Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7

author: Martin Smith <martin.smith@nokia.com> 2010-07-14 08:52:10 (GMT)
committer: Martin Smith <martin.smith@nokia.com> 2010-07-14 08:52:10 (GMT)
commit: bad44806fd543b91777b69d9afb0e1dd4910b15a (patch)
tree: 4f0fbc9a7548bc068b5f7048d8bbb20e5fea5759 /doc/src/snippets/code/doc_src_wince-introduction.qdoc
parent: d3f67bfe7cd1cc39d25e6a7371b2b185591008c4 (diff)
parent: 852ba9a62f65a27e42648d4b28b68c76b1589e75 (diff)
download: Qt-bad44806fd543b91777b69d9afb0e1dd4910b15a.zip
Qt-bad44806fd543b91777b69d9afb0e1dd4910b15a.tar.gz
Qt-bad44806fd543b91777b69d9afb0e1dd4910b15a.tar.bz2
0 files changed, 0 insertions, 0 deletions
diff --git a/.autom4te.cfg b/.autom4te.cfg
index 7b4dd6b..3872ddb 100644
--- a/.autom4te.cfg
+++ b/.autom4te.cfg
@@ -1,15 +1,12 @@
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 
 ## ------------------ ##
 ## User Preferences.  ##
diff --git a/.clang-format b/.clang-format
new file mode 100644
index 0000000..b51da2a
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,100 @@
+---
+BasedOnStyle:  LLVM
+AlignConsecutiveAssignments: true
+BraceWrapping:
+  AfterFunction:   true
+  #llvm10-11: AfterControlStatement: false - Never
+  BeforeCatch:     true
+  BeforeElse:      true
+  #llvm11:   BeforeLambdaBody: false
+  #llvm11:   BeforeWhile:     false
+BreakBeforeBraces: Stroustrup
+BreakAfterJavaFieldAnnotations: true
+BreakStringLiterals: true
+ColumnLimit:     110    # Update $max_trace_macro_line_len in bin/trace also
+IndentWidth:     4
+---
+Language:        Cpp
+#llvm11: AlignConsecutiveBitFields: false
+AlignConsecutiveDeclarations: true
+AlignConsecutiveMacros: true
+#llvm10-11: AlignOperands:   true - Align
+#llvm11: AllowShortEnumsOnASingleLine: true
+AllowShortFunctionsOnASingleLine: None
+AlwaysBreakAfterReturnType: AllDefinitions
+# Can enable the following section when llvm 12.x is out
+#AttributeMacros:
+#  - H5_ATTR_FORMAT
+#  - H5_ATTR_UNUSED
+#  - H5_ATTR_DEPRECATED_USED
+#  - H5_ATTR_NDEBUG_UNUSED
+#  - H5_ATTR_DEBUG_API_USED
+#  - H5_ATTR_PARALLEL_UNUSED
+#  - H5_ATTR_PARALLEL_USED
+#  - H5_ATTR_NORETURN
+#  - H5_ATTR_CONST
+#  - H5_ATTR_PURE
+#  - H5_ATTR_FALLTHROUGH
+ForEachMacros: ['ALL_MEMBERS', 'UNIQUE_MEMBERS']
+IncludeCategories:
+  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
+    Priority:        3
+    SortPriority:    0
+  - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
+    Priority:        4
+    SortPriority:    0
+  - Regex:           '.*'
+    Priority:        0
+    SortPriority:    0
+  - Regex:           '^H5*.*'
+    Priority:        1
+    SortPriority:    0
+  - Regex:           'private.*'
+    Priority:        2
+    SortPriority:    0
+IncludeIsMainRegex: '(public)?$'
+IndentCaseLabels: true
+#llvm11: IndentCaseBlocks: false
+IndentGotoLabels: false
+#llvm11: IndentExternBlock: AfterExternBlock
+#llvm11: InsertTrailingCommas: None
+MacroBlockBegin: "^BEGIN_FUNC"
+MacroBlockEnd: "^END_FUNC"
+ObjCBlockIndentWidth: 4
+#llvm11: ObjCBreakBeforeNestedBlockParam: true
+ReflowComments:  true
+SortIncludes:    false
+StatementMacros:
+  - FUNC_ENTER_API
+  - FUNC_LEAVE_API
+  - FUNC_ENTER_NOAPI_NOINIT_NOERR
+  - FUNC_LEAVE_NOAPI
+  - H5_BEGIN_TAG
+  - HGOTO_DONE_TAG
+  - H5_END_TAG
+  - HSYS_DONE_ERROR
+  - HSYS_GOTO_ERROR
+  - HDONE_ERROR
+  - HERROR
+  - H5_LEAVE
+  - H5E_PRINTF
+  - H5E_THROW
+  - HGOTO_DONE
+  - HGOTO_ERROR
+  - HMPI_ERROR
+  - HMPI_DONE_ERROR
+  - HMPI_GOTO_ERROR
+  - H5_GCC_DIAG_OFF
+  - H5_GCC_DIAG_ON
+  - CATCH
+#llvm10: TypenameMacros:
+#llvm10:   - STACK_OF
+#llvm10:   - LIST
+#llvm11: WhitespaceSensitiveMacros:
+#llvm11:   - STRINGIZE
+#llvm11:   - PP_STRINGIZE
+---
+Language:      Java
+BreakAfterJavaFieldAnnotations: true
+JavaImportGroups: ['java', 'hdf', 'hdf.hdf5lib', 'org']
+...
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..2ff0dab
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,879 @@
+* text=auto !eol
+bin/bbrelease -text
+bin/genparser -text
+bin/switch_maint_mode -text
+c++/src/H5OcreatProp.cpp -text
+c++/src/H5OcreatProp.h -text
+c++/src/footer.html -text
+c++/src/header_files/hdf_logo.jpg -text
+c++/src/header_files/help.jpg -text
+c++/src/header_files/image001.jpg -text
+c++/src/header_files/image002.jpg -text
+c++/test/tarray.cpp -text
+c++/test/th5s.h5 -text
+config/cce-fflags -text
+config/cce-flags -text
+config/cmake/CMakeFindJavaCommon.cmake -text
+config/cmake/CPack.Info.plist.in -text svneol=unset#application/xml
+config/cmake/FindHDFJAVA.cmake.in -text
+config/cmake/FindJNI.cmake -text
+config/cmake/HDF5UseFortran.cmake -text
+config/cmake/HDF5_Examples.cmake.in -text
+config/cmake/HDF5_Process_Flex_Files.cmake -text
+config/cmake/HDFCompilerFlags.cmake -text
+config/cmake/UseJava.cmake -text
+config/cmake/UseJavaClassFilelist.cmake -text
+config/cmake/UseJavaSymlinks.cmake -text
+config/cmake/jrunTest.cmake -text
+config/cmake/patch.xml -text
+config/cmake/scripts/CTestScript.cmake -text
+config/cmake/scripts/HDF5config.cmake -text
+config/cmake_ext_mod/hdf.bmp -text
+config/cmake_ext_mod/hdf.icns -text
+config/cmake_ext_mod/hdf.ico -text
+config/conclude_fc.am -text
+config/gnu-cxxflags -text
+examples/h5_vds-eiger.c -text
+examples/h5_vds-exc.c -text
+examples/h5_vds-exclim.c -text
+examples/h5_vds-percival-unlim-maxmin.c -text
+examples/h5_vds-percival-unlim.c -text
+examples/h5_vds-percival.c -text
+examples/h5_vds-simpleIO.c -text
+examples/h5_vds.c -text
+fortran/src/H5_buildiface.F90 -text
+fortran/src/H5config_f.inc.cmake -text
+fortran/src/H5config_f.inc.in -text
+fortran/src/H5fort_type_defines.h.in -text
+fortran/src/H5fortkit.F90 -text
+fortran/test/H5_test_buildiface.F90 -text
+hl/fortran/src/H5HL_buildiface.F90 -text
+hl/fortran/src/hdf5_hl_fortrandll.def.in -text
+hl/src/H5LD.c -text
+hl/src/H5LDprivate.h -text
+hl/src/H5LDpublic.h -text
+hl/src/H5LTanalyze.c -text
+hl/src/H5LTparse.c -text
+hl/src/H5LTparse.h -text
+hl/test/gen_test_ds.c svneol=native#text/plain
+hl/test/gen_test_ld.c -text
+hl/test/test_ds_be.h5 -text
+hl/test/test_ds_le.h5 -text
+hl/test/test_dset_append.c -text
+hl/test/test_ld.c -text
+hl/test/test_ld.h5 -text
+hl/test/test_packet_vlen.c -text
+hl/test/test_table_be.h5 -text
+hl/test/test_table_cray.h5 -text
+hl/test/test_table_le.h5 -text
+hl/tools/gif2h5/CMakeLists.txt -text
+hl/tools/gif2h5/CMakeTests.cmake -text
+hl/tools/gif2h5/testfiles/README -text
+hl/tools/gif2h5/testfiles/ex_image2.h5 -text
+hl/tools/gif2h5/testfiles/h52giftst.h5 -text
+hl/tools/gif2h5/testfiles/image1.gif -text
+java/CMakeLists.txt -text
+java/COPYING -text
+java/Makefile.am -text
+java/examples/CMakeLists.txt -text
+java/examples/Makefile.am -text
+java/examples/datasets/CMakeLists.txt -text
+java/examples/datasets/H5Ex_D_Alloc.java -text
+java/examples/datasets/H5Ex_D_Checksum.java -text
+java/examples/datasets/H5Ex_D_Chunk.java -text
+java/examples/datasets/H5Ex_D_Compact.java -text
+java/examples/datasets/H5Ex_D_External.java -text
+java/examples/datasets/H5Ex_D_FillValue.java -text
+java/examples/datasets/H5Ex_D_Gzip.java -text
+java/examples/datasets/H5Ex_D_Hyperslab.java -text
+java/examples/datasets/H5Ex_D_Nbit.java -text
+java/examples/datasets/H5Ex_D_ReadWrite.java -text
+java/examples/datasets/H5Ex_D_Shuffle.java -text
+java/examples/datasets/H5Ex_D_Sofloat.java -text
+java/examples/datasets/H5Ex_D_Soint.java -text
+java/examples/datasets/H5Ex_D_Szip.java -text
+java/examples/datasets/H5Ex_D_Transform.java -text
+java/examples/datasets/H5Ex_D_UnlimitedAdd.java -text
+java/examples/datasets/H5Ex_D_UnlimitedGzip.java -text
+java/examples/datasets/H5Ex_D_UnlimitedMod.java -text
+java/examples/datasets/Makefile.am -text
+java/examples/datasets/runExample.sh.in -text
+java/examples/datatypes/CMakeLists.txt -text
+java/examples/datatypes/H5Ex_T_Array.java -text
+java/examples/datatypes/H5Ex_T_ArrayAttribute.java -text
+java/examples/datatypes/H5Ex_T_Bit.java -text
+java/examples/datatypes/H5Ex_T_BitAttribute.java -text
+java/examples/datatypes/H5Ex_T_Commit.java -text
+java/examples/datatypes/H5Ex_T_Compound.java -text
+java/examples/datatypes/H5Ex_T_CompoundAttribute.java -text
+java/examples/datatypes/H5Ex_T_Float.java -text
+java/examples/datatypes/H5Ex_T_FloatAttribute.java -text
+java/examples/datatypes/H5Ex_T_Integer.java -text
+java/examples/datatypes/H5Ex_T_IntegerAttribute.java -text
+java/examples/datatypes/H5Ex_T_ObjectReference.java -text
+java/examples/datatypes/H5Ex_T_ObjectReferenceAttribute.java -text
+java/examples/datatypes/H5Ex_T_Opaque.java -text
+java/examples/datatypes/H5Ex_T_OpaqueAttribute.java -text
+java/examples/datatypes/H5Ex_T_String.java -text
+java/examples/datatypes/H5Ex_T_StringAttribute.java -text
+java/examples/datatypes/H5Ex_T_VLString.java -text
+java/examples/datatypes/Makefile.am -text
+java/examples/datatypes/runExample.sh.in -text
+java/examples/groups/CMakeLists.txt -text
+java/examples/groups/H5Ex_G_Compact.java -text
+java/examples/groups/H5Ex_G_Corder.java -text
+java/examples/groups/H5Ex_G_Create.java -text
+java/examples/groups/H5Ex_G_Intermediate.java -text
+java/examples/groups/H5Ex_G_Iterate.java -text
+java/examples/groups/H5Ex_G_Phase.java -text
+java/examples/groups/H5Ex_G_Traverse.java -text
+java/examples/groups/H5Ex_G_Visit.java -text
+java/examples/groups/Makefile.am -text
+java/examples/groups/h5ex_g_iterate.h5 -text svneol=unset#application/x-hdf
+java/examples/groups/h5ex_g_visit.h5 -text svneol=unset#application/x-hdf
+java/examples/groups/runExample.sh.in -text
+java/examples/intro/CMakeLists.txt -text
+java/examples/intro/H5_CreateAttribute.java -text
+java/examples/intro/H5_CreateDataset.java -text
+java/examples/intro/H5_CreateFile.java -text
+java/examples/intro/H5_CreateGroup.java -text
+java/examples/intro/H5_CreateGroupAbsoluteRelative.java -text
+java/examples/intro/H5_CreateGroupDataset.java -text
+java/examples/intro/H5_ReadWrite.java -text
+java/examples/intro/Makefile.am -text
+java/examples/intro/runExample.sh.in -text
+java/examples/testfiles/examples.datasets.H5Ex_D_Alloc.txt -text
+java/examples/testfiles/examples.datasets.H5Ex_D_Checksum.txt -text
+java/examples/testfiles/examples.datasets.H5Ex_D_Chunk.txt -text
+java/examples/testfiles/examples.datasets.H5Ex_D_Compact.txt -text
+java/examples/testfiles/examples.datasets.H5Ex_D_External.txt -text
+java/examples/testfiles/examples.datasets.H5Ex_D_FillValue.txt -text
+java/examples/testfiles/examples.datasets.H5Ex_D_Gzip.txt -text
+java/examples/testfiles/examples.datasets.H5Ex_D_Hyperslab.txt -text
+java/examples/testfiles/examples.datasets.H5Ex_D_Nbit.txt -text
+java/examples/testfiles/examples.datasets.H5Ex_D_ReadWrite.txt -text
+java/examples/testfiles/examples.datasets.H5Ex_D_Shuffle.txt -text
+java/examples/testfiles/examples.datasets.H5Ex_D_Sofloat.txt -text
+java/examples/testfiles/examples.datasets.H5Ex_D_Soint.txt -text
+java/examples/testfiles/examples.datasets.H5Ex_D_Szip.txt -text
+java/examples/testfiles/examples.datasets.H5Ex_D_Transform.txt -text
+java/examples/testfiles/examples.datasets.H5Ex_D_UnlimitedAdd.txt -text
+java/examples/testfiles/examples.datasets.H5Ex_D_UnlimitedGzip.txt -text
+java/examples/testfiles/examples.datasets.H5Ex_D_UnlimitedMod.txt -text
+java/examples/testfiles/examples.datatypes.H5Ex_T_Array.txt -text
+java/examples/testfiles/examples.datatypes.H5Ex_T_ArrayAttribute.txt -text
+java/examples/testfiles/examples.datatypes.H5Ex_T_Bit.txt -text
+java/examples/testfiles/examples.datatypes.H5Ex_T_BitAttribute.txt -text
+java/examples/testfiles/examples.datatypes.H5Ex_T_Commit.txt -text
+java/examples/testfiles/examples.datatypes.H5Ex_T_Compound.txt -text
+java/examples/testfiles/examples.datatypes.H5Ex_T_CompoundAttribute.txt -text
+java/examples/testfiles/examples.datatypes.H5Ex_T_Float.txt -text
+java/examples/testfiles/examples.datatypes.H5Ex_T_FloatAttribute.txt -text
+java/examples/testfiles/examples.datatypes.H5Ex_T_Integer.txt -text
+java/examples/testfiles/examples.datatypes.H5Ex_T_IntegerAttribute.txt -text
+java/examples/testfiles/examples.datatypes.H5Ex_T_ObjectReference.txt -text
+java/examples/testfiles/examples.datatypes.H5Ex_T_ObjectReferenceAttribute.txt -text
+java/examples/testfiles/examples.datatypes.H5Ex_T_Opaque.txt -text
+java/examples/testfiles/examples.datatypes.H5Ex_T_OpaqueAttribute.txt -text
+java/examples/testfiles/examples.datatypes.H5Ex_T_String.txt -text
+java/examples/testfiles/examples.datatypes.H5Ex_T_StringAttribute.txt -text
+java/examples/testfiles/examples.datatypes.H5Ex_T_VLString.txt -text
+java/examples/testfiles/examples.groups.H5Ex_G_Compact.txt -text
+java/examples/testfiles/examples.groups.H5Ex_G_Corder.txt -text
+java/examples/testfiles/examples.groups.H5Ex_G_Create.txt -text
+java/examples/testfiles/examples.groups.H5Ex_G_Intermediate.txt -text
+java/examples/testfiles/examples.groups.H5Ex_G_Iterate.txt -text
+java/examples/testfiles/examples.groups.H5Ex_G_Phase.txt -text
+java/examples/testfiles/examples.groups.H5Ex_G_Visit.txt -text
+java/examples/testfiles/examples.intro.H5_CreateAttribute.txt -text
+java/examples/testfiles/examples.intro.H5_CreateDataset.txt -text
+java/examples/testfiles/examples.intro.H5_CreateFile.txt -text
+java/examples/testfiles/examples.intro.H5_CreateGroup.txt -text
+java/examples/testfiles/examples.intro.H5_CreateGroupAbsoluteRelative.txt -text
+java/examples/testfiles/examples.intro.H5_CreateGroupDataset.txt -text
+java/examples/testfiles/examples.intro.H5_ReadWrite.txt -text
+java/lib/ext/slf4j-nop-1.7.33.jar -text svneol=unset#application/zip
+java/lib/ext/slf4j-simple-1.7.33.jar -text svneol=unset#application/zip
+java/lib/hamcrest-core.jar -text svneol=unset#application/java-archive
+java/lib/junit.jar -text svneol=unset#application/java-archive
+java/lib/simplelogger.properties -text
+java/lib/slf4j-api-1.7.33.jar -text svneol=unset#application/zip
+java/src/CMakeLists.txt -text
+java/src/Makefile.am -text
+java/src/hdf/CMakeLists.txt -text
+java/src/hdf/hdf5lib/CMakeLists.txt -text
+java/src/hdf/hdf5lib/H5.java -text
+java/src/hdf/hdf5lib/HDF5Constants.java -text
+java/src/hdf/hdf5lib/HDF5GroupInfo.java -text
+java/src/hdf/hdf5lib/HDFArray.java -text
+java/src/hdf/hdf5lib/HDFNativeData.java -text
+java/src/hdf/hdf5lib/callbacks/Callbacks.java -text
+java/src/hdf/hdf5lib/callbacks/H5A_iterate_cb.java -text
+java/src/hdf/hdf5lib/callbacks/H5A_iterate_t.java -text
+java/src/hdf/hdf5lib/callbacks/H5D_append_cb.java -text
+java/src/hdf/hdf5lib/callbacks/H5D_append_t.java -text
+java/src/hdf/hdf5lib/callbacks/H5D_iterate_cb.java -text
+java/src/hdf/hdf5lib/callbacks/H5D_iterate_t.java -text
+java/src/hdf/hdf5lib/callbacks/H5E_walk_cb.java -text
+java/src/hdf/hdf5lib/callbacks/H5E_walk_t.java -text
+java/src/hdf/hdf5lib/callbacks/H5L_iterate_t.java -text
+java/src/hdf/hdf5lib/callbacks/H5L_iterate_opdata_t.java -text
+java/src/hdf/hdf5lib/callbacks/H5O_iterate_t.java -text
+java/src/hdf/hdf5lib/callbacks/H5O_iterate_opdata_t.java -text
+java/src/hdf/hdf5lib/callbacks/H5P_cls_close_func_cb.java -text
+java/src/hdf/hdf5lib/callbacks/H5P_cls_close_func_t.java -text
+java/src/hdf/hdf5lib/callbacks/H5P_cls_copy_func_cb.java -text
+java/src/hdf/hdf5lib/callbacks/H5P_cls_copy_func_t.java -text
+java/src/hdf/hdf5lib/callbacks/H5P_cls_create_func_cb.java -text
+java/src/hdf/hdf5lib/callbacks/H5P_cls_create_func_t.java -text
+java/src/hdf/hdf5lib/callbacks/H5P_iterate_cb.java -text
+java/src/hdf/hdf5lib/callbacks/H5P_iterate_t.java -text
+java/src/hdf/hdf5lib/callbacks/H5P_prp_close_func_cb.java -text
+java/src/hdf/hdf5lib/callbacks/H5P_prp_compare_func_cb.java -text
+java/src/hdf/hdf5lib/callbacks/H5P_prp_copy_func_cb.java -text
+java/src/hdf/hdf5lib/callbacks/H5P_prp_create_func_cb.java -text
+java/src/hdf/hdf5lib/callbacks/H5P_prp_delete_func_cb.java -text
+java/src/hdf/hdf5lib/callbacks/H5P_prp_get_func_cb.java -text
+java/src/hdf/hdf5lib/callbacks/H5P_prp_set_func_cb.java -text
+java/src/hdf/hdf5lib/exceptions/HDF5AtomException.java -text
+java/src/hdf/hdf5lib/exceptions/HDF5AttributeException.java -text
+java/src/hdf/hdf5lib/exceptions/HDF5BtreeException.java -text
+java/src/hdf/hdf5lib/exceptions/HDF5DataFiltersException.java -text
+java/src/hdf/hdf5lib/exceptions/HDF5DataStorageException.java -text
+java/src/hdf/hdf5lib/exceptions/HDF5DatasetInterfaceException.java -text
+java/src/hdf/hdf5lib/exceptions/HDF5DataspaceInterfaceException.java -text
+java/src/hdf/hdf5lib/exceptions/HDF5DatatypeInterfaceException.java -text
+java/src/hdf/hdf5lib/exceptions/HDF5Exception.java -text
+java/src/hdf/hdf5lib/exceptions/HDF5ExternalFileListException.java -text
+java/src/hdf/hdf5lib/exceptions/HDF5FileInterfaceException.java -text
+java/src/hdf/hdf5lib/exceptions/HDF5FunctionArgumentException.java -text
+java/src/hdf/hdf5lib/exceptions/HDF5FunctionEntryExitException.java -text
+java/src/hdf/hdf5lib/exceptions/HDF5HeapException.java -text
+java/src/hdf/hdf5lib/exceptions/HDF5InternalErrorException.java -text
+java/src/hdf/hdf5lib/exceptions/HDF5JavaException.java -text
+java/src/hdf/hdf5lib/exceptions/HDF5LibraryException.java -text
+java/src/hdf/hdf5lib/exceptions/HDF5LowLevelIOException.java -text
+java/src/hdf/hdf5lib/exceptions/HDF5MetaDataCacheException.java -text
+java/src/hdf/hdf5lib/exceptions/HDF5ObjectHeaderException.java -text
+java/src/hdf/hdf5lib/exceptions/HDF5PropertyListInterfaceException.java -text
+java/src/hdf/hdf5lib/exceptions/HDF5ReferenceException.java -text
+java/src/hdf/hdf5lib/exceptions/HDF5ResourceUnavailableException.java -text
+java/src/hdf/hdf5lib/exceptions/HDF5SymbolTableException.java -text
+java/src/hdf/hdf5lib/structs/H5AC_cache_config_t.java -text
+java/src/hdf/hdf5lib/structs/H5A_info_t.java -text
+java/src/hdf/hdf5lib/structs/H5E_error2_t.java -text
+java/src/hdf/hdf5lib/structs/H5F_info2_t.java -text
+java/src/hdf/hdf5lib/structs/H5G_info_t.java -text
+java/src/hdf/hdf5lib/structs/H5L_info_t.java -text
+java/src/hdf/hdf5lib/structs/H5O_hdr_info_t.java -text
+java/src/hdf/hdf5lib/structs/H5O_info_t.java -text
+java/src/hdf/hdf5lib/structs/H5O_native_info_t.java -text
+java/src/hdf/hdf5lib/structs/H5O_token_t.java -text
+java/src/hdf/hdf5lib/structs/H5_ih_info_t.java -text
+java/src/hdf/overview.html -text
+java/src/jni/CMakeLists.txt -text
+java/src/jni/Makefile.am -text
+java/src/jni/exceptionImp.c -text
+java/src/jni/exceptionImp.h -text
+java/src/jni/h5Constants.c -text
+java/src/jni/h5Imp.c -text
+java/src/jni/h5Imp.h -text
+java/src/jni/h5aImp.c -text
+java/src/jni/h5aImp.h -text
+java/src/jni/h5dImp.c -text
+java/src/jni/h5dImp.h -text
+java/src/jni/h5eImp.c -text
+java/src/jni/h5eImp.h -text
+java/src/jni/h5fImp.c -text
+java/src/jni/h5fImp.h -text
+java/src/jni/h5gImp.c -text
+java/src/jni/h5gImp.h -text
+java/src/jni/h5iImp.c -text
+java/src/jni/h5iImp.h -text
+java/src/jni/h5jni.h -text
+java/src/jni/h5lImp.c -text
+java/src/jni/h5lImp.h -text
+java/src/jni/h5oImp.c -text
+java/src/jni/h5oImp.h -text
+java/src/jni/h5pImp.c -text
+java/src/jni/h5pImp.h -text
+java/src/jni/h5plImp.c -text
+java/src/jni/h5plImp.h -text
+java/src/jni/h5rImp.c -text
+java/src/jni/h5rImp.h -text
+java/src/jni/h5sImp.c -text
+java/src/jni/h5sImp.h -text
+java/src/jni/h5tImp.c -text
+java/src/jni/h5tImp.h -text
+java/src/jni/h5util.c -text
+java/src/jni/h5util.h -text
+java/src/jni/h5zImp.c -text
+java/src/jni/h5zImp.h -text
+java/src/jni/nativeData.c -text
+java/src/jni/nativeData.h -text
+java/test/CMakeLists.txt -text
+java/test/JUnit-interface.ert -text
+java/test/JUnit-interface.txt -text
+java/test/Makefile.am -text
+java/test/TestAll.java -text
+java/test/TestH5.java -text
+java/test/TestH5A.java -text
+java/test/TestH5D.java -text
+java/test/TestH5Dparams.java -text
+java/test/TestH5Dplist.java -text
+java/test/TestH5E.java -text
+java/test/TestH5Edefault.java -text
+java/test/TestH5Eparams.java -text
+java/test/TestH5Eregister.java -text
+java/test/TestH5F.java -text
+java/test/TestH5Fbasic.java -text
+java/test/TestH5Fparams.java -text
+java/test/TestH5G.java -text
+java/test/TestH5Gbasic.java -text
+java/test/TestH5Giterate.java -text
+java/test/TestH5Lbasic.java -text
+java/test/TestH5Lcreate.java -text
+java/test/TestH5Lparams.java -text
+java/test/TestH5Obasic.java -text
+java/test/TestH5Ocopy.java -text
+java/test/TestH5Ocreate.java -text
+java/test/TestH5Oparams.java -text
+java/test/TestH5P.java -text
+java/test/TestH5PData.java -text
+java/test/TestH5PL.java -text
+java/test/TestH5Pfapl.java -text
+java/test/TestH5Plist.java -text
+java/test/TestH5Pvirtual.java -text
+java/test/TestH5R.java -text
+java/test/TestH5S.java -text
+java/test/TestH5Sbasic.java -text
+java/test/TestH5T.java -text
+java/test/TestH5Tbasic.java -text
+java/test/TestH5Tparams.java -text
+java/test/TestUnit.java -text
+java/test/TestH5Z.java -text
+java/test/h5ex_g_iterate.orig -text svneol=unset#application/x-hdf
+java/test/junit.sh.in -text
+m4/aclocal_cxx.m4 -text
+m4/aclocal_fc.f90 -text
+m4/aclocal_fc.m4 -text
+m4/ax_check_class.m4 -text
+m4/ax_check_classpath.m4 -text
+m4/ax_check_java_home.m4 -text
+m4/ax_check_junit.m4 -text
+m4/ax_check_rqrd_class.m4 -text
+m4/ax_java_check_class.m4 -text
+m4/ax_java_options.m4 -text
+m4/ax_jni_include_dir.m4 -text
+m4/ax_prog_doxygen.m4 -text
+m4/ax_prog_jar.m4 -text
+m4/ax_prog_java.m4 -text
+m4/ax_prog_java_cc.m4 -text
+m4/ax_prog_java_works.m4 -text
+m4/ax_prog_javac.m4 -text
+m4/ax_prog_javac_works.m4 -text
+m4/ax_prog_javadoc.m4 -text
+m4/ax_prog_javah.m4 -text
+m4/ax_try_compile_java.m4 -text
+m4/ax_try_run_java.m4 -text
+src/H5Cepoch.c -text
+src/H5Cquery.c -text
+src/H5Ctag.c -text
+src/H5Ctest.c -text
+src/H5Dnone.c -text
+src/H5Dsingle.c -text
+src/H5Oflush.c -text
+test/bad_compound.h5 -text
+test/be_data.h5 -text
+test/be_extlink1.h5 -text
+test/be_extlink2.h5 -text
+test/btree_idx_1_6.h5 -text
+test/btree_idx_1_8.h5 -text
+test/cork.c -text
+test/corrupt_stab_msg.h5 -text
+test/deflate.h5 -text
+test/dynlib4.c -text
+test/family_v16-000000.h5 -text
+test/family_v16-000001.h5 -text
+test/family_v16-000002.h5 -text
+test/family_v16-000003.h5 -text
+test/file_image_core_test.h5 -text
+test/filespace_1_6.h5 -text
+test/filespace_1_8.h5 -text
+test/fill_old.h5 -text
+test/filter_error.h5 -text
+test/group_old.h5 -text
+test/le_data.h5 -text
+test/le_extlink1.h5 -text
+test/le_extlink2.h5 -text
+test/mergemsg.h5 -text svneol=unset#application/hdf5
+test/multi_file_v16-r.h5 -text
+test/multi_file_v16-s.h5 -text
+test/noencoder.h5 -text
+test/specmetaread.h5 -text
+test/tarrold.h5 -text
+test/tbad_msg_count.h5 -text
+test/tbogus.h5 -text
+test/test_filters_be.h5 -text
+test/test_filters_le.h5 -text
+test/testfiles/plist_files/acpl_32be -text
+test/testfiles/plist_files/acpl_32le -text
+test/testfiles/plist_files/acpl_64be -text
+test/testfiles/plist_files/acpl_64le -text
+test/testfiles/plist_files/dapl_32be -text
+test/testfiles/plist_files/dapl_32le -text
+test/testfiles/plist_files/dapl_64be -text
+test/testfiles/plist_files/dapl_64le -text
+test/testfiles/plist_files/dcpl_32be -text
+test/testfiles/plist_files/dcpl_32le -text
+test/testfiles/plist_files/dcpl_64be -text
+test/testfiles/plist_files/dcpl_64le -text
+test/testfiles/plist_files/def_acpl_32be -text
+test/testfiles/plist_files/def_acpl_32le -text
+test/testfiles/plist_files/def_acpl_64be -text
+test/testfiles/plist_files/def_acpl_64le -text
+test/testfiles/plist_files/def_dapl_32be -text
+test/testfiles/plist_files/def_dapl_32le -text
+test/testfiles/plist_files/def_dapl_64be -text
+test/testfiles/plist_files/def_dapl_64le -text
+test/testfiles/plist_files/def_dcpl_32be -text
+test/testfiles/plist_files/def_dcpl_32le -text
+test/testfiles/plist_files/def_dcpl_64be -text
+test/testfiles/plist_files/def_dcpl_64le -text
+test/testfiles/plist_files/def_dxpl_32be -text
+test/testfiles/plist_files/def_dxpl_32le -text
+test/testfiles/plist_files/def_dxpl_64be -text
+test/testfiles/plist_files/def_dxpl_64le -text
+test/testfiles/plist_files/def_fapl_32be -text
+test/testfiles/plist_files/def_fapl_32le -text
+test/testfiles/plist_files/def_fapl_64be -text
+test/testfiles/plist_files/def_fapl_64le -text
+test/testfiles/plist_files/def_fcpl_32be -text
+test/testfiles/plist_files/def_fcpl_32le -text
+test/testfiles/plist_files/def_fcpl_64be -text
+test/testfiles/plist_files/def_fcpl_64le -text
+test/testfiles/plist_files/def_gcpl_32be -text
+test/testfiles/plist_files/def_gcpl_32le -text
+test/testfiles/plist_files/def_gcpl_64be -text
+test/testfiles/plist_files/def_gcpl_64le -text
+test/testfiles/plist_files/def_lapl_32be -text
+test/testfiles/plist_files/def_lapl_32le -text
+test/testfiles/plist_files/def_lapl_64be -text
+test/testfiles/plist_files/def_lapl_64le -text
+test/testfiles/plist_files/def_lcpl_32be -text
+test/testfiles/plist_files/def_lcpl_32le -text
+test/testfiles/plist_files/def_lcpl_64be -text
+test/testfiles/plist_files/def_lcpl_64le -text
+test/testfiles/plist_files/def_ocpl_32be -text
+test/testfiles/plist_files/def_ocpl_32le -text
+test/testfiles/plist_files/def_ocpl_64be -text
+test/testfiles/plist_files/def_ocpl_64le -text
+test/testfiles/plist_files/def_ocpypl_32be -text
+test/testfiles/plist_files/def_ocpypl_32le -text
+test/testfiles/plist_files/def_ocpypl_64be -text
+test/testfiles/plist_files/def_ocpypl_64le -text
+test/testfiles/plist_files/def_strcpl_32be -text
+test/testfiles/plist_files/def_strcpl_32le -text
+test/testfiles/plist_files/def_strcpl_64be -text
+test/testfiles/plist_files/def_strcpl_64le -text
+test/testfiles/plist_files/dxpl_32be -text
+test/testfiles/plist_files/dxpl_32le -text
+test/testfiles/plist_files/dxpl_64be -text
+test/testfiles/plist_files/dxpl_64le -text
+test/testfiles/plist_files/fapl_32be -text
+test/testfiles/plist_files/fapl_32le -text
+test/testfiles/plist_files/fapl_64be -text
+test/testfiles/plist_files/fapl_64le -text
+test/testfiles/plist_files/fcpl_32be -text
+test/testfiles/plist_files/fcpl_32le -text
+test/testfiles/plist_files/fcpl_64be -text
+test/testfiles/plist_files/fcpl_64le -text
+test/testfiles/plist_files/gcpl_32be -text
+test/testfiles/plist_files/gcpl_32le -text
+test/testfiles/plist_files/gcpl_64be -text
+test/testfiles/plist_files/gcpl_64le -text
+test/testfiles/plist_files/lapl_32be -text
+test/testfiles/plist_files/lapl_32le -text
+test/testfiles/plist_files/lapl_64be -text
+test/testfiles/plist_files/lapl_64le -text
+test/testfiles/plist_files/lcpl_32be -text
+test/testfiles/plist_files/lcpl_32le -text
+test/testfiles/plist_files/lcpl_64be -text
+test/testfiles/plist_files/lcpl_64le -text
+test/testfiles/plist_files/ocpl_32be -text
+test/testfiles/plist_files/ocpl_32le -text
+test/testfiles/plist_files/ocpl_64be -text
+test/testfiles/plist_files/ocpl_64le -text
+test/testfiles/plist_files/ocpypl_32be -text
+test/testfiles/plist_files/ocpypl_32le -text
+test/testfiles/plist_files/ocpypl_64be -text
+test/testfiles/plist_files/ocpypl_64le -text
+test/testfiles/plist_files/strcpl_32be -text
+test/testfiles/plist_files/strcpl_32le -text
+test/testfiles/plist_files/strcpl_64be -text
+test/testfiles/plist_files/strcpl_64le -text
+test/th5s.h5 -text
+test/tlayouto.h5 -text
+test/tmtimen.h5 -text
+test/tmtimeo.h5 -text
+test/tsizeslheap.h5 -text
+testpar/t_init_term.c -text
+testpar/t_prestart.c -text
+testpar/t_pshutdown.c -text
+tools/h5copy/testfiles/h5copy_extlinks_src.h5 -text
+tools/h5copy/testfiles/h5copy_extlinks_trg.h5 -text
+tools/h5copy/testfiles/h5copy_ref.h5 -text
+tools/h5copy/testfiles/h5copytst.h5 -text
+tools/h5copy/testfiles/h5copytst_new.h5 -text
+tools/h5copy/testfiles/h5copytst_new.out.ls -text
+tools/h5diff/testfiles/compounds_array_vlen1.h5 -text
+tools/h5diff/testfiles/compounds_array_vlen2.h5 -text
+tools/h5diff/testfiles/h5diff_attr1.h5 -text
+tools/h5diff/testfiles/h5diff_attr2.h5 -text
+tools/h5diff/testfiles/h5diff_attr_v_level1.h5 -text
+tools/h5diff/testfiles/h5diff_attr_v_level2.h5 -text
+tools/h5diff/testfiles/h5diff_basic1.h5 -text
+tools/h5diff/testfiles/h5diff_basic2.h5 -text
+tools/h5diff/testfiles/h5diff_comp_vl_strs.h5 -text
+tools/h5diff/testfiles/h5diff_danglelinks1.h5 -text
+tools/h5diff/testfiles/h5diff_danglelinks2.h5 -text
+tools/h5diff/testfiles/h5diff_dset1.h5 -text
+tools/h5diff/testfiles/h5diff_dset2.h5 -text
+tools/h5diff/testfiles/h5diff_dset_zero_dim_size1.h5 -text
+tools/h5diff/testfiles/h5diff_dset_zero_dim_size2.h5 -text
+tools/h5diff/testfiles/h5diff_dtypes.h5 -text
+tools/h5diff/testfiles/h5diff_empty.h5 -text
+tools/h5diff/testfiles/h5diff_enum_invalid_values.h5 -text
+tools/h5diff/testfiles/h5diff_exclude1-1.h5 -text
+tools/h5diff/testfiles/h5diff_exclude1-2.h5 -text
+tools/h5diff/testfiles/h5diff_exclude2-1.h5 -text
+tools/h5diff/testfiles/h5diff_exclude2-2.h5 -text
+tools/h5diff/testfiles/h5diff_exclude3-1.h5 -text
+tools/h5diff/testfiles/h5diff_exclude3-2.h5 -text
+tools/h5diff/testfiles/h5diff_ext2softlink_src.h5 -text
+tools/h5diff/testfiles/h5diff_ext2softlink_trg.h5 -text
+tools/h5diff/testfiles/h5diff_extlink_src.h5 -text
+tools/h5diff/testfiles/h5diff_extlink_trg.h5 -text
+tools/h5diff/testfiles/h5diff_grp_recurse1.h5 -text
+tools/h5diff/testfiles/h5diff_grp_recurse2.h5 -text
+tools/h5diff/testfiles/h5diff_grp_recurse_ext1.h5 -text
+tools/h5diff/testfiles/h5diff_grp_recurse_ext2-1.h5 -text
+tools/h5diff/testfiles/h5diff_grp_recurse_ext2-2.h5 -text
+tools/h5diff/testfiles/h5diff_grp_recurse_ext2-3.h5 -text
+tools/h5diff/testfiles/h5diff_hyper1.h5 -text
+tools/h5diff/testfiles/h5diff_hyper2.h5 -text
+tools/h5diff/testfiles/h5diff_linked_softlink.h5 -text
+tools/h5diff/testfiles/h5diff_links.h5 -text
+tools/h5diff/testfiles/h5diff_softlinks.h5 -text
+tools/h5diff/testfiles/h5diff_types.h5 -text
+tools/h5diff/testfiles/h5diff_v1.txt -text
+tools/h5diff/testfiles/h5diff_v2.txt -text
+tools/h5diff/testfiles/h5diff_v3.txt -text
+tools/h5diff/testfiles/non_comparables1.h5 -text
+tools/h5diff/testfiles/non_comparables2.h5 -text
+tools/h5diff/testfiles/tmpSingleSiteBethe.output.h5 -text
+tools/h5diff/testfiles/tmpSingleSiteBethe.reference.h5 -text
+tools/h5diff/testfiles/tmptest.he5 -text
+tools/h5diff/testfiles/tmptest2.he5 -text
+tools/h5dump/errfiles/non_existing.err -text
+tools/h5format_convert/CMakeLists.txt -text
+tools/h5format_convert/CMakeTests.cmake -text
+tools/h5format_convert/Makefile.am -text
+tools/h5format_convert/h5fc_chk_idx.c -text
+tools/h5format_convert/h5fc_gentest.c -text
+tools/h5format_convert/h5format_convert.c -text
+tools/h5format_convert/testfiles/h5fc_d_file.ddl -text
+tools/h5format_convert/testfiles/h5fc_dname.ddl -text
+tools/h5format_convert/testfiles/h5fc_edge_v3.h5 -text
+tools/h5format_convert/testfiles/h5fc_err_level.h5 -text
+tools/h5format_convert/testfiles/h5fc_ext1_f.ddl -text
+tools/h5format_convert/testfiles/h5fc_ext1_f.h5 -text
+tools/h5format_convert/testfiles/h5fc_ext1_i.ddl -text
+tools/h5format_convert/testfiles/h5fc_ext1_i.h5 -text
+tools/h5format_convert/testfiles/h5fc_ext1_s.ddl -text
+tools/h5format_convert/testfiles/h5fc_ext1_s.h5 -text
+tools/h5format_convert/testfiles/h5fc_ext2_if.ddl -text
+tools/h5format_convert/testfiles/h5fc_ext2_if.h5 -text
+tools/h5format_convert/testfiles/h5fc_ext2_is.ddl -text
+tools/h5format_convert/testfiles/h5fc_ext2_is.h5 -text
+tools/h5format_convert/testfiles/h5fc_ext2_sf.ddl -text
+tools/h5format_convert/testfiles/h5fc_ext2_sf.h5 -text
+tools/h5format_convert/testfiles/h5fc_ext3_isf.ddl -text
+tools/h5format_convert/testfiles/h5fc_ext3_isf.h5 -text
+tools/h5format_convert/testfiles/h5fc_ext_none.h5 -text
+tools/h5format_convert/testfiles/h5fc_help.ddl -text
+tools/h5format_convert/testfiles/h5fc_non_v3.h5 -text
+tools/h5format_convert/testfiles/h5fc_nonexistdset_file.ddl -text
+tools/h5format_convert/testfiles/h5fc_nonexistfile.ddl -text
+tools/h5format_convert/testfiles/h5fc_nooption.ddl -text
+tools/h5format_convert/testfiles/h5fc_v_all.ddl -text
+tools/h5format_convert/testfiles/h5fc_v_bt1.ddl -text
+tools/h5format_convert/testfiles/h5fc_v_err.ddl -text
+tools/h5format_convert/testfiles/h5fc_v_n_1d.ddl -text
+tools/h5format_convert/testfiles/h5fc_v_n_all.ddl -text
+tools/h5format_convert/testfiles/h5fc_v_ndata_bt1.ddl -text
+tools/h5format_convert/testfiles/h5fc_v_non_chunked.ddl -text
+tools/h5format_convert/testfiles/old_h5fc_ext1_f.ddl -text
+tools/h5format_convert/testfiles/old_h5fc_ext1_f.h5 -text
+tools/h5format_convert/testfiles/old_h5fc_ext1_i.ddl -text
+tools/h5format_convert/testfiles/old_h5fc_ext1_i.h5 -text
+tools/h5format_convert/testfiles/old_h5fc_ext1_s.ddl -text
+tools/h5format_convert/testfiles/old_h5fc_ext1_s.h5 -text
+tools/h5format_convert/testfiles/old_h5fc_ext2_if.ddl -text
+tools/h5format_convert/testfiles/old_h5fc_ext2_if.h5 -text
+tools/h5format_convert/testfiles/old_h5fc_ext2_is.ddl -text
+tools/h5format_convert/testfiles/old_h5fc_ext2_is.h5 -text
+tools/h5format_convert/testfiles/old_h5fc_ext2_sf.ddl -text
+tools/h5format_convert/testfiles/old_h5fc_ext2_sf.h5 -text
+tools/h5format_convert/testfiles/old_h5fc_ext3_isf.ddl -text
+tools/h5format_convert/testfiles/old_h5fc_ext3_isf.h5 -text
+tools/h5format_convert/testfiles/old_h5fc_ext_none.h5 -text
+tools/h5format_convert/testh5fc.sh.in -text
+tools/h5import/testfiles/binfp64.h5 -text
+tools/h5import/testfiles/binin16.h5 -text
+tools/h5import/testfiles/binin32.h5 -text
+tools/h5import/testfiles/binin8.h5 -text
+tools/h5import/testfiles/binin8w.h5 -text
+tools/h5import/testfiles/binuin16.h5 -text
+tools/h5import/testfiles/binuin32.h5 -text
+tools/h5import/testfiles/textpfe.h5 -text
+tools/h5import/testfiles/txtfp32.h5 -text
+tools/h5import/testfiles/txtfp64.h5 -text
+tools/h5import/testfiles/txtin16.h5 -text
+tools/h5import/testfiles/txtin32.h5 -text
+tools/h5import/testfiles/txtin8.h5 -text
+tools/h5import/testfiles/txtstr.h5 -text
+tools/h5import/testfiles/txtuin16.h5 -text
+tools/h5import/testfiles/txtuin32.h5 -text
+tools/h5jam/testfiles/tall.h5 -text
+tools/h5jam/testfiles/twithub.h5 -text
+tools/h5jam/testfiles/twithub513.h5 -text
+tools/h5repack/testfiles/1_vds.h5-vds_dset_chunk20x10x5-v.ddl -text
+tools/h5repack/testfiles/2_vds.h5-vds_chunk3x6x9-v.ddl -text
+tools/h5repack/testfiles/3_1_vds.h5-vds_chunk2x5x8-v.ddl -text
+tools/h5repack/testfiles/4_vds.h5-vds_compa-v.ddl -text
+tools/h5repack/testfiles/4_vds.h5-vds_conti-v.ddl -text
+tools/h5repack/testfiles/README -text
+tools/h5repack/testfiles/h5repack_attr.h5 -text
+tools/h5repack/testfiles/h5repack_attr_refs.h5 -text
+tools/h5repack/testfiles/h5repack_deflate.h5 -text
+tools/h5repack/testfiles/h5repack_early.h5 -text
+tools/h5repack/testfiles/h5repack_ext.bin -text
+tools/h5repack/testfiles/h5repack_ext.h5 -text
+tools/h5repack/testfiles/h5repack_fill.h5 -text
+tools/h5repack/testfiles/h5repack_filters.h5 -text
+tools/h5repack/testfiles/h5repack_filters.h5-gzip_verbose_filters.tst -text
+tools/h5repack/testfiles/h5repack_fletcher.h5 -text
+tools/h5repack/testfiles/h5repack_hlink.h5 -text
+tools/h5repack/testfiles/h5repack_layout.UD.h5 -text svneol=unset#application/x-hdf
+tools/h5repack/testfiles/h5repack_layout.h5 -text
+tools/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst -text
+tools/h5repack/testfiles/h5repack_layout.h5-plugin_zero.tst -text
+tools/h5repack/testfiles/h5repack_layout2.h5 -text
+tools/h5repack/testfiles/h5repack_layout3.h5 -text
+tools/h5repack/testfiles/h5repack_layouto.h5 -text
+tools/h5repack/testfiles/h5repack_named_dtypes.h5 -text
+tools/h5repack/testfiles/h5repack_nbit.h5 -text
+tools/h5repack/testfiles/h5repack_nested_8bit_enum.h5 -text
+tools/h5repack/testfiles/h5repack_nested_8bit_enum_deflated.h5 -text
+tools/h5repack/testfiles/h5repack_objs.h5 -text
+tools/h5repack/testfiles/h5repack_refs.h5 -text
+tools/h5repack/testfiles/h5repack_shuffle.h5 -text
+tools/h5repack/testfiles/h5repack_soffset.h5 -text
+tools/h5repack/testfiles/h5repack_szip.h5 -text
+tools/h5repack/testfiles/ublock.bin -text
+tools/h5stat/testfiles/h5stat_filters.h5 -text
+tools/h5stat/testfiles/h5stat_idx.ddl -text
+tools/h5stat/testfiles/h5stat_idx.h5 -text
+tools/h5stat/testfiles/h5stat_newgrat.h5 -text
+tools/h5stat/testfiles/h5stat_threshold.h5 -text
+tools/h5stat/testfiles/h5stat_tsohm.h5 -text
+tools/lib/h5tools_error.h svneol=native#text/plain
+tools/testfiles/charsets.h5 -text
+tools/testfiles/family_file00000.h5 -text
+tools/testfiles/family_file00001.h5 -text
+tools/testfiles/family_file00002.h5 -text
+tools/testfiles/family_file00003.h5 -text
+tools/testfiles/family_file00004.h5 -text
+tools/testfiles/family_file00005.h5 -text
+tools/testfiles/family_file00006.h5 -text
+tools/testfiles/family_file00007.h5 -text
+tools/testfiles/family_file00008.h5 -text
+tools/testfiles/family_file00009.h5 -text
+tools/testfiles/family_file00010.h5 -text
+tools/testfiles/family_file00011.h5 -text
+tools/testfiles/family_file00012.h5 -text
+tools/testfiles/family_file00013.h5 -text
+tools/testfiles/family_file00014.h5 -text
+tools/testfiles/family_file00015.h5 -text
+tools/testfiles/family_file00016.h5 -text
+tools/testfiles/family_file00017.h5 -text
+tools/testfiles/file_space.h5 -text
+tools/testfiles/filter_fail.h5 -text
+tools/testfiles/non_existing.ddl -text
+tools/testfiles/packedbits.h5 -text
+tools/testfiles/taindices.h5 -text
+tools/testfiles/tall.h5 -text
+tools/testfiles/tarray1.h5 -text
+tools/testfiles/tarray1_big.h5 -text
+tools/testfiles/tarray2.h5 -text
+tools/testfiles/tarray3.h5 -text
+tools/testfiles/tarray4.h5 -text
+tools/testfiles/tarray5.h5 -text
+tools/testfiles/tarray6.h5 -text
+tools/testfiles/tarray7.h5 -text
+tools/testfiles/tarray8.h5 -text
+tools/testfiles/tattr.h5 -text
+tools/testfiles/tattr2.h5 -text
+tools/testfiles/tattr4_be.h5 -text
+tools/testfiles/tattrintsize.h5 -text
+tools/testfiles/tattrreg.h5 -text
+tools/testfiles/tbigdims.h5 -text
+tools/testfiles/tbinary.h5 -text
+tools/testfiles/tbitfields.h5 -text
+tools/testfiles/tbitnopaque_be.ddl -text
+tools/testfiles/tbitnopaque_le.ddl -text
+tools/testfiles/tbitnopaque.h5 -text svneol=unset#application/x-hdf
+tools/testfiles/tchar.h5 -text
+tools/testfiles/tcmpdattrintsize.h5 -text
+tools/testfiles/tcmpdintarray.h5 -text svneol=unset#application/x-hdf
+tools/testfiles/tcmpdints.h5 -text svneol=unset#application/x-hdf
+tools/testfiles/tcmpdintsize.h5 -text
+tools/testfiles/tcompound.h5 -text
+tools/testfiles/tcompound2.h5 -text
+tools/testfiles/tcompound_complex.h5 -text
+tools/testfiles/tcompound_complex2.ddl -text
+tools/testfiles/tcompound_complex2.h5 -text svneol=unset#application/x-hdf
+tools/testfiles/tdatareg.h5 -text
+tools/testfiles/tdset.h5 -text
+tools/testfiles/tdset2.h5 -text
+tools/testfiles/tdset_idx.h5 -text
+tools/testfiles/tdset_idx.ls -text
+tools/testfiles/tempty.h5 -text
+tools/testfiles/tenum.h5 -text
+tools/testfiles/textlink.h5 -text
+tools/testfiles/textlinkfar.h5 -text
+tools/testfiles/textlinksrc.h5 -text
+tools/testfiles/textlinktar.h5 -text
+tools/testfiles/tfamily00000.h5 -text
+tools/testfiles/tfamily00001.h5 -text
+tools/testfiles/tfamily00002.h5 -text
+tools/testfiles/tfamily00003.h5 -text
+tools/testfiles/tfamily00004.h5 -text
+tools/testfiles/tfamily00005.h5 -text
+tools/testfiles/tfamily00006.h5 -text
+tools/testfiles/tfamily00007.h5 -text
+tools/testfiles/tfamily00008.h5 -text
+tools/testfiles/tfamily00009.h5 -text
+tools/testfiles/tfamily00010.h5 -text
+tools/testfiles/tfcontents1.h5 -text
+tools/testfiles/tfcontents2.h5 -text
+tools/testfiles/tfilters.h5 -text
+tools/testfiles/tfpformat.h5 -text
+tools/testfiles/tfvalues.h5 -text
+tools/testfiles/tgroup.h5 -text
+tools/testfiles/tgrp_comments.h5 -text
+tools/testfiles/thlink.h5 -text
+tools/testfiles/thyperslab.h5 -text
+tools/testfiles/tints4dims.ddl -text
+tools/testfiles/tints4dims.h5 -text svneol=unset#application/x-hdf
+tools/testfiles/tints4dimsBlock2.ddl -text
+tools/testfiles/tints4dimsBlockEq.ddl -text
+tools/testfiles/tints4dimsCount2.ddl -text
+tools/testfiles/tints4dimsCountEq.ddl -text
+tools/testfiles/tints4dimsStride2.ddl -text
+tools/testfiles/tintsattrs.h5 -text svneol=unset#application/x-hdf
+tools/testfiles/tlarge_objname.h5 -text
+tools/testfiles/tldouble.h5 -text
+tools/testfiles/tldouble_scalar.h5 -text
+tools/testfiles/tlonglinks.h5 -text
+tools/testfiles/tloop.h5 -text
+tools/testfiles/tloop2.h5 -text
+tools/testfiles/tmany.h5 -text
+tools/testfiles/tmulti-b.h5 -text
+tools/testfiles/tmulti-g.h5 -text svneol=unset#application/octet-stream
+tools/testfiles/tmulti-l.h5 -text
+tools/testfiles/tmulti-o.h5 -text
+tools/testfiles/tmulti-r.h5 -text
+tools/testfiles/tmulti-s.h5 -text
+tools/testfiles/tname-amp.h5 -text
+tools/testfiles/tname-apos.h5 -text
+tools/testfiles/tname-gt.h5 -text
+tools/testfiles/tname-lt.h5 -text
+tools/testfiles/tname-quot.h5 -text
+tools/testfiles/tname-sp.h5 -text
+tools/testfiles/tnamed_dtype_attr.h5 -text
+tools/testfiles/tnestedcmpddt.h5 -text
+tools/testfiles/tnestedcomp.h5 -text
+tools/testfiles/tno-subset.h5 -text
+tools/testfiles/tnodata.h5 -text
+tools/testfiles/tnullspace.h5 -text
+tools/testfiles/tobjref.h5 -text
+tools/testfiles/topaque.h5 -text
+tools/testfiles/torderattr.h5 -text
+tools/testfiles/tordergr.h5 -text
+tools/testfiles/tref-escapes-at.h5 -text
+tools/testfiles/tref-escapes.h5 -text
+tools/testfiles/tref.h5 -text
+tools/testfiles/tsaf.h5 -text
+tools/testfiles/tscalarattrintsize.h5 -text
+tools/testfiles/tscalarintattrsize.h5 -text svneol=unset#application/x-hdf
+tools/testfiles/tscalarintsize.h5 -text
+tools/testfiles/tscalarstring.h5 -text
+tools/testfiles/tslink.h5 -text
+tools/testfiles/tsoftlinks.h5 -text
+tools/testfiles/tsplit_file-m.h5 -text
+tools/testfiles/tsplit_file-r.h5 -text
+tools/testfiles/tstr.h5 -text
+tools/testfiles/tstr2.h5 -text
+tools/testfiles/tstr3.h5 -text
+tools/testfiles/tstring-at.h5 -text
+tools/testfiles/tstring.ddl -text svneol=unset#application/octet-stream
+tools/testfiles/tstring.h5 -text
+tools/testfiles/tudlink.h5 -text
+tools/testfiles/tvldtypes1.h5 -text
+tools/testfiles/tvldtypes2.h5 -text
+tools/testfiles/tvldtypes3.h5 -text
+tools/testfiles/tvldtypes4.h5 -text
+tools/testfiles/tvldtypes5.h5 -text
+tools/testfiles/tvlenstr_array.ddl -text
+tools/testfiles/tvlenstr_array.h5 -text svneol=unset#application/x-hdf
+tools/testfiles/tvlstr.h5 -text
+tools/testfiles/tvms.h5 -text
+tools/testfiles/vds/1_a.h5 -text svneol=unset#application/x-hdf
+tools/testfiles/vds/1_b.h5 -text svneol=unset#application/x-hdf
+tools/testfiles/vds/1_c.h5 -text svneol=unset#application/x-hdf
+tools/testfiles/vds/1_d.h5 -text svneol=unset#application/x-hdf
+tools/testfiles/vds/1_e.h5 -text svneol=unset#application/x-hdf
+tools/testfiles/vds/1_f.h5 -text svneol=unset#application/x-hdf
+tools/testfiles/vds/1_vds.h5 -text svneol=unset#application/x-hdf
+tools/testfiles/vds/2_a.h5 -text svneol=unset#application/x-hdf
+tools/testfiles/vds/2_b.h5 -text svneol=unset#application/x-hdf
+tools/testfiles/vds/2_c.h5 -text svneol=unset#application/x-hdf
+tools/testfiles/vds/2_d.h5 -text svneol=unset#application/x-hdf
+tools/testfiles/vds/2_e.h5 -text svneol=unset#application/x-hdf
+tools/testfiles/vds/2_vds.h5 -text svneol=unset#application/x-hdf
+tools/testfiles/vds/3_1_vds.h5 -text svneol=unset#application/x-hdf
+tools/testfiles/vds/3_2_vds.h5 -text svneol=unset#application/x-hdf
+tools/testfiles/vds/4_0.h5 -text svneol=unset#application/x-hdf
+tools/testfiles/vds/4_1.h5 -text svneol=unset#application/x-hdf
+tools/testfiles/vds/4_2.h5 -text svneol=unset#application/x-hdf
+tools/testfiles/vds/4_vds.h5 -text svneol=unset#application/x-hdf
+tools/testfiles/vds/5_a.h5 -text svneol=unset#application/x-hdf
+tools/testfiles/vds/5_b.h5 -text svneol=unset#application/x-hdf
+tools/testfiles/vds/5_c.h5 -text svneol=unset#application/x-hdf
+tools/testfiles/vds/5_vds.h5 -text svneol=unset#application/x-hdf
+tools/testfiles/vds/a.h5 -text svneol=unset#application/x-hdf
+tools/testfiles/vds/b.h5 -text svneol=unset#application/x-hdf
+tools/testfiles/vds/c.h5 -text svneol=unset#application/x-hdf
+tools/testfiles/vds/d.h5 -text svneol=unset#application/x-hdf
+tools/testfiles/vds/f-0.h5 -text svneol=unset#application/x-hdf
+tools/testfiles/vds/f-3.h5 -text svneol=unset#application/x-hdf
+tools/testfiles/vds/vds-eiger.h5 -text svneol=unset#application/x-hdf
+tools/testfiles/vds/vds-first.ddl -text
+tools/testfiles/vds/vds-gap1.ddl -text
+tools/testfiles/vds/vds-gap2.ddl -text
+tools/testfiles/vds/vds-percival-unlim-maxmin.h5 -text svneol=unset#application/x-hdf
+tools/testfiles/vds/vds_layout-eiger.ddl -text
+tools/testfiles/vds/vds_layout-maxmin.ddl -text
+tools/testfiles/zerodim.h5 -text
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 0000000..bd56708
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1,11 @@
+# Lines starting with '#' are comments.
+# Each line is a file pattern followed by one or more owners.
+
+# These owners will be the default owners for everything in the repo.
+* @lrknox @derobins @byrnHDF @fortnern @jhendersonHDF @qkoziol @vchoi-hdfgroup @bmribler @raylu-hdf
+
+# Order is important. The last matching pattern has the most precedence.
+# So if a pull request only touches javascript files, only these owners
+# will be requested to review.
+/fortran/         @brtnfld
+/java/            @jhendersonHDF @byrnHDF @derobins
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 0000000..7c4daaf
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+custom: "https://hdfgroup.org/about-us/donate-to-the-hdf-group/"
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..ee1a73b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,25 @@
+---
+name: Bug report
+about: Report a problem with HDF5
+title: "[BUG]"
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Platform (please complete the following information)**
+ - HDF5 version (if building from a maintenance branch, please include the commit hash)
+ - OS and version
+ - Compiler and version
+ - Build system (e.g. CMake, Autotools) and version
+ - Any configure options you specified
+ - MPI library and version (parallel HDF5)
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
new file mode 100644
index 0000000..3674881
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an improvement to HDF5
+title: "[Feature Request]"
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md
new file mode 100644
index 0000000..87e6e08
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md
@@ -0,0 +1,8 @@
+## Describe your changes
+
+## Issue ticket number (GitHub or JIRA)
+
+## Checklist before requesting a review
+- [ ] My code conforms to the guidelines in CONTRIBUTING.md
+- [ ] I made an entry in release_docs/RELEASE.txt (bug fixes, new features)
+- [ ] I added a test (bug fixes, new features)
diff --git a/.github/workflows/clang-format-check.yml b/.github/workflows/clang-format-check.yml
new file mode 100644
index 0000000..e8251f2
--- /dev/null
+++ b/.github/workflows/clang-format-check.yml
@@ -0,0 +1,18 @@
+name: clang-format Check
+on:
+  pull_request:
+jobs:
+  formatting-check:
+    name: Formatting Check
+    runs-on: ubuntu-latest
+    if: "!contains(github.event.head_commit.message, 'skip-ci')"
+    steps:
+    - uses: actions/checkout@v3
+    - name: Run clang-format style check for C and Java programs.
+      uses: DoozyX/clang-format-lint-action@v0.13
+      with:
+        source: '.'
+        extensions: 'c,h,cpp,hpp,java'
+        clangFormatVersion: 13
+        style: file
+        exclude: './config ./hl/src/H5LTanalyze.c ./hl/src/H5LTparse.c ./hl/src/H5LTparse.h ./src/H5Epubgen.h ./src/H5Einit.h ./src/H5Eterm.h ./src/H5Edefin.h ./src/H5version.h ./src/H5overflow.h'
diff --git a/.github/workflows/clang-format-fix.yml b/.github/workflows/clang-format-fix.yml
new file mode 100644
index 0000000..c1110cf
--- /dev/null
+++ b/.github/workflows/clang-format-fix.yml
@@ -0,0 +1,25 @@
+name: clang-format Check
+on: 
+  workflow_dispatch:
+  push:
+jobs:
+  formatting-check:
+    name: Formatting Check
+    runs-on: ubuntu-latest
+    if: "!contains(github.event.head_commit.message, 'skip-ci')"
+    steps:
+    - uses: actions/checkout@v3
+    - name: Run clang-format style check for C and Java programs.
+      uses: DoozyX/clang-format-lint-action@v0.13
+      with:
+        source: '.'
+        extensions: 'c,h,cpp,hpp,java'
+        clangFormatVersion: 13
+        inplace: True
+        style: file
+        exclude: './config ./hl/src/H5LTanalyze.c ./hl/src/H5LTparse.c ./hl/src/H5LTparse.h ./src/H5Epubgen.h ./src/H5Einit.h ./src/H5Eterm.h ./src/H5Edefin.h ./src/H5version.h ./src/H5overflow.h'
+    - uses: EndBug/add-and-commit@v7
+      with:
+          author_name: github-actions
+          author_email: 41898282+github-actions[bot]@users.noreply.github.com
+          message: 'Committing clang-format changes'
diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml
new file mode 100644
index 0000000..74f193a
--- /dev/null
+++ b/.github/workflows/codespell.yml
@@ -0,0 +1,15 @@
+# GitHub Action to automate the identification of common misspellings in text files
+# https://github.com/codespell-project/codespell
+# https://github.com/codespell-project/actions-codespell
+name: codespell
+on: [push, pull_request]
+jobs:
+  codespell:
+    name: Check for spelling errors
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: codespell-project/actions-codespell@master
+        with:
+          skip: ./bin/trace,./hl/tools/h5watch/h5watch.c,./tools/test/h5jam/tellub.c,./config/sanitizer/LICENSE,./tools/test/h5repack/testfiles/*.dat
+          ignore_words_list: isnt,inout,nd,parms,parm,ba,offsetP,ser,ois,had,fiter,fo,clude,refere,minnum,offsetp,creat,ans:,eiter,lastr,ans,isn't,ifset,sur,trun,dne,tthe,hda,filname,te,htmp,minnum,ake,gord,numer,ro,oce
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 0000000..a313179
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,484 @@
+name: hdf5 dev CI
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+on:
+  workflow_dispatch:
+  push:
+  pull_request:
+    branches: [ develop, hdf5_1_14, hdf5_1_12, hdf5_1_10, hdf5_1_8 ]
+    paths-ignore:
+      - '.github/CODEOWNERS'
+      - '.github/FUNDING.yml'
+      - 'doc/**'
+      - 'release_docs/**'
+      - 'ACKNOWLEDGEMENTS'
+      - 'COPYING**'
+      - '**.md'
+    
+# A workflow run is made up of one or more jobs that can run sequentially or
+# in parallel. We just have one job, but the matrix items defined below will
+# run in parallel.
+jobs:
+
+  # A workflow that builds the library and runs all the tests
+  build_and_test:
+
+    strategy:
+
+      # The current matrix has three dimensions:
+      #
+      # * config name
+      # * thread-safety on/off
+      # * release vs. debug build
+      #
+      # Most configuration information is added via the 'include' mechanism,
+      # which will append the key-value pairs in the configuration where the
+      # names match.
+
+      matrix:
+
+        name:
+          - "Windows MSVC CMake"
+          - "Ubuntu gcc CMake"
+          - "Ubuntu gcc Autotools"
+          - "Ubuntu gcc Autotools parallel (build only)"
+          - "MacOS Clang CMake"
+
+        thread_safety:
+          - enabled: true
+            text: " TS"
+          - enabled: false
+            text: ""
+
+        build_mode:
+          - text: " REL"
+            cmake: "Release"
+            autotools: "production"
+          - text: " DBG"
+            cmake: "Debug"
+            autotools: "debug"
+
+        # This is where we list the bulk of the options for each configuration.
+        # The key-value pair values are usually appropriate for being CMake or
+        # Autotools configure values, so be aware of that.
+
+        include:
+
+          # Windows w/ MSVC + CMake
+          #
+          # No Fortran, parallel, or VFDs that rely on POSIX things
+          - name: "Windows MSVC CMake"
+            os: windows-2022
+            toolchain: ""
+            cpp: ON
+            fortran: OFF
+            java: ON
+            parallel: OFF
+            mirror_vfd: OFF
+            direct_vfd: OFF
+            generator: "-G \"Visual Studio 17 2022\" -A x64"
+            run_tests: true
+
+          # Linux (Ubuntu) w/ gcc + CMake
+          #
+          # We might think about adding Clang, but MacOS already tests that
+          # so it's not critical
+          - name: "Ubuntu gcc CMake"
+            os: ubuntu-latest
+            cpp: ON
+            fortran: ON
+            java: ON
+            parallel: OFF
+            mirror_vfd: ON
+            direct_vfd: ON
+            toolchain: "config/toolchain/GCC.cmake"
+            generator: "-G Ninja"
+            run_tests: true
+
+          # Linux (Ubuntu) w/ gcc + Autotools
+          #
+          # Keep this identical to the CMake configs. Note the difference in
+          # the values.
+          - name: "Ubuntu gcc Autotools"
+            os: ubuntu-latest
+            cpp: enable
+            fortran: enable
+            java: enable
+            parallel: disable
+            mirror_vfd: enable
+            direct_vfd: enable
+            deprec_sym: enable
+            default_api: v114
+            toolchain: ""
+            generator: "autogen"
+            flags: ""
+            run_tests: true
+
+          # Parallel Linux (Ubuntu) w/ gcc + Autotools
+          #
+          # The GitHub runners are inadequate for running parallel HDF5 tests,
+          # so we catch most issues in daily testing. What we have here is just
+          # a compile check to make sure nothing obvious is broken.
+          - name: "Ubuntu gcc Autotools parallel (build only)"
+            os: ubuntu-latest
+            cpp: disable
+            fortran: enable
+            java: disable
+            parallel: enable
+            mirror_vfd: disable
+            direct_vfd: disable
+            deprec_sym: enable
+            default_api: v114
+            toolchain: ""
+            generator: "autogen"
+            flags: "CC=mpicc"
+            run_tests: false
+
+          # MacOS w/ Clang + CMake
+          #
+          # We could also build with the Autotools via brew installing them,
+          # but that seems unnecessary
+          - name: "MacOS Clang CMake"
+            os: macos-11
+            cpp: ON
+            fortran: OFF
+            java: ON
+            parallel: OFF
+            mirror_vfd: ON
+            direct_vfd: OFF
+            toolchain: "config/toolchain/clang.cmake"
+            generator: "-G Ninja"
+            run_tests: true
+
+
+          #
+          # SPECIAL AUTOTOOLS BUILDS
+          #
+          # These do not run tests and are not built into the matrix and instead
+          # become NEW configs as their name would clobber one of the matrix
+          # names (so make sure the names are UNIQUE).
+          #
+
+          - name: "Ubuntu gcc Autotools v1.6 default API (build only)"
+            os: ubuntu-latest
+            cpp: enable
+            fortran: enable
+            java: enable
+            parallel: disable
+            mirror_vfd: enable
+            direct_vfd: enable
+            deprec_sym: enable
+            default_api: v16
+            toolchain: ""
+            generator: "autogen"
+            flags: ""
+            run_tests: false
+            thread_safety:
+              enabled: false
+              text: ""
+            build_mode:
+              text: " DBG"
+              cmake: "Debug"
+              autotools: "debug"
+
+          - name: "Ubuntu gcc Autotools v1.8 default API (build only)"
+            os: ubuntu-latest
+            cpp: enable
+            fortran: enable
+            java: enable
+            parallel: disable
+            mirror_vfd: enable
+            direct_vfd: enable
+            deprec_sym: enable
+            default_api: v18
+            toolchain: ""
+            generator: "autogen"
+            flags: ""
+            run_tests: false
+            thread_safety:
+              enabled: false
+              text: ""
+            build_mode:
+              text: " DBG"
+              cmake: "Debug"
+              autotools: "debug"
+
+          - name: "Ubuntu gcc Autotools v1.10 default API (build only)"
+            os: ubuntu-latest
+            cpp: enable
+            fortran: enable
+            java: enable
+            parallel: disable
+            mirror_vfd: enable
+            direct_vfd: enable
+            deprec_sym: enable
+            default_api: v110
+            toolchain: ""
+            generator: "autogen"
+            flags: ""
+            run_tests: false
+            thread_safety:
+              enabled: false
+              text: ""
+            build_mode:
+              text: " DBG"
+              cmake: "Debug"
+              autotools: "debug"
+
+          - name: "Ubuntu gcc Autotools v1.12 default API (build only)"
+            os: ubuntu-latest
+            cpp: enable
+            fortran: enable
+            java: enable
+            parallel: disable
+            mirror_vfd: enable
+            direct_vfd: enable
+            deprec_sym: enable
+            default_api: v112
+            toolchain: ""
+            generator: "autogen"
+            flags: ""
+            run_tests: false
+            thread_safety:
+              enabled: false
+              text: ""
+            build_mode:
+              text: " DBG"
+              cmake: "Debug"
+              autotools: "debug"
+
+          - name: "Ubuntu gcc Autotools v1.14 default API (build only)"
+            os: ubuntu-latest
+            cpp: enable
+            fortran: enable
+            java: enable
+            parallel: disable
+            mirror_vfd: enable
+            direct_vfd: enable
+            deprec_sym: enable
+            default_api: v114
+            toolchain: ""
+            generator: "autogen"
+            flags: ""
+            run_tests: false
+            thread_safety:
+              enabled: false
+              text: ""
+            build_mode:
+              text: " DBG"
+              cmake: "Debug"
+              autotools: "debug"
+
+          - name: "Ubuntu gcc Autotools no deprecated symbols (build only)"
+            os: ubuntu-latest
+            cpp: enable
+            fortran: enable
+            java: enable
+            parallel: disable
+            mirror_vfd: enable
+            direct_vfd: enable
+            deprec_sym: disable
+            default_api: default
+            toolchain: ""
+            generator: "autogen"
+            flags: ""
+            run_tests: false
+            thread_safety:
+              enabled: false
+              text: ""
+            build_mode:
+              text: " DBG"
+              cmake: "Debug"
+              autotools: "debug"
+
+          - name: "Ubuntu gcc Autotools -Werror (build only)"
+            os: ubuntu-latest
+            cpp: enable
+            fortran: disable
+            java: disable
+            parallel: disable
+            mirror_vfd: disable
+            direct_vfd: enable
+            deprec_sym: enable
+            default_api: v114
+            toolchain: ""
+            generator: "autogen"
+            flags: "CFLAGS=-Werror"
+            run_tests: false
+            thread_safety:
+              enabled: false
+              text: ""
+            build_mode:
+              text: " DBG"
+              cmake: "Debug"
+              autotools: "debug"
+
+          - name: "Ubuntu gcc Autotools -Werror (build only)"
+            os: ubuntu-latest
+            cpp: enable
+            fortran: disable
+            java: disable
+            parallel: disable
+            mirror_vfd: disable
+            direct_vfd: enable
+            deprec_sym: enable
+            default_api: v114
+            toolchain: ""
+            generator: "autogen"
+            flags: "CFLAGS=-Werror"
+            run_tests: false
+            thread_safety:
+              enabled: false
+              text: ""
+            build_mode:
+              text: " REL"
+              cmake: "Release"
+              autotools: "production"
+
+    # Sets the job's name from the properties
+    name: "${{ matrix.name }}${{ matrix.build_mode.text }}${{ matrix.thread_safety.text }}"
+
+    # Don't run the action if the commit message says to skip CI
+    if: "!contains(github.event.head_commit.message, 'skip-ci')"
+
+    # The type of runner that the job will run on
+    runs-on: ${{ matrix.os }}
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+
+      #
+      # SETUP
+      #
+
+      #Useful for debugging
+      - name: Dump matrix context
+        run: echo '${{ toJSON(matrix) }}'
+
+      - name: Install CMake Dependencies (Linux)
+        run: sudo apt-get install ninja-build
+        if: matrix.os == 'ubuntu-latest'
+
+      - name: Install Autotools Dependencies (Linux, serial)
+        run: |
+           sudo apt update
+           sudo apt install automake autoconf libtool libtool-bin
+           sudo apt install gcc-11 g++-11 gfortran-11
+           echo "CC=gcc-11" >> $GITHUB_ENV
+           echo "CXX=g++-11" >> $GITHUB_ENV
+           echo "FC=gfortran-11" >> $GITHUB_ENV
+        if: (matrix.generator == 'autogen') && (matrix.parallel != 'enable')
+
+      - name: Install Autotools Dependencies (Linux, parallel)
+        run: |
+           sudo apt update
+           sudo apt install automake autoconf libtool libtool-bin
+           sudo apt install openmpi-bin openmpi-common mpi-default-dev
+           echo "CC=mpicc" >> $GITHUB_ENV
+           echo "FC=mpif90" >> $GITHUB_ENV
+        if: (matrix.generator == 'autogen') && (matrix.parallel == 'enable')
+
+      - name: Install Dependencies (Windows)
+        run: choco install ninja
+        if: matrix.os == 'windows-latest'
+
+      - name: Install Dependencies (macOS)
+        run: brew install ninja
+        if: matrix.os == 'macos-11'
+
+      - name: Set environment for MSVC (Windows)
+        run: |
+          # Set these environment variables so CMake picks the correct compiler
+          echo "CXX=cl.exe" >> $GITHUB_ENV
+          echo "CC=cl.exe" >> $GITHUB_ENV
+        if:  matrix.os == 'windows-latest'
+    
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - name: Get Sources
+        uses: actions/checkout@v3
+
+      #
+      # AUTOTOOLS CONFIGURE
+      #
+
+      - name: Autotools Configure
+        run: |
+          sh ./autogen.sh
+          mkdir "${{ runner.workspace }}/build"
+          cd "${{ runner.workspace }}/build"
+          ${{ matrix.flags }} $GITHUB_WORKSPACE/configure --enable-build-mode=${{ matrix.build_mode.autotools }} --${{ matrix.deprec_sym }}-deprecated-symbols --with-default-api-version=${{ matrix.default_api }} --enable-shared --${{ matrix.parallel }}-parallel --${{ matrix.cpp }}-cxx --${{ matrix.fortran }}-fortran --${{ matrix.java }}-java --${{ matrix.mirror_vfd }}-mirror-vfd --${{ matrix.direct_vfd }}-direct-vfd
+        shell: bash
+        if: (matrix.generator == 'autogen') && (! matrix.thread_safe.enabled)
+
+      - name: Autotools Configure (Thread-Safe)
+        run: |
+          sh ./autogen.sh
+          mkdir "${{ runner.workspace }}/build"
+          cd "${{ runner.workspace }}/build"
+          ${{ matrix.flags }} $GITHUB_WORKSPACE/configure --enable-build-mode=${{ matrix.build_mode.autotools }} --enable-shared --enable-threadsafe --disable-hl --${{ matrix.parallel }}-parallel --${{ matrix.mirror_vfd }}-mirror-vfd --${{ matrix.direct_vfd }}-direct-vfd
+        shell: bash
+        if: (matrix.generator == 'autogen') && (matrix.thread_safe.enabled)
+
+      #
+      # CMAKE CONFIGURE
+      #
+
+      - name: CMake Configure
+        run: |
+          mkdir "${{ runner.workspace }}/build"
+          cd "${{ runner.workspace }}/build"
+          cmake ${{ matrix.generator }} -DCMAKE_BUILD_TYPE=${{ matrix.build_mode.cmake }} -DCMAKE_TOOLCHAIN_FILE=${{ matrix.toolchain }} -DBUILD_SHARED_LIBS=ON -DHDF5_ENABLE_ALL_WARNINGS=ON -DHDF5_ENABLE_PARALLEL:BOOL=${{ matrix.parallel }} -DHDF5_BUILD_CPP_LIB:BOOL=${{ matrix.cpp }} -DHDF5_BUILD_FORTRAN=${{ matrix.fortran }} -DHDF5_BUILD_JAVA=${{ matrix.java }} -DHDF5_ENABLE_MIRROR_VFD:BOOL=${{ matrix.mirror_vfd }} -DHDF5_ENABLE_DIRECT_VFD:BOOL=${{ matrix.direct_vfd }} $GITHUB_WORKSPACE
+        shell: bash
+        if: (matrix.generator != 'autogen') && (! matrix.thread_safe.enabled)
+
+
+      - name: CMake Configure (Thread-Safe)
+        run: |
+          mkdir "${{ runner.workspace }}/build"
+          cd "${{ runner.workspace }}/build"
+          cmake ${{ matrix.generator }} -DCMAKE_BUILD_TYPE=${{ matrix.build_mode.cmake }} -DCMAKE_TOOLCHAIN_FILE=${{ matrix.toolchain }} -DBUILD_SHARED_LIBS=ON -DHDF5_ENABLE_ALL_WARNINGS=ON -DHDF5_ENABLE_THREADSAFE:BOOL=ON -DHDF5_ENABLE_PARALLEL:BOOL=${{ matrix.parallel }} -DHDF5_BUILD_HL_LIB:BOOL=OFF -DHDF5_ENABLE_MIRROR_VFD:BOOL=${{ matrix.mirror_vfd }} -DHDF5_ENABLE_DIRECT_VFD:BOOL=${{ matrix.direct_vfd }} $GITHUB_WORKSPACE
+        shell: bash
+        if: (matrix.generator != 'autogen') && (matrix.thread_safe.enabled)
+
+      #
+      # BUILD
+      #
+
+      - name: Autotools Build
+        run: make
+        working-directory: ${{ runner.workspace }}/build
+        if: matrix.generator == 'autogen'
+
+      - name: CMake Build
+        run: cmake --build . --config ${{ matrix.build_mode.cmake }}
+        working-directory: ${{ runner.workspace }}/build
+        if: matrix.generator != 'autogen'
+
+      #
+      # RUN TESTS
+      #
+
+      - name: Autotools Run Tests
+        run: make check
+        working-directory: ${{ runner.workspace }}/build
+        if: (matrix.generator == 'autogen') && (matrix.run_tests)
+
+      - name: CMake Run Tests
+        run: ctest --build . -C ${{ matrix.build_mode.cmake }} -V
+        working-directory: ${{ runner.workspace }}/build
+        # Skip Debug MSVC while we investigate H5L Java test timeouts
+        if: (matrix.generator != 'autogen') && (matrix.run_tests) && ! ((matrix.name == 'Windows MSVC CMake') && (matrix.build_mode.cmake == 'Debug'))
+
+      #
+      # INSTALL (note that this runs even when we don't run the tests)
+      #
+
+      - name: Autotools Install
+        run: make install
+        working-directory: ${{ runner.workspace }}/build
+        if: (matrix.generator == 'autogen')
+
+      - name: Autotools Verify Install
+        run: make check-install
+        working-directory: ${{ runner.workspace }}/build
+        if: (matrix.generator == 'autogen')
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..3caf16a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,43 @@
+# .gitignore file for HDF5
+
+# Makefile.in files
+**/Makefile.in
+
+# Java .classes files
+**/java/.classes
+
+# Backup files
+# Editor-specific extensions should go in your ~/.gitconfig, but we
+# include the standard Unix backup '~' extension since autoheader
+# backs up H5config.h.in when it creates a new one and the
+# extension is always '~'.
+**/*~
+
+# Other files, most of which are created by the Autotools though
+# some are created by scripts in bin/
+/aclocal.m4
+/autom4te.cache
+bin/compile
+bin/config.guess
+bin/config.sub
+bin/depcomp
+bin/install-sh
+bin/ltmain.sh
+bin/missing
+bin/test-driver
+/build*
+/configure
+m4/libtool.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
+m4/lt~obsolete.m4
+src/H5Edefin.h
+src/H5Einit.h
+src/H5Epubgen.h
+src/H5Eterm.h
+src/H5config.h.in
+src/H5overflow.h
+src/H5version.h
+
+/.classpath
diff --git a/.h5chkright.ini b/.h5chkright.ini
index 10daeaf..02d3cad 100644
--- a/.h5chkright.ini
+++ b/.h5chkright.ini
@@ -1,15 +1,12 @@
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 
 # Initialization files for the Copyright Checker, chkcopyright.
 # Each line is a keyword for action and the rest are values.
diff --git a/BRANCH.md b/BRANCH.md
new file mode 100644
index 0000000..8266d8f
--- /dev/null
+++ b/BRANCH.md
@@ -0,0 +1,9 @@
+# Architecture Documentation Branch
+
+The purpose of this branch is to store work-in-progress architecture
+documentation while it is being written. This documentation will live in
+`doc/arch` (at least temporarily) and will probably NOT be in Doxygen format.
+
+
+This branch can be deleted when the architecture documentation has been
+merged back to develop
diff --git a/CMakeFilters.cmake b/CMakeFilters.cmake
index 7050f87..15221bf 100644
--- a/CMakeFilters.cmake
+++ b/CMakeFilters.cmake
@@ -1,25 +1,53 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
+option (USE_LIBAEC "Use AEC library as SZip Filter" OFF)
+option (USE_LIBAEC_STATIC "Use static AEC library " OFF)
 
 include (ExternalProject)
-#option (HDF5_ALLOW_EXTERNAL_SUPPORT "Allow External Library Building (NO SVN TGZ)" "NO")
-set (HDF5_ALLOW_EXTERNAL_SUPPORT "NO" CACHE STRING "Allow External Library Building (NO SVN TGZ)")
-set_property (CACHE HDF5_ALLOW_EXTERNAL_SUPPORT PROPERTY STRINGS NO SVN TGZ)
-if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
-  option (ZLIB_USE_EXTERNAL "Use External Library Building for ZLIB" 1)
+include (FetchContent)
+
+#option (HDF5_ALLOW_EXTERNAL_SUPPORT "Allow External Library Building (NO GIT TGZ)" "NO")
+set (HDF5_ALLOW_EXTERNAL_SUPPORT "NO" CACHE STRING "Allow External Library Building (NO GIT TGZ)")
+set_property (CACHE HDF5_ALLOW_EXTERNAL_SUPPORT PROPERTY STRINGS NO GIT TGZ)
+if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
+  option (ZLIB_USE_EXTERNAL "Use External Library Building for HDF5_ZLIB" 1)
   option (SZIP_USE_EXTERNAL "Use External Library Building for SZIP" 1)
-  if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN")
-    set (ZLIB_URL ${ZLIB_SVN_URL} CACHE STRING "Path to zlib Subversion repository")
-    set (SZIP_URL ${SZIP_SVN_URL} CACHE STRING "Path to szip Subversion repository")
+  if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT")
+    set (ZLIB_URL ${ZLIB_GIT_URL} CACHE STRING "Path to zlib git repository")
+    set (ZLIB_BRANCH ${ZLIB_GIT_BRANCH})
+    set (SZIP_URL ${SZIP_GIT_URL} CACHE STRING "Path to szip git repository")
+    set (SZIP_BRANCH ${SZIP_GIT_BRANCH})
   elseif (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
     if (NOT TGZPATH)
       set (TGZPATH ${HDF5_SOURCE_DIR})
-    endif (NOT TGZPATH)
+    endif ()
     set (ZLIB_URL ${TGZPATH}/${ZLIB_TGZ_NAME})
+    if (NOT EXISTS "${ZLIB_URL}")
+      set (HDF5_ENABLE_Z_LIB_SUPPORT OFF CACHE BOOL "" FORCE)
+      message (VERBOSE "Filter ZLIB file ${ZLIB_URL} not found")
+    endif ()
     set (SZIP_URL ${TGZPATH}/${SZIP_TGZ_NAME})
-  else (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN")
+    if (USE_LIBAEC)
+      set (SZIP_URL ${TGZPATH}/${SZAEC_TGZ_NAME})
+    endif ()
+    if (NOT EXISTS "${SZIP_URL}")
+      set (HDF5_ENABLE_SZIP_SUPPORT OFF CACHE BOOL "" FORCE)
+      message (VERBOSE "Filter SZIP file ${SZIP_URL} not found")
+    endif ()
+  else ()
     set (ZLIB_USE_EXTERNAL 0)
     set (SZIP_USE_EXTERNAL 0)
-  endif (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN")
-endif (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
+  endif ()
+endif ()
 
 #-----------------------------------------------------------------------------
 # Option for ZLib support
@@ -28,14 +56,14 @@ option (HDF5_ENABLE_Z_LIB_SUPPORT "Enable Zlib Filters" OFF)
 if (HDF5_ENABLE_Z_LIB_SUPPORT)
   if (NOT H5_ZLIB_HEADER)
     if (NOT ZLIB_USE_EXTERNAL)
-      find_package (ZLIB NAMES ${ZLIB_PACKAGE_NAME}${HDF_PACKAGE_EXT})
+      find_package (ZLIB NAMES ${ZLIB_PACKAGE_NAME}${HDF_PACKAGE_EXT} COMPONENTS static shared)
       if (NOT ZLIB_FOUND)
         find_package (ZLIB) # Legacy find
         if (ZLIB_FOUND)
-          set (LINK_LIBS ${LINK_LIBS} ${ZLIB_LIBRARIES})
-        endif (ZLIB_FOUND)
-      endif (NOT ZLIB_FOUND)
-    endif (NOT ZLIB_USE_EXTERNAL)
+          set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${ZLIB_LIBRARIES})
+        endif ()
+      endif ()
+    endif ()
     if (ZLIB_FOUND)
       set (H5_HAVE_FILTER_DEFLATE 1)
       set (H5_HAVE_ZLIB_H 1)
@@ -43,30 +71,30 @@ if (HDF5_ENABLE_Z_LIB_SUPPORT)
       set (H5_ZLIB_HEADER "zlib.h")
       set (ZLIB_INCLUDE_DIR_GEN ${ZLIB_INCLUDE_DIR})
       set (ZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR})
-    else (ZLIB_FOUND)
-      if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
-        EXTERNAL_ZLIB_LIBRARY (${HDF5_ALLOW_EXTERNAL_SUPPORT} ${LIB_TYPE})
+    else ()
+      if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
+        EXTERNAL_ZLIB_LIBRARY (${HDF5_ALLOW_EXTERNAL_SUPPORT})
         set (H5_HAVE_FILTER_DEFLATE 1)
         set (H5_HAVE_ZLIB_H 1)
         set (H5_HAVE_LIBZ 1)
-        message (STATUS "Filter ZLIB is built")
-      else (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
+        message (VERBOSE "Filter HDF5_ZLIB is built")
+      else ()
         message (FATAL_ERROR " ZLib is Required for ZLib support in HDF5")
-      endif (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
-    endif (ZLIB_FOUND)
-  else (NOT H5_ZLIB_HEADER)
+      endif ()
+    endif ()
+  else ()
     # This project is being called from within another and ZLib is already configured
     set (H5_HAVE_FILTER_DEFLATE 1)
     set (H5_HAVE_ZLIB_H 1)
     set (H5_HAVE_LIBZ 1)
-  endif (NOT H5_ZLIB_HEADER)
+  endif ()
   if (H5_HAVE_FILTER_DEFLATE)
     set (EXTERNAL_FILTERS "${EXTERNAL_FILTERS} DEFLATE")
-  endif (H5_HAVE_FILTER_DEFLATE)
-  set (LINK_LIBS ${LINK_LIBS} ${ZLIB_LIBRARIES})
+  endif ()
+  set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${ZLIB_STATIC_LIBRARY})
   INCLUDE_DIRECTORIES (${ZLIB_INCLUDE_DIRS})
-  message (STATUS "Filter ZLIB is ON")
-endif (HDF5_ENABLE_Z_LIB_SUPPORT)
+  message (VERBOSE "Filter HDF5_ZLIB is ON")
+endif ()
 
 #-----------------------------------------------------------------------------
 # Option for SzLib support
@@ -75,39 +103,56 @@ option (HDF5_ENABLE_SZIP_SUPPORT "Use SZip Filter" OFF)
 if (HDF5_ENABLE_SZIP_SUPPORT)
   option (HDF5_ENABLE_SZIP_ENCODING "Use SZip Encoding" OFF)
   if (NOT SZIP_USE_EXTERNAL)
-    find_package (SZIP NAMES ${SZIP_PACKAGE_NAME}${HDF_PACKAGE_EXT})
-    if (NOT SZIP_FOUND)
-      find_package (SZIP) # Legacy find
+    set(SZIP_FOUND FALSE)
+    if (USE_LIBAEC)
+      set(libaec_USE_STATIC_LIBS ${USE_LIBAEC_STATIC})
+      find_package (libaec 1.0.5 CONFIG)
       if (SZIP_FOUND)
-        set (LINK_LIBS ${LINK_LIBS} ${SZIP_LIBRARIES})
-      endif (SZIP_FOUND)
-    endif (NOT SZIP_FOUND)
-  endif (NOT SZIP_USE_EXTERNAL)
+        set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${SZIP_LIBRARIES})
+      endif ()
+    endif ()
+
+    if (NOT SZIP_FOUND)
+      find_package (SZIP NAMES ${SZIP_PACKAGE_NAME}${HDF_PACKAGE_EXT} COMPONENTS static shared)
+      if (NOT SZIP_FOUND)
+        find_package (SZIP) # Legacy find
+        if (SZIP_FOUND)
+          set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${SZIP_LIBRARIES})
+        endif ()
+      endif ()
+    endif ()
+  endif ()
   if (SZIP_FOUND)
     set (H5_HAVE_FILTER_SZIP 1)
     set (H5_HAVE_SZLIB_H 1)
     set (H5_HAVE_LIBSZ 1)
     set (SZIP_INCLUDE_DIR_GEN ${SZIP_INCLUDE_DIR})
-    set (SZIP_INCLUDE_DIRS ${SZIP_INCLUDE_DIR})
-  else (SZIP_FOUND)
-    if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
-      EXTERNAL_SZIP_LIBRARY (${HDF5_ALLOW_EXTERNAL_SUPPORT} ${LIB_TYPE} ${HDF5_ENABLE_SZIP_ENCODING})
+    set (SZIP_INCLUDE_DIRS ${SZIP_INCLUDE_DIRS} ${SZIP_INCLUDE_DIR})
+  else ()
+    if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
+      EXTERNAL_SZIP_LIBRARY (${HDF5_ALLOW_EXTERNAL_SUPPORT} ${HDF5_ENABLE_SZIP_ENCODING})
       set (H5_HAVE_FILTER_SZIP 1)
       set (H5_HAVE_SZLIB_H 1)
       set (H5_HAVE_LIBSZ 1)
-      message (STATUS "Filter SZIP is built")
-    else (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
+      message (VERBOSE "Filter SZIP is built")
+      if (USE_LIBAEC)
+        message (VERBOSE "... with library AEC")
+        set (SZIP_PACKAGE_NAME ${LIBAEC_PACKAGE_NAME})
+      else ()
+        set (SZIP_PACKAGE_NAME ${SZIP_PACKAGE_NAME})
+      endif ()
+    else ()
       message (FATAL_ERROR "SZIP is Required for SZIP support in HDF5")
-    endif (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
-  endif (SZIP_FOUND)
-  set (LINK_LIBS ${LINK_LIBS} ${SZIP_LIBRARIES})
+    endif ()
+  endif ()
+  set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${SZIP_STATIC_LIBRARY})
   INCLUDE_DIRECTORIES (${SZIP_INCLUDE_DIRS})
-  message (STATUS "Filter SZIP is ON")
+  message (VERBOSE "Filter SZIP is ON")
   if (H5_HAVE_FILTER_SZIP)
     set (EXTERNAL_FILTERS "${EXTERNAL_FILTERS} DECODE")
-  endif (H5_HAVE_FILTER_SZIP)
+  endif ()
   if (HDF5_ENABLE_SZIP_ENCODING)
     set (H5_HAVE_SZIP_ENCODER 1)
     set (EXTERNAL_FILTERS "${EXTERNAL_FILTERS} ENCODE")
-  endif (HDF5_ENABLE_SZIP_ENCODING)
-endif (HDF5_ENABLE_SZIP_SUPPORT)
+  endif ()
+endif ()
diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake
index 0380adc..f643afc 100644
--- a/CMakeInstallation.cmake
+++ b/CMakeInstallation.cmake
@@ -1,3 +1,14 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
 include (CMakePackageConfigHelpers)
 
 #-----------------------------------------------------------------------------
@@ -8,49 +19,41 @@ if (WIN32)
   find_program (NSIS_EXECUTABLE NSIS.exe PATHS "$ENV{ProgramFiles}\\NSIS" "$ENV{ProgramFiles${PF_ENV_EXT}}\\NSIS")
   if(NOT CPACK_WIX_ROOT)
     file(TO_CMAKE_PATH "$ENV{WIX}" CPACK_WIX_ROOT)
-  endif()
+  endif ()
   find_program (WIX_EXECUTABLE candle  PATHS "${CPACK_WIX_ROOT}/bin")
-endif (WIN32)
+endif ()
 
-#-----------------------------------------------------------------------------
-# Add file(s) to CMake Install
-#-----------------------------------------------------------------------------
-if (NOT HDF5_INSTALL_NO_DEVELOPMENT)
-  install (
-      FILES ${PROJECT_BINARY_DIR}/H5pubconf.h
-      DESTINATION ${HDF5_INSTALL_INCLUDE_DIR}
-      COMPONENT headers
-  )
-endif (NOT HDF5_INSTALL_NO_DEVELOPMENT)
 
 #-----------------------------------------------------------------------------
 # Add Target(s) to CMake Install for import into other projects
 #-----------------------------------------------------------------------------
 if (NOT HDF5_EXTERNALLY_CONFIGURED)
-  install (
-      EXPORT ${HDF5_EXPORTED_TARGETS}
-      DESTINATION ${HDF5_INSTALL_CMAKE_DIR}
-      FILE ${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-targets.cmake
-      COMPONENT configinstall
-  )
-endif (NOT HDF5_EXTERNALLY_CONFIGURED)
+  if (HDF5_EXPORTED_TARGETS)
+    install (
+        EXPORT ${HDF5_EXPORTED_TARGETS}
+        DESTINATION ${HDF5_INSTALL_CMAKE_DIR}
+        FILE ${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-targets.cmake
+        NAMESPACE ${HDF_PACKAGE_NAMESPACE}
+        COMPONENT configinstall
+    )
+  endif ()
 
-#-----------------------------------------------------------------------------
-# Export all exported targets to the build tree for use by parent project
-#-----------------------------------------------------------------------------
-if (NOT HDF5_EXTERNALLY_CONFIGURED)
+  #-----------------------------------------------------------------------------
+  # Export all exported targets to the build tree for use by parent project
+  #-----------------------------------------------------------------------------
   export (
-      TARGETS ${HDF5_LIBRARIES_TO_EXPORT} ${HDF5_LIB_DEPENDENCIES}
+      TARGETS ${HDF5_LIBRARIES_TO_EXPORT} ${HDF5_LIB_DEPENDENCIES} ${HDF5_UTILS_TO_EXPORT}
       FILE ${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-targets.cmake
+      NAMESPACE ${HDF_PACKAGE_NAMESPACE}
   )
-endif (NOT HDF5_EXTERNALLY_CONFIGURED)
+endif ()
 
 #-----------------------------------------------------------------------------
 # Set includes needed for build
 #-----------------------------------------------------------------------------
 set (HDF5_INCLUDES_BUILD_TIME
-    ${HDF5_SRC_DIR} ${HDF5_CPP_SRC_DIR} ${HDF5_HL_SRC_DIR}
-    ${HDF5_TOOLS_SRC_DIR} ${HDF5_BINARY_DIR}
+    ${HDF5_SRC_INCLUDE_DIRS} ${HDF5_CPP_SRC_DIR} ${HDF5_HL_SRC_DIR}
+    ${HDF5_TOOLS_SRC_DIR} ${HDF5_SRC_BINARY_DIR}
 )
 
 #-----------------------------------------------------------------------------
@@ -75,21 +78,6 @@ configure_package_config_file (
 )
 
 #-----------------------------------------------------------------------------
-# Configure the FindHDF5.cmake file for the install directory
-#-----------------------------------------------------------------------------
-if (NOT HDF5_EXTERNALLY_CONFIGURED)
-  configure_file (
-      ${HDF_RESOURCES_DIR}/FindHDF5.cmake.in 
-      ${HDF5_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/FindHDF5${HDF_PACKAGE_EXT}.cmake @ONLY
-  )
-  install (
-      FILES ${HDF5_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/FindHDF5${HDF_PACKAGE_EXT}.cmake
-      DESTINATION ${HDF5_INSTALL_CMAKE_DIR}
-      COMPONENT configinstall
-  )
-endif (NOT HDF5_EXTERNALLY_CONFIGURED)
-
-#-----------------------------------------------------------------------------
 # Configure the hdf5-config.cmake file for the install directory
 #-----------------------------------------------------------------------------
 set (INCLUDE_INSTALL_DIR ${HDF5_INSTALL_INCLUDE_DIR})
@@ -108,70 +96,57 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED)
       DESTINATION ${HDF5_INSTALL_CMAKE_DIR}
       COMPONENT configinstall
   )
-endif (NOT HDF5_EXTERNALLY_CONFIGURED)
+endif ()
 
 #-----------------------------------------------------------------------------
 # Configure the hdf5-config-version .cmake file for the install directory
 #-----------------------------------------------------------------------------
 if (NOT HDF5_EXTERNALLY_CONFIGURED)
-  configure_file (
-      ${HDF_RESOURCES_DIR}/hdf5-config-version.cmake.in
-      ${HDF5_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-config-version.cmake @ONLY
+  write_basic_package_version_file (
+    "${HDF5_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-config-version.cmake"
+    VERSION ${HDF5_PACKAGE_VERSION}
+    COMPATIBILITY SameMinorVersion
   )
+  #configure_file (
+  #    ${HDF_RESOURCES_DIR}/hdf5-config-version.cmake.in
+  #    ${HDF5_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-config-version.cmake @ONLY
+  #)
   install (
       FILES ${HDF5_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-config-version.cmake
       DESTINATION ${HDF5_INSTALL_CMAKE_DIR}
       COMPONENT configinstall
   )
-endif (NOT HDF5_EXTERNALLY_CONFIGURED)
+endif ()
 
 #-----------------------------------------------------------------------------
 # Configure the libhdf5.settings file for the lib info
 #-----------------------------------------------------------------------------
 if (H5_WORDS_BIGENDIAN)
   set (BYTESEX big-endian)
-else (H5_WORDS_BIGENDIAN)
+else ()
   set (BYTESEX little-endian)
-endif (H5_WORDS_BIGENDIAN)
+endif ()
 configure_file (
-    ${HDF_RESOURCES_DIR}/libhdf5.settings.cmake.in 
-    ${HDF5_BINARY_DIR}/libhdf5.settings @ONLY
+    ${HDF_RESOURCES_DIR}/libhdf5.settings.cmake.in
+    ${HDF5_SRC_BINARY_DIR}/libhdf5.settings ESCAPE_QUOTES @ONLY
 )
 install (
-    FILES ${HDF5_BINARY_DIR}/libhdf5.settings
-    DESTINATION ${HDF5_INSTALL_CMAKE_DIR}
+    FILES ${HDF5_SRC_BINARY_DIR}/libhdf5.settings
+    DESTINATION ${HDF5_INSTALL_LIB_DIR}
     COMPONENT libraries
 )
 
 #-----------------------------------------------------------------------------
-# Create pkgconfig files
-#-----------------------------------------------------------------------------
-#foreach (libs ${LINK_LIBS})
-#  set (LIBS "${LIBS} -l${libs}")
-#endforeach (libs ${LINK_LIBS})
-#foreach (libs ${HDF5_LIBRARIES_TO_EXPORT})
-#  set (HDF5LIBS "${HDF5LIBS} -l${libs}")
-#endforeach (libs ${HDF5_LIBRARIES_TO_EXPORT})
-#configure_file (
-#    ${HDF_RESOURCES_DIR}/libhdf5.pc.in
-#    ${HDF5_BINARY_DIR}/CMakeFiles/libhdf5.pc @ONLY
-#)
-#install (
-#    FILES ${HDF5_BINARY_DIR}/CMakeFiles/libhdf5.pc
-#    DESTINATION ${HDF5_INSTALL_LIB_DIR}/pkgconfig
-#)
-
-#-----------------------------------------------------------------------------
-# Configure the HDF518_Examples.cmake file and the examples
+# Configure the HDF5_Examples.cmake file and the examples
 #-----------------------------------------------------------------------------
 option (HDF5_PACK_EXAMPLES  "Package the HDF5 Library Examples Compressed File" OFF)
 if (HDF5_PACK_EXAMPLES)
   configure_file (
-      ${HDF_RESOURCES_DIR}/HDF518_Examples.cmake.in 
-      ${HDF5_BINARY_DIR}/HDF518_Examples.cmake @ONLY
+      ${HDF_RESOURCES_DIR}/HDF5_Examples.cmake.in
+      ${HDF5_BINARY_DIR}/HDF5_Examples.cmake @ONLY
   )
   install (
-      FILES ${HDF5_BINARY_DIR}/HDF518_Examples.cmake
+      FILES ${HDF5_BINARY_DIR}/HDF5_Examples.cmake
       DESTINATION ${HDF5_INSTALL_DATA_DIR}
       COMPONENT hdfdocuments
   )
@@ -180,22 +155,34 @@ if (HDF5_PACK_EXAMPLES)
         COMMAND ${CMAKE_COMMAND} -E tar xzf ${HDF5_EXAMPLES_COMPRESSED_DIR}/${HDF5_EXAMPLES_COMPRESSED}
     )
     install (
-      DIRECTORY ${HDF5_BINARY_DIR}/HDF5Examples-0.1.1-Source
+      DIRECTORY ${HDF5_BINARY_DIR}/HDF5Examples
       DESTINATION ${HDF5_INSTALL_DATA_DIR}
-      USE_SOURCE_PERMISSIONS 
+      USE_SOURCE_PERMISSIONS
       COMPONENT hdfdocuments
     )
-    install (
-        FILES
-            ${HDF5_SOURCE_DIR}/release_docs/USING_CMake_Examples.txt
-        DESTINATION ${HDF5_INSTALL_DATA_DIR}
-        COMPONENT hdfdocuments
-    )
-  endif (EXISTS "${HDF5_EXAMPLES_COMPRESSED_DIR}/${HDF5_EXAMPLES_COMPRESSED}")
-endif (HDF5_PACK_EXAMPLES)
+  endif ()
+  install (
+      FILES
+          ${HDF5_SOURCE_DIR}/release_docs/USING_CMake_Examples.txt
+      DESTINATION ${HDF5_INSTALL_DATA_DIR}
+      COMPONENT hdfdocuments
+  )
+  install (
+      FILES
+          ${HDF_RESOURCES_DIR}/CTestScript.cmake
+      DESTINATION ${HDF5_INSTALL_DATA_DIR}
+      COMPONENT hdfdocuments
+  )
+  install (
+      FILES
+          ${HDF_RESOURCES_DIR}/HDF5_Examples_options.cmake
+      DESTINATION ${HDF5_INSTALL_DATA_DIR}
+      COMPONENT hdfdocuments
+  )
+endif ()
 
 #-----------------------------------------------------------------------------
-# Configure the README.txt file for the binary package
+# Configure the README.md file for the binary package
 #-----------------------------------------------------------------------------
 HDF_README_PROPERTIES(HDF5_BUILD_FORTRAN)
 
@@ -204,22 +191,20 @@ HDF_README_PROPERTIES(HDF5_BUILD_FORTRAN)
 #-----------------------------------------------------------------------------
 if (WIN32)
   configure_file (${HDF5_SOURCE_DIR}/COPYING ${HDF5_BINARY_DIR}/COPYING.txt @ONLY)
-endif (WIN32)
+endif ()
 
 #-----------------------------------------------------------------------------
 # Add Document File(s) to CMake Install
 #-----------------------------------------------------------------------------
 if (NOT HDF5_EXTERNALLY_CONFIGURED)
   install (
-      FILES
-          ${HDF5_SOURCE_DIR}/COPYING
+      FILES ${HDF5_SOURCE_DIR}/COPYING
       DESTINATION ${HDF5_INSTALL_DATA_DIR}
       COMPONENT hdfdocuments
   )
   if (EXISTS "${HDF5_SOURCE_DIR}/release_docs" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/release_docs")
     set (release_files
         ${HDF5_SOURCE_DIR}/release_docs/USING_HDF5_CMake.txt
-        ${HDF5_SOURCE_DIR}/release_docs/COPYING
         ${HDF5_SOURCE_DIR}/release_docs/RELEASE.txt
     )
     if (WIN32)
@@ -227,10 +212,11 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED)
           ${release_files}
           ${HDF5_SOURCE_DIR}/release_docs/USING_HDF5_VS.txt
       )
-    endif (WIN32)
+    endif ()
     if (HDF5_PACK_INSTALL_DOCS)
       set (release_files
           ${release_files}
+          ${HDF5_SOURCE_DIR}/release_docs/INSTALL_Warnings.txt
           ${HDF5_SOURCE_DIR}/release_docs/INSTALL_CMake.txt
           ${HDF5_SOURCE_DIR}/release_docs/HISTORY-1_8.txt
           ${HDF5_SOURCE_DIR}/release_docs/INSTALL
@@ -240,40 +226,27 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED)
             ${release_files}
             ${HDF5_SOURCE_DIR}/release_docs/INSTALL_Windows.txt
         )
-      endif (WIN32)
+      endif ()
       if (CYGWIN)
         set (release_files
             ${release_files}
             ${HDF5_SOURCE_DIR}/release_docs/INSTALL_Cygwin.txt
         )
-      endif (CYGWIN)
+      endif ()
       if (HDF5_ENABLE_PARALLEL)
         set (release_files
             ${release_files}
             ${HDF5_SOURCE_DIR}/release_docs/INSTALL_parallel
         )
-      endif (HDF5_ENABLE_PARALLEL)
-    endif (HDF5_PACK_INSTALL_DOCS)
+      endif ()
+    endif ()
     install (
         FILES ${release_files}
-        DESTINATION ${HDF5_INSTALL_DATA_DIR}
+        DESTINATION ${HDF5_INSTALL_DOC_DIR}
         COMPONENT hdfdocuments
     )
-  endif (EXISTS "${HDF5_SOURCE_DIR}/release_docs" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/release_docs")
-endif (NOT HDF5_EXTERNALLY_CONFIGURED)
-
-if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-  if (CMAKE_HOST_UNIX)
-    set (CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/HDF_Group/${HDF5_PACKAGE_NAME}/${HDF5_PACKAGE_VERSION}"
-      CACHE PATH "Install path prefix, prepended onto install directories." FORCE)
-  else (CMAKE_HOST_UNIX)
-    GetDefaultWindowsPrefixBase(CMAKE_GENERIC_PROGRAM_FILES)
-    set (CMAKE_INSTALL_PREFIX
-      "${CMAKE_GENERIC_PROGRAM_FILES}/HDF_Group/${HDF5_PACKAGE_NAME}/${HDF5_PACKAGE_VERSION}"
-      CACHE PATH "Install path prefix, prepended onto install directories." FORCE)
-    set (CMAKE_GENERIC_PROGRAM_FILES)
-  endif (CMAKE_HOST_UNIX)
-endif (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+  endif ()
+endif ()
 
 #-----------------------------------------------------------------------------
 # Set the cpack variables
@@ -283,28 +256,32 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES)
   set (CPACK_PACKAGE_NAME "${HDF5_PACKAGE_NAME}")
   if (CDASH_LOCAL)
     set (CPACK_PACKAGE_VERSION "${HDF5_PACKAGE_VERSION}")
-  else (CDASH_LOCAL)
+  else ()
     set (CPACK_PACKAGE_VERSION "${HDF5_PACKAGE_VERSION_STRING}")
-  endif (CDASH_LOCAL)
+  endif ()
   set (CPACK_PACKAGE_VERSION_MAJOR "${HDF5_PACKAGE_VERSION_MAJOR}")
   set (CPACK_PACKAGE_VERSION_MINOR "${HDF5_PACKAGE_VERSION_MINOR}")
   set (CPACK_PACKAGE_VERSION_PATCH "")
+  set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
   if (EXISTS "${HDF5_SOURCE_DIR}/release_docs")
     set (CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/release_docs/RELEASE.txt")
-    set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/release_docs/COPYING")
     set (CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/release_docs/RELEASE.txt")
-  endif (EXISTS "${HDF5_SOURCE_DIR}/release_docs")
+  endif ()
   set (CPACK_PACKAGE_RELOCATABLE TRUE)
-  set (CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_VENDOR}/${CPACK_PACKAGE_NAME}/${CPACK_PACKAGE_VERSION}")
-  set (CPACK_PACKAGE_ICON "${HDF_RESOURCES_EXT_DIR}/hdf.bmp")
-
-  set (CPACK_GENERATOR "TGZ") 
+  if (OVERRIDE_INSTALL_VERSION)
+    set (CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_VENDOR}/${CPACK_PACKAGE_NAME}/${OVERRIDE_INSTALL_VERSION}")
+  else ()
+    set (CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_VENDOR}/${CPACK_PACKAGE_NAME}/${CPACK_PACKAGE_VERSION}")
+  endif ()
+  set (CPACK_PACKAGE_ICON "${HDF_RESOURCES_DIR}/hdf.bmp")
+
+  set (CPACK_GENERATOR "TGZ")
   if (WIN32)
-    set (CPACK_GENERATOR "ZIP") 
+    set (CPACK_GENERATOR "ZIP")
 
-    if (NSIS_EXECUTABLE)    
-      list (APPEND CPACK_GENERATOR "NSIS") 
-    endif (NSIS_EXECUTABLE)    
+    if (NSIS_EXECUTABLE)
+      list (APPEND CPACK_GENERATOR "NSIS")
+    endif ()
     # Installers for 32- vs. 64-bit CMake:
     #  - Root install directory (displayed to end user at installer-run time)
     #  - "NSIS package/display name" (text used in the installer GUI)
@@ -313,24 +290,28 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES)
     if (CMAKE_CL_64)
       set (CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES64")
       set (CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION} (Win64)")
-    else (CMAKE_CL_64)
+    else ()
       set (CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES")
       set (CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
-    endif (CMAKE_CL_64)
+    endif ()
     # set the install/unistall icon used for the installer itself
     # There is a bug in NSI that does not handle full unix paths properly.
-    set (CPACK_NSIS_MUI_ICON "${HDF_RESOURCES_EXT_DIR}\\\\hdf.ico")
-    set (CPACK_NSIS_MUI_UNIICON "${HDF_RESOURCES_EXT_DIR}\\\\hdf.ico")
+    set (CPACK_NSIS_MUI_ICON "${HDF_RESOURCES_DIR}\\\\hdf.ico")
+    set (CPACK_NSIS_MUI_UNIICON "${HDF_RESOURCES_DIR}\\\\hdf.ico")
     # set the package header icon for MUI
-    set (CPACK_PACKAGE_ICON "${HDF_RESOURCES_EXT_DIR}\\\\hdf.bmp")
+    set (CPACK_PACKAGE_ICON "${HDF_RESOURCES_DIR}\\\\hdf.bmp")
     set (CPACK_NSIS_DISPLAY_NAME "${CPACK_NSIS_PACKAGE_NAME}")
-    set (CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_VENDOR}\\\\${CPACK_PACKAGE_NAME}\\\\${CPACK_PACKAGE_VERSION}")
+    if (OVERRIDE_INSTALL_VERSION)
+      set (CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_VENDOR}\\\\${CPACK_PACKAGE_NAME}\\\\${OVERRIDE_INSTALL_VERSION}")
+    else ()
+      set (CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_VENDOR}\\\\${CPACK_PACKAGE_NAME}\\\\${CPACK_PACKAGE_VERSION}")
+    endif ()
     set (CPACK_NSIS_CONTACT "${HDF5_PACKAGE_BUGREPORT}")
     set (CPACK_NSIS_MODIFY_PATH ON)
-    
-    if (WIX_EXECUTABLE)    
-      list (APPEND CPACK_GENERATOR "WIX") 
-    endif (WIX_EXECUTABLE)    
+
+    if (WIX_EXECUTABLE)
+      list (APPEND CPACK_GENERATOR "WIX")
+    endif ()
 #WiX variables
     set (CPACK_WIX_UNINSTALL "1")
 # .. variable:: CPACK_WIX_LICENSE_RTF
@@ -348,7 +329,7 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES)
     set (CPACK_RESOURCE_FILE_LICENSE "${HDF5_BINARY_DIR}/COPYING.txt")
 # .. variable:: CPACK_WIX_PRODUCT_ICON
 #  The Icon shown next to the program name in Add/Remove programs.
-    set(CPACK_WIX_PRODUCT_ICON "${HDF_RESOURCES_EXT_DIR}\\\\hdf.ico")
+    set(CPACK_WIX_PRODUCT_ICON "${HDF_RESOURCES_DIR}\\\\hdf.ico")
 #
 # .. variable:: CPACK_WIX_UI_BANNER
 #
@@ -373,32 +354,27 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES)
     set(CPACK_WIX_PROPERTY_ARPHELPLINK "${HDF5_PACKAGE_BUGREPORT}")
     if (BUILD_SHARED_LIBS)
       set(CPACK_WIX_PATCH_FILE "${HDF_RESOURCES_DIR}/patch.xml")
-    endif (BUILD_SHARED_LIBS)
+    endif ()
   elseif (APPLE)
-    list (APPEND CPACK_GENERATOR "DragNDrop") 
+    list (APPEND CPACK_GENERATOR "STGZ")
+    list (APPEND CPACK_GENERATOR "DragNDrop")
     set (CPACK_COMPONENTS_ALL_IN_ONE_PACKAGE ON)
     set (CPACK_PACKAGING_INSTALL_PREFIX "/${CPACK_PACKAGE_INSTALL_DIRECTORY}")
-    set (CPACK_PACKAGE_ICON "${HDF_RESOURCES_EXT_DIR}/hdf.icns")
+    set (CPACK_PACKAGE_ICON "${HDF_RESOURCES_DIR}/hdf.icns")
 
-    option (HDF5_PACK_MACOSX_BUNDLE  "Package the HDF5 Library in a Bundle" OFF)
-    if (HDF5_PACK_MACOSX_BUNDLE)
-      list (APPEND CPACK_GENERATOR "Bundle")
+    option (HDF5_PACK_MACOSX_FRAMEWORK  "Package the HDF5 Library in a Frameworks" OFF)
+    if (HDF5_PACK_MACOSX_FRAMEWORK AND HDF5_BUILD_FRAMEWORKS)
       set (CPACK_BUNDLE_NAME "${HDF5_PACKAGE_STRING}")
       set (CPACK_BUNDLE_LOCATION "/")    # make sure CMAKE_INSTALL_PREFIX ends in /
       set (CMAKE_INSTALL_PREFIX "/${CPACK_BUNDLE_NAME}.framework/Versions/${CPACK_PACKAGE_VERSION}/${CPACK_PACKAGE_NAME}/")
-      set (CPACK_BUNDLE_ICON "${HDF_RESOURCES_EXT_DIR}/hdf.icns")
+      set (CPACK_BUNDLE_ICON "${HDF_RESOURCES_DIR}/hdf.icns")
       set (CPACK_BUNDLE_PLIST "${HDF5_BINARY_DIR}/CMakeFiles/Info.plist")
-      set (CPACK_APPLE_GUI_INFO_STRING "HDF5 (Hierarchical Data Format 5) Software Library and Utilities")
-      set (CPACK_APPLE_GUI_COPYRIGHT "Copyright © 2006-2015 by The HDF Group. All rights reserved.")
       set (CPACK_SHORT_VERSION_STRING "${CPACK_PACKAGE_VERSION}")
-      set (CPACK_APPLE_GUI_BUNDLE_NAME "${HDF5_PACKAGE_STRING}")
-      set (CPACK_APPLE_GUI_VERSION_STRING "${CPACK_PACKAGE_VERSION_STRING}")
-      set (CPACK_APPLE_GUI_SHORT_VERSION_STRING "${CPACK_PACKAGE_VERSION}")
       #-----------------------------------------------------------------------------
       # Configure the Info.plist file for the install bundle
       #-----------------------------------------------------------------------------
       configure_file (
-          ${HDF_RESOURCES_EXT_DIR}/CPack.Info.plist.in
+          ${HDF_RESOURCES_DIR}/CPack.Info.plist.in
           ${HDF5_BINARY_DIR}/CMakeFiles/Info.plist @ONLY
       )
       configure_file (
@@ -406,32 +382,37 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES)
           ${HDF5_BINARY_DIR}/CMakeFiles/PkgInfo @ONLY
       )
       configure_file (
-          ${HDF_RESOURCES_EXT_DIR}/version.plist.in
+          ${HDF_RESOURCES_DIR}/version.plist.in
           ${HDF5_BINARY_DIR}/CMakeFiles/version.plist @ONLY
       )
       install (
           FILES ${HDF5_BINARY_DIR}/CMakeFiles/PkgInfo
-                ${HDF5_BINARY_DIR}/CMakeFiles/version.plist
           DESTINATION ..
       )
-    endif (HDF5_PACK_MACOSX_BUNDLE)
-  else (WIN32)
-    list (APPEND CPACK_GENERATOR "STGZ") 
+    endif ()
+  else ()
+    list (APPEND CPACK_GENERATOR "STGZ")
     set (CPACK_PACKAGING_INSTALL_PREFIX "/${CPACK_PACKAGE_INSTALL_DIRECTORY}")
     set (CPACK_COMPONENTS_ALL_IN_ONE_PACKAGE ON)
 
+    list (APPEND CPACK_GENERATOR "DEB")
     set (CPACK_DEBIAN_PACKAGE_SECTION "Libraries")
     set (CPACK_DEBIAN_PACKAGE_MAINTAINER "${HDF5_PACKAGE_BUGREPORT}")
 
-#    list (APPEND CPACK_GENERATOR "RPM") 
+    list (APPEND CPACK_GENERATOR "RPM")
     set (CPACK_RPM_PACKAGE_RELEASE "1")
+    set (CPACK_RPM_PACKAGE_RELEASE_DIST ON)
     set (CPACK_RPM_COMPONENT_INSTALL ON)
     set (CPACK_RPM_PACKAGE_RELOCATABLE ON)
+    set (CPACK_RPM_FILE_NAME "RPM-DEFAULT")
+    set (CPACK_RPM_PACKAGE_NAME "${CPACK_PACKAGE_NAME}")
+    set (CPACK_RPM_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION}")
+    set (CPACK_RPM_PACKAGE_VENDOR "${CPACK_PACKAGE_VENDOR}")
     set (CPACK_RPM_PACKAGE_LICENSE "BSD-style")
     set (CPACK_RPM_PACKAGE_GROUP "Development/Libraries")
     set (CPACK_RPM_PACKAGE_URL "${HDF5_PACKAGE_URL}")
     set (CPACK_RPM_PACKAGE_SUMMARY "HDF5 is a unique technology suite that makes possible the management of extremely large and complex data collections.")
-    set (CPACK_RPM_PACKAGE_DESCRIPTION 
+    set (CPACK_RPM_PACKAGE_DESCRIPTION
         "The HDF5 technology suite includes:
 
     * A versatile data model that can represent very complex data objects and a wide variety of metadata.
@@ -447,33 +428,52 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES)
 The HDF5 data model, file format, API, library, and tools are open and distributed without charge.
 "
     )
-    
+
     #-----------------------------------------------------------------------------
     # Configure the spec file for the install RPM
     #-----------------------------------------------------------------------------
 #    configure_file ("${HDF5_RESOURCES_DIR}/hdf5.spec.in" "${CMAKE_CURRENT_BINARY_DIR}/${HDF5_PACKAGE_NAME}.spec" @ONLY IMMEDIATE)
 #    set (CPACK_RPM_USER_BINARY_SPECFILE "${CMAKE_CURRENT_BINARY_DIR}/${HDF5_PACKAGE_NAME}.spec")
-  endif (WIN32)
-  
+  endif ()
+
   # By default, do not warn when built on machines using only VS Express:
   if (NOT DEFINED CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS)
     set (CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS ON)
-  endif (NOT DEFINED CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS)
+  endif ()
   include (InstallRequiredSystemLibraries)
 
   set (CPACK_INSTALL_CMAKE_PROJECTS "${HDF5_BINARY_DIR};HDF5;ALL;/")
-  
+
   if (HDF5_PACKAGE_EXTLIBS)
-    if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
+    if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
       if (ZLIB_FOUND AND ZLIB_USE_EXTERNAL)
-        set (CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${ZLIB_INCLUDE_DIR_GEN};ZLIB;ALL;/")
-      endif (ZLIB_FOUND AND ZLIB_USE_EXTERNAL)
+        if (WIN32)
+          set (CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${ZLIB_INCLUDE_DIR_GEN};HDF5_ZLIB;ALL;/")
+        else ()
+          set (CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${ZLIB_INCLUDE_DIR_GEN};HDF5_ZLIB;libraries;/")
+          set (CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${ZLIB_INCLUDE_DIR_GEN};HDF5_ZLIB;headers;/")
+          set (CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${ZLIB_INCLUDE_DIR_GEN};HDF5_ZLIB;configinstall;/")
+        endif ()
+      endif ()
       if (SZIP_FOUND AND SZIP_USE_EXTERNAL)
-        set (CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${SZIP_INCLUDE_DIR_GEN};SZIP;ALL;/")
-      endif (SZIP_FOUND AND SZIP_USE_EXTERNAL)
-    endif (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
-  endif (HDF5_PACKAGE_EXTLIBS)
-  
+        if (WIN32)
+          set (CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${SZIP_INCLUDE_DIR_GEN};SZIP;ALL;/")
+        else ()
+          set (CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${SZIP_INCLUDE_DIR_GEN};SZIP;libraries;/")
+          set (CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${SZIP_INCLUDE_DIR_GEN};SZIP;headers;/")
+          set (CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${SZIP_INCLUDE_DIR_GEN};SZIP;configinstall;/")
+        endif ()
+      endif ()
+      if (PLUGIN_FOUND AND PLUGIN_USE_EXTERNAL)
+        if (WIN32)
+          set (CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${PLUGIN_BINARY_DIR};PLUGIN;ALL;/")
+        else ()
+          set (CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${PLUGIN_BINARY_DIR};PLUGIN;libraries;/")
+        endif ()
+      endif ()
+    endif ()
+  endif ()
+
   include (CPack)
 
   cpack_add_install_type(Full DISPLAY_NAME "Everything")
@@ -499,117 +499,129 @@ The HDF5 data model, file format, API, library, and tools are open and distribut
   #---------------------------------------------------------------------------
   # Now list the cpack commands
   #---------------------------------------------------------------------------
-  CPACK_ADD_COMPONENT (libraries 
+  cpack_add_component (libraries
       DISPLAY_NAME "HDF5 Libraries"
       GROUP Runtime
       INSTALL_TYPES Full Developer User
   )
-  CPACK_ADD_COMPONENT (headers 
-      DISPLAY_NAME "HDF5 Headers" 
+  cpack_add_component (headers
+      DISPLAY_NAME "HDF5 Headers"
       DEPENDS libraries
       GROUP Development
       INSTALL_TYPES Full Developer
   )
-  CPACK_ADD_COMPONENT (hdfdocuments 
+  cpack_add_component (hdfdocuments
       DISPLAY_NAME "HDF5 Documents"
       GROUP Documents
       INSTALL_TYPES Full Developer
   )
-  CPACK_ADD_COMPONENT (configinstall 
-      DISPLAY_NAME "HDF5 CMake files" 
+  cpack_add_component (configinstall
+      DISPLAY_NAME "HDF5 CMake files"
+      HIDDEN
       DEPENDS libraries
       GROUP Development
       INSTALL_TYPES Full Developer User
   )
-  
+
   if (HDF5_BUILD_FORTRAN)
-    CPACK_ADD_COMPONENT (fortlibraries 
-        DISPLAY_NAME "HDF5 Fortran Libraries" 
+    cpack_add_component (fortlibraries
+        DISPLAY_NAME "HDF5 Fortran Libraries"
         DEPENDS libraries
         GROUP Runtime
         INSTALL_TYPES Full Developer User
     )
-    CPACK_ADD_COMPONENT (fortheaders 
-        DISPLAY_NAME "HDF5 Fortran Headers" 
+    cpack_add_component (fortheaders
+        DISPLAY_NAME "HDF5 Fortran Headers"
         DEPENDS fortlibraries
         GROUP Development
         INSTALL_TYPES Full Developer
     )
-  endif (HDF5_BUILD_FORTRAN)
-  
+  endif ()
+
   if (HDF5_BUILD_CPP_LIB)
-    CPACK_ADD_COMPONENT (cpplibraries 
-        DISPLAY_NAME "HDF5 C++ Libraries" 
+    cpack_add_component (cpplibraries
+        DISPLAY_NAME "HDF5 C++ Libraries"
         DEPENDS libraries
         GROUP Runtime
         INSTALL_TYPES Full Developer User
     )
-    CPACK_ADD_COMPONENT (cppheaders 
-        DISPLAY_NAME "HDF5 C++ Headers" 
+    cpack_add_component (cppheaders
+        DISPLAY_NAME "HDF5 C++ Headers"
         DEPENDS cpplibraries
         GROUP Development
         INSTALL_TYPES Full Developer
     )
-  endif (HDF5_BUILD_CPP_LIB)
-  
+  endif ()
+
+  cpack_add_component (utilsapplications
+      DISPLAY_NAME "HDF5 Utility Applications"
+      DEPENDS libraries
+      GROUP Applications
+      INSTALL_TYPES Full Developer User
+  )
+
   if (HDF5_BUILD_TOOLS)
-    CPACK_ADD_COMPONENT (toolsapplications 
-        DISPLAY_NAME "HDF5 Tools Applications" 
+    cpack_add_component (toolsapplications
+        DISPLAY_NAME "HDF5 Tools Applications"
         DEPENDS toolslibraries
         GROUP Applications
         INSTALL_TYPES Full Developer User
     )
-    CPACK_ADD_COMPONENT (toolslibraries 
-        DISPLAY_NAME "HDF5 Tools Libraries" 
+    cpack_add_component (toolslibraries
+        DISPLAY_NAME "HDF5 Tools Libraries"
         DEPENDS libraries
         GROUP Runtime
         INSTALL_TYPES Full Developer User
     )
-    CPACK_ADD_COMPONENT (toolsheaders 
-        DISPLAY_NAME "HDF5 Tools Headers" 
+    cpack_add_component (toolsheaders
+        DISPLAY_NAME "HDF5 Tools Headers"
         DEPENDS toolslibraries
         GROUP Development
         INSTALL_TYPES Full Developer
     )
-  endif (HDF5_BUILD_TOOLS)
-  
+  endif ()
+
   if (HDF5_BUILD_HL_LIB)
-    CPACK_ADD_COMPONENT (hllibraries 
-        DISPLAY_NAME "HDF5 HL Libraries" 
+    cpack_add_component (hllibraries
+        DISPLAY_NAME "HDF5 HL Libraries"
         DEPENDS libraries
         GROUP Runtime
         INSTALL_TYPES Full Developer User
     )
-    CPACK_ADD_COMPONENT (hlheaders 
-        DISPLAY_NAME "HDF5 HL Headers" 
+    cpack_add_component (hlheaders
+        DISPLAY_NAME "HDF5 HL Headers"
         DEPENDS hllibraries
         GROUP Development
         INSTALL_TYPES Full Developer
     )
-    CPACK_ADD_COMPONENT (hltoolsapplications 
-        DISPLAY_NAME "HDF5 HL Tools Applications" 
+    cpack_add_component (hltoolsapplications
+        DISPLAY_NAME "HDF5 HL Tools Applications"
         DEPENDS hllibraries
         GROUP Applications
         INSTALL_TYPES Full Developer User
     )
-    CPACK_ADD_COMPONENT (hlcpplibraries 
-        DISPLAY_NAME "HDF5 HL C++ Libraries" 
-        DEPENDS hllibraries
-        GROUP Runtime
-        INSTALL_TYPES Full Developer User
-    )
-    CPACK_ADD_COMPONENT (hlcppheaders 
-        DISPLAY_NAME "HDF5 HL C++ Headers" 
-        DEPENDS hlcpplibraries
-        GROUP Development
-        INSTALL_TYPES Full Developer
-    )
-    CPACK_ADD_COMPONENT (hlfortlibraries 
-        DISPLAY_NAME "HDF5 HL Fortran Libraries" 
-        DEPENDS fortlibraries
-        GROUP Runtime
-        INSTALL_TYPES Full Developer User
-    )
-  endif (HDF5_BUILD_HL_LIB)
-  
-endif (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES)
+    if (HDF5_BUILD_CPP_LIB)
+      cpack_add_component (hlcpplibraries
+          DISPLAY_NAME "HDF5 HL C++ Libraries"
+          DEPENDS hllibraries
+          GROUP Runtime
+          INSTALL_TYPES Full Developer User
+      )
+      cpack_add_component (hlcppheaders
+          DISPLAY_NAME "HDF5 HL C++ Headers"
+          DEPENDS hlcpplibraries
+          GROUP Development
+          INSTALL_TYPES Full Developer
+      )
+    endif ()
+    if (HDF5_BUILD_FORTRAN)
+      cpack_add_component (hlfortlibraries
+          DISPLAY_NAME "HDF5 HL Fortran Libraries"
+          DEPENDS fortlibraries
+          GROUP Runtime
+          INSTALL_TYPES Full Developer User
+      )
+    endif ()
+  endif ()
+
+endif ()
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a6994ef..1c85965 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,21 @@
-cmake_minimum_required (VERSION 3.1.0)
-PROJECT (HDF5 C CXX)
+cmake_minimum_required (VERSION 3.18)
+project (HDF5 C)
+
+if (POLICY CMP0074)
+  # find_package() uses <PackageName>_ROOT variables.
+  cmake_policy (SET CMP0074 NEW)
+endif ()
+
+if (POLICY CMP0083)
+  # To control generation of Position Independent Executable (PIE) or not,
+  # some flags are required at link time.
+  cmake_policy (SET CMP0083 NEW)
+endif ()
+
+# Avoid warning about DOWNLOAD_EXTRACT_TIMESTAMP in CMake 3.24:
+if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
+    cmake_policy(SET CMP0135 NEW)
+endif()
 
 #-----------------------------------------------------------------------------
 # Instructions for use : Normal Build
@@ -10,6 +26,24 @@ PROJECT (HDF5 C CXX)
 # set CMAKE_INSTALL_PREFIX to the required install path.
 # Make install can be used to install all components for system-wide use.
 #
+if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
+    message (FATAL_ERROR "\nERROR! ${PROJECT_NAME} DOES NOT SUPPORT IN SOURCE BUILDS!\n"
+      "CMAKE_CURRENT_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}"
+      " == CMAKE_CURRENT_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR}\n"
+      "NEXT STEPS:\n"
+      "(1) Delete the CMakeCache.txt file and the CMakeFiles/ directory\n"
+      "     under the source directory for ${PROJECT_NAME}, otherwise you\n"
+      "     will not be able to configure ${PROJECT_NAME} correctly!\n"
+      "      * For example, on linux machines do:\n"
+      "        $ rm -r CMakeCache.txt CMakeFiles/\n"
+      "(2) Create a different directory and configure ${PROJECT_NAME} in that directory.\n"
+      "      * For example, on linux machines do:\n"
+      "        $ mkdir MY_BUILD\n"
+      "        $ cd MY_BUILD\n"
+      "        $ cmake [OPTIONS] ..\n"
+      )
+endif ()
+
 #-----------------------------------------------------------------------------
 # Instructions for use : Sub-Project Build
 #
@@ -28,10 +62,20 @@ PROJECT (HDF5 C CXX)
 #   dependencies of the HDF5 libs may be 'incomplete', add additional
 #   dependencies to this variable so that external projects pick them up
 #
+#option (HDF5_EXTERNAL_LIB_PREFIX "Use prefix for custom library naming." "")
+set (HDF5_EXTERNAL_LIB_PREFIX "" CACHE STRING "Use prefix for custom library naming.")
+mark_as_advanced (HDF5_EXTERNAL_LIB_PREFIX)
 # HDF5_EXTERNAL_LIB_PREFIX :
-#   If the parent project needs to install hdf libraries, but avoid 
+#   If the parent project needs to install hdf libraries, but avoid
 #   name conflicts with system versions, then a prefix may be added
 #   to ensure that the correct versions configured are used.
+set (HDF5_LIB_INFIX "" CACHE STRING "Use infix for custom library naming.")
+mark_as_advanced (HDF5_LIB_INFIX)
+# HDF5_LIB_INFIX :
+#   This infix is added to all library names after 'hdf5'.
+#   e.g. the infix '_openmpi' results in the library name 'libhdf5_openmpi.so'
+#   This name is used in packages on debian based systems.
+#   (see https://packages.debian.org/jessie/amd64/libhdf5-openmpi-8/filelist)
 #
 # HDF5_INSTALL_BIN_DIR, HDF5_INSTALL_LIB_DIR, HDF5_INSTALL_INCLUDE_DIR, HDF5_INSTALL_DATA_DIR :
 #   Customize the 'bin', 'lib', 'include', and 'share' installation directories.
@@ -53,22 +97,23 @@ PROJECT (HDF5 C CXX)
 #   # Setup all necessary overrides for zlib so that HDF5 uses our
 #   # internally compiled zlib rather than any other version
 #   if (HDF5_ENABLE_Z_LIB_SUPPORT)
-#     # We must tell the main HDF5 library that it depends on our zlib 
-#     set (HDF5_LIB_DEPENDENCIES vtkzlib)    
+#     # We must tell the main HDF5 library that it depends on our zlib
+#     set (HDF5_LIB_DEPENDENCIES vtkzlib)
 #     # Override the zlib header file
 #     if (VTK_USE_SYSTEM_ZLIB)
 #       set (H5_ZLIB_HEADER "zlib.h")
-#     else (VTK_USE_SYSTEM_ZLIB)
+#     else ()
 #       set (H5_ZLIB_HEADER "vtk_zlib.h")
 #       # Set vars that FindZlib would have set if used in sub project
 #       set (ZLIB_INCLUDE_DIRS "${VTK_ZLIB_INCLUDE_DIRS}")
 #       set (ZLIB_LIBRARIES vtkzlib)
-#     endif (VTK_USE_SYSTEM_ZLIB)
-#   endif (HDF5_ENABLE_Z_LIB_SUPPORT)
-# 
+#     endif ()
+#   endif ()
+#
 #   # Add the sub project
 #   add_subdirectory (Utilities/hdf5-1.8)
 #-----------------------------------------------------------------------------
+string (TIMESTAMP CONFIG_DATE "%Y-%m-%d")
 
 #-----------------------------------------------------------------------------
 # Allow Visual Studio solution directories
@@ -81,25 +126,31 @@ option (HDF5_USE_FOLDERS "Enable folder grouping of projects in IDEs." ON)
 mark_as_advanced (HDF5_USE_FOLDERS)
 if (HDF5_USE_FOLDERS)
   set_property (GLOBAL PROPERTY USE_FOLDERS ON)
-endif (HDF5_USE_FOLDERS)
+endif ()
 option (HDF5_NO_PACKAGES "CPACK - Disable packaging" OFF)
 mark_as_advanced (HDF5_NO_PACKAGES)
+option (ALLOW_UNSUPPORTED "Allow unsupported combinations of configure options" OFF)
+mark_as_advanced (ALLOW_UNSUPPORTED)
 
 #-----------------------------------------------------------------------------
 # Set the core names of all the libraries
 #-----------------------------------------------------------------------------
-set (HDF5_LIB_CORENAME              "hdf5")
-set (HDF5_TEST_LIB_CORENAME         "hdf5_test")
-set (HDF5_CPP_LIB_CORENAME          "hdf5_cpp")
-set (HDF5_HL_LIB_CORENAME           "hdf5_hl")
-set (HDF5_HL_CPP_LIB_CORENAME       "hdf5_hl_cpp")
-set (HDF5_TOOLS_LIB_CORENAME        "hdf5_tools")
-set (HDF5_F90_LIB_CORENAME          "hdf5_fortran")
-set (HDF5_F90_C_LIB_CORENAME        "hdf5_f90cstub")
-set (HDF5_F90_TEST_LIB_CORENAME     "hdf5_test_fortran")
-set (HDF5_F90_C_TEST_LIB_CORENAME   "hdf5_test_f90cstub")
-set (HDF5_HL_F90_LIB_CORENAME       "hdf5_hl_fortran")
-set (HDF5_HL_F90_C_LIB_CORENAME     "hdf5_hl_f90cstub")
+set (HDF5_LIB_CORENAME              "hdf5${HDF5_LIB_INFIX}")
+set (HDF5_TEST_LIB_CORENAME         "hdf5${HDF5_LIB_INFIX}_test")
+set (HDF5_CPP_LIB_CORENAME          "hdf5${HDF5_LIB_INFIX}_cpp")
+set (HDF5_HL_LIB_CORENAME           "hdf5${HDF5_LIB_INFIX}_hl")
+set (HDF5_HL_CPP_LIB_CORENAME       "hdf5${HDF5_LIB_INFIX}_hl_cpp")
+set (HDF5_TOOLS_LIB_CORENAME        "hdf5${HDF5_LIB_INFIX}_tools")
+set (HDF5_UTILS_LIB_CORENAME        "hdf5${HDF5_LIB_INFIX}_utils")
+set (HDF5_F90_LIB_CORENAME          "hdf5${HDF5_LIB_INFIX}_fortran")
+set (HDF5_F90_C_LIB_CORENAME        "hdf5${HDF5_LIB_INFIX}_f90cstub")
+set (HDF5_F90_TEST_LIB_CORENAME     "hdf5${HDF5_LIB_INFIX}_test_fortran")
+set (HDF5_F90_C_TEST_LIB_CORENAME   "hdf5${HDF5_LIB_INFIX}_test_f90cstub")
+set (HDF5_HL_F90_LIB_CORENAME       "hdf5${HDF5_LIB_INFIX}_hl_fortran")
+set (HDF5_HL_F90_C_LIB_CORENAME     "hdf5${HDF5_LIB_INFIX}_hl_f90cstub")
+set (HDF5_JAVA_JNI_LIB_CORENAME     "hdf5${HDF5_LIB_INFIX}_java")
+set (HDF5_JAVA_HDF5_LIB_CORENAME    "jarhdf5")
+set (HDF5_JAVA_TEST_LIB_CORENAME    "jartest5")
 
 #-----------------------------------------------------------------------------
 # Set the true names of all the libraries if customized by external project
@@ -110,62 +161,77 @@ set (HDF5_CPP_LIB_NAME          "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_CPP_LIB_COREN
 set (HDF5_HL_LIB_NAME           "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_HL_LIB_CORENAME}")
 set (HDF5_HL_CPP_LIB_NAME       "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_HL_CPP_LIB_CORENAME}")
 set (HDF5_TOOLS_LIB_NAME        "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_TOOLS_LIB_CORENAME}")
+set (HDF5_UTILS_LIB_NAME        "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_UTILS_LIB_CORENAME}")
 set (HDF5_F90_LIB_NAME          "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_F90_LIB_CORENAME}")
 set (HDF5_F90_C_LIB_NAME        "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_F90_C_LIB_CORENAME}")
 set (HDF5_F90_TEST_LIB_NAME     "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_F90_TEST_LIB_CORENAME}")
 set (HDF5_F90_C_TEST_LIB_NAME   "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_F90_C_TEST_LIB_CORENAME}")
 set (HDF5_HL_F90_LIB_NAME       "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_HL_F90_LIB_CORENAME}")
 set (HDF5_HL_F90_C_LIB_NAME     "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_HL_F90_C_LIB_CORENAME}")
+set (HDF5_JAVA_JNI_LIB_NAME     "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_JAVA_JNI_LIB_CORENAME}")
+set (HDF5_JAVA_HDF5_LIB_NAME    "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_JAVA_HDF5_LIB_CORENAME}")
+set (HDF5_JAVA_TEST_LIB_NAME    "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_JAVA_TEST_LIB_CORENAME}")
 
 #-----------------------------------------------------------------------------
 # Set the target names of all the libraries
 #-----------------------------------------------------------------------------
-set (HDF5_LIB_TARGET              ${HDF5_LIB_CORENAME})
-set (HDF5_TEST_LIB_TARGET         ${HDF5_TEST_LIB_CORENAME})
-set (HDF5_CPP_LIB_TARGET          ${HDF5_CPP_LIB_CORENAME})
-set (HDF5_HL_LIB_TARGET           ${HDF5_HL_LIB_CORENAME})
-set (HDF5_HL_CPP_LIB_TARGET       ${HDF5_HL_CPP_LIB_CORENAME})
-set (HDF5_TOOLS_LIB_TARGET        ${HDF5_TOOLS_LIB_CORENAME})
-set (HDF5_F90_LIB_TARGET          ${HDF5_F90_LIB_CORENAME})
-set (HDF5_F90_C_LIB_TARGET        ${HDF5_F90_C_LIB_CORENAME})
-set (HDF5_F90_TEST_LIB_TARGET     ${HDF5_F90_TEST_LIB_CORENAME})
-set (HDF5_F90_C_TEST_LIB_TARGET   ${HDF5_F90_C_TEST_LIB_CORENAME})
-set (HDF5_HL_F90_LIB_TARGET       ${HDF5_HL_F90_LIB_CORENAME})
-set (HDF5_HL_F90_C_LIB_TARGET     ${HDF5_HL_F90_C_LIB_CORENAME})
+set (HDF5_LIB_TARGET              "${HDF5_LIB_CORENAME}-static")
+set (HDF5_TEST_LIB_TARGET         "${HDF5_TEST_LIB_CORENAME}-static")
+set (HDF5_CPP_LIB_TARGET          "${HDF5_CPP_LIB_CORENAME}-static")
+set (HDF5_HL_LIB_TARGET           "${HDF5_HL_LIB_CORENAME}-static")
+set (HDF5_HL_CPP_LIB_TARGET       "${HDF5_HL_CPP_LIB_CORENAME}-static")
+set (HDF5_TOOLS_LIB_TARGET        "${HDF5_TOOLS_LIB_CORENAME}-static")
+set (HDF5_UTILS_LIB_TARGET        "${HDF5_UTILS_LIB_CORENAME}-static")
+set (HDF5_F90_LIB_TARGET          "${HDF5_F90_LIB_CORENAME}-static")
+set (HDF5_F90_C_LIB_TARGET        "${HDF5_F90_C_LIB_CORENAME}-static")
+set (HDF5_F90_TEST_LIB_TARGET     "${HDF5_F90_TEST_LIB_CORENAME}-static")
+set (HDF5_F90_C_TEST_LIB_TARGET   "${HDF5_F90_C_TEST_LIB_CORENAME}-static")
+set (HDF5_HL_F90_LIB_TARGET       "${HDF5_HL_F90_LIB_CORENAME}-static")
+set (HDF5_HL_F90_C_LIB_TARGET     "${HDF5_HL_F90_C_LIB_CORENAME}-static")
+set (HDF5_JAVA_JNI_LIB_TARGET     "${HDF5_JAVA_JNI_LIB_CORENAME}")
+set (HDF5_JAVA_HDF5_LIB_TARGET    "${HDF5_JAVA_HDF5_LIB_CORENAME}")
+set (HDF5_JAVA_TEST_LIB_TARGET    "${HDF5_JAVA_TEST_LIB_CORENAME}")
+set (HDF5_LIBSH_TARGET            "${HDF5_LIB_CORENAME}-shared")
+set (HDF5_TEST_LIBSH_TARGET       "${HDF5_TEST_LIB_CORENAME}-shared")
+set (HDF5_CPP_LIBSH_TARGET        "${HDF5_CPP_LIB_CORENAME}-shared")
+set (HDF5_HL_LIBSH_TARGET         "${HDF5_HL_LIB_CORENAME}-shared")
+set (HDF5_HL_CPP_LIBSH_TARGET     "${HDF5_HL_CPP_LIB_CORENAME}-shared")
+set (HDF5_TOOLS_LIBSH_TARGET      "${HDF5_TOOLS_LIB_CORENAME}-shared")
+set (HDF5_UTILS_LIBSH_TARGET      "${HDF5_UTILS_LIB_CORENAME}-shared")
+set (HDF5_F90_LIBSH_TARGET        "${HDF5_F90_LIB_CORENAME}-shared")
+set (HDF5_F90_C_LIBSH_TARGET      "${HDF5_F90_C_LIB_CORENAME}-shared")
+set (HDF5_F90_TEST_LIBSH_TARGET   "${HDF5_F90_TEST_LIB_CORENAME}-shared")
+set (HDF5_F90_C_TEST_LIBSH_TARGET "${HDF5_F90_C_TEST_LIB_CORENAME}-shared")
+set (HDF5_HL_F90_LIBSH_TARGET     "${HDF5_HL_F90_LIB_CORENAME}-shared")
+set (HDF5_HL_F90_C_LIBSH_TARGET   "${HDF5_HL_F90_C_LIB_CORENAME}-shared")
 
 #-----------------------------------------------------------------------------
 # Define some CMake variables for use later in the project
 #-----------------------------------------------------------------------------
+set (HDF_CONFIG_DIR          ${HDF5_SOURCE_DIR}/config)
 set (HDF_RESOURCES_DIR       ${HDF5_SOURCE_DIR}/config/cmake)
-set (HDF_RESOURCES_EXT_DIR   ${HDF5_SOURCE_DIR}/config/cmake_ext_mod)
 set (HDF5_SRC_DIR            ${HDF5_SOURCE_DIR}/src)
 set (HDF5_TEST_SRC_DIR       ${HDF5_SOURCE_DIR}/test)
 set (HDF5_CPP_SRC_DIR        ${HDF5_SOURCE_DIR}/c++)
 set (HDF5_CPP_TST_DIR        ${HDF5_SOURCE_DIR}/c++/test)
 set (HDF5_HL_SRC_DIR         ${HDF5_SOURCE_DIR}/hl)
 set (HDF5_HL_CPP_SRC_DIR     ${HDF5_SOURCE_DIR}/hl/c++)
-set (HDF5_TOOLS_SRC_DIR      ${HDF5_SOURCE_DIR}/tools)
-set (HDF5_PERFORM_SRC_DIR    ${HDF5_SOURCE_DIR}/tools/perform)
+set (HDF5_HL_TOOLS_DIR       ${HDF5_SOURCE_DIR}/hl/tools)
+set (HDF5_TOOLS_DIR          ${HDF5_SOURCE_DIR}/tools)
+set (HDF5_TOOLS_SRC_DIR      ${HDF5_SOURCE_DIR}/tools/src)
+set (HDF5_PERFORM_SRC_DIR    ${HDF5_SOURCE_DIR}/tools/src/perform)
+set (HDF5_UTILS_DIR          ${HDF5_SOURCE_DIR}/utils)
 set (HDF5_F90_SRC_DIR        ${HDF5_SOURCE_DIR}/fortran)
+set (HDF5_JAVA_JNI_SRC_DIR         ${HDF5_SOURCE_DIR}/java/src/jni)
+set (HDF5_JAVA_HDF5_SRC_DIR        ${HDF5_SOURCE_DIR}/java/src/hdf)
+set (HDF5_JAVA_TEST_SRC_DIR        ${HDF5_SOURCE_DIR}/java/test)
+set (HDF5_JAVA_LIB_DIR             ${HDF5_SOURCE_DIR}/java/lib)
+set (HDF5_JAVA_LOGGING_JAR         ${HDF5_SOURCE_DIR}/java/lib/slf4j-api-1.7.33.jar)
+set (HDF5_JAVA_LOGGING_NOP_JAR     ${HDF5_SOURCE_DIR}/java/lib/ext/slf4j-nop-1.7.33.jar)
+set (HDF5_JAVA_LOGGING_SIMPLE_JAR  ${HDF5_SOURCE_DIR}/java/lib/ext/slf4j-simple-1.7.33.jar)
+set (HDF5_DOXYGEN_DIR              ${HDF5_SOURCE_DIR}/doxygen)
 
-if (NOT HDF5_INSTALL_BIN_DIR)
-  set (HDF5_INSTALL_BIN_DIR bin)
-endif (NOT HDF5_INSTALL_BIN_DIR)
-if (NOT HDF5_INSTALL_LIB_DIR)
-  set (HDF5_INSTALL_LIB_DIR lib)
-endif (NOT HDF5_INSTALL_LIB_DIR)
-if (NOT HDF5_INSTALL_INCLUDE_DIR)
-  set (HDF5_INSTALL_INCLUDE_DIR include)
-endif (NOT HDF5_INSTALL_INCLUDE_DIR)
-if (NOT HDF5_INSTALL_DATA_DIR)
-  if (NOT WIN32)
-    set (HDF5_INSTALL_DATA_DIR share)
-    set (HDF5_INSTALL_CMAKE_DIR share/cmake)
-  else (NOT WIN32)
-    set (HDF5_INSTALL_DATA_DIR ".")
-    set (HDF5_INSTALL_CMAKE_DIR cmake)
-  endif (NOT WIN32)
-endif (NOT HDF5_INSTALL_DATA_DIR)
+set (HDF5_SRC_INCLUDE_DIRS ${HDF5_SRC_DIR})
 
 #-----------------------------------------------------------------------------
 # parse the full version number from H5public.h and include in H5_VERS_INFO
@@ -177,22 +243,99 @@ string (REGEX REPLACE ".*#define[ \t]+H5_VERS_MINOR[ \t]+([0-9]*).*$"
     "\\1" H5_VERS_MINOR ${_h5public_h_contents})
 string (REGEX REPLACE ".*#define[ \t]+H5_VERS_RELEASE[ \t]+([0-9]*).*$"
     "\\1" H5_VERS_RELEASE ${_h5public_h_contents})
-string (REGEX REPLACE ".*#define[ \t]+H5_VERS_SUBRELEASE[ \t]+\"([0-9A-Za-z._]*)\".*$"
+string (REGEX REPLACE ".*#define[ \t]+H5_VERS_SUBRELEASE[ \t]+\"([0-9A-Za-z._-]*)\".*$"
     "\\1" H5_VERS_SUBRELEASE ${_h5public_h_contents})
-#message (STATUS "VERSION: ${H5_VERS_MAJOR}.${H5_VERS_MINOR}.${H5_VERS_RELEASE}-${H5_VERS_SUBRELEASE}")
+message (TRACE "VERSION: ${H5_VERS_MAJOR}.${H5_VERS_MINOR}.${H5_VERS_RELEASE}-${H5_VERS_SUBRELEASE}")
 
 #-----------------------------------------------------------------------------
 # parse the full soversion number from config/lt_vers.am and include in H5_SOVERS_INFO
 #-----------------------------------------------------------------------------
 file (READ ${HDF5_SOURCE_DIR}/config/lt_vers.am _lt_vers_am_contents)
 string (REGEX REPLACE ".*LT_VERS_INTERFACE[ \t]+=[ \t]+([0-9]*).*$"
-    "\\1" H5_SOVERS_INTERFACE ${_lt_vers_am_contents})
+    "\\1" H5_LIB_SOVERS_INTERFACE ${_lt_vers_am_contents})
 string (REGEX REPLACE ".*LT_VERS_REVISION[ \t]+=[ \t]+([0-9]*).*$"
-    "\\1" H5_SOVERS_MINOR ${_lt_vers_am_contents})
+    "\\1" H5_LIB_SOVERS_MINOR ${_lt_vers_am_contents})
 string (REGEX REPLACE ".*LT_VERS_AGE[ \t]+=[ \t]+([0-9]*).*$"
-    "\\1" H5_SOVERS_RELEASE ${_lt_vers_am_contents})
-MATH (EXPR H5_SOVERS_MAJOR ${H5_SOVERS_INTERFACE}-${H5_SOVERS_RELEASE})
-message (STATUS "SOVERSION: ${H5_SOVERS_MAJOR}.${H5_SOVERS_RELEASE}.${H5_SOVERS_MINOR}")
+    "\\1" H5_LIB_SOVERS_RELEASE ${_lt_vers_am_contents})
+math (EXPR H5_LIB_SOVERS_MAJOR ${H5_LIB_SOVERS_INTERFACE}-${H5_LIB_SOVERS_RELEASE})
+message (VERBOSE "SOVERSION: ${H5_LIB_SOVERS_MAJOR}.${H5_LIB_SOVERS_RELEASE}.${H5_LIB_SOVERS_MINOR}")
+string (REGEX MATCH ".*LT_TOOLS_VERS_INTERFACE[ \t]+=[ \t]+([0-9]*).*$" H5_TOOLS_SOVERS_EXISTS ${_lt_vers_am_contents})
+if (H5_TOOLS_SOVERS_EXISTS)
+  string (REGEX REPLACE ".*LT_TOOLS_VERS_INTERFACE[ \t]+=[ \t]+([0-9]*).*$"
+      "\\1" H5_TOOLS_SOVERS_INTERFACE ${_lt_vers_am_contents})
+  string (REGEX REPLACE ".*LT_TOOLS_VERS_REVISION[ \t]+=[ \t]+([0-9]*).*$"
+      "\\1" H5_TOOLS_SOVERS_MINOR ${_lt_vers_am_contents})
+  string (REGEX REPLACE ".*LT_TOOLS_VERS_AGE[ \t]+=[ \t]+([0-9]*).*$"
+      "\\1" H5_TOOLS_SOVERS_RELEASE ${_lt_vers_am_contents})
+  math (EXPR H5_TOOLS_SOVERS_MAJOR ${H5_TOOLS_SOVERS_INTERFACE}-${H5_TOOLS_SOVERS_RELEASE})
+  message (VERBOSE "SOVERSION_TOOLS: ${H5_TOOLS_SOVERS_MAJOR}.${H5_TOOLS_SOVERS_RELEASE}.${H5_TOOLS_SOVERS_MINOR}")
+endif ()
+string (REGEX MATCH ".*LT_CXX_VERS_INTERFACE[ \t]+=[ \t]+([0-9]*).*$" H5_CXX_SOVERS_EXISTS ${_lt_vers_am_contents})
+if (H5_CXX_SOVERS_EXISTS)
+  string (REGEX REPLACE ".*LT_CXX_VERS_INTERFACE[ \t]+=[ \t]+([0-9]*).*$"
+      "\\1" H5_CXX_SOVERS_INTERFACE ${_lt_vers_am_contents})
+  string (REGEX REPLACE ".*LT_CXX_VERS_REVISION[ \t]+=[ \t]+([0-9]*).*$"
+      "\\1" H5_CXX_SOVERS_MINOR ${_lt_vers_am_contents})
+  string (REGEX REPLACE ".*LT_CXX_VERS_AGE[ \t]+=[ \t]+([0-9]*).*$"
+      "\\1" H5_CXX_SOVERS_RELEASE ${_lt_vers_am_contents})
+  math (EXPR H5_CXX_SOVERS_MAJOR ${H5_CXX_SOVERS_INTERFACE}-${H5_CXX_SOVERS_RELEASE})
+  message (VERBOSE "SOVERSION_CXX: ${H5_CXX_SOVERS_MAJOR}.${H5_CXX_SOVERS_RELEASE}.${H5_CXX_SOVERS_MINOR}")
+endif ()
+string (REGEX MATCH ".*LT_F_VERS_INTERFACE[ \t]+=[ \t]+([0-9]*).*$" H5_F_SOVERS_EXISTS ${_lt_vers_am_contents})
+if (H5_F_SOVERS_EXISTS)
+  string (REGEX REPLACE ".*LT_F_VERS_INTERFACE[ \t]+=[ \t]+([0-9]*).*$"
+      "\\1" H5_F_SOVERS_INTERFACE ${_lt_vers_am_contents})
+  string (REGEX REPLACE ".*LT_F_VERS_REVISION[ \t]+=[ \t]+([0-9]*).*$"
+      "\\1" H5_F_SOVERS_MINOR ${_lt_vers_am_contents})
+  string (REGEX REPLACE ".*LT_F_VERS_AGE[ \t]+=[ \t]+([0-9]*).*$"
+      "\\1" H5_F_SOVERS_RELEASE ${_lt_vers_am_contents})
+  math (EXPR H5_F_SOVERS_MAJOR ${H5_F_SOVERS_INTERFACE}-${H5_F_SOVERS_RELEASE})
+  message (VERBOSE "SOVERSION_F: ${H5_F_SOVERS_MAJOR}.${H5_F_SOVERS_RELEASE}.${H5_F_SOVERS_MINOR}")
+endif ()
+string (REGEX MATCH ".*LT_HL_VERS_INTERFACE[ \t]+=[ \t]+([0-9]*).*$" H5_HL_SOVERS_EXISTS ${_lt_vers_am_contents})
+if (H5_HL_SOVERS_EXISTS)
+  string (REGEX REPLACE ".*LT_HL_VERS_INTERFACE[ \t]+=[ \t]+([0-9]*).*$"
+      "\\1" H5_HL_SOVERS_INTERFACE ${_lt_vers_am_contents})
+  string (REGEX REPLACE ".*LT_HL_VERS_REVISION[ \t]+=[ \t]+([0-9]*).*$"
+      "\\1" H5_HL_SOVERS_MINOR ${_lt_vers_am_contents})
+  string (REGEX REPLACE ".*LT_HL_VERS_AGE[ \t]+=[ \t]+([0-9]*).*$"
+      "\\1" H5_HL_SOVERS_RELEASE ${_lt_vers_am_contents})
+  math (EXPR H5_HL_SOVERS_MAJOR ${H5_HL_SOVERS_INTERFACE}-${H5_HL_SOVERS_RELEASE})
+  message (VERBOSE "SOVERSION_HL: ${H5_HL_SOVERS_MAJOR}.${H5_HL_SOVERS_RELEASE}.${H5_HL_SOVERS_MINOR}")
+endif ()
+string (REGEX MATCH ".*LT_HL_CXX_VERS_INTERFACE[ \t]+=[ \t]+([0-9]*).*$" H5_HL_CXX_SOVERS_EXISTS ${_lt_vers_am_contents})
+if (H5_HL_CXX_SOVERS_EXISTS)
+  string (REGEX REPLACE ".*LT_HL_CXX_VERS_INTERFACE[ \t]+=[ \t]+([0-9]*).*$"
+      "\\1" H5_HL_CXX_SOVERS_INTERFACE ${_lt_vers_am_contents})
+  string (REGEX REPLACE ".*LT_HL_CXX_VERS_REVISION[ \t]+=[ \t]+([0-9]*).*$"
+      "\\1" H5_HL_CXX_SOVERS_MINOR ${_lt_vers_am_contents})
+  string (REGEX REPLACE ".*LT_HL_CXX_VERS_AGE[ \t]+=[ \t]+([0-9]*).*$"
+      "\\1" H5_HL_CXX_SOVERS_RELEASE ${_lt_vers_am_contents})
+  math (EXPR H5_HL_CXX_SOVERS_MAJOR ${H5_HL_CXX_SOVERS_INTERFACE}-${H5_HL_CXX_SOVERS_RELEASE})
+  message (VERBOSE "SOVERSION_HL_CXX: ${H5_HL_CXX_SOVERS_MAJOR}.${H5_HL_CXX_SOVERS_RELEASE}.${H5_HL_CXX_SOVERS_MINOR}")
+endif ()
+string (REGEX MATCH ".*LT_HL_F_VERS_INTERFACE[ \t]+=[ \t]+([0-9]*).*$" H5_HL_F_SOVERS_EXISTS ${_lt_vers_am_contents})
+if (H5_HL_F_SOVERS_EXISTS)
+  string (REGEX REPLACE ".*LT_HL_F_VERS_INTERFACE[ \t]+=[ \t]+([0-9]*).*$"
+      "\\1" H5_HL_F_SOVERS_INTERFACE ${_lt_vers_am_contents})
+  string (REGEX REPLACE ".*LT_HL_F_VERS_REVISION[ \t]+=[ \t]+([0-9]*).*$"
+      "\\1" H5_HL_F_SOVERS_MINOR ${_lt_vers_am_contents})
+  string (REGEX REPLACE ".*LT_HL_F_VERS_AGE[ \t]+=[ \t]+([0-9]*).*$"
+      "\\1" H5_HL_F_SOVERS_RELEASE ${_lt_vers_am_contents})
+  math (EXPR H5_HL_F_SOVERS_MAJOR ${H5_HL_F_SOVERS_INTERFACE}-${H5_HL_F_SOVERS_RELEASE})
+  message (VERBOSE "SOVERSION_HL_F: ${H5_HL_F_SOVERS_MAJOR}.${H5_HL_F_SOVERS_RELEASE}.${H5_HL_F_SOVERS_MINOR}")
+endif ()
+string (REGEX MATCH ".*LT_JAVA_VERS_INTERFACE[ \t]+=[ \t]+([0-9]*).*$" H5_JAVA_SOVERS_EXISTS ${_lt_vers_am_contents})
+if(H5_JAVA_SOVERS_EXISTS)
+  string (REGEX REPLACE ".*LT_JAVA_VERS_INTERFACE[ \t]+=[ \t]+([0-9]*).*$"
+      "\\1" H5_JAVA_SOVERS_INTERFACE ${_lt_vers_am_contents})
+  string (REGEX REPLACE ".*LT_JAVA_VERS_REVISION[ \t]+=[ \t]+([0-9]*).*$"
+      "\\1" H5_JAVA_SOVERS_MINOR ${_lt_vers_am_contents})
+  string (REGEX REPLACE ".*LT_JAVA_VERS_AGE[ \t]+=[ \t]+([0-9]*).*$"
+      "\\1" H5_JAVA_SOVERS_RELEASE ${_lt_vers_am_contents})
+  math (EXPR H5_JAVA_SOVERS_MAJOR ${H5_JAVA_SOVERS_INTERFACE}-${H5_JAVA_SOVERS_RELEASE})
+  message (VERBOSE "SOVERSION_JAVA: ${H5_JAVA_SOVERS_MAJOR}.${H5_JAVA_SOVERS_RELEASE}.${H5_JAVA_SOVERS_MINOR}")
+endif ()
 
 #-----------------------------------------------------------------------------
 # Basic HDF5 stuff here
@@ -202,12 +345,64 @@ set (HDF5_PACKAGE_NAME "HDF5")
 set (HDF5_PACKAGE_VERSION "${H5_VERS_MAJOR}.${H5_VERS_MINOR}.${H5_VERS_RELEASE}")
 set (HDF5_PACKAGE_VERSION_MAJOR "${H5_VERS_MAJOR}.${H5_VERS_MINOR}")
 set (HDF5_PACKAGE_VERSION_MINOR "${H5_VERS_RELEASE}")
-if (NOT "${H5_VERS_SUBRELEASE}" STREQUAL "")
-  set (HDF5_PACKAGE_VERSION_STRING "${HDF5_PACKAGE_VERSION}-${H5_VERS_SUBRELEASE}")
-else (NOT "${H5_VERS_SUBRELEASE}" STREQUAL "")
+if (H5_VERS_SUBRELEASE)
+  set (HDF5_PACKAGE_VERSION_STRING "${HDF5_PACKAGE_VERSION}.${H5_VERS_SUBRELEASE}")
+  set (HDF5_RELEASE_VERSION_STRING "${HDF5_PACKAGE_VERSION}-${H5_VERS_SUBRELEASE}")
+else ()
   set (HDF5_PACKAGE_VERSION_STRING "${HDF5_PACKAGE_VERSION}")
-endif (NOT "${H5_VERS_SUBRELEASE}" STREQUAL "")
-set (HDF5_PACKAGE_SOVERSION "${H5_SOVERS_MAJOR}.${H5_SOVERS_RELEASE}.${H5_SOVERS_MINOR}")
+  set (HDF5_RELEASE_VERSION_STRING "${HDF5_PACKAGE_VERSION}")
+endif ()
+set (HDF5_LIB_PACKAGE_SOVERSION "${H5_LIB_SOVERS_MAJOR}.${H5_LIB_SOVERS_RELEASE}.${H5_LIB_SOVERS_MINOR}")
+set (HDF5_LIB_PACKAGE_SOVERSION_MAJOR "${H5_LIB_SOVERS_MAJOR}")
+if (H5_TOOLS_SOVERS_EXISTS)
+  set (HDF5_TOOLS_PACKAGE_SOVERSION "${H5_TOOLS_SOVERS_MAJOR}.${H5_TOOLS_SOVERS_RELEASE}.${H5_TOOLS_SOVERS_MINOR}")
+  set (HDF5_TOOLS_PACKAGE_SOVERSION_MAJOR "${H5_TOOLS_SOVERS_MAJOR}")
+else ()
+  set (HDF5_TOOLS_PACKAGE_SOVERSION "${H5_LIB_SOVERS_MAJOR}.${H5_LIB_SOVERS_RELEASE}.${H5_LIB_SOVERS_MINOR}")
+  set (HDF5_TOOLS_PACKAGE_SOVERSION_MAJOR "${H5_LIB_SOVERS_MAJOR}")
+endif ()
+if (H5_CXX_SOVERS_EXISTS)
+  set (HDF5_CXX_PACKAGE_SOVERSION "${H5_CXX_SOVERS_MAJOR}.${H5_CXX_SOVERS_RELEASE}.${H5_CXX_SOVERS_MINOR}")
+  set (HDF5_CXX_PACKAGE_SOVERSION_MAJOR "${H5_CXX_SOVERS_MAJOR}")
+else ()
+  set (HDF5_CXX_PACKAGE_SOVERSION "${H5_LIB_SOVERS_MAJOR}.${H5_LIB_SOVERS_RELEASE}.${H5_LIB_SOVERS_MINOR}")
+  set (HDF5_CXX_PACKAGE_SOVERSION_MAJOR "${H5_LIB_SOVERS_MAJOR}")
+endif ()
+if (H5_F_SOVERS_EXISTS)
+  set (HDF5_F_PACKAGE_SOVERSION "${H5_F_SOVERS_MAJOR}.${H5_F_SOVERS_RELEASE}.${H5_F_SOVERS_MINOR}")
+  set (HDF5_F_PACKAGE_SOVERSION_MAJOR "${H5_F_SOVERS_MAJOR}")
+else ()
+  set (HDF5_F_PACKAGE_SOVERSION "${H5_LIB_SOVERS_MAJOR}.${H5_LIB_SOVERS_RELEASE}.${H5_LIB_SOVERS_MINOR}")
+  set (HDF5_F_PACKAGE_SOVERSION_MAJOR "${H5_LIB_SOVERS_MAJOR}")
+endif ()
+if (H5_HL_SOVERS_EXISTS)
+  set (HDF5_HL_PACKAGE_SOVERSION "${H5_HL_SOVERS_MAJOR}.${H5_HL_SOVERS_RELEASE}.${H5_HL_SOVERS_MINOR}")
+  set (HDF5_HL_PACKAGE_SOVERSION_MAJOR "${H5_HL_SOVERS_MAJOR}")
+else ()
+  set (HDF5_HL_PACKAGE_SOVERSION "${H5_LIB_SOVERS_MAJOR}.${H5_LIB_SOVERS_RELEASE}.${H5_LIB_SOVERS_MINOR}")
+  set (HDF5_HL_PACKAGE_SOVERSION_MAJOR "${H5_LIB_SOVERS_MAJOR}")
+endif ()
+if (H5_HL_F_SOVERS_EXISTS)
+  set (HDF5_HL_CXX_PACKAGE_SOVERSION "${H5_HL_CXX_SOVERS_MAJOR}.${H5_HL_CXX_SOVERS_RELEASE}.${H5_HL_CXX_SOVERS_MINOR}")
+  set (HDF5_HL_CXX_PACKAGE_SOVERSION_MAJOR "${H5_HL_CXX_SOVERS_MAJOR}")
+else ()
+  set (HDF5_HL_CXX_PACKAGE_SOVERSION "${H5_LIB_SOVERS_MAJOR}.${H5_LIB_SOVERS_RELEASE}.${H5_LIB_SOVERS_MINOR}")
+  set (HDF5_HL_CXX_PACKAGE_SOVERSION_MAJOR "${H5_LIB_SOVERS_MAJOR}")
+endif ()
+if (H5_HL_F_SOVERS_EXISTS)
+  set (HDF5_HL_F_PACKAGE_SOVERSION "${H5_HL_F_SOVERS_MAJOR}.${H5_HL_F_SOVERS_RELEASE}.${H5_HL_F_SOVERS_MINOR}")
+  set (HDF5_HL_F_PACKAGE_SOVERSION_MAJOR "${H5_HL_F_SOVERS_MAJOR}")
+else ()
+  set (HDF5_HL_F_PACKAGE_SOVERSION "${H5_LIB_SOVERS_MAJOR}.${H5_LIB_SOVERS_RELEASE}.${H5_LIB_SOVERS_MINOR}")
+  set (HDF5_HL_F_PACKAGE_SOVERSION_MAJOR "${H5_LIB_SOVERS_MAJOR}")
+endif ()
+if (H5_JAVA_SOVERS_EXISTS)
+  set (HDF5_JAVA_PACKAGE_SOVERSION "${H5_JAVA_SOVERS_MAJOR}.${H5_JAVA_SOVERS_RELEASE}.${H5_JAVA_SOVERS_MINOR}")
+  set (HDF5_JAVA_PACKAGE_SOVERSION_MAJOR "${H5_JAVA_SOVERS_MAJOR}")
+else ()
+  set (HDF5_JAVA_PACKAGE_SOVERSION "${H5_LIB_SOVERS_MAJOR}.${H5_LIB_SOVERS_RELEASE}.${H5_LIB_SOVERS_MINOR}")
+  set (HDF5_JAVA_PACKAGE_SOVERSION_MAJOR "${H5_LIB_SOVERS_MAJOR}")
+endif ()
 set (HDF5_PACKAGE_STRING "${HDF5_PACKAGE_NAME} ${HDF5_PACKAGE_VERSION_STRING}")
 set (HDF5_PACKAGE_TARNAME "${HDF5_PACKAGE}${HDF_PACKAGE_EXT}")
 set (HDF5_PACKAGE_URL "http://www.hdfgroup.org")
@@ -216,41 +411,21 @@ set (HDF5_PACKAGE_BUGREPORT "help@hdfgroup.org")
 #-----------------------------------------------------------------------------
 # Include some macros for reusable code
 #-----------------------------------------------------------------------------
-include (${HDF_RESOURCES_EXT_DIR}/HDFMacros.cmake)
-include (${HDF_RESOURCES_EXT_DIR}/HDFLibMacros.cmake)
-include (${HDF_RESOURCES_DIR}/HDF5Macros.cmake)
+include (${HDF_RESOURCES_DIR}/HDFMacros.cmake)
 
-#-----------------------------------------------------------------------------
-# Setup output Directories
-#-----------------------------------------------------------------------------
-if (NOT HDF5_EXTERNALLY_CONFIGURED)
-  set (CMAKE_RUNTIME_OUTPUT_DIRECTORY
-      ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Executables."
-  )
-  set (CMAKE_LIBRARY_OUTPUT_DIRECTORY
-      ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Libraries"
-  )
-  set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY
-      ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all static libraries."
-  )
-  set (CMAKE_Fortran_MODULE_DIRECTORY
-      ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all fortran modules."
-  )
-else (NOT HDF5_EXTERNALLY_CONFIGURED)
-  # if we are externally configured, but the project uses old cmake scripts
-  # this may not be set and utilities like H5detect will fail
-  if (NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
-    set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
-  endif (NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
-endif (NOT HDF5_EXTERNALLY_CONFIGURED)
+HDF_DIR_PATHS(${HDF5_PACKAGE_NAME})
+
+include (${HDF_RESOURCES_DIR}/HDFLibMacros.cmake)
+include (${HDF_RESOURCES_DIR}/HDF5PluginMacros.cmake)
+include (${HDF_RESOURCES_DIR}/HDF5Macros.cmake)
 
 #-----------------------------------------------------------------------------
 # Targets built within this project are exported at Install time for use
-# by other projects using FindHDF5. 
+# by other projects.
 #-----------------------------------------------------------------------------
 if (NOT HDF5_EXPORTED_TARGETS)
   set (HDF5_EXPORTED_TARGETS "hdf5-targets")
-endif (NOT HDF5_EXPORTED_TARGETS)
+endif ()
 
 #-----------------------------------------------------------------------------
 # To include a library in the list exported by the project AT BUILD TIME,
@@ -258,6 +433,8 @@ endif (NOT HDF5_EXPORTED_TARGETS)
 # which include hdf5 as a sub-project within their build tree
 #-----------------------------------------------------------------------------
 set_global_variable (HDF5_LIBRARIES_TO_EXPORT "")
+set_global_variable (HDF5_UTILS_TO_EXPORT "")
+
 set (EXTERNAL_HEADER_LIST "")
 set (EXTERNAL_LIBRARY_LIST "")
 set (EXTERNAL_LIBRARYDLL_LIST "")
@@ -270,69 +447,128 @@ include (${HDF_RESOURCES_DIR}/ConfigureChecks.cmake)
 set (CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE ON)
 
 #-----------------------------------------------------------------------------
-# Option to Build Shared/Static libs, default is static
+# Mac OS X Options
 #-----------------------------------------------------------------------------
-option (BUILD_SHARED_LIBS "Build Shared Libraries" OFF)
-set (LIB_TYPE STATIC)
-set (H5_ENABLE_SHARED_LIB NO)
+if (HDF5_BUILD_FRAMEWORKS AND NOT BUILD_SHARED_LIBS)
+  set (BUILD_SHARED_LIBS ON CACHE BOOL "Build Shared Libraries" FORCE)
+endif ()
+
+#-----------------------------------------------------------------------------
+# Option to Build Shared and Static libs, default is both
+#-----------------------------------------------------------------------------
+option (BUILD_STATIC_LIBS "Build Static Libraries" ON)
 set (H5_ENABLE_STATIC_LIB NO)
+option (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
+set (H5_ENABLE_SHARED_LIB NO)
+option (ONLY_SHARED_LIBS "Only Build Shared Libraries" OFF)
+mark_as_advanced (ONLY_SHARED_LIBS)
+
+if (BUILD_STATIC_LIBS)
+  set (H5_ENABLE_STATIC_LIB YES)
+endif ()
 if (BUILD_SHARED_LIBS)
-  set (LIB_TYPE SHARED)
-  set (H5_BUILT_AS_DYNAMIC_LIB 1)
   set (H5_ENABLE_SHARED_LIB YES)
-else (BUILD_SHARED_LIBS)
-  set (H5_BUILT_AS_STATIC_LIB 1)
-  set (H5_ENABLE_STATIC_LIB YES)
-endif (BUILD_SHARED_LIBS)
+endif ()
+
+# Force only shared libraries if all OFF
+if (NOT BUILD_STATIC_LIBS AND NOT BUILD_SHARED_LIBS)
+  set (ONLY_SHARED_LIBS ON CACHE BOOL "Only Build Shared Libraries" FORCE)
+endif ()
+
+if (ONLY_SHARED_LIBS)
+  set (H5_ENABLE_STATIC_LIB NO)
+  set (BUILD_SHARED_LIBS ON CACHE BOOL "Build Shared Libraries")
+endif ()
+
 set (CMAKE_POSITION_INDEPENDENT_CODE ON)
 
+if (NOT BUILD_SHARED_LIBS)
+  set (tgt_file_ext "")
+else ()
+  set (tgt_file_ext "-shared")
+endif ()
+
+#-----------------------------------------------------------------------------
+# perl is used in some optional src and tests, check availability
+find_package (Perl)
+if (PERL_FOUND)
+  set (H5_PERL_FOUND YES)
+endif ()
+#-----------------------------------------------------------------------------
+
 #-----------------------------------------------------------------------------
 # Option to Build Static executables
 #-----------------------------------------------------------------------------
-option (BUILD_STATIC_EXECS "Build Static Executabless" OFF)
+option (BUILD_STATIC_EXECS "Build Static Executables" OFF)
 if (BUILD_STATIC_EXECS)
   if (NOT WIN32)
     set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -static")
     set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static")
-  endif (NOT WIN32)
-endif (BUILD_STATIC_EXECS)
+  endif ()
+endif ()
+
+option (HDF5_ENABLE_ANALYZER_TOOLS "enable the use of Clang tools" OFF)
+mark_as_advanced (HDF5_ENABLE_ANALYZER_TOOLS)
+if (HDF5_ENABLE_ANALYZER_TOOLS)
+  include (${HDF5_SOURCE_DIR}/config/sanitizer/tools.cmake)
+endif ()
+option (HDF5_ENABLE_SANITIZERS "execute the Clang sanitizer" OFF)
+mark_as_advanced (HDF5_ENABLE_SANITIZERS)
+if (HDF5_ENABLE_SANITIZERS)
+  include (${HDF5_SOURCE_DIR}/config/sanitizer/sanitizers.cmake)
+endif ()
+option (HDF5_ENABLE_FORMATTERS "format source files" OFF)
+mark_as_advanced (HDF5_ENABLE_FORMATTERS)
+if (HDF5_ENABLE_FORMATTERS)
+  include (${HDF5_SOURCE_DIR}/config/sanitizer/formatting.cmake)
+endif ()
 
 #-----------------------------------------------------------------------------
 # Option to use code coverage
 #-----------------------------------------------------------------------------
 option (HDF5_ENABLE_COVERAGE "Enable code coverage for Libraries and Programs" OFF)
 if (HDF5_ENABLE_COVERAGE)
-  set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage")
-  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage")
-  set (LDFLAGS "${LDFLAGS} -fprofile-arcs -ftest-coverage")   
-endif (HDF5_ENABLE_COVERAGE)
-
-#-----------------------------------------------------------------------------
-# Option to indicate using dmalloc
-#-----------------------------------------------------------------------------
-# option (HDF5_ENABLE_USING_DMALLOC "Indicate that dmalloc is used" OFF)
-# if (HDF5_ENABLE_USING_DMALLOC)
-#   find_package (DMALLOC)
-#   set (H5_HAVE_DMALLOC DMALLOC_FOUND)   
-# endif (HDF5_ENABLE_USING_DMALLOC)
+  include (${HDF5_SOURCE_DIR}/config/sanitizer/code-coverage.cmake)
+  if(CODE_COVERAGE AND CODE_COVERAGE_ADDED)
+    add_code_coverage () # Adds instrumentation to all targets
+  else ()
+    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0 --coverage -fprofile-arcs -ftest-coverage")
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g --coverage -O0 -fprofile-arcs -ftest-coverage")
+    if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
+      set (LDFLAGS "${LDFLAGS} -fprofile-arcs -ftest-coverage")
+      link_libraries (gcov)
+    else ()
+      set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage")
+    endif ()
+  endif ()
+endif ()
 
 #-----------------------------------------------------------------------------
 # Option to indicate using a memory checker
 #-----------------------------------------------------------------------------
 option (HDF5_ENABLE_USING_MEMCHECKER "Indicate that a memory checker is used" OFF)
 if (HDF5_ENABLE_USING_MEMCHECKER)
-  set (H5_USING_MEMCHECKER 1)   
-endif (HDF5_ENABLE_USING_MEMCHECKER)
+  set (H5_USING_MEMCHECKER 1)
+endif ()
+
+#-----------------------------------------------------------------------------
+# Option to enable/disable using pread/pwrite for VFDs
+#-----------------------------------------------------------------------------
+option (HDF5_ENABLE_PREADWRITE "Use pread/pwrite in sec2/log/core VFDs in place of read/write (when available)" ON)
+mark_as_advanced (HDF5_ENABLE_PREADWRITE)
+if (HDF5_ENABLE_PREADWRITE AND H5_HAVE_PREAD AND H5_HAVE_PWRITE)
+  set (H5_HAVE_PREADWRITE 1)
+endif ()
 
 #-----------------------------------------------------------------------------
 # Option to use deprecated public API symbols
 #-----------------------------------------------------------------------------
 option (HDF5_ENABLE_DEPRECATED_SYMBOLS "Enable deprecated public API symbols" ON)
 if (HDF5_ENABLE_DEPRECATED_SYMBOLS)
-  set (H5_NO_DEPRECATED_SYMBOLS 0)   
-else (HDF5_ENABLE_DEPRECATED_SYMBOLS)
-  set (H5_NO_DEPRECATED_SYMBOLS 1)   
-endif (HDF5_ENABLE_DEPRECATED_SYMBOLS)
+  set (H5_NO_DEPRECATED_SYMBOLS 0)
+else ()
+  set (H5_NO_DEPRECATED_SYMBOLS 1)
+endif ()
 
 #-----------------------------------------------------------------------------
 # When building utility executables that generate other (source) files :
@@ -340,345 +576,252 @@ endif (HDF5_ENABLE_DEPRECATED_SYMBOLS)
 # Certain systems may add /Debug or /Release to output paths
 # and we need to call the executable from inside the CMake configuration
 #-----------------------------------------------------------------------------
-set (EXE_EXT "")
 if (WIN32)
-  set (EXE_EXT ".exe")
-  if (NOT CYGWIN)
-    add_definitions (-D_BIND_TO_CURRENT_VCLIBS_VERSION=1)
-    add_definitions (-D_CRT_SECURE_NO_WARNINGS)
-    add_definitions (-D_CONSOLE)
-  endif (NOT CYGWIN)
-endif (WIN32)
+  add_compile_definitions (_CRT_SECURE_NO_WARNINGS)
+  if (MSVC)
+    add_compile_definitions (_BIND_TO_CURRENT_VCLIBS_VERSION=1 _CONSOLE)
+  endif ()
+endif ()
+
+option (HDF5_MINGW_STATIC_GCC_LIBS "Statically link libgcc/libstdc++" OFF)
 
 if (MSVC)
   set (CMAKE_MFC_FLAG 0)
   set (WIN_COMPILE_FLAGS "")
   set (WIN_LINK_FLAGS "")
-endif (MSVC)
+endif ()
 
 set (MAKE_SYSTEM)
-if (CMAKE_BUILD_TOOL MATCHES "make")
+if (CMAKE_MAKE_PROGRAM MATCHES "make")
   set (MAKE_SYSTEM 1)
-endif (CMAKE_BUILD_TOOL MATCHES "make")
+endif ()
 
 set (CFG_INIT "/${CMAKE_CFG_INTDIR}")
 if (MAKE_SYSTEM)
   set (CFG_INIT "")
-endif (MAKE_SYSTEM)
+endif ()
+
+# Do not generate test programs by default
+option (HDF5_BUILD_GENERATORS "Build Test Generators" OFF)
 
 #-----------------------------------------------------------------------------
 # Add some definitions for Debug Builds
 #-----------------------------------------------------------------------------
 option (HDF5_ENABLE_TRACE "Enable API tracing capability" OFF)
 mark_as_advanced (HDF5_ENABLE_TRACE)
-if (CMAKE_BUILD_TYPE MATCHES Debug)
-  add_definitions (-DDEBUG)
-  # Enable tracing of the API
-  if (HDF5_ENABLE_TRACE)
-    add_definitions (-DH5_DEBUG_API )
-  endif (HDF5_ENABLE_TRACE)
+if (${HDF_CFG_NAME} MATCHES "Debug")
   # Enable instrumenting of the library's internal operations
   option (HDF5_ENABLE_INSTRUMENT "Instrument The library" OFF)
   if (HDF5_ENABLE_INSTRUMENT)
     set (H5_HAVE_INSTRUMENTED_LIBRARY 1)
-  endif (HDF5_ENABLE_INSTRUMENT)
+  endif ()
   mark_as_advanced (HDF5_ENABLE_INSTRUMENT)
-  #-- NMake Makefiles will overwhelm the console with warnings if -Wall is used.
-  if (NOT WIN32)
-    add_definitions (-Wall)
-  endif (NOT WIN32)
-else (CMAKE_BUILD_TYPE MATCHES Debug)
-  add_definitions (-DNDEBUG)
-  if (HDF5_ENABLE_TRACE)
-    add_definitions (-DH5_DEBUG_API )
-  endif (HDF5_ENABLE_TRACE)
-endif (CMAKE_BUILD_TYPE MATCHES Debug)
-
-#-----------------------------------------------------------------------------
-# Compiler specific flags : Shouldn't there be compiler tests for these
-#-----------------------------------------------------------------------------
-if (CMAKE_COMPILER_IS_GNUCC)
-  if (CMAKE_BUILD_TYPE MATCHES Debug)
-    set (CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS} -std=c99 -finline-functions -fno-common")
-  else (CMAKE_BUILD_TYPE MATCHES Debug)
-    set (CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS} -std=c99 -fomit-frame-pointer -finline-functions -fno-common")
-  endif (CMAKE_BUILD_TYPE MATCHES Debug)
-endif (CMAKE_COMPILER_IS_GNUCC)
-if (CMAKE_COMPILER_IS_GNUCXX)
-  if (CMAKE_BUILD_TYPE MATCHES Debug)
-    set (CMAKE_CXX_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_CXX_FLAGS} -finline-functions -fno-common")
-  else (CMAKE_BUILD_TYPE MATCHES Debug)
-    set (CMAKE_CXX_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_CXX_FLAGS} -fomit-frame-pointer -finline-functions -fno-common")
-  endif (CMAKE_BUILD_TYPE MATCHES Debug)
-endif (CMAKE_COMPILER_IS_GNUCXX)
-
-#-----------------------------------------------------------------------------
-# Option to embed library info into executables
-#-----------------------------------------------------------------------------
-option (HDF5_ENABLE_EMBEDDED_LIBINFO "embed library info into executables" ON)
-if (HDF5_ENABLE_EMBEDDED_LIBINFO)
-  set (H5_HAVE_EMBEDDED_LIBINFO 1)
-endif (HDF5_ENABLE_EMBEDDED_LIBINFO)
-
-#-----------------------------------------------------------------------------
-# Option to allow the user to disable compiler warnings
-#-----------------------------------------------------------------------------
-option (HDF5_DISABLE_COMPILER_WARNINGS "Disable compiler warnings" OFF)
-if (HDF5_DISABLE_COMPILER_WARNINGS)
-  # MSVC uses /w to suppress warnings.  It also complains if another
-  # warning level is given, so remove it.
-  if (MSVC)
-    set (HDF5_WARNINGS_BLOCKED 1)
-    string (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
-    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /w")
-    string (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /w")
-  endif (MSVC)
-  if (WIN32)
-    add_definitions (-D_CRT_SECURE_NO_WARNINGS)
-  endif (WIN32)
-  # Borland uses -w- to suppress warnings.
-  if (BORLAND)
-    set (HDF5_WARNINGS_BLOCKED 1)
-    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w-")
-  endif (BORLAND)
-
-  # Most compilers use -w to suppress warnings.
-  if (NOT HDF5_WARNINGS_BLOCKED)
-    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w")
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
-  endif (NOT HDF5_WARNINGS_BLOCKED)
-endif (HDF5_DISABLE_COMPILER_WARNINGS)
-
-#-----------------------------------------------------------------------------
-# CDash is configured to only allow 3000 warnings, so
-# break into groups (from the config/gnu-flags file)
-#-----------------------------------------------------------------------------
-if (NOT MSVC)
-  if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
-    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wextra -Wundef -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wconversion -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline")
-  else (NOT ${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
-    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -erroff=%none -DBSD_COMP")
-  endif (NOT ${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
-    # Append warning flags
-    # Don't use the '-Wtraditional' flag, we're way past having K&R C code
-    # set (H5_CFLAGS "${H5_CFLAGS} -Wtraditional")
-    # Don't use the '-Wtraditional-conversion' flag, there's too many warnings
-    #  from GCC's assert macro
-    # set (H5_CFLAGS "${H5_CFLAGS} -Wtraditional-conversion")
-
-    # Append warning flags from gcc-3* case
-    # (don't use -Wpadded flag for normal builds, many of the warnings its
-    #   issuing can't be fixed and they are making it hard to detect other,
-    #   more important warnings)
-    #set (H5_CFLAGS "${H5_CFLAGS} -Wfloat-equal -Wmissing-format-attribute -Wpadded")
-    set (H5_CFLAGS1 "${H5_CFLAGS1} -Wfloat-equal -Wmissing-format-attribute")
-
-    # Append warning flags from gcc-3.2* case
-    set (H5_CFLAGS1 "${H5_CFLAGS1} -Wmissing-noreturn -Wpacked -Wdisabled-optimization")
-
-    # Enable more format checking flags, beyond the basic -Wformat included
-    # in -Wall
-    set (H5_CFLAGS1 "${H5_CFLAGS1} -Wformat=2")
-
-    # The "unreachable code" warning appears to be reliable now...
-    # (this warning was removed in gcc 4.5+)
-    #set (H5_CFLAGS "${H5_CFLAGS} -Wunreachable-code")
-
-    # Append warning flags from gcc-3.3* case
-    set (H5_CFLAGS1 "${H5_CFLAGS1} -Wendif-labels")
-
-    # Append warning flags from gcc-3.4* case
-    set (H5_CFLAGS2 "${H5_CFLAGS2} -Wdeclaration-after-statement -Wold-style-definition -Winvalid-pch")
-
-    # Append more extra warning flags that only gcc4.0+ know about
-    set (H5_CFLAGS2 "${H5_CFLAGS2} -Wvariadic-macros -Winit-self -Wmissing-include-dirs -Wswitch-default -Wswitch-enum -Wunused-macros")
-
-    # Append more extra warning flags that only gcc 4.1+ know about
-    set (H5_CFLAGS3 "${H5_CFLAGS3} -Wunsafe-loop-optimizations -Wc++-compat")
-
-    # Append more extra warning flags that only gcc 4.2+ know about
-    set (H5_CFLAGS3 "${H5_CFLAGS3} -Wstrict-overflow")
-
-    # Append more extra warning flags that only gcc 4.3+ know about
-    #
-    # Technically, variable-length arrays are part of the C99 standard, but
-    #   we should approach them a bit cautiously... -QAK
-    set (H5_CFLAGS3 "${H5_CFLAGS3} -Wlogical-op -Wlarger-than=2048 -Wvla")
-
-    # Append more extra warning flags that only gcc 4.4+ know about
-    set (H5_CFLAGS4 "${H5_CFLAGS4} -Wsync-nand -Wframe-larger-than=16384 -Wpacked-bitfield-compat")
-
-    # Append more extra warning flags that only gcc 4.5+ know about
-    set (H5_CFLAGS4 "${H5_CFLAGS4} -Wstrict-overflow=5 -Wjump-misses-init -Wunsuffixed-float-constants")
-
-    # Append more extra warning flags that only gcc 4.6+ know about
-    set (H5_CFLAGS5 "${H5_CFLAGS5} -Wdouble-promotion -Wsuggest-attribute=const -Wtrampolines")
-
-    # Append more extra warning flags that only gcc 4.7+ know about
-    set (H5_CFLAGS5 "${H5_CFLAGS5} -Wstack-usage=8192 -Wvector-operation-performance -Wsuggest-attribute=pure -Wsuggest-attribute=noreturn")
-endif (NOT MSVC)
-  
-#-----------------------------------------------------------------------------
-# Option to allow the user to enable all warnings
-#-----------------------------------------------------------------------------
-option (HDF5_ENABLE_ALL_WARNINGS "Enable all warnings" OFF)
-if (HDF5_ENABLE_ALL_WARNINGS)
-  if (MSVC)
-    string (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
-    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Wall")
-    string (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Wall")
-  else (MSVC)
-    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -pedantic ${H5_CFLAGS1} ${H5_CFLAGS2} ${H5_CFLAGS3} ${H5_CFLAGS4}")
-  endif (MSVC)
-endif (HDF5_ENABLE_ALL_WARNINGS)
-
-#-----------------------------------------------------------------------------
-# Option to allow the user to enable warnings by groups
-#-----------------------------------------------------------------------------
-option (HDF5_ENABLE_GROUPZERO_WARNINGS "Enable group zero warnings" OFF)
-if (HDF5_ENABLE_GROUPZERO_WARNINGS)
-  if (MSVC)
-    string (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
-    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W1")
-    string (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W1")
-  else (MSVC)
-    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -pedantic")
-  endif (MSVC)
-endif (HDF5_ENABLE_GROUPZERO_WARNINGS)
-
-#-----------------------------------------------------------------------------
-# Option to allow the user to enable warnings by groups
-#-----------------------------------------------------------------------------
-option (HDF5_ENABLE_GROUPONE_WARNINGS "Enable group one warnings" OFF)
-if (HDF5_ENABLE_GROUPONE_WARNINGS)
-  if (MSVC)
-    string (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
-    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W2")
-    string (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W2")
-  else (MSVC)
-    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${H5_CFLAGS1}")
-  endif (MSVC)
-endif (HDF5_ENABLE_GROUPONE_WARNINGS)
-
-#-----------------------------------------------------------------------------
-# Option to allow the user to enable warnings by groups
-#-----------------------------------------------------------------------------
-option (HDF5_ENABLE_GROUPTWO_WARNINGS "Enable group two warnings" OFF)
-if (HDF5_ENABLE_GROUPTWO_WARNINGS)
-  if (MSVC)
-    string (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
-    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W3")
-    string (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3")
-  else (MSVC)
-    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${H5_CFLAGS2}")
-  endif (MSVC)
-endif (HDF5_ENABLE_GROUPTWO_WARNINGS)
+endif ()
 
 #-----------------------------------------------------------------------------
-# Option to allow the user to enable warnings by groups
+# Add some definitions for Developer Builds
 #-----------------------------------------------------------------------------
-option (HDF5_ENABLE_GROUPTHREE_WARNINGS "Enable group three warnings" OFF)
-if (HDF5_ENABLE_GROUPTHREE_WARNINGS)
-  if (MSVC)
-    string (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
-    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4")
-    string (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
-  else (MSVC)
-    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${H5_CFLAGS3}")
-  endif (MSVC)
-endif (HDF5_ENABLE_GROUPTHREE_WARNINGS)
+if (${HDF_CFG_NAME} MATCHES "Developer")
+  include (${HDF_RESOURCES_DIR}/HDF5DeveloperBuild.cmake)
+endif ()
 
 #-----------------------------------------------------------------------------
-# Option to allow the user to enable warnings by groups
-#-----------------------------------------------------------------------------
-option (HDF5_ENABLE_GROUPFOUR_WARNINGS "Enable group four warnings" OFF)
-if (HDF5_ENABLE_GROUPFOUR_WARNINGS)
-  if (NOT MSVC)
-    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${H5_CFLAGS4}")
-  endif (NOT MSVC)
-endif (HDF5_ENABLE_GROUPFOUR_WARNINGS)
-
-#-----------------------------------------------------------------------------
-# Option to allow the user to enable warnings by groups
-#-----------------------------------------------------------------------------
-option (HDF5_ENABLE_GROUPFIVE_WARNINGS "Enable group five warnings" OFF)
-if (HDF5_ENABLE_GROUPFIVE_WARNINGS)
-  if (NOT MSVC)
-    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${H5_CFLAGS5}")
-  endif (NOT MSVC)
-endif (HDF5_ENABLE_GROUPFIVE_WARNINGS)
-
-#-----------------------------------------------------------------------------
-# This is in here to help some of the GCC based IDES like Eclipse
-# and code blocks parse the compiler errors and warnings better.
-#-----------------------------------------------------------------------------
-if (CMAKE_COMPILER_IS_GNUCC)
-  set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fmessage-length=0")
-endif (CMAKE_COMPILER_IS_GNUCC)
-if (CMAKE_COMPILER_IS_GNUCXX)
-  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fmessage-length=0")
-endif (CMAKE_COMPILER_IS_GNUCXX)
-
-#-----------------------------------------------------------------------------
-# All libs/tests/examples need the main include directories
+# Option to embed library info into executables
 #-----------------------------------------------------------------------------
-INCLUDE_DIRECTORIES (${HDF5_BINARY_DIR} ${HDF5_SRC_DIR} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
+  set (H5_HAVE_EMBEDDED_LIBINFO 0)
+else ()
+  option (HDF5_ENABLE_EMBEDDED_LIBINFO "embed library info into executables" ON)
+  if (HDF5_ENABLE_EMBEDDED_LIBINFO)
+    set (H5_HAVE_EMBEDDED_LIBINFO 1)
+  endif ()
+endif ()
+
+include (${HDF_RESOURCES_DIR}/HDFCompilerFlags.cmake)
+set (CMAKE_MODULE_PATH ${HDF_RESOURCES_DIR} ${HDF_RESOURCES_DIR} ${CMAKE_MODULE_PATH})
+
+#-----------------------------------------------------------------------------
+# Option to Enable HDFS
+#-----------------------------------------------------------------------------
+option (HDF5_ENABLE_HDFS "Enable HDFS" OFF)
+if (HDF5_ENABLE_HDFS)
+  find_package(JNI REQUIRED)
+  if (JNI_FOUND)
+    set (H5_HAVE_LIBJVM 1)
+  endif ()
+  find_package(HDFS REQUIRED)
+  if (HDFS_FOUND)
+    set (H5_HAVE_LIBHDFS 1)
+    set (H5_HAVE_HDFS_H 1)
+    if (NOT MSVC)
+      list (APPEND LINK_LIBS -pthread)
+    endif ()
+  else ()
+    message (FATAL_ERROR "Set to use libhdfs library, but could not find or use libhdfs. Please verify that the path to HADOOP_HOME is valid, and/or reconfigure without HDF5_ENABLE_HDFS")
+  endif ()
+endif ()
 
 #-----------------------------------------------------------------------------
 # Option to Enable MPI Parallel
 #-----------------------------------------------------------------------------
-set (CMAKE_MODULE_PATH ${HDF_RESOURCES_DIR} ${HDF_RESOURCES_EXT_DIR} ${CMAKE_MODULE_PATH})
 option (HDF5_ENABLE_PARALLEL "Enable parallel build (requires MPI)" OFF)
 if (HDF5_ENABLE_PARALLEL)
-  include (FindMPI)
-  INCLUDE_DIRECTORIES (${MPI_C_INCLUDE_PATH})
+  find_package(MPI REQUIRED)
   if (MPI_C_FOUND)
     set (H5_HAVE_PARALLEL 1)
     # MPI checks, only do these if MPI_C_FOUND is true, otherwise they always fail
     # and once set, they are cached as false and not regenerated
-    set (CMAKE_REQUIRED_LIBRARIES "${MPI_C_LIBRARIES}" )
+    set (CMAKE_REQUIRED_LIBRARIES "${MPI_C_LIBRARIES}")
+    set (CMAKE_REQUIRED_INCLUDES "${MPI_C_INCLUDE_DIRS}")
     # Used by Fortran + MPI
-    CHECK_SYMBOL_EXISTS (MPI_Comm_c2f "${MPI_C_INCLUDE_PATH}/mpi.h"  H5_HAVE_MPI_MULTI_LANG_Comm)
-    CHECK_SYMBOL_EXISTS (MPI_Info_c2f "${MPI_C_INCLUDE_PATH}/mpi.h"  H5_HAVE_MPI_MULTI_LANG_Info)
-  else (MPI_C_FOUND)
-    message (STATUS "Parallel libraries not found")
-  endif (MPI_C_FOUND)
-endif (HDF5_ENABLE_PARALLEL)
+    CHECK_SYMBOL_EXISTS (MPI_Comm_c2f "mpi.h"  H5_HAVE_MPI_MULTI_LANG_Comm)
+    CHECK_SYMBOL_EXISTS (MPI_Info_c2f "mpi.h"  H5_HAVE_MPI_MULTI_LANG_Info)
+
+    # Used by Parallel Compression feature
+    set (PARALLEL_FILTERED_WRITES ON)
+    CHECK_SYMBOL_EXISTS (MPI_Ibarrier "mpi.h" H5_HAVE_MPI_Ibarrier)
+    CHECK_SYMBOL_EXISTS (MPI_Issend "mpi.h" H5_HAVE_MPI_Issend)
+    CHECK_SYMBOL_EXISTS (MPI_Iprobe "mpi.h" H5_HAVE_MPI_Iprobe)
+    CHECK_SYMBOL_EXISTS (MPI_Irecv "mpi.h" H5_HAVE_MPI_Irecv)
+    if (H5_HAVE_MPI_Ibarrier AND H5_HAVE_MPI_Issend AND H5_HAVE_MPI_Iprobe AND H5_HAVE_MPI_Irecv)
+      set (H5_HAVE_PARALLEL_FILTERED_WRITES 1)
+    else ()
+      message (WARNING "The MPI_Ibarrier/MPI_Issend/MPI_Iprobe/MPI_Irecv functions could not be located.
+               Parallel writes of filtered data will be disabled.")
+      set (PARALLEL_FILTERED_WRITES OFF)
+    endif ()
+
+    # Used by big I/O feature
+    set (LARGE_PARALLEL_IO ON)
+    CHECK_SYMBOL_EXISTS (MPI_Get_elements_x "mpi.h" H5_HAVE_MPI_Get_elements_x)
+    CHECK_SYMBOL_EXISTS (MPI_Type_size_x "mpi.h" H5_HAVE_MPI_Type_size_x)
+    if (NOT H5_HAVE_MPI_Get_elements_x OR NOT H5_HAVE_MPI_Type_size_x)
+      message (WARNING "The MPI_Get_elements_x and/or MPI_Type_size_x functions could not be located.
+               Reading/Writing >2GB of data in a single parallel I/O operation will be disabled.")
+      set (LARGE_PARALLEL_IO OFF)
+    endif ()
+  else ()
+    message (FATAL_ERROR "Parallel libraries not found")
+  endif ()
+endif ()
 
 # Parallel IO usage requires MPI to be Linked and Included
 if (H5_HAVE_PARALLEL)
   set (LINK_LIBS ${LINK_LIBS} ${MPI_C_LIBRARIES})
   if (MPI_C_LINK_FLAGS)
     set (CMAKE_EXE_LINKER_FLAGS "${MPI_C_LINK_FLAGS} ${CMAKE_EXE_LINKER_FLAGS}")
-  endif (MPI_C_LINK_FLAGS)
-endif (H5_HAVE_PARALLEL)
+  endif ()
+endif ()
+
+# Determine whether to build the HDF5 Subfiling VFD
+set (H5FD_SUBFILING_DIR ${HDF5_SRC_DIR}/H5FDsubfiling)
+set (HDF5_SRC_INCLUDE_DIRS
+    ${HDF5_SRC_INCLUDE_DIRS}
+    ${H5FD_SUBFILING_DIR}
+)
+option (HDF5_ENABLE_SUBFILING_VFD "Build Parallel HDF5 Subfiling VFD" OFF)
+if (HDF5_ENABLE_SUBFILING_VFD)
+  if (NOT HDF5_ENABLE_PARALLEL)
+    message (FATAL_ERROR "Subfiling VFD requires a parallel HDF5 build")
+  else ()
+    # Check for MPI_Comm_split_type
+    CHECK_SYMBOL_EXISTS (MPI_Comm_split_type "mpi.h" H5_HAVE_MPI_Comm_split_type)
+    if (NOT H5_HAVE_MPI_Comm_split_type)
+      message (FATAL_ERROR "Subfiling VFD requires MPI-3 support for MPI_Comm_split_type")
+    endif ()
+  endif()
+
+  if (NOT DEFINED Threads_FOUND)
+    set (THREADS_PREFER_PTHREAD_FLAG ON)
+    find_package (Threads REQUIRED)
+  endif ()
+
+  # For now, make sure we're using pthreads. Once Subfiling can be
+  # supported on Windows, we should allow Win32 threads as well
+  if (NOT ${Threads_FOUND} OR NOT ${CMAKE_USE_PTHREADS_INIT})
+    message (FATAL_ERROR "Subfiling requires pthreads for system thread library")
+  endif ()
+
+  CHECK_INCLUDE_FILE("stdatomic.h" HAVE_STDATOMIC_H)
+  if (NOT HAVE_STDATOMIC_H)
+    message (FATAL_ERROR "Subfiling VFD requires atomic operations support. C11 stdatomic.h NOT available.")
+  else()
+    set (H5_HAVE_STDATOMIC_H 1)
+  endif()
+
+  set (H5_HAVE_SUBFILING_VFD 1)
+  # IOC VFD is currently only built when subfiling is enabled
+  set (H5_HAVE_IOC_VFD 1)
+
+  message (STATUS "Setting up to use Mercury components")
+  set (H5FD_SUBFILING_MERCURY_DIR ${H5FD_SUBFILING_DIR}/mercury/src/util)
+  set (HDF5_SRC_INCLUDE_DIRS
+      ${HDF5_SRC_INCLUDE_DIRS}
+      ${H5FD_SUBFILING_MERCURY_DIR}
+  )
+  set (H5_HAVE_MERCURY_H 1)
+  set (CMAKE_REQUIRED_INCLUDES "${H5FD_SUBFILING_MERCURY_DIR}")
+endif()
 
-set (DEFAULT_API_VERSION "v110")
+#option (DEFAULT_API_VERSION "Enable v1.14 API (v16, v18, v110, v112, v114)" "v114")
+set (DEFAULT_API_VERSION "v114" CACHE STRING "Enable v1.14 API (v16, v18, v110, v112, v114)")
+set_property (CACHE DEFAULT_API_VERSION PROPERTY STRINGS v16 v18 v110 v112 v114)
 #-----------------------------------------------------------------------------
 # Option to use 1.6.x API
 #-----------------------------------------------------------------------------
-option (HDF5_USE_16_API_DEFAULT "Use the HDF5 1.6.x API by default" OFF)
 set (H5_USE_16_API_DEFAULT 0)
-if (HDF5_USE_16_API_DEFAULT)
+if (DEFAULT_API_VERSION MATCHES "v16")
   set (H5_USE_16_API_DEFAULT 1)
-  set (DEFAULT_API_VERSION "v16")
-endif (HDF5_USE_16_API_DEFAULT)
+endif ()
 
 #-----------------------------------------------------------------------------
 # Option to use 1.8.x API
 #-----------------------------------------------------------------------------
-option (HDF5_USE_18_API_DEFAULT "Use the HDF5 1.8.x API by default" OFF)
 set (H5_USE_18_API_DEFAULT 0)
-if (HDF5_USE_18_API_DEFAULT)
+if (DEFAULT_API_VERSION MATCHES "v18")
   set (H5_USE_18_API_DEFAULT 1)
-  set (DEFAULT_API_VERSION "v18")
-endif (HDF5_USE_18_API_DEFAULT)
+endif ()
+
+#-----------------------------------------------------------------------------
+# Option to use 1.10.x API
+#-----------------------------------------------------------------------------
+set (H5_USE_110_API_DEFAULT 0)
+if (DEFAULT_API_VERSION MATCHES "v110")
+  set (H5_USE_110_API_DEFAULT 1)
+endif ()
+
+#-----------------------------------------------------------------------------
+# Option to use 1.12.x API
+#-----------------------------------------------------------------------------
+if (NOT DEFAULT_API_VERSION)
+  set (DEFAULT_API_VERSION "v112")
+endif ()
+set (H5_USE_112_API_DEFAULT 0)
+if (DEFAULT_API_VERSION MATCHES "v112")
+  set (H5_USE_112_API_DEFAULT 1)
+endif ()
+
+#-----------------------------------------------------------------------------
+# Option to use 1.14.x API
+#-----------------------------------------------------------------------------
+if (NOT DEFAULT_API_VERSION)
+  set (DEFAULT_API_VERSION "v114")
+endif ()
+set (H5_USE_114_API_DEFAULT 0)
+if (DEFAULT_API_VERSION MATCHES "v114")
+  set (H5_USE_114_API_DEFAULT 1)
+endif ()
+
+#-----------------------------------------------------------------------------
+# Option to use 1.16.x API
+#-----------------------------------------------------------------------------
+if (NOT DEFAULT_API_VERSION)
+  set (DEFAULT_API_VERSION "v116")
+endif ()
+set (H5_USE_116_API_DEFAULT 0)
+if (DEFAULT_API_VERSION MATCHES "v116")
+  set (H5_USE_116_API_DEFAULT 1)
+endif ()
 
 #-----------------------------------------------------------------------------
 # Include user macros
@@ -699,100 +842,245 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED)
     set (HDF5_NO_PACKAGES OFF CACHE BOOL "CPACK - Disable packaging" FORCE)
     if (HDF5_ENABLE_Z_LIB_SUPPORT AND ZLIB_FOUND)
       PACKAGE_ZLIB_LIBRARY (${HDF5_ALLOW_EXTERNAL_SUPPORT})
-    endif (HDF5_ENABLE_Z_LIB_SUPPORT AND ZLIB_FOUND)
-    
+    endif ()
+
     if (HDF5_ENABLE_SZIP_SUPPORT AND SZIP_FOUND)
       PACKAGE_SZIP_LIBRARY (${HDF5_ALLOW_EXTERNAL_SUPPORT})
-    endif (HDF5_ENABLE_SZIP_SUPPORT AND SZIP_FOUND)
-  endif (HDF5_PACKAGE_EXTLIBS)
-endif (NOT HDF5_EXTERNALLY_CONFIGURED)
+    endif ()
+  endif ()
+endif ()
+
 #-----------------------------------------------------------------------------
 # Option to use threadsafe
-# Note: Currently CMake only allows configuring of threadsafe on 
-# non-Cygwin WINDOWS.
 #-----------------------------------------------------------------------------
-if (WIN32)
-  option (HDF5_ENABLE_THREADSAFE "Enable thread-safety" OFF)
-  if (HDF5_ENABLE_THREADSAFE)
-    # check for unsupported options
-    if (H5_BUILT_AS_STATIC_LIB)
-      message (FATAL_ERROR " **** thread-safety option not supported with static library **** ")
-    endif (H5_BUILT_AS_STATIC_LIB)
-    if (HDF5_ENABLE_PARALLEL)
-      message (FATAL_ERROR " **** parallel and thread-safety options are not supported **** ")
-    endif (HDF5_ENABLE_PARALLEL)
-    if (HDF5_BUILD_FORTRAN)
-      message (FATAL_ERROR " **** Fortran and thread-safety options are not supported **** ")
-    endif (HDF5_BUILD_FORTRAN)
-    if (HDF5_BUILD_CPP_LIB)
-      message (FATAL_ERROR " **** C++ and thread-safety options are not supported **** ")
-    endif (HDF5_BUILD_CPP_LIB)
+option (HDF5_ENABLE_THREADSAFE "Enable thread-safety" OFF)
+if (HDF5_ENABLE_THREADSAFE)
+  # check for unsupported options
+  if (WIN32)
+    message (VERBOSE " **** thread-safety option not supported with static library **** ")
+    message (VERBOSE " **** thread-safety option will not be used building static library **** ")
+  endif ()
+  if (HDF5_BUILD_FORTRAN)
+    if (NOT ALLOW_UNSUPPORTED)
+      message (FATAL_ERROR " **** Fortran and thread-safety options are not supported, override with ALLOW_UNSUPPORTED option **** ")
+    else ()
+      message (VERBOSE " **** Allowing unsupported Fortran and thread-safety options **** ")
+    endif ()
+  endif ()
+  if (HDF5_BUILD_CPP_LIB)
+    if (NOT ALLOW_UNSUPPORTED)
+      message (FATAL_ERROR " **** C++ and thread-safety options are not supported, override with ALLOW_UNSUPPORTED option **** ")
+    else ()
+      message (VERBOSE " **** Allowing unsupported C++ and thread-safety options **** ")
+    endif ()
+  endif ()
+  if (HDF5_BUILD_HL_LIB)
+    if (NOT ALLOW_UNSUPPORTED)
+      message (FATAL_ERROR " **** HL and thread-safety options are not supported, override with ALLOW_UNSUPPORTED option **** ")
+    else ()
+      message (VERBOSE " **** Allowing unsupported HL and thread-safety options **** ")
+    endif ()
+  endif ()
+  if (H5_HAVE_IOEO)
+    message (VERBOSE " **** Win32 threads requires WINVER>=0x600 (Windows Vista/7/8) **** ")
+    set (H5_HAVE_WIN_THREADS 1)
+  else ()
+    if (NOT H5_HAVE_PTHREAD_H)
+      message (FATAL_ERROR " **** thread-safe option requires Win32 threads or Pthreads **** ")
+    endif ()
+  endif ()
+  set (THREADS_PREFER_PTHREAD_FLAG ON)
+  find_package (Threads REQUIRED)
+  if (Threads_FOUND)
     set (H5_HAVE_THREADSAFE 1)
-    if (H5_HAVE_IOEO)
-      message (STATUS " **** Win32 threads requires WINVER>=0x600 (Windows Vista/7/8) **** ")
-      set (H5_HAVE_WIN_THREADS 1)
-    else (H5_HAVE_IOEO)
-      if (NOT H5_HAVE_PTHREAD_H)
-        set (H5_HAVE_THREADSAFE 0)
-        message (FATAL_ERROR " **** thread-safe option requires Win32 threads or Pthreads **** ")
-      endif (NOT H5_HAVE_PTHREAD_H)
-    endif (H5_HAVE_IOEO)
-  endif (HDF5_ENABLE_THREADSAFE)
-endif (WIN32)
-
-# -----------------------------------------------------------------------
-# wrapper script variables
-# 
-#set (CFLAGS "${C_DEFINES}")
-#set (CXXFLAGS "${CXX_DEFINES}")
+  endif ()
+endif ()
+
+#-----------------------------------------------------------------------------
+# Option to build the map API
+#-----------------------------------------------------------------------------
+option (HDF5_ENABLE_MAP_API "Build the map API" OFF)
+if (HDF5_ENABLE_MAP_API)
+  set (H5_HAVE_MAP_API 1)
+endif ()
 
 #-----------------------------------------------------------------------------
 # Add the HDF5 Library Target to the build
 #-----------------------------------------------------------------------------
-add_subdirectory (${HDF5_SOURCE_DIR}/src ${PROJECT_BINARY_DIR}/src)
+add_subdirectory (src)
 
-if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
+if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
   if (ZLIB_FOUND AND ZLIB_USE_EXTERNAL)
-    ADD_DEPENDENCIES (${HDF5_LIB_TARGET} ZLIB)
-  endif (ZLIB_FOUND AND ZLIB_USE_EXTERNAL)
+    if (NOT ONLY_SHARED_LIBS)
+      add_dependencies (${HDF5_LIB_TARGET} HDF5_ZLIB)
+    endif ()
+    if (BUILD_SHARED_LIBS)
+      add_dependencies (${HDF5_LIBSH_TARGET} HDF5_ZLIB)
+    endif ()
+  endif ()
   if (SZIP_FOUND AND SZIP_USE_EXTERNAL)
-    ADD_DEPENDENCIES (${HDF5_LIB_TARGET} SZIP)
-  endif (SZIP_FOUND AND SZIP_USE_EXTERNAL)
-endif (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
+    if (NOT ONLY_SHARED_LIBS)
+      add_dependencies (${HDF5_LIB_TARGET} SZIP)
+    endif ()
+    if (BUILD_SHARED_LIBS)
+      add_dependencies (${HDF5_LIBSH_TARGET} SZIP)
+    endif ()
+  endif ()
+endif ()
+
+#-----------------------------------------------------------------------------
+# Option to build documentation
+#-----------------------------------------------------------------------------
+option (HDF5_BUILD_DOC "Build documentation" OFF)
+if (HDF5_BUILD_DOC AND EXISTS "${HDF5_DOXYGEN_DIR}" AND IS_DIRECTORY "${HDF5_DOXYGEN_DIR}")
+# check if Doxygen is installed
+  find_package(Doxygen)
+  if (DOXYGEN_FOUND)
+    message(STATUS "Doxygen version: ${DOXYGEN_VERSION}")
+    add_subdirectory (doxygen)
+  else ()
+    message(STATUS "Doxygen needs to be installed to generate the doxygen documentation")
+  endif ()
+endif ()
 
 #-----------------------------------------------------------------------------
 # Dashboard and Testing Settings
 #-----------------------------------------------------------------------------
-option (BUILD_TESTING "Build HDF5 Unit Testing" OFF)
+option (BUILD_TESTING "Build HDF5 Unit Testing" ON)
 if (BUILD_TESTING)
   set (DART_TESTING_TIMEOUT 1200
-      CACHE INTEGER
+      CACHE STRING
       "Timeout in seconds for each test (default 1200=20minutes)"
   )
-  enable_testing ()
-  include (CTest)
-  if (NOT HDF5_EXTERNALLY_CONFIGURED)
-    if (EXISTS "${HDF5_SOURCE_DIR}/test" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/test")
-      add_subdirectory (${HDF5_SOURCE_DIR}/tools/lib ${PROJECT_BINARY_DIR}/tools/lib)
-      add_subdirectory (${HDF5_SOURCE_DIR}/test      ${PROJECT_BINARY_DIR}/test)
-    endif (EXISTS "${HDF5_SOURCE_DIR}/test" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/test")
-    if (H5_HAVE_PARALLEL)
-      if (EXISTS "${HDF5_SOURCE_DIR}/testpar" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/testpar")
-        add_subdirectory (${HDF5_SOURCE_DIR}/testpar ${PROJECT_BINARY_DIR}/testpar)
-      endif (EXISTS "${HDF5_SOURCE_DIR}/testpar" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/testpar")
-    endif (H5_HAVE_PARALLEL)
-  endif (NOT HDF5_EXTERNALLY_CONFIGURED)
+
+  # Generate a list of timeouts based on DART_TESTING_TIMEOUT
+  math (EXPR CTEST_SHORT_TIMEOUT "${DART_TESTING_TIMEOUT} / 2")
+  math (EXPR CTEST_LONG_TIMEOUT "${DART_TESTING_TIMEOUT} * 2")
+  math (EXPR CTEST_VERY_LONG_TIMEOUT "${DART_TESTING_TIMEOUT} * 3")
 
   option (HDF5_TEST_VFD "Execute tests with different VFDs" OFF)
   mark_as_advanced (HDF5_TEST_VFD)
   if (HDF5_TEST_VFD)
     option (HDF5_TEST_FHEAP_VFD "Execute tests with different VFDs" ON)
     mark_as_advanced (HDF5_TEST_FHEAP_VFD)
-  endif (HDF5_TEST_VFD)
-  
+
+    # Initialize the list of VFDs to be used for testing and create a test folder for each VFD
+    H5_SET_VFD_LIST()
+  endif ()
+
+  option (HDF5_TEST_PASSTHROUGH_VOL "Execute tests with different passthrough VOL connectors" OFF)
+  mark_as_advanced (HDF5_TEST_PASSTHROUGH_VOL)
+  if (HDF5_TEST_PASSTHROUGH_VOL)
+    option (HDF5_TEST_FHEAP_PASSTHROUGH_VOL "Execute fheap test with different passthrough VOL connectors" ON)
+    mark_as_advanced (HDF5_TEST_FHEAP_PASSTHROUGH VOL)
+  endif ()
+
+  set (H5_TEST_EXPRESS_LEVEL_DEFAULT "3")
+  set (HDF_TEST_EXPRESS "${H5_TEST_EXPRESS_LEVEL_DEFAULT}"
+      CACHE STRING "Control testing framework (0-3) (0 = exhaustive testing; 3 = quicker testing)")
+  mark_as_advanced (HDF_TEST_EXPRESS)
+  if (NOT "${HDF_TEST_EXPRESS}" STREQUAL "")
+    set (H5_TEST_EXPRESS_LEVEL_DEFAULT "${HDF_TEST_EXPRESS}")
+  endif ()
+
+  enable_testing ()
+  include (CTest)
+
   include (${HDF5_SOURCE_DIR}/CTestConfig.cmake)
   configure_file (${HDF_RESOURCES_DIR}/CTestCustom.cmake ${HDF5_BINARY_DIR}/CTestCustom.ctest @ONLY)
-endif (BUILD_TESTING)
+
+  option (HDF5_TEST_SERIAL "Execute non-parallel tests" ON)
+  mark_as_advanced (HDF5_TEST_SERIAL)
+
+  option (HDF5_TEST_TOOLS "Execute tools tests" ON)
+  mark_as_advanced (HDF5_TEST_TOOLS)
+
+  option (HDF5_TEST_EXAMPLES "Execute tests on examples" ON)
+  mark_as_advanced (HDF5_TEST_EXAMPLES)
+
+  option (HDF5_TEST_SWMR "Execute SWMR tests" ON)
+  mark_as_advanced (HDF5_TEST_SWMR)
+
+  option (HDF5_TEST_PARALLEL "Execute parallel tests" ON)
+  mark_as_advanced (HDF5_TEST_PARALLEL)
+
+  option (HDF5_TEST_FORTRAN "Execute fortran tests" ON)
+  mark_as_advanced (HDF5_TEST_FORTRAN)
+
+  option (HDF5_TEST_CPP "Execute cpp tests" ON)
+  mark_as_advanced (HDF5_TEST_CPP)
+
+  option (HDF5_TEST_JAVA "Execute java tests" ON)
+  mark_as_advanced (HDF5_TEST_JAVA)
+
+  if (NOT HDF5_EXTERNALLY_CONFIGURED)
+    if (EXISTS "${HDF5_SOURCE_DIR}/test" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/test")
+      add_subdirectory (test)
+    endif ()
+    if (H5_HAVE_PARALLEL)
+      if (EXISTS "${HDF5_SOURCE_DIR}/testpar" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/testpar")
+        add_subdirectory (testpar)
+      endif ()
+    endif ()
+  endif ()
+endif ()
+
+#-----------------------------------------------------------------------------
+# Option to build HDF5 Utilities
+#-----------------------------------------------------------------------------
+if (EXISTS "${HDF5_SOURCE_DIR}/utils" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/utils")
+  option (HDF5_BUILD_PARALLEL_TOOLS  "Build Parallel HDF5 Tools" OFF)
+  if (HDF5_BUILD_PARALLEL_TOOLS AND HDF5_ENABLE_PARALLEL)
+    set (CMAKE_PREFIX_PATH "$HDF_RESOURCES_DIR")
+    find_package(MFU REQUIRED)
+    if (MFU_FOUND)
+      message(STATUS "LL_PATH=${LL_PATH}")
+      set (H5_HAVE_LIBMFU 1)
+      set (H5_HAVE_MFU_H 1)
+      set (CMAKE_REQUIRED_INCLUDES "${MFU_INCLUDE_DIR}")
+      set (MFU_LIBRARY_DEBUG "$MFU_LIBRARY")
+      set (MFU_LIBRARY_RELEASE "$MFU_LIBRARY")
+    endif ()
+    find_package(CIRCLE REQUIRED)
+    if (CIRCLE_FOUND)
+      set (H5_HAVE_LIBCIRCLE 1)
+      set (H5_HAVE_CIRCLE_H 1)
+      set (CMAKE_REQUIRED_INCLUDES "${CIRCLE_INCLUDE_DIR}")
+    endif ()
+    find_package(DTCMP REQUIRED)
+    if (DTCMP_FOUND)
+      set (H5_HAVE_LIBDTCMP 1)
+      set (H5_HAVE_DTCMP_H 1)
+      set (CMAKE_REQUIRED_INCLUDES "${DTCMP_INCLUDE_DIR}")
+    endif ()
+  endif ()
+  add_subdirectory (utils)
+endif ()
+
+#-----------------------------------------------------------------------------
+# Option to build HDF5 Tools
+#-----------------------------------------------------------------------------
+if (EXISTS "${HDF5_SOURCE_DIR}/tools" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/tools")
+  option (HDF5_BUILD_TOOLS  "Build HDF5 Tools" ON)
+  if (HDF5_BUILD_TOOLS)
+    add_subdirectory (tools)
+  endif ()
+endif ()
+
+#-----------------------------------------------------------------------------
+# Include filter plugins
+#-----------------------------------------------------------------------------
+include (CMakePlugins.cmake)
+
+if (HDF5_PACKAGE_EXTLIBS AND NOT HDF5_NO_PACKAGES)
+  if (HDF5_ENABLE_PLUGIN_SUPPORT AND PLUGIN_FOUND)
+    PACKAGE_PLUGIN_LIBRARY (${HDF5_ALLOW_EXTERNAL_SUPPORT})
+#    option (HDF5_TEST_PLUGIN "Execute plugin tests" ON)
+#    mark_as_advanced (HDF5_TEST_PLUGIN)
+
+#    TEST_PLUGIN_LIBRARY ()
+  endif ()
+endif ()
 
 #-----------------------------------------------------------------------------
 # Option to build examples
@@ -800,9 +1088,9 @@ endif (BUILD_TESTING)
 if (EXISTS "${HDF5_SOURCE_DIR}/examples" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/examples")
   option (HDF5_BUILD_EXAMPLES  "Build HDF5 Library Examples" ON)
   if (HDF5_BUILD_EXAMPLES)
-    add_subdirectory (${HDF5_SOURCE_DIR}/examples ${PROJECT_BINARY_DIR}/examples)
-  endif (HDF5_BUILD_EXAMPLES)
-endif (EXISTS "${HDF5_SOURCE_DIR}/examples" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/examples")
+    add_subdirectory (examples)
+  endif ()
+endif ()
 
 #-----------------------------------------------------------------------------
 # Option to build High Level API's
@@ -811,9 +1099,9 @@ if (EXISTS "${HDF5_SOURCE_DIR}/hl" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/hl")
   option (HDF5_BUILD_HL_LIB  "Build HIGH Level HDF5 Library" ON)
   if (HDF5_BUILD_HL_LIB)
     set (H5_INCLUDE_HL 1)
-    add_subdirectory (${HDF5_SOURCE_DIR}/hl ${PROJECT_BINARY_DIR}/hl)
-  endif (HDF5_BUILD_HL_LIB)
-endif (EXISTS "${HDF5_SOURCE_DIR}/hl" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/hl")
+    add_subdirectory (hl)
+  endif ()
+endif ()
 
 #-----------------------------------------------------------------------------
 # Option to build Fortran bindings/tests/examples
@@ -826,78 +1114,103 @@ set (H5_FC_FUNC_ "H5_FC_FUNC_(name,NAME) name ## _")
 if (EXISTS "${HDF5_SOURCE_DIR}/fortran" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/fortran")
   option (HDF5_BUILD_FORTRAN "Build FORTRAN support" OFF)
   if (HDF5_BUILD_FORTRAN)
-    if (BUILD_SHARED_LIBS AND APPLE)
-      message (FATAL_ERROR " **** Shared FORTRAN libraries are unsupported **** ")
-    endif (BUILD_SHARED_LIBS AND APPLE)
-    option (HDF5_ENABLE_F2003 "Enable FORTRAN 2003 Standard" ON)
-    include (${HDF_RESOURCES_EXT_DIR}/HDFUseFortran.cmake)
-    if (HDF5_ENABLE_F2003)
-      if (NOT FORTRAN_HAVE_ISO_C_BINDING)
-        set (HDF5_ENABLE_F2003 OFF)
-      endif (NOT FORTRAN_HAVE_ISO_C_BINDING)
-    endif (HDF5_ENABLE_F2003)
-
-    # -----------------------------------------------------------------------
-    # wrapper script variables
-    # 
-#    set (FCFLAGS "${Fortran_DEFINES}")
-
-    add_subdirectory (${HDF5_SOURCE_DIR}/fortran ${PROJECT_BINARY_DIR}/fortran)
+    include (${HDF_RESOURCES_DIR}/HDFUseFortran.cmake)
+
+    message (VERBOSE "Fortran compiler ID is ${CMAKE_Fortran_COMPILER_ID}")
+    include (${HDF_RESOURCES_DIR}/HDFFortranCompilerFlags.cmake)
+    include (${HDF_RESOURCES_DIR}/HDF5UseFortran.cmake)
+    set (LINK_Fortran_LIBS ${LINK_LIBS})
+
+    if (NOT H5_FORTRAN_HAVE_ISO_C_BINDING)
+      message (FATAL_ERROR " **** Fortran compiler lacks required Fortran 2003 features; unsupported Fortran 2003 compiler, disable HDF5_BUILD_FORTRAN **** ")
+    endif ()
+
+    # Parallel IO usage requires MPI to be Linked and Included
+    if (H5_HAVE_PARALLEL)
+      find_package(MPI REQUIRED COMPONENTS Fortran)
+      set (LINK_Fortran_LIBS ${LINK_Fortran_LIBS} ${MPI_Fortran_LIBRARIES})
+      if (MPI_Fortran_LINK_FLAGS)
+        set (CMAKE_Fortran_EXE_LINKER_FLAGS "${MPI_Fortran_LINK_FLAGS} ${CMAKE_EXE_LINKER_FLAGS}")
+      endif ()
+    endif ()
+
+    #option (HDF5_INSTALL_MOD_FORTRAN "Copy FORTRAN mod files to include directory (NO SHARED STATIC)" "NO")
+    set (HDF5_INSTALL_MOD_FORTRAN "SHARED" CACHE STRING "Copy FORTRAN mod files to include directory (NO SHARED STATIC)")
+    set_property (CACHE HDF5_INSTALL_MOD_FORTRAN PROPERTY STRINGS NO SHARED STATIC)
+    if (NOT HDF5_INSTALL_MOD_FORTRAN MATCHES "NO")
+      if (NOT BUILD_SHARED_LIBS AND BUILD_STATIC_LIBS)
+        set (HDF5_INSTALL_MOD_FORTRAN "STATIC")
+      elseif (BUILD_SHARED_LIBS AND NOT BUILD_STATIC_LIBS)
+        set (HDF5_INSTALL_MOD_FORTRAN "SHARED")
+      endif ()
+    endif ()
+
+    add_subdirectory (fortran)
     if (HDF5_BUILD_HL_LIB)
       if (EXISTS "${HDF5_SOURCE_DIR}/hl/fortran" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/hl/fortran")
         #-- Build the High Level Fortran source codes
-        add_subdirectory (${HDF5_SOURCE_DIR}/hl/fortran ${PROJECT_BINARY_DIR}/hl/fortran)
-      endif (EXISTS "${HDF5_SOURCE_DIR}/hl/fortran" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/hl/fortran")
-    endif (HDF5_BUILD_HL_LIB)
-  endif (HDF5_BUILD_FORTRAN)
-endif (EXISTS "${HDF5_SOURCE_DIR}/fortran" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/fortran")
+        add_subdirectory (hl/fortran)
+      endif ()
+    endif ()
+  endif ()
+endif ()
 
 #-----------------------------------------------------------------------------
 # Option to build HDF5 C++ Library
 #-----------------------------------------------------------------------------
 if (EXISTS "${HDF5_SOURCE_DIR}/c++" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/c++")
-  option (HDF5_BUILD_CPP_LIB  "Build HDF5 C++ Library" ON)
+  option (HDF5_BUILD_CPP_LIB  "Build HDF5 C++ Library" OFF)
   if (HDF5_BUILD_CPP_LIB)
     # check for unsupported options
     if (HDF5_ENABLE_PARALLEL)
-      message (FATAL_ERROR " **** Parallel and C++ options are mutually exclusive **** ")
-    endif (HDF5_ENABLE_PARALLEL)
-    if (CMAKE_NO_STD_NAMESPACE)
-      set (H5_NO_STD 1)
-    endif (CMAKE_NO_STD_NAMESPACE)
-    add_subdirectory (${HDF5_SOURCE_DIR}/c++ ${PROJECT_BINARY_DIR}/c++)
+      if (NOT ALLOW_UNSUPPORTED)
+        message (FATAL_ERROR " **** Parallel and C++ options are mutually exclusive, override with ALLOW_UNSUPPORTED option **** ")
+      else ()
+        message (VERBOSE " **** Allowing unsupported Parallel and C++ options **** ")
+      endif ()
+    endif ()
+
+    include (${HDF_RESOURCES_DIR}/HDFCXXCompilerFlags.cmake)
+
+    add_subdirectory (c++)
     if (HDF5_BUILD_HL_LIB)
       if (EXISTS "${HDF5_SOURCE_DIR}/hl/c++" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/hl/c++")
         #-- Build the High Level Fortran source codes
-        add_subdirectory (${HDF5_SOURCE_DIR}/hl/c++ ${PROJECT_BINARY_DIR}/hl/c++)
-      endif (EXISTS "${HDF5_SOURCE_DIR}/hl/c++" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/hl/c++")
-    endif (HDF5_BUILD_HL_LIB)
-  endif (HDF5_BUILD_CPP_LIB)
-endif (EXISTS "${HDF5_SOURCE_DIR}/c++" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/c++")
+        add_subdirectory (hl/c++)
+      endif ()
+    endif ()
+  endif ()
+endif ()
 
 #-----------------------------------------------------------------------------
-# Option to build HDF5 Tools
+# Check if Fortran's default real is double precision. If it is and HL is
+# being built then configure should fail due to bug HDFFV-889.
 #-----------------------------------------------------------------------------
-if (EXISTS "${HDF5_SOURCE_DIR}/tools" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/tools")
-  option (HDF5_BUILD_TOOLS  "Build HDF5 Tools" ON)
-  if (HDF5_BUILD_TOOLS)
-    add_subdirectory (${HDF5_SOURCE_DIR}/tools ${PROJECT_BINARY_DIR}/tools)
-  endif (HDF5_BUILD_TOOLS)
-endif (EXISTS "${HDF5_SOURCE_DIR}/tools" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/tools")
+if (HDF5_BUILD_FORTRAN AND HDF5_BUILD_HL_LIB)
+  if (NOT H5_FORTRAN_DEFAULT_REAL_NOT_DOUBLE)
+    message (FATAL_ERROR " **** Fortran high-level routines are not supported when the default REAL is DOUBLE PRECISION, use HDF5_BUILD_HL_LIB:BOOL=OFF **** ")
+  endif ()
+endif ()
 
 #-----------------------------------------------------------------------------
-# Check if Fortran's default real is double precision. If it is and HL is 
-# being built then configure should fail due to bug HDFFV-889.
+# Option to build HDF5 Java Library
 #-----------------------------------------------------------------------------
- if (HDF5_BUILD_FORTRAN AND HDF5_BUILD_HL_LIB )
-   if (NOT FORTRAN_DEFAULT_REAL_NOT_DOUBLE)
-     message (FATAL_ERROR " **** Fortran high-level routines are not supported when the default REAL is DOUBLE PRECISION, use HDF5_BUILD_HL_LIB:BOOL=OFF **** ")
-   endif (NOT FORTRAN_DEFAULT_REAL_NOT_DOUBLE)
- endif (HDF5_BUILD_FORTRAN AND HDF5_BUILD_HL_LIB )
+if (EXISTS "${HDF5_SOURCE_DIR}/java" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/java")
+  option (HDF5_BUILD_JAVA  "Build Java HDF5 Library" OFF)
+  if (HDF5_BUILD_JAVA)
+    add_subdirectory (java)
+  endif ()
+endif ()
 
 #-----------------------------------------------------------------------------
 # Generate the H5pubconf.h file containing user settings needed by compilation
 #-----------------------------------------------------------------------------
-configure_file (${HDF_RESOURCES_DIR}/H5pubconf.h.in ${HDF5_BINARY_DIR}/H5pubconf.h @ONLY)
+configure_file (${HDF_RESOURCES_DIR}/H5pubconf.h.in ${HDF5_SRC_BINARY_DIR}/H5pubconf.h @ONLY)
+
+#-----------------------------------------------------------------------------
+# Options for use by cross compiling and toolchains
+#-----------------------------------------------------------------------------
+option (HDF5_USE_PREGEN "Use pre-generated Files" OFF)
+option (HDF5_BATCH_H5DETECT "Use a batch command for running h5detect" OFF)
 
 include (CMakeInstallation.cmake)
diff --git a/CMakePlugins.cmake b/CMakePlugins.cmake
new file mode 100644
index 0000000..16fb874
--- /dev/null
+++ b/CMakePlugins.cmake
@@ -0,0 +1,56 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
+
+include (ExternalProject)
+#option (HDF5_ALLOW_EXTERNAL_SUPPORT "Allow External Library Building (NO GIT TGZ)" "NO")
+set (HDF5_ALLOW_EXTERNAL_SUPPORT "NO" CACHE STRING "Allow External Library Building (NO GIT TGZ)")
+set_property (CACHE HDF5_ALLOW_EXTERNAL_SUPPORT PROPERTY STRINGS NO GIT TGZ)
+if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
+  option (PLUGIN_USE_EXTERNAL "Use External Library Building for filter PLUGIN" 1)
+  if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT")
+    set (PLUGIN_URL ${PLUGIN_GIT_URL} CACHE STRING "Path to PLUGIN git repository")
+    set (PLUGIN_BRANCH ${PLUGIN_GIT_BRANCH})
+  elseif (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
+    if (NOT TGZPATH)
+      set (TGZPATH ${HDF5_SOURCE_DIR})
+    endif ()
+    set (PLUGIN_URL ${TGZPATH}/${PLUGIN_TGZ_NAME})
+    if (NOT EXISTS "${PLUGIN_URL}")
+      set (HDF5_ENABLE_PLUGIN_SUPPORT OFF CACHE BOOL "" FORCE)
+      message (STATUS "Filter PLUGIN file ${PLUGIN_URL} not found")
+    endif ()
+  else ()
+    set (PLUGIN_USE_EXTERNAL 0)
+  endif ()
+endif ()
+
+#-----------------------------------------------------------------------------
+# Option for PLUGIN support
+#-----------------------------------------------------------------------------
+option (HDF5_ENABLE_PLUGIN_SUPPORT "Enable PLUGIN Filters" OFF)
+if (HDF5_ENABLE_PLUGIN_SUPPORT)
+  if (NOT PLUGIN_USE_EXTERNAL)
+    find_package (PLUGIN NAMES ${PLUGIN_PACKAGE_NAME}${HDF_PACKAGE_EXT})
+    if (NOT PLUGIN_FOUND)
+      find_package (PLUGIN) # Legacy find
+    endif ()
+  endif ()
+  if (NOT PLUGIN_FOUND)
+    if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
+      EXTERNAL_PLUGIN_LIBRARY (${HDF5_ALLOW_EXTERNAL_SUPPORT})
+      message (STATUS "Filter PLUGIN is built")
+    else ()
+      message (FATAL_ERROR " PLUGIN is Required for PLUGIN support in HDF5")
+    endif ()
+  endif ()
+  message (STATUS "Filter PLUGIN is ON")
+endif ()
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 0000000..b3aa7ab
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+help@hdfgroup.org.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..62b00ea
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,142 @@
+# How to contribute to HDF5
+
+The HDF Group encourages community members to contribute to the HDF5 project. We accept and are very grateful for any contributions,
+from minor typos and bug fixes to new features. The HDF Group is committed to work with the code contributors and make contribution
+process enjoyable and straightforward.
+
+This document describes guiding principles for the HDF5 code contributors and does not pretend to address any possible
+contribution. If in doubt, please do not hesitate to ask us for guidance.
+***Note that no contribution may be accepted unless the donor agrees with the HDF Group software license terms
+found in the COPYING file in every branch's top source directory.***
+
+
+> We will assume that you are familiar with `git` and `GitHub`.  If not, you may go through the GitHub tutorial found at
+[https://guides.github.com/activities/hello-world/](https://guides.github.com/activities/hello-world/).  This tutorial should only take
+around 10 minutes.
+
+## Table of Contents
+
+* [Workflow](#workflow)
+* [Acceptance criteria for a pull request](#criteria)
+* [Release Note](#releasenote)
+* [Check List](#checklist)
+
+# Workflow <A NAME="workflow"></A>
+
+The process for contributing code to HDF5 is as follows:
+
+* Open an issue on [HDF5 GitHub](https://github.com/HDFGroup/hdf5/issues).
+
+> This step is ***required*** unless the change is minor (e.g., typo fix).
+
+* Fork the [HDF5](https://github.com/HDFGroup/hdf5) repository.
+* Make the desired changes to the HDF5 software.
+    * New features should always go to _develop_ branch first and later should be merged to the appropriate maintenance branches.
+    * Bug fixes should go to all appropriate branches (_develop_ and maintenance).
+* Build and test your changes. Detailed instructions on building and testing HDF5 can be found in the `INSTALL*` files in the `release_docs` directory.
+* Push your changes to GitHub.
+* Issue a pull request and address any code formatting and testing issues reported.
+
+Once a pull request is correctly formatted and passes **ALL** CI tests, it will be reviewed and evaluated by The HDF Group developers and HDF5
+community members who can approve pull requests. The HDF Group developers will work with you to ensure that the pull request satisfies the acceptance
+criteria described in the next section.
+
+# Acceptance criteria for a pull request <A NAME="criteria"></A>
+
+We appreciate every contribution we receive, but we may not accept them all.  Those that we *do* satisfy the following criteria:
+
+* **The pull request has a clear purpose** - What does the pull request address? How does it benefit the HDF5 community?
+If the pull request does not have a clear purpose and benefits, it will not be accepted.
+
+* **The pull request is documented** - The HDF5 developers must understand not only *what* a change is doing, but *how* it is doing it.
+  Documenting the code makes it easier for us to understand your patch and maintain the code in the future.
+
+* **The pull request passes HDF5 regression testing** - Any issue fixed or functionality added should be accompanied by the corresponding
+tests and pass HDF5 regression testing run by The HDF Group. We do not expect you to perform comprehensive testing across multiple platforms
+before we accept the pull request. If the pull request does not pass regression testing after the merge, The HDF Group developers will work
+with you on the fixes.
+
+* **The pull request does not compromise the principles behind HDF5** - HDF5 has a 100% commitment to backward compatibility.
+    * Any file ever created with HDF5 must be readable by any future version of HDF5.
+   If your patch's purpose is to modify the HDF5 data model or file format,
+ **please** discuss this with us first. File format changes and features required by those changes can be introduced only in a new major release.
+    * HDF5 has a commitment to remaining *machine-independent*; data created on one platform/environment/architecture **must** remain readable by HDF5 on any other.
+    * For binary compatibility, no changes are allowed to public APIs and data structures in the maintenance releases; new APIs can be added.
+
+* **New features are documented** - Any new features should have proper documentation; talk to us if you have any questions.
+
+* **When to Write a Release Note** - Generally, a release note must be written for every change that is made to the code for which
+users might see a change in the way the software works. In other words, if a user might see a difference in the way the software works,
+a note should be written. By code we mean the text that will be compiled into one of the company's software products. The code includes
+configuration changes and changes to tools users might work with to configure and build our software.
+
+    * Notes should be added for known problems. Known problems are issues that we know about and have not yet been able to fix.
+
+    * Any change made to address a user-reported problem should be described in a release note.
+
+    * A release note does not need to be written for changes to the code that users will not see. Here are some examples. If you add a
+comment, you do not need to write a release note describing the comment you added. If you rewrite some code to make it read more
+clearly and if there is no change in functionality or performance, then you do not need to write a release note. If you change the
+process by which user software is made, you may not need to write a release note since the change was not made to the code.
+
+    * Users. We have different kinds of users. A release note may be written to be helpful to
+application developers and not system administrators. Users who may find the RELEASE.txt file helpful include the following:
+application developers, library developers, and system administrators.
+
+
+# Release Note <A NAME="releasenote"></A>
+
+* **Entry Syntax**
+The release note entry syntax is shown below.
+
+```
+    - Title/Problem
+
+      Problem/Solution
+
+      Signature
+```
+
+* **Entry Elements** - The elements of the entry - title, problem, solution, and signature - are described in more detail in the table
+below. Descriptions of the problem and the solution should be clear without any ambiguities and should be short without losing clarity or specifics.
+
+    * **Title** - The title or tag should identify one or more categories that will help readers decide if the entry is something they need to study. Can be combined with the `Problem` element
+    * **Problem** - Describe the problem and how users might see the problem in a paragraph.
+You might also consider the following as you describe the problem:
+        * Under what specific conditions does this issue arise?
+        * Under what specific conditions are we sure this issue will not arise?
+        * For a performance issue, instead of saying something is a performance issue, describe what the performance impact of issue is?
+    * **Solution** - Describe the solution in another paragraph.
+You might also consider the following as you describe the solution:
+        * What was done to resolve the issue?
+        * What is the functional impact?
+        * Is there a workaround – a way for users design their software so as not to encounter the issue? If so, what is the workaround?
+        * For a performance fix, how has the performance improved? Links to published documentation would be good.
+    * **Signature** - Each entry must be signed with the initials of the author, the date in YYYY/MM/DD format, and the JIRA ticket number. The
+following is an example entry written by developer Xavier Zolo on April 16, 2014 about JIRA ticket HDFFV-5555: (XYZ - 2014/04/16, HDFFV-5555). The
+signature is enclosed in parentheses. JIRA or Github numbers should not be used in the description of the problem or the solution. They are like
+abbreviations that customers and external users will not be able to interpret.
+
+# Checklist <A NAME="checklist"></A>
+
+Please make sure that you check the items applicable to your pull request:
+
+* Code
+  * [ ] Does the pull request have a corresponding GitHub issue and clear purpose?
+  * [ ] Does the pull request follow HDF5 best practices (naming conventions, code portability, code structure, etc.)? <<TODO: link to the document>>
+  * [ ] If changes were done to Autotools build, were they added to CMake and vice versa?
+  * [ ] Is the pull request applicable to any other branches? If yes, which ones? Please document it in the GitHub issue.
+  * [ ] Is the new code sufficiently documented for future maintenance?
+  * [ ] Does the new feature require a change to an existing API? See "API Compatibility Macros" document (https://portal.hdfgroup.org/display/HDF5/API+Compatibility+Macros)
+* Documentation
+  * [ ] Was the change described in the release_docs/RELEASE.txt file?
+  * [ ] Was MANIFEST updated if new files had been added to the source?
+  * [ ] Was the new function documented in the corresponding public header file using [Doxygen](https://docs.hdfgroup.org/hdf5/develop/_r_m_t.html)?
+  * [ ] Was new functionality documented for the HDF5 community (the level of documentation depends on the feature; ask us what would be appropriate)
+* Testing
+  * [ ] Does the pull request have tests?
+  * [ ] Does the pull request affect HDF5 library performance?
+
+We want as many contributions as we can get, and we are here to help. Feel free to reach out to us if you have any questions
+
+Thank you for your contribution!
diff --git a/COPYING b/COPYING
index b48d527..9d32232 100644
--- a/COPYING
+++ b/COPYING
@@ -1,13 +1,12 @@
-
 Copyright Notice and License Terms for 
 HDF5 (Hierarchical Data Format 5) Software Library and Utilities
 -----------------------------------------------------------------------------
 
 HDF5 (Hierarchical Data Format 5) Software Library and Utilities
-Copyright 2006-2014 by The HDF Group.
+Copyright 2006 by The HDF Group. 
 
 NCSA HDF5 (Hierarchical Data Format 5) Software Library and Utilities
-Copyright 1998-2006 by the Board of Trustees of the University of Illinois.
+Copyright 1998-2006 by The Board of Trustees of the University of Illinois. 
 
 All rights reserved.
 
@@ -22,44 +21,58 @@ provided that the following conditions are met:
    this list of conditions, and the following disclaimer in the documentation 
    and/or materials provided with the distribution.
 
-3. In addition, redistributions of modified forms of the source or binary 
-   code must carry prominent notices stating that the original code was 
-   changed and the date of the change.
-
-4. All publications or advertising materials mentioning features or use of 
-   this software are asked, but not required, to acknowledge that it was 
-   developed by The HDF Group and by the National Center for Supercomputing 
-   Applications at the University of Illinois at Urbana-Champaign and 
-   credit the contributors.
-
-5. Neither the name of The HDF Group, the name of the University, nor the 
+3. Neither the name of The HDF Group, the name of the University, nor the 
    name of any Contributor may be used to endorse or promote products derived 
    from this software without specific prior written permission from 
    The HDF Group, the University, or the Contributor, respectively.
 
 DISCLAIMER: 
 THIS SOFTWARE IS PROVIDED BY THE HDF GROUP AND THE CONTRIBUTORS 
-"AS IS" WITH NO WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED.  In no 
-event shall The HDF Group or the Contributors be liable for any damages 
-suffered by the users arising out of the use of this software, even if 
-advised of the possibility of such damage. 
+"AS IS" WITH NO WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED. IN NO 
+EVENT SHALL THE HDF GROUP OR THE CONTRIBUTORS BE LIABLE FOR ANY DAMAGES 
+SUFFERED BY THE USERS ARISING OUT OF THE USE OF THIS SOFTWARE, EVEN IF 
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 
+You are under no obligation whatsoever to provide any bug fixes, patches, or 
+upgrades to the features, functionality or performance of the source code 
+("Enhancements") to anyone; however, if you choose to make your Enhancements 
+available either publicly, or directly to The HDF Group, without imposing a 
+separate written license agreement for such Enhancements, then you hereby 
+grant the following license: a non-exclusive, royalty-free perpetual license 
+to install, use, modify, prepare derivative works, incorporate into other 
+computer software, distribute, and sublicense such enhancements or derivative 
+works thereof, in binary and source code form.
 
 -----------------------------------------------------------------------------
 -----------------------------------------------------------------------------
 
-Contributors:   National Center for Supercomputing Applications (NCSA) at 
-the University of Illinois, Fortner Software, Unidata Program Center (netCDF), 
-The Independent JPEG Group (JPEG), Jean-loup Gailly and Mark Adler (gzip), 
-and Digital Equipment Corporation (DEC).
+Limited portions of HDF5 were developed by Lawrence Berkeley National 
+Laboratory (LBNL). LBNL's Copyright Notice and Licensing Terms can be
+found here: COPYING_LBNL_HDF5 file in this directory or at 
+http://support.hdfgroup.org/ftp/HDF5/releases/COPYING_LBNL_HDF5. 
 
 -----------------------------------------------------------------------------
+-----------------------------------------------------------------------------
+
+Contributors:   National Center for Supercomputing Applications (NCSA) at 
+the University of Illinois, Fortner Software, Unidata Program Center 
+(netCDF), The Independent JPEG Group (JPEG), Jean-loup Gailly and Mark Adler 
+(gzip), and Digital Equipment Corporation (DEC).
 
+-----------------------------------------------------------------------------
+ 
 Portions of HDF5 were developed with support from the Lawrence Berkeley 
 National Laboratory (LBNL) and the United States Department of Energy 
 under Prime Contract No. DE-AC02-05CH11231.
 
 -----------------------------------------------------------------------------
 
+Portions of HDF5 were developed with support from Lawrence Livermore 
+National Laboratory and the United States Department of Energy under 
+Prime Contract No. DE-AC52-07NA27344.
+
+-----------------------------------------------------------------------------
+
 Portions of HDF5 were developed with support from the University of 
 California, Lawrence Livermore National Laboratory (UC LLNL).  
 The following statement applies to those portions of the product and must 
@@ -73,26 +86,21 @@ and/or accompanying materials:
    for the operation of UC LLNL.
 
    DISCLAIMER: 
-   This work was prepared as an account of work sponsored by an agency of 
-   the United States Government. Neither the United States Government nor 
-   the University of California nor any of their employees, makes any 
-   warranty, express or implied, or assumes any liability or responsibility 
-   for the accuracy, completeness, or usefulness of any information, 
-   apparatus, product, or process disclosed, or represents that its use 
-   would not infringe privately- owned rights. Reference herein to any 
-   specific commercial products, process, or service by trade name, 
-   trademark, manufacturer, or otherwise, does not necessarily constitute 
-   or imply its endorsement, recommendation, or favoring by the United 
-   States Government or the University of California. The views and 
-   opinions of authors expressed herein do not necessarily state or reflect 
-   those of the United States Government or the University of California, 
-   and shall not be used for advertising or product endorsement purposes.
+   THIS WORK WAS PREPARED AS AN ACCOUNT OF WORK SPONSORED BY AN AGENCY OF 
+   THE UNITED STATES GOVERNMENT. NEITHER THE UNITED STATES GOVERNMENT NOR 
+   THE UNIVERSITY OF CALIFORNIA NOR ANY OF THEIR EMPLOYEES, MAKES ANY 
+   WARRANTY, EXPRESS OR IMPLIED, OR ASSUMES ANY LIABILITY OR RESPONSIBILITY 
+   FOR THE ACCURACY, COMPLETENESS, OR USEFULNESS OF ANY INFORMATION, 
+   APPARATUS, PRODUCT, OR PROCESS DISCLOSED, OR REPRESENTS THAT ITS USE 
+   WOULD NOT INFRINGE PRIVATELY- OWNED RIGHTS. REFERENCE HEREIN TO ANY 
+   SPECIFIC COMMERCIAL PRODUCTS, PROCESS, OR SERVICE BY TRADE NAME, 
+   TRADEMARK, MANUFACTURER, OR OTHERWISE, DOES NOT NECESSARILY CONSTITUTE 
+   OR IMPLY ITS ENDORSEMENT, RECOMMENDATION, OR FAVORING BY THE UNITED 
+   STATES GOVERNMENT OR THE UNIVERSITY OF CALIFORNIA. THE VIEWS AND 
+   OPINIONS OF AUTHORS EXPRESSED HEREIN DO NOT NECESSARILY STATE OR REFLECT 
+   THOSE OF THE UNITED STATES GOVERNMENT OR THE UNIVERSITY OF CALIFORNIA, 
+   AND SHALL NOT BE USED FOR ADVERTISING OR PRODUCT ENDORSEMENT PURPOSES.
 
 -----------------------------------------------------------------------------
 
-HDF5 is available with the SZIP compression library but SZIP is not part 
-of HDF5 and has separate copyright and license terms. See “Szip Compression 
-in HDF Products” (www.hdfgroup.org/doc_resource/SZIP/) for further details.
-
------------------------------------------------------------------------------
 
diff --git a/COPYING_LBNL_HDF5 b/COPYING_LBNL_HDF5
new file mode 100644
index 0000000..16fba5d
--- /dev/null
+++ b/COPYING_LBNL_HDF5
@@ -0,0 +1,49 @@
+Copyright Notice and License Terms for
+HDF5 (Hierarchical Data Format 5) Software Library and Utilities
+-----------------------------------------------------------------------------
+
+HDF5 (Hierarchical Data Format 5)
+Copyright (c) 2016, The Regents of the University of California, through 
+Lawrence Berkeley National Laboratory (subject to receipt of any required 
+approvals from the U.S. Dept. of Energy).
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, 
+   this list of conditions, and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, 
+   this list of conditions, and the following disclaimer in the documentation 
+   and/or materials provided with the distribution.
+
+3. Neither the name of the University of California, Lawrence Berkeley 
+National Laboratory, U.S. Dept. of Energy nor the names of its contributors 
+may be used to endorse or promote products derived from this software without 
+specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
+THE POSSIBILITY OF SUCH DAMAGE.
+
+You are under no obligation whatsoever to provide any bug fixes, patches, 
+or upgrades to the features, functionality or performance of the source 
+code ("Enhancements") to anyone; however, if you choose to make your 
+Enhancements available either publicly, or directly to Lawrence Berkeley 
+National Laboratory, without imposing a separate written license agreement 
+for such Enhancements, then you hereby grant the following license: 
+a non-exclusive, royalty-free perpetual license to install, use, modify, 
+prepare derivative works, incorporate into other computer software, 
+distribute, and sublicense such enhancements or derivative works thereof, 
+in binary and source code form.
+
diff --git a/CTestConfig.cmake b/CTestConfig.cmake
index 7bbce4f..b780b86 100644
--- a/CTestConfig.cmake
+++ b/CTestConfig.cmake
@@ -1,32 +1,52 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
 ## This file should be placed in the root directory of your project.
 ## Then modify the CMakeLists.txt file in the root directory of your
 ## project to incorporate the testing dashboard.
-## # The following are required to uses Dart and the Cdash dashboard
+## # The following are required to use Dart and the CDash dashboard
 ##   ENABLE_TESTING()
 ##   INCLUDE(CTest)
 set (CTEST_PROJECT_NAME "HDF5")
 set (CTEST_NIGHTLY_START_TIME "18:00:00 CST")
 
-set (CTEST_DROP_METHOD "http")
-if (CDASH_LOCAL)
-  set (CTEST_DROP_SITE "72.36.68.252")
-  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5Trunk")
-else (CDASH_LOCAL)
-  set (CTEST_DROP_SITE "cdash.hdfgroup.uiuc.edu")
-  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5+Trunk")
-endif (CDASH_LOCAL)
+set (CTEST_DROP_METHOD "https")
+if (CTEST_DROP_SITE_INIT)
+  set (CTEST_DROP_SITE "${CTEST_DROP_SITE_INIT}")
+else ()
+  if (CDASH_LOCAL)
+    set (CTEST_DROP_SITE "cdash-internal.hdfgroup.org")
+  else ()
+    set (CTEST_DROP_SITE "cdash.hdfgroup.org")
+  endif ()
+endif ()
+if (CTEST_DROP_LOCATION_INIT)
+  set (CTEST_DROP_LOCATION "${CTEST_DROP_LOCATION_INIT}")
+else ()
+  if (CDASH_LOCAL)
+    set (CTEST_DROP_LOCATION "/submit.php?project=HDF5Trunk")
+  else ()
+    set (CTEST_DROP_LOCATION "/submit.php?project=HDF5")
+  endif ()
+endif ()
 set (CTEST_DROP_SITE_CDASH TRUE)
 
-set (UPDATE_TYPE svn)
+set (UPDATE_TYPE git)
 set (VALGRIND_COMMAND "/usr/bin/valgrind")
 set (VALGRIND_COMMAND_OPTIONS "-v --tool=memcheck --leak-check=full --track-fds=yes --num-callers=50 --show-reachable=yes --track-origins=yes --malloc-fill=0xff --free-fill=0xfe")
-set (CTEST_MEMORYCHECK_COMMAND "/usr/bin/valgrind")
-set (CTEST_MEMORYCHECK_COMMAND_OPTIONS "-v --tool=memcheck --leak-check=full --track-fds=yes --num-callers=50 --show-reachable=yes --track-origins=yes --malloc-fill=0xff --free-fill=0xfe")
 
-set (CTEST_TEST_TIMEOUT 1200 CACHE STRING 
-    "Maximum time allowed before CTest will kill the test.") 
-set (DART_TESTING_TIMEOUT 1200 CACHE STRING 
+set (CTEST_TEST_TIMEOUT 1200 CACHE STRING
+    "Maximum time allowed before CTest will kill the test.")
+set (DART_TESTING_TIMEOUT 1200 CACHE STRING
     "Maximum time allowed before CTest will kill the test." FORCE)
 
-SET(CTEST_SUBMIT_RETRY_DELAY 20 CACHE STRING
+set (CTEST_SUBMIT_RETRY_DELAY 20 CACHE STRING
     "How long to wait between timed-out CTest submissions.")
diff --git a/MANIFEST b/MANIFEST
deleted file mode 100644
index ad33012..0000000
--- a/MANIFEST
+++ /dev/null
@@ -1,2502 +0,0 @@
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-#
-#------------------------------------------------------------------------------
-# This is the list of files that are part of HDF5 source distribution. 
-# All files have a `./' prefix and appear in lexicographic order.
-# Lines that end with _DO_NOT_DISTRIBUTE_ will not be included in a
-# release.  Blank lines and comments are ignored.  Comments must start
-# in column one with a '#'.
-#------------------------------------------------------------------------------
-
-./.autom4te.cfg                 _DO_NOT_DISTRIBUTE_
-./.h5chkright.ini      _DO_NOT_DISTRIBUTE_
-./ACKNOWLEDGMENTS
-./COPYING
-./MANIFEST
-./Makefile.dist
-./Makefile.am
-./Makefile.in
-./m4/ltsugar.m4                         _DO_NOT_DISTRIBUTE_
-./m4/libtool.m4                         _DO_NOT_DISTRIBUTE_
-./m4/ltversion.m4                       _DO_NOT_DISTRIBUTE_
-./m4/lt~obsolete.m4                     _DO_NOT_DISTRIBUTE_
-./m4/ltoptions.m4                       _DO_NOT_DISTRIBUTE_
-./m4/aclocal_cxx.m4
-./m4/aclocal_fc.m4
-./README.txt
-./aclocal.m4
-./acsite.m4
-./configure
-./configure.ac
-
-./bin/COPYING
-./bin/buildhdf5
-./bin/checkapi        _DO_NOT_DISTRIBUTE_
-./bin/checkposix      _DO_NOT_DISTRIBUTE_
-./bin/chkconfigure      _DO_NOT_DISTRIBUTE_
-./bin/chkcopyright      _DO_NOT_DISTRIBUTE_
-./bin/chkmanifest
-./bin/cmakehdf5
-./bin/compile
-./bin/config.guess
-./bin/config.sub
-./bin/debug-ohdr      _DO_NOT_DISTRIBUTE_
-./bin/dependencies
-./bin/depcomp
-./bin/deploy
-./bin/distdep
-./bin/errors              _DO_NOT_DISTRIBUTE_
-./bin/genltanalyze      _DO_NOT_DISTRIBUTE_
-./bin/gcov_script            _DO_NOT_DISTRIBUTE_
-./bin/h5vers
-./bin/install-sh
-./bin/iostats
-./bin/locate_sw
-./bin/ltmain.sh
-./bin/make_err
-./bin/make_overflow
-./bin/make_vers
-./bin/makehelp
-./bin/missing
-./bin/mkdirs
-./bin/mkinstalldirs
-./bin/newer
-./bin/reconfigure      _DO_NOT_DISTRIBUTE_
-./bin/output_filter.sh
-./bin/README        _DO_NOT_DISTRIBUTE_
-./bin/release
-./bin/runtest        _DO_NOT_DISTRIBUTE_
-./bin/snapshot
-./bin/snapshot_version      _DO_NOT_DISTRIBUTE_
-./bin/test-driver
-./bin/timekeeper      _DO_NOT_DISTRIBUTE_
-./bin/trace
-./bin/yodconfigure
-
-./config/COPYING
-./config/BlankForm
-./config/apple
-./config/commence.am
-./config/conclude.am
-./config/examples.am
-./config/freebsd
-./config/gnu-fflags
-./config/gnu-flags
-./config/i386-pc-cygwin32
-./config/i686-pc-cygwin
-./config/ibm-aix
-./config/ibm-flags
-./config/intel-fflags
-./config/intel-flags
-./config/linux-gnu
-./config/linux-gnuaout
-./config/linux-gnulibc1
-./config/linux-gnulibc2
-./config/lt_vers.am
-./config/Makefile.am.blank
-./config/pgi-fflags
-./config/pgi-flags
-./config/powerpc-ibm-aix5.x
-./config/solaris2.x
-./config/x86_64-pc-cygwin
-
-./config/site-specific/BlankForm
-
-./examples/Attributes.txt
-./examples/Makefile.am
-./examples/Makefile.in
-./examples/h5_chunk_read.c
-./examples/h5_compound.c
-./examples/h5_crtgrpd.c
-./examples/h5_subset.c
-./examples/h5_cmprss.c
-./examples/h5_rdwt.c
-./examples/h5_crtgrpar.c
-./examples/h5_extend.c
-./examples/h5_crtatt.c
-./examples/h5_crtgrp.c
-./examples/h5_crtdat.c
-./examples/h5_drivers.c
-./examples/h5_dtransform.c
-./examples/h5_elink_unix2win.c
-./examples/h5_extend_write.c
-./examples/h5_extlink.c
-./examples/h5_group.c
-./examples/h5_interm_group.c
-./examples/h5_read.c
-./examples/h5_write.c
-./examples/h5_select.c
-./examples/h5_attribute.c
-./examples/h5_mount.c
-./examples/h5_reference.c
-./examples/h5_ref2reg.c
-./examples/h5_shared_mesg.c
-./examples/ph5example.c
-./examples/testh5cc.sh.in
-./examples/README
-
-
-#------------------------------------------------------------------------------
-#
-# Begin Fortran interface
-#
-#------------------------------------------------------------------------------
-
-./fortran/COPYING
-./fortran/Makefile.am
-./fortran/Makefile.in
-
-./fortran/robodoc.rc
-./fortran/doc/DevelGuide/toc_index.html
-./fortran/doc/DevelGuide/masterindex.html
-./fortran/doc/DevelGuide/robo_subroutines.html
-./fortran/doc/DevelGuide/robo_sourcefiles.html
-./fortran/doc/DevelGuide/robo_functions.html
-./fortran/doc/DevelGuide/robo_modules.html
-./fortran/doc/DevelGuide/robo_programs.html
-./fortran/doc/DevelGuide/robodoc.css
-./fortran/doc/DevelGuide/test/fortranlib_test_f90.html
-./fortran/doc/DevelGuide/test/tH5A_f90.html
-./fortran/doc/DevelGuide/test/tH5VL_f90.html
-./fortran/doc/DevelGuide/test/tH5D_f90.html
-./fortran/doc/DevelGuide/test/tH5E_f90.html
-./fortran/doc/DevelGuide/test/tH5F_f90.html
-./fortran/doc/DevelGuide/test/tH5G_f90.html
-./fortran/doc/DevelGuide/test/fflush1_f90.html
-./fortran/doc/DevelGuide/test/fortranlib_test_1_8_f90.html
-./fortran/doc/DevelGuide/test/tH5A_1_8_f90.html
-./fortran/doc/DevelGuide/test/tf_f90.html
-./fortran/doc/DevelGuide/test/fflush2_f90.html
-./fortran/doc/DevelGuide/test/fortranlib_test_F03_f90.html
-./fortran/doc/DevelGuide/test/tH5I_f90.html
-./fortran/doc/DevelGuide/test/tH5G_1_8_f90.html
-./fortran/doc/DevelGuide/test/tF2003_f90.html
-./fortran/doc/DevelGuide/test/tH5O_f90.html
-./fortran/doc/DevelGuide/test/tH5P_f90.html
-./fortran/doc/DevelGuide/test/tH5R_f90.html
-./fortran/doc/DevelGuide/test/tH5S_f90.html
-./fortran/doc/DevelGuide/test/tH5Sselect_f90.html
-./fortran/doc/DevelGuide/test/tH5T_f90.html
-./fortran/doc/DevelGuide/test/t_c.html
-./fortran/doc/DevelGuide/test/tH5Z_f90.html
-./fortran/doc/DevelGuide/src/H5Fff_f90.html
-./fortran/doc/DevelGuide/src/H5Zf_c.html
-./fortran/doc/DevelGuide/src/H5Pff_F90_f90.html
-./fortran/doc/DevelGuide/src/H5Aff_F03_f90.html
-./fortran/doc/DevelGuide/src/H5match_types_c.html
-./fortran/doc/DevelGuide/src/H5Rff_F90_f90.html
-./fortran/doc/DevelGuide/src/H5Lff_f90.html
-./fortran/doc/DevelGuide/src/H5FDmpiof_c.html
-./fortran/doc/DevelGuide/src/H5_f_c.html
-./fortran/doc/DevelGuide/src/H5Pff_f90.html
-./fortran/doc/DevelGuide/src/H5Rff_f90.html
-./fortran/doc/DevelGuide/src/H5Tff_f90.html
-./fortran/doc/DevelGuide/src/H5test_kind_f90.html
-./fortran/doc/DevelGuide/src/H5Aff_F90_f90.html
-./fortran/doc/DevelGuide/src/H5Zff_f90.html
-./fortran/doc/DevelGuide/src/HDF5_f90.html
-./fortran/doc/DevelGuide/src/H5_DBLE_InterfaceInclude_f90.html
-./fortran/doc/DevelGuide/src/H5f90kit_c.html
-./fortran/doc/DevelGuide/src/H5Aff_f90.html
-./fortran/doc/DevelGuide/src/H5_DBLE_InterfaceExclude_f90.html
-./fortran/doc/DevelGuide/src/H5Eff_f90.html
-./fortran/doc/DevelGuide/src/H5_ff_F03_f90.html
-./fortran/doc/DevelGuide/src/H5Gff_f90.html
-./fortran/doc/DevelGuide/src/H5test_kind_SIZEOF_f90.html
-./fortran/doc/DevelGuide/src/H5Iff_f90.html
-./fortran/doc/DevelGuide/src/H5Dff_F03_f90.html
-./fortran/doc/DevelGuide/src/H5Af_c.html
-./fortran/doc/DevelGuide/src/H5Off_f90.html
-./fortran/doc/DevelGuide/src/H5Df_c.html
-./fortran/doc/DevelGuide/src/H5Sff_f90.html
-./fortran/doc/DevelGuide/src/H5Ef_c.html
-./fortran/doc/DevelGuide/src/HDF5mpio_f90.html
-./fortran/doc/DevelGuide/src/H5Lff_F03_f90.html
-./fortran/doc/DevelGuide/src/H5Ff_c.html
-./fortran/doc/DevelGuide/src/H5f90global_f90.html
-./fortran/doc/DevelGuide/src/H5Gf_c.html
-./fortran/doc/DevelGuide/src/H5If_c.html
-./fortran/doc/DevelGuide/src/H5Pff_F03_f90.html
-./fortran/doc/DevelGuide/src/H5_ff_F90_f90.html
-./fortran/doc/DevelGuide/src/H5Rff_F03_f90.html
-./fortran/doc/DevelGuide/src/H5Lf_c.html
-./fortran/doc/DevelGuide/src/H5Of_c.html
-./fortran/doc/DevelGuide/src/H5Dff_F90_f90.html
-./fortran/doc/DevelGuide/src/H5Pf_c.html
-./fortran/doc/DevelGuide/src/H5FDmpioff_f90.html
-./fortran/doc/DevelGuide/src/H5_ff_f90.html
-./fortran/doc/DevelGuide/src/H5Rf_c.html
-./fortran/doc/DevelGuide/src/H5Sf_c.html
-./fortran/doc/DevelGuide/src/H5Tf_c.html
-./fortran/doc/DevelGuide/src/H5Dff_f90.html
-./fortran/doc/DevelGuide/src/H5Lff_F90_f90.html
-
-./fortran/examples/Makefile.am
-./fortran/examples/Makefile.in
-./fortran/examples/compound.f90
-./fortran/examples/compound_fortran2003.f90
-./fortran/examples/compound_complex_fortran2003.f90
-./fortran/examples/h5_cmprss.f90
-./fortran/examples/h5_crtatt.f90
-./fortran/examples/h5_crtdat.f90
-./fortran/examples/h5_crtgrp.f90
-./fortran/examples/h5_crtgrpar.f90
-./fortran/examples/h5_crtgrpd.f90
-./fortran/examples/h5_extend.f90
-./fortran/examples/h5_rdwt.f90
-./fortran/examples/h5_subset.f90
-./fortran/examples/hyperslab.f90
-./fortran/examples/mountexample.f90
-./fortran/examples/ph5example.f90
-./fortran/examples/refobjexample.f90
-./fortran/examples/refregexample.f90
-./fortran/examples/run-fortran-ex.sh.in
-./fortran/examples/selectele.f90
-./fortran/examples/testh5fc.sh.in
-./fortran/examples/nested_derived_type.f90
-./fortran/examples/rwdset_fortran2003.f90
-
-./fortran/src/H5_f.c
-./fortran/src/H5_ff.f90
-./fortran/src/H5_ff_F90.f90
-./fortran/src/H5_ff_F03.f90
-./fortran/src/H5_DBLE_InterfaceInclude.f90
-./fortran/src/H5_DBLE_InterfaceExclude.f90
-./fortran/src/H5Af.c
-./fortran/src/H5Aff.f90
-./fortran/src/H5Aff_F90.f90
-./fortran/src/H5Aff_F03.f90
-./fortran/src/H5Df.c
-./fortran/src/H5Dff.f90
-./fortran/src/H5Dff_F90.f90
-./fortran/src/H5Dff_F03.f90
-./fortran/src/H5Ef.c
-./fortran/src/H5Eff.f90
-./fortran/src/H5Eff_F90.f90
-./fortran/src/H5Eff_F03.f90
-./fortran/src/H5FDmpiof.c
-./fortran/src/H5FDmpioff.f90
-./fortran/src/H5Ff.c
-./fortran/src/H5Fff.f90
-./fortran/src/H5Fff_F90.f90
-./fortran/src/H5Fff_F03.f90
-./fortran/src/H5Gf.c
-./fortran/src/H5Gff.f90
-./fortran/src/H5If.c
-./fortran/src/H5Iff.f90
-./fortran/src/H5Lf.c
-./fortran/src/H5Lff.f90
-./fortran/src/H5Lff_F90.f90
-./fortran/src/H5Lff_F03.f90
-./fortran/src/H5Of.c
-./fortran/src/H5Off.f90
-./fortran/src/H5Off_F90.f90
-./fortran/src/H5Off_F03.f90
-./fortran/src/H5Pf.c
-./fortran/src/H5Pff.f90
-./fortran/src/H5Pff_F90.f90
-./fortran/src/H5Pff_F03.f90
-./fortran/src/H5Rf.c
-./fortran/src/H5Rff.f90
-./fortran/src/H5Rff_F90.f90
-./fortran/src/H5Rff_F03.f90
-./fortran/src/H5Sf.c
-./fortran/src/H5Sff.f90
-./fortran/src/H5Tf.c
-./fortran/src/H5Tff.f90
-./fortran/src/H5Tff_F90.f90
-./fortran/src/H5Tff_F03.f90
-./fortran/src/H5Zf.c
-./fortran/src/H5Zff.f90
-./fortran/src/H5f90.h
-./fortran/src/H5f90global.f90
-./fortran/src/H5f90i.h
-./fortran/src/H5f90kit.c
-./fortran/src/H5f90proto.h
-./fortran/src/H5test_kind.f90
-./fortran/src/H5test_kind_SIZEOF.f90
-./fortran/src/H5test_kind_STORAGE_SIZE.f90
-./fortran/src/H5match_types.c
-./fortran/src/HDF5.f90
-./fortran/src/HDF5mpio.f90
-./fortran/src/Makefile.am
-./fortran/src/Makefile.in
-./fortran/src/README
-./fortran/src/README_DEVELOPEMENT   _DO_NOT_DISTRIBUTE_
-./fortran/src/h5fc.in
-./fortran/src/hdf5_fortrandll.def.in
-
-./fortran/test/Makefile.am
-./fortran/test/Makefile.in
-./fortran/test/fflush1.f90
-./fortran/test/fflush2.f90
-./fortran/test/fortranlib_test.f90
-./fortran/test/fortranlib_test_1_8.f90
-./fortran/test/fortranlib_test_F03.f90
-./fortran/test/t.c
-./fortran/test/t.h
-./fortran/test/tf.f90
-./fortran/test/tf_F90.f90
-./fortran/test/tf_F03.f90
-./fortran/test/tf_F08.f90
-./fortran/test/tH5A.f90
-./fortran/test/tH5A_1_8.f90
-./fortran/test/tH5D.f90
-./fortran/test/tH5E_F03.f90
-./fortran/test/tH5E.f90
-./fortran/test/tH5F.f90
-./fortran/test/tH5F_F03.f90
-./fortran/test/tH5G.f90
-./fortran/test/tH5G_1_8.f90
-./fortran/test/tH5I.f90
-./fortran/test/tH5L_F03.f90
-./fortran/test/tH5MISC_1_8.f90
-./fortran/test/tH5O.f90
-./fortran/test/tH5O_F03.f90
-./fortran/test/tH5P_F03.f90
-./fortran/test/tH5P.f90
-./fortran/test/tH5R.f90
-./fortran/test/tH5S.f90
-./fortran/test/tH5Sselect.f90
-./fortran/test/tH5T_F03.f90
-./fortran/test/tH5T.f90
-./fortran/test/tH5VL.f90
-./fortran/test/tH5Z.f90
-./fortran/test/tHDF5_1_8.f90
-./fortran/test/tHDF5_F03.f90
-./fortran/test/tHDF5.f90
-
-./fortran/testpar/Makefile.am
-./fortran/testpar/Makefile.in
-./fortran/testpar/ptest.f90
-./fortran/testpar/hyper.f90
-./fortran/testpar/mdset.f90
-
-#------------------------------------------------------------------------------
-#
-# End Fortran interface
-#
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-#
-# Begin C++ interface
-#
-#------------------------------------------------------------------------------
-
-./c++/COPYING
-./c++/Makefile.am
-./c++/Makefile.in
-
-./c++/examples/chunks.cpp
-./c++/examples/compound.cpp
-./c++/examples/create.cpp
-./c++/examples/expected.out
-./c++/examples/extend_ds.cpp
-./c++/examples/h5group.cpp
-./c++/examples/h5tutr_cmprss.cpp
-./c++/examples/h5tutr_crtatt.cpp
-./c++/examples/h5tutr_crtdat.cpp
-./c++/examples/h5tutr_crtgrpar.cpp
-./c++/examples/h5tutr_crtgrp.cpp
-./c++/examples/h5tutr_crtgrpd.cpp
-./c++/examples/h5tutr_extend.cpp
-./c++/examples/h5tutr_rdwt.cpp
-./c++/examples/h5tutr_subset.cpp
-./c++/examples/readdata.cpp
-./c++/examples/testh5c++.sh.in
-./c++/examples/writedata.cpp
-./c++/examples/Makefile.am
-./c++/examples/Makefile.in
-./c++/examples/run-c++-ex.sh.in
-
-./c++/src/H5AbstractDs.cpp
-./c++/src/H5AbstractDs.h
-./c++/src/H5Alltypes.h
-./c++/src/H5ArrayType.cpp
-./c++/src/H5ArrayType.h
-./c++/src/H5AtomType.cpp
-./c++/src/H5AtomType.h
-./c++/src/H5Attribute.cpp
-./c++/src/H5Attribute.h
-./c++/src/H5Classes.h
-./c++/src/H5CommonFG.cpp
-./c++/src/H5CommonFG.h
-./c++/src/H5CompType.cpp
-./c++/src/H5CompType.h
-./c++/src/H5Cpp.h
-./c++/src/H5CppDoc.h
-./c++/src/H5DataSet.cpp
-./c++/src/H5DataSet.h
-./c++/src/H5DataSpace.cpp
-./c++/src/H5DataSpace.h
-./c++/src/H5DataType.cpp
-./c++/src/H5DataType.h
-./c++/src/H5DcreatProp.cpp
-./c++/src/H5DcreatProp.h
-./c++/src/H5DxferProp.cpp
-./c++/src/H5DxferProp.h
-./c++/src/H5EnumType.cpp
-./c++/src/H5EnumType.h
-./c++/src/H5Exception.cpp
-./c++/src/H5Exception.h
-./c++/src/H5FaccProp.cpp
-./c++/src/H5FaccProp.h
-./c++/src/H5FcreatProp.cpp
-./c++/src/H5FcreatProp.h
-./c++/src/H5File.cpp
-./c++/src/H5File.h
-./c++/src/H5FloatType.cpp
-./c++/src/H5FloatType.h
-./c++/src/H5Group.cpp
-./c++/src/H5Group.h
-./c++/src/H5IdComponent.cpp
-./c++/src/H5IdComponent.h
-./c++/src/H5Include.h
-./c++/src/H5IntType.cpp
-./c++/src/H5IntType.h
-./c++/src/H5Library.cpp
-./c++/src/H5Library.h
-./c++/src/H5Location.cpp
-./c++/src/H5Location.h
-./c++/src/H5Object.cpp
-./c++/src/H5Object.h
-./c++/src/H5PredType.cpp
-./c++/src/H5PredType.h
-./c++/src/H5PropList.cpp
-./c++/src/H5PropList.h
-./c++/src/H5StrType.cpp
-./c++/src/H5StrType.h
-./c++/src/H5VarLenType.cpp
-./c++/src/H5VarLenType.h
-./c++/src/Makefile.am
-./c++/src/Makefile.in
-./c++/src/RM_stylesheet.css
-./c++/src/cpp_doc_config
-./c++/src/h5c++.in
-./c++/src/header.html
-./c++/src/header_files/filelist.xml
-./c++/src/header_files/hdf_logo.jpg
-./c++/src/header_files/help.jpg
-./c++/src/header_files/image001.jpg
-./c++/src/header_files/image002.jpg
-
-./c++/test/H5srcdir_str.h.in
-./c++/test/Makefile.am
-./c++/test/Makefile.in
-./c++/test/dsets.cpp
-./c++/test/h5cpputil.cpp
-./c++/test/h5cpputil.h
-./c++/test/tattr.cpp
-./c++/test/tcompound.cpp
-./c++/test/tdspl.cpp
-./c++/test/testhdf5.cpp
-./c++/test/tfile.cpp
-./c++/test/tfilter.cpp
-./c++/test/th5s.cpp
-./c++/test/th5s.h5
-./c++/test/tlinks.cpp
-./c++/test/tobject.cpp
-./c++/test/ttypes.cpp
-./c++/test/trefer.cpp
-./c++/test/tvlstr.cpp
-
-#------------------------------------------------------------------------------
-#
-# End C++ interface
-#
-#------------------------------------------------------------------------------
-
-./release_docs/COPYING
-./release_docs/HISTORY-1_0-1_8_0_rc3.txt
-./release_docs/HISTORY-1_9.txt
-./release_docs/INSTALL
-./release_docs/INSTALL_CMake.txt
-./release_docs/INSTALL_Cygwin.txt
-./release_docs/INSTALL_parallel
-./release_docs/INSTALL_VMS.txt
-./release_docs/INSTALL_Windows.txt
-./release_docs/RELEASE.txt
-./release_docs/USING_HDF5_CMake.txt
-./release_docs/USING_HDF5_VS.txt
-
-./src/.indent.pro      _DO_NOT_DISTRIBUTE_
-./src/hdf5.lnt        _DO_NOT_DISTRIBUTE_
-./src/hdf5-win.lnt      _DO_NOT_DISTRIBUTE_
-./src/hdf5-lin.lnt      _DO_NOT_DISTRIBUTE_
-./src/COPYING
-./src/H5.c
-./src/H5checksum.c
-./src/H5dbg.c
-./src/H5api_adpt.h
-./src/H5err.txt
-./src/H5config.h.in
-./src/H5detect.c
-./src/H5make_libsettings.c
-./src/H5overflow.txt
-./src/H5overflow.h
-./src/H5private.h
-./src/H5public.h
-./src/H5system.c
-./src/H5timer.c
-./src/H5trace.c
-./src/H5vers.txt
-./src/H5version.h
-./src/H5A.c
-./src/H5Abtree2.c
-./src/H5Adense.c
-./src/H5Adeprec.c
-./src/H5Aint.c
-./src/H5Atest.c
-./src/H5Apkg.h
-./src/H5Aprivate.h
-./src/H5Apublic.h
-./src/H5AC.c
-./src/H5ACpkg.h
-./src/H5ACprivate.h
-./src/H5ACpublic.h
-./src/H5B.c
-./src/H5Bcache.c
-./src/H5Bdbg.c
-./src/H5Bpkg.h
-./src/H5Bprivate.h
-./src/H5Bpublic.h      
-./src/H5B2.c
-./src/H5B2cache.c
-./src/H5B2dbg.c
-./src/H5B2hdr.c
-./src/H5B2int.c
-./src/H5B2pkg.h
-./src/H5B2private.h
-./src/H5B2public.h    
-./src/H5B2stat.c
-./src/H5B2test.c
-./src/H5C.c
-./src/H5Cpkg.h
-./src/H5Cprivate.h
-./src/H5Cpublic.h
-./src/H5CS.c
-./src/H5CSprivate.h
-./src/H5D.c
-./src/H5Dbtree.c
-./src/H5Dchunk.c
-./src/H5Dcompact.c
-./src/H5Dcontig.c
-./src/H5Ddbg.c
-./src/H5Ddeprec.c
-./src/H5Defl.c
-./src/H5Dfill.c
-./src/H5Dint.c
-./src/H5Dio.c
-./src/H5Dlayout.c
-./src/H5Dmpio.c
-./src/H5Doh.c
-./src/H5Dpkg.h
-./src/H5Dprivate.h
-./src/H5Dpublic.h
-./src/H5Dscatgath.c
-./src/H5Dselect.c
-./src/H5Dtest.c
-./src/H5E.c
-./src/H5Edefin.h
-./src/H5Edeprec.c
-./src/H5Einit.h
-./src/H5Eint.c
-./src/H5Epkg.h
-./src/H5Eprivate.h
-./src/H5Epubgen.h
-./src/H5Epublic.h
-./src/H5Eterm.h
-./src/H5EA.c
-./src/H5EAcache.c
-./src/H5EAdbg.c
-./src/H5EAdblkpage.c
-./src/H5EAdblock.c
-./src/H5EAhdr.c
-./src/H5EAiblock.c
-./src/H5EAint.c
-./src/H5EApkg.h
-./src/H5EAprivate.h
-./src/H5EAsblock.c
-./src/H5EAstat.c
-./src/H5EAtest.c
-./src/H5F.c
-./src/H5Faccum.c
-./src/H5Fcwfs.c
-./src/H5Fdbg.c
-./src/H5Fdeprec.c
-./src/H5Fefc.c
-./src/H5Ffake.c
-./src/H5Fint.c
-./src/H5Fio.c
-./src/H5Fmount.c
-./src/H5Fmpi.c
-./src/H5Fquery.c
-./src/H5Fsfile.c
-./src/H5Fsuper.c
-./src/H5Fsuper_cache.c
-./src/H5Fpkg.h
-./src/H5Fprivate.h
-./src/H5Fpublic.h
-./src/H5Ftest.c
-./src/H5FA.c
-./src/H5FAcache.c
-./src/H5FAdbg.c
-./src/H5FAdblkpage.c
-./src/H5FAdblock.c
-./src/H5FAhdr.c
-./src/H5FApkg.h
-./src/H5FAprivate.h
-./src/H5FAstat.c
-./src/H5FAtest.c
-./src/H5FD.c
-./src/H5FDcore.c
-./src/H5FDcore.h
-./src/H5FDdirect.c
-./src/H5FDdirect.h
-./src/H5FDfamily.c
-./src/H5FDfamily.h
-./src/H5FDint.c
-./src/H5FDlog.c
-./src/H5FDlog.h
-./src/H5FDmpi.c
-./src/H5FDmpi.h
-./src/H5FDmpio.c
-./src/H5FDmpio.h
-./src/H5FDmulti.c
-./src/H5FDmulti.h
-./src/H5FDpkg.h
-./src/H5FDprivate.h
-./src/H5FDpublic.h
-./src/H5FDsec2.c
-./src/H5FDsec2.h
-./src/H5FDspace.c
-./src/H5FDstdio.c
-./src/H5FDstdio.h
-./src/H5FDwindows.c
-./src/H5FDwindows.h
-./src/H5FL.c
-./src/H5FLprivate.h
-./src/H5FO.c
-./src/H5FOprivate.h
-./src/H5FS.c
-./src/H5FScache.c
-./src/H5FSdbg.c
-./src/H5FStest.c
-./src/H5FSstat.c
-./src/H5FSpkg.h
-./src/H5FSprivate.h
-./src/H5FSpublic.h
-./src/H5FSsection.c
-./src/H5G.c
-./src/H5Gbtree2.c
-./src/H5Gcache.c
-./src/H5Gcompact.c
-./src/H5Gdense.c
-./src/H5Gdeprec.c
-./src/H5Gent.c
-./src/H5Gint.c
-./src/H5Glink.c
-./src/H5Gloc.c
-./src/H5Gname.c
-./src/H5Gnode.c
-./src/H5Gobj.c
-./src/H5Goh.c
-./src/H5Gpkg.h
-./src/H5Gprivate.h
-./src/H5Gpublic.h
-./src/H5Groot.c
-./src/H5Gstab.c
-./src/H5Gtest.c
-./src/H5Gtraverse.c
-./src/H5HF.c
-./src/H5HFbtree2.c
-./src/H5HFcache.c
-./src/H5HFdbg.c
-./src/H5HFdblock.c
-./src/H5HFdtable.c
-./src/H5HFhdr.c
-./src/H5HFhuge.c
-./src/H5HFiblock.c
-./src/H5HFiter.c
-./src/H5HFman.c
-./src/H5HFpkg.h
-./src/H5HFprivate.h
-./src/H5HFpublic.h  
-./src/H5HFsection.c
-./src/H5HFspace.c
-./src/H5HFstat.c
-./src/H5HFtest.c
-./src/H5HFtiny.c
-./src/H5HG.c
-./src/H5HGcache.c
-./src/H5HGdbg.c
-./src/H5HGpkg.h
-./src/H5HGprivate.h
-./src/H5HGpublic.h
-./src/H5HGquery.c
-./src/H5HL.c
-./src/H5HLcache.c
-./src/H5HLdbg.c
-./src/H5HLint.c
-./src/H5HLpkg.h
-./src/H5HLprivate.h
-./src/H5HLpublic.h
-./src/H5HP.c
-./src/H5HPprivate.h
-./src/H5I.c
-./src/H5Ipkg.h
-./src/H5Iprivate.h
-./src/H5Ipublic.h
-./src/H5Itest.c
-./src/H5L.c
-./src/H5Lexternal.c
-./src/H5Lpkg.h
-./src/H5Lprivate.h
-./src/H5Lpublic.h
-./src/H5MF.c
-./src/H5MFaggr.c
-./src/H5MFdbg.c
-./src/H5MFsection.c
-./src/H5MFpkg.h
-./src/H5MFprivate.h
-./src/H5MM.c
-./src/H5MMprivate.h
-./src/H5MMpublic.h
-./src/H5MP.c
-./src/H5MPpkg.h
-./src/H5MPprivate.h
-./src/H5MPtest.c
-./src/H5O.c
-./src/H5Oainfo.c
-./src/H5Oalloc.c
-./src/H5Oattr.c
-./src/H5Oattribute.c
-./src/H5Obogus.c
-./src/H5Obtreek.c
-./src/H5Ocache.c
-./src/H5Ochunk.c
-./src/H5Ocont.c
-./src/H5Ocopy.c
-./src/H5Odbg.c
-./src/H5Odrvinfo.c
-./src/H5Odtype.c
-./src/H5Oefl.c
-./src/H5Ofill.c
-./src/H5Ofsinfo.c
-./src/H5Oginfo.c
-./src/H5Olayout.c
-./src/H5Olinfo.c
-./src/H5Olink.c
-./src/H5Omessage.c
-./src/H5Omtime.c
-./src/H5Oname.c
-./src/H5Onull.c
-./src/H5Opkg.h
-./src/H5Opline.c
-./src/H5Oprivate.h
-./src/H5Opublic.h
-./src/H5Orefcount.c
-./src/H5Osdspace.c
-./src/H5Oshared.c
-./src/H5Oshared.h
-./src/H5Oshmesg.c
-./src/H5Ostab.c
-./src/H5Otest.c
-./src/H5Ounknown.c
-./src/H5P.c
-./src/H5Pacpl.c
-./src/H5Pdapl.c
-./src/H5Pdcpl.c
-./src/H5Pdeprec.c
-./src/H5Pdxpl.c
-./src/H5Pencdec.c
-./src/H5Pfapl.c
-./src/H5Pfcpl.c
-./src/H5Pfmpl.c
-./src/H5Pgcpl.c
-./src/H5Pint.c
-./src/H5Plapl.c
-./src/H5Plcpl.c
-./src/H5Pocpl.c
-./src/H5Pocpypl.c
-./src/H5Ppkg.h
-./src/H5Pprivate.h
-./src/H5Ppublic.h
-./src/H5Pstrcpl.c
-./src/H5Ptest.c
-./src/H5PL.c
-./src/H5PLprivate.h
-./src/H5PLpublic.h
-./src/H5PLextern.h
-./src/H5R.c
-./src/H5Rdeprec.c
-./src/H5Rpkg.h
-./src/H5Rprivate.h
-./src/H5Rpublic.h
-./src/H5UC.c
-./src/H5UCprivate.h
-./src/H5RS.c
-./src/H5RSprivate.h
-./src/H5S.c
-./src/H5Sall.c
-./src/H5Sdbg.c
-./src/H5Shyper.c
-./src/H5Smpio.c
-./src/H5Snone.c
-./src/H5Spkg.h
-./src/H5Spoint.c
-./src/H5Sprivate.h
-./src/H5Spublic.h
-./src/H5Sselect.c
-./src/H5Stest.c
-./src/H5SL.c
-./src/H5SLprivate.h
-./src/H5SM.c
-./src/H5SMbtree2.c
-./src/H5SMcache.c
-./src/H5SMmessage.c
-./src/H5SMpkg.h
-./src/H5SMprivate.h
-./src/H5SMtest.c
-./src/H5ST.c
-./src/H5STprivate.h
-./src/H5T.c
-./src/H5Tarray.c
-./src/H5Tbit.c
-./src/H5Tcommit.c
-./src/H5Tcompound.c
-./src/H5Tconv.c
-./src/H5Tcset.c
-./src/H5Tdbg.c
-./src/H5Tdeprec.c
-./src/H5Tenum.c
-./src/H5Tfields.c
-./src/H5Tfixed.c
-./src/H5Tfloat.c
-./src/H5Tnative.c
-./src/H5Toffset.c
-./src/H5Topaque.c
-./src/H5Torder.c
-./src/H5Toh.c
-./src/H5Tpad.c
-./src/H5Tpkg.h
-./src/H5Tprecis.c
-./src/H5Tprivate.h
-./src/H5Tpublic.h
-./src/H5Tstrpad.c
-./src/H5Tvisit.c
-./src/H5Tvlen.c
-./src/H5TS.c
-./src/H5TSprivate.h
-./src/H5VM.c
-./src/H5VMprivate.h
-./src/H5WB.c
-./src/H5WBprivate.h
-./src/H5Z.c
-./src/H5Zdeflate.c
-./src/H5Zfletcher32.c
-./src/H5Znbit.c
-./src/H5Zpkg.h
-./src/H5Zprivate.h
-./src/H5Zpublic.h
-./src/H5Zscaleoffset.c
-./src/H5Zshuffle.c
-./src/H5Zszip.c
-./src/H5Ztrans.c
-./src/Makefile.am
-./src/Makefile.in
-./src/hdf5.h
-./src/libhdf5.settings.in
-./src/H5win32defs.h
-
-./test/COPYING
-./test/H5srcdir.h
-./test/H5srcdir_str.h.in
-./test/Makefile.am
-./test/Makefile.in
-./test/accum.c
-./test/app_ref.c
-./test/bad_compound.h5
-./test/be_data.h5
-./test/be_extlink1.h5
-./test/be_extlink2.h5
-./test/big.c
-./test/bittests.c
-./test/btree2.c
-./test/cache.c
-./test/cache_api.c
-./test/cache_common.c
-./test/cache_common.h
-./test/cache_tagging.c
-./test/cmpd_dset.c
-./test/corrupt_stab_msg.h5
-./test/cross_read.c
-./test/dangle.c
-./test/deflate.h5
-./test/dsets.c
-./test/dt_arith.c
-./test/dtypes.c
-./test/dtransform.c
-./test/dynlib1.c
-./test/dynlib2.c
-./test/dynlib3.c
-./test/earray.c
-./test/efc.c
-./test/enc_dec_plist.c
-./test/enc_dec_plist_with_endianess.c
-./test/enum.c
-./test/extend.c
-./test/external.c
-./test/error_test.c
-./test/err_compat.c
-./test/filter_error.h5
-./test/links_env.c
-./test/family_v16_00000.h5
-./test/family_v16_00001.h5
-./test/family_v16_00002.h5
-./test/family_v16_00003.h5
-./test/farray.c
-./test/fheap.c
-./test/filespace_1_8.h5
-./test/filespace_1_6.h5
-./test/freespace.c
-./test/file_image.c
-./test/file_image_core_test.h5
-./test/fill_old.h5
-./test/fillval.c
-./test/filter_fail.c
-./test/flush1.c
-./test/flush2.c
-# ====distribute this for now. See HDFFV-8236====
-./test/gen_bad_ohdr.c
-./test/gen_bad_compound.c
-./test/gen_bogus.c
-./test/gen_cross.c
-./test/gen_deflate.c
-./test/gen_file_image.c
-./test/gen_filespace.c
-./test/gen_mergemsg.c
-./test/gen_new_array.c
-./test/gen_new_fill.c
-./test/gen_new_group.c
-./test/gen_new_mtime.c
-./test/gen_new_super.c
-./test/gen_noencoder.c
-./test/gen_nullspace.c
-./test/gen_old_array.c
-./test/gen_old_group.c
-./test/gen_old_layout.c
-./test/gen_old_mtime.c
-./test/gen_plist.c
-./test/gen_sizes_lheap.c
-./test/gen_specmetaread.c
-./test/gen_udlinks.c
-# ====end distribute this for now. See HDFFV-8236====
-./test/getname.c
-./test/gheap.c
-./test/group_old.h5
-./test/h5test.c
-./test/h5test.h
-./test/hyperslab.c
-./test/istore.c
-./test/le_data.h5
-./test/le_extlink1.h5
-./test/le_extlink2.h5
-./test/lheap.c
-./test/links.c
-./test/mergemsg.h5
-./test/mf.c
-./test/mount.c
-./test/mtime.c
-./test/multi_file_v16-r.h5
-./test/multi_file_v16-s.h5
-./test/noencoder.h5
-./test/ntypes.c
-./test/ohdr.c
-./test/objcopy.c
-./test/plugin.c
-./test/reserved.c
-./test/pool.c
-./test/set_extent.c
-# ====distribute this for now. See HDFFV-8236====
-./test/space_overflow.c
-# ====end distribute this for now. See HDFFV-8236====
-./test/specmetaread.h5
-./test/stab.c
-./test/tarray.c
-./test/tarrold.h5
-./test/tattr.c
-./test/tbad_msg_count.h5
-./test/tbogus.h5
-./test/tchecksum.c
-./test/tcheck_version.c
-./test/tconfig.c
-./test/tcoords.c
-./test/testcheck_version.sh.in
-./test/testerror.sh.in
-./test/testlinks_env.sh.in
-./test/testframe.c
-./test/testhdf5.c
-./test/testhdf5.h
-./test/testlibinfo.sh.in
-./test/test_plugin.sh.in
-./test/testmeta.c
-./test/tfile.c
-./test/tgenprop.c
-./test/th5o.c
-./test/th5s.c
-./test/th5s.h5
-./test/theap.c
-./test/tid.c
-./test/titerate.c
-./test/tlayouto.h5
-./test/tmeta.c
-./test/tmisc.c
-./test/tmtimen.h5
-./test/tmtimeo.h5
-./test/ttime.c
-./test/trefer.c
-./test/trefstr.c
-./test/tselect.c
-./test/tsizeslheap.h5
-./test/tskiplist.c
-./test/tsohm.c
-./test/ttst.c
-./test/ttsafe.c
-./test/ttsafe.h
-./test/ttsafe_acreate.c
-./test/ttsafe_cancel.c
-./test/ttsafe_dcreate.c
-./test/ttsafe_error.c
-./test/tunicode.c
-./test/tvlstr.c
-./test/tvltypes.c
-./test/unlink.c
-./test/unregister.c
-./test/vfd.c
-./test/test_filters_le.h5
-./test/test_filters_be.h5
-./test/gen_filters.c
-./test/chunk_info.c
-
-./test/testfiles/err_compat_1
-./test/testfiles/err_compat_2
-./test/testfiles/error_test_1
-./test/testfiles/error_test_2
-./test/testfiles/links_env.out
-./test/testfiles/plist_files/acpl_be
-./test/testfiles/plist_files/acpl_le
-./test/testfiles/plist_files/dapl_be
-./test/testfiles/plist_files/dapl_le
-./test/testfiles/plist_files/dcpl_be
-./test/testfiles/plist_files/dcpl_le
-./test/testfiles/plist_files/dxpl_be
-./test/testfiles/plist_files/dxpl_le
-./test/testfiles/plist_files/fapl_be
-./test/testfiles/plist_files/fapl_le
-./test/testfiles/plist_files/fcpl_be
-./test/testfiles/plist_files/fcpl_le
-./test/testfiles/plist_files/gcpl_be
-./test/testfiles/plist_files/gcpl_le
-./test/testfiles/plist_files/lapl_be
-./test/testfiles/plist_files/lapl_le
-./test/testfiles/plist_files/lcpl_be
-./test/testfiles/plist_files/lcpl_le
-./test/testfiles/plist_files/ocpl_be
-./test/testfiles/plist_files/ocpl_le
-./test/testfiles/plist_files/ocpypl_be
-./test/testfiles/plist_files/ocpypl_le
-./test/testfiles/plist_files/strcpl_be
-./test/testfiles/plist_files/strcpl_le
-
-./testpar/COPYING
-./testpar/Makefile.am
-./testpar/Makefile.in
-./testpar/t_cache.c
-./testpar/t_chunk_alloc.c
-./testpar/t_coll_chunk.c
-./testpar/t_dset.c
-./testpar/t_file.c
-./testpar/t_file_image.c
-./testpar/t_filter_read.c
-./testpar/t_mdset.c
-./testpar/t_mpi.c
-./testpar/t_ph5basic.c
-./testpar/t_pflush1.c
-./testpar/t_pflush2.c
-./testpar/t_prop.c
-./testpar/t_shapesame.c
-./testpar/t_pshutdown.c
-./testpar/t_prestart.c
-./testpar/t_span_tree.c
-./testpar/testpar.h
-./testpar/testphdf5.c
-./testpar/testphdf5.h
-
-./tools/COPYING
-./tools/Makefile.am
-./tools/Makefile.in
-
-./tools/h5dump/Makefile.am
-./tools/h5dump/Makefile.in
-./tools/h5dump/h5dump.c
-./tools/h5dump/h5dump.h
-./tools/h5dump/h5dump_defines.h
-./tools/h5dump/h5dump_extern.h
-./tools/h5dump/h5dump_ddl.c
-./tools/h5dump/h5dump_ddl.h
-./tools/h5dump/h5dump_xml.c
-./tools/h5dump/h5dump_xml.h
-./tools/h5dump/h5dumpgentest.c
-./tools/h5dump/testh5dump.sh.in
-./tools/h5dump/testh5dumppbits.sh.in
-./tools/h5dump/testh5dumpxml.sh.in
-./tools/h5dump/binread.c
-
-
-./tools/h5import/Makefile.am
-./tools/h5import/Makefile.in
-./tools/h5import/h5import.h
-./tools/h5import/h5import.c
-./tools/h5import/h5importtest.c
-./tools/h5import/h5importtestutil.sh.in
-
-# testfiles for h5import
-./tools/h5import/testfiles/binfp64.conf
-./tools/h5import/testfiles/binfp64.h5
-./tools/h5import/testfiles/binin16.conf
-./tools/h5import/testfiles/binin16.h5
-./tools/h5import/testfiles/binin32.conf
-./tools/h5import/testfiles/binin32.h5
-./tools/h5import/testfiles/binin8.conf
-./tools/h5import/testfiles/binin8.h5
-./tools/h5import/testfiles/binin8w.conf
-./tools/h5import/testfiles/binin8w.h5
-./tools/h5import/testfiles/binuin16.conf
-./tools/h5import/testfiles/binuin16.h5
-./tools/h5import/testfiles/binuin32.conf
-./tools/h5import/testfiles/binuin32.h5
-./tools/h5import/testfiles/textpfe.conf
-./tools/h5import/testfiles/textpfe.h5
-./tools/h5import/testfiles/textpfe64.txt
-./tools/h5import/testfiles/txtfp32.conf
-./tools/h5import/testfiles/txtfp32.h5
-./tools/h5import/testfiles/txtfp32.txt
-./tools/h5import/testfiles/txtfp64.conf
-./tools/h5import/testfiles/txtfp64.h5
-./tools/h5import/testfiles/txtfp64.txt
-./tools/h5import/testfiles/txtin16.conf
-./tools/h5import/testfiles/txtin16.h5
-./tools/h5import/testfiles/txtin16.txt
-./tools/h5import/testfiles/txtin32.conf
-./tools/h5import/testfiles/txtin32.h5
-./tools/h5import/testfiles/txtin32.txt
-./tools/h5import/testfiles/txtin8.conf
-./tools/h5import/testfiles/txtin8.h5
-./tools/h5import/testfiles/txtin8.txt
-./tools/h5import/testfiles/txtuin16.conf
-./tools/h5import/testfiles/txtuin16.h5
-./tools/h5import/testfiles/txtuin16.txt
-./tools/h5import/testfiles/txtuin32.conf
-./tools/h5import/testfiles/txtuin32.h5
-./tools/h5import/testfiles/txtuin32.txt
-./tools/h5import/testfiles/txtstr.conf
-./tools/h5import/testfiles/txtstr.h5
-./tools/h5import/testfiles/txtstr.txt
-./tools/h5import/testfiles/dbinfp64.h5.txt
-./tools/h5import/testfiles/dbinin8.h5.txt
-./tools/h5import/testfiles/dbinin8w.h5.txt
-./tools/h5import/testfiles/dbinin16.h5.txt
-./tools/h5import/testfiles/dbinin32.h5.txt
-./tools/h5import/testfiles/dbinuin16.h5.txt
-./tools/h5import/testfiles/dbinuin32.h5.txt
-./tools/h5import/testfiles/dtxtstr.h5.txt
-
-# h5diff sources
-./tools/h5diff/Makefile.am
-./tools/h5diff/Makefile.in
-./tools/h5diff/h5diff_common.c
-./tools/h5diff/h5diff_common.h
-./tools/h5diff/h5diff_main.c
-./tools/h5diff/ph5diff_main.c
-./tools/h5diff/h5diffgentest.c
-./tools/h5diff/testh5diff.sh.in
-./tools/h5diff/testph5diff.sh.in
-
-# h5repack sources
-./tools/h5repack/Makefile.am
-./tools/h5repack/Makefile.in
-./tools/h5repack/dynlib_rpk.c
-./tools/h5repack/h5repack.sh.in
-./tools/h5repack/h5repack_plugin.sh.in
-./tools/h5repack/h5repack.c
-./tools/h5repack/h5repack.h
-./tools/h5repack/h5repack_copy.c
-./tools/h5repack/h5repack_refs.c
-./tools/h5repack/h5repack_filters.c
-./tools/h5repack/h5repack_main.c
-./tools/h5repack/h5repack_opttable.c
-./tools/h5repack/h5repack_parse.c
-./tools/h5repack/h5repack_verify.c
-./tools/h5repack/h5repacktst.c
-./tools/h5repack/testh5repack_detect_szip.c
-
-# h5ls sources
-./tools/h5ls/Makefile.am
-./tools/h5ls/Makefile.in
-./tools/h5ls/h5ls.c
-./tools/h5ls/testh5ls.sh.in
-
-# h5copy sources
-./tools/h5copy/testh5copy.sh.in
-./tools/h5copy/Makefile.in
-./tools/h5copy/h5copy.c
-./tools/h5copy/h5copygentest.c
-./tools/h5copy/Makefile.am
-
-
-./tools/lib/Makefile.am
-./tools/lib/Makefile.in
-./tools/lib/h5diff.c
-./tools/lib/h5diff.h
-./tools/lib/h5diff_array.c
-./tools/lib/h5diff_attr.c
-./tools/lib/h5diff_dset.c
-./tools/lib/h5diff_util.c
-./tools/lib/h5trav.c
-./tools/lib/h5trav.h
-./tools/lib/h5tools.c
-./tools/lib/h5tools.h
-./tools/lib/h5tools_dump.c
-./tools/lib/h5tools_dump.h
-./tools/lib/h5tools_filters.c
-./tools/lib/h5tools_str.c
-./tools/lib/h5tools_str.h
-./tools/lib/h5tools_utils.c
-./tools/lib/h5tools_utils.h
-./tools/lib/h5tools_ref.c
-./tools/lib/h5tools_ref.h
-./tools/lib/h5tools_type.c
-./tools/lib/ph5diff.h
-./tools/lib/h5tools_error.h
-./tools/lib/io_timer.c
-./tools/lib/io_timer.h
-
-./tools/misc/Makefile.am
-./tools/misc/Makefile.in
-./tools/misc/h5cc.in
-./tools/misc/h5debug.c
-./tools/misc/h5mkgrp.c
-./tools/misc/h5redeploy.in
-./tools/misc/h5repart.c
-./tools/misc/h5repart_gentest.c
-./tools/misc/repart_test.c
-./tools/misc/testh5mkgrp.sh.in
-./tools/misc/testh5repart.sh.in
-./tools/misc/talign.c
-./tools/misc/testfiles/h5mkgrp_help.txt
-./tools/misc/testfiles/h5mkgrp_version.txt.in
-./tools/misc/h5perf_gentest.c
-
-# h5stat sources
-./tools/h5stat/Makefile.am
-./tools/h5stat/Makefile.in
-./tools/h5stat/h5stat.c
-
-# h5stat test files
-./tools/h5stat/h5stat_gentest.c
-./tools/h5stat/testh5stat.sh.in
-./tools/h5stat/testfiles/h5stat_dims1.ddl
-./tools/h5stat/testfiles/h5stat_dims2.ddl
-./tools/h5stat/testfiles/h5stat_err1_dims.ddl
-./tools/h5stat/testfiles/h5stat_err1_links.ddl
-./tools/h5stat/testfiles/h5stat_err1_numattrs.ddl
-./tools/h5stat/testfiles/h5stat_err2_numattrs.ddl
-./tools/h5stat/testfiles/h5stat_filters.ddl
-./tools/h5stat/testfiles/h5stat_filters-d.ddl
-./tools/h5stat/testfiles/h5stat_filters-dT.ddl
-./tools/h5stat/testfiles/h5stat_filters-F.ddl
-./tools/h5stat/testfiles/h5stat_filters-file.ddl
-./tools/h5stat/testfiles/h5stat_filters-g.ddl
-./tools/h5stat/testfiles/h5stat_filters-UD.ddl
-./tools/h5stat/testfiles/h5stat_filters-UT.ddl
-./tools/h5stat/testfiles/h5stat_filters.h5
-./tools/h5stat/testfiles/h5stat_help1.ddl
-./tools/h5stat/testfiles/h5stat_help2.ddl
-./tools/h5stat/testfiles/h5stat_links1.ddl
-./tools/h5stat/testfiles/h5stat_links2.ddl
-./tools/h5stat/testfiles/h5stat_links3.ddl
-./tools/h5stat/testfiles/h5stat_links4.ddl
-./tools/h5stat/testfiles/h5stat_links5.ddl
-./tools/h5stat/testfiles/h5stat_newgrat.ddl
-./tools/h5stat/testfiles/h5stat_newgrat-UA.ddl
-./tools/h5stat/testfiles/h5stat_newgrat-UG.ddl
-./tools/h5stat/testfiles/h5stat_newgrat.h5
-./tools/h5stat/testfiles/h5stat_nofile.ddl
-./tools/h5stat/testfiles/h5stat_notexist.ddl
-./tools/h5stat/testfiles/h5stat_numattrs1.ddl
-./tools/h5stat/testfiles/h5stat_numattrs2.ddl
-./tools/h5stat/testfiles/h5stat_numattrs3.ddl
-./tools/h5stat/testfiles/h5stat_numattrs4.ddl
-./tools/h5stat/testfiles/h5stat_threshold.h5
-./tools/h5stat/testfiles/h5stat_tsohm.ddl
-./tools/h5stat/testfiles/h5stat_tsohm.h5
-
-# h5dump test files
-./tools/testfiles/charsets.h5
-./tools/testfiles/charsets.ddl
-./tools/testfiles/family_file00000.h5
-./tools/testfiles/family_file00001.h5
-./tools/testfiles/family_file00002.h5
-./tools/testfiles/family_file00003.h5
-./tools/testfiles/family_file00004.h5
-./tools/testfiles/family_file00005.h5
-./tools/testfiles/family_file00006.h5
-./tools/testfiles/family_file00007.h5
-./tools/testfiles/family_file00008.h5
-./tools/testfiles/family_file00009.h5
-./tools/testfiles/family_file00010.h5
-./tools/testfiles/family_file00011.h5
-./tools/testfiles/family_file00012.h5
-./tools/testfiles/family_file00013.h5
-./tools/testfiles/family_file00014.h5
-./tools/testfiles/family_file00015.h5
-./tools/testfiles/family_file00016.h5
-./tools/testfiles/family_file00017.h5
-./tools/testfiles/file_space.h5
-./tools/testfiles/file_space.ddl
-./tools/testfiles/filter_fail.h5
-./tools/testfiles/filter_fail.ddl
-./tools/testfiles/h5dump-help.txt
-./tools/testfiles/packedbits.ddl
-./tools/testfiles/taindices.h5
-./tools/testfiles/tall-1.ddl
-./tools/testfiles/tall-2.ddl
-./tools/testfiles/tall-2A.ddl
-./tools/testfiles/tall-2A0.ddl
-./tools/testfiles/tall-2B.ddl
-./tools/testfiles/tall-3.ddl
-./tools/testfiles/tall-4s.ddl
-./tools/testfiles/tall-5s.ddl
-./tools/testfiles/tall-6.ddl
-./tools/testfiles/tall-6.exp
-./tools/testfiles/tall-7.ddl
-./tools/testfiles/tall-7N.ddl
-./tools/testfiles/tall.h5
-./tools/testfiles/tallfilters.ddl
-./tools/testfiles/tarray1.ddl
-./tools/testfiles/tarray1.h5
-./tools/testfiles/tarray1_big.ddl
-./tools/testfiles/tarray1_big.h5
-./tools/testfiles/tarray2.ddl
-./tools/testfiles/tarray2.h5
-./tools/testfiles/tarray3.ddl
-./tools/testfiles/tarray3.h5
-./tools/testfiles/tarray4.ddl
-./tools/testfiles/tarray4.h5
-./tools/testfiles/tarray5.ddl
-./tools/testfiles/tarray5.h5
-./tools/testfiles/tarray6.ddl
-./tools/testfiles/tarray6.h5
-./tools/testfiles/tarray7.ddl
-./tools/testfiles/tarray7.h5
-./tools/testfiles/tarray8.ddl
-./tools/testfiles/tarray8.h5
-./tools/testfiles/tattr.h5
-./tools/testfiles/tattr-1.ddl
-./tools/testfiles/tattr-2.ddl
-./tools/testfiles/tattr-3.ddl
-./tools/testfiles/tattr-4_be.ddl
-./tools/testfiles/tattr2.h5
-./tools/testfiles/tattr4_be.h5
-./tools/testfiles/tattrcontents1.ddl
-./tools/testfiles/tattrcontents2.ddl
-./tools/testfiles/tattrintsize.ddl
-./tools/testfiles/tattrintsize.h5
-./tools/testfiles/tattrreg.h5
-./tools/testfiles/tattrreg.ddl 
-./tools/testfiles/tattrregR.ddl 
-./tools/testfiles/tbigdims.ddl
-./tools/testfiles/tbigdims.h5
-./tools/testfiles/tbinary.h5
-./tools/testfiles/tbin1.ddl
-./tools/testfiles/tbin2.ddl
-./tools/testfiles/tbin3.ddl
-./tools/testfiles/tbin4.ddl
-./tools/testfiles/tbinregR.exp
-./tools/testfiles/tbinregR.ddl
-./tools/testfiles/tbitfields.h5
-./tools/testfiles/tbitnopaque.ddl
-./tools/testfiles/tbitnopaque.h5
-./tools/testfiles/tboot1.ddl
-./tools/testfiles/tboot2.ddl
-./tools/testfiles/tboot2A.ddl
-./tools/testfiles/tboot2B.ddl
-./tools/testfiles/tchar.h5
-./tools/testfiles/tchar1.ddl
-./tools/testfiles/tchunked.ddl
-./tools/testfiles/tcompact.ddl
-./tools/testfiles/tcontents.ddl
-./tools/testfiles/tcontiguos.ddl
-./tools/testfiles/tcmpdattrintsize.ddl
-./tools/testfiles/tcmpdintarray.ddl
-./tools/testfiles/tcmpdints.ddl
-./tools/testfiles/tcmpdintsize.ddl
-./tools/testfiles/tcmpdattrintsize.h5
-./tools/testfiles/tcmpdintarray.h5
-./tools/testfiles/tcmpdints.h5
-./tools/testfiles/tcmpdintsize.h5
-./tools/testfiles/tcomp-1.ddl
-./tools/testfiles/tcomp-2.ddl
-./tools/testfiles/tcomp-3.ddl
-./tools/testfiles/tcomp-4.ddl
-./tools/testfiles/tcompound.h5
-./tools/testfiles/tcompound2.h5
-./tools/testfiles/tcompound_complex.h5
-./tools/testfiles/tdatareg.h5
-./tools/testfiles/tdatareg.ddl 
-./tools/testfiles/tdataregR.ddl 
-./tools/testfiles/tdeflate.ddl
-./tools/testfiles/tdset-1.ddl
-./tools/testfiles/tdset-2.ddl
-./tools/testfiles/tdset-3s.ddl
-./tools/testfiles/tdset.h5
-./tools/testfiles/tdset2.h5
-./tools/testfiles/tempty.ddl
-./tools/testfiles/tempty.h5
-./tools/testfiles/tenum.h5
-./tools/testfiles/texceedsubblock.ddl
-./tools/testfiles/texceedsubcount.ddl
-./tools/testfiles/texceedsubstart.ddl
-./tools/testfiles/texceedsubstride.ddl
-./tools/testfiles/texternal.ddl
-./tools/testfiles/textlink.h5
-./tools/testfiles/textlink.h5.xml
-./tools/testfiles/textlink.ddl
-./tools/testfiles/textlinkfar.ddl
-./tools/testfiles/textlinkfar.h5
-./tools/testfiles/textlinksrc.ddl
-./tools/testfiles/textlinksrc.h5
-./tools/testfiles/textlinktar.h5
-./tools/testfiles/tfamily.ddl
-./tools/testfiles/tfamily00000.h5
-./tools/testfiles/tfamily00001.h5
-./tools/testfiles/tfamily00002.h5
-./tools/testfiles/tfamily00003.h5
-./tools/testfiles/tfamily00004.h5
-./tools/testfiles/tfamily00005.h5
-./tools/testfiles/tfamily00006.h5
-./tools/testfiles/tfamily00007.h5
-./tools/testfiles/tfamily00008.h5
-./tools/testfiles/tfamily00009.h5
-./tools/testfiles/tfamily00010.h5
-./tools/testfiles/tfcontents1.h5
-./tools/testfiles/tfcontents2.h5
-./tools/testfiles/tfill.ddl
-./tools/testfiles/tfilters.h5
-./tools/testfiles/tfletcher32.ddl
-./tools/testfiles/tfvalues.h5
-./tools/testfiles/tgroup-1.ddl
-./tools/testfiles/tgroup-2.ddl
-./tools/testfiles/tgroup.h5
-./tools/testfiles/tgrp_comments.ls
-./tools/testfiles/tgrp_comments.ddl
-./tools/testfiles/tgrp_comments.h5
-./tools/testfiles/thlink-1.ddl
-./tools/testfiles/thlink-2.ddl
-./tools/testfiles/thlink-3.ddl
-./tools/testfiles/thlink-4.ddl
-./tools/testfiles/thlink-5.ddl
-./tools/testfiles/thlink.h5
-./tools/testfiles/thyperslab.ddl
-./tools/testfiles/thyperslab.h5
-./tools/testfiles/tindicesyes.ddl
-./tools/testfiles/tindicesno.ddl
-./tools/testfiles/tindicessub2.ddl
-./tools/testfiles/tindicessub3.ddl
-./tools/testfiles/tindicessub4.ddl
-./tools/testfiles/tindicessub1.ddl
-./tools/testfiles/tintsattrs.ddl
-./tools/testfiles/tintsattrs.h5
-./tools/testfiles/tlarge_objname.ddl
-./tools/testfiles/tlarge_objname.h5
-./tools/testfiles/tldouble.h5
-./tools/testfiles/tlonglinks.ddl
-./tools/testfiles/tlonglinks.h5
-./tools/testfiles/tloop-1.ddl
-./tools/testfiles/tloop.h5
-./tools/testfiles/tloop2.h5
-./tools/testfiles/tmany.h5
-./tools/testfiles/tmulti-b.h5
-./tools/testfiles/tmulti.ddl
-./tools/testfiles/tmulti-g.h5
-./tools/testfiles/tmulti-l.h5
-./tools/testfiles/tmulti-o.h5
-./tools/testfiles/tmulti-r.h5
-./tools/testfiles/tmulti-s.h5
-./tools/testfiles/tmultifile.ls
-./tools/testfiles/tmultifile.ddl
-./tools/testfiles/tnbit.ddl
-./tools/testfiles/tnestcomp-1.ddl
-./tools/testfiles/tnestedcomp.h5
-./tools/testfiles/tnestedcmpddt.ddl
-./tools/testfiles/tnestedcmpddt.h5
-./tools/testfiles/tnoattrdata.ddl
-./tools/testfiles/tnoattrddl.ddl
-./tools/testfiles/tnodata.ddl
-./tools/testfiles/tnoddl.ddl
-./tools/testfiles/tnoddlfile.ddl
-./tools/testfiles/tnoddlfile.exp
-./tools/testfiles/tno-subset.h5
-./tools/testfiles/tno-subset.ddl
-./tools/testfiles/tnullspace.h5
-./tools/testfiles/tnullspace.ddl
-./tools/testfiles/tobjref.h5
-./tools/testfiles/topaque.h5
-./tools/testfiles/tordercontents1.ddl
-./tools/testfiles/tordercontents2.ddl
-./tools/testfiles/torderlinks1.ddl
-./tools/testfiles/torderlinks2.ddl
-./tools/testfiles/tperror.ddl
-./tools/testfiles/tqmarkfile.ddl
-./tools/testfiles/trawdatafile.ddl
-./tools/testfiles/trawdatafile.exp
-./tools/testfiles/trawssetfile.ddl
-./tools/testfiles/trawssetfile.exp
-./tools/testfiles/treadfilter.ddl
-./tools/testfiles/treadintfilter.ddl
-./tools/testfiles/treference.ddl
-./tools/testfiles/tsaf.ddl
-./tools/testfiles/tsaf.h5
-./tools/testfiles/tscalarattrintsize.ddl
-./tools/testfiles/tscalarattrintsize.h5
-./tools/testfiles/tscalarintattrsize.ddl
-./tools/testfiles/tscalarintattrsize.h5
-./tools/testfiles/tscalarintsize.ddl
-./tools/testfiles/tscalarintsize.h5
-./tools/testfiles/tscalarstring.ddl
-./tools/testfiles/tscalarstring.h5
-./tools/testfiles/tscaleoffset.ddl
-./tools/testfiles/tshuffle.ddl
-./tools/testfiles/tslink-1.ddl
-./tools/testfiles/tslink-2.ddl
-./tools/testfiles/tslink-D.ddl
-./tools/testfiles/tslink.h5
-./tools/testfiles/tsoftlinks.h5
-./tools/testfiles/tsplit_file-m.h5
-./tools/testfiles/tsplit_file-r.h5
-./tools/testfiles/tsplit_file.ddl
-./tools/testfiles/tstarfile.ddl
-./tools/testfiles/tstr.h5
-./tools/testfiles/tstr2.h5
-./tools/testfiles/tstr3.h5
-./tools/testfiles/tstr-1.ddl
-./tools/testfiles/tstr-2.ddl
-./tools/testfiles/tstr2bin2.exp
-./tools/testfiles/tstr2bin6.exp
-./tools/testfiles/tstring.ddl
-./tools/testfiles/tstring2.ddl
-./tools/testfiles/tstringe.ddl
-./tools/testfiles/tszip.ddl
-./tools/testfiles/tudlink.h5
-./tools/testfiles/tudlink.h5.xml
-./tools/testfiles/tudlink-1.ddl
-./tools/testfiles/tudlink-2.ddl
-./tools/testfiles/tuserfilter.ddl
-./tools/testfiles/tvldtypes1.ddl
-./tools/testfiles/tvldtypes1.h5
-./tools/testfiles/tvldtypes2.ddl
-./tools/testfiles/tvldtypes2.h5
-./tools/testfiles/tvldtypes3.ddl
-./tools/testfiles/tvldtypes3.h5
-./tools/testfiles/tvldtypes4.ddl
-./tools/testfiles/tvldtypes4.h5
-./tools/testfiles/tvldtypes5.ddl
-./tools/testfiles/tvldtypes5.h5
-./tools/testfiles/tvlstr.h5
-./tools/testfiles/tvlstr.ddl
-./tools/testfiles/tvms.ddl
-./tools/testfiles/tvms.h5
-./tools/testfiles/twidedisplay.ddl
-./tools/testfiles/twithddl.exp
-./tools/testfiles/twithddlfile.ddl
-./tools/testfiles/twithddlfile.exp
-
-# h5dump test error files
-./tools/h5dump/errfiles/filter_fail.err
-./tools/h5dump/errfiles/tall-1.err
-./tools/h5dump/errfiles/tall-2A.err
-./tools/h5dump/errfiles/tall-2A0.err
-./tools/h5dump/errfiles/tall-2B.err
-./tools/h5dump/errfiles/tarray1_big.err
-./tools/h5dump/errfiles/tattr-3.err
-./tools/h5dump/errfiles/tattrregR.err
-./tools/h5dump/errfiles/tcomp-3.err
-./tools/h5dump/errfiles/tdataregR.err
-./tools/h5dump/errfiles/tdset-2.err
-./tools/h5dump/errfiles/texceedsubblock.err
-./tools/h5dump/errfiles/texceedsubcount.err
-./tools/h5dump/errfiles/texceedsubstart.err
-./tools/h5dump/errfiles/texceedsubstride.err
-./tools/h5dump/errfiles/textlink.err
-./tools/h5dump/errfiles/textlinkfar.err
-./tools/h5dump/errfiles/textlinksrc.err
-./tools/h5dump/errfiles/tgroup-2.err
-./tools/h5dump/errfiles/tnofilename-with-packed-bits.err
-./tools/h5dump/errfiles/torderlinks1.err
-./tools/h5dump/errfiles/torderlinks2.err
-./tools/h5dump/errfiles/tpbitsCharLengthExceeded.err
-./tools/h5dump/errfiles/tpbitsCharOffsetExceeded.err
-./tools/h5dump/errfiles/tpbitsIncomplete.err
-./tools/h5dump/errfiles/tpbitsIntLengthExceeded.err
-./tools/h5dump/errfiles/tpbitsIntOffsetExceeded.err
-./tools/h5dump/errfiles/tpbitsLengthExceeded.err
-./tools/h5dump/errfiles/tpbitsLengthPositive.err
-./tools/h5dump/errfiles/tpbitsLongLengthExceeded.err
-./tools/h5dump/errfiles/tpbitsLongOffsetExceeded.err
-./tools/h5dump/errfiles/tpbitsMaxExceeded.err
-./tools/h5dump/errfiles/tpbitsOffsetExceeded.err
-./tools/h5dump/errfiles/tpbitsOffsetNegative.err
-./tools/h5dump/errfiles/tperror.err
-./tools/h5dump/errfiles/tqmarkfile.err
-./tools/h5dump/errfiles/tslink-D.err
-
-# h5dump packed bits validation
-./tools/testfiles/tnofilename-with-packed-bits.ddl
-./tools/testfiles/tpbitsLengthPositive.ddl
-./tools/testfiles/tpbitsMaxExceeded.ddl
-./tools/testfiles/tpbitsSigned.ddl
-./tools/testfiles/tpbitsSigned2.ddl
-./tools/testfiles/tpbitsSigned4.ddl
-./tools/testfiles/tpbitsSignedWhole.ddl
-./tools/testfiles/tpbitsSignedInt.ddl
-./tools/testfiles/tpbitsSignedInt4.ddl
-./tools/testfiles/tpbitsSignedInt8.ddl
-./tools/testfiles/tpbitsSignedIntWhole.ddl
-./tools/testfiles/tpbitsSignedLong.ddl
-./tools/testfiles/tpbitsSignedLong8.ddl
-./tools/testfiles/tpbitsSignedLong16.ddl
-./tools/testfiles/tpbitsSignedLongWhole.ddl
-./tools/testfiles/tpbitsSignedLongLong.ddl
-./tools/testfiles/tpbitsSignedLongLong16.ddl
-./tools/testfiles/tpbitsSignedLongLong32.ddl
-./tools/testfiles/tpbitsSignedLongLongWhole.ddl
-./tools/testfiles/tpbitsSignedLongLongWhole1.ddl
-./tools/testfiles/tpbitsSignedLongLongWhole63.ddl
-./tools/testfiles/tpbitsOffsetNegative.ddl
-./tools/testfiles/tpbitsUnsigned.ddl
-./tools/testfiles/tpbitsUnsigned2.ddl
-./tools/testfiles/tpbitsUnsigned4.ddl
-./tools/testfiles/tpbitsUnsignedWhole.ddl
-./tools/testfiles/tpbitsUnsignedInt.ddl
-./tools/testfiles/tpbitsUnsignedInt4.ddl
-./tools/testfiles/tpbitsUnsignedInt8.ddl
-./tools/testfiles/tpbitsUnsignedIntWhole.ddl
-./tools/testfiles/tpbitsUnsignedLong.ddl
-./tools/testfiles/tpbitsUnsignedLong8.ddl
-./tools/testfiles/tpbitsUnsignedLong16.ddl
-./tools/testfiles/tpbitsUnsignedLongWhole.ddl
-./tools/testfiles/tpbitsUnsignedLongLong.ddl
-./tools/testfiles/tpbitsUnsignedLongLong16.ddl
-./tools/testfiles/tpbitsUnsignedLongLong32.ddl
-./tools/testfiles/tpbitsUnsignedLongLongWhole.ddl
-./tools/testfiles/tpbitsUnsignedLongLongWhole1.ddl
-./tools/testfiles/tpbitsUnsignedLongLongWhole63.ddl
-./tools/testfiles/tpbitsMax.ddl
-./tools/testfiles/packedbits.h5
-./tools/testfiles/tpbitsArray.ddl
-./tools/testfiles/tpbitsCompound.ddl
-./tools/testfiles/tpbitsIncomplete.ddl
-./tools/testfiles/tpbitsLengthExceeded.ddl
-./tools/testfiles/tpbitsCharLengthExceeded.ddl
-./tools/testfiles/tpbitsIntLengthExceeded.ddl
-./tools/testfiles/tpbitsLongLengthExceeded.ddl
-./tools/testfiles/tpbitsOffsetExceeded.ddl
-./tools/testfiles/tpbitsCharOffsetExceeded.ddl
-./tools/testfiles/tpbitsIntOffsetExceeded.ddl
-./tools/testfiles/tpbitsLongOffsetExceeded.ddl
-./tools/testfiles/tpbitsOverlapped.ddl
-
-# h5dump h5import validation
-./tools/testfiles/out3.h5import
-./tools/testfiles/tordergr.h5
-./tools/testfiles/tordergr3.ddl
-./tools/testfiles/tordergr4.ddl
-./tools/testfiles/tordergr1.ddl
-./tools/testfiles/tordergr5.ddl
-./tools/testfiles/tordergr2.ddl
-./tools/testfiles/torderattr1.ddl
-./tools/testfiles/torderattr2.ddl
-./tools/testfiles/torderattr3.ddl
-./tools/testfiles/torderattr4.ddl
-./tools/testfiles/torderattr.h5
-./tools/testfiles/tfpformat.ddl
-./tools/testfiles/tfpformat.h5
-
-# h5dump h5repack validation
-./tools/testfiles/zerodim.ddl
-./tools/testfiles/zerodim.h5
-
-# Expected output from h5ls tests
-./tools/testfiles/nosuchfile.ls
-./tools/testfiles/help-1.ls
-./tools/testfiles/help-2.ls
-./tools/testfiles/help-3.ls
-./tools/testfiles/tall-1.ls
-./tools/testfiles/tall-2.ls
-./tools/testfiles/tcomp-1.ls
-./tools/testfiles/tdset-1.ls
-./tools/testfiles/tgroup-1.ls
-./tools/testfiles/tgroup-2.ls
-./tools/testfiles/tgroup-3.ls
-./tools/testfiles/tgroup.ls
-./tools/testfiles/tloop-1.ls
-./tools/testfiles/tnestcomp-1.ls
-./tools/testfiles/tnestcomp-2.ls
-./tools/testfiles/tnestcomp-3.ls
-./tools/testfiles/tnestcomp-4.ls
-./tools/testfiles/tsaf.ls
-./tools/testfiles/tstr-1.ls
-./tools/testfiles/tattr2.ls
-./tools/testfiles/tattrreg_le.ls
-./tools/testfiles/tattrreg_be.ls
-./tools/testfiles/tvldtypes1.ls
-./tools/testfiles/tvldtypes2le.ls
-./tools/testfiles/tvldtypes2be.ls
-./tools/testfiles/tdataregle.ls
-./tools/testfiles/tdataregbe.ls
-./tools/testfiles/tarray1.ls
-./tools/testfiles/tempty.ls
-./tools/testfiles/thlink-1.ls
-./tools/testfiles/tslink-1.ls
-./tools/testfiles/textlink-1.ls
-./tools/testfiles/textlinksrc-1.ls
-./tools/testfiles/textlinksrc-2.ls
-./tools/testfiles/textlinksrc-3.ls
-./tools/testfiles/textlinksrc-4.ls
-./tools/testfiles/textlinksrc-5.ls
-./tools/testfiles/textlinksrc-6.ls
-./tools/testfiles/textlinksrc-7.ls
-./tools/testfiles/textlinksrc-1-old.ls
-./tools/testfiles/textlinksrc-2-old.ls
-./tools/testfiles/textlinksrc-3-old.ls
-./tools/testfiles/textlinksrc-6-old.ls
-./tools/testfiles/textlinksrc-7-old.ls
-./tools/testfiles/tsoftlinks-1.ls
-./tools/testfiles/tsoftlinks-2.ls
-./tools/testfiles/tsoftlinks-3.ls
-./tools/testfiles/tsoftlinks-4.ls
-./tools/testfiles/tsoftlinks-5.ls
-./tools/testfiles/textlinksrc-nodangle-1.ls
-./tools/testfiles/textlinksrc-nodangle-2.ls
-./tools/testfiles/tsoftlinks-nodangle-1.ls
-./tools/testfiles/thlinks-nodangle-1.ls
-./tools/testfiles/tudlink-1.ls
-
-
-
-#additional test input and output for h5dump XML
-./tools/testfiles/tall.h5.xml
-./tools/testfiles/tarray1.h5.xml
-./tools/testfiles/tarray2.h5.xml
-./tools/testfiles/tarray3.h5.xml
-./tools/testfiles/tarray6.h5.xml
-./tools/testfiles/tarray7.h5.xml
-./tools/testfiles/tattr.h5.xml
-./tools/testfiles/tbitfields.h5.xml
-./tools/testfiles/tcompound.h5.xml
-./tools/testfiles/tcompound2.h5.xml
-./tools/testfiles/tcompound_complex.h5.xml
-./tools/testfiles/tdatareg.h5.xml
-./tools/testfiles/tdset.h5.xml
-./tools/testfiles/tdset2.h5.xml
-./tools/testfiles/tempty.h5.xml
-./tools/testfiles/tenum.h5.xml
-./tools/testfiles/tfpformat.h5.xml
-./tools/testfiles/tgroup.h5.xml
-./tools/testfiles/thlink.h5.xml
-./tools/testfiles/tloop.h5.xml
-./tools/testfiles/tloop2.h5.xml
-./tools/testfiles/tmany.h5.xml
-./tools/testfiles/tname-amp.h5
-./tools/testfiles/tname-amp.h5.xml
-./tools/testfiles/tname-apos.h5
-./tools/testfiles/tname-apos.h5.xml
-./tools/testfiles/tname-gt.h5
-./tools/testfiles/tname-gt.h5.xml
-./tools/testfiles/tname-lt.h5
-./tools/testfiles/tname-lt.h5.xml
-./tools/testfiles/tname-quot.h5
-./tools/testfiles/tname-quot.h5.xml
-./tools/testfiles/tname-sp.h5
-./tools/testfiles/tname-sp.h5.xml
-./tools/testfiles/tnamed_dtype_attr.ddl
-./tools/testfiles/tnamed_dtype_attr.h5
-./tools/testfiles/tnamed_dtype_attr.h5.xml
-./tools/testfiles/tnestedcomp.h5.xml
-./tools/testfiles/tnodata.h5
-./tools/testfiles/tnodata.h5.xml
-./tools/testfiles/tobjref.h5.xml
-./tools/testfiles/topaque.h5.xml
-./tools/testfiles/tref-escapes-at.h5
-./tools/testfiles/tref-escapes-at.h5.xml
-./tools/testfiles/tref-escapes.h5
-./tools/testfiles/tref-escapes.h5.xml
-./tools/testfiles/tref.h5
-./tools/testfiles/tref.h5.xml
-./tools/testfiles/tsaf.h5.xml
-./tools/testfiles/tslink.h5.xml
-./tools/testfiles/tstr.h5.xml
-./tools/testfiles/tstr2.h5.xml
-./tools/testfiles/tstring-at.h5
-./tools/testfiles/tstring-at.h5.xml
-./tools/testfiles/tstring.h5
-./tools/testfiles/tstring.h5.xml
-./tools/testfiles/tvldtypes1.h5.xml
-./tools/testfiles/tvldtypes2.h5.xml
-./tools/testfiles/tvldtypes3.h5.xml
-./tools/testfiles/tvldtypes4.h5.xml
-./tools/testfiles/tvldtypes5.h5.xml
-./tools/testfiles/tvlstr.h5.xml
-./tools/testfiles/tempty-dtd.h5.xml
-./tools/testfiles/tempty-dtd-uri.h5.xml
-./tools/testfiles/tempty-nons.h5.xml
-./tools/testfiles/tempty-nons-uri.h5.xml
-./tools/testfiles/tempty-ns.h5.xml
-./tools/testfiles/tempty-dtd-2.h5.xml
-./tools/testfiles/tempty-nons-2.h5.xml
-./tools/testfiles/tempty-ns-2.h5.xml
-./tools/testfiles/tall-2A.h5.xml
-./tools/testfiles/torderattr4.h5.xml
-./tools/testfiles/torderattr2.h5.xml
-./tools/testfiles/torderattr3.h5.xml
-./tools/testfiles/torderattr1.h5.xml
-
-
-#test files for h5diff
-./tools/h5diff/testfiles/h5diff_10.txt
-./tools/h5diff/testfiles/h5diff_11.txt
-./tools/h5diff/testfiles/h5diff_12.txt
-./tools/h5diff/testfiles/h5diff_13.txt
-./tools/h5diff/testfiles/h5diff_14.txt
-./tools/h5diff/testfiles/h5diff_15.txt
-./tools/h5diff/testfiles/h5diff_16_1.txt
-./tools/h5diff/testfiles/h5diff_16_2.txt
-./tools/h5diff/testfiles/h5diff_16_3.txt
-./tools/h5diff/testfiles/h5diff_17.txt
-./tools/h5diff/testfiles/h5diff_171.txt
-./tools/h5diff/testfiles/h5diff_172.txt
-./tools/h5diff/testfiles/h5diff_18.txt
-./tools/h5diff/testfiles/h5diff_18_1.txt
-./tools/h5diff/testfiles/h5diff_19.txt
-./tools/h5diff/testfiles/h5diff_20.txt
-./tools/h5diff/testfiles/h5diff_21.txt
-./tools/h5diff/testfiles/h5diff_22.txt
-./tools/h5diff/testfiles/h5diff_23.txt
-./tools/h5diff/testfiles/h5diff_24.txt
-./tools/h5diff/testfiles/h5diff_25.txt
-./tools/h5diff/testfiles/h5diff_26.txt
-./tools/h5diff/testfiles/h5diff_27.txt
-./tools/h5diff/testfiles/h5diff_28.txt
-./tools/h5diff/testfiles/h5diff_30.txt
-./tools/h5diff/testfiles/h5diff_50.txt
-./tools/h5diff/testfiles/h5diff_51.txt
-./tools/h5diff/testfiles/h5diff_52.txt
-./tools/h5diff/testfiles/h5diff_53.txt
-./tools/h5diff/testfiles/h5diff_54.txt
-./tools/h5diff/testfiles/h5diff_55.txt
-./tools/h5diff/testfiles/h5diff_56.txt
-./tools/h5diff/testfiles/h5diff_57.txt
-./tools/h5diff/testfiles/h5diff_58.txt
-./tools/h5diff/testfiles/h5diff_59.txt
-./tools/h5diff/testfiles/h5diff_600.txt
-./tools/h5diff/testfiles/h5diff_601.txt
-./tools/h5diff/testfiles/h5diff_603.txt
-./tools/h5diff/testfiles/h5diff_604.txt
-./tools/h5diff/testfiles/h5diff_605.txt
-./tools/h5diff/testfiles/h5diff_606.txt
-./tools/h5diff/testfiles/h5diff_607.txt
-./tools/h5diff/testfiles/h5diff_608.txt
-./tools/h5diff/testfiles/h5diff_609.txt
-./tools/h5diff/testfiles/h5diff_610.txt
-./tools/h5diff/testfiles/h5diff_612.txt
-./tools/h5diff/testfiles/h5diff_613.txt
-./tools/h5diff/testfiles/h5diff_614.txt
-./tools/h5diff/testfiles/h5diff_615.txt
-./tools/h5diff/testfiles/h5diff_616.txt
-./tools/h5diff/testfiles/h5diff_617.txt
-./tools/h5diff/testfiles/h5diff_618.txt
-./tools/h5diff/testfiles/h5diff_619.txt
-./tools/h5diff/testfiles/h5diff_621.txt
-./tools/h5diff/testfiles/h5diff_622.txt
-./tools/h5diff/testfiles/h5diff_623.txt
-./tools/h5diff/testfiles/h5diff_624.txt
-./tools/h5diff/testfiles/h5diff_625.txt
-./tools/h5diff/testfiles/h5diff_626.txt
-./tools/h5diff/testfiles/h5diff_627.txt
-./tools/h5diff/testfiles/h5diff_628.txt
-./tools/h5diff/testfiles/h5diff_629.txt
-./tools/h5diff/testfiles/h5diff_630.txt
-./tools/h5diff/testfiles/h5diff_631.txt
-./tools/h5diff/testfiles/h5diff_640.txt
-./tools/h5diff/testfiles/h5diff_641.txt
-./tools/h5diff/testfiles/h5diff_642.txt
-./tools/h5diff/testfiles/h5diff_643.txt
-./tools/h5diff/testfiles/h5diff_644.txt
-./tools/h5diff/testfiles/h5diff_645.txt
-./tools/h5diff/testfiles/h5diff_646.txt
-./tools/h5diff/testfiles/h5diff_70.txt
-./tools/h5diff/testfiles/h5diff_700.txt
-./tools/h5diff/testfiles/h5diff_701.txt
-./tools/h5diff/testfiles/h5diff_702.txt
-./tools/h5diff/testfiles/h5diff_703.txt
-./tools/h5diff/testfiles/h5diff_704.txt
-./tools/h5diff/testfiles/h5diff_705.txt
-./tools/h5diff/testfiles/h5diff_706.txt
-./tools/h5diff/testfiles/h5diff_707.txt
-./tools/h5diff/testfiles/h5diff_708.txt
-./tools/h5diff/testfiles/h5diff_709.txt
-./tools/h5diff/testfiles/h5diff_710.txt
-./tools/h5diff/testfiles/h5diff_80.txt
-./tools/h5diff/testfiles/h5diff_90.txt
-./tools/h5diff/testfiles/h5diff_100.txt
-./tools/h5diff/testfiles/h5diff_101.txt
-./tools/h5diff/testfiles/h5diff_102.txt
-./tools/h5diff/testfiles/h5diff_103.txt
-./tools/h5diff/testfiles/h5diff_104.txt
-# w for Windows-specific
-./tools/h5diff/testfiles/h5diff_101w.txt
-./tools/h5diff/testfiles/h5diff_102w.txt
-./tools/h5diff/testfiles/h5diff_103w.txt
-./tools/h5diff/testfiles/h5diff_104w.txt
-./tools/h5diff/testfiles/h5diff_200.txt
-./tools/h5diff/testfiles/h5diff_201.txt
-./tools/h5diff/testfiles/h5diff_202.txt
-./tools/h5diff/testfiles/h5diff_203.txt
-./tools/h5diff/testfiles/h5diff_204.txt
-./tools/h5diff/testfiles/h5diff_205.txt
-./tools/h5diff/testfiles/h5diff_206.txt
-./tools/h5diff/testfiles/h5diff_207.txt
-./tools/h5diff/testfiles/h5diff_208.txt
-./tools/h5diff/testfiles/h5diff_220.txt
-./tools/h5diff/testfiles/h5diff_221.txt
-./tools/h5diff/testfiles/h5diff_222.txt
-./tools/h5diff/testfiles/h5diff_223.txt
-./tools/h5diff/testfiles/h5diff_224.txt
-./tools/h5diff/testfiles/h5diff_300.txt
-./tools/h5diff/testfiles/h5diff_400.txt
-./tools/h5diff/testfiles/h5diff_401.txt
-./tools/h5diff/testfiles/h5diff_402.txt
-./tools/h5diff/testfiles/h5diff_403.txt
-./tools/h5diff/testfiles/h5diff_404.txt
-./tools/h5diff/testfiles/h5diff_405.txt
-./tools/h5diff/testfiles/h5diff_406.txt
-./tools/h5diff/testfiles/h5diff_407.txt
-./tools/h5diff/testfiles/h5diff_408.txt
-./tools/h5diff/testfiles/h5diff_409.txt
-./tools/h5diff/testfiles/h5diff_410.txt
-./tools/h5diff/testfiles/h5diff_411.txt
-./tools/h5diff/testfiles/h5diff_412.txt
-./tools/h5diff/testfiles/h5diff_413.txt
-./tools/h5diff/testfiles/h5diff_414.txt
-./tools/h5diff/testfiles/h5diff_415.txt
-./tools/h5diff/testfiles/h5diff_416.txt
-./tools/h5diff/testfiles/h5diff_417.txt
-./tools/h5diff/testfiles/h5diff_418.txt
-./tools/h5diff/testfiles/h5diff_419.txt
-./tools/h5diff/testfiles/h5diff_420.txt
-./tools/h5diff/testfiles/h5diff_421.txt
-./tools/h5diff/testfiles/h5diff_422.txt
-./tools/h5diff/testfiles/h5diff_423.txt
-./tools/h5diff/testfiles/h5diff_424.txt
-./tools/h5diff/testfiles/h5diff_425.txt
-./tools/h5diff/testfiles/h5diff_450.txt
-./tools/h5diff/testfiles/h5diff_451.txt
-./tools/h5diff/testfiles/h5diff_452.txt
-./tools/h5diff/testfiles/h5diff_453.txt
-./tools/h5diff/testfiles/h5diff_454.txt
-./tools/h5diff/testfiles/h5diff_455.txt
-./tools/h5diff/testfiles/h5diff_456.txt
-./tools/h5diff/testfiles/h5diff_457.txt
-./tools/h5diff/testfiles/h5diff_458.txt
-./tools/h5diff/testfiles/h5diff_459.txt
-./tools/h5diff/testfiles/h5diff_465.txt
-./tools/h5diff/testfiles/h5diff_466.txt
-./tools/h5diff/testfiles/h5diff_467.txt
-./tools/h5diff/testfiles/h5diff_468.txt
-./tools/h5diff/testfiles/h5diff_469.txt
-./tools/h5diff/testfiles/h5diff_471.txt
-./tools/h5diff/testfiles/h5diff_472.txt
-./tools/h5diff/testfiles/h5diff_473.txt
-./tools/h5diff/testfiles/h5diff_474.txt
-./tools/h5diff/testfiles/h5diff_475.txt
-./tools/h5diff/testfiles/h5diff_480.txt
-./tools/h5diff/testfiles/h5diff_481.txt
-./tools/h5diff/testfiles/h5diff_482.txt
-./tools/h5diff/testfiles/h5diff_483.txt
-./tools/h5diff/testfiles/h5diff_484.txt
-./tools/h5diff/testfiles/h5diff_485.txt
-./tools/h5diff/testfiles/h5diff_486.txt
-./tools/h5diff/testfiles/h5diff_487.txt
-./tools/h5diff/testfiles/h5diff_500.txt
-./tools/h5diff/testfiles/h5diff_501.txt
-./tools/h5diff/testfiles/h5diff_502.txt
-./tools/h5diff/testfiles/h5diff_503.txt
-./tools/h5diff/testfiles/h5diff_504.txt
-./tools/h5diff/testfiles/h5diff_505.txt
-./tools/h5diff/testfiles/h5diff_506.txt
-./tools/h5diff/testfiles/h5diff_507.txt
-./tools/h5diff/testfiles/h5diff_508.txt
-./tools/h5diff/testfiles/h5diff_509.txt
-./tools/h5diff/testfiles/h5diff_510.txt
-./tools/h5diff/testfiles/h5diff_511.txt
-./tools/h5diff/testfiles/h5diff_512.txt
-./tools/h5diff/testfiles/h5diff_513.txt
-./tools/h5diff/testfiles/h5diff_514.txt
-./tools/h5diff/testfiles/h5diff_515.txt
-./tools/h5diff/testfiles/h5diff_516.txt
-./tools/h5diff/testfiles/h5diff_517.txt
-./tools/h5diff/testfiles/h5diff_518.txt
-./tools/h5diff/testfiles/h5diff_530.txt
-./tools/h5diff/testfiles/h5diff_540.txt
-
-./tools/h5diff/testfiles/h5diff_attr1.h5
-./tools/h5diff/testfiles/h5diff_attr2.h5
-./tools/h5diff/testfiles/h5diff_attr_v_level1.h5
-./tools/h5diff/testfiles/h5diff_attr_v_level2.h5
-./tools/h5diff/testfiles/h5diff_basic1.h5
-./tools/h5diff/testfiles/h5diff_basic2.h5
-./tools/h5diff/testfiles/h5diff_dset1.h5
-./tools/h5diff/testfiles/h5diff_dset2.h5
-./tools/h5diff/testfiles/h5diff_dtypes.h5
-./tools/h5diff/testfiles/h5diff_empty.h5
-./tools/h5diff/testfiles/h5diff_hyper1.h5
-./tools/h5diff/testfiles/h5diff_hyper2.h5
-./tools/h5diff/testfiles/h5diff_types.h5
-./tools/h5diff/testfiles/h5diff_links.h5
-./tools/h5diff/testfiles/h5diff_ext2softlink_src.h5
-./tools/h5diff/testfiles/h5diff_ext2softlink_trg.h5
-./tools/h5diff/testfiles/h5diff_extlink_src.h5
-./tools/h5diff/testfiles/h5diff_extlink_trg.h5
-./tools/h5diff/testfiles/h5diff_linked_softlink.h5
-./tools/h5diff/testfiles/h5diff_softlinks.h5
-./tools/h5diff/testfiles/h5diff_danglelinks1.h5
-./tools/h5diff/testfiles/h5diff_danglelinks2.h5
-./tools/h5diff/testfiles/h5diff_grp_recurse1.h5
-./tools/h5diff/testfiles/h5diff_grp_recurse2.h5
-./tools/h5diff/testfiles/h5diff_grp_recurse_ext1.h5
-./tools/h5diff/testfiles/h5diff_grp_recurse_ext2-1.h5
-./tools/h5diff/testfiles/h5diff_grp_recurse_ext2-2.h5
-./tools/h5diff/testfiles/h5diff_grp_recurse_ext2-3.h5
-./tools/h5diff/testfiles/h5diff_exclude1-1.h5
-./tools/h5diff/testfiles/h5diff_exclude1-2.h5
-./tools/h5diff/testfiles/h5diff_exclude2-1.h5
-./tools/h5diff/testfiles/h5diff_exclude2-2.h5
-./tools/h5diff/testfiles/h5diff_exclude3-1.h5
-./tools/h5diff/testfiles/h5diff_exclude3-2.h5
-./tools/h5diff/testfiles/h5diff_comp_vl_strs.h5
-./tools/h5diff/testfiles/h5diff_dset_zero_dim_size1.h5
-./tools/h5diff/testfiles/h5diff_dset_zero_dim_size2.h5
-./tools/h5diff/testfiles/h5diff_enum_invalid_values.h5
-./tools/h5diff/testfiles/compounds_array_vlen1.h5
-./tools/h5diff/testfiles/compounds_array_vlen2.h5
-./tools/h5diff/testfiles/non_comparables1.h5
-./tools/h5diff/testfiles/non_comparables2.h5
-./tools/h5diff/testfiles/tmptest2.he5
-./tools/h5diff/testfiles/tmpSingleSiteBethe.reference.h5
-./tools/h5diff/testfiles/h5diff_tmp1.txt
-./tools/h5diff/testfiles/tmptest.he5
-./tools/h5diff/testfiles/h5diff_tmp2.txt
-./tools/h5diff/testfiles/tmpSingleSiteBethe.output.h5
-
-#test files for h5repack
-./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_layouto.h5
-./tools/h5repack/testfiles/h5repack_layout2.h5
-./tools/h5repack/testfiles/h5repack_layout3.h5
-./tools/h5repack/testfiles/h5repack_layout.UD.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_szip.h5
-./tools/h5repack/testfiles/ublock.bin
-./tools/h5repack/testfiles/deflate_limit.h5repack_layout.h5.ddl
-./tools/h5repack/testfiles/plugin_none.h5repack_layout.UD.h5.tst
-./tools/h5repack/testfiles/plugin_test.h5repack_layout.h5.tst
-./tools/h5repack/testfiles/h5repack-help.txt
-./tools/h5repack/testfiles/h5repack_filters.h5.tst
-./tools/h5repack/testfiles/h5repack_layout.h5.ddl
-./tools/h5repack/testfiles/h5repack_layout.UD.h5-plugin_none.ddl
-./tools/h5repack/testfiles/h5repack_layout.h5-plugin_test.ddl
-
-# jam utility and tests
-./tools/h5jam/h5jam.c
-./tools/h5jam/h5unjam.c
-./tools/h5jam/Makefile.am
-./tools/h5jam/Makefile.in
-./tools/h5jam/h5jamgentest.c
-./tools/h5jam/testh5jam.sh.in
-./tools/h5jam/tellub.c
-./tools/h5jam/getub.c
-
-# test files for jam
-./tools/h5jam/testfiles/h5jam-help.txt
-./tools/h5jam/testfiles/h5unjam-help.txt
-./tools/h5jam/testfiles/tall.h5
-./tools/h5jam/testfiles/twithub.h5
-./tools/h5jam/testfiles/twithub513.h5
-./tools/h5jam/testfiles/u10.txt
-./tools/h5jam/testfiles/u511.txt
-./tools/h5jam/testfiles/u512.txt
-./tools/h5jam/testfiles/u513.txt
-./tools/h5jam/testfiles/h5jam-ub-nohdf5.txt
-
-# test files for h5copy
-./tools/h5copy/testfiles/h5copytst.h5
-./tools/h5copy/testfiles/h5copytst.out.ls
-./tools/h5copy/testfiles/h5copy_ref.h5
-./tools/h5copy/testfiles/h5copy_ref.out.ls
-./tools/h5copy/testfiles/h5copy_extlinks_src.h5
-./tools/h5copy/testfiles/h5copy_extlinks_trg.h5
-./tools/h5copy/testfiles/h5copy_extlinks_src.out.ls
-./tools/h5copy/testfiles/h5copy_misc1.out
-
-# test files for h5mkgrp
-./tools/testfiles/h5mkgrp_nested_p.ls
-./tools/testfiles/h5mkgrp_nested_lp.ls
-./tools/testfiles/h5mkgrp_nested_mult_p.ls
-./tools/testfiles/h5mkgrp_nested_mult_lp.ls
-./tools/testfiles/h5mkgrp_several.ls
-./tools/testfiles/h5mkgrp_several_v.ls
-./tools/testfiles/h5mkgrp_several_p.ls
-./tools/testfiles/h5mkgrp_several_l.ls
-./tools/testfiles/h5mkgrp_single.ls
-./tools/testfiles/h5mkgrp_single_v.ls
-./tools/testfiles/h5mkgrp_single_p.ls
-./tools/testfiles/h5mkgrp_single_l.ls
-
-./tools/perform/COPYING
-./tools/perform/Makefile.am
-./tools/perform/Makefile.in
-./tools/perform/build_h5perf_alone.sh
-./tools/perform/build_h5perf_serial_alone.sh
-./tools/perform/chunk.c
-./tools/perform/gen_report.pl
-./tools/perform/iopipe.c
-./tools/perform/overhead.c
-./tools/perform/perf.c
-./tools/perform/perf_meta.c
-./tools/perform/pio_engine.c
-./tools/perform/pio_perf.c
-./tools/perform/pio_perf.h
-./tools/perform/pio_standalone.c
-./tools/perform/pio_standalone.h
-./tools/perform/sio_engine.c
-./tools/perform/sio_perf.c
-./tools/perform/sio_perf.h
-./tools/perform/sio_standalone.c
-./tools/perform/sio_standalone.h
-./tools/perform/zip_perf.c
-
-
-# high level libraries
-./hl/COPYING
-./hl/Makefile.am
-./hl/Makefile.in
-./hl/examples/Makefile.am
-./hl/examples/Makefile.in
-./hl/examples/ex_ds1.c
-./hl/examples/ex_lite1.c
-./hl/examples/ex_lite2.c
-./hl/examples/ex_lite3.c
-./hl/examples/ex_image1.c
-./hl/examples/ex_image2.c
-./hl/examples/ex_table_01.c
-./hl/examples/ex_table_02.c
-./hl/examples/ex_table_03.c
-./hl/examples/ex_table_04.c
-./hl/examples/ex_table_05.c
-./hl/examples/ex_table_06.c
-./hl/examples/ex_table_07.c
-./hl/examples/ex_table_08.c
-./hl/examples/ex_table_09.c
-./hl/examples/ex_table_10.c
-./hl/examples/ex_table_11.c
-./hl/examples/ex_table_12.c
-./hl/examples/image24pixel.txt
-./hl/examples/image8.txt
-./hl/examples/pal_rgb.h
-./hl/examples/ptExampleFL.c
-./hl/examples/run-hl-ex.sh
-./hl/examples/run-hlc-ex.sh.in
-./hl/src/COPYING
-./hl/src/Makefile.am
-./hl/src/Makefile.in
-./hl/src/H5DO.c
-./hl/src/H5DOpublic.h
-./hl/src/H5DS.c
-./hl/src/H5DSprivate.h
-./hl/src/H5DSpublic.h
-./hl/src/H5HLprivate2.h
-./hl/src/H5IM.c
-./hl/src/H5IMprivate.h
-./hl/src/H5IMpublic.h
-./hl/src/H5LT.c
-./hl/src/H5LTanalyze.l
-./hl/src/H5LTanalyze.c
-./hl/src/H5LTparse.y
-./hl/src/H5LTparse.c
-./hl/src/H5LTparse.h
-./hl/src/H5LTprivate.h
-./hl/src/H5LTpublic.h
-./hl/src/H5PT.c
-./hl/src/H5PTprivate.h
-./hl/src/H5PTpublic.h
-./hl/src/H5TB.c
-./hl/src/H5TBprivate.h
-./hl/src/H5TBpublic.h
-./hl/src/hdf5_hl.h
-./hl/test/COPYING
-./hl/test/H5srcdir_str.h.in
-./hl/test/Makefile.am
-./hl/test/Makefile.in
-./hl/test/dsdata.txt
-./hl/test/dslat.txt
-./hl/test/dslon.txt
-./hl/test/dtype_file.txt
-./hl/test/dtype_file_readable.txt
-./hl/test/earth.pal
-./hl/test/h5hltest.h
-./hl/test/image8.txt
-./hl/test/image24pixel.txt
-./hl/test/image24plane.txt
-./hl/test/pal_rgb.h
-./hl/test/sepia.pal
-./hl/test/dectris_hl_perf.c
-./hl/test/gen_test_ds.c
-./hl/test/test_ds.c
-./hl/test/test_dset_opt.c
-./hl/test/test_file_image.c
-./hl/test/test_image.c
-./hl/test/test_lite.c
-./hl/test/test_packet.c
-./hl/test/test_table.c
-./hl/test/test_ds_le.h5
-./hl/test/test_ds_be.h5
-./hl/test/test_table_le.h5
-./hl/test/test_table_be.h5
-./hl/test/test_table_cray.h5
-./hl/test/usa.wri
-
-# tools
-./hl/tools/COPYING
-./hl/tools/Makefile.am
-./hl/tools/Makefile.in
-./hl/tools/gif2h5/Makefile.am
-./hl/tools/gif2h5/Makefile.in
-./hl/tools/gif2h5/decompress.c
-./hl/tools/gif2h5/gif.h
-./hl/tools/gif2h5/gif2hdf.c
-./hl/tools/gif2h5/gif2mem.c
-./hl/tools/gif2h5/gifread.c
-./hl/tools/gif2h5/hdf2gif.c
-./hl/tools/gif2h5/hdfgifwr.c
-./hl/tools/gif2h5/writehdf.c
-./hl/tools/gif2h5/h52gifgentst.c
-./hl/tools/gif2h5/h52giftest.sh.in
-./hl/tools/gif2h5/testfiles/image1.gif
-./hl/tools/gif2h5/testfiles/h52giftst.h5
-
-# hl fortran
-./hl/fortran/COPYING
-./hl/fortran/Makefile.am
-./hl/fortran/Makefile.in
-./hl/fortran/examples/Makefile.am
-./hl/fortran/examples/Makefile.in
-./hl/fortran/examples/ex_ds1.f90
-./hl/fortran/examples/exlite.f90
-./hl/fortran/examples/run-hlfortran-ex.sh.in
-./hl/fortran/src/H5DSfc.c
-./hl/fortran/src/H5DSff.f90
-./hl/fortran/src/H5IMcc.c
-./hl/fortran/src/H5IMcc.h
-./hl/fortran/src/H5IMfc.c
-./hl/fortran/src/H5IMff.f90
-./hl/fortran/src/H5LTf90proto.h
-./hl/fortran/src/H5LTfc.c
-./hl/fortran/src/H5LTff.f90
-./hl/fortran/src/H5TBfc.c
-./hl/fortran/src/H5TBff.f90
-./hl/fortran/src/Makefile.am
-./hl/fortran/src/Makefile.in
-./hl/fortran/test/Makefile.am
-./hl/fortran/test/Makefile.in
-./hl/fortran/test/tstds.f90
-./hl/fortran/test/tstimage.f90
-./hl/fortran/test/tstlite.f90
-./hl/fortran/test/tsttable.f90
-
-# hl c++
-./hl/c++/COPYING
-./hl/c++/Makefile.am
-./hl/c++/Makefile.in
-./hl/c++/examples/Makefile.am
-./hl/c++/examples/Makefile.in
-./hl/c++/examples/ptExampleFL.cpp
-./hl/c++/examples/run-hlc++-ex.sh.in
-./hl/c++/src/H5PacketTable.h
-./hl/c++/src/H5PacketTable.cpp
-./hl/c++/src/Makefile.am
-./hl/c++/src/Makefile.in
-./hl/c++/test/ptableTest.h
-./hl/c++/test/ptableTest.cpp
-./hl/c++/test/Makefile.am
-./hl/c++/test/Makefile.in
-
-# CMake-specific Files
-./config/cmake/cacheinit.cmake
-./config/cmake/ConversionTests.c
-./config/cmake/ConfigureChecks.cmake
-./config/cmake/CTestCustom.cmake
-./config/cmake/FindHDF5.cmake.in
-./config/cmake/H5cxx_config.h.in
-./config/cmake/H5pubconf.h.in
-./config/cmake/hdf5-config.cmake.in
-./config/cmake/hdf5-config-version.cmake.in
-./config/cmake/HDF5Macros.cmake
-./config/cmake/libhdf5.settings.cmake.in
-./config/cmake/mccacheinit.cmake
-./config/cmake/patch.xml
-./config/cmake/PkgInfo.in
-./config/cmake/README.txt.cmake.in
-./config/cmake/userblockTest.cmake
-./config/cmake/vfdTest.cmake
-
-./config/cmake_ext_mod/CheckTypeSize.cmake
-./config/cmake_ext_mod/ConfigureChecks.cmake
-./config/cmake_ext_mod/CPack.Info.plist.in
-./config/cmake_ext_mod/CTestCustom.cmake
-./config/cmake_ext_mod/FindMPI.cmake
-./config/cmake_ext_mod/FindSZIP.cmake
-./config/cmake_ext_mod/GetTimeOfDayTest.cpp
-./config/cmake_ext_mod/grepTest.cmake
-./config/cmake_ext_mod/hdf.bmp
-./config/cmake_ext_mod/hdf.icns
-./config/cmake_ext_mod/hdf.ico
-./config/cmake_ext_mod/HDFCXXTests.cpp
-./config/cmake_ext_mod/HDFLibMacros.cmake
-./config/cmake_ext_mod/HDFMacros.cmake
-./config/cmake_ext_mod/HDFTests.c
-./config/cmake_ext_mod/HDFUseFortran.cmake
-./config/cmake_ext_mod/NSIS.InstallOptions.ini.in
-./config/cmake_ext_mod/NSIS.template.in
-./config/cmake_ext_mod/prunTest.cmake
-./config/cmake_ext_mod/runTest.cmake
-./config/cmake_ext_mod/version.plist.in
-
-# CMake-specific User Files
-./config/cmake/UserMacros/Windows_MT.cmake
-
-# CMake-specific Examples Files
-./config/cmake/HDF518_Examples.cmake.in
-./release_docs/USING_CMake_Examples.txt
-
-./CMakeLists.txt
-./CMakeFilters.cmake
-./CMakeInstallation.cmake
-./CTestConfig.cmake
-./UserMacros.cmake
-./c++/CMakeLists.txt
-./c++/examples/CMakeLists.txt
-./c++/examples/CMakeTests.cmake
-./c++/src/CMakeLists.txt
-./c++/test/CMakeLists.txt
-./c++/test/CMakeTests.cmake
-./examples/CMakeLists.txt
-./examples/CMakeTests.cmake
-./examples/run-all-ex.sh
-./examples/run-c-ex.sh.in
-./fortran/CMakeLists.txt
-./fortran/examples/CMakeLists.txt
-./fortran/examples/CMakeTests.cmake
-./fortran/src/CMakeLists.txt
-./fortran/test/CMakeLists.txt
-./fortran/test/CMakeTests.cmake
-./fortran/testpar/CMakeLists.txt
-./fortran/testpar/CMakeTests.cmake
-./hl/CMakeLists.txt
-./hl/c++/CMakeLists.txt
-./hl/c++/examples/CMakeLists.txt
-./hl/c++/examples/CMakeTests.cmake
-./hl/c++/src/CMakeLists.txt
-./hl/c++/test/CMakeLists.txt
-./hl/c++/test/CMakeTests.cmake
-./hl/examples/CMakeLists.txt
-./hl/examples/CMakeTests.cmake
-./hl/fortran/CMakeLists.txt
-./hl/fortran/examples/CMakeLists.txt
-./hl/fortran/examples/CMakeTests.cmake
-./hl/fortran/src/CMakeLists.txt
-./hl/fortran/test/CMakeLists.txt
-./hl/fortran/test/CMakeTests.cmake
-./hl/src/CMakeLists.txt
-./hl/test/CMakeLists.txt
-./hl/test/CMakeTests.cmake
-./hl/tools/CMakeLists.txt
-./hl/tools/CMakeTests.cmake
-./src/CMakeLists.txt
-./test/CMakeLists.txt
-./test/CMakeTests.cmake
-./testpar/CMakeLists.txt
-./testpar/CMakeTests.cmake
-./tools/CMakeLists.txt
-./tools/h5copy/CMakeLists.txt
-./tools/h5copy/CMakeTests.cmake
-./tools/h5diff/CMakeLists.txt
-./tools/h5diff/CMakeTests.cmake
-./tools/h5dump/CMakeLists.txt
-./tools/h5dump/CMakeTests.cmake
-./tools/h5dump/CMakeTestsPBITS.cmake
-./tools/h5dump/CMakeTestsXML.cmake
-./tools/h5import/CMakeLists.txt
-./tools/h5import/CMakeTests.cmake
-./tools/h5jam/CMakeLists.txt
-./tools/h5jam/CMakeTests.cmake
-./tools/h5ls/CMakeLists.txt
-./tools/h5ls/CMakeTests.cmake
-./tools/h5repack/CMakeLists.txt
-./tools/h5repack/CMakeTests.cmake
-./tools/h5stat/CMakeLists.txt
-./tools/h5stat/CMakeTests.cmake
-./tools/lib/CMakeLists.txt
-./tools/misc/CMakeLists.txt
-./tools/misc/CMakeTests.cmake
-./tools/perform/CMakeLists.txt
-./tools/perform/CMakeTests.cmake
diff --git a/Makefile.am b/Makefile.am
index c34f2cd..72d4959 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,21 +1,18 @@
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 ##
 ## Makefile.am
 ## Run automake to generate a Makefile.in from this file.
 ##
-# 
+#
 # This makefile mostly just reinvokes make in the various subdirectories
 # but does so in the correct order.  You can alternatively invoke make from
 # each subdirectory manually.
@@ -37,6 +34,9 @@
 
 include $(top_srcdir)/config/commence.am
 
+# include Doxygen rules (requires autoconf-archive >2016-03-20)
+@DX_RULES@
+
 # Define subdirectories to build.
 ## Automake understands that `make distclean' should recurse into
 ## conditional subdirectories even if `make all' does not.
@@ -47,15 +47,10 @@ include $(top_srcdir)/config/commence.am
 # Since we're explicitly listing DIST_SUBDIRS, we also need to list
 # directories that are only conditionally built (so that their Makefiles
 # are cleaned as well).
-# Note that `make clean' will not affect the examples or doc directories. 
+# Note that `make clean' will not affect the examples or doc directories.
 
 # Conditionals.  These conditionals are defined during configure
 # Define each variable to empty if it is not used to placate pmake
-if BUILD_PARALLEL_CONDITIONAL
-   TESTPARALLEL_DIR =testpar
-else
-   TESTPARALLEL_DIR=
-endif
 if BUILD_CXX_CONDITIONAL
    CXX_DIR =c++
 else
@@ -66,15 +61,35 @@ if BUILD_FORTRAN_CONDITIONAL
 else
    FORTRAN_DIR=
 endif
+if BUILD_JAVA_CONDITIONAL
+   JAVA_DIR=java
+else
+   JAVA_DIR=
+endif
 if BUILD_HDF5_HL_CONDITIONAL
    HDF5_HL_DIR =hl
 else
    HDF5_HL_DIR=
 endif
+if BUILD_TESTS_CONDITIONAL
+   TESTSERIAL_DIR =test
+else
+   TESTSERIAL_DIR=
+endif
+if BUILD_TESTS_PARALLEL_CONDITIONAL
+   TESTPARALLEL_DIR =testpar
+else
+   TESTPARALLEL_DIR=
+endif
+if BUILD_TOOLS_CONDITIONAL
+   TOOLS_DIR =tools
+else
+   TOOLS_DIR=
+endif
 
-SUBDIRS = src test $(TESTPARALLEL_DIR) tools . $(CXX_DIR) $(FORTRAN_DIR) \
-          $(HDF5_HL_DIR)
-DIST_SUBDIRS = src test testpar tools . c++ fortran hl examples
+SUBDIRS = src $(TESTSERIAL_DIR) $(TESTPARALLEL_DIR) bin $(TOOLS_DIR) utils . \
+          $(CXX_DIR) $(FORTRAN_DIR) $(JAVA_DIR) $(HDF5_HL_DIR)
+DIST_SUBDIRS = src test testpar tools utils . c++ fortran hl examples java
 
 # Some files generated during configure that should be cleaned
 DISTCLEANFILES=config/stamp1 config/stamp2
@@ -120,7 +135,7 @@ mostlyclean-local:
 # 'make install' will now install examples, the same as 'make install-all'.
 # 'make-install-all' will be redundant but will still work.
 install: install-recursive install-examples
-uninstall: uninstall-recursive uninstall-examples 
+uninstall: uninstall-recursive uninstall-examples
 
 # 'make install-all' also installs examples
 install-all:
@@ -141,7 +156,7 @@ install-doc:
 uninstall-doc:
 	@echo "docs no longer live in this tree.  Use install-examples to install examples."
 
-# `make check-install' or `make installcheck' checks that examples can 
+# `make check-install' or `make installcheck' checks that examples can
 #  be successfully built
 installcheck-local:
 	if test -n "${DESTDIR}"; then                                  \
@@ -174,10 +189,25 @@ check-all-install:
 trace:
 	@(cd src && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
 
+# doxygen support
+if BUILD_DOXYGEN_CONDITIONAL
+doxygen: doxygen-doc
+endif
+
 # Run tests with different Virtual File Drivers.
 # Currently, only invoke check-vfd in the test directory.
 check-vfd:
-	for d in src test; do                                 \
+	for d in src utils test; do                                     \
+	  if test $$d != .; then                                        \
+	    (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;           \
+	  fi;                                                           \
+	done
+
+# Run tests with different passthrough Virtual Object Layer Connectors.
+# NOTE: Will only succeed with passthrough VOL connectors that use
+#       the native VOL connector as the terminal connector.
+check-passthrough-vol:
+	for d in $(SUBDIRS); do                                \
 	  if test $$d != .; then                                       \
 	    (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;          \
 	  fi;                                                          \
diff --git a/Makefile.dist b/Makefile.dist
index e38af21..5ae9904 100644
--- a/Makefile.dist
+++ b/Makefile.dist
@@ -1,17 +1,14 @@
 # Top-level distributed Makefile 			       -*- makefile -*-
 
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 
 # This Makefile is a stub (copied from Makefile.dist) which will run
 # configure and then invoke the same target in the new Makefile created
diff --git a/Makefile.in b/Makefile.in
deleted file mode 100644
index 913afdc..0000000
--- a/Makefile.in
+++ /dev/null
@@ -1,1117 +0,0 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-# 
-# This makefile mostly just reinvokes make in the various subdirectories
-# but does so in the correct order.  You can alternatively invoke make from
-# each subdirectory manually.
-#
-# Top-level HDF5 Makefile(.in)
-
-# pmake has issues if variables are undefined.  Solve this problem in
-# top-level Makefile by defining .MAKEFLAGS target to -V before pmake can
-# encounter any undefined variables.
-# Automake resists putting anything but variable definitions first in
-# a Makefile.in, so we'll put a placebo comment here and use sed in
-# bin/reconfigure to turn it into the .MAKEFLAGS target.  Sigh.  -JL 2005
-# Configure should set AM_MAKEFLAGS to -V to solve this problem in
-# subdirectories.
-# NOTE: This means that invoking pmake in a subdirectory will not work.
-.MAKEFLAGS:@AM_MAKEFLAGS@
-	$(MAKE) all
-
-VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-DIST_COMMON = $(top_srcdir)/config/commence.am $(srcdir)/Makefile.in \
-	$(srcdir)/Makefile.am $(top_srcdir)/configure \
-	$(am__configure_deps) $(top_srcdir)/bin/mkinstalldirs COPYING \
-	bin/COPYING bin/README bin/compile bin/config.guess \
-	bin/config.sub bin/depcomp bin/install-sh bin/missing \
-	bin/mkinstalldirs bin/ltmain.sh $(top_srcdir)/bin/compile \
-	$(top_srcdir)/bin/config.guess $(top_srcdir)/bin/config.sub \
-	$(top_srcdir)/bin/install-sh $(top_srcdir)/bin/ltmain.sh \
-	$(top_srcdir)/bin/missing
-subdir = .
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/aclocal_cxx.m4 \
-	$(top_srcdir)/m4/aclocal_fc.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/src/H5config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
-	ctags-recursive dvi-recursive html-recursive info-recursive \
-	install-data-recursive install-dvi-recursive \
-	install-exec-recursive install-html-recursive \
-	install-info-recursive install-pdf-recursive \
-	install-ps-recursive install-recursive installcheck-recursive \
-	installdirs-recursive pdf-recursive ps-recursive \
-	tags-recursive uninstall-recursive
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-am__recursive_targets = \
-  $(RECURSIVE_TARGETS) \
-  $(RECURSIVE_CLEAN_TARGETS) \
-  $(am__extra_recursive_targets)
-AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	cscope distdir dist dist-all distcheck
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-CSCOPE = cscope
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
-  if test -d "$(distdir)"; then \
-    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-      && rm -rf "$(distdir)" \
-      || { sleep 5 && rm -rf "$(distdir)"; }; \
-  else :; fi
-am__post_remove_distdir = $(am__remove_distdir)
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
-  sed_rest='s,^[^/]*/*,,'; \
-  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
-  sed_butlast='s,/*[^/]*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
-DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
-DIST_TARGETS = dist-gzip
-distuninstallcheck_listfiles = find . -type f -print
-am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
-  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
-ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
-AMTAR = @AMTAR@
-
-# H5_CFLAGS holds flags that should be used when building hdf5,
-# but which should not be exported to h5cc for building other programs.
-# AM_CFLAGS is an automake construct which should be used by Makefiles 
-# instead of CFLAGS, as CFLAGS is reserved solely for the user to define.
-# This applies to FCFLAGS, CXXFLAGS, CPPFLAGS, and LDFLAGS as well.
-AM_CFLAGS = @AM_CFLAGS@ @H5_CFLAGS@
-AM_CPPFLAGS = @AM_CPPFLAGS@ @H5_CPPFLAGS@
-AM_CXXFLAGS = @AM_CXXFLAGS@ @H5_CXXFLAGS@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@
-AM_LDFLAGS = @AM_LDFLAGS@ @H5_LDFLAGS@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BYTESEX = @BYTESEX@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CC_VERSION = @CC_VERSION@
-CFLAGS = @CFLAGS@
-CLEARFILEBUF = @CLEARFILEBUF@
-CODESTACK = @CODESTACK@
-CONFIG_DATE = @CONFIG_DATE@
-CONFIG_MODE = @CONFIG_MODE@
-CONFIG_USER = @CONFIG_USER@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CXX_VERSION = @CXX_VERSION@
-CYGPATH_W = @CYGPATH_W@
-DEBUG_PKG = @DEBUG_PKG@
-DEFAULT_API_VERSION = @DEFAULT_API_VERSION@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
-DIRECT_VFD = @DIRECT_VFD@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-EXTERNAL_FILTERS = @EXTERNAL_FILTERS@
-
-# Make sure that these variables are exported to the Makefiles
-F9XMODEXT = @F9XMODEXT@
-F9XMODFLAG = @F9XMODFLAG@
-F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
-FC = @FC@
-FC2003 = @FC2003@
-FCFLAGS = @FCFLAGS@
-FCFLAGS_f90 = @FCFLAGS_f90@
-FCLIBS = @FCLIBS@
-FC_VERSION = @FC_VERSION@
-FGREP = @FGREP@
-FSEARCH_DIRS = @FSEARCH_DIRS@
-GREP = @GREP@
-H5_CFLAGS = @H5_CFLAGS@
-H5_CPPFLAGS = @H5_CPPFLAGS@
-H5_CXXFLAGS = @H5_CXXFLAGS@
-H5_CXX_SHARED = @H5_CXX_SHARED@
-H5_FCFLAGS = @H5_FCFLAGS@
-H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@
-H5_LDFLAGS = @H5_LDFLAGS@
-H5_LONE_COLON = @H5_LONE_COLON@
-H5_VERSION = @H5_VERSION@
-HADDR_T = @HADDR_T@
-HAVE_DMALLOC = @HAVE_DMALLOC@
-HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@
-HAVE_PTHREAD = @HAVE_PTHREAD@
-HDF5_HL = @HDF5_HL@
-HDF5_INTERFACES = @HDF5_INTERFACES@
-HDF_CXX = @HDF_CXX@
-HDF_FORTRAN = @HDF_FORTRAN@
-HDF_FORTRAN2003 = @HDF_FORTRAN2003@
-HID_T = @HID_T@
-HL = @HL@
-HL_FOR = @HL_FOR@
-HSIZE_T = @HSIZE_T@
-HSSIZE_T = @HSSIZE_T@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTRUMENT = @INSTRUMENT@
-INSTRUMENT_LIBRARY = @INSTRUMENT_LIBRARY@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LL_PATH = @LL_PATH@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_STATIC_EXEC = @LT_STATIC_EXEC@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MPE = @MPE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJECT_NAMELEN_DEFAULT_F = @OBJECT_NAMELEN_DEFAULT_F@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PARALLEL = @PARALLEL@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-RANLIB = @RANLIB@
-ROOT = @ROOT@
-RUNPARALLEL = @RUNPARALLEL@
-RUNSERIAL = @RUNSERIAL@
-R_INTEGER = @R_INTEGER@
-R_LARGE = @R_LARGE@
-SEARCH = @SEARCH@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SIZE_T = @SIZE_T@
-STATIC_EXEC = @STATIC_EXEC@
-STATIC_SHARED = @STATIC_SHARED@
-STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@
-STRIP = @STRIP@
-TESTPARALLEL = @TESTPARALLEL@
-THREADSAFE = @THREADSAFE@
-TIME = @TIME@
-TR = @TR@
-TRACE_API = @TRACE_API@
-UNAME_INFO = @UNAME_INFO@
-USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
-USE_FILTER_SZIP = @USE_FILTER_SZIP@
-USINGMEMCHECKER = @USINGMEMCHECKER@
-VERSION = @VERSION@
-WORDS_BIGENDIAN = @WORDS_BIGENDIAN@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_FC = @ac_ct_FC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-
-# Install directories that automake doesn't know about
-docdir = $(exec_prefix)/doc
-dvidir = @dvidir@
-enable_shared = @enable_shared@
-enable_static = @enable_static@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-
-# Shell commands used in Makefiles
-RM = rm -f
-CP = cp
-
-# Some machines need a command to run executables; this is that command
-# so that our tests will run.
-# We use RUNEXEC instead of RUNSERIAL directly because it may be that
-# some tests need to be run with a different command.  Older versions
-# of the makefiles used the command
-# $(LIBTOOL) --mode=execute
-# in some directories, for instance.
-RUNEXEC = $(RUNSERIAL)
-
-# Libraries to link to while building
-LIBHDF5 = $(top_builddir)/src/libhdf5.la
-LIBH5TEST = $(top_builddir)/test/libh5test.la
-LIBH5F = $(top_builddir)/fortran/src/libhdf5_fortran.la
-LIBH5FTEST = $(top_builddir)/fortran/test/libh5test_fortran.la
-LIBH5CPP = $(top_builddir)/c++/src/libhdf5_cpp.la
-LIBH5TOOLS = $(top_builddir)/tools/lib/libh5tools.la
-LIBH5_HL = $(top_builddir)/hl/src/libhdf5_hl.la
-LIBH5F_HL = $(top_builddir)/hl/fortran/src/libhdf5hl_fortran.la
-LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
-
-# Note that in svn revision 19400 the '/' after DESTDIR in H5* variables below  
-# has been removed. According to the official description of DESTDIR by Gnu at 
-# http://www.gnu.org/prep/standards/html_node/DESTDIR.html, DESTDIR is 
-# prepended to the normal and complete install path that it precedes for the 
-# purpose of installing in a temporary directory which is useful for building 
-# rpms and other packages.  The '/' after ${DESTDIR} will be followed by another 
-# '/' at the beginning of the normal install path.  When DESTDIR is empty the  
-# path then begins with '//', which is incorrect and causes problems at least for 
-# Cygwin.   
-
-# Scripts used to build examples
-# If only shared libraries have been installed, have h5cc build examples with
-# shared libraries instead of static libraries
-H5CC = ${DESTDIR}$(bindir)/h5cc
-H5CC_PP = ${DESTDIR}$(bindir)/h5pcc
-H5FC = ${DESTDIR}$(bindir)/h5fc
-H5FC_PP = ${DESTDIR}$(bindir)/h5pfc
-H5CPP = ${DESTDIR}$(bindir)/h5c++
-ACLOCAL_AMFLAGS = "-I m4"
-
-# The trace script; this is used on source files from the C library to
-# insert tracing macros.
-TRACE = perl $(top_srcdir)/bin/trace
-
-# .chkexe files are used to mark tests that have run successfully.
-# .chklog files are output from those tests.
-# *.clog and *.clog2 are from the MPE option.
-
-# Some files/directories generated during check that should be cleaned
-CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *-tmp
-@BUILD_PARALLEL_CONDITIONAL_FALSE@TESTPARALLEL_DIR = 
-
-# Define subdirectories to build.
-# Add this directory to SUBDIRS so that examples get built after tools
-# but before examples in extra interfaces (c++ and fortran).
-# Since we're explicitly listing DIST_SUBDIRS, we also need to list
-# directories that are only conditionally built (so that their Makefiles
-# are cleaned as well).
-# Note that `make clean' will not affect the examples or doc directories. 
-
-# Conditionals.  These conditionals are defined during configure
-# Define each variable to empty if it is not used to placate pmake
-@BUILD_PARALLEL_CONDITIONAL_TRUE@TESTPARALLEL_DIR = testpar
-@BUILD_CXX_CONDITIONAL_FALSE@CXX_DIR = 
-@BUILD_CXX_CONDITIONAL_TRUE@CXX_DIR = c++
-@BUILD_FORTRAN_CONDITIONAL_FALSE@FORTRAN_DIR = 
-@BUILD_FORTRAN_CONDITIONAL_TRUE@FORTRAN_DIR = fortran
-@BUILD_HDF5_HL_CONDITIONAL_FALSE@HDF5_HL_DIR = 
-@BUILD_HDF5_HL_CONDITIONAL_TRUE@HDF5_HL_DIR = hl
-SUBDIRS = src test $(TESTPARALLEL_DIR) tools . $(CXX_DIR) $(FORTRAN_DIR) \
-          $(HDF5_HL_DIR)
-
-DIST_SUBDIRS = src test testpar tools . c++ fortran hl examples
-
-# Some files generated during configure that should be cleaned
-DISTCLEANFILES = config/stamp1 config/stamp2
-all: all-recursive
-
-.SUFFIXES:
-am--refresh: Makefile
-	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/config/commence.am $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
-	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    echo ' $(SHELL) ./config.status'; \
-	    $(SHELL) ./config.status;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-	esac;
-$(top_srcdir)/config/commence.am:
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	$(am__cd) $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool config.lt
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run 'make' without going through this Makefile.
-# To change the values of 'make' variables: instead of editing Makefiles,
-# (1) if the variable is set in 'config.status', edit 'config.status'
-#     (which will cause the Makefiles to be regenerated when you run 'make');
-# (2) otherwise, pass the desired values on the 'make' command line.
-$(am__recursive_targets):
-	@fail=; \
-	if $(am__make_keepgoing); then \
-	  failcom='fail=yes'; \
-	else \
-	  failcom='exit 1'; \
-	fi; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-recursive
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: ctags-recursive
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscope: cscope.files
-	test ! -s cscope.files \
-	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
-clean-cscope:
-	-rm -f cscope.files
-cscope.files: clean-cscope cscopelist
-cscopelist: cscopelist-recursive
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
-
-distdir: $(DISTFILES)
-	$(am__remove_distdir)
-	test -d "$(distdir)" || mkdir "$(distdir)"
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    $(am__make_dryrun) \
-	      || test -d "$(distdir)/$$subdir" \
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
-	      || exit 1; \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-	-test -n "$(am__skip_mode_fix)" \
-	|| find "$(distdir)" -type d ! -perm -755 \
-		-exec chmod u+rwx,go+rx {} \; -o \
-	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r "$(distdir)"
-dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__post_remove_distdir)
-
-dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
-	$(am__post_remove_distdir)
-
-dist-lzip: distdir
-	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
-	$(am__post_remove_distdir)
-
-dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
-	$(am__post_remove_distdir)
-
-dist-tarZ: distdir
-	@echo WARNING: "Support for shar distribution archives is" \
-	               "deprecated." >&2
-	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
-	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__post_remove_distdir)
-
-dist-shar: distdir
-	@echo WARNING: "Support for distribution archives compressed with" \
-		       "legacy program 'compress' is deprecated." >&2
-	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__post_remove_distdir)
-
-dist-zip: distdir
-	-rm -f $(distdir).zip
-	zip -rq $(distdir).zip $(distdir)
-	$(am__post_remove_distdir)
-
-dist dist-all:
-	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
-	$(am__post_remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	case '$(DIST_ARCHIVES)' in \
-	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
-	*.tar.bz2*) \
-	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.lz*) \
-	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
-	*.tar.xz*) \
-	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
-	*.tar.Z*) \
-	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
-	*.zip*) \
-	  unzip $(distdir).zip ;;\
-	esac
-	chmod -R a-w $(distdir)
-	chmod u+w $(distdir)
-	mkdir $(distdir)/_build $(distdir)/_inst
-	chmod a-w $(distdir)
-	test -d $(distdir)/_build || exit 0; \
-	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && am__cwd=`pwd` \
-	  && $(am__cd) $(distdir)/_build \
-	  && ../configure \
-	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
-	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	    --srcdir=.. --prefix="$$dc_install_base" \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-	        distuninstallcheck \
-	  && chmod -R a-w "$$dc_install_base" \
-	  && ({ \
-	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-	  && rm -rf "$$dc_destdir" \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
-	  && cd "$$am__cwd" \
-	  || exit 1
-	$(am__post_remove_distdir)
-	@(echo "$(distdir) archives ready for distribution: "; \
-	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
-distuninstallcheck:
-	@test -n '$(distuninstallcheck_dir)' || { \
-	  echo 'ERROR: trying to run $@ with an empty' \
-	       '$$(distuninstallcheck_dir)' >&2; \
-	  exit 1; \
-	}; \
-	$(am__cd) '$(distuninstallcheck_dir)' || { \
-	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
-	  exit 1; \
-	}; \
-	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
-	   || { echo "ERROR: files left after uninstall:" ; \
-	        if test -n "$(DESTDIR)"; then \
-	          echo "  (check DESTDIR support)"; \
-	        fi ; \
-	        $(distuninstallcheck_listfiles) ; \
-	        exit 1; } >&2
-distcleancheck: distclean
-	@if test '$(srcdir)' = . ; then \
-	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-	  exit 1 ; \
-	fi
-	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-	  || { echo "ERROR: files left in build directory after distclean:" ; \
-	       $(distcleancheck_listfiles) ; \
-	       exit 1; } >&2
-check-am: all-am
-check: check-recursive
-all-am: Makefile
-installdirs: installdirs-recursive
-installdirs-am:
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am: installcheck-local
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool \
-	mostlyclean-local
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: $(am__recursive_targets) install-am install-strip
-
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
-	am--refresh check check-am clean clean-cscope clean-generic \
-	clean-libtool cscope cscopelist-am ctags ctags-am dist \
-	dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
-	dist-xz dist-zip distcheck distclean distclean-generic \
-	distclean-libtool distclean-tags distcleancheck distdir \
-	distuninstallcheck dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installcheck-local \
-	installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-local pdf pdf-am ps ps-am tags \
-	tags-am uninstall uninstall-am
-
-
-# List all build rules defined by HDF5 Makefiles as "PHONY" targets here.
-# This tells the Makefiles that these targets are not files to be built but
-# commands that should be executed even if a file with the same name already
-# exists.
-.PHONY: build-check-clean build-check-p build-check-s build-lib build-progs \
-        build-tests check-clean check-install check-p check-s check-vfd \
-        install-doc lib progs tests uninstall-doc _exec_check-s _test help
-
-help:
-	@$(top_srcdir)/bin/makehelp
-
-# Define rules for lib, progs, check, and tests.
-# These simply involve recursing into subdirectories.
-test _test: check
-
-lib progs check-p check-s:
-	for d in $(SUBDIRS); do                                \
-	  if test $$d != .; then                                        \
-	   (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;            \
-	  fi;                                                           \
-	done
-
-# Make all, tests, and (un)install
-tests:
-	for d in $(SUBDIRS); do                        \
-	  if test $$d != .; then                                        \
-	   (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;            \
-	  fi;                                                           \
-	  done
-
-# Check-clean also recurses into examples directory
-check-clean:
-	for d in $(SUBDIRS) examples; do               \
-	  if test $$d != .; then                                        \
-	   (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;            \
-	  fi;                                                           \
-	done
-	$(RM) -rf prefix-tmp destdir-tmp
-
-# Some C++ compilers/linkers will create a directory named ii_files in
-# the root directory, which should be cleaned.
-mostlyclean-local:
-	if test -d ii_files; then                                       \
-	  $(RM) -rf ii_files;                                           \
-	fi
-
-# 'make install' will now install examples, the same as 'make install-all'.
-# 'make-install-all' will be redundant but will still work.
-install: install-recursive install-examples
-uninstall: uninstall-recursive uninstall-examples 
-
-# 'make install-all' also installs examples
-install-all:
-	@$(MAKE) $(AM_MAKEFLAGS) install
-uninstall-all:
-	@$(MAKE) $(AM_MAKEFLAGS) uninstall
-
-# Install examples in this directory and recursively
-install-examples uninstall-examples:
-	for d in examples $(HDF5_INTERFACES) $(HL); do               \
-	    (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;           \
-	done
-
-# Placeholder to remind users that docs are now in a separate repository.
-install-doc:
-	@echo "docs no longer live in this tree.  Use install-examples to install examples."
-
-uninstall-doc:
-	@echo "docs no longer live in this tree.  Use install-examples to install examples."
-
-# `make check-install' or `make installcheck' checks that examples can 
-#  be successfully built
-installcheck-local:
-	if test -n "${DESTDIR}"; then                                  \
-          (cd ${DESTDIR}$(bindir) && pwd && ./h5redeploy -force);     \
-        fi
-	@(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
-
-# check-install is just a synonym for installcheck
-check-install: installcheck
-
-# check-all-install tests all installation methods.
-# Install via different mechanism and then compare against the default.
-# Fine if only libXXX.a files are different since they may have been ranlib'ed.
-check-all-install:
-	@echo Installing to default location
-	$(MAKE) install
-	@echo Installing to different prefix location
-	$(MAKE) prefix=${ROOT}/prefix-tmp install
-	@echo Compare against the default installation.
-	@echo Fine if only libXXX.a files are different.
-	-diff -r prefix-tmp ${prefix}
-	@echo Installing to different $$\DESTDIR location
-	env DESTDIR=${ROOT}/destdir-tmp $(MAKE) install
-	@echo Compare against the default installation.
-	@echo Fine if only libXXX.a files are different.
-	-diff -r destdir-tmp${prefix} ${prefix}
-
-# Only source files in the src directory include tracing information,
-# so 'make trace' only needs to recurse into that directory.
-trace:
-	@(cd src && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
-
-# Run tests with different Virtual File Drivers.
-# Currently, only invoke check-vfd in the test directory.
-check-vfd:
-	for d in src test; do                                 \
-	  if test $$d != .; then                                       \
-	    (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;          \
-	  fi;                                                          \
-	done
-
-# Automake wants to make config.status depend on configure.  This
-# makes sense, but config.status can't always be regenerated
-# properly, which can cause builds to fail.
-# This is a problem for our Daily Tests, which need to be able to
-# 'make distclean' reliably before running configure.
-# The simple solution is to override the dependency Automake supplies
-# for config.status so that it will never be regenerated.
-$(top_builddir)/config.status:
-
-# Don't include conclude.am in root Makefile; tests target needs to
-# recurse into reguar subdirs.
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..38e48ed
--- /dev/null
+++ b/README.md
@@ -0,0 +1,117 @@
+HDF5 version 1.15.0 currently under development
+
+![HDF5 Logo](doxygen/img/HDF5.png)
+
+[![develop build status](https://img.shields.io/github/actions/workflow/status/HDFGroup/hdf5/main.yml?branch=develop&label=develop)](https://github.com/HDFGroup/hdf5/actions?query=branch%3Adevelop)
+[![1.14 build status](https://img.shields.io/github/actions/workflow/status/HDFGroup/hdf5/main.yml?branch=hdf5_1_14&label=1.14)](https://github.com/HDFGroup/hdf5/actions?query=branch%3Ahdf5_1_14)
+[![1.12 build status](https://img.shields.io/github/actions/workflow/status/HDFGroup/hdf5/main.yml?branch=hdf5_1_12&label=1.12)](https://github.com/HDFGroup/hdf5/actions?query=branch%3Ahdf5_1_12)
+[![1.10 build status](https://img.shields.io/github/actions/workflow/status/HDFGroup/hdf5/main.yml?branch=hdf5_1_10&label=1.10)](https://github.com/HDFGroup/hdf5/actions?query=branch%3Ahdf5_1_10)
+[![1.8 build status](https://img.shields.io/github/actions/workflow/status/HDFGroup/hdf5/main.yml?branch=hdf5_1_8&label=1.8)](https://github.com/HDFGroup/hdf5/actions?query=branch%3Ahdf5_1_8)
+[![BSD](https://img.shields.io/badge/License-BSD-blue.svg)](https://github.com/HDFGroup/hdf5/blob/develop/COPYING)
+
+*Please refer to the release_docs/INSTALL file for installation instructions.*
+
+This repository contains a high-performance library's source code and a file format
+specification that implement the HDF5® data model. The model has been adopted across
+many industries and this implementation has become a de facto data management standard
+in science, engineering, and research communities worldwide.
+
+The HDF Group is the developer, maintainer, and steward of HDF5 software. Find more
+information about The HDF Group, the HDF5 Community, and other HDF5 software projects,
+tools, and services at The HDF Group's website.
+    
+   https://www.hdfgroup.org/
+
+
+DOCUMENTATION
+-------------
+This release is fully functional for the API described in the documentation.
+    
+   https://portal.hdfgroup.org/display/HDF5/The+HDF5+API
+
+Full Documentation and Programming Resources for this release can be found at
+
+   https://portal.hdfgroup.org/display/HDF5
+
+See the RELEASE.txt file in the release_docs/ directory for information specific
+to the features and updates included in this release of the library.
+
+Several more files are located within the release_docs/ directory with specific
+details for several common platforms and configurations.
+
+    INSTALL - Start Here. General instructions for compiling and installing the library
+    INSTALL_CMAKE  - instructions for building with CMake (Kitware.com)
+    INSTALL_parallel - instructions for building and configuring Parallel HDF5
+    INSTALL_Windows and INSTALL_Cygwin - MS Windows installations.
+
+
+
+HELP AND SUPPORT
+----------------
+Information regarding Help Desk and Support services is available at
+
+   https://portal.hdfgroup.org/display/support/The+HDF+Help+Desk
+
+
+
+FORUM and NEWS
+--------------
+The following public forums are provided for public announcements and discussions
+of interest to the general HDF5 Community.
+
+   - Homepage of the Forum
+   https://forum.hdfgroup.org
+
+   - News and Announcement
+   https://forum.hdfgroup.org/c/news-and-announcements-from-the-hdf-group
+
+   - HDF5 and HDF4 Topics
+   https://forum.hdfgroup.org/c/hdf5
+
+These forums are provided as an open and public service for searching and reading.
+Posting requires completing a simple registration and allows one to join in the
+conversation.  Please read the following instructions pertaining to the Forum's
+use and configuration
+    https://forum.hdfgroup.org/t/quickstart-guide-welcome-to-the-new-hdf-forum
+
+
+RELEASE SCHEDULE
+----------------
+
+![HDF5 release schedule](doc/img/release-schedule.png) 
+
+HDF5 does not release on a regular schedule. Instead, releases are driven by
+new features and bug fixes, though we try to have at least one release of each
+maintenance branch per year. Future HDF5 releases indicated on this schedule
+are tentative.
+
+**NOTE**: HDF5 1.12 is being retired early due to its incomplete and incompatible VOL
+layer.
+
+| Release | New Features |
+| ------- | ------------ |
+| 1.8.23 | last HDF5 1.8 release |
+| 1.10.10 | CVE fixes, performance improvements, H5Dchunk\_iter() |
+| 1.12.3 | CVE fixes, performance improvements, H5Dchunk\_iter(), last HDF5 1.12 release |
+| 1.14.1 | selection I/O with datatype conversion |
+| 2.0.0 | TBD |
+| TBD | VFD SWMR |
+
+This list of feature release versions is also tentative, and the specific release
+in which a feature is introduced may change.
+
+
+SNAPSHOTS, PREVIOUS RELEASES AND SOURCE CODE
+--------------------------------------------
+Periodically development code snapshots are provided at the following URL:
+    
+   https://gamma.hdfgroup.org/ftp/pub/outgoing/hdf5/snapshots/
+
+Source packages for current and previous releases are located at:
+    
+   https://portal.hdfgroup.org/display/support/Downloads
+
+Development code is available at our Github location:
+    
+   https://github.com/HDFGroup/hdf5.git
+
diff --git a/README.txt b/README.txt
deleted file mode 100644
index 9f22b0f..0000000
--- a/README.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-HDF5 version 1.9.216 currently under development
-Please refer to the release_docs/INSTALL file for installation instructions.
-------------------------------------------------------------------------------
-
-This release is fully functional for the API described in the documentation. 
-See the RELEASE.txt file in the release_docs/ directory for information 
-specific to this release of the library.  Several INSTALL* files can also be 
-found in the release_docs/ directory:  INSTALL contains instructions for 
-compiling and installing the library;  INSTALL_parallel contains instructions 
-for installing the parallel version of the library;  similarly-named files
-contain instructions for VMS and several environments on MS Windows systems. 
-
-Documentation for this release can be found at the following URL:
-    http://www.hdfgroup.org/HDF5/doc/.
-
-The following  mailing lists are currently set up for HDF5 Library users:
-
-    news        - For announcements of HDF5 related developments,
-                  not a discussion list.
-
-    hdf-forum   - For general discussion of the HDF5 library with
-                  other users.
-
-To subscribe to a list, send mail to "<list>-subscribe@lists.hdfgroup.org".
-where <list> is the name of the list.  For example, send a request 
-to subscribe to the 'news' mail list to the following address:
-    news-subscribe@lists.hdfgroup.org
-
-Messages sent to the list should be addressed to "<list>@lists.hdfgroup.org".
-
-Periodic code snapshots are provided at the following URL:
-    ftp://ftp.hdfgroup.uiuc.edu/pub/outgoing/hdf5/snapshots
-Please read the README.txt file in that directory before working with a 
-library snapshot.
-
-The HDF5 website is located at http://hdfgroup.org/HDF5/
-
-Bugs should be reported to help@hdfgroup.org.
diff --git a/UserMacros.cmake b/UserMacros.cmake
index 65ea5d4..c916223 100644
--- a/UserMacros.cmake
+++ b/UserMacros.cmake
@@ -1,3 +1,14 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
 ########################################################
 #  Include file for user options
 ########################################################
@@ -7,16 +18,15 @@
 #-----------------------------------------------------------------------------
 # Option to Build with User Defined Values
 #-----------------------------------------------------------------------------
-MACRO (MACRO_USER_DEFINED_LIBS)
+macro (MACRO_USER_DEFINED_LIBS)
   set (USER_DEFINED_VALUE "FALSE")
-ENDMACRO (MACRO_USER_DEFINED_LIBS)
+endmacro ()
 
 #-------------------------------------------------------------------------------
 option (BUILD_USER_DEFINED_LIBS "Build With User Defined Values" OFF)
 if (BUILD_USER_DEFINED_LIBS)
   MACRO_USER_DEFINED_LIBS ()
-endif (BUILD_USER_DEFINED_LIBS)
+endif ()
 #-----------------------------------------------------------------------------
 #------------------- E X A M P L E   E N D -----------------------------------
 #-----------------------------------------------------------------------------
- 
-\ No newline at end of file
diff --git a/aclocal.m4 b/aclocal.m4
deleted file mode 100644
index e10c539..0000000
--- a/aclocal.m4
+++ /dev/null
@@ -1,9774 +0,0 @@
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
-
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
-[m4_warning([this file was generated for autoconf 2.69.
-You have another version of autoconf.  It may work, but is not guaranteed to.
-If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-# (This private macro should not be called outside this file.)
-AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.14'
-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.14.1], [],
-      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-])
-
-# _AM_AUTOCONF_VERSION(VERSION)
-# -----------------------------
-# aclocal traces this macro to find the Autoconf version.
-# This is a private macro too.  Using m4_define simplifies
-# the logic in aclocal, which can simply ignore this definition.
-m4_define([_AM_AUTOCONF_VERSION], [])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.14.1])dnl
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-
-# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
-# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory.  The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run.  This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-#    fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-#    fails if $ac_aux_dir is absolute,
-#    fails when called from a subdirectory in a VPATH build with
-#          a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is '.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-#   MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH.  The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-# AM_CONDITIONAL                                            -*- Autoconf -*-
-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ([2.52])dnl
- m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])dnl
-AC_SUBST([$1_FALSE])dnl
-_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-_AM_SUBST_NOTMAKE([$1_FALSE])dnl
-m4_define([_AM_COND_VALUE_$1], [$2])dnl
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-
-# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
-      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
-      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-      [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
-      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
-      [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                    [depcc="$$1"   am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
-               [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named 'D' -- because '-MD' means "put the output
-  # in D".
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_$1_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-  fi
-  am__universal=false
-  m4_case([$1], [CC],
-    [case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac],
-    [CXX],
-    [case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac])
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-      # Solaris 10 /bin/sh.
-      echo '/* dummy */' > sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle '-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs.
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # After this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested.
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok '-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_$1_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE([dependency-tracking], [dnl
-AS_HELP_STRING(
-  [--enable-dependency-tracking],
-  [do not reject slow dependency extractors])
-AS_HELP_STRING(
-  [--disable-dependency-tracking],
-  [speeds up one-time build])])
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-  am__nodep='_no'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-AC_SUBST([am__nodep])dnl
-_AM_SUBST_NOTMAKE([am__nodep])dnl
-])
-
-# Generate code to set up dependency tracking.              -*- Autoconf -*-
-
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[{
-  # Older Autoconf quotes --file arguments for eval, but not when files
-  # are listed without --file.  Let's play safe and only enable the eval
-  # if we detect the quoting.
-  case $CONFIG_FILES in
-  *\'*) eval set x "$CONFIG_FILES" ;;
-  *)   set x $CONFIG_FILES ;;
-  esac
-  shift
-  for mf
-  do
-    # Strip MF so we end up with the name of the file.
-    mf=`echo "$mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named 'Makefile.in', but
-    # some people rename them; so instead we look at the file content.
-    # Grep'ing the first line is not enough: some people post-process
-    # each Makefile.in and add a new line on top of each file to say so.
-    # Grep'ing the whole file is not good either: AIX grep has a line
-    # limit of 2048, but all sed's we know have understand at least 4000.
-    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-      dirpart=`AS_DIRNAME("$mf")`
-    else
-      continue
-    fi
-    # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running 'make'.
-    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-    test -z "$DEPDIR" && continue
-    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "$am__include" && continue
-    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # Find all dependency output files, they are included files with
-    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-    # simplest approach to changing $(DEPDIR) to its actual value in the
-    # expansion.
-    for file in `sed -n "
-      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
-      # Make sure the directory exists.
-      test -f "$dirpart/$file" && continue
-      fdir=`AS_DIRNAME(["$file"])`
-      AS_MKDIR_P([$dirpart/$fdir])
-      # echo "creating $dirpart/$file"
-      echo '# dummy' > "$dirpart/$file"
-    done
-  done
-}
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each '.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
-     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
-# Do all the work for Automake.                             -*- Autoconf -*-
-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This macro actually does too much.  Some checks are only needed if
-# your package does certain things.  But this isn't really a big deal.
-
-dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
-m4_define([AC_PROG_CC],
-m4_defn([AC_PROG_CC])
-[_AM_PROG_CC_C_O
-])
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition.  After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.65])dnl
-dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[AC_DIAGNOSE([obsolete],
-             [$0: two- and three-arguments forms are deprecated.])
-m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(
-  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
-  [ok:ok],,
-  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
- AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
-AM_MISSING_PROG([AUTOCONF], [autoconf])
-AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
-AM_MISSING_PROG([AUTOHEADER], [autoheader])
-AM_MISSING_PROG([MAKEINFO], [makeinfo])
-AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-# For better backward compatibility.  To be removed once Automake 1.9.x
-# dies out for good.  For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
-AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-			     [_AM_PROG_TAR([v7])])])
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
-		  [_AM_DEPENDENCIES([CC])],
-		  [m4_define([AC_PROG_CC],
-			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
-		  [_AM_DEPENDENCIES([CXX])],
-		  [m4_define([AC_PROG_CXX],
-			     m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-		  [_AM_DEPENDENCIES([OBJC])],
-		  [m4_define([AC_PROG_OBJC],
-			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
-		  [_AM_DEPENDENCIES([OBJCXX])],
-		  [m4_define([AC_PROG_OBJCXX],
-			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
-])
-AC_REQUIRE([AM_SILENT_RULES])dnl
-dnl The testsuite driver may need to know about EXEEXT, so add the
-dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
-dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
-AC_CONFIG_COMMANDS_PRE(dnl
-[m4_provide_if([_AM_COMPILER_EXEEXT],
-  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-
-# POSIX will say in a future version that running "rm -f" with no argument
-# is OK; and we want to be able to make that assumption in our Makefile
-# recipes.  So use an aggressive probe to check that the usage we want is
-# actually supported "in the wild" to an acceptable degree.
-# See automake bug#10828.
-# To make any issue more visible, cause the running configure to be aborted
-# by default if the 'rm' program in use doesn't match our expectations; the
-# user can still override this though.
-if rm -f && rm -fr && rm -rf; then : OK; else
-  cat >&2 <<'END'
-Oops!
-
-Your 'rm' program seems unable to run without file operands specified
-on the command line, even when the '-f' option is present.  This is contrary
-to the behaviour of most rm programs out there, and not conforming with
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-
-Please tell bug-automake@gnu.org about your system, including the value
-of your $PATH and any error possibly output before this message.  This
-can help us improve future automake versions.
-
-END
-  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
-    echo 'Configuration will proceed anyway, since you have set the' >&2
-    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
-    echo >&2
-  else
-    cat >&2 <<'END'
-Aborting the configuration process, to ensure you take notice of the issue.
-
-You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
-
-If you want to complete the configuration process using your problematic
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-to "yes", and re-run configure.
-
-END
-    AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
-  fi
-fi])
-
-dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
-dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
-dnl mangled by Autoconf and run in a shell conditional statement.
-m4_define([_AC_COMPILER_EXEEXT],
-m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated.  The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_arg=$1
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $_am_arg | $_am_arg:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-  *)
-    install_sh="\${SHELL} $am_aux_dir/install-sh"
-  esac
-fi
-AC_SUBST([install_sh])])
-
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot.  For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
-# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
-# From Jim Meyering
-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_MAINTAINER_MODE([DEFAULT-MODE])
-# ----------------------------------
-# Control maintainer-specific portions of Makefiles.
-# Default is to disable them, unless 'enable' is passed literally.
-# For symmetry, 'disable' may be passed as well.  Anyway, the user
-# can override the default with the --enable/--disable switch.
-AC_DEFUN([AM_MAINTAINER_MODE],
-[m4_case(m4_default([$1], [disable]),
-       [enable], [m4_define([am_maintainer_other], [disable])],
-       [disable], [m4_define([am_maintainer_other], [enable])],
-       [m4_define([am_maintainer_other], [enable])
-        m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
-AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode's default is 'disable' unless 'enable' is passed
-  AC_ARG_ENABLE([maintainer-mode],
-    [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode],
-      am_maintainer_other[ make rules and dependencies not useful
-      (and sometimes confusing) to the casual installer])],
-    [USE_MAINTAINER_MODE=$enableval],
-    [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
-  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-  AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
-  MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST([MAINT])dnl
-]
-)
-
-# Check to see how 'make' treats includes.	            -*- Autoconf -*-
-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo this is the am__doit target
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
-  am__include=include
-  am__quote=
-  _am_result=GNU
-  ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   case `$am_make -s -f confmf 2> /dev/null` in #(
-   *the\ am__doit\ target*)
-     am__include=.include
-     am__quote="\""
-     _am_result=BSD
-     ;;
-   esac
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-
-# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it is modern enough.
-# If it is, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([missing])dnl
-if test x"${MISSING+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-  *)
-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-  esac
-fi
-# Use eval to expand $SHELL
-if eval "$MISSING --is-lightweight"; then
-  am_missing_run="$MISSING "
-else
-  am_missing_run=
-  AC_MSG_WARN(['missing' script is too old or missing])
-fi
-])
-
-# Helper functions for option handling.                     -*- Autoconf -*-
-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# --------------------
-# Set option NAME.  Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# _AM_PROG_CC_C_O
-# ---------------
-# Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
-# to automatically call this.
-AC_DEFUN([_AM_PROG_CC_C_O],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([compile])dnl
-AC_LANG_PUSH([C])dnl
-AC_CACHE_CHECK(
-  [whether $CC understands -c and -o together],
-  [am_cv_prog_cc_c_o],
-  [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
-  # Make sure it works both with $CC and with simple cc.
-  # Following AC_PROG_CC_C_O, we do the test twice because some
-  # compilers refuse to overwrite an existing .o file with -o,
-  # though they will create one.
-  am_cv_prog_cc_c_o=yes
-  for am_i in 1 2; do
-    if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
-         && test -f conftest2.$ac_objext; then
-      : OK
-    else
-      am_cv_prog_cc_c_o=no
-      break
-    fi
-  done
-  rm -f core conftest*
-  unset am_i])
-if test "$am_cv_prog_cc_c_o" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-AC_LANG_POP([C])])
-
-# For backward compatibility.
-AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_RUN_LOG(COMMAND)
-# -------------------
-# Run COMMAND, save the exit status in ac_status, and log it.
-# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
-AC_DEFUN([AM_RUN_LOG],
-[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
-   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   (exit $ac_status); }])
-
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Reject unsafe characters in $srcdir or the absolute working directory
-# name.  Accept space and tab only in the latter.
-am_lf='
-'
-case `pwd` in
-  *[[\\\"\#\$\&\'\`$am_lf]]*)
-    AC_MSG_ERROR([unsafe absolute working directory name]);;
-esac
-case $srcdir in
-  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
-    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
-esac
-
-# Do 'set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   am_has_slept=no
-   for am_try in 1 2; do
-     echo "timestamp, slept: $am_has_slept" > conftest.file
-     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-     if test "$[*]" = "X"; then
-	# -L didn't work.
-	set X `ls -t "$srcdir/configure" conftest.file`
-     fi
-     if test "$[*]" != "X $srcdir/configure conftest.file" \
-	&& test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-	# If neither matched, then we have a broken ls.  This can happen
-	# if, for instance, CONFIG_SHELL is bash and it inherits a
-	# broken ls alias from the environment.  This has actually
-	# happened.  Such a system could not be considered "sane".
-	AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-  alias in your environment])
-     fi
-     if test "$[2]" = conftest.file || test $am_try -eq 2; then
-       break
-     fi
-     # Just in case.
-     sleep 1
-     am_has_slept=yes
-   done
-   test "$[2]" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT([yes])
-# If we didn't sleep, we still need to ensure time stamps of config.status and
-# generated files are strictly newer.
-am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
-  ( sleep 1 ) &
-  am_sleep_pid=$!
-fi
-AC_CONFIG_COMMANDS_PRE(
-  [AC_MSG_CHECKING([that generated files are newer than configure])
-   if test -n "$am_sleep_pid"; then
-     # Hide warnings about reused PIDs.
-     wait $am_sleep_pid 2>/dev/null
-   fi
-   AC_MSG_RESULT([done])])
-rm -f conftest.file
-])
-
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_SILENT_RULES([DEFAULT])
-# --------------------------
-# Enable less verbose build rules; with the default set to DEFAULT
-# ("yes" being less verbose, "no" or empty being verbose).
-AC_DEFUN([AM_SILENT_RULES],
-[AC_ARG_ENABLE([silent-rules], [dnl
-AS_HELP_STRING(
-  [--enable-silent-rules],
-  [less verbose build output (undo: "make V=1")])
-AS_HELP_STRING(
-  [--disable-silent-rules],
-  [verbose build output (undo: "make V=0")])dnl
-])
-case $enable_silent_rules in @%:@ (((
-  yes) AM_DEFAULT_VERBOSITY=0;;
-   no) AM_DEFAULT_VERBOSITY=1;;
-    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
-esac
-dnl
-dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
-dnl do not support nested variable expansions.
-dnl See automake bug#9928 and bug#10237.
-am_make=${MAKE-make}
-AC_CACHE_CHECK([whether $am_make supports nested variables],
-   [am_cv_make_support_nested_variables],
-   [if AS_ECHO([['TRUE=$(BAR$(V))
-BAR0=false
-BAR1=true
-V=1
-am__doit:
-	@$(TRUE)
-.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
-  am_cv_make_support_nested_variables=yes
-else
-  am_cv_make_support_nested_variables=no
-fi])
-if test $am_cv_make_support_nested_variables = yes; then
-  dnl Using '$V' instead of '$(V)' breaks IRIX make.
-  AM_V='$(V)'
-  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
-  AM_V=$AM_DEFAULT_VERBOSITY
-  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
-AC_SUBST([AM_V])dnl
-AM_SUBST_NOTMAKE([AM_V])dnl
-AC_SUBST([AM_DEFAULT_V])dnl
-AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
-AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
-AM_BACKSLASH='\'
-AC_SUBST([AM_BACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
-])
-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_STRIP
-# ---------------------
-# One issue with vendor 'install' (even GNU) is that you can't
-# specify the program used to strip binaries.  This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in "make install-strip", and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using 'strip' when the user
-# run "make install-strip".  However 'strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the 'STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
-if test "$cross_compiling" != no; then
-  AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# _AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
-# This macro is traced by Automake.
-AC_DEFUN([_AM_SUBST_NOTMAKE])
-
-# AM_SUBST_NOTMAKE(VARIABLE)
-# --------------------------
-# Public sister of _AM_SUBST_NOTMAKE.
-AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
-
-# Check how to create a tarball.                            -*- Autoconf -*-
-
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of 'v7', 'ustar', or 'pax'.
-#
-# Substitute a variable $(am__tar) that is a command
-# writing to stdout a FORMAT-tarball containing the directory
-# $tardir.
-#     tardir=directory && $(am__tar) > result.tar
-#
-# Substitute a variable $(am__untar) that extract such
-# a tarball read from stdin.
-#     $(am__untar) < result.tar
-#
-AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.  Yes, it's still used
-# in the wild :-(  We should find a proper way to deprecate it ...
-AC_SUBST([AMTAR], ['$${TAR-tar}'])
-
-# We'll loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-
-m4_if([$1], [v7],
-  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
-
-  [m4_case([$1],
-    [ustar],
-     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
-      # There is notably a 21 bits limit for the UID and the GID.  In fact,
-      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
-      # and bug#13588).
-      am_max_uid=2097151 # 2^21 - 1
-      am_max_gid=$am_max_uid
-      # The $UID and $GID variables are not portable, so we need to resort
-      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
-      # below are definitely unexpected, so allow the users to see them
-      # (that is, avoid stderr redirection).
-      am_uid=`id -u || echo unknown`
-      am_gid=`id -g || echo unknown`
-      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
-      if test $am_uid -le $am_max_uid; then
-         AC_MSG_RESULT([yes])
-      else
-         AC_MSG_RESULT([no])
-         _am_tools=none
-      fi
-      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
-      if test $am_gid -le $am_max_gid; then
-         AC_MSG_RESULT([yes])
-      else
-        AC_MSG_RESULT([no])
-        _am_tools=none
-      fi],
-
-  [pax],
-    [],
-
-  [m4_fatal([Unknown tar format])])
-
-  AC_MSG_CHECKING([how to create a $1 tar archive])
-
-  # Go ahead even if we have the value already cached.  We do so because we
-  # need to set the values for the 'am__tar' and 'am__untar' variables.
-  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
-
-  for _am_tool in $_am_tools; do
-    case $_am_tool in
-    gnutar)
-      for _am_tar in tar gnutar gtar; do
-        AM_RUN_LOG([$_am_tar --version]) && break
-      done
-      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-      am__untar="$_am_tar -xf -"
-      ;;
-    plaintar)
-      # Must skip GNU tar: if it does not support --format= it doesn't create
-      # ustar tarball either.
-      (tar --version) >/dev/null 2>&1 && continue
-      am__tar='tar chf - "$$tardir"'
-      am__tar_='tar chf - "$tardir"'
-      am__untar='tar xf -'
-      ;;
-    pax)
-      am__tar='pax -L -x $1 -w "$$tardir"'
-      am__tar_='pax -L -x $1 -w "$tardir"'
-      am__untar='pax -r'
-      ;;
-    cpio)
-      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-      am__untar='cpio -i -H $1 -d'
-      ;;
-    none)
-      am__tar=false
-      am__tar_=false
-      am__untar=false
-      ;;
-    esac
-
-    # If the value was cached, stop now.  We just wanted to have am__tar
-    # and am__untar set.
-    test -n "${am_cv_prog_tar_$1}" && break
-
-    # tar/untar a dummy directory, and stop if the command works.
-    rm -rf conftest.dir
-    mkdir conftest.dir
-    echo GrepMe > conftest.dir/file
-    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-    rm -rf conftest.dir
-    if test -s conftest.tar; then
-      AM_RUN_LOG([$am__untar <conftest.tar])
-      AM_RUN_LOG([cat conftest.dir/file])
-      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-    fi
-  done
-  rm -rf conftest.dir
-
-  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-]) # _AM_PROG_TAR
-
-m4_include([m4/aclocal_cxx.m4])
-m4_include([m4/aclocal_fc.m4])
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-#
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-#                 Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-m4_define([_LT_COPYING], [dnl
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-#                 Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-#   This file is part of GNU Libtool.
-#
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-])
-
-# serial 57 LT_INIT
-
-
-# LT_PREREQ(VERSION)
-# ------------------
-# Complain and exit if this libtool version is less that VERSION.
-m4_defun([LT_PREREQ],
-[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
-       [m4_default([$3],
-		   [m4_fatal([Libtool version $1 or higher is required],
-		             63)])],
-       [$2])])
-
-
-# _LT_CHECK_BUILDDIR
-# ------------------
-# Complain if the absolute build directory name contains unusual characters
-m4_defun([_LT_CHECK_BUILDDIR],
-[case `pwd` in
-  *\ * | *\	*)
-    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
-esac
-])
-
-
-# LT_INIT([OPTIONS])
-# ------------------
-AC_DEFUN([LT_INIT],
-[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
-AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
-AC_BEFORE([$0], [LT_LANG])dnl
-AC_BEFORE([$0], [LT_OUTPUT])dnl
-AC_BEFORE([$0], [LTDL_INIT])dnl
-m4_require([_LT_CHECK_BUILDDIR])dnl
-
-dnl Autoconf doesn't catch unexpanded LT_ macros by default:
-m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
-m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
-dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
-dnl unless we require an AC_DEFUNed macro:
-AC_REQUIRE([LTOPTIONS_VERSION])dnl
-AC_REQUIRE([LTSUGAR_VERSION])dnl
-AC_REQUIRE([LTVERSION_VERSION])dnl
-AC_REQUIRE([LTOBSOLETE_VERSION])dnl
-m4_require([_LT_PROG_LTMAIN])dnl
-
-_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
-
-dnl Parse OPTIONS
-_LT_SET_OPTIONS([$0], [$1])
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-_LT_SETUP
-
-# Only expand once:
-m4_define([LT_INIT])
-])# LT_INIT
-
-# Old names:
-AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
-AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
-dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
-
-
-# _LT_CC_BASENAME(CC)
-# -------------------
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-m4_defun([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
-  case $cc_temp in
-    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-])
-
-
-# _LT_FILEUTILS_DEFAULTS
-# ----------------------
-# It is okay to use these file commands and assume they have been set
-# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
-m4_defun([_LT_FILEUTILS_DEFAULTS],
-[: ${CP="cp -f"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-])# _LT_FILEUTILS_DEFAULTS
-
-
-# _LT_SETUP
-# ---------
-m4_defun([_LT_SETUP],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
-AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
-
-_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
-dnl
-_LT_DECL([], [host_alias], [0], [The host system])dnl
-_LT_DECL([], [host], [0])dnl
-_LT_DECL([], [host_os], [0])dnl
-dnl
-_LT_DECL([], [build_alias], [0], [The build system])dnl
-_LT_DECL([], [build], [0])dnl
-_LT_DECL([], [build_os], [0])dnl
-dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([LT_PATH_LD])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-dnl
-AC_REQUIRE([AC_PROG_LN_S])dnl
-test -z "$LN_S" && LN_S="ln -s"
-_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
-dnl
-AC_REQUIRE([LT_CMD_MAX_LEN])dnl
-_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
-_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
-dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_CHECK_SHELL_FEATURES])dnl
-m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
-m4_require([_LT_CMD_RELOAD])dnl
-m4_require([_LT_CHECK_MAGIC_METHOD])dnl
-m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
-m4_require([_LT_CMD_OLD_ARCHIVE])dnl
-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-m4_require([_LT_WITH_SYSROOT])dnl
-
-_LT_CONFIG_LIBTOOL_INIT([
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-])
-if test -n "${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-
-_LT_CHECK_OBJDIR
-
-m4_require([_LT_TAG_COMPILER])dnl
-
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Global variables:
-ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$LD" && LD=ld
-test -z "$ac_objext" && ac_objext=o
-
-_LT_CC_BASENAME([$compiler])
-
-# Only perform the check for file, if the check method requires it
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    _LT_PATH_MAGIC
-  fi
-  ;;
-esac
-
-# Use C for the default configuration in the libtool script
-LT_SUPPORTED_TAG([CC])
-_LT_LANG_C_CONFIG
-_LT_LANG_DEFAULT_CONFIG
-_LT_CONFIG_COMMANDS
-])# _LT_SETUP
-
-
-# _LT_PREPARE_SED_QUOTE_VARS
-# --------------------------
-# Define a few sed substitution that help us do robust quoting.
-m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
-[# Backslashify metacharacters that are still active within
-# double-quoted strings.
-sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\([["`\\]]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-])
-
-# _LT_PROG_LTMAIN
-# ---------------
-# Note that this code is called both from `configure', and `config.status'
-# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
-# `config.status' has no value for ac_aux_dir unless we are using Automake,
-# so we pass a copy along to make sure it has a sensible value anyway.
-m4_defun([_LT_PROG_LTMAIN],
-[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
-_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
-ltmain="$ac_aux_dir/ltmain.sh"
-])# _LT_PROG_LTMAIN
-
-
-
-# So that we can recreate a full libtool script including additional
-# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
-# in macros and then make a single call at the end using the `libtool'
-# label.
-
-
-# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
-# ----------------------------------------
-# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-m4_define([_LT_CONFIG_LIBTOOL_INIT],
-[m4_ifval([$1],
-          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
-                     [$1
-])])])
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_INIT])
-
-
-# _LT_CONFIG_LIBTOOL([COMMANDS])
-# ------------------------------
-# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-m4_define([_LT_CONFIG_LIBTOOL],
-[m4_ifval([$1],
-          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
-                     [$1
-])])])
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
-
-
-# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
-# -----------------------------------------------------
-m4_defun([_LT_CONFIG_SAVE_COMMANDS],
-[_LT_CONFIG_LIBTOOL([$1])
-_LT_CONFIG_LIBTOOL_INIT([$2])
-])
-
-
-# _LT_FORMAT_COMMENT([COMMENT])
-# -----------------------------
-# Add leading comment marks to the start of each line, and a trailing
-# full-stop to the whole comment if one is not present already.
-m4_define([_LT_FORMAT_COMMENT],
-[m4_ifval([$1], [
-m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
-              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
-)])
-
-
-
-
-
-# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
-# -------------------------------------------------------------------
-# CONFIGNAME is the name given to the value in the libtool script.
-# VARNAME is the (base) name used in the configure script.
-# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
-# VARNAME.  Any other value will be used directly.
-m4_define([_LT_DECL],
-[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
-    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
-	[m4_ifval([$1], [$1], [$2])])
-    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
-    m4_ifval([$4],
-	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
-    lt_dict_add_subkey([lt_decl_dict], [$2],
-	[tagged?], [m4_ifval([$5], [yes], [no])])])
-])
-
-
-# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
-# --------------------------------------------------------
-m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
-
-
-# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
-# ------------------------------------------------
-m4_define([lt_decl_tag_varnames],
-[_lt_decl_filter([tagged?], [yes], $@)])
-
-
-# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
-# ---------------------------------------------------------
-m4_define([_lt_decl_filter],
-[m4_case([$#],
-  [0], [m4_fatal([$0: too few arguments: $#])],
-  [1], [m4_fatal([$0: too few arguments: $#: $1])],
-  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
-  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
-  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
-])
-
-
-# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
-# --------------------------------------------------
-m4_define([lt_decl_quote_varnames],
-[_lt_decl_filter([value], [1], $@)])
-
-
-# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
-# ---------------------------------------------------
-m4_define([lt_decl_dquote_varnames],
-[_lt_decl_filter([value], [2], $@)])
-
-
-# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
-# ---------------------------------------------------
-m4_define([lt_decl_varnames_tagged],
-[m4_assert([$# <= 2])dnl
-_$0(m4_quote(m4_default([$1], [[, ]])),
-    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
-    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
-m4_define([_lt_decl_varnames_tagged],
-[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
-
-
-# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
-# ------------------------------------------------
-m4_define([lt_decl_all_varnames],
-[_$0(m4_quote(m4_default([$1], [[, ]])),
-     m4_if([$2], [],
-	   m4_quote(lt_decl_varnames),
-	m4_quote(m4_shift($@))))[]dnl
-])
-m4_define([_lt_decl_all_varnames],
-[lt_join($@, lt_decl_varnames_tagged([$1],
-			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
-])
-
-
-# _LT_CONFIG_STATUS_DECLARE([VARNAME])
-# ------------------------------------
-# Quote a variable value, and forward it to `config.status' so that its
-# declaration there will have the same value as in `configure'.  VARNAME
-# must have a single quote delimited value for this to work.
-m4_define([_LT_CONFIG_STATUS_DECLARE],
-[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
-
-
-# _LT_CONFIG_STATUS_DECLARATIONS
-# ------------------------------
-# We delimit libtool config variables with single quotes, so when
-# we write them to config.status, we have to be sure to quote all
-# embedded single quotes properly.  In configure, this macro expands
-# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
-#
-#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
-m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
-[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
-    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
-
-
-# _LT_LIBTOOL_TAGS
-# ----------------
-# Output comment and list of tags supported by the script
-m4_defun([_LT_LIBTOOL_TAGS],
-[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
-available_tags="_LT_TAGS"dnl
-])
-
-
-# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
-# -----------------------------------
-# Extract the dictionary values for VARNAME (optionally with TAG) and
-# expand to a commented shell variable setting:
-#
-#    # Some comment about what VAR is for.
-#    visible_name=$lt_internal_name
-m4_define([_LT_LIBTOOL_DECLARE],
-[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
-					   [description])))[]dnl
-m4_pushdef([_libtool_name],
-    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
-m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
-    [0], [_libtool_name=[$]$1],
-    [1], [_libtool_name=$lt_[]$1],
-    [2], [_libtool_name=$lt_[]$1],
-    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
-m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
-])
-
-
-# _LT_LIBTOOL_CONFIG_VARS
-# -----------------------
-# Produce commented declarations of non-tagged libtool config variables
-# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
-# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
-# section) are produced by _LT_LIBTOOL_TAG_VARS.
-m4_defun([_LT_LIBTOOL_CONFIG_VARS],
-[m4_foreach([_lt_var],
-    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
-    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
-
-
-# _LT_LIBTOOL_TAG_VARS(TAG)
-# -------------------------
-m4_define([_LT_LIBTOOL_TAG_VARS],
-[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
-    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
-
-
-# _LT_TAGVAR(VARNAME, [TAGNAME])
-# ------------------------------
-m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
-
-
-# _LT_CONFIG_COMMANDS
-# -------------------
-# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
-# variables for single and double quote escaping we saved from calls
-# to _LT_DECL, we can put quote escaped variables declarations
-# into `config.status', and then the shell code to quote escape them in
-# for loops in `config.status'.  Finally, any additional code accumulated
-# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
-m4_defun([_LT_CONFIG_COMMANDS],
-[AC_PROVIDE_IFELSE([LT_OUTPUT],
-	dnl If the libtool generation code has been placed in $CONFIG_LT,
-	dnl instead of duplicating it all over again into config.status,
-	dnl then we will have config.status run $CONFIG_LT later, so it
-	dnl needs to know what name is stored there:
-        [AC_CONFIG_COMMANDS([libtool],
-            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
-    dnl If the libtool generation code is destined for config.status,
-    dnl expand the accumulated commands and init code now:
-    [AC_CONFIG_COMMANDS([libtool],
-        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
-])#_LT_CONFIG_COMMANDS
-
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
-[
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-sed_quote_subst='$sed_quote_subst'
-double_quote_subst='$double_quote_subst'
-delay_variable_subst='$delay_variable_subst'
-_LT_CONFIG_STATUS_DECLARATIONS
-LTCC='$LTCC'
-LTCFLAGS='$LTCFLAGS'
-compiler='$compiler_DEFAULT'
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-\$[]1
-_LTECHO_EOF'
-}
-
-# Quote evaled strings.
-for var in lt_decl_all_varnames([[ \
-]], lt_decl_quote_varnames); do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-# Double-quote double-evaled strings.
-for var in lt_decl_all_varnames([[ \
-]], lt_decl_dquote_varnames); do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-_LT_OUTPUT_LIBTOOL_INIT
-])
-
-# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
-# ------------------------------------
-# Generate a child script FILE with all initialization necessary to
-# reuse the environment learned by the parent script, and make the
-# file executable.  If COMMENT is supplied, it is inserted after the
-# `#!' sequence but before initialization text begins.  After this
-# macro, additional text can be appended to FILE to form the body of
-# the child script.  The macro ends with non-zero status if the
-# file could not be fully written (such as if the disk is full).
-m4_ifdef([AS_INIT_GENERATED],
-[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
-[m4_defun([_LT_GENERATED_FILE_INIT],
-[m4_require([AS_PREPARE])]dnl
-[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
-[lt_write_fail=0
-cat >$1 <<_ASEOF || lt_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-$2
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$1 <<\_ASEOF || lt_write_fail=1
-AS_SHELL_SANITIZE
-_AS_PREPARE
-exec AS_MESSAGE_FD>&1
-_ASEOF
-test $lt_write_fail = 0 && chmod +x $1[]dnl
-m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
-
-# LT_OUTPUT
-# ---------
-# This macro allows early generation of the libtool script (before
-# AC_OUTPUT is called), incase it is used in configure for compilation
-# tests.
-AC_DEFUN([LT_OUTPUT],
-[: ${CONFIG_LT=./config.lt}
-AC_MSG_NOTICE([creating $CONFIG_LT])
-_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
-[# Run this file to recreate a libtool stub with the current configuration.])
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-lt_cl_silent=false
-exec AS_MESSAGE_LOG_FD>>config.log
-{
-  echo
-  AS_BOX([Running $as_me.])
-} >&AS_MESSAGE_LOG_FD
-
-lt_cl_help="\
-\`$as_me' creates a local libtool stub from the current configuration,
-for use in further configure time tests before the real libtool is
-generated.
-
-Usage: $[0] [[OPTIONS]]
-
-  -h, --help      print this help, then exit
-  -V, --version   print version number, then exit
-  -q, --quiet     do not print progress messages
-  -d, --debug     don't remove temporary files
-
-Report bugs to <bug-libtool@gnu.org>."
-
-lt_cl_version="\
-m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
-m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
-configured by $[0], generated by m4_PACKAGE_STRING.
-
-Copyright (C) 2011 Free Software Foundation, Inc.
-This config.lt script is free software; the Free Software Foundation
-gives unlimited permision to copy, distribute and modify it."
-
-while test $[#] != 0
-do
-  case $[1] in
-    --version | --v* | -V )
-      echo "$lt_cl_version"; exit 0 ;;
-    --help | --h* | -h )
-      echo "$lt_cl_help"; exit 0 ;;
-    --debug | --d* | -d )
-      debug=: ;;
-    --quiet | --q* | --silent | --s* | -q )
-      lt_cl_silent=: ;;
-
-    -*) AC_MSG_ERROR([unrecognized option: $[1]
-Try \`$[0] --help' for more information.]) ;;
-
-    *) AC_MSG_ERROR([unrecognized argument: $[1]
-Try \`$[0] --help' for more information.]) ;;
-  esac
-  shift
-done
-
-if $lt_cl_silent; then
-  exec AS_MESSAGE_FD>/dev/null
-fi
-_LTEOF
-
-cat >>"$CONFIG_LT" <<_LTEOF
-_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
-_LTEOF
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-AC_MSG_NOTICE([creating $ofile])
-_LT_OUTPUT_LIBTOOL_COMMANDS
-AS_EXIT(0)
-_LTEOF
-chmod +x "$CONFIG_LT"
-
-# configure is writing to config.log, but config.lt does its own redirection,
-# appending to config.log, which fails on DOS, as config.log is still kept
-# open by configure.  Here we exec the FD to /dev/null, effectively closing
-# config.log, so it can be properly (re)opened and appended to by config.lt.
-lt_cl_success=:
-test "$silent" = yes &&
-  lt_config_lt_args="$lt_config_lt_args --quiet"
-exec AS_MESSAGE_LOG_FD>/dev/null
-$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
-exec AS_MESSAGE_LOG_FD>>config.log
-$lt_cl_success || AS_EXIT(1)
-])# LT_OUTPUT
-
-
-# _LT_CONFIG(TAG)
-# ---------------
-# If TAG is the built-in tag, create an initial libtool script with a
-# default configuration from the untagged config vars.  Otherwise add code
-# to config.status for appending the configuration named by TAG from the
-# matching tagged config vars.
-m4_defun([_LT_CONFIG],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-_LT_CONFIG_SAVE_COMMANDS([
-  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
-  m4_if(_LT_TAG, [C], [
-    # See if we are running on zsh, and set the options which allow our
-    # commands through without removal of \ escapes.
-    if test -n "${ZSH_VERSION+set}" ; then
-      setopt NO_GLOB_SUBST
-    fi
-
-    cfgfile="${ofile}T"
-    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
-    $RM "$cfgfile"
-
-    cat <<_LT_EOF >> "$cfgfile"
-#! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-_LT_COPYING
-_LT_LIBTOOL_TAGS
-
-# ### BEGIN LIBTOOL CONFIG
-_LT_LIBTOOL_CONFIG_VARS
-_LT_LIBTOOL_TAG_VARS
-# ### END LIBTOOL CONFIG
-
-_LT_EOF
-
-  case $host_os in
-  aix3*)
-    cat <<\_LT_EOF >> "$cfgfile"
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-_LT_EOF
-    ;;
-  esac
-
-  _LT_PROG_LTMAIN
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" \
-     || (rm -f "$cfgfile"; exit 1)
-
-  _LT_PROG_REPLACE_SHELLFNS
-
-   mv -f "$cfgfile" "$ofile" ||
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-],
-[cat <<_LT_EOF >> "$ofile"
-
-dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
-dnl in a comment (ie after a #).
-# ### BEGIN LIBTOOL TAG CONFIG: $1
-_LT_LIBTOOL_TAG_VARS(_LT_TAG)
-# ### END LIBTOOL TAG CONFIG: $1
-_LT_EOF
-])dnl /m4_if
-],
-[m4_if([$1], [], [
-    PACKAGE='$PACKAGE'
-    VERSION='$VERSION'
-    TIMESTAMP='$TIMESTAMP'
-    RM='$RM'
-    ofile='$ofile'], [])
-])dnl /_LT_CONFIG_SAVE_COMMANDS
-])# _LT_CONFIG
-
-
-# LT_SUPPORTED_TAG(TAG)
-# ---------------------
-# Trace this macro to discover what tags are supported by the libtool
-# --tag option, using:
-#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
-AC_DEFUN([LT_SUPPORTED_TAG], [])
-
-
-# C support is built-in for now
-m4_define([_LT_LANG_C_enabled], [])
-m4_define([_LT_TAGS], [])
-
-
-# LT_LANG(LANG)
-# -------------
-# Enable libtool support for the given language if not already enabled.
-AC_DEFUN([LT_LANG],
-[AC_BEFORE([$0], [LT_OUTPUT])dnl
-m4_case([$1],
-  [C],			[_LT_LANG(C)],
-  [C++],		[_LT_LANG(CXX)],
-  [Go],			[_LT_LANG(GO)],
-  [Java],		[_LT_LANG(GCJ)],
-  [Fortran 77],		[_LT_LANG(F77)],
-  [Fortran],		[_LT_LANG(FC)],
-  [Windows Resource],	[_LT_LANG(RC)],
-  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
-    [_LT_LANG($1)],
-    [m4_fatal([$0: unsupported language: "$1"])])])dnl
-])# LT_LANG
-
-
-# _LT_LANG(LANGNAME)
-# ------------------
-m4_defun([_LT_LANG],
-[m4_ifdef([_LT_LANG_]$1[_enabled], [],
-  [LT_SUPPORTED_TAG([$1])dnl
-  m4_append([_LT_TAGS], [$1 ])dnl
-  m4_define([_LT_LANG_]$1[_enabled], [])dnl
-  _LT_LANG_$1_CONFIG($1)])dnl
-])# _LT_LANG
-
-
-m4_ifndef([AC_PROG_GO], [
-# NOTE: This macro has been submitted for inclusion into   #
-#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
-#  a released version of Autoconf we should remove this    #
-#  macro and use it instead.                               #
-m4_defun([AC_PROG_GO],
-[AC_LANG_PUSH(Go)dnl
-AC_ARG_VAR([GOC],     [Go compiler command])dnl
-AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
-_AC_ARG_VAR_LDFLAGS()dnl
-AC_CHECK_TOOL(GOC, gccgo)
-if test -z "$GOC"; then
-  if test -n "$ac_tool_prefix"; then
-    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
-  fi
-fi
-if test -z "$GOC"; then
-  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
-fi
-])#m4_defun
-])#m4_ifndef
-
-
-# _LT_LANG_DEFAULT_CONFIG
-# -----------------------
-m4_defun([_LT_LANG_DEFAULT_CONFIG],
-[AC_PROVIDE_IFELSE([AC_PROG_CXX],
-  [LT_LANG(CXX)],
-  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
-
-AC_PROVIDE_IFELSE([AC_PROG_F77],
-  [LT_LANG(F77)],
-  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
-
-AC_PROVIDE_IFELSE([AC_PROG_FC],
-  [LT_LANG(FC)],
-  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
-
-dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
-dnl pulling things in needlessly.
-AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-  [LT_LANG(GCJ)],
-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-    [LT_LANG(GCJ)],
-    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
-      [LT_LANG(GCJ)],
-      [m4_ifdef([AC_PROG_GCJ],
-	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
-       m4_ifdef([A][M_PROG_GCJ],
-	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
-       m4_ifdef([LT_PROG_GCJ],
-	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
-
-AC_PROVIDE_IFELSE([AC_PROG_GO],
-  [LT_LANG(GO)],
-  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
-
-AC_PROVIDE_IFELSE([LT_PROG_RC],
-  [LT_LANG(RC)],
-  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
-])# _LT_LANG_DEFAULT_CONFIG
-
-# Obsolete macros:
-AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
-AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
-AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
-AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
-AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
-dnl AC_DEFUN([AC_LIBTOOL_F77], [])
-dnl AC_DEFUN([AC_LIBTOOL_FC], [])
-dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
-dnl AC_DEFUN([AC_LIBTOOL_RC], [])
-
-
-# _LT_TAG_COMPILER
-# ----------------
-m4_defun([_LT_TAG_COMPILER],
-[AC_REQUIRE([AC_PROG_CC])dnl
-
-_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
-_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
-_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
-_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-])# _LT_TAG_COMPILER
-
-
-# _LT_COMPILER_BOILERPLATE
-# ------------------------
-# Check for compiler boilerplate output or warnings with
-# the simple compiler test code.
-m4_defun([_LT_COMPILER_BOILERPLATE],
-[m4_require([_LT_DECL_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$RM conftest*
-])# _LT_COMPILER_BOILERPLATE
-
-
-# _LT_LINKER_BOILERPLATE
-# ----------------------
-# Check for linker boilerplate output or warnings with
-# the simple link test code.
-m4_defun([_LT_LINKER_BOILERPLATE],
-[m4_require([_LT_DECL_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$RM -r conftest*
-])# _LT_LINKER_BOILERPLATE
-
-# _LT_REQUIRED_DARWIN_CHECKS
-# -------------------------
-m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
-  case $host_os in
-    rhapsody* | darwin*)
-    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
-    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
-    AC_CHECK_TOOL([LIPO], [lipo], [:])
-    AC_CHECK_TOOL([OTOOL], [otool], [:])
-    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
-    _LT_DECL([], [DSYMUTIL], [1],
-      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
-    _LT_DECL([], [NMEDIT], [1],
-      [Tool to change global to local symbols on Mac OS X])
-    _LT_DECL([], [LIPO], [1],
-      [Tool to manipulate fat objects and archives on Mac OS X])
-    _LT_DECL([], [OTOOL], [1],
-      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
-    _LT_DECL([], [OTOOL64], [1],
-      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
-
-    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
-      [lt_cv_apple_cc_single_mod=no
-      if test -z "${LT_MULTI_MODULE}"; then
-	# By default we will add the -single_module flag. You can override
-	# by either setting the environment variable LT_MULTI_MODULE
-	# non-empty at configure time, or by adding -multi_module to the
-	# link flags.
-	rm -rf libconftest.dylib*
-	echo "int foo(void){return 1;}" > conftest.c
-	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
--dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
-	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
-        _lt_result=$?
-	# If there is a non-empty error log, and "single_module"
-	# appears in it, assume the flag caused a linker warning
-        if test -s conftest.err && $GREP single_module conftest.err; then
-	  cat conftest.err >&AS_MESSAGE_LOG_FD
-	# Otherwise, if the output was created with a 0 exit code from
-	# the compiler, it worked.
-	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
-	  lt_cv_apple_cc_single_mod=yes
-	else
-	  cat conftest.err >&AS_MESSAGE_LOG_FD
-	fi
-	rm -rf libconftest.dylib*
-	rm -f conftest.*
-      fi])
-
-    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
-      [lt_cv_ld_exported_symbols_list],
-      [lt_cv_ld_exported_symbols_list=no
-      save_LDFLAGS=$LDFLAGS
-      echo "_main" > conftest.sym
-      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-	[lt_cv_ld_exported_symbols_list=yes],
-	[lt_cv_ld_exported_symbols_list=no])
-	LDFLAGS="$save_LDFLAGS"
-    ])
-
-    AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
-      [lt_cv_ld_force_load=no
-      cat > conftest.c << _LT_EOF
-int forced_loaded() { return 2;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
-      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
-      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
-      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
-      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
-      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
-      cat > conftest.c << _LT_EOF
-int main() { return 0;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
-      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
-      _lt_result=$?
-      if test -s conftest.err && $GREP force_load conftest.err; then
-	cat conftest.err >&AS_MESSAGE_LOG_FD
-      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
-	lt_cv_ld_force_load=yes
-      else
-	cat conftest.err >&AS_MESSAGE_LOG_FD
-      fi
-        rm -f conftest.err libconftest.a conftest conftest.c
-        rm -rf conftest.dSYM
-    ])
-    case $host_os in
-    rhapsody* | darwin1.[[012]])
-      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-    darwin1.*)
-      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-    darwin*) # darwin 5.x on
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-	10.[[012]]*)
-	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-	10.*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-      esac
-    ;;
-  esac
-    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-      _lt_dar_single_mod='$single_module'
-    fi
-    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-    else
-      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    fi
-    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
-      _lt_dsymutil='~$DSYMUTIL $lib || :'
-    else
-      _lt_dsymutil=
-    fi
-    ;;
-  esac
-])
-
-
-# _LT_DARWIN_LINKER_FEATURES([TAG])
-# ---------------------------------
-# Checks for linker and compiler features on darwin
-m4_defun([_LT_DARWIN_LINKER_FEATURES],
-[
-  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
-  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-  _LT_TAGVAR(hardcode_direct, $1)=no
-  _LT_TAGVAR(hardcode_automatic, $1)=yes
-  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  if test "$lt_cv_ld_force_load" = "yes"; then
-    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
-                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
-  else
-    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
-  fi
-  _LT_TAGVAR(link_all_deplibs, $1)=yes
-  _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
-  case $cc_basename in
-     ifort*) _lt_dar_can_shared=yes ;;
-     *) _lt_dar_can_shared=$GCC ;;
-  esac
-  if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=func_echo_all
-    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-    m4_if([$1], [CXX],
-[   if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
-      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
-    fi
-],[])
-  else
-  _LT_TAGVAR(ld_shlibs, $1)=no
-  fi
-])
-
-# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
-# ----------------------------------
-# Links a minimal program and checks the executable
-# for the system default hardcoded library path. In most cases,
-# this is /usr/lib:/lib, but when the MPI compilers are used
-# the location of the communication and MPI libs are included too.
-# If we don't find anything, use the default library path according
-# to the aix ld manual.
-# Store the results from the different compilers for each TAGNAME.
-# Allow to override them for all tags through lt_cv_aix_libpath.
-m4_defun([_LT_SYS_MODULE_PATH_AIX],
-[m4_require([_LT_DECL_SED])dnl
-if test "${lt_cv_aix_libpath+set}" = set; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
-  [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
-  lt_aix_libpath_sed='[
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }]'
-  _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
-    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi],[])
-  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
-    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
-  fi
-  ])
-  aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
-fi
-])# _LT_SYS_MODULE_PATH_AIX
-
-
-# _LT_SHELL_INIT(ARG)
-# -------------------
-m4_define([_LT_SHELL_INIT],
-[m4_divert_text([M4SH-INIT], [$1
-])])# _LT_SHELL_INIT
-
-
-
-# _LT_PROG_ECHO_BACKSLASH
-# -----------------------
-# Find how we can fake an echo command that does not interpret backslash.
-# In particular, with Autoconf 2.60 or later we add some code to the start
-# of the generated configure script which will find a shell with a builtin
-# printf (which we can use as an echo command).
-m4_defun([_LT_PROG_ECHO_BACKSLASH],
-[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-
-AC_MSG_CHECKING([how to print strings])
-# Test print first, because it will be a builtin if present.
-if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
-   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='print -r --'
-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='printf %s\n'
-else
-  # Use this function as a fallback that always works.
-  func_fallback_echo ()
-  {
-    eval 'cat <<_LTECHO_EOF
-$[]1
-_LTECHO_EOF'
-  }
-  ECHO='func_fallback_echo'
-fi
-
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
-    $ECHO "$*" 
-}
-
-case "$ECHO" in
-  printf*) AC_MSG_RESULT([printf]) ;;
-  print*) AC_MSG_RESULT([print -r]) ;;
-  *) AC_MSG_RESULT([cat]) ;;
-esac
-
-m4_ifdef([_AS_DETECT_SUGGESTED],
-[_AS_DETECT_SUGGESTED([
-  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
-    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-    PATH=/empty FPATH=/empty; export PATH FPATH
-    test "X`printf %s $ECHO`" = "X$ECHO" \
-      || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
-
-_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
-_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
-])# _LT_PROG_ECHO_BACKSLASH
-
-
-# _LT_WITH_SYSROOT
-# ----------------
-AC_DEFUN([_LT_WITH_SYSROOT],
-[AC_MSG_CHECKING([for sysroot])
-AC_ARG_WITH([sysroot],
-[  --with-sysroot[=DIR] Search for dependent libraries within DIR
-                        (or the compiler's sysroot if not specified).],
-[], [with_sysroot=no])
-
-dnl lt_sysroot will always be passed unquoted.  We quote it here
-dnl in case the user passed a directory name.
-lt_sysroot=
-case ${with_sysroot} in #(
- yes)
-   if test "$GCC" = yes; then
-     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
-   fi
-   ;; #(
- /*)
-   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
-   ;; #(
- no|'')
-   ;; #(
- *)
-   AC_MSG_RESULT([${with_sysroot}])
-   AC_MSG_ERROR([The sysroot must be an absolute path.])
-   ;;
-esac
-
- AC_MSG_RESULT([${lt_sysroot:-no}])
-_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
-[dependent libraries, and in which our libraries should be installed.])])
-
-# _LT_ENABLE_LOCK
-# ---------------
-m4_defun([_LT_ENABLE_LOCK],
-[AC_ARG_ENABLE([libtool-lock],
-  [AS_HELP_STRING([--disable-libtool-lock],
-    [avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
-      *ELF-32*)
-	HPUX_IA64_MODE="32"
-	;;
-      *ELF-64*)
-	HPUX_IA64_MODE="64"
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    if test "$lt_cv_prog_gnu_ld" = yes; then
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -melf32bsmip"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -melf32bmipn32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -melf64bmip"
-	;;
-      esac
-    else
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -32"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -n32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -64"
-	  ;;
-      esac
-    fi
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-      *32-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_i386_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_i386"
-	    ;;
-	  ppc64-*linux*|powerpc64-*linux*)
-	    LD="${LD-ld} -m elf32ppclinux"
-	    ;;
-	  s390x-*linux*)
-	    LD="${LD-ld} -m elf_s390"
-	    ;;
-	  sparc64-*linux*)
-	    LD="${LD-ld} -m elf32_sparc"
-	    ;;
-	esac
-	;;
-      *64-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_x86_64_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_x86_64"
-	    ;;
-	  ppc*-*linux*|powerpc*-*linux*)
-	    LD="${LD-ld} -m elf64ppc"
-	    ;;
-	  s390*-*linux*|s390*-*tpf*)
-	    LD="${LD-ld} -m elf64_s390"
-	    ;;
-	  sparc*-*linux*)
-	    LD="${LD-ld} -m elf64_sparc"
-	    ;;
-	esac
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_PUSH(C)
-     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_POP])
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-*-*solaris*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-    *64-bit*)
-      case $lt_cv_prog_gnu_ld in
-      yes*)
-        case $host in
-        i?86-*-solaris*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        sparc*-*-solaris*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-        esac
-        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
-        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
-          LD="${LD-ld}_sol2"
-        fi
-        ;;
-      *)
-	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-	  LD="${LD-ld} -64"
-	fi
-	;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-esac
-
-need_locks="$enable_libtool_lock"
-])# _LT_ENABLE_LOCK
-
-
-# _LT_PROG_AR
-# -----------
-m4_defun([_LT_PROG_AR],
-[AC_CHECK_TOOLS(AR, [ar], false)
-: ${AR=ar}
-: ${AR_FLAGS=cru}
-_LT_DECL([], [AR], [1], [The archiver])
-_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
-
-AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
-  [lt_cv_ar_at_file=no
-   AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
-     [echo conftest.$ac_objext > conftest.lst
-      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
-      AC_TRY_EVAL([lt_ar_try])
-      if test "$ac_status" -eq 0; then
-	# Ensure the archiver fails upon bogus file names.
-	rm -f conftest.$ac_objext libconftest.a
-	AC_TRY_EVAL([lt_ar_try])
-	if test "$ac_status" -ne 0; then
-          lt_cv_ar_at_file=@
-        fi
-      fi
-      rm -f conftest.* libconftest.a
-     ])
-  ])
-
-if test "x$lt_cv_ar_at_file" = xno; then
-  archiver_list_spec=
-else
-  archiver_list_spec=$lt_cv_ar_at_file
-fi
-_LT_DECL([], [archiver_list_spec], [1],
-  [How to feed a file listing to the archiver])
-])# _LT_PROG_AR
-
-
-# _LT_CMD_OLD_ARCHIVE
-# -------------------
-m4_defun([_LT_CMD_OLD_ARCHIVE],
-[_LT_PROG_AR
-
-AC_CHECK_TOOL(STRIP, strip, :)
-test -z "$STRIP" && STRIP=:
-_LT_DECL([], [STRIP], [1], [A symbol stripping program])
-
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-test -z "$RANLIB" && RANLIB=:
-_LT_DECL([], [RANLIB], [1],
-    [Commands used to install an old-style archive])
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
-    ;;
-  *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
-fi
-
-case $host_os in
-  darwin*)
-    lock_old_archive_extraction=yes ;;
-  *)
-    lock_old_archive_extraction=no ;;
-esac
-_LT_DECL([], [old_postinstall_cmds], [2])
-_LT_DECL([], [old_postuninstall_cmds], [2])
-_LT_TAGDECL([], [old_archive_cmds], [2],
-    [Commands used to build an old-style archive])
-_LT_DECL([], [lock_old_archive_extraction], [0],
-    [Whether to use a lock for old archive extraction])
-])# _LT_CMD_OLD_ARCHIVE
-
-
-# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([_LT_COMPILER_OPTION],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_SED])dnl
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$3"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       $2=yes
-     fi
-   fi
-   $RM conftest*
-])
-
-if test x"[$]$2" = xyes; then
-    m4_if([$5], , :, [$5])
-else
-    m4_if([$6], , :, [$6])
-fi
-])# _LT_COMPILER_OPTION
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
-
-
-# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#                  [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------
-# Check whether the given linker option works
-AC_DEFUN([_LT_LINKER_OPTION],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_SED])dnl
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $3"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&AS_MESSAGE_LOG_FD
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         $2=yes
-       fi
-     else
-       $2=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-])
-
-if test x"[$]$2" = xyes; then
-    m4_if([$4], , :, [$4])
-else
-    m4_if([$5], , :, [$5])
-fi
-])# _LT_LINKER_OPTION
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
-
-
-# LT_CMD_MAX_LEN
-#---------------
-AC_DEFUN([LT_CMD_MAX_LEN],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-# find the maximum length of command line arguments
-AC_MSG_CHECKING([the maximum length of command line arguments])
-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
-  i=0
-  teststring="ABCD"
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
-
-  cygwin* | mingw* | cegcc*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  mint*)
-    # On MiNT this can take a long time and run out of memory.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
-
-  interix*)
-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-    lt_cv_sys_max_cmd_len=196608
-    ;;
-
-  os2*)
-    # The test takes a long time on OS/2.
-    lt_cv_sys_max_cmd_len=8192
-    ;;
-
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  sco3.2v5*)
-    lt_cv_sys_max_cmd_len=102400
-    ;;
-  sysv5* | sco5v6* | sysv4.2uw2*)
-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-    if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[	 ]]//'`
-    else
-      lt_cv_sys_max_cmd_len=32768
-    fi
-    ;;
-  *)
-    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    else
-      # Make teststring a little bigger before we do anything with it.
-      # a 1K string should be a reasonable start.
-      for i in 1 2 3 4 5 6 7 8 ; do
-        teststring=$teststring$teststring
-      done
-      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-      # If test is not a shell built-in, we'll probably end up computing a
-      # maximum length that is only half of the actual maximum length, but
-      # we can't tell.
-      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
-	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
-	      test $i != 17 # 1/2 MB should be enough
-      do
-        i=`expr $i + 1`
-        teststring=$teststring$teststring
-      done
-      # Only check the string length outside the loop.
-      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
-      teststring=
-      # Add a significant safety factor because C++ compilers can tack on
-      # massive amounts of additional arguments before passing them to the
-      # linker.  It appears as though 1/2 is a usable value.
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    fi
-    ;;
-  esac
-])
-if test -n $lt_cv_sys_max_cmd_len ; then
-  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
-else
-  AC_MSG_RESULT(none)
-fi
-max_cmd_len=$lt_cv_sys_max_cmd_len
-_LT_DECL([], [max_cmd_len], [0],
-    [What is the maximum length of a command?])
-])# LT_CMD_MAX_LEN
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
-
-
-# _LT_HEADER_DLFCN
-# ----------------
-m4_defun([_LT_HEADER_DLFCN],
-[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
-])# _LT_HEADER_DLFCN
-
-
-# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ----------------------------------------------------------------
-m4_defun([_LT_TRY_DLOPEN_SELF],
-[m4_require([_LT_HEADER_DLFCN])dnl
-if test "$cross_compiling" = yes; then :
-  [$4]
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
-[#line $LINENO "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-/* When -fvisbility=hidden is used, assume the code has been annotated
-   correspondingly for the symbols needed.  */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
-#endif
-
-int fnord () { return 42; }
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else
-        {
-	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-          else puts (dlerror ());
-	}
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-  return status;
-}]
-_LT_EOF
-  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) $1 ;;
-      x$lt_dlneed_uscore) $2 ;;
-      x$lt_dlunknown|x*) $3 ;;
-    esac
-  else :
-    # compilation failed
-    $3
-  fi
-fi
-rm -fr conftest*
-])# _LT_TRY_DLOPEN_SELF
-
-
-# LT_SYS_DLOPEN_SELF
-# ------------------
-AC_DEFUN([LT_SYS_DLOPEN_SELF],
-[m4_require([_LT_HEADER_DLFCN])dnl
-if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32* | cegcc*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-    ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-    ;;
-
-  darwin*)
-  # if libdl is installed we need to link against it
-    AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ])
-    ;;
-
-  *)
-    AC_CHECK_FUNC([shl_load],
-	  [lt_cv_dlopen="shl_load"],
-      [AC_CHECK_LIB([dld], [shl_load],
-	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
-	[AC_CHECK_FUNC([dlopen],
-	      [lt_cv_dlopen="dlopen"],
-	  [AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
-	    [AC_CHECK_LIB([svld], [dlopen],
-		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
-	      [AC_CHECK_LIB([dld], [dld_link],
-		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
-	      ])
-	    ])
-	  ])
-	])
-      ])
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    AC_CACHE_CHECK([whether a program can dlopen itself],
-	  lt_cv_dlopen_self, [dnl
-	  _LT_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
-	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
-    ])
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
-	  lt_cv_dlopen_self_static, [dnl
-	  _LT_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
-	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
-      ])
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-_LT_DECL([dlopen_support], [enable_dlopen], [0],
-	 [Whether dlopen is supported])
-_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
-	 [Whether dlopen of programs is supported])
-_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
-	 [Whether dlopen of statically linked programs is supported])
-])# LT_SYS_DLOPEN_SELF
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
-
-
-# _LT_COMPILER_C_O([TAGNAME])
-# ---------------------------
-# Check to see if options -c and -o are simultaneously supported by compiler.
-# This macro does not hard code the compiler like AC_PROG_CC_C_O.
-m4_defun([_LT_COMPILER_C_O],
-[m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
-  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
-  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-     fi
-   fi
-   chmod u+w . 2>&AS_MESSAGE_LOG_FD
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-])
-_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
-	[Does compiler simultaneously support -c and -o options?])
-])# _LT_COMPILER_C_O
-
-
-# _LT_COMPILER_FILE_LOCKS([TAGNAME])
-# ----------------------------------
-# Check to see if we can do hard links to lock some files if needed
-m4_defun([_LT_COMPILER_FILE_LOCKS],
-[m4_require([_LT_ENABLE_LOCK])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-_LT_COMPILER_C_O([$1])
-
-hard_links="nottested"
-if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  AC_MSG_CHECKING([if we can lock with hard links])
-  hard_links=yes
-  $RM conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  AC_MSG_RESULT([$hard_links])
-  if test "$hard_links" = no; then
-    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
-])# _LT_COMPILER_FILE_LOCKS
-
-
-# _LT_CHECK_OBJDIR
-# ----------------
-m4_defun([_LT_CHECK_OBJDIR],
-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
-[rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null])
-objdir=$lt_cv_objdir
-_LT_DECL([], [objdir], [0],
-         [The name of the directory that contains temporary libtool files])dnl
-m4_pattern_allow([LT_OBJDIR])dnl
-AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
-  [Define to the sub-directory in which libtool stores uninstalled libraries.])
-])# _LT_CHECK_OBJDIR
-
-
-# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
-# --------------------------------------
-# Check hardcoding attributes.
-m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
-[AC_MSG_CHECKING([how to hardcode library paths into programs])
-_LT_TAGVAR(hardcode_action, $1)=
-if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
-   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
-   test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
-
-  # We can hardcode non-existent directories.
-  if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
-     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
-    # Linking always hardcodes the temporary library directory.
-    _LT_TAGVAR(hardcode_action, $1)=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    _LT_TAGVAR(hardcode_action, $1)=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  _LT_TAGVAR(hardcode_action, $1)=unsupported
-fi
-AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
-
-if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
-   test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-_LT_TAGDECL([], [hardcode_action], [0],
-    [How to hardcode a shared library path into an executable])
-])# _LT_LINKER_HARDCODE_LIBPATH
-
-
-# _LT_CMD_STRIPLIB
-# ----------------
-m4_defun([_LT_CMD_STRIPLIB],
-[m4_require([_LT_DECL_EGREP])
-striplib=
-old_striplib=
-AC_MSG_CHECKING([whether stripping libraries is possible])
-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  AC_MSG_RESULT([yes])
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-  darwin*)
-    if test -n "$STRIP" ; then
-      striplib="$STRIP -x"
-      old_striplib="$STRIP -S"
-      AC_MSG_RESULT([yes])
-    else
-      AC_MSG_RESULT([no])
-    fi
-    ;;
-  *)
-    AC_MSG_RESULT([no])
-    ;;
-  esac
-fi
-_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
-_LT_DECL([], [striplib], [1])
-])# _LT_CMD_STRIPLIB
-
-
-# _LT_SYS_DYNAMIC_LINKER([TAG])
-# -----------------------------
-# PORTME Fill in your ld.so characteristics
-m4_defun([_LT_SYS_DYNAMIC_LINKER],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_OBJDUMP])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_CHECK_SHELL_FEATURES])dnl
-AC_MSG_CHECKING([dynamic linker characteristics])
-m4_if([$1],
-	[], [
-if test "$GCC" = yes; then
-  case $host_os in
-    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-    *) lt_awk_arg="/^libraries:/" ;;
-  esac
-  case $host_os in
-    mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
-    *) lt_sed_strip_eq="s,=/,/,g" ;;
-  esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
-  case $lt_search_path_spec in
-  *\;*)
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
-    ;;
-  *)
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
-    ;;
-  esac
-  # Ok, now we have the path, separated by spaces, we can step through it
-  # and add multilib dir if necessary.
-  lt_tmp_lt_search_path_spec=
-  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-  for lt_sys_path in $lt_search_path_spec; do
-    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-    else
-      test -d "$lt_sys_path" && \
-	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-    fi
-  done
-  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
-BEGIN {RS=" "; FS="/|\n";} {
-  lt_foo="";
-  lt_count=0;
-  for (lt_i = NF; lt_i > 0; lt_i--) {
-    if ($lt_i != "" && $lt_i != ".") {
-      if ($lt_i == "..") {
-        lt_count++;
-      } else {
-        if (lt_count == 0) {
-          lt_foo="/" $lt_i lt_foo;
-        } else {
-          lt_count--;
-        }
-      }
-    }
-  }
-  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
-  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
-}'`
-  # AWK program above erroneously prepends '/' to C:/dos/paths
-  # for these hosts.
-  case $host_os in
-    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
-      $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
-  esac
-  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi])
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix[[4-9]]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[[01]] | aix4.[[01]].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  case $host_cpu in
-  powerpc)
-    # Since July 2007 AmigaOS4 officially supports .so libraries.
-    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    ;;
-  m68k)
-    library_names_spec='$libname.ixlibrary $libname.a'
-    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-    ;;
-  esac
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[[45]]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32* | cegcc*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$cc_basename in
-  yes,*)
-    # gcc
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname~
-      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-      fi'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-m4_if([$1], [],[
-      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
-      ;;
-    mingw* | cegcc*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    dynamic_linker='Win32 ld.exe'
-    ;;
-
-  *,cl*)
-    # Native MSVC
-    libname_spec='$name'
-    soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-    library_names_spec='${libname}.dll.lib'
-
-    case $build_os in
-    mingw*)
-      sys_lib_search_path_spec=
-      lt_save_ifs=$IFS
-      IFS=';'
-      for lt_path in $LIB
-      do
-        IFS=$lt_save_ifs
-        # Let DOS variable expansion print the short 8.3 style file name.
-        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
-        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
-      done
-      IFS=$lt_save_ifs
-      # Convert to MSYS style.
-      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
-      ;;
-    cygwin*)
-      # Convert to unix form, then to dos form, then back to unix form
-      # but this time dos style (no spaces!) so that the unix form looks
-      # like /cygdrive/c/PROGRA~1:/cygdr...
-      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
-      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
-      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      ;;
-    *)
-      sys_lib_search_path_spec="$LIB"
-      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
-        # It is most probably a Windows format PATH.
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      # FIXME: find the short name or the path components, as spaces are
-      # common. (e.g. "Program Files" -> "PROGRA~1")
-      ;;
-    esac
-
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-    dynamic_linker='Win32 link.exe'
-    ;;
-
-  *)
-    # Assume MSVC wrapper
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    dynamic_linker='Win32 ld.exe'
-    ;;
-  esac
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-m4_if([$1], [],[
-  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[[23]].*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2.*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
-  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-haiku*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  dynamic_linker="$host_os runtime_loader"
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  hppa*64*)
-    shrext_cmds='.sl'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
-  postinstall_cmds='chmod 555 $lib'
-  # or fails outright, so override atomically:
-  install_override_mode=555
-  ;;
-
-interix[[3-9]]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux # correct to gnu/linux during the next big refactor
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-
-  # Some binutils ld are patched to set DT_RUNPATH
-  AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
-    [lt_cv_shlibpath_overrides_runpath=no
-    save_LDFLAGS=$LDFLAGS
-    save_libdir=$libdir
-    eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
-	 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
-    AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-      [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
-	 [lt_cv_shlibpath_overrides_runpath=yes])])
-    LDFLAGS=$save_LDFLAGS
-    libdir=$save_libdir
-    ])
-  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
-
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-*nto* | *qnx*)
-  version_type=qnx
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='ldqnx.so'
-  ;;
-
-openbsd*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-    *)				need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[[89]] | openbsd2.[[89]].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-rdos*)
-  dynamic_linker=no
-  ;;
-
-solaris*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux # correct to gnu/linux during the next big refactor
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-tpf*)
-  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-uts4*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-AC_MSG_RESULT([$dynamic_linker])
-test "$dynamic_linker" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-fi
-
-_LT_DECL([], [variables_saved_for_relink], [1],
-    [Variables whose values should be saved in libtool wrapper scripts and
-    restored at link time])
-_LT_DECL([], [need_lib_prefix], [0],
-    [Do we need the "lib" prefix for modules?])
-_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
-_LT_DECL([], [version_type], [0], [Library versioning type])
-_LT_DECL([], [runpath_var], [0],  [Shared library runtime path variable])
-_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
-_LT_DECL([], [shlibpath_overrides_runpath], [0],
-    [Is shlibpath searched before the hard-coded library search path?])
-_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
-_LT_DECL([], [library_names_spec], [1],
-    [[List of archive names.  First name is the real one, the rest are links.
-    The last name is the one that the linker finds with -lNAME]])
-_LT_DECL([], [soname_spec], [1],
-    [[The coded name of the library, if different from the real name]])
-_LT_DECL([], [install_override_mode], [1],
-    [Permission mode override for installation of shared libraries])
-_LT_DECL([], [postinstall_cmds], [2],
-    [Command to use after installation of a shared archive])
-_LT_DECL([], [postuninstall_cmds], [2],
-    [Command to use after uninstallation of a shared archive])
-_LT_DECL([], [finish_cmds], [2],
-    [Commands used to finish a libtool library installation in a directory])
-_LT_DECL([], [finish_eval], [1],
-    [[As "finish_cmds", except a single script fragment to be evaled but
-    not shown]])
-_LT_DECL([], [hardcode_into_libs], [0],
-    [Whether we should hardcode library paths into libraries])
-_LT_DECL([], [sys_lib_search_path_spec], [2],
-    [Compile-time system search path for libraries])
-_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
-    [Run-time system search path for libraries])
-])# _LT_SYS_DYNAMIC_LINKER
-
-
-# _LT_PATH_TOOL_PREFIX(TOOL)
-# --------------------------
-# find a file program which can recognize shared library
-AC_DEFUN([_LT_PATH_TOOL_PREFIX],
-[m4_require([_LT_DECL_EGREP])dnl
-AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-[[\\/*] |  ?:[\\/]*])
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="m4_if([$2], , $PATH, [$2])"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
-else
-  AC_MSG_RESULT(no)
-fi
-_LT_DECL([], [MAGIC_CMD], [0],
-	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
-])# _LT_PATH_TOOL_PREFIX
-
-# Old name:
-AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
-
-
-# _LT_PATH_MAGIC
-# --------------
-# find a file program which can recognize a shared library
-m4_defun([_LT_PATH_MAGIC],
-[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-])# _LT_PATH_MAGIC
-
-
-# LT_PATH_LD
-# ----------
-# find the pathname to the GNU or non-GNU linker
-AC_DEFUN([LT_PATH_LD],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
-
-AC_ARG_WITH([gnu-ld],
-    [AS_HELP_STRING([--with-gnu-ld],
-	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
-    [test "$withval" = no || with_gnu_ld=yes],
-    [with_gnu_ld=no])dnl
-
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by $CC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]]* | ?:[[\\/]]*)
-      re_direlt='/[[^/]][[^/]]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
-      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(lt_cv_path_LD,
-[if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
-	;;
-      *)
-	test "$with_gnu_ld" != yes && break
-	;;
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-_LT_PATH_LD_GNU
-AC_SUBST([LD])
-
-_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
-])# LT_PATH_LD
-
-# Old names:
-AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
-AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_PROG_LD], [])
-dnl AC_DEFUN([AC_PROG_LD], [])
-
-
-# _LT_PATH_LD_GNU
-#- --------------
-m4_defun([_LT_PATH_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])# _LT_PATH_LD_GNU
-
-
-# _LT_CMD_RELOAD
-# --------------
-# find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-m4_defun([_LT_CMD_RELOAD],
-[AC_CACHE_CHECK([for $LD option to reload object files],
-  lt_cv_ld_reload_flag,
-  [lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    if test "$GCC" != yes; then
-      reload_cmds=false
-    fi
-    ;;
-  darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
-esac
-_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
-_LT_TAGDECL([], [reload_cmds], [2])dnl
-])# _LT_CMD_RELOAD
-
-
-# _LT_CHECK_MAGIC_METHOD
-# ----------------------
-# how to check for library dependencies
-#  -- PORTME fill in with the dynamic library characteristics
-m4_defun([_LT_CHECK_MAGIC_METHOD],
-[m4_require([_LT_DECL_EGREP])
-m4_require([_LT_DECL_OBJDUMP])
-AC_CACHE_CHECK([how to recognize dependent libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix[[4-9]]*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi[[45]]*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin*)
-  # func_win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='func_win32_libid'
-  ;;
-
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump',
-  # unless we find 'file', for example because we are cross-compiling.
-  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
-  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
-    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-    lt_cv_file_magic_cmd='func_win32_libid'
-  else
-    # Keep this pattern in sync with the one in func_win32_libid.
-    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
-    lt_cv_file_magic_cmd='$OBJDUMP -f'
-  fi
-  ;;
-
-cegcc*)
-  # use the weaker test based on 'objdump'. See mingw*.
-  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-freebsd* | dragonfly*)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-haiku*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case $host_cpu in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
-interix[[3-9]]*)
-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
-  fi
-  ;;
-
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-*nto* | *qnx*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-openbsd*)
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-rdos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.3*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  pc)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-tpf*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-])
-
-file_magic_glob=
-want_nocaseglob=no
-if test "$build" = "$host"; then
-  case $host_os in
-  mingw* | pw32*)
-    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
-      want_nocaseglob=yes
-    else
-      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
-    fi
-    ;;
-  esac
-fi
-
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-_LT_DECL([], [deplibs_check_method], [1],
-    [Method to check whether dependent libraries are shared objects])
-_LT_DECL([], [file_magic_cmd], [1],
-    [Command to use when deplibs_check_method = "file_magic"])
-_LT_DECL([], [file_magic_glob], [1],
-    [How to find potential files when deplibs_check_method = "file_magic"])
-_LT_DECL([], [want_nocaseglob], [1],
-    [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
-])# _LT_CHECK_MAGIC_METHOD
-
-
-# LT_PATH_NM
-# ----------
-# find the pathname to a BSD- or MS-compatible name lister
-AC_DEFUN([LT_PATH_NM],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
-[if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-    lt_nm_to_check="$lt_nm_to_check nm"
-  fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS="$lt_save_ifs"
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm="$ac_dir/$lt_tmp_nm"
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
-	#   nm: unknown option "B" ignored
-	# Tru64's nm complains that /dev/null is an invalid object file
-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-	*/dev/null* | *'Invalid file or object type'*)
-	  lt_cv_path_NM="$tmp_nm -B"
-	  break
-	  ;;
-	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	  */dev/null*)
-	    lt_cv_path_NM="$tmp_nm -p"
-	    break
-	    ;;
-	  *)
-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	    continue # so that we can try to find one that supports BSD flags
-	    ;;
-	  esac
-	  ;;
-	esac
-      fi
-    done
-    IFS="$lt_save_ifs"
-  done
-  : ${lt_cv_path_NM=no}
-fi])
-if test "$lt_cv_path_NM" != "no"; then
-  NM="$lt_cv_path_NM"
-else
-  # Didn't find any BSD compatible name lister, look for dumpbin.
-  if test -n "$DUMPBIN"; then :
-    # Let the user override the test.
-  else
-    AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
-    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
-    *COFF*)
-      DUMPBIN="$DUMPBIN -symbols"
-      ;;
-    *)
-      DUMPBIN=:
-      ;;
-    esac
-  fi
-  AC_SUBST([DUMPBIN])
-  if test "$DUMPBIN" != ":"; then
-    NM="$DUMPBIN"
-  fi
-fi
-test -z "$NM" && NM=nm
-AC_SUBST([NM])
-_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
-
-AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
-  [lt_cv_nm_interface="BSD nm"
-  echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
-  (eval "$ac_compile" 2>conftest.err)
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
-  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
-  cat conftest.out >&AS_MESSAGE_LOG_FD
-  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-    lt_cv_nm_interface="MS dumpbin"
-  fi
-  rm -f conftest*])
-])# LT_PATH_NM
-
-# Old names:
-AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
-AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_PROG_NM], [])
-dnl AC_DEFUN([AC_PROG_NM], [])
-
-# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
-# --------------------------------
-# how to determine the name of the shared library
-# associated with a specific link library.
-#  -- PORTME fill in with the dynamic library characteristics
-m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
-[m4_require([_LT_DECL_EGREP])
-m4_require([_LT_DECL_OBJDUMP])
-m4_require([_LT_DECL_DLLTOOL])
-AC_CACHE_CHECK([how to associate runtime and link libraries],
-lt_cv_sharedlib_from_linklib_cmd,
-[lt_cv_sharedlib_from_linklib_cmd='unknown'
-
-case $host_os in
-cygwin* | mingw* | pw32* | cegcc*)
-  # two different shell functions defined in ltmain.sh
-  # decide which to use based on capabilities of $DLLTOOL
-  case `$DLLTOOL --help 2>&1` in
-  *--identify-strict*)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
-    ;;
-  *)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
-    ;;
-  esac
-  ;;
-*)
-  # fallback: assume linklib IS sharedlib
-  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
-  ;;
-esac
-])
-sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
-test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
-
-_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
-    [Command to associate shared and link libraries])
-])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
-
-
-# _LT_PATH_MANIFEST_TOOL
-# ----------------------
-# locate the manifest tool
-m4_defun([_LT_PATH_MANIFEST_TOOL],
-[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
-test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
-  [lt_cv_path_mainfest_tool=no
-  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
-  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
-    lt_cv_path_mainfest_tool=yes
-  fi
-  rm -f conftest*])
-if test "x$lt_cv_path_mainfest_tool" != xyes; then
-  MANIFEST_TOOL=:
-fi
-_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
-])# _LT_PATH_MANIFEST_TOOL
-
-
-# LT_LIB_M
-# --------
-# check for math library
-AC_DEFUN([LT_LIB_M],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-LIBM=
-case $host in
-*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
-  # These system don't have libm, or don't need it
-  ;;
-*-ncr-sysv4.3*)
-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
-  ;;
-*)
-  AC_CHECK_LIB(m, cos, LIBM="-lm")
-  ;;
-esac
-AC_SUBST([LIBM])
-])# LT_LIB_M
-
-# Old name:
-AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_CHECK_LIBM], [])
-
-
-# _LT_COMPILER_NO_RTTI([TAGNAME])
-# -------------------------------
-m4_defun([_LT_COMPILER_NO_RTTI],
-[m4_require([_LT_TAG_COMPILER])dnl
-
-_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-
-if test "$GCC" = yes; then
-  case $cc_basename in
-  nvcc*)
-    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
-  *)
-    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
-  esac
-
-  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
-    lt_cv_prog_compiler_rtti_exceptions,
-    [-fno-rtti -fno-exceptions], [],
-    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
-fi
-_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
-	[Compiler flag to turn off builtin functions])
-])# _LT_COMPILER_NO_RTTI
-
-
-# _LT_CMD_GLOBAL_SYMBOLS
-# ----------------------
-m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-AC_REQUIRE([LT_PATH_LD])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-AC_MSG_CHECKING([command to parse $NM output from $compiler object])
-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
-[
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[[BCDEGRST]]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
-
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[[BCDT]]'
-  ;;
-cygwin* | mingw* | pw32* | cegcc*)
-  symcode='[[ABCDGISTW]]'
-  ;;
-hpux*)
-  if test "$host_cpu" = ia64; then
-    symcode='[[ABCDEGRST]]'
-  fi
-  ;;
-irix* | nonstopux*)
-  symcode='[[BCDEGRST]]'
-  ;;
-osf*)
-  symcode='[[BCDEGQRST]]'
-  ;;
-solaris*)
-  symcode='[[BDRT]]'
-  ;;
-sco3.2v5*)
-  symcode='[[DT]]'
-  ;;
-sysv4.2uw2*)
-  symcode='[[DT]]'
-  ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
-  symcode='[[ABDT]]'
-  ;;
-sysv4)
-  symcode='[[DFNSTU]]'
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[[ABCDGIRSTW]]' ;;
-esac
-
-# Transform an extracted symbol line into a proper C declaration.
-# Some systems (esp. on ia64) link data and code symbols differently,
-# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
-
-# Try without a prefix underscore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\2"
-
-  # Write the raw and C identifiers.
-  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-    # Fake it for dumpbin and say T for any non-static function
-    # and D for any global variable.
-    # Also find C++ and __fastcall symbols from MSVC++,
-    # which start with @ or ?.
-    lt_cv_sys_global_symbol_pipe="$AWK ['"\
-"     {last_section=section; section=\$ 3};"\
-"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
-"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-"     \$ 0!~/External *\|/{next};"\
-"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-"     {if(hide[section]) next};"\
-"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
-"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
-"     ' prfx=^$ac_symprfx]"
-  else
-    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-  fi
-  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<_LT_EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(void);
-void nm_test_func(void){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-_LT_EOF
-
-  if AC_TRY_EVAL(ac_compile); then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
-	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<_LT_EOF > conftest.$ac_ext
-/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
-   relocations are performed -- see ld's documentation on pseudo-relocs.  */
-# define LT@&t@_DLSYM_CONST
-#elif defined(__osf__)
-/* This system does not cope well with relocations in const data.  */
-# define LT@&t@_DLSYM_CONST
-#else
-# define LT@&t@_DLSYM_CONST const
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-_LT_EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
-
-	  cat <<_LT_EOF >> conftest.$ac_ext
-
-/* The mapping between symbol names and symbols.  */
-LT@&t@_DLSYM_CONST struct {
-  const char *name;
-  void       *address;
-}
-lt__PROGRAM__LTX_preloaded_symbols[[]] =
-{
-  { "@PROGRAM@", (void *) 0 },
-_LT_EOF
-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
-	  cat <<\_LT_EOF >> conftest.$ac_ext
-  {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt__PROGRAM__LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-_LT_EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_globsym_save_LIBS=$LIBS
-	  lt_globsym_save_CFLAGS=$CFLAGS
-	  LIBS="conftstm.$ac_objext"
-	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
-	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
-	    pipe_works=yes
-	  fi
-	  LIBS=$lt_globsym_save_LIBS
-	  CFLAGS=$lt_globsym_save_CFLAGS
-	else
-	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
-    fi
-  else
-    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
-    cat conftest.$ac_ext >&5
-  fi
-  rm -rf conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
-])
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  AC_MSG_RESULT(failed)
-else
-  AC_MSG_RESULT(ok)
-fi
-
-# Response file support.
-if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-  nm_file_list_spec='@'
-elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
-  nm_file_list_spec='@'
-fi
-
-_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
-    [Take the output of nm and produce a listing of raw symbols and C names])
-_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
-    [Transform the output of nm in a proper C declaration])
-_LT_DECL([global_symbol_to_c_name_address],
-    [lt_cv_sys_global_symbol_to_c_name_address], [1],
-    [Transform the output of nm in a C name address pair])
-_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
-    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
-    [Transform the output of nm in a C name address pair when lib prefix is needed])
-_LT_DECL([], [nm_file_list_spec], [1],
-    [Specify filename containing input files for $NM])
-]) # _LT_CMD_GLOBAL_SYMBOLS
-
-
-# _LT_COMPILER_PIC([TAGNAME])
-# ---------------------------
-m4_defun([_LT_COMPILER_PIC],
-[m4_require([_LT_TAG_COMPILER])dnl
-_LT_TAGVAR(lt_prog_compiler_wl, $1)=
-_LT_TAGVAR(lt_prog_compiler_pic, $1)=
-_LT_TAGVAR(lt_prog_compiler_static, $1)=
-
-m4_if([$1], [CXX], [
-  # C++ specific cases for pic, static, wl, etc.
-  if test "$GXX" = yes; then
-    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-    aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-    mingw* | cygwin* | os2* | pw32* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      m4_if([$1], [GCJ], [],
-	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-    *djgpp*)
-      # DJGPP does not support shared libraries at all
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-      ;;
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)=
-      ;;
-    interix[[3-9]]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-    *qnx* | *nto*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-    *)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-  else
-    case $host_os in
-      aix[[4-9]]*)
-	# All AIX code is PIC.
-	if test "$host_cpu" = ia64; then
-	  # AIX 5 now supports IA64 processor
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	else
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-	fi
-	;;
-      chorus*)
-	case $cc_basename in
-	cxch68*)
-	  # Green Hills C++ Compiler
-	  # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-	  ;;
-	esac
-	;;
-      mingw* | cygwin* | os2* | pw32* | cegcc*)
-	# This hack is so that the source file can tell whether it is being
-	# built for inclusion in a dll (and should export symbols for example).
-	m4_if([$1], [GCJ], [],
-	  [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-	;;
-      dgux*)
-	case $cc_basename in
-	  ec++*)
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  ghcx*)
-	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      freebsd* | dragonfly*)
-	# FreeBSD uses GNU C++
-	;;
-      hpux9* | hpux10* | hpux11*)
-	case $cc_basename in
-	  CC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-	    if test "$host_cpu" != ia64; then
-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	    fi
-	    ;;
-	  aCC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-	    case $host_cpu in
-	    hppa*64*|ia64*)
-	      # +Z the default
-	      ;;
-	    *)
-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	      ;;
-	    esac
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      interix*)
-	# This is c89, which is MS Visual C++ (no shared libs)
-	# Anyone wants to do a port?
-	;;
-      irix5* | irix6* | nonstopux*)
-	case $cc_basename in
-	  CC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    # CC pic flag -KPIC is the default.
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
-	case $cc_basename in
-	  KCC*)
-	    # KAI C++ Compiler
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	    ;;
-	  ecpc* )
-	    # old Intel C++ for x86_64 which still supported -KPIC.
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	    ;;
-	  icpc* )
-	    # Intel C++, used to be incompatible with GCC.
-	    # ICC 10 doesn't accept -KPIC any more.
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	    ;;
-	  pgCC* | pgcpp*)
-	    # Portland Group C++ compiler
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  cxx*)
-	    # Compaq C++
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
-	    # IBM XL 8.0, 9.0 on PPC and BlueGene
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-	    ;;
-	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
-	    *Sun\ C*)
-	      # Sun C++ 5.9
-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	      ;;
-	    esac
-	    ;;
-	esac
-	;;
-      lynxos*)
-	;;
-      m88k*)
-	;;
-      mvs*)
-	case $cc_basename in
-	  cxx*)
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      netbsd*)
-	;;
-      *qnx* | *nto*)
-        # QNX uses GNU C++, but need to define -shared option too, otherwise
-        # it will coredump.
-        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-        ;;
-      osf3* | osf4* | osf5*)
-	case $cc_basename in
-	  KCC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    ;;
-	  RCC*)
-	    # Rational C++ 2.4.1
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  cxx*)
-	    # Digital/Compaq C++
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      psos*)
-	;;
-      solaris*)
-	case $cc_basename in
-	  CC* | sunCC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	    ;;
-	  gcx*)
-	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sunos4*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.x
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  lcc*)
-	    # Lucid
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-	case $cc_basename in
-	  CC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	esac
-	;;
-      tandem*)
-	case $cc_basename in
-	  NCC*)
-	    # NonStop-UX NCC 3.20
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      vxworks*)
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-	;;
-    esac
-  fi
-],
-[
-  if test "$GCC" = yes; then
-    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      m4_if([$1], [GCJ], [],
-	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)=
-      ;;
-
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-	# +Z the default
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-
-    interix[[3-9]]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      enable_shared=no
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-
-    *)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-
-    case $cc_basename in
-    nvcc*) # Cuda Compiler Driver 2.2
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
-      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
-        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
-      fi
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      else
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      m4_if([$1], [GCJ], [],
-	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC (with -KPIC) is the default.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
-      case $cc_basename in
-      # old Intel for x86_64 which still supported -KPIC.
-      ecc*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-        ;;
-      # icc used to be incompatible with GCC.
-      # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-        ;;
-      # Lahey Fortran 8.1.
-      lf95*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
-	;;
-      nagfor*)
-	# NAG Fortran compiler
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	;;
-      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-        ;;
-      ccc*)
-        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-        # All Alpha code is PIC.
-        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-        ;;
-      xl* | bgxl* | bgf* | mpixl*)
-	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-	;;
-      *)
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
-	  ;;
-	*Sun\ F* | *Sun*Fortran*)
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	  ;;
-	*Sun\ C*)
-	  # Sun C 5.9
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	  ;;
-        *Intel*\ [[CF]]*Compiler*)
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	  ;;
-	*Portland\ Group*)
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  ;;
-	esac
-	;;
-      esac
-      ;;
-
-    newsos6)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-
-    osf3* | osf4* | osf5*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # All OSF/1 code is PIC.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    rdos*)
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    solaris*)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    unicos*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-
-    uts4*)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    *)
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-    esac
-  fi
-])
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-    ;;
-  *)
-    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
-    ;;
-esac
-
-AC_CACHE_CHECK([for $compiler option to produce PIC],
-  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
-  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
-_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
-  _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
-    [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
-    [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
-    [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
-     "" | " "*) ;;
-     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
-     esac],
-    [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
-     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
-fi
-_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
-	[Additional compiler flags for building library objects])
-
-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
-	[How to pass a linker flag through the compiler])
-#
-# Check to make sure the static flag actually works.
-#
-wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
-_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
-  $lt_tmp_static_flag,
-  [],
-  [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
-_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
-	[Compiler flag to prevent dynamic linking])
-])# _LT_COMPILER_PIC
-
-
-# _LT_LINKER_SHLIBS([TAGNAME])
-# ----------------------------
-# See if the linker supports building shared libraries.
-m4_defun([_LT_LINKER_SHLIBS],
-[AC_REQUIRE([LT_PATH_LD])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-m4_require([_LT_PATH_MANIFEST_TOOL])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-m4_if([$1], [CXX], [
-  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-  case $host_os in
-  aix[[4-9]]*)
-    # If we're using GNU nm, then we don't want the "-C" option.
-    # -C means demangle to AIX nm, but means don't demangle with GNU nm
-    # Also, AIX nm treats weak defined symbols like other global defined
-    # symbols, whereas GNU nm marks them as "W".
-    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-    else
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-    fi
-    ;;
-  pw32*)
-    _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-    ;;
-  cygwin* | mingw* | cegcc*)
-    case $cc_basename in
-    cl*)
-      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-      ;;
-    *)
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
-      ;;
-    esac
-    ;;
-  *)
-    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-    ;;
-  esac
-], [
-  runpath_var=
-  _LT_TAGVAR(allow_undefined_flag, $1)=
-  _LT_TAGVAR(always_export_symbols, $1)=no
-  _LT_TAGVAR(archive_cmds, $1)=
-  _LT_TAGVAR(archive_expsym_cmds, $1)=
-  _LT_TAGVAR(compiler_needs_object, $1)=no
-  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
-  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  _LT_TAGVAR(hardcode_automatic, $1)=no
-  _LT_TAGVAR(hardcode_direct, $1)=no
-  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
-  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_TAGVAR(hardcode_libdir_separator, $1)=
-  _LT_TAGVAR(hardcode_minus_L, $1)=no
-  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  _LT_TAGVAR(inherit_rpath, $1)=no
-  _LT_TAGVAR(link_all_deplibs, $1)=unknown
-  _LT_TAGVAR(module_cmds, $1)=
-  _LT_TAGVAR(module_expsym_cmds, $1)=
-  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
-  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
-  _LT_TAGVAR(thread_safe_flag_spec, $1)=
-  _LT_TAGVAR(whole_archive_flag_spec, $1)=
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  _LT_TAGVAR(include_expsyms, $1)=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  # Exclude shared library initialization/finalization symbols.
-dnl Note also adjust exclude_expsyms for C++ above.
-  extract_expsyms_cmds=
-
-  case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  esac
-
-  _LT_TAGVAR(ld_shlibs, $1)=yes
-
-  # On some targets, GNU ld is compatible enough with the native linker
-  # that we're better off using the native interface for both.
-  lt_use_gnu_ld_interface=no
-  if test "$with_gnu_ld" = yes; then
-    case $host_os in
-      aix*)
-	# The AIX port of GNU ld has always aspired to compatibility
-	# with the native linker.  However, as the warning in the GNU ld
-	# block says, versions before 2.19.5* couldn't really create working
-	# shared libraries, regardless of the interface used.
-	case `$LD -v 2>&1` in
-	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
-	  *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
-	  *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
-	  *)
-	    lt_use_gnu_ld_interface=yes
-	    ;;
-	esac
-	;;
-      *)
-	lt_use_gnu_ld_interface=yes
-	;;
-    esac
-  fi
-
-  if test "$lt_use_gnu_ld_interface" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-      _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      _LT_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>&1` in
-      *GNU\ gold*) supports_anon_versioning=yes ;;
-      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix[[3-9]]*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.19, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to install binutils
-*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
-*** You will then need to restart the configuration process.
-
-_LT_EOF
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            _LT_TAGVAR(archive_expsym_cmds, $1)=''
-        ;;
-      m68k)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes
-        ;;
-      esac
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-      # as there is no search path for DLLs.
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(always_export_symbols, $1)=no
-      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
-
-      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    haiku*)
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    interix[[3-9]]*)
-      _LT_TAGVAR(hardcode_direct, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
-
-    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-      tmp_diet=no
-      if test "$host_os" = linux-dietlibc; then
-	case $cc_basename in
-	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
-	esac
-      fi
-      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-	 && test "$tmp_diet" = no
-      then
-	tmp_addflag=' $pic_flag'
-	tmp_sharedflag='-shared'
-	case $cc_basename,$host_cpu in
-        pgcc*)				# Portland Group C compiler
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95* | pgfortran*)
-					# Portland Group f77 and f90 compilers
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
-	  tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	  tmp_addflag=' -nofor_main' ;;
-	lf95*)				# Lahey Fortran 8.1
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
-	  tmp_sharedflag='--shared' ;;
-	xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
-	  tmp_sharedflag='-qmkshrobj'
-	  tmp_addflag= ;;
-	nvcc*)	# Cuda Compiler Driver 2.2
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  _LT_TAGVAR(compiler_needs_object, $1)=yes
-	  ;;
-	esac
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)			# Sun C 5.9
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  _LT_TAGVAR(compiler_needs_object, $1)=yes
-	  tmp_sharedflag='-G' ;;
-	*Sun\ F*)			# Sun Fortran 8.3
-	  tmp_sharedflag='-G' ;;
-	esac
-	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
-        if test "x$supports_anon_versioning" = xyes; then
-          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	    echo "local: *; };" >> $output_objdir/$libname.ver~
-	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-        fi
-
-	case $cc_basename in
-	xlf* | bgf* | bgxlf* | mpixlf*)
-	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
-	  if test "x$supports_anon_versioning" = xyes; then
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	      echo "local: *; };" >> $output_objdir/$libname.ver~
-	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-	  fi
-	  ;;
-	esac
-      else
-        _LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-	;;
-	*)
-	  # For security reasons, it is highly recommended that you always
-	  # use absolute paths for naming shared libraries, and exclude the
-	  # DT_RUNPATH tag from executables and libraries.  But doing so
-	  # requires that you compile everything twice, which is a pain.
-	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  else
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	  fi
-	;;
-      esac
-      ;;
-
-    sunos4*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-    esac
-
-    if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
-      runpath_var=
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
-      _LT_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(always_export_symbols, $1)=yes
-      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	_LT_TAGVAR(hardcode_direct, $1)=unsupported
-      fi
-      ;;
-
-    aix[[4-9]]*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	# Also, AIX nm treats weak defined symbols like other global
-	# defined symbols, whereas GNU nm marks them as "W".
-	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	else
-	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-	  for ld_flag in $LDFLAGS; do
-	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-	    aix_use_runtimelinking=yes
-	    break
-	  fi
-	  done
-	  ;;
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      _LT_TAGVAR(archive_cmds, $1)=''
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-
-      if test "$GCC" = yes; then
-	case $host_os in aix4.[[012]]|aix4.[[012]].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	  # We have reworked collect2
-	  :
-	  else
-	  # We have old collect2
-	  _LT_TAGVAR(hardcode_direct, $1)=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	  _LT_TAGVAR(hardcode_libdir_separator, $1)=
-	  fi
-	  ;;
-	esac
-	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
-	fi
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-	  fi
-	fi
-      fi
-
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      _LT_TAGVAR(always_export_symbols, $1)=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
-        # Determine the default libpath from the value encoded in an
-        # empty executable.
-        _LT_SYS_MODULE_PATH_AIX([$1])
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-      else
-	if test "$host_cpu" = ia64; then
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an
-	 # empty executable.
-	 _LT_SYS_MODULE_PATH_AIX([$1])
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	  if test "$with_gnu_ld" = yes; then
-	    # We only use this code for GNU lds that support --whole-archive.
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	  else
-	    # Exported symbols can be pulled into shared objects from archives
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	  fi
-	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            _LT_TAGVAR(archive_expsym_cmds, $1)=''
-        ;;
-      m68k)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes
-        ;;
-      esac
-      ;;
-
-    bsdi[[45]]*)
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      case $cc_basename in
-      cl*)
-	# Native MSVC
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	_LT_TAGVAR(always_export_symbols, $1)=yes
-	_LT_TAGVAR(file_list_spec, $1)='@'
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=".dll"
-	# FIXME: Setting linknames here is a bad hack.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-	  else
-	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-	  fi~
-	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-	  linknames='
-	# The linker will not automatically build a static lib if we build a DLL.
-	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
-	# Don't use ranlib
-	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
-	_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
-	  lt_tool_outputfile="@TOOL_OUTPUT@"~
-	  case $lt_outputfile in
-	    *.exe|*.EXE) ;;
-	    *)
-	      lt_outputfile="$lt_outputfile.exe"
-	      lt_tool_outputfile="$lt_tool_outputfile.exe"
-	      ;;
-	  esac~
-	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-	    $RM "$lt_outputfile.manifest";
-	  fi'
-	;;
-      *)
-	# Assume MSVC wrapper
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=".dll"
-	# FIXME: Setting linknames here is a bad hack.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
-	# The linker will automatically build a .lib file if we build a DLL.
-	_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-	# FIXME: Should let the user specify the lib program.
-	_LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
-	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-	;;
-      esac
-      ;;
-
-    darwin* | rhapsody*)
-      _LT_DARWIN_LINKER_FEATURES($1)
-      ;;
-
-    dgux*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2.*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-	_LT_TAGVAR(hardcode_direct, $1)=yes
-	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	_LT_TAGVAR(hardcode_minus_L, $1)=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	m4_if($1, [], [
-	  # Older versions of the 11.00 compiler do not understand -b yet
-	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
-	  _LT_LINKER_OPTION([if $CC understands -b],
-	    _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
-	    [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
-	    [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
-	  [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  _LT_TAGVAR(hardcode_direct, $1)=no
-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	  ;;
-	*)
-	  _LT_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	# Try to use the -exported_symbol ld option, if it does not
-	# work, assume that -exports_file does not work either and
-	# implicitly export all symbols.
-	# This should be the same for all languages, so no per-tag cache variable.
-	AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
-	  [lt_cv_irix_exported_symbol],
-	  [save_LDFLAGS="$LDFLAGS"
-	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-	   AC_LINK_IFELSE(
-	     [AC_LANG_SOURCE(
-	        [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
-			      [C++], [[int foo (void) { return 0; }]],
-			      [Fortran 77], [[
-      subroutine foo
-      end]],
-			      [Fortran], [[
-      subroutine foo
-      end]])])],
-	      [lt_cv_irix_exported_symbol=yes],
-	      [lt_cv_irix_exported_symbol=no])
-           LDFLAGS="$save_LDFLAGS"])
-	if test "$lt_cv_irix_exported_symbol" = yes; then
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-	fi
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(inherit_rpath, $1)=yes
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    newsos6)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *nto* | *qnx*)
-      ;;
-
-    openbsd*)
-      if test -f /usr/libexec/ld.so; then
-	_LT_TAGVAR(hardcode_direct, $1)=yes
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	else
-	  case $host_os in
-	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-	     _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	     ;;
-	   *)
-	     _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	     ;;
-	  esac
-	fi
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    os2*)
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      else
-	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    solaris*)
-      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-      else
-	case `$CC -V 2>&1` in
-	*"Compilers 5.0"*)
-	  wlarc=''
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
-	  ;;
-	*)
-	  wlarc='${wl}'
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-	  ;;
-	esac
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      case $host_os in
-      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-      *)
-	# The compiler driver will combine and reorder linker options,
-	# but understands `-z linker_flag'.  GCC discards it without `$wl',
-	# but is careful enough not to reorder.
-	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test "$GCC" = yes; then
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-	else
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-	fi
-	;;
-      esac
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
-	  _LT_TAGVAR(hardcode_direct, $1)=no
-        ;;
-	motorola)
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4.3*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	_LT_TAGVAR(ld_shlibs, $1)=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      _LT_TAGVAR(ld_shlibs, $1)=no
-      ;;
-    esac
-
-    if test x$host_vendor = xsni; then
-      case $host in
-      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
-	;;
-      esac
-    fi
-  fi
-])
-AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
-
-_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
-_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
-_LT_DECL([], [extract_expsyms_cmds], [2],
-    [The commands to extract the exported symbol list from a shared archive])
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
-x|xyes)
-  # Assume -lc should be added
-  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $_LT_TAGVAR(archive_cmds, $1) in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      AC_CACHE_CHECK([whether -lc should be explicitly linked in],
-	[lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
-	[$RM conftest*
-	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-	if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-	  soname=conftest
-	  lib=conftest
-	  libobjs=conftest.$ac_objext
-	  deplibs=
-	  wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
-	  pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
-	  compiler_flags=-v
-	  linker_flags=-v
-	  verstring=
-	  output_objdir=.
-	  libname=conftest
-	  lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
-	  _LT_TAGVAR(allow_undefined_flag, $1)=
-	  if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
-	  then
-	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	  else
-	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	  fi
-	  _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-	else
-	  cat conftest.err 1>&5
-	fi
-	$RM conftest*
-	])
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
-    [Whether or not to add -lc for building shared libraries])
-_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
-    [enable_shared_with_static_runtimes], [0],
-    [Whether or not to disallow shared libs when runtime libs are static])
-_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
-    [Compiler flag to allow reflexive dlopens])
-_LT_TAGDECL([], [whole_archive_flag_spec], [1],
-    [Compiler flag to generate shared objects directly from archives])
-_LT_TAGDECL([], [compiler_needs_object], [1],
-    [Whether the compiler copes with passing no objects directly])
-_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
-    [Create an old-style archive from a shared archive])
-_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
-    [Create a temporary old-style archive to link instead of a shared archive])
-_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
-_LT_TAGDECL([], [archive_expsym_cmds], [2])
-_LT_TAGDECL([], [module_cmds], [2],
-    [Commands used to build a loadable module if different from building
-    a shared archive.])
-_LT_TAGDECL([], [module_expsym_cmds], [2])
-_LT_TAGDECL([], [with_gnu_ld], [1],
-    [Whether we are building with GNU ld or not])
-_LT_TAGDECL([], [allow_undefined_flag], [1],
-    [Flag that allows shared libraries with undefined symbols to be built])
-_LT_TAGDECL([], [no_undefined_flag], [1],
-    [Flag that enforces no undefined symbols])
-_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
-    [Flag to hardcode $libdir into a binary during linking.
-    This must work even if $libdir does not exist])
-_LT_TAGDECL([], [hardcode_libdir_separator], [1],
-    [Whether we need a single "-rpath" flag with a separated argument])
-_LT_TAGDECL([], [hardcode_direct], [0],
-    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
-    DIR into the resulting binary])
-_LT_TAGDECL([], [hardcode_direct_absolute], [0],
-    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
-    DIR into the resulting binary and the resulting library dependency is
-    "absolute", i.e impossible to change by setting ${shlibpath_var} if the
-    library is relocated])
-_LT_TAGDECL([], [hardcode_minus_L], [0],
-    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-    into the resulting binary])
-_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
-    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-    into the resulting binary])
-_LT_TAGDECL([], [hardcode_automatic], [0],
-    [Set to "yes" if building a shared library automatically hardcodes DIR
-    into the library and all subsequent libraries and executables linked
-    against it])
-_LT_TAGDECL([], [inherit_rpath], [0],
-    [Set to yes if linker adds runtime paths of dependent libraries
-    to runtime path list])
-_LT_TAGDECL([], [link_all_deplibs], [0],
-    [Whether libtool must link a program against all its dependency libraries])
-_LT_TAGDECL([], [always_export_symbols], [0],
-    [Set to "yes" if exported symbols are required])
-_LT_TAGDECL([], [export_symbols_cmds], [2],
-    [The commands to list exported symbols])
-_LT_TAGDECL([], [exclude_expsyms], [1],
-    [Symbols that should not be listed in the preloaded symbols])
-_LT_TAGDECL([], [include_expsyms], [1],
-    [Symbols that must always be exported])
-_LT_TAGDECL([], [prelink_cmds], [2],
-    [Commands necessary for linking programs (against libraries) with templates])
-_LT_TAGDECL([], [postlink_cmds], [2],
-    [Commands necessary for finishing linking programs])
-_LT_TAGDECL([], [file_list_spec], [1],
-    [Specify filename containing input files])
-dnl FIXME: Not yet implemented
-dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
-dnl    [Compiler flag to generate thread safe objects])
-])# _LT_LINKER_SHLIBS
-
-
-# _LT_LANG_C_CONFIG([TAG])
-# ------------------------
-# Ensure that the configuration variables for a C compiler are suitably
-# defined.  These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_C_CONFIG],
-[m4_require([_LT_DECL_EGREP])dnl
-lt_save_CC="$CC"
-AC_LANG_PUSH(C)
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}'
-
-_LT_TAG_COMPILER
-# Save the default compiler, since it gets overwritten when the other
-# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
-compiler_DEFAULT=$CC
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-if test -n "$compiler"; then
-  _LT_COMPILER_NO_RTTI($1)
-  _LT_COMPILER_PIC($1)
-  _LT_COMPILER_C_O($1)
-  _LT_COMPILER_FILE_LOCKS($1)
-  _LT_LINKER_SHLIBS($1)
-  _LT_SYS_DYNAMIC_LINKER($1)
-  _LT_LINKER_HARDCODE_LIBPATH($1)
-  LT_SYS_DLOPEN_SELF
-  _LT_CMD_STRIPLIB
-
-  # Report which library types will actually be built
-  AC_MSG_CHECKING([if libtool supports shared libraries])
-  AC_MSG_RESULT([$can_build_shared])
-
-  AC_MSG_CHECKING([whether to build shared libraries])
-  test "$can_build_shared" = "no" && enable_shared=no
-
-  # On AIX, shared libraries and static libraries use the same namespace, and
-  # are all built from PIC.
-  case $host_os in
-  aix3*)
-    test "$enable_shared" = yes && enable_static=no
-    if test -n "$RANLIB"; then
-      archive_cmds="$archive_cmds~\$RANLIB \$lib"
-      postinstall_cmds='$RANLIB $lib'
-    fi
-    ;;
-
-  aix[[4-9]]*)
-    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-      test "$enable_shared" = yes && enable_static=no
-    fi
-    ;;
-  esac
-  AC_MSG_RESULT([$enable_shared])
-
-  AC_MSG_CHECKING([whether to build static libraries])
-  # Make sure either enable_shared or enable_static is yes.
-  test "$enable_shared" = yes || enable_static=yes
-  AC_MSG_RESULT([$enable_static])
-
-  _LT_CONFIG($1)
-fi
-AC_LANG_POP
-CC="$lt_save_CC"
-])# _LT_LANG_C_CONFIG
-
-
-# _LT_LANG_CXX_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for a C++ compiler are suitably
-# defined.  These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_CXX_CONFIG],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_PATH_MANIFEST_TOOL])dnl
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-    (test "X$CXX" != "Xg++"))) ; then
-  AC_PROG_CXXCPP
-else
-  _lt_caught_CXX_error=yes
-fi
-
-AC_LANG_PUSH(C++)
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(compiler_needs_object, $1)=no
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for C++ test sources.
-ac_ext=cpp
-
-# Object file extension for compiled C++ test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the CXX compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_caught_CXX_error" != yes; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="int some_variable = 0;"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC=$CC
-  lt_save_CFLAGS=$CFLAGS
-  lt_save_LD=$LD
-  lt_save_GCC=$GCC
-  GCC=$GXX
-  lt_save_with_gnu_ld=$with_gnu_ld
-  lt_save_path_LD=$lt_cv_path_LD
-  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-  else
-    $as_unset lt_cv_prog_gnu_ld
-  fi
-  if test -n "${lt_cv_path_LDCXX+set}"; then
-    lt_cv_path_LD=$lt_cv_path_LDCXX
-  else
-    $as_unset lt_cv_path_LD
-  fi
-  test -z "${LDCXX+set}" || LD=$LDCXX
-  CC=${CXX-"c++"}
-  CFLAGS=$CXXFLAGS
-  compiler=$CC
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME([$compiler])
-
-  if test -n "$compiler"; then
-    # We don't want -fno-exception when compiling C++ code, so set the
-    # no_builtin_flag separately
-    if test "$GXX" = yes; then
-      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-    else
-      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-    fi
-
-    if test "$GXX" = yes; then
-      # Set up default GNU C++ configuration
-
-      LT_PATH_LD
-
-      # Check if GNU C++ uses GNU ld as the underlying linker, since the
-      # archiving commands below assume that GNU ld is being used.
-      if test "$with_gnu_ld" = yes; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-        # If archive_cmds runs LD, not CC, wlarc should be empty
-        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-        #     investigate it a little bit more. (MM)
-        wlarc='${wl}'
-
-        # ancient GNU ld didn't support --whole-archive et. al.
-        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
-	  $GREP 'no-whole-archive' > /dev/null; then
-          _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-        else
-          _LT_TAGVAR(whole_archive_flag_spec, $1)=
-        fi
-      else
-        with_gnu_ld=no
-        wlarc=
-
-        # A generic and very simple default shared library creation
-        # command for GNU C++ for the case where it uses the native
-        # linker, instead of GNU ld.  If possible, this setting should
-        # overridden to take advantage of the native linker features on
-        # the platform it is being used on.
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-      fi
-
-      # Commands to make compiler produce verbose output that lists
-      # what "hidden" libraries, object files and flags are used when
-      # linking a shared library.
-      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-
-    else
-      GXX=no
-      with_gnu_ld=no
-      wlarc=
-    fi
-
-    # PORTME: fill in a description of your system's C++ link characteristics
-    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-    _LT_TAGVAR(ld_shlibs, $1)=yes
-    case $host_os in
-      aix3*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-      aix[[4-9]]*)
-        if test "$host_cpu" = ia64; then
-          # On IA64, the linker does run time linking by default, so we don't
-          # have to do anything special.
-          aix_use_runtimelinking=no
-          exp_sym_flag='-Bexport'
-          no_entry_flag=""
-        else
-          aix_use_runtimelinking=no
-
-          # Test if we are trying to use run time linking or normal
-          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-          # need to do runtime linking.
-          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-	    for ld_flag in $LDFLAGS; do
-	      case $ld_flag in
-	      *-brtl*)
-	        aix_use_runtimelinking=yes
-	        break
-	        ;;
-	      esac
-	    done
-	    ;;
-          esac
-
-          exp_sym_flag='-bexport'
-          no_entry_flag='-bnoentry'
-        fi
-
-        # When large executables or shared objects are built, AIX ld can
-        # have problems creating the table of contents.  If linking a library
-        # or program results in "error TOC overflow" add -mminimal-toc to
-        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-        _LT_TAGVAR(archive_cmds, $1)=''
-        _LT_TAGVAR(hardcode_direct, $1)=yes
-        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-        _LT_TAGVAR(link_all_deplibs, $1)=yes
-        _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-
-        if test "$GXX" = yes; then
-          case $host_os in aix4.[[012]]|aix4.[[012]].*)
-          # We only want to do this on AIX 4.2 and lower, the check
-          # below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	    # We have reworked collect2
-	    :
-	  else
-	    # We have old collect2
-	    _LT_TAGVAR(hardcode_direct, $1)=unsupported
-	    # It fails to find uninstalled libraries when the uninstalled
-	    # path is not listed in the libpath.  Setting hardcode_minus_L
-	    # to unsupported forces relinking
-	    _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=
-	  fi
-          esac
-          shared_flag='-shared'
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag="$shared_flag "'${wl}-G'
-	  fi
-        else
-          # not using gcc
-          if test "$host_cpu" = ia64; then
-	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	  # chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-          else
-	    if test "$aix_use_runtimelinking" = yes; then
-	      shared_flag='${wl}-G'
-	    else
-	      shared_flag='${wl}-bM:SRE'
-	    fi
-          fi
-        fi
-
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
-        # It seems that -bexpall does not export symbols beginning with
-        # underscore (_), so it is better to generate a list of symbols to
-	# export.
-        _LT_TAGVAR(always_export_symbols, $1)=yes
-        if test "$aix_use_runtimelinking" = yes; then
-          # Warning - without using the other runtime loading flags (-brtl),
-          # -berok will link without error, but may produce a broken library.
-          _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
-          # Determine the default libpath from the value encoded in an empty
-          # executable.
-          _LT_SYS_MODULE_PATH_AIX([$1])
-          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-        else
-          if test "$host_cpu" = ia64; then
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-          else
-	    # Determine the default libpath from the value encoded in an
-	    # empty executable.
-	    _LT_SYS_MODULE_PATH_AIX([$1])
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	    # Warning - without using the other run time loading flags,
-	    # -berok will link without error, but may produce a broken library.
-	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	    if test "$with_gnu_ld" = yes; then
-	      # We only use this code for GNU lds that support --whole-archive.
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	    else
-	      # Exported symbols can be pulled into shared objects from archives
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	    fi
-	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	    # This is similar to how AIX traditionally builds its shared
-	    # libraries.
-	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-          fi
-        fi
-        ;;
-
-      beos*)
-	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	  # support --undefined.  This deserves some investigation.  FIXME
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	else
-	  _LT_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-
-      chorus*)
-        case $cc_basename in
-          *)
-	  # FIXME: insert proper C++ library support
-	  _LT_TAGVAR(ld_shlibs, $1)=no
-	  ;;
-        esac
-        ;;
-
-      cygwin* | mingw* | pw32* | cegcc*)
-	case $GXX,$cc_basename in
-	,cl* | no,cl*)
-	  # Native MSVC
-	  # hardcode_libdir_flag_spec is actually meaningless, as there is
-	  # no search path for DLLs.
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	  _LT_TAGVAR(always_export_symbols, $1)=yes
-	  _LT_TAGVAR(file_list_spec, $1)='@'
-	  # Tell ltmain to make .lib files, not .a files.
-	  libext=lib
-	  # Tell ltmain to make .dll files, not .so files.
-	  shrext_cmds=".dll"
-	  # FIXME: Setting linknames here is a bad hack.
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	      $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-	    else
-	      $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-	    fi~
-	    $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-	    linknames='
-	  # The linker will not automatically build a static lib if we build a DLL.
-	  # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-	  # Don't use ranlib
-	  _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
-	  _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
-	    lt_tool_outputfile="@TOOL_OUTPUT@"~
-	    case $lt_outputfile in
-	      *.exe|*.EXE) ;;
-	      *)
-		lt_outputfile="$lt_outputfile.exe"
-		lt_tool_outputfile="$lt_tool_outputfile.exe"
-		;;
-	    esac~
-	    func_to_tool_file "$lt_outputfile"~
-	    if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-	      $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-	      $RM "$lt_outputfile.manifest";
-	    fi'
-	  ;;
-	*)
-	  # g++
-	  # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-	  # as there is no search path for DLLs.
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
-	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	  _LT_TAGVAR(always_export_symbols, $1)=no
-	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
-	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	    # If the export-symbols file already is a .def file (1st line
-	    # is EXPORTS), use it as is; otherwise, prepend...
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	      cp $export_symbols $output_objdir/$soname.def;
-	    else
-	      echo EXPORTS > $output_objdir/$soname.def;
-	      cat $export_symbols >> $output_objdir/$soname.def;
-	    fi~
-	    $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	  else
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	  fi
-	  ;;
-	esac
-	;;
-      darwin* | rhapsody*)
-        _LT_DARWIN_LINKER_FEATURES($1)
-	;;
-
-      dgux*)
-        case $cc_basename in
-          ec++*)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          ghcx*)
-	    # Green Hills C++ Compiler
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-        esac
-        ;;
-
-      freebsd2.*)
-        # C++ shared libraries reported to be fairly broken before
-	# switch to ELF
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      freebsd-elf*)
-        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-        ;;
-
-      freebsd* | dragonfly*)
-        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-        # conventions
-        _LT_TAGVAR(ld_shlibs, $1)=yes
-        ;;
-
-      gnu*)
-        ;;
-
-      haiku*)
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        _LT_TAGVAR(link_all_deplibs, $1)=yes
-        ;;
-
-      hpux9*)
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-        _LT_TAGVAR(hardcode_direct, $1)=yes
-        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-				             # but as the default
-				             # location of the library.
-
-        case $cc_basename in
-          CC*)
-            # FIXME: insert proper C++ library support
-            _LT_TAGVAR(ld_shlibs, $1)=no
-            ;;
-          aCC*)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            # Commands to make compiler produce verbose output that lists
-            # what "hidden" libraries, object files and flags are used when
-            # linking a shared library.
-            #
-            # There doesn't appear to be a way to prevent this compiler from
-            # explicitly linking system object files so we need to strip them
-            # from the output so that they don't get included in the library
-            # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-            ;;
-          *)
-            if test "$GXX" = yes; then
-              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            else
-              # FIXME: insert proper C++ library support
-              _LT_TAGVAR(ld_shlibs, $1)=no
-            fi
-            ;;
-        esac
-        ;;
-
-      hpux10*|hpux11*)
-        if test $with_gnu_ld = no; then
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-          case $host_cpu in
-            hppa*64*|ia64*)
-              ;;
-            *)
-	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-              ;;
-          esac
-        fi
-        case $host_cpu in
-          hppa*64*|ia64*)
-            _LT_TAGVAR(hardcode_direct, $1)=no
-            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-            ;;
-          *)
-            _LT_TAGVAR(hardcode_direct, $1)=yes
-            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-					         # but as the default
-					         # location of the library.
-            ;;
-        esac
-
-        case $cc_basename in
-          CC*)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          aCC*)
-	    case $host_cpu in
-	      hppa*64*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	      ia64*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	      *)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	    esac
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-	    ;;
-          *)
-	    if test "$GXX" = yes; then
-	      if test $with_gnu_ld = no; then
-	        case $host_cpu in
-	          hppa*64*)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	          ia64*)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	          *)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	        esac
-	      fi
-	    else
-	      # FIXME: insert proper C++ library support
-	      _LT_TAGVAR(ld_shlibs, $1)=no
-	    fi
-	    ;;
-        esac
-        ;;
-
-      interix[[3-9]]*)
-	_LT_TAGVAR(hardcode_direct, $1)=no
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-	# Instead, shared libraries are loaded at an image base (0x10000000 by
-	# default) and relocated if they conflict, which is a slow very memory
-	# consuming and fragmenting process.  To avoid this, we pick a random,
-	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	;;
-      irix5* | irix6*)
-        case $cc_basename in
-          CC*)
-	    # SGI C++
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-	    # necessary to make sure instantiated templates are included
-	    # in the archive.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
-	    ;;
-          *)
-	    if test "$GXX" = yes; then
-	      if test "$with_gnu_ld" = no; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	      else
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
-	      fi
-	    fi
-	    _LT_TAGVAR(link_all_deplibs, $1)=yes
-	    ;;
-        esac
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-        _LT_TAGVAR(inherit_rpath, $1)=yes
-        ;;
-
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
-        case $cc_basename in
-          KCC*)
-	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	    # KCC will only create a shared library if the output file
-	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
-	    # to its proper name (with version) after linking.
-	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-	    ;;
-	  icpc* | ecpc* )
-	    # Intel C++
-	    with_gnu_ld=yes
-	    # version 8.0 and above of icpc choke on multiply defined symbols
-	    # if we add $predep_objects and $postdep_objects, however 7.1 and
-	    # earlier do not add the objects themselves.
-	    case `$CC -V 2>&1` in
-	      *"Version 7."*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-		;;
-	      *)  # Version 8.0 or newer
-	        tmp_idyn=
-	        case $host_cpu in
-		  ia64*) tmp_idyn=' -i_dynamic';;
-		esac
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-		;;
-	    esac
-	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	    ;;
-          pgCC* | pgcpp*)
-            # Portland Group C++ compiler
-	    case `$CC -V` in
-	    *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
-	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
-	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
-		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
-		$RANLIB $oldlib'
-	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-	      ;;
-	    *) # Version 6 and above use weak symbols
-	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-	      ;;
-	    esac
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-            ;;
-	  cxx*)
-	    # Compaq C++
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-
-	    runpath_var=LD_RUN_PATH
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
-	    ;;
-	  xl* | mpixl* | bgxl*)
-	    # IBM XL 8.0 on PPC, with GNU ld
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    if test "x$supports_anon_versioning" = xyes; then
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-		cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-		echo "local: *; };" >> $output_objdir/$libname.ver~
-		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-	    fi
-	    ;;
-	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
-	    *Sun\ C*)
-	      # Sun C++ 5.9
-	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	      _LT_TAGVAR(compiler_needs_object, $1)=yes
-
-	      # Not sure whether something based on
-	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
-	      # would be better.
-	      output_verbose_link_cmd='func_echo_all'
-
-	      # Archives containing C++ object files must be created using
-	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	      # necessary to make sure instantiated templates are included
-	      # in the archive.
-	      _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	      ;;
-	    esac
-	    ;;
-	esac
-	;;
-
-      lynxos*)
-        # FIXME: insert proper C++ library support
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
-      m88k*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
-      mvs*)
-        case $cc_basename in
-          cxx*)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-	  *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-	esac
-	;;
-
-      netbsd*)
-        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-	  wlarc=
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	  _LT_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	fi
-	# Workaround some broken pre-1.5 toolchains
-	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-	;;
-
-      *nto* | *qnx*)
-        _LT_TAGVAR(ld_shlibs, $1)=yes
-	;;
-
-      openbsd2*)
-        # C++ shared libraries are fairly broken
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
-      openbsd*)
-	if test -f /usr/libexec/ld.so; then
-	  _LT_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-	  fi
-	  output_verbose_link_cmd=func_echo_all
-	else
-	  _LT_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-
-      osf3* | osf4* | osf5*)
-        case $cc_basename in
-          KCC*)
-	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	    # KCC will only create a shared library if the output file
-	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
-	    # to its proper name (with version) after linking.
-	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	    # Archives containing C++ object files must be created using
-	    # the KAI C++ compiler.
-	    case $host in
-	      osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
-	      *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
-	    esac
-	    ;;
-          RCC*)
-	    # Rational C++ 2.4.1
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          cxx*)
-	    case $host in
-	      osf3*)
-	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-		;;
-	      *)
-	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-	          echo "-hidden">> $lib.exp~
-	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
-	          $RM $lib.exp'
-	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-		;;
-	    esac
-
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-	    ;;
-	  *)
-	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	      case $host in
-	        osf3*)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-		  ;;
-	        *)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-		  ;;
-	      esac
-
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	      # Commands to make compiler produce verbose output that lists
-	      # what "hidden" libraries, object files and flags are used when
-	      # linking a shared library.
-	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-
-	    else
-	      # FIXME: insert proper C++ library support
-	      _LT_TAGVAR(ld_shlibs, $1)=no
-	    fi
-	    ;;
-        esac
-        ;;
-
-      psos*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      sunos4*)
-        case $cc_basename in
-          CC*)
-	    # Sun C++ 4.x
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          lcc*)
-	    # Lucid
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-        esac
-        ;;
-
-      solaris*)
-        case $cc_basename in
-          CC* | sunCC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
-	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	    case $host_os in
-	      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-	      *)
-		# The compiler driver will combine and reorder linker options,
-		# but understands `-z linker_flag'.
-	        # Supported since Solaris 2.6 (maybe 2.5.1?)
-		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-	        ;;
-	    esac
-	    _LT_TAGVAR(link_all_deplibs, $1)=yes
-
-	    output_verbose_link_cmd='func_echo_all'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	    # necessary to make sure instantiated templates are included
-	    # in the archive.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	    ;;
-          gcx*)
-	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-
-	    # The C++ compiler must be used to create the archive.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-	    ;;
-          *)
-	    # GNU C++ compiler with Solaris linker
-	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
-	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	        # Commands to make compiler produce verbose output that lists
-	        # what "hidden" libraries, object files and flags are used when
-	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-	      else
-	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
-	        # platform.
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	        # Commands to make compiler produce verbose output that lists
-	        # what "hidden" libraries, object files and flags are used when
-	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-	      fi
-
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-	      case $host_os in
-		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-		*)
-		  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-		  ;;
-	      esac
-	    fi
-	    ;;
-        esac
-        ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      runpath_var='LD_RUN_PATH'
-
-      case $cc_basename in
-        CC*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-      esac
-      ;;
-
-      sysv5* | sco3.2v5* | sco5v6*)
-	# Note: We can NOT use -z defs as we might desire, because we do not
-	# link with -lc, and that would cause any symbols used from libc to
-	# always be unresolved, which means just about no library would
-	# ever link correctly.  If we're not using GNU ld we use -z text
-	# though, which does catch some bad symbols but isn't as heavy-handed
-	# as -z defs.
-	_LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-	_LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-	_LT_TAGVAR(link_all_deplibs, $1)=yes
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-	runpath_var='LD_RUN_PATH'
-
-	case $cc_basename in
-          CC*)
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
-	      '"$_LT_TAGVAR(old_archive_cmds, $1)"
-	    _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
-	      '"$_LT_TAGVAR(reload_cmds, $1)"
-	    ;;
-	  *)
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    ;;
-	esac
-      ;;
-
-      tandem*)
-        case $cc_basename in
-          NCC*)
-	    # NonStop-UX NCC 3.20
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-        esac
-        ;;
-
-      vxworks*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      *)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-    esac
-
-    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-    test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-    _LT_TAGVAR(GCC, $1)="$GXX"
-    _LT_TAGVAR(LD, $1)="$LD"
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    _LT_SYS_HIDDEN_LIBDEPS($1)
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  CC=$lt_save_CC
-  CFLAGS=$lt_save_CFLAGS
-  LDCXX=$LD
-  LD=$lt_save_LD
-  GCC=$lt_save_GCC
-  with_gnu_ld=$lt_save_with_gnu_ld
-  lt_cv_path_LDCXX=$lt_cv_path_LD
-  lt_cv_path_LD=$lt_save_path_LD
-  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-fi # test "$_lt_caught_CXX_error" != yes
-
-AC_LANG_POP
-])# _LT_LANG_CXX_CONFIG
-
-
-# _LT_FUNC_STRIPNAME_CNF
-# ----------------------
-# func_stripname_cnf prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-#
-# This function is identical to the (non-XSI) version of func_stripname,
-# except this one can be used by m4 code that may be executed by configure,
-# rather than the libtool script.
-m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
-AC_REQUIRE([_LT_DECL_SED])
-AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
-func_stripname_cnf ()
-{
-  case ${2} in
-  .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
-  *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
-  esac
-} # func_stripname_cnf
-])# _LT_FUNC_STRIPNAME_CNF
-
-# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
-# ---------------------------------
-# Figure out "hidden" library dependencies from verbose
-# compiler output when linking a shared library.
-# Parse the compiler output and extract the necessary
-# objects, libraries and library flags.
-m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
-# Dependencies to place before and after the object being linked:
-_LT_TAGVAR(predep_objects, $1)=
-_LT_TAGVAR(postdep_objects, $1)=
-_LT_TAGVAR(predeps, $1)=
-_LT_TAGVAR(postdeps, $1)=
-_LT_TAGVAR(compiler_lib_search_path, $1)=
-
-dnl we can't use the lt_simple_compile_test_code here,
-dnl because it contains code intended for an executable,
-dnl not a library.  It's possible we should let each
-dnl tag define a new lt_????_link_test_code variable,
-dnl but it's only used here...
-m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
-int a;
-void foo (void) { a = 0; }
-_LT_EOF
-], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
-class Foo
-{
-public:
-  Foo (void) { a = 0; }
-private:
-  int a;
-};
-_LT_EOF
-], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
-      subroutine foo
-      implicit none
-      integer*4 a
-      a=0
-      return
-      end
-_LT_EOF
-], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
-      subroutine foo
-      implicit none
-      integer a
-      a=0
-      return
-      end
-_LT_EOF
-], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
-public class foo {
-  private int a;
-  public void bar (void) {
-    a = 0;
-  }
-};
-_LT_EOF
-], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
-package foo
-func foo() {
-}
-_LT_EOF
-])
-
-_lt_libdeps_save_CFLAGS=$CFLAGS
-case "$CC $CFLAGS " in #(
-*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
-*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
-*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
-esac
-
-dnl Parse the compiler output and extract the necessary
-dnl objects, libraries and library flags.
-if AC_TRY_EVAL(ac_compile); then
-  # Parse the compiler output and extract the necessary
-  # objects, libraries and library flags.
-
-  # Sentinel used to keep track of whether or not we are before
-  # the conftest object file.
-  pre_test_object_deps_done=no
-
-  for p in `eval "$output_verbose_link_cmd"`; do
-    case ${prev}${p} in
-
-    -L* | -R* | -l*)
-       # Some compilers place space between "-{L,R}" and the path.
-       # Remove the space.
-       if test $p = "-L" ||
-          test $p = "-R"; then
-	 prev=$p
-	 continue
-       fi
-
-       # Expand the sysroot to ease extracting the directories later.
-       if test -z "$prev"; then
-         case $p in
-         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
-         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
-         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
-         esac
-       fi
-       case $p in
-       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
-       esac
-       if test "$pre_test_object_deps_done" = no; then
-	 case ${prev} in
-	 -L | -R)
-	   # Internal compiler library paths should come after those
-	   # provided the user.  The postdeps already come after the
-	   # user supplied libs so there is no need to process them.
-	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
-	     _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
-	   else
-	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
-	   fi
-	   ;;
-	 # The "-l" case would never come before the object being
-	 # linked, so don't bother handling this case.
-	 esac
-       else
-	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
-	   _LT_TAGVAR(postdeps, $1)="${prev}${p}"
-	 else
-	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
-	 fi
-       fi
-       prev=
-       ;;
-
-    *.lto.$objext) ;; # Ignore GCC LTO objects
-    *.$objext)
-       # This assumes that the test object file only shows up
-       # once in the compiler output.
-       if test "$p" = "conftest.$objext"; then
-	 pre_test_object_deps_done=yes
-	 continue
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
-	   _LT_TAGVAR(predep_objects, $1)="$p"
-	 else
-	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
-	 fi
-       else
-	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
-	   _LT_TAGVAR(postdep_objects, $1)="$p"
-	 else
-	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
-	 fi
-       fi
-       ;;
-
-    *) ;; # Ignore the rest.
-
-    esac
-  done
-
-  # Clean up.
-  rm -f a.out a.exe
-else
-  echo "libtool.m4: error: problem compiling $1 test program"
-fi
-
-$RM -f confest.$objext
-CFLAGS=$_lt_libdeps_save_CFLAGS
-
-# PORTME: override above test on systems where it is broken
-m4_if([$1], [CXX],
-[case $host_os in
-interix[[3-9]]*)
-  # Interix 3.5 installs completely hosed .la files for C++, so rather than
-  # hack all around it, let's just trust "g++" to DTRT.
-  _LT_TAGVAR(predep_objects,$1)=
-  _LT_TAGVAR(postdep_objects,$1)=
-  _LT_TAGVAR(postdeps,$1)=
-  ;;
-
-linux*)
-  case `$CC -V 2>&1 | sed 5q` in
-  *Sun\ C*)
-    # Sun C++ 5.9
-
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    if test "$solaris_use_stlport4" != yes; then
-      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-
-solaris*)
-  case $cc_basename in
-  CC* | sunCC*)
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    # Adding this requires a known-good setup of shared libraries for
-    # Sun compiler versions before 5.6, else PIC objects from an old
-    # archive will be linked into the output, leading to subtle bugs.
-    if test "$solaris_use_stlport4" != yes; then
-      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-esac
-])
-
-case " $_LT_TAGVAR(postdeps, $1) " in
-*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
-esac
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=
-if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-fi
-_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
-    [The directories searched by this compiler when creating a shared library])
-_LT_TAGDECL([], [predep_objects], [1],
-    [Dependencies to place before and after the objects being linked to
-    create a shared library])
-_LT_TAGDECL([], [postdep_objects], [1])
-_LT_TAGDECL([], [predeps], [1])
-_LT_TAGDECL([], [postdeps], [1])
-_LT_TAGDECL([], [compiler_lib_search_path], [1],
-    [The library search path used internally by the compiler when linking
-    a shared library])
-])# _LT_SYS_HIDDEN_LIBDEPS
-
-
-# _LT_LANG_F77_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for a Fortran 77 compiler are
-# suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_F77_CONFIG],
-[AC_LANG_PUSH(Fortran 77)
-if test -z "$F77" || test "X$F77" = "Xno"; then
-  _lt_disable_F77=yes
-fi
-
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for f77 test sources.
-ac_ext=f
-
-# Object file extension for compiled f77 test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the F77 compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_F77" != yes; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="\
-      subroutine t
-      return
-      end
-"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code="\
-      program t
-      end
-"
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC="$CC"
-  lt_save_GCC=$GCC
-  lt_save_CFLAGS=$CFLAGS
-  CC=${F77-"f77"}
-  CFLAGS=$FFLAGS
-  compiler=$CC
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME([$compiler])
-  GCC=$G77
-  if test -n "$compiler"; then
-    AC_MSG_CHECKING([if libtool supports shared libraries])
-    AC_MSG_RESULT([$can_build_shared])
-
-    AC_MSG_CHECKING([whether to build shared libraries])
-    test "$can_build_shared" = "no" && enable_shared=no
-
-    # On AIX, shared libraries and static libraries use the same namespace, and
-    # are all built from PIC.
-    case $host_os in
-      aix3*)
-        test "$enable_shared" = yes && enable_static=no
-        if test -n "$RANLIB"; then
-          archive_cmds="$archive_cmds~\$RANLIB \$lib"
-          postinstall_cmds='$RANLIB $lib'
-        fi
-        ;;
-      aix[[4-9]]*)
-	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-	  test "$enable_shared" = yes && enable_static=no
-	fi
-        ;;
-    esac
-    AC_MSG_RESULT([$enable_shared])
-
-    AC_MSG_CHECKING([whether to build static libraries])
-    # Make sure either enable_shared or enable_static is yes.
-    test "$enable_shared" = yes || enable_static=yes
-    AC_MSG_RESULT([$enable_static])
-
-    _LT_TAGVAR(GCC, $1)="$G77"
-    _LT_TAGVAR(LD, $1)="$LD"
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  GCC=$lt_save_GCC
-  CC="$lt_save_CC"
-  CFLAGS="$lt_save_CFLAGS"
-fi # test "$_lt_disable_F77" != yes
-
-AC_LANG_POP
-])# _LT_LANG_F77_CONFIG
-
-
-# _LT_LANG_FC_CONFIG([TAG])
-# -------------------------
-# Ensure that the configuration variables for a Fortran compiler are
-# suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_FC_CONFIG],
-[AC_LANG_PUSH(Fortran)
-
-if test -z "$FC" || test "X$FC" = "Xno"; then
-  _lt_disable_FC=yes
-fi
-
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for fc test sources.
-ac_ext=${ac_fc_srcext-f}
-
-# Object file extension for compiled fc test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the FC compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_FC" != yes; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="\
-      subroutine t
-      return
-      end
-"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code="\
-      program t
-      end
-"
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC="$CC"
-  lt_save_GCC=$GCC
-  lt_save_CFLAGS=$CFLAGS
-  CC=${FC-"f95"}
-  CFLAGS=$FCFLAGS
-  compiler=$CC
-  GCC=$ac_cv_fc_compiler_gnu
-
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME([$compiler])
-
-  if test -n "$compiler"; then
-    AC_MSG_CHECKING([if libtool supports shared libraries])
-    AC_MSG_RESULT([$can_build_shared])
-
-    AC_MSG_CHECKING([whether to build shared libraries])
-    test "$can_build_shared" = "no" && enable_shared=no
-
-    # On AIX, shared libraries and static libraries use the same namespace, and
-    # are all built from PIC.
-    case $host_os in
-      aix3*)
-        test "$enable_shared" = yes && enable_static=no
-        if test -n "$RANLIB"; then
-          archive_cmds="$archive_cmds~\$RANLIB \$lib"
-          postinstall_cmds='$RANLIB $lib'
-        fi
-        ;;
-      aix[[4-9]]*)
-	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-	  test "$enable_shared" = yes && enable_static=no
-	fi
-        ;;
-    esac
-    AC_MSG_RESULT([$enable_shared])
-
-    AC_MSG_CHECKING([whether to build static libraries])
-    # Make sure either enable_shared or enable_static is yes.
-    test "$enable_shared" = yes || enable_static=yes
-    AC_MSG_RESULT([$enable_static])
-
-    _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
-    _LT_TAGVAR(LD, $1)="$LD"
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    _LT_SYS_HIDDEN_LIBDEPS($1)
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  GCC=$lt_save_GCC
-  CC=$lt_save_CC
-  CFLAGS=$lt_save_CFLAGS
-fi # test "$_lt_disable_FC" != yes
-
-AC_LANG_POP
-])# _LT_LANG_FC_CONFIG
-
-
-# _LT_LANG_GCJ_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for the GNU Java Compiler compiler
-# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_GCJ_CONFIG],
-[AC_REQUIRE([LT_PROG_GCJ])dnl
-AC_LANG_SAVE
-
-# Source file extension for Java test sources.
-ac_ext=java
-
-# Object file extension for compiled Java test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_CFLAGS=$CFLAGS
-lt_save_GCC=$GCC
-GCC=yes
-CC=${GCJ-"gcj"}
-CFLAGS=$GCJFLAGS
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)="$LD"
-_LT_CC_BASENAME([$compiler])
-
-# GCJ did not exist at the time GCC didn't implicitly link libc in.
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-
-if test -n "$compiler"; then
-  _LT_COMPILER_NO_RTTI($1)
-  _LT_COMPILER_PIC($1)
-  _LT_COMPILER_C_O($1)
-  _LT_COMPILER_FILE_LOCKS($1)
-  _LT_LINKER_SHLIBS($1)
-  _LT_LINKER_HARDCODE_LIBPATH($1)
-
-  _LT_CONFIG($1)
-fi
-
-AC_LANG_RESTORE
-
-GCC=$lt_save_GCC
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
-])# _LT_LANG_GCJ_CONFIG
-
-
-# _LT_LANG_GO_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for the GNU Go compiler
-# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_GO_CONFIG],
-[AC_REQUIRE([LT_PROG_GO])dnl
-AC_LANG_SAVE
-
-# Source file extension for Go test sources.
-ac_ext=go
-
-# Object file extension for compiled Go test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="package main; func main() { }"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='package main; func main() { }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_CFLAGS=$CFLAGS
-lt_save_GCC=$GCC
-GCC=yes
-CC=${GOC-"gccgo"}
-CFLAGS=$GOFLAGS
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)="$LD"
-_LT_CC_BASENAME([$compiler])
-
-# Go did not exist at the time GCC didn't implicitly link libc in.
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-
-if test -n "$compiler"; then
-  _LT_COMPILER_NO_RTTI($1)
-  _LT_COMPILER_PIC($1)
-  _LT_COMPILER_C_O($1)
-  _LT_COMPILER_FILE_LOCKS($1)
-  _LT_LINKER_SHLIBS($1)
-  _LT_LINKER_HARDCODE_LIBPATH($1)
-
-  _LT_CONFIG($1)
-fi
-
-AC_LANG_RESTORE
-
-GCC=$lt_save_GCC
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
-])# _LT_LANG_GO_CONFIG
-
-
-# _LT_LANG_RC_CONFIG([TAG])
-# -------------------------
-# Ensure that the configuration variables for the Windows resource compiler
-# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_RC_CONFIG],
-[AC_REQUIRE([LT_PROG_RC])dnl
-AC_LANG_SAVE
-
-# Source file extension for RC test sources.
-ac_ext=rc
-
-# Object file extension for compiled RC test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-lt_save_CFLAGS=$CFLAGS
-lt_save_GCC=$GCC
-GCC=
-CC=${RC-"windres"}
-CFLAGS=
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-
-if test -n "$compiler"; then
-  :
-  _LT_CONFIG($1)
-fi
-
-GCC=$lt_save_GCC
-AC_LANG_RESTORE
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
-])# _LT_LANG_RC_CONFIG
-
-
-# LT_PROG_GCJ
-# -----------
-AC_DEFUN([LT_PROG_GCJ],
-[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
-  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
-    [AC_CHECK_TOOL(GCJ, gcj,)
-      test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-      AC_SUBST(GCJFLAGS)])])[]dnl
-])
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
-
-
-# LT_PROG_GO
-# ----------
-AC_DEFUN([LT_PROG_GO],
-[AC_CHECK_TOOL(GOC, gccgo,)
-])
-
-
-# LT_PROG_RC
-# ----------
-AC_DEFUN([LT_PROG_RC],
-[AC_CHECK_TOOL(RC, windres,)
-])
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_RC], [])
-
-
-# _LT_DECL_EGREP
-# --------------
-# If we don't have a new enough Autoconf to choose the best grep
-# available, choose the one first in the user's PATH.
-m4_defun([_LT_DECL_EGREP],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
-AC_REQUIRE([AC_PROG_FGREP])dnl
-test -z "$GREP" && GREP=grep
-_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
-_LT_DECL([], [EGREP], [1], [An ERE matcher])
-_LT_DECL([], [FGREP], [1], [A literal string matcher])
-dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
-AC_SUBST([GREP])
-])
-
-
-# _LT_DECL_OBJDUMP
-# --------------
-# If we don't have a new enough Autoconf to choose the best objdump
-# available, choose the one first in the user's PATH.
-m4_defun([_LT_DECL_OBJDUMP],
-[AC_CHECK_TOOL(OBJDUMP, objdump, false)
-test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
-AC_SUBST([OBJDUMP])
-])
-
-# _LT_DECL_DLLTOOL
-# ----------------
-# Ensure DLLTOOL variable is set.
-m4_defun([_LT_DECL_DLLTOOL],
-[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
-AC_SUBST([DLLTOOL])
-])
-
-# _LT_DECL_SED
-# ------------
-# Check for a fully-functional sed program, that truncates
-# as few characters as possible.  Prefer GNU sed if found.
-m4_defun([_LT_DECL_SED],
-[AC_PROG_SED
-test -z "$SED" && SED=sed
-Xsed="$SED -e 1s/^X//"
-_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
-_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
-    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
-])# _LT_DECL_SED
-
-m4_ifndef([AC_PROG_SED], [
-# NOTE: This macro has been submitted for inclusion into   #
-#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
-#  a released version of Autoconf we should remove this    #
-#  macro and use it instead.                               #
-
-m4_defun([AC_PROG_SED],
-[AC_MSG_CHECKING([for a sed that does not truncate output])
-AC_CACHE_VAL(lt_cv_path_SED,
-[# Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for lt_ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-      fi
-    done
-  done
-done
-IFS=$as_save_IFS
-lt_ac_max=0
-lt_ac_count=0
-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-# along with /bin/sed that truncates output.
-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && continue
-  cat /dev/null > conftest.in
-  lt_ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-  # Check for GNU sed and select it if it is found.
-  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-    lt_cv_path_SED=$lt_ac_sed
-    break
-  fi
-  while true; do
-    cat conftest.in conftest.in >conftest.tmp
-    mv conftest.tmp conftest.in
-    cp conftest.in conftest.nl
-    echo >>conftest.nl
-    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-    cmp -s conftest.out conftest.nl || break
-    # 10000 chars as input seems more than enough
-    test $lt_ac_count -gt 10 && break
-    lt_ac_count=`expr $lt_ac_count + 1`
-    if test $lt_ac_count -gt $lt_ac_max; then
-      lt_ac_max=$lt_ac_count
-      lt_cv_path_SED=$lt_ac_sed
-    fi
-  done
-done
-])
-SED=$lt_cv_path_SED
-AC_SUBST([SED])
-AC_MSG_RESULT([$SED])
-])#AC_PROG_SED
-])#m4_ifndef
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_SED], [])
-
-
-# _LT_CHECK_SHELL_FEATURES
-# ------------------------
-# Find out whether the shell is Bourne or XSI compatible,
-# or has some other useful features.
-m4_defun([_LT_CHECK_SHELL_FEATURES],
-[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
-  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
-      = c,a/b,b/c, \
-    && eval 'test $(( 1 + 1 )) -eq 2 \
-    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-  && xsi_shell=yes
-AC_MSG_RESULT([$xsi_shell])
-_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
-
-AC_MSG_CHECKING([whether the shell understands "+="])
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
-    >/dev/null 2>&1 \
-  && lt_shell_append=yes
-AC_MSG_RESULT([$lt_shell_append])
-_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
-
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  lt_unset=unset
-else
-  lt_unset=false
-fi
-_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
-
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-  lt_SP2NL='tr \040 \012'
-  lt_NL2SP='tr \015\012 \040\040'
-  ;;
- *) # EBCDIC based system
-  lt_SP2NL='tr \100 \n'
-  lt_NL2SP='tr \r\n \100\100'
-  ;;
-esac
-_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
-_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
-])# _LT_CHECK_SHELL_FEATURES
-
-
-# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
-# ------------------------------------------------------
-# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
-# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
-m4_defun([_LT_PROG_FUNCTION_REPLACE],
-[dnl {
-sed -e '/^$1 ()$/,/^} # $1 /c\
-$1 ()\
-{\
-m4_bpatsubsts([$2], [$], [\\], [^\([	 ]\)], [\\\1])
-} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-])
-
-
-# _LT_PROG_REPLACE_SHELLFNS
-# -------------------------
-# Replace existing portable implementations of several shell functions with
-# equivalent extended shell implementations where those features are available..
-m4_defun([_LT_PROG_REPLACE_SHELLFNS],
-[if test x"$xsi_shell" = xyes; then
-  _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
-    case ${1} in
-      */*) func_dirname_result="${1%/*}${2}" ;;
-      *  ) func_dirname_result="${3}" ;;
-    esac])
-
-  _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
-    func_basename_result="${1##*/}"])
-
-  _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
-    case ${1} in
-      */*) func_dirname_result="${1%/*}${2}" ;;
-      *  ) func_dirname_result="${3}" ;;
-    esac
-    func_basename_result="${1##*/}"])
-
-  _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
-    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-    # positional parameters, so assign one to ordinary parameter first.
-    func_stripname_result=${3}
-    func_stripname_result=${func_stripname_result#"${1}"}
-    func_stripname_result=${func_stripname_result%"${2}"}])
-
-  _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
-    func_split_long_opt_name=${1%%=*}
-    func_split_long_opt_arg=${1#*=}])
-
-  _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
-    func_split_short_opt_arg=${1#??}
-    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
-
-  _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
-    case ${1} in
-      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-      *)    func_lo2o_result=${1} ;;
-    esac])
-
-  _LT_PROG_FUNCTION_REPLACE([func_xform], [    func_xform_result=${1%.*}.lo])
-
-  _LT_PROG_FUNCTION_REPLACE([func_arith], [    func_arith_result=$(( $[*] ))])
-
-  _LT_PROG_FUNCTION_REPLACE([func_len], [    func_len_result=${#1}])
-fi
-
-if test x"$lt_shell_append" = xyes; then
-  _LT_PROG_FUNCTION_REPLACE([func_append], [    eval "${1}+=\\${2}"])
-
-  _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
-    func_quote_for_eval "${2}"
-dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
-    eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
-
-  # Save a `func_append' function call where possible by direct use of '+='
-  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
-    && mv -f "$cfgfile.tmp" "$cfgfile" \
-      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-  test 0 -eq $? || _lt_function_replace_fail=:
-else
-  # Save a `func_append' function call even when '+=' is not available
-  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
-    && mv -f "$cfgfile.tmp" "$cfgfile" \
-      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-  test 0 -eq $? || _lt_function_replace_fail=:
-fi
-
-if test x"$_lt_function_replace_fail" = x":"; then
-  AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
-fi
-])
-
-# _LT_PATH_CONVERSION_FUNCTIONS
-# -----------------------------
-# Determine which file name conversion functions should be used by
-# func_to_host_file (and, implicitly, by func_to_host_path).  These are needed
-# for certain cross-compile configurations and native mingw.
-m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_MSG_CHECKING([how to convert $build file names to $host format])
-AC_CACHE_VAL(lt_cv_to_host_file_cmd,
-[case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
-        ;;
-    esac
-    ;;
-  *-*-cygwin* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_noop
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
-        ;;
-    esac
-    ;;
-  * ) # unhandled hosts (and "normal" native builds)
-    lt_cv_to_host_file_cmd=func_convert_file_noop
-    ;;
-esac
-])
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
-_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
-         [0], [convert $build file names to $host format])dnl
-
-AC_MSG_CHECKING([how to convert $build file names to toolchain format])
-AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
-[#assume ordinary cross tools, or native build.
-lt_cv_to_tool_file_cmd=func_convert_file_noop
-case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
-        ;;
-    esac
-    ;;
-esac
-])
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
-_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
-         [0], [convert $build files to toolchain format])dnl
-])# _LT_PATH_CONVERSION_FUNCTIONS
-
-# Helper functions for option handling.                    -*- Autoconf -*-
-#
-#   Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
-#   Inc.
-#   Written by Gary V. Vaughan, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 7 ltoptions.m4
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
-
-
-# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
-# ------------------------------------------
-m4_define([_LT_MANGLE_OPTION],
-[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
-
-
-# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
-# ---------------------------------------
-# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
-# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
-# saved as a flag.
-m4_define([_LT_SET_OPTION],
-[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
-m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
-        _LT_MANGLE_DEFUN([$1], [$2]),
-    [m4_warning([Unknown $1 option `$2'])])[]dnl
-])
-
-
-# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
-# ------------------------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-m4_define([_LT_IF_OPTION],
-[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
-
-
-# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
-# -------------------------------------------------------
-# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
-# are set.
-m4_define([_LT_UNLESS_OPTIONS],
-[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-	    [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
-		      [m4_define([$0_found])])])[]dnl
-m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
-])[]dnl
-])
-
-
-# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
-# ----------------------------------------
-# OPTION-LIST is a space-separated list of Libtool options associated
-# with MACRO-NAME.  If any OPTION has a matching handler declared with
-# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
-# the unknown option and exit.
-m4_defun([_LT_SET_OPTIONS],
-[# Set options
-m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-    [_LT_SET_OPTION([$1], _LT_Option)])
-
-m4_if([$1],[LT_INIT],[
-  dnl
-  dnl Simply set some default values (i.e off) if boolean options were not
-  dnl specified:
-  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
-  ])
-  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
-  ])
-  dnl
-  dnl If no reference was made to various pairs of opposing options, then
-  dnl we run the default mode handler for the pair.  For example, if neither
-  dnl `shared' nor `disable-shared' was passed, we enable building of shared
-  dnl archives by default:
-  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
-  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
-  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
-  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
-  		   [_LT_ENABLE_FAST_INSTALL])
-  ])
-])# _LT_SET_OPTIONS
-
-
-
-# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
-# -----------------------------------------
-m4_define([_LT_MANGLE_DEFUN],
-[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
-
-
-# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
-# -----------------------------------------------
-m4_define([LT_OPTION_DEFINE],
-[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
-])# LT_OPTION_DEFINE
-
-
-# dlopen
-# ------
-LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
-])
-
-AU_DEFUN([AC_LIBTOOL_DLOPEN],
-[_LT_SET_OPTION([LT_INIT], [dlopen])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `dlopen' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
-
-
-# win32-dll
-# ---------
-# Declare package support for building win32 dll's.
-LT_OPTION_DEFINE([LT_INIT], [win32-dll],
-[enable_win32_dll=yes
-
-case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
-  AC_CHECK_TOOL(AS, as, false)
-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-  ;;
-esac
-
-test -z "$AS" && AS=as
-_LT_DECL([], [AS],      [1], [Assembler program])dnl
-
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
-
-test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
-])# win32-dll
-
-AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-_LT_SET_OPTION([LT_INIT], [win32-dll])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `win32-dll' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
-
-
-# _LT_ENABLE_SHARED([DEFAULT])
-# ----------------------------
-# implement the --enable-shared flag, and supports the `shared' and
-# `disable-shared' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_SHARED],
-[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([shared],
-    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
-	[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
-
-    _LT_DECL([build_libtool_libs], [enable_shared], [0],
-	[Whether or not to build shared libraries])
-])# _LT_ENABLE_SHARED
-
-LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
-
-# Old names:
-AC_DEFUN([AC_ENABLE_SHARED],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
-])
-
-AC_DEFUN([AC_DISABLE_SHARED],
-[_LT_SET_OPTION([LT_INIT], [disable-shared])
-])
-
-AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
-AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_ENABLE_SHARED], [])
-dnl AC_DEFUN([AM_DISABLE_SHARED], [])
-
-
-
-# _LT_ENABLE_STATIC([DEFAULT])
-# ----------------------------
-# implement the --enable-static flag, and support the `static' and
-# `disable-static' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_STATIC],
-[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([static],
-    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
-	[build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
-
-    _LT_DECL([build_old_libs], [enable_static], [0],
-	[Whether or not to build static libraries])
-])# _LT_ENABLE_STATIC
-
-LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
-
-# Old names:
-AC_DEFUN([AC_ENABLE_STATIC],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
-])
-
-AC_DEFUN([AC_DISABLE_STATIC],
-[_LT_SET_OPTION([LT_INIT], [disable-static])
-])
-
-AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
-AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_ENABLE_STATIC], [])
-dnl AC_DEFUN([AM_DISABLE_STATIC], [])
-
-
-
-# _LT_ENABLE_FAST_INSTALL([DEFAULT])
-# ----------------------------------
-# implement the --enable-fast-install flag, and support the `fast-install'
-# and `disable-fast-install' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_FAST_INSTALL],
-[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([fast-install],
-    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
-    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_fast_install=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
-
-_LT_DECL([fast_install], [enable_fast_install], [0],
-	 [Whether or not to optimize for fast installation])dnl
-])# _LT_ENABLE_FAST_INSTALL
-
-LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
-
-# Old names:
-AU_DEFUN([AC_ENABLE_FAST_INSTALL],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `fast-install' option into LT_INIT's first parameter.])
-])
-
-AU_DEFUN([AC_DISABLE_FAST_INSTALL],
-[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `disable-fast-install' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
-dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
-
-
-# _LT_WITH_PIC([MODE])
-# --------------------
-# implement the --with-pic flag, and support the `pic-only' and `no-pic'
-# LT_INIT options.
-# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
-m4_define([_LT_WITH_PIC],
-[AC_ARG_WITH([pic],
-    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
-	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [lt_p=${PACKAGE-default}
-    case $withval in
-    yes|no) pic_mode=$withval ;;
-    *)
-      pic_mode=default
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for lt_pkg in $withval; do
-	IFS="$lt_save_ifs"
-	if test "X$lt_pkg" = "X$lt_p"; then
-	  pic_mode=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [pic_mode=default])
-
-test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
-
-_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
-])# _LT_WITH_PIC
-
-LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
-LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
-
-# Old name:
-AU_DEFUN([AC_LIBTOOL_PICMODE],
-[_LT_SET_OPTION([LT_INIT], [pic-only])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `pic-only' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
-
-
-m4_define([_LTDL_MODE], [])
-LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
-		 [m4_define([_LTDL_MODE], [nonrecursive])])
-LT_OPTION_DEFINE([LTDL_INIT], [recursive],
-		 [m4_define([_LTDL_MODE], [recursive])])
-LT_OPTION_DEFINE([LTDL_INIT], [subproject],
-		 [m4_define([_LTDL_MODE], [subproject])])
-
-m4_define([_LTDL_TYPE], [])
-LT_OPTION_DEFINE([LTDL_INIT], [installable],
-		 [m4_define([_LTDL_TYPE], [installable])])
-LT_OPTION_DEFINE([LTDL_INIT], [convenience],
-		 [m4_define([_LTDL_TYPE], [convenience])])
-
-# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
-#
-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-# Written by Gary V. Vaughan, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 6 ltsugar.m4
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
-
-
-# lt_join(SEP, ARG1, [ARG2...])
-# -----------------------------
-# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
-# associated separator.
-# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
-# versions in m4sugar had bugs.
-m4_define([lt_join],
-[m4_if([$#], [1], [],
-       [$#], [2], [[$2]],
-       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
-m4_define([_lt_join],
-[m4_if([$#$2], [2], [],
-       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
-
-
-# lt_car(LIST)
-# lt_cdr(LIST)
-# ------------
-# Manipulate m4 lists.
-# These macros are necessary as long as will still need to support
-# Autoconf-2.59 which quotes differently.
-m4_define([lt_car], [[$1]])
-m4_define([lt_cdr],
-[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
-       [$#], 1, [],
-       [m4_dquote(m4_shift($@))])])
-m4_define([lt_unquote], $1)
-
-
-# lt_append(MACRO-NAME, STRING, [SEPARATOR])
-# ------------------------------------------
-# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
-# Note that neither SEPARATOR nor STRING are expanded; they are appended
-# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
-# No SEPARATOR is output if MACRO-NAME was previously undefined (different
-# than defined and empty).
-#
-# This macro is needed until we can rely on Autoconf 2.62, since earlier
-# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
-m4_define([lt_append],
-[m4_define([$1],
-	   m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
-
-
-
-# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
-# ----------------------------------------------------------
-# Produce a SEP delimited list of all paired combinations of elements of
-# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
-# has the form PREFIXmINFIXSUFFIXn.
-# Needed until we can rely on m4_combine added in Autoconf 2.62.
-m4_define([lt_combine],
-[m4_if(m4_eval([$# > 3]), [1],
-       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
-[[m4_foreach([_Lt_prefix], [$2],
-	     [m4_foreach([_Lt_suffix],
-		]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
-	[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
-
-
-# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
-# -----------------------------------------------------------------------
-# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
-# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
-m4_define([lt_if_append_uniq],
-[m4_ifdef([$1],
-	  [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
-		 [lt_append([$1], [$2], [$3])$4],
-		 [$5])],
-	  [lt_append([$1], [$2], [$3])$4])])
-
-
-# lt_dict_add(DICT, KEY, VALUE)
-# -----------------------------
-m4_define([lt_dict_add],
-[m4_define([$1($2)], [$3])])
-
-
-# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
-# --------------------------------------------
-m4_define([lt_dict_add_subkey],
-[m4_define([$1($2:$3)], [$4])])
-
-
-# lt_dict_fetch(DICT, KEY, [SUBKEY])
-# ----------------------------------
-m4_define([lt_dict_fetch],
-[m4_ifval([$3],
-	m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
-    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
-
-
-# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
-# -----------------------------------------------------------------
-m4_define([lt_if_dict_fetch],
-[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
-	[$5],
-    [$6])])
-
-
-# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
-# --------------------------------------------------------------
-m4_define([lt_dict_filter],
-[m4_if([$5], [], [],
-  [lt_join(m4_quote(m4_default([$4], [[, ]])),
-           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
-		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
-])
-
-# ltversion.m4 -- version numbers			-*- Autoconf -*-
-#
-#   Copyright (C) 2004 Free Software Foundation, Inc.
-#   Written by Scott James Remnant, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# @configure_input@
-
-# serial 3337 ltversion.m4
-# This file is part of GNU Libtool
-
-m4_define([LT_PACKAGE_VERSION], [2.4.2])
-m4_define([LT_PACKAGE_REVISION], [1.3337])
-
-AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4.2'
-macro_revision='1.3337'
-_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
-_LT_DECL(, macro_revision, 0)
-])
-
-# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
-#
-#   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
-#   Written by Scott James Remnant, 2004.
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 5 lt~obsolete.m4
-
-# These exist entirely to fool aclocal when bootstrapping libtool.
-#
-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
-# which have later been changed to m4_define as they aren't part of the
-# exported API, or moved to Autoconf or Automake where they belong.
-#
-# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
-# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
-# using a macro with the same name in our local m4/libtool.m4 it'll
-# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
-# and doesn't know about Autoconf macros at all.)
-#
-# So we provide this file, which has a silly filename so it's always
-# included after everything else.  This provides aclocal with the
-# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
-# because those macros already exist, or will be overwritten later.
-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
-#
-# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
-# Yes, that means every name once taken will need to remain here until
-# we give up compatibility with versions before 1.7, at which point
-# we need to keep only those names which we still refer to.
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
-
-m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
-m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])
-m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
-m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])
-m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
-m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])
-m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])
-m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
-m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])
-m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])
-m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])
-m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
-m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
-m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
-m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
-m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])
-m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])
-m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
-m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
-m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])
-m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])
-m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
-m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
-m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
-m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
-m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
-m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])
-m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])
-m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])
-m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
-m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])
-m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])
-m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])
-m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])
-m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
-m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])
-m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
-m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
-m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
-m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
-m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
-m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
-m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
-m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
-m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
-m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
-m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
-m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
-m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
-m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
-m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
-m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
-m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
-m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
-m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
-
diff --git a/acsite.m4 b/acsite.m4
index eaab535..1782033 100644
--- a/acsite.m4
+++ b/acsite.m4
@@ -1,17 +1,15 @@
 dnl -------------------------------------------------------------------------
 dnl -------------------------------------------------------------------------
 dnl
-dnl Copyright by the Board of Trustees of the University of Illinois.
+dnl Copyright by The HDF Group.
 dnl All rights reserved.
 dnl
 dnl This file is part of HDF5.  The full HDF5 copyright notice, including
 dnl terms governing use, modification, and redistribution, is contained in
-dnl the files COPYING and Copyright.html.  COPYING can be found at the root
-dnl of the source code distribution tree; Copyright.html can be found at the
-dnl root level of an installed copy of the electronic HDF5 document set and
-dnl is linked from the top-level documents page.  It can also be found at
-dnl http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
-dnl access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
+dnl the COPYING file, which can be found at the root of the source code
+dnl dnl distribution tree, or in https://www.hdfgroup.org/licenses.
+dnl dnl If you do not have access to either file, you may request a copy from
+dnl dnl help@hdfgroup.org.
 dnl
 dnl Macros for HDF5 Fortran
 dnl
@@ -22,9 +20,9 @@ dnl -------------------------------------------------------------------------
 dnl _AC_SYS_LARGEFILE_MACRO_VALUE
 dnl
 dnl The following macro overrides the autoconf macro of the same name
-dnl with this custom definition. This macro performs the same checks as 
+dnl with this custom definition. This macro performs the same checks as
 dnl autoconf's native _AC_SYS_LARGEFILE_MACRO_VALUE, but will also set
-dnl AM_CPPFLAGS with the appropriate -D defines so additional configure 
+dnl AM_CPPFLAGS with the appropriate -D defines so additional configure
 dnl sizeof checks do not fail.
 dnl
 # _AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE,
@@ -53,87 +51,3 @@ esac
 rm -rf conftest*[]dnl
 ])# _AC_SYS_LARGEFILE_MACRO_VALUE
 
-dnl -------------------------------------------------------------------------
-dnl AC_F9X_MODS()
-dnl
-dnl	Check how F9X handles modules. This macro also checks which
-dnl	command-line option to use to include the module once it's built.
-dnl
-AC_DEFUN(AC_F9X_MODS,
-[AC_MSG_CHECKING(what $FC does with modules)
-AC_LANG_PUSH(Fortran)
-
-test -d conftestdir || mkdir conftestdir
-cd conftestdir
-rm -rf *
-
-cat >conftest.$ac_ext <<EOF
-      module module
-         integer foo
-      end module module
-EOF
-
-eval $ac_compile
-modfiles=""
-F9XMODEXT=""
-
-for f in conftest.o module.mod MODULE.mod module.M MODULE.M; do
-  if test -f "$f" ; then
-    modfiles="$f"
-
-    case "$f" in
-      *.o)   F9XMODEXT="o" ;;
-      *.mod) F9XMODEXT="mod" ;;
-      *.M)   F9XMODEXT="M" ;;
-    esac
-  fi
-done
-
-echo $modfiles 6>&1
-if test "$modfiles" = file.o; then
-  echo $ac_n "checking whether $FC -em is saner""... $ac_c" 1>&6
-  OLD_FCFLAGS=$FCFLAGS
-  FCFLAGS="$FCFLAGS -em"
-  eval $ac_compile
-  modfiles=""
-  for f in file.o module.mod MODULE.mod module.M MODULE.M; do
-    test -f $f && modfiles="$f"
-  done
-  if test "$modfiles" = "file.o"; then
-    FCFLAGS=$OLD_FCFLAGS
-    echo no 6>&1
-  else
-    echo yes 6>&1
-  fi
-fi
-cd ..
-
-AC_MSG_CHECKING(how $FC finds modules)
-
-for flag in "-I" "-M" "-p"; do
-  cat >conftest.$ac_ext <<EOF
-      program conftest
-          use module
-      end program conftest
-EOF
-
-  ac_compile='${FC-f90} $FCFLAGS ${flag}conftestdir -c conftest.$ac_ext 1>&AS_MESSAGE_LOG_FD'
-
-  if AC_TRY_EVAL(ac_compile); then
-    F9XMODFLAG=$flag
-    break
-  fi
-done
-
-if test -n "$F9XMODFLAG"; then
-  echo $F9XMODFLAG 1>&6
-  FCFLAGS="$F9XMODFLAG. $FCFLAGS"
-else
-  echo unknown 1>&6
-fi
-AC_SUBST(F9XMODFLAG)
-AC_SUBST(F9XMODEXT)
-rm -rf conftest*
-AC_LANG_POP(Fortran)
-])
-
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000..74c6c45
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,254 @@
+#!/bin/sh
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
+
+# A script to reconfigure autotools for HDF5, and to recreate other
+# generated files specific to HDF5.
+#
+# IMPORTANT OS X NOTE
+#
+# If you are using OS X, you will probably not have the autotools
+# installed, even if you have the Xcode command-line tools.
+#
+# The easiest way to fix this is to install everything via Homebrew:
+#
+#   http://brew.sh/
+#
+# After you install the base packages, install autoconf, automake,
+# and libtool.
+#
+#   brew install autoconf
+#   brew install automake
+#   brew install libtool
+#
+# This only takes a few minutes. Note that libtool and libtoolize will
+# be glibtool and glibtoolize so as not to conflict with Apple's non-gnu
+# tools. This autogen.sh script handles this for you.
+#
+# END IMPORTANT OS X NOTE
+#
+# If you want to use a particular version of the autotools, the paths
+# to each tool can be overridden using the following environment
+# variables:
+#
+#   HDF5_ACLOCAL
+#   HDF5_AUTOHEADER
+#   HDF5_AUTOMAKE
+#   HDF5_AUTOCONF
+#   HDF5_LIBTOOL
+#   HDF5_M4
+#
+# Note that aclocal will attempt to include libtool's share/aclocal
+# directory.
+#
+# Aside from -h for help, this script takes one potential option:
+#
+# -v
+#
+# This emits some extra information, mainly tool versions.
+
+echo
+echo "**************************"
+echo "* HDF5 autogen.sh script *"
+echo "**************************"
+echo
+
+# Default is not verbose output
+verbose=false
+
+optspec=":hpv-"
+while getopts "$optspec" optchar; do
+    case "${optchar}" in
+    h)
+        echo "usage: $0 [OPTIONS]"
+        echo
+        echo "      -h      Print this help message."
+        echo
+        echo "      -v      Show more verbose output."
+        echo
+        echo "  NOTE: Each tool can be set via an environment variable."
+        echo "        These are documented inside this autogen.sh script."
+        echo
+        exit 0
+        ;;
+    v)
+        echo "Setting verbosity: high"
+        echo
+        verbose=true
+        ;;
+    *)
+        if [ "$OPTERR" != 1 ] || case $optspec in :*) ;; *) false; esac; then
+            echo "ERROR: non-option argument: '-${OPTARG}'" >&2
+            echo "Quitting"
+            exit 1
+        fi
+        ;;
+    esac
+done
+
+# If paths to autotools are not specified, use whatever the system
+# has installed as the default. We use 'command -v <tool>' to
+# show exactly what's being used (shellcheck complains that 'which'
+# is non-standard and deprecated).
+if test -z "${HDF5_AUTOCONF}"; then
+    HDF5_AUTOCONF="$(command -v autoconf)"
+fi
+if test -z "${HDF5_AUTOMAKE}"; then
+    HDF5_AUTOMAKE="$(command -v automake)"
+fi
+if test -z "${HDF5_AUTOHEADER}"; then
+    HDF5_AUTOHEADER="$(command -v autoheader)"
+fi
+if test -z "${HDF5_ACLOCAL}"; then
+    HDF5_ACLOCAL="$(command -v aclocal)"
+fi
+if test -z "${HDF5_LIBTOOL}"; then
+    case "$(uname)" in
+    Darwin*)
+        # libtool on OS-X is non-gnu
+        HDF5_LIBTOOL="$(command -v glibtool)"
+        ;;
+    *)
+        HDF5_LIBTOOL="$(command -v libtool)"
+        ;;
+    esac
+fi
+if test -z "${HDF5_M4}"; then
+    HDF5_M4="$(command -v m4)"
+fi
+
+
+# Make sure that these versions of the autotools are in the path
+AUTOCONF_DIR=$(dirname "${HDF5_AUTOCONF}")
+LIBTOOL_DIR=$(dirname "${HDF5_LIBTOOL}")
+M4_DIR=$(dirname "${HDF5_M4}")
+PATH=${AUTOCONF_DIR}:${LIBTOOL_DIR}:${M4_DIR}:$PATH
+
+# Make libtoolize match the specified libtool
+case "$(uname)" in
+Darwin*)
+    # On OS X, libtoolize could be named glibtoolize or
+    # libtoolize. Try the former first, then fall back
+    # to the latter if it's not found.
+    HDF5_LIBTOOLIZE="${LIBTOOL_DIR}/glibtoolize"
+    if [ ! -f "$HDF5_LIBTOOLIZE" ] ; then
+        HDF5_LIBTOOLIZE="${LIBTOOL_DIR}/libtoolize"
+    fi
+    ;;
+*)
+    HDF5_LIBTOOLIZE="${LIBTOOL_DIR}/libtoolize"
+    ;;
+esac
+
+# Run scripts that process source.
+#
+# These should be run before the autotools so that failures here block
+# compilation.
+
+# Run trace script
+# The trace script adds H5TRACE macros to library source files.  It should
+# have no effect on files that don't have HDF5 API macros in them.
+echo "Running trace script:"
+bin/trace src/H5*.c || exit 1
+echo
+
+# Run make_err
+# make_err automatically generates the H5E headers that create error message
+# types for HDF5.
+echo "Running error generation script:"
+bin/make_err src/H5err.txt || exit 1
+echo
+
+# Run make_vers
+# make_vers automatically generates the public headers that define the API version
+# macros for HDF5.
+echo "Running API version generation script:"
+bin/make_vers src/H5vers.txt || exit 1
+echo
+
+# Run make_overflow
+# make_overflow automatically generates macros for detecting overflows for type
+# conversion.
+echo "Running overflow macro generation script:"
+bin/make_overflow src/H5overflow.txt || exit 1
+echo
+
+# Run autotools in order
+#
+# When available, we use the --force option to ensure all files are
+# updated. This prevents the autotools from re-running to fix dependencies
+# during the 'make' step, which can be a problem if environment variables
+# were set on the command line during autogen invocation.
+
+# Some versions of libtoolize will suggest that we add ACLOCAL_AMFLAGS
+# = '-I m4'. This is already done in commence.am, which is included
+# in Makefile.am. You can ignore this suggestion.
+
+# LIBTOOLIZE
+libtoolize_cmd="${HDF5_LIBTOOLIZE} --copy --force"
+echo "${libtoolize_cmd}"
+if [ "$verbose" = true ] ; then
+    ${HDF5_LIBTOOLIZE} --version
+fi
+${libtoolize_cmd} || exit 1
+echo
+echo "NOTE: You can ignore the warning about adding -I m4."
+echo "      We already do this in an included file."
+echo
+
+# ACLOCAL
+if test -e "${LIBTOOL_DIR}/../share/aclocal" ; then
+    aclocal_include="-I ${LIBTOOL_DIR}/../share/aclocal"
+fi
+aclocal_cmd="${HDF5_ACLOCAL} --force -I m4 ${aclocal_include}"
+echo "${aclocal_cmd}"
+if [ "$verbose" = true ] ; then
+    ${HDF5_ACLOCAL} --version
+fi
+${aclocal_cmd} || exit 1
+echo
+
+# AUTOHEADER
+autoheader_cmd="${HDF5_AUTOHEADER} --force"
+echo "${autoheader_cmd}"
+if [ "$verbose" = true ] ; then
+    ${HDF5_AUTOHEADER} --version
+fi
+${autoheader_cmd} || exit 1
+echo
+
+# AUTOMAKE
+automake_cmd="${HDF5_AUTOMAKE} --copy --add-missing --force-missing"
+echo "${automake_cmd}"
+if [ "$verbose" = true ] ; then
+    ${HDF5_AUTOMAKE} --version
+fi
+${automake_cmd} || exit 1
+echo
+
+# AUTOCONF
+# The "obsolete" warnings category flags our Java macros as obsolete.
+# Since there is no clear way to upgrade them (Java support in the Autotools
+# is not great) and they work well enough for now, we suppress those warnings.
+autoconf_cmd="${HDF5_AUTOCONF} --force --warnings=no-obsolete"
+echo "${autoconf_cmd}"
+if [ "$verbose" = true ] ; then
+    ${HDF5_AUTOCONF} --version
+fi
+${autoconf_cmd} || exit 1
+echo
+
+echo "*** SUCCESS ***"
+
+echo
+exit 0
+
diff --git a/bin/COPYING b/bin/COPYING
deleted file mode 100755
index 6903daf..0000000
--- a/bin/COPYING
+++ /dev/null
@@ -1,16 +0,0 @@
-
-  Copyright by  The HDF Group and 
-                The Board of Trustees of the University of Illinois. 
-  All rights reserved. 
-
-  The files and subdirectories in this directory are part of HDF5.  
-  The full HDF5 copyright notice, including terms governing use, 
-  modification, and redistribution, is contained in the files COPYING 
-  and Copyright.html.  COPYING can be found at the root of the source 
-  code distribution tree; Copyright.html can be found at the root 
-  level of an installed copy of the electronic HDF5 document set and 
-  is linked from the top-level documents page.  It can also be found 
-  at http://www.hdfgroup.org/HDF5/doc/Copyright.html.  If you do not 
-  have access to either file, you may request a copy from 
-  help@hdfgroup.org. 
-
diff --git a/bin/Makefile.am b/bin/Makefile.am
new file mode 100644
index 0000000..96a4969
--- /dev/null
+++ b/bin/Makefile.am
@@ -0,0 +1,56 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+##
+## Makefile.am
+## Run automake to generate a Makefile.in from this file.
+#
+# HDF5 Library Makefile(.in)
+#
+
+include $(top_srcdir)/config/commence.am
+
+# Include src directory
+AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
+
+# These are our main targets
+bin_SCRIPTS=h5redeploy
+
+# Tell automake to clean h5redeploy script
+CLEANFILES=h5redeploy
+
+# These were generated by configure.  Remove them only when distclean.
+DISTCLEANFILES=h5cc
+
+# All programs rely on hdf5 library and h5tools library
+LDADD=$(LIBH5TOOLS) $(LIBHDF5)
+
+# How to build h5redeploy script
+h5redeploy: h5redeploy.in
+	@cp $(srcdir)/$@.in $@
+
+# h5cc needs custom install and uninstall rules, since it may be
+# named h5pcc if hdf5 is being built in parallel mode.
+if BUILD_PARALLEL_CONDITIONAL
+  H5CC_NAME=h5pcc
+else
+  H5CC_NAME=h5cc
+endif
+
+$(DESTDIR)$(bindir):
+	echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1;
+
+install-exec-local: $(DESTDIR)$(bindir)
+	@$(INSTALL) h5cc $(DESTDIR)$(bindir)/$(H5CC_NAME)
+uninstall-local:
+	@$(RM) $(DESTDIR)$(bindir)/$(H5CC_NAME)
+
+include $(top_srcdir)/config/conclude.am
diff --git a/bin/README b/bin/README
deleted file mode 100644
index 1c77043..0000000
--- a/bin/README
+++ /dev/null
@@ -1,2 +0,0 @@
-The daily tests run copies of some of the scripts in this directory from another repository, notably snapshot and runtest.  The copies in this directory should work, but are not used in daily tests, though they should be tested occasionally.  
-
diff --git a/bin/README.md b/bin/README.md
new file mode 100644
index 0000000..856f348
--- /dev/null
+++ b/bin/README.md
@@ -0,0 +1,31 @@
+# Scripts in `bin` and their purpose
+
+Programs run via `autogen.sh` (or the equivalent in CMake) are indicated.
+
+|Program|Purpose|
+|-------|-------|
+|`buildhdf5`|Convenience script to build HDF5 using the Autotools|
+|`checkapi`|Checks if public API calls are used in internal functions|
+|`checkposix`|Checks if C/POSIX calls are prefixed with `HD`|
+|`chkcopyright`|Checks if files have appropriate copyright statements|
+|`cmakehdf5`|Convenience script to build HDF5 using CMake|
+|`debug-ohdr`|Examines debug output from `H5O_open/close` to look for open objects|
+|`format_source`|Runs `clang-format` over the source files, applying our rules|
+|`genparser`|Creates the flex/bison-based parser files in the high-level library|
+|`h5cc.in`|Input file from which h5cc is created|
+|`h5redeploy.in`|Input file from which h5redeploy is created|
+|`h5vers`|Updates the library version number|
+|`make_err`|Generates the H5E header files (called in `autogen.sh`)|
+|`make_vers`|Generates H5version.h (called in `autogen.sh`)|
+|`make_overflow`|Generates H5overflow.h (called in `autogen.sh`)|
+|`output_filter`|Used in the tools test code to strip extraneous output before we diff files|
+|`restore.sh`|Removes files generated by `autogen.sh`|
+|`runbkprog`|Used by CMake to run test programs in the background|
+|`switch_maint_mode`|Switches maintainer mode on/off in `configure.ac`|
+|`trace`|Adds `TRACE` macros to HDF5 C library source files (run by `autogen.sh`)|
+|`warnhist`|Generates compiler warning statistics for gcc/clang when fed output of make|
+
+## TODO
+
+* chkcopyright is currently semi-broken as it doesn't handle the full variety of copyright headers we need. We're leaving it in place, though, in the hopes that someone will update it in the future.
+* Extending warnhist to better understand the output of additional compilers/languages would be nice.
diff --git a/bin/batch/ctest.qsub.in.cmake b/bin/batch/ctest.qsub.in.cmake
new file mode 100755
index 0000000..da3ae2f
--- /dev/null
+++ b/bin/batch/ctest.qsub.in.cmake
@@ -0,0 +1,23 @@
+#!/bin/bash -l
+if [ $# -gt 0 ]; then
+    SUMMARY_FILE=$1
+fi
+ACCOUNT_ID=@ACCOUNT_ID@
+
+echo "Run parallel test command. Test output will be in build/${SUMMARY_FILE}"
+CTEST_CMD=`which ctest`
+
+#SKIPTESTS <<KEYWORD:script inserts list of skips tests here -- don't remove>>
+
+cd @HDF5_BINARY_DIR@
+if [[ $SUMMARY_FILE == *"ctestS"* ]]; then
+  CMD="${CTEST_CMD} -S ctest_serial.cmake"
+  qsub -t 60 -n 1 -q debug-flat-quad -A ${ACCOUNT_ID} ${CMD} >& ${SUMMARY_FILE}
+  echo "Done running ctest serial command."
+  touch ctestS.done
+else
+  CMD="${CTEST_CMD} -S ctest_parallel.cmake"
+  qsub -t 60 -n 1 -q debug-flat-quad -A ${ACCOUNT_ID} ${CMD} >& ${SUMMARY_FILE}
+  echo "Done running ctest parallel command."
+  touch ctestP.done
+fi
diff --git a/bin/batch/ctestP.lsf.in.cmake b/bin/batch/ctestP.lsf.in.cmake
new file mode 100644
index 0000000..8b89c9c
--- /dev/null
+++ b/bin/batch/ctestP.lsf.in.cmake
@@ -0,0 +1,20 @@
+#!/bin/tcsh
+### LSF syntax
+#BSUB -nnodes 1                  #number of nodes
+#BSUB -W 30                      #walltime in minutes
+#BSUB -G guests                  #account
+#BSUB -e ctestPerrors.txt        #stderr
+#BSUB -o ctestPoutput.txt        #stdout
+#BSUB -J hdf5_ctestP             #job
+##BSUB -q pbatch                 #queue to use
+#BSUB -q pdebug
+
+##date; hostname
+##echo -n 'JobID is '; echo $LSB_JOBID
+
+cd @HDF5_BINARY_DIR@
+echo "Run parallel test command. Test output will be in build/ctestP.out"
+ctest -S ctest_parallel.cmake >& ctestP.out
+
+echo "Done running ctest parallel command."
+touch ctestP.done
diff --git a/bin/batch/ctestP.sl.in.cmake b/bin/batch/ctestP.sl.in.cmake
new file mode 100644
index 0000000..599fee8
--- /dev/null
+++ b/bin/batch/ctestP.sl.in.cmake
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+#SBATCH --nodes=1
+#SBATCH -t 00:30:00
+#SBATCH --mail-type=BEGIN,END,FAIL
+##SBATCH --mail-user=<username>@sandia.gov
+#SBATCH --export=ALL
+#SBATCH --job-name=h5_ctestP
+
+cd @HDF5_BINARY_DIR@
+echo "Run parallel test command. Test output will be in build/ctestP.out"
+ctest -S ctest_parallel.cmake >& ctestP.out
+
+echo "Done running ctest parallel command."
+touch ctestP.done
diff --git a/bin/batch/ctestS.lsf.in.cmake b/bin/batch/ctestS.lsf.in.cmake
new file mode 100644
index 0000000..73b17c0
--- /dev/null
+++ b/bin/batch/ctestS.lsf.in.cmake
@@ -0,0 +1,17 @@
+#!/bin/tcsh
+### LSF syntax
+#BSUB -nnodes 1                  #number of nodes
+#BSUB -W 29                      #walltime in minutes
+#BSUB -G guests                  #account
+#BSUB -e ctestSerrors.txt        #stderr
+#BSUB -o ctestSoutput.txt        #stdout
+#BSUB -J hdf5_ctestS             #job
+##BSUB -q pbatch                 #queue to use
+#BSUB -q pdebug
+
+cd @HDF5_BINARY_DIR@
+echo "Run command. Test output will be in build/ctestS.out"
+ctest -S ctest_serial.cmake >& ctestS.out
+
+echo "Done running command."
+touch ctestS.done
diff --git a/bin/batch/ctestS.sl.in.cmake b/bin/batch/ctestS.sl.in.cmake
new file mode 100644
index 0000000..bf0d6ae
--- /dev/null
+++ b/bin/batch/ctestS.sl.in.cmake
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+#SBATCH --nodes=1
+#SBATCH -t 00:30:00
+#SBATCH --mail-type=BEGIN,END,FAIL
+##SBATCH --mail-user=<username>@sandia.gov
+#SBATCH --export=ALL
+#SBATCH --job-name=h5_ctestS
+
+cd @HDF5_BINARY_DIR@
+echo "Run command. Test output will be in build/ctestS.out"
+ctest -S ctest_serial.cmake >& ctestS.out
+
+echo "Done running command."
+touch ctestS.done
diff --git a/bin/batch/ctest_parallel.cmake.in b/bin/batch/ctest_parallel.cmake.in
new file mode 100644
index 0000000..f35a772
--- /dev/null
+++ b/bin/batch/ctest_parallel.cmake.in
@@ -0,0 +1,12 @@
+if(NOT "$ENV{CI_SITE_NAME}" STREQUAL "")
+  set(CTEST_SITE "$ENV{CI_SITE_NAME}")
+endif()
+if(NOT "$ENV{CI_BUILD_NAME}" STREQUAL "")
+  set(CTEST_BUILD_NAME "$ENV{CI_BUILD_NAME}")
+endif()
+
+ctest_start ("$ENV{CI_MODEL}" "@HDF5_SOURCE_DIR@" "@HDF5_BINARY_DIR@" APPEND)
+ctest_test (BUILD "@HDF5_BINARY_DIR@" APPEND INCLUDE MPI_TEST_ RETURN_VALUE res)
+if (${res} LESS 0 OR ${res} GREATER 0)
+      file (APPEND ${CTEST_SCRIPT_DIRECTORY}/FailedCTest.txt "Failed Tests: ${res}\n")
+      endif ()
diff --git a/bin/batch/ctest_serial.cmake.in b/bin/batch/ctest_serial.cmake.in
new file mode 100644
index 0000000..e54421b
--- /dev/null
+++ b/bin/batch/ctest_serial.cmake.in
@@ -0,0 +1,12 @@
+if(NOT "$ENV{CI_SITE_NAME}" STREQUAL "")
+  set(CTEST_SITE "$ENV{CI_SITE_NAME}")
+endif()
+if(NOT "$ENV{CI_BUILD_NAME}" STREQUAL "")
+  set(CTEST_BUILD_NAME "$ENV{CI_BUILD_NAME}")
+endif()
+
+ctest_start ("$ENV{CI_MODEL}" "@HDF5_SOURCE_DIR@" "@HDF5_BINARY_DIR@" APPEND)
+ctest_test (BUILD "@HDF5_BINARY_DIR@" APPEND EXCLUDE MPI_TEST_ PARALLEL_LEVEL 32 RETURN_VALUE res)
+if (${res} LESS 0 OR ${res} GREATER 0)
+      file (APPEND ${CTEST_SCRIPT_DIRECTORY}/FailedCTest.txt "Failed Tests: ${res}\n")
+      endif ()
diff --git a/bin/batch/knl_H5detect.sl.in.cmake b/bin/batch/knl_H5detect.sl.in.cmake
new file mode 100644
index 0000000..39a3ef3
--- /dev/null
+++ b/bin/batch/knl_H5detect.sl.in.cmake
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+#SBATCH -p knl -C quad
+#SBATCH --nodes=1
+#SBATCH -t 00:10:00
+#SBATCH --mail-type=BEGIN,END,FAIL
+#SBATCH --mail-user=<username>@sandia.gov
+#SBATCH --export=ALL
+#SBATCH --job-name=knl_h5detect
+
+
+# Inputs:  Build directory, output file name, executable file name (username/email if available).
+PROGNAME=H5detect
+OUTPUT=H5Tinit.c
+
+CMD="@HDF5_BINARY_DIR@/bin/${PROGNAME} @HDF5_GENERATED_SOURCE_DIR@/${OUTPUT}"
+echo "Run $CMD"
+srun -n 1 $CMD
+echo "Done running $CMD"
+
diff --git a/bin/batch/knl_ctestP.sl.in.cmake b/bin/batch/knl_ctestP.sl.in.cmake
new file mode 100644
index 0000000..97bd2ad
--- /dev/null
+++ b/bin/batch/knl_ctestP.sl.in.cmake
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+#SBATCH -p knl -C quad,cache
+#SBATCH --nodes=1
+#SBATCH -t 00:30:00
+#SBATCH --mail-type=BEGIN,END,FAIL
+##SBATCH --mail-user=<username>@sandia.gov
+#SBATCH --export=ALL
+#SBATCH --job-name=h5_ctestP
+
+cd @HDF5_BINARY_DIR@
+echo "Run parallel test command. Test output will be in build/ctestP.out"
+ctest -S ctest_parallel.cmake >& ctestP.out
+
+echo "Done running ctest parallel command."
+touch ctestP.done
diff --git a/bin/batch/knl_ctestS.sl.in.cmake b/bin/batch/knl_ctestS.sl.in.cmake
new file mode 100644
index 0000000..87c4a48
--- /dev/null
+++ b/bin/batch/knl_ctestS.sl.in.cmake
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+#SBATCH -p knl -C quad,cache
+#SBATCH --nodes=1
+#SBATCH -t 00:30:00
+#SBATCH --mail-type=BEGIN,END,FAIL
+##SBATCH --mail-user=<username>@sandia.gov
+#SBATCH --export=ALL
+#SBATCH --job-name=h5_ctestS
+
+cd @HDF5_BINARY_DIR@
+echo "Run command. Test output will be in build/ctestS.out"
+ctest -S ctest_serial.cmake >& ctestS.out
+
+echo "Done running command."
+touch ctestS.done
diff --git a/bin/batch/ray_ctestP.lsf.in.cmake b/bin/batch/ray_ctestP.lsf.in.cmake
new file mode 100644
index 0000000..51425b5
--- /dev/null
+++ b/bin/batch/ray_ctestP.lsf.in.cmake
@@ -0,0 +1,22 @@
+#!/bin/tcsh
+### LSF syntax
+#BSUB -n 6                       #number of nodes
+#BSUB -R "span[ptile=6]"
+#BSUB -W 30                      #walltime in minutes
+#BSUB -G guests                  #account
+#BSUB -e ctestPerrors.txt        #stderr
+#BSUB -o ctestPoutput.txt        #stdout
+#BSUB -J hdf5_ctestP             #job
+##BSUB -q pbatch                 #queue to use
+#BSUB -q pdebug
+
+##date; hostname
+##echo -n 'JobID is '; echo $LSB_JOBID
+
+cd @HDF5_BINARY_DIR@
+echo "Run parallel test command. Test output will be in build/ctestP.out"
+ctest -S ctest_parallel.cmake >& ctestP.out
+
+echo "Done running ctest parallel command."
+touch ctestP.done
+~                
diff --git a/bin/batch/ray_ctestS.lsf.in.cmake b/bin/batch/ray_ctestS.lsf.in.cmake
new file mode 100644
index 0000000..7f585b4
--- /dev/null
+++ b/bin/batch/ray_ctestS.lsf.in.cmake
@@ -0,0 +1,17 @@
+#!/bin/tcsh
+### LSF syntax
+#BSUB -n 1                       #number of nodes
+#BSUB -W 29                      #walltime in minutes
+#BSUB -G guests                  #account
+#BSUB -e ctestSerrors.txt        #stderr
+#BSUB -o ctestSoutput.txt        #stdout
+#BSUB -J hdf5_ctestS             #job
+##BSUB -q pbatch                 #queue to use
+#BSUB -q pdebug
+
+cd @HDF5_BINARY_DIR@
+echo "Run command. Test output will be in build/ctestS.out"
+ctest -S ctest_serial.cmake >& ctestS.out
+
+echo "Done running command."
+touch ctestS.done
diff --git a/bin/batch/raybsub b/bin/batch/raybsub
new file mode 100755
index 0000000..19dceef
--- /dev/null
+++ b/bin/batch/raybsub
@@ -0,0 +1,7 @@
+#!/bin/tcsh
+
+# ray.llnl.gov requires a '<' with bsub for submitting .lsf batch jobs.
+# CMake is reluctant to pass the '<', so we put it in this script and use
+# the script to submit the bsub command on ray.
+
+bsub < $1
diff --git a/bin/bbrelease b/bin/bbrelease
new file mode 100755
index 0000000..c59e2e5
--- /dev/null
+++ b/bin/bbrelease
@@ -0,0 +1,339 @@
+#!/bin/sh
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
+
+# Make a release of hdf5.
+#
+#   NOTE:
+#   This script differs from bin/release in that this has an added
+#   --revision option to create private releases with the code revision
+#   hash in the version strings.
+#
+#   This script can probably be merged into the original release script in
+#   the future.
+
+# Function definitions
+#
+# Print Usage page
+USAGE()
+{
+cat << EOF
+Usage: $0 -d <dir> [-h] [--private] [--revision [--branch BRANCHNAME]] <methods> ...
+   -d DIR       The name of the directory where the release(s) should be
+                placed.
+   --branch BRANCHNAME  This is to get the correct version of the branch name from the
+                        repository.  BRANCHNAME for v1.8 should be hdf5_1_8.
+   -h           print the help page.
+   --private    Make a private release with today's date in version information.
+   --revision   Make a private release with the code revision number in version information.
+                This allows --branch to be used for the file name.
+   --branch BRANCHNAME  This is to get the correct version of the branch name from the
+                        repository.  BRANCHNAME for v1.8 should be hdf5_1_8.
+
+This must be run at the top level of the source directory.
+The other command-line options are the names of the programs to use
+for compressing the resulting tar archive (if none are given then
+"tar" is assumed):
+
+    tar         -- use tar and don't do any compressing.
+    gzip        -- use gzip with "-9" and append ".gz" to the output name.
+    bzip2       -- use bzip2 with "-9" and append ".bz2" to the output name.
+    zip         -- convert all text files to DOS style and form a zip file for Windows use.
+
+An md5 checksum is produced for each archive created and stored in the md5 file.
+
+Examples:
+
+    $ bin/release -d /tmp
+    /tmp/hdf5-1.8.13-RELEASE.txt
+    /tmp/hdf5-1.8.13.md5
+    /tmp/hdf5-1.8.13.tar
+
+    $ bin/release -d /tmp gzip
+    /tmp/hdf5-1.8.13-RELEASE.txt
+    /tmp/hdf5-1.8.13.md5
+    /tmp/hdf5-1.8.13.tar.gz
+
+    $ bin/release -d /tmp tar gzip zip
+    /tmp/hdf5-1.8.13-RELEASE.txt
+    /tmp/hdf5-1.8.13.md5
+    /tmp/hdf5-1.8.13.tar
+    /tmp/hdf5-1.8.13.tar.gz
+    /tmp/hdf5-1.8.13.tar.zip
+
+EOF
+
+}
+
+# Function name: tar2zip
+# Convert the release tarball to a Windows zipball.
+#
+# Steps:
+# 1. untar the tarball in a temporary directory;
+#    Note: do this in a temporary directory to avoid changing
+#    the original source directory which may be around.
+# 2. convert all its text files to DOS (LF-CR) style;
+# 3. form a zip file which is usable by Windows users.
+#
+# Parameters:
+# $1 version
+# $2 release tarball
+# $3 output zipball file name
+#
+# Returns 0 if successful; 1 otherwise
+#
+tar2zip()
+{
+    if [ $# -ne 3 ]; then
+        echo "usage: tar2zip <tarfilename> <zipfilename>"
+        return 1
+    fi
+    ztmpdir=/tmp/tmpdir$$
+    mkdir -p $ztmpdir
+    version=$1
+    tarfile=$2
+    zipfile=$3
+
+    # step 1: untar tarball in ztmpdir
+    (cd $ztmpdir; tar xf -) < $tarfile
+    # sanity check
+    if [ ! -d $ztmpdir/$version ]; then
+        echo "untar did not create $ztmpdir/$version source dir"
+        # cleanup
+        rm -rf $ztmpdir
+        return 1
+    fi
+    # step 2: convert text files
+    # There maybe a simpler way to do this.
+    # options used in unix2dos:
+    # -k   Keep the date stamp
+    # -q   quiet mode
+    # grep redirect output to /dev/null because -q or -s are not portable.
+    find $ztmpdir/$version | \
+        while read inf; do \
+            if file $inf | grep "$inf\: .*text" > /dev/null 2>&1 ; then \
+                unix2dos -q -k $inf; \
+            fi\
+        done
+    # step 3: make zipball
+    # -9 maximum compression
+    # -y Store symbolic links as such in the zip archive
+    # -r recursive
+    # -q quiet
+    (cd $ztmpdir; zip -9 -y -r -q $version.zip $version)
+    mv $ztmpdir/$version.zip $zipfile
+
+    # cleanup
+    rm -rf $ztmpdir
+}
+
+# This command must be run at the top level of the hdf5 source directory.
+# Verify this requirement.
+if [ ! \( -f configure.ac -a -f bin/bbrelease \) ]; then
+    echo "$0 must be run at the top level of the hdf5 source directory"
+    exit 1
+fi
+
+# Defaults
+DEST=releases
+VERS=`perl bin/h5vers`
+VERS_OLD=
+test "$VERS" || exit 1
+verbose=yes
+release_date=`date +%F`
+today=`date +%Y%m%d`
+pmode='no'
+revmode='no'
+tmpdir="../#release_tmp.$$"     # tmp work directory
+CPPLUS_RM_NAME=cpplus_RM
+
+# Restore previous Version information
+RESTORE_VERSION()
+{
+    if [ X-${VERS_OLD} != X- ]; then
+        echo restoring version information back to $VERS_OLD
+        rm -f config/lt_vers.am
+        cp $tmpdir/lt_vers.am config/lt_vers.am
+        bin/h5vers -s $VERS_OLD
+        VERS_OLD=
+    fi
+}
+
+
+# Command-line arguments
+while [ -n "$1" ]; do
+    arg=$1
+    shift
+    case "$arg" in
+        -d)
+            DEST=$1
+            shift
+            ;;
+        -h)
+            USAGE
+            exit 0
+            ;;
+        --private)
+            pmode=yes
+            ;;
+        --revision)
+            revmode=yes
+            ;;
+        --branch)
+            BRANCHNAME=$1
+            shift
+            ;;
+        -*)
+            echo "Unknown switch: $arg" 1>&2
+            USAGE
+            exit 1
+            ;;
+        *)
+            methods="$methods $arg"
+            ;;
+    esac
+done
+
+# Default method is tar
+if [ "X$methods" = "X" ]; then
+    methods="tar"
+fi
+
+# Create the temporary work directory.
+if mkdir $tmpdir; then
+    echo "temporary work directory for release.  "\
+         "Can be deleted after release completes." > $tmpdir/README
+else
+    echo "Failed to mkdir tmpdir($tmpdir)"
+    exit 1
+fi
+
+# setup restoration in case of abort.
+trap RESTORE_VERSION 0
+
+if [ X$pmode = Xyes ]; then
+    VERS_OLD=$VERS
+    # Copy old version of config/lt_vers.am, since it's hard to
+    # "undo" changes to it.
+    cp config/lt_vers.am $tmpdir
+    # Set version information to m.n.r-of$today.
+    # (h5vers does not correctly handle just m.n.r-$today.)
+    VERS=`echo $VERS | sed -e s/-.*//`-of$today
+    echo Private release of $VERS
+    bin/h5vers -s $VERS
+fi
+
+if [ X$revmode = Xyes ]; then
+    VERS_OLD=$VERS
+    echo "Save old version $VERS_OLD for restoration later."
+    # Copy old version of config/lt_vers.am, since it's hard to
+    # "undo" changes to it.
+    cp config/lt_vers.am $tmpdir
+    if [ "${BRANCHNAME}" = "" ]; then
+        BRANCHNAME=`git symbolic-ref -q --short HEAD`
+    fi
+    revision=`git rev-parse --short HEAD`
+    # Set version information to m.n.r-r$revision.
+    # (h5vers does not correctly handle just m.n.r-$today.)
+    VERS=`echo $VERS | sed -e s/-.*//`-$revision
+    echo Private release of $VERS
+    HDF5_VERS=hdf5-$BRANCHNAME-$revision
+    echo file base of $HDF5_VERS
+    bin/h5vers -s $VERS
+    # use a generic directory name for revision releases
+    HDF5_IN_VERS=hdfsrc
+else
+    # Store hdf5-$VERS ("hdf5-1.7.51", e.g.) to a variable to avoid typos
+    HDF5_VERS=hdf5-$VERS
+    # directory name matches tar file name for non-revision releases
+    HDF5_IN_VERS=$HDF5_VERS
+fi
+
+test "$verbose" && echo "Releasing $HDF5_VERS to $DEST" 1>&2
+if [ ! -d $DEST ]; then
+    echo "   Destination directory $DEST does not exist" 1>&2
+    exit 1
+fi
+
+# Create a symlink to the source so files in the tarball have the prefix
+# we want (gnu's --transform isn't portable)
+ln -s `pwd` $tmpdir/$HDF5_IN_VERS || exit 1
+
+# Save a backup copy of Makefile if exists.
+test -f Makefile && mv Makefile $tmpdir/Makefile.x
+cp -p Makefile.dist Makefile
+
+# Update README.md and release_docs/RELEASE.txt with release information in
+# line 1.
+for f in README.md release_docs/RELEASE.txt; do
+    echo "HDF5 version $VERS released on $release_date" >$f.x
+    sed -e 1d $f >>$f.x
+    mv $f.x $f
+    # Make sure new files are of the right access mode
+    chmod 644 $f
+done
+
+# Create the tar file
+test "$verbose" && echo "   Running tar..." 1>&2
+(cd "$tmpdir" && exec tar -ch --exclude-vcs -f "$HDF5_VERS.tar" "./$HDF5_IN_VERS" || exit 1 )
+
+# Compress
+MD5file=$HDF5_VERS.md5
+cp /dev/null $DEST/$MD5file
+for comp in $methods; do
+    case $comp in
+        tar)
+            cp -p $tmpdir/$HDF5_VERS.tar $DEST/$HDF5_VERS.tar
+            (cd $DEST; md5sum $HDF5_VERS.tar >> $MD5file)
+            ;;
+        gzip)
+            test "$verbose" && echo "   Running gzip..." 1>&2
+            gzip -9 <$tmpdir/$HDF5_VERS.tar >$DEST/$HDF5_VERS.tar.gz
+            (cd $DEST; md5sum $HDF5_VERS.tar.gz >> $MD5file)
+            ;;
+        bzip2)
+            test "$verbose" && echo "   Running bzip2..." 1>&2
+            bzip2 -9 <$tmpdir/$HDF5_VERS.tar >$DEST/$HDF5_VERS.tar.bz2
+            (cd $DEST; md5sum $HDF5_VERS.tar.bz2 >> $MD5file)
+            ;;
+        zip)
+            test "$verbose" && echo "   Creating zip ball..." 1>&2
+            tar2zip $HDF5_IN_VERS $tmpdir/$HDF5_VERS.tar $DEST/$HDF5_VERS.zip 1>&2
+            (cd $DEST; md5sum $HDF5_VERS.zip >> $MD5file)
+            ;;
+        *)
+            echo "***Error*** Unknown method $comp"
+            exit 1
+            ;;
+    esac
+done
+
+# Copy the RELEASE.txt to the release area.
+cp release_docs/RELEASE.txt $DEST/$HDF5_VERS-RELEASE.txt
+
+# Remove distributed Makefile and restore previous Makefile if existed.
+rm -f Makefile
+test -f $tmpdir/Makefile.x && mv $tmpdir/Makefile.x Makefile
+
+# Restore OLD version information, then no need for trap.
+if [ X$pmode = Xyes ] || [ X$revmode = Xyes ]; then
+    echo "Restore the original version $VERS_OLD"
+    RESTORE_VERSION
+    trap 0
+fi
+
+# Remove temporary things
+rm -rf $tmpdir
+
+echo "DONE"
+
+exit 0
diff --git a/bin/buildhdf5 b/bin/buildhdf5
index 3a4b0d3..4c84884 100755
--- a/bin/buildhdf5
+++ b/bin/buildhdf5
@@ -1,17 +1,14 @@
 #!/bin/sh
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 #
 # Build HDF5 library by doing configure, make, and tests.
 # Usage: See USAGE()
@@ -180,7 +177,7 @@ LOCATE_SZLIB()
 	    esac
 	    ;;	# end of case ncsa
 	unknown)
-	    # Unknow domain. Give a shot at the some standard places.
+	    # Unknown domain. Give a shot at the some standard places.
 	    szlibpaths="/usr/local"
 	    ;;
     esac	# end of case $mydomain
diff --git a/bin/checkapi b/bin/checkapi
index b4a08e8..619f933 100755
--- a/bin/checkapi
+++ b/bin/checkapi
@@ -1,20 +1,19 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 #
 require 5.003;
 
+use warnings;
+
 # Purpose: insures that API functions aren't called internally.
 # Usage:   checkapi H5*.c
 my $filename = "";
diff --git a/bin/checkposix b/bin/checkposix
index db47ff3..ee12d44 100755
--- a/bin/checkposix
+++ b/bin/checkposix
@@ -1,115 +1,263 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
 require 5.003;
+use warnings;
 
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 #
-# Robb Matzke, matzke@llnl.gov
-# 30 Aug 1997
+# Dana Robinson
+# Spring 2019
+# (Original by Robb Matzke)
 #
-# Purpose: Given the names of C source files this script will print the
-#	   file name, line number, and function name of any function that
-#	   doesn't begin with the letter `h' or `H' as stipulated by the
-#	   HDF5 programming style guide.
+# Purpose:  Given the names of C source files this script will print the
+#           file name, line number, and function name of any function that
+#           doesn't begin with the letter 'h' or 'H' as stipulated by the
+#           HDF5 programming style guide.
 #
-#	   Emacs users can run this script as the compile command and
-#	   use `next-error' (usually bound to M-`) to find each name
-#	   violation.
-
-if(<>) {
-    if($ARGV =~ /\//) {
-        ($filename) = ($ARGV =~ /^.*\/([A-Za-z0-9_]*)\.c$/);
-    } else {
-        ($filename) = ($ARGV =~ /([A-Za-z0-9_]*)\.c$/);
+#           Emacs users can run this script as the compile command and
+#           use 'next-error' (usually bound to M-`) to find each name
+#           violation.
+
+use File::Basename;
+
+# Loop over all files passed to the function
+foreach $arg (@ARGV) {
+
+    # Get the filename from the path
+    $filename = fileparse($arg);
+
+    # Skip files that don't include H5private.h
+    # H5system. has to be inspected by hand since it wraps POSIX files
+    #
+    # H5detect and H5make_libsettings are created before the library exists
+    # so calls that link to function replacements won't work. We'll ignore
+    # it here.
+    #
+    # If a user specifies one file, process it no matter what so people
+    # can inspect files we normally skip (like H5system.c).
+
+    $ignore = 0;
+
+    # Ignored files in src/
+    if($#ARGV gt 0 and $filename =~ /H5FDmulti|H5FDstdio|H5VLpassthru|H5system|H5detect|H5make_libsettings/) {
+        $ignore = 1;
+    }
+    # Ignored atomic test files in test/
+    if($#ARGV gt 0 and $filename =~ /atomic_reader|atomic_writer/) {
+        $ignore = 1;
     }
+    # Ignored filter plugins in test/
+    if($#ARGV gt 0 and $filename =~ /^filter_plugin\d_/) {
+        $ignore = 1;
+    }
+    # Ignored generators in test/
+    if($#ARGV gt 0 and $filename =~ /^gen_/) {
+        $ignore = 1;
+    }
+
+    if($ignore) {
+        print "$filename is exempt from using Standard library macro wrappers\n";
+        next;
+    }
+
+    # Open the file
+    open(my $fh, "<", $arg) or do {
+        warn "NOTE: Unable to open $arg: !$\n";
+        next;
+    };
+
+    # Loop over all lines in the file to find undecorated functions
+    while (<$fh>) {
 
-    if($filename =~ /H5FDmulti|H5FDstdio/) {
-        print "$ARGV is exempt from using Standard library macro wrappers\n";
-    } else {
-        while (<>) {
-
-           # Get rid of comments by removing the inside part.
-           s|/\*.*?\*/||g;
-           if ($in_comment) {
-              if (/\*\//) {
-                 s|.*?\*/||;
-                 $in_comment = 0;
-              } else {
-                 $_="\n";
-              }
-           } elsif (m|/\*|) {
-              s|/\*.*||;
-              $in_comment = 1;
-           }
-
-           # Get rid of string constants if they begin and end on this line.
-           s/([\'\"])([^\1]|\\\1)*?\1/$1$1/g;
-
-           # Get rid of preprocessor directives
-           s/^\#.*//;
-
-           # Skip callbacks invoked as methods in a struct
-           next if $_ =~ /\b(\)?->|\.)\(?([a-z_A-Z]\w*)\s*\(/;
-
-           # Now find all function calls on this line which don't start with 'H'
-           while (($name)=/\b([a-z_A-GI-Z]\w*)\s*\(/) {
-              $_ = $';
+        # Get rid of comments by removing the inside part.
+        s|/\*.*?\*/||g;
+        if ($in_comment) {
+            if (/\*\//) {
+                s|.*?\*/||;
+                $in_comment = 0;
+            } else {
+                $_="\n";
+            }
+        } elsif (m|/\*|) {
+            s|/\*.*||;
+            $in_comment = 1;
+        }
+
+        # Get rid of string constants if they begin and end on this line.
+        s/([\'\"])([^\1]|\\\1)*?\1/$1$1/g;
+
+        # Get rid of preprocessor directives
+        s/^\#.*//;
+
+        # Skip callbacks invoked as methods in a struct
+        next if $_ =~ /\b(\)?]?->|\.)\(?([a-z_A-Z]\w*)\s*\(/;
+
+        # Now find all function calls on this line which don't start with 'H'
+        while (($name)=/\b([a-z_A-GI-Z]\w*)\s*\(/) {
+            $_ = $';
               
-              # Ignore C statements that look sort of like function
-              # calls.
-              next if $name =~ /^(if|for|offsetof|return|sizeof|switch|while|void)$/;
-
-              # Ignore things that get misdetected because of the simplified
-              # parsing that takes place here.
-              next if $name =~ /^(int|herr_t|_term_interface)$/;
-
-              # These are really HDF5 functions/macros even though they don't
-              # start with `h' or `H'.
-              next if $name =~ /^FUNC_(ENTER|LEAVE)(_(NO)?API|_PACKAGE|_STATIC)?(_NOFS|_NOCLEAR|_NOINIT)?(_NOFUNC|_TAG)?$/;
-              next if $name =~ /^(BEGIN|END)_FUNC$/;
-              next if $name =~ /^U?INT(8|16|32|64)(ENCODE|DECODE)(_VAR)?$/;
-              next if $name =~ /^CI_(PRINT_STATS|INC_SRC|INC_DST)$/;
-              next if $name =~ /^(ABS|ADDR_OVERFLOW|ALL_MEMBERS|BOUND|CONSTR|DETECT_[I|F|M]|DOWN)$/;
-              next if $name =~ /^(MIN3?|MAX3?|NELMTS|POWER_OF_TWO|REGION_OVERFLOW)$/;
-              next if $name =~ /^(UNIQUE_MEMBERS)$/;
-              next if $name =~ /^addr_defined$/;
-
-              # These functions/macros are exempt.
-              next if $name =~ /^(main|[fs]?printf|va_(start|arg|end))$/;
-
-              # These are Windows system calls. Ignore them.
-              next if $name =~ /^(_get_osfhandle|GetFileInformationByHandle|SetFilePointer|GetLastError|SetEndOfFile)$/;
-              next if $name =~ /^(FindNextFile|FindClose|_tzset|Wgettimeofday|GetSystemTimeAsFileTime|Wgetlogin|GetUserName)$/;
-
-              # These are MPI function calls. Ignore them.
-              next if $name =~ /^(MPI_|MPE_)/;
-
-              # These are POSIX threads function calls. Ignore them.
-              next if $name =~ /^pthread_/;
-
-              # These are Windows threads function calls. Ignore them.
-              next if $name =~ /^(_beginthread|(Initialize|Enter|Leave)CriticalSection|TlsAlloc)$/;
-
-              # These are zlib & szlib function calls. Ignore them.
-              next if $name =~ /^(inflate|SZ_)/;
-              next if $name =~ /^compress2$/;
-
-              print "$ARGV:$.: $name\n";
-           }
-
-        } continue {
-           close ARGV if eof;       # reset line number
+            # Ignore C statements that look sort of like function
+            # calls.
+            next if $name =~ /^(if|for|offsetof|return|sizeof|switch|while|void)$/;
+
+            # Ignore things that get misdetected because of the simplified
+            # parsing that takes place here.
+            next if $name =~ /^(int|herr_t|_term_interface|_term_package)$/;
+
+            # These are really HDF5 functions/macros even though they don't
+            # start with `h' or `H'.
+            next if $name =~ /^FUNC_(ENTER|LEAVE)(_(NO)?API|_PACKAGE|_STATIC)?(_NAMECHECK_ONLY|_NOFS|_NOCLEAR|_NOINIT|_NOPUSH)?(_NOFUNC|_TAG)?$/;
+            next if $name =~ /^(BEGIN|END)_FUNC$/;
+            next if $name =~ /^U?INT(8|16|32|64)(ENCODE|DECODE)(_VAR)?$/;
+            next if $name =~ /^CI_(PRINT_STATS|INC_SRC|INC_DST)$/;
+            next if $name =~ /^(ABS|ADDR_OVERFLOW|ALL_MEMBERS|BOUND|CONSTR|DETECT_[I|F|M]|DOWN)$/;
+            next if $name =~ /^(MIN3?|MAX3?|NELMTS|POWER_OF_TWO|REGION_OVERFLOW)$/;
+            next if $name =~ /^(SIZE_OVERFLOW|UNIQUE_MEMBERS|S_ISDIR)$/;
+            next if $name =~ /^addr_defined$/;
+            next if $name =~ /^TERMINATOR$/;
+
+            # Ignore callback invocation
+            next if $name =~ /^(op|cb|OP|iter_op|func)$/;
+
+            # Ignore main
+            next if $name =~ /^main$/;
+
+            # This often appears in preprocessor lines that span multiple lines
+            next if $name =~ /^(defined)$/;
+
+            # These are Windows system calls. Ignore them.
+            next if $name =~ /^(_get_osfhandle|GetFileInformationByHandle|SetFilePointer|GetLastError|SetEndOfFile)$/;
+            next if $name =~ /^(FindNextFile|FindClose|_tzset|Wgettimeofday|GetSystemTimeAsFileTime|GetUserName)$/;
+            next if $name =~ /^(DeleteCriticalSection|TlsFree|TlsGetValue|CreateThread)$/;
+            next if $name =~ /^(ExpandEnvironmentStringsA|LockFileEx|UnlockFileEx)$/;
+            next if $name =~ /^(DllMain|LocalAlloc|LocalFree)$/;
+            next if $name =~ /^(FindFirstFileA|FindNextFileA)$/;
+            next if $name =~ /^(_beginthread|(Initialize|Enter|Leave)CriticalSection|TlsAlloc)$/;
+
+            # These are MPI function calls. Ignore them.
+            next if $name =~ /^(MPI_)/;
+
+            # These are POSIX threads function calls. Ignore them.
+            next if $name =~ /^pthread_/;
+
+            # These are zlib & szlib function calls. Ignore them.
+            next if $name =~ /^(inflate|SZ_)/;
+            next if $name =~ /^compress2$/;
+
+            # These is an H5Dfill function. Ignore it in this file.
+            if($filename =~ /H5Dfill/) {
+                next if $name =~ /^(alloc_func)$/;
+            }
+
+            # These are H5Zscaleoffset functions. Ignore them in this file.
+            if($filename =~ /H5Zscaleoffset/) {
+                next if $name =~ /^(pow_fun|round_fun|abs_fun|lround_fun|llround_fun)$/;
+            }
+
+            # This is a macro parameter in H5Rint.c. Ignore it in this file.
+            if($filename =~ /H5Rint/) {
+                next if $name =~ /^(func)$/;
+            }
+
+            # Internal calls in the HDFS VFD (H5FDhdfs.c). Ignore it in this file.
+            if($filename =~ /H5FDhdfs/) {
+                next if $name =~ /^(hdfs)/;
+            }
+
+            # Macros, etc. from the mirror VFD (H5FDmirror.c). Ignore in this file.
+            if($filename =~ /H5FDmirror/) {
+                next if $name =~ /^(LOG)/;
+                next if $name =~ /^(BSWAP_64|is_host_little_endian)$/;
+            }
+
+            # These are things in H5FDs3comms.c and H5FDros3.c. Ignore them in these files.
+            if($filename =~ /H5FDs3comms|H5FDros3/) {
+                next if $name =~ /^(curl_|curlwritecallback|gmnow)/;
+                next if $name =~ /^(ros3_|ROS3_|S3COMMS_)/;
+                next if $name =~ /^(EVP_sha256|SHA256|ISO8601NOW)$/;
+            }
+
+            # TESTING (not comprehensive - just noise reduction)
+            
+            # Test macros and functions (testhdf5.h)
+            next if $name =~ /^(AddTest|TestErrPrintf|TestSummary|TestCleanup|TestShutdown)$/;
+            next if $name =~ /^(CHECK|CHECK_PTR|CHECK_PTR_NULL|CHECK_PTR_EQ|CHECK_I)$/;
+            next if $name =~ /^(VERIFY|VERIFY_STR|VERIFY_TYPE|MESSAGE|ERROR)$/;
+
+            # Test macros and functions (h5test.h)
+            next if $name =~ /^(TESTING|PASSED|SKIPPED|PUTS_ERROR|FAIL_PUTS_ERROR|FAIL_STACK_ERROR|TEST_ERROR|AT)$/;
+            next if $name =~ /^(GetTestExpress)$/;
+
+            # Ignore functions that start with test_ or check_
+            next if $name =~ /^test_/;
+            next if $name =~ /^check_/;
+
+            # Ignore functions that start with h5_
+            next if $name =~ /^h5_/;
+
+            # Ignore process completed status
+            next if $name =~ /(WIFEXITED|WEXITSTATUS|WIFSIGNALED|WTERMSIG|WCOREDUMP|WIFSTOPPED|WSTOPSIG)/;
+
+            # Ignore usage functions
+            next if $name =~ /^usage$/;
+
+            # Ignore callbacks
+            next if $name =~ /(_cb\d?)$/;
+
+            # Specific tests (not even remotely comprehensive)
+
+            # accum test code
+            if($filename =~ /accum/) {
+                next if $name =~ /^(accum_)/;
+            }
+
+            # cache test code
+            if($filename =~ /cache/) {
+                next if $name =~ /(_entry|_entries|_cache|_check|_dependency|_status|_op)$/;
+                next if $name =~ /^(verify_|smoke_check_|row_major_|col_major_)/;
+                next if $name =~ /^(resize_configs_are_equal|CACHE_ERROR)$/
+            }
+
+            # Splitter VFD test code. Ignore in vfd.c.
+            if($filename =~ /vfd/) {
+                next if $name =~ /^(SPLITTER_|splitter_)/;
+                next if $name =~ /(_splitter_)/;
+                next if $name =~ /^(file_exists)$/;
+            }
+
+            # S3 VFD test code. Ignore in ros3.c and s3comms.c.
+            # HDFS VFD test code. Ignore in hdfs.c.
+            if($filename =~ /ros3|s3comms|hdfs/) {
+                next if $name =~ /^(JSVERIFY|JSFAILED_|JSERR_|jserr_|FAIL_)/;
+                next if $name =~ /^(curl_)/;
+                next if $name =~ /^(S3COMMS_FORMAT_CREDENTIAL|ISO8601NOW|gmnow)$/;
+            }
+
+            # VDS test code. Ignore in vds.c.
+            if($filename =~ /vds/) {
+                next if $name =~ /^(vds_)/;
+            }
+
+            print "$filename:$.: $name\n";
         }
+
     }
+
+    # Close the file
+    close($fh);
+}
+
+if($#ARGV gt 0) {
+    print "\n";
+    print "NOTE:\n";
+    print "If any files were skipped due to being exempt, you can inspect them manually\n";
+    print "by using this script on them one at a time, which will always process the file.\n";
 }
diff --git a/bin/chkconfigure b/bin/chkconfigure
deleted file mode 100755
index abafae8..0000000
--- a/bin/chkconfigure
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/sh
-##
-## Copyright by the Board of Trustees of the University of Illinois.
-## All rights reserved.
-##
-## This file is part of HDF5.  The full HDF5 copyright notice, including
-## terms governing use, modification, and redistribution, is contained in
-## the files COPYING and Copyright.html.  COPYING can be found at the root
-## of the source code distribution tree; Copyright.html can be found at the
-## root level of an installed copy of the electronic HDF5 document set and
-## is linked from the top-level documents page.  It can also be found at
-## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
-## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
-##
-# Check that all the configure files are properly genernated.
-#
-# Programmer: Albert Cheng
-# Created Date: 2004/12/07
-
-#
-# Configure: should be generated by autoconf version 2.69.
-# autoconf:  should be of version 2.69.
-
-# variable initialization
-nerrors=0
-AUTOCONFVERSION=2.69
-AUTOCONFVERSIONLEAD='Generated by GNU Autoconf'
-CONFIGUREFILES="configure"
-
-
-# Function definitions
-#
-# PRINTMSG
-# Print a one line message left justified in a field of 70 characters
-# without newline.  More output for this line later.
-#
-PRINTMSG() {
-    SPACES="                                                               "
-    echo "$* $SPACES" | cut -c1-70 | tr -d '\012'
-}
-
-# print result passed.
-PASSED() {
-    echo " PASSED"
-}
-
-# print result failed.
-FAILED() {
-    echo "*FAILED*"
-}
-
-
-# Main body
-
-# Check configure files
-# The autoconf version should be among the first 5 lines.
-echo "Check autoconf version. Should be version $AUTOCONFVERSION"
-for xf in $CONFIGUREFILES; do
-    PRINTMSG $xf
-    if [ ! -f $xf ]; then
-	FAILED
-	echo File not found
-	nerrors=`expr $nerrors + 1`
-	continue
-    fi
-    autoconf_version=`head -5 $xf | grep "$AUTOCONFVERSIONLEAD"`
-    echo $autoconf_version | grep "$AUTOCONFVERSIONLEAD $AUTOCONFVERSION" > /dev/null 2>&1
-    if [ $? -eq 0 ]; then
-	PASSED
-    else
-	FAILED
-	echo "Expected: $AUTOCONFVERSIONLEAD $AUTOCONFVERSION"
-	echo "Got:      $autoconf_version"
-	nerrors=`expr $nerrors + 1`
-    fi
-done
-
-
-# Summary
-echo $0 found $nerrors errors
-if [ $nerrors != 0 ]; then
-    exit 1
-fi
-exit 0
diff --git a/bin/chkcopyright b/bin/chkcopyright
index fe9fe49..756afe8 100755
--- a/bin/chkcopyright
+++ b/bin/chkcopyright
@@ -1,18 +1,14 @@
 #! /bin/sh
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-#
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 
 # Check Copyright notice.
 # Check that all the files have the proper copyright notice.
@@ -30,7 +26,7 @@ DIFF="diff"
 INITFILE=.h5chkright.ini
 EXCEPTIONS=/tmp/h5chkright.except.$$
 tmpfile=/tmp/h5chkright_tmp.$$
-EXCEPTIONDIRS="-name CVS -o -name .svn"	# at least skip CVS directories.
+EXCEPTIONDIRS="-name .git"	# at least skip .git directories.
 EXTRACTEDFILE=/tmp/h5chkright.extracted.$$
 VERBOSE=		# default no
 FIXIT=			# default no
@@ -41,8 +37,8 @@ NFIXEDFILES=0		# Number of files fixed.
 NFIXFAILEDFILES=0	# Number of files fix failed.
 NUMBEGINLINES=60	# Copyright notice should be located within the
 			# this number of lines at the beginning of the file.
-UICOPYRIGHTSTR="Copyright by the Board of Trustees of the University of Illinois"
 THGCOPYRIGHTSTR="Copyright by The HDF Group."
+UICOPYRIGHTSTR="Copyright by the Board of Trustees of the University of Illinois"
 
 PASSEDLOG=/tmp/h5chkright_passed.$$
 SKIPPEDLOG=/tmp/h5chkright_skipped.$$
@@ -56,7 +52,6 @@ HTM_COPYRIGHT=/tmp/h5chkright_HTM.$$	# HTML style copyright
 SH_COPYRIGHT=/tmp/h5chkright_SH.$$	# SHELL style copyright
 SH_COPYRIGHT2=/tmp/h5chkright_SH2.$$	# SHELL style copyright, 2nd style.
 WINBAT_COPYRIGHT=/tmp/h5chkright_WINBAT.$$	# Windows Batch file Copyright notice
-VMSCMD_COPYRIGHT=/tmp/h5chkright_VMSCMD.$$	# VMS command file Copyright notice
 CONFIGURE_AC_COPYRIGHT=/tmp/h5chkright_CONFIGURE_AC.$$	# configure.ac file Copyright notice
 
 tmpfixfile=/tmp/h5chkright_fix.$$	# Temporary fixed copy of file
@@ -114,129 +109,92 @@ BUILDCOPYRIGHT()
     # C and C++ source Copyright notice
     cat > ${C_COPYRIGHT} << \EOF
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
 EOF
 
     # Fortran9X source Copyright notice
     cat > ${FTN_COPYRIGHT} << \EOF
 !   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
 !                                                                             *
 !   This file is part of HDF5.  The full HDF5 copyright notice, including     *
 !   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
 EOF
 
     # HTML file Copyright notice
     cat > ${HTM_COPYRIGHT} << \EOF
   * Copyright by The HDF Group.                                               *
-  * Copyright by the Board of Trustees of the University of Illinois.         *
   * All rights reserved.                                                      *
   *                                                                           *
   * This file is part of HDF5.  The full HDF5 copyright notice, including     *
   * terms governing use, modification, and redistribution, is contained in    *
-  * the files COPYING and Copyright.html.  COPYING can be found at the root   *
-  * of the source code distribution tree; Copyright.html can be found at the  *
-  * root level of an installed copy of the electronic HDF5 document set and   *
-  * is linked from the top-level documents page.  It can also be found at     *
-  * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-  * access to either file, you may request a copy from help@hdfgroup.org.     *
+  * the COPYING file, which can be found at the root of the source code       *
+  * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+  * If you do not have access to either file, you may request a copy from     *
+  * help@hdfgroup.org.                                                        *
 EOF
 
     # Shell style Copyright notice
     cat > ${SH_COPYRIGHT} << \EOF
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 EOF
 
     # Shell style Copyright notice (2nd type)
     cat > ${SH_COPYRIGHT2} << \EOF
 ## Copyright by The HDF Group.
-## Copyright by the Board of Trustees of the University of Illinois.
 ## All rights reserved.
 ##
 ## This file is part of HDF5.  The full HDF5 copyright notice, including
 ## terms governing use, modification, and redistribution, is contained in
-## the files COPYING and Copyright.html.  COPYING can be found at the root
-## of the source code distribution tree; Copyright.html can be found at the
-## root level of an installed copy of the electronic HDF5 document set and
-## is linked from the top-level documents page.  It can also be found at
-## http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-## access to either file, you may request a copy from help@hdfgroup.org.
+## the COPYING file, which can be found at the root of the source code
+## distribution tree, or in https://www.hdfgroup.org/licenses.
+## If you do not have access to either file, you may request a copy from
+## help@hdfgroup.org.
 EOF
 
     # Windows Batch file Copyright notice
     cat > ${WINBAT_COPYRIGHT} << \EOF
 @REM Copyright by The HDF Group.
-@REM Copyright by the Board of Trustees of the University of Illinois.
 @REM All rights reserved.
 @REM
 @REM This file is part of HDF5.  The full HDF5 copyright notice, including
 @REM terms governing use, modification, and redistribution, is contained in
-@REM the files COPYING and Copyright.html.  COPYING can be found at the root
-@REM of the source code distribution tree; Copyright.html can be found at the
-@REM root level of an installed copy of the electronic HDF5 document set and
-@REM is linked from the top-level documents page.  It can also be found at
-@REM http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-@REM access to either file, you may request a copy from help@hdfgroup.org.
+@REM the COPYING file, which can be found at the root of the source code
+@REM distribution tree, or in https://www.hdfgroup.org/licenses.
+@REM If you do not have access to either file, you may request a copy from
+@REM help@hdfgroup.org.
 EOF
 
     # configure.ac file Copyright notice
     cat > ${CONFIGURE_AC_COPYRIGHT} << \EOF
 dnl Copyright by The HDF Group.
-dnl Copyright by the Board of Trustees of the University of Illinois.
 dnl All rights reserved.
 dnl
 dnl This file is part of HDF5.  The full HDF5 copyright notice, including
 dnl terms governing use, modification, and redistribution, is contained in
-dnl the files COPYING and Copyright.html.  COPYING can be found at the root
-dnl of the source code distribution tree; Copyright.html can be found at the
-dnl root level of an installed copy of the electronic HDF5 document set and
-dnl is linked from the top-level documents page.  It can also be found at
-dnl http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-dnl access to either file, you may request a copy from help@hdfgroup.org.
-EOF
-
-    # VMS command file Copyright notice
-    cat > ${VMSCMD_COPYRIGHT} << \EOF
-$!# Copyright by The HDF Group.
-$!# Copyright by the Board of Trustees of the University of Illinois.
-$!# All rights reserved.
-$!#
-$!# This file is part of HDF5.  The full HDF5 copyright notice, including
-$!# terms governing use, modification, and redistribution, is contained in
-$!# the files COPYING and Copyright.html.  COPYING can be found at the root
-$!# of the source code distribution tree; Copyright.html can be found at the
-$!# root level of an installed copy of the electronic HDF5 document set and
-$!# is linked from the top-level documents page.  It can also be found at
-$!# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-$!# access to either file, you may request a copy from help@hdfgroup.org.
+dnl the COPYING file, which can be found at the root of the source code
+dnl distribution tree, or in https://www.hdfgroup.org/licenses.
+dnl If you do not have access to either file, you may request a copy from
+dnl help@hdfgroup.org.
 EOF
 
 }
@@ -383,7 +341,7 @@ FindLineInFile()
 # $1 file which contains the expected copyright notice.
 # $2 file in which to look for the copyright notice.
 # Copyright notice must be found within the beginning $NUMBEGINLINES of lines.
-# Hunt for the particular string $UICOPYRIGHTSTR which signifies the beginning
+# Hunt for the particular string $THGCOPYRIGHTSTR which signifies the beginning
 # of the copyright notice.
 #
 MATCH_COPYRIGHT()
@@ -398,7 +356,7 @@ MATCH_COPYRIGHT()
     nlines=`wc -l ${COPYRIGHTFILE}  | cut -f1 -d' '`
     # Find a line that contains the copyright string and its line number in
     # the file.
-    begin=`FindLineInFile "${UICOPYRIGHTSTR}" $f`
+    begin=`FindLineInFile "${THGCOPYRIGHTSTR}" $f`
     if [ "$begin" -le 0 ] ; then
 	# Not found, generate an empty dummy file
 	cp /dev/null ${EXTRACTEDFILE}
@@ -423,7 +381,7 @@ MATCH_COPYRIGHT()
 # $1 file which contains the expected copyright notice.
 # $2 file in which to look for the copyright notice.
 # Copyright notice must be found within the beginning $NUMBEGINLINES of lines.
-# Hunt for the particular string $UICOPYRIGHTSTR which signifies the beginning
+# Hunt for the particular string $THGCOPYRIGHTSTR which signifies the beginning
 # of the copyright notice.
 #
 FIX_COPYRIGHT()
@@ -446,7 +404,12 @@ FIX_COPYRIGHT()
     # the file.
     insertbegin=`FindLineInFile "${THGCOPYRIGHTSTR}" $f`
     if [ $insertbegin -gt 0 ]; then
-	insertend=`expr $insertbegin + $nlines`		# no need to -1.  See below.
+        insertUIbegin=`FindLineInFile "${UICOPYRIGHTSTR}" $f`
+            if [ $insertUIbegin -gt 0 ]; then
+	        insertend=`expr $insertbegin + $nlines + 1`
+            else
+                insertend=`expr $insertbegin + $nlines`
+            fi
     else
 	insertbegin=`FindLineInFile "${UICOPYRIGHTSTR}" $f`
 	if [ $insertbegin -gt 0 ]; then
@@ -611,28 +574,6 @@ BATCH_FILE()
 }
 
 
-# Check Windows Batch files
-#
-VMSCMD_FILE()
-{
-    f=$1
-    case `MATCH_COPYRIGHT $VMSCMD_COPYRIGHT $f` in
-    PASSED)
-	PASSED $f
-	return
-	;;
-    FAILED)
-	# show the difference
-	FAILED $f
-	$DIFF ${EXTRACTEDFILE} ${VMSCMD_COPYRIGHT}
-	if [ -n "$FIXIT" ]; then
-	    FIX_COPYRIGHT $VMSCMD_COPYRIGHT $f
-	fi
-	;;
-    esac
-}
-
-
 # Check Configure.in type files
 #
 CONFIGURE_AC_FILE()
@@ -834,10 +775,6 @@ while read file; do
 	    # Windows Batch files
 	    BATCH_FILE ${file}
 	    ;;
-	*.com )
-	    # VMS Command files
-	    VMSCMD_FILE ${file}
-	    ;;
 	*.h5 | *.hdf5 )
 	    # Ignore HDF5 data files
 	    continue
diff --git a/bin/chkmanifest b/bin/chkmanifest
deleted file mode 100755
index 646f815..0000000
--- a/bin/chkmanifest
+++ /dev/null
@@ -1,140 +0,0 @@
-#!/bin/sh
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-#
-
-# Check that all the files in MANIFEST exist and that (if this is a
-# SVN checkout) that all the SVN-managed files appear in the
-# MANIFEST.
-
-verbose=yes
-MANIFEST=/tmp/HD_MANIFEST.$$
-
-# Main
-test "$verbose" && echo "   Checking MANIFEST..." 1>&2
-# clean up $MANIFEST file when exits
-trap "rm -f $MANIFEST" 0
-
-# Only split lines on newline, not whitespace
-set -f
-IFS='
-'
-
-# First make sure i am in the directory in which there is an MANIFEST file
-# and then do the checking from there.  Will try the following,
-# current directory, parent directory, the directory this command resides.
-if [ -f MANIFEST ]; then
-    continue
-elif [ -f ../MANIFEST ]; then
-    cd ..
-else
-    commanddir=`dirname $0`
-    if [ -d "$commanddir" -a -f $commanddir/MANIFEST ]; then
-	cd $commanddir
-	continue
-    else
-	echo MANIFEST file not found. Abort.
-	exit 1
-    fi
-fi
-
-# Check for duplicate entries.  This can be done at any time, but it may as 
-# well be sooner so that if something else fails the presence of duplicates
-# will already be known.
-errcode=0
-DUPLICATES=`perl -ne 's/#.*//; next if /^\s*$/; if ($uniq{$_}++) { print $_; }' MANIFEST`
-if [ "$DUPLICATES" ]; then
-   cat 1>&2 <<EOF
-These entries appear more than once in the MANIFEST:  
-$DUPLICATES
-Please remove the duplicate lines and try again.
-
-EOF
-errcode=1 
-fi
-
-# Copy the manifest file to get a list of file names.
-grep '^\.' MANIFEST | expand | cut -f1 -d' ' >$MANIFEST
-
-for file in `cat $MANIFEST`; do
-    if [ ! -f $file ]; then
-       echo "- $file"
-       fail=yes
-    fi
-done
-
-# Get the list of files under version control and check that they are
-# present.
-#
-# First get a list of all the pending files with svn stat and
-# check those.
-svn_stat=`svn stat -q`
-for file in $svn_stat; do
-
-    # Newly added files are not listed by svn ls, which
-    # we check later.
-
-    # The line listing new files starts with 'A'.
-    letter=`echo $file | head -c 1`
-    if [ "$letter" = "A" ]; then
-        # Convert the seven Subversion status columns to './' so it matches
-        # the manifest file name.
-        #
-        # There is a space between the status columns and file name, hence
-        # the '8' instead of '7'.
-        path=`echo $file | sed 's/^.\{8\}/\.\//g'`
-        # Ignore directories
-        if [ ! -d $path ]; then
-            if (grep ^$path$ $MANIFEST >/dev/null); then
-                :
-            else
-                echo "- $path"
-                fail=yes
-            fi
-        fi
-    fi
-done
-
-# Next check svn ls, which gets a list of all files that are
-# checked in.
-svn_ls=`svn ls -R`
-for file in $svn_ls; do
-    path="./${file}"
-    # Ignore directories
-    if [ ! -d $path ]; then
-        if (grep ^$path$ $MANIFEST >/dev/null); then
-            :
-        else
-            echo "+ $path"
-            fail=yes
-        fi
-    fi
-done
-
-# Finish up
-if [ "X$fail" = "Xyes" ]; then
-    cat 1>&2 <<EOF
-The MANIFEST is out of date. Files marked with a minus sign (-) no
-longer exist; files marked with a plus sign (+) are SVN-managed but do
-not appear in the MANIFEST.  Please remedy the situation and try again.
-EOF
-    exit 1
-fi
-
-if [ $errcode -ne 0 ]; then
-    exit 1
-fi 
-
-test "$verbose" && echo "   The MANIFEST is up to date." 1>&2
-exit 0
diff --git a/bin/cmakehdf5 b/bin/cmakehdf5
index c092545..e59c772 100755
--- a/bin/cmakehdf5
+++ b/bin/cmakehdf5
@@ -12,8 +12,6 @@
 DPRINT=:
 #DPRINT=echo
 
-# use the ctest scripting method if --script is given
-if [ "$1" != "--script" ]; then
 # variable names
 # The "extra" number is the step number and easier to see all logfiles in
 # the sorted order of steps
@@ -23,13 +21,15 @@ makelog="#${progname}_2build.log"
 testlog="#${progname}_3test.log"
 packlog="#${progname}_4pack.log"
 installlog="#${progname}_5install.log"
+vflag=1		# verbose flag default to on.
+config_summary=libhdf5.settings
 exit_code=0
 
 # This command should be in the source directory's bin/
 # and should have invoked as "$srcdir/bin/$progname" or
 # "bin/$progname". So, by striping bin/$program from $0,
 # we can find $srcdir.
-if [ $0 == bin/$progname ]; then
+if [ "$0" = "bin/${progname}" ]; then
     srcdir="."		# current directory
 else
     # $0 is $srdir/bin/$progname
@@ -46,9 +46,18 @@ cacheinit=$srcdir/config/cmake/cacheinit.cmake
 build_cpp_lib=-DHDF5_BUILD_CPP_LIB:BOOL=OFF	# C++ interface default off
 build_fortran=-DHDF5_BUILD_FORTRAN:BOOL=OFF	# Fortran interface default off
 build_hl_lib=-DHDF5_BUILD_HL_LIB:BOOL=ON	# High Level interface default on
+build_threadsafe=-DHDF5_ENABLE_THREADSAFE:BOOL=OFF  # Threadsafe feature default off
 build_testing=-DBUILD_TESTING:BOOL=ON		# Build tests default on
+build_test_shell=-DTEST_SHELL_SCRIPTS:BOOL=ON   # Run shell script tests default on
 build_tools=-DHDF5_BUILD_TOOLS:BOOL=ON		# Build tools default on
-
+with_zlib=-DHDF5_ENABLE_Z_LIB_SUPPORT=ON	# enable zlib filter default on
+with_szlib=-DHDF5_ENABLE_SZIP_SUPPORT=OFF	# enables szip filter default off
+szlib_path=""					# szip lib path default off
+shared_lib=-DBUILD_SHARED_LIBS:BOOL=ON		# enables shared lib; default on
+njobs=""					# number of jobs (commands) to
+						# run simultaneously; default is
+						# value from $MAKE if defined,
+						# otherwise none (1)
 
 #=============
 # Function definitions
@@ -75,11 +84,26 @@ Usage: $progname [<options>]
     enable or disable c++ API. Default is off.
   --enable-hl | --disable-hl:
     enable or disable high level API. Default is on.
+  --enable-threadsafe | --disable-threadsafe:
+    enable or disable threadsafe feature. Default is off
+  --enable-shared | --disable-shared:
+    enable or disable shared lib. Default is on.
   --enable-tools | --disable-tools:
     enable or disable building tools. Default is on.
   --enable-testing | --disable-testing:
     enable or disable building tests. Default is on.
+  --with-zlib | --with-zlib=<libpath> | --without-zlib:
+    Use zlib library for external deflate I/O filter. Default is on.
+  --with-szlib | --with-szlib=<libpath> | --without-szlib:
+    Use szlib library for external deflate I/O filter. Default is on.
+  --njobs=<-j N>:
+    number of jobs (commands) to run simultaneously; default is value from
+    $MAKE if defined, otherwise none
+  --enable-verbose | --disable-verbose:
+    enable or disable verbose output. Default is on.
   --help: shows details help page
+
+  <libpath>: the file path to the library, expect <libpath>/lib and <libpath>/include.
 EOF
 }
 
@@ -106,7 +130,7 @@ STEP()
     (TIMESTAMP; nerror=0 ;
 	echo "eval $command"
 	eval $command || nerror=1 ;
-	TIMESTAMP; exit $nerror) < /dev/null >> "$logfile" 2>&1
+	TIMESTAMP; exit $nerror) < /dev/null > "$logfile" 2>&1
     if [ $? -ne 0 ]; then
 	echo "error in '$banner'.  $progname aborted."
 	exit 1
@@ -114,6 +138,60 @@ STEP()
 }
 
 
+# Install the generated installation image file.  Different platform uses
+# different image files.
+# Linux: HDF5-<version>-Linux.sh file
+# Mac OS X: Not implemented yet
+# Others: Not implemented yet
+INSTALL_HDF5()
+{
+    myos="`uname -s`"
+    case "$myos" in
+	Linux)
+	    install_file=./HDF5-${version}-Linux.sh
+	    $install_file  --skip-license $*
+	    ;;
+	Darwin)		# Mac OSX DMG file
+	    # These steps were a kludge. Need proper support from Cmake engineering.
+	    echo Darwin install step needs proper implementation. Quit.
+	    return 1
+	    #
+	    install_file=HDF5-${version}-Darwin.dmg
+	    test -d hdf5 || mkdir hdf5
+	    basename=`basename $install_file .dmg`
+	    # mount the DMG file as /Volumes/$basename
+	    # echo 'Y' as yes for license.
+	    echo Y | hdiutil mount $install_file
+	    # copy the contents to the install location
+	    cp -R "/Volumes/$basename/HDF_Group" hdf5
+	    # unmount the DMG file
+	    hdiutil unmount /Volumes/$basename
+	    ;;
+	*) 		# unknown/unsupported OS.
+	    echo "INSTALL_HDF5: Error--unknown/unsupported OS($myos)"
+	    return 1
+	    ;;
+    esac
+}
+
+
+# Print logfiles.
+# $*: logfiles
+DUMP_LOGFILE()
+{
+    for x in $*; do
+	if [ -f $x ]; then
+	    echo "=================================="
+	    echo "Dumping $x"
+	    echo "=================================="
+	    cat $x
+	    echo "==== END $x ====="
+	    echo
+	fi
+    done
+}
+
+
 #==========
 # main
 #==========
@@ -121,6 +199,12 @@ STEP()
 # Show a start time stamp
 TIMESTAMP
 
+# Initialize njobs if $MAKE is defined
+if [ -n "$MAKE" ]; then
+    # assume all arguments are for --jobs
+    njobs=`echo $MAKE | cut -s -d' ' -f2-`
+fi
+
 # Parse Cmake configure options
 # --enable-XXX or --disable-XXX will enable or disable feature XXX.
 # XXX can be:
@@ -149,6 +233,18 @@ while [ $# -gt 0 ]; do
 	--disable-hl)
 	    build_hl_lib=-DHDF5_BUILD_HL_LIB:BOOL=OFF
 	    ;;
+	--enable-threadsafe)
+	    build_threadsafe=-DHDF5_ENABLE_THREADSAFE:BOOL=ON
+	    ;;
+	--disable-threadsafe)
+	    build_threadsafe=-DHDF5_ENABLE_THREADSAFE:BOOL=OFF
+	    ;;
+	--enable-shared)
+	    shared_lib=-DBUILD_SHARED_LIBS:BOOL=ON
+	    ;;
+	--disable-shared)
+	    shared_lib=-DBUILD_SHARED_LIBS:BOOL=OFF
+	    ;;
 	--enable-tools)
 	    build_tools=-DHDF5_BUILD_TOOLS:BOOL=ON
 	    ;;
@@ -161,18 +257,58 @@ while [ $# -gt 0 ]; do
 	--disable-testing)
 	    build_testing=-DBUILD_TESTING:BOOL=OFF
 	    ;;
+	--enable-shell-testing)
+	    build_test_shell=-DTEST_SHELL_SCRIPTS:BOOL=ON
+	    ;;
+	--disable-shell-testing)
+	    build_test_shell=-DTEST_SHELL_SCRIPTS:BOOL=OFF
+	    ;;
+	--with-zlib)
+	    with_zlib=-DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON
+	    ;;
+	--with-zlib=*)
+	    xarg=`echo $1 | cut -d= -f2-`
+	    with_zlib="-DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON -DZLIB_ROOT=$xarg"
+	    ;;
+	--without-zlib)
+	    with_zlib=-DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=OFF
+	    ;;
+	--with-szlib)
+	    with_szlib=-DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON
+	    szlib_path=""	# szlib is in default paths
+	    ;;
+	--with-szlib=*)
+	    xarg=`echo $1 | cut -d= -f2-`
+	    with_szlib="-DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON"
+	    szlib_path="SZIP_INSTALL=$xarg"
+	    ;;
+	--without-szlib)
+	    with_szlib=-DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF
+	    szlib_path=""	# reset the path
+	    ;;
+	--njobs=*)
+	    njobs=`echo $1 | cut -d= -f2-`
+	    ;;
+	--enable-verbose)
+	    vflag=1
+	    ;;
+	--disable-verbose)
+	    vflag=0
+	    ;;
 	--help)
 	    # print the detail help page and exit
 	    HELP
 	    exit 0
 	    ;;
 	*)
-	    echo "Unknown options"
+	    echo "Unknown options: $1"
 	    HELP
+	    exit 1
 	    ;;
     esac
     shift
 done
+$DPRINT after option parsing vflag=$vflag
 
 # Always display the brief help page
 HELP_BRIEF
@@ -194,290 +330,51 @@ if [ $? != 0 ]; then
     echo $vers failed. Aborted.
     exit 1
 fi
-echo Running Cmake for HDF5-${version} ...
 
+# setup output of all the log files if verbose is on upon exit
+trap \
+    "if [ $vflag -ne 0 ]; then DUMP_LOGFILE \$configlog \$makelog \$testlog \$packlog \$installlog; fi" \
+    0
+
+echo Running Cmake for HDF5-${version} ...
 #      4. Configure the C library, tools and tests with this command:
-STEP "Configure..." "cmake \
+#         If successful, append the configure summary to the configure logfile.
+STEP "Configure..." \
+   "env ${szlib_path} \
+    cmake \
+    -C $cacheinit \
     $build_cpp_lib \
     $build_fortran \
     $build_hl_lib \
+    $build_threadsafe \
+    $shared_lib \
     $build_testing \
+    $build_test_shell \
     $build_tools \
-    $srcdir" $configlog
-      
+    $with_zlib \
+    $with_szlib \
+    $srcdir" $configlog &&\
+    cat $config_summary >> $configlog
+
 #      5. Build the C library, tools and tests with this command:
-STEP "Build the library, tools and tests, ..." "cmake --build . --config Release" $makelog
-      
+STEP "Build the library, tools and tests, ..." "cmake --build . --config Release -- $njobs" $makelog
+
 #      6. Test the C library and tools with this command:
-STEP "Test the library and tools..." "ctest . -C Release" $testlog
-      
+STEP "Test the library and tools..." "ctest . -C Release $njobs" $testlog
+
 #      7. Create an install image with this command:
 STEP "Create an install image..." "cpack -C Release CPackConfig.cmake" $packlog
-      
+
+# The implementation of installation is incomplete (only works for linux).
+# Screen it out for now till it is completed.
+if false; then
 #      8. Install with this command:
-STEP "Install..." "./HDF5-${version}-Linux.sh --skip-license" $installlog
+STEP "Install..." "INSTALL_HDF5" $installlog
+fi
+
 # save the last exit code
 exit_code=$?
 
 # Show a closing time stamp
 TIMESTAMP
 exit $exit_code
-
-else
-# ---------------
-# older version
-# ---------------
-
-# variable names
-progname=`basename $0`	# program name
-cminfile="cmakemin.$$" # Cmake minimum file
-cfgfile=$progname.$$	# configure file
-ctest_log=ctest.log    # output of ctest script
-install_log=install.log  # output of installation
-$DPRINT $cfgfile
-
-# Remove temporary generated files if exit 0
-trap "rm -f $cminfile $cfgfile" 0
-
-#=============
-# Function definitions
-#=============
-TIMESTAMP()
-{
-    echo "=====" "`date`" "====="
-}
-
-
-#==========
-# main
-#==========
-# Show a start time stamp
-TIMESTAMP
-
-# Explain what and where log files are.
-cat <<EOF
-$ctest_log: output of ctest script.
-$install_log: output of installation
-Log files will be stored in Testing/Temporary:
-    LastConfigure_<timestamp>.log: output of configure
-    LastBuild_<timestamp>.log: output of build
-    LastTest_<timestamp>.log: output of testing
-    LastTestsFailed_<timestamp>.log: list of failed tests
-
-EOF
-
-# First generate the two needed input files, the $cimnfile and $cfgfile.
-# Then use ctest to use the two input files.
-
-#==========
-# create the configure file
-#==========
-# Create the cmake minimum required file to be used by the following
-# configure file. Though not absolute needed, it is better to generate
-# this file before the configure file.  Quote the EOF to preven substitution
-# in the text.
-#==========
-#==========
-cat > $cfgfile <<'EOF'
-cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
-########################################################
-# This dashboard is maintained by The HDF Group
-# For any comments please contact cdashhelp@hdfgroup.org
-#
-########################################################
-
-set (CTEST_DASHBOARD_ROOT ${CTEST_SCRIPT_DIRECTORY})
-set (CTEST_SOURCE_DIRECTORY "../hdf5")
-set (CTEST_BINARY_DIRECTORY ".")
-set (CTEST_CMAKE_GENERATOR "Unix Makefiles")
-set (CTEST_BUILD_CONFIGURATION "Release")
-set (CTEST_MAX_N 8)
-
-# -- CDash variables
-set (LOCAL_NO_SUBMIT TRUE)	# No CDash submit.
-set (MODEL "Experimental")
-set (CDASH_LOCAL TRUE)
-set (SITE_BUILDNAME_SUFFIX "cmakehdf5")
-
-# -- URL set for internal check, default is to not update
-set (LOCAL_SKIP_UPDATE TRUE)
-set (REPOSITORY_URL "http://svn.${hdfgroup_url}/hdf5/branches/hdf5_1_8")
-# -- Standard build options  
-set (ADD_BUILD_OPTIONS "-DCMAKE_INSTALL_PREFIX:PATH=${CTEST_BINARY_DIRECTORY} -DHDF5_ALLOW_EXTERNAL_SUPPORT:STRING=\"SVN\" -DHDF5_PACKAGE_EXTLIBS:BOOL=ON")
-
-# Use multiple CPU cores to build
-include(ProcessorCount)
-ProcessorCount(N)
-if(NOT N EQUAL 0)
-  if(N GREATER ${CTEST_MAX_N})
-    set(N ${CTEST_MAX_N})
-  endif(N GREATER ${CTEST_MAX_N})
-  set(CTEST_BUILD_FLAGS -j${N})
-  set(ctest_test_args ${ctest_test_args} PARALLEL_LEVEL ${N})
-endif()
-
-# -----------------------------------------------------------  
-# -- Get environment
-# -----------------------------------------------------------  
-  ## -- set hostname
-  ## --------------------------
-  find_program (HOSTNAME_CMD NAMES hostname)
-  exec_program (${HOSTNAME_CMD} ARGS OUTPUT_VARIABLE HOSTNAME)
-  set (CTEST_SITE "${HOSTNAME}${CTEST_SITE_EXT}")
-  find_program (UNAME NAMES uname)
-  macro (getuname name flag)
-    exec_program ("${UNAME}" ARGS "${flag}" OUTPUT_VARIABLE "${name}")
-  endmacro (getuname)
-
-  getuname (osname -s)
-  getuname (osrel  -r)
-  getuname (cpu    -m)
-
-  if (SITE_BUILDNAME_SUFFIX)
-    set (CTEST_BUILD_NAME  "${osname}-${osrel}-${cpu}-${SITE_BUILDNAME_SUFFIX}")
-  else (SITE_BUILDNAME_SUFFIX)
-    set (CTEST_BUILD_NAME  "${osname}-${osrel}-${cpu}")
-  endif (SITE_BUILDNAME_SUFFIX)
-# -----------------------------------------------------------  
-  
-set (BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILDNAME:STRING=${CTEST_BUILD_NAME}")
- 
-#-----------------------------------------------------------------------------
-# MAC machines need special option
-#-----------------------------------------------------------------------------
-if (APPLE)
-  # Compiler choice
-  execute_process(COMMAND xcrun --find cc OUTPUT_VARIABLE XCODE_CC OUTPUT_STRIP_TRAILING_WHITESPACE)
-  execute_process(COMMAND xcrun --find c++ OUTPUT_VARIABLE XCODE_CXX OUTPUT_STRIP_TRAILING_WHITESPACE)
-  SET(ENV{CC} "${XCODE_CC}")
-  SET(ENV{CXX} "${XCODE_CXX}")
-  # Shared fortran is not supported, build static 
-  set (BUILD_OPTIONS "${BUILD_OPTIONS} -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_ANSI_CFLAGS:STRING=-fPIC")
-  set (BUILD_OPTIONS "${BUILD_OPTIONS} -DCTEST_USE_LAUNCHERS:BOOL=ON -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=OFF")
-endif (APPLE)
-
-
-# -----------------------------------------------------------  
-find_package (Subversion)
-set (CTEST_UPDATE_COMMAND "${Subversion_SVN_EXECUTABLE}")
-# -- Only clean build folder if LOCAL_CLEAR_BUILD is set  
-if (LOCAL_CLEAR_BUILD)
-  set (CTEST_START_WITH_EMPTY_BINARY_DIRECTORY TRUE)
-  ctest_empty_binary_directory (${CTEST_BINARY_DIRECTORY})
-endif (LOCAL_CLEAR_BUILD)
-
-#-----------------------------------------------------------------------------
-# Send the main script as a note.
-list (APPEND CTEST_NOTES_FILES
-  "${CMAKE_CURRENT_LIST_FILE}"
-  "${CTEST_SOURCE_DIRECTORY}/config/cmake/cacheinit.cmake"
-  )
-
-# Check for required variables.
-foreach (req
-    CTEST_CMAKE_GENERATOR
-    CTEST_SITE
-    CTEST_BUILD_NAME
-    )
-  if (NOT DEFINED ${req})
-    message(FATAL_ERROR "The containing script must set ${req}")
-  endif (NOT DEFINED ${req})
-endforeach (req)
-
-## -- set output to english
-set($ENV{LC_MESSAGES}  "en_EN")
- 
-#-----------------------------------------------------------------------------
-# Initialize the CTEST commands
-#------------------------------
-set (CTEST_CMAKE_COMMAND "\"${CMAKE_COMMAND}\"")
-set (CTEST_CONFIGURE_COMMAND
-    "${CTEST_CMAKE_COMMAND} -C \"${CTEST_SOURCE_DIRECTORY}/config/cmake/cacheinit.cmake\" -DCMAKE_BUILD_TYPE:STRING=${CTEST_BUILD_CONFIGURATION} ${BUILD_OPTIONS} \"-G${CTEST_CMAKE_GENERATOR}\" \"${CTEST_SOURCE_DIRECTORY}\"")
-
-# Print summary information.
-foreach (v
-    CTEST_SITE
-    CTEST_BUILD_NAME
-    CTEST_SOURCE_DIRECTORY
-    CTEST_BINARY_DIRECTORY
-    CTEST_CMAKE_GENERATOR
-    CTEST_BUILD_CONFIGURATION
-    CTEST_CONFIGURE_COMMAND
-    CTEST_SCRIPT_DIRECTORY
-    )
-  set (vars "${vars}  ${v}=[${${v}}]\n")
-endforeach (v)
-message ("Dashboard script configuration:\n${vars}\n")
-
-CTEST_START (${MODEL} TRACK ${MODEL})
-if (NOT LOCAL_SKIP_UPDATE)
-  CTEST_UPDATE (SOURCE "${CTEST_SOURCE_DIRECTORY}")
-endif (NOT LOCAL_SKIP_UPDATE)
-CTEST_CONFIGURE (BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
-if(NOT res STREQUAL "0")
-  message (FATAL_ERROR "Configure FAILED")
-endif()
-message ("Configure DONE")
-CTEST_READ_CUSTOM_FILES ("${CTEST_BINARY_DIRECTORY}")
-if (NOT LOCAL_NO_SUBMIT)
-  CTEST_SUBMIT (PARTS Update Configure Notes)
-endif (NOT LOCAL_NO_SUBMIT)
-CTEST_BUILD (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND RETURN_VALUE res)
-if (NOT LOCAL_NO_SUBMIT)
-  CTEST_SUBMIT (PARTS Build)
-endif (NOT LOCAL_NO_SUBMIT)
-if(NOT res STREQUAL "0")
-  message (FATAL_ERROR "Build FAILED")
-endif()
-message ("build DONE")
-if (NOT LOCAL_SKIP_TEST)
-  CTEST_TEST (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND ${ctest_test_args} RETURN_VALUE res)
-  if (NOT LOCAL_NO_SUBMIT)
-    CTEST_SUBMIT (PARTS Test)
-  endif (NOT LOCAL_NO_SUBMIT)
-  if(NOT res STREQUAL "0")
-    message (FATAL_ERROR "Test FAILED")
-  endif()
-  message ("test DONE")
-endif (NOT LOCAL_SKIP_TEST)
-if(NOT LOCAL_MEMCHECK_TEST)
-  ##-----------------------------------------------
-  ## Package the product
-  ##-----------------------------------------------
-  execute_process(COMMAND cpack -C ${CTEST_BUILD_CONFIGURATION} -V
-    WORKING_DIRECTORY ${CTEST_BINARY_DIRECTORY}
-    RESULT_VARIABLE cpackResult
-    OUTPUT_VARIABLE cpackLog
-    ERROR_VARIABLE cpackLog.err
-  )
-  file(WRITE ${CTEST_BINARY_DIRECTORY}/cpack.log "${cpackLog.err}" "${cpackLog}")
-endif(NOT LOCAL_MEMCHECK_TEST)
-#-----------------------------------------------------------------------------
-
-message ("DONE")
-EOF
-
-
-# Run ctest
-ctest -S $cfgfile -C Release -V -O $ctest_log
-exit_code=$?
-if [ $exit_code = 0 ]; then
-    echo CTest script completed without error
-else
-    echo Error encountered CTest script
-fi
-# Using HDF5-*.sh because actual name is unavailable
-install_sh=HDF5-*.sh
-echo installing with $install_sh ...
-./$install_sh --skip-license > $install_log
-exit_code=$?
-if [ $exit_code = 0 ]; then
-    echo Complete without error
-else
-    echo Error encountered
-fi
-TIMESTAMP
-exit $exit_code
-
-fi
-
diff --git a/bin/compile b/bin/compile
deleted file mode 100755
index 9bc8e49..0000000
--- a/bin/compile
+++ /dev/null
@@ -1,113 +0,0 @@
-#! /bin/sh
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-#
-
-# Wrapper for compilers which do not understand `-c -o'.
-
-# Copyright 1999, 2000 Free Software Foundation, Inc.
-# Written by Tom Tromey <tromey@cygnus.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Usage:
-# compile PROGRAM [ARGS]...
-# `-o FOO.o' is removed from the args passed to the actual compile.
-
-prog=$1
-shift
-
-ofile=
-cfile=
-args=
-while test $# -gt 0; do
-   case "$1" in
-    -o)
-       # configure might choose to run compile as `compile cc -o foo foo.c'.
-       # So we do something ugly here.
-       ofile=$2
-       shift
-       case "$ofile" in
-	*.o | *.obj)
-	   ;;
-	*)
-	   args="$args -o $ofile"
-	   ofile=
-	   ;;
-       esac
-       ;;
-    *.c)
-       cfile=$1
-       args="$args $1"
-       ;;
-    *)
-       args="$args $1"
-       ;;
-   esac
-   shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
-   # If no `-o' option was seen then we might have been invoked from a
-   # pattern rule where we don't need one.  That is ok -- this is a
-   # normal compilation that the losing compiler can handle.  If no
-   # `.c' file was seen then we are probably linking.  That is also
-   # ok.
-   exec "$prog" $args
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use `[/.-]' here to ensure that we don't use the same name
-# that we are using for the .o file.  Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d
-while true; do
-   if mkdir $lockdir > /dev/null 2>&1; then
-      break
-   fi
-   sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir $lockdir; exit 1" 1 2 15
-
-# Run the compile.
-"$prog" $args
-status=$?
-
-if test -f "$cofile"; then
-   mv "$cofile" "$ofile"
-fi
-
-rmdir $lockdir
-exit $status
diff --git a/bin/config.guess b/bin/config.guess
deleted file mode 100755
index 03fe473..0000000
--- a/bin/config.guess
+++ /dev/null
@@ -1,1526 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-#   Free Software Foundation, Inc.
-
-timestamp='2008-01-23'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
-#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
-	    armeb) machine=armeb-unknown ;;
-	    arm*) machine=arm-unknown ;;
-	    sh3el) machine=shl-unknown ;;
-	    sh3eb) machine=sh-unknown ;;
-	    sh5el) machine=sh5le-unknown ;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-	        os=netbsd
-		;;
-	esac
-	# The OS release
-	# Debian GNU/NetBSD machines have a different userland, and
-	# thus, need a distinct triplet. However, they do not need
-	# kernel version information, so it can be replaced with a
-	# suitable tag, in the style of linux-gnu.
-	case "${UNAME_VERSION}" in
-	    Debian*)
-		release='-gnu'
-		;;
-	    *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-		;;
-	esac
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
-	exit ;;
-    *:OpenBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-	exit ;;
-    *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit ;;
-    *:SolidBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-	exit ;;
-    macppc:MirBSD:*:*)
-	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    alpha:OSF1:*:*)
-	case $UNAME_RELEASE in
-	*4.0)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-		;;
-	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-		;;
-	esac
-	# According to Compaq, /usr/sbin/psrinfo has been available on
-	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-	# covers most systems running today.  This code pipes the CPU
-	# types through head -n 1, so we only detect the type of CPU 0.
-	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-	case "$ALPHA_CPU_TYPE" in
-	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
-	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
-	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
-	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
-	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
-	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
-	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
-	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
-	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
-	esac
-	# A Pn.n version is a patched version.
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit ;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
-	exit ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit ;;
-    *:z/VM:*:*)
-	echo s390-ibm-zvmoe
-	exit ;;
-    *:OS400:*:*)
-        echo powerpc-ibm-os400
-	exit ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
-	echo arm-unknown-riscos
-	exit ;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit ;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit ;;
-    NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit ;;
-    DRS?6000:unix:4.0:6*)
-	echo sparc-icl-nx6
-	exit ;;
-    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7; exit ;;
-	esac ;;
-    sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit ;;
-    sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
-		;;
-	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
-		;;
-	esac
-	exit ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
-    m68k:machten:*:*)
-	echo m68k-apple-machten${UNAME_RELEASE}
-	exit ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c &&
-	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-	  SYSTEM_NAME=`$dummy $dummyarg` &&
-	    { echo "$SYSTEM_NAME"; exit; }
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit ;;
-    Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit ;;
-    AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-	then
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	    fi
-	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
-	fi
- 	exit ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit ;;
-    ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-		then
-			echo "$SYSTEM_NAME"
-		else
-			echo rs6000-ibm-aix3.2.5
-		fi
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit ;;
-    *:AIX:*:[456])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit ;;                             # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit ;;
-    9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
-		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
-		fi
-		if [ "${HP_ARCH}" = "" ]; then
-		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
-
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
-
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
-
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
-EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-		    test -z "$HP_ARCH" && HP_ARCH=hppa
-		fi ;;
-	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
-	then
-	    eval $set_cc_for_build
-
-	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-	    # generating 64-bit code.  GNU and HP use different nomenclature:
-	    #
-	    # $ CC_FOR_BUILD=cc ./config.guess
-	    # => hppa2.0w-hp-hpux11.23
-	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-	    # => hppa64-hp-hpux11.23
-
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep __LP64__ >/dev/null
-	    then
-		HP_ARCH="hppa2.0w"
-	    else
-		HP_ARCH="hppa64"
-	    fi
-	fi
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit ;;
-    3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-		{ echo "$SYSTEM_NAME"; exit; }
-	echo unknown-hitachi-hiuxwe2
-	exit ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit ;;
-    i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-        exit ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-        exit ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-        exit ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-        exit ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-        exit ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	      -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    *:UNICOS/mp:*:*)
-	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
-    5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:FreeBSD:*:*)
-	case ${UNAME_MACHINE} in
-	    pc98)
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    amd64)
-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    *)
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	esac
-	exit ;;
-    i*:CYGWIN*:* | x*:CYGWIN*:*)
-    echo ${UNAME_MACHINE}-pc-cygwin
-    exit ;;
-    *:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit ;;
-    i*:windows32*:*)
-    	# uname -m includes "-pc" on this system.
-    	echo ${UNAME_MACHINE}-mingw32
-	exit ;;
-    i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit ;;
-    *:Interix*:[3456]*)
-    	case ${UNAME_MACHINE} in
-	    x86)
-		echo i586-pc-interix${UNAME_RELEASE}
-		exit ;;
-	    EM64T | authenticamd)
-		echo x86_64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	    IA64)
-		echo ia64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	esac ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-	echo i${UNAME_MACHINE}-pc-mks
-	exit ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i586-pc-interix
-	exit ;;
-    i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit ;;
-    amd64:CYGWIN*:*:*)
-	echo x86_64-unknown-cygwin
-	exit ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    *:GNU:*:*)
-	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit ;;
-    *:GNU/*:*:*)
-	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-	exit ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit ;;
-    arm*:Linux:*:*)
-	eval $set_cc_for_build
-	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-	    | grep -q __ARM_EABI__
-	then
-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
-	else
-	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-	fi
-	exit ;;
-    avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    cris:Linux:*:*)
-	echo cris-axis-linux-gnu
-	exit ;;
-    crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
-	exit ;;
-    frv:Linux:*:*)
-    	echo frv-unknown-linux-gnu
-	exit ;;
-    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    mips:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips
-	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips64
-	#undef mips64el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    or32:Linux:*:*)
-	echo or32-unknown-linux-gnu
-	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
-	esac
-	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-	exit ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
-	exit ;;
-    sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
-	exit ;;
-    x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
-	exit ;;
-    xtensa*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit ;;
-	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^LIBC/{
-		s: ::g
-		p
-	    }'`"
-	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-		exit
-	}
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-	;;
-    i*86:DYNIX/ptx:4*:*)
-	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-	# earlier versions are messed up and put the nodename in both
-	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit ;;
-    i*86:syllable:*:*)
-	echo ${UNAME_MACHINE}-pc-syllable
-	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-	fi
-	exit ;;
-    i*86:*:5:[678]*)
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
-	case `/bin/uname -X | grep "^Machine"` in
-	    *486*)	     UNAME_MACHINE=i486 ;;
-	    *Pentium)	     UNAME_MACHINE=i586 ;;
-	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit ;;
-    i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit ;;
-    pc:*:*:*)
-	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
-        exit ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit ;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	exit ;;
-    M680?0:D-NIX:5.3:*)
-	echo m68k-diab-dnix
-	exit ;;
-    M68*:*:R3V[5678]*:*)
-	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit ;;
-    RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes@openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit ;;
-    *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit ;;
-    i*86:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo ${UNAME_MACHINE}-stratus-vos
-	exit ;;
-    *:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit ;;
-    news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
-	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
-        exit ;;
-    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit ;;
-    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit ;;
-    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit ;;
-    SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-7:SUPER-UX:*:*)
-	echo sx7-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8:SUPER-UX:*:*)
-	echo sx8-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8R:SUPER-UX:*:*)
-	echo sx8r-nec-superux${UNAME_RELEASE}
-	exit ;;
-    Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Darwin:*:*)
-	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	    unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
-		UNAME_PROCESSOR=i386
-		UNAME_MACHINE=pc
-	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
-	echo nse-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = "386"; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit ;;
-    SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
-	exit ;;
-    *:DragonFly:*:*)
-	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit ;;
-    *:*VMS:*:*)
-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-	case "${UNAME_MACHINE}" in
-	    A*) echo alpha-dec-vms ; exit ;;
-	    I*) echo ia64-dec-vms ; exit ;;
-	    V*) echo vax-dec-vms ; exit ;;
-	esac ;;
-    *:XENIX:*:SysV)
-	echo i386-pc-xenix
-	exit ;;
-    i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-	exit ;;
-    i*86:rdos:*:*)
-	echo ${UNAME_MACHINE}-pc-rdos
-	exit ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-          "4"
-#else
-	  ""
-#endif
-         ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-	{ echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    c34*)
-	echo c34-convex-bsd
-	exit ;;
-    c38*)
-	echo c38-convex-bsd
-	exit ;;
-    c4*)
-	echo c4-convex-bsd
-	exit ;;
-    esac
-fi
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/bin/config.sub b/bin/config.sub
deleted file mode 100755
index 6759825..0000000
--- a/bin/config.sub
+++ /dev/null
@@ -1,1658 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-#   Free Software Foundation, Inc.
-
-timestamp='2008-01-16'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit ;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray)
-		os=
-		basic_machine=$1
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
- 	-chorusrdb)
- 		os=-chorusrdb
-		basic_machine=$1
- 		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco6)
-		os=-sco5v6
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-	| bfin \
-	| c4x | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| fido | fr30 | frv \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| i370 | i860 | i960 | ia64 \
-	| ip2k | iq2000 \
-	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
-	| mips64orion | mips64orionel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mips64vr5900 | mips64vr5900el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| mt \
-	| msp430 \
-	| nios | nios2 \
-	| ns16k | ns32k \
-	| or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-	| pyramid \
-	| score \
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu | strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
-	| v850 | v850e \
-	| we32k \
-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-	| z8k)
-		basic_machine=$basic_machine-unknown
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
-		# Motorola 68HC11/12.
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-		;;
-	ms1)
-		basic_machine=mt-unknown
-		;;
-
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* | avr32-* \
-	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | craynv-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
-	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| m32c-* | m32r-* | m32rle-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mips64vr5900-* | mips64vr5900el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipstx39-* | mipstx39el-* \
-	| mmix-* \
-	| mt-* \
-	| msp430-* \
-	| nios-* | nios2-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-	| pyramid-* \
-	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tron-* \
-	| v850-* | v850e-* | vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa*-* \
-	| ymp-* \
-	| z8k-*)
-		;;
-	# Recognize the basic CPU types without company name, with glob match.
-	xtensa*)
-		basic_machine=$basic_machine-unknown
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-    	abacus)
-		basic_machine=abacus-unknown
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	blackfin)
-		basic_machine=bfin-unknown
-		os=-linux
-		;;
-	blackfin-*)
-		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	craynv)
-		basic_machine=craynv-cray
-		os=-unicosmp
-		;;
-	cr16)
-		basic_machine=cr16-unknown
-		os=-elf
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	crisv32 | crisv32-* | etraxfs*)
-		basic_machine=crisv32-axis
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	crx)
-		basic_machine=crx-unknown
-		os=-elf
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	djgpp)
-		basic_machine=i586-pc
-		os=-msdosdjgpp
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m68knommu)
-		basic_machine=m68k-unknown
-		os=-linux
-		;;
-	m68knommu-*)
-		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	mingw32)
-		basic_machine=i386-pc
-		os=-mingw32
-		;;
-	mingw32ce)
-		basic_machine=arm-unknown
-		os=-mingw32ce
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	ms1-*)
-		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	openrisc | openrisc-*)
-		basic_machine=or32-unknown
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	parisc)
-		basic_machine=hppa-unknown
-		os=-linux
-		;;
-	parisc-*)
-		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-	pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pc98)
-		basic_machine=i386-pc
-		;;
-	pc98-*)
-		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
-		basic_machine=i686-pc
-		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc)	basic_machine=powerpc-unknown
-		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-		;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rdos)
-		basic_machine=i386-pc
-		os=-rdos
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
-	sde)
-		basic_machine=mipsisa32-sde
-		os=-elf
-		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sh5el)
-		basic_machine=sh5le-unknown
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
-		;;
-	tile*)
-		basic_machine=tile-unknown
-		os=-linux-gnu
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	xbox)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	mmix)
-		basic_machine=mmix-knuth
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
-		basic_machine=sh-unknown
-		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-		basic_machine=sparc-sun
-		;;
-	cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -openbsd* | -solidbsd* \
-	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto-qnx*)
-		;;
-	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
-        -os400*)
-		os=-os400
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-syllable*)
-		os=-syllable
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
-	-ns2 )
-		os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-        -tpf*)
-		os=-tpf
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
-		;;
-	-aros*)
-		os=-aros
-		;;
-	-kaos*)
-		os=-kaos
-		;;
-	-zvmoe)
-		os=-zvmoe
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-        score-*)
-		os=-elf
-		;;
-        spu-*)
-		os=-elf
-		;;
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-        c4x-* | tic4x-*)
-        	os=-coff
-		;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=-tops20
-		;;
-	pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
-		;;
-	m68*-cisco)
-		os=-aout
-		;;
-        mep-*)
-		os=-elf
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	or32-*)
-		os=-coff
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-haiku)
-		os=-haiku
-		;;
-	*-ibm)
-		os=-aix
-		;;
-    	*-knuth)
-		os=-mmixware
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-	*-gould)
-		os=-sysv
-		;;
-	*-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-	*-sgi)
-		os=-irix
-		;;
-	*-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-os400*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-tpf*)
-				vendor=ibm
-				;;
-			-vxsim* | -vxworks* | -windiss*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-			-vos*)
-				vendor=stratus
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
-exit
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/bin/debug-ohdr b/bin/debug-ohdr
index 170919a..1106af3 100755
--- a/bin/debug-ohdr
+++ b/bin/debug-ohdr
@@ -1,17 +1,14 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 #
 require 5.003;
 
diff --git a/bin/depcomp b/bin/depcomp
deleted file mode 100755
index ffcd540..0000000
--- a/bin/depcomp
+++ /dev/null
@@ -1,529 +0,0 @@
-#! /bin/sh
-# depcomp - compile a program generating dependencies as side-effects
-
-scriptversion=2005-02-09.22
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-
-case $1 in
-  '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-
-Run PROGRAMS ARGS to compile a file, generating dependencies
-as side-effects.
-
-Environment variables:
-  depmode     Dependency tracking mode.
-  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output by `PROGRAMS ARGS'.
-  DEPDIR      directory where to store dependencies.
-  depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputing dependencies.
-  libtool     Whether libtool is used (yes/no).
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "depcomp $scriptversion"
-    exit $?
-    ;;
-esac
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-  exit 1
-fi
-
-# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-depfile=${depfile-`echo "$object" |
-  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Some modes work just like other modes, but use different flags.  We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write.  Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
-  # HP compiler uses -M and no extra arg.
-  gccflag=-M
-  depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff.  Hmm.
-  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  mv "$tmpdepfile" "$depfile"
-  ;;
-
-gcc)
-## There are various ways to get dependency output from gcc.  Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-##   up in a subdir.  Having to rename by hand is ugly.
-##   (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
-## - Using -M directly means running the compiler twice (even worse
-##   than renaming).
-  if test -z "$gccflag"; then
-    gccflag=-MD,
-  fi
-  "$@" -Wp,"$gccflag$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
-  sed -e 's/^[^:]*: / /' \
-      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header).  We avoid this by adding
-## dummy dependencies for each header file.  Too bad gcc doesn't do
-## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
-## that the space means something, we add a space to the output as
-## well.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-sgi)
-  if test "$libtool" = yes; then
-    "$@" "-Wp,-MDupdate,$tmpdepfile"
-  else
-    "$@" -MDupdate "$tmpdepfile"
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-
-  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-    echo "$object : \\" > "$depfile"
-
-    # Clip off the initial element (the dependent).  Don't try to be
-    # clever and replace this with sed code, as IRIX sed won't handle
-    # lines with more than a fixed number of characters (4096 in
-    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
-    # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> $depfile
-    echo >> $depfile
-
-    # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> $depfile
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-aix)
-  # The C for AIX Compiler uses -M and outputs the dependencies
-  # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts `$object:' at the
-  # start of each line; $object doesn't have directory information.
-  # Version 6 uses the directory in both cases.
-  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
-  tmpdepfile="$stripped.u"
-  if test "$libtool" = yes; then
-    "$@" -Wc,-M
-  else
-    "$@" -M
-  fi
-  stat=$?
-
-  if test -f "$tmpdepfile"; then :
-  else
-    stripped=`echo "$stripped" | sed 's,^.*/,,'`
-    tmpdepfile="$stripped.u"
-  fi
-
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-
-  if test -f "$tmpdepfile"; then
-    outname="$stripped.o"
-    # Each line is of the form `foo.o: dependent.h'.
-    # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-icc)
-  # Intel's C compiler understands `-MD -MF file'.  However on
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-  # ICC 7.0 will fill foo.d with something like
-  #    foo.o: sub/foo.c
-  #    foo.o: sub/foo.h
-  # which is wrong.  We want:
-  #    sub/foo.o: sub/foo.c
-  #    sub/foo.o: sub/foo.h
-  #    sub/foo.c:
-  #    sub/foo.h:
-  # ICC 7.1 will output
-  #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using \ :
-  #    foo.o: sub/foo.c ... \
-  #     sub/foo.h ... \
-  #     ...
-
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h',
-  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
-  # Do two passes, one to just change these to
-  # `$object: dependent.h' and one to simply `dependent.h:'.
-  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-    sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-tru64)
-   # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in `foo.d' instead, so we check for that too.
-   # Subdirectories are respected.
-   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-   test "x$dir" = "x$object" && dir=
-   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
-   if test "$libtool" = yes; then
-      # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mecanism is used in libtool 1.4 series to
-      # handle both shared and static libraries in a single compilation.
-      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-      #
-      # With libtool 1.5 this exception was removed, and libtool now
-      # generates 2 separate objects for the 2 libraries.  These two
-      # compilations output dependencies in in $dir.libs/$base.o.d and
-      # in $dir$base.o.d.  We have to check for both files, because
-      # one of the two compilations can be disabled.  We should prefer
-      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-      # automatically cleaned when .libs/ is deleted, while ignoring
-      # the former would cause a distcleancheck panic.
-      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
-      tmpdepfile2=$dir$base.o.d          # libtool 1.5
-      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
-      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
-      "$@" -Wc,-MD
-   else
-      tmpdepfile1=$dir$base.o.d
-      tmpdepfile2=$dir$base.d
-      tmpdepfile3=$dir$base.d
-      tmpdepfile4=$dir$base.d
-      "$@" -MD
-   fi
-
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-      exit $stat
-   fi
-
-   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-   do
-     test -f "$tmpdepfile" && break
-   done
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a tab and a space in the [].
-      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-      echo "#dummy" > "$depfile"
-   fi
-   rm -f "$tmpdepfile"
-   ;;
-
-#nosideeffect)
-  # This comment above is used by automake to tell side-effect
-  # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for `:'
-  # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
-  "$@" $dashmflag |
-    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-dashXmstdout)
-  # This case only exists to satisfy depend.m4.  It is never actually
-  # run, as this mode is specially recognized in the preamble.
-  exit 1
-  ;;
-
-makedepend)
-  "$@" || exit $?
-  # Remove any Libtool call
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-  # X makedepend
-  shift
-  cleared=no
-  for arg in "$@"; do
-    case $cleared in
-    no)
-      set ""; shift
-      cleared=yes ;;
-    esac
-    case "$arg" in
-    -D*|-I*)
-      set fnord "$@" "$arg"; shift ;;
-    # Strip any option that makedepend may not understand.  Remove
-    # the object too, otherwise makedepend will parse it as a source file.
-    -*|$object)
-      ;;
-    *)
-      set fnord "$@" "$arg"; shift ;;
-    esac
-  done
-  obj_suffix="`echo $object | sed 's/^.*\././'`"
-  touch "$tmpdepfile"
-  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile" "$tmpdepfile".bak
-  ;;
-
-cpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  "$@" -E |
-    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  cat < "$tmpdepfile" >> "$depfile"
-  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvisualcpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
-  "$@" || exit $?
-  IFS=" "
-  for arg
-  do
-    case "$arg" in
-    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-	set fnord "$@"
-	shift
-	shift
-	;;
-    *)
-	set fnord "$@" "$arg"
-	shift
-	shift
-	;;
-    esac
-  done
-  "$@" -E |
-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-none)
-  exec "$@"
-  ;;
-
-*)
-  echo "Unknown depmode $depmode" 1>&2
-  exit 1
-  ;;
-esac
-
-exit 0
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/bin/dependencies b/bin/dependencies
deleted file mode 100755
index a82a3ee..0000000
--- a/bin/dependencies
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/perl -w
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-#
-my $depend_file;
-my $new_depend_file;
-my $srcdir;
-my $top_srcdir;
-my $top_builddir;
-
-while ($_ = shift @ARGV) {
-    if (/^--top_srcdir=([^ \t\n]*)/) {
-        $top_srcdir = $1;
-        $top_srcdir =~ s/\+/\\\+/g;
-        $top_srcdir =~ s/\./\\\./g;
-    } elsif (/^--top_builddir=([^ \t\n]*)/) {
-        $top_builddir = $1;
-        $top_builddir =~ s/\+/\\\+/g;
-        $top_builddir =~ s/\./\\\./g;
-    } else {
-        $depend_file = $_;
-        $new_depend_file = "$_.new";
-        last;
-    }
-}
-
-open(DEPEND, "<$depend_file") || die "cannot open file $depend_file: $!\n";
-open(NEW, ">$new_depend_file") || die "cannot open file $new_depend_file: $!\n";
-
-while (<DEPEND>) {
-    s/\.o(\b)/\.lo$1/g;
-    s/ $top_srcdir/ \$\(top_srcdir\)/g;
-    s/ $top_builddir/ \$\(top_builddir\)/g;
-    print NEW $_;
-}
-
-close(DEPEND);
-close(NEW);
-
-`mv $new_depend_file $depend_file`;
diff --git a/bin/deploy b/bin/deploy
deleted file mode 100755
index ef30d21..0000000
--- a/bin/deploy
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-#
-# Deploy the HDF5 binary.
-#
-# Programmer: Albert Cheng
-# Created Date: 2004/12/15
-#
-# Modifications
-
-# Function definitions
-#
-# Print Usage page
-USAGE()
-{
-cat << EOF
-Usage: $0 <dir>
-   Install the binary to directory <dir>
-
-Examples:
-
-    $ bin/deploy /usr/local/hdf5
-    ....
-
-EOF
-
-}
-
-
-# Variables
-
-if [ $# != 1 ]; then
-    USAGE
-    exit 1
-fi
-
-installdir=$1
-# create installdir if it does not exist yet.
-if [ -d $installdir ] || mkdir $installdir ; then
-    ${MAKE:-gmake} install prefix=$installdir  && \
-	( cd $installdir/bin; ./h5redeploy -force)
-    exit $?
-else
-    echo $installdir is not a valid directory
-    USAGE
-    exit 1
-fi
-
diff --git a/bin/distdep b/bin/distdep
deleted file mode 100644
index 0a22bd1..0000000
--- a/bin/distdep
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/perl -p
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-#
-
-# Usage: $0 [<].depend
-
-# Takes dependency info and generates on stdout dependencies suitable for
-# distribution by removing all the system include files from the list and
-# removing all but the base name of other include files (since the Makefiles
-# contain the logic for searching).
-
-($h,$_)=/\s*\\/?$h.$`:("",$h.$_);
-s|( +/\S*)*( *)|$2?" \\\n   ":""|eg;
-#s|(([-\w\.]+)/)+([-\w\.]+)|\3|g;
diff --git a/bin/errors b/bin/errors
deleted file mode 100755
index 6ce997b..0000000
--- a/bin/errors
+++ /dev/null
@@ -1,140 +0,0 @@
-#!/usr/local/bin/perl -w
-require 5.003;
-use Text::Tabs;
-
-# NOTE: THE FORMAT OF HRETURN_ERROR AND HGOTO_ERROR MACROS HAS
-# CHANGED. THIS SCRIPT NO LONGER WORKS! --rpm
-
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-#
-# Robb Matzke, matzke@llnl.gov
-# 30 Aug 1997
-#
-# Purpose: This script will read standard input which should be a
-#	   function prologue followed by a C function and will emit
-#	   on standard output the same source code with the function
-#	   prologue containing documentation for the various errors
-#	   that occur in the function.
-#
-#	   Errors are raised by calling HGOTO_ERROR() or
-#	   HRETURN_ERROR(). The reason for the error message is a
-#	   comment which appears immediately after the error macro
-#	   call and is contained entirely on one line:
-#
-#		HRETURN_ERROR (...); /*entry not found*/
-#
-#	   If such a comment doesn't exist, then the previous comment
-#	   is used, subject to the constraint that raising an error
-#	   clears the previous comment.
-#
-#	         /* Entry not found */
-#		 HGOTO_ERROR (...);
-#
-# 	   Emacs users can use this script interactively with the
-#	   c-mark-function and shell-command-on-region functions which
-#	   are normally bound to M-C-h and M-|.
-
-
-# Split STDIN into the prolog and the function body.  Preserve leading
-# white space.
-$_ = join "", <STDIN>;
-my ($head, $prolog, $body) = (/^(\s*)(\/\*(.*?)\*\/)?(.*)/s)[0,2,3];
-$prolog = "" unless $prolog;
-
-# Find each error and the comment that goes with it.
-for ($_=$body,$comment=""; /\/\*|H(RETURN|GOTO)_ERROR/s;) {
-   $_ = $&.$';
-
-   if (/^H(RETURN|GOTO)_ERROR\s*\(\s*H5E_(\w+)\s*,\s*H5E_(\w+)\s*,/s) {
-      ($major, $minor, $_) = ($2, $3, $');
-      $comment=$1 if /^.*?\)\s*;\s*\/\*\s*(.*?)\s*\*\//;
-      $comment =~ s/^\s*\*+\s*/ /mg; # leading asterisks.
-      $comment =~ s/^\s+//s;         # leading white space.
-      $comment =~ s/\s+$//s;         # trailing white space.
-      $comment =~ s/(\w)$/$1./s;     # punctuation.
-      $comment ||= "***NO COMMENT***";
-      $errors{"$major\000$minor\000\u$comment"} = 1;
-      $comment = "";
-
-   } else {
-      ($comment) = /^\/\*\s*(.*?)\s*\*\//s;
-      $_ = $';
-   }
-}
-
-
-# Format an error so it isn't too wide.
-sub fmt_error ($) {
-   local ($_) = @_;
-
-   my ($prefix,$space,$err) = /^((.*?)([A-Z_0-9]+\s+[A-Z_0-9]+\s+))/;
-   $_ = $';
-   tr/\n /  /s;
-   my $w = 70 - length expand $prefix;
-   s/(.{$w}\S+)\s+(\S)/$1."\n".$space.' 'x(length $err).$2/eg;
-   return $prefix . $_."\n";
-}
-
-
-
-# Sort the errors by major, then minor, then comment.  Duplicate
-# triplets have already been removed.
-sub by_triplet {
-   my ($a_maj, $a_min, $a_com) = split /\000/, $a;
-   my ($b_maj, $b_min, $b_com) = split /\000/, $b;
-   $a_maj cmp $b_maj || $a_min cmp $b_min || $a_com cmp $b_com;
-}
-@errors = map {sprintf "%-9s %-13s %s\n", split /\000/}
-          sort by_triplet keys %errors;
-
-
-
-# Add the list of errors to the prologue depending on the type of
-# prolog.
-if (($front, $back) = $prolog=~/^(.*?Errors:\s*?(?=\n)).*?\n\s*\*\s*\n(.*)/s) {
-   #| * Errors:							      |#
-   #| *		__list_of_error_messages__ (zero or more lines)	      |#
-   #| *								      |#
-   print $head, "/*", $front, "\n";
-   map {print fmt_error " *\t\t".$_} @errors;
-   print " *\n", $back, "*/", $body;
-
-} elsif (($front,$back) = $prolog =~
-	 /(.*?\n\s*ERRORS:?\s*?(?=\n)).*?\n\s*\n(.*)/s) {
-   #| ERRORS							      |#
-   #|		__list_of_error_messages__ (zero or more lines)	      |#
-   #|								      |#
-   print $head, "/*", $front, "\n";
-   map {print fmt_error "    ".$_} @errors;
-   print "\n", $back, "*/", $body;
-
-} elsif ($prolog eq "") {
-   # No prolog present.
-   print $head;
-   print "\n/*", "-"x73, "\n * Function:\t\n *\n * Purpose:\t\n *\n";
-   print " * Errors:\n";
-   map {print fmt_error " *\t\t".$_} @errors;
-   print " *\n * Return:\tSuccess:\t\n *\n *\t\tFailure:\t\n *\n";
-   print " * Programmer:\t\n *\n * Modifications:\n *\n *", '-'x73, "\n";
-   print " */\n", $body;
-
-} else {
-   # Prolog format not recognized.
-   print $head, "/*", $prolog, "*/\n\n";
-   print "/*\n * Errors returned by this function...\n";
-   map {print fmt_error " *\t".$_} @errors;
-   print " */\n", $body;
-}
-
-
diff --git a/bin/format_source b/bin/format_source
new file mode 100755
index 0000000..227d22a
--- /dev/null
+++ b/bin/format_source
@@ -0,0 +1,26 @@
+#!/bin/bash
+#
+# Recursively format all C & C++ sources and header files, except those in the
+# 'config' directory and generated files, such as H5LTanalyze.c, etc.
+#
+# Note that any files or directories that are excluded here should also be
+# added to the 'exclude' list in .github/workflows/clang-format-check.yml
+#
+# (Remember to update both bin/format_source and bin/format_source_patch)
+
+find . \( -type d -path ./config -prune -and -not -path ./config \) \
+    -or \( \( \! \( \
+        -name H5LTanalyze.c \
+        -or -name H5LTparse.c \
+        -or -name H5LTparse.h \
+        -or -name H5Epubgen.h \
+        -or -name H5Einit.h \
+        -or -name H5Eterm.h \
+        -or -name H5Edefin.h \
+        -or -name H5version.h \
+        -or -name H5overflow.h \
+        \) \) \
+    -and \( -iname *.h -or -iname *.c -or -iname *.cpp -or -iname *.hpp -or -iname *.java \) \) \
+    | xargs clang-format -style=file -i -fallback-style=none
+
+exit 0
diff --git a/bin/gcov_script b/bin/gcov_script
deleted file mode 100755
index ac82189..0000000
--- a/bin/gcov_script
+++ /dev/null
@@ -1,53 +0,0 @@
-#! /bin/sh
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-
-# A script to generate coverage files for HDF5 using gcov.
-# Configures, builds, and runs tests in-place; the output files will be placed
-# in a directory called gcov_logs.
-# Must be invoked from the root hdf5 directory.
-# This script has been tested on kagiso.
-
-CFLAGS="$CFLAGS -ftest-coverage -fprofile-arcs"
-export CFLAGS
-LDFLAGS="$LDFLAGS -lgcov"
-export LDFLAGS
-CC=gcc
-export CC
-./configure
-make
-make check
-mkdir gcov_logs
-cd src
-for j in *.h *.c
-  do
-  ln -s ../$j .libs/$j
-  done 
-cd .libs
-for j in *.gcda
-  do
-  gcov -b $j >> gcov.log 2>&1
-  done
-for j in *.gcov
-   do
-   mv $j ../../gcov_logs
-   done
-mv gcov.log ../../gcov_logs
-for j in *.c *.h
-  do
-  rm $j
-  done
-cd ../..
-
-
diff --git a/bin/genltanalyze b/bin/genltanalyze
deleted file mode 100755
index 1f56cc1..0000000
--- a/bin/genltanalyze
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/sh
-##
-## Copyright by the Board of Trustees of the University of Illinois.
-## All rights reserved.
-##
-## This file is part of HDF5.  The full HDF5 copyright notice, including
-## terms governing use, modification, and redistribution, is contained in
-## the files COPYING and Copyright.html.  COPYING can be found at the root
-## of the source code distribution tree; Copyright.html can be found at the
-## root level of an installed copy of the electronic HDF5 document set and
-## is linked from the top-level documents page.  It can also be found at
-## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
-## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
-##
-# regenerate hl/src/H5LTanalyze.c
-
-# HDF5 currently uses the following versions of the bison flex:
-BISON_VERSION="bison (GNU Bison) 2.7"
-FLEX_VERSION="flex 2.5.37"
-
-# If paths to bison flex are not specified by the user, assume tools are
-# running on jam in /mnt/hdf/packages and set paths accordingly.
-if test -z ${BISON}; then
-  BISON=/usr/hdf/bin/bison
-fi
-if test -z ${FLEX}; then
-  FLEX=/usr/hdf/bin/flex
-fi
-
-# Check version numbers of all bison flex against the "correct" versions
-BI_VERS=`${BISON} --version 2>&1 | grep "^${BISON_VERSION}"`
-if test -z "${BI_VERS}"; then
-   echo "${BISON} version is not ${BISON_VERSION}"
-   exit 1
-fi
-FL_VERS=`${FLEX} --version 2>&1 | grep "^${FLEX_VERSION}"`
-if test -z "${FL_VERS}"; then
-   echo "${FLEX} version is not ${FLEX_VERSION}"
-   exit 1
-fi
-
-# Make sure that the tools are in the path.
-BISON_DIR=`dirname ${BISON}`
-FLEX_DIR=`dirname ${FLEX}`
-
-# Main body
-cd hl/src
-echo "Generate hl/src/H5LTparse.c from hl/src/H5LTparse.y"
-bison -pH5LTyy -o H5LTparse.c -d H5LTparse.y
-echo "Generate hl/src/H5LTanalyze.c from hl/src/H5LTanalyze.l"
-flex --nounistd -PH5LTyy -oH5LTanalyze.c H5LTanalyze.l
-
-# fix H5LTparse.c to declare H5LTyyparse return type as an hid_t
-# instead of int.  Currently the generated function H5LTyyparse is
-# generated with a return value of type int, which is a mapping to the
-# flex yyparse function.  The return value in the HL library should be
-# an hid_t. 
-# I propose to not use flex to generate this function, but for now I am 
-# adding a perl command to find and replace this function declaration in
-# H5LTparse.c.
-perl -0777 -pi -e 's/int\nyyparse/hid_t\nyyparse/igs' H5LTparse.c
-perl -0777 -pi -e 's/int H5LTyyparse/hid_t H5LTyyparse/igs' H5LTparse.c
-
-# Add code that disables warnings in the flex/bison-generated code.
-#
-# Note that the GCC pragmas did not exist until gcc 4.2. Earlier versions
-# will simply ignore them, but we want to avoid those warnings.
-for f in H5LTparse.c H5LTanalyze.c
-do
-    echo '#if __GNUC__ >= 4 && __GNUC_MINOR__ >=2                           ' >> tmp.out
-    echo '#pragma GCC diagnostic ignored "-Wconversion"                     ' >> tmp.out
-    echo '#pragma GCC diagnostic ignored "-Wimplicit-function-declaration"  ' >> tmp.out
-    echo '#pragma GCC diagnostic ignored "-Wlarger-than="                   ' >> tmp.out
-    echo '#pragma GCC diagnostic ignored "-Wmissing-prototypes"             ' >> tmp.out
-    echo '#pragma GCC diagnostic ignored "-Wnested-externs"                 ' >> tmp.out
-    echo '#pragma GCC diagnostic ignored "-Wold-style-definition"           ' >> tmp.out
-    echo '#pragma GCC diagnostic ignored "-Wsign-compare"                   ' >> tmp.out
-    echo '#pragma GCC diagnostic ignored "-Wsign-conversion"                ' >> tmp.out
-    echo '#pragma GCC diagnostic ignored "-Wstrict-prototypes"              ' >> tmp.out
-    echo '#pragma GCC diagnostic ignored "-Wswitch-default"                 ' >> tmp.out
-    echo '#pragma GCC diagnostic ignored "-Wunused-function"                ' >> tmp.out
-    echo '#pragma GCC diagnostic ignored "-Wunused-macros"                  ' >> tmp.out
-    echo '#pragma GCC diagnostic ignored "-Wunused-parameter"               ' >> tmp.out
-    echo '#elif defined __SUNPRO_CC                                         ' >> tmp.out
-    echo '#pragma disable_warn                                              ' >> tmp.out
-    echo '#elif defined _MSC_VER                                            ' >> tmp.out
-    echo '#pragma warning(push, 1)                                          ' >> tmp.out
-    echo '#endif                                                            ' >> tmp.out
-
-    cat $f >> tmp.out
-    mv tmp.out $f
-done
-
-cd ../..
-
-exit 0
diff --git a/bin/genparser b/bin/genparser
new file mode 100755
index 0000000..619dbfa
--- /dev/null
+++ b/bin/genparser
@@ -0,0 +1,265 @@
+#! /bin/bash
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
+
+# This script runs flex/lex and bison/yacc to generate parser code for
+# the high-level library. It used to be a part of autogen.sh, but many
+# people encountered problems with installing flex and bison on their
+# system and the parser code rarely changes, so those parts of the
+# script were moved to their own file.
+#
+# NOTE CAREFULLY!
+#
+# There is NO dependency in either the autotools or CMake to regenerate
+# the parser code. If you modify H5LT analyze.l or H5LTparse.y, you
+# will need to run this script manually on a system with a suitable
+# lexer and parser generator.
+#
+# IMPORTANT OS X NOTE
+#
+# If you are using OS X, you will probably not have flex or bison
+# installed. In addition, even if you do have bison installed, the bison
+# version you have installed may also have a bug that makes it unable to
+# process our input files.
+#
+# The easiest way to fix this is to install everything via Homebrew:
+#
+#   http://brew.sh/
+#
+# After you install the base packages, install flex/bison.
+#
+#   brew install flex
+#   brew install bison
+#
+# END IMPORTANT OS X NOTE
+#
+# If you want to use a particular version of flex or bison, the paths
+# to each tool can be overridden using the following environment
+# variables:
+#
+#   HDF5_FLEX
+#   HDF5_BISON
+#
+# This script takes two potential options:
+#
+# -p
+#
+# When this is selected, the flex/bison versions are set to the paths
+# and versions used by The HDF Group to produce the released versions
+# of the library.
+#
+# NOTE: This is probably temporary. Once we update our dev machines
+# to have recent versions of the autotools this option will probably
+# be removed.
+#
+# -v
+#
+# This emits some extra information, mainly tool versions.
+
+echo
+echo "*******************************************"
+echo "* HDF5 high-level parser generator script *"
+echo "*******************************************"
+echo
+
+# Default is not verbose output
+verbose=false
+
+optspec=":hpv-"
+while getopts "$optspec" optchar; do
+    case "${optchar}" in
+    h)
+        echo "usage: $0 [OPTIONS] /path/to/hl/src/directory"
+        echo
+        echo "      -h      Print this help message."
+        echo
+        echo "      -p      Used by THG to use hard-codes flex/bison"
+        echo "              paths on THG machines. Not for non-HDF-Group"
+        echo "              users!"
+        echo
+        echo "      -v      Show more verbose output."
+        echo
+        echo "  NOTE: Each tool can be set via an environment variable."
+        echo "        These are documented inside this script."
+        echo
+        exit 0
+        ;;
+    p)
+        echo "Setting THG production mode..."
+        echo
+        production=true
+        ;;
+    v)
+        echo "Setting verbosity: high"
+        echo
+        verbose=true
+        ;;
+    *)
+        if [ "$OPTERR" != 1 ] || [ "${optspec:0:1}" = ":" ]; then
+            echo "Non-option argument: '-${OPTARG}'" >&2
+        fi
+        ;;
+    esac
+done
+
+# Get the path to the hl src directory
+shift $(($OPTIND - 1))
+path_to_hl_src=$1
+if test -z ${path_to_hl_src}; then
+    echo "*** ERROR *** - Path to hl/src not set"
+    echo "Please add the path to the hl/src directory as a parameter"
+    echo "See $0 -h for more help."
+    echo
+    exit -1
+fi
+
+if [ "$production" = true ] ; then
+
+    # Production mode
+    #
+    # Hard-code canonical HDF Group tool locations.
+
+    # If paths to tools are not specified, assume they are
+    # located in /usr/hdf/bin/AUTOTOOLS and set paths accordingly.
+    if test -z ${HDF5_BISON}; then
+        HDF5_BISON=/usr/hdf/bin/AUTOTOOLS/bison
+    fi
+    if test -z ${HDF5_FLEX}; then
+        HDF5_FLEX=/usr/hdf/bin/AUTOTOOLS/flex
+    fi
+
+else
+
+    # Not in production mode
+    #
+    # If paths to autotools are not specified, use whatever the system
+    # has installed as the default. We use 'which <tool>' to
+    # show exactly what's being used.
+    if test -z ${HDF5_BISON}; then
+        HDF5_BISON=$(which bison)
+    fi
+    if test -z ${HDF5_FLEX}; then
+        HDF5_FLEX=$(which flex)
+    fi
+
+fi # production
+
+# Make sure that these versions of the tools are in the path
+BISON_DIR=`dirname ${HDF5_BISON}`
+FLEX_DIR=`dirname ${HDF5_FLEX}`
+PATH=${FLEX_DIR}:${BISON_DIR}:$PATH
+
+# Run flex and bison
+# automatically generates hl/src/H5LTanalyze.c and hl/src/H5LTparse.c
+# Note that, as of Xcode 6.1 (2015), the default bison version on OS X
+# is old enough to have the circular dependency bug. You'll have
+# to install a later version of bison. See the OS X note at the top
+# of this script.
+echo
+echo "Generating H5LT parser code (requires yacc/bison):"
+echo "Generate hl/src/H5LTparse.c from hl/src/H5LTparse.y"
+# HDF5_BISON is set via the environment or 'which bison', above
+if test -z ${HDF5_BISON}; then
+    echo
+    echo "*************************"
+    echo " ERROR - bison not found"
+    echo "*************************"
+    echo "bison is required to generate parser code in H5LT"
+    echo
+    exit 127
+fi
+if [ "$verbose" = true ] ; then
+    ${HDF5_BISON} --version
+fi
+${HDF5_BISON} -pH5LTyy -o ${path_to_hl_src}/H5LTparse.c -d ${path_to_hl_src}/H5LTparse.y
+
+echo
+echo "Generating H5LT lexer code (requires lex/flex):"
+echo "Generate hl/src/H5LTanalyze.c from hl/src/H5LTanalyze.l"
+# HDF5_FLEX is set via the environment or 'which flex', above
+if test -z ${HDF5_FLEX}; then
+    echo
+    echo "************************"
+    echo " ERROR - flex not found"
+    echo "************************"
+    echo "flex is required to generate lexer code in H5LT"
+    echo
+    exit 127
+fi
+if [ "$verbose" = true ] ; then
+    ${HDF5_FLEX} --version
+fi
+${HDF5_FLEX} --nounistd -PH5LTyy -o ${path_to_hl_src}/H5LTanalyze.c ${path_to_hl_src}/H5LTanalyze.l
+
+# fix H5LTparse.c and H5LTlparse.h to declare H5LTyyparse return type as an
+# hid_t instead of int.  Currently the generated function H5LTyyparse is
+# generated with a return value of type int, which is a mapping to the
+# flex yyparse function.  The return value in the HL library should be
+# an hid_t.
+# I propose to not use flex to generate this function, but for now I am
+# adding a perl command to find and replace this function declaration in
+# H5LTparse.c.
+perl -0777 -pi -e 's/int yyparse/hid_t yyparse/igs' ${path_to_hl_src}/H5LTparse.c
+perl -0777 -pi -e 's/int\nyyparse/hid_t\nyyparse/igs' ${path_to_hl_src}/H5LTparse.c
+perl -0777 -pi -e 's/int H5LTyyparse/hid_t H5LTyyparse/igs' ${path_to_hl_src}/H5LTparse.c
+perl -0777 -pi -e 's/int yyparse/hid_t yyparse/igs' ${path_to_hl_src}/H5LTparse.h
+perl -0777 -pi -e 's/int\nyyparse/hid_t\nyyparse/igs' ${path_to_hl_src}/H5LTparse.h
+perl -0777 -pi -e 's/int H5LTyyparse/hid_t H5LTyyparse/igs' ${path_to_hl_src}/H5LTparse.h
+
+# Add code that disables warnings in the flex/bison-generated code.
+#
+# Note that the GCC pragmas did not exist until gcc 4.2. Earlier versions
+# will simply ignore them, but we want to avoid those warnings.
+#
+# Note also that although clang defines __GNUC__, it doesn't support every
+# warning that GCC does.
+for f in ${path_to_hl_src}/H5LTparse.c ${path_to_hl_src}/H5LTanalyze.c
+do
+    echo '#if defined (__GNUC__)                                            ' >> tmp.out
+    echo '#if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 402                    ' >> tmp.out
+    echo '#pragma GCC diagnostic ignored "-Wconversion"                     ' >> tmp.out
+    echo '#pragma GCC diagnostic ignored "-Wimplicit-function-declaration"  ' >> tmp.out
+    echo '#pragma GCC diagnostic ignored "-Wmissing-prototypes"             ' >> tmp.out
+    echo '#pragma GCC diagnostic ignored "-Wnested-externs"                 ' >> tmp.out
+    echo '#pragma GCC diagnostic ignored "-Wold-style-definition"           ' >> tmp.out
+    echo '#pragma GCC diagnostic ignored "-Wredundant-decls"                ' >> tmp.out
+    echo '#pragma GCC diagnostic ignored "-Wsign-compare"                   ' >> tmp.out
+    echo '#pragma GCC diagnostic ignored "-Wsign-conversion"                ' >> tmp.out
+    echo '#pragma GCC diagnostic ignored "-Wstrict-overflow"                ' >> tmp.out
+    echo '#pragma GCC diagnostic ignored "-Wstrict-prototypes"              ' >> tmp.out
+    echo '#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"           ' >> tmp.out
+    echo '#if !defined (__clang__)                                          ' >> tmp.out
+    echo '#pragma GCC diagnostic ignored "-Wlarger-than="                   ' >> tmp.out
+    echo '#pragma GCC diagnostic ignored "-Wsuggest-attribute=const"        ' >> tmp.out
+    echo '#pragma GCC diagnostic ignored "-Wsuggest-attribute=pure"         ' >> tmp.out
+    echo '#endif                                                            ' >> tmp.out
+    echo '#pragma GCC diagnostic ignored "-Wswitch-default"                 ' >> tmp.out
+    echo '#pragma GCC diagnostic ignored "-Wunused-function"                ' >> tmp.out
+    echo '#pragma GCC diagnostic ignored "-Wunused-macros"                  ' >> tmp.out
+    echo '#pragma GCC diagnostic ignored "-Wunused-parameter"               ' >> tmp.out
+    echo '#endif                                                            ' >> tmp.out
+    echo '#if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 600                    ' >> tmp.out
+    echo '#pragma GCC diagnostic ignored "-Wnull-dereference"               ' >> tmp.out
+    echo '#endif                                                            ' >> tmp.out
+    echo '#elif defined __SUNPRO_CC                                         ' >> tmp.out
+    echo '#pragma disable_warn                                              ' >> tmp.out
+    echo '#elif defined _MSC_VER                                            ' >> tmp.out
+    echo '#pragma warning(push, 1)                                          ' >> tmp.out
+    echo '#endif                                                            ' >> tmp.out
+
+    cat $f >> tmp.out
+    mv tmp.out $f
+done
+
+echo
+exit 0
+
diff --git a/bin/h5cc.in b/bin/h5cc.in
new file mode 100644
index 0000000..4eef3c9
--- /dev/null
+++ b/bin/h5cc.in
@@ -0,0 +1,391 @@
+#! /bin/sh
+##
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+##
+
+# This tool is adapted from the mpicc command of the MPICH Software.
+
+############################################################################
+##                                                                        ##
+## Things You May Have to Modify:                                         ##
+##                                                                        ##
+## If the following paths don't point to the place were HDF5 is installed ##
+## on your system (i.e., you received a binary distribution or moved the  ##
+## files from the originally installed directory to another directory)    ##
+## then modify them accordingly to represent the new paths.               ##
+##                                                                        ##
+############################################################################
+prefix="@prefix@"
+exec_prefix="@exec_prefix@"
+libdir="@libdir@"
+includedir="@includedir@"
+HL="@HL@"
+
+############################################################################
+##                                                                        ##
+## Things You Can Modify to Override HDF5 Library Build Components:       ##
+##                                                                        ##
+## (Advanced usage - know what you're doing - you're on your own here.)   ##
+## The four variables below can be used to insert paths and flags in      ##
+## CPPFLAGS, CFLAGS, LDFLAGS, or LIBS in the h5cc compile line:           ##
+##    $CLINKER $H5BLD_CPPFLAGS $CPPFLAGS $H5BLD_CFLAGS $CFLAGS $LDFLAGS   ##
+##    $LIBS $clibpath $link_objs $link_args $shared_link                  ##
+##                                                                        ##
+## These settings can be overridden by setting HDF5_CFLAGS,               ##
+## HDF5_CPPFLAGS, HDF5_LDFLAGS, or HDF5_LIBS in the environment.          ##
+##                                                                        ##
+############################################################################
+CFLAGSBASE=""
+CPPFLAGSBASE=""
+LDFLAGSBASE=""
+LIBSBASE=""
+
+############################################################################
+##                                                                        ##
+## You shouldn't have to modify anything below this line.                 ##
+##                                                                        ##
+############################################################################
+
+# Constants definitions
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+
+host_os="@host_os@"
+
+prog_name="`basename $0`"
+
+allargs=""
+compile_args=""
+libraries=""
+link_args=""
+link_objs=""
+clibpath=""
+
+do_link="yes"
+do_compile="no"
+dash_o="no"
+dash_c="no"
+get_output_file="no"
+
+SHOW="eval"
+CCBASE="@CC@"
+CLINKERBASE="@CC@"
+
+# CFLAGS, CPPFLAGS and LDFLAGS are reserved for use by the script user.
+# FLAGS brought from the hdf5 build are put in H5BLD_*FLAGS.
+
+# User's CPPFLAGS and CFLAGS come after their H5BLD counterparts.  User's
+# LDFLAGS come just before clibpath, user's LIBS come after $link_objs and
+# before the hdf5 libraries in $link_args, followed by any external library
+# paths and libraries from AM_LDFLAGS, LDFLAGS, AM_LIBS or LIBS carried in
+# from the hdf5 build. The order of the flags is intended to give precedence
+# to the user's flags.
+H5BLD_CFLAGS="@AM_CFLAGS@ @CFLAGS@"
+H5BLD_CPPFLAGS="@AM_CPPFLAGS@ @CPPFLAGS@"
+H5BLD_LDFLAGS="@AM_LDFLAGS@ @LDFLAGS@"
+H5BLD_LIBS="@LIBS@"
+
+CC="${HDF5_CC:-$CCBASE}"
+CLINKER="${HDF5_CLINKER:-$CLINKERBASE}"
+CFLAGS="${HDF5_CFLAGS:-$CFLAGSBASE}"
+CPPFLAGS="${HDF5_CPPFLAGS:-$CPPFLAGSBASE}"
+LDFLAGS="${HDF5_LDFLAGS:-$LDFLAGSBASE}"
+LIBS="${HDF5_LIBS:-$LIBSBASE}"
+
+# If a static library is available, the default will be to use it.  If the only
+# available library is shared, it will be used by default.  The user can
+# override either default, although choosing an unavailable library will result
+# in link errors.
+STATIC_AVAILABLE="@enable_static@"
+if test "${STATIC_AVAILABLE}" = "yes"; then
+  USE_SHARED_LIB="${HDF5_USE_SHLIB:-no}"
+else
+  USE_SHARED_LIB="${HDF5_USE_SHLIB:-yes}"
+fi
+
+
+usage() {
+  # A wonderfully informative "usage" message.
+  echo "usage: $prog_name [OPTIONS] <compile line>"
+  echo "  OPTIONS:"
+  echo "    -help        This help message."
+  echo "    -echo        Show all the shell commands executed"
+  echo "    -prefix=DIR  Prefix directory to find HDF5 lib/ and include/"
+  echo "                   subdirectories [default: $prefix]"
+  echo "    -show        Show the commands without executing them"
+  echo "    -showconfig  Show the HDF5 library configuration summary"
+  echo "    -shlib       Compile with shared HDF5 libraries [default for hdf5 built"
+  echo "                                                     without static libraries]"
+  echo "    -noshlib     Compile with static HDF5 libraries [default for hdf5 built"
+  echo "                                                     with static libraries]"
+  echo " "
+  echo "  <compile line>  - the normal compile line options for your compiler."
+  echo "                    $prog_name uses the same compiler you used to compile"
+  echo "                    HDF5. Check with your compiler's man pages for more"
+  echo "                    information on which options are needed."
+  echo " "
+  echo " You can override the compiler, linker, and whether or not to use static"
+  echo " or shared libraries to compile your program by setting the following"
+  echo " environment variables accordingly:"
+  echo " "
+  echo "   HDF5_CC                  -  use a different C compiler"
+  echo "   HDF5_CLINKER             -  use a different linker"
+  echo "   HDF5_USE_SHLIB=[yes|no]  -  use shared or static version of the HDF5 library"
+  echo "                                 [default: no except when built with only"
+  echo "                                           shared libraries]"
+  echo " "
+  echo " You can also add or change paths and flags to the compile line using"
+  echo " the following environment variables or by assigning them to their counterparts"
+  echo " in the 'Things You Can Modify to Override...'" section of $prog_name
+  echo " "
+  echo "  Variable              Current value to be replaced"
+  echo "  HDF5_CPPFLAGS         \"$CPPFLAGSBASE\""
+  echo "  HDF5_CFLAGS           \"$CFLAGSBASE\""
+  echo "  HDF5_LDFLAGS          \"$LDFLAGSBASE\""
+  echo "  HDF5_LIBS             \"$LIBSBASE\""
+  echo " "
+  echo " Note that adding library paths to HDF5_LDFLAGS where another hdf5 version"
+  echo " is located may link your program with that other hdf5 library version."
+  echo " "
+  exit $EXIT_FAILURE
+}
+
+# Show the configuration summary of the library recorded in the
+# libhdf5.settings file reside in the lib directory.
+showconfigure()
+{
+  cat ${libdir}/libhdf5.settings
+  status=$?
+}
+
+# Main
+status=$EXIT_SUCCESS
+
+if test "$#" = "0"; then
+  # No parameters specified, issue usage statement and exit.
+  usage
+fi
+
+case "$CC" in
+  gcc)
+    kind="gcc"
+    ;;
+  mpicc|mpcc|mpicc_r)
+    # Is this gcc masquarading as an MPI compiler?
+    if test "`${CC} -v 2>&1 | sed -n 2p | cut -c1-3`" = "gcc"; then
+      kind="gcc"
+    else
+      # Nope
+      kind="$host_os"
+    fi
+    ;;
+  *)
+    kind="$host_os"
+    ;;
+esac
+
+for arg in $@ ; do
+  if test "x$get_output_file" = "xyes"; then
+    link_args="$link_args $arg"
+    output_file="$arg"
+    get_output_file="no"
+    continue
+  fi
+
+  case "$arg" in
+    -c)
+      allargs="$allargs $arg"
+      compile_args="$compile_args $arg"
+
+      if test "x$do_link" = "xyes" -a -n "$output_file"; then
+        compile_args="$compile_args -o $output_file"
+      fi
+
+      do_link="no"
+      dash_c="yes"
+      ;;
+    -o)
+      allargs="$allargs $arg"
+      dash_o="yes"
+
+      if test "x$dash_c" = "xyes"; then
+        compile_args="$compile_args $arg"
+      else
+        link_args="$link_args $arg"
+        do_link="yes"
+        get_output_file="yes"
+      fi
+      ;;
+    -E|-M|-MT)
+      allargs="$allargs $arg"
+      compile_args="$compile_args $arg"
+      dash_c="yes"
+      do_link="no"
+      ;;
+    -l*)
+      libraries=" $libraries $arg "
+      allargs="$allargs $arg"
+      ;;
+    -prefix=*)
+      prefix="`expr "$arg" : '-prefix=\(.*\)'`"
+      ;;
+    -echo)
+      set -x
+      ;;
+    -show)
+      SHOW="echo"
+      ;;
+    -showconfig)
+      showconfigure
+      exit $status
+      ;;
+    -shlib)
+      USE_SHARED_LIB="yes"
+      ;;
+    -noshlib)
+      USE_SHARED_LIB="no"
+      ;;
+    -help)
+      usage
+      ;;
+    *\"*)
+      qarg="'"$arg"'"
+      allargs="$allargs $qarg"
+      ;;
+    *\'*)
+      qarg='\"'"$arg"'\"'
+      allargs="$allargs $qarg"
+      ;;
+    *)
+      allargs="$allargs $qarg"
+
+      if test -s "$arg"; then
+        ext=`expr "$arg" : '.*\(\..*\)'`
+
+        if test "x$ext" = "x.c"; then
+          do_compile="yes"
+          compile_args="$compile_args $arg"
+          fname=`basename $arg .c`
+          link_objs="$link_objs $fname.o"
+        elif test "x$ext" = "x.o"; then
+          if test "x$dash_c" = "xyes"; then
+            compile_args="$compile_args $arg"
+          else
+            do_link="yes"
+            link_objs="$link_objs $arg"
+          fi
+        elif test "x$ext" = "x.a"; then
+          # This is an archive that we're linking in
+          libraries=" $libraries $arg "
+        else
+          compile_args="$compile_args $arg"
+          link_args="$link_args $arg"
+        fi
+      else
+        compile_args="$compile_args $arg"
+        link_args="$link_args $arg"
+      fi
+      ;;
+  esac
+done
+
+if test "$dash_c" = "yes" -a "$do_compile" = no -a "$do_link" = no ; then
+    # -c was specified.  Force do_compile on.
+    do_compile=yes
+fi
+
+if test "x$do_compile" = "xyes"; then
+  if test "x$dash_c" != "xyes"; then
+    compile_args="-c $compile_args"
+  fi
+
+  $SHOW $CC -I$includedir $H5BLD_CPPFLAGS $CPPFLAGS $H5BLD_CFLAGS $CFLAGS $compile_args
+  status=$?
+
+  if test "$status" != "0"; then
+    exit $status
+  fi
+fi
+
+if test "x$do_link" = "xyes"; then
+  shared_link=""
+# conditionally link with the hl library
+  if test "X$HL" = "Xhl"; then
+   libraries=" $libraries -lhdf5_hl -lhdf5 "
+  else
+   libraries=" $libraries  -lhdf5 "
+  fi
+  link_args="$link_args -L${libdir}"
+
+  case "$kind" in
+    gcc|linux*)
+      # MacOS X doesn't support the "-Wl,-rpath -Wl," style of linker flags.
+      # It appears to want none of them specified.
+      case "$host_os" in
+        darwin*)          flag="" ;;
+        *)                flag="-Wl,-rpath -Wl," ;;
+      esac
+      ;;
+    hpux*)                flag="-Wl,+b -Wl," ;;
+    freebsd*|solaris*)    flag="-R" ;;
+    rs6000*|aix*)         flag="-L" ;;
+    sgi)                  flag="-rpath " ;;
+    *)                    flag="" ;;
+  esac
+
+  if test -n "$flag"; then
+    shared_link="${flag}${libdir}"
+  fi
+
+  if test "x$USE_SHARED_LIB" != "xyes"; then
+    # The "-lhdf5" & "-lhdf5_hl" flags are in here already...This is a static
+    # compile though, so change it to the static version (.a) of the library.
+    new_libraries=""
+    for lib in $libraries; do
+      case "$lib" in
+        -lhdf5)
+          new_libraries="$new_libraries ${libdir}/libhdf5.a"
+          ;;
+        -lhdf5_hl)
+          new_libraries="$new_libraries ${libdir}/libhdf5_hl.a"
+          ;;
+        *)
+          new_libraries="$new_libraries $lib"
+          ;;
+      esac
+    done
+    libraries="$new_libraries"
+  fi
+
+  for lib in $libraries; do
+    if echo $link_args | grep " $lib " > /dev/null ||
+       echo $link_args | grep " $lib$" > /dev/null; then
+      :
+    else
+      link_args="$link_args $lib "
+    fi
+  done
+
+  # The LIBS are just a bunch of -l* libraries necessary for the HDF5
+  # module. It's okay if they're included twice in the compile line.
+  link_args="$link_args $H5BLD_LDFLAGS $H5BLD_LIBS"
+
+  # User's CPPFLAGS and CFLAGS come after their H5BLD counterparts.  User's
+  # LDFLAGS come just before clibpath, user's LIBS come after $link_objs and
+  # before the hdf5 libraries in $link_args, followed by any external library
+  # paths and libraries from AM_LDFLAGS, LDFLAGS, AM_LIBS or LIBS carried in
+  # from the hdf5 build. The order of the flags is intended to give precedence
+  # to the user's flags.
+  $SHOW $CLINKER $H5BLD_CPPFLAGS $CPPFLAGS $H5BLD_CFLAGS $CFLAGS $LDFLAGS $clibpath $link_objs $LIBS $link_args $shared_link
+  status=$?
+fi
+
+exit $status
diff --git a/bin/h5redeploy.in b/bin/h5redeploy.in
new file mode 100644
index 0000000..d73cca7
--- /dev/null
+++ b/bin/h5redeploy.in
@@ -0,0 +1,215 @@
+#! /bin/sh
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
+
+## Update HDF5 compiler tools after the HDF5 software has been installed  ##
+## in a new location.							  ##
+## For help page, use "h5redeploy -help"				  ##
+##									  ##
+
+# Constants definitions
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+
+# Function definitions
+
+# show help page
+usage() {
+  # A wonderfully informative "usage" message.
+  echo "usage: $prog_name [OPTIONS]"
+  echo "  OPTIONS:"
+  echo "    -help|help        This help message"
+  echo "    -echo             Show all the shell commands executed"
+  echo "    -force            No prompt, just do it"
+  echo "    -prefix=DIR       New directory to find HDF5 lib/ and include/"
+  echo "                        subdirectories [default: current directory]"
+  echo "    -exec-prefix=DIR  New directory to find HDF5 lib/"
+  echo "                        subdirectory [default: <prefix>]"
+  echo "    -libdir=DIR       New directory for the HDF5 lib directory"
+  echo "                        [default: <exec-prefix>/lib]"
+  echo "    -includedir=DIR   New directory for the HDF5 header files"
+  echo "                        [default: <prefix>/include]"
+  echo "    -tool=TOOL        Tool to update. TOOL must be in the current"
+  echo "                        directory and writable. [default: $h5tools]"
+  echo "    -show             Show the commands without executing them"
+  echo " "
+  exit $EXIT_FAILURE
+}
+
+# display variable values
+dump_vars(){
+    echo "====Showing all variable values====="
+    echo prefix=$prefix
+    echo h5tools=$h5tools
+    echo "====End Showing====="
+}
+
+# show actions to be taken
+show_action()
+{
+    echo "Update the following tools because they are now installed at a new directory"
+    for t in $foundtools; do
+	echo "${t}:"
+	echo "   current setting=`sed -e '/^prefix=/s/prefix=//p' -e d $t`"
+	echo "   new     setting="\""$prefix"\"
+    done
+}
+
+
+# Report Error message
+ERROR()
+{
+    echo "***ERROR***"
+    echo "$1"
+}
+
+# Main
+#
+############################################################################
+## Installation directories:						  ##
+## prefix	architecture-independent files.				  ##
+## exec_prefix	architecture-dependent files, default is <prefix>.	  ##
+## libdir	libraries, default is <exec_prefix>/lib.		  ##
+## includedir	header files, default is <prefix/include>.		  ##
+## Not used here:							  ##
+## bindir	executables, <exec_prefix/bin>.				  ##
+############################################################################
+# Initialization
+h5tools="h5cc h5pcc h5fc h5pfc h5c++"	# possible hdf5 tools
+foundtools=		# tools found and will be modified
+fmode=			# force mode, default is off
+prefix=
+exec_prefix=
+libdir=
+includedir=
+
+# Parse options
+for arg in $@ ; do
+  case "$arg" in
+    -prefix=*)
+      prefix="`echo $arg | cut -f2 -d=`"
+      ;;
+    -exec-prefix=*)
+      exec_prefix="`echo $arg | cut -f2 -d=`"
+      ;;
+    -libdir=*)
+      libdir="`echo $arg | cut -f2 -d=`"
+      ;;
+    -includedir=*)
+      includedir="`echo $arg | cut -f2 -d=`"
+      ;;
+    -echo)
+      set -x
+      ;;
+    -show)
+      SHOW="echo"
+      ;;
+    -tool=*)
+      h5tools="`echo $arg | cut -f2 -d=`"
+      ;;
+    -help|help)
+      usage
+      ;;
+    -force)
+      fmode=yes
+      ;;
+    *)
+      ERROR "Unknown Option($arg)"
+      usage
+      exit $EXIT_FAILURE
+      ;;
+  esac
+done
+
+# Set to default value, one above where i am, if not given by user
+if [ -z "$prefix" ]; then
+    prefix=`(cd ..;pwd)`
+fi
+if [ -z "$exec_prefix" ]; then
+    exec_prefix='${prefix}'		# use single quotes to prevent expansion of $
+fi
+if [ -z "$libdir" ]; then
+    libdir='${exec_prefix}'/lib	# use single quotes to prevent expansion of $
+fi
+if [ -z "$includedir" ]; then
+    includedir='${prefix}'/include # use single quotes to prevent expansion of $
+fi
+
+for x in $h5tools; do
+    if [ -f $x ]; then
+	foundtools="$foundtools $x"
+	if [ ! -w $x ]; then
+	    ERROR "h5tool($x) is not writable"
+	    exit $EXIT_FAILURE
+	fi
+    fi
+done
+
+if [ -z "$foundtools" ]; then
+    ERROR "found no tools to modify"
+    exit $EXIT_FAILURE
+fi
+
+# Show actions to be taken and get consent
+show_action
+# Ask confirmation unless fmode is on
+if [ x-$fmode = x- ]; then
+    echo "Continue? (yes/no)"
+    read ansx
+    ans=`echo $ansx | tr "[A-Z]" "[a-z]"`
+    if [ x-$ans != x-yes ]; then
+	echo ABORT.  No tools changed.
+	exit $EXIT_FAILURE
+    fi
+fi
+
+
+# Create the update commands
+CMDFILE=/tmp/h5redeploy.$$
+touch $CMDFILE
+chmod 0600 $CMDFILE
+echo "/^prefix=/c"                    >> $CMDFILE
+echo prefix=\""$prefix"\"             >> $CMDFILE
+echo .                                >> $CMDFILE
+echo "/^exec_prefix=/c"               >> $CMDFILE
+echo exec_prefix=\""$exec_prefix"\"   >> $CMDFILE
+echo .                                >> $CMDFILE
+echo "/^libdir=/c"                    >> $CMDFILE
+echo libdir=\""$libdir"\"             >> $CMDFILE
+echo .                                >> $CMDFILE
+echo "/^includedir=/c"                >> $CMDFILE
+echo includedir=\""$includedir"\"     >> $CMDFILE
+echo .                                >> $CMDFILE
+(echo w; echo q)                      >> $CMDFILE
+
+
+# Update them
+if [ "$SHOW" = "echo" ]; then
+    echo "===Update commands are:===="
+    cat $CMDFILE
+    echo "===End Update commands====="
+fi
+
+for t in $foundtools; do
+    echo Update $t ...
+    COMMAND="ed - $t"
+    if [ "$SHOW" = "echo" ]; then
+	echo $COMMAND
+    else
+	$COMMAND < $CMDFILE
+    fi
+done
+
+
+# Cleanup
+rm -f $CMDFILE
+exit $EXIT_SUCCESS
diff --git a/bin/h5vers b/bin/h5vers
index cb4b9e0..6716794 100755
--- a/bin/h5vers
+++ b/bin/h5vers
@@ -7,19 +7,16 @@ require 5.003;
 use strict;
 
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 #
-# Robb Matzke <matzke@llnl.gov>
+# Robb Matzke
 # 17 July 1998
 
 ### Purpose
@@ -68,7 +65,7 @@ use strict;
 # ./H5public.h or ./src/H5public.h.
 #
 # If the version number is changed (either `-s' or `-i' was used on
-# the command line) then the first line of the README.txt and RELEASE.txt files
+# the command line) then the version line of the README.md and RELEASE.txt files
 # one directory above the H5public.h file is also modified so it looks
 # something like: This is hdf5-1.2.3-pre1 currently under development.
 # The AC_INIT macro in configure.ac will also change in this case to be
@@ -127,7 +124,7 @@ EOF
   exit 1;
 }
 
-# Parse arguments
+
 my ($verbose, $set, $inc, $file, $rc);
 my (@files) = ("H5public.h", "src/H5public.h", "../src/H5public.h");
 while ($_ = shift) {
@@ -158,11 +155,12 @@ while ($_ = shift) {
 }
 die "mutually exclusive options given\n" if $set && $inc;
 
-# Determine file to use as H5public.h, README.txt,
+# Determine file to use as H5public.h, README.md,
 # release_docs/RELEASE.txt, configure.ac, windows/src/H5pubconf.h
-# and config/lt_vers.am. 
-# The README.txt, release_docs/RELEASE.txt, configure.ac, 
-# windows/src/H5pubconf.h, and config/lt_vers.am 
+# config/lt_vers.am and config/cmake/scripts/HDF5config.cmake. 
+# The README.md, release_docs/RELEASE.txt, configure.ac, 
+# windows/src/H5pubconf.h, config/lt_vers.am and
+# config/cmake/scripts/HDF5config.cmake
 # files are always in the directory above H5public.h
 unless ($file) {
   for (@files) {
@@ -175,9 +173,13 @@ die "unable to read file: $file\n" unless -r $file;
 my $LT_VERS = $file;
 $LT_VERS =~ s/[^\/]*$/..\/config\/lt_vers.am/;
 die "unable to read file: $LT_VERS\n" unless -r $file;
-# README.txt
+# config/cmake/scripts/HDF5config.cmake
+my $HDF5CONFIGCMAKE = $file;
+$HDF5CONFIGCMAKE =~ s/[^\/]*$/..\/config\/cmake\/scripts\/HDF5config.cmake/;
+die "unable to read file: $HDF5CONFIGCMAKE\n" unless -r $file;
+# README.md
 my $README = $file;
-$README =~ s/[^\/]*$/..\/README.txt/;
+$README =~ s/[^\/]*$/..\/README.md/;
 die "unable to read file: $README\n" unless -r $file;
 # release_docs/RELEASE.txt
 my $RELEASE = $file;
@@ -187,6 +189,19 @@ die "unable to read file: $RELEASE\n" unless -r $file;
 my $CONFIGURE = $file;
 $CONFIGURE =~ s/[^\/]*$/..\/configure.ac/;
 die "unable to read file: $CONFIGURE\n" unless -r $file;
+# cpp_doc_config
+my $CPP_DOC_CONFIG = $file;
+$CPP_DOC_CONFIG =~ s/[^\/]*$/..\/c++\/src\/cpp_doc_config/;
+die "unable to read file: $CPP_DOC_CONFIG\n"  unless -r $file;
+my $H5_JAVA = $file;
+$H5_JAVA =~ s/[^\/]*$/..\/java\/src\/hdf\/hdf5lib\/H5.java/;
+die "unable to read file: $H5_JAVA\n" unless -r $file;
+my $TESTH5_JAVA = $file;
+$TESTH5_JAVA =~ s/[^\/]*$/..\/java\/test\/TestH5.java/;
+die "unable to read file: $TESTH5_JAVA\n" unless -r $file;
+my $REPACK_LAYOUT_PLUGIN_VERSION = $file;
+$REPACK_LAYOUT_PLUGIN_VERSION =~ s/[^\/]*$/..\/tools\/test\/h5repack\/testfiles\/h5repack_layout.h5-plugin_version_test.ddl/;
+die "unable to read file: $REPACK_LAYOUT_PLUGIN_VERSION\n" unless -r $file;
 
 # Get the current version number.
 open FILE, $file or die "unable to open $file: $!\n";
@@ -197,7 +212,7 @@ my (@curver) = getvers $contents;
 # Determine the new version number.
 my @newver; #new version
 if ($set) {
-  if ($set =~ /(\d+)\.(\d+)\.(\d+)(-([a-zA-Z]\w*))?/) {
+  if ($set =~ /(\d+)\.(\d+)\.(\d+)(-([\da-zA-Z]\w*))?/) {
     @newver = ($1, $2, $3, $5);
   } elsif ($set =~ /(\d+)\D+(\d+)\D+(\d+)(\s*\(([a-zA-Z]\w*)\))?\D*$/) {
     @newver = ($1, $2, $3, $5);
@@ -234,7 +249,9 @@ if ($set) {
   $README = "";
   $RELEASE = "";
   $CONFIGURE = "";
-  $LT_VERS = "";
+  $CPP_DOC_CONFIG = "";
+  $LT_VERS = "";       
+  $HDF5CONFIGCMAKE = "";
   @newver = @curver;
 }
 
@@ -272,16 +289,20 @@ if ($LT_VERS && $version_increased) {
 
   local($_) = $contentsy;
 
-  my ($lt_revision) = /^LT_VERS_REVISION\s*=\s*(\d+)/m;
-  my $new_lt_revision = $lt_revision+1;
-  ($contentsy) =~ s/^(LT_VERS_REVISION\s*=\s*)\d+/$1$new_lt_revision/m;
-
-  open FILE, ">$LT_VERS" or die "$LT_VERS: $!\n";
-  print FILE $contentsy;
-  close FILE;
+# As of the HDF5 v1.8.16 release, h5vers should not increment
+# the LT_VERS numbers, so the next 6 lines are commented out.
+# A future version may copy the numbers to H5public.h, so this
+# section is retained for future reference.
+#  my ($lt_revision) = /^LT_VERS_REVISION\s*=\s*(\d+)/m;
+#  my $new_lt_revision = $lt_revision+1;
+#  ($contentsy) =~ s/^(LT_VERS_REVISION\s*=\s*)\d+/$1$new_lt_revision/m;
+
+#  open FILE, ">$LT_VERS" or die "$LT_VERS: $!\n";
+#  print FILE $contentsy;
+#  close FILE;
 }
 
-# Update the README.txt file
+# Update the README.md file
 if ($README) {
   open FILE, $README or die "$README: $!\n";
   my @contents = <FILE>;
@@ -309,6 +330,115 @@ if ($RELEASE) {
   close FILE;
 }
 
+# Update the c++/src/cpp_doc_config file
+if ($CPP_DOC_CONFIG) {
+  my $data = read_file($CPP_DOC_CONFIG);
+  my $sub_rel_ver_str = (
+     $newver[3] eq "" 
+     ? sprintf("%s", "") 
+     : sprintf("%s", "-".$newver[3].", currently under development")
+     );
+  my $version_string = sprintf("\"%d.%d.%d%s%s\"",
+                               @newver[0,1,2],
+                               $sub_rel_ver_str);
+  $data =~ s/PROJECT_NUMBER\s*=.*/PROJECT_NUMBER         = $version_string/;
+
+  write_file($CPP_DOC_CONFIG, $data);  
+}
+
+# Update the config/cmake/scripts/HDF5config.cmake file
+if ($HDF5CONFIGCMAKE) {
+  my $data = read_file($HDF5CONFIGCMAKE);
+#  my $sub_rel_ver_str = "";
+  my $sub_rel_ver_str = (
+     $newver[3] eq "" 
+     ? sprintf("\"%s\"", "") 
+     : sprintf("\"%s\"", "-".$newver[3])
+     );
+  my $version_string = sprintf("\"%d.%d.%d\"", @newver[0,1,2]);
+
+  $data =~ s/set \(CTEST_SOURCE_VERSION .*\)/set \(CTEST_SOURCE_VERSION $version_string\)/;
+  $data =~ s/set \(CTEST_SOURCE_VERSEXT .*\)/set \(CTEST_SOURCE_VERSEXT $sub_rel_ver_str\)/;
+
+  write_file($HDF5CONFIGCMAKE, $data);  
+}
+
+# Update the java/src/hdf/hdf5lib/H5.java file
+if ($H5_JAVA) {
+  my $data = read_file($H5_JAVA);
+#  my $sub_rel_ver_str = "";
+  my $sub_rel_ver_str = (
+     $newver[3] eq ""
+     ? sprintf("\"%s\"", "")
+     : sprintf("\"%s\"", "-".$newver[3].", currently under development")
+     );
+  my $version_string1 = sprintf("%d.%d.%d", @newver[0,1,2]);
+  my $version_string2 = sprintf("%d, %d, %d", @newver[0,1,2]);
+
+  $data =~ s/\@version HDF5 .* <BR>/\@version HDF5 $version_string1 <BR>/;
+  $data =~ s/    public final static int LIB_VERSION\[\] = \{\d*,.\d*,.\d*\};/    public final static int LIB_VERSION[] = \{$version_string2\};/;
+
+  write_file($H5_JAVA, $data);
+}
+
+# Update the java/test/TestH5.java file
+if ($TESTH5_JAVA) {
+  my $data = read_file($TESTH5_JAVA);
+#  my $sub_rel_ver_str = "";
+  my $sub_rel_ver_str = (
+     $newver[3] eq ""
+     ? sprintf("\"%s\"", "")
+     : sprintf("\"%s\"", "-".$newver[3].", currently under development")
+     );
+  my $version_string1 = sprintf("%d, %d, %d", @newver[0,1,2]);
+  my $version_string2 = sprintf("int majnum = %d, minnum = %d, relnum = %d", @newver[0,1,2]);
+
+  $data =~ s/        int libversion\[\] = \{.*\};/        int libversion\[\] = \{$version_string1\};/;
+  $data =~ s/        int majnum = \d*, minnum = \d*, relnum = \d*;/        $version_string2;/;
+
+  write_file($TESTH5_JAVA, $data);
+}
+
+# Update the tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl file
+if ($REPACK_LAYOUT_PLUGIN_VERSION) {
+  my $data = read_file($REPACK_LAYOUT_PLUGIN_VERSION);
+  my $version_string = sprintf("%d %d %d", @newver[0,1,2]);
+
+  $data =~ s/            PARAMS \{ 9 \d* \d* \d* \}/            PARAMS \{ 9 $version_string \}/g;
+
+  write_file($REPACK_LAYOUT_PLUGIN_VERSION, $data);
+}
+
+# helper function to read the file for updating c++/src/cpp_doc_config,
+# config/cmake/scripts/HDF5Config.cmake, and java files.
+# The version string in that file is not at the top, so the string replacement
+# is not for the first line, and reading/writing the entire file as one string
+# facilitates the substring replacement.
+#Presumably these will also work for resetting the version in HDF5config.cmake.
+sub read_file {
+   my ($filename) = @_;
+
+    open my $in, $filename or die "Could not open '$filename' for reading $!";
+    local $/ = undef;
+    my $all = <$in>;
+    close $in;
+
+    return $all;
+}
+
+# helper function to write the file for updating c++/src/cpp_doc_config, 
+# config/cmake/scripts/HDF5config.cmake and java files.
+sub write_file {
+    my ($filename, $content) = @_;
+
+    open my $out, ">$filename" or die "Could not open '$filename' for writing $!";;
+    print $out $content;
+    close $out;
+
+    return;
+}
+
+
 sub gen_configure {
   my ($name, $conf) = @_;
 
@@ -332,12 +462,12 @@ sub gen_configure {
   $conf =~ /^(.*?)\/?configure.ac$/;
 
   if ($1) {
-    $rc = system("cd $1 && bin/reconfigure >/dev/null 2>/dev/null && rm -rf autom4te.cache");
+    $rc = system("cd $1 && ./autogen.sh >/dev/null 2>/dev/null && rm -rf autom4te.cache");
   } else {
-    $rc = system("bin/reconfigure >/dev/null 2>/dev/null && rm -rf autom4te.cache");
+    $rc = system("./autogen.sh >/dev/null 2>/dev/null && rm -rf autom4te.cache");
   }
   if ($rc) {
-    printf("bin/reconfigure failed with exit code %d. Aborted.\n", $rc);
+    printf("./autogen.sh failed with exit code %d. Aborted.\n", $rc);
     exit 1;
   }
 }
diff --git a/bin/install-sh b/bin/install-sh
deleted file mode 100755
index 6781b98..0000000
--- a/bin/install-sh
+++ /dev/null
@@ -1,520 +0,0 @@
-#!/bin/sh
-# install - install a program, script, or datafile
-
-scriptversion=2009-04-28.21; # UTC
-
-# This originates from X11R5 (mit/util/scripts/install.sh), which was
-# later released in X11R6 (xc/config/util/install.sh) with the
-# following copyright and license.
-#
-# Copyright (C) 1994 X Consortium
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the X Consortium shall not
-# be used in advertising or otherwise to promote the sale, use or other deal-
-# ings in this Software without prior written authorization from the X Consor-
-# tium.
-#
-#
-# FSF changes to this file are in the public domain.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.
-
-nl='
-'
-IFS=" ""	$nl"
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit=${DOITPROG-}
-if test -z "$doit"; then
-  doit_exec=exec
-else
-  doit_exec=$doit
-fi
-
-# Put in absolute file names if you don't have them in your path;
-# or use environment vars.
-
-chgrpprog=${CHGRPPROG-chgrp}
-chmodprog=${CHMODPROG-chmod}
-chownprog=${CHOWNPROG-chown}
-cmpprog=${CMPPROG-cmp}
-cpprog=${CPPROG-cp}
-mkdirprog=${MKDIRPROG-mkdir}
-mvprog=${MVPROG-mv}
-rmprog=${RMPROG-rm}
-stripprog=${STRIPPROG-strip}
-
-posix_glob='?'
-initialize_posix_glob='
-  test "$posix_glob" != "?" || {
-    if (set -f) 2>/dev/null; then
-      posix_glob=
-    else
-      posix_glob=:
-    fi
-  }
-'
-
-posix_mkdir=
-
-# Desired mode of installed file.
-mode=0755
-
-chgrpcmd=
-chmodcmd=$chmodprog
-chowncmd=
-mvcmd=$mvprog
-rmcmd="$rmprog -f"
-stripcmd=
-
-src=
-dst=
-dir_arg=
-dst_arg=
-
-copy_on_change=false
-no_target_directory=
-
-usage="\
-Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-   or: $0 [OPTION]... SRCFILES... DIRECTORY
-   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
-   or: $0 [OPTION]... -d DIRECTORIES...
-
-In the 1st form, copy SRCFILE to DSTFILE.
-In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-In the 4th, create DIRECTORIES.
-
-Options:
-     --help     display this help and exit.
-     --version  display version info and exit.
-
-  -c            (ignored)
-  -C            install only if different (preserve the last data modification time)
-  -d            create directories instead of installing files.
-  -g GROUP      $chgrpprog installed files to GROUP.
-  -m MODE       $chmodprog installed files to MODE.
-  -o USER       $chownprog installed files to USER.
-  -s            $stripprog installed files.
-  -t DIRECTORY  install into DIRECTORY.
-  -T            report an error if DSTFILE is a directory.
-
-Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
-  RMPROG STRIPPROG
-"
-
-while test $# -ne 0; do
-  case $1 in
-    -c) ;;
-
-    -C) copy_on_change=true;;
-
-    -d) dir_arg=true;;
-
-    -g) chgrpcmd="$chgrpprog $2"
-	shift;;
-
-    --help) echo "$usage"; exit $?;;
-
-    -m) mode=$2
-	case $mode in
-	  *' '* | *'	'* | *'
-'*	  | *'*'* | *'?'* | *'['*)
-	    echo "$0: invalid mode: $mode" >&2
-	    exit 1;;
-	esac
-	shift;;
-
-    -o) chowncmd="$chownprog $2"
-	shift;;
-
-    -s) stripcmd=$stripprog;;
-
-    -t) dst_arg=$2
-	shift;;
-
-    -T) no_target_directory=true;;
-
-    --version) echo "$0 $scriptversion"; exit $?;;
-
-    --)	shift
-	break;;
-
-    -*)	echo "$0: invalid option: $1" >&2
-	exit 1;;
-
-    *)  break;;
-  esac
-  shift
-done
-
-if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
-  # When -d is used, all remaining arguments are directories to create.
-  # When -t is used, the destination is already specified.
-  # Otherwise, the last argument is the destination.  Remove it from $@.
-  for arg
-  do
-    if test -n "$dst_arg"; then
-      # $@ is not empty: it contains at least $arg.
-      set fnord "$@" "$dst_arg"
-      shift # fnord
-    fi
-    shift # arg
-    dst_arg=$arg
-  done
-fi
-
-if test $# -eq 0; then
-  if test -z "$dir_arg"; then
-    echo "$0: no input file specified." >&2
-    exit 1
-  fi
-  # It's OK to call `install-sh -d' without argument.
-  # This can happen when creating conditional directories.
-  exit 0
-fi
-
-if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
-
-  # Set umask so as not to create temps with too-generous modes.
-  # However, 'strip' requires both read and write access to temps.
-  case $mode in
-    # Optimize common cases.
-    *644) cp_umask=133;;
-    *755) cp_umask=22;;
-
-    *[0-7])
-      if test -z "$stripcmd"; then
-	u_plus_rw=
-      else
-	u_plus_rw='% 200'
-      fi
-      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
-    *)
-      if test -z "$stripcmd"; then
-	u_plus_rw=
-      else
-	u_plus_rw=,u+rw
-      fi
-      cp_umask=$mode$u_plus_rw;;
-  esac
-fi
-
-for src
-do
-  # Protect names starting with `-'.
-  case $src in
-    -*) src=./$src;;
-  esac
-
-  if test -n "$dir_arg"; then
-    dst=$src
-    dstdir=$dst
-    test -d "$dstdir"
-    dstdir_status=$?
-  else
-
-    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
-    # might cause directories to be created, which would be especially bad
-    # if $src (and thus $dsttmp) contains '*'.
-    if test ! -f "$src" && test ! -d "$src"; then
-      echo "$0: $src does not exist." >&2
-      exit 1
-    fi
-
-    if test -z "$dst_arg"; then
-      echo "$0: no destination specified." >&2
-      exit 1
-    fi
-
-    dst=$dst_arg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst;;
-    esac
-
-    # If destination is a directory, append the input filename; won't work
-    # if double slashes aren't ignored.
-    if test -d "$dst"; then
-      if test -n "$no_target_directory"; then
-	echo "$0: $dst_arg: Is a directory" >&2
-	exit 1
-      fi
-      dstdir=$dst
-      dst=$dstdir/`basename "$src"`
-      dstdir_status=0
-    else
-      # Prefer dirname, but fall back on a substitute if dirname fails.
-      dstdir=`
-	(dirname "$dst") 2>/dev/null ||
-	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	     X"$dst" : 'X\(//\)[^/]' \| \
-	     X"$dst" : 'X\(//\)$' \| \
-	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
-	echo X"$dst" |
-	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)[^/].*/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\).*/{
-		   s//\1/
-		   q
-		 }
-		 s/.*/./; q'
-      `
-
-      test -d "$dstdir"
-      dstdir_status=$?
-    fi
-  fi
-
-  obsolete_mkdir_used=false
-
-  if test $dstdir_status != 0; then
-    case $posix_mkdir in
-      '')
-	# Create intermediate dirs using mode 755 as modified by the umask.
-	# This is like FreeBSD 'install' as of 1997-10-28.
-	umask=`umask`
-	case $stripcmd.$umask in
-	  # Optimize common cases.
-	  *[2367][2367]) mkdir_umask=$umask;;
-	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-
-	  *[0-7])
-	    mkdir_umask=`expr $umask + 22 \
-	      - $umask % 100 % 40 + $umask % 20 \
-	      - $umask % 10 % 4 + $umask % 2
-	    `;;
-	  *) mkdir_umask=$umask,go-w;;
-	esac
-
-	# With -d, create the new directory with the user-specified mode.
-	# Otherwise, rely on $mkdir_umask.
-	if test -n "$dir_arg"; then
-	  mkdir_mode=-m$mode
-	else
-	  mkdir_mode=
-	fi
-
-	posix_mkdir=false
-	case $umask in
-	  *[123567][0-7][0-7])
-	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
-	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-	    ;;
-	  *)
-	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-
-	    if (umask $mkdir_umask &&
-		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-	    then
-	      if test -z "$dir_arg" || {
-		   # Check for POSIX incompatibilities with -m.
-		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writeable bit of parent directory when it shouldn't.
-		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
-		   case $ls_ld_tmpdir in
-		     d????-?r-*) different_mode=700;;
-		     d????-?--*) different_mode=755;;
-		     *) false;;
-		   esac &&
-		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-		   }
-		 }
-	      then posix_mkdir=:
-	      fi
-	      rmdir "$tmpdir/d" "$tmpdir"
-	    else
-	      # Remove any dirs left behind by ancient mkdir implementations.
-	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-	    fi
-	    trap '' 0;;
-	esac;;
-    esac
-
-    if
-      $posix_mkdir && (
-	umask $mkdir_umask &&
-	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
-      )
-    then :
-    else
-
-      # The umask is ridiculous, or mkdir does not conform to POSIX,
-      # or it failed possibly due to a race condition.  Create the
-      # directory the slow way, step by step, checking for races as we go.
-
-      case $dstdir in
-	/*) prefix='/';;
-	-*) prefix='./';;
-	*)  prefix='';;
-      esac
-
-      eval "$initialize_posix_glob"
-
-      oIFS=$IFS
-      IFS=/
-      $posix_glob set -f
-      set fnord $dstdir
-      shift
-      $posix_glob set +f
-      IFS=$oIFS
-
-      prefixes=
-
-      for d
-      do
-	test -z "$d" && continue
-
-	prefix=$prefix$d
-	if test -d "$prefix"; then
-	  prefixes=
-	else
-	  if $posix_mkdir; then
-	    (umask=$mkdir_umask &&
-	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-	    # Don't fail if two instances are running concurrently.
-	    test -d "$prefix" || exit 1
-	  else
-	    case $prefix in
-	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-	      *) qprefix=$prefix;;
-	    esac
-	    prefixes="$prefixes '$qprefix'"
-	  fi
-	fi
-	prefix=$prefix/
-      done
-
-      if test -n "$prefixes"; then
-	# Don't fail if two instances are running concurrently.
-	(umask $mkdir_umask &&
-	 eval "\$doit_exec \$mkdirprog $prefixes") ||
-	  test -d "$dstdir" || exit 1
-	obsolete_mkdir_used=true
-      fi
-    fi
-  fi
-
-  if test -n "$dir_arg"; then
-    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
-    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
-      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
-  else
-
-    # Make a couple of temp file names in the proper directory.
-    dsttmp=$dstdir/_inst.$$_
-    rmtmp=$dstdir/_rm.$$_
-
-    # Trap to clean up those temp files at exit.
-    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-
-    # Copy the file name to the temp name.
-    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
-
-    # and set any options; do chmod last to preserve setuid bits.
-    #
-    # If any of these fail, we abort the whole thing.  If we want to
-    # ignore errors from any of these, just make sure not to ignore
-    # errors from the above "$doit $cpprog $src $dsttmp" command.
-    #
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
-    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
-    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-
-    # If -C, don't bother to copy if it wouldn't change the file.
-    if $copy_on_change &&
-       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
-       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
-
-       eval "$initialize_posix_glob" &&
-       $posix_glob set -f &&
-       set X $old && old=:$2:$4:$5:$6 &&
-       set X $new && new=:$2:$4:$5:$6 &&
-       $posix_glob set +f &&
-
-       test "$old" = "$new" &&
-       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
-    then
-      rm -f "$dsttmp"
-    else
-      # Rename the file to the real destination.
-      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
-
-      # The rename failed, perhaps because mv can't rename something else
-      # to itself, or perhaps because mv is so ancient that it does not
-      # support -f.
-      {
-	# Now remove or move aside any old file at destination location.
-	# We try this two ways since rm can't unlink itself on some
-	# systems and the destination file might be busy for other
-	# reasons.  In this case, the final cleanup might fail but the new
-	# file should still install successfully.
-	{
-	  test ! -f "$dst" ||
-	  $doit $rmcmd -f "$dst" 2>/dev/null ||
-	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-	  } ||
-	  { echo "$0: cannot unlink or rename $dst" >&2
-	    (exit 1); exit 1
-	  }
-	} &&
-
-	# Now rename the file to the real destination.
-	$doit $mvcmd "$dsttmp" "$dst"
-      }
-    fi || exit 1
-
-    trap '' 0
-  fi
-done
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/bin/iostats b/bin/iostats
index f57c0d0..d8a8933 100755
--- a/bin/iostats
+++ b/bin/iostats
@@ -1,17 +1,14 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 #
 
 # Usage: pipe the output of Linux's `strace' program into the stdin of
diff --git a/bin/locate_sw b/bin/locate_sw
deleted file mode 100755
index c9a7924..0000000
--- a/bin/locate_sw
+++ /dev/null
@@ -1,240 +0,0 @@
-#!/bin/sh
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-#
-
-# Try to locate the software as named in argument.
-# This is a sequential search of all possible locations of the software.
-# Usage: locate_sw <SW-Name>
-# It prints a string showing the paths leading to the include, lib and bin
-# directory of the software, separated by colons.  E.g., if the software is
-# located in /usr/sdt/*, it prints
-# /usr/sdt/include:/usr/sdt/lib:/usr/sdt/bin
-# Any component that is not found will be returned as an empty string. E.g.,
-# if somehow the header files of the software are not found, it prints
-# :/usr/sdt/lib;/usr/sdt/bin
-
-# Function definitions
-USAGE()
-{
-    echo "Usage: locate_sw <SW-Name>"
-    echo "    where <SW-Name> can be hdf4, hdf5, zlib"
-    echo "    It prints the paths leading the header files (include),"
-    echo "    library (lib), and tools (bin).   E.g.,"
-    echo "    /usr/sdt/include:/usr/sdt/lib:/usr/sdt/bin"
-    echo "    Any component that is not found will be returned as an empty string. E.g.,"
-    echo "    if somehow the header files of the software are not found, it prints"
-    echo "    :/usr/sdt/lib;/usr/sdt/bin"
-    echo "Exit code: 0 if software located; otherwise non-zero"
-}
-
-# locate hdf4 software
-locate_hdf4()
-{
-# this default is the best guess of locating hdf4 software
-swpaths_defaults="/usr/ncsa /usr/sdt /usr/local"
-swpaths=
-
-case "$OSname" in
-    SunOS)
-        case "$OSrelease" in
-            5.7)
-               swpaths="/afs/ncsa/packages/hdf/SunOS_5.7"
-               ;;
-	    *)
-            # use default
-	       ;;
-        esac
-        ;;
-    HP-UX)
-        case "$OSrelease" in
-	   B.11.00)
-	        swpaths="/afs/ncsa/packages/hdf/HPUX_11.00"
-               ;;
-           *)
-           # use default
-              ;;
-        esac
-	;;
-    Linux)
-	swpaths="/afs/ncsa/packages/hdf/Linux"
-	;;
-    OSF1)
-	swpaths="/afs/ncsa/packages/hdf/OSF1_V4.0"
-	;;
-    *)
-	# just use the defaults
-	;;
-esac
-
-# Check if the hdf4 software is actually available.
-# Accept the directory only if needed .h, .a and tools are found
-# in the same place.  That way, they are more likely to be of the
-# same version.
-# 
-swpaths="$swpaths $swpaths_defaults"
-for sw in $swpaths; do
-    if [ -r $sw/include/hdf.h -a -r $sw/lib/libdf.a -a -r $sw/bin/hdp ]; then
-	SW_inc=$sw/include
-	SW_lib=$sw/lib
-	SW_bin=$sw/bin
-	SW_Location=$sw
-	break
-    fi
-done
-}
-
-# locate hdf5 software
-locate_hdf5()
-{
-# this default is the best guess of locating hdf5 software
-swpaths_defaults="/usr/ncsa /usr/sdt /usr/local"
-swpaths=
-
-case "$OSname" in
-    SunOS)
-        case "$OSrelease" in
-            5.7)
-               swpaths="/afs/ncsa/packages/hdf5/SunOS_5.7"
-               ;;
-	    *)
-            # use default
-	       ;;
-        esac
-        ;;
-    HP-UX)
-        case "$OSrelease" in
-	   B.11.00)
-	        swpaths="/afs/ncsa/packages/hdf5/HPUX_11.00"
-               ;;
-           *)
-           # use default
-              ;;
-        esac
-	;;
-    Linux)
-	swpaths="/afs/ncsa/packages/hdf5/Linux"
-	;;
-    FreeBSD)
-        swpaths="/afs/ncsa/packages/hdf5/FreeBSD"
-        ;;
-    OSF1)
-	swpaths="/afs/ncsa/packages/hdf5/OSF1_V4.0"
-	;;
-    *)
-	# just use the defaults
-	;;
-esac
-
-# Check if the hdf5 software is actually available.
-# Accept the directory only if needed .h, .a and tools are found
-# in the same place.  That way, they are more likely to be of the
-# same version.
-# 
-swpaths="$swpaths $swpaths_defaults"
-for sw in $swpaths; do
-    if [ -r $sw/include/hdf5.h -a -r $sw/lib/libhdf5.a -a -r $sw/bin/h5dump ]; then
-	SW_inc=$sw/include
-	SW_lib=$sw/lib
-	SW_bin=$sw/bin
-	SW_Location=$sw
-	break
-    fi
-done
-}
-
-# locate zlib software
-locate_zlib()
-{
-# this default is the best guess of locating zlib software
-swpaths_defaults="/usr /usr/local /usr/ncsa /usr/sdt"
-swpaths=
-
-
-# Check if the zlib software is actually available.
-# Accept the directory only if needed .h, .a and tools are found
-# in the same place.  That way, they are more likely to be of the
-# same version.
-# Don't know something specific to check the bin directory.  Maybe gzip?
-# Just make sure it exists.
-# 
-swpaths="$swpaths $swpaths_defaults"
-for sw in $swpaths; do
-    if [ -r $sw/include/zlib.h -a	\
-	    \( -r $sw/lib/libz.a -o -r $sw/lib/libz.so \) -a -d $cw/bin ]; then
-	SW_inc=$sw/include
-	SW_lib=$sw/lib
-	SW_bin=$sw/bin
-	SW_Location=$sw
-	break
-    fi
-done
-
-# if none found, try HDF4 software which contains a version of zlib.
-if [ x-$SW_Location = x- ]; then
-    locate_hdf4
-fi
-
-}
-
-# Main
-#
-# Options
-#
-if [ $# -lt 1 ]; then
-    USAGE
-    exit 1
-fi
-
-if [ "$1" = -h ]; then
-    USAGE
-    exit 0
-fi
-
-SW=$1
-shift
-
-# locations of the software seeked.
-SW_inc=			# include place
-SW_lib=			# library place
-SW_bin=			# binary place
-SW_Location=		# parent directory of all the above
-
-OSname=`uname -s`
-OSrelease=`uname -r`
-
-case $SW in
-hdf4|hdf)
-    locate_hdf4
-    ;;
-hdf5)
-    locate_hdf5
-    ;;
-zlib)
-    locate_zlib
-    ;;
-*)
-    echo "unknown software ($SW)"
-    USAGE
-    exit 1
-    ;;
-esac
-
-# show the results located, separated by commas.
-if [ -n "${SW_inc}" -a -n "${SW_lib}" -a -n "${SW_bin}" ]; then
-    echo ${SW_inc},${SW_lib},${SW_bin}
-    exit 0
-else
-    exit 1
-fi
diff --git a/bin/ltmain.sh b/bin/ltmain.sh
deleted file mode 100644
index 63ae69d..0000000
--- a/bin/ltmain.sh
+++ /dev/null
@@ -1,9655 +0,0 @@
-
-# libtool (GNU libtool) 2.4.2
-# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
-# This is free software; see the source for copying conditions.  There is NO
-# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-# GNU Libtool is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html,
-# or obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-# Usage: $progname [OPTION]... [MODE-ARG]...
-#
-# Provide generalized library-building support services.
-#
-#       --config             show all configuration variables
-#       --debug              enable verbose shell tracing
-#   -n, --dry-run            display commands without modifying any files
-#       --features           display basic configuration information and exit
-#       --mode=MODE          use operation mode MODE
-#       --preserve-dup-deps  don't remove duplicate dependency libraries
-#       --quiet, --silent    don't print informational messages
-#       --no-quiet, --no-silent
-#                            print informational messages (default)
-#       --no-warn            don't display warning messages
-#       --tag=TAG            use configuration variables from tag TAG
-#   -v, --verbose            print more informational messages than default
-#       --no-verbose         don't print the extra informational messages
-#       --version            print version information
-#   -h, --help, --help-all   print short, long, or detailed help message
-#
-# MODE must be one of the following:
-#
-#         clean              remove files from the build directory
-#         compile            compile a source file into a libtool object
-#         execute            automatically set library path, then run a program
-#         finish             complete the installation of libtool libraries
-#         install            install libraries or executables
-#         link               create a library or an executable
-#         uninstall          remove libraries from an installed directory
-#
-# MODE-ARGS vary depending on the MODE.  When passed as first option,
-# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
-# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
-#
-# When reporting a bug, please describe a test case to reproduce it and
-# include the following information:
-#
-#         host-triplet:	$host
-#         shell:		$SHELL
-#         compiler:		$LTCC
-#         compiler flags:		$LTCFLAGS
-#         linker:		$LD (gnu? $with_gnu_ld)
-#         $progname:	(GNU libtool) 2.4.2
-#         automake:	$automake_version
-#         autoconf:	$autoconf_version
-#
-# Report bugs to <bug-libtool@gnu.org>.
-# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
-# General help using GNU software: <http://www.gnu.org/gethelp/>.
-
-PROGRAM=libtool
-PACKAGE=libtool
-VERSION=2.4.2
-TIMESTAMP=""
-package_revision=1.3337
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-$1
-_LTECHO_EOF'
-}
-
-# NLS nuisances: We save the old values to restore during execute mode.
-lt_user_locale=
-lt_safe_locale=
-for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-do
-  eval "if test \"\${$lt_var+set}\" = set; then
-          save_$lt_var=\$$lt_var
-          $lt_var=C
-	  export $lt_var
-	  lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
-	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
-	fi"
-done
-LC_ALL=C
-LANGUAGE=C
-export LANGUAGE LC_ALL
-
-$lt_unset CDPATH
-
-
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath="$0"
-
-
-
-: ${CP="cp -f"}
-test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
-: ${MAKE="make"}
-: ${MKDIR="mkdir"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
-: ${Xsed="$SED -e 1s/^X//"}
-
-# Global variables:
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
-EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.
-
-exit_status=$EXIT_SUCCESS
-
-# Make sure IFS has a sensible default
-lt_nl='
-'
-IFS=" 	$lt_nl"
-
-dirname="s,/[^/]*$,,"
-basename="s,^.*/,,"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-    func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
-    if test "X$func_dirname_result" = "X${1}"; then
-      func_dirname_result="${3}"
-    else
-      func_dirname_result="$func_dirname_result${2}"
-    fi
-} # func_dirname may be replaced by extended shell implementation
-
-
-# func_basename file
-func_basename ()
-{
-    func_basename_result=`$ECHO "${1}" | $SED "$basename"`
-} # func_basename may be replaced by extended shell implementation
-
-
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-#   dirname:  Compute the dirname of FILE.  If nonempty,
-#             add APPEND to the result, otherwise set result
-#             to NONDIR_REPLACEMENT.
-#             value returned in "$func_dirname_result"
-#   basename: Compute filename of FILE.
-#             value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
-    # Extract subdirectory from the argument.
-    func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
-    if test "X$func_dirname_result" = "X${1}"; then
-      func_dirname_result="${3}"
-    else
-      func_dirname_result="$func_dirname_result${2}"
-    fi
-    func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
-} # func_dirname_and_basename may be replaced by extended shell implementation
-
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
-    case ${2} in
-      .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
-      *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
-    esac
-} # func_stripname may be replaced by extended shell implementation
-
-
-# These SED scripts presuppose an absolute path with a trailing slash.
-pathcar='s,^/\([^/]*\).*$,\1,'
-pathcdr='s,^/[^/]*,,'
-removedotparts=':dotsl
-		s@/\./@/@g
-		t dotsl
-		s,/\.$,/,'
-collapseslashes='s@/\{1,\}@/@g'
-finalslash='s,/*$,/,'
-
-# func_normal_abspath PATH
-# Remove doubled-up and trailing slashes, "." path components,
-# and cancel out any ".." path components in PATH after making
-# it an absolute path.
-#             value returned in "$func_normal_abspath_result"
-func_normal_abspath ()
-{
-  # Start from root dir and reassemble the path.
-  func_normal_abspath_result=
-  func_normal_abspath_tpath=$1
-  func_normal_abspath_altnamespace=
-  case $func_normal_abspath_tpath in
-    "")
-      # Empty path, that just means $cwd.
-      func_stripname '' '/' "`pwd`"
-      func_normal_abspath_result=$func_stripname_result
-      return
-    ;;
-    # The next three entries are used to spot a run of precisely
-    # two leading slashes without using negated character classes;
-    # we take advantage of case's first-match behaviour.
-    ///*)
-      # Unusual form of absolute path, do nothing.
-    ;;
-    //*)
-      # Not necessarily an ordinary path; POSIX reserves leading '//'
-      # and for example Cygwin uses it to access remote file shares
-      # over CIFS/SMB, so we conserve a leading double slash if found.
-      func_normal_abspath_altnamespace=/
-    ;;
-    /*)
-      # Absolute path, do nothing.
-    ;;
-    *)
-      # Relative path, prepend $cwd.
-      func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
-    ;;
-  esac
-  # Cancel out all the simple stuff to save iterations.  We also want
-  # the path to end with a slash for ease of parsing, so make sure
-  # there is one (and only one) here.
-  func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
-        -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
-  while :; do
-    # Processed it all yet?
-    if test "$func_normal_abspath_tpath" = / ; then
-      # If we ascended to the root using ".." the result may be empty now.
-      if test -z "$func_normal_abspath_result" ; then
-        func_normal_abspath_result=/
-      fi
-      break
-    fi
-    func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
-        -e "$pathcar"`
-    func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
-        -e "$pathcdr"`
-    # Figure out what to do with it
-    case $func_normal_abspath_tcomponent in
-      "")
-        # Trailing empty path component, ignore it.
-      ;;
-      ..)
-        # Parent dir; strip last assembled component from result.
-        func_dirname "$func_normal_abspath_result"
-        func_normal_abspath_result=$func_dirname_result
-      ;;
-      *)
-        # Actual path component, append it.
-        func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
-      ;;
-    esac
-  done
-  # Restore leading double-slash if one was found on entry.
-  func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
-}
-
-# func_relative_path SRCDIR DSTDIR
-# generates a relative path from SRCDIR to DSTDIR, with a trailing
-# slash if non-empty, suitable for immediately appending a filename
-# without needing to append a separator.
-#             value returned in "$func_relative_path_result"
-func_relative_path ()
-{
-  func_relative_path_result=
-  func_normal_abspath "$1"
-  func_relative_path_tlibdir=$func_normal_abspath_result
-  func_normal_abspath "$2"
-  func_relative_path_tbindir=$func_normal_abspath_result
-
-  # Ascend the tree starting from libdir
-  while :; do
-    # check if we have found a prefix of bindir
-    case $func_relative_path_tbindir in
-      $func_relative_path_tlibdir)
-        # found an exact match
-        func_relative_path_tcancelled=
-        break
-        ;;
-      $func_relative_path_tlibdir*)
-        # found a matching prefix
-        func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
-        func_relative_path_tcancelled=$func_stripname_result
-        if test -z "$func_relative_path_result"; then
-          func_relative_path_result=.
-        fi
-        break
-        ;;
-      *)
-        func_dirname $func_relative_path_tlibdir
-        func_relative_path_tlibdir=${func_dirname_result}
-        if test "x$func_relative_path_tlibdir" = x ; then
-          # Have to descend all the way to the root!
-          func_relative_path_result=../$func_relative_path_result
-          func_relative_path_tcancelled=$func_relative_path_tbindir
-          break
-        fi
-        func_relative_path_result=../$func_relative_path_result
-        ;;
-    esac
-  done
-
-  # Now calculate path; take care to avoid doubling-up slashes.
-  func_stripname '' '/' "$func_relative_path_result"
-  func_relative_path_result=$func_stripname_result
-  func_stripname '/' '/' "$func_relative_path_tcancelled"
-  if test "x$func_stripname_result" != x ; then
-    func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
-  fi
-
-  # Normalisation. If bindir is libdir, return empty string,
-  # else relative path ending with a slash; either way, target
-  # file name can be directly appended.
-  if test ! -z "$func_relative_path_result"; then
-    func_stripname './' '' "$func_relative_path_result/"
-    func_relative_path_result=$func_stripname_result
-  fi
-}
-
-# The name of this program:
-func_dirname_and_basename "$progpath"
-progname=$func_basename_result
-
-# Make sure we have an absolute path for reexecution:
-case $progpath in
-  [\\/]*|[A-Za-z]:\\*) ;;
-  *[\\/]*)
-     progdir=$func_dirname_result
-     progdir=`cd "$progdir" && pwd`
-     progpath="$progdir/$progname"
-     ;;
-  *)
-     save_IFS="$IFS"
-     IFS=${PATH_SEPARATOR-:}
-     for progdir in $PATH; do
-       IFS="$save_IFS"
-       test -x "$progdir/$progname" && break
-     done
-     IFS="$save_IFS"
-     test -n "$progdir" || progdir=`pwd`
-     progpath="$progdir/$progname"
-     ;;
-esac
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed="${SED}"' -e 1s/^X//'
-sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
-
-# Sed substitution that turns a string into a regex matching for the
-# string literally.
-sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
-
-# Sed substitution that converts a w32 file name or path
-# which contains forward slashes, into one that contains
-# (escaped) backslashes.  A very naive implementation.
-lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-
-# Re-`\' parameter expansions in output of double_quote_subst that were
-# `\'-ed in input to the same.  If an odd number of `\' preceded a '$'
-# in input to double_quote_subst, that '$' was protected from expansion.
-# Since each input `\' is now two `\'s, look for any number of runs of
-# four `\'s followed by two `\'s and then a '$'.  `\' that '$'.
-bs='\\'
-bs2='\\\\'
-bs4='\\\\\\\\'
-dollar='\$'
-sed_double_backslash="\
-  s/$bs4/&\\
-/g
-  s/^$bs2$dollar/$bs&/
-  s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g
-  s/\n//g"
-
-# Standard options:
-opt_dry_run=false
-opt_help=false
-opt_quiet=false
-opt_verbose=false
-opt_warning=:
-
-# func_echo arg...
-# Echo program name prefixed message, along with the current mode
-# name if it has been set yet.
-func_echo ()
-{
-    $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
-}
-
-# func_verbose arg...
-# Echo program name prefixed message in verbose mode only.
-func_verbose ()
-{
-    $opt_verbose && func_echo ${1+"$@"}
-
-    # A bug in bash halts the script if the last line of a function
-    # fails when set -e is in force, so we need another command to
-    # work around that:
-    :
-}
-
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
-    $ECHO "$*"
-}
-
-# func_error arg...
-# Echo program name prefixed message to standard error.
-func_error ()
-{
-    $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
-}
-
-# func_warning arg...
-# Echo program name prefixed warning message to standard error.
-func_warning ()
-{
-    $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
-
-    # bash bug again:
-    :
-}
-
-# func_fatal_error arg...
-# Echo program name prefixed message to standard error, and exit.
-func_fatal_error ()
-{
-    func_error ${1+"$@"}
-    exit $EXIT_FAILURE
-}
-
-# func_fatal_help arg...
-# Echo program name prefixed message to standard error, followed by
-# a help hint, and exit.
-func_fatal_help ()
-{
-    func_error ${1+"$@"}
-    func_fatal_error "$help"
-}
-help="Try \`$progname --help' for more information."  ## default
-
-
-# func_grep expression filename
-# Check whether EXPRESSION matches any line of FILENAME, without output.
-func_grep ()
-{
-    $GREP "$1" "$2" >/dev/null 2>&1
-}
-
-
-# func_mkdir_p directory-path
-# Make sure the entire path to DIRECTORY-PATH is available.
-func_mkdir_p ()
-{
-    my_directory_path="$1"
-    my_dir_list=
-
-    if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
-
-      # Protect directory names starting with `-'
-      case $my_directory_path in
-        -*) my_directory_path="./$my_directory_path" ;;
-      esac
-
-      # While some portion of DIR does not yet exist...
-      while test ! -d "$my_directory_path"; do
-        # ...make a list in topmost first order.  Use a colon delimited
-	# list incase some portion of path contains whitespace.
-        my_dir_list="$my_directory_path:$my_dir_list"
-
-        # If the last portion added has no slash in it, the list is done
-        case $my_directory_path in */*) ;; *) break ;; esac
-
-        # ...otherwise throw away the child directory and loop
-        my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
-      done
-      my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
-
-      save_mkdir_p_IFS="$IFS"; IFS=':'
-      for my_dir in $my_dir_list; do
-	IFS="$save_mkdir_p_IFS"
-        # mkdir can fail with a `File exist' error if two processes
-        # try to create one of the directories concurrently.  Don't
-        # stop in that case!
-        $MKDIR "$my_dir" 2>/dev/null || :
-      done
-      IFS="$save_mkdir_p_IFS"
-
-      # Bail out if we (or some other process) failed to create a directory.
-      test -d "$my_directory_path" || \
-        func_fatal_error "Failed to create \`$1'"
-    fi
-}
-
-
-# func_mktempdir [string]
-# Make a temporary directory that won't clash with other running
-# libtool processes, and avoids race conditions if possible.  If
-# given, STRING is the basename for that directory.
-func_mktempdir ()
-{
-    my_template="${TMPDIR-/tmp}/${1-$progname}"
-
-    if test "$opt_dry_run" = ":"; then
-      # Return a directory name, but don't create it in dry-run mode
-      my_tmpdir="${my_template}-$$"
-    else
-
-      # If mktemp works, use that first and foremost
-      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
-
-      if test ! -d "$my_tmpdir"; then
-        # Failing that, at least try and use $RANDOM to avoid a race
-        my_tmpdir="${my_template}-${RANDOM-0}$$"
-
-        save_mktempdir_umask=`umask`
-        umask 0077
-        $MKDIR "$my_tmpdir"
-        umask $save_mktempdir_umask
-      fi
-
-      # If we're not in dry-run mode, bomb out on failure
-      test -d "$my_tmpdir" || \
-        func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
-    fi
-
-    $ECHO "$my_tmpdir"
-}
-
-
-# func_quote_for_eval arg
-# Aesthetically quote ARG to be evaled later.
-# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
-# is double-quoted, suitable for a subsequent eval, whereas
-# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
-# which are still active within double quotes backslashified.
-func_quote_for_eval ()
-{
-    case $1 in
-      *[\\\`\"\$]*)
-	func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
-      *)
-        func_quote_for_eval_unquoted_result="$1" ;;
-    esac
-
-    case $func_quote_for_eval_unquoted_result in
-      # Double-quote args containing shell metacharacters to delay
-      # word splitting, command substitution and and variable
-      # expansion for a subsequent eval.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, so we specify it separately.
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-        func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
-        ;;
-      *)
-        func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
-    esac
-}
-
-
-# func_quote_for_expand arg
-# Aesthetically quote ARG to be evaled later; same as above,
-# but do not quote variable references.
-func_quote_for_expand ()
-{
-    case $1 in
-      *[\\\`\"]*)
-	my_arg=`$ECHO "$1" | $SED \
-	    -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
-      *)
-        my_arg="$1" ;;
-    esac
-
-    case $my_arg in
-      # Double-quote args containing shell metacharacters to delay
-      # word splitting and command substitution for a subsequent eval.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, so we specify it separately.
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-        my_arg="\"$my_arg\""
-        ;;
-    esac
-
-    func_quote_for_expand_result="$my_arg"
-}
-
-
-# func_show_eval cmd [fail_exp]
-# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
-# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
-# is given, then evaluate it.
-func_show_eval ()
-{
-    my_cmd="$1"
-    my_fail_exp="${2-:}"
-
-    ${opt_silent-false} || {
-      func_quote_for_expand "$my_cmd"
-      eval "func_echo $func_quote_for_expand_result"
-    }
-
-    if ${opt_dry_run-false}; then :; else
-      eval "$my_cmd"
-      my_status=$?
-      if test "$my_status" -eq 0; then :; else
-	eval "(exit $my_status); $my_fail_exp"
-      fi
-    fi
-}
-
-
-# func_show_eval_locale cmd [fail_exp]
-# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
-# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
-# is given, then evaluate it.  Use the saved locale for evaluation.
-func_show_eval_locale ()
-{
-    my_cmd="$1"
-    my_fail_exp="${2-:}"
-
-    ${opt_silent-false} || {
-      func_quote_for_expand "$my_cmd"
-      eval "func_echo $func_quote_for_expand_result"
-    }
-
-    if ${opt_dry_run-false}; then :; else
-      eval "$lt_user_locale
-	    $my_cmd"
-      my_status=$?
-      eval "$lt_safe_locale"
-      if test "$my_status" -eq 0; then :; else
-	eval "(exit $my_status); $my_fail_exp"
-      fi
-    fi
-}
-
-# func_tr_sh
-# Turn $1 into a string suitable for a shell variable name.
-# Result is stored in $func_tr_sh_result.  All characters
-# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
-# if $1 begins with a digit, a '_' is prepended as well.
-func_tr_sh ()
-{
-  case $1 in
-  [0-9]* | *[!a-zA-Z0-9_]*)
-    func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
-    ;;
-  * )
-    func_tr_sh_result=$1
-    ;;
-  esac
-}
-
-
-# func_version
-# Echo version message to standard output and exit.
-func_version ()
-{
-    $opt_debug
-
-    $SED -n '/(C)/!b go
-	:more
-	/\./!{
-	  N
-	  s/\n# / /
-	  b more
-	}
-	:go
-	/^# '$PROGRAM' (GNU /,/# warranty; / {
-        s/^# //
-	s/^# *$//
-        s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
-        p
-     }' < "$progpath"
-     exit $?
-}
-
-# func_usage
-# Echo short help message to standard output and exit.
-func_usage ()
-{
-    $opt_debug
-
-    $SED -n '/^# Usage:/,/^#  *.*--help/ {
-        s/^# //
-	s/^# *$//
-	s/\$progname/'$progname'/
-	p
-    }' < "$progpath"
-    echo
-    $ECHO "run \`$progname --help | more' for full usage"
-    exit $?
-}
-
-# func_help [NOEXIT]
-# Echo long help message to standard output and exit,
-# unless 'noexit' is passed as argument.
-func_help ()
-{
-    $opt_debug
-
-    $SED -n '/^# Usage:/,/# Report bugs to/ {
-	:print
-        s/^# //
-	s/^# *$//
-	s*\$progname*'$progname'*
-	s*\$host*'"$host"'*
-	s*\$SHELL*'"$SHELL"'*
-	s*\$LTCC*'"$LTCC"'*
-	s*\$LTCFLAGS*'"$LTCFLAGS"'*
-	s*\$LD*'"$LD"'*
-	s/\$with_gnu_ld/'"$with_gnu_ld"'/
-	s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
-	s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
-	p
-	d
-     }
-     /^# .* home page:/b print
-     /^# General help using/b print
-     ' < "$progpath"
-    ret=$?
-    if test -z "$1"; then
-      exit $ret
-    fi
-}
-
-# func_missing_arg argname
-# Echo program name prefixed message to standard error and set global
-# exit_cmd.
-func_missing_arg ()
-{
-    $opt_debug
-
-    func_error "missing argument for $1."
-    exit_cmd=exit
-}
-
-
-# func_split_short_opt shortopt
-# Set func_split_short_opt_name and func_split_short_opt_arg shell
-# variables after splitting SHORTOPT after the 2nd character.
-func_split_short_opt ()
-{
-    my_sed_short_opt='1s/^\(..\).*$/\1/;q'
-    my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
-
-    func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
-    func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
-} # func_split_short_opt may be replaced by extended shell implementation
-
-
-# func_split_long_opt longopt
-# Set func_split_long_opt_name and func_split_long_opt_arg shell
-# variables after splitting LONGOPT at the `=' sign.
-func_split_long_opt ()
-{
-    my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
-    my_sed_long_arg='1s/^--[^=]*=//'
-
-    func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
-    func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
-} # func_split_long_opt may be replaced by extended shell implementation
-
-exit_cmd=:
-
-
-
-
-
-magic="%%%MAGIC variable%%%"
-magic_exe="%%%MAGIC EXE variable%%%"
-
-# Global variables.
-nonopt=
-preserve_args=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
-extracted_archives=
-extracted_serial=0
-
-# If this variable is set in any of the actions, the command in it
-# will be execed at the end.  This prevents here-documents from being
-# left over by shells.
-exec_cmd=
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-    eval "${1}=\$${1}\${2}"
-} # func_append may be replaced by extended shell implementation
-
-# func_append_quoted var value
-# Quote VALUE and append to the end of shell variable VAR, separated
-# by a space.
-func_append_quoted ()
-{
-    func_quote_for_eval "${2}"
-    eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
-} # func_append_quoted may be replaced by extended shell implementation
-
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-    func_arith_result=`expr "${@}"`
-} # func_arith may be replaced by extended shell implementation
-
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-    func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
-} # func_len may be replaced by extended shell implementation
-
-
-# func_lo2o object
-func_lo2o ()
-{
-    func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
-} # func_lo2o may be replaced by extended shell implementation
-
-
-# func_xform libobj-or-source
-func_xform ()
-{
-    func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
-} # func_xform may be replaced by extended shell implementation
-
-
-# func_fatal_configuration arg...
-# Echo program name prefixed message to standard error, followed by
-# a configuration failure hint, and exit.
-func_fatal_configuration ()
-{
-    func_error ${1+"$@"}
-    func_error "See the $PACKAGE documentation for more information."
-    func_fatal_error "Fatal configuration error."
-}
-
-
-# func_config
-# Display the configuration for all the tags in this script.
-func_config ()
-{
-    re_begincf='^# ### BEGIN LIBTOOL'
-    re_endcf='^# ### END LIBTOOL'
-
-    # Default configuration.
-    $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath"
-
-    # Now print the configurations for the tags.
-    for tagname in $taglist; do
-      $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath"
-    done
-
-    exit $?
-}
-
-# func_features
-# Display the features supported by this script.
-func_features ()
-{
-    echo "host: $host"
-    if test "$build_libtool_libs" = yes; then
-      echo "enable shared libraries"
-    else
-      echo "disable shared libraries"
-    fi
-    if test "$build_old_libs" = yes; then
-      echo "enable static libraries"
-    else
-      echo "disable static libraries"
-    fi
-
-    exit $?
-}
-
-# func_enable_tag tagname
-# Verify that TAGNAME is valid, and either flag an error and exit, or
-# enable the TAGNAME tag.  We also add TAGNAME to the global $taglist
-# variable here.
-func_enable_tag ()
-{
-  # Global variable:
-  tagname="$1"
-
-  re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
-  re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
-  sed_extractcf="/$re_begincf/,/$re_endcf/p"
-
-  # Validate tagname.
-  case $tagname in
-    *[!-_A-Za-z0-9,/]*)
-      func_fatal_error "invalid tag name: $tagname"
-      ;;
-  esac
-
-  # Don't test for the "default" C tag, as we know it's
-  # there but not specially marked.
-  case $tagname in
-    CC) ;;
-    *)
-      if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
-	taglist="$taglist $tagname"
-
-	# Evaluate the configuration.  Be careful to quote the path
-	# and the sed script, to avoid splitting on whitespace, but
-	# also don't use non-portable quotes within backquotes within
-	# quotes we have to do it in 2 steps:
-	extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
-	eval "$extractedcf"
-      else
-	func_error "ignoring unknown tag $tagname"
-      fi
-      ;;
-  esac
-}
-
-# func_check_version_match
-# Ensure that we are using m4 macros, and libtool script from the same
-# release of libtool.
-func_check_version_match ()
-{
-  if test "$package_revision" != "$macro_revision"; then
-    if test "$VERSION" != "$macro_version"; then
-      if test -z "$macro_version"; then
-        cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
-$progname: definition of this LT_INIT comes from an older release.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
-      else
-        cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
-      fi
-    else
-      cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
-$progname: but the definition of this LT_INIT comes from revision $macro_revision.
-$progname: You should recreate aclocal.m4 with macros from revision $package_revision
-$progname: of $PACKAGE $VERSION and run autoconf again.
-_LT_EOF
-    fi
-
-    exit $EXIT_MISMATCH
-  fi
-}
-
-
-# Shorthand for --mode=foo, only valid as the first argument
-case $1 in
-clean|clea|cle|cl)
-  shift; set dummy --mode clean ${1+"$@"}; shift
-  ;;
-compile|compil|compi|comp|com|co|c)
-  shift; set dummy --mode compile ${1+"$@"}; shift
-  ;;
-execute|execut|execu|exec|exe|ex|e)
-  shift; set dummy --mode execute ${1+"$@"}; shift
-  ;;
-finish|finis|fini|fin|fi|f)
-  shift; set dummy --mode finish ${1+"$@"}; shift
-  ;;
-install|instal|insta|inst|ins|in|i)
-  shift; set dummy --mode install ${1+"$@"}; shift
-  ;;
-link|lin|li|l)
-  shift; set dummy --mode link ${1+"$@"}; shift
-  ;;
-uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
-  shift; set dummy --mode uninstall ${1+"$@"}; shift
-  ;;
-esac
-
-
-
-# Option defaults:
-opt_debug=:
-opt_dry_run=false
-opt_config=false
-opt_preserve_dup_deps=false
-opt_features=false
-opt_finish=false
-opt_help=false
-opt_help_all=false
-opt_silent=:
-opt_warning=:
-opt_verbose=:
-opt_silent=false
-opt_verbose=false
-
-
-# Parse options once, thoroughly.  This comes as soon as possible in the
-# script to make things like `--version' happen as quickly as we can.
-{
-  # this just eases exit handling
-  while test $# -gt 0; do
-    opt="$1"
-    shift
-    case $opt in
-      --debug|-x)	opt_debug='set -x'
-			func_echo "enabling shell trace mode"
-			$opt_debug
-			;;
-      --dry-run|--dryrun|-n)
-			opt_dry_run=:
-			;;
-      --config)
-			opt_config=:
-func_config
-			;;
-      --dlopen|-dlopen)
-			optarg="$1"
-			opt_dlopen="${opt_dlopen+$opt_dlopen
-}$optarg"
-			shift
-			;;
-      --preserve-dup-deps)
-			opt_preserve_dup_deps=:
-			;;
-      --features)
-			opt_features=:
-func_features
-			;;
-      --finish)
-			opt_finish=:
-set dummy --mode finish ${1+"$@"}; shift
-			;;
-      --help)
-			opt_help=:
-			;;
-      --help-all)
-			opt_help_all=:
-opt_help=': help-all'
-			;;
-      --mode)
-			test $# = 0 && func_missing_arg $opt && break
-			optarg="$1"
-			opt_mode="$optarg"
-case $optarg in
-  # Valid mode arguments:
-  clean|compile|execute|finish|install|link|relink|uninstall) ;;
-
-  # Catch anything else as an error
-  *) func_error "invalid argument for $opt"
-     exit_cmd=exit
-     break
-     ;;
-esac
-			shift
-			;;
-      --no-silent|--no-quiet)
-			opt_silent=false
-func_append preserve_args " $opt"
-			;;
-      --no-warning|--no-warn)
-			opt_warning=false
-func_append preserve_args " $opt"
-			;;
-      --no-verbose)
-			opt_verbose=false
-func_append preserve_args " $opt"
-			;;
-      --silent|--quiet)
-			opt_silent=:
-func_append preserve_args " $opt"
-        opt_verbose=false
-			;;
-      --verbose|-v)
-			opt_verbose=:
-func_append preserve_args " $opt"
-opt_silent=false
-			;;
-      --tag)
-			test $# = 0 && func_missing_arg $opt && break
-			optarg="$1"
-			opt_tag="$optarg"
-func_append preserve_args " $opt $optarg"
-func_enable_tag "$optarg"
-			shift
-			;;
-
-      -\?|-h)		func_usage				;;
-      --help)		func_help				;;
-      --version)	func_version				;;
-
-      # Separate optargs to long options:
-      --*=*)
-			func_split_long_opt "$opt"
-			set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
-			shift
-			;;
-
-      # Separate non-argument short options:
-      -\?*|-h*|-n*|-v*)
-			func_split_short_opt "$opt"
-			set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
-			shift
-			;;
-
-      --)		break					;;
-      -*)		func_fatal_help "unrecognized option \`$opt'" ;;
-      *)		set dummy "$opt" ${1+"$@"};	shift; break  ;;
-    esac
-  done
-
-  # Validate options:
-
-  # save first non-option argument
-  if test "$#" -gt 0; then
-    nonopt="$opt"
-    shift
-  fi
-
-  # preserve --debug
-  test "$opt_debug" = : || func_append preserve_args " --debug"
-
-  case $host in
-    *cygwin* | *mingw* | *pw32* | *cegcc*)
-      # don't eliminate duplications in $postdeps and $predeps
-      opt_duplicate_compiler_generated_deps=:
-      ;;
-    *)
-      opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
-      ;;
-  esac
-
-  $opt_help || {
-    # Sanity checks first:
-    func_check_version_match
-
-    if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-      func_fatal_configuration "not configured to build any kind of library"
-    fi
-
-    # Darwin sucks
-    eval std_shrext=\"$shrext_cmds\"
-
-    # Only execute mode is allowed to have -dlopen flags.
-    if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
-      func_error "unrecognized option \`-dlopen'"
-      $ECHO "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    # Change the help message to a mode-specific one.
-    generic_help="$help"
-    help="Try \`$progname --help --mode=$opt_mode' for more information."
-  }
-
-
-  # Bail if the options were screwed
-  $exit_cmd $EXIT_FAILURE
-}
-
-
-
-
-## ----------- ##
-##    Main.    ##
-## ----------- ##
-
-# func_lalib_p file
-# True iff FILE is a libtool `.la' library or `.lo' object file.
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_lalib_p ()
-{
-    test -f "$1" &&
-      $SED -e 4q "$1" 2>/dev/null \
-        | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
-}
-
-# func_lalib_unsafe_p file
-# True iff FILE is a libtool `.la' library or `.lo' object file.
-# This function implements the same check as func_lalib_p without
-# resorting to external programs.  To this end, it redirects stdin and
-# closes it afterwards, without saving the original file descriptor.
-# As a safety measure, use it only where a negative result would be
-# fatal anyway.  Works if `file' does not exist.
-func_lalib_unsafe_p ()
-{
-    lalib_p=no
-    if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then
-	for lalib_p_l in 1 2 3 4
-	do
-	    read lalib_p_line
-	    case "$lalib_p_line" in
-		\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
-	    esac
-	done
-	exec 0<&5 5<&-
-    fi
-    test "$lalib_p" = yes
-}
-
-# func_ltwrapper_script_p file
-# True iff FILE is a libtool wrapper script
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_ltwrapper_script_p ()
-{
-    func_lalib_p "$1"
-}
-
-# func_ltwrapper_executable_p file
-# True iff FILE is a libtool wrapper executable
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_ltwrapper_executable_p ()
-{
-    func_ltwrapper_exec_suffix=
-    case $1 in
-    *.exe) ;;
-    *) func_ltwrapper_exec_suffix=.exe ;;
-    esac
-    $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1
-}
-
-# func_ltwrapper_scriptname file
-# Assumes file is an ltwrapper_executable
-# uses $file to determine the appropriate filename for a
-# temporary ltwrapper_script.
-func_ltwrapper_scriptname ()
-{
-    func_dirname_and_basename "$1" "" "."
-    func_stripname '' '.exe' "$func_basename_result"
-    func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
-}
-
-# func_ltwrapper_p file
-# True iff FILE is a libtool wrapper script or wrapper executable
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_ltwrapper_p ()
-{
-    func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1"
-}
-
-
-# func_execute_cmds commands fail_cmd
-# Execute tilde-delimited COMMANDS.
-# If FAIL_CMD is given, eval that upon failure.
-# FAIL_CMD may read-access the current command in variable CMD!
-func_execute_cmds ()
-{
-    $opt_debug
-    save_ifs=$IFS; IFS='~'
-    for cmd in $1; do
-      IFS=$save_ifs
-      eval cmd=\"$cmd\"
-      func_show_eval "$cmd" "${2-:}"
-    done
-    IFS=$save_ifs
-}
-
-
-# func_source file
-# Source FILE, adding directory component if necessary.
-# Note that it is not necessary on cygwin/mingw to append a dot to
-# FILE even if both FILE and FILE.exe exist: automatic-append-.exe
-# behavior happens only for exec(3), not for open(2)!  Also, sourcing
-# `FILE.' does not work on cygwin managed mounts.
-func_source ()
-{
-    $opt_debug
-    case $1 in
-    */* | *\\*)	. "$1" ;;
-    *)		. "./$1" ;;
-    esac
-}
-
-
-# func_resolve_sysroot PATH
-# Replace a leading = in PATH with a sysroot.  Store the result into
-# func_resolve_sysroot_result
-func_resolve_sysroot ()
-{
-  func_resolve_sysroot_result=$1
-  case $func_resolve_sysroot_result in
-  =*)
-    func_stripname '=' '' "$func_resolve_sysroot_result"
-    func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
-    ;;
-  esac
-}
-
-# func_replace_sysroot PATH
-# If PATH begins with the sysroot, replace it with = and
-# store the result into func_replace_sysroot_result.
-func_replace_sysroot ()
-{
-  case "$lt_sysroot:$1" in
-  ?*:"$lt_sysroot"*)
-    func_stripname "$lt_sysroot" '' "$1"
-    func_replace_sysroot_result="=$func_stripname_result"
-    ;;
-  *)
-    # Including no sysroot.
-    func_replace_sysroot_result=$1
-    ;;
-  esac
-}
-
-# func_infer_tag arg
-# Infer tagged configuration to use if any are available and
-# if one wasn't chosen via the "--tag" command line option.
-# Only attempt this if the compiler in the base compile
-# command doesn't match the default compiler.
-# arg is usually of the form 'gcc ...'
-func_infer_tag ()
-{
-    $opt_debug
-    if test -n "$available_tags" && test -z "$tagname"; then
-      CC_quoted=
-      for arg in $CC; do
-	func_append_quoted CC_quoted "$arg"
-      done
-      CC_expanded=`func_echo_all $CC`
-      CC_quoted_expanded=`func_echo_all $CC_quoted`
-      case $@ in
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when configure was run.
-      " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
-      " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
-      # Blanks at the start of $base_compile will cause this to fail
-      # if we don't check for them as well.
-      *)
-	for z in $available_tags; do
-	  if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
-	    # Evaluate the configuration.
-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
-	    CC_quoted=
-	    for arg in $CC; do
-	      # Double-quote args containing other shell metacharacters.
-	      func_append_quoted CC_quoted "$arg"
-	    done
-	    CC_expanded=`func_echo_all $CC`
-	    CC_quoted_expanded=`func_echo_all $CC_quoted`
-	    case "$@ " in
-	    " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
-	    " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
-	      # The compiler in the base compile command matches
-	      # the one in the tagged configuration.
-	      # Assume this is the tagged configuration we want.
-	      tagname=$z
-	      break
-	      ;;
-	    esac
-	  fi
-	done
-	# If $tagname still isn't set, then no tagged configuration
-	# was found and let the user know that the "--tag" command
-	# line option must be used.
-	if test -z "$tagname"; then
-	  func_echo "unable to infer tagged configuration"
-	  func_fatal_error "specify a tag with \`--tag'"
-#	else
-#	  func_verbose "using $tagname tagged configuration"
-	fi
-	;;
-      esac
-    fi
-}
-
-
-
-# func_write_libtool_object output_name pic_name nonpic_name
-# Create a libtool object file (analogous to a ".la" file),
-# but don't create it if we're doing a dry run.
-func_write_libtool_object ()
-{
-    write_libobj=${1}
-    if test "$build_libtool_libs" = yes; then
-      write_lobj=\'${2}\'
-    else
-      write_lobj=none
-    fi
-
-    if test "$build_old_libs" = yes; then
-      write_oldobj=\'${3}\'
-    else
-      write_oldobj=none
-    fi
-
-    $opt_dry_run || {
-      cat >${write_libobj}T <<EOF
-# $write_libobj - a libtool object file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object=$write_lobj
-
-# Name of the non-PIC object
-non_pic_object=$write_oldobj
-
-EOF
-      $MV "${write_libobj}T" "${write_libobj}"
-    }
-}
-
-
-##################################################
-# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
-##################################################
-
-# func_convert_core_file_wine_to_w32 ARG
-# Helper function used by file name conversion functions when $build is *nix,
-# and $host is mingw, cygwin, or some other w32 environment. Relies on a
-# correctly configured wine environment available, with the winepath program
-# in $build's $PATH.
-#
-# ARG is the $build file name to be converted to w32 format.
-# Result is available in $func_convert_core_file_wine_to_w32_result, and will
-# be empty on error (or when ARG is empty)
-func_convert_core_file_wine_to_w32 ()
-{
-  $opt_debug
-  func_convert_core_file_wine_to_w32_result="$1"
-  if test -n "$1"; then
-    # Unfortunately, winepath does not exit with a non-zero error code, so we
-    # are forced to check the contents of stdout. On the other hand, if the
-    # command is not found, the shell will set an exit code of 127 and print
-    # *an error message* to stdout. So we must check for both error code of
-    # zero AND non-empty stdout, which explains the odd construction:
-    func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
-    if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
-      func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
-        $SED -e "$lt_sed_naive_backslashify"`
-    else
-      func_convert_core_file_wine_to_w32_result=
-    fi
-  fi
-}
-# end: func_convert_core_file_wine_to_w32
-
-
-# func_convert_core_path_wine_to_w32 ARG
-# Helper function used by path conversion functions when $build is *nix, and
-# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
-# configured wine environment available, with the winepath program in $build's
-# $PATH. Assumes ARG has no leading or trailing path separator characters.
-#
-# ARG is path to be converted from $build format to win32.
-# Result is available in $func_convert_core_path_wine_to_w32_result.
-# Unconvertible file (directory) names in ARG are skipped; if no directory names
-# are convertible, then the result may be empty.
-func_convert_core_path_wine_to_w32 ()
-{
-  $opt_debug
-  # unfortunately, winepath doesn't convert paths, only file names
-  func_convert_core_path_wine_to_w32_result=""
-  if test -n "$1"; then
-    oldIFS=$IFS
-    IFS=:
-    for func_convert_core_path_wine_to_w32_f in $1; do
-      IFS=$oldIFS
-      func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
-      if test -n "$func_convert_core_file_wine_to_w32_result" ; then
-        if test -z "$func_convert_core_path_wine_to_w32_result"; then
-          func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
-        else
-          func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
-        fi
-      fi
-    done
-    IFS=$oldIFS
-  fi
-}
-# end: func_convert_core_path_wine_to_w32
-
-
-# func_cygpath ARGS...
-# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
-# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
-# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
-# (2), returns the Cygwin file name or path in func_cygpath_result (input
-# file name or path is assumed to be in w32 format, as previously converted
-# from $build's *nix or MSYS format). In case (3), returns the w32 file name
-# or path in func_cygpath_result (input file name or path is assumed to be in
-# Cygwin format). Returns an empty string on error.
-#
-# ARGS are passed to cygpath, with the last one being the file name or path to
-# be converted.
-#
-# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
-# environment variable; do not put it in $PATH.
-func_cygpath ()
-{
-  $opt_debug
-  if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
-    func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
-    if test "$?" -ne 0; then
-      # on failure, ensure result is empty
-      func_cygpath_result=
-    fi
-  else
-    func_cygpath_result=
-    func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
-  fi
-}
-#end: func_cygpath
-
-
-# func_convert_core_msys_to_w32 ARG
-# Convert file name or path ARG from MSYS format to w32 format.  Return
-# result in func_convert_core_msys_to_w32_result.
-func_convert_core_msys_to_w32 ()
-{
-  $opt_debug
-  # awkward: cmd appends spaces to result
-  func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
-    $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
-}
-#end: func_convert_core_msys_to_w32
-
-
-# func_convert_file_check ARG1 ARG2
-# Verify that ARG1 (a file name in $build format) was converted to $host
-# format in ARG2. Otherwise, emit an error message, but continue (resetting
-# func_to_host_file_result to ARG1).
-func_convert_file_check ()
-{
-  $opt_debug
-  if test -z "$2" && test -n "$1" ; then
-    func_error "Could not determine host file name corresponding to"
-    func_error "  \`$1'"
-    func_error "Continuing, but uninstalled executables may not work."
-    # Fallback:
-    func_to_host_file_result="$1"
-  fi
-}
-# end func_convert_file_check
-
-
-# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
-# Verify that FROM_PATH (a path in $build format) was converted to $host
-# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
-# func_to_host_file_result to a simplistic fallback value (see below).
-func_convert_path_check ()
-{
-  $opt_debug
-  if test -z "$4" && test -n "$3"; then
-    func_error "Could not determine the host path corresponding to"
-    func_error "  \`$3'"
-    func_error "Continuing, but uninstalled executables may not work."
-    # Fallback.  This is a deliberately simplistic "conversion" and
-    # should not be "improved".  See libtool.info.
-    if test "x$1" != "x$2"; then
-      lt_replace_pathsep_chars="s|$1|$2|g"
-      func_to_host_path_result=`echo "$3" |
-        $SED -e "$lt_replace_pathsep_chars"`
-    else
-      func_to_host_path_result="$3"
-    fi
-  fi
-}
-# end func_convert_path_check
-
-
-# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
-# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
-# and appending REPL if ORIG matches BACKPAT.
-func_convert_path_front_back_pathsep ()
-{
-  $opt_debug
-  case $4 in
-  $1 ) func_to_host_path_result="$3$func_to_host_path_result"
-    ;;
-  esac
-  case $4 in
-  $2 ) func_append func_to_host_path_result "$3"
-    ;;
-  esac
-}
-# end func_convert_path_front_back_pathsep
-
-
-##################################################
-# $build to $host FILE NAME CONVERSION FUNCTIONS #
-##################################################
-# invoked via `$to_host_file_cmd ARG'
-#
-# In each case, ARG is the path to be converted from $build to $host format.
-# Result will be available in $func_to_host_file_result.
-
-
-# func_to_host_file ARG
-# Converts the file name ARG from $build format to $host format. Return result
-# in func_to_host_file_result.
-func_to_host_file ()
-{
-  $opt_debug
-  $to_host_file_cmd "$1"
-}
-# end func_to_host_file
-
-
-# func_to_tool_file ARG LAZY
-# converts the file name ARG from $build format to toolchain format. Return
-# result in func_to_tool_file_result.  If the conversion in use is listed
-# in (the comma separated) LAZY, no conversion takes place.
-func_to_tool_file ()
-{
-  $opt_debug
-  case ,$2, in
-    *,"$to_tool_file_cmd",*)
-      func_to_tool_file_result=$1
-      ;;
-    *)
-      $to_tool_file_cmd "$1"
-      func_to_tool_file_result=$func_to_host_file_result
-      ;;
-  esac
-}
-# end func_to_tool_file
-
-
-# func_convert_file_noop ARG
-# Copy ARG to func_to_host_file_result.
-func_convert_file_noop ()
-{
-  func_to_host_file_result="$1"
-}
-# end func_convert_file_noop
-
-
-# func_convert_file_msys_to_w32 ARG
-# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
-# conversion to w32 is not available inside the cwrapper.  Returns result in
-# func_to_host_file_result.
-func_convert_file_msys_to_w32 ()
-{
-  $opt_debug
-  func_to_host_file_result="$1"
-  if test -n "$1"; then
-    func_convert_core_msys_to_w32 "$1"
-    func_to_host_file_result="$func_convert_core_msys_to_w32_result"
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_msys_to_w32
-
-
-# func_convert_file_cygwin_to_w32 ARG
-# Convert file name ARG from Cygwin to w32 format.  Returns result in
-# func_to_host_file_result.
-func_convert_file_cygwin_to_w32 ()
-{
-  $opt_debug
-  func_to_host_file_result="$1"
-  if test -n "$1"; then
-    # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
-    # LT_CYGPATH in this case.
-    func_to_host_file_result=`cygpath -m "$1"`
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_cygwin_to_w32
-
-
-# func_convert_file_nix_to_w32 ARG
-# Convert file name ARG from *nix to w32 format.  Requires a wine environment
-# and a working winepath. Returns result in func_to_host_file_result.
-func_convert_file_nix_to_w32 ()
-{
-  $opt_debug
-  func_to_host_file_result="$1"
-  if test -n "$1"; then
-    func_convert_core_file_wine_to_w32 "$1"
-    func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_nix_to_w32
-
-
-# func_convert_file_msys_to_cygwin ARG
-# Convert file name ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
-# Returns result in func_to_host_file_result.
-func_convert_file_msys_to_cygwin ()
-{
-  $opt_debug
-  func_to_host_file_result="$1"
-  if test -n "$1"; then
-    func_convert_core_msys_to_w32 "$1"
-    func_cygpath -u "$func_convert_core_msys_to_w32_result"
-    func_to_host_file_result="$func_cygpath_result"
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_msys_to_cygwin
-
-
-# func_convert_file_nix_to_cygwin ARG
-# Convert file name ARG from *nix to Cygwin format.  Requires Cygwin installed
-# in a wine environment, working winepath, and LT_CYGPATH set.  Returns result
-# in func_to_host_file_result.
-func_convert_file_nix_to_cygwin ()
-{
-  $opt_debug
-  func_to_host_file_result="$1"
-  if test -n "$1"; then
-    # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
-    func_convert_core_file_wine_to_w32 "$1"
-    func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
-    func_to_host_file_result="$func_cygpath_result"
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_nix_to_cygwin
-
-
-#############################################
-# $build to $host PATH CONVERSION FUNCTIONS #
-#############################################
-# invoked via `$to_host_path_cmd ARG'
-#
-# In each case, ARG is the path to be converted from $build to $host format.
-# The result will be available in $func_to_host_path_result.
-#
-# Path separators are also converted from $build format to $host format.  If
-# ARG begins or ends with a path separator character, it is preserved (but
-# converted to $host format) on output.
-#
-# All path conversion functions are named using the following convention:
-#   file name conversion function    : func_convert_file_X_to_Y ()
-#   path conversion function         : func_convert_path_X_to_Y ()
-# where, for any given $build/$host combination the 'X_to_Y' value is the
-# same.  If conversion functions are added for new $build/$host combinations,
-# the two new functions must follow this pattern, or func_init_to_host_path_cmd
-# will break.
-
-
-# func_init_to_host_path_cmd
-# Ensures that function "pointer" variable $to_host_path_cmd is set to the
-# appropriate value, based on the value of $to_host_file_cmd.
-to_host_path_cmd=
-func_init_to_host_path_cmd ()
-{
-  $opt_debug
-  if test -z "$to_host_path_cmd"; then
-    func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
-    to_host_path_cmd="func_convert_path_${func_stripname_result}"
-  fi
-}
-
-
-# func_to_host_path ARG
-# Converts the path ARG from $build format to $host format. Return result
-# in func_to_host_path_result.
-func_to_host_path ()
-{
-  $opt_debug
-  func_init_to_host_path_cmd
-  $to_host_path_cmd "$1"
-}
-# end func_to_host_path
-
-
-# func_convert_path_noop ARG
-# Copy ARG to func_to_host_path_result.
-func_convert_path_noop ()
-{
-  func_to_host_path_result="$1"
-}
-# end func_convert_path_noop
-
-
-# func_convert_path_msys_to_w32 ARG
-# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
-# conversion to w32 is not available inside the cwrapper.  Returns result in
-# func_to_host_path_result.
-func_convert_path_msys_to_w32 ()
-{
-  $opt_debug
-  func_to_host_path_result="$1"
-  if test -n "$1"; then
-    # Remove leading and trailing path separator characters from ARG.  MSYS
-    # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
-    # and winepath ignores them completely.
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
-    func_to_host_path_result="$func_convert_core_msys_to_w32_result"
-    func_convert_path_check : ";" \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
-  fi
-}
-# end func_convert_path_msys_to_w32
-
-
-# func_convert_path_cygwin_to_w32 ARG
-# Convert path ARG from Cygwin to w32 format.  Returns result in
-# func_to_host_file_result.
-func_convert_path_cygwin_to_w32 ()
-{
-  $opt_debug
-  func_to_host_path_result="$1"
-  if test -n "$1"; then
-    # See func_convert_path_msys_to_w32:
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
-    func_convert_path_check : ";" \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
-  fi
-}
-# end func_convert_path_cygwin_to_w32
-
-
-# func_convert_path_nix_to_w32 ARG
-# Convert path ARG from *nix to w32 format.  Requires a wine environment and
-# a working winepath.  Returns result in func_to_host_file_result.
-func_convert_path_nix_to_w32 ()
-{
-  $opt_debug
-  func_to_host_path_result="$1"
-  if test -n "$1"; then
-    # See func_convert_path_msys_to_w32:
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
-    func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
-    func_convert_path_check : ";" \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
-  fi
-}
-# end func_convert_path_nix_to_w32
-
-
-# func_convert_path_msys_to_cygwin ARG
-# Convert path ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
-# Returns result in func_to_host_file_result.
-func_convert_path_msys_to_cygwin ()
-{
-  $opt_debug
-  func_to_host_path_result="$1"
-  if test -n "$1"; then
-    # See func_convert_path_msys_to_w32:
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
-    func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
-    func_to_host_path_result="$func_cygpath_result"
-    func_convert_path_check : : \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
-  fi
-}
-# end func_convert_path_msys_to_cygwin
-
-
-# func_convert_path_nix_to_cygwin ARG
-# Convert path ARG from *nix to Cygwin format.  Requires Cygwin installed in a
-# a wine environment, working winepath, and LT_CYGPATH set.  Returns result in
-# func_to_host_file_result.
-func_convert_path_nix_to_cygwin ()
-{
-  $opt_debug
-  func_to_host_path_result="$1"
-  if test -n "$1"; then
-    # Remove leading and trailing path separator characters from
-    # ARG. msys behavior is inconsistent here, cygpath turns them
-    # into '.;' and ';.', and winepath ignores them completely.
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
-    func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
-    func_to_host_path_result="$func_cygpath_result"
-    func_convert_path_check : : \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
-  fi
-}
-# end func_convert_path_nix_to_cygwin
-
-
-# func_mode_compile arg...
-func_mode_compile ()
-{
-    $opt_debug
-    # Get the compilation command and the source file.
-    base_compile=
-    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
-    suppress_opt=yes
-    suppress_output=
-    arg_mode=normal
-    libobj=
-    later=
-    pie_flag=
-
-    for arg
-    do
-      case $arg_mode in
-      arg  )
-	# do not "continue".  Instead, add this to base_compile
-	lastarg="$arg"
-	arg_mode=normal
-	;;
-
-      target )
-	libobj="$arg"
-	arg_mode=normal
-	continue
-	;;
-
-      normal )
-	# Accept any command-line options.
-	case $arg in
-	-o)
-	  test -n "$libobj" && \
-	    func_fatal_error "you cannot specify \`-o' more than once"
-	  arg_mode=target
-	  continue
-	  ;;
-
-	-pie | -fpie | -fPIE)
-          func_append pie_flag " $arg"
-	  continue
-	  ;;
-
-	-shared | -static | -prefer-pic | -prefer-non-pic)
-	  func_append later " $arg"
-	  continue
-	  ;;
-
-	-no-suppress)
-	  suppress_opt=no
-	  continue
-	  ;;
-
-	-Xcompiler)
-	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
-	  continue      #  The current "srcfile" will either be retained or
-	  ;;            #  replaced later.  I would guess that would be a bug.
-
-	-Wc,*)
-	  func_stripname '-Wc,' '' "$arg"
-	  args=$func_stripname_result
-	  lastarg=
-	  save_ifs="$IFS"; IFS=','
-	  for arg in $args; do
-	    IFS="$save_ifs"
-	    func_append_quoted lastarg "$arg"
-	  done
-	  IFS="$save_ifs"
-	  func_stripname ' ' '' "$lastarg"
-	  lastarg=$func_stripname_result
-
-	  # Add the arguments to base_compile.
-	  func_append base_compile " $lastarg"
-	  continue
-	  ;;
-
-	*)
-	  # Accept the current argument as the source file.
-	  # The previous "srcfile" becomes the current argument.
-	  #
-	  lastarg="$srcfile"
-	  srcfile="$arg"
-	  ;;
-	esac  #  case $arg
-	;;
-      esac    #  case $arg_mode
-
-      # Aesthetically quote the previous argument.
-      func_append_quoted base_compile "$lastarg"
-    done # for arg
-
-    case $arg_mode in
-    arg)
-      func_fatal_error "you must specify an argument for -Xcompile"
-      ;;
-    target)
-      func_fatal_error "you must specify a target with \`-o'"
-      ;;
-    *)
-      # Get the name of the library object.
-      test -z "$libobj" && {
-	func_basename "$srcfile"
-	libobj="$func_basename_result"
-      }
-      ;;
-    esac
-
-    # Recognize several different file suffixes.
-    # If the user specifies -o file.o, it is replaced with file.lo
-    case $libobj in
-    *.[cCFSifmso] | \
-    *.ada | *.adb | *.ads | *.asm | \
-    *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-    *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
-      func_xform "$libobj"
-      libobj=$func_xform_result
-      ;;
-    esac
-
-    case $libobj in
-    *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
-    *)
-      func_fatal_error "cannot determine name of library object from \`$libobj'"
-      ;;
-    esac
-
-    func_infer_tag $base_compile
-
-    for arg in $later; do
-      case $arg in
-      -shared)
-	test "$build_libtool_libs" != yes && \
-	  func_fatal_configuration "can not build a shared library"
-	build_old_libs=no
-	continue
-	;;
-
-      -static)
-	build_libtool_libs=no
-	build_old_libs=yes
-	continue
-	;;
-
-      -prefer-pic)
-	pic_mode=yes
-	continue
-	;;
-
-      -prefer-non-pic)
-	pic_mode=no
-	continue
-	;;
-      esac
-    done
-
-    func_quote_for_eval "$libobj"
-    test "X$libobj" != "X$func_quote_for_eval_result" \
-      && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"'	 &()|`$[]' \
-      && func_warning "libobj name \`$libobj' may not contain shell special characters."
-    func_dirname_and_basename "$obj" "/" ""
-    objname="$func_basename_result"
-    xdir="$func_dirname_result"
-    lobj=${xdir}$objdir/$objname
-
-    test -z "$base_compile" && \
-      func_fatal_help "you must specify a compilation command"
-
-    # Delete any leftover library objects.
-    if test "$build_old_libs" = yes; then
-      removelist="$obj $lobj $libobj ${libobj}T"
-    else
-      removelist="$lobj $libobj ${libobj}T"
-    fi
-
-    # On Cygwin there's no "real" PIC flag so we must build both object types
-    case $host_os in
-    cygwin* | mingw* | pw32* | os2* | cegcc*)
-      pic_mode=default
-      ;;
-    esac
-    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
-      # non-PIC code in shared libraries is not supported
-      pic_mode=default
-    fi
-
-    # Calculate the filename of the output object if compiler does
-    # not support -o with -c
-    if test "$compiler_c_o" = no; then
-      output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
-      lockfile="$output_obj.lock"
-    else
-      output_obj=
-      need_locks=no
-      lockfile=
-    fi
-
-    # Lock this critical section if it is needed
-    # We use this script file to make the link, it avoids creating a new file
-    if test "$need_locks" = yes; then
-      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
-	func_echo "Waiting for $lockfile to be removed"
-	sleep 2
-      done
-    elif test "$need_locks" = warn; then
-      if test -f "$lockfile"; then
-	$ECHO "\
-*** ERROR, $lockfile exists and contains:
-`cat $lockfile 2>/dev/null`
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$opt_dry_run || $RM $removelist
-	exit $EXIT_FAILURE
-      fi
-      func_append removelist " $output_obj"
-      $ECHO "$srcfile" > "$lockfile"
-    fi
-
-    $opt_dry_run || $RM $removelist
-    func_append removelist " $lockfile"
-    trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
-
-    func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
-    srcfile=$func_to_tool_file_result
-    func_quote_for_eval "$srcfile"
-    qsrcfile=$func_quote_for_eval_result
-
-    # Only build a PIC object if we are building libtool libraries.
-    if test "$build_libtool_libs" = yes; then
-      # Without this assignment, base_compile gets emptied.
-      fbsd_hideous_sh_bug=$base_compile
-
-      if test "$pic_mode" != no; then
-	command="$base_compile $qsrcfile $pic_flag"
-      else
-	# Don't build PIC code
-	command="$base_compile $qsrcfile"
-      fi
-
-      func_mkdir_p "$xdir$objdir"
-
-      if test -z "$output_obj"; then
-	# Place PIC objects in $objdir
-	func_append command " -o $lobj"
-      fi
-
-      func_show_eval_locale "$command"	\
-          'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
-
-      if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$ECHO "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$opt_dry_run || $RM $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed, then go on to compile the next one
-      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
-	func_show_eval '$MV "$output_obj" "$lobj"' \
-	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
-      fi
-
-      # Allow error messages only from the first compilation.
-      if test "$suppress_opt" = yes; then
-	suppress_output=' >/dev/null 2>&1'
-      fi
-    fi
-
-    # Only build a position-dependent object if we build old libraries.
-    if test "$build_old_libs" = yes; then
-      if test "$pic_mode" != yes; then
-	# Don't build PIC code
-	command="$base_compile $qsrcfile$pie_flag"
-      else
-	command="$base_compile $qsrcfile $pic_flag"
-      fi
-      if test "$compiler_c_o" = yes; then
-	func_append command " -o $obj"
-      fi
-
-      # Suppress compiler output if we already did a PIC compilation.
-      func_append command "$suppress_output"
-      func_show_eval_locale "$command" \
-        '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
-
-      if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$ECHO "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$opt_dry_run || $RM $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed
-      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
-	func_show_eval '$MV "$output_obj" "$obj"' \
-	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
-      fi
-    fi
-
-    $opt_dry_run || {
-      func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
-
-      # Unlock the critical section if it was locked
-      if test "$need_locks" != no; then
-	removelist=$lockfile
-        $RM "$lockfile"
-      fi
-    }
-
-    exit $EXIT_SUCCESS
-}
-
-$opt_help || {
-  test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
-}
-
-func_mode_help ()
-{
-    # We need to display help for each of the modes.
-    case $opt_mode in
-      "")
-        # Generic help is extracted from the usage comments
-        # at the start of this file.
-        func_help
-        ;;
-
-      clean)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
-
-Remove files from the build directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, object or program, all the files associated
-with it are deleted. Otherwise, only FILE itself is deleted using RM."
-        ;;
-
-      compile)
-      $ECHO \
-"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
-
-Compile a source file into a libtool library object.
-
-This mode accepts the following additional options:
-
-  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
-  -no-suppress      do not suppress compiler output for multiple passes
-  -prefer-pic       try to build PIC objects only
-  -prefer-non-pic   try to build non-PIC objects only
-  -shared           do not build a \`.o' file suitable for static linking
-  -static           only build a \`.o' file suitable for static linking
-  -Wc,FLAG          pass FLAG directly to the compiler
-
-COMPILE-COMMAND is a command to be used in creating a \`standard' object file
-from the given SOURCEFILE.
-
-The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix \`.c' with the
-library object suffix, \`.lo'."
-        ;;
-
-      execute)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
-
-Automatically set library path, then run a program.
-
-This mode accepts the following additional options:
-
-  -dlopen FILE      add the directory containing FILE to the library path
-
-This mode sets the library path environment variable according to \`-dlopen'
-flags.
-
-If any of the ARGS are libtool executable wrappers, then they are translated
-into their corresponding uninstalled binary, and any of their required library
-directories are added to the library path.
-
-Then, COMMAND is executed, with ARGS as arguments."
-        ;;
-
-      finish)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=finish [LIBDIR]...
-
-Complete the installation of libtool libraries.
-
-Each LIBDIR is a directory that contains libtool libraries.
-
-The commands that this mode executes may require superuser privileges.  Use
-the \`--dry-run' option if you just want to see what would be executed."
-        ;;
-
-      install)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...
-
-Install executables or libraries.
-
-INSTALL-COMMAND is the installation command.  The first component should be
-either the \`install' or \`cp' program.
-
-The following components of INSTALL-COMMAND are treated specially:
-
-  -inst-prefix-dir PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
-
-The rest of the components are interpreted as arguments to that command (only
-BSD-compatible install options are recognized)."
-        ;;
-
-      link)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=link LINK-COMMAND...
-
-Link object files or libraries together to form another library, or to
-create an executable program.
-
-LINK-COMMAND is a command using the C compiler that you would use to create
-a program from several object files.
-
-The following components of LINK-COMMAND are treated specially:
-
-  -all-static       do not do any dynamic linking at all
-  -avoid-version    do not add a version suffix if possible
-  -bindir BINDIR    specify path to binaries directory (for systems where
-                    libraries must be found in the PATH setting at runtime)
-  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
-  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
-  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-  -export-symbols SYMFILE
-                    try to export only the symbols listed in SYMFILE
-  -export-symbols-regex REGEX
-                    try to export only the symbols matching REGEX
-  -LLIBDIR          search LIBDIR for required installed libraries
-  -lNAME            OUTPUT-FILE requires the installed library libNAME
-  -module           build a library that can dlopened
-  -no-fast-install  disable the fast-install mode
-  -no-install       link a not-installable executable
-  -no-undefined     declare that a library does not refer to external symbols
-  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-  -objectlist FILE  Use a list of object files found in FILE to specify objects
-  -precious-files-regex REGEX
-                    don't remove output files matching REGEX
-  -release RELEASE  specify package release information
-  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
-  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -shared           only do dynamic linking of libtool libraries
-  -shrext SUFFIX    override the standard shared library file extension
-  -static           do not do any dynamic linking of uninstalled libtool libraries
-  -static-libtool-libs
-                    do not do any dynamic linking of libtool libraries
-  -version-info CURRENT[:REVISION[:AGE]]
-                    specify library version info [each variable defaults to 0]
-  -weak LIBNAME     declare that the target provides the LIBNAME interface
-  -Wc,FLAG
-  -Xcompiler FLAG   pass linker-specific FLAG directly to the compiler
-  -Wl,FLAG
-  -Xlinker FLAG     pass linker-specific FLAG directly to the linker
-  -XCClinker FLAG   pass link-specific FLAG to the compiler driver (CC)
-
-All other options (arguments beginning with \`-') are ignored.
-
-Every other argument is treated as a filename.  Files ending in \`.la' are
-treated as uninstalled libtool libraries, other files are standard or library
-object files.
-
-If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-only library objects (\`.lo' files) may be specified, and \`-rpath' is
-required, except when creating a convenience library.
-
-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-using \`ar' and \`ranlib', or on Windows using \`lib'.
-
-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
-is created, otherwise an executable program is created."
-        ;;
-
-      uninstall)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
-
-Remove libraries from an installation directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, all the files associated with it are deleted.
-Otherwise, only FILE itself is deleted using RM."
-        ;;
-
-      *)
-        func_fatal_help "invalid operation mode \`$opt_mode'"
-        ;;
-    esac
-
-    echo
-    $ECHO "Try \`$progname --help' for more information about other modes."
-}
-
-# Now that we've collected a possible --mode arg, show help if necessary
-if $opt_help; then
-  if test "$opt_help" = :; then
-    func_mode_help
-  else
-    {
-      func_help noexit
-      for opt_mode in compile link execute install finish uninstall clean; do
-	func_mode_help
-      done
-    } | sed -n '1p; 2,$s/^Usage:/  or: /p'
-    {
-      func_help noexit
-      for opt_mode in compile link execute install finish uninstall clean; do
-	echo
-	func_mode_help
-      done
-    } |
-    sed '1d
-      /^When reporting/,/^Report/{
-	H
-	d
-      }
-      $x
-      /information about other modes/d
-      /more detailed .*MODE/d
-      s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
-  fi
-  exit $?
-fi
-
-
-# func_mode_execute arg...
-func_mode_execute ()
-{
-    $opt_debug
-    # The first argument is the command name.
-    cmd="$nonopt"
-    test -z "$cmd" && \
-      func_fatal_help "you must specify a COMMAND"
-
-    # Handle -dlopen flags immediately.
-    for file in $opt_dlopen; do
-      test -f "$file" \
-	|| func_fatal_help "\`$file' is not a file"
-
-      dir=
-      case $file in
-      *.la)
-	func_resolve_sysroot "$file"
-	file=$func_resolve_sysroot_result
-
-	# Check to see that this really is a libtool archive.
-	func_lalib_unsafe_p "$file" \
-	  || func_fatal_help "\`$lib' is not a valid libtool archive"
-
-	# Read the libtool library.
-	dlname=
-	library_names=
-	func_source "$file"
-
-	# Skip this library if it cannot be dlopened.
-	if test -z "$dlname"; then
-	  # Warn if it was a shared library.
-	  test -n "$library_names" && \
-	    func_warning "\`$file' was not linked with \`-export-dynamic'"
-	  continue
-	fi
-
-	func_dirname "$file" "" "."
-	dir="$func_dirname_result"
-
-	if test -f "$dir/$objdir/$dlname"; then
-	  func_append dir "/$objdir"
-	else
-	  if test ! -f "$dir/$dlname"; then
-	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
-	  fi
-	fi
-	;;
-
-      *.lo)
-	# Just add the directory containing the .lo file.
-	func_dirname "$file" "" "."
-	dir="$func_dirname_result"
-	;;
-
-      *)
-	func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
-	continue
-	;;
-      esac
-
-      # Get the absolute pathname.
-      absdir=`cd "$dir" && pwd`
-      test -n "$absdir" && dir="$absdir"
-
-      # Now add the directory to shlibpath_var.
-      if eval "test -z \"\$$shlibpath_var\""; then
-	eval "$shlibpath_var=\"\$dir\""
-      else
-	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
-      fi
-    done
-
-    # This variable tells wrapper scripts just to set shlibpath_var
-    # rather than running their programs.
-    libtool_execute_magic="$magic"
-
-    # Check if any of the arguments is a wrapper script.
-    args=
-    for file
-    do
-      case $file in
-      -* | *.la | *.lo ) ;;
-      *)
-	# Do a test to see if this is really a libtool program.
-	if func_ltwrapper_script_p "$file"; then
-	  func_source "$file"
-	  # Transform arg to wrapped name.
-	  file="$progdir/$program"
-	elif func_ltwrapper_executable_p "$file"; then
-	  func_ltwrapper_scriptname "$file"
-	  func_source "$func_ltwrapper_scriptname_result"
-	  # Transform arg to wrapped name.
-	  file="$progdir/$program"
-	fi
-	;;
-      esac
-      # Quote arguments (to preserve shell metacharacters).
-      func_append_quoted args "$file"
-    done
-
-    if test "X$opt_dry_run" = Xfalse; then
-      if test -n "$shlibpath_var"; then
-	# Export the shlibpath_var.
-	eval "export $shlibpath_var"
-      fi
-
-      # Restore saved environment variables
-      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-      do
-	eval "if test \"\${save_$lt_var+set}\" = set; then
-                $lt_var=\$save_$lt_var; export $lt_var
-	      else
-		$lt_unset $lt_var
-	      fi"
-      done
-
-      # Now prepare to actually exec the command.
-      exec_cmd="\$cmd$args"
-    else
-      # Display what would be done.
-      if test -n "$shlibpath_var"; then
-	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
-	echo "export $shlibpath_var"
-      fi
-      $ECHO "$cmd$args"
-      exit $EXIT_SUCCESS
-    fi
-}
-
-test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
-
-
-# func_mode_finish arg...
-func_mode_finish ()
-{
-    $opt_debug
-    libs=
-    libdirs=
-    admincmds=
-
-    for opt in "$nonopt" ${1+"$@"}
-    do
-      if test -d "$opt"; then
-	func_append libdirs " $opt"
-
-      elif test -f "$opt"; then
-	if func_lalib_unsafe_p "$opt"; then
-	  func_append libs " $opt"
-	else
-	  func_warning "\`$opt' is not a valid libtool archive"
-	fi
-
-      else
-	func_fatal_error "invalid argument \`$opt'"
-      fi
-    done
-
-    if test -n "$libs"; then
-      if test -n "$lt_sysroot"; then
-        sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
-        sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
-      else
-        sysroot_cmd=
-      fi
-
-      # Remove sysroot references
-      if $opt_dry_run; then
-        for lib in $libs; do
-          echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
-        done
-      else
-        tmpdir=`func_mktempdir`
-        for lib in $libs; do
-	  sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
-	    > $tmpdir/tmp-la
-	  mv -f $tmpdir/tmp-la $lib
-	done
-        ${RM}r "$tmpdir"
-      fi
-    fi
-
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      for libdir in $libdirs; do
-	if test -n "$finish_cmds"; then
-	  # Do each command in the finish commands.
-	  func_execute_cmds "$finish_cmds" 'admincmds="$admincmds
-'"$cmd"'"'
-	fi
-	if test -n "$finish_eval"; then
-	  # Do the single finish_eval.
-	  eval cmds=\"$finish_eval\"
-	  $opt_dry_run || eval "$cmds" || func_append admincmds "
-       $cmds"
-	fi
-      done
-    fi
-
-    # Exit here if they wanted silent mode.
-    $opt_silent && exit $EXIT_SUCCESS
-
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      echo "----------------------------------------------------------------------"
-      echo "Libraries have been installed in:"
-      for libdir in $libdirs; do
-	$ECHO "   $libdir"
-      done
-      echo
-      echo "If you ever happen to want to link against installed libraries"
-      echo "in a given directory, LIBDIR, you must either use libtool, and"
-      echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
-      echo "flag during linking and do at least one of the following:"
-      if test -n "$shlibpath_var"; then
-	echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-	echo "     during execution"
-      fi
-      if test -n "$runpath_var"; then
-	echo "   - add LIBDIR to the \`$runpath_var' environment variable"
-	echo "     during linking"
-      fi
-      if test -n "$hardcode_libdir_flag_spec"; then
-	libdir=LIBDIR
-	eval flag=\"$hardcode_libdir_flag_spec\"
-
-	$ECHO "   - use the \`$flag' linker flag"
-      fi
-      if test -n "$admincmds"; then
-	$ECHO "   - have your system administrator run these commands:$admincmds"
-      fi
-      if test -f /etc/ld.so.conf; then
-	echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-      fi
-      echo
-
-      echo "See any operating system documentation about shared libraries for"
-      case $host in
-	solaris2.[6789]|solaris2.1[0-9])
-	  echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
-	  echo "pages."
-	  ;;
-	*)
-	  echo "more information, such as the ld(1) and ld.so(8) manual pages."
-	  ;;
-      esac
-      echo "----------------------------------------------------------------------"
-    fi
-    exit $EXIT_SUCCESS
-}
-
-test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
-
-
-# func_mode_install arg...
-func_mode_install ()
-{
-    $opt_debug
-    # There may be an optional sh(1) argument at the beginning of
-    # install_prog (especially on Windows NT).
-    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
-       # Allow the use of GNU shtool's install command.
-       case $nonopt in *shtool*) :;; *) false;; esac; then
-      # Aesthetically quote it.
-      func_quote_for_eval "$nonopt"
-      install_prog="$func_quote_for_eval_result "
-      arg=$1
-      shift
-    else
-      install_prog=
-      arg=$nonopt
-    fi
-
-    # The real first argument should be the name of the installation program.
-    # Aesthetically quote it.
-    func_quote_for_eval "$arg"
-    func_append install_prog "$func_quote_for_eval_result"
-    install_shared_prog=$install_prog
-    case " $install_prog " in
-      *[\\\ /]cp\ *) install_cp=: ;;
-      *) install_cp=false ;;
-    esac
-
-    # We need to accept at least all the BSD install flags.
-    dest=
-    files=
-    opts=
-    prev=
-    install_type=
-    isdir=no
-    stripme=
-    no_mode=:
-    for arg
-    do
-      arg2=
-      if test -n "$dest"; then
-	func_append files " $dest"
-	dest=$arg
-	continue
-      fi
-
-      case $arg in
-      -d) isdir=yes ;;
-      -f)
-	if $install_cp; then :; else
-	  prev=$arg
-	fi
-	;;
-      -g | -m | -o)
-	prev=$arg
-	;;
-      -s)
-	stripme=" -s"
-	continue
-	;;
-      -*)
-	;;
-      *)
-	# If the previous option needed an argument, then skip it.
-	if test -n "$prev"; then
-	  if test "x$prev" = x-m && test -n "$install_override_mode"; then
-	    arg2=$install_override_mode
-	    no_mode=false
-	  fi
-	  prev=
-	else
-	  dest=$arg
-	  continue
-	fi
-	;;
-      esac
-
-      # Aesthetically quote the argument.
-      func_quote_for_eval "$arg"
-      func_append install_prog " $func_quote_for_eval_result"
-      if test -n "$arg2"; then
-	func_quote_for_eval "$arg2"
-      fi
-      func_append install_shared_prog " $func_quote_for_eval_result"
-    done
-
-    test -z "$install_prog" && \
-      func_fatal_help "you must specify an install program"
-
-    test -n "$prev" && \
-      func_fatal_help "the \`$prev' option requires an argument"
-
-    if test -n "$install_override_mode" && $no_mode; then
-      if $install_cp; then :; else
-	func_quote_for_eval "$install_override_mode"
-	func_append install_shared_prog " -m $func_quote_for_eval_result"
-      fi
-    fi
-
-    if test -z "$files"; then
-      if test -z "$dest"; then
-	func_fatal_help "no file or destination specified"
-      else
-	func_fatal_help "you must specify a destination"
-      fi
-    fi
-
-    # Strip any trailing slash from the destination.
-    func_stripname '' '/' "$dest"
-    dest=$func_stripname_result
-
-    # Check to see that the destination is a directory.
-    test -d "$dest" && isdir=yes
-    if test "$isdir" = yes; then
-      destdir="$dest"
-      destname=
-    else
-      func_dirname_and_basename "$dest" "" "."
-      destdir="$func_dirname_result"
-      destname="$func_basename_result"
-
-      # Not a directory, so check to see that there is only one file specified.
-      set dummy $files; shift
-      test "$#" -gt 1 && \
-	func_fatal_help "\`$dest' is not a directory"
-    fi
-    case $destdir in
-    [\\/]* | [A-Za-z]:[\\/]*) ;;
-    *)
-      for file in $files; do
-	case $file in
-	*.lo) ;;
-	*)
-	  func_fatal_help "\`$destdir' must be an absolute directory name"
-	  ;;
-	esac
-      done
-      ;;
-    esac
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    staticlibs=
-    future_libdirs=
-    current_libdirs=
-    for file in $files; do
-
-      # Do each installation.
-      case $file in
-      *.$libext)
-	# Do the static libraries later.
-	func_append staticlibs " $file"
-	;;
-
-      *.la)
-	func_resolve_sysroot "$file"
-	file=$func_resolve_sysroot_result
-
-	# Check to see that this really is a libtool archive.
-	func_lalib_unsafe_p "$file" \
-	  || func_fatal_help "\`$file' is not a valid libtool archive"
-
-	library_names=
-	old_library=
-	relink_command=
-	func_source "$file"
-
-	# Add the libdir to current_libdirs if it is the destination.
-	if test "X$destdir" = "X$libdir"; then
-	  case "$current_libdirs " in
-	  *" $libdir "*) ;;
-	  *) func_append current_libdirs " $libdir" ;;
-	  esac
-	else
-	  # Note the libdir as a future libdir.
-	  case "$future_libdirs " in
-	  *" $libdir "*) ;;
-	  *) func_append future_libdirs " $libdir" ;;
-	  esac
-	fi
-
-	func_dirname "$file" "/" ""
-	dir="$func_dirname_result"
-	func_append dir "$objdir"
-
-	if test -n "$relink_command"; then
-	  # Determine the prefix the user has applied to our future dir.
-	  inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
-
-	  # Don't allow the user to place us outside of our expected
-	  # location b/c this prevents finding dependent libraries that
-	  # are installed to the same prefix.
-	  # At present, this check doesn't affect windows .dll's that
-	  # are installed into $libdir/../bin (currently, that works fine)
-	  # but it's something to keep an eye on.
-	  test "$inst_prefix_dir" = "$destdir" && \
-	    func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
-
-	  if test -n "$inst_prefix_dir"; then
-	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-	  else
-	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
-	  fi
-
-	  func_warning "relinking \`$file'"
-	  func_show_eval "$relink_command" \
-	    'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
-	fi
-
-	# See the names of the shared library.
-	set dummy $library_names; shift
-	if test -n "$1"; then
-	  realname="$1"
-	  shift
-
-	  srcname="$realname"
-	  test -n "$relink_command" && srcname="$realname"T
-
-	  # Install the shared library and build the symlinks.
-	  func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
-	      'exit $?'
-	  tstripme="$stripme"
-	  case $host_os in
-	  cygwin* | mingw* | pw32* | cegcc*)
-	    case $realname in
-	    *.dll.a)
-	      tstripme=""
-	      ;;
-	    esac
-	    ;;
-	  esac
-	  if test -n "$tstripme" && test -n "$striplib"; then
-	    func_show_eval "$striplib $destdir/$realname" 'exit $?'
-	  fi
-
-	  if test "$#" -gt 0; then
-	    # Delete the old symlinks, and create new ones.
-	    # Try `ln -sf' first, because the `ln' binary might depend on
-	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
-	    # so we also need to try rm && ln -s.
-	    for linkname
-	    do
-	      test "$linkname" != "$realname" \
-		&& func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })"
-	    done
-	  fi
-
-	  # Do each command in the postinstall commands.
-	  lib="$destdir/$realname"
-	  func_execute_cmds "$postinstall_cmds" 'exit $?'
-	fi
-
-	# Install the pseudo-library for information purposes.
-	func_basename "$file"
-	name="$func_basename_result"
-	instname="$dir/$name"i
-	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
-
-	# Maybe install the static library, too.
-	test -n "$old_library" && func_append staticlibs " $dir/$old_library"
-	;;
-
-      *.lo)
-	# Install (i.e. copy) a libtool object.
-
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  func_basename "$file"
-	  destfile="$func_basename_result"
-	  destfile="$destdir/$destfile"
-	fi
-
-	# Deduce the name of the destination old-style object file.
-	case $destfile in
-	*.lo)
-	  func_lo2o "$destfile"
-	  staticdest=$func_lo2o_result
-	  ;;
-	*.$objext)
-	  staticdest="$destfile"
-	  destfile=
-	  ;;
-	*)
-	  func_fatal_help "cannot copy a libtool object to \`$destfile'"
-	  ;;
-	esac
-
-	# Install the libtool object if requested.
-	test -n "$destfile" && \
-	  func_show_eval "$install_prog $file $destfile" 'exit $?'
-
-	# Install the old object if enabled.
-	if test "$build_old_libs" = yes; then
-	  # Deduce the name of the old-style object file.
-	  func_lo2o "$file"
-	  staticobj=$func_lo2o_result
-	  func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?'
-	fi
-	exit $EXIT_SUCCESS
-	;;
-
-      *)
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  func_basename "$file"
-	  destfile="$func_basename_result"
-	  destfile="$destdir/$destfile"
-	fi
-
-	# If the file is missing, and there is a .exe on the end, strip it
-	# because it is most likely a libtool script we actually want to
-	# install
-	stripped_ext=""
-	case $file in
-	  *.exe)
-	    if test ! -f "$file"; then
-	      func_stripname '' '.exe' "$file"
-	      file=$func_stripname_result
-	      stripped_ext=".exe"
-	    fi
-	    ;;
-	esac
-
-	# Do a test to see if this is really a libtool program.
-	case $host in
-	*cygwin* | *mingw*)
-	    if func_ltwrapper_executable_p "$file"; then
-	      func_ltwrapper_scriptname "$file"
-	      wrapper=$func_ltwrapper_scriptname_result
-	    else
-	      func_stripname '' '.exe' "$file"
-	      wrapper=$func_stripname_result
-	    fi
-	    ;;
-	*)
-	    wrapper=$file
-	    ;;
-	esac
-	if func_ltwrapper_script_p "$wrapper"; then
-	  notinst_deplibs=
-	  relink_command=
-
-	  func_source "$wrapper"
-
-	  # Check the variables that should have been set.
-	  test -z "$generated_by_libtool_version" && \
-	    func_fatal_error "invalid libtool wrapper script \`$wrapper'"
-
-	  finalize=yes
-	  for lib in $notinst_deplibs; do
-	    # Check to see that each library is installed.
-	    libdir=
-	    if test -f "$lib"; then
-	      func_source "$lib"
-	    fi
-	    libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
-	    if test -n "$libdir" && test ! -f "$libfile"; then
-	      func_warning "\`$lib' has not been installed in \`$libdir'"
-	      finalize=no
-	    fi
-	  done
-
-	  relink_command=
-	  func_source "$wrapper"
-
-	  outputname=
-	  if test "$fast_install" = no && test -n "$relink_command"; then
-	    $opt_dry_run || {
-	      if test "$finalize" = yes; then
-	        tmpdir=`func_mktempdir`
-		func_basename "$file$stripped_ext"
-		file="$func_basename_result"
-	        outputname="$tmpdir/$file"
-	        # Replace the output file specification.
-	        relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
-
-	        $opt_silent || {
-	          func_quote_for_expand "$relink_command"
-		  eval "func_echo $func_quote_for_expand_result"
-	        }
-	        if eval "$relink_command"; then :
-	          else
-		  func_error "error: relink \`$file' with the above command before installing it"
-		  $opt_dry_run || ${RM}r "$tmpdir"
-		  continue
-	        fi
-	        file="$outputname"
-	      else
-	        func_warning "cannot relink \`$file'"
-	      fi
-	    }
-	  else
-	    # Install the binary that we compiled earlier.
-	    file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
-	  fi
-	fi
-
-	# remove .exe since cygwin /usr/bin/install will append another
-	# one anyway
-	case $install_prog,$host in
-	*/usr/bin/install*,*cygwin*)
-	  case $file:$destfile in
-	  *.exe:*.exe)
-	    # this is ok
-	    ;;
-	  *.exe:*)
-	    destfile=$destfile.exe
-	    ;;
-	  *:*.exe)
-	    func_stripname '' '.exe' "$destfile"
-	    destfile=$func_stripname_result
-	    ;;
-	  esac
-	  ;;
-	esac
-	func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?'
-	$opt_dry_run || if test -n "$outputname"; then
-	  ${RM}r "$tmpdir"
-	fi
-	;;
-      esac
-    done
-
-    for file in $staticlibs; do
-      func_basename "$file"
-      name="$func_basename_result"
-
-      # Set up the ranlib parameters.
-      oldlib="$destdir/$name"
-      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
-      tool_oldlib=$func_to_tool_file_result
-
-      func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
-
-      if test -n "$stripme" && test -n "$old_striplib"; then
-	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
-      fi
-
-      # Do each command in the postinstall commands.
-      func_execute_cmds "$old_postinstall_cmds" 'exit $?'
-    done
-
-    test -n "$future_libdirs" && \
-      func_warning "remember to run \`$progname --finish$future_libdirs'"
-
-    if test -n "$current_libdirs"; then
-      # Maybe just do a dry run.
-      $opt_dry_run && current_libdirs=" -n$current_libdirs"
-      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
-    else
-      exit $EXIT_SUCCESS
-    fi
-}
-
-test "$opt_mode" = install && func_mode_install ${1+"$@"}
-
-
-# func_generate_dlsyms outputname originator pic_p
-# Extract symbols from dlprefiles and create ${outputname}S.o with
-# a dlpreopen symbol table.
-func_generate_dlsyms ()
-{
-    $opt_debug
-    my_outputname="$1"
-    my_originator="$2"
-    my_pic_p="${3-no}"
-    my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
-    my_dlsyms=
-
-    if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-      if test -n "$NM" && test -n "$global_symbol_pipe"; then
-	my_dlsyms="${my_outputname}S.c"
-      else
-	func_error "not configured to extract global symbols from dlpreopened files"
-      fi
-    fi
-
-    if test -n "$my_dlsyms"; then
-      case $my_dlsyms in
-      "") ;;
-      *.c)
-	# Discover the nlist of each of the dlfiles.
-	nlist="$output_objdir/${my_outputname}.nm"
-
-	func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
-
-	# Parse the name list into a source file.
-	func_verbose "creating $output_objdir/$my_dlsyms"
-
-	$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
-/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
-/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
-
-#ifdef __cplusplus
-extern \"C\" {
-#endif
-
-#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
-#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
-#endif
-
-/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
-   relocations are performed -- see ld's documentation on pseudo-relocs.  */
-# define LT_DLSYM_CONST
-#elif defined(__osf__)
-/* This system does not cope well with relocations in const data.  */
-# define LT_DLSYM_CONST
-#else
-# define LT_DLSYM_CONST const
-#endif
-
-/* External symbol declarations for the compiler. */\
-"
-
-	if test "$dlself" = yes; then
-	  func_verbose "generating symbol list for \`$output'"
-
-	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
-
-	  # Add our own program objects to the symbol list.
-	  progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
-	  for progfile in $progfiles; do
-	    func_to_tool_file "$progfile" func_convert_file_msys_to_w32
-	    func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
-	    $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
-	  done
-
-	  if test -n "$exclude_expsyms"; then
-	    $opt_dry_run || {
-	      eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
-	      eval '$MV "$nlist"T "$nlist"'
-	    }
-	  fi
-
-	  if test -n "$export_symbols_regex"; then
-	    $opt_dry_run || {
-	      eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
-	      eval '$MV "$nlist"T "$nlist"'
-	    }
-	  fi
-
-	  # Prepare the list of exported symbols
-	  if test -z "$export_symbols"; then
-	    export_symbols="$output_objdir/$outputname.exp"
-	    $opt_dry_run || {
-	      $RM $export_symbols
-	      eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
-	      case $host in
-	      *cygwin* | *mingw* | *cegcc* )
-                eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-                eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
-	        ;;
-	      esac
-	    }
-	  else
-	    $opt_dry_run || {
-	      eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
-	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
-	      eval '$MV "$nlist"T "$nlist"'
-	      case $host in
-	        *cygwin* | *mingw* | *cegcc* )
-	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
-	          ;;
-	      esac
-	    }
-	  fi
-	fi
-
-	for dlprefile in $dlprefiles; do
-	  func_verbose "extracting global C symbols from \`$dlprefile'"
-	  func_basename "$dlprefile"
-	  name="$func_basename_result"
-          case $host in
-	    *cygwin* | *mingw* | *cegcc* )
-	      # if an import library, we need to obtain dlname
-	      if func_win32_import_lib_p "$dlprefile"; then
-	        func_tr_sh "$dlprefile"
-	        eval "curr_lafile=\$libfile_$func_tr_sh_result"
-	        dlprefile_dlbasename=""
-	        if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
-	          # Use subshell, to avoid clobbering current variable values
-	          dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
-	          if test -n "$dlprefile_dlname" ; then
-	            func_basename "$dlprefile_dlname"
-	            dlprefile_dlbasename="$func_basename_result"
-	          else
-	            # no lafile. user explicitly requested -dlpreopen <import library>.
-	            $sharedlib_from_linklib_cmd "$dlprefile"
-	            dlprefile_dlbasename=$sharedlib_from_linklib_result
-	          fi
-	        fi
-	        $opt_dry_run || {
-	          if test -n "$dlprefile_dlbasename" ; then
-	            eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
-	          else
-	            func_warning "Could not compute DLL name from $name"
-	            eval '$ECHO ": $name " >> "$nlist"'
-	          fi
-	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
-	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
-	            $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
-	        }
-	      else # not an import lib
-	        $opt_dry_run || {
-	          eval '$ECHO ": $name " >> "$nlist"'
-	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
-	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
-	        }
-	      fi
-	    ;;
-	    *)
-	      $opt_dry_run || {
-	        eval '$ECHO ": $name " >> "$nlist"'
-	        func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
-	        eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
-	      }
-	    ;;
-          esac
-	done
-
-	$opt_dry_run || {
-	  # Make sure we have at least an empty file.
-	  test -f "$nlist" || : > "$nlist"
-
-	  if test -n "$exclude_expsyms"; then
-	    $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
-	    $MV "$nlist"T "$nlist"
-	  fi
-
-	  # Try sorting and uniquifying the output.
-	  if $GREP -v "^: " < "$nlist" |
-	      if sort -k 3 </dev/null >/dev/null 2>&1; then
-		sort -k 3
-	      else
-		sort +2
-	      fi |
-	      uniq > "$nlist"S; then
-	    :
-	  else
-	    $GREP -v "^: " < "$nlist" > "$nlist"S
-	  fi
-
-	  if test -f "$nlist"S; then
-	    eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
-	  else
-	    echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
-	  fi
-
-	  echo >> "$output_objdir/$my_dlsyms" "\
-
-/* The mapping between symbol names and symbols.  */
-typedef struct {
-  const char *name;
-  void *address;
-} lt_dlsymlist;
-extern LT_DLSYM_CONST lt_dlsymlist
-lt_${my_prefix}_LTX_preloaded_symbols[];
-LT_DLSYM_CONST lt_dlsymlist
-lt_${my_prefix}_LTX_preloaded_symbols[] =
-{\
-  { \"$my_originator\", (void *) 0 },"
-
-	  case $need_lib_prefix in
-	  no)
-	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms"
-	    ;;
-	  *)
-	    eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
-	    ;;
-	  esac
-	  echo >> "$output_objdir/$my_dlsyms" "\
-  {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt_${my_prefix}_LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif\
-"
-	} # !$opt_dry_run
-
-	pic_flag_for_symtable=
-	case "$compile_command " in
-	*" -static "*) ;;
-	*)
-	  case $host in
-	  # compiling the symbol table file with pic_flag works around
-	  # a FreeBSD bug that causes programs to crash when -lm is
-	  # linked before any other PIC object.  But we must not use
-	  # pic_flag when linking with -static.  The problem exists in
-	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
-	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
-	  *-*-hpux*)
-	    pic_flag_for_symtable=" $pic_flag"  ;;
-	  *)
-	    if test "X$my_pic_p" != Xno; then
-	      pic_flag_for_symtable=" $pic_flag"
-	    fi
-	    ;;
-	  esac
-	  ;;
-	esac
-	symtab_cflags=
-	for arg in $LTCFLAGS; do
-	  case $arg in
-	  -pie | -fpie | -fPIE) ;;
-	  *) func_append symtab_cflags " $arg" ;;
-	  esac
-	done
-
-	# Now compile the dynamic symbol file.
-	func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
-
-	# Clean up the generated files.
-	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'
-
-	# Transform the symbol file into the correct name.
-	symfileobj="$output_objdir/${my_outputname}S.$objext"
-	case $host in
-	*cygwin* | *mingw* | *cegcc* )
-	  if test -f "$output_objdir/$my_outputname.def"; then
-	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-	  else
-	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-	  fi
-	  ;;
-	*)
-	  compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-	  finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-	  ;;
-	esac
-	;;
-      *)
-	func_fatal_error "unknown suffix for \`$my_dlsyms'"
-	;;
-      esac
-    else
-      # We keep going just in case the user didn't refer to
-      # lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
-      # really was required.
-
-      # Nullify the symbol file.
-      compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
-      finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
-    fi
-}
-
-# func_win32_libid arg
-# return the library type of file 'arg'
-#
-# Need a lot of goo to handle *both* DLLs and import libs
-# Has to be a shell function in order to 'eat' the argument
-# that is supplied when $file_magic_command is called.
-# Despite the name, also deal with 64 bit binaries.
-func_win32_libid ()
-{
-  $opt_debug
-  win32_libid_type="unknown"
-  win32_fileres=`file -L $1 2>/dev/null`
-  case $win32_fileres in
-  *ar\ archive\ import\ library*) # definitely import
-    win32_libid_type="x86 archive import"
-    ;;
-  *ar\ archive*) # could be an import, or static
-    # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
-    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
-       $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
-      func_to_tool_file "$1" func_convert_file_msys_to_w32
-      win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
-	$SED -n -e '
-	    1,100{
-		/ I /{
-		    s,.*,import,
-		    p
-		    q
-		}
-	    }'`
-      case $win32_nmres in
-      import*)  win32_libid_type="x86 archive import";;
-      *)        win32_libid_type="x86 archive static";;
-      esac
-    fi
-    ;;
-  *DLL*)
-    win32_libid_type="x86 DLL"
-    ;;
-  *executable*) # but shell scripts are "executable" too...
-    case $win32_fileres in
-    *MS\ Windows\ PE\ Intel*)
-      win32_libid_type="x86 DLL"
-      ;;
-    esac
-    ;;
-  esac
-  $ECHO "$win32_libid_type"
-}
-
-# func_cygming_dll_for_implib ARG
-#
-# Platform-specific function to extract the
-# name of the DLL associated with the specified
-# import library ARG.
-# Invoked by eval'ing the libtool variable
-#    $sharedlib_from_linklib_cmd
-# Result is available in the variable
-#    $sharedlib_from_linklib_result
-func_cygming_dll_for_implib ()
-{
-  $opt_debug
-  sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
-}
-
-# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
-#
-# The is the core of a fallback implementation of a
-# platform-specific function to extract the name of the
-# DLL associated with the specified import library LIBNAME.
-#
-# SECTION_NAME is either .idata$6 or .idata$7, depending
-# on the platform and compiler that created the implib.
-#
-# Echos the name of the DLL associated with the
-# specified import library.
-func_cygming_dll_for_implib_fallback_core ()
-{
-  $opt_debug
-  match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
-  $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
-    $SED '/^Contents of section '"$match_literal"':/{
-      # Place marker at beginning of archive member dllname section
-      s/.*/====MARK====/
-      p
-      d
-    }
-    # These lines can sometimes be longer than 43 characters, but
-    # are always uninteresting
-    /:[	 ]*file format pe[i]\{,1\}-/d
-    /^In archive [^:]*:/d
-    # Ensure marker is printed
-    /^====MARK====/p
-    # Remove all lines with less than 43 characters
-    /^.\{43\}/!d
-    # From remaining lines, remove first 43 characters
-    s/^.\{43\}//' |
-    $SED -n '
-      # Join marker and all lines until next marker into a single line
-      /^====MARK====/ b para
-      H
-      $ b para
-      b
-      :para
-      x
-      s/\n//g
-      # Remove the marker
-      s/^====MARK====//
-      # Remove trailing dots and whitespace
-      s/[\. \t]*$//
-      # Print
-      /./p' |
-    # we now have a list, one entry per line, of the stringified
-    # contents of the appropriate section of all members of the
-    # archive which possess that section. Heuristic: eliminate
-    # all those which have a first or second character that is
-    # a '.' (that is, objdump's representation of an unprintable
-    # character.) This should work for all archives with less than
-    # 0x302f exports -- but will fail for DLLs whose name actually
-    # begins with a literal '.' or a single character followed by
-    # a '.'.
-    #
-    # Of those that remain, print the first one.
-    $SED -e '/^\./d;/^.\./d;q'
-}
-
-# func_cygming_gnu_implib_p ARG
-# This predicate returns with zero status (TRUE) if
-# ARG is a GNU/binutils-style import library. Returns
-# with nonzero status (FALSE) otherwise.
-func_cygming_gnu_implib_p ()
-{
-  $opt_debug
-  func_to_tool_file "$1" func_convert_file_msys_to_w32
-  func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
-  test -n "$func_cygming_gnu_implib_tmp"
-}
-
-# func_cygming_ms_implib_p ARG
-# This predicate returns with zero status (TRUE) if
-# ARG is an MS-style import library. Returns
-# with nonzero status (FALSE) otherwise.
-func_cygming_ms_implib_p ()
-{
-  $opt_debug
-  func_to_tool_file "$1" func_convert_file_msys_to_w32
-  func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
-  test -n "$func_cygming_ms_implib_tmp"
-}
-
-# func_cygming_dll_for_implib_fallback ARG
-# Platform-specific function to extract the
-# name of the DLL associated with the specified
-# import library ARG.
-#
-# This fallback implementation is for use when $DLLTOOL
-# does not support the --identify-strict option.
-# Invoked by eval'ing the libtool variable
-#    $sharedlib_from_linklib_cmd
-# Result is available in the variable
-#    $sharedlib_from_linklib_result
-func_cygming_dll_for_implib_fallback ()
-{
-  $opt_debug
-  if func_cygming_gnu_implib_p "$1" ; then
-    # binutils import library
-    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
-  elif func_cygming_ms_implib_p "$1" ; then
-    # ms-generated import library
-    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
-  else
-    # unknown
-    sharedlib_from_linklib_result=""
-  fi
-}
-
-
-# func_extract_an_archive dir oldlib
-func_extract_an_archive ()
-{
-    $opt_debug
-    f_ex_an_ar_dir="$1"; shift
-    f_ex_an_ar_oldlib="$1"
-    if test "$lock_old_archive_extraction" = yes; then
-      lockfile=$f_ex_an_ar_oldlib.lock
-      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
-	func_echo "Waiting for $lockfile to be removed"
-	sleep 2
-      done
-    fi
-    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
-		   'stat=$?; rm -f "$lockfile"; exit $stat'
-    if test "$lock_old_archive_extraction" = yes; then
-      $opt_dry_run || rm -f "$lockfile"
-    fi
-    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
-     :
-    else
-      func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib"
-    fi
-}
-
-
-# func_extract_archives gentop oldlib ...
-func_extract_archives ()
-{
-    $opt_debug
-    my_gentop="$1"; shift
-    my_oldlibs=${1+"$@"}
-    my_oldobjs=""
-    my_xlib=""
-    my_xabs=""
-    my_xdir=""
-
-    for my_xlib in $my_oldlibs; do
-      # Extract the objects.
-      case $my_xlib in
-	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
-	*) my_xabs=`pwd`"/$my_xlib" ;;
-      esac
-      func_basename "$my_xlib"
-      my_xlib="$func_basename_result"
-      my_xlib_u=$my_xlib
-      while :; do
-        case " $extracted_archives " in
-	*" $my_xlib_u "*)
-	  func_arith $extracted_serial + 1
-	  extracted_serial=$func_arith_result
-	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
-	*) break ;;
-	esac
-      done
-      extracted_archives="$extracted_archives $my_xlib_u"
-      my_xdir="$my_gentop/$my_xlib_u"
-
-      func_mkdir_p "$my_xdir"
-
-      case $host in
-      *-darwin*)
-	func_verbose "Extracting $my_xabs"
-	# Do not bother doing anything if just a dry run
-	$opt_dry_run || {
-	  darwin_orig_dir=`pwd`
-	  cd $my_xdir || exit $?
-	  darwin_archive=$my_xabs
-	  darwin_curdir=`pwd`
-	  darwin_base_archive=`basename "$darwin_archive"`
-	  darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
-	  if test -n "$darwin_arches"; then
-	    darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
-	    darwin_arch=
-	    func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
-	    for darwin_arch in  $darwin_arches ; do
-	      func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
-	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
-	      cd "$darwin_curdir"
-	      $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
-	    done # $darwin_arches
-            ## Okay now we've a bunch of thin objects, gotta fatten them up :)
-	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
-	    darwin_file=
-	    darwin_files=
-	    for darwin_file in $darwin_filelist; do
-	      darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
-	      $LIPO -create -output "$darwin_file" $darwin_files
-	    done # $darwin_filelist
-	    $RM -rf unfat-$$
-	    cd "$darwin_orig_dir"
-	  else
-	    cd $darwin_orig_dir
-	    func_extract_an_archive "$my_xdir" "$my_xabs"
-	  fi # $darwin_arches
-	} # !$opt_dry_run
-	;;
-      *)
-        func_extract_an_archive "$my_xdir" "$my_xabs"
-	;;
-      esac
-      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
-    done
-
-    func_extract_archives_result="$my_oldobjs"
-}
-
-
-# func_emit_wrapper [arg=no]
-#
-# Emit a libtool wrapper script on stdout.
-# Don't directly open a file because we may want to
-# incorporate the script contents within a cygwin/mingw
-# wrapper executable.  Must ONLY be called from within
-# func_mode_link because it depends on a number of variables
-# set therein.
-#
-# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
-# variable will take.  If 'yes', then the emitted script
-# will assume that the directory in which it is stored is
-# the $objdir directory.  This is a cygwin/mingw-specific
-# behavior.
-func_emit_wrapper ()
-{
-	func_emit_wrapper_arg1=${1-no}
-
-	$ECHO "\
-#! $SHELL
-
-# $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-#
-# The $output program cannot be directly executed until all the libtool
-# libraries that it depends on are installed.
-#
-# This wrapper script should never be moved out of the build directory.
-# If it is, it will not operate correctly.
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-sed_quote_subst='$sed_quote_subst'
-
-# Be Bourne compatible
-if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
-else
-  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
-fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-relink_command=\"$relink_command\"
-
-# This environment variable determines our operation mode.
-if test \"\$libtool_install_magic\" = \"$magic\"; then
-  # install mode needs the following variables:
-  generated_by_libtool_version='$macro_version'
-  notinst_deplibs='$notinst_deplibs'
-else
-  # When we are sourced in execute mode, \$file and \$ECHO are already set.
-  if test \"\$libtool_execute_magic\" != \"$magic\"; then
-    file=\"\$0\""
-
-    qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
-    $ECHO "\
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-\$1
-_LTECHO_EOF'
-}
-    ECHO=\"$qECHO\"
-  fi
-
-# Very basic option parsing. These options are (a) specific to
-# the libtool wrapper, (b) are identical between the wrapper
-# /script/ and the wrapper /executable/ which is used only on
-# windows platforms, and (c) all begin with the string "--lt-"
-# (application programs are unlikely to have options which match
-# this pattern).
-#
-# There are only two supported options: --lt-debug and
-# --lt-dump-script. There is, deliberately, no --lt-help.
-#
-# The first argument to this parsing function should be the
-# script's $0 value, followed by "$@".
-lt_option_debug=
-func_parse_lt_options ()
-{
-  lt_script_arg0=\$0
-  shift
-  for lt_opt
-  do
-    case \"\$lt_opt\" in
-    --lt-debug) lt_option_debug=1 ;;
-    --lt-dump-script)
-        lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
-        test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
-        lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
-        cat \"\$lt_dump_D/\$lt_dump_F\"
-        exit 0
-      ;;
-    --lt-*)
-        \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
-        exit 1
-      ;;
-    esac
-  done
-
-  # Print the debug banner immediately:
-  if test -n \"\$lt_option_debug\"; then
-    echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
-  fi
-}
-
-# Used when --lt-debug. Prints its arguments to stdout
-# (redirection is the responsibility of the caller)
-func_lt_dump_args ()
-{
-  lt_dump_args_N=1;
-  for lt_arg
-  do
-    \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
-    lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
-  done
-}
-
-# Core function for launching the target application
-func_exec_program_core ()
-{
-"
-  case $host in
-  # Backslashes separate directories on plain windows
-  *-*-mingw | *-*-os2* | *-cegcc*)
-    $ECHO "\
-      if test -n \"\$lt_option_debug\"; then
-        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
-        func_lt_dump_args \${1+\"\$@\"} 1>&2
-      fi
-      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-"
-    ;;
-
-  *)
-    $ECHO "\
-      if test -n \"\$lt_option_debug\"; then
-        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
-        func_lt_dump_args \${1+\"\$@\"} 1>&2
-      fi
-      exec \"\$progdir/\$program\" \${1+\"\$@\"}
-"
-    ;;
-  esac
-  $ECHO "\
-      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
-      exit 1
-}
-
-# A function to encapsulate launching the target application
-# Strips options in the --lt-* namespace from \$@ and
-# launches target application with the remaining arguments.
-func_exec_program ()
-{
-  case \" \$* \" in
-  *\\ --lt-*)
-    for lt_wr_arg
-    do
-      case \$lt_wr_arg in
-      --lt-*) ;;
-      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
-      esac
-      shift
-    done ;;
-  esac
-  func_exec_program_core \${1+\"\$@\"}
-}
-
-  # Parse options
-  func_parse_lt_options \"\$0\" \${1+\"\$@\"}
-
-  # Find the directory that this script lives in.
-  thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
-  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
-
-  # Follow symbolic links until we get to the real thisdir.
-  file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
-  while test -n \"\$file\"; do
-    destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
-
-    # If there was a directory component, then change thisdir.
-    if test \"x\$destdir\" != \"x\$file\"; then
-      case \"\$destdir\" in
-      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
-      *) thisdir=\"\$thisdir/\$destdir\" ;;
-      esac
-    fi
-
-    file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
-    file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
-  done
-
-  # Usually 'no', except on cygwin/mingw when embedded into
-  # the cwrapper.
-  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
-  if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
-    # special case for '.'
-    if test \"\$thisdir\" = \".\"; then
-      thisdir=\`pwd\`
-    fi
-    # remove .libs from thisdir
-    case \"\$thisdir\" in
-    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
-    $objdir )   thisdir=. ;;
-    esac
-  fi
-
-  # Try to get the absolute directory name.
-  absdir=\`cd \"\$thisdir\" && pwd\`
-  test -n \"\$absdir\" && thisdir=\"\$absdir\"
-"
-
-	if test "$fast_install" = yes; then
-	  $ECHO "\
-  program=lt-'$outputname'$exeext
-  progdir=\"\$thisdir/$objdir\"
-
-  if test ! -f \"\$progdir/\$program\" ||
-     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
-       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
-
-    file=\"\$\$-\$program\"
-
-    if test ! -d \"\$progdir\"; then
-      $MKDIR \"\$progdir\"
-    else
-      $RM \"\$progdir/\$file\"
-    fi"
-
-	  $ECHO "\
-
-    # relink executable if necessary
-    if test -n \"\$relink_command\"; then
-      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
-      else
-	$ECHO \"\$relink_command_output\" >&2
-	$RM \"\$progdir/\$file\"
-	exit 1
-      fi
-    fi
-
-    $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
-    { $RM \"\$progdir/\$program\";
-      $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; }
-    $RM \"\$progdir/\$file\"
-  fi"
-	else
-	  $ECHO "\
-  program='$outputname'
-  progdir=\"\$thisdir/$objdir\"
-"
-	fi
-
-	$ECHO "\
-
-  if test -f \"\$progdir/\$program\"; then"
-
-	# fixup the dll searchpath if we need to.
-	#
-	# Fix the DLL searchpath if we need to.  Do this before prepending
-	# to shlibpath, because on Windows, both are PATH and uninstalled
-	# libraries must come first.
-	if test -n "$dllsearchpath"; then
-	  $ECHO "\
-    # Add the dll search path components to the executable PATH
-    PATH=$dllsearchpath:\$PATH
-"
-	fi
-
-	# Export our shlibpath_var if we have one.
-	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-	  $ECHO "\
-    # Add our own library path to $shlibpath_var
-    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
-
-    # Some systems cannot cope with colon-terminated $shlibpath_var
-    # The second colon is a workaround for a bug in BeOS R4 sed
-    $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
-
-    export $shlibpath_var
-"
-	fi
-
-	$ECHO "\
-    if test \"\$libtool_execute_magic\" != \"$magic\"; then
-      # Run the actual program with our arguments.
-      func_exec_program \${1+\"\$@\"}
-    fi
-  else
-    # The program doesn't exist.
-    \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
-    \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
-    \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
-    exit 1
-  fi
-fi\
-"
-}
-
-
-# func_emit_cwrapperexe_src
-# emit the source code for a wrapper executable on stdout
-# Must ONLY be called from within func_mode_link because
-# it depends on a number of variable set therein.
-func_emit_cwrapperexe_src ()
-{
-	cat <<EOF
-
-/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
-   Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-
-   The $output program cannot be directly executed until all the libtool
-   libraries that it depends on are installed.
-
-   This wrapper executable should never be moved out of the build directory.
-   If it is, it will not operate correctly.
-*/
-EOF
-	    cat <<"EOF"
-#ifdef _MSC_VER
-# define _CRT_SECURE_NO_DEPRECATE 1
-#endif
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef _MSC_VER
-# include <direct.h>
-# include <process.h>
-# include <io.h>
-#else
-# include <unistd.h>
-# include <stdint.h>
-# ifdef __CYGWIN__
-#  include <io.h>
-# endif
-#endif
-#include <malloc.h>
-#include <stdarg.h>
-#include <assert.h>
-#include <string.h>
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-
-/* declarations of non-ANSI functions */
-#if defined(__MINGW32__)
-# ifdef __STRICT_ANSI__
-int _putenv (const char *);
-# endif
-#elif defined(__CYGWIN__)
-# ifdef __STRICT_ANSI__
-char *realpath (const char *, char *);
-int putenv (char *);
-int setenv (const char *, const char *, int);
-# endif
-/* #elif defined (other platforms) ... */
-#endif
-
-/* portability defines, excluding path handling macros */
-#if defined(_MSC_VER)
-# define setmode _setmode
-# define stat    _stat
-# define chmod   _chmod
-# define getcwd  _getcwd
-# define putenv  _putenv
-# define S_IXUSR _S_IEXEC
-# ifndef _INTPTR_T_DEFINED
-#  define _INTPTR_T_DEFINED
-#  define intptr_t int
-# endif
-#elif defined(__MINGW32__)
-# define setmode _setmode
-# define stat    _stat
-# define chmod   _chmod
-# define getcwd  _getcwd
-# define putenv  _putenv
-#elif defined(__CYGWIN__)
-# define HAVE_SETENV
-# define FOPEN_WB "wb"
-/* #elif defined (other platforms) ... */
-#endif
-
-#if defined(PATH_MAX)
-# define LT_PATHMAX PATH_MAX
-#elif defined(MAXPATHLEN)
-# define LT_PATHMAX MAXPATHLEN
-#else
-# define LT_PATHMAX 1024
-#endif
-
-#ifndef S_IXOTH
-# define S_IXOTH 0
-#endif
-#ifndef S_IXGRP
-# define S_IXGRP 0
-#endif
-
-/* path handling portability macros */
-#ifndef DIR_SEPARATOR
-# define DIR_SEPARATOR '/'
-# define PATH_SEPARATOR ':'
-#endif
-
-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
-  defined (__OS2__)
-# define HAVE_DOS_BASED_FILE_SYSTEM
-# define FOPEN_WB "wb"
-# ifndef DIR_SEPARATOR_2
-#  define DIR_SEPARATOR_2 '\\'
-# endif
-# ifndef PATH_SEPARATOR_2
-#  define PATH_SEPARATOR_2 ';'
-# endif
-#endif
-
-#ifndef DIR_SEPARATOR_2
-# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
-#else /* DIR_SEPARATOR_2 */
-# define IS_DIR_SEPARATOR(ch) \
-	(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
-#endif /* DIR_SEPARATOR_2 */
-
-#ifndef PATH_SEPARATOR_2
-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
-#else /* PATH_SEPARATOR_2 */
-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
-#endif /* PATH_SEPARATOR_2 */
-
-#ifndef FOPEN_WB
-# define FOPEN_WB "w"
-#endif
-#ifndef _O_BINARY
-# define _O_BINARY 0
-#endif
-
-#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
-#define XFREE(stale) do { \
-  if (stale) { free ((void *) stale); stale = 0; } \
-} while (0)
-
-#if defined(LT_DEBUGWRAPPER)
-static int lt_debug = 1;
-#else
-static int lt_debug = 0;
-#endif
-
-const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
-
-void *xmalloc (size_t num);
-char *xstrdup (const char *string);
-const char *base_name (const char *name);
-char *find_executable (const char *wrapper);
-char *chase_symlinks (const char *pathspec);
-int make_executable (const char *path);
-int check_executable (const char *path);
-char *strendzap (char *str, const char *pat);
-void lt_debugprintf (const char *file, int line, const char *fmt, ...);
-void lt_fatal (const char *file, int line, const char *message, ...);
-static const char *nonnull (const char *s);
-static const char *nonempty (const char *s);
-void lt_setenv (const char *name, const char *value);
-char *lt_extend_str (const char *orig_value, const char *add, int to_end);
-void lt_update_exe_path (const char *name, const char *value);
-void lt_update_lib_path (const char *name, const char *value);
-char **prepare_spawn (char **argv);
-void lt_dump_script (FILE *f);
-EOF
-
-	    cat <<EOF
-volatile const char * MAGIC_EXE = "$magic_exe";
-const char * LIB_PATH_VARNAME = "$shlibpath_var";
-EOF
-
-	    if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-              func_to_host_path "$temp_rpath"
-	      cat <<EOF
-const char * LIB_PATH_VALUE   = "$func_to_host_path_result";
-EOF
-	    else
-	      cat <<"EOF"
-const char * LIB_PATH_VALUE   = "";
-EOF
-	    fi
-
-	    if test -n "$dllsearchpath"; then
-              func_to_host_path "$dllsearchpath:"
-	      cat <<EOF
-const char * EXE_PATH_VARNAME = "PATH";
-const char * EXE_PATH_VALUE   = "$func_to_host_path_result";
-EOF
-	    else
-	      cat <<"EOF"
-const char * EXE_PATH_VARNAME = "";
-const char * EXE_PATH_VALUE   = "";
-EOF
-	    fi
-
-	    if test "$fast_install" = yes; then
-	      cat <<EOF
-const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
-EOF
-	    else
-	      cat <<EOF
-const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */
-EOF
-	    fi
-
-
-	    cat <<"EOF"
-
-#define LTWRAPPER_OPTION_PREFIX         "--lt-"
-
-static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
-static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
-static const char *debug_opt            = LTWRAPPER_OPTION_PREFIX "debug";
-
-int
-main (int argc, char *argv[])
-{
-  char **newargz;
-  int  newargc;
-  char *tmp_pathspec;
-  char *actual_cwrapper_path;
-  char *actual_cwrapper_name;
-  char *target_name;
-  char *lt_argv_zero;
-  intptr_t rval = 127;
-
-  int i;
-
-  program_name = (char *) xstrdup (base_name (argv[0]));
-  newargz = XMALLOC (char *, argc + 1);
-
-  /* very simple arg parsing; don't want to rely on getopt
-   * also, copy all non cwrapper options to newargz, except
-   * argz[0], which is handled differently
-   */
-  newargc=0;
-  for (i = 1; i < argc; i++)
-    {
-      if (strcmp (argv[i], dumpscript_opt) == 0)
-	{
-EOF
-	    case "$host" in
-	      *mingw* | *cygwin* )
-		# make stdout use "unix" line endings
-		echo "          setmode(1,_O_BINARY);"
-		;;
-	      esac
-
-	    cat <<"EOF"
-	  lt_dump_script (stdout);
-	  return 0;
-	}
-      if (strcmp (argv[i], debug_opt) == 0)
-	{
-          lt_debug = 1;
-          continue;
-	}
-      if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
-        {
-          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
-             namespace, but it is not one of the ones we know about and
-             have already dealt with, above (inluding dump-script), then
-             report an error. Otherwise, targets might begin to believe
-             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
-             namespace. The first time any user complains about this, we'll
-             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
-             or a configure.ac-settable value.
-           */
-          lt_fatal (__FILE__, __LINE__,
-		    "unrecognized %s option: '%s'",
-                    ltwrapper_option_prefix, argv[i]);
-        }
-      /* otherwise ... */
-      newargz[++newargc] = xstrdup (argv[i]);
-    }
-  newargz[++newargc] = NULL;
-
-EOF
-	    cat <<EOF
-  /* The GNU banner must be the first non-error debug message */
-  lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
-EOF
-	    cat <<"EOF"
-  lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
-  lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
-
-  tmp_pathspec = find_executable (argv[0]);
-  if (tmp_pathspec == NULL)
-    lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
-  lt_debugprintf (__FILE__, __LINE__,
-                  "(main) found exe (before symlink chase) at: %s\n",
-		  tmp_pathspec);
-
-  actual_cwrapper_path = chase_symlinks (tmp_pathspec);
-  lt_debugprintf (__FILE__, __LINE__,
-                  "(main) found exe (after symlink chase) at: %s\n",
-		  actual_cwrapper_path);
-  XFREE (tmp_pathspec);
-
-  actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
-  strendzap (actual_cwrapper_path, actual_cwrapper_name);
-
-  /* wrapper name transforms */
-  strendzap (actual_cwrapper_name, ".exe");
-  tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1);
-  XFREE (actual_cwrapper_name);
-  actual_cwrapper_name = tmp_pathspec;
-  tmp_pathspec = 0;
-
-  /* target_name transforms -- use actual target program name; might have lt- prefix */
-  target_name = xstrdup (base_name (TARGET_PROGRAM_NAME));
-  strendzap (target_name, ".exe");
-  tmp_pathspec = lt_extend_str (target_name, ".exe", 1);
-  XFREE (target_name);
-  target_name = tmp_pathspec;
-  tmp_pathspec = 0;
-
-  lt_debugprintf (__FILE__, __LINE__,
-		  "(main) libtool target name: %s\n",
-		  target_name);
-EOF
-
-	    cat <<EOF
-  newargz[0] =
-    XMALLOC (char, (strlen (actual_cwrapper_path) +
-		    strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1));
-  strcpy (newargz[0], actual_cwrapper_path);
-  strcat (newargz[0], "$objdir");
-  strcat (newargz[0], "/");
-EOF
-
-	    cat <<"EOF"
-  /* stop here, and copy so we don't have to do this twice */
-  tmp_pathspec = xstrdup (newargz[0]);
-
-  /* do NOT want the lt- prefix here, so use actual_cwrapper_name */
-  strcat (newargz[0], actual_cwrapper_name);
-
-  /* DO want the lt- prefix here if it exists, so use target_name */
-  lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1);
-  XFREE (tmp_pathspec);
-  tmp_pathspec = NULL;
-EOF
-
-	    case $host_os in
-	      mingw*)
-	    cat <<"EOF"
-  {
-    char* p;
-    while ((p = strchr (newargz[0], '\\')) != NULL)
-      {
-	*p = '/';
-      }
-    while ((p = strchr (lt_argv_zero, '\\')) != NULL)
-      {
-	*p = '/';
-      }
-  }
-EOF
-	    ;;
-	    esac
-
-	    cat <<"EOF"
-  XFREE (target_name);
-  XFREE (actual_cwrapper_path);
-  XFREE (actual_cwrapper_name);
-
-  lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
-  lt_setenv ("DUALCASE", "1");  /* for MSK sh */
-  /* Update the DLL searchpath.  EXE_PATH_VALUE ($dllsearchpath) must
-     be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
-     because on Windows, both *_VARNAMEs are PATH but uninstalled
-     libraries must come first. */
-  lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
-  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
-
-  lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
-		  nonnull (lt_argv_zero));
-  for (i = 0; i < newargc; i++)
-    {
-      lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
-		      i, nonnull (newargz[i]));
-    }
-
-EOF
-
-	    case $host_os in
-	      mingw*)
-		cat <<"EOF"
-  /* execv doesn't actually work on mingw as expected on unix */
-  newargz = prepare_spawn (newargz);
-  rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
-  if (rval == -1)
-    {
-      /* failed to start process */
-      lt_debugprintf (__FILE__, __LINE__,
-		      "(main) failed to launch target \"%s\": %s\n",
-		      lt_argv_zero, nonnull (strerror (errno)));
-      return 127;
-    }
-  return rval;
-EOF
-		;;
-	      *)
-		cat <<"EOF"
-  execv (lt_argv_zero, newargz);
-  return rval; /* =127, but avoids unused variable warning */
-EOF
-		;;
-	    esac
-
-	    cat <<"EOF"
-}
-
-void *
-xmalloc (size_t num)
-{
-  void *p = (void *) malloc (num);
-  if (!p)
-    lt_fatal (__FILE__, __LINE__, "memory exhausted");
-
-  return p;
-}
-
-char *
-xstrdup (const char *string)
-{
-  return string ? strcpy ((char *) xmalloc (strlen (string) + 1),
-			  string) : NULL;
-}
-
-const char *
-base_name (const char *name)
-{
-  const char *base;
-
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  /* Skip over the disk name in MSDOS pathnames. */
-  if (isalpha ((unsigned char) name[0]) && name[1] == ':')
-    name += 2;
-#endif
-
-  for (base = name; *name; name++)
-    if (IS_DIR_SEPARATOR (*name))
-      base = name + 1;
-  return base;
-}
-
-int
-check_executable (const char *path)
-{
-  struct stat st;
-
-  lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
-                  nonempty (path));
-  if ((!path) || (!*path))
-    return 0;
-
-  if ((stat (path, &st) >= 0)
-      && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
-    return 1;
-  else
-    return 0;
-}
-
-int
-make_executable (const char *path)
-{
-  int rval = 0;
-  struct stat st;
-
-  lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
-                  nonempty (path));
-  if ((!path) || (!*path))
-    return 0;
-
-  if (stat (path, &st) >= 0)
-    {
-      rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR);
-    }
-  return rval;
-}
-
-/* Searches for the full path of the wrapper.  Returns
-   newly allocated full path name if found, NULL otherwise
-   Does not chase symlinks, even on platforms that support them.
-*/
-char *
-find_executable (const char *wrapper)
-{
-  int has_slash = 0;
-  const char *p;
-  const char *p_next;
-  /* static buffer for getcwd */
-  char tmp[LT_PATHMAX + 1];
-  int tmp_len;
-  char *concat_name;
-
-  lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
-                  nonempty (wrapper));
-
-  if ((wrapper == NULL) || (*wrapper == '\0'))
-    return NULL;
-
-  /* Absolute path? */
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
-    {
-      concat_name = xstrdup (wrapper);
-      if (check_executable (concat_name))
-	return concat_name;
-      XFREE (concat_name);
-    }
-  else
-    {
-#endif
-      if (IS_DIR_SEPARATOR (wrapper[0]))
-	{
-	  concat_name = xstrdup (wrapper);
-	  if (check_executable (concat_name))
-	    return concat_name;
-	  XFREE (concat_name);
-	}
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-    }
-#endif
-
-  for (p = wrapper; *p; p++)
-    if (*p == '/')
-      {
-	has_slash = 1;
-	break;
-      }
-  if (!has_slash)
-    {
-      /* no slashes; search PATH */
-      const char *path = getenv ("PATH");
-      if (path != NULL)
-	{
-	  for (p = path; *p; p = p_next)
-	    {
-	      const char *q;
-	      size_t p_len;
-	      for (q = p; *q; q++)
-		if (IS_PATH_SEPARATOR (*q))
-		  break;
-	      p_len = q - p;
-	      p_next = (*q == '\0' ? q : q + 1);
-	      if (p_len == 0)
-		{
-		  /* empty path: current directory */
-		  if (getcwd (tmp, LT_PATHMAX) == NULL)
-		    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
-                              nonnull (strerror (errno)));
-		  tmp_len = strlen (tmp);
-		  concat_name =
-		    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-		  memcpy (concat_name, tmp, tmp_len);
-		  concat_name[tmp_len] = '/';
-		  strcpy (concat_name + tmp_len + 1, wrapper);
-		}
-	      else
-		{
-		  concat_name =
-		    XMALLOC (char, p_len + 1 + strlen (wrapper) + 1);
-		  memcpy (concat_name, p, p_len);
-		  concat_name[p_len] = '/';
-		  strcpy (concat_name + p_len + 1, wrapper);
-		}
-	      if (check_executable (concat_name))
-		return concat_name;
-	      XFREE (concat_name);
-	    }
-	}
-      /* not found in PATH; assume curdir */
-    }
-  /* Relative path | not found in path: prepend cwd */
-  if (getcwd (tmp, LT_PATHMAX) == NULL)
-    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
-              nonnull (strerror (errno)));
-  tmp_len = strlen (tmp);
-  concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-  memcpy (concat_name, tmp, tmp_len);
-  concat_name[tmp_len] = '/';
-  strcpy (concat_name + tmp_len + 1, wrapper);
-
-  if (check_executable (concat_name))
-    return concat_name;
-  XFREE (concat_name);
-  return NULL;
-}
-
-char *
-chase_symlinks (const char *pathspec)
-{
-#ifndef S_ISLNK
-  return xstrdup (pathspec);
-#else
-  char buf[LT_PATHMAX];
-  struct stat s;
-  char *tmp_pathspec = xstrdup (pathspec);
-  char *p;
-  int has_symlinks = 0;
-  while (strlen (tmp_pathspec) && !has_symlinks)
-    {
-      lt_debugprintf (__FILE__, __LINE__,
-		      "checking path component for symlinks: %s\n",
-		      tmp_pathspec);
-      if (lstat (tmp_pathspec, &s) == 0)
-	{
-	  if (S_ISLNK (s.st_mode) != 0)
-	    {
-	      has_symlinks = 1;
-	      break;
-	    }
-
-	  /* search backwards for last DIR_SEPARATOR */
-	  p = tmp_pathspec + strlen (tmp_pathspec) - 1;
-	  while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
-	    p--;
-	  if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
-	    {
-	      /* no more DIR_SEPARATORS left */
-	      break;
-	    }
-	  *p = '\0';
-	}
-      else
-	{
-	  lt_fatal (__FILE__, __LINE__,
-		    "error accessing file \"%s\": %s",
-		    tmp_pathspec, nonnull (strerror (errno)));
-	}
-    }
-  XFREE (tmp_pathspec);
-
-  if (!has_symlinks)
-    {
-      return xstrdup (pathspec);
-    }
-
-  tmp_pathspec = realpath (pathspec, buf);
-  if (tmp_pathspec == 0)
-    {
-      lt_fatal (__FILE__, __LINE__,
-		"could not follow symlinks for %s", pathspec);
-    }
-  return xstrdup (tmp_pathspec);
-#endif
-}
-
-char *
-strendzap (char *str, const char *pat)
-{
-  size_t len, patlen;
-
-  assert (str != NULL);
-  assert (pat != NULL);
-
-  len = strlen (str);
-  patlen = strlen (pat);
-
-  if (patlen <= len)
-    {
-      str += len - patlen;
-      if (strcmp (str, pat) == 0)
-	*str = '\0';
-    }
-  return str;
-}
-
-void
-lt_debugprintf (const char *file, int line, const char *fmt, ...)
-{
-  va_list args;
-  if (lt_debug)
-    {
-      (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
-      va_start (args, fmt);
-      (void) vfprintf (stderr, fmt, args);
-      va_end (args);
-    }
-}
-
-static void
-lt_error_core (int exit_status, const char *file,
-	       int line, const char *mode,
-	       const char *message, va_list ap)
-{
-  fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
-  vfprintf (stderr, message, ap);
-  fprintf (stderr, ".\n");
-
-  if (exit_status >= 0)
-    exit (exit_status);
-}
-
-void
-lt_fatal (const char *file, int line, const char *message, ...)
-{
-  va_list ap;
-  va_start (ap, message);
-  lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
-  va_end (ap);
-}
-
-static const char *
-nonnull (const char *s)
-{
-  return s ? s : "(null)";
-}
-
-static const char *
-nonempty (const char *s)
-{
-  return (s && !*s) ? "(empty)" : nonnull (s);
-}
-
-void
-lt_setenv (const char *name, const char *value)
-{
-  lt_debugprintf (__FILE__, __LINE__,
-		  "(lt_setenv) setting '%s' to '%s'\n",
-                  nonnull (name), nonnull (value));
-  {
-#ifdef HAVE_SETENV
-    /* always make a copy, for consistency with !HAVE_SETENV */
-    char *str = xstrdup (value);
-    setenv (name, str, 1);
-#else
-    int len = strlen (name) + 1 + strlen (value) + 1;
-    char *str = XMALLOC (char, len);
-    sprintf (str, "%s=%s", name, value);
-    if (putenv (str) != EXIT_SUCCESS)
-      {
-        XFREE (str);
-      }
-#endif
-  }
-}
-
-char *
-lt_extend_str (const char *orig_value, const char *add, int to_end)
-{
-  char *new_value;
-  if (orig_value && *orig_value)
-    {
-      int orig_value_len = strlen (orig_value);
-      int add_len = strlen (add);
-      new_value = XMALLOC (char, add_len + orig_value_len + 1);
-      if (to_end)
-        {
-          strcpy (new_value, orig_value);
-          strcpy (new_value + orig_value_len, add);
-        }
-      else
-        {
-          strcpy (new_value, add);
-          strcpy (new_value + add_len, orig_value);
-        }
-    }
-  else
-    {
-      new_value = xstrdup (add);
-    }
-  return new_value;
-}
-
-void
-lt_update_exe_path (const char *name, const char *value)
-{
-  lt_debugprintf (__FILE__, __LINE__,
-		  "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
-                  nonnull (name), nonnull (value));
-
-  if (name && *name && value && *value)
-    {
-      char *new_value = lt_extend_str (getenv (name), value, 0);
-      /* some systems can't cope with a ':'-terminated path #' */
-      int len = strlen (new_value);
-      while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
-        {
-          new_value[len-1] = '\0';
-        }
-      lt_setenv (name, new_value);
-      XFREE (new_value);
-    }
-}
-
-void
-lt_update_lib_path (const char *name, const char *value)
-{
-  lt_debugprintf (__FILE__, __LINE__,
-		  "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
-                  nonnull (name), nonnull (value));
-
-  if (name && *name && value && *value)
-    {
-      char *new_value = lt_extend_str (getenv (name), value, 0);
-      lt_setenv (name, new_value);
-      XFREE (new_value);
-    }
-}
-
-EOF
-	    case $host_os in
-	      mingw*)
-		cat <<"EOF"
-
-/* Prepares an argument vector before calling spawn().
-   Note that spawn() does not by itself call the command interpreter
-     (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
-      ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-         GetVersionEx(&v);
-         v.dwPlatformId == VER_PLATFORM_WIN32_NT;
-      }) ? "cmd.exe" : "command.com").
-   Instead it simply concatenates the arguments, separated by ' ', and calls
-   CreateProcess().  We must quote the arguments since Win32 CreateProcess()
-   interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
-   special way:
-   - Space and tab are interpreted as delimiters. They are not treated as
-     delimiters if they are surrounded by double quotes: "...".
-   - Unescaped double quotes are removed from the input. Their only effect is
-     that within double quotes, space and tab are treated like normal
-     characters.
-   - Backslashes not followed by double quotes are not special.
-   - But 2*n+1 backslashes followed by a double quote become
-     n backslashes followed by a double quote (n >= 0):
-       \" -> "
-       \\\" -> \"
-       \\\\\" -> \\"
- */
-#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
-#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
-char **
-prepare_spawn (char **argv)
-{
-  size_t argc;
-  char **new_argv;
-  size_t i;
-
-  /* Count number of arguments.  */
-  for (argc = 0; argv[argc] != NULL; argc++)
-    ;
-
-  /* Allocate new argument vector.  */
-  new_argv = XMALLOC (char *, argc + 1);
-
-  /* Put quoted arguments into the new argument vector.  */
-  for (i = 0; i < argc; i++)
-    {
-      const char *string = argv[i];
-
-      if (string[0] == '\0')
-	new_argv[i] = xstrdup ("\"\"");
-      else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
-	{
-	  int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
-	  size_t length;
-	  unsigned int backslashes;
-	  const char *s;
-	  char *quoted_string;
-	  char *p;
-
-	  length = 0;
-	  backslashes = 0;
-	  if (quote_around)
-	    length++;
-	  for (s = string; *s != '\0'; s++)
-	    {
-	      char c = *s;
-	      if (c == '"')
-		length += backslashes + 1;
-	      length++;
-	      if (c == '\\')
-		backslashes++;
-	      else
-		backslashes = 0;
-	    }
-	  if (quote_around)
-	    length += backslashes + 1;
-
-	  quoted_string = XMALLOC (char, length + 1);
-
-	  p = quoted_string;
-	  backslashes = 0;
-	  if (quote_around)
-	    *p++ = '"';
-	  for (s = string; *s != '\0'; s++)
-	    {
-	      char c = *s;
-	      if (c == '"')
-		{
-		  unsigned int j;
-		  for (j = backslashes + 1; j > 0; j--)
-		    *p++ = '\\';
-		}
-	      *p++ = c;
-	      if (c == '\\')
-		backslashes++;
-	      else
-		backslashes = 0;
-	    }
-	  if (quote_around)
-	    {
-	      unsigned int j;
-	      for (j = backslashes; j > 0; j--)
-		*p++ = '\\';
-	      *p++ = '"';
-	    }
-	  *p = '\0';
-
-	  new_argv[i] = quoted_string;
-	}
-      else
-	new_argv[i] = (char *) string;
-    }
-  new_argv[argc] = NULL;
-
-  return new_argv;
-}
-EOF
-		;;
-	    esac
-
-            cat <<"EOF"
-void lt_dump_script (FILE* f)
-{
-EOF
-	    func_emit_wrapper yes |
-	      $SED -n -e '
-s/^\(.\{79\}\)\(..*\)/\1\
-\2/
-h
-s/\([\\"]\)/\\\1/g
-s/$/\\n/
-s/\([^\n]*\).*/  fputs ("\1", f);/p
-g
-D'
-            cat <<"EOF"
-}
-EOF
-}
-# end: func_emit_cwrapperexe_src
-
-# func_win32_import_lib_p ARG
-# True if ARG is an import lib, as indicated by $file_magic_cmd
-func_win32_import_lib_p ()
-{
-    $opt_debug
-    case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
-    *import*) : ;;
-    *) false ;;
-    esac
-}
-
-# func_mode_link arg...
-func_mode_link ()
-{
-    $opt_debug
-    case $host in
-    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-      # It is impossible to link a dll without this setting, and
-      # we shouldn't force the makefile maintainer to figure out
-      # which system we are compiling for in order to pass an extra
-      # flag for every libtool invocation.
-      # allow_undefined=no
-
-      # FIXME: Unfortunately, there are problems with the above when trying
-      # to make a dll which has undefined symbols, in which case not
-      # even a static library is built.  For now, we need to specify
-      # -no-undefined on the libtool link line when we can be certain
-      # that all symbols are satisfied, otherwise we get a static library.
-      allow_undefined=yes
-      ;;
-    *)
-      allow_undefined=yes
-      ;;
-    esac
-    libtool_args=$nonopt
-    base_compile="$nonopt $@"
-    compile_command=$nonopt
-    finalize_command=$nonopt
-
-    compile_rpath=
-    finalize_rpath=
-    compile_shlibpath=
-    finalize_shlibpath=
-    convenience=
-    old_convenience=
-    deplibs=
-    old_deplibs=
-    compiler_flags=
-    linker_flags=
-    dllsearchpath=
-    lib_search_path=`pwd`
-    inst_prefix_dir=
-    new_inherited_linker_flags=
-
-    avoid_version=no
-    bindir=
-    dlfiles=
-    dlprefiles=
-    dlself=no
-    export_dynamic=no
-    export_symbols=
-    export_symbols_regex=
-    generated=
-    libobjs=
-    ltlibs=
-    module=no
-    no_install=no
-    objs=
-    non_pic_objects=
-    precious_files_regex=
-    prefer_static_libs=no
-    preload=no
-    prev=
-    prevarg=
-    release=
-    rpath=
-    xrpath=
-    perm_rpath=
-    temp_rpath=
-    thread_safe=no
-    vinfo=
-    vinfo_number=no
-    weak_libs=
-    single_module="${wl}-single_module"
-    func_infer_tag $base_compile
-
-    # We need to know -static, to get the right output filenames.
-    for arg
-    do
-      case $arg in
-      -shared)
-	test "$build_libtool_libs" != yes && \
-	  func_fatal_configuration "can not build a shared library"
-	build_old_libs=no
-	break
-	;;
-      -all-static | -static | -static-libtool-libs)
-	case $arg in
-	-all-static)
-	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
-	    func_warning "complete static linking is impossible in this configuration"
-	  fi
-	  if test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=yes
-	  ;;
-	-static)
-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=built
-	  ;;
-	-static-libtool-libs)
-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=yes
-	  ;;
-	esac
-	build_libtool_libs=no
-	build_old_libs=yes
-	break
-	;;
-      esac
-    done
-
-    # See if our shared archives depend on static archives.
-    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
-
-    # Go through the arguments, transforming them on the way.
-    while test "$#" -gt 0; do
-      arg="$1"
-      shift
-      func_quote_for_eval "$arg"
-      qarg=$func_quote_for_eval_unquoted_result
-      func_append libtool_args " $func_quote_for_eval_result"
-
-      # If the previous option needs an argument, assign it.
-      if test -n "$prev"; then
-	case $prev in
-	output)
-	  func_append compile_command " @OUTPUT@"
-	  func_append finalize_command " @OUTPUT@"
-	  ;;
-	esac
-
-	case $prev in
-	bindir)
-	  bindir="$arg"
-	  prev=
-	  continue
-	  ;;
-	dlfiles|dlprefiles)
-	  if test "$preload" = no; then
-	    # Add the symbol object into the linking commands.
-	    func_append compile_command " @SYMFILE@"
-	    func_append finalize_command " @SYMFILE@"
-	    preload=yes
-	  fi
-	  case $arg in
-	  *.la | *.lo) ;;  # We handle these cases below.
-	  force)
-	    if test "$dlself" = no; then
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  self)
-	    if test "$prev" = dlprefiles; then
-	      dlself=yes
-	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
-	      dlself=yes
-	    else
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  *)
-	    if test "$prev" = dlfiles; then
-	      func_append dlfiles " $arg"
-	    else
-	      func_append dlprefiles " $arg"
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  esac
-	  ;;
-	expsyms)
-	  export_symbols="$arg"
-	  test -f "$arg" \
-	    || func_fatal_error "symbol file \`$arg' does not exist"
-	  prev=
-	  continue
-	  ;;
-	expsyms_regex)
-	  export_symbols_regex="$arg"
-	  prev=
-	  continue
-	  ;;
-	framework)
-	  case $host in
-	    *-*-darwin*)
-	      case "$deplibs " in
-		*" $qarg.ltframework "*) ;;
-		*) func_append deplibs " $qarg.ltframework" # this is fixed later
-		   ;;
-	      esac
-	      ;;
-	  esac
-	  prev=
-	  continue
-	  ;;
-	inst_prefix)
-	  inst_prefix_dir="$arg"
-	  prev=
-	  continue
-	  ;;
-	objectlist)
-	  if test -f "$arg"; then
-	    save_arg=$arg
-	    moreargs=
-	    for fil in `cat "$save_arg"`
-	    do
-#	      func_append moreargs " $fil"
-	      arg=$fil
-	      # A libtool-controlled object.
-
-	      # Check to see that this really is a libtool object.
-	      if func_lalib_unsafe_p "$arg"; then
-		pic_object=
-		non_pic_object=
-
-		# Read the .lo file
-		func_source "$arg"
-
-		if test -z "$pic_object" ||
-		   test -z "$non_pic_object" ||
-		   test "$pic_object" = none &&
-		   test "$non_pic_object" = none; then
-		  func_fatal_error "cannot find name of object for \`$arg'"
-		fi
-
-		# Extract subdirectory from the argument.
-		func_dirname "$arg" "/" ""
-		xdir="$func_dirname_result"
-
-		if test "$pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  pic_object="$xdir$pic_object"
-
-		  if test "$prev" = dlfiles; then
-		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		      func_append dlfiles " $pic_object"
-		      prev=
-		      continue
-		    else
-		      # If libtool objects are unsupported, then we need to preload.
-		      prev=dlprefiles
-		    fi
-		  fi
-
-		  # CHECK ME:  I think I busted this.  -Ossama
-		  if test "$prev" = dlprefiles; then
-		    # Preload the old-style object.
-		    func_append dlprefiles " $pic_object"
-		    prev=
-		  fi
-
-		  # A PIC object.
-		  func_append libobjs " $pic_object"
-		  arg="$pic_object"
-		fi
-
-		# Non-PIC object.
-		if test "$non_pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  non_pic_object="$xdir$non_pic_object"
-
-		  # A standard non-PIC object
-		  func_append non_pic_objects " $non_pic_object"
-		  if test -z "$pic_object" || test "$pic_object" = none ; then
-		    arg="$non_pic_object"
-		  fi
-		else
-		  # If the PIC object exists, use it instead.
-		  # $xdir was prepended to $pic_object above.
-		  non_pic_object="$pic_object"
-		  func_append non_pic_objects " $non_pic_object"
-		fi
-	      else
-		# Only an error if not doing a dry-run.
-		if $opt_dry_run; then
-		  # Extract subdirectory from the argument.
-		  func_dirname "$arg" "/" ""
-		  xdir="$func_dirname_result"
-
-		  func_lo2o "$arg"
-		  pic_object=$xdir$objdir/$func_lo2o_result
-		  non_pic_object=$xdir$func_lo2o_result
-		  func_append libobjs " $pic_object"
-		  func_append non_pic_objects " $non_pic_object"
-	        else
-		  func_fatal_error "\`$arg' is not a valid libtool object"
-		fi
-	      fi
-	    done
-	  else
-	    func_fatal_error "link input file \`$arg' does not exist"
-	  fi
-	  arg=$save_arg
-	  prev=
-	  continue
-	  ;;
-	precious_regex)
-	  precious_files_regex="$arg"
-	  prev=
-	  continue
-	  ;;
-	release)
-	  release="-$arg"
-	  prev=
-	  continue
-	  ;;
-	rpath | xrpath)
-	  # We need an absolute path.
-	  case $arg in
-	  [\\/]* | [A-Za-z]:[\\/]*) ;;
-	  *)
-	    func_fatal_error "only absolute run-paths are allowed"
-	    ;;
-	  esac
-	  if test "$prev" = rpath; then
-	    case "$rpath " in
-	    *" $arg "*) ;;
-	    *) func_append rpath " $arg" ;;
-	    esac
-	  else
-	    case "$xrpath " in
-	    *" $arg "*) ;;
-	    *) func_append xrpath " $arg" ;;
-	    esac
-	  fi
-	  prev=
-	  continue
-	  ;;
-	shrext)
-	  shrext_cmds="$arg"
-	  prev=
-	  continue
-	  ;;
-	weak)
-	  func_append weak_libs " $arg"
-	  prev=
-	  continue
-	  ;;
-	xcclinker)
-	  func_append linker_flags " $qarg"
-	  func_append compiler_flags " $qarg"
-	  prev=
-	  func_append compile_command " $qarg"
-	  func_append finalize_command " $qarg"
-	  continue
-	  ;;
-	xcompiler)
-	  func_append compiler_flags " $qarg"
-	  prev=
-	  func_append compile_command " $qarg"
-	  func_append finalize_command " $qarg"
-	  continue
-	  ;;
-	xlinker)
-	  func_append linker_flags " $qarg"
-	  func_append compiler_flags " $wl$qarg"
-	  prev=
-	  func_append compile_command " $wl$qarg"
-	  func_append finalize_command " $wl$qarg"
-	  continue
-	  ;;
-	*)
-	  eval "$prev=\"\$arg\""
-	  prev=
-	  continue
-	  ;;
-	esac
-      fi # test -n "$prev"
-
-      prevarg="$arg"
-
-      case $arg in
-      -all-static)
-	if test -n "$link_static_flag"; then
-	  # See comment for -static flag below, for more details.
-	  func_append compile_command " $link_static_flag"
-	  func_append finalize_command " $link_static_flag"
-	fi
-	continue
-	;;
-
-      -allow-undefined)
-	# FIXME: remove this flag sometime in the future.
-	func_fatal_error "\`-allow-undefined' must not be used because it is the default"
-	;;
-
-      -avoid-version)
-	avoid_version=yes
-	continue
-	;;
-
-      -bindir)
-	prev=bindir
-	continue
-	;;
-
-      -dlopen)
-	prev=dlfiles
-	continue
-	;;
-
-      -dlpreopen)
-	prev=dlprefiles
-	continue
-	;;
-
-      -export-dynamic)
-	export_dynamic=yes
-	continue
-	;;
-
-      -export-symbols | -export-symbols-regex)
-	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	  func_fatal_error "more than one -exported-symbols argument is not allowed"
-	fi
-	if test "X$arg" = "X-export-symbols"; then
-	  prev=expsyms
-	else
-	  prev=expsyms_regex
-	fi
-	continue
-	;;
-
-      -framework)
-	prev=framework
-	continue
-	;;
-
-      -inst-prefix-dir)
-	prev=inst_prefix
-	continue
-	;;
-
-      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
-      # so, if we see these flags be careful not to treat them like -L
-      -L[A-Z][A-Z]*:*)
-	case $with_gcc/$host in
-	no/*-*-irix* | /*-*-irix*)
-	  func_append compile_command " $arg"
-	  func_append finalize_command " $arg"
-	  ;;
-	esac
-	continue
-	;;
-
-      -L*)
-	func_stripname "-L" '' "$arg"
-	if test -z "$func_stripname_result"; then
-	  if test "$#" -gt 0; then
-	    func_fatal_error "require no space between \`-L' and \`$1'"
-	  else
-	    func_fatal_error "need path for \`-L' option"
-	  fi
-	fi
-	func_resolve_sysroot "$func_stripname_result"
-	dir=$func_resolve_sysroot_result
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	*)
-	  absdir=`cd "$dir" && pwd`
-	  test -z "$absdir" && \
-	    func_fatal_error "cannot determine absolute directory name of \`$dir'"
-	  dir="$absdir"
-	  ;;
-	esac
-	case "$deplibs " in
-	*" -L$dir "* | *" $arg "*)
-	  # Will only happen for absolute or sysroot arguments
-	  ;;
-	*)
-	  # Preserve sysroot, but never include relative directories
-	  case $dir in
-	    [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
-	    *) func_append deplibs " -L$dir" ;;
-	  esac
-	  func_append lib_search_path " $dir"
-	  ;;
-	esac
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-	  testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
-	  case :$dllsearchpath: in
-	  *":$dir:"*) ;;
-	  ::) dllsearchpath=$dir;;
-	  *) func_append dllsearchpath ":$dir";;
-	  esac
-	  case :$dllsearchpath: in
-	  *":$testbindir:"*) ;;
-	  ::) dllsearchpath=$testbindir;;
-	  *) func_append dllsearchpath ":$testbindir";;
-	  esac
-	  ;;
-	esac
-	continue
-	;;
-
-      -l*)
-	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
-	    # These systems don't actually have a C or math library (as such)
-	    continue
-	    ;;
-	  *-*-os2*)
-	    # These systems don't actually have a C library (as such)
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	    # Do not include libc due to us having libc/libc_r.
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C and math libraries are in the System framework
-	    func_append deplibs " System.ltframework"
-	    continue
-	    ;;
-	  *-*-sco3.2v5* | *-*-sco5v6*)
-	    # Causes problems with __ctype
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-	    # Compiler inserts libc in the correct place for threads to work
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  esac
-	elif test "X$arg" = "X-lc_r"; then
-	 case $host in
-	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	   # Do not include libc_r directly, use -pthread flag.
-	   continue
-	   ;;
-	 esac
-	fi
-	func_append deplibs " $arg"
-	continue
-	;;
-
-      -module)
-	module=yes
-	continue
-	;;
-
-      # Tru64 UNIX uses -model [arg] to determine the layout of C++
-      # classes, name mangling, and exception handling.
-      # Darwin uses the -arch flag to determine output architecture.
-      -model|-arch|-isysroot|--sysroot)
-	func_append compiler_flags " $arg"
-	func_append compile_command " $arg"
-	func_append finalize_command " $arg"
-	prev=xcompiler
-	continue
-	;;
-
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
-      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
-	func_append compiler_flags " $arg"
-	func_append compile_command " $arg"
-	func_append finalize_command " $arg"
-	case "$new_inherited_linker_flags " in
-	    *" $arg "*) ;;
-	    * ) func_append new_inherited_linker_flags " $arg" ;;
-	esac
-	continue
-	;;
-
-      -multi_module)
-	single_module="${wl}-multi_module"
-	continue
-	;;
-
-      -no-fast-install)
-	fast_install=no
-	continue
-	;;
-
-      -no-install)
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
-	  # The PATH hackery in wrapper scripts is required on Windows
-	  # and Darwin in order for the loader to find any dlls it needs.
-	  func_warning "\`-no-install' is ignored for $host"
-	  func_warning "assuming \`-no-fast-install' instead"
-	  fast_install=no
-	  ;;
-	*) no_install=yes ;;
-	esac
-	continue
-	;;
-
-      -no-undefined)
-	allow_undefined=no
-	continue
-	;;
-
-      -objectlist)
-	prev=objectlist
-	continue
-	;;
-
-      -o) prev=output ;;
-
-      -precious-files-regex)
-	prev=precious_regex
-	continue
-	;;
-
-      -release)
-	prev=release
-	continue
-	;;
-
-      -rpath)
-	prev=rpath
-	continue
-	;;
-
-      -R)
-	prev=xrpath
-	continue
-	;;
-
-      -R*)
-	func_stripname '-R' '' "$arg"
-	dir=$func_stripname_result
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	=*)
-	  func_stripname '=' '' "$dir"
-	  dir=$lt_sysroot$func_stripname_result
-	  ;;
-	*)
-	  func_fatal_error "only absolute run-paths are allowed"
-	  ;;
-	esac
-	case "$xrpath " in
-	*" $dir "*) ;;
-	*) func_append xrpath " $dir" ;;
-	esac
-	continue
-	;;
-
-      -shared)
-	# The effects of -shared are defined in a previous loop.
-	continue
-	;;
-
-      -shrext)
-	prev=shrext
-	continue
-	;;
-
-      -static | -static-libtool-libs)
-	# The effects of -static are defined in a previous loop.
-	# We used to do the same as -all-static on platforms that
-	# didn't have a PIC flag, but the assumption that the effects
-	# would be equivalent was wrong.  It would break on at least
-	# Digital Unix and AIX.
-	continue
-	;;
-
-      -thread-safe)
-	thread_safe=yes
-	continue
-	;;
-
-      -version-info)
-	prev=vinfo
-	continue
-	;;
-
-      -version-number)
-	prev=vinfo
-	vinfo_number=yes
-	continue
-	;;
-
-      -weak)
-        prev=weak
-	continue
-	;;
-
-      -Wc,*)
-	func_stripname '-Wc,' '' "$arg"
-	args=$func_stripname_result
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-          func_quote_for_eval "$flag"
-	  func_append arg " $func_quote_for_eval_result"
-	  func_append compiler_flags " $func_quote_for_eval_result"
-	done
-	IFS="$save_ifs"
-	func_stripname ' ' '' "$arg"
-	arg=$func_stripname_result
-	;;
-
-      -Wl,*)
-	func_stripname '-Wl,' '' "$arg"
-	args=$func_stripname_result
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-          func_quote_for_eval "$flag"
-	  func_append arg " $wl$func_quote_for_eval_result"
-	  func_append compiler_flags " $wl$func_quote_for_eval_result"
-	  func_append linker_flags " $func_quote_for_eval_result"
-	done
-	IFS="$save_ifs"
-	func_stripname ' ' '' "$arg"
-	arg=$func_stripname_result
-	;;
-
-      -Xcompiler)
-	prev=xcompiler
-	continue
-	;;
-
-      -Xlinker)
-	prev=xlinker
-	continue
-	;;
-
-      -XCClinker)
-	prev=xcclinker
-	continue
-	;;
-
-      # -msg_* for osf cc
-      -msg_*)
-	func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
-	;;
-
-      # Flags to be passed through unchanged, with rationale:
-      # -64, -mips[0-9]      enable 64-bit mode for the SGI compiler
-      # -r[0-9][0-9]*        specify processor for the SGI compiler
-      # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
-      # +DA*, +DD*           enable 64-bit mode for the HP compiler
-      # -q*                  compiler args for the IBM compiler
-      # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
-      # -F/path              path to uninstalled frameworks, gcc on darwin
-      # -p, -pg, --coverage, -fprofile-*  profiling flags for GCC
-      # @file                GCC response files
-      # -tp=*                Portland pgcc target processor selection
-      # --sysroot=*          for sysroot support
-      # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-      -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
-        func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
-        func_append compile_command " $arg"
-        func_append finalize_command " $arg"
-        func_append compiler_flags " $arg"
-        continue
-        ;;
-
-      # Some other compiler flag.
-      -* | +*)
-        func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
-	;;
-
-      *.$objext)
-	# A standard object.
-	func_append objs " $arg"
-	;;
-
-      *.lo)
-	# A libtool-controlled object.
-
-	# Check to see that this really is a libtool object.
-	if func_lalib_unsafe_p "$arg"; then
-	  pic_object=
-	  non_pic_object=
-
-	  # Read the .lo file
-	  func_source "$arg"
-
-	  if test -z "$pic_object" ||
-	     test -z "$non_pic_object" ||
-	     test "$pic_object" = none &&
-	     test "$non_pic_object" = none; then
-	    func_fatal_error "cannot find name of object for \`$arg'"
-	  fi
-
-	  # Extract subdirectory from the argument.
-	  func_dirname "$arg" "/" ""
-	  xdir="$func_dirname_result"
-
-	  if test "$pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    pic_object="$xdir$pic_object"
-
-	    if test "$prev" = dlfiles; then
-	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		func_append dlfiles " $pic_object"
-		prev=
-		continue
-	      else
-		# If libtool objects are unsupported, then we need to preload.
-		prev=dlprefiles
-	      fi
-	    fi
-
-	    # CHECK ME:  I think I busted this.  -Ossama
-	    if test "$prev" = dlprefiles; then
-	      # Preload the old-style object.
-	      func_append dlprefiles " $pic_object"
-	      prev=
-	    fi
-
-	    # A PIC object.
-	    func_append libobjs " $pic_object"
-	    arg="$pic_object"
-	  fi
-
-	  # Non-PIC object.
-	  if test "$non_pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    non_pic_object="$xdir$non_pic_object"
-
-	    # A standard non-PIC object
-	    func_append non_pic_objects " $non_pic_object"
-	    if test -z "$pic_object" || test "$pic_object" = none ; then
-	      arg="$non_pic_object"
-	    fi
-	  else
-	    # If the PIC object exists, use it instead.
-	    # $xdir was prepended to $pic_object above.
-	    non_pic_object="$pic_object"
-	    func_append non_pic_objects " $non_pic_object"
-	  fi
-	else
-	  # Only an error if not doing a dry-run.
-	  if $opt_dry_run; then
-	    # Extract subdirectory from the argument.
-	    func_dirname "$arg" "/" ""
-	    xdir="$func_dirname_result"
-
-	    func_lo2o "$arg"
-	    pic_object=$xdir$objdir/$func_lo2o_result
-	    non_pic_object=$xdir$func_lo2o_result
-	    func_append libobjs " $pic_object"
-	    func_append non_pic_objects " $non_pic_object"
-	  else
-	    func_fatal_error "\`$arg' is not a valid libtool object"
-	  fi
-	fi
-	;;
-
-      *.$libext)
-	# An archive.
-	func_append deplibs " $arg"
-	func_append old_deplibs " $arg"
-	continue
-	;;
-
-      *.la)
-	# A libtool-controlled library.
-
-	func_resolve_sysroot "$arg"
-	if test "$prev" = dlfiles; then
-	  # This library was specified with -dlopen.
-	  func_append dlfiles " $func_resolve_sysroot_result"
-	  prev=
-	elif test "$prev" = dlprefiles; then
-	  # The library was specified with -dlpreopen.
-	  func_append dlprefiles " $func_resolve_sysroot_result"
-	  prev=
-	else
-	  func_append deplibs " $func_resolve_sysroot_result"
-	fi
-	continue
-	;;
-
-      # Some other compiler argument.
-      *)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
-	;;
-      esac # arg
-
-      # Now actually substitute the argument into the commands.
-      if test -n "$arg"; then
-	func_append compile_command " $arg"
-	func_append finalize_command " $arg"
-      fi
-    done # argument parsing loop
-
-    test -n "$prev" && \
-      func_fatal_help "the \`$prevarg' option requires an argument"
-
-    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-      eval arg=\"$export_dynamic_flag_spec\"
-      func_append compile_command " $arg"
-      func_append finalize_command " $arg"
-    fi
-
-    oldlibs=
-    # calculate the name of the file, without its directory
-    func_basename "$output"
-    outputname="$func_basename_result"
-    libobjs_save="$libobjs"
-
-    if test -n "$shlibpath_var"; then
-      # get the directories listed in $shlibpath_var
-      eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
-    else
-      shlib_search_path=
-    fi
-    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
-    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
-
-    func_dirname "$output" "/" ""
-    output_objdir="$func_dirname_result$objdir"
-    func_to_tool_file "$output_objdir/"
-    tool_output_objdir=$func_to_tool_file_result
-    # Create the object directory.
-    func_mkdir_p "$output_objdir"
-
-    # Determine the type of output
-    case $output in
-    "")
-      func_fatal_help "you must specify an output file"
-      ;;
-    *.$libext) linkmode=oldlib ;;
-    *.lo | *.$objext) linkmode=obj ;;
-    *.la) linkmode=lib ;;
-    *) linkmode=prog ;; # Anything else should be a program.
-    esac
-
-    specialdeplibs=
-
-    libs=
-    # Find all interdependent deplibs by searching for libraries
-    # that are linked more than once (e.g. -la -lb -la)
-    for deplib in $deplibs; do
-      if $opt_preserve_dup_deps ; then
-	case "$libs " in
-	*" $deplib "*) func_append specialdeplibs " $deplib" ;;
-	esac
-      fi
-      func_append libs " $deplib"
-    done
-
-    if test "$linkmode" = lib; then
-      libs="$predeps $libs $compiler_lib_search_path $postdeps"
-
-      # Compute libraries that are listed more than once in $predeps
-      # $postdeps and mark them as special (i.e., whose duplicates are
-      # not to be eliminated).
-      pre_post_deps=
-      if $opt_duplicate_compiler_generated_deps; then
-	for pre_post_dep in $predeps $postdeps; do
-	  case "$pre_post_deps " in
-	  *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
-	  esac
-	  func_append pre_post_deps " $pre_post_dep"
-	done
-      fi
-      pre_post_deps=
-    fi
-
-    deplibs=
-    newdependency_libs=
-    newlib_search_path=
-    need_relink=no # whether we're linking any uninstalled libtool libraries
-    notinst_deplibs= # not-installed libtool libraries
-    notinst_path= # paths that contain not-installed libtool libraries
-
-    case $linkmode in
-    lib)
-	passes="conv dlpreopen link"
-	for file in $dlfiles $dlprefiles; do
-	  case $file in
-	  *.la) ;;
-	  *)
-	    func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
-	    ;;
-	  esac
-	done
-	;;
-    prog)
-	compile_deplibs=
-	finalize_deplibs=
-	alldeplibs=no
-	newdlfiles=
-	newdlprefiles=
-	passes="conv scan dlopen dlpreopen link"
-	;;
-    *)  passes="conv"
-	;;
-    esac
-
-    for pass in $passes; do
-      # The preopen pass in lib mode reverses $deplibs; put it back here
-      # so that -L comes before libs that need it for instance...
-      if test "$linkmode,$pass" = "lib,link"; then
-	## FIXME: Find the place where the list is rebuilt in the wrong
-	##        order, and fix it there properly
-        tmp_deplibs=
-	for deplib in $deplibs; do
-	  tmp_deplibs="$deplib $tmp_deplibs"
-	done
-	deplibs="$tmp_deplibs"
-      fi
-
-      if test "$linkmode,$pass" = "lib,link" ||
-	 test "$linkmode,$pass" = "prog,scan"; then
-	libs="$deplibs"
-	deplibs=
-      fi
-      if test "$linkmode" = prog; then
-	case $pass in
-	dlopen) libs="$dlfiles" ;;
-	dlpreopen) libs="$dlprefiles" ;;
-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
-	esac
-      fi
-      if test "$linkmode,$pass" = "lib,dlpreopen"; then
-	# Collect and forward deplibs of preopened libtool libs
-	for lib in $dlprefiles; do
-	  # Ignore non-libtool-libs
-	  dependency_libs=
-	  func_resolve_sysroot "$lib"
-	  case $lib in
-	  *.la)	func_source "$func_resolve_sysroot_result" ;;
-	  esac
-
-	  # Collect preopened libtool deplibs, except any this library
-	  # has declared as weak libs
-	  for deplib in $dependency_libs; do
-	    func_basename "$deplib"
-            deplib_base=$func_basename_result
-	    case " $weak_libs " in
-	    *" $deplib_base "*) ;;
-	    *) func_append deplibs " $deplib" ;;
-	    esac
-	  done
-	done
-	libs="$dlprefiles"
-      fi
-      if test "$pass" = dlopen; then
-	# Collect dlpreopened libraries
-	save_deplibs="$deplibs"
-	deplibs=
-      fi
-
-      for deplib in $libs; do
-	lib=
-	found=no
-	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
-        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
-	  if test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$deplib $compile_deplibs"
-	    finalize_deplibs="$deplib $finalize_deplibs"
-	  else
-	    func_append compiler_flags " $deplib"
-	    if test "$linkmode" = lib ; then
-		case "$new_inherited_linker_flags " in
-		    *" $deplib "*) ;;
-		    * ) func_append new_inherited_linker_flags " $deplib" ;;
-		esac
-	    fi
-	  fi
-	  continue
-	  ;;
-	-l*)
-	  if test "$linkmode" != lib && test "$linkmode" != prog; then
-	    func_warning "\`-l' is ignored for archives/objects"
-	    continue
-	  fi
-	  func_stripname '-l' '' "$deplib"
-	  name=$func_stripname_result
-	  if test "$linkmode" = lib; then
-	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
-	  else
-	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
-	  fi
-	  for searchdir in $searchdirs; do
-	    for search_ext in .la $std_shrext .so .a; do
-	      # Search the libtool library
-	      lib="$searchdir/lib${name}${search_ext}"
-	      if test -f "$lib"; then
-		if test "$search_ext" = ".la"; then
-		  found=yes
-		else
-		  found=no
-		fi
-		break 2
-	      fi
-	    done
-	  done
-	  if test "$found" != yes; then
-	    # deplib doesn't seem to be a libtool library
-	    if test "$linkmode,$pass" = "prog,link"; then
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      deplibs="$deplib $deplibs"
-	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    continue
-	  else # deplib is a libtool library
-	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
-	    # We need to do some special things here, and not later.
-	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	      case " $predeps $postdeps " in
-	      *" $deplib "*)
-		if func_lalib_p "$lib"; then
-		  library_names=
-		  old_library=
-		  func_source "$lib"
-		  for l in $old_library $library_names; do
-		    ll="$l"
-		  done
-		  if test "X$ll" = "X$old_library" ; then # only static version available
-		    found=no
-		    func_dirname "$lib" "" "."
-		    ladir="$func_dirname_result"
-		    lib=$ladir/$old_library
-		    if test "$linkmode,$pass" = "prog,link"; then
-		      compile_deplibs="$deplib $compile_deplibs"
-		      finalize_deplibs="$deplib $finalize_deplibs"
-		    else
-		      deplibs="$deplib $deplibs"
-		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-		    fi
-		    continue
-		  fi
-		fi
-		;;
-	      *) ;;
-	      esac
-	    fi
-	  fi
-	  ;; # -l
-	*.ltframework)
-	  if test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$deplib $compile_deplibs"
-	    finalize_deplibs="$deplib $finalize_deplibs"
-	  else
-	    deplibs="$deplib $deplibs"
-	    if test "$linkmode" = lib ; then
-		case "$new_inherited_linker_flags " in
-		    *" $deplib "*) ;;
-		    * ) func_append new_inherited_linker_flags " $deplib" ;;
-		esac
-	    fi
-	  fi
-	  continue
-	  ;;
-	-L*)
-	  case $linkmode in
-	  lib)
-	    deplibs="$deplib $deplibs"
-	    test "$pass" = conv && continue
-	    newdependency_libs="$deplib $newdependency_libs"
-	    func_stripname '-L' '' "$deplib"
-	    func_resolve_sysroot "$func_stripname_result"
-	    func_append newlib_search_path " $func_resolve_sysroot_result"
-	    ;;
-	  prog)
-	    if test "$pass" = conv; then
-	      deplibs="$deplib $deplibs"
-	      continue
-	    fi
-	    if test "$pass" = scan; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    func_stripname '-L' '' "$deplib"
-	    func_resolve_sysroot "$func_stripname_result"
-	    func_append newlib_search_path " $func_resolve_sysroot_result"
-	    ;;
-	  *)
-	    func_warning "\`-L' is ignored for archives/objects"
-	    ;;
-	  esac # linkmode
-	  continue
-	  ;; # -L
-	-R*)
-	  if test "$pass" = link; then
-	    func_stripname '-R' '' "$deplib"
-	    func_resolve_sysroot "$func_stripname_result"
-	    dir=$func_resolve_sysroot_result
-	    # Make sure the xrpath contains only unique directories.
-	    case "$xrpath " in
-	    *" $dir "*) ;;
-	    *) func_append xrpath " $dir" ;;
-	    esac
-	  fi
-	  deplibs="$deplib $deplibs"
-	  continue
-	  ;;
-	*.la)
-	  func_resolve_sysroot "$deplib"
-	  lib=$func_resolve_sysroot_result
-	  ;;
-	*.$libext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	    continue
-	  fi
-	  case $linkmode in
-	  lib)
-	    # Linking convenience modules into shared libraries is allowed,
-	    # but linking other static libraries is non-portable.
-	    case " $dlpreconveniencelibs " in
-	    *" $deplib "*) ;;
-	    *)
-	      valid_a_lib=no
-	      case $deplibs_check_method in
-		match_pattern*)
-		  set dummy $deplibs_check_method; shift
-		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
-		  if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
-		    | $EGREP "$match_pattern_regex" > /dev/null; then
-		    valid_a_lib=yes
-		  fi
-		;;
-		pass_all)
-		  valid_a_lib=yes
-		;;
-	      esac
-	      if test "$valid_a_lib" != yes; then
-		echo
-		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
-		echo "*** I have the capability to make that library automatically link in when"
-		echo "*** you link to this library.  But I can only do this if you have a"
-		echo "*** shared version of the library, which you do not appear to have"
-		echo "*** because the file extensions .$libext of this argument makes me believe"
-		echo "*** that it is just a static archive that I should not use here."
-	      else
-		echo
-		$ECHO "*** Warning: Linking the shared library $output against the"
-		$ECHO "*** static library $deplib is not portable!"
-		deplibs="$deplib $deplibs"
-	      fi
-	      ;;
-	    esac
-	    continue
-	    ;;
-	  prog)
-	    if test "$pass" != link; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    continue
-	    ;;
-	  esac # linkmode
-	  ;; # *.$libext
-	*.lo | *.$objext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	  elif test "$linkmode" = prog; then
-	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-	      # If there is no dlopen support or we're linking statically,
-	      # we need to preload.
-	      func_append newdlprefiles " $deplib"
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      func_append newdlfiles " $deplib"
-	    fi
-	  fi
-	  continue
-	  ;;
-	%DEPLIBS%)
-	  alldeplibs=yes
-	  continue
-	  ;;
-	esac # case $deplib
-
-	if test "$found" = yes || test -f "$lib"; then :
-	else
-	  func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
-	fi
-
-	# Check to see that this really is a libtool archive.
-	func_lalib_unsafe_p "$lib" \
-	  || func_fatal_error "\`$lib' is not a valid libtool archive"
-
-	func_dirname "$lib" "" "."
-	ladir="$func_dirname_result"
-
-	dlname=
-	dlopen=
-	dlpreopen=
-	libdir=
-	library_names=
-	old_library=
-	inherited_linker_flags=
-	# If the library was installed with an old release of libtool,
-	# it will not redefine variables installed, or shouldnotlink
-	installed=yes
-	shouldnotlink=no
-	avoidtemprpath=
-
-
-	# Read the .la file
-	func_source "$lib"
-
-	# Convert "-framework foo" to "foo.ltframework"
-	if test -n "$inherited_linker_flags"; then
-	  tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'`
-	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
-	    case " $new_inherited_linker_flags " in
-	      *" $tmp_inherited_linker_flag "*) ;;
-	      *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
-	    esac
-	  done
-	fi
-	dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	if test "$linkmode,$pass" = "lib,link" ||
-	   test "$linkmode,$pass" = "prog,scan" ||
-	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
-	  test -n "$dlopen" && func_append dlfiles " $dlopen"
-	  test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
-	fi
-
-	if test "$pass" = conv; then
-	  # Only check for convenience libraries
-	  deplibs="$lib $deplibs"
-	  if test -z "$libdir"; then
-	    if test -z "$old_library"; then
-	      func_fatal_error "cannot find name of link library for \`$lib'"
-	    fi
-	    # It is a libtool convenience library, so add in its objects.
-	    func_append convenience " $ladir/$objdir/$old_library"
-	    func_append old_convenience " $ladir/$objdir/$old_library"
-	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
-	    func_fatal_error "\`$lib' is not a convenience library"
-	  fi
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    deplibs="$deplib $deplibs"
-	    if $opt_preserve_dup_deps ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
-	      esac
-	    fi
-	    func_append tmp_libs " $deplib"
-	  done
-	  continue
-	fi # $pass = conv
-
-
-	# Get the name of the library we link against.
-	linklib=
-	if test -n "$old_library" &&
-	   { test "$prefer_static_libs" = yes ||
-	     test "$prefer_static_libs,$installed" = "built,no"; }; then
-	  linklib=$old_library
-	else
-	  for l in $old_library $library_names; do
-	    linklib="$l"
-	  done
-	fi
-	if test -z "$linklib"; then
-	  func_fatal_error "cannot find name of link library for \`$lib'"
-	fi
-
-	# This library was specified with -dlopen.
-	if test "$pass" = dlopen; then
-	  if test -z "$libdir"; then
-	    func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
-	  fi
-	  if test -z "$dlname" ||
-	     test "$dlopen_support" != yes ||
-	     test "$build_libtool_libs" = no; then
-	    # If there is no dlname, no dlopen support or we're linking
-	    # statically, we need to preload.  We also need to preload any
-	    # dependent libraries so libltdl's deplib preloader doesn't
-	    # bomb out in the load deplibs phase.
-	    func_append dlprefiles " $lib $dependency_libs"
-	  else
-	    func_append newdlfiles " $lib"
-	  fi
-	  continue
-	fi # $pass = dlopen
-
-	# We need an absolute path.
-	case $ladir in
-	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
-	*)
-	  abs_ladir=`cd "$ladir" && pwd`
-	  if test -z "$abs_ladir"; then
-	    func_warning "cannot determine absolute directory name of \`$ladir'"
-	    func_warning "passing it literally to the linker, although it might fail"
-	    abs_ladir="$ladir"
-	  fi
-	  ;;
-	esac
-	func_basename "$lib"
-	laname="$func_basename_result"
-
-	# Find the relevant object directory and library name.
-	if test "X$installed" = Xyes; then
-	  if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    func_warning "library \`$lib' was moved."
-	    dir="$ladir"
-	    absdir="$abs_ladir"
-	    libdir="$abs_ladir"
-	  else
-	    dir="$lt_sysroot$libdir"
-	    absdir="$lt_sysroot$libdir"
-	  fi
-	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
-	else
-	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    dir="$ladir"
-	    absdir="$abs_ladir"
-	    # Remove this search path later
-	    func_append notinst_path " $abs_ladir"
-	  else
-	    dir="$ladir/$objdir"
-	    absdir="$abs_ladir/$objdir"
-	    # Remove this search path later
-	    func_append notinst_path " $abs_ladir"
-	  fi
-	fi # $installed = yes
-	func_stripname 'lib' '.la' "$laname"
-	name=$func_stripname_result
-
-	# This library was specified with -dlpreopen.
-	if test "$pass" = dlpreopen; then
-	  if test -z "$libdir" && test "$linkmode" = prog; then
-	    func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
-	  fi
-	  case "$host" in
-	    # special handling for platforms with PE-DLLs.
-	    *cygwin* | *mingw* | *cegcc* )
-	      # Linker will automatically link against shared library if both
-	      # static and shared are present.  Therefore, ensure we extract
-	      # symbols from the import library if a shared library is present
-	      # (otherwise, the dlopen module name will be incorrect).  We do
-	      # this by putting the import library name into $newdlprefiles.
-	      # We recover the dlopen module name by 'saving' the la file
-	      # name in a special purpose variable, and (later) extracting the
-	      # dlname from the la file.
-	      if test -n "$dlname"; then
-	        func_tr_sh "$dir/$linklib"
-	        eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
-	        func_append newdlprefiles " $dir/$linklib"
-	      else
-	        func_append newdlprefiles " $dir/$old_library"
-	        # Keep a list of preopened convenience libraries to check
-	        # that they are being used correctly in the link pass.
-	        test -z "$libdir" && \
-	          func_append dlpreconveniencelibs " $dir/$old_library"
-	      fi
-	    ;;
-	    * )
-	      # Prefer using a static library (so that no silly _DYNAMIC symbols
-	      # are required to link).
-	      if test -n "$old_library"; then
-	        func_append newdlprefiles " $dir/$old_library"
-	        # Keep a list of preopened convenience libraries to check
-	        # that they are being used correctly in the link pass.
-	        test -z "$libdir" && \
-	          func_append dlpreconveniencelibs " $dir/$old_library"
-	      # Otherwise, use the dlname, so that lt_dlopen finds it.
-	      elif test -n "$dlname"; then
-	        func_append newdlprefiles " $dir/$dlname"
-	      else
-	        func_append newdlprefiles " $dir/$linklib"
-	      fi
-	    ;;
-	  esac
-	fi # $pass = dlpreopen
-
-	if test -z "$libdir"; then
-	  # Link the convenience library
-	  if test "$linkmode" = lib; then
-	    deplibs="$dir/$old_library $deplibs"
-	  elif test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$dir/$old_library $compile_deplibs"
-	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
-	  else
-	    deplibs="$lib $deplibs" # used for prog,scan pass
-	  fi
-	  continue
-	fi
-
-
-	if test "$linkmode" = prog && test "$pass" != link; then
-	  func_append newlib_search_path " $ladir"
-	  deplibs="$lib $deplibs"
-
-	  linkalldeplibs=no
-	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
-	     test "$build_libtool_libs" = no; then
-	    linkalldeplibs=yes
-	  fi
-
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    case $deplib in
-	    -L*) func_stripname '-L' '' "$deplib"
-	         func_resolve_sysroot "$func_stripname_result"
-	         func_append newlib_search_path " $func_resolve_sysroot_result"
-		 ;;
-	    esac
-	    # Need to link against all dependency_libs?
-	    if test "$linkalldeplibs" = yes; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      # Need to hardcode shared library paths
-	      # or/and link against static libraries
-	      newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    if $opt_preserve_dup_deps ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
-	      esac
-	    fi
-	    func_append tmp_libs " $deplib"
-	  done # for deplib
-	  continue
-	fi # $linkmode = prog...
-
-	if test "$linkmode,$pass" = "prog,link"; then
-	  if test -n "$library_names" &&
-	     { { test "$prefer_static_libs" = no ||
-	         test "$prefer_static_libs,$installed" = "built,yes"; } ||
-	       test -z "$old_library"; }; then
-	    # We need to hardcode the library path
-	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
-	      # Make sure the rpath contains only unique directories.
-	      case "$temp_rpath:" in
-	      *"$absdir:"*) ;;
-	      *) func_append temp_rpath "$absdir:" ;;
-	      esac
-	    fi
-
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) func_append compile_rpath " $absdir" ;;
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) func_append finalize_rpath " $libdir" ;;
-	      esac
-	      ;;
-	    esac
-	  fi # $linkmode,$pass = prog,link...
-
-	  if test "$alldeplibs" = yes &&
-	     { test "$deplibs_check_method" = pass_all ||
-	       { test "$build_libtool_libs" = yes &&
-		 test -n "$library_names"; }; }; then
-	    # We only need to search for static libraries
-	    continue
-	  fi
-	fi
-
-	link_static=no # Whether the deplib will be linked statically
-	use_static_libs=$prefer_static_libs
-	if test "$use_static_libs" = built && test "$installed" = yes; then
-	  use_static_libs=no
-	fi
-	if test -n "$library_names" &&
-	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
-	  case $host in
-	  *cygwin* | *mingw* | *cegcc*)
-	      # No point in relinking DLLs because paths are not encoded
-	      func_append notinst_deplibs " $lib"
-	      need_relink=no
-	    ;;
-	  *)
-	    if test "$installed" = no; then
-	      func_append notinst_deplibs " $lib"
-	      need_relink=yes
-	    fi
-	    ;;
-	  esac
-	  # This is a shared library
-
-	  # Warn about portability, can't link against -module's on some
-	  # systems (darwin).  Don't bleat about dlopened modules though!
-	  dlopenmodule=""
-	  for dlpremoduletest in $dlprefiles; do
-	    if test "X$dlpremoduletest" = "X$lib"; then
-	      dlopenmodule="$dlpremoduletest"
-	      break
-	    fi
-	  done
-	  if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
-	    echo
-	    if test "$linkmode" = prog; then
-	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
-	    else
-	      $ECHO "*** Warning: Linking the shared library $output against the loadable module"
-	    fi
-	    $ECHO "*** $linklib is not portable!"
-	  fi
-	  if test "$linkmode" = lib &&
-	     test "$hardcode_into_libs" = yes; then
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) func_append compile_rpath " $absdir" ;;
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) func_append finalize_rpath " $libdir" ;;
-	      esac
-	      ;;
-	    esac
-	  fi
-
-	  if test -n "$old_archive_from_expsyms_cmds"; then
-	    # figure out the soname
-	    set dummy $library_names
-	    shift
-	    realname="$1"
-	    shift
-	    libname=`eval "\\$ECHO \"$libname_spec\""`
-	    # use dlname if we got it. it's perfectly good, no?
-	    if test -n "$dlname"; then
-	      soname="$dlname"
-	    elif test -n "$soname_spec"; then
-	      # bleh windows
-	      case $host in
-	      *cygwin* | mingw* | *cegcc*)
-	        func_arith $current - $age
-		major=$func_arith_result
-		versuffix="-$major"
-		;;
-	      esac
-	      eval soname=\"$soname_spec\"
-	    else
-	      soname="$realname"
-	    fi
-
-	    # Make a new name for the extract_expsyms_cmds to use
-	    soroot="$soname"
-	    func_basename "$soroot"
-	    soname="$func_basename_result"
-	    func_stripname 'lib' '.dll' "$soname"
-	    newlib=libimp-$func_stripname_result.a
-
-	    # If the library has no export list, then create one now
-	    if test -f "$output_objdir/$soname-def"; then :
-	    else
-	      func_verbose "extracting exported symbol list from \`$soname'"
-	      func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
-	    fi
-
-	    # Create $newlib
-	    if test -f "$output_objdir/$newlib"; then :; else
-	      func_verbose "generating import library for \`$soname'"
-	      func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
-	    fi
-	    # make sure the library variables are pointing to the new library
-	    dir=$output_objdir
-	    linklib=$newlib
-	  fi # test -n "$old_archive_from_expsyms_cmds"
-
-	  if test "$linkmode" = prog || test "$opt_mode" != relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    lib_linked=yes
-	    case $hardcode_action in
-	    immediate | unsupported)
-	      if test "$hardcode_direct" = no; then
-		add="$dir/$linklib"
-		case $host in
-		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
-		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
-		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
-		    *-*-unixware7*) add_dir="-L$dir" ;;
-		  *-*-darwin* )
-		    # if the lib is a (non-dlopened) module then we can not
-		    # link against it, someone is ignoring the earlier warnings
-		    if /usr/bin/file -L $add 2> /dev/null |
-			 $GREP ": [^:]* bundle" >/dev/null ; then
-		      if test "X$dlopenmodule" != "X$lib"; then
-			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
-			if test -z "$old_library" ; then
-			  echo
-			  echo "*** And there doesn't seem to be a static archive available"
-			  echo "*** The link will probably fail, sorry"
-			else
-			  add="$dir/$old_library"
-			fi
-		      elif test -n "$old_library"; then
-			add="$dir/$old_library"
-		      fi
-		    fi
-		esac
-	      elif test "$hardcode_minus_L" = no; then
-		case $host in
-		*-*-sunos*) add_shlibpath="$dir" ;;
-		esac
-		add_dir="-L$dir"
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = no; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    relink)
-	      if test "$hardcode_direct" = yes &&
-	         test "$hardcode_direct_absolute" = no; then
-		add="$dir/$linklib"
-	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$absdir"
-		# Try looking first in the location we're being installed to.
-		if test -n "$inst_prefix_dir"; then
-		  case $libdir in
-		    [\\/]*)
-		      func_append add_dir " -L$inst_prefix_dir$libdir"
-		      ;;
-		  esac
-		fi
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = yes; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    *) lib_linked=no ;;
-	    esac
-
-	    if test "$lib_linked" != yes; then
-	      func_fatal_configuration "unsupported hardcode properties"
-	    fi
-
-	    if test -n "$add_shlibpath"; then
-	      case :$compile_shlibpath: in
-	      *":$add_shlibpath:"*) ;;
-	      *) func_append compile_shlibpath "$add_shlibpath:" ;;
-	      esac
-	    fi
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
-	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	      if test "$hardcode_direct" != yes &&
-		 test "$hardcode_minus_L" != yes &&
-		 test "$hardcode_shlibpath_var" = yes; then
-		case :$finalize_shlibpath: in
-		*":$libdir:"*) ;;
-		*) func_append finalize_shlibpath "$libdir:" ;;
-		esac
-	      fi
-	    fi
-	  fi
-
-	  if test "$linkmode" = prog || test "$opt_mode" = relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    # Finalize command for both is simple: just hardcode it.
-	    if test "$hardcode_direct" = yes &&
-	       test "$hardcode_direct_absolute" = no; then
-	      add="$libdir/$linklib"
-	    elif test "$hardcode_minus_L" = yes; then
-	      add_dir="-L$libdir"
-	      add="-l$name"
-	    elif test "$hardcode_shlibpath_var" = yes; then
-	      case :$finalize_shlibpath: in
-	      *":$libdir:"*) ;;
-	      *) func_append finalize_shlibpath "$libdir:" ;;
-	      esac
-	      add="-l$name"
-	    elif test "$hardcode_automatic" = yes; then
-	      if test -n "$inst_prefix_dir" &&
-		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
-		add="$inst_prefix_dir$libdir/$linklib"
-	      else
-		add="$libdir/$linklib"
-	      fi
-	    else
-	      # We cannot seem to hardcode it, guess we'll fake it.
-	      add_dir="-L$libdir"
-	      # Try looking first in the location we're being installed to.
-	      if test -n "$inst_prefix_dir"; then
-		case $libdir in
-		  [\\/]*)
-		    func_append add_dir " -L$inst_prefix_dir$libdir"
-		    ;;
-		esac
-	      fi
-	      add="-l$name"
-	    fi
-
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
-	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	    fi
-	  fi
-	elif test "$linkmode" = prog; then
-	  # Here we assume that one of hardcode_direct or hardcode_minus_L
-	  # is not unsupported.  This is valid on all known static and
-	  # shared platforms.
-	  if test "$hardcode_direct" != unsupported; then
-	    test -n "$old_library" && linklib="$old_library"
-	    compile_deplibs="$dir/$linklib $compile_deplibs"
-	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
-	  else
-	    compile_deplibs="-l$name -L$dir $compile_deplibs"
-	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
-	  fi
-	elif test "$build_libtool_libs" = yes; then
-	  # Not a shared library
-	  if test "$deplibs_check_method" != pass_all; then
-	    # We're trying link a shared library against a static one
-	    # but the system doesn't support it.
-
-	    # Just print a warning and add the library to dependency_libs so
-	    # that the program can be linked against the static library.
-	    echo
-	    $ECHO "*** Warning: This system can not link to static lib archive $lib."
-	    echo "*** I have the capability to make that library automatically link in when"
-	    echo "*** you link to this library.  But I can only do this if you have a"
-	    echo "*** shared version of the library, which you do not appear to have."
-	    if test "$module" = yes; then
-	      echo "*** But as you try to build a module library, libtool will still create "
-	      echo "*** a static module, that should work as long as the dlopening application"
-	      echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
-	      if test -z "$global_symbol_pipe"; then
-		echo
-		echo "*** However, this would only work if libtool was able to extract symbol"
-		echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-		echo "*** not find such a program.  So, this module is probably useless."
-		echo "*** \`nm' from GNU binutils and a full rebuild may help."
-	      fi
-	      if test "$build_old_libs" = no; then
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  else
-	    deplibs="$dir/$old_library $deplibs"
-	    link_static=yes
-	  fi
-	fi # link shared/static library?
-
-	if test "$linkmode" = lib; then
-	  if test -n "$dependency_libs" &&
-	     { test "$hardcode_into_libs" != yes ||
-	       test "$build_old_libs" = yes ||
-	       test "$link_static" = yes; }; then
-	    # Extract -R from dependency_libs
-	    temp_deplibs=
-	    for libdir in $dependency_libs; do
-	      case $libdir in
-	      -R*) func_stripname '-R' '' "$libdir"
-	           temp_xrpath=$func_stripname_result
-		   case " $xrpath " in
-		   *" $temp_xrpath "*) ;;
-		   *) func_append xrpath " $temp_xrpath";;
-		   esac;;
-	      *) func_append temp_deplibs " $libdir";;
-	      esac
-	    done
-	    dependency_libs="$temp_deplibs"
-	  fi
-
-	  func_append newlib_search_path " $absdir"
-	  # Link against this library
-	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
-	  # ... and its dependency_libs
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    newdependency_libs="$deplib $newdependency_libs"
-	    case $deplib in
-              -L*) func_stripname '-L' '' "$deplib"
-                   func_resolve_sysroot "$func_stripname_result";;
-              *) func_resolve_sysroot "$deplib" ;;
-            esac
-	    if $opt_preserve_dup_deps ; then
-	      case "$tmp_libs " in
-	      *" $func_resolve_sysroot_result "*)
-                func_append specialdeplibs " $func_resolve_sysroot_result" ;;
-	      esac
-	    fi
-	    func_append tmp_libs " $func_resolve_sysroot_result"
-	  done
-
-	  if test "$link_all_deplibs" != no; then
-	    # Add the search paths of all dependency libraries
-	    for deplib in $dependency_libs; do
-	      path=
-	      case $deplib in
-	      -L*) path="$deplib" ;;
-	      *.la)
-	        func_resolve_sysroot "$deplib"
-	        deplib=$func_resolve_sysroot_result
-	        func_dirname "$deplib" "" "."
-		dir=$func_dirname_result
-		# We need an absolute path.
-		case $dir in
-		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
-		*)
-		  absdir=`cd "$dir" && pwd`
-		  if test -z "$absdir"; then
-		    func_warning "cannot determine absolute directory name of \`$dir'"
-		    absdir="$dir"
-		  fi
-		  ;;
-		esac
-		if $GREP "^installed=no" $deplib > /dev/null; then
-		case $host in
-		*-*-darwin*)
-		  depdepl=
-		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
-		  if test -n "$deplibrary_names" ; then
-		    for tmp in $deplibrary_names ; do
-		      depdepl=$tmp
-		    done
-		    if test -f "$absdir/$objdir/$depdepl" ; then
-		      depdepl="$absdir/$objdir/$depdepl"
-		      darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
-                      if test -z "$darwin_install_name"; then
-                          darwin_install_name=`${OTOOL64} -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
-                      fi
-		      func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
-		      func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
-		      path=
-		    fi
-		  fi
-		  ;;
-		*)
-		  path="-L$absdir/$objdir"
-		  ;;
-		esac
-		else
-		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		  test -z "$libdir" && \
-		    func_fatal_error "\`$deplib' is not a valid libtool archive"
-		  test "$absdir" != "$libdir" && \
-		    func_warning "\`$deplib' seems to be moved"
-
-		  path="-L$absdir"
-		fi
-		;;
-	      esac
-	      case " $deplibs " in
-	      *" $path "*) ;;
-	      *) deplibs="$path $deplibs" ;;
-	      esac
-	    done
-	  fi # link_all_deplibs != no
-	fi # linkmode = lib
-      done # for deplib in $libs
-      if test "$pass" = link; then
-	if test "$linkmode" = "prog"; then
-	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
-	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
-	else
-	  compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	fi
-      fi
-      dependency_libs="$newdependency_libs"
-      if test "$pass" = dlpreopen; then
-	# Link the dlpreopened libraries before other libraries
-	for deplib in $save_deplibs; do
-	  deplibs="$deplib $deplibs"
-	done
-      fi
-      if test "$pass" != dlopen; then
-	if test "$pass" != conv; then
-	  # Make sure lib_search_path contains only unique directories.
-	  lib_search_path=
-	  for dir in $newlib_search_path; do
-	    case "$lib_search_path " in
-	    *" $dir "*) ;;
-	    *) func_append lib_search_path " $dir" ;;
-	    esac
-	  done
-	  newlib_search_path=
-	fi
-
-	if test "$linkmode,$pass" != "prog,link"; then
-	  vars="deplibs"
-	else
-	  vars="compile_deplibs finalize_deplibs"
-	fi
-	for var in $vars dependency_libs; do
-	  # Add libraries to $var in reverse order
-	  eval tmp_libs=\"\$$var\"
-	  new_libs=
-	  for deplib in $tmp_libs; do
-	    # FIXME: Pedantically, this is the right thing to do, so
-	    #        that some nasty dependency loop isn't accidentally
-	    #        broken:
-	    #new_libs="$deplib $new_libs"
-	    # Pragmatically, this seems to cause very few problems in
-	    # practice:
-	    case $deplib in
-	    -L*) new_libs="$deplib $new_libs" ;;
-	    -R*) ;;
-	    *)
-	      # And here is the reason: when a library appears more
-	      # than once as an explicit dependence of a library, or
-	      # is implicitly linked in more than once by the
-	      # compiler, it is considered special, and multiple
-	      # occurrences thereof are not removed.  Compare this
-	      # with having the same library being listed as a
-	      # dependency of multiple other libraries: in this case,
-	      # we know (pedantically, we assume) the library does not
-	      # need to be listed more than once, so we keep only the
-	      # last copy.  This is not always right, but it is rare
-	      # enough that we require users that really mean to play
-	      # such unportable linking tricks to link the library
-	      # using -Wl,-lname, so that libtool does not consider it
-	      # for duplicate removal.
-	      case " $specialdeplibs " in
-	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
-	      *)
-		case " $new_libs " in
-		*" $deplib "*) ;;
-		*) new_libs="$deplib $new_libs" ;;
-		esac
-		;;
-	      esac
-	      ;;
-	    esac
-	  done
-	  tmp_libs=
-	  for deplib in $new_libs; do
-	    case $deplib in
-	    -L*)
-	      case " $tmp_libs " in
-	      *" $deplib "*) ;;
-	      *) func_append tmp_libs " $deplib" ;;
-	      esac
-	      ;;
-	    *) func_append tmp_libs " $deplib" ;;
-	    esac
-	  done
-	  eval $var=\"$tmp_libs\"
-	done # for var
-      fi
-      # Last step: remove runtime libs from dependency_libs
-      # (they stay in deplibs)
-      tmp_libs=
-      for i in $dependency_libs ; do
-	case " $predeps $postdeps $compiler_lib_search_path " in
-	*" $i "*)
-	  i=""
-	  ;;
-	esac
-	if test -n "$i" ; then
-	  func_append tmp_libs " $i"
-	fi
-      done
-      dependency_libs=$tmp_libs
-    done # for pass
-    if test "$linkmode" = prog; then
-      dlfiles="$newdlfiles"
-    fi
-    if test "$linkmode" = prog || test "$linkmode" = lib; then
-      dlprefiles="$newdlprefiles"
-    fi
-
-    case $linkmode in
-    oldlib)
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	func_warning "\`-dlopen' is ignored for archives"
-      fi
-
-      case " $deplibs" in
-      *\ -l* | *\ -L*)
-	func_warning "\`-l' and \`-L' are ignored for archives" ;;
-      esac
-
-      test -n "$rpath" && \
-	func_warning "\`-rpath' is ignored for archives"
-
-      test -n "$xrpath" && \
-	func_warning "\`-R' is ignored for archives"
-
-      test -n "$vinfo" && \
-	func_warning "\`-version-info/-version-number' is ignored for archives"
-
-      test -n "$release" && \
-	func_warning "\`-release' is ignored for archives"
-
-      test -n "$export_symbols$export_symbols_regex" && \
-	func_warning "\`-export-symbols' is ignored for archives"
-
-      # Now set the variables for building old libraries.
-      build_libtool_libs=no
-      oldlibs="$output"
-      func_append objs "$old_deplibs"
-      ;;
-
-    lib)
-      # Make sure we only generate libraries of the form `libNAME.la'.
-      case $outputname in
-      lib*)
-	func_stripname 'lib' '.la' "$outputname"
-	name=$func_stripname_result
-	eval shared_ext=\"$shrext_cmds\"
-	eval libname=\"$libname_spec\"
-	;;
-      *)
-	test "$module" = no && \
-	  func_fatal_help "libtool library \`$output' must begin with \`lib'"
-
-	if test "$need_lib_prefix" != no; then
-	  # Add the "lib" prefix for modules if required
-	  func_stripname '' '.la' "$outputname"
-	  name=$func_stripname_result
-	  eval shared_ext=\"$shrext_cmds\"
-	  eval libname=\"$libname_spec\"
-	else
-	  func_stripname '' '.la' "$outputname"
-	  libname=$func_stripname_result
-	fi
-	;;
-      esac
-
-      if test -n "$objs"; then
-	if test "$deplibs_check_method" != pass_all; then
-	  func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
-	else
-	  echo
-	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
-	  $ECHO "*** objects $objs is not portable!"
-	  func_append libobjs " $objs"
-	fi
-      fi
-
-      test "$dlself" != no && \
-	func_warning "\`-dlopen self' is ignored for libtool libraries"
-
-      set dummy $rpath
-      shift
-      test "$#" -gt 1 && \
-	func_warning "ignoring multiple \`-rpath's for a libtool library"
-
-      install_libdir="$1"
-
-      oldlibs=
-      if test -z "$rpath"; then
-	if test "$build_libtool_libs" = yes; then
-	  # Building a libtool convenience library.
-	  # Some compilers have problems with a `.al' extension so
-	  # convenience libraries should have the same extension an
-	  # archive normally would.
-	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
-	  build_libtool_libs=convenience
-	  build_old_libs=yes
-	fi
-
-	test -n "$vinfo" && \
-	  func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
-
-	test -n "$release" && \
-	  func_warning "\`-release' is ignored for convenience libraries"
-      else
-
-	# Parse the version information argument.
-	save_ifs="$IFS"; IFS=':'
-	set dummy $vinfo 0 0 0
-	shift
-	IFS="$save_ifs"
-
-	test -n "$7" && \
-	  func_fatal_help "too many parameters to \`-version-info'"
-
-	# convert absolute version numbers to libtool ages
-	# this retains compatibility with .la files and attempts
-	# to make the code below a bit more comprehensible
-
-	case $vinfo_number in
-	yes)
-	  number_major="$1"
-	  number_minor="$2"
-	  number_revision="$3"
-	  #
-	  # There are really only two kinds -- those that
-	  # use the current revision as the major version
-	  # and those that subtract age and use age as
-	  # a minor version.  But, then there is irix
-	  # which has an extra 1 added just for fun
-	  #
-	  case $version_type in
-	  # correct linux to gnu/linux during the next big refactor
-	  darwin|linux|osf|windows|none)
-	    func_arith $number_major + $number_minor
-	    current=$func_arith_result
-	    age="$number_minor"
-	    revision="$number_revision"
-	    ;;
-	  freebsd-aout|freebsd-elf|qnx|sunos)
-	    current="$number_major"
-	    revision="$number_minor"
-	    age="0"
-	    ;;
-	  irix|nonstopux)
-	    func_arith $number_major + $number_minor
-	    current=$func_arith_result
-	    age="$number_minor"
-	    revision="$number_minor"
-	    lt_irix_increment=no
-	    ;;
-	  esac
-	  ;;
-	no)
-	  current="$1"
-	  revision="$2"
-	  age="$3"
-	  ;;
-	esac
-
-	# Check that each of the things are valid numbers.
-	case $current in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  func_error "CURRENT \`$current' must be a nonnegative integer"
-	  func_fatal_error "\`$vinfo' is not valid version information"
-	  ;;
-	esac
-
-	case $revision in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  func_error "REVISION \`$revision' must be a nonnegative integer"
-	  func_fatal_error "\`$vinfo' is not valid version information"
-	  ;;
-	esac
-
-	case $age in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  func_error "AGE \`$age' must be a nonnegative integer"
-	  func_fatal_error "\`$vinfo' is not valid version information"
-	  ;;
-	esac
-
-	if test "$age" -gt "$current"; then
-	  func_error "AGE \`$age' is greater than the current interface number \`$current'"
-	  func_fatal_error "\`$vinfo' is not valid version information"
-	fi
-
-	# Calculate the version variables.
-	major=
-	versuffix=
-	verstring=
-	case $version_type in
-	none) ;;
-
-	darwin)
-	  # Like Linux, but with the current version available in
-	  # verstring for coding it into the library header
-	  func_arith $current - $age
-	  major=.$func_arith_result
-	  versuffix="$major.$age.$revision"
-	  # Darwin ld doesn't like 0 for these options...
-	  func_arith $current + 1
-	  minor_current=$func_arith_result
-	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
-	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-	  ;;
-
-	freebsd-aout)
-	  major=".$current"
-	  versuffix=".$current.$revision";
-	  ;;
-
-	freebsd-elf)
-	  major=".$current"
-	  versuffix=".$current"
-	  ;;
-
-	irix | nonstopux)
-	  if test "X$lt_irix_increment" = "Xno"; then
-	    func_arith $current - $age
-	  else
-	    func_arith $current - $age + 1
-	  fi
-	  major=$func_arith_result
-
-	  case $version_type in
-	    nonstopux) verstring_prefix=nonstopux ;;
-	    *)         verstring_prefix=sgi ;;
-	  esac
-	  verstring="$verstring_prefix$major.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$revision
-	  while test "$loop" -ne 0; do
-	    func_arith $revision - $loop
-	    iface=$func_arith_result
-	    func_arith $loop - 1
-	    loop=$func_arith_result
-	    verstring="$verstring_prefix$major.$iface:$verstring"
-	  done
-
-	  # Before this point, $major must not contain `.'.
-	  major=.$major
-	  versuffix="$major.$revision"
-	  ;;
-
-	linux) # correct to gnu/linux during the next big refactor
-	  func_arith $current - $age
-	  major=.$func_arith_result
-	  versuffix="$major.$age.$revision"
-	  ;;
-
-	osf)
-	  func_arith $current - $age
-	  major=.$func_arith_result
-	  versuffix=".$current.$age.$revision"
-	  verstring="$current.$age.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$age
-	  while test "$loop" -ne 0; do
-	    func_arith $current - $loop
-	    iface=$func_arith_result
-	    func_arith $loop - 1
-	    loop=$func_arith_result
-	    verstring="$verstring:${iface}.0"
-	  done
-
-	  # Make executables depend on our current version.
-	  func_append verstring ":${current}.0"
-	  ;;
-
-	qnx)
-	  major=".$current"
-	  versuffix=".$current"
-	  ;;
-
-	sunos)
-	  major=".$current"
-	  versuffix=".$current.$revision"
-	  ;;
-
-	windows)
-	  # Use '-' rather than '.', since we only want one
-	  # extension on DOS 8.3 filesystems.
-	  func_arith $current - $age
-	  major=$func_arith_result
-	  versuffix="-$major"
-	  ;;
-
-	*)
-	  func_fatal_configuration "unknown library version type \`$version_type'"
-	  ;;
-	esac
-
-	# Clear the version info if we defaulted, and they specified a release.
-	if test -z "$vinfo" && test -n "$release"; then
-	  major=
-	  case $version_type in
-	  darwin)
-	    # we can't check for "0.0" in archive_cmds due to quoting
-	    # problems, so we reset it completely
-	    verstring=
-	    ;;
-	  *)
-	    verstring="0.0"
-	    ;;
-	  esac
-	  if test "$need_version" = no; then
-	    versuffix=
-	  else
-	    versuffix=".0.0"
-	  fi
-	fi
-
-	# Remove version info from name if versioning should be avoided
-	if test "$avoid_version" = yes && test "$need_version" = no; then
-	  major=
-	  versuffix=
-	  verstring=""
-	fi
-
-	# Check to see if the archive will have undefined symbols.
-	if test "$allow_undefined" = yes; then
-	  if test "$allow_undefined_flag" = unsupported; then
-	    func_warning "undefined symbols not allowed in $host shared libraries"
-	    build_libtool_libs=no
-	    build_old_libs=yes
-	  fi
-	else
-	  # Don't allow undefined symbols.
-	  allow_undefined_flag="$no_undefined_flag"
-	fi
-
-      fi
-
-      func_generate_dlsyms "$libname" "$libname" "yes"
-      func_append libobjs " $symfileobj"
-      test "X$libobjs" = "X " && libobjs=
-
-      if test "$opt_mode" != relink; then
-	# Remove our outputs, but don't remove object files since they
-	# may have been created when compiling PIC objects.
-	removelist=
-	tempremovelist=`$ECHO "$output_objdir/*"`
-	for p in $tempremovelist; do
-	  case $p in
-	    *.$objext | *.gcno)
-	       ;;
-	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
-	       if test "X$precious_files_regex" != "X"; then
-		 if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
-		 then
-		   continue
-		 fi
-	       fi
-	       func_append removelist " $p"
-	       ;;
-	    *) ;;
-	  esac
-	done
-	test -n "$removelist" && \
-	  func_show_eval "${RM}r \$removelist"
-      fi
-
-      # Now set the variables for building old libraries.
-      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
-	func_append oldlibs " $output_objdir/$libname.$libext"
-
-	# Transform .lo files to .o files.
-	oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
-      fi
-
-      # Eliminate all temporary directories.
-      #for path in $notinst_path; do
-      #	lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
-      #	deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
-      #	dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
-      #done
-
-      if test -n "$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	temp_xrpath=
-	for libdir in $xrpath; do
-	  func_replace_sysroot "$libdir"
-	  func_append temp_xrpath " -R$func_replace_sysroot_result"
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) func_append finalize_rpath " $libdir" ;;
-	  esac
-	done
-	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
-	  dependency_libs="$temp_xrpath $dependency_libs"
-	fi
-      fi
-
-      # Make sure dlfiles contains only unique files that won't be dlpreopened
-      old_dlfiles="$dlfiles"
-      dlfiles=
-      for lib in $old_dlfiles; do
-	case " $dlprefiles $dlfiles " in
-	*" $lib "*) ;;
-	*) func_append dlfiles " $lib" ;;
-	esac
-      done
-
-      # Make sure dlprefiles contains only unique files
-      old_dlprefiles="$dlprefiles"
-      dlprefiles=
-      for lib in $old_dlprefiles; do
-	case "$dlprefiles " in
-	*" $lib "*) ;;
-	*) func_append dlprefiles " $lib" ;;
-	esac
-      done
-
-      if test "$build_libtool_libs" = yes; then
-	if test -n "$rpath"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
-	    # these systems don't actually have a c library (as such)!
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C library is in the System framework
-	    func_append deplibs " System.ltframework"
-	    ;;
-	  *-*-netbsd*)
-	    # Don't link with libc until the a.out ld.so is fixed.
-	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	    # Do not include libc due to us having libc/libc_r.
-	    ;;
-	  *-*-sco3.2v5* | *-*-sco5v6*)
-	    # Causes problems with __ctype
-	    ;;
-	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-	    # Compiler inserts libc in the correct place for threads to work
-	    ;;
-	  *)
-	    # Add libc to deplibs on all other systems if necessary.
-	    if test "$build_libtool_need_lc" = "yes"; then
-	      func_append deplibs " -lc"
-	    fi
-	    ;;
-	  esac
-	fi
-
-	# Transform deplibs into only deplibs that can be linked in shared.
-	name_save=$name
-	libname_save=$libname
-	release_save=$release
-	versuffix_save=$versuffix
-	major_save=$major
-	# I'm not sure if I'm treating the release correctly.  I think
-	# release should show up in the -l (ie -lgmp5) so we don't want to
-	# add it in twice.  Is that correct?
-	release=""
-	versuffix=""
-	major=""
-	newdeplibs=
-	droppeddeps=no
-	case $deplibs_check_method in
-	pass_all)
-	  # Don't check for shared/static.  Everything works.
-	  # This might be a little naive.  We might want to check
-	  # whether the library exists or not.  But this is on
-	  # osf3 & osf4 and I'm not really sure... Just
-	  # implementing what was already the behavior.
-	  newdeplibs=$deplibs
-	  ;;
-	test_compile)
-	  # This code stresses the "libraries are programs" paradigm to its
-	  # limits. Maybe even breaks it.  We compile a program, linking it
-	  # against the deplibs as a proxy for the library.  Then we can check
-	  # whether they linked in statically or dynamically with ldd.
-	  $opt_dry_run || $RM conftest.c
-	  cat > conftest.c <<EOF
-	  int main() { return 0; }
-EOF
-	  $opt_dry_run || $RM conftest
-	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
-	    ldd_output=`ldd conftest`
-	    for i in $deplibs; do
-	      case $i in
-	      -l*)
-		func_stripname -l '' "$i"
-		name=$func_stripname_result
-		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		  case " $predeps $postdeps " in
-		  *" $i "*)
-		    func_append newdeplibs " $i"
-		    i=""
-		    ;;
-		  esac
-		fi
-		if test -n "$i" ; then
-		  libname=`eval "\\$ECHO \"$libname_spec\""`
-		  deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
-		  set dummy $deplib_matches; shift
-		  deplib_match=$1
-		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		    func_append newdeplibs " $i"
-		  else
-		    droppeddeps=yes
-		    echo
-		    $ECHO "*** Warning: dynamic linker does not accept needed library $i."
-		    echo "*** I have the capability to make that library automatically link in when"
-		    echo "*** you link to this library.  But I can only do this if you have a"
-		    echo "*** shared version of the library, which I believe you do not have"
-		    echo "*** because a test_compile did reveal that the linker did not use it for"
-		    echo "*** its dynamic dependency list that programs get resolved with at runtime."
-		  fi
-		fi
-		;;
-	      *)
-		func_append newdeplibs " $i"
-		;;
-	      esac
-	    done
-	  else
-	    # Error occurred in the first compile.  Let's try to salvage
-	    # the situation: Compile a separate program for each library.
-	    for i in $deplibs; do
-	      case $i in
-	      -l*)
-		func_stripname -l '' "$i"
-		name=$func_stripname_result
-		$opt_dry_run || $RM conftest
-		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
-		  ldd_output=`ldd conftest`
-		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		    case " $predeps $postdeps " in
-		    *" $i "*)
-		      func_append newdeplibs " $i"
-		      i=""
-		      ;;
-		    esac
-		  fi
-		  if test -n "$i" ; then
-		    libname=`eval "\\$ECHO \"$libname_spec\""`
-		    deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
-		    set dummy $deplib_matches; shift
-		    deplib_match=$1
-		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		      func_append newdeplibs " $i"
-		    else
-		      droppeddeps=yes
-		      echo
-		      $ECHO "*** Warning: dynamic linker does not accept needed library $i."
-		      echo "*** I have the capability to make that library automatically link in when"
-		      echo "*** you link to this library.  But I can only do this if you have a"
-		      echo "*** shared version of the library, which you do not appear to have"
-		      echo "*** because a test_compile did reveal that the linker did not use this one"
-		      echo "*** as a dynamic dependency that programs can get resolved with at runtime."
-		    fi
-		  fi
-		else
-		  droppeddeps=yes
-		  echo
-		  $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
-		  echo "*** make it link in!  You will probably need to install it or some"
-		  echo "*** library that it depends on before this library will be fully"
-		  echo "*** functional.  Installing it before continuing would be even better."
-		fi
-		;;
-	      *)
-		func_append newdeplibs " $i"
-		;;
-	      esac
-	    done
-	  fi
-	  ;;
-	file_magic*)
-	  set dummy $deplibs_check_method; shift
-	  file_magic_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
-	  for a_deplib in $deplibs; do
-	    case $a_deplib in
-	    -l*)
-	      func_stripname -l '' "$a_deplib"
-	      name=$func_stripname_result
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  func_append newdeplibs " $a_deplib"
-		  a_deplib=""
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib" ; then
-		libname=`eval "\\$ECHO \"$libname_spec\""`
-		if test -n "$file_magic_glob"; then
-		  libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
-		else
-		  libnameglob=$libname
-		fi
-		test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  if test "$want_nocaseglob" = yes; then
-		    shopt -s nocaseglob
-		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
-		    $nocaseglob
-		  else
-		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
-		  fi
-		  for potent_lib in $potential_libs; do
-		      # Follow soft links.
-		      if ls -lLd "$potent_lib" 2>/dev/null |
-			 $GREP " -> " >/dev/null; then
-			continue
-		      fi
-		      # The statement above tries to avoid entering an
-		      # endless loop below, in case of cyclic links.
-		      # We might still enter an endless loop, since a link
-		      # loop can be closed while we follow links,
-		      # but so what?
-		      potlib="$potent_lib"
-		      while test -h "$potlib" 2>/dev/null; do
-			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
-			case $potliblink in
-			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-			*) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
-			esac
-		      done
-		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
-			 $SED -e 10q |
-			 $EGREP "$file_magic_regex" > /dev/null; then
-			func_append newdeplibs " $a_deplib"
-			a_deplib=""
-			break 2
-		      fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		echo
-		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
-		echo "*** I have the capability to make that library automatically link in when"
-		echo "*** you link to this library.  But I can only do this if you have a"
-		echo "*** shared version of the library, which you do not appear to have"
-		echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
-		else
-		  $ECHO "*** with $libname and none of the candidates passed a file format test"
-		  $ECHO "*** using a file magic. Last file checked: $potlib"
-		fi
-	      fi
-	      ;;
-	    *)
-	      # Add a -L argument.
-	      func_append newdeplibs " $a_deplib"
-	      ;;
-	    esac
-	  done # Gone through all deplibs.
-	  ;;
-	match_pattern*)
-	  set dummy $deplibs_check_method; shift
-	  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
-	  for a_deplib in $deplibs; do
-	    case $a_deplib in
-	    -l*)
-	      func_stripname -l '' "$a_deplib"
-	      name=$func_stripname_result
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  func_append newdeplibs " $a_deplib"
-		  a_deplib=""
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib" ; then
-		libname=`eval "\\$ECHO \"$libname_spec\""`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		  for potent_lib in $potential_libs; do
-		    potlib="$potent_lib" # see symlink-check above in file_magic test
-		    if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
-		       $EGREP "$match_pattern_regex" > /dev/null; then
-		      func_append newdeplibs " $a_deplib"
-		      a_deplib=""
-		      break 2
-		    fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		echo
-		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
-		echo "*** I have the capability to make that library automatically link in when"
-		echo "*** you link to this library.  But I can only do this if you have a"
-		echo "*** shared version of the library, which you do not appear to have"
-		echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
-		else
-		  $ECHO "*** with $libname and none of the candidates passed a file format test"
-		  $ECHO "*** using a regex pattern. Last file checked: $potlib"
-		fi
-	      fi
-	      ;;
-	    *)
-	      # Add a -L argument.
-	      func_append newdeplibs " $a_deplib"
-	      ;;
-	    esac
-	  done # Gone through all deplibs.
-	  ;;
-	none | unknown | *)
-	  newdeplibs=""
-	  tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
-	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	    for i in $predeps $postdeps ; do
-	      # can't use Xsed below, because $i might contain '/'
-	      tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
-	    done
-	  fi
-	  case $tmp_deplibs in
-	  *[!\	\ ]*)
-	    echo
-	    if test "X$deplibs_check_method" = "Xnone"; then
-	      echo "*** Warning: inter-library dependencies are not supported in this platform."
-	    else
-	      echo "*** Warning: inter-library dependencies are not known to be supported."
-	    fi
-	    echo "*** All declared inter-library dependencies are being dropped."
-	    droppeddeps=yes
-	    ;;
-	  esac
-	  ;;
-	esac
-	versuffix=$versuffix_save
-	major=$major_save
-	release=$release_save
-	libname=$libname_save
-	name=$name_save
-
-	case $host in
-	*-*-rhapsody* | *-*-darwin1.[012])
-	  # On Rhapsody replace the C library with the System framework
-	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
-	  ;;
-	esac
-
-	if test "$droppeddeps" = yes; then
-	  if test "$module" = yes; then
-	    echo
-	    echo "*** Warning: libtool could not satisfy all declared inter-library"
-	    $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
-	    echo "*** a static module, that should work as long as the dlopening"
-	    echo "*** application is linked with the -dlopen flag."
-	    if test -z "$global_symbol_pipe"; then
-	      echo
-	      echo "*** However, this would only work if libtool was able to extract symbol"
-	      echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-	      echo "*** not find such a program.  So, this module is probably useless."
-	      echo "*** \`nm' from GNU binutils and a full rebuild may help."
-	    fi
-	    if test "$build_old_libs" = no; then
-	      oldlibs="$output_objdir/$libname.$libext"
-	      build_libtool_libs=module
-	      build_old_libs=yes
-	    else
-	      build_libtool_libs=no
-	    fi
-	  else
-	    echo "*** The inter-library dependencies that have been dropped here will be"
-	    echo "*** automatically added whenever a program is linked with this library"
-	    echo "*** or is declared to -dlopen it."
-
-	    if test "$allow_undefined" = no; then
-	      echo
-	      echo "*** Since this library must not contain undefined symbols,"
-	      echo "*** because either the platform does not support them or"
-	      echo "*** it was explicitly requested with -no-undefined,"
-	      echo "*** libtool will only create a static version of it."
-	      if test "$build_old_libs" = no; then
-		oldlibs="$output_objdir/$libname.$libext"
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  fi
-	fi
-	# Done checking deplibs!
-	deplibs=$newdeplibs
-      fi
-      # Time to change all our "foo.ltframework" stuff back to "-framework foo"
-      case $host in
-	*-*-darwin*)
-	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	  new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	  deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	  ;;
-      esac
-
-      # move library search paths that coincide with paths to not yet
-      # installed libraries to the beginning of the library search list
-      new_libs=
-      for path in $notinst_path; do
-	case " $new_libs " in
-	*" -L$path/$objdir "*) ;;
-	*)
-	  case " $deplibs " in
-	  *" -L$path/$objdir "*)
-	    func_append new_libs " -L$path/$objdir" ;;
-	  esac
-	  ;;
-	esac
-      done
-      for deplib in $deplibs; do
-	case $deplib in
-	-L*)
-	  case " $new_libs " in
-	  *" $deplib "*) ;;
-	  *) func_append new_libs " $deplib" ;;
-	  esac
-	  ;;
-	*) func_append new_libs " $deplib" ;;
-	esac
-      done
-      deplibs="$new_libs"
-
-      # All the library-specific variables (install_libdir is set above).
-      library_names=
-      old_library=
-      dlname=
-
-      # Test again, we may have decided not to build it any more
-      if test "$build_libtool_libs" = yes; then
-	# Remove ${wl} instances when linking with ld.
-	# FIXME: should test the right _cmds variable.
-	case $archive_cmds in
-	  *\$LD\ *) wl= ;;
-        esac
-	if test "$hardcode_into_libs" = yes; then
-	  # Hardcode the library paths
-	  hardcode_libdirs=
-	  dep_rpath=
-	  rpath="$finalize_rpath"
-	  test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
-	  for libdir in $rpath; do
-	    if test -n "$hardcode_libdir_flag_spec"; then
-	      if test -n "$hardcode_libdir_separator"; then
-		func_replace_sysroot "$libdir"
-		libdir=$func_replace_sysroot_result
-		if test -z "$hardcode_libdirs"; then
-		  hardcode_libdirs="$libdir"
-		else
-		  # Just accumulate the unique libdirs.
-		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		    ;;
-		  *)
-		    func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
-		    ;;
-		  esac
-		fi
-	      else
-		eval flag=\"$hardcode_libdir_flag_spec\"
-		func_append dep_rpath " $flag"
-	      fi
-	    elif test -n "$runpath_var"; then
-	      case "$perm_rpath " in
-	      *" $libdir "*) ;;
-	      *) func_append perm_rpath " $libdir" ;;
-	      esac
-	    fi
-	  done
-	  # Substitute the hardcoded libdirs into the rpath.
-	  if test -n "$hardcode_libdir_separator" &&
-	     test -n "$hardcode_libdirs"; then
-	    libdir="$hardcode_libdirs"
-	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
-	  fi
-	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
-	    # We should set the runpath_var.
-	    rpath=
-	    for dir in $perm_rpath; do
-	      func_append rpath "$dir:"
-	    done
-	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
-	  fi
-	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
-	fi
-
-	shlibpath="$finalize_shlibpath"
-	test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
-	if test -n "$shlibpath"; then
-	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
-	fi
-
-	# Get the real and link names of the library.
-	eval shared_ext=\"$shrext_cmds\"
-	eval library_names=\"$library_names_spec\"
-	set dummy $library_names
-	shift
-	realname="$1"
-	shift
-
-	if test -n "$soname_spec"; then
-	  eval soname=\"$soname_spec\"
-	else
-	  soname="$realname"
-	fi
-	if test -z "$dlname"; then
-	  dlname=$soname
-	fi
-
-	lib="$output_objdir/$realname"
-	linknames=
-	for link
-	do
-	  func_append linknames " $link"
-	done
-
-	# Use standard objects if they are pic
-	test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
-	test "X$libobjs" = "X " && libobjs=
-
-	delfiles=
-	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
-	  export_symbols="$output_objdir/$libname.uexp"
-	  func_append delfiles " $export_symbols"
-	fi
-
-	orig_export_symbols=
-	case $host_os in
-	cygwin* | mingw* | cegcc*)
-	  if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
-	    # exporting using user supplied symfile
-	    if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
-	      # and it's NOT already a .def file. Must figure out
-	      # which of the given symbols are data symbols and tag
-	      # them as such. So, trigger use of export_symbols_cmds.
-	      # export_symbols gets reassigned inside the "prepare
-	      # the list of exported symbols" if statement, so the
-	      # include_expsyms logic still works.
-	      orig_export_symbols="$export_symbols"
-	      export_symbols=
-	      always_export_symbols=yes
-	    fi
-	  fi
-	  ;;
-	esac
-
-	# Prepare the list of exported symbols
-	if test -z "$export_symbols"; then
-	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
-	    func_verbose "generating symbol list for \`$libname.la'"
-	    export_symbols="$output_objdir/$libname.exp"
-	    $opt_dry_run || $RM $export_symbols
-	    cmds=$export_symbols_cmds
-	    save_ifs="$IFS"; IFS='~'
-	    for cmd1 in $cmds; do
-	      IFS="$save_ifs"
-	      # Take the normal branch if the nm_file_list_spec branch
-	      # doesn't work or if tool conversion is not needed.
-	      case $nm_file_list_spec~$to_tool_file_cmd in
-		*~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
-		  try_normal_branch=yes
-		  eval cmd=\"$cmd1\"
-		  func_len " $cmd"
-		  len=$func_len_result
-		  ;;
-		*)
-		  try_normal_branch=no
-		  ;;
-	      esac
-	      if test "$try_normal_branch" = yes \
-		 && { test "$len" -lt "$max_cmd_len" \
-		      || test "$max_cmd_len" -le -1; }
-	      then
-		func_show_eval "$cmd" 'exit $?'
-		skipped_export=false
-	      elif test -n "$nm_file_list_spec"; then
-		func_basename "$output"
-		output_la=$func_basename_result
-		save_libobjs=$libobjs
-		save_output=$output
-		output=${output_objdir}/${output_la}.nm
-		func_to_tool_file "$output"
-		libobjs=$nm_file_list_spec$func_to_tool_file_result
-		func_append delfiles " $output"
-		func_verbose "creating $NM input file list: $output"
-		for obj in $save_libobjs; do
-		  func_to_tool_file "$obj"
-		  $ECHO "$func_to_tool_file_result"
-		done > "$output"
-		eval cmd=\"$cmd1\"
-		func_show_eval "$cmd" 'exit $?'
-		output=$save_output
-		libobjs=$save_libobjs
-		skipped_export=false
-	      else
-		# The command line is too long to execute in one step.
-		func_verbose "using reloadable object file for export list..."
-		skipped_export=:
-		# Break out early, otherwise skipped_export may be
-		# set to false by a later but shorter cmd.
-		break
-	      fi
-	    done
-	    IFS="$save_ifs"
-	    if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then
-	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
-	    fi
-	  fi
-	fi
-
-	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	  tmp_export_symbols="$export_symbols"
-	  test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
-	  $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
-	fi
-
-	if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
-	  # The given exports_symbols file has to be filtered, so filter it.
-	  func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
-	  # FIXME: $output_objdir/$libname.filter potentially contains lots of
-	  # 's' commands which not all seds can handle. GNU sed should be fine
-	  # though. Also, the filter scales superlinearly with the number of
-	  # global variables. join(1) would be nice here, but unfortunately
-	  # isn't a blessed tool.
-	  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-	  func_append delfiles " $export_symbols $output_objdir/$libname.filter"
-	  export_symbols=$output_objdir/$libname.def
-	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
-	fi
-
-	tmp_deplibs=
-	for test_deplib in $deplibs; do
-	  case " $convenience " in
-	  *" $test_deplib "*) ;;
-	  *)
-	    func_append tmp_deplibs " $test_deplib"
-	    ;;
-	  esac
-	done
-	deplibs="$tmp_deplibs"
-
-	if test -n "$convenience"; then
-	  if test -n "$whole_archive_flag_spec" &&
-	    test "$compiler_needs_object" = yes &&
-	    test -z "$libobjs"; then
-	    # extract the archives, so we have objects to list.
-	    # TODO: could optimize this to just extract one archive.
-	    whole_archive_flag_spec=
-	  fi
-	  if test -n "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	    test "X$libobjs" = "X " && libobjs=
-	  else
-	    gentop="$output_objdir/${outputname}x"
-	    func_append generated " $gentop"
-
-	    func_extract_archives $gentop $convenience
-	    func_append libobjs " $func_extract_archives_result"
-	    test "X$libobjs" = "X " && libobjs=
-	  fi
-	fi
-
-	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
-	  eval flag=\"$thread_safe_flag_spec\"
-	  func_append linker_flags " $flag"
-	fi
-
-	# Make a backup of the uninstalled library when relinking
-	if test "$opt_mode" = relink; then
-	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
-	fi
-
-	# Do each of the archive commands.
-	if test "$module" = yes && test -n "$module_cmds" ; then
-	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	    eval test_cmds=\"$module_expsym_cmds\"
-	    cmds=$module_expsym_cmds
-	  else
-	    eval test_cmds=\"$module_cmds\"
-	    cmds=$module_cmds
-	  fi
-	else
-	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	    eval test_cmds=\"$archive_expsym_cmds\"
-	    cmds=$archive_expsym_cmds
-	  else
-	    eval test_cmds=\"$archive_cmds\"
-	    cmds=$archive_cmds
-	  fi
-	fi
-
-	if test "X$skipped_export" != "X:" &&
-	   func_len " $test_cmds" &&
-	   len=$func_len_result &&
-	   test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  :
-	else
-	  # The command line is too long to link in one step, link piecewise
-	  # or, if using GNU ld and skipped_export is not :, use a linker
-	  # script.
-
-	  # Save the value of $output and $libobjs because we want to
-	  # use them later.  If we have whole_archive_flag_spec, we
-	  # want to use save_libobjs as it was before
-	  # whole_archive_flag_spec was expanded, because we can't
-	  # assume the linker understands whole_archive_flag_spec.
-	  # This may have to be revisited, in case too many
-	  # convenience libraries get linked in and end up exceeding
-	  # the spec.
-	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	  fi
-	  save_output=$output
-	  func_basename "$output"
-	  output_la=$func_basename_result
-
-	  # Clear the reloadable object creation command queue and
-	  # initialize k to one.
-	  test_cmds=
-	  concat_cmds=
-	  objlist=
-	  last_robj=
-	  k=1
-
-	  if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
-	    output=${output_objdir}/${output_la}.lnkscript
-	    func_verbose "creating GNU ld script: $output"
-	    echo 'INPUT (' > $output
-	    for obj in $save_libobjs
-	    do
-	      func_to_tool_file "$obj"
-	      $ECHO "$func_to_tool_file_result" >> $output
-	    done
-	    echo ')' >> $output
-	    func_append delfiles " $output"
-	    func_to_tool_file "$output"
-	    output=$func_to_tool_file_result
-	  elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
-	    output=${output_objdir}/${output_la}.lnk
-	    func_verbose "creating linker input file list: $output"
-	    : > $output
-	    set x $save_libobjs
-	    shift
-	    firstobj=
-	    if test "$compiler_needs_object" = yes; then
-	      firstobj="$1 "
-	      shift
-	    fi
-	    for obj
-	    do
-	      func_to_tool_file "$obj"
-	      $ECHO "$func_to_tool_file_result" >> $output
-	    done
-	    func_append delfiles " $output"
-	    func_to_tool_file "$output"
-	    output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
-	  else
-	    if test -n "$save_libobjs"; then
-	      func_verbose "creating reloadable object files..."
-	      output=$output_objdir/$output_la-${k}.$objext
-	      eval test_cmds=\"$reload_cmds\"
-	      func_len " $test_cmds"
-	      len0=$func_len_result
-	      len=$len0
-
-	      # Loop over the list of objects to be linked.
-	      for obj in $save_libobjs
-	      do
-		func_len " $obj"
-		func_arith $len + $func_len_result
-		len=$func_arith_result
-		if test "X$objlist" = X ||
-		   test "$len" -lt "$max_cmd_len"; then
-		  func_append objlist " $obj"
-		else
-		  # The command $test_cmds is almost too long, add a
-		  # command to the queue.
-		  if test "$k" -eq 1 ; then
-		    # The first file doesn't have a previous command to add.
-		    reload_objs=$objlist
-		    eval concat_cmds=\"$reload_cmds\"
-		  else
-		    # All subsequent reloadable object files will link in
-		    # the last one created.
-		    reload_objs="$objlist $last_robj"
-		    eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
-		  fi
-		  last_robj=$output_objdir/$output_la-${k}.$objext
-		  func_arith $k + 1
-		  k=$func_arith_result
-		  output=$output_objdir/$output_la-${k}.$objext
-		  objlist=" $obj"
-		  func_len " $last_robj"
-		  func_arith $len0 + $func_len_result
-		  len=$func_arith_result
-		fi
-	      done
-	      # Handle the remaining objects by creating one last
-	      # reloadable object file.  All subsequent reloadable object
-	      # files will link in the last one created.
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      reload_objs="$objlist $last_robj"
-	      eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
-	      if test -n "$last_robj"; then
-	        eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
-	      fi
-	      func_append delfiles " $output"
-
-	    else
-	      output=
-	    fi
-
-	    if ${skipped_export-false}; then
-	      func_verbose "generating symbol list for \`$libname.la'"
-	      export_symbols="$output_objdir/$libname.exp"
-	      $opt_dry_run || $RM $export_symbols
-	      libobjs=$output
-	      # Append the command to create the export file.
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
-	      if test -n "$last_robj"; then
-		eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
-	      fi
-	    fi
-
-	    test -n "$save_libobjs" &&
-	      func_verbose "creating a temporary reloadable object file: $output"
-
-	    # Loop through the commands generated above and execute them.
-	    save_ifs="$IFS"; IFS='~'
-	    for cmd in $concat_cmds; do
-	      IFS="$save_ifs"
-	      $opt_silent || {
-		  func_quote_for_expand "$cmd"
-		  eval "func_echo $func_quote_for_expand_result"
-	      }
-	      $opt_dry_run || eval "$cmd" || {
-		lt_exit=$?
-
-		# Restore the uninstalled library and exit
-		if test "$opt_mode" = relink; then
-		  ( cd "$output_objdir" && \
-		    $RM "${realname}T" && \
-		    $MV "${realname}U" "$realname" )
-		fi
-
-		exit $lt_exit
-	      }
-	    done
-	    IFS="$save_ifs"
-
-	    if test -n "$export_symbols_regex" && ${skipped_export-false}; then
-	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
-	    fi
-	  fi
-
-          if ${skipped_export-false}; then
-	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	      tmp_export_symbols="$export_symbols"
-	      test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
-	      $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
-	    fi
-
-	    if test -n "$orig_export_symbols"; then
-	      # The given exports_symbols file has to be filtered, so filter it.
-	      func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
-	      # FIXME: $output_objdir/$libname.filter potentially contains lots of
-	      # 's' commands which not all seds can handle. GNU sed should be fine
-	      # though. Also, the filter scales superlinearly with the number of
-	      # global variables. join(1) would be nice here, but unfortunately
-	      # isn't a blessed tool.
-	      $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-	      func_append delfiles " $export_symbols $output_objdir/$libname.filter"
-	      export_symbols=$output_objdir/$libname.def
-	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
-	    fi
-	  fi
-
-	  libobjs=$output
-	  # Restore the value of output.
-	  output=$save_output
-
-	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	    test "X$libobjs" = "X " && libobjs=
-	  fi
-	  # Expand the library linking commands again to reset the
-	  # value of $libobjs for piecewise linking.
-
-	  # Do each of the archive commands.
-	  if test "$module" = yes && test -n "$module_cmds" ; then
-	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	      cmds=$module_expsym_cmds
-	    else
-	      cmds=$module_cmds
-	    fi
-	  else
-	    if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	      cmds=$archive_expsym_cmds
-	    else
-	      cmds=$archive_cmds
-	    fi
-	  fi
-	fi
-
-	if test -n "$delfiles"; then
-	  # Append the command to remove temporary files to $cmds.
-	  eval cmds=\"\$cmds~\$RM $delfiles\"
-	fi
-
-	# Add any objects from preloaded convenience libraries
-	if test -n "$dlprefiles"; then
-	  gentop="$output_objdir/${outputname}x"
-	  func_append generated " $gentop"
-
-	  func_extract_archives $gentop $dlprefiles
-	  func_append libobjs " $func_extract_archives_result"
-	  test "X$libobjs" = "X " && libobjs=
-	fi
-
-	save_ifs="$IFS"; IFS='~'
-	for cmd in $cmds; do
-	  IFS="$save_ifs"
-	  eval cmd=\"$cmd\"
-	  $opt_silent || {
-	    func_quote_for_expand "$cmd"
-	    eval "func_echo $func_quote_for_expand_result"
-	  }
-	  $opt_dry_run || eval "$cmd" || {
-	    lt_exit=$?
-
-	    # Restore the uninstalled library and exit
-	    if test "$opt_mode" = relink; then
-	      ( cd "$output_objdir" && \
-	        $RM "${realname}T" && \
-		$MV "${realname}U" "$realname" )
-	    fi
-
-	    exit $lt_exit
-	  }
-	done
-	IFS="$save_ifs"
-
-	# Restore the uninstalled library and exit
-	if test "$opt_mode" = relink; then
-	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
-
-	  if test -n "$convenience"; then
-	    if test -z "$whole_archive_flag_spec"; then
-	      func_show_eval '${RM}r "$gentop"'
-	    fi
-	  fi
-
-	  exit $EXIT_SUCCESS
-	fi
-
-	# Create links to the real library.
-	for linkname in $linknames; do
-	  if test "$realname" != "$linkname"; then
-	    func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?'
-	  fi
-	done
-
-	# If -module or -export-dynamic was specified, set the dlname.
-	if test "$module" = yes || test "$export_dynamic" = yes; then
-	  # On all known operating systems, these are identical.
-	  dlname="$soname"
-	fi
-      fi
-      ;;
-
-    obj)
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	func_warning "\`-dlopen' is ignored for objects"
-      fi
-
-      case " $deplibs" in
-      *\ -l* | *\ -L*)
-	func_warning "\`-l' and \`-L' are ignored for objects" ;;
-      esac
-
-      test -n "$rpath" && \
-	func_warning "\`-rpath' is ignored for objects"
-
-      test -n "$xrpath" && \
-	func_warning "\`-R' is ignored for objects"
-
-      test -n "$vinfo" && \
-	func_warning "\`-version-info' is ignored for objects"
-
-      test -n "$release" && \
-	func_warning "\`-release' is ignored for objects"
-
-      case $output in
-      *.lo)
-	test -n "$objs$old_deplibs" && \
-	  func_fatal_error "cannot build library object \`$output' from non-libtool objects"
-
-	libobj=$output
-	func_lo2o "$libobj"
-	obj=$func_lo2o_result
-	;;
-      *)
-	libobj=
-	obj="$output"
-	;;
-      esac
-
-      # Delete the old objects.
-      $opt_dry_run || $RM $obj $libobj
-
-      # Objects from convenience libraries.  This assumes
-      # single-version convenience libraries.  Whenever we create
-      # different ones for PIC/non-PIC, this we'll have to duplicate
-      # the extraction.
-      reload_conv_objs=
-      gentop=
-      # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec and hope we can get by with
-      # turning comma into space..
-      wl=
-
-      if test -n "$convenience"; then
-	if test -n "$whole_archive_flag_spec"; then
-	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
-	  reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
-	else
-	  gentop="$output_objdir/${obj}x"
-	  func_append generated " $gentop"
-
-	  func_extract_archives $gentop $convenience
-	  reload_conv_objs="$reload_objs $func_extract_archives_result"
-	fi
-      fi
-
-      # If we're not building shared, we need to use non_pic_objs
-      test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
-
-      # Create the old-style object.
-      reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
-
-      output="$obj"
-      func_execute_cmds "$reload_cmds" 'exit $?'
-
-      # Exit if we aren't doing a library object file.
-      if test -z "$libobj"; then
-	if test -n "$gentop"; then
-	  func_show_eval '${RM}r "$gentop"'
-	fi
-
-	exit $EXIT_SUCCESS
-      fi
-
-      if test "$build_libtool_libs" != yes; then
-	if test -n "$gentop"; then
-	  func_show_eval '${RM}r "$gentop"'
-	fi
-
-	# Create an invalid libtool object if no PIC, so that we don't
-	# accidentally link it into a program.
-	# $show "echo timestamp > $libobj"
-	# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
-	exit $EXIT_SUCCESS
-      fi
-
-      if test -n "$pic_flag" || test "$pic_mode" != default; then
-	# Only do commands if we really have different PIC objects.
-	reload_objs="$libobjs $reload_conv_objs"
-	output="$libobj"
-	func_execute_cmds "$reload_cmds" 'exit $?'
-      fi
-
-      if test -n "$gentop"; then
-	func_show_eval '${RM}r "$gentop"'
-      fi
-
-      exit $EXIT_SUCCESS
-      ;;
-
-    prog)
-      case $host in
-	*cygwin*) func_stripname '' '.exe' "$output"
-	          output=$func_stripname_result.exe;;
-      esac
-      test -n "$vinfo" && \
-	func_warning "\`-version-info' is ignored for programs"
-
-      test -n "$release" && \
-	func_warning "\`-release' is ignored for programs"
-
-      test "$preload" = yes \
-        && test "$dlopen_support" = unknown \
-	&& test "$dlopen_self" = unknown \
-	&& test "$dlopen_self_static" = unknown && \
-	  func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support."
-
-      case $host in
-      *-*-rhapsody* | *-*-darwin1.[012])
-	# On Rhapsody replace the C library is the System framework
-	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
-	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
-	;;
-      esac
-
-      case $host in
-      *-*-darwin*)
-	# Don't allow lazy linking, it breaks C++ global constructors
-	# But is supposedly fixed on 10.4 or later (yay!).
-	if test "$tagname" = CXX ; then
-	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
-	    10.[0123])
-	      func_append compile_command " ${wl}-bind_at_load"
-	      func_append finalize_command " ${wl}-bind_at_load"
-	    ;;
-	  esac
-	fi
-	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
-	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	;;
-      esac
-
-
-      # move library search paths that coincide with paths to not yet
-      # installed libraries to the beginning of the library search list
-      new_libs=
-      for path in $notinst_path; do
-	case " $new_libs " in
-	*" -L$path/$objdir "*) ;;
-	*)
-	  case " $compile_deplibs " in
-	  *" -L$path/$objdir "*)
-	    func_append new_libs " -L$path/$objdir" ;;
-	  esac
-	  ;;
-	esac
-      done
-      for deplib in $compile_deplibs; do
-	case $deplib in
-	-L*)
-	  case " $new_libs " in
-	  *" $deplib "*) ;;
-	  *) func_append new_libs " $deplib" ;;
-	  esac
-	  ;;
-	*) func_append new_libs " $deplib" ;;
-	esac
-      done
-      compile_deplibs="$new_libs"
-
-
-      func_append compile_command " $compile_deplibs"
-      func_append finalize_command " $finalize_deplibs"
-
-      if test -n "$rpath$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	for libdir in $rpath $xrpath; do
-	  # This is the magic to use -rpath.
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) func_append finalize_rpath " $libdir" ;;
-	  esac
-	done
-      fi
-
-      # Now hardcode the library paths
-      rpath=
-      hardcode_libdirs=
-      for libdir in $compile_rpath $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    func_append rpath " $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) func_append perm_rpath " $libdir" ;;
-	  esac
-	fi
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-	  testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
-	  case :$dllsearchpath: in
-	  *":$libdir:"*) ;;
-	  ::) dllsearchpath=$libdir;;
-	  *) func_append dllsearchpath ":$libdir";;
-	  esac
-	  case :$dllsearchpath: in
-	  *":$testbindir:"*) ;;
-	  ::) dllsearchpath=$testbindir;;
-	  *) func_append dllsearchpath ":$testbindir";;
-	  esac
-	  ;;
-	esac
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      compile_rpath="$rpath"
-
-      rpath=
-      hardcode_libdirs=
-      for libdir in $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    func_append rpath " $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$finalize_perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) func_append finalize_perm_rpath " $libdir" ;;
-	  esac
-	fi
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      finalize_rpath="$rpath"
-
-      if test -n "$libobjs" && test "$build_old_libs" = yes; then
-	# Transform all the library objects into standard objects.
-	compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
-	finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
-      fi
-
-      func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
-
-      # template prelinking step
-      if test -n "$prelink_cmds"; then
-	func_execute_cmds "$prelink_cmds" 'exit $?'
-      fi
-
-      wrappers_required=yes
-      case $host in
-      *cegcc* | *mingw32ce*)
-        # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
-        wrappers_required=no
-        ;;
-      *cygwin* | *mingw* )
-        if test "$build_libtool_libs" != yes; then
-          wrappers_required=no
-        fi
-        ;;
-      *)
-        if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
-          wrappers_required=no
-        fi
-        ;;
-      esac
-      if test "$wrappers_required" = no; then
-	# Replace the output file specification.
-	compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
-	link_command="$compile_command$compile_rpath"
-
-	# We have no uninstalled library dependencies, so finalize right now.
-	exit_status=0
-	func_show_eval "$link_command" 'exit_status=$?'
-
-	if test -n "$postlink_cmds"; then
-	  func_to_tool_file "$output"
-	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
-	  func_execute_cmds "$postlink_cmds" 'exit $?'
-	fi
-
-	# Delete the generated files.
-	if test -f "$output_objdir/${outputname}S.${objext}"; then
-	  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
-	fi
-
-	exit $exit_status
-      fi
-
-      if test -n "$compile_shlibpath$finalize_shlibpath"; then
-	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
-      fi
-      if test -n "$finalize_shlibpath"; then
-	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
-      fi
-
-      compile_var=
-      finalize_var=
-      if test -n "$runpath_var"; then
-	if test -n "$perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $perm_rpath; do
-	    func_append rpath "$dir:"
-	  done
-	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-	if test -n "$finalize_perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $finalize_perm_rpath; do
-	    func_append rpath "$dir:"
-	  done
-	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-      fi
-
-      if test "$no_install" = yes; then
-	# We don't need to create a wrapper script.
-	link_command="$compile_var$compile_command$compile_rpath"
-	# Replace the output file specification.
-	link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
-	# Delete the old output file.
-	$opt_dry_run || $RM $output
-	# Link the executable and exit
-	func_show_eval "$link_command" 'exit $?'
-
-	if test -n "$postlink_cmds"; then
-	  func_to_tool_file "$output"
-	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
-	  func_execute_cmds "$postlink_cmds" 'exit $?'
-	fi
-
-	exit $EXIT_SUCCESS
-      fi
-
-      if test "$hardcode_action" = relink; then
-	# Fast installation is not supported
-	link_command="$compile_var$compile_command$compile_rpath"
-	relink_command="$finalize_var$finalize_command$finalize_rpath"
-
-	func_warning "this platform does not like uninstalled shared libraries"
-	func_warning "\`$output' will be relinked during installation"
-      else
-	if test "$fast_install" != no; then
-	  link_command="$finalize_var$compile_command$finalize_rpath"
-	  if test "$fast_install" = yes; then
-	    relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
-	  else
-	    # fast_install is set to needless
-	    relink_command=
-	  fi
-	else
-	  link_command="$compile_var$compile_command$compile_rpath"
-	  relink_command="$finalize_var$finalize_command$finalize_rpath"
-	fi
-      fi
-
-      # Replace the output file specification.
-      link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
-
-      # Delete the old output files.
-      $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
-
-      func_show_eval "$link_command" 'exit $?'
-
-      if test -n "$postlink_cmds"; then
-	func_to_tool_file "$output_objdir/$outputname"
-	postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
-	func_execute_cmds "$postlink_cmds" 'exit $?'
-      fi
-
-      # Now create the wrapper script.
-      func_verbose "creating $output"
-
-      # Quote the relink command for shipping.
-      if test -n "$relink_command"; then
-	# Preserve any variables that may affect compiler behavior
-	for var in $variables_saved_for_relink; do
-	  if eval test -z \"\${$var+set}\"; then
-	    relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
-	  elif eval var_value=\$$var; test -z "$var_value"; then
-	    relink_command="$var=; export $var; $relink_command"
-	  else
-	    func_quote_for_eval "$var_value"
-	    relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
-	  fi
-	done
-	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
-      fi
-
-      # Only actually do things if not in dry run mode.
-      $opt_dry_run || {
-	# win32 will think the script is a binary if it has
-	# a .exe suffix, so we strip it off here.
-	case $output in
-	  *.exe) func_stripname '' '.exe' "$output"
-	         output=$func_stripname_result ;;
-	esac
-	# test for cygwin because mv fails w/o .exe extensions
-	case $host in
-	  *cygwin*)
-	    exeext=.exe
-	    func_stripname '' '.exe' "$outputname"
-	    outputname=$func_stripname_result ;;
-	  *) exeext= ;;
-	esac
-	case $host in
-	  *cygwin* | *mingw* )
-	    func_dirname_and_basename "$output" "" "."
-	    output_name=$func_basename_result
-	    output_path=$func_dirname_result
-	    cwrappersource="$output_path/$objdir/lt-$output_name.c"
-	    cwrapper="$output_path/$output_name.exe"
-	    $RM $cwrappersource $cwrapper
-	    trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
-
-	    func_emit_cwrapperexe_src > $cwrappersource
-
-	    # The wrapper executable is built using the $host compiler,
-	    # because it contains $host paths and files. If cross-
-	    # compiling, it, like the target executable, must be
-	    # executed on the $host or under an emulation environment.
-	    $opt_dry_run || {
-	      $LTCC $LTCFLAGS -o $cwrapper $cwrappersource
-	      $STRIP $cwrapper
-	    }
-
-	    # Now, create the wrapper script for func_source use:
-	    func_ltwrapper_scriptname $cwrapper
-	    $RM $func_ltwrapper_scriptname_result
-	    trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
-	    $opt_dry_run || {
-	      # note: this script will not be executed, so do not chmod.
-	      if test "x$build" = "x$host" ; then
-		$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
-	      else
-		func_emit_wrapper no > $func_ltwrapper_scriptname_result
-	      fi
-	    }
-	  ;;
-	  * )
-	    $RM $output
-	    trap "$RM $output; exit $EXIT_FAILURE" 1 2 15
-
-	    func_emit_wrapper no > $output
-	    chmod +x $output
-	  ;;
-	esac
-      }
-      exit $EXIT_SUCCESS
-      ;;
-    esac
-
-    # See if we need to build an old-fashioned archive.
-    for oldlib in $oldlibs; do
-
-      if test "$build_libtool_libs" = convenience; then
-	oldobjs="$libobjs_save $symfileobj"
-	addlibs="$convenience"
-	build_libtool_libs=no
-      else
-	if test "$build_libtool_libs" = module; then
-	  oldobjs="$libobjs_save"
-	  build_libtool_libs=no
-	else
-	  oldobjs="$old_deplibs $non_pic_objects"
-	  if test "$preload" = yes && test -f "$symfileobj"; then
-	    func_append oldobjs " $symfileobj"
-	  fi
-	fi
-	addlibs="$old_convenience"
-      fi
-
-      if test -n "$addlibs"; then
-	gentop="$output_objdir/${outputname}x"
-	func_append generated " $gentop"
-
-	func_extract_archives $gentop $addlibs
-	func_append oldobjs " $func_extract_archives_result"
-      fi
-
-      # Do each command in the archive commands.
-      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
-	cmds=$old_archive_from_new_cmds
-      else
-
-	# Add any objects from preloaded convenience libraries
-	if test -n "$dlprefiles"; then
-	  gentop="$output_objdir/${outputname}x"
-	  func_append generated " $gentop"
-
-	  func_extract_archives $gentop $dlprefiles
-	  func_append oldobjs " $func_extract_archives_result"
-	fi
-
-	# POSIX demands no paths to be encoded in archives.  We have
-	# to avoid creating archives with duplicate basenames if we
-	# might have to extract them afterwards, e.g., when creating a
-	# static archive out of a convenience library, or when linking
-	# the entirety of a libtool archive into another (currently
-	# not supported by libtool).
-	if (for obj in $oldobjs
-	    do
-	      func_basename "$obj"
-	      $ECHO "$func_basename_result"
-	    done | sort | sort -uc >/dev/null 2>&1); then
-	  :
-	else
-	  echo "copying selected object files to avoid basename conflicts..."
-	  gentop="$output_objdir/${outputname}x"
-	  func_append generated " $gentop"
-	  func_mkdir_p "$gentop"
-	  save_oldobjs=$oldobjs
-	  oldobjs=
-	  counter=1
-	  for obj in $save_oldobjs
-	  do
-	    func_basename "$obj"
-	    objbase="$func_basename_result"
-	    case " $oldobjs " in
-	    " ") oldobjs=$obj ;;
-	    *[\ /]"$objbase "*)
-	      while :; do
-		# Make sure we don't pick an alternate name that also
-		# overlaps.
-		newobj=lt$counter-$objbase
-		func_arith $counter + 1
-		counter=$func_arith_result
-		case " $oldobjs " in
-		*[\ /]"$newobj "*) ;;
-		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
-		esac
-	      done
-	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
-	      func_append oldobjs " $gentop/$newobj"
-	      ;;
-	    *) func_append oldobjs " $obj" ;;
-	    esac
-	  done
-	fi
-	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
-	tool_oldlib=$func_to_tool_file_result
-	eval cmds=\"$old_archive_cmds\"
-
-	func_len " $cmds"
-	len=$func_len_result
-	if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  cmds=$old_archive_cmds
-	elif test -n "$archiver_list_spec"; then
-	  func_verbose "using command file archive linking..."
-	  for obj in $oldobjs
-	  do
-	    func_to_tool_file "$obj"
-	    $ECHO "$func_to_tool_file_result"
-	  done > $output_objdir/$libname.libcmd
-	  func_to_tool_file "$output_objdir/$libname.libcmd"
-	  oldobjs=" $archiver_list_spec$func_to_tool_file_result"
-	  cmds=$old_archive_cmds
-	else
-	  # the command line is too long to link in one step, link in parts
-	  func_verbose "using piecewise archive linking..."
-	  save_RANLIB=$RANLIB
-	  RANLIB=:
-	  objlist=
-	  concat_cmds=
-	  save_oldobjs=$oldobjs
-	  oldobjs=
-	  # Is there a better way of finding the last object in the list?
-	  for obj in $save_oldobjs
-	  do
-	    last_oldobj=$obj
-	  done
-	  eval test_cmds=\"$old_archive_cmds\"
-	  func_len " $test_cmds"
-	  len0=$func_len_result
-	  len=$len0
-	  for obj in $save_oldobjs
-	  do
-	    func_len " $obj"
-	    func_arith $len + $func_len_result
-	    len=$func_arith_result
-	    func_append objlist " $obj"
-	    if test "$len" -lt "$max_cmd_len"; then
-	      :
-	    else
-	      # the above command should be used before it gets too long
-	      oldobjs=$objlist
-	      if test "$obj" = "$last_oldobj" ; then
-		RANLIB=$save_RANLIB
-	      fi
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
-	      objlist=
-	      len=$len0
-	    fi
-	  done
-	  RANLIB=$save_RANLIB
-	  oldobjs=$objlist
-	  if test "X$oldobjs" = "X" ; then
-	    eval cmds=\"\$concat_cmds\"
-	  else
-	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
-	  fi
-	fi
-      fi
-      func_execute_cmds "$cmds" 'exit $?'
-    done
-
-    test -n "$generated" && \
-      func_show_eval "${RM}r$generated"
-
-    # Now create the libtool archive.
-    case $output in
-    *.la)
-      old_library=
-      test "$build_old_libs" = yes && old_library="$libname.$libext"
-      func_verbose "creating $output"
-
-      # Preserve any variables that may affect compiler behavior
-      for var in $variables_saved_for_relink; do
-	if eval test -z \"\${$var+set}\"; then
-	  relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
-	elif eval var_value=\$$var; test -z "$var_value"; then
-	  relink_command="$var=; export $var; $relink_command"
-	else
-	  func_quote_for_eval "$var_value"
-	  relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
-	fi
-      done
-      # Quote the link command for shipping.
-      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
-      if test "$hardcode_automatic" = yes ; then
-	relink_command=
-      fi
-
-      # Only create the output if not a dry run.
-      $opt_dry_run || {
-	for installed in no yes; do
-	  if test "$installed" = yes; then
-	    if test -z "$install_libdir"; then
-	      break
-	    fi
-	    output="$output_objdir/$outputname"i
-	    # Replace all uninstalled libtool libraries with the installed ones
-	    newdependency_libs=
-	    for deplib in $dependency_libs; do
-	      case $deplib in
-	      *.la)
-		func_basename "$deplib"
-		name="$func_basename_result"
-		func_resolve_sysroot "$deplib"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
-		test -z "$libdir" && \
-		  func_fatal_error "\`$deplib' is not a valid libtool archive"
-		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
-		;;
-	      -L*)
-		func_stripname -L '' "$deplib"
-		func_replace_sysroot "$func_stripname_result"
-		func_append newdependency_libs " -L$func_replace_sysroot_result"
-		;;
-	      -R*)
-		func_stripname -R '' "$deplib"
-		func_replace_sysroot "$func_stripname_result"
-		func_append newdependency_libs " -R$func_replace_sysroot_result"
-		;;
-	      *) func_append newdependency_libs " $deplib" ;;
-	      esac
-	    done
-	    dependency_libs="$newdependency_libs"
-	    newdlfiles=
-
-	    for lib in $dlfiles; do
-	      case $lib in
-	      *.la)
-	        func_basename "$lib"
-		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-		test -z "$libdir" && \
-		  func_fatal_error "\`$lib' is not a valid libtool archive"
-		func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
-		;;
-	      *) func_append newdlfiles " $lib" ;;
-	      esac
-	    done
-	    dlfiles="$newdlfiles"
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      case $lib in
-	      *.la)
-		# Only pass preopened files to the pseudo-archive (for
-		# eventual linking with the app. that links it) if we
-		# didn't already link the preopened objects directly into
-		# the library:
-		func_basename "$lib"
-		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-		test -z "$libdir" && \
-		  func_fatal_error "\`$lib' is not a valid libtool archive"
-		func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
-		;;
-	      esac
-	    done
-	    dlprefiles="$newdlprefiles"
-	  else
-	    newdlfiles=
-	    for lib in $dlfiles; do
-	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      func_append newdlfiles " $abs"
-	    done
-	    dlfiles="$newdlfiles"
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      func_append newdlprefiles " $abs"
-	    done
-	    dlprefiles="$newdlprefiles"
-	  fi
-	  $RM $output
-	  # place dlname in correct position for cygwin
-	  # In fact, it would be nice if we could use this code for all target
-	  # systems that can't hard-code library paths into their executables
-	  # and that have no shared library path variable independent of PATH,
-	  # but it turns out we can't easily determine that from inspecting
-	  # libtool variables, so we have to hard-code the OSs to which it
-	  # applies here; at the moment, that means platforms that use the PE
-	  # object format with DLL files.  See the long comment at the top of
-	  # tests/bindir.at for full details.
-	  tdlname=$dlname
-	  case $host,$output,$installed,$module,$dlname in
-	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
-	      # If a -bindir argument was supplied, place the dll there.
-	      if test "x$bindir" != x ;
-	      then
-		func_relative_path "$install_libdir" "$bindir"
-		tdlname=$func_relative_path_result$dlname
-	      else
-		# Otherwise fall back on heuristic.
-		tdlname=../bin/$dlname
-	      fi
-	      ;;
-	  esac
-	  $ECHO > $output "\
-# $outputname - a libtool library file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='$tdlname'
-
-# Names of this library.
-library_names='$library_names'
-
-# The name of the static archive.
-old_library='$old_library'
-
-# Linker flags that can not go in dependency_libs.
-inherited_linker_flags='$new_inherited_linker_flags'
-
-# Libraries that this one depends upon.
-dependency_libs='$dependency_libs'
-
-# Names of additional weak libraries provided by this library
-weak_library_names='$weak_libs'
-
-# Version information for $libname.
-current=$current
-age=$age
-revision=$revision
-
-# Is this an already installed library?
-installed=$installed
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=$module
-
-# Files to dlopen/dlpreopen
-dlopen='$dlfiles'
-dlpreopen='$dlprefiles'
-
-# Directory that this library needs to be installed in:
-libdir='$install_libdir'"
-	  if test "$installed" = no && test "$need_relink" = yes; then
-	    $ECHO >> $output "\
-relink_command=\"$relink_command\""
-	  fi
-	done
-      }
-
-      # Do a symbolic link so that the libtool archive can be found in
-      # LD_LIBRARY_PATH before the program is installed.
-      func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?'
-      ;;
-    esac
-    exit $EXIT_SUCCESS
-}
-
-{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
-    func_mode_link ${1+"$@"}
-
-
-# func_mode_uninstall arg...
-func_mode_uninstall ()
-{
-    $opt_debug
-    RM="$nonopt"
-    files=
-    rmforce=
-    exit_status=0
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    for arg
-    do
-      case $arg in
-      -f) func_append RM " $arg"; rmforce=yes ;;
-      -*) func_append RM " $arg" ;;
-      *) func_append files " $arg" ;;
-      esac
-    done
-
-    test -z "$RM" && \
-      func_fatal_help "you must specify an RM program"
-
-    rmdirs=
-
-    for file in $files; do
-      func_dirname "$file" "" "."
-      dir="$func_dirname_result"
-      if test "X$dir" = X.; then
-	odir="$objdir"
-      else
-	odir="$dir/$objdir"
-      fi
-      func_basename "$file"
-      name="$func_basename_result"
-      test "$opt_mode" = uninstall && odir="$dir"
-
-      # Remember odir for removal later, being careful to avoid duplicates
-      if test "$opt_mode" = clean; then
-	case " $rmdirs " in
-	  *" $odir "*) ;;
-	  *) func_append rmdirs " $odir" ;;
-	esac
-      fi
-
-      # Don't error if the file doesn't exist and rm -f was used.
-      if { test -L "$file"; } >/dev/null 2>&1 ||
-	 { test -h "$file"; } >/dev/null 2>&1 ||
-	 test -f "$file"; then
-	:
-      elif test -d "$file"; then
-	exit_status=1
-	continue
-      elif test "$rmforce" = yes; then
-	continue
-      fi
-
-      rmfiles="$file"
-
-      case $name in
-      *.la)
-	# Possibly a libtool archive, so verify it.
-	if func_lalib_p "$file"; then
-	  func_source $dir/$name
-
-	  # Delete the libtool libraries and symlinks.
-	  for n in $library_names; do
-	    func_append rmfiles " $odir/$n"
-	  done
-	  test -n "$old_library" && func_append rmfiles " $odir/$old_library"
-
-	  case "$opt_mode" in
-	  clean)
-	    case " $library_names " in
-	    *" $dlname "*) ;;
-	    *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
-	    esac
-	    test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
-	    ;;
-	  uninstall)
-	    if test -n "$library_names"; then
-	      # Do each command in the postuninstall commands.
-	      func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
-	    fi
-
-	    if test -n "$old_library"; then
-	      # Do each command in the old_postuninstall commands.
-	      func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
-	    fi
-	    # FIXME: should reinstall the best remaining shared library.
-	    ;;
-	  esac
-	fi
-	;;
-
-      *.lo)
-	# Possibly a libtool object, so verify it.
-	if func_lalib_p "$file"; then
-
-	  # Read the .lo file
-	  func_source $dir/$name
-
-	  # Add PIC object to the list of files to remove.
-	  if test -n "$pic_object" &&
-	     test "$pic_object" != none; then
-	    func_append rmfiles " $dir/$pic_object"
-	  fi
-
-	  # Add non-PIC object to the list of files to remove.
-	  if test -n "$non_pic_object" &&
-	     test "$non_pic_object" != none; then
-	    func_append rmfiles " $dir/$non_pic_object"
-	  fi
-	fi
-	;;
-
-      *)
-	if test "$opt_mode" = clean ; then
-	  noexename=$name
-	  case $file in
-	  *.exe)
-	    func_stripname '' '.exe' "$file"
-	    file=$func_stripname_result
-	    func_stripname '' '.exe' "$name"
-	    noexename=$func_stripname_result
-	    # $file with .exe has already been added to rmfiles,
-	    # add $file without .exe
-	    func_append rmfiles " $file"
-	    ;;
-	  esac
-	  # Do a test to see if this is a libtool program.
-	  if func_ltwrapper_p "$file"; then
-	    if func_ltwrapper_executable_p "$file"; then
-	      func_ltwrapper_scriptname "$file"
-	      relink_command=
-	      func_source $func_ltwrapper_scriptname_result
-	      func_append rmfiles " $func_ltwrapper_scriptname_result"
-	    else
-	      relink_command=
-	      func_source $dir/$noexename
-	    fi
-
-	    # note $name still contains .exe if it was in $file originally
-	    # as does the version of $file that was added into $rmfiles
-	    func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
-	    if test "$fast_install" = yes && test -n "$relink_command"; then
-	      func_append rmfiles " $odir/lt-$name"
-	    fi
-	    if test "X$noexename" != "X$name" ; then
-	      func_append rmfiles " $odir/lt-${noexename}.c"
-	    fi
-	  fi
-	fi
-	;;
-      esac
-      func_show_eval "$RM $rmfiles" 'exit_status=1'
-    done
-
-    # Try to remove the ${objdir}s in the directories where we deleted files
-    for dir in $rmdirs; do
-      if test -d "$dir"; then
-	func_show_eval "rmdir $dir >/dev/null 2>&1"
-      fi
-    done
-
-    exit $exit_status
-}
-
-{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
-    func_mode_uninstall ${1+"$@"}
-
-test -z "$opt_mode" && {
-  help="$generic_help"
-  func_fatal_help "you must specify a MODE"
-}
-
-test -z "$exec_cmd" && \
-  func_fatal_help "invalid operation mode \`$opt_mode'"
-
-if test -n "$exec_cmd"; then
-  eval exec "$exec_cmd"
-  exit $EXIT_FAILURE
-fi
-
-exit $exit_status
-
-
-# The TAGs below are defined such that we never get into a situation
-# in which we disable both kinds of libraries.  Given conflicting
-# choices, we go for a static library, that is the most portable,
-# since we can't tell whether shared libraries were disabled because
-# the user asked for that or because the platform doesn't support
-# them.  This is particularly important on AIX, because we don't
-# support having both static and shared libraries enabled at the same
-# time on that platform, so we default to a shared-only configuration.
-# If a disable-shared tag is given, we'll fallback to a static-only
-# configuration.  But we'll never go from static-only to shared-only.
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
-build_libtool_libs=no
-build_old_libs=yes
-# ### END LIBTOOL TAG CONFIG: disable-shared
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-static
-build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
-# ### END LIBTOOL TAG CONFIG: disable-static
-
-# Local Variables:
-# mode:shell-script
-# sh-indentation:2
-# End:
-# vi:sw=2
-
diff --git a/bin/make_err b/bin/make_err
index 4b1f474..31cb964 100755
--- a/bin/make_err
+++ b/bin/make_err
@@ -1,20 +1,18 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
 require 5.003;
 $indent=4;
+use warnings;
 
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 #
 
 # Create error headers
@@ -33,17 +31,14 @@ sub print_copyright ($) {
 
     print $fh "/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\n";
     print $fh " * Copyright by The HDF Group.                                               *\n";
-    print $fh " * Copyright by the Board of Trustees of the University of Illinois.         *\n";
     print $fh " * All rights reserved.                                                      *\n";
     print $fh " *                                                                           *\n";
     print $fh " * This file is part of HDF5.  The full HDF5 copyright notice, including     *\n";
     print $fh " * terms governing use, modification, and redistribution, is contained in    *\n";
-    print $fh " * the files COPYING and Copyright.html.  COPYING can be found at the root   *\n";
-    print $fh " * of the source code distribution tree; Copyright.html can be found at the  *\n";
-    print $fh " * root level of an installed copy of the electronic HDF5 document set and   *\n";
-    print $fh " * is linked from the top-level documents page.  It can also be found at     *\n";
-    print $fh " * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *\n";
-    print $fh " * access to either file, you may request a copy from help\@hdfgroup.org.     *\n";
+    print $fh " * the COPYING file, which can be found at the root of the source code       *\n";
+    print $fh " * distribution tree, or in https://www.hdfgroup.org/licenses.               *\n";
+    print $fh " * If you do not have access to either file, you may request a copy from     *\n";
+    print $fh " * help\@hdfgroup.org.                                                        *\n";
     print $fh " * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */\n";
 }
 
@@ -67,8 +62,8 @@ sub print_startprotect ($$) {
     $file =~ s/(\w*)\.h/$1/;
 
     # Print the ifdef info
-    print $fh "\n#ifndef _${file}_H\n";
-    print $fh "#define _${file}_H\n";
+    print $fh "\n#ifndef ${file}_H\n";
+    print $fh "#define ${file}_H\n";
 }
 
 ##############################################################################
@@ -175,6 +170,12 @@ sub create_public ($) {
     print_warning(*HEADER);
     print_startprotect(*HEADER, $file);
 
+    # Begin extern C block
+    print HEADER "\n";
+    print HEADER "#ifdef __cplusplus\n";
+    print HEADER "extern \"C\" {\n";
+    print HEADER "#endif\n";
+
     # Iterate over all the major errors
     print HEADER "\n/*********************/\n";
     print HEADER   "/* Major error codes */\n";
@@ -202,6 +203,12 @@ sub create_public ($) {
         }
     }
 
+    # End extern C block
+    print HEADER "\n";
+    print HEADER "#ifdef __cplusplus\n";
+    print HEADER "}\n";
+    print HEADER "#endif\n";
+
     print_endprotect(*HEADER, $file);
 
     # Close header file
@@ -236,8 +243,8 @@ sub create_init ($) {
     print HEADER   "/* Major error codes */\n";
     print HEADER   "/*********************/\n\n";
     foreach $name (keys %major) {
-        print HEADER " "x(0*$indent),"assert(${name}_g==(-1));\n";
-        print HEADER " "x(0*$indent),"if((msg = H5E_create_msg(cls, H5E_MAJOR, \"${major{$name}}\"))==NULL)\n";
+        print HEADER " "x(0*$indent),"HDassert(${name}_g==(-1));\n";
+        print HEADER " "x(0*$indent),"if((msg = H5E__create_msg(cls, H5E_MAJOR, \"${major{$name}}\"))==NULL)\n";
         print HEADER " "x(1*$indent),"HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, \"error message initialization failed\")\n";
         print HEADER " "x(0*$indent),"if((${name}_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)\n";
         print HEADER " "x(1*$indent),"HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, \"can't register error message\")\n";
@@ -252,8 +259,8 @@ sub create_init ($) {
 
         # Iterate over all the minor errors in each section
         for $name ( @{$section_list{$sect_name}}) {
-            print HEADER " "x(0*$indent),"assert(${name}_g==(-1));\n";
-            print HEADER " "x(0*$indent),"if((msg = H5E_create_msg(cls, H5E_MINOR, \"${minor{$name}}\"))==NULL)\n";
+            print HEADER " "x(0*$indent),"HDassert(${name}_g==(-1));\n";
+            print HEADER " "x(0*$indent),"if((msg = H5E__create_msg(cls, H5E_MINOR, \"${minor{$name}}\"))==NULL)\n";
             print HEADER " "x(1*$indent),"HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, \"error message initialization failed\")\n";
             print HEADER " "x(0*$indent),"if((${name}_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)\n";
             print HEADER " "x(1*$indent),"HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, \"can't register error message\")\n";
diff --git a/bin/make_overflow b/bin/make_overflow
index ced486a..33cbdfe 100755
--- a/bin/make_overflow
+++ b/bin/make_overflow
@@ -1,6 +1,7 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
 require 5.003;
 use strict;
+use warnings;
 
 # Global settings
 
@@ -9,17 +10,14 @@ my @ctypes = ( () );
 
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 #
 
 # Create assignment overflow #ifdefs
@@ -62,17 +60,14 @@ sub print_copyright ($) {
 
     print $fh "/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\n";
     print $fh " * Copyright by The HDF Group.                                               *\n";
-    print $fh " * Copyright by the Board of Trustees of the University of Illinois.         *\n";
     print $fh " * All rights reserved.                                                      *\n";
     print $fh " *                                                                           *\n";
     print $fh " * This file is part of HDF5.  The full HDF5 copyright notice, including     *\n";
     print $fh " * terms governing use, modification, and redistribution, is contained in    *\n";
-    print $fh " * the files COPYING and Copyright.html.  COPYING can be found at the root   *\n";
-    print $fh " * of the source code distribution tree; Copyright.html can be found at the  *\n";
-    print $fh " * root level of an installed copy of the electronic HDF5 document set and   *\n";
-    print $fh " * is linked from the top-level documents page.  It can also be found at     *\n";
-    print $fh " * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *\n";
-    print $fh " * access to either file, you may request a copy from help\@hdfgroup.org.     *\n";
+    print $fh " * the COPYING file, which can be found at the root of the source code       *\n";
+    print $fh " * distribution tree, or in https://www.hdfgroup.org/licenses.               *\n";
+    print $fh " * If you do not have access to either file, you may request a copy from     *\n";
+    print $fh " * help\@hdfgroup.org.                                                        *\n";
     print $fh " * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */\n";
 }
 
@@ -96,8 +91,8 @@ sub print_startprotect ($$) {
     $file =~ s/(\w*)\.h/$1/;
 
     # Print the ifdef info
-    print $fh "\n#ifndef _${file}_H\n";
-    print $fh "#define _${file}_H\n";
+    print $fh "\n#ifndef ${file}_H\n";
+    print $fh "#define ${file}_H\n";
 }
 
 ##############################################################################
diff --git a/bin/make_vers b/bin/make_vers
index 0bc3b62..1e21bf7 100755
--- a/bin/make_vers
+++ b/bin/make_vers
@@ -1,14 +1,15 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
 require 5.003;
+use warnings;
 
 # Global settings
 # (The max_idx parameter is the only thing that needs to be changed when adding
 #       support for a new major release.  If support for a prior major release
 #       is added (like support for 1.4, etc), the min_sup_idx parameter will
-#       need to be decremented. - QAK)
+#       need to be decremented.)
 
-# Max. library "index" (0 = v1.0, 1 = 1.2, etc)
-$max_idx = 5;
+# Max. library "index" (0 = v1.0, 1 = 1.2, 2 = 1.4, 3 = 1.6, 4 = 1.8, 5 = 1.10, 6 = 1.12, 7 = 1.14, 8 = 1.16, etc)
+$max_idx = 8;
 
 # Min. supported previous library version "index" (0 = v1.0, 1 = 1.2, etc)
 $min_sup_idx = 3;
@@ -18,17 +19,14 @@ $indent = 2;
 
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 #
 
 # Create public symbol version headers
@@ -47,17 +45,14 @@ sub print_copyright ($) {
 
     print $fh "/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\n";
     print $fh " * Copyright by The HDF Group.                                               *\n";
-    print $fh " * Copyright by the Board of Trustees of the University of Illinois.         *\n";
     print $fh " * All rights reserved.                                                      *\n";
     print $fh " *                                                                           *\n";
     print $fh " * This file is part of HDF5.  The full HDF5 copyright notice, including     *\n";
     print $fh " * terms governing use, modification, and redistribution, is contained in    *\n";
-    print $fh " * the files COPYING and Copyright.html.  COPYING can be found at the root   *\n";
-    print $fh " * of the source code distribution tree; Copyright.html can be found at the  *\n";
-    print $fh " * root level of an installed copy of the electronic HDF5 document set and   *\n";
-    print $fh " * is linked from the top-level documents page.  It can also be found at     *\n";
-    print $fh " * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *\n";
-    print $fh " * access to either file, you may request a copy from help\@hdfgroup.org.     *\n";
+    print $fh " * the COPYING file, which can be found at the root of the source code       *\n";
+    print $fh " * distribution tree, or in https://www.hdfgroup.org/licenses.               *\n";
+    print $fh " * If you do not have access to either file, you may request a copy from     *\n";
+    print $fh " * help\@hdfgroup.org.                                                        *\n";
     print $fh " * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */\n";
 }
 
@@ -81,8 +76,8 @@ sub print_startprotect ($$) {
     $file =~ s/(\w*)\.h/$1/;
 
     # Print the ifdef info
-    print $fh "\n#ifndef _${file}_H\n";
-    print $fh "#define _${file}_H\n";
+    print $fh "\n#ifndef ${file}_H\n";
+    print $fh "#define ${file}_H\n";
 }
 
 ##############################################################################
@@ -93,7 +88,8 @@ sub print_checkoptions ($) {
     my $curr_idx;               # Current API version index
 
     # Print the option checking
-    print $fh "\n/* Issue error if contradicting macros have been defined. */\n";
+    print $fh "\n\n/* Issue error if contradicting macros have been defined. */\n";
+    print $fh "/* (Can't use an older (deprecated) API version if deprecated symbols have been disabled) */\n";
 
     # Print the #ifdef
     print $fh "#if (";
@@ -122,26 +118,40 @@ sub print_checkoptions ($) {
 ##############################################################################
 # Print "global" API version macro settings
 #
-sub print_globalapivers ($) {
+sub print_globalapidefvers ($) {
     my $fh = shift;             # File handle for output file
     my $curr_idx;               # Current API version index
 
     # Print the descriptive comment
-    print $fh "\n\n/* If a particular \"global\" version of the library's interfaces is chosen,\n";
-    print $fh " *      set the versions for the API symbols affected.\n";
+    print $fh "\n\n/* If a particular default \"global\" version of the library's interfaces is\n";
+    print $fh " *      chosen, set the corresponding version macro for API symbols.\n";
     print $fh " *\n";
-    print $fh " * Note: If an application has already chosen a particular version for an\n";
-    print $fh " *      API symbol, the individual API version macro takes priority.\n";
     print $fh " */\n";
 
     for $curr_idx ($min_sup_idx .. ($max_idx - 1)) {
         # Print API version ifdef
-        print $fh "#if defined(H5_USE_1", ($curr_idx * 2), "_API_DEFAULT) && !defined(H5_USE_1", ($curr_idx * 2), "_API)\n";
+        print $fh "\n#if defined(H5_USE_1", ($curr_idx * 2), "_API_DEFAULT) && !defined(H5_USE_1", ($curr_idx * 2), "_API)\n";
         # Print API version definition
         print $fh " " x $indent, "#define H5_USE_1", ($curr_idx * 2), "_API 1\n";
         # Print API version endif
-        print $fh "#endif /* H5_USE_1", ($curr_idx * 2), "_API_DEFAULT && !H5_USE_1", ($curr_idx * 2), "_API */\n\n";
+        print $fh "#endif /* H5_USE_1", ($curr_idx * 2), "_API_DEFAULT && !H5_USE_1", ($curr_idx * 2), "_API */\n";
     }
+}
+
+##############################################################################
+# Print "global" API symbol version macro settings
+#
+sub print_globalapisymbolvers ($) {
+    my $fh = shift;             # File handle for output file
+    my $curr_idx;               # Current API version index
+
+    # Print the descriptive comment
+    print $fh "\n\n/* If a particular \"global\" version of the library's interfaces is chosen,\n";
+    print $fh " *      set the versions for the API symbols affected.\n";
+    print $fh " *\n";
+    print $fh " * Note: If an application has already chosen a particular version for an\n";
+    print $fh " *      API symbol, the individual API version macro takes priority.\n";
+    print $fh " */\n";
 
     # Loop over supported older library APIs and define the appropriate macros
     for $curr_idx ($min_sup_idx .. ($max_idx - 1)) {
@@ -342,7 +352,18 @@ sub parse_line ($) {
             my $vers_idx;       # Index of version in array
 
             # Do some validation on the input
-            if(!( $_ =~ /v1[02468]/ || $_ =~ /v11[02468]/ )) {
+            # Note:  v111 is allowed because H5O functions were prematurely versioned
+            #        in HDF5 1.10.  Because users were affected by this, the versioning
+            #        was rescinded but the H5O version 2 functions were kept to be 
+            #        called directly.  Now that the version macros are added in 1.12,
+            #        along with a 3rd version of the H5O functions, the H5O function
+            #        version for default api=v110 should be version 1 to work correctly
+            #        with 1.10 applications that were using unversioned H5O functions,
+            #        and the H5O function version should be version 3 for default api=v112 
+            #        (the default api version for 1.12).  Allowing a v111 entry and 
+            #        incrementing its index 13 lines below allows a version 2 that is
+            #        never accessed via the H5O function macros.
+            if(!( $_ =~ /v1[02468]/ || $_ =~ /v11[02468]/ ||  $_ =~ /v111/ )) {
                 die "bad version information: $name";
             }
             if(exists($sym_versions{$_})) {
@@ -355,6 +376,9 @@ sub parse_line ($) {
 #print "parse_line: _=$_\n";
             # Get the index of the version
             ($vers_idx) = ($_ =~ /v1(\d+)/);
+            if($vers_idx == 11) {
+                $vers_idx++;
+            }
             $vers_idx /= 2;
 #print "parse_line: vers_idx='$vers_idx'\n";
             push(@vers_nums, $vers_idx);
@@ -447,8 +471,9 @@ sub create_public ($) {
     print_copyright(*HEADER);
     print_warning(*HEADER);
     print_startprotect(*HEADER, $file);
+    print_globalapidefvers(*HEADER);
     print_checkoptions(*HEADER);
-    print_globalapivers(*HEADER);
+    print_globalapisymbolvers(*HEADER);
     print_defaultapivers(*HEADER);
     print_endprotect(*HEADER, $file);
 
@@ -482,7 +507,7 @@ for $file (@ARGV) {
         }
     }
     close SOURCE;
-  
+
     # Create header files
     print "Generating '", $prefix, "H5version.h'\n";
     create_public($prefix);
diff --git a/bin/makehelp b/bin/makehelp
index d6fbda2..4707397 100755
--- a/bin/makehelp
+++ b/bin/makehelp
@@ -40,6 +40,7 @@ make distclean:         remove all files generated by make, make check, or
 make check-p:           Only run parallel tests
 make check-s:           Only run serial tests
 make check-vfd:         Run tests with each virtual file driver
+make check-vol:         Run tests with each virtual object layer connector
 
 HDF5 uses Automake, so any standard Automake targets not listed here
 should also work.
diff --git a/bin/missing b/bin/missing
deleted file mode 100755
index db98974..0000000
--- a/bin/missing
+++ /dev/null
@@ -1,215 +0,0 @@
-#! /bin/sh
-# Common wrapper for a few potentially missing GNU programs.
-
-scriptversion=2013-10-28.13; # UTC
-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
-# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try '$0 --help' for more information"
-  exit 1
-fi
-
-case $1 in
-
-  --is-lightweight)
-    # Used by our autoconf macros to check whether the available missing
-    # script is modern enough.
-    exit 0
-    ;;
-
-  --run)
-    # Back-compat with the calling convention used by older automake.
-    shift
-    ;;
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
-to PROGRAM being missing or too old.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-
-Supported PROGRAM values:
-  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
-  bison     yacc      flex         lex       help2man
-
-Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
-'g' are ignored when checking the name.
-
-Send bug reports to <bug-automake@gnu.org>."
-    exit $?
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing $scriptversion (GNU Automake)"
-    exit $?
-    ;;
-
-  -*)
-    echo 1>&2 "$0: unknown '$1' option"
-    echo 1>&2 "Try '$0 --help' for more information"
-    exit 1
-    ;;
-
-esac
-
-# Run the given program, remember its exit status.
-"$@"; st=$?
-
-# If it succeeded, we are done.
-test $st -eq 0 && exit 0
-
-# Also exit now if we it failed (or wasn't found), and '--version' was
-# passed; such an option is passed most likely to detect whether the
-# program is present and works.
-case $2 in --version|--help) exit $st;; esac
-
-# Exit code 63 means version mismatch.  This often happens when the user
-# tries to use an ancient version of a tool on a file that requires a
-# minimum version.
-if test $st -eq 63; then
-  msg="probably too old"
-elif test $st -eq 127; then
-  # Program was missing.
-  msg="missing on your system"
-else
-  # Program was found and executed, but failed.  Give up.
-  exit $st
-fi
-
-perl_URL=http://www.perl.org/
-flex_URL=http://flex.sourceforge.net/
-gnu_software_URL=http://www.gnu.org/software
-
-program_details ()
-{
-  case $1 in
-    aclocal|automake)
-      echo "The '$1' program is part of the GNU Automake package:"
-      echo "<$gnu_software_URL/automake>"
-      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
-      echo "<$gnu_software_URL/autoconf>"
-      echo "<$gnu_software_URL/m4/>"
-      echo "<$perl_URL>"
-      ;;
-    autoconf|autom4te|autoheader)
-      echo "The '$1' program is part of the GNU Autoconf package:"
-      echo "<$gnu_software_URL/autoconf/>"
-      echo "It also requires GNU m4 and Perl in order to run:"
-      echo "<$gnu_software_URL/m4/>"
-      echo "<$perl_URL>"
-      ;;
-  esac
-}
-
-give_advice ()
-{
-  # Normalize program name to check for.
-  normalized_program=`echo "$1" | sed '
-    s/^gnu-//; t
-    s/^gnu//; t
-    s/^g//; t'`
-
-  printf '%s\n' "'$1' is $msg."
-
-  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
-  case $normalized_program in
-    autoconf*)
-      echo "You should only need it if you modified 'configure.ac',"
-      echo "or m4 files included by it."
-      program_details 'autoconf'
-      ;;
-    autoheader*)
-      echo "You should only need it if you modified 'acconfig.h' or"
-      echo "$configure_deps."
-      program_details 'autoheader'
-      ;;
-    automake*)
-      echo "You should only need it if you modified 'Makefile.am' or"
-      echo "$configure_deps."
-      program_details 'automake'
-      ;;
-    aclocal*)
-      echo "You should only need it if you modified 'acinclude.m4' or"
-      echo "$configure_deps."
-      program_details 'aclocal'
-      ;;
-   autom4te*)
-      echo "You might have modified some maintainer files that require"
-      echo "the 'autom4te' program to be rebuilt."
-      program_details 'autom4te'
-      ;;
-    bison*|yacc*)
-      echo "You should only need it if you modified a '.y' file."
-      echo "You may want to install the GNU Bison package:"
-      echo "<$gnu_software_URL/bison/>"
-      ;;
-    lex*|flex*)
-      echo "You should only need it if you modified a '.l' file."
-      echo "You may want to install the Fast Lexical Analyzer package:"
-      echo "<$flex_URL>"
-      ;;
-    help2man*)
-      echo "You should only need it if you modified a dependency" \
-           "of a man page."
-      echo "You may want to install the GNU Help2man package:"
-      echo "<$gnu_software_URL/help2man/>"
-    ;;
-    makeinfo*)
-      echo "You should only need it if you modified a '.texi' file, or"
-      echo "any other file indirectly affecting the aspect of the manual."
-      echo "You might want to install the Texinfo package:"
-      echo "<$gnu_software_URL/texinfo/>"
-      echo "The spurious makeinfo call might also be the consequence of"
-      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
-      echo "want to install GNU make:"
-      echo "<$gnu_software_URL/make/>"
-      ;;
-    *)
-      echo "You might have modified some files without having the proper"
-      echo "tools for further handling them.  Check the 'README' file, it"
-      echo "often tells you about the needed prerequisites for installing"
-      echo "this package.  You may also peek at any GNU archive site, in"
-      echo "case some other package contains this missing '$1' program."
-      ;;
-  esac
-}
-
-give_advice "$1" | sed -e '1s/^/WARNING: /' \
-                       -e '2,$s/^/         /' >&2
-
-# Propagate the correct exit status (expected to be 127 for a program
-# not found, 63 for a program that failed due to version mismatch).
-exit $st
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/bin/mkdirs b/bin/mkdirs
deleted file mode 100755
index 694a754..0000000
--- a/bin/mkdirs
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /bin/sh
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-#
-# This is a small program which will create directories n-levels deep.
-# You just call it with something like:
-#
-#       mkdirs /tmp/foo/bar/baz
-#
-# and it will create all the directories from /tmp down to baz which
-# don't exist.
-#
-chmodprog="${CHMODPROG-chmod}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-make_dir () {
-  if test ! -d $1; then
-    make_dir `echo $1 | sed -e 's#/[^/]*$##'`
-    $mkdirprog $1
-    $chmodprog 755 $1
-  fi
-}
-
-make_dir `echo $1 | sed -e 's#/$##'`
diff --git a/bin/mkinstalldirs b/bin/mkinstalldirs
deleted file mode 100755
index 994d71c..0000000
--- a/bin/mkinstalldirs
+++ /dev/null
@@ -1,101 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain
-
-# $Id$
-
-errstatus=0
-dirmode=""
-
-usage="\
-Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
-
-# process command line arguments
-while test $# -gt 0 ; do
-   case "${1}" in
-     -h | --help | --h* )			# -h for help
-	echo "${usage}" 1>&2; exit 0 ;;
-     -m )					# -m PERM arg
-	shift
-	test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; }
-	dirmode="${1}"
-	shift ;;
-     -- ) shift; break ;;			# stop option processing
-     -* ) echo "${usage}" 1>&2; exit 1 ;;	# unknown option
-     * )  break ;;				# first non-opt arg
-   esac
-done
-
-for file
-do
-  if test -d "$file"; then
-    shift
-  else
-    break
-  fi
-done
-
-case $# in
-0) exit 0 ;;
-esac
-
-case $dirmode in
-'')
-  if mkdir -p -- . 2>/dev/null; then
-    echo "mkdir -p -- $*"
-    exec mkdir -p -- "$@"
-  fi ;;
-*)
-  if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
-    echo "mkdir -m $dirmode -p -- $*"
-    exec mkdir -m "$dirmode" -p -- "$@"
-  fi ;;
-esac
-
-for file
-do
-   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-   shift
-
-   pathcomp=
-   for d
-   do
-     pathcomp="$pathcomp$d"
-     case "$pathcomp" in
-       -* ) pathcomp=./$pathcomp ;;
-     esac
-
-     if test ! -d "$pathcomp"; then
-	echo "mkdir $pathcomp"
-
-	mkdir "$pathcomp" || lasterr=$?
-
-	if test ! -d "$pathcomp"; then
-	  errstatus=$lasterr
-	else
-	  if test ! -z "$dirmode"; then
-	     echo "chmod $dirmode $pathcomp"
-
-	     lasterr=""
-	     chmod "$dirmode" "$pathcomp" || lasterr=$?
-
-	     if test ! -z "$lasterr"; then
-	       errstatus=$lasterr
-	     fi
-	  fi
-	fi
-     fi
-
-     pathcomp="$pathcomp/"
-   done
-done
-
-exit $errstatus
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 3
-# End:
-# mkinstalldirs ends here
diff --git a/bin/newer b/bin/newer
deleted file mode 100755
index 8ed9f87..0000000
--- a/bin/newer
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-#
-# Compare the modification time of file argument 1 against other file arguments.
-# Return true (0) if argument 1 is newer than all others, otherwise return
-# false (1).  If any of the argument is not a file, return false (1).
-#
-# Programmer: Albert Cheng
-# Created Date: 2005/07/06
-# Modification:
-#    Albert Cheng 2005/8/30
-#    Changed from two arguments to mulitple arguments.
-
-if test $# -lt 2; then
-    exit 1
-fi
-if test ! -f $1; then
-    exit 1
-fi
-f1=$1
-shift
-
-for f in $*; do
-    if test ! -f $f; then
-	exit 1
-    fi
-    if test X = X`find $f1 -newer $f -print`; then
-	exit 1
-    fi
-done
-
-# passed all tests.  Must be a file newer than all others.
-exit 0
diff --git a/bin/output_filter.sh b/bin/output_filter.sh
index 58f1c48..a2216fd 100644
--- a/bin/output_filter.sh
+++ b/bin/output_filter.sh
@@ -3,12 +3,10 @@
 ##
 ## This file is part of HDF5.  The full HDF5 copyright notice, including
 ## terms governing use, modification, and redistribution, is contained in
-## the files COPYING and Copyright.html.  COPYING can be found at the root
-## of the source code distribution tree; Copyright.html can be found at the
-## root level of an installed copy of the electronic HDF5 document set and
-## is linked from the top-level documents page.  It can also be found at
-## http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-## access to either file, you may request a copy from help@hdfgroup.org.
+## the COPYING file, which can be found at the root of the source code
+## distribution tree, or in https://www.hdfgroup.org/licenses.
+## If you do not have access to either file, you may request a copy from
+## help@hdfgroup.org.
 
 # This contains function definitions of output filtering.
 # This file should only be sourced in by another shell script.
@@ -17,6 +15,21 @@
 # Created Date: 2011/5/3
 
 
+# Comment added to address HDFFV-8270:
+# As I understand it, the purpose of this file is to remove extraneous messages 
+# that appear in stdout and stderr on some machines that have been tested outside 
+# of the HDF Group realm.  The purpose of this script is to filter those 
+# extraneous messages from stdout and stderr so that when the output files are
+# compared to the expected output, the extra messages will not cause failures in 
+# the tests.  The system messages in the comments below are out of date, meaning
+# I suppose that while the script code to filter messages on the system was 
+# correct correct when last used, the output in the comments doesn't match the
+# script code that follows.  I don't currently have access to any of these 
+# systems to see the current output and the effect of the script code. If using
+# this file in the future, please update the comments to match the scripts in use.
+# Larry Knox 2017/3/15
+
+
 # Some systems will dump some messages to stdout for various reasons.
 # Remove them from the stdout result file.
 # $1 is the file name of the file to be filtered.
@@ -48,26 +61,21 @@ STDOUT_FILTER() {
 # Remove them from the stderr result file.
 # $1 is the file name of the file to be filtered.
 # Cases of filter needed:
-# 1. MPE:
-# In parallel mode and if MPE library is used, it prints the following
-# two message lines whether the MPE tracing is used or not.
-#    Writing logfile.
-#    Finished writing logfile.
-# 2. LANL MPI:
+# * LANL MPI:
 # The LANL MPI will print some messages like the following,
 #    LA-MPI: *** mpirun (1.5.10)
 #    LA-MPI: *** 3 process(es) on 2 host(s): 2*fln21 1*fln22
 #    LA-MPI: *** libmpi (1.5.10)
 #    LA-MPI: *** Copyright 2001-2004, ACL, Los Alamos National Laboratory
-# 3. h5diff debug output:
+# * h5diff debug output:
 #    Debug output all have prefix "h5diff debug: ".
-# 4. AIX system prints messages like these when it is aborting:
+# * AIX system prints messages like these when it is aborting:
 #    ERROR: 0031-300  Forcing all remote tasks to exit due to exit code 1 in task 0
 #    ERROR: 0031-250  task 4: Terminated
 #    ERROR: 0031-250  task 3: Terminated
 #    ERROR: 0031-250  task 2: Terminated
 #    ERROR: 0031-250  task 1: Terminated
-# 5. LLNL Blue-Gene mpirun prints messages like there when it exit non-zero:
+# * LLNL Blue-Gene mpirun prints messages like there when it exit non-zero:
 #    <Apr 12 15:01:49.075658> BE_MPI (ERROR): The error message in the job record is as follows:
 #    <Apr 12 15:01:49.075736> BE_MPI (ERROR):   "killed by exit(1) on node 0"
 STDERR_FILTER() {
@@ -78,12 +86,6 @@ STDERR_FILTER() {
     cp $result_file $tmp_file
     sed -e '/ BE_MPI (ERROR): /d' \
 	< $tmp_file > $result_file
-    # Filter MPE messages
-    if test -n "$pmode"; then
-	cp $result_file $tmp_file
-	sed -e '/^Writing logfile./d' -e '/^Finished writing logfile./d' \
-	    < $tmp_file > $result_file
-    fi
     # Filter LANL MPI messages
     # and LLNL srun messages
     # and AIX error messages
diff --git a/bin/pkgscrpts/h5rmflags b/bin/pkgscrpts/h5rmflags
new file mode 100755
index 0000000..39c4281
--- /dev/null
+++ b/bin/pkgscrpts/h5rmflags
@@ -0,0 +1,164 @@
+#! /bin/sh
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
+
+## Remove paths to libraries used to build HDF5 when packaging HDF5
+## binaries.
+## For help page, use "h5rmflags -help"
+
+# Constants definitions
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+
+# Function definitions
+
+# show help page
+usage() {
+  # A wonderfully informative "usage" message.
+  echo "usage: $prog_name [OPTIONS]"
+  echo "  OPTIONS:"
+  echo "    -help|help   This help message"
+  echo "    -echo        Show all the shell commands executed"
+  echo "    -force       No prompt, just do it"
+  echo "    -prefix=DIR  New directory to find HDF5 lib/ and include/"
+  echo "                   subdirectories [default: current directory]"
+  echo "    -tool=TOOL   Tool to update. TOOL must be in the current"
+  echo "                   directory and writable. [default: $h5tools]"
+  echo "    -show        Show the commands without executing them"
+  echo " "
+  exit $EXIT_FAILURE
+}
+
+# display variable values
+dump_vars(){
+    echo "====Showing all variable values====="
+    echo prefix=$prefix
+    echo h5tools=$h5tools
+    echo "====End Showing====="
+}
+
+# show actions to be taken
+show_action()
+{
+    echo "Update the following tools because they are now installed at a new directory"
+    for t in $foundtools; do
+	echo "${t}:"
+	echo "   current setting=`sed -e '/^prefix=/s/prefix=//p' -e d $t`"
+	echo "   new     setting="\""$prefix"\"
+    done
+}
+
+
+# Report Error message
+ERROR()
+{
+    echo "***ERROR***"
+    echo "$1"
+}
+
+# Main
+#
+# Initialization
+h5tools="h5cc h5pcc h5fc h5pfc h5c++"	# possible hdf5 tools
+foundtools=		# tools found and will be modified
+fmode=			# force mode, default is off
+prefix=`(cd ..;pwd)`
+
+# Parse options
+for arg in $@ ; do
+  case "$arg" in
+    -prefix=*)
+      prefix="`expr "$arg" : '-prefix=\(.*\)'`"
+      ;;
+    -echo)
+      set -x
+      ;;
+    -show)
+      SHOW="echo"
+      ;;
+    -tool=*)
+      h5tools="`expr "$arg" : '-tool=\(.*\)'`"
+      ;;
+    -help|help)
+      usage
+      ;;
+    -force)
+      fmode=yes
+      ;;
+    *)
+      ERROR "Unknown Option($arg)"
+      usage
+      exit $EXIT_FAILURE
+      ;;
+  esac
+done
+
+# Sanity checks
+#if [ ! -d $prefix ]; then
+#    ERROR "prefix($prefix) is not an existing directory"
+#    exit $EXIT_FAILURE
+#fi
+
+for x in $h5tools; do
+    if [ -f $x ]; then
+	foundtools="$foundtools $x"
+	if [ ! -w $x ]; then
+	    ERROR "h5tool($x) is not writable"
+	    exit $EXIT_FAILURE
+	fi
+    fi
+done
+
+if [ -z "$foundtools" ]; then
+    ERROR "found no tools to modify"
+    exit $EXIT_FAILURE
+fi
+
+# Show actions to be taken and get consent
+show_action
+
+
+# Update them
+if [ "$SHOW" = "echo" ]; then
+    echo "===Update commands are:===="
+#    cat $CMDFILE
+    echo "===End Update commands====="
+fi
+
+for t in $foundtools; do
+    echo Update $t ...
+#    COMMAND="ed - $t"
+#    if [ "$SHOW" = "echo" ]; then
+#	echo $COMMAND
+#    else
+#        $COMMAND < $CMDFILE
+    ed - $t << end
+    g/^H5BLD_CPPFLAGS/s/-I\/.*include //g
+    g/^H5BLD_LDFLAGS/s/-L\/.*lib //g
+    g/^H5BLD_LDFLAGS/s/-L\/.*lib64 //g
+    .
+    w
+end
+#    fi
+done
+
+
+# Cleanup
+#rm -f $CMDFILE
+exit $EXIT_SUCCESS
+
+# Some possible future features to add
+# CCBASE - Name of the alternative C compiler
+# CLINKERBASE - Name of the alternative linker
+# LDFLAGS   - Path to different libraries your application will link with
+#     (this path should include the path to the zlib library)
+# LIBS      - Libraries your application will link with
diff --git a/bin/pkgscrpts/makeHDF5BinaryTarfiles.pl b/bin/pkgscrpts/makeHDF5BinaryTarfiles.pl
new file mode 100755
index 0000000..820403f
--- /dev/null
+++ b/bin/pkgscrpts/makeHDF5BinaryTarfiles.pl
@@ -0,0 +1,365 @@
+#!/usr/bin/perl
+# makeTarFiles.pl
+
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
+#
+#
+use warnings;
+use strict;
+use Cwd;
+use File::Basename;
+
+
+my %destsubdir = ('emu' => 'sunos-5.11-sparc-32-sunc512',
+                  'emu64' => 'sunos-5.11-sparc-64-sunc512',
+                  'ostrich' => 'linux-el6-ppc64-gcc447',
+                  'ostrichxl' => 'linux-el6-ppc64-xl13.1',
+                  'platypus' => 'linux-centos6-x86_64-gcc447',
+                  'platypus32' => 'linux-centos6-x86_64-32-gcc447',
+                  'moohan' => 'linux-centos7-x86_64-gcc485',
+                  'moohan32' => 'linux-centos7-x86_64-32-gcc485',
+                  'kite' => 'osx-10.8-x86_64-clang5.1',
+                  'quail' => 'osx-10.9-x86_64-clang6.0',
+                  'osx1010test' => 'osx-10.10-x86_64-clang6.0');
+
+my %szipdir = ('emu' =>  '/mnt/hdf/packages/szip/shared/encoder/SunOS-5.10',
+               'emu-static' => '/mnt/hdf/packages/szip/static/encoder/SunOS-5.10',
+               'emu64' => '/mnt/hdf/packages/szip-PIC/shared/encoder/SunOS-5.11-64',
+               'emu64-static' => '/mnt/hdf/packages/szip-PIC/shared/encoder/SunOS-5.11-64',
+               'kite' => '/mnt/hdf/packages/szip/shared/encoder/MacOS-10.8',
+               'kite-static' => '/mnt/hdf/packages/szip-PIC/static/encoder/MacOS-10.8',
+               'ostrich32' => '/mnt/hdf/packages/szip/shared/encoder/Linux2.6-ppc64-gcc',
+               'ostrich32-static' => '/mnt/hdf/packages/szip/static/encoder/Linux2.6-ibmppc64-gcc-32',
+               'ostrich' => '/mnt/hdf/packages/szip/shared/encoder/Linux2.6-ppc64-gcc-64',
+               'ostrich-static' => '/mnt/hdf/packages/szip/static/encoder/Linux2.6-ibmppc64-gcc',
+               'ostrichxl' => '/mnt/hdf/packages/szip/shared/encoder/Linux2.6-ppc64-gcc-64',
+               'ostrichxl-static' => '/mnt/hdf/packages/szip/static/encoder/Linux2.6-ibmppc64-gcc',
+               'osx1010test' => '/mnt/hdf/packages/szip/shared/encoder/MacOS-10.8',
+               'osx1010test-static' => '/mnt/hdf/packages/szip-PIC/static/encoder/MacOS-10.8',
+               'moohan' => '/mnt/hdf/packages/szip/shared/encoder/Linux2.6-x86_64-gcc',
+               'moohan-static' => '/mnt/hdf/packages/szip/static/encoder/Linux2.6-x86_64-gcc',
+               'moohan32' => '/mnt/hdf/packages/szip/shared/encoder/Linux2.6-x86_64-gcc-m32',
+               'moohan32-static' => '/mnt/hdf/packages/szip-PIC/static/encoder/Linux2.6-x86_64-gcc-m32',
+               'platypus32' => '/mnt/hdf/packages/szip/shared/encoder/Linux2.6-x86_64-gcc-m32',
+               'platypus32-static' => '/mnt/hdf/packages/szip-PIC/static/encoder/Linux2.6-x86_64-gcc-m32',
+               'platypus' => '/mnt/hdf/packages/szip/shared/encoder/Linux2.6-x86_64-gcc',
+               'platypus-static' => '/mnt/hdf/packages/szip/static/encoder/Linux2.6-x86_64-gcc',
+               'quail' => '/mnt/hdf/packages/szip/shared/encoder/MacOS-10.8',
+               'quail-static' => '/mnt/hdf/packages/szip-PIC/static/encoder/MacOS-10.8');
+
+my %zlibdir = ('emu' => '/mnt/hdf/packages/zlib-125/shared/SunOS-5.10',
+               'emu-static' => '/mnt/hdf/packages/zlib-125/static/SunOS-5.10',
+               'emu64' => '/mnt/hdf/packages/zlib-123-PIC/SunOS-5.11-64',
+               'emu64-static' => '/mnt/hdf/packages/zlib-123-PIC/SunOS-5.11-64',
+               'kite' => ' /mnt/hdf/packages/zlib-125/shared/mac-intel-x86_64',
+               'kite-static' => ' /mnt/hdf/packages/zlib-125/static/mac-intel-x86_64',
+               'ostrich32' => '/mnt/hdf/packages/zlib-125/PIC/Linux2.6-ppc64-gcc',
+               'ostrich32-static' => '/mnt/hdf/packages/zlib-125/PIC/Linux2.6-ppc64-gcc',
+               'ostrich' => '/mnt/hdf/packages/zlib-125/PIC/Linux2.6-ppc64-gcc-64',
+               'ostrich-static'  => '/mnt/hdf/packages/zlib-125/PIC/Linux2.6-ppc64-gcc-64',
+               'ostrichxl' => '/mnt/hdf/packages/zlib-125/PIC/Linux2.6-ppc64-gcc-64',
+               'ostrichxl-static'  => '/mnt/hdf/packages/zlib-125/PIC/Linux2.6-ppc64-gcc-64',
+               'osx1010test' => ' /mnt/hdf/packages/zlib-125/shared/mac-intel-x86_64',
+               'osx1010test-static' => ' /mnt/hdf/packages/zlib-125/static/mac-intel-x86_64',
+               'moohan' => '/mnt/hdf/packages/zlib-125/shared/Linux2.6-x86_64-gcc',
+               'moohan-static' => '/mnt/hdf/packages/zlib-125/static/Linux2.6-x86_64-gcc',
+               'moohan32' => '/mnt/hdf/packages/zlib-128/Linux2.6-x86_64-gcc-m32',
+               'moohan32-static' => '/mnt/hdf/packages/zlib-128/Linux2.6-x86_64-gcc-m32',
+               'platypus32' => '/mnt/hdf/packages/zlib-128/Linux2.6-x86_64-gcc-m32',
+               'platypus32-static' => '/mnt/hdf/packages/zlib-128/Linux2.6-x86_64-gcc-m32',
+               'platypus' => '/mnt/hdf/packages/zlib-125/shared/Linux2.6-x86_64-gcc',
+               'platypus-static' => '/mnt/hdf/packages/zlib-125/static/Linux2.6-x86_64-gcc',
+               'quail' => ' /mnt/hdf/packages/zlib-125/shared/mac-intel-x86_64',
+               'quail-static' => ' /mnt/hdf/packages/zlib-125/static/mac-intel-x86_64');
+
+my $indirectory = ".";
+$indirectory = shift;
+
+my $outdirectory = ".";
+$outdirectory = shift;
+
+my $key = ".";
+#$key = shift;
+
+my $scriptdirname = dirname(__FILE__);
+
+unless (-d $outdirectory) {
+   print "$outdirectory not found.  Create it or choose another one and try again.\n";
+   exit 1;
+}
+ 
+print "Subdirectories of $indirectory will be tarred and stored in $outdirectory.\n";
+
+
+my $tarfilename;
+my $tardirname;
+my $output;
+my $cmd;
+
+# I'm currently copying system zlibs for at least solaris and FreeBSD machines.  Since this script runs on jam it may require scp to get the libs.
+
+#For future reference
+# command for getting szlib files and links for shared binaries:
+# tar cvf - -C <szipDir>/lib . | tar xvf - -C <libdir> .
+# libz.so.1.2.3 and the static files should just be copied because they're in directories
+# with other files.  Then create the libz.so.1 and libz.so symbolic links.
+sub addzandszlibs {
+   my $dir = shift;
+   my $indirectory = shift;
+   my $currentdir = getcwd();
+
+   if (-d "$indirectory/$dir" ) {
+      my $szdir = $szipdir{$dir};
+      my $zldir = $zlibdir{$dir};
+      if ($dir =~ /static/ || $dir =~ /ostrich/) {
+         $cmd = "cp $szdir/lib/libsz.a $indirectory/$dir/lib";
+         $output = `$cmd`;
+         print $output;
+         $cmd = "cp $zldir/lib/libz.a $indirectory/$dir/lib";
+         $output = `$cmd`;
+         print $output;
+      } elsif ($dir eq "freedom" || $dir eq "loyalty") {
+         $cmd = "cp $szdir/lib/libsz.so.2 $indirectory/$dir/lib";
+         $output = `$cmd`;
+         print $output;
+         $cmd = "cp $zldir/lib/libz.so.5 $indirectory/$dir/lib";
+         $output = `$cmd`;
+         print $output;
+         
+         chdir "$indirectory/$dir/lib" or die "Couldn't change directory to $indirectory/$dir/lib, $!";
+         $cmd = "ln -s libsz.so.2 libsz.so";
+         $output = `$cmd`;
+         print $output;
+
+         $cmd = "ln -s libz.so.5 libz.so";
+         $output = `$cmd`;
+         print $output;
+
+         chdir $currentdir or die "Couldn't change directory back to $currentdir, $!";
+      } elsif ($dir eq "quail" || $dir eq "kite" || $dir eq "osx1010test") {
+         #we've been using the static libraries for the macs - built with -fPIC
+#         $cmd = "cp $szdir/lib/libsz.a $indirectory/$dir/lib";
+#         $output = `$cmd`;
+#         print $output;
+#         $cmd = "cp $zldir/lib/libz.a $indirectory/$dir/lib";
+#         $output = `$cmd`;
+#         print $output;
+         $cmd = "cp $szdir/lib/libsz.2.0.0.dylib $indirectory/$dir/lib";
+         $output = `$cmd`;
+         print $output;
+         $cmd = "cp $zldir/lib/libz.1.2.5.dylib $indirectory/$dir/lib";
+         $output = `$cmd`;
+         print $output;
+
+         chdir "$indirectory/$dir/lib" or die "Couldn't change directory to $indirectory/$dir/lib, $!";
+         $cmd = "ln -s libsz.2.0.0.dylib libsz.2.dylib";
+         $output = `$cmd`;
+         print $output;
+
+         $cmd = "ln -s libsz.2.0.0.dylib libsz.dylib";
+         $output = `$cmd`;
+         print $output;
+
+         $cmd = "ln -s libz.1.2.5.dylib libz.1.dylib";
+         $output = `$cmd`;
+         print $output;
+
+         $cmd = "ln -s libz.1.2.5.dylib libz.dylib";
+         $output = `$cmd`;
+         print $output;
+
+         chdir $currentdir or die "Couldn't change directory back to $currentdir, $!";
+
+      } elsif ($dir eq "emu64") {
+         $cmd = "cp $szdir/lib/libsz.so.2.0.0 $indirectory/$dir/lib";
+         $output = `$cmd`;
+         print $output;
+         $cmd = "cp $zldir/lib/libz.a $indirectory/$dir/lib";
+         $output = `$cmd`;
+         print $output;
+         
+         chdir "$indirectory/$dir/lib" or die "Couldn't change directory to $indirectory/$dir/lib, $!";
+         $cmd = "ln -s libsz.so.2.0.0 libsz.so.2";
+         $output = `$cmd`;
+         print $output;
+
+         $cmd = "ln -s libsz.so.2.0.0 libsz.so";
+         $output = `$cmd`;
+         print $output;
+
+         chdir $currentdir or die "Couldn't change directory back to $currentdir, $!";
+
+      } elsif ($dir eq "platypus32" || $dir eq "moohan32") {
+         $cmd = "cp $szdir/lib/libsz.so.2.0.0 $indirectory/$dir/lib";
+         $output = `$cmd`;
+         print $output;
+
+        # $cmd = "cp $zldir/lib/libz.a $indirectory/$dir/lib";
+        # $output = `$cmd`;
+        # print $output;
+
+         chdir "$indirectory/$dir/lib" or die "Couldn't change directory to $indirectory/$dir/lib, $!";
+         $cmd = "ln -s libsz.so.2.0.0 libsz.so.2";
+         $output = `$cmd`;
+         print $output;
+
+         $cmd = "ln -s libsz.so.2.0.0 libsz.so";
+         $output = `$cmd`;
+         print $output;
+
+        # $cmd = "ln -s libz.so.1.2.8 libz.so.1";
+        # $output = `$cmd`;
+        # print $output;
+
+        # $cmd = "ln -s libz.so.1.2.8 libz.so";
+        # $output = `$cmd`;
+        # print $output;
+
+         chdir $currentdir or die "Couldn't change directory back to $currentdir, $!";
+
+      } else {
+         $cmd = "cp $szdir/lib/libsz.so.2.0.0 $indirectory/$dir/lib";
+         $output = `$cmd`;
+         print $output;
+
+         $cmd = "cp $zldir/lib/libz.so.1.2.5 $indirectory/$dir/lib";
+         $output = `$cmd`;
+         print $output;
+         
+         chdir "$indirectory/$dir/lib" or die "Couldn't change directory to $indirectory/$dir/lib, $!";
+         $cmd = "ln -s libsz.so.2.0.0 libsz.so.2";
+         $output = `$cmd`;
+         print $output;
+
+         $cmd = "ln -s libsz.so.2.0.0 libsz.so";
+         $output = `$cmd`;
+         print $output;
+
+         $cmd = "ln -s libz.so.1.2.5 libz.so.1";
+         $output = `$cmd`;
+         print $output;
+
+         $cmd = "ln -s libz.so.1.2.5 libz.so";
+         $output = `$cmd`;
+         print $output;
+
+         chdir $currentdir or die "Couldn't change directory back to $currentdir, $!";
+      }
+   }
+}
+
+sub makeTarFile { 
+   my $directoryname = shift;
+   my $origdirname = shift;
+   my $tarfilename = shift;
+   my $tardirname = shift;
+   $cmd = "mv $indirectory/$origdirname $indirectory/$tardirname";
+   $output = `$cmd`;
+   print $output;
+   if (-d $indirectory."/".$tardirname."/doc/hdf5/examples") {
+      $cmd = "mv $indirectory/$tardirname/doc/hdf5/examples $indirectory/$tardirname/examples";
+      $output = `$cmd`;
+      print $output;
+      $cmd = "rm -rf $indirectory/$tardirname/doc";
+      $output = `$cmd`;
+      print $output;
+   }
+   $cmd = "tar zcvf $outdirectory/$directoryname/$tarfilename -C $indirectory $tardirname";
+   print "Need to run $cmd.\n";
+   $output = `$cmd`;
+   sleep 10;
+   print "Create $tarfilename:  $output\n";
+   $cmd = "mv $indirectory/$tardirname $indirectory/$origdirname";
+   $output = `$cmd`;
+   print $output;
+}
+
+foreach $key (keys %destsubdir) {
+   print "Process ".$key."\n\n";
+   #skip unless there's a directory by the name of $key or $key-static
+   next unless -d $indirectory.'/'.$key || -d $indirectory.'/'.$key."-static";
+   my $version;
+   # This assumes a static directory.  Probably the others should be checked if this
+   # doesn't exist.
+   $cmd = "grep \"HDF5 Version\" $indirectory/$key/lib/libhdf5.settings";
+   $_ = `$cmd`;
+   print $_, "\n";
+   s/HDF5 Version://;
+   s/^\s+//;
+   chomp;
+   $version = $_;
+   #my $directoryname = substr $destsubdir{$key}, 0, rindex($destsubdir{$key}, '-');
+   my $directoryname = $destsubdir{$key};
+   mkdir $outdirectory."/".$directoryname, 0755 unless -d $outdirectory."/".$directoryname;
+   my $staticdir = $key."-static";
+   print $indirectory."/$key tarfile will be put in " . $outdirectory."/".$directoryname."\n";
+   if (-e $outdirectory."/".$destsubdir{$key}."/README") {
+      print $outdirectory."/".$destsubdir{$key}."/README" . " has already been created.\n";
+   }
+   else {
+      print "Make the Outer README file:  ";
+      $cmd = "perl ./makeOuterREADME.pl $indirectory/$key $outdirectory $directoryname";
+      print $cmd, "\n";
+      my $output = `$cmd`;
+      print $output;
+   }
+   my $file = "";
+   my @dirnames = "";
+   opendir(DIR, $indirectory) or die "can't open .: $!";
+   while (defined($file = readdir(DIR))) {
+      next unless ($file eq $key || $file eq "$key-static") && -d $indirectory."/".$file;
+      push @dirnames, $file;
+   }
+   foreach my $dir (@dirnames) {
+      next if $dir eq "";
+      print "Make the Inner README files.\n";
+      $cmd = "perl ./makeInternalREADME.pl $indirectory/$dir";
+      print $cmd, "\n";
+      $output = `$cmd`;
+      print $output;
+      print "Add the zlib and szip files for $dir.\n";
+      &addzandszlibs($dir, $indirectory);
+      my $currentdir = getcwd();
+     
+      print "Remove all lib*.la files from $dir/lib*.\n";
+      $cmd = "rm $indirectory/$dir/lib*/lib*.la";
+      print $cmd, "\n";
+      $output = `$cmd`;
+      print $output;
+
+      chdir "$indirectory/$dir/bin" or die "Couldn't change directory to $indirectory/$dir/bin, $!";
+
+      $cmd = "$scriptdirname/h5rmflags -force";
+      $output = `$cmd`;
+      print $output;
+      chdir $currentdir or die "Couldn't change directory back to $currentdir, $!";
+      print "Tar up the files into the output directory.\n";
+      if (-d $indirectory."/".$dir) {
+         if ($dir =~ /static/) {
+            $tarfilename = "hdf5-$version-$destsubdir{$key}-static.tar.gz";
+            $tardirname = "hdf5-$version-$destsubdir{$key}-static";
+         } else {
+            $tarfilename = "hdf5-$version-$destsubdir{$key}-shared.tar.gz";
+            $tardirname = "hdf5-$version-$destsubdir{$key}-shared";
+         }            
+         &makeTarFile($directoryname, $dir, $tarfilename, $tardirname);
+      }
+   } 
+      # If this copy is done after h5rmflags is run on all the directories the compile scripts
+      # in the utilities directory will already have the paths removed. 
+   if (-d $indirectory."/".$staticdir) {
+      $cmd = "cp -prv $indirectory/$staticdir/bin $outdirectory/$directoryname/utilities";
+      $output = `$cmd`;
+      print $output;
+   }
+}
+
diff --git a/bin/reconfigure b/bin/reconfigure
deleted file mode 100755
index 7a0f437..0000000
--- a/bin/reconfigure
+++ /dev/null
@@ -1,152 +0,0 @@
-#! /bin/sh
-#
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-#
-
-# A script to reconfigure autotools for HDF5, and to recreate other
-# generated files specifc to HDF5.
-# If the paths of the autotools are not specified by the user, they
-# are hardcoded to point to their locations on HDF5 Linux machines.
-# Users can specify the locations of the autotools with the following
-# variables:
-# AUTOCONF, AUTOMAKE, ACLOCAL, AUTOHEADER should be the path to the
-# corresponding tools.
-# LIBTOOL_DIR should be the path to the base libtool directory;
-# $LIBTOOL_DIR/bin/libtool should invoke libtool, while
-# $LIBTOOL_DIR/share/aclocal needs to be included by aclocal.
-# Be very careful when specifying these tools manually!  There are a lot
-# of versions that can get confused (not even counting the m4 utility)!
-
-# HDF5 currently uses the following versions of the autotools:
-AUTOCONF_VERSION="autoconf (GNU Autoconf) 2.69"
-AUTOMAKE_VERSION="automake (GNU automake) 1.14.1"
-AUTOHEADER_VERSION="autoheader (GNU Autoconf) 2.69"
-ACLOCAL_VERSION="aclocal (GNU automake) 1.14.1"
-LIBTOOL_VERSION="(GNU libtool) 2.4.2"
-M4_VERSION="m4 (GNU M4) 1.4.17"
-
-#
-# When upgrading automake's version, don't forget to also update its
-# helper utilities, especially depcomp.
-
-
-# If paths to autotools are not specified by the user, assume tools are
-# running on jam in /mnt/hdf/packages and set paths accordingly.
-if test -z ${AUTORECONF}; then
-  AUTORECONF=/mnt/hdf/packages/autoconf/autoconf-2.69/bin/autoreconf
-fi
-if test -z ${AUTOCONF}; then
-  AUTOCONF=/mnt/hdf/packages/autoconf/autoconf-2.69/bin/autoconf
-fi
-if test -z ${AUTOMAKE}; then
-  AUTOMAKE=/mnt/hdf/packages/automake/automake-1.14.1/bin/automake-1.14
-fi
-if test -z ${AUTOHEADER}; then
-  AUTOHEADER=/mnt/hdf/packages/autoconf/autoconf-2.69/bin/autoheader
-fi
-if test -z ${ACLOCAL}; then
-  ACLOCAL=/mnt/hdf/packages/automake/automake-1.14.1/bin/aclocal-1.14
-fi
-if test -z ${LIBTOOL}; then
-  LIBTOOL=/mnt/hdf/packages/libtool/libtool-2.4.2/bin/libtool
-fi
-if test -z ${M4}; then
-  M4=/mnt/hdf/packages/m4/m4-1.4.17/bin/m4
-fi
-
-# Check version numbers of all autotools against the "correct" versions
-AC_VERS=`${AUTOCONF} --version 2>&1 | grep "^${AUTOCONF_VERSION}"`
-if test -z "${AC_VERS}"; then
-   echo "${AUTOCONF} version is not ${AUTOCONF_VERSION}"
-   exit 1
-fi
-AM_VERS=`${AUTOMAKE} --version 2>&1 | grep "^${AUTOMAKE_VERSION}"`
-if test -z "${AM_VERS}"; then
-   echo "${AUTOMAKE} version is not ${AUTOMAKE_VERSION}"
-   exit 1
-fi
-AH_VERS=`${AUTOHEADER} --version 2>&1 | grep "^${AUTOHEADER_VERSION}"`
-if test -z "${AH_VERS}"; then
-   echo "${AUTOHEADER} version is not ${AUTOHEADER_VERSION}"
-   exit 1
-fi
-AL_VERS=`${ACLOCAL} --version 2>&1 | grep "^${ACLOCAL_VERSION}"`
-if test -z "${AL_VERS}"; then
-   echo "${ACLOCAL} version is not ${ACLOCAL_VERSION}"
-   exit 1
-fi
-LT_VERS=`${LIBTOOL} --version 2>&1 | grep "${LIBTOOL_VERSION}"`
-if test -z "${LT_VERS}"; then
-   echo "${LIBTOOL} version is not ${LIBTOOL_VERSION}"
-   exit 1
-fi
-M4_VERS=`${M4} --version 2>&1 | grep "${M4_VERSION}"`
-if test -z "${M4_VERS}"; then
-   echo "${M4} version is not ${M4_VERSION}"
-   exit 1
-fi
-
-# Make sure that the tools are in the path.
-AUTOCONF_DIR=`dirname ${AUTOCONF}`
-LIBTOOL_DIR=`dirname ${LIBTOOL}`
-M4_DIR=`dirname ${M4}`
-PATH=${AUTOCONF_DIR}:${M4_DIR}:$PATH
-
-# Run autoconf/automake commands in order
-  echo ${ACLOCAL} -I ${LIBTOOL_DIR}/../share/aclocal
-  ${ACLOCAL} -I ${LIBTOOL_DIR}/../share/aclocal || exit 1
-
-  echo ${AUTOHEADER}
-  ${AUTOHEADER} || exit 1
-
-  echo ${AUTOMAKE} --add-missing
-  ${AUTOMAKE} --add-missing || exit 1
-
-  echo ${AUTOCONF}
-  ${AUTOCONF} || exit 1
-
-# Clean up top-level Makefile.in
-# pmake wants an argument to be the first non-comment line it encounters
-# in the Makefile.  Automake wants to reorganize the Makefile.
-# To work around this, we post-process the top-level Makefile.in.
-  sed "s/^#xxx//" Makefile.in > Makefile.in.new
-  mv Makefile.in.new Makefile.in
-
-# Run trace script
-# The trace script adds H5TRACE macros to library source files.  It should
-# have no effect on files that don't have HDF5 API macros in them.
-echo
-echo "    Running trace script:"
-bin/trace src/H5*.c || exit 1
-
-# Run make_err
-# make_err automatically generates the H5E headers that create error message
-# types for HDF5.
-echo
-echo "    Running error generation script:"
-bin/make_err src/H5err.txt || exit 1
-
-# Run make_vers
-# make_vers automatically generates the public headers that define the API version
-# macros for HDF5.
-echo
-echo "    Running API version generation script:"
-bin/make_vers src/H5vers.txt || exit 1
-
-# Run flex
-# automatically generates the lexical file for hl/src/H5LTanalyze.c
-echo
-echo "    Running flex generation script:"
-bin/genltanalyze || exit 1
-
-exit 0
diff --git a/bin/release b/bin/release
index d771db6..ca9a47c 100755
--- a/bin/release
+++ b/bin/release
@@ -1,38 +1,17 @@
 #!/bin/sh
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 #
 
 # Make a release of hdf5.
-#
-# Programmer: Robb Matzke
-# Creation date: on or before 1998-01-29.
-#
-# Modifications
-#   Robb Matzke, 1999-07-16
-#   The SunOS 5.6 sed *must* have slashes as delimiters. I changed things like
-#   `sed s+/CVS++' to `sed 's/\/CVS//'
-#
-#   Albert Cheng, 1999-10-26
-#   Moved the MANIFEST checking to a separate command file so that
-#   it can be invoked individually.
-#
-#   Albert Cheng, 2004-08-14
-#   Added the --private option.
-#
-#   James Laird, 2005-09-07
-#   Added the md5 method.
 
 # Function definitions
 #
@@ -40,41 +19,58 @@
 USAGE()
 {
 cat << EOF
-Usage: $0 -d <dir> [-h] [--nocheck] [--private] <methods> ...
-   -d DIR	The name of the directory where the releas(es) should be
+Usage: $0 -d <dir> [--docver BRANCHNAME] [-h] [--private] <methods> ...
+   -d DIR       The name of the directory where the release(s) should be
                 placed.
+   --docver BRANCHNAME  This is added for 1.8 and beyond to get the correct
+                        version of documentation files from the hdf5docs
+                        repository.  BRANCHNAME for v1.8 should be hdf5_1_8.
    -h           print the help page.
-   --nocheck	Ignore errors in MANIFEST file.
-   --private	Make a private release with today's date in version information.
-         
+   --private    Make a private release with today's date in version information.
+
 This must be run at the top level of the source directory.
 The other command-line options are the names of the programs to use
 for compressing the resulting tar archive (if none are given then
-"tar md5" is assumed):
+"tar" is assumed):
 
-    tar		-- use tar and don't do any compressing.
-    gzip	-- use gzip with "-9" and append ".gz" to the output name.
+    tar         -- use tar and don't do any compressing.
+    gzip        -- use gzip with "-9" and append ".gz" to the output name.
     bzip2       -- use bzip2 with "-9" and append ".bz2" to the output name.
-    zip		-- convert all text files to DOS style and form a zip file for Windows use.
-    md5         -- produce a md5 checksum in addition to the archive.
+    zip         -- convert all text files to DOS style and form a zip file for Windows use.
+    cmake-tgz   -- create a tar file using the gzip default level with a build-unix.sh
+                   command file and all other CMake files needed to build HDF5 source
+                   using CMake on unix machines.
+    cmake-zip   -- convert all text files to DOS style and create a zip file including cmake
+                   scripts and .bat files to build HDF5 source using CMake on Windows.
+    hpc-cmake-tgz
+                -- create a tar file using the gzip default level with a build-unix.sh
+                   command file and all other CMake files needed to build HDF5 source
+                   using CMake on unix machines, with HDF5options.cmake files for serial
+                   and parallel builds on machines requiring batch jobs to run tests.
+                   The default is for parallel build, with serial only build by changing
+                   the HDF5options.cmake symlink to ser-HDF5options.cmake.  More
+                   information is available in the README_HPC file.
     doc         -- produce the latest doc tree in addition to the archive.
 
+A sha256 checksum is produced for each archive created and stored in the sha256 file.
+
 Examples:
 
     $ bin/release -d /tmp
     /tmp/hdf5-1.8.13-RELEASE.txt
+    /tmp/hdf5-1.8.13.sha256
     /tmp/hdf5-1.8.13.tar
-    /tmp/hdf5-1.8.13.tar.md5
 
     $ bin/release -d /tmp gzip
     /tmp/hdf5-1.8.13-RELEASE.txt
+    /tmp/hdf5-1.8.13.sha256
     /tmp/hdf5-1.8.13.tar.gz
 
-    $ bin/release -d /tmp tar gzip zip md5
+    $ bin/release -d /tmp tar gzip zip
     /tmp/hdf5-1.8.13-RELEASE.txt
+    /tmp/hdf5-1.8.13.sha256
     /tmp/hdf5-1.8.13.tar
     /tmp/hdf5-1.8.13.tar.gz
-    /tmp/hdf5-1.8.13.tar.md5
     /tmp/hdf5-1.8.13.tar.zip
 
 EOF
@@ -84,15 +80,10 @@ EOF
 # Function name: tar2zip
 # Convert the release tarball to a Windows zipball.
 #
-# Programmer: Albert Cheng
-# Creation date: 2014-04-23
-#
-# Modifications
-#
 # Steps:
-# 1. untar the tarball in a temporay directory;
+# 1. untar the tarball in a temporary directory;
 #    Note: do this in a temporary directory to avoid changing
-#    the original source directory which maybe around.
+#    the original source directory which may be around.
 # 2. convert all its text files to DOS (LF-CR) style;
 # 3. form a zip file which is usable by Windows users.
 #
@@ -106,10 +97,10 @@ EOF
 tar2zip()
 {
     if [ $# -ne 3 ]; then
-	echo "usage: tar2zip <tarfilename> <zipfilename>"
-	return 1
+        echo "usage: tar2zip <tarfilename> <zipfilename>"
+        return 1
     fi
-    ztmpdir=/tmp/tmpdir$$
+    ztmpdir=/tmp/ztmpdir$$
     mkdir -p $ztmpdir
     version=$1
     tarfile=$2
@@ -119,23 +110,23 @@ tar2zip()
     (cd $ztmpdir; tar xf -) < $tarfile
     # sanity check
     if [ ! -d $ztmpdir/$version ]; then
-	echo "untar did not create $ztmpdir/$version source dir"
-	# cleanup
-	rm -rf $ztmpdir
-	return 1
+        echo "untar did not create $ztmpdir/$version source dir"
+        # cleanup
+        rm -rf $ztmpdir
+        return 1
     fi
     # step 2: convert text files
     # There maybe a simpler way to do this.
     # options used in unix2dos:
-    # -k   Keep the date stamp 
+    # -k   Keep the date stamp
     # -q   quiet mode
     # grep redirect output to /dev/null because -q or -s are not portable.
     find $ztmpdir/$version | \
-	while read inf; do \
-	    if file $inf | grep "$inf\: .*text" > /dev/null 2>&1 ; then \
-		unix2dos -q -k $inf; \
-	    fi\
-	done
+        while read inf; do \
+            if file $inf | grep "$inf\: .*text" > /dev/null 2>&1 ; then \
+                unix2dos -q -k $inf; \
+            fi\
+        done
     # step 3: make zipball
     # -9 maximum compression
     # -y Store symbolic links as such in the zip archive
@@ -148,9 +139,261 @@ tar2zip()
     rm -rf $ztmpdir
 }
 
+# Function name: tar2cmakezip
+# Convert the release tarball to a Windows zipball with files to run CMake build.
+#
+# Steps:
+# 1. untar the tarball in a temporary directory;
+#    Note: do this in a temporary directory to avoid changing
+#    the original source directory which may be around.
+# 2. add build-unix.sh script.
+# 3. add LIBAEC.tar.gz, ZLib.tar.gz and cmake files to top level directory.
+# 4. create gzipped tar file with these contents:
+#        build-unix.sh          script
+#        hdf5-<version>         source code directory extracted from tar file
+#        CTestScript.cmake      cmake file copied from <hdf5 source code>/config/cmake/scripts
+#        HDF5config.cmake       cmake file copied from <hdf5 source code>/config/cmake/scripts
+#        HDF5options.cmake      cmake file copied from <hdf5 source code>/config/cmake/scripts
+#        LIBAEC.tar.gz          copied from /mnt/scr1/pre-release/hdf5/CMake
+#        ZLib.tar.gz            copied from /mnt/scr1/pre-release/hdf5/CMake
+
+
+# Parameters:
+# $1 version
+# $2 release tarball
+# $3 output zipball file name
+#
+# Returns 0 if successful; 1 otherwise
+#
+ # need function to create another temporary directory, extract the
+            # $tmpdir/$HDF5_VERS.tar into it, create build-VS*.bat files,
+            # add CTestScript.cmake, HDF5config.cmake, LIBAEC.tar.gz
+            # ZLib.tar.gz, HDF5 examples, and then zip it.
+tar2cmakezip()
+{
+    if [ $# -ne 3 ]; then
+        echo "usage: tar2cmakezip <tarfilename> <zipfilename>"
+        return 1
+    fi
+    cmziptmpdir=/tmp/cmziptmpdir$$
+    cmziptmpsubdir=$cmziptmpdir/CMake-$HDF5_VERS
+    mkdir -p $cmziptmpsubdir
+    version=$1
+    tarfile=$2
+    zipfile=$3
+
+    # step 1: untar tarball in cmgztmpdir
+    (cd $cmziptmpsubdir; tar xf -) < $tarfile
+    # sanity check
+    if [ ! -d $cmziptmpsubdir/$version ]; then
+        echo "untar did not create $cmziptmpsubdir/$version source dir"
+        # cleanup
+        rm -rf $cmziptmpdir
+        return 1
+    fi
+
+    # step 2: add batch file for building CMake on window
+    (cd $cmziptmpsubdir; echo "ctest -S HDF5config.cmake,BUILD_GENERATOR=VS2013 -C Release -V -O hdf5.log" > build-VS2013-32.bat; chmod 755 build-VS2013-32.bat)
+    (cd $cmziptmpsubdir; echo "ctest -S HDF5config.cmake,BUILD_GENERATOR=VS201364 -C Release -V -O hdf5.log" > build-VS2013-64.bat; chmod 755 build-VS2013-64.bat)
+    (cd $cmziptmpsubdir; echo "ctest -S HDF5config.cmake,BUILD_GENERATOR=VS2015 -C Release -V -O hdf5.log" > build-VS2015-32.bat; chmod 755 build-VS2015-32.bat)
+    (cd $cmziptmpsubdir; echo "ctest -S HDF5config.cmake,BUILD_GENERATOR=VS201564 -C Release -V -O hdf5.log" > build-VS2015-64.bat; chmod 755 build-VS2015-64.bat)
+    (cd $cmziptmpsubdir; echo "ctest -S HDF5config.cmake,BUILD_GENERATOR=VS2017 -C Release -V -O hdf5.log" > build-VS2017-32.bat; chmod 755 build-VS2017-32.bat)
+    (cd $cmziptmpsubdir; echo "ctest -S HDF5config.cmake,BUILD_GENERATOR=VS201764 -C Release -V -O hdf5.log" > build-VS2017-64.bat; chmod 755 build-VS2017-64.bat)
+    (cd $cmziptmpsubdir; echo "ctest -S HDF5config.cmake,BUILD_GENERATOR=VS2019 -C Release -V -O hdf5.log" > build-VS2019-32.bat; chmod 755 build-VS2019-32.bat)
+    (cd $cmziptmpsubdir; echo "ctest -S HDF5config.cmake,BUILD_GENERATOR=VS201964 -C Release -V -O hdf5.log" > build-VS2019-64.bat; chmod 755 build-VS2019-64.bat)
+
+    # step 3: add LIBAEC.tar.gz, ZLib.tar.gz and cmake files
+    cp /mnt/scr1/pre-release/hdf5/CMake/LIBAEC.tar.gz $cmziptmpsubdir
+    cp /mnt/scr1/pre-release/hdf5/CMake/ZLib.tar.gz $cmziptmpsubdir
+    cp /mnt/scr1/pre-release/hdf5/CMake/HDF5Examples-2.0.2-Source.zip $cmziptmpsubdir
+    cp /mnt/scr1/pre-release/hdf5/CMake/hdf5_plugins-master.zip $cmziptmpsubdir
+    cp $cmziptmpsubdir/$version/config/cmake/scripts/CTestScript.cmake $cmziptmpsubdir
+    cp $cmziptmpsubdir/$version/config/cmake/scripts/HDF5config.cmake $cmziptmpsubdir
+    cp $cmziptmpsubdir/$version/config/cmake/scripts/HDF5options.cmake $cmziptmpsubdir
+
+    # step 4: convert text files
+    # There maybe a simpler way to do this.
+    # options used in unix2dos:
+    # -k   Keep the date stamp
+    # -q   quiet mode
+    # grep redirect output to /dev/null because -q or -s are not portable.
+    find $cmziptmpsubdir/$version | \
+        while read inf; do \
+            if file $inf | grep "$inf\: .*text" > /dev/null 2>&1 ; then \
+                unix2dos -q -k $inf; \
+            fi\
+        done
+
+    # step 3: make zipball
+    # -9 maximum compression
+    # -y Store symbolic links as such in the zip archive
+    # -r recursive
+    # -q quiet
+    (cd $cmziptmpdir; zip -9 -y -r -q CMake-$version.zip *)
+    mv $cmziptmpdir/CMake-$version.zip $zipfile
+
+    # cleanup
+    rm -rf $cmziptmpdir
+}
+
+# Function name: tar2cmaketgz
+# Convert the release tarball to a gzipped tar file with files to run CMake build.
+#
+#
+# Steps:
+# 1. untar the tarball in a temporary directory;
+#    Note: do this in a temporary directory to avoid changing
+#    the original source directory which may be around.
+# 2. add build-unix.sh script.
+# 3. add LIBAEC.tar.gz, ZLib.tar.gz and cmake files to top level directory.
+# 4. create gzipped tar file with these contents:
+#        build-unix.sh          script
+#        hdf5-<version>         source code directory extracted from tar file
+#        CTestScript.cmake      cmake file copied from <hdf5 source code>/config/cmake/scripts
+#        HDF5config.cmake       cmake file copied from <hdf5 source code>/config/cmake/scripts
+#        HDF5options.cmake      cmake file copied from <hdf5 source code>/config/cmake/scripts
+#        LIBAEC.tar.gz          copied from /mnt/scr1/pre-release/hdf5/CMake
+#        ZLib.tar.gz            copied from /mnt/scr1/pre-release/hdf5/CMake
+
+
+# Parameters:
+# $1 version
+# $2 release tarball
+# $3 output zipball file name
+#
+# Returns 0 if successful; 1 otherwise
+#
+ # need function to create another temporary directory, extract the
+            # $tmpdir/$HDF5_VERS.tar into it, create build-unix.sh,
+            # add CTestScript.cmake, HDF5config.cmake, LIBAEC.tar.gz
+            # ZLib.tar.gz, HDF5 examples, and then tar.gz it.
+tar2cmaketgz()
+{
+    if [ $# -ne 3 ]; then
+        echo "usage: tar2cmaketgz <tarfilename> <tgzfilename>"
+        return 1
+    fi
+    cmgztmpdir=/tmp/cmgztmpdir$$
+    cmgztmpsubdir=$cmgztmpdir/CMake-$HDF5_VERS
+    mkdir -p $cmgztmpsubdir
+    version=$1
+    tarfile=$2
+    tgzfile=$3
+
+    # step 1: untar tarball in cmgztmpdir
+    (cd $cmgztmpsubdir; tar xf -) < $tarfile
+    # sanity check
+    if [ ! -d $cmgztmpsubdir/$version ]; then
+        echo "untar did not create $cmgztmpsubdir/$version source dir"
+        # cleanup
+        rm -rf $cmgztmpdir
+        return 1
+    fi
+
+
+    # step 2: add build-unix.sh script
+    (cd $cmgztmpsubdir; echo "ctest -S HDF5config.cmake,BUILD_GENERATOR=Unix -C Release -V -O hdf5.log" > build-unix.sh; chmod 755 build-unix.sh)
+
+    # step 3: add LIBAEC.tar.gz, ZLib.tar.gz and cmake files
+    cp /mnt/scr1/pre-release/hdf5/CMake/LIBAEC.tar.gz $cmgztmpsubdir
+    cp /mnt/scr1/pre-release/hdf5/CMake/ZLib.tar.gz $cmgztmpsubdir
+    cp /mnt/scr1/pre-release/hdf5/CMake/HDF5Examples-2.0.2-Source.tar.gz $cmgztmpsubdir
+    cp /mnt/scr1/pre-release/hdf5/CMake/hdf5_plugins-master.tar.gz $cmgztmpsubdir
+    cp $cmgztmpsubdir/$version/config/cmake/scripts/CTestScript.cmake $cmgztmpsubdir
+    cp $cmgztmpsubdir/$version/config/cmake/scripts/HDF5config.cmake $cmgztmpsubdir
+    cp $cmgztmpsubdir/$version/config/cmake/scripts/HDF5options.cmake $cmgztmpsubdir
+    tar czf $DEST/CMake-$HDF5_VERS.tar.gz -C $cmgztmpdir . || exit 1
+
+    # cleanup
+    rm -rf $cmgztmpdir
+}
+
+# Function name: tar2hpccmaketgz
+# Convert the release tarball to a gzipped tarfile with files to run CMake build
+# and HDF5options.cmake files for parallel or serial only builds where build
+# tests are run on compute nodes using batch scripts.
+#
+# Steps:
+# 1. untar the tarball in a temporary directory;
+#    Note: do this in a temporary directory to avoid changing
+#    the original source directory which may be around.
+# 2. add build-unix.sh script.
+# 3. add LIBAEC.tar.gz, ZLib.tar.gz and cmake files to top level directory.
+# 4. create gzipped tar file with these contents:
+#        build-unix.sh          script
+#        hdf5-<version>         source code directory extracted from tar file
+#        CTestScript.cmake      cmake file copied from <hdf5 source code>/config/cmake/scripts
+#        HDF5config.cmake       cmake file copied from <hdf5 source code>/config/cmake/scripts
+#        HDF5options.cmake      cmake file copied from <hdf5 source code>/config/cmake/scripts
+#        LIBAEC.tar.gz          copied from /mnt/scr1/pre-release/hdf5/CMake
+#        ZLib.tar.gz            copied from /mnt/scr1/pre-release/hdf5/CMake
+#
+# 5. For HPC-CMake tgz file the following are also needed in the top-level directory:
+#        README_HPC                 copied from release_docs
+#        ser-HDF5options.cmake      copied from <hdf5 source code>/config/cmake/scripts/HPC
+#        par-HDF5options.cmake      copied from <hdf5 source code>/config/cmake/scripts/HPC
+#        HDF5options.cmake          symlink to par-HDF5options.cmake
+#
+
+# Parameters:
+# $1 version
+# $2 release tarball
+# $3 output zipball file name
+#
+# Returns 0 if successful; 1 otherwise
+#
+ # need function to create another temporary directory, extract the
+            # $tmpdir/$HDF5_VERS.tar into it, create build-unix.sh,
+            # add CTestScript.cmake, HDF5config.cmake, LIBAEC.tar.gz
+            # ZLib.tar.gz, HDF5 examples, and then tar.gz it.
+tar2hpccmaketgz()
+{
+    if [ $# -ne 3 ]; then
+        echo "usage: tar2hpccmaketgz <tarfilename> <tgzfilename>"
+        return 1
+    fi
+    cmgztmpdir=/tmp/cmgztmpdir$$
+    cmgztmpsubdir=$cmgztmpdir/HPC-CMake-$HDF5_VERS
+    mkdir -p $cmgztmpsubdir
+    version=$1
+    tarfile=$2
+    tgzfile=$3
+
+    # step 1: untar tarball in cmgztmpdir
+    (cd $cmgztmpsubdir; tar xf -) < $tarfile
+    # sanity check
+    if [ ! -d $cmgztmpsubdir/$version ]; then
+        echo "untar did not create $cmgztmpsubdir/$version source dir"
+        # cleanup
+        rm -rf $cmgztmpdir
+        return 1
+    fi
+
+
+    # step 2: add build-unix.sh script
+    (cd $cmgztmpsubdir; echo "ctest -S HDF5config.cmake,BUILD_GENERATOR=Unix -C Release -V -O hdf5.log" > build-unix.sh; chmod 755 build-unix.sh)
+
+    # step 3: add LIBAEC.tar.gz, ZLib.tar.gz and cmake files
+    cp /mnt/scr1/pre-release/hdf5/CMake/LIBAEC.tar.gz $cmgztmpsubdir
+    cp /mnt/scr1/pre-release/hdf5/CMake/ZLib.tar.gz $cmgztmpsubdir
+    cp /mnt/scr1/pre-release/hdf5/CMake/HDF5Examples-2.0.2-Source.tar.gz $cmgztmpsubdir
+    cp /mnt/scr1/pre-release/hdf5/CMake/hdf5_plugins-master.tar.gz $cmgztmpsubdir
+    cp $cmgztmpsubdir/$version/config/cmake/scripts/CTestScript.cmake $cmgztmpsubdir
+    cp $cmgztmpsubdir/$version/config/cmake/scripts/HDF5config.cmake $cmgztmpsubdir
+
+    cp $cmgztmpsubdir/$version/release_docs/README_HPC $cmgztmpsubdir
+    cp $cmgztmpsubdir/$version/config/cmake/scripts/HPC/ser-HDF5options.cmake $cmgztmpsubdir
+    cp $cmgztmpsubdir/$version/config/cmake/scripts/HPC/par-HDF5options.cmake $cmgztmpsubdir
+    (cd $cmgztmpsubdir; ln -s par-HDF5options.cmake HDF5options.cmake)
+    tar czf $DEST/HPC-CMake-$HDF5_VERS.tar.gz -C $cmgztmpdir . || exit 1
+
+    # cleanup
+    rm -rf $cmgztmpdir
+}
+
 # This command must be run at the top level of the hdf5 source directory.
 # Verify this requirement.
-if [ ! \( -f configure -a -f bin/release \) ]; then
+if [ ! \( -f configure.ac -a -f bin/release \) ]; then
     echo "$0 must be run at the top level of the hdf5 source directory"
     exit 1
 fi
@@ -161,23 +404,31 @@ VERS=`perl bin/h5vers`
 VERS_OLD=
 test "$VERS" || exit 1
 verbose=yes
-check=yes
 release_date=`date +%F`
 today=`date +%Y%m%d`
 pmode='no'
-tmpdir="../#release_tmp.$$"	# tmp work directory
-DOC_URL=http://svn.hdfgroup.uiuc.edu/hdf5doc/trunk
+tmpdir="../#release_tmp.$$"     # tmp work directory
+DOC_URL=https://git@bitbucket.hdfgroup.org/scm/hdffv/hdf5doc.git
 CPPLUS_RM_NAME=cpplus_RM
+MAINT_MODE_ENABLED=""
+
+# If maintainer mode is enabled in configure, it should be disabled for release,
+# and enabled again after release files have been created.  If already disabled
+# there's no need to do either.
+MAINT_MODE_ENABLED=`grep ^AM_MAINTAINER_MODE ./configure.ac | grep enable`
+if [ "${MAINT_MODE_ENABLED}" != "" ]; then
+    bin/switch_maint_mode -disable ./configure.ac
+fi
 
 # Restore previous Version information
 RESTORE_VERSION()
 {
     if [ X-${VERS_OLD} != X- ]; then
-	echo restoring version information back to $VERS_OLD
-	rm -f config/lt_vers.am
-	cp $tmpdir/lt_vers.am config/lt_vers.am
-	bin/h5vers -s $VERS_OLD
-	VERS_OLD=
+        echo restoring version information back to $VERS_OLD
+        rm -f config/lt_vers.am
+        cp $tmpdir/lt_vers.am config/lt_vers.am
+        bin/h5vers -s $VERS_OLD
+        VERS_OLD=
     fi
 }
 
@@ -187,37 +438,38 @@ while [ -n "$1" ]; do
     arg=$1
     shift
     case "$arg" in
-	-d)
-	    DEST=$1
-	    shift
-	    ;;
-	--nocheck)
-	    check=no
-	    ;;
-	-h)
-	    USAGE
-	    exit 0
-	    ;;
-	--private)
-	    pmode=yes
-	    ;;
-	-*)
-	    echo "Unknown switch: $arg" 1>&2
-	    USAGE
-	    exit 1
-	    ;;
-	*)
-	    methods="$methods $arg"
-	    ;;
+        -d)
+            DEST=$1
+            shift
+            ;;
+        -h)
+            USAGE
+            exit 0
+            ;;
+        --private)
+            pmode=yes
+            ;;
+        --docver)
+            DOCVERSION=$1
+            shift
+            ;;
+        -*)
+            echo "Unknown switch: $arg" 1>&2
+            USAGE
+            exit 1
+            ;;
+        *)
+            methods="$methods $arg"
+            ;;
     esac
 done
 
-# Default methods are tar and md5
+# Default method is tar
 if [ "X$methods" = "X" ]; then
-    methods="tar md5"
+    methods="tar"
 fi
 
-# Create the temporay work directory.
+# Create the temporary work directory.
 if mkdir $tmpdir; then
     echo "temporary work directory for release.  "\
          "Can be deleted after release completes." > $tmpdir/README
@@ -238,6 +490,7 @@ if [ X$pmode = Xyes ]; then
     # (h5vers does not correctly handle just m.n.r-$today.)
     VERS=`echo $VERS | sed -e s/-.*//`-of$today
     echo Private release of $VERS
+else
     bin/h5vers -s $VERS
 fi
 
@@ -250,29 +503,17 @@ if [ ! -d $DEST ]; then
     exit 1
 fi
 
-# Check the validity of the MANIFEST file.
-bin/chkmanifest || fail=yes
-if [ "X$fail" = "Xyes" ]; then
-    if [ $check = yes ]; then
-        exit 1
-    else
-	echo "Continuing anyway..."
-    fi
-fi
-
-# Create a manifest that contains only files for distribution.
-MANIFEST=$tmpdir/H5_MANIFEST
-grep '^\.' MANIFEST | grep -v _DO_NOT_DISTRIBUTE_ >$MANIFEST
-
-# Prepare the source tree for a release.
+# Create a symlink to the source so files in the tarball have the prefix
+# we want (gnu's --transform isn't portable)
 ln -s `pwd` $tmpdir/$HDF5_VERS || exit 1
+
 # Save a backup copy of Makefile if exists.
 test -f Makefile && mv Makefile $tmpdir/Makefile.x
 cp -p Makefile.dist Makefile
 
-# Update README.txt and release_docs/RELEASE.txt with release information in
+# Update README.md and release_docs/RELEASE.txt with release information in
 # line 1.
-for f in README.txt release_docs/RELEASE.txt; do
+for f in README.md release_docs/RELEASE.txt; do
     echo "HDF5 version $VERS released on $release_date" >$f.x
     sed -e 1d $f >>$f.x
     mv $f.x $f
@@ -280,57 +521,84 @@ for f in README.txt release_docs/RELEASE.txt; do
     chmod 644 $f
 done
 
+# develop is different than branches.
+if [ "${DOCVERSION}" ]; then
+    DOC_URL="$DOC_URL -b ${DOCVERSION}"
+fi
+
 # Create the tar file
 test "$verbose" && echo "   Running tar..." 1>&2
-( \
-    cd $tmpdir; \
-    tar cf $HDF5_VERS.tar $HDF5_VERS/Makefile \
-	`sed 's/^\.\//hdf5-'$VERS'\//' $MANIFEST` || exit 1 \
-)
+(cd "$tmpdir" && exec tar -ch --exclude-vcs -f "$HDF5_VERS.tar" "./$HDF5_VERS" || exit 1 )
 
 # Compress
+SHA256=$HDF5_VERS.sha256
+cp /dev/null $DEST/$SHA256
 for comp in $methods; do
     case $comp in
-	tar)
-	    cp -p $tmpdir/$HDF5_VERS.tar $DEST/$HDF5_VERS.tar
-	    ;;
-	gzip)
-	    test "$verbose" && echo "   Running gzip..." 1>&2
-	    gzip -9 <$tmpdir/$HDF5_VERS.tar >$DEST/$HDF5_VERS.tar.gz
-	    ;;
-	bzip2)
-	    test "$verbose" && echo "   Running bzip2..." 1>&2
-	    bzip2 -9 <$tmpdir/$HDF5_VERS.tar >$DEST/$HDF5_VERS.tar.bz2
-	    ;;
-	zip)
-	    test "$verbose" && echo "   Creating zip ball..." 1>&2
-	    tar2zip $HDF5_VERS $tmpdir/$HDF5_VERS.tar $DEST/$HDF5_VERS.zip 1>&2
-	    ;;
-	md5)
-	    test "$verbose" && echo "   Creating checksum..." 1>&2
-	    (cd $tmpdir; md5sum $HDF5_VERS.tar ) > $DEST/$HDF5_VERS.tar.md5
-	    ;;
-	doc)
-	    test "$verbose" && echo "   Creating docs..." 1>&2
-	    # Check out docs from svn repo
-	    (cd $tmpdir; svn co $DOC_URL > /dev/null) || exit 1
-	    # Create doxygen C++ RM
-	    (cd c++/src && doxygen cpp_doc_config > /dev/null ) || exit 1
-	    # Replace version of C++ RM with just-created version
-	    rm -rf $tmpdir/trunk/html/$CPPLUS_RM_NAME
-	    mv c++/src/$CPPLUS_RM_NAME $tmpdir/trunk/html/$CPPLUS_RM_NAME
-	    # Compress the docs and move them to the release area
-	    mv $tmpdir/trunk $tmpdir/${HDF5_VERS}_docs
-	    (cd $tmpdir && tar cf ${HDF5_VERS}_docs.tar ${HDF5_VERS}_docs)
-	    mv $tmpdir/${HDF5_VERS}_docs.tar $DEST
-	    ;;
-	*)
-	    echo "***Error*** Unknown method $comp"
-	    exit 1
-	    ;;
+        tar)
+            cp -p $tmpdir/$HDF5_VERS.tar $DEST/$HDF5_VERS.tar
+            (cd $DEST; sha256sum $HDF5_VERS.tar >> $SHA256)
+            ;;
+        gzip)
+            test "$verbose" && echo "   Running gzip..." 1>&2
+            gzip -9 <$tmpdir/$HDF5_VERS.tar >$DEST/$HDF5_VERS.tar.gz
+            (cd $DEST; sha256sum $HDF5_VERS.tar.gz >> $SHA256)
+            ;;
+        cmake-tgz)
+            test "$verbose" && echo "   Creating CMake tar.gz file..." 1>&2
+            tar2cmaketgz $HDF5_VERS $tmpdir/$HDF5_VERS.tar $DEST/CMake-$HDF5_VERS.tar.gz 1>&2
+            (cd $DEST; sha256sum CMake-$HDF5_VERS.tar.gz >> $SHA256)
+            ;;
+        hpc-cmake-tgz)
+            test "$verbose" && echo "   Creating HPC-CMake tar.gz file..." 1>&2
+            tar2hpccmaketgz $HDF5_VERS $tmpdir/$HDF5_VERS.tar $DEST/HPC-CMake-$HDF5_VERS.tar.gz 1>&2
+            (cd $DEST; sha256sum HPC-CMake-$HDF5_VERS.tar.gz >> $SHA256)
+            ;;
+        bzip2)
+            test "$verbose" && echo "   Running bzip2..." 1>&2
+            bzip2 -9 <$tmpdir/$HDF5_VERS.tar >$DEST/$HDF5_VERS.tar.bz2
+            (cd $DEST; sha256sum $HDF5_VERS.tar.bz2 >> $SHA256)
+            ;;
+        zip)
+            test "$verbose" && echo "   Creating zip ball..." 1>&2
+            tar2zip $HDF5_VERS $tmpdir/$HDF5_VERS.tar $DEST/$HDF5_VERS.zip 1>&2
+            (cd $DEST; sha256sum $HDF5_VERS.zip >> $SHA256)
+            ;;
+        cmake-zip)
+            test "$verbose" && echo "   Creating CMake-zip ball..." 1>&2
+            tar2cmakezip $HDF5_VERS $tmpdir/$HDF5_VERS.tar $DEST/CMake-$HDF5_VERS.zip 1>&2
+            (cd $DEST; sha256sum CMake-$HDF5_VERS.zip >> $SHA256)
+            ;;
+        doc)
+            if [ "${DOCVERSION}" = "" ]; then
+                DOCVERSION=master
+            fi
+            test "$verbose" && echo "   Creating docs..." 1>&2
+            # Check out docs from git repo
+            (cd $tmpdir; git clone -q $DOC_URL ${DOCVERSION} > /dev/null) || exit 1
+            # Create doxygen C++ RM
+            (cd c++/src && doxygen cpp_doc_config > /dev/null ) || exit 1
+            # Replace version of C++ RM with just-created version
+            rm -rf $tmpdir/${DOCVERSION}/html/$CPPLUS_RM_NAME || exit 1
+            mv c++/src/$CPPLUS_RM_NAME $tmpdir/${DOCVERSION}/html/$CPPLUS_RM_NAME || exit 1
+            # Compress the docs and move them to the release area
+            mv $tmpdir/${DOCVERSION} $tmpdir/${HDF5_VERS}_docs || exit 1
+            (cd $tmpdir && tar cf ${HDF5_VERS}_docs.tar ${HDF5_VERS}_docs) || exit 1
+            mv $tmpdir/${HDF5_VERS}_docs.tar $DEST || exit 1
+            ;;
+        *)
+            echo "***Error*** Unknown method $comp"
+            exit 1
+            ;;
     esac
 done
 
+# If AM_MAINTAINER_MODE was enabled before running this script
+# restore it to "enabled".
+if [ "${MAINT_MODE_ENABLED}" != "" ]; then
+    bin/switch_maint_mode -enable ./configure.ac
+fi
+
 # Copy the RELEASE.txt to the release area.
 cp release_docs/RELEASE.txt $DEST/$HDF5_VERS-RELEASE.txt
 
@@ -347,4 +615,6 @@ fi
 # Remove temporary things
 rm -rf $tmpdir
 
+echo "DONE"
+
 exit 0
diff --git a/bin/restore.sh b/bin/restore.sh
new file mode 100755
index 0000000..85ebd1c
--- /dev/null
+++ b/bin/restore.sh
@@ -0,0 +1,68 @@
+#!/bin/sh
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
+
+# A script to clean up the action of autogen.sh
+#
+# If this script fails to clean up generated files on a particular
+# platform, please contact help@hdfgroup.org or comment on the forum.
+
+echo
+echo "*******************************"
+echo "* HDF5 autogen.sh undo script *"
+echo "*******************************"
+echo
+
+echo "Remove autom4te.cache directory"
+rm -rf autom4te.cache
+
+echo "Remove configure script"
+rm -f configure
+
+echo "Remove Makefile.in files"
+find . -type f -name 'Makefile.in' -exec rm {} \;
+
+echo "Remove files generated by libtoolize"
+rm -f bin/ltmain.sh
+rm -f m4/libtool.m4
+rm -f m4/ltoptions.m4
+rm -f m4/ltsugar.m4
+rm -f m4/ltversion.m4
+rm -f m4/lt~obsolete.m4
+
+echo "Remove files generated by automake"
+rm -f bin/compile
+rm -f bin/config.guess
+rm -f bin/config.sub
+rm -f bin/install-sh
+rm -f bin/missing
+rm -f bin/test-driver
+rm -f bin/depcomp
+
+echo "Remove files generated by autoheader"
+rm -f src/H5config.h.in
+
+echo "Remove files generated by bin/make_err"
+rm -f src/H5Epubgen.h
+rm -f src/H5Einit.h
+rm -f src/H5Eterm.h
+rm -f src/H5Edefin.h
+
+echo "Remove files generated by bin/make_vers"
+rm -f src/H5version.h
+
+echo "Remove files generated by bin/make_overflow"
+rm -f src/H5overflow.h
+
+echo "Remove remaining generated files"
+rm -f aclocal.m4
+
diff --git a/bin/runbkgprog b/bin/runbkgprog
new file mode 100755
index 0000000..945f5f3
--- /dev/null
+++ b/bin/runbkgprog
@@ -0,0 +1,87 @@
+#!/usr/bin/env perl
+require 5.003;
+use warnings;
+$indent=4;
+
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
+
+# Run program in background
+#
+use warnings;
+use strict;
+
+use Carp;
+use Time::HiRes;
+use POSIX 'setsid';
+
+my $child_pid;
+my $child_proc;
+my $cmd = $ARGV[0];
+my $debug = 1;
+
+print "\nStart child process\n";
+start_child();
+print "\nStarted child process\n";
+
+sub start_child {
+    die "cannot execute cmd: $cmd" unless -x $cmd;
+    if ($^O eq 'MSWin32') { # Windows
+        require Win32::Process;
+        Win32::Process::Create($child_proc, $cmd, $cmd, 0, 0, ".") || confess "Could not spawn child: $!";
+        $child_pid = $child_proc->GetProcessID();
+    }
+    else { # Unix
+        $SIG{CHLD} = 'IGNORE';
+        $child_pid = fork();
+        unless (defined $child_pid) {
+            confess "Could not spawn child (Unix): $!";
+        }
+        if ($child_pid == 0) { # child
+            unless ($debug) {
+                open STDIN, "<", "/dev/null"   or die "Can't read /dev/null: $!";
+                open STDOUT, ">", "/dev/null"  or die "Can't write /dev/null: $!";
+            }
+            setsid or warn "setsid cannot start a new session: $!";
+            unless ($debug) {
+                open STDERR, '>&STDOUT'  or die "Can't dup stdout: $!";
+            }
+            local $| = 1;
+            unless (exec($cmd)) {
+                confess "Could not start child: $cmd: $!";
+                CORE::exit(0);
+            }
+        }
+        # parent
+        $SIG{CHLD} = 'DEFAULT';
+    }
+    # catch early child exit, e.g. if program path is incorrect
+    sleep(1.0);
+    POSIX::waitpid(-1, POSIX::WNOHANG()); # clean up any defunct child process
+    if (kill(0,$child_pid)) {
+        print "\nStarted child process id $child_pid\n";
+    }
+    else {
+        warn "Child process exited quickly: $cmd: process $child_pid";
+    }
+}
+
+sub stop_child
+{
+    if ($^O eq 'MSWin32') { # Windows
+        Win32::Process::KillProcess($child_pid,0);
+    }
+    else { # Unix
+        kill 9, $child_pid || warn "could not kill process $child_pid: $!";
+    }
+    print "Stopped child process id $child_pid\n";
+}
diff --git a/bin/runtest b/bin/runtest
deleted file mode 100755
index 4356db3..0000000
--- a/bin/runtest
+++ /dev/null
@@ -1,968 +0,0 @@
-#! /bin/sh
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-#
-
-# run the hdf5/bin/snapshot
-# Usage:
-#	runtest		run the test for the local host
-#	runtest <hostname>	run the test for <hostname>
-#	runtest -all		run the test for all predefined hosts
-#
-# Assumptions in knowing where to find the right scripts to execute.
-# 1. assume we are at the top level of the hdf5 source.  So, bin/* are
-#    where the script files are.
-# 2. after the cvs update is completed, we can go to the snapshot area
-#    hdf5 source tree and use the bin/* there.
-# 3. Cannot use the snapshot area scripts from the beginning because
-#    for one, the current directory is renamed as previous right after
-#    a snapshot release; and for another, some scripts may be changed
-#    by the cvs update while it is being used.
-
-# local setup
-DEBUGMODE=""
-test -n "$DEBUGMODE" && echo "******** DEBUGMODE is $DEBUGMODE ************"
-WHEREAMI='pwd'
-CMD=
-
-# the name of this program
-PROGNAME="bin/runtest $DEBUGMODE"
-
-# Setup
-HOSTNAME=`hostname | cut -f1 -d.`	# no domain part
-TODAY=`date +%m%d%a`
-WEEKDAY=`date +%a`
-H5VER=			# default to current CVS version
-H5VERSION=		# default to current CVS version
-n_test=0		# Number of tests ran
-n_pass=0		# Number of tests passed
-n_fail=0		# Number of tests failed
-n_skip=0		# Number of tests skipped
-
-# Default to do checkout (only once) and test, no release.
-# Will run test only if there is significant differences from previous version.
-# If srcdir is not used, don't launched multiple tests
-SNAPSHOT="${DEBUGMODE:+echo }bin/snapshot"
-SRCDIR="srcdir"
-# Default standard Snaptest commands
-SNAPCMD="$SRCDIR test clean"
-# Default Standard snaptest command options
-STANDARD_OPT=""
-ENABLE_PARALLEL="--enable-parallel"
-CONFIGNAME=$HOSTNAME	# Name used in the SNAPTESTCFG file
-
-# test host default as local host.
-TESTHOST=""
-
-#################################
-# Function definitions
-#################################
-
-# Print messages to stdout
-# Use this to show output heading to stdout
-PRINT()
-{
-    echo "$*"
-}
-
-# Show seconds since midnight.
-# This is used to calculate seconds elapsed
-SecOfDay()
-{
-    set `date '+%H %M %S'`
-    t_sec=`expr $1 \* 3600 + $2 \* 60 + $3`
-    echo $t_sec
-}
-
-# Calculated the elapsed time (in seconds) between the first
-# and second time.  If second time is smaller than the first,
-# we assume the clock has passed midnight and calculate appropriately.
-ElapsedTime()
-{
-    if [ $2 -lt $1 ]; then
-	t_sec=`expr 3600 \* 24 - $1 + $2`
-    else
-	t_sec=`expr $2 - $1`
-    fi
-    echo `expr $t_sec / 60`m `expr $t_sec % 60`s
-}
-
-# Report errors
-# $1--an error message to be printed
-REPORT_ERR()
-{
-    ERRMSG=$1
-    # print it with a banner shifted right a bit
-    PRINT "	*************************************"
-    PRINT "	`date`"
-    PRINT "	$ERRMSG"
-    PRINT "	*************************************"
-    # report it in the FAILED-LOG file too
-    PRINT "$ERRMSG" >> $FAILEDLOG
-}
-
-#
-# Report results of the last test done
-REPORT_RESULT()
-{
-    if [ $retcode -eq 0 ]; then
-	if [ $skiptest = yes ]; then
-	    n_skip=`expr $n_skip + 1`
-	    PRINT "SKIPPED ${HOSTNAME}: $TEST_TYPE" | tee -a $SKIPPEDLOG
-	else
-	    n_pass=`expr $n_pass + 1`
-	    PRINT "PASSED ${HOSTNAME}: $TEST_TYPE" | tee -a $PASSEDLOG
-	fi
-    else
-	# test failed.
-	n_fail=`expr $n_fail + 1`
-	REPORT_ERR "****FAILED ${HOSTNAME}: $TEST_TYPE****"
-    fi
-}
-
-# Print a blank line
-PRINT_BLANK()
-{
-    PRINT
-}
-
-# Print test trailer
-PRINT_TEST_TRAILER()
-{
-    PRINT "*** finished $TEST_TYPE tests for $HOSTNAME ***"
-    date; EndTime=`SecOfDay`
-    PRINT Total time = `ElapsedTime $StartTime $EndTime`
-    PRINT_BLANK
-}
-
-# Print trailer summary
-PRINT_TRAILER()
-{
-    PRINT "*** finished tests in $HOSTNAME ***"
-    date; TotalEndTime=`SecOfDay`
-    PRINT "${HOSTNAME}: Ran $n_test($n_pass/$n_fail/$n_skip) $runtest_type, Grand total test time = " \
-          "`ElapsedTime $TotalStartTime $TotalEndTime`" | tee -a $TIMELOG
-    PRINT_BLANK
-}
-
-# Figure out which remote command to use to reach a host.
-# Try ssh first, then rsh since fewer machines support rsh exec.
-# $1--hostname to reach.
-CHECK_RSH()
-{
-    # Figure out how to use ping command in this host.
-    # Some hosts use "ping host count", some use "ping -c count host".
-    # Test "ping -c 3 -w 5" since it has timeout feature.
-    # Test "ping -c ..." style before "ping host 3" because some machines
-    # that recognize -c treat 'ping localhost 3' as to ping host '3'.
-    if [ -z "$PING" ]; then
-	if ping -c 3 -w 5 localhost >/dev/null 2>&1; then
-	    PING='ping -c 3 -w 5'
-	    PINGCOUNT=
-	elif ping -c 3 localhost >/dev/null 2>&1; then
-	    PING='ping -c 3'
-	    PINGCOUNT=
-	elif ping localhost 3 >/dev/null 2>&1; then
-	    PING=ping
-	    PINGCOUNT=3
-	else	# don't know how to use ping.
-	    PING=no_ping
-	    PINGCOUNT=
-	fi
-    fi
-    #
-    host=$1
-    # Try remote command with host if it responds to ping.
-    # Still try it if we don't know how to do ping.
-    if [ no_ping = "$PING" ] || $PING $host $PINGCOUNT >/dev/null 2>&1; then
-	if ssh $host -n hostname >/dev/null 2>&1; then
-	    RSH=ssh
-	elif rsh $host -n hostname >/dev/null 2>&1; then
-	    RSH=rsh
-	else
-	    PRINT cannot remote command with $host
-	    RSH="NoRemoteCommand"
-	fi
-    else
-	RSH="NotReachable"
-    fi
-}
-
-
-# Wait for a file for at most number of minutes
-# $1--the file
-# $2--number of minutes
-# WAIT_STATUS set to:
-#	-1 if errors encountered
-#	0  if file found within time limit
-#	1  if file not found within time limit
-WAITFOR()
-{
-    wait_file=$1
-    nminutes=$2
-    if [ -z "$wait_file" -o ! "$nminutes" -ge 0 ]
-    then
-	PRINT "errors in argument of WAITFOR(): wait_file($1) or nminutes($2)"
-	WAIT_STATUS=-1
-	return
-    fi
-    while [ ! -f $wait_file ]; do
-	if [ $nminutes -gt 0 ]; then
-	    PRINT "Wait For $wait_file to appear"
-	    sleep 60			#sleep 1 minute
-	else
-	    WAIT_STATUS=1
-	    return
-	fi
-	nminutes=`expr $nminutes - 1`
-    done
-    WAIT_STATUS=0
-    return
-}
-
-
-# Wait till a file disappears for at most number of minutes.
-# Useful to wait till a lock is removed by another process.
-# $1--the file
-# $2--number of minutes
-# WAIT_STATUS set to:
-#	-1 if errors encountered
-#	0  if file disappears within time limit
-#	1  if file has not disappeared within time limit
-WAITTILL()
-{
-    wait_file=$1
-    nminutes=$2
-    if [ -z "$wait_file" -o ! "$nminutes" -ge 0 ]
-    then
-	PRINT "errors in argument of WAITTILL(): wait_file($1) or nminutes($2)"
-	WAIT_STATUS=-1
-	return
-    fi
-    while [ -f $wait_file ]; do
-	if [ $nminutes -gt 0 ]; then
-	    PRINT "Wait till $wait_file has disappeared"
-	    sleep 60			#sleep 1 minute
-	else
-	    WAIT_STATUS=1
-	    return
-	fi
-	nminutes=`expr $nminutes - 1`
-    done
-    WAIT_STATUS=0
-    return
-}
-
-
-# Run one snapshot test
-# $*--Types of test being run
-RUNSNAPTEST()
-{
-    SNAPCMD_OPT="$STANDARD_OPT"		# snapshot test option
-    SRCDIRNAME=${HOSTNAME}
-    # restore CC, PATH in case they were changed in the last test.
-    CC="$CC_SAVED"
-    PATH=$PATH_SAVED
-    export PATH			# DEC OSF1 needs to export PATH explicitly
-    TEST_TYPE=$*
-    retcode=0
-    skiptest=no
-    date
-    PRINT "*** starting $TEST_TYPE tests in $HOSTNAME ***"
-    PRINT "Uname -a: `uname -a`"
-
-    # Parse the test type and set options accordingly.
-    # See comments of SNAPTEST_CONFIG_PARSE().
-    while [ $# -gt 0 ]; do
-	case $1 in
-	    -n32) # want -n32 option
-		SRCDIRNAME=${SRCDIRNAME}-n32
-		CC="cc -n32"
-		export CC
-		;;
-	    -64) # want -64 option
-		SRCDIRNAME=${SRCDIRNAME}-64
-		CC="cc -64"
-		export CC
-		;;
-	    parallel) # want parallel test
-		SNAPCMD_OPT="$SNAPCMD_OPT $ENABLE_PARALLEL"
-		SRCDIRNAME=${SRCDIRNAME}-pp
-		;;
-	    standard) # standard test
-		;;
-	    --*)
-		# option for configure
-		SNAPCMD_OPT="$SNAPCMD_OPT $1"
-		;;
-	    op-configure)
-		# option for configure
-		SNAPCMD_OPT="$SNAPCMD_OPT $1 $2"
-		shift
-		;;
-	    op-snapshot)
-		# option for snapshot
-		shift
-		SNAPCMD_OPT="$SNAPCMD_OPT $1"
-		;;
-	    setenv)
-		# pass them along to snapshot set environment variable
-		shift
-		SNAPCMD_OPT="$SNAPCMD_OPT setenv $1 $2"
-		shift
-		;;
-	    setenvN)
-		# set environment variable with $1 values
-		# e.g., setenvN 3 x a b c is same as setenv x="a b c".
-		# pass them along to snapshot set environment variable
-		shift
-		envN=$1
-		shift
-		envname=$1
-		SNAPCMD_OPT="$SNAPCMD_OPT setenvN $envN $envname"
-		envalue=
-		while test $envN -gt 0; do
-		    shift
-		    envalue="$envalue $1"
-		    envN=`expr $envN - 1`
-		done
-		SNAPCMD_OPT="$SNAPCMD_OPT $envalue"
-		;;
-	    skip)
-		# skip this test
-		skiptest=yes
-		;;
-	    srcdirname)
-		# Use this before using parallel and -n32 since this overrides
-		# the others.
-		shift
-		SRCDIRNAME=$1
-		;;
-	    deploy)
-		# deploy the built binary.
-		shift
-		SNAPCMD_OPT="$SNAPCMD_OPT deploy $1"
-		;;
-	    deploydir)
-		# default directory for deployment.
-		shift
-		SNAPCMD_OPT="$SNAPCMD_OPT deploydir $1"
-		;;
-	    *) # unknown test
-		PRINT "$0: unknown type of test ($1)"
-		retcode=1
-		;;
-	esac
-	shift
-    done
-
-    if [ $retcode -ne 0 -o $skiptest = yes ]; then
-	errcode=$retcode 
-	return $retcode
-    fi
-
-    # Track down the zlib software
-    ans=`$SNAPYARD/current/bin/locate_sw zlib`
-    if [ $? = 0 ]; then
-	Z_INC=`echo $ans | cut -f1 -d,`
-	Z_LIB=`echo $ans | cut -f2 -d,`
-	SNAPCMD_OPT="$SNAPCMD_OPT zlib $Z_INC,$Z_LIB"
-    else
-	# cannot locate zlib software.
-	# continue the test, maybe configure can find it.
-	:
-    fi
-
-    if [ -n "${SRCDIRNAME}" ]; then
-	SNAPCMD_OPT="$SNAPCMD_OPT srcdirname ${SRCDIRNAME}"
-    fi
-
-    # Setup log file name to save test output
-    THIS_MINUTE=`date +%H%M`
-    LOGFILE=${LOGBASENAME}/${SRCDIRNAME}_${TODAY}_${THIS_MINUTE}
-    PRINT "Running snapshot with output saved in"
-    PRINT "   $LOGFILE"
-    (date; PRINT Hostname=$HOSTNAME) >> $LOGFILE
-
-    (
-    cd $SNAPYARD/current
-    $SNAPSHOT $SNAPCMD $SNAPCMD_OPT
-    ) >> $LOGFILE 2>&1
-    retcode=$?
-    [ $retcode -ne 0 ] && errcode=$retcode
-
-    date >> $LOGFILE
-    if [ $retcode -ne 0 ]; then
-        # Dump the first 10 lines and the last 30 lines of the LOGFILE.
-        ( ntail=30
-	    echo =========================
-	    echo "Dumping logfile of ${HOSTNAME}: $TEST_TYPE"
-	    echo "Last $ntail lines of $LOGFILE"
-	    echo =========================
-	    tail -$ntail $LOGFILE
-            echo =========================
-            echo Dumping done
-            echo =========================
-	    echo ""
-	) >> $FAILEDDETAIL
-    fi
-}
-
-TIMELIMIT_PARSE()
-{
-    # Function returns timeparam for timekeeper via standard out - 
-    # any debug statements should be 'echo "Debug string" >&2' or timekeeper 
-    # will declare timeparam to be non-numeric and ignore it.
-    while read x y ; do
-        # Scan for entry for this weekday.
-        xd=`echo $x | cut -f1 -d/`
-        if [ "$xd" = ${WEEKDAY} ]; then
-            # strip away the weekday/ part.
-            timeparam=`echo $x | cut -f2 -d/`
-            break
-        fi
-        case "$x" in
-           '' | '#'*)
-                # blank or comment lines.  Continue.
-                ;;
-            ???/*)
-                # Ignore any entry not of this weekday.
-                ;;
-            *)
-                timeparam="$x"
-                ;;
-        esac
-    done
-    echo $timeparam
-    return
-}
-
-# configuration parsing.
-# Taking configuration from input.
-# This should be invoke with configure file as stdin.
-# Syntax of the configure file:
-#    All lines started with the # are comment lines and are ignored.
-#    Blank lines are ignored too.
-#    Each config line starts with a "Scope" followed by test types.
-#
-# Scope can be:
-#    standard ...          # what the standard test types are.
-#    <host>: <test>        Do <test> for <host> 
-#    all: <test>           Do <test> for all hosts. 
-#    <weekday>/...         Use this scope if the <weekday> matches.
-#                          <weekday> can be {Mon,Tue,Wed,Thu,Fri,Sat,Sun}
-#    If no <host>: input for a <host>, the standard test is used.
-#
-# Test types:
-#    standard		tests defined in standard scope.
-#    -n32		-n32 mode.  Apply to 64/32 bit OS such as IRIX64.
-#    parallel		parallel mode.
-#    op-configure <option>	configure option
-#    op-snapshot <option>	snapshot option
-#    --*		configure option
-#    setenv <name> <value>	set environment variable <name> to <value>
-#                       Pass along to snapshot
-#    setenvN <N> <name> <value> ...
-#		        set environment variable with <N> values
-#		        e.g., setenvN 3 x a b c is same as setenv x="a b c".
-#                       Pass along to snapshot.
-#    skip		skip this test
-#    srcdirname <name>	use <name> as the build-directory.
-#    deploy <name>	deploy the built binary at directory <name>.
-#    deploydir <name>   use <name> as the default directory for deployment.
-SNAPTEST_CONFIG_PARSE()
-{
-    while read x y ; do
-	# Scan for entry for this weekday.
-	xd=`echo $x | cut -f1 -d/`
-	if [ "$xd" = ${WEEKDAY} ]; then
-	    # strip away the weekday/ part.
-	    x=`echo $x | cut -f2 -d/`
-	fi
-	case "$x" in
-	    '' | '#'*)
-		# blank or comment lines.  Continue.
-	    	;;
-	    ???/*)
-		# Ignore any entry not of this weekday.
-		;;
-	    standard)
-		#standard configuration
-		STANDARD_OPT="$y"
-		;;
-	    all: | ${CONFIGNAME}:)
-		# types of test for all hosts or this host
-		if [ -n "$TEST_TYPES" ]; then
-		    TEST_TYPES="$TEST_TYPES ; $y"
-		else
-		    TEST_TYPES="$y"
-		fi
-		;;
-	    *:)	# ignore types of test for other hosts
-		;;
-	    *)	# unknown configuration option
-		PRINT $x $y
-		PRINT "***Unknown configuration option. Ignored.***"
-		;;
-	esac
-    done
-}
-
-# Snap Test configuration parsing.
-# If TEST_TYPES is not set, set it to do the "standard" test.
-SNAPTEST_CONFIG()
-{
-    TEST_TYPES=
-    STANDARD_OPT=
-    if [ -f $SNAPTESTCFG ]; then
-	SNAPTEST_CONFIG_PARSE < $SNAPTESTCFG
-    fi
-    TEST_TYPES=${TEST_TYPES:-'standard'}
-}
-
-
-# Show usage page
-USAGE()
-{
-cat <<EOF
-Usage: runtest [-h] [-debug] [-r<version>] [-all] [-nocvs] [-nodiff] [<host> ...]
-    -h
-	print this help page
-    -debug
-	turn on debug mode
-    -r<version>
-	do runtest for <version>
-    -all
-	launch tests for all pre-defined testing hosts
-    -nocvs
-	do not do cvs commands
-    -nodiff
-	do not do diff commands
-    -setup
-        setup the directory structure for snapshot test
-    -configname <name>
-	use <name> as hostname in the parsing of the snaptest configure file
-    <host>
-	launch tests for <host>
-    
--all and <host> are contradictory and whichever is specified last, is
-the one to take effect.  If neither are given, do the test for the
-local host.
-EOF
-}
-
-
-# Verify if directory ($1) exists.  If not, create it.
-CHECK_DIR()
-{
-   dir=$1
-   if test ! -e $1; then
-      echo mkdir $1
-      mkdir $1
-      errcode=$?
-   elif test ! -d $1; then
-      echo $1 is not a directory
-      errcode=1
-   fi
-}
-
-
-#################################
-# Main
-#################################
-#################################
-# Set up global variables
-#################################
-retcode=0			# error code of individula task
-errcode=0			# error code of the whole test
-skiptest=no			# if test is skipped
-CC_SAVED="$CC"			# CC & PATH maybe changed within a test.
-PATH_SAVED=$PATH		# These save the original values.
-timelimit=300			# default time limit (minutes) for the timekeeper
-
-#################################
-# Parse options
-#################################
-while [ $# -gt 0 ]; do
-    case "$1" in
-	-h) # help--show usage
-	    USAGE
-	    exit 0
-	    ;;
-	-debug*)
-	    # set debug mode
-	    DEBUGMODE="$1"
-	    SNAPSHOT="echo bin/snapshot"
-	    PROGNAME="$PROGNAME $DEBUGMODE"
-	    PRINT "******** DEBUGMODE is $DEBUGMODE ************"
-	    ;;
-	-r*)
-	    # version string
-	    H5VER="$1"
-	    ;;
-	-all)
-	    # Test all hosts.
-	    TESTHOST=-all
-	    ;;
-	-nocvs)
-	    # do not do cvs commands.
-	    NOCVS=nocvs
-	    ;;
-	-nodiff)
-	    # do not do diff commands.
-	    NODIFF=nodiff
-	    ;;
-	-configname)
-	    # use <name> as hostname in the parsing of the snaptest configure file.
-	    shift
-	    CONFIGNAME=$1
-	    ;;
-	-setup)
-	    # setup the directory structure for snapshot test.
-	    CMD=setup
-	    ;;
-	-*) # Unknow option
-	    PRINT "Unknown option ($1)"
-	    USAGE
-	    exit 1
-	    ;;
-	*)
-	    TESTHOST=$*
-	    break
-	    ;;
-    esac
-    shift
-done
-
-# setup H5VER if not set yet
-if [ -z "$H5VER" -a -f bin/snapshot_version ]
-then
-    . bin/snapshot_version
-fi
-
-if [ -n "$H5VER" ]
-then
-    H5VERSION=hdf5_`echo $H5VER | sed -e s/-r// -e s/\\\./_/g`
-    PROGNAME="$PROGNAME $H5VER"
-else
-    H5VERSION=hdf5
-fi
-
-#################################
-# Setup snapshot test directories
-#################################
-BASEDIR=${HOME}/snapshots-${H5VERSION}
-# initial processing of setup option if requested
-if test x-$CMD = x-setup; then
-    CHECK_DIR $BASEDIR
-    test $errcode -ne 0 && exit 1
-elif [ ! -d ${BASEDIR} ]; then
-    echo "BASEDIR ($BASEDIR) does not exist"
-    exit 1
-fi
-# Show the real physical path rather than the symbolic path
-SNAPYARD=`cd $BASEDIR && /bin/pwd`
-# Log file basename
-LOGDIR=${SNAPYARD}/log
-LOGBASENAME=${LOGDIR}
-PASSEDLOG=${LOGDIR}/PASSED_LOG_${TODAY}
-FAILEDLOG=${LOGDIR}/FAILED_LOG_${TODAY}
-FAILEDDETAIL=${LOGDIR}/FAILED_DETAIL_${TODAY}
-SKIPPEDLOG=${LOGDIR}/SKIPPED_LOG_${TODAY}
-TIMELOG=${LOGDIR}/TIME_LOG_${TODAY}
-TIMEKEEPERLOG=${LOGDIR}/TIMEKEEPER_LOG_${TODAY}
-CVSLOG=${LOGDIR}/CVS_LOG_${TODAY}
-CVSLOG_LOCK=${LOGDIR}/CVS_LOG_LOCK_${TODAY}
-DIFFLOG=${LOGDIR}/DIFF_LOG_${TODAY}
-COPYRIGHT_ERR=${LOGDIR}/COPYRIGHT_ERR_${TODAY}
-# Snap Test hosts and Configuration files
-ALLHOSTSFILE=${SNAPYARD}/allhostfile
-SNAPTESTCFG=${SNAPYARD}/snaptest.cfg
-TIMELIMIT=${SNAPYARD}/timelimit
-TMPFILE="${LOGDIR}/#runtest.${TODAY}.$$"
-
-# more processing of setup option if requested
-if test x-$CMD = x-setup; then
-    CHECK_DIR $LOGDIR
-    test $errcode -ne 0 && exit 1
-    CHECK_DIR $LOGDIR/OLD
-    test $errcode -ne 0 && exit 1
-    CHECK_DIR $SNAPYARD/TestDir
-    test $errcode -ne 0 && exit 1
-    # create empty test hosts or configure files if non-existing
-    for f in $ALLHOSTSFILE $SNAPTESTCFG; do
-	if test ! -f $f; then
-	    echo Creating $f
-	    touch $f
-	fi
-    done
-    # create or update the current source.
-    echo update current source
-    $SNAPSHOT checkout 
-    # setup completed.  Exit.
-    exit 0
-fi
-
-#################################
-# Show some host status numbers
-#################################
-# df sometimes hangs due to file system problems.  Invoke it as background
-# process and give it 10 seconds to finish.  If it hangs, just continue.
-uptime
-df &
-sleep 10
-
-#################################
-# Setup test host(s)
-#################################
-if [ "$TESTHOST" = -all ]; then
-    if [ -f $ALLHOSTSFILE ]; then
-	TESTHOST=`sed -e '/^#/d;/^ *$/d' $ALLHOSTSFILE`
-    else
-	PRINT "could not access the all-hosts-file ($ALLHOSTSFILE)"
-	USAGE
-	exit 1
-    fi
-fi
-
-
-#################################
-# Setup to print a trailer summary when exiting not via
-# the normal end of the script.
-#################################
-trap PRINT_TRAILER 0
-
-#
-TotalStartTime=`SecOfDay`
-
-# Process the configuration
-SNAPTEST_CONFIG
-PRINT STANDARD_OPT=$STANDARD_OPT
-PRINT TEST_TYPES=$TEST_TYPES
-PRINT_BLANK
-
-# Do a checkout if one has not been done today.
-# Then check MANIFEST file and copyrights noitces.
-if [ -z "$NOCVS" ]; then
-    PRINT "Running CVS checkout with output saved in"
-    PRINT "   $CVSLOG"
-    # Set CVS lock first
-    touch $CVSLOG_LOCK
-    ($SNAPSHOT checkout ) >> $CVSLOG 2>&1
-    # Save error code and remove the lock
-    errcode=$?
-    rm -f $CVSLOG_LOCK
-    if [ $errcode -ne 0 ]; then
-	# test failed.
-	REPORT_ERR "****FAILED ${HOSTNAME}: CVS checkout****"
-	exit $errcode
-    fi
-    # ===================
-    # Check MANIFEST file
-    # ===================
-    PRINT Checking MAINFEST file ...
-    (cd $SNAPYARD/current; bin/chkmanifest) > $TMPFILE 2>&1
-    errcode=$?
-    if [ $errcode -eq 0 ]; then
-	# test passed.
-	cat $TMPFILE
-    else
-	# test failed.
-	REPORT_ERR "****FAILED ${HOSTNAME}: MANIFEST check****"
-        (   echo =========================
-	    echo "MANIFEST checking failed output"
-	    echo =========================
-	    cat $TMPFILE
-            echo =========================
-	    echo "MANIFEST checking failed output done"
-            echo =========================
-	    echo ""
-	) >> $FAILEDDETAIL
-    fi
-    rm $TMPFILE
-    PRINT_BLANK
-    # No copyright checking until what need copyright is decided. 2006/4/7.
-    if false; then
-    # ======================
-    # Check Copyright notice
-    # ======================
-    PRINT Checking Copyrights notices ...
-    if (cd $SNAPYARD/current; bin/chkcopyright) > $TMPFILE 2>&1 ; then
-	echo Passed.
-    else
-	# Save the output and report some of it.
-	# Do not report it as failed for runtest yet.
-	# Send a separate report mail via hardcoding.
-	# Need fixes/cleanup later.
-	echo "Failed. See detail in another report mail"
-	cp $TMPFILE $COPYRIGHT_ERR
-	nheadlines=300
-	ntaillines=5		# Number of lines in report summary.
-	(
-	    echo =========================
-	    echo "Copyright checking failed. Showing first $nheadlines lines of output."
-	    echo "Complete output is in file $COPYRIGHT_ERR"
-	    echo =========================
-	    nreportlines=`wc -l < $COPYRIGHT_ERR`
-	    if [ $nreportlines -le `expr $nheadlines + $ntaillines` ]; then
-		# Just print the whole file.
-		cat $COPYRIGHT_ERR
-	    else
-		# Show the first $nheadlines plus report summary
-		head -$nheadlines $COPYRIGHT_ERR
-		echo ...
-		tail -$ntaillines $COPYRIGHT_ERR
-	    fi 
-	)  | Mail -s "${H5VERSION} Copyrights check Failed" hdf5lib
-    fi
-    rm $TMPFILE
-    PRINT_BLANK
-    fi
-else
-    # make sure the cvs update, if done by another host, has completed.
-    # First wait for the presence of $CVSLOG which signals some host
-    # has started the cvs update.  Then wait for the absense of $CVSLOG_LOCK
-    # which signals the host has completed the cvs update.
-    WAITFOR $CVSLOG 90
-    if [ $WAIT_STATUS -ne 0 ]; then
-	errcode=$WAIT_STATUS
-	REPORT_ERR "****FAILED ${HOSTNAME}: Time expired waiting CVS update to start****"
-	exit $errcode
-    fi
-    WAITTILL $CVSLOG_LOCK 10
-    if [ $WAIT_STATUS -ne 0 ]; then
-	errcode=$WAIT_STATUS
-	REPORT_ERR "****FAILED ${HOSTNAME}: Time expired waiting CVS update to finish****"
-	exit $errcode
-    fi
-fi
-
-# run a snapshot diff to see if any significant differences between
-# the current and previous versions
-if [ -z "$NODIFF" ]; then
-    $SNAPSHOT diff >> $DIFFLOG 2>&1
-    errcode=$?
-    # check the errcode only if NOT in DEBUG MODE
-    if [ -z "$DEBUGMODE" -a $errcode -eq 0 ]; then
-	# no need to run test
-	PRINT "NO TEST: no significant differences between current and previous versions" |
-	    tee -a $PASSEDLOG
-	exit 0
-    fi
-fi
-
-# we can use the version of script in SNAPYARD/current now.
-# Don't do the diff or cvs update any more.
-PROGNAME="$SNAPYARD/current/$PROGNAME -nodiff -nocvs"
-
-# Decide to do test for the local host or for remote hosts
-if [ -n "$TESTHOST" -a $HOSTNAME != "$TESTHOST" ]; then
-    date
-    PRINT "*** launching tests from $HOSTNAME ***"
-    PRINT_BLANK
-    TEST_TYPE="launching"
-    cd ${SNAPYARD}/log
-    # Fork off timekeeper if concurrent tests will be used.
-    if [ -n "$SRCDIR" ]; then
-        timelimit=`TIMELIMIT_PARSE < $TIMELIMIT`
-	($SNAPYARD/current/bin/timekeeper $timelimit > $TIMEKEEPERLOG 2>&1 &)
-	PRINT "    Fork off timekeeper $timelimit"
-    fi
-    runtest_type="hosts"
-    for h in $TESTHOST; do
-	# Must do CONFIGNAME before $h got changed by the second cut.
-	# cut returns the whole string if there is no / in the string
-	# at all.  But that works okay for the CONFIGNAME too.
-	CONFIGNAME=`echo $h | cut -f2 -d/`
-	h=`echo $h | cut -f1 -d/`
-	n_test=`expr $n_test + 1`
-	TMP_OUTPUT="#${h}_${CONFIGNAME}.out"
-	(PRINT "=============="
-	 PRINT "Testing $h"
-	 PRINT "==============") > $TMP_OUTPUT
-	CHECK_RSH $h
-	# run the remote shell command with output to $TMP_OUTPUT
-	case "$RSH" in
-	    rsh|ssh)
-		CMD="$RSH $h -n $PROGNAME -configname $CONFIGNAME"
-		PRINT $CMD
-
-		# launch concurrent tests only if srcdir is used
-		if [ -n "$SRCDIR" ]; then
-		    $CMD || REPORT_ERR "****FAILED ${h}: Abnormal exit from runtest****" && PRINT_BLANK &
-		    echo $! > PID.${h}_${CONFIGNAME}
-		else
-		    $CMD || REPORT_ERR "****FAILED ${h}: Abnormal exit from runtest****" && PRINT_BLANK
-		fi
-		;;
-	    NoRemoteCommand)
-		PRINT $h does not accept Remote Command "(`date`)"
-		;;
-	    NotReachable)
-		PRINT $h is not reachable  "(`date`)"
-		;;
-	    *)
-		PRINT "CHECK_RSH for $h returned unknow result ($RSH)"
-		;;
-	esac >> $TMP_OUTPUT 2>&1
-    done
-    # wait for all launched tests to finish, then cat them back out.
-    wait
-    # Pause a moment in case the timekeeper is terminating processes.
-    wait 30
-    for h in $TESTHOST; do
-	CONFIGNAME=`echo $h | cut -f2 -d/`
-	h=`echo $h | cut -f1 -d/`
-	TMP_OUTPUT="#${h}_${CONFIGNAME}.out"
-	cat $TMP_OUTPUT
-	# Verify test script did complete by checking the last lines
-	(tail -5 $TMP_OUTPUT | grep -s 'Grand total' > /dev/null 2>&1) ||
-	    (REPORT_ERR "****FAILED ${h}: snaptest did not complete****" &&
-		PRINT_BLANK)
-	rm -f $TMP_OUTPUT PID.${h}_${CONFIGNAME}
-    done
-    exit 0
-fi
-
-# run the test(s)
-# Note that first field is cut without -s but all subsequent cut
-# must use -s.  If -s is not used at all, a $TEST_TYPES that has
-# no ';' (only 1 test), will pass through intact in all cut. That
-# results in infinite looping.
-# If -s is used with the first field, it will suppress completely
-# a $TYPE_TYPES that has no ';' (only 1 tst ).  That results in no
-# test at all.
-# Note that n_test must start as 1.
-# 
-n_test=1
-runtest_type="tests"
-TEST="`echo $TEST_TYPES | cut -f$n_test -d';'`"
-while [ -n "$TEST" ]; do
-    StartTime=`SecOfDay`
-    RUNSNAPTEST $TEST
-    REPORT_RESULT
-    PRINT_TEST_TRAILER
-
-    n_test=`expr $n_test + 1`
-    TEST="`echo $TEST_TYPES | cut -f$n_test -s -d';'`"
-done
-# dec n_test to show the actual number of tests ran.
-n_test=`expr $n_test - 1`
-
-PRINT_TRAILER
-
-# disable trailer summary printing since all trailers have been
-# printed and we are exiting normally.
-trap 0
-exit $errcode
diff --git a/bin/snapshot b/bin/snapshot
deleted file mode 100755
index b4adf5e..0000000
--- a/bin/snapshot
+++ /dev/null
@@ -1,516 +0,0 @@
-#!/bin/sh
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-
-# This script should be run nightly from cron.  It checks out hdf5
-# from the source repository and compares it against the previous
-# snapshot.  If anything significant changed then a new snapshot is
-# created, the minor version number is incremented, and the change is
-# checked back into the source repository.
-#
-
-# function definitions
-TIMESTAMP()
-{
-    echo "=====" "$1": "`date`" "====="
-}
-
-EXIT_BANNER()
-{
-TIMESTAMP "Exit $PROGNAME with status=$?"
-}
-
-# Show current total disk usage.
-DISKUSAGE()
-{
-    du -ks | \
-    ( read x y; echo "Disk Usage=$x KB" )
-}
-
-
-# MAIN
-# SGI /bin/sh replaces $0 as function name if used in a function.
-# Set the name here to avoid that ambiguity and better style too.
-PROGNAME=$0
-
-echo "====================================="
-echo "$PROGNAME $*"
-echo "====================================="
-TIMESTAMP MAIN
-uname -a
-
-# setup exit banner message
-trap EXIT_BANNER 0
-
-# Dump environment variables before option parsing
-echo ===Dumping environment variables before option parsing ===
-printenv | sort
-echo ===Done Dumping environment variables before option parsing ===
-
-# snapshots release directory.  Default relative to $BASEDIR.
-ReleaseDir_default=release_dir
-
-# Where is the zlib library?
-# At NCSA, half of the machines have it in /usr/lib, the other half at
-# /usr/ncsa/lib.  Leave it unset.
-ZLIB_default=
-ZLIB=$ZLIB_default
-
-# What compression methods to use? (md5 does checksum).
-METHODS="gzip zip bzip2 md5 doc"
-
-# Use User's MAKE if set.  Else use generic make.
-MAKE=${MAKE:-make}
-
-# Default check action.
-CHECKVAL=check
-
-#
-# Command options
-cmd="all"
-test_opt=""
-errcode=0
-while [ $# -gt 0 ] ; do
-    case "$1" in
-	all)	
-	    cmd="all"
-	    ;;
-	checkout)
-	    cmdcheckout="checkout"
-	    cmd=""
-	    ;;
-	diff)
-	    cmddiff="diff"
-	    cmd=""
-	    ;;
-	deploy)
-	    # deploy the built binary.
-	    shift
-	    if [ $# -lt 1 ]; then
-		echo "deploy <dir> missing"
-		errcode=1
-		cmd="help"
-		break
-	    fi
-	    cmddeploy="deploy"
-	    DEPLOYDIRNAME="$1"
-	    ;;
-	deploydir)
-	    # default directory for deployment.
-	    shift
-	    if [ $# -lt 1 ]; then
-		echo "deploydir <dir> missing"
-		errcode=1
-		cmd="help"
-		break
-	    fi
-	    deploydir="$1"
-	    ;;
-	test)
-	    cmdtest="test"
-	    cmd=""
-	    ;;
-	setenv)
-	    # set environment variable
-	    shift
-	    eval $1="$2"
-	    export $1
-	    shift
-	    ;;
-	setenvN)
-	    # set environment variable with $1 values
-	    # e.g., setenvN 3 x a b c is same as setenv x="a b c".
-	    # a kludge now--the extra single quotes are needed
-	    # else eval complains.
-	    shift
-	    envN=$1
-	    shift
-	    envname=$1
-	    envalue=
-	    while test $envN -gt 0; do
-		shift
-		envalue="$envalue $1"
-		envN=`expr $envN - 1`
-	    done
-	    eval $envname="'$envalue'"
-	    export $envname
-	    ;;
-	srcdir)
-	    #use srcdir option for test
-	    srcdir="yes"
-	    ;;
-	srcdirname)
-	    shift
-	    if [ $# -lt 1 ]; then
-		echo "srcdirname <dir> missing"
-		errcode=1
-		cmd="help"
-		break
-	    fi
-	    SRCDIRNAME="$1"
-	    ;;
-	release)
-	    cmdrel="release"
-	    cmd=""
-	    ;;
-	clean | distclean)
-	    cmdclean="$1"
-	    cmd=""
-	    ;;
-	help)
-	    cmd="help"
-	    break
-	    ;;
-	echo)
-	    set -x
-	    break
-	    ;;
-	zlib)
-	    shift
-	    if [ $# -lt 1 ]; then
-		echo "ZLIB information missing"
-		errcode=1
-		cmd="help"
-		break
-	    fi
-	    ZLIB="$1"
-	    ;;
-	releasedir)
-	    shift
-	    if [ $# -lt 1 ]; then
-		echo "Release directory name missing"
-		errcode=1
-		cmd="help"
-		break
-	    fi
-	    ReleaseDir="$1"
-	    ;;
-	check-vfd)
-	    CHECKVAL=check-vfd
-	    ;;
-	yodconfigure)
-	    YODCONFIGURE=yes
-	    ;;
-	--*)
-	    OP_CONFIGURE="$OP_CONFIGURE $1"
-	    ;;
-	op-configure)
-	    shift
-	    if [ $# -lt 1 ]; then
-		echo "op-configure option missing"
-		errcode=1
-		cmd="help"
-		break
-	    fi
-	    OP_CONFIGURE="$OP_CONFIGURE $1"
-	    ;;
-	*)
-	    echo "Unkown option $1"
-	    errcode=1
-	    cmd="help"
-	    break
-	    ;;
-    esac
-    shift
-done
-
-# Dump environment variables after option parsing
-echo ===Dumping environment variables after option parsing ===
-printenv | sort
-echo ===Done Dumping environment variables after option parsing ===
-
-if [ "$cmd" = help ]; then
-    set -
-    cat <<EOF
-Usage: $PROGNAME [all] [checkout] [diff] [test] [srcdir] [release] [help]
-	[clean] [distclean] [echo] [deploy <dir>] [deploydir <dir>]
-	[zlib <zlib_path>] [releasedir <dir>] [srcdirname <dir>] [check-vfd]
-	[op-configure <option>] [--<option>]
-    all:      Run all commands (checkout, test & release)
-              [Default is all]
-    checkout: Run source checkout
-    diff:     Run diff on current and previous versions.  Exit 0 if
-              no significant differences are found.  Otherwise, non-zero.
-    deploy:   deploy binary to directory <dir>
-    deploydir: use <dir> as the default directory for deployment
-    test:     Run test
-    release:  Run release
-    clean:    Run make clean
-    distclean:Run make distclean
-    echo:     Turn on echo mode (set -x)
-    setenv <name> <value>:
-              Set environment variable <name> to <value>.
-    setenvN <N> <name> <value> ...:
-	      Set environment variable with <N> values.
-	      E.g., setenvN 3 x a b c is same as setenv x="a b c".
-    srcdir:   Use srcdir option (does not imply other commands)
-              "snapshot srcdir" is equivalent to "snapshot srcdir all"
-              "snapshot srcdir checkout" is equivalent to "snapshot checkout"
-    srcdirname <dir>:
-              Use <dir> as the srcdir testing directory if srcdir is choosen.
-              If <dir> starts with '-', it is append to the default name
-              E.g., "snapshot srcdir srcdirname -xx" uses hostname-xx
-              [Default is hostname]
-    help:     Print this message
-    echo:     Turn on shell echo
-    zlib <zlib_path>:
-              Use <zlib_path> as the ZLIB locations
-              [Default is $ZLIB_default]
-    releasedir <dir>:
-              Use <dir> as the release directory
-              [Default is $ReleaseDir_default]
-    check-vfd:
-	      Run make check-vfd instead of just make check.
-    op-configure <option>:
-              Pass <option> to the configure command
-              E.g., "snapshot op-configure --enable-parallel"
-                  configures for parallel mode
-    --<option>:
-              Pass --<option> to the configure command
-              E.g., "snapshot --enable-parallel"
-                  configures for parallel mode
-EOF
-    exit $errcode
-fi
-
-# Setup the proper configure option (--with-zlib) to use zlib library
-# provide ZLIB is non-empty.
-ZLIB=${ZLIB:+"--with-zlib="$ZLIB}
-if [ -n "$YODCONFIGURE" ]; then
-    cp configure configure.yod
-    bin/yodconfigure configure.yod
-    CONFIGURE="./configure.yod"
-else
-    CONFIGURE="./configure"
-fi
-CONFIGURE="$CONFIGURE $ZLIB $OP_CONFIGURE"
-
-# Execute the requests
-snapshot=yes
-
-if [ -f bin/snapshot_version ]; then
-    . bin/snapshot_version
-else
-    H5VERSION=hdf5
-fi
-
-BASEDIR=${HOME}/snapshots-${H5VERSION}
-if [ ! -d ${BASEDIR} ]; then
-    echo "BASEDIR ($BASEDIR) does not exist"
-    exit 1
-fi
-
-CURRENT=${BASEDIR}/current
-PREVIOUS=${BASEDIR}/previous
-ReleaseDir=${ReleaseDir:=${BASEDIR}/${ReleaseDir_default}}
-HOSTNAME=`hostname | cut -f1 -d.`	# no domain part
-if [ $H5VERSION != hdf5 ]; then
-    SVNVERSION="hdf5/branches/$H5VERSION"
-else
-    SVNVERSION=hdf5/trunk		# use the default (trunk) version
-fi
-
-# Try finding a version of diff that supports the -I option too.
-DIFF=diff
-for d in `echo $PATH | sed -e 's/:/ /g'` ; do
-    test -x $d/diff && $d/diff -I XYZ /dev/null /dev/null > /dev/null 2>&1 &&
-	DIFF=$d/diff && break
-done
-
-#=============================
-# Run source checkout
-#=============================
-if [ "$cmd" = "all" -o -n "$cmdcheckout" ]; then
-    TIMESTAMP "checkout"
-    # If there is a Makefile in ${CURRENT}, the last test done in it
-    # has not been distclean'ed.  They would interfere with other
-    # --srcdir build since make considers the files in ${CURRENT}
-    # take precedence over files in its own build-directory.  Run
-    # a "make distclean" to clean them all out.  This is not really
-    # part of the "checkout" functions but this is the most convenient
-    # spot to do the distclean.  We will also continue the checkout process
-    # regardless of the return code of distclean.
-    ( cd ${CURRENT}; test -f Makefile && ${MAKE} distclean)
-
-    SVNROOT=http://svn.hdfgroup.uiuc.edu
-    # Check out the current version from source repository.
-    (cd $BASEDIR; svn -q co ${SVNROOT}/${SVNVERSION} current ) || exit 1
-fi # Do source checkout
-
-
-#=============================
-# Run Test the HDF5 library
-#=============================
-if [ "$cmd" = "all" -o -n "$cmdtest" -o -n "$cmddiff" ]; then
-    TIMESTAMP "diff"
-    # setup if srcdir is used.
-    if [ -z "$srcdir" ]; then
-	TESTDIR=${CURRENT}
-    else
-	#create TESTDIR if not exist yet
-	case "$SRCDIRNAME" in
-	"")
-	    SRCDIRNAME=$HOSTNAME
-	    ;;
-	-*)
-	    SRCDIRNAME="$HOSTNAME$SRCDIRNAME"
-	    ;;
-	esac
-	TESTDIR=${BASEDIR}/TestDir/${SRCDIRNAME}
-	test -d ${TESTDIR} || mkdir ${TESTDIR}
-    fi
-    # Make sure current version exists and is clean
-    if [ -d ${TESTDIR} ]; then
-	(cd ${TESTDIR} && ${MAKE} distclean)
-    else
-	errcode=$?
-        snapshot=no
-        exit $errcode
-    fi
-
-    # Compare it with the previous version.  Compare only files listed in
-    # the MANIFEST plus the MANIFEST itself.
-    if [ -d ${PREVIOUS} ]; then
-	if (${DIFF} -c ${PREVIOUS}/MANIFEST ${CURRENT}/MANIFEST); then
-	    snapshot=no
-	    for src in `grep '^\.' ${CURRENT}/MANIFEST|expand|cut -f1 -d' '`; do
-		if ${DIFF} -I H5_VERS_RELEASE -I " released on " \
-		    -I " currently under development" \
-		    ${PREVIOUS}/$src ${CURRENT}/$src
-		then
-		    :	#continue
-		else
-		    snapshot=yes
-		    break
-		fi
-	    done
-	fi
-    fi
-
-    # if diff is choosen, exit 0 if no significant differences are found.
-    # otherwise, exit 1.  This includes cases of other failures.
-    if [ -n "$cmddiff" ]; then
-	if [ $snapshot = no ]; then
-	    exit 0
-	else
-	    exit 1
-	fi
-    fi
-
-    # Build, run tests and install procedures
-    if [ "$snapshot" = "yes" ]; then
-	if (cd ${TESTDIR} && \
-	    TIMESTAMP "configure" && \
-	    ${srcdir:+${CURRENT}/}${CONFIGURE} && \
-	    TIMESTAMP "make" && \
-	    ${MAKE} && DISKUSAGE \
-	    TIMESTAMP ${CHECKVAL} && \
-	    ${MAKE} ${CHECKVAL} && DISKUSAGE \
-	    TIMESTAMP "install" && \
-	    ${MAKE} install-all && DISKUSAGE \
-	    TIMESTAMP "check-install" && \
-	    ${MAKE} check-install && DISKUSAGE \
-	    TIMESTAMP "uninstall" && \
-	    ${MAKE} uninstall-all && DISKUSAGE); then
-	    :
-	else
-	    errcode=$?
-	    snapshot=no
-	    exit $errcode
-	fi
-    fi
-fi # Test the HDF5 library
-
-
-#=============================
-# Run deployment if requested.
-#=============================
-if [ -n "$DEPLOYDIRNAME" ]; then
-    if [ "$snapshot" = "yes" ]; then
-	TIMESTAMP "deploy"
-        if (cd ${TESTDIR} &&
-            ${CURRENT}/bin/deploy ${deploydir}/${DEPLOYDIRNAME} && \
-            TIMESTAMP "clean" && \
-            ${MAKE} clean && \
-            TIMESTAMP "check-install prefix=${deploydir}/${DEPLOYDIRNAME}" && \
-            ${MAKE} check-install prefix=${deploydir}/${DEPLOYDIRNAME}); then
-	    :	#continue
-	else
-	    errcode=$?
-	    exit $errcode
-	fi
-    fi
-fi # Deploy
-
-
-#=============================
-# Run Release snapshot, update version, and commit to source repository
-#=============================
-if [ "$cmd" = "all" -o -n "$cmdrel" ]; then
-    if [ "$snapshot" = "yes" ]; then
-	TIMESTAMP "release"
-	(cd ${CURRENT} && ${MAKE} distclean)
-	(
-	    # Turn on exit on error in the sub-shell so that it does not
-	    # commit source if errors encounter here.
-	    set -e
-	    cd ${CURRENT}
-	    RELEASE_VERSION="`perl bin/h5vers -v`"
-	    echo "Making snapshot release ($RELEASE_VERSION) to ${ReleaseDir}..."
-	    bin/release -d $ReleaseDir $METHODS
-	    perl bin/h5vers -i
-	    svn -q commit -m "Snapshot $RELEASE_VERSION"
-	)
-	errcode=$?
-    fi
-
-    # Replace the previous version with the current version.
-    # Should check if the errcode of the release process but there
-    # are other failures after release was done (e.g. h5vers or svn failures)
-    # that should allow the replacement to occure.
-    rm -rf ${PREVIOUS}
-    mv ${CURRENT} ${PREVIOUS}
-fi #Release snapshot
-
-
-#=============================
-# Clean the test area.  Default is no clean.
-#=============================
-if [ -n "$cmdclean" ]; then
-    TIMESTAMP "clean"
-    # setup if srcdir is used.
-    if [ -z "$srcdir" ]; then
-	TESTDIR=${CURRENT}
-    else
-	case "$SRCDIRNAME" in
-	"")
-	    SRCDIRNAME=$HOSTNAME
-	    ;;
-	-*)
-	    SRCDIRNAME="$HOSTNAME$SRCDIRNAME"
-	    ;;
-	esac
-	TESTDIR=${BASEDIR}/TestDir/${SRCDIRNAME}
-    fi
-    # clean it
-    if (cd ${TESTDIR} && ${MAKE} $cmdclean ) then
-	:
-    else
-	errcode=$?
-        snapshot=no
-        exit $errcode
-    fi
-fi # Clean the Test directory
-
-exit $errcode
diff --git a/bin/snapshot_version b/bin/snapshot_version
deleted file mode 100644
index 86f7142..0000000
--- a/bin/snapshot_version
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-#
-
-# default version for snapshot test
-# H5VERSION matches with a source version symbolic name.  Will test use the
-# latest revision of that branch.  If set to "hdf5", it uses the main
-# version.
-# H5VER tells runtest which version to run
-H5VERSION=hdf5
diff --git a/bin/switch_maint_mode b/bin/switch_maint_mode
new file mode 100755
index 0000000..9813eeb
--- /dev/null
+++ b/bin/switch_maint_mode
@@ -0,0 +1,80 @@
+#!/bin/sh
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
+# Switch AM_MAINTAINER_MODE value in configure.ac
+# Usage: See USAGE()
+# Programmer: Dana Robinson
+# Creation date: January 2016
+
+USAGE()
+{
+cat <<EOF
+
+switch_maint_mode reverses the status of AM_MAINTAINER_MODE in
+configure.ac from enable to disable or vice-versa. When enabled,
+this feature forces the autotools to run when the input files are
+older than the output files. This is the default for development
+branches. When disabled, the autotools will NOT be re-run regardless
+of their timestamps or any modifications. This is the default for
+tarballs and release branches since it avoids having end-users
+requiring the autotools.
+
+Command Syntax
+==============
+switch_maint_mode [-help] [-enable|disable] <path-to-configure.ac>
+
+EOF
+}
+
+MODE="notset"
+CONFIG_AC_PATH=
+
+# Display help/usage if any options were passed in
+while [ $# -gt 0 ]; do
+    case "$1" in
+    -enable)
+        MODE="enable"
+        ;;
+    -disable)
+        MODE="disable"
+        ;;
+	-help)
+	    USAGE
+	    exit 0
+	    ;;
+    *)
+	    CONFIG_AC_PATH="$1"
+	    ;;
+    esac
+    shift
+done
+
+# Did we get a file path?
+if test -z $CONFIG_AC_PATH ; then
+    USAGE
+    exit 1
+fi
+
+# Did we get a mode?
+if test -z $MODE ; then
+    USAGE
+    exit 1
+fi
+
+# Run perl over configure.ac
+if test "X-$MODE" = "X-enable" ; then
+    perl -pi -e 's/^(AM_MAINTAINER_MODE\(\[)([a-z]+)(\]\))/$1enable$3/g' $CONFIG_AC_PATH
+fi
+if test "X-$MODE" = "X-disable" ; then
+    perl -pi -e 's/^(AM_MAINTAINER_MODE\(\[)([a-z]+)(\]\))/$1disable$3/g' $CONFIG_AC_PATH
+fi
+
diff --git a/bin/test-driver b/bin/test-driver
deleted file mode 100755
index d306056..0000000
--- a/bin/test-driver
+++ /dev/null
@@ -1,139 +0,0 @@
-#! /bin/sh
-# test-driver - basic testsuite driver script.
-
-scriptversion=2013-07-13.22; # UTC
-
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-# Make unconditional expansion of undefined variables an error.  This
-# helps a lot in preventing typo-related bugs.
-set -u
-
-usage_error ()
-{
-  echo "$0: $*" >&2
-  print_usage >&2
-  exit 2
-}
-
-print_usage ()
-{
-  cat <<END
-Usage:
-  test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
-              [--expect-failure={yes|no}] [--color-tests={yes|no}]
-              [--enable-hard-errors={yes|no}] [--]
-              TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
-The '--test-name', '--log-file' and '--trs-file' options are mandatory.
-END
-}
-
-test_name= # Used for reporting.
-log_file=  # Where to save the output of the test script.
-trs_file=  # Where to save the metadata of the test run.
-expect_failure=no
-color_tests=no
-enable_hard_errors=yes
-while test $# -gt 0; do
-  case $1 in
-  --help) print_usage; exit $?;;
-  --version) echo "test-driver $scriptversion"; exit $?;;
-  --test-name) test_name=$2; shift;;
-  --log-file) log_file=$2; shift;;
-  --trs-file) trs_file=$2; shift;;
-  --color-tests) color_tests=$2; shift;;
-  --expect-failure) expect_failure=$2; shift;;
-  --enable-hard-errors) enable_hard_errors=$2; shift;;
-  --) shift; break;;
-  -*) usage_error "invalid option: '$1'";;
-   *) break;;
-  esac
-  shift
-done
-
-missing_opts=
-test x"$test_name" = x && missing_opts="$missing_opts --test-name"
-test x"$log_file"  = x && missing_opts="$missing_opts --log-file"
-test x"$trs_file"  = x && missing_opts="$missing_opts --trs-file"
-if test x"$missing_opts" != x; then
-  usage_error "the following mandatory options are missing:$missing_opts"
-fi
-
-if test $# -eq 0; then
-  usage_error "missing argument"
-fi
-
-if test $color_tests = yes; then
-  # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'.
-  red='[0;31m' # Red.
-  grn='[0;32m' # Green.
-  lgn='[1;32m' # Light green.
-  blu='[1;34m' # Blue.
-  mgn='[0;35m' # Magenta.
-  std='[m'     # No color.
-else
-  red= grn= lgn= blu= mgn= std=
-fi
-
-do_exit='rm -f $log_file $trs_file; (exit $st); exit $st'
-trap "st=129; $do_exit" 1
-trap "st=130; $do_exit" 2
-trap "st=141; $do_exit" 13
-trap "st=143; $do_exit" 15
-
-# Test script is run here.
-"$@" >$log_file 2>&1
-estatus=$?
-if test $enable_hard_errors = no && test $estatus -eq 99; then
-  estatus=1
-fi
-
-case $estatus:$expect_failure in
-  0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
-  0:*)   col=$grn res=PASS  recheck=no  gcopy=no;;
-  77:*)  col=$blu res=SKIP  recheck=no  gcopy=yes;;
-  99:*)  col=$mgn res=ERROR recheck=yes gcopy=yes;;
-  *:yes) col=$lgn res=XFAIL recheck=no  gcopy=yes;;
-  *:*)   col=$red res=FAIL  recheck=yes gcopy=yes;;
-esac
-
-# Report outcome to console.
-echo "${col}${res}${std}: $test_name"
-
-# Register the test result, and other relevant metadata.
-echo ":test-result: $res" > $trs_file
-echo ":global-test-result: $res" >> $trs_file
-echo ":recheck: $recheck" >> $trs_file
-echo ":copy-in-global-log: $gcopy" >> $trs_file
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/bin/timekeeper b/bin/timekeeper
deleted file mode 100755
index 7c50759..0000000
--- a/bin/timekeeper
+++ /dev/null
@@ -1,131 +0,0 @@
-#!/bin/sh
-##
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-##
-# As a time keeper of the remote daily test process launched by runtest.
-# It sleeps for a certain time and then wakes up to hangup those processes
-# that are still around, assuming they have run too long.
-#
-# Programmer: Albert Cheng
-# Created Date: 2004/12/23
-
-# variable initialization
-waitminutes=300			# default to 5 hours == 300 minutes
-debugtimelimit=
-debugflag=		# no debug
-
-# Function definitions
-#
-# PRINTMSG
-# Print a one line message left justified in a field of 70 characters
-# without newline.  More output for this line later.
-#
-PRINTMSG() {
-    SPACES="                                                               "
-    echo "$* $SPACES" | cut -c1-70 | tr -d '\012'
-}
-
-
-USAGE()
-{
-    echo "Usage: %0 [-h] [-debug] [<time-limit>]"
-    echo "    Run timekeeper with <time-limit> minutes, default is $waitminutes."
-    echo "    If <time-limit> is in the form of HH:MM, it means wait till then."
-    echo "    -h      print this help page"
-    echo "    -debug  run debug mode"
-}
-
-
-ParseOption()
-{
-    if [ $# -gt 0 -a "$1" = -h ]; then
-	shift
-	USAGE
-	exit 0
-    fi
-    if [ $# -gt 0 -a "$1" = -debug ]; then
-	shift
-	debugflag=yes
-	waitminutes=1		# use shorter time for debug
-    fi
-    if [ $# -gt 0 ]; then
-	targettime=$1
-	shift
-
-	# find out it is minutes to wait or HH:MM to wake up
-	case $targettime in
-	*:*)	# HH:MM
-	    currenttime=`date +%H:%M`
-	    currenthour=`echo $currenttime | cut -f1 -d:`
-	    currentminute=`echo $currenttime | cut -f2 -d:`
-	    targethour=`echo $targettime | cut -f1 -d:`
-	    targetminute=`echo $targettime | cut -f2 -d:`
-	    waitminutes=`expr \( $targethour - $currenthour \) \* 60 + $targetminute - $currentminute`
-	    if test $waitminutes -le 0; then
-		# target time is in tomorrow, add 1 day of minutes
-		waitminutes=`expr 24 \* 60 + $waitminutes`
-	    fi
-	    ;;
-	*)
-	    waitminutes=$targettime
-	    ;;
-	esac
-    fi
-}
-
-
-# Main body
-echo "Timekeeper started at `date`"
-ParseOption $*
-waitperiod=`expr $waitminutes \* 60`		# convert to seconds
-
-if [ -z "$debugflag" ]; then
-    # normal time keeping mode
-    # sleep first
-    echo Timekeeper sleeping for $waitperiod seconds
-    sleep $waitperiod
-    # Look for any processes still around
-    echo "Timekeeper woke up at `date`, looking for processes to terminate..."
-    for x in PID.* ; do
-	if [ -f $x ]; then
-	    pid=`cat $x`
-	    # check if process is still around
-	    if test X$pid \!= X && ps -p $pid > /dev/null; then
-		echo "terminating process $x ($pid)"
-		kill -HUP $pid
-		echo "Remote shell command ended.  But some processes might still be"
-		echo "running in the remote machine.  Login there to verify."
-	    fi
-	fi
-    done
-else
-    # Debug mode. Launch two rsh process, one ends before, the other after
-    # waitperiod.  Must launch timekeeper from a subshell, else the debug
-    # will wait for it too.
-    myhostname=`hostname`
-    ( $0 $waitminutes &)
-    debugtimelimit=`expr $waitperiod - 10`
-    echo rsh $myhostname sleep $debugtimelimit
-    rsh $myhostname sleep $debugtimelimit &
-    echo $! > PID.before
-    debugtimelimit=`expr $waitperiod + 10`
-    echo rsh $myhostname sleep $debugtimelimit
-    rsh $myhostname sleep $debugtimelimit &
-    echo $! > PID.after
-
-    wait
-    rm PID.before PID.after
-fi
-
-echo "Timekeeper ended at `date`"
diff --git a/bin/trace b/bin/trace
index 2823982..2b563e5 100755
--- a/bin/trace
+++ b/bin/trace
@@ -1,19 +1,17 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
 ##
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 ##
 require 5.003;
+use warnings;
 $Source = "";
 
 ##############################################################################
@@ -29,52 +27,106 @@ $Source = "";
 # usually the same as the package name.
 #
 %TypeString = ("haddr_t"                    => "a",
+               "H5A_info_t"                 => "Ai",
+               "H5A_operator1_t"            => "Ao",
+               "H5A_operator2_t"            => "AO",
                "hbool_t"                    => "b",
+               "H5AC_cache_config_t"        => "Cc",
+               "H5AC_cache_image_config_t"  => "CC",
                "double"                     => "d",
                "H5D_alloc_time_t"           => "Da",
-	       "H5FD_mpio_collective_opt_t" => "Dc",
+               "H5D_append_cb_t"            => "DA",
+               "H5FD_mpio_collective_opt_t" => "Dc",
                "H5D_fill_time_t"            => "Df",
                "H5D_fill_value_t"           => "DF",
-	       "H5FD_mpio_chunk_opt_t"      => "Dh",
+               "H5D_gather_func_t"          => "Dg",
+               "H5FD_mpio_chunk_opt_t"      => "Dh",
                "H5D_mpio_actual_io_mode_t"  => "Di",
+               "H5FD_file_image_callbacks_t" => "DI",
+               "H5D_chunk_index_t"          => "Dk",
                "H5D_layout_t"               => "Dl",
                "H5D_mpio_no_collective_cause_t" => "Dn",
                "H5D_mpio_actual_chunk_opt_mode_t" => "Do",
+               "H5D_operator_t"             => "DO",
                "H5D_space_status_t"         => "Ds",
+               "H5D_scatter_func_t"         => "DS",
                "H5FD_mpio_xfer_t"           => "Dt",
+               "H5D_vds_view_t"             => "Dv",
+               "H5FD_class_value_t"         => "DV",
+               "H5D_chunk_iter_op_t"        => "x",
                "herr_t"                     => "e",
+               "H5E_auto1_t"                => "Ea",
+               "H5E_auto2_t"                => "EA",
+               "H5ES_event_complete_func_t" => "EC",
                "H5E_direction_t"            => "Ed",
                "H5E_error_t"                => "Ee",
-	       "H5E_type_t"                 => "Et",
-	       "H5F_close_degree_t"         => "Fd",
-	       "H5F_file_space_type_t"      => "Ff",
-	       "H5F_mem_t"                  => "Fm",
+               "H5ES_event_insert_func_t"   => "EI",
+               "H5ES_status_t"              => "Es",
+               "H5E_type_t"                 => "Et",
+               "H5FD_class_t"               => "FC",
+               "H5F_close_degree_t"         => "Fd",
+               "H5F_fspace_strategy_t"      => "Ff",
+               "H5F_flush_cb_t"             => "FF",
+               "H5F_info2_t"                => "FI",
+               "H5F_mem_t"                  => "Fm",
                "H5F_scope_t"                => "Fs",
-	       "H5F_libver_t"               => "Fv",
+               "H5F_file_space_type_t"      => "Ft",
+               "H5F_libver_t"               => "Fv",
+               "H5G_iterate_t"              => "Gi",
                "H5G_obj_t"                  => "Go",
                "H5G_stat_t"                 => "Gs",
-	       "hsize_t"                    => "h",
+               "hsize_t"                    => "h",
+               "H5_atclose_func_t"          => "Hc",
                "hssize_t"                   => "Hs",
-	       "H5E_major_t"                => "i",
-               "H5E_minor_t"                => "i",
-               "H5_iter_order_t"            => "Io",
-               "H5_index_t"                 => "Ii",
+               "H5E_major_t"                => "i",     # H5E_major_t is typedef'd to hid_t
+               "H5E_minor_t"                => "i",     # H5E_minor_t is typedef'd to hid_t
                "hid_t"                      => "i",
+               "H5I_future_discard_func_t"  => "ID",
+               "H5I_free_t"                 => "If",
+               "H5_index_t"                 => "Ii",
+               "H5I_iterate_func_t"         => "II",
+               "H5_iter_order_t"            => "Io",
+               "H5FD_subfiling_ioc_select_t" => "IO",
+               "H5I_future_realize_func_t"  => "IR",
                "int"                        => "Is",
                "int32_t"                    => "Is",
+               "H5I_search_func_t"          => "IS",
+               "H5I_type_t"                 => "It",
                "unsigned"                   => "Iu",
                "unsigned int"               => "Iu",
                "uint32_t"                   => "Iu",
-               "H5I_type_t"                 => "It",
-	       "H5G_link_t"                 => "Ll", #Same as H5L_type_t now
-	       "H5L_type_t"                 => "Ll",
+               "H5O_token_t"                => "k",
+               "H5L_iterate1_t"             => "Li",
+               "H5L_iterate2_t"             => "LI",
+               "H5G_link_t"                 => "Ll", #Same as H5L_type_t now
+               "H5L_type_t"                 => "Ll",
+               "H5L_elink_traverse_t"       => "Lt",
+               "H5MM_allocate_t"            => "Ma",
                "MPI_Comm"                   => "Mc",
+               "H5MM_free_t"                => "Mf",
                "MPI_Info"                   => "Mi",
+               "H5M_iterate_t"              => 'MI',
                "H5FD_mem_t"                 => "Mt",
                "off_t"                      => "o",
+               "H5O_iterate1_t"             => "Oi",
+               "H5O_iterate2_t"             => "OI",
+               "H5O_mcdt_search_cb_t"       => "Os",
                "H5O_type_t"                 => "Ot",
                "H5P_class_t"                => "p",
-	       "hobj_ref_t"		    => "r",
+               "H5P_cls_create_func_t"      => "Pc",
+               "H5P_prp_create_func_t"      => "PC",
+               "H5P_prp_delete_func_t"      => "PD",
+               "H5P_prp_get_func_t"         => "PG",
+               "H5P_iterate_t"              => "Pi",
+               "H5P_cls_close_func_t"       => "Pl",
+               "H5P_prp_close_func_t"       => "PL",
+               "H5P_prp_compare_func_t"     => "PM",
+               "H5P_cls_copy_func_t"        => "Po",
+               "H5P_prp_copy_func_t"        => "PO",
+               "H5P_prp_set_func_t"         => "PS",
+               "hdset_reg_ref_t"            => "Rd",
+               "hobj_ref_t"                 => "Ro",
+               "H5R_ref_t"                  => "Rr",
                "H5R_type_t"                 => "Rt",
                "char"                       => "s",
                "unsigned char"              => "s",
@@ -83,78 +135,91 @@ $Source = "";
                "H5S_sel_type"               => "St",
                "htri_t"                     => "t",
                "H5T_cset_t",                => "Tc",
+               "H5T_conv_t"                 => "TC",
                "H5T_direction_t",           => "Td",
+               "H5T_pers_t"                 => "Te",
+               "H5T_conv_except_func_t"     => "TE",
                "H5T_norm_t"                 => "Tn",
                "H5T_order_t"                => "To",
                "H5T_pad_t"                  => "Tp",
-               "H5T_pers_t"                 => "Te",
                "H5T_sign_t"                 => "Ts",
                "H5T_class_t"                => "Tt",
                "H5T_str_t"                  => "Tz",
                "unsigned long"              => "Ul",
                "unsigned long long"         => "UL",
-               "void"                       => "x",
-               "FILE"                       => "x",
-               "H5A_operator_t"             => "x",
-	       "H5A_operator1_t"            => "x",
-	       "H5A_operator2_t"            => "x",
-	       "H5A_info_t"                 => "x",
-               "H5AC_cache_config_t"        => "x",
-               "H5D_gather_func_t"          => "x",
-               "H5D_operator_t"             => "x",
-               "H5D_scatter_func_t"         => "x",
-               "H5E_auto_t"                 => "x",
-               "H5E_auto1_t"                => "x",
-               "H5E_auto2_t"                => "x",
-               "H5E_walk_t"                 => "x",
-               "H5E_walk1_t"                => "x",
-               "H5E_walk2_t"                => "x",
-	       "H5F_info1_t"                => "x",
-	       "H5F_info2_t"                => "x",
-               "H5FD_t"                     => "x",
-               "H5FD_class_t"               => "x",
-               "H5FD_stream_fapl_t"         => "x",
-               "H5FD_file_image_callbacks_t" => "x",
-               "H5G_iterate_t"              => "x",
-	       "H5G_info_t"                 => "x",
-	       "H5I_free_t"                 => "x",
-                "H5I_search_func_t"         => "x",
-                "H5L_class_t"                => "x",
-               "H5L_elink_traverse_t"       => "x",
-               "H5L_iterate_t"              => "x",
-               "H5MM_allocate_t"            => "x",
-               "H5MM_free_t"                => "x",
-	       "H5O_info_t"                 => "x",
-               "H5O_iterate_t"              => "x",
-               "H5O_mcdt_search_cb_t"       => "x",
-               "H5P_cls_create_func_t"      => "x",
-               "H5P_cls_copy_func_t"        => "x",
-               "H5P_cls_close_func_t"       => "x",
-               "H5P_iterate_t"              => "x",
-               "H5P_prp_create_func_t"      => "x",
-               "H5P_prp_copy_func_t"        => "x",
-               "H5P_prp_close_func_t"       => "x",
-               "H5P_prp_delete_func_t"      => "x",
-               "H5P_prp_get_func_t"         => "x",
-               "H5P_prp_set_func_t"         => "x",
-               "H5P_prp_compare_func_t"     => "x",
-               "H5T_cdata_t"                => "x",
-               "H5T_conv_t"                 => "x",
-               "H5T_conv_except_func_t"     => "x",
-               "H5Z_func_t"                 => "x",
-               "H5Z_filter_func_t"          => "x",
+               "uint64_t"                   => "UL",
+               "H5VL_attr_get_t"            => "Va",
+               "H5VL_blob_optional_t"       => "VA",
+               "H5VL_attr_specific_t"       => "Vb",
+               "H5VL_blob_specific_t"       => "VB",
+               "H5VL_dataset_get_t"         => "Vc",
+               "H5VL_class_value_t"         => "VC",
+               "H5VL_dataset_specific_t"    => "Vd",
+               "H5VL_datatype_get_t"        => "Ve",
+               "H5VL_datatype_specific_t"   => "Vf",
+               "H5VL_file_get_t"            => "Vg",
+               "H5VL_file_specific_t"       => "Vh",
+               "H5VL_group_get_t"           => "Vi",
+               "H5VL_group_specific_t"      => "Vj",
+               "H5VL_link_create_t"         => "Vk",
+               "H5VL_link_get_t"            => "Vl",
+               "H5VL_get_conn_lvl_t"        => "VL",
+               "H5VL_link_specific_t"       => "Vm",
+               "H5VL_object_get_t"          => "Vn",
+               "H5VL_request_notify_t"      => "VN",
+               "H5VL_object_specific_t"     => "Vo",
+               "H5VL_request_specific_t"    => "Vr",
+               "H5VL_attr_optional_t"       => "Vs",
+               "H5VL_subclass_t"            => "VS",
+               "H5VL_dataset_optional_t"    => "Vt",
+               "H5VL_datatype_optional_t"   => "Vu",
+               "H5VL_file_optional_t"       => "Vv",
+               "H5VL_group_optional_t"      => "Vw",
+               "H5VL_link_optional_t"       => "Vx",
+               "H5VL_object_optional_t"     => "Vy",
+               "H5VL_request_optional_t"    => "Vz",
                "va_list"                    => "x",
+               "void"                       => "x",
                "size_t"                     => "z",
                "H5Z_SO_scale_type_t"        => "Za",
                "H5Z_class_t"                => "Zc",
                "H5Z_EDC_t"                  => "Ze",
                "H5Z_filter_t"               => "Zf",
+               "H5Z_filter_func_t"          => "ZF",
                "ssize_t"                    => "Zs",
+
+# Types below must be defined here, as they appear in function arguments,
+# but they are not yet supported in the H5_trace_args() routine yet.  If
+# they are used as an actual parameter type (and not just as a pointer to
+# to the type), they must have a "real" abbreviation added (like the ones
+# above), moved to the section of entries above, and support for displaying
+# the type must be added to H5_trace_args().
+               "H5ES_err_info_t"            => "#",
+               "H5FD_t"                     => "#",
+               "H5FD_hdfs_fapl_t"           => "#",
+               "H5FD_mirror_fapl_t"         => "#",
+               "H5FD_onion_fapl_t"         => "#",
+               "H5FD_ros3_fapl_t"           => "#",
+               "H5FD_splitter_vfd_config_t" => "#",
+               "H5L_class_t"                => "#",
+               "H5VL_class_t"               => "#",
+               "H5VL_loc_params_t"          => "#",
+               "H5VL_request_status_t"      => "#",
               );
 
+
+##############################################################################
+# Maximum length of H5TRACE macro line
+# If the ColumnLimit in .clang-format is changed, this value will need to be updated
+#
+my $max_trace_macro_line_len = 110;
+
+
 ##############################################################################
 # Print an error message.
 #
+my $found_errors = 0;
+
 sub errmesg ($$@) {
   my ($file, $func, @mesg) = @_;
   my ($mesg) = join "", @mesg;
@@ -164,6 +229,8 @@ sub errmesg ($$@) {
     $lineno = tr/\n/\n/;
   }
 
+  $found_errors = 1;
+
   print "$file: in function \`$func\':\n";
   print "$file:$lineno: $mesg\n";
 }
@@ -178,8 +245,15 @@ sub argstring ($$$) {
 
   # Normalize the data type by removing redundant white space,
   # certain type qualifiers, and indirection.
-  $atype =~ s/^\bconst\b//;
-  $atype =~ s/\bUNUSED\b//g;
+  $atype =~ s/^\bconst\b//;     # Leading const
+  $atype =~ s/\s*const\s*//;    # const after type, possibly in the middle of '*'s
+  $atype =~ s/^\bstatic\b//;
+  $atype =~ s/\bH5_ATTR_UNUSED\b//g;
+  $atype =~ s/\bH5_ATTR_DEPRECATED_USED\b//g;
+  $atype =~ s/\bH5_ATTR_NDEBUG_UNUSED\b//g;
+  $atype =~ s/\bH5_ATTR_DEBUG_API_USED\b//g;
+  $atype =~ s/\bH5_ATTR_PARALLEL_UNUSED\b//g;
+  $atype =~ s/\bH5_ATTR_PARALLEL_USED\b//g;
   $atype =~ s/\s+/ /g;
   $ptr = length $1 if  $atype =~ s/(\*+)//;
   $atype =~ s/^\s+//;
@@ -197,141 +271,277 @@ sub argstring ($$$) {
     --$ptr;
     $tstr = $TypeString{"$atype*"};
   } elsif (!exists $TypeString{$atype}) {
-    errmesg $file, $func, "untraceable type \`$atype", '*'x$ptr, "\'";
+# Defer throwing error until type is actually used
+#    errmesg $file, $func, "untraceable type \`$atype", '*'x$ptr, "\'";
   } else {
     $tstr = $TypeString{$atype};
   }
-  return ("*" x $ptr) . ($array?"[$array]":"") . $tstr;
+  return ("*" x $ptr) . ($array ? "[$array]" : "") . $tstr;
 }
 
 ##############################################################################
 # Given information about an API function, rewrite that function with
 # updated tracing information.
 #
+my $file_api = 0;
+my $file_args = 0;
+my $total_api = 0;
+my $total_args = 0;
 sub rewrite_func ($$$$$) {
   my ($file, $type, $name, $args, $body) = @_;
-  my ($arg,$trace);
-  my (@arg_name, @arg_str);
+  my ($arg, $trace, $argtrace);
+  my (@arg_name, @arg_str, @arg_type);
   local $_;
 
+  # Keep copy of original arguments
+  my $orig_args = $args;
+
   # Parse return value
   my $rettype = argstring $file, $name, $type;
-  goto error if $rettype =~ /!/;
 
   # Parse arguments
   if ($args eq "void") {
-    $trace = "H5TRACE0(\"$rettype\",\"\");\n";
+    $trace = "H5TRACE0(\"$rettype\", \"\");\n";
+    $argtrace = "H5ARG_TRACE0(\"\")";
   } else {
     # Split arguments.  First convert `/*in,out*/' to get rid of the
-    # comma, then split the arguments on commas.
-    $args =~ s/(\/\*\s*in),\s*(out\s*\*\/)/$1_$2/g;
+    # comma and remove lines beginning with a '#', then split the arguments
+    # on commas.
+    $args =~ s/(\/\*\s*in),\s*(out\s*\*\/)/$1_$2/g;     # Get rid of comma in 'in,out'
+    $args =~ s/H5FL_TRACK_PARAMS//g; # Remove free list macro
+    $args =~ s/\n#.*?\n/\n/g;        # Remove lines beginning with '#'
     my @args = split /,[\s\n]*/, $args;
     my $argno = 0;
     my %names;
 
     for $arg (@args) {
-      if($arg=~/\w*\.{3}\w*/){
+      if($arg=~/\w*\.{3}\w*/){  # Skip "..." for varargs parameter
         next;
       }
-      unless ($arg=~/^(([a-z_A-Z]\w*\s+)+\**)
-	      ([a-z_A-Z]\w*)(\[.*?\])?
-	      (\s*\/\*\s*(in|out|in_out)\s*\*\/)?\s*$/x) {
-	errmesg $file, $name, "unable to parse \`$arg\'";
-	goto error;
+      unless ($arg=~/^((\s*[a-z_A-Z](\w|\*)*\s+)+(\s*\*\s*|\s*const\s*|\s*volatile\s*)*)
+              ([a-z_A-Z]\w*)(\[.*?\])?
+              (\s*\/\*\s*(in|out|in_out)\s*\*\/)?\s*$/x) {
+        errmesg $file, $name, "unable to parse \`$arg\'";
+        goto error;
       } else {
-	my ($atype, $aname, $array, $adir) = ($1, $3, $4, $6);
-	$names{$aname} = $argno++;
-	$adir ||= "in";
-	$atype =~ s/\s+$//;
-	push @arg_name, $aname;
-
-	if ($adir eq "out") {
-	  push @arg_str, "x";
-	} else {
-	  if (defined $array) {
-	    $atype .= "*";
-	    if ($array =~ /^\[\/\*([a-z_A-Z]\w*)\*\/\]$/) {
-	      my $asize = $1;
-	      if (exists $names{$asize}) {
-		$atype .= '[a' . $names{$asize} . ']';
-	      } else {
-		warn "bad array size: $asize";
-		$atype .= "*";
-	      }
-	    }
-	  }
-	  push @arg_str, argstring $file, $name, $atype;
-	}
+        my ($atype, $aname, $array, $adir) = ($1, $5, $6, $8);
+        $names{$aname} = $argno++;
+        $adir ||= "in";
+        $atype =~ s/\s+$//;
+        push @arg_name, $aname;
+        push @arg_type, $atype;
+
+        if ($adir eq "out") {
+          push @arg_str, "x";
+        } else {
+          if (defined $array) {
+            $atype .= "*";
+            if ($array =~ /^\[\/\*([a-z_A-Z]\w*)\*\/\]$/) {
+              my $asize = $1;
+              if (exists $names{$asize}) {
+                $atype .= '[a' . $names{$asize} . ']';
+              } else {
+                warn "bad array size: $asize";
+                $atype .= "*";
+              }
+            }
+          }
+          push @arg_str, argstring $file, $name, $atype;
+        }
       }
     }
+
+    # Compose the trace macro
     $trace = "H5TRACE" . scalar(@arg_str) . "(\"$rettype\", \"";
+    $argtrace = "H5ARG_TRACE" . scalar(@arg_str) . "(__func__, \"";
     $trace .= join("", @arg_str) . "\"";
-    my $len = 4 + length $trace;
-    for (@arg_name) {
-      if ($len + length >= 77) {
-	$trace .= ",\n             $_";
-	$len = 13 + length;
+    $argtrace .= join("", @arg_str) . "\"";
+
+    # Add 4 for indenting the line
+    my $len = 4 + length($trace);
+
+    for my $i (0 .. $#arg_name) {
+      # Handle wrapping
+
+      # Be VERY careful here! clang-format and this script MUST agree
+      # on which lines get wrapped or there will be churn as each tries
+      # to undo the other's output.
+      #
+      # TWO cases must be handled:
+      # 1) The argument is that last one and ');' will be appended
+      # 2) The argument is NOT the last one and ',' will be appended
+      #
+      # NB: clang-format does NOT consider terminal newlines when
+      #     counting columns for the ColumnLimit
+      #
+      # The extra '2' added after $len includes the ', ' that would be
+      # added BEFORE the argument.
+      #
+      my $adjust = ($i + 1 == scalar(@arg_str)) ? 2 : 1;
+      my $len_if_added = $len + 2 + length($arg_name[$i]) + $adjust;
+
+      # Wrap lines that will be longer than the limit
+      if ($len_if_added > $max_trace_macro_line_len) {
+        # Wrap line, with indentation
+        $trace .= ",\n             ";
+        $len = 13;              # Set to 13, for indentation
+
+        # Indent an extra space to account for extra digit in 'H5TRACE' macro
+        if (scalar(@arg_str) >= 10) {
+          $trace .= " ";
+          $len++;
+        }
       } else {
-	$trace .= ", $_";
-	$len += 1 + length;
+        $trace .= ", ";
+        $len += 2;     # Add 2, for ', '
       }
+
+      # Append argument
+      $trace .= "$arg_name[$i]";
+      $argtrace .= ", $arg_name[$i]";
+
+      # Add length of appended argument name
+      $len += length($arg_name[$i]);
     }
+
+    # Append final ');' for macro
     $trace .= ");\n";
+    $argtrace .= ")";
   }
-  goto error if grep {/!/} @arg_str;
-
-  # The H5TRACE() statement
-  if ($body =~ /\/\*[ \t]*NO[ \t]*TRACE[ \t]*\*\//) {
-    # Ignored due to NO TRACE comment.
-  } elsif ($body =~ s/((\n[ \t]*)H5TRACE\d+\s*\(.*?\);)\n/"$2$trace"/es) {
-    # Replaced an H5TRACE macro.
-  } elsif ($body=~s/((\n[ \t]*)FUNC_ENTER\w*\s*(\(.*?\))?;??)\n/"$1$2$trace"/es) {
-    # Added an H5TRACE macro after a FUNC_ENTER macro.
-  } else {
-    errmesg $file, $name, "unable to insert tracing information";
-    print "body = ", $body, "\n";
-    goto error;
+
+  # Check for API / non-API routine name
+  if( $name =~ /H5[A-Z]{0,2}[a-z].*/) {
+      # The H5TRACE() statement, for API routines
+      if ($body =~ /\/\*[ \t]*NO[ \t]*TRACE[ \t]*\*\//) {
+        # Ignored due to NO TRACE comment.
+      } else {
+          # Check for known, but unsupported type
+          if ( $trace =~ /(^#)|([^*]#)/ ) {
+            # Check for unsupported return type
+            if ( $type =~ /(^#)|([^*]#)/ ) {
+              errmesg $file, $name, "unsupported type in return type\nAdd to TypeString hash in trace script and update H5_trace_args()";
+              print "type = '$type'\n";
+            }
+
+            # Check for unsupported argument type
+            $index = 0;
+            for (@arg_str) {
+              if ( $_ =~ /(^#)|([^*]#)/ ) {
+                errmesg $file, $name, "unsupported type in args\nAdd to TypeString hash in trace script and update H5_trace_args()";
+                print "type = $arg_type[$index]\n";
+              }
+              $index++;
+            }
+            goto error;
+          }
+
+          # Check for unknown (and therefore unsupported) type
+          if ( $trace =~ /(^!)|([^*]!)/ ) {
+            # Check for unsupported return type
+            if ( $type =~ /(^!)|([^*]!)/ ) {
+              errmesg $file, $name, "unknown type in return type\nAdd to TypeString hash in trace script and also update H5_trace_args() if used by value";
+              print "type = '$type'\n";
+            }
+
+            # Check for unsupported argument type
+            $index = 0;
+            for (@arg_str) {
+              if ( $_ =~ /(^!)|([^*]!)/ ) {
+                errmesg $file, $name, "unknown type in args\nAdd to TypeString hash in trace script and also update H5_trace_args() if used by value";
+                print "type = $arg_type[$index]\n";
+              }
+              $index++;
+            }
+            goto error;
+          }
+
+          if ($body =~ s/((\n[ \t]*)H5TRACE\d+\s*\(.*?\);)\n/"$2$trace"/es) {
+            # Replaced an H5TRACE macro.
+          } elsif ($body=~s/((\n[ \t]*)FUNC_ENTER\w*[ \t]*(\(.*?\))?;??)\n/"$1$2$trace"/es) {
+            # Added an H5TRACE macro after a FUNC_ENTER macro.
+          } else {
+            errmesg $file, $name, "unable to insert tracing information";
+            print "body = ", $body, "\n";
+            goto error;
+          }
+      }
+
+    #Increment # of API routines modified
+    $file_api++;
+  }
+
+  # Check for H5ARG_TRACE macros in non-API routines
+  if ( $body =~ /H5ARG_TRACE/ ) {
+      # Check for untraceable type (deferred until $argtrace used)
+      if ( $argtrace =~ /(^!)|([^*]!)/ ) {
+        errmesg $file, $name, "untraceable type in args";
+        print "args = '$orig_args'\n";
+        goto error;
+      }
+
+      # Replace / update H5ARG_TRACE macro.
+      $body =~ s/(H5ARG_TRACE(\d+\s*\(.*?\))?)/"$argtrace"/esg;
+
+    #Increment # of non-API routines modified
+    $file_args++;
   }
 
-  
  error:
-  return "\n$type\n$name($args)\n$body";
+  return "\n$type\n$name($orig_args)\n$body";
 }
 
 ##############################################################################
 # Process each source file, rewriting API functions with updated
 # tracing information.
 #
-my $total_api = 0;
 for $file (@ARGV) {
+  $file_api = 0;
+  $file_args = 0;
+
   # Ignore some files that do not need tracing macros
-  unless ($file eq "H5FDmulti.c" or $file eq "src/H5FDmulti.c" or $file eq "H5FDstdio.c" or $file eq "src/H5FDstdio.c") {
-  
+  unless ($file eq "H5FDmulti.c" or $file eq "src/H5FDmulti.c" or $file eq "H5FDstdio.c" or $file eq "src/H5FDstdio.c" or $file eq "src/H5TS.c" or $file eq "src/H5FDperform.c") {
+
     # Snarf up the entire file
     open SOURCE, $file or die "$file: $!\n";
     $Source = join "", <SOURCE>;
     close SOURCE;
 
-    # Make modifications
+    # Make a copy of the original data
     my $original = $Source;
-    my $napi = $Source =~ s/\n([A-Za-z]\w*(\s+[A-Za-z]\w*)*\s*\**)\n #type
-                              (H5[A-Z]{0,2}[^_A-Z0-9]\w*)      #name
-                              \s*\((.*?)\)\s*               #args
-                              (\{.*?\n\}[^\n]*)             #body
-                           /rewrite_func($file,$1,$3,$4,$5)/segx;
-    $total_api += $napi;
+
+    # Make modifications
+    $Source =~ s/\n([A-Za-z]\w*(\s+[A-Za-z]\w*)*\s*\**)\n #type
+                     (H5[A-Z]{0,2}_?[a-zA-Z0-9_]\w*)      #name
+                     \s*\((.*?)\)\s*                      #args
+                     (\{.*?\n\}[^\n]*)                    #body
+                     /rewrite_func($file,$1,$3,$4,$5)/segx;
 
 # If the source changed then print out the new version
     if ($original ne $Source) {
-      printf "%s: instrumented %d API function%s\n", 
-             $file, $napi, 1==$napi?"":"s";
+      printf "%s: instrumented %d API function%s and %d argument list%s\n",
+             $file, $file_api, (1 == $file_api ? "" : "s"),
+             $file_args, (1 == $file_args ? "" : "s");
       rename $file, "$file~" or die "unable to make backup";
       open SOURCE, ">$file" or die "unable to modify source";
       print SOURCE $Source;
       close SOURCE;
+
+      $total_api += $file_api;
+      $total_args += $file_args;
     }
   }
 }
 
-printf "Finished processing HDF5 API calls\n"
+if ($found_errors eq 1) {
+    printf "\n";
+    printf "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n";
+    printf "*** ERRORS FOUND *** ERRORS FOUND *** ERRORS FOUND ****\n";
+    printf "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n";
+    exit 1;
+} else {
+    printf "Finished processing HDF5 API calls:\n";
+    printf "\tinstrumented %d API function%s and %d argument list%s\n",
+             $total_api, (1 == $total_api ? "" : "s"),
+             $total_args, (1 == $total_args ? "" : "s");
+}
 
diff --git a/bin/warnhist b/bin/warnhist
new file mode 100755
index 0000000..fc42209
--- /dev/null
+++ b/bin/warnhist
@@ -0,0 +1,549 @@
+#!/usr/bin/env perl
+require 5.003;
+use warnings;
+
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
+# Quincey Koziol
+#  9 Aug 2013
+#
+# Purpose: Given an input file containing the output from a build of the
+#	   library, gather the file names and line numbers, alias
+#          identical types of warnings together into a single bin and
+#          report the number of warnings for each type of warning, each file
+#          and the total count of warnings
+
+# Perl modules/settings
+use strict;
+use Getopt::Std;
+
+# Global variables, for accumulating information
+my $totalcount = 0;
+my $notecount = 0;
+my $dupcount = 0;
+my %warn_count = ();
+my $warncount;
+my %warn_file = ();
+my %warn_file_line = ();
+my %warn_file_line_offset = ();
+my %file_count = ();
+my $filecount;
+my $ignorecount = 0;
+my @ignorenames;
+my %ignored_files = ();
+my %warn_file_indices = ();
+my %file_warn_indices = ();
+my @warn_match_strings;
+my @file_match_strings;
+my %file_warn = ();
+my %file_warn_line = ();
+my $current_warning = 0;
+my $current_file = 0;
+my $warn_index;
+my $genericize = 1;
+
+# Info about last name / line / offset for file
+my $last_c_name;
+my $last_fort_name;
+my $last_fort_line;
+my $last_fort_offset;
+
+# Display usage
+sub do_help {
+    print "Usage: 'warnhist [-h, --help] [-t <prefix>] [-w <n>] [-W] [-f <n>] [-F] [-s <warning string list>] [-S <file string list] [-l] [-u] [-i <name list>] [file]'\n";
+    print "\t-h, --help\tDisplay this usage\n";
+    print "\t-t <prefix>\tTrim pathname prefix from filenames, <prefix>\n";
+    print "\t-w <n>\tDisplay files for a given warning index list, <n>\n";
+    print "\t\t<n> can be a single value, a range, or a comma separated list\n";
+    print "\t\tFor example: '0' or '0,4' or '8-10' or '0,2-4,8-10,13'\n";
+    print "\t-W\tDisplay files for all warnings\n";
+    print "\t-f <n>\tDisplay warnings for a given file index list, <n>\n";
+    print "\t\t<n> can be a single value, a range, or a comma separated list\n";
+    print "\t\tFor example: '0' or '0,4' or '8-10' or '0,2-4,8-10,13'\n";
+    print "\t-F\tDisplay warnings for all files\n";
+    print "\t-s <warning string list>\tDisplay files for warnings which contain a string, <warning string list>\n";
+    print "\t\t<warning string list> is a comma separated list, with no spaces\n";
+    print "\t\tFor example: 'Wunused-dummy-argument' or 'Wunused-dummy-argument,Wunused-variable'\n";
+    print "\t-S <file string list>\tDisplay warnings for files which contain a string, <file string list>\n";
+    print "\t\t<file string list> is a comma separated list, with no spaces\n";
+    print "\t\tFor example: 'H5Fint' or 'H5Fint,H5Gnode'\n";
+    print "\t-l\tDisplay line numbers for file/warning\n";
+    print "\t-u\tLeave 'unique' types in warnings, instead of genericizing them\n";
+    print "\t-i <name list>\tIgnore named files, <name list>\n";
+    print "\t\t<name list> is a comma separated list, with no spaces\n";
+    print "\t\tFor example: 'H5LTparse' or 'H5LTparse,H5LTanalyze'\n";
+    print "\tfile\tFilename containing build output\n";
+    print "\t\tIf no file is given, standard input is used.\n";
+    exit;
+}
+
+sub main::HELP_MESSAGE {
+    do_help();
+}
+
+# declare the Perl command line flags/options we want to allow
+my %options=();
+getopts("FWhut:w:f:s:S:i:l", \%options);
+
+# Display usage, if requested
+if($options{h}) {
+    do_help();
+}
+
+# Parse list of file names to ignore
+if(exists $options{i}) {
+    @ignorenames = split /,/, $options{i};
+#print STDERR @ignorenames;
+}
+
+# Parse list of warning indices to expand file names
+if(exists $options{w}) {
+    my @tmp_indices;
+
+    @tmp_indices = split /,/, $options{w};
+#print STDERR @tmp_indices;
+    for my $x (@tmp_indices) {
+#print STDERR "x = '$x'\n";
+        if($x =~ /\-/) {
+            my $start_index;
+            my $end_index;
+
+#print STDERR "matched = '$x'\n";
+            ($start_index, $end_index) = split /\-/, $x;
+#print STDERR "start_index = '$start_index', end_index = '$end_index'\n";
+            for my $y ($start_index..$end_index) {
+#print STDERR "y = '$y'\n";
+                if(!exists $warn_file_indices{$y}) {
+                    $warn_file_indices{$y} = $y;
+                }
+            }
+        }
+        else {
+            if(!exists $warn_file_indices{$x}) {
+                $warn_file_indices{$x} = $x;
+            }
+        }
+    }
+#foreach (sort keys %warn_file_indices) {
+#    print STDERR "$_ : $warn_file_indices{$_}\n";
+#}
+}
+
+# Parse list of warning strings to expand file names
+if(exists $options{s}) {
+    @warn_match_strings = split /,/, $options{s};
+# print STDERR @warn_match_strings;
+}
+
+# Parse list of file indices to expand warnings
+if(exists $options{f}) {
+    my @tmp_indices;
+
+    @tmp_indices = split /,/, $options{f};
+#print STDERR @tmp_indices;
+    for my $x (@tmp_indices) {
+#print STDERR "x = '$x'\n";
+        if($x =~ /\-/) {
+            my $start_index;
+            my $end_index;
+
+#print STDERR "matched = '$x'\n";
+            ($start_index, $end_index) = split /\-/, $x;
+#print STDERR "start_index = '$start_index', end_index = '$end_index'\n";
+            for my $y ($start_index..$end_index) {
+#print STDERR "y = '$y'\n";
+                if(!exists $file_warn_indices{$y}) {
+                    $file_warn_indices{$y} = $y;
+                }
+            }
+        }
+        else {
+            if(!exists $file_warn_indices{$x}) {
+                $file_warn_indices{$x} = $x;
+            }
+        }
+    }
+#foreach (sort keys %warn_file_indices) {
+#    print STDERR "$_ : $warn_file_indices{$_}\n";
+#}
+}
+
+# Parse list of warning strings for files to expand warnings
+if(exists $options{S}) {
+    @file_match_strings = split /,/, $options{S};
+# print STDERR @file_match_strings;
+}
+
+# Check if warnings should stay unique and not be "genericized"
+if($options{u}) {
+    $genericize = 0;
+}
+
+PARSE_LINES:
+while (<>) {
+    my $name;
+    my $line;
+    my $prev_line;
+    my $toss;
+    my $offset;
+    my $warning;
+    my $extra;
+    my $extra2;
+
+    # Retain last FORTRAN compile line, which comes a few lines before warning
+    if($_ =~ /.*\.[fF]90:.*/) {
+        ($last_fort_name, $last_fort_line, $last_fort_offset) = split /\:/, $_;
+        ($last_fort_line, $toss) = split /\./, $last_fort_line;
+    }
+
+    # Retain last C/C++ compile line, which possibly comes a few lines before warning
+    if($_ =~ /.*[A-Za-z0-9_]\.[cC]:.*/) {
+        ($last_c_name, $toss) = split /\:/, $_;
+    }
+
+    # Retain C/C++ compile line, which comes with the line of warning
+    if($_ =~ /.*[A-Za-z0-9_]\.[chC]\(.*[0-9]\):.*#.*/) {
+        $last_c_name = $_;
+    }
+
+    # Skip lines that don't have the word "warning"
+    next if $_ !~ /[Ww]arning/;
+
+    # Skip warnings from linker
+    next if $_ =~ /ld: warning:/;
+
+    # Skip warnings from build_py and install_lib
+    next if $_ =~ /warning: (build_py|install_lib)/;
+
+    # Skip variables with the word 'warning' in them
+    next if $_ =~ /_warning_/;
+
+    # Skip AMD Optimizing Compiler (aocc) lines "<#> warning(s) generated."
+    next if $_ =~ / warnings? generated\./;
+
+    # "Hide" the C++ '::' symbol until we've parsed out the parts of the line
+    while($_ =~ /\:\:/) {
+	$_ =~ s/\:\:/@@@@/g;
+    }
+
+    # Check for weird formatting of warning message
+    $line = "??";
+    $offset = "??";
+    if($_ =~ /^cc1: warning:.*/) {
+        $name = $last_c_name;
+        ($toss, $toss, $warning, $extra, $extra2) = split /\:/, $_;
+    # Check for CMAKE build with warning on first line and no filename
+    } elsif($_ =~ /^\s*[Ww]arning:.*/) {
+        $name = $last_c_name;
+        ($toss, $warning, $extra, $extra2) = split /\:/, $_;
+    # Check for file-scope gcc Fortran warning output
+    } elsif($_ =~ /f\d\d\d: Warning:/) {
+        # These are interspersed with the "compiling a file" output
+        # when compiling with `make -j` and thus difficult to tie to
+        # any particular file. They are due to things like inappropriate
+        # build options and don't have a line number.
+        #
+        # They start with f, as in f951
+        $name = "(generic)";
+        $line = int(rand(1000000)); # Hack to avoid counting as duplictates
+
+        ($warning) = $_ =~ /\[(.*)\]/x;
+    # Check for FORTRAN warning output
+    } elsif($_ =~ /^Warning:.*/) {
+        $name = $last_fort_name;
+        $line = $last_fort_line;
+        $offset = $last_fort_offset;
+        ($toss, $warning, $extra, $extra2) = split /\:/, $_;
+
+        # Check for improperly parsed filename or line
+        if($name =~ /^$/) {
+            print "Filename is a null string! Input line #$. is: '$_'";
+            next
+        }
+        if($line =~ /^$/) {
+            print "Line is a null string! Input line #$. is: '$_'";
+            next
+        }
+    # Check for non-GCC warning (Solaris/Oracle?)
+    } elsif($_ =~ /^\".*, line [0-9]+: *[Ww]arning:.*/) {
+        ($name, $toss, $warning, $extra, $extra2) = split /\:/, $_;
+        ($name, $line) = split /\,/, $name;
+	    $name =~ s/^\"//g;
+	    $name =~ s/\"$//g;
+	    $line =~ s/^\s*line\s*//g;
+    # Check for Intel icc warning
+    } elsif($_ =~ /.*[A-Za-z0-9_]\.[chC]\(.*[0-9]\):.*#.*/) {
+        ($last_c_name, $toss, $warning) = split /\:/, $last_c_name;
+        ($name, $line) = split /\(/, $last_c_name;
+        $line =~ s/\)//g;
+    } else {
+        # Check for 'character offset' field appended to file & line #
+	# (This is probably specific to GCC)
+        if($_ =~ /^.*[0-9]+\:[0-9]+\:/) {
+            ($name, $line, $offset, $toss, $warning, $extra, $extra2) = split /\:/, $_;
+        } else {
+            ($name, $line, $toss, $warning, $extra, $extra2) = split /\:/, $_;
+        }
+    }
+
+    # Check for extra ':' followed by more text in original warning string,
+    #  and append the ':' and text back onto the parsed warning
+    #  (Use 'length $extra' idiom to avoid warning when $extra is undefined)
+    if(length $extra ) {
+        $warning = join ':', $warning, $extra;
+    }
+    if(length $extra2 ) {
+        $warning = join ':', $warning, $extra2;
+    }
+
+    # Restore the C++ '::' symbol now that we've parsed out the parts of the line
+    while($warning =~ /@@@@/) {
+        $warning =~ s/@@@@/\:\:/g;
+    }
+
+    # Trim leading '..' paths from filename
+    while($name =~ /^\.\.\//) {
+        $name =~ s/^\.\.\///g;
+    }
+
+    # Check for trimming prefix
+    if((exists $options{t}) && ($name =~ /$options{t}/)) {
+        $name =~ s/^$options{t}\///g;
+    }
+
+    # Check for ignored file
+    if(exists $options{i}) {
+        for my $x (@ignorenames) {
+            if($name =~ /$x/) {
+                $ignorecount++;
+                if(!(exists $ignored_files{$name})) {
+                    $ignored_files{$name} = $name;
+                }
+                next PARSE_LINES;
+            }
+        }
+    }
+
+    # Check for improperly parsed warning (usually an undefined warning string)
+    if(!defined $warning) {
+        print "Warning Undefined! Input line is: '$_'";
+        next
+    }
+
+    # Get rid of leading & trailing whitespace
+    $warning =~ s/^\s//g;
+    $warning =~ s/\s$//g;
+
+    # Check for improperly parsed warning
+    if($warning =~ /^$/) {
+        print "Warning is a null string! Input line is: '$_'";
+        next
+    }
+
+    # Convert all quotes to '
+    $warning =~ s/‘/'/g;
+    $warning =~ s/’/'/g;
+    $warning =~ s/"/'/g;
+
+#
+# These skipped messages & "genericizations" may be specific to GCC
+
+    # Skip supplemental warning message
+    if($warning =~ /near initialization for/) {
+	$notecount++;
+        next
+    }
+
+    # Skip C++ supplemental warning message
+    if($warning =~ /in call to/) {
+	$notecount++;
+        next
+    }
+
+    # Skip GCC warning that should be a note
+    if($_ =~ /\(this will be reported only once per input file\)/) {
+	$notecount++;
+        next
+    }
+
+    if($genericize) {
+	# Eliminate C/C++ "{aka <some type>}" and "{aka '<some type>'}" info
+	if($warning =~ /\s(\{|\()aka '?[A-Za-z_0-9\(\)\*\,\[\]\.\<\>\&\:\+\#]+[A-Za-z_0-9\(\)\*\,\[\]\.\<\>\&\:\+\#\ ]*'?(\}|\))/) {
+	    $warning =~ s/\s(\{|\()aka '?[A-Za-z_0-9\(\)\*\,\[\]\.\<\>\&\:\+\#]+[A-Za-z_0-9\(\)\*\,\[\]\.\<\>\&\:\+\#\ ]*'?(\}|\))//g;
+	}
+
+	# Genericize C/C++ '<some type>', printf format '%<some format>', and
+	# "unknown warning group" into '-'
+	if($warning =~ /'[A-Za-z_0-9\(\)\*\,\[\]\.\<\>\&\:\+\#\-\=]+[A-Za-z_0-9\(\)\*\,\[\]\.\<\>\&\:\+\#\-\=\ ]*'/) {
+	    $warning =~ s/'[A-Za-z_0-9\(\)\*\,\[\]\.\<\>\&\:\+\#\-\=]+[A-Za-z_0-9\(\)\*\,\[\]\.\<\>\&\:\+\#\-\=\ ]*'/'-'/g;
+	}
+	if($warning =~ /'%[\#0\-\ \+]*[,;\:_]?[0-9\*]*\.?[0-9\*]*[hjltzL]*[aAcdeEfFgGinosuxX]'/) {
+	    $warning =~ s/'%[\#0\-\ \+]*[,;\:_]?[0-9\*]*\.?[0-9\*]*[hjltzL]*[aAcdeEfFgGinosuxX]'/'-'/g;
+	}
+
+	# Genericize C/C++ "<macro>" warnings into "-"
+	if($warning =~ /"[A-Za-z_0-9]*"/) {
+	    $warning =~ s/"[A-Za-z_0-9]*"/"-"/g;
+	}
+
+	# Genericize [GCC?] C/C++ warning text about suggested attribute
+	if($warning =~ /attribute=[A-Za-z_0-9]*\]/) {
+	    $warning =~ s/=[A-Za-z_0-9]*\]/=-\]/g;
+	}
+
+	# Genericize FORTRAN "at (<n>)" into "at (-)", "REAL(<n>)" into "REAL(-)",
+	# 	and "INTEGER(<n>)" into "INTEGER(-)"
+	if($warning =~ /.*at\s\([0-9]+\).*/) {
+	    $warning =~ s/at\s\([0-9]+\)/at \(-\)/g;
+	}
+	if($warning =~ /.*REAL\([0-9]+\).*/) {
+	    $warning =~ s/REAL\([0-9]+\)/REAL\(-\)/g;
+	}
+	if($warning =~ /.*INTEGER\([0-9]+\).*/) {
+	    $warning =~ s/INTEGER\([0-9]+\)/INTEGER\(-\)/g;
+	}
+
+	# Genericize standalone numbers in warnings
+	if($warning =~ /(\s|')-?[0-9]+(\s|')/) {
+	    $warning =~ s/-?[0-9]+/-/g;
+	}
+
+	# Genericize unusual GCC/G++/GFORTRAN warnings that aren't handled above
+	if($warning =~ /\[deprecation\] [A-Za-z_0-9]*\([A-Za-z_,0-9]*\) in [A-Za-z_0-9]* has been deprecated.*/) {
+	    $warning =~ s/[A-Za-z_0-9]*\([A-Za-z_,0-9]*\) in [A-Za-z_0-9]*/-\(-\) in -/g;
+	}
+    }
+# <end possible GCC-specific code>
+
+    # Check if we've already seen this warning on this line in this file
+    # (Can happen for warnings from inside header files)
+    if( !exists $warn_file_line_offset{$warning}{$name}{$line}{$offset} ) {
+	# Increment count for [generic] warning
+	$warn_count{$warning}++;
+	$warn_file{$warning}{$name}++;
+	$warn_file_line{$warning}{$name}{$line}++;
+	$warn_file_line_offset{$warning}{$name}{$line}{$offset}++;
+
+	# Increment count for filename
+	$file_count{$name}++;
+	$file_warn{$name}{$warning}++;
+	$file_warn_line{$name}{$warning}{$line}++;
+
+	# Increment total count of warnings
+	$totalcount++;
+    }
+    else {
+	# Increment count of duplicate warnings
+	$dupcount++;
+    }
+
+#    print STDERR "name = $name\n";
+#    print STDERR "line = $line\n";
+#    print STDERR "offset = $offset\n";
+#    print STDERR "warning = \"$warning\"\n";
+}
+
+print "Total unique [non-ignored] warnings: $totalcount\n";
+print "Ignored notes / supplemental warning lines [not counted in unique warnings]: $notecount\n";
+print "Duplicated warning lines [not counted in unique warnings]: $dupcount\n";
+print "Total ignored warnings: $ignorecount\n";
+$warncount = keys %warn_count;
+print "Total unique kinds of warnings: $warncount\n";
+$filecount = keys %file_count;
+print "Total files with warnings: $filecount\n\n";
+
+# Print warnings in decreasing frequency
+print "# of Warnings by frequency (file count)\n";
+print "=======================================\n";
+for my $x (sort {$warn_count{$b} <=> $warn_count{$a}} keys(%warn_count)) {
+    printf ("[%2d] %4d (%2d) - %s\n", $current_warning++, $warn_count{$x}, scalar(keys %{$warn_file{$x}}), $x);
+    if((exists $options{W}) || (exists $options{w}) || (exists $options{s})) {
+        my $curr_index = $current_warning - 1;
+	my $match = 0;
+
+	# Check for string from list in current warning
+	if(exists $options{s}) {
+	    for my $y (@warn_match_strings) {
+# print STDERR "y = '$y'\n";
+		if($x =~ /$y/) {
+# print STDERR "matched warning = '$x'\n";
+		    $match = 1;
+		    last;
+		}
+	    }
+	}
+
+	# Check if current warning index matches
+        if((exists $warn_file_indices{$curr_index}) && $curr_index == $warn_file_indices{$curr_index}) {
+	    $match = 1;
+	}
+
+        if($match) {
+            for my $y (sort {$warn_file{$x}{$b} <=> $warn_file{$x}{$a}} keys(%{$warn_file{$x}})) {
+                printf ("\t%4d - %s\n", $warn_file{$x}{$y}, $y);
+                if(exists $options{l}) {
+		    my $lines = join ", ", sort {$a <=> $b} keys %{$warn_file_line{$x}{$y}};
+                    printf("\t\tLines: $lines \n");
+                }
+            }
+        }
+    }
+}
+
+# Print warnings in decreasing frequency, by filename
+print "\n# of Warnings by filename (warning type)\n";
+print   "========================================\n";
+for my $x (sort {$file_count{$b} <=> $file_count{$a}} keys(%file_count)) {
+    printf ("[%3d] %4d (%2d) - %s\n", $current_file++, $file_count{$x}, scalar(keys %{$file_warn{$x}}), $x);
+    if((exists $options{F}) || (exists $options{f}) || (exists $options{S})) {
+        my $curr_index = $current_file - 1;
+	my $match = 0;
+
+	# Check for string from list in current file
+	if(exists $options{S}) {
+	    for my $y (@file_match_strings) {
+# print STDERR "y = '$y'\n";
+		if($x =~ /$y/) {
+# print STDERR "matched warning = '$x'\n";
+		    $match = 1;
+		    last;
+		}
+	    }
+	}
+
+	# Check if current file index matches
+        if((exists $file_warn_indices{$curr_index}) && $curr_index == $file_warn_indices{$curr_index}) {
+	    $match = 1;
+	}
+
+        if($match) {
+            for my $y (sort {$file_warn{$x}{$b} <=> $file_warn{$x}{$a}} keys(%{$file_warn{$x}})) {
+                printf ("\t%4d - %s\n", $file_warn{$x}{$y}, $y);
+                if(exists $options{l}) {
+		    my $lines = join ", ", sort {$a <=> $b} keys %{$file_warn_line{$x}{$y}};
+                    printf("\t\tLines: $lines \n");
+                }
+            }
+        }
+    }
+}
+
+# Print names of files that were ignored
+# Check for ignored file
+if(exists $options{i}) {
+    print "\nIgnored filenames\n";
+    print   "=================\n";
+    for my $x (sort keys(%ignored_files)) {
+	print "$x\n";
+    }
+}
+
diff --git a/bin/yodconfigure b/bin/yodconfigure
deleted file mode 100755
index 2bc67e2..0000000
--- a/bin/yodconfigure
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/sh
-#
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
-#
-# Fix configure file so that it can launch configure testing executable
-# via the proper launching command, e.g., yod.  (Thus the name yodconfigure
-# is used.)
-#
-# Author: Albert Cheng
-
-if [ "$1" = -f ]; then
-    FORCEMODE=yes
-    echo turn FORCEMODE to $FORCEMODE
-    shift
-fi
-
-if [ $# -ne 1 ]; then
-    echo "Usage: $0 [-f] <configure file>"
-    echo "   -f   apply the change even if it has been applied already."
-    exit 1
-fi
-confile=$1
-
-if [ ! -w $confile ]; then
-    echo "$0: $confile is not writable"
-    exit 1
-fi
-
-ACTRY_NAME="ACTRY()"
-if grep ^"$ACTRY_NAME"$ $confile >/dev/null 2>&1 && [ "$FORCEMODE" != yes ]; then
-    echo "$0: $confile is already yodconfigure ready.  Use -f to force yodconfigure again."
-    exit 1
-fi
-
-# Insert the ACTRY function after the 1st line which is the #!/bin/sh.
-# Change all "eval $ac_try" commands to call ACTRY.
-# auto-configure have changed the ac_try syntax from 'eval $ac_try' to
-# 'eval "$ac_try"'.  Thus requiring two very similar global-substitute.
-# The single quotes around EOF tell shell NOT to expand or do substitution in
-# the body of ed input.
-#
-ed - $confile <<'EOF'
-1a
-# ===inserted by yodconfigure ====
-# ACTRY will figure out when it is approprirate to run the command by the
-# $RUNSERIAL launcher (e.g., yod -sz 1) and when to just run it as is.
-# So far, ./a.out and ./conftest are names of real executable that should
-# be run by $RUNSERIAL.
-#
-# (uncomment the echo line if you want to see what is going on.)
-ACTRY()
-{
-#echo ACTRY: args are: $* > /dev/tty
-if [ "$1" = ./a.out -o "$1" = ./conftest ]; then
-#    echo $RUNSERIAL $* > /dev/tty
-    $RUNSERIAL $*
-else
-    $*
-fi
-}
-# === end of ACTRY inserted by yodconfigure ====
-.
-g/eval $ac_try/s/eval/eval ACTRY/
-g/eval "$ac_try"/s/eval/eval ACTRY/
-w
-q
-EOF
diff --git a/c++/CMakeLists.txt b/c++/CMakeLists.txt
index 39280e8..2c0275b 100644
--- a/c++/CMakeLists.txt
+++ b/c++/CMakeLists.txt
@@ -1,53 +1,18 @@
-cmake_minimum_required (VERSION 3.1.0)
-PROJECT (HDF5_CPP)
+cmake_minimum_required (VERSION 3.18)
+project (HDF5_CPP CXX)
 
-#-----------------------------------------------------------------------------
-# Apply Definitions to compiler in this directory and below
-#-----------------------------------------------------------------------------
-add_definitions (${HDF_EXTRA_C_FLAGS})
-
-#-----------------------------------------------------------------------------
-# Shared/Static Libs
-#-----------------------------------------------------------------------------
-if (BUILD_SHARED_LIBS)
-  set (CPP_BUILT_AS_DYNAMIC_LIB 1)
-else (BUILD_SHARED_LIBS)
-  set (CPP_BUILT_AS_STATIC_LIB 1)
-endif (BUILD_SHARED_LIBS)
-
-#-----------------------------------------------------------------------------
-# Generate configure file
-#-----------------------------------------------------------------------------
-configure_file (${HDF_RESOURCES_DIR}/H5cxx_config.h.in
-                ${HDF5_BINARY_DIR}/H5cxx_pubconf.h
-)
-
-#-----------------------------------------------------------------------------
-# Setup Include directories
-#-----------------------------------------------------------------------------
-INCLUDE_DIRECTORIES (${HDF5_CPP_SOURCE_DIR}/src)
-INCLUDE_DIRECTORIES (${HDF5_BINARY_DIR})
-
-#-----------------------------------------------------------------------------
-# Parallel/MPI, prevent spurious cpp/cxx warnings
-#-----------------------------------------------------------------------------
-if (H5_HAVE_PARALLEL)
-  add_definitions ("-DMPICH_SKIP_MPICXX")
-  add_definitions ("-DMPICH_IGNORE_CXX_SEEK")
-endif (H5_HAVE_PARALLEL)
-
-add_subdirectory (${HDF5_CPP_SOURCE_DIR}/src ${HDF5_CPP_BINARY_DIR}/src)
+add_subdirectory (src)
 
 #-----------------------------------------------------------------------------
 # Build the CPP Examples
 #-----------------------------------------------------------------------------
 if (HDF5_BUILD_EXAMPLES)
-  add_subdirectory (${HDF5_CPP_SOURCE_DIR}/examples ${HDF5_CPP_BINARY_DIR}/examples)
-endif (HDF5_BUILD_EXAMPLES)
+  add_subdirectory (examples)
+endif ()
 
 #-----------------------------------------------------------------------------
 # Build the CPP unit tests
 #-----------------------------------------------------------------------------
 if (BUILD_TESTING)
-  add_subdirectory (${HDF5_CPP_SOURCE_DIR}/test ${HDF5_CPP_BINARY_DIR}/test)
-endif (BUILD_TESTING)
+  add_subdirectory (test)
+endif ()
diff --git a/c++/COPYING b/c++/COPYING
deleted file mode 100644
index 6903daf..0000000
--- a/c++/COPYING
+++ /dev/null
@@ -1,16 +0,0 @@
-
-  Copyright by  The HDF Group and 
-                The Board of Trustees of the University of Illinois. 
-  All rights reserved. 
-
-  The files and subdirectories in this directory are part of HDF5.  
-  The full HDF5 copyright notice, including terms governing use, 
-  modification, and redistribution, is contained in the files COPYING 
-  and Copyright.html.  COPYING can be found at the root of the source 
-  code distribution tree; Copyright.html can be found at the root 
-  level of an installed copy of the electronic HDF5 document set and 
-  is linked from the top-level documents page.  It can also be found 
-  at http://www.hdfgroup.org/HDF5/doc/Copyright.html.  If you do not 
-  have access to either file, you may request a copy from 
-  help@hdfgroup.org. 
-
diff --git a/c++/Makefile.am b/c++/Makefile.am
index 416060a..c6c94f3 100644
--- a/c++/Makefile.am
+++ b/c++/Makefile.am
@@ -1,28 +1,32 @@
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 ##
 ## Makefile.am
 ## Run automake to generate a Makefile.in from this file.
 #
 # Top-level HDF5-C++ Makefile(.in)
-# 
+#
 
 include $(top_srcdir)/config/commence.am
 
+if BUILD_TESTS_CONDITIONAL
+   TEST_DIR = test
+else
+   TEST_DIR=
+endif
+
 ## Only recurse into subdirectories if C++ interface is enabled.
 if BUILD_CXX_CONDITIONAL
-   SUBDIRS=src test
+   SUBDIRS=src $(TEST_DIR)
+
 endif
 DIST_SUBDIRS = src test examples
 
diff --git a/c++/Makefile.in b/c++/Makefile.in
deleted file mode 100644
index 376a991..0000000
--- a/c++/Makefile.in
+++ /dev/null
@@ -1,1369 +0,0 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-#
-# Top-level HDF5-C++ Makefile(.in)
-# 
-VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-DIST_COMMON = $(top_srcdir)/config/commence.am \
-	$(top_srcdir)/config/conclude.am $(srcdir)/Makefile.in \
-	$(srcdir)/Makefile.am $(top_srcdir)/bin/mkinstalldirs \
-	$(top_srcdir)/bin/test-driver COPYING
-TESTS =
-subdir = c++
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/aclocal_cxx.m4 \
-	$(top_srcdir)/m4/aclocal_fc.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/src/H5config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
-	ctags-recursive dvi-recursive html-recursive info-recursive \
-	install-data-recursive install-dvi-recursive \
-	install-exec-recursive install-html-recursive \
-	install-info-recursive install-pdf-recursive \
-	install-ps-recursive install-recursive installcheck-recursive \
-	installdirs-recursive pdf-recursive ps-recursive \
-	tags-recursive uninstall-recursive
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-am__recursive_targets = \
-  $(RECURSIVE_TARGETS) \
-  $(RECURSIVE_CLEAN_TARGETS) \
-  $(am__extra_recursive_targets)
-AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	check recheck distdir
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-am__tty_colors_dummy = \
-  mgn= red= grn= lgn= blu= brg= std=; \
-  am__color_tests=no
-am__tty_colors = { \
-  $(am__tty_colors_dummy); \
-  if test "X$(AM_COLOR_TESTS)" = Xno; then \
-    am__color_tests=no; \
-  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
-    am__color_tests=yes; \
-  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
-    am__color_tests=yes; \
-  fi; \
-  if test $$am__color_tests = yes; then \
-    red='[0;31m'; \
-    grn='[0;32m'; \
-    lgn='[1;32m'; \
-    blu='[1;34m'; \
-    mgn='[0;35m'; \
-    brg='[1m'; \
-    std='[m'; \
-  fi; \
-}
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__recheck_rx = ^[ 	]*:recheck:[ 	]*
-am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
-am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
-# A command that, given a newline-separated list of test names on the
-# standard input, print the name of the tests that are to be re-run
-# upon "make recheck".
-am__list_recheck_tests = $(AWK) '{ \
-  recheck = 1; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-        { \
-          if ((getline line2 < ($$0 ".log")) < 0) \
-	    recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
-        { \
-          recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
-        { \
-          break; \
-        } \
-    }; \
-  if (recheck) \
-    print $$0; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# A command that, given a newline-separated list of test names on the
-# standard input, create the global log from their .trs and .log files.
-am__create_global_log = $(AWK) ' \
-function fatal(msg) \
-{ \
-  print "fatal: making $@: " msg | "cat >&2"; \
-  exit 1; \
-} \
-function rst_section(header) \
-{ \
-  print header; \
-  len = length(header); \
-  for (i = 1; i <= len; i = i + 1) \
-    printf "="; \
-  printf "\n\n"; \
-} \
-{ \
-  copy_in_global_log = 1; \
-  global_test_result = "RUN"; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-         fatal("failed to read from " $$0 ".trs"); \
-      if (line ~ /$(am__global_test_result_rx)/) \
-        { \
-          sub("$(am__global_test_result_rx)", "", line); \
-          sub("[ 	]*$$", "", line); \
-          global_test_result = line; \
-        } \
-      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
-        copy_in_global_log = 0; \
-    }; \
-  if (copy_in_global_log) \
-    { \
-      rst_section(global_test_result ": " $$0); \
-      while ((rc = (getline line < ($$0 ".log"))) != 0) \
-      { \
-        if (rc < 0) \
-          fatal("failed to read from " $$0 ".log"); \
-        print line; \
-      }; \
-      printf "\n"; \
-    }; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# Restructured Text title.
-am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
-# Solaris 10 'make', and several other traditional 'make' implementations,
-# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
-# by disabling -e (using the XSI extension "set +e") if it's set.
-am__sh_e_setup = case $$- in *e*) set +e;; esac
-# Default flags passed to test drivers.
-am__common_driver_flags = \
-  --color-tests "$$am__color_tests" \
-  --enable-hard-errors "$$am__enable_hard_errors" \
-  --expect-failure "$$am__expect_failure"
-# To be inserted before the command running the test.  Creates the
-# directory for the log if needed.  Stores in $dir the directory
-# containing $f, in $tst the test, in $log the log.  Executes the
-# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
-# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
-# will run the test scripts (or their associated LOG_COMPILER, if
-# thy have one).
-am__check_pre = \
-$(am__sh_e_setup);					\
-$(am__vpath_adj_setup) $(am__vpath_adj)			\
-$(am__tty_colors);					\
-srcdir=$(srcdir); export srcdir;			\
-case "$@" in						\
-  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
-    *) am__odir=.;; 					\
-esac;							\
-test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
-  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
-if test -f "./$$f"; then dir=./;			\
-elif test -f "$$f"; then dir=;				\
-else dir="$(srcdir)/"; fi;				\
-tst=$$dir$$f; log='$@'; 				\
-if test -n '$(DISABLE_HARD_ERRORS)'; then		\
-  am__enable_hard_errors=no; 				\
-else							\
-  am__enable_hard_errors=yes; 				\
-fi; 							\
-case " $(XFAIL_TESTS) " in				\
-  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
-    am__expect_failure=yes;;				\
-  *)							\
-    am__expect_failure=no;;				\
-esac; 							\
-$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
-# A shell command to get the names of the tests scripts with any registered
-# extension removed (i.e., equivalently, the names of the test logs, with
-# the '.log' extension removed).  The result is saved in the shell variable
-# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
-# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
-# since that might cause problem with VPATH rewrites for suffix-less tests.
-# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
-am__set_TESTS_bases = \
-  bases='$(TEST_LOGS)'; \
-  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
-  bases=`echo $$bases`
-RECHECK_LOGS = $(TEST_LOGS)
-TEST_SUITE_LOG = test-suite.log
-am__test_logs1 = $(TESTS:=.log)
-am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
-TEST_LOGS = $(am__test_logs2:.sh.log=.log)
-SH_LOG_DRIVER = $(SHELL) $(top_srcdir)/bin/test-driver
-SH_LOG_COMPILE = $(SH_LOG_COMPILER) $(AM_SH_LOG_FLAGS) $(SH_LOG_FLAGS)
-am__set_b = \
-  case '$@' in \
-    */*) \
-      case '$*' in \
-        */*) b='$*';; \
-          *) b=`echo '$@' | sed 's/\.log$$//'`; \
-       esac;; \
-    *) \
-      b='$*';; \
-  esac
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
-  sed_rest='s,^[^/]*/*,,'; \
-  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
-  sed_butlast='s,/*[^/]*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
-ACLOCAL = @ACLOCAL@
-ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
-AMTAR = @AMTAR@
-
-# H5_CFLAGS holds flags that should be used when building hdf5,
-# but which should not be exported to h5cc for building other programs.
-# AM_CFLAGS is an automake construct which should be used by Makefiles 
-# instead of CFLAGS, as CFLAGS is reserved solely for the user to define.
-# This applies to FCFLAGS, CXXFLAGS, CPPFLAGS, and LDFLAGS as well.
-AM_CFLAGS = @AM_CFLAGS@ @H5_CFLAGS@
-AM_CPPFLAGS = @AM_CPPFLAGS@ @H5_CPPFLAGS@
-AM_CXXFLAGS = @AM_CXXFLAGS@ @H5_CXXFLAGS@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@
-AM_LDFLAGS = @AM_LDFLAGS@ @H5_LDFLAGS@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BYTESEX = @BYTESEX@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CC_VERSION = @CC_VERSION@
-CFLAGS = @CFLAGS@
-CLEARFILEBUF = @CLEARFILEBUF@
-CODESTACK = @CODESTACK@
-CONFIG_DATE = @CONFIG_DATE@
-CONFIG_MODE = @CONFIG_MODE@
-CONFIG_USER = @CONFIG_USER@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CXX_VERSION = @CXX_VERSION@
-CYGPATH_W = @CYGPATH_W@
-DEBUG_PKG = @DEBUG_PKG@
-DEFAULT_API_VERSION = @DEFAULT_API_VERSION@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
-DIRECT_VFD = @DIRECT_VFD@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-EXTERNAL_FILTERS = @EXTERNAL_FILTERS@
-
-# Make sure that these variables are exported to the Makefiles
-F9XMODEXT = @F9XMODEXT@
-F9XMODFLAG = @F9XMODFLAG@
-F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
-FC = @FC@
-FC2003 = @FC2003@
-FCFLAGS = @FCFLAGS@
-FCFLAGS_f90 = @FCFLAGS_f90@
-FCLIBS = @FCLIBS@
-FC_VERSION = @FC_VERSION@
-FGREP = @FGREP@
-FSEARCH_DIRS = @FSEARCH_DIRS@
-GREP = @GREP@
-H5_CFLAGS = @H5_CFLAGS@
-H5_CPPFLAGS = @H5_CPPFLAGS@
-H5_CXXFLAGS = @H5_CXXFLAGS@
-H5_CXX_SHARED = @H5_CXX_SHARED@
-H5_FCFLAGS = @H5_FCFLAGS@
-H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@
-H5_LDFLAGS = @H5_LDFLAGS@
-H5_LONE_COLON = @H5_LONE_COLON@
-H5_VERSION = @H5_VERSION@
-HADDR_T = @HADDR_T@
-HAVE_DMALLOC = @HAVE_DMALLOC@
-HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@
-HAVE_PTHREAD = @HAVE_PTHREAD@
-HDF5_HL = @HDF5_HL@
-HDF5_INTERFACES = @HDF5_INTERFACES@
-HDF_CXX = @HDF_CXX@
-HDF_FORTRAN = @HDF_FORTRAN@
-HDF_FORTRAN2003 = @HDF_FORTRAN2003@
-HID_T = @HID_T@
-HL = @HL@
-HL_FOR = @HL_FOR@
-HSIZE_T = @HSIZE_T@
-HSSIZE_T = @HSSIZE_T@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTRUMENT = @INSTRUMENT@
-INSTRUMENT_LIBRARY = @INSTRUMENT_LIBRARY@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LL_PATH = @LL_PATH@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_STATIC_EXEC = @LT_STATIC_EXEC@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MPE = @MPE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJECT_NAMELEN_DEFAULT_F = @OBJECT_NAMELEN_DEFAULT_F@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PARALLEL = @PARALLEL@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-RANLIB = @RANLIB@
-ROOT = @ROOT@
-RUNPARALLEL = @RUNPARALLEL@
-RUNSERIAL = @RUNSERIAL@
-R_INTEGER = @R_INTEGER@
-R_LARGE = @R_LARGE@
-SEARCH = @SEARCH@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SIZE_T = @SIZE_T@
-STATIC_EXEC = @STATIC_EXEC@
-STATIC_SHARED = @STATIC_SHARED@
-STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@
-STRIP = @STRIP@
-TESTPARALLEL = @TESTPARALLEL@
-THREADSAFE = @THREADSAFE@
-TIME = @TIME@
-TR = @TR@
-TRACE_API = @TRACE_API@
-UNAME_INFO = @UNAME_INFO@
-USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
-USE_FILTER_SZIP = @USE_FILTER_SZIP@
-USINGMEMCHECKER = @USINGMEMCHECKER@
-VERSION = @VERSION@
-WORDS_BIGENDIAN = @WORDS_BIGENDIAN@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_FC = @ac_ct_FC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-
-# Install directories that automake doesn't know about
-docdir = $(exec_prefix)/doc
-dvidir = @dvidir@
-enable_shared = @enable_shared@
-enable_static = @enable_static@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-
-# Shell commands used in Makefiles
-RM = rm -f
-CP = cp
-
-# Some machines need a command to run executables; this is that command
-# so that our tests will run.
-# We use RUNEXEC instead of RUNSERIAL directly because it may be that
-# some tests need to be run with a different command.  Older versions
-# of the makefiles used the command
-# $(LIBTOOL) --mode=execute
-# in some directories, for instance.
-RUNEXEC = $(RUNSERIAL)
-
-# Libraries to link to while building
-LIBHDF5 = $(top_builddir)/src/libhdf5.la
-LIBH5TEST = $(top_builddir)/test/libh5test.la
-LIBH5F = $(top_builddir)/fortran/src/libhdf5_fortran.la
-LIBH5FTEST = $(top_builddir)/fortran/test/libh5test_fortran.la
-LIBH5CPP = $(top_builddir)/c++/src/libhdf5_cpp.la
-LIBH5TOOLS = $(top_builddir)/tools/lib/libh5tools.la
-LIBH5_HL = $(top_builddir)/hl/src/libhdf5_hl.la
-LIBH5F_HL = $(top_builddir)/hl/fortran/src/libhdf5hl_fortran.la
-LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
-
-# Note that in svn revision 19400 the '/' after DESTDIR in H5* variables below  
-# has been removed. According to the official description of DESTDIR by Gnu at 
-# http://www.gnu.org/prep/standards/html_node/DESTDIR.html, DESTDIR is 
-# prepended to the normal and complete install path that it precedes for the 
-# purpose of installing in a temporary directory which is useful for building 
-# rpms and other packages.  The '/' after ${DESTDIR} will be followed by another 
-# '/' at the beginning of the normal install path.  When DESTDIR is empty the  
-# path then begins with '//', which is incorrect and causes problems at least for 
-# Cygwin.   
-
-# Scripts used to build examples
-# If only shared libraries have been installed, have h5cc build examples with
-# shared libraries instead of static libraries
-H5CC = ${DESTDIR}$(bindir)/h5cc
-H5CC_PP = ${DESTDIR}$(bindir)/h5pcc
-H5FC = ${DESTDIR}$(bindir)/h5fc
-H5FC_PP = ${DESTDIR}$(bindir)/h5pfc
-H5CPP = ${DESTDIR}$(bindir)/h5c++
-ACLOCAL_AMFLAGS = "-I m4"
-
-# The trace script; this is used on source files from the C library to
-# insert tracing macros.
-TRACE = perl $(top_srcdir)/bin/trace
-
-# .chkexe files are used to mark tests that have run successfully.
-# .chklog files are output from those tests.
-# *.clog and *.clog2 are from the MPE option.
-CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2
-@BUILD_CXX_CONDITIONAL_TRUE@SUBDIRS = src test
-DIST_SUBDIRS = src test examples
-
-# Automake needs to be taught how to build lib, progs, and tests targets.
-# These will be filled in automatically for the most part (e.g.,
-# lib_LIBRARIES are built for lib target), but EXTRA_LIB, EXTRA_PROG, and
-# EXTRA_TEST variables are supplied to allow the user to force targets to
-# be built at certain times. 
-LIB = $(lib_LIBRARIES) $(lib_LTLIBRARIES) $(noinst_LIBRARIES)                 \
-      $(noinst_LTLIBRARIES) $(check_LIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LIB)
-
-PROGS = $(bin_PROGRAMS) $(bin_SCRIPTS) $(noinst_PROGRAMS) $(noinst_SCRIPTS)   \
-        $(EXTRA_PROG)
-
-chk_TESTS = $(check_PROGRAMS) $(check_SCRIPTS) $(EXTRA_TEST) 
-TEST_EXTENSIONS = .sh
-SH_LOG_COMPILER = $(SHELL)
-AM_SH_LOG_FLAGS = 
-TEST_PROG_CHKEXE = $(TEST_PROG:=.chkexe_)
-TEST_PROG_PARA_CHKEXE = $(TEST_PROG_PARA:=.chkexe_)
-TEST_SCRIPT_CHKSH = $(TEST_SCRIPT:=.chkexe_)
-TEST_SCRIPT_PARA_CHKSH = $(TEST_SCRIPT_PARA:=.chkexe_)
-all: all-recursive
-
-.SUFFIXES:
-.SUFFIXES: .log .sh .sh$(EXEEXT) .trs
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign c++/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign c++/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-$(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am:
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run 'make' without going through this Makefile.
-# To change the values of 'make' variables: instead of editing Makefiles,
-# (1) if the variable is set in 'config.status', edit 'config.status'
-#     (which will cause the Makefiles to be regenerated when you run 'make');
-# (2) otherwise, pass the desired values on the 'make' command line.
-$(am__recursive_targets):
-	@fail=; \
-	if $(am__make_keepgoing); then \
-	  failcom='fail=yes'; \
-	else \
-	  failcom='exit 1'; \
-	fi; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-recursive
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: ctags-recursive
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-recursive
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-# Recover from deleted '.trs' file; this should ensure that
-# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
-# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
-# to avoid problems with "make -n".
-.log.trs:
-	rm -f $< $@
-	$(MAKE) $(AM_MAKEFLAGS) $<
-
-# Leading 'am--fnord' is there to ensure the list of targets does not
-# expand to empty, as could happen e.g. with make check TESTS=''.
-am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
-am--force-recheck:
-	@:
-
-$(TEST_SUITE_LOG): $(TEST_LOGS)
-	@$(am__set_TESTS_bases); \
-	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
-	redo_bases=`for i in $$bases; do \
-	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
-	            done`; \
-	if test -n "$$redo_bases"; then \
-	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
-	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
-	  if $(am__make_dryrun); then :; else \
-	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
-	  fi; \
-	fi; \
-	if test -n "$$am__remaking_logs"; then \
-	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
-	       "recursion detected" >&2; \
-	else \
-	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
-	fi; \
-	if $(am__make_dryrun); then :; else \
-	  st=0;  \
-	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
-	  for i in $$redo_bases; do \
-	    test -f $$i.trs && test -r $$i.trs \
-	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
-	    test -f $$i.log && test -r $$i.log \
-	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
-	  done; \
-	  test $$st -eq 0 || exit 1; \
-	fi
-	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
-	ws='[ 	]'; \
-	results=`for b in $$bases; do echo $$b.trs; done`; \
-	test -n "$$results" || results=/dev/null; \
-	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
-	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
-	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
-	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
-	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
-	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
-	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
-	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
-	  success=true; \
-	else \
-	  success=false; \
-	fi; \
-	br='==================='; br=$$br$$br$$br$$br; \
-	result_count () \
-	{ \
-	    if test x"$$1" = x"--maybe-color"; then \
-	      maybe_colorize=yes; \
-	    elif test x"$$1" = x"--no-color"; then \
-	      maybe_colorize=no; \
-	    else \
-	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
-	    fi; \
-	    shift; \
-	    desc=$$1 count=$$2; \
-	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
-	      color_start=$$3 color_end=$$std; \
-	    else \
-	      color_start= color_end=; \
-	    fi; \
-	    echo "$${color_start}# $$desc $$count$${color_end}"; \
-	}; \
-	create_testsuite_report () \
-	{ \
-	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
-	  result_count $$1 "PASS: " $$pass  "$$grn"; \
-	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
-	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
-	  result_count $$1 "FAIL: " $$fail  "$$red"; \
-	  result_count $$1 "XPASS:" $$xpass "$$red"; \
-	  result_count $$1 "ERROR:" $$error "$$mgn"; \
-	}; \
-	{								\
-	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
-	    $(am__rst_title);						\
-	  create_testsuite_report --no-color;				\
-	  echo;								\
-	  echo ".. contents:: :depth: 2";				\
-	  echo;								\
-	  for b in $$bases; do echo $$b; done				\
-	    | $(am__create_global_log);					\
-	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
-	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
-	if $$success; then						\
-	  col="$$grn";							\
-	 else								\
-	  col="$$red";							\
-	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
-	fi;								\
-	echo "$${col}$$br$${std}"; 					\
-	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
-	echo "$${col}$$br$${std}"; 					\
-	create_testsuite_report --maybe-color;				\
-	echo "$$col$$br$$std";						\
-	if $$success; then :; else					\
-	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
-	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
-	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
-	  fi;								\
-	  echo "$$col$$br$$std";					\
-	fi;								\
-	$$success || exit 1
-recheck: all 
-	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-	@set +e; $(am__set_TESTS_bases); \
-	bases=`for i in $$bases; do echo $$i; done \
-	         | $(am__list_recheck_tests)` || exit 1; \
-	log_list=`for i in $$bases; do echo $$i.log; done`; \
-	log_list=`echo $$log_list`; \
-	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
-	        am__force_recheck=am--force-recheck \
-	        TEST_LOGS="$$log_list"; \
-	exit $$?
-.sh.log:
-	@p='$<'; \
-	$(am__set_b); \
-	$(am__check_pre) $(SH_LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_SH_LOG_DRIVER_FLAGS) $(SH_LOG_DRIVER_FLAGS) -- $(SH_LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-@am__EXEEXT_TRUE@.sh$(EXEEXT).log:
-@am__EXEEXT_TRUE@	@p='$<'; \
-@am__EXEEXT_TRUE@	$(am__set_b); \
-@am__EXEEXT_TRUE@	$(am__check_pre) $(SH_LOG_DRIVER) --test-name "$$f" \
-@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
-@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_SH_LOG_DRIVER_FLAGS) $(SH_LOG_DRIVER_FLAGS) -- $(SH_LOG_COMPILE) \
-@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    $(am__make_dryrun) \
-	      || test -d "$(distdir)/$$subdir" \
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
-	      || exit 1; \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
-check: check-recursive
-all-am: Makefile all-local
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
-	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
-	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am: installcheck-local
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool \
-	mostlyclean-local
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: $(am__recursive_targets) check-am install-am install-strip
-
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \
-	check check-TESTS check-am clean clean-generic clean-libtool \
-	cscopelist-am ctags ctags-am distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installcheck-local installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
-	pdf-am ps ps-am recheck tags tags-am uninstall uninstall-am
-
-
-# List all build rules defined by HDF5 Makefiles as "PHONY" targets here.
-# This tells the Makefiles that these targets are not files to be built but
-# commands that should be executed even if a file with the same name already
-# exists.
-.PHONY: build-check-clean build-check-p build-check-s build-lib build-progs \
-        build-tests check-clean check-install check-p check-s check-vfd \
-        install-doc lib progs tests uninstall-doc _exec_check-s _test help
-
-help:
-	@$(top_srcdir)/bin/makehelp
-
-# Install examples
-install-examples uninstall-examples:
-	@(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
-
-installcheck-local:
-	@(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
-
-# Clean examples when check-clean is invoked
-check-clean ::
-	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
-	@for d in X $(SUBDIRS) examples; do                                   \
-	    if test $$d != X && test $$d != .; then                           \
-	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
-	    fi;                                                               \
-	done
-
-# lib/progs/tests targets recurse into subdirectories. build-* targets
-# build files in this directory.
-build-lib: $(LIB)
-build-progs: $(LIB) $(PROGS)
-build-tests: $(LIB) $(PROGS) $(chk_TESTS)
-
-# General rule for recursive building targets.
-# BUILT_SOURCES contain targets that need to be built before anything else
-# in the directory (e.g., for Fortran type detection)
-lib progs tests check-s check-p :: $(BUILT_SOURCES)
-	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
-	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X && test $$d != .; then                           \
-	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
-	    fi;                                                               \
-	done
-
-# General rule for recursive cleaning targets.  Like the rule above,
-# but doesn't require building BUILT_SOURCES.
-check-clean ::
-	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
-	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X && test $$d != .; then                           \
-	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
-	    fi;                                                               \
-	done
-
-# Tell Automake to build tests when the user types `make all' (this is
-# not its default behavior).  Also build EXTRA_LIB and EXTRA_PROG since
-# Automake won't build them automatically, either.
-all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(chk_TESTS)
-
-# make install-doc doesn't do anything outside of doc directory, but
-# Makefiles should recognize it.
-# UPDATE: docs no longer reside in this build tree, so this target
-# is depreciated.
-install-doc uninstall-doc:
-	@echo "Nothing to be done."
-
-# clean up files generated by tests so they can be re-run.
-build-check-clean:
-	$(RM) -rf $(CHECK_CLEANFILES)
-
-# run check-clean whenever mostlyclean is run
-mostlyclean-local: build-check-clean
-
-# check-install is just a synonym for installcheck
-check-install: installcheck
-
-# Run each test in order, passing $(TEST_FLAGS) to the program.
-# Since tests are done in a shell loop, "make -i" does apply inside it.
-# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
-# The timestamps give a rough idea how much time the tests use.
-#
-# Note that targets in chk_TESTS (defined above) will be built when the user
-# types 'make tests' or 'make check', but only programs in TEST_PROG,
-# TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
-check-TESTS: test
-
-test _test:
-	@$(MAKE) build-check-s
-	@$(MAKE) build-check-p
-
-# Actual execution of check-s.
-build-check-s: $(LIB) $(PROGS) $(chk_TESTS)
-	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
-	   echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
-	fi
-	@$(MAKE) $(AM_MAKEFLAGS) _exec_check-s
-	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
-	    echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
-	fi
-
-_exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH)
-
-# The dummy.chkexe here prevents the target from being
-# empty if there are no tests in the current directory.
-# $${log} is the log file.
-# $${tname} is the name of test.
-$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
-	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \
-	   tname=$(@:.chkexe_=)$(EXEEXT);\
-	   log=$(@:.chkexe_=.chklog); \
-	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \
-	      echo "No need to test $${tname} again."; \
-	   else \
-	      echo "============================" > $${log}; \
-	      if test "X$(FORTRAN_API)" = "Xyes"; then \
-	         echo "Fortran API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "Fortran API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(CXX_API)" = "Xyes"; then \
-	         echo "C++ API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "C++ API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log};\
-	      else \
-	         echo "Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "$(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      fi; \
-	      echo "============================" >> $${log}; \
-	      srcdir="$(srcdir)" \
-	         $(TIME) $(RUNEXEC) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \
-	         && touch $(@:.chkexe_=.chkexe) || \
-	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	         (cat $${log} && false) || exit 1; \
-	      echo "" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
-	      echo "============================" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
-	      cat $${log}; \
-	   fi; \
-	fi
-
-# The dummysh.chkexe here prevents the target from being
-# empty if there are no tests in the current directory.
-# $${log} is the log file.
-# $${tname} is the name of test.
-$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
-	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummysh.chkexe_"; then \
-	   cmd=$(@:.chkexe_=);\
-	   tname=`basename $$cmd`;\
-	   chkname=`basename $(@:.chkexe_=.chkexe)`;\
-	   log=`basename $(@:.chkexe_=.chklog)`; \
-	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer $${chkname} $$cmd $(SCRIPT_DEPEND); then \
-	      echo "No need to test $${tname} again."; \
-	   else \
-	      echo "============================" > $${log}; \
-	      if test "X$(FORTRAN_API)" = "Xyes"; then \
-	         echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(CXX_API)" = "Xyes"; then \
-	         echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      else \
-	         echo "Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      fi; \
-	      echo "============================" >> $${log}; \
-	      RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
-	      srcdir="$(srcdir)" \
-	         $(TIME) $(SHELL) $$cmd $(TEST_FLAGS) >> $${log} 2>&1 \
-	         && touch $${chkname} || \
-	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	         (cat $${log} && false) || exit 1; \
-	      echo "" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
-	      echo "============================" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
-	      cat $${log}; \
-	   fi; \
-	   echo "============================"; \
-	fi
-
-# Actual execution of check-p.
-build-check-p: $(LIB) $(PROGS) $(chk_TESTS)
-	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
-	   echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
-	fi
-	@if test -n "$(TEST_PROG_PARA)"; then                                \
-	    echo "**** Hint ****";                                            \
-	    echo "Parallel test files reside in the current directory"        \
-	         "by default.";                                               \
-	    echo "Set HDF5_PARAPREFIX to use another directory. E.g.,";       \
-	    echo "    HDF5_PARAPREFIX=/PFS/user/me";                          \
-	    echo "    export HDF5_PARAPREFIX";                                \
-	    echo "    make check";                                            \
-	    echo "**** end of Hint ****";                                     \
-	fi
-	@for test in $(TEST_PROG_PARA) dummy; do                             \
-	   if test $$test != dummy; then                                      \
-	      $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ \
-	      RUNEXEC="$(RUNPARALLEL)" || exit 1; \
-	   fi;                                                                \
-	done
-	@for test in $(TEST_SCRIPT_PARA) dummy; do                           \
-	  if test $$test != dummy; then                                      \
-	    $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ || exit 1; \
-	  fi;                                                                 \
-	done
-	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
-	    echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
-	fi
-
-# Run test with different Virtual File Driver
-check-vfd: $(LIB) $(PROGS) $(chk_TESTS)
-	@for vfd in $(VFD_LIST) dummy; do                                     \
-	    if test $$vfd != dummy; then                                      \
-	        echo "============================";                          \
-	        echo "Testing Virtual File Driver $$vfd";                     \
-	        echo "============================";                          \
-	        $(MAKE) $(AM_MAKEFLAGS) check-clean || exit 1;                \
-	        HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check || exit 1;    \
-	    fi;                                                               \
-	done
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/c++/examples/CMakeLists.txt b/c++/examples/CMakeLists.txt
index ff375f3..c8c4018 100644
--- a/c++/examples/CMakeLists.txt
+++ b/c++/examples/CMakeLists.txt
@@ -1,11 +1,11 @@
-cmake_minimum_required (VERSION 3.1.0)
+cmake_minimum_required (VERSION 3.18)
+project (HDF5_CPP_EXAMPLES CXX)
+
 # --------------------------------------------------------------------
 # Notes: When creating examples they should be prefixed
 # with "cpp_ex_". This allows for easier filtering of the examples.
 # --------------------------------------------------------------------
 
-PROJECT (HDF5_CPP_EXAMPLES)
-
 #-----------------------------------------------------------------------------
 # Define examples
 #-----------------------------------------------------------------------------
@@ -34,20 +34,54 @@ set (tutr_examples
 
 foreach (example ${examples})
   add_executable (cpp_ex_${example} ${HDF5_CPP_EXAMPLES_SOURCE_DIR}/${example}.cpp)
-  TARGET_NAMING (cpp_ex_${example} ${LIB_TYPE})
-  TARGET_C_PROPERTIES (cpp_ex_${example} ${LIB_TYPE} " " " ")
-  target_link_libraries (cpp_ex_${example} ${HDF5_CPP_LIB_TARGET} ${HDF5_LIB_TARGET})
+  target_include_directories (cpp_ex_${example} PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  if (NOT BUILD_SHARED_LIBS)
+    TARGET_C_PROPERTIES (cpp_ex_${example} STATIC)
+    target_link_libraries (cpp_ex_${example} PRIVATE ${HDF5_CPP_LIB_TARGET} ${HDF5_LIB_TARGET})
+  else ()
+    TARGET_C_PROPERTIES (cpp_ex_${example} SHARED)
+    target_link_libraries (cpp_ex_${example} PRIVATE ${HDF5_CPP_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
+    if (MINGW AND HDF5_MINGW_STATIC_GCC_LIBS)
+      target_link_options (${HDF5_CPP_LIBSH_TARGET}
+          PRIVATE -static-libgcc -static-libstdc++
+      )
+    endif ()
+  endif ()
   set_target_properties (cpp_ex_${example} PROPERTIES FOLDER examples/cpp)
-endforeach (example ${examples})
+
+  #-----------------------------------------------------------------------------
+  # Add Target to clang-format
+  #-----------------------------------------------------------------------------
+  if (HDF5_ENABLE_FORMATTERS)
+    clang_format (HDF5_CPP_EXAMPLES_${example}_FORMAT cpp_ex_${example})
+  endif ()
+endforeach ()
 
 foreach (example ${tutr_examples})
   add_executable (cpp_ex_${example} ${HDF5_CPP_EXAMPLES_SOURCE_DIR}/${example}.cpp)
-  TARGET_NAMING (cpp_ex_${example} ${LIB_TYPE})
-  TARGET_C_PROPERTIES (cpp_ex_${example} ${LIB_TYPE} " " " ")
-  target_link_libraries (cpp_ex_${example} ${HDF5_CPP_LIB_TARGET} ${HDF5_LIB_TARGET})
+  target_include_directories (cpp_ex_${example} PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  if (NOT BUILD_SHARED_LIBS)
+    TARGET_C_PROPERTIES (cpp_ex_${example} STATIC)
+    target_link_libraries (cpp_ex_${example} PRIVATE ${HDF5_CPP_LIB_TARGET} ${HDF5_LIB_TARGET})
+  else ()
+    TARGET_C_PROPERTIES (cpp_ex_${example} SHARED)
+    target_link_libraries (cpp_ex_${example} PRIVATE ${HDF5_CPP_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
+    if (MINGW AND HDF5_MINGW_STATIC_GCC_LIBS)
+      target_link_options (${HDF5_CPP_LIBSH_TARGET}
+          PRIVATE -static-libgcc -static-libstdc++
+      )
+    endif ()
+  endif ()
   set_target_properties (cpp_ex_${example} PROPERTIES FOLDER examples/cpp)
-endforeach (example ${tutr_examples})
 
-if (BUILD_TESTING)
+  #-----------------------------------------------------------------------------
+  # Add Target to clang-format
+  #-----------------------------------------------------------------------------
+  if (HDF5_ENABLE_FORMATTERS)
+    clang_format (HDF5_CPP_EXAMPLES_${example}_FORMAT cpp_ex_${example})
+  endif ()
+endforeach ()
+
+if (BUILD_TESTING AND HDF5_TEST_CPP AND HDF5_TEST_EXAMPLES AND HDF5_TEST_SERIAL)
   include (CMakeTests.cmake)
-endif (BUILD_TESTING)
+endif ()
diff --git a/c++/examples/CMakeTests.cmake b/c++/examples/CMakeTests.cmake
index 4db8c68..f5b2a88 100644
--- a/c++/examples/CMakeTests.cmake
+++ b/c++/examples/CMakeTests.cmake
@@ -1,3 +1,14 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
 
 ##############################################################################
 ##############################################################################
@@ -5,57 +16,107 @@
 ##############################################################################
 ##############################################################################
   # Remove any output file left over from previous test run
-  add_test (
-      NAME CPP_ex-clear-objects
-      COMMAND    ${CMAKE_COMMAND}
-          -E remove 
-          Group.h5
-          SDS.h5
-          SDScompound.h5
-          SDSextendible.h5
-          Select.h5
-  )
-  if (NOT "${last_test}" STREQUAL "")
-    set_tests_properties (CPP_ex-clear-objects PROPERTIES DEPENDS ${last_test})
-  endif (NOT "${last_test}" STREQUAL "")
-  set (last_test "CPP_ex-clear-objects")
+set (CPP_EX_CLEANFILES
+    Group.h5
+    SDS.h5
+    SDScompound.h5
+    SDSextendible.h5
+    Select.h5
+)
+add_test (
+    NAME CPP_ex-clear-objects
+    COMMAND    ${CMAKE_COMMAND}
+        -E remove ${CPP_EX_CLEANFILES}
+)
+set_tests_properties (CPP_ex-clear-objects PROPERTIES
+    FIXTURES_SETUP clear_cppex
+    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+)
+add_test (
+    NAME CPP_ex-clean-objects
+    COMMAND    ${CMAKE_COMMAND}
+        -E remove ${CPP_EX_CLEANFILES}
+)
+set_tests_properties (CPP_ex-clean-objects PROPERTIES
+    FIXTURES_CLEANUP clear_cppex
+    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+)
 
-  foreach (example ${examples})
-    add_test (NAME CPP_ex_${example} COMMAND $<TARGET_FILE:cpp_ex_${example}>)
-    if (NOT "${last_test}" STREQUAL "")
-      set_tests_properties (CPP_ex_${example} PROPERTIES DEPENDS ${last_test})
-    endif (NOT "${last_test}" STREQUAL "")
-    set (last_test "CPP_ex_${example}")
-  endforeach (example ${examples})
-#the following dependicies are handled by the order of the files
+foreach (example ${examples})
+  if (HDF5_ENABLE_USING_MEMCHECKER)
+    add_test (NAME CPP_ex_${example} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:cpp_ex_${example}>)
+  else ()
+    add_test (NAME CPP_ex_${example} COMMAND "${CMAKE_COMMAND}"
+        -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
+        -D "TEST_PROGRAM=$<TARGET_FILE:cpp_ex_${example}>"
+        -D "TEST_ARGS:STRING="
+        -D "TEST_EXPECT=0"
+        -D "TEST_SKIP_COMPARE=TRUE"
+        -D "TEST_OUTPUT=cpp_ex_${example}.txt"
+        #-D "TEST_REFERENCE=cpp_ex_${example}.out"
+        -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+        -P "${HDF_RESOURCES_DIR}/runTest.cmake"
+    )
+  endif ()
+  set_tests_properties (CPP_ex_${example} PROPERTIES FIXTURES_REQUIRED clear_cppex)
+  if (last_test)
+    set_tests_properties (CPP_ex_${example} PROPERTIES DEPENDS ${last_test})
+  endif ()
+  set (last_test "CPP_ex_${example}")
+endforeach ()
+#the following dependencies are handled by the order of the files
 #  SET_TESTS_PROPERTIES(CPP_ex_readdata PROPERTIES DEPENDS CPP_ex_create)
 #  SET_TESTS_PROPERTIES(CPP_ex_chunks PROPERTIES DEPENDS CPP_ex_extend_ds)
+set (CPP_EX_TUTR_CLEANFILES
+    h5tutr_cmprss.h5
+    h5tutr_dset.h5
+    h5tutr_extend.h5
+    h5tutr_group.h5
+    h5tutr_groups.h5
+    h5tutr_subset.h5
+)
+add_test (
+    NAME CPP_ex_tutr-clear-objects
+    COMMAND    ${CMAKE_COMMAND}
+        -E remove ${CPP_EX_TUTR_CLEANFILES}
+)
+set_tests_properties (CPP_ex_tutr-clear-objects PROPERTIES
+    FIXTURES_SETUP clear_cppex_tutr
+    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+)
+add_test (
+    NAME CPP_ex_tutr-clean-objects
+    COMMAND    ${CMAKE_COMMAND}
+        -E remove ${CPP_EX_TUTR_CLEANFILES}
+)
+set_tests_properties (CPP_ex_tutr-clean-objects PROPERTIES
+    FIXTURES_CLEANUP clear_cppex_tutr
+    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+)
 
-  add_test (
-      NAME CPP_ex_tutr-clear-objects
-      COMMAND    ${CMAKE_COMMAND}
-          -E remove 
-          h5tutr_cmprss.h5
-          h5tutr_dset.h5
-          h5tutr_extend.h5
-          h5tutr_group.h5
-          h5tutr_groups.h5
-          h5tutr_subset.h5
-  )
-  if (NOT "${last_test}" STREQUAL "")
-    set_tests_properties (CPP_ex_tutr-clear-objects PROPERTIES DEPENDS ${last_test})
-  endif (NOT "${last_test}" STREQUAL "")
-  set (last_test "CPP_ex_tutr-clear-objects")
-  
-  foreach (example ${tutr_examples})
-    add_test (NAME CPP_ex_${example} COMMAND $<TARGET_FILE:cpp_ex_${example}>)
-    if (NOT "${last_test}" STREQUAL "")
-      set_tests_properties (CPP_ex_${example} PROPERTIES DEPENDS ${last_test})
-    endif (NOT "${last_test}" STREQUAL "")
-    set (last_test "CPP_ex_${example}")
-  endforeach (example ${tutr_examples})
-#the following dependicies are handled by the order of the files
+foreach (example ${tutr_examples})
+  if (HDF5_ENABLE_USING_MEMCHECKER)
+    add_test (NAME CPP_ex_${example} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:cpp_ex_${example}>)
+  else ()
+    add_test (NAME CPP_ex_${example} COMMAND "${CMAKE_COMMAND}"
+        -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
+        -D "TEST_PROGRAM=$<TARGET_FILE:cpp_ex_${example}>"
+        -D "TEST_ARGS:STRING="
+        -D "TEST_EXPECT=0"
+        -D "TEST_SKIP_COMPARE=TRUE"
+        -D "TEST_OUTPUT=tutr_cpp_ex_${example}.txt"
+        #-D "TEST_REFERENCE=cpp_ex_tutr_${example}.out"
+        -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+        -P "${HDF_RESOURCES_DIR}/runTest.cmake"
+    )
+  endif ()
+  set_tests_properties (CPP_ex_${example} PROPERTIES FIXTURES_REQUIRED clear_cppex_tutr)
+  if (last_test)
+    set_tests_properties (CPP_ex_${example} PROPERTIES DEPENDS ${last_test})
+  endif ()
+  set (last_test "CPP_ex_${example}")
+endforeach ()
+#the following dependencies are handled by the order of the files
 #  SET_TESTS_PROPERTIES(CPP_ex_h5tutr_crtatt PROPERTIES DEPENDS CPP_ex_h5tutr_crtdat)
 #  SET_TESTS_PROPERTIES(CPP_ex_h5tutr_rdwt PROPERTIES DEPENDS CPP_ex_h5tutr_crtdat)
 #  SET_TESTS_PROPERTIES(CPP_ex_h5tutr_crtgrpd PROPERTIES DEPENDS CPP_ex_h5tutr_crtgrpar)
-  
-\ No newline at end of file
diff --git a/c++/examples/Makefile.am b/c++/examples/Makefile.am
index 5bb8d59..b97b5d1 100644
--- a/c++/examples/Makefile.am
+++ b/c++/examples/Makefile.am
@@ -1,16 +1,13 @@
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 ##
 ## Makefile.am
 ## Run automake to generate a Makefile.in from this file.
@@ -42,8 +39,8 @@ INSTALL_FILES=create.cpp readdata.cpp writedata.cpp compound.cpp \
 # Some of the examples depend on files created by running other examples
 readdata.chkexe_: create.chkexe_
 chunks.chkexe_: extend_ds.chkexe_
-h5tutr_rdwt.chkexe_: h5tutrcrtdat.chkexe
-h5tutrcrtatt.chkexe_: h5tutrcrtdat.chkexe
+h5tutr_rdwt.chkexe_: h5tutr_crtdat.chkexe
+h5tutrcrtatt.chkexe_: h5tutr_crtdat.chkexe
 h5tutr_crtgrpd.chkexe_: h5tutr_crtgrpar.chkexe
 
 # Tell conclude.am that these are C++ tests.
@@ -51,7 +48,8 @@ CXX_API=yes
 
 # Where to install examples
 # Note: no '/' after DESTDIR.  Explanation in commence.am
-EXAMPLEDIR=${DESTDIR}$(exec_prefix)/share/hdf5_examples/c++
+EXAMPLEDIR=${DESTDIR}$(examplesdir)/c++
+EXAMPLETOPDIR=${DESTDIR}$(examplesdir)
 
 # How to build programs using h5c++
 $(EXTRA_PROG): $(H5CPP)
diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in
deleted file mode 100644
index 150f830..0000000
--- a/c++/examples/Makefile.in
+++ /dev/null
@@ -1,1322 +0,0 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-#
-# HDF5 Library Examples Makefile(.in)
-#
-
-# We can't tell automake about example programs, because they need to be
-# built using h5cc (or h5fc, etc.) instead of the standard compilers.
-# This creates some extra work for us.
-VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-DIST_COMMON = $(top_srcdir)/config/commence.am \
-	$(top_srcdir)/config/examples.am \
-	$(top_srcdir)/config/conclude.am $(srcdir)/Makefile.in \
-	$(srcdir)/Makefile.am $(top_srcdir)/bin/mkinstalldirs \
-	$(srcdir)/run-c++-ex.sh.in $(srcdir)/testh5c++.sh.in \
-	$(top_srcdir)/bin/test-driver
-TESTS = $(TEST_SCRIPT)
-subdir = c++/examples
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/aclocal_cxx.m4 \
-	$(top_srcdir)/m4/aclocal_fc.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/src/H5config.h
-CONFIG_CLEAN_FILES = run-c++-ex.sh testh5c++.sh
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__tty_colors_dummy = \
-  mgn= red= grn= lgn= blu= brg= std=; \
-  am__color_tests=no
-am__tty_colors = { \
-  $(am__tty_colors_dummy); \
-  if test "X$(AM_COLOR_TESTS)" = Xno; then \
-    am__color_tests=no; \
-  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
-    am__color_tests=yes; \
-  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
-    am__color_tests=yes; \
-  fi; \
-  if test $$am__color_tests = yes; then \
-    red='[0;31m'; \
-    grn='[0;32m'; \
-    lgn='[1;32m'; \
-    blu='[1;34m'; \
-    mgn='[0;35m'; \
-    brg='[1m'; \
-    std='[m'; \
-  fi; \
-}
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__recheck_rx = ^[ 	]*:recheck:[ 	]*
-am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
-am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
-# A command that, given a newline-separated list of test names on the
-# standard input, print the name of the tests that are to be re-run
-# upon "make recheck".
-am__list_recheck_tests = $(AWK) '{ \
-  recheck = 1; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-        { \
-          if ((getline line2 < ($$0 ".log")) < 0) \
-	    recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
-        { \
-          recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
-        { \
-          break; \
-        } \
-    }; \
-  if (recheck) \
-    print $$0; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# A command that, given a newline-separated list of test names on the
-# standard input, create the global log from their .trs and .log files.
-am__create_global_log = $(AWK) ' \
-function fatal(msg) \
-{ \
-  print "fatal: making $@: " msg | "cat >&2"; \
-  exit 1; \
-} \
-function rst_section(header) \
-{ \
-  print header; \
-  len = length(header); \
-  for (i = 1; i <= len; i = i + 1) \
-    printf "="; \
-  printf "\n\n"; \
-} \
-{ \
-  copy_in_global_log = 1; \
-  global_test_result = "RUN"; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-         fatal("failed to read from " $$0 ".trs"); \
-      if (line ~ /$(am__global_test_result_rx)/) \
-        { \
-          sub("$(am__global_test_result_rx)", "", line); \
-          sub("[ 	]*$$", "", line); \
-          global_test_result = line; \
-        } \
-      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
-        copy_in_global_log = 0; \
-    }; \
-  if (copy_in_global_log) \
-    { \
-      rst_section(global_test_result ": " $$0); \
-      while ((rc = (getline line < ($$0 ".log"))) != 0) \
-      { \
-        if (rc < 0) \
-          fatal("failed to read from " $$0 ".log"); \
-        print line; \
-      }; \
-      printf "\n"; \
-    }; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# Restructured Text title.
-am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
-# Solaris 10 'make', and several other traditional 'make' implementations,
-# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
-# by disabling -e (using the XSI extension "set +e") if it's set.
-am__sh_e_setup = case $$- in *e*) set +e;; esac
-# Default flags passed to test drivers.
-am__common_driver_flags = \
-  --color-tests "$$am__color_tests" \
-  --enable-hard-errors "$$am__enable_hard_errors" \
-  --expect-failure "$$am__expect_failure"
-# To be inserted before the command running the test.  Creates the
-# directory for the log if needed.  Stores in $dir the directory
-# containing $f, in $tst the test, in $log the log.  Executes the
-# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
-# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
-# will run the test scripts (or their associated LOG_COMPILER, if
-# thy have one).
-am__check_pre = \
-$(am__sh_e_setup);					\
-$(am__vpath_adj_setup) $(am__vpath_adj)			\
-$(am__tty_colors);					\
-srcdir=$(srcdir); export srcdir;			\
-case "$@" in						\
-  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
-    *) am__odir=.;; 					\
-esac;							\
-test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
-  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
-if test -f "./$$f"; then dir=./;			\
-elif test -f "$$f"; then dir=;				\
-else dir="$(srcdir)/"; fi;				\
-tst=$$dir$$f; log='$@'; 				\
-if test -n '$(DISABLE_HARD_ERRORS)'; then		\
-  am__enable_hard_errors=no; 				\
-else							\
-  am__enable_hard_errors=yes; 				\
-fi; 							\
-case " $(XFAIL_TESTS) " in				\
-  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
-    am__expect_failure=yes;;				\
-  *)							\
-    am__expect_failure=no;;				\
-esac; 							\
-$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
-# A shell command to get the names of the tests scripts with any registered
-# extension removed (i.e., equivalently, the names of the test logs, with
-# the '.log' extension removed).  The result is saved in the shell variable
-# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
-# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
-# since that might cause problem with VPATH rewrites for suffix-less tests.
-# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
-am__set_TESTS_bases = \
-  bases='$(TEST_LOGS)'; \
-  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
-  bases=`echo $$bases`
-RECHECK_LOGS = $(TEST_LOGS)
-AM_RECURSIVE_TARGETS = check recheck
-TEST_SUITE_LOG = test-suite.log
-am__test_logs1 = $(TESTS:=.log)
-am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
-TEST_LOGS = $(am__test_logs2:.sh.log=.log)
-SH_LOG_DRIVER = $(SHELL) $(top_srcdir)/bin/test-driver
-SH_LOG_COMPILE = $(SH_LOG_COMPILER) $(AM_SH_LOG_FLAGS) $(SH_LOG_FLAGS)
-am__set_b = \
-  case '$@' in \
-    */*) \
-      case '$*' in \
-        */*) b='$*';; \
-          *) b=`echo '$@' | sed 's/\.log$$//'`; \
-       esac;; \
-    *) \
-      b='$*';; \
-  esac
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
-AMTAR = @AMTAR@
-
-# H5_CFLAGS holds flags that should be used when building hdf5,
-# but which should not be exported to h5cc for building other programs.
-# AM_CFLAGS is an automake construct which should be used by Makefiles 
-# instead of CFLAGS, as CFLAGS is reserved solely for the user to define.
-# This applies to FCFLAGS, CXXFLAGS, CPPFLAGS, and LDFLAGS as well.
-AM_CFLAGS = @AM_CFLAGS@ @H5_CFLAGS@
-AM_CPPFLAGS = @AM_CPPFLAGS@ @H5_CPPFLAGS@
-AM_CXXFLAGS = @AM_CXXFLAGS@ @H5_CXXFLAGS@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@
-AM_LDFLAGS = @AM_LDFLAGS@ @H5_LDFLAGS@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BYTESEX = @BYTESEX@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CC_VERSION = @CC_VERSION@
-CFLAGS = @CFLAGS@
-CLEARFILEBUF = @CLEARFILEBUF@
-CODESTACK = @CODESTACK@
-CONFIG_DATE = @CONFIG_DATE@
-CONFIG_MODE = @CONFIG_MODE@
-CONFIG_USER = @CONFIG_USER@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CXX_VERSION = @CXX_VERSION@
-CYGPATH_W = @CYGPATH_W@
-DEBUG_PKG = @DEBUG_PKG@
-DEFAULT_API_VERSION = @DEFAULT_API_VERSION@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
-DIRECT_VFD = @DIRECT_VFD@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-EXTERNAL_FILTERS = @EXTERNAL_FILTERS@
-
-# Make sure that these variables are exported to the Makefiles
-F9XMODEXT = @F9XMODEXT@
-F9XMODFLAG = @F9XMODFLAG@
-F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
-FC = @FC@
-FC2003 = @FC2003@
-FCFLAGS = @FCFLAGS@
-FCFLAGS_f90 = @FCFLAGS_f90@
-FCLIBS = @FCLIBS@
-FC_VERSION = @FC_VERSION@
-FGREP = @FGREP@
-FSEARCH_DIRS = @FSEARCH_DIRS@
-GREP = @GREP@
-H5_CFLAGS = @H5_CFLAGS@
-H5_CPPFLAGS = @H5_CPPFLAGS@
-H5_CXXFLAGS = @H5_CXXFLAGS@
-H5_CXX_SHARED = @H5_CXX_SHARED@
-H5_FCFLAGS = @H5_FCFLAGS@
-H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@
-H5_LDFLAGS = @H5_LDFLAGS@
-H5_LONE_COLON = @H5_LONE_COLON@
-H5_VERSION = @H5_VERSION@
-HADDR_T = @HADDR_T@
-HAVE_DMALLOC = @HAVE_DMALLOC@
-HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@
-HAVE_PTHREAD = @HAVE_PTHREAD@
-HDF5_HL = @HDF5_HL@
-HDF5_INTERFACES = @HDF5_INTERFACES@
-HDF_CXX = @HDF_CXX@
-HDF_FORTRAN = @HDF_FORTRAN@
-HDF_FORTRAN2003 = @HDF_FORTRAN2003@
-HID_T = @HID_T@
-HL = @HL@
-HL_FOR = @HL_FOR@
-HSIZE_T = @HSIZE_T@
-HSSIZE_T = @HSSIZE_T@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTRUMENT = @INSTRUMENT@
-INSTRUMENT_LIBRARY = @INSTRUMENT_LIBRARY@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LL_PATH = @LL_PATH@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_STATIC_EXEC = @LT_STATIC_EXEC@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MPE = @MPE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJECT_NAMELEN_DEFAULT_F = @OBJECT_NAMELEN_DEFAULT_F@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PARALLEL = @PARALLEL@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-RANLIB = @RANLIB@
-ROOT = @ROOT@
-RUNPARALLEL = @RUNPARALLEL@
-RUNSERIAL = @RUNSERIAL@
-R_INTEGER = @R_INTEGER@
-R_LARGE = @R_LARGE@
-SEARCH = @SEARCH@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SIZE_T = @SIZE_T@
-STATIC_EXEC = @STATIC_EXEC@
-STATIC_SHARED = @STATIC_SHARED@
-STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@
-STRIP = @STRIP@
-TESTPARALLEL = @TESTPARALLEL@
-THREADSAFE = @THREADSAFE@
-TIME = @TIME@
-TR = @TR@
-TRACE_API = @TRACE_API@
-UNAME_INFO = @UNAME_INFO@
-USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
-USE_FILTER_SZIP = @USE_FILTER_SZIP@
-USINGMEMCHECKER = @USINGMEMCHECKER@
-VERSION = @VERSION@
-WORDS_BIGENDIAN = @WORDS_BIGENDIAN@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_FC = @ac_ct_FC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-
-# Install directories that automake doesn't know about
-docdir = $(exec_prefix)/doc
-dvidir = @dvidir@
-enable_shared = @enable_shared@
-enable_static = @enable_static@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-
-# Shell commands used in Makefiles
-RM = rm -f
-CP = cp
-
-# Some machines need a command to run executables; this is that command
-# so that our tests will run.
-# We use RUNEXEC instead of RUNSERIAL directly because it may be that
-# some tests need to be run with a different command.  Older versions
-# of the makefiles used the command
-# $(LIBTOOL) --mode=execute
-# in some directories, for instance.
-RUNEXEC = $(RUNSERIAL)
-
-# Libraries to link to while building
-LIBHDF5 = $(top_builddir)/src/libhdf5.la
-LIBH5TEST = $(top_builddir)/test/libh5test.la
-LIBH5F = $(top_builddir)/fortran/src/libhdf5_fortran.la
-LIBH5FTEST = $(top_builddir)/fortran/test/libh5test_fortran.la
-LIBH5CPP = $(top_builddir)/c++/src/libhdf5_cpp.la
-LIBH5TOOLS = $(top_builddir)/tools/lib/libh5tools.la
-LIBH5_HL = $(top_builddir)/hl/src/libhdf5_hl.la
-LIBH5F_HL = $(top_builddir)/hl/fortran/src/libhdf5hl_fortran.la
-LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
-
-# Note that in svn revision 19400 the '/' after DESTDIR in H5* variables below  
-# has been removed. According to the official description of DESTDIR by Gnu at 
-# http://www.gnu.org/prep/standards/html_node/DESTDIR.html, DESTDIR is 
-# prepended to the normal and complete install path that it precedes for the 
-# purpose of installing in a temporary directory which is useful for building 
-# rpms and other packages.  The '/' after ${DESTDIR} will be followed by another 
-# '/' at the beginning of the normal install path.  When DESTDIR is empty the  
-# path then begins with '//', which is incorrect and causes problems at least for 
-# Cygwin.   
-
-# Scripts used to build examples
-# If only shared libraries have been installed, have h5cc build examples with
-# shared libraries instead of static libraries
-H5CC = ${DESTDIR}$(bindir)/h5cc
-H5CC_PP = ${DESTDIR}$(bindir)/h5pcc
-H5FC = ${DESTDIR}$(bindir)/h5fc
-H5FC_PP = ${DESTDIR}$(bindir)/h5pfc
-H5CPP = ${DESTDIR}$(bindir)/h5c++
-ACLOCAL_AMFLAGS = "-I m4"
-
-# The trace script; this is used on source files from the C library to
-# insert tracing macros.
-TRACE = perl $(top_srcdir)/bin/trace
-
-# .chkexe files are used to mark tests that have run successfully.
-# .chklog files are output from those tests.
-# *.clog and *.clog2 are from the MPE option.
-CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5
-INSTALL_SCRIPT_FILES = run-c++-ex.sh
-
-# These are the programs that 'make all' or 'make prog' will build and
-# which 'make check' will run.  List them in the order they should be run.
-EXAMPLE_PROG = create readdata writedata compound extend_ds chunks h5group \
-	     h5tutr_cmprss h5tutr_crtatt h5tutr_crtdat h5tutr_crtgrpar \
-	     h5tutr_crtgrp h5tutr_crtgrpd h5tutr_extend h5tutr_rdwt \
-	     h5tutr_subset
-
-TEST_SCRIPT = testh5c++.sh
-TEST_EXAMPLES_SCRIPT = $(INSTALL_SCRIPT_FILES)
-
-# These are the example files to be installed
-INSTALL_FILES = create.cpp readdata.cpp writedata.cpp compound.cpp \
-              extend_ds.cpp chunks.cpp h5group.cpp \
-	      h5tutr_cmprss.cpp h5tutr_crtatt.cpp h5tutr_crtdat.cpp \
-	      h5tutr_crtgrpar.cpp h5tutr_crtgrp.cpp h5tutr_crtgrpd.cpp \
-	      h5tutr_extend.cpp h5tutr_rdwt.cpp h5tutr_subset.cpp
-
-
-# Tell conclude.am that these are C++ tests.
-CXX_API = yes
-
-# Where to install examples
-# Note: no '/' after DESTDIR.  Explanation in commence.am
-EXAMPLEDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples/c++
-
-# Assume that all tests in this directory are examples, and tell
-# conclude.am when to build them.
-EXTRA_PROG = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA)
-
-# We need to tell automake what to clean
-MOSTLYCLEANFILES = *.raw *.meta *.o
-CLEANFILES = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA)
-
-# Automake needs to be taught how to build lib, progs, and tests targets.
-# These will be filled in automatically for the most part (e.g.,
-# lib_LIBRARIES are built for lib target), but EXTRA_LIB, EXTRA_PROG, and
-# EXTRA_TEST variables are supplied to allow the user to force targets to
-# be built at certain times. 
-LIB = $(lib_LIBRARIES) $(lib_LTLIBRARIES) $(noinst_LIBRARIES)                 \
-      $(noinst_LTLIBRARIES) $(check_LIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LIB)
-
-PROGS = $(bin_PROGRAMS) $(bin_SCRIPTS) $(noinst_PROGRAMS) $(noinst_SCRIPTS)   \
-        $(EXTRA_PROG)
-
-chk_TESTS = $(check_PROGRAMS) $(check_SCRIPTS) $(EXTRA_TEST) 
-TEST_EXTENSIONS = .sh
-SH_LOG_COMPILER = $(SHELL)
-AM_SH_LOG_FLAGS = 
-TEST_PROG_CHKEXE = $(TEST_PROG:=.chkexe_)
-TEST_PROG_PARA_CHKEXE = $(TEST_PROG_PARA:=.chkexe_)
-TEST_SCRIPT_CHKSH = $(TEST_SCRIPT:=.chkexe_)
-TEST_SCRIPT_PARA_CHKSH = $(TEST_SCRIPT_PARA:=.chkexe_)
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .log .sh .sh$(EXEEXT) .trs
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/examples.am $(top_srcdir)/config/conclude.am $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign c++/examples/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign c++/examples/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-$(top_srcdir)/config/commence.am $(top_srcdir)/config/examples.am $(top_srcdir)/config/conclude.am:
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-run-c++-ex.sh: $(top_builddir)/config.status $(srcdir)/run-c++-ex.sh.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-testh5c++.sh: $(top_builddir)/config.status $(srcdir)/testh5c++.sh.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-# Recover from deleted '.trs' file; this should ensure that
-# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
-# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
-# to avoid problems with "make -n".
-.log.trs:
-	rm -f $< $@
-	$(MAKE) $(AM_MAKEFLAGS) $<
-
-# Leading 'am--fnord' is there to ensure the list of targets does not
-# expand to empty, as could happen e.g. with make check TESTS=''.
-am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
-am--force-recheck:
-	@:
-
-$(TEST_SUITE_LOG): $(TEST_LOGS)
-	@$(am__set_TESTS_bases); \
-	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
-	redo_bases=`for i in $$bases; do \
-	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
-	            done`; \
-	if test -n "$$redo_bases"; then \
-	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
-	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
-	  if $(am__make_dryrun); then :; else \
-	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
-	  fi; \
-	fi; \
-	if test -n "$$am__remaking_logs"; then \
-	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
-	       "recursion detected" >&2; \
-	else \
-	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
-	fi; \
-	if $(am__make_dryrun); then :; else \
-	  st=0;  \
-	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
-	  for i in $$redo_bases; do \
-	    test -f $$i.trs && test -r $$i.trs \
-	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
-	    test -f $$i.log && test -r $$i.log \
-	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
-	  done; \
-	  test $$st -eq 0 || exit 1; \
-	fi
-	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
-	ws='[ 	]'; \
-	results=`for b in $$bases; do echo $$b.trs; done`; \
-	test -n "$$results" || results=/dev/null; \
-	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
-	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
-	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
-	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
-	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
-	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
-	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
-	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
-	  success=true; \
-	else \
-	  success=false; \
-	fi; \
-	br='==================='; br=$$br$$br$$br$$br; \
-	result_count () \
-	{ \
-	    if test x"$$1" = x"--maybe-color"; then \
-	      maybe_colorize=yes; \
-	    elif test x"$$1" = x"--no-color"; then \
-	      maybe_colorize=no; \
-	    else \
-	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
-	    fi; \
-	    shift; \
-	    desc=$$1 count=$$2; \
-	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
-	      color_start=$$3 color_end=$$std; \
-	    else \
-	      color_start= color_end=; \
-	    fi; \
-	    echo "$${color_start}# $$desc $$count$${color_end}"; \
-	}; \
-	create_testsuite_report () \
-	{ \
-	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
-	  result_count $$1 "PASS: " $$pass  "$$grn"; \
-	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
-	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
-	  result_count $$1 "FAIL: " $$fail  "$$red"; \
-	  result_count $$1 "XPASS:" $$xpass "$$red"; \
-	  result_count $$1 "ERROR:" $$error "$$mgn"; \
-	}; \
-	{								\
-	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
-	    $(am__rst_title);						\
-	  create_testsuite_report --no-color;				\
-	  echo;								\
-	  echo ".. contents:: :depth: 2";				\
-	  echo;								\
-	  for b in $$bases; do echo $$b; done				\
-	    | $(am__create_global_log);					\
-	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
-	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
-	if $$success; then						\
-	  col="$$grn";							\
-	 else								\
-	  col="$$red";							\
-	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
-	fi;								\
-	echo "$${col}$$br$${std}"; 					\
-	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
-	echo "$${col}$$br$${std}"; 					\
-	create_testsuite_report --maybe-color;				\
-	echo "$$col$$br$$std";						\
-	if $$success; then :; else					\
-	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
-	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
-	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
-	  fi;								\
-	  echo "$$col$$br$$std";					\
-	fi;								\
-	$$success || exit 1
-recheck: all 
-	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-	@set +e; $(am__set_TESTS_bases); \
-	bases=`for i in $$bases; do echo $$i; done \
-	         | $(am__list_recheck_tests)` || exit 1; \
-	log_list=`for i in $$bases; do echo $$i.log; done`; \
-	log_list=`echo $$log_list`; \
-	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
-	        am__force_recheck=am--force-recheck \
-	        TEST_LOGS="$$log_list"; \
-	exit $$?
-.sh.log:
-	@p='$<'; \
-	$(am__set_b); \
-	$(am__check_pre) $(SH_LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_SH_LOG_DRIVER_FLAGS) $(SH_LOG_DRIVER_FLAGS) -- $(SH_LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-@am__EXEEXT_TRUE@.sh$(EXEEXT).log:
-@am__EXEEXT_TRUE@	@p='$<'; \
-@am__EXEEXT_TRUE@	$(am__set_b); \
-@am__EXEEXT_TRUE@	$(am__check_pre) $(SH_LOG_DRIVER) --test-name "$$f" \
-@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
-@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_SH_LOG_DRIVER_FLAGS) $(SH_LOG_DRIVER_FLAGS) -- $(SH_LOG_COMPILE) \
-@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
-check: check-am
-all-am: Makefile all-local
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
-	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
-	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
-	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-data-local
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am: installcheck-local
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool \
-	mostlyclean-local
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-local
-
-.MAKE: check-am install-am install-strip
-
-.PHONY: all all-am all-local check check-TESTS check-am clean \
-	clean-generic clean-libtool cscopelist-am ctags-am distclean \
-	distclean-generic distclean-libtool distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-data-local install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installcheck-local installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
-	pdf-am ps ps-am recheck tags-am uninstall uninstall-am \
-	uninstall-local
-
-
-# List all build rules defined by HDF5 Makefiles as "PHONY" targets here.
-# This tells the Makefiles that these targets are not files to be built but
-# commands that should be executed even if a file with the same name already
-# exists.
-.PHONY: build-check-clean build-check-p build-check-s build-lib build-progs \
-        build-tests check-clean check-install check-p check-s check-vfd \
-        install-doc lib progs tests uninstall-doc _exec_check-s _test help
-
-help:
-	@$(top_srcdir)/bin/makehelp
-
-# Some of the examples depend on files created by running other examples
-readdata.chkexe_: create.chkexe_
-chunks.chkexe_: extend_ds.chkexe_
-h5tutr_rdwt.chkexe_: h5tutrcrtdat.chkexe
-h5tutrcrtatt.chkexe_: h5tutrcrtdat.chkexe
-h5tutr_crtgrpd.chkexe_: h5tutr_crtgrpar.chkexe
-
-# How to build programs using h5c++
-$(EXTRA_PROG): $(H5CPP)
-	$(H5CPP) $(H5CCFLAGS) $(CPPFLAGS) -o $@ $(srcdir)/$@.cpp
-
-# List dependencies for each program.  Normally, automake would take
-# care of this for us, but if we tell automake about the programs it
-# will try to build them with the normal C++ compiler, not h5c++.  This is
-# an inelegant way of solving the problem, unfortunately.
-create: $(srcdir)/create.cpp
-readdata: $(srcdir)/readdata.cpp
-writedata: $(srcdir)/writedata.cpp
-compound: $(srcdir)/compound.cpp
-extend_ds: $(srcdir)/extend_ds.cpp
-chunks: $(srcdir)/chunks.cpp
-h5group: $(srcdir)/h5group.cpp
-
-h5tutr_cmprss: $(srcdir)/h5tutr_cmprss.cpp
-h5tutr_crtatt: $(srcdir)/h5tutr_crtatt.cpp
-h5tutr_crtdat: $(srcdir)/h5tutr_crtdat.cpp
-h5tutr_crtgrpar: $(srcdir)/h5tutr_crtgrpar.cpp
-h5tutr_crtgrp: $(srcdir)/h5tutr_crtgrp.cpp
-h5tutr_crtgrpd: $(srcdir)/h5tutr_crtgrpd.cpp
-h5tutr_extend: $(srcdir)/h5tutr_extend.cpp
-h5tutr_rdwt: $(srcdir)/h5tutr_rdwt.cpp
-h5tutr_subset: $(srcdir)/h5tutr_subset.cpp
-
-# How to create EXAMPLEDIR if it doesn't already exist
-$(EXAMPLEDIR):
-	-$(top_srcdir)/bin/mkdirs $@
-$(EXAMPLETOPDIR):
-	-$(top_srcdir)/bin/mkdirs $@
-
-# Install and uninstall rules.  We install the source files, not the
-# example programs themselves.
-install-data-local:
-	@$(MAKE) $(AM_MAKEFLAGS) install-examples
-uninstall-local:
-	@$(MAKE) $(AM_MAKEFLAGS) uninstall-examples
-
-install-examples: $(EXAMPLEDIR) $(INSTALL_FILES) 
-	@for f in X $(INSTALL_FILES); do                                     \
-	  if test $$f != X; then                                             \
-	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);    \
-            chmod a-x $(EXAMPLEDIR)/$$f;                                     \
-	  fi;                                                                \
-	done
-	@for f in X $(INSTALL_SCRIPT_FILES); do                                   \
-	  if test $$f != X; then                                             \
-	    (set -x; $(INSTALL) $$f $(EXAMPLEDIR)/. || exit 1);\
-	  fi;                                                                \
-	done
-	@for f in X $(INSTALL_TOP_FILES); do                       \
-	  if test $$f != X; then                                             \
-	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1); \
-            chmod a-x $(EXAMPLETOPDIR)/$$f;\
-	  fi;                                                                \
-	done
-	@for f in X $(INSTALL_TOP_SCRIPT_FILES); do                       \
-	  if test $$f != X; then                                             \
-	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1); \
-	  fi;                                                                \
-	done
-
-uninstall-examples:
-	@if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then             \
-	  set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_FILES);                \
-	fi
-	@if test -n "$(INSTALL_SCRIPT_FILES)" -a -d $(EXAMPLEDIR); then           \
-	  set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_SCRIPT_FILES);              \
-	fi
-	@if test -n "$(INSTALL_TOP_FILES)" -a -d $(EXAMPLETOPDIR); then    \
-	  set -x; cd $(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_FILES);       \
-	fi
-	@if test -n "$(INSTALL_TOP_SCRIPT_FILES)" -a -d $(EXAMPLETOPDIR); then    \
-	  set -x; cd $(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_SCRIPT_FILES);       \
-	fi
-
-installcheck-local:
-	@if test "$(STATIC_SHARED)" = "static, shared"; then               \
-	  H5CCFLAGS="-shlib" $(MAKE) $(AM_MAKEFLAGS) check;                \
-	  $(MAKE) $(AM_MAKEFLAGS) clean;                                   \
-	  H5CCFLAGS="" $(MAKE) $(AM_MAKEFLAGS) check;                      \
-	elif test "$(STATIC_SHARED)" = "shared"; then                     \
-	  H5CCFLAGS="-shlib" $(MAKE) $(AM_MAKEFLAGS) check;                \
-	else                                                              \
-	  $(MAKE) $(AM_MAKEFLAGS) check;                                   \
-	fi 
-	@if test "$(INSTALL_FILES)" -a $(TEST_EXAMPLES_SCRIPT) -a -d $(EXAMPLEDIR); then \
-	    echo "============================";                                         \
-	    echo "Testing $(TEST_EXAMPLES_SCRIPT)";                                      \
-	    echo "============================";                                         \
-	    (cd $(EXAMPLEDIR);                                                           \
-	     /bin/sh ./$(TEST_EXAMPLES_SCRIPT);)                                                   \
-	fi
-
-# lib/progs/tests targets recurse into subdirectories. build-* targets
-# build files in this directory.
-build-lib: $(LIB)
-build-progs: $(LIB) $(PROGS)
-build-tests: $(LIB) $(PROGS) $(chk_TESTS)
-
-# General rule for recursive building targets.
-# BUILT_SOURCES contain targets that need to be built before anything else
-# in the directory (e.g., for Fortran type detection)
-lib progs tests check-s check-p :: $(BUILT_SOURCES)
-	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
-	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X && test $$d != .; then                           \
-	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
-	    fi;                                                               \
-	done
-
-# General rule for recursive cleaning targets.  Like the rule above,
-# but doesn't require building BUILT_SOURCES.
-check-clean ::
-	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
-	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X && test $$d != .; then                           \
-	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
-	    fi;                                                               \
-	done
-
-# Tell Automake to build tests when the user types `make all' (this is
-# not its default behavior).  Also build EXTRA_LIB and EXTRA_PROG since
-# Automake won't build them automatically, either.
-all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(chk_TESTS)
-
-# make install-doc doesn't do anything outside of doc directory, but
-# Makefiles should recognize it.
-# UPDATE: docs no longer reside in this build tree, so this target
-# is depreciated.
-install-doc uninstall-doc:
-	@echo "Nothing to be done."
-
-# clean up files generated by tests so they can be re-run.
-build-check-clean:
-	$(RM) -rf $(CHECK_CLEANFILES)
-
-# run check-clean whenever mostlyclean is run
-mostlyclean-local: build-check-clean
-
-# check-install is just a synonym for installcheck
-check-install: installcheck
-
-# Run each test in order, passing $(TEST_FLAGS) to the program.
-# Since tests are done in a shell loop, "make -i" does apply inside it.
-# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
-# The timestamps give a rough idea how much time the tests use.
-#
-# Note that targets in chk_TESTS (defined above) will be built when the user
-# types 'make tests' or 'make check', but only programs in TEST_PROG,
-# TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
-check-TESTS: test
-
-test _test:
-	@$(MAKE) build-check-s
-	@$(MAKE) build-check-p
-
-# Actual execution of check-s.
-build-check-s: $(LIB) $(PROGS) $(chk_TESTS)
-	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
-	   echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
-	fi
-	@$(MAKE) $(AM_MAKEFLAGS) _exec_check-s
-	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
-	    echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
-	fi
-
-_exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH)
-
-# The dummy.chkexe here prevents the target from being
-# empty if there are no tests in the current directory.
-# $${log} is the log file.
-# $${tname} is the name of test.
-$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
-	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \
-	   tname=$(@:.chkexe_=)$(EXEEXT);\
-	   log=$(@:.chkexe_=.chklog); \
-	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \
-	      echo "No need to test $${tname} again."; \
-	   else \
-	      echo "============================" > $${log}; \
-	      if test "X$(FORTRAN_API)" = "Xyes"; then \
-	         echo "Fortran API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "Fortran API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(CXX_API)" = "Xyes"; then \
-	         echo "C++ API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "C++ API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log};\
-	      else \
-	         echo "Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "$(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      fi; \
-	      echo "============================" >> $${log}; \
-	      srcdir="$(srcdir)" \
-	         $(TIME) $(RUNEXEC) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \
-	         && touch $(@:.chkexe_=.chkexe) || \
-	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	         (cat $${log} && false) || exit 1; \
-	      echo "" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
-	      echo "============================" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
-	      cat $${log}; \
-	   fi; \
-	fi
-
-# The dummysh.chkexe here prevents the target from being
-# empty if there are no tests in the current directory.
-# $${log} is the log file.
-# $${tname} is the name of test.
-$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
-	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummysh.chkexe_"; then \
-	   cmd=$(@:.chkexe_=);\
-	   tname=`basename $$cmd`;\
-	   chkname=`basename $(@:.chkexe_=.chkexe)`;\
-	   log=`basename $(@:.chkexe_=.chklog)`; \
-	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer $${chkname} $$cmd $(SCRIPT_DEPEND); then \
-	      echo "No need to test $${tname} again."; \
-	   else \
-	      echo "============================" > $${log}; \
-	      if test "X$(FORTRAN_API)" = "Xyes"; then \
-	         echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(CXX_API)" = "Xyes"; then \
-	         echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      else \
-	         echo "Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      fi; \
-	      echo "============================" >> $${log}; \
-	      RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
-	      srcdir="$(srcdir)" \
-	         $(TIME) $(SHELL) $$cmd $(TEST_FLAGS) >> $${log} 2>&1 \
-	         && touch $${chkname} || \
-	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	         (cat $${log} && false) || exit 1; \
-	      echo "" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
-	      echo "============================" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
-	      cat $${log}; \
-	   fi; \
-	   echo "============================"; \
-	fi
-
-# Actual execution of check-p.
-build-check-p: $(LIB) $(PROGS) $(chk_TESTS)
-	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
-	   echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
-	fi
-	@if test -n "$(TEST_PROG_PARA)"; then                                \
-	    echo "**** Hint ****";                                            \
-	    echo "Parallel test files reside in the current directory"        \
-	         "by default.";                                               \
-	    echo "Set HDF5_PARAPREFIX to use another directory. E.g.,";       \
-	    echo "    HDF5_PARAPREFIX=/PFS/user/me";                          \
-	    echo "    export HDF5_PARAPREFIX";                                \
-	    echo "    make check";                                            \
-	    echo "**** end of Hint ****";                                     \
-	fi
-	@for test in $(TEST_PROG_PARA) dummy; do                             \
-	   if test $$test != dummy; then                                      \
-	      $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ \
-	      RUNEXEC="$(RUNPARALLEL)" || exit 1; \
-	   fi;                                                                \
-	done
-	@for test in $(TEST_SCRIPT_PARA) dummy; do                           \
-	  if test $$test != dummy; then                                      \
-	    $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ || exit 1; \
-	  fi;                                                                 \
-	done
-	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
-	    echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
-	fi
-
-# Run test with different Virtual File Driver
-check-vfd: $(LIB) $(PROGS) $(chk_TESTS)
-	@for vfd in $(VFD_LIST) dummy; do                                     \
-	    if test $$vfd != dummy; then                                      \
-	        echo "============================";                          \
-	        echo "Testing Virtual File Driver $$vfd";                     \
-	        echo "============================";                          \
-	        $(MAKE) $(AM_MAKEFLAGS) check-clean || exit 1;                \
-	        HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check || exit 1;    \
-	    fi;                                                               \
-	done
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/c++/examples/chunks.cpp b/c++/examples/chunks.cpp
index 286934a..cc5d7c9 100644
--- a/c++/examples/chunks.cpp
+++ b/c++/examples/chunks.cpp
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
@@ -18,223 +15,203 @@
  *   We will read from the file created by extend.cpp
  */
 
-#ifdef OLD_HEADER_FILENAME
-#include <iostream.h>
-#else
 #include <iostream>
-#endif
-#include <string>
-
-#ifndef H5_NO_NAMESPACE
-#ifndef H5_NO_STD
-    using std::cout;
-    using std::endl;
-#endif  // H5_NO_STD
-#endif
+using std::cout;
+using std::endl;
 
+#include <string>
 #include "H5Cpp.h"
+using namespace H5;
 
-#ifndef H5_NO_NAMESPACE
-    using namespace H5;
-#endif
-
-const H5std_string FILE_NAME( "SDSextendible.h5" );
-const H5std_string DATASET_NAME( "ExtendibleArray" );
-const int      NX = 10;
-const int      NY = 5;
-const int      RANK = 2;
-const int      RANKC = 1;
+const H5std_string FILE_NAME("SDSextendible.h5");
+const H5std_string DATASET_NAME("ExtendibleArray");
+const int          NX    = 10;
+const int          NY    = 5;
+const int          RANK  = 2;
+const int          RANKC = 1;
 
-int main (void)
+int
+main(void)
 {
-    hsize_t	i, j;
+    hsize_t i, j;
 
     // Try block to detect exceptions raised by any of the calls inside it
-    try
-    {
-	/*
-	 * Turn off the auto-printing when failure occurs so that we can
-	 * handle the errors appropriately
-	 */
-	Exception::dontPrint();
-
-	/*
-	 * Open the file and the dataset.
-	 */
-	H5File file( FILE_NAME, H5F_ACC_RDONLY );
-	DataSet dataset = file.openDataSet( DATASET_NAME );
-
-	/*
-	 * Get filespace for rank and dimension
-	 */
-	DataSpace filespace = dataset.getSpace();
-
-	/*
-	 * Get number of dimensions in the file dataspace
-	 */
-	int rank = filespace.getSimpleExtentNdims();
-
-	/*
-	 * Get and print the dimension sizes of the file dataspace
-	 */
-	hsize_t dims[2]; 	// dataset dimensions
-	rank = filespace.getSimpleExtentDims( dims );
-	cout << "dataset rank = " << rank << ", dimensions "
-	     << (unsigned long)(dims[0]) << " x "
-	     << (unsigned long)(dims[1]) << endl;
-
-	/*
-	 * Define the memory space to read dataset.
-	 */
-	DataSpace mspace1(RANK, dims);
-
-	/*
-	 * Read dataset back and display.
-	 */
-	int data_out[NX][NY];  // buffer for dataset to be read
-	dataset.read( data_out, PredType::NATIVE_INT, mspace1, filespace );
-
-	cout << "\n";
-	cout << "Dataset: \n";
-	for (j = 0; j < dims[0]; j++)
-	{
-	    for (i = 0; i < dims[1]; i++)
-		cout << data_out[j][i] << " ";
-	    cout << endl;
-	}
-
-	/*
-	 *	    dataset rank 2, dimensions 10 x 5
-	 *	    chunk rank 2, dimensions 2 x 5
-
-	 *	    Dataset:
-	 *	    1 1 1 3 3
-	 *	    1 1 1 3 3
-	 *	    1 1 1 0 0
-	 *	    2 0 0 0 0
-	 *	    2 0 0 0 0
-	 *	    2 0 0 0 0
-	 *	    2 0 0 0 0
-	 *	    2 0 0 0 0
-	 *	    2 0 0 0 0
-	 *	    2 0 0 0 0
-	 */
-
-	/*
-	 * Read the third column from the dataset.
-	 * First define memory dataspace, then define hyperslab
-	 * and read it into column array.
-	 */
-	hsize_t col_dims[1];
-	col_dims[0] = 10;
-	DataSpace mspace2( RANKC, col_dims );
-
-	/*
-	 * Define the column (hyperslab) to read.
-	 */
-	hsize_t offset[2] = { 0, 2 };
-	hsize_t  count[2] = { 10, 1 };
-	int column[10];  // buffer for column to be read
-
-	/*
-	 * Define hyperslab and read.
-	 */
-	filespace.selectHyperslab( H5S_SELECT_SET, count, offset );
-	dataset.read( column, PredType::NATIVE_INT, mspace2, filespace );
-
-	cout << endl;
-	cout << "Third column: " << endl;
-	for (i = 0; i < 10; i++)
-	    cout << column[i] << endl;
-
-	/*
-	 *	    Third column:
-	 *	    1
-	 *	    1
-	 *	    1
-	 *	    0
-	 *	    0
-	 *	    0
-	 *	    0
-	 *	    0
-	 *	    0
-	 *	    0
-	 */
-
-	/*
-	 * Get creation properties list.
-	 */
-	DSetCreatPropList cparms = dataset.getCreatePlist();
-
-	/*
-	 * Check if dataset is chunked.
-	 */
-	hsize_t chunk_dims[2];
-	int     rank_chunk;
-	if( H5D_CHUNKED == cparms.getLayout() )
-	{
-	    /*
-	     * Get chunking information: rank and dimensions
-	     */
-	    rank_chunk = cparms.getChunk( 2, chunk_dims);
-	    cout << "chunk rank " << rank_chunk << "dimensions "
-		<< (unsigned long)(chunk_dims[0]) << " x "
-		<< (unsigned long)(chunk_dims[1]) << endl;
-
-	    /*
-	     * Define the memory space to read a chunk.
-	     */
-	    DataSpace mspace3( rank_chunk, chunk_dims );
-
-	    /*
-	     * Define chunk in the file (hyperslab) to read.
-	     */
-	    offset[0] = 2;
-	    offset[1] = 0;
-	    count[0]  = chunk_dims[0];
-	    count[1]  = chunk_dims[1];
-	    filespace.selectHyperslab( H5S_SELECT_SET, count, offset );
-
-	    /*
-	     * Read chunk back and display.
-	     */
-	    int chunk_out[2][5];   // buffer for chunk to be read
-	    dataset.read( chunk_out, PredType::NATIVE_INT, mspace3, filespace );
-	    cout << endl;
-	    cout << "Chunk:" << endl;
-	    for (j = 0; j < chunk_dims[0]; j++)
-	    {
-		for (i = 0; i < chunk_dims[1]; i++)
-		    cout << chunk_out[j][i] << " ";
-		cout << endl;
-	    }
-	    /*
-	     *	 Chunk:
-	     *	 1 1 1 0 0
-	     *	 2 0 0 0 0
-	     */
-	}
-    }  // end of try block
+    try {
+        /*
+         * Turn off the auto-printing when failure occurs so that we can
+         * handle the errors appropriately
+         */
+        Exception::dontPrint();
+
+        /*
+         * Open the file and the dataset.
+         */
+        H5File  file(FILE_NAME, H5F_ACC_RDONLY);
+        DataSet dataset = file.openDataSet(DATASET_NAME);
+
+        /*
+         * Get filespace for rank and dimension
+         */
+        DataSpace filespace = dataset.getSpace();
+
+        /*
+         * Get number of dimensions in the file dataspace
+         */
+        int rank = filespace.getSimpleExtentNdims();
+
+        /*
+         * Get and print the dimension sizes of the file dataspace
+         */
+        hsize_t dims[2]; // dataset dimensions
+        rank = filespace.getSimpleExtentDims(dims);
+        cout << "dataset rank = " << rank << ", dimensions " << (unsigned long)(dims[0]) << " x "
+             << (unsigned long)(dims[1]) << endl;
+
+        /*
+         * Define the memory space to read dataset.
+         */
+        DataSpace mspace1(RANK, dims);
+
+        /*
+         * Read dataset back and display.
+         */
+        int data_out[NX][NY]; // buffer for dataset to be read
+        dataset.read(data_out, PredType::NATIVE_INT, mspace1, filespace);
+
+        cout << "\n";
+        cout << "Dataset: \n";
+        for (j = 0; j < dims[0]; j++) {
+            for (i = 0; i < dims[1]; i++)
+                cout << data_out[j][i] << " ";
+            cout << endl;
+        }
+
+        /*
+         *          dataset rank 2, dimensions 10 x 5
+         *          chunk rank 2, dimensions 2 x 5
+
+         *          Dataset:
+         *          1 1 1 3 3
+         *          1 1 1 3 3
+         *          1 1 1 0 0
+         *          2 0 0 0 0
+         *          2 0 0 0 0
+         *          2 0 0 0 0
+         *          2 0 0 0 0
+         *          2 0 0 0 0
+         *          2 0 0 0 0
+         *          2 0 0 0 0
+         */
+
+        /*
+         * Read the third column from the dataset.
+         * First define memory dataspace, then define hyperslab
+         * and read it into column array.
+         */
+        hsize_t col_dims[1];
+        col_dims[0] = 10;
+        DataSpace mspace2(RANKC, col_dims);
+
+        /*
+         * Define the column (hyperslab) to read.
+         */
+        hsize_t offset[2] = {0, 2};
+        hsize_t count[2]  = {10, 1};
+        int     column[10]; // buffer for column to be read
+
+        /*
+         * Define hyperslab and read.
+         */
+        filespace.selectHyperslab(H5S_SELECT_SET, count, offset);
+        dataset.read(column, PredType::NATIVE_INT, mspace2, filespace);
+
+        cout << endl;
+        cout << "Third column: " << endl;
+        for (i = 0; i < 10; i++)
+            cout << column[i] << endl;
+
+        /*
+         *          Third column:
+         *          1
+         *          1
+         *          1
+         *          0
+         *          0
+         *          0
+         *          0
+         *          0
+         *          0
+         *          0
+         */
+
+        /*
+         * Get creation properties list.
+         */
+        DSetCreatPropList cparms = dataset.getCreatePlist();
+
+        /*
+         * Check if dataset is chunked.
+         */
+        hsize_t chunk_dims[2];
+        int     rank_chunk;
+        if (H5D_CHUNKED == cparms.getLayout()) {
+            /*
+             * Get chunking information: rank and dimensions
+             */
+            rank_chunk = cparms.getChunk(2, chunk_dims);
+            cout << "chunk rank " << rank_chunk << "dimensions " << (unsigned long)(chunk_dims[0]) << " x "
+                 << (unsigned long)(chunk_dims[1]) << endl;
+
+            /*
+             * Define the memory space to read a chunk.
+             */
+            DataSpace mspace3(rank_chunk, chunk_dims);
+
+            /*
+             * Define chunk in the file (hyperslab) to read.
+             */
+            offset[0] = 2;
+            offset[1] = 0;
+            count[0]  = chunk_dims[0];
+            count[1]  = chunk_dims[1];
+            filespace.selectHyperslab(H5S_SELECT_SET, count, offset);
+
+            /*
+             * Read chunk back and display.
+             */
+            int chunk_out[2][5]; // buffer for chunk to be read
+            dataset.read(chunk_out, PredType::NATIVE_INT, mspace3, filespace);
+            cout << endl;
+            cout << "Chunk:" << endl;
+            for (j = 0; j < chunk_dims[0]; j++) {
+                for (i = 0; i < chunk_dims[1]; i++)
+                    cout << chunk_out[j][i] << " ";
+                cout << endl;
+            }
+            /*
+             *   Chunk:
+             *   1 1 1 0 0
+             *   2 0 0 0 0
+             */
+        }
+    } // end of try block
 
     // catch failure caused by the H5File operations
-    catch( FileIException error )
-    {
-	error.printError();
-	return -1;
+    catch (FileIException error) {
+        error.printErrorStack();
+        return -1;
     }
 
     // catch failure caused by the DataSet operations
-    catch( DataSetIException error )
-    {
-	error.printError();
-	return -1;
+    catch (DataSetIException error) {
+        error.printErrorStack();
+        return -1;
     }
 
     // catch failure caused by the DataSpace operations
-    catch( DataSpaceIException error )
-    {
-	error.printError();
-	return -1;
+    catch (DataSpaceIException error) {
+        error.printErrorStack();
+        return -1;
     }
     return 0;
 }
diff --git a/c++/examples/compound.cpp b/c++/examples/compound.cpp
index dfc5d81..f9397a9 100644
--- a/c++/examples/compound.cpp
+++ b/c++/examples/compound.cpp
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
@@ -19,195 +16,178 @@
  * and read back fields' subsets.
  */
 
-#ifdef OLD_HEADER_FILENAME
-#include <iostream.h>
-#else
 #include <iostream>
-#endif
-#include <string>
-
-#ifndef H5_NO_NAMESPACE
-#ifndef H5_NO_STD
-    using std::cout;
-    using std::endl;
-#endif  // H5_NO_STD
-#endif
+using std::cout;
+using std::endl;
 
+#include <string>
 #include "H5Cpp.h"
-
-#ifndef H5_NO_NAMESPACE
-    using namespace H5;
-#endif
-
-const H5std_string FILE_NAME( "SDScompound.h5" );
-const H5std_string DATASET_NAME( "ArrayOfStructures" );
-const H5std_string MEMBER1( "a_name" );
-const H5std_string MEMBER2( "b_name" );
-const H5std_string MEMBER3( "c_name" );
-const int   LENGTH = 10;
-const int   RANK = 1;
-
-int main(void)
+using namespace H5;
+
+const H5std_string FILE_NAME("SDScompound.h5");
+const H5std_string DATASET_NAME("ArrayOfStructures");
+const H5std_string MEMBER1("a_name");
+const H5std_string MEMBER2("b_name");
+const H5std_string MEMBER3("c_name");
+const int          LENGTH = 10;
+const int          RANK   = 1;
+
+int
+main(void)
 {
-   /* First structure  and dataset*/
-   typedef struct s1_t {
-	int    a;
-	float  b;
-	double c;
-   } s1_t;
-
-   /* Second structure (subset of s1_t)  and dataset*/
-   typedef struct s2_t {
-	double c;
-	int    a;
-   } s2_t;
-
-   // Try block to detect exceptions raised by any of the calls inside it
-   try
-   {
-      /*
-       * Initialize the data
-       */
-      int  i;
-      s1_t s1[LENGTH];
-      for (i = 0; i< LENGTH; i++)
-      {
-         s1[i].a = i;
-         s1[i].b = i*i;
-         s1[i].c = 1./(i+1);
-      }
-
-      /*
-       * Turn off the auto-printing when failure occurs so that we can
-       * handle the errors appropriately
-       */
-      Exception::dontPrint();
-
-      /*
-       * Create the data space.
-       */
-      hsize_t dim[] = {LENGTH};   /* Dataspace dimensions */
-      DataSpace space( RANK, dim );
-
-      /*
-       * Create the file.
-       */
-      H5File* file = new H5File( FILE_NAME, H5F_ACC_TRUNC );
-
-      /*
-       * Create the memory datatype.
-       */
-      CompType mtype1( sizeof(s1_t) );
-      mtype1.insertMember( MEMBER1, HOFFSET(s1_t, a), PredType::NATIVE_INT);
-      mtype1.insertMember( MEMBER3, HOFFSET(s1_t, c), PredType::NATIVE_DOUBLE);
-      mtype1.insertMember( MEMBER2, HOFFSET(s1_t, b), PredType::NATIVE_FLOAT);
-
-      /*
-       * Create the dataset.
-       */
-      DataSet* dataset;
-      dataset = new DataSet(file->createDataSet(DATASET_NAME, mtype1, space));
-
-      /*
-       * Write data to the dataset;
-       */
-      dataset->write( s1, mtype1 );
-
-      /*
-       * Release resources
-       */
-      delete dataset;
-      delete file;
-
-      /*
-       * Open the file and the dataset.
-       */
-      file = new H5File( FILE_NAME, H5F_ACC_RDONLY );
-      dataset = new DataSet (file->openDataSet( DATASET_NAME ));
-
-      /*
-       * Create a datatype for s2
-       */
-      CompType mtype2( sizeof(s2_t) );
-
-      mtype2.insertMember( MEMBER3, HOFFSET(s2_t, c), PredType::NATIVE_DOUBLE);
-      mtype2.insertMember( MEMBER1, HOFFSET(s2_t, a), PredType::NATIVE_INT);
-
-      /*
-       * Read two fields c and a from s1 dataset. Fields in the file
-       * are found by their names "c_name" and "a_name".
-       */
-      s2_t s2[LENGTH];
-      dataset->read( s2, mtype2 );
-
-      /*
-       * Display the fields
-       */
-      cout << endl << "Field c : " << endl;
-      for( i = 0; i < LENGTH; i++)
-	 cout << s2[i].c << " ";
-      cout << endl;
-
-      cout << endl << "Field a : " << endl;
-      for( i = 0; i < LENGTH; i++)
-	 cout << s2[i].a << " ";
-      cout << endl;
-
-      /*
-       * Create a datatype for s3.
-       */
-      CompType mtype3( sizeof(float) );
-
-      mtype3.insertMember( MEMBER2, 0, PredType::NATIVE_FLOAT);
-
-      /*
-       * Read field b from s1 dataset. Field in the file is found by its name.
-       */
-      float s3[LENGTH];  // Third "structure" - used to read float field of s1
-      dataset->read( s3, mtype3 );
-
-      /*
-       * Display the field
-       */
-      cout << endl << "Field b : " << endl;
-      for( i = 0; i < LENGTH; i++)
-	 cout << s3[i] << " ";
-      cout << endl;
-
-      /*
-       * Release resources
-       */
-      delete dataset;
-      delete file;
-   }  // end of try block
-
-   // catch failure caused by the H5File operations
-   catch( FileIException error )
-   {
-      error.printError();
-      return -1;
-   }
-
-   // catch failure caused by the DataSet operations
-   catch( DataSetIException error )
-   {
-      error.printError();
-      return -1;
-   }
-
-   // catch failure caused by the DataSpace operations
-   catch( DataSpaceIException error )
-   {
-      error.printError();
-      return -1;
-   }
-
-   // catch failure caused by the DataSpace operations
-   catch( DataTypeIException error )
-   {
-      error.printError();
-      return -1;
-   }
-
-   return 0;
+    /* First structure  and dataset*/
+    typedef struct s1_t {
+        int    a;
+        float  b;
+        double c;
+    } s1_t;
+
+    /* Second structure (subset of s1_t)  and dataset*/
+    typedef struct s2_t {
+        double c;
+        int    a;
+    } s2_t;
+
+    // Try block to detect exceptions raised by any of the calls inside it
+    try {
+        /*
+         * Initialize the data
+         */
+        int  i;
+        s1_t s1[LENGTH];
+        for (i = 0; i < LENGTH; i++) {
+            s1[i].a = i;
+            s1[i].b = i * i;
+            s1[i].c = 1. / (i + 1);
+        }
+
+        /*
+         * Turn off the auto-printing when failure occurs so that we can
+         * handle the errors appropriately
+         */
+        Exception::dontPrint();
+
+        /*
+         * Create the data space.
+         */
+        hsize_t   dim[] = {LENGTH}; /* Dataspace dimensions */
+        DataSpace space(RANK, dim);
+
+        /*
+         * Create the file.
+         */
+        H5File *file = new H5File(FILE_NAME, H5F_ACC_TRUNC);
+
+        /*
+         * Create the memory datatype.
+         */
+        CompType mtype1(sizeof(s1_t));
+        mtype1.insertMember(MEMBER1, HOFFSET(s1_t, a), PredType::NATIVE_INT);
+        mtype1.insertMember(MEMBER3, HOFFSET(s1_t, c), PredType::NATIVE_DOUBLE);
+        mtype1.insertMember(MEMBER2, HOFFSET(s1_t, b), PredType::NATIVE_FLOAT);
+
+        /*
+         * Create the dataset.
+         */
+        DataSet *dataset;
+        dataset = new DataSet(file->createDataSet(DATASET_NAME, mtype1, space));
+
+        /*
+         * Write data to the dataset;
+         */
+        dataset->write(s1, mtype1);
+
+        /*
+         * Release resources
+         */
+        delete dataset;
+        delete file;
+
+        /*
+         * Open the file and the dataset.
+         */
+        file    = new H5File(FILE_NAME, H5F_ACC_RDONLY);
+        dataset = new DataSet(file->openDataSet(DATASET_NAME));
+
+        /*
+         * Create a datatype for s2
+         */
+        CompType mtype2(sizeof(s2_t));
+
+        mtype2.insertMember(MEMBER3, HOFFSET(s2_t, c), PredType::NATIVE_DOUBLE);
+        mtype2.insertMember(MEMBER1, HOFFSET(s2_t, a), PredType::NATIVE_INT);
+
+        /*
+         * Read two fields c and a from s1 dataset. Fields in the file
+         * are found by their names "c_name" and "a_name".
+         */
+        s2_t s2[LENGTH];
+        dataset->read(s2, mtype2);
+
+        /*
+         * Display the fields
+         */
+        cout << endl << "Field c : " << endl;
+        for (i = 0; i < LENGTH; i++)
+            cout << s2[i].c << " ";
+        cout << endl;
+
+        cout << endl << "Field a : " << endl;
+        for (i = 0; i < LENGTH; i++)
+            cout << s2[i].a << " ";
+        cout << endl;
+
+        /*
+         * Create a datatype for s3.
+         */
+        CompType mtype3(sizeof(float));
+
+        mtype3.insertMember(MEMBER2, 0, PredType::NATIVE_FLOAT);
+
+        /*
+         * Read field b from s1 dataset. Field in the file is found by its name.
+         */
+        float s3[LENGTH]; // Third "structure" - used to read float field of s1
+        dataset->read(s3, mtype3);
+
+        /*
+         * Display the field
+         */
+        cout << endl << "Field b : " << endl;
+        for (i = 0; i < LENGTH; i++)
+            cout << s3[i] << " ";
+        cout << endl;
+
+        /*
+         * Release resources
+         */
+        delete dataset;
+        delete file;
+    } // end of try block
+
+    // catch failure caused by the H5File operations
+    catch (FileIException error) {
+        error.printErrorStack();
+        return -1;
+    }
+
+    // catch failure caused by the DataSet operations
+    catch (DataSetIException error) {
+        error.printErrorStack();
+        return -1;
+    }
+
+    // catch failure caused by the DataSpace operations
+    catch (DataSpaceIException error) {
+        error.printErrorStack();
+        return -1;
+    }
+
+    // catch failure caused by the DataSpace operations
+    catch (DataTypeIException error) {
+        error.printErrorStack();
+        return -1;
+    }
+
+    return 0;
 }
diff --git a/c++/examples/create.cpp b/c++/examples/create.cpp
index b4cc768..bd179f3 100644
--- a/c++/examples/create.cpp
+++ b/c++/examples/create.cpp
@@ -1,134 +1,118 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
  *  This example writes a dataset to a new HDF5 file.
  */
 
-#ifdef OLD_HEADER_FILENAME
-#include <iostream.h>
-#else
 #include <iostream>
-#endif
-#include <string>
 
+#include <string>
 #include "H5Cpp.h"
+using namespace H5;
 
-#ifndef H5_NO_NAMESPACE
-    using namespace H5;
-#endif
+const H5std_string FILE_NAME("SDS.h5");
+const H5std_string DATASET_NAME("IntArray");
+const int          NX   = 5; // dataset dimensions
+const int          NY   = 6;
+const int          RANK = 2;
 
-const H5std_string	FILE_NAME( "SDS.h5" );
-const H5std_string	DATASET_NAME( "IntArray" );
-const int 	NX = 5;                    // dataset dimensions
-const int 	NY = 6;
-const int 	RANK = 2;
-
-int main (void)
+int
+main(void)
 {
-   /*
-    * Data initialization.
-    */
-   int i, j;
-   int data[NX][NY];          // buffer for data to write
-   for (j = 0; j < NX; j++)
-   {
-      for (i = 0; i < NY; i++)
-	 data[j][i] = i + j;
-   }
-   /*
-    * 0 1 2 3 4 5
-    * 1 2 3 4 5 6
-    * 2 3 4 5 6 7
-    * 3 4 5 6 7 8
-    * 4 5 6 7 8 9
-    */
-
-   // Try block to detect exceptions raised by any of the calls inside it
-   try
-   {
-      /*
-       * Turn off the auto-printing when failure occurs so that we can
-       * handle the errors appropriately
-       */
-      Exception::dontPrint();
-
-      /*
-       * Create a new file using H5F_ACC_TRUNC access,
-       * default file creation properties, and default file
-       * access properties.
-       */
-      H5File file( FILE_NAME, H5F_ACC_TRUNC );
-
-      /*
-       * Define the size of the array and create the data space for fixed
-       * size dataset.
-       */
-      hsize_t     dimsf[2];              // dataset dimensions
-      dimsf[0] = NX;
-      dimsf[1] = NY;
-      DataSpace dataspace( RANK, dimsf );
-
-      /*
-       * Define datatype for the data in the file.
-       * We will store little endian INT numbers.
-       */
-      IntType datatype( PredType::NATIVE_INT );
-      datatype.setOrder( H5T_ORDER_LE );
-
-      /*
-       * Create a new dataset within the file using defined dataspace and
-       * datatype and default dataset creation properties.
-       */
-      DataSet dataset = file.createDataSet( DATASET_NAME, datatype, dataspace );
-
-      /*
-       * Write the data to the dataset using default memory space, file
-       * space, and transfer properties.
-       */
-      dataset.write( data, PredType::NATIVE_INT );
-   }  // end of try block
-
-   // catch failure caused by the H5File operations
-   catch( FileIException error )
-   {
-      error.printError();
-      return -1;
-   }
-
-   // catch failure caused by the DataSet operations
-   catch( DataSetIException error )
-   {
-      error.printError();
-      return -1;
-   }
-
-   // catch failure caused by the DataSpace operations
-   catch( DataSpaceIException error )
-   {
-      error.printError();
-      return -1;
-   }
-
-   // catch failure caused by the DataSpace operations
-   catch( DataTypeIException error )
-   {
-      error.printError();
-      return -1;
-   }
-
-   return 0;  // successfully terminated
+    /*
+     * Data initialization.
+     */
+    int i, j;
+    int data[NX][NY]; // buffer for data to write
+    for (j = 0; j < NX; j++) {
+        for (i = 0; i < NY; i++)
+            data[j][i] = i + j;
+    }
+    /*
+     * 0 1 2 3 4 5
+     * 1 2 3 4 5 6
+     * 2 3 4 5 6 7
+     * 3 4 5 6 7 8
+     * 4 5 6 7 8 9
+     */
+
+    // Try block to detect exceptions raised by any of the calls inside it
+    try {
+        /*
+         * Turn off the auto-printing when failure occurs so that we can
+         * handle the errors appropriately
+         */
+        Exception::dontPrint();
+
+        /*
+         * Create a new file using H5F_ACC_TRUNC access,
+         * default file creation properties, and default file
+         * access properties.
+         */
+        H5File file(FILE_NAME, H5F_ACC_TRUNC);
+
+        /*
+         * Define the size of the array and create the data space for fixed
+         * size dataset.
+         */
+        hsize_t dimsf[2]; // dataset dimensions
+        dimsf[0] = NX;
+        dimsf[1] = NY;
+        DataSpace dataspace(RANK, dimsf);
+
+        /*
+         * Define datatype for the data in the file.
+         * We will store little endian INT numbers.
+         */
+        IntType datatype(PredType::NATIVE_INT);
+        datatype.setOrder(H5T_ORDER_LE);
+
+        /*
+         * Create a new dataset within the file using defined dataspace and
+         * datatype and default dataset creation properties.
+         */
+        DataSet dataset = file.createDataSet(DATASET_NAME, datatype, dataspace);
+
+        /*
+         * Write the data to the dataset using default memory space, file
+         * space, and transfer properties.
+         */
+        dataset.write(data, PredType::NATIVE_INT);
+    } // end of try block
+
+    // catch failure caused by the H5File operations
+    catch (FileIException error) {
+        error.printErrorStack();
+        return -1;
+    }
+
+    // catch failure caused by the DataSet operations
+    catch (DataSetIException error) {
+        error.printErrorStack();
+        return -1;
+    }
+
+    // catch failure caused by the DataSpace operations
+    catch (DataSpaceIException error) {
+        error.printErrorStack();
+        return -1;
+    }
+
+    // catch failure caused by the DataSpace operations
+    catch (DataTypeIException error) {
+        error.printErrorStack();
+        return -1;
+    }
+
+    return 0; // successfully terminated
 }
-
diff --git a/c++/examples/extend_ds.cpp b/c++/examples/extend_ds.cpp
index 2723263..8449c75 100644
--- a/c++/examples/extend_ds.cpp
+++ b/c++/examples/extend_ds.cpp
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
@@ -20,221 +17,205 @@
  *
  */
 
-#ifdef OLD_HEADER_FILENAME
-#include <iostream.h>
-#else
 #include <iostream>
-#endif
 #include <string>
 
-#ifndef H5_NO_NAMESPACE
-#ifndef H5_NO_STD
-    using std::cout;
-    using std::endl;
-#endif  // H5_NO_STD
-#endif
+using std::cout;
+using std::endl;
 
+#include <string>
 #include "H5Cpp.h"
+using namespace H5;
 
-#ifndef H5_NO_NAMESPACE
-    using namespace H5;
-#endif
-
-const H5std_string FILE_NAME( "SDSextendible.h5" );
-const H5std_string DATASET_NAME( "ExtendibleArray" );
-const int      NX = 10;
-const int      NY = 5;
-const int      RANK = 2;
+const H5std_string FILE_NAME("SDSextendible.h5");
+const H5std_string DATASET_NAME("ExtendibleArray");
+const int          NX   = 10;
+const int          NY   = 5;
+const int          RANK = 2;
 
-int main (void)
+int
+main(void)
 {
-   /*
-    * Try block to detect exceptions raised by any of the calls inside it
-    */
-   try
-   {
-      /*
-       * Turn off the auto-printing when failure occurs so that we can
-       * handle the errors appropriately
-       */
-      Exception::dontPrint();
-
-      /*
-       * Create the data space with unlimited dimensions.
-       */
-      hsize_t      dims[2]  = { 3, 3};  // dataset dimensions at creation
-      hsize_t      maxdims[2] = {H5S_UNLIMITED, H5S_UNLIMITED};
-      DataSpace mspace1( RANK, dims, maxdims);
-
-      /*
-       * Create a new file. If file exists its contents will be overwritten.
-       */
-      H5File file( FILE_NAME, H5F_ACC_TRUNC );
-
-      /*
-       * Modify dataset creation properties, i.e. enable chunking.
-       */
-      DSetCreatPropList cparms;
-
-      hsize_t      chunk_dims[2] ={2, 5};
-      cparms.setChunk( RANK, chunk_dims );
-
-      /*
-       * Set fill value for the dataset
-       */
-      int fill_val = 0;
-      cparms.setFillValue( PredType::NATIVE_INT, &fill_val);
-
-      /*
-       * Create a new dataset within the file using cparms
-       * creation properties.
-       */
-      DataSet dataset = file.createDataSet( DATASET_NAME, PredType::NATIVE_INT, mspace1, cparms);
-
-      /*
-       * Extend the dataset. This call assures that dataset is at least 3 x 3.
-       */
-      hsize_t      size[2];
-      size[0]   = 3;
-      size[1]   = 3;
-      dataset.extend( size );
-
-      /*
-       * Select a hyperslab.
-       */
-      DataSpace fspace1 = dataset.getSpace ();
-      hsize_t     offset[2];
-      offset[0] = 0;
-      offset[1] = 0;
-      hsize_t      dims1[2] = { 3, 3};            /* data1 dimensions */
-      fspace1.selectHyperslab( H5S_SELECT_SET, dims1, offset );
-
-      /*
-       * Write the data to the hyperslab.
-       */
-      int       data1[3][3] = { {1, 1, 1},       /* data to write */
-				{1, 1, 1},
-				{1, 1, 1} };
-      dataset.write( data1, PredType::NATIVE_INT, mspace1, fspace1 );
-
-      /*
-       * Extend the dataset. Dataset becomes 10 x 3.
-       */
-      hsize_t   dims2[2] = { 7, 1};            /* data2 dimensions */
-      dims[0]   = dims1[0] + dims2[0];
-      size[0]   = dims[0];
-      size[1]   = dims[1];
-      dataset.extend( size );
-
-      /*
-       * Select a hyperslab.
-       */
-      DataSpace fspace2 = dataset.getSpace ();
-      offset[0] = 3;
-      offset[1] = 0;
-      fspace2.selectHyperslab( H5S_SELECT_SET, dims2, offset );
-
-      /*
-       * Define memory space
-       */
-      DataSpace mspace2( RANK, dims2 );
-
-      /*
-       * Write the data to the hyperslab.
-       */
-      int  data2[7]    = { 2, 2, 2, 2, 2, 2, 2};
-      dataset.write( data2, PredType::NATIVE_INT, mspace2, fspace2 );
-
-      /*
-       * Extend the dataset. Dataset becomes 10 x 5.
-       */
-      hsize_t   dims3[2] = { 2, 2};            /* data3 dimensions */
-      dims[1]   = dims1[1] + dims3[1];
-      size[0]   = dims[0];
-      size[1]   = dims[1];
-      dataset.extend( size );
-
-      /*
-       * Select a hyperslab
-       */
-      DataSpace fspace3 = dataset.getSpace ();
-      offset[0] = 0;
-      offset[1] = 3;
-      fspace3.selectHyperslab( H5S_SELECT_SET, dims3, offset );
-
-      /*
-       * Define memory space.
-       */
-      DataSpace mspace3( RANK, dims3 );
-
-      /*
-       * Write the data to the hyperslab.
-       */
-      int         data3[2][2] = { {3, 3}, {3, 3} };
-      dataset.write( data3, PredType::NATIVE_INT, mspace3, fspace3 );
-
-      /*
-       * Read the data from this dataset and display it.
-       */
-      int i, j;
-      int data_out[NX][NY];
-      for (i = 0; i < NX; i++)
-      {
-         for (j = 0; j < NY; j++)
-            data_out[i][j] = 0;
-      }
-      dataset.read( data_out, PredType::NATIVE_INT );
-      /*
-       * Resulting dataset
-       *
-       *	 1 1 1 3 3
-       *	 1 1 1 3 3
-       *	 1 1 1 0 0
-       *	 2 0 0 0 0
-       *	 2 0 0 0 0
-       *	 2 0 0 0 0
-       *	 2 0 0 0 0
-       *	 2 0 0 0 0
-       *	 2 0 0 0 0
-       *	 2 0 0 0 0
-       */
-      /*
-       * Display the result.
-       */
-      for (i=0; i < NX; i++)
-      {
-          for(j=0; j < NY; j++)
-             cout << data_out[i][j] << "  ";
-          cout << endl;
-      }
-   }  // end of try block
-
-   // catch failure caused by the H5File operations
-   catch( FileIException error )
-   {
-      error.printError();
-      return -1;
-   }
-
-   // catch failure caused by the DataSet operations
-   catch( DataSetIException error )
-   {
-      error.printError();
-      return -1;
-   }
-
-   // catch failure caused by the DataSpace operations
-   catch( DataSpaceIException error )
-   {
-      error.printError();
-      return -1;
-   }
-
-   // catch failure caused by the DataSpace operations
-   catch( DataTypeIException error )
-   {
-      error.printError();
-      return -1;
-   }
-   return 0;
+    /*
+     * Try block to detect exceptions raised by any of the calls inside it
+     */
+    try {
+        /*
+         * Turn off the auto-printing when failure occurs so that we can
+         * handle the errors appropriately
+         */
+        Exception::dontPrint();
+
+        /*
+         * Create the data space with unlimited dimensions.
+         */
+        hsize_t   dims[2]    = {3, 3}; // dataset dimensions at creation
+        hsize_t   maxdims[2] = {H5S_UNLIMITED, H5S_UNLIMITED};
+        DataSpace mspace1(RANK, dims, maxdims);
+
+        /*
+         * Create a new file. If file exists its contents will be overwritten.
+         */
+        H5File file(FILE_NAME, H5F_ACC_TRUNC);
+
+        /*
+         * Modify dataset creation properties, i.e. enable chunking.
+         */
+        DSetCreatPropList cparms;
+
+        hsize_t chunk_dims[2] = {2, 5};
+        cparms.setChunk(RANK, chunk_dims);
+
+        /*
+         * Set fill value for the dataset
+         */
+        int fill_val = 0;
+        cparms.setFillValue(PredType::NATIVE_INT, &fill_val);
+
+        /*
+         * Create a new dataset within the file using cparms
+         * creation properties.
+         */
+        DataSet dataset = file.createDataSet(DATASET_NAME, PredType::NATIVE_INT, mspace1, cparms);
+
+        /*
+         * Extend the dataset. This call assures that dataset is at least 3 x 3.
+         */
+        hsize_t size[2];
+        size[0] = 3;
+        size[1] = 3;
+        dataset.extend(size);
+
+        /*
+         * Select a hyperslab.
+         */
+        DataSpace fspace1 = dataset.getSpace();
+        hsize_t   offset[2];
+        offset[0]        = 0;
+        offset[1]        = 0;
+        hsize_t dims1[2] = {3, 3}; /* data1 dimensions */
+        fspace1.selectHyperslab(H5S_SELECT_SET, dims1, offset);
+
+        /*
+         * Write the data to the hyperslab.
+         */
+        int data1[3][3] = {{1, 1, 1}, /* data to write */
+                           {1, 1, 1},
+                           {1, 1, 1}};
+        dataset.write(data1, PredType::NATIVE_INT, mspace1, fspace1);
+
+        /*
+         * Extend the dataset. Dataset becomes 10 x 3.
+         */
+        hsize_t dims2[2] = {7, 1}; /* data2 dimensions */
+        dims[0]          = dims1[0] + dims2[0];
+        size[0]          = dims[0];
+        size[1]          = dims[1];
+        dataset.extend(size);
+
+        /*
+         * Select a hyperslab.
+         */
+        DataSpace fspace2 = dataset.getSpace();
+        offset[0]         = 3;
+        offset[1]         = 0;
+        fspace2.selectHyperslab(H5S_SELECT_SET, dims2, offset);
+
+        /*
+         * Define memory space
+         */
+        DataSpace mspace2(RANK, dims2);
+
+        /*
+         * Write the data to the hyperslab.
+         */
+        int data2[7] = {2, 2, 2, 2, 2, 2, 2};
+        dataset.write(data2, PredType::NATIVE_INT, mspace2, fspace2);
+
+        /*
+         * Extend the dataset. Dataset becomes 10 x 5.
+         */
+        hsize_t dims3[2] = {2, 2}; /* data3 dimensions */
+        dims[1]          = dims1[1] + dims3[1];
+        size[0]          = dims[0];
+        size[1]          = dims[1];
+        dataset.extend(size);
+
+        /*
+         * Select a hyperslab
+         */
+        DataSpace fspace3 = dataset.getSpace();
+        offset[0]         = 0;
+        offset[1]         = 3;
+        fspace3.selectHyperslab(H5S_SELECT_SET, dims3, offset);
+
+        /*
+         * Define memory space.
+         */
+        DataSpace mspace3(RANK, dims3);
+
+        /*
+         * Write the data to the hyperslab.
+         */
+        int data3[2][2] = {{3, 3}, {3, 3}};
+        dataset.write(data3, PredType::NATIVE_INT, mspace3, fspace3);
+
+        /*
+         * Read the data from this dataset and display it.
+         */
+        int i, j;
+        int data_out[NX][NY];
+        for (i = 0; i < NX; i++) {
+            for (j = 0; j < NY; j++)
+                data_out[i][j] = 0;
+        }
+        dataset.read(data_out, PredType::NATIVE_INT);
+        /*
+         * Resulting dataset
+         *
+         *         1 1 1 3 3
+         *         1 1 1 3 3
+         *         1 1 1 0 0
+         *         2 0 0 0 0
+         *         2 0 0 0 0
+         *         2 0 0 0 0
+         *         2 0 0 0 0
+         *         2 0 0 0 0
+         *         2 0 0 0 0
+         *         2 0 0 0 0
+         */
+        /*
+         * Display the result.
+         */
+        for (i = 0; i < NX; i++) {
+            for (j = 0; j < NY; j++)
+                cout << data_out[i][j] << "  ";
+            cout << endl;
+        }
+    } // end of try block
+
+    // catch failure caused by the H5File operations
+    catch (FileIException error) {
+        error.printErrorStack();
+        return -1;
+    }
+
+    // catch failure caused by the DataSet operations
+    catch (DataSetIException error) {
+        error.printErrorStack();
+        return -1;
+    }
+
+    // catch failure caused by the DataSpace operations
+    catch (DataSpaceIException error) {
+        error.printErrorStack();
+        return -1;
+    }
+
+    // catch failure caused by the DataSpace operations
+    catch (DataTypeIException error) {
+        error.printErrorStack();
+        return -1;
+    }
+    return 0;
 }
diff --git a/c++/examples/h5group.cpp b/c++/examples/h5group.cpp
index a5137bc..0779aa9 100644
--- a/c++/examples/h5group.cpp
+++ b/c++/examples/h5group.cpp
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
@@ -22,205 +19,184 @@
  * the C version is used in this example.
  */
 
-#ifdef OLD_HEADER_FILENAME
-#include <iostream.h>
-#else
 #include <iostream>
-#endif
-#include <string>
-
-#ifndef H5_NO_NAMESPACE
-#ifndef H5_NO_STD
-    using std::cout;
-    using std::endl;
-#endif  // H5_NO_STD
-#endif
+using std::cout;
+using std::endl;
 
+#include <string>
 #include "H5Cpp.h"
+using namespace H5;
 
-#ifndef H5_NO_NAMESPACE
-    using namespace H5;
-#endif
-
-const H5std_string FILE_NAME( "Group.h5" );
-const int	   RANK = 2;
+const H5std_string FILE_NAME("Group.h5");
+const int          RANK = 2;
 
 // Operator function
-extern "C" herr_t file_info(hid_t loc_id, const char *name, const H5L_info_t *linfo,
-    void *opdata);
+extern "C" herr_t file_info(hid_t loc_id, const char *name, const H5L_info2_t *linfo, void *opdata);
 
-int main(void)
+int
+main(void)
 {
 
-    hsize_t  dims[2];
-    hsize_t  cdims[2];
+    hsize_t dims[2];
+    hsize_t cdims[2];
 
     // Try block to detect exceptions raised by any of the calls inside it
-    try
-    {
-	/*
-	 * Turn off the auto-printing when failure occurs so that we can
-	 * handle the errors appropriately
-	 */
-	Exception::dontPrint();
-
-	/*
-	 * Create the named file, truncating the existing one if any,
-	 * using default create and access property lists.
-	 */
-	H5File *file = new H5File( FILE_NAME, H5F_ACC_TRUNC );
-
-	/*
-	 * Create a group in the file
-	 */
-	Group* group = new Group( file->createGroup( "/Data" ));
-
-	/*
-	 * Create dataset "Compressed Data" in the group using absolute
-	 * name. Dataset creation property list is modified to use
-	 * GZIP compression with the compression effort set to 6.
-	 * Note that compression can be used only when dataset is chunked.
-	 */
-	dims[0] = 1000;
-	dims[1] = 20;
-	cdims[0] = 20;
-	cdims[1] = 20;
-	DataSpace *dataspace = new DataSpace(RANK, dims); // create new dspace
-	DSetCreatPropList ds_creatplist;  // create dataset creation prop list
-	ds_creatplist.setChunk( 2, cdims );  // then modify it for compression
-	ds_creatplist.setDeflate( 6 );
-
-	/*
-	 * Create the first dataset.
-	 */
-	DataSet* dataset = new DataSet(file->createDataSet(
-		"/Data/Compressed_Data", PredType::NATIVE_INT,
-		*dataspace, ds_creatplist ));
-
-	/*
-	 * Close the first dataset.
-	 */
-	delete dataset;
-	delete dataspace;
-
-	/*
-	 * Create the second dataset.
-	 */
-	dims[0] = 500;
-	dims[1] = 20;
-	dataspace = new DataSpace(RANK, dims); // create second dspace
-	dataset = new DataSet(file->createDataSet("/Data/Float_Data",
-			PredType::NATIVE_FLOAT, *dataspace));
-
-	delete dataset;
-	delete dataspace;
-	delete group;
-	delete file;
-
-	/*
-	 * Now reopen the file and group in the file.
-	 */
-	file = new H5File(FILE_NAME, H5F_ACC_RDWR);
-	group = new Group(file->openGroup("Data"));
-
-	/*
-	 * Access "Compressed_Data" dataset in the group.
-	 */
-	try {  // to determine if the dataset exists in the group
-	    dataset = new DataSet( group->openDataSet( "Compressed_Data" ));
-	}
-	catch( GroupIException not_found_error ) {
-	    cout << " Dataset is not found." << endl;
-	}
-	cout << "dataset \"/Data/Compressed_Data\" is open" << endl;
-
-	/*
-	 * Close the dataset.
-	 */
-	delete dataset;
-
-	/*
-	 * Create hard link to the Data group.
-	 */
-	file->link( H5L_TYPE_HARD, "Data", "Data_new" );
-
-	/*
-	 * We can access "Compressed_Data" dataset using created
-	 * hard link "Data_new".
-	 */
-	try {  // to determine if the dataset exists in the file
-	    dataset = new DataSet(file->openDataSet( "/Data_new/Compressed_Data" ));
-	}
-	catch( FileIException not_found_error )
-	{
-	    cout << " Dataset is not found." << endl;
-	}
-	cout << "dataset \"/Data_new/Compressed_Data\" is open" << endl;
-
-	/*
-	 * Close the dataset.
-	 */
-	delete dataset;
-
-	/*
-	 * Use iterator to see the names of the objects in the file
-	 * root directory.
-	 */
-	cout << endl << "Iterating over elements in the file" << endl;
-	herr_t idx = H5Literate(file->getId(), H5_INDEX_NAME, H5_ITER_INC, NULL, file_info, NULL);
-	cout << endl;
-
-	/*
-	 * Unlink  name "Data" and use iterator to see the names
-	 * of the objects in the file root direvtory.
-	 */
-	cout << "Unlinking..." << endl;
-	try {  // attempt to unlink the dataset
-	    file->unlink( "Data" );
-	}
-	catch( FileIException unlink_error )
-	{
-	    cout << " unlink failed." << endl;
-	}
-	cout << "\"Data\" is unlinked" << endl;
-
-	cout << endl << "Iterating over elements in the file again" << endl;
-	idx = H5Literate(file->getId(), H5_INDEX_NAME, H5_ITER_INC, NULL, file_info, NULL);
-	cout << endl;
-
-	/*
-	 * Close the group and file.
-	 */
-	delete group;
-	delete file;
-    }  // end of try block
+    try {
+        /*
+         * Turn off the auto-printing when failure occurs so that we can
+         * handle the errors appropriately
+         */
+        Exception::dontPrint();
+
+        /*
+         * Create the named file, truncating the existing one if any,
+         * using default create and access property lists.
+         */
+        H5File *file = new H5File(FILE_NAME, H5F_ACC_TRUNC);
+
+        /*
+         * Create a group in the file
+         */
+        Group *group = new Group(file->createGroup("/Data"));
+
+        /*
+         * Create dataset "Compressed Data" in the group using absolute
+         * name. Dataset creation property list is modified to use
+         * GZIP compression with the compression effort set to 6.
+         * Note that compression can be used only when dataset is chunked.
+         */
+        dims[0]                     = 1000;
+        dims[1]                     = 20;
+        cdims[0]                    = 20;
+        cdims[1]                    = 20;
+        DataSpace        *dataspace = new DataSpace(RANK, dims); // create new dspace
+        DSetCreatPropList ds_creatplist;                         // create dataset creation prop list
+        ds_creatplist.setChunk(2, cdims);                        // then modify it for compression
+        ds_creatplist.setDeflate(6);
+
+        /*
+         * Create the first dataset.
+         */
+        DataSet *dataset = new DataSet(
+            file->createDataSet("/Data/Compressed_Data", PredType::NATIVE_INT, *dataspace, ds_creatplist));
+
+        /*
+         * Close the first dataset.
+         */
+        delete dataset;
+        delete dataspace;
+
+        /*
+         * Create the second dataset.
+         */
+        dims[0]   = 500;
+        dims[1]   = 20;
+        dataspace = new DataSpace(RANK, dims); // create second dspace
+        dataset   = new DataSet(file->createDataSet("/Data/Float_Data", PredType::NATIVE_FLOAT, *dataspace));
+
+        delete dataset;
+        delete dataspace;
+        delete group;
+        delete file;
+
+        /*
+         * Now reopen the file and group in the file.
+         */
+        file  = new H5File(FILE_NAME, H5F_ACC_RDWR);
+        group = new Group(file->openGroup("Data"));
+
+        /*
+         * Access "Compressed_Data" dataset in the group.
+         */
+        try { // to determine if the dataset exists in the group
+            dataset = new DataSet(group->openDataSet("Compressed_Data"));
+        }
+        catch (GroupIException not_found_error) {
+            cout << " Dataset is not found." << endl;
+        }
+        cout << "dataset \"/Data/Compressed_Data\" is open" << endl;
+
+        /*
+         * Close the dataset.
+         */
+        delete dataset;
+
+        /*
+         * Create hard link to the Data group.
+         */
+        file->link(H5L_TYPE_HARD, "Data", "Data_new");
+
+        /*
+         * We can access "Compressed_Data" dataset using created
+         * hard link "Data_new".
+         */
+        try { // to determine if the dataset exists in the file
+            dataset = new DataSet(file->openDataSet("/Data_new/Compressed_Data"));
+        }
+        catch (FileIException not_found_error) {
+            cout << " Dataset is not found." << endl;
+        }
+        cout << "dataset \"/Data_new/Compressed_Data\" is open" << endl;
+
+        /*
+         * Close the dataset.
+         */
+        delete dataset;
+
+        /*
+         * Use iterator to see the names of the objects in the file
+         * root directory.
+         */
+        cout << endl << "Iterating over elements in the file" << endl;
+        herr_t idx = H5Literate2(file->getId(), H5_INDEX_NAME, H5_ITER_INC, NULL, file_info, NULL);
+        cout << endl;
+
+        /*
+         * Unlink  name "Data" and use iterator to see the names
+         * of the objects in the file root direvtory.
+         */
+        cout << "Unlinking..." << endl;
+        try { // attempt to unlink the dataset
+            file->unlink("Data");
+        }
+        catch (FileIException unlink_error) {
+            cout << " unlink failed." << endl;
+        }
+        cout << "\"Data\" is unlinked" << endl;
+
+        cout << endl << "Iterating over elements in the file again" << endl;
+        idx = H5Literate2(file->getId(), H5_INDEX_NAME, H5_ITER_INC, NULL, file_info, NULL);
+        cout << endl;
+
+        /*
+         * Close the group and file.
+         */
+        delete group;
+        delete file;
+    } // end of try block
 
     // catch failure caused by the H5File operations
-    catch( FileIException error )
-    {
-	error.printError();
-	return -1;
+    catch (FileIException error) {
+        error.printErrorStack();
+        return -1;
     }
 
     // catch failure caused by the DataSet operations
-    catch( DataSetIException error )
-    {
-	error.printError();
-	return -1;
+    catch (DataSetIException error) {
+        error.printErrorStack();
+        return -1;
     }
 
     // catch failure caused by the DataSpace operations
-    catch( DataSpaceIException error )
-    {
-	error.printError();
-	return -1;
+    catch (DataSpaceIException error) {
+        error.printErrorStack();
+        return -1;
     }
 
     // catch failure caused by the Attribute operations
-    catch( AttributeIException error )
-    {
-	error.printError();
-	return -1;
+    catch (AttributeIException error) {
+        error.printErrorStack();
+        return -1;
     }
     return 0;
 }
@@ -229,7 +205,7 @@ int main(void)
  * Operator function.
  */
 herr_t
-file_info(hid_t loc_id, const char *name, const H5L_info_t *linfo, void *opdata)
+file_info(hid_t loc_id, const char *name, const H5L_info2_t *linfo, void *opdata)
 {
     hid_t group;
 
@@ -246,4 +222,3 @@ file_info(hid_t loc_id, const char *name, const H5L_info_t *linfo, void *opdata)
     H5Gclose(group);
     return 0;
 }
-
diff --git a/c++/examples/h5tutr_cmprss.cpp b/c++/examples/h5tutr_cmprss.cpp
index e9c87f1..6d9c109 100644
--- a/c++/examples/h5tutr_cmprss.cpp
+++ b/c++/examples/h5tutr_cmprss.cpp
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.						     *
- * Copyright by the Board of Trustees of the University of Illinois.	     *
- * All rights reserved.							     *
- *	                                                                     *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have	     *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
@@ -19,144 +16,135 @@
  */
 
 #include <iostream>
-#include <string>
+using std::cout;
+using std::endl;
 
+#include <string>
 #include "H5Cpp.h"
+using namespace H5;
 
-#ifndef H5_NO_NAMESPACE
-    using namespace H5;
-#ifndef H5_NO_STD
-    using std::cout;
-    using std::endl;
-#endif  // H5_NO_STD
-#endif
+const H5std_string FILE_NAME("h5tutr_cmprss.h5");
+const H5std_string DATASET_NAME("Compressed_Data");
+const int          DIM0 = 100;
+const int          DIM1 = 20;
 
-const H5std_string	FILE_NAME("h5tutr_cmprss.h5");
-const H5std_string	DATASET_NAME("Compressed_Data");
-const int	DIM0 = 100;
-const int	DIM1 = 20;
-
-int main (void)
+int
+main(void)
 {
-    hsize_t dims[2] = { DIM0, DIM1 };	// dataset dimensions
-    hsize_t chunk_dims[2] = { 20, 20 };	// chunk dimensions
-    int     i,j, buf[DIM0][DIM1];
+    hsize_t dims[2]       = {DIM0, DIM1}; // dataset dimensions
+    hsize_t chunk_dims[2] = {20, 20};     // chunk dimensions
+    int     i, j, buf[DIM0][DIM1];
 
     // Try block to detect exceptions raised by any of the calls inside it
-    try
-    {
-	// Turn off the auto-printing when failure occurs so that we can
-	// handle the errors appropriately
-	Exception::dontPrint();
-
-	// Create a new file using the default property lists. 
-	H5File file(FILE_NAME, H5F_ACC_TRUNC);
-
-	// Create the data space for the dataset.
-	DataSpace *dataspace = new DataSpace(2, dims);
-
-	// Modify dataset creation property to enable chunking
-	DSetCreatPropList  *plist = new  DSetCreatPropList;
-	plist->setChunk(2, chunk_dims);
-
-	// Set ZLIB (DEFLATE) Compression using level 6.
-	// To use SZIP compression comment out this line.
-	plist->setDeflate(6);
-
-	// Uncomment these lines to set SZIP Compression
-	// unsigned szip_options_mask = H5_SZIP_NN_OPTION_MASK;
-	// unsigned szip_pixels_per_block = 16;
-	// plist->setSzip(szip_options_mask, szip_pixels_per_block);
-     
-	// Create the dataset.      
-	DataSet *dataset = new DataSet(file.createDataSet( DATASET_NAME, 
-	                        PredType::STD_I32BE, *dataspace, *plist) );
-
-	for (i = 0; i< DIM0; i++)
-	  for (j=0; j<DIM1; j++)
-	      buf[i][j] = i+j;
-
-	// Write data to dataset.
-	dataset->write(buf, PredType::NATIVE_INT);
-
-	// Close objects and file.  Either approach will close the HDF5 item.
-	delete dataspace;
-	delete dataset;
-	delete plist;
-	file.close();
-
-	// -----------------------------------------------
-	// Re-open the file and dataset, retrieve filter 
-	// information for dataset and read the data back.
-	// -----------------------------------------------
-	
-	int        rbuf[DIM0][DIM1];
-	int        numfilt;
-	size_t     nelmts={1}, namelen={1};
-	unsigned  flags, filter_info, cd_values[1], idx;
-	char       name[1];
-	H5Z_filter_t filter_type;
-
-	// Open the file and the dataset in the file.
-	file.openFile(FILE_NAME, H5F_ACC_RDONLY);
-	dataset = new DataSet(file.openDataSet( DATASET_NAME));
-
-	// Get the create property list of the dataset.
-	plist = new DSetCreatPropList(dataset->getCreatePlist ());
-
-	// Get the number of filters associated with the dataset.
-	numfilt = plist->getNfilters();
-	cout << "Number of filters associated with dataset: " << numfilt << endl;
-
-	for (idx=0; idx < numfilt; idx++) {
-	    nelmts = 0;
-
-	    filter_type = plist->getFilter(idx, flags, nelmts, cd_values, namelen, name , filter_info);
-
-	    cout << "Filter Type: ";
-
-	    switch (filter_type) {
-	      case H5Z_FILTER_DEFLATE:
-	           cout << "H5Z_FILTER_DEFLATE" << endl;
-	           break;
-	      case H5Z_FILTER_SZIP:
-	           cout << "H5Z_FILTER_SZIP" << endl; 
-	           break;
-	      default:
-	           cout << "Other filter type included." << endl;
-	      }
-	}
-
-	// Read data.
-	dataset->read(rbuf, PredType::NATIVE_INT);
-
-	delete plist; 
-	delete dataset;
-	file.close();	// can be skipped
-
-    }  // end of try block
+    try {
+        // Turn off the auto-printing when failure occurs so that we can
+        // handle the errors appropriately
+        Exception::dontPrint();
+
+        // Create a new file using the default property lists.
+        H5File file(FILE_NAME, H5F_ACC_TRUNC);
+
+        // Create the data space for the dataset.
+        DataSpace *dataspace = new DataSpace(2, dims);
+
+        // Modify dataset creation property to enable chunking
+        DSetCreatPropList *plist = new DSetCreatPropList;
+        plist->setChunk(2, chunk_dims);
+
+        // Set ZLIB (DEFLATE) Compression using level 6.
+        // To use SZIP compression comment out this line.
+        plist->setDeflate(6);
+
+        // Uncomment these lines to set SZIP Compression
+        // unsigned szip_options_mask = H5_SZIP_NN_OPTION_MASK;
+        // unsigned szip_pixels_per_block = 16;
+        // plist->setSzip(szip_options_mask, szip_pixels_per_block);
+
+        // Create the dataset.
+        DataSet *dataset =
+            new DataSet(file.createDataSet(DATASET_NAME, PredType::STD_I32BE, *dataspace, *plist));
+
+        for (i = 0; i < DIM0; i++)
+            for (j = 0; j < DIM1; j++)
+                buf[i][j] = i + j;
+
+        // Write data to dataset.
+        dataset->write(buf, PredType::NATIVE_INT);
+
+        // Close objects and file.  Either approach will close the HDF5 item.
+        delete dataspace;
+        delete dataset;
+        delete plist;
+        file.close();
+
+        // -----------------------------------------------
+        // Re-open the file and dataset, retrieve filter
+        // information for dataset and read the data back.
+        // -----------------------------------------------
+
+        int          rbuf[DIM0][DIM1];
+        int          numfilt;
+        size_t       nelmts = {1}, namelen = {1};
+        unsigned     flags, filter_info, cd_values[1], idx;
+        char         name[1];
+        H5Z_filter_t filter_type;
+
+        // Open the file and the dataset in the file.
+        file.openFile(FILE_NAME, H5F_ACC_RDONLY);
+        dataset = new DataSet(file.openDataSet(DATASET_NAME));
+
+        // Get the create property list of the dataset.
+        plist = new DSetCreatPropList(dataset->getCreatePlist());
+
+        // Get the number of filters associated with the dataset.
+        numfilt = plist->getNfilters();
+        cout << "Number of filters associated with dataset: " << numfilt << endl;
+
+        for (idx = 0; idx < numfilt; idx++) {
+            nelmts = 0;
+
+            filter_type = plist->getFilter(idx, flags, nelmts, cd_values, namelen, name, filter_info);
+
+            cout << "Filter Type: ";
+
+            switch (filter_type) {
+                case H5Z_FILTER_DEFLATE:
+                    cout << "H5Z_FILTER_DEFLATE" << endl;
+                    break;
+                case H5Z_FILTER_SZIP:
+                    cout << "H5Z_FILTER_SZIP" << endl;
+                    break;
+                default:
+                    cout << "Other filter type included." << endl;
+            }
+        }
+
+        // Read data.
+        dataset->read(rbuf, PredType::NATIVE_INT);
+
+        delete plist;
+        delete dataset;
+        file.close(); // can be skipped
+
+    } // end of try block
 
     // catch failure caused by the H5File operations
-    catch(FileIException error)
-    {
-	error.printError();
-	return -1;
+    catch (FileIException error) {
+        error.printErrorStack();
+        return -1;
     }
 
     // catch failure caused by the DataSet operations
-    catch(DataSetIException error)
-    {
-	error.printError();
-	return -1;
+    catch (DataSetIException error) {
+        error.printErrorStack();
+        return -1;
     }
 
     // catch failure caused by the DataSpace operations
-    catch(DataSpaceIException error)
-    {
-	error.printError();
-	return -1;
+    catch (DataSpaceIException error) {
+        error.printErrorStack();
+        return -1;
     }
 
-    return 0;  // successfully terminated
+    return 0; // successfully terminated
 }
-
diff --git a/c++/examples/h5tutr_crtatt.cpp b/c++/examples/h5tutr_crtatt.cpp
index df8ca5a..0b18de1 100644
--- a/c++/examples/h5tutr_crtatt.cpp
+++ b/c++/examples/h5tutr_crtatt.cpp
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.						     *
- * Copyright by the Board of Trustees of the University of Illinois.	     *
- * All rights reserved.							     *
- *	                                                                     *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have	     *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
@@ -20,76 +17,65 @@
 
 #include <iostream>
 #include <string>
-
 #include "H5Cpp.h"
+using namespace H5;
 
-#ifndef H5_NO_NAMESPACE
-    using namespace H5;
-#endif
-
-const H5std_string	FILE_NAME( "h5tutr_dset.h5" );
-const H5std_string	DATASET_NAME( "dset" );
-const H5std_string	ATTR_NAME( "Units" );
+const H5std_string FILE_NAME("h5tutr_dset.h5");
+const H5std_string DATASET_NAME("dset");
+const H5std_string ATTR_NAME("Units");
 
-const int	DIM1 = 2;
+const int DIM1 = 2;
 
-int main (void)
+int
+main(void)
 {
-   int attr_data[2] = { 100, 200};
-   hsize_t dims[1] = { DIM1 };
-   
-
-   // Try block to detect exceptions raised by any of the calls inside it
-   try
-   {
-	// Turn off the auto-printing when failure occurs so that we can
-	// handle the errors appropriately
-	Exception::dontPrint();
-
-	// Open an existing file and dataset.
-	H5File file( FILE_NAME, H5F_ACC_RDWR );
-	DataSet dataset = file.openDataSet( DATASET_NAME );
-
-	// Create the data space for the attribute.
-	DataSpace attr_dataspace = DataSpace (1, dims );
-
-	// Create a dataset attribute. 
-	Attribute attribute = dataset.createAttribute( ATTR_NAME, PredType::STD_I32BE, 
-	                                          attr_dataspace);
-     
-	// Write the attribute data. 
-	attribute.write( PredType::NATIVE_INT, attr_data);
-
-   }  // end of try block
-
-   // catch failure caused by the H5File operations
-   catch( DataSpaceIException error )
-   {
-	error.printError();
-	return -1;
-   }
-
-   // catch failure caused by the H5File operations
-   catch( AttributeIException error )
-   {
-	error.printError();
-	return -1;
-   }
-
-   // catch failure caused by the H5File operations
-   catch( FileIException error )
-   {
-	error.printError();
-	return -1;
-   }
-
-   // catch failure caused by the DataSet operations
-   catch( DataSetIException error )
-   {
-	error.printError();
-	return -1;
-   }
-
-   return 0;  // successfully terminated
+    int     attr_data[2] = {100, 200};
+    hsize_t dims[1]      = {DIM1};
+
+    // Try block to detect exceptions raised by any of the calls inside it
+    try {
+        // Turn off the auto-printing when failure occurs so that we can
+        // handle the errors appropriately
+        Exception::dontPrint();
+
+        // Open an existing file and dataset.
+        H5File  file(FILE_NAME, H5F_ACC_RDWR);
+        DataSet dataset = file.openDataSet(DATASET_NAME);
+
+        // Create the data space for the attribute.
+        DataSpace attr_dataspace = DataSpace(1, dims);
+
+        // Create a dataset attribute.
+        Attribute attribute = dataset.createAttribute(ATTR_NAME, PredType::STD_I32BE, attr_dataspace);
+
+        // Write the attribute data.
+        attribute.write(PredType::NATIVE_INT, attr_data);
+
+    } // end of try block
+
+    // catch failure caused by the H5File operations
+    catch (DataSpaceIException error) {
+        error.printErrorStack();
+        return -1;
+    }
+
+    // catch failure caused by the H5File operations
+    catch (AttributeIException error) {
+        error.printErrorStack();
+        return -1;
+    }
+
+    // catch failure caused by the H5File operations
+    catch (FileIException error) {
+        error.printErrorStack();
+        return -1;
+    }
+
+    // catch failure caused by the DataSet operations
+    catch (DataSetIException error) {
+        error.printErrorStack();
+        return -1;
+    }
+
+    return 0; // successfully terminated
 }
-
diff --git a/c++/examples/h5tutr_crtdat.cpp b/c++/examples/h5tutr_crtdat.cpp
index c767f72..d23675f 100644
--- a/c++/examples/h5tutr_crtdat.cpp
+++ b/c++/examples/h5tutr_crtdat.cpp
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.						     *
- * Copyright by the Board of Trustees of the University of Illinois.	     *
- * All rights reserved.							     *
- *	                                                                     *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have	     *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
@@ -22,61 +19,54 @@
 #include <string>
 
 #include "H5Cpp.h"
+using namespace H5;
 
-#ifndef H5_NO_NAMESPACE
-    using namespace H5;
-#endif
+const H5std_string FILE_NAME("h5tutr_dset.h5");
+const H5std_string DATASET_NAME("dset");
+const int          NX   = 4; // dataset dimensions
+const int          NY   = 6;
+const int          RANK = 2;
 
-const H5std_string	FILE_NAME("h5tutr_dset.h5");
-const H5std_string	DATASET_NAME("dset");
-const int	 NX = 4;                     // dataset dimensions
-const int	 NY = 6;
-const int	 RANK = 2;
-
-int main (void)
+int
+main(void)
 {
     // Try block to detect exceptions raised by any of the calls inside it
-    try
-    {
-	// Turn off the auto-printing when failure occurs so that we can
-	// handle the errors appropriately
-	Exception::dontPrint();
+    try {
+        // Turn off the auto-printing when failure occurs so that we can
+        // handle the errors appropriately
+        Exception::dontPrint();
 
-	// Create a new file using the default property lists. 
-	H5File file(FILE_NAME, H5F_ACC_TRUNC);
+        // Create a new file using the default property lists.
+        H5File file(FILE_NAME, H5F_ACC_TRUNC);
 
-	// Create the data space for the dataset.
-	hsize_t dims[2];               // dataset dimensions
-	dims[0] = NX;
-	dims[1] = NY;
-	DataSpace dataspace(RANK, dims);
+        // Create the data space for the dataset.
+        hsize_t dims[2]; // dataset dimensions
+        dims[0] = NX;
+        dims[1] = NY;
+        DataSpace dataspace(RANK, dims);
 
-	// Create the dataset.      
-	DataSet dataset = file.createDataSet(DATASET_NAME, PredType::STD_I32BE, dataspace);
+        // Create the dataset.
+        DataSet dataset = file.createDataSet(DATASET_NAME, PredType::STD_I32BE, dataspace);
 
-    }  // end of try block
+    } // end of try block
 
     // catch failure caused by the H5File operations
-    catch(FileIException error)
-    {
-	error.printError();
-	return -1;
+    catch (FileIException error) {
+        error.printErrorStack();
+        return -1;
     }
 
     // catch failure caused by the DataSet operations
-    catch(DataSetIException error)
-    {
-	error.printError();
-	return -1;
+    catch (DataSetIException error) {
+        error.printErrorStack();
+        return -1;
     }
 
     // catch failure caused by the DataSpace operations
-    catch(DataSpaceIException error)
-    {
-	error.printError();
-	return -1;
+    catch (DataSpaceIException error) {
+        error.printErrorStack();
+        return -1;
     }
 
-    return 0;  // successfully terminated
+    return 0; // successfully terminated
 }
-
diff --git a/c++/examples/h5tutr_crtgrp.cpp b/c++/examples/h5tutr_crtgrp.cpp
index 3db4e72..5b13dc3 100644
--- a/c++/examples/h5tutr_crtgrp.cpp
+++ b/c++/examples/h5tutr_crtgrp.cpp
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.						     *
- * Copyright by the Board of Trustees of the University of Illinois.	     *
- * All rights reserved.							     *
- *	                                                                     *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have	     *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
@@ -19,51 +16,44 @@
  */
 
 #include <iostream>
-#include <string>
+using std::cout;
+using std::endl;
 
+#include <string>
 #include "H5Cpp.h"
-
-#ifndef H5_NO_NAMESPACE
-    using namespace H5;
-#ifndef H5_NO_STD
-    using std::cout;
-    using std::endl;
-#endif  // H5_NO_STD
-#endif
+using namespace H5;
 
 const H5std_string FILE_NAME("h5tutr_group.h5");
 
-int main(void)
+int
+main(void)
 {
     // Try block to detect exceptions raised by any of the calls inside it
-    try
-    {
-	// Turn off the auto-printing when failure occurs so that we can
-	// handle the errors appropriately
-	Exception::dontPrint();
+    try {
+        // Turn off the auto-printing when failure occurs so that we can
+        // handle the errors appropriately
+        Exception::dontPrint();
 
-	// Create a new file using default property lists.
-	H5File file(FILE_NAME, H5F_ACC_TRUNC);
-	
-	// Create a group named "/MygGroup" in the file
-	Group group(file.createGroup("/MyGroup"));
+        // Create a new file using default property lists.
+        H5File file(FILE_NAME, H5F_ACC_TRUNC);
+
+        // Create a group named "/MygGroup" in the file
+        Group group(file.createGroup("/MyGroup"));
+
+        // File and group will be closed as their instances go out of scope.
 
-	// File and group will be closed as their instances go out of scope.
-   
     } // end of try block
 
     // catch failure caused by the H5File operations
-    catch(FileIException error)
-    {
-	error.printError();
-	return -1;
+    catch (FileIException error) {
+        error.printErrorStack();
+        return -1;
     }
     // catch failure caused by the Group operations
-    catch(GroupIException error)
-    {
-	error.printError();
-	return -1;
+    catch (GroupIException error) {
+        error.printErrorStack();
+        return -1;
     }
- 
+
     return 0;
 }
diff --git a/c++/examples/h5tutr_crtgrpar.cpp b/c++/examples/h5tutr_crtgrpar.cpp
index f6e031f..a1a7427 100644
--- a/c++/examples/h5tutr_crtgrpar.cpp
+++ b/c++/examples/h5tutr_crtgrpar.cpp
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.						     *
- * Copyright by the Board of Trustees of the University of Illinois.	     *
- * All rights reserved.							     *
- *	                                                                     *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have	     *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
@@ -19,74 +16,65 @@
  */
 
 #include <iostream>
-#include <string>
+using std::cout;
+using std::endl;
 
+#include <string>
 #include "H5Cpp.h"
-
-#ifndef H5_NO_NAMESPACE
-    using namespace H5;
-#ifndef H5_NO_STD
-    using std::cout;
-    using std::endl;
-#endif  // H5_NO_STD
-#endif
+using namespace H5;
 
 const H5std_string FILE_NAME("h5tutr_groups.h5");
 
-int main(void)
+int
+main(void)
 {
 
     // Try block to detect exceptions raised by any of the calls inside it
-    try
-    {
-      
-	// Turn off the auto-printing when failure occurs so that we can
-	// handle the errors appropriately.
-
-	Exception::dontPrint();
-
-	// Create a new file using default properties.
-
-	H5File file(FILE_NAME, H5F_ACC_TRUNC);
-
-	// Create group "MyGroup" in the root group using an absolute name.
-	 
-	Group group1(file.createGroup( "/MyGroup"));
- 
-	// Create group "Group_A" in group "MyGroup" using an
-	// absolute name.
-
-	Group group2(file.createGroup("/MyGroup/Group_A"));   
-
-	// Create group "Group_B" in group "MyGroup" using a
-	// relative name.
-  
-	Group group3(group1.createGroup ("Group_B"));
- 
-	// Close the groups and file.
-
-	group1.close();
-	group2.close();
-	group3.close();
-	file.close();
-    
+    try {
+
+        // Turn off the auto-printing when failure occurs so that we can
+        // handle the errors appropriately.
+
+        Exception::dontPrint();
+
+        // Create a new file using default properties.
+
+        H5File file(FILE_NAME, H5F_ACC_TRUNC);
+
+        // Create group "MyGroup" in the root group using an absolute name.
+
+        Group group1(file.createGroup("/MyGroup"));
+
+        // Create group "Group_A" in group "MyGroup" using an
+        // absolute name.
+
+        Group group2(file.createGroup("/MyGroup/Group_A"));
+
+        // Create group "Group_B" in group "MyGroup" using a
+        // relative name.
+
+        Group group3(group1.createGroup("Group_B"));
+
+        // Close the groups and file.
+
+        group1.close();
+        group2.close();
+        group3.close();
+        file.close();
+
     } // end of try block
 
     // catch failure caused by the File operations
-    catch(FileIException error)
-    {
-	error.printError();
-	return -1;
+    catch (FileIException error) {
+        error.printErrorStack();
+        return -1;
     }
 
     // catch failure caused by the Group operations
-    catch(GroupIException error)
-    {
-	error.printError();
-	return -1;
+    catch (GroupIException error) {
+        error.printErrorStack();
+        return -1;
     }
 
     return 0;
 }
-
-
diff --git a/c++/examples/h5tutr_crtgrpd.cpp b/c++/examples/h5tutr_crtgrpd.cpp
index f0bde52..19bf99d 100644
--- a/c++/examples/h5tutr_crtgrpd.cpp
+++ b/c++/examples/h5tutr_crtgrpd.cpp
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.						     *
- * Copyright by the Board of Trustees of the University of Illinois.	     *
- * All rights reserved.							     *
- *	                                                                     *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have	     *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
@@ -19,123 +16,112 @@
  */
 
 #include <iostream>
-#include <string>
+using std::cout;
+using std::endl;
 
+#include <string>
 #include "H5Cpp.h"
-
-#ifndef H5_NO_NAMESPACE
-    using namespace H5;
-#ifndef H5_NO_STD
-     using std::cout;
-     using std::endl;
-#endif  // H5_NO_STD
-#endif
+using namespace H5;
 
 const H5std_string FILE_NAME("h5tutr_groups.h5");
 const H5std_string DATASET_NAME1("/MyGroup/dset1");
 const H5std_string DATASET_NAME2("dset2");
-const int	RANK = 2;
-const int	D1DIM1 = 3;
-const int	D1DIM2 = 3;
-const int	D2DIM1 = 2;
-const int	D2DIM2 = 10;
-
-int main(void)
+const int          RANK   = 2;
+const int          D1DIM1 = 3;
+const int          D1DIM2 = 3;
+const int          D2DIM1 = 2;
+const int          D2DIM2 = 10;
+
+int
+main(void)
 {
     int dset1_data[D1DIM1][D1DIM2], dset2_data[D2DIM1][D2DIM2]; // data buffers
     int i, j;
 
     // Try block to catch exceptions raised by any of the calls inside it
-    try
-    {
-	// Turn off the auto-printing when failure occurs so that we can
-	// handle the errors appropriately
-	Exception::dontPrint();
+    try {
+        // Turn off the auto-printing when failure occurs so that we can
+        // handle the errors appropriately
+        Exception::dontPrint();
 
-	// Initialize the first dataset. 
-	for (i = 0; i < D1DIM1; i++)
-	    for (j = 0; j < D1DIM2; j++)
-	       dset1_data[i][j] = j + 1;
+        // Initialize the first dataset.
+        for (i = 0; i < D1DIM1; i++)
+            for (j = 0; j < D1DIM2; j++)
+                dset1_data[i][j] = j + 1;
 
-	//  Initialize the second dataset. 
-	for (i = 0; i < D2DIM1; i++)
-	  for (j = 0; j < D2DIM2; j++)
-	      dset2_data[i][j] = j + 1;
+        //  Initialize the second dataset.
+        for (i = 0; i < D2DIM1; i++)
+            for (j = 0; j < D2DIM2; j++)
+                dset2_data[i][j] = j + 1;
 
-	// Open an existing file and dataset.
-	H5File file(FILE_NAME, H5F_ACC_RDWR);
+        // Open an existing file and dataset.
+        H5File file(FILE_NAME, H5F_ACC_RDWR);
 
         // Create the data space for the first dataset.  Note the use of
         // pointer for the instance 'dataspace'.  It can be deleted and
         // used again later for another data space.  An HDF5 identifier is
         // closed by the destructor or the method 'close()'.
-	hsize_t dims[RANK];               // dataset dimensions
-	dims[0] = D1DIM1;
-	dims[1] = D1DIM2;
-	DataSpace *dataspace = new DataSpace (RANK, dims);
-
-	// Create the dataset in group "MyGroup".  Same note as for the
-	// dataspace above.
-	DataSet *dataset = new DataSet (file.createDataSet(DATASET_NAME1, 
-	                                 PredType::STD_I32BE, *dataspace));
-
-	// Write the data to the dataset using default memory space, file
-	// space, and transfer properties.
-	dataset->write(dset1_data, PredType::NATIVE_INT);
-
-	// Close the current dataset and data space.
-	delete dataset;
-	delete dataspace;
-
-	// Create the data space for the second dataset.
-	dims[0] = D2DIM1;
-	dims[1] = D2DIM2;
-	dataspace = new DataSpace (RANK, dims);
-
-	// Create group "Group_A" in group "MyGroup".
-	Group group(file.openGroup("/MyGroup/Group_A"));
-
-	// Create the second dataset in group "Group_A".
-	dataset = new DataSet (group.createDataSet(DATASET_NAME2, 
-	                                 PredType::STD_I32BE, *dataspace));
-
-	// Write the data to the dataset using default memory space, file
-	// space, and transfer properties.
-	dataset->write(dset2_data, PredType::NATIVE_INT);
-
-	// Close all objects.
-	delete dataspace;
-	delete dataset;
-	group.close();
-    
+        hsize_t dims[RANK]; // dataset dimensions
+        dims[0]              = D1DIM1;
+        dims[1]              = D1DIM2;
+        DataSpace *dataspace = new DataSpace(RANK, dims);
+
+        // Create the dataset in group "MyGroup".  Same note as for the
+        // dataspace above.
+        DataSet *dataset = new DataSet(file.createDataSet(DATASET_NAME1, PredType::STD_I32BE, *dataspace));
+
+        // Write the data to the dataset using default memory space, file
+        // space, and transfer properties.
+        dataset->write(dset1_data, PredType::NATIVE_INT);
+
+        // Close the current dataset and data space.
+        delete dataset;
+        delete dataspace;
+
+        // Create the data space for the second dataset.
+        dims[0]   = D2DIM1;
+        dims[1]   = D2DIM2;
+        dataspace = new DataSpace(RANK, dims);
+
+        // Create group "Group_A" in group "MyGroup".
+        Group group(file.openGroup("/MyGroup/Group_A"));
+
+        // Create the second dataset in group "Group_A".
+        dataset = new DataSet(group.createDataSet(DATASET_NAME2, PredType::STD_I32BE, *dataspace));
+
+        // Write the data to the dataset using default memory space, file
+        // space, and transfer properties.
+        dataset->write(dset2_data, PredType::NATIVE_INT);
+
+        // Close all objects.
+        delete dataspace;
+        delete dataset;
+        group.close();
+
     } // end of try block
 
     // catch failure caused by the H5File operations
-    catch(FileIException error)
-    {
-	 error.printError();
-	 return -1;
+    catch (FileIException error) {
+        error.printErrorStack();
+        return -1;
     }
     // catch failure caused by the DataSet operations
-    catch(DataSetIException error)
-    {
-	 error.printError();
-	 return -1;
+    catch (DataSetIException error) {
+        error.printErrorStack();
+        return -1;
     }
 
     // catch failure caused by the DataSpace operations
-    catch(DataSpaceIException error)
-    {
-	error.printError();
-	return -1;
+    catch (DataSpaceIException error) {
+        error.printErrorStack();
+        return -1;
     }
 
     // catch failure caused by the Group operations
-    catch(GroupIException error)
-    {
-	error.printError();
-	return -1;
+    catch (GroupIException error) {
+        error.printErrorStack();
+        return -1;
     }
- 
-     return 0;
+
+    return 0;
 }
diff --git a/c++/examples/h5tutr_extend.cpp b/c++/examples/h5tutr_extend.cpp
index 432ca5e..b725f00 100644
--- a/c++/examples/h5tutr_extend.cpp
+++ b/c++/examples/h5tutr_extend.cpp
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.						     *
- * Copyright by the Board of Trustees of the University of Illinois.	     *
- * All rights reserved.							     *
- *	                                                                     *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have	     *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
@@ -19,159 +16,145 @@
  */
 
 #include <iostream>
-#include <string>
+using std::cout;
+using std::endl;
 
+#include <string>
 #include "H5Cpp.h"
+using namespace H5;
 
-#ifndef H5_NO_NAMESPACE
-     using namespace H5;
-#ifndef H5_NO_STD
-     using std::cout;
-     using std::endl;
-#endif  // H5_NO_STD
-#endif
-
-const H5std_string	FILE_NAME("h5tutr_extend.h5");
-const H5std_string	DATASETNAME("ExtendibleArray");
+const H5std_string FILE_NAME("h5tutr_extend.h5");
+const H5std_string DATASETNAME("ExtendibleArray");
 
-int main (void)
+int
+main(void)
 {
-     hsize_t dims[2] = {3,3};	        // dataset dimensions at creation
-     hsize_t maxdims[2] = {H5S_UNLIMITED, H5S_UNLIMITED}; 
-     hsize_t chunk_dims[2] ={2, 5};
-     int	   data[3][3] = { {1, 1, 1},    // data to write 
-	                          {1, 1, 1},
-	                          {1, 1, 1} };
-
-     // Variables used in extending and writing to the extended portion of dataset 
-
-     hsize_t size[2];
-     hsize_t offset[2];
-     hsize_t dimsext[2] = {7, 3};         // extend dimensions 
-     int     dataext[7][3] = { {2, 3, 4},
-	                              {2, 3, 4},
-	                              {2, 3, 4},
-	                              {2, 3, 4},
-	                              {2, 3, 4},
-	                              {2, 3, 4},
-	                              {2, 3, 4} };
+    hsize_t dims[2]       = {3, 3}; // dataset dimensions at creation
+    hsize_t maxdims[2]    = {H5S_UNLIMITED, H5S_UNLIMITED};
+    hsize_t chunk_dims[2] = {2, 5};
+    int     data[3][3]    = {{1, 1, 1}, // data to write
+                      {1, 1, 1},
+                      {1, 1, 1}};
+
+    // Variables used in extending and writing to the extended portion of dataset
+
+    hsize_t size[2];
+    hsize_t offset[2];
+    hsize_t dimsext[2]    = {7, 3}; // extend dimensions
+    int     dataext[7][3] = {{2, 3, 4}, {2, 3, 4}, {2, 3, 4}, {2, 3, 4}, {2, 3, 4}, {2, 3, 4}, {2, 3, 4}};
 
     // Try block to detect exceptions raised by any of the calls inside it
-    try
-    {
-	// Turn off the auto-printing when failure occurs so that we can
-	// handle the errors appropriately
-	Exception::dontPrint();
-
-	// Create a new file using the default property lists. 
-	H5File file(FILE_NAME, H5F_ACC_TRUNC);
-
-	// Create the data space for the dataset.  Note the use of pointer
-	// for the instance 'dataspace'.  It can be deleted and used again
-	// later for another dataspace.  An HDF5 identifier can be closed
-	// by the destructor or the method 'close()'.
-	DataSpace *dataspace = new DataSpace (2, dims, maxdims);
-
-	// Modify dataset creation property to enable chunking
-	DSetCreatPropList prop;
-	prop.setChunk(2, chunk_dims);
-
-	// Create the chunked dataset.  Note the use of pointer.
-	DataSet *dataset = new DataSet(file.createDataSet( DATASETNAME, 
-	                         PredType::STD_I32BE, *dataspace, prop) );
- 
-	// Write data to dataset.
-	dataset->write(data, PredType::NATIVE_INT);
-
-	// Extend the dataset. Dataset becomes 10 x 3.
-	size[0] = dims[0] + dimsext[0];
-	size[1] = dims[1];
-	dataset->extend(size); 
-
-	// Select a hyperslab in extended portion of the dataset.
-	DataSpace *filespace = new DataSpace(dataset->getSpace ());
-	offset[0] = 3;
-	offset[1] = 0;
-	filespace->selectHyperslab(H5S_SELECT_SET, dimsext, offset);
-	
-	// Define memory space.
-	DataSpace *memspace = new DataSpace(2, dimsext, NULL);
-
-	// Write data to the extended portion of the dataset.
-	dataset->write(dataext, PredType::NATIVE_INT, *memspace, *filespace);
-
-	// Close all objects and file.
-	prop.close();
-	delete filespace;
-	delete memspace;
-	delete dataspace;
-	delete dataset;
-	file.close();
-
-	// --------------------------------------- 
-	// Re-open the file and read the data back
-	// --------------------------------------- 
-
-	int        rdata[10][3];
-	int        i,j, rank, rank_chunk;
-	hsize_t    chunk_dimsr[2], dimsr[2];
-
-	// Open the file and dataset.
-	file.openFile(FILE_NAME, H5F_ACC_RDONLY);
-	dataset = new DataSet(file.openDataSet( DATASETNAME)); 
-
-	// Get the dataset's dataspace and creation property list.
-	filespace = new DataSpace(dataset->getSpace());
-	prop = dataset->getCreatePlist();
-
-	// Get information to obtain memory dataspace.
-	rank = filespace->getSimpleExtentNdims();
-	herr_t status_n = filespace->getSimpleExtentDims(dimsr);
-
-	if (H5D_CHUNKED == prop.getLayout())
-	     rank_chunk = prop.getChunk(rank, chunk_dimsr);
-	cout << "rank chunk = " << rank_chunk << endl;;
-
-	memspace = new DataSpace(rank, dimsr, NULL);
-	dataset->read(rdata, PredType::NATIVE_INT, *memspace, *filespace);
-      
-	cout << endl;
-	for (j = 0; j < dimsr[0]; j++) {
-	    for (i = 0; i < dimsr[1]; i++)
-	       cout << " " <<  rdata[j][i];
-	    cout << endl;
-	}
-
-	// Close all objects and file.
-	prop.close();
-	delete filespace;
-	delete memspace;
-	delete dataset;
-	file.close();
-      
-    }  // end of try block
+    try {
+        // Turn off the auto-printing when failure occurs so that we can
+        // handle the errors appropriately
+        Exception::dontPrint();
+
+        // Create a new file using the default property lists.
+        H5File file(FILE_NAME, H5F_ACC_TRUNC);
+
+        // Create the data space for the dataset.  Note the use of pointer
+        // for the instance 'dataspace'.  It can be deleted and used again
+        // later for another dataspace.  An HDF5 identifier can be closed
+        // by the destructor or the method 'close()'.
+        DataSpace *dataspace = new DataSpace(2, dims, maxdims);
+
+        // Modify dataset creation property to enable chunking
+        DSetCreatPropList prop;
+        prop.setChunk(2, chunk_dims);
+
+        // Create the chunked dataset.  Note the use of pointer.
+        DataSet *dataset =
+            new DataSet(file.createDataSet(DATASETNAME, PredType::STD_I32BE, *dataspace, prop));
+
+        // Write data to dataset.
+        dataset->write(data, PredType::NATIVE_INT);
+
+        // Extend the dataset. Dataset becomes 10 x 3.
+        size[0] = dims[0] + dimsext[0];
+        size[1] = dims[1];
+        dataset->extend(size);
+
+        // Select a hyperslab in extended portion of the dataset.
+        DataSpace *filespace = new DataSpace(dataset->getSpace());
+        offset[0]            = 3;
+        offset[1]            = 0;
+        filespace->selectHyperslab(H5S_SELECT_SET, dimsext, offset);
+
+        // Define memory space.
+        DataSpace *memspace = new DataSpace(2, dimsext, NULL);
+
+        // Write data to the extended portion of the dataset.
+        dataset->write(dataext, PredType::NATIVE_INT, *memspace, *filespace);
+
+        // Close all objects and file.
+        prop.close();
+        delete filespace;
+        delete memspace;
+        delete dataspace;
+        delete dataset;
+        file.close();
+
+        // ---------------------------------------
+        // Re-open the file and read the data back
+        // ---------------------------------------
+
+        int     rdata[10][3];
+        int     i, j, rank, rank_chunk;
+        hsize_t chunk_dimsr[2], dimsr[2];
+
+        // Open the file and dataset.
+        file.openFile(FILE_NAME, H5F_ACC_RDONLY);
+        dataset = new DataSet(file.openDataSet(DATASETNAME));
+
+        // Get the dataset's dataspace and creation property list.
+        filespace = new DataSpace(dataset->getSpace());
+        prop      = dataset->getCreatePlist();
+
+        // Get information to obtain memory dataspace.
+        rank            = filespace->getSimpleExtentNdims();
+        herr_t status_n = filespace->getSimpleExtentDims(dimsr);
+
+        if (H5D_CHUNKED == prop.getLayout())
+            rank_chunk = prop.getChunk(rank, chunk_dimsr);
+        cout << "rank chunk = " << rank_chunk << endl;
+        ;
+
+        memspace = new DataSpace(rank, dimsr, NULL);
+        dataset->read(rdata, PredType::NATIVE_INT, *memspace, *filespace);
+
+        cout << endl;
+        for (j = 0; j < dimsr[0]; j++) {
+            for (i = 0; i < dimsr[1]; i++)
+                cout << " " << rdata[j][i];
+            cout << endl;
+        }
+
+        // Close all objects and file.
+        prop.close();
+        delete filespace;
+        delete memspace;
+        delete dataset;
+        file.close();
+
+    } // end of try block
 
     // catch failure caused by the H5File operations
-    catch(FileIException error)
-    {
-	error.printError();
-	return -1;
+    catch (FileIException error) {
+        error.printErrorStack();
+        return -1;
     }
 
     // catch failure caused by the DataSet operations
-    catch(DataSetIException error)
-    {
-	error.printError();
-	return -1;
+    catch (DataSetIException error) {
+        error.printErrorStack();
+        return -1;
     }
 
     // catch failure caused by the DataSpace operations
-    catch(DataSpaceIException error)
-    {
-	error.printError();
-	return -1;
+    catch (DataSpaceIException error) {
+        error.printErrorStack();
+        return -1;
     }
 
-    return 0;  // successfully terminated
+    return 0; // successfully terminated
 }
-
diff --git a/c++/examples/h5tutr_rdwt.cpp b/c++/examples/h5tutr_rdwt.cpp
index 68c28ca..3f44109 100644
--- a/c++/examples/h5tutr_rdwt.cpp
+++ b/c++/examples/h5tutr_rdwt.cpp
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.						     *
- * Copyright by the Board of Trustees of the University of Illinois.	     *
- * All rights reserved.							     *
- *	                                                                     *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have	     *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
@@ -20,60 +17,54 @@
 
 #include <iostream>
 #include <string>
-
 #include "H5Cpp.h"
+using namespace H5;
 
-#ifndef H5_NO_NAMESPACE
-    using namespace H5;
-#endif
-
-const H5std_string	FILE_NAME("h5tutr_dset.h5");
-const H5std_string	DATASET_NAME("dset");
-const int 	DIM0 = 4;	               // dataset dimensions
-const int 	DIM1 = 6;
+const H5std_string FILE_NAME("h5tutr_dset.h5");
+const H5std_string DATASET_NAME("dset");
+const int          DIM0 = 4; // dataset dimensions
+const int          DIM1 = 6;
 
-int main (void)
+int
+main(void)
 {
-    
+
     // Data initialization.
-     
+
     int i, j;
-    int data[DIM0][DIM1];	    // buffer for data to write
+    int data[DIM0][DIM1]; // buffer for data to write
 
     for (j = 0; j < DIM0; j++)
-	for (i = 0; i < DIM1; i++)
-	 data[j][i] = i * 6 + j + 1;
+        for (i = 0; i < DIM1; i++)
+            data[j][i] = i * 6 + j + 1;
 
     // Try block to detect exceptions raised by any of the calls inside it
-    try
-    {
-	// Turn off the auto-printing when failure occurs so that we can
-	// handle the errors appropriately
-	Exception::dontPrint();
+    try {
+        // Turn off the auto-printing when failure occurs so that we can
+        // handle the errors appropriately
+        Exception::dontPrint();
 
-	// Open an existing file and dataset.
-	H5File file(FILE_NAME, H5F_ACC_RDWR);
-	DataSet dataset = file.openDataSet(DATASET_NAME);
+        // Open an existing file and dataset.
+        H5File  file(FILE_NAME, H5F_ACC_RDWR);
+        DataSet dataset = file.openDataSet(DATASET_NAME);
 
-	// Write the data to the dataset using default memory space, file
-	// space, and transfer properties.
-	dataset.write(data, PredType::NATIVE_INT);
+        // Write the data to the dataset using default memory space, file
+        // space, and transfer properties.
+        dataset.write(data, PredType::NATIVE_INT);
 
-    }  // end of try block
+    } // end of try block
 
     // catch failure caused by the H5File operations
-    catch(FileIException error)
-    {
-	error.printError();
-	return -1;
+    catch (FileIException error) {
+        error.printErrorStack();
+        return -1;
     }
 
     // catch failure caused by the DataSet operations
-    catch(DataSetIException error)
-    {
-	error.printError();
-	return -1;
+    catch (DataSetIException error) {
+        error.printErrorStack();
+        return -1;
     }
 
-    return 0;  // successfully terminated
+    return 0; // successfully terminated
 }
diff --git a/c++/examples/h5tutr_subset.cpp b/c++/examples/h5tutr_subset.cpp
index ad52747..1f278f0 100644
--- a/c++/examples/h5tutr_subset.cpp
+++ b/c++/examples/h5tutr_subset.cpp
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.						     *
- * Copyright by the Board of Trustees of the University of Illinois.	     *
- * All rights reserved.							     *
- *	                                                                     *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have	     *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
@@ -19,165 +16,153 @@
  */
 
 #include <iostream>
-#include <string>
+using std::cout;
+using std::endl;
 
+#include <string>
 #include "H5Cpp.h"
+using namespace H5;
 
-#ifndef H5_NO_NAMESPACE
-     using namespace H5;
-#ifndef H5_NO_STD
-     using std::cout;
-     using std::endl;
-#endif  // H5_NO_STD
-#endif
+const H5std_string FILE_NAME("h5tutr_subset.h5");
+const H5std_string DATASET_NAME("IntArray");
 
-const H5std_string	FILE_NAME("h5tutr_subset.h5");
-const H5std_string	DATASET_NAME("IntArray");
+const int RANK     = 2;
+const int DIM0_SUB = 3; // subset dimensions
+const int DIM1_SUB = 4;
+const int DIM0     = 8; // size of dataset
+const int DIM1     = 10;
 
-const int     RANK = 2;
-const int     DIM0_SUB = 3;	// subset dimensions
-const int     DIM1_SUB = 4;
-const int     DIM0 = 8;		// size of dataset
-const int     DIM1 = 10;
-
-int main (void)
+int
+main(void)
 {
-    int     i,j;
-    int     data[DIM0][DIM1], sdata[DIM0_SUB][DIM1_SUB], rdata[DIM0][DIM1];
+    int i, j;
+    int data[DIM0][DIM1], sdata[DIM0_SUB][DIM1_SUB], rdata[DIM0][DIM1];
 
     // Try block to detect exceptions raised by any of the calls inside it
-    try
-    {
-	// Turn off the auto-printing when failure occurs so that we can
-	// handle the errors appropriately
-	Exception::dontPrint();
-
-	// ---------------------------------------------------
-	// Create a new file using the default property lists. 
-	// Then create a dataset and write data to it. 
-	// Close the file and dataset.
-	// ---------------------------------------------------
-      
-	H5File file(FILE_NAME, H5F_ACC_TRUNC);
-
-	hsize_t dims[2];              
-	dims[0] = DIM0;
-	dims[1] = DIM1;
-	DataSpace dataspace = DataSpace (RANK, dims);
-
-	DataSet dataset(file.createDataSet( DATASET_NAME, 
-	                                 PredType::STD_I32BE, dataspace) );
-
-
-	for (j = 0; j < DIM0; j++) {
-	     for (i = 0; i < DIM1; i++)
-	         if (i< (DIM1/2))
-	            data[j][i] = 1;
-	         else
-	            data[j][i] = 2;
-	      }
-
-	dataset.write(data, PredType::NATIVE_INT);
-
-	cout << endl << "Data Written to File:" << endl;
-	for (j = 0; j < DIM0; j++) {
-	    for (i = 0; i < DIM1; i++)
-	       cout << " " <<  data[j][i];
-	    cout << endl;
-	}
-
-	dataspace.close();
-	dataset.close();
-	file.close();
-
-	// ---------------------------------------------------
-	// Reopen the file and dataset and write a subset of
-	// values to the dataset.
-	// ---------------------------------------------------
-
-	hsize_t offset[2], count[2], stride[2], block[2];
-	hsize_t dimsm[2];
-
-	file.openFile(FILE_NAME, H5F_ACC_RDWR);
-	dataset = file.openDataSet(DATASET_NAME);
-
-	// Specify size and shape of subset to write. 
-
-	offset[0] = 1;
-	offset[1] = 2;
-
-	count[0]  = DIM0_SUB;
-	count[1]  = DIM1_SUB;
-
-	stride[0] = 1;
-	stride[1] = 1;
-
-	block[0] = 1;
-	block[1] = 1;
-  
-	// Define Memory Dataspace. Get file dataspace and select
-	// a subset from the file dataspace.
-
-	dimsm[0] = DIM0_SUB;
-	dimsm[1] = DIM1_SUB;
-
-	DataSpace memspace(RANK, dimsm, NULL);
-
-	dataspace = dataset.getSpace();
-	dataspace.selectHyperslab(H5S_SELECT_SET, count, offset, stride, block); 
-
-	// Write a subset of data to the dataset, then read the
-	// entire dataset back from the file.
-
-	cout << endl << "Write subset to file specifying: " << endl;
-	cout << "  offset=1x2 stride=1x1 count=3x4 block=1x1" << endl;
-	for (j = 0; j < DIM0_SUB; j++) {
-	    for (i = 0; i < DIM1_SUB; i++)
-	       sdata[j][i] = 5;
-	} 
-	
-	dataset.write(sdata, PredType::NATIVE_INT, memspace, dataspace);
-	dataset.read(rdata, PredType::NATIVE_INT);
-
- 
-	cout << endl << "Data in File after Subset is Written:" << endl;
-	for (i = 0; i < DIM0; i++) {
-	    for (j = 0; j < DIM1; j++) 
-	       cout << " " <<  rdata[i][j];
-	    cout << endl;
-	}
-	cout << endl;
-
-	// It is not necessary to close these objects because close() will
-	// be called when the object instances are going out of scope.
-	dataspace.close();
-	memspace.close();
-	dataset.close();
-	file.close();
-
-    }  // end of try block
+    try {
+        // Turn off the auto-printing when failure occurs so that we can
+        // handle the errors appropriately
+        Exception::dontPrint();
+
+        // ---------------------------------------------------
+        // Create a new file using the default property lists.
+        // Then create a dataset and write data to it.
+        // Close the file and dataset.
+        // ---------------------------------------------------
+
+        H5File file(FILE_NAME, H5F_ACC_TRUNC);
+
+        hsize_t dims[2];
+        dims[0]             = DIM0;
+        dims[1]             = DIM1;
+        DataSpace dataspace = DataSpace(RANK, dims);
+
+        DataSet dataset(file.createDataSet(DATASET_NAME, PredType::STD_I32BE, dataspace));
+
+        for (j = 0; j < DIM0; j++) {
+            for (i = 0; i < DIM1; i++)
+                if (i < (DIM1 / 2))
+                    data[j][i] = 1;
+                else
+                    data[j][i] = 2;
+        }
+
+        dataset.write(data, PredType::NATIVE_INT);
+
+        cout << endl << "Data Written to File:" << endl;
+        for (j = 0; j < DIM0; j++) {
+            for (i = 0; i < DIM1; i++)
+                cout << " " << data[j][i];
+            cout << endl;
+        }
+
+        dataspace.close();
+        dataset.close();
+        file.close();
+
+        // ---------------------------------------------------
+        // Reopen the file and dataset and write a subset of
+        // values to the dataset.
+        // ---------------------------------------------------
+
+        hsize_t offset[2], count[2], stride[2], block[2];
+        hsize_t dimsm[2];
+
+        file.openFile(FILE_NAME, H5F_ACC_RDWR);
+        dataset = file.openDataSet(DATASET_NAME);
+
+        // Specify size and shape of subset to write.
+
+        offset[0] = 1;
+        offset[1] = 2;
+
+        count[0] = DIM0_SUB;
+        count[1] = DIM1_SUB;
+
+        stride[0] = 1;
+        stride[1] = 1;
+
+        block[0] = 1;
+        block[1] = 1;
+
+        // Define Memory Dataspace. Get file dataspace and select
+        // a subset from the file dataspace.
+
+        dimsm[0] = DIM0_SUB;
+        dimsm[1] = DIM1_SUB;
+
+        DataSpace memspace(RANK, dimsm, NULL);
+
+        dataspace = dataset.getSpace();
+        dataspace.selectHyperslab(H5S_SELECT_SET, count, offset, stride, block);
+
+        // Write a subset of data to the dataset, then read the
+        // entire dataset back from the file.
+
+        cout << endl << "Write subset to file specifying: " << endl;
+        cout << "  offset=1x2 stride=1x1 count=3x4 block=1x1" << endl;
+        for (j = 0; j < DIM0_SUB; j++) {
+            for (i = 0; i < DIM1_SUB; i++)
+                sdata[j][i] = 5;
+        }
+
+        dataset.write(sdata, PredType::NATIVE_INT, memspace, dataspace);
+        dataset.read(rdata, PredType::NATIVE_INT);
+
+        cout << endl << "Data in File after Subset is Written:" << endl;
+        for (i = 0; i < DIM0; i++) {
+            for (j = 0; j < DIM1; j++)
+                cout << " " << rdata[i][j];
+            cout << endl;
+        }
+        cout << endl;
+
+        // It is not necessary to close these objects because close() will
+        // be called when the object instances are going out of scope.
+        dataspace.close();
+        memspace.close();
+        dataset.close();
+        file.close();
+
+    } // end of try block
 
     // catch failure caused by the H5File operations
-    catch(FileIException error)
-    {
-	error.printError();
-	return -1;
+    catch (FileIException error) {
+        error.printErrorStack();
+        return -1;
     }
 
     // catch failure caused by the DataSet operations
-    catch(DataSetIException error)
-    {
-	error.printError();
-	return -1;
+    catch (DataSetIException error) {
+        error.printErrorStack();
+        return -1;
     }
 
     // catch failure caused by the DataSpace operations
-    catch(DataSpaceIException error)
-    {
-	error.printError();
-	return -1;
+    catch (DataSpaceIException error) {
+        error.printErrorStack();
+        return -1;
     }
 
-    return 0;  // successfully terminated
+    return 0; // successfully terminated
 }
-
diff --git a/c++/examples/readdata.cpp b/c++/examples/readdata.cpp
index b615a40..1deed36 100644
--- a/c++/examples/readdata.cpp
+++ b/c++/examples/readdata.cpp
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 //
@@ -19,204 +16,182 @@
 //      information about the dataset in the SDS.h5 file is obtained.
 //
 
-#ifdef OLD_HEADER_FILENAME
-#include <iostream.h>
-#else
 #include <iostream>
-#endif
-#include <string>
-
-#ifndef H5_NO_NAMESPACE
-#ifndef H5_NO_STD
-    using std::cout;
-    using std::endl;
-#endif  // H5_NO_STD
-#endif
+using std::cout;
+using std::endl;
 
+#include <string>
 #include "H5Cpp.h"
-
-#ifndef H5_NO_NAMESPACE
-    using namespace H5;
-#endif
-
-const H5std_string FILE_NAME( "SDS.h5" );
-const H5std_string DATASET_NAME( "IntArray" );
-const int    NX_SUB = 3;	// hyperslab dimensions
-const int    NY_SUB = 4;
-const int    NX = 7;		// output buffer dimensions
-const int    NY = 7;
-const int    NZ = 3;
-const int    RANK_OUT = 3;
-
-int main (void)
+using namespace H5;
+
+const H5std_string FILE_NAME("SDS.h5");
+const H5std_string DATASET_NAME("IntArray");
+const int          NX_SUB   = 3; // hyperslab dimensions
+const int          NY_SUB   = 4;
+const int          NX       = 7; // output buffer dimensions
+const int          NY       = 7;
+const int          NZ       = 3;
+const int          RANK_OUT = 3;
+
+int
+main(void)
 {
-   /*
-    * Output buffer initialization.
-    */
-   int i, j, k;
-   int         data_out[NX][NY][NZ ]; /* output buffer */
-   for (j = 0; j < NX; j++)
-   {
-      for (i = 0; i < NY; i++)
-      {
- 	 for (k = 0; k < NZ ; k++)
-	    data_out[j][i][k] = 0;
-      }
-   }
-
-   /*
-    * Try block to detect exceptions raised by any of the calls inside it
-    */
-   try
-   {
-      /*
-       * Turn off the auto-printing when failure occurs so that we can
-       * handle the errors appropriately
-       */
-      Exception::dontPrint();
-
-      /*
-       * Open the specified file and the specified dataset in the file.
-       */
-      H5File file( FILE_NAME, H5F_ACC_RDONLY );
-      DataSet dataset = file.openDataSet( DATASET_NAME );
-
-      /*
-       * Get the class of the datatype that is used by the dataset.
-       */
-      H5T_class_t type_class = dataset.getTypeClass();
-
-      /*
-       * Get class of datatype and print message if it's an integer.
-       */
-      if( type_class == H5T_INTEGER )
-      {
-	 cout << "Data set has INTEGER type" << endl;
-
-         /*
-	  * Get the integer datatype
-          */
-	 IntType intype = dataset.getIntType();
-
-         /*
-          * Get order of datatype and print message if it's a little endian.
-          */
-	 H5std_string order_string;
-         H5T_order_t order = intype.getOrder( order_string );
-	 cout << order_string << endl;
-
-         /*
-          * Get size of the data element stored in file and print it.
-          */
-         size_t size = intype.getSize();
-         cout << "Data size is " << size << endl;
-      }
-
-      /*
-       * Get dataspace of the dataset.
-       */
-      DataSpace dataspace = dataset.getSpace();
-
-      /*
-       * Get the number of dimensions in the dataspace.
-       */
-      int rank = dataspace.getSimpleExtentNdims();
-
-      /*
-       * Get the dimension size of each dimension in the dataspace and
-       * display them.
-       */
-      hsize_t dims_out[2];
-      int ndims = dataspace.getSimpleExtentDims( dims_out, NULL);
-      cout << "rank " << rank << ", dimensions " <<
-	      (unsigned long)(dims_out[0]) << " x " <<
-	      (unsigned long)(dims_out[1]) << endl;
-
-      /*
-       * Define hyperslab in the dataset; implicitly giving strike and
-       * block NULL.
-       */
-      hsize_t      offset[2];	// hyperslab offset in the file
-      hsize_t      count[2];	// size of the hyperslab in the file
-      offset[0] = 1;
-      offset[1] = 2;
-      count[0]  = NX_SUB;
-      count[1]  = NY_SUB;
-      dataspace.selectHyperslab( H5S_SELECT_SET, count, offset );
-
-      /*
-       * Define the memory dataspace.
-       */
-      hsize_t     dimsm[3];              /* memory space dimensions */
-      dimsm[0] = NX;
-      dimsm[1] = NY;
-      dimsm[2] = NZ ;
-      DataSpace memspace( RANK_OUT, dimsm );
-
-      /*
-       * Define memory hyperslab.
-       */
-      hsize_t      offset_out[3];	// hyperslab offset in memory
-      hsize_t      count_out[3];	// size of the hyperslab in memory
-      offset_out[0] = 3;
-      offset_out[1] = 0;
-      offset_out[2] = 0;
-      count_out[0]  = NX_SUB;
-      count_out[1]  = NY_SUB;
-      count_out[2]  = 1;
-      memspace.selectHyperslab( H5S_SELECT_SET, count_out, offset_out );
-
-      /*
-       * Read data from hyperslab in the file into the hyperslab in
-       * memory and display the data.
-       */
-      dataset.read( data_out, PredType::NATIVE_INT, memspace, dataspace );
-
-      for (j = 0; j < NX; j++)
-      {
-	for (i = 0; i < NY; i++)
-	   cout << data_out[j][i][0] << " ";
-	cout << endl;
-      }
-      /*
-       * 0 0 0 0 0 0 0
-       * 0 0 0 0 0 0 0
-       * 0 0 0 0 0 0 0
-       * 3 4 5 6 0 0 0
-       * 4 5 6 7 0 0 0
-       * 5 6 7 8 0 0 0
-       * 0 0 0 0 0 0 0
-       */
-   }  // end of try block
-
-   // catch failure caused by the H5File operations
-   catch( FileIException error )
-   {
-      error.printError();
-      return -1;
-   }
-
-   // catch failure caused by the DataSet operations
-   catch( DataSetIException error )
-   {
-      error.printError();
-      return -1;
-   }
-
-   // catch failure caused by the DataSpace operations
-   catch( DataSpaceIException error )
-   {
-      error.printError();
-      return -1;
-   }
-
-   // catch failure caused by the DataSpace operations
-   catch( DataTypeIException error )
-   {
-      error.printError();
-      return -1;
-   }
-
-   return 0;  // successfully terminated
+    /*
+     * Output buffer initialization.
+     */
+    int i, j, k;
+    int data_out[NX][NY][NZ]; /* output buffer */
+    for (j = 0; j < NX; j++) {
+        for (i = 0; i < NY; i++) {
+            for (k = 0; k < NZ; k++)
+                data_out[j][i][k] = 0;
+        }
+    }
+
+    /*
+     * Try block to detect exceptions raised by any of the calls inside it
+     */
+    try {
+        /*
+         * Turn off the auto-printing when failure occurs so that we can
+         * handle the errors appropriately
+         */
+        Exception::dontPrint();
+
+        /*
+         * Open the specified file and the specified dataset in the file.
+         */
+        H5File  file(FILE_NAME, H5F_ACC_RDONLY);
+        DataSet dataset = file.openDataSet(DATASET_NAME);
+
+        /*
+         * Get the class of the datatype that is used by the dataset.
+         */
+        H5T_class_t type_class = dataset.getTypeClass();
+
+        /*
+         * Get class of datatype and print message if it's an integer.
+         */
+        if (type_class == H5T_INTEGER) {
+            cout << "Data set has INTEGER type" << endl;
+
+            /*
+             * Get the integer datatype
+             */
+            IntType intype = dataset.getIntType();
+
+            /*
+             * Get order of datatype and print message if it's a little endian.
+             */
+            H5std_string order_string;
+            H5T_order_t  order = intype.getOrder(order_string);
+            cout << order_string << endl;
+
+            /*
+             * Get size of the data element stored in file and print it.
+             */
+            size_t size = intype.getSize();
+            cout << "Data size is " << size << endl;
+        }
+
+        /*
+         * Get dataspace of the dataset.
+         */
+        DataSpace dataspace = dataset.getSpace();
+
+        /*
+         * Get the number of dimensions in the dataspace.
+         */
+        int rank = dataspace.getSimpleExtentNdims();
+
+        /*
+         * Get the dimension size of each dimension in the dataspace and
+         * display them.
+         */
+        hsize_t dims_out[2];
+        int     ndims = dataspace.getSimpleExtentDims(dims_out, NULL);
+        cout << "rank " << rank << ", dimensions " << (unsigned long)(dims_out[0]) << " x "
+             << (unsigned long)(dims_out[1]) << endl;
+
+        /*
+         * Define hyperslab in the dataset; implicitly giving strike and
+         * block NULL.
+         */
+        hsize_t offset[2]; // hyperslab offset in the file
+        hsize_t count[2];  // size of the hyperslab in the file
+        offset[0] = 1;
+        offset[1] = 2;
+        count[0]  = NX_SUB;
+        count[1]  = NY_SUB;
+        dataspace.selectHyperslab(H5S_SELECT_SET, count, offset);
+
+        /*
+         * Define the memory dataspace.
+         */
+        hsize_t dimsm[3]; /* memory space dimensions */
+        dimsm[0] = NX;
+        dimsm[1] = NY;
+        dimsm[2] = NZ;
+        DataSpace memspace(RANK_OUT, dimsm);
+
+        /*
+         * Define memory hyperslab.
+         */
+        hsize_t offset_out[3]; // hyperslab offset in memory
+        hsize_t count_out[3];  // size of the hyperslab in memory
+        offset_out[0] = 3;
+        offset_out[1] = 0;
+        offset_out[2] = 0;
+        count_out[0]  = NX_SUB;
+        count_out[1]  = NY_SUB;
+        count_out[2]  = 1;
+        memspace.selectHyperslab(H5S_SELECT_SET, count_out, offset_out);
+
+        /*
+         * Read data from hyperslab in the file into the hyperslab in
+         * memory and display the data.
+         */
+        dataset.read(data_out, PredType::NATIVE_INT, memspace, dataspace);
+
+        for (j = 0; j < NX; j++) {
+            for (i = 0; i < NY; i++)
+                cout << data_out[j][i][0] << " ";
+            cout << endl;
+        }
+        /*
+         * 0 0 0 0 0 0 0
+         * 0 0 0 0 0 0 0
+         * 0 0 0 0 0 0 0
+         * 3 4 5 6 0 0 0
+         * 4 5 6 7 0 0 0
+         * 5 6 7 8 0 0 0
+         * 0 0 0 0 0 0 0
+         */
+    } // end of try block
+
+    // catch failure caused by the H5File operations
+    catch (FileIException error) {
+        error.printErrorStack();
+        return -1;
+    }
+
+    // catch failure caused by the DataSet operations
+    catch (DataSetIException error) {
+        error.printErrorStack();
+        return -1;
+    }
+
+    // catch failure caused by the DataSpace operations
+    catch (DataSpaceIException error) {
+        error.printErrorStack();
+        return -1;
+    }
+
+    // catch failure caused by the DataSpace operations
+    catch (DataTypeIException error) {
+        error.printErrorStack();
+        return -1;
+    }
+
+    return 0; // successfully terminated
 }
-
diff --git a/c++/examples/run-c++-ex.sh.in b/c++/examples/run-c++-ex.sh.in
index 77ac36a..4593779 100644
--- a/c++/examples/run-c++-ex.sh.in
+++ b/c++/examples/run-c++-ex.sh.in
@@ -5,12 +5,10 @@
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 
 #
 #  This file:  run-c++-ex.sh
@@ -20,7 +18,7 @@
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 #                                                                               #
 # This script will compile and run the c++ examples from source files           #
-# installed in .../share/hdf5_examples/c++ using h5c++.  The                    #
+# installed in @examplesdir@/c++ using h5c++.  The                              #
 # order for running programs with RunTest in the MAIN section below is taken    #
 # from the Makefile.  The order is important since some of the test programs    #
 # use data files created by earlier test programs.  Any future additions should #
@@ -32,9 +30,32 @@
 EXIT_SUCCESS=0
 EXIT_FAILURE=1
 
+#
+# Try to derive the path to the installation $prefix established
+# by ./configure relative to the examples directory established by
+# ./configure.  If successful, set `prefix_relto_examplesdir` to the
+# relative path.  Otherwise, set `prefix_relto_examplesdir` to the
+# absolute installation $prefix.
+#
+# This script uses the value of `prefix` in the user's environment, if
+# it is set, below.  The content of $() is evaluated in a sub-shell, so
+# if `prefix` is set in the user's environment, the shell statements in
+# $() won't clobber it.
+#
+prefix_relto_examplesdir=$(
+prefix=@prefix@
+examplesdir=@examplesdir@
+if [ ${examplesdir##${prefix}/} != ${examplesdir} ]; then
+    echo $(echo ${examplesdir##${prefix}/} | \
+        sed 's,[^/][^/]*,..,g')
+else
+    echo $prefix
+fi
+)
+
 # Where the tool is installed.
 # default is relative path to installed location of the tools
-prefix="${prefix:-../../../}"
+prefix="${prefix:-../${prefix_relto_examplesdir}}"
 AR="@AR@"
 RANLIB="@RANLIB@"
 H5TOOL="h5c++"                  # The tool name
@@ -120,5 +141,5 @@ rm *.o
 rm *.h5
 echo
 
-exit $EXIT_VALUE 
+exit $EXIT_VALUE
 
diff --git a/c++/examples/testh5c++.sh.in b/c++/examples/testh5c++.sh.in
index 40d503f..ac95ba6 100644
--- a/c++/examples/testh5c++.sh.in
+++ b/c++/examples/testh5c++.sh.in
@@ -1,17 +1,14 @@
 #! /bin/sh
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 #
 # Tests for the h5c++ compiler tool
 # Created: Albert Cheng, 2007/3/14
@@ -58,7 +55,7 @@ applib=libapp${H5TOOL}.a
 # short hands
 # Caution: if some *.h5 files must be cleaned here, list them by names.
 # Don't use the wildcard form of *.h5 as it will wipe out even *.h5 generated
-# by otehr test programs. This will cause a racing condition error when
+# by other test programs. This will cause a racing condition error when
 # parallel make (e.g., gmake -j 4) is used.
 temp_SRC="$hdf5main $appmain $prog1 $prog2"
 temp_OBJ=`echo $temp_SRC | sed -e "s/\.${suffix}/.o/g"`
@@ -69,11 +66,7 @@ temp_FILES="a.out $applib"
 cat > $appmain <<EOF
 #include <string>
 
-#ifdef OLD_HEADER_FILENAME
-#include <iostream.h>
-#else
 #include <iostream>
-#endif
 
 #include "H5Cpp.h"
 
@@ -97,19 +90,11 @@ EOF
 
 # generate prog1
 cat > $prog1 <<EOF
-#ifdef OLD_HEADER_FILENAME
-    #include <iostream.h>
-#else
-    #include <iostream>
-#endif
+#include <iostream>
 #include <string>
 
-#ifndef H5_NO_NAMESPACE
-#ifndef H5_NO_STD
-    using std::cout;
-    using std::endl;
-#endif  // H5_NO_STD
-#endif
+using std::cout;
+using std::endl;
 int sub1(void)
 {
     cout << "in sub1" << endl;
@@ -119,19 +104,11 @@ EOF
 
 # generate prog2
 cat > $prog2 <<EOF
-#ifdef OLD_HEADER_FILENAME
-    #include <iostream.h>
-#else
-    #include <iostream>
-#endif
+#include <iostream>
 #include <string>
 
-#ifndef H5_NO_NAMESPACE
-#ifndef H5_NO_STD
-    using std::cout;
-    using std::endl;
-#endif  // H5_NO_STD
-#endif
+using std::cout;
+using std::endl;
 int sub2(void)
 {
     cout << "in sub2" << endl;
@@ -144,11 +121,7 @@ EOF
 cat > $hdf5main <<EOF
 #include <string>
 
-#ifdef OLD_HEADER_FILENAME
-#include <iostream.h>
-#else
 #include <iostream>
-#endif
 
 #include "H5Cpp.h"
 
diff --git a/c++/examples/writedata.cpp b/c++/examples/writedata.cpp
index 496c5d1..3f9d70b 100644
--- a/c++/examples/writedata.cpp
+++ b/c++/examples/writedata.cpp
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
@@ -22,317 +19,325 @@
  *  file is closed. Program reopens the file and reads and displays the result.
  */
 
-#ifdef OLD_HEADER_FILENAME
-#include <iostream.h>
-#else
 #include <iostream>
-#endif
-#include <string>
-
-#ifndef H5_NO_NAMESPACE
-#ifndef H5_NO_STD
-    using std::cout;
-    using std::endl;
-#endif  // H5_NO_STD
-#endif
+using std::cout;
+using std::endl;
 
+#include <string>
 #include "H5Cpp.h"
-
-#ifndef H5_NO_NAMESPACE
-    using namespace H5;
-#endif
-
-const H5std_string FILE_NAME( "Select.h5" );
-const H5std_string DATASET_NAME( "Matrix in file" );
-const int   MSPACE1_RANK = 1;	// Rank of the first dataset in memory
-const int   MSPACE1_DIM = 50;   // Dataset size in memory
-const int   MSPACE2_RANK = 1;	// Rank of the second dataset in memory
-const int   MSPACE2_DIM = 4;	// Dataset size in memory
-const int   FSPACE_RANK = 2;	// Dataset rank as it is stored in the file
-const int   FSPACE_DIM1 = 8;	// Dimension sizes of the dataset as it is
-const int   FSPACE_DIM2 = 12;	// 	stored in the file
-const int   MSPACE_RANK = 2;	// Rank of the first dataset in memory
-const int   MSPACE_DIM1 = 8;	// We will read dataset back from the file
-const int   MSPACE_DIM2 = 9;	// 	to the dataset in memory with these
-				// 	dataspace parameters
-const int   NPOINTS = 4;	// Number of points that will be selected
-				//	and overwritten
-
-int main (void)
+using namespace H5;
+
+const H5std_string FILE_NAME("Select.h5");
+const H5std_string DATASET_NAME("Matrix in file");
+const int          MSPACE1_RANK = 1;  // Rank of the first dataset in memory
+const int          MSPACE1_DIM  = 50; // Dataset size in memory
+const int          MSPACE2_RANK = 1;  // Rank of the second dataset in memory
+const int          MSPACE2_DIM  = 4;  // Dataset size in memory
+const int          FSPACE_RANK  = 2;  // Dataset rank as it is stored in the file
+const int          FSPACE_DIM1  = 8;  // Dimension sizes of the dataset as it is
+const int          FSPACE_DIM2  = 12; //      stored in the file
+const int          MSPACE_RANK  = 2;  // Rank of the first dataset in memory
+const int          MSPACE_DIM1  = 8;  // We will read dataset back from the file
+const int          MSPACE_DIM2  = 9;  //      to the dataset in memory with these
+                                      //      dataspace parameters
+const int NPOINTS = 4;                // Number of points that will be selected
+                                      //      and overwritten
+
+int
+main(void)
 {
-    int   i,j; // loop indices */
+    int i, j; // loop indices */
 
     /*
      * Try block to detect exceptions raised by any of the calls inside it
      */
-    try
-    {
-	/*
-	 * Turn off the auto-printing when failure occurs so that we can
-	 * handle the errors appropriately
-	 */
-	Exception::dontPrint();
-
-	/*
-	 * Create a file.
-	 */
-	H5File* file = new H5File( FILE_NAME, H5F_ACC_TRUNC );
-
-	/*
-	* Create property list for a dataset and set up fill values.
-	*/
-	int fillvalue = 0;   /* Fill value for the dataset */
-	DSetCreatPropList plist;
-	plist.setFillValue(PredType::NATIVE_INT, &fillvalue);
-
-	/*
-	 * Create dataspace for the dataset in the file.
-	 */
-	hsize_t fdim[] = {FSPACE_DIM1, FSPACE_DIM2}; // dim sizes of ds (on disk)
-	DataSpace fspace( FSPACE_RANK, fdim );
-
-	/*
-	 * Create dataset and write it into the file.
-	 */
-	DataSet* dataset = new DataSet(file->createDataSet(
-		DATASET_NAME, PredType::NATIVE_INT, fspace, plist));
-
-	/*
-	 * Select hyperslab for the dataset in the file, using 3x2 blocks,
-	 * (4,3) stride and (2,4) count starting at the position (0,1).
-	 */
-	hsize_t start[2]; // Start of hyperslab
-	hsize_t stride[2]; // Stride of hyperslab
-	hsize_t count[2];  // Block count
-	hsize_t block[2];  // Block sizes
-	start[0]  = 0; start[1]  = 1;
-	stride[0] = 4; stride[1] = 3;
-	count[0]  = 2; count[1]  = 4;
-	block[0]  = 3; block[1]  = 2;
-	fspace.selectHyperslab( H5S_SELECT_SET, count, start, stride, block);
-
-	/*
-	 * Create dataspace for the first dataset.
-	 */
-	hsize_t dim1[] = {MSPACE1_DIM};  /* Dimension size of the first dataset
-	                                   (in memory) */
-	DataSpace mspace1( MSPACE1_RANK, dim1 );
-
-	/*
-	 * Select hyperslab.
-	 * We will use 48 elements of the vector buffer starting at the
-	 * second element.  Selected elements are 1 2 3 . . . 48
-	 */
-	start[0]  = 1;
-	stride[0] = 1;
-	count[0]  = 48;
-	block[0]  = 1;
-	mspace1.selectHyperslab( H5S_SELECT_SET, count, start, stride, block);
-
-	/*
-	 * Write selection from the vector buffer to the dataset in the file.
-	 *
-	 * File dataset should look like this:
-	 *                    0  1  2  0  3  4  0  5  6  0  7  8
-	 *                    0  9 10  0 11 12  0 13 14  0 15 16
-	 *                    0 17 18  0 19 20  0 21 22  0 23 24
-	 *                    0  0  0  0  0  0  0  0  0  0  0  0
-	 *                    0 25 26  0 27 28  0 29 30  0 31 32
-	 *                    0 33 34  0 35 36  0 37 38  0 39 40
-	 *                    0 41 42  0 43 44  0 45 46  0 47 48
-	 *                    0  0  0  0  0  0  0  0  0  0  0  0
-	 */
-	int    vector[MSPACE1_DIM];	// vector buffer for dset
-
-	/*
-	 * Buffer initialization.
-	 */
-	vector[0] = vector[MSPACE1_DIM - 1] = -1;
-	for (i = 1; i < MSPACE1_DIM - 1; i++)
-	    vector[i] = i;
-
-	dataset->write( vector, PredType::NATIVE_INT, mspace1, fspace );
-
-	/*
-	 * Reset the selection for the file dataspace fid.
-	 */
-	fspace.selectNone();
-
-	/*
-	 * Create dataspace for the second dataset.
-	 */
-	hsize_t dim2[] = {MSPACE2_DIM};  /* Dimension size of the second dataset
-	                                   (in memory */
-	DataSpace mspace2( MSPACE2_RANK, dim2 );
-
-	/*
-	 * Select sequence of NPOINTS points in the file dataspace.
-	 */
-	hsize_t coord[NPOINTS][FSPACE_RANK]; /* Array to store selected points
-	                                        from the file dataspace */
-	coord[0][0] = 0; coord[0][1] = 0;
-	coord[1][0] = 3; coord[1][1] = 3;
-	coord[2][0] = 3; coord[2][1] = 5;
-	coord[3][0] = 5; coord[3][1] = 6;
-
-	fspace.selectElements( H5S_SELECT_SET, NPOINTS, (const hsize_t *)coord);
-
-	/*
-	 * Write new selection of points to the dataset.
-	 */
-	int    values[] = {53, 59, 61, 67};  /* New values to be written */
-	dataset->write( values, PredType::NATIVE_INT, mspace2, fspace );
-
-	/*
-	 * File dataset should look like this:
-	 *                   53  1  2  0  3  4  0  5  6  0  7  8
-	 *                    0  9 10  0 11 12  0 13 14  0 15 16
-	 *                    0 17 18  0 19 20  0 21 22  0 23 24
-	 *                    0  0  0 59  0 61  0  0  0  0  0  0
-	 *                    0 25 26  0 27 28  0 29 30  0 31 32
-	 *                    0 33 34  0 35 36 67 37 38  0 39 40
-	 *                    0 41 42  0 43 44  0 45 46  0 47 48
-	 *                    0  0  0  0  0  0  0  0  0  0  0  0
-	 *
-	 */
-
-	/*
-	 * Close the dataset and the file.
-	 */
-	delete dataset;
-	delete file;
-
-	/*
-	 * Open the file.
-	 */
-	file = new H5File( FILE_NAME, H5F_ACC_RDONLY );
-
-	/*
-	 * Open the dataset.
-	 */
-	dataset = new DataSet( file->openDataSet( DATASET_NAME ));
-
-	/*
-	 * Get dataspace of the dataset.
-	 */
-	fspace = dataset->getSpace();
-
-	/*
-	 * Select first hyperslab for the dataset in the file. The following
-	 * elements are selected:
-	 *                     10  0 11 12
-	 *                     18  0 19 20
-	 *                      0 59  0 61
-	 *
-	 */
-	start[0] = 1; start[1] = 2;
-	block[0] = 1; block[1] = 1;
-	stride[0] = 1; stride[1] = 1;
-	count[0]  = 3; count[1]  = 4;
-	fspace.selectHyperslab(H5S_SELECT_SET, count, start, stride, block);
-
-	/*
-	 * Add second selected hyperslab to the selection.
-	 * The following elements are selected:
-	 *                    19 20  0 21 22
-	 *                     0 61  0  0  0
-	 *                    27 28  0 29 30
-	 *                    35 36 67 37 38
-	 *                    43 44  0 45 46
-	 *                     0  0  0  0  0
-	 * Note that two hyperslabs overlap. Common elements are:
-	 *                                              19 20
-	 *                                               0 61
-	 */
-	start[0] = 2; start[1] = 4;
-	block[0] = 1; block[1] = 1;
-	stride[0] = 1; stride[1] = 1;
-	count[0]  = 6; count[1]  = 5;
-	fspace.selectHyperslab(H5S_SELECT_OR, count, start, stride, block);
-
-	/*
-	 * Create memory dataspace.
-	 */
-	hsize_t mdim[] = {MSPACE_DIM1, MSPACE_DIM2}; /* Dimension sizes of the
+    try {
+        /*
+         * Turn off the auto-printing when failure occurs so that we can
+         * handle the errors appropriately
+         */
+        Exception::dontPrint();
+
+        /*
+         * Create a file.
+         */
+        H5File *file = new H5File(FILE_NAME, H5F_ACC_TRUNC);
+
+        /*
+         * Create property list for a dataset and set up fill values.
+         */
+        int               fillvalue = 0; /* Fill value for the dataset */
+        DSetCreatPropList plist;
+        plist.setFillValue(PredType::NATIVE_INT, &fillvalue);
+
+        /*
+         * Create dataspace for the dataset in the file.
+         */
+        hsize_t   fdim[] = {FSPACE_DIM1, FSPACE_DIM2}; // dim sizes of ds (on disk)
+        DataSpace fspace(FSPACE_RANK, fdim);
+
+        /*
+         * Create dataset and write it into the file.
+         */
+        DataSet *dataset =
+            new DataSet(file->createDataSet(DATASET_NAME, PredType::NATIVE_INT, fspace, plist));
+
+        /*
+         * Select hyperslab for the dataset in the file, using 3x2 blocks,
+         * (4,3) stride and (2,4) count starting at the position (0,1).
+         */
+        hsize_t start[2];  // Start of hyperslab
+        hsize_t stride[2]; // Stride of hyperslab
+        hsize_t count[2];  // Block count
+        hsize_t block[2];  // Block sizes
+        start[0]  = 0;
+        start[1]  = 1;
+        stride[0] = 4;
+        stride[1] = 3;
+        count[0]  = 2;
+        count[1]  = 4;
+        block[0]  = 3;
+        block[1]  = 2;
+        fspace.selectHyperslab(H5S_SELECT_SET, count, start, stride, block);
+
+        /*
+         * Create dataspace for the first dataset.
+         */
+        hsize_t dim1[] = {MSPACE1_DIM}; /* Dimension size of the first dataset
+                                          (in memory) */
+        DataSpace mspace1(MSPACE1_RANK, dim1);
+
+        /*
+         * Select hyperslab.
+         * We will use 48 elements of the vector buffer starting at the
+         * second element.  Selected elements are 1 2 3 . . . 48
+         */
+        start[0]  = 1;
+        stride[0] = 1;
+        count[0]  = 48;
+        block[0]  = 1;
+        mspace1.selectHyperslab(H5S_SELECT_SET, count, start, stride, block);
+
+        /*
+         * Write selection from the vector buffer to the dataset in the file.
+         *
+         * File dataset should look like this:
+         *                    0  1  2  0  3  4  0  5  6  0  7  8
+         *                    0  9 10  0 11 12  0 13 14  0 15 16
+         *                    0 17 18  0 19 20  0 21 22  0 23 24
+         *                    0  0  0  0  0  0  0  0  0  0  0  0
+         *                    0 25 26  0 27 28  0 29 30  0 31 32
+         *                    0 33 34  0 35 36  0 37 38  0 39 40
+         *                    0 41 42  0 43 44  0 45 46  0 47 48
+         *                    0  0  0  0  0  0  0  0  0  0  0  0
+         */
+        int vector[MSPACE1_DIM]; // vector buffer for dset
+
+        /*
+         * Buffer initialization.
+         */
+        vector[0] = vector[MSPACE1_DIM - 1] = -1;
+        for (i = 1; i < MSPACE1_DIM - 1; i++)
+            vector[i] = i;
+
+        dataset->write(vector, PredType::NATIVE_INT, mspace1, fspace);
+
+        /*
+         * Reset the selection for the file dataspace fid.
+         */
+        fspace.selectNone();
+
+        /*
+         * Create dataspace for the second dataset.
+         */
+        hsize_t dim2[] = {MSPACE2_DIM}; /* Dimension size of the second dataset
+                                          (in memory */
+        DataSpace mspace2(MSPACE2_RANK, dim2);
+
+        /*
+         * Select sequence of NPOINTS points in the file dataspace.
+         */
+        hsize_t coord[NPOINTS][FSPACE_RANK]; /* Array to store selected points
+                                                from the file dataspace */
+        coord[0][0] = 0;
+        coord[0][1] = 0;
+        coord[1][0] = 3;
+        coord[1][1] = 3;
+        coord[2][0] = 3;
+        coord[2][1] = 5;
+        coord[3][0] = 5;
+        coord[3][1] = 6;
+
+        fspace.selectElements(H5S_SELECT_SET, NPOINTS, (const hsize_t *)coord);
+
+        /*
+         * Write new selection of points to the dataset.
+         */
+        int values[] = {53, 59, 61, 67}; /* New values to be written */
+        dataset->write(values, PredType::NATIVE_INT, mspace2, fspace);
+
+        /*
+         * File dataset should look like this:
+         *                   53  1  2  0  3  4  0  5  6  0  7  8
+         *                    0  9 10  0 11 12  0 13 14  0 15 16
+         *                    0 17 18  0 19 20  0 21 22  0 23 24
+         *                    0  0  0 59  0 61  0  0  0  0  0  0
+         *                    0 25 26  0 27 28  0 29 30  0 31 32
+         *                    0 33 34  0 35 36 67 37 38  0 39 40
+         *                    0 41 42  0 43 44  0 45 46  0 47 48
+         *                    0  0  0  0  0  0  0  0  0  0  0  0
+         *
+         */
+
+        /*
+         * Close the dataset and the file.
+         */
+        delete dataset;
+        delete file;
+
+        /*
+         * Open the file.
+         */
+        file = new H5File(FILE_NAME, H5F_ACC_RDONLY);
+
+        /*
+         * Open the dataset.
+         */
+        dataset = new DataSet(file->openDataSet(DATASET_NAME));
+
+        /*
+         * Get dataspace of the dataset.
+         */
+        fspace = dataset->getSpace();
+
+        /*
+         * Select first hyperslab for the dataset in the file. The following
+         * elements are selected:
+         *                     10  0 11 12
+         *                     18  0 19 20
+         *                      0 59  0 61
+         *
+         */
+        start[0]  = 1;
+        start[1]  = 2;
+        block[0]  = 1;
+        block[1]  = 1;
+        stride[0] = 1;
+        stride[1] = 1;
+        count[0]  = 3;
+        count[1]  = 4;
+        fspace.selectHyperslab(H5S_SELECT_SET, count, start, stride, block);
+
+        /*
+         * Add second selected hyperslab to the selection.
+         * The following elements are selected:
+         *                    19 20  0 21 22
+         *                     0 61  0  0  0
+         *                    27 28  0 29 30
+         *                    35 36 67 37 38
+         *                    43 44  0 45 46
+         *                     0  0  0  0  0
+         * Note that two hyperslabs overlap. Common elements are:
+         *                                              19 20
+         *                                               0 61
+         */
+        start[0]  = 2;
+        start[1]  = 4;
+        block[0]  = 1;
+        block[1]  = 1;
+        stride[0] = 1;
+        stride[1] = 1;
+        count[0]  = 6;
+        count[1]  = 5;
+        fspace.selectHyperslab(H5S_SELECT_OR, count, start, stride, block);
+
+        /*
+         * Create memory dataspace.
+         */
+        hsize_t mdim[] = {MSPACE_DIM1, MSPACE_DIM2}; /* Dimension sizes of the
                                                    dataset in memory when we
                                                    read selection from the
                                                    dataset on the disk */
-	DataSpace mspace(MSPACE_RANK, mdim);
-
-	/*
-	 * Select two hyperslabs in memory. Hyperslabs has the same
-	 * size and shape as the selected hyperslabs for the file dataspace.
-	 */
-	start[0] = 0; start[1] = 0;
-	block[0] = 1; block[1] = 1;
-	stride[0] = 1; stride[1] = 1;
-	count[0]  = 3; count[1]  = 4;
-	mspace.selectHyperslab(H5S_SELECT_SET, count, start, stride, block);
-	start[0] = 1; start[1] = 2;
-	block[0] = 1; block[1] = 1;
-	stride[0] = 1; stride[1] = 1;
-	count[0]  = 6; count[1]  = 5;
-	mspace.selectHyperslab(H5S_SELECT_OR, count, start, stride, block);
-
-	/*
-	 * Initialize data buffer.
-	 */
-	int matrix_out[MSPACE_DIM1][MSPACE_DIM2];
-	for (i = 0; i < MSPACE_DIM1; i++)
-	    for (j = 0; j < MSPACE_DIM2; j++)
-		matrix_out[i][j] = 0;
-
-	/*
-	 * Read data back to the buffer matrix.
-	 */
-	dataset->read(matrix_out, PredType::NATIVE_INT, mspace, fspace);
-
-	/*
-	 * Display the result.  Memory dataset is:
-	 *
-	 *                    10  0 11 12  0  0  0  0  0
-	 *                    18  0 19 20  0 21 22  0  0
-	 *                     0 59  0 61  0  0  0  0  0
-	 *                     0  0 27 28  0 29 30  0  0
-	 *                     0  0 35 36 67 37 38  0  0
-	 *                     0  0 43 44  0 45 46  0  0
-	 *                     0  0  0  0  0  0  0  0  0
-	 *                     0  0  0  0  0  0  0  0  0
-	 */
-	for (i=0; i < MSPACE_DIM1; i++)
-	{
-	    for(j=0; j < MSPACE_DIM2; j++)
-		cout << matrix_out[i][j] << "  ";
-	    cout << endl;
-	}
-
-	/*
-	 * Close the dataset and the file.
-	 */
-	delete dataset;
-	delete file;
-   }  // end of try block
-
-   // catch failure caused by the H5File operations
-   catch( FileIException error )
-   {
-	error.printError();
-	return -1;
-   }
-
-   // catch failure caused by the DataSet operations
-   catch( DataSetIException error )
-   {
-	error.printError();
-	return -1;
-   }
-
-   // catch failure caused by the DataSpace operations
-   catch( DataSpaceIException error )
-   {
-	error.printError();
-	return -1;
-   }
-
-   return 0;
+        DataSpace mspace(MSPACE_RANK, mdim);
+
+        /*
+         * Select two hyperslabs in memory. Hyperslabs has the same
+         * size and shape as the selected hyperslabs for the file dataspace.
+         */
+        start[0]  = 0;
+        start[1]  = 0;
+        block[0]  = 1;
+        block[1]  = 1;
+        stride[0] = 1;
+        stride[1] = 1;
+        count[0]  = 3;
+        count[1]  = 4;
+        mspace.selectHyperslab(H5S_SELECT_SET, count, start, stride, block);
+        start[0]  = 1;
+        start[1]  = 2;
+        block[0]  = 1;
+        block[1]  = 1;
+        stride[0] = 1;
+        stride[1] = 1;
+        count[0]  = 6;
+        count[1]  = 5;
+        mspace.selectHyperslab(H5S_SELECT_OR, count, start, stride, block);
+
+        /*
+         * Initialize data buffer.
+         */
+        int matrix_out[MSPACE_DIM1][MSPACE_DIM2];
+        for (i = 0; i < MSPACE_DIM1; i++)
+            for (j = 0; j < MSPACE_DIM2; j++)
+                matrix_out[i][j] = 0;
+
+        /*
+         * Read data back to the buffer matrix.
+         */
+        dataset->read(matrix_out, PredType::NATIVE_INT, mspace, fspace);
+
+        /*
+         * Display the result.  Memory dataset is:
+         *
+         *                    10  0 11 12  0  0  0  0  0
+         *                    18  0 19 20  0 21 22  0  0
+         *                     0 59  0 61  0  0  0  0  0
+         *                     0  0 27 28  0 29 30  0  0
+         *                     0  0 35 36 67 37 38  0  0
+         *                     0  0 43 44  0 45 46  0  0
+         *                     0  0  0  0  0  0  0  0  0
+         *                     0  0  0  0  0  0  0  0  0
+         */
+        for (i = 0; i < MSPACE_DIM1; i++) {
+            for (j = 0; j < MSPACE_DIM2; j++)
+                cout << matrix_out[i][j] << "  ";
+            cout << endl;
+        }
+
+        /*
+         * Close the dataset and the file.
+         */
+        delete dataset;
+        delete file;
+    } // end of try block
+
+    // catch failure caused by the H5File operations
+    catch (FileIException error) {
+        error.printErrorStack();
+        return -1;
+    }
+
+    // catch failure caused by the DataSet operations
+    catch (DataSetIException error) {
+        error.printErrorStack();
+        return -1;
+    }
+
+    // catch failure caused by the DataSpace operations
+    catch (DataSpaceIException error) {
+        error.printErrorStack();
+        return -1;
+    }
+
+    return 0;
 }
diff --git a/c++/src/C2Cppfunction_map.htm b/c++/src/C2Cppfunction_map.htm
new file mode 100644
index 0000000..665bc63
--- /dev/null
+++ b/c++/src/C2Cppfunction_map.htm
@@ -0,0 +1,24304 @@
+<html xmlns:v="urn:schemas-microsoft-com:vml"
+xmlns:o="urn:schemas-microsoft-com:office:office"
+xmlns:w="urn:schemas-microsoft-com:office:word"
+xmlns:m="http://schemas.microsoft.com/office/2004/12/omml"
+xmlns="http://www.w3.org/TR/REC-html40">
+
+<head>
+<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
+<meta name=ProgId content=Word.Document>
+<meta name=Generator content="Microsoft Word 15">
+<meta name=Originator content="Microsoft Word 15">
+<link rel=File-List href="C2Cppfunction_map_files/filelist.xml">
+<!--[if gte mso 9]><xml>
+ <o:DocumentProperties>
+  <o:Author>bmribler</o:Author>
+  <o:Template>Normal</o:Template>
+  <o:LastAuthor>bmribler</o:LastAuthor>
+  <o:Revision>2</o:Revision>
+  <o:TotalTime>1347</o:TotalTime>
+  <o:Created>2018-05-21T15:01:00Z</o:Created>
+  <o:LastSaved>2018-05-21T15:01:00Z</o:LastSaved>
+  <o:Pages>1</o:Pages>
+  <o:Words>6393</o:Words>
+  <o:Characters>36443</o:Characters>
+  <o:Company>Microsoft</o:Company>
+  <o:Lines>303</o:Lines>
+  <o:Paragraphs>85</o:Paragraphs>
+  <o:CharactersWithSpaces>42751</o:CharactersWithSpaces>
+  <o:Version>15.00</o:Version>
+ </o:DocumentProperties>
+ <o:OfficeDocumentSettings>
+  <o:RelyOnVML/>
+  <o:AllowPNG/>
+ </o:OfficeDocumentSettings>
+</xml><![endif]-->
+<link rel=themeData href="C2Cppfunction_map_files/themedata.thmx">
+<link rel=colorSchemeMapping
+href="C2Cppfunction_map_files/colorschememapping.xml">
+<!--[if gte mso 9]><xml>
+ <w:WordDocument>
+  <w:HideSpellingErrors/>
+  <w:GrammarState>Clean</w:GrammarState>
+  <w:TrackMoves>false</w:TrackMoves>
+  <w:TrackFormatting/>
+  <w:PunctuationKerning/>
+  <w:ValidateAgainstSchemas/>
+  <w:SaveIfXMLInvalid>false</w:SaveIfXMLInvalid>
+  <w:IgnoreMixedContent>false</w:IgnoreMixedContent>
+  <w:AlwaysShowPlaceholderText>false</w:AlwaysShowPlaceholderText>
+  <w:DoNotPromoteQF/>
+  <w:LidThemeOther>EN-US</w:LidThemeOther>
+  <w:LidThemeAsian>X-NONE</w:LidThemeAsian>
+  <w:LidThemeComplexScript>X-NONE</w:LidThemeComplexScript>
+  <w:Compatibility>
+   <w:BreakWrappedTables/>
+   <w:SnapToGridInCell/>
+   <w:WrapTextWithPunct/>
+   <w:UseAsianBreakRules/>
+   <w:DontGrowAutofit/>
+   <w:SplitPgBreakAndParaMark/>
+   <w:EnableOpenTypeKerning/>
+   <w:DontFlipMirrorIndents/>
+   <w:OverrideTableStyleHps/>
+  </w:Compatibility>
+  <m:mathPr>
+   <m:mathFont m:val="Cambria Math"/>
+   <m:brkBin m:val="before"/>
+   <m:brkBinSub m:val="&#45;-"/>
+   <m:smallFrac m:val="off"/>
+   <m:dispDef/>
+   <m:lMargin m:val="0"/>
+   <m:rMargin m:val="0"/>
+   <m:defJc m:val="centerGroup"/>
+   <m:wrapIndent m:val="1440"/>
+   <m:intLim m:val="subSup"/>
+   <m:naryLim m:val="undOvr"/>
+  </m:mathPr></w:WordDocument>
+</xml><![endif]--><!--[if gte mso 9]><xml>
+ <w:LatentStyles DefLockedState="false" DefUnhideWhenUsed="false"
+  DefSemiHidden="false" DefQFormat="false" DefPriority="99"
+  LatentStyleCount="371">
+  <w:LsdException Locked="false" Priority="0" QFormat="true" Name="Normal"/>
+  <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 1"/>
+  <w:LsdException Locked="false" Priority="9" SemiHidden="true"
+   UnhideWhenUsed="true" QFormat="true" Name="heading 2"/>
+  <w:LsdException Locked="false" Priority="9" SemiHidden="true"
+   UnhideWhenUsed="true" QFormat="true" Name="heading 3"/>
+  <w:LsdException Locked="false" Priority="9" SemiHidden="true"
+   UnhideWhenUsed="true" QFormat="true" Name="heading 4"/>
+  <w:LsdException Locked="false" Priority="9" SemiHidden="true"
+   UnhideWhenUsed="true" QFormat="true" Name="heading 5"/>
+  <w:LsdException Locked="false" Priority="9" SemiHidden="true"
+   UnhideWhenUsed="true" QFormat="true" Name="heading 6"/>
+  <w:LsdException Locked="false" Priority="9" SemiHidden="true"
+   UnhideWhenUsed="true" QFormat="true" Name="heading 7"/>
+  <w:LsdException Locked="false" Priority="9" SemiHidden="true"
+   UnhideWhenUsed="true" QFormat="true" Name="heading 8"/>
+  <w:LsdException Locked="false" Priority="9" SemiHidden="true"
+   UnhideWhenUsed="true" QFormat="true" Name="heading 9"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="index 1"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="index 2"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="index 3"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="index 4"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="index 5"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="index 6"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="index 7"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="index 8"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="index 9"/>
+  <w:LsdException Locked="false" Priority="39" SemiHidden="true"
+   UnhideWhenUsed="true" Name="toc 1"/>
+  <w:LsdException Locked="false" Priority="39" SemiHidden="true"
+   UnhideWhenUsed="true" Name="toc 2"/>
+  <w:LsdException Locked="false" Priority="39" SemiHidden="true"
+   UnhideWhenUsed="true" Name="toc 3"/>
+  <w:LsdException Locked="false" Priority="39" SemiHidden="true"
+   UnhideWhenUsed="true" Name="toc 4"/>
+  <w:LsdException Locked="false" Priority="39" SemiHidden="true"
+   UnhideWhenUsed="true" Name="toc 5"/>
+  <w:LsdException Locked="false" Priority="39" SemiHidden="true"
+   UnhideWhenUsed="true" Name="toc 6"/>
+  <w:LsdException Locked="false" Priority="39" SemiHidden="true"
+   UnhideWhenUsed="true" Name="toc 7"/>
+  <w:LsdException Locked="false" Priority="39" SemiHidden="true"
+   UnhideWhenUsed="true" Name="toc 8"/>
+  <w:LsdException Locked="false" Priority="39" SemiHidden="true"
+   UnhideWhenUsed="true" Name="toc 9"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Normal Indent"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="footnote text"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="annotation text"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="header"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="footer"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="index heading"/>
+  <w:LsdException Locked="false" Priority="35" SemiHidden="true"
+   UnhideWhenUsed="true" QFormat="true" Name="caption"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="table of figures"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="envelope address"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="envelope return"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="footnote reference"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="annotation reference"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="line number"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="page number"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="endnote reference"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="endnote text"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="table of authorities"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="macro"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="toa heading"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="List"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="List Bullet"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="List Number"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="List 2"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="List 3"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="List 4"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="List 5"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="List Bullet 2"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="List Bullet 3"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="List Bullet 4"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="List Bullet 5"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="List Number 2"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="List Number 3"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="List Number 4"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="List Number 5"/>
+  <w:LsdException Locked="false" Priority="10" QFormat="true" Name="Title"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Closing"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Signature"/>
+  <w:LsdException Locked="false" Priority="1" SemiHidden="true"
+   UnhideWhenUsed="true" Name="Default Paragraph Font"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Body Text"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Body Text Indent"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="List Continue"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="List Continue 2"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="List Continue 3"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="List Continue 4"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="List Continue 5"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Message Header"/>
+  <w:LsdException Locked="false" Priority="11" QFormat="true" Name="Subtitle"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Salutation"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Date"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Body Text First Indent"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Body Text First Indent 2"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Note Heading"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Body Text 2"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Body Text 3"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Body Text Indent 2"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Body Text Indent 3"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Block Text"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Hyperlink"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="FollowedHyperlink"/>
+  <w:LsdException Locked="false" Priority="22" QFormat="true" Name="Strong"/>
+  <w:LsdException Locked="false" Priority="20" QFormat="true" Name="Emphasis"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Document Map"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Plain Text"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="E-mail Signature"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="HTML Top of Form"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="HTML Bottom of Form"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Normal (Web)"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="HTML Acronym"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="HTML Address"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="HTML Cite"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="HTML Code"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="HTML Definition"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="HTML Keyboard"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="HTML Preformatted"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="HTML Sample"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="HTML Typewriter"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="HTML Variable"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Normal Table"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="annotation subject"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="No List"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Outline List 1"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Outline List 2"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Outline List 3"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Table Simple 1"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Table Simple 2"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Table Simple 3"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Table Classic 1"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Table Classic 2"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Table Classic 3"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Table Classic 4"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Table Colorful 1"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Table Colorful 2"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Table Colorful 3"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Table Columns 1"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Table Columns 2"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Table Columns 3"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Table Columns 4"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Table Columns 5"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Table Grid 1"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Table Grid 2"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Table Grid 3"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Table Grid 4"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Table Grid 5"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Table Grid 6"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Table Grid 7"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Table Grid 8"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Table List 1"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Table List 2"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Table List 3"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Table List 4"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Table List 5"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Table List 6"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Table List 7"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Table List 8"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Table 3D effects 1"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Table 3D effects 2"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Table 3D effects 3"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Table Contemporary"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Table Elegant"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Table Professional"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Table Subtle 1"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Table Subtle 2"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Table Web 1"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Table Web 2"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Table Web 3"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Balloon Text"/>
+  <w:LsdException Locked="false" Priority="39" Name="Table Grid"/>
+  <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+   Name="Table Theme"/>
+  <w:LsdException Locked="false" SemiHidden="true" Name="Placeholder Text"/>
+  <w:LsdException Locked="false" Priority="1" QFormat="true" Name="No Spacing"/>
+  <w:LsdException Locked="false" Priority="60" Name="Light Shading"/>
+  <w:LsdException Locked="false" Priority="61" Name="Light List"/>
+  <w:LsdException Locked="false" Priority="62" Name="Light Grid"/>
+  <w:LsdException Locked="false" Priority="63" Name="Medium Shading 1"/>
+  <w:LsdException Locked="false" Priority="64" Name="Medium Shading 2"/>
+  <w:LsdException Locked="false" Priority="65" Name="Medium List 1"/>
+  <w:LsdException Locked="false" Priority="66" Name="Medium List 2"/>
+  <w:LsdException Locked="false" Priority="67" Name="Medium Grid 1"/>
+  <w:LsdException Locked="false" Priority="68" Name="Medium Grid 2"/>
+  <w:LsdException Locked="false" Priority="69" Name="Medium Grid 3"/>
+  <w:LsdException Locked="false" Priority="70" Name="Dark List"/>
+  <w:LsdException Locked="false" Priority="71" Name="Colorful Shading"/>
+  <w:LsdException Locked="false" Priority="72" Name="Colorful List"/>
+  <w:LsdException Locked="false" Priority="73" Name="Colorful Grid"/>
+  <w:LsdException Locked="false" Priority="60" Name="Light Shading Accent 1"/>
+  <w:LsdException Locked="false" Priority="61" Name="Light List Accent 1"/>
+  <w:LsdException Locked="false" Priority="62" Name="Light Grid Accent 1"/>
+  <w:LsdException Locked="false" Priority="63" Name="Medium Shading 1 Accent 1"/>
+  <w:LsdException Locked="false" Priority="64" Name="Medium Shading 2 Accent 1"/>
+  <w:LsdException Locked="false" Priority="65" Name="Medium List 1 Accent 1"/>
+  <w:LsdException Locked="false" SemiHidden="true" Name="Revision"/>
+  <w:LsdException Locked="false" Priority="34" QFormat="true"
+   Name="List Paragraph"/>
+  <w:LsdException Locked="false" Priority="29" QFormat="true" Name="Quote"/>
+  <w:LsdException Locked="false" Priority="30" QFormat="true"
+   Name="Intense Quote"/>
+  <w:LsdException Locked="false" Priority="66" Name="Medium List 2 Accent 1"/>
+  <w:LsdException Locked="false" Priority="67" Name="Medium Grid 1 Accent 1"/>
+  <w:LsdException Locked="false" Priority="68" Name="Medium Grid 2 Accent 1"/>
+  <w:LsdException Locked="false" Priority="69" Name="Medium Grid 3 Accent 1"/>
+  <w:LsdException Locked="false" Priority="70" Name="Dark List Accent 1"/>
+  <w:LsdException Locked="false" Priority="71" Name="Colorful Shading Accent 1"/>
+  <w:LsdException Locked="false" Priority="72" Name="Colorful List Accent 1"/>
+  <w:LsdException Locked="false" Priority="73" Name="Colorful Grid Accent 1"/>
+  <w:LsdException Locked="false" Priority="60" Name="Light Shading Accent 2"/>
+  <w:LsdException Locked="false" Priority="61" Name="Light List Accent 2"/>
+  <w:LsdException Locked="false" Priority="62" Name="Light Grid Accent 2"/>
+  <w:LsdException Locked="false" Priority="63" Name="Medium Shading 1 Accent 2"/>
+  <w:LsdException Locked="false" Priority="64" Name="Medium Shading 2 Accent 2"/>
+  <w:LsdException Locked="false" Priority="65" Name="Medium List 1 Accent 2"/>
+  <w:LsdException Locked="false" Priority="66" Name="Medium List 2 Accent 2"/>
+  <w:LsdException Locked="false" Priority="67" Name="Medium Grid 1 Accent 2"/>
+  <w:LsdException Locked="false" Priority="68" Name="Medium Grid 2 Accent 2"/>
+  <w:LsdException Locked="false" Priority="69" Name="Medium Grid 3 Accent 2"/>
+  <w:LsdException Locked="false" Priority="70" Name="Dark List Accent 2"/>
+  <w:LsdException Locked="false" Priority="71" Name="Colorful Shading Accent 2"/>
+  <w:LsdException Locked="false" Priority="72" Name="Colorful List Accent 2"/>
+  <w:LsdException Locked="false" Priority="73" Name="Colorful Grid Accent 2"/>
+  <w:LsdException Locked="false" Priority="60" Name="Light Shading Accent 3"/>
+  <w:LsdException Locked="false" Priority="61" Name="Light List Accent 3"/>
+  <w:LsdException Locked="false" Priority="62" Name="Light Grid Accent 3"/>
+  <w:LsdException Locked="false" Priority="63" Name="Medium Shading 1 Accent 3"/>
+  <w:LsdException Locked="false" Priority="64" Name="Medium Shading 2 Accent 3"/>
+  <w:LsdException Locked="false" Priority="65" Name="Medium List 1 Accent 3"/>
+  <w:LsdException Locked="false" Priority="66" Name="Medium List 2 Accent 3"/>
+  <w:LsdException Locked="false" Priority="67" Name="Medium Grid 1 Accent 3"/>
+  <w:LsdException Locked="false" Priority="68" Name="Medium Grid 2 Accent 3"/>
+  <w:LsdException Locked="false" Priority="69" Name="Medium Grid 3 Accent 3"/>
+  <w:LsdException Locked="false" Priority="70" Name="Dark List Accent 3"/>
+  <w:LsdException Locked="false" Priority="71" Name="Colorful Shading Accent 3"/>
+  <w:LsdException Locked="false" Priority="72" Name="Colorful List Accent 3"/>
+  <w:LsdException Locked="false" Priority="73" Name="Colorful Grid Accent 3"/>
+  <w:LsdException Locked="false" Priority="60" Name="Light Shading Accent 4"/>
+  <w:LsdException Locked="false" Priority="61" Name="Light List Accent 4"/>
+  <w:LsdException Locked="false" Priority="62" Name="Light Grid Accent 4"/>
+  <w:LsdException Locked="false" Priority="63" Name="Medium Shading 1 Accent 4"/>
+  <w:LsdException Locked="false" Priority="64" Name="Medium Shading 2 Accent 4"/>
+  <w:LsdException Locked="false" Priority="65" Name="Medium List 1 Accent 4"/>
+  <w:LsdException Locked="false" Priority="66" Name="Medium List 2 Accent 4"/>
+  <w:LsdException Locked="false" Priority="67" Name="Medium Grid 1 Accent 4"/>
+  <w:LsdException Locked="false" Priority="68" Name="Medium Grid 2 Accent 4"/>
+  <w:LsdException Locked="false" Priority="69" Name="Medium Grid 3 Accent 4"/>
+  <w:LsdException Locked="false" Priority="70" Name="Dark List Accent 4"/>
+  <w:LsdException Locked="false" Priority="71" Name="Colorful Shading Accent 4"/>
+  <w:LsdException Locked="false" Priority="72" Name="Colorful List Accent 4"/>
+  <w:LsdException Locked="false" Priority="73" Name="Colorful Grid Accent 4"/>
+  <w:LsdException Locked="false" Priority="60" Name="Light Shading Accent 5"/>
+  <w:LsdException Locked="false" Priority="61" Name="Light List Accent 5"/>
+  <w:LsdException Locked="false" Priority="62" Name="Light Grid Accent 5"/>
+  <w:LsdException Locked="false" Priority="63" Name="Medium Shading 1 Accent 5"/>
+  <w:LsdException Locked="false" Priority="64" Name="Medium Shading 2 Accent 5"/>
+  <w:LsdException Locked="false" Priority="65" Name="Medium List 1 Accent 5"/>
+  <w:LsdException Locked="false" Priority="66" Name="Medium List 2 Accent 5"/>
+  <w:LsdException Locked="false" Priority="67" Name="Medium Grid 1 Accent 5"/>
+  <w:LsdException Locked="false" Priority="68" Name="Medium Grid 2 Accent 5"/>
+  <w:LsdException Locked="false" Priority="69" Name="Medium Grid 3 Accent 5"/>
+  <w:LsdException Locked="false" Priority="70" Name="Dark List Accent 5"/>
+  <w:LsdException Locked="false" Priority="71" Name="Colorful Shading Accent 5"/>
+  <w:LsdException Locked="false" Priority="72" Name="Colorful List Accent 5"/>
+  <w:LsdException Locked="false" Priority="73" Name="Colorful Grid Accent 5"/>
+  <w:LsdException Locked="false" Priority="60" Name="Light Shading Accent 6"/>
+  <w:LsdException Locked="false" Priority="61" Name="Light List Accent 6"/>
+  <w:LsdException Locked="false" Priority="62" Name="Light Grid Accent 6"/>
+  <w:LsdException Locked="false" Priority="63" Name="Medium Shading 1 Accent 6"/>
+  <w:LsdException Locked="false" Priority="64" Name="Medium Shading 2 Accent 6"/>
+  <w:LsdException Locked="false" Priority="65" Name="Medium List 1 Accent 6"/>
+  <w:LsdException Locked="false" Priority="66" Name="Medium List 2 Accent 6"/>
+  <w:LsdException Locked="false" Priority="67" Name="Medium Grid 1 Accent 6"/>
+  <w:LsdException Locked="false" Priority="68" Name="Medium Grid 2 Accent 6"/>
+  <w:LsdException Locked="false" Priority="69" Name="Medium Grid 3 Accent 6"/>
+  <w:LsdException Locked="false" Priority="70" Name="Dark List Accent 6"/>
+  <w:LsdException Locked="false" Priority="71" Name="Colorful Shading Accent 6"/>
+  <w:LsdException Locked="false" Priority="72" Name="Colorful List Accent 6"/>
+  <w:LsdException Locked="false" Priority="73" Name="Colorful Grid Accent 6"/>
+  <w:LsdException Locked="false" Priority="19" QFormat="true"
+   Name="Subtle Emphasis"/>
+  <w:LsdException Locked="false" Priority="21" QFormat="true"
+   Name="Intense Emphasis"/>
+  <w:LsdException Locked="false" Priority="31" QFormat="true"
+   Name="Subtle Reference"/>
+  <w:LsdException Locked="false" Priority="32" QFormat="true"
+   Name="Intense Reference"/>
+  <w:LsdException Locked="false" Priority="33" QFormat="true" Name="Book Title"/>
+  <w:LsdException Locked="false" Priority="37" SemiHidden="true"
+   UnhideWhenUsed="true" Name="Bibliography"/>
+  <w:LsdException Locked="false" Priority="39" SemiHidden="true"
+   UnhideWhenUsed="true" QFormat="true" Name="TOC Heading"/>
+  <w:LsdException Locked="false" Priority="41" Name="Plain Table 1"/>
+  <w:LsdException Locked="false" Priority="42" Name="Plain Table 2"/>
+  <w:LsdException Locked="false" Priority="43" Name="Plain Table 3"/>
+  <w:LsdException Locked="false" Priority="44" Name="Plain Table 4"/>
+  <w:LsdException Locked="false" Priority="45" Name="Plain Table 5"/>
+  <w:LsdException Locked="false" Priority="40" Name="Grid Table Light"/>
+  <w:LsdException Locked="false" Priority="46" Name="Grid Table 1 Light"/>
+  <w:LsdException Locked="false" Priority="47" Name="Grid Table 2"/>
+  <w:LsdException Locked="false" Priority="48" Name="Grid Table 3"/>
+  <w:LsdException Locked="false" Priority="49" Name="Grid Table 4"/>
+  <w:LsdException Locked="false" Priority="50" Name="Grid Table 5 Dark"/>
+  <w:LsdException Locked="false" Priority="51" Name="Grid Table 6 Colorful"/>
+  <w:LsdException Locked="false" Priority="52" Name="Grid Table 7 Colorful"/>
+  <w:LsdException Locked="false" Priority="46"
+   Name="Grid Table 1 Light Accent 1"/>
+  <w:LsdException Locked="false" Priority="47" Name="Grid Table 2 Accent 1"/>
+  <w:LsdException Locked="false" Priority="48" Name="Grid Table 3 Accent 1"/>
+  <w:LsdException Locked="false" Priority="49" Name="Grid Table 4 Accent 1"/>
+  <w:LsdException Locked="false" Priority="50" Name="Grid Table 5 Dark Accent 1"/>
+  <w:LsdException Locked="false" Priority="51"
+   Name="Grid Table 6 Colorful Accent 1"/>
+  <w:LsdException Locked="false" Priority="52"
+   Name="Grid Table 7 Colorful Accent 1"/>
+  <w:LsdException Locked="false" Priority="46"
+   Name="Grid Table 1 Light Accent 2"/>
+  <w:LsdException Locked="false" Priority="47" Name="Grid Table 2 Accent 2"/>
+  <w:LsdException Locked="false" Priority="48" Name="Grid Table 3 Accent 2"/>
+  <w:LsdException Locked="false" Priority="49" Name="Grid Table 4 Accent 2"/>
+  <w:LsdException Locked="false" Priority="50" Name="Grid Table 5 Dark Accent 2"/>
+  <w:LsdException Locked="false" Priority="51"
+   Name="Grid Table 6 Colorful Accent 2"/>
+  <w:LsdException Locked="false" Priority="52"
+   Name="Grid Table 7 Colorful Accent 2"/>
+  <w:LsdException Locked="false" Priority="46"
+   Name="Grid Table 1 Light Accent 3"/>
+  <w:LsdException Locked="false" Priority="47" Name="Grid Table 2 Accent 3"/>
+  <w:LsdException Locked="false" Priority="48" Name="Grid Table 3 Accent 3"/>
+  <w:LsdException Locked="false" Priority="49" Name="Grid Table 4 Accent 3"/>
+  <w:LsdException Locked="false" Priority="50" Name="Grid Table 5 Dark Accent 3"/>
+  <w:LsdException Locked="false" Priority="51"
+   Name="Grid Table 6 Colorful Accent 3"/>
+  <w:LsdException Locked="false" Priority="52"
+   Name="Grid Table 7 Colorful Accent 3"/>
+  <w:LsdException Locked="false" Priority="46"
+   Name="Grid Table 1 Light Accent 4"/>
+  <w:LsdException Locked="false" Priority="47" Name="Grid Table 2 Accent 4"/>
+  <w:LsdException Locked="false" Priority="48" Name="Grid Table 3 Accent 4"/>
+  <w:LsdException Locked="false" Priority="49" Name="Grid Table 4 Accent 4"/>
+  <w:LsdException Locked="false" Priority="50" Name="Grid Table 5 Dark Accent 4"/>
+  <w:LsdException Locked="false" Priority="51"
+   Name="Grid Table 6 Colorful Accent 4"/>
+  <w:LsdException Locked="false" Priority="52"
+   Name="Grid Table 7 Colorful Accent 4"/>
+  <w:LsdException Locked="false" Priority="46"
+   Name="Grid Table 1 Light Accent 5"/>
+  <w:LsdException Locked="false" Priority="47" Name="Grid Table 2 Accent 5"/>
+  <w:LsdException Locked="false" Priority="48" Name="Grid Table 3 Accent 5"/>
+  <w:LsdException Locked="false" Priority="49" Name="Grid Table 4 Accent 5"/>
+  <w:LsdException Locked="false" Priority="50" Name="Grid Table 5 Dark Accent 5"/>
+  <w:LsdException Locked="false" Priority="51"
+   Name="Grid Table 6 Colorful Accent 5"/>
+  <w:LsdException Locked="false" Priority="52"
+   Name="Grid Table 7 Colorful Accent 5"/>
+  <w:LsdException Locked="false" Priority="46"
+   Name="Grid Table 1 Light Accent 6"/>
+  <w:LsdException Locked="false" Priority="47" Name="Grid Table 2 Accent 6"/>
+  <w:LsdException Locked="false" Priority="48" Name="Grid Table 3 Accent 6"/>
+  <w:LsdException Locked="false" Priority="49" Name="Grid Table 4 Accent 6"/>
+  <w:LsdException Locked="false" Priority="50" Name="Grid Table 5 Dark Accent 6"/>
+  <w:LsdException Locked="false" Priority="51"
+   Name="Grid Table 6 Colorful Accent 6"/>
+  <w:LsdException Locked="false" Priority="52"
+   Name="Grid Table 7 Colorful Accent 6"/>
+  <w:LsdException Locked="false" Priority="46" Name="List Table 1 Light"/>
+  <w:LsdException Locked="false" Priority="47" Name="List Table 2"/>
+  <w:LsdException Locked="false" Priority="48" Name="List Table 3"/>
+  <w:LsdException Locked="false" Priority="49" Name="List Table 4"/>
+  <w:LsdException Locked="false" Priority="50" Name="List Table 5 Dark"/>
+  <w:LsdException Locked="false" Priority="51" Name="List Table 6 Colorful"/>
+  <w:LsdException Locked="false" Priority="52" Name="List Table 7 Colorful"/>
+  <w:LsdException Locked="false" Priority="46"
+   Name="List Table 1 Light Accent 1"/>
+  <w:LsdException Locked="false" Priority="47" Name="List Table 2 Accent 1"/>
+  <w:LsdException Locked="false" Priority="48" Name="List Table 3 Accent 1"/>
+  <w:LsdException Locked="false" Priority="49" Name="List Table 4 Accent 1"/>
+  <w:LsdException Locked="false" Priority="50" Name="List Table 5 Dark Accent 1"/>
+  <w:LsdException Locked="false" Priority="51"
+   Name="List Table 6 Colorful Accent 1"/>
+  <w:LsdException Locked="false" Priority="52"
+   Name="List Table 7 Colorful Accent 1"/>
+  <w:LsdException Locked="false" Priority="46"
+   Name="List Table 1 Light Accent 2"/>
+  <w:LsdException Locked="false" Priority="47" Name="List Table 2 Accent 2"/>
+  <w:LsdException Locked="false" Priority="48" Name="List Table 3 Accent 2"/>
+  <w:LsdException Locked="false" Priority="49" Name="List Table 4 Accent 2"/>
+  <w:LsdException Locked="false" Priority="50" Name="List Table 5 Dark Accent 2"/>
+  <w:LsdException Locked="false" Priority="51"
+   Name="List Table 6 Colorful Accent 2"/>
+  <w:LsdException Locked="false" Priority="52"
+   Name="List Table 7 Colorful Accent 2"/>
+  <w:LsdException Locked="false" Priority="46"
+   Name="List Table 1 Light Accent 3"/>
+  <w:LsdException Locked="false" Priority="47" Name="List Table 2 Accent 3"/>
+  <w:LsdException Locked="false" Priority="48" Name="List Table 3 Accent 3"/>
+  <w:LsdException Locked="false" Priority="49" Name="List Table 4 Accent 3"/>
+  <w:LsdException Locked="false" Priority="50" Name="List Table 5 Dark Accent 3"/>
+  <w:LsdException Locked="false" Priority="51"
+   Name="List Table 6 Colorful Accent 3"/>
+  <w:LsdException Locked="false" Priority="52"
+   Name="List Table 7 Colorful Accent 3"/>
+  <w:LsdException Locked="false" Priority="46"
+   Name="List Table 1 Light Accent 4"/>
+  <w:LsdException Locked="false" Priority="47" Name="List Table 2 Accent 4"/>
+  <w:LsdException Locked="false" Priority="48" Name="List Table 3 Accent 4"/>
+  <w:LsdException Locked="false" Priority="49" Name="List Table 4 Accent 4"/>
+  <w:LsdException Locked="false" Priority="50" Name="List Table 5 Dark Accent 4"/>
+  <w:LsdException Locked="false" Priority="51"
+   Name="List Table 6 Colorful Accent 4"/>
+  <w:LsdException Locked="false" Priority="52"
+   Name="List Table 7 Colorful Accent 4"/>
+  <w:LsdException Locked="false" Priority="46"
+   Name="List Table 1 Light Accent 5"/>
+  <w:LsdException Locked="false" Priority="47" Name="List Table 2 Accent 5"/>
+  <w:LsdException Locked="false" Priority="48" Name="List Table 3 Accent 5"/>
+  <w:LsdException Locked="false" Priority="49" Name="List Table 4 Accent 5"/>
+  <w:LsdException Locked="false" Priority="50" Name="List Table 5 Dark Accent 5"/>
+  <w:LsdException Locked="false" Priority="51"
+   Name="List Table 6 Colorful Accent 5"/>
+  <w:LsdException Locked="false" Priority="52"
+   Name="List Table 7 Colorful Accent 5"/>
+  <w:LsdException Locked="false" Priority="46"
+   Name="List Table 1 Light Accent 6"/>
+  <w:LsdException Locked="false" Priority="47" Name="List Table 2 Accent 6"/>
+  <w:LsdException Locked="false" Priority="48" Name="List Table 3 Accent 6"/>
+  <w:LsdException Locked="false" Priority="49" Name="List Table 4 Accent 6"/>
+  <w:LsdException Locked="false" Priority="50" Name="List Table 5 Dark Accent 6"/>
+  <w:LsdException Locked="false" Priority="51"
+   Name="List Table 6 Colorful Accent 6"/>
+  <w:LsdException Locked="false" Priority="52"
+   Name="List Table 7 Colorful Accent 6"/>
+ </w:LatentStyles>
+</xml><![endif]-->
+<style>
+<!--
+ /* Font Definitions */
+ @font-face
+	{font-family:Helvetica;
+	panose-1:2 11 6 4 2 2 2 2 2 4;
+	mso-font-charset:0;
+	mso-generic-font-family:swiss;
+	mso-font-format:other;
+	mso-font-pitch:variable;
+	mso-font-signature:3 0 0 0 1 0;}
+@font-face
+	{font-family:Courier;
+	panose-1:2 7 4 9 2 2 5 2 4 4;
+	mso-font-charset:0;
+	mso-generic-font-family:modern;
+	mso-font-format:other;
+	mso-font-pitch:fixed;
+	mso-font-signature:3 0 0 0 1 0;}
+@font-face
+	{font-family:"Tms Rmn";
+	panose-1:2 2 6 3 4 5 5 2 3 4;
+	mso-font-charset:0;
+	mso-generic-font-family:roman;
+	mso-font-format:other;
+	mso-font-pitch:variable;
+	mso-font-signature:3 0 0 0 1 0;}
+@font-face
+	{font-family:Helv;
+	panose-1:2 11 6 4 2 2 2 3 2 4;
+	mso-font-charset:0;
+	mso-generic-font-family:swiss;
+	mso-font-format:other;
+	mso-font-pitch:variable;
+	mso-font-signature:3 0 0 0 1 0;}
+@font-face
+	{font-family:"New York";
+	panose-1:2 4 5 3 6 5 6 2 3 4;
+	mso-font-charset:0;
+	mso-generic-font-family:roman;
+	mso-font-format:other;
+	mso-font-pitch:variable;
+	mso-font-signature:3 0 0 0 1 0;}
+@font-face
+	{font-family:System;
+	panose-1:0 0 0 0 0 0 0 0 0 0;
+	mso-font-charset:0;
+	mso-generic-font-family:swiss;
+	mso-font-format:other;
+	mso-font-pitch:variable;
+	mso-font-signature:3 0 0 0 1 0;}
+@font-face
+	{font-family:Wingdings;
+	panose-1:5 0 0 0 0 0 0 0 0 0;
+	mso-font-charset:2;
+	mso-generic-font-family:auto;
+	mso-font-pitch:variable;
+	mso-font-signature:0 268435456 0 0 -2147483648 0;}
+@font-face
+	{font-family:"MS Mincho";
+	panose-1:2 2 6 9 4 2 5 8 3 4;
+	mso-font-alt:"\FF2D\FF33 \660E\671D";
+	mso-font-charset:128;
+	mso-generic-font-family:roman;
+	mso-font-format:other;
+	mso-font-pitch:fixed;
+	mso-font-signature:1 134676480 16 0 131072 0;}
+@font-face
+	{font-family:Batang;
+	panose-1:2 3 6 0 0 1 1 1 1 1;
+	mso-font-alt:\BC14\D0D5;
+	mso-font-charset:129;
+	mso-generic-font-family:auto;
+	mso-font-format:other;
+	mso-font-pitch:fixed;
+	mso-font-signature:1 151388160 16 0 524288 0;}
+@font-face
+	{font-family:SimSun;
+	panose-1:2 1 6 0 3 1 1 1 1 1;
+	mso-font-alt:\5B8B\4F53;
+	mso-font-charset:134;
+	mso-generic-font-family:auto;
+	mso-font-format:other;
+	mso-font-pitch:variable;
+	mso-font-signature:1 135135232 16 0 262144 0;}
+@font-face
+	{font-family:PMingLiU;
+	panose-1:2 2 5 0 0 0 0 0 0 0;
+	mso-font-alt:\65B0\7D30\660E\9AD4;
+	mso-font-charset:136;
+	mso-generic-font-family:auto;
+	mso-font-format:other;
+	mso-font-pitch:variable;
+	mso-font-signature:1 134742016 16 0 1048576 0;}
+@font-face
+	{font-family:"MS Gothic";
+	panose-1:2 11 6 9 7 2 5 8 2 4;
+	mso-font-alt:"\FF2D\FF33 \30B4\30B7\30C3\30AF";
+	mso-font-charset:128;
+	mso-generic-font-family:modern;
+	mso-font-format:other;
+	mso-font-pitch:fixed;
+	mso-font-signature:1 134676480 16 0 131072 0;}
+@font-face
+	{font-family:Dotum;
+	panose-1:2 11 6 0 0 1 1 1 1 1;
+	mso-font-alt:\B3CB\C6C0;
+	mso-font-charset:129;
+	mso-generic-font-family:modern;
+	mso-font-format:other;
+	mso-font-pitch:fixed;
+	mso-font-signature:1 151388160 16 0 524288 0;}
+@font-face
+	{font-family:SimHei;
+	panose-1:2 1 6 9 6 1 1 1 1 1;
+	mso-font-alt:\9ED1\4F53;
+	mso-font-charset:134;
+	mso-generic-font-family:modern;
+	mso-font-format:other;
+	mso-font-pitch:fixed;
+	mso-font-signature:1 135135232 16 0 262144 0;}
+@font-face
+	{font-family:MingLiU;
+	panose-1:2 2 5 9 0 0 0 0 0 0;
+	mso-font-alt:\7D30\660E\9AD4;
+	mso-font-charset:136;
+	mso-generic-font-family:modern;
+	mso-font-format:other;
+	mso-font-pitch:fixed;
+	mso-font-signature:1 134742016 16 0 1048576 0;}
+@font-face
+	{font-family:Mincho;
+	panose-1:2 2 6 9 4 3 5 8 3 5;
+	mso-font-alt:\660E\671D;
+	mso-font-charset:128;
+	mso-generic-font-family:roman;
+	mso-font-format:other;
+	mso-font-pitch:fixed;
+	mso-font-signature:1 134676480 16 0 131072 0;}
+@font-face
+	{font-family:Gulim;
+	panose-1:2 11 6 0 0 1 1 1 1 1;
+	mso-font-alt:\AD74\B9BC;
+	mso-font-charset:129;
+	mso-generic-font-family:roman;
+	mso-font-format:other;
+	mso-font-pitch:fixed;
+	mso-font-signature:1 151388160 16 0 524288 0;}
+@font-face
+	{font-family:Century;
+	panose-1:2 4 6 4 5 5 5 2 3 4;
+	mso-font-charset:0;
+	mso-generic-font-family:roman;
+	mso-font-format:other;
+	mso-font-pitch:variable;
+	mso-font-signature:3 0 0 0 1 0;}
+@font-face
+	{font-family:"Angsana New";
+	panose-1:2 2 6 3 5 4 5 2 3 4;
+	mso-font-charset:222;
+	mso-generic-font-family:roman;
+	mso-font-format:other;
+	mso-font-pitch:variable;
+	mso-font-signature:16777217 0 0 0 65536 0;}
+@font-face
+	{font-family:"Cordia New";
+	panose-1:2 11 3 4 2 2 2 2 2 4;
+	mso-font-charset:222;
+	mso-generic-font-family:roman;
+	mso-font-format:other;
+	mso-font-pitch:variable;
+	mso-font-signature:16777217 0 0 0 65536 0;}
+@font-face
+	{font-family:Mangal;
+	panose-1:2 4 5 3 5 2 3 3 2 2;
+	mso-font-charset:1;
+	mso-generic-font-family:roman;
+	mso-font-format:other;
+	mso-font-pitch:variable;
+	mso-font-signature:8192 0 0 0 0 0;}
+@font-face
+	{font-family:Latha;
+	panose-1:2 11 6 4 2 2 2 2 2 4;
+	mso-font-charset:1;
+	mso-generic-font-family:roman;
+	mso-font-format:other;
+	mso-font-pitch:variable;
+	mso-font-signature:262144 0 0 0 0 0;}
+@font-face
+	{font-family:Sylfaen;
+	panose-1:1 10 5 2 5 3 6 3 3 3;
+	mso-font-charset:0;
+	mso-generic-font-family:roman;
+	mso-font-format:other;
+	mso-font-pitch:variable;
+	mso-font-signature:12583555 0 0 0 13 0;}
+@font-face
+	{font-family:Vrinda;
+	panose-1:2 11 5 2 4 2 4 2 2 3;
+	mso-font-charset:1;
+	mso-generic-font-family:roman;
+	mso-font-format:other;
+	mso-font-pitch:variable;
+	mso-font-signature:0 0 0 0 0 0;}
+@font-face
+	{font-family:Raavi;
+	panose-1:2 11 5 2 4 2 4 2 2 3;
+	mso-font-charset:1;
+	mso-generic-font-family:roman;
+	mso-font-format:other;
+	mso-font-pitch:variable;
+	mso-font-signature:0 0 0 0 0 0;}
+@font-face
+	{font-family:Shruti;
+	panose-1:2 11 5 2 4 2 4 2 2 3;
+	mso-font-charset:1;
+	mso-generic-font-family:roman;
+	mso-font-format:other;
+	mso-font-pitch:variable;
+	mso-font-signature:0 0 0 0 0 0;}
+@font-face
+	{font-family:Sendnya;
+	panose-1:0 0 4 0 0 0 0 0 0 0;
+	mso-font-charset:1;
+	mso-generic-font-family:roman;
+	mso-font-format:other;
+	mso-font-pitch:variable;
+	mso-font-signature:0 0 0 0 0 0;}
+@font-face
+	{font-family:Gautami;
+	panose-1:2 11 5 2 4 2 4 2 2 3;
+	mso-font-charset:1;
+	mso-generic-font-family:roman;
+	mso-font-format:other;
+	mso-font-pitch:variable;
+	mso-font-signature:0 0 0 0 0 0;}
+@font-face
+	{font-family:Tunga;
+	panose-1:2 11 5 2 4 2 4 2 2 3;
+	mso-font-charset:1;
+	mso-generic-font-family:roman;
+	mso-font-format:other;
+	mso-font-pitch:variable;
+	mso-font-signature:0 0 0 0 0 0;}
+@font-face
+	{font-family:"Estrangelo Edessa";
+	panose-1:3 8 6 0 0 0 0 0 0 0;
+	mso-font-charset:1;
+	mso-generic-font-family:roman;
+	mso-font-format:other;
+	mso-font-pitch:variable;
+	mso-font-signature:0 0 0 0 0 0;}
+@font-face
+	{font-family:"Cambria Math";
+	panose-1:2 4 5 3 5 4 6 3 2 4;
+	mso-font-charset:1;
+	mso-generic-font-family:roman;
+	mso-font-format:other;
+	mso-font-pitch:variable;
+	mso-font-signature:0 0 0 0 0 0;}
+@font-face
+	{font-family:"Arial Unicode MS";
+	panose-1:2 11 6 4 2 2 2 2 2 4;
+	mso-font-charset:0;
+	mso-generic-font-family:roman;
+	mso-font-format:other;
+	mso-font-pitch:variable;
+	mso-font-signature:3 0 0 0 1 0;}
+@font-face
+	{font-family:"Calibri Light";
+	panose-1:2 15 3 2 2 2 4 3 2 4;
+	mso-font-charset:0;
+	mso-generic-font-family:swiss;
+	mso-font-pitch:variable;
+	mso-font-signature:-536859905 -1073732485 9 0 511 0;}
+@font-face
+	{font-family:Calibri;
+	panose-1:2 15 5 2 2 2 4 3 2 4;
+	mso-font-charset:0;
+	mso-generic-font-family:swiss;
+	mso-font-pitch:variable;
+	mso-font-signature:-536859905 -1073732485 9 0 511 0;}
+@font-face
+	{font-family:"Segoe UI";
+	panose-1:2 11 5 2 4 2 4 2 2 3;
+	mso-font-charset:0;
+	mso-generic-font-family:swiss;
+	mso-font-format:other;
+	mso-font-pitch:variable;
+	mso-font-signature:3 0 0 0 1 0;}
+ /* Style Definitions */
+ p.MsoNormal, li.MsoNormal, div.MsoNormal
+	{mso-style-unhide:no;
+	mso-style-qformat:yes;
+	mso-style-parent:"";
+	margin-top:0in;
+	margin-right:0in;
+	margin-bottom:8.0pt;
+	margin-left:0in;
+	line-height:107%;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:"Calibri",sans-serif;
+	mso-ascii-font-family:Calibri;
+	mso-ascii-theme-font:minor-latin;
+	mso-fareast-font-family:Calibri;
+	mso-fareast-theme-font:minor-latin;
+	mso-hansi-font-family:Calibri;
+	mso-hansi-theme-font:minor-latin;
+	mso-bidi-font-family:"Times New Roman";
+	mso-bidi-theme-font:minor-bidi;}
+h2
+	{mso-style-priority:9;
+	mso-style-qformat:yes;
+	mso-style-link:"Heading 2 Char";
+	mso-style-next:Normal;
+	margin-top:2.0pt;
+	margin-right:0in;
+	margin-bottom:0in;
+	margin-left:0in;
+	margin-bottom:.0001pt;
+	line-height:107%;
+	mso-pagination:widow-orphan lines-together;
+	page-break-after:avoid;
+	mso-outline-level:2;
+	font-size:13.0pt;
+	font-family:"Calibri Light",sans-serif;
+	mso-ascii-font-family:"Calibri Light";
+	mso-ascii-theme-font:major-latin;
+	mso-fareast-font-family:"Times New Roman";
+	mso-fareast-theme-font:major-fareast;
+	mso-hansi-font-family:"Calibri Light";
+	mso-hansi-theme-font:major-latin;
+	mso-bidi-font-family:"Times New Roman";
+	mso-bidi-theme-font:major-bidi;
+	color:#2E74B5;
+	mso-themecolor:accent1;
+	mso-themeshade:191;
+	font-weight:normal;}
+a:link, span.MsoHyperlink
+	{mso-style-noshow:yes;
+	mso-style-priority:99;
+	color:blue;
+	text-decoration:underline;
+	text-underline:single;}
+a:visited, span.MsoHyperlinkFollowed
+	{mso-style-noshow:yes;
+	mso-style-priority:99;
+	color:#954F72;
+	mso-themecolor:followedhyperlink;
+	text-decoration:underline;
+	text-underline:single;}
+span.Heading2Char
+	{mso-style-name:"Heading 2 Char";
+	mso-style-priority:9;
+	mso-style-unhide:no;
+	mso-style-locked:yes;
+	mso-style-link:"Heading 2";
+	mso-ansi-font-size:13.0pt;
+	mso-bidi-font-size:13.0pt;
+	font-family:"Calibri Light",sans-serif;
+	mso-ascii-font-family:"Calibri Light";
+	mso-ascii-theme-font:major-latin;
+	mso-fareast-font-family:"Times New Roman";
+	mso-fareast-theme-font:major-fareast;
+	mso-hansi-font-family:"Calibri Light";
+	mso-hansi-theme-font:major-latin;
+	mso-bidi-font-family:"Times New Roman";
+	mso-bidi-theme-font:major-bidi;
+	color:#2E74B5;
+	mso-themecolor:accent1;
+	mso-themeshade:191;}
+span.msoIns
+	{mso-style-type:export-only;
+	mso-style-name:"";
+	text-decoration:underline;
+	text-underline:single;
+	color:teal;}
+span.msoDel
+	{mso-style-type:export-only;
+	mso-style-name:"";
+	text-decoration:line-through;
+	color:red;}
+.MsoChpDefault
+	{mso-style-type:export-only;
+	mso-default-props:yes;
+	font-family:"Calibri",sans-serif;
+	mso-ascii-font-family:Calibri;
+	mso-ascii-theme-font:minor-latin;
+	mso-fareast-font-family:Calibri;
+	mso-fareast-theme-font:minor-latin;
+	mso-hansi-font-family:Calibri;
+	mso-hansi-theme-font:minor-latin;
+	mso-bidi-font-family:"Times New Roman";
+	mso-bidi-theme-font:minor-bidi;}
+.MsoPapDefault
+	{mso-style-type:export-only;
+	margin-bottom:8.0pt;
+	line-height:107%;}
+@page WordSection1
+	{size:11.0in 8.5in;
+	mso-page-orientation:landscape;
+	margin:1.0in 1.0in 1.0in 1.0in;
+	mso-header-margin:.5in;
+	mso-footer-margin:.5in;
+	mso-paper-source:0;}
+div.WordSection1
+	{page:WordSection1;}
+ /* List Definitions */
+ @list l0
+	{mso-list-id:364453017;
+	mso-list-template-ids:-1899575734;}
+@list l0:level1
+	{mso-level-number-format:bullet;
+	mso-level-text:\F0B7;
+	mso-level-tab-stop:.5in;
+	mso-level-number-position:left;
+	text-indent:-.25in;
+	mso-ansi-font-size:10.0pt;
+	font-family:Symbol;}
+@list l0:level2
+	{mso-level-number-format:bullet;
+	mso-level-text:o;
+	mso-level-tab-stop:1.0in;
+	mso-level-number-position:left;
+	text-indent:-.25in;
+	mso-ansi-font-size:10.0pt;
+	font-family:"Courier New";
+	mso-bidi-font-family:"Times New Roman";}
+@list l0:level3
+	{mso-level-number-format:bullet;
+	mso-level-text:\F0A7;
+	mso-level-tab-stop:1.5in;
+	mso-level-number-position:left;
+	text-indent:-.25in;
+	mso-ansi-font-size:10.0pt;
+	font-family:Wingdings;}
+@list l0:level4
+	{mso-level-number-format:bullet;
+	mso-level-text:\F0A7;
+	mso-level-tab-stop:2.0in;
+	mso-level-number-position:left;
+	text-indent:-.25in;
+	mso-ansi-font-size:10.0pt;
+	font-family:Wingdings;}
+@list l0:level5
+	{mso-level-number-format:bullet;
+	mso-level-text:\F0A7;
+	mso-level-tab-stop:2.5in;
+	mso-level-number-position:left;
+	text-indent:-.25in;
+	mso-ansi-font-size:10.0pt;
+	font-family:Wingdings;}
+@list l0:level6
+	{mso-level-number-format:bullet;
+	mso-level-text:\F0A7;
+	mso-level-tab-stop:3.0in;
+	mso-level-number-position:left;
+	text-indent:-.25in;
+	mso-ansi-font-size:10.0pt;
+	font-family:Wingdings;}
+@list l0:level7
+	{mso-level-number-format:bullet;
+	mso-level-text:\F0A7;
+	mso-level-tab-stop:3.5in;
+	mso-level-number-position:left;
+	text-indent:-.25in;
+	mso-ansi-font-size:10.0pt;
+	font-family:Wingdings;}
+@list l0:level8
+	{mso-level-number-format:bullet;
+	mso-level-text:\F0A7;
+	mso-level-tab-stop:4.0in;
+	mso-level-number-position:left;
+	text-indent:-.25in;
+	mso-ansi-font-size:10.0pt;
+	font-family:Wingdings;}
+@list l0:level9
+	{mso-level-number-format:bullet;
+	mso-level-text:\F0A7;
+	mso-level-tab-stop:4.5in;
+	mso-level-number-position:left;
+	text-indent:-.25in;
+	mso-ansi-font-size:10.0pt;
+	font-family:Wingdings;}
+@list l1
+	{mso-list-id:1808625326;
+	mso-list-template-ids:-1664603998;}
+@list l1:level1
+	{mso-level-number-format:bullet;
+	mso-level-text:\F0B7;
+	mso-level-tab-stop:.5in;
+	mso-level-number-position:left;
+	text-indent:-.25in;
+	mso-ansi-font-size:10.0pt;
+	font-family:Symbol;}
+@list l1:level2
+	{mso-level-number-format:bullet;
+	mso-level-text:o;
+	mso-level-tab-stop:1.0in;
+	mso-level-number-position:left;
+	text-indent:-.25in;
+	mso-ansi-font-size:10.0pt;
+	font-family:"Courier New";
+	mso-bidi-font-family:"Times New Roman";}
+@list l1:level3
+	{mso-level-number-format:bullet;
+	mso-level-text:\F0A7;
+	mso-level-tab-stop:1.5in;
+	mso-level-number-position:left;
+	text-indent:-.25in;
+	mso-ansi-font-size:10.0pt;
+	font-family:Wingdings;}
+@list l1:level4
+	{mso-level-number-format:bullet;
+	mso-level-text:\F0A7;
+	mso-level-tab-stop:2.0in;
+	mso-level-number-position:left;
+	text-indent:-.25in;
+	mso-ansi-font-size:10.0pt;
+	font-family:Wingdings;}
+@list l1:level5
+	{mso-level-number-format:bullet;
+	mso-level-text:\F0A7;
+	mso-level-tab-stop:2.5in;
+	mso-level-number-position:left;
+	text-indent:-.25in;
+	mso-ansi-font-size:10.0pt;
+	font-family:Wingdings;}
+@list l1:level6
+	{mso-level-number-format:bullet;
+	mso-level-text:\F0A7;
+	mso-level-tab-stop:3.0in;
+	mso-level-number-position:left;
+	text-indent:-.25in;
+	mso-ansi-font-size:10.0pt;
+	font-family:Wingdings;}
+@list l1:level7
+	{mso-level-number-format:bullet;
+	mso-level-text:\F0A7;
+	mso-level-tab-stop:3.5in;
+	mso-level-number-position:left;
+	text-indent:-.25in;
+	mso-ansi-font-size:10.0pt;
+	font-family:Wingdings;}
+@list l1:level8
+	{mso-level-number-format:bullet;
+	mso-level-text:\F0A7;
+	mso-level-tab-stop:4.0in;
+	mso-level-number-position:left;
+	text-indent:-.25in;
+	mso-ansi-font-size:10.0pt;
+	font-family:Wingdings;}
+@list l1:level9
+	{mso-level-number-format:bullet;
+	mso-level-text:\F0A7;
+	mso-level-tab-stop:4.5in;
+	mso-level-number-position:left;
+	text-indent:-.25in;
+	mso-ansi-font-size:10.0pt;
+	font-family:Wingdings;}
+@list l2
+	{mso-list-id:2000766018;
+	mso-list-template-ids:-780390354;}
+@list l2:level1
+	{mso-level-number-format:bullet;
+	mso-level-text:\F0B7;
+	mso-level-tab-stop:.5in;
+	mso-level-number-position:left;
+	text-indent:-.25in;
+	mso-ansi-font-size:10.0pt;
+	font-family:Symbol;}
+@list l2:level2
+	{mso-level-number-format:bullet;
+	mso-level-text:o;
+	mso-level-tab-stop:1.0in;
+	mso-level-number-position:left;
+	text-indent:-.25in;
+	mso-ansi-font-size:10.0pt;
+	font-family:"Courier New";
+	mso-bidi-font-family:"Times New Roman";}
+@list l2:level3
+	{mso-level-number-format:bullet;
+	mso-level-text:\F0A7;
+	mso-level-tab-stop:1.5in;
+	mso-level-number-position:left;
+	text-indent:-.25in;
+	mso-ansi-font-size:10.0pt;
+	font-family:Wingdings;}
+@list l2:level4
+	{mso-level-number-format:bullet;
+	mso-level-text:\F0A7;
+	mso-level-tab-stop:2.0in;
+	mso-level-number-position:left;
+	text-indent:-.25in;
+	mso-ansi-font-size:10.0pt;
+	font-family:Wingdings;}
+@list l2:level5
+	{mso-level-number-format:bullet;
+	mso-level-text:\F0A7;
+	mso-level-tab-stop:2.5in;
+	mso-level-number-position:left;
+	text-indent:-.25in;
+	mso-ansi-font-size:10.0pt;
+	font-family:Wingdings;}
+@list l2:level6
+	{mso-level-number-format:bullet;
+	mso-level-text:\F0A7;
+	mso-level-tab-stop:3.0in;
+	mso-level-number-position:left;
+	text-indent:-.25in;
+	mso-ansi-font-size:10.0pt;
+	font-family:Wingdings;}
+@list l2:level7
+	{mso-level-number-format:bullet;
+	mso-level-text:\F0A7;
+	mso-level-tab-stop:3.5in;
+	mso-level-number-position:left;
+	text-indent:-.25in;
+	mso-ansi-font-size:10.0pt;
+	font-family:Wingdings;}
+@list l2:level8
+	{mso-level-number-format:bullet;
+	mso-level-text:\F0A7;
+	mso-level-tab-stop:4.0in;
+	mso-level-number-position:left;
+	text-indent:-.25in;
+	mso-ansi-font-size:10.0pt;
+	font-family:Wingdings;}
+@list l2:level9
+	{mso-level-number-format:bullet;
+	mso-level-text:\F0A7;
+	mso-level-tab-stop:4.5in;
+	mso-level-number-position:left;
+	text-indent:-.25in;
+	mso-ansi-font-size:10.0pt;
+	font-family:Wingdings;}
+ol
+	{margin-bottom:0in;}
+ul
+	{margin-bottom:0in;}
+-->
+</style>
+<!--[if gte mso 10]>
+<style>
+ /* Style Definitions */
+ table.MsoNormalTable
+	{mso-style-name:"Table Normal";
+	mso-tstyle-rowband-size:0;
+	mso-tstyle-colband-size:0;
+	mso-style-noshow:yes;
+	mso-style-priority:99;
+	mso-style-parent:"";
+	mso-padding-alt:0in 5.4pt 0in 5.4pt;
+	mso-para-margin-top:0in;
+	mso-para-margin-right:0in;
+	mso-para-margin-bottom:8.0pt;
+	mso-para-margin-left:0in;
+	line-height:107%;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:"Calibri",sans-serif;
+	mso-ascii-font-family:Calibri;
+	mso-ascii-theme-font:minor-latin;
+	mso-hansi-font-family:Calibri;
+	mso-hansi-theme-font:minor-latin;
+	mso-bidi-font-family:"Times New Roman";
+	mso-bidi-theme-font:minor-bidi;}
+table.MsoTableGrid
+	{mso-style-name:"Table Grid";
+	mso-tstyle-rowband-size:0;
+	mso-tstyle-colband-size:0;
+	mso-style-priority:39;
+	mso-style-unhide:no;
+	border:solid windowtext 1.0pt;
+	mso-border-alt:solid windowtext .5pt;
+	mso-padding-alt:0in 5.4pt 0in 5.4pt;
+	mso-border-insideh:.5pt solid windowtext;
+	mso-border-insidev:.5pt solid windowtext;
+	mso-para-margin:0in;
+	mso-para-margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:"Calibri",sans-serif;
+	mso-ascii-font-family:Calibri;
+	mso-ascii-theme-font:minor-latin;
+	mso-hansi-font-family:Calibri;
+	mso-hansi-theme-font:minor-latin;
+	mso-bidi-font-family:"Times New Roman";
+	mso-bidi-theme-font:minor-bidi;}
+</style>
+<![endif]--><!--[if gte mso 9]><xml>
+ <o:shapedefaults v:ext="edit" spidmax="1026"/>
+</xml><![endif]--><!--[if gte mso 9]><xml>
+ <o:shapelayout v:ext="edit">
+  <o:idmap v:ext="edit" data="1"/>
+ </o:shapelayout></xml><![endif]-->
+</head>
+
+<body lang=EN-US link=blue vlink="#954F72" style='tab-interval:.5in'>
+
+<div class=WordSection1>
+
+<p class=MsoNormal align=center style='text-align:center'><b style='mso-bidi-font-weight:
+normal'><span style='font-size:14.0pt;mso-bidi-font-size:11.0pt;line-height:
+107%;font-family:"Times New Roman",serif'>C++ API Wrappers of HDF5 C Functions<o:p></o:p></span></b></p>
+
+<p class=MsoNormal><o:p>&nbsp;</o:p></p>
+
+<table class=MsoTableGrid border=1 cellspacing=0 cellpadding=0 width=0
+ style='width:736.55pt;margin-left:5.65pt;border-collapse:collapse;border:none;
+ mso-border-alt:solid windowtext .5pt;mso-yfti-tbllook:1184;mso-padding-alt:
+ 0in 5.4pt 0in 5.4pt'>
+ <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;mso-border-alt:
+  solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><b style='mso-bidi-font-weight:normal'>C Function<o:p></o:p></b></p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border:solid windowtext 1.0pt;
+  border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
+  solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><b style='mso-bidi-font-weight:normal'>C++
+  Wrapper<o:p></o:p></b></p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border:solid windowtext 1.0pt;
+  border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
+  solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><b style='mso-bidi-font-weight:normal'>1.8<o:p></o:p></b></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border:solid windowtext 1.0pt;
+  border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
+  solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><b style='mso-bidi-font-weight:normal'>1.10<o:p></o:p></b></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border:solid windowtext 1.0pt;
+  border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
+  solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><b style='mso-bidi-font-weight:normal'>Comment<o:p></o:p></b></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:1'>
+  <td width=263 rowspan=4 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Acreate2</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>Attribute H5Location::createAttribute( const char* name, const
+  DataType&amp; data_type, const DataSpace&amp; data_space, const PropList&amp;
+  create_plist = PropList::DEFAULT)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:#F2F2F2;mso-background-themecolor:
+  background1;mso-background-themeshade:242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>Deprecated in 1.8.19</p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:2'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>Attribute H5Location::createAttribute( const H5std_string&amp; name,
+  const DataType&amp; data_type, const DataSpace&amp; data_space, const
+  PropList&amp; create_plist = PropList::DEFAULT)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:#F2F2F2;mso-background-themecolor:
+  background1;mso-background-themeshade:242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>Deprecated in 1.8.19</p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:3'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>Attribute H5Object::createAttribute( const char* name, const
+  DataType&amp; data_type, const DataSpace&amp; data_space, const PropList&amp;
+  create_plist = PropList::DEFAULT)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>Revised model</p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:4'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>Attribute H5Object::createAttribute( const H5std_string&amp; name,
+  const DataType&amp; data_type, const DataSpace&amp; data_space, const
+  PropList&amp; create_plist = PropList::DEFAULT)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>Revised model</p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:5'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Acreate_by_name</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>no</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:6'>
+  <td width=263 rowspan=4 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Aopen</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>Attribute H5Location::openAttribute( const char* name )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:#F2F2F2;mso-background-themecolor:
+  background1;mso-background-themeshade:242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>Deprecated in 1.8.19</p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:7'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>Attribute H5Location::openAttribute( const H5std_string&amp; name )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:#F2F2F2;mso-background-themecolor:
+  background1;mso-background-themeshade:242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>Deprecated in 1.8.19</p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:8'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>Attribute H5Object::openAttribute( const char* name )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:9'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>Attribute H5Object::openAttribute( const H5std_string&amp; name )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:10'>
+  <td width=263 rowspan=2 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Aopen_by_idx</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Aopen_by_idx</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>Attribute H5Location::openAttribute( const unsigned int idx )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:#F2F2F2;mso-background-themecolor:
+  background1;mso-background-themeshade:242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>Deprecated in 1.8.19</p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:11'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>Attribute H5Object::openAttribute( const unsigned int idx )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:12'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Aopen_by_name</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>no</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:13'>
+  <td width=263 rowspan=2 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Awrite</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void Attribute::write( const DataType&amp; mem_type, const void *buf
+  )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:14'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void Attribute::write(const DataType&amp; mem_type, const
+  H5std_string&amp; strg)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:15'>
+  <td width=263 rowspan=2 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Aread</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void Attribute::read( const DataType&amp; mem_type, void *buf )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:16'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void Attribute::read(const DataType&amp; mem_type, H5std_string&amp;
+  strg)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:17'>
+  <td width=263 rowspan=2 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Aclose</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void Attribute::close()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:18'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>Attribute::~Attribute()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:19'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Aget_space</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>DataSpace Attribute::getSpace()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:20'>
+  <td width=263 rowspan=8 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Aget_type</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>DataType AbstractDs::getDataType()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:21'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>ArrayType AbstractDs::getArrayType()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:22'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>CompType AbstractDs::getCompType()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:23'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>EnumType AbstractDs::getEnumType()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:24'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>IntType AbstractDs::getIntType()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:25'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>FloatType AbstractDs::getFloatType()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:26'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>StrType AbstractDs::getStrType()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:27'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>VarLenType AbstractDs::getVarLenType()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:28'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Aget_create_plist</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>no</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:29'>
+  <td width=263 rowspan=5 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Aget_name</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>ssize_t Attribute::getName(char* attr_name, size_t buf_size)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:30'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5std_string Attribute::getName()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:31'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5std_string Attribute::getName(size_t len) const</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:32'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>ssize_t Attribute::getName(H5std_string&amp; attr_name, size_t len)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:33'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>ssize_t Attribute::getName( size_t len, H5std_string&amp; attr_name )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:34'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Aget_name_by_idx</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>no</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:35'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Aget_storage_size</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>hsize_t Attribute::getStorageSize()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:36'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Aget_info</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>no</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:37'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Aget_info_by_name</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>no</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:38'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Aget_info_by_idx</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>no</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:39'>
+  <td width=263 rowspan=2 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Arename</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void H5Location::renameAttr(const char* oldname, const char* newname)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>Deprecated in 1.8.19</p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:40'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void H5Object::renameAttr(const char* oldname, const char* newname)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:41'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Arename_by_name</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>no</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:42'>
+  <td width=263 rowspan=2 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Aiterate2</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>int H5Location::iterateAttrs( attr_operator_t user_op, unsigned
+  *_idx, void *op_data )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:43'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>int H5Object::iterateAttrs( attr_operator_t user_op, unsigned *_idx,
+  void *op_data )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:44'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Aiterate_by_name</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:45'>
+  <td width=263 rowspan=2 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Adelete</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void H5Location::removeAttr( const char* name )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>Deprecated in 1.8.19</p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:46'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void H5Object::removeAttr( const char* name )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:47'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Adelete_by_name</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:48'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Adelete_by_idx</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:49'>
+  <td width=263 rowspan=2 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Aexists</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>bool H5Location::attrExists(const char* name)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>Deprecated in 1.8.19</p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:50'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>bool H5Object::attrExists(const char* name)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:51'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Aexists_by_name</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:52'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  background:#F2F2F2;mso-background-themecolor:background1;mso-background-themeshade:
+  242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><span style='background:lightgrey;mso-highlight:lightgrey'><o:p>&nbsp;</o:p></span></p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:#F2F2F2;mso-background-themecolor:
+  background1;mso-background-themeshade:242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:#F2F2F2;mso-background-themecolor:
+  background1;mso-background-themeshade:242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:#F2F2F2;mso-background-themecolor:
+  background1;mso-background-themeshade:242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:#F2F2F2;mso-background-themecolor:
+  background1;mso-background-themeshade:242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:53'>
+  <td width=263 rowspan=4 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Dcreate2</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>DataSet CommonFG::createDataSet( const char* name, const
+  DataType&amp; data_type, const DataSpace&amp; data_space, const
+  DSetCreatPropList&amp; create_plist )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:#F2F2F2;mso-background-themecolor:
+  background1;mso-background-themeshade:242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:54'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>DataSet CommonFG::createDataSet( const H5std_string&amp; name, const
+  DataType&amp; data_type, const DataSpace&amp; data_space, const
+  DSetCreatPropList&amp; create_plist )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:#F2F2F2;mso-background-themecolor:
+  background1;mso-background-themeshade:242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:55'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>DataSet H5Location::createDataSet( const char* name, const
+  DataType&amp; data_type, const DataSpace&amp; data_space, const
+  DSetCreatPropList&amp; create_plist )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:#F2F2F2;mso-background-themecolor:
+  background1;mso-background-themeshade:242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:56'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>DataSet H5Location::createDataSet( const H5std_string&amp; name,
+  const DataType&amp; data_type, const DataSpace&amp; data_space, const
+  DSetCreatPropList&amp; create_plist )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:#F2F2F2;mso-background-themecolor:
+  background1;mso-background-themeshade:242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:57'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Dcreate_anon</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>no</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:58'>
+  <td width=263 rowspan=4 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Dopen2</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>DataSet CommonFG::openDataSet( const char* name )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:59'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>DataSet CommonFG::openDataSet( const H5std_string&amp; name)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:60'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>DataSet H5Location::openDataSet( const char* name )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:61'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>DataSet H5Location::openDataSet( const H5std_string&amp; name)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:62'>
+  <td width=263 rowspan=2 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Dclose</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DataSet::close()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:63'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>DataSet destructor</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:64'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Dget_space</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>DataSpace DataSet::getSpace()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:65'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Dget_space_status</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DataSet::getSpaceStatus(H5D_space_status_t&amp; status)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:66'>
+  <td width=263 rowspan=8 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Dget_type</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>DataType AbstractDs::getDataType()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:67'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>ArrayType AbstractDs::getArrayType()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:68'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>CompType AbstractDs::getCompType()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:69'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>EnumType AbstractDs::getEnumType()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:70'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>IntType AbstractDs::getIntType()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:71'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>FloatType AbstractDs::getFloatType()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:72'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>StrType AbstractDs::getStrType()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:73'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>VarLenType AbstractDs::getVarLenType()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:74'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Dget_create_plist</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>DSetCreatPropList DataSet::getCreatePlist()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:75'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Dget_access_plist</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>no</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:76'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Dget_storage_size</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>hsize_t DataSet::getStorageSize()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:77'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Dget_offset</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>haddr_t DataSet::getOffset()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:78'>
+  <td width=263 rowspan=2 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Dread</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DataSet::read( void* buf, const DataType&amp; mem_type, const
+  DataSpace&amp; mem_space, const DataSpace&amp; file_space, const
+  DSetMemXferPropList&amp; xfer_plist )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:79'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DataSet::read(H5std_string&amp; strg, const DataType&amp;
+  mem_type, const DataSpace&amp; mem_space, const DataSpace&amp; file_space,
+  const DSetMemXferPropList&amp; xfer_plist)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:80'>
+  <td width=263 rowspan=2 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Dwrite</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DataSet::write( const void* buf, const DataType&amp; mem_type,
+  const DataSpace&amp; mem_space, const DataSpace&amp; file_space, const
+  DSetMemXferPropList&amp; xfer_plist )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:81'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DataSet::write( const H5std_string&amp; strg, const
+  DataType&amp; mem_type, const DataSpace&amp; mem_space, const DataSpace&amp;
+  file_space, const DSetMemXferPropList&amp; xfer_plist )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:82'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Diterate</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>int DataSet::iterateElems( void* buf, const DataType&amp; type, const
+  DataSpace&amp; space, H5D_operator_t op, void* op_data )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:83'>
+  <td width=263 rowspan=2 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Dvlen_reclaim</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DataSet::vlenReclaim(const DataType&amp; type, const
+  DataSpace&amp; space, const DSetMemXferPropList&amp; xfer_plist, void* buf )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>Remove this one</p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:84'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DataSet::vlenReclaim(void* buf, const DataType&amp; type, const
+  DataSpace&amp; space, const DSetMemXferPropList&amp; xfer_plist)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>Better prototype</p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:85'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Dvlen_get_buf_size</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>hsize_t DataSet::getVlenBufSize(const DataType&amp; type, const
+  DataSpace&amp; space)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:86'>
+  <td width=263 rowspan=2 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Dfill</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DataSet::fillMemBuf(const void *fill, const DataType&amp;
+  fill_type, void *buf, const DataType&amp; buf_type, const DataSpace&amp;
+  space)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:87'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DataSet::fillMemBuf(void *buf, const DataType&amp; buf_type,
+  const DataSpace&amp; space</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:88'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Dset_extent</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DataSet::extend( const hsize_t* size )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:89'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Dscatter</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>no</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:90'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Dgather</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>no</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:91'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Ddebug</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>no</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:92'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><span style='background:lightgrey;mso-highlight:lightgrey'><o:p>&nbsp;</o:p></span></p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:93'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Eregister_class</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:94'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Eunregister_class</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:95'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Eclose_msg</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:96'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Ecreate_msg</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:97'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Ecreate_stack</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:98'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Eget_current_stack</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:99'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Eclose_stack</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:100'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Eget_class_name</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:101'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Eset_current_stack</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:102'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Epush2</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:103'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Epop</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:104'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Eprint2</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void Exception::printErrorStack(FILE* stream, hid_t err_stack)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:105'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Ewalk2</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void Exception::walkErrorStack( H5E_direction_t direction,
+  H5E_walk2_t func, void* client_data )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:106'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Eget_auto2</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void Exception::getAutoPrint( H5E_auto2_t&amp; func, void**
+  client_data )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:107'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Eset_auto2</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void Exception::setAutoPrint( H5E_auto2_t&amp; func, void*
+  client_data )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:108'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Eclear2</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void Exception::clearErrorStack()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:109'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Eauto_is_v2</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>no</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:110'>
+  <td width=263 rowspan=2 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Eget_msg</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5std_string Exception::getMajorString( hid_t err_major )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:111'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5std_string Exception::getMinorString( hid_t err_minor )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:112'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Eget_num</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>no</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:113'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  background:#F2F2F2;mso-background-themecolor:background1;mso-background-themeshade:
+  242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><span style='background:lightgrey;mso-highlight:lightgrey'><o:p>&nbsp;</o:p></span></p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:#F2F2F2;mso-background-themecolor:
+  background1;mso-background-themeshade:242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:#F2F2F2;mso-background-themecolor:
+  background1;mso-background-themeshade:242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:#F2F2F2;mso-background-themecolor:
+  background1;mso-background-themeshade:242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:#F2F2F2;mso-background-themecolor:
+  background1;mso-background-themeshade:242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:114'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_fapl_core</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void FileAccPropList::setCore (size_t increment, hbool_t
+  backing_store)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:115'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_fapl_core</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void FileAccPropList::getCore (size_t&amp; increment, hbool_t&amp;
+  backing_store)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:116'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_fapl_direct</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:117'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_fapl_direct</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:118'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5FD_family_init</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:119'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_fapl_family</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void FileAccPropList::setFamily( hsize_t memb_size, const FileAccPropList&amp;
+  memb_plist)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:120'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_fapl_family</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void FileAccPropList::getFamily(hsize_t&amp; memb_size,
+  FileAccPropList&amp; memb_plist)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:121'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_fapl_log</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void FileAccPropList::setLog(const char *logfile, unsigned flags,
+  size_t buf_size)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:122'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5FD_multi_init</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:123'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_fapl_multi</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:124'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_fapl_multi</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:125'>
+  <td width=263 rowspan=4 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_fapl_split</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void FileAccPropList::setSplit(const FileAccPropList&amp; meta_plist,
+  const FileAccPropList&amp; raw_plist, const char* meta_ext, const char*
+  raw_ext )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:126'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void FileAccPropList::setSplit(FileAccPropList&amp; meta_plist,
+  FileAccPropList&amp; raw_plist, const char* meta_ext, const char* raw_ext )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:127'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void FileAccPropList::setSplit(const FileAccPropList&amp; meta_plist,
+  const FileAccPropList&amp; raw_plist, const H5std_string&amp; meta_ext, const
+  H5std_string&amp; raw_ext )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:128'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void FileAccPropList::setSplit(FileAccPropList&amp; meta_plist,
+  FileAccPropList&amp; raw_plist, const H5std_string&amp; meta_ext, const
+  H5std_string&amp; raw_ext )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:129'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5FD_log_init</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:130'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5FD_core_init</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:131'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5FD_direct_init</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:132'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:133'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5FDregister</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:134'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5FDunregister</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:135'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5FDopen</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:136'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5FDclose</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:137'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5FDcmp</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:138'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5FDquery</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:139'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5FDalloc</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:140'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5FDfree</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:141'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5FDget_eoa</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:142'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5FDset_eoa</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:143'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5FDget_eof</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:144'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5FDget_vfd_handle</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:145'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5FDread</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:146'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5FDwrite</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:147'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5FDflush</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:148'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5FDtruncate</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:149'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5FD_sec2_init</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:150'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_fapl_sec2</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void FileAccPropList::setSec2()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:151'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5FD_stdio_init</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:152'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_fapl_stdio</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void FileAccPropList::setStdio()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:153'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_fapl_windows</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:154'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Fis_hdf5</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>bool H5File::isHdf5(const char* name)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:155'>
+  <td width=263 rowspan=2 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Fcreate</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5File::H5File( const char* name, unsigned int flags, const
+  FileCreatPropList&amp; create_plist, const FileAccPropList&amp; access_plist
+  )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:156'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5File::H5File( const H5std_string&amp; name, unsigned int flags,
+  const FileCreatPropList&amp; create_plist, const FileAccPropList&amp;
+  access_plist )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:157'>
+  <td width=263 rowspan=3 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Fopen</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5File::H5File( const char* name, unsigned int flags, const
+  FileCreatPropList&amp; create_plist, const FileAccPropList&amp; access_plist
+  )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:158'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5File::H5File( const H5std_string&amp; name, unsigned int flags,
+  const FileCreatPropList&amp; create_plist, const FileAccPropList&amp;
+  access_plist )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:159'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void H5File::openFile(const char* name, unsigned int flags, const
+  FileAccPropList&amp; access_plist)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:160'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Freopen</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void H5File::reOpen()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:161'>
+  <td width=263 rowspan=2 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Fflush</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void H5Location::flush(H5F_scope_t scope)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:162'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void Attribute::flush(H5F_scope_t scope)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:163'>
+  <td width=263 rowspan=2 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Fclose</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void H5File::close()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:164'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5File destructor</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:165'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Fget_create_plist</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>FileCreatPropList H5File::getCreatePlist()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:166'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Fget_access_plist</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>FileAccPropList H5File::getAccessPlist()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:167'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Fget_intent</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:168'>
+  <td width=263 rowspan=2 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Fget_obj_count</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>ssize_t H5File::getObjCount(unsigned types)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:169'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>ssize_t H5File::getObjCount()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:170'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Fget_obj_ids</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void H5File::getObjIDs(unsigned types, size_t max_objs, hid_t
+  *oid_list)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:171'>
+  <td width=263 rowspan=2 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Fget_vfd_handle</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void H5File::getVFDHandle(const FileAccPropList&amp; fapl, void
+  **file_handle)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:172'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void H5File::getVFDHandle(void **file_handle)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:173'>
+  <td width=263 rowspan=4 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Fmount</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void CommonFG::mount(const char* name, const H5File&amp; child, const
+  PropList&amp; plist )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:174'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void CommonFG::mount(const char* name, H5File&amp; child,
+  PropList&amp; plist)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:175'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void CommonFG::mount(const H5std_string&amp; name, const H5File&amp;
+  child, const PropList&amp; plist)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:176'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void CommonFG::mount(const H5std_string&amp; name, H5File&amp; child,
+  PropList&amp; plist)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:177'>
+  <td width=263 rowspan=2 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Funmount</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void CommonFG::unmount( const char* name )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:178'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void CommonFG::unmount( const H5std_string&amp; name )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:179'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Fget_freespace</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>hssize_t H5File::getFreeSpace()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:180'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Fget_filesize</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>hsize_t H5File::getFileSize()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:180'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Fget_fileno</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>unsigned long H5File::getFileNum()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:181'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Fget_file_image</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:182'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Fget_mdc_config</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:183'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Fset_mdc_config</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:184'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Fget_mdc_hit_rate</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:185'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Fget_mdc_size</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:186'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Freset_mdc_hit_rate_stats</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:187'>
+  <td width=263 rowspan=2 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Fget_name</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5std_string H5Location::getFileName()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:188'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5std_string Attribute::getFileName()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>Will be retired</p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:189'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Fget_info2</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:190'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Fget_free_sections</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:191'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Fclear_elink_file_cache</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>no</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:192'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:193'>
+  <td width=263 rowspan=6 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Gcreate2</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>Group CommonFG::createGroup( const char* name, size_t size_hint )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:194'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>Group CommonFG::createGroup( const H5std_string&amp; name, size_t
+  size_hint )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:195'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>Group H5Location::createGroup( const char* name, size_t size_hint )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:196'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>Group H5Location::createGroup( const H5std_string&amp; name, size_t
+  size_hint )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:197'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>Group createGroup(const char* name, const LinkCreatPropList&amp;
+  lcpl)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:198'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>Group createGroup(const H5std_string&amp; name, const
+  LinkCreatPropList&amp; lcpl)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:199'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Gcreate_anon</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:200'>
+  <td width=263 rowspan=4 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Gopen2</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>Group CommonFG::openGroup( const char* name )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:201'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>Group CommonFG::openGroup( const H5std_string&amp; name )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:202'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>Group H5Location::openGroup( const char* name )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:203'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>Group H5Location::openGroup( const H5std_string&amp; name )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:204'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Gget_create_plist</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:205'>
+  <td width=263 rowspan=3 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Gget_info</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>hsize_t CommonFG::getNumObjs()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:206'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>hsize_t H5Location::getNumObjs()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>Moved to Group in 1.10.2</p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:207'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>hsize_t Group::getNumObjs()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:208'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Gget_info_by_name</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:209'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Gget_info_by_idx</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:210'>
+  <td width=263 rowspan=2 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Gclose</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void Group::close()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:211'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>Group destructor</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:212'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Glink</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>Deprecated</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:213'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Glink2</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>Deprecated</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:214'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Gmove</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:215'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Gmove2</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:216'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Gunlink</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:217'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Lcreate_hard</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:218'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Lcreate_soft</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:219'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Gget_linkval</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:220'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Gset_comment</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:221'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Gget_comment</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:222'>
+  <td width=263 rowspan=2 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Giterate</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>int CommonFG::iterateElems( const char* name, int *idx, H5G_iterate_t
+  op , void* op_data )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:223'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>int CommonFG::iterateElems( const H5std_string&amp; name, int *idx,
+  H5G_iterate_t op , void* op_data )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:224'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Gget_num_objs</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>no</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:225'>
+  <td width=263 rowspan=4 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><span style='background:lightgrey;mso-highlight:lightgrey'>H5Gget_objinfo<o:p></o:p></span></p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void CommonFG::getObjinfo( const char* name, hbool_t follow_link,
+  H5G_stat_t&amp; statbuf )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:226'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void CommonFG::getObjinfo( const H5std_string&amp; name, hbool_t
+  follow_link, H5G_stat_t&amp; statbuf )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:227'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void CommonFG::getObjinfo( const char* name, H5G_stat_t&amp; statbuf
+  )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:228'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void CommonFG::getObjinfo( const H5std_string&amp; name,
+  H5G_stat_t&amp; statbuf )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:229'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Gget_objname_by_idx</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:230'>
+  <td width=263 rowspan=3 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><span style='background:lightgrey;mso-highlight:lightgrey'>H5Gget_objtype_by_idx</span></p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5G_obj_t CommonFG::getObjTypeByIdx(hsize_t idx)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:231'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5G_obj_t CommonFG::getObjTypeByIdx(hsize_t idx, char* type_name)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:232'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5G_obj_t CommonFG::getObjTypeByIdx(hsize_t idx, H5std_string&amp;
+  type_name)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:233'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:234'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Iregister</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:235'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Iobject_verify</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:236'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Iremove_verify</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:237'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Iget_type</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5I_type_t IdComponent::getHDFObjType(const hid_t obj_id)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:238'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Iget_file_id</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:239'>
+  <td width=263 rowspan=3 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Iget_name</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>ssize_t H5Object::getObjName(char *obj_name, size_t buf_size)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:240'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5std_string H5Object::getObjName()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:241'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>ssize_t H5Object::getObjName(H5std_string&amp; obj_name, size_t len)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:242'>
+  <td width=263 rowspan=2 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Iinc_ref</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void IdComponent::incRefCount(const hid_t obj_id)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:243'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void IdComponent::incRefCount()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:244'>
+  <td width=263 rowspan=2 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Idec_ref</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void IdComponent::decRefCount(const hid_t obj_id)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:245'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void IdComponent::decRefCount()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:246'>
+  <td width=263 rowspan=2 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Iget_ref</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>int IdComponent::getCounter(const hid_t obj_id)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:247'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>int IdComponent::getCounter()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:248'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Iregister_type</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:249'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Iclear_type</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:250'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Idestroy_type</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:251'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Iinc_type_ref</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:252'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Idec_type_ref</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:253'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Iget_type_ref</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:254'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Isearch</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:255'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Inmembers</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:256'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Itype_exists</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:257'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Iis_valid</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:258'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  background:#F2F2F2;mso-background-themecolor:background1;mso-background-themeshade:
+  242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:#F2F2F2;mso-background-themecolor:
+  background1;mso-background-themeshade:242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:#F2F2F2;mso-background-themecolor:
+  background1;mso-background-themeshade:242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:#F2F2F2;mso-background-themecolor:
+  background1;mso-background-themeshade:242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:#F2F2F2;mso-background-themecolor:
+  background1;mso-background-themeshade:242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:259'>
+  <td width=263 rowspan=6 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Lmove</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void H5Location::moveLink(const char* src_name,</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><span style='mso-spacerun:yes'>            </span>const Group&amp;
+  dst, const char* dst_name,</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><span style='mso-spacerun:yes'>            </span>const
+  LinkCreatPropList&amp; lcpl = LinkCreatPropList::DEFAULT,</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><span style='mso-spacerun:yes'>            </span>const
+  LinkAccPropList&amp; lapl = LinkAccPropList::DEFAULT)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:260'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void H5Location::moveLink(const H5std_string&amp; src_name,</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><span style='mso-spacerun:yes'>            </span>const Group&amp;
+  dst, const H5std_string&amp; dst_name,</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><span style='mso-spacerun:yes'>            </span>const
+  LinkCreatPropList&amp; lcpl = LinkCreatPropList::DEFAULT,</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><span style='mso-spacerun:yes'>            </span>const
+  LinkAccPropList&amp; lapl = LinkAccPropList::DEFAULT)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:261'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void H5Location::moveLink(const char* src_name, const char* dst_name,</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><span style='mso-spacerun:yes'>            </span>const
+  LinkCreatPropList&amp; lcpl = LinkCreatPropList::DEFAULT,</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><span style='mso-spacerun:yes'>            </span>const
+  LinkAccPropList&amp; lapl = LinkAccPropList::DEFAULT)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:262'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void H5Location::moveLink(const H5std_string&amp; src_name,</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><span style='mso-spacerun:yes'>            </span>const
+  H5std_string&amp; dst_name,</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><span style='mso-spacerun:yes'>            </span>const
+  LinkCreatPropList&amp; lcpl = LinkCreatPropList::DEFAULT,</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><span style='mso-spacerun:yes'>            </span>const
+  LinkAccPropList&amp; lapl = LinkAccPropList::DEFAULT)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:263'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void CommonFG::move( const char* src, const char* dst )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>Deprecated due to inadequate functionality</p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:264'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void CommonFG::move( const H5std_string&amp; src, const
+  H5std_string&amp; dst )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>Same as above</p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:265'>
+  <td width=263 rowspan=4 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Lcopy</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void H5Location::copyLink(const char *src_name, const Group&amp; dst,
+  const char *dst_name, const LinkCreatPropList&amp; lcpl =
+  LinkCreatPropList::DEFAULT, </p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>const LinkAccPropList&amp; lapl = LinkAccPropList::DEFAULT) </p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:266'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void H5Location::copyLink(const H5std_string&amp; src_name, const
+  Group&amp; dst, const H5std_string&amp; dst_name,</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>const LinkCreatPropList&amp; lcpl = LinkCreatPropList::DEFAULT, </p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>const LinkAccPropList&amp; lapl = LinkAccPropList::DEFAULT) </p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:267'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void H5Location::copyLink(const char *src_name, const char *dst_name,</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>const LinkCreatPropList&amp; lcpl = LinkCreatPropList::DEFAULT,</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>const<span style='mso-spacerun:yes'>  </span>LinkAccPropList&amp;
+  lapl = LinkAccPropList::DEFAULT) </p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:268'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void H5Location::copyLink(const H5std_string&amp; src_name,</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>const H5std_string&amp; dst_name,</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>const LinkCreatPropList&amp; lcpl = LinkCreatPropList::DEFAULT,</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>const LinkAccPropList&amp; lapl = LinkAccPropList::DEFAULT) </p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:269'>
+  <td width=263 rowspan=4 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Lcreate_hard</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void H5Location::link(const char *curr_name,</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><span style='mso-spacerun:yes'>             </span>const Group&amp;
+  new_loc, const char *new_name,</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><span style='mso-spacerun:yes'>             </span>const
+  LinkCreatPropList&amp; lcpl = LinkCreatPropList::DEFAULT,</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><span style='mso-spacerun:yes'>             </span>const
+  LinkAccPropList&amp; lapl = LinkAccPropList::DEFAULT)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:270'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void H5Location::link(const H5std_string&amp; curr_name,</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><span style='mso-spacerun:yes'>             </span>const Group&amp;
+  new_loc, const H5std_string&amp; new_name,</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><span style='mso-spacerun:yes'>             </span>const
+  LinkCreatPropList&amp; lcpl = LinkCreatPropList::DEFAULT,</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><span style='mso-spacerun:yes'>             </span>const
+  LinkAccPropList&amp; lapl = LinkAccPropList::DEFAULT)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:271'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void H5Location::link(const char *curr_name,</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><span style='mso-spacerun:yes'>             </span>const hid_t
+  same_loc, const char *new_name,</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><span style='mso-spacerun:yes'>             </span>const
+  LinkCreatPropList&amp; lcpl = LinkCreatPropList::DEFAULT,</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><span style='mso-spacerun:yes'>             </span>const
+  LinkAccPropList&amp; lapl = LinkAccPropList::DEFAULT)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:272'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void H5Location::link(const H5std_string&amp; curr_name,</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><span style='mso-spacerun:yes'>             </span>const hid_t
+  same_loc, const H5std_string&amp; new_name,</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><span style='mso-spacerun:yes'>             </span>const
+  LinkCreatPropList&amp; lcpl = LinkCreatPropList::DEFAULT,</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><span style='mso-spacerun:yes'>             </span>const
+  LinkAccPropList&amp; lapl = LinkAccPropList::DEFAULT)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:273'>
+  <td width=263 rowspan=2 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Lcreate_soft</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void H5Location::link(const char *target_name, const char *link_name,</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><span style='mso-spacerun:yes'>             </span>const
+  LinkCreatPropList&amp; lcpl = LinkCreatPropList::DEFAULT,</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><span style='mso-spacerun:yes'>             </span>const
+  LinkAccPropList&amp; lapl = LinkAccPropList::DEFAULT)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:274'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void H5Location::link(const H5std_string&amp; target_name,</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><span style='mso-spacerun:yes'>             </span>const
+  H5std_string&amp; link_name,</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><span style='mso-spacerun:yes'>             </span>const
+  LinkCreatPropList&amp; lcpl = LinkCreatPropList::DEFAULT,</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><span style='mso-spacerun:yes'>             </span>const
+  LinkAccPropList&amp; lapl = LinkAccPropList::DEFAULT)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:275'>
+  <td width=263 rowspan=2 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Lcreate_hard</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Lcreate_soft</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void CommonFG::link( H5L_type_t link_type, const char* curr_name,
+  const char* new_name )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>Deprecated due to inadequate functionality</p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:276'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void CommonFG::link( H5L_type_t link_type, const H5std_string&amp;
+  curr_name, const H5std_string&amp; new_name )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>Deprecated due to inadequate functionality</p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:277'>
+  <td width=263 rowspan=4 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Ldelete</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void CommonFG::unlink( const char* name,</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><span style='mso-spacerun:yes'>             </span>const
+  LinkAccPropList&amp; lapl = LinkAccPropList::DEFAULT)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:#F2F2F2;mso-background-themecolor:
+  background1;mso-background-themeshade:242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>Added second argument in 1.8.21</p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:278'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void CommonFG::unlink( const H5std_string&amp; name,</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><span style='mso-spacerun:yes'>             </span>const
+  LinkAccPropList&amp; lapl = LinkAccPropList::DEFAULT)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:#F2F2F2;mso-background-themecolor:
+  background1;mso-background-themeshade:242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>Added second argument in 1.8.21</p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:279'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void H5Location::unlink( const char* name,</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><span style='mso-spacerun:yes'>             </span>const
+  LinkAccPropList&amp; lapl = LinkAccPropList::DEFAULT)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:#F2F2F2;mso-background-themecolor:
+  background1;mso-background-themeshade:242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>Moved from CommonFG &amp; added 2<sup>nd</sup> arg in 1.10.2</p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:280'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void H5Location::unlink( const H5std_string&amp; name,</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><span style='mso-spacerun:yes'>             </span>const LinkAccPropList&amp;
+  lapl = LinkAccPropList::DEFAULT)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:#F2F2F2;mso-background-themecolor:
+  background1;mso-background-themeshade:242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>Moved from CommonFG &amp; added 2<sup>nd</sup> arg in 1.10.2</p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:281'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Ldelete_by_idx</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:282'>
+  <td width=263 rowspan=4 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Lget_val</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5std_string CommonFG::getLinkval( const char* name, size_t size )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:283'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5std_string CommonFG::getLinkval( const H5std_string&amp; name,
+  size_t size )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:284'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5std_string H5Location::getLinkval( const char* name, size_t size )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:285'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5std_string H5Location::getLinkval( const H5std_string&amp; name,
+  size_t size )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:286'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Lget_val_by_idx</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:287'>
+  <td width=263 rowspan=2 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Lexists</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>bool H5Location::nameExists(const char* name, const
+  LinkAccPropList&amp; lapl)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:288'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>bool H5Location::nameExists(const H5std_string&amp; name, const
+  LinkAccPropList&amp; lapl)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:289'>
+  <td width=263 rowspan=2 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Lget_info</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5L_info2_t getLinkInfo(const char* link_name,</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><span style='mso-tab-count:1'>               </span>const
+  LinkAccPropList&amp; lapl = LinkAccPropList::DEFAULT)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:290'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5L_info2_t getLinkInfo(const H5std_string&amp; link_name,</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><span style='mso-tab-count:1'>               </span>const
+  LinkAccPropList&amp; lapl = LinkAccPropList::DEFAULT)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:291'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Lget_info_by_idx</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:292'>
+  <td width=263 rowspan=6 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Lget_name_by_idx</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5std_string CommonFG::getObjnameByIdx(hsize_t idx)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:293'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>ssize_t CommonFG::getObjnameByIdx(hsize_t idx, char* name, size_t
+  size)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:294'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>ssize_t CommonFG::getObjnameByIdx(hsize_t idx, H5std_string&amp;
+  name, size_t size)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:295'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5std_string H5Location::getObjnameByIdx(hsize_t idx)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:296'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>ssize_t H5Location::getObjnameByIdx(hsize_t idx, char* name, size_t
+  size)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:297'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>ssize_t H5Location::getObjnameByIdx(hsize_t idx, H5std_string&amp;
+  name, size_t size)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:298'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Literate</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:299'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Literate_by_name</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:300'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Lvisit</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:301'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Lvisit_by_name</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:302'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:303'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Lcreate_ud</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:304'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Lregister</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:305'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Lunregister</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:306'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Lis_registered</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:307'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Lunpack_elink_val</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:308'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Lcreate_external</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:309'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  background:#F2F2F2;mso-background-themecolor:background1;mso-background-themeshade:
+  242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:#F2F2F2;mso-background-themecolor:
+  background1;mso-background-themeshade:242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:#F2F2F2;mso-background-themecolor:
+  background1;mso-background-themeshade:242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:#F2F2F2;mso-background-themecolor:
+  background1;mso-background-themeshade:242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:#F2F2F2;mso-background-themecolor:
+  background1;mso-background-themeshade:242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:310'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Oopen</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:311'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Oopen_by_addr</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:312'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Oopen_by_idx</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:313'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Oexists_by_name</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:314'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Oget_info</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:315'>
+  <td width=263 rowspan=4 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Oget_info_by_name</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5O_type_t CommonFG::childObjType(const char* objname)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:316'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5O_type_t CommonFG::childObjType(const H5std_string&amp; objname)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:317'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5O_type_t H5Location::childObjType(const char* objname)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:318'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5O_type_t H5Location::childObjType(const H5std_string&amp; objname)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:319'>
+  <td width=263 rowspan=2 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Oget_info_by_idx</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5O_type_t CommonFG::childObjType(hsize_t index, H5_index_t
+  index_type, H5_iter_order_t order, const char* objname)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:320'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5O_type_t H5Location::childObjType(hsize_t index, H5_index_t
+  index_type, H5_iter_order_t order, const char* objname)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:white;mso-background-themecolor:
+  background1;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:321'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Olink</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:322'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Oincr_refcount</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:323'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Odecr_refcount</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:324'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Ocopy</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:325'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Oset_comment</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:326'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Oset_comment_by_name</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:327'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Oget_comment</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:328'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Oget_comment_by_name</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:329'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Ovisit</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:330'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Ovisit_by_name</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:331'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Oclose</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:332'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  background:#F2F2F2;mso-background-themecolor:background1;mso-background-themeshade:
+  242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:#F2F2F2;mso-background-themecolor:
+  background1;mso-background-themeshade:242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:#F2F2F2;mso-background-themecolor:
+  background1;mso-background-themeshade:242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:#F2F2F2;mso-background-themecolor:
+  background1;mso-background-themeshade:242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:#F2F2F2;mso-background-themecolor:
+  background1;mso-background-themeshade:242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:333'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5PLset_loading_state</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:334'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5PLget_loading_state</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:335'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  background:#F2F2F2;mso-background-themecolor:background1;mso-background-themeshade:
+  242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:#F2F2F2;mso-background-themecolor:
+  background1;mso-background-themeshade:242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:#F2F2F2;mso-background-themecolor:
+  background1;mso-background-themeshade:242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:#F2F2F2;mso-background-themecolor:
+  background1;mso-background-themeshade:242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:#F2F2F2;mso-background-themecolor:
+  background1;mso-background-themeshade:242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:336'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pcreate_class</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:337'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_class_name</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5std_string PropList::getClassName()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:338'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pcreate</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>PropList::PropList(const hid_t plist_id)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:339'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pregister2</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:340'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pinsert2</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:341'>
+  <td width=263 rowspan=5 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void PropList::setProperty(const char* name, void* value)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:342'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void PropList::setProperty(const char* name, const char* charptr)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:343'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void PropList::setProperty(const char* name, H5std_string&amp; strg)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:344'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void PropList::setProperty(const H5std_string&amp; name, void* value)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:345'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void PropList::setProperty(const H5std_string&amp; name,
+  H5std_string&amp; strg)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:346'>
+  <td width=263 rowspan=2 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pexist</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>bool PropList::propExist(const char* name )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:347'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>bool PropList::propExist(const H5std_string&amp; name )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:348'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pencode</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DataType::encode()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:349'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pdecode</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>virtual DataType* DataType::decode()</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>virtual DataType* ArrayType::decode()</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>virtual DataType* CompType::decode()</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>virtual DataType* DataType::decode()</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>virtual DataType* EnumType::decode()</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>virtual DataType* FloatType::decode()</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>virtual DataType* IntType::decode()</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>virtual DataType* StrType::decode()</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>virtual DataType* VarLenType::decode()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:350;height:10.0pt'>
+  <td width=263 rowspan=2 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt;height:10.0pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_size</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt;height:10.0pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>size_t PropList::getPropSize(const char *name)</p>
+  </td>
+  <td width=35 rowspan=2 valign=top style='width:26.05pt;border-top:none;
+  border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt;height:10.0pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 rowspan=2 valign=top style='width:31.45pt;border-top:none;
+  border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt;height:10.0pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 rowspan=2 valign=top style='width:126.65pt;border-top:none;
+  border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt;height:10.0pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:351;height:10.0pt'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt;height:10.0pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>size_t PropList::getPropSize(const H5std_string&amp; name)</p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:352'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_nprops</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>size_t PropList::getNumProps()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:353'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_class</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>hid_t PropList::getClass()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:354'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_class_parent</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>PropList PropList::getClassParent()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:355;height:10.0pt'>
+  <td width=263 rowspan=4 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt;height:10.0pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt;height:10.0pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void PropList::getProperty(const char* name, void* value)</p>
+  </td>
+  <td width=35 rowspan=4 valign=top style='width:26.05pt;border-top:none;
+  border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt;height:10.0pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 rowspan=4 valign=top style='width:31.45pt;border-top:none;
+  border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt;height:10.0pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 rowspan=4 valign=top style='width:126.65pt;border-top:none;
+  border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt;height:10.0pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:356;height:10.0pt'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt;height:10.0pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5std_string PropList::getProperty(const char* name)</p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:357;height:10.0pt'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt;height:10.0pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void PropList::getProperty(const H5std_string&amp; name, void* value)</p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:358;height:10.0pt'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt;height:10.0pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5std_string PropList::getProperty(const H5std_string&amp; name)</p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:359'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pequal</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>bool PropList::operator==(const PropList&amp; rhs)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:360'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pisa_class</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>bool PropList::isAClass(const PropList&amp; prop_class)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:361'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Piterate</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:362;height:10.0pt'>
+  <td width=263 rowspan=4 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt;height:10.0pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pcopy_prop</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt;height:10.0pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void PropList::copyProp(PropList&amp; dest, const char *name)</p>
+  </td>
+  <td width=35 rowspan=4 valign=top style='width:26.05pt;border-top:none;
+  border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt;height:10.0pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 rowspan=4 valign=top style='width:31.45pt;border-top:none;
+  border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt;height:10.0pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 rowspan=4 valign=top style='width:126.65pt;border-top:none;
+  border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt;height:10.0pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:363;height:10.0pt'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt;height:10.0pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void PropList::copyProp( PropList&amp; dest, const H5std_string&amp;
+  name )</p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:364;height:10.0pt'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt;height:10.0pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void PropList::copyProp( PropList&amp; dest, PropList&amp; src, const
+  char *name )</p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:365;height:10.0pt'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt;height:10.0pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void PropList::copyProp( PropList&amp; dest, PropList&amp; src, const
+  H5std_string&amp; name )</p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:366;height:10.0pt'>
+  <td width=263 rowspan=2 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt;height:10.0pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Premove</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt;height:10.0pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void PropList::removeProp(const char *name)</p>
+  </td>
+  <td width=35 rowspan=2 valign=top style='width:26.05pt;border-top:none;
+  border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt;height:10.0pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 rowspan=2 valign=top style='width:31.45pt;border-top:none;
+  border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt;height:10.0pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 rowspan=2 valign=top style='width:126.65pt;border-top:none;
+  border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt;height:10.0pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:367;height:10.0pt'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt;height:10.0pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void PropList::removeProp(const H5std_string&amp; name)</p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:368'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Punregister</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:369'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pclose_class</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void PropList::closeClass()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:370'>
+  <td width=263 rowspan=2 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pclose</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void PropList::close()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:371'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>PropList destructor</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:372'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pcopy</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void PropList::copy( const PropList&amp; like_plist )</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:373'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_attr_phase_change</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void ObjCreatPropList::setAttrPhaseChange(unsigned max_compact = 8,
+  unsigned min_dense = 6)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:374'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_attr_phase_change</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void ObjCreatPropList::getAttrPhaseChange(unsigned&amp; max_compact,
+  unsigned&amp; min_dense)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:375'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_attr_creation_order</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void ObjCreatPropList::setAttrCrtOrder(unsigned crt_order_flags)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:376'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_attr_creation_order</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>unsigned ObjCreatPropList::getAttrCrtOrder()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:377'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_obj_track_times</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:378'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_obj_track_times</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:379'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pmodify_filter</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void modifyFilter(H5Z_filter_t filter_id, unsigned int flags, size_t
+  cd_nelmts, const unsigned int cd_values[])</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:380'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_filter</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DSetCreatPropList::setFilter(H5Z_filter_t filter_id, unsigned
+  int flags,</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><span style='mso-spacerun:yes'>        </span>size_t cd_nelmts, const
+  unsigned int cd_values[])</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:381'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_nfilters</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>int DSetCreatPropList::getNfilters()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:382'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_filter2</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Z_filter_t DSetCreatPropList::getFilter(int filter_number,</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><span style='mso-spacerun:yes'>        </span>unsigned int
+  &amp;flags, size_t &amp;cd_nelmts, unsigned int* cd_values,</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><span style='mso-spacerun:yes'>        </span>size_t namelen, char
+  name[], unsigned int&amp; filter_config)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:383'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_filter_by_id2</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DSetCreatPropList::getFilterById(H5Z_filter_t filter_id,</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><span style='mso-spacerun:yes'>        </span>unsigned int
+  &amp;flags, size_t &amp;cd_nelmts, unsigned int* cd_values,</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><span style='mso-spacerun:yes'>        </span>size_t namelen, char
+  name[], unsigned int &amp;filter_config)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:384'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pall_filters_avail</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>bool DSetCreatPropList::allFiltersAvail()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:385'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Premove_filter</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DSetCreatPropList::removeFilter(H5Z_filter_t filter_id)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:386'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_deflate</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DSetCreatPropList::setDeflate(int level)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:387'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_fletcher32</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DSetCreatPropList::setFletcher32()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:388'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_userblock</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void FileCreatPropList::setUserblock(hsize_t size)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:389'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_userblock</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>hsize_t FileCreatPropList::getUserblock()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:390'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_sizes</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void FileCreatPropList::setSizes(size_t sizeof_addr, size_t
+  sizeof_size)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:391'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_sizes</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void FileCreatPropList::getSizes(size_t&amp; sizeof_addr, size_t&amp;
+  sizeof_size)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:392'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_sym_k</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void FileCreatPropList::setSymk(unsigned ik, unsigned lk)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:393'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_sym_k</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void FileCreatPropList::getSymk(unsigned&amp; ik, unsigned&amp; lk)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:394'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_istore_k</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void FileCreatPropList::setIstorek(unsigned ik)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:395'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_istore_k</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>unsigned FileCreatPropList::getIstorek()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:396'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_shared_mesg_nindexes</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:397'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_shared_mesg_nindexes</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:398'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_shared_mesg_index</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:399'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_shared_mesg_index</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:400'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_shared_mesg_phase_change</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:401'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_shared_mesg_phase_change</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:402'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_file_space</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void FileCreatPropList::setFileSpaceStrategy(H5F_fspace_strategy_t
+  strategy, hbool_t persist, hsize_t threshold)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:403'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_file_space</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void
+  FileCreatPropList::getFileSpaceStrategy(H5F_fspace_strategy_t&amp; strategy,
+  hbool_t&amp; persist, hsize_t&amp; threshold)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:404'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_alignment</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void FileAccPropList::setAlignment(hsize_t threshold, hsize_t
+  alignment)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:405'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_alignment</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void FileAccPropList::getAlignment(hsize_t &amp;threshold, hsize_t
+  &amp;alignment)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:406'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_driver</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void FileAccPropList::setDriver(hid_t new_driver_id, const void
+  *new_driver_info)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:407'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_driver</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>hid_t FileAccPropList::getDriver()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:408'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_driver_info</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:409'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_family_offset</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void FileAccPropList::setFamilyOffset(hsize_t offset)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:410'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_family_offset</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>hsize_t FileAccPropList::getFamilyOffset()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:411'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_multi_type</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void FileAccPropList::setMultiType(H5FD_mem_t dtype)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:412'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_multi_type</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5FD_mem_t FileAccPropList::getMultiType()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:413'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_cache</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void FileAccPropList::setCache(int mdc_nelmts, size_t rdcc_nelmts,
+  size_t rdcc_nbytes, double rdcc_w0)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:414'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_cache</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void FileAccPropList::getCache(int&amp; mdc_nelmts, size_t&amp;
+  rdcc_nelmts, size_t&amp; rdcc_nbytes, double&amp; rdcc_w0)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:415'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_mdc_config</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:416'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_mdc_config</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:417'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_gc_references</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void FileAccPropList::setGcReferences(unsigned gc_ref)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:418'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_gc_references</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>unsigned FileAccPropList::getGcReferences()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:419'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_fclose_degree</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void FileAccPropList::setFcloseDegree(H5F_close_degree_t degree)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:420'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_fclose_degree</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5F_close_degree_t FileAccPropList::getFcloseDegree()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:421'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_meta_block_size</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void FileAccPropList::setMetaBlockSize(hsize_t &amp;block_size)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:422'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_meta_block_size</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>hsize_t FileAccPropList::getMetaBlockSize()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:423'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_sieve_buf_size</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void FileAccPropList::setSieveBufSize(size_t bufsize)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:424'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_sieve_buf_size</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>size_t FileAccPropList::getSieveBufSize()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:425'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_small_data_block_size</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DSetMemXferPropList::setSmallDataBlockSize(hsize_t size)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:426'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_small_data_block_size</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>hsize_t DSetMemXferPropList::getSmallDataBlockSize()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:427'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_libver_bounds</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void FileAccPropList::setLibverBounds(H5F_libver_t libver_low,
+  H5F_libver_t libver_high)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:428'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_libver_bounds</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void FileAccPropList::getLibverBounds(H5F_libver_t&amp; libver_low,
+  H5F_libver_t&amp; libver_high)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:429'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_elink_file_cache_size</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:430'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_elink_file_cache_size</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:431'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_elink_file_cache_size</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:432'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_file_image</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:433'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_file_image</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:434'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_file_image_callbacks</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:435'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_file_image_callbacks</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:436'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:437'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_core_write_tracking</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:438'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_core_write_tracking</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:439'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:440'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_layout</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DSetCreatPropList::setLayout(H5D_layout_t layout)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:441'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_layout</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5D_layout_t DSetCreatPropList::getLayout()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:442'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_chunk</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DSetCreatPropList::setChunk(int ndims, const hsize_t* dim)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:443'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_chunk</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>int DSetCreatPropList::getChunk(int max_ndims, hsize_t* dim)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:444'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_external</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DSetCreatPropList::setExternal(const char* name, off_t offset,
+  hsize_t size)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:445'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_external_count</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>int DSetCreatPropList::getExternalCount</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:446'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_external</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DSetCreatPropList::getExternal(unsigned idx, size_t name_size,
+  char* name, off_t&amp; offset, hsize_t&amp; size)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:447'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_szip</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DSetCreatPropList::setSzip(unsigned int options_mask, unsigned
+  int pixels_per_block)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:448'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_shuffle</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DSetCreatPropList::setShuffle()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:449'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_nbit</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DSetCreatPropList::setNbit()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:450'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_scaleoffset</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:451'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_fill_value</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DSetCreatPropList::setFillValue(const DataType&amp; fvalue_type,
+  const void* value)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:452'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_fill_value</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DSetCreatPropList::getFillValue(const DataType&amp; fvalue_type,
+  void* value)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:453'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pfill_value_defined</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5D_fill_value_t DSetCreatPropList::isFillValueDefined()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:454'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_alloc_time</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DSetCreatPropList::setAllocTime(H5D_alloc_time_t alloc_time)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:455'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_alloc_time</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5D_alloc_time_t DSetCreatPropList::getAllocTime()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:456'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_fill_time</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DSetCreatPropList::setFillTime(H5D_fill_time_t fill_time)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:457'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_fill_time</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5D_fill_time_t DSetCreatPropList::getFillTime()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:458'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_chunk_cache</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:459'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_chunk_cache</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:460'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_data_transform</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DSetMemXferPropList::setDataTransform(const char* expression)</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DSetMemXferPropList::setDataTransform(const H5std_string&amp;
+  expression)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:461'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_data_transform</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>ssize_t DSetMemXferPropList::getDataTransform(char* exp, size_t
+  buf_size)</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5std_string DSetMemXferPropList::getDataTransform()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:462'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_buffer</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DSetMemXferPropList::setBuffer(size_t size, void* tconv, void*
+  bkg)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:463'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_buffer</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>size_t DSetMemXferPropList::getBuffer(void** tconv, void** bkg)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:464'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_preserve</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DSetMemXferPropList::setPreserve(bool status)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:465'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_preserve</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>bool DSetMemXferPropList::getPreserve()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:466'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_edc_check</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DSetMemXferPropList::setEDCCheck(H5Z_EDC_t check)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:467'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Z_EDC_t H5Pget_edc_check</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Z_EDC_t DSetMemXferPropList::getEDCCheck()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:468'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_filter_callback</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:469'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_btree_ratios</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DSetMemXferPropList::setBtreeRatios(double left, double middle,
+  double right)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:470'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_btree_ratios</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DSetMemXferPropList::getBtreeRatios(double&amp; left,
+  double&amp; middle, double&amp; right)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:471'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_vlen_mem_manager</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DSetMemXferPropList::setVlenMemManager() </p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DSetMemXferPropList::setVlenMemManager(H5MM_allocate_t alloc_func,
+  void* alloc_info, H5MM_free_t free_func, void* free_info)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:472'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_vlen_mem_manager</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DSetMemXferPropList::getVlenMemManager(H5MM_allocate_t&amp;
+  alloc_func, void** alloc_info, H5MM_free_t&amp; free_func, void** free_info)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:473'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_hyper_vector_size</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DSetMemXferPropList::setHyperVectorSize(size_t vector_size)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:474'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_hyper_vector_size</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>size_t DSetMemXferPropList::getHyperVectorSize()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:475'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_type_conv_cb</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DSetMemXferPropList::setTypeConvCB(H5T_conv_except_func_t op,
+  void *user_data)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:476'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_type_conv_cb</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DSetMemXferPropList::getTypeConvCB(H5T_conv_except_func_t *op,
+  void **user_data)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:477'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_create_intermediate_group</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:478'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_create_intermediate_group</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:479'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_local_heap_size_hint</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:480'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_local_heap_size_hint</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:481'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_link_phase_change</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:482'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_link_phase_change</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:483'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_est_link_info</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:484'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_est_link_info</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:485'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_link_creation_order</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:486'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_link_creation_order</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:487'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_char_encoding</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>ASAP</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:488'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_char_encoding</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>ASAP</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:489'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_nlinks</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void LinkAccPropList::setNumLinks(size_t nlinks)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:490'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_nlinks</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>size_t LinkAccPropList::getNumLinks()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:491'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_elink_prefix</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:492'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_elink_prefix</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:493'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_elink_fapl</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:494'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_elink_fapl</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:495'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_elink_acc_flags</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:496'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_elink_acc_flags</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:497'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_elink_cb</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:498'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_elink_cb</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:499'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:500'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_copy_object</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:501'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_copy_object</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:502'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Padd_merge_committed_dtype_path</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:503'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pfree_merge_committed_dtype_paths</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:504'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pset_mcdt_search_cb</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:505'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Pget_mcdt_search_cb</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:506'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  background:#F2F2F2;mso-background-themecolor:background1;mso-background-themeshade:
+  242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:#F2F2F2;mso-background-themecolor:
+  background1;mso-background-themeshade:242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:#F2F2F2;mso-background-themecolor:
+  background1;mso-background-themeshade:242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:#F2F2F2;mso-background-themecolor:
+  background1;mso-background-themeshade:242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:#F2F2F2;mso-background-themecolor:
+  background1;mso-background-themeshade:242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:507'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5open</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void H5Library::open()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:508'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5close</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void H5Library::close()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:509'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5dont_atexit</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void H5Library::dontAtExit()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:510'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5garbage_collect</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal;tab-stops:46.65pt'>void H5Library::garbageCollect()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:511'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5set_free_list_limits</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void H5Library::setFreeListLimits(int reg_global_lim, int
+  reg_list_lim,</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><span style='mso-spacerun:yes'>        </span>int arr_global_lim, int
+  arr_list_lim, int blk_global_lim,</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><span style='mso-spacerun:yes'>        </span>int blk_list_lim)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:512'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5get_libversion</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void H5Library::getLibVersion(unsigned&amp; majnum, unsigned&amp;
+  minnum, unsigned&amp; relnum)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:513'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5check_version</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void H5Library::checkVersion(unsigned majnum, unsigned minnum,
+  unsigned relnum)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:514'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5free_memory</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No wrapper</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:515'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5allocate_memory</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No wrapper</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:516'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5resize_memory</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No wrapper</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:517'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  background:#F2F2F2;mso-background-themecolor:background1;mso-background-themeshade:
+  242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:#F2F2F2;mso-background-themecolor:
+  background1;mso-background-themeshade:242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:#F2F2F2;mso-background-themecolor:
+  background1;mso-background-themeshade:242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:#F2F2F2;mso-background-themecolor:
+  background1;mso-background-themeshade:242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:#F2F2F2;mso-background-themecolor:
+  background1;mso-background-themeshade:242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:518;height:17.45pt'>
+  <td width=263 rowspan=4 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt;height:17.45pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Rcreate</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt;height:17.45pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void H5Location::reference(void* ref, const char* name, const
+  DataSpace&amp; dataspace, H5R_type_t ref_type)</p>
+  </td>
+  <td width=35 rowspan=4 valign=top style='width:26.05pt;border-top:none;
+  border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt;height:17.45pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 rowspan=4 valign=top style='width:31.45pt;border-top:none;
+  border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt;height:17.45pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 rowspan=4 valign=top style='width:126.65pt;border-top:none;
+  border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt;height:17.45pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:519;height:17.45pt'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt;height:17.45pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void H5Location::reference(void* ref, const H5std_string&amp; name,
+  const DataSpace&amp; dataspace, H5R_type_t ref_type)</p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:520;height:17.45pt'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt;height:17.45pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void H5Location::reference(void* ref, const char* name, H5R_type_t
+  ref_type)</p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:521;height:17.45pt'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt;height:17.45pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void H5Location::reference(void* ref, const H5std_string&amp; name,
+  H5R_type_t ref_type)</p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:522'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Rdereference2</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>DataSet::DataSet(const H5Location&amp; loc, const void* ref,
+  H5R_type_t ref_type)</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:523'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Rget_region</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>DataSpace H5Location::getRegion(void *ref, H5R_type_t ref_type)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:524'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Rget_obj_type2</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5O_type_t H5Location::getRefObjType(void *ref, H5R_type_t ref_type)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:525'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Rget_name</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:526'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:527'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><span style='background:lightgrey;mso-highlight:lightgrey'>H5Rget_obj_type1<o:p></o:p></span></p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>Should be remove from code</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:528'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:529'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Screate</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>DataSpace::DataSpace(H5S_class_t type)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:530'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Screate_simple</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>DataSpace::DataSpace(int rank, const hsize_t * dims, const hsize_t *
+  maxdims)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'>x</p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:531'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Sset_extent_simple</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DataSpace::setExtentSimple(int rank, const hsize_t
+  *current_size, const hsize_t *maximum_size)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:532'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Scopy</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DataSpace::copy(const DataSpace&amp; like_space)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:533'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Sclose</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DataSpace::close()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:534'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Sencode</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:535'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Sdecode</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:536'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Sget_simple_extent_npoints</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>hssize_t DataSpace::getSimpleExtentNpoints</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:537'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Sget_simple_extent_ndims</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>int DataSpace::getSimpleExtentNdims ()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:538'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Sget_simple_extent_dims</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>int DataSpace::getSimpleExtentDims (hsize_t *dims, hsize_t *maxdims)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:539'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Sis_simple</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>bool DataSpace::isSimple ()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:540'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Sget_select_npoints</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>hssize_t DataSpace::getSelectNpoints ()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:541'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Sselect_hyperslab</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DataSpace::selectHyperslab(H5S_seloper_t op, const hsize_t
+  *count, const hsize_t *start, const hsize_t *stride, const hsize_t *block)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:542'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Sselect_elements</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DataSpace::selectElements (H5S_seloper_t op, const size_t
+  num_elements, const hsize_t *coord)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:543'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Sget_simple_extent_type</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5S_class_t DataSpace::getSimpleExtentType ()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:544'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Sset_extent_none</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DataSpace::setExtentNone ()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:545'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Sextent_copy</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DataSpace::extentCopy (const DataSpace&amp; dest_space)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:546'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Sextent_equal</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:547'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Sselect_all</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DataSpace::selectAll ()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:548'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Sselect_none</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DataSpace::selectNone ()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:549'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Soffset_simple</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DataSpace::offsetSimple (const hssize_t* offset)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:550'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Sselect_valid</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>bool DataSpace::selectValid ()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:551'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Sis_regular_hyperslab</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:552'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Sget_regular_hyperslab</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:553'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Sget_select_hyper_nblocks</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>hssize_t DataSpace::getSelectHyperNblocks ()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:554'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Sget_select_elem_npoints</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>hssize_t DataSpace::getSelectElemNpoints ()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:555'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Sget_select_hyper_blocklist</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DataSpace::getSelectHyperBlocklist(hsize_t startblock, hsize_t
+  numblocks, hsize_t *buf)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:556'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Sget_select_elem_pointlist</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DataSpace::getSelectElemPointlist (hsize_t startpoint, hsize_t
+  numpoints, hsize_t *buf)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:557'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Sget_select_bounds</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DataSpace::getSelectBounds (hsize_t* start, hsize_t* end)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:558'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Sget_select_type</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:559'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  background:#F2F2F2;mso-background-themecolor:background1;mso-background-themeshade:
+  242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:#F2F2F2;mso-background-themecolor:
+  background1;mso-background-themeshade:242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:#F2F2F2;mso-background-themecolor:
+  background1;mso-background-themeshade:242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:#F2F2F2;mso-background-themecolor:
+  background1;mso-background-themeshade:242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;background:#F2F2F2;mso-background-themecolor:
+  background1;mso-background-themeshade:242;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:560'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tcreate</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>DataType::DataType(const H5T_class_t type_class, size_t size)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:561'>
+  <td width=263 rowspan=3 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tcopy</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>DataType::DataType(const PredType&amp; pred_type)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:562'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DataType::copy(const DataType&amp; like_type)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:563'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DataType::copy(const DataSet&amp; dset)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:564'>
+  <td width=263 rowspan=2 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tclose</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DataType::close()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:565;height:10.0pt'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt;height:10.0pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>DataType destructor</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt;height:10.0pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt;height:10.0pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt;height:10.0pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:566'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tequal</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>bool DataType::operator==(const DataType&amp; compared_type)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:567'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tlock</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DataType::lock()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:568'>
+  <td width=263 rowspan=2 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tcommit2</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DataType::commit(const H5Location&amp; loc, const char* name)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:569'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DataType::commit(const H5Location&amp; loc, const
+  H5std_string&amp; name)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:570'>
+  <td width=263 rowspan=16 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Topen2</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>DataType CommonFG::openDataType(const char* name)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:571'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>DataType CommonFG::openDataType(const H5std_string&amp; name)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:572'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>ArrayType CommonFG::openArrayType(const char* name)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:573'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>ArrayType CommonFG::openArrayType(const H5std_string&amp; name)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:574'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>CompType CommonFG::openCompType(const char* name)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:575'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>CompType CommonFG::openCompType(const H5std_string&amp; name)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:576'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>EnumType CommonFG::openEnumType(const char* name)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:577'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>EnumType CommonFG::openEnumType(const H5std_string&amp; name)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:578'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>IntType CommonFG::openIntType(const char* name)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:579'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>IntType CommonFG::openIntType(const H5std_string&amp; name)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:580'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>FloatType CommonFG::openFloatType(const char* name)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:581'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>FloatType CommonFG::openFloatType(const H5std_string&amp; name)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:582'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>StrType CommonFG::openStrType(const char* name)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:583'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>StrType CommonFG::openStrType(const H5std_string&amp; name)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:584'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>VarLenType CommonFG::openVarLenType(const char* name)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:585'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>VarLenType CommonFG::openVarLenType(const H5std_string&amp; name)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:586'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tcommit_anon</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:587'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tget_create_plist</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>PropList DataType::getCreatePlist()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:588'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tcommitted</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>bool DataType::committed()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:589'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tencode</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DataType::encode()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:590'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tdecode</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>virtual DataType* DataType::decode() const;</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>virtual DataType* ArrayType::decode() const;</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>virtual DataType* CompType::decode() const;</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>virtual DataType* DataType::decode() const;</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>virtual DataType* EnumType::decode() const;</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>virtual DataType* FloatType::decode() const;</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>virtual DataType* IntType::decode() const;</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>virtual DataType* StrType::decode() const;</p>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>virtual DataType* VarLenType::decode() const;</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:591'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tinsert</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void CompType::insertMember(const H5std_string&amp; name, size_t
+  offset, const DataType&amp; new_member)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:592'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tpack</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void CompType::pack()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:593'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tenum_create</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>EnumType::EnumType(const IntType&amp; data_type)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:594'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tenum_insert</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void EnumType::insert(const char* name, void *value)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:595'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tenum_nameof</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5std_string EnumType::nameOf(void *value, size_t size)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:596'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tenum_valueof</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void EnumType::valueOf(const char* name, void *value)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:597'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tvlen_create</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>VarLenType::VarLenType(const DataType* base_type)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:598'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tarray_create2</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>ArrayType::ArrayType(const DataType&amp; base_type, int ndims, const
+  hsize_t* dims)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:599'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tget_array_ndims</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>int ArrayType::getArrayNDims()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:600'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tget_array_dims2</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>int ArrayType::getArrayDims(hsize_t* dims)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:601'>
+  <td width=263 rowspan=2 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tset_tag</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DataType::setTag(const char* tag)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:602'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DataType::setTag(const H5std_string&amp; tag)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:603'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tget_tag</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5std_string DataType::getTag()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:604'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tget_super</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>DataType DataType::getSuper()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:605'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tget_class</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5T_class_t DataType::getClass()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:606'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tdetect_class</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>bool DataType::detectClass(H5T_class_t cls)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:607'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tget_size</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>size_t DataType::getSize()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:608'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tget_order</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5T_order_t AtomType::getOrder()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:609'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tget_precision</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>size_t AtomType::getPrecision()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:610'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tget_offset</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>int AtomType::getOffset()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:611'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tget_pad</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void AtomType::getPad(H5T_pad_t&amp; lsb, H5T_pad_t&amp; msb)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:612'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tget_sign</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5T_sign_t IntType::getSign()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:613'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tget_fields</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void FloatType::getFields(size_t&amp; spos, size_t&amp; epos,
+  size_t&amp; esize, size_t&amp; mpos, size_t&amp; msize)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:614'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tget_ebias</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>size_t FloatType::getEbias()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:615'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tget_norm</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5T_norm_t FloatType::getNorm(H5std_string&amp; norm_string)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:616'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tget_inpad</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5T_pad_t FloatType::getInpad(H5std_string&amp; pad_string)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:617'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tget_strpad</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5T_str_t StrType::getStrpad()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:618'>
+  <td width=263 rowspan=2 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tget_nmembers</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>int CompType::getNmembers()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:619'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>int EnumType::getNmembers()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:620'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tget_member_name</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5std_string CompType::getMemberName(unsigned member_num)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:621'>
+  <td width=263 rowspan=2 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tget_member_index</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>int CompType::getMemberIndex(const char* name)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:622'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>int CompType::getMemberIndex(const H5std_string&amp; name)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:623'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tget_member_offset</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>size_t CompType::getMemberOffset(unsigned member_num)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:624'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tget_member_class</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5T_class_t CompType::getMemberClass(unsigned member_num)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:625'>
+  <td width=263 rowspan=8 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tget_member_type</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>DataType CompType::getMemberDataType(unsigned member_num)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:626'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>ArrayType CompType::getMemberArrayType(unsigned member_num)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:627'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>CompType CompType::getMemberCompType(unsigned member_num)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:628'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>EnumType CompType::getMemberEnumType(unsigned member_num)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:629'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>IntType CompType::getMemberIntType(unsigned member_num)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:630'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>FloatType CompType::getMemberFloatType(unsigned member_num)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:631'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>StrType CompType::getMemberStrType(unsigned member_num)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:632'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>VarLenType CompType::getMemberVarLenType(unsigned member_num)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:633'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tget_member_value</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void EnumType::getMemberValue(unsigned memb_no, void *value)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:634'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tget_cset</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5T_cset_t StrType::getCset()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:635'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tis_variable_str</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>bool DataType::isVariableStr()</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:636'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tget_native_type</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:637'>
+  <td width=263 rowspan=2 style='width:197.2pt;border:solid windowtext 1.0pt;
+  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tset_size</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void AtomType::setSize(size_t size)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:638'>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void CompType::setSize(size_t size)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:639'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tset_order</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void AtomType::setOrder(H5T_order_t order)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:640'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tset_precision</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void AtomType::setPrecision(size_t precision)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:641'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tset_offset</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void AtomType::setOffset(size_t offset)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:642'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tset_pad</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void AtomType::setPad(H5T_pad_t lsb, H5T_pad_t msb)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:643'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tset_sign</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void IntType::setSign(H5T_sign_t sign)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:644'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tset_fields</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void FloatType::setFields(size_t spos, size_t epos, size_t esize,
+  size_t mpos, size_t msize)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:645'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tset_ebias</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void FloatType::setEbias(size_t ebias)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:646'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tset_norm</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void FloatType::setNorm(H5T_norm_t norm)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:647'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tset_inpad</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void FloatType::setInpad(H5T_pad_t inpad)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:648'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tset_cset</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void StrType::setCset(H5T_cset_t cset)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:649'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tset_strpad</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void StrType::setStrpad(H5T_str_t strpad)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:650'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tregister</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DataType::registerFunc(H5T_pers_t pers, const char* name, const
+  DataType&amp; dest, H5T_conv_t func)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:651'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tunregister</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DataType::unregister(H5T_pers_t pers, const char* name, const
+  DataType&amp; dest, H5T_conv_t func)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:652'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tfind</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5T_conv_t DataType::find(const DataType&amp; dest, H5T_cdata_t
+  **pcdata)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:653'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tcompiler_conv</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>No</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:654'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>H5Tconvert</p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'>void DataType::convert(const DataType&amp; dest, size_t nelmts, void
+  *buf, void *background, const PropList&amp; plist)</p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:655;mso-yfti-lastrow:yes'>
+  <td width=263 style='width:197.2pt;border:solid windowtext 1.0pt;border-top:
+  none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+  padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=474 valign=top style='width:355.2pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=35 valign=top style='width:26.05pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=42 valign=top style='width:31.45pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal align=center style='margin-bottom:0in;margin-bottom:.0001pt;
+  text-align:center;line-height:normal'><o:p>&nbsp;</o:p></p>
+  </td>
+  <td width=169 valign=top style='width:126.65pt;border-top:none;border-left:
+  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
+  <p class=MsoNormal style='margin-bottom:0in;margin-bottom:.0001pt;line-height:
+  normal'><o:p>&nbsp;</o:p></p>
+  </td>
+ </tr>
+</table>
+
+<p class=MsoNormal><o:p>&nbsp;</o:p></p>
+
+<p class=MsoNormal><o:p>&nbsp;</o:p></p>
+
+</div>
+
+</body>
+
+</html>
diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt
index 2f3a0c4..490f3e0 100644
--- a/c++/src/CMakeLists.txt
+++ b/c++/src/CMakeLists.txt
@@ -1,24 +1,10 @@
-cmake_minimum_required (VERSION 3.1.0)
-PROJECT (HDF5_CPP_SRC)
-
-#-----------------------------------------------------------------------------
-# Shared/Static Libs
-#-----------------------------------------------------------------------------
-if (BUILD_SHARED_LIBS)
-  set (CPP_BUILT_AS_DYNAMIC_LIB 1)
-endif (BUILD_SHARED_LIBS)
-
-#-----------------------------------------------------------------------------
-# Generate configure file
-#-----------------------------------------------------------------------------
-configure_file (${HDF_RESOURCES_DIR}/H5cxx_config.h.in
-                ${HDF5_BINARY_DIR}/H5cxx_pubconf.h
-)
+cmake_minimum_required (VERSION 3.18)
+project (HDF5_CPP_SRC CXX)
 
 #-----------------------------------------------------------------------------
 # Define cpp Library
 #-----------------------------------------------------------------------------
-set (CPP_SRCS
+set (CPP_SOURCES
     ${HDF5_CPP_SRC_SOURCE_DIR}/H5AbstractDs.cpp
     ${HDF5_CPP_SRC_SOURCE_DIR}/H5ArrayType.cpp
     ${HDF5_CPP_SRC_SOURCE_DIR}/H5AtomType.cpp
@@ -28,6 +14,7 @@ set (CPP_SRCS
     ${HDF5_CPP_SRC_SOURCE_DIR}/H5DataSet.cpp
     ${HDF5_CPP_SRC_SOURCE_DIR}/H5DataSpace.cpp
     ${HDF5_CPP_SRC_SOURCE_DIR}/H5DataType.cpp
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5DaccProp.cpp
     ${HDF5_CPP_SRC_SOURCE_DIR}/H5DcreatProp.cpp
     ${HDF5_CPP_SRC_SOURCE_DIR}/H5DxferProp.cpp
     ${HDF5_CPP_SRC_SOURCE_DIR}/H5EnumType.cpp
@@ -39,9 +26,12 @@ set (CPP_SRCS
     ${HDF5_CPP_SRC_SOURCE_DIR}/H5Group.cpp
     ${HDF5_CPP_SRC_SOURCE_DIR}/H5IdComponent.cpp
     ${HDF5_CPP_SRC_SOURCE_DIR}/H5IntType.cpp
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5LaccProp.cpp
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5LcreatProp.cpp
     ${HDF5_CPP_SRC_SOURCE_DIR}/H5Library.cpp
     ${HDF5_CPP_SRC_SOURCE_DIR}/H5Location.cpp
     ${HDF5_CPP_SRC_SOURCE_DIR}/H5Object.cpp
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5OcreatProp.cpp
     ${HDF5_CPP_SRC_SOURCE_DIR}/H5PredType.cpp
     ${HDF5_CPP_SRC_SOURCE_DIR}/H5PropList.cpp
     ${HDF5_CPP_SRC_SOURCE_DIR}/H5StrType.cpp
@@ -62,6 +52,7 @@ set (CPP_HDRS
     ${HDF5_CPP_SRC_SOURCE_DIR}/H5DataSet.h
     ${HDF5_CPP_SRC_SOURCE_DIR}/H5DataSpace.h
     ${HDF5_CPP_SRC_SOURCE_DIR}/H5DataType.h
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5DaccProp.h
     ${HDF5_CPP_SRC_SOURCE_DIR}/H5DcreatProp.h
     ${HDF5_CPP_SRC_SOURCE_DIR}/H5DxferProp.h
     ${HDF5_CPP_SRC_SOURCE_DIR}/H5EnumType.h
@@ -74,27 +65,75 @@ set (CPP_HDRS
     ${HDF5_CPP_SRC_SOURCE_DIR}/H5IdComponent.h
     ${HDF5_CPP_SRC_SOURCE_DIR}/H5Include.h
     ${HDF5_CPP_SRC_SOURCE_DIR}/H5IntType.h
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5LaccProp.h
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5LcreatProp.h
     ${HDF5_CPP_SRC_SOURCE_DIR}/H5Library.h
     ${HDF5_CPP_SRC_SOURCE_DIR}/H5Location.h
     ${HDF5_CPP_SRC_SOURCE_DIR}/H5Object.h
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5OcreatProp.h
     ${HDF5_CPP_SRC_SOURCE_DIR}/H5PredType.h
     ${HDF5_CPP_SRC_SOURCE_DIR}/H5PropList.h
     ${HDF5_CPP_SRC_SOURCE_DIR}/H5StrType.h
     ${HDF5_CPP_SRC_SOURCE_DIR}/H5VarLenType.h
 )
 
-add_library (${HDF5_CPP_LIB_TARGET} ${LIB_TYPE} ${CPP_SRCS} ${CPP_HDRS})
-TARGET_C_PROPERTIES (${HDF5_CPP_LIB_TARGET} ${LIB_TYPE} " " " ")
-target_link_libraries (${HDF5_CPP_LIB_TARGET} ${HDF5_LIB_TARGET})
-set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_CPP_LIB_TARGET}")
-H5_SET_LIB_OPTIONS (${HDF5_CPP_LIB_TARGET} ${HDF5_CPP_LIB_NAME} ${LIB_TYPE})
-set_target_properties (${HDF5_CPP_LIB_TARGET} PROPERTIES
-    FOLDER libraries/cpp
-    INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
-)
+if (NOT ONLY_SHARED_LIBS)
+  add_library (${HDF5_CPP_LIB_TARGET} STATIC ${CPP_SOURCES} ${CPP_HDRS})
+  target_include_directories (${HDF5_CPP_LIB_TARGET}
+      PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
+      INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
+  )
+  target_compile_options(${HDF5_CPP_LIB_TARGET} PRIVATE "${HDF5_CMAKE_CXX_FLAGS}")
+  target_compile_definitions(${HDF5_CPP_LIB_TARGET}
+      PRIVATE $<$<BOOL:${HDF5_ENABLE_PARALLEL}>:MPICH_SKIP_MPICXX;MPICH_IGNORE_CXX_SEEK># Parallel/MPI, prevent spurious cpp/cxx warnings
+  )
+  TARGET_C_PROPERTIES (${HDF5_CPP_LIB_TARGET} STATIC)
+  target_link_libraries (${HDF5_CPP_LIB_TARGET} PUBLIC ${HDF5_LIB_TARGET})
+  set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_CPP_LIB_TARGET}")
+  H5_SET_LIB_OPTIONS (${HDF5_CPP_LIB_TARGET} ${HDF5_CPP_LIB_NAME} STATIC 0)
+  set_target_properties (${HDF5_CPP_LIB_TARGET} PROPERTIES FOLDER libraries/cpp)
+  set (install_targets ${HDF5_CPP_LIB_TARGET})
+endif ()
+
+if (BUILD_SHARED_LIBS)
+  add_library (${HDF5_CPP_LIBSH_TARGET} SHARED ${CPP_SOURCES} ${CPP_HDRS})
+  target_include_directories (${HDF5_CPP_LIBSH_TARGET}
+      PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
+      INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
+  )
+  target_compile_options(${HDF5_CPP_LIBSH_TARGET} PRIVATE "${HDF5_CMAKE_CXX_FLAGS}")
+  target_compile_definitions(${HDF5_CPP_LIBSH_TARGET}
+      PUBLIC "H5_BUILT_AS_DYNAMIC_LIB"
+      PRIVATE $<$<BOOL:${HDF5_ENABLE_PARALLEL}>:MPICH_SKIP_MPICXX;MPICH_IGNORE_CXX_SEEK># Parallel/MPI, prevent spurious cpp/cxx warnings
+  )
+  TARGET_C_PROPERTIES (${HDF5_CPP_LIBSH_TARGET} SHARED)
+  target_link_libraries (${HDF5_CPP_LIBSH_TARGET}
+      PUBLIC ${HDF5_LIBSH_TARGET}
+  )
+  if (MINGW AND HDF5_MINGW_STATIC_GCC_LIBS)
+    target_link_options (${HDF5_CPP_LIBSH_TARGET}
+        PRIVATE -static-libgcc -static-libstdc++
+    )
+  endif ()
+  set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_CPP_LIBSH_TARGET}")
+  H5_SET_LIB_OPTIONS (${HDF5_CPP_LIBSH_TARGET} ${HDF5_CPP_LIB_NAME} SHARED "CXX")
+  set_target_properties (${HDF5_CPP_LIBSH_TARGET} PROPERTIES FOLDER libraries/cpp)
+  set (install_targets ${install_targets} ${HDF5_CPP_LIBSH_TARGET})
+endif ()
+
+#-----------------------------------------------------------------------------
+# Add Target to clang-format
+#-----------------------------------------------------------------------------
+if (HDF5_ENABLE_FORMATTERS)
+  if (NOT ONLY_SHARED_LIBS)
+    clang_format (HDF5_CPP_SRC_FORMAT ${HDF5_CPP_LIB_TARGET})
+  else ()
+    clang_format (HDF5_CPP_SRC_FORMAT ${HDF5_CPP_LIBSH_TARGET})
+  endif ()
+endif ()
 
 #-----------------------------------------------------------------------------
-# Add file(s) to CMake Install 
+# Add file(s) to CMake Install
 #-----------------------------------------------------------------------------
 install (
     FILES
@@ -110,16 +149,74 @@ install (
 #-----------------------------------------------------------------------------
 if (HDF5_EXPORTED_TARGETS)
   if (BUILD_SHARED_LIBS)
-    INSTALL_TARGET_PDB (${HDF5_CPP_LIB_TARGET} ${HDF5_INSTALL_BIN_DIR} cpplibraries)
-  endif (BUILD_SHARED_LIBS)
-  
+    INSTALL_TARGET_PDB (${HDF5_CPP_LIBSH_TARGET} ${HDF5_INSTALL_BIN_DIR} cpplibraries)
+  endif ()
+  if (NOT ONLY_SHARED_LIBS)
+    INSTALL_TARGET_PDB (${HDF5_CPP_LIB_TARGET} ${HDF5_INSTALL_LIB_DIR} cpplibraries)
+  endif ()
+
   install (
       TARGETS
-          ${HDF5_CPP_LIB_TARGET}
+          ${install_targets}
       EXPORT
           ${HDF5_EXPORTED_TARGETS}
       LIBRARY DESTINATION ${HDF5_INSTALL_LIB_DIR} COMPONENT cpplibraries
       ARCHIVE DESTINATION ${HDF5_INSTALL_LIB_DIR} COMPONENT cpplibraries
       RUNTIME DESTINATION ${HDF5_INSTALL_BIN_DIR} COMPONENT cpplibraries
+      FRAMEWORK DESTINATION ${HDF5_INSTALL_FWRK_DIR} COMPONENT cpplibraries
+      INCLUDES DESTINATION include
+  )
+endif ()
+
+#-----------------------------------------------------------------------------
+# Create pkgconfig files
+#-----------------------------------------------------------------------------
+set (_PKG_CONFIG_PREFIX ${CMAKE_INSTALL_PREFIX})
+set (_PKG_CONFIG_EXEC_PREFIX \${prefix})
+set (_PKG_CONFIG_LIBDIR \${exec_prefix}/${HDF5_INSTALL_LIB_DIR})
+set (_PKG_CONFIG_INCLUDEDIR \${prefix}/${HDF5_INSTALL_INCLUDE_DIR})
+set (_PKG_CONFIG_LIBNAME "${HDF5_CPP_LIB_CORENAME}")
+set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}")
+
+set (_PKG_CONFIG_LIBS_PRIVATE)
+
+if (NOT ONLY_SHARED_LIBS)
+  set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_CPP_LIB_CORENAME}")
+endif ()
+if (BUILD_SHARED_LIBS)
+  set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_CPP_LIB_CORENAME}")
+endif ()
+
+set (_PKG_CONFIG_REQUIRES "${HDF5_LIB_CORENAME} = ${HDF5_PACKAGE_VERSION}")
+set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_LIB_CORENAME} = ${HDF5_PACKAGE_VERSION}")
+
+configure_file (
+    ${HDF_CONFIG_DIR}/libhdf5.pc.in
+    ${HDF5_BINARY_DIR}/CMakeFiles/${HDF5_CPP_LIB_CORENAME}.pc
+    @ONLY
+)
+install (
+    FILES ${HDF5_BINARY_DIR}/CMakeFiles/${HDF5_CPP_LIB_CORENAME}.pc
+    DESTINATION ${HDF5_INSTALL_LIB_DIR}/pkgconfig
+    COMPONENT cpplibraries
+)
+
+if (NOT WIN32 AND NOT MINGW)
+  if (HDF5_ENABLE_PARALLEL AND MPI_CXX_FOUND)
+    set (_PKG_CONFIG_COMPILER ${MPI_CXX_COMPILER})
+  else ()
+    set (_PKG_CONFIG_COMPILER ${CMAKE_CXX_COMPILER})
+  endif ()
+  configure_file (
+      ${HDF_RESOURCES_DIR}/libh5cc.in
+      ${HDF5_BINARY_DIR}/CMakeFiles/h5c++
+      @ONLY
+  )
+  install (
+      FILES ${HDF5_BINARY_DIR}/CMakeFiles/h5c++
+      DESTINATION ${HDF5_INSTALL_BIN_DIR}
+      PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+      COMPONENT cpplibraries
   )
-endif (HDF5_EXPORTED_TARGETS)
+endif ()
+
diff --git a/c++/src/H5AbstractDs.cpp b/c++/src/H5AbstractDs.cpp
index 0e6ac00..3eeb197 100644
--- a/c++/src/H5AbstractDs.cpp
+++ b/c++/src/H5AbstractDs.cpp
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <string>
@@ -19,27 +16,35 @@
 #include "H5Exception.h"
 #include "H5IdComponent.h"
 #include "H5PropList.h"
+#include "H5FaccProp.h"
+#include "H5FcreatProp.h"
+#include "H5OcreatProp.h"
+#include "H5DcreatProp.h"
+#include "H5DxferProp.h"
+#include "H5LcreatProp.h"
+#include "H5LaccProp.h"
+#include "H5DaccProp.h"
+#include "H5Location.h"
 #include "H5Object.h"
+#include "H5DataSpace.h"
 #include "H5AbstractDs.h"
-#include "H5DcreatProp.h"
-#include "H5CommonFG.h"
 #include "H5Alltypes.h"
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#endif
 
 //--------------------------------------------------------------------------
-// Function:	AbstractDs default constructor
-///\brief	Default constructor
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    AbstractDs default constructor
+///\brief       Default constructor
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-AbstractDs::AbstractDs(){}
+AbstractDs::AbstractDs()
+{
+}
 
 //--------------------------------------------------------------------------
-// Function:	AbstractDs default constructor
-///\brief	Creates an AbstractDs instance using an existing id.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    AbstractDs default constructor
+///\brief       Creates an AbstractDs instance using an existing id.
+// Programmer   Binh-Minh Ribler - 2000
 //
 // *** Deprecation warning ***
 // This constructor is no longer appropriate because the data member "id" had
@@ -47,283 +52,288 @@ AbstractDs::AbstractDs(){}
 // removal does not raise any problems in 1.10, it will be removed from 1.8 in
 // subsequent releases.
 //--------------------------------------------------------------------------
-AbstractDs::AbstractDs(const hid_t ds_id){}
-
-//--------------------------------------------------------------------------
-// Function:	AbstractDs copy constructor
-///\brief	Copy constructor: makes a copy of the original AbstractDs object.
-// Programmer	Binh-Minh Ribler - 2000
-// *** Deprecation warning ***
-// This constructor is no longer appropriate because the data member "id" had
-// been moved to the sub-classes.  It is removed from 1.8.15 because it is
-// a noop and it can be generated by the compiler if needed.
-//--------------------------------------------------------------------------
-//--------------------------------------------------------------------------
-// AbstractDs::AbstractDs(const AbstractDs& original){}
+// Mar 2016 -BMR, AbstractDs::AbstractDs(const hid_t ds_id){}
 
 //--------------------------------------------------------------------------
-// Function:	AbstractDs::getTypeClass
-///\brief	Returns the class of the datatype that is used by this
-///		object, which can be a dataset or an attribute.
-///\return	Datatype class identifier
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    AbstractDs::getTypeClass
+///\brief       Returns the class of the datatype that is used by this
+///             object, which can be a dataset or an attribute.
+///\return      Datatype class identifier
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-H5T_class_t AbstractDs::getTypeClass() const
+H5T_class_t
+AbstractDs::getTypeClass() const
 {
-   // Gets the datatype used by this dataset or attribute.
-   // p_get_type calls either H5Dget_type or H5Aget_type depending on
-   // which object invokes getTypeClass
-   hid_t datatype_id;
-   try {
-      datatype_id = p_get_type();  // returned value is already validated
-   }
-   catch (DataSetIException E) {
-      throw DataTypeIException("DataSet::getTypeClass", E.getDetailMsg());
-   }
-   catch (AttributeIException E) {
-      throw DataTypeIException("Attribute::getTypeClass", E.getDetailMsg());
-   }
+    // Gets the datatype used by this dataset or attribute.
+    // p_get_type calls either H5Dget_type or H5Aget_type depending on
+    // which object invokes getTypeClass
+    hid_t datatype_id;
+    try {
+        datatype_id = p_get_type(); // returned value is already validated
+    }
+    catch (DataSetIException &E) {
+        throw DataTypeIException("DataSet::getTypeClass", E.getDetailMsg());
+    }
+    catch (AttributeIException &E) {
+        throw DataTypeIException("Attribute::getTypeClass", E.getDetailMsg());
+    }
 
-   // Gets the class of the datatype and validate it before returning
-   H5T_class_t type_class = H5Tget_class(datatype_id);
+    // Gets the class of the datatype and validate it before returning
+    H5T_class_t type_class = H5Tget_class(datatype_id);
 
-   // Close temporary datatype_id
-   herr_t ret_value = H5Tclose(datatype_id);
-   if (ret_value < 0)
-   {
-      if (fromClass() == "DataSet")
-	 throw DataTypeIException("DataSet::getTypeClass", "H5Tclose failed");
-      else if (fromClass() == "Attribute")
-	 throw DataTypeIException("Attribute::getTypeClass", "H5Tclose failed");
-   }
+    // Close temporary datatype_id
+    herr_t ret_value = H5Tclose(datatype_id);
+    if (ret_value < 0) {
+        if (fromClass() == "DataSet")
+            throw DataTypeIException("DataSet::getTypeClass", "H5Tclose failed");
+        else if (fromClass() == "Attribute")
+            throw DataTypeIException("Attribute::getTypeClass", "H5Tclose failed");
+    }
 
-   // Check on the returned type_class
-   if (type_class == H5T_NO_CLASS)
-   {
-      if (fromClass() == "DataSet")
-	 throw DataTypeIException("DataSet::getTypeClass", "H5Tget_class returns H5T_NO_CLASS");
-      else if (fromClass() == "Attribute")
-	 throw DataTypeIException("Attribute::getTypeClass", "H5Tget_class returns H5T_NO_CLASS");
-   }
-   return(type_class);
+    // Check on the returned type_class
+    if (type_class == H5T_NO_CLASS) {
+        if (fromClass() == "DataSet")
+            throw DataTypeIException("DataSet::getTypeClass", "H5Tget_class returns H5T_NO_CLASS");
+        else if (fromClass() == "Attribute")
+            throw DataTypeIException("Attribute::getTypeClass", "H5Tget_class returns H5T_NO_CLASS");
+    }
+    return (type_class);
 }
 
 //--------------------------------------------------------------------------
-// Function:	AbstractDs::getDataType
-///\brief	Returns the generic datatype of this abstract dataset, which
-///		can be a dataset or an attribute.
-///\return	DataType instance
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    AbstractDs::getDataType
+///\brief       Returns the generic datatype of this abstract dataset, which
+///             can be a dataset or an attribute.
+///\return      DataType instance
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-DataType AbstractDs::getDataType() const
+DataType
+AbstractDs::getDataType() const
 {
-   // Gets the id of the datatype used by this dataset or attribute using
-   // p_get_type.  p_get_type calls either H5Dget_type or H5Aget_type
-   // depending on which object invokes getDataType.  Then, create and
-   // return the DataType object
-   try {
-      DataType datatype(p_get_type());
-      return(datatype);
-   }
-   catch (DataSetIException E) {
-      throw DataTypeIException("DataSet::getDataType", E.getDetailMsg());
-   }
-   catch (AttributeIException E) {
-      throw DataTypeIException("Attribute::getDataType", E.getDetailMsg());
-   }
+    // Gets the id of the datatype used by this dataset or attribute using
+    // p_get_type.  p_get_type calls either H5Dget_type or H5Aget_type
+    // depending on which object invokes getDataType.  Then, create and
+    // return the DataType object
+    try {
+        DataType datatype;
+        f_DataType_setId(&datatype, p_get_type());
+        return (datatype);
+    }
+    catch (DataSetIException &E) {
+        throw DataTypeIException("DataSet::getDataType", E.getDetailMsg());
+    }
+    catch (AttributeIException &E) {
+        throw DataTypeIException("Attribute::getDataType", E.getDetailMsg());
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	AbstractDs::getArrayType
-///\brief	Returns the array datatype of this abstract dataset which
-///		can be a dataset or an attribute.
-///\return	ArrayType instance
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - Jul, 2005
+// Function:    AbstractDs::getArrayType
+///\brief       Returns the array datatype of this abstract dataset which
+///             can be a dataset or an attribute.
+///\return      ArrayType instance
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - Jul, 2005
 //--------------------------------------------------------------------------
-ArrayType AbstractDs::getArrayType() const
+ArrayType
+AbstractDs::getArrayType() const
 {
-   // Gets the id of the datatype used by this dataset or attribute using
-   // p_get_type.  p_get_type calls either H5Dget_type or H5Aget_type
-   // depending on which object invokes getArrayType.  Then, create and
-   // return the ArrayType object
-   try {
-      ArrayType arraytype(p_get_type());
-      return(arraytype);
-   }
-   catch (DataSetIException E) {
-      throw DataTypeIException("DataSet::getArrayType", E.getDetailMsg());
-   }
-   catch (AttributeIException E) {
-      throw DataTypeIException("Attribute::getArrayType", E.getDetailMsg());
-   }
+    // Gets the id of the datatype used by this dataset or attribute using
+    // p_get_type.  p_get_type calls either H5Dget_type or H5Aget_type
+    // depending on which object invokes getArrayType.  Then, create and
+    // return the ArrayType object
+    try {
+        // Create ArrayType and set values this way to work around the
+        // problem described in the JIRA issue HDFFV-7947
+        ArrayType arraytype;
+        f_DataType_setId(&arraytype, p_get_type());
+        return (arraytype);
+    }
+    catch (DataSetIException &E) {
+        throw DataTypeIException("DataSet::getArrayType", E.getDetailMsg());
+    }
+    catch (AttributeIException &E) {
+        throw DataTypeIException("Attribute::getArrayType", E.getDetailMsg());
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	AbstractDs::getCompType
-///\brief	Returns the compound datatype of this abstract dataset which
-///		can be a dataset or an attribute.
-///\return	CompType instance
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    AbstractDs::getCompType
+///\brief       Returns the compound datatype of this abstract dataset which
+///             can be a dataset or an attribute.
+///\return      CompType instance
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-CompType AbstractDs::getCompType() const
+CompType
+AbstractDs::getCompType() const
 {
-   // Gets the id of the datatype used by this dataset or attribute using
-   // p_get_type.  p_get_type calls either H5Dget_type or H5Aget_type
-   // depending on which object invokes getCompType.  Then, create and
-   // return the CompType object
-   try {
-      CompType comptype(p_get_type());
-      return(comptype);
-   }
-   catch (DataSetIException E) {
-      throw DataTypeIException("DataSet::getCompType", E.getDetailMsg());
-   }
-   catch (AttributeIException E) {
-      throw DataTypeIException("Attribute::getCompType", E.getDetailMsg());
-   }
+    // Gets the id of the datatype used by this dataset or attribute using
+    // p_get_type.  p_get_type calls either H5Dget_type or H5Aget_type
+    // depending on which object invokes getCompType.  Then, create and
+    // return the CompType object
+    try {
+        CompType comptype;
+        f_DataType_setId(&comptype, p_get_type());
+        return (comptype);
+    }
+    catch (DataSetIException &E) {
+        throw DataTypeIException("DataSet::getCompType", E.getDetailMsg());
+    }
+    catch (AttributeIException &E) {
+        throw DataTypeIException("Attribute::getCompType", E.getDetailMsg());
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	AbstractDs::getEnumType
-///\brief	Returns the enumeration datatype of this abstract dataset which
-///		can be a dataset or an attribute.
-///\return	EnumType instance
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    AbstractDs::getEnumType
+///\brief       Returns the enumeration datatype of this abstract dataset which
+///             can be a dataset or an attribute.
+///\return      EnumType instance
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-EnumType AbstractDs::getEnumType() const
+EnumType
+AbstractDs::getEnumType() const
 {
-   // Gets the id of the datatype used by this dataset or attribute using
-   // p_get_type.  p_get_type calls either H5Dget_type or H5Aget_type
-   // depending on which object invokes getEnumType.  Then, create and
-   // return the EnumType object
-   try {
-      EnumType enumtype(p_get_type());
-      return(enumtype);
-   }
-   catch (DataSetIException E) {
-      throw DataTypeIException("DataSet::getEnumType", E.getDetailMsg());
-   }
-   catch (AttributeIException E) {
-      throw DataTypeIException("Attribute::getEnumType", E.getDetailMsg());
-   }
+    // Gets the id of the datatype used by this dataset or attribute using
+    // p_get_type.  p_get_type calls either H5Dget_type or H5Aget_type
+    // depending on which object invokes getEnumType.  Then, create and
+    // return the EnumType object
+    try {
+        EnumType enumtype;
+        f_DataType_setId(&enumtype, p_get_type());
+        return (enumtype);
+    }
+    catch (DataSetIException &E) {
+        throw DataTypeIException("DataSet::getEnumType", E.getDetailMsg());
+    }
+    catch (AttributeIException &E) {
+        throw DataTypeIException("Attribute::getEnumType", E.getDetailMsg());
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	AbstractDs::getIntType
-///\brief	Returns the integer datatype of this abstract dataset which
-///		can be a dataset or an attribute.
-///\return	IntType instance
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    AbstractDs::getIntType
+///\brief       Returns the integer datatype of this abstract dataset which
+///             can be a dataset or an attribute.
+///\return      IntType instance
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-IntType AbstractDs::getIntType() const
+IntType
+AbstractDs::getIntType() const
 {
-   // Gets the id of the datatype used by this dataset or attribute using
-   // p_get_type.  p_get_type calls either H5Dget_type or H5Aget_type
-   // depending on which object invokes getIntType.  Then, create and
-   // return the IntType object
-   try {
-      IntType inttype(p_get_type());
-      return(inttype);
-   }
-   catch (DataSetIException E) {
-      throw DataTypeIException("DataSet::getIntType", E.getDetailMsg());
-   }
-   catch (AttributeIException E) {
-      throw DataTypeIException("Attribute::getIntType", E.getDetailMsg());
-   }
+    // Gets the id of the datatype used by this dataset or attribute using
+    // p_get_type.  p_get_type calls either H5Dget_type or H5Aget_type
+    // depending on which object invokes getIntType.  Then, create and
+    // return the IntType object
+    try {
+        IntType inttype;
+        f_DataType_setId(&inttype, p_get_type());
+        return (inttype);
+    }
+    catch (DataSetIException &E) {
+        throw DataTypeIException("DataSet::getIntType", E.getDetailMsg());
+    }
+    catch (AttributeIException &E) {
+        throw DataTypeIException("Attribute::getIntType", E.getDetailMsg());
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	AbstractDs::getFloatType
-///\brief	Returns the floating-point datatype of this abstract dataset,
-///		which can be a dataset or an attribute.
-///\return	FloatType instance
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    AbstractDs::getFloatType
+///\brief       Returns the floating-point datatype of this abstract dataset,
+///             which can be a dataset or an attribute.
+///\return      FloatType instance
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-FloatType AbstractDs::getFloatType() const
+FloatType
+AbstractDs::getFloatType() const
 {
-   // Gets the id of the datatype used by this dataset or attribute using
-   // p_get_type.  p_get_type calls either H5Dget_type or H5Aget_type
-   // depending on which object invokes getFloatType.  Then, create and
-   // return the FloatType object
-   try {
-      FloatType floatype(p_get_type());
-      return(floatype);
-   }
-   catch (DataSetIException E) {
-      throw DataTypeIException("DataSet::getFloatType", E.getDetailMsg());
-   }
-   catch (AttributeIException E) {
-      throw DataTypeIException("Attribute::getFloatType", E.getDetailMsg());
-   }
+    // Gets the id of the datatype used by this dataset or attribute using
+    // p_get_type.  p_get_type calls either H5Dget_type or H5Aget_type
+    // depending on which object invokes getFloatType.  Then, create and
+    // return the FloatType object
+    try {
+        FloatType floatype;
+        f_DataType_setId(&floatype, p_get_type());
+        return (floatype);
+    }
+    catch (DataSetIException &E) {
+        throw DataTypeIException("DataSet::getFloatType", E.getDetailMsg());
+    }
+    catch (AttributeIException &E) {
+        throw DataTypeIException("Attribute::getFloatType", E.getDetailMsg());
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	AbstractDs::getStrType
-///\brief	Returns the string datatype of this abstract dataset which
-///		can be a dataset or an attribute.
-///\return	StrType instance
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    AbstractDs::getStrType
+///\brief       Returns the string datatype of this abstract dataset which
+///             can be a dataset or an attribute.
+///\return      StrType instance
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-StrType AbstractDs::getStrType() const
+StrType
+AbstractDs::getStrType() const
 {
-   // Gets the id of the datatype used by this dataset or attribute using
-   // p_get_type.  p_get_type calls either H5Dget_type or H5Aget_type
-   // depending on which object invokes getStrType.  Then, create and
-   // return the StrType object
-   try {
-      StrType strtype(p_get_type());
-      return(strtype);
-   }
-   catch (DataSetIException E) {
-      throw DataTypeIException("DataSet::getStrType", E.getDetailMsg());
-   }
-   catch (AttributeIException E) {
-      throw DataTypeIException("Attribute::getStrType", E.getDetailMsg());
-   }
+    // Gets the id of the datatype used by this dataset or attribute using
+    // p_get_type.  p_get_type calls either H5Dget_type or H5Aget_type
+    // depending on which object invokes getStrType.  Then, create and
+    // return the StrType object
+    try {
+        StrType strtype;
+        f_DataType_setId(&strtype, p_get_type());
+        return (strtype);
+    }
+    catch (DataSetIException &E) {
+        throw DataTypeIException("DataSet::getStrType", E.getDetailMsg());
+    }
+    catch (AttributeIException &E) {
+        throw DataTypeIException("Attribute::getStrType", E.getDetailMsg());
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	AbstractDs::getVarLenType
-///\brief	Returns the floating-point datatype of this abstract dataset,
-///		which can be a dataset or an attribute.
-///\return	VarLenType instance
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - Jul, 2005
+// Function:    AbstractDs::getVarLenType
+///\brief       Returns the variable length datatype of this abstract dataset,
+///             which can be a dataset or an attribute.
+///\return      VarLenType instance
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - Jul, 2005
 //--------------------------------------------------------------------------
-VarLenType AbstractDs::getVarLenType() const
+VarLenType
+AbstractDs::getVarLenType() const
 {
-   // Gets the id of the datatype used by this dataset or attribute using
-   // p_get_type.  p_get_type calls either H5Dget_type or H5Aget_type
-   // depending on which object invokes getVarLenType.  Then, create and
-   // return the VarLenType object
-   try {
-      VarLenType varlentype(p_get_type());
-      return(varlentype);
-   }
-   catch (DataSetIException E) {
-      throw DataTypeIException("DataSet::getVarLenType", E.getDetailMsg());
-   }
-   catch (AttributeIException E) {
-      throw DataTypeIException("Attribute::getVarLenType", E.getDetailMsg());
-   }
+    // Gets the id of the datatype used by this dataset or attribute using
+    // p_get_type.  p_get_type calls either H5Dget_type or H5Aget_type
+    // depending on which object invokes getVarLenType.  Then, create and
+    // return the VarLenType object
+    try {
+        VarLenType varlentype;
+        f_DataType_setId(&varlentype, p_get_type());
+        return (varlentype);
+    }
+    catch (DataSetIException &E) {
+        throw DataTypeIException("DataSet::getVarLenType", E.getDetailMsg());
+    }
+    catch (AttributeIException &E) {
+        throw DataTypeIException("Attribute::getVarLenType", E.getDetailMsg());
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	AbstractDs destructor
-///\brief	Noop destructor.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    AbstractDs destructor
+///\brief       Noop destructor.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-AbstractDs::~AbstractDs() {}
+AbstractDs::~AbstractDs()
+{
+}
 
-#ifndef H5_NO_NAMESPACE
-} // end namespace
-#endif
+} // namespace H5
diff --git a/c++/src/H5AbstractDs.h b/c++/src/H5AbstractDs.h
index 8ed7967..49bcfeb 100644
--- a/c++/src/H5AbstractDs.h
+++ b/c++/src/H5AbstractDs.h
@@ -1,25 +1,20 @@
 // C++ informative line for the emacs editor: -*- C++ -*-
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __AbstractDs_H
-#define __AbstractDs_H
+#ifndef H5AbstractDs_H
+#define H5AbstractDs_H
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#endif
 
 class ArrayType;
 class CompType;
@@ -28,72 +23,61 @@ class FloatType;
 class IntType;
 class StrType;
 class VarLenType;
+class DataSpace;
 
 /*! \class AbstractDs
     \brief AbstractDs is an abstract base class, inherited by Attribute
      and DataSet.
 
     It provides a collection of services that are common to both Attribute
-    and DataSet.  AbstractDs inherits from H5Object.
+    and DataSet.
 */
 class H5_DLLCPP AbstractDs {
-   public:
-	// Gets a copy the datatype of that this abstract dataset uses.
-	// Note that this datatype is a generic one and can only be accessed
-	// via generic member functions, i.e., member functions belong
-	// to DataType.  To get specific datatype, i.e. EnumType, FloatType,
-	// etc..., use the specific functions, that follow, instead.
-	DataType getDataType() const;
-
-	// Gets a copy of the specific datatype of this abstract dataset.
-	ArrayType getArrayType() const;
-	CompType getCompType() const;
-	EnumType getEnumType() const;
-	IntType getIntType() const;
-	FloatType getFloatType() const;
-	StrType getStrType() const;
-	VarLenType getVarLenType() const;
-
-	///\brief Gets the size in memory of this abstract dataset.
-	virtual size_t getInMemDataSize() const = 0;
-
-	///\brief Gets the dataspace of this abstract dataset - pure virtual.
-	virtual DataSpace getSpace() const = 0;
-
-	// Gets the class of the datatype that is used by this abstract
-	// dataset.
-	H5T_class_t getTypeClass() const;
-
-	///\brief Returns the amount of storage size required - pure virtual.
-	virtual hsize_t getStorageSize() const = 0;
-
-	///\brief Returns this class name.
-	virtual H5std_string fromClass() const = 0;
-
-	// Destructor
-	virtual ~AbstractDs();
-
-   protected:
-	// Default constructor
-	AbstractDs();
-
-        // *** Deprecation warning ***
-        // The following two constructors are no longer appropriate after the
-        // data member "id" had been moved to the sub-classes.
-        // The copy constructor is a noop and is removed in 1.8.15 and the
-        // other will be removed from 1.10 release, and then from 1.8 if its
-        // removal does not raise any problems in two 1.10 releases.
-
-	AbstractDs(const hid_t h5_id);
-
-	// Copy constructor
-	// AbstractDs( const AbstractDs& original );
-
-   private:
-	// This member function is implemented by DataSet and Attribute.
-	virtual hid_t p_get_type() const = 0;
-};
-#ifndef H5_NO_NAMESPACE
-}
-#endif
-#endif // __AbstractDs_H
+  public:
+    // Gets a copy the datatype of that this abstract dataset uses.
+    // Note that this datatype is a generic one and can only be accessed
+    // via generic member functions, i.e., member functions belong
+    // to DataType.  To get specific datatype, i.e. EnumType, FloatType,
+    // etc..., use the specific functions, that follow, instead.
+    DataType getDataType() const;
+
+    // Gets a copy of the specific datatype of this abstract dataset.
+    ArrayType  getArrayType() const;
+    CompType   getCompType() const;
+    EnumType   getEnumType() const;
+    IntType    getIntType() const;
+    FloatType  getFloatType() const;
+    StrType    getStrType() const;
+    VarLenType getVarLenType() const;
+
+    ///\brief Gets the size in memory of this abstract dataset.
+    virtual size_t getInMemDataSize() const = 0;
+
+    ///\brief Gets the dataspace of this abstract dataset - pure virtual.
+    virtual DataSpace getSpace() const = 0;
+
+    // Gets the class of the datatype that is used by this abstract
+    // dataset.
+    H5T_class_t getTypeClass() const;
+
+    ///\brief Returns the amount of storage size required - pure virtual.
+    virtual hsize_t getStorageSize() const = 0;
+
+    // Returns this class name - pure virtual.
+    virtual H5std_string fromClass() const = 0;
+
+    // Destructor
+    virtual ~AbstractDs();
+
+  protected:
+    // Default constructor
+    AbstractDs();
+
+  private:
+    // This member function is implemented by DataSet and Attribute - pure virtual.
+    virtual hid_t p_get_type() const = 0;
+
+}; // end of AbstractDs
+} // namespace H5
+
+#endif // H5AbstractDs_H
diff --git a/c++/src/H5Alltypes.h b/c++/src/H5Alltypes.h
index b1d792d..b18add8 100644
--- a/c++/src/H5Alltypes.h
+++ b/c++/src/H5Alltypes.h
@@ -1,17 +1,14 @@
 // C++ informative line for the emacs editor: -*- C++ -*-
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 // This header file simply serves as a container to hold the
@@ -24,6 +21,6 @@
 #include "H5IntType.h"
 #include "H5FloatType.h"
 #include "H5StrType.h"
-#include "H5CompType.h"
 #include "H5ArrayType.h"
 #include "H5VarLenType.h"
+#include "H5CompType.h"
diff --git a/c++/src/H5ArrayType.cpp b/c++/src/H5ArrayType.cpp
index 8807dca..ab9690e 100644
--- a/c++/src/H5ArrayType.cpp
+++ b/c++/src/H5ArrayType.cpp
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <string>
@@ -19,158 +16,206 @@
 #include "H5Exception.h"
 #include "H5IdComponent.h"
 #include "H5PropList.h"
-#include "H5Object.h"
+#include "H5OcreatProp.h"
 #include "H5DcreatProp.h"
-#include "H5CommonFG.h"
+#include "H5LcreatProp.h"
+#include "H5LaccProp.h"
+#include "H5DaccProp.h"
+#include "H5Location.h"
+#include "H5Object.h"
 #include "H5DataType.h"
 #include "H5ArrayType.h"
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#endif
 
 //--------------------------------------------------------------------------
-// Function:	ArrayType default constructor
-///\brief	Default constructor: Creates a stub ArrayType
-// Programmer	Binh-Minh Ribler - May 2004
+// Function:    ArrayType default constructor
+///\brief       Default constructor: Creates a stub ArrayType
+// Programmer   Binh-Minh Ribler - May 2004
 //--------------------------------------------------------------------------
 ArrayType::ArrayType() : DataType()
 {
-   // Initialize members
-   rank = -1;
-   dimensions = NULL;
 }
 
 //--------------------------------------------------------------------------
-// Function:	ArrayType overloaded constructor
-///\brief	Creates an ArrayType object using an existing id.
-///\param	existing_id - IN: Id of an existing datatype
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - May 2004
+// Function:    ArrayType overloaded constructor
+///\brief       Creates an ArrayType object using an existing id.
+///\param       existing_id - IN: Id of an existing datatype
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - May 2004
 //--------------------------------------------------------------------------
-ArrayType::ArrayType( const hid_t existing_id ) : DataType( existing_id )
+ArrayType::ArrayType(const hid_t existing_id) : DataType(existing_id)
 {
-   // Get the rank of the existing array and store it in this array
-   rank = H5Tget_array_ndims(existing_id);
-   if (rank < 0)
-   {
-      throw DataTypeIException("ArrayType constructor (existing id)", "H5Tget_array_ndims failed");
-   }
-
-    // Allocate space for the dimensions
-    dimensions = new hsize_t[rank];
-
-    // Get the dimensions of the existing array and store it in this array
-    int ret_value = H5Tget_array_dims2(id, dimensions);
-    if (ret_value < 0)
-	throw DataTypeIException("ArrayType constructor (existing id)", "H5Tget_array_dims2 failed");
 }
 
 //--------------------------------------------------------------------------
-// Function:	ArrayType copy constructor
-///\brief	Copy constructor: makes a copy of the original ArrayType object.
-// Programmer	Binh-Minh Ribler - May 2004
+// Function:    ArrayType copy constructor
+///\brief       Copy constructor: same HDF5 object as \a original
+// Programmer   Binh-Minh Ribler - May 2004
 //--------------------------------------------------------------------------
-ArrayType::ArrayType( const ArrayType& original ) : DataType( original )
+ArrayType::ArrayType(const ArrayType &original) : DataType(original)
 {
-    // Copy the rank of the original array
-    rank = original.rank;
-
-    // Allocate space then copy the dimensions from the original array
-    dimensions = new hsize_t[rank];
-    for (int i = 0; i < rank; i++)
-	dimensions[i] = original.dimensions[i];
 }
 
 //--------------------------------------------------------------------------
-// Function:	ArrayType overloaded constructor
-///\brief	Creates a new array data type based on the specified
-///		\a base_type.
-///\param	base_type - IN: Existing datatype
-///\param	ndims     - IN: Rank of the array, [0..H5S_MAX_RANK]
-///\param	dims      - IN: Size of each array dimension
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - May 2004
+// Function:    ArrayType overloaded constructor
+///\brief       Creates a new array data type based on the specified
+///             \a base_type.
+///\param       base_type - IN: Existing datatype
+///\param       ndims     - IN: Rank of the array, [0..H5S_MAX_RANK]
+///\param       dims      - IN: Size of each array dimension
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - May 2004
 //--------------------------------------------------------------------------
-ArrayType::ArrayType(const DataType& base_type, int ndims, const hsize_t* dims) : DataType()
+ArrayType::ArrayType(const DataType &base_type, int ndims, const hsize_t *dims) : DataType()
 {
+    if (ndims < 0 || ndims > H5S_MAX_RANK)
+        throw DataTypeIException("ArrayType constructor", "ndims not in range [0..H5S_MAX_RANK]");
+
     // Call C API to create an array data type
-    hid_t new_type_id = H5Tarray_create2(base_type.getId(), ndims, dims);
+    hid_t new_type_id = H5Tarray_create2(base_type.getId(), static_cast<unsigned>(ndims), dims);
     if (new_type_id < 0)
-	throw DataTypeIException("ArrayType constructor", "H5Tarray_create2 failed");
+        throw DataTypeIException("ArrayType constructor", "H5Tarray_create2 failed");
 
-    // Set the id and rank for this object
+    // Set the id for this object
     id = new_type_id;
-    rank = ndims;
+}
 
-    // Allocate space then set the dimensions as provided by caller
-    dimensions = new hsize_t[rank];
-    for (int i = 0; i < rank; i++)
-	dimensions[i] = dims[i];
+//--------------------------------------------------------------------------
+// Function:    ArrayType overloaded constructor
+///\brief       Creates an ArrayType instance by opening an HDF5 array datatype
+///             given its name, provided as a C character string.
+///\param       loc        - IN: Location of the type
+///\param       dtype_name - IN: Array type name
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - Dec 2016
+// Description
+//              In 1.10.1, this constructor was introduced and may replace the
+//              existing function CommonFG::openArrayType(const char*) to
+//              improve usability.
+//              -BMR, Dec 2016
+//--------------------------------------------------------------------------
+ArrayType::ArrayType(const H5Location &loc, const char *dtype_name) : DataType()
+{
+    id = p_opentype(loc, dtype_name);
+}
+
+//--------------------------------------------------------------------------
+// Function:    ArrayType overloaded constructor
+///\brief       Creates an ArrayType instance by opening an HDF5 array datatype
+///             given its name, provided as an \c H5std_string.
+///\param       loc        - IN: Location of the type
+///\param       dtype_name - IN: Array type name
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - Dec 2016
+// Description
+//              In 1.10.1, this constructor was introduced and may replace the
+//              existing function CommonFG::openArrayType(const H5std_string&)
+//              to improve usability.
+//              -BMR, Dec 2016
+//--------------------------------------------------------------------------
+ArrayType::ArrayType(const H5Location &loc, const H5std_string &dtype_name) : DataType()
+{
+    id = p_opentype(loc, dtype_name.c_str());
 }
 
 //--------------------------------------------------------------------------
-// Function:	ArrayType::getArrayNDims
-///\brief	Returns the number of dimensions for an array datatype.
-///\return	Number of dimensions
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - May 2004
+// Function:    ArrayType::operator=
+///\brief       Assignment operator
+///\param       rhs - IN: Reference to the existing array datatype
+///\return      Reference to ArrayType instance
+///\exception   H5::DataTypeIException
+// Description
+//              Closes the id on the lhs object first with setId, then copies
+//              each data member from the rhs object. (Issue HDFFV-9562)
+// Programmer   Binh-Minh Ribler - Mar 2016
 //--------------------------------------------------------------------------
-int ArrayType::getArrayNDims()
+ArrayType &
+ArrayType::operator=(const ArrayType &rhs)
 {
-   // If the array's rank has not been stored, i.e. rank is init to -1,
-   // retrieve it via the C API
-   if (rank < 0)
-   {
-      rank = H5Tget_array_ndims(id);
-      if (rank < 0)
-      {
-         throw DataTypeIException("ArrayType::getArrayNDims", "H5Tget_array_ndims failed");
-      }
-   }
-   return(rank);
+    if (this != &rhs) {
+        // handling references to this id
+        try {
+            setId(rhs.id);
+            // Note: a = b, so there are two objects with the same hdf5 id
+            // that's why incRefCount is needed, and it is called by setId
+        }
+        catch (Exception &close_error) {
+            throw DataTypeIException(inMemFunc("operator="), close_error.getDetailMsg());
+        }
+    }
+    return (*this);
 }
 
 //--------------------------------------------------------------------------
-// Function:	ArrayType::getArrayDims
-///\brief	Retrieves the size of all dimensions of an array datatype.
-///\param	dims - OUT: Sizes of dimensions
-///\return	Number of dimensions
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - May 2004
+// Function:    ArrayType::decode
+///\brief       Returns an ArrayType object via DataType* by decoding the
+///             binary object description of this type.
+///
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - Aug 2017
 //--------------------------------------------------------------------------
-int ArrayType::getArrayDims(hsize_t* dims)
+DataType *
+ArrayType::decode() const
 {
-   // If the array's dimensions have not been stored, retrieve them via C API
-   if (dimensions == NULL)
-   {
-      int ndims = H5Tget_array_dims2(id, dims);
-      if (ndims < 0)
-         throw DataTypeIException("ArrayType::getArrayDims", "H5Tget_array_dims2 failed");
-      // Store the array's info in memory
-      rank = ndims;
-      dimensions = new hsize_t[rank];
-      for (int i = 0; i < rank; i++)
-         dimensions[i] = dims[i];
-   }
-   // Otherwise, simply copy what's in 'dimensions' to 'dims'
-   for (int i = 0; i < rank; i++)
-      dims[i] = dimensions[i];
-   return(rank);
+    hid_t encoded_arrtype_id = H5I_INVALID_HID;
+    try {
+        encoded_arrtype_id = p_decode();
+    }
+    catch (DataTypeIException &err) {
+        throw;
+    }
+    ArrayType *encoded_arrtype = new ArrayType;
+    encoded_arrtype->p_setId(encoded_arrtype_id);
+    return (encoded_arrtype);
+}
+
+//--------------------------------------------------------------------------
+// Function:    ArrayType::getArrayNDims
+///\brief       Returns the number of dimensions for an array datatype.
+///\return      Number of dimensions
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - May 2004
+//--------------------------------------------------------------------------
+int
+ArrayType::getArrayNDims() const
+{
+    // Get the rank of the array type specified by id from the C API
+    int ndims = H5Tget_array_ndims(id);
+    if (ndims < 0) {
+        throw DataTypeIException("ArrayType::getArrayNDims", "H5Tget_array_ndims failed");
+    }
+
+    return (ndims);
+}
+
+//--------------------------------------------------------------------------
+// Function:    ArrayType::getArrayDims
+///\brief       Retrieves the size of all dimensions of an array datatype.
+///\param       dims - OUT: Sizes of dimensions
+///\return      Number of dimensions
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - May 2004
+//--------------------------------------------------------------------------
+int
+ArrayType::getArrayDims(hsize_t *dims) const
+{
+    // Get the dimensions
+    int ndims = H5Tget_array_dims2(id, dims);
+    if (ndims < 0)
+        throw DataTypeIException("ArrayType::getArrayDims", "H5Tget_array_dims2 failed");
+
+    // Return the number of dimensions
+    return (ndims);
 }
 
 //--------------------------------------------------------------------------
-// Function:	ArrayType destructor
-///\brief	Properly terminates access to this array datatype.
-// Programmer	Binh-Minh Ribler - May 2004
+// Function:    ArrayType destructor
+///\brief       Properly terminates access to this array datatype.
+// Programmer   Binh-Minh Ribler - May 2004
 //--------------------------------------------------------------------------
 ArrayType::~ArrayType()
 {
-   // Free allocated memory
-   if (dimensions != NULL)
-      delete []dimensions;
 }
 
-#ifndef H5_NO_NAMESPACE
-} // end namespace
-#endif
+} // namespace H5
diff --git a/c++/src/H5ArrayType.h b/c++/src/H5ArrayType.h
index 511126e..e9afb9c 100644
--- a/c++/src/H5ArrayType.h
+++ b/c++/src/H5ArrayType.h
@@ -1,63 +1,71 @@
 // C++ informative line for the emacs editor: -*- C++ -*-
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5ArrayType_H
-#define __H5ArrayType_H
+#ifndef H5ArrayType_H
+#define H5ArrayType_H
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#endif
 
 /*! \class ArrayType
     \brief Class ArrayType inherits from DataType and provides wrappers for
      the HDF5's Array Datatypes.
 */
+// Inheritance: DataType -> H5Object -> H5Location -> IdComponent
 class H5_DLLCPP ArrayType : public DataType {
-   public:
-	// Constructor that creates a new array data type based on the
-	// specified base type.
-	ArrayType(const DataType& base_type, int ndims, const hsize_t* dims);
+  public:
+    // Constructor that creates a new array data type based on the
+    // specified base type.
+    ArrayType(const DataType &base_type, int ndims, const hsize_t *dims);
 
-	// Returns the number of dimensions of this array datatype.
-	int getArrayNDims();
+    // Assignment operator
+    ArrayType &operator=(const ArrayType &rhs);
 
-	// Returns the sizes of dimensions of this array datatype.
-	int getArrayDims(hsize_t* dims);
+    // Constructors that open an array datatype, given a location.
+    ArrayType(const H5Location &loc, const char *name);
+    ArrayType(const H5Location &loc, const H5std_string &name);
 
-	///\brief Returns this class name.
-	virtual H5std_string fromClass () const { return("ArrayType"); }
+    // Returns an ArrayType object via DataType* by decoding the
+    // binary object description of this type.
+    virtual DataType *decode() const override;
 
-	// Copy constructor: makes copy of the original object.
-	ArrayType( const ArrayType& original );
+    // Returns the number of dimensions of this array datatype.
+    int getArrayNDims() const;
+    // int getArrayNDims(); // removed 1.8.18 and 1.10.1
 
-	// Constructor that takes an existing id
-	ArrayType( const hid_t existing_id );
+    // Returns the sizes of dimensions of this array datatype.
+    int getArrayDims(hsize_t *dims) const;
+    // int getArrayDims(hsize_t* dims); // removed 1.8.18 and 1.10.1
 
-	// Noop destructor
-	virtual ~ArrayType();
+    ///\brief Returns this class name.
+    virtual H5std_string
+    fromClass() const override
+    {
+        return ("ArrayType");
+    }
 
-   protected:
-	// Default constructor
-	ArrayType();
+    // Copy constructor: same as the original ArrayType.
+    ArrayType(const ArrayType &original);
 
-   private:
-	int rank;		// Rank of the array
-	hsize_t* dimensions;	// Sizes of the array dimensions
-};
-#ifndef H5_NO_NAMESPACE
-}
-#endif
-#endif // __H5ArrayType_H
+    // Constructor that takes an existing id
+    ArrayType(const hid_t existing_id);
+
+    // Noop destructor
+    virtual ~ArrayType() override;
+
+    // Default constructor
+    ArrayType();
+
+}; // end of ArrayType
+} // namespace H5
+
+#endif // H5ArrayType_H
diff --git a/c++/src/H5AtomType.cpp b/c++/src/H5AtomType.cpp
index 09f762f..8f50317 100644
--- a/c++/src/H5AtomType.cpp
+++ b/c++/src/H5AtomType.cpp
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <string>
@@ -19,281 +16,288 @@
 #include "H5Exception.h"
 #include "H5IdComponent.h"
 #include "H5PropList.h"
-#include "H5Object.h"
+#include "H5OcreatProp.h"
 #include "H5DcreatProp.h"
-#include "H5CommonFG.h"
+#include "H5LcreatProp.h"
+#include "H5LaccProp.h"
+#include "H5DaccProp.h"
+#include "H5Location.h"
+#include "H5Object.h"
 #include "H5DataType.h"
 #include "H5AtomType.h"
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#endif
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 //--------------------------------------------------------------------------
-// Function:	AtomType default constructor [protected]
-// Purpose	Default constructor: creates a stub atomic datatype.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    AtomType default constructor [protected]
+// Purpose      Default constructor: creates a stub atomic datatype.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-AtomType::AtomType() : DataType() {}
+AtomType::AtomType() : DataType()
+{
+}
 
 //--------------------------------------------------------------------------
-// Function:	AtomType overloaded constructor [protected]
-// Purpose	Creates an AtomType object using an existing id.
-// Parameter	existing_id - IN: Id of an existing datatype
-// Exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    AtomType overloaded constructor [protected]
+// Purpose      Creates an AtomType object using an existing id.
+// Parameter    existing_id - IN: Id of an existing datatype
+// Exception    H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-AtomType::AtomType( const hid_t existing_id ) : DataType( existing_id ) {}
+AtomType::AtomType(const hid_t existing_id) : DataType(existing_id)
+{
+}
 
 //--------------------------------------------------------------------------
-// Function:	AtomType copy constructor
-///\brief	Copy constructor: makes a copy of the original AtomType object.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    AtomType copy constructor
+///\brief       Copy constructor: same HDF5 object as \a original
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-AtomType::AtomType( const AtomType& original ) : DataType( original ) {}
+AtomType::AtomType(const AtomType &original) : DataType(original)
+{
+}
 #endif // DOXYGEN_SHOULD_SKIP_THIS
 
 //--------------------------------------------------------------------------
-// Function:	AtomType::setSize
-///\brief	Sets the total size for an atomic datatype.
-///\param	size - IN: Size to set
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    AtomType::setSize
+///\brief       Sets the total size for an atomic datatype.
+///\param       size - IN: Size to set
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void AtomType::setSize( size_t size ) const
+void
+AtomType::setSize(size_t size) const
 {
-   // Call C routine H5Tset_size to set the total size
-   herr_t ret_value = H5Tset_size( id, size );
-   if( ret_value < 0 )
-   {
-      throw DataTypeIException(inMemFunc("setSize"), "H5Tset_size failed");
-   }
+    // Call C routine H5Tset_size to set the total size
+    herr_t ret_value = H5Tset_size(id, size);
+    if (ret_value < 0) {
+        throw DataTypeIException(inMemFunc("setSize"), "H5Tset_size failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	AtomType::getOrder
-///\brief	Returns the byte order of an atomic datatype.
-///\return	Byte order, which can be:
-///		\li \c H5T_ORDER_LE
-///		\li \c H5T_ORDER_BE
-///		\li \c H5T_ORDER_VAX
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - Mar, 2005
+// Function:    AtomType::getOrder
+///\brief       Returns the byte order of an atomic datatype.
+///\return      Byte order, which can be:
+///             \li \c H5T_ORDER_LE
+///             \li \c H5T_ORDER_BE
+///             \li \c H5T_ORDER_VAX
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - Mar, 2005
 //--------------------------------------------------------------------------
-H5T_order_t AtomType::getOrder() const
+H5T_order_t
+AtomType::getOrder() const
 {
-   // Call C routine to get the byte ordering
-   H5T_order_t type_order = H5Tget_order( id );
+    // Call C routine to get the byte ordering
+    H5T_order_t type_order = H5Tget_order(id);
 
-   // return a byte order constant if successful
-   if( type_order == H5T_ORDER_ERROR )
-   {
-      throw DataTypeIException(inMemFunc("getOrder"),
-		"H5Tget_order returns H5T_ORDER_ERROR");
-   }
-   return( type_order );
+    // return a byte order constant if successful
+    if (type_order == H5T_ORDER_ERROR) {
+        throw DataTypeIException(inMemFunc("getOrder"), "H5Tget_order returns H5T_ORDER_ERROR");
+    }
+    return (type_order);
 }
 
 //--------------------------------------------------------------------------
-// Function:	AtomType::getOrder
-///\brief	This is an overloaded member function, provided for convenience.
-///		It takes a reference to a \c H5std_string for the buffer that
-///		provide the text description of the returned byte order.
-///		The text description can be either of the following:
-///		"Little endian byte ordering (0)";
-///		"Big endian byte ordering (1)";
-///		"VAX mixed byte ordering (2)";
-///\param	order_string - OUT: Text description of the returned byte order
-///\return	Byte order, which can be:
-///		\li \c H5T_ORDER_LE
-///		\li \c H5T_ORDER_BE
-///		\li \c H5T_ORDER_VAX
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    AtomType::getOrder
+///\brief       This is an overloaded member function, provided for convenience.
+///             It takes a reference to a \c H5std_string for the buffer that
+///             provide the text description of the returned byte order.
+///             The text description can be either of the following:
+///             "Little endian byte ordering (0)";
+///             "Big endian byte ordering (1)";
+///             "VAX mixed byte ordering (2)";
+///\param       order_string - OUT: Text description of the returned byte order
+///\return      Byte order, which can be:
+///             \li \c H5T_ORDER_LE
+///             \li \c H5T_ORDER_BE
+///             \li \c H5T_ORDER_VAX
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-H5T_order_t AtomType::getOrder( H5std_string& order_string ) const
+H5T_order_t
+AtomType::getOrder(H5std_string &order_string) const
 {
-   // Call the overloaded to get the type order without text
-   H5T_order_t type_order = getOrder();
+    // Call the overloaded to get the type order without text
+    H5T_order_t type_order = getOrder();
 
-   // Then provide the text and return the type order
-   if( type_order == H5T_ORDER_LE )
-      order_string = "Little endian byte ordering (0)";
-   else if( type_order == H5T_ORDER_BE )
-      order_string = "Big endian byte ordering (1)";
-   else if( type_order == H5T_ORDER_VAX )
-      order_string = "VAX mixed byte ordering (2)";
-   return( type_order );
+    // Then provide the text and return the type order
+    if (type_order == H5T_ORDER_LE)
+        order_string = "Little endian byte ordering (0)";
+    else if (type_order == H5T_ORDER_BE)
+        order_string = "Big endian byte ordering (1)";
+    else if (type_order == H5T_ORDER_VAX)
+        order_string = "VAX mixed byte ordering (2)";
+    return (type_order);
 }
 
 //--------------------------------------------------------------------------
-// Function:	AtomType::setOrder
-///\brief	Sets the byte ordering of an atomic datatype.
-///\param	order - IN: Byte ordering constant, which can be:
-///		\li \c H5T_ORDER_LE
-///		\li \c H5T_ORDER_BE
-///		\li \c H5T_ORDER_VAX
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    AtomType::setOrder
+///\brief       Sets the byte ordering of an atomic datatype.
+///\param       order - IN: Byte ordering constant, which can be:
+///             \li \c H5T_ORDER_LE
+///             \li \c H5T_ORDER_BE
+///             \li \c H5T_ORDER_VAX
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void AtomType::setOrder( H5T_order_t order ) const
+void
+AtomType::setOrder(H5T_order_t order) const
 {
-   // Call C routine to set the byte ordering
-   herr_t ret_value = H5Tset_order( id, order );
-   if( ret_value < 0 )
-   {
-      throw DataTypeIException(inMemFunc("setOrder"), "H5Tset_order failed");
-   }
+    // Call C routine to set the byte ordering
+    herr_t ret_value = H5Tset_order(id, order);
+    if (ret_value < 0) {
+        throw DataTypeIException(inMemFunc("setOrder"), "H5Tset_order failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	AtomType::getPrecision
-///\brief	Returns the precision of an atomic datatype.
-///\return	Number of significant bits
-///\exception	H5::DataTypeIException
+// Function:    AtomType::getPrecision
+///\brief       Returns the precision of an atomic datatype.
+///\return      Number of significant bits
+///\exception   H5::DataTypeIException
 ///\par Description
-///		The precision is the number of significant bits which,
-///		unless padding is present, is 8 times larger than the
-///		value returned by \c DataType::getSize().
-// Programmer	Binh-Minh Ribler - 2000
+///             The precision is the number of significant bits which,
+///             unless padding is present, is 8 times larger than the
+///             value returned by \c DataType::getSize().
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-size_t AtomType::getPrecision() const
+size_t
+AtomType::getPrecision() const
 {
-   size_t num_signi_bits = H5Tget_precision( id );  // C routine
+    size_t num_signi_bits = H5Tget_precision(id); // C routine
 
-   // returns number of significant bits if successful
-   if( num_signi_bits == 0 )
-   {
-      throw DataTypeIException(inMemFunc("getPrecision"),
-		"H5Tget_precision returns invalid number of significant bits");
-   }
-   return( num_signi_bits );
+    // returns number of significant bits if successful
+    if (num_signi_bits == 0) {
+        throw DataTypeIException(inMemFunc("getPrecision"),
+                                 "H5Tget_precision returns invalid number of significant bits");
+    }
+    return (num_signi_bits);
 }
 
 //--------------------------------------------------------------------------
-// Function:	AtomType::setPrecision
-///\brief	Sets the precision of an atomic datatype.
-///\param	precision - IN: Number of bits of precision
-///\exception	H5::DataTypeIException
+// Function:    AtomType::setPrecision
+///\brief       Sets the precision of an atomic datatype.
+///\param       precision - IN: Number of bits of precision
+///\exception   H5::DataTypeIException
 ///\par Description
-///		For information, please see C layer Reference Manuat at:
-/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5T.html#Datatype-SetPrecision
-// Programmer	Binh-Minh Ribler - 2000
+///             For information, please refer to the H5Tset_precision API in
+///             the HDF5 C Reference Manual.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void AtomType::setPrecision( size_t precision ) const
+void
+AtomType::setPrecision(size_t precision) const
 {
-   // Call C routine to set the datatype precision
-   herr_t ret_value = H5Tset_precision( id, precision );
-   if( ret_value < 0 )
-   {
-      throw DataTypeIException(inMemFunc("setPrecision"), "H5Tset_precision failed");
-   }
+    // Call C routine to set the datatype precision
+    herr_t ret_value = H5Tset_precision(id, precision);
+    if (ret_value < 0) {
+        throw DataTypeIException(inMemFunc("setPrecision"), "H5Tset_precision failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	AtomType::getOffset
-///\brief	Retrieves the bit offset of the first significant bit.
-///\return	Offset value
-///\exception	H5::DataTypeIException
+// Function:    AtomType::getOffset
+///\brief       Retrieves the bit offset of the first significant bit.
+///\return      Offset value
+///\exception   H5::DataTypeIException
 ///\par Description
-///		For information, please see C layer Reference Manuat at:
-/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5T.html#Datatype-GetOffset
-// Programmer	Binh-Minh Ribler - 2000
+///             For information, please refer to the H5Tget_offset API in
+///             the HDF5 C Reference Manual.
+// Programmer   Binh-Minh Ribler - 2000
 // Modification
-//		12/05/00: due to C API change
-//			- return type changed from size_t to int
-//			- offset = -1 when failure occurs vs. 0
+//              12/05/00: due to C API change
+//                  - return type changed from size_t to int
+//                  - offset = -1 when failure occurs vs. 0
 //--------------------------------------------------------------------------
-int AtomType::getOffset() const
+int
+AtomType::getOffset() const
 {
-   int offset = H5Tget_offset( id );  // C routine
+    int offset = H5Tget_offset(id); // C routine
 
-   // returns a non-negative offset value if successful
-   if( offset == -1 )
-   {
-      throw DataTypeIException(inMemFunc("getOffset"),
-		"H5Tget_offset returns a negative offset value");
-   }
-   return( offset );
+    // returns a non-negative offset value if successful
+    if (offset == -1) {
+        throw DataTypeIException(inMemFunc("getOffset"), "H5Tget_offset returns a negative offset value");
+    }
+    return (offset);
 }
 
 //--------------------------------------------------------------------------
-// Function:	AtomType::setOffset
-///\brief	Sets the bit offset of the first significant bit.
-///\param	offset - IN: Offset of first significant bit
-///\exception	H5::DataTypeIException
+// Function:    AtomType::setOffset
+///\brief       Sets the bit offset of the first significant bit.
+///\param       offset - IN: Offset of first significant bit
+///\exception   H5::DataTypeIException
 ///\par Description
-///		For information, please see C layer Reference Manuat at:
-/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5T.html#Datatype-SetOffset
-// Programmer	Binh-Minh Ribler - 2000
+///             For information, please refer to the H5Tset_offset API in
+///             the HDF5 C Reference Manual.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void AtomType::setOffset( size_t offset ) const
+void
+AtomType::setOffset(size_t offset) const
 {
-   // Call C routine to set the bit offset
-   herr_t ret_value = H5Tset_offset( id, offset );
-   if( ret_value < 0 )
-   {
-      throw DataTypeIException(inMemFunc("setOffset"), "H5Tset_offset failed");
-   }
+    // Call C routine to set the bit offset
+    herr_t ret_value = H5Tset_offset(id, offset);
+    if (ret_value < 0) {
+        throw DataTypeIException(inMemFunc("setOffset"), "H5Tset_offset failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	AtomType::getPad
-///\brief	Retrieves the padding type of the least and most-significant
-///		bit padding.
-///\param	lsb - OUT: Least-significant bit padding type
-///\param	msb - OUT: Most-significant bit padding type
-///\exception	H5::DataTypeIException
+// Function:    AtomType::getPad
+///\brief       Retrieves the padding type of the least and most-significant
+///             bit padding.
+///\param       lsb - OUT: Least-significant bit padding type
+///\param       msb - OUT: Most-significant bit padding type
+///\exception   H5::DataTypeIException
 ///\par Description
-///		Possible values for \a lsb and \a msb include:
-///		\li \c H5T_PAD_ZERO (0) - Set background to zeros.
-///		\li \c H5T_PAD_ONE (1) - Set background to ones.
-///		\li \c H5T_PAD_BACKGROUND (2) - Leave background alone.
-// Programmer	Binh-Minh Ribler - 2000
+///             Possible values for \a lsb and \a msb include:
+///             \li \c H5T_PAD_ZERO (0) - Set background to zeros.
+///             \li \c H5T_PAD_ONE (1) - Set background to ones.
+///             \li \c H5T_PAD_BACKGROUND (2) - Leave background alone.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void AtomType::getPad( H5T_pad_t& lsb, H5T_pad_t& msb ) const
+void
+AtomType::getPad(H5T_pad_t &lsb, H5T_pad_t &msb) const
 {
-   // Call C routine to get the padding type
-   herr_t ret_value = H5Tget_pad( id, &lsb, &msb );
-   if( ret_value < 0 )
-   {
-      throw DataTypeIException(inMemFunc("getPad"), "H5Tget_pad failed");
-   }
+    // Call C routine to get the padding type
+    herr_t ret_value = H5Tget_pad(id, &lsb, &msb);
+    if (ret_value < 0) {
+        throw DataTypeIException(inMemFunc("getPad"), "H5Tget_pad failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	AtomType::setPad
-///\brief	Sets the least and most-significant bits padding types.
-///\param	lsb - IN: Least-significant bit padding type
-///\param	msb - IN: Most-significant bit padding type
-///\exception	H5::DataTypeIException
+// Function:    AtomType::setPad
+///\brief       Sets the least and most-significant bits padding types.
+///\param       lsb - IN: Least-significant bit padding type
+///\param       msb - IN: Most-significant bit padding type
+///\exception   H5::DataTypeIException
 ///\par Description
-///		Valid values for \a lsb and \a msb include:
-///		\li \c H5T_PAD_ZERO (0) - Set background to zeros.
-///		\li \c H5T_PAD_ONE (1) - Set background to ones.
-///		\li \c H5T_PAD_BACKGROUND (2) - Leave background alone.
-// Programmer	Binh-Minh Ribler - 2000
+///             Valid values for \a lsb and \a msb include:
+///             \li \c H5T_PAD_ZERO (0) - Set background to zeros.
+///             \li \c H5T_PAD_ONE (1) - Set background to ones.
+///             \li \c H5T_PAD_BACKGROUND (2) - Leave background alone.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void AtomType::setPad( H5T_pad_t lsb, H5T_pad_t msb ) const
+void
+AtomType::setPad(H5T_pad_t lsb, H5T_pad_t msb) const
 {
-   // Call C routine to set the padding type
-   herr_t ret_value = H5Tset_pad( id, lsb, msb );
-   if( ret_value < 0 )
-   {
-      throw DataTypeIException(inMemFunc("setPad"), "H5Tset_pad failed");
-   }
+    // Call C routine to set the padding type
+    herr_t ret_value = H5Tset_pad(id, lsb, msb);
+    if (ret_value < 0) {
+        throw DataTypeIException(inMemFunc("setPad"), "H5Tset_pad failed");
+    }
 }
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 //--------------------------------------------------------------------------
-// Function:	AtomType destructor
-///\brief	Noop destructor.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    AtomType destructor
+///\brief       Noop destructor.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-AtomType::~AtomType() {}
+AtomType::~AtomType()
+{
+}
 #endif // DOXYGEN_SHOULD_SKIP_THIS
 
-#ifndef H5_NO_NAMESPACE
-} // end namespace
-#endif
+} // namespace H5
diff --git a/c++/src/H5AtomType.h b/c++/src/H5AtomType.h
index 792312a..bb2cf48 100644
--- a/c++/src/H5AtomType.h
+++ b/c++/src/H5AtomType.h
@@ -1,25 +1,20 @@
 // C++ informative line for the emacs editor: -*- C++ -*-
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5AtomType_H
-#define __H5AtomType_H
+#ifndef H5AtomType_H
+#define H5AtomType_H
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#endif
 
 /*! \class AtomType
     \brief AtomType is a base class, inherited by IntType, FloatType,
@@ -28,58 +23,63 @@ namespace H5 {
     AtomType provides operations on HDF5 atomic datatypes.  It also inherits
     from DataType.
 */
+// Inheritance: DataType -> H5Object -> H5Location -> IdComponent
 class H5_DLLCPP AtomType : public DataType {
-   public:
-	// Returns the byte order of an atomic datatype.
-	H5T_order_t getOrder() const;
-	H5T_order_t getOrder( H5std_string& order_string ) const;
+  public:
+    // Returns the byte order of an atomic datatype.
+    H5T_order_t getOrder() const;
+    H5T_order_t getOrder(H5std_string &order_string) const;
 
-	// Sets the byte ordering of an atomic datatype.
-	void setOrder( H5T_order_t order ) const;
+    // Sets the byte ordering of an atomic datatype.
+    void setOrder(H5T_order_t order) const;
 
-	// Retrieves the bit offset of the first significant bit.
-	// 12/05/00 - changed return type to int from size_t - C API
-	int getOffset() const;
+    // Retrieves the bit offset of the first significant bit.
+    // 12/05/00 - changed return type to int from size_t - C API
+    int getOffset() const;
 
-	// Sets the bit offset of the first significant bit.
-	void setOffset( size_t offset ) const;
+    // Sets the bit offset of the first significant bit.
+    void setOffset(size_t offset) const;
 
-	// Retrieves the padding type of the least and most-significant bit padding.
-	void getPad( H5T_pad_t& lsb, H5T_pad_t& msb ) const;
+    // Retrieves the padding type of the least and most-significant bit padding.
+    void getPad(H5T_pad_t &lsb, H5T_pad_t &msb) const;
 
-	// Sets the least and most-significant bits padding types
-	void setPad( H5T_pad_t lsb, H5T_pad_t msb ) const;
+    // Sets the least and most-significant bits padding types
+    void setPad(H5T_pad_t lsb, H5T_pad_t msb) const;
 
-	// Returns the precision of an atomic datatype.
-	size_t getPrecision() const;
+    // Returns the precision of an atomic datatype.
+    size_t getPrecision() const;
 
-	// Sets the precision of an atomic datatype.
-	void setPrecision( size_t precision ) const;
+    // Sets the precision of an atomic datatype.
+    void setPrecision(size_t precision) const;
 
-	// Sets the total size for an atomic datatype.
-	void setSize( size_t size ) const;
+    // Sets the total size for an atomic datatype.
+    void setSize(size_t size) const;
 
-	///\brief Returns this class name.
-	virtual H5std_string fromClass () const { return("AtomType"); }
+    ///\brief Returns this class name.
+    virtual H5std_string
+    fromClass() const override
+    {
+        return ("AtomType");
+    }
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
-	// Copy constructor - makes copy of the original object
-	AtomType( const AtomType& original );
+    // Copy constructor: same as the original AtomType.
+    AtomType(const AtomType &original);
 
-	// Noop destructor
-	virtual ~AtomType();
+    // Noop destructor
+    virtual ~AtomType() override;
 #endif // DOXYGEN_SHOULD_SKIP_THIS
 
-   protected:
+  protected:
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
-	// Default constructor
-	AtomType();
+    // Default constructor
+    AtomType();
 
-	// Constructor that takes an existing id
-	AtomType( const hid_t existing_id );
+    // Constructor that takes an existing id
+    AtomType(const hid_t existing_id);
 #endif // DOXYGEN_SHOULD_SKIP_THIS
-};
-#ifndef H5_NO_NAMESPACE
-}
-#endif
-#endif // __H5AtomType_H
+
+}; // end of AtomType
+} // namespace H5
+
+#endif // H5AtomType_H
diff --git a/c++/src/H5Attribute.cpp b/c++/src/H5Attribute.cpp
index 6b5c753..d2898f5 100644
--- a/c++/src/H5Attribute.cpp
+++ b/c++/src/H5Attribute.cpp
@@ -1,560 +1,513 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifdef OLD_HEADER_FILENAME
-#include <iostream.h>
-#else
+#include <cstdlib>
 #include <iostream>
-#endif
 #include <string>
 
 #include "H5Include.h"
 #include "H5Exception.h"
 #include "H5IdComponent.h"
 #include "H5PropList.h"
-#include "H5Object.h"
-#include "H5AbstractDs.h"
 #include "H5FaccProp.h"
 #include "H5FcreatProp.h"
+#include "H5OcreatProp.h"
 #include "H5DcreatProp.h"
-#include "H5CommonFG.h"
+#include "H5LcreatProp.h"
+#include "H5LaccProp.h"
+#include "H5DaccProp.h"
+#include "H5Location.h"
+#include "H5Object.h"
+#include "H5AbstractDs.h"
 #include "H5DataType.h"
 #include "H5DataSpace.h"
-#include "H5File.h"
 #include "H5Attribute.h"
-#include "H5private.h"		// for HDfree
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#ifndef H5_NO_STD
-    using std::cerr;
-    using std::endl;
-#endif  // H5_NO_STD
-#endif
+using std::cerr;
+using std::endl;
+
+class H5Object; // forward declaration for UserData4Aiterate
 
-class H5_DLLCPP H5Object;  // forward declaration for UserData4Aiterate
 //--------------------------------------------------------------------------
-// Function:	Attribute default constructor
-///\brief	Default constructor: Creates a stub attribute
-// Programmer	Binh-Minh Ribler - May, 2004
+// Function:    Attribute default constructor
+///\brief       Default constructor: Creates a stub attribute
+// Programmer   Binh-Minh Ribler - May, 2004
 //--------------------------------------------------------------------------
-Attribute::Attribute() : AbstractDs(), IdComponent(), id(H5I_INVALID_HID) {}
+Attribute::Attribute() : AbstractDs(), H5Location(), id(H5I_INVALID_HID)
+{
+}
 
 //--------------------------------------------------------------------------
-// Function:	Attribute copy constructor
-///\brief	Copy constructor: makes a copy of the original Attribute object.
-///\param	original  - IN: Original Attribute object to copy
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    Attribute copy constructor
+///\brief       Copy constructor: same HDF5 object as \a original
+///\param       original  - IN: Original Attribute object to copy
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-Attribute::Attribute(const Attribute& original) : AbstractDs(), IdComponent()
+Attribute::Attribute(const Attribute &original) : AbstractDs(), H5Location(), id(original.id)
 {
-    id = original.getId();
     incRefCount(); // increment number of references to this id
 }
 
 //--------------------------------------------------------------------------
-// Function:	Attribute overloaded constructor
-///\brief	Creates an Attribute object using the id of an existing
-///		attribute.
-///\param	existing_id - IN: Id of an existing attribute
-///\exception	H5::AttributeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    Attribute overloaded constructor
+///\brief       Creates an Attribute object using the id of an existing
+///             attribute.
+///\param       existing_id - IN: Id of an existing attribute
+///\exception   H5::AttributeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-Attribute::Attribute(const hid_t existing_id) : AbstractDs(), IdComponent()
+Attribute::Attribute(const hid_t existing_id) : AbstractDs(), H5Location(), id(existing_id)
 {
-   id = existing_id;
+    incRefCount(); // increment number of references to this id
 }
 
 //--------------------------------------------------------------------------
-// Function:	Attribute::write
-///\brief	Writes data to this attribute.
-///\param	mem_type  - IN: Attribute datatype (in memory)
-///\param	buf       - IN: Data to be written
-///\exception	H5::AttributeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    Attribute::write
+///\brief       Writes data to this attribute.
+///\param       mem_type  - IN: Attribute datatype (in memory)
+///\param       buf       - IN: Data to be written
+///\exception   H5::AttributeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void Attribute::write( const DataType& mem_type, const void *buf ) const
+void
+Attribute::write(const DataType &mem_type, const void *buf) const
 {
-   herr_t ret_value = H5Awrite( id, mem_type.getId(), buf );
-   if( ret_value < 0 )
-   {
-      throw AttributeIException("Attribute::write", "H5Awrite failed");
-   }
+    herr_t ret_value = H5Awrite(id, mem_type.getId(), buf);
+    if (ret_value < 0) {
+        throw AttributeIException("Attribute::write", "H5Awrite failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	Attribute::write
-///\brief	This is an overloaded member function, provided for convenience.
-///		It writes a \a H5std_string to this attribute.
-///\param	mem_type  - IN: Attribute datatype (in memory)
-///\param	strg      - IN: Data to be written
-///\exception	H5::AttributeIException
-// Programmer	Binh-Minh Ribler - Apr, 2003
+// Function:    Attribute::write
+///\brief       This is an overloaded member function, provided for convenience.
+///             It writes a \a H5std_string to this attribute.
+///\param       mem_type  - IN: Attribute datatype (in memory)
+///\param       strg      - IN: Data to be written
+///\exception   H5::AttributeIException
+// Programmer   Binh-Minh Ribler - Apr, 2003
 //--------------------------------------------------------------------------
-void Attribute::write(const DataType& mem_type, const H5std_string& strg) const
+void
+Attribute::write(const DataType &mem_type, const H5std_string &strg) const
 {
     // Check if this attribute has variable-len string or fixed-len string and
     // proceed appropriately.
     htri_t is_variable_len = H5Tis_variable_str(mem_type.getId());
-    if (is_variable_len < 0)
-    {
-	throw AttributeIException("Attribute::write", "H5Tis_variable_str failed");
+    if (is_variable_len < 0) {
+        throw AttributeIException("Attribute::write", "H5Tis_variable_str failed");
     }
     // Convert string to C-string
-    const char* strg_C;
-    strg_C = strg.c_str();  // strg_C refers to the contents of strg as a C-str
+    const char *strg_C;
+    strg_C           = strg.c_str(); // strg_C refers to the contents of strg as a C-str
     herr_t ret_value = 0;
 
     // Pass string in differently depends on variable or fixed length
-    if (!is_variable_len)
-    {
-	ret_value = H5Awrite(id, mem_type.getId(), strg_C);
+    if (!is_variable_len) {
+        ret_value = H5Awrite(id, mem_type.getId(), strg_C);
     }
-    else
-    {
-	// passing third argument by address
-	ret_value = H5Awrite(id, mem_type.getId(), &strg_C);
+    else {
+        // passing third argument by address
+        ret_value = H5Awrite(id, mem_type.getId(), &strg_C);
     }
-    if (ret_value < 0)
-    {
-	throw AttributeIException("Attribute::write", "H5Awrite failed");
+    if (ret_value < 0) {
+        throw AttributeIException("Attribute::write", "H5Awrite failed");
     }
 }
 
 //--------------------------------------------------------------------------
-// Function:	Attribute::read
-///\brief	Reads data from this attribute.
-///\param	mem_type -  IN: Attribute datatype (in memory)
-///\param	buf      - OUT: Buffer for read data
-///\exception	H5::AttributeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    Attribute::read
+///\brief       Reads data from this attribute.
+///\param       mem_type -  IN: Attribute datatype (in memory)
+///\param       buf      - OUT: Buffer for read data
+///\exception   H5::AttributeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void Attribute::read( const DataType& mem_type, void *buf ) const
+void
+Attribute::read(const DataType &mem_type, void *buf) const
 {
-   herr_t ret_value = H5Aread( id, mem_type.getId(), buf );
-   if( ret_value < 0 )
-   {
-      throw AttributeIException("Attribute::read", "H5Aread failed");
-   }
+    herr_t ret_value = H5Aread(id, mem_type.getId(), buf);
+    if (ret_value < 0) {
+        throw AttributeIException("Attribute::read", "H5Aread failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	Attribute::read
-///\brief	This is an overloaded member function, provided for convenience.
-///		It reads a \a H5std_string from this attribute.
-///\param	mem_type  - IN: Attribute datatype (in memory)
-///\param	strg      - IN: Buffer for read string
-///\exception	H5::AttributeIException
-// Programmer	Binh-Minh Ribler - Apr, 2003
+// Function:    Attribute::read
+///\brief       This is an overloaded member function, provided for convenience.
+///             It reads a \a H5std_string from this attribute.
+///\param       mem_type  - IN: Attribute datatype (in memory)
+///\param       strg      - IN: Buffer for read string
+///\exception   H5::AttributeIException
+// Programmer   Binh-Minh Ribler - Apr, 2003
 // Modification
-//	Mar 2008
-//		Corrected a misunderstanding that H5Aread would allocate
-//		space for the buffer.  Obtained the attribute size and
-//		allocated memory properly. -BMR
-//	Apr 2009
-//		Used getInMemDataSize to get attribute data size. -BMR
-//	Jul 2009
-//		Divided into specific private functions for fixed- and
-//		variable-len string data: p_read_fixed_len and
-//		p_read_variable_len.  This should improve readability. -BMR
-//--------------------------------------------------------------------------
-void Attribute::read(const DataType& mem_type, H5std_string& strg) const
+//      Mar 2008
+//              Corrected a misunderstanding that H5Aread would allocate
+//              space for the buffer.  Obtained the attribute size and
+//              allocated memory properly. -BMR
+//      Apr 2009
+//              Used getInMemDataSize to get attribute data size. -BMR
+//      Jul 2009
+//              Divided into specific private functions for fixed- and
+//              variable-len string data: p_read_fixed_len and
+//              p_read_variable_len.  This should improve readability. -BMR
+//--------------------------------------------------------------------------
+void
+Attribute::read(const DataType &mem_type, H5std_string &strg) const
 {
     // Check if this attribute has variable-len string or fixed-len string and
     // proceed appropriately.
     htri_t is_variable_len = H5Tis_variable_str(mem_type.getId());
-    if (is_variable_len < 0)
-    {
+    if (is_variable_len < 0) {
         throw AttributeIException("Attribute::read", "H5Tis_variable_str failed");
     }
 
-    if (!is_variable_len)       // only allocate for fixed-len string
+    if (!is_variable_len) // only allocate for fixed-len string
     {
         p_read_fixed_len(mem_type, strg);
     }
-    else
-    {
+    else {
         p_read_variable_len(mem_type, strg);
     }
 }
 
 //--------------------------------------------------------------------------
-// Function:	Attribute::getInMemDataSize
-///\brief	Gets the size in memory of the attribute's data.
-///\return	Size of data (in memory)
-///\exception	H5::AttributeIException
-// Programmer	Binh-Minh Ribler - Apr 2009
+// Function:    Attribute::getInMemDataSize
+///\brief       Gets the size in memory of the attribute's data.
+///\return      Size of data (in memory)
+///\exception   H5::AttributeIException
+// Programmer   Binh-Minh Ribler - Apr 2009
 //--------------------------------------------------------------------------
-size_t Attribute::getInMemDataSize() const
+size_t
+Attribute::getInMemDataSize() const
 {
     const char *func = "Attribute::getInMemDataSize";
 
     // Get the data type of this attribute
     hid_t mem_type_id = H5Aget_type(id);
-    if( mem_type_id < 0 )
-    {
-	throw AttributeIException(func, "H5Aget_type failed");
+    if (mem_type_id < 0) {
+        throw AttributeIException(func, "H5Aget_type failed");
     }
 
     // Get the data type's size by first getting its native type then getting
     // the native type's size.
     hid_t native_type = H5Tget_native_type(mem_type_id, H5T_DIR_DEFAULT);
-    if (native_type < 0)
-    {
-	throw AttributeIException(func, "H5Tget_native_type failed");
+    if (native_type < 0) {
+        throw AttributeIException(func, "H5Tget_native_type failed");
     }
     size_t type_size = H5Tget_size(native_type);
-    if (type_size == 0)
-    {
-	throw AttributeIException(func, "H5Tget_size failed");
+    if (type_size == 0) {
+        throw AttributeIException(func, "H5Tget_size failed");
     }
 
     // Close the native type and the datatype of this attribute.
-    if (H5Tclose(native_type) < 0)
-    {
-	throw DataSetIException(func, "H5Tclose(native_type) failed");
+    if (H5Tclose(native_type) < 0) {
+        throw DataSetIException(func, "H5Tclose(native_type) failed");
     }
-    if (H5Tclose(mem_type_id) < 0)
-    {
-	throw DataSetIException(func, "H5Tclose(mem_type_id) failed");
+    if (H5Tclose(mem_type_id) < 0) {
+        throw DataSetIException(func, "H5Tclose(mem_type_id) failed");
     }
 
     // Get number of elements of the attribute by first getting its dataspace
     // then getting the number of elements in the dataspace
     hid_t space_id = H5Aget_space(id);
-    if (space_id < 0)
-    {
-	throw AttributeIException(func, "H5Aget_space failed");
+    if (space_id < 0) {
+        throw AttributeIException(func, "H5Aget_space failed");
     }
     hssize_t num_elements = H5Sget_simple_extent_npoints(space_id);
-    if (num_elements < 0)
-    {
-	throw AttributeIException(func, "H5Sget_simple_extent_npoints failed");
+    if (num_elements < 0) {
+        throw AttributeIException(func, "H5Sget_simple_extent_npoints failed");
     }
 
     // Close the dataspace
-    if (H5Sclose(space_id) < 0)
-    {
-	throw DataSetIException(func, "H5Sclose failed");
+    if (H5Sclose(space_id) < 0) {
+        throw DataSetIException(func, "H5Sclose failed");
     }
 
     // Calculate and return the size of the data
-    size_t data_size = type_size * num_elements;
-    return(data_size);
-}
+    size_t data_size = type_size * static_cast<size_t>(num_elements);
 
-//--------------------------------------------------------------------------
-// Function:	Attribute::getSpace
-///\brief	Gets a copy of the dataspace for this attribute.
-///\return	Dataspace instance
-///\exception	H5::AttributeIException
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-DataSpace Attribute::getSpace() const
-{
-   // Calls C function H5Aget_space to get the id of the dataspace
-   hid_t dataspace_id = H5Aget_space( id );
-
-   // If the dataspace id is valid, create and return the DataSpace object
-   if( dataspace_id > 0 )
-   {
-      DataSpace dataspace( dataspace_id );
-      return( dataspace );
-   }
-   else
-   {
-      throw AttributeIException("Attribute::getSpace", "H5Aget_space failed");
-   }
+    return data_size;
 }
 
 //--------------------------------------------------------------------------
-// Function:	Attribute::getFileName
-///\brief	Gets the name of the file, in which this attribute belongs.
-///\return	File name
-///\exception	H5::IdComponentException
-// Programmer	Binh-Minh Ribler - Jul, 2004
+// Function:    Attribute::getSpace
+///\brief       Gets a copy of the dataspace for this attribute.
+///\return      Dataspace instance
+///\exception   H5::AttributeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-H5std_string Attribute::getFileName() const
+DataSpace
+Attribute::getSpace() const
 {
-   try {
-      return(p_get_file_name());
-   }
-   catch (IdComponentException E) {
-      throw FileIException("Attribute::getFileName", E.getDetailMsg());
-   }
+    // Calls C function H5Aget_space to get the id of the dataspace
+    hid_t dataspace_id = H5Aget_space(id);
+
+    // If the dataspace id is valid, create and return the DataSpace object
+    if (dataspace_id > 0) {
+        DataSpace dataspace;
+        f_DataSpace_setId(&dataspace, dataspace_id);
+        return (dataspace);
+    }
+    else {
+        throw AttributeIException("Attribute::getSpace", "H5Aget_space failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	Attribute::getName
-///\brief	Gets the name of this attribute, returning its length.
-///\param	attr_name - OUT: Buffer for the name string as char*
-///\param	buf_size  -  IN: Length of the buffer, default to 0
-///\return	Actual length of the attribute name
-///\exception	H5::AttributeIException
+// Function:    Attribute::getName
+///\brief       Gets the name of this attribute, returning its length.
+///\param       attr_name - OUT: Buffer for the name string as char*
+///\param       buf_size  -  IN: Length of the buffer, default to 0
+///\return      Actual length of the attribute name
+///\exception   H5::AttributeIException
 ///\par Description
-///		This function retrieves \a buf_size chars of the attribute's
-///		name including null termination.  Thus, if the actual length
-///		of the name is more than buf_size-1, the retrieved name will
-///		be truncated to accommodate the null terminator.
-///		To get length of the attribute's name for buffer allocation,
-///		an application can call this function passing in NULL for the
-///		first argument and ignore the second argument.
-// Programmer	Binh-Minh Ribler - Mar, 2014
-//--------------------------------------------------------------------------
-ssize_t Attribute::getName(char* attr_name, size_t buf_size) const
+///             This function retrieves \a buf_size chars of the attribute's
+///             name including null termination.  Thus, if the actual length
+///             of the name is more than buf_size-1, the retrieved name will
+///             be truncated to accommodate the null terminator.
+///             To get length of the attribute's name for buffer allocation,
+///             an application can call this function passing in NULL for the
+///             first argument and ignore the second argument.
+// Programmer   Binh-Minh Ribler - Mar, 2014
+//--------------------------------------------------------------------------
+ssize_t
+Attribute::getName(char *attr_name, size_t buf_size) const
 {
     // H5Aget_name will get buf_size-1 chars of the name to null terminate it
     ssize_t name_size = H5Aget_name(id, buf_size, attr_name);
 
     // If H5Aget_name returns a negative value, raise an exception
-    if (name_size < 0)
-    {
-	throw AttributeIException("Attribute::getName", "H5Aget_name failed");
+    if (name_size < 0) {
+        throw AttributeIException("Attribute::getName", "H5Aget_name failed");
     }
-    else if (name_size == 0)
-    {
-	throw AttributeIException("Attribute::getName", "Attribute must have a name, name length is 0");
+    else if (name_size == 0) {
+        throw AttributeIException("Attribute::getName", "Attribute must have a name, name length is 0");
     }
     // Return length of the name
-    return(name_size);
+    return (name_size);
 }
 
 //--------------------------------------------------------------------------
-// Function:	Attribute::getName
-///\brief	Returns the name of this attribute as an \a H5std_string.
-///\return	Name of the attribute
-///\exception	H5::AttributeIException
-// Programmer	Binh-Minh Ribler - May, 2004
+// Function:    Attribute::getName
+///\brief       Returns the name of this attribute as an \a H5std_string.
+///\return      Name of the attribute
+///\exception   H5::AttributeIException
+// Programmer   Binh-Minh Ribler - May, 2004
 // Modification
-//	Mar 2014 - BMR
-//		Revised to use the modified getName() above
+//      Mar 2014 - BMR
+//              Revised to use the modified getName() above
 //--------------------------------------------------------------------------
-H5std_string Attribute::getName() const
+H5std_string
+Attribute::getName() const
 {
-    H5std_string attr_name(""); // attribute name to return
+    H5std_string attr_name; // attribute name to return
 
     // Preliminary call to get the size of the attribute name
-    ssize_t name_size = H5Aget_name(id, (size_t)0, NULL);
+    ssize_t name_size = H5Aget_name(id, 0, NULL);
 
     // If H5Aget_name failed, throw exception
-    if (name_size < 0)
-    {
-	throw AttributeIException("Attribute::getName", "H5Aget_name failed");
+    if (name_size < 0) {
+        throw AttributeIException("Attribute::getName", "H5Aget_name failed");
     }
-    else if (name_size == 0)
-    {
-	throw AttributeIException("Attribute::getName", "Attribute must have a name, name length is 0");
+    else if (name_size == 0) {
+        throw AttributeIException("Attribute::getName", "Attribute must have a name, name length is 0");
     }
     // Attribute's name exists, retrieve it
-    else if (name_size > 0)
-    {
-        char* name_C = new char[name_size+1];  // temporary C-string
-        HDmemset(name_C, 0, name_size+1); // clear buffer
+    else if (name_size > 0) {
+        // The actual size is the cast value + 1 for the terminal ASCII NUL
+        // (unfortunate in/out type sign mismatch)
+        size_t actual_name_size = static_cast<size_t>(name_size) + 1;
+
+        // Create buffer for C string
+        char *name_C = new char[actual_name_size]();
 
         // Use overloaded function
-        name_size = getName(name_C, name_size+1);
+        name_size = getName(name_C, actual_name_size);
 
         // Convert the C attribute name to return
         attr_name = name_C;
 
         // Clean up resource
-        delete []name_C;
-
+        delete[] name_C;
     }
+
     // Return attribute's name
-    return(attr_name);
+    return attr_name;
 }
 
 //--------------------------------------------------------------------------
-// Function:	Attribute::getName
-///\brief	This is an overloaded member function, provided for convenience.
-///		It differs from the above function in that it takes an integer
-///		specifying a desired length to be retrieved of the name.
-///\return	Name (or part of name) of the attribute
-///\param	len  -  IN: Desired length of the name
-///\exception	H5::AttributeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    Attribute::getName
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes an integer
+///             specifying a desired length to be retrieved of the name.
+///\return      Name (or part of name) of the attribute
+///\param       len  -  IN: Desired length of the name
+///\exception   H5::AttributeIException
+// Programmer   Binh-Minh Ribler - 2000
 // Modification
-//	Mar 2014 - BMR
-//		Revised to use the new getName() below
+//      Mar 2014 - BMR
+//              Revised to use the new getName() below
 //--------------------------------------------------------------------------
-H5std_string Attribute::getName(size_t len) const
+H5std_string
+Attribute::getName(size_t len) const
 {
     H5std_string attr_name;
-    ssize_t name_size = getName(attr_name, len);
+    ssize_t      name_size = getName(attr_name, len);
     if (name_size < 0)
-	return("");
+        return ("");
     else
-	return(attr_name);
+        return (attr_name);
 }
 
 //--------------------------------------------------------------------------
-// Function:	Attribute::getName
-///\brief	Gets the name of this attribute, returning its length.
-///\param	attr_name - OUT: Buffer for the name string as \a H5std_string
-///\param	len  -  IN: Desired length of the name, default to 0
-///\return	Actual length of the attribute name
-///\exception	H5::AttributeIException
+// Function:    Attribute::getName
+///\brief       Gets the name of this attribute, returning its length.
+///\param       attr_name - OUT: Buffer for the name string as \a H5std_string
+///\param       len  -  IN: Desired length of the name, default to 0
+///\return      Actual length of the attribute name
+///\exception   H5::AttributeIException
 ///\par Description
-///		This function retrieves the attribute's name as a string.  The
-///		buf_size can specify a specific length or default to 0, in
-///		which case the entire name will be retrieved.
-// Programmer	Binh-Minh Ribler - Nov, 2001
+///             This function retrieves the attribute's name as a string.  The
+///             buf_size can specify a specific length or default to 0, in
+///             which case the entire name will be retrieved.
+// Programmer   Binh-Minh Ribler - Nov, 2001
 // Modification
-//	Mar 2014 - BMR
-//		Added to replace getName(size_t, H5std_string&) so that it'll
-//		allow the argument "len" to be skipped.
+//      Mar 2014 - BMR
+//              Added to replace getName(size_t, H5std_string&) so that it'll
+//              allow the argument "len" to be skipped.
 //--------------------------------------------------------------------------
-ssize_t Attribute::getName(H5std_string& attr_name, size_t len) const
+ssize_t
+Attribute::getName(H5std_string &attr_name, size_t len) const
 {
     ssize_t name_size = 0;
 
     // If no length is provided, get the entire attribute name
-    if (len == 0)
-    {
+    if (len == 0) {
         attr_name = getName();
-	name_size = attr_name.length();
+        name_size = static_cast<ssize_t>(attr_name.length());
     }
     // If length is provided, get that number of characters in name
-    else
-    {
-        char* name_C = new char[len+1];  // temporary C-string
-        HDmemset(name_C, 0, len+1); // clear buffer
+    else {
+        // Create buffer for C string
+        char *name_C = new char[len + 1]();
 
         // Use overloaded function
-        name_size = getName(name_C, len+1);
+        name_size = getName(name_C, len + 1);
 
         // Convert the C attribute name to return
         attr_name = name_C;
 
         // Clean up resource
-        delete []name_C;
+        delete[] name_C;
     }
     // Otherwise, keep attr_name intact
 
     // Return name size
-    return(name_size);
+    return name_size;
 }
 
 //--------------------------------------------------------------------------
 // Function:    Attribute::getName
-///\brief       This function is replaced by the previous function, which
-///		provides more convenient prototype.  It will be removed
-///		in future release.
-///\param       len  -  IN: Desired length of the name
-///\param       attr_name - OUT: Buffer for the name string
-///\return      Actual length of the attribute name
-///\exception   H5::AttributeIException
+// Purpose      This function is replaced by the previous function, which
+//              provides more convenient prototype.  It will be removed
+//              in future release.
+// Param        len  -  IN: Desired length of the name
+// Param        attr_name - OUT: Buffer for the name string
+// Return       Actual length of the attribute name
+// Exception    H5::AttributeIException
 // Programmer   Binh-Minh Ribler - Nov, 2001
 // Modification
-//		Modified to call its replacement. -BMR, 2014/04/16
+//              Modified to call its replacement. -BMR, 2014/04/16
+//              Removed from documentation. -BMR, 2016/03/07 1.8.17 and 1.10.0
+//              Removed from code. -BMR, 2016/08/11 1.8.18 and 1.10.1
 //--------------------------------------------------------------------------
-ssize_t Attribute::getName( size_t len, H5std_string& attr_name ) const
-{
-    return (getName(attr_name, len));
-}
-
-//--------------------------------------------------------------------------
-// Function:	Attribute::getStorageSize
-///\brief	Returns the amount of storage size required for this attribute.
-///\return	Size of the storage or 0, for no data
-///\exception	H5::AttributeIException
-// Note:	H5Dget_storage_size returns 0 when there is no data.  This
-//		function should have no failure. (from SLU)
-// Programmer	Binh-Minh Ribler - Mar, 2005
-//--------------------------------------------------------------------------
-hsize_t Attribute::getStorageSize() const
-{
-   hsize_t storage_size = H5Aget_storage_size(id);
-   return (storage_size);
-}
+// ssize_t Attribute::getName(size_t len, H5std_string& attr_name) const
+//{
+//    return (getName(attr_name, len));
+//}
 
 //--------------------------------------------------------------------------
-// Function:	Attribute::flush
-///\brief	Flushes all buffers associated with a file specified by
-///		this attribute, to disk.
-///\param	scope - IN: Specifies the scope of the flushing action,
-///		which can be either of these values:
-///		\li \c H5F_SCOPE_GLOBAL - Flushes the entire virtual file
-///		\li \c H5F_SCOPE_LOCAL - Flushes only the specified file
-///\exception	H5::AttributeIException
-///\par Description
-///		This attribute is used to identify the file to be flushed.
-// Programmer	Binh-Minh Ribler - 2012
-// Modification
-//	Sep 2012 - BMR
-//		Duplicated from H5Location
+// Function:    Attribute::getStorageSize
+///\brief       Returns the amount of storage size required for this attribute.
+///\return      Size of the storage or 0, for no data
+///\exception   H5::AttributeIException
+// Note:        H5Dget_storage_size returns 0 when there is no data.  This
+//              function should have no failure. (from SLU)
+// Programmer   Binh-Minh Ribler - Mar, 2005
 //--------------------------------------------------------------------------
-void Attribute::flush(H5F_scope_t scope) const
+hsize_t
+Attribute::getStorageSize() const
 {
-   herr_t ret_value = H5Fflush(getId(), scope);
-   if( ret_value < 0 )
-   {
-      throw AttributeIException("Attribute::flush", "H5Fflush failed");
-   }
+    hsize_t storage_size = H5Aget_storage_size(id);
+    return (storage_size);
 }
 
 //--------------------------------------------------------------------------
 // Function:    Attribute::getId
-///\brief	Get the id of this attribute
-///\return	Attribute identifier
+///\brief       Get the id of this attribute
+///\return      Attribute identifier
 // Description:
-//		Class hierarchy is revised to address bugzilla 1068.  Class
-//		AbstractDS and Attribute are moved out of H5Object.  In
-//		addition, member IdComponent::id is moved into subclasses, and
-//		IdComponent::getId now becomes pure virtual function.
+//              Class hierarchy is revised to address bugzilla 1068.  Class
+//              AbstractDS and Attribute are moved out of H5Object.  In
+//              addition, member IdComponent::id is moved into subclasses, and
+//              IdComponent::getId now becomes pure virtual function.
 // Programmer   Binh-Minh Ribler - May, 2008
+// Modification
+//      Aug 2016 - BMR
+//              Note that Attribute is now inheriting from H5Location, because
+//              an attribute id can be used to specify a location in HDF5
+//              library.
 //--------------------------------------------------------------------------
-hid_t Attribute::getId() const
+hid_t
+Attribute::getId() const
 {
-   return(id);
+    return (id);
 }
 
 //--------------------------------------------------------------------------
-// Function:	Attribute::p_get_type (private)
-// Purpose	Gets the datatype of this attribute.
-// Return	Id of the datatype
-// Exception	H5::AttributeIException
+// Function:    Attribute::p_get_type (private)
+// Purpose      Gets the datatype of this attribute.
+// Return       Id of the datatype
+// Exception    H5::AttributeIException
 // Description
-// 		This private function is used in AbstractDs.
-// Programmer	Binh-Minh Ribler - 2000
+//              This private function is used in AbstractDs.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-hid_t Attribute::p_get_type() const
+hid_t
+Attribute::p_get_type() const
 {
-   hid_t type_id = H5Aget_type( id );
-   if( type_id > 0 )
-      return( type_id );
-   else
-   {
-      throw AttributeIException("", "H5Aget_type failed");
-   }
+    hid_t type_id = H5Aget_type(id);
+    if (type_id > 0)
+        return (type_id);
+    else {
+        throw AttributeIException("", "H5Aget_type failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	Attribute::p_read_fixed_len (private)
-// brief	Reads a fixed length \a H5std_string from an attribute.
-// param	mem_type  - IN: Attribute datatype (in memory)
-// param	strg      - IN: Buffer for read string
-// exception	H5::AttributeIException
-// Programmer	Binh-Minh Ribler - Jul, 2009
+// Function:    Attribute::p_read_fixed_len (private)
+// brief       Reads a fixed length \a H5std_string from an attribute.
+// param       mem_type  - IN: Attribute datatype (in memory)
+// param       strg      - IN: Buffer for read string
+// exception   H5::AttributeIException
+// Programmer   Binh-Minh Ribler - Jul, 2009
 // Modification
-//	Jul 2009
-//		Separated the fixed length case from the original
-//		Attribute::read
+//      Jul 2009
+//              Separated the fixed length case from the original
+//              Attribute::read
 //--------------------------------------------------------------------------
-void Attribute::p_read_fixed_len(const DataType& mem_type, H5std_string& strg) const
+void
+Attribute::p_read_fixed_len(const DataType &mem_type, H5std_string &strg) const
 {
     // Only allocate for fixed-len string.
 
@@ -562,35 +515,34 @@ void Attribute::p_read_fixed_len(const DataType& mem_type, H5std_string& strg) c
     size_t attr_size = getInMemDataSize();
 
     // If there is data, allocate buffer and read it.
-    if (attr_size > 0)
-    {
-	char *strg_C = new char[(size_t)attr_size+1];
-	herr_t ret_value = H5Aread(id, mem_type.getId(), strg_C);
-	if( ret_value < 0 )
-	{
-	    delete []strg_C;	// de-allocate for fixed-len string
-	    throw AttributeIException("Attribute::read", "H5Aread failed");
-	}
-	// Get string from the C char* and release resource allocated locally
-	strg_C[attr_size] = '\0';
-	strg = strg_C;
-	delete []strg_C;
+    if (attr_size > 0) {
+        char  *strg_C    = new char[attr_size + 1];
+        herr_t ret_value = H5Aread(id, mem_type.getId(), strg_C);
+        if (ret_value < 0) {
+            delete[] strg_C; // de-allocate for fixed-len string
+            throw AttributeIException("Attribute::read", "H5Aread failed");
+        }
+        // Get string from the C char* and release resource allocated locally
+        strg_C[attr_size] = '\0';
+        strg              = strg_C;
+        delete[] strg_C;
     }
 }
 
 //--------------------------------------------------------------------------
-// Function:	Attribute::p_read_variable_len (private)
-// brief	Reads a variable length \a H5std_string from an attribute.
-// param	mem_type  - IN: Attribute datatype (in memory)
-// param	strg      - IN: Buffer for read string
-// exception	H5::AttributeIException
-// Programmer	Binh-Minh Ribler - Jul, 2009
+// Function:    Attribute::p_read_variable_len (private)
+// brief       Reads a variable length \a H5std_string from an attribute.
+// param       mem_type  - IN: Attribute datatype (in memory)
+// param       strg      - IN: Buffer for read string
+// exception   H5::AttributeIException
+// Programmer   Binh-Minh Ribler - Jul, 2009
 // Modification
-//	Jul 2009
-//		Separated the variable length case from the original
-//		Attribute::read. -BMR
+//        Jul 2009
+//              Separated the variable length case from the original
+//              Attribute::read. -BMR
 //--------------------------------------------------------------------------
-void Attribute::p_read_variable_len(const DataType& mem_type, H5std_string& strg) const
+void
+Attribute::p_read_variable_len(const DataType &mem_type, H5std_string &strg) const
 {
     // Prepare and call C API to read attribute.
     char *strg_C;
@@ -598,14 +550,13 @@ void Attribute::p_read_variable_len(const DataType& mem_type, H5std_string& strg
     // Read attribute, no allocation for variable-len string; C library will
     herr_t ret_value = H5Aread(id, mem_type.getId(), &strg_C);
 
-    if( ret_value < 0 )
-    {
-	throw AttributeIException("Attribute::read", "H5Aread failed");
+    if (ret_value < 0) {
+        throw AttributeIException("Attribute::read", "H5Aread failed");
     }
 
     // Get string from the C char* and release resource allocated by C API
     strg = strg_C;
-    HDfree(strg_C);
+    free(strg_C);
 }
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
@@ -614,68 +565,66 @@ void Attribute::p_read_variable_len(const DataType& mem_type, H5std_string& strg
 ///\brief       Sets the identifier of this object to a new value.
 ///
 ///\exception   H5::IdComponentException when the attempt to close the HDF5
-///		object fails
+///             object fails
 // Description:
-//		The underlaying reference counting in the C library ensures
-//		that the current valid id of this object is properly closed.
-//		Then the object's id is reset to the new id.
+//              The underlying reference counting in the C library ensures
+//              that the current valid id of this object is properly closed.
+//              Then the object's id is reset to the new id.
 // Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void Attribute::p_setId(const hid_t new_id)
+void
+Attribute::p_setId(const hid_t new_id)
 {
     // handling references to this old id
     try {
-	close();
+        close();
     }
-    catch (Exception close_error) {
-	throw AttributeIException("Attribute::p_setId", close_error.getDetailMsg());
+    catch (Exception &close_error) {
+        throw AttributeIException("Attribute::p_setId", close_error.getDetailMsg());
     }
-   // reset object's id to the given id
-   id = new_id;
+    // reset object's id to the given id
+    id = new_id;
 }
 #endif // DOXYGEN_SHOULD_SKIP_THIS
 
 //--------------------------------------------------------------------------
-// Function:	Attribute::close
-///\brief	Closes this attribute.
+// Function:    Attribute::close
+///\brief       Closes this attribute.
 ///
-///\exception	H5::AttributeIException
-// Programmer	Binh-Minh Ribler - Mar 9, 2005
+///\exception   H5::AttributeIException
+// Programmer   Binh-Minh Ribler - Mar 9, 2005
 //--------------------------------------------------------------------------
-void Attribute::close()
+void
+Attribute::close()
 {
-    if (p_valid_id(id))
-    {
-	herr_t ret_value = H5Aclose(id);
-	if( ret_value < 0 )
-	{
-	    throw AttributeIException("Attribute::close", "H5Aclose failed");
-	}
-	// reset the id
-	id = H5I_INVALID_HID;
+    if (p_valid_id(id)) {
+        herr_t ret_value = H5Aclose(id);
+        if (ret_value < 0) {
+            throw AttributeIException("Attribute::close", "H5Aclose failed");
+        }
+        // reset the id
+        id = H5I_INVALID_HID;
     }
 }
 
 //--------------------------------------------------------------------------
-// Function:	Attribute destructor
-///\brief	Properly terminates access to this attribute.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    Attribute destructor
+///\brief       Properly terminates access to this attribute.
+// Programmer   Binh-Minh Ribler - 2000
 // Modification
-//		- Replaced resetIdComponent() with decRefCount() to use C
-//		library ID reference counting mechanism - BMR, Jun 1, 2004
-//		- Replaced decRefCount with close() to let the C library
-//		handle the reference counting - BMR, Jun 1, 2006
+//              - Replaced resetIdComponent() with decRefCount() to use C
+//              library ID reference counting mechanism - BMR, Jun 1, 2004
+//              - Replaced decRefCount with close() to let the C library
+//              handle the reference counting - BMR, Jun 1, 2006
 //--------------------------------------------------------------------------
 Attribute::~Attribute()
 {
     try {
-	close();
+        close();
     }
-    catch (Exception close_error) {
-	cerr << "Attribute::~Attribute - " << close_error.getDetailMsg() << endl;
+    catch (Exception &close_error) {
+        cerr << "Attribute::~Attribute - " << close_error.getDetailMsg() << endl;
     }
 }
 
-#ifndef H5_NO_NAMESPACE
-} // end namespace
-#endif
+} // namespace H5
diff --git a/c++/src/H5Attribute.h b/c++/src/H5Attribute.h
index f57b922..6851e1a 100644
--- a/c++/src/H5Attribute.h
+++ b/c++/src/H5Attribute.h
@@ -1,116 +1,106 @@
 // C++ informative line for the emacs editor: -*- C++ -*-
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5Attribute_H
-#define __H5Attribute_H
+#ifndef H5Attribute_H
+#define H5Attribute_H
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#endif
 
 /*! \class Attribute
     \brief Class Attribute operates on HDF5 attributes.
 
     An attribute has many characteristics similar to a dataset, thus both
     Attribute and DataSet are derivatives of AbstractDs.  Attribute also
-    inherits from IdComponent because an attribute is an HDF5 component that
-    is identified by an identifier.
+    inherits from H5Location because an attribute can be used to specify
+    a location.
 */
-class H5_DLLCPP Attribute : public AbstractDs, public IdComponent {
-   public:
-	// Closes this attribute.
-	virtual void close();
+//  Inheritance: multiple H5Location/AbstractDs -> IdComponent
+class H5_DLLCPP Attribute : public AbstractDs, public H5Location {
+  public:
+    // Copy constructor: same as the original Attribute.
+    Attribute(const Attribute &original);
 
-	// Gets the name of the file, in which this attribute belongs.
-	H5std_string getFileName() const;
+    // Default constructor
+    Attribute();
 
-	// Gets the name of this attribute.
-	ssize_t getName(char* attr_name, size_t buf_size = 0) const;
-	H5std_string getName(size_t len) const;
-	H5std_string getName() const;
-	ssize_t getName(H5std_string& attr_name, size_t len = 0) const;
-	// The overloaded function below is replaced by the one above and it
-	// is kept for backward compatibility purpose.
-	ssize_t getName( size_t buf_size, H5std_string& attr_name ) const;
+    // Creates a copy of an existing attribute using the attribute id
+    Attribute(const hid_t attr_id);
 
-	// Gets a copy of the dataspace for this attribute.
-	virtual DataSpace getSpace() const;
+    // Closes this attribute.
+    virtual void close() override;
 
-	// Returns the amount of storage size required for this attribute.
-	virtual hsize_t getStorageSize() const;
+    // Gets the name of this attribute.
+    ssize_t      getName(char *attr_name, size_t buf_size = 0) const;
+    H5std_string getName(size_t len) const;
+    H5std_string getName() const;
+    ssize_t      getName(H5std_string &attr_name, size_t len = 0) const;
+    // The overloaded function below is replaced by the one above and it
+    // is kept for backward compatibility purpose.
+    ssize_t getName(size_t buf_size, H5std_string &attr_name) const;
 
-	// Returns the in memory size of this attribute's data.
-	virtual size_t getInMemDataSize() const;
+    // Gets a copy of the dataspace for this attribute.
+    virtual DataSpace getSpace() const override;
 
-	// Reads data from this attribute.
-	void read( const DataType& mem_type, void *buf ) const;
-	void read( const DataType& mem_type, H5std_string& strg ) const;
+    // Returns the amount of storage size required for this attribute.
+    virtual hsize_t getStorageSize() const override;
 
-	// Writes data to this attribute.
-	void write(const DataType& mem_type, const void *buf ) const;
-	void write(const DataType& mem_type, const H5std_string& strg ) const;
+    // Returns the in memory size of this attribute's data.
+    virtual size_t getInMemDataSize() const override;
 
-	// Flushes all buffers associated with the file specified by this
-	// attribute to disk.
-	void flush( H5F_scope_t scope ) const;
+    // Reads data from this attribute.
+    void read(const DataType &mem_type, void *buf) const;
+    void read(const DataType &mem_type, H5std_string &strg) const;
 
-	///\brief Returns this class name.
-	virtual H5std_string fromClass () const { return("Attribute"); }
+    // Writes data to this attribute.
+    void write(const DataType &mem_type, const void *buf) const;
+    void write(const DataType &mem_type, const H5std_string &strg) const;
 
-	// Creates a copy of an existing attribute using the attribute id
-	Attribute( const hid_t attr_id );
+    ///\brief Returns this class name.
+    virtual H5std_string
+    fromClass() const override
+    {
+        return ("Attribute");
+    }
 
-	// Copy constructor: makes a copy of an existing Attribute object.
-	Attribute( const Attribute& original );
+    // Gets the attribute id.
+    virtual hid_t getId() const override;
 
-	// Default constructor
-	Attribute();
+    // Destructor: properly terminates access to this attribute.
+    virtual ~Attribute() override;
 
-	// Gets the attribute id.
-	virtual hid_t getId() const;
-
-	// Destructor: properly terminates access to this attribute.
-	virtual ~Attribute();
-
-   protected:
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
-	// Sets the attribute id.
-	virtual void p_setId(const hid_t new_id);
+  protected:
+    // Sets the attribute id.
+    virtual void p_setId(const hid_t new_id) override;
 #endif // DOXYGEN_SHOULD_SKIP_THIS
 
-   private:
-	hid_t id;	// HDF5 attribute id
-
-	// This function contains the common code that is used by
-	// getTypeClass and various API functions getXxxType
-	// defined in AbstractDs for generic datatype and specific
-	// sub-types
-	virtual hid_t p_get_type() const;
-
-	// Reads variable or fixed len strings from this attribute.
-	void p_read_variable_len(const DataType& mem_type, H5std_string& strg) const;
-	void p_read_fixed_len(const DataType& mem_type, H5std_string& strg) const;
-
-	// do not inherit H5Object::iterateAttrs
-	int iterateAttrs() { return 0; }
-
-	// do not inherit H5Object::renameAttr
-	void renameAttr() {}
-};
-#ifndef H5_NO_NAMESPACE
-}
-#endif
-#endif // __H5Attribute_H
+  private:
+    hid_t id; // HDF5 attribute id
+
+    // This function contains the common code that is used by
+    // getTypeClass and various API functions getXxxType
+    // defined in AbstractDs for generic datatype and specific
+    // sub-types
+    virtual hid_t p_get_type() const override;
+
+    // Reads variable or fixed len strings from this attribute.
+    void p_read_variable_len(const DataType &mem_type, H5std_string &strg) const;
+    void p_read_fixed_len(const DataType &mem_type, H5std_string &strg) const;
+
+    // Friend function to set Attribute id.  For library use only.
+    friend void f_Attribute_setId(Attribute *attr, hid_t new_id);
+
+}; // end of Attribute
+} // namespace H5
+
+#endif // H5Attribute_H
diff --git a/c++/src/H5Classes.h b/c++/src/H5Classes.h
index de7cf4a..b4a0670 100644
--- a/c++/src/H5Classes.h
+++ b/c++/src/H5Classes.h
@@ -1,52 +1,45 @@
 // C++ informative line for the emacs editor: -*- C++ -*-
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5Classes_H
-#define __H5Classes_H
+#ifndef H5Classes_H
+#define H5Classes_H
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#endif
-	class Exception;
-	class IdComponent;
-	class H5Location;
-	class H5Object;
-	class PropList;
-	class FileCreatPropList;
-	class FileAccPropList;
-	class DSetCreatPropList;
-	class DSetMemXferPropList;
-	class DTypePropList;
-	class DataType;
-	class DataSpace;
-	class AtomType;
-	class PredType;
-	class EnumType;
-	class IntType;
-	class FloatType;
-	class StrType;
-	class CompType;
-	//class RefType;
-	class AbstractDs;
-	class DataSet;
-	class Group;
-	class H5File;
-	class Attribute;
-	class H5Library;
-#ifndef H5_NO_NAMESPACE
-}
-#endif
-#endif // __H5Classes_H
+class Exception;
+class IdComponent;
+class H5Location;
+class H5Object;
+class PropList;
+class FileCreatPropList;
+class FileAccPropList;
+class LinkAccPropList;
+class DSetCreatPropList;
+class DSetMemXferPropList;
+class DTypePropList;
+class DataType;
+class DataSpace;
+class AtomType;
+class PredType;
+class IntType;
+class FloatType;
+class StrType;
+class EnumType;
+class CompType;
+class AbstractDs;
+class DataSet;
+class Group;
+class H5File;
+class Attribute;
+class H5Library;
+} // namespace H5
+#endif // H5Classes_H
diff --git a/c++/src/H5CommonFG.cpp b/c++/src/H5CommonFG.cpp
index 3aa0386..adbd61a 100644
--- a/c++/src/H5CommonFG.cpp
+++ b/c++/src/H5CommonFG.cpp
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <string>
@@ -18,23 +15,20 @@
 #include "H5Include.h"
 #include "H5Exception.h"
 #include "H5IdComponent.h"
+#include "H5DataSpace.h"
 #include "H5PropList.h"
-#include "H5Object.h"
-#include "H5FaccProp.h"
-#include "H5FcreatProp.h"
 #include "H5DxferProp.h"
+#include "H5OcreatProp.h"
 #include "H5DcreatProp.h"
-#include "H5CommonFG.h"
-#include "H5Group.h"
+#include "H5LcreatProp.h"
+#include "H5LaccProp.h"
+#include "H5DaccProp.h"
+#include "H5Location.h"
+#include "H5Object.h"
+#include "H5Alltypes.h"
 #include "H5AbstractDs.h"
-#include "H5DataSpace.h"
 #include "H5DataSet.h"
-#include "H5File.h"
-#include "H5Alltypes.h"
-#include "H5private.h"		// for HDstrcpy
-
-#include <iostream>
-using namespace std;
+#include "H5CommonFG.h"
 
 // There are a few comments that are common to most of the functions
 // defined in this file so they are listed here.
@@ -49,1149 +43,363 @@ using namespace std;
 //   GroupIException.
 // December 2000
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#endif
-
-//--------------------------------------------------------------------------
-// Function:	CommonFG::createGroup
-///\brief	Creates a new group at this location which can be a file
-///		or another group.
-///\param	name  - IN: Name of the group to create
-///\param	size_hint - IN: Indicates the number of bytes to reserve for
-///		the names that will appear in the group
-///\return	Group instance
-///\exception	H5::FileIException or H5::GroupIException
-///\par Description
-///		The optional \a size_hint specifies how much file space to
-///		reserve for storing the names that will appear in this new
-///		group. If a non-positive value is provided for the \a size_hint
-///		then a default size is chosen.
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-Group CommonFG::createGroup( const char* name, size_t size_hint ) const
-{
-   // Group creation property list for size_hint
-   hid_t gcpl_id = 0;
-
-   // Set the local heap size hint
-   if(!(size_hint == (size_t)-1 || size_hint == 0)) {
-
-       // If the creation of the property list failed, throw an exception
-       if((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0)
-          throwException("createGroup", "H5Pcreate failed");
-
-       if( H5Pset_local_heap_size_hint(gcpl_id, size_hint) < 0) {
-          H5Pclose(gcpl_id);
-          throwException("createGroup", "H5Pset_local_heap_size failed");
-       }
-    }
-
-   // Call C routine H5Gcreate2 to create the named group, giving the
-   // location id which can be a file id or a group id
-   hid_t group_id = H5Gcreate2( getLocId(), name, H5P_DEFAULT, gcpl_id, H5P_DEFAULT );
-
-   // Close the group creation property list, if necessary
-   if(gcpl_id > 0)
-       H5Pclose(gcpl_id);
-
-   // If the creation of the group failed, throw an exception
-   if( group_id < 0 )
-      throwException("createGroup", "H5Gcreate2 failed");
-
-   // No failure, create and return the Group object
-   Group group( group_id );
-   return( group );
-}
-
-//--------------------------------------------------------------------------
-// Function:	CommonFG::createGroup
-///\brief	This is an overloaded member function, provided for convenience.
-///		It differs from the above function in that it takes an
-///		\c H5std_string for \a name.
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-Group CommonFG::createGroup( const H5std_string& name, size_t size_hint ) const
-{
-   return( createGroup( name.c_str(), size_hint ));
-}
-
-//--------------------------------------------------------------------------
-// Function:	CommonFG::openGroup
-///\brief	Opens an existing group in a location which can be a file
-///		or another group.
-///\param	name  - IN: Name of the group to open
-///\return	Group instance
-///\exception	H5::FileIException or H5::GroupIException
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-Group CommonFG::openGroup( const char* name ) const
-{
-   // Call C routine H5Gopen2 to open the named group, giving the
-   // location id which can be a file id or a group id
-   hid_t group_id = H5Gopen2( getLocId(), name, H5P_DEFAULT );
-
-   // If the opening of the group failed, throw an exception
-   if( group_id < 0 )
-      throwException("openGroup", "H5Gopen2 failed");
-
-   // No failure, create and return the Group object
-   Group group( group_id );
-   return( group );
-}
-
-//--------------------------------------------------------------------------
-// Function:	CommonFG::openGroup
-///\brief	This is an overloaded member function, provided for convenience.
-///		It differs from the above function in that it takes an
-///		\c H5std_string for \a name.
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-Group CommonFG::openGroup( const H5std_string& name ) const
-{
-   return( openGroup( name.c_str() ));
-}
-
-//--------------------------------------------------------------------------
-// Function:	CommonFG::createDataSet
-///\brief	Creates a new dataset at this location.
-///\param	name  - IN: Name of the dataset to create
-///\param	data_type - IN: Datatype of the dataset
-///\param	data_space - IN: Dataspace for the dataset
-///\param	create_plist - IN: Creation properly list for the dataset
-///\return	DataSet instance
-///\exception	H5::FileIException or H5::GroupIException
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-DataSet CommonFG::createDataSet( const char* name, const DataType& data_type, const DataSpace& data_space, const DSetCreatPropList& create_plist ) const
-{
-   // Obtain identifiers for C API
-   hid_t type_id = data_type.getId();
-   hid_t space_id = data_space.getId();
-   hid_t create_plist_id = create_plist.getId();
-
-   // Call C routine H5Dcreate2 to create the named dataset
-   hid_t dataset_id = H5Dcreate2( getLocId(), name, type_id, space_id, H5P_DEFAULT, create_plist_id, H5P_DEFAULT );
-
-   // If the creation of the dataset failed, throw an exception
-   if( dataset_id < 0 )
-      throwException("createDataSet", "H5Dcreate2 failed");
-
-   // No failure, create and return the DataSet object
-   DataSet dataset( dataset_id );
-   return( dataset );
-}
-
-//--------------------------------------------------------------------------
-// Function:	CommonFG::createDataSet
-///\brief	This is an overloaded member function, provided for convenience.
-///		It differs from the above function in that it takes an
-///		\c H5std_string for \a name.
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-DataSet CommonFG::createDataSet( const H5std_string& name, const DataType& data_type, const DataSpace& data_space, const DSetCreatPropList& create_plist ) const
-{
-   return( createDataSet( name.c_str(), data_type, data_space, create_plist ));
-}
-
-//--------------------------------------------------------------------------
-// Function:	CommonFG::openDataSet
-///\brief	Opens an existing dataset at this location.
-///\param	name  - IN: Name of the dataset to open
-///\return	DataSet instance
-///\exception	H5::FileIException or H5::GroupIException
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-DataSet CommonFG::openDataSet( const char* name ) const
-{
-   // Call C function H5Dopen2 to open the specified dataset, giving
-   // the location id and the dataset's name
-   hid_t dataset_id = H5Dopen2( getLocId(), name, H5P_DEFAULT );
-
-   // If the dataset's opening failed, throw an exception
-   if(dataset_id < 0)
-      throwException("openDataSet", "H5Dopen2 failed");
-
-   // No failure, create and return the DataSet object
-   DataSet dataset( dataset_id );
-   return( dataset );
-}
-
-//--------------------------------------------------------------------------
-// Function:	CommonFG::openDataSet
-///\brief	This is an overloaded member function, provided for convenience.
-///		It differs from the above function in that it takes an
-///		\c H5std_string for \a name.
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-DataSet CommonFG::openDataSet( const H5std_string& name ) const
-{
-   return( openDataSet( name.c_str() ));
-}
-
-//--------------------------------------------------------------------------
-// Function:	CommonFG::link
-///\brief	Creates a link of the specified type from \a new_name to
-///		\a curr_name.
-///\param	link_type  - IN: Link type; possible values are
-///		\li \c H5G_LINK_HARD
-///		\li \c H5G_LINK_SOFT
-///\param	curr_name - IN: Name of the existing object if link is a hard
-///		link; can be anything for the soft link
-///\param	new_name - IN: New name for the object
-///\exception	H5::FileIException or H5::GroupIException
-///\par Description
-///		Note that both names are interpreted relative to the
-///		specified location.
-///		For information on creating hard link and soft link, please
-///		refer to the C layer Reference Manual at:
-/// http://hdfgroup.org/HDF5/doc/RM/RM_H5L.html#Link-CreateHard and
-/// http://hdfgroup.org/HDF5/doc/RM/RM_H5L.html#Link-CreateSoft
-// Programmer	Binh-Minh Ribler - 2000
-// Modification
-//	2007: QAK modified to use H5L APIs - BMR
-//--------------------------------------------------------------------------
-void CommonFG::link( H5L_type_t link_type, const char* curr_name, const char* new_name ) const
-{
-    herr_t ret_value = -1;
-
-    switch(link_type) {
-        case H5L_TYPE_HARD:
-            ret_value = H5Lcreate_hard( getLocId(), curr_name, H5L_SAME_LOC, new_name, H5P_DEFAULT, H5P_DEFAULT );
-            break;
-
-        case H5L_TYPE_SOFT:
-            ret_value = H5Lcreate_soft( curr_name, getLocId(), new_name, H5P_DEFAULT, H5P_DEFAULT );
-            break;
-
-        default:
-            throwException("link", "unknown link type");
-            break;
-    } /* end switch */
-
-   if( ret_value < 0 )
-      throwException("link", "creating link failed");
-}
-
-//--------------------------------------------------------------------------
-// Function:	CommonFG::link
-///\brief	This is an overloaded member function, provided for convenience.
-///		It differs from the above function in that it takes an
-///		\c H5std_string for \a curr_name and \a new_name.
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-void CommonFG::link( H5L_type_t link_type, const H5std_string& curr_name, const H5std_string& new_name ) const
-{
-   link( link_type, curr_name.c_str(), new_name.c_str() );
-}
-
-//--------------------------------------------------------------------------
-// Function:	CommonFG::unlink
-///\brief	Removes the specified name at this location.
-///\param	name  - IN: Name of the object to be removed
-///\exception	H5::FileIException or H5::GroupIException
-// Programmer	Binh-Minh Ribler - 2000
-// Modification
-//	2007: QAK modified to use H5L APIs - BMR
-//--------------------------------------------------------------------------
-void CommonFG::unlink( const char* name ) const
-{
-   herr_t ret_value = H5Ldelete( getLocId(), name, H5P_DEFAULT );
-   if( ret_value < 0 )
-      throwException("unlink", "H5Ldelete failed");
-}
-
-//--------------------------------------------------------------------------
-// Function:	CommonFG::unlink
-///\brief	This is an overloaded member function, provided for convenience.
-///		It differs from the above function in that it takes an
-///		\c H5std_string for \a name.
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-void CommonFG::unlink( const H5std_string& name ) const
-{
-   unlink( name.c_str() );
-}
-
-//--------------------------------------------------------------------------
-// Function:	CommonFG::move
-///\brief	Renames an object at this location.
-///\param	src - IN: Object's original name
-///\param	dst - IN: Object's new name
-///\exception	H5::FileIException or H5::GroupIException
-///\note
-///		Exercise care in moving groups as it is possible to render
-///		data in a file inaccessible with Group::move. Please refer
-///		to the Group Interface in the HDF5 User's Guide for details at:
-/// http://www.hdfgroup.org/HDF5/doc/UG/UG_frame09Groups.html
-// Programmer	Binh-Minh Ribler - 2000
-// Modification
-//	2007: QAK modified to use H5L APIs - BMR
-//--------------------------------------------------------------------------
-void CommonFG::move( const char* src, const char* dst ) const
-{
-   herr_t ret_value = H5Lmove( getLocId(), src, H5L_SAME_LOC, dst, H5P_DEFAULT, H5P_DEFAULT );
-   if( ret_value < 0 )
-      throwException("move", "H5Lmove failed");
-}
-
-//--------------------------------------------------------------------------
-// Function:	CommonFG::move
-///\brief	This is an overloaded member function, provided for convenience.
-///		It differs from the above function in that it takes an
-///		\c H5std_string for \a src and \a dst.
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-void CommonFG::move( const H5std_string& src, const H5std_string& dst ) const
-{
-   move( src.c_str(), dst.c_str() );
-}
-
-#ifndef H5_NO_DEPRECATED_SYMBOLS
-//--------------------------------------------------------------------------
-// Function:	CommonFG::getObjinfo
-///\brief	Returns information about an object.
-///\param	name  - IN: Name of the object
-///\param	follow_link - IN: Link flag
-///\param	statbuf - OUT: Buffer to return information about the object
-///\exception	H5::FileIException or H5::GroupIException
-///\par Description
-///		For more information, please refer to the C layer Reference
-///		Manual at:
-/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5G.html#Group-GetObjinfo
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-void CommonFG::getObjinfo( const char* name, hbool_t follow_link, H5G_stat_t& statbuf ) const
-{
-   herr_t ret_value = H5Gget_objinfo( getLocId(), name, follow_link, &statbuf );
-   if( ret_value < 0 )
-      throwException("getObjinfo", "H5Gget_objinfo failed");
-}
-
-//--------------------------------------------------------------------------
-// Function:	CommonFG::getObjinfo
-///\brief	This is an overloaded member function, provided for convenience.
-///		It differs from the above function in that it takes an
-///		\c H5std_string for \a name.
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-void CommonFG::getObjinfo( const H5std_string& name, hbool_t follow_link, H5G_stat_t& statbuf ) const
-{
-   getObjinfo( name.c_str(), follow_link, statbuf );
-}
-
-//--------------------------------------------------------------------------
-// Function:	CommonFG::getObjinfo
-///\brief	This is an overloaded member function, provided for convenience.
-///		It differs from the above functions in that it doesn't have
-///		the paramemter \a follow_link.
-// Programmer	Binh-Minh Ribler - Nov, 2005
-// Note: need to modify to use H5Oget_info and H5Lget_info - BMR
-//--------------------------------------------------------------------------
-void CommonFG::getObjinfo( const char* name, H5G_stat_t& statbuf ) const
-{
-   herr_t ret_value = H5Gget_objinfo( getLocId(), name, 0, &statbuf );
-   if( ret_value < 0 )
-      throwException("getObjinfo", "H5Gget_objinfo failed");
-}
-
-//--------------------------------------------------------------------------
-// Function:	CommonFG::getObjinfo
-///\brief	This is an overloaded member function, provided for convenience.
-///		It differs from the above function in that it takes an
-///		\c H5std_string for \a name.
-// Programmer	Binh-Minh Ribler - Nov, 2005
-//--------------------------------------------------------------------------
-void CommonFG::getObjinfo( const H5std_string& name, H5G_stat_t& statbuf ) const
-{
-   getObjinfo( name.c_str(), statbuf );
-}
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
-
-//--------------------------------------------------------------------------
-// Function:	CommonFG::getLinkval
-///\brief	Returns the name of the object that the symbolic link points to.
-///\param	name  - IN: Symbolic link to the object
-///\param	size - IN: Maximum number of characters of value to be returned
-///\return	Name of the object
-///\exception	H5::FileIException or H5::GroupIException
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-H5std_string CommonFG::getLinkval( const char* name, size_t size ) const
-{
-    H5L_info_t linkinfo;
-    char *value_C;	// value in C string
-    size_t val_size = size;
-    H5std_string value = "";
-    herr_t ret_value;
-
-    // if user doesn't provide buffer size, determine it
-    if (size == 0)
-    {
-	ret_value = H5Lget_info(getLocId(), name, &linkinfo, H5P_DEFAULT);
-	if( ret_value < 0 )
-	    throwException("getLinkval", "H5Lget_info to find buffer size failed");
-
-	val_size = linkinfo.u.val_size;
-    }
-
-    // if link has value, retrieve the value, otherwise, return null string
-    if (val_size > 0)
-    {
-	value_C = new char[val_size+1];  // temporary C-string for C API
-	HDmemset(value_C, 0, val_size+1); // clear buffer
-
-	ret_value = H5Lget_val(getLocId(), name, value_C, val_size, H5P_DEFAULT);
-	if( ret_value < 0 )
-	{
-	    delete []value_C;
-	    throwException("getLinkval", "H5Lget_val failed");
-	}
-
-	value = H5std_string(value_C);
-	delete []value_C;
-    }
-    return(value);
-}
-
-//--------------------------------------------------------------------------
-// Function:	CommonFG::getLinkval
-///\brief	This is an overloaded member function, provided for convenience.
-///		It differs from the above function in that it takes an
-///		\c H5std_string for \a name.
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-H5std_string CommonFG::getLinkval( const H5std_string& name, size_t size ) const
-{
-   return( getLinkval( name.c_str(), size ));
-}
-
-//--------------------------------------------------------------------------
-// Function:	CommonFG::mount
-///\brief	Mounts the file \a child onto this group.
-///\param	name  - IN: Name of the group
-///\param	child - IN: File to mount
-///\param	plist - IN: Property list to use
-///\exception	H5::FileIException or H5::GroupIException
-// Programmer	Binh-Minh Ribler - 2014 (original 2000)
-//--------------------------------------------------------------------------
-void CommonFG::mount(const char* name, const H5File& child, const PropList& plist ) const
-{
-   // Obtain identifiers for C API
-   hid_t plist_id = plist.getId();
-   hid_t child_id = child.getId();
-
-   // Call C routine H5Fmount to do the mouting
-   herr_t ret_value = H5Fmount( getLocId(), name, child_id, plist_id );
-
-   // Raise exception if H5Fmount returns negative value
-   if( ret_value < 0 )
-      throwException("mount", "H5Fmount failed");
-}
-
-//--------------------------------------------------------------------------
-// Function:	CommonFG::mount
-///\brief	This is an overloaded member function, kept for backward
-///		compatibility.  It differs from the above function in that it
-///		misses const's.  This wrapper will be removed in future release.
-///\param	name  - IN: Name of the group
-///\param	child - IN: File to mount
-///\param	plist - IN: Property list to use
-///\exception	H5::FileIException or H5::GroupIException
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-void CommonFG::mount(const char* name, H5File& child, PropList& plist) const
-{
-   mount(name, (const H5File)child, (const PropList)plist);
-}
-
-//--------------------------------------------------------------------------
-// Function:	CommonFG::mount
-///\brief	This is an overloaded member function, provided for convenience.
-///		It takes an \c H5std_string for \a name.
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-void CommonFG::mount(const H5std_string& name, const H5File& child, const PropList& plist) const
-{
-   mount(name.c_str(), child, plist);
-}
-
-//--------------------------------------------------------------------------
-// Function:	CommonFG::mount
-///\brief	This is an overloaded member function, kept for backward
-///		compatibility.  It differs from the above function in that it
-///		misses const's.  This wrapper will be removed in future release.
-// Programmer	Binh-Minh Ribler - 2014
-//--------------------------------------------------------------------------
-void CommonFG::mount(const H5std_string& name, H5File& child, PropList& plist) const
-{
-   mount(name.c_str(), (const H5File)child, (const PropList)plist);
-}
-
-//--------------------------------------------------------------------------
-// Function:	CommonFG::unmount
-///\brief	Unmounts the specified file.
-///\param	name  - IN: Name of the file to unmount
-///\exception	H5::FileIException or H5::GroupIException
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-void CommonFG::unmount( const char* name ) const
-{
-   // Call C routine H5Fmount to do the mouting
-   herr_t ret_value = H5Funmount( getLocId(), name );
-
-   // Raise exception if H5Funmount returns negative value
-   if( ret_value < 0 )
-      throwException("unmount", "H5Funmount failed");
-}
-
-//--------------------------------------------------------------------------
-// Function:	CommonFG::unmount
-///\brief	This is an overloaded member function, provided for convenience.
-///		It differs from the above function in that it takes an
-///		\c H5std_string for \a name.
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-void CommonFG::unmount( const H5std_string& name ) const
-{
-   unmount( name.c_str() );
-}
-
-//--------------------------------------------------------------------------
-// Function:	CommonFG::openDataType
-///\brief	Opens the named generic datatype at this location.
-///\param	name  - IN: Name of the datatype to open
-///\return	DataType instance
-///\exception	H5::FileIException or H5::GroupIException
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-DataType CommonFG::openDataType( const char* name ) const
-{
-   // Call C function H5Topen2 to open the named datatype in this group,
-   // given either the file or group id
-   hid_t type_id = H5Topen2(getLocId(), name, H5P_DEFAULT);
-
-   // If the datatype's opening failed, throw an exception
-   if( type_id < 0 )
-      throwException("openDataType", "H5Topen2 failed");
-
-   // No failure, create and return the DataType object
-   DataType data_type(type_id);
-   return(data_type);
-}
-
-//--------------------------------------------------------------------------
-// Function:	CommonFG::openDataType
-///\brief	This is an overloaded member function, provided for convenience.
-///		It differs from the above function in that it takes an
-///		\c H5std_string for \a name.
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-DataType CommonFG::openDataType( const H5std_string& name ) const
-{
-   return( openDataType( name.c_str()) );
-}
 
 //--------------------------------------------------------------------------
-// Function:	CommonFG::openArrayType
-///\brief	Opens the named array datatype at this location.
-///\param	name  - IN: Name of the array datatype to open
-///\return	ArrayType instance
-///\exception	H5::FileIException or H5::GroupIException
-// Programmer	Binh-Minh Ribler - Jul, 2005
+// Function:    CommonFG::openDataType
+///\brief       Opens the named generic datatype at this location.
+///\param       name  - IN: Name of the datatype to open
+///\return      DataType instance
+///\exception   H5::FileIException or H5::GroupIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-ArrayType CommonFG::openArrayType( const char* name ) const
+DataType
+CommonFG::openDataType(const char *name) const
 {
-   // Call C function H5Topen2 to open the named datatype in this group,
-   // given either the file or group id
-   hid_t type_id = H5Topen2(getLocId(), name, H5P_DEFAULT);
+    // Call C function H5Topen2 to open the named datatype in this group,
+    // given either the file or group id
+    hid_t type_id = H5Topen2(getLocId(), name, H5P_DEFAULT);
 
-   // If the datatype's opening failed, throw an exception
-   if( type_id < 0 )
-      throwException("openArrayType", "H5Topen2 failed");
+    // If the datatype's opening failed, throw an exception
+    if (type_id < 0)
+        throwException("openDataType", "H5Topen2 failed");
 
-   // No failure, create and return the ArrayType object
-   ArrayType array_type (type_id);
-   return(array_type);
+    // No failure, create and return the DataType object
+    DataType data_type;
+    f_DataType_setId(&data_type, type_id);
+    return (data_type);
 }
 
 //--------------------------------------------------------------------------
-// Function:	CommonFG::openArrayType
-///\brief	This is an overloaded member function, provided for convenience.
-///		It differs from the above function in that it takes an
-///		\c H5std_string for \a name.
-// Programmer	Binh-Minh Ribler - Jul, 2005
+// Function:    CommonFG::openDataType
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes an
+///             \c H5std_string for \a name.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-ArrayType CommonFG::openArrayType( const H5std_string& name ) const
+DataType
+CommonFG::openDataType(const H5std_string &name) const
 {
-   return( openArrayType( name.c_str()) );
+    return (openDataType(name.c_str()));
 }
 
 //--------------------------------------------------------------------------
-// Function:	CommonFG::openCompType
-///\brief	Opens the named compound datatype at this location.
-///\param	name  - IN: Name of the compound datatype to open
-///\return	CompType instance
-///\exception	H5::FileIException or H5::GroupIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    CommonFG::openArrayType
+///\brief       Opens the named array datatype at this location.
+///\param       name  - IN: Name of the array datatype to open
+///\return      ArrayType instance
+///\exception   H5::FileIException or H5::GroupIException
+// Programmer   Binh-Minh Ribler - Jul, 2005
 //--------------------------------------------------------------------------
-CompType CommonFG::openCompType( const char* name ) const
+ArrayType
+CommonFG::openArrayType(const char *name) const
 {
-   // Call C function H5Topen2 to open the named datatype in this group,
-   // given either the file or group id
-   hid_t type_id = H5Topen2(getLocId(), name, H5P_DEFAULT);
+    // Call C function H5Topen2 to open the named datatype in this group,
+    // given either the file or group id
+    hid_t type_id = H5Topen2(getLocId(), name, H5P_DEFAULT);
 
-   // If the datatype's opening failed, throw an exception
-   if( type_id < 0 )
-      throwException("openCompType", "H5Topen2 failed");
+    // If the datatype's opening failed, throw an exception
+    if (type_id < 0)
+        throwException("openArrayType", "H5Topen2 failed");
 
-   // No failure, create and return the CompType object
-   CompType comp_type(type_id);
-   return(comp_type);
+    // No failure, create and return the ArrayType object
+    ArrayType array_type;
+    f_DataType_setId(&array_type, type_id);
+    return (array_type);
 }
 
 //--------------------------------------------------------------------------
-// Function:	CommonFG::openCompType
-///\brief	This is an overloaded member function, provided for convenience.
-///		It differs from the above function in that it takes an
-///		\c H5std_string for \a name.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    CommonFG::openArrayType
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes an
+///             \c H5std_string for \a name.
+// Programmer   Binh-Minh Ribler - Jul, 2005
 //--------------------------------------------------------------------------
-CompType CommonFG::openCompType( const H5std_string& name ) const
+ArrayType
+CommonFG::openArrayType(const H5std_string &name) const
 {
-   return( openCompType( name.c_str()) );
+    return (openArrayType(name.c_str()));
 }
 
 //--------------------------------------------------------------------------
-// Function:	CommonFG::openEnumType
-///\brief	Opens the named enumeration datatype at this location.
-///\param	name  - IN: Name of the enumeration datatype to open
-///\return	EnumType instance
-///\exception	H5::FileIException or H5::GroupIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    CommonFG::openCompType
+///\brief       Opens the named compound datatype at this location.
+///\param       name  - IN: Name of the compound datatype to open
+///\return      CompType instance
+///\exception   H5::FileIException or H5::GroupIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-EnumType CommonFG::openEnumType( const char* name ) const
+CompType
+CommonFG::openCompType(const char *name) const
 {
-   // Call C function H5Topen2 to open the named datatype in this group,
-   // given either the file or group id
-   hid_t type_id = H5Topen2(getLocId(), name, H5P_DEFAULT);
+    // Call C function H5Topen2 to open the named datatype in this group,
+    // given either the file or group id
+    hid_t type_id = H5Topen2(getLocId(), name, H5P_DEFAULT);
 
-   // If the datatype's opening failed, throw an exception
-   if( type_id < 0 )
-      throwException("openEnumType", "H5Topen2 failed");
+    // If the datatype's opening failed, throw an exception
+    if (type_id < 0)
+        throwException("openCompType", "H5Topen2 failed");
 
-   // No failure, create and return the EnumType object
-   EnumType enum_type(type_id);
-   return(enum_type);
+    // No failure, create and return the CompType object
+    CompType comp_type;
+    f_DataType_setId(&comp_type, type_id);
+    return (comp_type);
 }
 
 //--------------------------------------------------------------------------
-// Function:	CommonFG::openEnumType
-///\brief	This is an overloaded member function, provided for convenience.
-///		It differs from the above function in that it takes an
-///		\c H5std_string for \a name.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    CommonFG::openCompType
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes an
+///             \c H5std_string for \a name.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-EnumType CommonFG::openEnumType( const H5std_string& name ) const
+CompType
+CommonFG::openCompType(const H5std_string &name) const
 {
-   return( openEnumType( name.c_str()) );
+    return (openCompType(name.c_str()));
 }
 
 //--------------------------------------------------------------------------
-// Function:	CommonFG::openIntType
-///\brief	Opens the named integer datatype at this location.
-///\param	name  - IN: Name of the integer datatype to open
-///\return	IntType instance
-///\exception	H5::FileIException or H5::GroupIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    CommonFG::openEnumType
+///\brief       Opens the named enumeration datatype at this location.
+///\param       name  - IN: Name of the enumeration datatype to open
+///\return      EnumType instance
+///\exception   H5::FileIException or H5::GroupIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-IntType CommonFG::openIntType( const char* name ) const
+EnumType
+CommonFG::openEnumType(const char *name) const
 {
-   // Call C function H5Topen2 to open the named datatype in this group,
-   // given either the file or group id
-   hid_t type_id = H5Topen2(getLocId(), name, H5P_DEFAULT);
+    // Call C function H5Topen2 to open the named datatype in this group,
+    // given either the file or group id
+    hid_t type_id = H5Topen2(getLocId(), name, H5P_DEFAULT);
 
-   // If the datatype's opening failed, throw an exception
-   if( type_id < 0 )
-      throwException("openIntType", "H5Topen2 failed");
+    // If the datatype's opening failed, throw an exception
+    if (type_id < 0)
+        throwException("openEnumType", "H5Topen2 failed");
 
-   // No failure, create and return the IntType object
-   IntType int_type(type_id);
-   return(int_type);
+    // No failure, create and return the EnumType object
+    EnumType enum_type;
+    f_DataType_setId(&enum_type, type_id);
+    return (enum_type);
 }
 
 //--------------------------------------------------------------------------
-// Function:	CommonFG::openIntType
-///\brief	This is an overloaded member function, provided for convenience.
-///		It differs from the above function in that it takes an
-///		\c H5std_string for \a name.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    CommonFG::openEnumType
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes an
+///             \c H5std_string for \a name.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-IntType CommonFG::openIntType( const H5std_string& name ) const
+EnumType
+CommonFG::openEnumType(const H5std_string &name) const
 {
-   return( openIntType( name.c_str()) );
+    return (openEnumType(name.c_str()));
 }
 
 //--------------------------------------------------------------------------
-// Function:	CommonFG::openFloatType
-///\brief	Opens the named floating-point datatype at this location.
-///\param	name  - IN: Name of the floating-point datatype to open
-///\return	FloatType instance
-///\exception	H5::FileIException or H5::GroupIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    CommonFG::openIntType
+///\brief       Opens the named integer datatype at this location.
+///\param       name  - IN: Name of the integer datatype to open
+///\return      IntType instance
+///\exception   H5::FileIException or H5::GroupIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-FloatType CommonFG::openFloatType( const char* name ) const
+IntType
+CommonFG::openIntType(const char *name) const
 {
-   // Call C function H5Topen2 to open the named datatype in this group,
-   // given either the file or group id
-   hid_t type_id = H5Topen2(getLocId(), name, H5P_DEFAULT);
+    // Call C function H5Topen2 to open the named datatype in this group,
+    // given either the file or group id
+    hid_t type_id = H5Topen2(getLocId(), name, H5P_DEFAULT);
 
-   // If the datatype's opening failed, throw an exception
-   if( type_id < 0 )
-      throwException("openFloatType", "H5Topen2 failed");
+    // If the datatype's opening failed, throw an exception
+    if (type_id < 0)
+        throwException("openIntType", "H5Topen2 failed");
 
-   // No failure, create and return the FloatType object
-   FloatType float_type(type_id);
-   return(float_type);
+    // No failure, create and return the IntType object
+    IntType int_type;
+    f_DataType_setId(&int_type, type_id);
+    return (int_type);
 }
 
 //--------------------------------------------------------------------------
-// Function:	CommonFG::openFloatType
-///\brief	This is an overloaded member function, provided for convenience.
-///		It differs from the above function in that it takes an
-///		\c H5std_string for \a name.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    CommonFG::openIntType
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes an
+///             \c H5std_string for \a name.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-FloatType CommonFG::openFloatType( const H5std_string& name ) const
+IntType
+CommonFG::openIntType(const H5std_string &name) const
 {
-   return( openFloatType( name.c_str()) );
+    return (openIntType(name.c_str()));
 }
 
 //--------------------------------------------------------------------------
-// Function:	CommonFG::openStrType
-///\brief	Opens the named string datatype at this location.
-///\param	name  - IN: Name of the string datatype to open
-///\return	StrType instance
-///\exception	H5::FileIException or H5::GroupIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    CommonFG::openFloatType
+///\brief       Opens the named floating-point datatype at this location.
+///\param       name  - IN: Name of the floating-point datatype to open
+///\return      FloatType instance
+///\exception   H5::FileIException or H5::GroupIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-StrType CommonFG::openStrType( const char* name ) const
+FloatType
+CommonFG::openFloatType(const char *name) const
 {
-   // Call C function H5Topen2 to open the named datatype in this group,
-   // given either the file or group id
-   hid_t type_id = H5Topen2(getLocId(), name, H5P_DEFAULT);
+    // Call C function H5Topen2 to open the named datatype in this group,
+    // given either the file or group id
+    hid_t type_id = H5Topen2(getLocId(), name, H5P_DEFAULT);
 
-   // If the datatype's opening failed, throw an exception
-   if( type_id < 0 )
-      throwException("openStrType", "H5Topen2 failed");
+    // If the datatype's opening failed, throw an exception
+    if (type_id < 0)
+        throwException("openFloatType", "H5Topen2 failed");
 
-   // No failure, create and return the StrType object
-   StrType str_type(type_id);
-   return(str_type);
+    // No failure, create and return the FloatType object
+    FloatType float_type;
+    f_DataType_setId(&float_type, type_id);
+    return (float_type);
 }
 
 //--------------------------------------------------------------------------
-// Function:	CommonFG::openStrType
-///\brief	This is an overloaded member function, provided for convenience.
-///		It differs from the above function in that it takes an
-///		\c H5std_string for \a name.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    CommonFG::openFloatType
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes an
+///             \c H5std_string for \a name.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-StrType CommonFG::openStrType( const H5std_string& name ) const
+FloatType
+CommonFG::openFloatType(const H5std_string &name) const
 {
-   return( openStrType( name.c_str()) );
+    return (openFloatType(name.c_str()));
 }
 
 //--------------------------------------------------------------------------
-// Function:	CommonFG::openVarLenType
-///\brief	Opens the named variable length datatype at this location.
-///\param	name  - IN: Name of the variable length datatype to open
-///\return	VarLenType instance
-///\exception	H5::FileIException or H5::GroupIException
-// Programmer	Binh-Minh Ribler - Jul, 2005
+// Function:    CommonFG::openStrType
+///\brief       Opens the named string datatype at this location.
+///\param       name  - IN: Name of the string datatype to open
+///\return      StrType instance
+///\exception   H5::FileIException or H5::GroupIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-VarLenType CommonFG::openVarLenType( const char* name ) const
+StrType
+CommonFG::openStrType(const char *name) const
 {
-   // Call C function H5Topen2 to open the named datatype in this group,
-   // given either the file or group id
-   hid_t type_id = H5Topen2(getLocId(), name, H5P_DEFAULT);
+    // Call C function H5Topen2 to open the named datatype in this group,
+    // given either the file or group id
+    hid_t type_id = H5Topen2(getLocId(), name, H5P_DEFAULT);
 
-   // If the datatype's opening failed, throw an exception
-   if( type_id < 0 )
-      throwException("openVarLenType", "H5Topen2 failed");
+    // If the datatype's opening failed, throw an exception
+    if (type_id < 0)
+        throwException("openStrType", "H5Topen2 failed");
 
-   // No failure, create and return the VarLenType object
-   VarLenType varlen_type(type_id);
-   return(varlen_type);
+    // No failure, create and return the StrType object
+    StrType str_type;
+    f_DataType_setId(&str_type, type_id);
+    return (str_type);
 }
 
 //--------------------------------------------------------------------------
-// Function:	CommonFG::openVarLenType
-///\brief	This is an overloaded member function, provided for convenience.
-///		It differs from the above function in that it takes an
-///		\c H5std_string for \a name.
-// Programmer	Binh-Minh Ribler - Jul, 2005
+// Function:    CommonFG::openStrType
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes an
+///             \c H5std_string for \a name.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-VarLenType CommonFG::openVarLenType( const H5std_string& name ) const
+StrType
+CommonFG::openStrType(const H5std_string &name) const
 {
-   return( openVarLenType( name.c_str()) );
+    return (openStrType(name.c_str()));
 }
 
-#ifndef H5_NO_DEPRECATED_SYMBOLS
 //--------------------------------------------------------------------------
-// Function:	CommonFG::iterateElems
-///\brief	Iterates a user's function over the entries of a group.
-///\param	name    - IN    : Name of group to iterate over
-///\param	idx     - IN/OUT: Starting (IN) and ending (OUT) entry indices
-///\param	op      - IN    : User's function to operate on each entry
-///\param	op_data - IN/OUT: Data associated with the operation
-///\return	The return value of the first operator that returns non-zero,
-///		or zero if all members were processed with no operator
-///		returning non-zero.
-///\exception	H5::FileIException or H5::GroupIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    CommonFG::openVarLenType
+///\brief       Opens the named variable length datatype at this location.
+///\param       name  - IN: Name of the variable length datatype to open
+///\return      VarLenType instance
+///\exception   H5::FileIException or H5::GroupIException
+// Programmer   Binh-Minh Ribler - Jul, 2005
 //--------------------------------------------------------------------------
-int CommonFG::iterateElems( const char* name, int *idx, H5G_iterate_t op , void* op_data )
+VarLenType
+CommonFG::openVarLenType(const char *name) const
 {
-   int ret_value = H5Giterate( getLocId(), name, idx, op, op_data );
-   if( ret_value < 0 )
-   {
-      throwException("iterateElems", "H5Giterate failed");
-   }
-   return( ret_value );
-}
+    // Call C function H5Topen2 to open the named datatype in this group,
+    // given either the file or group id
+    hid_t type_id = H5Topen2(getLocId(), name, H5P_DEFAULT);
 
-//--------------------------------------------------------------------------
-// Function:	CommonFG::iterateElems
-///\brief	This is an overloaded member function, provided for convenience.
-///		It differs from the above function in that it takes an
-///		\c H5std_string for \a name.
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-int CommonFG::iterateElems( const H5std_string& name, int *idx, H5G_iterate_t op , void* op_data )
-{
-   return( iterateElems( name.c_str(), idx, op, op_data ));
-}
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
-
-//--------------------------------------------------------------------------
-// Function:	CommonFG::getNumObjs
-///\brief	Returns the number of objects in this group.
-///\return	Number of objects
-///\exception	H5::FileIException or H5::GroupIException
-// Programmer	Binh-Minh Ribler - January, 2003
-//--------------------------------------------------------------------------
-hsize_t CommonFG::getNumObjs() const
-{
-   H5G_info_t 		ginfo;                  /* Group information */
+    // If the datatype's opening failed, throw an exception
+    if (type_id < 0)
+        throwException("openVarLenType", "H5Topen2 failed");
 
-   herr_t ret_value = H5Gget_info(getLocId(), &ginfo);
-   if(ret_value < 0)
-      throwException("getNumObjs", "H5Gget_info failed");
-   return (ginfo.nlinks);
+    // No failure, create and return the VarLenType object
+    VarLenType varlen_type;
+    f_DataType_setId(&varlen_type, type_id);
+    return (varlen_type);
 }
 
 //--------------------------------------------------------------------------
-// Function:	CommonFG::getObjnameByIdx
-///\brief	Returns the name of an object in this group, given the
-///		object's index.
-///\param	idx  -     IN: Transient index of the object
-///\return	Object name
-///\exception	H5::FileIException or H5::GroupIException
-///\par Description
-///		The value of idx can be any nonnegative number less than the
-///		total number of objects in the group, which is returned by
-///		the function \c CommonFG::getNumObjs.  Note that this is a
-///		transient index; thus, an object may have a different index
-///		each time the group is opened.
-// Programmer	Binh-Minh Ribler - Mar, 2005
+// Function:    CommonFG::openVarLenType
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes an
+///             \c H5std_string for \a name.
+// Programmer   Binh-Minh Ribler - Jul, 2005
 //--------------------------------------------------------------------------
-H5std_string CommonFG::getObjnameByIdx(hsize_t idx) const
+VarLenType
+CommonFG::openVarLenType(const H5std_string &name) const
 {
-    // call H5Lget_name_by_idx with name as NULL to get its length
-    ssize_t name_len = H5Lget_name_by_idx(getLocId(), ".", H5_INDEX_NAME, H5_ITER_INC, idx, NULL, 0, H5P_DEFAULT);
-    if(name_len < 0)
-      throwException("getObjnameByIdx", "H5Lget_name_by_idx failed");
-
-    // now, allocate C buffer to get the name
-    char* name_C = new char[name_len+1];
-    HDmemset(name_C, 0, name_len+1); // clear buffer
-
-    name_len = H5Lget_name_by_idx(getLocId(), ".", H5_INDEX_NAME, H5_ITER_INC, idx, name_C, name_len+1, H5P_DEFAULT);
-
-    if (name_len < 0)
-    {
-	delete []name_C;
-	throwException("getObjnameByIdx", "H5Lget_name_by_idx failed");
-    }
-
-    // clean up and return the string
-    H5std_string name = H5std_string(name_C);
-    delete []name_C;
-    return (name);
-}
-
-//--------------------------------------------------------------------------
-// Function:	CommonFG::getObjnameByIdx
-///\brief	Retrieves the name of an object in this group, given the
-///		object's index.
-///\param	idx  -     IN: Transient index of the object
-///\param	name - IN/OUT: Retrieved name of the object
-///\param	size -     IN: Length to retrieve
-///\return	Actual size of the object name or 0, if object has no name
-///\exception	H5::FileIException or H5::GroupIException
-///\par Description
-///		The value of idx can be any nonnegative number less than the
-///		total number of objects in the group, which is returned by
-///		the function \c CommonFG::getNumObjs.  Note that this is a
-///		transient index; thus, an object may have a different index
-///		each time the group is opened.
-// Programmer	Binh-Minh Ribler - January, 2003
-//--------------------------------------------------------------------------
-ssize_t CommonFG::getObjnameByIdx(hsize_t idx, char* name, size_t size) const
-{
-   ssize_t name_len = H5Lget_name_by_idx(getLocId(), ".", H5_INDEX_NAME, H5_ITER_INC, idx, name, size, H5P_DEFAULT);
-   if(name_len < 0)
-      throwException("getObjnameByIdx", "H5Lget_name_by_idx failed");
-
-   return (name_len);
+    return (openVarLenType(name.c_str()));
 }
 
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
 //--------------------------------------------------------------------------
-// Function:	CommonFG::getObjnameByIdx
-///\brief	This is an overloaded member function, provided for convenience.
-///		It differs from the above function in that it takes an
-///		\c H5std_string for \a name.
-// Programmer	Binh-Minh Ribler - January, 2003
-//--------------------------------------------------------------------------
-ssize_t CommonFG::getObjnameByIdx(hsize_t idx, H5std_string& name, size_t size) const
-{
-   char* name_C = new char[size+1]; // temporary C-string for object name
-   HDmemset(name_C, 0, size+1); // clear buffer
-
-   // call overloaded function to get the name
-   ssize_t name_len = getObjnameByIdx(idx, name_C, size+1);
-   if(name_len < 0)
-   {
-      delete []name_C;
-      throwException("getObjnameByIdx", "H5Lget_name_by_idx failed");
-   }
-
-   // clean up and return the string
-   name = H5std_string(name_C);
-   delete []name_C;
-   return (name_len);
-}
-
-//--------------------------------------------------------------------------
-// Function:	CommonFG::childObjType
-///\brief	Returns the type of an object in this file/group, given the
-///		object's name.
-///\param	objname - IN: Name of the object
-///\return	Object type, which can have the following values for group,
-///		dataset, and named datatype
-///		\li \c H5O_TYPE_GROUP
-///		\li \c H5O_TYPE_DATASET
-///		\li \c H5O_TYPE_NAMED_DATATYPE
-///		Refer to the C API documentation for more details:
-///		http://www.hdfgroup.org/HDF5/doc/RM/RM_H5O.html#Object-GetInfo
-///\exception	H5::FileIException or H5::GroupIException
-///		Exception will be thrown when:
-///		- an error returned by the C API
-///		- object type is not one of the valid values above
-// Programmer	Binh-Minh Ribler - April, 2014
-//--------------------------------------------------------------------------
-H5O_type_t CommonFG::childObjType(const char* objname) const
-{
-    H5O_info_t objinfo;
-    H5O_type_t objtype = H5O_TYPE_UNKNOWN;
-
-    // Use C API to get information of the object
-    herr_t ret_value = H5Oget_info_by_name(getLocId(), objname, &objinfo, H5P_DEFAULT);
-
-    // Throw exception if C API returns failure
-    if (ret_value < 0)
-	throwException("childObjType", "H5Oget_info_by_name failed");
-    // Return a valid type or throw an exception for unknown type
-    else
-      switch (objinfo.type)
-      {
-	case H5O_TYPE_GROUP:
-	case H5O_TYPE_DATASET:
-	case H5O_TYPE_NAMED_DATATYPE:
-	    objtype = objinfo.type;
-	    break;
-	default:
-	    throwException("childObjType", "Unknown type of object");
-      }
-    return(objtype);
-}
-
-//--------------------------------------------------------------------------
-// Function:	CommonFG::childObjType
-///\brief	This is an overloaded member function, provided for convenience.
-///		It takes an \a H5std_string for the object's name.
-///\brief	Returns the type of an object in this group, given the
-///		object's name.
-///\param	objname - IN: Name of the object (H5std_string&)
-///\exception	H5::FileIException or H5::GroupIException
-// Programmer	Binh-Minh Ribler - April, 2014
+// Function:    CommonFG default constructor
+///\brief       Default constructor.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-H5O_type_t CommonFG::childObjType(const H5std_string& objname) const
+CommonFG::CommonFG()
 {
-    // Use overloaded function
-    H5O_type_t objtype = childObjType(objname.c_str());
-    return(objtype);
 }
 
 //--------------------------------------------------------------------------
-// Function:	CommonFG::childObjType
-///\brief	Returns the type of an object in this file/group, given the
-///		object's index and its type and order.
-///\param	index - IN: Position of the object
-///\param	index_type - IN: Type of the index, default to H5_INDEX_NAME
-///\param	order - IN: Traversing order, default to H5_ITER_INC
-///\param	objname - IN: Name of the object, default to "."
-///\return	Object type, which can have the following values for group,
-///		dataset, and named datatype
-///		\li \c H5O_TYPE_GROUP
-///		\li \c H5O_TYPE_DATASET
-///		\li \c H5O_TYPE_NAMED_DATATYPE
-///		Refer to the C API documentation for more details:
-///		http://www.hdfgroup.org/HDF5/doc/RM/RM_H5O.html#Object-GetInfo
-///\exception	H5::FileIException or H5::GroupIException
-///		Exception will be thrown when:
-///		- an error returned by the C API
-///		- object type is not one of the valid values above
-// Developer's Notes:
-//	- this overload uses H5Oget_info_by_idx instead of H5Oget_info_by_name
-//	  like the previous childObjType()
-//	- index is the required argument so, first
-//	- objname is last because it's more likely the location is already
-//	  fully specified
-//	- Leave property list out for now because C API is not using it, it
-//	  can be added later when needed.
-// Programmer	Binh-Minh Ribler - April, 2014
+// Function:    CommonFG destructor
+///\brief       Noop destructor.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-H5O_type_t CommonFG::childObjType(hsize_t index, H5_index_t index_type, H5_iter_order_t order, const char* objname) const
+CommonFG::~CommonFG()
 {
-    herr_t ret_value;
-    H5O_info_t objinfo;
-    H5O_type_t objtype = H5O_TYPE_UNKNOWN;
-
-    // Use C API to get information of the object
-    ret_value = H5Oget_info_by_idx(getLocId(), objname, index_type, order, index, &objinfo, H5P_DEFAULT);
-
-    // Throw exception if C API returns failure
-    if (ret_value < 0)
-	throwException("childObjType", "H5Oget_info_by_idx failed");
-    // Return a valid type or throw an exception for unknown type
-    else
-      switch (objinfo.type)
-      {
-	case H5O_TYPE_GROUP:
-	case H5O_TYPE_DATASET:
-	case H5O_TYPE_NAMED_DATATYPE:
-	    objtype = objinfo.type;
-	    break;
-	default:
-	    throwException("childObjType", "Unknown type of object");
-      }
-    return(objtype);
 }
 
-#ifndef H5_NO_DEPRECATED_SYMBOLS
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 //--------------------------------------------------------------------------
-// Function:	CommonFG::getObjTypeByIdx
-///\brief	Returns the type of an object in this group, given the
-///		object's index.
-///\param	idx - IN: Transient index of the object
-///\return	Object type
-///\exception	H5::FileIException or H5::GroupIException
-// Programmer	Binh-Minh Ribler - January, 2003
+// Function:    f_DataType_setId - friend
+// Purpose:     This function is friend to class H5::DataType so that it
+//              can set DataType::id in order to work around a problem
+//              described in the JIRA issue HDFFV-7947.
+//              Applications shouldn't need to use it.
+// param        dtype   - IN/OUT: DataType object to be changed
+// param        new_id - IN: New id to set
+// Programmer   Binh-Minh Ribler - 2015
 //--------------------------------------------------------------------------
-H5G_obj_t CommonFG::getObjTypeByIdx(hsize_t idx) const
+void
+f_DataType_setId(DataType *dtype, hid_t new_id)
 {
-   H5G_obj_t obj_type = H5Gget_objtype_by_idx(getLocId(), idx);
-   if (obj_type == H5G_UNKNOWN)
-      throwException("getObjTypeByIdx", "H5Gget_objtype_by_idx failed");
-
-   return (obj_type);
+    dtype->p_setId(new_id);
 }
 
 //--------------------------------------------------------------------------
-// Function:	CommonFG::getObjTypeByIdx
-///\brief	This is an overloaded member function, provided for convenience.
-///		It differs from the above function because it also provides
-///		the returned object type in text (char*)
-///\param	idx       - IN: Transient index of the object
-///\param	type_name - OUT: Object type in text
-///\return	Object type
-///\exception	H5::FileIException or H5::GroupIException
-// Programmer	Binh-Minh Ribler - May, 2010
+// Function:    f_DataSet_setId - friend
+// Purpose:     This function is friend to class H5::DataSet so that it
+//              can set DataSet::id in order to work around a problem
+//              described in the JIRA issue HDFFV-7947.
+//              Applications shouldn't need to use it.
+// param        dset   - IN/OUT: DataSet object to be changed
+// param        new_id - IN: New id to set
+// Programmer   Binh-Minh Ribler - 2015
 //--------------------------------------------------------------------------
-H5G_obj_t CommonFG::getObjTypeByIdx(hsize_t idx, char* type_name) const
+void
+f_DataSet_setId(DataSet *dset, hid_t new_id)
 {
-   H5G_obj_t obj_type = H5Gget_objtype_by_idx(getLocId(), idx);
-   switch (obj_type)
-   {
-	case H5G_LINK: HDstrcpy(type_name, "symbolic link"); break;
-	case H5G_GROUP: HDstrcpy(type_name, "group"); break;
-	case H5G_DATASET: HDstrcpy(type_name, "dataset"); break;
-	case H5G_TYPE: HDstrcpy(type_name, "datatype"); break;
-	case H5G_UNKNOWN:
-	default:
-	   throwException("getObjTypeByIdx", "H5Gget_objtype_by_idx failed");
-   }
-   return (obj_type);
+    dset->p_setId(new_id);
 }
-//--------------------------------------------------------------------------
-// Function:	CommonFG::getObjTypeByIdx
-///\brief	This is an overloaded member function, provided for convenience.
-///		It differs from the above function because it also provides
-///		the returned object type in text (H5std_string&)
-///\param	idx       - IN: Transient index of the object
-///\param	type_name - OUT: Object type in text
-///\return	Object type
-///\exception	H5::FileIException or H5::GroupIException
-// Programmer	Binh-Minh Ribler - January, 2003
-//--------------------------------------------------------------------------
-H5G_obj_t CommonFG::getObjTypeByIdx(hsize_t idx, H5std_string& type_name) const
-{
-   H5G_obj_t obj_type = H5Gget_objtype_by_idx(getLocId(), idx);
-   switch (obj_type)
-   {
-	case H5G_LINK: type_name = H5std_string("symbolic link"); break;
-	case H5G_GROUP: type_name = H5std_string("group"); break;
-	case H5G_DATASET: type_name = H5std_string("dataset"); break;
-	case H5G_TYPE: type_name = H5std_string("datatype"); break;
-	case H5G_UNKNOWN:
-	default:
-	   throwException("getObjTypeByIdx", "H5Gget_objtype_by_idx failed");
-   }
-   return (obj_type);
-}
-#endif // DOXYGEN_SHOULD_SKIP_THIS
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
-
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
-//--------------------------------------------------------------------------
-// Function:	CommonFG default constructor
-///\brief	Default constructor.
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-CommonFG::CommonFG() {}
 
-//--------------------------------------------------------------------------
-// Function:	CommonFG destructor
-///\brief	Noop destructor.
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-CommonFG::~CommonFG() {}
 #endif // DOXYGEN_SHOULD_SKIP_THIS
 
-#ifndef H5_NO_NAMESPACE
-}
-#endif
-
+} // namespace H5
diff --git a/c++/src/H5CommonFG.h b/c++/src/H5CommonFG.h
index 5c8a142..e675617 100644
--- a/c++/src/H5CommonFG.h
+++ b/c++/src/H5CommonFG.h
@@ -1,170 +1,95 @@
 // C++ informative line for the emacs editor: -*- C++ -*-
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __CommonFG_H
-#define __CommonFG_H
+#ifndef H5CommonFG_H
+#define H5CommonFG_H
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#endif
 
+// Class forwarding
 class Group;
 class H5File;
 class ArrayType;
 class VarLenType;
 
 /*! \class CommonFG
-    \brief \a CommonFG is an abstract base class of H5File and H5Group.
-
-    It provides common operations of H5File and H5Group.
+    \brief \a CommonFG is an abstract base class of H5Group.
 */
+/* Note: This class is being deprecated gradually. */
 class H5_DLLCPP CommonFG {
-   public:
-	// Creates a new group at this location which can be a file
-	// or another group.
-	Group createGroup(const char* name, size_t size_hint = 0) const;
-	Group createGroup(const H5std_string& name, size_t size_hint = 0) const;
-
-	// Opens an existing group in a location which can be a file
-	// or another group.
-	Group openGroup(const char* name) const;
-	Group openGroup(const H5std_string& name) const;
-
-	// Creates a new dataset at this location.
-	DataSet createDataSet(const char* name, const DataType& data_type, const DataSpace& data_space, const DSetCreatPropList& create_plist = DSetCreatPropList::DEFAULT) const;
-	DataSet createDataSet(const H5std_string& name, const DataType& data_type, const DataSpace& data_space, const DSetCreatPropList& create_plist = DSetCreatPropList::DEFAULT) const;
-
-	// Opens an existing dataset at this location.
-	DataSet openDataSet(const char* name) const;
-	DataSet openDataSet(const H5std_string& name) const;
-
-	// Returns the value of a symbolic link.
-	H5std_string getLinkval(const char* link_name, size_t size=0) const;
-	H5std_string getLinkval(const H5std_string& link_name, size_t size=0) const;
-
-	// Returns the number of objects in this group.
-	hsize_t getNumObjs() const;
-
-	// Retrieves the name of an object in this group, given the
-	// object's index.
-	H5std_string getObjnameByIdx(hsize_t idx) const;
-	ssize_t getObjnameByIdx(hsize_t idx, char* name, size_t size) const;
-	ssize_t getObjnameByIdx(hsize_t idx, H5std_string& name, size_t size) const;
-
-	// Retrieves the type of an object in this file or group, given the
-	// object's name
-	H5O_type_t childObjType(const H5std_string& objname) const;
-	H5O_type_t childObjType(const char* objname) const;
-	H5O_type_t childObjType(hsize_t index, H5_index_t index_type=H5_INDEX_NAME, H5_iter_order_t order=H5_ITER_INC, const char* objname=".") const;
-
-#ifndef H5_NO_DEPRECATED_SYMBOLS
-	// Returns the type of an object in this group, given the
-	// object's index.
-	H5G_obj_t getObjTypeByIdx(hsize_t idx) const;
-	H5G_obj_t getObjTypeByIdx(hsize_t idx, char* type_name) const;
-	H5G_obj_t getObjTypeByIdx(hsize_t idx, H5std_string& type_name) const;
-
-	// Returns information about an HDF5 object, given by its name,
-	// at this location.
-	void getObjinfo(const char* name, hbool_t follow_link, H5G_stat_t& statbuf) const;
-	void getObjinfo(const H5std_string& name, hbool_t follow_link, H5G_stat_t& statbuf) const;
-	void getObjinfo(const char* name, H5G_stat_t& statbuf) const;
-	void getObjinfo(const H5std_string& name, H5G_stat_t& statbuf) const;
-
-	// Iterates over the elements of this group - not implemented in
-	// C++ style yet.
-	int iterateElems(const char* name, int *idx, H5G_iterate_t op, void *op_data);
-	int iterateElems(const H5std_string& name, int *idx, H5G_iterate_t op, void *op_data);
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
-
-	// Creates a link of the specified type from new_name to current_name;
-	// both names are interpreted relative to the specified location id.
-	void link(H5L_type_t link_type, const char* curr_name, const char* new_name) const;
-	void link(H5L_type_t link_type, const H5std_string& curr_name, const H5std_string& new_name) const;
-
-	// Removes the specified name at this location.
-	void unlink(const char* name) const;
-	void unlink(const H5std_string& name) const;
-
-	// Mounts the file 'child' onto this location.
-	void mount(const char* name, const H5File& child, const PropList& plist) const;
-	void mount(const char* name, H5File& child, PropList& plist) const; // backward compatibility
-	void mount(const H5std_string& name, const H5File& child, const PropList& plist) const;
-	void mount(const H5std_string& name, H5File& child, PropList& plist) const; // backward compatibility
-
-	// Unmounts the file named 'name' from this parent location.
-	void unmount(const char* name) const;
-	void unmount(const H5std_string& name) const;
-
-	// Renames an object at this location.
-	void move(const char* src, const char* dst) const;
-	void move(const H5std_string& src, const H5std_string& dst) const;
-
-	// Opens a generic named datatype in this location.
-	DataType openDataType(const char* name) const;
-	DataType openDataType(const H5std_string& name) const;
-
-	// Opens a named array datatype in this location.
-	ArrayType openArrayType(const char* name) const;
-	ArrayType openArrayType(const H5std_string& name) const;
-
-	// Opens a named compound datatype in this location.
-	CompType openCompType(const char* name) const;
-	CompType openCompType(const H5std_string& name) const;
-
-	// Opens a named enumeration datatype in this location.
-	EnumType openEnumType(const char* name) const;
-	EnumType openEnumType(const H5std_string& name) const;
-
-	// Opens a named integer datatype in this location.
-	IntType openIntType(const char* name) const;
-	IntType openIntType(const H5std_string& name) const;
-
-	// Opens a named floating-point datatype in this location.
-	FloatType openFloatType(const char* name) const;
-	FloatType openFloatType(const H5std_string& name) const;
-
-	// Opens a named string datatype in this location.
-	StrType openStrType(const char* name) const;
-	StrType openStrType(const H5std_string& name) const;
-
-	// Opens a named variable length datatype in this location.
-	VarLenType openVarLenType(const char* name) const;
-	VarLenType openVarLenType(const H5std_string& name) const;
+  public:
+    // Opens a generic named datatype in this location.
+    DataType openDataType(const char *name) const;
+    DataType openDataType(const H5std_string &name) const;
+
+    // Opens a named array datatype in this location.
+    ArrayType openArrayType(const char *name) const;
+    ArrayType openArrayType(const H5std_string &name) const;
+
+    // Opens a named compound datatype in this location.
+    CompType openCompType(const char *name) const;
+    CompType openCompType(const H5std_string &name) const;
+
+    // Opens a named enumeration datatype in this location.
+    EnumType openEnumType(const char *name) const;
+    EnumType openEnumType(const H5std_string &name) const;
+
+    // Opens a named integer datatype in this location.
+    IntType openIntType(const char *name) const;
+    IntType openIntType(const H5std_string &name) const;
+
+    // Opens a named floating-point datatype in this location.
+    FloatType openFloatType(const char *name) const;
+    FloatType openFloatType(const H5std_string &name) const;
+
+    // Opens a named string datatype in this location.
+    StrType openStrType(const char *name) const;
+    StrType openStrType(const H5std_string &name) const;
+
+    // Opens a named variable length datatype in this location.
+    VarLenType openVarLenType(const char *name) const;
+    VarLenType openVarLenType(const H5std_string &name) const;
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
-	/// For subclasses, H5File and Group, to return the correct
-	/// object id, i.e. file or group id.
-	virtual hid_t getLocId() const = 0;
+    /// For subclasses, H5File and Group, to return the correct
+    /// object id, i.e. file or group id.
+    virtual hid_t getLocId() const = 0;
+
+    /// For subclasses, H5File and Group, to throw appropriate exception.
+    virtual void throwException(const H5std_string &func_name, const H5std_string &msg) const = 0;
 
+    // Default constructor.
+    CommonFG();
 
-	/// For subclasses, H5File and Group, to throw appropriate exception.
-	virtual void throwException(const H5std_string& func_name, const H5std_string& msg) const = 0;
+    // Noop destructor.
+    virtual ~CommonFG();
 
-	// Default constructor.
-	CommonFG();
+  protected:
+    virtual void p_setId(const hid_t new_id) = 0;
 
-	// Noop destructor.
-	virtual ~CommonFG();
 #endif // DOXYGEN_SHOULD_SKIP_THIS
 
-}; // end of CommonFG declaration
+}; // end of CommonFG
+} // namespace H5
 
-#ifndef H5_NO_NAMESPACE
-}
-#endif
-#endif // __CommonFG_H
+#endif // H5CommonFG_H
 
+/***************************************************************************
+                                Design Note
+                                ===========
+
+September 2017:
+
+        This class used to be base class of H5File as well, until the
+        restructure that moved H5File to be subclass of H5Group.
+*/
diff --git a/c++/src/H5CompType.cpp b/c++/src/H5CompType.cpp
index 191f004..1f7755e 100644
--- a/c++/src/H5CompType.cpp
+++ b/c++/src/H5CompType.cpp
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <string>
@@ -19,360 +16,445 @@
 #include "H5Exception.h"
 #include "H5IdComponent.h"
 #include "H5PropList.h"
-#include "H5Object.h"
+#include "H5OcreatProp.h"
 #include "H5DcreatProp.h"
-#include "H5CommonFG.h"
+#include "H5DxferProp.h"
+#include "H5LcreatProp.h"
+#include "H5LaccProp.h"
+#include "H5DaccProp.h"
+#include "H5Location.h"
+#include "H5Object.h"
 #include "H5Alltypes.h"
 #include "H5AbstractDs.h"
-#include "H5DxferProp.h"
 #include "H5DataSpace.h"
 #include "H5DataSet.h"
-#include "H5private.h"
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#endif
 
 //--------------------------------------------------------------------------
-// Function:	CompType default constructor
-///\brief	Default constructor: Creates a stub compound datatype
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    CompType default constructor
+///\brief       Default constructor: Creates a stub compound datatype
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-CompType::CompType() : DataType() {}
+CompType::CompType() : DataType()
+{
+}
 
 //--------------------------------------------------------------------------
-// Function:	CompType copy constructor
-///\brief	Copy constructor: makes copy of the original CompType object
-///\param	original - IN: Original CompType instance
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    CompType copy constructor
+///\brief       Copy constructor: same HDF5 object as \a original
+///\param       original - IN: Original CompType instance
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-CompType::CompType( const CompType& original ) : DataType( original ) {}
+CompType::CompType(const CompType &original) : DataType(original)
+{
+}
 
 //--------------------------------------------------------------------------
-// Function:	CompType overloaded constructor
-///\brief	Creates a CompType object using the id of an existing datatype.
-///\param	existing_id - IN: Id of an existing compound datatype
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    CompType overloaded constructor
+///\brief       Creates a CompType object using the id of an existing datatype.
+///\param       existing_id - IN: Id of an existing compound datatype
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-CompType::CompType( const hid_t existing_id ) : DataType( existing_id ) {}
+CompType::CompType(const hid_t existing_id) : DataType(existing_id)
+{
+}
 
 //--------------------------------------------------------------------------
-// Function:	CompType overloaded constructor
-///\brief	Creates an empty compound datatype given a size, in bytes.
-///\param	size - IN: Number of bytes in the datatype to create
-///\exception	H5::DataTypeIException
+// Function:    CompType overloaded constructor
+///\brief       Creates an empty compound datatype given a size, in bytes.
+///\param       size - IN: Number of bytes in the datatype to create
+///\exception   H5::DataTypeIException
 // Description
-// 		The DataType constructor calls the C API H5Tcreate to create
-// 		the compound datatype.
-// Programmer	Binh-Minh Ribler - 2000
+//              The DataType constructor calls the C API H5Tcreate to create
+//              the compound datatype.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-CompType::CompType( size_t size ) : DataType( H5T_COMPOUND, size ) {}
+CompType::CompType(size_t size) : DataType(H5T_COMPOUND, size)
+{
+}
 
 //--------------------------------------------------------------------------
-// Function:	CompType overloaded constructor
-///\brief	Gets the compound datatype of the specified dataset.
-///\param	dataset - IN: Dataset that this enum datatype associates with
-///\return	CompType instance
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    CompType overloaded constructor
+///\brief       Gets the compound datatype of the specified dataset.
+///\param       dataset - IN: Dataset that this enum datatype associates with
+///\return      CompType instance
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-CompType::CompType( const DataSet& dataset ) : DataType()
+CompType::CompType(const DataSet &dataset) : DataType()
 {
-   // Calls C function H5Dget_type to get the id of the datatype
-   id = H5Dget_type( dataset.getId() );
+    // Calls C function H5Dget_type to get the id of the datatype
+    id = H5Dget_type(dataset.getId());
 
-   // If the datatype id is invalid, throw exception
-   if( id < 0 )
-   {
-      throw DataSetIException("CompType constructor", "H5Dget_type failed");
-   }
+    // If the datatype id is invalid, throw exception
+    if (id < 0) {
+        throw DataSetIException("CompType constructor", "H5Dget_type failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	CompType::getNmembers
-///\brief	Returns the number of members in this compound datatype.
-///\return	Number of members
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    CompType overloaded constructor
+///\brief       Creates an CompType instance by opening an HDF5 compound
+///             given its name, provided as a C character string.
+///\param       loc        - IN: Location of the type
+///\param       dtype_name - IN: Compound type name
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - Dec 2016
+// Description
+//              In 1.10.1, this constructor was introduced and may replace the
+//              existing function CommonFG::openCompType(const char*) to
+//              improve usability.
+//              -BMR, Dec 2016
 //--------------------------------------------------------------------------
-int CompType::getNmembers() const
+CompType::CompType(const H5Location &loc, const char *dtype_name) : DataType()
 {
-   int num_members = H5Tget_nmembers( id );
-   if( num_members < 0 )
-   {
-      throw DataTypeIException("CompType::getNmembers",
-		"H5Tget_nmembers returns negative number of members");
-   }
-   return( num_members );
+    id = p_opentype(loc, dtype_name);
 }
 
 //--------------------------------------------------------------------------
-// Function:	CompType::getMemberName
-///\brief	Returns the name of a member in this compound datatype.
-///\param	member_num - IN: Zero-based index of the member
-///\return	Name of member
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    CompType overloaded constructor
+///\brief       Creates an CompType instance by opening an HDF5 compound
+///             datatype given its name, provided as an \c H5std_string.
+///\param       loc        - IN: Location of the type
+///\param       dtype_name - IN: Compound type name
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - Dec 2016
+// Description
+//              In 1.10.1, this constructor was introduced and may replace the
+//              existing function CommonFG::openCompType(const H5Location&)
+//              to improve usability.
+//              -BMR, Dec 2016
+//--------------------------------------------------------------------------
+CompType::CompType(const H5Location &loc, const H5std_string &dtype_name) : DataType()
+{
+    id = p_opentype(loc, dtype_name.c_str());
+}
+
+//--------------------------------------------------------------------------
+// Function:    CompType::decode
+///\brief       Returns a CompType object via DataType* by decoding the
+///             binary object description of this datatype.
+///
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - Aug 2017
+//--------------------------------------------------------------------------
+DataType *
+CompType::decode() const
+{
+    hid_t encoded_cmptype_id = H5I_INVALID_HID;
+    try {
+        encoded_cmptype_id = p_decode();
+    }
+    catch (DataTypeIException &err) {
+        throw;
+    }
+    CompType *encoded_cmptype = new CompType;
+    encoded_cmptype->p_setId(encoded_cmptype_id);
+    return (encoded_cmptype);
+}
+
+//--------------------------------------------------------------------------
+// Function:    CompType::getNmembers
+///\brief       Returns the number of members in this compound datatype.
+///\return      Number of members
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+int
+CompType::getNmembers() const
+{
+    int num_members = H5Tget_nmembers(id);
+    if (num_members < 0) {
+        throw DataTypeIException("CompType::getNmembers",
+                                 "H5Tget_nmembers returns negative number of members");
+    }
+    return (num_members);
+}
+
+//--------------------------------------------------------------------------
+// Function:    CompType::getMemberName
+///\brief       Returns the name of a member in this compound datatype.
+///\param       member_num - IN: Zero-based index of the member
+///\return      Name of member
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-H5std_string CompType::getMemberName( unsigned member_num ) const
+H5std_string
+CompType::getMemberName(unsigned member_num) const
 {
-    char* member_name_C = H5Tget_member_name( id, member_num );
-    if( member_name_C == NULL )  // NULL means failure
+    char *member_name_C = H5Tget_member_name(id, member_num);
+    if (member_name_C == NULL) // NULL means failure
     {
-	throw DataTypeIException("CompType::getMemberName",
-		"H5Tget_member_name returns NULL for member name");
+        throw DataTypeIException("CompType::getMemberName",
+                                 "H5Tget_member_name returns NULL for member name");
     }
     H5std_string member_name = H5std_string(member_name_C); // convert C string to string
-    H5free_memory(member_name_C); // free the C string
-    return( member_name ); // return the member name string
+    H5free_memory(member_name_C);                           // free the C string
+    return (member_name);                                   // return the member name string
 }
 
 //--------------------------------------------------------------------------
-// Function:	CompType::getMemberIndex
-///\brief	Returns the index of a member in this compound datatype.
-///\param	name - IN: Name of the member
-///\return	Index of member
-///\exception	H5::DataTypeIException
+// Function:    CompType::getMemberIndex
+///\brief       Returns the index of a member in this compound datatype.
+///\param       name - IN: Name of the member
+///\return      Index of member
+///\exception   H5::DataTypeIException
 ///\par Description
-///		Members are stored in no particular order with numbers 0
-///		through N-1, where N is the value returned by the member
-///		function \c CompType::getNmembers.
-// Programmer	Binh-Minh Ribler - May 16, 2002
+///             Members are stored in no particular order with numbers 0
+///             through N-1, where N is the value returned by the member
+///             function \c CompType::getNmembers.
+// Programmer   Binh-Minh Ribler - May 16, 2002
 //--------------------------------------------------------------------------
-int CompType::getMemberIndex(const char* name) const
+int
+CompType::getMemberIndex(const char *name) const
 {
-   int member_index = H5Tget_member_index(id, name);
-   if( member_index < 0 )
-   {
-      throw DataTypeIException("CompType::getMemberIndex",
-		"H5Tget_member_index returns negative value");
-   }
-   return( member_index );
+    int member_index = H5Tget_member_index(id, name);
+    if (member_index < 0) {
+        throw DataTypeIException("CompType::getMemberIndex", "H5Tget_member_index returns negative value");
+    }
+    return (member_index);
 }
-int CompType::getMemberIndex(const H5std_string& name) const
+int
+CompType::getMemberIndex(const H5std_string &name) const
 {
-   return(getMemberIndex(name.c_str()));
+    return (getMemberIndex(name.c_str()));
 }
 
 //--------------------------------------------------------------------------
-// Function:	CompType::getMemberOffset
-///\brief	Returns the byte offset of the beginning of a member with
-///		respect to the beginning of the compound data type datum.
-///\param	member_num - IN: Zero-based index of the member
-///\return	Byte offset
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    CompType::getMemberOffset
+///\brief       Returns the byte offset of the beginning of a member with
+///             respect to the beginning of the compound data type datum.
+///\param       member_num - IN: Zero-based index of the member
+///\return      Byte offset
+// Programmer   Binh-Minh Ribler - 2000
 // Description
-///		Members are stored in no particular order with numbers 0
-///		through N-1, where N is the value returned by the member
-///		function \c CompType::getNmembers.
+///             Members are stored in no particular order with numbers 0
+///             through N-1, where N is the value returned by the member
+///             function \c CompType::getNmembers.
 //
-//		Note that byte offset being returned as 0 doesn't indicate
-//		a failure. (According to Quincey)
+//              Note that byte offset being returned as 0 doesn't indicate
+//              a failure. (According to Quincey)
 //--------------------------------------------------------------------------
-size_t CompType::getMemberOffset( unsigned member_num ) const
+size_t
+CompType::getMemberOffset(unsigned member_num) const
 {
-   size_t offset = H5Tget_member_offset( id, member_num );
-   return( offset );
+    size_t offset = H5Tget_member_offset(id, member_num);
+    return (offset);
 }
 
 //--------------------------------------------------------------------------
-// Function:	CompType::getMemberClass
-///\brief	Gets the type class of the specified member.
-///\param	member_num - IN: Zero-based index of the member
-///\return	Type class of the member
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    CompType::getMemberClass
+///\brief       Gets the type class of the specified member.
+///\param       member_num - IN: Zero-based index of the member
+///\return      Type class of the member
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 // Modification
-//		Modified to use H5Tget_member_class instead. - Jul, 2005
+//              Modified to use H5Tget_member_class instead. - Jul, 2005
 //--------------------------------------------------------------------------
-H5T_class_t CompType::getMemberClass( unsigned member_num ) const
+H5T_class_t
+CompType::getMemberClass(unsigned member_num) const
 {
-   H5T_class_t member_class = H5Tget_member_class(id, member_num);
-   if( member_class == H5T_NO_CLASS )
-   {
-      throw DataTypeIException("CompType::getMemberClass",
-		"H5Tget_member_class returns H5T_NO_CLASS");
-   }
-   return(member_class);
+    H5T_class_t member_class = H5Tget_member_class(id, member_num);
+    if (member_class == H5T_NO_CLASS) {
+        throw DataTypeIException("CompType::getMemberClass", "H5Tget_member_class returns H5T_NO_CLASS");
+    }
+    return (member_class);
 }
 
 // This private member function calls the C API to get the identifier
 // of the specified member.  It provides the id to construct appropriate
 // sub-types in the functions getMemberXxxType below, where Xxx indicates
 // the sub-types.
-hid_t CompType::p_get_member_type(unsigned member_num) const
-{
-   // get the id of the specified member first
-   hid_t member_type_id = H5Tget_member_type( id, member_num );
-   if( member_type_id > 0 )
-      return( member_type_id );
-   else
-   {
-      // p_get_member_type is private, caller will catch this exception
-      // then throw another with appropriate API name
-      throw DataTypeIException("", "H5Tget_member_type failed");
-   }
-}
+hid_t
+CompType::p_get_member_type(unsigned member_num) const
+{
+    // get the id of the specified member first
+    hid_t member_type_id = H5Tget_member_type(id, member_num);
+    if (member_type_id > 0)
+        return (member_type_id);
+    else {
+        // p_get_member_type is private, caller will catch this exception
+        // then throw another with appropriate API name
+        throw DataTypeIException("", "H5Tget_member_type failed");
+    }
+}
 
 //--------------------------------------------------------------------------
-// Function:	CompType::getMemberDataType
-///\brief	Returns the generic datatype of the specified member in this
-///		compound datatype.
-///\param	member_num - IN: Zero-based index of the member
-///\return	DataType instance
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    CompType::getMemberDataType
+///\brief       Returns the generic datatype of the specified member in this
+///             compound datatype.
+///\param       member_num - IN: Zero-based index of the member
+///\return      DataType instance
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-DataType CompType::getMemberDataType( unsigned member_num ) const
+DataType
+CompType::getMemberDataType(unsigned member_num) const
 {
-   try {
-      DataType datatype(p_get_member_type(member_num));
-      return(datatype);
-   }
-   catch (DataTypeIException E) {
-      throw DataTypeIException("CompType::getMemberDataType", E.getDetailMsg());
-   }
-}
+    try {
+        DataType datatype;
+        f_DataType_setId(&datatype, p_get_member_type(member_num));
+        return (datatype);
+    }
+    catch (DataTypeIException &E) {
+        throw DataTypeIException("CompType::getMemberDataType", E.getDetailMsg());
+    }
+}
 
 //--------------------------------------------------------------------------
-// Function:	CompType::getMemberArrayType
-///\brief	Returns the array datatype of the specified member in this
-///		compound datatype.
-///\param	member_num - IN: Zero-based index of the member
-///\return	ArrayType instance
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - Jul, 2005
+// Function:    CompType::getMemberArrayType
+///\brief       Returns the array datatype of the specified member in this
+///             compound datatype.
+///\param       member_num - IN: Zero-based index of the member
+///\return      ArrayType instance
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - Jul, 2005
 //--------------------------------------------------------------------------
-ArrayType CompType::getMemberArrayType( unsigned member_num ) const
+ArrayType
+CompType::getMemberArrayType(unsigned member_num) const
 {
-   try {
-      ArrayType arraytype(p_get_member_type(member_num));
-      return(arraytype);
-   }
-   catch (DataTypeIException E) {
-      throw DataTypeIException("CompType::getMemberArrayType", E.getDetailMsg());
-   }
-}
+    try {
+        ArrayType arraytype;
+        f_DataType_setId(&arraytype, p_get_member_type(member_num));
+        return (arraytype);
+    }
+    catch (DataTypeIException &E) {
+        throw DataTypeIException("CompType::getMemberArrayType", E.getDetailMsg());
+    }
+}
 
 //--------------------------------------------------------------------------
-// Function:	CompType::getMemberCompType
-///\brief	Returns the compound datatype of the specified member in this
-///		compound datatype.
-///\param	member_num - IN: Zero-based index of the member
-///\return	CompType instance
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    CompType::getMemberCompType
+///\brief       Returns the compound datatype of the specified member in this
+///             compound datatype.
+///\param       member_num - IN: Zero-based index of the member
+///\return      CompType instance
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-CompType CompType::getMemberCompType( unsigned member_num ) const
+CompType
+CompType::getMemberCompType(unsigned member_num) const
 {
-   try {
-      CompType comptype(p_get_member_type(member_num));
-      return(comptype);
-   }
-   catch (DataTypeIException E) {
-      throw DataTypeIException("CompType::getMemberCompType", E.getDetailMsg());
-   }
-}
+    try {
+        CompType comptype;
+        f_DataType_setId(&comptype, p_get_member_type(member_num));
+        return (comptype);
+    }
+    catch (DataTypeIException &E) {
+        throw DataTypeIException("CompType::getMemberCompType", E.getDetailMsg());
+    }
+}
 
 //--------------------------------------------------------------------------
-// Function:	CompType::getMemberEnumType
-///\brief	Returns the enumeration datatype of the specified member in
-///		this compound datatype.
-///\param	member_num - IN: Zero-based index of the member
-///\return	EnumType instance
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    CompType::getMemberEnumType
+///\brief       Returns the enumeration datatype of the specified member in
+///             this compound datatype.
+///\param       member_num - IN: Zero-based index of the member
+///\return      EnumType instance
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-EnumType CompType::getMemberEnumType( unsigned member_num ) const
+EnumType
+CompType::getMemberEnumType(unsigned member_num) const
 {
-   try {
-      EnumType enumtype(p_get_member_type(member_num));
-      return(enumtype);
-   }
-   catch (DataTypeIException E) {
-      throw DataTypeIException("CompType::getMemberEnumType", E.getDetailMsg());
-   }
+    try {
+        EnumType enumtype;
+        f_DataType_setId(&enumtype, p_get_member_type(member_num));
+        return (enumtype);
+    }
+    catch (DataTypeIException &E) {
+        throw DataTypeIException("CompType::getMemberEnumType", E.getDetailMsg());
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	CompType::getMemberIntType
-///\brief	Returns the integer datatype of the specified member in this
-///		compound datatype.
-///\param	member_num - IN: Zero-based index of the member
-///\return	IntType instance
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-IntType CompType::getMemberIntType( unsigned member_num ) const
+// Function:    CompType::getMemberIntType
+///\brief       Returns the integer datatype of the specified member in this
+///             compound datatype.
+///\param       member_num - IN: Zero-based index of the member
+///\return      IntType instance
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+IntType
+CompType::getMemberIntType(unsigned member_num) const
 {
-   try {
-      IntType inttype(p_get_member_type(member_num));
-      return(inttype);
-   }
-   catch (DataTypeIException E) {
-      throw DataTypeIException("CompType::getMemberIntType", E.getDetailMsg());
-   }
+    try {
+        IntType inttype;
+        f_DataType_setId(&inttype, p_get_member_type(member_num));
+        return (inttype);
+    }
+    catch (DataTypeIException &E) {
+        throw DataTypeIException("CompType::getMemberIntType", E.getDetailMsg());
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	CompType::getMemberFloatType
-///\brief	Returns the floating-point datatype of the specified member
-///		in this compound datatype.
-///\param	member_num - IN: Zero-based index of the member
-///\return	FloatType instance
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    CompType::getMemberFloatType
+///\brief       Returns the floating-point datatype of the specified member
+///             in this compound datatype.
+///\param       member_num - IN: Zero-based index of the member
+///\return      FloatType instance
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-FloatType CompType::getMemberFloatType( unsigned member_num ) const
+FloatType
+CompType::getMemberFloatType(unsigned member_num) const
 {
-   try {
-      FloatType floatype(p_get_member_type(member_num));
-      return(floatype);
-   }
-   catch (DataTypeIException E) {
-      throw DataTypeIException("CompType::getMemberFloatType", E.getDetailMsg());
-   }
+    try {
+        FloatType floatype;
+        f_DataType_setId(&floatype, p_get_member_type(member_num));
+        return (floatype);
+    }
+    catch (DataTypeIException &E) {
+        throw DataTypeIException("CompType::getMemberFloatType", E.getDetailMsg());
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	CompType::getMemberStrType
-///\brief	Returns the string datatype of the specified member in this
-///		compound datatype.
-///\param	member_num - IN: Zero-based index of the member
-///\return	StrType instance
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    CompType::getMemberStrType
+///\brief       Returns the string datatype of the specified member in this
+///             compound datatype.
+///\param       member_num - IN: Zero-based index of the member
+///\return      StrType instance
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-StrType CompType::getMemberStrType( unsigned member_num ) const
+StrType
+CompType::getMemberStrType(unsigned member_num) const
 {
-   try {
-      StrType strtype(p_get_member_type(member_num));
-      return(strtype);
-   }
-   catch (DataTypeIException E) {
-      throw DataTypeIException("CompType::getMemberStrType", E.getDetailMsg());
-   }
+    try {
+        StrType strtype;
+        f_DataType_setId(&strtype, p_get_member_type(member_num));
+        return (strtype);
+    }
+    catch (DataTypeIException &E) {
+        throw DataTypeIException("CompType::getMemberStrType", E.getDetailMsg());
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	CompType::getMemberVarLenType
-///\brief	Returns the variable length datatype of the specified member
-///		in this compound datatype.
-///\param	member_num - IN: Zero-based index of the member
-///\return	VarLenType instance
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - Jul, 2005
+// Function:    CompType::getMemberVarLenType
+///\brief       Returns the variable length datatype of the specified member
+///             in this compound datatype.
+///\param       member_num - IN: Zero-based index of the member
+///\return      VarLenType instance
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - Jul, 2005
 //--------------------------------------------------------------------------
-VarLenType CompType::getMemberVarLenType( unsigned member_num ) const
+VarLenType
+CompType::getMemberVarLenType(unsigned member_num) const
 {
-   try {
-      VarLenType varlentype(p_get_member_type(member_num));
-      return(varlentype);
-   }
-   catch (DataTypeIException E) {
-      throw DataTypeIException("CompType::getMemberVarLenType", E.getDetailMsg());
-   }
+    try {
+        VarLenType varlentype;
+        f_DataType_setId(&varlentype, p_get_member_type(member_num));
+        return (varlentype);
+    }
+    catch (DataTypeIException &E) {
+        throw DataTypeIException("CompType::getMemberVarLenType", E.getDetailMsg());
+    }
 }
 
 /* old style of getMemberType - using overloads; new style above
@@ -381,27 +463,27 @@ VarLenType CompType::getMemberVarLenType( unsigned member_num ) const
    May, 2004: These should be reconsidered to provide more convenience.
 // Returns the datatype of the specified member in this compound datatype.
 // Several overloading of getMemberType are for different datatypes
-void CompType::getMemberType( unsigned member_num, EnumType& enumtype ) const
+void CompType::getMemberType(unsigned member_num, EnumType& enumtype) const
 {
    p_get_member_type(member_num, enumtype);
 }
 
-void CompType::getMemberType( unsigned member_num, CompType& comptype ) const
+void CompType::getMemberType(unsigned member_num, CompType& comptype) const
 {
    p_get_member_type(member_num, comptype);
 }
 
-void CompType::getMemberType( unsigned member_num, IntType& inttype ) const
+void CompType::getMemberType(unsigned member_num, IntType& inttype) const
 {
    p_get_member_type(member_num, inttype);
 }
 
-void CompType::getMemberType( unsigned member_num, FloatType& floatype ) const
+void CompType::getMemberType(unsigned member_num, FloatType& floatype) const
 {
    p_get_member_type(member_num, floatype);
 }
 
-void CompType::getMemberType( unsigned member_num, StrType& strtype ) const
+void CompType::getMemberType(unsigned member_num, StrType& strtype) const
 {
    p_get_member_type(member_num, strtype);
 }
@@ -409,63 +491,63 @@ void CompType::getMemberType( unsigned member_num, StrType& strtype ) const
 */
 
 //--------------------------------------------------------------------------
-// Function:	CompType::insertMember
-///\brief	Inserts a new member to this compound datatype.
-///\param	name - IN: Name of the new member
-///\param	offset - IN: Offset in memory structure of the field to insert
-///\param	new_member - IN: New member to be inserted
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    CompType::insertMember
+///\brief       Inserts a new member to this compound datatype.
+///\param       name - IN: Name of the new member
+///\param       offset - IN: Offset in memory structure of the field to insert
+///\param       new_member - IN: New member to be inserted
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void CompType::insertMember( const H5std_string& name, size_t offset, const DataType& new_member ) const
+void
+CompType::insertMember(const H5std_string &name, size_t offset, const DataType &new_member) const
 {
-   // Convert string to C-string
-   const char* name_C;
-   name_C = name.c_str();  // name_C refers to the contents of name as a C-str
+    // Convert string to C-string
+    const char *name_C;
+    name_C = name.c_str(); // name_C refers to the contents of name as a C-str
 
-   hid_t new_member_id = new_member.getId();  // get new_member id for C API
+    hid_t new_member_id = new_member.getId(); // get new_member id for C API
 
-   // Call C routine H5Tinsert to add the new member
-   herr_t ret_value = H5Tinsert( id, name_C, offset, new_member_id );
-   if( ret_value < 0 )
-   {
-      throw DataTypeIException("CompType::insertMember", "H5Tinsert failed");
-   }
+    // Call C routine H5Tinsert to add the new member
+    herr_t ret_value = H5Tinsert(id, name_C, offset, new_member_id);
+    if (ret_value < 0) {
+        throw DataTypeIException("CompType::insertMember", "H5Tinsert failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	CompType::pack
-///\brief	Recursively removes padding from within a compound datatype.
+// Function:    CompType::pack
+///\brief       Recursively removes padding from within a compound datatype.
 ///
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void CompType::pack() const
+void
+CompType::pack() const
 {
-   // Calls C routine H5Tpack to remove padding
-   herr_t ret_value = H5Tpack( id );
-   if( ret_value < 0 )
-   {
-      throw DataTypeIException("CompType::pack", "H5Tpack failed");
-   }
+    // Calls C routine H5Tpack to remove padding
+    herr_t ret_value = H5Tpack(id);
+    if (ret_value < 0) {
+        throw DataTypeIException("CompType::pack", "H5Tpack failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	CompType::setSize
-///\brief	Sets the total size for this compound datatype.
-///\param	size - IN: Size to set
-///\exception	H5::DataTypeIException
+// Function:    CompType::setSize
+///\brief       Sets the total size for this compound datatype.
+///\param       size - IN: Size to set
+///\exception   H5::DataTypeIException
 // Note
-//	H5Tset_size works on atom datatypes and compound datatypes only
-// Programmer	Binh-Minh Ribler - 2014
+//      H5Tset_size works on atom datatypes and compound datatypes only
+// Programmer   Binh-Minh Ribler - 2014
 //--------------------------------------------------------------------------
-void CompType::setSize(size_t size) const
+void
+CompType::setSize(size_t size) const
 {
     // Call C routine H5Tset_size to set the total size
     herr_t ret_value = H5Tset_size(id, size);
-    if (ret_value < 0)
-    {
-	throw DataTypeIException("CompType::setSize", "H5Tset_size failed");
+    if (ret_value < 0) {
+        throw DataTypeIException("CompType::setSize", "H5Tset_size failed");
     }
 }
 
@@ -474,8 +556,8 @@ void CompType::setSize(size_t size) const
 ///\brief       Properly terminates access to this compound datatype.
 // Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-CompType::~CompType() {}
+CompType::~CompType()
+{
+}
 
-#ifndef H5_NO_NAMESPACE
-} // end namespace
-#endif
+} // namespace H5
diff --git a/c++/src/H5CompType.h b/c++/src/H5CompType.h
index bd6d76c..0675d20 100644
--- a/c++/src/H5CompType.h
+++ b/c++/src/H5CompType.h
@@ -1,118 +1,126 @@
 // C++ informative line for the emacs editor: -*- C++ -*-
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5CompType_H
-#define __H5CompType_H
+#ifndef H5CompType_H
+#define H5CompType_H
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#endif
 
 /*! \class CompType
     \brief CompType is a derivative of a DataType and operates on HDF5
     compound datatypes.
 */
+//  Inheritance: DataType -> H5Object -> H5Location -> IdComponent
 class H5_DLLCPP CompType : public DataType {
-   public:
-	// Default constructor
-	CompType();
+  public:
+    // Default constructor
+    CompType();
 
-	// Creates a compound datatype using an existing id
-	CompType( const hid_t existing_id );
+    // Creates a compound datatype using an existing id
+    CompType(const hid_t existing_id);
 
-	// Creates a new compound datatype, given the type's size
-	CompType( size_t size ); // H5Tcreate
+    // Creates a new compound datatype, given the type's size
+    CompType(size_t size); // H5Tcreate
 
-	// Gets the compound datatype of the specified dataset
-	CompType( const DataSet& dataset );  // H5Dget_type
+    // Gets the compound datatype of the specified dataset
+    CompType(const DataSet &dataset); // H5Dget_type
 
-	// Copy constructor - makes a copy of original object
-	CompType( const CompType& original );
+    // Copy constructor - same as the original CompType.
+    CompType(const CompType &original);
 
-	// Returns the type class of the specified member of this compound
-	// datatype.  It provides to the user a way of knowing what type
-	// to create another datatype of the same class
-	H5T_class_t getMemberClass( unsigned member_num ) const;
+    // Constructors that open a compound datatype, given a location.
+    CompType(const H5Location &loc, const char *name);
+    CompType(const H5Location &loc, const H5std_string &name);
 
-	// Returns the index of a member in this compound data type.
-	int getMemberIndex(const char* name) const;
-	int getMemberIndex(const H5std_string& name) const;
+    // Returns a CompType object via DataType* by decoding the binary
+    // object description of this type.
+    virtual DataType *decode() const override;
 
-	// Returns the offset of a member of this compound datatype.
-	size_t getMemberOffset( unsigned memb_no ) const;
+    // Returns the type class of the specified member of this compound
+    // datatype.  It provides to the user a way of knowing what type
+    // to create another datatype of the same class
+    H5T_class_t getMemberClass(unsigned member_num) const;
 
-	// Returns the name of a member of this compound datatype.
-	H5std_string getMemberName( unsigned member_num ) const;
+    // Returns the index of a member in this compound data type.
+    int getMemberIndex(const char *name) const;
+    int getMemberIndex(const H5std_string &name) const;
 
-	// Returns the generic datatype of the specified member in
-	// this compound datatype.
-	DataType getMemberDataType( unsigned member_num ) const;
+    // Returns the offset of a member of this compound datatype.
+    size_t getMemberOffset(unsigned memb_no) const;
 
-	// Returns the array datatype of the specified member in
-	// this compound datatype.
-	ArrayType getMemberArrayType( unsigned member_num ) const;
+    // Returns the name of a member of this compound datatype.
+    H5std_string getMemberName(unsigned member_num) const;
 
-	// Returns the compound datatype of the specified member in
-	// this compound datatype.
-	CompType getMemberCompType( unsigned member_num ) const;
+    // Returns the generic datatype of the specified member in
+    // this compound datatype.
+    DataType getMemberDataType(unsigned member_num) const;
 
-	// Returns the enumeration datatype of the specified member in
-	// this compound datatype.
-	EnumType getMemberEnumType( unsigned member_num ) const;
+    // Returns the array datatype of the specified member in
+    // this compound datatype.
+    ArrayType getMemberArrayType(unsigned member_num) const;
 
-	// Returns the integer datatype of the specified member in
-	// this compound datatype.
-	IntType getMemberIntType( unsigned member_num ) const;
+    // Returns the compound datatype of the specified member in
+    // this compound datatype.
+    CompType getMemberCompType(unsigned member_num) const;
 
-	// Returns the floating-point datatype of the specified member in
-	// this compound datatype.
-	FloatType getMemberFloatType( unsigned member_num ) const;
+    // Returns the enumeration datatype of the specified member in
+    // this compound datatype.
+    EnumType getMemberEnumType(unsigned member_num) const;
 
-	// Returns the string datatype of the specified member in
-	// this compound datatype.
-	StrType getMemberStrType( unsigned member_num ) const;
+    // Returns the integer datatype of the specified member in
+    // this compound datatype.
+    IntType getMemberIntType(unsigned member_num) const;
 
-	// Returns the variable length datatype of the specified member in
-	// this compound datatype.
-	VarLenType getMemberVarLenType( unsigned member_num ) const;
+    // Returns the floating-point datatype of the specified member in
+    // this compound datatype.
+    FloatType getMemberFloatType(unsigned member_num) const;
 
-	// Returns the number of members in this compound datatype.
-	int getNmembers() const;
+    // Returns the string datatype of the specified member in
+    // this compound datatype.
+    StrType getMemberStrType(unsigned member_num) const;
 
-	// Adds a new member to this compound datatype.
-	void insertMember( const H5std_string& name, size_t offset, const DataType& new_member ) const;
+    // Returns the variable length datatype of the specified member in
+    // this compound datatype.
+    VarLenType getMemberVarLenType(unsigned member_num) const;
 
-	// Recursively removes padding from within this compound datatype.
-	void pack() const;
+    // Returns the number of members in this compound datatype.
+    int getNmembers() const;
 
-	// Sets the total size for this compound datatype.
-	void setSize(size_t size) const;
+    // Adds a new member to this compound datatype.
+    void insertMember(const H5std_string &name, size_t offset, const DataType &new_member) const;
 
-	///\brief Returns this class name.
-	virtual H5std_string fromClass () const { return("CompType"); }
+    // Recursively removes padding from within this compound datatype.
+    void pack() const;
 
-	// Noop destructor.
-	virtual ~CompType();
+    // Sets the total size for this compound datatype.
+    void setSize(size_t size) const;
 
-   private:
-	// Contains common code that is used by the member functions
-	// getMemberXxxType
-	hid_t p_get_member_type(unsigned member_num) const;
-};
-#ifndef H5_NO_NAMESPACE
-}
-#endif
-#endif // __H5CompType_H
+    ///\brief Returns this class name.
+    virtual H5std_string
+    fromClass() const override
+    {
+        return ("CompType");
+    }
+
+    // Noop destructor.
+    virtual ~CompType() override;
+
+  private:
+    // Contains common code that is used by the member functions
+    // getMemberXxxType
+    hid_t p_get_member_type(unsigned member_num) const;
+
+}; // end of CompType
+} // namespace H5
+
+#endif // H5CompType_H
diff --git a/c++/src/H5Cpp.h b/c++/src/H5Cpp.h
index 044108b..34fdef2 100644
--- a/c++/src/H5Cpp.h
+++ b/c++/src/H5Cpp.h
@@ -1,37 +1,37 @@
 // C++ informative line for the emacs editor: -*- C++ -*-
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5Cpp_H
-#define __H5Cpp_H
+#ifndef H5Cpp_H
+#define H5Cpp_H
 
 #include "H5Include.h"
 #include "H5Exception.h"
 #include "H5IdComponent.h"
 #include "H5DataSpace.h"
 #include "H5PropList.h"
+#include "H5FaccProp.h"
+#include "H5FcreatProp.h"
+#include "H5OcreatProp.h"
+#include "H5DcreatProp.h"
+#include "H5DxferProp.h"
+#include "H5LcreatProp.h"
+#include "H5LaccProp.h"
+#include "H5DaccProp.h"
 #include "H5Location.h"
 #include "H5Object.h"
 #include "H5AbstractDs.h"
 #include "H5Attribute.h"
-#include "H5DcreatProp.h"
-#include "H5CommonFG.h"
 #include "H5DataType.h"
-#include "H5DxferProp.h"
-#include "H5FaccProp.h"
-#include "H5FcreatProp.h"
 #include "H5AtomType.h"
 #include "H5PredType.h"
 #include "H5EnumType.h"
@@ -42,18 +42,9 @@
 #include "H5ArrayType.h"
 #include "H5VarLenType.h"
 #include "H5DataSet.h"
+#include "H5CommonFG.h"
 #include "H5Group.h"
 #include "H5File.h"
 #include "H5Library.h"
 
-/* Some C++ compilers do not have offsetof macro; define to bypass the problem
-   - BMR- -EIP- 2007/08/01
-*/
-#ifndef H5_CXX_HAVE_OFFSETOF
-#ifdef HOFFSET
-   #undef HOFFSET
-#endif
-#define HOFFSET(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
-#endif
-
-#endif // __H5Cpp_H
+#endif // H5Cpp_H
diff --git a/c++/src/H5CppDoc.h b/c++/src/H5CppDoc.h
index 388fc25..37bd8a5 100644
--- a/c++/src/H5CppDoc.h
+++ b/c++/src/H5CppDoc.h
@@ -1,21 +1,18 @@
 // C++ informative line for the emacs editor: -*- C++ -*-
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5CppDoc_H
-#define __H5CppDoc_H
+#ifndef H5CppDoc_H
+#define H5CppDoc_H
 
 //-------------------------------------------------------------------------
 // The following section will be used to generate the 'Mainpage'
@@ -27,13 +24,10 @@
  * \section intro_sec Introduction
  *
  * The C++ API provides C++ wrappers for the HDF5 C Library.
- * 
- * It is assumed that the user has knowledge of the 
- * <a href="http://www.hdfgroup.org/HDF5/doc/H5.format.html">
- * HDF5 file format</a> and its components. 
- * For more information on the HDF5 C Library, see the 
- * <a href="http://www.hdfgroup.org/HDF5/doc/index.html"> 
- * HDF5 Software Documentation</a> page.
+ *
+ * It is assumed that the user has knowledge of the HDF5 file format and its
+ * components.  For more information on the HDF5 C Library, please refer to
+ * the HDF5 Software Documentation page.
  *
  * Because the HDF5 C Library maps very well to
  * the object oriented design approach, classes in the C++ API can
@@ -52,49 +46,49 @@
     Dataspace Interface (H5S)         DataSpace
     Datatype Interface (H5T)          DataType and subclasses
   \endverbatim
+ *
+ * This <a href="./C2Cppfunction_map.htm">
+ * table </a> provides a map from the C APIs to the C++ member functions.
  * <br />
  * \section install_sec Installation
  *
- * The HDF5 C++ API is included with the HDF5 source code and can 
- * be obtained from 
- * <a href="http://www.hdfgroup.org/HDF5/release/obtainsrc.html">
- * http://www.hdfgroup.org/HDF5/release/obtainsrc.html</a>.
- * 
- * Please refer to the release_docs/INSTALL file under the top directory 
- * of the HDF5 source code for information about installing, building, 
+ * The HDF5 C++ API is included with the HDF5 source code.
+ *
+ * Please refer to the release_docs/INSTALL file under the top directory
+ * of the HDF5 source code for information about installing, building,
  * and testing the C++ API.
  *
  * <br />
  */
 
-///	This example shows how to create datasets.
+///        This example shows how to create datasets.
 ///\par
 ///\example     create.cpp
 
 ///\par
-///	This example shows how to write datasets.
+///        This example shows how to write datasets.
 ///\example     writedata.cpp
 
 ///\par
-///	This example shows how to read datasets.
+///        This example shows how to read datasets.
 ///\example     readdata.cpp
 
 ///\par
-///	This example shows how to create a compound datatype,
-///	write an array which has the compound datatype to the file,
-///	and read back fields' subsets.
+///        This example shows how to create a compound datatype,
+///        write an array which has the compound datatype to the file,
+///        and read back fields' subsets.
 ///\example     compound.cpp
 
 ///\par
-///	This example shows how to work with extendible datasets.
+///        This example shows how to work with extendible datasets.
 ///\example     extend_ds.cpp
 
 ///\par
-///	This example shows how to read data from a chunked dataset.
+///        This example shows how to read data from a chunked dataset.
 ///\example     chunks.cpp
 
 ///\par
-///	This example shows how to work with groups.
+///        This example shows how to work with groups.
 ///\example     h5group.cpp
 
-#endif // __H5CppDoc_H
+#endif // H5CppDoc_H
diff --git a/c++/src/H5DaccProp.cpp b/c++/src/H5DaccProp.cpp
new file mode 100644
index 0000000..7043079
--- /dev/null
+++ b/c++/src/H5DaccProp.cpp
@@ -0,0 +1,170 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#include <string>
+
+#include "H5Include.h"
+#include "H5Exception.h"
+#include "H5IdComponent.h"
+#include "H5DataSpace.h"
+#include "H5PropList.h"
+#include "H5LaccProp.h"
+#include "H5DaccProp.h"
+
+namespace H5 {
+
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+// This DOXYGEN_SHOULD_SKIP_THIS block is a work-around approach to control
+// the order of creation and deletion of the global constants.  See Design Notes
+// in "H5PredType.cpp" for information.
+
+// Initialize a pointer for the constant
+DSetAccPropList *DSetAccPropList::DEFAULT_ = 0;
+
+//--------------------------------------------------------------------------
+// Function:    DSetAccPropList::getConstant
+// Purpose:     Creates a DSetAccPropList object representing the HDF5
+//              constant H5P_DATASET_ACCESS, pointed to by
+//              DSetAccPropList::DEFAULT_
+// exception    H5::PropListIException
+// Description
+//              If DSetAccPropList::DEFAULT_ already points to an allocated
+//              object, throw a PropListIException.  This scenario should
+//              not happen.
+// Programmer   Binh-Minh Ribler - 2015
+//--------------------------------------------------------------------------
+DSetAccPropList *
+DSetAccPropList::getConstant()
+{
+    // Tell the C library not to clean up, H5Library::termH5cpp will call
+    // H5close - more dependency if use H5Library::dontAtExit()
+    if (!IdComponent::H5dontAtexit_called) {
+        (void)H5dont_atexit();
+        IdComponent::H5dontAtexit_called = true;
+    }
+
+    // If the constant pointer is not allocated, allocate it. Otherwise,
+    // throw because it shouldn't be.
+    if (DEFAULT_ == 0)
+        DEFAULT_ = new DSetAccPropList(H5P_DATASET_ACCESS);
+    else
+        throw PropListIException("DSetAccPropList::getConstant",
+                                 "DSetAccPropList::getConstant is being invoked on an allocated DEFAULT_");
+    return (DEFAULT_);
+}
+
+//--------------------------------------------------------------------------
+// Function:    DSetAccPropList::deleteConstants
+// Purpose:     Deletes the constant object that DSetAccPropList::DEFAULT_
+//              points to.
+// Programmer   Binh-Minh Ribler - 2015
+//--------------------------------------------------------------------------
+void
+DSetAccPropList::deleteConstants()
+{
+    delete DEFAULT_;
+}
+
+//--------------------------------------------------------------------------
+// Purpose      Constant for dataset creation default property
+//--------------------------------------------------------------------------
+const DSetAccPropList &DSetAccPropList::DEFAULT = *getConstant();
+
+#endif // DOXYGEN_SHOULD_SKIP_THIS
+
+//--------------------------------------------------------------------------
+// Function:    DSetAccPropList default constructor
+///\brief       Default constructor: creates a stub dataset creation property list
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+DSetAccPropList::DSetAccPropList() : LinkAccPropList(H5P_DATASET_ACCESS)
+{
+}
+
+//--------------------------------------------------------------------------
+// Function:    DSetAccPropList copy constructor
+///\brief       Copy constructor: same HDF5 object as \a original
+///             DSetAccPropList object
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+DSetAccPropList::DSetAccPropList(const DSetAccPropList &orig) : LinkAccPropList(orig)
+{
+}
+
+//--------------------------------------------------------------------------
+// Function:    DSetAccPropList overloaded constructor
+///\brief       Creates a DSetAccPropList object using the id of an
+///             existing dataset creation property list.
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+DSetAccPropList::DSetAccPropList(const hid_t plist_id) : LinkAccPropList(plist_id)
+{
+}
+
+//--------------------------------------------------------------------------
+// Function:    DSetAccPropList::setChunkCache
+///\brief       Sets the raw data chunk cache parameters.
+///\param       rdcc_nslots - IN: Number of chunk slots in the raw data chunk cache
+///\param       rdcc_nbytes - IN: Total size of the raw data chunk cache
+///\param       rdcc_w0     - IN: The chunk preemption policy for this dataset
+///\exception   H5::PropListIException
+///\par Description
+///             The raw data chunk cache parameters includes the number of
+///             objects in the meta data cache and the maximum number of
+///             chunks and bytes in the raw data chunk cache.  Once set,
+///             these values will override the values in the file access
+///             property list.
+///
+///             For information, please refer to the H5Pset_chunk_cache API in
+///             the HDF5 C Reference Manual.
+// July 2018
+//--------------------------------------------------------------------------
+void
+DSetAccPropList::setChunkCache(size_t rdcc_nslots, size_t rdcc_nbytes, double rdcc_w0) const
+{
+    herr_t ret_value = H5Pset_chunk_cache(id, rdcc_nslots, rdcc_nbytes, rdcc_w0);
+    if (ret_value < 0) {
+        throw PropListIException("DSetAccPropList::setChunkCache", "H5Pset_chunk_cache failed");
+    }
+}
+
+//--------------------------------------------------------------------------
+// Function:    DSetAccPropList::getChunkCache
+///\brief       Retrieves the raw data chunk cache parameters.
+///\param       rdcc_nslots - OUT: Number of chunk slots in the raw data chunk cache
+///\param       rdcc_nbytes - OUT: Total size of the raw data chunk cache
+///\param       rdcc_w0     - OUT: The chunk preemption policy for this dataset
+///\exception   H5::PropListIException
+///\par Description
+///             For information, please refer to the H5Pget_chunk_cache API in
+///             the HDF5 C Reference Manual.
+// July 2018
+//--------------------------------------------------------------------------
+void
+DSetAccPropList::getChunkCache(size_t &rdcc_nslots, size_t &rdcc_nbytes, double &rdcc_w0) const
+{
+    herr_t ret_value = H5Pget_chunk_cache(id, &rdcc_nslots, &rdcc_nbytes, &rdcc_w0);
+    if (ret_value < 0) {
+        throw PropListIException("DSetAccPropList::getChunkCache", "H5Pget_chunk_cache failed");
+    }
+}
+
+//--------------------------------------------------------------------------
+// Function:    DSetAccPropList destructor
+///\brief       Noop destructor.
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+DSetAccPropList::~DSetAccPropList()
+{
+}
+
+} // namespace H5
diff --git a/c++/src/H5DaccProp.h b/c++/src/H5DaccProp.h
new file mode 100644
index 0000000..bb404ce
--- /dev/null
+++ b/c++/src/H5DaccProp.h
@@ -0,0 +1,71 @@
+// C++ informative line for the emacs editor: -*- C++ -*-
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#ifndef H5DSetAccPropList_H
+#define H5DSetAccPropList_H
+
+namespace H5 {
+
+/*! \class DSetAccPropList
+    \brief Class DSetAccPropList inherits from LinkAccPropList and provides
+    wrappers for the HDF5 dataset access property functions.
+*/
+//  Inheritance: LinkAccPropList -> PropList -> IdComponent
+class H5_DLLCPP DSetAccPropList : public LinkAccPropList {
+  public:
+    ///\brief Default dataset creation property list.
+    static const DSetAccPropList &DEFAULT;
+
+    // Creates a dataset creation property list.
+    DSetAccPropList();
+
+    // Sets the raw data chunk cache parameters.
+    void setChunkCache(size_t rdcc_nslots, size_t rdcc_nbytes, double rdcc_w0) const;
+
+    // Retrieves the raw data chunk cache parameters.
+    void getChunkCache(size_t &rdcc_nslots, size_t &rdcc_nbytes, double &rdcc_w0) const;
+
+    ///\brief Returns this class name.
+    virtual H5std_string
+    fromClass() const override
+    {
+        return ("DSetAccPropList");
+    }
+
+    // Copy constructor - same as the original DSetAccPropList.
+    DSetAccPropList(const DSetAccPropList &orig);
+
+    // Creates a copy of an existing dataset creation property list
+    // using the property list id.
+    DSetAccPropList(const hid_t plist_id);
+
+    // Noop destructor.
+    virtual ~DSetAccPropList() override;
+
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+
+    // Deletes the global constant, should only be used by the library
+    static void deleteConstants();
+
+  private:
+    static DSetAccPropList *DEFAULT_;
+
+    // Creates the global constant, should only be used by the library
+    static DSetAccPropList *getConstant();
+
+#endif // DOXYGEN_SHOULD_SKIP_THIS
+
+}; // end of DSetAccPropList
+} // namespace H5
+
+#endif // H5DSetAccPropList_H
diff --git a/c++/src/H5DataSet.cpp b/c++/src/H5DataSet.cpp
index 0374d95..7d19a6d 100644
--- a/c++/src/H5DataSet.cpp
+++ b/c++/src/H5DataSet.cpp
@@ -1,694 +1,715 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifdef OLD_HEADER_FILENAME
-#include <iostream.h>
-#else
+#include <cstdlib>
 #include <iostream>
-#endif
 #include <string>
 
 #include "H5Include.h"
 #include "H5Exception.h"
 #include "H5IdComponent.h"
 #include "H5PropList.h"
-#include "H5Object.h"
-#include "H5PropList.h"
-#include "H5DxferProp.h"
-#include "H5DcreatProp.h"
 #include "H5FaccProp.h"
 #include "H5FcreatProp.h"
-#include "H5CommonFG.h"
+#include "H5OcreatProp.h"
+#include "H5DxferProp.h"
+#include "H5DcreatProp.h"
+#include "H5LcreatProp.h"
+#include "H5LaccProp.h"
+#include "H5DaccProp.h"
+#include "H5Location.h"
+#include "H5Object.h"
 #include "H5DataType.h"
 #include "H5DataSpace.h"
 #include "H5AbstractDs.h"
-#include "H5File.h"
 #include "H5Attribute.h"
 #include "H5DataSet.h"
-#include "H5private.h"		// for HDfree
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#ifndef H5_NO_STD
-    using std::cerr;
-    using std::endl;
-#endif  // H5_NO_STD
-#endif
+using std::cerr;
+using std::endl;
 
 //--------------------------------------------------------------------------
-// Function:	DataSet default constructor
-///\brief	Default constructor: creates a stub DataSet.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DataSet default constructor
+///\brief       Default constructor: creates a stub DataSet.
 //--------------------------------------------------------------------------
-DataSet::DataSet() : H5Object(), AbstractDs(), id(H5I_INVALID_HID) {}
+DataSet::DataSet() : H5Object(), AbstractDs(), id(H5I_INVALID_HID)
+{
+}
 
 //--------------------------------------------------------------------------
-// Function:	DataSet overloaded constructor
-///\brief	Creates an DataSet object using the id of an existing dataset.
-///\param	existing_id - IN: Id of an existing dataset
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DataSet overloaded constructor
+///\brief       Creates an DataSet object using the id of an existing dataset.
+///\param       existing_id - IN: Id of an existing dataset
+// Description
+//              incRefCount() is needed here to prevent the id from being closed
+//              prematurely.  That is, when application uses the id of an
+//              existing DataSet object to create another DataSet object.  So,
+//              when one of those objects is deleted, the id will be closed if
+//              the reference counter is only 1.
 //--------------------------------------------------------------------------
-DataSet::DataSet(const hid_t existing_id) : H5Object(), AbstractDs()
+DataSet::DataSet(const hid_t existing_id) : H5Object(), AbstractDs(), id(existing_id)
 {
-    id = existing_id;
+    incRefCount(); // increment number of references to this id
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataSet copy constructor
-///\brief	Copy constructor: makes a copy of the original DataSet object.
-///\param	original - IN: DataSet instance to copy
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DataSet copy constructor
+///\brief       Copy constructor: same HDF5 object as \a original
+///\param       original - IN: DataSet instance to copy
 //--------------------------------------------------------------------------
-DataSet::DataSet(const DataSet& original) : H5Object(), AbstractDs()
+DataSet::DataSet(const DataSet &original) : H5Object(), AbstractDs(), id(original.id)
 {
-    id = original.getId();
     incRefCount(); // increment number of references to this id
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataSet overload constructor - dereference
-///\brief	Given a reference, ref, to an hdf5 location, creates a
-///		DataSet object
-///\param	loc - IN: Dataset reference object is in or location of
-///			  object that the dataset is located within.
-///\param	ref - IN: Reference pointer
-///\param	ref_type - IN: Reference type - default to H5R_OBJECT
-///\param	plist - IN: Property list - default to PropList::DEFAULT
-///\exception	H5::DataSetIException
+// Function:    DataSet assignment operator
+///\brief       Assignment operator: same HDF5 object as \a original
+///\param       original - IN: DataSet instance to copy
+//--------------------------------------------------------------------------
+DataSet &
+DataSet::operator=(const DataSet &original)
+{
+    if (this != &original) {
+        setId(original.id);
+    }
+    return (*this);
+}
+
+//--------------------------------------------------------------------------
+// Function:    DataSet overload constructor - dereference
+///\brief       Given a reference, ref, to an hdf5 location, creates a
+///             DataSet object
+///\param       loc - IN: Dataset reference object is in or location of
+///                       object that the dataset is located within.
+///\param       ref - IN: Reference pointer
+///\param       ref_type - IN: Reference type - default to H5R_OBJECT
+///\param       plist - IN: Property list - default to PropList::DEFAULT
+///\exception   H5::DataSetIException
 ///\par Description
-///		\c loc can be DataSet, Group, H5File, or named DataType, that
-///		is a datatype that has been named by DataType::commit.
-// Programmer	Binh-Minh Ribler - Oct, 2006
-// Modification
-//	Jul, 2008
-//		Added for application convenience.
+///             \c loc can be DataSet, Group, H5File, or named DataType, that
+///             is a datatype that has been named by DataType::commit.
 //--------------------------------------------------------------------------
-DataSet::DataSet(const H5Location& loc, const void* ref, H5R_type_t ref_type, const PropList& plist) : H5Object(), AbstractDs(), id(H5I_INVALID_HID)
+DataSet::DataSet(const H5Location &loc, const void *ref, H5R_type_t ref_type, const PropList &plist)
+    : H5Object(), AbstractDs(), id(H5I_INVALID_HID)
 {
     id = H5Location::p_dereference(loc.getId(), ref, ref_type, plist, "constructor - by dereferenced");
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataSet overload constructor - dereference
-///\brief	Given a reference, ref, to an hdf5 attribute, creates a
-///		DataSet object
-///\param	attr - IN: Specifying location where the referenced object is in
-///\param	ref - IN: Reference pointer
-///\param	ref_type - IN: Reference type - default to H5R_OBJECT
-///\param	plist - IN: Property list - default to PropList::DEFAULT
-///\exception	H5::ReferenceException
-// Programmer	Binh-Minh Ribler - Oct, 2006
-// Modification
-//	Jul, 2008
-//		Added for application convenience.
+// Function:    DataSet overload constructor - dereference
+///\brief       Given a reference, ref, to an hdf5 attribute, creates a
+///             DataSet object
+///\param       attr - IN: Specifying location where the referenced object is in
+///\param       ref - IN: Reference pointer
+///\param       ref_type - IN: Reference type - default to H5R_OBJECT
+///\param       plist - IN: Property list - default to PropList::DEFAULT
+///\exception   H5::ReferenceException
 //--------------------------------------------------------------------------
-DataSet::DataSet(const Attribute& attr, const void* ref, H5R_type_t ref_type, const PropList& plist) : H5Object(), AbstractDs(), id(H5I_INVALID_HID)
+DataSet::DataSet(const Attribute &attr, const void *ref, H5R_type_t ref_type, const PropList &plist)
+    : H5Object(), AbstractDs(), id(H5I_INVALID_HID)
 {
     id = H5Location::p_dereference(attr.getId(), ref, ref_type, plist, "constructor - by dereference");
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataSet::getSpace
-///\brief	Gets a copy of the dataspace of this dataset.
-///\return	DataSpace instance
-///\exception	H5::DataSetIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DataSet::getSpace
+///\brief       Gets a copy of the dataspace of this dataset.
+///\return      DataSpace instance
+///\exception   H5::DataSetIException
 //--------------------------------------------------------------------------
-DataSpace DataSet::getSpace() const
+DataSpace
+DataSet::getSpace() const
 {
-   // Calls C function H5Dget_space to get the id of the dataspace
-   hid_t dataspace_id = H5Dget_space( id );
+    // Calls C function H5Dget_space to get the id of the dataspace
+    hid_t dataspace_id = H5Dget_space(id);
 
-   // If the dataspace id is invalid, throw an exception
-   if( dataspace_id < 0 )
-   {
-      throw DataSetIException("DataSet::getSpace", "H5Dget_space failed");
-   }
-   //create dataspace object using the existing id then return the object
-   DataSpace data_space( dataspace_id );
-   return( data_space );
+    // If the dataspace id is invalid, throw an exception
+    if (dataspace_id < 0) {
+        throw DataSetIException("DataSet::getSpace", "H5Dget_space failed");
+    }
+    // create dataspace object using the existing id then return the object
+    DataSpace data_space;
+    f_DataSpace_setId(&data_space, dataspace_id);
+    return (data_space);
 }
 
 // This private member function calls the C API to get the identifier
 // of the datatype that is used by this dataset.  It is used
 // by the various AbstractDs functions to get the specific datatype.
-hid_t DataSet::p_get_type() const
+hid_t
+DataSet::p_get_type() const
+{
+    hid_t type_id = H5Dget_type(id);
+    if (type_id > 0)
+        return (type_id);
+    else {
+        throw DataSetIException("", "H5Dget_type failed");
+    }
+}
+
+//--------------------------------------------------------------------------
+// Function:    DataSet::getCreatePlist
+///\brief       Gets the dataset creation property list.
+///\return      DSetCreatPropList instance
+///\exception   H5::DataSetIException
+//--------------------------------------------------------------------------
+DSetCreatPropList
+DataSet::getCreatePlist() const
 {
-   hid_t type_id = H5Dget_type( id );
-   if( type_id > 0 )
-      return( type_id );
-   else
-   {
-      throw DataSetIException("", "H5Dget_type failed");
-   }
+    hid_t create_plist_id = H5Dget_create_plist(id);
+    if (create_plist_id < 0) {
+        throw DataSetIException("DataSet::getCreatePlist", "H5Dget_create_plist failed");
+    }
+
+    // create and return the DSetCreatPropList object
+    DSetCreatPropList create_plist;
+    f_PropList_setId(&create_plist, create_plist_id);
+    return (create_plist);
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataSet::getCreatePlist
-///\brief	Gets the dataset creation property list.
-///\return	DSetCreatPropList instance
-///\exception	H5::DataSetIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DataSet::getAccessPlist
+///\brief       Gets the dataset access property list.
+///\return      DSetAccPropList instance
+///\exception   H5::DataSetIException
+// July 2018
 //--------------------------------------------------------------------------
-DSetCreatPropList DataSet::getCreatePlist() const
+DSetAccPropList
+DataSet::getAccessPlist() const
 {
-   hid_t create_plist_id = H5Dget_create_plist( id );
-   if( create_plist_id < 0 )
-   {
-      throw DataSetIException("DataSet::getCreatePlist", "H5Dget_create_plist failed");
-   }
-   // create and return the DSetCreatPropList object
-   DSetCreatPropList create_plist( create_plist_id );
-   return( create_plist );
+    hid_t access_plist_id = H5Dget_access_plist(id);
+    if (access_plist_id < 0) {
+        throw DataSetIException("DataSet::getAccessPlist", "H5Dget_access_plist failed");
+    }
+
+    // create and return the DSetCreatPropList object
+    DSetAccPropList access_plist;
+    f_PropList_setId(&access_plist, access_plist_id);
+    return (access_plist);
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataSet::getStorageSize
-///\brief	Returns the amount of storage required for a dataset.
-///\return	Size of the storage or 0, for no data
-///\exception	H5::DataSetIException
-// Note:	H5Dget_storage_size returns 0 when there is no data.  This
-//		function should have no failure. (from SLU)
-// Programmer	Binh-Minh Ribler - Mar, 2005
+// Function:    DataSet::getStorageSize
+///\brief       Returns the amount of storage required for a dataset.
+///\return      Size of the storage or 0, for no data
+///\exception   H5::DataSetIException
+// Note:        H5Dget_storage_size returns 0 when there is no data.  This
+//              function should have no failure. (from SLU)
 //--------------------------------------------------------------------------
-hsize_t DataSet::getStorageSize() const
+hsize_t
+DataSet::getStorageSize() const
 {
-   hsize_t storage_size = H5Dget_storage_size(id);
-   return(storage_size);
+    hsize_t storage_size = H5Dget_storage_size(id);
+    return (storage_size);
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataSet::getInMemDataSize
-///\brief	Gets the size in memory of the dataset's data.
-///\return	Size of data (in memory)
-///\exception	H5::DataSetIException
-// Programmer	Binh-Minh Ribler - Apr 2009
+// Function:    DataSet::getInMemDataSize
+///\brief       Gets the size in memory of the dataset's data.
+///\return      Size of data (in memory)
+///\exception   H5::DataSetIException
 //--------------------------------------------------------------------------
-size_t DataSet::getInMemDataSize() const
+size_t
+DataSet::getInMemDataSize() const
 {
     const char *func = "DataSet::getInMemDataSize";
 
     // Get the data type of this dataset
     hid_t mem_type_id = H5Dget_type(id);
-    if( mem_type_id < 0 )
-    {
-	throw DataSetIException(func, "H5Dget_type failed");
+    if (mem_type_id < 0) {
+        throw DataSetIException(func, "H5Dget_type failed");
     }
 
     // Get the data type's size by first getting its native type then getting
     // the native type's size.
     hid_t native_type = H5Tget_native_type(mem_type_id, H5T_DIR_DEFAULT);
-    if (native_type < 0)
-    {
-	throw DataSetIException(func, "H5Tget_native_type failed");
+    if (native_type < 0) {
+        throw DataSetIException(func, "H5Tget_native_type failed");
     }
     size_t type_size = H5Tget_size(native_type);
-    if (type_size == 0)
-    {
-	throw DataSetIException(func, "H5Tget_size failed");
+    if (type_size == 0) {
+        throw DataSetIException(func, "H5Tget_size failed");
     }
 
     // Close the native type and the datatype of this dataset.
-    if (H5Tclose(native_type) < 0)
-    {
-	throw DataSetIException(func, "H5Tclose(native_type) failed");
+    if (H5Tclose(native_type) < 0) {
+        throw DataSetIException(func, "H5Tclose(native_type) failed");
     }
-    if (H5Tclose(mem_type_id) < 0)
-    {
-	throw DataSetIException(func, "H5Tclose(mem_type_id) failed");
+    if (H5Tclose(mem_type_id) < 0) {
+        throw DataSetIException(func, "H5Tclose(mem_type_id) failed");
     }
 
     // Get number of elements of the dataset by first getting its dataspace,
     // then getting the number of elements in the dataspace
     hid_t space_id = H5Dget_space(id);
-    if (space_id < 0)
-    {
-	throw DataSetIException(func, "H5Dget_space failed");
+    if (space_id < 0) {
+        throw DataSetIException(func, "H5Dget_space failed");
     }
     hssize_t num_elements = H5Sget_simple_extent_npoints(space_id);
-    if (num_elements < 0)
-    {
-	throw DataSetIException(func, "H5Sget_simple_extent_npoints failed");
+    if (num_elements < 0) {
+        throw DataSetIException(func, "H5Sget_simple_extent_npoints failed");
     }
 
     // Close the dataspace
-    if (H5Sclose(space_id) < 0)
-    {
-	throw DataSetIException(func, "H5Sclose failed");
+    if (H5Sclose(space_id) < 0) {
+        throw DataSetIException(func, "H5Sclose failed");
     }
 
     // Calculate and return the size of the data
-    size_t data_size = type_size * num_elements;
-    return(data_size);
+    // Note that large datasets can overflow a size_t
+    size_t data_size = type_size * static_cast<size_t>(num_elements);
+
+    return data_size;
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataSet::getOffset
-///\brief	Returns the address of this dataset in the file.
-///\return	Address of dataset
-///\exception	H5::DataSetIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DataSet::getOffset
+///\brief       Returns the address of this dataset in the file.
+///\return      Address of dataset
+///\exception   H5::DataSetIException
 //--------------------------------------------------------------------------
-haddr_t DataSet::getOffset() const
+haddr_t
+DataSet::getOffset() const
 {
-   haddr_t ds_addr; // for address of dataset
+    haddr_t ds_addr; // for address of dataset
 
-   ds_addr = H5Dget_offset(id);
-   if( ds_addr == HADDR_UNDEF )
-   {
-      throw DataSetIException("DataSet::getOffset", "H5Dget_offset returned HADDR_UNDEF");
-   }
-   return(ds_addr);
+    ds_addr = H5Dget_offset(id);
+    if (ds_addr == HADDR_UNDEF) {
+        throw DataSetIException("DataSet::getOffset", "H5Dget_offset returned HADDR_UNDEF");
+    }
+    return (ds_addr);
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataSet::getSpaceStatus
-///\brief	Determines whether space has been allocated for a dataset.
-///\param	status - OUT: Space allocation status
-///\exception	H5::DataSetIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DataSet::getSpaceStatus
+///\brief       Determines whether space has been allocated for a dataset.
+///\param       status - OUT: Space allocation status
+///\exception   H5::DataSetIException
 //--------------------------------------------------------------------------
-void DataSet::getSpaceStatus(H5D_space_status_t& status) const
+void
+DataSet::getSpaceStatus(H5D_space_status_t &status) const
 {
-   herr_t ret_value = H5Dget_space_status(id, &status);
-   if( ret_value < 0 )
-   {
-      throw DataSetIException("DataSet::getSpaceStatus", "H5Dget_space_status failed");
-   }
+    herr_t ret_value = H5Dget_space_status(id, &status);
+    if (ret_value < 0) {
+        throw DataSetIException("DataSet::getSpaceStatus", "H5Dget_space_status failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataSet::getVlenBufSize
-///\brief	Returns the number of bytes required to store VL data.
-///\return	Amount of storage
-///\exception	H5::DataSetIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DataSet::getVlenBufSize
+///\brief       Returns the number of bytes required to store VL data.
+///\param       type - IN: Datatype, which is the datatype for the buffer
+///\param       space - IN: Selection for the memory buffer
+///\return      Amount of storage
+///\exception   H5::DataSetIException
 //--------------------------------------------------------------------------
-hsize_t DataSet::getVlenBufSize(const DataType& type, const DataSpace& space ) const
+hsize_t
+DataSet::getVlenBufSize(const DataType &type, const DataSpace &space) const
 {
-   // Obtain identifiers for C API
-   hid_t type_id = type.getId();
-   hid_t space_id = space.getId();
+    // Obtain identifiers for C API
+    hid_t type_id  = type.getId();
+    hid_t space_id = space.getId();
 
-   hsize_t size; // for amount of storage
+    hsize_t size; // for amount of storage
 
-   herr_t ret_value = H5Dvlen_get_buf_size( id, type_id, space_id, &size );
-   if( ret_value < 0 )
-   {
-      throw DataSetIException("DataSet::getVlenBufSize", "H5Dvlen_get_buf_size failed");
-   }
-   return( size );
+    herr_t ret_value = H5Dvlen_get_buf_size(id, type_id, space_id, &size);
+    if (ret_value < 0) {
+        throw DataSetIException("DataSet::getVlenBufSize", "H5Dvlen_get_buf_size failed");
+    }
+    return (size);
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataSet::getVlenBufSize
-///\brief       This is an overloaded member function, kept for backward
-///		compatibility.  It differs from the above function in that it
-///             misses const's.  This wrapper will be removed in future release.
-///\return	Amount of storage
-///\exception	H5::DataSetIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DataSet::getVlenBufSize
+// Purpose      This is an overloaded member function, kept for backward
+//              compatibility.  It differs from the above function in that it
+//              misses const's.  This wrapper will be removed in future release.
+// Return       Amount of storage
+// Exception    H5::DataSetIException
+// Modification
+//              Modified to call its replacement. -BMR, 2014/04/16
+//              Removed from documentation. -BMR, 2016/03/07 1.8.17 and 1.10.0
+//              Removed from code. -BMR, 2016/08/11 1.8.18 and 1.10.1
+//--------------------------------------------------------------------------
+// hsize_t DataSet::getVlenBufSize(DataType& type, DataSpace& space) const
+//{
+//    return(getVlenBufSize(type, space));
+//}
+
+//--------------------------------------------------------------------------
+// Function:    DataSet::vlenReclaim
+///\brief       Reclaims VL datatype memory buffers.
+///\param       type - IN: Datatype, which is the datatype stored in the buffer
+///\param       space - IN: Selection for the memory buffer to free the
+///             VL datatypes within
+///\param       xfer_plist - IN: Property list used to create the buffer
+///\param       buf - IN: Pointer to the buffer to be reclaimed
+///\exception   H5::DataSetIException
 //--------------------------------------------------------------------------
-hsize_t DataSet::getVlenBufSize( DataType& type, DataSpace& space ) const
+void
+DataSet::vlenReclaim(const DataType &type, const DataSpace &space, const DSetMemXferPropList &xfer_plist,
+                     void *buf)
 {
-    return(getVlenBufSize((const DataType)type, (const DataSpace)space));
+    // Obtain identifiers for C API
+    hid_t type_id       = type.getId();
+    hid_t space_id      = space.getId();
+    hid_t xfer_plist_id = xfer_plist.getId();
+
+    herr_t ret_value = H5Treclaim(type_id, space_id, xfer_plist_id, buf);
+    if (ret_value < 0) {
+        throw DataSetIException("DataSet::vlenReclaim", "H5Treclaim failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataSet::vlenReclaim
-///\brief	Reclaims VL datatype memory buffers.
-///\param	type - IN: Datatype, which is the datatype stored in the buffer
-///\param	space - IN: Selection for the memory buffer to free the
-///		VL datatypes within
-///\param	xfer_plist - IN: Property list used to create the buffer
-///\param	buf - IN: Pointer to the buffer to be reclaimed
-///\exception	H5::DataSetIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DataSet::vlenReclaim
+///\brief       Reclaims VL datatype memory buffers.
+///\param       type - IN: Datatype, which is the datatype stored in the buffer
+///\param       space - IN: Selection for the memory buffer to free the
+///             VL datatypes within
+///\param       xfer_plist - IN: Property list used to create the buffer
+///\param       buf - IN: Pointer to the buffer to be reclaimed
+///\exception   H5::DataSetIException
+//\parDescription
+//              This function has better prototype for the users than the
+//              other, which might be removed at some point. BMR - 2006/12/20
 //--------------------------------------------------------------------------
-void DataSet::vlenReclaim(const DataType& type, const DataSpace& space, const DSetMemXferPropList& xfer_plist, void* buf )
+void
+DataSet::vlenReclaim(void *buf, const DataType &type, const DataSpace &space,
+                     const DSetMemXferPropList &xfer_plist)
 {
-   // Obtain identifiers for C API
-   hid_t type_id = type.getId();
-   hid_t space_id = space.getId();
-   hid_t xfer_plist_id = xfer_plist.getId();
+    // Obtain identifiers for C API
+    hid_t type_id       = type.getId();
+    hid_t space_id      = space.getId();
+    hid_t xfer_plist_id = xfer_plist.getId();
 
-   herr_t ret_value = H5Dvlen_reclaim( type_id, space_id, xfer_plist_id, buf );
-   if( ret_value < 0 )
-   {
-      throw DataSetIException("DataSet::vlenReclaim", "H5Dvlen_reclaim failed");
-   }
+    herr_t ret_value = H5Treclaim(type_id, space_id, xfer_plist_id, buf);
+    if (ret_value < 0) {
+        throw DataSetIException("DataSet::vlenReclaim", "H5Treclaim failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataSet::vlenReclaim
-///\brief	Reclaims VL datatype memory buffers.
-///\param	type - IN: Datatype, which is the datatype stored in the buffer
-///\param	space - IN: Selection for the memory buffer to free the
-///		VL datatypes within
-///\param	xfer_plist - IN: Property list used to create the buffer
-///\param	buf - IN: Pointer to the buffer to be reclaimed
-///\exception	H5::DataSetIException
-// Programmer	Binh-Minh Ribler - 2000
-//\parDescription
-//		This function has better prototype for the users than the
-//		other, which might be removed at some point. BMR - 2006/12/20
+// Function:    DataSet::read
+///\brief       Reads raw data from the specified dataset.
+///\param       buf - IN: Buffer for read data
+///\param       mem_type - IN: Memory datatype
+///\param       mem_space - IN: Memory dataspace
+///\param       file_space - IN: Dataset's dataspace in the file
+///\param       xfer_plist - IN: Transfer property list for this I/O operation
+///\exception   H5::DataSetIException
+///\par Description
+///             This function reads raw data from this dataset into the
+///             buffer \a buf, converting from file datatype and dataspace
+///             to memory datatype \a mem_type and dataspace \a mem_space.
 //--------------------------------------------------------------------------
-void DataSet::vlenReclaim(void* buf, const DataType& type, const DataSpace& space, const DSetMemXferPropList& xfer_plist)
+void
+DataSet::read(void *buf, const DataType &mem_type, const DataSpace &mem_space, const DataSpace &file_space,
+              const DSetMemXferPropList &xfer_plist) const
 {
-   // Obtain identifiers for C API
-   hid_t type_id = type.getId();
-   hid_t space_id = space.getId();
-   hid_t xfer_plist_id = xfer_plist.getId();
+    // Obtain identifiers for C API
+    hid_t mem_type_id   = mem_type.getId();
+    hid_t mem_space_id  = mem_space.getId();
+    hid_t file_space_id = file_space.getId();
+    hid_t xfer_plist_id = xfer_plist.getId();
 
-   herr_t ret_value = H5Dvlen_reclaim(type_id, space_id, xfer_plist_id, buf);
-   if (ret_value < 0)
-   {
-      throw DataSetIException("DataSet::vlenReclaim", "H5Dvlen_reclaim failed");
-   }
+    herr_t ret_value = H5Dread(id, mem_type_id, mem_space_id, file_space_id, xfer_plist_id, buf);
+    if (ret_value < 0) {
+        throw DataSetIException("DataSet::read", "H5Dread failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataSet::read
-///\brief	Reads raw data from the specified dataset.
-///\param	buf - IN: Buffer for read data
-///\param	mem_type - IN: Memory datatype
-///\param	mem_space - IN: Memory dataspace
-///\param	file_space - IN: Dataset's dataspace in the file
-///\param	xfer_plist - IN: Transfer property list for this I/O operation
-///\exception	H5::DataSetIException
-///\par Description
-///		This function reads raw data from this dataset into the
-///		buffer \a buf, converting from file datatype and dataspace
-///		to memory datatype \a mem_type and dataspace \a mem_space.
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-void DataSet::read( void* buf, const DataType& mem_type, const DataSpace& mem_space, const DataSpace& file_space, const DSetMemXferPropList& xfer_plist ) const
-{
-   // Obtain identifiers for C API
-   hid_t mem_type_id = mem_type.getId();
-   hid_t mem_space_id = mem_space.getId();
-   hid_t file_space_id = file_space.getId();
-   hid_t xfer_plist_id = xfer_plist.getId();
-
-   herr_t ret_value = H5Dread( id, mem_type_id, mem_space_id, file_space_id, xfer_plist_id, buf );
-   if( ret_value < 0 )
-   {
-      throw DataSetIException("DataSet::read", "H5Dread failed");
-   }
-}
-
-//--------------------------------------------------------------------------
-// Function:	DataSet::read
-///\brief	This is an overloaded member function, provided for convenience.
-///		It takes a reference to a \c H5std_string for the buffer.
-///\param	strg - IN: Buffer for read data string
-///\param	mem_type - IN: Memory datatype
-///\param	mem_space - IN: Memory dataspace
-///\param	file_space - IN: Dataset's dataspace in the file
-///\param	xfer_plist - IN: Transfer property list for this I/O operation
-///\exception	H5::DataSetIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DataSet::read
+///\brief       This is an overloaded member function, provided for convenience.
+///             It takes a reference to a \c H5std_string for the buffer.
+///\param       strg - IN: Buffer for read data string
+///\param       mem_type - IN: Memory datatype
+///\param       mem_space - IN: Memory dataspace
+///\param       file_space - IN: Dataset's dataspace in the file
+///\param       xfer_plist - IN: Transfer property list for this I/O operation
+///\exception   H5::DataSetIException
 // Modification
-//	Jul 2009
-//		Follow the change to Attribute::read and use the following
-//		private functions to read datasets with fixed- and
-//		variable-length string:
-//			DataSet::p_read_fixed_len and
-//			DataSet::p_read_variable_len
-//--------------------------------------------------------------------------
-void DataSet::read(H5std_string& strg, const DataType& mem_type, const DataSpace& mem_space, const DataSpace& file_space, const DSetMemXferPropList& xfer_plist) const
+//      Jul 2009
+//              Follow the change to Attribute::read and use the following
+//              private functions to read datasets with fixed- and
+//              variable-length string:
+//                  DataSet::p_read_fixed_len and
+//                  DataSet::p_read_variable_len
+//--------------------------------------------------------------------------
+void
+DataSet::read(H5std_string &strg, const DataType &mem_type, const DataSpace &mem_space,
+              const DataSpace &file_space, const DSetMemXferPropList &xfer_plist) const
 {
     // Check if this dataset has variable-len string or fixed-len string and
     // proceed appropriately.
     htri_t is_variable_len = H5Tis_variable_str(mem_type.getId());
-    if (is_variable_len < 0)
-    {
+    if (is_variable_len < 0) {
         throw DataSetIException("DataSet::read", "H5Tis_variable_str failed");
     }
 
     // Obtain identifiers for C API
-    hid_t mem_type_id = mem_type.getId();
-    hid_t mem_space_id = mem_space.getId();
+    hid_t mem_type_id   = mem_type.getId();
+    hid_t mem_space_id  = mem_space.getId();
     hid_t file_space_id = file_space.getId();
     hid_t xfer_plist_id = xfer_plist.getId();
 
-    if (!is_variable_len)       // only allocate for fixed-len string
+    if (!is_variable_len) // only allocate for fixed-len string
     {
         p_read_fixed_len(mem_type_id, mem_space_id, file_space_id, xfer_plist_id, strg);
     }
-    else
-    {
+    else {
         p_read_variable_len(mem_type_id, mem_space_id, file_space_id, xfer_plist_id, strg);
     }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataSet::write
-///\brief	Writes raw data from an application buffer to a dataset.
-///\param	buf - IN: Buffer containing data to be written
-///\param	mem_type - IN: Memory datatype
-///\param	mem_space - IN: Memory dataspace
-///\param	file_space - IN: Dataset's dataspace in the file
-///\param	xfer_plist - IN: Transfer property list for this I/O operation
-///\exception	H5::DataSetIException
+// Function:    DataSet::write
+///\brief       Writes raw data from an application buffer to a dataset.
+///\param       buf - IN: Buffer containing data to be written
+///\param       mem_type - IN: Memory datatype
+///\param       mem_space - IN: Memory dataspace
+///\param       file_space - IN: Dataset's dataspace in the file
+///\param       xfer_plist - IN: Transfer property list for this I/O operation
+///\exception   H5::DataSetIException
 ///\par Description
-///		This function writes raw data from an application buffer
-///		\a buf to a dataset, converting from memory datatype
-///		\a mem_type and dataspace \a mem_space to file datatype
-///		and dataspace.
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-void DataSet::write( const void* buf, const DataType& mem_type, const DataSpace& mem_space, const DataSpace& file_space, const DSetMemXferPropList& xfer_plist ) const
+///             This function writes raw data from an application buffer
+///             \a buf to a dataset, converting from memory datatype
+///             \a mem_type and dataspace \a mem_space to file datatype
+///             and dataspace.
+//--------------------------------------------------------------------------
+void
+DataSet::write(const void *buf, const DataType &mem_type, const DataSpace &mem_space,
+               const DataSpace &file_space, const DSetMemXferPropList &xfer_plist) const
 {
-   // Obtain identifiers for C API
-   hid_t mem_type_id = mem_type.getId();
-   hid_t mem_space_id = mem_space.getId();
-   hid_t file_space_id = file_space.getId();
-   hid_t xfer_plist_id = xfer_plist.getId();
+    // Obtain identifiers for C API
+    hid_t mem_type_id   = mem_type.getId();
+    hid_t mem_space_id  = mem_space.getId();
+    hid_t file_space_id = file_space.getId();
+    hid_t xfer_plist_id = xfer_plist.getId();
 
-   herr_t ret_value = H5Dwrite( id, mem_type_id, mem_space_id, file_space_id, xfer_plist_id, buf );
-   if( ret_value < 0 )
-   {
-      throw DataSetIException("DataSet::write", "H5Dwrite failed");
-   }
+    herr_t ret_value = H5Dwrite(id, mem_type_id, mem_space_id, file_space_id, xfer_plist_id, buf);
+    if (ret_value < 0) {
+        throw DataSetIException("DataSet::write", "H5Dwrite failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataSet::write
-///\brief	This is an overloaded member function, provided for convenience.
-///		It takes a reference to a \c H5std_string for the buffer.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DataSet::write
+///\brief       This is an overloaded member function, provided for convenience.
+///             It takes a reference to a \c H5std_string for the buffer.
 // Modification
-//	Jul 2009
-//		Modified to pass the buffer into H5Dwrite properly depending
-//		whether the dataset has variable- or fixed-length string.
+//      Jul 2009
+//              Modified to pass the buffer into H5Dwrite properly depending
+//              whether the dataset has variable- or fixed-length string.
 //--------------------------------------------------------------------------
-void DataSet::write( const H5std_string& strg, const DataType& mem_type, const DataSpace& mem_space, const DataSpace& file_space, const DSetMemXferPropList& xfer_plist ) const
+void
+DataSet::write(const H5std_string &strg, const DataType &mem_type, const DataSpace &mem_space,
+               const DataSpace &file_space, const DSetMemXferPropList &xfer_plist) const
 {
     // Check if this attribute has variable-len string or fixed-len string and
     // proceed appropriately.
     htri_t is_variable_len = H5Tis_variable_str(mem_type.getId());
-    if (is_variable_len < 0)
-    {
+    if (is_variable_len < 0) {
         throw DataSetIException("DataSet::write", "H5Tis_variable_str failed");
     }
 
-   // Obtain identifiers for C API
-   hid_t mem_type_id = mem_type.getId();
-   hid_t mem_space_id = mem_space.getId();
-   hid_t file_space_id = file_space.getId();
-   hid_t xfer_plist_id = xfer_plist.getId();
+    // Obtain identifiers for C API
+    hid_t mem_type_id   = mem_type.getId();
+    hid_t mem_space_id  = mem_space.getId();
+    hid_t file_space_id = file_space.getId();
+    hid_t xfer_plist_id = xfer_plist.getId();
 
     // Convert string to C-string
-    const char* strg_C;
-    strg_C = strg.c_str();  // strg_C refers to the contents of strg as a C-str
+    const char *strg_C;
+    strg_C           = strg.c_str(); // strg_C refers to the contents of strg as a C-str
     herr_t ret_value = 0;
 
     // Pass string in differently depends on variable or fixed length
-    if (!is_variable_len)
-    {
-        ret_value = H5Dwrite( id, mem_type_id, mem_space_id, file_space_id, xfer_plist_id, strg_C );
+    if (!is_variable_len) {
+        ret_value = H5Dwrite(id, mem_type_id, mem_space_id, file_space_id, xfer_plist_id, strg_C);
     }
-    else
-    {
+    else {
         // passing string argument by address
-        ret_value = H5Dwrite( id, mem_type_id, mem_space_id, file_space_id, xfer_plist_id, &strg_C );
+        ret_value = H5Dwrite(id, mem_type_id, mem_space_id, file_space_id, xfer_plist_id, &strg_C);
     }
-    if (ret_value < 0)
-    {
+    if (ret_value < 0) {
         throw DataSetIException("DataSet::write", "H5Dwrite failed");
     }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataSet::iterateElems
-///\brief	Iterates over all selected elements in a dataspace.
-///\param	buf - IN/OUT: Pointer to the buffer in memory containing the
-///		elements to iterate over
-///\param	type - IN: Datatype for the elements stored in \a buf
-///\param	space - IN: Dataspace for \a buf. Also contains the selection
-///		to iterate over.
-///\param	op - IN: Function pointer to the routine to be called for
-///		each element in \a buf iterated over
-///\param	op_data - IN/OUT: Pointer to any user-defined data associated
-///		with the operation
-///\exception	H5::DataSetIException
-///\note	This function may not work correctly yet - it's still
-///		under development.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DataSet::iterateElems
+///\brief       Iterates over all selected elements in a dataspace.
+///\param       buf - IN/OUT: Pointer to the buffer in memory containing the
+///             elements to iterate over
+///\param       type - IN: Datatype for the elements stored in \a buf
+///\param       space - IN: Dataspace for \a buf. Also contains the selection
+///             to iterate over.
+///\param       op - IN: Function pointer to the routine to be called for
+///             each element in \a buf iterated over
+///\param       op_data - IN/OUT: Pointer to any user-defined data associated
+///             with the operation
+///\exception   H5::DataSetIException
+///\note        This function may not work correctly yet - it's still
+///             under development.
 //--------------------------------------------------------------------------
-int DataSet::iterateElems( void* buf, const DataType& type, const DataSpace& space, H5D_operator_t op, void* op_data )
+int
+DataSet::iterateElems(void *buf, const DataType &type, const DataSpace &space, H5D_operator_t op,
+                      void *op_data)
 {
-   // Obtain identifiers for C API
-   hid_t type_id = type.getId();
-   hid_t space_id = space.getId();
-   herr_t ret_value = H5Diterate( buf, type_id, space_id, op, op_data );
-   if( ret_value >= 0 )
-      return( ret_value );
-   else  // raise exception when H5Diterate returns a negative value
-   {
-      throw DataSetIException("DataSet::iterateElems", "H5Diterate failed");
-   }
+    // Obtain identifiers for C API
+    hid_t  type_id   = type.getId();
+    hid_t  space_id  = space.getId();
+    herr_t ret_value = H5Diterate(buf, type_id, space_id, op, op_data);
+    if (ret_value >= 0)
+        return (ret_value);
+    else // raise exception when H5Diterate returns a negative value
+    {
+        throw DataSetIException("DataSet::iterateElems", "H5Diterate failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataSet::extend
-///\brief	Extends a dataset with unlimited dimension.
-///\param	size - IN: Array containing the new magnitude of each dimension
-///\exception	H5::DataSetIException
+// Function:    DataSet::extend
+///\brief       Extends a dataset with unlimited dimension.
+///\param       size - IN: Array containing the new magnitude of each dimension
+///\exception   H5::DataSetIException
 ///\par Description
-///		For more information, please see the Description section in
-///		C layer Reference Manual at:
-///\par
-/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5D.html#Dataset-Extend
-// Programmer	Binh-Minh Ribler - 2000
+///             For information, please refer to the H5Dset_extent API in
+///             the HDF5 C Reference Manual.
 //--------------------------------------------------------------------------
-void DataSet::extend( const hsize_t* size ) const
+void
+DataSet::extend(const hsize_t *size) const
 {
-   herr_t ret_value = H5Dset_extent( id, size );
-   if( ret_value < 0 )  // raise exception when H5Dset_extent returns a neg value
-      throw DataSetIException("DataSet::extend", "H5Dset_extent failed");
+    herr_t ret_value = H5Dset_extent(id, size);
+    if (ret_value < 0) // raise exception when H5Dset_extent returns a neg value
+        throw DataSetIException("DataSet::extend", "H5Dset_extent failed");
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataSet::fillMemBuf
-///\brief	Fills a selection in memory with a value.
-///\param	fill - IN: Pointer to fill value to use - default NULL
-///\param	fill_type - IN: Datatype of the fill value
-///\param	buf - IN/OUT: Memory buffer to fill selection within
-///\param	buf_type - IN: Datatype of the elements in buffer
-///\param	space - IN: Dataspace describing memory buffer & containing selection to use
-///\exception	H5::DataSetIException
-// Programmer	Binh-Minh Ribler - 2014
-// Modification
-//		Used the non-const version.
+// Function:    DataSet::fillMemBuf
+///\brief       Fills a selection in memory with a value.
+///\param       fill - IN: Pointer to fill value to use - default NULL
+///\param       fill_type - IN: Datatype of the fill value
+///\param       buf - IN/OUT: Memory buffer to fill selection within
+///\param       buf_type - IN: Datatype of the elements in buffer
+///\param       space - IN: Dataspace describing memory buffer & containing selection to use
+///\exception   H5::DataSetIException
 //--------------------------------------------------------------------------
-void DataSet::fillMemBuf(const void *fill, const DataType& fill_type, void *buf, const DataType& buf_type, const DataSpace& space) const
+void
+DataSet::fillMemBuf(const void *fill, const DataType &fill_type, void *buf, const DataType &buf_type,
+                    const DataSpace &space) const
 {
-    hid_t fill_type_id = fill_type.getId();
-    hid_t buf_type_id = buf_type.getId();
-    hid_t space_id = space.getId();
-    herr_t ret_value = H5Dfill(fill, fill_type_id, buf, buf_type_id, space_id);
-    if( ret_value < 0 )
-    {
-	throw DataSetIException("DataSet::fillMemBuf", "H5Dfill failed");
+    hid_t  fill_type_id = fill_type.getId();
+    hid_t  buf_type_id  = buf_type.getId();
+    hid_t  space_id     = space.getId();
+    herr_t ret_value    = H5Dfill(fill, fill_type_id, buf, buf_type_id, space_id);
+    if (ret_value < 0) {
+        throw DataSetIException("DataSet::fillMemBuf", "H5Dfill failed");
     }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataSet::fillMemBuf
-///\brief       This is an overloaded member function, kept for backward
-///		compatibility.  It differs from the above function in that it
-///             misses const's.  This wrapper will be removed in future release.
-///\param	fill - IN: Pointer to fill value to use - default NULL
-///\param	fill_type - IN: Datatype of the fill value
-///\param	buf - IN/OUT: Memory buffer to fill selection within
-///\param	buf_type - IN: Datatype of the elements in buffer
-///\param	space - IN: Dataspace describing memory buffer & containing selection to use
-///\exception	H5::DataSetIException
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-void DataSet::fillMemBuf(const void *fill, DataType& fill_type, void *buf, DataType& buf_type, DataSpace& space)
-{
-    fillMemBuf(fill, (const DataType)fill_type, buf, (const DataType)buf_type, (const DataSpace)space);
-}
-
-//--------------------------------------------------------------------------
-// Function:	DataSet::fillMemBuf
-///\brief	Fills a selection in memory with 0.
-///\param	buf - IN/OUT: Memory buffer to fill selection within
-///\param	buf_type - IN: Datatype of the elements in buffer
-///\param	space - IN: Dataspace describing memory buffer & containing selection to use
-///\exception	H5::DataSetIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DataSet::fillMemBuf
+// Purpose      This is an overloaded member function, kept for backward
+//              compatibility.  It differs from the above function in that it
+//              misses const's.  This wrapper will be removed in future release.
+// Param        fill - IN: Pointer to fill value to use - default NULL
+// Param        fill_type - IN: Datatype of the fill value
+// Param        buf - IN/OUT: Memory buffer to fill selection within
+// Param        buf_type - IN: Datatype of the elements in buffer
+// Param        space - IN: Dataspace describing memory buffer & containing selection to use
+// Exception    H5::DataSetIException
+// Modification
+//              Modified to call its replacement. -BMR, 2014/04/16
+//              Removed from documentation. -BMR, 2016/03/07 1.8.17 and 1.10.0
+//              Removed from code. -BMR, 2016/08/11 1.8.18 and 1.10.1
 //--------------------------------------------------------------------------
-void DataSet::fillMemBuf(void *buf, const DataType& buf_type, const DataSpace& space) const
-{
-    hid_t buf_type_id = buf_type.getId();
-    hid_t space_id = space.getId();
-    herr_t ret_value = H5Dfill(NULL, buf_type_id, buf, buf_type_id, space_id);
-    if( ret_value < 0 )
-    {
-	throw DataSetIException("DataSet::fillMemBuf", "H5Dfill failed");
-    }
-}
+// void DataSet::fillMemBuf(const void *fill, DataType& fill_type, void *buf, DataType& buf_type, DataSpace&
+// space)
+//{
+//    fillMemBuf(fill, (const DataType)fill_type, buf, (const DataType)buf_type, (const DataSpace)space);
+//}
 
 //--------------------------------------------------------------------------
 // Function:    DataSet::fillMemBuf
-///\brief       This is an overloaded member function, kept for backward
-///		compatibility.  It differs from the above function in that it
-///             misses const's.  This wrapper will be removed in future release.
+///\brief       Fills a selection in memory with 0.
 ///\param       buf - IN/OUT: Memory buffer to fill selection within
 ///\param       buf_type - IN: Datatype of the elements in buffer
 ///\param       space - IN: Dataspace describing memory buffer & containing selection to use
 ///\exception   H5::DataSetIException
-// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void DataSet::fillMemBuf(void *buf, DataType& buf_type, DataSpace& space)
+void
+DataSet::fillMemBuf(void *buf, const DataType &buf_type, const DataSpace &space) const
 {
-    fillMemBuf(buf, (const DataType)buf_type, (const DataSpace)space);
+    hid_t  buf_type_id = buf_type.getId();
+    hid_t  space_id    = space.getId();
+    herr_t ret_value   = H5Dfill(NULL, buf_type_id, buf, buf_type_id, space_id);
+    if (ret_value < 0) {
+        throw DataSetIException("DataSet::fillMemBuf", "H5Dfill failed");
+    }
 }
 
 //--------------------------------------------------------------------------
+// Function:    DataSet::fillMemBuf
+// Purpose      This is an overloaded member function, kept for backward
+//              compatibility.  It differs from the above function in that it
+//              misses const's.  This wrapper will be removed in future release.
+// Param        buf - IN/OUT: Memory buffer to fill selection within
+// Param        buf_type - IN: Datatype of the elements in buffer
+// Param        space - IN: Dataspace describing memory buffer & containing selection to use
+// Exception    H5::DataSetIException
+// Modification
+//              Modified to call its replacement. -BMR, 2014/04/16
+//              Removed from documentation. -BMR, 2016/03/07 1.8.17 and 1.10.0
+//              Removed from code. -BMR, 2016/08/11 1.8.18 and 1.10.1
+//--------------------------------------------------------------------------
+// void DataSet::fillMemBuf(void *buf, DataType& buf_type, DataSpace& space)
+//{
+//    fillMemBuf(buf, (const DataType)buf_type, (const DataSpace)space);
+//}
+
+//--------------------------------------------------------------------------
 // Function:    DataSet::getId
-///\brief	Get the id of this dataset.
-///\return	DataSet identifier
+///\brief       Get the id of this dataset.
+///\return      DataSet identifier
 // Description:
 //              Class hierarchy is revised to address bugzilla 1068.  Class
 //              AbstractDs and Attribute are moved out of H5Object.  In
 //              addition, member IdComponent::id is moved into subclasses, and
 //              IdComponent::getId now becomes pure virtual function.
-// Programmer   Binh-Minh Ribler - May, 2008
 //--------------------------------------------------------------------------
-hid_t DataSet::getId() const
+hid_t
+DataSet::getId() const
 {
-   return(id);
+    return (id);
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataSet::p_read_fixed_len (private)
-// brief	Reads a fixed length \a H5std_string from a dataset.
-// param	mem_type  - IN: DataSet datatype (in memory)
-// param	strg      - IN: Buffer for read string
-// exception	H5::DataSetIException
-// Programmer	Binh-Minh Ribler - Jul, 2009
+// Function:    DataSet::p_read_fixed_len (private)
+// brief        Reads a fixed length \a H5std_string from a dataset.
+// param        mem_type  - IN: DataSet datatype (in memory)
+// param        strg      - IN: Buffer for read string
+// exceptio n   H5::DataSetIException
 // Modification
-//	Jul 2009
-//		Added in follow to the change in Attribute::read
+//      Jul 2009
+//              Added in follow to the change in Attribute::read
 //--------------------------------------------------------------------------
-void DataSet::p_read_fixed_len(const hid_t mem_type_id, const hid_t mem_space_id, const hid_t file_space_id, const hid_t xfer_plist_id, H5std_string& strg) const
+void
+DataSet::p_read_fixed_len(const hid_t mem_type_id, const hid_t mem_space_id, const hid_t file_space_id,
+                          const hid_t xfer_plist_id, H5std_string &strg) const
 {
     // Only allocate for fixed-len string.
 
@@ -696,37 +717,36 @@ void DataSet::p_read_fixed_len(const hid_t mem_type_id, const hid_t mem_space_id
     size_t data_size = getInMemDataSize();
 
     // If there is data, allocate buffer and read it.
-    if (data_size > 0)
-    {
-	char *strg_C = new char [data_size+1];
-	HDmemset(strg_C, 0, data_size+1); // clear buffer
+    if (data_size > 0) {
+        // Create buffer for C string
+        char *strg_C = new char[data_size + 1]();
 
-	herr_t ret_value = H5Dread(id, mem_type_id, mem_space_id, file_space_id, xfer_plist_id, strg_C);
+        herr_t ret_value = H5Dread(id, mem_type_id, mem_space_id, file_space_id, xfer_plist_id, strg_C);
 
-	if( ret_value < 0 )
-	{
-	    delete []strg_C;	// de-allocate for fixed-len string
-	    throw DataSetIException("DataSet::read", "H5Dread failed for fixed length string");
-	}
+        if (ret_value < 0) {
+            delete[] strg_C; // de-allocate for fixed-len string
+            throw DataSetIException("DataSet::read", "H5Dread failed for fixed length string");
+        }
 
-	// Get string from the C char* and release resource allocated locally
-	strg = strg_C;
-	delete []strg_C;
+        // Get string from the C char* and release resource allocated locally
+        strg = strg_C;
+        delete[] strg_C;
     }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataSet::p_read_variable_len (private)
-// brief	Reads a variable length \a H5std_string from an dataset.
-// param	mem_type  - IN: DataSet datatype (in memory)
-// param	strg      - IN: Buffer for read string
-// exception	H5::DataSetIException
-// Programmer	Binh-Minh Ribler - Jul, 2009
+// Function:    DataSet::p_read_variable_len (private)
+// brief        Reads a variable length \a H5std_string from an dataset.
+// param        mem_type  - IN: DataSet datatype (in memory)
+// param        strg      - IN: Buffer for read string
+// exception    H5::DataSetIException
 // Modification
-//	Jul 2009
-//		Added in follow to the change in Attribute::read
+//      Jul 2009
+//              Added in follow to the change in Attribute::read
 //--------------------------------------------------------------------------
-void DataSet::p_read_variable_len(const hid_t mem_type_id, const hid_t mem_space_id, const hid_t file_space_id, const hid_t xfer_plist_id, H5std_string& strg) const
+void
+DataSet::p_read_variable_len(const hid_t mem_type_id, const hid_t mem_space_id, const hid_t file_space_id,
+                             const hid_t xfer_plist_id, H5std_string &strg) const
 {
     // Prepare and call C API to read dataset.
     char *strg_C;
@@ -734,14 +754,13 @@ void DataSet::p_read_variable_len(const hid_t mem_type_id, const hid_t mem_space
     // Read dataset, no allocation for variable-len string; C library will
     herr_t ret_value = H5Dread(id, mem_type_id, mem_space_id, file_space_id, xfer_plist_id, &strg_C);
 
-    if( ret_value < 0 )
-    {
-	throw DataSetIException("DataSet::read", "H5Dread failed for variable length string");
+    if (ret_value < 0) {
+        throw DataSetIException("DataSet::read", "H5Dread failed for variable length string");
     }
 
     // Get string from the C char* and release resource allocated by C API
     strg = strg_C;
-    HDfree(strg_C);
+    free(strg_C);
 }
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
@@ -752,66 +771,77 @@ void DataSet::p_read_variable_len(const hid_t mem_type_id, const hid_t mem_space
 ///\exception   H5::IdComponentException when the attempt to close the HDF5
 ///             object fails
 // Description:
-//              The underlaying reference counting in the C library ensures
+//              The underlying reference counting in the C library ensures
 //              that the current valid id of this object is properly closed.
 //              Then the object's id is reset to the new id.
-// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void DataSet::p_setId(const hid_t new_id)
+void
+DataSet::p_setId(const hid_t new_id)
 {
     // handling references to this old id
     try {
         close();
     }
-    catch (Exception close_error) {
+    catch (Exception &close_error) {
         throw DataSetIException(inMemFunc("p_setId"), close_error.getDetailMsg());
     }
-   // reset object's id to the given id
-   id = new_id;
+    // reset object's id to the given id
+    id = new_id;
+}
+
+//--------------------------------------------------------------------------
+// Function:    f_PropList_setId - friend
+// Purpose:     This function is friend to class H5::PropList so that it
+//              can set PropList::id in order to work around a problem
+//              described in the JIRA issue HDFFV-7947.
+//              Applications shouldn't need to use it.
+// param        dset   - IN/OUT: DataSet object to be changed
+// param        new_id - IN: New id to set
+//--------------------------------------------------------------------------
+void
+f_PropList_setId(PropList *plist, hid_t new_id)
+{
+    plist->p_setId(new_id);
 }
+
 #endif // DOXYGEN_SHOULD_SKIP_THIS
 
 //--------------------------------------------------------------------------
-// Function:	DataSet::close
-///\brief	Closes this dataset.
+// Function:    DataSet::close
+///\brief       Closes this dataset.
 ///
-///\exception	H5::DataSetIException
-// Programmer	Binh-Minh Ribler - Mar 9, 2005
+///\exception   H5::DataSetIException
 //--------------------------------------------------------------------------
-void DataSet::close()
+void
+DataSet::close()
 {
-    if (p_valid_id(id))
-    {
-	herr_t ret_value = H5Dclose( id );
-	if( ret_value < 0 )
-	{
-	    throw DataSetIException("DataSet::close", "H5Dclose failed");
-	}
-	// reset the id
-	id = H5I_INVALID_HID;
+    if (p_valid_id(id)) {
+        herr_t ret_value = H5Dclose(id);
+        if (ret_value < 0) {
+            throw DataSetIException("DataSet::close", "H5Dclose failed");
+        }
+        // reset the id
+        id = H5I_INVALID_HID;
     }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataSet destructor
-///\brief	Properly terminates access to this dataset.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DataSet destructor
+///\brief       Properly terminates access to this dataset.
 // Modification
-//		- Replaced resetIdComponent() with decRefCount() to use C
-//		library ID reference counting mechanism - BMR, Jun 1, 2004
-//		- Replaced decRefCount with close() to let the C library
-//		handle the reference counting - BMR, Jun 1, 2006
+//              - Replaced resetIdComponent() with decRefCount() to use C
+//              library ID reference counting mechanism - BMR, Jun 1, 2004
+//              - Replaced decRefCount with close() to let the C library
+//              handle the reference counting - BMR, Jun 1, 2006
 //--------------------------------------------------------------------------
 DataSet::~DataSet()
 {
     try {
-	close();
+        close();
     }
-    catch (Exception close_error) {
-	cerr << "DataSet::~DataSet - " << close_error.getDetailMsg() << endl;
+    catch (Exception &close_error) {
+        cerr << "DataSet::~DataSet - " << close_error.getDetailMsg() << endl;
     }
 }
 
-#ifndef H5_NO_NAMESPACE
-} // end namespace
-#endif
+} // namespace H5
diff --git a/c++/src/H5DataSet.h b/c++/src/H5DataSet.h
index 529466a..3992350 100644
--- a/c++/src/H5DataSet.h
+++ b/c++/src/H5DataSet.h
@@ -1,25 +1,20 @@
 // C++ informative line for the emacs editor: -*- C++ -*-
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5DataSet_H
-#define __H5DataSet_H
+#ifndef H5DataSet_H
+#define H5DataSet_H
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#endif
 
 /*! \class DataSet
     \brief Class DataSet operates on HDF5 datasets.
@@ -28,105 +23,136 @@ namespace H5 {
     Attribute and DataSet are derivatives of AbstractDs.  DataSet also
     inherits from H5Object because a dataset is an HDF5 object.
 */
+//  Inheritance: multiple H5Object/AbstractDs -> H5Location -> IdComponent
 class H5_DLLCPP DataSet : public H5Object, public AbstractDs {
-   public:
-	// Close this dataset.
-	virtual void close();
-
-	// Extends the dataset with unlimited dimension.
-	void extend( const hsize_t* size ) const;
-
-	// Fills a selection in memory with a value
-	void fillMemBuf(const void *fill, const DataType& fill_type, void *buf, const DataType& buf_type, const DataSpace& space) const;
-	void fillMemBuf(const void *fill, DataType& fill_type, void *buf, DataType& buf_type, DataSpace& space); // kept for backward compatibility
-
-	// Fills a selection in memory with zero
-	void fillMemBuf(void *buf, const DataType& buf_type, const DataSpace& space) const;
-	void fillMemBuf(void *buf, DataType& buf_type, DataSpace& space); // kept for backward compatibility
-
-	// Gets the creation property list of this dataset.
-	DSetCreatPropList getCreatePlist() const;
-
-	// Returns the address of this dataset in the file.
-	haddr_t getOffset() const;
-
-	// Gets the dataspace of this dataset.
-	virtual DataSpace getSpace() const;
-
-	// Determines whether space has been allocated for a dataset.
-	void getSpaceStatus(H5D_space_status_t& status) const;
-
-	// Returns the amount of storage size required for this dataset.
-	virtual hsize_t getStorageSize() const;
-
-	// Returns the in memory size of this attribute's data.
-	virtual size_t getInMemDataSize() const;
-
-	// Returns the number of bytes required to store VL data.
-	hsize_t getVlenBufSize(const DataType& type, const DataSpace& space ) const;
-	hsize_t getVlenBufSize(DataType& type, DataSpace& space) const; // kept for backward compatibility
-
-	// Reclaims VL datatype memory buffers.
-	static void vlenReclaim(const DataType& type, const DataSpace& space, const DSetMemXferPropList& xfer_plist, void* buf );
-	static void vlenReclaim(void *buf, const DataType& type, const DataSpace& space = DataSpace::ALL, const DSetMemXferPropList& xfer_plist = DSetMemXferPropList::DEFAULT);
-
-	// Reads the data of this dataset and stores it in the provided buffer.
-	// The memory and file dataspaces and the transferring property list
-	// can be defaults.
-	void read( void* buf, const DataType& mem_type, const DataSpace& mem_space = DataSpace::ALL, const DataSpace& file_space = DataSpace::ALL, const DSetMemXferPropList& xfer_plist = DSetMemXferPropList::DEFAULT ) const;
-        void read( H5std_string& buf, const DataType& mem_type, const DataSpace& mem_space = DataSpace::ALL, const DataSpace& file_space = DataSpace::ALL, const DSetMemXferPropList& xfer_plist = DSetMemXferPropList::DEFAULT ) const;
-
-	// Writes the buffered data to this dataset.
-	// The memory and file dataspaces and the transferring property list
-	// can be defaults.
-	void write( const void* buf, const DataType& mem_type, const DataSpace& mem_space = DataSpace::ALL, const DataSpace& file_space = DataSpace::ALL, const DSetMemXferPropList& xfer_plist = DSetMemXferPropList::DEFAULT ) const;
-        void write( const H5std_string& buf, const DataType& mem_type, const DataSpace& mem_space = DataSpace::ALL, const DataSpace& file_space = DataSpace::ALL, const DSetMemXferPropList& xfer_plist = DSetMemXferPropList::DEFAULT ) const;
-
-	// Iterates the selected elements in the specified dataspace - not implemented in C++ style yet
-        int iterateElems( void* buf, const DataType& type, const DataSpace& space, H5D_operator_t op, void* op_data = NULL );
-
-	///\brief Returns this class name.
-	virtual H5std_string fromClass () const { return("DataSet"); }
-
-	// Creates a dataset by way of dereference.
-	DataSet(const H5Location& loc, const void* ref, H5R_type_t ref_type = H5R_OBJECT, const PropList& plist = PropList::DEFAULT);
-	DataSet(const Attribute& attr, const void* ref, H5R_type_t ref_type = H5R_OBJECT, const PropList& plist = PropList::DEFAULT);
-
-	// Default constructor.
-	DataSet();
+  public:
+    // Close this dataset.
+    virtual void close() override;
+
+    // Extends the dataset with unlimited dimension.
+    void extend(const hsize_t *size) const;
+
+    // Fills a selection in memory with a value
+    void fillMemBuf(const void *fill, const DataType &fill_type, void *buf, const DataType &buf_type,
+                    const DataSpace &space) const;
+    // void fillMemBuf(const void *fill, DataType& fill_type, void *buf, DataType& buf_type, DataSpace&
+    // space); // removed from 1.8.18 and 1.10.1
+
+    // Fills a selection in memory with zero
+    void fillMemBuf(void *buf, const DataType &buf_type, const DataSpace &space) const;
+    // void fillMemBuf(void *buf, DataType& buf_type, DataSpace& space); // removed from 1.8.18 and 1.10.1
+
+    // Gets the creation property list of this dataset.
+    DSetCreatPropList getCreatePlist() const;
+
+    // Gets the access property list of this dataset.
+    DSetAccPropList getAccessPlist() const;
+
+    // Returns the address of this dataset in the file.
+    haddr_t getOffset() const;
+
+    // Gets the dataspace of this dataset.
+    virtual DataSpace getSpace() const override;
+
+    // Determines whether space has been allocated for a dataset.
+    void getSpaceStatus(H5D_space_status_t &status) const;
+
+    // Returns the amount of storage size required for this dataset.
+    virtual hsize_t getStorageSize() const override;
+
+    // Returns the in memory size of this attribute's data.
+    virtual size_t getInMemDataSize() const override;
+
+    // Returns the number of bytes required to store VL data.
+    hsize_t getVlenBufSize(const DataType &type, const DataSpace &space) const;
+    // hsize_t getVlenBufSize(DataType& type, DataSpace& space) const; // removed from 1.8.18 and 1.10.1
+
+    // Reclaims VL datatype memory buffers.
+    static void vlenReclaim(const DataType &type, const DataSpace &space,
+                            const DSetMemXferPropList &xfer_plist, void *buf);
+    static void vlenReclaim(void *buf, const DataType &type, const DataSpace &space = DataSpace::ALL,
+                            const DSetMemXferPropList &xfer_plist = DSetMemXferPropList::DEFAULT);
+
+    // Reads the data of this dataset and stores it in the provided buffer.
+    // The memory and file dataspaces and the transferring property list
+    // can be defaults.
+    void read(void *buf, const DataType &mem_type, const DataSpace &mem_space = DataSpace::ALL,
+              const DataSpace           &file_space = DataSpace::ALL,
+              const DSetMemXferPropList &xfer_plist = DSetMemXferPropList::DEFAULT) const;
+    void read(H5std_string &buf, const DataType &mem_type, const DataSpace &mem_space = DataSpace::ALL,
+              const DataSpace           &file_space = DataSpace::ALL,
+              const DSetMemXferPropList &xfer_plist = DSetMemXferPropList::DEFAULT) const;
+
+    // Writes the buffered data to this dataset.
+    // The memory and file dataspaces and the transferring property list
+    // can be defaults.
+    void write(const void *buf, const DataType &mem_type, const DataSpace &mem_space = DataSpace::ALL,
+               const DataSpace           &file_space = DataSpace::ALL,
+               const DSetMemXferPropList &xfer_plist = DSetMemXferPropList::DEFAULT) const;
+    void write(const H5std_string &buf, const DataType &mem_type, const DataSpace &mem_space = DataSpace::ALL,
+               const DataSpace           &file_space = DataSpace::ALL,
+               const DSetMemXferPropList &xfer_plist = DSetMemXferPropList::DEFAULT) const;
+
+    // Iterates the selected elements in the specified dataspace - not implemented in C++ style yet
+    int iterateElems(void *buf, const DataType &type, const DataSpace &space, H5D_operator_t op,
+                     void *op_data = NULL);
+
+    ///\brief Returns this class name.
+    virtual H5std_string
+    fromClass() const override
+    {
+        return ("DataSet");
+    }
+
+    // Creates a dataset by way of dereference.
+    DataSet(const H5Location &loc, const void *ref, H5R_type_t ref_type = H5R_OBJECT,
+            const PropList &plist = PropList::DEFAULT);
+    DataSet(const Attribute &attr, const void *ref, H5R_type_t ref_type = H5R_OBJECT,
+            const PropList &plist = PropList::DEFAULT);
+
+    // Default constructor.
+    DataSet();
+
+    // Copy constructor - same as the original DataSet.
+    DataSet(const DataSet &original);
+
+    // Assignment operator
+    DataSet &operator=(const DataSet &original);
+
+    // Creates a copy of an existing DataSet using its id.
+    DataSet(const hid_t existing_id);
+
+    // Gets the dataset id.
+    virtual hid_t getId() const override;
+
+    // Destructor: properly terminates access to this dataset.
+    virtual ~DataSet() override;
+
+  protected:
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+    // Sets the dataset id.
+    virtual void p_setId(const hid_t new_id) override;
+#endif // DOXYGEN_SHOULD_SKIP_THIS
 
-	// Copy constructor.
-	DataSet( const DataSet& original );
+  private:
+    hid_t id; // HDF5 dataset id
 
-	// Creates a copy of an existing DataSet using its id.
-	DataSet(const hid_t existing_id);
+    // This function contains the common code that is used by
+    // getTypeClass and various API functions getXxxType
+    // defined in AbstractDs for generic datatype and specific
+    // sub-types
+    virtual hid_t p_get_type() const override;
 
-        // Gets the dataset id.
-        virtual hid_t getId() const;
+    // Reads variable or fixed len strings from this dataset.
+    void p_read_fixed_len(const hid_t mem_type_id, const hid_t mem_space_id, const hid_t file_space_id,
+                          const hid_t xfer_plist_id, H5std_string &strg) const;
+    void p_read_variable_len(const hid_t mem_type_id, const hid_t mem_space_id, const hid_t file_space_id,
+                             const hid_t xfer_plist_id, H5std_string &strg) const;
 
-	// Destructor: properly terminates access to this dataset.
-	virtual ~DataSet();
+    // Friend function to set DataSet id.  For library use only.
+    friend void f_DataSet_setId(DataSet *dset, hid_t new_id);
 
-   protected:
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
-        // Sets the dataset id.
-        virtual void p_setId(const hid_t new_id);
-#endif // DOXYGEN_SHOULD_SKIP_THIS
+}; // end of DataSet
+} // namespace H5
 
-   private:
-	hid_t id;       // HDF5 dataset id
-
-        // This function contains the common code that is used by
-        // getTypeClass and various API functions getXxxType
-        // defined in AbstractDs for generic datatype and specific
-        // sub-types
-	virtual hid_t p_get_type() const;
-
-	// Reads variable or fixed len strings from this dataset.
-	void p_read_fixed_len(const hid_t mem_type_id, const hid_t mem_space_id, const hid_t file_space_id, const hid_t xfer_plist_id, H5std_string& strg) const;
-	void p_read_variable_len(const hid_t mem_type_id, const hid_t mem_space_id, const hid_t file_space_id, const hid_t xfer_plist_id, H5std_string& strg) const;
-};
-#ifndef H5_NO_NAMESPACE
-}
-#endif
-#endif // __H5DataSet_H
+#endif // H5DataSet_H
diff --git a/c++/src/H5DataSpace.cpp b/c++/src/H5DataSpace.cpp
index 761a454..a770101 100644
--- a/c++/src/H5DataSpace.cpp
+++ b/c++/src/H5DataSpace.cpp
@@ -1,23 +1,16 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifdef OLD_HEADER_FILENAME
-#include <iostream.h>
-#else
 #include <iostream>
-#endif
 #include <string>
 
 #include "H5Include.h"
@@ -25,564 +18,606 @@
 #include "H5IdComponent.h"
 #include "H5DataSpace.h"
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#ifndef H5_NO_STD
-    using std::cerr;
-    using std::endl;
-#endif  // H5_NO_STD
-#endif
+using std::cerr;
+using std::endl;
+
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+// This DOXYGEN_SHOULD_SKIP_THIS block is a work-around approach to control
+// the order of creation and deletion of the global constants.  See Design Notes
+// in "H5PredType.cpp" for information.
+
+// Initialize a pointer for the constant
+DataSpace *DataSpace::ALL_ = 0;
 
 //--------------------------------------------------------------------------
-///\brief	Constant for default dataspace.
+// Function:    DataSpace::getConstant
+//              Creates a DataSpace object representing the HDF5 constant
+//              H5S_ALL, pointed to by DataSpace::ALL_
+// Exception    H5::DataSpaceIException
+// Description
+//              If DataSpace::ALL_ already points to an allocated object, throw
+//              a DataSpaceIException.  This scenario should not happen.
+// Programmer   Binh-Minh Ribler - 2015
 //--------------------------------------------------------------------------
-const DataSpace DataSpace::ALL( H5S_ALL );
+DataSpace *
+DataSpace::getConstant()
+{
+    // Tell the C library not to clean up, H5Library::termH5cpp will call
+    // H5close - more dependency if use H5Library::dontAtExit()
+    if (!IdComponent::H5dontAtexit_called) {
+        (void)H5dont_atexit();
+        IdComponent::H5dontAtexit_called = true;
+    }
+
+    // If the constant pointer is not allocated, allocate it. Otherwise,
+    // throw because it shouldn't be.
+    if (ALL_ == 0)
+        ALL_ = new DataSpace(H5S_ALL);
+    else
+        throw DataSpaceIException("DataSpace::getConstant",
+                                  "DataSpace::getConstant is being invoked on an allocated ALL_");
+    return (ALL_);
+}
 
 //--------------------------------------------------------------------------
-// Function:	DataSpace constructor
-///\brief	Creates a new dataspace given a dataspace type.
-///\param	type - IN: Type of the dataspace to be created, which
-///		currently can be either \c H5S_SCALAR or \c H5S_SIMPLE;
-///		default to \c H5S_SCALAR.
-///\exception	H5::DataSpaceIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DataSpace::deleteConstants
+// Purpose:     Deletes the constant object that DataSpace::ALL_ points to
+// Programmer   Binh-Minh Ribler - 2015
 //--------------------------------------------------------------------------
-DataSpace::DataSpace(H5S_class_t type) : IdComponent()
+void
+DataSpace::deleteConstants()
 {
-   id = H5Screate( type );
-   if( id < 0 )
-   {
-      throw DataSpaceIException("DataSpace constructor", "H5Screate failed");
-   }
+    delete ALL_;
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataSpace overloaded constructor
-///\brief	Creates a new simple dataspace.
-///\param	rank - IN: Number of dimensions of dataspace.
-///\param	dims - IN: An array of the size of each dimension.
-///\param	maxdims - IN: An array of the maximum size of each dimension.
-///\exception	H5::DataSpaceIException
-// Programmer	Binh-Minh Ribler - 2000
+// Purpose      Constant for default dataspace.
+//--------------------------------------------------------------------------
+const DataSpace &DataSpace::ALL = *getConstant();
+
+#endif // DOXYGEN_SHOULD_SKIP_THIS
+
 //--------------------------------------------------------------------------
-DataSpace::DataSpace( int rank, const hsize_t * dims, const hsize_t * maxdims) : IdComponent()
+// Function:    DataSpace constructor
+///\brief       Creates a new dataspace given a dataspace type.
+///\param       type - IN: Type of the dataspace to be created, which
+///             currently can be either \c H5S_SCALAR or \c H5S_SIMPLE;
+///             default to \c H5S_SCALAR.
+///\exception   H5::DataSpaceIException
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+DataSpace::DataSpace(H5S_class_t type) : IdComponent(), id{H5Screate(type)}
 {
-   id = H5Screate_simple( rank, dims, maxdims );
-   if( id < 0 )
-   {
-      throw DataSpaceIException("DataSpace constructor", "H5Screate_simple failed");
-   }
+    if (id < 0) {
+        throw DataSpaceIException("DataSpace constructor", "H5Screate failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataSpace overloaded constructor
-///\brief	Creates a DataSpace object using the id of an existing
-///		dataspace.
-///\param	existing_id - IN: Id of an existing dataspace
-///\exception	H5::DataSpaceIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DataSpace overloaded constructor
+///\brief       Creates a new simple dataspace.
+///\param       rank - IN: Number of dimensions of dataspace.
+///\param       dims - IN: An array of the size of each dimension.
+///\param       maxdims - IN: An array of the maximum size of each dimension.
+///\exception   H5::DataSpaceIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-DataSpace::DataSpace(const hid_t existing_id) : IdComponent()
+DataSpace::DataSpace(int rank, const hsize_t *dims, const hsize_t *maxdims)
+    : IdComponent(), id{H5Screate_simple(rank, dims, maxdims)}
 {
-    id = existing_id;
+    if (id < 0) {
+        throw DataSpaceIException("DataSpace constructor", "H5Screate_simple failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataSpace copy constructor
-///\brief	Copy constructor: makes a copy of the original DataSpace object.
-///\param	original - IN: DataSpace object to copy
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DataSpace overloaded constructor
+///\brief       Creates a DataSpace object using the id of an existing
+///             dataspace.
+///\param       existing_id - IN: Id of an existing dataspace
+///\exception   H5::DataSpaceIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-DataSpace::DataSpace(const DataSpace& original) : IdComponent()
+DataSpace::DataSpace(const hid_t existing_id) : IdComponent(), id(existing_id)
 {
-    id = original.getId();
     incRefCount(); // increment number of references to this id
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataSpace::copy
-///\brief	Makes a copy of an existing dataspace.
-///\param	like_space  - IN: Dataspace to be copied
-///\exception	H5::DataSpaceIException
-// Programmer	Binh-Minh Ribler - 2000
-// Modification
-//		- Replaced resetIdComponent() with decRefCount() to use C
-//		library ID reference counting mechanism - BMR, Jun 1, 2004
-//		- Replaced decRefCount with close() to let the C library
-//		handle the reference counting - BMR, Jun 1, 2006
+// Function:    DataSpace copy constructor
+///\brief       Copy constructor: same HDF5 object as \a original
+///\param       original - IN: DataSpace object to copy
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void DataSpace::copy( const DataSpace& like_space )
+DataSpace::DataSpace(const DataSpace &original) : IdComponent(), id(original.id)
 {
-   // If this object has an hdf5 valid id, close it
-   if( id != H5S_ALL ) {
-      try {
-         close();
-      }
-      catch (Exception close_error) {
-         throw DataSpaceIException("DataSpace::copy", close_error.getDetailMsg());
-      }
-   }  // end if
-
-   // call C routine to copy the dataspace
-   id = H5Scopy( like_space.getId() );
+    incRefCount(); // increment number of references to this id
+}
 
-   if( id < 0 )
-      throw DataSpaceIException("DataSpace::copy", "H5Scopy failed");
+//--------------------------------------------------------------------------
+// Function:    DataSpace::copy
+///\brief       Makes a copy of an existing dataspace.
+///\param       like_space  - IN: Dataspace to be copied
+///\exception   H5::DataSpaceIException
+// Programmer   Binh-Minh Ribler - 2000
+// Modification
+//              - Replaced resetIdComponent() with decRefCount() to use C
+//              library ID reference counting mechanism - BMR, Jun 1, 2004
+//              - Replaced decRefCount with close() to let the C library
+//              handle the reference counting - BMR, Jun 1, 2006
+//--------------------------------------------------------------------------
+void
+DataSpace::copy(const DataSpace &like_space)
+{
+    // If this object has an hdf5 valid id, close it
+    if (id != H5S_ALL) {
+        try {
+            close();
+        }
+        catch (Exception &close_error) {
+            throw DataSpaceIException("DataSpace::copy", close_error.getDetailMsg());
+        }
+    } // end if
+
+    // call C routine to copy the dataspace
+    id = H5Scopy(like_space.getId());
+
+    if (id < 0)
+        throw DataSpaceIException("DataSpace::copy", "H5Scopy failed");
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataSpace::operator=
-///\brief	Assignment operator.
-///\param	rhs - IN: Reference to the existing dataspace
-///\return	Reference to DataSpace instance
-///\exception	H5::DataSpaceIException
+// Function:    DataSpace::operator=
+///\brief       Assignment operator.
+///\param       rhs - IN: Reference to the existing dataspace
+///\return      Reference to DataSpace instance
+///\exception   H5::DataSpaceIException
 // Description
-//		Makes a copy of the type on the right hand side and stores
-//		the new id in the left hand side object.
-// Programmer	Binh-Minh Ribler - 2000
+//              Makes a copy of the type on the right hand side and stores
+//              the new id in the left hand side object.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-DataSpace& DataSpace::operator=( const DataSpace& rhs )
+DataSpace &
+DataSpace::operator=(const DataSpace &rhs)
 {
     if (this != &rhs)
         copy(rhs);
-    return(*this);
+    return (*this);
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataSpace::isSimple
-///\brief	Determines whether this dataspace is a simple dataspace.
-///\return	\c true if the dataspace is a simple dataspace, and \c false,
-///		otherwise
-///\exception	H5::DataSpaceIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DataSpace::isSimple
+///\brief       Determines whether this dataspace is a simple dataspace.
+///\return      \c true if the dataspace is a simple dataspace, and \c false,
+///             otherwise
+///\exception   H5::DataSpaceIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-bool DataSpace::isSimple () const
+bool
+DataSpace::isSimple() const
 {
-   htri_t simple = H5Sis_simple( id );
-   if( simple > 0 )
-      return true;
-   else if( simple == 0 )
-      return false;
-   else
-   {
-      throw DataSpaceIException("DataSpace::isSimple",
-		"H5Sis_simple returns negative value");
-   }
+    htri_t simple = H5Sis_simple(id);
+    if (simple > 0)
+        return true;
+    else if (simple == 0)
+        return false;
+    else {
+        throw DataSpaceIException("DataSpace::isSimple", "H5Sis_simple returns negative value");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataSpace::offsetSimple
-///\brief	Sets the offset of this simple dataspace.
-///\param	offset  - IN: Offset to position the selection at
-///\exception	H5::DataSpaceIException
+// Function:    DataSpace::offsetSimple
+///\brief       Sets the offset of this simple dataspace.
+///\param       offset  - IN: Offset to position the selection at
+///\exception   H5::DataSpaceIException
 ///\par Description
-///		This function creates an offset for the selection within
-///		an extent, allowing the same shaped selection to be moved
-///		to different locations within a dataspace without requiring
-///		it to be re-defined.
-// Programmer	Binh-Minh Ribler - 2000
+///             This function creates an offset for the selection within
+///             an extent, allowing the same shaped selection to be moved
+///             to different locations within a dataspace without requiring
+///             it to be re-defined.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void DataSpace::offsetSimple ( const hssize_t* offset ) const
+void
+DataSpace::offsetSimple(const hssize_t *offset) const
 {
-   herr_t ret_value = H5Soffset_simple( id, offset );
-   if( ret_value < 0 )
-   {
-      throw DataSpaceIException("DataSpace::offsetSimple", "H5Soffset_simple failed");
-   }
+    herr_t ret_value = H5Soffset_simple(id, offset);
+    if (ret_value < 0) {
+        throw DataSpaceIException("DataSpace::offsetSimple", "H5Soffset_simple failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataSpace::getSimpleExtentDims
-///\brief	Retrieves dataspace dimension size and maximum size.
-///\param	dims  - IN: Name of the new member
-///\param	maxdims - IN: Pointer to the value of the new member
-///\return	Number of dimensions, the same value as returned by
-///		\c DataSpace::getSimpleExtentNdims()
-///\exception	H5::DataSpaceIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DataSpace::getSimpleExtentDims
+///\brief       Retrieves dataspace dimension size and maximum size.
+///\param       dims  - IN: Name of the new member
+///\param       maxdims - IN: Pointer to the value of the new member
+///\return      Number of dimensions, the same value as returned by
+///             \c DataSpace::getSimpleExtentNdims()
+///\exception   H5::DataSpaceIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-int DataSpace::getSimpleExtentDims ( hsize_t *dims, hsize_t *maxdims ) const
+int
+DataSpace::getSimpleExtentDims(hsize_t *dims, hsize_t *maxdims) const
 {
-   int ndims = H5Sget_simple_extent_dims( id, dims, maxdims );
-   if( ndims < 0 )
-   {
-      throw DataSpaceIException("DataSpace::getSimpleExtentDims",
-		"H5Sget_simple_extent_dims returns negative number of dimensions");
-   }
-   return( ndims );
+    int ndims = H5Sget_simple_extent_dims(id, dims, maxdims);
+    if (ndims < 0) {
+        throw DataSpaceIException("DataSpace::getSimpleExtentDims",
+                                  "H5Sget_simple_extent_dims returns negative number of dimensions");
+    }
+    return (ndims);
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataSpace::getSimpleExtentNdims
-///\brief	Returns the dimensionality of a dataspace.
-///\return	Number of dimensions
-///\exception	H5::DataSpaceIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DataSpace::getSimpleExtentNdims
+///\brief       Returns the dimensionality of a dataspace.
+///\return      Number of dimensions
+///\exception   H5::DataSpaceIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-int DataSpace::getSimpleExtentNdims () const
+int
+DataSpace::getSimpleExtentNdims() const
 {
-   int ndims = H5Sget_simple_extent_ndims( id );
-   if( ndims < 0 )
-   {
-      throw DataSpaceIException("DataSpace::getSimpleExtentNdims",
-		"H5Sget_simple_extent_ndims returns negative value for dimensionality of the dataspace");
-   }
-   return( ndims );
+    int ndims = H5Sget_simple_extent_ndims(id);
+    if (ndims < 0) {
+        throw DataSpaceIException(
+            "DataSpace::getSimpleExtentNdims",
+            "H5Sget_simple_extent_ndims returns negative value for dimensionality of the dataspace");
+    }
+    return (ndims);
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataSpace::getSimpleExtentNpoints
-///\brief	Returns the number of elements in a dataspace.
-///\return	Number of elements
-///\exception	H5::DataSpaceIException
+// Function:    DataSpace::getSimpleExtentNpoints
+///\brief       Returns the number of elements in a dataspace.
+///\return      Number of elements
+///\exception   H5::DataSpaceIException
 // Modification
-//		12/05/00: due to C API change
-//			return type hssize_t vs. hsize_t
-//			num_elements = -1 when failure occurs vs. 0
-// Programmer	Binh-Minh Ribler - 2000
+//              12/05/00: due to C API change
+//                      return type hssize_t vs. hsize_t
+//                      num_elements = -1 when failure occurs vs. 0
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-hssize_t DataSpace::getSimpleExtentNpoints () const
+hssize_t
+DataSpace::getSimpleExtentNpoints() const
 {
-   hssize_t num_elements = H5Sget_simple_extent_npoints( id );
-
-   if( num_elements > -1 )
-      return( num_elements );
-   else
-   {
-      throw DataSpaceIException("DataSpace::getSimpleExtentNpoints",
-	"H5Sget_simple_extent_npoints returns negative value for the number of elements in the dataspace");
-   }
+    hssize_t num_elements = H5Sget_simple_extent_npoints(id);
+    if (num_elements > -1)
+        return (num_elements);
+    else {
+        throw DataSpaceIException("DataSpace::getSimpleExtentNpoints",
+                                  "H5Sget_simple_extent_npoints returns negative value for the number of "
+                                  "elements in the dataspace");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataSpace::getSimpleExtentType
-///\brief	Returns the current class of a dataspace.
-///\return	Class of the dataspace
-///\exception	H5::DataSpaceIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DataSpace::getSimpleExtentType
+///\brief       Returns the current class of a dataspace.
+///\return      Class of the dataspace
+///\exception   H5::DataSpaceIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-H5S_class_t DataSpace::getSimpleExtentType () const
+H5S_class_t
+DataSpace::getSimpleExtentType() const
 {
-   H5S_class_t class_name = H5Sget_simple_extent_type( id );
-   if( class_name == H5S_NO_CLASS )
-   {
-      throw DataSpaceIException("DataSpace::getSimpleExtentType",
-		"H5Sget_simple_extent_type returns H5S_NO_CLASS");
-   }
-   return( class_name );
+    H5S_class_t class_name = H5Sget_simple_extent_type(id);
+    if (class_name == H5S_NO_CLASS) {
+        throw DataSpaceIException("DataSpace::getSimpleExtentType",
+                                  "H5Sget_simple_extent_type returns H5S_NO_CLASS");
+    }
+    return (class_name);
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataSpace::extentCopy
-///\brief	Copies the extent of a dataspace.
-///\param	dest_space  - IN: Dataspace to copy from
-///\exception	H5::DataSpaceIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DataSpace::extentCopy
+///\brief       Copies the extent of a dataspace.
+///\param       dest_space  - IN: Dataspace to copy from
+///\exception   H5::DataSpaceIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void DataSpace::extentCopy (const DataSpace& dest_space) const
+void
+DataSpace::extentCopy(const DataSpace &dest_space) const
 {
-   hid_t dest_space_id = dest_space.getId();
-   herr_t ret_value = H5Sextent_copy( dest_space_id, id );
-   if( ret_value < 0 )
-   {
-      throw DataSpaceIException("DataSpace::extentCopy", "H5Sextent_copy failed");
-   }
+    hid_t  dest_space_id = dest_space.getId();
+    herr_t ret_value     = H5Sextent_copy(dest_space_id, id);
+    if (ret_value < 0) {
+        throw DataSpaceIException("DataSpace::extentCopy", "H5Sextent_copy failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataSpace::extentCopy
-///\brief	This is an overloaded member function, kept for backward
-///		compatibility.  It differs from the above function in that it
-///		misses const.  This wrapper will be removed in future release.
-///\param	dest_space  - IN: Dataspace to copy from
-///\exception	H5::DataSpaceIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DataSpace::extentCopy
+// Purpose      This is an overloaded member function, kept for backward
+//              compatibility.  It differs from the above function in that it
+//              misses const.  This wrapper will be removed in future release.
+// Param        dest_space  - IN: Dataspace to copy from
+// Exception    H5::DataSpaceIException
+// Programmer   Binh-Minh Ribler - 2000
+// Modification
+//              Modified to call its replacement. -BMR, 2014/04/16
+//              Removed from documentation. -BMR, 2016/03/07 1.8.17 and 1.10.0
+//              Removed from code. -BMR, 2016/08/11 1.8.18 and 1.10.1
+//--------------------------------------------------------------------------
+// void DataSpace::extentCopy(DataSpace& dest_space) const
+//{
+//    extentCopy(dest_space);
+//}
+
+//--------------------------------------------------------------------------
+// Function:    DataSpace::setExtentSimple
+///\brief       Sets or resets the size of an existing dataspace.
+///\param       rank  - IN: Rank of the dataspace
+///\param       current_size - IN: Array containing current size of dataspace
+///\param       maximum_size - IN: Array containing maximum size of dataspace
+///\exception   H5::DataSpaceIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void DataSpace::extentCopy( DataSpace& dest_space ) const
+void
+DataSpace::setExtentSimple(int rank, const hsize_t *current_size, const hsize_t *maximum_size) const
 {
-    extentCopy((const DataSpace)dest_space);
+    herr_t ret_value;
+    ret_value = H5Sset_extent_simple(id, rank, current_size, maximum_size);
+    if (ret_value < 0) {
+        throw DataSpaceIException("DataSpace::setExtentSimple", "H5Sset_extent_simple failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataSpace::setExtentSimple
-///\brief	Sets or resets the size of an existing dataspace.
-///\param	rank  - IN: Rank of the dataspace
-///\param	current_size - IN: Array containing current size of dataspace
-///\param	maximum_size - IN: Array containing maximum size of dataspace
-///\exception	H5::DataSpaceIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DataSpace::setExtentNone
+///\brief       Removes the extent from a dataspace.
+///
+///\exception   H5::DataSpaceIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void DataSpace::setExtentSimple( int rank, const hsize_t *current_size, const hsize_t *maximum_size ) const
+void
+DataSpace::setExtentNone() const
 {
-   herr_t ret_value;
-   ret_value = H5Sset_extent_simple( id, rank, current_size, maximum_size );
-   if( ret_value < 0 )
-   {
-      throw DataSpaceIException("DataSpace::setExtentSimple", "H5Sset_extent_simple failed");
-   }
+    herr_t ret_value = H5Sset_extent_none(id);
+    if (ret_value < 0) {
+        throw DataSpaceIException("DataSpace::setExtentNone", "H5Sset_extent_none failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataSpace::setExtentNone
-///\brief	Removes the extent from a dataspace.
-///
-///\exception	H5::DataSpaceIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DataSpace::getSelectNpoints
+///\brief       Returns the number of elements in a dataspace selection.
+///\return      Number of elements
+///\exception   H5::DataSpaceIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void DataSpace::setExtentNone () const
+hssize_t
+DataSpace::getSelectNpoints() const
 {
-   herr_t ret_value = H5Sset_extent_none( id );
-   if( ret_value < 0 )
-   {
-      throw DataSpaceIException("DataSpace::setExtentNone", "H5Sset_extent_none failed");
-   }
+    hssize_t num_elements = H5Sget_select_npoints(id);
+    if (num_elements < 0) {
+        throw DataSpaceIException(
+            "DataSpace::getSelectNpoints",
+            "H5Sget_select_npoints returns negative value for number of elements in the dataspace selection");
+    }
+    return (num_elements);
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataSpace::getSelectNpoints
-///\brief	Returns the number of elements in a dataspace selection.
-///\return	Number of elements
-///\exception	H5::DataSpaceIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DataSpace::getSelectHyperNblocks
+///\brief       Returns number of hyperslab blocks.
+///\return      Number of hyperslab blocks
+///\exception   H5::DataSpaceIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-hssize_t DataSpace::getSelectNpoints () const
+hssize_t
+DataSpace::getSelectHyperNblocks() const
 {
-   hssize_t num_elements = H5Sget_select_npoints( id );
-   if( num_elements < 0 )
-   {
-      throw DataSpaceIException("DataSpace::getSelectNpoints",
-		"H5Sget_select_npoints returns negative value for number of elements in the dataspace selection");
-   }
-   return( num_elements );
+    hssize_t num_blocks = H5Sget_select_hyper_nblocks(id);
+    if (num_blocks < 0) {
+        throw DataSpaceIException(
+            "DataSpace::getSelectHyperNblocks",
+            "H5Sget_select_hyper_nblocks returns negative value for the number of hyperslab blocks");
+    }
+    return (num_blocks);
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataSpace::getSelectHyperNblocks
-///\brief	Returns number of hyperslab blocks.
-///\return	Number of hyperslab blocks
-///\exception	H5::DataSpaceIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DataSpace::getSelectHyperBlocklist
+///\brief       Gets the list of hyperslab blocks currently selected
+///\param       startblock  - IN: Hyperslab block to start with
+///\param       numblocks - IN: Number of hyperslab blocks to get
+///\param       buf - IN: List of hyperslab blocks selected
+///\exception   H5::DataSpaceIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-hssize_t DataSpace::getSelectHyperNblocks () const
+void
+DataSpace::getSelectHyperBlocklist(hsize_t startblock, hsize_t numblocks, hsize_t *buf) const
 {
-   hssize_t num_blocks = H5Sget_select_hyper_nblocks( id );
-   if( num_blocks < 0 )
-   {
-      throw DataSpaceIException("DataSpace::getSelectHyperNblocks",
-		"H5Sget_select_hyper_nblocks returns negative value for the number of hyperslab blocks");
-   }
-   return( num_blocks );
+    herr_t ret_value;
+    ret_value = H5Sget_select_hyper_blocklist(id, startblock, numblocks, buf);
+    if (ret_value < 0) {
+        throw DataSpaceIException("DataSpace::getSelectHyperBlocklist",
+                                  "H5Sget_select_hyper_blocklist failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataSpace::getSelectHyperBlocklist
-///\brief	Gets the list of hyperslab blocks currently selected
-///\param	startblock  - IN: Hyperslab block to start with
-///\param	numblocks - IN: Number of hyperslab blocks to get
-///\param	buf - IN: List of hyperslab blocks selected
-///\exception	H5::DataSpaceIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DataSpace::getSelectElemNpoints
+///\brief       Returns the number of element points in the current selection.
+///\return      Number of element points
+///\exception   H5::DataSpaceIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void DataSpace::getSelectHyperBlocklist( hsize_t startblock, hsize_t numblocks, hsize_t *buf ) const
+hssize_t
+DataSpace::getSelectElemNpoints() const
 {
-   herr_t ret_value;
-   ret_value = H5Sget_select_hyper_blocklist( id, startblock, numblocks, buf );
-   if( ret_value < 0 )
-   {
-      throw DataSpaceIException("DataSpace::getSelectHyperBlocklist",
-		"H5Sget_select_hyper_blocklist failed");
-   }
+    hssize_t num_points = H5Sget_select_elem_npoints(id);
+    if (num_points < 0) {
+        throw DataSpaceIException("DataSpace::getSelectElemNpoints", "H5Sget_select_elem_npoints failed");
+    }
+    return (num_points);
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataSpace::getSelectElemNpoints
-///\brief	Returns the number of element points in the current selection.
-///\return	Number of element points
-///\exception	H5::DataSpaceIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DataSpace::getSelectElemPointlist
+///\brief       Gets the list of element points currently selected
+///\param       startpoint  - IN: Element point to start with
+///\param       numpoints - IN: Number of element points to get
+///\param       buf - IN: List of element points selected
+///\exception   H5::DataSpaceIException
+///\par Description
+///             For information, please refer to the C API
+///             H5Sget_select_elem_pointlist in the HDF5 C Reference Manual.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-hssize_t DataSpace::getSelectElemNpoints () const
+void
+DataSpace::getSelectElemPointlist(hsize_t startpoint, hsize_t numpoints, hsize_t *buf) const
 {
-   hssize_t num_points = H5Sget_select_elem_npoints( id );
-   if( num_points < 0 )
-   {
-      throw DataSpaceIException("DataSpace::getSelectElemNpoints",
-		"H5Sget_select_elem_npoints failed");
-   }
-   return( num_points );
+    herr_t ret_value;
+    ret_value = H5Sget_select_elem_pointlist(id, startpoint, numpoints, buf);
+    if (ret_value < 0) {
+        throw DataSpaceIException("DataSpace::getSelectElemPointlist", "H5Sget_select_elem_pointlist failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataSpace::getSelectElemPointlist
-///\brief	Gets the list of element points currently selected
-///\param	startpoint  - IN: Element point to start with
-///\param	numpoints - IN: Number of element points to get
-///\param	buf - IN: List of element points selected
-///\exception	H5::DataSpaceIException
+// Function:    DataSpace::getSelectBounds
+///\brief       Gets the bounding box containing the current selection.
+///\param       start  - IN: Starting coordinates of the bounding box
+///\param       end - IN: Ending coordinates of the bounding box, i.e.,
+///             the coordinates of the diagonally opposite corner
+///\exception   H5::DataSpaceIException
 ///\par Description
-///		For more information, please refer to the C layer Reference
-///		Manual at:
-/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5S.html#Dataspace-SelectElemPointList
-// Programmer	Binh-Minh Ribler - 2000
+///             For information, please refer to the H5Sget_select_bounds API in
+///             the HDF5 C Reference Manual.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void DataSpace::getSelectElemPointlist ( hsize_t startpoint, hsize_t numpoints, hsize_t *buf ) const
+void
+DataSpace::getSelectBounds(hsize_t *start, hsize_t *end) const
 {
-   herr_t ret_value;
-   ret_value = H5Sget_select_elem_pointlist( id, startpoint, numpoints, buf );
-   if( ret_value < 0 )
-   {
-      throw DataSpaceIException("DataSpace::getSelectElemPointlist",
-		"H5Sget_select_elem_pointlist failed");
-   }
+    herr_t ret_value = H5Sget_select_bounds(id, start, end);
+    if (ret_value < 0) {
+        throw DataSpaceIException("DataSpace::getSelectBounds", "H5Sget_select_bounds failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataSpace::getSelectBounds
-///\brief	Gets the bounding box containing the current selection.
-///\param	start  - IN: Starting coordinates of the bounding box
-///\param	end - IN: Ending coordinates of the bounding box, i.e.,
-///		the coordinates of the diagonally opposite corner
-///\exception	H5::DataSpaceIException
+// Function:    DataSpace::selectElements
+///\brief       Selects array elements to be included in the selection for
+///             this dataspace.
+///\param       op  - IN: Operator specifying how the new selection is to be
+///             combined with the existing selection for the dataspace
+///\param       num_elements  - IN: Number of elements to be selected
+///\param       coord  - IN: A 2-dimensional array of 0-based values
+///             specifying the coordinates of the elements being selected
+///\exception   H5::DataSpaceIException
 ///\par Description
-///		For more information, please refer to the C layer Reference
-///		Manual at:
-/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5S.html#Dataspace-SelectBounds
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-void DataSpace::getSelectBounds ( hsize_t* start, hsize_t* end ) const
-{
-   herr_t ret_value = H5Sget_select_bounds( id, start, end );
-   if( ret_value < 0 )
-   {
-      throw DataSpaceIException("DataSpace::getSelectBounds",
-		"H5Sget_select_bounds failed");
-   }
-}
-
-//--------------------------------------------------------------------------
-// Function:	DataSpace::selectElements
-///\brief	Selects array elements to be included in the selection for
-///		this dataspace.
-///\param	op  - IN: Operator specifying how the new selection is to be
-///		combined with the existing selection for the dataspace
-///\param	num_elements  - IN: Number of elements to be selected
-///\param	coord  - IN: A 2-dimensional array of 0-based values
-///		specifying the coordinates of the elements being selected
-///\exception	H5::DataSpaceIException
-///\par Description
-///		For more information, please refer to the C layer Reference
-///		Manual at:
-/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5S.html#Dataspace-SelectElements
-// Programmer	Binh-Minh Ribler - 2000
+///             For information, please refer to the H5Sselect_elements API in
+///             the HDF5 C Reference Manual.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void DataSpace::selectElements ( H5S_seloper_t op, const size_t num_elements, const hsize_t *coord) const
+void
+DataSpace::selectElements(H5S_seloper_t op, const size_t num_elements, const hsize_t *coord) const
 {
-   herr_t ret_value;
-   ret_value = H5Sselect_elements( id, op, num_elements, coord );
-   if( ret_value < 0 )
-   {
-      throw DataSpaceIException("DataSpace::selectElements",
-		"H5Sselect_elements failed");
-   }
+    herr_t ret_value;
+    ret_value = H5Sselect_elements(id, op, num_elements, coord);
+    if (ret_value < 0) {
+        throw DataSpaceIException("DataSpace::selectElements", "H5Sselect_elements failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataSpace::selectAll
-///\brief	Selects the entire dataspace.
+// Function:    DataSpace::selectAll
+///\brief       Selects the entire dataspace.
 ///
-///\exception	H5::DataSpaceIException
-// Programmer	Binh-Minh Ribler - 2000
+///\exception   H5::DataSpaceIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void DataSpace::selectAll () const
+void
+DataSpace::selectAll() const
 {
-   herr_t ret_value = H5Sselect_all( id );
-   if( ret_value < 0 )
-   {
-      throw DataSpaceIException("DataSpace::selectAll", "H5Sselect_all failed");
-   }
+    herr_t ret_value = H5Sselect_all(id);
+    if (ret_value < 0) {
+        throw DataSpaceIException("DataSpace::selectAll", "H5Sselect_all failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataSpace::selectNone
-///\brief	Resets the selection region to include no elements.
+// Function:    DataSpace::selectNone
+///\brief       Resets the selection region to include no elements.
 ///
-///\exception	H5::DataSpaceIException
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-void DataSpace::selectNone () const
-{
-  herr_t ret_value = H5Sselect_none( id );
-   if( ret_value < 0 )
-   {
-      throw DataSpaceIException("DataSpace::selectNone",
-		"H5Sselect_none failed");
-   }
-}
-
-//--------------------------------------------------------------------------
-// Function:	DataSpace::selectValid
-///\brief	Verifies that the selection is within the extent of the
-///		dataspace.
-///\return	\c true if the selection is within the extent of the
-///		dataspace, and \c false, otherwise
-///\exception	H5::DataSpaceIException
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-bool DataSpace::selectValid () const
-{
-  htri_t ret_value = H5Sselect_valid( id );
-   if( ret_value > 0 )
-      return true;
-   else if( ret_value == 0 )
-      return false;
-   else
-   {
-      throw DataSpaceIException("DataSpace::selectValid",
-		"H5Sselect_valid returns negative value");
-   }
-}
-
-//--------------------------------------------------------------------------
-// Function:	DataSpace::selectHyperslab
-///\brief	Selects a hyperslab region to add to the current selected region.
-///\param	op - IN: Operation to perform on current selection
-///\param	count - IN: Number of blocks included in the hyperslab
-///\param	start - IN: Offset of the start of hyperslab
-///\param	stride - IN: Hyperslab stride - default to \c NULL
-///\param	block - IN: Size of block in the hyperslab - default to \c NULL
-///\exception	H5::DataSpaceIException
+///\exception   H5::DataSpaceIException
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+void
+DataSpace::selectNone() const
+{
+    herr_t ret_value = H5Sselect_none(id);
+    if (ret_value < 0) {
+        throw DataSpaceIException("DataSpace::selectNone", "H5Sselect_none failed");
+    }
+}
+
+//--------------------------------------------------------------------------
+// Function:    DataSpace::selectValid
+///\brief       Verifies that the selection is within the extent of the
+///             dataspace.
+///\return      \c true if the selection is within the extent of the
+///             dataspace, and \c false, otherwise
+///\exception   H5::DataSpaceIException
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+bool
+DataSpace::selectValid() const
+{
+    htri_t ret_value = H5Sselect_valid(id);
+    if (ret_value > 0)
+        return true;
+    else if (ret_value == 0)
+        return false;
+    else {
+        throw DataSpaceIException("DataSpace::selectValid", "H5Sselect_valid returns negative value");
+    }
+}
+
+//--------------------------------------------------------------------------
+// Function:    DataSpace::selectHyperslab
+///\brief       Selects a hyperslab region to add to the current selected region.
+///\param       op - IN: Operation to perform on current selection
+///\param       count - IN: Number of blocks included in the hyperslab
+///\param       start - IN: Offset of the start of hyperslab
+///\param       stride - IN: Hyperslab stride - default to \c NULL
+///\param       block - IN: Size of block in the hyperslab - default to \c NULL
+///\exception   H5::DataSpaceIException
 ///\par Description
-///		For more information, please refer to the C layer Reference
-///		Manual at:
-/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5S.html#Dataspace-SelectHyperslab
-// Programmer	Binh-Minh Ribler - 2000
+///             For information, please refer to the H5Sselect_hyperslab API in
+///             the HDF5 C Reference Manual.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void DataSpace::selectHyperslab( H5S_seloper_t op, const hsize_t *count, const hsize_t *start, const hsize_t *stride, const hsize_t *block ) const
+void
+DataSpace::selectHyperslab(H5S_seloper_t op, const hsize_t *count, const hsize_t *start,
+                           const hsize_t *stride, const hsize_t *block) const
 {
-   herr_t ret_value;
-   ret_value = H5Sselect_hyperslab( id, op, start, stride, count, block );
-   if( ret_value < 0 )
-   {
-      throw DataSpaceIException("DataSpace::selectHyperslab",
-		"H5Sselect_hyperslab failed");
-   }
+    herr_t ret_value;
+    ret_value = H5Sselect_hyperslab(id, op, start, stride, count, block);
+    if (ret_value < 0) {
+        throw DataSpaceIException("DataSpace::selectHyperslab", "H5Sselect_hyperslab failed");
+    }
 }
 
 //--------------------------------------------------------------------------
 // Function:    DataSpace::getId
-///\brief	Get the id of this dataspace
-///\return	Dataspace identifier
+///\brief       Get the id of this dataspace
+///\return      Dataspace identifier
 // Modification:
-//	May 2008 - BMR
+//      May 2008 - BMR
 //              Class hierarchy is revised to address bugzilla 1068.  Class
 //              AbstractDS and Attribute are moved out of H5Object.  In
 //              addition, member IdComponent::id is moved into subclasses, and
 //              IdComponent::getId now becomes pure virtual function.
 // Programmer   Binh-Minh Ribler - May, 2008
 //--------------------------------------------------------------------------
-hid_t DataSpace::getId() const
+hid_t
+DataSpace::getId() const
 {
-   return(id);
+    return (id);
 }
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
@@ -593,66 +628,65 @@ hid_t DataSpace::getId() const
 ///\exception   H5::IdComponentException when the attempt to close the HDF5
 ///             object fails
 // Description:
-//              The underlaying reference counting in the C library ensures
+//              The underlying reference counting in the C library ensures
 //              that the current valid id of this object is properly closed.
 //              Then the object's id is reset to the new id.
 // Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void DataSpace::p_setId(const hid_t new_id)
+void
+DataSpace::p_setId(const hid_t new_id)
 {
     // handling references to this old id
     try {
         close();
     }
-    catch (Exception close_error) {
+    catch (Exception &close_error) {
         throw DataSpaceIException(inMemFunc("p_setId"), close_error.getDetailMsg());
     }
-   // reset object's id to the given id
-   id = new_id;
+    // reset object's id to the given id
+    id = new_id;
 }
 #endif // DOXYGEN_SHOULD_SKIP_THIS
 
 //--------------------------------------------------------------------------
-// Function:	DataSpace::close
-///\brief	Closes this dataspace.
+// Function:    DataSpace::close
+///\brief       Closes this dataspace.
 ///
-///\exception	H5::DataSpaceIException
-// Programmer	Binh-Minh Ribler - Mar 9, 2005
+///\exception   H5::DataSpaceIException
+// Programmer   Binh-Minh Ribler - Mar 9, 2005
 //--------------------------------------------------------------------------
-void DataSpace::close()
+void
+DataSpace::close()
 {
     // check if id is a valid hdf5 object id before trying to close it
-    if (p_valid_id(id))
-    {
-	herr_t ret_value = H5Sclose(id);
-	if( ret_value < 0 )
-	{
-	    throw DataSpaceIException("DataSpace::close", "H5Sclose failed");
-	}
-	// reset the id
-	id = H5I_INVALID_HID;
+    if (p_valid_id(id)) {
+        herr_t ret_value = H5Sclose(id);
+        if (ret_value < 0) {
+            throw DataSpaceIException("DataSpace::close", "H5Sclose failed");
+        }
+        // reset the id
+        id = H5I_INVALID_HID;
     }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataSpace destructor
-///\brief	Properly terminates access to this dataspace.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DataSpace destructor
+///\brief       Properly terminates access to this dataspace.
+// Programmer   Binh-Minh Ribler - 2000
 // Modification
-//		- Replaced resetIdComponent() with decRefCount() to use C
-//		library ID reference counting mechanism - BMR, Jun 1, 2004
-//		- Replaced decRefCount with close() to let the C library
-//		handle the reference counting - BMR, Jun 1, 2006
+//              - Replaced resetIdComponent() with decRefCount() to use C
+//              library ID reference counting mechanism - BMR, Jun 1, 2004
+//              - Replaced decRefCount with close() to let the C library
+//              handle the reference counting - BMR, Jun 1, 2006
 //--------------------------------------------------------------------------
 DataSpace::~DataSpace()
 {
     try {
-	close();
-    } catch (Exception close_error) {
-	cerr << "DataSpace::~DataSpace - " << close_error.getDetailMsg() << endl;
+        close();
+    }
+    catch (Exception &close_error) {
+        cerr << "DataSpace::~DataSpace - " << close_error.getDetailMsg() << endl;
     }
 }
 
-#ifndef H5_NO_NAMESPACE
-} // end namespace
-#endif
+} // namespace H5
diff --git a/c++/src/H5DataSpace.h b/c++/src/H5DataSpace.h
index b007fd0..136a8ea 100644
--- a/c++/src/H5DataSpace.h
+++ b/c++/src/H5DataSpace.h
@@ -1,136 +1,157 @@
 // C++ informative line for the emacs editor: -*- C++ -*-
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5DataSpace_H
-#define __H5DataSpace_H
+#ifndef H5DataSpace_H
+#define H5DataSpace_H
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#endif
 
-//! Class DataSpace operates on HDF5 dataspaces.
+/*! \class DataSpace
+    \brief Class DataSpace inherits from IdComponent and provides wrappers for
+     the HDF5's dataspaces.
+*/
+//  Inheritance: IdComponent
 class H5_DLLCPP DataSpace : public IdComponent {
-   public:
-	// Default DataSpace objects
-	static const DataSpace ALL;
+  public:
+    ///\brief Default DataSpace objects
+    static const DataSpace &ALL;
 
-	// Creates a dataspace object given the space type
-	DataSpace(H5S_class_t type = H5S_SCALAR);
+    // Creates a dataspace object given the space type
+    DataSpace(H5S_class_t type = H5S_SCALAR);
 
-	// Creates a simple dataspace
-	DataSpace(int rank, const hsize_t * dims, const hsize_t * maxdims = NULL);
+    // Creates a simple dataspace
+    DataSpace(int rank, const hsize_t *dims, const hsize_t *maxdims = NULL);
 
-	// Creates a DataSpace object using an existing dataspace id.
-	DataSpace(const hid_t space_id);
+    // Creates a DataSpace object using an existing dataspace id.
+    DataSpace(const hid_t space_id);
 
-	// Copy constructor: makes a copy of the original DataSpace object.
-	DataSpace(const DataSpace& original);
+    // Copy constructor - same as the original DataSpace.
+    DataSpace(const DataSpace &original);
 
-	// Assignment operator
-	DataSpace& operator=( const DataSpace& rhs );
+    // Assignment operator
+    DataSpace &operator=(const DataSpace &rhs);
 
-	// Closes this dataspace.
-	virtual void close();
+    // Closes this dataspace.
+    virtual void close() override;
 
-	// Makes copy of an existing dataspace.
-	void copy(const DataSpace& like_space);
+    // Makes copy of an existing dataspace.
+    void copy(const DataSpace &like_space);
 
-	// Copies the extent of this dataspace.
-	void extentCopy(const DataSpace& dest_space) const;
-	// Kept for backward compatibility only.
-	void extentCopy(DataSpace& dest_space) const;
+    // Copies the extent of this dataspace.
+    void extentCopy(const DataSpace &dest_space) const;
+    // removed from 1.8.18 and 1.10.1
+    // void extentCopy(DataSpace& dest_space) const;
 
-	// Gets the bounding box containing the current selection.
-	void getSelectBounds( hsize_t* start, hsize_t* end ) const;
+    // Gets the bounding box containing the current selection.
+    void getSelectBounds(hsize_t *start, hsize_t *end) const;
 
-	// Gets the number of element points in the current selection.
-	hssize_t getSelectElemNpoints() const;
+    // Gets the number of element points in the current selection.
+    hssize_t getSelectElemNpoints() const;
 
-	// Retrieves the list of element points currently selected.
-	void getSelectElemPointlist( hsize_t startpoint, hsize_t numpoints, hsize_t *buf ) const;
+    // Retrieves the list of element points currently selected.
+    void getSelectElemPointlist(hsize_t startpoint, hsize_t numpoints, hsize_t *buf) const;
 
-	// Gets the list of hyperslab blocks currently selected.
-	void getSelectHyperBlocklist( hsize_t startblock, hsize_t numblocks, hsize_t *buf ) const;
+    // Gets the list of hyperslab blocks currently selected.
+    void getSelectHyperBlocklist(hsize_t startblock, hsize_t numblocks, hsize_t *buf) const;
 
-	// Get number of hyperslab blocks.
-	hssize_t getSelectHyperNblocks() const;
+    // Get number of hyperslab blocks.
+    hssize_t getSelectHyperNblocks() const;
 
-	// Gets the number of elements in this dataspace selection.
-	hssize_t getSelectNpoints() const;
+    // Gets the number of elements in this dataspace selection.
+    hssize_t getSelectNpoints() const;
 
-	// Retrieves dataspace dimension size and maximum size.
-	int getSimpleExtentDims( hsize_t *dims, hsize_t *maxdims = NULL ) const;
+    // Retrieves dataspace dimension size and maximum size.
+    int getSimpleExtentDims(hsize_t *dims, hsize_t *maxdims = NULL) const;
 
-	// Gets the dimensionality of this dataspace.
-	int getSimpleExtentNdims() const;
+    // Gets the dimensionality of this dataspace.
+    int getSimpleExtentNdims() const;
 
-	// Gets the number of elements in this dataspace.
-	// 12/05/00 - changed return type to hssize_t from hsize_t - C API
-	hssize_t getSimpleExtentNpoints() const;
+    // Gets the number of elements in this dataspace.
+    // 12/05/00 - changed return type to hssize_t from hsize_t - C API
+    hssize_t getSimpleExtentNpoints() const;
 
-	// Gets the current class of this dataspace.
-	H5S_class_t getSimpleExtentType() const;
+    // Gets the current class of this dataspace.
+    H5S_class_t getSimpleExtentType() const;
 
-	// Determines if this dataspace is a simple one.
-	bool isSimple() const;
+    // Determines if this dataspace is a simple one.
+    bool isSimple() const;
 
-	// Sets the offset of this simple dataspace.
-	void offsetSimple( const hssize_t* offset ) const;
+    // Sets the offset of this simple dataspace.
+    void offsetSimple(const hssize_t *offset) const;
 
-	// Selects the entire dataspace.
-	void selectAll() const;
+    // Selects the entire dataspace.
+    void selectAll() const;
 
-	// Selects array elements to be included in the selection for
-	// this dataspace.
-	void selectElements( H5S_seloper_t op, const size_t num_elements, const hsize_t *coord) const;
+    // Selects array elements to be included in the selection for
+    // this dataspace.
+    void selectElements(H5S_seloper_t op, const size_t num_elements, const hsize_t *coord) const;
 
-	// Selects a hyperslab region to add to the current selected region.
-	void selectHyperslab( H5S_seloper_t op, const hsize_t *count, const hsize_t *start, const hsize_t *stride = NULL, const hsize_t *block = NULL ) const;
+    // Selects a hyperslab region to add to the current selected region.
+    void selectHyperslab(H5S_seloper_t op, const hsize_t *count, const hsize_t *start,
+                         const hsize_t *stride = NULL, const hsize_t *block = NULL) const;
 
-	// Resets the selection region to include no elements.
-	void selectNone() const;
+    // Resets the selection region to include no elements.
+    void selectNone() const;
 
-	// Verifies that the selection is within the extent of the dataspace.
-	bool selectValid() const;
+    // Verifies that the selection is within the extent of the dataspace.
+    bool selectValid() const;
 
-	// Removes the extent from this dataspace.
-	void setExtentNone() const;
+    // Removes the extent from this dataspace.
+    void setExtentNone() const;
 
-	// Sets or resets the size of this dataspace.
-	void setExtentSimple( int rank, const hsize_t *current_size, const hsize_t *maximum_size = NULL ) const;
+    // Sets or resets the size of this dataspace.
+    void setExtentSimple(int rank, const hsize_t *current_size, const hsize_t *maximum_size = NULL) const;
 
-	///\brief Returns this class name.
-	virtual H5std_string fromClass () const { return("DataSpace"); }
+    ///\brief Returns this class name.
+    virtual H5std_string
+    fromClass() const override
+    {
+        return ("DataSpace");
+    }
 
-	// Gets the dataspace id.
-	virtual hid_t getId() const;
+    // Gets the dataspace id.
+    virtual hid_t getId() const override;
 
-	// Destructor: properly terminates access to this dataspace.
-	virtual ~DataSpace();
+    // Deletes the global constant
+    static void deleteConstants();
+
+    // Destructor: properly terminates access to this dataspace.
+    virtual ~DataSpace() override;
+
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+
+  protected:
+    // Sets the dataspace id.
+    virtual void p_setId(const hid_t new_id) override;
+
+#endif // DOXYGEN_SHOULD_SKIP_THIS
+
+  private:
+    hid_t id; // HDF5 dataspace id
 
-   protected:
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
-	// Sets the dataspace id.
-	virtual void p_setId(const hid_t new_id);
+
+    static DataSpace *ALL_;
+
+    // Creates the global constant
+    static DataSpace *getConstant();
+
+    // Friend function to set DataSpace id.  For library use only.
+    friend void f_DataSpace_setId(DataSpace *dspace, hid_t new_id);
+
 #endif // DOXYGEN_SHOULD_SKIP_THIS
 
-   private:
-	hid_t id;       // HDF5 dataspace id
-};
-#ifndef H5_NO_NAMESPACE
-}
-#endif
-#endif // __H5DataSpace_H
+}; // end of DataSpace
+} // namespace H5
+
+#endif // H5DataSpace_H
diff --git a/c++/src/H5DataType.cpp b/c++/src/H5DataType.cpp
index c4b1694..ca3e67c 100644
--- a/c++/src/H5DataType.cpp
+++ b/c++/src/H5DataType.cpp
@@ -1,652 +1,883 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifdef OLD_HEADER_FILENAME
-#include <iostream.h>
-#else
+#include <cstdlib>
 #include <iostream>
-#endif
 #include <string>
 
 #include "H5Include.h"
 #include "H5Exception.h"
 #include "H5IdComponent.h"
-#include "H5PropList.h"
 #include "H5DataSpace.h"
-#include "H5Object.h"
+#include "H5PropList.h"
 #include "H5FaccProp.h"
 #include "H5FcreatProp.h"
+#include "H5OcreatProp.h"
 #include "H5DcreatProp.h"
 #include "H5DxferProp.h"
-#include "H5CommonFG.h"
+#include "H5LcreatProp.h"
+#include "H5LaccProp.h"
+#include "H5DaccProp.h"
+#include "H5Location.h"
+#include "H5Object.h"
 #include "H5DataType.h"
 #include "H5AtomType.h"
 #include "H5PredType.h"
-#include "H5private.h"
 #include "H5AbstractDs.h"
 #include "H5DataSet.h"
-#include "H5File.h"
 #include "H5Attribute.h"
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#ifndef H5_NO_STD
-    using std::cerr;
-    using std::endl;
-#endif  // H5_NO_STD
-#endif
+using std::cerr;
+using std::endl;
 
 //--------------------------------------------------------------------------
-// Function:	DataType default constructor
-///\brief	Default constructor: Creates a stub datatype
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DataType default constructor
+///\brief       Default constructor: Creates a stub datatype
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-DataType::DataType() : H5Object(), id(H5I_INVALID_HID) {}
+DataType::DataType() : H5Object(), id(H5I_INVALID_HID), encoded_buf(NULL), buf_size(0)
+{
+}
 
 //--------------------------------------------------------------------------
-// Function:	DataType overloaded constructor
-///\brief	Creates a datatype using an existing datatype's id
-///\param	existing_id - IN: Id of the existing datatype
+// Function:    DataType overloaded constructor
+///\brief       Creates a datatype using an existing datatype's id
+///\param       existing_id - IN: Id of the existing datatype
 // Description
-//		Constructor creates a copy of an existing DataType using
-//		its id.
-// Programmer	Binh-Minh Ribler - 2000
+//              Constructor creates a copy of an existing DataType using
+//              its id.
+// Programmer   Binh-Minh Ribler - 2000
 // Modification
-//	Dec, 2005
-//		Removed second argument, "predefined", after changing to the
-//		new ref counting mechanism that relies on C's ref counting.
+//        Dec, 2005
+//              Removed second argument, "predefined", after changing to the
+//              new ref counting mechanism that relies on C's ref counting.
 //--------------------------------------------------------------------------
-DataType::DataType(const hid_t existing_id) : H5Object()
+DataType::DataType(const hid_t existing_id) : H5Object(), id(existing_id), encoded_buf(NULL), buf_size(0)
 {
-    id = existing_id;
+    incRefCount(); // increment number of references to this id
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataType overloaded constructor
-///\brief	Creates a object given its class and size
-///\param	type_class - IN: Class of datatype to create
-///\param	size       - IN: Number of bytes in the datatype to create
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DataType overloaded constructor
+///\brief       Creates a object given its class and size
+///\param       type_class - IN: Class of datatype to create
+///\param       size       - IN: Number of bytes in the datatype to create
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-DataType::DataType( const H5T_class_t type_class, size_t size ) : H5Object()
+DataType::DataType(const H5T_class_t type_class, size_t size)
+    : H5Object(), id{H5Tcreate(type_class, size)}, encoded_buf(NULL), buf_size(0)
 {
-   // Call C routine to create the new datatype
-   id = H5Tcreate( type_class, size );
-   if( id < 0 )
-   {
-      throw DataTypeIException("DataType constructor", "H5Tcreate failed");
-   }
+    if (id < 0) {
+        throw DataTypeIException("DataType constructor", "H5Tcreate failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataType overload constructor - dereference
-///\brief	Given a reference, ref, to an hdf5 group, creates a
-///		DataType object
+// Function:    DataType overload constructor - dereference
+///\brief       Given a reference, ref, to an hdf5 group, creates a
+///             DataType object
 ///\param       loc - IN: Location referenced object is in
-///\param	ref - IN: Reference pointer
-///\param	ref_type - IN: Reference type - default to H5R_OBJECT
-///\param	plist - IN: Property list - default to PropList::DEFAULT
-///\exception	H5::ReferenceException
-// Programmer	Binh-Minh Ribler - Oct, 2006
-// Modification
-//	Jul, 2008
-//		Added for application convenience.
+///\param       ref - IN: Reference pointer
+///\param       ref_type - IN: Reference type - default to H5R_OBJECT
+///\param       plist - IN: Property list - default to PropList::DEFAULT
+///\exception   H5::ReferenceException
+// Programmer   Binh-Minh Ribler - Oct, 2006
 //--------------------------------------------------------------------------
-DataType::DataType(const H5Location& loc, const void* ref, H5R_type_t ref_type, const PropList& plist) : H5Object(), id(H5I_INVALID_HID)
+DataType::DataType(const H5Location &loc, const void *ref, H5R_type_t ref_type, const PropList &plist)
+    : H5Object(), id{H5Location::p_dereference(loc.getId(), ref, ref_type, plist,
+                                               "constructor - by dereference")},
+      encoded_buf(NULL), buf_size(0)
 {
-    id = H5Location::p_dereference(loc.getId(), ref, ref_type, plist, "constructor - by dereference");
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataType overload constructor - dereference
-///\brief	Given a reference, ref, to an hdf5 group, creates a
-///		DataType object
-///\param       attr - IN: Specifying location where the referenced object is in
-///\param	ref - IN: Reference pointer
-///\param	ref_type - IN: Reference type - default to H5R_OBJECT
-///\param	plist - IN: Property list - default to PropList::DEFAULT
-///\exception	H5::ReferenceException
-// Programmer	Binh-Minh Ribler - Oct, 2006
+// Function:    DataType overload constructor - dereference
+// brief       Given a reference, ref, to an hdf5 group, creates a
+//             DataType object
+// param       attr - IN: Specifying location where the referenced object is in
+// param       ref - IN: Reference pointer
+// param       ref_type - IN: Reference type - default to H5R_OBJECT
+// param       plist - IN: Property list - default to PropList::DEFAULT
+// exception   H5::ReferenceException
+// Programmer   Binh-Minh Ribler - Oct, 2006
 // Modification
-//	Jul, 2008
-//		Added for application convenience.
+//        Jul, 2008
+//              Added for application convenience.
 //--------------------------------------------------------------------------
-DataType::DataType(const Attribute& attr, const void* ref, H5R_type_t ref_type, const PropList& plist) : H5Object(), id(H5I_INVALID_HID)
+/* DataType::DataType(const Attribute& attr, const void* ref, H5R_type_t ref_type, const PropList& plist) :
+H5Object(), id(H5I_INVALID_HID), encoded_buf(NULL), buf_size(0)
 {
-    id = H5Location::p_dereference(attr.getId(), ref, ref_type, plist, "constructor - by dereference");
+   id = H5Location::p_dereference(attr.getId(), ref, ref_type, plist, "constructor - by dereference");
 }
+*/
 
 //--------------------------------------------------------------------------
-// Function:	DataType copy constructor
-///\brief	Copy constructor: makes a copy of the original DataType object.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DataType copy constructor
+///\brief       Copy constructor: same HDF5 object as \a original
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-DataType::DataType(const DataType& original) : H5Object()
+DataType::DataType(const DataType &original) : H5Object(), id(original.id), encoded_buf(NULL), buf_size(0)
 {
-    id = original.getId();
     incRefCount(); // increment number of references to this id
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataType::copy
-///\brief	Copies an existing datatype to this datatype object
-///\param	like_type - IN: Datatype to be copied
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DataType overloaded constructor
+///\brief       Creates a DataType instance using a predefined type
+///\param       pred_type - IN: Predefined datatype
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2015
+// Description
+//              Copying the type so that when a predefined type is passed in,
+//              a copy of it is made, not just a duplicate of the HDF5 id.
+//              Note: calling DataType::copy will invoke DataType::close()
+//              unnecessarily and will produce undefined behavior.
+//              -BMR, Apr 2015
+//--------------------------------------------------------------------------
+DataType::DataType(const PredType &pred_type)
+    : H5Object(), id{H5Tcopy(pred_type.getId())}, encoded_buf(NULL), buf_size(0)
+{
+    if (id < 0)
+        throw DataTypeIException("DataType constructor", "H5Tcopy failed");
+}
+
+//--------------------------------------------------------------------------
+// Function:    DataType overloaded constructor
+///\brief       Creates a DataType instance by opening an HDF5 datatype given
+///             its name as a char*.
+///\param       loc        - IN: Location of the type
+///\param       dtype_name - IN: Datatype name
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - Dec 2016
+// Description
+//              In 1.10.1, this constructor was introduced and may replace the
+//              existing function CommonFG::openDataType(const char*) to
+//              improve usability.
+//              -BMR, Dec 2016
+//--------------------------------------------------------------------------
+DataType::DataType(const H5Location &loc, const char *dtype_name)
+    : H5Object(), id{p_opentype(loc, dtype_name)}, encoded_buf(NULL), buf_size(0)
+{
+}
+
+//--------------------------------------------------------------------------
+// Function:    DataType overloaded constructor
+///\brief       Creates a DataType instance by opening an HDF5 datatype given
+///             its name as an \c H5std_string.
+///\param       loc        - IN: Location of the type
+///\param       dtype_name - IN: Datatype name
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - Dec 2016
+// Description
+//              In 1.10.1, this constructor was introduced and may replace the
+//              existing function CommonFG::openDataType(const H5std_string&) to
+//              improve usability.
+//              -BMR, Dec 2016
+//--------------------------------------------------------------------------
+DataType::DataType(const H5Location &loc, const H5std_string &dtype_name)
+    : H5Object(), id{p_opentype(loc, dtype_name.c_str())}, encoded_buf(NULL), buf_size(0)
+{
+}
+
+//--------------------------------------------------------------------------
+// Function:    DataType::copy
+///\brief       Copies an existing datatype to this datatype object
+///\param       like_type - IN: Datatype to be copied
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 // Modification
-//		- Replaced resetIdComponent() with decRefCount() to use C
-//		library ID reference counting mechanism - BMR, Jun 1, 2004
-//		- Replaced decRefCount with close() to let the C library
-//		handle the reference counting - BMR, Jun 1, 2006
+//              - Replaced resetIdComponent() with decRefCount() to use C
+//              library ID reference counting mechanism - BMR, Jun 1, 2004
+//              - Replaced decRefCount with close() to let the C library
+//              handle the reference counting - BMR, Jun 1, 2006
 //--------------------------------------------------------------------------
-void DataType::copy( const DataType& like_type )
+void
+DataType::copy(const DataType &like_type)
 {
     // close the current data type before copying like_type to this object
     try {
-	close();
+        close();
     }
-    catch (Exception close_error) {
-	throw DataTypeIException(inMemFunc("copy"), close_error.getDetailMsg());
+    catch (Exception &close_error) {
+        throw DataTypeIException(inMemFunc("copy"), close_error.getDetailMsg());
     }
 
     // call C routine to copy the datatype
-    id = H5Tcopy( like_type.getId() );
-    if( id < 0 )
-	throw DataTypeIException(inMemFunc("copy"), "H5Tcopy failed");
+    id = H5Tcopy(like_type.getId());
+    if (id < 0)
+        throw DataTypeIException(inMemFunc("copy"), "H5Tcopy failed");
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataType::copy
-///\brief	Copies the datatype of the given dataset to this datatype object
-///\param	dset - IN: Dataset
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - Jan, 2007
+// Function:    DataType::copy
+///\brief       Copies the datatype of the given dataset to this datatype object
+///\param       dset - IN: Dataset
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - Jan, 2007
 ///\par Description
-///		The resulted dataset will be transient and modifiable.
+///             The resulted dataset will be transient and modifiable.
 //--------------------------------------------------------------------------
-void DataType::copy(const DataSet& dset)
+void
+DataType::copy(const DataSet &dset)
 {
     // close the current data type before copying dset's datatype to this object
     try {
-	close();
+        close();
     }
-    catch (Exception close_error) {
-	throw DataTypeIException(inMemFunc("copy"), close_error.getDetailMsg());
+    catch (Exception &close_error) {
+        throw DataTypeIException(inMemFunc("copy"), close_error.getDetailMsg());
     }
 
     // call C routine to copy the datatype
-    id = H5Tcopy( dset.getId() );
-    if( id < 0 )
-	throw DataTypeIException(inMemFunc("copy"), "H5Tcopy failed");
+    id = H5Tcopy(dset.getId());
+    if (id < 0)
+        throw DataTypeIException(inMemFunc("copy"), "H5Tcopy failed");
 }
 
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
 //--------------------------------------------------------------------------
-// Function:	DataType::operator=
-///\brief	Assignment operator
-///\param	rhs - IN: Reference to the existing datatype
-///\return	Reference to DataType instance
-///\exception	H5::DataTypeIException
-// Description
-// 		Makes a copy of the type on the right hand side and stores
-//		the new id in the left hand side object.
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-DataType& DataType::operator=( const DataType& rhs )
-{
-    if (this != &rhs)
-	copy(rhs);
-    return(*this);
-}
-
-//--------------------------------------------------------------------------
-// Function:	DataType::operator==
-///\brief	Compares this DataType against the given one to determines
-///		whether the two objects refer to the same actual datatype.
-///\param	compared_type - IN: Reference to the datatype to compare
-///\return	true if the datatypes are equal, and false, otherwise.
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-bool DataType::operator==(const DataType& compared_type ) const
-{
-   // Call C routine H5Tequal to determines whether two datatype
-   // identifiers refer to the same datatype
-   htri_t ret_value = H5Tequal( id, compared_type.getId() );
-   if( ret_value > 0 )
-      return true;
-   else if( ret_value == 0 )
-      return false;
-   else
-   {
-      throw DataTypeIException(inMemFunc("operator=="), "H5Tequal returns negative value");
-   }
-}
-
-//--------------------------------------------------------------------------
-// Function:	DataType::p_commit (private)
-//\brief	Commits a transient datatype to a file, creating a new
-//		named datatype
-//\param	loc_id - IN: The id of either a file, group, dataset, named
-//			 datatype, or attribute.
-//\param	name - IN: Name of the datatype
-//\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
-// Modification:
-//		Copied from DataType::commit and made into private function
-//		to be commonly used by several overloads of DataType::commit.
-//		BMR - Jan, 2007
+// Function:    DataType::p_decode
+// Purpose      Returns an id of a type by decoding the binary object
+///             description of this datatype.
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - Aug 2017
 //--------------------------------------------------------------------------
-void DataType::p_commit(hid_t loc_id, const char* name)
+hid_t
+DataType::p_decode() const
 {
-   // Call C routine to commit the transient datatype
-   herr_t ret_value = H5Tcommit2(loc_id, name, id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-   if( ret_value < 0 )
-      throw DataTypeIException(inMemFunc("p_commit"), "H5Tcommit2 failed");
+    // Make sure that the buffer can be decoded
+    if (encoded_buf == NULL) {
+        throw DataTypeIException("DataType::p_decode", "No encoded buffer");
+    }
+
+    // Call C function to decode the binary object description
+    hid_t encoded_dtype_id = H5Tdecode(encoded_buf);
+
+    // If H5Tdecode fails, raise exception
+    if (encoded_dtype_id < 0) {
+        throw DataTypeIException("DataType::p_decode", "H5Tdecode failed");
+    }
+    else {
+        return (encoded_dtype_id);
+    }
 }
+#endif // DOXYGEN_SHOULD_SKIP_THIS
 
 //--------------------------------------------------------------------------
-// Function:	DataType::commit
-///\brief	Commits a transient datatype to a file, creating a new
-///		named datatype
-///\param	loc - IN: A location (file, dataset, datatype, or group)
-///\param	name - IN: Name of the datatype
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - Jan, 2007
+// Function:    DataType::decode
+///\brief       Returns a DataType instance by decoding the binary object
+///             description of this datatype.
+///
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - Aug 2017
 //--------------------------------------------------------------------------
-void DataType::commit(const H5Location& loc, const char* name)
+DataType *
+DataType::decode() const
 {
-   p_commit(loc.getId(), name);
+    hid_t encoded_dtype_id = H5I_INVALID_HID;
+    try {
+        encoded_dtype_id = p_decode();
+    }
+    catch (DataTypeIException &err) {
+        throw;
+    }
+    DataType *encoded_dtype = new DataType;
+    encoded_dtype->p_setId(encoded_dtype_id);
+    return (encoded_dtype);
+}
+
+//--------------------------------------------------------------------------
+// Function:    DataType::encode
+///\brief       Creates a binary object description of this datatype.
+///
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - Aug 2017
+//--------------------------------------------------------------------------
+void
+DataType::encode()
+{
+    // Call H5Tencode passing in null to determine the size of the buffer
+    herr_t ret_value = H5Tencode(id, NULL, &buf_size);
+    if (ret_value < 0) {
+        throw DataTypeIException("DataType::encode", "Failed to get buf_size");
+    }
+
+    // Allocate buffer and call C function again to encode
+    if (buf_size > 0) {
+        encoded_buf = new unsigned char[buf_size]();
+
+        ret_value = H5Tencode(id, encoded_buf, &buf_size);
+        if (ret_value < 0) {
+            throw DataTypeIException("DataType::encode", "H5Tencode failed");
+        }
+    }
+    else {
+        throw DataTypeIException("DataType::encode", "Failed to allocate buffer for encoding");
+    }
+}
+
+//--------------------------------------------------------------------------
+// Function:    DataType::hasBinaryDesc
+///\brief       Determines whether this datatype has a binary object
+///             description.
+///
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - Aug 2017
+//--------------------------------------------------------------------------
+bool
+DataType::hasBinaryDesc() const
+{
+    return encoded_buf != NULL;
+}
+
+//--------------------------------------------------------------------------
+// Function:    DataType::operator=
+///\brief       Assignment operator
+///\param       rhs - IN: Reference to the existing datatype
+///\return      Reference to DataType instance
+///\exception   H5::DataTypeIException
+// Description
+//              Makes a copy of the type on the right hand side and stores
+//              the new id in the left hand side object.
+// Programmer   Binh-Minh Ribler - 2000
+// Modification
+//              Changed operator= to simply copy the id of rhs instead of
+//              calling H5Tcopy because, when the operator= is invoked, a
+//              different datatype id is created and it won't have the same
+//              characteristics as the original one, specifically, if the
+//              rhs represents a named datatype, "this" would still be a
+//              transient datatype.
+//              BMR - Mar, 2015
+//--------------------------------------------------------------------------
+DataType &
+DataType::operator=(const DataType &rhs)
+{
+    if (this != &rhs) {
+        setId(rhs.id);
+    }
+    return (*this);
+}
+
+//--------------------------------------------------------------------------
+// Function:    DataType::operator==
+///\brief       Compares this DataType against the given one to determines
+///             whether the two objects refer to the same actual datatype.
+///\param       compared_type - IN: Reference to the datatype to compare
+///\return      true if the datatypes are equal, and false, otherwise.
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+bool
+DataType::operator==(const DataType &compared_type) const
+{
+    // Call C routine H5Tequal to determines whether two datatype
+    // identifiers refer to the same datatype
+    htri_t ret_value = H5Tequal(id, compared_type.getId());
+    if (ret_value > 0)
+        return true;
+    else if (ret_value == 0)
+        return false;
+    else {
+        throw DataTypeIException(inMemFunc("operator=="), "H5Tequal returns negative value");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataType::commit
-///\brief	This is an overloaded member function, kept for backward
-///		compatibility.  It differs from the above function in that it
-///		misses const's.  This wrapper will be removed in future release.
-///\param	loc - IN: A location (file, dataset, datatype, or group)
-///\param	name - IN: Name of the datatype
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - Jan, 2007
+// Function:    DataType::operator!=
+///\brief       Compares this DataType against the given one to determines
+///             whether the two objects refer to different actual datatypes.
+///\param       compared_type - IN: Reference to the datatype to compare
+///\return      true if the datatypes are not equal, and false, otherwise.
+///\exception   H5::DataTypeIException
+// July, 2018
 //--------------------------------------------------------------------------
-void DataType::commit(H5Location& loc, const char* name)
+bool
+DataType::operator!=(const DataType &compared_type) const
 {
-   p_commit(loc.getId(), name);
+    return !operator==(compared_type);
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataType::commit
-///\brief	This is an overloaded member function, provided for convenience.
-///		It differs from the above function only in the type of the
-///		argument \a name.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DataType::p_commit (private)
+//\brief        Commits a transient datatype to a file, creating a new
+//              named datatype
+//\param        loc_id - IN: The id of either a file, group, dataset, named
+//                           datatype, or attribute.
+//\param        name - IN: Name of the datatype
+//\exception    H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
+// Modification:
+//              Copied from DataType::commit and made into private function
+//              to be commonly used by several overloads of DataType::commit.
+//              BMR - Jan, 2007
 //--------------------------------------------------------------------------
-void DataType::commit(const H5Location& loc, const H5std_string& name)
+void
+DataType::p_commit(hid_t loc_id, const char *name)
 {
-   p_commit(loc.getId(), name.c_str());
+    // Call C routine to commit the transient datatype
+    herr_t ret_value = H5Tcommit2(loc_id, name, id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    if (ret_value < 0)
+        throw DataTypeIException(inMemFunc("p_commit"), "H5Tcommit2 failed");
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataType::commit
-///\brief	This is an overloaded member function, kept for backward
-///		compatibility.  It differs from the above function in that it
-///		misses const's.  This wrapper will be removed in future release.
-///\param	loc - IN: A location (file, dataset, datatype, or group)
-///\param	name - IN: Name of the datatype
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - Jan, 2007
+// Function:    DataType::commit
+///\brief       Commits a transient datatype to a file, creating a new
+///             named datatype
+///\param       loc - IN: A location (file, dataset, datatype, or group)
+///\param       name - IN: Name of the datatype
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - Jan, 2007
 //--------------------------------------------------------------------------
-void DataType::commit(H5Location& loc, const H5std_string& name)
+void
+DataType::commit(const H5Location &loc, const char *name)
 {
-   p_commit(loc.getId(), name.c_str());
+    p_commit(loc.getId(), name);
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataType::committed
-///\brief	Determines whether a datatype is a named type or a
-///		transient type.
-///\return	\c true if the datatype is a named type, and \c false,
-///		otherwise.
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DataType::commit
+// Purpose      This is an overloaded member function, kept for backward
+//              compatibility.  It differs from the above function in that it
+//              misses const's.  This wrapper will be removed in future release.
+// Param        loc - IN: A location (file, dataset, datatype, or group)
+// Param        name - IN: Name of the datatype
+// Exception    H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - Jan, 2007
+// Modification
+//              Planned for removal. -BMR, 2014/04/16
+//              Removed from documentation. -BMR, 2016/03/07 1.8.17 and 1.10.0
+//              Removed from code. -BMR, 2016/08/11 1.8.18 and 1.10.1
+//--------------------------------------------------------------------------
+// void DataType::commit(H5Location& loc, const char* name)
+//{
+//   p_commit(loc.getId(), name);
+//}
+
+//--------------------------------------------------------------------------
+// Function:    DataType::commit
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function only in the type of the
+///             argument \a name.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-bool DataType::committed() const
+void
+DataType::commit(const H5Location &loc, const H5std_string &name)
 {
-   // Call C function to determine if a datatype is a named one
-   htri_t committed = H5Tcommitted( id );
-   if( committed > 0 )
-      return true;
-   else if( committed == 0 )
-      return false;
-   else
-   {
-      throw DataTypeIException(inMemFunc("committed"), "H5Tcommitted return negative value");
-   }
+    p_commit(loc.getId(), name.c_str());
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataType::find
-///\brief	Finds a conversion function that can handle a conversion
-///		from this datatype to the specified datatype, \a dest.
-///\param	dest   - IN: Destination datatype
-///\param	pcdata - IN: Pointer to type conversion data
-///\return	Pointer to a suitable conversion function
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DataType::commit
+// Purpose      This is an overloaded member function, kept for backward
+//              compatibility.  It differs from the above function in that it
+//              misses const's.  This wrapper will be removed in future release.
+// Param        loc - IN: A location (file, dataset, datatype, or group)
+// Param        name - IN: Name of the datatype
+// Exception    H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - Jan, 2007
+// Modification
+//              Planned for removal. -BMR, 2014/04/16
+//              Removed from documentation. -BMR, 2016/03/07 1.8.17 and 1.10.0
+//              Removed from code. -BMR, 2016/08/11 1.8.18 and 1.10.1
+//--------------------------------------------------------------------------
+// void DataType::commit(H5Location& loc, const H5std_string& name)
+//{
+//   p_commit(loc.getId(), name.c_str());
+//}
+
+//--------------------------------------------------------------------------
+// Function:    DataType::committed
+///\brief       Determines whether a datatype is a named type or a
+///             transient type.
+///\return      \c true if the datatype is a named type, and \c false,
+///             otherwise.
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+bool
+DataType::committed() const
+{
+    // Call C function to determine if a datatype is a named one
+    htri_t is_committed = H5Tcommitted(id);
+    if (is_committed > 0)
+        return true;
+    else if (is_committed == 0)
+        return false;
+    else {
+        throw DataTypeIException(inMemFunc("committed"), "H5Tcommitted return negative value");
+    }
+}
+
 //--------------------------------------------------------------------------
-H5T_conv_t DataType::find( const DataType& dest, H5T_cdata_t **pcdata ) const
+// Function:    DataType::find
+///\brief       Finds a conversion function that can handle a conversion
+///             from this datatype to the specified datatype, \a dest.
+///\param       dest   - IN: Destination datatype
+///\param       pcdata - IN: Pointer to type conversion data
+///\return      Pointer to a suitable conversion function
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+H5T_conv_t
+DataType::find(const DataType &dest, H5T_cdata_t **pcdata) const
 {
-   // Call C routine to find the conversion function
-   H5T_conv_t func = H5Tfind( id, dest.getId(), pcdata );
-   if( func == NULL )
-   {
-      throw DataTypeIException(inMemFunc("find"), "H5Tfind returns a NULL function");
-   }
-   return( func );
+    // Call C routine to find the conversion function
+    H5T_conv_t func = H5Tfind(id, dest.getId(), pcdata);
+    if (func == NULL) {
+        throw DataTypeIException(inMemFunc("find"), "H5Tfind returns a NULL function");
+    }
+    return (func);
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataType::convert
-///\brief	Converts data from this datatype to the specified datatypes.
-///\param	dest       - IN: Destination datatype
-///\param	nelmts     - IN: Size of array \a buf
-///\param	buf        - IN/OUT: Array containing pre- and post-conversion
-///				values
-///\param	background - IN: Optional backgroud buffer
-///\param	plist - IN: Property list - default to PropList::DEFAULT
-///\return	Pointer to a suitable conversion function
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DataType::convert
+///\brief       Converts data from this datatype to the specified datatypes.
+///\param       dest       - IN: Destination datatype
+///\param       nelmts     - IN: Size of array \a buf
+///\param       buf        - IN/OUT: Array containing pre- and post-conversion
+///                            values
+///\param       background - IN: Optional background buffer
+///\param       plist - IN: Property list - default to PropList::DEFAULT
+///\return      Pointer to a suitable conversion function
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void DataType::convert( const DataType& dest, size_t nelmts, void *buf, void *background, const PropList& plist ) const
+void
+DataType::convert(const DataType &dest, size_t nelmts, void *buf, void *background,
+                  const PropList &plist) const
 {
-   // Get identifiers for C API
-   hid_t dest_id = dest.getId();
-   hid_t plist_id = plist.getId();
+    // Get identifiers for C API
+    hid_t dest_id  = dest.getId();
+    hid_t plist_id = plist.getId();
 
-   // Call C routine H5Tconvert to convert the data
-   herr_t ret_value;
-   ret_value = H5Tconvert( id, dest_id, nelmts, buf, background, plist_id );
-   if( ret_value < 0 )
-   {
-      throw DataTypeIException(inMemFunc("convert"), "H5Tconvert failed");
-   }
+    // Call C routine H5Tconvert to convert the data
+    herr_t ret_value;
+    ret_value = H5Tconvert(id, dest_id, nelmts, buf, background, plist_id);
+    if (ret_value < 0) {
+        throw DataTypeIException(inMemFunc("convert"), "H5Tconvert failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataType::lock
-///\brief	Locks a datatype, making it read-only and non-destructible.
+// Function:    DataType::lock
+///\brief       Locks a datatype, making it read-only and non-destructible.
 ///
-///\exception	H5::DataTypeIException
-///\par Descrition
-///		This is normally done by the library for predefined data
-///		types so the application doesn't inadvertently change or
-///		delete a predefined type.
+///\exception   H5::DataTypeIException
+///\par Description
+///             This is normally done by the library for predefined data
+///             types so the application doesn't inadvertently change or
+///             delete a predefined type.
 ///
-///		Once a data type is locked it can never be unlocked unless
-///		the entire library is closed.
-// Programmer	Binh-Minh Ribler - 2000
+///             Once a data type is locked it can never be unlocked unless
+///             the entire library is closed.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void DataType::lock() const
+void
+DataType::lock() const
 {
-   // Call C routine to lock the datatype
-   herr_t ret_value = H5Tlock( id );
-   if( ret_value < 0 )
-   {
-      throw DataTypeIException(inMemFunc("lock"), "H5Tlock failed");
-   }
+    // Call C routine to lock the datatype
+    herr_t ret_value = H5Tlock(id);
+    if (ret_value < 0) {
+        throw DataTypeIException(inMemFunc("lock"), "H5Tlock failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataType::getClass
-///\brief	Returns the datatype class identifier.
-///\return	Datatype class identifier
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DataType::getClass
+///\brief       Returns the datatype class identifier.
+///\return      Datatype class identifier
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-H5T_class_t DataType::getClass() const
+H5T_class_t
+DataType::getClass() const
 {
-   H5T_class_t type_class = H5Tget_class( id );
+    H5T_class_t type_class = H5Tget_class(id);
 
-   // Return datatype class identifier if successful
-   if( type_class == H5T_NO_CLASS )
-   {
-      throw DataTypeIException(inMemFunc("getClass"), "H5Tget_class returns H5T_NO_CLASS");
-   }
-   return( type_class );
+    // Return datatype class identifier if successful
+    if (type_class == H5T_NO_CLASS) {
+        throw DataTypeIException(inMemFunc("getClass"), "H5Tget_class returns H5T_NO_CLASS");
+    }
+    return (type_class);
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataType::getSize
-///\brief	Returns the size of a datatype.
-///\return	Datatype size in bytes
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DataType::getSize
+///\brief       Returns the size of a datatype.
+///\return      Datatype size in bytes
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-size_t DataType::getSize() const
+size_t
+DataType::getSize() const
 {
-   // Call C routine to get the datatype size
-   size_t type_size = H5Tget_size( id );
-   if( type_size <= 0 ) // valid data types are never zero size
-   {
-      throw DataTypeIException(inMemFunc("getSize"), "H5Tget_size returns invalid datatype size");
-   }
-   return( type_size );
+    // Call C routine to get the datatype size
+    size_t type_size = H5Tget_size(id);
+    if (type_size <= 0) // valid data types are never zero size
+    {
+        throw DataTypeIException(inMemFunc("getSize"), "H5Tget_size returns invalid datatype size");
+    }
+    return (type_size);
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataType::getSuper
-///\brief	Returns the base datatype from which a datatype is derived.
-///\return	DataType object
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DataType::getSuper
+///\brief       Returns the base datatype from which a datatype is derived.
+///\return      DataType object
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-DataType DataType::getSuper() const
+DataType
+DataType::getSuper() const
 {
-   // Call C routine to get the base datatype from which the specified
-   // datatype is derived.
-   hid_t base_type_id = H5Tget_super( id );
+    // Call C routine to get the base datatype from which the specified
+    // datatype is derived.
+    hid_t base_type_id = H5Tget_super(id);
 
-   // If H5Tget_super returns a valid datatype id, create and return
-   // the base type, otherwise, raise exception
-   if( base_type_id > 0 )
-   {
-      DataType base_type( base_type_id );
-      return( base_type );
-   }
-   else
-   {
-      throw DataTypeIException(inMemFunc("getSuper"), "H5Tget_super failed");
-   }
+    // If H5Tget_super returns a valid datatype id, create and return
+    // the base type, otherwise, raise exception
+    if (base_type_id > 0) {
+        DataType base_type;
+        base_type.p_setId(base_type_id);
+        return (base_type);
+    }
+    else {
+        throw DataTypeIException(inMemFunc("getSuper"), "H5Tget_super failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataType::registerFunc
-///\brief	Registers the specified conversion function.
-///\param	pers - IN: Conversion option
-///			\li \c H5T_PERS_HARD for hard conversion functions
-///			\li \c H5T_PERS_SOFT for soft conversion functions.
-///\param	name - IN: Name displayed in diagnostic output.
-///\param	dest - IN: Destination datatype.
-///\param	func - IN: Function to convert between source and
-///		destination datatypes.
-///\exception	H5::DataTypeIException
+// Function:    DataType::registerFunc
+///\brief       Registers the specified conversion function.
+///\param       pers - IN: Conversion option
+///                     \li \c H5T_PERS_HARD for hard conversion functions
+///                     \li \c H5T_PERS_SOFT for soft conversion functions.
+///\param       name - IN: Name displayed in diagnostic output.
+///\param       dest - IN: Destination datatype.
+///\param       func - IN: Function to convert between source and
+///             destination datatypes.
+///\exception   H5::DataTypeIException
 ///\par Description
-///		For more information, please see:
-/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5T.html#Datatype-Register
-// Programmer	Binh-Minh Ribler - 2000
+///             For information, please refer to the H5Tregister API in
+///             the HDF5 C Reference Manual.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void DataType::registerFunc( H5T_pers_t pers, const char* name, const DataType& dest, H5T_conv_t func ) const
+void
+DataType::registerFunc(H5T_pers_t pers, const char *name, const DataType &dest, H5T_conv_t func) const
 {
-   hid_t dest_id = dest.getId();  // get id of the destination datatype
+    hid_t dest_id = dest.getId(); // get id of the destination datatype
 
-   // Call C routine H5Tregister to register the conversion function
-   herr_t ret_value = H5Tregister( pers, name, id, dest_id, func );
-   if( ret_value < 0 )
-   {
-      throw DataTypeIException(inMemFunc("registerFunc"), "H5Tregister failed");
-   }
+    // Call C routine H5Tregister to register the conversion function
+    herr_t ret_value = H5Tregister(pers, name, id, dest_id, func);
+    if (ret_value < 0) {
+        throw DataTypeIException(inMemFunc("registerFunc"), "H5Tregister failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataType::registerFunc
-///\brief	This is an overloaded member function, provided for convenience.
-///		It differs from the above function only in the type of the
-///		argument \a name.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DataType::registerFunc
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function only in the type of the
+///             argument \a name.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void DataType::registerFunc( H5T_pers_t pers, const H5std_string& name, const DataType& dest, H5T_conv_t func ) const
+void
+DataType::registerFunc(H5T_pers_t pers, const H5std_string &name, const DataType &dest, H5T_conv_t func) const
 {
-   registerFunc( pers, name.c_str(), dest, func );
+    registerFunc(pers, name.c_str(), dest, func);
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataType::unregister
-///\brief	Removes a conversion function from all conversion paths.
-///\param	pers - IN: Conversion option
-///			\li \c H5T_PERS_HARD for hard conversion functions
-///			\li \c H5T_PERS_SOFT for soft conversion functions.
-///\param	name - IN: Name displayed in diagnostic output.
-///\param	dest - IN: Destination datatype.
-///\param	func - IN: Function to convert between source and
-///		destination datatypes.
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DataType::unregister
+///\brief       Removes a conversion function from all conversion paths.
+///\param       pers - IN: Conversion option
+///                     \li \c H5T_PERS_HARD for hard conversion functions
+///                     \li \c H5T_PERS_SOFT for soft conversion functions.
+///\param       name - IN: Name displayed in diagnostic output.
+///\param       dest - IN: Destination datatype.
+///\param       func - IN: Function to convert between source and
+///             destination datatypes.
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void DataType::unregister( H5T_pers_t pers, const char* name, const DataType& dest, H5T_conv_t func ) const
+void
+DataType::unregister(H5T_pers_t pers, const char *name, const DataType &dest, H5T_conv_t func) const
 {
-   hid_t dest_id = dest.getId();  // get id of the dest datatype for C API
+    hid_t dest_id = dest.getId(); // get id of the dest datatype for C API
 
-   // Call C routine H5Tunregister to remove the conversion function
-   herr_t ret_value = H5Tunregister( pers, name, id, dest_id, func );
-   if( ret_value < 0 )
-   {
-      throw DataTypeIException(inMemFunc("unregister"), "H5Tunregister failed");
-   }
+    // Call C routine H5Tunregister to remove the conversion function
+    herr_t ret_value = H5Tunregister(pers, name, id, dest_id, func);
+    if (ret_value < 0) {
+        throw DataTypeIException(inMemFunc("unregister"), "H5Tunregister failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataType::unregister
-///\brief	This is an overloaded member function, provided for convenience.
-///		It differs from the above function only in the type of the
-///		argument \a name.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DataType::unregister
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function only in the type of the
+///             argument \a name.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void DataType::unregister( H5T_pers_t pers, const H5std_string& name, const DataType& dest, H5T_conv_t func ) const
+void
+DataType::unregister(H5T_pers_t pers, const H5std_string &name, const DataType &dest, H5T_conv_t func) const
 {
-   unregister( pers, name.c_str(), dest, func );
+    unregister(pers, name.c_str(), dest, func);
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataType::setTag
-///\brief	Tags an opaque datatype.
-///\param	tag - IN: Descriptive ASCII string with which the opaque
-///		datatype is to be tagged.
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DataType::setTag
+///\brief       Tags an opaque datatype.
+///\param       tag - IN: Descriptive ASCII string with which the opaque
+///             datatype is to be tagged.
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void DataType::setTag( const char* tag ) const
+void
+DataType::setTag(const char *tag) const
 {
-   // Call C routine H5Tset_tag to tag an opaque datatype.
-   herr_t ret_value = H5Tset_tag( id, tag );
-   if( ret_value < 0 )
-   {
-      throw DataTypeIException(inMemFunc("setTag"), "H5Tset_tag failed");
-   }
+    // Call C routine H5Tset_tag to tag an opaque datatype.
+    herr_t ret_value = H5Tset_tag(id, tag);
+    if (ret_value < 0) {
+        throw DataTypeIException(inMemFunc("setTag"), "H5Tset_tag failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataType::setTag
-///\brief	This is an overloaded member function, provided for convenience.
-///		It differs from the above function only in the type of the
-///		argument \a name.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DataType::setTag
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function only in the type of the
+///             argument \a name.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void DataType::setTag( const H5std_string& tag ) const
+void
+DataType::setTag(const H5std_string &tag) const
 {
-   setTag( tag.c_str());
+    setTag(tag.c_str());
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataType::getTag
-///\brief	Gets the tag associated with an opaque datatype.
-///\return	Tag associated with the opaque datatype
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DataType::getTag
+///\brief       Gets the tag associated with an opaque datatype.
+///\return      Tag associated with the opaque datatype
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-H5std_string DataType::getTag() const
+H5std_string
+DataType::getTag() const
 {
-    char* tag_Cstr = H5Tget_tag( id );
+    char *tag_Cstr = H5Tget_tag(id);
 
     // if the tag C-string returned is not NULL, convert it to C++ string
     // and return it, otherwise, raise an exception
-    if( tag_Cstr != NULL )
-    {
-	H5std_string tag = H5std_string(tag_Cstr); // C string to string object
-	H5free_memory(tag_Cstr); // free the C string
-	return (tag); // return the tag
+    if (tag_Cstr != NULL) {
+        H5std_string tag = H5std_string(tag_Cstr); // C string to string object
+        H5free_memory(tag_Cstr);                   // free the C string
+        return (tag);                              // return the tag
     }
-    else
-    {
-	throw DataTypeIException(inMemFunc("getTag"), "H5Tget_tag returns NULL for tag");
+    else {
+        throw DataTypeIException(inMemFunc("getTag"), "H5Tget_tag returns NULL for tag");
     }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataType::detectClass
-///\brief	Checks whether a datatype contains (or is) a certain type of
-///		datatype.
-///\return	true if this datatype contains or is the specified type,
-///		and false, otherwise.
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - May, 2004
+// Function:    DataType::detectClass
+///\brief       Checks whether a datatype contains (or is) a certain type of
+///             datatype.
+///\return      true if this datatype contains or is the specified type,
+///             and false, otherwise.
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - May, 2004
 //--------------------------------------------------------------------------
-bool DataType::detectClass(H5T_class_t cls) const
+bool
+DataType::detectClass(H5T_class_t cls) const
 {
-   htri_t ret_value = H5Tdetect_class(id, cls);
-   if( ret_value > 0 )
-      return true;
-   else if( ret_value == 0 )
-      return false;
-   else
-   {
-      throw DataTypeIException(inMemFunc("detectClass"),
-				"H5Tdetect_class returns negative value");
-   }
+    htri_t ret_value = H5Tdetect_class(id, cls);
+    if (ret_value > 0)
+        return true;
+    else if (ret_value == 0)
+        return false;
+    else {
+        throw DataTypeIException(inMemFunc("detectClass"), "H5Tdetect_class returns negative value");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataType::isVariableStr
-///\brief	Check whether this datatype is a variable-length string.
-///\return	true if this datatype is a variable-length string, and
-///		false, otherwise.
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - May, 2004
+// Function:    DataType::detectClass (static)
+///\brief       Checks whether a predtype is a certain class of datatype.
+///\return      true if this predtype is the specified type class, and false,
+///             otherwise.
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - August, 2017
 //--------------------------------------------------------------------------
-bool DataType::isVariableStr() const
+bool
+DataType::detectClass(const PredType &pred_type, H5T_class_t cls)
 {
-   htri_t is_varlen_str = H5Tis_variable_str(id);
-   if( is_varlen_str == 1 )
-      return true;
-   else if( is_varlen_str == 0 )
-      return false;
-   else
-   {
-      throw DataTypeIException(inMemFunc("isVariableStr"),
-				"H5Tis_variable_str returns negative value");
-   }
+    htri_t ret_value = H5Tdetect_class(pred_type.getId(), cls);
+    if (ret_value > 0)
+        return true;
+    else if (ret_value == 0)
+        return false;
+    else {
+        throw DataTypeIException("detectClass on PredType", "H5Tdetect_class returns negative value");
+    }
+}
+
+//--------------------------------------------------------------------------
+// Function:    DataType::isVariableStr
+///\brief       Check whether this datatype is a variable-length string.
+///\return      true if this datatype is a variable-length string, and
+///             false, otherwise.
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - May, 2004
+//--------------------------------------------------------------------------
+bool
+DataType::isVariableStr() const
+{
+    htri_t is_varlen_str = H5Tis_variable_str(id);
+    if (is_varlen_str == 1)
+        return true;
+    else if (is_varlen_str == 0)
+        return false;
+    else {
+        throw DataTypeIException(inMemFunc("isVariableStr"), "H5Tis_variable_str returns negative value");
+    }
+}
+
+//--------------------------------------------------------------------------
+// Function:    DataType::getCreatePlist
+///\brief       Returns a copy of the property list, which is for datatype
+///             creation.
+///\return      A property list object
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - March, 2017
+// Description
+//              Currently, there is no datatype creation property list class
+//              in the C++ API because there is no associated functionality.
+//--------------------------------------------------------------------------
+PropList
+DataType::getCreatePlist() const
+{
+    hid_t create_plist_id = H5Tget_create_plist(id);
+    if (create_plist_id < 0) {
+        throw DataTypeIException(inMemFunc("getCreatePlist"), "H5Tget_create_plist returns negative value");
+    }
+    // create and return the DSetCreatPropList object
+    PropList create_plist;
+    f_PropList_setId(&create_plist, create_plist_id);
+    return (create_plist);
 }
 
 //--------------------------------------------------------------------------
@@ -661,93 +892,113 @@ bool DataType::isVariableStr() const
 //              IdComponent::getId now becomes pure virtual function.
 // Programmer   Binh-Minh Ribler - May, 2008
 //--------------------------------------------------------------------------
-hid_t DataType::getId() const
+hid_t
+DataType::getId() const
 {
-   return(id);
+    return (id);
 }
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 //--------------------------------------------------------------------------
+// Function:    DataType::p_opentype (private)
+///\brief       Opens an HDF5 datatype given its name
+///\param       loc        - IN: Location of the type
+///\param       dtype_name - IN: Datatype name
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - Dec 2016
+// Description
+//              This function was introduced in 1.10.1 to be used by the new
+//              XxxType constructors that open a datatype. -BMR, Dec 2016
+//--------------------------------------------------------------------------
+hid_t
+DataType::p_opentype(const H5Location &loc, const char *dtype_name) const
+{
+    // Call C function to open the named datatype at this location
+    hid_t ret_value = H5Topen2(loc.getId(), dtype_name, H5P_DEFAULT);
+    if (ret_value < 0)
+        throw DataTypeIException(inMemFunc("constructor"), "H5Topen2 failed");
+    return (ret_value);
+}
+
+//--------------------------------------------------------------------------
 // Function:    DataType::p_setId
 ///\brief       Sets the identifier of this object to a new value.
 ///
 ///\exception   H5::IdComponentException when the attempt to close the HDF5
 ///             object fails
 // Description:
-//              The underlaying reference counting in the C library ensures
+//              The underlying reference counting in the C library ensures
 //              that the current valid id of this object is properly closed.
 //              Then the object's id is reset to the new id.
 // Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void DataType::p_setId(const hid_t new_id)
+void
+DataType::p_setId(const hid_t new_id)
 {
     // handling references to this old id
     try {
         close();
     }
-    catch (Exception close_error) {
+    catch (Exception &close_error) {
         throw DataTypeIException(inMemFunc("p_setId"), close_error.getDetailMsg());
     }
-   // reset object's id to the given id
-   id = new_id;
+    // reset object's id to the given id
+    id = new_id;
 }
 #endif // DOXYGEN_SHOULD_SKIP_THIS
 
 //--------------------------------------------------------------------------
-// Function:	DataType::close
-///\brief	Closes the datatype if it is not a predefined type.
+// Function:    DataType::close
+///\brief       Closes the datatype if it is not a predefined type.
 ///
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - Mar 9, 2005
-//--------------------------------------------------------------------------
-void DataType::close()
-{
-    if (p_valid_id(id))
-    {
-	herr_t ret_value = H5Tclose(id);
-	if( ret_value < 0 )
-	{
-	    throw DataTypeIException(inMemFunc("close"), "H5Tclose failed");
-	}
-	// reset the id
-	id = H5I_INVALID_HID;
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - Mar 9, 2005
+//--------------------------------------------------------------------------
+void
+DataType::close()
+{
+    if (p_valid_id(id)) {
+        herr_t ret_value = H5Tclose(id);
+        if (ret_value < 0) {
+            throw DataTypeIException(inMemFunc("close"), "H5Tclose failed");
+        }
+        // Reset the id
+        id = H5I_INVALID_HID;
+
+        // Free and reset buffer of encoded object description if it's been used
+        if (encoded_buf != NULL) {
+            delete[] encoded_buf;
+            buf_size = 0;
+        }
     }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DataType destructor
-///\brief	Properly terminates access to this datatype.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DataType destructor
+///\brief       Properly terminates access to this datatype.
+// Programmer   Binh-Minh Ribler - 2000
 // Modification
-//		- Replaced resetIdComponent() with decRefCount() to use C
-//		  library ID reference counting mechanism - BMR, Jun 1, 2004
-//		- Replaced decRefCount with close() to let the C library
-//		  handle the reference counting - BMR, Jun 1, 2006
-//		- Added the use of H5CPP_EXITED to terminate the HDF5 library
-//		  and elimiate previous memory leaks.  See comments in the
-//		  header file "H5PredType.h" for details. - BMR, Mar 30, 2012
+//              - Replaced resetIdComponent() with decRefCount() to use C
+//                library ID reference counting mechanism - BMR, Jun 1, 2004
+//              - Replaced decRefCount with close() to let the C library
+//                handle the reference counting - BMR, Jun 1, 2006
+//              - Added the use of H5CPP_EXITED to terminate the HDF5 library
+//                and eliminate previous memory leaks.  See comments in the
+//                header file "H5PredType.h" for details. - BMR, Mar 30, 2012
+//              - Major re-implementation of the global constants was done
+//                to avoid relying on the order of the creation and deletion
+//                of the global constants.  Hence, H5CPP_EXITED was removed.
+//                See Design Notes in "H5PredType.cpp" for details.
+//                - BMR, Sep 30, 2015
 //--------------------------------------------------------------------------
 DataType::~DataType()
 {
-    try
-    {
-	/* If this is the object AtExit, terminate the HDF5 library.  This is
-	   to eliminate memory leaks due to the library being re-initiated
-	   (after the program has ended) and not re-terminated. */
-	if (id == H5CPP_EXITED)
-	{
-	    herr_t ret_value = H5close();
-	    if (ret_value == FAIL)
-		throw DataTypeIException(inMemFunc("~DataType - "), "H5close failed");
-	}
-	// Close the HDF5 datatype
-	else
-	    close();
-    }
-    catch (Exception close_error) {
-	cerr << inMemFunc("~DataType - ") << close_error.getDetailMsg() << endl;
-    }
-}
-#ifndef H5_NO_NAMESPACE
-} // end namespace
-#endif
+    try {
+        close();
+    }
+    catch (Exception &close_error) {
+        cerr << inMemFunc("~DataType - ") << close_error.getDetailMsg() << endl;
+    }
+}
+
+} // namespace H5
diff --git a/c++/src/H5DataType.h b/c++/src/H5DataType.h
index 064bfe1..7cc1d31 100644
--- a/c++/src/H5DataType.h
+++ b/c++/src/H5DataType.h
@@ -1,25 +1,20 @@
 // C++ informative line for the emacs editor: -*- C++ -*-
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5DataType_H
-#define __H5DataType_H
+#ifndef H5DataType_H
+#define H5DataType_H
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#endif
 
 /*! \class DataType
     \brief Class DataType provides generic operations on HDF5 datatypes.
@@ -28,114 +23,163 @@ namespace H5 {
     object and is a base class of ArrayType, AtomType, CompType, EnumType,
     and VarLenType.
 */
+//  Inheritance: DataType -> H5Object -> H5Location -> IdComponent
 class H5_DLLCPP DataType : public H5Object {
-   public:
-	// Creates a datatype given its class and size
-	DataType( const H5T_class_t type_class, size_t size );
+  public:
+    // Creates a datatype given its class and size
+    DataType(const H5T_class_t type_class, size_t size);
 
-	// Copy constructor: makes a copy of the original object
-	DataType( const DataType& original );
+    // Copy constructor - same as the original DataType.
+    DataType(const DataType &original);
 
-	// Creates a datatype by way of dereference.
-	DataType(const H5Location& loc, const void* ref, H5R_type_t ref_type = H5R_OBJECT, const PropList& plist = PropList::DEFAULT);
-	DataType(const Attribute& attr, const void* ref, H5R_type_t ref_type = H5R_OBJECT, const PropList& plist = PropList::DEFAULT);
+    // Creates a copy of a predefined type
+    DataType(const PredType &pred_type);
 
-	// Closes this datatype.
-	virtual void close();
+    // Constructors to open a generic named datatype at a given location.
+    DataType(const H5Location &loc, const char *name);
+    DataType(const H5Location &loc, const H5std_string &name);
 
-	// Copies an existing datatype to this datatype object.
-	void copy(const DataType& like_type);
+    // Creates a datatype by way of dereference.
+    DataType(const H5Location &loc, const void *ref, H5R_type_t ref_type = H5R_OBJECT,
+             const PropList &plist = PropList::DEFAULT);
+    //        DataType(const Attribute& attr, const void* ref, H5R_type_t ref_type = H5R_OBJECT, const
+    //        PropList& plist = PropList::DEFAULT);
 
-	// Copies the datatype of dset to this datatype object.
-	void copy(const DataSet& dset);
+    // Closes this datatype.
+    virtual void close() override;
 
-	// Returns the datatype class identifier.
-	H5T_class_t getClass() const;
+    // Copies an existing datatype to this datatype object.
+    void copy(const DataType &like_type);
 
-	// Commits a transient datatype to a file; this datatype becomes
-	// a named datatype which can be accessed from the location.
-	void commit(const H5Location& loc, const char* name);
-	void commit(const H5Location& loc, const H5std_string& name);
-	// These two overloaded functions are kept for backward compatibility
-	// only; they missed the const.
-	void commit(H5Location& loc, const char* name);
-	void commit(H5Location& loc, const H5std_string& name);
+    // Copies the datatype of dset to this datatype object.
+    void copy(const DataSet &dset);
 
-	// Determines whether this datatype is a named datatype or
-	// a transient datatype.
-	bool committed() const;
+    // Returns a DataType instance by decoding the binary object
+    // description of this datatype.
+    virtual DataType *decode() const;
 
-        // Finds a conversion function that can handle the conversion
-        // this datatype to the given datatype, dest.
-	H5T_conv_t find( const DataType& dest, H5T_cdata_t **pcdata ) const;
+    // Creates a binary object description of this datatype.
+    void encode();
 
-	// Converts data from between specified datatypes.
-	void convert( const DataType& dest, size_t nelmts, void *buf, void *background, const PropList& plist=PropList::DEFAULT) const;
+    // Returns the datatype class identifier.
+    H5T_class_t getClass() const;
 
-	// Assignment operator
-	DataType& operator=( const DataType& rhs );
+    // Commits a transient datatype to a file; this datatype becomes
+    // a named datatype which can be accessed from the location.
+    void commit(const H5Location &loc, const char *name);
+    void commit(const H5Location &loc, const H5std_string &name);
 
-	// Determines whether two datatypes are the same.
-	bool operator==(const DataType& compared_type ) const;
+    // These two overloaded functions are kept for backward compatibility
+    // only; they missed the const - removed from 1.8.18 and 1.10.1
+    // void commit(H5Location& loc, const char* name);
+    // void commit(H5Location& loc, const H5std_string& name);
 
-	// Locks a datatype.
-	void lock() const;
+    // Determines whether this datatype is a named datatype or
+    // a transient datatype.
+    bool committed() const;
 
-	// Returns the size of a datatype.
-	size_t getSize() const;
+    // Finds a conversion function that can handle the conversion
+    // this datatype to the given datatype, dest.
+    H5T_conv_t find(const DataType &dest, H5T_cdata_t **pcdata) const;
 
-	// Returns the base datatype from which a datatype is derived.
-	// Note: not quite right for specific types yet???
-	DataType getSuper() const;
+    // Converts data from between specified datatypes.
+    void convert(const DataType &dest, size_t nelmts, void *buf, void *background,
+                 const PropList &plist = PropList::DEFAULT) const;
 
-	// Registers a conversion function.
-	void registerFunc(H5T_pers_t pers, const char* name, const DataType& dest, H5T_conv_t func ) const;
-	void registerFunc(H5T_pers_t pers, const H5std_string& name, const DataType& dest, H5T_conv_t func ) const;
+    // Assignment operator
+    DataType &operator=(const DataType &rhs);
 
-	// Removes a conversion function from all conversion paths.
-	void unregister( H5T_pers_t pers, const char* name, const DataType& dest, H5T_conv_t func ) const;
-	void unregister( H5T_pers_t pers, const H5std_string& name, const DataType& dest, H5T_conv_t func ) const;
+    // Determines whether two datatypes are the same.
+    bool operator==(const DataType &compared_type) const;
 
-	// Tags an opaque datatype.
-	void setTag( const char* tag ) const;
-	void setTag( const H5std_string& tag ) const;
+    // Determines whether two datatypes are not the same.
+    bool operator!=(const DataType &compared_type) const;
 
-	// Gets the tag associated with an opaque datatype.
-	H5std_string getTag() const;
+    // Locks a datatype.
+    void lock() const;
 
-	// Checks whether this datatype contains (or is) a certain type class.
-	bool detectClass(H5T_class_t cls) const;
+    // Returns the size of a datatype.
+    size_t getSize() const;
 
-	// Checks whether this datatype is a variable-length string.
-	bool isVariableStr() const;
+    // Returns the base datatype from which a datatype is derived.
+    // Note: not quite right for specific types yet???
+    DataType getSuper() const;
 
-	///\brief Returns this class name.
-	virtual H5std_string fromClass () const { return("DataType"); }
+    // Registers a conversion function.
+    void registerFunc(H5T_pers_t pers, const char *name, const DataType &dest, H5T_conv_t func) const;
+    void registerFunc(H5T_pers_t pers, const H5std_string &name, const DataType &dest, H5T_conv_t func) const;
 
-	// Creates a copy of an existing DataType using its id
-	DataType( const hid_t type_id );
+    // Removes a conversion function from all conversion paths.
+    void unregister(H5T_pers_t pers, const char *name, const DataType &dest, H5T_conv_t func) const;
+    void unregister(H5T_pers_t pers, const H5std_string &name, const DataType &dest, H5T_conv_t func) const;
 
-	// Default constructor
-	DataType();
+    // Tags an opaque datatype.
+    void setTag(const char *tag) const;
+    void setTag(const H5std_string &tag) const;
 
-	// Gets the datatype id.
-	virtual hid_t getId() const;
+    // Gets the tag associated with an opaque datatype.
+    H5std_string getTag() const;
 
-	// Destructor: properly terminates access to this datatype.
-	virtual ~DataType();
+    // Checks whether this datatype contains (or is) a certain type class.
+    bool        detectClass(H5T_class_t cls) const;
+    static bool detectClass(const PredType &pred_type, H5T_class_t cls);
 
-   protected:
+    // Checks whether this datatype is a variable-length string.
+    bool isVariableStr() const;
+
+    // Returns a copy of the creation property list of a datatype.
+    PropList getCreatePlist() const;
+
+    ///\brief Returns this class name.
+    virtual H5std_string
+    fromClass() const override
+    {
+        return ("DataType");
+    }
+
+    // Creates a copy of an existing DataType using its id
+    DataType(const hid_t type_id);
+
+    // Default constructor
+    DataType();
+
+    // Determines whether this datatype has a binary object description.
+    bool hasBinaryDesc() const;
+
+    // Gets the datatype id.
+    virtual hid_t getId() const override;
+
+    // Destructor: properly terminates access to this datatype.
+    virtual ~DataType() override;
+
+  protected:
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
-	hid_t id;	// HDF5 datatype id
+    hid_t id; // HDF5 datatype id
+
+    // Returns an id of a type by decoding the binary object
+    // description of this datatype.
+    hid_t p_decode() const;
+
+    // Sets the datatype id.
+    virtual void p_setId(const hid_t new_id) override;
+
+    // Opens a datatype and returns the id.
+    hid_t p_opentype(const H5Location &loc, const char *dtype_name) const;
 
-	// Sets the datatype id.
-	virtual void p_setId(const hid_t new_id);
 #endif // DOXYGEN_SHOULD_SKIP_THIS
 
-   private:
-	void p_commit(hid_t loc_id, const char* name);
-};
-#ifndef H5_NO_NAMESPACE
-}
-#endif
-#endif // __H5DataType_H
+  private:
+    // Buffer for binary object description of this datatype, allocated
+    // in DataType::encode and used in DataType::decode
+    unsigned char *encoded_buf;
+    size_t         buf_size;
+
+    // Friend function to set DataType id.  For library use only.
+    friend void f_DataType_setId(DataType *dtype, hid_t new_id);
+
+    void p_commit(hid_t loc_id, const char *name);
+
+}; // end of DataType
+} // namespace H5
+
+#endif // H5DataType_H
diff --git a/c++/src/H5DcreatProp.cpp b/c++/src/H5DcreatProp.cpp
index 2b124ee..831441d 100644
--- a/c++/src/H5DcreatProp.cpp
+++ b/c++/src/H5DcreatProp.cpp
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <string>
@@ -18,659 +15,784 @@
 #include "H5Include.h"
 #include "H5Exception.h"
 #include "H5IdComponent.h"
+#include "H5DataSpace.h"
 #include "H5PropList.h"
-#include "H5Object.h"
+#include "H5OcreatProp.h"
 #include "H5DcreatProp.h"
-#include "H5CommonFG.h"
+#include "H5LcreatProp.h"
+#include "H5LaccProp.h"
+#include "H5DaccProp.h"
+#include "H5Location.h"
+#include "H5Object.h"
 #include "H5DataType.h"
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#endif
+
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+// This DOXYGEN_SHOULD_SKIP_THIS block is a work-around approach to control
+// the order of creation and deletion of the global constants.  See Design Notes
+// in "H5PredType.cpp" for information.
+
+// Initialize a pointer for the constant
+DSetCreatPropList *DSetCreatPropList::DEFAULT_ = 0;
 
 //--------------------------------------------------------------------------
-///\brief	Constant for dataset creation default property
+// Function:    DSetCreatPropList::getConstant
+// Purpose:     Creates a DSetCreatPropList object representing the HDF5
+//              constant H5P_DATASET_CREATE, pointed to by
+//              DSetCreatPropList::DEFAULT_
+// exception    H5::PropListIException
+// Description
+//              If DSetCreatPropList::DEFAULT_ already points to an allocated
+//              object, throw a PropListIException.  This scenario should
+//              not happen.
+// Programmer   Binh-Minh Ribler - 2015
 //--------------------------------------------------------------------------
-const DSetCreatPropList DSetCreatPropList::DEFAULT;
+DSetCreatPropList *
+DSetCreatPropList::getConstant()
+{
+    // Tell the C library not to clean up, H5Library::termH5cpp will call
+    // H5close - more dependency if use H5Library::dontAtExit()
+    if (!IdComponent::H5dontAtexit_called) {
+        (void)H5dont_atexit();
+        IdComponent::H5dontAtexit_called = true;
+    }
+
+    // If the constant pointer is not allocated, allocate it. Otherwise,
+    // throw because it shouldn't be.
+    if (DEFAULT_ == 0)
+        DEFAULT_ = new DSetCreatPropList(H5P_DATASET_CREATE);
+    else
+        throw PropListIException("DSetCreatPropList::getConstant",
+                                 "DSetCreatPropList::getConstant is being invoked on an allocated DEFAULT_");
+    return (DEFAULT_);
+}
 
 //--------------------------------------------------------------------------
-// Function:	DSetCreatPropList default constructor
-///\brief	Default constructor: creates a stub dataset creation property list
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DSetCreatPropList::deleteConstants
+// Purpose:     Deletes the constant object that DSetCreatPropList::DEFAULT_
+//              points to.
+// Programmer   Binh-Minh Ribler - 2015
 //--------------------------------------------------------------------------
-DSetCreatPropList::DSetCreatPropList() : PropList( H5P_DATASET_CREATE) {}
+void
+DSetCreatPropList::deleteConstants()
+{
+    delete DEFAULT_;
+}
 
 //--------------------------------------------------------------------------
-// Function:	DSetCreatPropList copy constructor
-///\brief	Copy constructor: makes a copy of the original
-///		DSetCreatPropList object
-// Programmer	Binh-Minh Ribler - 2000
+// Purpose      Constant for dataset creation default property
 //--------------------------------------------------------------------------
-DSetCreatPropList::DSetCreatPropList( const DSetCreatPropList& orig ) : PropList( orig ) {}
+const DSetCreatPropList &DSetCreatPropList::DEFAULT = *getConstant();
+
+#endif // DOXYGEN_SHOULD_SKIP_THIS
 
 //--------------------------------------------------------------------------
-// Function:	DSetCreatPropList overloaded constructor
-///\brief	Creates a DSetCreatPropList object using the id of an
-///		existing dataset creation property list.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DSetCreatPropList default constructor
+///\brief       Default constructor: creates a stub dataset creation property list
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-DSetCreatPropList::DSetCreatPropList(const hid_t plist_id) : PropList(plist_id) {}
+DSetCreatPropList::DSetCreatPropList() : ObjCreatPropList(H5P_DATASET_CREATE)
+{
+}
 
 //--------------------------------------------------------------------------
-// Function:	DSetCreatPropList::setChunk
-///\brief	Sets the size of the chunks used to store a chunked layout
-///		dataset.
-///\param	ndims - IN: Number of dimensions of each chunk
-///\param	dim   - IN: Array containing the size of each chunk
-///\exception	H5::PropListIException
-///\par Description
-///		The \a ndims parameter currently must have the same value as
-///		the rank of the dataset.  The values of the \a dim array
-///		define the size of the chunks to store the dataset's raw
-///		data.  As a side-effect, the layout of the dataset will be
-///		changed to \c H5D_CHUNKED, if it is not so already.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DSetCreatPropList copy constructor
+///\brief       Copy constructor: same HDF5 object as \a original
+///             DSetCreatPropList object
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void DSetCreatPropList::setChunk( int ndims, const hsize_t* dim ) const
+DSetCreatPropList::DSetCreatPropList(const DSetCreatPropList &orig) : ObjCreatPropList(orig)
 {
-   herr_t ret_value = H5Pset_chunk( id, ndims, dim );
-   if( ret_value < 0 )
-   {
-      throw PropListIException("DSetCreatPropList::setChunk", "H5Pset_chunk failed");
-   }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DSetCreatPropList::getChunk
-///\brief	Retrieves the size of the chunks used to store a chunked
-///		layout dataset.
-///\param	max_ndims - IN: Size of \a dim array
-///\param	dim      - OUT: Array to store the chunk dimensions
-///\exception	H5::PropListIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DSetCreatPropList overloaded constructor
+///\brief       Creates a DSetCreatPropList object using the id of an
+///             existing dataset creation property list.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-int DSetCreatPropList::getChunk( int max_ndims, hsize_t* dim ) const
+DSetCreatPropList::DSetCreatPropList(const hid_t plist_id) : ObjCreatPropList(plist_id)
 {
-   int chunk_size = H5Pget_chunk( id, max_ndims, dim );
-   if( chunk_size < 0 )
-   {
-      throw PropListIException("DSetCreatPropList::getChunk",
-		"H5Pget_chunk returns negative chunk size");
-   }
-   return( chunk_size );
 }
 
 //--------------------------------------------------------------------------
-// Function:	DSetCreatPropList::setLayout
-///\brief	Sets the type of storage used store the raw data for a dataset.
-///\param	layout - IN: Type of storage layout for raw data
-///\exception	H5::PropListIException
+// Function:    DSetCreatPropList::setChunk
+///\brief       Sets the size of the chunks used to store a chunked layout
+///             dataset.
+///\param       ndims - IN: Number of dimensions of each chunk
+///\param       dim   - IN: Array containing the size of each chunk
+///\exception   H5::PropListIException
 ///\par Description
-///		For information on valid layout types, please refer to
-/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-SetLayout
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-void DSetCreatPropList::setLayout(H5D_layout_t layout) const
-{
-   herr_t ret_value = H5Pset_layout( id, layout );
-   if( ret_value < 0 )
-   {
-      throw PropListIException("DSetCreatPropList::setLayout",
-		"H5Pset_layout failed");
-   }
-}
-
-//--------------------------------------------------------------------------
-// Function:	DSetCreatPropList::getLayout
-///\brief	Retrieves the layout type of this property list
-///\return	Layout type, which can be:
-///		\li \c H5D_COMPACT - raw data is stored in the object
-///		                header in the file.
-///		\li \c H5D_CONTIGUOUS - raw data is stored separately from the
-///		                object header in one contiguous chunk in
-///		                the file.
-///		\li \c H5D_CHUNKED - raw data is stored separately from the
-///		                object header in chunks in separate locations
-///		                in the file.
-///\exception	H5::PropListIException
+///             The \a ndims parameter currently must have the same value as
+///             the rank of the dataset.  The values of the \a dim array
+///             define the size of the chunks to store the dataset's raw
+///             data.  As a side-effect, the layout of the dataset will be
+///             changed to \c H5D_CHUNKED, if it is not so already.
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+void
+DSetCreatPropList::setChunk(int ndims, const hsize_t *dim) const
+{
+    herr_t ret_value = H5Pset_chunk(id, ndims, dim);
+    if (ret_value < 0) {
+        throw PropListIException("DSetCreatPropList::setChunk", "H5Pset_chunk failed");
+    }
+}
+
+//--------------------------------------------------------------------------
+// Function:    DSetCreatPropList::getChunk
+///\brief       Retrieves the size of the chunks used to store a chunked
+///             layout dataset.
+///\param       max_ndims - IN: Size of \a dim array
+///\param       dim      - OUT: Array to store the chunk dimensions
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+int
+DSetCreatPropList::getChunk(int max_ndims, hsize_t *dim) const
+{
+    int chunk_size = H5Pget_chunk(id, max_ndims, dim);
+    if (chunk_size < 0) {
+        throw PropListIException("DSetCreatPropList::getChunk", "H5Pget_chunk returns negative chunk size");
+    }
+    return (chunk_size);
+}
+
+//--------------------------------------------------------------------------
+// Function:    DSetCreatPropList::setLayout
+///\brief       Sets the type of storage used store the raw data for a dataset.
+///\param       layout - IN: Type of storage layout for raw data
+///\exception   H5::PropListIException
 ///\par Description
-// Programmer	Binh-Minh Ribler - 2000
+///             For information, please refer to the H5Pset_layout API in
+///             the HDF5 C Reference Manual.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-H5D_layout_t DSetCreatPropList::getLayout() const
+void
+DSetCreatPropList::setLayout(H5D_layout_t layout) const
 {
-   H5D_layout_t layout = H5Pget_layout( id );
-   if( layout == H5D_LAYOUT_ERROR )
-   {
-      throw PropListIException("DSetCreatPropList::getLayout",
-		"H5Pget_layout returns H5D_LAYOUT_ERROR");
-   }
-   return( layout );
+    herr_t ret_value = H5Pset_layout(id, layout);
+    if (ret_value < 0) {
+        throw PropListIException("DSetCreatPropList::setLayout", "H5Pset_layout failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DSetCreatPropList::setDeflate
-///\brief	Sets compression method and compression level
-///\param	level - IN: Compression level, should [0..9], inclusive
-///\exception	H5::PropListIException
+// Function:    DSetCreatPropList::getLayout
+///\brief       Retrieves the layout type of this property list
+///\return      Layout type, which can be:
+///             \li \c H5D_COMPACT - raw data is stored in the object
+///                             header in the file.
+///             \li \c H5D_CONTIGUOUS - raw data is stored separately from the
+///                             object header in one contiguous chunk in
+///                             the file.
+///             \li \c H5D_CHUNKED - raw data is stored separately from the
+///                             object header in chunks in separate locations
+///                             in the file.
+///\exception   H5::PropListIException
 ///\par Description
-///		The function sets the compression method for this property
-///		list to \c H5D_COMPRESS_DEFLATE and the compression level to
-///		\a level. Lower compression levels are faster but result in
-///		less compression.
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-void DSetCreatPropList::setDeflate( int level ) const
-{
-   herr_t ret_value = H5Pset_deflate( id, level );
-   if( ret_value < 0 )
-   {
-      throw PropListIException("DSetCreatPropList::setDeflate",
-		"H5Pset_deflate failed");
-   }
-}
-
-//--------------------------------------------------------------------------
-// Function:	DSetCreatPropList::setSzip
-///\brief	Sets up for the use of the SZIP compression filter.
-///\param	options_mask     - IN: A bit-mask conveying the desired SZIP
-///			options.  Valid values are H5_SZIP_EC_OPTION_MASK
-///			and H5_SZIP_NN_OPTION_MASK.
-///\param	pixels_per_block - IN: Number of pixels or data elements in
-///			each data block.
-///\exception	H5::PropListIException
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+H5D_layout_t
+DSetCreatPropList::getLayout() const
+{
+    H5D_layout_t layout = H5Pget_layout(id);
+    if (layout == H5D_LAYOUT_ERROR) {
+        throw PropListIException("DSetCreatPropList::getLayout", "H5Pget_layout returns H5D_LAYOUT_ERROR");
+    }
+    return layout;
+}
+
+//--------------------------------------------------------------------------
+// Function:    DSetCreatPropList::setDeflate
+///\brief       Sets compression method and compression level
+///\param       level - IN: Compression level, should [0..9], inclusive
+///\exception   H5::PropListIException
 ///\par Description
-///		The associate C function sets an SZIP compression filter,
-///		H5Z_FILTER_SZIP, for a dataset.  For more information about
-///		SZIP and usage, please refer to the C layer Reference
-///		Manual at:
-/// http://hdfgroup.org/HDF5/doc/RM_H5P.html#Property-SetSzip
-// Programmer	Binh-Minh Ribler - Jan, 2007
+///             The function sets the compression method for this property
+///             list to \c H5D_COMPRESS_DEFLATE and the compression level to
+///             \a level. Lower compression levels are faster but result in
+///             less compression.
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+void
+DSetCreatPropList::setDeflate(int level) const
+{
+    if (level < 0) {
+        throw PropListIException("DSetCreatPropList::setDeflate", "level can't be negative");
+    }
+
+    herr_t ret_value = H5Pset_deflate(id, static_cast<unsigned>(level));
+
+    if (ret_value < 0) {
+        throw PropListIException("DSetCreatPropList::setDeflate", "H5Pset_deflate failed");
+    }
+}
+
 //--------------------------------------------------------------------------
-void DSetCreatPropList::setSzip(unsigned int options_mask, unsigned int pixels_per_block) const
+// Function:    DSetCreatPropList::setSzip
+///\brief       Sets up for the use of the SZIP compression filter.
+///\param       options_mask     - IN: A bit-mask conveying the desired SZIP
+///                     options.  Valid values are H5_SZIP_EC_OPTION_MASK
+///                     and H5_SZIP_NN_OPTION_MASK.
+///\param       pixels_per_block - IN: Number of pixels or data elements in
+///                     each data block.
+///\exception   H5::PropListIException
+///\par Description
+///             The associate C function sets an SZIP compression filter,
+///             H5Z_FILTER_SZIP, for a dataset.  For more information about
+///             SZIP and usage, please refer to the H5Pset_szip API in
+///             the HDF5 C Reference Manual.
+// Programmer   Binh-Minh Ribler - Jan, 2007
+//--------------------------------------------------------------------------
+void
+DSetCreatPropList::setSzip(unsigned int options_mask, unsigned int pixels_per_block) const
 {
     herr_t ret_value = H5Pset_szip(id, options_mask, pixels_per_block);
-    if( ret_value < 0 )
-    {
-	throw PropListIException("DSetCreatPropList::setSzip",
-		"H5Pset_szip failed");
+    if (ret_value < 0) {
+        throw PropListIException("DSetCreatPropList::setSzip", "H5Pset_szip failed");
     }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DSetCreatPropList::setFillValue
-///\brief	Sets a dataset fill value
-///\param	fvalue_type - IN: Data type for the value passed via \a value
-///\param	value - IN: Pointer to buffer containing the fill value
-///\exception	H5::PropListIException
+// Function:    DSetCreatPropList::setNbit
+///\brief       Sets up for the use of the Nbit compression filter.
+///\exception   H5::PropListIException
+///
 ///\par Description
-///		The datatype may differ from that of the dataset, but it must
-///		be one that the HDF5 library is able to convert \a value to
-///		the dataset datatype when the dataset is created.
-///		The default fill value is 0 (zero,) which is interpreted
-///		according to the actual dataset datatype.
+///             The associate C function sets an Nbit compression filter,
+///             H5Z_FILTER_NBIT, for a dataset.  For more information about
+///             Nbit compression, please refer to the H5Pset_nbit API in
+///             the HDF5 C Reference Manual.
+// Programmer   Binh-Minh Ribler - Apr, 2016
+//--------------------------------------------------------------------------
+void
+DSetCreatPropList::setNbit() const
+{
+    herr_t ret_value = H5Pset_nbit(id);
+    if (ret_value < 0) {
+        throw PropListIException("DSetCreatPropList::setNbit", "H5Pset_nbit failed");
+    }
+}
+
+//--------------------------------------------------------------------------
+// Function:    DSetCreatPropList::setFillValue
+///\brief       Sets a dataset fill value
+///\param       fvalue_type - IN: Data type for the value passed via \a value
+///\param       value - IN: Pointer to buffer containing the fill value
+///\exception   H5::PropListIException
+///\par Description
+///             The datatype may differ from that of the dataset, but it must
+///             be one that the HDF5 library is able to convert \a value to
+///             the dataset datatype when the dataset is created.
+///             The default fill value is 0 (zero,) which is interpreted
+///             according to the actual dataset datatype.
 ///\par
-///		For information on setting fill value, please refer to the
-///		C layer Reference Manual at:
-/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-SetFillValue
-// Programmer	Binh-Minh Ribler - 2000
+///             For information on setting fill value, please refer to the
+///             H5Pset_fill_value API in the HDF5 C Reference Manual.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void DSetCreatPropList::setFillValue( const DataType& fvalue_type, const void* value ) const
+void
+DSetCreatPropList::setFillValue(const DataType &fvalue_type, const void *value) const
 {
-   herr_t ret_value = H5Pset_fill_value( id, fvalue_type.getId(), value );
-   if( ret_value < 0 )
-   {
-      throw PropListIException("DSetCreatPropList::setFillValue",
-                "H5Pset_fill_value failed");
-   }
+    herr_t ret_value = H5Pset_fill_value(id, fvalue_type.getId(), value);
+    if (ret_value < 0) {
+        throw PropListIException("DSetCreatPropList::setFillValue", "H5Pset_fill_value failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DSetCreatPropList::getFillValue
-///\brief	Retrieves a dataset fill value
-///\param	fvalue_type - IN: Data type for the value passed via \a value
-///\param	value - OUT: Pointer to buffer to hold the retrieved fill value
-///\exception	H5::PropListIException
+// Function:    DSetCreatPropList::getFillValue
+///\brief       Retrieves a dataset fill value
+///\param       fvalue_type - IN: Data type for the value passed via \a value
+///\param       value - OUT: Pointer to buffer to hold the retrieved fill value
+///\exception   H5::PropListIException
 ///\par Description
-///		The fill value is returned through \a value pointer
-///		and the memory is allocated by the caller.  The fill
-///		value will be converted from its current data type to the
-///		specified by \a fvalue_type.
-// Programmer	Binh-Minh Ribler - 2000
+///             The fill value is returned through \a value pointer
+///             and the memory is allocated by the caller.  The fill
+///             value will be converted from its current data type to the
+///             specified by \a fvalue_type.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void DSetCreatPropList::getFillValue( const DataType& fvalue_type, void* value ) const
+void
+DSetCreatPropList::getFillValue(const DataType &fvalue_type, void *value) const
 {
-   herr_t ret_value = H5Pget_fill_value( id, fvalue_type.getId(), value );
-   if( ret_value < 0 )
-   {
-      throw PropListIException("DSetCreatPropList::getFillValue",
-                "H5Pget_fill_value failed");
-   }
+    herr_t ret_value = H5Pget_fill_value(id, fvalue_type.getId(), value);
+    if (ret_value < 0) {
+        throw PropListIException("DSetCreatPropList::getFillValue", "H5Pget_fill_value failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DSetCreatPropList::isFillValueDefined
-///\brief	Check if fill value has been defined for this property
+// Function:    DSetCreatPropList::isFillValueDefined
+///\brief       Check if fill value has been defined for this property
 ///\return
-///		\li \c H5D_FILL_VALUE_UNDEFINED    =0,
-///		\li \c H5D_FILL_VALUE_DEFAULT      =1,
-///		\li \c H5D_FILL_VALUE_USER_DEFINED =2
-///\exception	H5::PropListIException
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-H5D_fill_value_t DSetCreatPropList::isFillValueDefined()
-{
-   H5D_fill_value_t status;
-   herr_t ret_value = H5Pfill_value_defined(id, &status);
-   if( ret_value < 0 )
-   {
-      throw PropListIException("DSetCreatPropList::isFillValueDefined",
-                "H5Pfill_value_defined returned H5D_FILL_VALUE_ERROR (-1)");
-   }
-   else
-      return (status);
-}
-
-//--------------------------------------------------------------------------
-// Function:	DSetCreatPropList::setFilter
-///\brief	Adds a filter to the filter pipeline
-///\param	filter_id - IN: Filter to add
-///\param	flags     - IN: Specifies general properties of the filter
-///\param	cd_nelmts - IN: Number of elements in cd_values
-///\param	cd_values - IN: Auxiliary data for the filter
-///\exception	H5::PropListIException
+///             \li \c H5D_FILL_VALUE_UNDEFINED    =0,
+///             \li \c H5D_FILL_VALUE_DEFAULT      =1,
+///             \li \c H5D_FILL_VALUE_USER_DEFINED =2
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+H5D_fill_value_t
+DSetCreatPropList::isFillValueDefined() const
+{
+    H5D_fill_value_t status;
+    herr_t           ret_value = H5Pfill_value_defined(id, &status);
+    if (ret_value < 0) {
+        throw PropListIException("DSetCreatPropList::isFillValueDefined",
+                                 "H5Pfill_value_defined returned H5D_FILL_VALUE_ERROR (-1)");
+    }
+    else
+        return (status);
+}
+
+//--------------------------------------------------------------------------
+// Function:    DSetCreatPropList::setFilter
+///\brief       Adds a filter to the filter pipeline
+///\param       filter_id - IN: Filter to add
+///\param       flags     - IN: Specifies general properties of the filter
+///\param       cd_nelmts - IN: Number of elements in cd_values
+///\param       cd_values - IN: Auxiliary data for the filter
+///\exception   H5::PropListIException
 ///\par Description
-///		The \a flags argument is a bit vector of the field:
-///		\c H5Z_FLAG_OPTIONAL(0x0001)
+///             The \a flags argument is a bit vector of the field:
+///             \c H5Z_FLAG_OPTIONAL(0x0001)
 ///\par
-///		If this bit is set then the filter is optional.  If the filter
-///		fails during a \c DataSet::write() operation then the filter
-///		is just excluded from the pipeline for the chunk for which it
-///		failed; the filter will not participate in the pipeline
-///		during a \c DataSet::read() of the chunk.  If this bit is clear
-///		and the filter fails then the entire I/O operation fails.
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-void DSetCreatPropList::setFilter( H5Z_filter_t filter_id, unsigned int flags,
-	size_t cd_nelmts, const unsigned int cd_values[] ) const
-{
-   herr_t ret_value = H5Pset_filter( id, filter_id, flags, cd_nelmts, cd_values );
-   if( ret_value < 0 )
-   {
-      throw PropListIException("DSetCreatPropList::setFilter",
-                "H5Pset_filter failed");
-   }
-}
-
-//--------------------------------------------------------------------------
-// Function:	DSetCreatPropList::removeFilter
-///\brief	Removes one or more filters
-///\param	filter_id - IN: Filter to remove
-///\exception	H5::PropListIException
+///             If this bit is set then the filter is optional.  If the filter
+///             fails during a \c DataSet::write() operation then the filter
+///             is just excluded from the pipeline for the chunk for which it
+///             failed; the filter will not participate in the pipeline
+///             during a \c DataSet::read() of the chunk.  If this bit is clear
+///             and the filter fails then the entire I/O operation fails.
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+void
+DSetCreatPropList::setFilter(H5Z_filter_t filter_id, unsigned int flags, size_t cd_nelmts,
+                             const unsigned int cd_values[]) const
+{
+    herr_t ret_value = H5Pset_filter(id, filter_id, flags, cd_nelmts, cd_values);
+    if (ret_value < 0) {
+        throw PropListIException("DSetCreatPropList::setFilter", "H5Pset_filter failed");
+    }
+}
+
+//--------------------------------------------------------------------------
+// Function:    DSetCreatPropList::removeFilter
+///\brief       Removes one or more filters
+///\param       filter_id - IN: Filter to remove
+///\exception   H5::PropListIException
 ///\par Description
-///		Deletes a filter from the dataset creation property list;
-///		deletes all filters if \a filter_id is \c H5Z_FILTER_NONE.
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-void DSetCreatPropList::removeFilter(H5Z_filter_t filter_id) const
-{
-   herr_t ret_value = H5Premove_filter( id, filter_id);
-   if( ret_value < 0 )
-   {
-      throw PropListIException("DSetCreatPropList::removeFilter",
-                "H5Premove_filter failed");
-   }
-}
-
-//--------------------------------------------------------------------------
-// Function:	DSetCreatPropList::getNfilters
-///\brief	Returns the number of filters in the pipeline
-///\return	Number of filters
-///\exception	H5::PropListIException
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-int DSetCreatPropList::getNfilters() const
-{
-   int num_filters = H5Pget_nfilters( id );
-   if( num_filters < 0 )
-   {
-      throw PropListIException("DSetCreatPropList::getNfilters",
-                "H5Pget_nfilters returned negative number of filters");
-   }
-   else
-      return( num_filters );
-}
-
-//--------------------------------------------------------------------------
-// Function:	DSetCreatPropList::getFilter
-///\brief	Returns information about a filter in a pipeline
-///\param	filter_number  - IN: Filter to get, range [0..N-1], where
-///				     N is returned by H5Pget_nfilters()
-///\param	flags         - OUT: General properties of the filter
-///\param	cd_nelmts  - IN/OUT: Number of elements in \a cd_values /Number
-///				     of values defined by the filter
-///\param	cd_values     - OUT: Array to hold the data; allocated by the user
-///\param	namelen       - IN: Length of \a name
-///\param	name          - OUT: Name of the filter
-///\param	filter_config - OUT: Flags indicating whether filter can encode/decode
-///\return	Filter id
-///\exception	H5::PropListIException
+///             Deletes a filter from the dataset creation property list;
+///             deletes all filters if \a filter_id is \c H5Z_FILTER_NONE.
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+void
+DSetCreatPropList::removeFilter(H5Z_filter_t filter_id) const
+{
+    herr_t ret_value = H5Premove_filter(id, filter_id);
+    if (ret_value < 0) {
+        throw PropListIException("DSetCreatPropList::removeFilter", "H5Premove_filter failed");
+    }
+}
+
+//--------------------------------------------------------------------------
+// Function:    DSetCreatPropList::getNfilters
+///\brief       Returns the number of filters in the pipeline
+///\return      Number of filters
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+int
+DSetCreatPropList::getNfilters() const
+{
+    int num_filters = H5Pget_nfilters(id);
+    if (num_filters < 0) {
+        throw PropListIException("DSetCreatPropList::getNfilters",
+                                 "H5Pget_nfilters returned negative number of filters");
+    }
+    else
+        return (num_filters);
+}
+
+//--------------------------------------------------------------------------
+// Function:    DSetCreatPropList::getFilter
+///\brief       Returns information about a filter in a pipeline
+///\param       filter_number  - IN: Filter to get, range [0..N-1], where
+///                                  N is returned by H5Pget_nfilters()
+///\param       flags         - OUT: General properties of the filter
+///\param       cd_nelmts  - IN/OUT: Number of elements in \a cd_values /Number
+///                                  of values defined by the filter
+///\param       cd_values     - OUT: Array to hold the data; allocated by the user
+///\param       namelen       - IN: Length of \a name
+///\param       name          - OUT: Name of the filter
+///\param       filter_config - OUT: Flags indicating whether filter can encode/decode
+///\return      Filter id
+///\exception   H5::PropListIException
 ///\par Description
-///		Failure occurs when \a filter_number is out of range.
-//		Note: the first argument was mistakenly typed as int instead
-//		of unsigned int, but for backward compatibility, it cannot be
-//		changed. -BMR (2014/04/15)
-//--------------------------------------------------------------------------
-H5Z_filter_t DSetCreatPropList::getFilter(int filter_number,
-	unsigned int &flags, size_t &cd_nelmts, unsigned int* cd_values,
-	size_t namelen, char name[], unsigned int& filter_config) const
-{
-   H5Z_filter_t filter_id;
-   filter_id = H5Pget_filter2(id, filter_number, &flags, &cd_nelmts,
-				cd_values, namelen, name, &filter_config);
-   if( filter_id == H5Z_FILTER_ERROR )
-      throw PropListIException("DSetCreatPropList::getFilter",
-                "H5Pget_filter2 returned H5Z_FILTER_ERROR");
-   else
-      return(filter_id);
-}
-
-//--------------------------------------------------------------------------
-// Function:	DSetCreatPropList::getFilterById
-///\brief	Returns information about a filter in a pipeline given the
-///		filter id
-///\param	filter_id -      IN: Filter to get
-///\param	flags     -     OUT: General properties of the filter
-///\param	cd_nelmts -  IN/OUT: Number of elements in \a cd_values /Number
-///				     of values defined by the filter
-///\param	cd_values -     OUT: Array to hold the data; allocated by the user
-///\param	namelen   -      IN: Length of \a name
-///\param	name      -     OUT: Name of the filter
-///\param	filter_config - OUT: Flags indicating whether filter can encode/decode
-///\exception	H5::PropListIException
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-void DSetCreatPropList::getFilterById(H5Z_filter_t filter_id,
-	unsigned int &flags, size_t &cd_nelmts, unsigned int* cd_values,
-	size_t namelen, char name[], unsigned int &filter_config) const
-{
-   herr_t ret_value = H5Pget_filter_by_id2(id, filter_id, &flags, &cd_nelmts,
-				cd_values, namelen, name, &filter_config);
-   if (ret_value < 0)
-      throw PropListIException("DSetCreatPropList::getFilterById",
-                "H5Pget_filter_by_id2 failed");
-}
-
-//--------------------------------------------------------------------------
-// Function:	DSetCreatPropList::modifyFilter
-///\brief	Modifies the specified filter
-///\param	filter_id -  IN: Filter to get
-///\param	flags     - OUT: General properties of the filter
-///\param	cd_nelmts -  IN: Number of elements in \a cd_values
-///		        \n  OUT: Number of values defined by the filter
-///\param	cd_values - OUT: Array to hold the data; allocated by the user
-///\exception	H5::PropListIException
+///             Failure occurs when \a filter_number is out of range.
+//              Note: the first argument was mistakenly typed as int instead
+//              of unsigned int, but for backward compatibility, it cannot be
+//              changed. -BMR (2014/04/15)
+//--------------------------------------------------------------------------
+H5Z_filter_t
+DSetCreatPropList::getFilter(int filter_number, unsigned int &flags, size_t &cd_nelmts,
+                             unsigned int *cd_values, size_t namelen, char name[],
+                             unsigned int &filter_config) const
+{
+    if (filter_number < 0)
+        throw PropListIException("DSetCreatPropList::getFilter", "filter_number can't be negative");
+
+    H5Z_filter_t filter_id = H5Pget_filter2(id, static_cast<unsigned>(filter_number), &flags, &cd_nelmts,
+                                            cd_values, namelen, name, &filter_config);
+    if (filter_id == H5Z_FILTER_ERROR)
+        throw PropListIException("DSetCreatPropList::getFilter", "H5Pget_filter2 returned H5Z_FILTER_ERROR");
+    else
+        return filter_id;
+}
+
+//--------------------------------------------------------------------------
+// Function:    DSetCreatPropList::getFilterById
+///\brief       Returns information about a filter in a pipeline given the
+///             filter id
+///\param       filter_id -      IN: Filter to get
+///\param       flags     -     OUT: General properties of the filter
+///\param       cd_nelmts -  IN/OUT: Number of elements in \a cd_values /Number
+///                                  of values defined by the filter
+///\param       cd_values -     OUT: Array to hold the data; allocated by the user
+///\param       namelen   -      IN: Length of \a name
+///\param       name      -     OUT: Name of the filter
+///\param       filter_config - OUT: Flags indicating whether filter can encode/decode
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+void
+DSetCreatPropList::getFilterById(H5Z_filter_t filter_id, unsigned int &flags, size_t &cd_nelmts,
+                                 unsigned int *cd_values, size_t namelen, char name[],
+                                 unsigned int &filter_config) const
+{
+    herr_t ret_value =
+        H5Pget_filter_by_id2(id, filter_id, &flags, &cd_nelmts, cd_values, namelen, name, &filter_config);
+    if (ret_value < 0)
+        throw PropListIException("DSetCreatPropList::getFilterById", "H5Pget_filter_by_id2 failed");
+}
+
+//--------------------------------------------------------------------------
+// Function:    DSetCreatPropList::modifyFilter
+///\brief       Modifies the specified filter
+///\param       filter_id -  IN: Filter to get
+///\param       flags     - OUT: General properties of the filter
+///\param       cd_nelmts -  IN: Number of elements in \a cd_values
+///                     \n  OUT: Number of values defined by the filter
+///\param       cd_values - OUT: Array to hold the data; allocated by the user
+///\exception   H5::PropListIException
 ///\par Description
-///		The \a flags argument is a bit vector of the field:
-///		\c H5Z_FLAG_OPTIONAL(0x0001)
+///             The \a flags argument is a bit vector of the field:
+///             \c H5Z_FLAG_OPTIONAL(0x0001)
 ///\par
-///		If this bit is set then the filter is optional.  If the filter
-///		fails during a DataSet::write() operation then the filter
-///		is just excluded from the pipeline for the chunk for which it
-///		failed; the filter will not participate in the pipeline
-///		during a DataSet::read() of the chunk.  If this bit is clear
-///		and the filter fails then the entire I/O operation fails.
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-void DSetCreatPropList::modifyFilter( H5Z_filter_t filter_id, unsigned int
-	flags, size_t cd_nelmts, const unsigned int cd_values[] ) const
-{
-   herr_t ret_value = H5Pmodify_filter(id, filter_id, flags, cd_nelmts, cd_values);
-   if( ret_value < 0 )
-   {
-      throw PropListIException("DSetCreatPropList::modifyFilter",
-                "H5Pmodify_filter failed");
-   }
-}
-
-//--------------------------------------------------------------------------
-// Function:	DSetCreatPropList::allFiltersAvail
-///\brief	Queries whether all the filters set in this property list
-///		are available currently.
-///\return	true if all filters available, and false if one or more
-///		filters not currently available
-///\exception	H5::PropListIException
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-bool DSetCreatPropList::allFiltersAvail()
-{
-   htri_t ret_value = H5Pall_filters_avail(id);
-   if( ret_value > 0 )
-      return true;
-   else if( ret_value == 0 )
-      return false;
-   else // Raise exception when H5Pall_filters_avail returns a negative value
-   {
-      throw PropListIException("DSetCreatPropList::allFiltersAvail", "H5Pall_filters_avail returned negative value");
-   }
-}
-
-//--------------------------------------------------------------------------
-// Function:	DSetCreatPropList::setShuffle
-///\brief	Sets method of the shuffle filter
+///             If this bit is set then the filter is optional.  If the filter
+///             fails during a DataSet::write() operation then the filter
+///             is just excluded from the pipeline for the chunk for which it
+///             failed; the filter will not participate in the pipeline
+///             during a DataSet::read() of the chunk.  If this bit is clear
+///             and the filter fails then the entire I/O operation fails.
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+void
+DSetCreatPropList::modifyFilter(H5Z_filter_t filter_id, unsigned int flags, size_t cd_nelmts,
+                                const unsigned int cd_values[]) const
+{
+    herr_t ret_value = H5Pmodify_filter(id, filter_id, flags, cd_nelmts, cd_values);
+    if (ret_value < 0) {
+        throw PropListIException("DSetCreatPropList::modifyFilter", "H5Pmodify_filter failed");
+    }
+}
+
+//--------------------------------------------------------------------------
+// Function:    DSetCreatPropList::allFiltersAvail
+///\brief       Queries whether all the filters set in this property list
+///             are available currently.
+///\return      true if all filters available, and false if one or more
+///             filters not currently available
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+bool
+DSetCreatPropList::allFiltersAvail() const
+{
+    htri_t ret_value = H5Pall_filters_avail(id);
+    if (ret_value > 0)
+        return true;
+    else if (ret_value == 0)
+        return false;
+    else // Raise exception when H5Pall_filters_avail returns a negative value
+    {
+        throw PropListIException("DSetCreatPropList::allFiltersAvail",
+                                 "H5Pall_filters_avail returned negative value");
+    }
+}
+
+//--------------------------------------------------------------------------
+// Function:    DSetCreatPropList::setShuffle
+///\brief       Sets method of the shuffle filter
 ///
-///\exception	H5::PropListIException
+///\exception   H5::PropListIException
 ///\par Description
-///		Please refer to the Reference Manual of \c H5Pset_shuffle for
-///		details.
-/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-SetShuffle
-// Programmer	Binh-Minh Ribler - 2000
+///             For information, please refer to the H5Pset_shuffle API in
+///             the HDF5 C Reference Manual.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void DSetCreatPropList::setShuffle() const
+void
+DSetCreatPropList::setShuffle() const
 {
-   herr_t ret_value = H5Pset_shuffle(id);
-   if( ret_value < 0 )
-   {
-      throw PropListIException("DSetCreatPropList::setShuffle",
-                "H5Pset_shuffle failed");
-   }
+    herr_t ret_value = H5Pset_shuffle(id);
+    if (ret_value < 0) {
+        throw PropListIException("DSetCreatPropList::setShuffle", "H5Pset_shuffle failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DSetCreatPropList::getAllocTime
-///\brief	Get space allocation time for this property.
-///\return	Space allocation time.
-///\exception	H5::PropListIException
+// Function:    DSetCreatPropList::getAllocTime
+///\brief       Get space allocation time for this property.
+///\return      Space allocation time.
+///\exception   H5::PropListIException
 ///\par Description
-///		The values of space allocation time can be one of the
-///		followings:
-///		\li \c H5D_ALLOC_TIME_DEFAULT
-///		\li \c H5D_ALLOC_TIME_EARLY
-///		\li \c H5D_ALLOC_TIME_LATE
-///		\li \c H5D_ALLOC_TIME_INCR
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-H5D_alloc_time_t DSetCreatPropList::getAllocTime()
-{
-   H5D_alloc_time_t alloc_time;
-   herr_t ret_value = H5Pget_alloc_time(id, &alloc_time);
-   if( ret_value < 0 )
-   {
-      throw PropListIException("DSetCreatPropList::getAllocTime",
-                "H5Pget_alloc_time failed");
-   }
-   else
-      return (alloc_time);
-}
-
-//--------------------------------------------------------------------------
-// Function:	DSetCreatPropList::getFillTime
-///\brief	Gets fill value writing time.
-///\return	Fill value writing time
-///\exception	H5::PropListIException
+///             The values of space allocation time can be one of the
+///             following:
+///             \li \c H5D_ALLOC_TIME_DEFAULT
+///             \li \c H5D_ALLOC_TIME_EARLY
+///             \li \c H5D_ALLOC_TIME_LATE
+///             \li \c H5D_ALLOC_TIME_INCR
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+H5D_alloc_time_t
+DSetCreatPropList::getAllocTime() const
+{
+    H5D_alloc_time_t alloc_time;
+    herr_t           ret_value = H5Pget_alloc_time(id, &alloc_time);
+    if (ret_value < 0) {
+        throw PropListIException("DSetCreatPropList::getAllocTime", "H5Pget_alloc_time failed");
+    }
+    else
+        return (alloc_time);
+}
+
+//--------------------------------------------------------------------------
+// Function:    DSetCreatPropList::getFillTime
+///\brief       Gets fill value writing time.
+///\return      Fill value writing time
+///\exception   H5::PropListIException
 ///\par Description
-///		Valid values for fill value writing time include
-///		\li \c H5D_FILL_TIME_NEVER
-///		\li \c H5D_FILL_TIME_ALLOC.
-// Programmer	Binh-Minh Ribler - 2000
+///             Valid values for fill value writing time include
+///             \li \c H5D_FILL_TIME_NEVER
+///             \li \c H5D_FILL_TIME_ALLOC.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-H5D_fill_time_t DSetCreatPropList::getFillTime()
+H5D_fill_time_t
+DSetCreatPropList::getFillTime() const
 {
-   H5D_fill_time_t fill_time;
-   herr_t ret_value = H5Pget_fill_time(id, &fill_time);
-   if( ret_value < 0 )
-   {
-      throw PropListIException("DSetCreatPropList::getFillTime",
-                "H5Pget_fill_time failed");
-   }
-   else
-      return (fill_time);
+    H5D_fill_time_t fill_time;
+    herr_t          ret_value = H5Pget_fill_time(id, &fill_time);
+    if (ret_value < 0) {
+        throw PropListIException("DSetCreatPropList::getFillTime", "H5Pget_fill_time failed");
+    }
+    else
+        return (fill_time);
 }
 
 //--------------------------------------------------------------------------
-// Function:	DSetCreatPropList::setAllocTime
-///\brief	Sets space allocation time for dataset during creation.
-///\param	alloc_time -  IN: Allocation time
-///\exception	H5::PropListIException
+// Function:    DSetCreatPropList::setAllocTime
+///\brief       Sets space allocation time for dataset during creation.
+///\param       alloc_time -  IN: Allocation time
+///\exception   H5::PropListIException
 ///\par Description
-///		Valid values for space allocation time include:
-///		\li \c H5D_ALLOC_TIME_DEFAULT
-///		\li \c H5D_ALLOC_TIME_EARLY
-///		\li \c H5D_ALLOC_TIME_LATE
-///		\li \c H5D_ALLOC_TIME_INCR
-// Programmer	Binh-Minh Ribler - 2000
+///             Valid values for space allocation time include:
+///             \li \c H5D_ALLOC_TIME_DEFAULT
+///             \li \c H5D_ALLOC_TIME_EARLY
+///             \li \c H5D_ALLOC_TIME_LATE
+///             \li \c H5D_ALLOC_TIME_INCR
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void DSetCreatPropList::setAllocTime(H5D_alloc_time_t alloc_time)
+void
+DSetCreatPropList::setAllocTime(H5D_alloc_time_t alloc_time) const
 {
-   herr_t ret_value = H5Pset_alloc_time(id, alloc_time);
-   if( ret_value < 0 )
-   {
-      throw PropListIException("DSetCreatPropList::setAllocTime",
-                "H5Pset_alloc_time failed");
-   }
+    herr_t ret_value = H5Pset_alloc_time(id, alloc_time);
+    if (ret_value < 0) {
+        throw PropListIException("DSetCreatPropList::setAllocTime", "H5Pset_alloc_time failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DSetCreatPropList::setFillTime
-///\brief	Sets fill value writing time for dataset.
-///\return	Fill value writing time
-///\exception	H5::PropListIException
+// Function:    DSetCreatPropList::setFillTime
+///\brief       Sets fill value writing time for dataset.
+///\return      Fill value writing time
+///\exception   H5::PropListIException
 ///\par Description
-///		Valid values for fill value writing time include
-///		\li \c H5D_FILL_TIME_NEVER
-///		\li \c H5D_FILL_TIME_ALLOC.
-// Programmer	Binh-Minh Ribler - 2000
+///             Valid values for fill value writing time include
+///             \li \c H5D_FILL_TIME_NEVER
+///             \li \c H5D_FILL_TIME_ALLOC.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void DSetCreatPropList::setFillTime(H5D_fill_time_t fill_time)
+void
+DSetCreatPropList::setFillTime(H5D_fill_time_t fill_time) const
 {
-   herr_t ret_value = H5Pset_fill_time(id, fill_time);
-   if( ret_value < 0 )
-   {
-      throw PropListIException("DSetCreatPropList::setFillTime",
-                "H5Pset_fill_time failed");
-   }
+    herr_t ret_value = H5Pset_fill_time(id, fill_time);
+    if (ret_value < 0) {
+        throw PropListIException("DSetCreatPropList::setFillTime", "H5Pset_fill_time failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DSetCreatPropList::setFletcher32
-///\brief	Sets Fletcher32 checksum of EDC for this property list.
+// Function:    DSetCreatPropList::setFletcher32
+///\brief       Sets Fletcher32 checksum of EDC for this property list.
 ///
-///\exception	H5::PropListIException
-// Programmer	Binh-Minh Ribler - 2000
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+void
+DSetCreatPropList::setFletcher32() const
+{
+    herr_t ret_value = H5Pset_fletcher32(id);
+    if (ret_value < 0) {
+        throw PropListIException("DSetCreatPropList::setFletcher32", "H5Pset_fletcher32 failed");
+    }
+}
+
+//--------------------------------------------------------------------------
+// Function:    DSetCreatPropList::setExternal
+///\brief       Adds an external file to the list of external files
+///\param       name   - IN: Name of the external file
+///\param       offset - IN: Location where the data starts in the file
+///\param       size   - IN: Number of bytes reserved in the file for the data
+///\exception   H5::PropListIException
+///\par Description
+///             If a dataset is split across multiple files then the files
+///             should be defined in order. The total size of the dataset is
+///             the sum of the \a size arguments for all the external files.  If
+///             the total size is larger than the size of a dataset then the
+///             dataset can be extended (provided the data space also allows
+///             the extending).
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+void
+DSetCreatPropList::setExternal(const char *name, off_t offset, hsize_t size) const
+{
+    herr_t ret_value = H5Pset_external(id, name, offset, size);
+    if (ret_value < 0) {
+        throw PropListIException("DSetCreatPropList::setExternal", "H5Pset_external failed");
+    }
+}
+
+//--------------------------------------------------------------------------
+// Function:    DSetCreatPropList::getExternalCount
+///\brief       Returns the number of external files for a dataset
+///\return      Number of external files
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+int
+DSetCreatPropList::getExternalCount() const
+{
+    int num_ext_files = H5Pget_external_count(id);
+    if (num_ext_files < 0) {
+        throw PropListIException("DSetCreatPropList::getExternalCount",
+                                 "H5Pget_external_count returns negative number of external files");
+    }
+    else
+        return (num_ext_files);
+}
+
 //--------------------------------------------------------------------------
-void DSetCreatPropList::setFletcher32() const
+// Function:    DSetCreatPropList::getExternal
+///\brief       Returns information about an external file
+///\param       idx    - IN: Index of the external file, ranges [0-(N-1)] and
+///                             returned by getExternalCount()
+///\param       name_size - IN: Maximum length of \a name
+///\param       name   - OUT: Name of the external file
+///\param       offset - OUT: Location to return an offset value
+///\param       size   - OUT: Location to return the size of the external file data
+///\exception   H5::PropListIException
+///\par Description
+///             The parameter \a idx ranges [0..N-1] where N is returned by
+///             getExternalCount().  At most \a name_size characters are copied
+///             into the name array. If the external file name is longer than
+///             name_size with the null terminator, the return value is not
+///             null terminated (similar to strncpy()).
+///             If \a name_size is zero or \a name is a null pointer, the
+///             external file name will not be returned.  If \a offset or
+///             \a size are null pointers then the corresponding information
+///             will not be returned.
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+void
+DSetCreatPropList::getExternal(unsigned idx, size_t name_size, char *name, off_t &offset, hsize_t &size) const
 {
-   herr_t ret_value = H5Pset_fletcher32(id);
-   if( ret_value < 0 )
-   {
-      throw PropListIException("DSetCreatPropList::setFletcher32",
-                "H5Pset_fletcher32 failed");
-   }
+    herr_t ret_value = H5Pget_external(id, idx, name_size, name, &offset, &size);
+    if (ret_value < 0) {
+        throw PropListIException("DSetCreatPropList::getExternal", "H5Pget_external failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DSetCreatPropList::setExternal
-///\brief	Adds an external file to the list of external files
-///\param	name   - IN: Name of the external file
-///\param	offset - IN: Location where the data starts in the file
-///\param	size   - IN: Number of bytes reserved in the file for the data
-///\exception	H5::PropListIException
+// Function:    DSetCreatPropList::setVirtual
+///\brief       Maps elements of a virtual dataset to elements of the source
+///             dataset.
+///\param       vspace     - IN: Dataspace the virtual dataset, possibly an
+///                             unlimited selection
+///\param       src_fname  - IN: Name of the HDF5 file where the source dataset
+///                             is located (\a char*)
+///\param       src_dsname - IN: Path to the dataset in the file specified by
+///                             \a src_file_name (\a char*)
+///\param       sspace     - IN: Dataspace with a selection applied, possibly
+///                             an unlimited selection
+///\exception   H5::PropListIException
 ///\par Description
-///		If a dataset is splitted across multiple files then the files
-///		should be defined in order. The total size of the dataset is
-///		the sum of the \a size arguments for all the external files.  If
-///		the total size is larger than the size of a dataset then the
-///		dataset can be extended (provided the data space also allows
-///		the extending).
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-void DSetCreatPropList::setExternal( const char* name, off_t offset, hsize_t size ) const
-{
-   herr_t ret_value = H5Pset_external( id, name, offset, size );
-   if( ret_value < 0 )
-   {
-      throw PropListIException("DSetCreatPropList::setExternal",
-                "H5Pset_external failed");
-   }
-}
-
-//--------------------------------------------------------------------------
-// Function:	DSetCreatPropList::getExternalCount
-///\brief	Returns the number of external files for a dataset
-///\return	Number of external files
-///\exception	H5::PropListIException
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-int DSetCreatPropList::getExternalCount() const
-{
-   int num_ext_files = H5Pget_external_count( id );
-   if( num_ext_files < 0 )
-   {
-      throw PropListIException("DSetCreatPropList::getExternalCount",
-                "H5Pget_external_count returns negative number of external files");
-   }
-   else
-      return( num_ext_files );
-}
-
-//--------------------------------------------------------------------------
-// Function:	DSetCreatPropList::getExternal
-///\brief	Returns information about an external file
-///\param	idx    - IN: Index of the external file, ranges [0-(N-1)] and
-///		                returned by getExternalCount()
-///\param	name_size - IN: Maximum length of \a name
-///\param	name   - OUT: Name of the external file
-///\param	offset - OUT: Location to return an offset value
-///\param	size   - OUT: Location to return the size of the external file data
-///\exception	H5::PropListIException
+///             For information, please refer to the H5Pset_virtual API in
+///             the HDF5 C Reference Manual.
+// Programmer   Binh-Minh Ribler - Mar, 2017
+//--------------------------------------------------------------------------
+void
+DSetCreatPropList::setVirtual(const DataSpace &vspace, const char *src_fname, const char *src_dsname,
+                              const DataSpace &sspace) const
+{
+    herr_t ret_value = H5Pset_virtual(id, vspace.getId(), src_fname, src_dsname, sspace.getId());
+    if (ret_value < 0) {
+        throw PropListIException("DSetCreatPropList::setVirtual", "H5Pset_virtual failed");
+    }
+}
+
+//--------------------------------------------------------------------------
+// Function:    DSetCreatPropList::setVirtual
+///\brief       Maps elements of a virtual dataset to elements of the source
+///             dataset.
+///\param       vspace     - IN: Dataspace the virtual dataset, possibly an
+///                             unlimited selection
+///\param       src_fname  - IN: Name of the HDF5 file where the source dataset
+///                             is located (\a H5std_string)
+///\param       src_dsname - IN: Path to the dataset in the file specified by
+///                             \a src_file_name (\a H5std_string)
+///\param       sspace     - IN: Dataspace with a selection applied, possibly
+///                             an unlimited selection
+///\exception   H5::PropListIException
 ///\par Description
-///		The parameter \a idx ranges [0..N-1] where N is returned by
-///		getExternalCount().  At most \a name_size characters are copied
-///		into the name array. If the external file name is longer than
-///		name_size with the null terminator, the return value is not
-///		null terminated (similar to strncpy()).
-///		If \a name_size is zero or \a name is a null pointer, the
-///		external file name will not be returned.  If \a offset or
-///		\a size are null pointers then the corresponding information
-///		will not be returned.
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-void DSetCreatPropList::getExternal( unsigned idx, size_t name_size, char* name, off_t& offset, hsize_t& size ) const
-{
-   herr_t ret_value = H5Pget_external( id, idx, name_size, name, &offset, &size );
-   if( ret_value < 0 )
-   {
-      throw PropListIException("DSetCreatPropList::getExternal",
-                "H5Pget_external failed");
-   }
-}
-
-//--------------------------------------------------------------------------
-// Function:	DSetCreatPropList destructor
-///\brief	Noop destructor.
+///             For information, please refer to the H5Pset_virtual API in
+///             the HDF5 C Reference Manual.
+// Programmer   Binh-Minh Ribler - Mar, 2017
+//--------------------------------------------------------------------------
+void
+DSetCreatPropList::setVirtual(const DataSpace &vspace, const H5std_string src_fname,
+                              const H5std_string src_dsname, const DataSpace &sspace) const
+{
+    setVirtual(vspace, src_fname.c_str(), src_dsname.c_str(), sspace);
+}
+
+//--------------------------------------------------------------------------
+// Function:    DSetCreatPropList destructor
+///\brief       Noop destructor.
 // Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-DSetCreatPropList::~DSetCreatPropList () {}
+DSetCreatPropList::~DSetCreatPropList()
+{
+}
 
-#ifndef H5_NO_NAMESPACE
-} // end namespace
-#endif
+} // namespace H5
diff --git a/c++/src/H5DcreatProp.h b/c++/src/H5DcreatProp.h
index 7434b9b..94ecbb5 100644
--- a/c++/src/H5DcreatProp.h
+++ b/c++/src/H5DcreatProp.h
@@ -1,130 +1,161 @@
 // C++ informative line for the emacs editor: -*- C++ -*-
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5DSCreatPropList_H
-#define __H5DSCreatPropList_H
+#ifndef H5DSCreatPropList_H
+#define H5DSCreatPropList_H
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#endif
+
+// Class forwarding
+class DataType;
+class DataSpace;
 
 /*! \class DSetCreatPropList
-    \brief Class DSetCreatPropList represents the dataset creation property
-    list.
+    \brief Class DSetCreatPropList inherits from ObjCreatPropList and provides
+    wrappers for the HDF5 dataset creation property functions.
 */
-class H5_DLLCPP DSetCreatPropList : public PropList {
-   public:
-	// Default dataset creation property list.
-	static const DSetCreatPropList DEFAULT;
+//  Inheritance: ObjCreatPropList -> PropList -> IdComponent
+class H5_DLLCPP DSetCreatPropList : public ObjCreatPropList {
+  public:
+    ///\brief Default dataset creation property list.
+    static const DSetCreatPropList &DEFAULT;
+
+    // Creates a dataset creation property list.
+    DSetCreatPropList();
+
+    // Queries whether all the filters set in this property list are
+    // available currently.
+    bool allFiltersAvail() const;
+
+    // Get space allocation time for this property.
+    H5D_alloc_time_t getAllocTime() const;
+
+    // Set space allocation time for dataset during creation.
+    void setAllocTime(H5D_alloc_time_t alloc_time) const;
+
+    // Retrieves the size of the chunks used to store a chunked layout dataset.
+    int getChunk(int max_ndims, hsize_t *dim) const;
+
+    // Sets the size of the chunks used to store a chunked layout dataset.
+    void setChunk(int ndims, const hsize_t *dim) const;
+
+    // Returns information about an external file.
+    void getExternal(unsigned idx, size_t name_size, char *name, off_t &offset, hsize_t &size) const;
+
+    // Returns the number of external files for a dataset.
+    int getExternalCount() const;
+
+    // Gets fill value writing time.
+    H5D_fill_time_t getFillTime() const;
 
-	// Creates a dataset creation property list.
-	DSetCreatPropList();
+    // Sets fill value writing time for dataset.
+    void setFillTime(H5D_fill_time_t fill_time) const;
 
-	// Queries whether all the filters set in this property list are
-	// available currently.
-	bool allFiltersAvail();
+    // Retrieves a dataset fill value.
+    void getFillValue(const DataType &fvalue_type, void *value) const;
 
-	// Get space allocation time for this property.
-	H5D_alloc_time_t getAllocTime();
+    // Sets a dataset fill value.
+    void setFillValue(const DataType &fvalue_type, const void *value) const;
 
-	// Set space allocation time for dataset during creation.
-	void setAllocTime(H5D_alloc_time_t alloc_time);
+    // Returns information about a filter in a pipeline.
+    H5Z_filter_t getFilter(int filter_number, unsigned int &flags, size_t &cd_nelmts, unsigned int *cd_values,
+                           size_t namelen, char name[], unsigned int &filter_config) const;
 
-	// Retrieves the size of the chunks used to store a chunked layout dataset.
-	int getChunk( int max_ndims, hsize_t* dim ) const;
+    // Returns information about a filter in a pipeline given the filter id.
+    void getFilterById(H5Z_filter_t filter_id, unsigned int &flags, size_t &cd_nelmts,
+                       unsigned int *cd_values, size_t namelen, char name[],
+                       unsigned int &filter_config) const;
 
-	// Sets the size of the chunks used to store a chunked layout dataset.
-	void setChunk( int ndims, const hsize_t* dim ) const;
+    // Gets the layout of the raw data storage of the data that uses this
+    // property list.
+    H5D_layout_t getLayout() const;
 
-	// Returns information about an external file.
-	void getExternal( unsigned idx, size_t name_size, char* name, off_t& offset, hsize_t& size ) const;
+    // Sets the type of storage used to store the raw data for the
+    // dataset that uses this property list.
+    void setLayout(H5D_layout_t layout) const;
 
-	// Returns the number of external files for a dataset.
-	int getExternalCount() const;
+    // Returns the number of filters in the pipeline.
+    int getNfilters() const;
 
-	// Gets fill value writing time.
-	H5D_fill_time_t getFillTime();
+    // Checks if fill value has been defined for this property.
+    H5D_fill_value_t isFillValueDefined() const;
 
-	// Sets fill value writing time for dataset.
-	void setFillTime(H5D_fill_time_t fill_time);
+    // Modifies the specified filter.
+    void modifyFilter(H5Z_filter_t filter_id, unsigned int flags, size_t cd_nelmts,
+                      const unsigned int cd_values[]) const;
 
-	// Retrieves a dataset fill value.
-	void getFillValue( const DataType& fvalue_type, void* value ) const;
+    // Remove one or all filters from the filter pipeline.
+    void removeFilter(H5Z_filter_t filter_id) const;
 
-	// Sets a dataset fill value.
-	void setFillValue( const DataType& fvalue_type, const void* value ) const;
+    // Sets compression method and compression level.
+    void setDeflate(int level) const;
 
-	// Returns information about a filter in a pipeline.
-	H5Z_filter_t getFilter(int filter_number, unsigned int& flags, size_t& cd_nelmts, unsigned int* cd_values, size_t namelen, char name[], unsigned int &filter_config) const;
+    // Adds an external file to the list of external files.
+    void setExternal(const char *name, off_t offset, hsize_t size) const;
 
-	// Returns information about a filter in a pipeline given the filter id.
-	void getFilterById(H5Z_filter_t filter_id, unsigned int &flags, size_t &cd_nelmts, unsigned int* cd_values, size_t namelen, char name[], unsigned int &filter_config) const;
+    // Adds a filter to the filter pipeline.
+    void setFilter(H5Z_filter_t filter, unsigned int flags = 0, size_t cd_nelmts = 0,
+                   const unsigned int cd_values[] = NULL) const;
 
-	// Gets the layout of the raw data storage of the data that uses this
-	// property list.
-	H5D_layout_t getLayout() const;
+    // Sets Fletcher32 checksum of EDC for this property list.
+    void setFletcher32() const;
 
-	// Sets the type of storage used to store the raw data for the
-	// dataset that uses this property list.
-	void setLayout(H5D_layout_t layout) const;
+    // Sets method of the shuffle filter.
+    void setShuffle() const;
 
-	// Returns the number of filters in the pipeline.
-	int getNfilters() const;
+    // Sets SZIP compression method.
+    void setSzip(unsigned int options_mask, unsigned int pixels_per_block) const;
 
-	// Checks if fill value has been defined for this property.
-	H5D_fill_value_t isFillValueDefined();
+    // Sets N-bit compression method.
+    void setNbit() const;
 
-	// Modifies the specified filter.
-	void modifyFilter( H5Z_filter_t filter_id, unsigned int flags, size_t cd_nelmts, const unsigned int cd_values[] ) const;
+    // Maps elements of a virtual dataset to elements of the source dataset.
+    void setVirtual(const DataSpace &vspace, const char *src_fname, const char *src_dsname,
+                    const DataSpace &sspace) const;
+    void setVirtual(const DataSpace &vspace, const H5std_string src_fname, const H5std_string src_dsname,
+                    const DataSpace &sspace) const;
 
-	// Remove one or all filters from the filter pipeline.
-	void removeFilter( H5Z_filter_t filter_id) const;
+    ///\brief Returns this class name.
+    virtual H5std_string
+    fromClass() const override
+    {
+        return ("DSetCreatPropList");
+    }
 
-	// Sets compression method and compression level.
-	void setDeflate( int level ) const;
+    // Copy constructor - same as the original DSetCreatPropList.
+    DSetCreatPropList(const DSetCreatPropList &orig);
 
-	// Adds an external file to the list of external files.
-	void setExternal( const char* name, off_t offset, hsize_t size ) const;
+    // Creates a copy of an existing dataset creation property list
+    // using the property list id.
+    DSetCreatPropList(const hid_t plist_id);
 
-	// Adds a filter to the filter pipeline.
-	void setFilter( H5Z_filter_t filter, unsigned int flags = 0, size_t cd_nelmts = 0, const unsigned int cd_values[] = NULL) const;
+    // Noop destructor.
+    virtual ~DSetCreatPropList() override;
 
-	// Sets Fletcher32 checksum of EDC for this property list.
-	void setFletcher32() const;
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
 
-	// Sets method of the shuffle filter.
-	void setShuffle() const;
+    // Deletes the global constant, should only be used by the library
+    static void deleteConstants();
 
-	// Sets SZIP compression method.
-	void setSzip(unsigned int options_mask, unsigned int pixels_per_block) const;
+  private:
+    static DSetCreatPropList *DEFAULT_;
 
-	///\brief Returns this class name.
-	virtual H5std_string fromClass () const { return("DSetCreatPropList"); }
+    // Creates the global constant, should only be used by the library
+    static DSetCreatPropList *getConstant();
 
-	// Copy constructor: creates a copy of a DSetCreatPropList object.
-	DSetCreatPropList(const DSetCreatPropList& orig);
+#endif // DOXYGEN_SHOULD_SKIP_THIS
 
-	// Creates a copy of an existing dataset creation property list
-	// using the property list id.
-	DSetCreatPropList(const hid_t plist_id);
+}; // end of DSetCreatPropList
+} // namespace H5
 
-	// Noop destructor.
-	virtual ~DSetCreatPropList();
-};
-#ifndef H5_NO_NAMESPACE
-}
-#endif
-#endif // __H5DSCreatPropList_H
+#endif // H5DSCreatPropList_H
diff --git a/c++/src/H5DxferProp.cpp b/c++/src/H5DxferProp.cpp
index 1f4a638..3aec15f 100644
--- a/c++/src/H5DxferProp.cpp
+++ b/c++/src/H5DxferProp.cpp
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <string>
@@ -20,222 +17,266 @@
 #include "H5IdComponent.h"
 #include "H5PropList.h"
 #include "H5DxferProp.h"
-#include "H5private.h"		// for HDmemset
 
-#include <iostream>
+namespace H5 {
 
-#ifndef H5_NO_NAMESPACE
-#ifndef H5_NO_STD
-    using std::cerr;
-    using std::endl;
-#endif  // H5_NO_STD
-#endif
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+// This DOXYGEN_SHOULD_SKIP_THIS block is a work-around approach to control
+// the order of creation and deletion of the global constants.  See Design Notes
+// in "H5PredType.cpp" for information.
 
+// Initialize a pointer for the constant
+DSetMemXferPropList *DSetMemXferPropList::DEFAULT_ = 0;
 
-#ifndef H5_NO_NAMESPACE
-namespace H5 {
-#endif
+//--------------------------------------------------------------------------
+// Function:    DSetMemXferPropList::getConstant
+//              Creates a DSetMemXferPropList object representing the HDF5
+//              constant H5P_DATASET_XFER, pointed to by
+//              DSetMemXferPropList::DEFAULT_
+// exception    H5::PropListIException
+// Description
+//              If DSetMemXferPropList::DEFAULT_ already points to an allocated
+//              object, throw a PropListIException.  This scenario should not
+//              happen.
+// Programmer   Binh-Minh Ribler - 2015
+//--------------------------------------------------------------------------
+DSetMemXferPropList *
+DSetMemXferPropList::getConstant()
+{
+    // Tell the C library not to clean up, H5Library::termH5cpp will call
+    // H5close - more dependency if use H5Library::dontAtExit()
+    if (!IdComponent::H5dontAtexit_called) {
+        (void)H5dont_atexit();
+        IdComponent::H5dontAtexit_called = true;
+    }
+
+    // If the constant pointer is not allocated, allocate it. Otherwise,
+    // throw because it shouldn't be.
+    if (DEFAULT_ == 0)
+        DEFAULT_ = new DSetMemXferPropList(H5P_DATASET_XFER);
+    else
+        throw PropListIException(
+            "DSetMemXferPropList::getConstant",
+            "DSetMemXferPropList::getConstant is being invoked on an allocated DEFAULT_");
+    return (DEFAULT_);
+}
 
 //--------------------------------------------------------------------------
-///\brief	Constant for default dataset memory and transfer property list.
+// Function:    DSetMemXferPropList::deleteConstants
+// Purpose:     Deletes the constant object that DSetMemXferPropList::DEFAULT_
+//              points to.
+// Programmer   Binh-Minh Ribler - 2015
 //--------------------------------------------------------------------------
-const DSetMemXferPropList DSetMemXferPropList::DEFAULT;
+void
+DSetMemXferPropList::deleteConstants()
+{
+    delete DEFAULT_;
+}
 
 //--------------------------------------------------------------------------
-// Function	DSetMemXferPropList default constructor
-///\brief	Default constructor: creates a stub dataset memory and
-///		transfer property list object.
-// Programmer:	Binh-Minh Ribler - 2000
+// Purpose      Constant for default dataset memory and transfer property list.
 //--------------------------------------------------------------------------
-DSetMemXferPropList::DSetMemXferPropList() : PropList(H5P_DATASET_XFER) {}
+const DSetMemXferPropList &DSetMemXferPropList::DEFAULT = *getConstant();
+
+#endif // DOXYGEN_SHOULD_SKIP_THIS
 
 //--------------------------------------------------------------------------
-// Function	DSetMemXferPropList constructor
-///\brief	Creates a dataset transfer property list with transform
-///		expression.
-// Programmer:	Binh-Minh Ribler - 2000
+// Function     DSetMemXferPropList default constructor
+///\brief       Default constructor: creates a stub dataset memory and
+///             transfer property list object.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-DSetMemXferPropList::DSetMemXferPropList(const char* exp) : PropList(H5P_DATASET_XFER)
+DSetMemXferPropList::DSetMemXferPropList() : PropList(H5P_DATASET_XFER)
 {
-    setDataTransform(exp);
 }
 
 //--------------------------------------------------------------------------
-// Function	DSetMemXferPropList copy constructor
-///\brief	Copy constructor: makes a copy of the original
-///		DSetMemXferPropList object
-///\param	original - IN: Original dataset memory and transfer property
-///				list object to copy
-// Programmer:	Binh-Minh Ribler - 2000
+// Function     DSetMemXferPropList constructor
+///\brief       Creates a dataset transfer property list with transform
+///             expression.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-DSetMemXferPropList::DSetMemXferPropList(const DSetMemXferPropList& original ) : PropList( original ) {}
+DSetMemXferPropList::DSetMemXferPropList(const char *exp) : PropList(H5P_DATASET_XFER)
+{
+    setDataTransform(exp);
+}
 
 //--------------------------------------------------------------------------
-// Function	DSetMemXferPropList overloaded constructor
-///\brief	Creates a DSetMemXferPropList object using the id of an
-///		existing DSetMemXferPropList.
-///\param	plist_id - IN: Id of an existing dataset memory and transfer
-///				property list
-// Programmer:	Binh-Minh Ribler - 2000
+// Function     DSetMemXferPropList copy constructor
+///\brief       Copy constructor: same HDF5 object as \a original
+///             DSetMemXferPropList object
+///\param       original - IN: Original dataset memory and transfer property
+///                            list object to copy
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-DSetMemXferPropList::DSetMemXferPropList(const hid_t plist_id) : PropList(plist_id) {}
+DSetMemXferPropList::DSetMemXferPropList(const DSetMemXferPropList &original) : PropList(original)
+{
+}
 
 //--------------------------------------------------------------------------
-// Function:	DSetMemXferPropList::setBuffer
-///\brief	Sets type conversion and background buffers.
-///\param	size  - IN: Size, in bytes, of the type conversion and background buffers
-///\param	tconv - IN: Pointer to application-allocated type conversion buffer
-///\param	bkg   - IN: Pointer to application-allocated background buffer
-///\exception	H5::PropListIException
-// Programmer:	Binh-Minh Ribler - 2000
+// Function     DSetMemXferPropList overloaded constructor
+///\brief       Creates a DSetMemXferPropList object using the id of an
+///             existing DSetMemXferPropList.
+///\param       plist_id - IN: Id of an existing dataset memory and transfer
+///                            property list
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void DSetMemXferPropList::setBuffer( size_t size, void* tconv, void* bkg ) const
+DSetMemXferPropList::DSetMemXferPropList(const hid_t plist_id) : PropList(plist_id)
 {
-   herr_t ret_value = H5Pset_buffer( id, size, tconv, bkg );
-   if( ret_value < 0 )
-   {
-      throw PropListIException("DSetMemXferPropList::setBuffer",
-		"H5Pset_buffer failed");
-   }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DSetMemXferPropList::getBuffer
-///\brief	Reads buffer settings.
-///\param	tconv - IN: Pointer to application-allocated type conversion buffer
-///\param	bkg   - IN: Pointer to application-allocated background buffer
-///\return	Buffer size, in bytes
-///\exception	H5::PropListIException
-// Programmer:	Binh-Minh Ribler - 2000
+// Function:    DSetMemXferPropList::setBuffer
+///\brief       Sets type conversion and background buffers.
+///\param       size  - IN: Size, in bytes, of the type conversion and background buffers
+///\param       tconv - IN: Pointer to application-allocated type conversion buffer
+///\param       bkg   - IN: Pointer to application-allocated background buffer
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
+void
+DSetMemXferPropList::setBuffer(size_t size, void *tconv, void *bkg) const
+{
+    herr_t ret_value = H5Pset_buffer(id, size, tconv, bkg);
+    if (ret_value < 0) {
+        throw PropListIException("DSetMemXferPropList::setBuffer", "H5Pset_buffer failed");
+    }
+}
 
-size_t DSetMemXferPropList::getBuffer( void** tconv, void** bkg ) const
+//--------------------------------------------------------------------------
+// Function:    DSetMemXferPropList::getBuffer
+///\brief       Reads buffer settings.
+///\param       tconv - OUT: Pointer to application-allocated type conversion buf
+///\param       bkg   - OUT: Pointer to application-allocated background buffer
+///\return      Buffer size, in bytes
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+size_t
+DSetMemXferPropList::getBuffer(void **tconv, void **bkg) const
 {
-   size_t buffer_size = H5Pget_buffer( id, tconv, bkg );
-   if( buffer_size == 0 )
-   {
-      throw PropListIException("DSetMemXferPropList::getBuffer",
-		"H5Pget_buffer returned 0 for buffer size - failure");
-   }
-   return( buffer_size );
+    size_t buffer_size = H5Pget_buffer(id, tconv, bkg);
+    if (buffer_size == 0) {
+        throw PropListIException("DSetMemXferPropList::getBuffer",
+                                 "H5Pget_buffer returned 0 for buffer size - failure");
+    }
+    return (buffer_size);
 }
 
 //--------------------------------------------------------------------------
-// Function:	DSetMemXferPropList::setPreserve
-///\brief	Sets the dataset transfer property list status to true or false.
-///\param	status - IN: Status to set, true or false
-///\exception	H5::PropListIException
-// Programmer:	Binh-Minh Ribler - 2000
+// Function:    DSetMemXferPropList::setPreserve
+///\brief       Sets the dataset transfer property list status to true or false.
+///\param       status - IN: Status to set, true or false
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void DSetMemXferPropList::setPreserve( bool status ) const
+void
+DSetMemXferPropList::setPreserve(bool status) const
 {
-   herr_t ret_value = H5Pset_preserve( id, (hbool_t) status );
-   if( ret_value < 0 )
-   {
-      throw PropListIException("DSetMemXferPropList::setPreserve",
-		"H5Pset_preserve failed");
-   }
+    herr_t ret_value = H5Pset_preserve(id, static_cast<hbool_t>(status));
+    if (ret_value < 0) {
+        throw PropListIException("DSetMemXferPropList::setPreserve", "H5Pset_preserve failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DSetMemXferPropList::getPreserve
-///\brief	Checks status of the dataset transfer property list.
-///\return	Status of the dataset transfer property list
-///\exception	H5::PropListIException
-// Programmer:	Binh-Minh Ribler - 2000
+// Function:    DSetMemXferPropList::getPreserve
+///\brief       Checks status of the dataset transfer property list.
+///\return      Status of the dataset transfer property list
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-bool DSetMemXferPropList::getPreserve() const
+bool
+DSetMemXferPropList::getPreserve() const
 {
-   int ret_value = H5Pget_preserve( id );
-   if( ret_value > 0 )
-      return true;
-   else if( ret_value == 0 )
-      return false;
-   else
-   {
-      throw PropListIException("DSetMemXferPropList::getPreserve",
-		"H5Pget_preserve returned negative value for status");
-   }
+    int ret_value = H5Pget_preserve(id);
+    if (ret_value > 0)
+        return true;
+    else if (ret_value == 0)
+        return false;
+    else {
+        throw PropListIException("DSetMemXferPropList::getPreserve",
+                                 "H5Pget_preserve returned negative value for status");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DSetMemXferPropList::setBtreeRatios
-///\brief	Sets B-tree split ratios for a dataset transfer property list.
-///\param	left   - IN: B-tree split ratio for left-most nodes
-///\param	middle - IN: B-tree split ratio for right-most nodes and lone nodes
-///\param	right  - IN: B-tree split ratio for all other nodes
-///\exception	H5::PropListIException
-// Programmer:	Binh-Minh Ribler - 2000
+// Function:    DSetMemXferPropList::setBtreeRatios
+///\brief       Sets B-tree split ratios for a dataset transfer property list.
+///\param       left   - IN: B-tree split ratio for left-most nodes
+///\param       middle - IN: B-tree split ratio for right-most nodes and lone nodes
+///\param       right  - IN: B-tree split ratio for all other nodes
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void DSetMemXferPropList::setBtreeRatios( double left, double middle, double right ) const
+void
+DSetMemXferPropList::setBtreeRatios(double left, double middle, double right) const
 {
-   herr_t ret_value = H5Pset_btree_ratios( id, left, middle, right );
-   if( ret_value < 0 )
-   {
-      throw PropListIException("DSetMemXferPropList::setBtreeRatios",
-		"H5Pset_btree_ratios failed");
-   }
+    herr_t ret_value = H5Pset_btree_ratios(id, left, middle, right);
+    if (ret_value < 0) {
+        throw PropListIException("DSetMemXferPropList::setBtreeRatios", "H5Pset_btree_ratios failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DSetMemXferPropList::getBtreeRatios
-///\brief	Gets B-tree split ratios for a dataset transfer property list.
-///\param	left   - OUT: B-tree split ratio for left-most nodes
-///\param	middle - OUT: B-tree split ratio for right-most nodes and lone nodes
-///\param	right  - OUT: B-tree split ratio for all other nodes
-///\exception	H5::PropListIException
-// Programmer:	Binh-Minh Ribler - 2000
+// Function:    DSetMemXferPropList::getBtreeRatios
+///\brief       Gets B-tree split ratios for a dataset transfer property list.
+///\param       left   - OUT: B-tree split ratio for left-most nodes
+///\param       middle - OUT: B-tree split ratio for right-most nodes and lone nodes
+///\param       right  - OUT: B-tree split ratio for all other nodes
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void DSetMemXferPropList::getBtreeRatios( double& left, double& middle, double& right ) const
+void
+DSetMemXferPropList::getBtreeRatios(double &left, double &middle, double &right) const
 {
-   herr_t ret_value = H5Pget_btree_ratios( id, &left, &middle, &right );
-   if( ret_value < 0 )
-   {
-      throw PropListIException("DSetMemXferPropList::getBtreeRatios",
-		"H5Pget_btree_ratios failed");
-   }
+    herr_t ret_value = H5Pget_btree_ratios(id, &left, &middle, &right);
+    if (ret_value < 0) {
+        throw PropListIException("DSetMemXferPropList::getBtreeRatios", "H5Pget_btree_ratios failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DSetMemXferPropList::setDataTransform
-///\brief	Sets data transform expression.
-///\param	expression - IN: null-terminated data transform expression (char*)
-///\exception	H5::PropListIException
-// Programmer:	Binh-Minh Ribler - Mar, 2014
+// Function:    DSetMemXferPropList::setDataTransform
+///\brief       Sets data transform expression.
+///\param       expression - IN: null-terminated data transform expression (char*)
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - Mar, 2014
 //--------------------------------------------------------------------------
-void DSetMemXferPropList::setDataTransform(const char* expression) const
+void
+DSetMemXferPropList::setDataTransform(const char *expression) const
 {
-   herr_t ret_value = H5Pset_data_transform( id, expression);
-   if( ret_value < 0 )
-   {
-      throw PropListIException("DSetMemXferPropList::setDataTransform",
-		"H5Pset_data_transform failed");
-   }
+    herr_t ret_value = H5Pset_data_transform(id, expression);
+    if (ret_value < 0) {
+        throw PropListIException("DSetMemXferPropList::setDataTransform", "H5Pset_data_transform failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DSetMemXferPropList::setDataTransform
-///\brief	This is an overloaded member function, provided for convenience.
-///		It takes a reference to a \c H5std_string for the expression.
-///\param	expression - IN: H5std_string data transform expression
-///\exception	H5::PropListIException
-// Programmer:	Binh-Minh Ribler - Mar, 2014
+// Function:    DSetMemXferPropList::setDataTransform
+///\brief       This is an overloaded member function, provided for convenience.
+///             It takes a reference to a \c H5std_string for the expression.
+///\param       expression - IN: H5std_string data transform expression
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - Mar, 2014
 //--------------------------------------------------------------------------
-void DSetMemXferPropList::setDataTransform(const H5std_string& expression) const
+void
+DSetMemXferPropList::setDataTransform(const H5std_string &expression) const
 {
     setDataTransform(expression.c_str());
 }
 
 //--------------------------------------------------------------------------
-// Function:	DSetMemXferPropList::getDataTransform
-///\brief	Sets data transform expression.
-///\param	exp - OUT: buffer for data transform expression (char*)
-///\param	buf_size   - IN: size of buffer for expression, including the
-///				 null terminator
-///\exception	H5::PropListIException
-// Programmer:	Binh-Minh Ribler - Mar, 2014
+// Function:    DSetMemXferPropList::getDataTransform
+///\brief       Sets data transform expression.
+///\param       exp - OUT: buffer for data transform expression (char*)
+///\param       buf_size   - IN: size of buffer for expression, including the
+///                              null terminator
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - Mar, 2014
 //--------------------------------------------------------------------------
-ssize_t DSetMemXferPropList::getDataTransform(char* exp, size_t buf_size) const
+ssize_t
+DSetMemXferPropList::getDataTransform(char *exp, size_t buf_size) const
 {
     // H5Pget_data_transform will get buf_size characters of the expression
     // including the null terminator
@@ -243,10 +284,8 @@ ssize_t DSetMemXferPropList::getDataTransform(char* exp, size_t buf_size) const
     exp_len = H5Pget_data_transform(id, exp, buf_size);
 
     // H5Pget_data_transform returns a negative value, raise an exception
-    if (exp_len < 0)
-    {
-	throw PropListIException("DSetMemXferPropList::getDataTransform",
-		"H5Pget_data_transform failed");
+    if (exp_len < 0) {
+        throw PropListIException("DSetMemXferPropList::getDataTransform", "H5Pget_data_transform failed");
     }
 
     // H5Pget_data_transform will put a null terminator at the end of the
@@ -254,276 +293,274 @@ ssize_t DSetMemXferPropList::getDataTransform(char* exp, size_t buf_size) const
     // of the buffer.
 
     // Return the expression length, which might be different from buf_size
-    return(exp_len);
+    return (exp_len);
 }
 
 //--------------------------------------------------------------------------
-// Function:	DSetMemXferPropList::getDataTransform
-///\brief	This is an overloaded member function, provided for convenience.
-///		It takes no parameter and returns a \c H5std_string for the expression.
-///\exception	H5::PropListIException
-// Programmer:	Binh-Minh Ribler - Mar, 2014
+// Function:    DSetMemXferPropList::getDataTransform
+///\brief       This is an overloaded member function, provided for convenience.
+///             It takes no parameter and returns a \c H5std_string for the expression.
+///
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - Mar, 2014
 //--------------------------------------------------------------------------
-H5std_string DSetMemXferPropList::getDataTransform() const
+H5std_string
+DSetMemXferPropList::getDataTransform() const
 {
     // Initialize string to "", so that if there is no expression, the returned
     // string will be empty
-    H5std_string expression("");
+    H5std_string expression;
 
     // Preliminary call to get the expression's length
-    ssize_t exp_len = H5Pget_data_transform(id, NULL, (size_t)0);
+    ssize_t exp_len = H5Pget_data_transform(id, NULL, 0);
 
     // If H5Pget_data_transform returns a negative value, raise an exception
-    if (exp_len < 0)
-    {
+    if (exp_len < 0) {
         throw PropListIException("DSetMemXferPropList::getDataTransform", "H5Pget_data_transform failed");
     }
 
     // If expression exists, calls C routine again to get it
-    else if (exp_len > 0)
-    {
+    else if (exp_len > 0) {
+
+        // The actual size is the cast value + 1 for the terminal ASCII NUL
+        // (unfortunate in/out type sign mismatch)
+        size_t actual_exp_len = static_cast<size_t>(exp_len) + 1;
+
         // Temporary buffer for char* expression
-        char* exp_C = new char[exp_len+1];
-        HDmemset(exp_C, 0, exp_len+1); // clear buffer
+        char *exp_C = new char[actual_exp_len]();
 
         // Used overloaded function
-        exp_len = getDataTransform(exp_C, exp_len+1);
+        exp_len = getDataTransform(exp_C, actual_exp_len);
 
         // Convert the C expression to return
         expression = exp_C;
 
         // Clean up resource
-        delete []exp_C;
+        delete[] exp_C;
     }
     // Return the string expression
-    return(expression);
+    return (expression);
 }
 
 //--------------------------------------------------------------------------
-// Function:	DSetMemXferPropList::getTypeConvCB
-///\brief	Sets an exception handling callback for datatype conversion
-///		for a dataset transfer property list.
-///\param	op        - IN: User's function
-///\param	user_data - IN: User's data
-///\exception	H5::PropListIException
-// Programmer:	Binh-Minh Ribler - April, 2004
+// Function:    DSetMemXferPropList::getTypeConvCB
+///\brief       Sets an exception handling callback for datatype conversion
+///             for a dataset transfer property list.
+///\param       op        - IN: User's function
+///\param       user_data - IN: User's data
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
-void DSetMemXferPropList::setTypeConvCB( H5T_conv_except_func_t op, void *user_data) const
+void
+DSetMemXferPropList::setTypeConvCB(H5T_conv_except_func_t op, void *user_data) const
 {
-   herr_t ret_value = H5Pset_type_conv_cb( id, op, user_data);
-   if( ret_value < 0 )
-   {
-      throw PropListIException("DSetMemXferPropList::setTypeConvCB",
-		"H5Pset_type_conv_cb failed");
-   }
+    herr_t ret_value = H5Pset_type_conv_cb(id, op, user_data);
+    if (ret_value < 0) {
+        throw PropListIException("DSetMemXferPropList::setTypeConvCB", "H5Pset_type_conv_cb failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DSetMemXferPropList::getTypeConvCB
-///\brief	Gets the exception handling callback function and data.
-///\param	op        - IN: Retrieved user function
-///\param	user_data - IN: Retrieved user data
-///\exception	H5::PropListIException
-// Programmer:	Binh-Minh Ribler - April, 2004
+// Function:    DSetMemXferPropList::getTypeConvCB
+///\brief       Gets the exception handling callback function and data.
+///\param       op        - IN: Retrieved user function
+///\param       user_data - IN: Retrieved user data
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
-void DSetMemXferPropList::getTypeConvCB( H5T_conv_except_func_t *op, void **user_data) const
+void
+DSetMemXferPropList::getTypeConvCB(H5T_conv_except_func_t *op, void **user_data) const
 {
-   herr_t ret_value = H5Pget_type_conv_cb( id, op, user_data);
-   if( ret_value < 0 )
-   {
-      throw PropListIException("DSetMemXferPropList::getTypeConvCB",
-		"H5Pget_type_conv_cb failed");
-   }
+    herr_t ret_value = H5Pget_type_conv_cb(id, op, user_data);
+    if (ret_value < 0) {
+        throw PropListIException("DSetMemXferPropList::getTypeConvCB", "H5Pget_type_conv_cb failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DSetMemXferPropList::setVlenMemManager
-///\brief	Sets the memory manager for variable-length datatype allocation.
-///\param	alloc_func - IN: User's allocate routine
-///\param	alloc_info - IN: User's allocation parameters
-///\param	free_func  - IN: User's free routine
-///\param	free_info  - IN: User's free parameters
-///\exception	H5::PropListIException
-// Programmer:	Binh-Minh Ribler - 2000
+// Function:    DSetMemXferPropList::setVlenMemManager
+///\brief       Sets the memory manager for variable-length datatype allocation.
+///\param       alloc_func - IN: User's allocate routine
+///\param       alloc_info - IN: User's allocation parameters
+///\param       free_func  - IN: User's free routine
+///\param       free_info  - IN: User's free parameters
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void DSetMemXferPropList::setVlenMemManager( H5MM_allocate_t alloc_func, void* alloc_info, H5MM_free_t free_func, void* free_info ) const
+void
+DSetMemXferPropList::setVlenMemManager(H5MM_allocate_t alloc_func, void *alloc_info, H5MM_free_t free_func,
+                                       void *free_info) const
 {
-   herr_t ret_value = H5Pset_vlen_mem_manager( id, alloc_func, alloc_info,
-						free_func, free_info );
-   if( ret_value < 0 )
-   {
-      throw PropListIException("DSetMemXferPropList::setVlenMemManager",
-		"H5Pset_vlen_mem_manager failed");
-   }
+    herr_t ret_value = H5Pset_vlen_mem_manager(id, alloc_func, alloc_info, free_func, free_info);
+    if (ret_value < 0) {
+        throw PropListIException("DSetMemXferPropList::setVlenMemManager", "H5Pset_vlen_mem_manager failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DSetMemXferPropList::setVlenMemManager
-///\brief	Sets the memory manager for variable-length datatype
-///		allocation - system \c malloc and \c free will be used.
+// Function:    DSetMemXferPropList::setVlenMemManager
+///\brief       Sets the memory manager for variable-length datatype
+///             allocation - system \c malloc and \c free will be used.
 ///
-///\exception	H5::PropListIException
-// Programmer:	Binh-Minh Ribler - 2000
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void DSetMemXferPropList::setVlenMemManager() const
+void
+DSetMemXferPropList::setVlenMemManager() const
 {
-   setVlenMemManager( NULL, NULL, NULL, NULL );
+    setVlenMemManager(NULL, NULL, NULL, NULL);
 }
 
 //--------------------------------------------------------------------------
-// Function:	DSetMemXferPropList::getVlenMemManager
-///\brief	Gets the memory manager for variable-length datatype allocation
-///\param	alloc_func - OUT: User's allocate routine
-///\param	alloc_info - OUT: User's allocation parameters
-///\param	free_func  - OUT: User's free routine
-///\param	free_info  - OUT: User's free parameters
-///\exception	H5::PropListIException
-// Programmer:	Binh-Minh Ribler - 2000
+// Function:    DSetMemXferPropList::getVlenMemManager
+///\brief       Gets the memory manager for variable-length datatype allocation
+///\param       alloc_func - OUT: User's allocate routine
+///\param       alloc_info - OUT: User's allocation parameters
+///\param       free_func  - OUT: User's free routine
+///\param       free_info  - OUT: User's free parameters
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void DSetMemXferPropList::getVlenMemManager( H5MM_allocate_t& alloc_func, void** alloc_info, H5MM_free_t& free_func, void** free_info ) const
+void
+DSetMemXferPropList::getVlenMemManager(H5MM_allocate_t &alloc_func, void **alloc_info, H5MM_free_t &free_func,
+                                       void **free_info) const
 {
-   herr_t ret_value = H5Pget_vlen_mem_manager( id, &alloc_func, alloc_info, &free_func, free_info );
-   if( ret_value < 0 )
-   {
-      throw PropListIException("DSetMemXferPropList::getVlenMemManager",
-		"H5Pget_vlen_mem_manager failed");
-   }
+    herr_t ret_value = H5Pget_vlen_mem_manager(id, &alloc_func, alloc_info, &free_func, free_info);
+    if (ret_value < 0) {
+        throw PropListIException("DSetMemXferPropList::getVlenMemManager", "H5Pget_vlen_mem_manager failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DSetMemXferPropList::setSmallDataBlockSize
-///\brief	Sets the size of a contiguous block reserved for small data.
-///\param	size - IN: Maximum size, in bytes, of the small data block.
-///\exception	H5::PropListIException
+// Function:    DSetMemXferPropList::setSmallDataBlockSize
+///\brief       Sets the size of a contiguous block reserved for small data.
+///\param       size - IN: Maximum size, in bytes, of the small data block.
+///\exception   H5::PropListIException
 ///\par Description
-///		For detail, please refer to the C layer Reference Manual at:
-/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-SetSmallData
-// Programmer:	Binh-Minh Ribler - April, 2004
+///             For detail, please refer to the H5Pset_small_data_block_size
+///             API in the HDF5 C Reference Manual.
+// Programmer   Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
-void DSetMemXferPropList::setSmallDataBlockSize(hsize_t size)
+void
+DSetMemXferPropList::setSmallDataBlockSize(hsize_t size) const
 {
-   herr_t ret_value = H5Pset_small_data_block_size(id, size);
-   if (ret_value < 0)
-   {
-      throw PropListIException("DSetMemXferPropList::setSmallDataBlockSize",
-		"H5Pset_small_data_block_size failed");
-   }
+    herr_t ret_value = H5Pset_small_data_block_size(id, size);
+    if (ret_value < 0) {
+        throw PropListIException("DSetMemXferPropList::setSmallDataBlockSize",
+                                 "H5Pset_small_data_block_size failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DSetMemXferPropList::getSmallDataBlockSize
-///\brief	Returns the current small data block size setting.
-///\return	Size of the small data block, in bytes
-///\exception	H5::PropListIException
-// Programmer:	Binh-Minh Ribler - April, 2004
+// Function:    DSetMemXferPropList::getSmallDataBlockSize
+///\brief       Returns the current small data block size setting.
+///\return      Size of the small data block, in bytes
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
-hsize_t DSetMemXferPropList::getSmallDataBlockSize()
+hsize_t
+DSetMemXferPropList::getSmallDataBlockSize() const
 {
-   hsize_t size;
-   herr_t ret_value = H5Pget_small_data_block_size(id, &size);
-   if (ret_value < 0)
-   {
-      throw PropListIException("DSetMemXferPropList::getSmallDataBlockSize",
-		"H5Pget_small_data_block_size failed");
-   }
-   return(size);
+    hsize_t size;
+    herr_t  ret_value = H5Pget_small_data_block_size(id, &size);
+    if (ret_value < 0) {
+        throw PropListIException("DSetMemXferPropList::getSmallDataBlockSize",
+                                 "H5Pget_small_data_block_size failed");
+    }
+    return (size);
 }
 
 //--------------------------------------------------------------------------
-// Function:	DSetMemXferPropList::setHyperVectorSize
-///\brief	Sets number of I/O vectors to be read/written in hyperslab I/O.
+// Function:    DSetMemXferPropList::setHyperVectorSize
+///\brief       Sets number of I/O vectors to be read/written in hyperslab I/O.
 ///
-///\exception	H5::PropListIException
+///\exception   H5::PropListIException
 ///\par Description
-///		For information, please refer to the C layer Reference
-///		Manual at:
-/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-SetHyperVectorSize
-// Programmer:	Binh-Minh Ribler - April, 2004
+///             For detail, please refer to the H5Pset_hyper_vector_size
+///             API in the HDF5 C Reference Manual.
+// Programmer   Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
-void DSetMemXferPropList::setHyperVectorSize(size_t vector_size)
+void
+DSetMemXferPropList::setHyperVectorSize(size_t vector_size) const
 {
-   herr_t ret_value = H5Pset_hyper_vector_size(id, vector_size);
-   if (ret_value < 0)
-   {
-      throw PropListIException("DSetMemXferPropList::setHyperVectorSize",
-		"H5Pset_hyper_vector_size failed");
-   }
+    herr_t ret_value = H5Pset_hyper_vector_size(id, vector_size);
+    if (ret_value < 0) {
+        throw PropListIException("DSetMemXferPropList::setHyperVectorSize",
+                                 "H5Pset_hyper_vector_size failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DSetMemXferPropList::getHyperVectorSize
-///\brief	Returns the number of I/O vectors to be read/written in
-///		hyperslab I/O.
-///\return	Number of I/O vectors
-///\exception	H5::PropListIException
-// Programmer:	Binh-Minh Ribler - April, 2004
+// Function:    DSetMemXferPropList::getHyperVectorSize
+///\brief       Returns the number of I/O vectors to be read/written in
+///             hyperslab I/O.
+///\return      Number of I/O vectors
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
-size_t DSetMemXferPropList::getHyperVectorSize()
+size_t
+DSetMemXferPropList::getHyperVectorSize() const
 {
-   size_t vector_size;
-   herr_t ret_value = H5Pget_hyper_vector_size(id, &vector_size);
-   if (ret_value < 0)
-   {
-      throw PropListIException("DSetMemXferPropList::getHyperVectorSize",
-		"H5Pget_hyper_vector_size failed");
-   }
-   return(vector_size);
+    size_t vector_size;
+    herr_t ret_value = H5Pget_hyper_vector_size(id, &vector_size);
+    if (ret_value < 0) {
+        throw PropListIException("DSetMemXferPropList::getHyperVectorSize",
+                                 "H5Pget_hyper_vector_size failed");
+    }
+    return (vector_size);
 }
 
 //--------------------------------------------------------------------------
-// Function:	DSetMemXferPropList::setEDCCheck
-///\brief	Enables or disables error-detecting for a dataset reading
-///		process.
-///\param	check - IN: Specifies whether error detection is enabled or
-///				disabled
-///\exception	H5::PropListIException
+// Function:    DSetMemXferPropList::setEDCCheck
+///\brief       Enables or disables error-detecting for a dataset reading
+///             process.
+///\param       check - IN: Specifies whether error detection is enabled or
+///                         disabled
+///\exception   H5::PropListIException
 ///\par Description
-///		The error detection algorithm used is the algorithm previously
-///		specified in the corresponding dataset creation property
-///		list.  This function does not affect the use of error
-///		detection in the writing process.
+///             The error detection algorithm used is the algorithm previously
+///             specified in the corresponding dataset creation property
+///             list.  This function does not affect the use of error
+///             detection in the writing process.
 ///\par
-///		Valid values are as follows:
-///		\li \c H5Z_ENABLE_EDC   (default)
-///		\li \c H5Z_DISABLE_EDC
-// Programmer:	Binh-Minh Ribler - April, 2004
+///             Valid values are as follows:
+///             \li \c H5Z_ENABLE_EDC   (default)
+///             \li \c H5Z_DISABLE_EDC
+// Programmer   Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
-void DSetMemXferPropList::setEDCCheck(H5Z_EDC_t check)
+void
+DSetMemXferPropList::setEDCCheck(H5Z_EDC_t check) const
 {
-   herr_t ret_value = H5Pset_edc_check(id, check);
-   if (ret_value < 0)
-   {
-      throw PropListIException("DSetMemXferPropList::setEDCCheck",
-		"H5Pset_edc_check failed");
-   }
+    herr_t ret_value = H5Pset_edc_check(id, check);
+    if (ret_value < 0) {
+        throw PropListIException("DSetMemXferPropList::setEDCCheck", "H5Pset_edc_check failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	DSetMemXferPropList::getEDCCheck
-///\brief	Determines whether error-detection is enabled for dataset reads.
-///\return	\c H5Z_ENABLE_EDC or \c H5Z_DISABLE_EDC
-///\exception	H5::PropListIException
-// Programmer:	Binh-Minh Ribler - April, 2004
+// Function:    DSetMemXferPropList::getEDCCheck
+///\brief       Determines whether error-detection is enabled for dataset reads.
+///\return      \c H5Z_ENABLE_EDC or \c H5Z_DISABLE_EDC
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
-H5Z_EDC_t DSetMemXferPropList::getEDCCheck()
+H5Z_EDC_t
+DSetMemXferPropList::getEDCCheck() const
 {
-   H5Z_EDC_t check = H5Pget_edc_check(id);
-   if (check < 0)
-   {
-      throw PropListIException("DSetMemXferPropList::getEDCCheck",
-		"H5Pget_edc_check failed");
-   }
-   return(check);
+    H5Z_EDC_t check = H5Pget_edc_check(id);
+    if (check < 0) {
+        throw PropListIException("DSetMemXferPropList::getEDCCheck", "H5Pget_edc_check failed");
+    }
+    return (check);
 }
 
 //--------------------------------------------------------------------------
-// Function:	DSetMemXferPropList destructor
-///\brief	Noop destructor.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    DSetMemXferPropList destructor
+///\brief       Noop destructor.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-DSetMemXferPropList::~DSetMemXferPropList() {}
-
-#ifndef H5_NO_NAMESPACE
-} // end namespace
-#endif
+DSetMemXferPropList::~DSetMemXferPropList()
+{
+}
 
+} // namespace H5
diff --git a/c++/src/H5DxferProp.h b/c++/src/H5DxferProp.h
index f93676e..d0a65c1 100644
--- a/c++/src/H5DxferProp.h
+++ b/c++/src/H5DxferProp.h
@@ -1,121 +1,133 @@
 // C++ informative line for the emacs editor: -*- C++ -*-
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5DSetMemXferPropList_H
-#define __H5DSetMemXferPropList_H
+#ifndef H5DSetMemXferPropList_H
+#define H5DSetMemXferPropList_H
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#endif
 
 /*! \class DSetMemXferPropList
-    \brief Class DSetMemXferPropList represents the dataset memory and
-    transfer property list.
+    \brief Class DSetCreatPropList inherits from PropList and provides
+    wrappers for the HDF5 dataset memory and transfer property list.
 */
+//  Inheritance: PropList -> IdComponent
 class H5_DLLCPP DSetMemXferPropList : public PropList {
-   public:
-	static const DSetMemXferPropList DEFAULT;
+  public:
+    ///\brief Default dataset memory and transfer property list.
+    static const DSetMemXferPropList &DEFAULT;
 
-	// Creates a dataset memory and transfer property list.
-	DSetMemXferPropList();
+    // Creates a dataset memory and transfer property list.
+    DSetMemXferPropList();
 
-	// Creates a dataset transform property list.
-	DSetMemXferPropList(const char* expression);
+    // Creates a dataset transform property list.
+    DSetMemXferPropList(const char *expression);
 
-	// Sets type conversion and background buffers.
-	void setBuffer( size_t size, void* tconv, void* bkg ) const;
+    // Sets type conversion and background buffers.
+    void setBuffer(size_t size, void *tconv, void *bkg) const;
 
-	// Reads buffer settings.
-	size_t getBuffer( void** tconv, void** bkg ) const;
+    // Reads buffer settings.
+    size_t getBuffer(void **tconv, void **bkg) const;
 
-	// Sets B-tree split ratios for a dataset transfer property list.
-	void setBtreeRatios( double left, double middle, double right ) const;
+    // Sets B-tree split ratios for a dataset transfer property list.
+    void setBtreeRatios(double left, double middle, double right) const;
 
-	// Gets B-tree split ratios for a dataset transfer property list.
-	void getBtreeRatios( double& left, double& middle, double& right ) const;
+    // Gets B-tree split ratios for a dataset transfer property list.
+    void getBtreeRatios(double &left, double &middle, double &right) const;
 
-	// Sets data transform expression.
-	void setDataTransform(const char* expression) const;
-	void setDataTransform(const H5std_string& expression) const;
+    // Sets data transform expression.
+    void setDataTransform(const char *expression) const;
+    void setDataTransform(const H5std_string &expression) const;
 
-	// Gets data transform expression.
-	ssize_t getDataTransform(char* exp, size_t buf_size=0) const;
-	H5std_string getDataTransform() const;
+    // Gets data transform expression.
+    ssize_t      getDataTransform(char *exp, size_t buf_size = 0) const;
+    H5std_string getDataTransform() const;
 
-	// Sets the dataset transfer property list status to TRUE or FALSE.
-	void setPreserve( bool status ) const;
+    // Sets the dataset transfer property list status to TRUE or FALSE.
+    void setPreserve(bool status) const;
 
-	// Checks status of the dataset transfer property list.
-	bool getPreserve() const;
+    // Checks status of the dataset transfer property list.
+    bool getPreserve() const;
 
-	// Sets an exception handling callback for datatype conversion.
-	void setTypeConvCB( H5T_conv_except_func_t op, void *user_data) const;
+    // Sets an exception handling callback for datatype conversion.
+    void setTypeConvCB(H5T_conv_except_func_t op, void *user_data) const;
 
-	// Gets the exception handling callback for datatype conversion.
-	void getTypeConvCB( H5T_conv_except_func_t *op, void **user_data) const;
+    // Gets the exception handling callback for datatype conversion.
+    void getTypeConvCB(H5T_conv_except_func_t *op, void **user_data) const;
 
-	// Sets the memory manager for variable-length datatype
-	// allocation in H5Dread and H5Dvlen_reclaim.
-	void setVlenMemManager( H5MM_allocate_t alloc, void* alloc_info,
-				H5MM_free_t free, void* free_info ) const;
+    // Sets the memory manager for variable-length datatype
+    // allocation in H5Dread and H5Treclaim.
+    void setVlenMemManager(H5MM_allocate_t alloc, void *alloc_info, H5MM_free_t free, void *free_info) const;
 
-	// alloc and free are set to NULL, indicating that system
-	// malloc and free are to be used.
-	void setVlenMemManager() const;
+    // alloc and free are set to NULL, indicating that system
+    // malloc and free are to be used.
+    void setVlenMemManager() const;
 
-	// Gets the memory manager for variable-length datatype
-	// allocation in H5Dread and H5Tvlen_reclaim.
-	void getVlenMemManager( H5MM_allocate_t& alloc, void** alloc_info,
-				H5MM_free_t& free, void** free_info ) const;
+    // Gets the memory manager for variable-length datatype
+    // allocation in H5Dread and H5Treclaim.
+    void getVlenMemManager(H5MM_allocate_t &alloc, void **alloc_info, H5MM_free_t &free,
+                           void **free_info) const;
 
-	// Sets the size of a contiguous block reserved for small data.
-	void setSmallDataBlockSize(hsize_t size);
+    // Sets the size of a contiguous block reserved for small data.
+    void setSmallDataBlockSize(hsize_t size) const;
 
-	// Returns the current small data block size setting.
-	hsize_t getSmallDataBlockSize();
+    // Returns the current small data block size setting.
+    hsize_t getSmallDataBlockSize() const;
 
-	// Sets number of I/O vectors to be read/written in hyperslab I/O.
-	void setHyperVectorSize(size_t vector_size);
+    // Sets number of I/O vectors to be read/written in hyperslab I/O.
+    void setHyperVectorSize(size_t vector_size) const;
 
-	// Returns the number of I/O vectors to be read/written in
-	// hyperslab I/O.
-	size_t getHyperVectorSize();
+    // Returns the number of I/O vectors to be read/written in
+    // hyperslab I/O.
+    size_t getHyperVectorSize() const;
 
-	// Enables or disables error-detecting for a dataset reading
-	// process.
-	void setEDCCheck(H5Z_EDC_t check);
+    // Enables or disables error-detecting for a dataset reading
+    // process.
+    void setEDCCheck(H5Z_EDC_t check) const;
 
-	// Determines whether error-detection is enabled for dataset reads.
-	H5Z_EDC_t getEDCCheck();
+    // Determines whether error-detection is enabled for dataset reads.
+    H5Z_EDC_t getEDCCheck() const;
 
-	///\brief Returns this class name.
-	virtual H5std_string fromClass () const { return("DSetMemXferPropList"); }
+    ///\brief Returns this class name.
+    virtual H5std_string
+    fromClass() const override
+    {
+        return ("DSetMemXferPropList");
+    }
 
-	// Copy constructor: makes a copy of a DSetMemXferPropList object.
-	DSetMemXferPropList(const DSetMemXferPropList& orig);
+    // Copy constructor - same as the original DSetMemXferPropList.
+    DSetMemXferPropList(const DSetMemXferPropList &orig);
 
-	// Creates a copy of an existing dataset memory and transfer
-	// property list using the property list id.
-	DSetMemXferPropList(const hid_t plist_id);
+    // Creates a copy of an existing dataset memory and transfer
+    // property list using the property list id.
+    DSetMemXferPropList(const hid_t plist_id);
 
-	// Noop destructor
-	virtual ~DSetMemXferPropList();
-};
-#ifndef H5_NO_NAMESPACE
-}
-#endif
-#endif // __H5DSetMemXferPropList_H
+    // Noop destructor
+    virtual ~DSetMemXferPropList() override;
 
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+
+    // Deletes the global constant, should only be used by the library
+    static void deleteConstants();
+
+  private:
+    static DSetMemXferPropList *DEFAULT_;
+
+    // Creates the global constant, should only be used by the library
+    static DSetMemXferPropList *getConstant();
+
+#endif // DOXYGEN_SHOULD_SKIP_THIS
+
+}; // end of DSetMemXferPropList
+} // namespace H5
+
+#endif // H5DSetMemXferPropList_H
diff --git a/c++/src/H5EnumType.cpp b/c++/src/H5EnumType.cpp
index a91c053..218934e 100644
--- a/c++/src/H5EnumType.cpp
+++ b/c++/src/H5EnumType.cpp
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <string>
@@ -19,263 +16,332 @@
 #include "H5Exception.h"
 #include "H5IdComponent.h"
 #include "H5PropList.h"
-#include "H5Object.h"
-#include "H5AbstractDs.h"
+#include "H5OcreatProp.h"
+#include "H5DcreatProp.h"
 #include "H5DxferProp.h"
 #include "H5DataSpace.h"
-#include "H5DcreatProp.h"
-#include "H5CommonFG.h"
+#include "H5LcreatProp.h"
+#include "H5LaccProp.h"
+#include "H5DaccProp.h"
+#include "H5Location.h"
+#include "H5Object.h"
+#include "H5AbstractDs.h"
 #include "H5DataType.h"
 #include "H5DataSet.h"
 #include "H5AtomType.h"
 #include "H5IntType.h"
 #include "H5EnumType.h"
-#include "H5private.h"			// for HDmemset
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#endif
 
 //--------------------------------------------------------------------------
-// Function:	EnumType default constructor
-///\brief	Default constructor: Creates a stub datatype
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    EnumType default constructor
+///\brief       Default constructor: Creates a stub datatype
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-EnumType::EnumType() : DataType() {}
+EnumType::EnumType() : DataType()
+{
+}
 
 //--------------------------------------------------------------------------
-// Function:	EnumType overloaded constructor
-///\brief	Creates an EnumType object using the id of an existing datatype.
-///\param	existing_id - IN: Id of an existing datatype
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    EnumType overloaded constructor
+///\brief       Creates an EnumType object using the id of an existing datatype.
+///\param       existing_id - IN: Id of an existing datatype
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-EnumType::EnumType( const hid_t existing_id ) : DataType( existing_id ) {}
+EnumType::EnumType(const hid_t existing_id) : DataType(existing_id)
+{
+}
 
 //--------------------------------------------------------------------------
-// Function:	EnumType copy constructor
-///\brief	Copy constructor: makes a copy of the original EnumType object.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    EnumType copy constructor
+///\brief       Copy constructor: same HDF5 object as \a original
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-EnumType::EnumType( const EnumType& original ) : DataType( original ) {}
+EnumType::EnumType(const EnumType &original) : DataType(original)
+{
+}
 
 //--------------------------------------------------------------------------
-// Function:	EnumType overloaded constructor
-///\brief	Creates an empty enumeration datatype given a size, in bytes.
-///\param	size - IN: Number of bytes in the datatype to create
-///\exception	H5::DataTypeIException
+// Function:    EnumType overloaded constructor
+///\brief       Creates an empty enumeration datatype given a size, in bytes.
+///\param       size - IN: Number of bytes in the datatype to create
+///\exception   H5::DataTypeIException
 // Description
-// 		The DataType constructor calls the C API H5Tcreate to create
-// 		the enum datatype.
-// Programmer	Binh-Minh Ribler - 2000
+//              The DataType constructor calls the C API H5Tcreate to create
+//              the enum datatype.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-EnumType::EnumType( size_t size ) : DataType( H5T_ENUM, size ) {}
+EnumType::EnumType(size_t size) : DataType(H5T_ENUM, size)
+{
+}
 
 //--------------------------------------------------------------------------
-// Function:	EnumType overloaded constructor
-///\brief	Gets the enum datatype of the specified dataset.
-///\param	dataset - IN: Dataset that this enum datatype associates with
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    EnumType overloaded constructor
+///\brief       Gets the enum datatype of the specified dataset.
+///\param       dataset - IN: Dataset that this enum datatype associates with
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-EnumType::EnumType( const DataSet& dataset ) : DataType()
+EnumType::EnumType(const DataSet &dataset) : DataType()
 {
-   // Calls C function H5Dget_type to get the id of the datatype
-   id = H5Dget_type( dataset.getId() );
+    // Calls C function H5Dget_type to get the id of the datatype
+    id = H5Dget_type(dataset.getId());
 
-   // If the datatype id is not valid, throw an exception
-   if( id < 0 )
-   {
-      throw DataSetIException("EnumType constructor", "H5Dget_type failed");
-   }
+    // If the datatype id is not valid, throw an exception
+    if (id < 0) {
+        throw DataSetIException("EnumType constructor", "H5Dget_type failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	EnumType overloaded constructor
-///\brief	Creates a new enum datatype based on an integer datatype.
-///\param	data_type - IN: Base datatype
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    EnumType overloaded constructor
+///\brief       Creates a new enum datatype based on an integer datatype.
+///\param       data_type - IN: Base datatype
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-EnumType::EnumType( const IntType& data_type ) : DataType()
+EnumType::EnumType(const IntType &data_type) : DataType()
 {
-   // Calls C function H5Tenum_create to get the id of the datatype
-   id = H5Tenum_create( data_type.getId() );
+    // Calls C function H5Tenum_create to get the id of the datatype
+    id = H5Tenum_create(data_type.getId());
 
-   // If the datatype id is not valid, throw an exception
-   if( id < 0 )
-   {
-      throw DataSetIException("EnumType constructor", "H5Tenum_create failed");
-   }
+    // If the datatype id is not valid, throw an exception
+    if (id < 0) {
+        throw DataSetIException("EnumType constructor", "H5Tenum_create failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	EnumType::insert
-///\brief	Inserts a new member to this enumeration datatype.
-///\param	name  - IN: Name of the new member
-///\param	value - IN: Pointer to the value of the new member
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    EnumType overloaded constructor
+///\brief       Creates an EnumType instance by opening an HDF5 enum datatype
+///             given its name, provided as a C character string.
+///\param       dtype_name - IN: Enum datatype name
+///\param       loc        - IN: Location of the type
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - Dec 2016
+// Description
+//              In 1.10.1, this constructor was introduced and may replace the
+//              existing function CommonFG::openEnumType(const char*) to
+//              improve usability.
+//              -BMR, Dec 2016
 //--------------------------------------------------------------------------
-void EnumType::insert( const char* name, void *value ) const
+EnumType::EnumType(const H5Location &loc, const char *dtype_name) : DataType()
 {
-   // Calls C routine H5Tenum_insert to insert the new enum datatype member.
-   herr_t ret_value = H5Tenum_insert( id, name, value );
-   if( ret_value < 0 )
-   {
-      throw DataTypeIException("EnumType::insert", "H5Tenum_insert failed");
-   }
+    id = p_opentype(loc, dtype_name);
 }
 
 //--------------------------------------------------------------------------
-// Function:	EnumType::insert
-///\brief	This is an overloaded member function, provided for convenience.
-///		It differs from the above function only in the type of
-///		argument \a name.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    EnumType overloaded constructor
+///\brief       Creates an EnumType instance by opening an HDF5 enum datatype
+///             given its name, provided as an \c H5std_string.
+///\param       loc        - IN: Location of the type
+///\param       dtype_name - IN: Enum datatype name
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - Dec 2016
+// Description
+//              In 1.10.1, this constructor was introduced and may replace the
+//              existing function CommonFG::openEnumType(const H5std_string&)
+//              to improve usability.
+//              -BMR, Dec 2016
 //--------------------------------------------------------------------------
-void EnumType::insert( const H5std_string& name, void *value ) const
+EnumType::EnumType(const H5Location &loc, const H5std_string &dtype_name) : DataType()
 {
-    insert( name.c_str(), value );
+    id = p_opentype(loc, dtype_name.c_str());
 }
 
 //--------------------------------------------------------------------------
-// Function:	EnumType::nameOf
-///\brief	Returns the symbol name corresponding to a specified member
-///		of this enumeration datatype.
-///\param	value - IN: Pointer to the value of the enum datatype
-///\param	size  - IN: Size for the name
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    EnumType::decode
+///\brief       Returns an EnumType object via DataType* by decoding the
+///             binary object description of this type.
+///
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - Aug 2017
 //--------------------------------------------------------------------------
-H5std_string EnumType::nameOf( void *value, size_t size ) const
+DataType *
+EnumType::decode() const
 {
-   char* name_C = new char[size+1];  // temporary C-string for C API
-   HDmemset(name_C, 0, size+1); // clear buffer
+    hid_t encoded_enumtype_id = H5I_INVALID_HID;
+    try {
+        encoded_enumtype_id = p_decode();
+    }
+    catch (DataTypeIException &err) {
+        throw;
+    }
+    EnumType *encoded_enumtype = new EnumType;
+    encoded_enumtype->p_setId(encoded_enumtype_id);
+    return (encoded_enumtype);
+}
 
-   // Calls C routine H5Tenum_nameof to get the name of the specified enum type
-   herr_t ret_value = H5Tenum_nameof( id, value, name_C, size );
+//--------------------------------------------------------------------------
+// Function:    EnumType::insert
+///\brief       Inserts a new member to this enumeration datatype.
+///\param       name  - IN: Name of the new member
+///\param       value - IN: Pointer to the value of the new member
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+void
+EnumType::insert(const char *name, void *value) const
+{
+    // Calls C routine H5Tenum_insert to insert the new enum datatype member.
+    herr_t ret_value = H5Tenum_insert(id, name, value);
+    if (ret_value < 0) {
+        throw DataTypeIException("EnumType::insert", "H5Tenum_insert failed");
+    }
+}
+
+//--------------------------------------------------------------------------
+// Function:    EnumType::insert
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function only in the type of
+///             argument \a name.
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+void
+EnumType::insert(const H5std_string &name, void *value) const
+{
+    insert(name.c_str(), value);
+}
+
+//--------------------------------------------------------------------------
+// Function:    EnumType::nameOf
+///\brief       Returns the symbol name corresponding to a specified member
+///             of this enumeration datatype.
+///\param       value - IN: Pointer to the value of the enum datatype
+///\param       size  - IN: Size for the name
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+H5std_string
+EnumType::nameOf(void *value, size_t size) const
+{
+    char *name_C = new char[size + 1](); // temporary C-string for C API
+
+    // Calls C routine H5Tenum_nameof to get the name of the specified enum type
+    herr_t ret_value = H5Tenum_nameof(id, value, name_C, size);
 
-   // If H5Tenum_nameof returns a negative value, raise an exception,
-   if( ret_value < 0 )
-   {
-      delete []name_C;
-      throw DataTypeIException("EnumType::nameOf", "H5Tenum_nameof failed");
-   }
-   // otherwise, create the string to hold the datatype name and return it
-   H5std_string name(name_C);
-   delete []name_C;
-   return( name );
+    // If H5Tenum_nameof returns a negative value, raise an exception,
+    if (ret_value < 0) {
+        delete[] name_C;
+        throw DataTypeIException("EnumType::nameOf", "H5Tenum_nameof failed");
+    }
+    // otherwise, create the string to hold the datatype name and return it
+    H5std_string name(name_C);
+    delete[] name_C;
+    return (name);
 }
 
 //--------------------------------------------------------------------------
-// Function:	EnumType::valueOf
-///\brief	Retrieves the value corresponding to a member of this
-///		enumeration datatype, given the member's name.
-///\param	name  -  IN: Name of the queried member
-///\param	value - OUT: Pointer to the retrieved value
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    EnumType::valueOf
+///\brief       Retrieves the value corresponding to a member of this
+///             enumeration datatype, given the member's name.
+///\param       name  -  IN: Name of the queried member
+///\param       value - OUT: Pointer to the retrieved value
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void EnumType::valueOf( const char* name, void *value ) const
+void
+EnumType::valueOf(const char *name, void *value) const
 {
-   // Calls C routine H5Tenum_valueof to get the enum datatype value
-   herr_t ret_value = H5Tenum_valueof( id, name, value );
-   if( ret_value < 0 )
-   {
-      throw DataTypeIException("EnumType::valueOf", "H5Tenum_valueof failed");
-   }
+    // Calls C routine H5Tenum_valueof to get the enum datatype value
+    herr_t ret_value = H5Tenum_valueof(id, name, value);
+    if (ret_value < 0) {
+        throw DataTypeIException("EnumType::valueOf", "H5Tenum_valueof failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	EnumType::valueOf
-///\brief	This is an overloaded member function, provided for convenience.
-///		It differs from the above function only in the type of
-///		argument \a name.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    EnumType::valueOf
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function only in the type of
+///             argument \a name.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void EnumType::valueOf( const H5std_string& name, void *value ) const
+void
+EnumType::valueOf(const H5std_string &name, void *value) const
 {
-    valueOf( name.c_str(), value );
+    valueOf(name.c_str(), value);
 }
 
 //--------------------------------------------------------------------------
-// Function:	EnumType::getMemberIndex
-///\brief	Returns the index of a member in this enumeration datatype.
-///\param	name - IN: Name of the queried member
-///\return	Index of the member if it exists.  Index will have the value
-///		between 0 and \c N-1, where \c N is the value returned by the
-///		member function \c EnumType::getNmembers.
-///\exception	H5::DataTypeIException
+// Function:    EnumType::getMemberIndex
+///\brief       Returns the index of a member in this enumeration datatype.
+///\param       name - IN: Name of the queried member
+///\return      Index of the member if it exists.  Index will have the value
+///             between 0 and \c N-1, where \c N is the value returned by the
+///             member function \c EnumType::getNmembers.
+///\exception   H5::DataTypeIException
 // Programmer   Binh-Minh Ribler - May 16, 2002
 //--------------------------------------------------------------------------
-int EnumType::getMemberIndex(const char *name) const
+int
+EnumType::getMemberIndex(const char *name) const
 {
-   int member_index = H5Tget_member_index(id, name);
-   if( member_index < 0 )
-   {
-      throw DataTypeIException("EnumType::getMemberIndex",
-                "H5Tget_member_index returns negative value");
-   }
-   return( member_index );
+    int member_index = H5Tget_member_index(id, name);
+    if (member_index < 0) {
+        throw DataTypeIException("EnumType::getMemberIndex", "H5Tget_member_index returns negative value");
+    }
+    return (member_index);
 }
 
 //--------------------------------------------------------------------------
-// Function:	EnumType::getMemberIndex
-///\brief	This is an overloaded member function, provided for convenience.
-///		It differs from the above function only in the type of
-///		argument \a name.
+// Function:    EnumType::getMemberIndex
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function only in the type of
+///             argument \a name.
 // Programmer   Binh-Minh Ribler - May 16, 2002
 //--------------------------------------------------------------------------
-int EnumType::getMemberIndex(const H5std_string& name) const
+int
+EnumType::getMemberIndex(const H5std_string &name) const
 {
-    return(EnumType::getMemberIndex(name.c_str()));
+    return (EnumType::getMemberIndex(name.c_str()));
 }
 
 //--------------------------------------------------------------------------
-// Function:	EnumType::getNmembers
-///\brief	Returns the number of members in this enumeration datatype.
-///\return	Number of members
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - May, 2004
+// Function:    EnumType::getNmembers
+///\brief       Returns the number of members in this enumeration datatype.
+///\return      Number of members
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - May, 2004
 //--------------------------------------------------------------------------
-int EnumType::getNmembers() const
+int
+EnumType::getNmembers() const
 {
-   int num_members = H5Tget_nmembers( id );
-   if( num_members < 0 )
-   {
-      throw DataTypeIException("EnumType::getNmembers",
-                "H5Tget_nmembers returns negative number of members");
-   }
-   return( num_members );
+    int num_members = H5Tget_nmembers(id);
+    if (num_members < 0) {
+        throw DataTypeIException("EnumType::getNmembers",
+                                 "H5Tget_nmembers returns negative number of members");
+    }
+    return (num_members);
 }
 
 //--------------------------------------------------------------------------
-// Function:	EnumType::getMemberValue
-///\brief	Retrieves the value of a member in this enumeration datatype,
-///		given the member's index.
-///\param	memb_no - IN: Index of the queried member
-///\param	value   - OUT: Pointer to the retrieved value
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    EnumType::getMemberValue
+///\brief       Retrieves the value of a member in this enumeration datatype,
+///             given the member's index.
+///\param       memb_no - IN: Index of the queried member
+///\param       value   - OUT: Pointer to the retrieved value
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void EnumType::getMemberValue( unsigned memb_no, void *value ) const
+void
+EnumType::getMemberValue(unsigned memb_no, void *value) const
 {
-   // Call C routine H5Tget_member_value to get the datatype member's value
-   hid_t ret_value = H5Tget_member_value( id, memb_no, value );
-   if( ret_value < 0 )
-   {
-      throw DataTypeIException("EnumType::getMemberValue", "H5Tget_member_value failed");
-   }
+    // Call C routine H5Tget_member_value to get the datatype member's value
+    hid_t ret_value = H5Tget_member_value(id, memb_no, value);
+    if (ret_value < 0) {
+        throw DataTypeIException("EnumType::getMemberValue", "H5Tget_member_value failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	EnumType destructor
-///\brief	Properly terminates access to this enum datatype.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    EnumType destructor
+///\brief       Properly terminates access to this enum datatype.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-EnumType::~EnumType() {}
+EnumType::~EnumType()
+{
+}
 
-#ifndef H5_NO_NAMESPACE
-} // end namespace
-#endif
+} // namespace H5
diff --git a/c++/src/H5EnumType.h b/c++/src/H5EnumType.h
index fe36e8b..a98688e 100644
--- a/c++/src/H5EnumType.h
+++ b/c++/src/H5EnumType.h
@@ -1,78 +1,89 @@
 // C++ informative line for the emacs editor: -*- C++ -*-
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5EnumType_H
-#define __H5EnumType_H
+#ifndef H5EnumType_H
+#define H5EnumType_H
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#endif
 
-//! Class EnumType operates on HDF5 enum datatypes.
+/*! \class EnumType
+    \brief EnumType is a derivative of a DataType and operates on HDF5
+    enum datatypes.
+*/
+//  Inheritance: DataType -> H5Object -> H5Location -> IdComponent
 class H5_DLLCPP EnumType : public DataType {
 
-   public:
-	// Creates an empty enumeration datatype based on a native signed
-	// integer type, whose size is given by size.
-	EnumType( size_t size );
+  public:
+    // Creates an empty enumeration datatype based on a native signed
+    // integer type, whose size is given by size.
+    EnumType(size_t size);
 
-	// Gets the enum datatype of the specified dataset
-	EnumType( const DataSet& dataset );  // H5Dget_type
+    // Gets the enum datatype of the specified dataset
+    EnumType(const DataSet &dataset); // H5Dget_type
 
-	// Creates a new enum datatype based on an integer datatype
-	EnumType( const IntType& data_type );  // H5Tenum_create
+    // Creates a new enum datatype based on an integer datatype
+    EnumType(const IntType &data_type); // H5Tenum_create
 
-	// Returns the number of members in this enumeration datatype.
-	int getNmembers () const;
+    // Constructors that open an enum datatype, given a location.
+    EnumType(const H5Location &loc, const char *name);
+    EnumType(const H5Location &loc, const H5std_string &name);
 
-	// Returns the index of a member in this enumeration data type.
-	int getMemberIndex(const char* name) const;
-	int getMemberIndex(const H5std_string& name) const;
+    // Returns an EnumType object via DataType* by decoding the
+    // binary object description of this type.
+    virtual DataType *decode() const override;
 
-	// Returns the value of an enumeration datatype member
-	void getMemberValue( unsigned memb_no, void *value ) const;
+    // Returns the number of members in this enumeration datatype.
+    int getNmembers() const;
 
-	// Inserts a new member to this enumeration type.
-	void insert( const char* name, void *value ) const;
-	void insert( const H5std_string& name, void *value ) const;
+    // Returns the index of a member in this enumeration data type.
+    int getMemberIndex(const char *name) const;
+    int getMemberIndex(const H5std_string &name) const;
 
-	// Returns the symbol name corresponding to a specified member
-	// of this enumeration datatype.
-	H5std_string nameOf( void *value, size_t size ) const;
+    // Returns the value of an enumeration datatype member
+    void getMemberValue(unsigned memb_no, void *value) const;
 
-	// Returns the value corresponding to a specified member of this
-	// enumeration datatype.
-	void valueOf( const char* name, void *value ) const;
-	void valueOf( const H5std_string& name, void *value ) const;
+    // Inserts a new member to this enumeration type.
+    void insert(const char *name, void *value) const;
+    void insert(const H5std_string &name, void *value) const;
 
-	///\brief Returns this class name.
-	virtual H5std_string fromClass () const { return("EnumType"); }
+    // Returns the symbol name corresponding to a specified member
+    // of this enumeration datatype.
+    H5std_string nameOf(void *value, size_t size) const;
 
-	// Default constructor
-	EnumType();
+    // Returns the value corresponding to a specified member of this
+    // enumeration datatype.
+    void valueOf(const char *name, void *value) const;
+    void valueOf(const H5std_string &name, void *value) const;
 
-	// Creates an enumeration datatype using an existing id
-	EnumType( const hid_t existing_id );
+    ///\brief Returns this class name.
+    virtual H5std_string
+    fromClass() const override
+    {
+        return ("EnumType");
+    }
 
-	// Copy constructor: makes a copy of the original EnumType object.
-	EnumType( const EnumType& original );
+    // Default constructor
+    EnumType();
 
-	virtual ~EnumType();
-};
-#ifndef H5_NO_NAMESPACE
-}
-#endif
-#endif // __H5EnumType_H
+    // Creates an enumeration datatype using an existing id
+    EnumType(const hid_t existing_id);
+
+    // Copy constructor: same as the original EnumType.
+    EnumType(const EnumType &original);
+
+    virtual ~EnumType() override;
+
+}; // end of EnumType
+} // namespace H5
+
+#endif // H5EnumType_H
diff --git a/c++/src/H5Exception.cpp b/c++/src/H5Exception.cpp
index fb1e42e..97b8606 100644
--- a/c++/src/H5Exception.cpp
+++ b/c++/src/H5Exception.cpp
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <string>
@@ -18,218 +15,229 @@
 #include "H5Include.h"
 #include "H5Exception.h"
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#endif
 
 const char Exception::DEFAULT_MSG[] = "No detailed information provided";
 
 //--------------------------------------------------------------------------
-// Function:	Exception default constructor
-///\brief	Default constructor.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    Exception default constructor
+///\brief       Default constructor.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-Exception::Exception() : detail_message(""), func_name("") {}
+Exception::Exception() : detail_message{""}, func_name{""}
+{
+}
 
 //--------------------------------------------------------------------------
-// Function:	Exception overloaded constructor
-///\brief	Creates an exception with the name of the function,
-///		in which the failure occurs, and an optional detailed message.
-///\param	func - IN: Name of the function where failure occurs
-///\param	message   - IN: Message on the failure
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    Exception overloaded constructor
+///\brief       Creates an exception with the name of the function,
+///             in which the failure occurs, and an optional detailed message.
+///\param       func - IN: Name of the function where failure occurs
+///\param       message   - IN: Message on the failure
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-Exception::Exception(const H5std_string& func, const H5std_string& message) : detail_message(message), func_name(func) {}
+Exception::Exception(const H5std_string &func, const H5std_string &message)
+    : detail_message(message), func_name(func)
+{
+}
 
 //--------------------------------------------------------------------------
-// Function:	Exception copy constructor
-///\brief	Copy constructor: makes a copy of the original Exception object.
-///\param	orig - IN: Exception instance to copy
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    Exception copy constructor
+///\brief       Copy constructor: same HDF5 object as \a original
+///\param       orig - IN: Exception instance to copy
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-Exception::Exception( const Exception& orig )
+Exception::Exception(const Exception &orig) : detail_message(orig.detail_message), func_name(orig.func_name)
 {
-   detail_message = orig.detail_message;
-   func_name = orig.func_name;
 }
 
 //--------------------------------------------------------------------------
-// Function:	Exception::getMajorString
-///\brief	Returns a text string that describes the error
-///		specified by a major error number.
-///\param	err_major - IN: Major error number
-///\return	Major error string
+// Function:    Exception::getMajorString
+///\brief       Returns a text string that describes the error
+///             specified by a major error number.
+///\param       err_major - IN: Major error number
+///\return      Major error string
 ///\par Description
-///		In the failure case, the string "Invalid major error number"
-///		will be returned.
-// Programmer	Binh-Minh Ribler - 2000
+///             In the failure case, the string "Invalid major error number"
+///             will be returned.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-H5std_string Exception::getMajorString( hid_t err_major ) const
+H5std_string
+Exception::getMajorString(hid_t err_major) const
 {
-   // Preliminary call to H5Eget_msg() to get the length of the message
-   ssize_t mesg_size = H5Eget_msg(err_major, NULL, NULL, 0);
+    // Preliminary call to H5Eget_msg() to get the length of the message
+    ssize_t mesg_size = H5Eget_msg(err_major, NULL, NULL, 0);
+
+    // If H5Eget_msg() returns a negative value, raise an exception,
+    if (mesg_size < 0)
+        throw IdComponentException("Exception::getMajorString", "H5Eget_msg failed");
+
+    // The actual message size is the cast value + 1 for the terminal ASCII NUL
+    // (unfortunate in/out type sign mismatch)
+    size_t actual_mesg_size = static_cast<size_t>(mesg_size) + 1;
 
-   // If H5Eget_msg() returns a negative value, raise an exception,
-   if( mesg_size < 0 )
-      throw IdComponentException("Exception::getMajorString",
-				"H5Eget_msg failed");
+    // Call H5Eget_msg again to get the actual message
+    char *mesg_C = new char[actual_mesg_size]; // temporary C-string for C API
 
-   // Call H5Eget_msg again to get the actual message
-   char* mesg_C = new char[mesg_size+1];  // temporary C-string for C API
-   mesg_size = H5Eget_msg(err_major, NULL, mesg_C, mesg_size+1);
+    mesg_size = H5Eget_msg(err_major, NULL, mesg_C, actual_mesg_size);
 
-   // Check for failure again
-   if( mesg_size < 0 )
-   {
-      delete []mesg_C;
-      throw IdComponentException("Exception::getMajorString",
-				"H5Eget_msg failed");
-   }
+    // Check for failure again
+    if (mesg_size < 0) {
+        delete[] mesg_C;
+        throw IdComponentException("Exception::getMajorString", "H5Eget_msg failed");
+    }
 
-   // Convert the C error description and return
-   H5std_string major_str(mesg_C);
-   delete []mesg_C;
-   return( major_str );
+    // Convert the C error description and return
+    H5std_string major_str(mesg_C);
+    delete[] mesg_C;
+    return (major_str);
 }
 
 //--------------------------------------------------------------------------
-// Function:	Exception::getMinorString
-///\brief	Returns a text string that describes the error
-///		specified by a minor error number.
-///\param	err_minor - IN: Minor error number
-///\return	Minor error string
+// Function:    Exception::getMinorString
+///\brief       Returns a text string that describes the error
+///             specified by a minor error number.
+///\param       err_minor - IN: Minor error number
+///\return      Minor error string
 ///\par Description
-///		In the failure case, the string "Invalid minor error number"
-///		will be returned.
-// Programmer	Binh-Minh Ribler - 2000
+///             In the failure case, the string "Invalid minor error number"
+///             will be returned.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-H5std_string Exception::getMinorString( hid_t err_minor ) const
+H5std_string
+Exception::getMinorString(hid_t err_minor) const
 {
-   // Preliminary call to H5Eget_msg() to get the length of the message
-   ssize_t mesg_size = H5Eget_msg(err_minor, NULL, NULL, 0);
+    // Preliminary call to H5Eget_msg() to get the length of the message
+    ssize_t mesg_size = H5Eget_msg(err_minor, NULL, NULL, 0);
 
-   // If H5Eget_msg() returns a negative value, raise an exception,
-   if( mesg_size < 0 )
-      throw IdComponentException("Exception::getMinorString",
-				"H5Eget_msg failed");
+    // If H5Eget_msg() returns a negative value, raise an exception,
+    if (mesg_size < 0)
+        throw IdComponentException("Exception::getMinorString", "H5Eget_msg failed");
 
-   // Call H5Eget_msg again to get the actual message
-   char* mesg_C = new char[mesg_size+1];  // temporary C-string for C API
-   mesg_size = H5Eget_msg(err_minor, NULL, mesg_C, mesg_size+1);
+    // The actual message size is the cast value + 1 for the terminal ASCII NUL
+    // (unfortunate in/out type sign mismatch)
+    size_t actual_mesg_size = static_cast<size_t>(mesg_size) + 1;
 
-   // Check for failure again
-   if( mesg_size < 0 )
-   {
-      delete []mesg_C;
-      throw IdComponentException("Exception::getMinorString",
-				"H5Eget_msg failed");
-   }
+    // Call H5Eget_msg again to get the actual message
+    char *mesg_C = new char[actual_mesg_size]; // temporary C-string for C API
 
-   // Convert the C error description and return
-   H5std_string minor_str(mesg_C);
-   delete []mesg_C;
-   return( minor_str );
+    mesg_size = H5Eget_msg(err_minor, NULL, mesg_C, actual_mesg_size);
+
+    // Check for failure again
+    if (mesg_size < 0) {
+        delete[] mesg_C;
+        throw IdComponentException("Exception::getMinorString", "H5Eget_msg failed");
+    }
+
+    // Convert the C error description and return
+    H5std_string minor_str(mesg_C);
+    delete[] mesg_C;
+    return (minor_str);
 }
 
 //--------------------------------------------------------------------------
-// Function:	Exception::setAutoPrint
-///\brief	Turns on the automatic error printing.
-///\param	func        - IN: Function to be called upon an error condition
-///\param	client_data - IN: Data passed to the error function
+// Function:    Exception::setAutoPrint
+///\brief       Turns on the automatic error printing.
+///\param       func        - IN: Function to be called upon an error condition
+///\param       client_data - IN: Data passed to the error function
 ///\par Description
-///		When the library is first initialized the auto printing
-///		function, \a func, is set to the C API \c H5Eprint and
-///		\a client_data is the standard error stream pointer, \c stderr.
-///		Automatic stack traversal is always in the \c H5E_WALK_DOWNWARD
-///		direction.
+///             When the library is first initialized the auto printing
+///             function, \a func, is set to the C API \c H5Eprint and
+///             \a client_data is the standard error stream pointer, \c stderr.
+///             Automatic stack traversal is always in the \c H5E_WALK_DOWNWARD
+///             direction.
 ///\par
-///		Users are encouraged to write their own more specific error
-///		handlers
-// Programmer	Binh-Minh Ribler - 2000
+///             Users are encouraged to write their own more specific error
+///             handlers
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void Exception::setAutoPrint( H5E_auto2_t& func, void* client_data )
+void
+Exception::setAutoPrint(H5E_auto2_t &func, void *client_data)
 {
-   // calls the C API routine H5Eset_auto to set the auto printing to
-   // the specified function.
-   herr_t ret_value = H5Eset_auto2( H5E_DEFAULT, func, client_data );
-   if( ret_value < 0 )
-      throw Exception( "Exception::setAutoPrint", "H5Eset_auto failed" );
+    // calls the C API routine H5Eset_auto to set the auto printing to
+    // the specified function.
+    herr_t ret_value = H5Eset_auto2(H5E_DEFAULT, func, client_data);
+    if (ret_value < 0)
+        throw Exception("Exception::setAutoPrint", "H5Eset_auto failed");
 }
 
 //--------------------------------------------------------------------------
-// Function:	Exception::dontPrint
-///\brief	Turns off the automatic error printing from the C library.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    Exception::dontPrint
+///\brief       Turns off the automatic error printing from the C library.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void Exception::dontPrint()
+void
+Exception::dontPrint()
 {
-   // calls the C API routine H5Eset_auto with NULL parameters to turn
-   // off the automatic error printing.
-   herr_t ret_value = H5Eset_auto2( H5E_DEFAULT, NULL, NULL );
-   if( ret_value < 0 )
-      throw Exception( "Exception::dontPrint", "H5Eset_auto failed" );
+    // calls the C API routine H5Eset_auto with NULL parameters to turn
+    // off the automatic error printing.
+    herr_t ret_value = H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
+    if (ret_value < 0)
+        throw Exception("Exception::dontPrint", "H5Eset_auto failed");
 }
 
 //--------------------------------------------------------------------------
-// Function:	Exception::getAutoPrint
-///\brief	Retrieves the current settings for the automatic error
-///		stack traversal function and its data.
-///\param	func        - OUT: Current setting for the function to be
-///					called upon an error condition
-///\param	client_data - OUT: Current setting for the data passed to
-///					the error function
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    Exception::getAutoPrint
+///\brief       Retrieves the current settings for the automatic error
+///             stack traversal function and its data.
+///\param       func        - OUT: Current setting for the function to be
+///                                called upon an error condition
+///\param       client_data - OUT: Current setting for the data passed to
+///                                the error function
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void Exception::getAutoPrint( H5E_auto2_t& func, void** client_data )
+void
+Exception::getAutoPrint(H5E_auto2_t &func, void **client_data)
 {
-   // calls the C API routine H5Eget_auto to get the current setting of
-   // the automatic error printing
-   herr_t ret_value = H5Eget_auto2( H5E_DEFAULT, &func, client_data );
-   if( ret_value < 0 )
-      throw Exception( "Exception::getAutoPrint", "H5Eget_auto failed" );
+    // calls the C API routine H5Eget_auto to get the current setting of
+    // the automatic error printing
+    herr_t ret_value = H5Eget_auto2(H5E_DEFAULT, &func, client_data);
+    if (ret_value < 0)
+        throw Exception("Exception::getAutoPrint", "H5Eget_auto failed");
 }
 
 //--------------------------------------------------------------------------
-// Function:	Exception::clearErrorStack
-///\brief	Clears the error stack for the current thread.
+// Function:    Exception::clearErrorStack
+///\brief       Clears the error stack for the current thread.
 ///\par Description
-///		The stack is also cleared whenever a C API function is
-///		called, with certain exceptions (for instance, \c H5Eprint).
-// Programmer	Binh-Minh Ribler - 2000
+///             The stack is also cleared whenever a C API function is
+///             called, with certain exceptions (for instance, \c H5Eprint).
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void Exception::clearErrorStack()
+void
+Exception::clearErrorStack()
 {
-   // calls the C API routine H5Eclear to clear the error stack
-   herr_t ret_value = H5Eclear2(H5E_DEFAULT);
-   if( ret_value < 0 )
-      throw Exception( "Exception::clearErrorStack", "H5Eclear failed" );
+    // calls the C API routine H5Eclear to clear the error stack
+    herr_t ret_value = H5Eclear2(H5E_DEFAULT);
+    if (ret_value < 0)
+        throw Exception("Exception::clearErrorStack", "H5Eclear failed");
 }
 
 //--------------------------------------------------------------------------
-// Function:	Exception::walkErrorStack
-///\brief	Walks the error stack for the current thread, calling the
-///		specified function.
-///\param	direction - IN: Direction in which the error stack is to be walked
-///\param	func - IN: Function to be called for each error encountered
-///\param	client_data - IN: Data passed to the error function
+// Function:    Exception::walkErrorStack
+///\brief       Walks the error stack for the current thread, calling the
+///             specified function.
+///\param       direction - IN: Direction in which the error stack is to be walked
+///\param       func - IN: Function to be called for each error encountered
+///\param       client_data - IN: Data passed to the error function
 ///\par Description
-///		Valid values for \a direction include:
-///		\li \c H5E_WALK_UPWARD - begin with the most specific error
-///		        and end at the API
-///		\li \c H5E_WALK_DOWNWARD - begin at the API and end at the
-///		        inner-most function where the error was first detected
+///             Valid values for \a direction include:
+///             \li \c H5E_WALK_UPWARD - begin with the most specific error
+///                     and end at the API
+///             \li \c H5E_WALK_DOWNWARD - begin at the API and end at the
+///                     inner-most function where the error was first detected
 ///\par
-///		The function specified by \a func will be called for each
-///		error in the error stack.  The \c H5E_walk_t prototype is as
-///		follows:
+///             The function specified by \a func will be called for each
+///             error in the error stack.  The \c H5E_walk_t prototype is as
+///             follows:
 ///\code
 /// typedef herr_t (*H5E_walk_t)(int n, H5E_error_t *err_desc, void *client_data)
 ///     int n - Indexed position of the error in the stack; it begins at zero
-///		regardless of stack traversal direction
+///             regardless of stack traversal direction
 ///     H5E_error_t *err_desc - Pointer to a data structure describing the
-///		error.  This structure is listed below.
+///             error.  This structure is listed below.
 ///     void *client_data - Pointer to client data in the format expected by
-///		the user-defined function.
+///             the user-defined function.
 ///\endcode
 ///\par
 ///     Data structure to describe the error:
@@ -244,351 +252,467 @@ void Exception::clearErrorStack()
 ///     const char  *desc;          //optional supplied description
 /// } H5E_error2_t;
 ///\endcode
-// Programmer	Binh-Minh Ribler - 2000
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void Exception::walkErrorStack( H5E_direction_t direction, H5E_walk2_t func, void* client_data )
+void
+Exception::walkErrorStack(H5E_direction_t direction, H5E_walk2_t func, void *client_data)
 {
-   // calls the C API routine H5Ewalk to walk the error stack
-   herr_t ret_value = H5Ewalk2( H5E_DEFAULT, direction, func, client_data );
-   if( ret_value < 0 )
-      throw Exception( "Exception::walkErrorStack", "H5Ewalk failed" );
+    // calls the C API routine H5Ewalk to walk the error stack
+    herr_t ret_value = H5Ewalk2(H5E_DEFAULT, direction, func, client_data);
+    if (ret_value < 0)
+        throw Exception("Exception::walkErrorStack", "H5Ewalk failed");
 }
 
 //--------------------------------------------------------------------------
-// Function:	Exception::getDetailMsg
-///\brief	Returns the detailed message set at the time the exception
-///		is thrown.
-///\return	Text message - \c H5std_string
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    Exception::getDetailMsg
+///\brief       Returns the detailed message set at the time the exception
+///             is thrown.
+///\return      Text message - \c H5std_string
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-H5std_string Exception::getDetailMsg() const
+H5std_string
+Exception::getDetailMsg() const
 {
-   return(detail_message);
+    return (detail_message);
 }
 
 //--------------------------------------------------------------------------
-// Function:	Exception::getCDetailMsg
-///\brief	Returns the detailed message set at the time the exception
-///		is thrown.
-///\return	Text message - \c char pointer
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    Exception::getCDetailMsg
+///\brief       Returns the detailed message set at the time the exception
+///             is thrown.
+///\return      Text message - \c char pointer
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-const char* Exception::getCDetailMsg() const
+const char *
+Exception::getCDetailMsg() const
 {
-   return(detail_message.c_str());
+    return (detail_message.c_str());
 }
 
 //--------------------------------------------------------------------------
-// Function:	Exception::getFuncName
-///\brief	Returns the name of the function, where the exception is thrown.
-///\return	Text message - \c H5std_string
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    Exception::getFuncName
+///\brief       Returns the name of the function, where the exception is thrown.
+///\return      Text message - \c H5std_string
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-H5std_string Exception::getFuncName() const
+H5std_string
+Exception::getFuncName() const
 {
-   return(func_name);
+    return (func_name);
 }
 
 //--------------------------------------------------------------------------
-// Function:	Exception::getCFuncName
-///\brief	Returns the name of the function, where the exception is thrown.
-///\return	Text message - \c char pointer
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    Exception::getCFuncName
+///\brief       Returns the name of the function, where the exception is thrown.
+///\return      Text message - \c char pointer
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-const char* Exception::getCFuncName() const
+const char *
+Exception::getCFuncName() const
 {
-   return(func_name.c_str());
+    return (func_name.c_str());
 }
 
 //--------------------------------------------------------------------------
-// Function:	Exception::printErrorStack (static)
-///\brief	Prints the error stack in a default manner.
-///\param	stream    - IN: File pointer, default to stderr
-///\param	err_stack - IN: Error stack ID, default to H5E_DEFAULT(0)
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    Exception::printErrorStack (static)
+///\brief       Prints the error stack in a default manner.
+///\param       stream    - IN: File pointer, default to stderr
+///\param       err_stack - IN: Error stack ID, default to H5E_DEFAULT(0)
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void Exception::printErrorStack(FILE* stream, hid_t err_stack)
+void
+Exception::printErrorStack(FILE *stream, hid_t err_stack)
 {
-   herr_t ret_value = H5Eprint2(err_stack, stream);
-   if( ret_value < 0 )
-      throw Exception( "Printing error stack", "H5Eprint2 failed" );
+    herr_t ret_value = H5Eprint2(err_stack, stream);
+    if (ret_value < 0)
+        throw Exception("Printing error stack", "H5Eprint2 failed");
 }
 
 //--------------------------------------------------------------------------
-// Function:	Exception::printError
-///\brief	Prints the error stack in a default manner.  This member
-///		function is replaced by the static function printErrorStack
-///		and will be removed from the next major release.
-///\param	stream - IN: File pointer
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    Exception::printError
+// Purpose:     Prints the error stack in a default manner.  This member
+//              function is replaced by the static function printErrorStack
+//              and will be removed from the next major release.
+// Parameter    stream - IN: File pointer
+// Programmer   Binh-Minh Ribler - 2000
 // Description:
-//		This function can be removed in next major release.
-//		-BMR, 2014/04/24
+//              This function can be removed in next major release.
+//              -BMR, 2014/04/24
+//              Removed from documentation. -BMR, 2016/03/23
+//              Removed from code. -BMR, 2017/08/11 1.8.20 and 1.10.2
+//--------------------------------------------------------------------------
+// void Exception::printError(FILE* stream) const
+//{
+//    Exception::printErrorStack(stream, H5E_DEFAULT);
+//}
+
+//--------------------------------------------------------------------------
+// Function:    Exception destructor
+///\brief       Noop destructor
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void Exception::printError(FILE* stream) const
+Exception::~Exception() throw()
 {
-    Exception::printErrorStack(stream, H5E_DEFAULT);
 }
 
 //--------------------------------------------------------------------------
-// Function:	Exception destructor
-///\brief	Noop destructor
-// Programmer	Binh-Minh Ribler - 2000
+// Subclass:    FileIException
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
 //--------------------------------------------------------------------------
-Exception::~Exception() throw() {}
+// Function:    FileIException default constructor
+///\brief       Default constructor.
+//--------------------------------------------------------------------------
+FileIException::FileIException() : Exception()
+{
+}
+//--------------------------------------------------------------------------
+// Function:    FileIException overloaded constructor
+///\brief       Creates a FileIException with the name of the function,
+///             in which the failure occurs, and an optional detailed message.
+///\param       func - IN: Name of the function where failure occurs
+///\param       message   - IN: Message on the failure
+//--------------------------------------------------------------------------
+FileIException::FileIException(const H5std_string &func, const H5std_string &message)
+    : Exception(func, message)
+{
+}
+//--------------------------------------------------------------------------
+// Function:    FileIException destructor
+///\brief       Noop destructor.
+//--------------------------------------------------------------------------
+FileIException::~FileIException() throw()
+{
+}
 
 //--------------------------------------------------------------------------
-// Subclass:	FileIException
-// Programmer	Binh-Minh Ribler - 2000
+// Subclass:    GroupIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
 //--------------------------------------------------------------------------
-// Function:	FileIException default constructor
-///\brief	Default constructor.
+// Function:    GroupIException default constructor
+///\brief       Default constructor.
 //--------------------------------------------------------------------------
-FileIException::FileIException():Exception(){}
+GroupIException::GroupIException() : Exception()
+{
+}
 //--------------------------------------------------------------------------
-// Function:	FileIException overloaded constructor
-///\brief	Creates a FileIException with the name of the function,
-///		in which the failure occurs, and an optional detailed message.
-///\param	func - IN: Name of the function where failure occurs
-///\param	message   - IN: Message on the failure
+// Function:    GroupIException overloaded constructor
+///\brief       Creates a GroupIException with the name of the function,
+///             in which the failure occurs, and an optional detailed message.
+///\param       func - IN: Name of the function where failure occurs
+///\param       message   - IN: Message on the failure
 //--------------------------------------------------------------------------
-FileIException::FileIException(const H5std_string& func, const H5std_string& message) : Exception(func, message) {}
+GroupIException::GroupIException(const H5std_string &func, const H5std_string &message)
+    : Exception(func, message)
+{
+}
 //--------------------------------------------------------------------------
-// Function:	FileIException destructor
-///\brief	Noop destructor.
+// Function:    GroupIException destructor
+///\brief       Noop destructor.
 //--------------------------------------------------------------------------
-FileIException::~FileIException() throw() {}
+GroupIException::~GroupIException() throw()
+{
+}
 
 //--------------------------------------------------------------------------
-// Subclass:	GroupIException
-// Programmer	Binh-Minh Ribler - 2000
+// Subclass:    DataSpaceIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
 //--------------------------------------------------------------------------
-// Function:	GroupIException default constructor
-///\brief	Default constructor.
+// Function:    DataSpaceIException default constructor
+///\brief       Default constructor.
 //--------------------------------------------------------------------------
-GroupIException::GroupIException():Exception(){}
+DataSpaceIException::DataSpaceIException() : Exception()
+{
+}
 //--------------------------------------------------------------------------
-// Function:	GroupIException overloaded constructor
-///\brief	Creates a GroupIException with the name of the function,
-///		in which the failure occurs, and an optional detailed message.
-///\param	func - IN: Name of the function where failure occurs
-///\param	message   - IN: Message on the failure
+// Function:    DataSpaceIException overloaded constructor
+///\brief       Creates a DataSpaceIException with the name of the function,
+///             in which the failure occurs, and an optional detailed message.
+///\param       func - IN: Name of the function where failure occurs
+///\param       message   - IN: Message on the failure
 //--------------------------------------------------------------------------
-GroupIException::GroupIException(const H5std_string& func, const H5std_string& message) : Exception(func, message) {}
+DataSpaceIException::DataSpaceIException(const H5std_string &func, const H5std_string &message)
+    : Exception(func, message)
+{
+}
 //--------------------------------------------------------------------------
-// Function:	GroupIException destructor
-///\brief	Noop destructor.
+// Function:    DataSpaceIException destructor
+///\brief       Noop destructor.
 //--------------------------------------------------------------------------
-GroupIException::~GroupIException() throw() {}
+DataSpaceIException::~DataSpaceIException() throw()
+{
+}
 
 //--------------------------------------------------------------------------
-// Subclass:	DataSpaceIException
-// Programmer	Binh-Minh Ribler - 2000
+// Subclass:    DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
 //--------------------------------------------------------------------------
-// Function:	DataSpaceIException default constructor
-///\brief	Default constructor.
+// Function:    DataTypeIException default constructor
+///\brief       Default constructor.
 //--------------------------------------------------------------------------
-DataSpaceIException::DataSpaceIException():Exception(){}
+DataTypeIException::DataTypeIException() : Exception()
+{
+}
 //--------------------------------------------------------------------------
-// Function:	DataSpaceIException overloaded constructor
-///\brief	Creates a DataSpaceIException with the name of the function,
-///		in which the failure occurs, and an optional detailed message.
-///\param	func - IN: Name of the function where failure occurs
-///\param	message   - IN: Message on the failure
+// Function:    DataTypeIException overloaded constructor
+///\brief       Creates a DataTypeIException with the name of the function,
+///             in which the failure occurs, and an optional detailed message.
+///\param       func - IN: Name of the function where failure occurs
+///\param       message   - IN: Message on the failure
 //--------------------------------------------------------------------------
-DataSpaceIException::DataSpaceIException(const H5std_string& func, const H5std_string& message) : Exception(func, message) {}
+DataTypeIException::DataTypeIException(const H5std_string &func, const H5std_string &message)
+    : Exception(func, message)
+{
+}
 //--------------------------------------------------------------------------
-// Function:	DataSpaceIException destructor
-///\brief	Noop destructor.
+// Function:    DataTypeIException destructor
+///\brief       Noop destructor.
 //--------------------------------------------------------------------------
-DataSpaceIException::~DataSpaceIException() throw() {}
+DataTypeIException::~DataTypeIException() throw()
+{
+}
 
 //--------------------------------------------------------------------------
-// Subclass:	DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Subclass:    ObjHeaderIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
 //--------------------------------------------------------------------------
-// Function:	DataTypeIException default constructor
-///\brief	Default constructor.
+// Function:    ObjHeaderIException default constructor
+///\brief       Default constructor.
 //--------------------------------------------------------------------------
-DataTypeIException::DataTypeIException():Exception(){}
+ObjHeaderIException::ObjHeaderIException() : Exception()
+{
+}
 //--------------------------------------------------------------------------
-// Function:	DataTypeIException overloaded constructor
-///\brief	Creates a DataTypeIException with the name of the function,
-///		in which the failure occurs, and an optional detailed message.
-///\param	func - IN: Name of the function where failure occurs
-///\param	message   - IN: Message on the failure
+// Function:    ObjHeaderIException overloaded constructor
+///\brief       Creates an ObjHeaderIException with the name of the function,
+///             in which the failure occurs, and an optional detailed message.
+///\param       func - IN: Name of the function where failure occurs
+///\param       message   - IN: Message on the failure
 //--------------------------------------------------------------------------
-DataTypeIException::DataTypeIException(const H5std_string& func, const H5std_string& message) : Exception(func, message) {}
+ObjHeaderIException::ObjHeaderIException(const H5std_string &func, const H5std_string &message)
+    : Exception(func, message)
+{
+}
 //--------------------------------------------------------------------------
-// Function:	DataTypeIException destructor
-///\brief	Noop destructor.
+// Function:    ObjHeaderIException destructor
+///\brief       Noop destructor.
 //--------------------------------------------------------------------------
-DataTypeIException::~DataTypeIException() throw() {}
+ObjHeaderIException::~ObjHeaderIException() throw()
+{
+}
 
 //--------------------------------------------------------------------------
-// Subclass:	PropListIException
-// Programmer	Binh-Minh Ribler - 2000
+// Subclass:    PropListIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
 //--------------------------------------------------------------------------
-// Function:	PropListIException default constructor
-///\brief	Default constructor.
+// Function:    PropListIException default constructor
+///\brief       Default constructor.
 //--------------------------------------------------------------------------
-PropListIException::PropListIException():Exception(){}
+PropListIException::PropListIException() : Exception()
+{
+}
 //--------------------------------------------------------------------------
-// Function:	PropListIException overloaded constructor
-///\brief	Creates a PropListIException with the name of the function,
-///		in which the failure occurs, and an optional detailed message.
-///\param	func - IN: Name of the function where failure occurs
-///\param	message   - IN: Message on the failure
+// Function:    PropListIException overloaded constructor
+///\brief       Creates a PropListIException with the name of the function,
+///             in which the failure occurs, and an optional detailed message.
+///\param       func - IN: Name of the function where failure occurs
+///\param       message   - IN: Message on the failure
 //--------------------------------------------------------------------------
-PropListIException::PropListIException(const H5std_string& func, const H5std_string& message) : Exception(func, message) {}
+PropListIException::PropListIException(const H5std_string &func, const H5std_string &message)
+    : Exception(func, message)
+{
+}
 //--------------------------------------------------------------------------
-// Function:	PropListIException destructor
-///\brief	Noop destructor.
+// Function:    PropListIException destructor
+///\brief       Noop destructor.
 //--------------------------------------------------------------------------
-PropListIException::~PropListIException() throw() {}
+PropListIException::~PropListIException() throw()
+{
+}
 
 //--------------------------------------------------------------------------
-// Subclass:	DataSetIException
-// Programmer	Binh-Minh Ribler - 2000
+// Subclass:    DataSetIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
 //--------------------------------------------------------------------------
-// Function:	DataSetIException default constructor
-///\brief	Default constructor.
+// Function:    DataSetIException default constructor
+///\brief       Default constructor.
 //--------------------------------------------------------------------------
-DataSetIException::DataSetIException():Exception(){}
+DataSetIException::DataSetIException() : Exception()
+{
+}
 //--------------------------------------------------------------------------
-// Function:	DataSetIException overloaded constructor
-///\brief	Creates a DataSetIException with the name of the function,
-///		in which the failure occurs, and an optional detailed message.
-///\param	func - IN: Name of the function where failure occurs
-///\param	message   - IN: Message on the failure
+// Function:    DataSetIException overloaded constructor
+///\brief       Creates a DataSetIException with the name of the function,
+///             in which the failure occurs, and an optional detailed message.
+///\param       func - IN: Name of the function where failure occurs
+///\param       message   - IN: Message on the failure
 //--------------------------------------------------------------------------
-DataSetIException::DataSetIException(const H5std_string& func, const H5std_string& message) : Exception(func, message) {}
+DataSetIException::DataSetIException(const H5std_string &func, const H5std_string &message)
+    : Exception(func, message)
+{
+}
 //--------------------------------------------------------------------------
-// Function:	DataSetIException destructor
-///\brief	Noop destructor.
+// Function:    DataSetIException destructor
+///\brief       Noop destructor.
 //--------------------------------------------------------------------------
-DataSetIException::~DataSetIException() throw() {}
+DataSetIException::~DataSetIException() throw()
+{
+}
 
 //--------------------------------------------------------------------------
-// Subclass:	AttributeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Subclass:    AttributeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
 //--------------------------------------------------------------------------
-// Function:	AttributeIException default constructor
-///\brief	Default constructor.
+// Function:    AttributeIException default constructor
+///\brief       Default constructor.
 //--------------------------------------------------------------------------
-AttributeIException::AttributeIException():Exception(){}
+AttributeIException::AttributeIException() : Exception()
+{
+}
 //--------------------------------------------------------------------------
-// Function:	AttributeIException overloaded constructor
-///\brief	Creates an AttributeIException with the name of the function,
-///		in which the failure occurs, and an optional detailed message.
-///\param	func - IN: Name of the function where failure occurs
-///\param	message   - IN: Message on the failure
+// Function:    AttributeIException overloaded constructor
+///\brief       Creates an AttributeIException with the name of the function,
+///             in which the failure occurs, and an optional detailed message.
+///\param       func - IN: Name of the function where failure occurs
+///\param       message   - IN: Message on the failure
 //--------------------------------------------------------------------------
-AttributeIException::AttributeIException(const H5std_string& func, const H5std_string& message) : Exception(func, message) {}
+AttributeIException::AttributeIException(const H5std_string &func, const H5std_string &message)
+    : Exception(func, message)
+{
+}
 //--------------------------------------------------------------------------
-// Function:	AttributeIException destructor
-///\brief	Noop destructor.
+// Function:    AttributeIException destructor
+///\brief       Noop destructor.
 //--------------------------------------------------------------------------
-AttributeIException::~AttributeIException() throw() {}
+AttributeIException::~AttributeIException() throw()
+{
+}
 
 //--------------------------------------------------------------------------
-// Subclass:	ReferenceException
-// Programmer	Binh-Minh Ribler - 2000
+// Subclass:    ReferenceException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
 //--------------------------------------------------------------------------
-// Function:	ReferenceException default constructor
-///\brief	Default constructor.
+// Function:    ReferenceException default constructor
+///\brief       Default constructor.
 //--------------------------------------------------------------------------
-ReferenceException::ReferenceException():Exception(){}
+ReferenceException::ReferenceException() : Exception()
+{
+}
 //--------------------------------------------------------------------------
-// Function:	ReferenceException overloaded constructor
-///\brief	Creates a ReferenceException with the name of the function,
-///		in which the failure occurs, and an optional detailed message.
-///\param	func - IN: Name of the function where failure occurs
-///\param	message   - IN: Message on the failure
+// Function:    ReferenceException overloaded constructor
+///\brief       Creates a ReferenceException with the name of the function,
+///             in which the failure occurs, and an optional detailed message.
+///\param       func - IN: Name of the function where failure occurs
+///\param       message   - IN: Message on the failure
 //--------------------------------------------------------------------------
-ReferenceException::ReferenceException(const H5std_string& func, const H5std_string& message) : Exception(func, message) {}
+ReferenceException::ReferenceException(const H5std_string &func, const H5std_string &message)
+    : Exception(func, message)
+{
+}
 //--------------------------------------------------------------------------
-// Function:	ReferenceException destructor
-///\brief	Noop destructor.
+// Function:    ReferenceException destructor
+///\brief       Noop destructor.
 //--------------------------------------------------------------------------
-ReferenceException::~ReferenceException() throw() {}
+ReferenceException::~ReferenceException() throw()
+{
+}
 
 //--------------------------------------------------------------------------
-// Subclass:	LibraryIException
-// Programmer	Binh-Minh Ribler - 2000
+// Subclass:    LibraryIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
 //--------------------------------------------------------------------------
-// Function:	LibraryIException default constructor
-///\brief	Default constructor.
+// Function:    LibraryIException default constructor
+///\brief       Default constructor.
 //--------------------------------------------------------------------------
-LibraryIException::LibraryIException():Exception(){}
+LibraryIException::LibraryIException() : Exception()
+{
+}
 //--------------------------------------------------------------------------
-// Function:	LibraryIException overloaded constructor
-///\brief	Creates a LibraryIException with the name of the function,
-///		in which the failure occurs, and an optional detailed message.
-///\param	func - IN: Name of the function where failure occurs
-///\param	message   - IN: Message on the failure
+// Function:    LibraryIException overloaded constructor
+///\brief       Creates a LibraryIException with the name of the function,
+///             in which the failure occurs, and an optional detailed message.
+///\param       func - IN: Name of the function where failure occurs
+///\param       message   - IN: Message on the failure
 //--------------------------------------------------------------------------
-LibraryIException::LibraryIException(const H5std_string& func, const H5std_string& message) : Exception(func, message) {}
+LibraryIException::LibraryIException(const H5std_string &func, const H5std_string &message)
+    : Exception(func, message)
+{
+}
 //--------------------------------------------------------------------------
-// Function:	LibraryIException destructor
-///\brief	Noop destructor.
+// Function:    LibraryIException destructor
+///\brief       Noop destructor.
 //--------------------------------------------------------------------------
-LibraryIException::~LibraryIException() throw() {}
+LibraryIException::~LibraryIException() throw()
+{
+}
 
 //--------------------------------------------------------------------------
-// Subclass:	LocationException
-// Programmer	Binh-Minh Ribler - 2014
+// Subclass:    LocationException
+// Programmer   Binh-Minh Ribler - 2014
 //--------------------------------------------------------------------------
 //--------------------------------------------------------------------------
-// Function:	LocationException default constructor
-///\brief	Default constructor.
+// Function:    LocationException default constructor
+///\brief       Default constructor.
 //--------------------------------------------------------------------------
-LocationException::LocationException():Exception(){}
+LocationException::LocationException() : Exception()
+{
+}
 //--------------------------------------------------------------------------
-// Function:	LocationException overloaded constructor
-///\brief	Creates a LocationException with the name of the function,
-///		in which the failure occurs, and an optional detailed message.
-///\param	func - IN: Name of the function where failure occurs
-///\param	message   - IN: Message on the failure
+// Function:    LocationException overloaded constructor
+///\brief       Creates a LocationException with the name of the function,
+///             in which the failure occurs, and an optional detailed message.
+///\param       func - IN: Name of the function where failure occurs
+///\param       message   - IN: Message on the failure
 //--------------------------------------------------------------------------
-LocationException::LocationException(const H5std_string& func, const H5std_string& message) : Exception(func, message) {}
+LocationException::LocationException(const H5std_string &func, const H5std_string &message)
+    : Exception(func, message)
+{
+}
 //--------------------------------------------------------------------------
-// Function:	LocationException destructor
-///\brief	Noop destructor.
+// Function:    LocationException destructor
+///\brief       Noop destructor.
 //--------------------------------------------------------------------------
-LocationException::~LocationException() throw() {}
+LocationException::~LocationException() throw()
+{
+}
 
 //--------------------------------------------------------------------------
-// Subclass:	IdComponentException
-// Programmer	Binh-Minh Ribler - 2000
+// Subclass:    IdComponentException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
 //--------------------------------------------------------------------------
-// Function:	IdComponentException default constructor
-///\brief	Default constructor.
+// Function:    IdComponentException default constructor
+///\brief       Default constructor.
 //--------------------------------------------------------------------------
-IdComponentException::IdComponentException(): Exception() {}
+IdComponentException::IdComponentException() : Exception()
+{
+}
 //--------------------------------------------------------------------------
-// Function:	IdComponentException overloaded constructor
-///\brief	Creates a IdComponentException with the name of the function,
-///		in which the failure occurs, and an optional detailed message.
-///\param	func - IN: Name of the function where failure occurs
-///\param	message   - IN: Message on the failure
+// Function:    IdComponentException overloaded constructor
+///\brief       Creates a IdComponentException with the name of the function,
+///             in which the failure occurs, and an optional detailed message.
+///\param       func - IN: Name of the function where failure occurs
+///\param       message   - IN: Message on the failure
 //--------------------------------------------------------------------------
-IdComponentException::IdComponentException(const H5std_string& func, const H5std_string& message) : Exception(func, message) {}
+IdComponentException::IdComponentException(const H5std_string &func, const H5std_string &message)
+    : Exception(func, message)
+{
+}
 //--------------------------------------------------------------------------
-// Function:	IdComponentException destructor
-///\brief	Noop destructor.
+// Function:    IdComponentException destructor
+///\brief       Noop destructor.
 //--------------------------------------------------------------------------
-IdComponentException::~IdComponentException() throw() {}
-#ifndef H5_NO_NAMESPACE
-} // end namespace
-#endif
+IdComponentException::~IdComponentException() throw()
+{
+}
+
+} // namespace H5
diff --git a/c++/src/H5Exception.h b/c++/src/H5Exception.h
index 639b633..d4533e5 100644
--- a/c++/src/H5Exception.h
+++ b/c++/src/H5Exception.h
@@ -1,32 +1,23 @@
 // C++ informative line for the emacs editor: -*- C++ -*-
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5Exception_H
-#define __H5Exception_H
+#ifndef H5Exception_H
+#define H5Exception_H
 
 #include <string>
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#ifdef H5_NO_STD
-    #define H5std_string ::string
-#else
-    #define H5std_string std::string
-#endif
-#endif
+#define H5std_string std::string
 
 /*! \class Exception
     \brief Exception provides wrappers of HDF5 error handling functions.
@@ -34,145 +25,150 @@ namespace H5 {
     Many classes are derived from Exception for specific HDF5 C interfaces.
 */
 class H5_DLLCPP Exception {
-   public:
-	// Creates an exception with a function name where the failure occurs
-	// and an optional detailed message
-	Exception(const H5std_string& func_name, const H5std_string& message = DEFAULT_MSG);
+  public:
+    // Creates an exception with a function name where the failure occurs
+    // and an optional detailed message
+    Exception(const H5std_string &func_name, const H5std_string &message = DEFAULT_MSG);
 
-	// Returns a character string that describes the error specified by
-	// a major error number.
-	H5std_string getMajorString( hid_t err_major_id ) const;
+    // Returns a character string that describes the error specified by
+    // a major error number.
+    H5std_string getMajorString(hid_t err_major_id) const;
 
-	// Returns a character string that describes the error specified by
-	// a minor error number.
-	H5std_string getMinorString( hid_t err_minor_id ) const;
+    // Returns a character string that describes the error specified by
+    // a minor error number.
+    H5std_string getMinorString(hid_t err_minor_id) const;
 
-	// Returns the detailed message set at the time the exception is thrown
-	H5std_string getDetailMsg() const;
-	const char* getCDetailMsg() const;	// C string of detailed message
-	H5std_string getFuncName() const;	// function name as a string object
-	const char* getCFuncName() const;	// function name as a char string
+    // Returns the detailed message set at the time the exception is thrown
+    H5std_string getDetailMsg() const;
+    const char  *getCDetailMsg() const; // C string of detailed message
+    H5std_string getFuncName() const;   // function name as a string object
+    const char  *getCFuncName() const;  // function name as a char string
 
-	// Turns on the automatic error printing.
-	static void setAutoPrint( H5E_auto2_t& func, void* client_data);
+    // Turns on the automatic error printing.
+    static void setAutoPrint(H5E_auto2_t &func, void *client_data);
 
-	// Turns off the automatic error printing.
-	static void dontPrint();
+    // Turns off the automatic error printing.
+    static void dontPrint();
 
-	// Retrieves the current settings for the automatic error stack
-	// traversal function and its data.
-	static void getAutoPrint( H5E_auto2_t& func, void** client_data);
+    // Retrieves the current settings for the automatic error stack
+    // traversal function and its data.
+    static void getAutoPrint(H5E_auto2_t &func, void **client_data);
 
-	// Clears the error stack for the current thread.
-	static void clearErrorStack();
+    // Clears the error stack for the current thread.
+    static void clearErrorStack();
 
-	// Walks the error stack for the current thread, calling the
-	// specified function.
-	static void walkErrorStack( H5E_direction_t direction,
-				H5E_walk2_t func, void* client_data);
+    // Walks the error stack for the current thread, calling the
+    // specified function.
+    static void walkErrorStack(H5E_direction_t direction, H5E_walk2_t func, void *client_data);
 
-	// Prints the error stack in a default manner.
-	static void printErrorStack(FILE* stream = stderr,
-				    hid_t err_stack = H5E_DEFAULT); // Static
-	virtual void printError(FILE* stream = NULL) const;
+    // Prints the error stack in a default manner.
+    static void printErrorStack(FILE *stream = stderr, hid_t err_stack = H5E_DEFAULT);
+    // Deprecated in favor of printErrorStack.
+    // Removed from code. -BMR, 2017/08/11 1.8.20 and 1.10.2
+    // virtual void printError(FILE* stream = NULL) const;
 
-	// Default constructor
-	Exception();
+    // Default constructor
+    Exception();
 
-	// copy constructor
-	Exception( const Exception& orig);
+    // copy constructor
+    Exception(const Exception &orig);
 
-	// virtual Destructor
-	virtual ~Exception() throw();
+    // virtual Destructor
+    virtual ~Exception() throw();
 
-   protected:
-        // Default value for detail_message
-        static const char DEFAULT_MSG[];
+  protected:
+    // Default value for detail_message
+    static const char DEFAULT_MSG[];
 
-   private:
-	H5std_string detail_message;
-	H5std_string func_name;
+  private:
+    H5std_string detail_message;
+    H5std_string func_name;
 };
 
 class H5_DLLCPP FileIException : public Exception {
-   public:
-	FileIException( const H5std_string& func_name, const H5std_string& message = DEFAULT_MSG);
-	FileIException();
-	virtual ~FileIException() throw();
+  public:
+    FileIException(const H5std_string &func_name, const H5std_string &message = DEFAULT_MSG);
+    FileIException();
+    virtual ~FileIException() throw() override;
 };
 
 class H5_DLLCPP GroupIException : public Exception {
-   public:
-	GroupIException( const H5std_string& func_name, const H5std_string& message = DEFAULT_MSG);
-	GroupIException();
-	virtual ~GroupIException() throw();
+  public:
+    GroupIException(const H5std_string &func_name, const H5std_string &message = DEFAULT_MSG);
+    GroupIException();
+    virtual ~GroupIException() throw() override;
 };
 
 class H5_DLLCPP DataSpaceIException : public Exception {
-   public:
-	DataSpaceIException(const H5std_string& func_name, const H5std_string& message = DEFAULT_MSG);
-	DataSpaceIException();
-	virtual ~DataSpaceIException() throw();
+  public:
+    DataSpaceIException(const H5std_string &func_name, const H5std_string &message = DEFAULT_MSG);
+    DataSpaceIException();
+    virtual ~DataSpaceIException() throw() override;
 };
 
 class H5_DLLCPP DataTypeIException : public Exception {
-   public:
-	DataTypeIException(const H5std_string& func_name, const H5std_string& message = DEFAULT_MSG);
-	DataTypeIException();
-	virtual ~DataTypeIException() throw();
+  public:
+    DataTypeIException(const H5std_string &func_name, const H5std_string &message = DEFAULT_MSG);
+    DataTypeIException();
+    virtual ~DataTypeIException() throw() override;
+};
+
+class H5_DLLCPP ObjHeaderIException : public Exception {
+  public:
+    ObjHeaderIException(const H5std_string &func_name, const H5std_string &message = DEFAULT_MSG);
+    ObjHeaderIException();
+    virtual ~ObjHeaderIException() throw() override;
 };
 
 class H5_DLLCPP PropListIException : public Exception {
-   public:
-	PropListIException(const H5std_string& func_name, const H5std_string& message = DEFAULT_MSG);
-	PropListIException();
-	virtual ~PropListIException() throw();
+  public:
+    PropListIException(const H5std_string &func_name, const H5std_string &message = DEFAULT_MSG);
+    PropListIException();
+    virtual ~PropListIException() throw() override;
 };
 
 class H5_DLLCPP DataSetIException : public Exception {
-   public:
-	DataSetIException(const H5std_string& func_name, const H5std_string& message = DEFAULT_MSG);
-	DataSetIException();
-	virtual ~DataSetIException() throw();
+  public:
+    DataSetIException(const H5std_string &func_name, const H5std_string &message = DEFAULT_MSG);
+    DataSetIException();
+    virtual ~DataSetIException() throw() override;
 };
 
 class H5_DLLCPP AttributeIException : public Exception {
-   public:
-	AttributeIException(const H5std_string& func_name, const H5std_string& message = DEFAULT_MSG);
-	AttributeIException();
-	virtual ~AttributeIException() throw();
+  public:
+    AttributeIException(const H5std_string &func_name, const H5std_string &message = DEFAULT_MSG);
+    AttributeIException();
+    virtual ~AttributeIException() throw() override;
 };
 
 class H5_DLLCPP ReferenceException : public Exception {
-   public:
-	ReferenceException(const H5std_string& func_name, const H5std_string& message = DEFAULT_MSG);
-	ReferenceException();
-	virtual ~ReferenceException() throw();
+  public:
+    ReferenceException(const H5std_string &func_name, const H5std_string &message = DEFAULT_MSG);
+    ReferenceException();
+    virtual ~ReferenceException() throw() override;
 };
 
 class H5_DLLCPP LibraryIException : public Exception {
-   public:
-	LibraryIException(const H5std_string& func_name, const H5std_string& message = DEFAULT_MSG);
-	LibraryIException();
-	virtual ~LibraryIException() throw();
+  public:
+    LibraryIException(const H5std_string &func_name, const H5std_string &message = DEFAULT_MSG);
+    LibraryIException();
+    virtual ~LibraryIException() throw() override;
 };
 
 class H5_DLLCPP LocationException : public Exception {
-   public:
-	LocationException(const H5std_string& func_name, const H5std_string& message = DEFAULT_MSG);
-	LocationException();
-	virtual ~LocationException() throw();
+  public:
+    LocationException(const H5std_string &func_name, const H5std_string &message = DEFAULT_MSG);
+    LocationException();
+    virtual ~LocationException() throw() override;
 };
 
 class H5_DLLCPP IdComponentException : public Exception {
-   public:
-	IdComponentException(const H5std_string& func_name, const H5std_string& message = DEFAULT_MSG);
-	IdComponentException();
-	virtual ~IdComponentException() throw();
-};
+  public:
+    IdComponentException(const H5std_string &func_name, const H5std_string &message = DEFAULT_MSG);
+    IdComponentException();
+    virtual ~IdComponentException() throw() override;
 
-#ifndef H5_NO_NAMESPACE
-}
-#endif
+}; // end of IdComponentException
+} // namespace H5
 
-#endif // __H5Exception_H
+#endif // H5Exception_H
diff --git a/c++/src/H5FaccProp.cpp b/c++/src/H5FaccProp.cpp
index 5696742..94e054f 100644
--- a/c++/src/H5FaccProp.cpp
+++ b/c++/src/H5FaccProp.cpp
@@ -1,330 +1,354 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
+#include <iostream>
 #include <string>
 
+using std::cerr;
+using std::endl;
+
 #include "H5Include.h"
 #include "H5Exception.h"
 #include "H5IdComponent.h"
 #include "H5PropList.h"
 #include "H5FaccProp.h"
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#endif
+
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+// This DOXYGEN_SHOULD_SKIP_THIS block is a work-around approach to control
+// the order of creation and deletion of the global constants.  See Design Notes
+// in "H5PredType.cpp" for information.
+
+// Initialize a pointer for the constant
+FileAccPropList *FileAccPropList::DEFAULT_ = 0;
+
+//--------------------------------------------------------------------------
+// Function:    FileAccPropList::getConstant
+//              Creates a FileAccPropList object representing the HDF5 constant
+//              H5P_FILE_ACCESS, pointed to by FileAccPropList::DEFAULT_
+// exception    H5::PropListIException
+// Description
+//              If FileAccPropList::DEFAULT_ already points to an allocated
+//              object, throw a PropListIException.  This scenario should not
+//              happen.
+// Programmer   Binh-Minh Ribler - 2015
+//--------------------------------------------------------------------------
+FileAccPropList *
+FileAccPropList::getConstant()
+{
+    // Tell the C library not to clean up, H5Library::termH5cpp will call
+    // H5close - more dependency if use H5Library::dontAtExit()
+    if (!IdComponent::H5dontAtexit_called) {
+        (void)H5dont_atexit();
+        IdComponent::H5dontAtexit_called = true;
+    }
+
+    // If the constant pointer is not allocated, allocate it. Otherwise,
+    // throw because it shouldn't be.
+    if (DEFAULT_ == 0)
+        DEFAULT_ = new FileAccPropList(H5P_FILE_ACCESS);
+    else
+        throw PropListIException("FileAccPropList::getConstant",
+                                 "FileAccPropList::getConstant is being invoked on an allocated DEFAULT_");
+    return (DEFAULT_);
+}
 
 //--------------------------------------------------------------------------
-///\brief	Constant for default property
+// Function:    FileAccPropList::deleteConstants
+// Purpose     Deletes the constant object that FileAccPropList::DEFAULT_
+//              points to.
+// exception    H5::PropListIException
+// Programmer   Binh-Minh Ribler - 2015
 //--------------------------------------------------------------------------
-const FileAccPropList FileAccPropList::DEFAULT;
+void
+FileAccPropList::deleteConstants()
+{
+    delete DEFAULT_;
+}
 
 //--------------------------------------------------------------------------
-// Function:	Default Constructor
-///\brief	Creates a file access property list
-// Programmer:	Binh-Minh Ribler - 2000
+// Purpose     Constant for default property
 //--------------------------------------------------------------------------
-FileAccPropList::FileAccPropList() : PropList( H5P_FILE_ACCESS ) {}
+const FileAccPropList &FileAccPropList::DEFAULT = *getConstant();
+
+#endif // DOXYGEN_SHOULD_SKIP_THIS
 
 //--------------------------------------------------------------------------
-// Function:	FileAccPropList copy constructor
-///\brief	Copy Constructor: makes a copy of the original
-///		FileAccPropList object.
-// Programmer:	Binh-Minh Ribler - 2000
+// Function:    Default Constructor
+///\brief       Creates a file access property list
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-FileAccPropList::FileAccPropList(const FileAccPropList& orig) : PropList(orig) {}
+FileAccPropList::FileAccPropList() : PropList(H5P_FILE_ACCESS)
+{
+}
 
 //--------------------------------------------------------------------------
-// Function:	FileAccPropList overloaded constructor
-///\brief	Creates a file access property list using the id of an
-///		existing one.
-// Programmer:  Binh-Minh Ribler - 2000
+// Function:    FileAccPropList copy constructor
+///\brief       Copy constructor: same HDF5 object as \a original
+///\param       original - IN: FileAccPropList instance to copy
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-FileAccPropList::FileAccPropList(const hid_t plist_id) : PropList(plist_id) {}
+FileAccPropList::FileAccPropList(const FileAccPropList &original) : PropList(original)
+{
+}
 
 //--------------------------------------------------------------------------
-// Function:	FileAccPropList::setStdio
-///\brief	Modifies this property list to use the \c H5FD_STDIO driver.
-///
-///\exception	H5::PropListIException
-// Programmer:  Binh-Minh Ribler - April, 2004
+// Function:    FileAccPropList overloaded constructor
+///\brief       Creates a file access property list using the id of an
+///             existing one.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void FileAccPropList::setStdio() const
+FileAccPropList::FileAccPropList(const hid_t plist_id) : PropList(plist_id)
 {
-   herr_t ret_value = H5Pset_fapl_stdio(id);
-   if( ret_value < 0 )
-   {
-      throw PropListIException("FileAccPropList::setStdio", "H5Pset_fapl_stdio failed");
-   }
 }
 
 //--------------------------------------------------------------------------
-// Function:	FileAccPropList::getDriver
-///\brief	Return the ID of the low-level file driver.
-///\return	A low-level driver ID which is the same ID used when the
-///		driver was set for the property list.  The driver ID is
-///		only valid as long as the file driver remains registered.
-///		Valid driver identifiers can be found at:
-/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-GetDriver
-///\exception	H5::PropListIException
-// Programmer:  Binh-Minh Ribler - April, 2004
+// Function:    FileAccPropList::setStdio
+///\brief       Modifies this property list to use the \c H5FD_STDIO driver.
+///
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
-hid_t FileAccPropList::getDriver() const
+void
+FileAccPropList::setStdio() const
 {
-   hid_t driver = H5Pget_driver(id);
-   if (driver < 0)
-   {
-      throw PropListIException("FileAccPropList::getDriver", "H5Pget_driver failed");
-   }
-   return(driver);
+    herr_t ret_value = H5Pset_fapl_stdio(id);
+    if (ret_value < 0) {
+        throw PropListIException("FileAccPropList::setStdio", "H5Pset_fapl_stdio failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	FileAccPropList::setDriver
-///\brief	Set file driver for this property list.
-///\param	new_driver_id   - IN: File driver
-///\param	new_driver_info - IN: Struct containing the driver-specific properites
-///\exception	H5::PropListIException
+// Function:    FileAccPropList::getDriver
+///\brief       Return the ID of the low-level file driver.
+///\return      A low-level driver ID which is the same ID used when the
+///             driver was set for the property list.  The driver ID is
+///             only valid as long as the file driver remains registered.
+///             For detail on valid driver identifiers, please refer to the
+///             H5Pget_driver API in the HDF5 C Reference Manual.
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - April, 2004
+//--------------------------------------------------------------------------
+hid_t
+FileAccPropList::getDriver() const
+{
+    hid_t driver = H5Pget_driver(id);
+    if (driver < 0) {
+        throw PropListIException("FileAccPropList::getDriver", "H5Pget_driver failed");
+    }
+    return (driver);
+}
+
+//--------------------------------------------------------------------------
+// Function:    FileAccPropList::setDriver
+///\brief       Set file driver for this property list.
+///\param       new_driver_id   - IN: File driver
+///\param       new_driver_info - IN: Struct containing the driver-specific properties
+///\exception   H5::PropListIException
 ///\par Description
-///		For a list of valid driver identifiers, please see the C
-///		layer Reference Manual at:
-/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-SetDriver
-// Programmer:  Binh-Minh Ribler - April, 2004
+///             For information, please refer to the H5Pset_driver API in
+///             the HDF5 C Reference Manual.
+// Programmer   Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
-void FileAccPropList::setDriver(hid_t new_driver_id, const void *new_driver_info) const
+void
+FileAccPropList::setDriver(hid_t new_driver_id, const void *new_driver_info) const
 {
-   herr_t ret_value = H5Pset_driver(id, new_driver_id, new_driver_info);
-   if (ret_value < 0)
-   {
-      throw PropListIException("FileAccPropList::setDriver", "H5Pset_driver failed");
-   }
+    herr_t ret_value = H5Pset_driver(id, new_driver_id, new_driver_info);
+    if (ret_value < 0) {
+        throw PropListIException("FileAccPropList::setDriver", "H5Pset_driver failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	FileAccPropList::setFamilyOffset
-///\brief	Sets offset for family driver.
-///\param	offset - IN: offset value
-///\exception	H5::PropListIException
-// Programmer:  Binh-Minh Ribler - April, 2004
+// Function:    FileAccPropList::setFamilyOffset
+///\brief       Sets offset for family driver.
+///\param       offset - IN: offset value
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
-void FileAccPropList::setFamilyOffset(hsize_t offset) const
+void
+FileAccPropList::setFamilyOffset(hsize_t offset) const
 {
-   herr_t ret_value = H5Pset_family_offset(id, offset);
-   if (ret_value < 0)
-   {
-      throw PropListIException("FileAccPropList::setFamilyOffset", "H5Pset_family_offset failed");
-   }
+    herr_t ret_value = H5Pset_family_offset(id, offset);
+    if (ret_value < 0) {
+        throw PropListIException("FileAccPropList::setFamilyOffset", "H5Pset_family_offset failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	FileAccPropList::getFamilyOffset
-///\brief	Get offset for family driver.
-///\return	Offset for family driver
-///\exception	H5::PropListIException
-// Programmer:  Binh-Minh Ribler - April, 2004
+// Function:    FileAccPropList::getFamilyOffset
+///\brief       Get offset for family driver.
+///\return      Offset for family driver
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
-hsize_t FileAccPropList::getFamilyOffset() const
+hsize_t
+FileAccPropList::getFamilyOffset() const
 {
-   hsize_t offset;
-   herr_t ret_value = H5Pget_family_offset(id, &offset);
-   if (ret_value < 0)
-   {
-      throw PropListIException("FileAccPropList::getFamilyOffset", "H5Pget_family_offset failed");
-   }
-   return(offset);
+    hsize_t offset;
+    herr_t  ret_value = H5Pget_family_offset(id, &offset);
+    if (ret_value < 0) {
+        throw PropListIException("FileAccPropList::getFamilyOffset", "H5Pget_family_offset failed");
+    }
+    return (offset);
 }
 
 //--------------------------------------------------------------------------
-// Function:	FileAccPropList::setCore
-///\brief	Modifies this file access property list to use the \c H5FD_CORE
-///		driver.
-///\param	increment - IN: Specifies how much memory to increase each
-///				time more memory is needed, in bytes
-///\param	backing_store - IN: Indicating whether to write the file
-///				contents to disk when the file is closed
-///\exception	H5::PropListIException
+// Function:    FileAccPropList::setCore
+///\brief       Modifies this file access property list to use the \c H5FD_CORE
+///             driver.
+///\param       increment - IN: Specifies how much memory to increase each
+///                             time more memory is needed, in bytes
+///\param       backing_store - IN: Indicating whether to write the file
+///                                 contents to disk when the file is closed
+///\exception   H5::PropListIException
 ///\par Description
-///		For more details on the use of \c H5FD_CORE driver, please
-///		refer to
-/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-SetFaplCore
-// Programmer:  Binh-Minh Ribler - April, 2004
+///             For more details on the use of \c H5FD_CORE driver, please
+///             refer to the H5Pset_fapl_core API in the HDF5 C Reference Manual.
+// Programmer   Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
-void FileAccPropList::setCore (size_t increment, hbool_t backing_store) const
+void
+FileAccPropList::setCore(size_t increment, hbool_t backing_store) const
 {
-   herr_t ret_value = H5Pset_fapl_core (id, increment, backing_store);
-   if (ret_value < 0)
-   {
-      throw PropListIException ("FileAccPropList::setCore", "H5Pset_fapl_core failed");
-   }
+    herr_t ret_value = H5Pset_fapl_core(id, increment, backing_store);
+    if (ret_value < 0) {
+        throw PropListIException("FileAccPropList::setCore", "H5Pset_fapl_core failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	FileAccPropList::getCore
-///\brief	Queries core file driver properties.
-///\param	increment - OUT: Size of memory increment, in bytes
-///\param	backing_store - OUT: Indicating whether to write the file
-///				contents to disk when the file is closed
-///\exception	H5::PropListIException
-// Programmer:  Binh-Minh Ribler - April, 2004
+// Function:    FileAccPropList::getCore
+///\brief       Queries core file driver properties.
+///\param       increment - OUT: Size of memory increment, in bytes
+///\param       backing_store - OUT: Indicating whether to write the file
+///                                  contents to disk when the file is closed
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
-void FileAccPropList::getCore (size_t& increment, hbool_t& backing_store) const
+void
+FileAccPropList::getCore(size_t &increment, hbool_t &backing_store) const
 {
-   herr_t ret_value = H5Pget_fapl_core(id, &increment, &backing_store);
-   if( ret_value < 0 )
-   {
-      throw PropListIException("FileAccPropList::getCore", "H5Pget_fapl_core failed");
-   }
+    herr_t ret_value = H5Pget_fapl_core(id, &increment, &backing_store);
+    if (ret_value < 0) {
+        throw PropListIException("FileAccPropList::getCore", "H5Pget_fapl_core failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	FileAccPropList::setFamily
-///\brief	Sets this file access property list to use the family driver.
-///\param	memb_size  - IN: Size in bytes of each file member
-///\param	memb_plist - IN: File access property list to be used for
-///					each family member
-///\exception	H5::PropListIException
-///\par Description
-///		Note that \a memb_size is used only when creating a new file.
-// Programmer:  Binh-Minh Ribler - April, 2004
-//--------------------------------------------------------------------------
-void FileAccPropList::setFamily( hsize_t memb_size, const FileAccPropList& memb_plist ) const
-{
-   herr_t ret_value = H5Pset_fapl_family (id, memb_size, memb_plist.getId() );
-   if( ret_value < 0 )
-   {
-      throw PropListIException("FileAccPropList::setFamily", "H5Pset_fapl_family failed");
-   }
-}
-
-//--------------------------------------------------------------------------
-// Function:	FileAccPropList::getFamily
-///\brief	Returns information about the family file access property
-///		list.
-///\param	memb_size  - OUT: Size in bytes of each file member
-///\param	memb_plist - OUT: Retrieved file access property list for each
-///				  file member
-///\exception	H5::PropListIException
-// Programmer:  Binh-Minh Ribler - April, 2004
-//--------------------------------------------------------------------------
-void FileAccPropList::getFamily(hsize_t& memb_size, FileAccPropList& memb_plist) const
-{
-   hid_t memb_plist_id;
-   herr_t ret_value = H5Pget_fapl_family( id, &memb_size, &memb_plist_id );
-   if( ret_value < 0 )
-   {
-      throw PropListIException("FileAccPropList::getFamily", "H5Pget_fapl_family failed");
-   }
-   memb_plist.p_setId(memb_plist_id);
-}
-
-//--------------------------------------------------------------------------
-// Function:	FileAccPropList::getFamily
-///\brief	This is an overloaded member function, provided for convenience.
-///		It differs from the above function only in what arguments it
-///		accepts and its return value.
-///\param	memb_size  - OUT: Size in bytes of each file member
-///\return	The file access property list for each file member
-///\exception	H5::PropListIException
-// Programmer:  Binh-Minh Ribler - April, 2004
-//--------------------------------------------------------------------------
-FileAccPropList FileAccPropList::getFamily(hsize_t& memb_size) const
-{
-   hid_t memb_plist_id;
-   herr_t ret_value = H5Pget_fapl_family( id, &memb_size, &memb_plist_id );
-   if( ret_value < 0 )
-   {
-      throw PropListIException("FileAccPropList::getFamily", "H5Pget_fapl_family failed");
-   }
-   FileAccPropList memb_plist(memb_plist_id);
-   return(memb_plist);
-}
-
-//--------------------------------------------------------------------------
-// Function:	FileAccPropList::setSplit
-///\brief	Emulates the old split file driver, which stored meta data
-///		in one file and raw data in another file.
-///\param	meta_plist  - IN: File access plist for the metadata file
-///\param	raw_plist   - IN: File access plist for the raw data file
-///\param	meta_ext    - IN: Metadata filename extension as \c char*
-///\param	raw_ext     - IN: Raw data filename extension as \c char*
-///\exception	H5::PropListIException
+// Function:    FileAccPropList::setFamily
+///\brief       Sets this file access property list to use the family driver.
+///\param       memb_size  - IN: Size in bytes of each file member
+///\param       memb_plist - IN: File access property list to be used for
+///                              each family member
+///\exception   H5::PropListIException
 ///\par Description
-///		Temporary - For information, please refer to:
-/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-SetFaplSplit
-// Programmer:  Binh-Minh Ribler - April, 2004
+///             Note that \a memb_size is used only when creating a new file.
+// Programmer   Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
-void FileAccPropList::setSplit(const FileAccPropList& meta_plist, const FileAccPropList& raw_plist, const char* meta_ext, const char* raw_ext ) const
+void
+FileAccPropList::setFamily(hsize_t memb_size, const FileAccPropList &memb_plist) const
 {
-   hid_t meta_pid = meta_plist.getId();
-   hid_t raw_pid = raw_plist.getId();
-   herr_t ret_value = H5Pset_fapl_split( id, meta_ext, meta_pid, raw_ext, raw_pid );
-   if( ret_value < 0 )
-{
-      throw PropListIException("FileAccPropList::setSplit", "H5Pset_fapl_split failed");
-   }
+    herr_t ret_value = H5Pset_fapl_family(id, memb_size, memb_plist.getId());
+    if (ret_value < 0) {
+        throw PropListIException("FileAccPropList::setFamily", "H5Pset_fapl_family failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	FileAccPropList::setSplit
-///\brief	This is an overloaded member function, kept for backward
-///		compatibility.  It differs from the above function in that it
-///		misses const's.  This wrapper will be removed in future release.
-///\param	meta_plist  - IN: File access plist for the metadata file
-///\param	raw_plist   - IN: File access plist for the raw data file
-///\param	meta_ext    - IN: Metadata filename extension as \c char*
-///\param	raw_ext     - IN: Raw data filename extension as \c char*
-///\exception	H5::PropListIException
-// Programmer:  Binh-Minh Ribler - April, 2004
-// Note:	Retiring April, 2014
-//--------------------------------------------------------------------------
-void FileAccPropList::setSplit(FileAccPropList& meta_plist, FileAccPropList& raw_plist, const char* meta_ext, const char* raw_ext ) const
-{
-    setSplit((const FileAccPropList)meta_plist, (const FileAccPropList)raw_plist, meta_ext, raw_ext);
+// Function:    FileAccPropList::getFamily
+///\brief       Returns information about the family file access property
+///             list.
+///\param       memb_size  - OUT: Size in bytes of each file member
+///\param       memb_plist - OUT: Retrieved file access property list for each
+///                               file member
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - April, 2004
+//--------------------------------------------------------------------------
+void
+FileAccPropList::getFamily(hsize_t &memb_size, FileAccPropList &memb_plist) const
+{
+    hid_t  memb_plist_id;
+    herr_t ret_value = H5Pget_fapl_family(id, &memb_size, &memb_plist_id);
+    if (ret_value < 0) {
+        throw PropListIException("FileAccPropList::getFamily", "H5Pget_fapl_family failed");
+    }
+    memb_plist.p_setId(memb_plist_id);
 }
 
 //--------------------------------------------------------------------------
-// Function:	FileAccPropList::setSplit
-///\brief	This is an overloaded member function, provided for convenience.
-///		It takes character arguments as \c H5std_string.
-///\param	meta_plist  - IN: File access plist for the metadata file
-///\param	raw_plist   - IN: File access plist for the raw data file
-///\param	meta_ext    - IN: Metadata filename extension as \c H5std_string
-///\param	raw_ext     - IN: Raw data filename extension as \c H5std_string
-///\exception	H5::PropListIException
-// Programmer:  Binh-Minh Ribler - April, 2004
+// Function:    FileAccPropList::getFamily
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function only in what arguments it
+///             accepts and its return value.
+///\param       memb_size  - OUT: Size in bytes of each file member
+///\return      The file access property list for each file member
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - April, 2004
+//--------------------------------------------------------------------------
+FileAccPropList
+FileAccPropList::getFamily(hsize_t &memb_size) const
+{
+    hid_t  memb_plist_id;
+    herr_t ret_value = H5Pget_fapl_family(id, &memb_size, &memb_plist_id);
+    if (ret_value < 0) {
+        throw PropListIException("FileAccPropList::getFamily", "H5Pget_fapl_family failed");
+    }
+    FileAccPropList memb_plist(memb_plist_id);
+    return (memb_plist);
+}
+
 //--------------------------------------------------------------------------
-void FileAccPropList::setSplit(const FileAccPropList& meta_plist, const FileAccPropList& raw_plist, const H5std_string& meta_ext, const H5std_string& raw_ext ) const
-{
-   setSplit( meta_plist, raw_plist, meta_ext.c_str(), raw_ext.c_str() );
+// Function:    FileAccPropList::setSplit
+///\brief       Emulates the old split file driver, which stored meta data
+///             in one file and raw data in another file.
+///\param       meta_plist  - IN: File access plist for the metadata file
+///\param       raw_plist   - IN: File access plist for the raw data file
+///\param       meta_ext    - IN: Metadata filename extension as \c char*
+///\param       raw_ext     - IN: Raw data filename extension as \c char*
+///\exception   H5::PropListIException
+///\par Description
+///             For information, please refer to the H5Pset_fapl_split API in
+///             the HDF5 C Reference Manual.
+// Programmer   Binh-Minh Ribler - April, 2004
+//--------------------------------------------------------------------------
+void
+FileAccPropList::setSplit(const FileAccPropList &meta_plist, const FileAccPropList &raw_plist,
+                          const char *meta_ext, const char *raw_ext) const
+{
+    hid_t  meta_pid  = meta_plist.getId();
+    hid_t  raw_pid   = raw_plist.getId();
+    herr_t ret_value = H5Pset_fapl_split(id, meta_ext, meta_pid, raw_ext, raw_pid);
+    if (ret_value < 0) {
+        throw PropListIException("FileAccPropList::setSplit", "H5Pset_fapl_split failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	FileAccPropList::setSplit
-///\brief	This is an overloaded member function, kept for backward
-///		compatibility.  It differs from the above function in that it
-///		misses const's.  This wrapper will be removed in future release.
-///\param	meta_plist  - IN: File access plist for the metadata file
-///\param	raw_plist   - IN: File access plist for the raw data file
-///\param	meta_ext    - IN: Metadata filename extension as \c string
-///\param	raw_ext     - IN: Raw data filename extension as \c string
-///\exception	H5::PropListIException
-// Programmer:  Binh-Minh Ribler - April, 2004
-// Note:	Retiring April, 2014
+// Function:    FileAccPropList::setSplit
+///\brief       This is an overloaded member function, provided for convenience.
+///             It takes character arguments as \c H5std_string.
+///\param       meta_plist  - IN: File access plist for the metadata file
+///\param       raw_plist   - IN: File access plist for the raw data file
+///\param       meta_ext    - IN: Metadata filename extension as \c H5std_string
+///\param       raw_ext     - IN: Raw data filename extension as \c H5std_string
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
-void FileAccPropList::setSplit(FileAccPropList& meta_plist, FileAccPropList& raw_plist, const H5std_string& meta_ext, const H5std_string& raw_ext ) const
+void
+FileAccPropList::setSplit(const FileAccPropList &meta_plist, const FileAccPropList &raw_plist,
+                          const H5std_string &meta_ext, const H5std_string &raw_ext) const
 {
-   setSplit((const FileAccPropList)meta_plist, (const FileAccPropList)raw_plist, meta_ext.c_str(), raw_ext.c_str() );
+    setSplit(meta_plist, raw_plist, meta_ext.c_str(), raw_ext.c_str());
 }
 
 // Stream Virtual File Driver had been removed from the main library.
@@ -332,344 +356,464 @@ void FileAccPropList::setSplit(FileAccPropList& meta_plist, FileAccPropList& raw
 // -BMR, March, 2012
 
 //--------------------------------------------------------------------------
-// Function:	FileAccPropList::getSieveBufSize
-///\brief	Returns the current settings for the data sieve buffer size
-///		property from this property list.
-///\return	Data sieve buffer size, in bytes
-///\exception	H5::PropListIException
-// Programmer:  Binh-Minh Ribler - April, 2004
+// Function:    FileAccPropList::getSieveBufSize
+///\brief       Returns the current settings for the data sieve buffer size
+///             property from this property list.
+///\return      Data sieve buffer size, in bytes
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
-size_t FileAccPropList::getSieveBufSize() const
+size_t
+FileAccPropList::getSieveBufSize() const
 {
-   size_t bufsize;
-   herr_t ret_value = H5Pget_sieve_buf_size(id, &bufsize);
-   if( ret_value < 0 )
-   {
-      throw PropListIException("FileAccPropList::getSieveBufSize", "H5Pget_sieve_buf_size failed");
-   }
-   return(bufsize);
+    size_t bufsize;
+    herr_t ret_value = H5Pget_sieve_buf_size(id, &bufsize);
+    if (ret_value < 0) {
+        throw PropListIException("FileAccPropList::getSieveBufSize", "H5Pget_sieve_buf_size failed");
+    }
+    return (bufsize);
 }
 
 //--------------------------------------------------------------------------
-// Function:	FileAccPropList::setSieveBufSize
-///\brief	Sets the maximum size of the data sieve buffer.
-///\param	bufsize - IN: Maximum size, in bytes, of data sieve buffer
-///\exception	H5::PropListIException
+// Function:    FileAccPropList::setSieveBufSize
+///\brief       Sets the maximum size of the data sieve buffer.
+///\param       bufsize - IN: Maximum size, in bytes, of data sieve buffer
+///\exception   H5::PropListIException
 ///\par Description
-///		For detail on data sieving, please refer to
-/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-SetSieveBufSize
-// Programmer:  Binh-Minh Ribler - April, 2004
+///             For more detail, please refer to the H5Pset_sieve_buf_size
+///             API in the HDF5 C Reference Manual.
+// Programmer   Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
-void FileAccPropList::setSieveBufSize(size_t bufsize) const
+void
+FileAccPropList::setSieveBufSize(size_t bufsize) const
 {
-   herr_t ret_value = H5Pset_sieve_buf_size(id, bufsize);
-   if( ret_value < 0 )
-   {
-      throw PropListIException("FileAccPropList::getSieveBufSize", "H5Pget_sieve_buf_size failed");
-   }
+    herr_t ret_value = H5Pset_sieve_buf_size(id, bufsize);
+    if (ret_value < 0) {
+        throw PropListIException("FileAccPropList::getSieveBufSize", "H5Pget_sieve_buf_size failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	FileAccPropList::setMetaBlockSize
-///\brief	Sets the minimum size of metadata block allocations.
-///\param	block_size - IN: Minimum size, in bytes, of metadata
-///		block allocations
-///\exception	H5::PropListIException
+// Function:    FileAccPropList::setMetaBlockSize
+///\brief       Sets the minimum size of metadata block allocations.
+///\param       block_size - IN: Minimum size, in bytes, of metadata
+///             block allocations
+///\exception   H5::PropListIException
 ///\par Description
-///		For more detail, please see the C layer Reference Manual at:
-/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-SetMetaBlockSize
-// Programmer:  Binh-Minh Ribler - April, 2004
+///             For information, please refer to the H5Pset_meta_block_size
+///             API in the HDF5 C Reference Manual.
+// Programmer   Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
-void FileAccPropList::setMetaBlockSize(hsize_t &block_size) const
+void
+FileAccPropList::setMetaBlockSize(hsize_t &block_size) const
 {
-   herr_t ret_value = H5Pset_meta_block_size(id, block_size);
-   if( ret_value < 0 )
-   {
-      throw PropListIException("FileAccPropList::setMetaBlockSize", "H5Pset_meta_block_size failed");
-   }
+    herr_t ret_value = H5Pset_meta_block_size(id, block_size);
+    if (ret_value < 0) {
+        throw PropListIException("FileAccPropList::setMetaBlockSize", "H5Pset_meta_block_size failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	FileAccPropList::getMetaBlockSize
-///\brief	Returns the current metadata block size setting.
-///\return	Metadata block size
-///\exception	H5::PropListIException
-// Programmer:  Binh-Minh Ribler - April, 2004
+// Function:    FileAccPropList::getMetaBlockSize
+///\brief       Returns the current metadata block size setting.
+///\return      Metadata block size
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
-hsize_t FileAccPropList::getMetaBlockSize() const
+hsize_t
+FileAccPropList::getMetaBlockSize() const
 {
-   hsize_t block_size;
-   herr_t ret_value = H5Pget_meta_block_size(id, &block_size);
-   if( ret_value < 0 )
-   {
-      throw PropListIException("FileAccPropList::getMetaBlockSize", "H5Pget_meta_block_size failed");
-   }
-   return(block_size);
+    hsize_t block_size;
+    herr_t  ret_value = H5Pget_meta_block_size(id, &block_size);
+    if (ret_value < 0) {
+        throw PropListIException("FileAccPropList::getMetaBlockSize", "H5Pget_meta_block_size failed");
+    }
+    return (block_size);
 }
 
 //--------------------------------------------------------------------------
-// Function:	FileAccPropList::setLog
-///\brief	Modifies this file access property list to use the logging
-///		driver.
-///\param	logfile  - IN: Name of the log file
-///\param	flags    - IN: Flags specifying the types of logging activity
-///\param	buf_size - IN: Size of the logging buffer
-///\exception	H5::PropListIException
+// Function:    FileAccPropList::setLog
+///\brief       Modifies this file access property list to use the logging
+///             driver.
+///\param       logfile  - IN: Name of the log file
+///\param       flags    - IN: Flags specifying the types of logging activity
+///\param       buf_size - IN: Size of the logging buffer
+///\exception   H5::PropListIException
 ///\par Description
-///		For detail on \a flags, please refer to
-/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-SetFaplLog
-// Programmer:  Binh-Minh Ribler - April, 2004
+///             For information, please refer to the H5Pset_fapl_log API in
+///             the HDF5 C Reference Manual.
+// Programmer   Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
-void FileAccPropList::setLog(const char *logfile, unsigned flags, size_t buf_size) const
+void
+FileAccPropList::setLog(const char *logfile, unsigned flags, size_t buf_size) const
 {
-   herr_t ret_value = H5Pset_fapl_log(id, logfile, flags, buf_size);
-   if( ret_value < 0 )
-   {
-      throw PropListIException("FileAccPropList::setLog", "H5Pset_fapl_log failed");
-   }
+    herr_t ret_value = H5Pset_fapl_log(id, logfile, flags, buf_size);
+    if (ret_value < 0) {
+        throw PropListIException("FileAccPropList::setLog", "H5Pset_fapl_log failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	FileAccPropList::setLog
-///\brief	This is an overloaded member function, provided for convenience.
-///		It differs from the above function only in what arguments it
-///		accepts.
-///\param	logfile  - IN: Name of the log file - string
-///\param	flags    - IN: Flags specifying the types of logging activity
-///\param	buf_size - IN: Size of the logging buffer
-// Programmer:  Binh-Minh Ribler - April, 2004
+// Function:    FileAccPropList::setLog
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function only in what arguments it
+///             accepts.
+///\param       logfile  - IN: Name of the log file - string
+///\param       flags    - IN: Flags specifying the types of logging activity
+///\param       buf_size - IN: Size of the logging buffer
+// Programmer   Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
-void FileAccPropList::setLog(const H5std_string& logfile, unsigned flags, size_t buf_size) const
+void
+FileAccPropList::setLog(const H5std_string &logfile, unsigned flags, size_t buf_size) const
 {
-   setLog(logfile.c_str(), flags, buf_size);
+    setLog(logfile.c_str(), flags, buf_size);
 }
 
 //--------------------------------------------------------------------------
-// Function:	FileAccPropList::setSec2
-///\brief	Modifies this file access property list to use the sec2
-///		driver.
+// Function:    FileAccPropList::setSec2
+///\brief       Modifies this file access property list to use the sec2
+///             driver.
 ///
-///\exception	H5::PropListIException
-// Programmer:  Binh-Minh Ribler - April, 2004
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
-void FileAccPropList::setSec2() const
+void
+FileAccPropList::setSec2() const
 {
-   herr_t ret_value = H5Pset_fapl_sec2(id);
-   if( ret_value < 0 )
-   {
-      throw PropListIException("FileAccPropList::setSec2", "H5Pset_fapl_sec2 failed");
-   }
+    herr_t ret_value = H5Pset_fapl_sec2(id);
+    if (ret_value < 0) {
+        throw PropListIException("FileAccPropList::setSec2", "H5Pset_fapl_sec2 failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	FileAccPropList::setAlignment
-///\brief	Sets the alignment properties of this property list.
-///\param	threshold - IN: Threshold value for file object size
-///\param	alignment - IN: Alignment value
-///\exception	H5::PropListIException
+// Function:    FileAccPropList::setAlignment
+///\brief       Sets the alignment properties of this property list.
+///\param       threshold - IN: Threshold value for file object size
+///\param       alignment - IN: Alignment value
+///\exception   H5::PropListIException
 ///\par Description
-///		The parameter \a threshold must have a non-negative value.
-///		Note that setting the threshold value to 0 (zero) has the
-///		effect of a special case, forcing everything to be aligned.
-///		The parameter \a alignment must have a positive value.
+///             The parameter \a threshold must have a non-negative value.
+///             Note that setting the threshold value to 0 (zero) has the
+///             effect of a special case, forcing everything to be aligned.
+///             The parameter \a alignment must have a positive value.
 ///
-///		For detail on \a setting alignment, please refer to
-/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-SetAlignment
-// Programmer:	Binh-Minh Ribler - 2000
+///             For more detail, please refer to the H5Pset_alignment API in
+///             the HDF5 C Reference Manual.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void FileAccPropList::setAlignment( hsize_t threshold, hsize_t alignment ) const
+void
+FileAccPropList::setAlignment(hsize_t threshold, hsize_t alignment) const
 {
-   herr_t ret_value = H5Pset_alignment( id, threshold, alignment );
-   if( ret_value < 0 )
-   {
-      throw PropListIException("FileAccPropList::setAlignment", "H5Pset_alignment failed");
-   }
+    herr_t ret_value = H5Pset_alignment(id, threshold, alignment);
+    if (ret_value < 0) {
+        throw PropListIException("FileAccPropList::setAlignment", "H5Pset_alignment failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	FileAccPropList::getAlignment
-///\brief	Returns the current settings for alignment properties from
-///		this property list.
-///\param	threshold - OUT: Retrieved threshold value for file object size
-///\param	alignment - OUT: Retrieved alignment value
-///\exception	H5::PropListIException
-// Programmer:	Binh-Minh Ribler - 2000
+// Function:    FileAccPropList::getAlignment
+///\brief       Returns the current settings for alignment properties from
+///             this property list.
+///\param       threshold - OUT: Retrieved threshold value for file object size
+///\param       alignment - OUT: Retrieved alignment value
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void FileAccPropList::getAlignment( hsize_t &threshold, hsize_t &alignment ) const
+void
+FileAccPropList::getAlignment(hsize_t &threshold, hsize_t &alignment) const
 {
-   herr_t ret_value = H5Pget_alignment( id, &threshold, &alignment );
-   if( ret_value < 0 )
-   {
-      throw PropListIException("FileAccPropList::getAlignment", "H5Pget_alignment failed");
-   }
+    herr_t ret_value = H5Pget_alignment(id, &threshold, &alignment);
+    if (ret_value < 0) {
+        throw PropListIException("FileAccPropList::getAlignment", "H5Pget_alignment failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	FileAccPropList::setMultiType
-///\brief	Sets data type for \c MULTI driver.
-///\param	dtype - IN: Type of data
-///\exception	H5::PropListIException
+// Function:    FileAccPropList::setMultiType
+///\brief       Sets data type for \c MULTI driver.
+///\param       dtype - IN: Type of data
+///\exception   H5::PropListIException
 ///\par Description
-///		More details and valid values for \a dtype can be found at:
-/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-SetMultiType
-// Programmer:  Binh-Minh Ribler - April, 2004
+///             For information, please refer to the H5Pset_multi_type API in
+///             the HDF5 C Reference Manual.
+// Programmer   Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
-void FileAccPropList::setMultiType(H5FD_mem_t dtype) const
+void
+FileAccPropList::setMultiType(H5FD_mem_t dtype) const
 {
-   herr_t ret_value = H5Pset_multi_type(id, dtype);
-   if( ret_value < 0 )
-   {
-      throw PropListIException("FileAccPropList::setMultiType", "H5Pset_multi_type failed");
-   }
+    herr_t ret_value = H5Pset_multi_type(id, dtype);
+    if (ret_value < 0) {
+        throw PropListIException("FileAccPropList::setMultiType", "H5Pset_multi_type failed");
+    }
+}
+
+//--------------------------------------------------------------------------
+// Function:    FileAccPropList::getMultiType
+///\brief       Returns the data type property for \c MULTI driver.
+///\return      The data type property
+///\exception   H5::PropListIException
+///\par Description
+///             For information, please refer to the H5Pget_multi_type API in
+///             the HDF5 C Reference Manual.
+// Programmer   Binh-Minh Ribler - April, 2004
+//--------------------------------------------------------------------------
+H5FD_mem_t
+FileAccPropList::getMultiType() const
+{
+    H5FD_mem_t dtype;
+    herr_t     ret_value = H5Pget_multi_type(id, &dtype);
+    if (ret_value < 0) {
+        throw PropListIException("FileAccPropList::getMultiType", "H5Pget_multi_type failed");
+    }
+    return (dtype);
 }
 
 //--------------------------------------------------------------------------
-// Function:	FileAccPropList::getMultiType
-///\brief	Returns the data type property for \c MULTI driver.
-///\return	The data type property
-///\exception	H5::PropListIException
+// Function:    FileAccPropList::setCache
+///\brief       Sets the meta data cache and raw data chunk cache parameters.
+///\param       mdc_nelmts - IN: Number of elements in the meta data cache
+///\param       rdcc_nelmts - IN: Number of elements in the raw data chunk cache
+///\param       rdcc_nbytes - IN: Total size of the raw data chunk cache, in bytes
+///\param       rdcc_w0 - IN: Preemption policy
+///\exception   H5::PropListIException
 ///\par Description
-///		More details and possible returned values can be found at:
-/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-GetMultiType
-// Programmer:  Binh-Minh Ribler - April, 2004
+///             The argument \a rdcc_w0 should hold a value between 0 and 1
+///             inclusive.  This value indicates how much chunks that have
+///             been fully read are favored for preemption. A value of zero
+///             means fully read chunks are treated no differently than other
+///             chunks (the preemption is strictly LRU) while a value of one
+///             means fully read chunks are always preempted before other chunks.
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+void
+FileAccPropList::setCache(int mdc_nelmts, size_t rdcc_nelmts, size_t rdcc_nbytes, double rdcc_w0) const
+{
+    herr_t ret_value = H5Pset_cache(id, mdc_nelmts, rdcc_nelmts, rdcc_nbytes, rdcc_w0);
+    if (ret_value < 0) {
+        throw PropListIException("FileAccPropList::setCache", "H5Pset_cache failed");
+    }
+}
+
 //--------------------------------------------------------------------------
-H5FD_mem_t FileAccPropList::getMultiType() const
+// Function:    FileAccPropList::getCache
+///\brief       Queries the meta data cache and raw data chunk cache parameters.
+///\param       mdc_nelmts  - OUT: Number of elements in the meta data cache
+///\param       rdcc_nelmts - OUT: Number of elements in the raw data chunk cache
+///\param       rdcc_nbytes - OUT: Total size of the raw data chunk cache, in bytes
+///\param       rdcc_w0 - OUT: Preemption policy
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+void
+FileAccPropList::getCache(int &mdc_nelmts, size_t &rdcc_nelmts, size_t &rdcc_nbytes, double &rdcc_w0) const
 {
-   H5FD_mem_t dtype;
-   herr_t ret_value = H5Pget_multi_type(id, &dtype);
-   if( ret_value < 0 )
-   {
-      throw PropListIException("FileAccPropList::getMultiType", "H5Pget_multi_type failed");
-   }
-   return(dtype);
+    herr_t ret_value = H5Pget_cache(id, &mdc_nelmts, &rdcc_nelmts, &rdcc_nbytes, &rdcc_w0);
+    if (ret_value < 0) {
+        throw PropListIException("FileAccPropList::getCache", "H5Pget_cache failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	FileAccPropList::setCache
-///\brief	Sets the meta data cache and raw data chunk cache parameters.
-///\param	mdc_nelmts - IN: Number of elements in the meta data cache
-///\param	rdcc_nelmts - IN: Number of elements in the raw data chunk cache
-///\param	rdcc_nbytes - IN: Total size of the raw data chunk cache, in bytes
-///\param	rdcc_w0 - IN: Preemption policy
-///\exception	H5::PropListIException
-///\par Description
-///		The argument \a rdcc_w0 should hold a value between 0 and 1
-///		inclusive.  This value indicates how much chunks that have
-///		been fully read are favored for preemption. A value of zero
-///		means fully read chunks are treated no differently than other
-///		chunks (the preemption is strictly LRU) while a value of one
-///		means fully read chunks are always preempted before other chunks.
-// Programmer:	Binh-Minh Ribler - 2000
+// Function:    FileAccPropList::setFcloseDegree
+///\brief       Sets the degree for the file close behavior.
+///\param       degree - IN:
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
-void FileAccPropList::setCache( int mdc_nelmts, size_t rdcc_nelmts, size_t rdcc_nbytes, double rdcc_w0 ) const
+void
+FileAccPropList::setFcloseDegree(H5F_close_degree_t degree) const
 {
-   herr_t ret_value = H5Pset_cache( id, mdc_nelmts, rdcc_nelmts, rdcc_nbytes, rdcc_w0 );
-   if( ret_value < 0 )
-   {
-      throw PropListIException("FileAccPropList::setCache", "H5Pset_cache failed");
-   }
+    herr_t ret_value = H5Pset_fclose_degree(id, degree);
+    if (ret_value < 0) {
+        throw PropListIException("FileAccPropList::setFcloseDegree", "H5Pset_fclose_degree failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	FileAccPropList::getCache
-///\brief	Queries the meta data cache and raw data chunk cache parameters.
-///\param	mdc_nelmts  - OUT: Number of elements in the meta data cache
-///\param	rdcc_nelmts - OUT: Number of elements in the raw data chunk cache
-///\param	rdcc_nbytes - OUT: Total size of the raw data chunk cache, in bytes
-///\param	rdcc_w0 - OUT: Preemption policy
-///\exception	H5::PropListIException
-// Programmer:	Binh-Minh Ribler - 2000
+// Function:    FileAccPropList::getFcloseDegree
+///\brief       Returns the degree for the file close behavior.
+///\return      The degree for the file close behavior
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
-void FileAccPropList::getCache( int& mdc_nelmts, size_t& rdcc_nelmts, size_t& rdcc_nbytes, double& rdcc_w0 ) const
+H5F_close_degree_t
+FileAccPropList::getFcloseDegree() const
 {
-   herr_t ret_value = H5Pget_cache( id, &mdc_nelmts, &rdcc_nelmts, &rdcc_nbytes, &rdcc_w0 );
-   if( ret_value < 0 )
-   {
-      throw PropListIException("FileAccPropList::getCache", "H5Pget_cache failed");
-   }
+    H5F_close_degree_t degree;
+    herr_t             ret_value = H5Pget_fclose_degree(id, &degree);
+    if (ret_value < 0) {
+        throw PropListIException("FileAccPropList::getFcloseDegree", "H5Pget_fclose_degree failed");
+    }
+    return (degree);
 }
 
 //--------------------------------------------------------------------------
-// Function:	FileAccPropList::setFcloseDegree
-///\brief	Sets the degree for the file close behavior.
-///\param	degree - IN:
-///\exception	H5::PropListIException
-// Programmer:  Binh-Minh Ribler - April, 2004
+// Function:    FileAccPropList::setGcReferences
+///\brief       Sets garbage collecting references flag.
+///\param       gc_ref - IN: Flag setting reference garbage collection to
+///                          on (1) or off (0).
+///\exception   H5::PropListIException
+///\par Description
+///             For information, please refer to the H5Pset_gc_references API in
+///             the HDF5 C Reference Manual.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void FileAccPropList::setFcloseDegree(H5F_close_degree_t degree)
+void
+FileAccPropList::setGcReferences(unsigned gc_ref) const
 {
-   herr_t ret_value = H5Pset_fclose_degree(id, degree);
-   if( ret_value < 0 )
-   {
-      throw PropListIException("FileAccPropList::setFcloseDegree", "H5Pset_fclose_degree failed");
-   }
+    herr_t ret_value = H5Pset_gc_references(id, gc_ref);
+    if (ret_value < 0) {
+        throw PropListIException("FileAccPropList::setGcReferences", "H5Pset_gc_references failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	FileAccPropList::getFcloseDegree
-///\brief	Returns the degree for the file close behavior.
-///\return	The degree for the file close behavior
-///\exception	H5::PropListIException
-// Programmer:  Binh-Minh Ribler - April, 2004
+// Function:    FileAccPropList::getGcReferences
+///\brief       Returns the garbage collecting references setting.
+///\return      Garbage collecting references setting, 0 (off) or 1 (on)
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-H5F_close_degree_t FileAccPropList::getFcloseDegree()
+unsigned
+FileAccPropList::getGcReferences() const
 {
-   H5F_close_degree_t degree;
-   herr_t ret_value = H5Pget_fclose_degree(id, &degree);
-   if( ret_value < 0 )
-   {
-      throw PropListIException("FileAccPropList::getFcloseDegree", "H5Pget_fclose_degree failed");
-   }
-   return(degree);
+    unsigned gc_ref;
+
+    // the name of this routine will be changed to H5Pget_gc_references???
+    herr_t ret_value = H5Pget_gc_references(id, &gc_ref);
+    if (ret_value < 0) {
+        throw PropListIException("FileAccPropList::getGcReferences", "H5Pget_gc_references failed");
+    }
+    return (gc_ref);
 }
 
 //--------------------------------------------------------------------------
-// Function:	FileAccPropList::setGcReferences
-///\brief	Sets garbage collecting references flag.
-///\param	gc_ref - IN: Flag setting reference garbage collection to
-///				on (1) or off (0).
-///\exception	H5::PropListIException
+// Function:    FileAccPropList::setFileLocking
+///\brief       Sets file locking flags.
+///\param       use_file_locking - IN: Flag that determines if file locks should
+//                  be used or not.
+///\param       ignore_when_disabled - IN: Flag that determines if file locks
+//                  should be be used when disabled on the file system or not.
+///\exception   H5::PropListIException
 ///\par Description
-///		For detail on \a fapl, please refer to
-/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-SetGCReferences
-// Programmer:	Binh-Minh Ribler - 2000
+///             For information, please refer to the H5Pset_file_locking API in
+///             the HDF5 C Reference Manual.
+// Programmer   Dana Robinson - 2020
 //--------------------------------------------------------------------------
-void FileAccPropList::setGcReferences( unsigned gc_ref ) const
+void
+FileAccPropList::setFileLocking(hbool_t use_file_locking, hbool_t ignore_when_disabled) const
 {
-   herr_t ret_value = H5Pset_gc_references( id, gc_ref );
-   if( ret_value < 0 )
-   {
-      throw PropListIException("FileAccPropList::setGcReferences", "H5Pset_gc_references failed");
-   }
+    herr_t ret_value = H5Pset_file_locking(id, use_file_locking, ignore_when_disabled);
+
+    if (ret_value < 0) {
+        throw PropListIException("FileAccPropList::setFileLocking", "H5Pset_file_locking failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	FileAccPropList::getGcReferences
-///\brief	Returns the garbage collecting references setting.
-///\return	Garbage collecting references setting, 0 (off) or 1 (on)
-///\exception	H5::PropListIException
-// Programmer:	Binh-Minh Ribler - 2000
+// Function:    FileAccPropList::getFileLocking
+///\brief       Gets file locking flags.
+///\param       use_file_locking - OUT: Flag that determines if file locks
+//                  should be used or not.
+///\param       ignore_when_disabled - OUT: Flag that determines if file locks
+//                  should be be used when disabled on the file system or not.
+///\exception   H5::PropListIException
+///\par Description
+///             For information, please refer to the H5Pget_file_locking API in
+///             the HDF5 C Reference Manual.
+// Programmer   Dana Robinson - 2020
 //--------------------------------------------------------------------------
-unsigned FileAccPropList::getGcReferences() const
+void
+FileAccPropList::getFileLocking(hbool_t &use_file_locking, hbool_t &ignore_when_disabled) const
 {
-   unsigned gc_ref;
+    herr_t ret_value = H5Pget_file_locking(id, &use_file_locking, &ignore_when_disabled);
 
-   // the name of this routine will be changed to H5Pget_gc_references???
-   herr_t ret_value = H5Pget_gc_references( id, &gc_ref );
-   if( ret_value < 0 )
-   {
-      throw PropListIException("FileAccPropList::getGcReferences", "H5Pget_gc_references failed");
-   }
-   return( gc_ref );
+    if (ret_value < 0) {
+        throw PropListIException("FileAccPropList::getFileLocking", "H5Pget_file_locking failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	FileAccPropList destructor
-///\brief	Noop destructor
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    FileAccPropList::setLibverBounds
+///\brief       Sets bounds on versions of library format to be used when creating
+///             or writing objects.
+///\param       libver_low  - IN: Earliest version of the library that will be
+///                               used for creating or writing objects
+///\param       libver_high - IN: Latest version of the library that will be
+///\exception   H5::PropListIException
+///\par Description
+///             Valid values of \a libver_low are as follows:
+///             \li \c H5F_LIBVER_EARLIEST   (Default)
+///             \li \c H5F_LIBVER_18
+///             \li \c H5F_LIBVER_110
+///             \li \c H5F_LIBVER_112
+///             \li \c H5F_LIBVER_114
+///             \li \c H5F_LIBVER_LATEST
+///
+///             Valid values of \a libver_high are as follows:
+///             \li \c H5F_LIBVER_18
+///             \li \c H5F_LIBVER_110
+///             \li \c H5F_LIBVER_112
+///             \li \c H5F_LIBVER_114
+///             \li \c H5F_LIBVER_LATEST   (Default)
+///
+///             For more detail, please refer to the H5Pset_libver_bounds API in
+///             the HDF5 C Reference Manual.
+// Programmer   Binh-Minh Ribler - March, 2015
 //--------------------------------------------------------------------------
-FileAccPropList::~FileAccPropList() {}
+void
+FileAccPropList::setLibverBounds(H5F_libver_t libver_low, H5F_libver_t libver_high) const
+{
+    herr_t ret_value = H5Pset_libver_bounds(id, libver_low, libver_high);
+    if (ret_value < 0) {
+        throw PropListIException("FileAccPropList::setLibverBounds", "H5Pset_libver_bounds failed");
+    }
+}
+
+//--------------------------------------------------------------------------
+// Function:    FileAccPropList::getLibverBounds
+///\brief       Gets the current settings for the library version format bounds
+///             from a file access property list.
+///\param       libver_low  - OUT: Earliest version of the library that will be
+///                                used for creating or writing objects
+///\param       libver_high - OUT: Latest version of the library that will be
+///                                used for creating or writing objects
+///\exception   H5::PropListIException
+///\par Description
+///             On success, the argument \a libver_low can have the following
+///             values:
+///             \li \c H5F_LIBVER_EARLIEST
+///             \li \c H5F_LIBVER_18
+///             \li \c H5F_LIBVER_110
+///             \li \c H5F_LIBVER_112
+///             \li \c H5F_LIBVER_114
+///             \li \c H5F_LIBVER_LATEST
+///
+///             and \a libver_high:
+///             \li \c H5F_LIBVER_18
+///             \li \c H5F_LIBVER_110
+///             \li \c H5F_LIBVER_112
+///             \li \c H5F_LIBVER_114
+///             \li \c H5F_LIBVER_LATEST
+// Programmer   Binh-Minh Ribler - March, 2015
+//--------------------------------------------------------------------------
+void
+FileAccPropList::getLibverBounds(H5F_libver_t &libver_low, H5F_libver_t &libver_high) const
+{
+    herr_t ret_value = H5Pget_libver_bounds(id, &libver_low, &libver_high);
+    if (ret_value < 0) {
+        throw PropListIException("FileAccPropList::getLibverBounds", "H5Pget_libver_bounds failed");
+    }
+}
+
+//--------------------------------------------------------------------------
+// Function:    FileAccPropList destructor
+///\brief       Noop destructor
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+FileAccPropList::~FileAccPropList()
+{
+}
 
-#ifndef H5_NO_NAMESPACE
-} // end namespace
-#endif
+} // namespace H5
diff --git a/c++/src/H5FaccProp.h b/c++/src/H5FaccProp.h
index 861ac4c..27028a2 100644
--- a/c++/src/H5FaccProp.h
+++ b/c++/src/H5FaccProp.h
@@ -1,145 +1,170 @@
 // C++ informative line for the emacs editor: -*- C++ -*-
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5FileAccPropList_H
-#define __H5FileAccPropList_H
+#ifndef H5FileAccPropList_H
+#define H5FileAccPropList_H
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#endif
 
-//! Class FileAccPropList represents the HDF5 file access property list.
+/*! \class FileAccPropList
+    \brief Class FileAccPropList inherits from PropList and provides
+    wrappers for the HDF5 file access property list.
+*/
+//  Inheritance: PropList -> IdComponent
 class H5_DLLCPP FileAccPropList : public PropList {
-   public:
-	static const FileAccPropList DEFAULT;
+  public:
+    ///\brief Default file access property list.
+    static const FileAccPropList &DEFAULT;
 
-	// Creates a file access property list.
-	FileAccPropList();
+    // Creates a file access property list.
+    FileAccPropList();
 
-	// Modifies this property list to use the H5FD_STDIO driver
-	void setStdio() const;
+    // Modifies this property list to use the H5FD_STDIO driver
+    void setStdio() const;
 
-	// Set file driver for this property list
-	void setDriver(hid_t new_driver_id, const void *new_driver_info) const;
+    // Set file driver for this property list
+    void setDriver(hid_t new_driver_id, const void *new_driver_info) const;
 
-	// Returns a low-level file driver identifier.
-	hid_t getDriver() const;
+    // Returns a low-level file driver identifier.
+    hid_t getDriver() const;
 
-	// Sets offset for family driver.
-	void setFamilyOffset(hsize_t offset) const;
+    // Sets offset for family driver.
+    void setFamilyOffset(hsize_t offset) const;
 
-	// Gets offset for family driver.
-	hsize_t getFamilyOffset() const;
+    // Gets offset for family driver.
+    hsize_t getFamilyOffset() const;
 
-	// Modifies this file access property list to use the sec2 driver.
-	void setSec2() const;
+    // Modifies this file access property list to use the sec2 driver.
+    void setSec2() const;
 
-	// Modifies this file access property list to use the H5FD_CORE
-	// driver.
-	void setCore (size_t increment, hbool_t backing_store) const;
+    // Modifies this file access property list to use the H5FD_CORE
+    // driver.
+    void setCore(size_t increment, hbool_t backing_store) const;
 
-	// Queries H5FD_CORE driver properties.
-	void getCore (size_t& increment, hbool_t& backing_store) const;
+    // Queries H5FD_CORE driver properties.
+    void getCore(size_t &increment, hbool_t &backing_store) const;
 
-	// Sets this file access properties list to the family driver.
-	void setFamily( hsize_t memb_size, const FileAccPropList& memb_plist ) const;
+    // Sets this file access properties list to the family driver.
+    void setFamily(hsize_t memb_size, const FileAccPropList &memb_plist) const;
 
-	// Returns information about the family file access property list.
-	void getFamily(hsize_t& memb_size, FileAccPropList& memb_plist) const;
-	FileAccPropList getFamily(hsize_t& memb_size) const;
+    // Returns information about the family file access property list.
+    void            getFamily(hsize_t &memb_size, FileAccPropList &memb_plist) const;
+    FileAccPropList getFamily(hsize_t &memb_size) const;
 
-	// Emulates the old split file driver,
-	void setSplit(const FileAccPropList& meta_plist,
-		      const FileAccPropList& raw_plist,
-		      const char* meta_ext = ".meta",
-		      const char* raw_ext = ".raw" ) const;
-	void setSplit(const FileAccPropList& meta_plist,
-		      const FileAccPropList& raw_plist,
-		      const H5std_string& meta_ext = ".meta",
-		      const H5std_string& raw_ext = ".raw") const;
-	// These two overloaded functions are kept for backward compatibility
-	// only; they missed the const's and will be removed in future release.
-	void setSplit(FileAccPropList& meta_plist, FileAccPropList& raw_plist,
-	     const char* meta_ext=".meta", const char* raw_ext=".raw") const;
-	void setSplit(FileAccPropList& meta_plist, FileAccPropList& raw_plist,
-	     const H5std_string& meta_ext=".meta",
-	     const H5std_string& raw_ext=".raw") const;
+    // Emulates the old split file driver,
+    void setSplit(const FileAccPropList &meta_plist, const FileAccPropList &raw_plist,
+                  const char *meta_ext = ".meta", const char *raw_ext = ".raw") const;
+    void setSplit(const FileAccPropList &meta_plist, const FileAccPropList &raw_plist,
+                  const H5std_string &meta_ext = ".meta", const H5std_string &raw_ext = ".raw") const;
 
-	// Sets the maximum size of the data sieve buffer.
-	void setSieveBufSize(size_t bufsize) const;
+    // Sets the maximum size of the data sieve buffer.
+    void setSieveBufSize(size_t bufsize) const;
 
-	// Returns the current settings for the data sieve buffer size
-	// property
-	size_t getSieveBufSize() const;
+    // Returns the current settings for the data sieve buffer size
+    // property
+    size_t getSieveBufSize() const;
 
-	// Sets the minimum size of metadata block allocations.
-	void setMetaBlockSize(hsize_t &block_size) const;
+    // Sets the minimum size of metadata block allocations.
+    void setMetaBlockSize(hsize_t &block_size) const;
 
-	// Returns the current metadata block size setting.
-	hsize_t getMetaBlockSize() const;
+    // Returns the current metadata block size setting.
+    hsize_t getMetaBlockSize() const;
 
-	// Modifies this file access property list to use the logging driver.
-	void setLog(const char *logfile, unsigned flags, size_t buf_size) const;
-	void setLog(const H5std_string& logfile, unsigned flags, size_t buf_size) const;
+    // Modifies this file access property list to use the logging driver.
+    void setLog(const char *logfile, unsigned flags, size_t buf_size) const;
+    void setLog(const H5std_string &logfile, unsigned flags, size_t buf_size) const;
 
-	// Sets alignment properties of this file access property list
-	void setAlignment( hsize_t threshold = 1, hsize_t alignment = 1 ) const;
+    // Sets alignment properties of this file access property list
+    void setAlignment(hsize_t threshold = 1, hsize_t alignment = 1) const;
 
-	// Retrieves the current settings for alignment properties from
-	// this property list.
-	void getAlignment( hsize_t& threshold, hsize_t& alignment ) const;
+    // Retrieves the current settings for alignment properties from
+    // this property list.
+    void getAlignment(hsize_t &threshold, hsize_t &alignment) const;
 
-	// Sets data type for multi driver.
-	void setMultiType(H5FD_mem_t dtype) const;
+    // Sets data type for multi driver.
+    void setMultiType(H5FD_mem_t dtype) const;
 
-	// Returns the data type property for MULTI driver.
-	H5FD_mem_t getMultiType() const;
+    // Returns the data type property for MULTI driver.
+    H5FD_mem_t getMultiType() const;
 
-	// Sets the meta data cache and raw data chunk cache parameters.
-	void setCache( int mdc_nelmts, size_t rdcc_nelmts, size_t rdcc_nbytes, double rdcc_w0 ) const;
+    // Sets the meta data cache and raw data chunk cache parameters.
+    void setCache(int mdc_nelmts, size_t rdcc_nelmts, size_t rdcc_nbytes, double rdcc_w0) const;
 
-	// Queries the meta data cache and raw data chunk cache parameters.
-	void getCache( int& mdc_nelmts, size_t& rdcc_nelmts, size_t& rdcc_nbytes, double& rdcc_w0 ) const;
+    // Queries the meta data cache and raw data chunk cache parameters.
+    void getCache(int &mdc_nelmts, size_t &rdcc_nelmts, size_t &rdcc_nbytes, double &rdcc_w0) const;
 
-	// Sets the degree for the file close behavior.
-	void setFcloseDegree(H5F_close_degree_t degree);
+    // Sets the degree for the file close behavior.
+    void setFcloseDegree(H5F_close_degree_t degree) const;
 
-	// Returns the degree for the file close behavior.
-	H5F_close_degree_t getFcloseDegree();
+    // Returns the degree for the file close behavior.
+    H5F_close_degree_t getFcloseDegree() const;
 
-	// Sets garbage collecting references flag.
-	void setGcReferences( unsigned gc_ref = 0 ) const;
+    // Sets file access property list to use the H5FD_DIRECT driver.
+    void setFileAccDirect(size_t boundary, size_t block_size, size_t cbuf_size) const;
 
-	// Returns garbage collecting references setting.
-	unsigned getGcReferences() const;
+    // Retrieves information about the direct file access property list.
+    void getFileAccDirect(size_t &boundary, size_t &block_size, size_t &cbuf_size) const;
 
-	///\brief Returns this class name.
-	virtual H5std_string fromClass () const { return("FileAccPropList"); }
+    // Sets garbage collecting references flag.
+    void setGcReferences(unsigned gc_ref = 0) const;
 
-	// Copy constructor: creates a copy of a FileAccPropList object.
-	FileAccPropList( const FileAccPropList& original );
+    // Returns garbage collecting references setting.
+    unsigned getGcReferences() const;
 
-	// Creates a copy of an existing file access property list
-	// using the property list id.
-	FileAccPropList (const hid_t plist_id);
+    // Sets file locking parameters.
+    void setFileLocking(hbool_t use_file_locking, hbool_t ignore_when_disabled) const;
 
-	// Noop destructor
-	virtual ~FileAccPropList();
-};
-#ifndef H5_NO_NAMESPACE
-}
-#endif
-#endif // __H5FileAccPropList_H
+    // Gets file locking parameters.
+    void getFileLocking(hbool_t &use_file_locking, hbool_t &ignore_when_disabled) const;
+
+    // Sets bounds on versions of library format to be used when creating
+    // or writing objects.
+    void setLibverBounds(H5F_libver_t libver_low, H5F_libver_t libver_high) const;
+
+    // Gets the current settings for the library version format bounds.
+    void getLibverBounds(H5F_libver_t &libver_low, H5F_libver_t &libver_high) const;
+
+    ///\brief Returns this class name.
+    virtual H5std_string
+    fromClass() const override
+    {
+        return ("FileAccPropList");
+    }
+
+    // Copy constructor: same as the original FileAccPropList.
+    FileAccPropList(const FileAccPropList &original);
+
+    // Creates a copy of an existing file access property list
+    // using the property list id.
+    FileAccPropList(const hid_t plist_id);
+
+    // Noop destructor
+    virtual ~FileAccPropList() override;
+
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+
+    // Deletes the global constant, should only be used by the library
+    static void deleteConstants();
+
+  private:
+    static FileAccPropList *DEFAULT_;
+
+    // Creates the global constant, should only be used by the library
+    static FileAccPropList *getConstant();
+
+#endif // DOXYGEN_SHOULD_SKIP_THIS
+
+}; // end of FileAccPropList
+} // namespace H5
+
+#endif // H5FileAccPropList_H
diff --git a/c++/src/H5FcreatProp.cpp b/c++/src/H5FcreatProp.cpp
index 8d9965e..3b8fd94 100644
--- a/c++/src/H5FcreatProp.cpp
+++ b/c++/src/H5FcreatProp.cpp
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <string>
@@ -21,237 +18,370 @@
 #include "H5PropList.h"
 #include "H5FcreatProp.h"
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#endif
+
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+// This DOXYGEN_SHOULD_SKIP_THIS block is a work-around approach to control
+// the order of creation and deletion of the global constants.  See Design Notes
+// in "H5PredType.cpp" for information.
+
+// Initialize a pointer for the constant
+FileCreatPropList *FileCreatPropList::DEFAULT_ = 0;
+
+//--------------------------------------------------------------------------
+// Function:    FileCreatPropList::getConstant
+// Purpose      Creates a FileCreatPropList object representing the HDF5
+//              constant H5P_FILE_ACCESS, pointed to by FileCreatPropList::DEFAULT_
+// exception    H5::PropListIException
+// Description
+//              If FileCreatPropList::DEFAULT_ already points to an allocated
+//              object, throw a PropListIException.  This scenario should not happen.
+// Programmer   Binh-Minh Ribler - 2015
+//--------------------------------------------------------------------------
+FileCreatPropList *
+FileCreatPropList::getConstant()
+{
+    // Tell the C library not to clean up, H5Library::termH5cpp will call
+    // H5close - more dependency if use H5Library::dontAtExit()
+    if (!IdComponent::H5dontAtexit_called) {
+        (void)H5dont_atexit();
+        IdComponent::H5dontAtexit_called = true;
+    }
+
+    // If the constant pointer is not allocated, allocate it. Otherwise,
+    // throw because it shouldn't be.
+    if (DEFAULT_ == 0)
+        DEFAULT_ = new FileCreatPropList(H5P_FILE_CREATE);
+    else
+        throw PropListIException("FileCreatPropList::getConstant",
+                                 "FileCreatPropList::getConstant is being invoked on an allocated DEFAULT_");
+    return (DEFAULT_);
+}
+
+//--------------------------------------------------------------------------
+// Function:    FileCreatPropList::deleteConstants
+// Purpose      Deletes the constant object that FileCreatPropList::DEFAULT_
+//              points to.
+// Programmer   Binh-Minh Ribler - 2015
+//--------------------------------------------------------------------------
+void
+FileCreatPropList::deleteConstants()
+{
+    delete DEFAULT_;
+}
 
 //--------------------------------------------------------------------------
-///\brief	Constant for default property
+// Purpose      Constant for default property
 //--------------------------------------------------------------------------
-const FileCreatPropList FileCreatPropList::DEFAULT;
+const FileCreatPropList &FileCreatPropList::DEFAULT = *getConstant();
+
+#endif // DOXYGEN_SHOULD_SKIP_THIS
 
 //--------------------------------------------------------------------------
-// Function:	FileCreatPropList default constructor
-///\brief	Default constructor: Creates a file create property list
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    FileCreatPropList default constructor
+///\brief       Default constructor: Creates a file create property list
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-FileCreatPropList::FileCreatPropList() : PropList( H5P_FILE_CREATE ) {}
+FileCreatPropList::FileCreatPropList() : PropList(H5P_FILE_CREATE)
+{
+}
 
 //--------------------------------------------------------------------------
-// Function:	FileCreatPropList copy constructor
-///\brief	Copy constructor: makes a copy of the original
-///		FileCreatPropList object.
-///\param	original - IN: FileCreatPropList instance to copy
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    FileCreatPropList copy constructor
+///\brief       Copy constructor: same HDF5 object as \a original
+///             FileCreatPropList object.
+///\param       original - IN: FileCreatPropList instance to copy
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-FileCreatPropList::FileCreatPropList( const FileCreatPropList& original ) : PropList( original ) {}
+FileCreatPropList::FileCreatPropList(const FileCreatPropList &original) : PropList(original)
+{
+}
 
 //--------------------------------------------------------------------------
-// Function:	FileCreatPropList overloaded constructor
-///\brief	Creates a file creation property list using the id of an
-///		existing one.
-///\param	plist_id - IN: FileCreatPropList id to use
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    FileCreatPropList overloaded constructor
+///\brief       Creates a file creation property list using the id of an
+///             existing one.
+///\param       plist_id - IN: FileCreatPropList id to use
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-FileCreatPropList::FileCreatPropList(const hid_t plist_id) : PropList(plist_id) {}
+FileCreatPropList::FileCreatPropList(const hid_t plist_id) : PropList(plist_id)
+{
+}
 
 #ifndef H5_NO_DEPRECATED_SYMBOLS
 //--------------------------------------------------------------------------
-// Function:	FileCreatPropList::getVersion
-///\brief	Retrieves version information for various parts of a file.
-///\param	super    - OUT: The file super block.
-///\param	freelist - OUT: The global free list.
-///\param	stab     - OUT: The root symbol table entry.
-///\param	shhdr    - OUT: Shared object headers.
-///\exception	H5::PropListIException
+// Function:    FileCreatPropList::getVersion
+///\brief       Retrieves version information for various parts of a file.
+///\param       super    - OUT: The file super block.
+///\param       freelist - OUT: The global free list.
+///\param       stab     - OUT: The root symbol table entry.
+///\param       shhdr    - OUT: Shared object headers.
+///\exception   H5::PropListIException
 ///\par Description
-///		Any (or even all) of the output arguments can be null pointers.
-// Programmer	Binh-Minh Ribler - 2000
+///             Any (or even all) of the output arguments can be null pointers.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void FileCreatPropList::getVersion(unsigned& super, unsigned& freelist, unsigned& stab, unsigned& shhdr) const
+void
+FileCreatPropList::getVersion(unsigned &super, unsigned &freelist, unsigned &stab, unsigned &shhdr) const
 {
-   herr_t ret_value = H5Pget_version( id, &super, &freelist, &stab, &shhdr );
-   if( ret_value < 0 )
-   {
-      throw PropListIException("FileCreatPropList::getVersion",
-		"H5Pget_version failed");
-   }
+    herr_t ret_value = H5Pget_version(id, &super, &freelist, &stab, &shhdr);
+    if (ret_value < 0) {
+        throw PropListIException("FileCreatPropList::getVersion", "H5Pget_version failed");
+    }
 }
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
 
 //--------------------------------------------------------------------------
-// Function:	FileCreatPropList::setUserblock
-///\brief	Sets the user block size field of this file creation property list.
-///\param	size - IN: User block size to be set, in bytes
-///\exception	H5::PropListIException
+// Function:    FileCreatPropList::setUserblock
+///\brief       Sets the user block size field of this file creation property list.
+///\param       size - IN: User block size to be set, in bytes
+///\exception   H5::PropListIException
 ///\par Description
-///		The default user block size is 0; it may be set to any power
-///		of 2 equal to 512 or greater (512, 1024, 2048, etc.)
-// Programmer	Binh-Minh Ribler - 2000
+///             The default user block size is 0; it may be set to any power
+///             of 2 equal to 512 or greater (512, 1024, 2048, etc.)
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void FileCreatPropList::setUserblock( hsize_t size ) const
+void
+FileCreatPropList::setUserblock(hsize_t size) const
 {
-   herr_t ret_value = H5Pset_userblock( id, size);
-   if( ret_value < 0 )
-   {
-      throw PropListIException("FileCreatPropList::setUserblock",
-		"H5Pset_userblock failed");
-   }
+    herr_t ret_value = H5Pset_userblock(id, size);
+    if (ret_value < 0) {
+        throw PropListIException("FileCreatPropList::setUserblock", "H5Pset_userblock failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	FileCreatPropList::getUserblock
-///\brief	Returns the user block size of this file creation property list.
-///\return	User block size
-///\exception	H5::PropListIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    FileCreatPropList::getUserblock
+///\brief       Returns the user block size of this file creation property list.
+///\return      User block size
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-hsize_t FileCreatPropList::getUserblock() const
+hsize_t
+FileCreatPropList::getUserblock() const
 {
-   hsize_t userblock_size;
-   herr_t ret_value = H5Pget_userblock( id, &userblock_size );
-   if( ret_value < 0 )
-   {
-      throw PropListIException("FileCreatPropList::getUserblock",
-		"H5Pget_userblock failed");
-   }
-   return( userblock_size );
+    hsize_t userblock_size;
+    herr_t  ret_value = H5Pget_userblock(id, &userblock_size);
+    if (ret_value < 0) {
+        throw PropListIException("FileCreatPropList::getUserblock", "H5Pget_userblock failed");
+    }
+    return (userblock_size);
 }
 
 //--------------------------------------------------------------------------
-// Function:	FileCreatPropList::setSizes
-///\brief	Sets the byte size of the offsets and lengths used to
-///		address objects in an HDF5 file.
-///\param	sizeof_addr - IN: Size of an object offset in bytes
-///\param	sizeof_size - IN: Size of an object length in bytes.
-///\exception	H5::PropListIException
+// Function:    FileCreatPropList::setSizes
+///\brief       Sets the byte size of the offsets and lengths used to
+///             address objects in an HDF5 file.
+///\param       sizeof_addr - IN: Size of an object offset in bytes
+///\param       sizeof_size - IN: Size of an object length in bytes.
+///\exception   H5::PropListIException
 ///\par Description
-///		For information on setting sizes, please refer to the
-///		C layer Reference Manual at:
-/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-SetSizes
-// Programmer	Binh-Minh Ribler - 2000
+///             For information, please refer to the H5Pset_sizes API in
+///             the HDF5 C Reference Manual.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void FileCreatPropList::setSizes( size_t sizeof_addr, size_t sizeof_size ) const
+void
+FileCreatPropList::setSizes(size_t sizeof_addr, size_t sizeof_size) const
 {
-   herr_t ret_value = H5Pset_sizes( id, sizeof_addr, sizeof_size );
-   if( ret_value < 0 )
-   {
-      throw PropListIException("FileCreatPropList::setSizes",
-		"H5Pset_sizes failed");
-   }
+    herr_t ret_value = H5Pset_sizes(id, sizeof_addr, sizeof_size);
+    if (ret_value < 0) {
+        throw PropListIException("FileCreatPropList::setSizes", "H5Pset_sizes failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	FileCreatPropList::getSizes
-///\brief	Retrieves the size of the offsets and lengths used in an
-///		HDF5 file.
+// Function:    FileCreatPropList::getSizes
+///\brief       Retrieves the size of the offsets and lengths used in an
+///             HDF5 file.
 ///
-///\exception	H5::PropListIException
-// Programmer	Binh-Minh Ribler - 2000
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void FileCreatPropList::getSizes( size_t& sizeof_addr, size_t& sizeof_size ) const
+void
+FileCreatPropList::getSizes(size_t &sizeof_addr, size_t &sizeof_size) const
 {
-   herr_t ret_value = H5Pget_sizes( id, &sizeof_addr, &sizeof_size );
-   if( ret_value < 0 )
-   {
-      throw PropListIException("FileCreatPropList::getSizes",
-		"H5Pget_sizes failed");
-   }
+    herr_t ret_value = H5Pget_sizes(id, &sizeof_addr, &sizeof_size);
+    if (ret_value < 0) {
+        throw PropListIException("FileCreatPropList::getSizes", "H5Pget_sizes failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	FileCreatPropList::setSymk
-///\brief	Sets the size of parameters used to control the symbol table
-///		nodes.
-///\param	ik - IN: Symbol table tree rank
-///\param	lk - IN: Symbol table node size
-///\exception	H5::PropListIException
+// Function:    FileCreatPropList::setSymk
+///\brief       Sets the size of parameters used to control the symbol table
+///             nodes.
+///\param       ik - IN: Symbol table tree rank
+///\param       lk - IN: Symbol table node size
+///\exception   H5::PropListIException
 ///\par Description
-///		For information, please see the C layer Reference Manual at:
-/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-SetSymK
-// Programmer	Binh-Minh Ribler - 2000
+///             For information, please refer to the H5Pset_sym_k API in
+///             the HDF5 C Reference Manual.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void FileCreatPropList::setSymk( unsigned ik, unsigned lk ) const
+void
+FileCreatPropList::setSymk(unsigned ik, unsigned lk) const
 {
-   herr_t ret_value = H5Pset_sym_k( id, ik, lk );
-   if( ret_value < 0 )
-   {
-      throw PropListIException("FileCreatPropList::setSymk",
-		"H5Pset_sym_k failed");
-   }
+    herr_t ret_value = H5Pset_sym_k(id, ik, lk);
+    if (ret_value < 0) {
+        throw PropListIException("FileCreatPropList::setSymk", "H5Pset_sym_k failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	FileCreatPropList::getSymk
-///\brief	Retrieves the size of the symbol table B-tree 1/2 rank and
-///		the symbol table leaf node 1/2 size.
+// Function:    FileCreatPropList::getSymk
+///\brief       Retrieves the size of the symbol table B-tree 1/2 rank and
+///             the symbol table leaf node 1/2 size.
 ///
-///\exception	H5::PropListIException
+///\exception   H5::PropListIException
 ///\par Description
-///		For information, please see
-/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-GetSymK
-// Programmer	Binh-Minh Ribler - 2000
+///             For information, please refer to the H5Pget_sym_k API in
+///             the HDF5 C Reference Manual.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void FileCreatPropList::getSymk( unsigned& ik, unsigned& lk ) const
+void
+FileCreatPropList::getSymk(unsigned &ik, unsigned &lk) const
 {
-   herr_t ret_value = H5Pget_sym_k( id, &ik, &lk );
-   if( ret_value < 0 )
-   {
-      throw PropListIException("FileCreatPropList::getSymk",
-		"H5Pget_sym_k failed");
-   }
+    herr_t ret_value = H5Pget_sym_k(id, &ik, &lk);
+    if (ret_value < 0) {
+        throw PropListIException("FileCreatPropList::getSymk", "H5Pget_sym_k failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	FileCreatPropList::setIstorek
-///\brief	Sets the size of the parameter used to control the B-trees
-///		for indexing chunked datasets.
-///\param	ik - IN: 1/2 rank of chunked storage B-tree
-///\exception	H5::PropListIException
+// Function:    FileCreatPropList::setIstorek
+///\brief       Sets the size of the parameter used to control the B-trees
+///             for indexing chunked datasets.
+///\param       ik - IN: 1/2 rank of chunked storage B-tree
+///\exception   H5::PropListIException
 ///\par Description
-///		For information, please see the C layer Reference Manual at:
-/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-SetIstoreK
-// Programmer	Binh-Minh Ribler - 2000
+///             For information, please refer to the H5Pset_istore_k API in
+///             the HDF5 C Reference Manual.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void FileCreatPropList::setIstorek( unsigned ik ) const
+void
+FileCreatPropList::setIstorek(unsigned ik) const
 {
-   herr_t ret_value = H5Pset_istore_k( id, ik );
-   if( ret_value < 0 )
-   {
-      throw PropListIException("FileCreatPropList::setIstorek",
-		"H5Pset_istore_k failed");
-   }
+    herr_t ret_value = H5Pset_istore_k(id, ik);
+    if (ret_value < 0) {
+        throw PropListIException("FileCreatPropList::setIstorek", "H5Pset_istore_k failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	FileCreatPropList::getIstorek
-///\brief	Returns the 1/2 rank of an indexed storage B-tree.
-///\return	1/2 rank of chunked storage B-tree
-///\exception	H5::PropListIException
+// Function:    FileCreatPropList::getIstorek
+///\brief       Returns the 1/2 rank of an indexed storage B-tree.
+///\return      1/2 rank of chunked storage B-tree
+///\exception   H5::PropListIException
 ///\par Description
-///		For information, please see
-/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-GetIstoreK
-// Programmer	Binh-Minh Ribler - 2000
+///             For information, please refer to the H5Pget_istore_k API in
+///             the HDF5 C Reference Manual.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-unsigned FileCreatPropList::getIstorek() const
+unsigned
+FileCreatPropList::getIstorek() const
 {
-   unsigned ik;
-   herr_t ret_value = H5Pget_istore_k( id, &ik );
-   if( ret_value < 0 )
-   {
-      throw PropListIException("FileCreatPropList::getIstorek",
-		"H5Pget_istore_k failed");
-   }
-   return( ik );
+    unsigned ik;
+    herr_t   ret_value = H5Pget_istore_k(id, &ik);
+    if (ret_value < 0) {
+        throw PropListIException("FileCreatPropList::getIstorek", "H5Pget_istore_k failed");
+    }
+    return (ik);
 }
 
 //--------------------------------------------------------------------------
-// Function:	FileCreatPropList destructor
-///\brief	Noop destructor.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    FileCreatPropList::setFileSpaceStrategy
+///\brief       Sets the strategy and the threshold value that the library
+///             will employ in managing file space.
+///\param       strategy  - IN: Strategy for file space management
+///\param       persist   - IN: Whether to persist free-space
+///\param       threshold - IN: Free-space section threshold. The library
+///             default is 1, which is to track all free-space sections.
+///\exception   H5::PropListIException
+///\par Description
+///             If the given strategy is zero, the property will not be
+///             changed and the existing strategy will be retained.
+///             If the given threshold value is zero, the property will not be
+///             changed and the existing threshold will be retained.
+///             For information, please refer to the H5Pset_file_space_strategy
+///             API in the HDF5 C Reference Manual.
+// Programmer   Binh-Minh Ribler - Feb, 2017
 //--------------------------------------------------------------------------
-FileCreatPropList::~FileCreatPropList() {}
+void
+FileCreatPropList::setFileSpaceStrategy(H5F_fspace_strategy_t strategy, hbool_t persist,
+                                        hsize_t threshold) const
+{
+    herr_t ret_value = H5Pset_file_space_strategy(id, strategy, persist, threshold);
+    if (ret_value < 0) {
+        throw PropListIException("FileCreatPropList::setFileSpaceStrategy",
+                                 "H5Pset_file_space_strategy failed");
+    }
+}
+
+//--------------------------------------------------------------------------
+// Function:    FileCreatPropList::getFileSpaceStrategy
+///\brief       Retrieves the strategy, persist, and threshold that the library
+///             uses in managing file space.
+///\param       strategy  - OUT: Strategy for file space management
+///\param       persist   - OUT: Whether to persist free-space
+///\param       threshold - OUT: Free-space section threshold
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - Feb, 2017
+//--------------------------------------------------------------------------
+void
+FileCreatPropList::getFileSpaceStrategy(H5F_fspace_strategy_t &strategy, hbool_t &persist,
+                                        hsize_t &threshold) const
+{
+    herr_t ret_value = H5Pget_file_space_strategy(id, &strategy, &persist, &threshold);
+    if (ret_value < 0) {
+        throw PropListIException("FileCreatPropList::getFileSpaceStrategy",
+                                 "H5Pget_file_space_strategy failed");
+    }
+}
+
+//--------------------------------------------------------------------------
+// Function:    FileCreatPropList::setFileSpacePagesize
+///\brief       Sets the file space page size for paged aggregation.
+///\param       fsp_psize - IN: Filespace's page size
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - Feb, 2017
+//--------------------------------------------------------------------------
+void
+FileCreatPropList::setFileSpacePagesize(hsize_t fsp_psize) const
+{
+    herr_t ret_value = H5Pset_file_space_page_size(id, fsp_psize);
+    if (ret_value < 0) {
+        throw PropListIException("FileCreatPropList::setFileSpacePagesize",
+                                 "H5Pset_file_space_page_size failed");
+    }
+}
+
+//--------------------------------------------------------------------------
+// Function:    FileCreatPropList::getFileSpacePagesize
+///\brief       Returns the file space page size for aggregating small
+///             metadata or raw data.
+///\return      File space page size
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - Feb, 2017
+//--------------------------------------------------------------------------
+hsize_t
+FileCreatPropList::getFileSpacePagesize() const
+{
+    hsize_t fsp_psize = 0;
+    herr_t  ret_value = H5Pget_file_space_page_size(id, &fsp_psize);
+    if (ret_value < 0) {
+        throw PropListIException("FileCreatPropList::getFileSpacePagesize",
+                                 "H5Pget_file_space_page_size failed");
+    }
+    return (fsp_psize);
+}
+
+//--------------------------------------------------------------------------
+// Function:    FileCreatPropList destructor
+///\brief       Noop destructor.
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+FileCreatPropList::~FileCreatPropList()
+{
+}
 
-#ifndef H5_NO_NAMESPACE
-} // end namespace
-#endif
+} // namespace H5
diff --git a/c++/src/H5FcreatProp.h b/c++/src/H5FcreatProp.h
index 4fe51a9..399db71 100644
--- a/c++/src/H5FcreatProp.h
+++ b/c++/src/H5FcreatProp.h
@@ -1,81 +1,111 @@
 // C++ informative line for the emacs editor: -*- C++ -*-
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5FileCreatPropList_H
-#define __H5FileCreatPropList_H
+#ifndef H5FileCreatPropList_H
+#define H5FileCreatPropList_H
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#endif
 
-//! Class FileCreatPropList represents the HDF5 file create property list.
+/*! \class FileCreatPropList
+    \brief Class FileCreatPropList inherits from PropList and provides
+    wrappers for the HDF5 file create property list.
+*/
+//  Inheritance: PropList -> IdComponent
 class H5_DLLCPP FileCreatPropList : public PropList {
-   public:
-	// Default file creation property list.
-	static const FileCreatPropList DEFAULT;
+  public:
+    ///\brief Default file creation property list.
+    static const FileCreatPropList &DEFAULT;
 
-	// Creates a file create property list.
-	FileCreatPropList();
+    // Creates a file create property list.
+    FileCreatPropList();
 
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-	// Retrieves version information for various parts of a file.
-	void getVersion( unsigned& super, unsigned& freelist, unsigned& stab, unsigned& shhdr ) const;
+    // Retrieves version information for various parts of a file.
+    void getVersion(unsigned &super, unsigned &freelist, unsigned &stab, unsigned &shhdr) const;
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
 
-	// Sets the userblock size field of a file creation property list.
-	void setUserblock( hsize_t size ) const;
+    // Sets the userblock size field of a file creation property list.
+    void setUserblock(hsize_t size) const;
 
-	// Gets the size of a user block in this file creation property list.
-	hsize_t getUserblock() const;
+    // Gets the size of a user block in this file creation property list.
+    hsize_t getUserblock() const;
 
-	// Retrieves the size-of address and size quantities stored in a
-	// file according to this file creation property list.
-	void getSizes( size_t& sizeof_addr, size_t& sizeof_size ) const;
+    // Retrieves the size-of address and size quantities stored in a
+    // file according to this file creation property list.
+    void getSizes(size_t &sizeof_addr, size_t &sizeof_size) const;
 
-	// Sets file size-of addresses and sizes.
-	void setSizes( size_t sizeof_addr = 4, size_t sizeof_size = 4 ) const;
+    // Sets file size-of addresses and sizes.
+    void setSizes(size_t sizeof_addr = 4, size_t sizeof_size = 4) const;
 
-	// Retrieves the size of the symbol table B-tree 1/2 rank and the
-	// symbol table leaf node 1/2 size.
-	void getSymk( unsigned& int_nodes_k, unsigned& leaf_nodes_k ) const;
+    // Retrieves the size of the symbol table B-tree 1/2 rank and the
+    // symbol table leaf node 1/2 size.
+    void getSymk(unsigned &int_nodes_k, unsigned &leaf_nodes_k) const;
 
-	// Sets the size of parameters used to control the symbol table nodes.
-	void setSymk( unsigned int_nodes_k, unsigned leaf_nodes_k ) const;
+    // Sets the size of parameters used to control the symbol table nodes.
+    void setSymk(unsigned int_nodes_k, unsigned leaf_nodes_k) const;
 
-	// Returns the 1/2 rank of an indexed storage B-tree.
-	unsigned getIstorek() const;
+    // Returns the 1/2 rank of an indexed storage B-tree.
+    unsigned getIstorek() const;
 
-	// Sets the size of parameter used to control the B-trees for
-	// indexing chunked datasets.
-	void setIstorek( unsigned ik ) const;
+    // Sets the size of parameter used to control the B-trees for
+    // indexing chunked datasets.
+    void setIstorek(unsigned ik) const;
 
-	///\brief Returns this class name.
-	virtual H5std_string fromClass () const { return("FileCreatPropList"); }
+    // Sets the strategy and the threshold value that the library will
+    // will employ in managing file space.
+    void setFileSpaceStrategy(H5F_fspace_strategy_t strategy, hbool_t persist, hsize_t threshold) const;
 
-	// Copy constructor: creates a copy of a FileCreatPropList object.
-	FileCreatPropList(const FileCreatPropList& orig);
+    // Returns the strategy that the library uses in managing file space.
+    void getFileSpaceStrategy(H5F_fspace_strategy_t &strategy, hbool_t &persist, hsize_t &threshold) const;
 
-	// Creates a copy of an existing file create property list
-	// using the property list id.
-	FileCreatPropList (const hid_t plist_id);
+    // Sets the file space page size for paged aggregation.
+    void setFileSpacePagesize(hsize_t fsp_psize) const;
 
-	// Noop destructor
-	virtual ~FileCreatPropList();
-};
-#ifndef H5_NO_NAMESPACE
-}
-#endif
-#endif // __H5FileCreatPropList_H
+    // Returns the threshold value that the library uses in tracking free
+    // space sections.
+    hsize_t getFileSpacePagesize() const;
+
+    ///\brief Returns this class name.
+    virtual H5std_string
+    fromClass() const override
+    {
+        return ("FileCreatPropList");
+    }
+
+    // Copy constructor: same as the original FileCreatPropList.
+    FileCreatPropList(const FileCreatPropList &orig);
+
+    // Creates a copy of an existing file create property list
+    // using the property list id.
+    FileCreatPropList(const hid_t plist_id);
+
+    // Noop destructor
+    virtual ~FileCreatPropList() override;
+
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+
+    // Deletes the global constant, should only be used by the library
+    static void deleteConstants();
+
+  private:
+    static FileCreatPropList *DEFAULT_;
+
+    // Creates the global constant, should only be used by the library
+    static FileCreatPropList *getConstant();
+
+#endif // DOXYGEN_SHOULD_SKIP_THIS
+
+}; // end of FileCreatPropList
+} // namespace H5
+
+#endif // H5FileCreatPropList_H
diff --git a/c++/src/H5File.cpp b/c++/src/H5File.cpp
index e0a0da5..8f1830b 100644
--- a/c++/src/H5File.cpp
+++ b/c++/src/H5File.cpp
@@ -1,34 +1,32 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifdef OLD_HEADER_FILENAME
-#include <iostream.h>
-#else
 #include <iostream>
-#endif
 #include <string>
 
 #include "H5Include.h"
 #include "H5Exception.h"
 #include "H5IdComponent.h"
 #include "H5PropList.h"
-#include "H5Object.h"
 #include "H5FaccProp.h"
 #include "H5FcreatProp.h"
+#include "H5OcreatProp.h"
 #include "H5DxferProp.h"
 #include "H5DcreatProp.h"
+#include "H5LcreatProp.h"
+#include "H5LaccProp.h"
+#include "H5DaccProp.h"
+#include "H5Location.h"
+#include "H5Object.h"
 #include "H5CommonFG.h"
 #include "H5Group.h"
 #include "H5AbstractDs.h"
@@ -37,86 +35,132 @@
 #include "H5File.h"
 #include "H5Alltypes.h"
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#ifndef H5_NO_STD
-    using std::cerr;
-    using std::endl;
-#endif  // H5_NO_STD
-#endif
+using std::cerr;
+using std::endl;
 
 //--------------------------------------------------------------------------
-// Function	H5File default constructor
-///\brief	Default constructor: creates a stub H5File object.
-// Programmer	Binh-Minh Ribler - 2000
+// Function     H5File default constructor
+///\brief       Default constructor: creates a stub H5File object.
+// December 2000
 //--------------------------------------------------------------------------
-H5File::H5File() : H5Location(), CommonFG(), id(H5I_INVALID_HID) {}
+H5File::H5File() : Group(), id(H5I_INVALID_HID)
+{
+}
 
 //--------------------------------------------------------------------------
-// Function:	H5File overloaded constructor
-///\brief	Creates or opens an HDF5 file depending on the parameter flags.
-///\param	name         - IN: Name of the file
-///\param	flags        - IN: File access flags
-///\param	create_plist - IN: File creation property list, used when
-///		modifying default file meta-data.  Default to
-///		FileCreatPropList::DEFAULT
-///\param	access_plist - IN: File access property list.  Default to
-///		FileAccPropList::DEFAULT
+// Function:    H5File overloaded constructor
+///\brief       Creates or opens an HDF5 file depending on the parameter flags.
+///\param       name         - IN: Name of the file
+///\param       flags        - IN: File access flags
+///\param       create_plist - IN: File creation property list, used when
+///             modifying default file meta-data.  Default to
+///             FileCreatPropList::DEFAULT
+///\param       access_plist - IN: File access property list.  Default to
+///             FileAccPropList::DEFAULT
 ///\par Description
-///		Valid values of \a flags include:
-///		\li \c H5F_ACC_TRUNC - Truncate file, if it already exists,
-///				       erasing all data previously stored in
-///				       the file.
-///		\li \c H5F_ACC_EXCL - Fail if file already exists.
-///			\c H5F_ACC_TRUNC and \c H5F_ACC_EXCL are mutually exclusive
-///		\li \c H5F_ACC_RDONLY - Open file as read-only, if it already
-///					exists, and fail, otherwise
-///		\li \c H5F_ACC_RDWR - Open file for read/write, if it already
-///					exists, and fail, otherwise
-///		\li \c H5F_ACC_DEBUG - print debug information. This flag is
-///			used only by HDF5 library developers; it is neither
-///			tested nor supported for use in applications.
+///             Valid values of \a flags include:
+///             \li \c H5F_ACC_TRUNC - Truncate file, if it already exists,
+///                             erasing all data previously stored in
+///                             the file.
+///             \li \c H5F_ACC_EXCL - Fail if file already exists.
+///                 \c H5F_ACC_TRUNC and \c H5F_ACC_EXCL are mutually exclusive
+///             \li \c H5F_ACC_RDONLY - Open file as read-only, if it already
+///                             exists, and fail, otherwise
+///             \li \c H5F_ACC_RDWR - Open file for read/write, if it already
+///                             exists, and fail, otherwise
 ///\par
-///		For info on file creation in the case of an already-open file,
-///		please refer to the \b Special \b case section in the C layer
-///		Reference Manual at:
-/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5F.html#File-Create
-// Notes	With a PGI compiler (~2012-2013), the exception thrown by p_get_file
-//		could not be caught in the applications.  Added try block here
-//		to catch then re-throw it. -BMR 2013/03/21
-// Programmer	Binh-Minh Ribler - 2000
+///             For info on file creation in the case of an already-open file,
+///             please refer to the \b Special \b case section of the H5Fcreate
+///             API in the C Reference Manual.
+// Notes        With a PGI compiler (~2012-2013,) the exception thrown by
+//              p_get_file could not be caught in the applications.  Added try
+//              block here to catch then re-throw it. -BMR 2013/03/21
+// December 2000
+//--------------------------------------------------------------------------
+H5File::H5File(const char *name, unsigned int flags, const FileCreatPropList &create_plist,
+               const FileAccPropList &access_plist)
+    : Group(), id(H5I_INVALID_HID)
+{
+    try {
+        p_get_file(name, flags, create_plist, access_plist);
+    }
+    catch (FileIException &open_file) {
+        throw open_file;
+    }
+}
+
 //--------------------------------------------------------------------------
-H5File::H5File( const char* name, unsigned int flags, const FileCreatPropList& create_plist, const FileAccPropList& access_plist ) : H5Location(), CommonFG(), id(H5I_INVALID_HID)
+// Function:    H5File overloaded constructor
+///\brief       This is another overloaded constructor.  It differs from the
+///             above constructor only in the type of the \a name argument.
+///\param       name - IN: Name of the file - \c H5std_string
+///\param       flags - IN: File access flags
+///\param       create_plist - IN: File creation property list, used when
+///             modifying default file meta-data.  Default to
+///             FileCreatPropList::DEFAULT
+///\param       access_plist - IN: File access property list.  Default to
+///             FileAccPropList::DEFAULT
+// Notes        With a PGI compiler (~2012-2013,) the exception thrown by
+//              p_get_file could not be caught in the applications.  Added try
+//              block here to catch then re-throw it. -BMR 2013/03/21
+// December 2000
+//--------------------------------------------------------------------------
+H5File::H5File(const H5std_string &name, unsigned int flags, const FileCreatPropList &create_plist,
+               const FileAccPropList &access_plist)
+    : Group(), id(H5I_INVALID_HID)
 {
     try {
-	p_get_file(name, flags, create_plist, access_plist);
-    } catch (FileIException open_file) {
-	throw open_file;
+        p_get_file(name.c_str(), flags, create_plist, access_plist);
+    }
+    catch (FileIException &open_file) {
+        throw open_file;
     }
 }
 
 //--------------------------------------------------------------------------
-// Function:	H5File overloaded constructor
-///\brief	This is another overloaded constructor.  It differs from the
-///		above constructor only in the type of the \a name argument.
-///\param	name - IN: Name of the file - \c H5std_string
-///\param	flags - IN: File access flags
-///\param	create_plist - IN: File creation property list, used when
-///		modifying default file meta-data.  Default to
-///		FileCreatPropList::DEFAULT
-///\param	access_plist - IN: File access property list.  Default to
-///		FileAccPropList::DEFAULT
-// Notes	With a PGI compiler (~2012-2013), the exception thrown by p_get_file
-//		could not be caught in the applications.  Added try block here
-//		to catch then re-throw it. -BMR 2013/03/21
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    H5File overloaded constructor
+///\brief       Opens an HDF5 file using a non-default access property list
+///\param       name         - IN: Name of the file
+///\param       flags        - IN: File access flags
+///\param       access_plist - IN: File access property list.
+///\par Description
+///             Valid values of \a flags include:
+///             \li \c H5F_ACC_RDONLY - Open file as read-only, if it already
+///                             exists, and fail, otherwise
+///             \li \c H5F_ACC_RDWR - Open file for read/write, if it already
+///                             exists, and fail, otherwise
+// Notes        With a PGI compiler (~2012-2013,) the exception thrown by
+//              p_get_file could not be caught in the applications.  Added try
+//              block here to catch then re-throw it. -BMR 2013/03/21
+//--------------------------------------------------------------------------
+H5File::H5File(const char *name, unsigned int flags, const FileAccPropList &access_plist)
+    : Group(), id(H5I_INVALID_HID)
+{
+    try {
+        p_get_file(name, flags, FileCreatPropList::DEFAULT, access_plist);
+    }
+    catch (FileIException &open_file) {
+        throw open_file;
+    }
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5File overloaded constructor
+///\brief       This is another overloaded constructor.  It differs from the
+///             above constructor only in the type of the \a name argument.
+///\param       name - IN: Name of the file - \c H5std_string
+///\param       flags - IN: File access flags
+///\param       access_plist - IN: File access property list
 //--------------------------------------------------------------------------
-H5File::H5File( const H5std_string& name, unsigned int flags, const FileCreatPropList& create_plist, const FileAccPropList& access_plist ) : H5Location(), CommonFG(), id(H5I_INVALID_HID)
+H5File::H5File(const H5std_string &name, unsigned int flags, const FileAccPropList &access_plist)
+    : Group(), id(H5I_INVALID_HID)
 {
     try {
-	p_get_file(name.c_str(), flags, create_plist, access_plist);
-    } catch (FileIException open_file) {
-	throw open_file;
+        p_get_file(name.c_str(), flags, FileCreatPropList::DEFAULT, access_plist);
+    }
+    catch (FileIException &open_file) {
+        throw open_file;
     }
 }
 
@@ -124,441 +168,539 @@ H5File::H5File( const H5std_string& name, unsigned int flags, const FileCreatPro
 //--------------------------------------------------------------------------
 // This function is private and contains common code between the
 // constructors taking a string or a char*
-// Programmer	Binh-Minh Ribler - 2000
 // Modification
-//		- removed H5F_ACC_CREAT because H5Fcreate will fail with
-//		H5F_ACC_CREAT. - BMR, Sep 17, 2014
+//              - removed H5F_ACC_CREAT because H5Fcreate will fail with
+//              H5F_ACC_CREAT. - BMR, Sep 17, 2014
 //--------------------------------------------------------------------------
-void H5File::p_get_file(const char* name, unsigned int flags, const FileCreatPropList& create_plist, const FileAccPropList& access_plist)
+void
+H5File::p_get_file(const char *name, unsigned int flags, const FileCreatPropList &create_plist,
+                   const FileAccPropList &access_plist)
 {
     // These bits only set for creation, so if any of them are set,
     // create the file.
-    if( flags & (H5F_ACC_EXCL|H5F_ACC_TRUNC|H5F_ACC_DEBUG))
-    {
-	hid_t create_plist_id = create_plist.getId();
-	hid_t access_plist_id = access_plist.getId();
-	id = H5Fcreate( name, flags, create_plist_id, access_plist_id );
-	if( id < 0 )  // throw an exception when open/create fail
-	{
-	    throw FileIException("H5File constructor", "H5Fcreate failed");
-	}
+    if (flags & (H5F_ACC_EXCL | H5F_ACC_TRUNC)) {
+        hid_t create_plist_id = create_plist.getId();
+        hid_t access_plist_id = access_plist.getId();
+        id                    = H5Fcreate(name, flags, create_plist_id, access_plist_id);
+        if (id < 0) // throw an exception when open/create fail
+        {
+            throw FileIException("H5File constructor", "H5Fcreate failed");
+        }
     }
     // Open the file if none of the bits above are set.
-    else
-    {
-	hid_t access_plist_id = access_plist.getId();
-	id = H5Fopen( name, flags, access_plist_id );
-	if( id < 0 )  // throw an exception when open/create fail
-	{
-	    throw FileIException("H5File constructor", "H5Fopen failed");
-	}
+    else {
+        hid_t access_plist_id = access_plist.getId();
+        id                    = H5Fopen(name, flags, access_plist_id);
+        if (id < 0) // throw an exception when open/create fail
+        {
+            throw FileIException("H5File constructor", "H5Fopen failed");
+        }
     }
 }
 
+//--------------------------------------------------------------------------
+// Function:    H5File overloaded constructor
+///\brief       Creates an H5File object using an existing file id.
+///\param       existing_id - IN: Id of an existing file
+// Description
+//      Mar 29, 2015
+//              Added in responding to a request from user Jason Newton.
+//              However, it is not recommended to use the private member "id"
+//              in applications.  Unlike other situations, where similar
+//              constructor is needed by the library in order to return
+//              an object, H5File doesn't need it. -BMR (HDFFV-8766 partially)
+//--------------------------------------------------------------------------
+H5File::H5File(hid_t existing_id) : Group(), id{existing_id}
+{
+    incRefCount(); // increment number of references to this id
+}
+
 #endif // DOXYGEN_SHOULD_SKIP_THIS
 
 //--------------------------------------------------------------------------
-// Function:	H5File copy constructor
-///\brief	Copy constructor: makes a copy of the original
-///		H5File object.
-///\param	original - IN: H5File instance to copy
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    H5File copy constructor
+///\brief       Copy constructor: same HDF5 object as \a original
+///             H5File object.
+///\param       original - IN: H5File instance to copy
+// December 2000
 //--------------------------------------------------------------------------
-H5File::H5File(const H5File& original) : H5Location(), CommonFG()
+H5File::H5File(const H5File &original) : Group(original), id{original.getId()}
 {
-    id = original.getId();
     incRefCount(); // increment number of references to this id
 }
 
 //--------------------------------------------------------------------------
-// Function:	H5File::isHdf5 (static)
-///\brief	Determines whether a file in HDF5 format. (Static)
-///\param	name - IN: Name of the file
-///\return	true if the file is in HDF5 format, and false, otherwise
-///\exception	H5::FileIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    H5File::isHdf5 (static)
+///\brief       Determines whether a file in HDF5 format. (Static)
+///\param       name - IN: Name of the file
+///\return      true if the file is in HDF5 format, and false, otherwise
+///\exception   H5::FileIException
+// December 2000
+//--------------------------------------------------------------------------
+bool
+H5File::isHdf5(const char *name)
+{
+    // Calls C routine H5Fis_accessible to determine whether the file is in
+    // HDF5 format.  It returns positive value, 0, or negative value
+    htri_t ret_value = H5Fis_accessible(name, H5P_DEFAULT);
+
+    if (ret_value > 0)
+        return true;
+    else if (ret_value == 0)
+        return false;
+    else // Raise exception when H5Fis_accessible returns a negative value
+    {
+        throw FileIException("H5File::isHdf5", "H5Fis_accessible returned negative value");
+    }
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5File::isHdf5 (static)
+///\brief       This is an overloaded member function, provided for convenience.
+///             It takes an \c H5std_string for \a name. (Static)
+///\param       name - IN: Name of the file - \c H5std_string
+// December 2000
 //--------------------------------------------------------------------------
-bool H5File::isHdf5(const char* name)
+bool
+H5File::isHdf5(const H5std_string &name)
 {
-   // Calls C routine H5Fis_hdf5 to determine whether the file is in
-   // HDF5 format.  It returns positive value, 0, or negative value
-   htri_t ret_value = H5Fis_hdf5( name );
-   if( ret_value > 0 )
-      return true;
-   else if( ret_value == 0 )
-      return false;
-   else // Raise exception when H5Fis_hdf5 returns a negative value
-   {
-      throw FileIException("H5File::isHdf5", "H5Fis_hdf5 returned negative value");
-   }
+    return (isHdf5(name.c_str()));
 }
 
 //--------------------------------------------------------------------------
-// Function:	H5File::isHdf5 (static)
-///\brief	This is an overloaded member function, provided for convenience.
-///		It takes an \c H5std_string for \a name. (Static)
-///\param	name - IN: Name of the file - \c H5std_string
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    H5File::isAccessible (static)
+///\brief       Determines whether a file can be accessed as HDF5. (Static)
+///\param       name - IN: Name of the file
+///\param       access_plist - IN: File access property list.  Default to
+///             FileAccPropList::DEFAULT
+///\return      true if the file can be accessed as HDF5, and false, otherwise
+///\exception   H5::FileIException
+// September 2018
 //--------------------------------------------------------------------------
-bool H5File::isHdf5(const H5std_string& name )
+bool
+H5File::isAccessible(const char *name, const FileAccPropList &access_plist)
 {
-   return( isHdf5( name.c_str()) );
+    // Calls C routine H5Fis_accessible to determine whether the file is in
+    // HDF5 format.  It returns positive value, 0, or negative value
+    hid_t  access_plist_id = access_plist.getId();
+    htri_t ret_value       = H5Fis_accessible(name, access_plist_id);
+    if (ret_value > 0)
+        return true;
+    else if (ret_value == 0)
+        return false;
+    else // Raise exception when H5Fis_accessible returns a negative value
+    {
+        throw FileIException("H5File::isAccessible", "H5Fis_accessible returned negative value");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	openFile
-///\brief	Opens an HDF5 file
-///\param	name         - IN: Name of the file
-///\param	flags        - IN: File access flags
-///\param	access_plist - IN: File access property list.  Default to
-///		FileAccPropList::DEFAULT
+// Function:    H5File::isAccessible (static)
+///\brief       This is an overloaded member function, provided for convenience.
+///             It takes an \c H5std_string for \a name. (Static)
+///\param       name - IN: Name of the file - \c H5std_string
+///\param       access_plist - IN: File access property list.  Default to
+///             FileAccPropList::DEFAULT
+// September 2018
+//--------------------------------------------------------------------------
+bool
+H5File::isAccessible(const H5std_string &name, const FileAccPropList &access_plist)
+{
+    return (isAccessible(name.c_str(), access_plist));
+}
+
+//--------------------------------------------------------------------------
+// Function:    openFile
+///\brief       Opens an HDF5 file
+///\param       name         - IN: Name of the file
+///\param       flags        - IN: File access flags
+///\param       access_plist - IN: File access property list.  Default to
+///             FileAccPropList::DEFAULT
 ///\par Description
-///		Valid values of \a flags include:
-///		H5F_ACC_RDWR:   Open with read/write access. If the file is
-///				currently open for read-only access then it
-///				will be reopened. Absence of this flag
-///				implies read-only access.
+///             Valid values of \a flags include:
+///             H5F_ACC_RDWR:   Open with read/write access. If the file is
+///                     currently open for read-only access then it
+///                     will be reopened. Absence of this flag
+///                     implies read-only access.
 ///
-///		H5F_ACC_RDONLY: Open with read only access. - default
+///             H5F_ACC_RDONLY: Open with read only access. - default
 ///
-// Programmer	Binh-Minh Ribler - Oct, 2005
+// October 2005
 //--------------------------------------------------------------------------
-void H5File::openFile(const char* name, unsigned int flags, const FileAccPropList& access_plist)
+void
+H5File::openFile(const char *name, unsigned int flags, const FileAccPropList &access_plist)
 {
+    try {
+        close();
+    }
+    catch (Exception &close_error) {
+        throw FileIException("H5File::openFile", close_error.getDetailMsg());
+    }
+
     hid_t access_plist_id = access_plist.getId();
-    id = H5Fopen (name, flags, access_plist_id);
-    if (id < 0)  // throw an exception when open fails
+    id                    = H5Fopen(name, flags, access_plist_id);
+    if (id < 0) // throw an exception when open fails
     {
-	throw FileIException("H5File::openFile", "H5Fopen failed");
+        throw FileIException("H5File::openFile", "H5Fopen failed");
     }
 }
 
 //--------------------------------------------------------------------------
-// Function:	H5File::openFile
-///\brief	This is an overloaded member function, provided for convenience.
-///		It takes an \c H5std_string for \a name.
-///\param	name         - IN: Name of the file - \c H5std_string
-///\param	flags        - IN: File access flags
-///\param	access_plist - IN: File access property list.  Default to
-///		FileAccPropList::DEFAULT
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    H5File::openFile
+///\brief       This is an overloaded member function, provided for convenience.
+///             It takes an \c H5std_string for \a name.
+///\param       name         - IN: Name of the file - \c H5std_string
+///\param       flags        - IN: File access flags
+///\param       access_plist - IN: File access property list.  Default to
+///             FileAccPropList::DEFAULT
+// December 2000
 //--------------------------------------------------------------------------
-void H5File::openFile(const H5std_string& name, unsigned int flags, const FileAccPropList& access_plist)
+void
+H5File::openFile(const H5std_string &name, unsigned int flags, const FileAccPropList &access_plist)
 {
     openFile(name.c_str(), flags, access_plist);
 }
 
 //--------------------------------------------------------------------------
-// Function:	H5File::reOpen
-///\brief	Reopens this file.
+// Function:    H5File::reOpen
+///\brief       Reopens this file.
 ///
-///\exception	H5::FileIException
+///\exception   H5::FileIException
 // Description
-//		If this object has represented another HDF5 file, the previous
-//		HDF5 file need to be closed first.
-// Programmer	Binh-Minh Ribler - 2000
+//              If this object has represented another HDF5 file, the previous
+//              HDF5 file need to be closed first.
 // Note:        This wrapper doesn't seem right regarding the 'id' and should
 //              be investigated.  BMR - 2/20/2005
 // Modification
-//		- Replaced resetIdComponent() with decRefCount() to use C
-//		library ID reference counting mechanism - BMR, Feb 20, 2005
-//		- Replaced decRefCount with close() to let the C library
-//		handle the reference counting - BMR, Jun 1, 2006
+//              - Replaced resetIdComponent() with decRefCount() to use C
+//              library ID reference counting mechanism - BMR, Feb 20, 2005
+//              - Replaced decRefCount with close() to let the C library
+//              handle the reference counting - BMR, Jun 1, 2006
 //--------------------------------------------------------------------------
-void H5File::reOpen()
+void
+H5File::reOpen()
 {
     try {
         close();
     }
-    catch (Exception close_error) {
+    catch (Exception &close_error) {
         throw FileIException("H5File::reOpen", close_error.getDetailMsg());
     }
 
-   // call C routine to reopen the file - Note: not sure about this,
-   // which id to be the parameter when closing?
-   id = H5Freopen( id );
-   if( id < 0 ) // Raise exception when H5Freopen returns a neg value
-      throw FileIException("H5File::reOpen", "H5Freopen failed");
+    // call C routine to reopen the file - Note: not sure about this,
+    // which id to be the parameter when closing?
+    id = H5Freopen(id);
+    if (id < 0) // Raise exception when H5Freopen returns a neg value
+        throw FileIException("H5File::reOpen", "H5Freopen failed");
 }
 
 //--------------------------------------------------------------------------
-// Function:	H5File::getCreatePlist
-///\brief	Returns the creation property list of this file
-///\return	FileCreatPropList object
-///\exception	H5::FileIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    H5File::getCreatePlist
+///\brief       Returns a copy of the creation property list of this file
+///\return      FileCreatPropList object
+///\exception   H5::FileIException
+// December 2000
 //--------------------------------------------------------------------------
-FileCreatPropList H5File::getCreatePlist() const
+FileCreatPropList
+H5File::getCreatePlist() const
 {
-   hid_t create_plist_id = H5Fget_create_plist( id );
+    hid_t create_plist_id = H5Fget_create_plist(id);
 
-   // if H5Fget_create_plist returns a valid id, create and return
-   // the FileCreatPropList object for this property list
-   if( create_plist_id > 0 )
-   {
-      FileCreatPropList create_plist( create_plist_id );
-      return( create_plist );
-   }
-   else
-   {
-      throw FileIException("H5File::getCreatePlist", "H5Fget_create_plist failed");
-   }
+    // if H5Fget_create_plist returns a valid id, create and return
+    // the FileCreatPropList object for this property list
+    if (create_plist_id > 0) {
+        FileCreatPropList create_plist(create_plist_id);
+        return (create_plist);
+    }
+    else {
+        throw FileIException("H5File::getCreatePlist", "H5Fget_create_plist failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	H5File::getAccessPlist
-///\brief	Returns the access property list of this file
-///\return	FileAccPropList object
-///\exception	H5::FileIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    H5File::getAccessPlist
+///\brief       Returns a copy of the access property list of this file
+///\return      FileAccPropList object
+///\exception   H5::FileIException
+// December 2000
 //--------------------------------------------------------------------------
-FileAccPropList H5File::getAccessPlist() const
+FileAccPropList
+H5File::getAccessPlist() const
 {
-   hid_t access_plist_id = H5Fget_access_plist( id );
+    hid_t access_plist_id = H5Fget_access_plist(id);
 
-   // if H5Fget_access_plist returns a valid id, create and return
-   // the FileAccPropList object for this property list
-   if( access_plist_id > 0 )
-   {
-      FileAccPropList access_plist( access_plist_id );
-      return access_plist;
-   }
-   else // Raise an exception
-   {
-      throw FileIException("H5File::getAccessPlist", "H5Fget_access_plist failed");
-   }
+    // if H5Fget_access_plist returns a valid id, create and return
+    // the FileAccPropList object for this property list
+    if (access_plist_id > 0) {
+        FileAccPropList access_plist(access_plist_id);
+        return access_plist;
+    }
+    else // Raise an exception
+    {
+        throw FileIException("H5File::getAccessPlist", "H5Fget_access_plist failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	H5File::getFreeSpace
-///\brief	Returns the amount of free space in the file.
-///\return	Amount of free space
-///\exception	H5::FileIException
-// Programmer   Binh-Minh Ribler - May 2004
+// Function:    H5File::getFileInfo
+///\brief       Retrieves the general information of this file.
+///
+///\exception   H5::FileIException
+///\par Description
+///             The retrieved information may include information about
+///             superblock extension, free space management, and shared object
+// February 2017
 //--------------------------------------------------------------------------
-hssize_t H5File::getFreeSpace() const
+void
+H5File::getFileInfo(H5F_info2_t &file_info) const
 {
-   hssize_t free_space = H5Fget_freespace(id);
-   if( free_space < 0 )
-   {
-      throw FileIException("H5File::getFreeSpace", "H5Fget_freespace failed");
-   }
-   return (free_space);
+    herr_t ret_value = H5Fget_info2(id, &file_info);
+    if (ret_value < 0) {
+        throw FileIException("H5File::getFileInfo", "H5Fget_info2 failed");
+    }
 }
 
-
 //--------------------------------------------------------------------------
-// Function:	H5File::getObjCount
-///\brief	Returns the number of opened object IDs (files, datasets,
-///		groups and datatypes) in the same file.
-///\param	types - Type of object to retrieve the count
-///\return	Number of opened object IDs
-///\exception	H5::FileIException
-///\par Description
-///		The valid values for \a types include:
-///		\li \c H5F_OBJ_FILE	- Files only
-///		\li \c H5F_OBJ_DATASET	- Datasets only
-///		\li \c H5F_OBJ_GROUP	- Groups only
-///		\li \c H5F_OBJ_DATATYPE	- Named datatypes only
-///		\li \c H5F_OBJ_ATTR	- Attributes only
-///		\li \c H5F_OBJ_ALL    - All of the above, i.e., \c H5F_OBJ_FILE
-///					| \c H5F_OBJ_DATASET | \c H5F_OBJ_GROUP
-///					| \c H5F_OBJ_DATATYPE | \c H5F_OBJ_ATTR
-///\par
-/// Multiple object types can be combined with the logical OR operator (|).
-// Programmer   Binh-Minh Ribler - May 2004
+// Function:    H5File::getFreeSpace
+///\brief       Returns the amount of free space in the file.
+///\return      Amount of free space
+///\exception   H5::FileIException
+// May 2004
 //--------------------------------------------------------------------------
-ssize_t H5File::getObjCount(unsigned types) const
+hssize_t
+H5File::getFreeSpace() const
 {
-   ssize_t num_objs = H5Fget_obj_count(id, types);
-   if( num_objs < 0 )
-   {
-      throw FileIException("H5File::getObjCount", "H5Fget_obj_count failed");
-   }
-   return (num_objs);
+    hssize_t free_space = H5Fget_freespace(id);
+    if (free_space < 0) {
+        throw FileIException("H5File::getFreeSpace", "H5Fget_freespace failed");
+    }
+    return (free_space);
 }
 
 //--------------------------------------------------------------------------
-// Function:	H5File::getObjCount
-///\brief	This is an overloaded member function, provided for convenience.
-///		It takes no parameter and returns the object count of all
-///		object types.
-///\return	Number of opened object IDs
-///\exception	H5::FileIException
-// Programmer   Binh-Minh Ribler - May 2004
+// Function:    H5File::getObjCount
+///\brief       Returns the number of opened object IDs (files, datasets,
+///             groups and datatypes) in the same file.
+///\param       types - Type of object to retrieve the count
+///\return      Number of opened object IDs
+///\exception   H5::FileIException
+///\par Description
+///             The valid values for \a types include:
+///             \li \c H5F_OBJ_FILE     - Files only
+///             \li \c H5F_OBJ_DATASET  - Datasets only
+///             \li \c H5F_OBJ_GROUP    - Groups only
+///             \li \c H5F_OBJ_DATATYPE - Named datatypes only
+///             \li \c H5F_OBJ_ATTR     - Attributes only
+///             \li \c H5F_OBJ_ALL    - All of the above, i.e., \c H5F_OBJ_FILE
+///                         | \c H5F_OBJ_DATASET | \c H5F_OBJ_GROUP
+///                         | \c H5F_OBJ_DATATYPE | \c H5F_OBJ_ATTR
+///\par
+/// Multiple object types can be combined with the logical OR operator (|).
+// May 2004
 //--------------------------------------------------------------------------
-ssize_t H5File::getObjCount() const
+ssize_t
+H5File::getObjCount(unsigned types) const
 {
-   ssize_t num_objs = H5Fget_obj_count(id, H5F_OBJ_ALL);
-   if( num_objs < 0 )
-   {
-      throw FileIException("H5File::getObjCount", "H5Fget_obj_count failed");
-   }
-   return (num_objs);
+    ssize_t num_objs = H5Fget_obj_count(id, types);
+    if (num_objs < 0) {
+        throw FileIException("H5File::getObjCount", "H5Fget_obj_count failed");
+    }
+    return (num_objs);
 }
 
 //--------------------------------------------------------------------------
-// Function:	H5File::getObjIDs
-///\brief	Retrieves a list of opened object IDs (files, datasets,
-///		groups and datatypes) in the same file.
-///\param	types    - Type of object to retrieve the count
-///\param	max_objs - Maximum number of object identifiers to place
-///			   into obj_id_list.
-///\param	oid_list - List of open object identifiers
-///\exception	H5::FileIException
+// Function:    H5File::getObjIDs
+///\brief       Retrieves a list of opened object IDs (files, datasets,
+///             groups and datatypes) in the same file.
+///\param       types    - Type of object to retrieve the count
+///\param       max_objs - Maximum number of object identifiers to place
+///                        into obj_id_list.
+///\param       oid_list - List of open object identifiers
+///\exception   H5::FileIException
 ///\par Description
-///		The valid values for \a types include:
-///		\li \c H5F_OBJ_FILE	- Files only
-///		\li \c H5F_OBJ_DATASET	- Datasets only
-///		\li \c H5F_OBJ_GROUP	- Groups only
-///		\li \c H5F_OBJ_DATATYPE	- Named datatypes only
-///		\li \c H5F_OBJ_ATTR	- Attributes only
-///		\li \c H5F_OBJ_ALL    - All of the above, i.e., \c H5F_OBJ_FILE
-///					| \c H5F_OBJ_DATASET | \c H5F_OBJ_GROUP
-///					| \c H5F_OBJ_DATATYPE | \c H5F_OBJ_ATTR
+///             The valid values for \a types include:
+///             \li \c H5F_OBJ_FILE - Files only
+///             \li \c H5F_OBJ_DATASET - Datasets only
+///             \li \c H5F_OBJ_GROUP - Groups only
+///             \li \c H5F_OBJ_DATATYPE - Named datatypes only
+///             \li \c H5F_OBJ_ATTR - Attributes only
+///             \li \c H5F_OBJ_ALL    - All of the above, i.e., \c H5F_OBJ_FILE
+///                     | \c H5F_OBJ_DATASET | \c H5F_OBJ_GROUP
+///                     | \c H5F_OBJ_DATATYPE | \c H5F_OBJ_ATTR
 ///\par
 /// Multiple object types can be combined with the logical OR operator (|).
 //
 // Notes: will do the overload for this one after hearing from Quincey???
-// Programmer   Binh-Minh Ribler - May 2004
+// May 2004
 //--------------------------------------------------------------------------
-void H5File::getObjIDs(unsigned types, size_t max_objs, hid_t *oid_list) const
+void
+H5File::getObjIDs(unsigned types, size_t max_objs, hid_t *oid_list) const
 {
-   ssize_t ret_value = H5Fget_obj_ids(id, types, max_objs, oid_list);
-   if( ret_value < 0 )
-   {
-      throw FileIException("H5File::getObjIDs", "H5Fget_obj_ids failed");
-   }
+    ssize_t ret_value = H5Fget_obj_ids(id, types, max_objs, oid_list);
+    if (ret_value < 0) {
+        throw FileIException("H5File::getObjIDs", "H5Fget_obj_ids failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	H5File::getVFDHandle
-///\brief	Returns the pointer to the file handle of the low-level file
-///		driver.
-///\param	fapl        - File access property list
-///\param	file_handle - Pointer to the file handle being used by
-///			      the low-level virtual file driver
-///\exception	H5::FileIException
+// Function:    H5File::getVFDHandle
+///\brief       Returns the pointer to the file handle of the low-level file
+///             driver.
+///\param       fapl        - File access property list
+///\param       file_handle - Pointer to the file handle being used by
+///                           the low-level virtual file driver
+///\exception   H5::FileIException
 ///\par Description
-///		For the \c FAMILY or \c MULTI drivers, \a fapl should be
-///		defined through the property list functions:
-///		\c FileAccPropList::setFamilyOffset for the \c FAMILY driver
-///		and \c FileAccPropList::setMultiType for the \c MULTI driver.
+///             For the \c FAMILY or \c MULTI drivers, \a fapl should be
+///             defined through the property list functions:
+///             \c FileAccPropList::setFamilyOffset for the \c FAMILY driver
+///             and \c FileAccPropList::setMultiType for the \c MULTI driver.
 ///
-///		The obtained file handle is dynamic and is valid only while
-///		the file remains open; it will be invalid if the file is
-///		closed and reopened or opened during a subsequent session.
-// Programmer   Binh-Minh Ribler - May 2004
+///             The obtained file handle is dynamic and is valid only while
+///             the file remains open; it will be invalid if the file is
+///             closed and reopened or opened during a subsequent session.
+// May 2004
 //--------------------------------------------------------------------------
-void H5File::getVFDHandle(const FileAccPropList& fapl, void **file_handle) const
+void
+H5File::getVFDHandle(const FileAccPropList &fapl, void **file_handle) const
 {
-   hid_t fapl_id = fapl.getId();
-   herr_t ret_value = H5Fget_vfd_handle(id, fapl_id, file_handle);
-   if( ret_value < 0 )
-   {
-      throw FileIException("H5File::getVFDHandle", "H5Fget_vfd_handle failed");
-   }
+    hid_t  fapl_id   = fapl.getId();
+    herr_t ret_value = H5Fget_vfd_handle(id, fapl_id, file_handle);
+    if (ret_value < 0) {
+        throw FileIException("H5File::getVFDHandle", "H5Fget_vfd_handle failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	H5File::getVFDHandle
-///\brief	This is an overloaded member function, kept for backward
-///		compatibility.  It differs from the above function in that it
-///		misses const.  This wrapper will be removed in future release.
-///\param	fapl        - File access property list
-///\param	file_handle - Pointer to the file handle being used by
-///			      the low-level virtual file driver
-///\exception	H5::FileIException
-// Programmer   Binh-Minh Ribler - May 2004
-// Note:	Retiring April, 2014
-//--------------------------------------------------------------------------
-void H5File::getVFDHandle(FileAccPropList& fapl, void **file_handle) const
+// Function:    H5File::getVFDHandle
+// Purpose      This is an overloaded member function, kept for backward
+//              compatibility.  It differs from the above function in that it
+//              misses const's.  This wrapper will be removed in future release.
+// Param        fapl        - File access property list
+// Param        file_handle - Pointer to the file handle being used by
+//                            the low-level virtual file driver
+// Exception    H5::FileIException
+// May 2004
+// Modification
+//              Planned for removal. -BMR, 2014/04/16
+//              Removed from documentation. -BMR, 2016/03/07 1.8.17 and 1.10.0
+//              Removed from code. -BMR, 2016/08/11 1.8.18 and 1.10.1
+//--------------------------------------------------------------------------
+// void H5File::getVFDHandle(FileAccPropList& fapl, void **file_handle) const
+//{
+//    getVFDHandle((const FileAccPropList)fapl, file_handle);
+//}
+
+//--------------------------------------------------------------------------
+// Function:    H5File::getVFDHandle
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function only in what arguments it
+///             accepts.
+///\param       file_handle - Pointer to the file handle being used by
+///                     the low-level virtual file driver
+///\exception   H5::FileIException
+// May 2004
+//--------------------------------------------------------------------------
+void
+H5File::getVFDHandle(void **file_handle) const
 {
-    getVFDHandle((const FileAccPropList)fapl, file_handle);
+    herr_t ret_value = H5Fget_vfd_handle(id, H5P_DEFAULT, file_handle);
+    if (ret_value < 0) {
+        throw FileIException("H5File::getVFDHandle", "H5Fget_vfd_handle failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	H5File::getVFDHandle
-///\brief	This is an overloaded member function, provided for convenience.
-///		It differs from the above function only in what arguments it
-///		accepts.
-///\param	file_handle - Pointer to the file handle being used by
-///			      the low-level virtual file driver
-///\exception	H5::FileIException
-// Programmer   Binh-Minh Ribler - May 2004
+// Function:    H5File::getFileSize
+///\brief       Returns the file size of the HDF5 file.
+///\return      File size
+///\exception   H5::FileIException
+///\par Description
+///             This function is called after an existing file is opened in
+///             order to learn the true size of the underlying file.
+// Programmer   Raymond Lu - June 24, 2004
 //--------------------------------------------------------------------------
-void H5File::getVFDHandle(void **file_handle) const
+hsize_t
+H5File::getFileSize() const
 {
-   herr_t ret_value = H5Fget_vfd_handle(id, H5P_DEFAULT, file_handle);
-   if( ret_value < 0 )
-   {
-      throw FileIException("H5File::getVFDHandle", "H5Fget_vfd_handle failed");
-   }
+    hsize_t file_size;
+    herr_t  ret_value = H5Fget_filesize(id, &file_size);
+    if (ret_value < 0) {
+        throw FileIException("H5File::getFileSize", "H5Fget_filesize failed");
+    }
+    return (file_size);
 }
 
 //--------------------------------------------------------------------------
-// Function:	H5File::getFileSize
-///\brief	Returns the file size of the HDF5 file.
-///\return	File size
-///\exception	H5::FileIException
+// Function:    H5File::getFileNum
+///\brief       Returns the file number of the HDF5 file.
+///\return      File number
+///\exception   H5::FileIException
 ///\par Description
-///		This function is called after an existing file is opened in
-///		order to learn the true size of the underlying file.
-// Programmer   Raymond Lu - June 24, 2004
+///             This function is called after an existing file is opened in
+///             order to retrieve the unique 'file number' for the file.
+// Programmer   Quincey Koziol - April 13, 2019
 //--------------------------------------------------------------------------
-hsize_t H5File::getFileSize() const
+unsigned long
+H5File::getFileNum() const
 {
-   hsize_t file_size;
-   herr_t ret_value = H5Fget_filesize(id, &file_size);
-   if (ret_value < 0)
-   {
-      throw FileIException("H5File::getFileSize", "H5Fget_filesize failed");
-   }
-   return (file_size);
+    unsigned long fileno    = 0;
+    herr_t        ret_value = H5Fget_fileno(id, &fileno);
+    if (ret_value < 0) {
+        throw FileIException("H5File::getFileNum", "H5Fget_fileno failed");
+    }
+    return (fileno);
 }
 
 //--------------------------------------------------------------------------
 // Function:    H5File::getId
-///\brief	Get the id of this file
-///\return	File identifier
-// Modification:
+///\brief       Get the id of this file
+///\return      File identifier
+// Modification
 //      May 2008 - BMR
 //              Class hierarchy is revised to address bugzilla 1068.  Class
 //              AbstractDS and Attribute are moved out of H5Object.  In
 //              addition, member IdComponent::id is moved into subclasses, and
 //              IdComponent::getId now becomes pure virtual function.
-// Programmer   Binh-Minh Ribler - May, 2008
+// May, 2008
 //--------------------------------------------------------------------------
-hid_t H5File::getId() const
+hid_t
+H5File::getId() const
 {
-   return(id);
+    return (id);
 }
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 //--------------------------------------------------------------------------
-// Function:	H5File::getLocId
-// Purpose:	Get the id of this file
+// Function:    H5File::reopen
+// Purpose      Reopens this file.
+// Exception    H5::FileIException
 // Description
-//		This function is a redefinition of CommonFG::getLocId.  It
-//		is used by CommonFG member functions to get the file id.
-// Programmer	Binh-Minh Ribler - 2000
+//              This function is replaced by the above function reOpen.
+// December 2000
 //--------------------------------------------------------------------------
-hid_t H5File::getLocId() const
+void
+H5File::reopen()
 {
-   return( getId() );
+    H5File::reOpen();
 }
 
 //--------------------------------------------------------------------------
-// Function:	H5File::reopen
-// Purpose:	Reopens this file.
-// Exception	H5::FileIException
+// Function:    H5File::getLocId
+// Purpose      Get the id of this file
 // Description
-//		This function is replaced by the above function reOpen.
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-void H5File::reopen()
+//              This function is a redefinition of CommonFG::getLocId.  It
+//              is used by CommonFG member functions to get the file id.
+// December 2000
+// Deprecated:
+//      Aug 18, 2016 -BMR
+//              After HDFFV-9920, the Group's methods can use getId() and
+//              getLocId() is kept for backward compatibility.
+//--------------------------------------------------------------------------
+hid_t
+H5File::getLocId() const
 {
-   H5File::reOpen();
+    return (getId());
 }
 
 //--------------------------------------------------------------------------
@@ -567,87 +709,86 @@ void H5File::reopen()
 ///
 ///\exception   H5::IdComponentException when the attempt to close the HDF5
 ///             object fails
-// Description:
-//              The underlaying reference counting in the C library ensures
+// Description
+//              The underlying reference counting in the C library ensures
 //              that the current valid id of this object is properly closed.
 //              Then the object's id is reset to the new id.
-// Programmer   Binh-Minh Ribler - 2000
+// December 2000
 //--------------------------------------------------------------------------
-void H5File::p_setId(const hid_t new_id)
+void
+H5File::p_setId(const hid_t new_id)
 {
     // handling references to this old id
     try {
         close();
     }
-    catch (Exception E) {
+    catch (Exception &E) {
         throw FileIException("H5File::p_setId", E.getDetailMsg());
     }
-   // reset object's id to the given id
-   id = new_id;
+    // reset object's id to the given id
+    id = new_id;
 }
 #endif // DOXYGEN_SHOULD_SKIP_THIS
 
 //--------------------------------------------------------------------------
-// Function:	H5File::close
-///\brief	Closes this HDF5 file.
+// Function:    H5File::close
+///\brief       Closes this HDF5 file.
 ///
-///\exception	H5::FileIException
-// Programmer	Binh-Minh Ribler - Mar 9, 2005
+///\exception   H5::FileIException
+// March 2005
 //--------------------------------------------------------------------------
-void H5File::close()
+void
+H5File::close()
 {
-    if (p_valid_id(id))
-    {
-	herr_t ret_value = H5Fclose( id );
-	if( ret_value < 0 )
-	{
-	    throw FileIException("H5File::close", "H5Fclose failed");
-	}
-	// reset the id
-	id = H5I_INVALID_HID;
+    if (p_valid_id(id)) {
+        herr_t ret_value = H5Fclose(id);
+        if (ret_value < 0) {
+            throw FileIException("H5File::close", "H5Fclose failed");
+        }
+        // reset the id
+        id = H5I_INVALID_HID;
     }
 }
 
 //--------------------------------------------------------------------------
-// Function:	H5File::throwException
-///\brief	Throws file exception - initially implemented for CommonFG
-///\param	func_name - Name of the function where failure occurs
-///\param	msg       - Message describing the failure
-///\exception	H5::FileIException
+// Function:    H5File::throwException
+///\brief       Throws file exception - initially implemented for CommonFG
+///\param       func_name - Name of the function where failure occurs
+///\param       msg       - Message describing the failure
+///\exception   H5::FileIException
 // Description
-// 		This function is used in CommonFG implementation so that
-//		proper exception can be thrown for file or group.  The
-//		argument func_name is a member of CommonFG and "H5File::"
-//		will be inserted to indicate the function called is an
-//		implementation of H5File.
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-void H5File::throwException(const H5std_string& func_name, const H5std_string& msg) const
+//              This function is also used in H5Location implementation so that
+//              proper exception can be thrown for file or group.  The
+//              "H5File::" will be inserted to indicate the function called is
+//              an implementation of H5File.
+// December 2000
+//--------------------------------------------------------------------------
+void
+H5File::throwException(const H5std_string &func_name, const H5std_string &msg) const
 {
-   H5std_string full_name = func_name;
-   full_name.insert(0, "H5File::");
-   throw FileIException(full_name, msg);
+    H5std_string full_name = func_name;
+    full_name.insert(0, "H5File::");
+    throw FileIException(full_name, msg);
 }
 
 //--------------------------------------------------------------------------
-// Function:	H5File destructor
-///\brief	Properly terminates access to this file.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    H5File destructor
+///\brief       Properly terminates access to this file.
+// December 2000
 // Modification
-//		- Replaced resetIdComponent() with decRefCount() to use C
-//		library ID reference counting mechanism - BMR, Feb 20, 2005
-//		- Replaced decRefCount with close() to let the C library
-//		handle the reference counting - BMR, Jun 1, 2006
+//              - Replaced resetIdComponent() with decRefCount() to use C
+//              library ID reference counting mechanism - BMR, Feb 20, 2005
+//              - Replaced decRefCount with close() to let the C library
+//              handle the reference counting - BMR, Jun 1, 2006
 //--------------------------------------------------------------------------
 H5File::~H5File()
 {
     try {
-	close();
-    } catch (Exception close_error) {
-	cerr << "H5File::~H5File - " << close_error.getDetailMsg() << endl;
+        close();
+    }
+    catch (Exception &close_error) {
+        cerr << "H5File::~H5File - " << close_error.getDetailMsg() << endl;
     }
 }
 
-#ifndef H5_NO_NAMESPACE
-} // end namespace
-#endif
+} // namespace H5
diff --git a/c++/src/H5File.h b/c++/src/H5File.h
index 0ef85b5..617adaa 100644
--- a/c++/src/H5File.h
+++ b/c++/src/H5File.h
@@ -1,124 +1,140 @@
 // C++ informative line for the emacs editor: -*- C++ -*-
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5File_H
-#define __H5File_H
+#ifndef H5File_H
+#define H5File_H
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#endif
 
 /*! \class H5File
-    \brief Class H5File represents an HDF5 file.
-
-    It inherits from H5Location and CommonFG.
+    \brief Class H5File represents an HDF5 file and inherits from class Group
+    as file is a root group.
 */
-class H5_DLLCPP H5File : public H5Location, public CommonFG {
-   public:
-	// Creates or opens an HDF5 file.
-	H5File( const char* name, unsigned int flags,
-	   const FileCreatPropList& create_plist = FileCreatPropList::DEFAULT,
-	   const FileAccPropList& access_plist = FileAccPropList::DEFAULT );
-	H5File( const H5std_string& name, unsigned int flags,
-	   const FileCreatPropList& create_plist = FileCreatPropList::DEFAULT,
-	   const FileAccPropList& access_plist = FileAccPropList::DEFAULT );
-
-	// Open the file
-	void openFile(const H5std_string& name, unsigned int flags,
-	    const FileAccPropList& access_plist = FileAccPropList::DEFAULT);
-	void openFile(const char* name, unsigned int flags,
-	    const FileAccPropList& access_plist = FileAccPropList::DEFAULT);
-
-	// Close this file.
-	virtual void close();
-
-	// Gets the access property list of this file.
-	FileAccPropList getAccessPlist() const;
-
-	// Gets the creation property list of this file.
-	FileCreatPropList getCreatePlist() const;
-
-	// Retrieves the file size of an opened file.
-	hsize_t getFileSize() const;
-
-	// Returns the amount of free space in the file.
-	hssize_t getFreeSpace() const;
-
-	// Returns the number of opened object IDs (files, datasets, groups
-	// and datatypes) in the same file.
-	ssize_t getObjCount(unsigned types) const;
-	ssize_t getObjCount() const;
-
-	// Retrieves a list of opened object IDs (files, datasets, groups
-	// and datatypes) in the same file.
-	void getObjIDs(unsigned types, size_t max_objs, hid_t *oid_list) const;
-
-	// Returns the pointer to the file handle of the low-level file driver.
-	void getVFDHandle(void **file_handle) const;
-	void getVFDHandle(const FileAccPropList& fapl, void **file_handle) const;
-	void getVFDHandle(FileAccPropList& fapl, void **file_handle) const; // kept for backward compatibility
-
-	// Determines if a file, specified by its name, is in HDF5 format
-	static bool isHdf5(const char* name );
-	static bool isHdf5(const H5std_string& name );
-
-	// Reopens this file.
-	void reOpen();	// added for better name
+//  Inheritance: Group -> CommonFG/H5Object -> H5Location -> IdComponent
+class H5_DLLCPP H5File : public Group {
+  public:
+    // Creates or opens an HDF5 file.
+    H5File(const char *name, unsigned int flags,
+           const FileCreatPropList &create_plist = FileCreatPropList::DEFAULT,
+           const FileAccPropList   &access_plist = FileAccPropList::DEFAULT);
+    H5File(const H5std_string &name, unsigned int flags,
+           const FileCreatPropList &create_plist = FileCreatPropList::DEFAULT,
+           const FileAccPropList   &access_plist = FileAccPropList::DEFAULT);
+    H5File(const char *name, unsigned int flags, const FileAccPropList &access_plist);
+    H5File(const H5std_string &name, unsigned int flags, const FileAccPropList &access_plist);
+
+    // Open the file
+    void openFile(const H5std_string &name, unsigned int flags,
+                  const FileAccPropList &access_plist = FileAccPropList::DEFAULT);
+    void openFile(const char *name, unsigned int flags,
+                  const FileAccPropList &access_plist = FileAccPropList::DEFAULT);
+
+    // Close this file.
+    virtual void close() override;
+
+    // Gets a copy of the access property list of this file.
+    FileAccPropList getAccessPlist() const;
+
+    // Gets a copy of the creation property list of this file.
+    FileCreatPropList getCreatePlist() const;
+
+    // Gets general information about this file.
+    void getFileInfo(H5F_info2_t &file_info) const;
+
+    // Returns the amount of free space in the file.
+    hssize_t getFreeSpace() const;
+
+    // Returns the number of opened object IDs (files, datasets, groups
+    // and datatypes) in the same file.
+    ssize_t getObjCount(unsigned types = H5F_OBJ_ALL) const;
+
+    // Retrieves a list of opened object IDs (files, datasets, groups
+    // and datatypes) in the same file.
+    void getObjIDs(unsigned types, size_t max_objs, hid_t *oid_list) const;
+
+    // Returns the pointer to the file handle of the low-level file driver.
+    void getVFDHandle(void **file_handle) const;
+    void getVFDHandle(const FileAccPropList &fapl, void **file_handle) const;
+    // void getVFDHandle(FileAccPropList& fapl, void **file_handle) const; // removed from 1.8.18 and 1.10.1
+
+    // Returns the file size of the HDF5 file.
+    hsize_t getFileSize() const;
+
+    // Returns the 'file number' of the HDF5 file.
+    unsigned long getFileNum() const;
+
+    // Determines if a file, specified by its name, is in HDF5 format
+    static bool isHdf5(const char *name);
+    static bool isHdf5(const H5std_string &name);
+
+    // Determines if a file, specified by its name, can be accessed as HDF5
+    static bool isAccessible(const char            *name,
+                             const FileAccPropList &access_plist = FileAccPropList::DEFAULT);
+    static bool isAccessible(const H5std_string    &name,
+                             const FileAccPropList &access_plist = FileAccPropList::DEFAULT);
+
+    // Reopens this file.
+    void reOpen(); // added for better name
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
-	void reopen();  // obsolete in favor of reOpen()
+    void reopen(); // obsolete in favor of reOpen()
 
-	// Gets the file id
-	virtual hid_t getLocId() const;
+    // Creates an H5File using an existing file id.  Not recommended
+    // in applications.
+    H5File(hid_t existing_id);
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS
 
-	///\brief Returns this class name.
-	virtual H5std_string fromClass () const { return("H5File"); }
+    ///\brief Returns this class name.
+    virtual H5std_string
+    fromClass() const override
+    {
+        return ("H5File");
+    }
+
+    // Throw file exception.
+    virtual void throwException(const H5std_string &func_name, const H5std_string &msg) const override;
 
-	// Throw file exception.
-	virtual void throwException(const H5std_string& func_name, const H5std_string& msg) const;
+    // For CommonFG to get the file id.
+    virtual hid_t getLocId() const override;
 
-	// Default constructor
-	H5File();
+    // Default constructor
+    H5File();
 
-	// Copy constructor: makes a copy of the original H5File object.
-	H5File(const H5File& original);
+    // Copy constructor: same as the original H5File.
+    H5File(const H5File &original);
 
-	// Gets the HDF5 file id.
-	virtual hid_t getId() const;
+    // Gets the HDF5 file id.
+    virtual hid_t getId() const override;
 
-	// H5File destructor.
-	virtual ~H5File();
+    // H5File destructor.
+    virtual ~H5File() override;
 
-   protected:
+  protected:
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
-	// Sets the HDF5 file id.
-	virtual void p_setId(const hid_t new_id);
+    // Sets the HDF5 file id.
+    virtual void p_setId(const hid_t new_id) override;
 #endif // DOXYGEN_SHOULD_SKIP_THIS
 
-   private:
-	hid_t id;	// HDF5 file id
+  private:
+    hid_t id; // HDF5 file id
+
+    // This function is private and contains common code between the
+    // constructors taking a string or a char*
+    void p_get_file(const char *name, unsigned int flags, const FileCreatPropList &create_plist,
+                    const FileAccPropList &access_plist);
 
-	// This function is private and contains common code between the
-	// constructors taking a string or a char*
-	void p_get_file( const char* name, unsigned int flags, const FileCreatPropList& create_plist, const FileAccPropList& access_plist );
+}; // end of H5File
+} // namespace H5
 
-};
-#ifndef H5_NO_NAMESPACE
-}
-#endif
-#endif // __H5File_H
+#endif // H5File_H
diff --git a/c++/src/H5FloatType.cpp b/c++/src/H5FloatType.cpp
index 784e419..9d43dbf 100644
--- a/c++/src/H5FloatType.cpp
+++ b/c++/src/H5FloatType.cpp
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <string>
@@ -19,271 +16,339 @@
 #include "H5Exception.h"
 #include "H5IdComponent.h"
 #include "H5PropList.h"
-#include "H5Object.h"
+#include "H5OcreatProp.h"
 #include "H5DcreatProp.h"
-#include "H5CommonFG.h"
+#include "H5DxferProp.h"
+#include "H5LcreatProp.h"
+#include "H5LaccProp.h"
+#include "H5DaccProp.h"
+#include "H5Location.h"
+#include "H5Object.h"
 #include "H5DataType.h"
 #include "H5AbstractDs.h"
-#include "H5DxferProp.h"
 #include "H5DataSpace.h"
 #include "H5AtomType.h"
 #include "H5FloatType.h"
 #include "H5DataSet.h"
 #include "H5PredType.h"
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#endif
 
 //--------------------------------------------------------------------------
-// Function:	FloatType default constructor
-///\brief	Default constructor: Creates a stub floating-point datatype
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    FloatType default constructor
+///\brief       Default constructor: Creates a stub floating-point datatype
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-FloatType::FloatType() {}
+FloatType::FloatType()
+{
+}
 
 //--------------------------------------------------------------------------
-// Function:	FloatType overloaded constructor
-///\brief	Creates a floating-point datatype using a predefined type.
-///\param	pred_type - IN: Predefined datatype
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    FloatType overloaded constructor
+///\brief       Creates a floating-point datatype using a predefined type.
+///\param       pred_type - IN: Predefined datatype
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-FloatType::FloatType( const PredType& pred_type ) : AtomType()
+FloatType::FloatType(const PredType &pred_type) : AtomType()
 {
-   // use DataType::copy to make a copy of this predefined type
-   copy( pred_type );
+    // use DataType::copy to make a copy of this predefined type
+    copy(pred_type);
 }
 
 //--------------------------------------------------------------------------
-// Function:	FloatType overloaded constructor
-///\brief	Creates an FloatType object using the id of an existing
-///		datatype.
-///\param	existing_id - IN: Id of an existing datatype
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    FloatType overloaded constructor
+///\brief       Creates an FloatType object using the id of an existing
+///             datatype.
+///\param       existing_id - IN: Id of an existing datatype
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-FloatType::FloatType( const hid_t existing_id ) : AtomType( existing_id ) {}
+FloatType::FloatType(const hid_t existing_id) : AtomType(existing_id)
+{
+}
 
 //--------------------------------------------------------------------------
-// Function:	FloatType copy constructor
-///\brief	Copy constructor: makes a copy of the original FloatType object.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    FloatType copy constructor
+///\brief       Copy constructor: same HDF5 object as \a original
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-FloatType::FloatType( const FloatType&  original ) : AtomType( original ){}
+FloatType::FloatType(const FloatType &original) : AtomType(original)
+{
+}
 
 //--------------------------------------------------------------------------
-// Function:	EnumType overloaded constructor
-///\brief	Gets the floating-point datatype of the specified dataset
-///\param	dataset - IN: Dataset that this floating-point datatype
-///		associates with
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    FloatType overloaded constructor
+///\brief       Gets the floating-point datatype of the specified dataset
+///\param       dataset - IN: Dataset that this floating-point datatype
+///             associates with
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-FloatType::FloatType( const DataSet& dataset ) : AtomType()
+FloatType::FloatType(const DataSet &dataset) : AtomType()
 {
-   // Calls C function H5Dget_type to get the id of the datatype
-   id = H5Dget_type( dataset.getId() );
+    // Calls C function H5Dget_type to get the id of the datatype
+    id = H5Dget_type(dataset.getId());
 
-   if( id < 0 )
-   {
-      throw DataSetIException("FloatType constructor", "H5Dget_type failed");
-   }
+    if (id < 0) {
+        throw DataSetIException("FloatType constructor", "H5Dget_type failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	FloatType::getFields
-///\brief	Retrieves floating point datatype bit field information.
-///\param	spos  - OUT: Retrieved floating-point sign bit
-///\param	epos  - OUT: Retrieved exponent bit-position
-///\param	esize - OUT: Retrieved size of exponent, in bits
-///\param	mpos  - OUT: Retrieved mantissa bit-position
-///\param	msize - OUT: Retrieved size of mantissa, in bits
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-void FloatType::getFields( size_t& spos, size_t& epos, size_t& esize, size_t& mpos, size_t& msize ) const
+// Function:    FloatType overloaded constructor
+///\brief       Creates an FloatType instance by opening an HDF5 float datatype
+///             given its name, provided as a C character string.
+///\param       loc        - IN: Location of the type
+///\param       dtype_name - IN: Float type name
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - Dec 2016
+// Description
+//              In 1.10.1, this constructor was introduced and may replace the
+//              existing function CommonFG::openFloatType(const char*)
+//              to improve usability.
+//              -BMR, Dec 2016
+//--------------------------------------------------------------------------
+FloatType::FloatType(const H5Location &loc, const char *dtype_name) : AtomType()
 {
-   herr_t ret_value = H5Tget_fields( id, &spos, &epos, &esize, &mpos, &msize );
-   if( ret_value < 0 )
-   {
-      throw DataTypeIException("FloatType::getFields", "H5Tget_fields failed");
-   }
+    id = p_opentype(loc, dtype_name);
 }
 
 //--------------------------------------------------------------------------
-// Function:	FloatType::setFields
-///\brief	Sets locations and sizes of floating point bit fields.
-///\param	spos  - OUT: Sign position, i.e., the bit offset of the
-///		floating-point sign bit.
-///\param	epos  - OUT: Exponent bit position
-///\param	esize - OUT: Size of exponent, in bits
-///\param	mpos  - OUT: Mantissa bit-position
-///\param	msize - OUT: Size of mantissa, in bits
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-void FloatType::setFields( size_t spos, size_t epos, size_t esize, size_t mpos, size_t msize ) const
+// Function:    FloatType overloaded constructor
+///\brief       Creates an FloatType instance by opening an HDF5 float datatype
+///             given its name, provided as an \c H5std_string.
+///\param       loc        - IN: Location of the type
+///\param       dtype_name - IN: Float type name
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - Dec 2016
+// Description
+//              In 1.10.1, this constructor was introduced and may replace the
+//              existing function CommonFG::openFloatType(const H5std_string&)
+//              to improve usability.
+//              -BMR, Dec 2016
+//--------------------------------------------------------------------------
+FloatType::FloatType(const H5Location &loc, const H5std_string &dtype_name) : AtomType()
 {
-   herr_t ret_value = H5Tset_fields( id, spos, epos, esize, mpos, msize );
-   if( ret_value < 0 )
-   {
-      throw DataTypeIException("FloatType::setFields", "H5Tset_fields failed");
-   }
+    id = p_opentype(loc, dtype_name.c_str());
 }
 
 //--------------------------------------------------------------------------
-// Function:	FloatType::getEbias
-///\brief	Retrieves the exponent bias of a floating-point type.
-///\return	Exponent bias
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    FloatType::decode
+///\brief       Returns an FloatType object via DataType* by decoding the
+///             binary object description of this type.
+///
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - Aug 2017
 //--------------------------------------------------------------------------
-size_t FloatType::getEbias() const
+DataType *
+FloatType::decode() const
 {
-   size_t ebias = H5Tget_ebias( id );
-   // Returns the bias if successful
-   if( ebias == 0 )
-   {
-      throw DataTypeIException("FloatType::getEbias", "H5Tget_ebias failed - returned exponent bias as 0");
-   }
-   return( ebias );
+    hid_t encoded_flttype_id = H5I_INVALID_HID;
+    try {
+        encoded_flttype_id = p_decode();
+    }
+    catch (DataTypeIException &err) {
+        throw;
+    }
+    FloatType *encoded_flttype = new FloatType;
+    encoded_flttype->p_setId(encoded_flttype_id);
+    return (encoded_flttype);
 }
 
 //--------------------------------------------------------------------------
-// Function:	FloatType::setEbias
-///\brief	Sets the exponent bias of a floating-point type.
-///\param	ebias - Exponent bias value
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    FloatType::getFields
+///\brief       Retrieves floating point datatype bit field information.
+///\param       spos  - OUT: Retrieved floating-point sign bit
+///\param       epos  - OUT: Retrieved exponent bit-position
+///\param       esize - OUT: Retrieved size of exponent, in bits
+///\param       mpos  - OUT: Retrieved mantissa bit-position
+///\param       msize - OUT: Retrieved size of mantissa, in bits
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void FloatType::setEbias( size_t ebias ) const
+void
+FloatType::getFields(size_t &spos, size_t &epos, size_t &esize, size_t &mpos, size_t &msize) const
 {
-   herr_t ret_value = H5Tset_ebias( id, ebias );
-   if( ret_value < 0 )
-   {
-      throw DataTypeIException("FloatType::setEbias", "H5Tset_ebias failed");
-   }
+    herr_t ret_value = H5Tget_fields(id, &spos, &epos, &esize, &mpos, &msize);
+    if (ret_value < 0) {
+        throw DataTypeIException("FloatType::getFields", "H5Tget_fields failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	FloatType::getNorm
-///\brief	Retrieves mantissa normalization of a floating-point datatype.
-///\param	norm_string - OUT: Text string of the normalization type
-///\return	Valid normalization type, which can be:
-///		\li \c H5T_NORM_IMPLIED (0) - MSB of mantissa is not stored
-///		\li \c H5T_NORM_MSBSET (1) - MSB of mantissa is always 1
-///		\li \c H5T_NORM_NONE (2) - Mantissa is not normalized
-///\exception	H5::DataTypeIException
+// Function:    FloatType::setFields
+///\brief       Sets locations and sizes of floating point bit fields.
+///\param       spos  - OUT: Sign position, i.e., the bit offset of the
+///             floating-point sign bit.
+///\param       epos  - OUT: Exponent bit position
+///\param       esize - OUT: Size of exponent, in bits
+///\param       mpos  - OUT: Mantissa bit-position
+///\param       msize - OUT: Size of mantissa, in bits
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+void
+FloatType::setFields(size_t spos, size_t epos, size_t esize, size_t mpos, size_t msize) const
+{
+    herr_t ret_value = H5Tset_fields(id, spos, epos, esize, mpos, msize);
+    if (ret_value < 0) {
+        throw DataTypeIException("FloatType::setFields", "H5Tset_fields failed");
+    }
+}
+
+//--------------------------------------------------------------------------
+// Function:    FloatType::getEbias
+///\brief       Retrieves the exponent bias of a floating-point type.
+///\return      Exponent bias
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+size_t
+FloatType::getEbias() const
+{
+    size_t ebias = H5Tget_ebias(id);
+    // Returns the bias if successful
+    if (ebias == 0) {
+        throw DataTypeIException("FloatType::getEbias", "H5Tget_ebias failed - returned exponent bias as 0");
+    }
+    return (ebias);
+}
+
+//--------------------------------------------------------------------------
+// Function:    FloatType::setEbias
+///\brief       Sets the exponent bias of a floating-point type.
+///\param       ebias - Exponent bias value
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+void
+FloatType::setEbias(size_t ebias) const
+{
+    herr_t ret_value = H5Tset_ebias(id, ebias);
+    if (ret_value < 0) {
+        throw DataTypeIException("FloatType::setEbias", "H5Tset_ebias failed");
+    }
+}
+
+//--------------------------------------------------------------------------
+// Function:    FloatType::getNorm
+///\brief       Retrieves mantissa normalization of a floating-point datatype.
+///\param       norm_string - OUT: Text string of the normalization type
+///\return      Valid normalization type, which can be:
+///             \li \c H5T_NORM_IMPLIED (0) - MSB of mantissa is not stored
+///             \li \c H5T_NORM_MSBSET (1) - MSB of mantissa is always 1
+///             \li \c H5T_NORM_NONE (2) - Mantissa is not normalized
+///\exception   H5::DataTypeIException
 ///\par Description
-///		For your convenience, this function also provides the text
-///		string of the returned normalization type, via parameter
-///		\a norm_string.
-// Programmer	Binh-Minh Ribler - 2000
+///             For your convenience, this function also provides the text
+///             string of the returned normalization type, via parameter
+///             \a norm_string.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-H5T_norm_t FloatType::getNorm( H5std_string& norm_string ) const
+H5T_norm_t
+FloatType::getNorm(H5std_string &norm_string) const
 {
-   H5T_norm_t norm = H5Tget_norm( id );  // C routine
-   // Returns a valid normalization type if successful
-   if( norm == H5T_NORM_ERROR )
-   {
-      throw DataTypeIException("FloatType::getNorm", "H5Tget_norm failed - returned H5T_NORM_ERROR");
-   }
-   if( norm == H5T_NORM_IMPLIED )
-      norm_string = "H5T_NORM_IMPLIED (0)";
-   else if( norm == H5T_NORM_MSBSET )
-      norm_string = "H5T_NORM_MSBSET (1)";
-   else if( norm == H5T_NORM_NONE )
-      norm_string = "H5T_NORM_NONE (2)";
-   return( norm );
+    H5T_norm_t norm = H5Tget_norm(id); // C routine
+    // Returns a valid normalization type if successful
+    if (norm == H5T_NORM_ERROR) {
+        throw DataTypeIException("FloatType::getNorm", "H5Tget_norm failed - returned H5T_NORM_ERROR");
+    }
+    if (norm == H5T_NORM_IMPLIED)
+        norm_string = "H5T_NORM_IMPLIED (0)";
+    else if (norm == H5T_NORM_MSBSET)
+        norm_string = "H5T_NORM_MSBSET (1)";
+    else if (norm == H5T_NORM_NONE)
+        norm_string = "H5T_NORM_NONE (2)";
+    return (norm);
 }
 
 //--------------------------------------------------------------------------
-// Function:	FloatType::setNorm
-///\brief	Sets the mantissa normalization of a floating-point datatype.
-///\param	norm - IN: Mantissa normalization type
-///\exception	H5::DataTypeIException
+// Function:    FloatType::setNorm
+///\brief       Sets the mantissa normalization of a floating-point datatype.
+///\param       norm - IN: Mantissa normalization type
+///\exception   H5::DataTypeIException
 ///\par Description
-///		Valid values for normalization type include:
-///		\li \c H5T_NORM_IMPLIED (0) - MSB of mantissa is not stored
-///		\li \c H5T_NORM_MSBSET (1) - MSB of mantissa is always 1
-///		\li \c H5T_NORM_NONE (2) - Mantissa is not normalized
-// Programmer	Binh-Minh Ribler - 2000
+///             Valid values for normalization type include:
+///             \li \c H5T_NORM_IMPLIED (0) - MSB of mantissa is not stored
+///             \li \c H5T_NORM_MSBSET (1) - MSB of mantissa is always 1
+///             \li \c H5T_NORM_NONE (2) - Mantissa is not normalized
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void FloatType::setNorm( H5T_norm_t norm ) const
+void
+FloatType::setNorm(H5T_norm_t norm) const
 {
-   herr_t ret_value = H5Tset_norm( id, norm );
-   if( ret_value < 0 )
-   {
-      throw DataTypeIException("FloatType::setNorm", "H5Tset_norm failed");
-   }
+    herr_t ret_value = H5Tset_norm(id, norm);
+    if (ret_value < 0) {
+        throw DataTypeIException("FloatType::setNorm", "H5Tset_norm failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	FloatType::getInpad
-///\brief	Retrieves the internal padding type for unused bits in
-///		this floating-point datatypes.
-///\return	Internal padding type, which can be:
-///		\li \c H5T_PAD_ZERO (0) - Set background to zeros
-///		\li \c H5T_PAD_ONE (1) - Set background to ones
-///		\li \c H5T_PAD_BACKGROUND (2) - Leave background alone
-///\exception	H5::DataTypeIException
+// Function:    FloatType::getInpad
+///\brief       Retrieves the internal padding type for unused bits in
+///             this floating-point datatypes.
+///\return      Internal padding type, which can be:
+///             \li \c H5T_PAD_ZERO (0) - Set background to zeros
+///             \li \c H5T_PAD_ONE (1) - Set background to ones
+///             \li \c H5T_PAD_BACKGROUND (2) - Leave background alone
+///\exception   H5::DataTypeIException
 ///\par Description
-///		For your convenience, this function also provides the text
-///		string of the returned internal padding type, via parameter
-///		\a pad_string.
-// Programmer	Binh-Minh Ribler - 2000
+///             For your convenience, this function also provides the text
+///             string of the returned internal padding type, via parameter
+///             \a pad_string.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-H5T_pad_t FloatType::getInpad( H5std_string& pad_string ) const
+H5T_pad_t
+FloatType::getInpad(H5std_string &pad_string) const
 {
-   H5T_pad_t pad_type = H5Tget_inpad( id );
-   // Returns a valid padding type if successful
-   if( pad_type == H5T_PAD_ERROR )
-   {
-      throw DataTypeIException("FloatType::getInpad", "H5Tget_inpad failed - returned H5T_PAD_ERROR");
-   }
-   if( pad_type == H5T_PAD_ZERO )
-      pad_string = "H5T_PAD_ZERO (0)";
-   else if( pad_type == H5T_PAD_ONE )
-      pad_string = "H5T_PAD_ONE (1)";
-   else if( pad_type == H5T_PAD_BACKGROUND )
-      pad_string = "H5T_PAD_BACKGROUD (2)";
-   return( pad_type );
+    H5T_pad_t pad_type = H5Tget_inpad(id);
+    // Returns a valid padding type if successful
+    if (pad_type == H5T_PAD_ERROR) {
+        throw DataTypeIException("FloatType::getInpad", "H5Tget_inpad failed - returned H5T_PAD_ERROR");
+    }
+    if (pad_type == H5T_PAD_ZERO)
+        pad_string = "H5T_PAD_ZERO (0)";
+    else if (pad_type == H5T_PAD_ONE)
+        pad_string = "H5T_PAD_ONE (1)";
+    else if (pad_type == H5T_PAD_BACKGROUND)
+        pad_string = "H5T_PAD_BACKGROUD (2)";
+    return (pad_type);
 }
 
 //--------------------------------------------------------------------------
-// Function:	FloatType::setInpad
-///\brief	Fills unused internal floating point bits.
-///\param	inpad - IN: Internal padding type
-///\exception	H5::DataTypeIException
+// Function:    FloatType::setInpad
+///\brief       Fills unused internal floating point bits.
+///\param       inpad - IN: Internal padding type
+///\exception   H5::DataTypeIException
 ///\par Description
-///		If any internal bits of a floating point type are unused
-///		(that is, those significant bits which are not part of the
-///		sign, exponent, or mantissa), then they will be filled
-///		according to the padding value provided by \a inpad.
+///             If any internal bits of a floating point type are unused
+///             (that is, those significant bits which are not part of the
+///             sign, exponent, or mantissa), then they will be filled
+///             according to the padding value provided by \a inpad.
 ///\par
-///		Valid values for normalization type include:
-///		\li \c H5T_PAD_ZERO (0) - Set background to zeros
-///		\li \c H5T_PAD_ONE (1) - Set background to ones
-///		\li \c H5T_PAD_BACKGROUND (2) - Leave background alone
-// Programmer	Binh-Minh Ribler - 2000
+///             Valid values for normalization type include:
+///             \li \c H5T_PAD_ZERO (0) - Set background to zeros
+///             \li \c H5T_PAD_ONE (1) - Set background to ones
+///             \li \c H5T_PAD_BACKGROUND (2) - Leave background alone
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void FloatType::setInpad( H5T_pad_t inpad ) const
+void
+FloatType::setInpad(H5T_pad_t inpad) const
 {
-   herr_t ret_value = H5Tset_inpad( id, inpad );
-   if( ret_value < 0 )
-   {
-      throw DataTypeIException("FloatType::setInpad", "H5Tset_inpad failed");
-   }
+    herr_t ret_value = H5Tset_inpad(id, inpad);
+    if (ret_value < 0) {
+        throw DataTypeIException("FloatType::setInpad", "H5Tset_inpad failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	FloatType destructor
-///\brief	Noop destructor.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    FloatType destructor
+///\brief       Noop destructor.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-FloatType::~FloatType() {}
+FloatType::~FloatType()
+{
+}
 
-#ifndef H5_NO_NAMESPACE
-} // end namespace
-#endif
+} // namespace H5
diff --git a/c++/src/H5FloatType.h b/c++/src/H5FloatType.h
index 06a5450..42437ec 100644
--- a/c++/src/H5FloatType.h
+++ b/c++/src/H5FloatType.h
@@ -1,75 +1,86 @@
 // C++ informative line for the emacs editor: -*- C++ -*-
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5FloatType_H
-#define __H5FloatType_H
+#ifndef H5FloatType_H
+#define H5FloatType_H
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#endif
 
-//! Class FloatType operates on HDF5 floating point datatype.
+/*! \class FloatType
+    \brief FloatType is a derivative of a DataType and operates on HDF5
+    floating point datatype.
+*/
+//  Inheritance: AtomType -> DataType -> H5Object -> H5Location -> IdComponent
 class H5_DLLCPP FloatType : public AtomType {
-   public:
-        // Creates a floating-point type using a predefined type
-        FloatType( const PredType& pred_type );
+  public:
+    // Creates a floating-point type using a predefined type.
+    FloatType(const PredType &pred_type);
 
-	// Gets the floating-point datatype of the specified dataset
-	FloatType( const DataSet& dataset );
+    // Gets the floating-point datatype of the specified dataset.
+    FloatType(const DataSet &dataset);
 
-	// Retrieves the exponent bias of a floating-point type.
-	size_t getEbias() const;
+    // Constructors that open an HDF5 float datatype, given a location.
+    FloatType(const H5Location &loc, const char *name);
+    FloatType(const H5Location &loc, const H5std_string &name);
 
-	// Sets the exponent bias of a floating-point type.
-	void setEbias( size_t ebias ) const;
+    // Returns an FloatType object via DataType* by decoding the
+    // binary object description of this type.
+    virtual DataType *decode() const override;
 
-	// Retrieves floating point datatype bit field information.
-	void getFields( size_t& spos, size_t& epos, size_t& esize, size_t& mpos, size_t& msize ) const;
+    // Retrieves the exponent bias of a floating-point type.
+    size_t getEbias() const;
 
-	// Sets locations and sizes of floating point bit fields.
-	void setFields( size_t spos, size_t epos, size_t esize, size_t mpos, size_t msize ) const;
+    // Sets the exponent bias of a floating-point type.
+    void setEbias(size_t ebias) const;
 
-	// Retrieves the internal padding type for unused bits in floating-point datatypes.
-	H5T_pad_t getInpad( H5std_string& pad_string ) const;
+    // Retrieves floating point datatype bit field information.
+    void getFields(size_t &spos, size_t &epos, size_t &esize, size_t &mpos, size_t &msize) const;
 
-	// Fills unused internal floating point bits.
-	void setInpad( H5T_pad_t inpad ) const;
+    // Sets locations and sizes of floating point bit fields.
+    void setFields(size_t spos, size_t epos, size_t esize, size_t mpos, size_t msize) const;
 
-	// Retrieves mantissa normalization of a floating-point datatype.
-	H5T_norm_t getNorm( H5std_string& norm_string ) const;
+    // Retrieves the internal padding type for unused bits in floating-point datatypes.
+    H5T_pad_t getInpad(H5std_string &pad_string) const;
 
-	// Sets the mantissa normalization of a floating-point datatype.
-	void setNorm( H5T_norm_t norm ) const;
+    // Fills unused internal floating point bits.
+    void setInpad(H5T_pad_t inpad) const;
 
-	///\brief Returns this class name.
-	virtual H5std_string fromClass () const { return("FloatType"); }
+    // Retrieves mantissa normalization of a floating-point datatype.
+    H5T_norm_t getNorm(H5std_string &norm_string) const;
 
-	// Default constructor
-	FloatType();
+    // Sets the mantissa normalization of a floating-point datatype.
+    void setNorm(H5T_norm_t norm) const;
 
-	// Creates a floating-point datatype using an existing id
-	FloatType( const hid_t existing_id );
+    ///\brief Returns this class name.
+    virtual H5std_string
+    fromClass() const override
+    {
+        return ("FloatType");
+    }
 
-	// Copy constructor: makes a copy of the original FloatType object.
-	FloatType( const FloatType& original );
+    // Default constructor
+    FloatType();
 
-	// Noop destructor.
-	virtual ~FloatType();
-};
-#ifndef H5_NO_NAMESPACE
-}
-#endif
-#endif // __H5FloatType_H
+    // Creates a floating-point datatype using an existing id.
+    FloatType(const hid_t existing_id);
+
+    // Copy constructor: same as the original FloatType.
+    FloatType(const FloatType &original);
+
+    // Noop destructor.
+    virtual ~FloatType() override;
+
+}; // end of FloatType
+} // namespace H5
+
+#endif // H5FloatType_H
diff --git a/c++/src/H5Group.cpp b/c++/src/H5Group.cpp
index 8b22458..0fe8ff3 100644
--- a/c++/src/H5Group.cpp
+++ b/c++/src/H5Group.cpp
@@ -1,35 +1,33 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifdef OLD_HEADER_FILENAME
-#include <iostream.h>
-#else
 #include <iostream>
-#endif
 #include <string>
 
 #include "H5Include.h"
 #include "H5Exception.h"
 #include "H5IdComponent.h"
 #include "H5PropList.h"
-#include "H5Object.h"
-#include "H5AbstractDs.h"
 #include "H5FaccProp.h"
 #include "H5FcreatProp.h"
+#include "H5OcreatProp.h"
 #include "H5DcreatProp.h"
 #include "H5DxferProp.h"
+#include "H5LcreatProp.h"
+#include "H5LaccProp.h"
+#include "H5DaccProp.h"
+#include "H5Location.h"
+#include "H5Object.h"
+#include "H5AbstractDs.h"
 #include "H5DataSpace.h"
 #include "H5DataSet.h"
 #include "H5CommonFG.h"
@@ -38,103 +36,167 @@
 #include "H5File.h"
 #include "H5Alltypes.h"
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#ifndef H5_NO_STD
-    using std::cerr;
-    using std::endl;
-#endif  // H5_NO_STD
-#endif
+using std::cerr;
+using std::endl;
 
 //--------------------------------------------------------------------------
-// Function:	Group default constructor
-///\brief	Default constructor: creates a stub Group.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    Group default constructor
+///\brief       Default constructor: creates a stub Group.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-Group::Group() : H5Object(), CommonFG(), id(H5I_INVALID_HID) {}
+Group::Group() : H5Object(), CommonFG(), id(H5I_INVALID_HID)
+{
+}
 
 //--------------------------------------------------------------------------
-// Function:	Group copy constructor
-///\brief	Copy constructor: makes a copy of the original Group object.
-///\param	original - IN: Original group to copy
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    Group copy constructor
+///\brief       Copy constructor: same HDF5 object as \a original
+///\param       original - IN: Original group to copy
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-Group::Group(const Group& original) : H5Object(), CommonFG()
+Group::Group(const Group &original) : H5Object(), CommonFG(), id(original.id)
 {
-    id = original.getId();
     incRefCount(); // increment number of references to this id
 }
 
 //--------------------------------------------------------------------------
-// Function:	Group::getLocId
-///\brief	Returns the id of this group.
-///\return	Id of this group
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    Group::closeObjId
+///\brief       Closes an object, which was opened with Group::getObjId
+///
+///\exception   H5::FileIException or H5::GroupIException
+// Programmer   Binh-Minh Ribler - March, 2017
+//--------------------------------------------------------------------------
+void
+Group::closeObjId(hid_t obj_id) const
+{
+    herr_t ret_value = H5Oclose(obj_id);
+    if (ret_value < 0) {
+        throwException("Group::closeObjId", "H5Oclose failed");
+    }
+}
+
+//--------------------------------------------------------------------------
+// Function:    Group::getLocId
+// Purpose:     Get the id of this group
+// Programmer   Binh-Minh Ribler - 2000
+// Description
+//              This function is a redefinition of CommonFG::getLocId.  It
+//              is used by CommonFG member functions to get the file id.
+// Deprecated:
+//      Aug 18, 2016 -BMR
+//              After HDFFV-9920, the Group's methods can use getId() and
+//              getLocId() is kept for backward compatibility.
 //--------------------------------------------------------------------------
-hid_t Group::getLocId() const
+hid_t
+Group::getLocId() const
 {
-   return( getId() );
+    return (getId());
 }
 
 //--------------------------------------------------------------------------
-// Function:	Group overloaded constructor
-///\brief	Creates a Group object using the id of an existing group.
-///\param	existing_id - IN: Id of an existing group
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    Group overloaded constructor
+///\brief       Creates a Group object using the id of an existing group.
+///\param       existing_id - IN: Id of an existing group
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-Group::Group(const hid_t existing_id) : H5Object(), CommonFG()
+Group::Group(const hid_t existing_id) : H5Object(), CommonFG(), id(existing_id)
 {
-    id = existing_id;
+    incRefCount(); // increment number of references to this id
 }
 
 //--------------------------------------------------------------------------
-// Function:	Group overload constructor - dereference
-///\brief	Given a reference, ref, to an hdf5 group, creates a Group object
-///\param	loc - IN: Specifying location referenced object is in
-///\param	ref - IN: Reference pointer
-///\param	ref_type - IN: Reference type - default to H5R_OBJECT
-///\param	plist - IN: Property list - default to PropList::DEFAULT
-///\exception	H5::ReferenceException
+// Function:    Group overload constructor - dereference
+///\brief       Given a reference, ref, to an hdf5 group, creates a Group object
+///\param       loc - IN: Specifying location referenced object is in
+///\param       ref - IN: Reference pointer
+///\param       ref_type - IN: Reference type - default to H5R_OBJECT
+///\param       plist - IN: Property list - default to PropList::DEFAULT
+///\exception   H5::ReferenceException
 ///\par Description
-///		\c obj can be DataSet, Group, or named DataType, that
-///		is a datatype that has been named by DataType::commit.
-// Programmer	Binh-Minh Ribler - Oct, 2006
+///             \c obj can be DataSet, Group, or named DataType, that
+///             is a datatype that has been named by DataType::commit.
+// Programmer   Binh-Minh Ribler - Oct, 2006
 //--------------------------------------------------------------------------
-Group::Group(const H5Location& loc, const void* ref, H5R_type_t ref_type, const PropList& plist) : H5Object(), CommonFG(), id(H5I_INVALID_HID)
+Group::Group(const H5Location &loc, const void *ref, H5R_type_t ref_type, const PropList &plist)
+    : H5Object(), CommonFG(), id(H5I_INVALID_HID)
 {
     id = H5Location::p_dereference(loc.getId(), ref, ref_type, plist, "constructor - by dereference");
 }
 
 //--------------------------------------------------------------------------
-// Function:	Group overload constructor - dereference
-///\brief	Given a reference, ref, to an hdf5 group, creates a Group object
-///\param	attr - IN: Specifying location where the referenced object is in
-///\param	ref - IN: Reference pointer
-///\param	ref_type - IN: Reference type - default to H5R_OBJECT
-///\param	plist - IN: Property list - default to PropList::DEFAULT
-///\exception	H5::ReferenceException
-// Programmer	Binh-Minh Ribler - Oct, 2006
+// Function:    Group::getNumObjs
+///\brief       Returns the number of objects in this group.
+///\return      Number of objects
+///\exception   H5::FileIException or H5::GroupIException
+// Programmer   Binh-Minh Ribler - January, 2003
+//--------------------------------------------------------------------------
+hsize_t
+Group::getNumObjs() const
+{
+    H5G_info_t ginfo; // Group information
+
+    herr_t ret_value = H5Gget_info(getId(), &ginfo);
+    if (ret_value < 0)
+        throwException("getNumObjs", "H5Gget_info failed");
+    return (ginfo.nlinks);
+}
+
+//--------------------------------------------------------------------------
+// Function:    Group::getObjId
+///\brief       Opens an object via object header.
+///\param       obj_name - IN: Path to the object
+///\param       plist    - IN: Access property list for the link pointing to
+///                            the object
+///\exception   H5::FileIException or H5::GroupIException
+///\par Description
+///             This function opens an object in a group or file, using
+///             H5Oopen.  Thus, an object can be opened without knowing
+///             the object's type.
+// Programmer   Binh-Minh Ribler - March, 2017
+//--------------------------------------------------------------------------
+hid_t
+Group::getObjId(const char *obj_name, const PropList &plist) const
+{
+    hid_t ret_value = H5Oopen(getId(), obj_name, plist.getId());
+    if (ret_value < 0) {
+        throwException("Group::getObjId", "H5Oopen failed");
+    }
+    return (ret_value);
+}
+
+//--------------------------------------------------------------------------
+// Function:    Group::getObjId
+///\brief       This is an overloaded member function, provided for convenience.
+///             It takes a reference to a \c H5std_string for the object's name.
+///\param       obj_name - IN: Path to the object
+///\param       plist    - IN: Access property list for the link pointing to
+///                            the object
+///\exception   H5::FileIException or H5::GroupIException
+// Programmer   Binh-Minh Ribler - March, 2017
 //--------------------------------------------------------------------------
-Group::Group(const Attribute& attr, const void* ref, H5R_type_t ref_type, const PropList& plist) : H5Object(), CommonFG(), id(H5I_INVALID_HID)
+hid_t
+Group::getObjId(const H5std_string &obj_name, const PropList &plist) const
 {
-    id = H5Location::p_dereference(attr.getId(), ref, ref_type, plist, "constructor - by dereference");
+    return (getObjId(obj_name.c_str(), plist));
 }
 
 //--------------------------------------------------------------------------
 // Function:    Group::getId
-///\brief	Get the id of this group
-///\return	Group identifier
+///\brief       Get the id of this group
+///\return      Group identifier
 // Modification:
 //      May 2008 - BMR
-//		Class hierarchy is revised to address bugzilla 1068.  Class
-//		AbstractDS and Attribute are moved out of H5Object.  In
-//		addition, member IdComponent::id is moved into subclasses, and
-//		IdComponent::getId now becomes pure virtual function.
+//              Class hierarchy is revised to address bugzilla 1068.  Class
+//              AbstractDS and Attribute are moved out of H5Object.  In
+//              addition, member IdComponent::id is moved into subclasses, and
+//              IdComponent::getId now becomes pure virtual function.
 // Programmer   Binh-Minh Ribler - May, 2008
 //--------------------------------------------------------------------------
-hid_t Group::getId() const
+hid_t
+Group::getId() const
 {
-   return(id);
+    return (id);
 }
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
@@ -143,89 +205,87 @@ hid_t Group::getId() const
 ///\brief       Sets the identifier of this object to a new value.
 ///
 ///\exception   H5::IdComponentException when the attempt to close the HDF5
-///		object fails
+///             object fails
 // Description:
-//		The underlaying reference counting in the C library ensures
-//		that the current valid id of this object is properly closed.
-//		Then the object's id is reset to the new id.
+//              The underlying reference counting in the C library ensures
+//              that the current valid id of this object is properly closed.
+//              Then the object's id is reset to the new id.
 // Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void Group::p_setId(const hid_t new_id)
+void
+Group::p_setId(const hid_t new_id)
 {
     // handling references to this old id
     try {
         close();
     }
-    catch (Exception close_error) {
-        throw GroupIException("Group::p_setId", close_error.getDetailMsg());
+    catch (Exception &close_error) {
+        throwException("Group::p_setId", close_error.getDetailMsg());
     }
-   // reset object's id to the given id
-   id = new_id;
+    // reset object's id to the given id
+    id = new_id;
 }
 #endif // DOXYGEN_SHOULD_SKIP_THIS
 
 //--------------------------------------------------------------------------
-// Function:	Group::close
-///\brief	Closes this group.
+// Function:    Group::close
+///\brief       Closes this group.
 ///
-///\exception	H5::GroupIException
-// Programmer	Binh-Minh Ribler - Mar 9, 2005
+///\exception   H5::GroupIException
+// Programmer   Binh-Minh Ribler - Mar 9, 2005
 //--------------------------------------------------------------------------
-void Group::close()
+void
+Group::close()
 {
-    if (p_valid_id(id))
-    {
-	herr_t ret_value = H5Gclose( id );
-	if( ret_value < 0 )
-	{
-	    throw GroupIException("Group::close", "H5Gclose failed");
-	}
-	// reset the id
-	id = H5I_INVALID_HID;
+    if (p_valid_id(id)) {
+        herr_t ret_value = H5Gclose(id);
+        if (ret_value < 0) {
+            throwException("Group::close", "H5Gclose failed");
+        }
+        // reset the id
+        id = H5I_INVALID_HID;
     }
 }
 
 //--------------------------------------------------------------------------
-// Function:	Group::throwException
-///\brief	Throws H5::GroupIException.
-///\param	func_name - Name of the function where failure occurs
-///\param	msg       - Message describing the failure
-///\exception	H5::GroupIException
+// Function:    Group::throwException
+///\brief       Throws H5::GroupIException.
+///\param       func_name - Name of the function where failure occurs
+///\param       msg       - Message describing the failure
+///\exception   H5::GroupIException
 // Description
-//		This function is used in CommonFG implementation so that
-//		proper exception can be thrown for file or group.  The
-//		argument func_name is a member of CommonFG and "Group::"
-//		will be inserted to indicate the function called is an
-//		implementation of Group.
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-void Group::throwException(const H5std_string& func_name, const H5std_string& msg) const
+//              This function is also used in H5Location's methods so that
+//              proper exception can be thrown for file or group.  The
+//              "Group::" will be inserted to indicate the function called is
+//              an implementation of Group.
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+void
+Group::throwException(const H5std_string &func_name, const H5std_string &msg) const
 {
-   H5std_string full_name = func_name;
-   full_name.insert(0, "Group::");
-   throw GroupIException(full_name, msg);
+    H5std_string full_name = func_name;
+    full_name.insert(0, "Group::");
+    throw GroupIException(full_name, msg);
 }
 
 //--------------------------------------------------------------------------
-// Function:	Group destructor
-///\brief	Properly terminates access to this group.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    Group destructor
+///\brief       Properly terminates access to this group.
+// Programmer   Binh-Minh Ribler - 2000
 // Modification
-//		- Replaced resetIdComponent() with decRefCount() to use C
-//		library ID reference counting mechanism - BMR, Feb 20, 2005
-//		- Replaced decRefCount with close() to let the C library
-//		handle the reference counting - BMR, Jun 1, 2006
+//              - Replaced resetIdComponent() with decRefCount() to use C
+//              library ID reference counting mechanism - BMR, Feb 20, 2005
+//              - Replaced decRefCount with close() to let the C library
+//              handle the reference counting - BMR, Jun 1, 2006
 //--------------------------------------------------------------------------
 Group::~Group()
 {
     try {
-	close();
+        close();
     }
-    catch (Exception close_error) {
-	cerr << "Group::~Group - " << close_error.getDetailMsg() << endl;
+    catch (Exception &close_error) {
+        cerr << "Group::~Group - " << close_error.getDetailMsg() << endl;
     }
 }
 
-#ifndef H5_NO_NAMESPACE
-} // end namespace
-#endif
+} // namespace H5
diff --git a/c++/src/H5Group.h b/c++/src/H5Group.h
index 1bd9882..cb9b092 100644
--- a/c++/src/H5Group.h
+++ b/c++/src/H5Group.h
@@ -1,74 +1,85 @@
 // C++ informative line for the emacs editor: -*- C++ -*-
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5Group_H
-#define __H5Group_H
+#ifndef H5Group_H
+#define H5Group_H
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#endif
 
 /*! \class Group
     \brief Class Group represents an HDF5 group.
-
-    It inherits many operations from H5Location and CommonFG.
 */
+//  Inheritance: CommonFG/H5Object -> H5Location -> IdComponent
 class H5_DLLCPP Group : public H5Object, public CommonFG {
-   public:
-	// Close this group.
-	virtual void close();
+  public:
+    // Close this group.
+    virtual void close() override;
+
+    ///\brief Returns this class name.
+    virtual H5std_string
+    fromClass() const override
+    {
+        return ("Group");
+    }
+
+    // Throw group exception.
+    virtual void throwException(const H5std_string &func_name, const H5std_string &msg) const override;
 
-	///\brief Returns this class name.
-	virtual H5std_string fromClass () const { return("Group"); }
+    // for CommonFG to get the file id.
+    virtual hid_t getLocId() const override;
 
-	// Throw group exception.
-	virtual void throwException(const H5std_string& func_name, const H5std_string& msg) const;
+    // Creates a group by way of dereference.
+    Group(const H5Location &loc, const void *ref, H5R_type_t ref_type = H5R_OBJECT,
+          const PropList &plist = PropList::DEFAULT);
+    // Removed in 1.10.1, because H5Location is baseclass
+    //        Group(const Attribute& attr, const void* ref, H5R_type_t ref_type = H5R_OBJECT, const PropList&
+    //        plist = PropList::DEFAULT);
 
-	// for CommonFG to get the file id.
-	virtual hid_t getLocId() const;
+    // Returns the number of objects in this group.
+    hsize_t getNumObjs() const;
 
-	// Creates a group by way of dereference.
-	Group(const H5Location& loc, const void* ref, H5R_type_t ref_type = H5R_OBJECT, const PropList& plist = PropList::DEFAULT);
-        Group(const Attribute& attr, const void* ref, H5R_type_t ref_type = H5R_OBJECT, const PropList& plist = PropList::DEFAULT);
+    // Opens an object within a group or a file, i.e., root group.
+    hid_t getObjId(const char *name, const PropList &plist = PropList::DEFAULT) const;
+    hid_t getObjId(const H5std_string &name, const PropList &plist = PropList::DEFAULT) const;
 
-	// default constructor
-	Group();
+    // Closes an object opened by getObjId().
+    void closeObjId(hid_t obj_id) const;
 
-	// Copy constructor: makes a copy of the original object
-	Group(const Group& original);
+    // default constructor
+    Group();
 
-	// Gets the group id.
-	virtual hid_t getId() const;
+    // Copy constructor: same as the original Group.
+    Group(const Group &original);
 
-	// Destructor
-	virtual ~Group();
+    // Gets the group id.
+    virtual hid_t getId() const override;
 
-	// Creates a copy of an existing group using its id.
-	Group( const hid_t group_id );
+    // Destructor
+    virtual ~Group() override;
 
-   protected:
+    // Creates a copy of an existing group using its id.
+    Group(const hid_t group_id);
+
+  protected:
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
-	// Sets the group id.
-	virtual void p_setId(const hid_t new_id);
+    // Sets the group id.
+    virtual void p_setId(const hid_t new_id) override;
 #endif // DOXYGEN_SHOULD_SKIP_THIS
 
-   private:
-	hid_t id;	// HDF5 group id
-};
-#ifndef H5_NO_NAMESPACE
-}
-#endif
-#endif // __H5Group_H
+  private:
+    hid_t id; // HDF5 group id
+
+}; // end of Group
+} // namespace H5
+
+#endif // H5Group_H
diff --git a/c++/src/H5IdComponent.cpp b/c++/src/H5IdComponent.cpp
index 54813ea..d6dc6ad 100644
--- a/c++/src/H5IdComponent.cpp
+++ b/c++/src/H5IdComponent.cpp
@@ -1,23 +1,15 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifdef OLD_HEADER_FILENAME
-#include <iostream.h>
-#else
-#include <iostream>
-#endif
 #include <string>
 
 #include "H5Include.h"
@@ -25,320 +17,405 @@
 #include "H5Library.h"
 #include "H5IdComponent.h"
 #include "H5DataSpace.h"
-#include "H5private.h"			// for HDmemset
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#endif
 
-//--------------------------------------------------------------------------
-// Function:	IdComponent overloaded constructor
-///\brief	Creates an IdComponent object using the id of an existing object.
-///\param	h5_id - IN: Id of an existing object
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
-//
-// *** Deprecation warning ***
-// This constructor is no longer appropriate because the data member "id" had
-// been moved to the sub-classes.  It will be removed in 1.10 release.  If its
-// removal does not raise any problems in 1.10, it will be removed from 1.8 in
-// subsequent releases.
-//--------------------------------------------------------------------------
-IdComponent::IdComponent(const hid_t h5_id) {}
-
-//--------------------------------------------------------------------------
-// Function:	IdComponent copy constructor
-// Purpose:	This noop copy constructor is removed as a result of the data
-//		member "id" being moved down to sub-classes. (Mar 2015)
-// Parameters:	original - IN: IdComponent instance to copy
-// Programmer	Binh-Minh Ribler - 2000
-//
-// *** Deprecation warning ***
-// This constructor is no longer appropriate because the data member "id" had
-// been moved to the sub-classes.  It is removed from 1.8.15 because it is
-// a noop and it can be generated by the compiler if needed.
-//--------------------------------------------------------------------------
-// IdComponent::IdComponent(const IdComponent& original) {}
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+// This flag indicates whether H5Library::initH5cpp has been called to register
+// the terminating functions with atexit()
+bool IdComponent::H5cppinit = false;
+
+// This flag is used to decide whether H5dont_atexit should be called.
+// Subclasses that have global constants use it.  This is a temporary
+// work-around in 1.8.16.  It will be removed after HDFFV-9540 is fixed.
+bool IdComponent::H5dontAtexit_called = false;
+#endif // DOXYGEN_SHOULD_SKIP_THIS
 
 //--------------------------------------------------------------------------
-// Function:	IdComponent::incRefCount
-///\brief	Increment reference counter for a given id.
-// Programmer	Binh-Minh Ribler - May 2005
+// Function:    IdComponent::incRefCount
+///\brief       Increment reference counter for a given id.
+// Programmer   Binh-Minh Ribler - May 2005
 //--------------------------------------------------------------------------
-void IdComponent::incRefCount(const hid_t obj_id) const
+void
+IdComponent::incRefCount(const hid_t obj_id) const
 {
     if (p_valid_id(obj_id))
-	if (H5Iinc_ref(obj_id) < 0)
-	    throw IdComponentException(inMemFunc("incRefCount"), "incrementing object ref count failed");
+        if (H5Iinc_ref(obj_id) < 0)
+            throw IdComponentException(inMemFunc("incRefCount"), "incrementing object ref count failed");
 }
 
 //--------------------------------------------------------------------------
-// Function:	IdComponent::incRefCount
-///\brief	Increment reference counter for the id of this object.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    IdComponent::incRefCount
+///\brief       Increment reference counter for the id of this object.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void IdComponent::incRefCount() const
+void
+IdComponent::incRefCount() const
 {
     incRefCount(getId());
 }
 
 //--------------------------------------------------------------------------
-// Function:	IdComponent::decRefCount
-///\brief	Decrement reference counter for a given id.
-// Programmer	Binh-Minh Ribler - May 2005
+// Function:    IdComponent::decRefCount
+///\brief       Decrement reference counter for a given id.
+// Programmer   Binh-Minh Ribler - May 2005
 // Modification:
-//		Added the check for ref counter to give a little more info
-//		on why H5Idec_ref fails in some cases - BMR 5/19/2005
+//              Added the check for ref counter to give a little more info
+//              on why H5Idec_ref fails in some cases - BMR 5/19/2005
 //--------------------------------------------------------------------------
-void IdComponent::decRefCount(const hid_t obj_id) const
+void
+IdComponent::decRefCount(const hid_t obj_id) const
 {
     if (p_valid_id(obj_id))
-	if (H5Idec_ref(obj_id) < 0)
-	{
-	    if (H5Iget_ref(obj_id) <= 0)
-		throw IdComponentException(inMemFunc("decRefCount"),
-					"object ref count is 0 or negative");
-	    else
-		throw IdComponentException(inMemFunc("decRefCount"),
-					"decrementing object ref count failed");
-	}
+        if (H5Idec_ref(obj_id) < 0) {
+            if (H5Iget_ref(obj_id) <= 0)
+                throw IdComponentException(inMemFunc("decRefCount"), "object ref count is 0 or negative");
+            else
+                throw IdComponentException(inMemFunc("decRefCount"), "decrementing object ref count failed");
+        }
 }
 
 //--------------------------------------------------------------------------
-// Function:	IdComponent::decRefCount
-///\brief	Decrement reference counter for the id of this object.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    IdComponent::decRefCount
+///\brief       Decrement reference counter for the id of this object.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void IdComponent::decRefCount() const
+void
+IdComponent::decRefCount() const
 {
     decRefCount(getId());
 }
 
 //--------------------------------------------------------------------------
-// Function:	IdComponent::getCounter
-///\brief	Returns the reference counter for a given id.
-///\return	Reference count
-// Programmer	Binh-Minh Ribler - May 2005
+// Function:    IdComponent::getCounter
+///\brief       Returns the reference counter for a given id.
+///\return      Reference count
+// Programmer   Binh-Minh Ribler - May 2005
 //--------------------------------------------------------------------------
-int IdComponent::getCounter(const hid_t obj_id) const
+int
+IdComponent::getCounter(const hid_t obj_id) const
 {
     int counter = 0;
-    if (p_valid_id(obj_id))
-    {
-	counter = H5Iget_ref(obj_id);
-	if (counter < 0)
-	    throw IdComponentException(inMemFunc("incRefCount"), "getting object ref count failed - negative");
+    if (p_valid_id(obj_id)) {
+        counter = H5Iget_ref(obj_id);
+        if (counter < 0)
+            throw IdComponentException(inMemFunc("incRefCount"),
+                                       "getting object ref count failed - negative");
     }
     return (counter);
 }
 
 //--------------------------------------------------------------------------
-// Function:	IdComponent::getCounter
-///\brief	Returns the reference counter for the id of this object.
-///\return	Reference count
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    IdComponent::getCounter
+///\brief       Returns the reference counter for the id of this object.
+///\return      Reference count
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-int IdComponent::getCounter() const
+int
+IdComponent::getCounter() const
 {
     return (getCounter(getId()));
 }
 
 //--------------------------------------------------------------------------
-// Function:	getHDFObjType (static)
-///\brief	Given an id, returns the type of the object.
-///\return	a valid HDF object type, which may be one of the following:
-///		\li \c H5I_FILE
-///		\li \c H5I_GROUP
-///		\li \c H5I_DATATYPE
-///		\li \c H5I_DATASPACE
-///		\li \c H5I_DATASET
-///		\li \c H5I_ATTR
-///		\li or \c H5I_BADID, if no valid type can be determined or the
-///				input object id is invalid.
+// Function:    getHDFObjType (static)
+///\brief       Given an id, returns the type of the object.
+///\return      a valid HDF object type, which may be one of the following:
+///             \li \c H5I_FILE
+///             \li \c H5I_GROUP
+///             \li \c H5I_DATATYPE
+///             \li \c H5I_DATASPACE
+///             \li \c H5I_DATASET
+///             \li \c H5I_ATTR
+///             \li or \c H5I_BADID, if no valid type can be determined or the
+///                         input object id is invalid.
 // Programmer   Binh-Minh Ribler - Jul, 2005
 //--------------------------------------------------------------------------
-H5I_type_t IdComponent::getHDFObjType(const hid_t obj_id)
+H5I_type_t
+IdComponent::getHDFObjType(const hid_t obj_id)
 {
     if (obj_id <= 0)
-	return H5I_BADID; // invalid
+        return H5I_BADID; // invalid
     H5I_type_t id_type = H5Iget_type(obj_id);
     if (id_type <= H5I_BADID || id_type >= H5I_NTYPES)
-	return H5I_BADID; // invalid
+        return H5I_BADID; // invalid
     else
-	return id_type; // valid type
+        return id_type; // valid type
 }
 
 //--------------------------------------------------------------------------
-// Function:	getHDFObjType
-///\brief	Returns the type of the object.  It is an overloaded function
-///		of the above function.
-///\return	a valid HDF object type, which may be one of the following:
-///		\li \c H5I_FILE
-///		\li \c H5I_GROUP
-///		\li \c H5I_DATATYPE
-///		\li \c H5I_DATASPACE
-///		\li \c H5I_DATASET
-///		\li \c H5I_ATTR
-///		\li or \c H5I_BADID, if no valid type can be determined or the
-///				input object id is invalid.
+// Function:    getHDFObjType
+///\brief       Returns the type of the object.  It is an overloaded function
+///             of the above function.
+///\return      a valid HDF object type, which may be one of the following:
+///             \li \c H5I_FILE
+///             \li \c H5I_GROUP
+///             \li \c H5I_DATATYPE
+///             \li \c H5I_DATASPACE
+///             \li \c H5I_DATASET
+///             \li \c H5I_ATTR
+///             \li or \c H5I_BADID, if no valid type can be determined or the
+///                         input object id is invalid.
 // Programmer   Binh-Minh Ribler - Mar, 2014
 //--------------------------------------------------------------------------
-H5I_type_t IdComponent::getHDFObjType() const
+H5I_type_t
+IdComponent::getHDFObjType() const
+{
+    return (getHDFObjType(getId()));
+}
+
+//--------------------------------------------------------------------------
+// Function:    getNumMembers (static)
+///\brief       Returns the number of members of the given type.
+///\return      Number of members
+///\par Description
+///             If there is no member of the given type, getNumMembers will
+///             return 0.  Valid types are:
+///             \li \c H5I_FILE (= 1)
+///             \li \c H5I_GROUP
+///             \li \c H5I_DATATYPE
+///             \li \c H5I_DATASPACE
+///             \li \c H5I_DATASET
+///             \li \c H5I_ATTR
+///             \li \c H5I_VFL
+///             \li \c H5I_VOL
+///             \li \c H5I_GENPROP_CLS
+///             \li \c H5I_GENPROP_LST
+///             \li \c H5I_ERROR_CLASS
+///             \li \c H5I_ERROR_MSG
+///             \li \c H5I_ERROR_STACK
+// Programmer   Binh-Minh Ribler - Feb, 2017
+//--------------------------------------------------------------------------
+hsize_t
+IdComponent::getNumMembers(H5I_type_t type)
 {
-    return(getHDFObjType(getId()));
+    hsize_t nmembers  = 0;
+    herr_t  ret_value = H5Inmembers(type, &nmembers);
+    if (ret_value < 0)
+        throw IdComponentException("getNumMembers", "H5Inmembers failed");
+    else
+        return (nmembers);
 }
 
 //--------------------------------------------------------------------------
-// Function:	IdComponent::operator=
-///\brief	Assignment operator.
-///\param	rhs - IN: Reference to the existing object
-///\return	Reference to IdComponent instance
-///\exception	H5::IdComponentException when attempt to close the HDF5
-///		object fails
+// Function:    isValid (static)
+///\brief       Checks if the given ID is valid.
+///\return      true if the given identifier is valid, and false, otherwise.
+///\par Description
+///             A valid ID is one that is in use and has an application
+///             reference count of at least 1.
+// Programmer   Binh-Minh Ribler - Mar 1, 2017
+//--------------------------------------------------------------------------
+bool
+IdComponent::isValid(hid_t an_id)
+{
+    // Call C function
+    htri_t ret_value = H5Iis_valid(an_id);
+    if (ret_value > 0)
+        return true;
+    else if (ret_value == 0)
+        return false;
+    else // Raise exception when H5Iis_valid returns a negative value
+        throw IdComponentException("isValid", "H5Iis_valid failed");
+}
+
+//--------------------------------------------------------------------------
+// Function:    typeExists (static)
+///\brief       Queries if a given type is currently registered with the
+///             library.
+///\return      true if the given type exists, and false, otherwise.
+///\par Description
+///             Valid types are:
+///             \li \c H5I_FILE (= 1)
+///             \li \c H5I_GROUP
+///             \li \c H5I_DATATYPE
+///             \li \c H5I_DATASPACE
+///             \li \c H5I_DATASET
+///             \li \c H5I_ATTR
+///             \li \c H5I_VFL
+///             \li \c H5I_VOL
+///             \li \c H5I_GENPROP_CLS
+///             \li \c H5I_GENPROP_LST
+///             \li \c H5I_ERROR_CLASS
+///             \li \c H5I_ERROR_MSG
+///             \li \c H5I_ERROR_STACK
+// Programmer   Binh-Minh Ribler - Feb, 2017
+//--------------------------------------------------------------------------
+bool
+IdComponent::typeExists(H5I_type_t type)
+{
+    // Call C function
+    htri_t ret_value = H5Itype_exists(type);
+    if (ret_value > 0)
+        return true;
+    else if (ret_value == 0)
+        return false;
+    else // Raise exception when H5Itype_exists returns a negative value
+        throw IdComponentException("typeExists", "H5Itype_exists failed");
+}
+
+//--------------------------------------------------------------------------
+// Function:    IdComponent::operator=
+///\brief       Assignment operator.
+///\param       rhs - IN: Reference to the existing object
+///\return      Reference to IdComponent instance
+///\exception   H5::IdComponentException when attempt to close the HDF5
+///             object fails
 // Description
-//		First, close the current valid id of this object.  Then
-//		copy the id from rhs to this object, and increment the
-//		reference counter of the id to indicate that another object
-//		is referencing that id.
+//              First, close the current valid id of this object.  Then
+//              copy the id from rhs to this object, and increment the
+//              reference counter of the id to indicate that another object
+//              is referencing that id.
 // Modification
-//	2010/5/9 - BMR
-//		Removed close() and incRefCount() because setId/p_setId takes
-//		care of close() and setId takes care incRefCount().
-// Programmer	Binh-Minh Ribler - 2000
+//        2010/5/9 - BMR
+//              Removed close() and incRefCount() because setId/p_setId takes
+//              care of close() and setId takes care incRefCount().
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-IdComponent& IdComponent::operator=( const IdComponent& rhs )
+IdComponent &
+IdComponent::operator=(const IdComponent &rhs)
 {
-    if (this != &rhs)
-    {
-	// handling references to this id
-  	try {
-	    setId(rhs.getId());
-	    // Note: a = b, so there are two objects with the same hdf5 id
-	    // that's why incRefCount is needed, and it is called by setId
-	}
-	catch (Exception close_error) {
-	    throw FileIException(inMemFunc("operator="), close_error.getDetailMsg());
-	}
+    if (this != &rhs) {
+        // handling references to this id
+        try {
+            setId(rhs.getId());
+            // Note: a = b, so there are two objects with the same hdf5 id
+            // that's why incRefCount is needed, and it is called by setId
+        }
+        catch (Exception &close_error) {
+            throw FileIException(inMemFunc("operator="), close_error.getDetailMsg());
+        }
     }
     return *this;
 }
 
 //--------------------------------------------------------------------------
-// Function:	IdComponent::setId
-///\brief	Sets the identifier of this object to a new value.
-///
-///\exception	H5::IdComponentException when the attempt to close the HDF5
-///		object fails
+// Function:    IdComponent::setId
+///\brief       Sets the identifier of this object to a new value.
+///\param       new_id - IN: New identifier to be set to
+///\exception   H5::IdComponentException when the attempt to close the HDF5
+///             object fails
 // Description:
-//		p_setId ensures that the current valid id of this object is
-//		properly closed before resetting the object's id to the new id.
-// Programmer	Binh-Minh Ribler - 2000
+//              p_setId ensures that the current valid id of this object is
+//              properly closed before resetting the object's id to the new id.
+// Programmer   Binh-Minh Ribler - 2000
 // Modification
-//	2008/7/23 - BMR
-//		Changed all subclasses' setId to p_setId and put back setId
-//		here.  p_setId is used in the library where the id provided
-//		by a C API passed on to user's application in the form of a
-//		C++ API object, which will be destroyed properly, and so
-//		p_setId does not call incRefCount.  On the other hand, the
-//		public version setId is used by other applications, in which
-//		the id passed to setId already has a reference count, so setId
-//		must call incRefCount.
-//--------------------------------------------------------------------------
-void IdComponent::setId(const hid_t new_id)
+//        2008/7/23 - BMR
+//              Changed all subclasses' setId to p_setId and put back setId
+//              here.  p_setId is used in the library where the id provided
+//              by a C API passed on to user's application in the form of a
+//              C++ API object, which will be destroyed properly, and so
+//              p_setId does not call incRefCount.  On the other hand, the
+//              public version setId is used by other applications, in which
+//              the id passed to setId is that of another C++ API object, so
+//              setId must call incRefCount.
+//--------------------------------------------------------------------------
+void
+IdComponent::setId(const hid_t new_id)
 {
-   // set to new_id
-   p_setId(new_id);
+    // set to new_id
+    p_setId(new_id);
 
-   // increment the reference counter of the new id
-   incRefCount();
+    // increment the reference counter of the new id
+    incRefCount();
 }
 
 //--------------------------------------------------------------------------
-// Function:	IdComponent destructor
-///\brief	Noop destructor.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    IdComponent destructor
+///\brief       Noop destructor.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-IdComponent::~IdComponent() {}
+IdComponent::~IdComponent()
+{
+}
 
 //
 // Implementation of protected functions for HDF5 Reference Interface
-// and miscelaneous helpers.
+// and miscellaneous helpers.
 //
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 //--------------------------------------------------------------------------
-// Function:	IdComponent::inMemFunc
-///\brief	Makes and returns string "<class-name>::<func_name>"
-///\param	func_name - Name of the function where failure occurs
+// Function:    IdComponent::inMemFunc
+///\brief       Makes and returns string "<class-name>::<func_name>"
+///\param       func_name - Name of the function where failure occurs
 // Description
-///		Concatenates the class name of this object with the
-///		passed-in function name to create a string that indicates
-///		where the failure occurs.  The class-name is provided by
-///		fromClass().  This string will be used by a base class when
-///		an exception is thrown.
-// Programmer	Binh-Minh Ribler - Aug 6, 2005
-//--------------------------------------------------------------------------
-H5std_string IdComponent::inMemFunc(const char* func_name) const
+///             Concatenates the class name of this object with the
+///             passed-in function name to create a string that indicates
+///             where the failure occurs.  The class-name is provided by
+///             fromClass().  This string will be used by a base class when
+///             an exception is thrown.
+// Programmer   Binh-Minh Ribler - Aug 6, 2005
+//--------------------------------------------------------------------------
+H5std_string
+IdComponent::inMemFunc(const char *func_name) const
 {
-#ifdef H5_VMS
-   H5std_string full_name = fromClass();
-   full_name.append("::");
-   full_name.append(func_name);
-#else
-   H5std_string full_name = func_name;
-   full_name.insert(0, "::");
-   full_name.insert(0, fromClass());
-#endif /*H5_VMS*/
-   return (full_name);
+    H5std_string full_name = func_name;
+    full_name.insert(0, "::");
+    full_name.insert(0, fromClass());
+    return (full_name);
 }
 
 //--------------------------------------------------------------------------
-// Function:	IdComponent default constructor - private
-///\brief	Default constructor.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    IdComponent default constructor - private
+///\brief       Default constructor.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-IdComponent::IdComponent() {}
+IdComponent::IdComponent()
+{
+    // initH5cpp will register the terminating functions with atexit().
+    // This should only be done once.
+    if (!H5cppinit) {
+        H5Library::initH5cpp();
+        H5cppinit = true;
+    }
+}
 
 //--------------------------------------------------------------------------
-// Function:	IdComponent::p_get_file_name (protected)
-// Purpose:	Gets the name of the file, in which this object belongs.
-// Exception:	H5::IdComponentException
+// Function:    IdComponent::p_get_file_name (protected)
+// Purpose      Gets the name of the file, in which this object belongs.
+// Exception:   H5::IdComponentException
 // Description:
-// 		This function is protected so that the user applications can
-// 		only have access to its code via allowable classes, namely,
-// 		Attribute and H5Location subclasses.
-// Programmer	Binh-Minh Ribler - Jul, 2004
-//--------------------------------------------------------------------------
-H5std_string IdComponent::p_get_file_name() const
+//              This function is protected so that the user applications can
+//              only have access to its code via H5Location subclasses.
+//      September 2017
+//              This function should be moved to H5Location now that Attribute
+//              inherits from H5Location.
+// Programmer   Binh-Minh Ribler - Jul, 2004
+//--------------------------------------------------------------------------
+H5std_string
+IdComponent::p_get_file_name() const
 {
-   hid_t temp_id = getId();
-
-   // Preliminary call to H5Fget_name to get the length of the file name
-   ssize_t name_size = H5Fget_name(temp_id, NULL, 0);
-
-   // If H5Aget_name returns a negative value, raise an exception,
-   if( name_size < 0 )
-   {
-      throw IdComponentException("", "H5Fget_name failed");
-   }
-
-   // Call H5Fget_name again to get the actual file name
-   char* name_C = new char[name_size+1];  // temporary C-string for C API
-   HDmemset(name_C, 0, name_size+1); // clear buffer
-
-   name_size = H5Fget_name(temp_id, name_C, name_size+1);
-
-   // Check for failure again
-   if( name_size < 0 )
-   {
-      delete []name_C;
-      throw IdComponentException("", "H5Fget_name failed");
-   }
-
-   // Convert the C file name and return
-   H5std_string file_name(name_C);
-   delete []name_C;
-   return(file_name);
+    hid_t temp_id = getId();
+
+    // Preliminary call to H5Fget_name to get the length of the file name
+    ssize_t name_size = H5Fget_name(temp_id, NULL, 0);
+
+    // If H5Aget_name returns a negative value, raise an exception,
+    if (name_size < 0) {
+        throw IdComponentException("", "H5Fget_name failed");
+    }
+
+    // The actual message size is the cast value + 1 for the terminal ASCII NUL
+    // (unfortunate in/out type sign mismatch)
+    size_t actual_name_size = static_cast<size_t>(name_size) + 1;
+
+    // Call H5Fget_name again to get the actual file name
+    char *name_C = new char[actual_name_size]();
+
+    name_size = H5Fget_name(temp_id, name_C, actual_name_size);
+
+    // Check for failure again
+    if (name_size < 0) {
+        delete[] name_C;
+        throw IdComponentException("", "H5Fget_name failed");
+    }
+
+    // Convert the C file name and return
+    H5std_string file_name(name_C);
+    delete[] name_C;
+
+    return file_name;
 }
 
 //
@@ -346,22 +423,20 @@ H5std_string IdComponent::p_get_file_name() const
 //
 
 //--------------------------------------------------------------------------
-// Function:	p_valid_id
-// Purpose:	Verifies that the given id is a valid id so it can be passed
-//		into an H5I C function.
-// Return	true if id is valid, false, otherwise
-// Programmer	Binh-Minh Ribler - May, 2005
+// Function:    p_valid_id
+// Purpose      Verifies that the given id is a valid id so it can be passed
+//              into an H5I C function.
+// Return       true if id is valid, false, otherwise
+// Programmer   Binh-Minh Ribler - May, 2005
 //--------------------------------------------------------------------------
-bool IdComponent::p_valid_id(const hid_t obj_id)
+bool
+IdComponent::p_valid_id(const hid_t obj_id)
 {
     if (obj_id <= 0)
-	return false;
+        return false;
 
     H5I_type_t id_type = H5Iget_type(obj_id);
-    if (id_type <= H5I_BADID || id_type >= H5I_NTYPES)
-	return false;
-    else
-	return true;
+    return (id_type > H5I_BADID && id_type < H5I_NTYPES);
 }
 
 // Notes about IdComponent::id
@@ -374,6 +449,4 @@ bool IdComponent::p_valid_id(const hid_t obj_id)
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS
 
-#ifndef H5_NO_NAMESPACE
-}
-#endif
+} // namespace H5
diff --git a/c++/src/H5IdComponent.h b/c++/src/H5IdComponent.h
index f9fd56e..d64bdb5 100644
--- a/c++/src/H5IdComponent.h
+++ b/c++/src/H5IdComponent.h
@@ -1,27 +1,21 @@
 // C++ informative line for the emacs editor: -*- C++ -*-
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __IdComponent_H
-#define __IdComponent_H
+#ifndef H5IdComponent_H
+#define H5IdComponent_H
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#endif
 
-class DataSpace;
 /*! \class IdComponent
     \brief Class IdComponent provides wrappers of the C functions that
      operate on an HDF5 identifier.
@@ -30,86 +24,92 @@ class DataSpace;
     rarely needs them.
 */
 class H5_DLLCPP IdComponent {
-   public:
-	// Increment reference counter.
-	void incRefCount(const hid_t obj_id) const;
-	void incRefCount() const;
+  public:
+    // Increment reference counter.
+    void incRefCount(const hid_t obj_id) const;
+    void incRefCount() const;
 
-	// Decrement reference counter.
-	void decRefCount(const hid_t obj_id) const;
-	void decRefCount() const;
+    // Decrement reference counter.
+    void decRefCount(const hid_t obj_id) const;
+    void decRefCount() const;
 
-	// Get the reference counter to this identifier.
-	int getCounter(const hid_t obj_id) const;
-	int getCounter() const;
+    // Get the reference counter to this identifier.
+    int getCounter(const hid_t obj_id) const;
+    int getCounter() const;
 
-	// Returns an HDF5 object type, given the object id.
-	static H5I_type_t getHDFObjType(const hid_t obj_id);
+    // Returns an HDF5 object type, given the object id.
+    static H5I_type_t getHDFObjType(const hid_t obj_id);
 
-	// Returns an HDF5 object type of this object.
-	H5I_type_t getHDFObjType() const;
+    // Returns an HDF5 object type of this object.
+    H5I_type_t getHDFObjType() const;
 
-	// Assignment operator.
-	IdComponent& operator=( const IdComponent& rhs );
+    // Returns the number of members in a type.
+    static hsize_t getNumMembers(H5I_type_t type);
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
-	// Gets the identifier of this object.
-	virtual hid_t getId () const = 0;
-#endif // DOXYGEN_SHOULD_SKIP_THIS
-
-	// Sets the identifier of this object to a new value.
-	void setId(const hid_t new_id);
+    // Checks if the given ID is valid.
+    static bool isValid(hid_t an_id);
 
-	// *** Deprecation warning ***
-	// The following two constructors are no longer appropriate after the
-	// data member "id" had been moved to the sub-classes.
-	// The copy constructor is a noop and is removed in 1.8.15 and the
-	// other will be removed from 1.10 release, and then from 1.8 if its
-	// removal does not raise any problems in two 1.10 releases.
+    // Determines if an type exists.
+    static bool typeExists(H5I_type_t type);
 
-	// Creates an object to hold an HDF5 identifier.
-	IdComponent( const hid_t h5_id );
+    // Assignment operator.
+    IdComponent &operator=(const IdComponent &rhs);
 
-	// Copy constructor: makes copy of the original IdComponent object.
-	// IdComponent( const IdComponent& original );
+    // Sets the identifier of this object to a new value.
+    void setId(const hid_t new_id);
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
-	// Pure virtual function for there are various H5*close for the
-	// subclasses.
-	virtual void close() = 0;
 
-	// Makes and returns the string "<class-name>::<func_name>";
-	// <class-name> is returned by fromClass().
-	H5std_string inMemFunc(const char* func_name) const;
+    // Gets the identifier of this object.
+    virtual hid_t getId() const = 0;
 
-	///\brief Returns this class name.
-	virtual H5std_string fromClass() const { return("IdComponent");}
+    // Pure virtual function for there are various H5*close for the
+    // subclasses.
+    virtual void close() = 0;
 
-#endif // DOXYGEN_SHOULD_SKIP_THIS
+    // Makes and returns the string "<class-name>::<func_name>";
+    // <class-name> is returned by fromClass().
+    H5std_string inMemFunc(const char *func_name) const;
+
+    ///\brief Returns this class name.
+    virtual H5std_string
+    fromClass() const
+    {
+        return ("IdComponent");
+    }
 
-	// Destructor
-	virtual ~IdComponent();
+#endif // DOXYGEN_SHOULD_SKIP_THIS
 
-   protected:
-	// Default constructor.
-	IdComponent();
+    // Destructor
+    virtual ~IdComponent();
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
-	// Gets the name of the file, in which an HDF5 object belongs.
-	H5std_string p_get_file_name() const;
 
-	// Verifies that the given id is valid.
-	static bool p_valid_id(const hid_t obj_id);
+  protected:
+    // Default constructor.
+    IdComponent();
+
+    // Gets the name of the file, in which an HDF5 object belongs.
+    H5std_string p_get_file_name() const;
+
+    // Verifies that the given id is valid.
+    static bool p_valid_id(const hid_t obj_id);
+
+    // Sets the identifier of this object to a new value. - this one
+    // doesn't increment reference count
+    virtual void p_setId(const hid_t new_id) = 0;
+
+    // This flag is used to decide whether H5dont_atexit should be called
+    static bool H5dontAtexit_called;
 
-	// Sets the identifier of this object to a new value. - this one
-	// doesn't increment reference count
-	virtual void p_setId(const hid_t new_id) = 0;
+  private:
+    // This flag indicates whether H5Library::initH5cpp has been called
+    // to register various terminating functions with atexit()
+    static bool H5cppinit;
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS
 
 }; // end class IdComponent
+} // namespace H5
 
-#ifndef H5_NO_NAMESPACE
-}
-#endif
-#endif // __IdComponent_H
+#endif // H5IdComponent_H
diff --git a/c++/src/H5Include.h b/c++/src/H5Include.h
index 87cb182..a55cbe4 100644
--- a/c++/src/H5Include.h
+++ b/c++/src/H5Include.h
@@ -1,30 +1,25 @@
 // C++ informative line for the emacs editor: -*- C++ -*-
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <hdf5.h>
 
-// Define bool type for platforms that don't support bool yet
-#ifdef BOOL_NOTDEFINED
-#ifdef false
-#undef false
-#endif
-#ifdef true
-#undef true
-#endif
-typedef int bool;
-const bool  false = 0;
-const bool  true  = 1;
-#endif
+// These are defined in H5Opkg.h, which should not be included in the C++ API,
+// so re-define them here for now.
+
+/* Initial version of the object header format */
+#define H5O_VERSION_1 1
+
+/* Revised version - leaves out reserved bytes and alignment padding, and adds
+ *      magic number as prefix and checksum as suffix for all chunks.
+ */
+#define H5O_VERSION_2 2
diff --git a/c++/src/H5IntType.cpp b/c++/src/H5IntType.cpp
index a884829..194ae21 100644
--- a/c++/src/H5IntType.cpp
+++ b/c++/src/H5IntType.cpp
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <string>
@@ -19,122 +16,189 @@
 #include "H5Exception.h"
 #include "H5IdComponent.h"
 #include "H5PropList.h"
-#include "H5Object.h"
+#include "H5OcreatProp.h"
 #include "H5DcreatProp.h"
-#include "H5CommonFG.h"
+#include "H5DxferProp.h"
+#include "H5LcreatProp.h"
+#include "H5LaccProp.h"
+#include "H5DaccProp.h"
+#include "H5Location.h"
+#include "H5Object.h"
 #include "H5DataType.h"
 #include "H5AbstractDs.h"
-#include "H5DxferProp.h"
 #include "H5DataSpace.h"
 #include "H5AtomType.h"
 #include "H5IntType.h"
 #include "H5DataSet.h"
 #include "H5PredType.h"
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#endif
 
+//--------------------------------------------------------------------------
+// Function:    IntType default constructor
+///\brief       Default constructor: Creates a stub integer datatype
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+IntType::IntType()
+{
+}
 
 //--------------------------------------------------------------------------
-// Function:	IntType default constructor
-///\brief	Default constructor: Creates a stub integer datatype
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    IntType copy constructor
+///\brief       Copy constructor: same HDF5 object as \a original
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-IntType::IntType() {}
+IntType::IntType(const IntType &original) : AtomType(original)
+{
+}
 
 //--------------------------------------------------------------------------
-// Function:	IntType copy constructor
-///\brief	Copy constructor: makes a copy of the original IntType object.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    IntType overloaded constructor
+///\brief       Creates a integer type using a predefined type
+///\param       pred_type - IN: Predefined datatype
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-IntType::IntType( const IntType& original ) : AtomType( original ) {}
+IntType::IntType(const PredType &pred_type) : AtomType()
+{
+    // use DataType::copy to make a copy of this predefined type
+    copy(pred_type);
+}
 
 //--------------------------------------------------------------------------
-// Function:	IntType overloaded constructor
-///\brief	Creates a integer type using a predefined type
-///\param	pred_type - IN: Predefined datatype
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    IntType overloaded constructor
+///\brief       Creates an integer datatype using the id of an existing
+///             datatype.
+///\param       existing_id - IN: Id of an existing datatype
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-IntType::IntType( const PredType& pred_type ) : AtomType()
+IntType::IntType(const hid_t existing_id) : AtomType(existing_id)
 {
-   // use DataType::copy to make a copy of this predefined type
-   copy( pred_type );
 }
 
 //--------------------------------------------------------------------------
-// Function:	IntType overloaded constructor
-///\brief	Creates an integer datatype using the id of an existing
-///		datatype.
-///\param	existing_id - IN: Id of an existing datatype
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    IntType overloaded constructor
+///\brief       Gets the integer datatype of the specified dataset.
+///\param       dataset - IN: Dataset that this integer datatype associates with
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-IntType::IntType( const hid_t existing_id ) : AtomType( existing_id ) {}
+IntType::IntType(const DataSet &dataset) : AtomType()
+{
+    // Calls C function H5Dget_type to get the id of the datatype
+    id = H5Dget_type(dataset.getId());
+
+    if (id < 0) {
+        throw DataSetIException("IntType constructor", "H5Dget_type failed");
+    }
+}
 
 //--------------------------------------------------------------------------
-// Function:	IntType overloaded constructor
-///\brief	Gets the integer datatype of the specified dataset.
-///\param	dataset - IN: Dataset that this integer datatype associates with
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    IntType overloaded constructor
+///\brief       Creates a IntType instance by opening an HDF5 integer datatype
+///             given its name as a char*.
+///\param       loc        - IN: Location of the type
+///\param       dtype_name - IN: Integer type name
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - Dec 2016
+// Description
+//              In 1.10.1, this constructor was introduced and may replace the
+//              existing function CommonFG::openIntType(const char*) to
+//              improve usability.
+//              -BMR, Dec 2016
+//--------------------------------------------------------------------------
+IntType::IntType(const H5Location &loc, const char *dtype_name) : AtomType()
+{
+    id = p_opentype(loc, dtype_name);
+}
+
 //--------------------------------------------------------------------------
-IntType::IntType( const DataSet& dataset ) : AtomType()
+// Function:    IntType overloaded constructor
+///\brief       Creates a IntType instance by opening an HDF5 integer datatype
+///             given its name, provided as an \c H5std_string.
+///\param       loc        - IN: Location of the type
+///\param       dtype_name - IN: Integer type name
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - Dec 2016
+// Description
+//              In 1.10.1, this constructor was introduced and may replace the
+//              existing function CommonFG::openIntType(const H5std_string&)
+//              to improve usability.
+//              -BMR, Dec 2016
+//--------------------------------------------------------------------------
+IntType::IntType(const H5Location &loc, const H5std_string &dtype_name) : AtomType()
 {
-   // Calls C function H5Dget_type to get the id of the datatype
-   id = H5Dget_type( dataset.getId() );
+    id = p_opentype(loc, dtype_name.c_str());
+}
 
-   if( id < 0 )
-   {
-      throw DataSetIException("IntType constructor", "H5Dget_type failed");
-   }
+//--------------------------------------------------------------------------
+// Function:    IntType::decode
+///\brief       Returns an IntType object via DataType* by decoding the
+///             binary object description of this type.
+///
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - Aug 2017
+//--------------------------------------------------------------------------
+DataType *
+IntType::decode() const
+{
+    hid_t encoded_inttype_id = H5I_INVALID_HID;
+    try {
+        encoded_inttype_id = p_decode();
+    }
+    catch (DataTypeIException &err) {
+        throw;
+    }
+    IntType *encoded_inttype = new IntType;
+    encoded_inttype->p_setId(encoded_inttype_id);
+    return (encoded_inttype);
 }
 
 //--------------------------------------------------------------------------
-// Function:	IntType::getSign
-///\brief	Retrieves the sign type for an integer type.
-///\return	Valid sign type
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    IntType::getSign
+///\brief       Retrieves the sign type for an integer type.
+///\return      Valid sign type
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-H5T_sign_t IntType::getSign() const
+H5T_sign_t
+IntType::getSign() const
 {
-   H5T_sign_t type_sign = H5Tget_sign( id );  // C routine
-
-   // Returns a valid sign type if no errors
-   if( type_sign == H5T_SGN_ERROR )
-   {
-      throw DataTypeIException("IntType::getSign",
-		"H5Tget_sign failed - returned H5T_SGN_ERROR for the sign type");
-   }
-   return( type_sign );
+    H5T_sign_t type_sign = H5Tget_sign(id); // C routine
+
+    // Returns a valid sign type if no errors
+    if (type_sign == H5T_SGN_ERROR) {
+        throw DataTypeIException("IntType::getSign",
+                                 "H5Tget_sign failed - returned H5T_SGN_ERROR for the sign type");
+    }
+    return (type_sign);
 }
 
 //--------------------------------------------------------------------------
-// Function:	IntType::getSign
-///\brief	Sets the sign property for an integer type.
-///\param	sign - IN: Sign type
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    IntType::getSign
+///\brief       Sets the sign property for an integer type.
+///\param       sign - IN: Sign type
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void IntType::setSign( H5T_sign_t sign ) const
+void
+IntType::setSign(H5T_sign_t sign) const
 {
-   // Call C routine to set the sign property
-   herr_t ret_value = H5Tset_sign( id, sign );
-   if( ret_value < 0 )
-   {
-      throw DataTypeIException("IntType::setSign", "H5Tset_sign failed");
-   }
+    // Call C routine to set the sign property
+    herr_t ret_value = H5Tset_sign(id, sign);
+    if (ret_value < 0) {
+        throw DataTypeIException("IntType::setSign", "H5Tset_sign failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	IntType destructor
-///\brief	Noop destructor.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    IntType destructor
+///\brief       Noop destructor.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-IntType::~IntType() {}
+IntType::~IntType()
+{
+}
 
-#ifndef H5_NO_NAMESPACE
-} // end namespace
-#endif
+} // namespace H5
diff --git a/c++/src/H5IntType.h b/c++/src/H5IntType.h
index 95fa642..170ed37 100644
--- a/c++/src/H5IntType.h
+++ b/c++/src/H5IntType.h
@@ -1,57 +1,68 @@
 // C++ informative line for the emacs editor: -*- C++ -*-
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5IntType_H
-#define __H5IntType_H
+#ifndef H5IntType_H
+#define H5IntType_H
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#endif
 
-//! Class IntType operates on HDF5 integer datatype.
+/*! \class IntType
+    \brief IntType is a derivative of a DataType and operates on HDF5
+    integer datatype.
+*/
+//  Inheritance: AtomType -> DataType -> H5Object -> H5Location -> IdComponent
 class H5_DLLCPP IntType : public AtomType {
-   public:
-	// Creates a integer type using a predefined type
-	IntType(const PredType& pred_type);
+  public:
+    // Creates an integer type using a predefined type
+    IntType(const PredType &pred_type);
 
-	// Gets the integer datatype of the specified dataset
-	IntType(const DataSet& dataset);
+    // Gets the integer datatype of the specified dataset
+    IntType(const DataSet &dataset);
 
-	// Retrieves the sign type for an integer type
-	H5T_sign_t getSign() const;
+    // Constructors that open an HDF5 integer datatype, given a location.
+    IntType(const H5Location &loc, const char *name);
+    IntType(const H5Location &loc, const H5std_string &name);
 
-	// Sets the sign proprety for an integer type.
-	void setSign( H5T_sign_t sign ) const;
+    // Returns an IntType object via DataType* by decoding the
+    // binary object description of this type.
+    virtual DataType *decode() const override;
 
-	///\brief Returns this class name.
-	virtual H5std_string fromClass () const { return("IntType"); }
+    // Retrieves the sign type for an integer type
+    H5T_sign_t getSign() const;
 
-	// Default constructor
-	IntType();
+    // Sets the sign property for an integer type.
+    void setSign(H5T_sign_t sign) const;
 
-	// Creates a integer datatype using an existing id
-	IntType(const hid_t existing_id);
+    ///\brief Returns this class name.
+    virtual H5std_string
+    fromClass() const override
+    {
+        return ("IntType");
+    }
 
-	// Copy constructor: makes copy of IntType object
-	IntType(const IntType& original);
+    // Default constructor
+    IntType();
 
-	// Noop destructor.
-	virtual ~IntType();
-};
-#ifndef H5_NO_NAMESPACE
-}
-#endif
-#endif // __H5IntType_H
+    // Creates a integer datatype using an existing id
+    IntType(const hid_t existing_id);
+
+    // Copy constructor: same as the original IntType.
+    IntType(const IntType &original);
+
+    // Noop destructor.
+    virtual ~IntType() override;
+
+}; // end of IntType
+} // namespace H5
+
+#endif // H5IntType_H
diff --git a/c++/src/H5LaccProp.cpp b/c++/src/H5LaccProp.cpp
new file mode 100644
index 0000000..7c63bd0
--- /dev/null
+++ b/c++/src/H5LaccProp.cpp
@@ -0,0 +1,159 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#include <string>
+
+#include "H5Include.h"
+#include "H5Exception.h"
+#include "H5IdComponent.h"
+#include "H5PropList.h"
+#include "H5LaccProp.h"
+
+namespace H5 {
+
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+// This DOXYGEN_SHOULD_SKIP_THIS block is a work-around approach to control
+// the order of creation and deletion of the global constants.  See Design Notes
+// in "H5PredType.cpp" for information.
+
+// Initialize a pointer for the constant
+LinkAccPropList *LinkAccPropList::DEFAULT_ = 0;
+
+//--------------------------------------------------------------------------
+// Function:    LinkAccPropList::getConstant
+//              Creates a LinkAccPropList object representing the HDF5 constant
+//              H5P_LINK_ACCESS, pointed to by LinkAccPropList::DEFAULT_
+// exception    H5::PropListIException
+// Description
+//              If LinkAccPropList::DEFAULT_ already points to an allocated
+//              object, throw a PropListIException.  This scenario should not
+//              happen.
+// Programmer   Binh-Minh Ribler - December, 2016
+//--------------------------------------------------------------------------
+LinkAccPropList *
+LinkAccPropList::getConstant()
+{
+    // Tell the C library not to clean up, H5Library::termH5cpp will call
+    // H5close - more dependency if use H5Library::dontAtExit()
+    if (!IdComponent::H5dontAtexit_called) {
+        (void)H5dont_atexit();
+        IdComponent::H5dontAtexit_called = true;
+    }
+
+    // If the constant pointer is not allocated, allocate it. Otherwise,
+    // throw because it shouldn't be.
+    if (DEFAULT_ == 0)
+        DEFAULT_ = new LinkAccPropList(H5P_LINK_ACCESS);
+    else
+        throw PropListIException("LinkAccPropList::getConstant",
+                                 "LinkAccPropList::getConstant is being invoked on an allocated DEFAULT_");
+    return (DEFAULT_);
+}
+
+//--------------------------------------------------------------------------
+// Function:    LinkAccPropList::deleteConstants
+// Purpose:     Deletes the constant object that LinkAccPropList::DEFAULT_
+//              points to.
+// exception    H5::PropListIException
+// Programmer   Binh-Minh Ribler - December, 2016
+//--------------------------------------------------------------------------
+void
+LinkAccPropList::deleteConstants()
+{
+    delete DEFAULT_;
+}
+
+//--------------------------------------------------------------------------
+// Purpose:     Constant for default property
+//--------------------------------------------------------------------------
+const LinkAccPropList &LinkAccPropList::DEFAULT = *getConstant();
+
+#endif // DOXYGEN_SHOULD_SKIP_THIS
+
+//--------------------------------------------------------------------------
+// Function:    Default Constructor
+///\brief       Creates a file access property list
+// Programmer   Binh-Minh Ribler - December, 2016
+//--------------------------------------------------------------------------
+LinkAccPropList::LinkAccPropList() : PropList(H5P_LINK_ACCESS)
+{
+}
+
+//--------------------------------------------------------------------------
+// Function:    LinkAccPropList copy constructor
+///\brief       Copy Constructor: same HDF5 object as \a original
+///\param       original - IN: LinkAccPropList instance to copy
+// Programmer   Binh-Minh Ribler - December, 2016
+//--------------------------------------------------------------------------
+LinkAccPropList::LinkAccPropList(const LinkAccPropList &original) : PropList(original)
+{
+}
+
+//--------------------------------------------------------------------------
+// Function:    LinkAccPropList overloaded constructor
+///\brief       Creates a file access property list using the id of an
+///             existing one.
+// Programmer   Binh-Minh Ribler - December, 2016
+//--------------------------------------------------------------------------
+LinkAccPropList::LinkAccPropList(const hid_t plist_id) : PropList(plist_id)
+{
+}
+
+//--------------------------------------------------------------------------
+// Function:    LinkAccPropList::setNumLinks
+///\brief       Set the number of soft or user-defined link traversals allowed
+///             before the library assumes it has found a cycle and aborts the
+///             traversal.
+///
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - March 1, 2017
+//--------------------------------------------------------------------------
+void
+LinkAccPropList::setNumLinks(size_t nlinks) const
+{
+    herr_t ret_value = H5Pset_nlinks(id, nlinks);
+    // Throw exception if H5Pset_nlinks returns failure
+    if (ret_value < 0) {
+        throw PropListIException("setNumLinks", "H5Pset_nlinks failed");
+    }
+}
+
+//--------------------------------------------------------------------------
+// Function:    LinkAccPropList::getNumLinks
+///\brief       Gets the number of soft or user-defined links that can be
+///             traversed before a failure occurs.
+///
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - March 1, 2017
+//--------------------------------------------------------------------------
+size_t
+LinkAccPropList::getNumLinks() const
+{
+    size_t nlinks    = 0;
+    herr_t ret_value = H5Pget_nlinks(id, &nlinks);
+    // Throw exception if H5Pget_nlinks returns failure
+    if (ret_value < 0) {
+        throw PropListIException("getNumLinks", "H5Pget_nlinks failed");
+    }
+    return (nlinks);
+}
+
+//--------------------------------------------------------------------------
+// Function:    LinkAccPropList destructor
+///\brief       Noop destructor
+// Programmer   Binh-Minh Ribler - December, 2016
+//--------------------------------------------------------------------------
+LinkAccPropList::~LinkAccPropList()
+{
+}
+
+} // namespace H5
diff --git a/c++/src/H5LaccProp.h b/c++/src/H5LaccProp.h
new file mode 100644
index 0000000..53389e2
--- /dev/null
+++ b/c++/src/H5LaccProp.h
@@ -0,0 +1,72 @@
+// C++ informative line for the emacs editor: -*- C++ -*-
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#ifndef H5LinkAccPropList_H
+#define H5LinkAccPropList_H
+
+namespace H5 {
+
+/*! \class LinkAccPropList
+    \brief Class LinkAccPropList inherits from PropList and provides
+    wrappers for the HDF5 link access property list.
+*/
+// Inheritance: PropList -> IdComponent
+class H5_DLLCPP LinkAccPropList : public PropList {
+  public:
+    ///\brief Default link access property list.
+    static const LinkAccPropList &DEFAULT;
+
+    // Creates a link access property list.
+    LinkAccPropList();
+
+    ///\brief Returns this class name.
+    virtual H5std_string
+    fromClass() const override
+    {
+        return ("LinkAccPropList");
+    }
+
+    // Copy constructor: same as the original LinkAccPropList.
+    LinkAccPropList(const LinkAccPropList &original);
+
+    // Creates a copy of an existing link access property list
+    // using the property list id.
+    LinkAccPropList(const hid_t plist_id);
+
+    // Sets the number of soft or user-defined links that can be
+    // traversed before a failure occurs.
+    void setNumLinks(size_t nlinks) const;
+
+    // Gets the number of soft or user-defined link traversals allowed
+    size_t getNumLinks() const;
+
+    // Noop destructor
+    virtual ~LinkAccPropList() override;
+
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+
+    // Deletes the global constant, should only be used by the library
+    static void deleteConstants();
+
+  private:
+    static LinkAccPropList *DEFAULT_;
+
+    // Creates the global constant, should only be used by the library
+    static LinkAccPropList *getConstant();
+
+#endif // DOXYGEN_SHOULD_SKIP_THIS
+
+}; // end of LinkAccPropList
+} // namespace H5
+
+#endif // H5LinkAccPropList_H
diff --git a/c++/src/H5LcreatProp.cpp b/c++/src/H5LcreatProp.cpp
new file mode 100644
index 0000000..2f34375
--- /dev/null
+++ b/c++/src/H5LcreatProp.cpp
@@ -0,0 +1,196 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#include <string>
+
+#include "H5Include.h"
+#include "H5Exception.h"
+#include "H5IdComponent.h"
+#include "H5PropList.h"
+#include "H5LcreatProp.h"
+
+namespace H5 {
+
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+// This DOXYGEN_SHOULD_SKIP_THIS block is a work-around approach to control
+// the order of creation and deletion of the global constants.  See Design Notes
+// in "H5PredType.cpp" for information.
+
+// Initialize a pointer for the constant
+LinkCreatPropList *LinkCreatPropList::DEFAULT_ = 0;
+
+//--------------------------------------------------------------------------
+// Function:    LinkCreatPropList::getConstant
+//              Creates a LinkCreatPropList object representing the HDF5 constant
+//              H5P_LINK_CREATE, pointed to by LinkCreatPropList::DEFAULT_
+// exception    H5::PropListIException
+// Description
+//              If LinkCreatPropList::DEFAULT_ already points to an allocated
+//              object, throw a PropListIException.  This scenario should not
+//              happen.
+// December, 2016
+//--------------------------------------------------------------------------
+LinkCreatPropList *
+LinkCreatPropList::getConstant()
+{
+    // Tell the C library not to clean up, H5Library::termH5cpp will call
+    // H5close - more dependency if use H5Library::dontAtExit()
+    if (!IdComponent::H5dontAtexit_called) {
+        (void)H5dont_atexit();
+        IdComponent::H5dontAtexit_called = true;
+    }
+
+    // If the constant pointer is not allocated, allocate it. Otherwise,
+    // throw because it shouldn't be.
+    if (DEFAULT_ == 0)
+        DEFAULT_ = new LinkCreatPropList(H5P_LINK_CREATE);
+    else
+        throw PropListIException("LinkCreatPropList::getConstant",
+                                 "LinkCreatPropList::getConstant is being invoked on an allocated DEFAULT_");
+    return (DEFAULT_);
+}
+
+//--------------------------------------------------------------------------
+// Function:    LinkCreatPropList::deleteConstants
+// Purpose:     Deletes the constant object that LinkCreatPropList::DEFAULT_
+//              points to.
+// exception    H5::PropListIException
+// December, 2016
+//--------------------------------------------------------------------------
+void
+LinkCreatPropList::deleteConstants()
+{
+    delete DEFAULT_;
+}
+
+//--------------------------------------------------------------------------
+// Purpose:     Constant for default property
+//--------------------------------------------------------------------------
+const LinkCreatPropList &LinkCreatPropList::DEFAULT = *getConstant();
+
+#endif // DOXYGEN_SHOULD_SKIP_THIS
+
+//--------------------------------------------------------------------------
+// Function:    Default Constructor
+///\brief       Creates a file access property list
+// December, 2016
+//--------------------------------------------------------------------------
+LinkCreatPropList::LinkCreatPropList() : PropList(H5P_LINK_CREATE)
+{
+}
+
+//--------------------------------------------------------------------------
+// Function:    LinkCreatPropList copy constructor
+///\brief       Copy constructor: same HDF5 object as \a original
+///\param       original - IN: LinkCreatPropList instance to copy
+// December, 2016
+//--------------------------------------------------------------------------
+LinkCreatPropList::LinkCreatPropList(const LinkCreatPropList &original) : PropList(original)
+{
+}
+
+//--------------------------------------------------------------------------
+// Function:    LinkCreatPropList overloaded constructor
+///\brief       Creates a file access property list using the id of an
+///             existing one.
+// December, 2016
+//--------------------------------------------------------------------------
+LinkCreatPropList::LinkCreatPropList(const hid_t plist_id) : PropList(plist_id)
+{
+}
+
+//--------------------------------------------------------------------------
+// Function:    LinkCreatPropList::setCreateIntermediateGroup
+///\brief       Specifies in property list whether to create missing
+///             intermediate groups.
+///\param       crt_intmd_group - IN: Flag specifying whether to create
+///                               intermediate groups upon the creation of an object
+///\exception   H5::PropListIException
+// April, 2019
+//--------------------------------------------------------------------------
+void
+LinkCreatPropList::setCreateIntermediateGroup(bool crt_intmd_group) const
+{
+    herr_t ret_value = H5Pset_create_intermediate_group(id, static_cast<unsigned>(crt_intmd_group));
+    // Throw exception if H5Pset_create_intermediate_group returns failure
+    if (ret_value < 0) {
+        throw PropListIException("setCreateIntermediateGroup", "H5Pset_create_intermediate_group failed");
+    }
+}
+
+//--------------------------------------------------------------------------
+// Function:    LinkCreatPropList::getCreateIntermediateGroup
+///\brief       Determines whether property is set to enable creating missing
+///             intermediate groups.
+///\return      true if creating intermediate groups is enabled, and false, otherwise
+///\exception   H5::PropListIException
+// April, 2019
+//--------------------------------------------------------------------------
+bool
+LinkCreatPropList::getCreateIntermediateGroup() const
+{
+    unsigned crt_intmd_group;
+    herr_t   ret_value = H5Pget_create_intermediate_group(id, &crt_intmd_group);
+    // Throw exception if H5Pget_create_intermediate_group returns failure
+    if (ret_value < 0) {
+        throw PropListIException("getCreateIntermediateGroup", "H5Pget_create_intermediate_group failed");
+    }
+
+    return static_cast<bool>(crt_intmd_group);
+}
+
+//--------------------------------------------------------------------------
+// Function:    LinkCreatPropList::setCharEncoding
+///\brief       Sets the character encoding of the string.
+///
+///\exception   H5::PropListIException
+// March, 2018
+//--------------------------------------------------------------------------
+void
+LinkCreatPropList::setCharEncoding(H5T_cset_t encoding) const
+{
+    herr_t ret_value = H5Pset_char_encoding(id, encoding);
+    // Throw exception if H5Pset_char_encoding returns failure
+    if (ret_value < 0) {
+        throw PropListIException("setCharEncoding", "H5Pset_char_encoding failed");
+    }
+}
+
+//--------------------------------------------------------------------------
+// Function:    LinkCreatPropList::getCharEncoding
+///\brief       Gets the character encoding of the string.
+///\return      The character encoding
+///\exception   H5::PropListIException
+// March, 2018
+//--------------------------------------------------------------------------
+H5T_cset_t
+LinkCreatPropList::getCharEncoding() const
+{
+    H5T_cset_t encoding;
+    herr_t     ret_value = H5Pget_char_encoding(id, &encoding);
+    // Throw exception if H5Pget_char_encoding returns failure
+    if (ret_value < 0) {
+        throw PropListIException("getCharEncoding", "H5Pget_char_encoding failed");
+    }
+    return (encoding);
+}
+
+//--------------------------------------------------------------------------
+// Function:    LinkCreatPropList destructor
+///\brief       Noop destructor
+// December, 2016
+//--------------------------------------------------------------------------
+LinkCreatPropList::~LinkCreatPropList()
+{
+}
+
+} // namespace H5
diff --git a/c++/src/H5LcreatProp.h b/c++/src/H5LcreatProp.h
new file mode 100644
index 0000000..233a98b
--- /dev/null
+++ b/c++/src/H5LcreatProp.h
@@ -0,0 +1,79 @@
+// C++ informative line for the emacs editor: -*- C++ -*-
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#ifndef H5LinkCreatPropList_H
+#define H5LinkCreatPropList_H
+
+namespace H5 {
+
+/*! \class LinkCreatPropList
+    \brief Class LinkCreatPropList inherits from PropList and provides
+    wrappers for the HDF5 link creation property list.
+*/
+// Inheritance: PropList -> IdComponent
+class H5_DLLCPP LinkCreatPropList : public PropList {
+  public:
+    ///\brief Default link creation property list.
+    static const LinkCreatPropList &DEFAULT;
+
+    // Creates a link creation property list.
+    LinkCreatPropList();
+
+    ///\brief Returns this class name.
+    virtual H5std_string
+    fromClass() const override
+    {
+        return ("LinkCreatPropList");
+    }
+
+    // Copy constructor: same as the original LinkCreatPropList.
+    LinkCreatPropList(const LinkCreatPropList &original);
+
+    // Creates a copy of an existing link creation property list
+    // using the property list id.
+    LinkCreatPropList(const hid_t plist_id);
+
+    // Specifies in property list whether to create missing
+    // intermediate groups
+    void setCreateIntermediateGroup(bool crt_intmd_group) const;
+
+    // Determines whether property is set to enable creating missing
+    // intermediate groups
+    bool getCreateIntermediateGroup() const;
+
+    // Sets the character encoding of the string.
+    void setCharEncoding(H5T_cset_t encoding) const;
+
+    // Gets the character encoding of the string.
+    H5T_cset_t getCharEncoding() const;
+
+    // Noop destructor
+    virtual ~LinkCreatPropList() override;
+
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+
+    // Deletes the global constant, should only be used by the library
+    static void deleteConstants();
+
+  private:
+    static LinkCreatPropList *DEFAULT_;
+
+    // Creates the global constant, should only be used by the library
+    static LinkCreatPropList *getConstant();
+
+#endif // DOXYGEN_SHOULD_SKIP_THIS
+
+}; // end of LinkCreatPropList
+} // namespace H5
+
+#endif // H5LinkCreatPropList_H
diff --git a/c++/src/H5Library.cpp b/c++/src/H5Library.cpp
index ecc5141..5a94a9e 100644
--- a/c++/src/H5Library.cpp
+++ b/c++/src/H5Library.cpp
@@ -1,179 +1,297 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
+#include <cstdlib>
 #include <string>
 
-#include "H5CppDoc.h"	// included only for Doxygen to generate part of RM
+#include "H5CppDoc.h" // included only for Doxygen to generate part of RM
 #include "H5Include.h"
 #include "H5Exception.h"
+#include "H5IdComponent.h"
+#include "H5PropList.h"
+#include "H5FaccProp.h"
+#include "H5FcreatProp.h"
+#include "H5OcreatProp.h"
+#include "H5DxferProp.h"
+#include "H5DcreatProp.h"
+#include "H5LcreatProp.h"
+#include "H5LaccProp.h"
+#include "H5DaccProp.h"
+#include "H5Location.h"
+#include "H5Object.h"
+#include "H5DataType.h"
+#include "H5AtomType.h"
+#include "H5PredType.h"
+#include "H5DataSpace.h"
 #include "H5Library.h"
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#endif
-
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
-// This static variable will be set to true when dontAtExit is called
-bool H5Library::need_cleanup = false;
-#endif // DOXYGEN_SHOULD_SKIP_THIS
 
 //--------------------------------------------------------------------------
-// Function:	H5Library::open
-///\brief	Initializes the HDF5 library.
+// Function:    H5Library::open (static)
+///\brief       Initializes the HDF5 library.
 ///
-///\exception	H5::LibraryIException
-// Programmer	Binh-Minh Ribler - 2000
+///\exception   H5::LibraryIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void H5Library::open()
+void
+H5Library::open()
 {
-   herr_t ret_value = H5open();
-   if( ret_value < 0 )
-   {
-      throw LibraryIException("H5Library::open", "H5open failed");
-   }
+    herr_t ret_value = H5open();
+    if (ret_value < 0) {
+        throw LibraryIException("H5Library::open", "H5open failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	H5Library::close
-///\brief	Flushes all data to disk, closes files, and cleans up memory.
+// Function:    H5Library::close (static)
+///\brief       Flushes all data to disk, closes files, and cleans up memory.
 ///
-///\exception	H5::LibraryIException
-// Programmer	Binh-Minh Ribler - 2000
+///\exception   H5::LibraryIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void H5Library::close()
+void
+H5Library::close()
 {
-   herr_t ret_value = H5close();
-   if( ret_value < 0 )
-   {
-      throw LibraryIException("H5Library::close", "H5close failed");
-   }
+    herr_t ret_value = H5close();
+    if (ret_value < 0) {
+        throw LibraryIException("H5Library::close", "H5close failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	H5Library::dontAtExit
-///\brief	Instructs library not to install \c atexit cleanup routine
+// Function:    H5Library::dontAtExit (static)
+///\brief       Instructs library not to install the C \c atexit cleanup routine
 ///
-///\exception	H5::LibraryIException
-// Programmer	Binh-Minh Ribler - 2000
+///\exception   H5::LibraryIException
+// Programmer   Binh-Minh Ribler - 2000
+// Modification
+//              Removed the check for failure returned from H5dont_atexit.
+//              will be fixed to not fail (HDFFV-9540)
 //--------------------------------------------------------------------------
-void H5Library::dontAtExit()
+void
+H5Library::dontAtExit()
 {
-   herr_t ret_value = H5dont_atexit();
-   if( ret_value < 0 )
-   {
-      throw LibraryIException("H5Library::dontAtExit", "H5dont_atexit failed");
-   }
+    (void)H5dont_atexit();
 }
 
 //--------------------------------------------------------------------------
-// Function:	H5Library::getLibVersion
-///\brief	Returns the HDF library release number.
-///\param	majnum - OUT: Major version of the library
-///\param	minnum - OUT: Minor version of the library
-///\param	relnum - OUT: Release number of the library
-///\exception	H5::LibraryIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    H5Library::getLibVersion (static)
+///\brief       Returns the HDF library release number.
+///\param       majnum - OUT: Major version of the library
+///\param       minnum - OUT: Minor version of the library
+///\param       relnum - OUT: Release number of the library
+///\exception   H5::LibraryIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void H5Library::getLibVersion( unsigned& majnum, unsigned& minnum, unsigned& relnum )
+void
+H5Library::getLibVersion(unsigned &majnum, unsigned &minnum, unsigned &relnum)
 {
-   herr_t ret_value = H5get_libversion( &majnum, &minnum, &relnum );
-   if( ret_value < 0 )
-   {
-      throw LibraryIException("H5Library::getLibVersion", "H5get_libversion failed");
-   }
+    herr_t ret_value = H5get_libversion(&majnum, &minnum, &relnum);
+    if (ret_value < 0) {
+        throw LibraryIException("H5Library::getLibVersion", "H5get_libversion failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	H5Library::checkVersion
-///\brief	Verifies that the arguments match the version numbers
-///		compiled into the library
-///\param	majnum - IN: Major version of the library
-///\param	minnum - IN: Minor version of the library
-///\param	relnum - IN: Release number of the library
-///\exception	H5::LibraryIException
+// Function:    H5Library::checkVersion (static)
+///\brief       Verifies that the arguments match the version numbers
+///             compiled into the library
+///\param       majnum - IN: Major version of the library
+///\param       minnum - IN: Minor version of the library
+///\param       relnum - IN: Release number of the library
+///\exception   H5::LibraryIException
 ///\par Description
-///		For information about library version, please refer to
-///		the C layer Reference Manual at:
-/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5.html#Library-VersCheck
-// Programmer	Binh-Minh Ribler - 2000
+///             For information about library version, please refer to
+///             the H5check_version API in the HDF5 C Reference Manual.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void H5Library::checkVersion(unsigned majnum, unsigned minnum, unsigned relnum)
+void
+H5Library::checkVersion(unsigned majnum, unsigned minnum, unsigned relnum)
 {
-   herr_t ret_value = H5check_version(majnum, minnum, relnum);
-   if( ret_value < 0 )
-   {
-      throw LibraryIException("H5Library::checkVersion", "H5check_version failed");
-   }
+    herr_t ret_value = H5check_version(majnum, minnum, relnum);
+    if (ret_value < 0) {
+        throw LibraryIException("H5Library::checkVersion", "H5check_version failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	H5Library::garbageCollect
-///\brief	Walks through all the garbage collection routines for the
-///		library, which are supposed to free any unused memory they
-///		have allocated.
+// Function:    H5Library::garbageCollect (static)
+///\brief       Walks through all the garbage collection routines for the
+///             library, which are supposed to free any unused memory they
+///             have allocated.
 ///
-///\exception	H5::LibraryIException
+///\exception   H5::LibraryIException
 ///\par Description
-///		It is not required that H5Library::garbageCollect be called
-///		at any particular time; it is only necessary in certain
-///		situations, such as when the application has performed actions
-///		that cause the library to allocate many objects. The
-///		application should call H5Library::garbageCollect if it
-///		eventually releases those objects and wants to reduce the
-///		memory used by the library from the peak usage required.
+///             It is not required that H5Library::garbageCollect be called
+///             at any particular time; it is only necessary in certain
+///             situations, such as when the application has performed actions
+///             that cause the library to allocate many objects. The
+///             application should call H5Library::garbageCollect if it
+///             eventually releases those objects and wants to reduce the
+///             memory used by the library from the peak usage required.
 ///\par
-///		The library automatically garbage collects all the free
-///		lists when the application ends.
-// Programmer	Binh-Minh Ribler - May, 2004
+///             The library automatically garbage collects all the free
+///             lists when the application ends.
+// Programmer   Binh-Minh Ribler - May, 2004
+//--------------------------------------------------------------------------
+void
+H5Library::garbageCollect()
+{
+    herr_t ret_value = H5garbage_collect();
+    if (ret_value < 0) {
+        throw LibraryIException("H5Library::garbageCollect", "H5garbage_collect failed");
+    }
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Library::initH5cpp (static)
+///\brief       Initializes C++ library and registers terminating functions at
+///             exit.  Only for the library functions, not for user-defined
+///             functions.
+// Description
+//              initH5cpp registers the following functions with std::atexit():
+//                      termH5cpp() - calls H5close() after all cleanup in
+//                                    the C++ library is done
+//                      <classname>::deleteConstants - deletes all references
+//                                    for <classname> global constants
+///\exception   H5::LibraryIException
+//
+// Programmer   Binh-Minh Ribler - September, 2015
 //--------------------------------------------------------------------------
-void H5Library::garbageCollect()
+void
+H5Library::initH5cpp()
 {
-   herr_t ret_value = H5garbage_collect();
-   if( ret_value < 0 )
-   {
-      throw LibraryIException("H5Library::garbageCollect", "H5garbage_collect failed");
-   }
+    // Register terminating functions with atexit(); they will be invoked in
+    // the reversed order
+    int ret_value = 0;
+    ret_value     = std::atexit(termH5cpp);
+    if (ret_value != 0)
+        throw LibraryIException("H5Library::initH5cpp", "Registering termH5cpp failed");
+
+    ret_value = std::atexit(PredType::deleteConstants);
+    if (ret_value != 0)
+        throw LibraryIException("H5Library::initH5cpp", "Registering PredType::deleteConstants failed");
+
+    ret_value = std::atexit(PropList::deleteConstants);
+    if (ret_value != 0)
+        throw LibraryIException("H5Library::initH5cpp", "Registering PropList::deleteConstants failed");
+
+    ret_value = std::atexit(DSetAccPropList::deleteConstants);
+    if (ret_value != 0)
+        throw LibraryIException("H5Library::initH5cpp",
+                                "Registering DSetAccPropList::deleteConstants failed");
+
+    ret_value = std::atexit(LinkAccPropList::deleteConstants);
+    if (ret_value != 0)
+        throw LibraryIException("H5Library::initH5cpp",
+                                "Registering LinkAccPropList::deleteConstants failed");
+
+    ret_value = std::atexit(LinkCreatPropList::deleteConstants);
+    if (ret_value != 0)
+        throw LibraryIException("H5Library::initH5cpp",
+                                "Registering LinkCreatPropList::deleteConstants failed");
+
+    ret_value = std::atexit(FileAccPropList::deleteConstants);
+    if (ret_value != 0)
+        throw LibraryIException("H5Library::initH5cpp",
+                                "Registering FileAccPropList::deleteConstants failed");
+
+    ret_value = std::atexit(FileCreatPropList::deleteConstants);
+    if (ret_value != 0)
+        throw LibraryIException("H5Library::initH5cpp",
+                                "Registering FileCreatPropList::deleteConstants failed");
+
+    ret_value = std::atexit(DSetMemXferPropList::deleteConstants);
+    if (ret_value != 0)
+        throw LibraryIException("H5Library::initH5cpp",
+                                "Registering DSetMemXferPropList::deleteConstants failed");
+
+    ret_value = std::atexit(DSetCreatPropList::deleteConstants);
+    if (ret_value != 0)
+        throw LibraryIException("H5Library::initH5cpp",
+                                "Registering DSetCreatPropList::deleteConstants failed");
+
+    ret_value = std::atexit(ObjCreatPropList::deleteConstants);
+    if (ret_value != 0)
+        throw LibraryIException("H5Library::initH5cpp",
+                                "Registering ObjCreatPropList::deleteConstants failed");
+
+    ret_value = std::atexit(DataSpace::deleteConstants);
+    if (ret_value != 0)
+        throw LibraryIException("H5Library::initH5cpp", "Registering DataSpace::deleteConstants failed");
 }
 
 //--------------------------------------------------------------------------
-// Function:	H5Library::setFreeListLimits
-///\brief	Sets limits on the different kinds of free lists.
-///\param	reg_global_lim - IN: Limit on all "regular" free list memory used
-///\param	reg_list_lim   - IN: Limit on memory used in each "regular" free list
-///\param	arr_global_lim - IN: Limit on all "array" free list memory used
-///\param	arr_list_lim   - IN: Limit on memory used in each "array" free list
-///\param	blk_global_lim - IN: Limit on all "block" free list memory used
-///\param	blk_list_lim   - IN: Limit on memory used in each "block" free list
-///\exception	H5::LibraryIException
+// Function:    H5Library::termH5cpp (static)
+///\brief       Sends request for the C layer to terminate.
 ///\par Description
-///		Setting a value of -1 for a limit means no limit of that type.
-///		For more information on free list limits, please refer to C
-///		layer Reference Manual at:
-/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5.html#Library-SetFreeListLimits
-// Programmer	Binh-Minh Ribler - May, 2004
-//--------------------------------------------------------------------------
-void H5Library::setFreeListLimits(int reg_global_lim, int reg_list_lim,
-	int arr_global_lim, int arr_list_lim, int blk_global_lim,
-	int blk_list_lim)
+///             If the C library fails to terminate, exit with a failure.
+// Programmer   Binh-Minh Ribler - September, 2015
+//--------------------------------------------------------------------------
+void
+H5Library::termH5cpp()
 {
-   herr_t ret_value = H5set_free_list_limits(reg_global_lim, reg_list_lim, arr_global_lim, arr_list_lim, blk_global_lim, blk_list_lim);
-   if( ret_value < 0 )
-   {
-      throw LibraryIException("H5Library::setFreeListLimits", "H5set_free_list_limits failed");
-   }
+    // Close the C library
+    herr_t ret_value = H5close();
+    if (ret_value == -1)
+        exit(-1);
 }
-#ifndef H5_NO_NAMESPACE
-} // end namespace
-#endif
+
+//--------------------------------------------------------------------------
+// Function:    H5Library::setFreeListLimits (static)
+///\brief       Sets limits on the different kinds of free lists.
+///\param       reg_global_lim - IN: Limit on all "regular" free list memory used
+///\param       reg_list_lim   - IN: Limit on memory used in each "regular" free list
+///\param       arr_global_lim - IN: Limit on all "array" free list memory used
+///\param       arr_list_lim   - IN: Limit on memory used in each "array" free list
+///\param       blk_global_lim - IN: Limit on all "block" free list memory used
+///\param       blk_list_lim   - IN: Limit on memory used in each "block" free list
+///\exception   H5::LibraryIException
+///\par Description
+///             Setting a value of -1 for a limit means no limit of that type.
+///             For more information on free list limits, please refer to
+///             the H5set_free_list_limits API in the HDF5 C Reference Manual.
+// Programmer   Binh-Minh Ribler - May, 2004
+//--------------------------------------------------------------------------
+void
+H5Library::setFreeListLimits(int reg_global_lim, int reg_list_lim, int arr_global_lim, int arr_list_lim,
+                             int blk_global_lim, int blk_list_lim)
+{
+    herr_t ret_value = H5set_free_list_limits(reg_global_lim, reg_list_lim, arr_global_lim, arr_list_lim,
+                                              blk_global_lim, blk_list_lim);
+    if (ret_value < 0) {
+        throw LibraryIException("H5Library::setFreeListLimits", "H5set_free_list_limits failed");
+    }
+}
+
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+//--------------------------------------------------------------------------
+// Function:    H5Library default constructor - private
+///\brief       Default constructor: Creates a stub H5Library object
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+H5Library::H5Library()
+{
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Library destructor
+///\brief       Noop destructor
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+H5Library::~H5Library()
+{
+}
+#endif // DOXYGEN_SHOULD_SKIP_THIS
+
+} // namespace H5
diff --git a/c++/src/H5Library.h b/c++/src/H5Library.h
index e5365f9..3770639 100644
--- a/c++/src/H5Library.h
+++ b/c++/src/H5Library.h
@@ -1,76 +1,71 @@
 // C++ informative line for the emacs editor: -*- C++ -*-
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5Library_H
-#define __H5Library_H
+#ifndef H5Library_H
+#define H5Library_H
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#endif
-
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
-#define NOTATEXIT       (-10)   // just in case the HDF5 library use more
-	// negative constants. Note: the solution used for the atexit/global
-	// destructors is not reliable, and desperately needs improvement
-	// It is not even working, inifiteloop message still printed when
-	// calling H5close
-#endif // DOXYGEN_SHOULD_SKIP_THIS
 
 /*! \class H5Library
     \brief Class H5Library operates the HDF5 library globably.
 
-    It is not neccessary to construct an instance of H5Library to use the
+    It is not necessary to construct an instance of H5Library to use the
     methods.
 */
 class H5_DLLCPP H5Library {
-   public:
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
-	static bool need_cleanup; // indicates if H5close should be called
-#endif // DOXYGEN_SHOULD_SKIP_THIS
+  public:
+    // Initializes the HDF5 library.
+    static void open();
+
+    // Flushes all data to disk, closes files, and cleans up memory.
+    static void close();
 
-	// Initializes the HDF5 library.
-	static void open();
+    // Instructs library not to install atexit cleanup routine
+    static void dontAtExit();
 
-	// Flushes all data to disk, closes files, and cleans up memory.
-	static void close();
+    // Returns the HDF library release number.
+    static void getLibVersion(unsigned &majnum, unsigned &minnum, unsigned &relnum);
 
-	// Instructs library not to install atexit cleanup routine
-	static void dontAtExit();
+    // Verifies that the arguments match the version numbers compiled
+    // into the library
+    static void checkVersion(unsigned majnum, unsigned minnum, unsigned relnum);
 
-	// Returns the HDF library release number.
-	static void getLibVersion( unsigned& majnum, unsigned& minnum, unsigned& relnum );
+    // Walks through all the garbage collection routines for the library,
+    // which are supposed to free any unused memory they have allocated.
+    static void garbageCollect();
 
-	// Verifies that the arguments match the version numbers compiled
-	// into the library
-	static void checkVersion( unsigned majnum, unsigned minnum, unsigned relnum );
+    // Sets limits on the different kinds of free lists.
+    static void setFreeListLimits(int reg_global_lim, int reg_list_lim, int arr_global_lim, int arr_list_lim,
+                                  int blk_global_lim, int blk_list_lim);
 
-	// Walks through all the garbage collection routines for the library,
-	// which are supposed to free any unused memory they have allocated.
-	static void garbageCollect();
+    // Initializes C++ library and registers terminating functions at exit.
+    // Only for the library functions, not for user-defined functions.
+    static void initH5cpp(void);
 
-	// Sets limits on the different kinds of free lists.
-	static void setFreeListLimits(int reg_global_lim, int reg_list_lim, int
-	arr_global_lim, int arr_list_lim, int blk_global_lim, int blk_list_lim);
+    // Sends request for terminating the HDF5 library.
+    static void termH5cpp(void);
+
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+
+  private:
+    // Default constructor - no instance ever created from outsiders
+    H5Library();
+
+    // Destructor
+    ~H5Library();
+#endif // DOXYGEN_SHOULD_SKIP_THIS
 
-   private:
-	// Default constructor - no instance ever created
-	H5Library() {};
+}; // end of H5Library
+} // namespace H5
 
-};
-#ifndef H5_NO_NAMESPACE
-}
-#endif
-#endif // __H5Library_H
+#endif // H5Library_H
diff --git a/c++/src/H5Location.cpp b/c++/src/H5Location.cpp
index 5cece19..29714f5 100644
--- a/c++/src/H5Location.cpp
+++ b/c++/src/H5Location.cpp
@@ -1,90 +1,74 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
+#include <iostream>
 #include <string>
+using namespace std;
 
 #include "H5Include.h"
 #include "H5Exception.h"
 #include "H5IdComponent.h"
+#include "H5DataSpace.h"
 #include "H5PropList.h"
-#include "H5Location.h"
-#include "H5Object.h"
-#include "H5DcreatProp.h"
-#include "H5DxferProp.h"
 #include "H5FaccProp.h"
 #include "H5FcreatProp.h"
-#include "H5CommonFG.h"
+#include "H5OcreatProp.h"
+#include "H5DcreatProp.h"
+#include "H5DxferProp.h"
+#include "H5LcreatProp.h"
+#include "H5LaccProp.h"
+#include "H5DaccProp.h"
+#include "H5Location.h"
+#include "H5Object.h"
 #include "H5DataType.h"
-#include "H5DataSpace.h"
 #include "H5AbstractDs.h"
-#include "H5File.h"
 #include "H5DataSet.h"
-#include "H5Attribute.h"
-#include "H5private.h"		// for HDmemset
-#include <iostream>
-using namespace std;
-
+#include "H5CommonFG.h"
+#include "H5Group.h"
+#include "H5File.h"
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#endif
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
-// userAttrOpWrpr simply interfaces between the user's function and the
-// C library function H5Aiterate2; used to resolve the different prototype
-// problem.  May be moved to Iterator later.
-extern "C" herr_t userAttrOpWrpr(hid_t loc_id, const char *attr_name,
-    const H5A_info_t *ainfo, void *op_data)
-{
-   H5std_string s_attr_name = H5std_string( attr_name );
-#ifdef NO_STATIC_CAST
-   UserData4Aiterate* myData = (UserData4Aiterate *) op_data;
-#else
-   UserData4Aiterate* myData = static_cast <UserData4Aiterate *> (op_data);
-#endif
-   myData->op( *myData->location, s_attr_name, myData->opData );
-   return 0;
-}
-
 //--------------------------------------------------------------------------
-// Function:	H5Location default constructor (protected)
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    H5Location default constructor (protected)
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-H5Location::H5Location() : IdComponent() {}
+H5Location::H5Location() : IdComponent()
+{
+}
 
 //--------------------------------------------------------------------------
-// Function:	H5Location overloaded constructor (protected)
-// Purpose	Creates an H5Location object using the id of an existing HDF5
-//		object.
-// Parameters	object_id - IN: Id of an existing HDF5 object
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    H5Location overloaded constructor (protected)
+// Purpose      Creates an H5Location object using the id of an existing HDF5
+//              object.
+// Parameters   object_id - IN: Id of an existing HDF5 object
+// Programmer   Binh-Minh Ribler - 2000
 
 // *** Deprecation warning ***
 // This constructor is no longer appropriate because the data member "id" had
 // been moved to the sub-classes.  It will be removed in 1.10 release.  If its
 // removal does not raise any problems in 1.10, it will be removed from 1.8 in
 // subsequent releases.
+// Removed in 1.10.1 - Aug 2016
 //--------------------------------------------------------------------------
-H5Location::H5Location(const hid_t object_id) : IdComponent() {}
+// H5Location::H5Location(const hid_t object_id) : IdComponent() {}
 
 //--------------------------------------------------------------------------
-// Function:	H5Location copy constructor
-// Purpose:	This noop copy constructor is removed as a result of the data
-//		member "id" being moved down to sub-classes. (Mar 2015)
-///\param	original - IN: H5Location instance to copy
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    H5Location copy constructor
+// Purpose      This noop copy constructor is removed as a result of the data
+//              member "id" being moved down to sub-classes. (Mar 2015)
+///\param       original - IN: H5Location instance to copy
+// Programmer   Binh-Minh Ribler - 2000
 //
 // *** Deprecation warning ***
 // This constructor is no longer appropriate because the data member "id" had
@@ -96,841 +80,2362 @@ H5Location::H5Location(const hid_t object_id) : IdComponent() {}
 #endif // DOXYGEN_SHOULD_SKIP_THIS
 
 //--------------------------------------------------------------------------
-// Function:	H5Location::createAttribute
-///\brief	Creates an attribute for a group, dataset, or named datatype.
-///\param	name - IN: Name of the attribute
-///\param	data_type - IN: Datatype for the attribute
-///\param	data_space - IN: Dataspace for the attribute - only simple
-///		dataspaces are allowed at this time
-///\param	create_plist - IN: Creation property list - default to
-///		PropList::DEFAULT
-///\return	Attribute instance
-///\exception	H5::AttributeIException
+// Function:    H5Location::nameExists
+///\brief       Checks if a link of a given name exists in a location
+///\param       name - IN: Searched name
+///\param       lapl - IN: Link access property list
+///\exception   H5::LocationException
+// Modification
+//              Renamed from exists() in 1.10.2 -BMR
+//--------------------------------------------------------------------------
+bool
+H5Location::nameExists(const char *name, const LinkAccPropList &lapl) const
+{
+    htri_t ret_value = H5Lexists(getId(), name, lapl.getId());
+    if (ret_value > 0)
+        return true;
+    else if (ret_value == 0)
+        return false;
+    else // Raise exception when H5Lexists returns a negative value
+    {
+        throw LocationException(inMemFunc("nameExists"), "H5Lexists failed");
+    }
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::nameExists
+///\brief       Checks if a link of a given name exists in a location
+///\param       name - IN: Searched name
+///\param       lapl - IN: Link access property list
+///\exception   H5::LocationException
+// Modification
+//              Renamed from exists() in 1.10.2 -BMR
+//--------------------------------------------------------------------------
+bool
+H5Location::nameExists(const H5std_string &name, const LinkAccPropList &lapl) const
+{
+    return (nameExists(name.c_str(), lapl));
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::exists - Deprecated
+// Purpose      Checks if a link of a given name exists in a location
+///\brief       Deprecated in favor of nameExists
+///\param       name - IN: Searched name
+///\param       lapl - IN: Link access property list
+///\exception   H5::LocationException
+// Programmer   Binh-Minh Ribler - Nov, 2016
+// Modification
+//              Renamed to nameExists() in 1.10.2 -BMR
+//--------------------------------------------------------------------------
+bool
+H5Location::exists(const char *name, const LinkAccPropList &lapl) const
+{
+    return (nameExists(name, lapl));
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::exists - Deprecated
+// Purpose      Checks if a link of a given name exists in a location
+///\brief       Deprecated in favor of nameExists
+///\param       name - IN: Searched name
+///\param       lapl - IN: Link access property list
+///\exception   H5::LocationException
+// Programmer   Binh-Minh Ribler - Dec, 2016
+// Modification
+//              Renamed to nameExists() in 1.10.2 -BMR
+//--------------------------------------------------------------------------
+bool
+H5Location::exists(const H5std_string &name, const LinkAccPropList &lapl) const
+{
+    return (nameExists(name.c_str(), lapl));
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::flush
+///\brief       Flushes all buffers associated with a location to disk.
+///\param       scope - IN: Specifies the scope of the flushing action,
+///             which can be either of these values:
+///             \li \c H5F_SCOPE_GLOBAL - Flushes the entire virtual file
+///             \li \c H5F_SCOPE_LOCAL - Flushes only the specified file
+///\exception   H5::LocationException
 ///\par Description
-///		The attribute name specified in \a name must be unique.
-///		Attempting to create an attribute with the same name as an
-///		existing attribute will raise an exception, leaving the
-///		pre-existing attribute intact. To overwrite an existing
-///		attribute with a new attribute of the same name, first
-///		delete the existing one with \c H5Location::removeAttr, then
-///		recreate it with this function.
-// Programmer	Binh-Minh Ribler - 2000
+///             This location is used to identify the file to be flushed.
+// Programmer   Binh-Minh Ribler - 2012
+// Modification
+//        Sep 2012 - BMR
+//              Moved from H5File/H5Object
 //--------------------------------------------------------------------------
-Attribute H5Location::createAttribute( const char* name, const DataType& data_type, const DataSpace& data_space, const PropList& create_plist ) const
+void
+H5Location::flush(H5F_scope_t scope) const
 {
-   hid_t type_id = data_type.getId();
-   hid_t space_id = data_space.getId();
-   hid_t plist_id = create_plist.getId();
-   hid_t attr_id = H5Acreate2(getId(), name, type_id, space_id, plist_id, H5P_DEFAULT );
+    herr_t ret_value = H5Fflush(getId(), scope);
+    if (ret_value < 0) {
+        throw LocationException(inMemFunc("flush"), "H5Fflush failed");
+    }
+}
 
-   // If the attribute id is valid, create and return the Attribute object
-   if( attr_id > 0 )
-   {
-      Attribute attr( attr_id );
-      return( attr );
-   }
-   else
-      throw AttributeIException(inMemFunc("createAttribute"), "H5Acreate2 failed");
+//--------------------------------------------------------------------------
+// Function:    H5Location::getFileName
+///\brief       Gets the name of the file, in which an HDF5 object at this
+///             location belongs.
+///\return      File name
+///\exception   H5::LocationException
+// Programmer   Binh-Minh Ribler - Jul, 2004
+//--------------------------------------------------------------------------
+H5std_string
+H5Location::getFileName() const
+{
+    try {
+        return (p_get_file_name());
+    }
+    catch (IdComponentException &E) {
+        throw LocationException(inMemFunc("getFileName"), E.getDetailMsg());
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	H5Location::createAttribute
-///\brief	This is an overloaded member function, provided for convenience.
-///		It differs from the above function in that it takes
-///		a reference to an \c H5std_string for \a name.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    H5Location::setComment
+///\brief       Sets or resets the comment for an object specified by its name.
+///\param       name  - IN: Name of the object
+///\param       comment - IN: New comment
+///\exception   H5::LocationException
+///\par Description
+///             If \a comment is an empty string or a null pointer, the comment
+///             message is removed from the object.
+///             Comments should be relatively short, null-terminated, ASCII
+///             strings.  They can be attached to any object that has an
+///             object header, e.g., data sets, groups, named data types,
+///             and data spaces, but not symbolic links.
+// Programmer   Binh-Minh Ribler - 2000 (moved from CommonFG, Sep 2013)
+// Modification
+//      2007: QAK modified to use H5O APIs; however the first parameter is
+//              no longer just file or group, this function should be moved
+//              to another class to accommodate attribute, dataset, and named
+//              datatype. - BMR
 //--------------------------------------------------------------------------
-Attribute H5Location::createAttribute( const H5std_string& name, const DataType& data_type, const DataSpace& data_space, const PropList& create_plist ) const
+void
+H5Location::setComment(const char *name, const char *comment) const
 {
-   return( createAttribute( name.c_str(), data_type, data_space, create_plist ));
+    herr_t ret_value = H5Oset_comment_by_name(getId(), name, comment, H5P_DEFAULT);
+    if (ret_value < 0)
+        throw LocationException(inMemFunc("setComment"), "H5Oset_comment_by_name failed");
 }
 
 //--------------------------------------------------------------------------
-// Function:	H5Location::openAttribute
-///\brief	Opens an attribute given its name.
-///\param	name - IN: Name of the attribute
-///\return	Attribute instance
-///\exception	H5::AttributeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    H5Location::setComment
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes an
+///             \c H5std_string for \a name and \a comment.
+// Programmer   Binh-Minh Ribler - 2000 (moved from CommonFG, Sep 2013)
 //--------------------------------------------------------------------------
-Attribute H5Location::openAttribute( const char* name ) const
+void
+H5Location::setComment(const H5std_string &name, const H5std_string &comment) const
 {
-   hid_t attr_id = H5Aopen(getId(), name, H5P_DEFAULT);
-   if( attr_id > 0 )
-   {
-      Attribute attr( attr_id );
-      return( attr );
-   }
-   else
-   {
-      throw AttributeIException(inMemFunc("openAttribute"), "H5Aopen failed");
-   }
+    setComment(name.c_str(), comment.c_str());
 }
 
 //--------------------------------------------------------------------------
-// Function:	H5Location::openAttribute
-///\brief	This is an overloaded member function, provided for convenience.
-///		It differs from the above function in that it takes
-///		a reference to an \c H5std_string for \a name.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    H5Location::setComment
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it doesn't take
+///             an object name.
+// Programmer   Binh-Minh Ribler - Sep 2013
 //--------------------------------------------------------------------------
-Attribute H5Location::openAttribute( const H5std_string& name ) const
+void
+H5Location::setComment(const char *comment) const
 {
-   return( openAttribute( name.c_str()) );
+    herr_t ret_value = H5Oset_comment_by_name(getId(), ".", comment, H5P_DEFAULT);
+    if (ret_value < 0)
+        throw LocationException(inMemFunc("setComment"), "H5Oset_comment_by_name failed");
 }
 
 //--------------------------------------------------------------------------
-// Function:	H5Location::openAttribute
-///\brief	Opens an attribute given its index.
-///\param	idx - IN: Index of the attribute, a 0-based, non-negative integer
-///\return	Attribute instance
-///\exception	H5::AttributeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    H5Location::setComment
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes an
+///             \c H5std_string for \a comment.
+// Programmer   Binh-Minh Ribler - Sep 2013
 //--------------------------------------------------------------------------
-Attribute H5Location::openAttribute( const unsigned int idx ) const
+void
+H5Location::setComment(const H5std_string &comment) const
 {
-   hid_t attr_id = H5Aopen_by_idx(getId(), ".", H5_INDEX_CRT_ORDER,
-			H5_ITER_INC, (hsize_t)idx, H5P_DEFAULT, H5P_DEFAULT);
-   if( attr_id > 0 )
-   {
-      Attribute attr( attr_id );
-      return( attr );
-   }
-   else
-   {
-      throw AttributeIException(inMemFunc("openAttribute"), "H5Aopen_by_idx failed");
-   }
+    setComment(comment.c_str());
 }
 
 //--------------------------------------------------------------------------
-// Function:	H5Location::iterateAttrs
-///\brief	Iterates a user's function over all the attributes of an H5
-///		object, which may be a group, dataset or named datatype.
-///\param	user_op - IN: User's function to operate on each attribute
-///\param	_idx - IN/OUT: Starting (IN) and ending (OUT) attribute indices
-///\param	op_data - IN: User's data to pass to user's operator function
-///\return	Returned value of the last operator if it was non-zero, or
-///		zero if all attributes were processed
-///\exception	H5::AttributeIException
+// Function:    H5Location::removeComment
+///\brief       Removes the comment from an object specified by its name.
+///\param       name  - IN: Name of the object
+///\exception   H5::LocationException
+// Programmer   Binh-Minh Ribler - May 2005 (moved from CommonFG, Sep 2013)
+//      2007: QAK modified to use H5O APIs; however the first parameter is
+//              no longer just file or group, this function should be moved
+//              to another class to accommodate attribute, dataset, and named
+//              datatype. - BMR
+//--------------------------------------------------------------------------
+void
+H5Location::removeComment(const char *name) const
+{
+    herr_t ret_value = H5Oset_comment_by_name(getId(), name, NULL, H5P_DEFAULT);
+    if (ret_value < 0)
+        throw LocationException(inMemFunc("removeComment"), "H5Oset_comment_by_name failed");
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::removeComment
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes an
+///             \c H5std_string for \a name.
+// Programmer   Binh-Minh Ribler - May 2005 (moved from CommonFG, Sep 2013)
+//--------------------------------------------------------------------------
+void
+H5Location::removeComment(const H5std_string &name) const
+{
+    removeComment(name.c_str());
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::getComment
+///\brief       Retrieves the comment for this location, returning its length.
+///\param       name     - IN: Name of the object
+///\param       buf_size - IN: Length of the comment to retrieve
+///\param       comment  - OUT: Retrieved comment
+///\return      Actual length of the comment
+///\exception   H5::LocationException
 ///\par Description
-///		The signature of user_op is
-///		void (*)(H5::H5Location&, H5std_string, void*).
-///		For information, please refer to the C layer Reference Manual
-///		at:
-/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5A.html#Annot-Iterate
-// Programmer	Binh-Minh Ribler - 2000
+///             This function retrieves \a buf_size characters of the comment
+///             including the null terminator.  Thus, if the actual length
+///             of the comment is more than buf_size-1, the retrieved comment
+///             will be truncated to accommodate the null terminator.
+// Programmer   Binh-Minh Ribler - Mar 2014
+//--------------------------------------------------------------------------
+ssize_t
+H5Location::getComment(const char *name, size_t buf_size, char *comment) const
+{
+    // H5Oget_comment_by_name will get buf_size chars of the comment including
+    // the null terminator
+    ssize_t comment_len;
+    comment_len = H5Oget_comment_by_name(getId(), name, comment, buf_size, H5P_DEFAULT);
+
+    // If H5Oget_comment_by_name returns a negative value, raise an exception
+    if (comment_len < 0) {
+        throw LocationException("H5Location::getComment", "H5Oget_comment_by_name failed");
+    }
+    // If the comment is longer than the provided buffer size, the C library
+    // will not null terminate it
+    if (static_cast<size_t>(comment_len) >= buf_size)
+        comment[buf_size - 1] = '\0';
+
+    // Return the actual comment length, which might be different from buf_size
+    return (comment_len);
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::getComment
+///\brief       Returns the comment as \a string for this location,
+///             returning its length.
+///\param       name     - IN: Name of the object
+///\param       buf_size - IN: Length of the comment to retrieve, default to 0
+///\return      Comment string
+///\exception   H5::LocationException
+// Programmer   Binh-Minh Ribler - 2000 (moved from CommonFG, Sep 2013)
 //--------------------------------------------------------------------------
-int H5Location::iterateAttrs( attr_operator_t user_op, unsigned *_idx, void *op_data )
+H5std_string
+H5Location::getComment(const char *name, size_t buf_size) const
 {
-   // store the user's function and data
-   UserData4Aiterate* userData = new UserData4Aiterate;
-   userData->opData = op_data;
-   userData->op = user_op;
-   userData->location = this;
+    // Initialize string to "", so that if there is no comment, the returned
+    // string will be empty
+    H5std_string comment;
 
-   // call the C library routine H5Aiterate2 to iterate the attributes
-   hsize_t idx = _idx ? (hsize_t)*_idx : 0;
-   int ret_value = H5Aiterate2(getId(), H5_INDEX_NAME, H5_ITER_INC, &idx,
-			userAttrOpWrpr, (void *) userData);
+    // Preliminary call to get the comment's length
+    ssize_t comment_len = H5Oget_comment_by_name(getId(), name, NULL, 0, H5P_DEFAULT);
 
-   // release memory
-   delete userData;
+    // If H5Oget_comment_by_name returns a negative value, raise an exception
+    if (comment_len < 0) {
+        throw LocationException("H5Location::getComment", "H5Oget_comment_by_name failed");
+    }
 
-   if( ret_value >= 0 ) {
-      /* Pass back update index value to calling code */
-      if (_idx)
-	 *_idx = (unsigned)idx;
+    // If comment exists, calls C routine again to get it
+    else if (comment_len > 0) {
+        size_t tmp_len = buf_size;
 
-      return( ret_value );
-   }
-   else  // raise exception when H5Aiterate returns a negative value
-      throw AttributeIException(inMemFunc("iterateAttrs"), "H5Aiterate2 failed");
+        // If buffer size is not provided, use comment length
+        if (tmp_len == 0)
+            tmp_len = static_cast<size_t>(comment_len);
+
+        // Temporary buffer for char* comment
+        char *comment_C = new char[tmp_len + 1]();
+
+        // Used overloaded function
+        ssize_t temp_len = getComment(name, tmp_len + 1, comment_C);
+        if (temp_len < 0) {
+            delete[] comment_C;
+            throw LocationException("H5Location::getComment", "H5Oget_comment_by_name failed");
+        }
+
+        // Convert the C comment to return
+        comment = comment_C;
+
+        // Clean up resource
+        delete[] comment_C;
+    }
+
+    // Return the string comment
+    return (comment);
 }
 
 //--------------------------------------------------------------------------
-// Function:	H5Location::getNumAttrs
-///\brief	Returns the number of attributes attached to this HDF5 object.
-///\return	Number of attributes
-///\exception	H5::AttributeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    H5Location::getComment
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes an
+///             \c H5std_string for \a name.
+// Programmer   Binh-Minh Ribler - 2000 (moved from CommonFG, Sep 2013)
 //--------------------------------------------------------------------------
-int H5Location::getNumAttrs() const
+H5std_string
+H5Location::getComment(const H5std_string &name, size_t buf_size) const
 {
-   H5O_info_t oinfo;    /* Object info */
+    return (getComment(name.c_str(), buf_size));
+}
 
-   if(H5Oget_info(getId(), &oinfo) < 0)
-      throw AttributeIException(inMemFunc("getNumAttrs"), "H5Oget_info failed");
-   else
-      return( (int)oinfo.num_attrs );
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::p_reference (protected)
+// Purpose      Creates a reference to an HDF5 object or a dataset region.
+// Parameters
+//              name - IN: Name of the object to be referenced
+//              dataspace - IN: Dataspace with selection
+//              ref_type - IN: Type of reference; default to \c H5R_DATASET_REGION
+// Exception    H5::ReferenceException
+// Programmer   Binh-Minh Ribler - May, 2004
+//--------------------------------------------------------------------------
+void
+H5Location::p_reference(void *ref, const char *name, hid_t space_id, H5R_type_t ref_type) const
+{
+    herr_t ret_value = H5Rcreate(ref, getId(), name, ref_type, space_id);
+    if (ret_value < 0) {
+        throw ReferenceException(inMemFunc("reference"), "H5Rcreate failed");
+    }
 }
 
+#endif // DOXYGEN_SHOULD_SKIP_THIS
+
 //--------------------------------------------------------------------------
-// Function:	H5Location::attrExists
-///\brief	Checks whether the named attribute exists at this location.
-///\param	name - IN: Name of the attribute to be queried
-///\exception	H5::AttributeIException
-// Programmer	Binh-Minh Ribler - 2013
+// Function:    H5Location::reference
+///\brief       Creates a reference to an HDF5 object or a dataset region.
+///\param       ref - IN: Reference pointer
+///\param       name - IN: Name of the object to be referenced
+///\param       dataspace - IN: Dataspace with selection
+///\param       ref_type - IN: Type of reference to query, valid values are:
+///             \li \c H5R_OBJECT         - Reference is an object reference.
+///             \li \c H5R_DATASET_REGION - Reference is a dataset region
+///                     reference. (default)
+///\exception   H5::ReferenceException
+///\note        This method is more suitable for a dataset region reference.
+// Programmer   Binh-Minh Ribler - May, 2004
+//--------------------------------------------------------------------------
+void
+H5Location::reference(void *ref, const char *name, const DataSpace &dataspace, H5R_type_t ref_type) const
+{
+    try {
+        p_reference(ref, name, dataspace.getId(), ref_type);
+    }
+    catch (ReferenceException &E) {
+        throw ReferenceException(inMemFunc("reference"), E.getDetailMsg());
+    }
+}
+
 //--------------------------------------------------------------------------
-bool H5Location::attrExists(const char* name) const
+// Function:    H5Location::reference
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes an
+///             \c H5std_string for \a name.
+///\param       ref - IN: Reference pointer
+///\param       name - IN: Name of the object to be referenced
+///\param       dataspace - IN: Dataspace with selection
+///\param       ref_type - IN: Type of reference to query, valid values are:
+///             \li \c H5R_OBJECT         - Reference is an object reference.
+///             \li \c H5R_DATASET_REGION - Reference is a dataset region
+///                     reference. (default)
+///\exception   H5::ReferenceException
+///\note        This method is more suitable for a dataset region reference.
+// Programmer   Binh-Minh Ribler - May, 2004
+//--------------------------------------------------------------------------
+void
+H5Location::reference(void *ref, const H5std_string &name, const DataSpace &dataspace,
+                      H5R_type_t ref_type) const
 {
-   // Call C routine H5Aexists to determine whether an attribute exists
-   // at this location, which could be specified by a file, group, dataset,
-   // or named datatype.
-   herr_t ret_value = H5Aexists(getId(), name);
-   if( ret_value > 0 )
-      return true;
-   else if(ret_value == 0)
-      return false;
-   else // Raise exception when H5Aexists returns a negative value
-      throw AttributeIException(inMemFunc("attrExists"), "H5Aexists failed");
+    try {
+        p_reference(ref, name.c_str(), dataspace.getId(), ref_type);
+    }
+    catch (ReferenceException &E) {
+        throw ReferenceException(inMemFunc("reference"), E.getDetailMsg());
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	H5Location::attrExists
-///\brief	This is an overloaded member function, provided for convenience.
-///		It differs from the above function in that it takes
-///		a reference to an \c H5std_string for \a name.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    H5Location::reference
+///\brief       This is an overloaded function, provided for your convenience.
+///             It differs from the above function in that it does not take
+///             a DataSpace object and the reference type must be specified.
+///\param       ref - IN: Reference pointer
+///\param       name - IN: Name of the object to be referenced
+///\param       ref_type - IN: Type of reference to query, valid values are:
+///             \li \c H5R_OBJECT         - Reference is an object reference (default)
+///             \li \c H5R_DATASET_REGION - Reference is a dataset region
+///\exception   H5::ReferenceException
+///\note        This method is more suitable for an object reference.
+// Programmer   Binh-Minh Ribler - May, 2004
+//--------------------------------------------------------------------------
+void
+H5Location::reference(void *ref, const char *name, H5R_type_t ref_type) const
+{
+    try {
+        p_reference(ref, name, -1, ref_type);
+    }
+    catch (ReferenceException &E) {
+        throw ReferenceException(inMemFunc("reference"), E.getDetailMsg());
+    }
+}
+
 //--------------------------------------------------------------------------
-bool H5Location::attrExists(const H5std_string& name) const
+// Function:    H5Location::reference
+///\brief       This is an overloaded function, provided for your convenience.
+///             It differs from the above function in that it takes an
+///             \c H5std_string for the object's name.
+///\param       ref - IN: Reference pointer
+///\param       name - IN: Name of the object to be referenced - \c H5std_string
+///\param       ref_type - IN: Type of reference to query, valid values are:
+///             \li \c H5R_OBJECT         - Reference is an object reference (default)
+///             \li \c H5R_DATASET_REGION - Reference is a dataset region
+///\note        This method is more suitable for an object reference.
+// Programmer   Binh-Minh Ribler - May, 2004
+//--------------------------------------------------------------------------
+void
+H5Location::reference(void *ref, const H5std_string &name, H5R_type_t ref_type) const
 {
-   return(attrExists(name.c_str()));
+    reference(ref, name.c_str(), ref_type);
 }
 
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
 //--------------------------------------------------------------------------
-// Function:	H5Location::removeAttr
-///\brief	Removes the named attribute from this object.
-///\param	name - IN: Name of the attribute to be removed
-///\exception	H5::AttributeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    H5Location::p_dereference (protected)
+// Purpose      Dereference a ref into an hdf5 object.
+// Parameters
+//              loc_id - IN: An hdf5 identifier specifying the location of the
+//                          referenced object
+//              ref - IN: Reference pointer
+//              ref_type - IN: Reference type
+//              plist - IN: Property list - default to PropList::DEFAULT
+//              from_func - IN: Name of the calling function
+// Exception    H5::ReferenceException
+// Programmer   Binh-Minh Ribler - Oct, 2006
+//--------------------------------------------------------------------------
+hid_t
+H5Location::p_dereference(hid_t loc_id, const void *ref, H5R_type_t ref_type, const PropList &plist,
+                          const char *from_func)
+{
+    hid_t plist_id;
+    if (p_valid_id(plist.getId()))
+        plist_id = plist.getId();
+    else
+        plist_id = H5P_DEFAULT;
+
+    hid_t temp_id = H5Rdereference2(loc_id, plist_id, ref_type, ref);
+    if (temp_id < 0) {
+        throw ReferenceException(inMemFunc(from_func), "H5Rdereference2 failed");
+    }
+
+    return (temp_id);
+}
+#endif // DOXYGEN_SHOULD_SKIP_THIS
+
 //--------------------------------------------------------------------------
-void H5Location::removeAttr( const char* name ) const
+// Function:    H5Location::dereference
+///\brief       Dereferences a reference into an HDF5 object, given an HDF5 object.
+///\param       loc - IN: Location of the referenced object
+///\param       ref - IN: Reference pointer
+///\param       ref_type - IN: Reference type
+///\param       plist - IN: Property list - default to PropList::DEFAULT
+///\exception   H5::ReferenceException
+// Programmer   Binh-Minh Ribler - Oct, 2006
+//--------------------------------------------------------------------------
+void
+H5Location::dereference(const H5Location &loc, const void *ref, H5R_type_t ref_type, const PropList &plist)
 {
-   herr_t ret_value = H5Adelete(getId(), name);
-   if( ret_value < 0 )
-      throw AttributeIException(inMemFunc("removeAttr"), "H5Adelete failed");
+    p_setId(p_dereference(loc.getId(), ref, ref_type, plist, "dereference"));
 }
 
 //--------------------------------------------------------------------------
-// Function:	H5Location::removeAttr
-///\brief	This is an overloaded member function, provided for convenience.
-///		It differs from the above function in that it takes
-///		a reference to an \c H5std_string for \a name.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    H5Location::dereference
+// brief        Dereferences a reference into an HDF5 object, given an attribute.
+// param        attr - IN: Attribute specifying the location of the referenced object
+// param        ref - IN: Reference pointer
+// param        ref_type - IN: Reference type
+// param        plist - IN: Property list - default to PropList::DEFAULT
+// exception    H5::ReferenceException
+// Programmer   Binh-Minh Ribler - Oct, 2006
+// Modification
+//      Mar, 2017
+//              Removed in 1.10.1 because H5Location is Attribute's baseclass
+//              now. -BMR
 //--------------------------------------------------------------------------
-void H5Location::removeAttr( const H5std_string& name ) const
+/* void H5Location::dereference(const Attribute& attr, const void* ref, H5R_type_t ref_type, const PropList&
+plist)
 {
-   removeAttr( name.c_str() );
+  p_setId(p_dereference(attr.getId(), ref, ref_type, plist, "dereference"));
 }
+*/
 
+#ifndef H5_NO_DEPRECATED_SYMBOLS
 //--------------------------------------------------------------------------
-// Function:	H5Location::renameAttr
-///\brief	Renames the named attribute from this object.
-///\param	oldname - IN: Name of the attribute to be renamed
-///\param	newname - IN: New name ame of the attribute
-///\exception	H5::AttributeIException
-// Programmer	Binh-Minh Ribler - Mar, 2005
+// Function:    H5Location::getObjType
+///\brief       Retrieves the type of object that an object reference points to.
+///\param       ref_type - IN: Type of reference to query, valid values are:
+///             \li \c H5R_OBJECT - Reference is an object reference.
+///             \li \c H5R_DATASET_REGION - Reference is a dataset region reference.
+///\param       ref      - IN: Reference to query
+///\return      An object type, which can be one of the following:
+///             \li \c H5G_UNKNOWN  - A failure occurs. (-1)
+///             \li \c H5G_GROUP  - Object is a group.
+///             \li \c H5G_DATASET - Object is a dataset.
+///             \li \c H5G_TYPE Object - is a named datatype
+///             \li \c H5G_LINK  - Object is a symbolic link.
+///             \li \c H5G_UDLINK  - Object is a user-defined link.
+///\exception   H5::ReferenceException
+// Programmer   Binh-Minh Ribler - May, 2004
+// Modification
+//      Sep 2012: Moved up from H5File, Group, DataSet, and DataType
 //--------------------------------------------------------------------------
-void H5Location::renameAttr(const char* oldname, const char* newname) const
+H5G_obj_t
+H5Location::getObjType(void *ref, H5R_type_t ref_type) const
 {
-   herr_t ret_value = H5Arename(getId(), oldname, newname);
-   if (ret_value < 0)
-      throw AttributeIException(inMemFunc("renameAttr"), "H5Arename failed");
+    try {
+        return (p_get_obj_type(ref, ref_type));
+    }
+    catch (ReferenceException &E) {
+        throw ReferenceException(inMemFunc("getObjType"), E.getDetailMsg());
+    }
 }
 
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
 //--------------------------------------------------------------------------
-// Function:	H5Location::renameAttr
-///\brief	This is an overloaded member function, provided for convenience.
-///		It differs from the above function in that it takes
-///		a reference to an \c H5std_string for the names.
-// Programmer	Binh-Minh Ribler - Mar, 2005
+// Function:    H5Location::p_get_obj_type (protected)
+// Purpose      Retrieves the type of object that an object reference points to.
+// Parameters
+//              ref      - IN: Reference to query
+//              ref_type - IN: Type of reference to query
+// Return       An object type, which can be one of the following:
+//                      H5G_UNKNOWN \tFailure occurs (-1)
+//                      H5G_GROUP \tObject is a group.
+//                      H5G_DATASET \tObject is a dataset.
+//                      H5G_TYPE Object \tis a named datatype.
+//                      H5G_LINK \tObject is a symbolic link.
+//                      H5G_UDLINK \tObject is a user-defined link.
+// Exception    H5::ReferenceException
+// Programmer   Binh-Minh Ribler - May, 2004
+//--------------------------------------------------------------------------
+H5G_obj_t
+H5Location::p_get_obj_type(void *ref, H5R_type_t ref_type) const
+{
+    H5G_obj_t obj_type = H5Rget_obj_type1(getId(), ref_type, ref);
+    if (obj_type == H5G_UNKNOWN) {
+        throw ReferenceException(inMemFunc("getObjType"), "H5Rget_obj_type1 failed");
+    }
+    return (obj_type);
+}
+#endif // DOXYGEN_SHOULD_SKIP_THIS
+
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
+
 //--------------------------------------------------------------------------
-void H5Location::renameAttr(const H5std_string& oldname, const H5std_string& newname) const
+// Function:    H5Location::getRefObjType
+///\brief       Retrieves the type of object that an object reference points to.
+///\param       ref      - IN: Reference to query
+///\param       ref_type - IN: Type of reference to query, valid values are:
+///             \li \c H5R_OBJECT         - Reference is an object reference.
+///             \li \c H5R_DATASET_REGION - Reference is a dataset region reference.
+///\return      An object type, which can be one of the following:
+///             \li \c H5O_TYPE_UNKNOWN - Unknown object type (-1)
+///             \li \c H5O_TYPE_GROUP   - Object is a group
+///             \li \c H5O_TYPE_DATASET - Object is a dataset
+///             \li \c H5O_TYPE_NAMED_DATATYPE - Object is a named datatype
+///             \li \c H5O_TYPE_NTYPES  - Number of different object types
+///\exception   H5::ReferenceException
+// Programmer   Binh-Minh Ribler - May, 2004
+//--------------------------------------------------------------------------
+H5O_type_t
+H5Location::getRefObjType(void *ref, H5R_type_t ref_type) const
 {
-   renameAttr (oldname.c_str(), newname.c_str());
+    try {
+        return (p_get_ref_obj_type(ref, ref_type));
+    }
+    catch (ReferenceException &E) {
+        throw ReferenceException(inMemFunc("getRefObjType"), E.getDetailMsg());
+    }
 }
 
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
 //--------------------------------------------------------------------------
-// Function:	H5Location::flush
-///\brief	Flushes all buffers associated with a location to disk.
-///\param	scope - IN: Specifies the scope of the flushing action,
-///		which can be either of these values:
-///		\li \c H5F_SCOPE_GLOBAL - Flushes the entire virtual file
-///		\li \c H5F_SCOPE_LOCAL - Flushes only the specified file
-///\exception	H5::Exception
-///\par Description
-///		This location is used to identify the file to be flushed.
-// Programmer	Binh-Minh Ribler - 2012
+// Function:    H5Location::p_get_ref_obj_type (protected)
+// Purpose      Retrieves the type of object that an object reference points to.
+// Parameters
+//              ref      - IN: Reference to query
+//              ref_type - IN: Type of reference to query
+// Return       An object type, which can be one of the following:
+//                      H5O_TYPE_UNKNOWN        - Unknown object type (-1)
+//                      H5O_TYPE_GROUP          - Object is a group
+//                      H5O_TYPE_DATASET        - Object is a dataset
+//                      H5O_TYPE_NAMED_DATATYPE - Object is a named datatype
+//                      H5O_TYPE_NTYPES         - Number of object types
+// Exception    H5::ReferenceException
+// Programmer   Binh-Minh Ribler - May, 2004
+//--------------------------------------------------------------------------
+H5O_type_t
+H5Location::p_get_ref_obj_type(void *ref, H5R_type_t ref_type) const
+{
+    H5O_type_t obj_type  = H5O_TYPE_UNKNOWN;
+    herr_t     ret_value = H5Rget_obj_type2(getId(), ref_type, ref, &obj_type);
+    if (ret_value < 0) {
+        throw ReferenceException(inMemFunc("getRefObjType"), "H5Rget_obj_type2 failed");
+    }
+    if (obj_type == H5O_TYPE_UNKNOWN || obj_type >= H5O_TYPE_NTYPES) {
+        throw ReferenceException(inMemFunc("getRefObjType"), "H5Rget_obj_type2 returned invalid type");
+    }
+    return (obj_type);
+}
+#endif // DOXYGEN_SHOULD_SKIP_THIS
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::getRegion
+///\brief       Retrieves a dataspace with the region pointed to selected.
+///\param       ref      - IN: Reference to get region of
+///\param       ref_type - IN: Type of reference to get region of - default
+//                             to H5R_DATASET_REGION
+///\return      DataSpace object
+///\exception   H5::ReferenceException
+// Programmer   Binh-Minh Ribler - May, 2004
 // Modification
-//	Sep 2012 - BMR
-//		Moved from H5File/H5Object
+//      Mar 29, 2015
+//              Used friend function to set id for DataSpace instead of the
+//              existing id constructor or the setId method to avoid incrementing
+//              ref count, as a work-around for a problem described in the JIRA
+//              issue HDFFV-7947. -BMR
+//--------------------------------------------------------------------------
+DataSpace
+H5Location::getRegion(void *ref, H5R_type_t ref_type) const
+{
+    hid_t space_id = H5Rget_region(getId(), ref_type, ref);
+    if (space_id < 0) {
+        throw ReferenceException(inMemFunc("getRegion"), "H5Rget_region failed");
+    }
+    try {
+        DataSpace dataspace;
+        f_DataSpace_setId(&dataspace, space_id);
+        return (dataspace);
+    }
+    catch (DataSpaceIException &E) {
+        throw ReferenceException(inMemFunc("getRegion"), E.getDetailMsg());
+    }
+}
+
+// From H5CommonFG.cpp
+// Notes with "***Updated" are new and for Group.cpp
+// Original notes are from December 2000
+//
+// There are a few comments that are common to most of the functions
+// defined in this file so they are listed here.
+// - getLocId is called by all functions, that call a C API, to get
+//   the location id, which can be either a file id or a group id.
+//   This function is pure virtual and it's up to H5File and Group
+//   to call the right getId() - although, as the structure of the
+//   library at this time, getId() is basically the IdComponent::getId()
+//   ***Updated: after the classes are rearranged (HDFFV-9920), functions
+//               in CommonFG are moved to Group, and they can call getId()
+//               instead of getLocId().  getLocId() is kept for backward
+//               compatibility on user applications.  Aug 18, 2016 -BMR
+//   ***Updated: Moving to Group was a mistake, now to H5Location
+//               Aug 24, 2016 -BMR
+// - when a failure returned by the C API, the functions will call
+//   throwException, which is a pure virtual function and is implemented
+//   by H5File to throw a FileIException and by Group to throw a
+//   GroupIException.
+//   ***Updated: after HDFFV-9920, methods in classes H5Location and Group
+//   use throwException to distinguish the FileIException and GroupIException.
+//   CommonFG is no longer used in the library.  Aug 18, 2016 -BMR
+//   H5Location::throwException is changed to throw LocationException for any
+//   subclass that is not H5File or Group.  Aug 14, 2017 -BMR
+//   ***Note: following the changes in HDFFV-9920, some of the methods could
+//   throw different exceptions, but for backward-compatibility, throwException
+//   is kept in those methods as well. Sep 17, 2016 -BMR
+//
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::createGroup
+///\brief       Creates a new group at this location, which can be a file,
+///             group, dataset, attribute, or named datatype.
+///\param       name  - IN: Name of the group to create
+///\param       size_hint - IN: Indicates the number of bytes to reserve for
+///             the names that will appear in the group
+///\return      Group instance
+///\exception   H5::FileIException/H5::GroupIException/H5::LocationException
+///\par Description
+///             The optional \a size_hint specifies how much file space to
+///             reserve for storing the names that will appear in this new
+///             group. If a non-positive value is provided for the \a size_hint
+///             then a default size is chosen.
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+Group
+H5Location::createGroup(const char *name, const LinkCreatPropList &lcpl) const
+{
+    // Call C routine H5Gcreate2 to create the named group, giving the
+    // location id which can be a file id or a group id
+    hid_t group_id = H5Gcreate2(getId(), name, lcpl.getId(), H5P_DEFAULT, H5P_DEFAULT);
+
+    // If the creation of the group failed, throw an exception
+    if (group_id < 0)
+        throwException("createGroup", "H5Gcreate2 failed");
+
+    // No failure, create and return the Group object
+    Group       group;
+    H5Location *ptr = &group;
+    ptr->p_setId(group_id);
+    return (group);
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::createGroup
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes an
+///             \c H5std_string for \a name.
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+Group
+H5Location::createGroup(const H5std_string &name, const LinkCreatPropList &lcpl) const
+{
+    return (createGroup(name.c_str(), lcpl));
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::createGroup
+///\brief       Creates a new group at this location, which can be a file,
+///             group, dataset, attribute, or named datatype.
+///\param       name  - IN: Name of the group to create
+///\param       size_hint - IN: Indicates the number of bytes to reserve for
+///             the names that will appear in the group
+///\return      Group instance
+///\exception   H5::FileIException/H5::GroupIException/H5::LocationException
+///\par Description
+///             The optional \a size_hint specifies how much file space to
+///             reserve for storing the names that will appear in this new
+///             group. If a non-positive value is provided for the \a size_hint
+///             then a default size is chosen.
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+Group
+H5Location::createGroup(const char *name, size_t size_hint) const
+{
+    // Group creation property list for size hint
+    hid_t gcpl_id = 0;
+
+    // Set the local heap size hint
+    if (size_hint > 0) {
+        // If the creation of the property list failed, throw an exception
+        if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0)
+            throwException("createGroup", "H5Pcreate failed");
+
+        if (H5Pset_local_heap_size_hint(gcpl_id, size_hint) < 0) {
+            H5Pclose(gcpl_id);
+            throwException("createGroup", "H5Pset_local_heap_size_hint failed");
+        }
+    }
+
+    // Call C routine H5Gcreate2 to create the named group, giving the
+    // location id which can be a file id or a group id
+    hid_t group_id = H5Gcreate2(getId(), name, H5P_DEFAULT, gcpl_id, H5P_DEFAULT);
+
+    // Close the group creation property list, if necessary
+    if (gcpl_id > 0)
+        H5Pclose(gcpl_id);
+
+    // If the creation of the group failed, throw an exception
+    if (group_id < 0)
+        throwException("createGroup", "H5Gcreate2 failed");
+
+    // No failure, create and return the Group object
+    Group       group;
+    H5Location *ptr = &group;
+    ptr->p_setId(group_id);
+    return (group);
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::createGroup
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes an
+///             \c H5std_string for \a name.
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+Group
+H5Location::createGroup(const H5std_string &name, size_t size_hint) const
+{
+    return (createGroup(name.c_str(), size_hint));
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::openGroup
+///\brief       Opens an existing group in a location which can be a file
+///             or another group.
+///\param       name  - IN: Name of the group to open
+///\return      Group instance
+///\exception   H5::FileIException/H5::GroupIException/H5::LocationException
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+Group
+H5Location::openGroup(const char *name) const
+{
+    // Call C routine H5Gopen2 to open the named group, giving the
+    // location id which can be a file id or a group id
+    hid_t group_id = H5Gopen2(getId(), name, H5P_DEFAULT);
+
+    // If the opening of the group failed, throw an exception
+    if (group_id < 0)
+        throwException("openGroup", "H5Gopen2 failed");
+
+    // No failure, create and return the Group object
+    Group group;
+    // group.p_setId(group_id);
+    H5Location *ptr = &group;
+    ptr->p_setId(group_id);
+    return (group);
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::openGroup
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes an
+///             \c H5std_string for \a name.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void H5Location::flush(H5F_scope_t scope) const
+Group
+H5Location::openGroup(const H5std_string &name) const
 {
-   herr_t ret_value = H5Fflush(getId(), scope);
-   if( ret_value < 0 )
-   {
-      throw LocationException(inMemFunc("flush"), "H5Fflush failed");
-   }
+    return (openGroup(name.c_str()));
 }
 
 //--------------------------------------------------------------------------
-// Function:	H5Location::getFileName
-///\brief	Gets the name of the file, in which this HDF5 object belongs.
-///\return	File name
-///\exception	H5::LocationException
-// Programmer	Binh-Minh Ribler - Jul, 2004
+// Function:    H5Location::createDataSet
+///\brief       Creates a new dataset at this location.
+///\param       name       - IN: Name of the dataset to create
+///\param       data_type  - IN: Datatype of the dataset
+///\param       data_space - IN: Dataspace for the dataset
+///\param       dcpl       - IN: Dataset creation properly list
+///\param       lcpl       - IN: Link creation properly list
+///\param       dapl       - IN: Dataset access properly list
+///\return      DataSet instance
+///\exception   H5::FileIException/H5::GroupIException/H5::LocationException
+// 2000
+// Modification:
+//      Jul 2018
+//              Added LinkCreatPropList and DSetAccPropList but did not
+//              follow the order in the C function: lcpl, dcpl, dapl, to
+//              accommodate the existing createDataSet calls.
+//--------------------------------------------------------------------------
+DataSet
+H5Location::createDataSet(const char *name, const DataType &data_type, const DataSpace &data_space,
+                          const DSetCreatPropList &dcpl, const DSetAccPropList &dapl,
+                          const LinkCreatPropList &lcpl) const
+{
+    // Obtain identifiers for C API
+    hid_t type_id  = data_type.getId();
+    hid_t space_id = data_space.getId();
+    hid_t dcpl_id  = dcpl.getId();
+    hid_t lcpl_id  = lcpl.getId();
+    hid_t dapl_id  = dapl.getId();
+
+    // Call C routine H5Dcreate2 to create the named dataset
+    hid_t dataset_id = H5Dcreate2(getId(), name, type_id, space_id, lcpl_id, dcpl_id, dapl_id);
+
+    // If the creation of the dataset failed, throw an exception
+    if (dataset_id < 0)
+        throwException("createDataSet", "H5Dcreate2 failed");
+
+    // No failure, create and return the DataSet object
+    DataSet dataset;
+    f_DataSet_setId(&dataset, dataset_id);
+    return (dataset);
+}
+
 //--------------------------------------------------------------------------
-H5std_string H5Location::getFileName() const
+// Function:    H5Location::createDataSet
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes an
+///             \c H5std_string for \a name.
+// 2000
+// Modification:
+//      Jul 2018
+//              Added LinkCreatPropList and DSetAccPropList but did not
+//              follow the order in the C function: lcpl, dcpl, dapl, to
+//              accommodate the existing createDataSet calls.
+//--------------------------------------------------------------------------
+DataSet
+H5Location::createDataSet(const H5std_string &name, const DataType &data_type, const DataSpace &data_space,
+                          const DSetCreatPropList &dcpl, const DSetAccPropList &dapl,
+                          const LinkCreatPropList &lcpl) const
 {
-   try {
-      return(p_get_file_name());
-   }
-   catch (LocationException E) {
-      throw FileIException(inMemFunc("getFileName"), E.getDetailMsg());
-   }
+    return (createDataSet(name.c_str(), data_type, data_space, dcpl, dapl, lcpl));
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::openDataSet
+///\brief       Opens an existing dataset at this location.
+///\param       name  - IN: Name of the dataset to open
+///\return      DataSet instance
+///\exception   H5::FileIException/H5::GroupIException/H5::LocationException
+// 2000
+// Modification:
+//      Jul 2018
+//              Added DSetAccPropList argument
+//--------------------------------------------------------------------------
+DataSet
+H5Location::openDataSet(const char *name, const DSetAccPropList &dapl) const
+{
+    // Call C function H5Dopen2 to open the specified dataset, giving
+    // the location id and the dataset's name
+    hid_t dapl_id    = dapl.getId();
+    hid_t dataset_id = H5Dopen2(getId(), name, dapl_id);
+
+    // If the dataset's opening failed, throw an exception
+    if (dataset_id < 0)
+        throwException("openDataSet", "H5Dopen2 failed");
+
+    // No failure, create and return the DataSet object
+    DataSet dataset;
+    f_DataSet_setId(&dataset, dataset_id);
+    return (dataset);
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::openDataSet
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes an
+///             \c H5std_string for \a name.
+// 2000
+// Modification:
+//      Jul 2018
+//              Added DSetAccPropList argument
+//--------------------------------------------------------------------------
+DataSet
+H5Location::openDataSet(const H5std_string &name, const DSetAccPropList &dapl) const
+{
+    return (openDataSet(name.c_str(), dapl));
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::link
+///\brief       Creates a soft link from \a link_name to \a target_name.
+///\param       target_name - IN: Name of object, can be a non-existing object
+///\param       link_name   - IN: Link name for the target name
+///\param       lcpl - IN: Link creation plist - default to LinkCreatPropList::DEFAULT
+///\param       lapl - IN: Link access plist - default to LinkAccPropList::DEFAULT
+///\exception   H5::FileIException or H5::GroupIException
+///\par Description
+///             Note that both names are interpreted relative to the current
+///             location.
+///             For information on creating a soft link, please refer to the
+///             H5Lcreate_soft APIs in the HDF5 C Reference Manual.
+//  March 2018
+//--------------------------------------------------------------------------
+void
+H5Location::link(const char *target_name, const char *link_name, const LinkCreatPropList &lcpl,
+                 const LinkAccPropList &lapl) const
+{
+    herr_t ret_value = -1;
+    hid_t  lcpl_id   = lcpl.getId();
+    hid_t  lapl_id   = lapl.getId();
+
+    ret_value = H5Lcreate_soft(target_name, getId(), link_name, lcpl_id, lapl_id);
+    if (ret_value < 0)
+        throwException("link", "creating soft link failed");
 }
 
 //--------------------------------------------------------------------------
-// Function:	H5Location::setComment
-///\brief	Sets or resets the comment for an object specified by its name.
-///\param	name  - IN: Name of the object
-///\param	comment - IN: New comment
-///\exception	H5::LocationException
-///\par	Description
-///		If \a comment is an empty string or a null pointer, the comment
-///		message is removed from the object.
-///		Comments should be relatively short, null-terminated, ASCII
-///		strings.  They can be attached to any object that has an
-///		object header, e.g., data sets, groups, named data types,
-///		and data spaces, but not symbolic links.
-// Programmer	Binh-Minh Ribler - 2000 (moved from CommonFG, Sep 2013)
+// Function:    H5Location::link
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes an
+///             \c H5std_string for \a target_name and \a link_name.
+///\exception   H5::FileIException or H5::GroupIException
+// March, 2018
+//--------------------------------------------------------------------------
+void
+H5Location::link(const H5std_string &target_name, const H5std_string &link_name,
+                 const LinkCreatPropList &lcpl, const LinkAccPropList &lapl) const
+{
+    link(target_name.c_str(), link_name.c_str(), lcpl, lapl);
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::link
+///\brief       Creates a hard link from \a new_name to \a curr_name.
+///\param       curr_name - IN: Name of the existing object
+///\param       new_loc   - IN: New group or root group
+///\param       new_name  - IN: New name for the object
+///\param       lcpl - IN: Link creation plist - default to LinkCreatPropList::DEFAULT
+///\param       lapl - IN: Link access plist - default to LinkAccPropList::DEFAULT
+///\exception   H5::FileIException or H5::GroupIException
+///\par Description
+///             Note that both names are interpreted relative to the
+///             specified location.
+///             For information on creating a hard link, please refer to the
+///             H5Lcreate_hard APIs in the HDF5 C Reference Manual.
+//  March 2018
+//--------------------------------------------------------------------------
+void
+H5Location::link(const char *curr_name, const Group &new_loc, const char *new_name,
+                 const LinkCreatPropList &lcpl, const LinkAccPropList &lapl) const
+{
+    herr_t ret_value  = -1;
+    hid_t  new_loc_id = new_loc.getId();
+    hid_t  lcpl_id    = lcpl.getId();
+    hid_t  lapl_id    = lapl.getId();
+
+    ret_value = H5Lcreate_hard(getId(), curr_name, new_loc_id, new_name, lcpl_id, lapl_id);
+    if (ret_value < 0)
+        throwException("link", "creating link failed");
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::link
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes an
+///             \c H5std_string for \a curr_name and \a new_name.
+///\exception   H5::FileIException or H5::GroupIException
+// March, 2018
+//--------------------------------------------------------------------------
+void
+H5Location::link(const H5std_string &curr_name, const Group &new_loc, const H5std_string &new_name,
+                 const LinkCreatPropList &lcpl, const LinkAccPropList &lapl) const
+{
+    link(curr_name.c_str(), new_loc, new_name.c_str(), lcpl, lapl);
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::link
+///\brief       Creates a hard link from \a new_name to \a curr_name - can be
+///             used to pass in H5L_SAME_LOC.
+///\param       curr_name - IN: Name of the existing object
+///\param       loc_id    - IN: Group or root group ID, or H5L_SAME_LOC
+///\param       new_name  - IN: New name for the link
+///\param       lcpl - IN: Link creation plist - default to LinkCreatPropList::DEFAULT
+///\param       lapl - IN: Link access plist - default to LinkAccPropList::DEFAULT
+///\exception   H5::FileIException or H5::GroupIException
+///\par Description
+///             Note that both names are interpreted relative to the
+///             specified location.
+///             For information on creating a hard link, please refer to the
+///             H5Lcreate_hard APIs in the HDF5 C Reference Manual.
+//  March 2018
+//--------------------------------------------------------------------------
+void
+H5Location::link(const char *curr_name, const hid_t same_loc, const char *new_name,
+                 const LinkCreatPropList &lcpl, const LinkAccPropList &lapl) const
+{
+    herr_t ret_value = -1;
+    hid_t  lcpl_id   = lcpl.getId();
+    hid_t  lapl_id   = lapl.getId();
+
+    ret_value = H5Lcreate_hard(getId(), curr_name, same_loc, new_name, lcpl_id, lapl_id);
+
+    if (ret_value < 0)
+        throwException("link", "creating link failed");
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::link
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes an
+///             \c H5std_string for \a curr_name and \a new_name.
+///\exception   H5::FileIException or H5::GroupIException
+// March, 2018
+//--------------------------------------------------------------------------
+void
+H5Location::link(const H5std_string &curr_name, const hid_t same_loc, const H5std_string &new_name,
+                 const LinkCreatPropList &lcpl, const LinkAccPropList &lapl) const
+{
+    link(curr_name.c_str(), same_loc, new_name.c_str(), lcpl, lapl);
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::link
+///\brief       Creates a link of the specified type from \a new_name to
+///             \a curr_name.
+///\param       link_type  - IN: Link type; possible values are
+///             \li \c H5G_LINK_HARD
+///             \li \c H5G_LINK_SOFT
+///\param       curr_name - IN: Name of the existing object if link is a hard
+///             link; can be anything for the soft link
+///\param       new_name - IN: New name for the object
+///\exception   H5::FileIException/H5::GroupIException/H5::LocationException
+///\par Description
+///             Note that both names are interpreted relative to the
+///             specified location.
+///             For information on creating hard link and soft link, please
+///             refer to the H5Lcreate_hard and H5Lcreate_soft APIs in the
+///             HDF5 C Reference Manual.
+// Programmer   Binh-Minh Ribler - 2000
 // Modification
-//	2007: QAK modified to use H5O APIs; however the first parameter is
-//		no longer just file or group, this function should be moved
-//		to another class to accommodate attribute, dataset, and named
-//		datatype. - BMR
+//        2007: QAK modified to use H5L APIs - BMR
+//        Mar 2018: Inadequate functionality, new hard link is only in
+//              H5L_SAME_LOC.  This function will be retired in favor of
+//              its replacement. - BMR
+//--------------------------------------------------------------------------
+void
+H5Location::link(H5L_type_t link_type, const char *curr_name, const char *new_name) const
+{
+    herr_t ret_value = -1;
+
+    switch (link_type) {
+        case H5L_TYPE_HARD:
+            ret_value = H5Lcreate_hard(getId(), curr_name, H5L_SAME_LOC, new_name, H5P_DEFAULT, H5P_DEFAULT);
+            break;
+
+        case H5L_TYPE_SOFT:
+            ret_value = H5Lcreate_soft(curr_name, getId(), new_name, H5P_DEFAULT, H5P_DEFAULT);
+            break;
+
+        case H5L_TYPE_ERROR:
+        case H5L_TYPE_EXTERNAL:
+        case H5L_TYPE_MAX:
+        default:
+            throwException("link", "unknown link type");
+            break;
+    } /* end switch */
+
+    if (ret_value < 0)
+        throwException("link", "creating link failed");
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::link
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes an
+///             \c H5std_string for \a curr_name and \a new_name.
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+void
+H5Location::link(H5L_type_t link_type, const H5std_string &curr_name, const H5std_string &new_name) const
+{
+    link(link_type, curr_name.c_str(), new_name.c_str());
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::copyLink
+///\brief       Copies a link from one group to another.
+///\param       src_name - IN: Original name
+///\param       dst      - IN: Destination location
+///\param       dst_name - IN: New name
+///\param       lcpl     - IN: Link creation plist - default LinkCreatPropList::DEFAULT
+///\param       lapl     - IN: Link access plist - default LinkAccPropList::DEFAULT
+///\exception   H5::FileIException or H5::GroupIException
+// March, 2018
+//--------------------------------------------------------------------------
+void
+H5Location::copyLink(const char *src_name, const Group &dst, const char *dst_name,
+                     const LinkCreatPropList &lcpl, const LinkAccPropList &lapl) const
+{
+    herr_t ret_value;
+    hid_t  dst_id  = dst.getId();
+    hid_t  lcpl_id = lcpl.getId();
+    hid_t  lapl_id = lapl.getId();
+
+    ret_value = H5Lcopy(getId(), src_name, dst_id, dst_name, lcpl_id, lapl_id);
+    if (ret_value < 0)
+        throwException("copyLink", "H5Lcopy failed");
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::copyLink
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes an
+///             \c H5std_string for \a src_name and \a dst_name.
+///\exception   H5::FileIException or H5::GroupIException
+// March, 2018
+//--------------------------------------------------------------------------
+void
+H5Location::copyLink(const H5std_string &src_name, const Group &dst, const H5std_string &dst_name,
+                     const LinkCreatPropList &lcpl, const LinkAccPropList &lapl) const
+{
+    copyLink(src_name.c_str(), dst, dst_name.c_str(), lcpl, lapl);
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::copyLink
+///\brief       Copies a link from a group in the same location.
+///\param       src_name - IN: Original name
+///\param       dst_name - IN: New name
+///\param       lcpl     - IN: Link creation plist - default LinkCreatPropList::DEFAULT
+///\param       lapl     - IN: Link access plist - default LinkAccPropList::DEFAULT
+///\exception   H5::FileIException or H5::GroupIException
+// March, 2018
+//--------------------------------------------------------------------------
+void
+H5Location::copyLink(const char *src_name, const char *dst_name, const LinkCreatPropList &lcpl,
+                     const LinkAccPropList &lapl) const
+{
+    herr_t ret_value;
+    hid_t  lcpl_id = lcpl.getId();
+    hid_t  lapl_id = lapl.getId();
+
+    ret_value = H5Lcopy(getId(), src_name, H5L_SAME_LOC, dst_name, lcpl_id, lapl_id);
+    if (ret_value < 0)
+        throwException("copyLink", "H5Lcopy H5L_SAME_LOC failed");
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::copyLink
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes an
+///             \c H5std_string for \a src_name and \a dst_name.
+///\exception   H5::FileIException or H5::GroupIException
+// March, 2018
+//--------------------------------------------------------------------------
+void
+H5Location::copyLink(const H5std_string &src_name, const H5std_string &dst_name,
+                     const LinkCreatPropList &lcpl, const LinkAccPropList &lapl) const
+{
+    copyLink(src_name.c_str(), dst_name.c_str(), lcpl, lapl);
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::moveLink
+///\brief       Renames a link in this group and moves it to a new location.
+///\param       src_name - IN: Original name
+///\param       dst      - IN: Destination location
+///\param       dst_name - IN: New name
+///\param       lcpl     - IN: Link creation plist - default LinkCreatPropList::DEFAULT
+///\param       lapl     - IN: Link access plist - default LinkAccPropList::DEFAULT
+///\exception   H5::FileIException or H5::GroupIException
+///\note
+///             Exercise care in moving groups as it is possible to render
+///             data in a file inaccessible with H5Location::moveLink. Please refer
+///             to the Group Interface in the HDF5 User's Guide for details.
+// March, 2018
+//--------------------------------------------------------------------------
+void
+H5Location::moveLink(const char *src_name, const Group &dst, const char *dst_name,
+                     const LinkCreatPropList &lcpl, const LinkAccPropList &lapl) const
+{
+    herr_t ret_value;
+    hid_t  dst_id  = dst.getId();
+    hid_t  lcpl_id = lcpl.getId();
+    hid_t  lapl_id = lapl.getId();
+
+    ret_value = H5Lmove(getId(), src_name, dst_id, dst_name, lcpl_id, lapl_id);
+    if (ret_value < 0)
+        throwException("moveLink", "H5Lmove failed");
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::moveLink
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes an
+///             \c H5std_string for \a src_name and \a dst_name.
+///\exception   H5::FileIException or H5::GroupIException
+// March, 2018
+//--------------------------------------------------------------------------
+void
+H5Location::moveLink(const H5std_string &src_name, const Group &dst, const H5std_string &dst_name,
+                     const LinkCreatPropList &lcpl, const LinkAccPropList &lapl) const
+{
+    moveLink(src_name.c_str(), dst, dst_name.c_str(), lcpl, lapl);
+}
+
 //--------------------------------------------------------------------------
-void H5Location::setComment(const char* name, const char* comment) const
+// Function:    H5Location::moveLink
+///\brief       Renames a link in this group.
+///\param       src_name - IN: Original name
+///\param       dst_name - IN: New name
+///\param       lcpl     - IN: Link creation plist - default LinkCreatPropList::DEFAULT
+///\param       lapl     - IN: Link access plist - default LinkAccPropList::DEFAULT
+///\exception   H5::FileIException or H5::GroupIException
+///\note
+///             Exercise care in moving groups as it is possible to render
+///             data in a file inaccessible with H5Location::moveLink. Please refer
+///             to the Group Interface in the HDF5 User's Guide for details.
+// March, 2018
+//--------------------------------------------------------------------------
+void
+H5Location::moveLink(const char *src_name, const char *dst_name, const LinkCreatPropList &lcpl,
+                     const LinkAccPropList &lapl) const
 {
-   herr_t ret_value = H5Oset_comment_by_name(getId(), name, comment, H5P_DEFAULT);
-   if( ret_value < 0 )
-      throw LocationException(inMemFunc("setComment"), "H5Oset_comment_by_name failed");
+    herr_t ret_value;
+    hid_t  lcpl_id = lcpl.getId();
+    hid_t  lapl_id = lapl.getId();
+
+    ret_value = H5Lmove(getId(), src_name, H5L_SAME_LOC, dst_name, lcpl_id, lapl_id);
+    if (ret_value < 0)
+        throwException("moveLink", "H5Lmove H5L_SAME_LOC failed");
 }
 
 //--------------------------------------------------------------------------
-// Function:	H5Location::setComment
-///\brief	This is an overloaded member function, provided for convenience.
-///		It differs from the above function in that it takes an
-///		\c H5std_string for \a name and \a comment.
-// Programmer	Binh-Minh Ribler - 2000 (moved from CommonFG, Sep 2013)
+// Function:    H5Location::moveLink
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes an
+///             \c H5std_string for \a src_name and \a dst_name.
+///\exception   H5::FileIException or H5::GroupIException
+// March, 2018
 //--------------------------------------------------------------------------
-void H5Location::setComment(const H5std_string& name, const H5std_string& comment) const
+void
+H5Location::moveLink(const H5std_string &src_name, const H5std_string &dst_name,
+                     const LinkCreatPropList &lcpl, const LinkAccPropList &lapl) const
 {
-   setComment(name.c_str(), comment.c_str());
+    moveLink(src_name.c_str(), dst_name.c_str(), lcpl, lapl);
 }
 
 //--------------------------------------------------------------------------
-// Function:	H5Location::setComment
-///\brief	This is an overloaded member function, provided for convenience.
-///		It differs from the above function in that it doesn't take
-///		an object name.
-// Programmer	Binh-Minh Ribler - Sep 2013
+// Function:    H5Location::move
+///\brief       Renames an object at this location. - Deprecated due to inadequate functionality
+///\param       src - IN: Object's original name
+///\param       dst - IN: Object's new name
+///\exception   H5::FileIException/H5::GroupIException/H5::LocationException
+///\note
+///             Exercise care in moving groups as it is possible to render
+///             data in a file inaccessible with H5Location::move. Please refer
+///             to the Group Interface in the HDF5 User's Guide for details.
 // Modification
+//      2007: QAK modified to use H5L APIs - BMR
+//      2018: Will be replaced by H5Location::moveLink() -BMR
 //--------------------------------------------------------------------------
-void H5Location::setComment(const char* comment) const
+void
+H5Location::move(const char *src, const char *dst) const
 {
-   herr_t ret_value = H5Oset_comment_by_name(getId(), ".", comment, H5P_DEFAULT);
-   if( ret_value < 0 )
-      throw LocationException(inMemFunc("setComment"), "H5Oset_comment_by_name failed");
+    moveLink(src, dst, LinkCreatPropList::DEFAULT, LinkAccPropList::DEFAULT);
 }
 
 //--------------------------------------------------------------------------
-// Function:	H5Location::setComment
-///\brief	This is an overloaded member function, provided for convenience.
-///		It differs from the above function in that it takes an
-///		\c H5std_string for \a comment.
-// Programmer	Binh-Minh Ribler - Sep 2013
+// Function:    H5Location::move
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes an
+///             \c H5std_string for \a src and \a dst. - Deprecated due to inadequate functionality
+// Modification
+//      2018: Will be replaced by H5Location::moveLink() -BMR
 //--------------------------------------------------------------------------
-void H5Location::setComment(const H5std_string& comment) const
+void
+H5Location::move(const H5std_string &src, const H5std_string &dst) const
 {
-   setComment(comment.c_str());
+    moveLink(src.c_str(), dst.c_str(), LinkCreatPropList::DEFAULT, LinkAccPropList::DEFAULT);
 }
 
 //--------------------------------------------------------------------------
-// Function:	H5Location::removeComment
-///\brief	Removes the comment from an object specified by its name.
-///\param	name  - IN: Name of the object
-///\exception	H5::LocationException
-// Programmer	Binh-Minh Ribler - May 2005 (moved from CommonFG, Sep 2013)
-//	2007: QAK modified to use H5O APIs; however the first parameter is
-//		no longer just file or group, this function should be moved
-//		to another class to accommodate attribute, dataset, and named
-//		datatype. - BMR
+// Function:    H5Location::unlink
+///\brief       Removes the specified link from this group.
+///\param       name  - IN: Name of the object to be removed
+///\exception   H5::FileIException/H5::GroupIException/H5::LocationException
+// March, 2018
 //--------------------------------------------------------------------------
-void H5Location::removeComment(const char* name) const
+void
+H5Location::unlink(const char *name, const LinkAccPropList &lapl) const
 {
-   herr_t ret_value = H5Oset_comment_by_name(getId(), name, NULL, H5P_DEFAULT);
-   if( ret_value < 0 )
-      throw LocationException(inMemFunc("removeComment"), "H5Oset_comment_by_name failed");
+    herr_t ret_value = H5Ldelete(getId(), name, lapl.getId());
+    if (ret_value < 0)
+        throwException("unlink", "H5Ldelete failed");
 }
 
 //--------------------------------------------------------------------------
-// Function:	H5Location::removeComment
-///\brief	This is an overloaded member function, provided for convenience.
-///		It differs from the above function in that it takes an
-///		\c H5std_string for \a name.
-// Programmer	Binh-Minh Ribler - May 2005 (moved from CommonFG, Sep 2013)
+// Function:    H5Location::unlink
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes an
+///             \c H5std_string for \a name.
+// March, 2018
 //--------------------------------------------------------------------------
-void H5Location::removeComment(const H5std_string& name) const
+void
+H5Location::unlink(const H5std_string &name, const LinkAccPropList &lapl) const
 {
-   removeComment (name.c_str());
+    unlink(name.c_str(), lapl);
 }
 
 //--------------------------------------------------------------------------
-// Function:	H5Location::getComment
-///\brief	Retrieves the comment for this location, returning its length.
-///\param	name     - IN: Name of the object
-///\param	buf_size - IN: Length of the comment to retrieve
-///\param	comment  - OUT: Retrieved comment
-///\return	Actual length of the comment
-///\exception	H5::LocationException
+// Function:    H5Location::getNativeObjinfo
+///\brief       Retrieves native information about an HDF5 object.
+///\param       objinfo - OUT: Struct containing the native object info
+///\param       fields  - IN: Indicates the group of information to be retrieved
 ///\par Description
-///		This function retrieves \a buf_size characters of the comment
-///		including the null terminator.  Thus, if the actual length
-///		of the comment is more than buf_size-1, the retrieved comment
-///		will be truncated to accommodate the null terminator.
-// Programmer	Binh-Minh Ribler - Mar 2014
+///             Valid values of \a fields are as follows:
+///             \li \c H5O_INFO_HDR (default)
+///             \li \c H5O_INFO_META_SIZE
+///             \li \c H5O_INFO_ALL
+// July, 2018
+//--------------------------------------------------------------------------
+void
+H5Location::getNativeObjinfo(H5O_native_info_t &objinfo, unsigned fields) const
+{
+
+    // Use C API to get information of the object
+    herr_t ret_value = H5Oget_native_info(getId(), &objinfo, fields);
+
+    // Throw exception if C API returns failure
+    if (ret_value < 0)
+        throwException(inMemFunc("getNativeObjinfo"), "H5Oget_native_info failed");
+}
+
 //--------------------------------------------------------------------------
-ssize_t H5Location::getComment(const char* name, size_t buf_size, char* comment) const
+// Function:    H5Location::getNativeObjinfo
+///\brief       Retrieves native information about an HDF5 object given its name.
+///\param       name    - IN: Name of the object to be queried - \c char *
+///\param       objinfo - OUT: Struct containing the native object info
+///\param       fields  - IN: Indicates the group of information to be retrieved
+///                           - default to H5O_INFO_HDR
+///\param       lapl - IN: Link access property list
+///\par Description
+///             Valid values of \a fields are as follows:
+///             \li \c H5O_INFO_HDR (default)
+///             \li \c H5O_INFO_META_SIZE
+///             \li \c H5O_INFO_ALL
+// July, 2018
+//--------------------------------------------------------------------------
+void
+H5Location::getNativeObjinfo(const char *name, H5O_native_info_t &objinfo, unsigned fields,
+                             const LinkAccPropList &lapl) const
 {
-    // H5Oget_comment_by_name will get buf_size chars of the comment including
-    // the null terminator
-    ssize_t comment_len;
-    comment_len = H5Oget_comment_by_name(getId(), name, comment, buf_size, H5P_DEFAULT);
+    // Use C API to get information of the object
+    herr_t ret_value = H5Oget_native_info_by_name(getId(), name, &objinfo, fields, lapl.getId());
 
-    // If H5Oget_comment_by_name returns a negative value, raise an exception
-    if (comment_len < 0)
-    {
-        throw LocationException("H5Location::getComment", "H5Oget_comment_by_name failed");
-    }
-    // If the comment is longer than the provided buffer size, the C library
-    // will not null terminate it
-    if ((size_t)comment_len >= buf_size)
-	comment[buf_size-1] = '\0';
+    // Throw exception if C API returns failure
+    if (ret_value < 0)
+        throwException(inMemFunc("getNativeObjinfo"), "H5Oget_native_info_by_name failed");
+}
 
-    // Return the actual comment length, which might be different from buf_size
-    return(comment_len);
+//--------------------------------------------------------------------------
+// Function:    H5Location::getNativeObjinfo
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes
+///             a reference to an \c H5std_string for \a name.
+///\param       name    - IN: Name of the object to be queried - \c H5std_string
+///\param       objinfo - OUT: Struct containing the native object info
+///\param       fields  - IN: Indicates the group of information to be retrieved
+///                           - default to H5O_INFO_HDR
+///\param       lapl - IN: Link access property list
+// July, 2018
+//--------------------------------------------------------------------------
+void
+H5Location::getNativeObjinfo(const H5std_string &name, H5O_native_info_t &objinfo, unsigned fields,
+                             const LinkAccPropList &lapl) const
+{
+    getNativeObjinfo(name.c_str(), objinfo, fields, lapl);
 }
 
 //--------------------------------------------------------------------------
-// Function:	H5Location::getComment
-///\brief	Returns the comment as \a string for this location,
-///		returning its length.
-///\param	name     - IN: Name of the object
-///\param	buf_size - IN: Length of the comment to retrieve, default to 0
-///\return	Comment string
-///\exception	H5::LocationException
-// Programmer	Binh-Minh Ribler - 2000 (moved from CommonFG, Sep 2013)
+// Function:    H5Location::getNativeObjinfo
+///\brief       Retrieves native information about an HDF5 object given its index.
+///\param       grp_name - IN: Group name where the object belongs - \c char *
+///\param       idx_type - IN: Type of index
+///\param       order   - IN: Order to traverse
+///\param       idx     - IN: Object position
+///\param       objinfo - OUT: Struct containing the native object info
+///\param       fields  - IN: Indicates the group of information to be retrieved
+///                           - default to H5O_INFO_HDR
+///\param       lapl    - IN: Link access property list
+///\par Description
+///             Valid values of \a fields are as follows:
+///             \li \c H5O_INFO_HDR (default)
+///             \li \c H5O_INFO_META_SIZE
+///             \li \c H5O_INFO_ALL
+// July, 2018
+//--------------------------------------------------------------------------
+void
+H5Location::getNativeObjinfo(const char *grp_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t idx,
+                             H5O_native_info_t &objinfo, unsigned fields, const LinkAccPropList &lapl) const
+{
+    // Use C API to get information of the object
+    herr_t ret_value =
+        H5Oget_native_info_by_idx(getId(), grp_name, idx_type, order, idx, &objinfo, fields, lapl.getId());
+
+    // Throw exception if C API returns failure
+    if (ret_value < 0)
+        throwException(inMemFunc("getNativeObjinfo"), "H5Oget_native_info_by_idx failed");
+}
+
 //--------------------------------------------------------------------------
-H5std_string H5Location::getComment(const char* name, size_t buf_size) const
+// Function:    H5Location::getObjinfo
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes
+///             a reference to an \c H5std_string for \a name.
+///\param       name    - IN: Name of the object to be queried - \c H5std_string
+///\param       objinfo - OUT: Struct containing the native object info
+///\param       fields  - IN: Indicates a group of information to be retrieved
+///                           - default to H5O_INFO_HDR
+///\param       lapl - IN: Link access property list
+// July, 2018
+//--------------------------------------------------------------------------
+void
+H5Location::getNativeObjinfo(const H5std_string &grp_name, H5_index_t idx_type, H5_iter_order_t order,
+                             hsize_t idx, H5O_native_info_t &objinfo, unsigned fields,
+                             const LinkAccPropList &lapl) const
 {
-    // Initialize string to "", so that if there is no comment, the returned
-    // string will be empty
-    H5std_string comment("");
+    getNativeObjinfo(grp_name.c_str(), idx_type, order, idx, objinfo, fields, lapl);
+}
 
-    // Preliminary call to get the comment's length
-    ssize_t comment_len = H5Oget_comment_by_name(getId(), name, NULL, (size_t)0, H5P_DEFAULT);
+//--------------------------------------------------------------------------
+// Function:    H5Location::getObjinfo
+///\brief       Retrieves information about an HDF5 object.
+///\param       objinfo - OUT: Struct containing the object info
+///\param       fields  - IN: Indicates the group of information to be retrieved
+///\par Description
+///             Valid values of \a fields are as follows:
+///             \li \c H5O_INFO_BASIC (default)
+///             \li \c H5O_INFO_TIME
+///             \li \c H5O_INFO_NUM_ATTRS
+///             \li \c H5O_INFO_HDR
+///             \li \c H5O_INFO_META_SIZE
+///             \li \c H5O_INFO_ALL
+// July, 2018
+//--------------------------------------------------------------------------
+void
+H5Location::getObjinfo(H5O_info2_t &objinfo, unsigned fields) const
+{
 
-    // If H5Oget_comment_by_name returns a negative value, raise an exception
-    if (comment_len < 0)
-    {
-        throw LocationException("H5Location::getComment", "H5Oget_comment_by_name failed");
-    }
+    // Use C API to get information of the object
+    herr_t ret_value = H5Oget_info3(getId(), &objinfo, fields);
 
-    // If comment exists, calls C routine again to get it
-    else if (comment_len > 0)
-    {
-	size_t tmp_len = buf_size;
+    // Throw exception if C API returns failure
+    if (ret_value < 0)
+        throwException(inMemFunc("getObjinfo"), "H5Oget_info3 failed");
+}
 
-	// If buffer size is not provided, use comment length
-	if (tmp_len == 0)
-	    tmp_len = comment_len;
+//--------------------------------------------------------------------------
+// Function:    H5Location::getObjinfo
+///\brief       Retrieves information about an HDF5 object given its name.
+///\param       name    - IN: Name of the object to be queried - \c char *
+///\param       objinfo - OUT: Struct containing the object info
+///\param       fields  - IN: Indicates the group of information to be retrieved
+///                           - default to H5O_INFO_BASIC
+///\param       lapl - IN: Link access property list
+///\par Description
+///             Valid values of \a fields are as follows:
+///             \li \c H5O_INFO_BASIC (default)
+///             \li \c H5O_INFO_TIME
+///             \li \c H5O_INFO_NUM_ATTRS
+///             \li \c H5O_INFO_HDR
+///             \li \c H5O_INFO_META_SIZE
+///             \li \c H5O_INFO_ALL
+// July, 2018
+//--------------------------------------------------------------------------
+void
+H5Location::getObjinfo(const char *name, H5O_info2_t &objinfo, unsigned fields,
+                       const LinkAccPropList &lapl) const
+{
+    // Use C API to get information of the object
+    herr_t ret_value = H5Oget_info_by_name3(getId(), name, &objinfo, fields, lapl.getId());
 
-	// Temporary buffer for char* comment
-	char* comment_C = new char[tmp_len+1];
-	HDmemset(comment_C, 0, tmp_len+1); // clear buffer
+    // Throw exception if C API returns failure
+    if (ret_value < 0)
+        throwException(inMemFunc("getObjinfo"), "H5Oget_info_by_name2 failed");
+}
 
-	// Used overloaded function
-	ssize_t comment_len = getComment(name, tmp_len+1, comment_C);
-	if (comment_len < 0)
-	{
-	    delete []comment_C;
-	    throw LocationException("H5Location::getComment", "H5Oget_comment_by_name failed");
-	}
+//--------------------------------------------------------------------------
+// Function:    H5Location::getObjinfo
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes
+///             a reference to an \c H5std_string for \a name.
+///\param       name    - IN: Name of the object to be queried - \c H5std_string
+///\param       objinfo - OUT: Struct containing the object info
+///\param       fields  - IN: Indicates the group of information to be retrieved
+///                           - default to H5O_INFO_BASIC
+///\param       lapl - IN: Link access property list
+// July, 2018
+//--------------------------------------------------------------------------
+void
+H5Location::getObjinfo(const H5std_string &name, H5O_info2_t &objinfo, unsigned fields,
+                       const LinkAccPropList &lapl) const
+{
+    getObjinfo(name.c_str(), objinfo, fields, lapl);
+}
 
-	// Convert the C comment to return
-	comment = comment_C;
+//--------------------------------------------------------------------------
+// Function:    H5Location::getObjinfo
+///\brief       Retrieves information about an HDF5 object given its index.
+///\param       grp_name - IN: Group name where the object belongs - \c char *
+///\param       idx_type - IN: Type of index
+///\param       order   - IN: Order to traverse
+///\param       idx     - IN: Object position
+///\param       objinfo - OUT: Struct containing the object info
+///\param       fields  - IN: Indicates the group of information to be retrieved
+///                           - default to H5O_INFO_BASIC
+///\param       lapl    - IN: Link access property list
+///\par Description
+///             Valid values of \a fields are as follows:
+///             \li \c H5O_INFO_BASIC (default)
+///             \li \c H5O_INFO_TIME
+///             \li \c H5O_INFO_NUM_ATTRS
+///             \li \c H5O_INFO_HDR
+///             \li \c H5O_INFO_META_SIZE
+///             \li \c H5O_INFO_ALL
+// July, 2018
+//--------------------------------------------------------------------------
+void
+H5Location::getObjinfo(const char *grp_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t idx,
+                       H5O_info2_t &objinfo, unsigned fields, const LinkAccPropList &lapl) const
+{
+    // Use C API to get information of the object
+    herr_t ret_value =
+        H5Oget_info_by_idx3(getId(), grp_name, idx_type, order, idx, &objinfo, fields, lapl.getId());
 
-	// Clean up resource
-	delete []comment_C;
-    }
+    // Throw exception if C API returns failure
+    if (ret_value < 0)
+        throwException(inMemFunc("getObjinfo"), "H5Oget_info_by_idx2 failed");
+}
 
-    // Return the string comment
-    return(comment);
+//--------------------------------------------------------------------------
+// Function:    H5Location::getObjinfo
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes
+///             a reference to an \c H5std_string for \a name.
+///\param       name    - IN: Name of the object to be queried - \c H5std_string
+///\param       objinfo - OUT: Struct containing the object info
+///\param       fields  - IN: Indicates a group of information to be retrieved
+///                           - default to H5O_INFO_BASIC
+///\param       lapl - IN: Link access property list
+// July, 2018
+//--------------------------------------------------------------------------
+void
+H5Location::getObjinfo(const H5std_string &grp_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t idx,
+                       H5O_info2_t &objinfo, unsigned fields, const LinkAccPropList &lapl) const
+{
+    getObjinfo(grp_name.c_str(), idx_type, order, idx, objinfo, fields, lapl);
 }
 
+#ifndef H5_NO_DEPRECATED_SYMBOLS
 //--------------------------------------------------------------------------
-// Function:	H5Location::getComment
-///\brief	This is an overloaded member function, provided for convenience.
-///		It differs from the above function in that it takes an
-///		\c H5std_string for \a name.
-// Programmer	Binh-Minh Ribler - 2000 (moved from CommonFG, Sep 2013)
+// Function:    H5Location::getObjinfo
+///\brief       Returns information about an object.
+///\param       name  - IN: Name of the object
+///\param       follow_link - IN: Link flag
+///\param       statbuf - OUT: Buffer to return information about the object
+///\exception   H5::FileIException/H5::GroupIException/H5::LocationException
+///\par Description
+///             For information, please refer to the H5Gget_objinfo API in
+///             the HDF5 C Reference Manual.
+// 2000
 //--------------------------------------------------------------------------
-H5std_string H5Location::getComment(const H5std_string& name, size_t buf_size) const
+void
+H5Location::getObjinfo(const char *name, hbool_t follow_link, H5G_stat_t &statbuf) const
 {
-    return(getComment(name.c_str(), buf_size));
+    herr_t ret_value = H5Gget_objinfo(getId(), name, follow_link, &statbuf);
+    if (ret_value < 0)
+        throwException("getObjinfo", "H5Gget_objinfo failed");
 }
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 
 //--------------------------------------------------------------------------
-// Function:	H5Location::p_reference (protected)
-// Purpose	Creates a reference to an HDF5 object or a dataset region.
-// Parameters
-//		name - IN: Name of the object to be referenced
-//		dataspace - IN: Dataspace with selection
-//		ref_type - IN: Type of reference; default to \c H5R_DATASET_REGION
-// Exception	H5::ReferenceException
-// Programmer	Binh-Minh Ribler - May, 2004
+// Function:    H5Location::getObjinfo
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes an
+///             \c H5std_string for \a name.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void H5Location::p_reference(void* ref, const char* name, hid_t space_id, H5R_type_t ref_type) const
+void
+H5Location::getObjinfo(const H5std_string &name, hbool_t follow_link, H5G_stat_t &statbuf) const
 {
-   herr_t ret_value = H5Rcreate(ref, getId(), name, ref_type, space_id);
-   if (ret_value < 0)
-   {
-      throw ReferenceException(inMemFunc("reference"), "H5Rcreate failed");
-   }
+    getObjinfo(name.c_str(), follow_link, statbuf);
 }
 
-#endif // DOXYGEN_SHOULD_SKIP_THIS
+//--------------------------------------------------------------------------
+// Function:    H5Location::getObjinfo
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above functions in that it doesn't have
+///             the parameter \a follow_link.
+// Nov, 2005
+//--------------------------------------------------------------------------
+void
+H5Location::getObjinfo(const char *name, H5G_stat_t &statbuf) const
+{
+    herr_t ret_value = H5Gget_objinfo(getId(), name, 0, &statbuf);
+    if (ret_value < 0)
+        throwException("getObjinfo", "H5Gget_objinfo failed");
+}
 
 //--------------------------------------------------------------------------
-// Function:	H5Location::reference
-///\brief	Creates a reference to an HDF5 object or a dataset region.
-///\param	ref - IN: Reference pointer
-///\param	name - IN: Name of the object to be referenced
-///\param	dataspace - IN: Dataspace with selection
-///\param	ref_type - IN: Type of reference to query, valid values are:
-///		\li \c H5R_OBJECT         - Reference is an object reference.
-///		\li \c H5R_DATASET_REGION - Reference is a dataset region
-///			reference. (default)
-///\exception	H5::ReferenceException
-///\note	This method is more suitable for a dataset region reference.
-// Programmer	Binh-Minh Ribler - May, 2004
-//--------------------------------------------------------------------------
-void H5Location::reference(void* ref, const char* name, const DataSpace& dataspace, H5R_type_t ref_type) const
-{
-   try {
-      p_reference(ref, name, dataspace.getId(), ref_type);
-   }
-   catch (ReferenceException E) {
-      throw ReferenceException(inMemFunc("reference"), E.getDetailMsg());
-   }
-}
-
-//--------------------------------------------------------------------------
-// Function:	H5Location::reference
-///\brief	This is an overloaded member function, provided for convenience.
-///		It differs from the above function in that it takes an
-///		\c H5std_string for \a name.
-///\param	ref - IN: Reference pointer
-///\param	name - IN: Name of the object to be referenced
-///\param	dataspace - IN: Dataspace with selection
-///\param	ref_type - IN: Type of reference to query, valid values are:
-///		\li \c H5R_OBJECT         - Reference is an object reference.
-///		\li \c H5R_DATASET_REGION - Reference is a dataset region
-///			reference. (default)
-///\exception	H5::ReferenceException
-///\note	This method is more suitable for a dataset region reference.
-// Programmer	Binh-Minh Ribler - May, 2004
-//--------------------------------------------------------------------------
-void H5Location::reference(void* ref, const H5std_string& name, const DataSpace& dataspace, H5R_type_t ref_type) const
-{
-   try {
-      p_reference(ref, name.c_str(), dataspace.getId(), ref_type);
-   }
-   catch (ReferenceException E) {
-      throw ReferenceException(inMemFunc("reference"), E.getDetailMsg());
-   }
-}
-
-//--------------------------------------------------------------------------
-// Function:	H5Location::reference
-///\brief	This is an overloaded function, provided for your convenience.
-///		It differs from the above function in that it does not take
-///		a DataSpace object and the reference type must be specified.
-///\param	ref - IN: Reference pointer
-///\param	name - IN: Name of the object to be referenced
-///\param	ref_type - IN: Type of reference to query, valid values are:
-///		\li \c H5R_OBJECT         - Reference is an object reference (default)
-///		\li \c H5R_DATASET_REGION - Reference is a dataset region
-///\exception	H5::ReferenceException
-///\note	This method is more suitable for an object reference.
-// Programmer	Binh-Minh Ribler - May, 2004
-//--------------------------------------------------------------------------
-void H5Location::reference(void* ref, const char* name, H5R_type_t ref_type) const
-{
-   try {
-      p_reference(ref, name, -1, ref_type);
-   }
-   catch (ReferenceException E) {
-      throw ReferenceException(inMemFunc("reference"), E.getDetailMsg());
-   }
-}
-
-//--------------------------------------------------------------------------
-// Function:	H5Location::reference
-///\brief	This is an overloaded function, provided for your convenience.
-///		It differs from the above function in that it takes an
-///		\c H5std_string for the object's name.
-///\param	ref - IN: Reference pointer
-///\param	name - IN: Name of the object to be referenced - \c H5std_string
-///\param	ref_type - IN: Type of reference to query, valid values are:
-///		\li \c H5R_OBJECT         - Reference is an object reference (default)
-///		\li \c H5R_DATASET_REGION - Reference is a dataset region
-///\note	This method is more suitable for an object reference.
-// Programmer	Binh-Minh Ribler - May, 2004
-//--------------------------------------------------------------------------
-void H5Location::reference(void* ref, const H5std_string& name, H5R_type_t ref_type) const
-{
-   reference(ref, name.c_str(), ref_type);
+// Function:    H5Location::getObjinfo
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes an
+///             \c H5std_string for \a name.
+// Programmer   Binh-Minh Ribler - Nov, 2005
+//--------------------------------------------------------------------------
+void
+H5Location::getObjinfo(const H5std_string &name, H5G_stat_t &statbuf) const
+{
+    getObjinfo(name.c_str(), statbuf);
 }
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
+
 //--------------------------------------------------------------------------
-// Function:	H5Location::p_dereference (protected)
-// Purpose	Dereference a ref into an hdf5 object.
-// Parameters
-//		loc_id - IN: An hdf5 identifier specifying the location of the
-//			 referenced object
-//		ref - IN: Reference pointer
-//		ref_type - IN: Reference type
-//		plist - IN: Property list - default to PropList::DEFAULT
-//		from_func - IN: Name of the calling function
-// Exception	H5::ReferenceException
-// Programmer	Binh-Minh Ribler - Oct, 2006
-// Modification
-//	May 2008 - BMR
-//		Moved from IdComponent.
+// Function:    H5Location::getLinkInfo
+///\brief       Returns the information of the named link.
+///\param       link_name  - IN: Symbolic link to the object
+///\param       size - IN: Maximum number of characters of value to be returned
+///\return      Name of the object
+///\exception   H5::FileIException/H5::GroupIException/H5::LocationException
+// 2000
 //--------------------------------------------------------------------------
-hid_t H5Location::p_dereference(hid_t loc_id, const void* ref, H5R_type_t ref_type, const PropList& plist, const char* from_func)
+H5L_info2_t
+H5Location::getLinkInfo(const char *link_name, const LinkAccPropList &lapl) const
 {
-   hid_t plist_id;
-   if (p_valid_id(plist.getId()))
-	plist_id = plist.getId();
-   else
-	plist_id = H5P_DEFAULT;
+    H5L_info2_t linkinfo; // link info structure
 
-   hid_t temp_id = H5Rdereference2(loc_id, plist_id, ref_type, ref);
-   if (temp_id < 0)
-   {
-      throw ReferenceException(inMemFunc(from_func), "H5Rdereference failed");
-   }
+    herr_t ret_value = H5Lget_info2(getId(), link_name, &linkinfo, lapl.getId());
+    if (ret_value < 0)
+        throwException("getLinkInfo", "H5Lget_info to find buffer size failed");
 
-   return(temp_id);
+    return (linkinfo);
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::getLinkInfo
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes an
+///             \c H5std_string for \a link_name.
+//--------------------------------------------------------------------------
+H5L_info2_t
+H5Location::getLinkInfo(const H5std_string &link_name, const LinkAccPropList &lapl) const
+{
+    return (getLinkInfo(link_name.c_str(), lapl));
 }
-#endif // DOXYGEN_SHOULD_SKIP_THIS
 
 //--------------------------------------------------------------------------
-// Function:	H5Location::dereference
-///\brief	Dereferences a reference into an HDF5 object, given an HDF5 object.
-///\param	loc - IN: Location of the referenced object
-///\param	ref - IN: Reference pointer
-///\param	ref_type - IN: Reference type
-///\param	plist - IN: Property list - default to PropList::DEFAULT
-///\exception	H5::ReferenceException
-// Programmer	Binh-Minh Ribler - Oct, 2006
+// Function:    H5Location::getLinkval
+///\brief       Returns the name of the object that the symbolic link points to.
+///\param       name  - IN: Symbolic link to the object
+///\param       size - IN: Maximum number of characters of value to be returned
+///\return      Name of the object
+///\exception   H5::FileIException/H5::GroupIException/H5::LocationException
+// 2000
+//--------------------------------------------------------------------------
+H5std_string
+H5Location::getLinkval(const char *name, size_t size) const
+{
+    H5L_info2_t  linkinfo;
+    char        *value_C; // value in C string
+    size_t       val_size = size;
+    H5std_string value;
+    herr_t       ret_value;
+
+    // if user doesn't provide buffer size, determine it
+    if (size == 0) {
+        ret_value = H5Lget_info2(getId(), name, &linkinfo, H5P_DEFAULT);
+        if (ret_value < 0)
+            throwException("getLinkval", "H5Lget_info to find buffer size failed");
+
+        val_size = linkinfo.u.val_size;
+    }
+
+    // if link has value, retrieve the value, otherwise, return null string
+    if (val_size > 0) {
+        // Create buffer for C string
+        value_C = new char[val_size + 1]();
+
+        ret_value = H5Lget_val(getId(), name, value_C, val_size, H5P_DEFAULT);
+        if (ret_value < 0) {
+            delete[] value_C;
+            throwException("getLinkval", "H5Lget_val failed");
+        }
+
+        value = H5std_string(value_C);
+        delete[] value_C;
+    }
+    return (value);
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::getLinkval
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes an
+///             \c H5std_string for \a name.
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+H5std_string
+H5Location::getLinkval(const H5std_string &name, size_t size) const
+{
+    return (getLinkval(name.c_str(), size));
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::mount
+///\brief       Mounts the file \a child onto this group.
+///\param       name  - IN: Name of the group
+///\param       child - IN: File to mount
+///\param       plist - IN: Property list to use
+///\exception   H5::FileIException or H5::GroupIException
+// Programmer   Binh-Minh Ribler - 2014 (original 2000)
+//--------------------------------------------------------------------------
+void
+H5Location::mount(const char *name, const H5File &child, const PropList &plist) const
+{
+    // Obtain identifiers for C API
+    hid_t plist_id = plist.getId();
+    hid_t child_id = child.getId();
+
+    // Call C routine H5Fmount to do the mouting
+    herr_t ret_value = H5Fmount(getId(), name, child_id, plist_id);
+
+    // Raise exception if H5Fmount returns negative value
+    if (ret_value < 0)
+        throwException("mount", "H5Fmount failed");
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::mount
+// Purpose      This is an overloaded member function, kept for backward
+//              compatibility.  It differs from the above function in that it
+//              misses const's.  This wrapper will be removed in future release.
+// Param        name  - IN: Name of the group
+// Param        child - IN: File to mount
+// Param        plist - IN: Property list to use
+// Exception    H5::FileIException or H5::GroupIException
+// Programmer   Binh-Minh Ribler - 2000
 // Modification
-//	May, 2008
-//		Corrected missing parameters. - BMR
+//              Modified to call its replacement. -BMR, 2014/04/16
+//              Removed from documentation. -BMR, 2016/03/07 1.8.17 and 1.10.0
+//              Removed from code. -BMR, 2016/08/11 1.8.18 and 1.10.1
+//--------------------------------------------------------------------------
+// void H5Location::mount(const char* name, H5File& child, PropList& plist) const
+//{
+//   mount(name, child, plist);
+//}
+
 //--------------------------------------------------------------------------
-void H5Location::dereference(const H5Location& loc, const void* ref, H5R_type_t ref_type, const PropList& plist)
+// Function:    H5Location::mount
+///\brief       This is an overloaded member function, provided for convenience.
+///             It takes an \c H5std_string for \a name.
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+void
+H5Location::mount(const H5std_string &name, const H5File &child, const PropList &plist) const
 {
-   p_setId(p_dereference(loc.getId(), ref, ref_type, plist, "dereference"));
+    mount(name.c_str(), child, plist);
 }
 
 //--------------------------------------------------------------------------
-// Function:	H5Location::dereference
-///\brief	Dereferences a reference into an HDF5 object, given an attribute.
-///\param	attr - IN: Attribute specifying the location of the referenced object
-///\param	ref - IN: Reference pointer
-///\param	ref_type - IN: Reference type
-///\param	plist - IN: Property list - default to PropList::DEFAULT
-///\exception	H5::ReferenceException
-// Programmer	Binh-Minh Ribler - Oct, 2006
+// Function:    H5Location::mount
+// Purpose      This is an overloaded member function, kept for backward
+//              compatibility.  It differs from the above function in that it
+//              misses const's.  This wrapper will be removed in future release.
+// Programmer   Binh-Minh Ribler - 2014
 // Modification
-//	May, 2008
-//		Corrected missing parameters. - BMR
+//              Modified to call its replacement. -BMR, 2014/04/16
+//              Removed from documentation. -BMR, 2016/03/07 1.8.17 and 1.10.0
+//              Removed from code. -BMR, 2016/08/11 1.8.18 and 1.10.1
+//--------------------------------------------------------------------------
+// void H5Location::mount(const H5std_string& name, H5File& child, PropList& plist) const
+//{
+//   mount(name.c_str(), child, plist);
+//}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::unmount
+///\brief       Unmounts the specified file.
+///\param       name  - IN: Name of the file to unmount
+///\exception   H5::FileIException/H5::GroupIException/H5::LocationException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void H5Location::dereference(const Attribute& attr, const void* ref, H5R_type_t ref_type, const PropList& plist)
+void
+H5Location::unmount(const char *name) const
 {
-   p_setId(p_dereference(attr.getId(), ref, ref_type, plist, "dereference"));
+    // Call C routine H5Fmount to do the mouting
+    herr_t ret_value = H5Funmount(getId(), name);
+
+    // Raise exception if H5Funmount returns negative value
+    if (ret_value < 0)
+        throwException("unmount", "H5Funmount failed");
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::unmount
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes an
+///             \c H5std_string for \a name.
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+void
+H5Location::unmount(const H5std_string &name) const
+{
+    unmount(name.c_str());
 }
 
 #ifndef H5_NO_DEPRECATED_SYMBOLS
 //--------------------------------------------------------------------------
-// Function:	H5Location::getObjType
-///\brief	Retrieves the type of object that an object reference points to.
-///\param	ref_type - IN: Type of reference to query, valid values are:
-///		\li \c H5R_OBJECT - Reference is an object reference.
-///		\li \c H5R_DATASET_REGION - Reference is a dataset region reference.
-///\param	ref      - IN: Reference to query
-///\return	An object type, which can be one of the following:
-///		\li \c H5G_UNKNOWN  - A failure occurs. (-1)
-///		\li \c H5G_GROUP  - Object is a group.
-///		\li \c H5G_DATASET - Object is a dataset.
-///		\li \c H5G_TYPE Object - is a named datatype
-///		\li \c H5G_LINK  - Object is a symbolic link.
-///		\li \c H5G_UDLINK  - Object is a user-defined link.
-///\exception	H5::ReferenceException
-// Programmer	Binh-Minh Ribler - May, 2004
-// Modification
-//	Sep 2012: Moved up from H5File, Group, DataSet, and DataType
+// Function:    H5Location::iterateElems
+///\brief       Iterates a user's function over the entries of a group.
+///\param       name    - IN    : Name of group to iterate over
+///\param       idx     - IN/OUT: Starting (IN) and ending (OUT) entry indices
+///\param       op      - IN    : User's function to operate on each entry
+///\param       op_data - IN/OUT: Data associated with the operation
+///\return      The return value of the first operator that returns non-zero,
+///             or zero if all members were processed with no operator
+///             returning non-zero.
+///\exception   H5::FileIException/H5::GroupIException/H5::LocationException
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+int
+H5Location::iterateElems(const char *name, int *idx, H5G_iterate_t op, void *op_data)
+{
+    int ret_value = H5Giterate(getId(), name, idx, op, op_data);
+    if (ret_value < 0) {
+        throwException("iterateElems", "H5Giterate failed");
+    }
+    return (ret_value);
+}
+
 //--------------------------------------------------------------------------
-H5G_obj_t H5Location::getObjType(void *ref, H5R_type_t ref_type) const
+// Function:    H5Location::iterateElems
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes an
+///             \c H5std_string for \a name.
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+int
+H5Location::iterateElems(const H5std_string &name, int *idx, H5G_iterate_t op, void *op_data)
 {
-   try {
-      return(p_get_obj_type(ref, ref_type));
-   }
-   catch (ReferenceException E) {
-      throw ReferenceException(inMemFunc("getObjType"), E.getDetailMsg());
-   }
+    return (iterateElems(name.c_str(), idx, op, op_data));
 }
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 //--------------------------------------------------------------------------
-// Function:	H5Location::p_get_obj_type (protected)
-// Purpose	Retrieves the type of object that an object reference points to.
-// Parameters
-//		ref      - IN: Reference to query
-//		ref_type - IN: Type of reference to query
-// Return	An object type, which can be one of the following:
-//			H5G_UNKNOWN \tFailure occurs (-1)
-//			H5G_GROUP \tObject is a group.
-//			H5G_DATASET \tObject is a dataset.
-//			H5G_TYPE Object \tis a named datatype.
-//			H5G_LINK \tObject is a symbolic link.
-//			H5G_UDLINK \tObject is a user-defined link.
-// Exception	H5::ReferenceException
-// Programmer	Binh-Minh Ribler - May, 2004
-//--------------------------------------------------------------------------
-H5G_obj_t H5Location::p_get_obj_type(void *ref, H5R_type_t ref_type) const
-{
-   H5G_obj_t obj_type = H5Rget_obj_type1(getId(), ref_type, ref);
-
-   if (obj_type == H5G_UNKNOWN)
-   {
-      throw ReferenceException(inMemFunc("getObjType"), "H5Rget_obj_type1 failed");
-   }
-   return(obj_type);
+// Function:    H5Location::getNumObjs
+///\brief       Deprecated - moved to H5::Group in 1.10.2.
+///\return      Deprecated
+///\exception   Deprecated
+// Programmer   Binh-Minh Ribler - January, 2003
+//--------------------------------------------------------------------------
+hsize_t
+H5Location::getNumObjs() const
+{
+    H5G_info_t ginfo; // Group information
+
+    herr_t ret_value = H5Gget_info(getId(), &ginfo);
+    if (ret_value < 0)
+        throwException("getNumObjs", "H5Gget_info failed");
+    return (ginfo.nlinks);
 }
-#endif // DOXYGEN_SHOULD_SKIP_THIS
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::getObjnameByIdx
+///\brief       Returns the name of an object in this group, given the
+///             object's index.
+///\param       idx  -     IN: Transient index of the object
+///\return      Object name
+///\exception   H5::FileIException/H5::GroupIException/H5::LocationException
+///\par Description
+///             The value of idx can be any nonnegative number less than the
+///             total number of objects in the group, which is returned by
+///             the function \c H5Location::getNumObjs.  Note that this is a
+///             transient index; thus, an object may have a different index
+///             each time the group is opened.
+// Programmer   Binh-Minh Ribler - Mar, 2005
+//--------------------------------------------------------------------------
+H5std_string
+H5Location::getObjnameByIdx(hsize_t idx) const
+{
+    // call H5Lget_name_by_idx with name as NULL to get its length
+    ssize_t name_len =
+        H5Lget_name_by_idx(getId(), ".", H5_INDEX_NAME, H5_ITER_INC, idx, NULL, 0, H5P_DEFAULT);
+    if (name_len < 0)
+        throwException("getObjnameByIdx", "H5Lget_name_by_idx failed");
+
+    // The actual size is the cast value + 1 for the terminal ASCII NUL
+    // (unfortunate in/out type sign mismatch)
+    size_t actual_name_len = static_cast<size_t>(name_len) + 1;
+
+    // Create buffer for C string
+    char *name_C = new char[actual_name_len]();
+
+    name_len = H5Lget_name_by_idx(getId(), ".", H5_INDEX_NAME, H5_ITER_INC, idx, name_C, actual_name_len,
+                                  H5P_DEFAULT);
+
+    if (name_len < 0) {
+        delete[] name_C;
+        throwException("getObjnameByIdx", "H5Lget_name_by_idx failed");
+    }
+
+    // clean up and return the string
+    H5std_string name = H5std_string(name_C);
+    delete[] name_C;
+    return (name);
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::getObjnameByIdx
+///\brief       Retrieves the name of an object in this group, given the
+///             object's index.
+///\param       idx  -     IN: Transient index of the object
+///\param       name - IN/OUT: Retrieved name of the object
+///\param       size -     IN: Length to retrieve
+///\return      Actual size of the object name or 0, if object has no name
+///\exception   H5::FileIException/H5::GroupIException/H5::LocationException
+///\par Description
+///             The value of idx can be any nonnegative number less than the
+///             total number of objects in the group, which is returned by
+///             the function \c H5Location::getNumObjs.  Note that this is a
+///             transient index; thus, an object may have a different index
+///             each time the group is opened.
+// Programmer   Binh-Minh Ribler - January, 2003
+//--------------------------------------------------------------------------
+ssize_t
+H5Location::getObjnameByIdx(hsize_t idx, char *name, size_t size) const
+{
+    ssize_t name_len =
+        H5Lget_name_by_idx(getId(), ".", H5_INDEX_NAME, H5_ITER_INC, idx, name, size, H5P_DEFAULT);
+    if (name_len < 0)
+        throwException("getObjnameByIdx", "H5Lget_name_by_idx failed");
+
+    return (name_len);
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::getObjnameByIdx
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes an
+///             \c H5std_string for \a name.
+// Programmer   Binh-Minh Ribler - January, 2003
+//--------------------------------------------------------------------------
+ssize_t
+H5Location::getObjnameByIdx(hsize_t idx, H5std_string &name, size_t size) const
+{
+    // Create buffer for C string
+    char *name_C = new char[size + 1]();
+
+    // call overloaded function to get the name
+    ssize_t name_len = getObjnameByIdx(idx, name_C, size + 1);
+    if (name_len < 0) {
+        delete[] name_C;
+        throwException("getObjnameByIdx", "H5Lget_name_by_idx failed");
+    }
+
+    // clean up and return the string
+    name = H5std_string(name_C);
+    delete[] name_C;
+    return (name_len);
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::childObjType
+///\brief       Returns the type of an object in this file/group, given the
+///             object's name.
+///\param       objname - IN: Name of the object
+///\return      Object type, which can have the following values for group,
+///             dataset, and named datatype
+///             \li \c H5O_TYPE_GROUP
+///             \li \c H5O_TYPE_DATASET
+///             \li \c H5O_TYPE_NAMED_DATATYPE
+///             For information, please refer to the H5Oget_info_by_name API in
+///             the HDF5 C Reference Manual.
+///\exception   H5::FileIException/H5::GroupIException/H5::LocationException
+///             Exception will be thrown when:
+///             - an error returned by the C API
+///             - object type is not one of the valid values above
+// Programmer   Binh-Minh Ribler - April, 2014
+//--------------------------------------------------------------------------
+H5O_type_t
+H5Location::childObjType(const char *objname) const
+{
+    H5O_info2_t objinfo;
+    H5O_type_t  objtype = H5O_TYPE_UNKNOWN;
+
+    // Use C API to get information of the object
+    herr_t ret_value = H5Oget_info_by_name3(getId(), objname, &objinfo, H5O_INFO_BASIC, H5P_DEFAULT);
+
+    // Throw exception if C API returns failure
+    if (ret_value < 0)
+        throwException("childObjType", "H5Oget_info_by_name failed");
+    // Return a valid type or throw an exception for unknown type
+    else
+        switch (objinfo.type) {
+            case H5O_TYPE_GROUP:
+            case H5O_TYPE_DATASET:
+            case H5O_TYPE_NAMED_DATATYPE:
+                objtype = objinfo.type;
+                break;
+            case H5O_TYPE_UNKNOWN:
+            case H5O_TYPE_NTYPES:
+            case H5O_TYPE_MAP:
+            default:
+                throwException("childObjType", "Unknown type of object");
+        }
+    return (objtype);
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::childObjType
+///\brief       This is an overloaded member function, provided for convenience.
+///             It takes an \a H5std_string for the object's name.
+///\brief       Returns the type of an object in this group, given the
+///             object's name.
+///\param       objname - IN: Name of the object (H5std_string&)
+///\exception   H5::FileIException/H5::GroupIException/H5::LocationException
+// Programmer   Binh-Minh Ribler - April, 2014
+//--------------------------------------------------------------------------
+H5O_type_t
+H5Location::childObjType(const H5std_string &objname) const
+{
+    // Use overloaded function
+    H5O_type_t objtype = childObjType(objname.c_str());
+    return (objtype);
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::childObjType
+///\brief       Returns the type of an object in this file/group, given the
+///             object's index and its type and order.
+///\param       index - IN: Position of the object
+///\param       index_type - IN: Type of the index, default to H5_INDEX_NAME
+///\param       order - IN: Traversing order, default to H5_ITER_INC
+///\param       objname - IN: Name of the object, default to "."
+///\return      Object type, which can have the following values for group,
+///             dataset, and named datatype
+///             \li \c H5O_TYPE_GROUP
+///             \li \c H5O_TYPE_DATASET
+///             \li \c H5O_TYPE_NAMED_DATATYPE
+///             For information, please refer to the H5Oget_info_by_idx API in
+///             the HDF5 C Reference Manual.
+///\exception   H5::FileIException/H5::GroupIException/H5::LocationException
+///             Exception will be thrown when:
+///             - an error returned by the C API
+///             - object type is not one of the valid values above
+// Developer's Notes:
+//      - this overload uses H5Oget_info_by_idx instead of H5Oget_info_by_name
+//        like the previous childObjType()
+//      - index is the required argument so, first
+//      - objname is last because it's more likely the location is already
+//        fully specified
+//      - Leave property list out for now because C API is not using it, it
+//        can be added later when needed.
+// Programmer   Binh-Minh Ribler - April, 2014
+//--------------------------------------------------------------------------
+H5O_type_t
+H5Location::childObjType(hsize_t index, H5_index_t index_type, H5_iter_order_t order,
+                         const char *objname) const
+{
+    herr_t      ret_value;
+    H5O_info2_t objinfo;
+    H5O_type_t  objtype = H5O_TYPE_UNKNOWN;
+
+    // Use C API to get information of the object
+    ret_value = H5Oget_info_by_idx3(getId(), objname, index_type, order, index, &objinfo, H5O_INFO_BASIC,
+                                    H5P_DEFAULT);
+
+    // Throw exception if C API returns failure
+    if (ret_value < 0)
+        throwException("childObjType", "H5Oget_info_by_idx failed");
+    // Return a valid type or throw an exception for unknown type
+    else
+        switch (objinfo.type) {
+            case H5O_TYPE_GROUP:
+            case H5O_TYPE_DATASET:
+            case H5O_TYPE_NAMED_DATATYPE:
+                objtype = objinfo.type;
+                break;
+            case H5O_TYPE_UNKNOWN:
+            case H5O_TYPE_NTYPES:
+            case H5O_TYPE_MAP:
+            default:
+                throwException("childObjType", "Unknown type of object");
+        }
+    return (objtype);
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::childObjVersion
+///\brief       Returns the object header version of an object in this file/group,
+///             given the object's name.
+///\param       objname - IN: Name of the object
+///\return      Object version, which can have the following values:
+///             \li \c H5O_VERSION_1
+///             \li \c H5O_VERSION_2
+///\exception   H5::FileIException/H5::GroupIException/H5::LocationException
+///             Exception will be thrown when:
+///             - an error returned by the C API
+///             - version number is not one of the valid values above
+// Programmer   Binh-Minh Ribler - April, 2014
+//--------------------------------------------------------------------------
+unsigned
+H5Location::childObjVersion(const char *objname) const
+{
+    H5O_native_info_t objinfo;
+    unsigned          version = 0;
+
+    // Use C API to get information of the object
+    herr_t ret_value =
+        H5Oget_native_info_by_name(getId(), objname, &objinfo, H5O_NATIVE_INFO_HDR, H5P_DEFAULT);
+
+    // Throw exception if C API returns failure
+    if (ret_value < 0)
+        throwException("childObjVersion", "H5Oget_info_by_name failed");
+    // Return a valid version or throw an exception for invalid value
+    else {
+        version = objinfo.hdr.version;
+        if (version != H5O_VERSION_1 && version != H5O_VERSION_2)
+            throwException("childObjVersion", "Invalid version for object");
+    }
+    return (version);
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::childObjVersion
+///\brief       This is an overloaded member function, provided for convenience.
+///             It takes an \a H5std_string for the object's name.
+///\brief       Returns the type of an object in this group, given the
+///             object's name.
+///\param       objname - IN: Name of the object (H5std_string&)
+///\exception   H5::FileIException/H5::GroupIException/H5::LocationException
+// Programmer   Binh-Minh Ribler - April, 2014
+//--------------------------------------------------------------------------
+unsigned
+H5Location::childObjVersion(const H5std_string &objname) const
+{
+    // Use overloaded function
+    unsigned version = childObjVersion(objname.c_str());
+    return (version);
+}
+
+#ifndef H5_NO_DEPRECATED_SYMBOLS
+//--------------------------------------------------------------------------
+// Function:    H5Location::getObjTypeByIdx
+///\brief       Returns the type of an object in this group, given the
+///             object's index.
+///\param       idx - IN: Transient index of the object
+///\return      Object type
+///\exception   H5::FileIException/H5::GroupIException/H5::LocationException
+// Programmer   Binh-Minh Ribler - January, 2003
+//--------------------------------------------------------------------------
+H5G_obj_t
+H5Location::getObjTypeByIdx(hsize_t idx) const
+{
+    H5G_obj_t obj_type = H5Gget_objtype_by_idx(getId(), idx);
+    if (obj_type == H5G_UNKNOWN)
+        throwException("getObjTypeByIdx", "H5Gget_objtype_by_idx failed");
+
+    return (obj_type);
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::getObjTypeByIdx
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function because it also provides
+///             the returned object type in text (char*)
+///\param       idx       - IN: Transient index of the object
+///\param       type_name - OUT: Object type in text
+///\return      Object type
+///\exception   H5::FileIException/H5::GroupIException/H5::LocationException
+// Programmer   Binh-Minh Ribler - May, 2010
+// Modification
+//              Modified to use the other function. -BMR, 2016/03/07
+//--------------------------------------------------------------------------
+H5G_obj_t
+H5Location::getObjTypeByIdx(hsize_t idx, char *type_name) const
+{
+    H5std_string stype_name(type_name);
+    return (getObjTypeByIdx(idx, stype_name));
+}
+//--------------------------------------------------------------------------
+// Function:    H5Location::getObjTypeByIdx
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function because it also provides
+///             the returned object type in text (H5std_string&)
+///\param       idx       - IN: Transient index of the object
+///\param       type_name - OUT: Object type in text
+///\return      Object type
+///\exception   H5::FileIException/H5::GroupIException/H5::LocationException
+// Programmer   Binh-Minh Ribler - January, 2003
+//--------------------------------------------------------------------------
+H5G_obj_t
+H5Location::getObjTypeByIdx(hsize_t idx, H5std_string &type_name) const
+{
+    H5G_obj_t obj_type = H5Gget_objtype_by_idx(getId(), idx);
+    switch (obj_type) {
+        case H5G_LINK:
+            type_name = H5std_string("symbolic link");
+            break;
+        case H5G_GROUP:
+            type_name = H5std_string("group");
+            break;
+        case H5G_DATASET:
+            type_name = H5std_string("dataset");
+            break;
+        case H5G_TYPE:
+            type_name = H5std_string("datatype");
+            break;
+        case H5G_UNKNOWN:
+        case H5G_UDLINK:
+        case H5G_RESERVED_5:
+        case H5G_RESERVED_6:
+        case H5G_RESERVED_7:
+        default:
+            throwException("getObjTypeByIdx", "H5Gget_objtype_by_idx failed");
+    }
+    return (obj_type);
+}
+
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
 
 //--------------------------------------------------------------------------
-// Function:	H5Location::getRefObjType
-///\brief	Retrieves the type of object that an object reference points to.
-///\param	ref      - IN: Reference to query
-///\param	ref_type - IN: Type of reference to query, valid values are:
-///		\li \c H5R_OBJECT         - Reference is an object reference.
-///		\li \c H5R_DATASET_REGION - Reference is a dataset region reference.
-///\return	An object type, which can be one of the following:
-///		\li \c H5O_TYPE_UNKNOWN	- Unknown object type (-1)
-///		\li \c H5O_TYPE_GROUP	- Object is a group
-///		\li \c H5O_TYPE_DATASET	- Object is a dataset
-///		\li \c H5O_TYPE_NAMED_DATATYPE - Object is a named datatype
-///		\li \c H5O_TYPE_NTYPES	- Number of different object types
-///\exception	H5::ReferenceException
-// Programmer	Binh-Minh Ribler - May, 2004
+// Function:    H5Location::throwException
+///\brief       Invokes subclass' throwException
+///\param       func_name - Name of the function where failure occurs
+///\param       msg       - Message describing the failure
+///\exception   H5::GroupIException
+// Programmer   Binh-Minh Ribler - 2000
+// Modification
+//      August 2017 - BMR
+//              Keep H5Location::throwException and H5File::throwException to
+//              maintain backward compatibility.  For other subclasses, throw
+//              LocationException.
 //--------------------------------------------------------------------------
-H5O_type_t H5Location::getRefObjType(void *ref, H5R_type_t ref_type) const
+void
+H5Location::throwException(const H5std_string &func_name, const H5std_string &msg) const
 {
-   try {
-      return(p_get_ref_obj_type(ref, ref_type));
-   }
-   catch (ReferenceException E) {
-      throw ReferenceException(inMemFunc("getRefObjType"), E.getDetailMsg());
-   }
+    throw LocationException(inMemFunc(func_name.c_str()), msg);
 }
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 //--------------------------------------------------------------------------
-// Function:	H5Location::p_get_ref_obj_type (protected)
-// Purpose	Retrieves the type of object that an object reference points to.
-// Parameters
-//		ref      - IN: Reference to query
-//		ref_type - IN: Type of reference to query
-// Return	An object type, which can be one of the following:
-//			H5O_TYPE_UNKNOWN	- Unknown object type (-1)
-//			H5O_TYPE_GROUP		- Object is a group
-//			H5O_TYPE_DATASET	- Object is a dataset
-//			H5O_TYPE_NAMED_DATATYPE - Object is a named datatype
-//			H5O_TYPE_NTYPES		- Number of object types
-// Exception	H5::ReferenceException
-// Programmer	Binh-Minh Ribler - May, 2004
-//--------------------------------------------------------------------------
-H5O_type_t H5Location::p_get_ref_obj_type(void *ref, H5R_type_t ref_type) const
-{
-   H5O_type_t obj_type = H5O_TYPE_UNKNOWN;
-   herr_t ret_value = H5Rget_obj_type2(getId(), ref_type, ref, &obj_type);
-   if (ret_value < 0)
-   {
-      throw ReferenceException(inMemFunc("getRefObjType"), "H5Rget_obj_type2 failed");
-   }
-   if (obj_type == H5O_TYPE_UNKNOWN || obj_type >= H5O_TYPE_NTYPES)
-   {
-      throw ReferenceException(inMemFunc("getRefObjType"), "H5Rget_obj_type2 returned invalid type");
-   }
-   return(obj_type);
-}
-
-
-//--------------------------------------------------------------------------
-// Function:	H5Location::getRegion
-///\brief	Retrieves a dataspace with the region pointed to selected.
-///\param	ref	 - IN: Reference to get region of
-///\param	ref_type - IN: Type of reference to get region of - default
-//				to H5R_DATASET_REGION
-///\return	DataSpace object
-///\exception	H5::ReferenceException
-// Programmer	Binh-Minh Ribler - May, 2004
-//--------------------------------------------------------------------------
-DataSpace H5Location::getRegion(void *ref, H5R_type_t ref_type) const
-{
-   hid_t space_id = H5Rget_region(getId(), ref_type, ref);
-   if (space_id < 0)
-   {
-      throw ReferenceException(inMemFunc("getRegion"), "H5Rget_region failed");
-   }
-   try {
-      DataSpace dataspace(space_id);
-      return(dataspace);
-   }
-   catch (DataSpaceIException E) {
-      throw ReferenceException(inMemFunc("getRegion"), E.getDetailMsg());
-   }
-}
-
-
-//--------------------------------------------------------------------------
-// Function:	H5Location destructor
-///\brief	Noop destructor.
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-H5Location::~H5Location() {}
+// Function:    f_DataSet_setId - friend
+// Modification:
+//              Moved to H5CommonFG.cpp after the rearrangement of classes
+//              -BMR, Dec 2016
+//--------------------------------------------------------------------------
 
-#endif // DOXYGEN_SHOULD_SKIP_THIS
+// end of From H5CommonFG.cpp
+
+//--------------------------------------------------------------------------
+// Function:    f_Attribute_setId - friend
+// Modification:
+//              Moved to H5Object.cpp after the rearrangement of classes
+//              -BMR, Dec 2016
+//--------------------------------------------------------------------------
+
+//--------------------------------------------------------------------------
+// Function:    f_DataSpace_setId - friend
+// Purpose      This function is friend to class H5::DataSpace so that it can
+//              can set DataSpace::id in order to work around a problem
+//              described in the JIRA issue HDFFV-7947.
+//              Applications shouldn't need to use it.
+// param        dspace   - IN/OUT: DataSpace object to be changed
+// param        new_id - IN: New id to set
+// Programmer   Binh-Minh Ribler - 2015
+//--------------------------------------------------------------------------
+void
+f_DataSpace_setId(DataSpace *dspace, hid_t new_id)
+{
+    dspace->p_setId(new_id);
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location destructor
+///\brief       Noop destructor.
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+H5Location::~H5Location()
+{
+}
 
-#ifndef H5_NO_NAMESPACE
-} // end namespace
-#endif
+} // namespace H5
diff --git a/c++/src/H5Location.h b/c++/src/H5Location.h
index 69f7ff3..ee45d67 100644
--- a/c++/src/H5Location.h
+++ b/c++/src/H5Location.h
@@ -1,180 +1,341 @@
 // C++ informative line for the emacs editor: -*- C++ -*-
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5Location_H
-#define __H5Location_H
+#ifndef H5Location_H
+#define H5Location_H
 
-#include "H5Classes.h"		// constains forward class declarations
+#include "H5Classes.h" // contains forward class declarations
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#endif
-
-class H5_DLLCPP H5Location;  // forward declaration for UserData4Aiterate
-
-// Define the operator function pointer for H5Aiterate().
-typedef void (*attr_operator_t)( H5Location& loc/*in*/,
-                                 const H5std_string attr_name/*in*/,
-                                 void *operator_data/*in,out*/);
-
-//! User data for attribute iteration
-class UserData4Aiterate {
-   public:
-	attr_operator_t op;
-	void* opData;
-	H5Location* location;
-};
 
 /*! \class H5Location
     \brief H5Location is an abstract base class, added in version 1.8.12.
 
     It provides a collection of wrappers for the C functions that take a
     location identifier to specify the HDF5 object.  The location identifier
-    can be either file, group, dataset, or named datatype.
+    can be either file, group, dataset, attribute, or named datatype.
+    Wrappers for H5A functions stay in H5Object.
 */
-// Most of these methods were in H5Object but are now moved here because
-// a location can be a file, group, dataset, or named datatype. -BMR, 2013-10-1
+// Inheritance: IdComponent
 class H5_DLLCPP H5Location : public IdComponent {
-   public:
-	// Creates an attribute for the specified object at this location
-	// PropList is currently not used, so always be default.
-	Attribute createAttribute( const char* name, const DataType& type, const DataSpace& space, const PropList& create_plist = PropList::DEFAULT ) const;
-	Attribute createAttribute( const H5std_string& name, const DataType& type, const DataSpace& space, const PropList& create_plist = PropList::DEFAULT ) const;
+  public:
+    // Checks if a link of a given name exists in a location
+    bool nameExists(const char *name, const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const;
+    bool nameExists(const H5std_string &name, const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const;
 
-	// Given its name, opens the attribute that belongs to an object at
-	// this location.
-	Attribute openAttribute( const char* name ) const;
-	Attribute openAttribute( const H5std_string& name ) const;
+    // Checks if a link of a given name exists in a location
+    // Deprecated in favor of nameExists for better name.
+    bool exists(const char *name, const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const;
+    bool exists(const H5std_string &name, const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const;
 
-	// Given its index, opens the attribute that belongs to an object at
-	// this location.
-	Attribute openAttribute( const unsigned int idx ) const;
+    // Flushes all buffers associated with this location to disk.
+    void flush(H5F_scope_t scope) const;
 
-	// Flushes all buffers associated with this location to disk.
-	void flush( H5F_scope_t scope ) const;
+    // Gets the name of the file, specified by this location.
+    H5std_string getFileName() const;
 
-	// Gets the name of the file, specified by this location.
-	H5std_string getFileName() const;
+#ifndef H5_NO_DEPRECATED_SYMBOLS
+    // Retrieves the type of object that an object reference points to.
+    H5G_obj_t getObjType(void *ref, H5R_type_t ref_type = H5R_OBJECT) const;
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
 
-	// Determines the number of attributes at this location.
-	int getNumAttrs() const;
+    // Retrieves the type of object that an object reference points to.
+    H5O_type_t getRefObjType(void *ref, H5R_type_t ref_type = H5R_OBJECT) const;
+    // Note: getRefObjType deprecates getObjType, but getObjType's name is
+    // misleading, so getRefObjType is used in the new function instead.
+
+    // Sets the comment for an HDF5 object specified by its name.
+    void setComment(const char *name, const char *comment) const;
+    void setComment(const H5std_string &name, const H5std_string &comment) const;
+    void setComment(const char *comment) const;
+    void setComment(const H5std_string &comment) const;
+
+    // Retrieves comment for the HDF5 object specified by its name.
+    ssize_t      getComment(const char *name, size_t buf_size, char *comment) const;
+    H5std_string getComment(const char *name, size_t buf_size = 0) const;
+    H5std_string getComment(const H5std_string &name, size_t buf_size = 0) const;
+
+    // Removes the comment for the HDF5 object specified by its name.
+    void removeComment(const char *name) const;
+    void removeComment(const H5std_string &name) const;
+
+    // Creates a reference to a named object or to a dataset region
+    // in this object.
+    void reference(void *ref, const char *name, H5R_type_t ref_type = H5R_OBJECT) const;
+    void reference(void *ref, const H5std_string &name, H5R_type_t ref_type = H5R_OBJECT) const;
+    void reference(void *ref, const char *name, const DataSpace &dataspace,
+                   H5R_type_t ref_type = H5R_DATASET_REGION) const;
+    void reference(void *ref, const H5std_string &name, const DataSpace &dataspace,
+                   H5R_type_t ref_type = H5R_DATASET_REGION) const;
+
+    // Open a referenced object whose location is specified by either
+    // a file, an HDF5 object, or an attribute.
+    void dereference(const H5Location &loc, const void *ref, H5R_type_t ref_type = H5R_OBJECT,
+                     const PropList &plist = PropList::DEFAULT);
+    // Removed in 1.10.1, because H5Location is baseclass
+    // void dereference(const Attribute& attr, const void* ref, H5R_type_t ref_type = H5R_OBJECT, const
+    // PropList& plist = PropList::DEFAULT);
+
+    // Retrieves a dataspace with the region pointed to selected.
+    DataSpace getRegion(void *ref, H5R_type_t ref_type = H5R_DATASET_REGION) const;
+
+    // Create a new group with using link create property list.
+    Group createGroup(const char *name, const LinkCreatPropList &lcpl) const;
+    Group createGroup(const H5std_string &name, const LinkCreatPropList &lcpl) const;
+
+    // From CommonFG
+    // Creates a new group at this location which can be a file
+    // or another group.
+    Group createGroup(const char *name, size_t size_hint = 0) const;
+    Group createGroup(const H5std_string &name, size_t size_hint = 0) const;
+
+    // Opens an existing group in a location which can be a file
+    // or another group.
+    Group openGroup(const char *name) const;
+    Group openGroup(const H5std_string &name) const;
+
+    // Creates a new dataset in this location.
+    DataSet createDataSet(const char *name, const DataType &data_type, const DataSpace &data_space,
+                          const DSetCreatPropList &create_plist = DSetCreatPropList::DEFAULT,
+                          const DSetAccPropList   &dapl         = DSetAccPropList::DEFAULT,
+                          const LinkCreatPropList &lcpl         = LinkCreatPropList::DEFAULT) const;
+    DataSet createDataSet(const H5std_string &name, const DataType &data_type, const DataSpace &data_space,
+                          const DSetCreatPropList &create_plist = DSetCreatPropList::DEFAULT,
+                          const DSetAccPropList   &dapl         = DSetAccPropList::DEFAULT,
+                          const LinkCreatPropList &lcpl         = LinkCreatPropList::DEFAULT) const;
+
+    // Deprecated to add LinkCreatPropList and DSetAccPropList - 1.10.3
+    // DataSet createDataSet(const char* name, const DataType& data_type, const DataSpace& data_space, const
+    // DSetCreatPropList& create_plist = DSetCreatPropList::DEFAULT) const; DataSet createDataSet(const
+    // H5std_string& name, const DataType& data_type, const DataSpace& data_space, const DSetCreatPropList&
+    // create_plist = DSetCreatPropList::DEFAULT) const;
+
+    // Opens an existing dataset at this location.
+    // DSetAccPropList is added - 1.10.3
+    DataSet openDataSet(const char *name, const DSetAccPropList &dapl = DSetAccPropList::DEFAULT) const;
+    DataSet openDataSet(const H5std_string    &name,
+                        const DSetAccPropList &dapl = DSetAccPropList::DEFAULT) const;
+
+    H5L_info2_t getLinkInfo(const char            *link_name,
+                            const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const;
+    H5L_info2_t getLinkInfo(const H5std_string    &link_name,
+                            const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const;
+
+    // Returns the value of a symbolic link.
+    H5std_string getLinkval(const char *link_name, size_t size = 0) const;
+    H5std_string getLinkval(const H5std_string &link_name, size_t size = 0) const;
+
+    // Returns the number of objects in this group.
+    // Deprecated - moved to H5::Group in 1.10.2.
+    hsize_t getNumObjs() const;
+
+    // Retrieves the name of an object in this group, given the
+    // object's index.
+    H5std_string getObjnameByIdx(hsize_t idx) const;
+    ssize_t      getObjnameByIdx(hsize_t idx, char *name, size_t size) const;
+    ssize_t      getObjnameByIdx(hsize_t idx, H5std_string &name, size_t size) const;
+
+    // Retrieves the type of an object in this file or group, given the
+    // object's name
+    H5O_type_t childObjType(const H5std_string &objname) const;
+    H5O_type_t childObjType(const char *objname) const;
+    H5O_type_t childObjType(hsize_t index, H5_index_t index_type = H5_INDEX_NAME,
+                            H5_iter_order_t order = H5_ITER_INC, const char *objname = ".") const;
+
+    // Returns the object header version of an object in this file or group,
+    // given the object's name.
+    unsigned childObjVersion(const char *objname) const;
+    unsigned childObjVersion(const H5std_string &objname) const;
+
+    // Retrieves information about an HDF5 object.
+    void getObjinfo(H5O_info2_t &objinfo, unsigned fields = H5O_INFO_BASIC) const;
+
+    // Retrieves information about an HDF5 object, given its name.
+    void getObjinfo(const char *name, H5O_info2_t &objinfo, unsigned fields = H5O_INFO_BASIC,
+                    const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const;
+    void getObjinfo(const H5std_string &name, H5O_info2_t &objinfo, unsigned fields = H5O_INFO_BASIC,
+                    const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const;
+
+    // Retrieves information about an HDF5 object, given its index.
+    void getObjinfo(const char *grp_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t idx,
+                    H5O_info2_t &objinfo, unsigned fields = H5O_INFO_BASIC,
+                    const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const;
+    void getObjinfo(const H5std_string &grp_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t idx,
+                    H5O_info2_t &objinfo, unsigned fields = H5O_INFO_BASIC,
+                    const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const;
+
+    // Retrieves native native information about an HDF5 object.
+    void getNativeObjinfo(H5O_native_info_t &objinfo, unsigned fields = H5O_NATIVE_INFO_HDR) const;
+
+    // Retrieves native information about an HDF5 object, given its name.
+    void getNativeObjinfo(const char *name, H5O_native_info_t &objinfo, unsigned fields = H5O_NATIVE_INFO_HDR,
+                          const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const;
+    void getNativeObjinfo(const H5std_string &name, H5O_native_info_t &objinfo,
+                          unsigned               fields = H5O_NATIVE_INFO_HDR,
+                          const LinkAccPropList &lapl   = LinkAccPropList::DEFAULT) const;
+
+    // Retrieves native information about an HDF5 object, given its index.
+    void getNativeObjinfo(const char *grp_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t idx,
+                          H5O_native_info_t &objinfo, unsigned fields = H5O_NATIVE_INFO_HDR,
+                          const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const;
+    void getNativeObjinfo(const H5std_string &grp_name, H5_index_t idx_type, H5_iter_order_t order,
+                          hsize_t idx, H5O_native_info_t &objinfo, unsigned fields = H5O_NATIVE_INFO_HDR,
+                          const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const;
 
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-	// Retrieves the type of object that an object reference points to.
-	H5G_obj_t getObjType(void *ref, H5R_type_t ref_type = H5R_OBJECT) const;
+    // Returns the type of an object in this group, given the
+    // object's index.
+    H5G_obj_t getObjTypeByIdx(hsize_t idx) const;
+    H5G_obj_t getObjTypeByIdx(hsize_t idx, char *type_name) const;
+    H5G_obj_t getObjTypeByIdx(hsize_t idx, H5std_string &type_name) const;
+
+    // Returns information about an HDF5 object, given by its name,
+    // at this location. - Deprecated
+    void getObjinfo(const char *name, hbool_t follow_link, H5G_stat_t &statbuf) const;
+    void getObjinfo(const H5std_string &name, hbool_t follow_link, H5G_stat_t &statbuf) const;
+    void getObjinfo(const char *name, H5G_stat_t &statbuf) const;
+    void getObjinfo(const H5std_string &name, H5G_stat_t &statbuf) const;
+
+    // Iterates over the elements of this group - not implemented in
+    // C++ style yet.
+    int iterateElems(const char *name, int *idx, H5G_iterate_t op, void *op_data);
+    int iterateElems(const H5std_string &name, int *idx, H5G_iterate_t op, void *op_data);
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
 
-	// Retrieves the type of object that an object reference points to.
-	H5O_type_t getRefObjType(void *ref, H5R_type_t ref_type = H5R_OBJECT) const;
-	// Note: getRefObjType deprecates getObjType, but getObjType's name is
-	// misleading, so getRefObjType is used in the new function instead.
-
-	// Iterate user's function over the attributes at this location.
-	int iterateAttrs(attr_operator_t user_op, unsigned* idx = NULL, void* op_data = NULL);
-
-	// Checks whether the named attribute exists at this location.
-	bool attrExists(const char* name) const;
-	bool attrExists(const H5std_string& name) const;
-
-	// Renames the named attribute to a new name.
-	void renameAttr(const char* oldname, const char* newname) const;
-	void renameAttr(const H5std_string& oldname, const H5std_string& newname) const;
-
-	// Removes the named attribute from this location.
-	void removeAttr(const char* name) const;
-	void removeAttr(const H5std_string& name) const;
-
-	// Sets the comment for an HDF5 object specified by its name.
-	void setComment(const char* name, const char* comment) const;
-	void setComment(const H5std_string& name, const H5std_string& comment) const;
-	void setComment(const char* comment) const;
-	void setComment(const H5std_string& comment) const;
-
-	// Retrieves comment for the HDF5 object specified by its name.
-	ssize_t getComment(const char* name, size_t buf_size, char* comment) const;
-	H5std_string getComment(const char* name, size_t buf_size=0) const;
-	H5std_string getComment(const H5std_string& name, size_t buf_size=0) const;
-
-	// Removes the comment for the HDF5 object specified by its name.
-	void removeComment(const char* name) const;
-	void removeComment(const H5std_string& name) const;
-
-	// Creates a reference to a named object or to a dataset region
-	// in this object.
-	void reference(void* ref, const char* name, 
-			H5R_type_t ref_type = H5R_OBJECT) const;
-	void reference(void* ref, const H5std_string& name,
-			H5R_type_t ref_type = H5R_OBJECT) const;
-	void reference(void* ref, const char* name, const DataSpace& dataspace,
-			H5R_type_t ref_type = H5R_DATASET_REGION) const;
-	void reference(void* ref, const H5std_string& name, const DataSpace& dataspace,
-			H5R_type_t ref_type = H5R_DATASET_REGION) const;
-
-	// Open a referenced object whose location is specified by either
-	// a file, an HDF5 object, or an attribute.
-	void dereference(const H5Location& loc, const void* ref, H5R_type_t ref_type = H5R_OBJECT, const PropList& plist = PropList::DEFAULT);
-	void dereference(const Attribute& attr, const void* ref, H5R_type_t ref_type = H5R_OBJECT, const PropList& plist = PropList::DEFAULT);
-
-	// Retrieves a dataspace with the region pointed to selected.
-	DataSpace getRegion(void *ref, H5R_type_t ref_type = H5R_DATASET_REGION) const;
-
-	///\brief Returns an identifier. (pure virtual)
-	virtual hid_t getId() const = 0;
-
-   protected:
-	// Default constructor
-	H5Location();
-
+    // Creates a soft link from link_name to target_name.
+    void link(const char *target_name, const char *link_name,
+              const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT,
+              const LinkAccPropList   &lapl = LinkAccPropList::DEFAULT) const;
+    void link(const H5std_string &target_name, const H5std_string &link_name,
+              const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT,
+              const LinkAccPropList   &lapl = LinkAccPropList::DEFAULT) const;
+
+    // Creates a hard link from new_name to curr_name.
+    void link(const char *curr_name, const Group &new_loc, const char *new_name,
+              const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT,
+              const LinkAccPropList   &lapl = LinkAccPropList::DEFAULT) const;
+    void link(const H5std_string &curr_name, const Group &new_loc, const H5std_string &new_name,
+              const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT,
+              const LinkAccPropList   &lapl = LinkAccPropList::DEFAULT) const;
+
+    // Creates a hard link from new_name to curr_name in same location.
+    void link(const char *curr_name, const hid_t same_loc, const char *new_name,
+              const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT,
+              const LinkAccPropList   &lapl = LinkAccPropList::DEFAULT) const;
+    void link(const H5std_string &curr_name, const hid_t same_loc, const H5std_string &new_name,
+              const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT,
+              const LinkAccPropList   &lapl = LinkAccPropList::DEFAULT) const;
+
+    // Creates a link of the specified type from new_name to current_name;
+    // both names are interpreted relative to the specified location id.
+    // Deprecated due to inadequate functionality.
+    void link(H5L_type_t link_type, const char *curr_name, const char *new_name) const;
+    void link(H5L_type_t link_type, const H5std_string &curr_name, const H5std_string &new_name) const;
+
+    // Removes the specified link from this location.
+    void unlink(const char *link_name, const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const;
+    void unlink(const H5std_string &link_name, const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const;
+
+    // Mounts the file 'child' onto this location.
+    void mount(const char *name, const H5File &child, const PropList &plist) const;
+    void mount(const H5std_string &name, const H5File &child, const PropList &plist) const;
+
+    // Unmounts the file named 'name' from this parent location.
+    void unmount(const char *name) const;
+    void unmount(const H5std_string &name) const;
+
+    // Copies a link from a group to another.
+    void copyLink(const char *src_name, const Group &dst, const char *dst_name,
+                  const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT,
+                  const LinkAccPropList   &lapl = LinkAccPropList::DEFAULT) const;
+    void copyLink(const H5std_string &src_name, const Group &dst, const H5std_string &dst_name,
+                  const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT,
+                  const LinkAccPropList   &lapl = LinkAccPropList::DEFAULT) const;
+
+    // Makes a copy of a link in the same group.
+    void copyLink(const char *src_name, const char *dst_name,
+                  const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT,
+                  const LinkAccPropList   &lapl = LinkAccPropList::DEFAULT) const;
+    void copyLink(const H5std_string &src_name, const H5std_string &dst_name,
+                  const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT,
+                  const LinkAccPropList   &lapl = LinkAccPropList::DEFAULT) const;
+
+    // Renames a link in this group and moves to a new location.
+    void moveLink(const char *src_name, const Group &dst, const char *dst_name,
+                  const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT,
+                  const LinkAccPropList   &lapl = LinkAccPropList::DEFAULT) const;
+    void moveLink(const H5std_string &src_name, const Group &dst, const H5std_string &dst_name,
+                  const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT,
+                  const LinkAccPropList   &lapl = LinkAccPropList::DEFAULT) const;
+
+    // Renames a link in this group.
+    void moveLink(const char *src_name, const char *dst_name,
+                  const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT,
+                  const LinkAccPropList   &lapl = LinkAccPropList::DEFAULT) const;
+    void moveLink(const H5std_string &src_name, const H5std_string &dst_name,
+                  const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT,
+                  const LinkAccPropList   &lapl = LinkAccPropList::DEFAULT) const;
+
+    // Renames an object at this location.
+    // Deprecated due to inadequate functionality.
+    void move(const char *src, const char *dst) const;
+    void move(const H5std_string &src, const H5std_string &dst) const;
+
+    // end From CommonFG
+
+    /// For subclasses, H5File and Group, to throw appropriate exception.
+    virtual void throwException(const H5std_string &func_name, const H5std_string &msg) const;
+
+    // Default constructor
+    H5Location();
+
+  protected:
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
+    // *** Deprecation warning ***
+    // The following two constructors are no longer appropriate after the
+    // data member "id" had been moved to the sub-classes.
+    // The copy constructor is a noop and is removed in 1.8.15 and the
+    // other will be removed from 1.10 release, and then from 1.8 if its
+    // removal does not raise any problems in two 1.10 releases.
 
-	// *** Deprecation warning ***
-	// The following two constructors are no longer appropriate after the
-	// data member "id" had been moved to the sub-classes.
-	// The copy constructor is a noop and is removed in 1.8.15 and the
-	// other will be removed from 1.10 release, and then from 1.8 if its
-	// removal does not raise any problems in two 1.10 releases.
-
-	// Creates a copy of an existing object giving the location id.
-	H5Location(const hid_t loc_id);
+    // Creates a copy of an existing object giving the location id.
+    // H5Location(const hid_t loc_id);
 
-	// Copy constructor.
-	// H5Location(const H5Location& original);
+    // Creates a reference to an HDF5 object or a dataset region.
+    void p_reference(void *ref, const char *name, hid_t space_id, H5R_type_t ref_type) const;
 
-	// Creates a reference to an HDF5 object or a dataset region.
-	void p_reference(void* ref, const char* name, hid_t space_id, H5R_type_t ref_type) const;
-
-	// Dereferences a ref into an HDF5 id.
-	hid_t p_dereference(hid_t loc_id, const void* ref, H5R_type_t ref_type, const PropList& plist, const char* from_func);
+    // Dereferences a ref into an HDF5 id.
+    hid_t p_dereference(hid_t loc_id, const void *ref, H5R_type_t ref_type, const PropList &plist,
+                        const char *from_func);
 
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-	// Retrieves the type of object that an object reference points to.
-	H5G_obj_t p_get_obj_type(void *ref, H5R_type_t ref_type) const;
+    // Retrieves the type of object that an object reference points to.
+    H5G_obj_t p_get_obj_type(void *ref, H5R_type_t ref_type) const;
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
 
-	// Retrieves the type of object that an object reference points to.
-	H5O_type_t p_get_ref_obj_type(void *ref, H5R_type_t ref_type) const;
+    // Retrieves the type of object that an object reference points to.
+    H5O_type_t p_get_ref_obj_type(void *ref, H5R_type_t ref_type) const;
+
+    // Sets the identifier of this object to a new value. - this one
+    // doesn't increment reference count
+    // virtual void p_setId(const hid_t new_id);
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS
 
-	// Noop destructor.
-	virtual ~H5Location();
+    // Noop destructor.
+    virtual ~H5Location() override;
 
-}; /* end class H5Location */
+}; // end of H5Location
+} // namespace H5
 
-#ifndef H5_NO_NAMESPACE
-}
-#endif
-#endif // __H5Location_H
+#endif // H5Location_H
diff --git a/c++/src/H5Object.cpp b/c++/src/H5Object.cpp
index df3f565..94d76a8 100644
--- a/c++/src/H5Object.cpp
+++ b/c++/src/H5Object.cpp
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <string>
@@ -19,57 +16,438 @@
 #include "H5Exception.h"
 #include "H5IdComponent.h"
 #include "H5PropList.h"
-#include "H5Object.h"
-#include "H5DcreatProp.h"
-#include "H5DxferProp.h"
 #include "H5FaccProp.h"
 #include "H5FcreatProp.h"
-#include "H5CommonFG.h"
+#include "H5OcreatProp.h"
+#include "H5DcreatProp.h"
+#include "H5DxferProp.h"
+#include "H5LcreatProp.h"
+#include "H5LaccProp.h"
+#include "H5DaccProp.h"
+#include "H5Location.h"
+#include "H5Object.h"
 #include "H5DataType.h"
 #include "H5DataSpace.h"
 #include "H5AbstractDs.h"
+#include "H5CommonFG.h"
+#include "H5Group.h"
 #include "H5File.h"
 #include "H5DataSet.h"
 #include "H5Attribute.h"
-#include "H5private.h"		// for HDmemset
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#endif
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
+// userAttrOpWrpr interfaces between the user's function and the
+// C library function H5Aiterate2
+extern "C" {
+
+static herr_t
+userAttrOpWrpr(hid_t loc_id, const char *attr_name, const H5A_info_t *ainfo, void *op_data)
+{
+    // Unused
+    (void)loc_id;
+    (void)ainfo;
+
+    H5std_string       s_attr_name = H5std_string(attr_name);
+    UserData4Aiterate *myData      = reinterpret_cast<UserData4Aiterate *>(op_data);
+    myData->op(*myData->location, s_attr_name, myData->opData);
+    return 0;
+}
+
+// userVisitOpWrpr interfaces between the user's function and the
+// C library function H5Ovisit3
+static herr_t
+userVisitOpWrpr(hid_t obj_id, const char *attr_name, const H5O_info2_t *obj_info, void *op_data)
+{
+    // Unused
+    (void)obj_id;
+
+    H5std_string    s_attr_name = H5std_string(attr_name);
+    UserData4Visit *myData      = reinterpret_cast<UserData4Visit *>(op_data);
+    int             status      = myData->op(*myData->obj, s_attr_name, obj_info, myData->opData);
+    return status;
+}
+
+} // extern "C"
+
+//--------------------------------------------------------------------------
+// Function:    H5Object default constructor (protected)
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+H5Object::H5Object() : H5Location()
+{
+}
+
+//--------------------------------------------------------------------------
+// Function:    f_Attribute_setId - friend
+// Purpose:     This function is friend to class H5::Attribute so that it
+//              can set Attribute::id in order to work around a problem
+//              described in the JIRA issue HDFFV-7947.
+//              Applications shouldn't need to use it.
+// param        attr   - IN/OUT: Attribute object to be changed
+// param        new_id - IN: New id to set
+// Programmer   Binh-Minh Ribler - 2015
+//--------------------------------------------------------------------------
+void
+f_Attribute_setId(Attribute *attr, hid_t new_id)
+{
+    attr->p_setId(new_id);
+}
+#endif
+
+//--------------------------------------------------------------------------
+// Function:    H5Object::createAttribute
+///\brief       Creates an attribute for a group, dataset, or named datatype.
+///\param       name - IN: Name of the attribute
+///\param       data_type - IN: Datatype for the attribute
+///\param       data_space - IN: Dataspace for the attribute - only simple
+///             dataspaces are allowed at this time
+///\param       create_plist - IN: Creation property list - default to
+///             PropList::DEFAULT
+///\return      Attribute instance
+///\exception   H5::AttributeIException
+///\par Description
+///             The attribute name specified in \a name must be unique.
+///             Attempting to create an attribute with the same name as an
+///             existing attribute will raise an exception, leaving the
+///             pre-existing attribute intact. To overwrite an existing
+///             attribute with a new attribute of the same name, first
+///             delete the existing one with \c H5Object::removeAttr, then
+///             recreate it with this function.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-// Function:	H5Object default constructor (protected)
-// Programmer	Binh-Minh Ribler - 2000
+Attribute
+H5Object::createAttribute(const char *name, const DataType &data_type, const DataSpace &data_space,
+                          const PropList &create_plist) const
+{
+    hid_t type_id  = data_type.getId();
+    hid_t space_id = data_space.getId();
+    hid_t plist_id = create_plist.getId();
+    hid_t attr_id  = H5Acreate2(getId(), name, type_id, space_id, plist_id, H5P_DEFAULT);
+
+    // If the attribute id is valid, create and return the Attribute object
+    if (attr_id > 0) {
+        Attribute attr;
+        f_Attribute_setId(&attr, attr_id);
+        return (attr);
+    }
+    else
+        throw AttributeIException(inMemFunc("createAttribute"), "H5Acreate2 failed");
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Object::createAttribute
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes
+///             a reference to an \c H5std_string for \a name.
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+Attribute
+H5Object::createAttribute(const H5std_string &name, const DataType &data_type, const DataSpace &data_space,
+                          const PropList &create_plist) const
+{
+    return (createAttribute(name.c_str(), data_type, data_space, create_plist));
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Object::openAttribute
+///\brief       Opens an attribute given its name.
+///\param       name - IN: Name of the attribute
+///\return      Attribute instance
+///\exception   H5::AttributeIException
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+Attribute
+H5Object::openAttribute(const char *name) const
+{
+    hid_t attr_id = H5Aopen(getId(), name, H5P_DEFAULT);
+    if (attr_id > 0) {
+        Attribute attr;
+        f_Attribute_setId(&attr, attr_id);
+        return (attr);
+    }
+    else {
+        throw AttributeIException(inMemFunc("openAttribute"), "H5Aopen failed");
+    }
+}
+
 //--------------------------------------------------------------------------
-H5Object::H5Object() : H5Location() {}
+// Function:    H5Object::openAttribute
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes
+///             a reference to an \c H5std_string for \a name.
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+Attribute
+H5Object::openAttribute(const H5std_string &name) const
+{
+    return (openAttribute(name.c_str()));
+}
 
 //--------------------------------------------------------------------------
-// Function:	H5Object overloaded constructor (protected)
-// Purpose	Creates an H5Object object using the id of an existing HDF5
-// 		object.
-// Parameters	object_id - IN: Id of an existing HDF5 object
-// Programmer	Binh-Minh Ribler - 2000
-// *** Deprecation warning ***
-// This constructor is no longer appropriate because the data member "id" had
-// been moved to the sub-classes.  It will be removed in 1.10 release.  If its
-// removal does not raise any problems in 1.10, it will be removed from 1.8 in
-// subsequent releases.
+// Function:    H5Object::openAttribute
+///\brief       Opens an attribute given its index.
+///\param       idx - IN: Index of the attribute, a 0-based, non-negative integer
+///\return      Attribute instance
+///\exception   H5::AttributeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-H5Object::H5Object(const hid_t object_id) : H5Location() {}
+Attribute
+H5Object::openAttribute(const unsigned int idx) const
+{
+    hid_t attr_id = H5Aopen_by_idx(getId(), ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, static_cast<hsize_t>(idx),
+                                   H5P_DEFAULT, H5P_DEFAULT);
+    if (attr_id > 0) {
+        Attribute attr;
+        f_Attribute_setId(&attr, attr_id);
+        return (attr);
+    }
+    else {
+        throw AttributeIException(inMemFunc("openAttribute"), "H5Aopen_by_idx failed");
+    }
+}
 
 //--------------------------------------------------------------------------
-// Function:	H5Object copy constructor
-///\brief	Copy constructor: makes a copy of the original H5Object
-///		instance.
-///\param	original - IN: H5Object instance to copy
-// Programmer	Binh-Minh Ribler - 2000
-// *** Deprecation warning ***
-// This constructor is no longer appropriate because the data member "id" had
-// been moved to the sub-classes.  It is removed from 1.8.15 because it is
-// a noop and it can be generated by the compiler if needed.
+// Function:    H5Object::iterateAttrs
+///\brief       Iterates a user's function over all the attributes of an H5
+///             object, which may be a group, dataset or named datatype.
+///\param       user_op - IN: User's function to operate on each attribute
+///\param       _idx - IN/OUT: Starting (IN) and ending (OUT) attribute indices
+///\param       op_data - IN: User's data to pass to user's operator function
+///\return      Returned value of the last operator if it was non-zero, or
+///             zero if all attributes were processed
+///\exception   H5::AttributeIException
+///\par Description
+///             The signature of user_op is
+///             void (*)(H5::H5Location&, H5std_string, void*).
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-// H5Object::H5Object(const H5Object& original) : H5Location() {}
+int
+H5Object::iterateAttrs(attr_operator_t user_op, unsigned *_idx, void *op_data)
+{
+    // store the user's function and data
+    UserData4Aiterate *userData = new UserData4Aiterate;
+    userData->opData            = op_data;
+    userData->op                = user_op;
+    userData->location          = this;
+
+    // call the C library routine H5Aiterate2 to iterate the attributes
+    hsize_t idx = _idx ? static_cast<hsize_t>(*_idx) : 0;
+    int     ret_value =
+        H5Aiterate2(getId(), H5_INDEX_NAME, H5_ITER_INC, &idx, userAttrOpWrpr, static_cast<void *>(userData));
+
+    // release memory
+    delete userData;
+
+    if (ret_value >= 0) {
+        /* Pass back update index value to calling code */
+        if (_idx)
+            *_idx = static_cast<unsigned>(idx);
+        return (ret_value);
+    }
+    else // raise exception when H5Aiterate returns a negative value
+        throw AttributeIException(inMemFunc("iterateAttrs"), "H5Aiterate2 failed");
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Object::visit
+///\brief       Recursively visits all HDF5 objects accessible from this object.
+///\param       idx_type - IN: Type of index; valid values include:
+///             \li \c H5_INDEX_NAME
+///             \li \c H5_INDEX_CRT_ORDER
+///\param       order - IN: Order in which index is traversed; valid values include:
+///             \li \c H5_ITER_DEC
+///             \li \c H5_ITER_INC
+///             \li \c H5_ITER_NATIVE
+///\param       user_op  - IN: Callback function passing data regarding the
+///                            object to the calling application
+///\param       *op_data - IN: User-defined pointer to data required by the
+///                            application for its processing of the object
+///\param       fields   - IN: Flags specifying the fields to be retrieved
+///                            to the callback op via the H5O_info2_t argument.
+///             \li \c H5O_INFO_BASIC      fileno, addr, type, and rc fields
+///             \li \c H5O_INFO_TIME       atime, mtime, ctime, and btime fields
+///             \li \c H5O_INFO_NUM_ATTRS  num_attrs field
+///             \li \c H5O_INFO_ALL        H5O_INFO_BASIC | H5O_INFO_TIME | H5O_INFO_NUM_ATTRS
+///\return
+///             \li On success:
+///                 \li the return value of the first operator that returns a positive value
+///                 \li zero if all members were processed with no operator returning non-zero
+///             \li On failure:
+///                 \li an exception Exception will be thrown if something went
+///                     wrong within the library or the operator failed
+///\exception   H5::Exception
+///\par Description
+///             For information, please refer to the H5Ovisit3 API in the HDF5
+///             C Reference Manual.
+// Programmer   Binh-Minh Ribler - Feb, 2019
+//--------------------------------------------------------------------------
+void
+H5Object::visit(H5_index_t idx_type, H5_iter_order_t order, visit_operator_t user_op, void *op_data,
+                unsigned int fields)
+{
+    // Store the user's function and data
+    UserData4Visit *userData = new UserData4Visit;
+    userData->opData         = op_data;
+    userData->op             = user_op;
+    userData->obj            = this;
+
+    // Call the C API passing in op wrapper and info
+    herr_t ret_value =
+        H5Ovisit3(getId(), idx_type, order, userVisitOpWrpr, static_cast<void *>(userData), fields);
+
+    // Release memory
+    delete userData;
+
+    // Throw exception if H5Ovisit3 failed, which could be a failure in
+    // the library or in the call back operator
+    if (ret_value < 0)
+        throw Exception(inMemFunc("visit"), "H5Ovisit3 failed");
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Object::objVersion
+///\brief       Returns the header version of this HDF5 object.
+///\return      Object version, which can have the following values:
+///             \li \c H5O_VERSION_1
+///             \li \c H5O_VERSION_2
+///\exception   H5::ObjHeaderIException
+///             Exception will be thrown when:
+///             - an error returned by the C API
+///             - version number is not one of the valid values above
+// Programmer   Binh-Minh Ribler - December, 2016
+//--------------------------------------------------------------------------
+unsigned
+H5Object::objVersion() const
+{
+    H5O_native_info_t objinfo;
+    unsigned          version = 0;
+
+    // Use C API to get information of the object
+    herr_t ret_value = H5Oget_native_info(getId(), &objinfo, H5O_NATIVE_INFO_HDR);
+
+    // Throw exception if C API returns failure
+    if (ret_value < 0)
+        throw Exception(inMemFunc("objVersion"), "H5Oget_native_info failed");
+    // Return a valid version or throw an exception for invalid value
+    else {
+        version = objinfo.hdr.version;
+        if (version != H5O_VERSION_1 && version != H5O_VERSION_2)
+            throw ObjHeaderIException("objVersion", "Invalid version for object");
+    }
+    return (version);
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Object::getNumAttrs
+///\brief       Returns the number of attributes attached to this HDF5 object.
+///\return      Number of attributes
+///\exception   H5::AttributeIException
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+int
+H5Object::getNumAttrs() const
+{
+    H5O_info2_t oinfo; /* Object info */
+
+    if (H5Oget_info3(getId(), &oinfo, H5O_INFO_NUM_ATTRS) < 0)
+        throw AttributeIException(inMemFunc("getNumAttrs"), "H5Oget_info failed");
+    else
+        return (static_cast<int>(oinfo.num_attrs));
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Object::attrExists
+///\brief       Checks whether the named attribute exists at this location.
+///\param       name - IN: Name of the attribute to be queried
+///\exception   H5::AttributeIException
+// Programmer   Binh-Minh Ribler - 2013
+//--------------------------------------------------------------------------
+bool
+H5Object::attrExists(const char *name) const
+{
+    // Call C routine H5Aexists to determine whether an attribute exists
+    // at this location, which could be specified by a file, group, dataset,
+    // or named datatype.
+    herr_t ret_value = H5Aexists(getId(), name);
+    if (ret_value > 0)
+        return true;
+    else if (ret_value == 0)
+        return false;
+    else // Raise exception when H5Aexists returns a negative value
+        throw AttributeIException(inMemFunc("attrExists"), "H5Aexists failed");
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Object::attrExists
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes
+///             a reference to an \c H5std_string for \a name.
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+bool
+H5Object::attrExists(const H5std_string &name) const
+{
+    return (attrExists(name.c_str()));
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Object::removeAttr
+///\brief       Removes the named attribute from this object.
+///\param       name - IN: Name of the attribute to be removed
+///\exception   H5::AttributeIException
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+void
+H5Object::removeAttr(const char *name) const
+{
+    herr_t ret_value = H5Adelete(getId(), name);
+    if (ret_value < 0)
+        throw AttributeIException(inMemFunc("removeAttr"), "H5Adelete failed");
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Object::removeAttr
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes
+///             a reference to an \c H5std_string for \a name.
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+void
+H5Object::removeAttr(const H5std_string &name) const
+{
+    removeAttr(name.c_str());
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Object::renameAttr
+///\brief       Renames the named attribute from this object.
+///\param       oldname - IN: Name of the attribute to be renamed
+///\param       newname - IN: New name ame of the attribute
+///\exception   H5::AttributeIException
+// Programmer   Binh-Minh Ribler - Mar, 2005
+//--------------------------------------------------------------------------
+void
+H5Object::renameAttr(const char *oldname, const char *newname) const
+{
+    herr_t ret_value = H5Arename(getId(), oldname, newname);
+    if (ret_value < 0)
+        throw AttributeIException(inMemFunc("renameAttr"), "H5Arename failed");
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Object::renameAttr
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes
+///             a reference to an \c H5std_string for the names.
+// Programmer   Binh-Minh Ribler - Mar, 2005
+//--------------------------------------------------------------------------
+void
+H5Object::renameAttr(const H5std_string &oldname, const H5std_string &newname) const
+{
+    renameAttr(oldname.c_str(), newname.c_str());
+}
 
 //--------------------------------------------------------------------------
 // Function:    getObjName
@@ -77,22 +455,21 @@ H5Object::H5Object(const hid_t object_id) : H5Location() {}
 ///\return      The name of the object
 // Programmer   Binh-Minh Ribler - Mar, 2014
 //--------------------------------------------------------------------------
-ssize_t H5Object::getObjName(char *obj_name, size_t buf_size) const
+ssize_t
+H5Object::getObjName(char *obj_name, size_t buf_size) const
 {
     // H5Iget_name will get buf_size-1 chars of the name to null terminate it
     ssize_t name_size = H5Iget_name(getId(), obj_name, buf_size);
 
     // If H5Iget_name returns a negative value, raise an exception
-    if (name_size < 0)
-    {
+    if (name_size < 0) {
         throw Exception(inMemFunc("getObjName"), "H5Iget_name failed");
     }
-    else if (name_size == 0)
-    {
+    else if (name_size == 0) {
         throw Exception(inMemFunc("getObjName"), "Object must have a name, but name length is 0");
     }
     // Return length of the name
-    return(name_size);
+    return (name_size);
 }
 
 //--------------------------------------------------------------------------
@@ -101,41 +478,44 @@ ssize_t H5Object::getObjName(char *obj_name, size_t buf_size) const
 ///\return      Name of the object
 ///\exception   H5::Exception
 // Programmer   Binh-Minh Ribler - Mar, 2014
-// Modification
 //--------------------------------------------------------------------------
-H5std_string H5Object::getObjName() const
+H5std_string
+H5Object::getObjName() const
 {
-    H5std_string obj_name(""); // object name to return
+    H5std_string obj_name; // object name to return
 
     // Preliminary call to get the size of the object name
-    ssize_t name_size = H5Iget_name(getId(), NULL, (size_t)0);
+    ssize_t name_size = H5Iget_name(getId(), NULL, 0);
 
     // If H5Iget_name failed, throw exception
-    if (name_size < 0)
-    {
+    if (name_size < 0) {
         throw Exception(inMemFunc("getObjName"), "H5Iget_name failed");
     }
-    else if (name_size == 0)
-    {
+    else if (name_size == 0) {
         throw Exception(inMemFunc("getObjName"), "Object must have a name, but name length is 0");
     }
     // Object's name exists, retrieve it
-    else if (name_size > 0)
-    {
-        char* name_C = new char[name_size+1];  // temporary C-string
-        HDmemset(name_C, 0, name_size+1); // clear buffer
+    else if (name_size > 0) {
+
+        // The actual size is the cast value + 1 for the terminal ASCII NUL
+        // (unfortunate in/out type sign mismatch)
+        size_t actual_name_size = static_cast<size_t>(name_size) + 1;
+
+        // Create buffer for C string
+        char *name_C = new char[actual_name_size]();
 
         // Use overloaded function
-        name_size = getObjName(name_C, name_size+1);
+        name_size = getObjName(name_C, actual_name_size);
 
         // Convert the C object name to return
         obj_name = name_C;
 
         // Clean up resource
-        delete []name_C;
+        delete[] name_C;
     }
+
     // Return object's name
-    return(obj_name);
+    return obj_name;
 }
 
 //--------------------------------------------------------------------------
@@ -151,45 +531,45 @@ H5std_string H5Object::getObjName() const
 ///             which case the entire name will be retrieved.
 // Programmer   Binh-Minh Ribler - Mar, 2014
 //--------------------------------------------------------------------------
-ssize_t H5Object::getObjName(H5std_string& obj_name, size_t len) const
+ssize_t
+H5Object::getObjName(H5std_string &obj_name, size_t len) const
 {
     ssize_t name_size = 0;
 
     // If no length is provided, get the entire object name
-    if (len == 0)
-    {
-        obj_name = getObjName();
-        name_size = obj_name.length();
+    if (len == 0) {
+        obj_name  = getObjName();
+        name_size = static_cast<ssize_t>(obj_name.length());
     }
     // If length is provided, get that number of characters in name
-    else
-    {
-        char* name_C = new char[len+1];  // temporary C-string
-        HDmemset(name_C, 0, len+1); // clear buffer
+    else {
+        // Create buffer for C string
+        char *name_C = new char[len + 1]();
 
         // Use overloaded function
-        name_size = getObjName(name_C, len+1);
+        name_size = getObjName(name_C, len + 1);
 
         // Convert the C object name to return
         obj_name = name_C;
 
         // Clean up resource
-        delete []name_C;
+        delete[] name_C;
     }
     // Otherwise, keep obj_name intact
 
     // Return name size
-    return(name_size);
+    return name_size;
 }
 
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
 //--------------------------------------------------------------------------
-// Function:	H5Object destructor
-///\brief	Noop destructor.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    H5Object destructor
+///\brief       Noop destructor.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-H5Object::~H5Object() {}
+H5Object::~H5Object()
+{
+}
 #endif // DOXYGEN_SHOULD_SKIP_THIS
 
-#ifndef H5_NO_NAMESPACE
-} // end namespace
-#endif
+} // namespace H5
diff --git a/c++/src/H5Object.h b/c++/src/H5Object.h
index f8ac792..1e93c0c 100644
--- a/c++/src/H5Object.h
+++ b/c++/src/H5Object.h
@@ -1,83 +1,134 @@
 // C++ informative line for the emacs editor: -*- C++ -*-
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5Object_H
-#define __H5Object_H
-
-#include "H5Location.h"
-#include "H5Classes.h"		// constains forward class declarations
-
-// H5Object is a baseclass.  It has these subclasses:
-// Group, DataSet, and DataType.
-// DataType, in turn, has several specific datatypes as subclasses.
-// Modification:
-//	Sept 18, 2012: Added class H5Location in between IdComponent and
-//		H5Object.  An H5File now inherits from H5Location.  All HDF5
-//		wrappers in H5Object are moved up to H5Location.  H5Object
-//		is left mostly empty for future wrappers that are only for
-//		group, dataset, and named datatype.  Note that the reason for
-//		adding H5Location instead of simply moving H5File to be under
-//		H5Object is H5File is not an HDF5 object, and renaming H5Object
-//		to H5Location will risk breaking user applications.
-//		-BMR
-//	Apr 2, 2014: Added wrapper getObjName for H5Iget_name 
-#ifndef H5_NO_NAMESPACE
+#ifndef H5Object_H
+#define H5Object_H
+
 namespace H5 {
-#endif
 
 /*! \class H5Object
     \brief Class H5Object is a bridge between H5Location and DataSet, DataType,
      and Group.
 
-    All the wrappers in H5Object were moved to H5Location.
+    Modification:
+        Sept 18, 2012: Added class H5Location in between IdComponent and
+                H5Object.  An H5File now inherits from H5Location.  All HDF5
+                wrappers in H5Object are moved up to H5Location.  H5Object
+                is left mostly empty for future wrappers that are only for
+                group, dataset, and named datatype.  Note that the reason for
+                adding H5Location instead of simply moving H5File to be under
+                H5Object is H5File is not an HDF5 object, and renaming H5Object
+                to H5Location will risk breaking user applications.
+                -BMR
+        Apr 2, 2014: Added wrapper getObjName for H5Iget_name
+        Sep 21, 2016: Rearranging classes (HDFFV-9920) moved H5A wrappers back
+                into H5Object.  This way, C functions that takes attribute id
+                can be in H5Location and those that cannot take attribute id
+                can be in H5Object.
 */
+// Inheritance: H5Location -> IdComponent
+
+// Define the operator function pointer for H5Aiterate().
+typedef void (*attr_operator_t)(H5Object &loc, const H5std_string attr_name, void *operator_data);
+
+// Define the operator function pointer for H5Ovisit3().
+typedef int (*visit_operator_t)(H5Object &obj, const H5std_string attr_name, const H5O_info2_t *oinfo,
+                                void *operator_data);
+
+// User data for attribute iteration
+class UserData4Aiterate {
+  public:
+    attr_operator_t op;
+    void           *opData;
+    H5Object       *location; // Consider changing to H5Location
+};
+
+// User data for visit iteration
+class UserData4Visit {
+  public:
+    visit_operator_t op;
+    void            *opData;
+    H5Object        *obj;
+};
+
 class H5_DLLCPP H5Object : public H5Location {
-   public:
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
-	// Gets the name of this HDF5 object, i.e., Group, DataSet, or
-	// DataType.
-	ssize_t getObjName(char *obj_name, size_t buf_size = 0) const;
-	ssize_t getObjName(H5std_string& obj_name, size_t len = 0) const;
-	H5std_string getObjName() const;
+  public:
+    // Creates an attribute for the specified object
+    // PropList is currently not used, so always be default.
+    Attribute createAttribute(const char *name, const DataType &type, const DataSpace &space,
+                              const PropList &create_plist = PropList::DEFAULT) const;
+    Attribute createAttribute(const H5std_string &name, const DataType &type, const DataSpace &space,
+                              const PropList &create_plist = PropList::DEFAULT) const;
+
+    // Given its name, opens the attribute that belongs to an object at
+    // this location.
+    Attribute openAttribute(const char *name) const;
+    Attribute openAttribute(const H5std_string &name) const;
+
+    // Given its index, opens the attribute that belongs to an object at
+    // this location.
+    Attribute openAttribute(const unsigned int idx) const;
 
-	// Noop destructor.
-	virtual ~H5Object();
+    // Iterate user's function over the attributes of this object.
+    int iterateAttrs(attr_operator_t user_op, unsigned *idx = NULL, void *op_data = NULL);
 
-   protected:
-	// Default constructor
-	H5Object();
+    // Recursively visit elements reachable from this object.
+    void visit(H5_index_t idx_type, H5_iter_order_t order, visit_operator_t user_op, void *op_data,
+               unsigned int fields);
+
+    // Returns the object header version of an object
+    unsigned objVersion() const;
+
+    // Determines the number of attributes belong to this object.
+    int getNumAttrs() const;
+
+    // Checks whether the named attribute exists for this object.
+    bool attrExists(const char *name) const;
+    bool attrExists(const H5std_string &name) const;
+
+    // Renames the named attribute to a new name.
+    void renameAttr(const char *oldname, const char *newname) const;
+    void renameAttr(const H5std_string &oldname, const H5std_string &newname) const;
+
+    // Removes the named attribute from this object.
+    void removeAttr(const char *name) const;
+    void removeAttr(const H5std_string &name) const;
+
+    // Returns an identifier.
+    virtual hid_t getId() const override = 0;
+
+    // Gets the name of this HDF5 object, i.e., Group, DataSet, or
+    // DataType.
+    ssize_t      getObjName(char *obj_name, size_t buf_size = 0) const;
+    ssize_t      getObjName(H5std_string &obj_name, size_t len = 0) const;
+    H5std_string getObjName() const;
+
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
 
-        // *** Deprecation warning ***
-        // The following two constructors are no longer appropriate after the
-        // data member "id" had been moved to the sub-classes.
-        // The copy constructor is a noop and is removed in 1.8.15 and the
-        // other will be removed from 1.10 release, and then from 1.8 if its
-        // removal does not raise any problems in two 1.10 releases.
+  protected:
+    // Default constructor
+    H5Object();
 
-	// Creates a copy of an existing object giving the object id
-	H5Object( const hid_t object_id );
+    // Sets the identifier of this object to a new value. - this one
+    // doesn't increment reference count
+    virtual void p_setId(const hid_t new_id) override = 0;
 
-	// Copy constructor: makes copy of an H5Object object.
-	// H5Object(const H5Object& original);
+    // Noop destructor.
+    virtual ~H5Object() override;
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS
 
-}; /* end class H5Object */
+}; // end of H5Object
+} // namespace H5
 
-#ifndef H5_NO_NAMESPACE
-}
-#endif
-#endif // __H5Object_H
+#endif // H5Object_H
diff --git a/c++/src/H5OcreatProp.cpp b/c++/src/H5OcreatProp.cpp
new file mode 100644
index 0000000..1391fc7
--- /dev/null
+++ b/c++/src/H5OcreatProp.cpp
@@ -0,0 +1,220 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#include <string>
+
+#include "H5Include.h"
+#include "H5Exception.h"
+#include "H5IdComponent.h"
+#include "H5PropList.h"
+#include "H5OcreatProp.h"
+
+namespace H5 {
+
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+// This DOXYGEN_SHOULD_SKIP_THIS block is a work-around approach to control
+// the order of creation and deletion of the global constants.  See Design Notes
+// in "H5PredType.cpp" for information.
+
+// Initialize a pointer for the constant
+ObjCreatPropList *ObjCreatPropList::DEFAULT_ = 0;
+
+//--------------------------------------------------------------------------
+// Function:    ObjCreatPropList::getConstant
+//              Creates a ObjCreatPropList object representing the HDF5 constant
+//              H5P_FILE_ACCESS, pointed to by ObjCreatPropList::DEFAULT_
+// exception    H5::PropListIException
+// Description
+//              If ObjCreatPropList::DEFAULT_ already points to an allocated
+//              object, throw a PropListIException.  This scenario should not
+//              happen.
+// Programmer   Binh-Minh Ribler - 2015
+//--------------------------------------------------------------------------
+ObjCreatPropList *
+ObjCreatPropList::getConstant()
+{
+    // Tell the C library not to clean up, H5Library::termH5cpp will call
+    // H5close - more dependency if use H5Library::dontAtExit()
+    if (!IdComponent::H5dontAtexit_called) {
+        (void)H5dont_atexit();
+        IdComponent::H5dontAtexit_called = true;
+    }
+
+    // If the constant pointer is not allocated, allocate it. Otherwise,
+    // throw because it shouldn't be.
+    if (DEFAULT_ == 0)
+        DEFAULT_ = new ObjCreatPropList(H5P_OBJECT_CREATE);
+    else
+        throw PropListIException("ObjCreatPropList::getConstant",
+                                 "ObjCreatPropList::getConstant is being invoked on an allocated DEFAULT_");
+    return (DEFAULT_);
+}
+
+//--------------------------------------------------------------------------
+// Function:    ObjCreatPropList::deleteConstants
+// Purpose:     Deletes the constant object that ObjCreatPropList::DEFAULT_
+//              points to.
+// exception    H5::PropListIException
+// Programmer   Binh-Minh Ribler - 2015
+//--------------------------------------------------------------------------
+void
+ObjCreatPropList::deleteConstants()
+{
+    delete DEFAULT_;
+}
+
+//--------------------------------------------------------------------------
+// Purpose:     Constant for default property
+//--------------------------------------------------------------------------
+const ObjCreatPropList &ObjCreatPropList::DEFAULT = *getConstant();
+
+#endif // DOXYGEN_SHOULD_SKIP_THIS
+
+//--------------------------------------------------------------------------
+// Function:    Default Constructor
+///\brief       Creates a file access property list
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+ObjCreatPropList::ObjCreatPropList() : PropList(H5P_OBJECT_CREATE)
+{
+}
+
+//--------------------------------------------------------------------------
+// Function:    ObjCreatPropList copy constructor
+///\brief       Copy constructor: same HDF5 object as \a original
+///\param       original - IN: ObjCreatPropList instance to copy
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+ObjCreatPropList::ObjCreatPropList(const ObjCreatPropList &original) : PropList(original)
+{
+}
+
+//--------------------------------------------------------------------------
+// Function:    ObjCreatPropList overloaded constructor
+///\brief       Creates a file access property list using the id of an
+///             existing one.
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+ObjCreatPropList::ObjCreatPropList(const hid_t plist_id) : PropList(plist_id)
+{
+}
+
+//--------------------------------------------------------------------------
+// Function:    ObjCreatPropList::setAttrPhaseChange
+///\brief       Sets attribute storage phase change thresholds.
+///\param       max_compact - IN: Maximum number of attributes to be stored in
+///                               compact storage.  Default to 8
+///\param       min_dense   - IN: Minimum number of attributes to be stored in
+///                               dense storage.  Default to 6
+///\exception   H5::PropListIException
+///\par Description
+///             If \c max_compact is set to 0, dense storage will be used.
+///             For more detail about on attribute storage, please refer to the
+///             H5Pset_attr_phase_change API in the HDF5 C Reference Manual.
+// Programmer   Binh-Minh Ribler - September 2015
+//--------------------------------------------------------------------------
+void
+ObjCreatPropList::setAttrPhaseChange(unsigned max_compact, unsigned min_dense) const
+{
+    herr_t ret_value = H5Pset_attr_phase_change(id, max_compact, min_dense);
+    if (ret_value < 0) {
+        throw PropListIException("ObjCreatPropList::setAttrPhaseChange", "H5Pset_attr_phase_change failed");
+    }
+}
+
+//--------------------------------------------------------------------------
+// Function:    ObjCreatPropList::getAttrPhaseChange
+///\brief       Gets attribute storage phase change thresholds.
+///\param       max_compact - OUT: Maximum number of attributes to be stored in
+///                               compact storage.
+///\param       min_dense   - OUT: Minimum number of attributes to be stored in
+///                               dense storage.
+///\exception   H5::PropListIException
+///\par Description
+///             If \c max_compact is set to 0, dense storage will be used.
+///             For more detail about on attribute storage, please refer to the
+///             H5Pget_attr_phase_change API in the HDF5 C Reference Manual.
+// Programmer   Binh-Minh Ribler - September 2015
+//--------------------------------------------------------------------------
+void
+ObjCreatPropList::getAttrPhaseChange(unsigned &max_compact, unsigned &min_dense) const
+{
+    herr_t ret_value;
+    ret_value = H5Pget_attr_phase_change(id, &max_compact, &min_dense);
+    if (ret_value < 0) {
+        throw PropListIException("ObjCreatPropList::getAttrPhaseChange", "H5Pget_attr_phase_change failed");
+    }
+}
+
+//--------------------------------------------------------------------------
+// Function:    ObjCreatPropList::setAttrCrtOrder
+///\brief       Set the flags for creation order of attributes on an object
+///\param       crt_order_flags  - IN: Flags specifying whether to track and
+///                     index attribute creation order.  Default: No flag set
+///\exception   H5::PropListIException
+///\par Description
+///             Valid flags are:
+///             \li \c H5P_CRT_ORDER_TRACKED - Attribute creation order is tracked
+///             \li \c H5P_CRT_ORDER_INDEXED - Attribute creation order is
+///                              indexed (requires H5P_CRT_ORDER_TRACKED).
+///             When no flag is set, attribute creation order is neither
+///             tracked not indexed.  Note that HDF5 currently provides no
+///             mechanism to turn on attribute creation order tracking at object
+///             creation time and to build the index later.
+///             For detail, please refer to the H5Pset_attr_creation_order API
+///             in the HDF5 C Reference Manual.
+// Programmer   Binh-Minh Ribler - September 2015
+//--------------------------------------------------------------------------
+void
+ObjCreatPropList::setAttrCrtOrder(unsigned crt_order_flags) const
+{
+    herr_t ret_value = H5Pset_attr_creation_order(id, crt_order_flags);
+    if (ret_value < 0) {
+        throw PropListIException("ObjCreatPropList::setAttrCrtOrder", "H5Pset_attr_creation_order failed");
+    }
+}
+
+//--------------------------------------------------------------------------
+// Function:    ObjCreatPropList::getAttrCrtOrder
+///\brief       Returns the flags indicating creation order is tracked/indexed
+///             for attributes on an object.
+///\return      The flags
+///\exception   H5::PropListIException
+///\par Description
+///             When no flag is set, i.e. crt_order_flags = 0, attribute
+///             creation order is neither tracked not indexed.
+///             For detail, please refer to the H5Pget_attr_creation_order API
+///             in the HDF5 C Reference Manual.
+// Programmer   Binh-Minh Ribler - September 2015
+//--------------------------------------------------------------------------
+unsigned
+ObjCreatPropList::getAttrCrtOrder() const
+{
+    herr_t   ret_value;
+    unsigned crt_order_flags = 0;
+    ret_value                = H5Pget_attr_creation_order(id, &crt_order_flags);
+    if (ret_value < 0) {
+        throw PropListIException("ObjCreatPropList::getAttrCrtOrder", "H5Pget_attr_creation_order failed");
+    }
+    return (crt_order_flags);
+}
+
+//--------------------------------------------------------------------------
+// Function:    ObjCreatPropList destructor
+///\brief       Noop destructor
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+ObjCreatPropList::~ObjCreatPropList()
+{
+}
+
+} // namespace H5
diff --git a/c++/src/H5OcreatProp.h b/c++/src/H5OcreatProp.h
new file mode 100644
index 0000000..6d752ed
--- /dev/null
+++ b/c++/src/H5OcreatProp.h
@@ -0,0 +1,77 @@
+// C++ informative line for the emacs editor: -*- C++ -*-
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#ifndef H5ObjCreatPropList_H
+#define H5ObjCreatPropList_H
+
+namespace H5 {
+
+/*! \class ObjCreatPropList
+    \brief Class ObjCreatPropList inherits from PropList and provides
+    wrappers for the HDF5 object create property list.
+*/
+//  Inheritance: PropList -> IdComponent
+class H5_DLLCPP ObjCreatPropList : public PropList {
+  public:
+    ///\brief Default object creation property list.
+    static const ObjCreatPropList &DEFAULT;
+
+    // Creates a object creation property list.
+    ObjCreatPropList();
+
+    // Sets attribute storage phase change thresholds.
+    void setAttrPhaseChange(unsigned max_compact = 8, unsigned min_dense = 6) const;
+
+    // Gets attribute storage phase change thresholds.
+    void getAttrPhaseChange(unsigned &max_compact, unsigned &min_dense) const;
+
+    // Sets tracking and indexing of attribute creation order.
+    void setAttrCrtOrder(unsigned crt_order_flags) const;
+
+    // Gets tracking and indexing settings for attribute creation order.
+    unsigned getAttrCrtOrder() const;
+
+    ///\brief Returns this class name.
+    virtual H5std_string
+    fromClass() const override
+    {
+        return ("ObjCreatPropList");
+    }
+
+    // Copy constructor: same as the original ObjCreatPropList.
+    ObjCreatPropList(const ObjCreatPropList &original);
+
+    // Creates a copy of an existing object creation property list
+    // using the property list id.
+    ObjCreatPropList(const hid_t plist_id);
+
+    // Noop destructor
+    virtual ~ObjCreatPropList() override;
+
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+
+    // Deletes the global constant, should only be used by the library
+    static void deleteConstants();
+
+  private:
+    static ObjCreatPropList *DEFAULT_;
+
+    // Creates the global constant, should only be used by the library
+    static ObjCreatPropList *getConstant();
+
+#endif // DOXYGEN_SHOULD_SKIP_THIS
+
+}; // end of ObjCreatPropList
+} // namespace H5
+
+#endif // H5ObjCreatPropList_H
diff --git a/c++/src/H5PredType.cpp b/c++/src/H5PredType.cpp
index 6dbee98..5f5934e 100644
--- a/c++/src/H5PredType.cpp
+++ b/c++/src/H5PredType.cpp
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <string>
@@ -19,283 +16,978 @@
 #include "H5Exception.h"
 #include "H5IdComponent.h"
 #include "H5PropList.h"
-#include "H5Object.h"
+#include "H5OcreatProp.h"
 #include "H5DcreatProp.h"
-#include "H5CommonFG.h"
+#include "H5LcreatProp.h"
+#include "H5LaccProp.h"
+#include "H5DaccProp.h"
+#include "H5Location.h"
+#include "H5Object.h"
 #include "H5DataType.h"
 #include "H5AtomType.h"
-#include "H5Library.h"
 #include "H5PredType.h"
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#endif
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 //--------------------------------------------------------------------------
-// Function:	PredType overloaded constructor
-///\brief	Creates a PredType object using the id of an existing
-///		predefined datatype.
-///\param	predtype_id - IN: Id of a predefined datatype
+// Function:    PredType overloaded constructor
+///\brief       Creates a PredType object using the id of an existing
+///             predefined datatype.
+///\param       predtype_id - IN: Id of a predefined datatype
 // Description
-// 		This constructor creates a PredType object by copying
-//		the provided HDF5 predefined datatype.
-// Programmer	Binh-Minh Ribler - 2000
+//              This constructor creates a PredType object by copying
+//              the provided HDF5 predefined datatype.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-PredType::PredType( const hid_t predtype_id ) : AtomType( predtype_id )
+PredType::PredType(const hid_t predtype_id) : AtomType(predtype_id)
 {
-    if (predtype_id == H5CPP_EXITED)
-	id = predtype_id;
-    else
-	id = H5Tcopy(predtype_id);
+    id = H5Tcopy(predtype_id);
 }
 
 //--------------------------------------------------------------------------
-// Function:	PredType default constructor
-///\brief	Default constructor: Creates a stub predefined datatype
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    PredType default constructor
+///\brief       Default constructor: Creates a stub predefined datatype
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-PredType::PredType() : AtomType() {}
+PredType::PredType() : AtomType()
+{
+}
 #endif // DOXYGEN_SHOULD_SKIP_THIS
 
 //--------------------------------------------------------------------------
-// Function:	PredType copy constructor
-///\brief	Copy constructor: makes a copy of the original PredType object.
-///\param	original - IN: PredType instance to copy
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    PredType copy constructor
+///\brief       Copy constructor: same HDF5 object as \a original
+///\param       original - IN: PredType instance to copy
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-PredType::PredType( const PredType& original ) : AtomType( original ) {}
-
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
-// Flag to terminate HDF5 library in DataType::~DataType
-const PredType PredType::AtExit(H5CPP_EXITED);
-
-// Definition of pre-defined types
-const PredType PredType::C_S1( H5T_C_S1 );
-const PredType PredType::FORTRAN_S1( H5T_FORTRAN_S1 );
-
-const PredType PredType::STD_I8BE( H5T_STD_I8BE );
-const PredType PredType::STD_I8LE( H5T_STD_I8LE );
-const PredType PredType::STD_I16BE( H5T_STD_I16BE );
-const PredType PredType::STD_I16LE( H5T_STD_I16LE );
-const PredType PredType::STD_I32BE( H5T_STD_I32BE );
-const PredType PredType::STD_I32LE( H5T_STD_I32LE );
-const PredType PredType::STD_I64BE( H5T_STD_I64BE );
-const PredType PredType::STD_I64LE( H5T_STD_I64LE );
-const PredType PredType::STD_U8BE( H5T_STD_U8BE );
-const PredType PredType::STD_U8LE( H5T_STD_U8LE );
-const PredType PredType::STD_U16BE( H5T_STD_U16BE );
-const PredType PredType::STD_U16LE( H5T_STD_U16LE );
-const PredType PredType::STD_U32BE( H5T_STD_U32BE );
-const PredType PredType::STD_U32LE( H5T_STD_U32LE );
-const PredType PredType::STD_U64BE( H5T_STD_U64BE );
-const PredType PredType::STD_U64LE( H5T_STD_U64LE );
-const PredType PredType::STD_B8BE( H5T_STD_B8BE );
-const PredType PredType::STD_B8LE( H5T_STD_B8LE );
-
-const PredType PredType::STD_B16BE( H5T_STD_B16BE );
-const PredType PredType::STD_B16LE( H5T_STD_B16LE );
-const PredType PredType::STD_B32BE( H5T_STD_B32BE );
-const PredType PredType::STD_B32LE( H5T_STD_B32LE );
-const PredType PredType::STD_B64BE( H5T_STD_B64BE );
-const PredType PredType::STD_B64LE( H5T_STD_B64LE );
-const PredType PredType::STD_REF_OBJ( H5T_STD_REF_OBJ );
-const PredType PredType::STD_REF_DSETREG( H5T_STD_REF_DSETREG );
-
-const PredType PredType::IEEE_F32BE( H5T_IEEE_F32BE );
-const PredType PredType::IEEE_F32LE( H5T_IEEE_F32LE );
-const PredType PredType::IEEE_F64BE( H5T_IEEE_F64BE );
-const PredType PredType::IEEE_F64LE( H5T_IEEE_F64LE );
-
-const PredType PredType::UNIX_D32BE( H5T_UNIX_D32BE );
-const PredType PredType::UNIX_D32LE( H5T_UNIX_D32LE );
-const PredType PredType::UNIX_D64BE( H5T_UNIX_D64BE );
-const PredType PredType::UNIX_D64LE( H5T_UNIX_D64LE );
-
-const PredType PredType::INTEL_I8( H5T_INTEL_I8 );
-const PredType PredType::INTEL_I16( H5T_INTEL_I16 );
-const PredType PredType::INTEL_I32( H5T_INTEL_I32 );
-const PredType PredType::INTEL_I64( H5T_INTEL_I64 );
-const PredType PredType::INTEL_U8( H5T_INTEL_U8 );
-const PredType PredType::INTEL_U16( H5T_INTEL_U16 );
-const PredType PredType::INTEL_U32( H5T_INTEL_U32 );
-const PredType PredType::INTEL_U64( H5T_INTEL_U64 );
-const PredType PredType::INTEL_B8( H5T_INTEL_B8 );
-const PredType PredType::INTEL_B16( H5T_INTEL_B16 );
-const PredType PredType::INTEL_B32( H5T_INTEL_B32 );
-const PredType PredType::INTEL_B64( H5T_INTEL_B64 );
-const PredType PredType::INTEL_F32( H5T_INTEL_F32 );
-const PredType PredType::INTEL_F64( H5T_INTEL_F64 );
-
-const PredType PredType::ALPHA_I8( H5T_ALPHA_I8 );
-const PredType PredType::ALPHA_I16( H5T_ALPHA_I16 );
-const PredType PredType::ALPHA_I32( H5T_ALPHA_I32 );
-const PredType PredType::ALPHA_I64( H5T_ALPHA_I64 );
-const PredType PredType::ALPHA_U8( H5T_ALPHA_U8 );
-const PredType PredType::ALPHA_U16( H5T_ALPHA_U16 );
-const PredType PredType::ALPHA_U32( H5T_ALPHA_U32 );
-const PredType PredType::ALPHA_U64( H5T_ALPHA_U64 );
-const PredType PredType::ALPHA_B8( H5T_ALPHA_B8 );
-const PredType PredType::ALPHA_B16( H5T_ALPHA_B16 );
-const PredType PredType::ALPHA_B32( H5T_ALPHA_B32 );
-const PredType PredType::ALPHA_B64( H5T_ALPHA_B64 );
-const PredType PredType::ALPHA_F32( H5T_ALPHA_F32 );
-const PredType PredType::ALPHA_F64( H5T_ALPHA_F64 );
-
-const PredType PredType::MIPS_I8( H5T_MIPS_I8 );
-const PredType PredType::MIPS_I16( H5T_MIPS_I16 );
-const PredType PredType::MIPS_I32( H5T_MIPS_I32 );
-const PredType PredType::MIPS_I64( H5T_MIPS_I64 );
-const PredType PredType::MIPS_U8( H5T_MIPS_U8 );
-const PredType PredType::MIPS_U16( H5T_MIPS_U16 );
-const PredType PredType::MIPS_U32( H5T_MIPS_U32 );
-const PredType PredType::MIPS_U64( H5T_MIPS_U64 );
-const PredType PredType::MIPS_B8( H5T_MIPS_B8 );
-const PredType PredType::MIPS_B16( H5T_MIPS_B16 );
-const PredType PredType::MIPS_B32( H5T_MIPS_B32 );
-const PredType PredType::MIPS_B64( H5T_MIPS_B64 );
-const PredType PredType::MIPS_F32( H5T_MIPS_F32 );
-const PredType PredType::MIPS_F64( H5T_MIPS_F64 );
-
-const PredType PredType::NATIVE_CHAR( H5T_NATIVE_CHAR );
-const PredType PredType::NATIVE_INT( H5T_NATIVE_INT );
-const PredType PredType::NATIVE_FLOAT( H5T_NATIVE_FLOAT );
-const PredType PredType::NATIVE_SCHAR( H5T_NATIVE_SCHAR );
-const PredType PredType::NATIVE_UCHAR( H5T_NATIVE_UCHAR );
-const PredType PredType::NATIVE_SHORT( H5T_NATIVE_SHORT );
-const PredType PredType::NATIVE_USHORT( H5T_NATIVE_USHORT );
-const PredType PredType::NATIVE_UINT( H5T_NATIVE_UINT );
-const PredType PredType::NATIVE_LONG( H5T_NATIVE_LONG );
-const PredType PredType::NATIVE_ULONG( H5T_NATIVE_ULONG );
-const PredType PredType::NATIVE_LLONG( H5T_NATIVE_LLONG );
-const PredType PredType::NATIVE_ULLONG( H5T_NATIVE_ULLONG );
-const PredType PredType::NATIVE_DOUBLE( H5T_NATIVE_DOUBLE );
-#if H5_SIZEOF_LONG_DOUBLE !=0
-const PredType PredType::NATIVE_LDOUBLE( H5T_NATIVE_LDOUBLE );
-#endif
-const PredType PredType::NATIVE_B8( H5T_NATIVE_B8 );
-const PredType PredType::NATIVE_B16( H5T_NATIVE_B16 );
-const PredType PredType::NATIVE_B32( H5T_NATIVE_B32 );
-const PredType PredType::NATIVE_B64( H5T_NATIVE_B64 );
-const PredType PredType::NATIVE_OPAQUE( H5T_NATIVE_OPAQUE );
-const PredType PredType::NATIVE_HSIZE( H5T_NATIVE_HSIZE );
-const PredType PredType::NATIVE_HSSIZE( H5T_NATIVE_HSSIZE );
-const PredType PredType::NATIVE_HERR( H5T_NATIVE_HERR );
-const PredType PredType::NATIVE_HBOOL( H5T_NATIVE_HBOOL );
-
-const PredType PredType::NATIVE_INT8( H5T_NATIVE_INT8 );
-const PredType PredType::NATIVE_UINT8( H5T_NATIVE_UINT8 );
-const PredType PredType::NATIVE_INT16( H5T_NATIVE_INT16 );
-const PredType PredType::NATIVE_UINT16( H5T_NATIVE_UINT16 );
-const PredType PredType::NATIVE_INT32( H5T_NATIVE_INT32 );
-const PredType PredType::NATIVE_UINT32( H5T_NATIVE_UINT32 );
-const PredType PredType::NATIVE_INT64( H5T_NATIVE_INT64 );
-const PredType PredType::NATIVE_UINT64( H5T_NATIVE_UINT64 );
-
-// LEAST types
-#if H5_SIZEOF_INT_LEAST8_T != 0
-const PredType PredType::NATIVE_INT_LEAST8( H5T_NATIVE_INT_LEAST8 );
-#endif /* H5_SIZEOF_INT_LEAST8_T */
-#if H5_SIZEOF_UINT_LEAST8_T != 0
-const PredType PredType::NATIVE_UINT_LEAST8( H5T_NATIVE_UINT_LEAST8 );
-#endif /* H5_SIZEOF_UINT_LEAST8_T */
-
-#if H5_SIZEOF_INT_LEAST16_T != 0
-const PredType PredType::NATIVE_INT_LEAST16( H5T_NATIVE_INT_LEAST16 );
-#endif /* H5_SIZEOF_INT_LEAST16_T */
-#if H5_SIZEOF_UINT_LEAST16_T != 0
-const PredType PredType::NATIVE_UINT_LEAST16( H5T_NATIVE_UINT_LEAST16 );
-#endif /* H5_SIZEOF_UINT_LEAST16_T */
-
-#if H5_SIZEOF_INT_LEAST32_T != 0
-const PredType PredType::NATIVE_INT_LEAST32( H5T_NATIVE_INT_LEAST32 );
-#endif /* H5_SIZEOF_INT_LEAST32_T */
-#if H5_SIZEOF_UINT_LEAST32_T != 0
-const PredType PredType::NATIVE_UINT_LEAST32( H5T_NATIVE_UINT_LEAST32 );
-#endif /* H5_SIZEOF_UINT_LEAST32_T */
-
-#if H5_SIZEOF_INT_LEAST64_T != 0
-const PredType PredType::NATIVE_INT_LEAST64( H5T_NATIVE_INT_LEAST64 );
-#endif /* H5_SIZEOF_INT_LEAST64_T */
-#if H5_SIZEOF_UINT_LEAST64_T != 0
-const PredType PredType::NATIVE_UINT_LEAST64( H5T_NATIVE_UINT_LEAST64 );
-#endif /* H5_SIZEOF_UINT_LEAST64_T */
-
-// FAST types
-#if H5_SIZEOF_INT_FAST8_T != 0
-const PredType PredType::NATIVE_INT_FAST8( H5T_NATIVE_INT_FAST8 );
-#endif /* H5_SIZEOF_INT_FAST8_T */
-#if H5_SIZEOF_UINT_FAST8_T != 0
-const PredType PredType::NATIVE_UINT_FAST8( H5T_NATIVE_UINT_FAST8 );
-#endif /* H5_SIZEOF_UINT_FAST8_T */
-
-#if H5_SIZEOF_INT_FAST16_T != 0
-const PredType PredType::NATIVE_INT_FAST16( H5T_NATIVE_INT_FAST16 );
-#endif /* H5_SIZEOF_INT_FAST16_T */
-#if H5_SIZEOF_UINT_FAST16_T != 0
-const PredType PredType::NATIVE_UINT_FAST16( H5T_NATIVE_UINT_FAST16 );
-#endif /* H5_SIZEOF_UINT_FAST16_T */
-
-#if H5_SIZEOF_INT_FAST32_T != 0
-const PredType PredType::NATIVE_INT_FAST32( H5T_NATIVE_INT_FAST32 );
-#endif /* H5_SIZEOF_INT_FAST32_T */
-#if H5_SIZEOF_UINT_FAST32_T != 0
-const PredType PredType::NATIVE_UINT_FAST32( H5T_NATIVE_UINT_FAST32 );
-#endif /* H5_SIZEOF_UINT_FAST32_T */
-
-#if H5_SIZEOF_INT_FAST64_T != 0
-const PredType PredType::NATIVE_INT_FAST64( H5T_NATIVE_INT_FAST64 );
-#endif /* H5_SIZEOF_INT_FAST64_T */
-#if H5_SIZEOF_UINT_FAST64_T != 0
-const PredType PredType::NATIVE_UINT_FAST64( H5T_NATIVE_UINT_FAST64 );
-#endif /* H5_SIZEOF_UINT_FAST64_T */
-#endif // DOXYGEN_SHOULD_SKIP_THIS
+PredType::PredType(const PredType &original) : AtomType(original)
+{
+}
 
 //--------------------------------------------------------------------------
-// Function:	PredType::operator=
-///\brief	Assignment operator.
-///\param	rhs - IN: Reference to the predefined datatype
-///\return	Reference to PredType instance
-///\exception	H5::DataTypeIException
+// Function:    PredType::operator=
+///\brief       Assignment operator.
+///\param       rhs - IN: Reference to the predefined datatype
+///\return      Reference to PredType instance
+///\exception   H5::DataTypeIException
 // Description
-//		Makes a copy of the type on the right hand side and stores
-//		the new id in the left hand side object.
-// Programmer	Binh-Minh Ribler - 2000
+//              Makes a copy of the type on the right hand side and stores
+//              the new id in the left hand side object.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-PredType& PredType::operator=( const PredType& rhs )
+PredType &
+PredType::operator=(const PredType &rhs)
 {
     if (this != &rhs)
-	copy(rhs);
-    return(*this);
+        copy(rhs);
+    return (*this);
 }
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 // These dummy functions do not inherit from DataType - they'll
 // throw an DataTypeIException if invoked.
-void PredType::commit(H5Location& loc, const char* name )
+void
+PredType::commit(H5Location &loc, const char *name)
 {
-   throw DataTypeIException("PredType::commit", "Error: Attempted to commit a predefined datatype.  Invalid operation!" );
+    // Unused
+    (void)loc;
+    (void)name;
+
+    throw DataTypeIException("PredType::commit",
+                             "Error: Attempted to commit a predefined datatype.  Invalid operation!");
 }
 
-void PredType::commit(H5Location& loc, const H5std_string& name )
+void
+PredType::commit(H5Location &loc, const H5std_string &name)
 {
-   commit( loc, name.c_str());
+    commit(loc, name.c_str());
 }
 
-bool PredType::committed()
+bool
+PredType::committed()
 {
-   throw DataTypeIException("PredType::committed", "Error: Attempting to check for commit status on a predefined datatype." );
+    throw DataTypeIException("PredType::committed",
+                             "Error: Attempting to check for commit status on a predefined datatype.");
 }
 #endif // DOXYGEN_SHOULD_SKIP_THIS
 
 // Default destructor
 //--------------------------------------------------------------------------
-// Function:	PredType destructor
-///\brief	Noop destructor.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    PredType destructor
+///\brief       Noop destructor.
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+PredType::~PredType()
+{
+}
+
+/*****************************************************************************
+        The following section is regarding the global constants PredType,
+        DataSpace, and PropList.
+
+ *****************************************************************************/
+
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+// Definition pointers for the constants
+PredType *PredType::PREDTYPE_CONST_ = 0; // dummy
+PredType *PredType::STD_I8BE_;
+PredType *PredType::STD_I8LE_;
+PredType *PredType::STD_I16BE_;
+PredType *PredType::STD_I16LE_;
+PredType *PredType::STD_I32BE_;
+PredType *PredType::STD_I32LE_;
+PredType *PredType::STD_I64BE_;
+PredType *PredType::STD_I64LE_;
+PredType *PredType::STD_U8BE_;
+PredType *PredType::STD_U8LE_;
+PredType *PredType::STD_U16BE_;
+PredType *PredType::STD_U16LE_;
+PredType *PredType::STD_U32BE_;
+PredType *PredType::STD_U32LE_;
+PredType *PredType::STD_U64BE_;
+PredType *PredType::STD_U64LE_;
+PredType *PredType::STD_B8BE_;
+PredType *PredType::STD_B8LE_;
+PredType *PredType::STD_B16BE_;
+PredType *PredType::STD_B16LE_;
+PredType *PredType::STD_B32BE_;
+PredType *PredType::STD_B32LE_;
+PredType *PredType::STD_B64BE_;
+PredType *PredType::STD_B64LE_;
+PredType *PredType::STD_REF_OBJ_;
+PredType *PredType::STD_REF_DSETREG_;
+
+PredType *PredType::C_S1_;
+PredType *PredType::FORTRAN_S1_;
+
+PredType *PredType::IEEE_F32BE_;
+PredType *PredType::IEEE_F32LE_;
+PredType *PredType::IEEE_F64BE_;
+PredType *PredType::IEEE_F64LE_;
+
+PredType *PredType::UNIX_D32BE_;
+PredType *PredType::UNIX_D32LE_;
+PredType *PredType::UNIX_D64BE_;
+PredType *PredType::UNIX_D64LE_;
+
+PredType *PredType::INTEL_I8_;
+PredType *PredType::INTEL_I16_;
+PredType *PredType::INTEL_I32_;
+PredType *PredType::INTEL_I64_;
+PredType *PredType::INTEL_U8_;
+PredType *PredType::INTEL_U16_;
+PredType *PredType::INTEL_U32_;
+PredType *PredType::INTEL_U64_;
+PredType *PredType::INTEL_B8_;
+PredType *PredType::INTEL_B16_;
+PredType *PredType::INTEL_B32_;
+PredType *PredType::INTEL_B64_;
+PredType *PredType::INTEL_F32_;
+PredType *PredType::INTEL_F64_;
+
+PredType *PredType::ALPHA_I8_;
+PredType *PredType::ALPHA_I16_;
+PredType *PredType::ALPHA_I32_;
+PredType *PredType::ALPHA_I64_;
+PredType *PredType::ALPHA_U8_;
+PredType *PredType::ALPHA_U16_;
+PredType *PredType::ALPHA_U32_;
+PredType *PredType::ALPHA_U64_;
+PredType *PredType::ALPHA_B8_;
+PredType *PredType::ALPHA_B16_;
+PredType *PredType::ALPHA_B32_;
+PredType *PredType::ALPHA_B64_;
+PredType *PredType::ALPHA_F32_;
+PredType *PredType::ALPHA_F64_;
+
+PredType *PredType::MIPS_I8_;
+PredType *PredType::MIPS_I16_;
+PredType *PredType::MIPS_I32_;
+PredType *PredType::MIPS_I64_;
+PredType *PredType::MIPS_U8_;
+PredType *PredType::MIPS_U16_;
+PredType *PredType::MIPS_U32_;
+PredType *PredType::MIPS_U64_;
+PredType *PredType::MIPS_B8_;
+PredType *PredType::MIPS_B16_;
+PredType *PredType::MIPS_B32_;
+PredType *PredType::MIPS_B64_;
+PredType *PredType::MIPS_F32_;
+PredType *PredType::MIPS_F64_;
+
+PredType *PredType::NATIVE_CHAR_;
+PredType *PredType::NATIVE_SCHAR_;
+PredType *PredType::NATIVE_UCHAR_;
+PredType *PredType::NATIVE_SHORT_;
+PredType *PredType::NATIVE_USHORT_;
+PredType *PredType::NATIVE_INT_;
+PredType *PredType::NATIVE_UINT_;
+PredType *PredType::NATIVE_LONG_;
+PredType *PredType::NATIVE_ULONG_;
+PredType *PredType::NATIVE_LLONG_;
+PredType *PredType::NATIVE_ULLONG_;
+PredType *PredType::NATIVE_FLOAT_;
+PredType *PredType::NATIVE_DOUBLE_;
+PredType *PredType::NATIVE_LDOUBLE_;
+PredType *PredType::NATIVE_B8_;
+PredType *PredType::NATIVE_B16_;
+PredType *PredType::NATIVE_B32_;
+PredType *PredType::NATIVE_B64_;
+PredType *PredType::NATIVE_OPAQUE_;
+PredType *PredType::NATIVE_HSIZE_;
+PredType *PredType::NATIVE_HSSIZE_;
+PredType *PredType::NATIVE_HERR_;
+PredType *PredType::NATIVE_HBOOL_;
+
+PredType *PredType::NATIVE_INT8_;
+PredType *PredType::NATIVE_UINT8_;
+PredType *PredType::NATIVE_INT16_;
+PredType *PredType::NATIVE_UINT16_;
+PredType *PredType::NATIVE_INT32_;
+PredType *PredType::NATIVE_UINT32_;
+PredType *PredType::NATIVE_INT64_;
+PredType *PredType::NATIVE_UINT64_;
+
+// LEAST types
+PredType *PredType::NATIVE_INT_LEAST8_;
+PredType *PredType::NATIVE_UINT_LEAST8_;
+
+PredType *PredType::NATIVE_INT_LEAST16_;
+PredType *PredType::NATIVE_UINT_LEAST16_;
+
+PredType *PredType::NATIVE_INT_LEAST32_;
+PredType *PredType::NATIVE_UINT_LEAST32_;
+
+PredType *PredType::NATIVE_INT_LEAST64_;
+PredType *PredType::NATIVE_UINT_LEAST64_;
+
+// FAST types
+PredType *PredType::NATIVE_INT_FAST8_;
+PredType *PredType::NATIVE_UINT_FAST8_;
+
+PredType *PredType::NATIVE_INT_FAST16_;
+PredType *PredType::NATIVE_UINT_FAST16_;
+
+PredType *PredType::NATIVE_INT_FAST32_;
+PredType *PredType::NATIVE_UINT_FAST32_;
+
+PredType *PredType::NATIVE_INT_FAST64_;
+PredType *PredType::NATIVE_UINT_FAST64_;
+
 //--------------------------------------------------------------------------
-PredType::~PredType() {}
+// Function:    PredType::getPredTypes
+// Purpose      Returns the dummy PredType constant object pointer
+// Return:      PredType object pointer
+// Description
+//              If the dummy constant PREDTYPE_CONST_ is not allocated yet,
+//              call makePredTypes() to allocate all of the PredType constants.
+//              Otherwise, just simply return the object pointer PREDTYPE_CONST_.
+//
+//              Note that, there is a similar function to getPredTypes() in
+//              other classes, that have global constants, is called getConstant().
+//
+// Programmer   Binh-Minh Ribler - September 2015
+//--------------------------------------------------------------------------
+PredType *
+PredType::getPredTypes()
+{
+    // Tell the C library not to clean up, H5Library::termH5cpp will call
+    // H5close - more dependency if use H5Library::dontAtExit()
+    if (!IdComponent::H5dontAtexit_called) {
+        (void)H5dont_atexit();
+        IdComponent::H5dontAtexit_called = true;
+    }
+
+    // If the dummy constant pointer is not allocated, allocate all PredType
+    // constant pointers.  Otherwise, throw because it shouldn't be.
+    if (PREDTYPE_CONST_ == 0)
+        makePredTypes();
+    else
+        throw H5::DataTypeIException(
+            "PredType::getPredTypes",
+            "PredType::getPredTypes is being invoked on an allocated PREDTYPE_CONST_");
+    return PREDTYPE_CONST_;
+}
+
+//--------------------------------------------------------------------------
+// Function:    PredType::makePredTypes
+// Purpose      Allocate all PredType constants.
+// Programmer   Binh-Minh Ribler - September 2015
+//--------------------------------------------------------------------------
+void
+PredType::makePredTypes()
+{
+    PREDTYPE_CONST_ = new PredType;
+    C_S1_           = new PredType(H5T_C_S1);
+    FORTRAN_S1_     = new PredType(H5T_FORTRAN_S1);
+
+    STD_I8BE_  = new PredType(H5T_STD_I8BE);
+    STD_I8LE_  = new PredType(H5T_STD_I8LE);
+    STD_I16BE_ = new PredType(H5T_STD_I16BE);
+    STD_I16LE_ = new PredType(H5T_STD_I16LE);
+    STD_I32BE_ = new PredType(H5T_STD_I32BE);
+    STD_I32LE_ = new PredType(H5T_STD_I32LE);
+    STD_I64BE_ = new PredType(H5T_STD_I64BE);
+    STD_I64LE_ = new PredType(H5T_STD_I64LE);
+    STD_U8BE_  = new PredType(H5T_STD_U8BE);
+    STD_U8LE_  = new PredType(H5T_STD_U8LE);
+    STD_U16BE_ = new PredType(H5T_STD_U16BE);
+    STD_U16LE_ = new PredType(H5T_STD_U16LE);
+    STD_U32BE_ = new PredType(H5T_STD_U32BE);
+    STD_U32LE_ = new PredType(H5T_STD_U32LE);
+    STD_U64BE_ = new PredType(H5T_STD_U64BE);
+    STD_U64LE_ = new PredType(H5T_STD_U64LE);
+    STD_B8BE_  = new PredType(H5T_STD_B8BE);
+    STD_B8LE_  = new PredType(H5T_STD_B8LE);
+
+    STD_B16BE_       = new PredType(H5T_STD_B16BE);
+    STD_B16LE_       = new PredType(H5T_STD_B16LE);
+    STD_B32BE_       = new PredType(H5T_STD_B32BE);
+    STD_B32LE_       = new PredType(H5T_STD_B32LE);
+    STD_B64BE_       = new PredType(H5T_STD_B64BE);
+    STD_B64LE_       = new PredType(H5T_STD_B64LE);
+    STD_REF_OBJ_     = new PredType(H5T_STD_REF_OBJ);
+    STD_REF_DSETREG_ = new PredType(H5T_STD_REF_DSETREG);
+
+    IEEE_F32BE_ = new PredType(H5T_IEEE_F32BE);
+    IEEE_F32LE_ = new PredType(H5T_IEEE_F32LE);
+    IEEE_F64BE_ = new PredType(H5T_IEEE_F64BE);
+    IEEE_F64LE_ = new PredType(H5T_IEEE_F64LE);
+
+    UNIX_D32BE_ = new PredType(H5T_UNIX_D32BE);
+    UNIX_D32LE_ = new PredType(H5T_UNIX_D32LE);
+    UNIX_D64BE_ = new PredType(H5T_UNIX_D64BE);
+    UNIX_D64LE_ = new PredType(H5T_UNIX_D64LE);
+
+    INTEL_I8_  = new PredType(H5T_INTEL_I8);
+    INTEL_I16_ = new PredType(H5T_INTEL_I16);
+    INTEL_I32_ = new PredType(H5T_INTEL_I32);
+    INTEL_I64_ = new PredType(H5T_INTEL_I64);
+    INTEL_U8_  = new PredType(H5T_INTEL_U8);
+    INTEL_U16_ = new PredType(H5T_INTEL_U16);
+    INTEL_U32_ = new PredType(H5T_INTEL_U32);
+    INTEL_U64_ = new PredType(H5T_INTEL_U64);
+    INTEL_B8_  = new PredType(H5T_INTEL_B8);
+    INTEL_B16_ = new PredType(H5T_INTEL_B16);
+    INTEL_B32_ = new PredType(H5T_INTEL_B32);
+    INTEL_B64_ = new PredType(H5T_INTEL_B64);
+    INTEL_F32_ = new PredType(H5T_INTEL_F32);
+    INTEL_F64_ = new PredType(H5T_INTEL_F64);
+
+    ALPHA_I8_  = new PredType(H5T_ALPHA_I8);
+    ALPHA_I16_ = new PredType(H5T_ALPHA_I16);
+    ALPHA_I32_ = new PredType(H5T_ALPHA_I32);
+    ALPHA_I64_ = new PredType(H5T_ALPHA_I64);
+    ALPHA_U8_  = new PredType(H5T_ALPHA_U8);
+    ALPHA_U16_ = new PredType(H5T_ALPHA_U16);
+    ALPHA_U32_ = new PredType(H5T_ALPHA_U32);
+    ALPHA_U64_ = new PredType(H5T_ALPHA_U64);
+    ALPHA_B8_  = new PredType(H5T_ALPHA_B8);
+    ALPHA_B16_ = new PredType(H5T_ALPHA_B16);
+    ALPHA_B32_ = new PredType(H5T_ALPHA_B32);
+    ALPHA_B64_ = new PredType(H5T_ALPHA_B64);
+    ALPHA_F32_ = new PredType(H5T_ALPHA_F32);
+    ALPHA_F64_ = new PredType(H5T_ALPHA_F64);
+
+    MIPS_I8_  = new PredType(H5T_MIPS_I8);
+    MIPS_I16_ = new PredType(H5T_MIPS_I16);
+    MIPS_I32_ = new PredType(H5T_MIPS_I32);
+    MIPS_I64_ = new PredType(H5T_MIPS_I64);
+    MIPS_U8_  = new PredType(H5T_MIPS_U8);
+    MIPS_U16_ = new PredType(H5T_MIPS_U16);
+    MIPS_U32_ = new PredType(H5T_MIPS_U32);
+    MIPS_U64_ = new PredType(H5T_MIPS_U64);
+    MIPS_B8_  = new PredType(H5T_MIPS_B8);
+    MIPS_B16_ = new PredType(H5T_MIPS_B16);
+    MIPS_B32_ = new PredType(H5T_MIPS_B32);
+    MIPS_B64_ = new PredType(H5T_MIPS_B64);
+    MIPS_F32_ = new PredType(H5T_MIPS_F32);
+    MIPS_F64_ = new PredType(H5T_MIPS_F64);
+
+    NATIVE_CHAR_    = new PredType(H5T_NATIVE_CHAR);
+    NATIVE_INT_     = new PredType(H5T_NATIVE_INT);
+    NATIVE_FLOAT_   = new PredType(H5T_NATIVE_FLOAT);
+    NATIVE_SCHAR_   = new PredType(H5T_NATIVE_SCHAR);
+    NATIVE_UCHAR_   = new PredType(H5T_NATIVE_UCHAR);
+    NATIVE_SHORT_   = new PredType(H5T_NATIVE_SHORT);
+    NATIVE_USHORT_  = new PredType(H5T_NATIVE_USHORT);
+    NATIVE_UINT_    = new PredType(H5T_NATIVE_UINT);
+    NATIVE_LONG_    = new PredType(H5T_NATIVE_LONG);
+    NATIVE_ULONG_   = new PredType(H5T_NATIVE_ULONG);
+    NATIVE_LLONG_   = new PredType(H5T_NATIVE_LLONG);
+    NATIVE_ULLONG_  = new PredType(H5T_NATIVE_ULLONG);
+    NATIVE_DOUBLE_  = new PredType(H5T_NATIVE_DOUBLE);
+    NATIVE_LDOUBLE_ = new PredType(H5T_NATIVE_LDOUBLE);
+    NATIVE_B8_      = new PredType(H5T_NATIVE_B8);
+    NATIVE_B16_     = new PredType(H5T_NATIVE_B16);
+    NATIVE_B32_     = new PredType(H5T_NATIVE_B32);
+    NATIVE_B64_     = new PredType(H5T_NATIVE_B64);
+    NATIVE_OPAQUE_  = new PredType(H5T_NATIVE_OPAQUE);
+    NATIVE_HSIZE_   = new PredType(H5T_NATIVE_HSIZE);
+    NATIVE_HSSIZE_  = new PredType(H5T_NATIVE_HSSIZE);
+    NATIVE_HERR_    = new PredType(H5T_NATIVE_HERR);
+    NATIVE_HBOOL_   = new PredType(H5T_NATIVE_HBOOL);
+
+    NATIVE_INT8_   = new PredType(H5T_NATIVE_INT8);
+    NATIVE_UINT8_  = new PredType(H5T_NATIVE_UINT8);
+    NATIVE_INT16_  = new PredType(H5T_NATIVE_INT16);
+    NATIVE_UINT16_ = new PredType(H5T_NATIVE_UINT16);
+    NATIVE_INT32_  = new PredType(H5T_NATIVE_INT32);
+    NATIVE_UINT32_ = new PredType(H5T_NATIVE_UINT32);
+    NATIVE_INT64_  = new PredType(H5T_NATIVE_INT64);
+    NATIVE_UINT64_ = new PredType(H5T_NATIVE_UINT64);
+
+    // LEAST types
+    NATIVE_INT_LEAST8_  = new PredType(H5T_NATIVE_INT_LEAST8);
+    NATIVE_UINT_LEAST8_ = new PredType(H5T_NATIVE_UINT_LEAST8);
+
+    NATIVE_INT_LEAST16_  = new PredType(H5T_NATIVE_INT_LEAST16);
+    NATIVE_UINT_LEAST16_ = new PredType(H5T_NATIVE_UINT_LEAST16);
+
+    NATIVE_INT_LEAST32_  = new PredType(H5T_NATIVE_INT_LEAST32);
+    NATIVE_UINT_LEAST32_ = new PredType(H5T_NATIVE_UINT_LEAST32);
+
+    NATIVE_INT_LEAST64_  = new PredType(H5T_NATIVE_INT_LEAST64);
+    NATIVE_UINT_LEAST64_ = new PredType(H5T_NATIVE_UINT_LEAST64);
+
+    // FAST types
+    NATIVE_INT_FAST8_  = new PredType(H5T_NATIVE_INT_FAST8);
+    NATIVE_UINT_FAST8_ = new PredType(H5T_NATIVE_UINT_FAST8);
+
+    NATIVE_INT_FAST16_  = new PredType(H5T_NATIVE_INT_FAST16);
+    NATIVE_UINT_FAST16_ = new PredType(H5T_NATIVE_UINT_FAST16);
+
+    NATIVE_INT_FAST32_  = new PredType(H5T_NATIVE_INT_FAST32);
+    NATIVE_UINT_FAST32_ = new PredType(H5T_NATIVE_UINT_FAST32);
+
+    NATIVE_INT_FAST64_  = new PredType(H5T_NATIVE_INT_FAST64);
+    NATIVE_UINT_FAST64_ = new PredType(H5T_NATIVE_UINT_FAST64);
+
+} // makePredTypes
+
+//--------------------------------------------------------------------------
+// Function:    PredType::deleteConstants
+// Purpose      Deletes all PredType constant pointers.
+// Programmer   Binh-Minh Ribler - September 2015
+//--------------------------------------------------------------------------
+void
+PredType::deleteConstants()
+{
+    delete STD_I8BE_;
+    delete STD_I8LE_;
+    delete STD_I16BE_;
+    delete STD_I16LE_;
+    delete STD_I32BE_;
+    delete STD_I32LE_;
+    delete STD_I64BE_;
+    delete STD_I64LE_;
+    delete STD_U8BE_;
+    delete STD_U8LE_;
+    delete STD_U16BE_;
+    delete STD_U16LE_;
+    delete STD_U32BE_;
+    delete STD_U32LE_;
+    delete STD_U64BE_;
+    delete STD_U64LE_;
+    delete STD_B8BE_;
+    delete STD_B8LE_;
+    delete STD_B16BE_;
+    delete STD_B16LE_;
+    delete STD_B32BE_;
+    delete STD_B32LE_;
+    delete STD_B64BE_;
+    delete STD_B64LE_;
+    delete STD_REF_OBJ_;
+    delete STD_REF_DSETREG_;
+
+    delete C_S1_;
+    delete FORTRAN_S1_;
+
+    delete IEEE_F32BE_;
+    delete IEEE_F32LE_;
+    delete IEEE_F64BE_;
+    delete IEEE_F64LE_;
+
+    delete UNIX_D32BE_;
+    delete UNIX_D32LE_;
+    delete UNIX_D64BE_;
+    delete UNIX_D64LE_;
+
+    delete INTEL_I8_;
+    delete INTEL_I16_;
+    delete INTEL_I32_;
+    delete INTEL_I64_;
+    delete INTEL_U8_;
+    delete INTEL_U16_;
+    delete INTEL_U32_;
+    delete INTEL_U64_;
+    delete INTEL_B8_;
+    delete INTEL_B16_;
+    delete INTEL_B32_;
+    delete INTEL_B64_;
+    delete INTEL_F32_;
+    delete INTEL_F64_;
+
+    delete ALPHA_I8_;
+    delete ALPHA_I16_;
+    delete ALPHA_I32_;
+    delete ALPHA_I64_;
+    delete ALPHA_U8_;
+    delete ALPHA_U16_;
+    delete ALPHA_U32_;
+    delete ALPHA_U64_;
+    delete ALPHA_B8_;
+    delete ALPHA_B16_;
+    delete ALPHA_B32_;
+    delete ALPHA_B64_;
+    delete ALPHA_F32_;
+    delete ALPHA_F64_;
+
+    delete MIPS_I8_;
+    delete MIPS_I16_;
+    delete MIPS_I32_;
+    delete MIPS_I64_;
+    delete MIPS_U8_;
+    delete MIPS_U16_;
+    delete MIPS_U32_;
+    delete MIPS_U64_;
+    delete MIPS_B8_;
+    delete MIPS_B16_;
+    delete MIPS_B32_;
+    delete MIPS_B64_;
+    delete MIPS_F32_;
+    delete MIPS_F64_;
+
+    delete NATIVE_CHAR_;
+    delete NATIVE_SCHAR_;
+    delete NATIVE_UCHAR_;
+    delete NATIVE_SHORT_;
+    delete NATIVE_USHORT_;
+    delete NATIVE_INT_;
+    delete NATIVE_UINT_;
+    delete NATIVE_LONG_;
+    delete NATIVE_ULONG_;
+    delete NATIVE_LLONG_;
+    delete NATIVE_ULLONG_;
+    delete NATIVE_FLOAT_;
+    delete NATIVE_DOUBLE_;
+    delete NATIVE_LDOUBLE_;
+    delete NATIVE_B8_;
+    delete NATIVE_B16_;
+    delete NATIVE_B32_;
+    delete NATIVE_B64_;
+    delete NATIVE_OPAQUE_;
+    delete NATIVE_HSIZE_;
+    delete NATIVE_HSSIZE_;
+    delete NATIVE_HERR_;
+    delete NATIVE_HBOOL_;
+
+    delete NATIVE_INT8_;
+    delete NATIVE_UINT8_;
+    delete NATIVE_INT16_;
+    delete NATIVE_UINT16_;
+    delete NATIVE_INT32_;
+    delete NATIVE_UINT32_;
+    delete NATIVE_INT64_;
+    delete NATIVE_UINT64_;
+
+    // LEAST types
+    delete NATIVE_INT_LEAST8_;
+    delete NATIVE_UINT_LEAST8_;
+
+    delete NATIVE_INT_LEAST16_;
+    delete NATIVE_UINT_LEAST16_;
+
+    delete NATIVE_INT_LEAST32_;
+    delete NATIVE_UINT_LEAST32_;
+
+    delete NATIVE_INT_LEAST64_;
+    delete NATIVE_UINT_LEAST64_;
+
+    // FAST types
+    delete NATIVE_INT_FAST8_;
+    delete NATIVE_UINT_FAST8_;
+
+    delete NATIVE_INT_FAST16_;
+    delete NATIVE_UINT_FAST16_;
+
+    delete NATIVE_INT_FAST32_;
+    delete NATIVE_UINT_FAST32_;
+
+    delete NATIVE_INT_FAST64_;
+    delete NATIVE_UINT_FAST64_;
+
+    delete PREDTYPE_CONST_;
+    PREDTYPE_CONST_ = 0;
+} // deleteConstants
+
+// Assigning the constant references to the dynamically allocated constants
+// after using PREDTYPE_CONST to activate the creation of those constants.
+
+//  PREDTYPE_CONST will be the first static constant declared in the file.
+//  getPredTypes() will call makePredTypes() to allocate memory for all the
+//  PredType constants.  Note that, there is a similar function to getPredTypes()
+//  in other classes, that have global constants, is called getConstant().
+
+const PredType &PredType::PREDTYPE_CONST  = *PredType::getPredTypes();
+const PredType &PredType::STD_I8BE        = *STD_I8BE_;
+const PredType &PredType::STD_I8LE        = *STD_I8LE_;
+const PredType &PredType::STD_I16BE       = *STD_I16BE_;
+const PredType &PredType::STD_I16LE       = *STD_I16LE_;
+const PredType &PredType::STD_I32BE       = *STD_I32BE_;
+const PredType &PredType::STD_I32LE       = *STD_I32LE_;
+const PredType &PredType::STD_I64BE       = *STD_I64BE_;
+const PredType &PredType::STD_I64LE       = *STD_I64LE_;
+const PredType &PredType::STD_U8BE        = *STD_U8BE_;
+const PredType &PredType::STD_U8LE        = *STD_U8LE_;
+const PredType &PredType::STD_U16BE       = *STD_U16BE_;
+const PredType &PredType::STD_U16LE       = *STD_U16LE_;
+const PredType &PredType::STD_U32BE       = *STD_U32BE_;
+const PredType &PredType::STD_U32LE       = *STD_U32LE_;
+const PredType &PredType::STD_U64BE       = *STD_U64BE_;
+const PredType &PredType::STD_U64LE       = *STD_U64LE_;
+const PredType &PredType::STD_B8BE        = *STD_B8BE_;
+const PredType &PredType::STD_B8LE        = *STD_B8LE_;
+const PredType &PredType::STD_B16BE       = *STD_B16BE_;
+const PredType &PredType::STD_B16LE       = *STD_B16LE_;
+const PredType &PredType::STD_B32BE       = *STD_B32BE_;
+const PredType &PredType::STD_B32LE       = *STD_B32LE_;
+const PredType &PredType::STD_B64BE       = *STD_B64BE_;
+const PredType &PredType::STD_B64LE       = *STD_B64LE_;
+const PredType &PredType::STD_REF_OBJ     = *STD_REF_OBJ_;
+const PredType &PredType::STD_REF_DSETREG = *STD_REF_DSETREG_;
+
+const PredType &PredType::C_S1       = *C_S1_;
+const PredType &PredType::FORTRAN_S1 = *FORTRAN_S1_;
+
+const PredType &PredType::IEEE_F32BE = *IEEE_F32BE_;
+const PredType &PredType::IEEE_F32LE = *IEEE_F32LE_;
+const PredType &PredType::IEEE_F64BE = *IEEE_F64BE_;
+const PredType &PredType::IEEE_F64LE = *IEEE_F64LE_;
+
+const PredType &PredType::UNIX_D32BE = *UNIX_D32BE_;
+const PredType &PredType::UNIX_D32LE = *UNIX_D32LE_;
+const PredType &PredType::UNIX_D64BE = *UNIX_D64BE_;
+const PredType &PredType::UNIX_D64LE = *UNIX_D64LE_;
+
+const PredType &PredType::INTEL_I8  = *INTEL_I8_;
+const PredType &PredType::INTEL_I16 = *INTEL_I16_;
+const PredType &PredType::INTEL_I32 = *INTEL_I32_;
+const PredType &PredType::INTEL_I64 = *INTEL_I64_;
+const PredType &PredType::INTEL_U8  = *INTEL_U8_;
+const PredType &PredType::INTEL_U16 = *INTEL_U16_;
+const PredType &PredType::INTEL_U32 = *INTEL_U32_;
+const PredType &PredType::INTEL_U64 = *INTEL_U64_;
+const PredType &PredType::INTEL_B8  = *INTEL_B8_;
+const PredType &PredType::INTEL_B16 = *INTEL_B16_;
+const PredType &PredType::INTEL_B32 = *INTEL_B32_;
+const PredType &PredType::INTEL_B64 = *INTEL_B64_;
+const PredType &PredType::INTEL_F32 = *INTEL_F32_;
+const PredType &PredType::INTEL_F64 = *INTEL_F64_;
+
+const PredType &PredType::ALPHA_I8  = *ALPHA_I8_;
+const PredType &PredType::ALPHA_I16 = *ALPHA_I16_;
+const PredType &PredType::ALPHA_I32 = *ALPHA_I32_;
+const PredType &PredType::ALPHA_I64 = *ALPHA_I64_;
+const PredType &PredType::ALPHA_U8  = *ALPHA_U8_;
+const PredType &PredType::ALPHA_U16 = *ALPHA_U16_;
+const PredType &PredType::ALPHA_U32 = *ALPHA_U32_;
+const PredType &PredType::ALPHA_U64 = *ALPHA_U64_;
+const PredType &PredType::ALPHA_B8  = *ALPHA_B8_;
+const PredType &PredType::ALPHA_B16 = *ALPHA_B16_;
+const PredType &PredType::ALPHA_B32 = *ALPHA_B32_;
+const PredType &PredType::ALPHA_B64 = *ALPHA_B64_;
+const PredType &PredType::ALPHA_F32 = *ALPHA_F32_;
+const PredType &PredType::ALPHA_F64 = *ALPHA_F64_;
+
+const PredType &PredType::MIPS_I8  = *MIPS_I8_;
+const PredType &PredType::MIPS_I16 = *MIPS_I16_;
+const PredType &PredType::MIPS_I32 = *MIPS_I32_;
+const PredType &PredType::MIPS_I64 = *MIPS_I64_;
+const PredType &PredType::MIPS_U8  = *MIPS_U8_;
+const PredType &PredType::MIPS_U16 = *MIPS_U16_;
+const PredType &PredType::MIPS_U32 = *MIPS_U32_;
+const PredType &PredType::MIPS_U64 = *MIPS_U64_;
+const PredType &PredType::MIPS_B8  = *MIPS_B8_;
+const PredType &PredType::MIPS_B16 = *MIPS_B16_;
+const PredType &PredType::MIPS_B32 = *MIPS_B32_;
+const PredType &PredType::MIPS_B64 = *MIPS_B64_;
+const PredType &PredType::MIPS_F32 = *MIPS_F32_;
+const PredType &PredType::MIPS_F64 = *MIPS_F64_;
+
+const PredType &PredType::NATIVE_CHAR    = *NATIVE_CHAR_;
+const PredType &PredType::NATIVE_SCHAR   = *NATIVE_SCHAR_;
+const PredType &PredType::NATIVE_UCHAR   = *NATIVE_UCHAR_;
+const PredType &PredType::NATIVE_SHORT   = *NATIVE_SHORT_;
+const PredType &PredType::NATIVE_USHORT  = *NATIVE_USHORT_;
+const PredType &PredType::NATIVE_INT     = *NATIVE_INT_;
+const PredType &PredType::NATIVE_UINT    = *NATIVE_UINT_;
+const PredType &PredType::NATIVE_LONG    = *NATIVE_LONG_;
+const PredType &PredType::NATIVE_ULONG   = *NATIVE_ULONG_;
+const PredType &PredType::NATIVE_LLONG   = *NATIVE_LLONG_;
+const PredType &PredType::NATIVE_ULLONG  = *NATIVE_ULLONG_;
+const PredType &PredType::NATIVE_FLOAT   = *NATIVE_FLOAT_;
+const PredType &PredType::NATIVE_DOUBLE  = *NATIVE_DOUBLE_;
+const PredType &PredType::NATIVE_LDOUBLE = *NATIVE_LDOUBLE_;
+const PredType &PredType::NATIVE_B8      = *NATIVE_B8_;
+const PredType &PredType::NATIVE_B16     = *NATIVE_B16_;
+const PredType &PredType::NATIVE_B32     = *NATIVE_B32_;
+const PredType &PredType::NATIVE_B64     = *NATIVE_B64_;
+const PredType &PredType::NATIVE_OPAQUE  = *NATIVE_OPAQUE_;
+const PredType &PredType::NATIVE_HSIZE   = *NATIVE_HSIZE_;
+const PredType &PredType::NATIVE_HSSIZE  = *NATIVE_HSSIZE_;
+const PredType &PredType::NATIVE_HERR    = *NATIVE_HERR_;
+const PredType &PredType::NATIVE_HBOOL   = *NATIVE_HBOOL_;
+
+const PredType &PredType::NATIVE_INT8   = *NATIVE_INT8_;
+const PredType &PredType::NATIVE_UINT8  = *NATIVE_UINT8_;
+const PredType &PredType::NATIVE_INT16  = *NATIVE_INT16_;
+const PredType &PredType::NATIVE_UINT16 = *NATIVE_UINT16_;
+const PredType &PredType::NATIVE_INT32  = *NATIVE_INT32_;
+const PredType &PredType::NATIVE_UINT32 = *NATIVE_UINT32_;
+const PredType &PredType::NATIVE_INT64  = *NATIVE_INT64_;
+const PredType &PredType::NATIVE_UINT64 = *NATIVE_UINT64_;
+
+// LEAST types
+const PredType &PredType::NATIVE_INT_LEAST8  = *NATIVE_INT_LEAST8_;
+const PredType &PredType::NATIVE_UINT_LEAST8 = *NATIVE_UINT_LEAST8_;
+
+const PredType &PredType::NATIVE_INT_LEAST16  = *NATIVE_INT_LEAST16_;
+const PredType &PredType::NATIVE_UINT_LEAST16 = *NATIVE_UINT_LEAST16_;
+
+const PredType &PredType::NATIVE_INT_LEAST32  = *NATIVE_INT_LEAST32_;
+const PredType &PredType::NATIVE_UINT_LEAST32 = *NATIVE_UINT_LEAST32_;
+
+const PredType &PredType::NATIVE_INT_LEAST64  = *NATIVE_INT_LEAST64_;
+const PredType &PredType::NATIVE_UINT_LEAST64 = *NATIVE_UINT_LEAST64_;
+
+// FAST types
+const PredType &PredType::NATIVE_INT_FAST8  = *NATIVE_INT_FAST8_;
+const PredType &PredType::NATIVE_UINT_FAST8 = *NATIVE_UINT_FAST8_;
+
+const PredType &PredType::NATIVE_INT_FAST16  = *NATIVE_INT_FAST16_;
+const PredType &PredType::NATIVE_UINT_FAST16 = *NATIVE_UINT_FAST16_;
+
+const PredType &PredType::NATIVE_INT_FAST32  = *NATIVE_INT_FAST32_;
+const PredType &PredType::NATIVE_UINT_FAST32 = *NATIVE_UINT_FAST32_;
+
+const PredType &PredType::NATIVE_INT_FAST64  = *NATIVE_INT_FAST64_;
+const PredType &PredType::NATIVE_UINT_FAST64 = *NATIVE_UINT_FAST64_;
+
+#endif // DOXYGEN_SHOULD_SKIP_THIS
+
+} // namespace H5
+
+/***************************************************************************
+                                Design Note
+                                ===========
+
+September 2015:
+
+        The C++ library has several types of global constants from different
+        classes, such as PropList, PredType, DataSpace, etc...  Previously,
+        these global constants were declared statically and the C++ library used
+        a constant, called PredType::AtExit, to detect when all the global
+        constants are destroyed then close the C library (H5close).  This method
+        relied on the order of the constants being created and destroyed and
+        that PredType constants be the last to be destroyed.  In September
+        2015, it was recognized that the order in which the global constants were
+        created and destroyed was actually undefined, thus can be different
+        between different compilers.  This resulted in failure when compilers
+        destroy PredType constants before others because when PredType::AtExit
+        was destroyed, the C library was closed, so when the constants of other
+        classes such as PropList or DataSpace were being deleted, the C library
+        would not be available.
+
+        These are the classes that have global constants:
+                + PredType
+                + DataSpace
+                + PropList (and its subclasses below)
+                + DSetMemXferPropList
+                + DSetCreatPropList
+                + DSetAccPropList
+                + FileAccPropList
+                + FileCreatPropList
+                + LinkAccPropList
+                + LinkCreatPropList
+                + ObjCreatPropList
+
+        The new method includes these main points:
+
+        - The C++ library uses dynamically allocated constants to have the
+          control in which order the global constants are created/destroyed.
+
+        - The previous static constants are changed to be the references to
+          the dynamically allocated constants to avoid impact on applications.
+
+        - The first time an IdComponent default constructor is invoked, it
+          will call the function H5Library::initH5cpp which registers the
+          terminating functions from each class that has the global constants
+          so that these functions can destroy those constants at the exit of the
+          application.  IdComponent is a baseclass of any object class that has
+          an identifier, such as Group, DataSet, DataType,...  The classes which
+          have the global constants are all derived from IdComponent.
+
+        - At the normal termination of the application, each registered function
+          for each constant type will delete all the allocated constants in
+          that type class, then a different terminating function, which was also
+          registered with atexit() by initH5cpp, will call H5close to close the
+          C library.
+
+        The following list presents the differences between the old and new
+        methods and the changes implemented for the new method.
+
+        1.  The following items are added to class H5Library:
+                // Private instance to be created by H5Library only
+                static H5Library* instance;
+
+                // Returns a singleton H5Library to initialize the global
+                // constants, invoked in IdComponent default constructor
+                static H5Library* getInstance(); // public
+
+                // Registers cleanup and terminating functions with atexit(),
+                // called in IdComponent default constructor
+                static void initH5cpp(void); // public
+
+                // Calls H5close to terminate the library, registered with
+                // atexit(), as the last thing to be done.
+                static void termH5cpp(void); // public
+
+        2.  The following shows the differences between the old and new methods
+            for allocating the PredType constants.  There are more than 100
+            constants, but only one is shown here for examples.
+
+        Old Method:
+        ----------
+                // Declaration of the constant - in "H5PredType.h"
+                static const PredType NATIVE_INT;
+
+                // Definition of the constant - in "H5PredType.cpp"
+                const PredType PredType::NATIVE_INT(H5T_NATIVE_INT);
+
+        New Method:
+        ----------
+                // Declare pointer for a constant - in "H5PredType.h"
+                static PredType* NATIVE_INT_; // "H5PredType.h"
+
+                // Change previous constant to reference - in "H5PredType.h"
+                static const PredType& NATIVE_INT;
+
+                // The assignment of the first static constant, named
+                // PREDTYPE_CONST, calls makePredTypes() which allocates the
+                // dynamic memory for every PredType constant.
+
+                // Creates a dynamic PredType object representing a C constant
+                // - in makePredTypes()
+                NATIVE_INT_ = new PredType(H5T_NATIVE_INT);
+
+                // Assign the constant reference to the dynamic object
+                // - in "H5PredType.cpp"
+                const PredType& PredType::NATIVE_INT = *NATIVE_INT_;
+
+            Functions added to class PredType:
+
+                // Creates the constants
+                static void makePredTypes(); // private
+
+                // Calls makePredTypes to create the constants and returns
+                // the dummy constant PREDTYPE_CONST;
+                static PredType* getPredTypes(); // private
+
+                // Deletes the constants
+                static void deleteConstants(); // public
+
+        3.  This section shows the differences between the old and new methods
+            for allocating the DataSpace constant, DataSpace::ALL.
+
+        Old Method:
+        ----------
+                // Declaration of the constant - in "H5DataSpace.h"
+                static const DataSpace ALL;
+
+                // Definition of the constant - in "H5DataSpace.cpp"
+                const DataSpace DataSpace::ALL(H5S_ALL);
+
+        New Method:
+        ----------
+                // Declare pointer for a constant - in "H5DataSpace.h"
+                static DataSpace* ALL_; // "H5DataSpace.h"
+
+                // Change previous constant to reference - in "H5DataSpace.h"
+                static const DataSpace& ALL;
+
+                // Creates a dynamic DataSpace object representing the C constant
+                // - in "H5DataSpace.cpp"
+                ALL_ = new DataSpace(H5S_ALL);
+
+                // Assign the constant reference to the dynamic object
+                // - in "H5DataSpace.cpp"
+                const DataSpace& DataSpace::ALL = *ALL_;
+
+            Functions added to class DataSpace:
+
+                // Creates the constant
+                static DataSpace* getConstant(); // private
+
+                // Deletes the constant
+                static void deleteConstants(); // public
+
+        4.  This section shows the differences between the old and new methods
+            for allocating the following constants
+                - PropList constant, PropList::DEFAULT.
+                - DSetAccPropList constant, DSetAccPropList::DEFAULT.
+                - DSetCreatPropList constant, DSetCreatPropList::DEFAULT.
+                - DSetMemXferPropList constant, DSetMemXferPropList::DEFAULT.
+                - FileCreatPropList constant, FileCreatPropList::DEFAULT.
+                - FileAccPropList constant, FileAccPropList::DEFAULT.
+                - LinkAccPropList constant, LinkAccPropList::DEFAULT.
+                - LinkCreatPropList constant, LinkCreatPropList::DEFAULT.
+                - ObjCreatPropList constant, ObjCreatPropList::DEFAULT.
+
+            For these constants, the library has the same changes, except the
+            class names and the HDF5 corresponding constants. Only the items
+            of PropList are listed, and "PropList" can be replaced by any of
+            DSetAccPropList, DSetCreatPropList, DSetMemXferPropList,
+            FileCreatPropList, FileAccPropList, LinkAccPropList, LinkCreatPropList,
+            ObjCreatPropList for those classes.  The HDF5 C constant "H5P_DEFAULT"
+            can be replaced by any of these respectively: H5P_DATASET_ACCESS,
+            H5P_DATASET_CREATE, H5P_DATASET_XFER, H5P_FILE_CREATE, H5P_FILE_ACCESS,
+            H5P_LINK_ACCESS, H5P_LINK_CREATE, and H5P_OBJECT_CREATE.
+
+        Old Method:
+        ----------
+                // Declaration of the constant - in "H5PropList.h"
+                static const PropList DEFAULT;
+
+                // Definition of the constant - in "H5PropList.cpp"
+                const PropList PropList::DEFAULT(H5P_DEFAULT);
+
+        New Method:
+        ----------
+                // Declare pointer for a constant - in "H5PropList.h"
+                static PropList* DEFAULT_; // "H5PropList.h"
+
+                // Change previous constant to reference - in "H5PropList.h"
+                static const PropList& DEFAULT;
+
+                // Creates a dynamic PropList object representing the C constant
+                // - in "H5PropList.cpp"
+                DEFAULT_ = new PropList(H5P_DEFAULT);
+
+                // Assign the constant reference to the dynamic object
+                // - in "H5PropList.cpp"
+                const PropList& PropList::DEFAULT = *DEFAULT_;
+
+            Functions added to class PropList:
+
+                // Creates the constant
+                static PropList* getConstant(); // private
+
+                // Deletes the constants
+                static void deleteConstants(); // public
+
+            The same functions are added to the subclasses of PropList instead of
+            using PropList's because of the class types and in favor of clarity.
 
-#ifndef H5_NO_NAMESPACE
-} // end namespace
-#endif
+****************************************************************************/
diff --git a/c++/src/H5PredType.h b/c++/src/H5PredType.h
index 494b169..1e305fc 100644
--- a/c++/src/H5PredType.h
+++ b/c++/src/H5PredType.h
@@ -1,35 +1,20 @@
 // C++ informative line for the emacs editor: -*- C++ -*-
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5PredType_H
-#define __H5PredType_H
+#ifndef H5PredType_H
+#define H5PredType_H
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#endif
-
-/* This constant is defined for a workaround to eliminate memory leaks due to
-   the library being re-initiated when PredType destructors are invoked.  A
-   PredType instant with H5CPP_EXITED as the value of its "id" is constructed
-   before the other PredType objects are created.  At exit, when this special
-   PredType object is to be destructed, no HDF5 library function will be called
-   and the library will be terminated.  -BMR, Mar 30, 2012 */
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
-#define H5CPP_EXITED	-3  // -3 is less likely to be used elsewhere
-#endif // DOXYGEN_SHOULD_SKIP_THIS
 
 /*! \class PredType
     \brief Class PredType holds the definition of all the HDF5 predefined
@@ -38,229 +23,357 @@ namespace H5 {
     These types can only be made copy of, not created by H5Tcreate or
     closed by H5Tclose.  They are treated as constants.
 */
+//  Inheritance: AtomType -> DataType -> H5Object -> H5Location -> IdComponent
 class H5_DLLCPP PredType : public AtomType {
-   public:
-	///\brief Returns this class name.
-	virtual H5std_string fromClass () const { return("PredType"); }
-
-	// Makes a copy of the predefined type and stores the new
-	// id in the left hand side object.
-	PredType& operator=( const PredType& rhs );
-
-	// Copy constructor - makes copy of the original object
-	PredType( const PredType& original );
-
-	// Noop destructor
-	virtual ~PredType();
-
-	// Declaration of predefined types; their definition is in H5PredType.cpp
-	static const PredType STD_I8BE;
-	static const PredType STD_I8LE;
-	static const PredType STD_I16BE;
-	static const PredType STD_I16LE;
-	static const PredType STD_I32BE;
-	static const PredType STD_I32LE;
-	static const PredType STD_I64BE;
-	static const PredType STD_I64LE;
-	static const PredType STD_U8BE;
-	static const PredType STD_U8LE;
-	static const PredType STD_U16BE;
-	static const PredType STD_U16LE;
-	static const PredType STD_U32BE;
-	static const PredType STD_U32LE;
-	static const PredType STD_U64BE;
-	static const PredType STD_U64LE;
-	static const PredType STD_B8BE;
-	static const PredType STD_B8LE;
-	static const PredType STD_B16BE;
-	static const PredType STD_B16LE;
-	static const PredType STD_B32BE;
-	static const PredType STD_B32LE;
-	static const PredType STD_B64BE;
-	static const PredType STD_B64LE;
-	static const PredType STD_REF_OBJ;
-	static const PredType STD_REF_DSETREG;
-
-	static const PredType C_S1;
-	static const PredType FORTRAN_S1;
-
-	static const PredType IEEE_F32BE;
-	static const PredType IEEE_F32LE;
-	static const PredType IEEE_F64BE;
-	static const PredType IEEE_F64LE;
-
-	static const PredType UNIX_D32BE;
-	static const PredType UNIX_D32LE;
-	static const PredType UNIX_D64BE;
-	static const PredType UNIX_D64LE;
-
-	static const PredType INTEL_I8;
-	static const PredType INTEL_I16;
-	static const PredType INTEL_I32;
-	static const PredType INTEL_I64;
-	static const PredType INTEL_U8;
-	static const PredType INTEL_U16;
-	static const PredType INTEL_U32;
-	static const PredType INTEL_U64;
-	static const PredType INTEL_B8;
-	static const PredType INTEL_B16;
-	static const PredType INTEL_B32;
-	static const PredType INTEL_B64;
-	static const PredType INTEL_F32;
-	static const PredType INTEL_F64;
-
-	static const PredType ALPHA_I8;
-	static const PredType ALPHA_I16;
-	static const PredType ALPHA_I32;
-	static const PredType ALPHA_I64;
-	static const PredType ALPHA_U8;
-	static const PredType ALPHA_U16;
-	static const PredType ALPHA_U32;
-	static const PredType ALPHA_U64;
-	static const PredType ALPHA_B8;
-	static const PredType ALPHA_B16;
-	static const PredType ALPHA_B32;
-	static const PredType ALPHA_B64;
-	static const PredType ALPHA_F32;
-	static const PredType ALPHA_F64;
-
-	static const PredType MIPS_I8;
-	static const PredType MIPS_I16;
-	static const PredType MIPS_I32;
-	static const PredType MIPS_I64;
-	static const PredType MIPS_U8;
-	static const PredType MIPS_U16;
-	static const PredType MIPS_U32;
-	static const PredType MIPS_U64;
-	static const PredType MIPS_B8;
-	static const PredType MIPS_B16;
-	static const PredType MIPS_B32;
-	static const PredType MIPS_B64;
-	static const PredType MIPS_F32;
-	static const PredType MIPS_F64;
-
-	static const PredType NATIVE_CHAR;
-	static const PredType NATIVE_SCHAR;
-	static const PredType NATIVE_UCHAR;
-	static const PredType NATIVE_SHORT;
-	static const PredType NATIVE_USHORT;
-	static const PredType NATIVE_INT;
-	static const PredType NATIVE_UINT;
-	static const PredType NATIVE_LONG;
-	static const PredType NATIVE_ULONG;
-	static const PredType NATIVE_LLONG;
-	static const PredType NATIVE_ULLONG;
-	static const PredType NATIVE_FLOAT;
-	static const PredType NATIVE_DOUBLE;
-	static const PredType NATIVE_LDOUBLE;
-	static const PredType NATIVE_B8;
-	static const PredType NATIVE_B16;
-	static const PredType NATIVE_B32;
-	static const PredType NATIVE_B64;
-	static const PredType NATIVE_OPAQUE;
-	static const PredType NATIVE_HSIZE;
-	static const PredType NATIVE_HSSIZE;
-	static const PredType NATIVE_HERR;
-	static const PredType NATIVE_HBOOL;
-
-	static const PredType NATIVE_INT8;
-	static const PredType NATIVE_UINT8;
-	static const PredType NATIVE_INT16;
-	static const PredType NATIVE_UINT16;
-	static const PredType NATIVE_INT32;
-	static const PredType NATIVE_UINT32;
-	static const PredType NATIVE_INT64;
-	static const PredType NATIVE_UINT64;
-
-// LEAST types
-#if H5_SIZEOF_INT_LEAST8_T != 0
-	static const PredType NATIVE_INT_LEAST8;
-#endif /* H5_SIZEOF_INT_LEAST8_T */
-#if H5_SIZEOF_UINT_LEAST8_T != 0
-	static const PredType NATIVE_UINT_LEAST8;
-#endif /* H5_SIZEOF_UINT_LEAST8_T */
-
-#if H5_SIZEOF_INT_LEAST16_T != 0
-	static const PredType NATIVE_INT_LEAST16;
-#endif /* H5_SIZEOF_INT_LEAST16_T */
-#if H5_SIZEOF_UINT_LEAST16_T != 0
-	static const PredType NATIVE_UINT_LEAST16;
-#endif /* H5_SIZEOF_UINT_LEAST16_T */
-
-#if H5_SIZEOF_INT_LEAST32_T != 0
-	static const PredType NATIVE_INT_LEAST32;
-#endif /* H5_SIZEOF_INT_LEAST32_T */
-#if H5_SIZEOF_UINT_LEAST32_T != 0
-	static const PredType NATIVE_UINT_LEAST32;
-#endif /* H5_SIZEOF_UINT_LEAST32_T */
-
-#if H5_SIZEOF_INT_LEAST64_T != 0
-	static const PredType NATIVE_INT_LEAST64;
-#endif /* H5_SIZEOF_INT_LEAST64_T */
-#if H5_SIZEOF_UINT_LEAST64_T != 0
-	static const PredType NATIVE_UINT_LEAST64;
-#endif /* H5_SIZEOF_UINT_LEAST64_T */
-
-// FAST types
-#if H5_SIZEOF_INT_FAST8_T != 0
-	static const PredType NATIVE_INT_FAST8;
-#endif /* H5_SIZEOF_INT_FAST8_T */
-#if H5_SIZEOF_UINT_FAST8_T != 0
-	static const PredType NATIVE_UINT_FAST8;
-#endif /* H5_SIZEOF_UINT_FAST8_T */
-
-#if H5_SIZEOF_INT_FAST16_T != 0
-	static const PredType NATIVE_INT_FAST16;
-#endif /* H5_SIZEOF_INT_FAST16_T */
-#if H5_SIZEOF_UINT_FAST16_T != 0
-	static const PredType NATIVE_UINT_FAST16;
-#endif /* H5_SIZEOF_UINT_FAST16_T */
-
-#if H5_SIZEOF_INT_FAST32_T != 0
-	static const PredType NATIVE_INT_FAST32;
-#endif /* H5_SIZEOF_INT_FAST32_T */
-#if H5_SIZEOF_UINT_FAST32_T != 0
-	static const PredType NATIVE_UINT_FAST32;
-#endif /* H5_SIZEOF_UINT_FAST32_T */
-
-#if H5_SIZEOF_INT_FAST64_T != 0
-	static const PredType NATIVE_INT_FAST64;
-#endif /* H5_SIZEOF_INT_FAST64_T */
-#if H5_SIZEOF_UINT_FAST64_T != 0
-	static const PredType NATIVE_UINT_FAST64;
-#endif /* H5_SIZEOF_UINT_FAST64_T */
-
-	/*! \brief This dummy function do not inherit from DataType - it will
-	    throw a DataTypeIException if invoked.
-	*/
-	void commit(H5Location& loc, const H5std_string& name );
-	/*! \brief This dummy function do not inherit from DataType - it will
-	    throw a DataTypeIException if invoked.
-	*/
-	void commit(H5Location& loc, const char* name );
-	/*! \brief This dummy function do not inherit from DataType - it will
-	    throw a DataTypeIException if invoked.
-	*/
-	bool committed();
-
-   protected:
+  public:
+    ///\brief Returns this class name.
+    virtual H5std_string
+    fromClass() const override
+    {
+        return ("PredType");
+    }
+
+    // Makes a copy of the predefined type and stores the new
+    // id in the left hand side object.
+    PredType &operator=(const PredType &rhs);
+
+    // Copy constructor: same as the original PredType.
+    PredType(const PredType &original);
+
+    // Noop destructor
+    virtual ~PredType() override;
+
+    /*! \brief This dummy function do not inherit from DataType - it will
+        throw a DataTypeIException if invoked.
+    */
+    void commit(H5Location &loc, const H5std_string &name);
+    /*! \brief This dummy function do not inherit from DataType - it will
+        throw a DataTypeIException if invoked.
+    */
+    void commit(H5Location &loc, const char *name);
+    /*! \brief This dummy function do not inherit from DataType - it will
+        throw a DataTypeIException if invoked.
+    */
+    bool committed();
+
+    ///\brief PredType constants
+    static const PredType &STD_I8BE;
+    static const PredType &STD_I8LE;
+    static const PredType &STD_I16BE;
+    static const PredType &STD_I16LE;
+    static const PredType &STD_I32BE;
+    static const PredType &STD_I32LE;
+    static const PredType &STD_I64BE;
+    static const PredType &STD_I64LE;
+    static const PredType &STD_U8BE;
+    static const PredType &STD_U8LE;
+    static const PredType &STD_U16BE;
+    static const PredType &STD_U16LE;
+    static const PredType &STD_U32BE;
+    static const PredType &STD_U32LE;
+    static const PredType &STD_U64BE;
+    static const PredType &STD_U64LE;
+    static const PredType &STD_B8BE;
+    static const PredType &STD_B8LE;
+    static const PredType &STD_B16BE;
+    static const PredType &STD_B16LE;
+    static const PredType &STD_B32BE;
+    static const PredType &STD_B32LE;
+    static const PredType &STD_B64BE;
+    static const PredType &STD_B64LE;
+    static const PredType &STD_REF_OBJ;
+    static const PredType &STD_REF_DSETREG;
+
+    static const PredType &C_S1;
+    static const PredType &FORTRAN_S1;
+
+    static const PredType &IEEE_F32BE;
+    static const PredType &IEEE_F32LE;
+    static const PredType &IEEE_F64BE;
+    static const PredType &IEEE_F64LE;
+
+    static const PredType &UNIX_D32BE;
+    static const PredType &UNIX_D32LE;
+    static const PredType &UNIX_D64BE;
+    static const PredType &UNIX_D64LE;
+
+    static const PredType &INTEL_I8;
+    static const PredType &INTEL_I16;
+    static const PredType &INTEL_I32;
+    static const PredType &INTEL_I64;
+    static const PredType &INTEL_U8;
+    static const PredType &INTEL_U16;
+    static const PredType &INTEL_U32;
+    static const PredType &INTEL_U64;
+    static const PredType &INTEL_B8;
+    static const PredType &INTEL_B16;
+    static const PredType &INTEL_B32;
+    static const PredType &INTEL_B64;
+    static const PredType &INTEL_F32;
+    static const PredType &INTEL_F64;
+
+    static const PredType &ALPHA_I8;
+    static const PredType &ALPHA_I16;
+    static const PredType &ALPHA_I32;
+    static const PredType &ALPHA_I64;
+    static const PredType &ALPHA_U8;
+    static const PredType &ALPHA_U16;
+    static const PredType &ALPHA_U32;
+    static const PredType &ALPHA_U64;
+    static const PredType &ALPHA_B8;
+    static const PredType &ALPHA_B16;
+    static const PredType &ALPHA_B32;
+    static const PredType &ALPHA_B64;
+    static const PredType &ALPHA_F32;
+    static const PredType &ALPHA_F64;
+
+    static const PredType &MIPS_I8;
+    static const PredType &MIPS_I16;
+    static const PredType &MIPS_I32;
+    static const PredType &MIPS_I64;
+    static const PredType &MIPS_U8;
+    static const PredType &MIPS_U16;
+    static const PredType &MIPS_U32;
+    static const PredType &MIPS_U64;
+    static const PredType &MIPS_B8;
+    static const PredType &MIPS_B16;
+    static const PredType &MIPS_B32;
+    static const PredType &MIPS_B64;
+    static const PredType &MIPS_F32;
+    static const PredType &MIPS_F64;
+
+    static const PredType &NATIVE_CHAR;
+    static const PredType &NATIVE_SCHAR;
+    static const PredType &NATIVE_UCHAR;
+    static const PredType &NATIVE_SHORT;
+    static const PredType &NATIVE_USHORT;
+    static const PredType &NATIVE_INT;
+    static const PredType &NATIVE_UINT;
+    static const PredType &NATIVE_LONG;
+    static const PredType &NATIVE_ULONG;
+    static const PredType &NATIVE_LLONG;
+    static const PredType &NATIVE_ULLONG;
+    static const PredType &NATIVE_FLOAT;
+    static const PredType &NATIVE_DOUBLE;
+    static const PredType &NATIVE_LDOUBLE;
+    static const PredType &NATIVE_B8;
+    static const PredType &NATIVE_B16;
+    static const PredType &NATIVE_B32;
+    static const PredType &NATIVE_B64;
+    static const PredType &NATIVE_OPAQUE;
+    static const PredType &NATIVE_HSIZE;
+    static const PredType &NATIVE_HSSIZE;
+    static const PredType &NATIVE_HERR;
+    static const PredType &NATIVE_HBOOL;
+
+    static const PredType &NATIVE_INT8;
+    static const PredType &NATIVE_UINT8;
+    static const PredType &NATIVE_INT16;
+    static const PredType &NATIVE_UINT16;
+    static const PredType &NATIVE_INT32;
+    static const PredType &NATIVE_UINT32;
+    static const PredType &NATIVE_INT64;
+    static const PredType &NATIVE_UINT64;
+
+    // LEAST types
+    static const PredType &NATIVE_INT_LEAST8;
+    static const PredType &NATIVE_UINT_LEAST8;
+
+    static const PredType &NATIVE_INT_LEAST16;
+    static const PredType &NATIVE_UINT_LEAST16;
+
+    static const PredType &NATIVE_INT_LEAST32;
+    static const PredType &NATIVE_UINT_LEAST32;
+
+    static const PredType &NATIVE_INT_LEAST64;
+    static const PredType &NATIVE_UINT_LEAST64;
+
+    // FAST types
+    static const PredType &NATIVE_INT_FAST8;
+    static const PredType &NATIVE_UINT_FAST8;
+
+    static const PredType &NATIVE_INT_FAST16;
+    static const PredType &NATIVE_UINT_FAST16;
+
+    static const PredType &NATIVE_INT_FAST32;
+    static const PredType &NATIVE_UINT_FAST32;
+
+    static const PredType &NATIVE_INT_FAST64;
+    static const PredType &NATIVE_UINT_FAST64;
+
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
-	// Default constructor
-	PredType();
 
-	// Creates a pre-defined type using an HDF5 pre-defined constant
-	PredType( const hid_t predtype_id );  // used by the library only
+    // Deletes the PredType global constants
+    static void deleteConstants();
+
+    // Dummy constant
+    static const PredType &PREDTYPE_CONST; // dummy constant
+
+  protected:
+    // Default constructor
+    PredType();
+
+    // Creates a pre-defined type using an HDF5 pre-defined constant
+    PredType(const hid_t predtype_id); // used by the library only
+
+  private:
+    // Activates the creation of the PredType global constants
+    static PredType *getPredTypes();
+
+    // Dynamically allocates PredType global constants
+    static void makePredTypes();
+
+    // Dummy constant
+    static PredType *PREDTYPE_CONST_;
+
+    // Declaration of pointers to constants
+    static PredType *STD_I8BE_;
+    static PredType *STD_I8LE_;
+    static PredType *STD_I16BE_;
+    static PredType *STD_I16LE_;
+    static PredType *STD_I32BE_;
+    static PredType *STD_I32LE_;
+    static PredType *STD_I64BE_;
+    static PredType *STD_I64LE_;
+    static PredType *STD_U8BE_;
+    static PredType *STD_U8LE_;
+    static PredType *STD_U16BE_;
+    static PredType *STD_U16LE_;
+    static PredType *STD_U32BE_;
+    static PredType *STD_U32LE_;
+    static PredType *STD_U64BE_;
+    static PredType *STD_U64LE_;
+    static PredType *STD_B8BE_;
+    static PredType *STD_B8LE_;
+    static PredType *STD_B16BE_;
+    static PredType *STD_B16LE_;
+    static PredType *STD_B32BE_;
+    static PredType *STD_B32LE_;
+    static PredType *STD_B64BE_;
+    static PredType *STD_B64LE_;
+    static PredType *STD_REF_OBJ_;
+    static PredType *STD_REF_DSETREG_;
+
+    static PredType *C_S1_;
+    static PredType *FORTRAN_S1_;
+
+    static PredType *IEEE_F32BE_;
+    static PredType *IEEE_F32LE_;
+    static PredType *IEEE_F64BE_;
+    static PredType *IEEE_F64LE_;
+
+    static PredType *UNIX_D32BE_;
+    static PredType *UNIX_D32LE_;
+    static PredType *UNIX_D64BE_;
+    static PredType *UNIX_D64LE_;
+
+    static PredType *INTEL_I8_;
+    static PredType *INTEL_I16_;
+    static PredType *INTEL_I32_;
+    static PredType *INTEL_I64_;
+    static PredType *INTEL_U8_;
+    static PredType *INTEL_U16_;
+    static PredType *INTEL_U32_;
+    static PredType *INTEL_U64_;
+    static PredType *INTEL_B8_;
+    static PredType *INTEL_B16_;
+    static PredType *INTEL_B32_;
+    static PredType *INTEL_B64_;
+    static PredType *INTEL_F32_;
+    static PredType *INTEL_F64_;
+
+    static PredType *ALPHA_I8_;
+    static PredType *ALPHA_I16_;
+    static PredType *ALPHA_I32_;
+    static PredType *ALPHA_I64_;
+    static PredType *ALPHA_U8_;
+    static PredType *ALPHA_U16_;
+    static PredType *ALPHA_U32_;
+    static PredType *ALPHA_U64_;
+    static PredType *ALPHA_B8_;
+    static PredType *ALPHA_B16_;
+    static PredType *ALPHA_B32_;
+    static PredType *ALPHA_B64_;
+    static PredType *ALPHA_F32_;
+    static PredType *ALPHA_F64_;
+
+    static PredType *MIPS_I8_;
+    static PredType *MIPS_I16_;
+    static PredType *MIPS_I32_;
+    static PredType *MIPS_I64_;
+    static PredType *MIPS_U8_;
+    static PredType *MIPS_U16_;
+    static PredType *MIPS_U32_;
+    static PredType *MIPS_U64_;
+    static PredType *MIPS_B8_;
+    static PredType *MIPS_B16_;
+    static PredType *MIPS_B32_;
+    static PredType *MIPS_B64_;
+    static PredType *MIPS_F32_;
+    static PredType *MIPS_F64_;
+
+    static PredType *NATIVE_CHAR_;
+    static PredType *NATIVE_SCHAR_;
+    static PredType *NATIVE_UCHAR_;
+    static PredType *NATIVE_SHORT_;
+    static PredType *NATIVE_USHORT_;
+    static PredType *NATIVE_INT_;
+    static PredType *NATIVE_UINT_;
+    static PredType *NATIVE_LONG_;
+    static PredType *NATIVE_ULONG_;
+    static PredType *NATIVE_LLONG_;
+    static PredType *NATIVE_ULLONG_;
+    static PredType *NATIVE_FLOAT_;
+    static PredType *NATIVE_DOUBLE_;
+    static PredType *NATIVE_LDOUBLE_;
+    static PredType *NATIVE_B8_;
+    static PredType *NATIVE_B16_;
+    static PredType *NATIVE_B32_;
+    static PredType *NATIVE_B64_;
+    static PredType *NATIVE_OPAQUE_;
+    static PredType *NATIVE_HSIZE_;
+    static PredType *NATIVE_HSSIZE_;
+    static PredType *NATIVE_HERR_;
+    static PredType *NATIVE_HBOOL_;
+
+    static PredType *NATIVE_INT8_;
+    static PredType *NATIVE_UINT8_;
+    static PredType *NATIVE_INT16_;
+    static PredType *NATIVE_UINT16_;
+    static PredType *NATIVE_INT32_;
+    static PredType *NATIVE_UINT32_;
+    static PredType *NATIVE_INT64_;
+    static PredType *NATIVE_UINT64_;
+
+    // LEAST types
+    static PredType *NATIVE_INT_LEAST8_;
+    static PredType *NATIVE_UINT_LEAST8_;
+
+    static PredType *NATIVE_INT_LEAST16_;
+    static PredType *NATIVE_UINT_LEAST16_;
+
+    static PredType *NATIVE_INT_LEAST32_;
+    static PredType *NATIVE_UINT_LEAST32_;
+
+    static PredType *NATIVE_INT_LEAST64_;
+    static PredType *NATIVE_UINT_LEAST64_;
+
+    // FAST types
+    static PredType *NATIVE_INT_FAST8_;
+    static PredType *NATIVE_UINT_FAST8_;
+
+    static PredType *NATIVE_INT_FAST16_;
+    static PredType *NATIVE_UINT_FAST16_;
+
+    static PredType *NATIVE_INT_FAST32_;
+    static PredType *NATIVE_UINT_FAST32_;
+
+    static PredType *NATIVE_INT_FAST64_;
+    static PredType *NATIVE_UINT_FAST64_;
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS
 
-   private:
-	// Added this to work around the atexit/global destructor problem.
-	// It'll help to terminate the library after other PredType instances
-	// are closed.  -BMR, Mar 30, 2012
-	static const PredType AtExit;
-
-};
-#ifndef H5_NO_NAMESPACE
-}
-#endif
-#endif // __H5PredType_H
+}; // end of PredType
+} // namespace H5
+
+#endif // H5PredType_H
diff --git a/c++/src/H5PropList.cpp b/c++/src/H5PropList.cpp
index 1d7d1ba..92a826e 100644
--- a/c++/src/H5PropList.cpp
+++ b/c++/src/H5PropList.cpp
@@ -1,226 +1,283 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifdef OLD_HEADER_FILENAME
-#include <iostream.h>
-#else
 #include <iostream>
-#endif
-
 #include <string>
 
 #include "H5Include.h"
 #include "H5Exception.h"
 #include "H5IdComponent.h"
 #include "H5PropList.h"
-#include "H5private.h"		// for HDfree
-
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#ifndef H5_NO_STD
-    using std::cerr;
-    using std::endl;
-#endif  // H5_NO_STD
-#endif
+using std::cerr;
+using std::endl;
+
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+// This DOXYGEN_SHOULD_SKIP_THIS block is a work-around approach to control
+// the order of creation and deletion of the global constants.  See Design Notes
+// in "H5PredType.cpp" for information.
+
+// Initialize a pointer for the constant
+PropList *PropList::DEFAULT_ = 0;
+
+//--------------------------------------------------------------------------
+// Function:    PropList::getConstant
+// Purpose      Creates a PropList object representing the HDF5 constant
+//              H5P_DEFAULT, pointed to by PropList::DEFAULT_.
+// Exception    H5::PropListIException
+// Description
+//              If PropList::DEFAULT_ already points to an allocated object,
+//              throw a PropListIException.  This scenario should not happen.
+// Programmer   Binh-Minh Ribler - 2015
+//--------------------------------------------------------------------------
+PropList *
+PropList::getConstant()
+{
+    // Tell the C library not to clean up, H5Library::termH5cpp will call
+    // H5close - more dependency if use H5Library::dontAtExit()
+    if (!IdComponent::H5dontAtexit_called) {
+        (void)H5dont_atexit();
+        IdComponent::H5dontAtexit_called = true;
+    }
+
+    // If the constant pointer is not allocated, allocate it. Otherwise,
+    // throw because it shouldn't be.
+    if (DEFAULT_ == 0)
+        DEFAULT_ = new PropList(H5P_DEFAULT);
+    else
+        throw PropListIException("PropList::getConstant",
+                                 "PropList::getConstant is being invoked on an allocated DEFAULT_");
+    return (DEFAULT_);
+}
 
 //--------------------------------------------------------------------------
-///\brief	Constant for default property.
+// Function:    PropList::deleteConstants
+// Purpose      Deletes the constant object that PropList::DEFAULT_ points to.
+// Programmer   Binh-Minh Ribler - 2015
 //--------------------------------------------------------------------------
-const PropList PropList::DEFAULT;
+void
+PropList::deleteConstants()
+{
+    delete DEFAULT_;
+}
 
 //--------------------------------------------------------------------------
-// Function	Default constructor
-///\brief	Default constructor: creates a stub property list object.
-// Programmer	Binh-Minh Ribler - 2000
+// Purpose      Constant for default property.
 //--------------------------------------------------------------------------
-PropList::PropList() : IdComponent(), id(H5P_DEFAULT) {}
+const PropList &PropList::DEFAULT = *getConstant();
+
+#endif // DOXYGEN_SHOULD_SKIP_THIS
 
 //--------------------------------------------------------------------------
-// Function:	PropList copy constructor
-///\brief	Copy constructor
-///\param	original - IN: The original property list to copy
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    Default constructor
+///\brief       Default constructor: creates a stub property list object.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-PropList::PropList(const PropList& original) : IdComponent()
+PropList::PropList() : IdComponent(), id(H5P_DEFAULT)
+{
+}
+
+//--------------------------------------------------------------------------
+// Function:    PropList copy constructor
+///\brief       Copy constructor: same HDF5 object as \a original
+///\param       original - IN: The original property list to copy
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+PropList::PropList(const PropList &original) : IdComponent(), id(original.id)
 {
-    id = original.getId();
     incRefCount(); // increment number of references to this id
 }
 
 //--------------------------------------------------------------------------
-// Function:	PropList overloaded constructor
-///\brief	Creates a property list using the id of an existing property.
-///\param	plist_id - IN: Id of the existing property list
-///\exception	H5::PropListIException
+// Function:    PropList overloaded constructor
+///\brief       Creates a property list using the id of an existing property.
+///\param       plist_id - IN: Id of the existing property list
+///\exception   H5::PropListIException
 // Description
-//		This function creates a new property list if a property
-//		class is provided or makes a copy of a property list if one
-//		is given.  If the given id is anything else, then set this
-//		property's id to H5P_DEFAULT.
-// Programmer	Binh-Minh Ribler - 2000
+//              This function creates a new property list if a property
+//              class is provided or makes a copy of a property list if one
+//              is given.  If the given id is anything else, then set this
+//              property's id to H5P_DEFAULT.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-PropList::PropList( const hid_t plist_id ) : IdComponent()
+PropList::PropList(const hid_t plist_id) : IdComponent(), id{H5P_DEFAULT}
 {
-    if (plist_id <= 0)
-	id = H5P_DEFAULT;
-
     H5I_type_t id_type = H5Iget_type(plist_id);
     switch (id_type) {
-	case H5I_GENPROP_CLS:
-	  // call C routine to create a new property from the given prop class
-	  id = H5Pcreate(plist_id);
-	  if( id < 0 )
-	  {
-	      throw PropListIException("PropList constructor", "H5Pcreate failed");
-	  }
-	  break;
-	case H5I_GENPROP_LST:
-	  // call C routine to make a copy of the given property list
-	  id = H5Pcopy(plist_id);
-	  if( id < 0 )
-	  {
-	      throw PropListIException("PropList constructor", "H5Pcopy failed");
-	  }
-	  break;
-	default:
-	  id = H5P_DEFAULT;
-	  break;
+        case H5I_GENPROP_CLS:
+            // call C routine to create a new property from the given prop class
+            id = H5Pcreate(plist_id);
+            if (id < 0) {
+                throw PropListIException("PropList constructor", "H5Pcreate failed");
+            }
+            break;
+        case H5I_GENPROP_LST:
+            // call C routine to make a copy of the given property list
+            id = H5Pcopy(plist_id);
+            if (id < 0) {
+                throw PropListIException("PropList constructor", "H5Pcopy failed");
+            }
+            break;
+        /* These should really be error cases, but changing that breaks
+         * the stated behavior and causes test failures.
+         * (DER, July 2017)
+         */
+        case H5I_BADID:
+        case H5I_FILE:
+        case H5I_GROUP:
+        case H5I_DATATYPE:
+        case H5I_DATASPACE:
+        case H5I_DATASET:
+        case H5I_ATTR:
+        case H5I_VFL:
+        case H5I_VOL:
+        case H5I_ERROR_CLASS:
+        case H5I_ERROR_MSG:
+        case H5I_ERROR_STACK:
+        case H5I_NTYPES:
+        case H5I_UNINIT:
+        case H5I_MAP:
+        case H5I_SPACE_SEL_ITER:
+        case H5I_EVENTSET:
+        default:
+            id = H5P_DEFAULT;
+            break;
     }
 }
 
 //--------------------------------------------------------------------------
-// Function:	PropList::copy
-///\brief	Makes a copy of an existing property list.
-///\param	like_plist - IN: Reference to the existing property list
-///\exception	H5::PropListIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    PropList::copy
+///\brief       Makes a copy of an existing property list.
+///\param       like_plist - IN: Reference to the existing property list
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - 2000
 // Modification
-//		- Replaced resetIdComponent() with decRefCount() to use C
-//		library ID reference counting mechanism - BMR, Jun 1, 2004
-//		- Replaced decRefCount with close() to let the C library
-//		handle the reference counting - BMR, Jun 1, 2006
+//              - Replaced resetIdComponent() with decRefCount() to use C
+//              library ID reference counting mechanism - BMR, Jun 1, 2004
+//              - Replaced decRefCount with close() to let the C library
+//              handle the reference counting - BMR, Jun 1, 2006
 //--------------------------------------------------------------------------
-void PropList::copy( const PropList& like_plist )
+void
+PropList::copy(const PropList &like_plist)
 {
     // If this object is representing an hdf5 object, close it before
     // copying like_plist to it
     try {
-	close();
+        close();
     }
-    catch (Exception close_error) {
-	throw PropListIException(inMemFunc("copy"), close_error.getDetailMsg());
+    catch (Exception &close_error) {
+        throw PropListIException(inMemFunc("copy"), close_error.getDetailMsg());
     }
 
     // call C routine to copy the property list
-    id = H5Pcopy( like_plist.getId() );
-    if( id < 0 )
-	throw PropListIException(inMemFunc("copy"), "H5Pcopy failed");
+    id = H5Pcopy(like_plist.getId());
+    if (id < 0)
+        throw PropListIException(inMemFunc("copy"), "H5Pcopy failed");
 }
 
 //--------------------------------------------------------------------------
-// Function:	PropList::operator=
-///\brief	Assignment operator.
-///\param	rhs - IN: Reference to the existing property list
-///\return	Reference to PropList instance
-///\exception	H5::PropListIException
+// Function:    PropList::operator=
+///\brief       Assignment operator.
+///\param       rhs - IN: Reference to the existing property list
+///\return      Reference to PropList instance
+///\exception   H5::PropListIException
 // Description
-//		Makes a copy of the property list on the right hand side
-//		and stores the new id in the left hand side object.
-// Programmer	Binh-Minh Ribler - 2000
+//              Makes a copy of the property list on the right hand side
+//              and stores the new id in the left hand side object.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-PropList& PropList::operator=( const PropList& rhs )
+PropList &
+PropList::operator=(const PropList &rhs)
 {
     if (this != &rhs)
-	copy(rhs);
-    return(*this);
+        copy(rhs);
+    return (*this);
 }
 
 //--------------------------------------------------------------------------
-// Function:	PropList::copyProp
-///\brief	Copies a property from this property list or class to another
-///\param	dest - IN: Destination property list or class
-///\param	name - IN: Name of the property to copy - \c char pointer
-///\exception	H5::PropListIException
-// Programmer	Binh-Minh Ribler - Jul, 2005
+// Function:    PropList::copyProp
+///\brief       Copies a property from this property list or class to another
+///\param       dest - IN: Destination property list or class
+///\param       name - IN: Name of the property to copy - \c char pointer
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - Jul, 2005
 //--------------------------------------------------------------------------
-void PropList::copyProp(PropList& dest, const char *name) const
+void
+PropList::copyProp(PropList &dest, const char *name) const
 {
-   hid_t dst_id = dest.getId();
-   herr_t ret_value = H5Pcopy_prop(dst_id, id, name);
-   if( ret_value < 0 )
-   {
-      throw PropListIException(inMemFunc("copyProp"), "H5Pcopy_prop failed");
-   }
+    hid_t  dst_id    = dest.getId();
+    herr_t ret_value = H5Pcopy_prop(dst_id, id, name);
+    if (ret_value < 0) {
+        throw PropListIException(inMemFunc("copyProp"), "H5Pcopy_prop failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	PropList::copyProp
-///\brief	This is an overloaded member function, provided for convenience.
-/// 		It differs from the above function only in what arguments it
-///		accepts.
-///\param	dest - IN: Destination property list or class
-///\param	name - IN: Name of the property to copy - \c H5std_string
-// Programmer	Binh-Minh Ribler - Jul, 2005
+// Function:    PropList::copyProp
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function only in what arguments it
+///             accepts.
+///\param       dest - IN: Destination property list or class
+///\param       name - IN: Name of the property to copy - \c H5std_string
+// Programmer   Binh-Minh Ribler - Jul, 2005
 //--------------------------------------------------------------------------
-void PropList::copyProp( PropList& dest, const H5std_string& name ) const
+void
+PropList::copyProp(PropList &dest, const H5std_string &name) const
 {
-   copyProp( dest, name.c_str());
+    copyProp(dest, name.c_str());
 }
 
 //--------------------------------------------------------------------------
-// Function:	PropList::copyProp
-///\brief	Copies a property from one list or class to another - Obsolete
-///\param	dest - IN: Destination property list or class
-///\param	src  - IN: Source property list or class
-///\param	name - IN: Name of the property to copy - \c char pointer
-///\note	This member function will be removed in the next release
-///\exception	H5::PropListIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    PropList::copyProp
+///\brief       Copies a property from one list or class to another - Obsolete
+///\param       dest - IN: Destination property list or class
+///\param       src  - IN: Source property list or class
+///\param       name - IN: Name of the property to copy - \c char pointer
+///\note        This member function will be removed in the next release
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void PropList::copyProp( PropList& dest, PropList& src, const char *name ) const
+void
+PropList::copyProp(PropList &dest, PropList &src, const char *name) const
 {
-   hid_t dst_id = dest.getId();
-   hid_t src_id = src.getId();
-   herr_t ret_value = H5Pcopy_prop(dst_id, src_id, name);
-   if( ret_value < 0 )
-   {
-      throw PropListIException(inMemFunc("copyProp"), "H5Pcopy_prop failed");
-   }
-
+    hid_t  dst_id    = dest.getId();
+    hid_t  src_id    = src.getId();
+    herr_t ret_value = H5Pcopy_prop(dst_id, src_id, name);
+    if (ret_value < 0) {
+        throw PropListIException(inMemFunc("copyProp"), "H5Pcopy_prop failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	PropList::copyProp
-///\brief	This is an overloaded member function, provided for convenience.
-/// 		It differs from the above function only in what arguments it
-///		accepts. - Obsolete
-///\param	dest - IN: Destination property list or class
-///\param	src  - IN: Source property list or class
-///\param	name - IN: Name of the property to copy - \c H5std_string
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    PropList::copyProp
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function only in what arguments it
+///             accepts. - Obsolete
+///\param       dest - IN: Destination property list or class
+///\param       src  - IN: Source property list or class
+///\param       name - IN: Name of the property to copy - \c H5std_string
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void PropList::copyProp( PropList& dest, PropList& src, const H5std_string& name ) const
+void
+PropList::copyProp(PropList &dest, PropList &src, const H5std_string &name) const
 {
-   copyProp( dest, src, name.c_str());
+    copyProp(dest, src, name.c_str());
 }
 
 //--------------------------------------------------------------------------
 // Function:    PropList::getId
-///\brief	Get the id of this property list
-///\return	Property list identifier
+///\brief       Get the id of this property list
+///\return      Property list identifier
 // Description:
 //              Class hierarchy is revised to address bugzilla 1068.  Class
 //              AbstractDS and Attribute are moved out of H5Object.  In
@@ -228,9 +285,10 @@ void PropList::copyProp( PropList& dest, PropList& src, const H5std_string& name
 //              IdComponent::getId now becomes pure virtual function.
 // Programmer   Binh-Minh Ribler - May, 2008
 //--------------------------------------------------------------------------
-hid_t PropList::getId() const
+hid_t
+PropList::getId() const
 {
-   return(id);
+    return (id);
 }
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
@@ -241,467 +299,536 @@ hid_t PropList::getId() const
 ///\exception   H5::IdComponentException when the attempt to close the HDF5
 ///             object fails
 // Description:
-//              The underlaying reference counting in the C library ensures
+//              The underlying reference counting in the C library ensures
 //              that the current valid id of this object is properly closed.
 //              Then the object's id is reset to the new id.
 // Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void PropList::p_setId(const hid_t new_id)
+void
+PropList::p_setId(const hid_t new_id)
 {
     // handling references to this old id
     try {
         close();
     }
-    catch (Exception close_error) {
+    catch (Exception &close_error) {
         throw PropListIException(inMemFunc("p_setId"), close_error.getDetailMsg());
     }
-   // reset object's id to the given id
-   id = new_id;
+    // reset object's id to the given id
+    id = new_id;
 }
+
 #endif // DOXYGEN_SHOULD_SKIP_THIS
 
 //--------------------------------------------------------------------------
-// Function:	PropList::close
-///\brief	Closes the property list if it is not a default one.
+// Function:    PropList::close
+///\brief       Closes the property list if it is not a default one.
 ///
-///\exception	H5::PropListIException
-// Programmer	Binh-Minh Ribler - Mar 9, 2005
-//--------------------------------------------------------------------------
-void PropList::close()
-{
-    if (p_valid_id(id))
-    {
-	herr_t ret_value = H5Pclose( id );
-	if( ret_value < 0 )
-	{
-	    throw PropListIException(inMemFunc("close"), "H5Pclose failed");
-	}
-	// reset the id
-	id = H5I_INVALID_HID;
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - Mar 9, 2005
+//--------------------------------------------------------------------------
+void
+PropList::close()
+{
+    if (p_valid_id(id)) {
+        herr_t ret_value = H5Pclose(id);
+        if (ret_value < 0) {
+            throw PropListIException(inMemFunc("close"), "H5Pclose failed");
+        }
+        // reset the id
+        id = H5I_INVALID_HID;
     }
 }
 
 //--------------------------------------------------------------------------
-// Function:	PropList::getClass
-///\brief	Returns the class of this property list, i.e. \c H5P_FILE_CREATE...
-///\return	The property list class if it is not equal to \c H5P_ROOT
-///\exception	H5::PropListIException
-// Programmer	Binh-Minh Ribler - April, 2004
+// Function:    PropList::getClass
+///\brief       Returns the class of this property list, i.e. \c H5P_FILE_CREATE...
+///\return      The property list class if it is not equal to \c H5P_ROOT
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
-hid_t PropList::getClass() const
+hid_t
+PropList::getClass() const
 {
-   hid_t plist_class = H5Pget_class( id );
-   if( plist_class == H5P_ROOT )
-   {
-      throw PropListIException(inMemFunc("getClass"),
-		"H5Pget_class failed - returned H5P_ROOT");
-   }
-   return( plist_class );
+    hid_t plist_class = H5Pget_class(id);
+    if (plist_class == H5P_ROOT) {
+        throw PropListIException(inMemFunc("getClass"), "H5Pget_class failed - returned H5P_ROOT");
+    }
+    return (plist_class);
 }
 
 //--------------------------------------------------------------------------
-// Function:	PropList::propExist
-///\brief	Query the existance of a property in a property object.
-///\param	name - IN: Name of property to check for - \c char pointer
-///\return	true if the property exists in the property object, and
-///		false, otherwise.
-///\exception	H5::PropListIException
+// Function:    PropList::propExist
+///\brief       Queries the existence of a property in a property object.
+///\param       name - IN: Name of property to check for - \c char pointer
+///\return      true if the property exists in the property object, and
+///             false, otherwise.
+///\exception   H5::PropListIException
 ///\par Description
-///		This routine checks if a property exists within a property
-///		list or class.
+///             This routine checks if a property exists within a property
+///             list or class.
 // Programmer:  Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
-bool PropList::propExist(const char* name ) const
-{
-   // Calls C routine H5Pexist to determine whether a property exists
-   // within a property list or class.  It returns a positive value, 0,
-   // or a negative value
-   htri_t ret_value = H5Pexist(id, name);
-   if( ret_value > 0 )
-      return true;
-   else if( ret_value == 0 )
-      return false;
-   else // Raise exception when H5Pexist returns a negative value
-   {
-      throw PropListIException(inMemFunc("propExist"), "H5Pexist failed");
-   }
-}
-//--------------------------------------------------------------------------
-// Function:	PropList::propExist
-///\brief	This is an overloaded member function, provided for convenience.
-/// 		It differs from the above function only in what arguments it
-///		accepts.
-///\param	name - IN: Name of property to check for - \c H5std_string
+bool
+PropList::propExist(const char *name) const
+{
+    // Calls C routine H5Pexist to determine whether a property exists
+    // within a property list or class.  It returns a positive value, 0,
+    // or a negative value
+    htri_t ret_value = H5Pexist(id, name);
+    if (ret_value > 0)
+        return true;
+    else if (ret_value == 0)
+        return false;
+    else // Raise exception when H5Pexist returns a negative value
+    {
+        throw PropListIException(inMemFunc("propExist"), "H5Pexist failed");
+    }
+}
+//--------------------------------------------------------------------------
+// Function:    PropList::propExist
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function only in what arguments it
+///             accepts.
+///\param       name - IN: Name of property to check for - \c H5std_string
 // Programmer:  Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
-bool PropList::propExist(const H5std_string& name ) const
+bool
+PropList::propExist(const H5std_string &name) const
 {
-   return( propExist( name.c_str()) );
+    return (propExist(name.c_str()));
 }
 
 //--------------------------------------------------------------------------
-// Function:	PropList::closeClass
-///\brief	Close a property list class.
+// Function:    PropList::closeClass
+///\brief       Close a property list class.
 ///
-///\exception	H5::PropListIException
+///\exception   H5::PropListIException
 ///\par Description
-///		Releases memory and detaches a class from the property
-///		list class hierarchy.
+///             Releases memory and detaches a class from the property
+///             list class hierarchy.
 // Programmer:  Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
-void PropList::closeClass() const
+void
+PropList::closeClass() const
 {
-   herr_t ret_value = H5Pclose_class(id);
-   if( ret_value < 0 )
-   {
-      throw PropListIException(inMemFunc("closeClass"), "H5Pclose_class failed");
-   }
+    herr_t ret_value = H5Pclose_class(id);
+    if (ret_value < 0) {
+        throw PropListIException(inMemFunc("closeClass"), "H5Pclose_class failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	PropList::getProperty
-///\brief	Query the value of a property in a property list.
-///\param	name -   IN: Name of property to query - \c char pointer
-///\param	value - OUT: Pointer to the buffer for the property value
-///\exception	H5::PropListIException
+// Function:    PropList::getProperty
+///\brief       Query the value of a property in a property list.
+///\param       name -   IN: Name of property to query - \c char pointer
+///\param       value - OUT: Pointer to the buffer for the property value
+///\exception   H5::PropListIException
 ///\par Description
-///		Retrieves a copy of the value for a property in a property
-///		list.  The property name must exist or this routine will
-///		throw an exception.
+///             Retrieves a copy of the value for a property in a property
+///             list.  The property name must exist or this routine will
+///             throw an exception.
 // Programmer:  Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
-void PropList::getProperty(const char* name, void* value) const
+void
+PropList::getProperty(const char *name, void *value) const
 {
-   herr_t ret_value = H5Pget(id, name, value);
-   if (ret_value < 0)
-   {
-      throw PropListIException(inMemFunc("getProperty"), "H5Pget failed");
-   }
+    herr_t ret_value = H5Pget(id, name, value);
+    if (ret_value < 0) {
+        throw PropListIException(inMemFunc("getProperty"), "H5Pget failed");
+    }
 }
 //--------------------------------------------------------------------------
-// Function:	PropList::getProperty
-///\brief	This is an overloaded member function, provided for convenience.
-///   		It differs from the above function only in what arguments it
-///		accepts.
-///\param	name -  IN: Name of property to query - \c char pointer
-///\return	The property that is a \c H5std_string.
-///\exception	H5::PropListIException
+// Function:    PropList::getProperty
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function only in what arguments it
+///             accepts.
+///\param       name -  IN: Name of property to query - \c char pointer
+///\return      The property that is a \c H5std_string.
+///\exception   H5::PropListIException
 // Programmer:  Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
-H5std_string PropList::getProperty(const char* name) const
+H5std_string
+PropList::getProperty(const char *name) const
 {
-   // Get property size first
-   size_t size = getPropSize(name);
+    // Get property size first
+    size_t size = getPropSize(name);
 
-   // Allocate buffer then get the property
-   char* prop_strg_C = new char[size+1];  // temporary C-string for C API
-   HDmemset(prop_strg_C, 0, size+1); // clear buffer
+    // Allocate buffer then get the property
+    char *prop_strg_C = new char[size + 1]();
 
-   herr_t ret_value = H5Pget(id, name, prop_strg_C); // call C API
+    herr_t ret_value = H5Pget(id, name, prop_strg_C); // call C API
 
-   // Throw exception if H5Pget returns failure
-   if (ret_value < 0)
-   {
-      delete []prop_strg_C;
-      throw PropListIException(inMemFunc("getProperty"), "H5Pget failed");
-   }
+    // Throw exception if H5Pget returns failure
+    if (ret_value < 0) {
+        delete[] prop_strg_C;
+        throw PropListIException(inMemFunc("getProperty"), "H5Pget failed");
+    }
 
-   // Return propety value as a string after deleting temp C-string
-   H5std_string prop_strg(prop_strg_C);
-   delete []prop_strg_C;
-   return (prop_strg);
+    // Return property value as a string after deleting temp C-string
+    H5std_string prop_strg(prop_strg_C);
+    delete[] prop_strg_C;
+    return (prop_strg);
 }
 //--------------------------------------------------------------------------
-// Function:	PropList::getProperty
-///\brief	This is an overloaded member function, provided for convenience.
-///   		It differs from the above function only in what arguments it
-///		accepts.
-///\param	name -   IN: Name of property to query - \c H5std_string
-///\param	value - OUT: Pointer to the buffer for the property value
+// Function:    PropList::getProperty
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function only in what arguments it
+///             accepts.
+///\param       name -   IN: Name of property to query - \c H5std_string
+///\param       value - OUT: Pointer to the buffer for the property value
 // Programmer:  Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
-void PropList::getProperty(const H5std_string& name, void* value) const
+void
+PropList::getProperty(const H5std_string &name, void *value) const
 {
-   getProperty(name.c_str(), value);
+    getProperty(name.c_str(), value);
 }
 //--------------------------------------------------------------------------
-// Function:	PropList::getProperty
-///\brief	This is an overloaded member function, provided for convenience.
-///   		It differs from the above function only in what arguments it
-///		accepts.
-///\param	name -  IN: Name of property to query - \c H5std_string
-///\return	The property that is a \c H5std_string.
+// Function:    PropList::getProperty
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function only in what arguments it
+///             accepts.
+///\param       name -  IN: Name of property to query - \c H5std_string
+///\return      The property that is a \c H5std_string.
 // Programmer:  Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
-H5std_string PropList::getProperty(const H5std_string& name) const
+H5std_string
+PropList::getProperty(const H5std_string &name) const
 {
-   return (getProperty(name.c_str()));
+    return (getProperty(name.c_str()));
 }
 
 //--------------------------------------------------------------------------
-// Function:	PropList::getPropSize
-///\brief	Query the size of a property in a property list or class.
-///\param	name - IN: Name of property to query
-///\return	Size of the property
-///\exception	H5::PropListIException
+// Function:    PropList::getPropSize
+///\brief       Query the size of a property in a property list or class.
+///\param       name - IN: Name of property to query
+///\return      Size of the property
+///\exception   H5::PropListIException
 ///\par Description
-///		This routine retrieves the size of a property's value
-///		in bytes.  Zero-sized properties are allowed and the return
-///		value will be of 0.  This function works for both property
-///		lists and classes.
+///             This routine retrieves the size of a property's value
+///             in bytes.  Zero-sized properties are allowed and the return
+///             value will be of 0.  This function works for both property
+///             lists and classes.
 // Programmer:  Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
-size_t PropList::getPropSize(const char *name) const
+size_t
+PropList::getPropSize(const char *name) const
 {
-   size_t prop_size;
-   herr_t ret_value = H5Pget_size(id, name, &prop_size);
-   if (ret_value < 0)
-   {
-      throw PropListIException(inMemFunc("getPropSize"), "H5Pget_size failed");
-   }
-   return(prop_size);
+    size_t prop_size;
+    herr_t ret_value = H5Pget_size(id, name, &prop_size);
+    if (ret_value < 0) {
+        throw PropListIException(inMemFunc("getPropSize"), "H5Pget_size failed");
+    }
+    return (prop_size);
 }
 //--------------------------------------------------------------------------
-// Function:	PropList::getPropSize
-///\brief	This is an overloaded member function, provided for convenience.
-/// 		It differs from the above function only in what arguments it
-///		accepts.
-///\param	name - IN: Name of property to query - \c H5std_string
+// Function:    PropList::getPropSize
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function only in what arguments it
+///             accepts.
+///\param       name - IN: Name of property to query - \c H5std_string
 ///
 // Programmer:  Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
-size_t PropList::getPropSize(const H5std_string& name) const
+size_t
+PropList::getPropSize(const H5std_string &name) const
 {
-   return (getPropSize(name.c_str()));
+    return (getPropSize(name.c_str()));
 }
 
 //--------------------------------------------------------------------------
-// Function:	PropList::getClassName
-///\brief	Return the name of a generic property list class.
-///\return	A string containing the class name, if success, otherwise,
-///		a NULL string.
+// Function:    PropList::getClassName
+///\brief       Return the name of a generic property list class.
+///\return      A string containing the class name, if success, otherwise,
+///             an empty string.
 // Programmer:  Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
-H5std_string PropList::getClassName() const
+H5std_string
+PropList::getClassName() const
 {
-   char* temp_str;
-   temp_str = H5Pget_class_name(id); // this API specified that temp_str must
-				     // be freed.
-
-   if (temp_str != NULL)
-   {
-      H5std_string class_name(temp_str);
-      H5free_memory(temp_str);
-      return(class_name);
-   }
-   else
-      return 0;
+    char *temp_str;
+    temp_str = H5Pget_class_name(id);
+    if (temp_str != NULL) {
+        H5std_string class_name(temp_str);
+        H5free_memory(temp_str);
+        return (class_name);
+    }
+    else
+        return "";
 }
+
 //--------------------------------------------------------------------------
-// Function:	PropList::getNumProps
-///\brief	Returns the number of properties in this property list or class.
-///\return	Size of the property.
-///\exception	H5::PropListIException
+// Function:    PropList::getNumProps
+///\brief       Returns the number of properties in this property list or class.
+///\return      Size of the property.
+///\exception   H5::PropListIException
 // Programmer:  Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
-size_t PropList::getNumProps() const
+size_t
+PropList::getNumProps() const
 {
-   size_t nprops;
-   herr_t ret_value = H5Pget_nprops (id, &nprops);
-   if (ret_value < 0)
-   {
-      throw PropListIException(inMemFunc("getNumProps"), "H5Pget_nprops failed");
-   }
-   return (nprops);
+    size_t nprops;
+    herr_t ret_value = H5Pget_nprops(id, &nprops);
+    if (ret_value < 0) {
+        throw PropListIException(inMemFunc("getNumProps"), "H5Pget_nprops failed");
+    }
+    return (nprops);
 }
 
 //--------------------------------------------------------------------------
-// Function:	PropList::setProperty
-///\brief	Set a property's value in a property list.
-///\param	name  - IN: Name of property to set - \c char pointer
-///\param	value - IN: Void pointer to the value for the property
-///\exception	H5::PropListIException
+// Function:    PropList::setProperty
+///\brief       Set a property's value in a property list.
+///\param       name  - IN: Name of property to set - \c char pointer
+///\param       value - IN: Void pointer to the value for the property
+///\exception   H5::PropListIException
+// Description
+//              Revision svn r29815 changed 'value' to const, hence, deprecated
+//              the non-const setProperty.
 // Programmer:  Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
-void PropList::setProperty(const char* name, void* value) const
+void
+PropList::setProperty(const char *name, const void *value) const
 {
-   herr_t ret_value = H5Pset(id, name, value);
-   if (ret_value < 0)
-   {
-      throw PropListIException(inMemFunc("setProperty"), "H5Pset failed");
-   }
+    herr_t ret_value = H5Pset(id, name, value);
+    if (ret_value < 0) {
+        throw PropListIException(inMemFunc("setProperty"), "H5Pset failed");
+    }
 }
+
 //--------------------------------------------------------------------------
-// Function:	PropList::setProperty
-///\brief	This is an overloaded member function, provided for convenience.
-/// 		It differs from the above function only in what arguments it
-///		accepts.
-///\param	name    - IN: Name of property to set - \c char pointer
-///\param	charptr - IN: Char pointer to the value for the property
-// Programmer:  Binh-Minh Ribler - April, 2004
+// Function:    PropList::setProperty
+///\brief       Deprecated due to missing const in prototype. (1.10.1)
+// Programmer:  Binh-Minh Ribler - March, 2017
+// Modification
+//              Planned for removal. -BMR, 2017/03/17 1.10.1
 //--------------------------------------------------------------------------
-void PropList::setProperty(const char* name, const char* charptr) const
+void
+PropList::setProperty(const char *name, void *value) const
 {
-   herr_t ret_value = H5Pset(id, name, (void*) charptr);
-   if (ret_value < 0)
-   {
-      throw PropListIException(inMemFunc("setProperty"), "H5Pset failed");
-   }
+    herr_t ret_value = H5Pset(id, name, value);
+    if (ret_value < 0) {
+        throw PropListIException(inMemFunc("setProperty"), "H5Pset failed");
+    }
 }
+
 //--------------------------------------------------------------------------
-// Function:	PropList::setProperty
-///\brief	This is an overloaded member function, provided for convenience.
-/// 		It differs from the above function only in what arguments it
-///		accepts.
-///\param	name - IN: Name of property to set - \c char pointer
-///\param	strg - IN: Value for the property is a \c H5std_string
+// Function:    PropList::setProperty
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function only in what arguments it
+///             accepts.
+///\param       name    - IN: Name of property to set - \c char pointer
+///\param       charptr - IN: Char pointer to the value for the property
+// Description
+//              Revision svn r29815 changed 'value' to const, hence, deprecated
+//              the non-const setProperty.
 // Programmer:  Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
-void PropList::setProperty(const char* name, H5std_string& strg) const
+void
+PropList::setProperty(const char *name, const char *charptr) const
 {
-   setProperty(name, strg.c_str());
+    herr_t ret_value = H5Pset(id, name, static_cast<const void *>(charptr));
+    if (ret_value < 0) {
+        throw PropListIException(inMemFunc("setProperty"), "H5Pset failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	PropList::setProperty
-///\brief	This is an overloaded member function, provided for convenience.
-/// 		It differs from the above function only in what arguments it
-///		accepts.
-///\param	name  - IN: Name of property to set - \c H5std_string
-///\param	value - IN: Void pointer to the value for the property
+// Function:    PropList::setProperty
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function only in what arguments it
+///             accepts.
+///\param       name - IN: Name of property to set - \c char pointer
+///\param       strg - IN: Value for the property is a \c H5std_string
 // Programmer:  Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
-void PropList::setProperty(const H5std_string& name, void* value) const
+void
+PropList::setProperty(const char *name, const H5std_string &strg) const
 {
-   setProperty(name.c_str(), value);
+    setProperty(name, strg.c_str());
 }
 
 //--------------------------------------------------------------------------
-// Function:	PropList::setProperty
-///\brief	This is an overloaded member function, provided for convenience.
-/// 		It differs from the above function only in what arguments it
-///		accepts.
-///\param	name - IN: Name of property to set - \c H5std_string
-///\param	strg - IN: Value for the property is a \c H5std_string
+// Function:    PropList::setProperty
+///\brief       Deprecated due to missing const in prototype. (1.10.1)
+// Programmer:  Binh-Minh Ribler - March, 2017
+// Modification
+//              Planned for removal. -BMR, 2017/03/17 1.10.1
+//--------------------------------------------------------------------------
+void
+PropList::setProperty(const char *name, H5std_string &strg) const
+{
+    setProperty(name, strg.c_str());
+}
+
+//--------------------------------------------------------------------------
+// Function:    PropList::setProperty
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function only in what arguments it
+///             accepts.
+///\param       name  - IN: Name of property to set - \c H5std_string
+///\param       value - IN: Void pointer to the value for the property
 // Programmer:  Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
-void PropList::setProperty(const H5std_string& name, H5std_string& strg) const
+void
+PropList::setProperty(const H5std_string &name, const void *value) const
+{
+    setProperty(name.c_str(), value);
+}
+
+//--------------------------------------------------------------------------
+// Function:    PropList::setProperty
+///\brief       Deprecated due to missing const in prototype. (1.10.1)
+// Programmer:  Binh-Minh Ribler - March, 2017
+// Modification
+//              Planned for removal. -BMR, 2017/03/17 1.10.1
+//--------------------------------------------------------------------------
+void
+PropList::setProperty(const H5std_string &name, void *value) const
 {
-   setProperty(name.c_str(), strg.c_str());
+    setProperty(name.c_str(), value);
 }
 
 //--------------------------------------------------------------------------
-// Function:	PropList::isAClass
-///\brief	Determines whether a property list is a certain class.
-///\param	prop_class - IN: Property class to query
-///\return	true if the property list is a member of the property list
-///		class, and false, otherwise.
-///\exception	H5::PropListIException
+// Function:    PropList::setProperty
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function only in what arguments it
+///             accepts.
+///\param       name - IN: Name of property to set - \c H5std_string
+///\param       strg - IN: Value for the property is a \c H5std_string
 // Programmer:  Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
-bool PropList::isAClass(const PropList& prop_class) const
+void
+PropList::setProperty(const H5std_string &name, const H5std_string &strg) const
 {
-   htri_t ret_value = H5Pisa_class(id, prop_class.getId());
-   if( ret_value > 0 )
-      return true;
-   else if( ret_value == 0 )
-      return false;
-   else // Raise exception when H5Pisa_class returns a negative value
-   {
-      throw PropListIException(inMemFunc("isAClass"), "H5Pisa_class failed");
-   }
+    setProperty(name.c_str(), strg.c_str());
+}
 
+//--------------------------------------------------------------------------
+// Function:    PropList::setProperty
+///\brief       Deprecated due to missing const in prototype. (1.10.1)
+// Programmer:  Binh-Minh Ribler - March, 2017
+// Modification
+//              Planned for removal. -BMR, 2017/03/17 1.10.1
+//--------------------------------------------------------------------------
+void
+PropList::setProperty(const H5std_string &name, H5std_string &strg) const
+{
+    setProperty(name.c_str(), strg.c_str());
+}
+
+//--------------------------------------------------------------------------
+// Function:    PropList::isAClass
+///\brief       Determines whether a property list is a certain class.
+///\param       prop_class - IN: Property class to query
+///\return      true if the property list is a member of the property list
+///             class, and false, otherwise.
+///\exception   H5::PropListIException
+// Programmer:  Binh-Minh Ribler - April, 2004
+//--------------------------------------------------------------------------
+bool
+PropList::isAClass(const PropList &prop_class) const
+{
+    htri_t ret_value = H5Pisa_class(id, prop_class.getId());
+    if (ret_value > 0)
+        return true;
+    else if (ret_value == 0)
+        return false;
+    else // Raise exception when H5Pisa_class returns a negative value
+    {
+        throw PropListIException(inMemFunc("isAClass"), "H5Pisa_class failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	PropList::removeProp
-///\brief	Removes a property from a property list.
-///\param	name - IN: Name of property to remove - \c char pointer
-///\exception	H5::PropListIException
+// Function:    PropList::removeProp
+///\brief       Removes a property from a property list.
+///\param       name - IN: Name of property to remove - \c char pointer
+///\exception   H5::PropListIException
 // Programmer:  Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
-void PropList::removeProp(const char *name) const
+void
+PropList::removeProp(const char *name) const
 {
-   herr_t ret_value = H5Premove(id, name);
-   if (ret_value < 0)
-   {
-      throw PropListIException(inMemFunc("removeProp"), "H5Premove failed");
-   }
+    herr_t ret_value = H5Premove(id, name);
+    if (ret_value < 0) {
+        throw PropListIException(inMemFunc("removeProp"), "H5Premove failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	PropList::removeProp
-///\brief	This is an overloaded member function, provided for convenience.
-/// 		It differs from the above function only in what arguments it
-///		accepts.
-///\param	name - IN: Name of property to remove - \c H5std_string
+// Function:    PropList::removeProp
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function only in what arguments it
+///             accepts.
+///\param       name - IN: Name of property to remove - \c H5std_string
 // Programmer:  Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
-void PropList::removeProp(const H5std_string& name) const
+void
+PropList::removeProp(const H5std_string &name) const
 {
-   removeProp(name.c_str());
+    removeProp(name.c_str());
 }
 
 //--------------------------------------------------------------------------
-// Function:	PropList::operator==
-///\brief	Compares this property list or class against the given list or class.
-///\param	rhs - IN: Reference to the property list to compare
-///\return	true if the property lists or classes are equal, and
-///		false, otherwise.
-///\exception	H5::PropListIException
+// Function:    PropList::operator==
+///\brief       Compares this property list or class against the given list or class.
+///\param       rhs - IN: Reference to the property list to compare
+///\return      true if the property lists or classes are equal, and
+///             false, otherwise.
+///\exception   H5::PropListIException
 // Programmer:  Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
-bool PropList::operator==(const PropList& rhs) const
+bool
+PropList::operator==(const PropList &rhs) const
 {
-   htri_t ret_value = H5Pequal(id, rhs.getId());
-   if( ret_value > 0 )
-      return true;
-   else if( ret_value == 0 )
-      return false;
-   else // Raise exception when H5Pequal returns a negative value
-   {
-      throw PropListIException(inMemFunc("operator=="), "H5Pequal failed");
-   }
+    htri_t ret_value = H5Pequal(id, rhs.getId());
+    if (ret_value > 0)
+        return true;
+    else if (ret_value == 0)
+        return false;
+    else // Raise exception when H5Pequal returns a negative value
+    {
+        throw PropListIException(inMemFunc("operator=="), "H5Pequal failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	PropList::getClassParent
-///\brief	Returns the parent class of a generic property class
-///\return	The parent class of a property class
-///\exception	H5::PropListIException
+// Function:    PropList::getClassParent
+///\brief       Returns the parent class of a generic property class
+///\return      The parent class of a property class
+///\exception   H5::PropListIException
 // Programmer:  Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
-PropList PropList::getClassParent() const
+PropList
+PropList::getClassParent() const
 {
-   hid_t class_id = H5Pget_class_parent(id);
-   if (class_id < 0)
-   {
-      throw PropListIException(inMemFunc("getClassParent"), "H5Pget_class_parent failed");
-   }
-   PropList pclass(class_id);
-   return(pclass);
+    hid_t class_id = H5Pget_class_parent(id);
+    if (class_id < 0) {
+        throw PropListIException(inMemFunc("getClassParent"), "H5Pget_class_parent failed");
+    }
+    PropList pclass(class_id);
+    return (pclass);
 }
 
 //--------------------------------------------------------------------------
-// Function:	PropList destructor
-///\brief	Properly terminates access to this property list.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    PropList destructor
+///\brief       Properly terminates access to this property list.
+// Programmer   Binh-Minh Ribler - 2000
 // Modification
-//		- Replaced resetIdComponent() with decRefCount() to use C
-//		library ID reference counting mechanism - BMR, Jun 1, 2004
-//		- Replaced decRefCount with close() to let the C library
-//		handle the reference counting - BMR, Jun 1, 2006
+//              - Replaced resetIdComponent() with decRefCount() to use C
+//              library ID reference counting mechanism - BMR, Jun 1, 2004
+//              - Replaced decRefCount with close() to let the C library
+//              handle the reference counting - BMR, Jun 1, 2006
 //--------------------------------------------------------------------------
 PropList::~PropList()
 {
     try {
-	close();
+        close();
     }
-    catch (Exception close_error) {
-	cerr << "PropList::~PropList - " << close_error.getDetailMsg() << endl;
+    catch (Exception &close_error) {
+        cerr << "PropList::~PropList - " << close_error.getDetailMsg() << endl;
     }
 }
 
-#ifndef H5_NO_NAMESPACE
-} // end namespace
-#endif
+} // namespace H5
diff --git a/c++/src/H5PropList.h b/c++/src/H5PropList.h
index f26201d..beef474 100644
--- a/c++/src/H5PropList.h
+++ b/c++/src/H5PropList.h
@@ -1,125 +1,146 @@
 // C++ informative line for the emacs editor: -*- C++ -*-
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5PropList_H
-#define __H5PropList_H
+#ifndef H5PropList_H
+#define H5PropList_H
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#endif
 
-//! Class PropList provides operations for generic property lists.
+/*! \class PropList
+    \brief Class PropList inherits from IdComponent and provides wrappers for
+    the HDF5 generic property list.
+*/
+//  Inheritance: IdComponent
 class H5_DLLCPP PropList : public IdComponent {
-   public:
-	// Default property list
-        static const PropList DEFAULT;
+  public:
+    ///\brief Default property list
+    static const PropList &DEFAULT;
 
-	// Creates a property list of a given type or creates a copy of an
-	// existing property list giving the property list id.
-	PropList(const hid_t plist_id);
+    // Creates a property list of a given type or creates a copy of an
+    // existing property list giving the property list id.
+    PropList(const hid_t plist_id);
 
-	// Make a copy of the given property list using assignment statement
-	PropList& operator=( const PropList& rhs );
+    // Make a copy of the given property list using assignment statement
+    PropList &operator=(const PropList &rhs);
 
-	// Compares this property list or class against the given list or class.
-	bool operator==(const PropList& rhs) const;
+    // Compares this property list or class against the given list or class.
+    bool operator==(const PropList &rhs) const;
 
-	// Close this property list.
-	virtual void close();
+    // Close this property list.
+    virtual void close() override;
 
-	// Close a property list class.
-	void closeClass() const;
+    // Close a property list class.
+    void closeClass() const;
 
-	// Makes a copy of the given property list.
-	void copy( const PropList& like_plist );
+    // Makes a copy of the given property list.
+    void copy(const PropList &like_plist);
 
-	// Copies a property from this property list or class to another
-	void copyProp( PropList& dest, const char* name) const;
-	void copyProp( PropList& dest, const H5std_string& name) const;
+    // Copies a property from this property list or class to another
+    void copyProp(PropList &dest, const char *name) const;
+    void copyProp(PropList &dest, const H5std_string &name) const;
 
-	// Copies a property from one property list or property class to another
-	void copyProp( PropList& dest, PropList& src, const char* name) const;
-	void copyProp( PropList& dest, PropList& src, const H5std_string& name) const;
+    // Copies a property from one property list or property class to another
+    void copyProp(PropList &dest, PropList &src, const char *name) const;
+    void copyProp(PropList &dest, PropList &src, const H5std_string &name) const;
 
-	// Gets the class of this property list, i.e. H5P_FILE_CREATE,
-	// H5P_FILE_ACCESS, ...
-	hid_t getClass() const;
+    // Gets the class of this property list, i.e. H5P_FILE_CREATE,
+    // H5P_FILE_ACCESS, ...
+    hid_t getClass() const;
 
-	// Return the name of a generic property list class.
-	H5std_string getClassName() const;
+    // Return the name of a generic property list class.
+    H5std_string getClassName() const;
 
-	// Returns the parent class of a generic property class.
-	PropList getClassParent() const;
+    // Returns the parent class of a generic property class.
+    PropList getClassParent() const;
 
-	// Returns the number of properties in this property list or class.
-	size_t getNumProps() const;
+    // Returns the number of properties in this property list or class.
+    size_t getNumProps() const;
 
-	// Query the value of a property in a property list.
-	void getProperty(const char* name, void* value) const;
-	void getProperty(const H5std_string& name, void* value) const;
-	H5std_string getProperty(const char* name) const;
-	H5std_string getProperty(const H5std_string& name) const;
+    // Query the value of a property in a property list.
+    void         getProperty(const char *name, void *value) const;
+    void         getProperty(const H5std_string &name, void *value) const;
+    H5std_string getProperty(const char *name) const;
+    H5std_string getProperty(const H5std_string &name) const;
 
-	// Set a property's value in a property list.
-	void setProperty(const char* name, void* value) const;
-	void setProperty(const char* name, const char* charptr) const;
-	void setProperty(const char* name, H5std_string& strg) const;
-	void setProperty(const H5std_string& name, void* value) const;
-	void setProperty(const H5std_string& name, H5std_string& strg) const;
+    // Set a property's value in a property list.
+    void setProperty(const char *name, const char *charptr) const;
+    void setProperty(const char *name, const void *value) const;
+    void setProperty(const char *name, const H5std_string &strg) const;
+    void setProperty(const H5std_string &name, const void *value) const;
+    void setProperty(const H5std_string &name, const H5std_string &strg) const;
+    // Deprecated after 1.10.1, missing const
+    void setProperty(const char *name, void *value) const;
+    void setProperty(const char *name, H5std_string &strg) const;
+    void setProperty(const H5std_string &name, void *value) const;
+    void setProperty(const H5std_string &name, H5std_string &strg) const;
 
-	// Query the size of a property in a property list or class.
-	size_t getPropSize(const char *name) const;
-	size_t getPropSize(const H5std_string& name) const;
+    // Query the size of a property in a property list or class.
+    size_t getPropSize(const char *name) const;
+    size_t getPropSize(const H5std_string &name) const;
 
-	// Determines whether a property list is a certain class.
-	bool isAClass(const PropList& prop_class) const;
+    // Determines whether a property list is a certain class.
+    bool isAClass(const PropList &prop_class) const;
 
-	/// Query the existance of a property in a property object.
-	bool propExist(const char* name) const;
-	bool propExist(const H5std_string& name) const;
+    /// Query the existence of a property in a property object.
+    bool propExist(const char *name) const;
+    bool propExist(const H5std_string &name) const;
 
-	// Removes a property from a property list.
-	void removeProp(const char *name) const;
-	void removeProp(const H5std_string& name) const;
+    // Removes a property from a property list.
+    void removeProp(const char *name) const;
+    void removeProp(const H5std_string &name) const;
 
-	///\brief Returns this class name.
-	virtual H5std_string fromClass () const { return("PropList"); }
+    ///\brief Returns this class name.
+    virtual H5std_string
+    fromClass() const override
+    {
+        return ("PropList");
+    }
 
-	// Default constructor: creates a stub PropList object.
-	PropList();
+    // Default constructor: creates a stub PropList object.
+    PropList();
 
-	// Copy constructor: creates a copy of a PropList object.
-	PropList(const PropList& original);
+    // Copy constructor: same as the original PropList.
+    PropList(const PropList &original);
 
-	// Gets the property list id.
-	virtual hid_t getId() const;
+    // Gets the property list id.
+    virtual hid_t getId() const override;
 
-	// Destructor: properly terminates access to this property list.
-	virtual ~PropList();
+    // Destructor: properly terminates access to this property list.
+    virtual ~PropList() override;
 
-   protected:
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
-	hid_t id;	// HDF5 property list id
 
-	// Sets the property list id.
-	virtual void p_setId(const hid_t new_id);
+    // Deletes the PropList global constant
+    static void deleteConstants();
+
+  protected:
+    hid_t id; // HDF5 property list id
+
+    // Sets the property list id.
+    virtual void p_setId(const hid_t new_id) override;
+
+  private:
+    static PropList *DEFAULT_;
+
+    // Dynamically allocates the PropList global constant
+    static PropList *getConstant();
+
+    // Friend function to set PropList id.  For library use only.
+    friend void f_PropList_setId(PropList *plist, hid_t new_id);
+
 #endif // DOXYGEN_SHOULD_SKIP_THIS
-};
 
-#ifndef H5_NO_NAMESPACE
-}
-#endif
-#endif  // __H5PropList_H
+}; // end of PropList
+} // namespace H5
+
+#endif // H5PropList_H
diff --git a/c++/src/H5StrType.cpp b/c++/src/H5StrType.cpp
index 5195bba..42011ee 100644
--- a/c++/src/H5StrType.cpp
+++ b/c++/src/H5StrType.cpp
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <string>
@@ -19,230 +16,301 @@
 #include "H5Exception.h"
 #include "H5IdComponent.h"
 #include "H5PropList.h"
-#include "H5Object.h"
+#include "H5OcreatProp.h"
 #include "H5DcreatProp.h"
-#include "H5CommonFG.h"
+#include "H5DxferProp.h"
+#include "H5LcreatProp.h"
+#include "H5LaccProp.h"
+#include "H5DaccProp.h"
+#include "H5Location.h"
+#include "H5Object.h"
 #include "H5DataType.h"
 #include "H5AtomType.h"
 #include "H5AbstractDs.h"
-#include "H5DxferProp.h"
 #include "H5DataSpace.h"
 #include "H5StrType.h"
 #include "H5DataSet.h"
 #include "H5PredType.h"
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#endif
 
 //--------------------------------------------------------------------------
-// Function:	StrType default constructor
-///\brief	Default constructor: Creates a stub string datatype
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    StrType default constructor
+///\brief       Default constructor: Creates a stub string datatype
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-StrType::StrType() : AtomType() {}
+StrType::StrType() : AtomType()
+{
+}
 
 //--------------------------------------------------------------------------
-// Function:	StrType overloaded constructor
-///\brief	Creates a string datatype using a predefined type.
-///\param	pred_type - IN: Predefined datatype
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    StrType overloaded constructor
+///\brief       Creates a string datatype using a predefined type.
+///\param       pred_type - IN: Predefined datatype
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-StrType::StrType( const PredType& pred_type ) : AtomType()
+StrType::StrType(const PredType &pred_type) : AtomType()
 {
-   // use DataType::copy to make a copy of this predefined type
-   copy( pred_type );
+    // use DataType::copy to make a copy of this predefined type
+    copy(pred_type);
 }
 
 //--------------------------------------------------------------------------
-// Function:	StrType overloaded constructor
-///\brief	Creates a string datatype with a specified length
-///\param	pred_type - IN: String predefined type to replicate.
-///\param	size	  - IN: Length of the new string type
-///\exception	H5::DataTypeIException
+// Function:    StrType overloaded constructor
+// Purpose      Creates a string datatype with a specified length
+// Param        pred_type - IN: String predefined type to replicate.
+// Param        size     - IN: Length of the new string type
+// Exception    H5::DataTypeIException
 // Description
-// 		The 1st argument could have been skipped, but this
-// 		constructor will collide with the one that takes an
-// 		existing id.
+//              The 1st argument could have been skipped, but this
+//              constructor will collide with the one that takes an
+//              existing id.
 //
-//		Update: replacing the 1st argument with a dummy 0 to
-//		avoid the clashing problem, that doesn't eliminate the
-//		the 1st argument but it's simpler for the user to type
-//		a '0' than PredType::C_S1.  - Dec 2, 2005
-///\note
-///		The use of this constructor can be shortened by using
-///		its overloaded below as StrType(0, size).
-// Programmer	Binh-Minh Ribler - 2000
+//              Update: replacing the 1st argument with a dummy 0 to
+//              avoid the clashing problem, that doesn't eliminate the
+//              the 1st argument but it's simpler for the user to type
+//              a '0' than PredType::C_S1.  - Dec 2, 2005
+// Note
+//              The use of this constructor can be shortened by using
+//              its overloaded below as StrType(0, size).
+// Programmer   Binh-Minh Ribler - 2000
+// Modification
+//              Planned for removal. -BMR, 2005/12/02
+//              Removed from documentation. -BMR, 2016/03/07
 //--------------------------------------------------------------------------
-StrType::StrType( const PredType& pred_type, const size_t& size ) : AtomType()
+StrType::StrType(const PredType &pred_type, const size_t &size) : AtomType()
 {
-   // use DataType::copy to make a copy of the string predefined type
-   // then set its length
-   copy(pred_type);
-   setSize(size);
+    // use DataType::copy to make a copy of the string predefined type
+    // then set its length
+    copy(pred_type);
+    setSize(size);
 }
 
 //--------------------------------------------------------------------------
-// Function:	StrType overloaded constructor
-///\brief	Creates a string datatype with a specified length
-///\param	dummy - IN: To simplify calling the previous constructor
-///			and avoid prototype clash with another constructor
-///\param	size  - IN: Length of the new string type
-///\exception	H5::DataTypeIException
+// Function:    StrType overloaded constructor
+///\brief       Creates a string datatype with a specified length
+///\param       dummy - IN: To simplify calling the previous constructor
+///                         and avoid prototype clash with another constructor
+///\param       size  - IN: Length of the new string type
+///\exception   H5::DataTypeIException
 ///\par Description
-///		The 1st argument is just a dummy to simplify calling the
-///		previous constructor, such as:
-///		StrType atype(0, size) instead of
-///		StrType atype(PredType::C_S1, size)
-///\note
-///		This constructor may replace the previous one in the future.
-// Programmer	Binh-Minh Ribler - Nov 28, 2005
+///             The 1st argument is just a dummy to simplify calling the
+///             previous constructor, such as:
+///             StrType atype(0, size) instead of
+///             StrType atype(PredType::C_S1, size)
+// Note
+//              This constructor replaced the previous one.
+// Programmer   Binh-Minh Ribler - Nov 28, 2005
 //--------------------------------------------------------------------------
-StrType::StrType( const int dummy, const size_t& size ) : AtomType()
+StrType::StrType(const int dummy, const size_t &size) : AtomType()
 {
-   // use DataType::copy to make a copy of the string predefined type
-   // then set its length
-   copy(PredType::C_S1);
-   setSize(size);
+    // Unused
+    (void)dummy;
+
+    // use DataType::copy to make a copy of the string predefined type
+    // then set its length
+    copy(PredType::C_S1);
+    setSize(size);
 }
 
 //--------------------------------------------------------------------------
-// Function:	StrType overloaded constructor
-///\brief	Creates an StrType object using the id of an existing datatype.
-///\param	existing_id - IN: Id of an existing datatype
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    StrType overloaded constructor
+///\brief       Creates an StrType object using the id of an existing datatype.
+///\param       existing_id - IN: Id of an existing datatype
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-StrType::StrType( const hid_t existing_id ) : AtomType( existing_id ) {}
+StrType::StrType(const hid_t existing_id) : AtomType(existing_id)
+{
+}
 
 //--------------------------------------------------------------------------
-// Function:	StrType copy constructor
-///\brief	Copy constructor: makes a copy of the original StrType object.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    StrType copy constructor
+///\brief       Copy constructor: same HDF5 object as \a original
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-StrType::StrType( const StrType& original ) : AtomType ( original ) {}
+StrType::StrType(const StrType &original) : AtomType(original)
+{
+}
 
 //--------------------------------------------------------------------------
-// Function:	StrType overloaded constructor
-///\brief	Gets the string datatype of the specified dataset
-///\param	dataset - IN: Dataset that this string datatype associates with
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    StrType overloaded constructor
+///\brief       Gets the string datatype of the specified dataset
+///\param       dataset - IN: Dataset that this string datatype associates with
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-StrType::StrType( const DataSet& dataset ) : AtomType ()
+StrType::StrType(const DataSet &dataset) : AtomType()
 {
-   // Calls C function H5Dget_type to get the id of the datatype
-   id = H5Dget_type( dataset.getId() );
+    // Calls C function H5Dget_type to get the id of the datatype
+    id = H5Dget_type(dataset.getId());
 
-   if( id < 0 )
-   {
-      throw DataSetIException("StrType constructor", "H5Dget_type failed");
-   }
+    if (id < 0) {
+        throw DataSetIException("StrType constructor", "H5Dget_type failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	StrType::getCset
-///\brief	Retrieves the character set type of this string datatype.
-///\return	Character set type, which can be:
-///		\li \c H5T_CSET_ASCII (0) - Character set is US ASCII.
-///\note
-///	ASCII and UTF-8 Unicode are the only currently supported character
-///	encodings. Extended ASCII encodings (for example, ISO 8859) are not
-///	supported. This encoding policy is not enforced by the HDF5 Library.
-///	Using encodings other than ASCII and UTF-8 can lead to compatibility
-///	and usability problems. See the C API entry H5Pset_char_encoding for
-///	more information.
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-H5T_cset_t StrType::getCset() const
+// Function:    StrType overloaded constructor
+///\brief       Creates an StrType instance by opening an HDF5 string datatype
+///             given its name, provided as a C character string.
+///\param       loc        - IN: Location of the type
+///\param       dtype_name - IN: String type name
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - Dec 2016
+// Description
+//              In 1.10.1, this constructor was introduced and may replace the
+//              existing function CommonFG::openStrType(const char*) to
+//              improve usability.
+//              -BMR, Dec 2016
+//--------------------------------------------------------------------------
+StrType::StrType(const H5Location &loc, const char *dtype_name) : AtomType()
+{
+    id = p_opentype(loc, dtype_name);
+}
+
+//--------------------------------------------------------------------------
+// Function:    StrType overloaded constructor
+///\brief       Creates an StrType instance by opening an HDF5 string datatype
+///             given its name, provided as an \c H5std_string.
+///\param       loc        - IN: Location of the type
+///\param       dtype_name - IN: String type name
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - Dec 2016
+// Description
+//              In 1.10.1, this constructor was introduced and may replace the
+//              existing function CommonFG::openStrType(const H5std_string&)
+//              to improve usability.
+//              -BMR, Dec 2016
+//--------------------------------------------------------------------------
+StrType::StrType(const H5Location &loc, const H5std_string &dtype_name) : AtomType()
+{
+    id = p_opentype(loc, dtype_name.c_str());
+}
+
+//--------------------------------------------------------------------------
+// Function:    StrType::decode
+///\brief       Returns an StrType object via DataType* by decoding the
+///             binary object description of this type.
+///
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - Aug 2017
+//--------------------------------------------------------------------------
+DataType *
+StrType::decode() const
 {
-   H5T_cset_t cset = H5Tget_cset( id );
-
-   // Returns a valid character set type if successful
-   if( cset == H5T_CSET_ERROR )
-   {
-      throw DataTypeIException("StrType::getCset", "H5Tget_cset failed");
-   }
-   return( cset );
+    hid_t encoded_strtype_id = H5I_INVALID_HID;
+    try {
+        encoded_strtype_id = p_decode();
+    }
+    catch (DataTypeIException &err) {
+        throw;
+    }
+    StrType *encoded_strtype = new StrType;
+    encoded_strtype->p_setId(encoded_strtype_id);
+    return (encoded_strtype);
 }
 
 //--------------------------------------------------------------------------
-// Function:	StrType::setCset
-///\brief	Sets character set to be used.
-///\param	cset - IN: character set type, which can be:
-///		\li \c H5T_CSET_ASCII (0) - Character set is US ASCII.
+// Function:    StrType::getCset
+///\brief       Retrieves the character set type of this string datatype.
+///\return      Character set type, which can be:
+///             \li \c H5T_CSET_ASCII (0) - Character set is US ASCII.
 ///\note
-///	ASCII and UTF-8 Unicode are the only currently supported character
-///	encodings. Extended ASCII encodings (for example, ISO 8859) are not
-///	supported. This encoding policy is not enforced by the HDF5 Library.
-///	Using encodings other than ASCII and UTF-8 can lead to compatibility
-///	and usability problems. See the C API entry H5Pset_char_encoding for
-///	more information.
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-void StrType::setCset( H5T_cset_t cset ) const
+///     ASCII and UTF-8 Unicode are the only currently supported character
+///     encodings. Extended ASCII encodings (for example, ISO 8859) are not
+///     supported. This encoding policy is not enforced by the HDF5 Library.
+///     Using encodings other than ASCII and UTF-8 can lead to compatibility
+///     and usability problems. See the C API entry H5Pset_char_encoding for
+///     more information.
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+H5T_cset_t
+StrType::getCset() const
 {
-   herr_t ret_value = H5Tset_cset( id, cset );
+    H5T_cset_t cset = H5Tget_cset(id);
 
-   if( ret_value < 0 )
-   {
-      throw DataTypeIException("StrType::setCset", "H5Tset_cset failed");
-   }
+    // Returns a valid character set type if successful
+    if (cset == H5T_CSET_ERROR) {
+        throw DataTypeIException("StrType::getCset", "H5Tget_cset failed");
+    }
+    return (cset);
 }
 
 //--------------------------------------------------------------------------
-// Function:	StrType::getStrpad
-///\brief	Retrieves the storage mechanism for of this string datatype.
-///\return	String storage mechanism, which can be:
-///		\li \c H5T_STR_NULLTERM (0) - Null terminate (as C does)
-///		\li \c H5T_STR_NULLPAD (0) - Pad with zeros
-///		\li \c H5T_STR_SPACEPAD (0) - pad with spaces (as FORTRAN does)
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    StrType::setCset
+///\brief       Sets character set to be used.
+///\param       cset - IN: character set type, which can be:
+///             \li \c H5T_CSET_ASCII (0) - Character set is US ASCII.
+///\note
+///     ASCII and UTF-8 Unicode are the only currently supported character
+///     encodings. Extended ASCII encodings (for example, ISO 8859) are not
+///     supported. This encoding policy is not enforced by the HDF5 Library.
+///     Using encodings other than ASCII and UTF-8 can lead to compatibility
+///     and usability problems. See the C API entry H5Pset_char_encoding for
+///     more information.
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-H5T_str_t StrType::getStrpad() const
+void
+StrType::setCset(H5T_cset_t cset) const
 {
-   H5T_str_t strpad = H5Tget_strpad( id );
-
-   // Returns a valid string padding type if successful
-   if( strpad == H5T_STR_ERROR )
-   {
-      throw DataTypeIException("StrType::getStrpad",
-		"H5Tget_strpad failed - returned H5T_STR_ERROR");
-   }
-   return( strpad );
+    herr_t ret_value = H5Tset_cset(id, cset);
+    if (ret_value < 0) {
+        throw DataTypeIException("StrType::setCset", "H5Tset_cset failed");
+    }
 }
 
 //--------------------------------------------------------------------------
-// Function:	StrType::setStrpad
-///\brief	Defines the storage mechanism for this string datatype.
-///\param	strpad - IN: String padding type
-///\exception	H5::DataTypeIException
-///\par Description
-///		For detail, please refer to the C layer Reference Manual at:
-/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5T.html#Datatype-SetStrpad
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    StrType::getStrpad
+///\brief       Retrieves the storage mechanism for of this string datatype.
+///\return      String storage mechanism, which can be:
+///             \li \c H5T_STR_NULLTERM (0) - Null terminate (as C does)
+///             \li \c H5T_STR_NULLPAD (0) - Pad with zeros
+///             \li \c H5T_STR_SPACEPAD (0) - pad with spaces (as FORTRAN does)
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void StrType::setStrpad( H5T_str_t strpad ) const
+H5T_str_t
+StrType::getStrpad() const
 {
-   herr_t ret_value = H5Tset_strpad( id, strpad );
+    H5T_str_t strpad = H5Tget_strpad(id);
 
-   if( ret_value < 0 )
-   {
-      throw DataTypeIException("StrType::setStrpad", "H5Tset_strpad failed");
-   }
+    // Returns a valid string padding type if successful
+    if (strpad == H5T_STR_ERROR) {
+        throw DataTypeIException("StrType::getStrpad", "H5Tget_strpad failed - returned H5T_STR_ERROR");
+    }
+    return (strpad);
 }
 
 //--------------------------------------------------------------------------
-// Function:	StrType destructor
-///\brief	Properly terminates access to this string datatype.
-// Programmer	Binh-Minh Ribler - 2000
+// Function:    StrType::setStrpad
+///\brief       Defines the storage mechanism for this string datatype.
+///\param       strpad - IN: String padding type
+///\exception   H5::DataTypeIException
+///\par Description
+///             For information, please refer to the H5Tset_strpad API in
+///             the HDF5 C Reference Manual.
+// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-StrType::~StrType() {}
+void
+StrType::setStrpad(H5T_str_t strpad) const
+{
+    herr_t ret_value = H5Tset_strpad(id, strpad);
+    if (ret_value < 0) {
+        throw DataTypeIException("StrType::setStrpad", "H5Tset_strpad failed");
+    }
+}
+
+//--------------------------------------------------------------------------
+// Function:    StrType destructor
+///\brief       Properly terminates access to this string datatype.
+// Programmer   Binh-Minh Ribler - 2000
+//--------------------------------------------------------------------------
+StrType::~StrType()
+{
+}
 
-#ifndef H5_NO_NAMESPACE
-} // end namespace
-#endif
+} // namespace H5
diff --git a/c++/src/H5StrType.h b/c++/src/H5StrType.h
index 8b3a773..ccae3e7 100644
--- a/c++/src/H5StrType.h
+++ b/c++/src/H5StrType.h
@@ -1,69 +1,80 @@
 // C++ informative line for the emacs editor: -*- C++ -*-
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5StrType_H
-#define __H5StrType_H
+#ifndef H5StrType_H
+#define H5StrType_H
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#endif
 
-//! Class StrType operates on HDF5 string datatypes.
+/*! \class StrType
+    \brief StrType is a derivative of a DataType and operates on HDF5
+    string datatype.
+*/
+//  Inheritance: AtomType -> DataType -> H5Object -> H5Location -> IdComponent
 class H5_DLLCPP StrType : public AtomType {
-   public:
-	// Creates a string type using a predefined type
-	StrType(const PredType& pred_type);
+  public:
+    // Creates a string type using a predefined type
+    StrType(const PredType &pred_type);
 
-	// Creates a string type with specified length - may be obsolete
-	StrType(const PredType& pred_type, const size_t& size);
+    // Creates a string type with specified length - may be obsolete
+    StrType(const PredType &pred_type, const size_t &size);
 
-	// Creates a string type with specified length
-	StrType(const int dummy, const size_t& size);
+    // Creates a string type with specified length
+    StrType(const int dummy, const size_t &size);
 
-        // Gets the string datatype of the specified dataset
-	StrType(const DataSet& dataset);
+    // Gets the string datatype of the specified dataset
+    StrType(const DataSet &dataset);
 
-	// Retrieves the character set type of this string datatype.
-	H5T_cset_t getCset() const;
+    // Constructors that open an HDF5 string datatype, given a location.
+    StrType(const H5Location &loc, const char *name);
+    StrType(const H5Location &loc, const H5std_string &name);
 
-	// Sets character set to be used.
-	void setCset(H5T_cset_t cset) const;
+    // Returns an StrType object via DataType* by decoding the
+    // binary object description of this type.
+    virtual DataType *decode() const override;
 
-	// Retrieves the string padding method for this string datatype.
-	H5T_str_t getStrpad() const;
+    // Retrieves the character set type of this string datatype.
+    H5T_cset_t getCset() const;
 
-	// Defines the storage mechanism for character strings.
-	void setStrpad(H5T_str_t strpad) const;
+    // Sets character set to be used.
+    void setCset(H5T_cset_t cset) const;
 
-	///\brief Returns this class name.
-	virtual H5std_string fromClass () const { return("StrType"); }
+    // Retrieves the string padding method for this string datatype.
+    H5T_str_t getStrpad() const;
 
-	// default constructor
-	StrType();
+    // Defines the storage mechanism for character strings.
+    void setStrpad(H5T_str_t strpad) const;
 
-	// Creates a string datatype using an existing id
-	StrType(const hid_t existing_id);
+    ///\brief Returns this class name.
+    virtual H5std_string
+    fromClass() const override
+    {
+        return ("StrType");
+    }
 
-	// Copy constructor - makes a copy of the original object
-	StrType(const StrType& original);
+    // default constructor
+    StrType();
 
-	// Noop destructor.
-	virtual ~StrType();
-};
-#ifndef H5_NO_NAMESPACE
-}
-#endif
-#endif // __H5StrType_H
+    // Creates a string datatype using an existing id
+    StrType(const hid_t existing_id);
+
+    // Copy constructor: same as the original StrType.
+    StrType(const StrType &original);
+
+    // Noop destructor.
+    virtual ~StrType() override;
+
+}; // end of StrType
+} // namespace H5
+
+#endif // H5StrType_H
diff --git a/c++/src/H5VarLenType.cpp b/c++/src/H5VarLenType.cpp
index 3641a5d..6043e14 100644
--- a/c++/src/H5VarLenType.cpp
+++ b/c++/src/H5VarLenType.cpp
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <string>
@@ -19,67 +16,150 @@
 #include "H5Exception.h"
 #include "H5IdComponent.h"
 #include "H5PropList.h"
-#include "H5Object.h"
+#include "H5OcreatProp.h"
 #include "H5DcreatProp.h"
-#include "H5CommonFG.h"
+#include "H5LcreatProp.h"
+#include "H5LaccProp.h"
+#include "H5DaccProp.h"
+#include "H5Location.h"
+#include "H5Object.h"
 #include "H5DataType.h"
 #include "H5VarLenType.h"
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#endif
 
+//--------------------------------------------------------------------------
+// Function:    VarLenType default constructor
+///\brief       Default constructor: Creates a stub variable-length datatype.
+//--------------------------------------------------------------------------
+VarLenType::VarLenType() : DataType()
+{
+}
 
 //--------------------------------------------------------------------------
-// Function:	VarLenType default constructor
-///\brief	Default constructor: Creates a stub variable-length datatype.
+// Function:    VarLenType overloaded constructor
+///\brief       Creates an VarLenType object using an existing id.
+///\param       existing_id - IN: Id of an existing datatype
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - May, 2004
 //--------------------------------------------------------------------------
-VarLenType::VarLenType() : DataType() {}
+VarLenType::VarLenType(const hid_t existing_id) : DataType(existing_id)
+{
+}
 
 //--------------------------------------------------------------------------
-// Function:	VarLenType overloaded constructor
-///\brief	Creates an VarLenType object using an existing id.
-///\param	existing_id - IN: Id of an existing datatype
-///\exception	H5::DataTypeIException
-// Programmer	Binh-Minh Ribler - May, 2004
+// Function:    VarLenType copy constructor
+///\brief       Copy constructor: same HDF5 object as \a original
+// Programmer   Binh-Minh Ribler - May, 2004
 //--------------------------------------------------------------------------
-VarLenType::VarLenType(const hid_t existing_id) : DataType(existing_id) {}
+VarLenType::VarLenType(const VarLenType &original) : DataType(original)
+{
+}
 
 //--------------------------------------------------------------------------
-// Function:	VarLenType copy constructor
-///\brief	Copy constructor: makes a copy of the original VarLenType object.
-// Programmer	Binh-Minh Ribler - May, 2004
+// Function:    VarLenType overloaded constructor
+///\brief       Deprecated - will be removed after 1.10.2
+///\param       base_type - IN: Pointer to existing datatype
+///\exception   H5::DataTypeIException
+// Description
+//              DataType passed by pointer to avoid clashing with copy
+//              constructor.
+//              Updated: this is unnecessary.
+//              -BMR, Sep, 2017
+// Programmer   Binh-Minh Ribler - May, 2004
 //--------------------------------------------------------------------------
-VarLenType::VarLenType(const VarLenType& original) : DataType(original) {}
+VarLenType::VarLenType(const DataType *base_type) : DataType()
+{
+    id = H5Tvlen_create(base_type->getId());
+    if (id < 0) {
+        throw DataTypeIException("VarLenType constructor", "H5Tvlen_create returns negative value");
+    }
+}
 
 //--------------------------------------------------------------------------
-// Function:	VarLenType overloaded constructor
-///\brief	Creates a new variable-length datatype based on the specified
-///		\a base_type.
-///\param	base_type - IN: Pointer to existing datatype
-///\exception	H5::DataTypeIException
+// Function:    VarLenType overloaded constructor
+///\brief       Creates a new variable-length datatype based on the specified
+///             \a base_type.
+///\param       base_type - IN: An existing datatype
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - May, 2004
+//--------------------------------------------------------------------------
+VarLenType::VarLenType(const DataType &base_type) : DataType()
+{
+    id = H5Tvlen_create(base_type.getId());
+    if (id < 0) {
+        throw DataTypeIException("VarLenType constructor", "H5Tvlen_create returns negative value");
+    }
+}
+
+//--------------------------------------------------------------------------
+// Function:    VarLenType overloaded constructor
+///\brief       Creates an VarLenType instance by opening an HDF5 variable
+///             length datatype given its name, provided as a C char*.
+///\param       loc        - IN: Location of the type
+///\param       dtype_name - IN: Variable length type name
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - Dec 2016
+// Description
+//              In 1.10.1, this constructor was introduced and may replace the
+//              existing function CommonFG::openVarLenType(const char*) to
+//              improve usability.
+//              -BMR, Dec 2016
+//--------------------------------------------------------------------------
+VarLenType::VarLenType(const H5Location &loc, const char *dtype_name) : DataType()
+{
+    id = p_opentype(loc, dtype_name);
+}
+
+//--------------------------------------------------------------------------
+// Function:    VarLenType overloaded constructor
+///\brief       Creates an VarLenType instance by opening an HDF5 variable
+///             length datatype given its name, provided as an \c H5std_string.
+///\param       loc        - IN: Location of the type
+///\param       dtype_name - IN: Variable length type name
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - Dec 2016
 // Description
-//		DataType passed by pointer to avoid clashing with copy
-//		constructor.
-// Programmer	Binh-Minh Ribler - May, 2004
+//              In 1.10.1, this constructor was introduced and may replace the
+//              existing function CommonFG::openVarLenType(const H5std_string&)
+//              to improve usability.
+//              -BMR, Dec 2016
 //--------------------------------------------------------------------------
-VarLenType::VarLenType(const DataType* base_type) : DataType()
+VarLenType::VarLenType(const H5Location &loc, const H5std_string &dtype_name) : DataType()
 {
-   id = H5Tvlen_create(base_type->getId());
-   if (id < 0)
-   {
-      throw DataTypeIException("VarLenType constructor",
-                "H5Tvlen_create returns negative value");
-   }
+    id = p_opentype(loc, dtype_name.c_str());
 }
 
 //--------------------------------------------------------------------------
-// Function:	VarLenType destructor
-///\brief	Properly terminates access to this datatype.
-// Programmer	Binh-Minh Ribler - May, 2004
+// Function:    VarLenType::decode
+///\brief       Returns an VarLenType object via DataType* by decoding the
+///             binary object description of this type.
+///
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - Aug 2017
 //--------------------------------------------------------------------------
-VarLenType::~VarLenType() {}
+DataType *
+VarLenType::decode() const
+{
+    hid_t encoded_vltype_id = H5I_INVALID_HID;
+    try {
+        encoded_vltype_id = p_decode();
+    }
+    catch (DataTypeIException &err) {
+        throw;
+    }
+    VarLenType *encoded_vltype = new VarLenType;
+    encoded_vltype->p_setId(encoded_vltype_id);
+    return (encoded_vltype);
+}
+
+//--------------------------------------------------------------------------
+// Function:    VarLenType destructor
+///\brief       Properly terminates access to this datatype.
+// Programmer   Binh-Minh Ribler - May, 2004
+//--------------------------------------------------------------------------
+VarLenType::~VarLenType()
+{
+}
 
-#ifndef H5_NO_NAMESPACE
-} // end namespace
-#endif
+} // namespace H5
diff --git a/c++/src/H5VarLenType.h b/c++/src/H5VarLenType.h
index 40c597f..318681a 100644
--- a/c++/src/H5VarLenType.h
+++ b/c++/src/H5VarLenType.h
@@ -1,50 +1,63 @@
 // C++ informative line for the emacs editor: -*- C++ -*-
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5VarLenType_H
-#define __H5VarLenType_H
+#ifndef H5VarLenType_H
+#define H5VarLenType_H
 
-#ifndef H5_NO_NAMESPACE
 namespace H5 {
-#endif
 
-//! VarLenType operates on the HDF5 C's Variable-length Datatypes.
+/*! \class VarLenType
+    \brief VarLenType is a derivative of a DataType and operates on HDF5
+    Variable-length Datatypes.
+*/
+//  Inheritance: DataType -> H5Object -> H5Location -> IdComponent
 class H5_DLLCPP VarLenType : public DataType {
-   public:
-	// Constructor that creates a variable-length datatype based
-	// on the specified base type.
-	VarLenType(const DataType* base_type);
-
-	///\brief Returns this class name.
-	virtual H5std_string fromClass () const { return("VarLenType"); }
-
-	// Copy constructor: makes copy of the original object.
-	VarLenType( const VarLenType& original );
-
-	// Constructor that takes an existing id
-	VarLenType( const hid_t existing_id );
-
-	// Noop destructor
-	virtual ~VarLenType();
-
-   protected:
-	// Default constructor
-	VarLenType();
-};
-#ifndef H5_NO_NAMESPACE
-}
-#endif
-#endif // __H5VarLenType_H
+  public:
+    // Constructor that creates a variable-length datatype based
+    // on the specified base type.
+    VarLenType(const DataType &base_type);
+
+    // Deprecated - will be removed after 1.10.2
+    VarLenType(const DataType *base_type);
+
+    // Returns an VarLenType object via DataType* by decoding the
+    // binary object description of this type.
+    virtual DataType *decode() const override;
+
+    ///\brief Returns this class name.
+    virtual H5std_string
+    fromClass() const override
+    {
+        return ("VarLenType");
+    }
+
+    // Copy constructor: same as the original VarLenType.
+    VarLenType(const VarLenType &original);
+
+    // Constructor that takes an existing id
+    VarLenType(const hid_t existing_id);
+
+    // Constructors that open a variable-length datatype, given a location.
+    VarLenType(const H5Location &loc, const char *name);
+    VarLenType(const H5Location &loc, const H5std_string &name);
+
+    // Noop destructor
+    virtual ~VarLenType() override;
+
+    // Default constructor
+    VarLenType();
+
+}; // end of VarLenType
+} // namespace H5
+
+#endif // H5VarLenType_H
diff --git a/c++/src/Makefile.am b/c++/src/Makefile.am
index 7c1f497..41815cd 100644
--- a/c++/src/Makefile.am
+++ b/c++/src/Makefile.am
@@ -1,16 +1,13 @@
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 ##
 ## Makefile.am
 ## Run automake to generate a Makefile.in from this file.
@@ -28,36 +25,37 @@ AM_CPPFLAGS+=-I$(top_srcdir)/src
 lib_LTLIBRARIES=libhdf5_cpp.la
 
 # Add libtool numbers to the HDF5 C++ library (from config/lt_vers.am)
-libhdf5_cpp_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
-
-# Shared C++ libraries aren't universally supported.
-if CXX_SHARED_CONDITIONAL
-else
-  AM_LDFLAGS+=-static
-endif
+libhdf5_cpp_la_LDFLAGS= -version-info $(LT_CXX_VERS_INTERFACE):$(LT_CXX_VERS_REVISION):$(LT_CXX_VERS_AGE) $(AM_LDFLAGS)
 
 bin_SCRIPTS=h5c++
 
 # Source files for the library
-libhdf5_cpp_la_SOURCES=H5Exception.cpp H5IdComponent.cpp H5Library.cpp        \
-        H5Attribute.cpp H5Location.cpp H5Object.cpp H5PropList.cpp	      \
-	H5FaccProp.cpp H5FcreatProp.cpp H5DcreatProp.cpp H5DxferProp.cpp      \
-	H5DataType.cpp H5DataSpace.cpp H5AbstractDs.cpp H5AtomType.cpp        \
-	H5PredType.cpp H5EnumType.cpp H5IntType.cpp H5FloatType.cpp           \
-	H5StrType.cpp H5ArrayType.cpp H5VarLenType.cpp H5CompType.cpp         \
-	H5DataSet.cpp H5CommonFG.cpp H5Group.cpp H5File.cpp
+libhdf5_cpp_la_SOURCES=H5Exception.cpp H5IdComponent.cpp	\
+    H5DataSpace.cpp H5PropList.cpp H5Library.cpp			\
+    H5FaccProp.cpp H5FcreatProp.cpp H5LcreatProp.cpp		\
+    H5LaccProp.cpp H5DaccProp.cpp H5DxferProp.cpp			\
+    H5DcreatProp.cpp H5Location.cpp H5AbstractDs.cpp		\
+    H5Attribute.cpp H5Object.cpp H5OcreatProp.cpp			\
+    H5DataType.cpp H5AtomType.cpp H5PredType.cpp			\
+    H5EnumType.cpp H5IntType.cpp H5FloatType.cpp			\
+    H5StrType.cpp H5ArrayType.cpp H5VarLenType.cpp			\
+    H5CompType.cpp H5DataSet.cpp H5CommonFG.cpp H5Group.cpp	\
+    H5File.cpp
 
 # HDF5 C++ library depends on HDF5 Library.
 libhdf5_cpp_la_LIBADD=$(LIBHDF5)
 
 # Public headers
-include_HEADERS=H5Cpp.h H5AbstractDs.h H5AtomType.h H5Attribute.h H5Classes.h \
-        H5CommonFG.h H5CompType.h H5DataSet.h H5DataSpace.h H5DataType.h      \
-        H5DcreatProp.h H5DxferProp.h H5EnumType.h H5Exception.h H5FaccProp.h  \
-        H5FcreatProp.h H5File.h H5FloatType.h H5Group.h H5IdComponent.h       \
-        H5Include.h H5IntType.h H5Library.h H5Location.h H5Object.h           \
-	H5PredType.h H5PropList.h H5StrType.h H5CppDoc.h H5ArrayType.h        \
-	H5VarLenType.h      
+include_HEADERS=H5Cpp.h H5AbstractDs.h H5AtomType.h			\
+	H5Attribute.h H5Classes.h H5CommonFG.h H5CompType.h		\
+	H5DataSet.h H5DataSpace.h H5DataType.h H5OcreatProp.h		\
+	H5DaccProp.h H5DcreatProp.h					\
+	H5DxferProp.h H5EnumType.h H5Exception.h H5FaccProp.h		\
+	H5FcreatProp.h H5File.h H5FloatType.h H5Group.h			\
+	H5IdComponent.h H5Include.h H5IntType.h H5LcreatProp.h		\
+	H5LaccProp.h H5Library.h H5Location.h H5Object.h		\
+	H5PredType.h H5PropList.h H5StrType.h H5CppDoc.h		\
+	H5ArrayType.h H5VarLenType.h
 
 # h5c++ and libhdf5.settings are generated during configure.  Remove only when
 # distclean.
diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in
deleted file mode 100644
index 688e932..0000000
--- a/c++/src/Makefile.in
+++ /dev/null
@@ -1,1522 +0,0 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-#
-# HDF5-C++ Makefile(.in)
-#
-
-
-
-VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-DIST_COMMON = $(top_srcdir)/config/commence.am \
-	$(top_srcdir)/config/lt_vers.am \
-	$(top_srcdir)/config/conclude.am $(srcdir)/Makefile.in \
-	$(srcdir)/Makefile.am $(top_srcdir)/bin/mkinstalldirs \
-	$(srcdir)/h5c++.in $(top_srcdir)/bin/depcomp \
-	$(include_HEADERS) $(top_srcdir)/bin/test-driver
-
-# Shared C++ libraries aren't universally supported.
-@CXX_SHARED_CONDITIONAL_FALSE@am__append_1 = -static
-TESTS =
-subdir = c++/src
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/aclocal_cxx.m4 \
-	$(top_srcdir)/m4/aclocal_fc.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/src/H5config.h
-CONFIG_CLEAN_FILES = h5c++
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
-	"$(DESTDIR)$(includedir)"
-LTLIBRARIES = $(lib_LTLIBRARIES)
-libhdf5_cpp_la_DEPENDENCIES = $(LIBHDF5)
-am_libhdf5_cpp_la_OBJECTS = H5Exception.lo H5IdComponent.lo \
-	H5Library.lo H5Attribute.lo H5Location.lo H5Object.lo \
-	H5PropList.lo H5FaccProp.lo H5FcreatProp.lo H5DcreatProp.lo \
-	H5DxferProp.lo H5DataType.lo H5DataSpace.lo H5AbstractDs.lo \
-	H5AtomType.lo H5PredType.lo H5EnumType.lo H5IntType.lo \
-	H5FloatType.lo H5StrType.lo H5ArrayType.lo H5VarLenType.lo \
-	H5CompType.lo H5DataSet.lo H5CommonFG.lo H5Group.lo H5File.lo
-libhdf5_cpp_la_OBJECTS = $(am_libhdf5_cpp_la_OBJECTS)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 = 
-libhdf5_cpp_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(libhdf5_cpp_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SCRIPTS = $(bin_SCRIPTS)
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
-depcomp = $(SHELL) $(top_srcdir)/bin/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS)
-AM_V_CXX = $(am__v_CXX_@AM_V@)
-am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
-am__v_CXX_0 = @echo "  CXX     " $@;
-am__v_CXX_1 = 
-CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
-am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
-am__v_CXXLD_0 = @echo "  CXXLD   " $@;
-am__v_CXXLD_1 = 
-SOURCES = $(libhdf5_cpp_la_SOURCES)
-DIST_SOURCES = $(libhdf5_cpp_la_SOURCES)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-HEADERS = $(include_HEADERS)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-am__tty_colors_dummy = \
-  mgn= red= grn= lgn= blu= brg= std=; \
-  am__color_tests=no
-am__tty_colors = { \
-  $(am__tty_colors_dummy); \
-  if test "X$(AM_COLOR_TESTS)" = Xno; then \
-    am__color_tests=no; \
-  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
-    am__color_tests=yes; \
-  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
-    am__color_tests=yes; \
-  fi; \
-  if test $$am__color_tests = yes; then \
-    red='[0;31m'; \
-    grn='[0;32m'; \
-    lgn='[1;32m'; \
-    blu='[1;34m'; \
-    mgn='[0;35m'; \
-    brg='[1m'; \
-    std='[m'; \
-  fi; \
-}
-am__recheck_rx = ^[ 	]*:recheck:[ 	]*
-am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
-am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
-# A command that, given a newline-separated list of test names on the
-# standard input, print the name of the tests that are to be re-run
-# upon "make recheck".
-am__list_recheck_tests = $(AWK) '{ \
-  recheck = 1; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-        { \
-          if ((getline line2 < ($$0 ".log")) < 0) \
-	    recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
-        { \
-          recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
-        { \
-          break; \
-        } \
-    }; \
-  if (recheck) \
-    print $$0; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# A command that, given a newline-separated list of test names on the
-# standard input, create the global log from their .trs and .log files.
-am__create_global_log = $(AWK) ' \
-function fatal(msg) \
-{ \
-  print "fatal: making $@: " msg | "cat >&2"; \
-  exit 1; \
-} \
-function rst_section(header) \
-{ \
-  print header; \
-  len = length(header); \
-  for (i = 1; i <= len; i = i + 1) \
-    printf "="; \
-  printf "\n\n"; \
-} \
-{ \
-  copy_in_global_log = 1; \
-  global_test_result = "RUN"; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-         fatal("failed to read from " $$0 ".trs"); \
-      if (line ~ /$(am__global_test_result_rx)/) \
-        { \
-          sub("$(am__global_test_result_rx)", "", line); \
-          sub("[ 	]*$$", "", line); \
-          global_test_result = line; \
-        } \
-      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
-        copy_in_global_log = 0; \
-    }; \
-  if (copy_in_global_log) \
-    { \
-      rst_section(global_test_result ": " $$0); \
-      while ((rc = (getline line < ($$0 ".log"))) != 0) \
-      { \
-        if (rc < 0) \
-          fatal("failed to read from " $$0 ".log"); \
-        print line; \
-      }; \
-      printf "\n"; \
-    }; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# Restructured Text title.
-am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
-# Solaris 10 'make', and several other traditional 'make' implementations,
-# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
-# by disabling -e (using the XSI extension "set +e") if it's set.
-am__sh_e_setup = case $$- in *e*) set +e;; esac
-# Default flags passed to test drivers.
-am__common_driver_flags = \
-  --color-tests "$$am__color_tests" \
-  --enable-hard-errors "$$am__enable_hard_errors" \
-  --expect-failure "$$am__expect_failure"
-# To be inserted before the command running the test.  Creates the
-# directory for the log if needed.  Stores in $dir the directory
-# containing $f, in $tst the test, in $log the log.  Executes the
-# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
-# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
-# will run the test scripts (or their associated LOG_COMPILER, if
-# thy have one).
-am__check_pre = \
-$(am__sh_e_setup);					\
-$(am__vpath_adj_setup) $(am__vpath_adj)			\
-$(am__tty_colors);					\
-srcdir=$(srcdir); export srcdir;			\
-case "$@" in						\
-  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
-    *) am__odir=.;; 					\
-esac;							\
-test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
-  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
-if test -f "./$$f"; then dir=./;			\
-elif test -f "$$f"; then dir=;				\
-else dir="$(srcdir)/"; fi;				\
-tst=$$dir$$f; log='$@'; 				\
-if test -n '$(DISABLE_HARD_ERRORS)'; then		\
-  am__enable_hard_errors=no; 				\
-else							\
-  am__enable_hard_errors=yes; 				\
-fi; 							\
-case " $(XFAIL_TESTS) " in				\
-  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
-    am__expect_failure=yes;;				\
-  *)							\
-    am__expect_failure=no;;				\
-esac; 							\
-$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
-# A shell command to get the names of the tests scripts with any registered
-# extension removed (i.e., equivalently, the names of the test logs, with
-# the '.log' extension removed).  The result is saved in the shell variable
-# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
-# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
-# since that might cause problem with VPATH rewrites for suffix-less tests.
-# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
-am__set_TESTS_bases = \
-  bases='$(TEST_LOGS)'; \
-  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
-  bases=`echo $$bases`
-RECHECK_LOGS = $(TEST_LOGS)
-AM_RECURSIVE_TARGETS = check recheck
-TEST_SUITE_LOG = test-suite.log
-am__test_logs1 = $(TESTS:=.log)
-am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
-TEST_LOGS = $(am__test_logs2:.sh.log=.log)
-SH_LOG_DRIVER = $(SHELL) $(top_srcdir)/bin/test-driver
-SH_LOG_COMPILE = $(SH_LOG_COMPILER) $(AM_SH_LOG_FLAGS) $(SH_LOG_FLAGS)
-am__set_b = \
-  case '$@' in \
-    */*) \
-      case '$*' in \
-        */*) b='$*';; \
-          *) b=`echo '$@' | sed 's/\.log$$//'`; \
-       esac;; \
-    *) \
-      b='$*';; \
-  esac
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
-AMTAR = @AMTAR@
-
-# H5_CFLAGS holds flags that should be used when building hdf5,
-# but which should not be exported to h5cc for building other programs.
-# AM_CFLAGS is an automake construct which should be used by Makefiles 
-# instead of CFLAGS, as CFLAGS is reserved solely for the user to define.
-# This applies to FCFLAGS, CXXFLAGS, CPPFLAGS, and LDFLAGS as well.
-AM_CFLAGS = @AM_CFLAGS@ @H5_CFLAGS@
-
-# Include src directory
-AM_CPPFLAGS = @AM_CPPFLAGS@ @H5_CPPFLAGS@ -I$(top_srcdir)/src
-AM_CXXFLAGS = @AM_CXXFLAGS@ @H5_CXXFLAGS@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@
-AM_LDFLAGS = @AM_LDFLAGS@ @H5_LDFLAGS@ $(am__append_1)
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BYTESEX = @BYTESEX@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CC_VERSION = @CC_VERSION@
-CFLAGS = @CFLAGS@
-CLEARFILEBUF = @CLEARFILEBUF@
-CODESTACK = @CODESTACK@
-CONFIG_DATE = @CONFIG_DATE@
-CONFIG_MODE = @CONFIG_MODE@
-CONFIG_USER = @CONFIG_USER@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CXX_VERSION = @CXX_VERSION@
-CYGPATH_W = @CYGPATH_W@
-DEBUG_PKG = @DEBUG_PKG@
-DEFAULT_API_VERSION = @DEFAULT_API_VERSION@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
-DIRECT_VFD = @DIRECT_VFD@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-EXTERNAL_FILTERS = @EXTERNAL_FILTERS@
-
-# Make sure that these variables are exported to the Makefiles
-F9XMODEXT = @F9XMODEXT@
-F9XMODFLAG = @F9XMODFLAG@
-F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
-FC = @FC@
-FC2003 = @FC2003@
-FCFLAGS = @FCFLAGS@
-FCFLAGS_f90 = @FCFLAGS_f90@
-FCLIBS = @FCLIBS@
-FC_VERSION = @FC_VERSION@
-FGREP = @FGREP@
-FSEARCH_DIRS = @FSEARCH_DIRS@
-GREP = @GREP@
-H5_CFLAGS = @H5_CFLAGS@
-H5_CPPFLAGS = @H5_CPPFLAGS@
-H5_CXXFLAGS = @H5_CXXFLAGS@
-H5_CXX_SHARED = @H5_CXX_SHARED@
-H5_FCFLAGS = @H5_FCFLAGS@
-H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@
-H5_LDFLAGS = @H5_LDFLAGS@
-H5_LONE_COLON = @H5_LONE_COLON@
-H5_VERSION = @H5_VERSION@
-HADDR_T = @HADDR_T@
-HAVE_DMALLOC = @HAVE_DMALLOC@
-HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@
-HAVE_PTHREAD = @HAVE_PTHREAD@
-HDF5_HL = @HDF5_HL@
-HDF5_INTERFACES = @HDF5_INTERFACES@
-HDF_CXX = @HDF_CXX@
-HDF_FORTRAN = @HDF_FORTRAN@
-HDF_FORTRAN2003 = @HDF_FORTRAN2003@
-HID_T = @HID_T@
-HL = @HL@
-HL_FOR = @HL_FOR@
-HSIZE_T = @HSIZE_T@
-HSSIZE_T = @HSSIZE_T@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTRUMENT = @INSTRUMENT@
-INSTRUMENT_LIBRARY = @INSTRUMENT_LIBRARY@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LL_PATH = @LL_PATH@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_STATIC_EXEC = @LT_STATIC_EXEC@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MPE = @MPE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJECT_NAMELEN_DEFAULT_F = @OBJECT_NAMELEN_DEFAULT_F@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PARALLEL = @PARALLEL@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-RANLIB = @RANLIB@
-ROOT = @ROOT@
-RUNPARALLEL = @RUNPARALLEL@
-RUNSERIAL = @RUNSERIAL@
-R_INTEGER = @R_INTEGER@
-R_LARGE = @R_LARGE@
-SEARCH = @SEARCH@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SIZE_T = @SIZE_T@
-STATIC_EXEC = @STATIC_EXEC@
-STATIC_SHARED = @STATIC_SHARED@
-STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@
-STRIP = @STRIP@
-TESTPARALLEL = @TESTPARALLEL@
-THREADSAFE = @THREADSAFE@
-TIME = @TIME@
-TR = @TR@
-TRACE_API = @TRACE_API@
-UNAME_INFO = @UNAME_INFO@
-USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
-USE_FILTER_SZIP = @USE_FILTER_SZIP@
-USINGMEMCHECKER = @USINGMEMCHECKER@
-VERSION = @VERSION@
-WORDS_BIGENDIAN = @WORDS_BIGENDIAN@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_FC = @ac_ct_FC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-
-# Install directories that automake doesn't know about
-docdir = $(exec_prefix)/doc
-dvidir = @dvidir@
-enable_shared = @enable_shared@
-enable_static = @enable_static@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-
-# Shell commands used in Makefiles
-RM = rm -f
-CP = cp
-
-# Some machines need a command to run executables; this is that command
-# so that our tests will run.
-# We use RUNEXEC instead of RUNSERIAL directly because it may be that
-# some tests need to be run with a different command.  Older versions
-# of the makefiles used the command
-# $(LIBTOOL) --mode=execute
-# in some directories, for instance.
-RUNEXEC = $(RUNSERIAL)
-
-# Libraries to link to while building
-LIBHDF5 = $(top_builddir)/src/libhdf5.la
-LIBH5TEST = $(top_builddir)/test/libh5test.la
-LIBH5F = $(top_builddir)/fortran/src/libhdf5_fortran.la
-LIBH5FTEST = $(top_builddir)/fortran/test/libh5test_fortran.la
-LIBH5CPP = $(top_builddir)/c++/src/libhdf5_cpp.la
-LIBH5TOOLS = $(top_builddir)/tools/lib/libh5tools.la
-LIBH5_HL = $(top_builddir)/hl/src/libhdf5_hl.la
-LIBH5F_HL = $(top_builddir)/hl/fortran/src/libhdf5hl_fortran.la
-LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
-
-# Note that in svn revision 19400 the '/' after DESTDIR in H5* variables below  
-# has been removed. According to the official description of DESTDIR by Gnu at 
-# http://www.gnu.org/prep/standards/html_node/DESTDIR.html, DESTDIR is 
-# prepended to the normal and complete install path that it precedes for the 
-# purpose of installing in a temporary directory which is useful for building 
-# rpms and other packages.  The '/' after ${DESTDIR} will be followed by another 
-# '/' at the beginning of the normal install path.  When DESTDIR is empty the  
-# path then begins with '//', which is incorrect and causes problems at least for 
-# Cygwin.   
-
-# Scripts used to build examples
-# If only shared libraries have been installed, have h5cc build examples with
-# shared libraries instead of static libraries
-H5CC = ${DESTDIR}$(bindir)/h5cc
-H5CC_PP = ${DESTDIR}$(bindir)/h5pcc
-H5FC = ${DESTDIR}$(bindir)/h5fc
-H5FC_PP = ${DESTDIR}$(bindir)/h5pfc
-H5CPP = ${DESTDIR}$(bindir)/h5c++
-ACLOCAL_AMFLAGS = "-I m4"
-
-# The trace script; this is used on source files from the C library to
-# insert tracing macros.
-TRACE = perl $(top_srcdir)/bin/trace
-
-# .chkexe files are used to mark tests that have run successfully.
-# .chklog files are output from those tests.
-# *.clog and *.clog2 are from the MPE option.
-CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2
-
-# Add libtool shared library version numbers to the HDF5 library
-# See libtool versioning documentation online.
-# After making changes, run bin/reconfigure to update other configure related
-# files like Makefile.in.
-LT_VERS_INTERFACE = 6
-LT_VERS_REVISION = 206
-LT_VERS_AGE = 0
-
-# This is our main target
-lib_LTLIBRARIES = libhdf5_cpp.la
-
-# Add libtool numbers to the HDF5 C++ library (from config/lt_vers.am)
-libhdf5_cpp_la_LDFLAGS = -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
-bin_SCRIPTS = h5c++
-
-# Source files for the library
-libhdf5_cpp_la_SOURCES = H5Exception.cpp H5IdComponent.cpp H5Library.cpp        \
-        H5Attribute.cpp H5Location.cpp H5Object.cpp H5PropList.cpp	      \
-	H5FaccProp.cpp H5FcreatProp.cpp H5DcreatProp.cpp H5DxferProp.cpp      \
-	H5DataType.cpp H5DataSpace.cpp H5AbstractDs.cpp H5AtomType.cpp        \
-	H5PredType.cpp H5EnumType.cpp H5IntType.cpp H5FloatType.cpp           \
-	H5StrType.cpp H5ArrayType.cpp H5VarLenType.cpp H5CompType.cpp         \
-	H5DataSet.cpp H5CommonFG.cpp H5Group.cpp H5File.cpp
-
-
-# HDF5 C++ library depends on HDF5 Library.
-libhdf5_cpp_la_LIBADD = $(LIBHDF5)
-
-# Public headers
-include_HEADERS = H5Cpp.h H5AbstractDs.h H5AtomType.h H5Attribute.h H5Classes.h \
-        H5CommonFG.h H5CompType.h H5DataSet.h H5DataSpace.h H5DataType.h      \
-        H5DcreatProp.h H5DxferProp.h H5EnumType.h H5Exception.h H5FaccProp.h  \
-        H5FcreatProp.h H5File.h H5FloatType.h H5Group.h H5IdComponent.h       \
-        H5Include.h H5IntType.h H5Library.h H5Location.h H5Object.h           \
-	H5PredType.h H5PropList.h H5StrType.h H5CppDoc.h H5ArrayType.h        \
-	H5VarLenType.h      
-
-
-# h5c++ and libhdf5.settings are generated during configure.  Remove only when
-# distclean.
-DISTCLEANFILES = h5c++ libhdf5.settings
-
-# Mark this directory as part of the C++ API
-CXX_API = yes
-
-# Automake needs to be taught how to build lib, progs, and tests targets.
-# These will be filled in automatically for the most part (e.g.,
-# lib_LIBRARIES are built for lib target), but EXTRA_LIB, EXTRA_PROG, and
-# EXTRA_TEST variables are supplied to allow the user to force targets to
-# be built at certain times. 
-LIB = $(lib_LIBRARIES) $(lib_LTLIBRARIES) $(noinst_LIBRARIES)                 \
-      $(noinst_LTLIBRARIES) $(check_LIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LIB)
-
-PROGS = $(bin_PROGRAMS) $(bin_SCRIPTS) $(noinst_PROGRAMS) $(noinst_SCRIPTS)   \
-        $(EXTRA_PROG)
-
-chk_TESTS = $(check_PROGRAMS) $(check_SCRIPTS) $(EXTRA_TEST) 
-TEST_EXTENSIONS = .sh
-SH_LOG_COMPILER = $(SHELL)
-AM_SH_LOG_FLAGS = 
-TEST_PROG_CHKEXE = $(TEST_PROG:=.chkexe_)
-TEST_PROG_PARA_CHKEXE = $(TEST_PROG_PARA:=.chkexe_)
-TEST_SCRIPT_CHKSH = $(TEST_SCRIPT:=.chkexe_)
-TEST_SCRIPT_PARA_CHKSH = $(TEST_SCRIPT_PARA:=.chkexe_)
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .cpp .lo .log .o .obj .sh .sh$(EXEEXT) .trs
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/lt_vers.am $(top_srcdir)/config/conclude.am $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign c++/src/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign c++/src/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-$(top_srcdir)/config/commence.am $(top_srcdir)/config/lt_vers.am $(top_srcdir)/config/conclude.am:
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-h5c++: $(top_builddir)/config.status $(srcdir)/h5c++.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
-	}
-
-uninstall-libLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
-	done
-
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; \
-	locs=`for p in $$list; do echo $$p; done | \
-	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
-	      sort -u`; \
-	test -z "$$locs" || { \
-	  echo rm -f $${locs}; \
-	  rm -f $${locs}; \
-	}
-
-libhdf5_cpp.la: $(libhdf5_cpp_la_OBJECTS) $(libhdf5_cpp_la_DEPENDENCIES) $(EXTRA_libhdf5_cpp_la_DEPENDENCIES) 
-	$(AM_V_CXXLD)$(libhdf5_cpp_la_LINK) -rpath $(libdir) $(libhdf5_cpp_la_OBJECTS) $(libhdf5_cpp_la_LIBADD) $(LIBS)
-install-binSCRIPTS: $(bin_SCRIPTS)
-	@$(NORMAL_INSTALL)
-	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n' \
-	    -e 'h;s|.*|.|' \
-	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
-	      if (++n[d] == $(am__install_max)) { \
-		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
-	    else { print "f", d "/" $$4, $$1 } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	     test -z "$$files" || { \
-	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \
-	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
-	     } \
-	; done
-
-uninstall-binSCRIPTS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	       sed -e 's,.*/,,;$(transform)'`; \
-	dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5AbstractDs.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5ArrayType.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5AtomType.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Attribute.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5CommonFG.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5CompType.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5DataSet.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5DataSpace.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5DataType.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5DcreatProp.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5DxferProp.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5EnumType.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Exception.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FaccProp.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FcreatProp.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5File.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FloatType.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Group.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5IdComponent.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5IntType.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Library.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Location.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Object.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5PredType.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5PropList.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5StrType.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5VarLenType.Plo@am__quote@
-
-.cpp.o:
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
-
-.cpp.obj:
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.cpp.lo:
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-includeHEADERS: $(include_HEADERS)
-	@$(NORMAL_INSTALL)
-	@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \
-	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \
-	done
-
-uninstall-includeHEADERS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: ctags-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-# Recover from deleted '.trs' file; this should ensure that
-# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
-# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
-# to avoid problems with "make -n".
-.log.trs:
-	rm -f $< $@
-	$(MAKE) $(AM_MAKEFLAGS) $<
-
-# Leading 'am--fnord' is there to ensure the list of targets does not
-# expand to empty, as could happen e.g. with make check TESTS=''.
-am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
-am--force-recheck:
-	@:
-
-$(TEST_SUITE_LOG): $(TEST_LOGS)
-	@$(am__set_TESTS_bases); \
-	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
-	redo_bases=`for i in $$bases; do \
-	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
-	            done`; \
-	if test -n "$$redo_bases"; then \
-	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
-	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
-	  if $(am__make_dryrun); then :; else \
-	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
-	  fi; \
-	fi; \
-	if test -n "$$am__remaking_logs"; then \
-	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
-	       "recursion detected" >&2; \
-	else \
-	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
-	fi; \
-	if $(am__make_dryrun); then :; else \
-	  st=0;  \
-	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
-	  for i in $$redo_bases; do \
-	    test -f $$i.trs && test -r $$i.trs \
-	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
-	    test -f $$i.log && test -r $$i.log \
-	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
-	  done; \
-	  test $$st -eq 0 || exit 1; \
-	fi
-	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
-	ws='[ 	]'; \
-	results=`for b in $$bases; do echo $$b.trs; done`; \
-	test -n "$$results" || results=/dev/null; \
-	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
-	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
-	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
-	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
-	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
-	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
-	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
-	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
-	  success=true; \
-	else \
-	  success=false; \
-	fi; \
-	br='==================='; br=$$br$$br$$br$$br; \
-	result_count () \
-	{ \
-	    if test x"$$1" = x"--maybe-color"; then \
-	      maybe_colorize=yes; \
-	    elif test x"$$1" = x"--no-color"; then \
-	      maybe_colorize=no; \
-	    else \
-	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
-	    fi; \
-	    shift; \
-	    desc=$$1 count=$$2; \
-	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
-	      color_start=$$3 color_end=$$std; \
-	    else \
-	      color_start= color_end=; \
-	    fi; \
-	    echo "$${color_start}# $$desc $$count$${color_end}"; \
-	}; \
-	create_testsuite_report () \
-	{ \
-	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
-	  result_count $$1 "PASS: " $$pass  "$$grn"; \
-	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
-	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
-	  result_count $$1 "FAIL: " $$fail  "$$red"; \
-	  result_count $$1 "XPASS:" $$xpass "$$red"; \
-	  result_count $$1 "ERROR:" $$error "$$mgn"; \
-	}; \
-	{								\
-	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
-	    $(am__rst_title);						\
-	  create_testsuite_report --no-color;				\
-	  echo;								\
-	  echo ".. contents:: :depth: 2";				\
-	  echo;								\
-	  for b in $$bases; do echo $$b; done				\
-	    | $(am__create_global_log);					\
-	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
-	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
-	if $$success; then						\
-	  col="$$grn";							\
-	 else								\
-	  col="$$red";							\
-	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
-	fi;								\
-	echo "$${col}$$br$${std}"; 					\
-	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
-	echo "$${col}$$br$${std}"; 					\
-	create_testsuite_report --maybe-color;				\
-	echo "$$col$$br$$std";						\
-	if $$success; then :; else					\
-	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
-	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
-	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
-	  fi;								\
-	  echo "$$col$$br$$std";					\
-	fi;								\
-	$$success || exit 1
-recheck: all 
-	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-	@set +e; $(am__set_TESTS_bases); \
-	bases=`for i in $$bases; do echo $$i; done \
-	         | $(am__list_recheck_tests)` || exit 1; \
-	log_list=`for i in $$bases; do echo $$i.log; done`; \
-	log_list=`echo $$log_list`; \
-	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
-	        am__force_recheck=am--force-recheck \
-	        TEST_LOGS="$$log_list"; \
-	exit $$?
-.sh.log:
-	@p='$<'; \
-	$(am__set_b); \
-	$(am__check_pre) $(SH_LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_SH_LOG_DRIVER_FLAGS) $(SH_LOG_DRIVER_FLAGS) -- $(SH_LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-@am__EXEEXT_TRUE@.sh$(EXEEXT).log:
-@am__EXEEXT_TRUE@	@p='$<'; \
-@am__EXEEXT_TRUE@	$(am__set_b); \
-@am__EXEEXT_TRUE@	$(am__check_pre) $(SH_LOG_DRIVER) --test-name "$$f" \
-@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
-@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_SH_LOG_DRIVER_FLAGS) $(SH_LOG_DRIVER_FLAGS) -- $(SH_LOG_COMPILE) \
-@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(HEADERS) all-local
-installdirs:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includedir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
-	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
-	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-includeHEADERS
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-binSCRIPTS install-libLTLIBRARIES
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-local
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-binSCRIPTS uninstall-includeHEADERS \
-	uninstall-libLTLIBRARIES
-
-.MAKE: check-am install-am install-strip
-
-.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-TESTS \
-	check-am clean clean-generic clean-libLTLIBRARIES \
-	clean-libtool cscopelist-am ctags ctags-am distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-binSCRIPTS install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am \
-	install-includeHEADERS install-info install-info-am \
-	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
-	pdf-am ps ps-am recheck tags tags-am uninstall uninstall-am \
-	uninstall-binSCRIPTS uninstall-includeHEADERS \
-	uninstall-libLTLIBRARIES
-
-
-# List all build rules defined by HDF5 Makefiles as "PHONY" targets here.
-# This tells the Makefiles that these targets are not files to be built but
-# commands that should be executed even if a file with the same name already
-# exists.
-.PHONY: build-check-clean build-check-p build-check-s build-lib build-progs \
-        build-tests check-clean check-install check-p check-s check-vfd \
-        install-doc lib progs tests uninstall-doc _exec_check-s _test help
-
-help:
-	@$(top_srcdir)/bin/makehelp
-
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-
-# Some C++ compilers/linkers (PGI?) create a directory named "ii_files" that
-# holds *.ii files, which are template entity instantiations.
-# This entire directory should be cleaned.
-mostlyclean-local:
-	@if test -d ii_files; then                                       \
-	  $(RM) -rf ii_files;                                           \
-	fi
-
-# lib/progs/tests targets recurse into subdirectories. build-* targets
-# build files in this directory.
-build-lib: $(LIB)
-build-progs: $(LIB) $(PROGS)
-build-tests: $(LIB) $(PROGS) $(chk_TESTS)
-
-# General rule for recursive building targets.
-# BUILT_SOURCES contain targets that need to be built before anything else
-# in the directory (e.g., for Fortran type detection)
-lib progs tests check-s check-p :: $(BUILT_SOURCES)
-	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
-	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X && test $$d != .; then                           \
-	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
-	    fi;                                                               \
-	done
-
-# General rule for recursive cleaning targets.  Like the rule above,
-# but doesn't require building BUILT_SOURCES.
-check-clean ::
-	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
-	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X && test $$d != .; then                           \
-	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
-	    fi;                                                               \
-	done
-
-# Tell Automake to build tests when the user types `make all' (this is
-# not its default behavior).  Also build EXTRA_LIB and EXTRA_PROG since
-# Automake won't build them automatically, either.
-all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(chk_TESTS)
-
-# make install-doc doesn't do anything outside of doc directory, but
-# Makefiles should recognize it.
-# UPDATE: docs no longer reside in this build tree, so this target
-# is depreciated.
-install-doc uninstall-doc:
-	@echo "Nothing to be done."
-
-# clean up files generated by tests so they can be re-run.
-build-check-clean:
-	$(RM) -rf $(CHECK_CLEANFILES)
-
-# run check-clean whenever mostlyclean is run
-mostlyclean-local: build-check-clean
-
-# check-install is just a synonym for installcheck
-check-install: installcheck
-
-# Run each test in order, passing $(TEST_FLAGS) to the program.
-# Since tests are done in a shell loop, "make -i" does apply inside it.
-# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
-# The timestamps give a rough idea how much time the tests use.
-#
-# Note that targets in chk_TESTS (defined above) will be built when the user
-# types 'make tests' or 'make check', but only programs in TEST_PROG,
-# TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
-check-TESTS: test
-
-test _test:
-	@$(MAKE) build-check-s
-	@$(MAKE) build-check-p
-
-# Actual execution of check-s.
-build-check-s: $(LIB) $(PROGS) $(chk_TESTS)
-	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
-	   echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
-	fi
-	@$(MAKE) $(AM_MAKEFLAGS) _exec_check-s
-	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
-	    echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
-	fi
-
-_exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH)
-
-# The dummy.chkexe here prevents the target from being
-# empty if there are no tests in the current directory.
-# $${log} is the log file.
-# $${tname} is the name of test.
-$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
-	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \
-	   tname=$(@:.chkexe_=)$(EXEEXT);\
-	   log=$(@:.chkexe_=.chklog); \
-	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \
-	      echo "No need to test $${tname} again."; \
-	   else \
-	      echo "============================" > $${log}; \
-	      if test "X$(FORTRAN_API)" = "Xyes"; then \
-	         echo "Fortran API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "Fortran API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(CXX_API)" = "Xyes"; then \
-	         echo "C++ API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "C++ API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log};\
-	      else \
-	         echo "Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "$(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      fi; \
-	      echo "============================" >> $${log}; \
-	      srcdir="$(srcdir)" \
-	         $(TIME) $(RUNEXEC) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \
-	         && touch $(@:.chkexe_=.chkexe) || \
-	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	         (cat $${log} && false) || exit 1; \
-	      echo "" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
-	      echo "============================" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
-	      cat $${log}; \
-	   fi; \
-	fi
-
-# The dummysh.chkexe here prevents the target from being
-# empty if there are no tests in the current directory.
-# $${log} is the log file.
-# $${tname} is the name of test.
-$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
-	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummysh.chkexe_"; then \
-	   cmd=$(@:.chkexe_=);\
-	   tname=`basename $$cmd`;\
-	   chkname=`basename $(@:.chkexe_=.chkexe)`;\
-	   log=`basename $(@:.chkexe_=.chklog)`; \
-	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer $${chkname} $$cmd $(SCRIPT_DEPEND); then \
-	      echo "No need to test $${tname} again."; \
-	   else \
-	      echo "============================" > $${log}; \
-	      if test "X$(FORTRAN_API)" = "Xyes"; then \
-	         echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(CXX_API)" = "Xyes"; then \
-	         echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      else \
-	         echo "Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      fi; \
-	      echo "============================" >> $${log}; \
-	      RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
-	      srcdir="$(srcdir)" \
-	         $(TIME) $(SHELL) $$cmd $(TEST_FLAGS) >> $${log} 2>&1 \
-	         && touch $${chkname} || \
-	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	         (cat $${log} && false) || exit 1; \
-	      echo "" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
-	      echo "============================" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
-	      cat $${log}; \
-	   fi; \
-	   echo "============================"; \
-	fi
-
-# Actual execution of check-p.
-build-check-p: $(LIB) $(PROGS) $(chk_TESTS)
-	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
-	   echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
-	fi
-	@if test -n "$(TEST_PROG_PARA)"; then                                \
-	    echo "**** Hint ****";                                            \
-	    echo "Parallel test files reside in the current directory"        \
-	         "by default.";                                               \
-	    echo "Set HDF5_PARAPREFIX to use another directory. E.g.,";       \
-	    echo "    HDF5_PARAPREFIX=/PFS/user/me";                          \
-	    echo "    export HDF5_PARAPREFIX";                                \
-	    echo "    make check";                                            \
-	    echo "**** end of Hint ****";                                     \
-	fi
-	@for test in $(TEST_PROG_PARA) dummy; do                             \
-	   if test $$test != dummy; then                                      \
-	      $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ \
-	      RUNEXEC="$(RUNPARALLEL)" || exit 1; \
-	   fi;                                                                \
-	done
-	@for test in $(TEST_SCRIPT_PARA) dummy; do                           \
-	  if test $$test != dummy; then                                      \
-	    $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ || exit 1; \
-	  fi;                                                                 \
-	done
-	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
-	    echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
-	fi
-
-# Run test with different Virtual File Driver
-check-vfd: $(LIB) $(PROGS) $(chk_TESTS)
-	@for vfd in $(VFD_LIST) dummy; do                                     \
-	    if test $$vfd != dummy; then                                      \
-	        echo "============================";                          \
-	        echo "Testing Virtual File Driver $$vfd";                     \
-	        echo "============================";                          \
-	        $(MAKE) $(AM_MAKEFLAGS) check-clean || exit 1;                \
-	        HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check || exit 1;    \
-	    fi;                                                               \
-	done
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/c++/src/cpp_doc_config b/c++/src/cpp_doc_config
index f2caed2..a3595bf 100644
--- a/c++/src/cpp_doc_config
+++ b/c++/src/cpp_doc_config
@@ -32,13 +32,13 @@ DOXYFILE_ENCODING      = UTF-8
 # title of most generated pages and in a few other places.
 # The default value is: My Project.
 
-PROJECT_NAME           = "HDF5 C++ API"
+PROJECT_NAME           =
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. This
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.8.13
+PROJECT_NUMBER         = "1.15.0"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
@@ -51,7 +51,7 @@ PROJECT_BRIEF          =
 # and the maximum width should not exceed 200 pixels. Doxygen will copy the logo
 # to the output directory.
 
-PROJECT_LOGO           = ./header_files/hdf_logo.jpg
+PROJECT_LOGO           =
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
 # into which the generated documentation will be written. If a relative path is
@@ -873,7 +873,7 @@ EXAMPLE_RECURSIVE      = NO
 # that contain images that are to be included in the documentation (see the
 # \image command).
 
-IMAGE_PATH             = 
+IMAGE_PATH             = ./header_files
 
 # The INPUT_FILTER tag can be used to specify a program that doxygen should
 # invoke to filter for each input file. Doxygen will invoke the filter program
@@ -1010,7 +1010,7 @@ USE_HTAGS              = NO
 VERBATIM_HEADERS       = YES
 
 # If the CLANG_ASSISTED_PARSING tag is set to YES, then doxygen will use the
-# clang parser (see: http://clang.llvm.org/) for more acurate parsing at the
+# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the
 # cost of reduced performance. This can be particularly helpful with template
 # rich C++ code for which doxygen's built-in parser lacks the necessary type
 # information.
@@ -1106,7 +1106,7 @@ HTML_HEADER            =
 # that doxygen normally uses.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_FOOTER            = 
+HTML_FOOTER            = footer.html
 
 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
 # sheet that is used by each HTML page. It can be used to fine-tune the look of
@@ -1124,7 +1124,7 @@ HTML_STYLESHEET        =
 # defined cascading style sheet that is included after the standard style sheets
 # created by doxygen. Using this option one can overrule certain style aspects.
 # This is preferred over using HTML_STYLESHEET since it does not replace the
-# standard style sheet and is therefor more robust against future updates.
+# standard style sheet and is therefore more robust against future updates.
 # Doxygen will copy the style sheet file to the output directory. For an example
 # see the documentation.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1139,7 +1139,8 @@ HTML_EXTRA_STYLESHEET  =
 # files will be copied as-is; there are no commands or markers available.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_EXTRA_FILES       = 
+HTML_EXTRA_FILES       = ./header_files/help.jpg \
+                         ./C2Cppfunction_map.htm
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the stylesheet and background images according to
@@ -2008,7 +2009,7 @@ PREDEFINED             = DOXYGEN_SHOULD_SKIP_THIS
 EXPAND_AS_DEFINED      = 
 
 # If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
-# remove all refrences to function-like macros that are alone on a line, have an
+# remove all references to function-like macros that are alone on a line, have an
 # all uppercase name, and do not end with a semicolon. Such function macros are
 # typically used for boiler-plate code, and will confuse the parser if not
 # removed.
diff --git a/c++/src/footer.html b/c++/src/footer.html
new file mode 100644
index 0000000..7592925
--- /dev/null
+++ b/c++/src/footer.html
@@ -0,0 +1,22 @@
+
+<!-- INCLUDE VIA PHP FROM <doc_root>/ed_libs/Footer.htm -->
+
+<address>
+<p><hr/></p>
+<table width="100%" border="0">
+  <tr valign="top">
+      <td align="left">
+          <address>
+          <em> The HDF Group Help Desk:</em> <img src="help.jpg" align=top height=16>
+          </address>
+      </td><td width="5%">&nbsp;</td>
+      <td align="right">
+          Copyright by
+          The HDF Group
+      </td>   
+  </tr>   
+</table>
+</address>
+
+<!-- END PHP INCLUDE FROM <doc_root>/ed_libs/Footer.htm -->
+
diff --git a/c++/src/h5c++.in b/c++/src/h5c++.in
index 069842a..078fa73 100644
--- a/c++/src/h5c++.in
+++ b/c++/src/h5c++.in
@@ -1,17 +1,14 @@
 #! /bin/sh
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 #
 
 ############################################################################
@@ -37,10 +34,10 @@ HL="@HL@"
 ## (Advanced usage - know what you're doing - you're on your own here.)   ##
 ## The four variables below can be used to insert paths and flags in      ##
 ## CPPFLAGS, CXXFLAGS, LDFLAGS, or LIBS in the h5cc compile line:         ##
-##    $CLINKER $H5BLD_CPPFLAGS $CPPFLAGS $H5BLD_CXXFLAGS $CXXFLAGS        ##
+##    $CXXLINKER $H5BLD_CPPFLAGS $CPPFLAGS $H5BLD_CXXFLAGS $CXXFLAGS      ##
 ##    $LDFLAGS $LIBS $clibpath $link_objs $link_args $shared_link         ##
 ##                                                                        ##
-## These settings can be overriden by setting HDF5_CXXFLAGS,              ##
+## These settings can be overridden by setting HDF5_CXXFLAGS,             ##
 ## HDF5_CPPFLAGS, HDF5_LDFLAGS, or HDF5_LIBS in the environment.          ##
 ##                                                                        ##
 ############################################################################
@@ -95,7 +92,7 @@ H5BLD_LDFLAGS="@AM_LDFLAGS@ @LDFLAGS@"
 H5BLD_LIBS="@LIBS@"
 
 CXX="${HDF5_CXX:-$CXXBASE}"
-CXXLINKER="${HDF5_CLINKER:-$CXXLINKERBASE}"
+CXXLINKER="${HDF5_CXXLINKER:-$CXXLINKERBASE}"
 CXXFLAGS="${HDF5_CXXFLAGS:-$CXXFLAGSBASE}"
 CPPFLAGS="${HDF5_CPPFLAGS:-$CPPFLAGSBASE}"
 LDFLAGS="${HDF5_LDFLAGS:-$LDFLAGSBASE}"
@@ -142,7 +139,7 @@ usage() {
   echo "                                 [default: no except when built with only"
   echo "                                           shared libraries]"
   echo " You can also add or change paths and flags to the compile line using"
-  echo " the following environment varibles or by assigning them to their counterparts"
+  echo " the following environment variables or by assigning them to their counterparts"
   echo " in the 'Things You Can Modify to Override...'" section of $prog_name
   echo " "
   echo "  Variable              Current value to be replaced"
@@ -205,7 +202,7 @@ for arg in $@ ; do
       compile_args="$compile_args $arg"
 
       if test "x$do_link" = "xyes" -a -n "$output_file"; then
-        compile_args="$compile_args -o $outputfile"
+        compile_args="$compile_args -o $output_file"
       fi
 
       do_link="no"
@@ -313,7 +310,7 @@ fi
 
 if test "x$do_link" = "xyes"; then
   shared_link=""
-  # conditionnaly link with the hl library  
+  # conditionally link with the hl library
   if test "X$HL" = "Xhl"; then
    libraries=" $libraries -lhdf5_hl_cpp -lhdf5_cpp -lhdf5_hl -lhdf5 "
   else
diff --git a/c++/src/header.html b/c++/src/header.html
index c3018d7..8bacd7c 100644
--- a/c++/src/header.html
+++ b/c++/src/header.html
@@ -7,17 +7,14 @@ xmlns="http://www.w3.org/TR/REC-html40">
 <!--
   * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
   * Copyright by The HDF Group.                                               *
-  * Copyright by the Board of Trustees of the University of Illinois.         *
   * All rights reserved.                                                      *
   *                                                                           *
   * This file is part of HDF5.  The full HDF5 copyright notice, including     *
   * terms governing use, modification, and redistribution, is contained in    *
-  * the files COPYING and Copyright.html.  COPYING can be found at the root   *
-  * of the source code distribution tree; Copyright.html can be found at the  *
-  * root level of an installed copy of the electronic HDF5 document set and   *
-  * is linked from the top-level documents page.  It can also be found at     *
-  * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-  * access to either file, you may request a copy from help@hdfgroup.org.     *
+  * the COPYING file, which can be found at the root of the source code       *
+  * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+  * If you do not have access to either file, you may request a copy from     *
+  * help@hdfgroup.org.                                                        *
   * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  -->
 
@@ -345,7 +342,7 @@ p.MsoNormal
 
 <p class=MsoNormal style='margin-top:0in;margin-right:15.0pt;margin-bottom:
 0in;margin-left:15.0pt;margin-bottom:.0001pt'><span style='color:black'><span
-style='mso-spacerun:yes'>�</span></span><b style='mso-bidi-font-weight:normal'><span
+style='mso-spacerun:yes'> </span></span><b style='mso-bidi-font-weight:normal'><span
 style='font-size:22.0pt;color:black'><o:p></o:p></span></b></p>
 
 <div align=center>
diff --git a/c++/test/CMakeLists.txt b/c++/test/CMakeLists.txt
index dcdf3a3..55aade2 100644
--- a/c++/test/CMakeLists.txt
+++ b/c++/test/CMakeLists.txt
@@ -1,5 +1,6 @@
-cmake_minimum_required (VERSION 3.1.0)
-PROJECT (HDF5_CPP_TEST)
+cmake_minimum_required (VERSION 3.18)
+project (HDF5_CPP_TEST CXX)
+
 # --------------------------------------------------------------------
 # Notes: When creating unit test executables they should be prefixed
 # with "cpp_". This allows for easier filtering of the test suite when
@@ -11,14 +12,16 @@ PROJECT (HDF5_CPP_TEST)
 #-----------------------------------------------------------------------------
 # Define Sources
 #-----------------------------------------------------------------------------
-set (CPP_TEST_SRCS
+set (CPP_TEST_SOURCES
     ${HDF5_CPP_TEST_SOURCE_DIR}/testhdf5.cpp
+    ${HDF5_CPP_TEST_SOURCE_DIR}/tarray.cpp
     ${HDF5_CPP_TEST_SOURCE_DIR}/tattr.cpp
     ${HDF5_CPP_TEST_SOURCE_DIR}/tcompound.cpp
     ${HDF5_CPP_TEST_SOURCE_DIR}/tdspl.cpp
     ${HDF5_CPP_TEST_SOURCE_DIR}/tfile.cpp
     ${HDF5_CPP_TEST_SOURCE_DIR}/tfilter.cpp
     ${HDF5_CPP_TEST_SOURCE_DIR}/th5s.cpp
+    ${HDF5_CPP_TEST_SOURCE_DIR}/titerate.cpp
     ${HDF5_CPP_TEST_SOURCE_DIR}/tlinks.cpp
     ${HDF5_CPP_TEST_SOURCE_DIR}/tobject.cpp
     ${HDF5_CPP_TEST_SOURCE_DIR}/trefer.cpp
@@ -34,24 +37,33 @@ set (CPP_TEST_SRCS
 set (srcdir ${CMAKE_CURRENT_SOURCE_DIR})
 configure_file (${HDF5_CPP_TEST_SOURCE_DIR}/H5srcdir_str.h.in H5srcdir_str.h  @ONLY)
 
-add_executable (cpp_testhdf5 ${CPP_TEST_SRCS} )
-TARGET_NAMING (cpp_testhdf5 ${LIB_TYPE})
-TARGET_C_PROPERTIES (cpp_testhdf5 ${LIB_TYPE} " " " ")
-target_link_libraries (cpp_testhdf5
-    ${HDF5_CPP_LIB_TARGET}
-    ${HDF5_LIB_TARGET}
-    ${HDF5_TEST_LIB_TARGET}
-)
-set_target_properties (cpp_testhdf5 PROPERTIES
-    FOLDER test/cpp
-    INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
+add_executable (cpp_testhdf5 ${CPP_TEST_SOURCES} ${HDF5_CPP_TEST_SOURCE_DIR}/h5cpputil.h)
+target_include_directories (cpp_testhdf5 PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};${HDF5_TEST_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+target_compile_options(cpp_testhdf5 PRIVATE "${HDF5_CMAKE_CXX_FLAGS}")
+target_compile_definitions(cpp_testhdf5
+    PRIVATE $<$<BOOL:${HDF5_ENABLE_PARALLEL}>:MPICH_SKIP_MPICXX;MPICH_IGNORE_CXX_SEEK># Parallel/MPI, prevent spurious cpp/cxx warnings
 )
+if (NOT BUILD_SHARED_LIBS)
+  TARGET_C_PROPERTIES (cpp_testhdf5 STATIC)
+  target_link_libraries (cpp_testhdf5 PRIVATE ${HDF5_CPP_LIB_TARGET} ${HDF5_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
+else ()
+  TARGET_C_PROPERTIES (cpp_testhdf5 SHARED)
+  target_link_libraries (cpp_testhdf5 PRIVATE ${HDF5_CPP_LIBSH_TARGET} ${HDF5_LIBSH_TARGET} ${HDF5_TEST_LIBSH_TARGET})
+  if (MINGW AND HDF5_MINGW_STATIC_GCC_LIBS)
+    target_link_options (${HDF5_CPP_LIBSH_TARGET}
+        PRIVATE -static-libgcc -static-libstdc++
+    )
+  endif ()
+endif ()
+set_target_properties (cpp_testhdf5 PROPERTIES FOLDER test/cpp)
 
-add_custom_command (
-    TARGET     cpp_testhdf5
-    POST_BUILD
-    COMMAND    ${CMAKE_COMMAND}
-    ARGS       -E copy_if_different ${HDF5_CPP_TEST_SOURCE_DIR}/th5s.h5 ${PROJECT_BINARY_DIR}/th5s.h5
-)
+#-----------------------------------------------------------------------------
+# Add Target to clang-format
+#-----------------------------------------------------------------------------
+if (HDF5_ENABLE_FORMATTERS)
+  clang_format (HDF5_CPP_TEST_cpp_testhdf5_FORMAT cpp_testhdf5)
+endif ()
 
-include (CMakeTests.cmake)
+if (HDF5_TEST_CPP AND HDF5_TEST_SERIAL)
+  include (CMakeTests.cmake)
+endif ()
diff --git a/c++/test/CMakeTests.cmake b/c++/test/CMakeTests.cmake
index c725f69..fc94a68 100644
--- a/c++/test/CMakeTests.cmake
+++ b/c++/test/CMakeTests.cmake
@@ -1,72 +1,47 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
+HDFTEST_COPY_FILE("${HDF5_CPP_TEST_SOURCE_DIR}/th5s.h5" "${PROJECT_BINARY_DIR}/th5s.h5" "cpp_testhdf5_files")
+add_custom_target(cpp_testhdf5_files ALL COMMENT "Copying files needed by cpp_testhdf5 tests" DEPENDS ${cpp_testhdf5_files_list})
 
 ##############################################################################
 ##############################################################################
 ###           T E S T I N G                                                ###
 ##############################################################################
 ##############################################################################
-# Remove any output file left over from previous test run
-add_test (
-    NAME CPP_testhdf5-clear-objects
-    COMMAND    ${CMAKE_COMMAND}
-        -E remove 
-            tattr_basic.h5
-            tattr_compound.h5
-            tattr_dtype.h5
-            tattr_multi.h5
-            tattr_scalar.h5
-            tfattrs.h5
+if (HDF5_ENABLE_USING_MEMCHECKER)
+  add_test (NAME CPP_testhdf5 COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:cpp_testhdf5>)
+else ()
+  add_test (NAME CPP_testhdf5 COMMAND "${CMAKE_COMMAND}"
+      -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
+      -D "TEST_PROGRAM=$<TARGET_FILE:cpp_testhdf5>"
+      -D "TEST_ARGS:STRING="
+      -D "TEST_EXPECT=0"
+      -D "TEST_SKIP_COMPARE=TRUE"
+      -D "TEST_OUTPUT=cpp_testhdf5.txt"
+      #-D "TEST_REFERENCE=cpp_testhdf5.out"
+      -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+      -P "${HDF_RESOURCES_DIR}/runTest.cmake"
+  )
+endif ()
+set_tests_properties (CPP_testhdf5 PROPERTIES
+    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
 )
 
-add_test (NAME CPP_testhdf5 COMMAND $<TARGET_FILE:cpp_testhdf5>)
-set_tests_properties (CPP_testhdf5 PROPERTIES DEPENDS CPP_testhdf5-clear-objects)
+##############################################################################
+##############################################################################
+###                         V F D   T E S T S                              ###
+##############################################################################
+##############################################################################
 
 if (HDF5_TEST_VFD)
-
-  set (VFD_LIST
-      sec2
-      stdio
-      core
-      split
-      multi
-      family
-  )
-  
-  if (DIRECT_VFD)
-    set (VFD_LIST ${VFD_LIST} direct)
-  endif (DIRECT_VFD)
-
-  MACRO (ADD_VFD_TEST vfdname resultcode)
-    if (NOT HDF5_ENABLE_USING_MEMCHECKER)
-      add_test (
-          NAME CPP_VFD-${vfdname}-cpp_testhdf5-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove 
-                  tattr_basic.h5
-                  tattr_compound.h5
-                  tattr_dtype.h5
-                  tattr_multi.h5
-                  tattr_scalar.h5
-                  tfattrs.h5
-      )
-      add_test (
-        NAME CPP_VFD-${vfdname}-cpp_testhdf5 
-        COMMAND "${CMAKE_COMMAND}"
-            -D "TEST_PROGRAM=$<TARGET_FILE:cpp_testhdf5>"
-            -D "TEST_ARGS:STRING="
-            -D "TEST_VFD:STRING=${vfdname}"
-            -D "TEST_EXPECT=${resultcode}"
-            -D "TEST_OUTPUT=cpp_testhdf5"
-            -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-            -P "${HDF_RESOURCES_DIR}/vfdTest.cmake"
-      )
-      set_tests_properties (CPP_VFD-${vfdname}-cpp_testhdf5 PROPERTIES DEPENDS CPP_VFD-${vfdname}-cpp_testhdf5-clear-objects)
-      set_tests_properties (CPP_VFD-${vfdname}-cpp_testhdf5 PROPERTIES TIMEOUT 30)
-    endif (NOT HDF5_ENABLE_USING_MEMCHECKER)
-  ENDMACRO (ADD_VFD_TEST)
-  
-  # Run test with different Virtual File Driver
-  foreach (vfd ${VFD_LIST})
-    ADD_VFD_TEST (${vfd} 0)
-  endforeach (vfd ${VFD_LIST})
-
-endif (HDF5_TEST_VFD)
+  include (CMakeVFDTests.cmake)
+endif ()
diff --git a/c++/test/CMakeVFDTests.cmake b/c++/test/CMakeVFDTests.cmake
new file mode 100644
index 0000000..5405df3
--- /dev/null
+++ b/c++/test/CMakeVFDTests.cmake
@@ -0,0 +1,46 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
+
+##############################################################################
+##############################################################################
+###           T E S T I N G                                                ###
+##############################################################################
+##############################################################################
+H5_CREATE_VFD_DIR()
+
+##############################################################################
+##############################################################################
+###           T H E   T E S T S  M A C R O S                               ###
+##############################################################################
+##############################################################################
+macro (ADD_VFD_TEST vfdname resultcode)
+  if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+    add_test (
+        NAME CPP_VFD-${vfdname}-cpp_testhdf5
+        COMMAND "${CMAKE_COMMAND}"
+            -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
+            -D "TEST_PROGRAM=$<TARGET_FILE:cpp_testhdf5>"
+            -D "TEST_ARGS:STRING="
+            -D "TEST_VFD:STRING=${vfdname}"
+            -D "TEST_EXPECT=${resultcode}"
+            -D "TEST_OUTPUT=${vfdname}-cpp_testhdf5.out"
+            -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/${vfdname}"
+            -P "${HDF_RESOURCES_DIR}/vfdTest.cmake"
+    )
+    set_tests_properties (CPP_VFD-${vfdname}-cpp_testhdf5 PROPERTIES TIMEOUT ${CTEST_SHORT_TIMEOUT})
+  endif ()
+endmacro ()
+
+# Run test with different Virtual File Driver
+foreach (vfd ${VFD_LIST})
+  ADD_VFD_TEST (${vfd} 0)
+endforeach ()
diff --git a/c++/test/H5srcdir_str.h.in b/c++/test/H5srcdir_str.h.in
index d472124..55280cd 100644
--- a/c++/test/H5srcdir_str.h.in
+++ b/c++/test/H5srcdir_str.h.in
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /* If you are reading this file and it has a '.h' suffix, it was automatically
diff --git a/c++/test/Makefile.am b/c++/test/Makefile.am
index 2717e9c..d513d95 100644
--- a/c++/test/Makefile.am
+++ b/c++/test/Makefile.am
@@ -1,16 +1,13 @@
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 ##
 ## Makefile.am
 ## Run automake to generate a Makefile.in from this file.
@@ -23,12 +20,6 @@ include $(top_srcdir)/config/commence.am
 # Include src, test, and c++/src directories
 AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/c++/src
 
-# Shared C++ libraries aren't universally supported.
-if CXX_SHARED_CONDITIONAL
-else
-  AM_LDFLAGS+=-static
-endif
-
 # These are our main targets.  They should be listed in the order to be
 # executed, generally most specific tests to least specific tests.
 TEST_PROG=testhdf5
@@ -37,9 +28,10 @@ check_PROGRAMS=$(TEST_PROG)
 # The tests depend on the hdf5 library, test library, and the c++ library
 LDADD=$(LIBH5TEST) $(LIBH5CPP) $(LIBHDF5)
 
-testhdf5_SOURCES=testhdf5.cpp dsets.cpp tattr.cpp tcompound.cpp	\
-	tdspl.cpp tfile.cpp tfilter.cpp th5s.cpp tlinks.cpp tobject.cpp \
-	trefer.cpp ttypes.cpp tvlstr.cpp h5cpputil.cpp
+testhdf5_SOURCES=testhdf5.cpp dsets.cpp tattr.cpp tarray.cpp	\
+	tcompound.cpp tdspl.cpp tfile.cpp tfilter.cpp th5s.cpp	\
+	tlinks.cpp tobject.cpp trefer.cpp ttypes.cpp tvlstr.cpp	\
+	titerate.cpp h5cpputil.cpp
 
 # Tell conclude.am that these are C++ tests.
 CXX_API=yes
diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in
deleted file mode 100644
index d359186..0000000
--- a/c++/test/Makefile.in
+++ /dev/null
@@ -1,1377 +0,0 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-#
-# HDF5-C++ Makefile(.in)
-#
-VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-DIST_COMMON = $(top_srcdir)/config/commence.am \
-	$(top_srcdir)/config/conclude.am $(srcdir)/Makefile.in \
-	$(srcdir)/Makefile.am $(top_srcdir)/bin/mkinstalldirs \
-	$(srcdir)/H5srcdir_str.h.in $(top_srcdir)/bin/depcomp \
-	$(top_srcdir)/bin/test-driver
-
-# Shared C++ libraries aren't universally supported.
-@CXX_SHARED_CONDITIONAL_FALSE@am__append_1 = -static
-check_PROGRAMS = $(am__EXEEXT_1)
-TESTS = $(am__EXEEXT_1)
-subdir = c++/test
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/aclocal_cxx.m4 \
-	$(top_srcdir)/m4/aclocal_fc.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/src/H5config.h
-CONFIG_CLEAN_FILES = H5srcdir_str.h
-CONFIG_CLEAN_VPATH_FILES =
-am__EXEEXT_1 = testhdf5$(EXEEXT)
-am_testhdf5_OBJECTS = testhdf5.$(OBJEXT) dsets.$(OBJEXT) \
-	tattr.$(OBJEXT) tcompound.$(OBJEXT) tdspl.$(OBJEXT) \
-	tfile.$(OBJEXT) tfilter.$(OBJEXT) th5s.$(OBJEXT) \
-	tlinks.$(OBJEXT) tobject.$(OBJEXT) trefer.$(OBJEXT) \
-	ttypes.$(OBJEXT) tvlstr.$(OBJEXT) h5cpputil.$(OBJEXT)
-testhdf5_OBJECTS = $(am_testhdf5_OBJECTS)
-testhdf5_LDADD = $(LDADD)
-testhdf5_DEPENDENCIES = $(LIBH5TEST) $(LIBH5CPP) $(LIBHDF5)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 = 
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
-depcomp = $(SHELL) $(top_srcdir)/bin/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS)
-AM_V_CXX = $(am__v_CXX_@AM_V@)
-am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
-am__v_CXX_0 = @echo "  CXX     " $@;
-am__v_CXX_1 = 
-CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
-am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
-am__v_CXXLD_0 = @echo "  CXXLD   " $@;
-am__v_CXXLD_1 = 
-SOURCES = $(testhdf5_SOURCES)
-DIST_SOURCES = $(testhdf5_SOURCES)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-am__tty_colors_dummy = \
-  mgn= red= grn= lgn= blu= brg= std=; \
-  am__color_tests=no
-am__tty_colors = { \
-  $(am__tty_colors_dummy); \
-  if test "X$(AM_COLOR_TESTS)" = Xno; then \
-    am__color_tests=no; \
-  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
-    am__color_tests=yes; \
-  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
-    am__color_tests=yes; \
-  fi; \
-  if test $$am__color_tests = yes; then \
-    red='[0;31m'; \
-    grn='[0;32m'; \
-    lgn='[1;32m'; \
-    blu='[1;34m'; \
-    mgn='[0;35m'; \
-    brg='[1m'; \
-    std='[m'; \
-  fi; \
-}
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__recheck_rx = ^[ 	]*:recheck:[ 	]*
-am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
-am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
-# A command that, given a newline-separated list of test names on the
-# standard input, print the name of the tests that are to be re-run
-# upon "make recheck".
-am__list_recheck_tests = $(AWK) '{ \
-  recheck = 1; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-        { \
-          if ((getline line2 < ($$0 ".log")) < 0) \
-	    recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
-        { \
-          recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
-        { \
-          break; \
-        } \
-    }; \
-  if (recheck) \
-    print $$0; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# A command that, given a newline-separated list of test names on the
-# standard input, create the global log from their .trs and .log files.
-am__create_global_log = $(AWK) ' \
-function fatal(msg) \
-{ \
-  print "fatal: making $@: " msg | "cat >&2"; \
-  exit 1; \
-} \
-function rst_section(header) \
-{ \
-  print header; \
-  len = length(header); \
-  for (i = 1; i <= len; i = i + 1) \
-    printf "="; \
-  printf "\n\n"; \
-} \
-{ \
-  copy_in_global_log = 1; \
-  global_test_result = "RUN"; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-         fatal("failed to read from " $$0 ".trs"); \
-      if (line ~ /$(am__global_test_result_rx)/) \
-        { \
-          sub("$(am__global_test_result_rx)", "", line); \
-          sub("[ 	]*$$", "", line); \
-          global_test_result = line; \
-        } \
-      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
-        copy_in_global_log = 0; \
-    }; \
-  if (copy_in_global_log) \
-    { \
-      rst_section(global_test_result ": " $$0); \
-      while ((rc = (getline line < ($$0 ".log"))) != 0) \
-      { \
-        if (rc < 0) \
-          fatal("failed to read from " $$0 ".log"); \
-        print line; \
-      }; \
-      printf "\n"; \
-    }; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# Restructured Text title.
-am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
-# Solaris 10 'make', and several other traditional 'make' implementations,
-# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
-# by disabling -e (using the XSI extension "set +e") if it's set.
-am__sh_e_setup = case $$- in *e*) set +e;; esac
-# Default flags passed to test drivers.
-am__common_driver_flags = \
-  --color-tests "$$am__color_tests" \
-  --enable-hard-errors "$$am__enable_hard_errors" \
-  --expect-failure "$$am__expect_failure"
-# To be inserted before the command running the test.  Creates the
-# directory for the log if needed.  Stores in $dir the directory
-# containing $f, in $tst the test, in $log the log.  Executes the
-# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
-# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
-# will run the test scripts (or their associated LOG_COMPILER, if
-# thy have one).
-am__check_pre = \
-$(am__sh_e_setup);					\
-$(am__vpath_adj_setup) $(am__vpath_adj)			\
-$(am__tty_colors);					\
-srcdir=$(srcdir); export srcdir;			\
-case "$@" in						\
-  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
-    *) am__odir=.;; 					\
-esac;							\
-test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
-  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
-if test -f "./$$f"; then dir=./;			\
-elif test -f "$$f"; then dir=;				\
-else dir="$(srcdir)/"; fi;				\
-tst=$$dir$$f; log='$@'; 				\
-if test -n '$(DISABLE_HARD_ERRORS)'; then		\
-  am__enable_hard_errors=no; 				\
-else							\
-  am__enable_hard_errors=yes; 				\
-fi; 							\
-case " $(XFAIL_TESTS) " in				\
-  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
-    am__expect_failure=yes;;				\
-  *)							\
-    am__expect_failure=no;;				\
-esac; 							\
-$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
-# A shell command to get the names of the tests scripts with any registered
-# extension removed (i.e., equivalently, the names of the test logs, with
-# the '.log' extension removed).  The result is saved in the shell variable
-# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
-# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
-# since that might cause problem with VPATH rewrites for suffix-less tests.
-# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
-am__set_TESTS_bases = \
-  bases='$(TEST_LOGS)'; \
-  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
-  bases=`echo $$bases`
-RECHECK_LOGS = $(TEST_LOGS)
-AM_RECURSIVE_TARGETS = check recheck
-TEST_SUITE_LOG = test-suite.log
-LOG_DRIVER = $(SHELL) $(top_srcdir)/bin/test-driver
-LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
-am__set_b = \
-  case '$@' in \
-    */*) \
-      case '$*' in \
-        */*) b='$*';; \
-          *) b=`echo '$@' | sed 's/\.log$$//'`; \
-       esac;; \
-    *) \
-      b='$*';; \
-  esac
-am__test_logs1 = $(TESTS:=.log)
-am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
-TEST_LOGS = $(am__test_logs2:.sh.log=.log)
-SH_LOG_DRIVER = $(SHELL) $(top_srcdir)/bin/test-driver
-SH_LOG_COMPILE = $(SH_LOG_COMPILER) $(AM_SH_LOG_FLAGS) $(SH_LOG_FLAGS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
-AMTAR = @AMTAR@
-
-# H5_CFLAGS holds flags that should be used when building hdf5,
-# but which should not be exported to h5cc for building other programs.
-# AM_CFLAGS is an automake construct which should be used by Makefiles 
-# instead of CFLAGS, as CFLAGS is reserved solely for the user to define.
-# This applies to FCFLAGS, CXXFLAGS, CPPFLAGS, and LDFLAGS as well.
-AM_CFLAGS = @AM_CFLAGS@ @H5_CFLAGS@
-
-# Include src, test, and c++/src directories
-AM_CPPFLAGS = @AM_CPPFLAGS@ @H5_CPPFLAGS@ -I$(top_srcdir)/src \
-	-I$(top_srcdir)/test -I$(top_srcdir)/c++/src
-AM_CXXFLAGS = @AM_CXXFLAGS@ @H5_CXXFLAGS@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@
-AM_LDFLAGS = @AM_LDFLAGS@ @H5_LDFLAGS@ $(am__append_1)
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BYTESEX = @BYTESEX@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CC_VERSION = @CC_VERSION@
-CFLAGS = @CFLAGS@
-CLEARFILEBUF = @CLEARFILEBUF@
-CODESTACK = @CODESTACK@
-CONFIG_DATE = @CONFIG_DATE@
-CONFIG_MODE = @CONFIG_MODE@
-CONFIG_USER = @CONFIG_USER@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CXX_VERSION = @CXX_VERSION@
-CYGPATH_W = @CYGPATH_W@
-DEBUG_PKG = @DEBUG_PKG@
-DEFAULT_API_VERSION = @DEFAULT_API_VERSION@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
-DIRECT_VFD = @DIRECT_VFD@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-EXTERNAL_FILTERS = @EXTERNAL_FILTERS@
-
-# Make sure that these variables are exported to the Makefiles
-F9XMODEXT = @F9XMODEXT@
-F9XMODFLAG = @F9XMODFLAG@
-F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
-FC = @FC@
-FC2003 = @FC2003@
-FCFLAGS = @FCFLAGS@
-FCFLAGS_f90 = @FCFLAGS_f90@
-FCLIBS = @FCLIBS@
-FC_VERSION = @FC_VERSION@
-FGREP = @FGREP@
-FSEARCH_DIRS = @FSEARCH_DIRS@
-GREP = @GREP@
-H5_CFLAGS = @H5_CFLAGS@
-H5_CPPFLAGS = @H5_CPPFLAGS@
-H5_CXXFLAGS = @H5_CXXFLAGS@
-H5_CXX_SHARED = @H5_CXX_SHARED@
-H5_FCFLAGS = @H5_FCFLAGS@
-H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@
-H5_LDFLAGS = @H5_LDFLAGS@
-H5_LONE_COLON = @H5_LONE_COLON@
-H5_VERSION = @H5_VERSION@
-HADDR_T = @HADDR_T@
-HAVE_DMALLOC = @HAVE_DMALLOC@
-HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@
-HAVE_PTHREAD = @HAVE_PTHREAD@
-HDF5_HL = @HDF5_HL@
-HDF5_INTERFACES = @HDF5_INTERFACES@
-HDF_CXX = @HDF_CXX@
-HDF_FORTRAN = @HDF_FORTRAN@
-HDF_FORTRAN2003 = @HDF_FORTRAN2003@
-HID_T = @HID_T@
-HL = @HL@
-HL_FOR = @HL_FOR@
-HSIZE_T = @HSIZE_T@
-HSSIZE_T = @HSSIZE_T@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTRUMENT = @INSTRUMENT@
-INSTRUMENT_LIBRARY = @INSTRUMENT_LIBRARY@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LL_PATH = @LL_PATH@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_STATIC_EXEC = @LT_STATIC_EXEC@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MPE = @MPE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJECT_NAMELEN_DEFAULT_F = @OBJECT_NAMELEN_DEFAULT_F@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PARALLEL = @PARALLEL@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-RANLIB = @RANLIB@
-ROOT = @ROOT@
-RUNPARALLEL = @RUNPARALLEL@
-RUNSERIAL = @RUNSERIAL@
-R_INTEGER = @R_INTEGER@
-R_LARGE = @R_LARGE@
-SEARCH = @SEARCH@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SIZE_T = @SIZE_T@
-STATIC_EXEC = @STATIC_EXEC@
-STATIC_SHARED = @STATIC_SHARED@
-STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@
-STRIP = @STRIP@
-TESTPARALLEL = @TESTPARALLEL@
-THREADSAFE = @THREADSAFE@
-TIME = @TIME@
-TR = @TR@
-TRACE_API = @TRACE_API@
-UNAME_INFO = @UNAME_INFO@
-USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
-USE_FILTER_SZIP = @USE_FILTER_SZIP@
-USINGMEMCHECKER = @USINGMEMCHECKER@
-VERSION = @VERSION@
-WORDS_BIGENDIAN = @WORDS_BIGENDIAN@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_FC = @ac_ct_FC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-
-# Install directories that automake doesn't know about
-docdir = $(exec_prefix)/doc
-dvidir = @dvidir@
-enable_shared = @enable_shared@
-enable_static = @enable_static@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-
-# Shell commands used in Makefiles
-RM = rm -f
-CP = cp
-
-# Some machines need a command to run executables; this is that command
-# so that our tests will run.
-# We use RUNEXEC instead of RUNSERIAL directly because it may be that
-# some tests need to be run with a different command.  Older versions
-# of the makefiles used the command
-# $(LIBTOOL) --mode=execute
-# in some directories, for instance.
-RUNEXEC = $(RUNSERIAL)
-
-# Libraries to link to while building
-LIBHDF5 = $(top_builddir)/src/libhdf5.la
-LIBH5TEST = $(top_builddir)/test/libh5test.la
-LIBH5F = $(top_builddir)/fortran/src/libhdf5_fortran.la
-LIBH5FTEST = $(top_builddir)/fortran/test/libh5test_fortran.la
-LIBH5CPP = $(top_builddir)/c++/src/libhdf5_cpp.la
-LIBH5TOOLS = $(top_builddir)/tools/lib/libh5tools.la
-LIBH5_HL = $(top_builddir)/hl/src/libhdf5_hl.la
-LIBH5F_HL = $(top_builddir)/hl/fortran/src/libhdf5hl_fortran.la
-LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
-
-# Note that in svn revision 19400 the '/' after DESTDIR in H5* variables below  
-# has been removed. According to the official description of DESTDIR by Gnu at 
-# http://www.gnu.org/prep/standards/html_node/DESTDIR.html, DESTDIR is 
-# prepended to the normal and complete install path that it precedes for the 
-# purpose of installing in a temporary directory which is useful for building 
-# rpms and other packages.  The '/' after ${DESTDIR} will be followed by another 
-# '/' at the beginning of the normal install path.  When DESTDIR is empty the  
-# path then begins with '//', which is incorrect and causes problems at least for 
-# Cygwin.   
-
-# Scripts used to build examples
-# If only shared libraries have been installed, have h5cc build examples with
-# shared libraries instead of static libraries
-H5CC = ${DESTDIR}$(bindir)/h5cc
-H5CC_PP = ${DESTDIR}$(bindir)/h5pcc
-H5FC = ${DESTDIR}$(bindir)/h5fc
-H5FC_PP = ${DESTDIR}$(bindir)/h5pfc
-H5CPP = ${DESTDIR}$(bindir)/h5c++
-ACLOCAL_AMFLAGS = "-I m4"
-
-# The trace script; this is used on source files from the C library to
-# insert tracing macros.
-TRACE = perl $(top_srcdir)/bin/trace
-
-# .chkexe files are used to mark tests that have run successfully.
-# .chklog files are output from those tests.
-# *.clog and *.clog2 are from the MPE option.
-# Temporary files
-CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 tattr_multi.h5 \
-	tfattrs.h5 tattr_scalar.h5 tattr_compound.h5 tattr_dtype.h5 \
-	tattr_basic.h5
-
-# These are our main targets.  They should be listed in the order to be
-# executed, generally most specific tests to least specific tests.
-TEST_PROG = testhdf5
-
-# The tests depend on the hdf5 library, test library, and the c++ library
-LDADD = $(LIBH5TEST) $(LIBH5CPP) $(LIBHDF5)
-testhdf5_SOURCES = testhdf5.cpp dsets.cpp tattr.cpp tcompound.cpp	\
-	tdspl.cpp tfile.cpp tfilter.cpp th5s.cpp tlinks.cpp tobject.cpp \
-	trefer.cpp ttypes.cpp tvlstr.cpp h5cpputil.cpp
-
-
-# Tell conclude.am that these are C++ tests.
-CXX_API = yes
-
-# Automake needs to be taught how to build lib, progs, and tests targets.
-# These will be filled in automatically for the most part (e.g.,
-# lib_LIBRARIES are built for lib target), but EXTRA_LIB, EXTRA_PROG, and
-# EXTRA_TEST variables are supplied to allow the user to force targets to
-# be built at certain times. 
-LIB = $(lib_LIBRARIES) $(lib_LTLIBRARIES) $(noinst_LIBRARIES)                 \
-      $(noinst_LTLIBRARIES) $(check_LIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LIB)
-
-PROGS = $(bin_PROGRAMS) $(bin_SCRIPTS) $(noinst_PROGRAMS) $(noinst_SCRIPTS)   \
-        $(EXTRA_PROG)
-
-chk_TESTS = $(check_PROGRAMS) $(check_SCRIPTS) $(EXTRA_TEST) 
-TEST_EXTENSIONS = .sh
-SH_LOG_COMPILER = $(SHELL)
-AM_SH_LOG_FLAGS = 
-TEST_PROG_CHKEXE = $(TEST_PROG:=.chkexe_)
-TEST_PROG_PARA_CHKEXE = $(TEST_PROG_PARA:=.chkexe_)
-TEST_SCRIPT_CHKSH = $(TEST_SCRIPT:=.chkexe_)
-TEST_SCRIPT_PARA_CHKSH = $(TEST_SCRIPT_PARA:=.chkexe_)
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .cpp .lo .log .o .obj .sh .sh$(EXEEXT) .trs
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign c++/test/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign c++/test/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-$(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am:
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-H5srcdir_str.h: $(top_builddir)/config.status $(srcdir)/H5srcdir_str.h.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
-clean-checkPROGRAMS:
-	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-
-testhdf5$(EXEEXT): $(testhdf5_OBJECTS) $(testhdf5_DEPENDENCIES) $(EXTRA_testhdf5_DEPENDENCIES) 
-	@rm -f testhdf5$(EXEEXT)
-	$(AM_V_CXXLD)$(CXXLINK) $(testhdf5_OBJECTS) $(testhdf5_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dsets.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/h5cpputil.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tattr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tcompound.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tdspl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testhdf5.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tfile.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tfilter.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/th5s.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tlinks.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tobject.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trefer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ttypes.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tvlstr.Po@am__quote@
-
-.cpp.o:
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
-
-.cpp.obj:
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.cpp.lo:
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: ctags-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-# Recover from deleted '.trs' file; this should ensure that
-# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
-# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
-# to avoid problems with "make -n".
-.log.trs:
-	rm -f $< $@
-	$(MAKE) $(AM_MAKEFLAGS) $<
-
-# Leading 'am--fnord' is there to ensure the list of targets does not
-# expand to empty, as could happen e.g. with make check TESTS=''.
-am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
-am--force-recheck:
-	@:
-
-$(TEST_SUITE_LOG): $(TEST_LOGS)
-	@$(am__set_TESTS_bases); \
-	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
-	redo_bases=`for i in $$bases; do \
-	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
-	            done`; \
-	if test -n "$$redo_bases"; then \
-	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
-	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
-	  if $(am__make_dryrun); then :; else \
-	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
-	  fi; \
-	fi; \
-	if test -n "$$am__remaking_logs"; then \
-	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
-	       "recursion detected" >&2; \
-	else \
-	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
-	fi; \
-	if $(am__make_dryrun); then :; else \
-	  st=0;  \
-	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
-	  for i in $$redo_bases; do \
-	    test -f $$i.trs && test -r $$i.trs \
-	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
-	    test -f $$i.log && test -r $$i.log \
-	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
-	  done; \
-	  test $$st -eq 0 || exit 1; \
-	fi
-	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
-	ws='[ 	]'; \
-	results=`for b in $$bases; do echo $$b.trs; done`; \
-	test -n "$$results" || results=/dev/null; \
-	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
-	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
-	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
-	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
-	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
-	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
-	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
-	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
-	  success=true; \
-	else \
-	  success=false; \
-	fi; \
-	br='==================='; br=$$br$$br$$br$$br; \
-	result_count () \
-	{ \
-	    if test x"$$1" = x"--maybe-color"; then \
-	      maybe_colorize=yes; \
-	    elif test x"$$1" = x"--no-color"; then \
-	      maybe_colorize=no; \
-	    else \
-	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
-	    fi; \
-	    shift; \
-	    desc=$$1 count=$$2; \
-	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
-	      color_start=$$3 color_end=$$std; \
-	    else \
-	      color_start= color_end=; \
-	    fi; \
-	    echo "$${color_start}# $$desc $$count$${color_end}"; \
-	}; \
-	create_testsuite_report () \
-	{ \
-	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
-	  result_count $$1 "PASS: " $$pass  "$$grn"; \
-	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
-	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
-	  result_count $$1 "FAIL: " $$fail  "$$red"; \
-	  result_count $$1 "XPASS:" $$xpass "$$red"; \
-	  result_count $$1 "ERROR:" $$error "$$mgn"; \
-	}; \
-	{								\
-	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
-	    $(am__rst_title);						\
-	  create_testsuite_report --no-color;				\
-	  echo;								\
-	  echo ".. contents:: :depth: 2";				\
-	  echo;								\
-	  for b in $$bases; do echo $$b; done				\
-	    | $(am__create_global_log);					\
-	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
-	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
-	if $$success; then						\
-	  col="$$grn";							\
-	 else								\
-	  col="$$red";							\
-	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
-	fi;								\
-	echo "$${col}$$br$${std}"; 					\
-	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
-	echo "$${col}$$br$${std}"; 					\
-	create_testsuite_report --maybe-color;				\
-	echo "$$col$$br$$std";						\
-	if $$success; then :; else					\
-	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
-	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
-	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
-	  fi;								\
-	  echo "$$col$$br$$std";					\
-	fi;								\
-	$$success || exit 1
-recheck: all $(check_PROGRAMS)
-	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-	@set +e; $(am__set_TESTS_bases); \
-	bases=`for i in $$bases; do echo $$i; done \
-	         | $(am__list_recheck_tests)` || exit 1; \
-	log_list=`for i in $$bases; do echo $$i.log; done`; \
-	log_list=`echo $$log_list`; \
-	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
-	        am__force_recheck=am--force-recheck \
-	        TEST_LOGS="$$log_list"; \
-	exit $$?
-testhdf5.log: testhdf5$(EXEEXT)
-	@p='testhdf5$(EXEEXT)'; \
-	b='testhdf5'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-.sh.log:
-	@p='$<'; \
-	$(am__set_b); \
-	$(am__check_pre) $(SH_LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_SH_LOG_DRIVER_FLAGS) $(SH_LOG_DRIVER_FLAGS) -- $(SH_LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-@am__EXEEXT_TRUE@.sh$(EXEEXT).log:
-@am__EXEEXT_TRUE@	@p='$<'; \
-@am__EXEEXT_TRUE@	$(am__set_b); \
-@am__EXEEXT_TRUE@	$(am__check_pre) $(SH_LOG_DRIVER) --test-name "$$f" \
-@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
-@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_SH_LOG_DRIVER_FLAGS) $(SH_LOG_DRIVER_FLAGS) -- $(SH_LOG_COMPILE) \
-@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
-	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
-check: check-am
-all-am: Makefile all-local
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
-	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
-	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-local
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: check-am install-am install-strip
-
-.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-TESTS \
-	check-am clean clean-checkPROGRAMS clean-generic clean-libtool \
-	cscopelist-am ctags ctags-am distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
-	pdf-am ps ps-am recheck tags tags-am uninstall uninstall-am
-
-
-# List all build rules defined by HDF5 Makefiles as "PHONY" targets here.
-# This tells the Makefiles that these targets are not files to be built but
-# commands that should be executed even if a file with the same name already
-# exists.
-.PHONY: build-check-clean build-check-p build-check-s build-lib build-progs \
-        build-tests check-clean check-install check-p check-s check-vfd \
-        install-doc lib progs tests uninstall-doc _exec_check-s _test help
-
-help:
-	@$(top_srcdir)/bin/makehelp
-
-# Some C++ compilers/linkers (PGI?) create a directory named "ii_files" that
-# holds *.ii files, which are template entity instantiations.
-# This entire directory should be cleaned.
-mostlyclean-local:
-	@if test -d ii_files; then                                       \
-	  $(RM) -rf ii_files;                                           \
-	fi
-
-# lib/progs/tests targets recurse into subdirectories. build-* targets
-# build files in this directory.
-build-lib: $(LIB)
-build-progs: $(LIB) $(PROGS)
-build-tests: $(LIB) $(PROGS) $(chk_TESTS)
-
-# General rule for recursive building targets.
-# BUILT_SOURCES contain targets that need to be built before anything else
-# in the directory (e.g., for Fortran type detection)
-lib progs tests check-s check-p :: $(BUILT_SOURCES)
-	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
-	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X && test $$d != .; then                           \
-	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
-	    fi;                                                               \
-	done
-
-# General rule for recursive cleaning targets.  Like the rule above,
-# but doesn't require building BUILT_SOURCES.
-check-clean ::
-	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
-	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X && test $$d != .; then                           \
-	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
-	    fi;                                                               \
-	done
-
-# Tell Automake to build tests when the user types `make all' (this is
-# not its default behavior).  Also build EXTRA_LIB and EXTRA_PROG since
-# Automake won't build them automatically, either.
-all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(chk_TESTS)
-
-# make install-doc doesn't do anything outside of doc directory, but
-# Makefiles should recognize it.
-# UPDATE: docs no longer reside in this build tree, so this target
-# is depreciated.
-install-doc uninstall-doc:
-	@echo "Nothing to be done."
-
-# clean up files generated by tests so they can be re-run.
-build-check-clean:
-	$(RM) -rf $(CHECK_CLEANFILES)
-
-# run check-clean whenever mostlyclean is run
-mostlyclean-local: build-check-clean
-
-# check-install is just a synonym for installcheck
-check-install: installcheck
-
-# Run each test in order, passing $(TEST_FLAGS) to the program.
-# Since tests are done in a shell loop, "make -i" does apply inside it.
-# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
-# The timestamps give a rough idea how much time the tests use.
-#
-# Note that targets in chk_TESTS (defined above) will be built when the user
-# types 'make tests' or 'make check', but only programs in TEST_PROG,
-# TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
-check-TESTS: test
-
-test _test:
-	@$(MAKE) build-check-s
-	@$(MAKE) build-check-p
-
-# Actual execution of check-s.
-build-check-s: $(LIB) $(PROGS) $(chk_TESTS)
-	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
-	   echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
-	fi
-	@$(MAKE) $(AM_MAKEFLAGS) _exec_check-s
-	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
-	    echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
-	fi
-
-_exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH)
-
-# The dummy.chkexe here prevents the target from being
-# empty if there are no tests in the current directory.
-# $${log} is the log file.
-# $${tname} is the name of test.
-$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
-	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \
-	   tname=$(@:.chkexe_=)$(EXEEXT);\
-	   log=$(@:.chkexe_=.chklog); \
-	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \
-	      echo "No need to test $${tname} again."; \
-	   else \
-	      echo "============================" > $${log}; \
-	      if test "X$(FORTRAN_API)" = "Xyes"; then \
-	         echo "Fortran API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "Fortran API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(CXX_API)" = "Xyes"; then \
-	         echo "C++ API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "C++ API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log};\
-	      else \
-	         echo "Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "$(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      fi; \
-	      echo "============================" >> $${log}; \
-	      srcdir="$(srcdir)" \
-	         $(TIME) $(RUNEXEC) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \
-	         && touch $(@:.chkexe_=.chkexe) || \
-	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	         (cat $${log} && false) || exit 1; \
-	      echo "" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
-	      echo "============================" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
-	      cat $${log}; \
-	   fi; \
-	fi
-
-# The dummysh.chkexe here prevents the target from being
-# empty if there are no tests in the current directory.
-# $${log} is the log file.
-# $${tname} is the name of test.
-$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
-	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummysh.chkexe_"; then \
-	   cmd=$(@:.chkexe_=);\
-	   tname=`basename $$cmd`;\
-	   chkname=`basename $(@:.chkexe_=.chkexe)`;\
-	   log=`basename $(@:.chkexe_=.chklog)`; \
-	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer $${chkname} $$cmd $(SCRIPT_DEPEND); then \
-	      echo "No need to test $${tname} again."; \
-	   else \
-	      echo "============================" > $${log}; \
-	      if test "X$(FORTRAN_API)" = "Xyes"; then \
-	         echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(CXX_API)" = "Xyes"; then \
-	         echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      else \
-	         echo "Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      fi; \
-	      echo "============================" >> $${log}; \
-	      RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
-	      srcdir="$(srcdir)" \
-	         $(TIME) $(SHELL) $$cmd $(TEST_FLAGS) >> $${log} 2>&1 \
-	         && touch $${chkname} || \
-	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	         (cat $${log} && false) || exit 1; \
-	      echo "" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
-	      echo "============================" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
-	      cat $${log}; \
-	   fi; \
-	   echo "============================"; \
-	fi
-
-# Actual execution of check-p.
-build-check-p: $(LIB) $(PROGS) $(chk_TESTS)
-	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
-	   echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
-	fi
-	@if test -n "$(TEST_PROG_PARA)"; then                                \
-	    echo "**** Hint ****";                                            \
-	    echo "Parallel test files reside in the current directory"        \
-	         "by default.";                                               \
-	    echo "Set HDF5_PARAPREFIX to use another directory. E.g.,";       \
-	    echo "    HDF5_PARAPREFIX=/PFS/user/me";                          \
-	    echo "    export HDF5_PARAPREFIX";                                \
-	    echo "    make check";                                            \
-	    echo "**** end of Hint ****";                                     \
-	fi
-	@for test in $(TEST_PROG_PARA) dummy; do                             \
-	   if test $$test != dummy; then                                      \
-	      $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ \
-	      RUNEXEC="$(RUNPARALLEL)" || exit 1; \
-	   fi;                                                                \
-	done
-	@for test in $(TEST_SCRIPT_PARA) dummy; do                           \
-	  if test $$test != dummy; then                                      \
-	    $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ || exit 1; \
-	  fi;                                                                 \
-	done
-	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
-	    echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
-	fi
-
-# Run test with different Virtual File Driver
-check-vfd: $(LIB) $(PROGS) $(chk_TESTS)
-	@for vfd in $(VFD_LIST) dummy; do                                     \
-	    if test $$vfd != dummy; then                                      \
-	        echo "============================";                          \
-	        echo "Testing Virtual File Driver $$vfd";                     \
-	        echo "============================";                          \
-	        $(MAKE) $(AM_MAKEFLAGS) check-clean || exit 1;                \
-	        HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check || exit 1;    \
-	    fi;                                                               \
-	done
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/c++/test/dsets.cpp b/c++/test/dsets.cpp
index e5c8bf0..5c3ce81 100644
--- a/c++/test/dsets.cpp
+++ b/c++/test/dsets.cpp
@@ -1,1120 +1,1449 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*****************************************************************************
    FILE
    dsets.cpp - HDF5 C++ testing the functionalities associated with the
-	       C dataset interface (H5D)
+               C dataset interface (H5D)
 
    EXTERNAL ROUTINES/VARIABLES:
      These routines are in the test directory of the C library:
-	h5_reset() -- in h5test.c, resets the library by closing it
-	h5_fileaccess() -- in h5test.c, returns a file access template
+        h5_reset() -- in h5test.c, resets the library by closing it
+        h5_fileaccess() -- in h5test.c, returns a file access template
 
  ***************************************************************************/
 
-#ifdef OLD_HEADER_FILENAME
-#include <iostream.h>
-#else
+#include <cfloat>
+#include <cmath>
 #include <iostream>
-#endif
-#include <string>
-
-#ifndef H5_NO_NAMESPACE
-#ifndef H5_NO_STD
-    using std::cerr;
-    using std::endl;
-#endif  // H5_NO_STD
-#endif
-
-#include "H5Cpp.h"	// C++ API header file
-
-#ifndef H5_NO_NAMESPACE
-    using namespace H5;
-#endif
-
-#include "h5cpputil.h"	// C++ utilility header file
+using std::cerr;
+using std::endl;
 
-const H5std_string	FILE1("dataset.h5");
-const H5std_string	DSET_DEFAULT_NAME("default");
-const H5std_string	DSET_DEFAULT_NAME_PATH("/default");
-const H5std_string	DSET_CHUNKED_NAME("chunked");
-const H5std_string	DSET_SIMPLE_IO_NAME("simple_io");
-const H5std_string	DSET_TCONV_NAME	("tconv");
-const H5std_string	DSET_COMPRESS_NAME("compressed");
-const H5std_string	DSET_BOGUS_NAME	("bogus");
+#include <string>
+#include "H5Cpp.h" // C++ API header file
+using namespace H5;
+
+#include "h5test.h"
+#include "h5cpputil.h" // C++ utilility header file
+
+const H5std_string FILE1("dataset.h5");
+const H5std_string DSET_DEFAULT_NAME("default");
+const H5std_string DSET_DEFAULT_NAME_PATH("/default");
+const H5std_string DSET_CHUNKED_NAME("chunked");
+const H5std_string DSET_SIMPLE_IO_NAME("simple_io");
+const H5std_string DSET_TCONV_NAME("tconv");
+const H5std_string DSET_COMPRESS_NAME("compressed");
+const H5std_string DSET_BOGUS_NAME("bogus");
+const H5std_string DSET_OPERATOR("testing operator=");
+const H5std_string DSET_OPERATOR_PATH("/testing operator=");
 
 /* Temporary filter IDs used for testing */
 const int H5Z_FILTER_BOGUS = 305;
 
-#if 0 // UNUSED variables caused warning, so duplicated below with NULL instead
-static size_t filter_bogus(unsigned int flags, size_t cd_nelmts,
-    const unsigned int *cd_values, size_t nbytes, size_t *buf_size, void **buf);
-#endif
-static size_t filter_bogus(size_t nbytes);
+static size_t filter_bogus(unsigned int flags, size_t cd_nelmts, const unsigned int *cd_values, size_t nbytes,
+                           size_t *buf_size, void **buf);
+// H5_ATTR_UNUSED variables caused warning, but taking them out caused failure.
 
 /*-------------------------------------------------------------------------
- * Function:	test_create
- *
- * Purpose:	Attempts to create a dataset.
+ * Function:    test_create
  *
- * Return:	Success:	0
+ * Purpose      Attempts to create a dataset.
  *
- *		Failure:	-1
- *
- * Programmer:	Binh-Minh Ribler (using C version)
- *		Friday, January 5, 2001
- *
- * Modifications:
+ * Return       Success: 0
  *
+ *              Failure: -1
  *-------------------------------------------------------------------------
  */
 static herr_t
-test_create( H5File& file)
+test_create(H5File &file)
 {
-    SUBTEST("create, open, close");
+    SUBTEST("Create, open, close");
 
     // Setting this to NULL for cleaning up in failure situations
     DataSet *dataset = NULL;
     try {
-	// Create a data space
-	hsize_t     dims[2];
-	dims[0] = 256;
-	dims[1] = 512;
-	DataSpace space (2, dims, NULL);
-
-	// Create a dataset using the default dataset creation properties.
-	// We're not sure what they are, so we won't check.
-	dataset = new DataSet (file.createDataSet
-		(DSET_DEFAULT_NAME, PredType::NATIVE_DOUBLE, space));
-
-
-	// Add a comment to the dataset
-	file.setComment (DSET_DEFAULT_NAME, "This is a dataset");
-
-	// Close the dataset
-	delete dataset;
-	dataset = NULL;
-
-	// Try creating a dataset that already exists.  This should fail since a
-	// dataset can only be created once.  If an exception is not thrown for
-	// this action by createDataSet, then throw an invalid action exception.
-	try {
-	    dataset = new DataSet (file.createDataSet
-			(DSET_DEFAULT_NAME, PredType::NATIVE_DOUBLE, space));
-
-	    // continuation here, that means no exception has been thrown
-	    throw InvalidActionException("H5File::createDataSet", "Library allowed overwrite of existing dataset");
-	}
-	catch (FileIException E)	// catching invalid creating dataset
-	{} // do nothing, exception expected
-
-	// Open the dataset we created above and then close it.  This is one
-	// way to open an existing dataset for accessing.
-	dataset = new DataSet (file.openDataSet (DSET_DEFAULT_NAME));
-
-	// Get and verify the name of this dataset, using
-	// H5std_string getObjName()
-	H5std_string ds_name = dataset->getObjName();
-	verify_val(ds_name, DSET_DEFAULT_NAME_PATH, "DataSet::getObjName", __LINE__, __FILE__);
-
-	// Get and verify the comment from this dataset, using
-	// H5std_string getComment(const H5std_string& name, <buf_size=0, by default>)
-	H5std_string comment = file.getComment(DSET_DEFAULT_NAME);
-	verify_val(comment, "This is a dataset", "DataSet::getComment", __LINE__, __FILE__);
-
-	// Close the dataset when accessing is completed
-	delete dataset;
-
-	// This is another way to open an existing dataset for accessing.
-	DataSet another_dataset(file.openDataSet (DSET_DEFAULT_NAME));
-
-	// Try opening a non-existent dataset.  This should fail so if an
-	// exception is not thrown for this action by openDataSet, then
-	// display failure information and throw an exception.
-	try {
-	    dataset = new DataSet (file.openDataSet( "does_not_exist" ));
-
-	    // continuation here, that means no exception has been thrown
-	    throw InvalidActionException("H5File::openDataSet", "Attempted to open a non-existent dataset");
-	}
-	catch (FileIException E ) // catching creating non-existent dataset
-	{} // do nothing, exception expected
-
-	// Create a new dataset that uses chunked storage instead of the default
-	// layout.
-	DSetCreatPropList create_parms;
-	hsize_t     csize[2];
-	csize[0] = 5;
-	csize[1] = 100;
-	create_parms.setChunk( 2, csize );
-
-	dataset = new DataSet (file.createDataSet
-		(DSET_CHUNKED_NAME, PredType::NATIVE_DOUBLE, space, create_parms));
-	// Note: this one has no error message in C when failure occurs?
-
-	// clean up and return with success
-	delete dataset;
-
-	PASSED();
-	return 0;
-    }	// outer most try block
-
-    catch (InvalidActionException E)
-    {
-	cerr << " FAILED" << endl;
-	cerr << "    <<<  " << E.getDetailMsg() << "  >>>" << endl << endl;
-
-	// clean up and return with failure
-	if (dataset != NULL)
-	    delete dataset;
-	return -1;
+        // Create a data space
+        hsize_t dims[2];
+        dims[0] = 256;
+        dims[1] = 512;
+        DataSpace space(2, dims, NULL);
+
+        // Create a dataset using the default dataset creation properties.
+        // We're not sure what they are, so we won't check.
+        dataset = new DataSet(file.createDataSet(DSET_DEFAULT_NAME, PredType::NATIVE_DOUBLE, space));
+
+        // Add a comment to the dataset
+        file.setComment(DSET_DEFAULT_NAME, "This is a dataset");
+
+        // Close the dataset
+        delete dataset;
+        dataset = NULL;
+
+        // Try creating a dataset that already exists.  This should fail since a
+        // dataset can only be created once.  If an exception is not thrown for
+        // this action by createDataSet, then throw an invalid action exception.
+        try {
+            dataset = new DataSet(file.createDataSet(DSET_DEFAULT_NAME, PredType::NATIVE_DOUBLE, space));
+
+            // continuation here, that means no exception has been thrown
+            throw InvalidActionException("H5File::createDataSet",
+                                         "Library allowed overwrite of existing dataset");
+        }
+        catch (FileIException &E) // catching invalid creating dataset
+        {
+        } // do nothing, exception expected
+
+        // Open the dataset we created above and then close it.  This is one
+        // way to open an existing dataset for accessing.
+        dataset = new DataSet(file.openDataSet(DSET_DEFAULT_NAME));
+
+        // Get and verify the name of this dataset, using
+        // H5std_string getObjName()
+        H5std_string ds_name = dataset->getObjName();
+        verify_val(ds_name, DSET_DEFAULT_NAME_PATH, "DataSet::getObjName", __LINE__, __FILE__);
+
+        // Get and verify the comment from this dataset, using
+        // H5std_string getComment(const H5std_string& name, <buf_size=0, by default>)
+        H5std_string comment = file.getComment(DSET_DEFAULT_NAME);
+        verify_val(comment, "This is a dataset", "DataSet::getComment", __LINE__, __FILE__);
+
+        // Close the dataset when accessing is completed
+        delete dataset;
+
+        // This is another way to open an existing dataset for accessing.
+        DataSet another_dataset(file.openDataSet(DSET_DEFAULT_NAME));
+
+        // Try opening a non-existent dataset.  This should fail so if an
+        // exception is not thrown for this action by openDataSet, then
+        // display failure information and throw an exception.
+        try {
+            dataset = new DataSet(file.openDataSet("does_not_exist"));
+
+            // continuation here, that means no exception has been thrown
+            throw InvalidActionException("H5File::openDataSet", "Attempted to open a non-existent dataset");
+        }
+        catch (FileIException &E) // catching creating non-existent dataset
+        {
+        } // do nothing, exception expected
+
+        // Create a new dataset that uses chunked storage instead of the default
+        // layout.
+        DSetCreatPropList create_parms;
+        hsize_t           csize[2];
+        csize[0] = 5;
+        csize[1] = 100;
+        create_parms.setChunk(2, csize);
+
+        dataset =
+            new DataSet(file.createDataSet(DSET_CHUNKED_NAME, PredType::NATIVE_DOUBLE, space, create_parms));
+        // Note: this one has no error message in C when failure occurs?
+
+        // clean up and return with success
+        delete dataset;
+
+        PASSED();
+        return 0;
+    } // outer most try block
+
+    catch (InvalidActionException &E) {
+        cerr << " FAILED" << endl;
+        cerr << "    <<<  " << E.getDetailMsg() << "  >>>" << endl << endl;
+
+        // clean up and return with failure
+        delete dataset;
+        return -1;
     }
     // catch all other exceptions
-    catch (Exception E)
-    {
-	issue_fail_msg("test_create", __LINE__, __FILE__);
-
-	// clean up and return with failure
-	if (dataset != NULL)
-	    delete dataset;
-	return -1;
+    catch (Exception &E) {
+        issue_fail_msg("test_create", __LINE__, __FILE__);
+
+        // clean up and return with failure
+        delete dataset;
+        return -1;
     }
-}   // test_create
+} // test_create
 
 /*-------------------------------------------------------------------------
- * Function:	test_simple_io
- *
- * Purpose:	Tests simple I/O.  That is, reading and writing a complete
- *		multi-dimensional array without data type or data space
- *		conversions, without compression, and stored contiguously.
- *
- * Return:	Success:	0
+ * Function:    test_simple_io
  *
- *		Failure:	-1
+ * Purpose      Tests simple I/O.  That is, reading and writing a complete
+ *              multi-dimensional array without data type or data space
+ *              conversions, without compression, and stored contiguously.
  *
- * Programmer:	Binh-Minh Ribler (using C version)
- *		Friday, January 5, 2001
- *
- * Modifications:
+ * Return       Success: 0
  *
+ *              Failure: -1
  *-------------------------------------------------------------------------
  */
 static herr_t
-test_simple_io( H5File& file)
+test_simple_io(H5File &file)
 {
 
-    SUBTEST("simple I/O");
+    SUBTEST("Simple I/O");
 
-    int	points[100][200];
-    int	check[100][200];
-    int		i, j, n;
+    auto points = new int[100][200];
+    auto check  = new int[100][200]();
+    int  i, j, n;
 
     // Initialize the dataset
-    for (i = n = 0; i < 100; i++)
-    {
-	for (j = 0; j < 200; j++) {
-	    points[i][j] = n++;
-	}
+    for (i = n = 0; i < 100; i++) {
+        for (j = 0; j < 200; j++) {
+            points[i][j] = n++;
+        }
     }
 
-    char* tconv_buf = new char [1000];
-    try
-    {
-	// Create the data space
-	hsize_t	dims[2];
-	dims[0] = 100;
-	dims[1] = 200;
-	DataSpace space (2, dims, NULL);
-
-	// Create a small conversion buffer to test strip mining
-	DSetMemXferPropList xfer;
-
-	xfer.setBuffer (1000, tconv_buf, NULL);
-
-	// Create the dataset
-	DataSet dataset (file.createDataSet (DSET_SIMPLE_IO_NAME, PredType::NATIVE_INT, space));
-
-	// Write the data to the dataset
-	dataset.write ((void*) points, PredType::NATIVE_INT, DataSpace::ALL, DataSpace::ALL, xfer);
-
-	// Read the dataset back
-	dataset.read ((void*) check, PredType::NATIVE_INT, DataSpace::ALL, DataSpace::ALL, xfer);
-
-	// Check that the values read are the same as the values written
-	for (i = 0; i < 100; i++)
-	    for (j = 0; j < 200; j++)
-	    {
-		int status = check_values (i, j, points[i][j], check[i][j]);
-		if (status == -1)
-		    throw Exception("DataSet::read");
-	    }
-
-	// clean up and return with success
-	delete [] tconv_buf;
-	PASSED();
-	return 0;
-    }  // end try
+    char *tconv_buf = new char[1000];
+    try {
+        // Create the data space
+        hsize_t dims[2];
+        dims[0] = 100;
+        dims[1] = 200;
+        DataSpace space(2, dims, NULL);
+
+        // Create a small conversion buffer to test strip mining
+        DSetMemXferPropList xfer;
+
+        xfer.setBuffer(1000, tconv_buf, NULL);
+
+        // Create the dataset
+        DataSet dataset(file.createDataSet(DSET_SIMPLE_IO_NAME, PredType::NATIVE_INT, space));
+
+        // Write the data to the dataset
+        dataset.write(static_cast<void *>(points), PredType::NATIVE_INT, DataSpace::ALL, DataSpace::ALL,
+                      xfer);
+
+        // Read the dataset back
+        dataset.read(static_cast<void *>(check), PredType::NATIVE_INT, DataSpace::ALL, DataSpace::ALL, xfer);
+
+        // Check that the values read are the same as the values written
+        for (i = 0; i < 100; i++)
+            for (j = 0; j < 200; j++) {
+                int status =
+                    check_values(static_cast<hsize_t>(i), static_cast<hsize_t>(j), points[i][j], check[i][j]);
+                if (status == -1)
+                    throw Exception("DataSet::read");
+            }
+
+        // clean up and return with success
+        delete[] tconv_buf;
+        delete[] points;
+        delete[] check;
+        PASSED();
+        return 0;
+    } // end try
 
     // catch all dataset, space, plist exceptions
-    catch (Exception E)
-    {
-	cerr << " FAILED" << endl;
-	cerr << "    <<<  " << E.getDetailMsg() << "  >>>" << endl << endl;
-
-	// clean up and return with failure
-	if (tconv_buf)
-	    delete [] tconv_buf;
-	return -1;
+    catch (Exception &E) {
+        cerr << " FAILED" << endl;
+        cerr << "    <<<  " << E.getDetailMsg() << "  >>>" << endl << endl;
+
+        // clean up and return with failure
+        delete[] tconv_buf;
+        delete[] points;
+        delete[] check;
+        return -1;
     }
-}   // test_simple_io
+} // test_simple_io
 
 /*-------------------------------------------------------------------------
- * Function:	test_datasize
- *
- * Purpose:	Tests DataSet::getInMemDataSize().  
- *
- * Return:	Success:	0
+ * Function:    test_datasize
  *
- *		Failure:	-1
+ * Purpose      Tests DataSet::getInMemDataSize().
  *
- * Programmer:	Binh-Minh Ribler
- *		Thursday, March 22, 2012
- *
- * Modifications:
+ * Return       Success: 0
  *
+ *              Failure: -1
  *-------------------------------------------------------------------------
  */
 static herr_t
 test_datasize(FileAccPropList &fapl)
 {
     SUBTEST("DataSet::getInMemDataSize()");
-    try
-    {
-	// Open FILE1.
-	H5File file(FILE1, H5F_ACC_RDWR, FileCreatPropList::DEFAULT, fapl);
-
-	// Open dataset DSET_SIMPLE_IO_NAME.
-	DataSet dset = file.openDataSet (DSET_SIMPLE_IO_NAME);
-
-	// Get the dataset's dataspace to calculate the size for verification.
-	DataSpace space(dset.getSpace());
-
-	// Get the dimension sizes.
-	hsize_t dims[2];
-	int n_dims = space.getSimpleExtentDims(dims);
-	if (n_dims < 0)
-	{
-	    throw Exception("test_compression", "DataSpace::getSimpleExtentDims() failed");
-	}
-
-	// Calculate the supposed size.  Size of each value is int (4), from
-	// test_simple_io.
-	size_t expected_size = 4 * dims[0] * dims[1];
-
-	// getInMemDataSize() returns the in memory size of the data.
-	size_t ds_size = dset.getInMemDataSize();
-
-	// Verify the data size.
-	if (ds_size != expected_size)
-	{
-	    H5_FAILED();
-	    cerr << " Expected data size = " << expected_size;
-	    cerr << " but dset.getInMemDataSize() returned " << ds_size << endl;
-	    throw Exception("test_compression", "Failed in testing DataSet::getInMemDataSize()");
-	}
-
-	PASSED();
-	return 0;
-    }  // end try
+    try {
+        // Open FILE1.
+        H5File file(FILE1, H5F_ACC_RDWR, FileCreatPropList::DEFAULT, fapl);
+
+        // Open dataset DSET_SIMPLE_IO_NAME.
+        DataSet dset = file.openDataSet(DSET_SIMPLE_IO_NAME);
+
+        // Get the dataset's dataspace to calculate the size for verification.
+        DataSpace space(dset.getSpace());
+
+        // Get the dimension sizes.
+        hsize_t dims[2];
+        int     n_dims = space.getSimpleExtentDims(dims);
+        if (n_dims < 0) {
+            throw Exception("test_compression", "DataSpace::getSimpleExtentDims() failed");
+        }
+
+        // Calculate the supposed size.  Size of each value is int (4), from
+        // test_simple_io.
+        size_t expected_size = 4 * dims[0] * dims[1];
+
+        // getInMemDataSize() returns the in memory size of the data.
+        size_t ds_size = dset.getInMemDataSize();
+
+        // Verify the data size.
+        if (ds_size != expected_size) {
+            H5_FAILED();
+            cerr << " Expected data size = " << expected_size;
+            cerr << " but dset.getInMemDataSize() returned " << ds_size << endl;
+            throw Exception("test_compression", "Failed in testing DataSet::getInMemDataSize()");
+        }
+
+        PASSED();
+        return 0;
+    } // end try
 
     // catch all dataset, space, plist exceptions
-    catch (Exception E)
-    {
-	cerr << " FAILED" << endl;
-	cerr << "    <<<  " << E.getDetailMsg() << "  >>>" << endl << endl;
+    catch (Exception &E) {
+        cerr << " FAILED" << endl;
+        cerr << "    <<<  " << E.getDetailMsg() << "  >>>" << endl << endl;
 
-	return -1;
+        return -1;
     }
-}   // test_datasize
+} // test_datasize
 
 /*-------------------------------------------------------------------------
- * Function:	test_tconv
+ * Function:    test_tconv
  *
- * Purpose:	Test some simple data type conversion stuff.
+ * Purpose      Test some simple data type conversion stuff.
  *
- * Return:	Success:	0
- *
- *		Failure:	-1
- *
- * Programmer:	Binh-Minh Ribler (using C version)
- *		Friday, January 5, 2001
- *
- * Modifications:
+ * Return       Success: 0
  *
+ *              Failure: -1
  *-------------------------------------------------------------------------
  */
 static herr_t
-test_tconv( H5File& file)
+test_tconv(H5File &file)
 {
     // Prepare buffers for input/output
-    char	*out=NULL, *in=NULL;
-    out = new char [4*1000000];
+    char *out = NULL, *in = NULL;
+    out = new char[4 * 1000000];
     // assert (out); - should use exception handler for new - BMR
-    in = new char [4*1000000];
-    //assert (in);
+    in = new char[4 * 1000000];
+    // assert (in);
 
-    SUBTEST("data type conversion");
+    SUBTEST("Data type conversion");
 
     // Initialize the dataset
     for (int i = 0; i < 1000000; i++) {
-	out[i*4+0] = 0x11;
-	out[i*4+1] = 0x22;
-	out[i*4+2] = 0x33;
-	out[i*4+3] = 0x44;
+        out[i * 4 + 0] = 0x11;
+        out[i * 4 + 1] = 0x22;
+        out[i * 4 + 2] = 0x33;
+        out[i * 4 + 3] = 0x44;
     }
 
-    try
-    {
-	// Create the data space
-	hsize_t	dims[1];
-	dims[0] = 1000000;
-	DataSpace space (1, dims, NULL);
-
-	// Create the data set
-	DataSet dataset (file.createDataSet (DSET_TCONV_NAME, PredType::STD_I32LE, space));
-
-	// Write the data to the dataset
-	dataset.write ((void*) out, PredType::STD_I32LE);
-
-	// Read data with byte order conversion
-	dataset.read ((void*) in, PredType::STD_I32BE);
-
-	// Check
-	for (int i = 0; i < 1000000; i++) {
-	    if (in[4*i+0]!=out[4*i+3] ||
-		in[4*i+1]!=out[4*i+2] ||
-		in[4*i+2]!=out[4*i+1] ||
-		in[4*i+3]!=out[4*i+0])
-	    {
-		throw Exception("DataSet::read", "Read with byte order conversion failed");
-	    }
-	}
-
-	// clean up and return with success
-	delete [] out;
-	delete [] in;
-	PASSED();
-	return 0;
-    }  // end try
+    try {
+        // Create the data space
+        hsize_t dims[1];
+        dims[0] = 1000000;
+        DataSpace space(1, dims, NULL);
+
+        // Create the data set
+        DataSet dataset(file.createDataSet(DSET_TCONV_NAME, PredType::STD_I32LE, space));
+
+        // Write the data to the dataset
+        dataset.write(static_cast<void *>(out), PredType::STD_I32LE);
+
+        // Read data with byte order conversion
+        dataset.read(static_cast<void *>(in), PredType::STD_I32BE);
+
+        // Check
+        for (int i = 0; i < 1000000; i++) {
+            if (in[4 * i + 0] != out[4 * i + 3] || in[4 * i + 1] != out[4 * i + 2] ||
+                in[4 * i + 2] != out[4 * i + 1] || in[4 * i + 3] != out[4 * i + 0]) {
+                throw Exception("DataSet::read", "Read with byte order conversion failed");
+            }
+        }
+
+        // clean up and return with success
+        delete[] out;
+        delete[] in;
+        PASSED();
+        return 0;
+    } // end try
 
     // catch all dataset and space exceptions
-    catch (Exception E)
-    {
-	cerr << " FAILED" << endl;
-	cerr << "    <<<  " << E.getDetailMsg() << "  >>>" << endl << endl;
-
-	// clean up and return with failure
-	delete [] out;
-	delete [] in;
-	return -1;
+    catch (Exception &E) {
+        cerr << " FAILED" << endl;
+        cerr << "    <<<  " << E.getDetailMsg() << "  >>>" << endl << endl;
+
+        // clean up and return with failure
+        delete[] out;
+        delete[] in;
+        return -1;
     }
-}   // test_tconv
+} // test_tconv
 
 /* This message derives from H5Z */
 const H5Z_class2_t H5Z_BOGUS[1] = {{
-    H5Z_CLASS_T_VERS,		/* H5Z_class_t version number   */
-    H5Z_FILTER_BOGUS,		/* Filter id number		*/
-    1, 1,			/* Encode and decode enabled    */
-    "bogus",			/* Filter name for debugging	*/
-    NULL,                       /* The "can apply" callback     */
-    NULL,                       /* The "set local" callback     */
-    (H5Z_func_t)filter_bogus,   /* The actual filter function	*/
+    H5Z_CLASS_T_VERS, /* H5Z_class_t version number   */
+    H5Z_FILTER_BOGUS, /* Filter id number             */
+    1, 1,             /* Encode and decode enabled    */
+    "bogus",          /* Filter name for debugging        */
+    NULL,             /* The "can apply" callback     */
+    NULL,             /* The "set local" callback     */
+    filter_bogus,     /* The actual filter function        */
 }};
 
 /*-------------------------------------------------------------------------
- * Function:	bogus
- *
- * Purpose:	A bogus compression method that doesn't do anything.
+ * Function:    bogus
  *
- * Return:	Success:	Data chunk size
+ * Purpose      A bogus compression method that doesn't do anything.
  *
- *		Failure:	0
+ * Return       Success: Data chunk size
  *
- * Programmer:	Robb Matzke
- *		Tuesday, April 21, 1998
- *
- * Modifications:
+ *              Failure: 0
  *
+ * Programmer   Robb Matzke
+ *              Tuesday, April 21, 1998
  *-------------------------------------------------------------------------
  */
 static size_t
-#if 0 // UNUSED variables caused warning, so duplicated below with NULL instead
-filter_bogus(unsigned int flags, size_t cd_nelmts,
-      const unsigned int cd_values[], size_t nbytes,
-      size_t *buf_size, void **buf)
-#endif
-filter_bogus(size_t nbytes)
+filter_bogus(unsigned int flags, size_t cd_nelmts, const unsigned int cd_values[], size_t nbytes,
+             size_t *buf_size, void **buf)
 {
+    // Unused
+    (void)flags;
+    (void)cd_nelmts;
+    (void)cd_values;
+    (void)buf_size;
+    (void)buf;
+
     return nbytes;
 }
 
 /*-------------------------------------------------------------------------
- * Function:	test_compression
- *
- * Purpose:	Tests dataset compression. If compression is requested when
- *		it hasn't been compiled into the library (such as when
- *		updating an existing compressed dataset) then data is sent to
- *		the file uncompressed but no errors are returned.
+ * Function:    test_compression
  *
- * Return:	Success:	0
+ * Purpose      Tests dataset compression. If compression is requested when
+ *              it hasn't been compiled into the library (such as when
+ *              updating an existing compressed dataset) then data is sent to
+ *              the file uncompressed but no errors are returned.
  *
- *		Failure:	-1
- *
- * Programmer:	Binh-Minh Ribler (using C version)
- *		Friday, January 5, 2001
- *
- * Modifications:
+ * Return       Success: 0
  *
+ *              Failure: -1
  *-------------------------------------------------------------------------
  */
 static herr_t
-test_compression(H5File& file)
+test_compression(H5File &file)
 {
 #ifndef H5_HAVE_FILTER_DEFLATE
-    const char		*not_supported;
+    const char *not_supported;
     not_supported = "    Deflate compression is not enabled.";
 #endif /* H5_HAVE_FILTER_DEFLATE */
-    int		points[100][200];
-    int		check[100][200];
-    hsize_t	i, j, n;
+    auto    points = new int[100][200];
+    auto    check  = new int[100][200];
+    hsize_t i, j, n;
 
     // Initialize the dataset
-    for (i = n = 0; i < 100; i++)
-    {
-	for (j = 0; j < 200; j++) {
-	    points[i][j] = (int)n++;
-	}
+    for (i = n = 0; i < 100; i++) {
+        for (j = 0; j < 200; j++) {
+            points[i][j] = static_cast<int>(n++);
+        }
     }
-    char* tconv_buf = new char [1000];
-    DataSet* dataset = NULL;
-    try
-    {
-	const hsize_t	size[2] = {100, 200};
-	// Create the data space
-	DataSpace space1(2, size, NULL);
 
-	// Create a small conversion buffer to test strip mining
-	DSetMemXferPropList xfer;
+    char    *tconv_buf = new char[1000];
+    DataSet *dataset   = NULL;
+    try {
+        const hsize_t size[2] = {100, 200};
+        // Create the data space
+        DataSpace space1(2, size, NULL);
+
+        // Create a small conversion buffer to test strip mining
+        DSetMemXferPropList xfer;
 
-	xfer.setBuffer (1000, tconv_buf, NULL);
+        xfer.setBuffer(1000, tconv_buf, NULL);
 
-	// Use chunked storage with compression
-	DSetCreatPropList dscreatplist;
+        // Use chunked storage with compression
+        DSetCreatPropList dscreatplist;
 
-	const hsize_t	chunk_size[2] = {2, 25};
-	dscreatplist.setChunk (2, chunk_size);
-	dscreatplist.setDeflate (6);
+        const hsize_t chunk_size[2] = {2, 25};
+        dscreatplist.setChunk(2, chunk_size);
+        dscreatplist.setDeflate(6);
 
 #ifdef H5_HAVE_FILTER_DEFLATE
-	SUBTEST("Compression (setup)");
-
-	// Create the dataset
-	dataset = new DataSet (file.createDataSet
-	    (DSET_COMPRESS_NAME, PredType::NATIVE_INT, space1, dscreatplist));
-
-	PASSED();
-
-	/*----------------------------------------------------------------------
-	* STEP 1: Read uninitialized data.  It should be zero.
-	*----------------------------------------------------------------------
-	*/
-	SUBTEST("Compression (uninitialized read)");
-
-	dataset->read ((void*) check, PredType::NATIVE_INT, DataSpace::ALL, DataSpace::ALL, xfer);
-
-	for (i=0; i<size[0]; i++) {
-	    for (j=0; j<size[1]; j++) {
-		if (0!=check[i][j]) {
-		    H5_FAILED();
-		    cerr << "    Read a non-zero value." << endl;
-		    cerr << "    At index " << (unsigned long)i << "," <<
-		   (unsigned long)j << endl;
-		    throw Exception("test_compression", "Failed in uninitialized read");
-		}
-	    }
-	}
-	PASSED();
-
-	/*----------------------------------------------------------------------
-	* STEP 2: Test compression by setting up a chunked dataset and writing
-	* to it.
-	*----------------------------------------------------------------------
-	*/
-	SUBTEST("Compression (write)");
-
-	for (i=n=0; i<size[0]; i++)
-	{
-	    for (j=0; j<size[1]; j++)
-	    {
-		points[i][j] = (int)n++;
-	    }
-	}
-
-	dataset->write ((void*) points, PredType::NATIVE_INT, DataSpace::ALL, DataSpace::ALL, xfer);
-
-	PASSED();
-
-	/*----------------------------------------------------------------------
-	* STEP 3: Try to read the data we just wrote.
-	*----------------------------------------------------------------------
-	*/
-	SUBTEST("Compression (read)");
-
-	// Read the dataset back
-	dataset->read ((void*)check, PredType::NATIVE_INT, DataSpace::ALL, DataSpace::ALL, xfer);
-
-	// Check that the values read are the same as the values written
-	for (i = 0; i < size[0]; i++)
-	    for (j = 0; j < size[1]; j++)
-	    {
-		int status = check_values (i, j, points[i][j], check[i][j]);
-		if (status == -1)
-		    throw Exception("test_compression", "Failed in read");
-	    }
-
-	PASSED();
-
-	/*----------------------------------------------------------------------
-	* STEP 4: Write new data over the top of the old data.  The new data is
-	* random thus not very compressible, and will cause the chunks to move
-	* around as they grow.  We only change values for the left half of the
-	* dataset although we rewrite the whole thing.
-	*----------------------------------------------------------------------
-	*/
-	SUBTEST("Compression (modify)");
-
-	for (i=0; i<size[0]; i++)
-	{
-	    for (j=0; j<size[1]/2; j++)
-	    {
-	    	points[i][j] = rand ();
-	    }
-	}
-	dataset->write ((void*)points, PredType::NATIVE_INT, DataSpace::ALL, DataSpace::ALL, xfer);
-
-	// Read the dataset back and check it
-	dataset->read ((void*)check, PredType::NATIVE_INT, DataSpace::ALL, DataSpace::ALL, xfer);
-
-	// Check that the values read are the same as the values written
-	for (i = 0; i < size[0]; i++)
-	    for (j = 0; j < size[1]; j++)
-	    {
-		int status = check_values (i, j, points[i][j], check[i][j]);
-		if (status == -1)
-		    throw Exception("test_compression", "Failed in modify");
-	    }
-
-	PASSED();
-
-	/*----------------------------------------------------------------------
-	* STEP 5: Close the dataset and then open it and read it again.  This
-	* insures that the compression message is picked up properly from the
-	* object header.
-	*----------------------------------------------------------------------
-	*/
-	SUBTEST("Compression (re-open)");
-
-	// close this dataset to reuse the var
-	delete dataset;
-
-	dataset = new DataSet (file.openDataSet (DSET_COMPRESS_NAME));
-	dataset->read ((void*)check, PredType::NATIVE_INT, DataSpace::ALL, DataSpace::ALL, xfer);
-
-	// Check that the values read are the same as the values written
-	for (i = 0; i < size[0]; i++)
-	    for (j = 0; j < size[1]; j++)
-	    {
-		int status = check_values (i, j, points[i][j], check[i][j]);
-		if (status == -1)
-		    throw Exception("test_compression", "Failed in re-open");
-	    }
-
-	PASSED();
-
-
-	/*----------------------------------------------------------------------
-	* STEP 6: Test partial I/O by writing to and then reading from a
-	* hyperslab of the dataset.  The hyperslab does not line up on chunk
-	* boundaries (we know that case already works from above tests).
-	*----------------------------------------------------------------------
-	*/
-	SUBTEST("Compression (partial I/O)");
-
-	const hsize_t	hs_size[2] = {4, 50};
-	const hsize_t	hs_offset[2] = {7, 30};
-	for (i = 0; i < hs_size[0]; i++) {
-	    for (j = 0; j < hs_size[1]; j++) {
-		points[hs_offset[0]+i][hs_offset[1]+j] = rand ();
-	    }
-	}
-	space1.selectHyperslab( H5S_SELECT_SET, hs_size, hs_offset );
-	dataset->write ((void*)points, PredType::NATIVE_INT, space1, space1, xfer);
-	dataset->read ((void*)check, PredType::NATIVE_INT, space1, space1, xfer);
-
-	// Check that the values read are the same as the values written
-	for (i=0; i<hs_size[0]; i++) {
-	for (j=0; j<hs_size[1]; j++) {
-	    if (points[hs_offset[0]+i][hs_offset[1]+j] !=
-		check[hs_offset[0]+i][hs_offset[1]+j]) {
-		H5_FAILED();
-		cerr << "    Read different values than written.\n" << endl;
-		cerr << "    At index " << (unsigned long)(hs_offset[0]+i) <<
-		   "," << (unsigned long)(hs_offset[1]+j) << endl;
-
-		cerr << "    At original: " << (int)points[hs_offset[0]+i][hs_offset[1]+j] << endl;
-		cerr << "    At returned: " << (int)check[hs_offset[0]+i][hs_offset[1]+j] << endl;
-		throw Exception("test_compression", "Failed in partial I/O");
-	    }
-	} // for j
-	} // for i
-
-	delete dataset;
-	dataset = NULL;
-
-	PASSED();
+        SUBTEST("Compression (setup)");
+
+        // Create the dataset
+        dataset =
+            new DataSet(file.createDataSet(DSET_COMPRESS_NAME, PredType::NATIVE_INT, space1, dscreatplist));
+
+        PASSED();
+
+        /*----------------------------------------------------------------------
+         * STEP 1: Read uninitialized data.  It should be zero.
+         *----------------------------------------------------------------------
+         */
+        SUBTEST("Compression (uninitialized read)");
+
+        dataset->read(static_cast<void *>(check), PredType::NATIVE_INT, DataSpace::ALL, DataSpace::ALL, xfer);
+
+        for (i = 0; i < size[0]; i++) {
+            for (j = 0; j < size[1]; j++) {
+                if (0 != check[i][j]) {
+                    H5_FAILED();
+                    cerr << "    Read a non-zero value." << endl;
+                    cerr << "    At index " << static_cast<unsigned long>(i) << ","
+                         << static_cast<unsigned long>(j) << endl;
+                    throw Exception("test_compression", "Failed in uninitialized read");
+                }
+            }
+        }
+        PASSED();
+
+        /*----------------------------------------------------------------------
+         * STEP 2: Test compression by setting up a chunked dataset and writing
+         * to it.
+         *----------------------------------------------------------------------
+         */
+        SUBTEST("Compression (write)");
+
+        for (i = n = 0; i < size[0]; i++) {
+            for (j = 0; j < size[1]; j++) {
+                points[i][j] = static_cast<int>(n++);
+            }
+        }
+
+        dataset->write(static_cast<void *>(points), PredType::NATIVE_INT, DataSpace::ALL, DataSpace::ALL,
+                       xfer);
+
+        PASSED();
+
+        /*----------------------------------------------------------------------
+         * STEP 3: Try to read the data we just wrote.
+         *----------------------------------------------------------------------
+         */
+        SUBTEST("Compression (read)");
+
+        // Read the dataset back
+        dataset->read(static_cast<void *>(check), PredType::NATIVE_INT, DataSpace::ALL, DataSpace::ALL, xfer);
+
+        // Check that the values read are the same as the values written
+        for (i = 0; i < size[0]; i++)
+            for (j = 0; j < size[1]; j++) {
+                int status = check_values(i, j, points[i][j], check[i][j]);
+                if (status == -1)
+                    throw Exception("test_compression", "Failed in read");
+            }
+
+        PASSED();
+
+        /*----------------------------------------------------------------------
+         * STEP 4: Write new data over the top of the old data.  The new data is
+         * random thus not very compressible, and will cause the chunks to move
+         * around as they grow.  We only change values for the left half of the
+         * dataset although we rewrite the whole thing.
+         *----------------------------------------------------------------------
+         */
+        SUBTEST("Compression (modify)");
+
+        for (i = 0; i < size[0]; i++) {
+            for (j = 0; j < size[1] / 2; j++) {
+                points[i][j] = rand();
+            }
+        }
+        dataset->write(static_cast<void *>(points), PredType::NATIVE_INT, DataSpace::ALL, DataSpace::ALL,
+                       xfer);
+
+        // Read the dataset back and check it
+        dataset->read(static_cast<void *>(check), PredType::NATIVE_INT, DataSpace::ALL, DataSpace::ALL, xfer);
+
+        // Check that the values read are the same as the values written
+        for (i = 0; i < size[0]; i++)
+            for (j = 0; j < size[1]; j++) {
+                int status = check_values(i, j, points[i][j], check[i][j]);
+                if (status == -1)
+                    throw Exception("test_compression", "Failed in modify");
+            }
+
+        PASSED();
+
+        /*----------------------------------------------------------------------
+         * STEP 5: Close the dataset and then open it and read it again.  This
+         * insures that the compression message is picked up properly from the
+         * object header.
+         *----------------------------------------------------------------------
+         */
+        SUBTEST("Compression (re-open)");
+
+        // close this dataset to reuse the var
+        delete dataset;
+
+        dataset = new DataSet(file.openDataSet(DSET_COMPRESS_NAME));
+        dataset->read(static_cast<void *>(check), PredType::NATIVE_INT, DataSpace::ALL, DataSpace::ALL, xfer);
+
+        // Check that the values read are the same as the values written
+        for (i = 0; i < size[0]; i++)
+            for (j = 0; j < size[1]; j++) {
+                int status = check_values(i, j, points[i][j], check[i][j]);
+                if (status == -1)
+                    throw Exception("test_compression", "Failed in re-open");
+            }
+
+        PASSED();
+
+        /*----------------------------------------------------------------------
+         * STEP 6: Test partial I/O by writing to and then reading from a
+         * hyperslab of the dataset.  The hyperslab does not line up on chunk
+         * boundaries (we know that case already works from above tests).
+         *----------------------------------------------------------------------
+         */
+        SUBTEST("Compression (partial I/O)");
+
+        const hsize_t hs_size[2]   = {4, 50};
+        const hsize_t hs_offset[2] = {7, 30};
+        for (i = 0; i < hs_size[0]; i++) {
+            for (j = 0; j < hs_size[1]; j++) {
+                points[hs_offset[0] + i][hs_offset[1] + j] = rand();
+            }
+        }
+        space1.selectHyperslab(H5S_SELECT_SET, hs_size, hs_offset);
+        dataset->write(static_cast<void *>(points), PredType::NATIVE_INT, space1, space1, xfer);
+        dataset->read(static_cast<void *>(check), PredType::NATIVE_INT, space1, space1, xfer);
+
+        // Check that the values read are the same as the values written
+        for (i = 0; i < hs_size[0]; i++) {
+            for (j = 0; j < hs_size[1]; j++) {
+                if (points[hs_offset[0] + i][hs_offset[1] + j] != check[hs_offset[0] + i][hs_offset[1] + j]) {
+                    H5_FAILED();
+                    cerr << "    Read different values than written.\n" << endl;
+                    cerr << "    At index " << static_cast<unsigned long>((hs_offset[0] + i)) << ","
+                         << static_cast<unsigned long>((hs_offset[1] + j)) << endl;
+
+                    cerr << "    At original: "
+                         << static_cast<int>(points[hs_offset[0] + i][hs_offset[1] + j]) << endl;
+                    cerr << "    At returned: " << static_cast<int>(check[hs_offset[0] + i][hs_offset[1] + j])
+                         << endl;
+                    throw Exception("test_compression", "Failed in partial I/O");
+                }
+            } // for j
+        }     // for i
+
+        delete dataset;
+        dataset = NULL;
+
+        PASSED();
 
 #else
-	SUBTEST("deflate filter");
-	SKIPPED();
-	cerr << not_supported << endl;
+        SUBTEST("deflate filter");
+        SKIPPED();
+        cerr << not_supported << endl;
 #endif
 
-	/*----------------------------------------------------------------------
-	* STEP 7: Register an application-defined compression method and use it
-	* to write and then read the dataset.
-	*----------------------------------------------------------------------
-	*/
-	SUBTEST("Compression (app-defined method)");
-
-        if (H5Zregister (H5Z_BOGUS)<0)
-		throw Exception("test_compression", "Failed in app-defined method");
-	if (H5Pset_filter (dscreatplist.getId(), H5Z_FILTER_BOGUS, 0, 0, NULL)<0)
-	    throw Exception("test_compression", "Failed in app-defined method");
-	dscreatplist.setFilter (H5Z_FILTER_BOGUS, 0, 0, NULL);
-
-	DataSpace space2 (2, size, NULL);
-	dataset = new DataSet (file.createDataSet (DSET_BOGUS_NAME, PredType::NATIVE_INT, space2, dscreatplist));
-
-	dataset->write ((void*)points, PredType::NATIVE_INT, DataSpace::ALL, DataSpace::ALL, xfer);
-	dataset->read ((void*)check, PredType::NATIVE_INT, DataSpace::ALL, DataSpace::ALL, xfer);
-
-	// Check that the values read are the same as the values written
-	for (i = 0; i < size[0]; i++)
-	    for (j = 0; j < size[1]; j++)
-	    {
-		int status = check_values (i, j, points[i][j], check[i][j]);
-		if (status == -1)
-		    throw Exception("test_compression", "Failed in app-defined method");
-	    }
-
-	PASSED();
-
-	/*----------------------------------------------------------------------
-	* Cleanup
-	*----------------------------------------------------------------------
-	*/
-	delete dataset;
-	delete [] tconv_buf;
-	return 0;
+        /*----------------------------------------------------------------------
+         * STEP 7: Register an application-defined compression method and use it
+         * to write and then read the dataset.
+         *----------------------------------------------------------------------
+         */
+        SUBTEST("Compression (app-defined method)");
+
+        if (H5Zregister(H5Z_BOGUS) < 0)
+            throw Exception("test_compression", "Failed in app-defined method");
+        if (H5Pset_filter(dscreatplist.getId(), H5Z_FILTER_BOGUS, 0, 0, NULL) < 0)
+            throw Exception("test_compression", "Failed in app-defined method");
+        dscreatplist.setFilter(H5Z_FILTER_BOGUS, 0, 0, NULL);
+
+        DataSpace space2(2, size, NULL);
+        dataset =
+            new DataSet(file.createDataSet(DSET_BOGUS_NAME, PredType::NATIVE_INT, space2, dscreatplist));
+
+        dataset->write(static_cast<void *>(points), PredType::NATIVE_INT, DataSpace::ALL, DataSpace::ALL,
+                       xfer);
+        dataset->read(static_cast<void *>(check), PredType::NATIVE_INT, DataSpace::ALL, DataSpace::ALL, xfer);
+
+        // Check that the values read are the same as the values written
+        for (i = 0; i < size[0]; i++)
+            for (j = 0; j < size[1]; j++) {
+                int status = check_values(i, j, points[i][j], check[i][j]);
+                if (status == -1)
+                    throw Exception("test_compression", "Failed in app-defined method");
+            }
+
+        PASSED();
+
+        /*----------------------------------------------------------------------
+         * Cleanup
+         *----------------------------------------------------------------------
+         */
+        delete dataset;
+        delete[] tconv_buf;
+        delete[] points;
+        delete[] check;
+        return 0;
     } // end try
 
     // catch all dataset, file, space, and plist exceptions
-    catch (Exception E)
-    {
-	cerr << " FAILED" << endl;
-	cerr << "    <<<  " << E.getDetailMsg() << "  >>>" << endl << endl;
-
-	// clean up and return with failure
-	if (dataset != NULL)
-	    delete dataset;
-	if (tconv_buf)
-	    delete [] tconv_buf;
-	return -1;
+    catch (Exception &E) {
+        cerr << " FAILED" << endl;
+        cerr << "    <<<  " << E.getDetailMsg() << "  >>>" << endl << endl;
+
+        // clean up and return with failure
+        delete dataset;
+        delete[] tconv_buf;
+        delete[] points;
+        delete[] check;
+        return -1;
     }
-}   // test_compression
+} // test_compression
 
 /*-------------------------------------------------------------------------
- * Function:	test_multiopen
+ * Function:    test_nbit_methods
  *
- * Purpose:	Tests that a bug no longer exists.  If a dataset is opened
- *		twice and one of the handles is used to extend the dataset,
- *		then the other handle should return the new size when
- *		queried.
+ * Purpose      Tests setting nbit compression methods.
  *
- * Return:	Success:	0
+ * Return       Success: 0
  *
- *		Failure:	-1
+ *              Failure: -1
+ *-------------------------------------------------------------------------
+ */
+const H5std_string DSET_NBIT_NAME("nbit_dataset");
+const hsize_t      DIM1 = 2;
+const hsize_t      DIM2 = 5;
+
+static herr_t
+test_nbit_compression(H5File &file)
+{
+    typedef struct {
+        int   i;
+        char  c;
+        short s;
+    } s1_t;
+
+    const hsize_t size[2]       = {DIM1, DIM2};
+    const hsize_t chunk_size[2] = {DIM1, DIM2};
+    s1_t          orig_data[DIM1][DIM2];
+    s1_t          new_data[DIM1][DIM2];
+    hsize_t       i, j;
+
+    SUBTEST("N-bit compression (setup)");
+
+    HDmemset(orig_data, 0, DIM1 * DIM2 * sizeof(s1_t));
+    HDmemset(new_data, 0, DIM1 * DIM2 * sizeof(s1_t));
+
+    try {
+        // Define datatypes of members of compound datatype
+        IntType i_type(PredType::NATIVE_INT);
+        IntType c_type(PredType::NATIVE_CHAR);
+        IntType s_type(PredType::NATIVE_SHORT);
+
+        // Create a dataset compound datatype
+        CompType cmpd(sizeof(s1_t));
+        cmpd.insertMember("i", HOFFSET(s1_t, i), i_type);
+        cmpd.insertMember("c", HOFFSET(s1_t, c), c_type);
+        cmpd.insertMember("s", HOFFSET(s1_t, s), s_type);
+
+        // Create a memory compound datatype
+        CompType mem_cmpd(sizeof(s1_t));
+        mem_cmpd.insertMember("i", HOFFSET(s1_t, i), i_type);
+        mem_cmpd.insertMember("c", HOFFSET(s1_t, c), c_type);
+        mem_cmpd.insertMember("s", HOFFSET(s1_t, s), s_type);
+
+        // Set order of dataset compound datatype
+        // cmpd.setOrder(H5T_ORDER_BE); only for atomic type?
+
+        // Create the data space
+        DataSpace space(2, size);
+
+        // Use nbit filter
+        DSetCreatPropList dscreat;
+        dscreat.setChunk(2, chunk_size);
+        dscreat.setNbit();
+
+        // Create the dataset
+        DataSet dataset(file.createDataSet(DSET_NBIT_NAME, cmpd, space, dscreat));
+
+        // Initialize data, assuming size of long long >= size of member datatypes
+        for (i = 0; i < size[0]; i++)
+            for (j = 0; j < size[1]; j++) {
+                orig_data[i][j].i = static_cast<int>(i * j);
+                orig_data[i][j].c = static_cast<char>('a' + i);
+                orig_data[i][j].s = static_cast<short>(i + j);
+
+                // Some even-numbered integer values are negative
+                if ((i * size[1] + j + 1) % 2 == 0) {
+                    orig_data[i][j].i = -orig_data[i][j].i;
+                    orig_data[i][j].s = static_cast<short>(-orig_data[i][j].s);
+                }
+            }
+
+        // Write to the dataset
+        dataset.write(static_cast<void *>(orig_data), mem_cmpd);
+
+        // Read the dataset back */
+        dataset.read(static_cast<void *>(new_data), mem_cmpd);
+
+        // Check that the values read are the same as the values written.
+        for (i = 0; i < size[0]; i++)
+            for (j = 0; j < size[1]; j++) {
+                if ((new_data[i][j].i != orig_data[i][j].i) || (new_data[i][j].c != orig_data[i][j].c) ||
+                    (new_data[i][j].s != orig_data[i][j].s)) {
+                    H5_FAILED();
+                    printf("    Read different values than written.\n");
+                    printf("    At index %lu,%lu\n", static_cast<unsigned long>(i),
+                           static_cast<unsigned long>(j));
+                }
+            }
+
+        PASSED();
+        return 0;
+    } // end try block
+
+    // catch all dataset, file, space, and plist exceptions
+    catch (Exception &E) {
+        cerr << " FAILED" << endl;
+        cerr << "    <<<  " << E.getDetailMsg() << "  >>>" << endl << endl;
+
+        return -1;
+    }
+} // test_nbit_compression
+
+/*-------------------------------------------------------------------------
+ * Function:    test_multiopen
  *
- * Programmer:	Binh-Minh Ribler (using C version)
- *		Saturday, February 17, 2001
+ * Purpose      Tests that a bug no longer exists.  If a dataset is opened
+ *              twice and one of the handles is used to extend the dataset,
+ *              then the other handle should return the new size when
+ *              queried.
  *
- * Modifications:
+ * Return       Success: 0
  *
+ *              Failure: -1
  *-------------------------------------------------------------------------
  */
 static herr_t
-test_multiopen (H5File& file)
+test_multiopen(H5File &file)
 {
 
     SUBTEST("Multi-open with extending");
 
-    DataSpace* space = NULL;
+    DataSpace *space = NULL;
     try {
 
-	// Create a dataset creation property list
-	DSetCreatPropList dcpl;
+        // Create a dataset creation property list
+        DSetCreatPropList dcpl;
 
-	// Set chunk size to given size
-	hsize_t		cur_size[1] = {10};
-	dcpl.setChunk (1, cur_size);
+        // Set chunk size to given size
+        hsize_t cur_size[1] = {10};
+        dcpl.setChunk(1, cur_size);
 
-	// Create a simple data space with unlimited size
-	static hsize_t	max_size[1] = {H5S_UNLIMITED};
-	space = new DataSpace (1, cur_size, max_size);
+        // Create a simple data space with unlimited size
+        hsize_t max_size[1] = {H5S_UNLIMITED};
+        space               = new DataSpace(1, cur_size, max_size);
 
-	// Create first dataset
-	DataSet dset1 = file.createDataSet ("multiopen", PredType::NATIVE_INT, *space, dcpl);
+        // Create first dataset
+        DataSet dset1 = file.createDataSet("multiopen", PredType::NATIVE_INT, *space, dcpl);
 
-	// Open again the first dataset from the file to another DataSet object.
-	DataSet dset2 = file.openDataSet ("multiopen");
+        // Open again the first dataset from the file to another DataSet object.
+        DataSet dset2 = file.openDataSet("multiopen");
 
-	// Relieve the dataspace
-	delete space;
-	space = NULL;
+        // Relieve the dataspace
+        delete space;
+        space = NULL;
 
-	// Extend the dimensionality of the first dataset
-	cur_size[0] = 20;
-	dset1.extend (cur_size);
+        // Extend the dimensionality of the first dataset
+        cur_size[0] = 20;
+        dset1.extend(cur_size);
 
-	// Get the size from the second handle
-	space = new DataSpace (dset2.getSpace());
+        // Get the size from the second handle
+        space = new DataSpace(dset2.getSpace());
 
-	hsize_t		tmp_size[1];
-	space->getSimpleExtentDims (tmp_size);
-	if (cur_size[0]!=tmp_size[0])
-	{
-	    cerr << "    Got " << (int)tmp_size[0] << " instead of "
-		    << (int)cur_size[0] << "!" << endl;
-	    throw Exception("test_multiopen", "Failed in multi-open with extending");
-	}
+        hsize_t tmp_size[1];
+        space->getSimpleExtentDims(tmp_size);
+        if (cur_size[0] != tmp_size[0]) {
+            cerr << "    Got " << static_cast<int>(tmp_size[0]) << " instead of "
+                 << static_cast<int>(cur_size[0]) << "!" << endl;
+            throw Exception("test_multiopen", "Failed in multi-open with extending");
+        }
 
-	// clean up and return with success
-	delete space;
-	PASSED();
-	return 0;
+        // clean up and return with success
+        delete space;
+        PASSED();
+        return 0;
     } // end try block
 
     // catch all dataset, file, space, and plist exceptions
-    catch (Exception E)
-    {
-	cerr << " FAILED" << endl;
-	cerr << "    <<<  " << E.getDetailMsg() << "  >>>" << endl << endl;
-
-	// clean up and return with failure
-	if (space != NULL)
-	    delete space;
-	return -1;
+    catch (Exception &E) {
+        cerr << " FAILED" << endl;
+        cerr << "    <<<  " << E.getDetailMsg() << "  >>>" << endl << endl;
+
+        // clean up and return with failure
+        delete space;
+        return -1;
     }
-}   // test_multiopen
+} // test_multiopen
 
 /*-------------------------------------------------------------------------
- * Function:	test_types
+ * Function:    test_types
  *
- * Purpose:	Test various types - should be moved to dtypes.cpp
+ * Purpose      Test various types - should be moved to dtypes.cpp
  *
- * Return:	Success:	0
+ * Return       Success: 0
  *
- *		Failure:	-1
+ *              Failure: -1
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+test_types(H5File &file)
+{
+    SUBTEST("Various datatypes");
+
+    size_t   i;
+    DataSet *dset = NULL;
+    try {
+
+        // Create a group in the file that was passed in from the caller
+        Group grp = file.createGroup("typetests");
+
+        /* bitfield_1 */
+        unsigned char buf[32];
+        hsize_t       nelmts = sizeof(buf);
+        DataType      type;
+        try { // block of bitfield_1
+            // test copying a predefined type
+            type.copy(PredType::STD_B8LE);
+
+            // Test copying a user-defined type using DataType::copy
+            DataType copied_type;
+            copied_type.copy(type);
+
+            // Test copying a user-defined type using DataType::operator=
+            DataType another_copied_type;
+            another_copied_type = type;
+
+            // Test copying a user-defined int type using DataType::operator=
+            IntType  orig_int(PredType::STD_B8LE);
+            DataType generic_type;
+            generic_type = orig_int;
+
+            // Test copying an integer predefined type
+            IntType new_int_type(PredType::STD_B8LE);
+
+            // Test copying an int predefined type using DataType::operator=
+            IntType another_int_type;
+            another_int_type = new_int_type;
+
+            DataSpace space(1, &nelmts);
+            dset = new DataSet(grp.createDataSet("bitfield_1", type, space));
+
+            // Fill buffer
+            for (i = 0; i < sizeof buf; i++)
+                buf[i] = static_cast<unsigned char>(0xff) ^ static_cast<unsigned char>(i);
+
+            // Write data from buf using all default dataspaces and property list
+            dset->write(buf, type);
+
+            // no failure in bitfield_1, close this dataset
+            delete dset;
+        } // end try block of bitfield_1
+
+        // catch exceptions thrown in try block of bitfield_1
+        catch (Exception &E) {
+            cerr << " FAILED" << endl;
+            cerr << "    <<<  "
+                 << "bitfield_1: " << E.getFuncName() << " - " << E.getDetailMsg() << "  >>>" << endl
+                 << endl;
+            delete dset;
+            return -1;
+        }
+
+        /* bitfield_2 */
+        nelmts = sizeof(buf) / 2;
+        try { // bitfield_2 block
+            type.copy(PredType::STD_B16LE);
+            DataSpace space(1, &nelmts);
+            dset = new DataSet(grp.createDataSet("bitfield_2", type, space));
+
+            // Fill buffer
+            for (i = 0; i < sizeof(buf); i++)
+                buf[i] = static_cast<unsigned char>(0xff) ^ static_cast<unsigned char>(i);
+
+            // Write data from buf using all default dataspaces and property
+            // list; if writing fails, deallocate dset and return.
+            dset->write(buf, type);
+
+            // no failure in bitfield_2, close this dataset and reset for
+            // variable reuse
+            delete dset;
+            dset = NULL;
+        } // end try block of bitfield_2
+
+        // catch exceptions thrown in try block of bitfield_2
+        catch (Exception &E) {
+            cerr << " FAILED" << endl;
+            cerr << "    <<<  "
+                 << "bitfield_2: " << E.getFuncName() << " - " << E.getDetailMsg() << "  >>>" << endl
+                 << endl;
+            delete dset;
+            throw E; // propagate the exception
+        }
+
+        /* opaque_1 */
+        DataType *optype = NULL;
+        try { // opaque_1 block
+            optype = new DataType(H5T_OPAQUE, 1);
+            nelmts = sizeof(buf);
+            DataSpace space(1, &nelmts);
+            optype->setTag("testing 1-byte opaque type");
+            dset = new DataSet(grp.createDataSet("opaque_1", *optype, space));
+
+            // Fill buffer
+            for (i = 0; i < sizeof buf; i++)
+                buf[i] = static_cast<unsigned char>(0xff) ^ static_cast<unsigned char>(i);
+
+            // Write data from buf using all default dataspaces and property
+            // list; if writing fails, deallocate dset and return.
+            dset->write(buf, *optype);
+
+            // no failure in opaque_1
+            delete dset;
+            dset = NULL;
+            delete optype;
+            optype = NULL;
+        } // end try block of opaque_1
+
+        // catch exceptions thrown in try block of opaque_1
+        catch (Exception &E) {
+            cerr << " FAILED" << endl;
+            cerr << "    <<<  "
+                 << "opaque_1: " << E.getFuncName() << " - " << E.getDetailMsg() << "  >>>" << endl
+                 << endl;
+            delete dset;
+            delete optype;
+            throw E; // propagate the exception
+        }
+
+        /* opaque_2 */
+        try { // block opaque_2
+            nelmts = sizeof(buf) / 4;
+            DataSpace space(1, &nelmts);
+            optype = new DataType(H5T_OPAQUE, 4);
+            optype->setTag("testing 4-byte opaque type");
+            dset = new DataSet(grp.createDataSet("opaque_2", *optype, space));
+
+            // Fill buffer
+            for (i = 0; i < sizeof(buf); i++)
+                buf[i] = static_cast<unsigned char>(0xff) ^ static_cast<unsigned char>(i);
+
+            // Write data from buf using all default dataspaces and property
+            // list; if writing fails, deallocate dset and return.
+            dset->write(buf, *optype);
+
+            // no failure in opaque_1
+            delete dset;
+            dset = NULL;
+            delete optype;
+            optype = NULL;
+        } // end try block of opaque_2
+
+        // catch exceptions thrown in try block of opaque_2
+        catch (Exception &E) {
+            cerr << " FAILED" << endl;
+            cerr << "    <<<  "
+                 << "opaque_2: " << E.getFuncName() << " - " << E.getDetailMsg() << "  >>>" << endl
+                 << endl;
+            delete dset;
+            delete optype;
+            throw E; // propagate the exception
+        }
+
+        PASSED();
+        return 0;
+    } // end top try block
+
+    catch (Exception &E) {
+        return -1;
+    }
+} // test_types
+
+/*-------------------------------------------------------------------------
+ * Function:    test_getNativeObjinfo
  *
- * Programmer:  Binh-Minh Ribler (using C version)
- *		February 17, 2001
+ * Purpose      Tests getNativeObjinfo()
  *
- * Modifications:
+ * Return       Success: 0
+ *              Failure: -1
  *
+ * July, 2018
  *-------------------------------------------------------------------------
  */
 static herr_t
-test_types(H5File& file)
+test_getnativeinfo(H5File &file)
 {
-    SUBTEST("Various datatypes");
+    SUBTEST("Getting object information");
 
-    size_t		i;
-    DataSet* dset = NULL;
     try {
+        // Create a data space
+        hsize_t dims[2];
+        dims[0] = 256;
+        dims[1] = 512;
+        DataSpace space(2, dims, NULL);
+
+        // Create a dataset using the default dataset creation properties.
+        // We're not sure what they are, so we won't check.
+        DataSet dataset(file.openDataSet(DSET_CHUNKED_NAME));
+
+        // Get dataset header info
+        H5O_native_info_t ninfo;
+        HDmemset(&ninfo, 0, sizeof(ninfo));
+        dataset.getNativeObjinfo(ninfo, H5O_NATIVE_INFO_HDR);
+        verify_val(static_cast<long>(ninfo.hdr.nchunks), 1, "DataSet::getNativeObjinfo", __LINE__, __FILE__);
+        dataset.close();
+
+        // Open the dataset we created above and then close it.  This is one
+        // way to open an existing dataset for accessing.
+        dataset = file.openDataSet(DSET_DEFAULT_NAME);
+        HDmemset(&ninfo, 0, sizeof(ninfo));
+        dataset.getNativeObjinfo(ninfo, H5O_NATIVE_INFO_ALL);
+        verify_val(static_cast<long>(ninfo.hdr.nchunks), 1, "DataSet::getNativeObjinfo", __LINE__, __FILE__);
+        dataset.close();
+
+        PASSED();
+        return 0;
+    } // outer most try block
+
+    catch (InvalidActionException &E) {
+        cerr << " FAILED" << endl;
+        cerr << "    <<<  " << E.getDetailMsg() << "  >>>" << endl << endl;
+        return -1;
+    }
+    // catch all other exceptions
+    catch (Exception &E) {
+        issue_fail_msg("test_getnativeinfo", __LINE__, __FILE__);
+        return -1;
+    }
+} // test_getnativeinfo
 
-	// Create a group in the file that was passed in from the caller
-	Group grp = file.createGroup ("typetests");
-
-	/* bitfield_1 */
-	unsigned char	buf[32];
-	hsize_t nelmts = sizeof(buf);
-	DataType type;
-	try { // block of bitfield_1
-	    // test copying a predefined type
-	    type.copy (PredType::STD_B8LE);
-
-	    // Test copying a user-defined type using DataType::copy
-	    DataType copied_type;
-	    copied_type.copy(type);
-
-	    // Test copying a user-defined type using DataType::operator=
-	    DataType another_copied_type;
-	    another_copied_type = type;
-
-	    // Test copying a user-defined int type using DataType::operator=
-	    IntType orig_int(PredType::STD_B8LE);
-	    DataType generic_type;
-	    generic_type = orig_int;
-
-	    // Test copying an integer predefined type
-	    IntType new_int_type(PredType::STD_B8LE);
-
-	    // Test copying an int predefined type using DataType::operator=
-	    IntType another_int_type;
-	    another_int_type = new_int_type;
-
-	    DataSpace space (1, &nelmts);
-	    dset = new DataSet(grp.createDataSet("bitfield_1", type, space));
-
-	    // Fill buffer
-	    for (i=0; i<sizeof buf; i++)
-	    	buf[i] = (unsigned char)0xff ^ (unsigned char)i;
-
-	    // Write data from buf using all default dataspaces and property list
-	    dset->write (buf, type);
-
-	    // no failure in bitfield_1, close this dataset
-	    delete dset;
-	} // end try block of bitfield_1
-
-	// catch exceptions thrown in try block of bitfield_1
-	catch (Exception E)
-	{
-	    cerr << " FAILED" << endl;
-	    cerr << "    <<<  " << "bitfield_1: " << E.getFuncName()
-		 << " - " << E.getDetailMsg() << "  >>>" << endl << endl;
-	    if (dset != NULL)
-		delete dset;
-	    return -1;
-	}
-
-	/* bitfield_2 */
-	nelmts = sizeof(buf)/2;
-	try { // bitfield_2 block
-	    type.copy (PredType::STD_B16LE);
-	    DataSpace space (1, &nelmts);
-	    dset = new DataSet(grp.createDataSet("bitfield_2", type, space));
-
-	    // Fill buffer
-	    for (i=0; i<sizeof(buf); i++)
-		buf[i] = (unsigned char)0xff ^ (unsigned char)i;
-
-	    // Write data from buf using all default dataspaces and property
-	    // list; if writing fails, deallocate dset and return.
-	    dset->write (buf, type);
-
-	    // no failure in bitfield_2, close this dataset and reset for
-	    // variable reuse
-	    delete dset;
-	    dset = NULL;
-	} // end try block of bitfield_2
-
-	// catch exceptions thrown in try block of bitfield_2
-	catch (Exception E) {
-	    cerr << " FAILED" << endl;
-	    cerr << "    <<<  " << "bitfield_2: " << E.getFuncName()
-		 << " - " << E.getDetailMsg() << "  >>>" << endl << endl;
-	    if (dset != NULL)
-		delete dset;
-	    throw E; // propagate the exception
-	}
-
-	/* opaque_1 */
-	DataType* optype = NULL;
-	try { // opaque_1 block
-	    optype = new DataType(H5T_OPAQUE, 1);
-	    nelmts = sizeof(buf);
-	    DataSpace space (1, &nelmts);
-	    optype->setTag ("testing 1-byte opaque type");
-	    dset = new DataSet(grp.createDataSet("opaque_1", *optype, space));
-
-	    // Fill buffer
-	    for (i=0; i<sizeof buf; i++)
-		buf[i] = (unsigned char)0xff ^ (unsigned char)i;
-
-	    // Write data from buf using all default dataspaces and property
-	    // list; if writing fails, deallocate dset and return.
-	    dset->write (buf, *optype);
-
-	    // no failure in opaque_1
-	    delete dset; dset = NULL;
-	    delete optype; optype = NULL;
-	} // end try block of opaque_1
-
-	// catch exceptions thrown in try block of opaque_1
-	catch (Exception E) {
-	    cerr << " FAILED" << endl;
-	    cerr << "    <<<  " << "opaque_1: " << E.getFuncName()
-		 << " - " << E.getDetailMsg() << "  >>>" << endl << endl;
-	    if (dset != NULL)
-		delete dset;
-	    if (optype != NULL)
-		delete optype;
-	    throw E; // propagate the exception
-	}
-
-	/* opaque_2 */
-	try { // block opaque_2
-	    nelmts = sizeof(buf)/4;
-	    DataSpace space (1, &nelmts);
-	    optype = new DataType(H5T_OPAQUE, 4);
-	    optype->setTag ("testing 4-byte opaque type");
-	    dset = new DataSet(grp.createDataSet("opaque_2", *optype, space));
-
-	    // Fill buffer
-	    for (i=0; i<sizeof(buf); i++)
-		buf[i] = (unsigned char)0xff ^ (unsigned char)i;
-
-	    // Write data from buf using all default dataspaces and property
-	    // list; if writing fails, deallocate dset and return.
-	    dset->write (buf, *optype);
-
-	    // no failure in opaque_1
-	    delete dset; dset = NULL;
-	    delete optype; optype = NULL;
-	} //end try block of opaque_2
-
-	// catch exceptions thrown in try block of opaque_2
-	catch (Exception E) {
-	    cerr << " FAILED" << endl;
-	    cerr << "    <<<  " << "opaque_2: " << E.getFuncName()
-		 << " - " << E.getDetailMsg() << "  >>>" << endl << endl;
-	    if (dset != NULL)
-		delete dset;
-	    if (optype != NULL)
-		delete optype;
-	    throw E; // propagate the exception
-	}
-
-	PASSED();
-	return 0;
+/*-------------------------------------------------------------------------
+ * Function:    test_chunk_cache
+ *
+ * Purpose      Tests setting rdcc info on a DAPL, and interaction
+ *              with the corresponding properties in the file structure.
+ *
+ * Return       Success:        0
+ *              Failure:        number of errors
+ *
+ * July 2018
+ *-------------------------------------------------------------------------
+ */
+const int          RANK1 = 1;
+const H5std_string FILE_ACCPLIST("test_accplist.h5");
+
+static herr_t
+test_chunk_cache(const FileAccPropList &fapl)
+{
+    SUBTEST("DSetAccPropList::set/getChunkCache");
+
+    try {
+        // Create a default dataset access and file access property lists
+        FileAccPropList fapl_def;
+        DSetAccPropList dapl;
+
+        // Verify that chunk cache parameters are the same
+        int    mdc_nelmts = 0;
+        size_t nslots_1 = 0, nslots_4 = 0, nbytes_1 = 0, nbytes_4 = 0;
+        double w0_1 = 0.0, w0_4 = 0.0;
+        fapl_def.getCache(mdc_nelmts, nslots_1, nbytes_1, w0_1);
+        dapl.getChunkCache(nslots_4, nbytes_4, w0_4);
+        verify_val(nslots_1, nslots_4, "DSetAccPropList::getChunkCache", __LINE__, __FILE__);
+        verify_val(nbytes_1, nbytes_4, "DSetAccPropList::getChunkCache", __LINE__, __FILE__);
+        if (abs(w0_1 - w0_4) > DBL_EPSILON)
+            TestErrPrintf("%d: w0_1 and w0_4 different: w0_1=%f, "
+                          "w0_4=%f\n",
+                          __LINE__, w0_1, w0_4);
+
+        // Set a link access property on dapl to verify property list inheritance
+        dapl.setNumLinks(134);
+        size_t nlinks = dapl.getNumLinks();
+        verify_val(static_cast<long>(nlinks), 134, "DSetAccPropList::getNumLinks", __LINE__, __FILE__);
+
+        // Make a copy of the external fapl
+        FileAccPropList fapl_local(fapl);
+
+        // Set new rdcc settings on fapl local
+        size_t nslots_2 = nslots_1 * 2;
+        size_t nbytes_2 = nbytes_1 * 2;
+        double w0_2     = w0_1 / 2.0;
+        fapl_local.getCache(mdc_nelmts, nslots_2, nbytes_2, w0_2);
+
+        // Create a new file using default fcpl and the passed-in fapl
+        H5File file(FILE_ACCPLIST, H5F_ACC_TRUNC, FileCreatPropList::DEFAULT, fapl_local);
+
+        // Create dataset creation property list
+        DSetCreatPropList dcpl;
+
+        // Set chunk dimensions
+        hsize_t cdims[RANK1];
+        cdims[0] = 10;
+        dcpl.setChunk(RANK1, cdims);
+
+        // Create memory space
+        hsize_t mdims[RANK1];
+        mdims[0] = 10;
+        DataSpace mspace(RANK1, mdims);
+
+        // Create a dataset using that dataset creation properties
+        DataSet dataset(file.createDataSet(DSET_CHUNKED_NAME, PredType::NATIVE_INT, mspace, dcpl, dapl));
+
+        // Get the dataset access property list
+        DSetAccPropList dapl2 = dataset.getAccessPlist();
+
+        // Retrieve and verify the raw data chunk cache parameters
+        nslots_4 = nbytes_4 = 0;
+        w0_4                = 0.0;
+        dapl2.getChunkCache(nslots_4, nbytes_4, w0_4);
+        verify_val(nslots_2, nslots_4, "DSetCreatPropList::getChunkCache", __LINE__, __FILE__);
+        verify_val(nbytes_2, nbytes_4, "DSetCreatPropList::getChunkCache", __LINE__, __FILE__);
+        verify_val(H5_DBL_ABS_EQUAL(w0_2, w0_4), 1, "DSetCreatPropList::getChunkCache", __LINE__, __FILE__);
+
+        // Set new values on original dapl
+        size_t nslots_3 = nslots_1 * 2;
+        size_t nbytes_3 = H5D_CHUNK_CACHE_NBYTES_DEFAULT;
+        double w0_3     = w0_2 / 2;
+        dapl.getChunkCache(nslots_3, nbytes_3, w0_3);
+
+        // Close dataset
+        dataset.close();
+
+        // Reopen dataset
+        DataSet dataset2(file.openDataSet(DSET_CHUNKED_NAME, dapl));
+
+        // Get the dataset access property list
+        DSetAccPropList dapl3 = dataset2.getAccessPlist();
+
+        // Retrieve and verify the raw data chunk cache parameters
+        dapl3.getChunkCache(nslots_4, nbytes_4, w0_4);
+        verify_val(nslots_3, nslots_4, "DSetCreatPropList::getLayout", __LINE__, __FILE__);
+        verify_val(nbytes_3, nbytes_4, "DSetCreatPropList::getLayout", __LINE__, __FILE__);
+        verify_val(H5_DBL_ABS_EQUAL(w0_3, w0_4), 1, "DSetCreatPropList::getLayout", __LINE__, __FILE__);
+
+        PASSED();
+        return 0;
     } // end top try block
 
-    catch (Exception E)
-    {
-	return -1;
+    catch (Exception &E) {
+        return -1;
     }
-}   // test_types
+} // test_chunk_cache
 
 /*-------------------------------------------------------------------------
- * Function:	test_dset
- *
- * Purpose:	Tests the dataset interface (H5D)
+ * Function:    test_virtual
  *
- * Return:	Success: 0
+ * Purpose      Tests fixed, unlimited, and printf selections in the same
+ *              VDS
  *
- *		Failure: -1
+ * Return       Success:        0
+ *              Failure:        number of errors
+ *-------------------------------------------------------------------------
+ */
+const int RANK = 2;
+
+static herr_t
+test_virtual()
+{
+    SUBTEST("DSetCreatPropList::setVirtual");
+
+    try {
+        // Create DCPLs
+        DSetCreatPropList dcpl;
+        DSetCreatPropList srcdcpl;
+
+        // Set fill value
+        char *fill = NULL;
+        dcpl.setFillValue(PredType::NATIVE_INT, &fill);
+
+        // Set chunk dimensions
+        hsize_t cdims[RANK];
+        cdims[0] = 2;
+        cdims[1] = 2;
+        srcdcpl.setChunk(RANK, cdims);
+
+        // Create memory space
+        hsize_t mdims[RANK];
+        mdims[0] = 10;
+        mdims[1] = 10;
+        DataSpace memspace(RANK, mdims);
+
+        // Get the current layout, should be default, H5D_CONTIGUOUS
+        H5D_layout_t layout = dcpl.getLayout();
+        verify_val(static_cast<long>(layout), static_cast<long>(H5D_CONTIGUOUS),
+                   "DSetCreatPropList::getLayout", __LINE__, __FILE__);
+
+        // Create fixed mapping
+        hsize_t dims[RANK];
+        dims[0] = 6;
+        dims[1] = 6;
+        DataSpace vspace(RANK, dims, mdims);
+
+        hsize_t start[RANK]; // Hyperslab start
+        hsize_t count[RANK]; // Hyperslab count
+        start[0] = start[1] = 3;
+        count[0] = count[1] = 3;
+        vspace.selectHyperslab(H5S_SELECT_SET, count, start);
+
+        DataSpace srcspace(RANK, count);
+
+        H5std_string src_file = "src_file_map.h5";
+        H5std_string src_dset = "src_dset_fixed";
+        dcpl.setVirtual(vspace, src_file, src_dset, srcspace);
+
+        // Get and verify the new layout
+        layout = dcpl.getLayout();
+        verify_val(static_cast<long>(layout), static_cast<long>(H5D_VIRTUAL), "DSetCreatPropList::getLayout",
+                   __LINE__, __FILE__);
+
+        PASSED();
+        return 0;
+    } // end top try block
+
+    catch (Exception &E) {
+        return -1;
+    }
+} // test_virtual
+
+/*-------------------------------------------------------------------------
+ * Function:    test_operator
  *
- * Programmer:	Binh-Minh Ribler (using C version)
- *		Friday, January 5, 2001
+ * Purpose      Tests DataSet::operator=
  *
- * Modifications:
- *	Nov 12, 01:
- *		- moved h5_cleanup to outside of try block because
- *		  dataset.h5 cannot be removed until "file" is out of
- *		  scope and dataset.h5 is closed.
- *	Feb 20, 05:
- *		- cleanup_dsets took care of the cleanup now.
+ * Return       Success: 0
  *
+ *              Failure: -1
  *-------------------------------------------------------------------------
  */
-#ifdef __cplusplus
-extern "C"
-#endif
-void test_dset()
+static herr_t
+test_operator(H5File &file)
 {
-    hid_t	fapl_id;
-    fapl_id = h5_fileaccess(); // in h5test.c, returns a file access template
+    SUBTEST("DataSet::operator=");
+
+    try {
+        // Create a data space
+        hsize_t dims[2];
+        dims[0] = 256;
+        dims[1] = 512;
+        DataSpace space(2, dims, NULL);
 
-    int		nerrors=0;	// keep track of number of failures occurr
+        // Create a dataset using the default dataset creation properties.
+        // We're not sure what they are, so we won't check.
+        DataSet dataset = file.createDataSet(DSET_OPERATOR, PredType::NATIVE_DOUBLE, space);
 
-    try
-    {
-	// Use the file access template id to create a file access prop.
-	// list object to pass in H5File::H5File
-	FileAccPropList fapl(fapl_id);
+        // Add a comment to the dataset
+        file.setComment(DSET_OPERATOR, "Dataset using operator=");
 
-	H5File file(FILE1, H5F_ACC_TRUNC, FileCreatPropList::DEFAULT, fapl);
+        // Close the dataset
+        dataset.close();
 
-	// Cause the library to emit initial messages
-	Group grp = file.createGroup( "emit diagnostics", 0);
-	grp.setComment("Causes diagnostic messages to be emitted");
+        // Re-open the dataset
+        DataSet another_dataset(file.openDataSet(DSET_OPERATOR));
 
-	nerrors += test_create(file) < 0 ? 1:0;
-	nerrors += test_simple_io(file) < 0 ? 1:0;
-	nerrors += test_tconv(file) < 0 ? 1:0;
-	nerrors += test_compression(file) < 0 ? 1:0;
-	nerrors += test_multiopen (file) < 0 ? 1:0;
-	nerrors += test_types(file) < 0 ? 1:0;
+        // Try operator= to make another dataset
+        DataSet copied_dataset = another_dataset;
+
+        H5std_string copied_dataset_name  = copied_dataset.getObjName();
+        H5std_string another_dataset_name = another_dataset.getObjName();
+
+        PASSED();
+        return 0;
+    } // try block
+
+    // catch all other exceptions
+    catch (Exception &E) {
+        issue_fail_msg("test_operator", __LINE__, __FILE__);
 
-	// Close group "emit diagnostics".
-	grp.close();
+        // clean up and return with failure
+        return -1;
+    }
+} // test_operator
 
-	// Close the file before testing data size.
-	file.close();
+/*-------------------------------------------------------------------------
+ * Function:    test_dset
+ *
+ * Purpose      Tests the dataset interface (H5D)
+ *
+ * Return       Success: 0
+ *
+ *              Failure: -1
+ *
+ * Modifications:
+ *        Nov 12, 01:
+ *              - moved h5_cleanup to outside of try block because
+ *                dataset.h5 cannot be removed until "file" is out of
+ *                scope and dataset.h5 is closed.
+ *        Feb 20, 05:
+ *              - cleanup_dsets took care of the cleanup now.
+ *
+ *-------------------------------------------------------------------------
+ */
+extern "C" void
+test_dset()
+{
+    hid_t fapl_id;
+    fapl_id     = h5_fileaccess(); // in h5test.c, returns a file access template
+    int nerrors = 0;               // keep track of number of failures occur
 
-	nerrors += test_datasize(fapl) <0 ? 1:0;
+    try {
+        // Use the file access template id to create a file access prop.
+        // list object to pass in H5File::H5File
+        FileAccPropList fapl(fapl_id);
+
+        H5File file(FILE1, H5F_ACC_TRUNC, FileCreatPropList::DEFAULT, fapl);
+
+        // Cause the library to emit initial messages
+        Group grp = file.createGroup("emit diagnostics", 0);
+        grp.setComment("Causes diagnostic messages to be emitted");
+
+        nerrors += test_create(file) < 0 ? 1 : 0;
+        nerrors += test_simple_io(file) < 0 ? 1 : 0;
+        nerrors += test_getnativeinfo(file) < 0 ? 1 : 0;
+        nerrors += test_tconv(file) < 0 ? 1 : 0;
+        nerrors += test_compression(file) < 0 ? 1 : 0;
+        nerrors += test_nbit_compression(file) < 0 ? 1 : 0;
+        nerrors += test_multiopen(file) < 0 ? 1 : 0;
+        nerrors += test_types(file) < 0 ? 1 : 0;
+        nerrors += test_virtual() < 0 ? 1 : 0;
+        nerrors += test_operator(file) < 0 ? 1 : 0;
+        nerrors += test_chunk_cache(fapl) < 0 ? 1 : 0;
+
+        // Close group "emit diagnostics".
+        grp.close();
+
+        // Close the file before testing data size.
+        file.close();
+
+        nerrors += test_datasize(fapl) < 0 ? 1 : 0;
     }
-    catch (Exception E)
-    {
-	test_report(nerrors, H5std_string(" Dataset"));
+    catch (Exception &E) {
+        test_report(nerrors, H5std_string(" Dataset"));
     }
 
     // Clean up data file
     cleanup_dsets();
-}   // test_dset
+} // test_dset
 
 /*-------------------------------------------------------------------------
  * Function:    cleanup_dsets
  *
- * Purpose:     Cleanup temporary test files
- *
- * Return:      none
+ * Purpose      Cleanup temporary test files
  *
- * Programmer:  (use C version)
- *
- * Modifications:
+ * Return       None
  *
+ * Programmer   (use C version)
  *-------------------------------------------------------------------------
  */
-#ifdef __cplusplus
-extern "C"
-#endif
-void cleanup_dsets()
+extern "C" void
+cleanup_dsets()
 {
     HDremove(FILE1.c_str());
+    HDremove(FILE_ACCPLIST.c_str());
 } // cleanup_dsets
-
diff --git a/c++/test/h5cpputil.cpp b/c++/test/h5cpputil.cpp
index 40e81cc..02805db 100644
--- a/c++/test/h5cpputil.cpp
+++ b/c++/test/h5cpputil.cpp
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*****************************************************************************
@@ -21,181 +18,180 @@
 
  ***************************************************************************/
 
-#ifdef OLD_HEADER_FILENAME
-#include <iostream.h>
-#else
 #include <iostream>
-#endif
-#include <string>
+using std::cerr;
+using std::endl;
 
-#ifndef H5_NO_NAMESPACE
-#ifndef H5_NO_STD
-    using std::cerr;
-    using std::endl;
-#endif  // H5_NO_STD
-#endif
+#include <string>
+#include "H5Cpp.h" // C++ API header file
+using namespace H5;
 
 #include "h5test.h"
-#include "H5Cpp.h"
-
-#ifndef H5_NO_NAMESPACE
-    using namespace H5;
-#endif
+#include "h5cpputil.h" // C++ utilility header file
 
-#include "h5cpputil.h"
-
-
 /*-------------------------------------------------------------------------
- * Function:	test_report
- *
- * Purpose:	Prints out the number of errors for the tests indicated
- * 		by 'testname,' if there were any failures occurred.  If
- * 		no failure, test_report prints out the tests passed message.
+ * Function:    test_report
  *
- * Return:	if any failure has occurred:	1
+ * Purpose      Prints out the number of errors for the tests indicated
+ *              by 'testname,' if there were any failures occurred.  If
+ *              no failure, test_report prints out the tests passed message.
  *
- *		if no failure occurs:	0
+ * Return       if any failure has occurred: 1
  *
- * Programmer:	Binh-Minh Ribler (using C code segment for reporting tests)
- *		Friday, February 6, 2001
- *
- * Modifications:
+ *              if no failure occurs: 0
  *
+ * Programmer   Binh-Minh Ribler (using C code segment for reporting tests)
+ *              Friday, February 6, 2001
  *-------------------------------------------------------------------------
  */
-int test_report( int nerrors, const H5std_string& testname )
+int
+test_report(int nerrors, const H5std_string &testname)
 {
-   if (nerrors)
-   {
-      nerrors = MAX(1, nerrors);
-	if (1 == nerrors)
-	    cerr << "***** " << nerrors << testname
-					<< " TEST FAILED! *****" << endl;
-	else
-	    cerr << "***** " << nerrors << testname
-					<< " TESTS FAILED! *****" << endl;
-      return 1;
-   }
-   else
-   {
-      cerr << "All" << testname << " tests passed." << endl;
-      return 0;
-   }
+    if (nerrors) {
+        nerrors = MAX(1, nerrors);
+        if (1 == nerrors)
+            cerr << "***** " << nerrors << testname << " TEST FAILED! *****" << endl;
+        else
+            cerr << "***** " << nerrors << testname << " TESTS FAILED! *****" << endl;
+        return 1;
+    }
+    else {
+        cerr << "All" << testname << " tests passed." << endl;
+        return 0;
+    }
 }
 
 /*-------------------------------------------------------------------------
- * Function:	issue_fail_msg
+ * Function:    issue_fail_msg
  *
- * Purpose:	Displays that a function has failed with its location.
+ * Purpose      Displays that a function has failed with its location.
  *
- * Return:	None
+ * Return       None
  *
- * Programmer:	Binh-Minh Ribler (copied and modified macro CHECK from C)
- *		Monday, December 20, 2004
+ * Programmer   Binh-Minh Ribler (copied and modified macro CHECK from C)
+ *              Monday, December 20, 2004
  *
  *-------------------------------------------------------------------------
  */
-void issue_fail_msg(const char* where, int line, const char* file_name,
-		    const char* message)
+void
+issue_fail_msg(const char *where, int line, const char *file_name, const char *message)
 {
-    //if (GetTestVerbosity()>=VERBO_HI)
-    {
-	cerr << endl;
-        cerr << ">>> FAILED in " << where << " at line " << line
-             << " in " << file_name << " - " << message << endl << endl;
+    if (GetTestVerbosity() >= VERBO_HI) {
+        cerr << endl;
+        cerr << ">>> FAILED in " << where << " at line " << line << " in " << file_name << " - " << message
+             << endl
+             << endl;
     }
 }
 
 /*-------------------------------------------------------------------------
- * Function:	issue_fail_msg
+ * Function:    issue_fail_msg
  *
- * Purpose:	Displays that a function has failed with its location.
+ * Purpose      Displays that a function has failed with its location.
  *
- * Return:	None
+ * Return       None
  *
- * Programmer:	Binh-Minh Ribler (copied and modified macro CHECK from C)
- *		Monday, December 20, 2004
+ * Programmer   Binh-Minh Ribler (copied and modified macro CHECK from C)
+ *              Monday, December 20, 2004
  *
  *-------------------------------------------------------------------------
  */
-void issue_fail_msg(const char* where, int line, const char* file_name,
-		    const char* func_name, const char* message)
+void
+issue_fail_msg(const char *where, int line, const char *file_name, const char *func_name, const char *message)
 {
-    //if (GetTestVerbosity()>=VERBO_HI)
-    {
-	cerr << endl;
-        cerr << ">>> FAILED in " << where << ": " << func_name << endl <<
-		"    at line " << line << " in " << file_name << endl <<
-		"    C library detail: " << message << endl << endl;
+    if (GetTestVerbosity() >= VERBO_HI) {
+        cerr << endl;
+        cerr << ">>> FAILED in " << where << ": " << func_name << endl
+             << "    at line " << line << " in " << file_name << endl
+             << "    C library detail: " << message << endl
+             << endl;
     }
 }
 
 /*-------------------------------------------------------------------------
- * Function:	check_values
+ * Function:    check_values
  *
- * Purpose:	Checks a read value against the written value.  If they are
- *		different, the function will print out a message and the
- *		different values.  This function is made to reuse the code
- *		segment that is used in various places throughout
- *		the test code.  Where the C version of this code segment
- *		"goto error," this function will return -1.
+ * Purpose      Checks a read value against the written value.  If they are
+ *              different, the function will print out a message and the
+ *              different values.  This function is made to reuse the code
+ *              segment that is used in various places throughout
+ *              the test code.  Where the C version of this code segment
+ *              "goto error," this function will return -1.
  *
- * Return:	Success:	0
+ * Return       Success: 0
  *
- *		Failure:	-1
- *
- * Programmer:	Binh-Minh Ribler (using C code segment for checking values)
- *		Friday, February 6, 2001
- *
- * Modifications:
+ *              Failure: -1
  *
+ * Programmer   Binh-Minh Ribler (using C code segment for checking values)
+ *              Friday, February 6, 2001
  *-------------------------------------------------------------------------
  */
-int check_values (hsize_t i, hsize_t j, int apoint, int acheck)
+int
+check_values(hsize_t i, hsize_t j, int apoint, int acheck)
 {
-    if (apoint != acheck)
-    {
-	cerr << "    Read different values than written.\n" << endl;
-	cerr << "    At index " << (unsigned long)i << "," <<
-   	(unsigned long)j << endl;
-	return -1;
+    if (apoint != acheck) {
+        cerr << "    Read different values than written.\n" << endl;
+        cerr << "    At index " << static_cast<unsigned long>(i) << "," << static_cast<unsigned long>(j)
+             << endl;
+        return -1;
     }
     return 0;
 } // check_values
 
 /*-------------------------------------------------------------------------
- * Function:	verify_val (const char*, const char*,...)
+ * Function:    check_values
+ *
+ * Purpose      Checks a char string pointer for NULL.  If it is NULL,
+ *              the function will print out a message
+ *
+ * Return       Success: 0
+ *
+ *              Failure: -1
  *
- * Purpose:	Compares two character strings.  If they are
- *		different, the function will print out a message and the
- *		different values.
+ * Programmer   Binh-Minh Ribler (using C code segment for checking values)
+ *              Friday, September 16, 2016
  *
- * Return:	Success:	0
+ *-------------------------------------------------------------------------
+ */
+void
+check_values(const char *value, const char *msg, int line, const char *file_name)
+{
+    if (value == NULL) {
+        cerr << endl;
+        cerr << "*** ERROR: " << msg << ", at line " << line << endl;
+        IncTestNumErrs();
+        throw TestFailedException(file_name, msg);
+    }
+}
+
+/*-------------------------------------------------------------------------
+ * Function:    verify_val (const char*, const char*,...)
  *
- *		Failure:	-1
+ * Purpose      Compares two character strings.  If they are
+ *              different, the function will print out a message and the
+ *              different values.
  *
- * Programmer:	Binh-Minh Ribler
- *		May 2, 2010
+ * Return       Success: 0
  *
- * Modifications:
+ *              Failure: -1
  *
+ * Programmer   Binh-Minh Ribler
+ *              May 2, 2010
  *-------------------------------------------------------------------------
  */
-void verify_val(const char* x, const char* value, const char* where, int line, const char* file_name)
+void
+verify_val(const char *x, const char *value, const char *where, int line, const char *file_name)
 {
-    if (GetTestVerbosity()>=VERBO_HI)
-    {
+    if (GetTestVerbosity() >= VERBO_HI) {
         cerr << endl;
-        cerr << "   Call to routine: " << where << " at line " << line
-             << " in " << file_name <<  " had value " << x << endl;
+        cerr << "   Call to routine: " << where << " at line " << line << " in " << file_name << " had value "
+             << x << endl;
     }
-    if (strcmp(x, value) != 0)
-    {
+    if (strcmp(x, value) != 0) {
         cerr << endl;
-        cerr << "*** UNEXPECTED VALUE from " << where << " should be "
-             << value << ", but is " << x << " at line " << line
-             << " in " << file_name << endl;
-        IncTestNumErrs();
+        cerr << "*** UNEXPECTED VALUE from " << where << " should be " << value << ", but is " << x
+             << " at line " << line << " in " << file_name << endl;
+        // IncTestNumErrs();
         throw TestFailedException(where, "");
     }
 }
@@ -203,44 +199,57 @@ void verify_val(const char* x, const char* value, const char* where, int line, c
 //--------------------------------------------------------------------------
 // Function:    InvalidActionException default constructor
 //--------------------------------------------------------------------------
-InvalidActionException::InvalidActionException():Exception(){}
+InvalidActionException::InvalidActionException() : Exception()
+{
+}
 
 //--------------------------------------------------------------------------
 // Function:    InvalidActionException overloaded constructor
 //
-// Purpose:	Creates an InvalidActionException with the name of the function,
+// Purpose      Creates an InvalidActionException with the name of the function,
 //              which the failure should have occurred but didn't, and a
-//		message explaining why it should fail.
+//              message explaining why it should fail.
 // Parameters
-//		func_name - IN: Name of the function where failure should occur
-//		message   - IN: Message
+//              func    - IN: Name of the function where failure should occur
+//              message - IN: Message
 //--------------------------------------------------------------------------
-InvalidActionException::InvalidActionException(const H5std_string func_name, const H5std_string message) : Exception(func_name, message) {}
+InvalidActionException::InvalidActionException(const H5std_string &func, const H5std_string &message)
+    : Exception(func, message)
+{
+}
 
 //--------------------------------------------------------------------------
 // Function:    InvalidActionException destructor
 //--------------------------------------------------------------------------
-InvalidActionException::~InvalidActionException() throw() {}
+InvalidActionException::~InvalidActionException() throw()
+{
+}
 
 //--------------------------------------------------------------------------
 // Function:    TestFailedException default constructor
 //--------------------------------------------------------------------------
-TestFailedException::TestFailedException():Exception(){}
+TestFailedException::TestFailedException() : Exception()
+{
+}
 
 //--------------------------------------------------------------------------
 // Function:    TestFailedException overloaded constructor
 //
-// Purpose:	Creates an TestFailedException with the name of the function,
+// Purpose      Creates an TestFailedException with the name of the function,
 //              which the failure should have occurred but didn't, and a
-//		message explaining why it should fail.
+//              message explaining why it should fail.
 // Parameters
-//		func_name - IN: Name of the function where failure should occur
-//		message   - IN: Message
+//              func    - IN: Name of the function where failure should occur
+//              message - IN: Message
 //--------------------------------------------------------------------------
-TestFailedException::TestFailedException(const H5std_string func_name, const H5std_string message) : Exception(func_name, message) {}
+TestFailedException::TestFailedException(const H5std_string &func, const H5std_string &message)
+    : Exception(func, message)
+{
+}
 
 //--------------------------------------------------------------------------
 // Function:    TestFailedException destructor
 //--------------------------------------------------------------------------
-TestFailedException::~TestFailedException() throw() {}
-
+TestFailedException::~TestFailedException() throw()
+{
+}
diff --git a/c++/test/h5cpputil.h b/c++/test/h5cpputil.h
index 8625213..a5477b6 100644
--- a/c++/test/h5cpputil.h
+++ b/c++/test/h5cpputil.h
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*****************************************************************************
@@ -21,117 +18,131 @@
 
  ***************************************************************************/
 
-#ifndef _h5cpputil_h
-#define _h5cpputil_h
+#ifndef H5cpputil_H
+#define H5cpputil_H
 
 #include "h5test.h"
 
-#ifndef H5_NO_NAMESPACE
 using namespace H5;
-#endif
-
-#ifndef H5_NO_STD
 using std::cerr;
 using std::endl;
-#endif
 
-#define MESSAGE(V,A) {if (HDGetTestVerbosity()>(V)) print_func A;}
-#define SUBTEST(TEST) {printf("   Subtest: %-52s",TEST); fflush(stdout);}
+#define MESSAGE(V, A)                                                                                        \
+    {                                                                                                        \
+        if (HDGetTestVerbosity() > (V))                                                                      \
+            print_func A;                                                                                    \
+    }
+#define SUBTEST(TEST)                                                                                        \
+    {                                                                                                        \
+        printf("   Subtest: %-52s", TEST);                                                                   \
+        fflush(stdout);                                                                                      \
+    }
 
-int check_values (hsize_t i, hsize_t j, int apoint, int acheck);
-int test_report (int, const H5std_string&);
-void issue_fail_msg(const char* where, int line, const char* file_name,
-		    const char* message="");
-void issue_fail_msg(const char* where, int line, const char* file_name,
-		    const char* func_name, const char* message);
+int  check_values(hsize_t i, hsize_t j, int apoint, int acheck);
+void check_values(const char *value, const char *msg, int line, const char *file_name);
+int  test_report(int, const H5std_string &);
+void issue_fail_msg(const char *where, int line, const char *file_name, const char *message = "");
+void issue_fail_msg(const char *where, int line, const char *file_name, const char *func_name,
+                    const char *message);
 
 class InvalidActionException : public Exception {
-   public:
-	InvalidActionException(const H5std_string func_name, const H5std_string message = DEFAULT_MSG);
-	InvalidActionException();
-	virtual ~InvalidActionException() throw();
+  public:
+    InvalidActionException(const H5std_string &func_name, const H5std_string &message = DEFAULT_MSG);
+    InvalidActionException();
+    ~InvalidActionException() throw() override;
 };
 
 class TestFailedException : public Exception {
-   public:
-	TestFailedException(const H5std_string func_name, const H5std_string message = DEFAULT_MSG);
-	TestFailedException();
-	virtual ~TestFailedException() throw();
+  public:
+    TestFailedException(const H5std_string &func_name, const H5std_string &message = DEFAULT_MSG);
+    TestFailedException();
+    ~TestFailedException() throw() override;
 };
 
 // Overloaded/Template functions to verify values and display proper info
-void verify_val(const char* x, const char* value, const char* where, int line, const char* file_name);
+
+// Verifies
+void verify_val(const char *x, const char *value, const char *where, int line, const char *file_name);
 
 template <class Type1, class Type2>
-    void verify_val(Type1 x, Type2 value, const char* where, int line, const char* file_name)
+void
+verify_val(Type1 x, Type2 value, const char *where, int line, const char *file_name)
 {
-    if (GetTestVerbosity()>=VERBO_HI)
-    {
-	cerr << endl;
-        cerr << "   Call to routine: " << where << " at line " << line
-	     << " in " << file_name <<  " had value " << x << endl;
+    if (GetTestVerbosity() >= VERBO_HI) {
+        cerr << endl;
+        cerr << "   Call to routine: " << where << " at line " << line << " in " << file_name << " had value "
+             << x << endl;
     }
-    if (x != value)
-    {
-	cerr << endl;
-        cerr << "*** UNEXPECTED VALUE from " << where << " should be "
-	     << value << ", but is " << x << " at line " << line
-	     << " in " << file_name << endl;
-	IncTestNumErrs();
-	throw TestFailedException(where, "");
+    if (x != value) {
+        cerr << endl;
+        cerr << "*** UNEXPECTED VALUE from " << where << " should be " << value << ", but is " << x
+             << " at line " << line << " in " << file_name << endl;
+        IncTestNumErrs();
+        throw TestFailedException(where, "");
     }
 }
 
 template <class Type1, class Type2>
-    void verify_val(Type1 x, Type2 value, const char* msg, const char* file_name, int line)
+void
+verify_val(Type1 x, Type2 value, const char *msg, const char *file_name, int line)
 {
-    if (x != value)
-    {
-	cerr << endl;
-        cerr << "*** UNEXPECTED VALUE: " << file_name << ":line " << line
-	     << ":" << msg << " different: " << x << ", should be " << value
-	     << endl;
-	IncTestNumErrs();
-	throw TestFailedException(file_name, msg);
+    if (x != value) {
+        cerr << endl;
+        cerr << "*** UNEXPECTED VALUE: " << file_name << ":line " << line << ": " << msg
+             << " different: " << x << ", should be " << value << endl;
+        IncTestNumErrs();
+        throw TestFailedException(file_name, msg);
     }
 }
 
 template <class Type1, class Type2>
-    void verify_val_noteq(Type1 x, Type2 value, const char* where, int line, const char* file_name)
+void
+verify_val_noteq(Type1 x, Type2 value, const char *where, int line, const char *file_name)
 {
-    if (GetTestVerbosity()>=VERBO_HI)
-    {
-	cerr << endl;
-        cerr << "   Call to routine: " << where << " at line " << line
-	     << " in " << file_name <<  " had value " << x << endl;
+    if (GetTestVerbosity() >= VERBO_HI) {
+        cerr << endl;
+        cerr << "   Call to routine: " << where << " at line " << line << " in " << file_name << " had value "
+             << x << endl;
     }
-    if (x == value)
-    {
-	cerr << endl;
-        cerr << "*** UNEXPECTED VALUE from " << where << " should not be "
-	     << value << " at line " << line << " in " << file_name << endl;
-	IncTestNumErrs();
-	throw TestFailedException(where, "");
+    if (x == value) {
+        cerr << endl;
+        cerr << "*** UNEXPECTED VALUE from " << where << " should not be " << value << " at line " << line
+             << " in " << file_name << endl;
+        IncTestNumErrs();
+        throw TestFailedException(where, "");
     }
 }
 
 template <class Type1, class Type2>
-    void CHECK(Type1 x, Type2 value, const char* msg, int line, const char* file_name)
+void
+CHECK(Type1 x, Type2 value, const char *msg, int line, const char *file_name)
 {
-    if (x == value)
-    {
-	cerr << endl;
+    if (x == value) {
+        cerr << endl;
         cerr << "*** Function " << msg << " FAILED at line " << line << endl;
-	IncTestNumErrs();
-	throw TestFailedException(file_name, msg);
+        IncTestNumErrs();
+        throw TestFailedException(file_name, msg);
     }
 }
 
+template <class Type1, class Type2>
+void
+verify_val(Type1 x, Type2 value, float epsilon, const char *msg, int line, const char *file_name)
+{
+    if (x == value) {
+        cerr << endl;
+        cerr << "*** UNEXPECTED FLOAT VALUE: " << file_name << ":line " << line << ": " << msg
+             << " different: " << x << ", should be " << value << " (epsilon=" << epsilon << ")" << endl;
+        IncTestNumErrs();
+        throw TestFailedException(file_name, msg);
+    }
+}
 
 /* Prototypes for the test routines */
 #ifdef __cplusplus
 extern "C" {
 #endif
+void test_array();
 void test_attr();
 void test_compound();
 void test_dsproplist();
@@ -139,6 +150,7 @@ void test_file();
 void test_filters();
 void test_links();
 void test_h5s();
+void test_iterate();
 void test_object();
 void test_reference();
 void test_types();
@@ -146,14 +158,16 @@ void test_vlstrings();
 void test_dset();
 
 /* Prototypes for the cleanup routines */
+void cleanup_array();
 void cleanup_attr();
 void cleanup_compound();
 void cleanup_dsproplist();
 void cleanup_dsets();
 void cleanup_file();
 void cleanup_filters();
-void cleanup_links();
 void cleanup_h5s();
+void cleanup_iterate();
+void cleanup_links();
 void cleanup_object();
 void cleanup_reference();
 void cleanup_types();
@@ -167,7 +181,6 @@ void cleanup_vlstrings();
 void cleanup_select(void);
 void cleanup_time(void);
 void cleanup_vltypes(void);
-void cleanup_iterate(void);
 void cleanup_array(void);
 void cleanup_genprop(void);
 void cleanup_misc(void);
diff --git a/c++/test/tarray.cpp b/c++/test/tarray.cpp
new file mode 100644
index 0000000..63324ba
--- /dev/null
+++ b/c++/test/tarray.cpp
@@ -0,0 +1,520 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/*****************************************************************************
+   FILE
+   tarray.cpp - HDF5 C++ testing the array datatype functionality
+
+ ***************************************************************************/
+#include <iostream>
+using std::cerr;
+using std::endl;
+
+#include <string>
+#include "H5Cpp.h" // C++ API header file
+using namespace H5;
+
+#include "h5test.h"
+#include "h5cpputil.h" // C++ utilility header file
+
+const H5std_string FILENAME("tarray.h5");
+const H5std_string ARRAYTYPE_NAME("/Array type 1");
+const int          SPACE1_RANK = 1;
+const hsize_t      SPACE1_DIM1 = 4;
+const int          ARRAY1_RANK = 1;
+const hsize_t      ARRAY1_DIM1 = 4;
+
+typedef enum flt_t { FLT_FLOAT, FLT_DOUBLE, FLT_LDOUBLE, FLT_OTHER } flt_t;
+
+typedef enum int_t {
+    INT_CHAR,
+    INT_UCHAR,
+    INT_SHORT,
+    INT_USHORT,
+    INT_INT,
+    INT_UINT,
+    INT_LONG,
+    INT_ULONG,
+    INT_LLONG,
+    INT_ULLONG,
+    INT_OTHER
+} int_t;
+
+/*-------------------------------------------------------------------------
+ * Function:    test_array_compound_array
+ *
+ * Purpose      Tests 1-D array of compound datatypes (with array fields)
+ *
+ * Return       None
+ *
+ * Programmer   Binh-Minh Ribler (using C version)
+ *              January, 2016
+ *-------------------------------------------------------------------------
+ */
+static void
+test_array_compound_array()
+{
+    SUBTEST("ArrayType::getArrayNDims & ArrayType::getArrayDims");
+    typedef struct { // Typedef for compound datatype */
+        int   i;
+        float f[ARRAY1_DIM1];
+    } s1_t;
+    s1_t        wdata[SPACE1_DIM1][ARRAY1_DIM1]; // Information to write
+    s1_t        rdata[SPACE1_DIM1][ARRAY1_DIM1]; // Information read in
+    hsize_t     sdims1[] = {SPACE1_DIM1};
+    hsize_t     tdims1[] = {ARRAY1_DIM1};
+    int         nmemb;            // Number of compound members
+    int         ii;               // counting variables
+    hsize_t     idxi, idxj, idxk; // dimension indicing variables
+    H5T_class_t mclass;           // Datatype class for field
+
+    // Initialize array data to write
+    for (idxi = 0; idxi < SPACE1_DIM1; idxi++)
+        for (idxj = 0; idxj < ARRAY1_DIM1; idxj++) {
+            wdata[idxi][idxj].i = static_cast<int>(idxi * 10 + idxj);
+            for (idxk = 0; idxk < ARRAY1_DIM1; idxk++) {
+                float temp = static_cast<float>(idxi) * 10.0F + static_cast<float>(idxj) * 2.5F +
+                             static_cast<float>(idxk);
+                wdata[idxi][idxj].f[idxk] = temp;
+            }
+        } // end for
+
+    try {
+        // Create File
+        H5File file1(FILENAME, H5F_ACC_TRUNC);
+
+        // Create dataspace for datasets
+        DataSpace space(SPACE1_RANK, sdims1, NULL);
+
+        /*
+         * Create an array datatype of compounds, arrtype.  Each compound
+         * datatype, comptype, contains an integer and an array of floats,
+         * arrfltype.
+         */
+
+        // Create a compound datatype
+        CompType comptype(sizeof(s1_t));
+
+        // Insert integer field
+        comptype.insertMember("i", HOFFSET(s1_t, i), PredType::NATIVE_INT);
+
+        // Create an array of floats datatype
+        ArrayType arrfltype(PredType::NATIVE_FLOAT, ARRAY1_RANK, tdims1);
+
+        // Insert float array field
+        comptype.insertMember("f", HOFFSET(s1_t, f), arrfltype);
+
+        // Close array of floats field datatype
+        arrfltype.close();
+
+        // Create an array datatype of the compound datatype
+        ArrayType arrtype(comptype, ARRAY1_RANK, tdims1);
+
+        // Close compound datatype comptype
+        comptype.close();
+
+        // Create a dataset
+        DataSet dataset = file1.createDataSet("Dataset1", arrtype, space);
+
+        // Write dataset to disk
+        dataset.write(wdata, arrtype);
+
+        // Test opening ArrayType with opening constructor (Dec 2016)
+
+        // Commit the arrtype to give it a name
+        arrtype.commit(file1, ARRAYTYPE_NAME);
+
+        // Close it, then re-open with the opening constructor
+        arrtype.close();
+        ArrayType named_type(file1, ARRAYTYPE_NAME);
+
+        // Get and verify the type's name
+        H5std_string type_name = named_type.getObjName();
+        verify_val(type_name, ARRAYTYPE_NAME, "DataType::getObjName tests constructor", __LINE__, __FILE__);
+        named_type.close();
+
+        // Close all
+        dataset.close();
+        space.close();
+        file1.close();
+
+        // Re-open file
+        file1.openFile(FILENAME, H5F_ACC_RDONLY);
+
+        // Open the dataset
+        dataset = file1.openDataSet("Dataset1");
+
+        /*
+         * Check the datatype array of compounds
+         */
+
+        // Verify that it is an array of compounds
+        DataType dstype = dataset.getDataType();
+        mclass          = dstype.getClass();
+        verify_val(mclass == H5T_ARRAY, true, "f2_type.getClass", __LINE__, __FILE__);
+
+        dstype.close();
+
+        // Get the array datatype to check
+        ArrayType atype_check = dataset.getArrayType();
+
+        // Check the array rank
+        int ndims = atype_check.getArrayNDims();
+        verify_val(ndims, ARRAY1_RANK, "atype_check.getArrayNDims", __LINE__, __FILE__);
+
+        // Get the array dimensions
+        hsize_t rdims1[H5S_MAX_RANK];
+        atype_check.getArrayDims(rdims1);
+
+        // Check the array dimensions
+        for (ii = 0; ii < ndims; ii++)
+            if (rdims1[ii] != tdims1[ii]) {
+                TestErrPrintf("Array dimension information doesn't match!, rdims1[%d]=%" PRIuHSIZE
+                              ", tdims1[%d]=%" PRIuHSIZE "\n",
+                              ii, rdims1[ii], ii, tdims1[ii]);
+                continue;
+            } // end if
+
+        // Test ArrayType::ArrayType(const hid_t existing_id)
+        ArrayType new_arrtype(atype_check.getId());
+
+        // Check the array rank
+        ndims = new_arrtype.getArrayNDims();
+        verify_val(ndims, ARRAY1_RANK, "new_arrtype.getArrayNDims", __LINE__, __FILE__);
+
+        // Get the array dimensions
+        new_arrtype.getArrayDims(rdims1);
+
+        // Check the array dimensions
+        for (ii = 0; ii < ndims; ii++)
+            if (rdims1[ii] != tdims1[ii]) {
+                TestErrPrintf("Array dimension information doesn't match!, rdims1[%d]=%" PRIuHSIZE
+                              ", tdims1[%d]=%" PRIuHSIZE "\n",
+                              ii, rdims1[ii], ii, tdims1[ii]);
+                continue;
+            } // end if
+
+        /*
+         * Check the compound datatype and the array of floats datatype
+         * in the compound.
+         */
+        // Get the compound datatype, which is the base datatype of the
+        // array datatype atype_check.
+        DataType base_type = atype_check.getSuper();
+        mclass             = base_type.getClass();
+        verify_val(mclass == H5T_COMPOUND, true, "atype_check.getClass", __LINE__, __FILE__);
+
+        // Verify the compound datatype info
+        CompType ctype_check(base_type.getId());
+        base_type.close();
+
+        // Check the number of members
+        nmemb = ctype_check.getNmembers();
+        verify_val(nmemb, 2, "ctype_check.getNmembers", __LINE__, __FILE__);
+
+        // Check the 2nd field's name
+        H5std_string field2_name = ctype_check.getMemberName(1);
+        if (HDstrcmp(field2_name.c_str(), "f") != 0)
+            TestErrPrintf("Compound field name doesn't match!, field2_name=%s\n", field2_name.c_str());
+
+        // Get the 2nd field's datatype
+        DataType f2_type = ctype_check.getMemberDataType(1);
+
+        // Get the 2nd field's class, this 2nd field should have an array type
+        mclass = f2_type.getClass();
+        verify_val(mclass == H5T_ARRAY, true, "f2_type.getClass", __LINE__, __FILE__);
+        f2_type.close();
+
+        // Get the 2nd field, array of floats datatype, to check
+        ArrayType f2_atype_check = ctype_check.getMemberArrayType(1);
+
+        // Check the array rank
+        ndims = f2_atype_check.getArrayNDims();
+        verify_val(ndims, ARRAY1_RANK, "f2_atype_check.getArrayNDims", __LINE__, __FILE__);
+
+        // Get the array dimensions
+        HDmemset(rdims1, 0, sizeof(rdims1));
+        f2_atype_check.getArrayDims(rdims1);
+
+        // Check the array dimensions
+        for (ii = 0; ii < ndims; ii++)
+            if (rdims1[ii] != tdims1[ii]) {
+                TestErrPrintf("Array dimension information doesn't match!, rdims1[%d]=%" PRIuHSIZE
+                              ", tdims1[%d]=%" PRIuHSIZE "\n",
+                              ii, rdims1[ii], ii, tdims1[ii]);
+                continue;
+            } // end if
+
+        // Close done datatypes
+        f2_atype_check.close();
+        ctype_check.close();
+
+        // Read dataset from disk
+        dataset.read(rdata, atype_check);
+
+        // Compare data read in
+        for (idxi = 0; idxi < SPACE1_DIM1; idxi++) {
+            for (idxj = 0; idxj < ARRAY1_DIM1; idxj++) {
+                if (wdata[idxi][idxj].i != rdata[idxi][idxj].i) {
+                    TestErrPrintf("Array data information doesn't match!, wdata[%" PRIuHSIZE "][%" PRIuHSIZE
+                                  "].i=%d, "
+                                  "rdata[%" PRIuHSIZE "][%" PRIuHSIZE "].i=%d\n",
+                                  idxi, idxj, wdata[idxi][idxj].i, idxi, idxj, rdata[idxi][idxj].i);
+                    continue;
+                } // end if
+            }     // end for
+        }         // end for
+
+        // Close all
+        atype_check.close();
+        dataset.close();
+        file1.close();
+        PASSED();
+    } // end of try block
+    catch (Exception &E) {
+        issue_fail_msg("test_array_compound_array", __LINE__, __FILE__, E.getCDetailMsg());
+    }
+
+} // end test_array_compound_array()
+
+/*
+ * Helper routine to demonstrate the issue in HDFFV-9562
+ */
+static H5::DataType
+getArr()
+{
+    hsize_t *dims = new hsize_t;
+    *dims         = 5;
+    H5::ArrayType ret;
+    ret = H5::ArrayType(H5::PredType::NATIVE_INT, 1, dims);
+    delete dims;
+    return ret;
+}
+
+/*-------------------------------------------------------------------------
+ * Function:    test_array_assignment
+ *
+ * Purpose      Tests the operator=
+ *
+ * Return       None
+ *
+ * Programmer   Binh-Minh Ribler (using C version)
+ *              March, 2016
+ *
+ * Description:
+ *              Used user's sample code in HDFFV-9562
+ *-------------------------------------------------------------------------
+ */
+static void
+test_array_assignment()
+{
+    hsize_t sdims1[] = {SPACE1_DIM1};
+    SUBTEST("ArrayType::operator=");
+
+    try {
+        // Create File
+        H5File file1(FILENAME, H5F_ACC_TRUNC);
+
+        // Create dataspace for datasets
+        DataSpace space(SPACE1_RANK, sdims1, NULL);
+
+        /*
+         * Create an array datatype of compounds, arrtype.  Each compound
+         * datatype, comptype, contains an integer and an array of floats,
+         * arrfltype.
+         */
+
+        // Create a compound datatype
+        CompType comptype(static_cast<size_t>(24));
+
+        // Insert integer field
+        comptype.insertMember("i", 0, PredType::NATIVE_INT);
+
+        // Insert float array field
+        comptype.insertMember("a", 4, getArr());
+
+        // Create a dataset
+        DataSet dataset = file1.createDataSet("Dataset1", comptype, space);
+
+        // Close all
+        dataset.close();
+        comptype.close();
+        space.close();
+        file1.close();
+
+        PASSED();
+    } // end of try block
+    catch (Exception &E) {
+        issue_fail_msg("test_array_assignment", __LINE__, __FILE__, E.getCDetailMsg());
+    }
+} // end test_array_assignment()
+
+/*-------------------------------------------------------------------------
+ * Function:    test_array_info
+ *
+ * Purpose      Tests getting array information using the const methods.
+ *
+ * Return       None
+ *
+ * Programmer   Binh-Minh Ribler
+ *              April, 2016
+ *-------------------------------------------------------------------------
+ */
+static void
+test_array_info()
+{
+    SUBTEST("ArrayType Const Methods");
+    typedef struct { // Typedef for compound datatype */
+        int   i;
+        float f[ARRAY1_DIM1];
+    } s1_t;
+    s1_t        wdata[SPACE1_DIM1][ARRAY1_DIM1]; // Information to write
+    hsize_t     sdims1[] = {SPACE1_DIM1};
+    hsize_t     tdims1[] = {ARRAY1_DIM1};
+    int         ii;               // counting variables
+    hsize_t     idxi, idxj, idxk; // dimension indicing variables
+    H5T_class_t mclass;           // Datatype class for field
+
+    // Initialize array data to write
+    for (idxi = 0; idxi < SPACE1_DIM1; idxi++)
+        for (idxj = 0; idxj < ARRAY1_DIM1; idxj++) {
+            wdata[idxi][idxj].i = static_cast<int>(idxi * 10 + idxj);
+            for (idxk = 0; idxk < ARRAY1_DIM1; idxk++) {
+                float temp = static_cast<float>(idxi) * 10.0F + static_cast<float>(idxj) * 2.5F +
+                             static_cast<float>(idxk);
+                wdata[idxi][idxj].f[idxk] = temp;
+            }
+        }
+
+    try {
+        // Create File
+        H5File file1(FILENAME, H5F_ACC_TRUNC);
+
+        // Create dataspace for datasets
+        DataSpace space(SPACE1_RANK, sdims1, NULL);
+
+        /*
+         * Create some array datatypes, then close the file.
+         */
+
+        // Create an array of floats datatype
+        ArrayType arrfltype(PredType::NATIVE_FLOAT, ARRAY1_RANK, tdims1);
+
+        // Create an array datatype of the compound datatype
+        ArrayType arrtype(PredType::NATIVE_UINT, ARRAY1_RANK, tdims1);
+
+        // Create a dataset
+        DataSet dataset = file1.createDataSet("Dataset1", arrtype, space);
+
+        // Write dataset to disk
+        dataset.write(wdata, arrtype);
+
+        // Close array of floats field datatype
+        arrfltype.close();
+
+        // Close all
+        dataset.close();
+        arrtype.close();
+        space.close();
+        file1.close();
+
+        // Re-open file
+        file1.openFile(FILENAME, H5F_ACC_RDONLY);
+
+        // Open the dataset
+        dataset = file1.openDataSet("Dataset1");
+
+        /*
+         * Check the datatype array of compounds
+         */
+
+        // Verify that it is an array of compounds
+        DataType dstype = dataset.getDataType();
+        mclass          = dstype.getClass();
+        verify_val(mclass == H5T_ARRAY, true, "f2_type.getClass", __LINE__, __FILE__);
+
+        dstype.close();
+
+        { // Let atype_check go out of scope
+            // Get the array datatype, declared as const
+            const ArrayType atype_check = dataset.getArrayType();
+
+            // Check the array rank with the const method
+            int ndims = atype_check.getArrayNDims();
+            verify_val(ndims, ARRAY1_RANK, "atype_check.getArrayNDims", __LINE__, __FILE__);
+
+            // Get the array dimensions with the const method
+            hsize_t rdims1[H5S_MAX_RANK];
+            atype_check.getArrayDims(rdims1);
+
+            // Check the array dimensions
+            for (ii = 0; ii < ndims; ii++)
+                if (rdims1[ii] != tdims1[ii]) {
+                    TestErrPrintf("Array dimension information doesn't match!, rdims1[%d]=%" PRIuHSIZE
+                                  ", tdims1[%d]=%" PRIuHSIZE "\n",
+                                  ii, rdims1[ii], ii, tdims1[ii]);
+                    continue;
+                }
+        }
+
+        // Close all
+        dataset.close();
+        file1.close();
+        PASSED();
+    } // end of try block
+    catch (Exception &E) {
+        issue_fail_msg("test_array_info", __LINE__, __FILE__, E.getCDetailMsg());
+    }
+
+} // end test_array_info()
+
+/*-------------------------------------------------------------------------
+ * Function:    test_array
+ *
+ * Purpose      Main datatypes testing routine
+ *
+ * Return       None
+ *-------------------------------------------------------------------------
+ */
+extern "C" void
+test_array()
+{
+    // Output message about test being performed
+    MESSAGE(5, ("Testing Array Datatypes\n"));
+
+    // Test array of compounds with array field
+    test_array_compound_array();
+
+    // Test operator= (HDFFV-9562)
+    test_array_assignment();
+
+    // Test const functions (HDFFV-9725)
+    test_array_info();
+
+} // test_array()
+
+/*-------------------------------------------------------------------------
+ * Function:    cleanup_array
+ *
+ * Purpose      Cleanup temporary test files
+ *
+ * Return       None
+ *
+ * Programmer   Binh-Minh Ribler (using C version)
+ *              January, 2016
+ *-------------------------------------------------------------------------
+ */
+extern "C" void
+cleanup_array()
+{
+    HDremove(FILENAME.c_str());
+} // cleanup_array
diff --git a/c++/test/tattr.cpp b/c++/test/tattr.cpp
index 407e6a8..4a35763 100644
--- a/c++/test/tattr.cpp
+++ b/c++/test/tattr.cpp
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*****************************************************************************
@@ -19,40 +16,30 @@
         C attribute interface (H5A)
 
  ***************************************************************************/
-
-#ifdef OLD_HEADER_FILENAME
-#include <iostream.h>
-#else
+#include <cfloat>
+#include <cmath>
 #include <iostream>
-#endif
-#include <string>
-
-#ifndef H5_NO_NAMESPACE
-#ifndef H5_NO_STD
-    using std::cerr;
-    using std::endl;
-#endif  // H5_NO_STD
-#endif
+using std::cerr;
+using std::endl;
 
-#include "H5Cpp.h"	// C++ API header file
-
-#ifndef H5_NO_NAMESPACE
-    using namespace H5;
-#endif
+#include <string>
+#include "H5Cpp.h" // C++ API header file
+using namespace H5;
 
-#include "h5cpputil.h"	// C++ utilility header file
+#include "h5test.h"
+#include "h5cpputil.h" // C++ utilility header file
 
-const H5std_string	FILE_BASIC("tattr_basic.h5");
-const H5std_string	FILE_COMPOUND("tattr_compound.h5");
-const H5std_string	FILE_SCALAR("tattr_scalar.h5");
-const H5std_string	FILE_MULTI("tattr_multi.h5");
-const H5std_string	FILE_DTYPE("tattr_dtype.h5");
-const H5std_string	ATTR_TMP_NAME("temp_attr_name");
-const H5std_string	FATTR_TMP_NAME("temp_fattr_name");
-const size_t		ATTR_MAX_DIMS = 7;
+const H5std_string FILE_BASIC("tattr_basic.h5");
+const H5std_string FILE_COMPOUND("tattr_compound.h5");
+const H5std_string FILE_SCALAR("tattr_scalar.h5");
+const H5std_string FILE_MULTI("tattr_multi.h5");
+const H5std_string FILE_DTYPE("tattr_dtype.h5");
+const H5std_string ATTR_TMP_NAME("temp_attr_name");
+const H5std_string FATTR_TMP_NAME("temp_fattr_name");
+const size_t       ATTR_MAX_DIMS = 7;
 
 /* 3-D dataset with fixed dimensions */
-const int SPACE1_RANK = 3;
+const int     SPACE1_RANK = 3;
 const hsize_t SPACE1_DIM1 = 3;
 const hsize_t SPACE1_DIM2 = 15;
 const hsize_t SPACE1_DIM3 = 13;
@@ -64,434 +51,467 @@ const H5std_string TYPE1_NAME("/Type");
 
 /* Attribute Rank & Dimensions */
 const H5std_string ATTR1_NAME("Attr1");
-const int ATTR1_RANK = 1;
-const hsize_t ATTR1_DIM1 = 3;
-int attr_data1[ATTR1_DIM1]={512,-234,98123}; /* Test data for 1st attribute */
+const int          ATTR1_RANK             = 1;
+const hsize_t      ATTR1_DIM1             = 3;
+int                attr_data1[ATTR1_DIM1] = {512, -234, 98123}; /* Test data for 1st attribute */
 
 // File attribute, using the same rank and dimensions as ATTR1_NAME's
 const H5std_string FATTR1_NAME("File Attr1");
 const H5std_string FATTR2_NAME("File Attr2");
 
 const H5std_string ATTR2_NAME("Attr2");
-const int ATTR2_RANK = 2;
-const hsize_t ATTR2_DIM1 = 2;
-const hsize_t ATTR2_DIM2 = 2;
-int attr_data2[ATTR2_DIM1][ATTR2_DIM2]={{7614,-416},{197814,-3}}; /* Test data for 2nd attribute */
+const int          ATTR2_RANK          = 2;
+const hsize_t      ATTR2_DIM1          = 2;
+const hsize_t      ATTR2_DIM2          = 2;
+int attr_data2[ATTR2_DIM1][ATTR2_DIM2] = {{7614, -416}, {197814, -3}}; /* Test data for 2nd attribute */
 
 const H5std_string ATTR3_NAME("Attr3");
-const int ATTR3_RANK = 3;
-const hsize_t ATTR3_DIM1 = 2;
-const hsize_t ATTR3_DIM2 = 2;
-const hsize_t ATTR3_DIM3 = 2;
-double attr_data3[ATTR3_DIM1][ATTR3_DIM2][ATTR3_DIM3]={{{2.3,-26.1},{0.123,-10.0}},{{981724.2,-0.91827},{2.0,23.0}}}; /* Test data for 3rd attribute */
+const int          ATTR3_RANK                                     = 3;
+const hsize_t      ATTR3_DIM1                                     = 2;
+const hsize_t      ATTR3_DIM2                                     = 2;
+const hsize_t      ATTR3_DIM3                                     = 2;
+double             attr_data3[ATTR3_DIM1][ATTR3_DIM2][ATTR3_DIM3] = {
+    {{2.3, -26.1}, {0.123, -10.0}}, {{981724.2, -0.91827}, {2.0, 23.0}}}; /* Test data for 3rd attribute */
 
 const H5std_string ATTR4_NAME("Attr4");
-const int ATTR4_RANK = 2;
-const hsize_t ATTR4_DIM1 = 2;
-const hsize_t ATTR4_DIM2 = 2;
+const int          ATTR4_RANK = 2;
+const hsize_t      ATTR4_DIM1 = 2;
+const hsize_t      ATTR4_DIM2 = 2;
 
 const H5std_string ATTR4_FIELDNAME1("i");
 const H5std_string ATTR4_FIELDNAME2("d");
 const H5std_string ATTR4_FIELDNAME3("c");
-size_t attr4_field1_off=0;
-size_t attr4_field2_off=0;
-size_t attr4_field3_off=0;
+size_t             attr4_field1_off = 0;
+size_t             attr4_field2_off = 0;
+size_t             attr4_field3_off = 0;
 struct attr4_struct {
-    int i;
+    int    i;
     double d;
-    char c;
- } attr_data4[ATTR4_DIM1][ATTR4_DIM2]={{{3,-26.1,'d'},{-100000, 0.123,'3'}},
-    {{-23,981724.2,'Q'},{0,2.0,'\n'}}}; // Test data for 4th attribute
+    char   c;
+} attr_data4[ATTR4_DIM1][ATTR4_DIM2] = {
+    {{3, -26.1, 'd'}, {-100000, 0.123, '3'}},
+    {{-23, 981724.2, 'Q'}, {0, 2.0, '\n'}}}; // Test data for 4th attribute
 
 const H5std_string ATTR5_NAME("Attr5");
-const int ATTR5_RANK = 0;
-float attr_data5 = (float)-5.123;    	// Test data for 5th attribute
+const int          ATTR5_RANK = 0;
+float              attr_data5 = -5.123F; // Test data for 5th attribute
 
 /* Info for another attribute */
 const H5std_string ATTR1A_NAME("Attr1_a");
-int attr_data1a[ATTR1_DIM1]={256,11945,-22107};
-
-/****************************************************************
-**
-**  test_attr_basic_write(): Test basic write attribute.
-**      Tests integer attributes on both datasets and groups
-**
-****************************************************************/
-static void test_attr_basic_write()
+int                attr_data1a[ATTR1_DIM1] = {256, 11945, -22107};
+
+/*-------------------------------------------------------------------------
+ * Function:    test_attr_basic_write
+ *
+ * Purpose      Test basic write attribute on both datasets and groups.
+ *
+ * Return       None
+ *-------------------------------------------------------------------------
+ */
+static void
+test_attr_basic_write(FileAccPropList &fapl)
 {
-    hsize_t dims1[] = {SPACE1_DIM1, SPACE1_DIM2, SPACE1_DIM3};
-    hsize_t dims2[] = {ATTR1_DIM1};
-    hsize_t dims3[] = {ATTR2_DIM1,ATTR2_DIM2};
-    int     read_data1[ATTR1_DIM1]={0}; // Buffer for reading 1st attribute
+    hsize_t dims1[]                = {SPACE1_DIM1, SPACE1_DIM2, SPACE1_DIM3};
+    hsize_t dims2[]                = {ATTR1_DIM1};
+    hsize_t dims3[]                = {ATTR2_DIM1, ATTR2_DIM2};
+    int     read_data1[ATTR1_DIM1] = {0}; // Buffer for reading 1st attribute
     hsize_t i;
 
     // Output message about test being performed
     SUBTEST("Basic Attribute Writing Functions");
 
     try {
-	// Create file
-	H5File fid1 (FILE_BASIC, H5F_ACC_TRUNC);
-
-	// Create dataspace for dataset
-	DataSpace ds_space (SPACE1_RANK, dims1);
-
-	/*
-	 *		Test attribute with dataset
-	 */
-
-	// Create a dataset
-	DataSet dataset = fid1.createDataSet(DSET1_NAME, PredType::NATIVE_UCHAR, ds_space);
+        // Create file
+        H5File fid1(FILE_BASIC, H5F_ACC_TRUNC, FileCreatPropList::DEFAULT, fapl);
 
-	// Create dataspace for attribute
-	DataSpace att_space (ATTR1_RANK, dims2);
+        // Create dataspace for dataset
+        DataSpace ds_space(SPACE1_RANK, dims1);
 
-	// Create a file attribute
-	Attribute file_attr2 = fid1.createAttribute (FATTR1_NAME, PredType::NATIVE_INT, att_space);
+        /*
+         *                Test attribute with dataset
+         */
 
-	// Create a file attribute
-	Attribute file_attr1 = fid1.createAttribute (FATTR2_NAME, PredType::NATIVE_INT, att_space);
+        // Create a dataset
+        DataSet dataset = fid1.createDataSet(DSET1_NAME, PredType::NATIVE_UCHAR, ds_space);
 
-	// Create an attribute for the dataset
-	Attribute ds_attr1 = dataset.createAttribute (ATTR1_NAME, PredType::NATIVE_INT, att_space);
+        // Create dataspace for attribute
+        DataSpace att_space(ATTR1_RANK, dims2);
 
-	// Try creating an attribute that already exists.  This should fail
-	// since two attributes cannot have the same name.  If an exception
-	// is not thrown for this action by createAttribute, then throw an
-	// invalid action exception.
-	try {
-	    Attribute invalid_attr = dataset.createAttribute (ATTR1_NAME, PredType::NATIVE_INT, att_space);
+        // Create a file attribute
+        Attribute file_attr2 = fid1.createAttribute(FATTR1_NAME, PredType::NATIVE_INT, att_space);
 
-	    // continuation here, that means no exception has been thrown
-	    throw InvalidActionException("H5File::createDataSet", "Library allowed overwrite of existing dataset");
-	}
-	catch (AttributeIException E) // catching invalid creating attribute
-        {} // do nothing, exception expected
+        // Create a file attribute
+        Attribute file_attr1 = fid1.createAttribute(FATTR2_NAME, PredType::NATIVE_INT, att_space);
 
-	// Write attribute information
-	ds_attr1.write (PredType::NATIVE_INT, attr_data1);
+        // Create an attribute for the dataset
+        Attribute ds_attr1 = dataset.createAttribute(ATTR1_NAME, PredType::NATIVE_INT, att_space);
 
-	// Read attribute information immediately, without closing attribute
-	ds_attr1.read (PredType::NATIVE_INT, read_data1);
+        // Try creating an attribute that already exists.  This should fail
+        // since two attributes cannot have the same name.  If an exception
+        // is not thrown for this action by createAttribute, then throw an
+        // invalid action exception.
+        try {
+            Attribute invalid_attr = dataset.createAttribute(ATTR1_NAME, PredType::NATIVE_INT, att_space);
 
-	// Verify values read in
-	for(i=0; i<ATTR1_DIM1; i++)
-	    if(attr_data1[i]!=read_data1[i])
-		TestErrPrintf("%d: attribute data different: attr_data1[%d]=%d,read_data1[%d]=%d\n",__LINE__,i,attr_data1[i],i,read_data1[i]);
-
-	// Create two more attributes for this dataset, but only write to one.
-	Attribute ds_attr2 = dataset.createAttribute (ATTR2_NAME, PredType::NATIVE_INT, att_space);
-	Attribute ds_attr3 = dataset.createAttribute (ATTR3_NAME, PredType::NATIVE_INT, att_space);
-
-	// Write attribute information
-	ds_attr2.write (PredType::NATIVE_INT, attr_data1a);
-
-	// Read attribute information immediately, without closing attribute
-	ds_attr2.read (PredType::NATIVE_INT, read_data1);
-
-	// Verify values read in
-	for(i=0; i<ATTR1_DIM1; i++)
-	    if(attr_data1a[i]!=read_data1[i])
-		TestErrPrintf("%d: attribute data different: attr_data1a[%d]=%d,read_data1[%d]=%d\n",__LINE__,i,attr_data1a[i],i,read_data1[i]);
-
-	// Close both attributes
-	ds_attr1.close();
-	ds_attr2.close();
-	ds_attr3.close();
-
-	/*
-	 *		Test attribute with group
-	 */
-
-	// Create group in file fid1
-	Group group = fid1.createGroup (GROUP1_NAME);
-
-	// Create dataspace for attribute
-	DataSpace sid3(ATTR2_RANK, dims3);
-
-	// Create an attribute for the group
-	Attribute gr_attr = group.createAttribute (ATTR2_NAME, PredType::NATIVE_INT, sid3);
-
-	// Check storage size for attribute
-	hsize_t attr_size = gr_attr.getStorageSize();
-	verify_val((long)attr_size, (long)(ATTR2_DIM1*ATTR2_DIM2*sizeof(int)),
-			"Attribute::getStorageSize",__LINE__,__FILE__);
-
-	// Try to create the same attribute again (should fail)
-	try {
-	    Attribute invalid_attr = group.createAttribute (ATTR2_NAME, PredType::NATIVE_INT, sid3);
+            // continuation here, that means no exception has been thrown
+            throw InvalidActionException("H5File::createDataSet",
+                                         "Library allowed overwrite of existing dataset");
+        }
+        catch (AttributeIException &E) // catching invalid creating attribute
+        {
+        } // do nothing, exception expected
+
+        // Write attribute information
+        ds_attr1.write(PredType::NATIVE_INT, attr_data1);
+
+        // Read attribute information immediately, without closing attribute
+        ds_attr1.read(PredType::NATIVE_INT, read_data1);
+
+        // Verify values read in
+        for (i = 0; i < ATTR1_DIM1; i++)
+            if (attr_data1[i] != read_data1[i])
+                TestErrPrintf("%d: attribute data different: attr_data1[%" PRIuHSIZE
+                              "]=%d,read_data1[%" PRIuHSIZE "]=%d\n",
+                              __LINE__, i, attr_data1[i], i, read_data1[i]);
+
+        // Create two more attributes for this dataset, but only write to one.
+        Attribute ds_attr2 = dataset.createAttribute(ATTR2_NAME, PredType::NATIVE_INT, att_space);
+        Attribute ds_attr3 = dataset.createAttribute(ATTR3_NAME, PredType::NATIVE_INT, att_space);
+
+        // Write attribute information
+        ds_attr2.write(PredType::NATIVE_INT, attr_data1a);
+
+        // Read attribute information immediately, without closing attribute
+        ds_attr2.read(PredType::NATIVE_INT, read_data1);
+
+        // Verify values read in
+        for (i = 0; i < ATTR1_DIM1; i++)
+            if (attr_data1a[i] != read_data1[i])
+                TestErrPrintf("%d: attribute data different: attr_data1a[%" PRIuHSIZE
+                              "]=%d,read_data1[%" PRIuHSIZE "]=%d\n",
+                              __LINE__, i, attr_data1a[i], i, read_data1[i]);
+
+        // Close both attributes
+        ds_attr1.close();
+        ds_attr2.close();
+        ds_attr3.close();
+
+        /*
+         *                Test attribute with group
+         */
+
+        // Create group in file fid1
+        Group group = fid1.createGroup(GROUP1_NAME);
+
+        // Create dataspace for attribute
+        DataSpace sid3(ATTR2_RANK, dims3);
+
+        // Create an attribute for the group
+        Attribute gr_attr = group.createAttribute(ATTR2_NAME, PredType::NATIVE_INT, sid3);
+
+        // Check storage size for attribute
+        hsize_t attr_size = gr_attr.getStorageSize();
+        verify_val(static_cast<long>(attr_size), static_cast<long>(ATTR2_DIM1 * ATTR2_DIM2 * sizeof(int)),
+                   "Attribute::getStorageSize", __LINE__, __FILE__);
+
+        // Try to create the same attribute again (should fail)
+        try {
+            Attribute invalid_attr = group.createAttribute(ATTR2_NAME, PredType::NATIVE_INT, sid3);
             // continuation here, that means no exception has been thrown
             throw InvalidActionException("H5Group::createAttribute",
-			"Attempting to create an existing attribute");
-	}
-        catch (AttributeIException E) // catching invalid creating attribute
-        {} // do nothing, exception expected
+                                         "Attempting to create an existing attribute");
+        }
+        catch (AttributeIException &E) // catching invalid creating attribute
+        {
+        } // do nothing, exception expected
 
-	// Write attribute information
-	gr_attr.write (PredType::NATIVE_INT, attr_data2);
+        // Write attribute information
+        gr_attr.write(PredType::NATIVE_INT, attr_data2);
 
-	// Check storage size for attribute
-	attr_size = gr_attr.getStorageSize();
-	verify_val((long)attr_size, (long)(ATTR2_DIM1*ATTR2_DIM2*sizeof(int)),
-			"Attribute::getStorageSize",  __LINE__, __FILE__);
+        // Check storage size for attribute
+        attr_size = gr_attr.getStorageSize();
+        verify_val(static_cast<long>(attr_size), static_cast<long>(ATTR2_DIM1 * ATTR2_DIM2 * sizeof(int)),
+                   "Attribute::getStorageSize", __LINE__, __FILE__);
 
-	PASSED();
+        PASSED();
     } // end try block
 
-    catch (Exception E) {
-	issue_fail_msg("test_attr_basic_write()", __LINE__, __FILE__, E.getCDetailMsg());
+    catch (Exception &E) {
+        issue_fail_msg("test_attr_basic_write()", __LINE__, __FILE__, E.getCDetailMsg());
     }
-}   // test_attr_basic_write()
-
-/****************************************************************
-**
-**  test_attr_getname(): Test getting attribute name functions.
-**
-**  Test these functions:
-**  A. ssize_t Attribute::getName(char* attr_name, size_t buf_size)
-**    1. With arbitrary buf_size that is larger than the name size
-**    2. With arbitrary buf_size that is smaller than the name's length.
-**    3. With a buf_size that equals the name's length.
-**
-**  B. ssize_t Attribute::getName(H5std_string& attr_name, size_t buf_size)
-**    1. With buffer smaller than the actual name
-**    2. Same test but with retiring overloaded function
-**	ssize_t Attribute::getName(size_t buf_size, H5std_string& attr_name)
-**
-**  C. H5std_string Attribute::getName()
-**
-**  D. H5std_string Attribute::getName(size_t len)
-**
-**  E. ssize_t Attribute::getName(H5std_string& attr_name, size_t buf_size)
-**	With buffer size equals the name's length, i.e., buf_size=0
-**
-****************************************************************/
-static void test_attr_getname()
+} // test_attr_basic_write()
+
+/*-------------------------------------------------------------------------
+ * Function:    test_attr_getname
+ *
+ * Purpose      Test getting attribute name.
+ *
+ * Description
+ *  Test these functions:
+ *  A. ssize_t Attribute::getName(char* attr_name, size_t buf_size)
+ *    1. With arbitrary buf_size that is larger than the name size
+ *    2. With arbitrary buf_size that is smaller than the name's length.
+ *    3. With a buf_size that equals the name's length.
+ *
+ *  B. ssize_t Attribute::getName(H5std_string& attr_name, size_t buf_size)
+ *    1. With buffer smaller than the actual name
+ *    2. Same test but with retiring overloaded function
+ *        ssize_t Attribute::getName(size_t buf_size, H5std_string& attr_name)
+ *
+ *  C. H5std_string Attribute::getName()
+ *
+ *  D. H5std_string Attribute::getName(size_t len)
+ *
+ *  E. ssize_t Attribute::getName(H5std_string& attr_name, size_t buf_size)
+ *        With buffer size equals the name's length, i.e., buf_size=0
+ *
+ * Return       None
+ *-------------------------------------------------------------------------
+ */
+static void
+test_attr_getname(FileAccPropList &fapl)
 {
     // Output message about test being performed
     SUBTEST("Testing all overloads of Attribute::getName");
 
     try {
-	//
-	// Open the file FILE_BASIC and test getName with its attribute
-	//
-
-	// Open file
-	H5File fid1(FILE_BASIC, H5F_ACC_RDWR);
-
-	// Check for existence of attribute FATTR1_NAME
-	bool attr_exists = fid1.attrExists(FATTR1_NAME);
-	if (attr_exists == false)
-	    throw InvalidActionException("H5File::attrExists", "Attribute should exist but does not");
-
-	// Open attribute 
-	Attribute fattr1(fid1.openAttribute(FATTR1_NAME));
-
-	// A. Get attribute name with
-	// ssize_t Attribute::getName(char* attr_name, size_t buf_size)
-	// using different buffer sizes and verify against FATTR1_NAME (3 cases)
-
-	// 1. With arbitrary buf_size that is larger than the name size
-	size_t buf_size = FATTR1_NAME.length() + 10;
-	char* fattr1_name = new char[buf_size+1];
-	HDmemset(fattr1_name, 0, buf_size+1);
-	ssize_t name_size = 0; // actual length of attribute name
-	name_size = fattr1.getName(fattr1_name, buf_size+1);
-	CHECK(name_size, FAIL, "Attribute::getName", __LINE__, __FILE__);
-	verify_val((size_t)name_size, FATTR1_NAME.length(), "Attribute::getName", __LINE__, __FILE__);
-	verify_val((const char*)fattr1_name, FATTR1_NAME, "Attribute::getName", __LINE__, __FILE__);
-	delete []fattr1_name;
-
-	// 2. With arbitrary buf_size that is smaller than the name's length.
-	// Let's try 4 first characters in the name.
-	buf_size = 4;
-	char short_name[5] = "File"; // to verify the read name
-	fattr1_name = new char[buf_size+1];
-	HDmemset(fattr1_name, 0, buf_size+1);
-	name_size = fattr1.getName(fattr1_name, buf_size+1);
-	CHECK(name_size, FAIL, "Attribute::getName", __LINE__, __FILE__);
-	verify_val((size_t)name_size, FATTR1_NAME.size(), "Attribute::getName", __LINE__, __FILE__);
-	verify_val((const char*)fattr1_name, (const char*)short_name, "Attribute::getName", __LINE__, __FILE__);
-	delete []fattr1_name;
-
-	// 3. With a buf_size that equals the name's length.
-	buf_size = FATTR1_NAME.length();
-	fattr1_name = new char[buf_size+1];
-	HDmemset(fattr1_name, 0, buf_size+1);
-	name_size = fattr1.getName(fattr1_name, buf_size+1);
-	CHECK(name_size, FAIL, "Attribute::getName", __LINE__, __FILE__);
-	verify_val(fattr1_name, FATTR1_NAME, "Attribute::getName", __LINE__, __FILE__);
-	delete []fattr1_name;
-
-	// B. Get attribute name with
-	// ssize_t Attribute::getName(H5std_string& attr_name, size_t buf_size)
-	// using buffer smaller than the actual name
-	buf_size = 4;
-	H5std_string fattr1_name2;
-	name_size = fattr1.getName(fattr1_name2, buf_size);
-	verify_val(fattr1_name2, "File", "Attribute::getName", __LINE__, __FILE__);
-
-	// Same test as above, but with deprecated overloaded function
-	// ssize_t Attribute::getName(size_t buf_size, H5std_string& attr_name)
-	// using buffer smaller than the actual name
-	H5std_string fattr1_name2a;
-	name_size = fattr1.getName(fattr1_name2a, buf_size);
-	verify_val(fattr1_name2a, "File", "Attribute::getName", __LINE__, __FILE__);
-
-	// C. Get file attribute's name with
-	// H5std_string Attribute::getName()
-	H5std_string fattr1_name3 = fattr1.getName();
-	verify_val(fattr1_name3, FATTR1_NAME, "Attribute::getName", __LINE__, __FILE__);
-
-	//
-	// D. Test getName getting part of an attribute's name using
-	// H5std_string Attribute::getName(len)
-	//
-
-	// Open dataset DSET1_NAME
-	DataSet dataset = fid1.openDataSet(DSET1_NAME);
-
-	// Check for existence of attribute
-	attr_exists = dataset.attrExists(ATTR1_NAME);
-	if (attr_exists == false)
-	    throw InvalidActionException("H5File::attrExists", "Attribute should exist but does not");
-
-	// Open attribute
-	Attribute attr1(dataset.openAttribute(ATTR1_NAME));
-
-	size_t len = 4;
-	H5std_string dattr_name1 = attr1.getName(len);
-	verify_val(dattr_name1, "Attr", "Attribute::getName", __LINE__, __FILE__);
-
-	// E. Get dataset's attribute name with
-	// H5std_string Attribute::getName(H5std_string attr_name, buf_size=0)
-	H5std_string dattr_name2;
-	name_size = attr1.getName(dattr_name2);
-	verify_val(dattr_name2, ATTR1_NAME, "Attribute::getName", __LINE__, __FILE__);
-
-	PASSED();
+        //
+        // Open the file FILE_BASIC and test getName with its attribute
+        //
+
+        // Open file
+        H5File fid1(FILE_BASIC, H5F_ACC_RDWR, fapl);
+
+        // Check for existence of attribute FATTR1_NAME
+        bool attr_exists = fid1.attrExists(FATTR1_NAME);
+        if (!attr_exists)
+            throw InvalidActionException("H5File::attrExists", "Attribute should exist but does not");
+
+        // Open attribute
+        Attribute fattr1(fid1.openAttribute(FATTR1_NAME));
+
+        // A. Get attribute name with
+        // ssize_t Attribute::getName(char* attr_name, size_t buf_size)
+        // using different buffer sizes and verify against FATTR1_NAME (3 cases)
+
+        // 1. With arbitrary buf_size that is larger than the name size
+        size_t buf_size    = FATTR1_NAME.length() + 10;
+        char  *fattr1_name = new char[buf_size + 1];
+        HDmemset(fattr1_name, 0, buf_size + 1);
+        ssize_t name_size = 0; // actual length of attribute name
+        name_size         = fattr1.getName(fattr1_name, buf_size + 1);
+        CHECK(name_size, FAIL, "Attribute::getName", __LINE__, __FILE__);
+        verify_val(static_cast<size_t>(name_size), FATTR1_NAME.length(), "Attribute::getName", __LINE__,
+                   __FILE__);
+        verify_val(const_cast<const char *>(fattr1_name), FATTR1_NAME, "Attribute::getName", __LINE__,
+                   __FILE__);
+        delete[] fattr1_name;
+
+        // 2. With arbitrary buf_size that is smaller than the name's length.
+        // Let's try 4 first characters in the name.
+        buf_size           = 4;
+        char short_name[5] = "File"; // to verify the read name
+        fattr1_name        = new char[buf_size + 1];
+        HDmemset(fattr1_name, 0, buf_size + 1);
+        name_size = fattr1.getName(fattr1_name, buf_size + 1);
+        CHECK(name_size, FAIL, "Attribute::getName", __LINE__, __FILE__);
+        verify_val(static_cast<size_t>(name_size), FATTR1_NAME.size(), "Attribute::getName", __LINE__,
+                   __FILE__);
+        verify_val(const_cast<const char *>(fattr1_name), const_cast<const char *>(short_name),
+                   "Attribute::getName", __LINE__, __FILE__);
+        delete[] fattr1_name;
+
+        // 3. With a buf_size that equals the name's length.
+        buf_size    = FATTR1_NAME.length();
+        fattr1_name = new char[buf_size + 1];
+        HDmemset(fattr1_name, 0, buf_size + 1);
+        name_size = fattr1.getName(fattr1_name, buf_size + 1);
+        CHECK(name_size, FAIL, "Attribute::getName", __LINE__, __FILE__);
+        verify_val(fattr1_name, FATTR1_NAME, "Attribute::getName", __LINE__, __FILE__);
+        delete[] fattr1_name;
+
+        // B. Get attribute name with
+        // ssize_t Attribute::getName(H5std_string& attr_name, size_t buf_size)
+        // using buffer smaller than the actual name
+        buf_size = 4;
+        H5std_string fattr1_name2;
+        name_size = fattr1.getName(fattr1_name2, buf_size);
+        verify_val(fattr1_name2, "File", "Attribute::getName", __LINE__, __FILE__);
+
+        // Same test as above, but with deprecated overloaded function
+        // ssize_t Attribute::getName(size_t buf_size, H5std_string& attr_name)
+        // using buffer smaller than the actual name
+        H5std_string fattr1_name2a;
+        name_size = fattr1.getName(fattr1_name2a, buf_size);
+        verify_val(fattr1_name2a, "File", "Attribute::getName", __LINE__, __FILE__);
+
+        // C. Get file attribute's name with
+        // H5std_string Attribute::getName()
+        H5std_string fattr1_name3 = fattr1.getName();
+        verify_val(fattr1_name3, FATTR1_NAME, "Attribute::getName", __LINE__, __FILE__);
+
+        //
+        // D. Test getName getting part of an attribute's name using
+        // H5std_string Attribute::getName(len)
+        //
+
+        // Open dataset DSET1_NAME
+        DataSet dataset = fid1.openDataSet(DSET1_NAME);
+
+        // Check for existence of attribute
+        attr_exists = dataset.attrExists(ATTR1_NAME);
+        if (!attr_exists)
+            throw InvalidActionException("H5File::attrExists", "Attribute should exist but does not");
+
+        // Open attribute
+        Attribute attr1(dataset.openAttribute(ATTR1_NAME));
+
+        size_t       len         = 4;
+        H5std_string dattr_name1 = attr1.getName(len);
+        verify_val(dattr_name1, "Attr", "Attribute::getName", __LINE__, __FILE__);
+
+        // E. Get dataset's attribute name with
+        // H5std_string Attribute::getName(H5std_string attr_name, buf_size=0)
+        H5std_string dattr_name2;
+        name_size = attr1.getName(dattr_name2);
+        verify_val(dattr_name2, ATTR1_NAME, "Attribute::getName", __LINE__, __FILE__);
+
+        PASSED();
     } // end try block
 
-    catch (Exception E) {
-	issue_fail_msg("test_attr_getname()", __LINE__, __FILE__, E.getCDetailMsg());
+    catch (Exception &E) {
+        issue_fail_msg("test_attr_getname()", __LINE__, __FILE__, E.getCDetailMsg());
     }
-}   // test_attr_getname()
-
-/****************************************************************
-**
-**  test_attr_rename(): Test renaming attribute function.
-**
-****************************************************************/
-static void test_attr_rename()
+} // test_attr_getname()
+
+/*-------------------------------------------------------------------------
+ * Function:    test_attr_rename
+ *
+ * Purpose      Test renaming attribute function.
+ *
+ * Return       None
+ *-------------------------------------------------------------------------
+ */
+static void
+test_attr_rename(FileAccPropList &fapl)
 {
-    int read_data1[ATTR1_DIM1]={0}; // Buffer for reading the attribute
+    int     read_data1[ATTR1_DIM1] = {0}; // Buffer for reading the attribute
     hsize_t i;
 
     // Output message about test being performed
     SUBTEST("Checking for Existence and Renaming Attribute");
 
     try {
-	// Open file
-	H5File fid1(FILE_BASIC, H5F_ACC_RDWR);
+        // Open file
+        H5File fid1(FILE_BASIC, H5F_ACC_RDWR, fapl);
 
-	// Check and rename attribute belonging to a file
+        // Check and rename attribute belonging to a file
 
-	// Check for existence of attribute
-	bool attr_exists = fid1.attrExists(FATTR1_NAME);
-	if (attr_exists == false)
-	    throw InvalidActionException("H5File::attrExists", "Attribute should exist but does not");
+        // Check for existence of attribute
+        bool attr_exists = fid1.attrExists(FATTR1_NAME);
+        if (!attr_exists)
+            throw InvalidActionException("H5File::attrExists", "Attribute should exist but does not");
 
-	// Change attribute name
-	fid1.renameAttr(FATTR1_NAME, FATTR_TMP_NAME);
+        // Change attribute name
+        fid1.renameAttr(FATTR1_NAME, FATTR_TMP_NAME);
 
-	// Open attribute again
-	Attribute fattr1(fid1.openAttribute(FATTR_TMP_NAME));
+        // Open attribute again
+        Attribute fattr1(fid1.openAttribute(FATTR_TMP_NAME));
 
-	// Verify new attribute name
-	H5std_string fattr_name = fattr1.getName();
-	verify_val(fattr_name, FATTR_TMP_NAME, "Attribute::getName", __LINE__, __FILE__);
+        // Verify new attribute name
+        H5std_string fattr_name = fattr1.getName();
+        verify_val(fattr_name, FATTR_TMP_NAME, "Attribute::getName", __LINE__, __FILE__);
 
-	int num_attrs = fid1.getNumAttrs();
-	verify_val(num_attrs, 2, "Attribute::getNumAttrs", __LINE__, __FILE__);
+        int num_attrs = fid1.getNumAttrs();
+        verify_val(num_attrs, 2, "Attribute::getNumAttrs", __LINE__, __FILE__);
 
-	// Change first file attribute back to the original name
-	fid1.renameAttr(FATTR_TMP_NAME, FATTR1_NAME);
+        // Change first file attribute back to the original name
+        fid1.renameAttr(FATTR_TMP_NAME, FATTR1_NAME);
 
-	// Open the dataset
-	DataSet dataset = fid1.openDataSet(DSET1_NAME);
+        // Open the dataset
+        DataSet dataset = fid1.openDataSet(DSET1_NAME);
 
-	// Check and rename attribute belonging to a dataset
+        // Check and rename attribute belonging to a dataset
 
-	// Check for existence of attribute
-	attr_exists = dataset.attrExists(ATTR1_NAME);
-	if (attr_exists == false)
-	    throw InvalidActionException("H5File::attrExists", "Attribute should exist but does not");
+        // Check for existence of attribute
+        attr_exists = dataset.attrExists(ATTR1_NAME);
+        if (!attr_exists)
+            throw InvalidActionException("H5File::attrExists", "Attribute should exist but does not");
 
-	// Change attribute name
-	dataset.renameAttr(ATTR1_NAME, ATTR_TMP_NAME);
+        // Change attribute name
+        dataset.renameAttr(ATTR1_NAME, ATTR_TMP_NAME);
 
-	// Open attribute again
-	Attribute attr1(dataset.openAttribute(ATTR_TMP_NAME));
+        // Open attribute again
+        Attribute attr1(dataset.openAttribute(ATTR_TMP_NAME));
 
-	// Verify new attribute name
-	H5std_string attr_name = attr1.getName();
-	verify_val(attr_name, ATTR_TMP_NAME, "Attribute::getName", __LINE__, __FILE__);
+        // Verify new attribute name
+        H5std_string attr_name = attr1.getName();
+        verify_val(attr_name, ATTR_TMP_NAME, "Attribute::getName", __LINE__, __FILE__);
 
-	// Read attribute information immediately, without closing attribute
-	attr1.read (PredType::NATIVE_INT, read_data1);
+        // Read attribute information immediately, without closing attribute
+        attr1.read(PredType::NATIVE_INT, read_data1);
 
-	// Verify values read in
-	for(i=0; i<ATTR1_DIM1; i++)
-	    if(attr_data1[i]!=read_data1[i])
-		TestErrPrintf("%d: attribute data different: attr_data1[%d]=%d,read_data1[%d]=%d\n",__LINE__,i,attr_data1[i],i,read_data1[i]);
+        // Verify values read in
+        for (i = 0; i < ATTR1_DIM1; i++)
+            if (attr_data1[i] != read_data1[i])
+                TestErrPrintf("%d: attribute data different: attr_data1[%" PRIuHSIZE
+                              "]=%d,read_data1[%" PRIuHSIZE "]=%d\n",
+                              __LINE__, i, attr_data1[i], i, read_data1[i]);
 
-	// Close attribute
-    	attr1.close();
+        // Close attribute
+        attr1.close();
 
-	// Check for existence of second attribute
-	attr_exists = dataset.attrExists(ATTR2_NAME);
-	if (attr_exists == false)
-	    throw InvalidActionException("H5File::attrExists", "Attribute should exist but does not");
+        // Check for existence of second attribute
+        attr_exists = dataset.attrExists(ATTR2_NAME);
+        if (!attr_exists)
+            throw InvalidActionException("H5File::attrExists", "Attribute should exist but does not");
 
-	// Open the second attribute
-	Attribute attr2(dataset.openAttribute(ATTR2_NAME));
+        // Open the second attribute
+        Attribute attr2(dataset.openAttribute(ATTR2_NAME));
 
-	// Verify second attribute name
-	H5std_string attr2_name = attr2.getName();
-	verify_val(attr2_name, ATTR2_NAME, "Attribute::getName", __LINE__, __FILE__);
+        // Verify second attribute name
+        H5std_string attr2_name = attr2.getName();
+        verify_val(attr2_name, ATTR2_NAME, "Attribute::getName", __LINE__, __FILE__);
 
-	// Read attribute information immediately, without closing attribute
-	attr2.read (PredType::NATIVE_INT, read_data1);
+        // Read attribute information immediately, without closing attribute
+        attr2.read(PredType::NATIVE_INT, read_data1);
 
-	// Verify values read in
-	for(i=0; i<ATTR1_DIM1; i++)
-	    if(attr_data1a[i]!=read_data1[i])
-		TestErrPrintf("%d: attribute data different: attr_data1a[%d]=%d,read_data1[%d]=%d\n",__LINE__,i,attr_data1a[i],i,read_data1[i]);
+        // Verify values read in
+        for (i = 0; i < ATTR1_DIM1; i++)
+            if (attr_data1a[i] != read_data1[i])
+                TestErrPrintf("%d: attribute data different: attr_data1a[%" PRIuHSIZE
+                              "]=%d,read_data1[%" PRIuHSIZE "]=%d\n",
+                              __LINE__, i, attr_data1a[i], i, read_data1[i]);
 
-	// Close attribute
-	attr2.close();
+        // Close attribute
+        attr2.close();
 
-	// Change first attribute back to the original name
-	dataset.renameAttr(ATTR_TMP_NAME, ATTR1_NAME);
+        // Change first attribute back to the original name
+        dataset.renameAttr(ATTR_TMP_NAME, ATTR1_NAME);
 
-	// Check for existence of attribute after renaming
-	attr_exists = dataset.attrExists(ATTR1_NAME);
-	if (attr_exists == false)
-	    throw InvalidActionException("H5File::attrExists", "Attribute should exist but does not");
+        // Check for existence of attribute after renaming
+        attr_exists = dataset.attrExists(ATTR1_NAME);
+        if (!attr_exists)
+            throw InvalidActionException("H5File::attrExists", "Attribute should exist but does not");
 
-	PASSED();
+        PASSED();
     } // end try block
 
-    catch (Exception E) {
-	issue_fail_msg("test_attr_rename()", __LINE__, __FILE__, E.getCDetailMsg());
+    catch (Exception &E) {
+        issue_fail_msg("test_attr_rename()", __LINE__, __FILE__, E.getCDetailMsg());
     }
-}   // test_attr_rename()
-
-/********************************************************************
-**
-**  test_attr_basic_read(): Test basic read attribute.
-**
-********************************************************************/
-static void test_attr_basic_read()
+} // test_attr_rename()
+
+/*-------------------------------------------------------------------------
+ * Function:    test_attr_basic_read
+ *
+ * Purpose      Test basic read attribute.
+ *
+ * Return       None
+ *-------------------------------------------------------------------------
+ */
+static void
+test_attr_basic_read(FileAccPropList &fapl)
 {
     hsize_t i, j;
 
@@ -499,1118 +519,1526 @@ static void test_attr_basic_read()
     SUBTEST("Basic Attribute Reading Functions");
 
     try {
-	// Open file
-	H5File fid1(FILE_BASIC, H5F_ACC_RDWR);
-
-	// Open the dataset
-	DataSet dataset = fid1.openDataSet(DSET1_NAME);
-
-	// Verify the correct number of attributes
-	int num_attrs = dataset.getNumAttrs();
-	verify_val(num_attrs, 3, "DataSet::getNumAttrs", __LINE__, __FILE__);
-
-	// Open an attribute for the dataset
-	Attribute ds_attr=dataset.openAttribute(ATTR1_NAME);
-
-	// Read attribute information
-	int read_data1[ATTR1_DIM1]={0}; // Buffer for reading 1st attribute
-	ds_attr.read(PredType::NATIVE_INT, &read_data1);
-
-	// Verify values read in
-	for(i=0; i<ATTR1_DIM1; i++)
-            if(attr_data1[i]!=read_data1[i])
-		TestErrPrintf("%d: attribute data different: attr_data1[%d]=%d, read_data1[%d]=%d\n",__LINE__,i,attr_data1[i],i,read_data1[i]);
-
-	/*
-	 *		Test attribute with group
-	 */
-	// Open the group
-	Group group = fid1.openGroup(GROUP1_NAME);
-
-	// Verify the correct number of attributes
-	num_attrs = group.getNumAttrs();
-	verify_val(num_attrs, 1, "H5Group::getNumAttrs", __LINE__, __FILE__);
-
-	// Open an attribute for the group
-	Attribute gr_attr = group.openAttribute(ATTR2_NAME);
-
-	// Buffer for reading 2nd attribute
-	int read_data2[ATTR2_DIM1][ATTR2_DIM2]={{0}};
-
-	// Read attribute information
-	gr_attr.read(PredType::NATIVE_INT, read_data2);
-
-	// Verify values read in
-	for(i=0; i<ATTR2_DIM1; i++)
-            for(j=0; j<ATTR2_DIM2; j++)
-        	if(attr_data2[i][j]!=read_data2[i][j]) {
-		    TestErrPrintf("%d: attribute data different: attr_data2[%d][%d]=%d, read_data2[%d][%d]=%d\n",__LINE__, i,j,attr_data2[i][j],i,j,read_data2[i][j]);
-		}
-	PASSED();
+        // Open file
+        H5File fid1(FILE_BASIC, H5F_ACC_RDWR, fapl);
+
+        // Open the dataset
+        DataSet dataset = fid1.openDataSet(DSET1_NAME);
+
+        // Verify the correct number of attributes
+        int num_attrs = dataset.getNumAttrs();
+        verify_val(num_attrs, 3, "DataSet::getNumAttrs", __LINE__, __FILE__);
+
+        // Verify the correct number of attributes another way
+        H5O_info2_t oinfo;
+        HDmemset(&oinfo, 0, sizeof(oinfo));
+        dataset.getObjinfo(oinfo, H5O_INFO_NUM_ATTRS);
+        verify_val(static_cast<long>(oinfo.num_attrs), 3, "DataSet::getObjinfo", __LINE__, __FILE__);
+
+        // Open an attribute for the dataset
+        Attribute ds_attr = dataset.openAttribute(ATTR1_NAME);
+
+        // Read attribute information
+        int read_data1[ATTR1_DIM1] = {0}; // Buffer for reading 1st attribute
+        ds_attr.read(PredType::NATIVE_INT, &read_data1);
+
+        // Verify values read in
+        for (i = 0; i < ATTR1_DIM1; i++)
+            if (attr_data1[i] != read_data1[i])
+                TestErrPrintf("%d: attribute data different: attr_data1[%" PRIuHSIZE
+                              "]=%d, read_data1[%" PRIuHSIZE "]=%d\n",
+                              __LINE__, i, attr_data1[i], i, read_data1[i]);
+
+        /*
+         *                Test attribute with group
+         */
+        // Open the group
+        Group group = fid1.openGroup(GROUP1_NAME);
+
+        // Verify the correct number of attributes
+        num_attrs = group.getNumAttrs();
+        verify_val(num_attrs, 1, "Group::getNumAttrs", __LINE__, __FILE__);
+
+        // Verify the correct number of attributes another way
+        HDmemset(&oinfo, 0, sizeof(oinfo));
+        group.getObjinfo(oinfo, H5O_INFO_NUM_ATTRS);
+        verify_val(static_cast<long>(oinfo.num_attrs), 1, "Group::getObjinfo", __LINE__, __FILE__);
+
+        // Open an attribute for the group
+        Attribute gr_attr = group.openAttribute(ATTR2_NAME);
+
+        // Buffer for reading 2nd attribute
+        int read_data2[ATTR2_DIM1][ATTR2_DIM2] = {{0}};
+
+        // Read attribute information
+        gr_attr.read(PredType::NATIVE_INT, read_data2);
+
+        // Verify values read in
+        for (i = 0; i < ATTR2_DIM1; i++)
+            for (j = 0; j < ATTR2_DIM2; j++)
+                if (attr_data2[i][j] != read_data2[i][j]) {
+                    TestErrPrintf("%d: attribute data different: attr_data2[%" PRIuHSIZE "][%" PRIuHSIZE
+                                  "]=%d, "
+                                  "read_data2[%" PRIuHSIZE "][%" PRIuHSIZE "]=%d\n",
+                                  __LINE__, i, j, attr_data2[i][j], i, j, read_data2[i][j]);
+                }
+        PASSED();
     } // end try block
 
-    catch (Exception E) {
-	issue_fail_msg("test_attr_basic_read()", __LINE__, __FILE__, E.getCDetailMsg());
+    catch (Exception &E) {
+        issue_fail_msg("test_attr_basic_read()", __LINE__, __FILE__, E.getCDetailMsg());
     }
-}   // test_attr_basic_read()
-
-/****************************************************************
-**
-**  test_attr_compound_write(): Tests compound datatype attributes
-**
-****************************************************************/
-static void test_attr_compound_write()
+} // test_attr_basic_read()
+
+/*-------------------------------------------------------------------------
+ * Function:    test_attr_compound_write
+ *
+ * Purpose      Test writing attributes with compound datatype.
+ *
+ * Return       None
+ *-------------------------------------------------------------------------
+ */
+static void
+test_attr_compound_write(FileAccPropList &fapl)
 {
 
-	// Output message about test being performed
+    // Output message about test being performed
     SUBTEST("Multiple Attribute Functions");
 
     try {
-	// Create file
-	H5File fid1(FILE_COMPOUND.c_str(), H5F_ACC_TRUNC);
+        // Create file
+        H5File fid1(FILE_COMPOUND.c_str(), H5F_ACC_TRUNC, FileCreatPropList::DEFAULT, fapl);
 
-	// Create dataspace for dataset
-	hsize_t		dims1[] = {SPACE1_DIM1, SPACE1_DIM2, SPACE1_DIM3};
-	DataSpace sid1(SPACE1_RANK, dims1);
+        // Create dataspace for dataset
+        hsize_t   dims1[] = {SPACE1_DIM1, SPACE1_DIM2, SPACE1_DIM3};
+        DataSpace sid1(SPACE1_RANK, dims1);
 
-	// Create a dataset
-	DataSet dataset = fid1.createDataSet(DSET1_NAME, PredType::NATIVE_UCHAR,sid1);
+        // Create a dataset
+        DataSet dataset = fid1.createDataSet(DSET1_NAME, PredType::NATIVE_UCHAR, sid1);
 
-	// Create the attribute datatype.
-	CompType comp_type(sizeof(struct attr4_struct));
+        // Create the attribute datatype.
+        CompType comp_type(sizeof(struct attr4_struct));
 
-	attr4_field1_off = HOFFSET(struct attr4_struct, i);
-	comp_type.insertMember(ATTR4_FIELDNAME1, attr4_field1_off, PredType::NATIVE_INT);
+        attr4_field1_off = HOFFSET(struct attr4_struct, i);
+        comp_type.insertMember(ATTR4_FIELDNAME1, attr4_field1_off, PredType::NATIVE_INT);
 
-	attr4_field2_off = HOFFSET(struct attr4_struct, d);
-	comp_type.insertMember(ATTR4_FIELDNAME2, attr4_field2_off, PredType::NATIVE_DOUBLE);
+        attr4_field2_off = HOFFSET(struct attr4_struct, d);
+        comp_type.insertMember(ATTR4_FIELDNAME2, attr4_field2_off, PredType::NATIVE_DOUBLE);
 
-	attr4_field3_off = HOFFSET(struct attr4_struct, c);
-	comp_type.insertMember(ATTR4_FIELDNAME3, attr4_field3_off, PredType::NATIVE_SCHAR);
+        attr4_field3_off = HOFFSET(struct attr4_struct, c);
+        comp_type.insertMember(ATTR4_FIELDNAME3, attr4_field3_off, PredType::NATIVE_SCHAR);
 
-	// Create dataspace for 1st attribute
-	hsize_t		dims2[] = {ATTR4_DIM1,ATTR4_DIM2};
-	DataSpace sid2(ATTR4_RANK, dims2);
+        // Create dataspace for 1st attribute
+        hsize_t   dims2[] = {ATTR4_DIM1, ATTR4_DIM2};
+        DataSpace sid2(ATTR4_RANK, dims2);
 
-	// Create complex attribute for the dataset
-	Attribute attr = dataset.createAttribute(ATTR4_NAME, comp_type, sid2);
+        // Create complex attribute for the dataset
+        Attribute attr = dataset.createAttribute(ATTR4_NAME, comp_type, sid2);
 
-	// Try to create the same attribute again (should fail)
-	try {
-	    Attribute invalid_attr = dataset.createAttribute (ATTR4_NAME, comp_type, sid2);
-	}
-        catch (AttributeIException E) // catching invalid creating attribute
-        {} // do nothing, exception expected
+        // Try to create the same attribute again (should fail)
+        try {
+            Attribute invalid_attr = dataset.createAttribute(ATTR4_NAME, comp_type, sid2);
+        }
+        catch (AttributeIException &E) // catching invalid creating attribute
+        {
+        } // do nothing, exception expected
 
-	// Write complex attribute data
-	attr.write(comp_type, attr_data4);
+        // Write complex attribute data
+        attr.write(comp_type, attr_data4);
 
-	PASSED();
+        PASSED();
     } // end try block
 
-    catch (Exception E) {
-	issue_fail_msg("test_attr_compound_write()", __LINE__, __FILE__, E.getCDetailMsg());
+    catch (Exception &E) {
+        issue_fail_msg("test_attr_compound_write()", __LINE__, __FILE__, E.getCDetailMsg());
     }
-}   // test_attr_compound_write()
-
-/****************************************************************
-**
-**  test_attr_compound_read(): Test basic H5A (attribute) code.
-**
-****************************************************************/
-static void test_attr_compound_read()
+} // test_attr_compound_write()
+
+/*-------------------------------------------------------------------------
+ * Function:    test_attr_compound_read
+ *
+ * Purpose      Test reading attributes with compound datatype.
+ *
+ * Return       None
+ *-------------------------------------------------------------------------
+ */
+static void
+test_attr_compound_read(FileAccPropList &fapl)
 {
-    hsize_t dims[ATTR_MAX_DIMS];	// Attribute dimensions
-    size_t      size;   // Attribute datatype size as stored in file
-    size_t      offset; // Attribute datatype field offset
+    hsize_t             dims[ATTR_MAX_DIMS];                // Attribute dimensions
+    size_t              size;                               // Attribute datatype size as stored in file
+    size_t              offset;                             // Attribute datatype field offset
     struct attr4_struct read_data4[ATTR4_DIM1][ATTR4_DIM2]; // Buffer for reading 4th attribute
 
     // Output message about test being performed
     SUBTEST("Basic Attribute Functions");
 
     try {
-	// Open file
-	H5File fid1(FILE_COMPOUND, H5F_ACC_RDWR);
-
-	// Open the dataset
-	DataSet dataset = fid1.openDataSet(DSET1_NAME);
-
-	// Verify the correct number of attributes
-	int num_attrs = dataset.getNumAttrs();
-	verify_val(num_attrs, 1, "DataSet::getNumAttrs", __LINE__, __FILE__);
-
-	// Open 1st attribute for the dataset
-	Attribute attr = dataset.openAttribute((unsigned)0);
-
-	/* Verify Dataspace */
-
-	// Get the dataspace of the attribute
-	DataSpace space = attr.getSpace();
-
-	// Get the rank of the dataspace and verify it
-	int rank = space.getSimpleExtentNdims();
-	verify_val(rank, ATTR4_RANK, "DataSpace::getSimpleExtentNdims", __LINE__, __FILE__);
-
-	// Get the dims of the dataspace and verify them
-	int ndims = space.getSimpleExtentDims(dims);
-	verify_val(ndims, ATTR4_RANK, "DataSpace::getSimpleExtentDims", __LINE__, __FILE__);
-        verify_val((long)dims[0], (long)ATTR4_DIM1, "DataSpace::getSimpleExtentDims",__LINE__, __FILE__);
-        verify_val((long)dims[1], (long)ATTR4_DIM2, "DataSpace::getSimpleExtentDims",__LINE__, __FILE__);
-
-	// Get the class of the datatype that is used by attr
-	H5T_class_t type_class = attr.getTypeClass();
-
-	// Verify that the type is of compound datatype
-	verify_val(type_class, H5T_COMPOUND, "Attribute::getTypeClass", __LINE__, __FILE__);
-
-	// Get the compound datatype
-	CompType datatype = attr.getCompType();
-
-	// Verify the number of fields in the datatype, which must be 3
-	int fields = datatype.getNmembers();
-	verify_val(fields, 3, "CompType::getNmembers", __LINE__, __FILE__);
-
-	// Verify that the fields have the same names as when the type
-	// was created
-	int j;
-	for(j=0; j<fields; j++)
-	{
-	    H5std_string fieldname = datatype.getMemberName(j);
-	    if(!((fieldname == ATTR4_FIELDNAME1) ||
-		(fieldname == ATTR4_FIELDNAME2) ||
-		(fieldname == ATTR4_FIELDNAME3)))
-            TestErrPrintf("%d:invalid field name for field #%d: %s\n",__LINE__,j,fieldname.c_str());
-	} /* end for */
-
-	offset = datatype.getMemberOffset(0);
-	verify_val(offset, attr4_field1_off, "DataType::getMemberOffset", __LINE__, __FILE__);
-
-	offset = datatype.getMemberOffset(1);
-	verify_val(offset, attr4_field2_off, "DataType::getMemberOffset", __LINE__, __FILE__);
-
-	offset = datatype.getMemberOffset(2);
-	verify_val(offset, attr4_field3_off, "DataType::getMemberOffset", __LINE__, __FILE__);
-
-	/* Verify each field's type, class & size */
-
-	// Get and verify the type class of the first member
-	type_class = datatype.getMemberClass(0);
-	verify_val(type_class, H5T_INTEGER, "DataType::getMemberClass", __LINE__, __FILE__);
-	// Get and verify the order of this member's type
-	IntType i_type = datatype.getMemberIntType(0);
-	H5T_order_t order = i_type.getOrder();
-	verify_val(order, PredType::NATIVE_INT.getOrder(), "DataType::getOrder", __LINE__, __FILE__);
-
-	// Get and verify the size of this member's type
-	size = i_type.getSize();
-	verify_val(size, PredType::NATIVE_INT.getSize(), "DataType::getSize", __LINE__, __FILE__);
-
-	// Get and verify class, order, and size of the second member's type
-	type_class = datatype.getMemberClass(1);
-	verify_val(type_class, H5T_FLOAT, "DataType::getMemberClass", __LINE__, __FILE__);
-	FloatType f_type = datatype.getMemberFloatType(1);
-	order = f_type.getOrder();
-	verify_val(order, PredType::NATIVE_DOUBLE.getOrder(), "DataType::getOrder", __LINE__, __FILE__);
-	size = f_type.getSize();
-	verify_val(size, PredType::NATIVE_DOUBLE.getSize(), "DataType::getSize", __LINE__, __FILE__);
-
-	// Get and verify class, order, and size of the third member's type
-	type_class = datatype.getMemberClass(2);
-	verify_val(type_class, H5T_INTEGER, "DataType::getMemberClass", __LINE__, __FILE__);
-	// Note: H5T_INTEGER is correct here!
-
-	StrType s_type = datatype.getMemberStrType(2);
-	order = s_type.getOrder();
-	verify_val(order, PredType::NATIVE_SCHAR.getOrder(), "DataType::getOrder", __LINE__, __FILE__);
-	size = s_type.getSize();
-	verify_val(size, PredType::NATIVE_SCHAR.getSize(), "DataType::getSize", __LINE__, __FILE__);
-
-	// Read attribute information
-	attr.read(datatype, read_data4);
-
-	// Verify values read in
-	hsize_t ii, jj;
-	for(ii=0; ii<ATTR4_DIM1; ii++)
-	    for(jj=0; jj<ATTR4_DIM2; jj++)
-		if(HDmemcmp(&attr_data4[ii][jj],&read_data4[ii][jj],sizeof(struct attr4_struct))) {
-		    TestErrPrintf("%d:attribute data different: attr_data4[%d][%d].i=%d, read_data4[%d][%d].i=%d\n",__LINE__,ii,jj,attr_data4[ii][jj].i,ii,jj,read_data4[ii][jj].i);
-		    TestErrPrintf("%d:attribute data different: attr_data4[%d][%d].d=%f, read_data4[%d][%d].d=%f\n",__LINE__,ii,jj,attr_data4[ii][jj].d,ii,jj,read_data4[ii][jj].d);
-		    TestErrPrintf("%d:attribute data different: attr_data4[%d][%d].c=%c, read_data4[%d][%d].c=%c\n",__LINE__,ii,jj,attr_data4[ii][jj].c,ii,jj,read_data4[ii][jj].c);
-             } /* end if */
-
-	// Verify name
-	H5std_string attr_name = attr.getName();
-	verify_val(attr_name, ATTR4_NAME, "Attribute::getName", __LINE__, __FILE__);
-	PASSED();
+        // Open file
+        H5File fid1(FILE_COMPOUND, H5F_ACC_RDWR, fapl);
+
+        // Open the dataset
+        DataSet dataset = fid1.openDataSet(DSET1_NAME);
+
+        // Verify the correct number of attributes
+        int num_attrs = dataset.getNumAttrs();
+        verify_val(num_attrs, 1, "DataSet::getNumAttrs", __LINE__, __FILE__);
+
+        // Verify the correct number of attributes another way
+        H5O_info2_t oinfo;
+        HDmemset(&oinfo, 0, sizeof(oinfo));
+        dataset.getObjinfo(oinfo, H5O_INFO_NUM_ATTRS);
+        verify_val(static_cast<long>(oinfo.num_attrs), 1, "DataSet::getObjinfo", __LINE__, __FILE__);
+
+        // Open 1st attribute for the dataset
+        Attribute attr = dataset.openAttribute(static_cast<unsigned>(0));
+
+        /* Verify Dataspace */
+
+        // Get the dataspace of the attribute
+        DataSpace space = attr.getSpace();
+
+        // Get the rank of the dataspace and verify it
+        int rank = space.getSimpleExtentNdims();
+        verify_val(rank, ATTR4_RANK, "DataSpace::getSimpleExtentNdims", __LINE__, __FILE__);
+
+        // Get the dims of the dataspace and verify them
+        int ndims = space.getSimpleExtentDims(dims);
+        verify_val(ndims, ATTR4_RANK, "DataSpace::getSimpleExtentDims", __LINE__, __FILE__);
+        verify_val(static_cast<long>(dims[0]), static_cast<long>(ATTR4_DIM1),
+                   "DataSpace::getSimpleExtentDims", __LINE__, __FILE__);
+        verify_val(static_cast<long>(dims[1]), static_cast<long>(ATTR4_DIM2),
+                   "DataSpace::getSimpleExtentDims", __LINE__, __FILE__);
+
+        // Get the class of the datatype that is used by attr
+        H5T_class_t type_class = attr.getTypeClass();
+
+        // Verify that the type is of compound datatype
+        verify_val(static_cast<long>(type_class), static_cast<long>(H5T_COMPOUND), "Attribute::getTypeClass",
+                   __LINE__, __FILE__);
+
+        // Get the compound datatype
+        CompType datatype = attr.getCompType();
+
+        // Verify the number of fields in the datatype, which must be 3
+        int fields = datatype.getNmembers();
+        verify_val(fields, 3, "CompType::getNmembers", __LINE__, __FILE__);
+
+        // Verify that the fields have the same names as when the type
+        // was created
+        for (int j = 0; j < fields; j++) {
+            H5std_string fieldname = datatype.getMemberName(static_cast<unsigned>(j));
+            if (!((fieldname == ATTR4_FIELDNAME1) || (fieldname == ATTR4_FIELDNAME2) ||
+                  (fieldname == ATTR4_FIELDNAME3)))
+                TestErrPrintf("%d:invalid field name for field #%d: %s\n", __LINE__, j, fieldname.c_str());
+        }
+
+        offset = datatype.getMemberOffset(0);
+        verify_val(offset, attr4_field1_off, "DataType::getMemberOffset", __LINE__, __FILE__);
+
+        offset = datatype.getMemberOffset(1);
+        verify_val(offset, attr4_field2_off, "DataType::getMemberOffset", __LINE__, __FILE__);
+
+        offset = datatype.getMemberOffset(2);
+        verify_val(offset, attr4_field3_off, "DataType::getMemberOffset", __LINE__, __FILE__);
+
+        /* Verify each field's type, class & size */
+
+        // Get and verify the type class of the first member
+        type_class = datatype.getMemberClass(0);
+        verify_val(static_cast<long>(type_class), static_cast<long>(H5T_INTEGER), "DataType::getMemberClass",
+                   __LINE__, __FILE__);
+        // Get and verify the order of this member's type
+        IntType     i_type = datatype.getMemberIntType(0);
+        H5T_order_t order  = i_type.getOrder();
+        verify_val(static_cast<long>(order), static_cast<long>(PredType::NATIVE_INT.getOrder()),
+                   "DataType::getOrder", __LINE__, __FILE__);
+
+        // Get and verify the size of this member's type
+        size = i_type.getSize();
+        verify_val(size, PredType::NATIVE_INT.getSize(), "DataType::getSize", __LINE__, __FILE__);
+
+        // Get and verify class, order, and size of the second member's type
+        type_class = datatype.getMemberClass(1);
+        verify_val(static_cast<long>(type_class), static_cast<long>(H5T_FLOAT), "DataType::getMemberClass",
+                   __LINE__, __FILE__);
+        FloatType f_type = datatype.getMemberFloatType(1);
+        order            = f_type.getOrder();
+        verify_val(static_cast<long>(order), static_cast<long>(PredType::NATIVE_DOUBLE.getOrder()),
+                   "DataType::getOrder", __LINE__, __FILE__);
+        size = f_type.getSize();
+        verify_val(size, PredType::NATIVE_DOUBLE.getSize(), "DataType::getSize", __LINE__, __FILE__);
+
+        // Get and verify class, order, and size of the third member's type
+        type_class = datatype.getMemberClass(2);
+        verify_val(static_cast<long>(type_class), static_cast<long>(H5T_INTEGER), "DataType::getMemberClass",
+                   __LINE__, __FILE__);
+        // Note: H5T_INTEGER is correct here!
+
+        StrType s_type = datatype.getMemberStrType(2);
+        order          = s_type.getOrder();
+        verify_val(static_cast<long>(order), static_cast<long>(PredType::NATIVE_SCHAR.getOrder()),
+                   "DataType::getOrder", __LINE__, __FILE__);
+        size = s_type.getSize();
+        verify_val(size, PredType::NATIVE_SCHAR.getSize(), "DataType::getSize", __LINE__, __FILE__);
+
+        // Read attribute information
+        attr.read(datatype, read_data4);
+
+        // Verify values read in
+        hsize_t ii, jj;
+        for (ii = 0; ii < ATTR4_DIM1; ii++)
+            for (jj = 0; jj < ATTR4_DIM2; jj++)
+                if (HDmemcmp(&attr_data4[ii][jj], &read_data4[ii][jj], sizeof(struct attr4_struct)) != 0) {
+                    TestErrPrintf("%d:attribute data different: attr_data4[%" PRIuHSIZE "][%" PRIuHSIZE
+                                  "].i=%d, "
+                                  "read_data4[%" PRIuHSIZE "][%" PRIuHSIZE "].i=%d\n",
+                                  __LINE__, ii, jj, attr_data4[ii][jj].i, ii, jj, read_data4[ii][jj].i);
+                    TestErrPrintf("%d:attribute data different: attr_data4[%" PRIuHSIZE "][%" PRIuHSIZE
+                                  "].d=%f, "
+                                  "read_data4[%" PRIuHSIZE "][%" PRIuHSIZE "].d=%f\n",
+                                  __LINE__, ii, jj, attr_data4[ii][jj].d, ii, jj, read_data4[ii][jj].d);
+                    TestErrPrintf("%d:attribute data different: attr_data4[%" PRIuHSIZE "][%" PRIuHSIZE
+                                  "].c=%c, "
+                                  "read_data4[%" PRIuHSIZE "][%" PRIuHSIZE "].c=%c\n",
+                                  __LINE__, ii, jj, attr_data4[ii][jj].c, ii, jj, read_data4[ii][jj].c);
+                } /* end if */
+
+        // Verify name
+        H5std_string attr_name = attr.getName();
+        verify_val(attr_name, ATTR4_NAME, "Attribute::getName", __LINE__, __FILE__);
+    } // end try block
+
+    catch (Exception &E) {
+        issue_fail_msg("test_attr_compound_read()", __LINE__, __FILE__, E.getCDetailMsg());
+    }
+
+    try {
+        // Now, try truncating the file to make sure reference counting is good.
+        // If any references to ids in the previous block are left unterminated,
+        // the truncating will fail, because the file will not be closed in
+        // the file.close() above.
+        H5File file1(FILE_COMPOUND, H5F_ACC_TRUNC);
+
+        PASSED();
     } // end try block
 
-    catch (Exception E) {
-	issue_fail_msg("test_attr_compound_read()", __LINE__, __FILE__, E.getCDetailMsg());
+    catch (FileIException &E) {
+        issue_fail_msg("test_attr_compound_read()", __LINE__, __FILE__,
+                       "Unable to truncate file, possibly because some objects are left opened");
     }
-}   // test_attr_compound_read()
-
-/****************************************************************
-**
-**  test_attr_scalar_write(): Test scalar attribute writing functionality.
-**
-****************************************************************/
-static void test_attr_scalar_write()
+} // test_attr_compound_read()
+
+/*-------------------------------------------------------------------------
+ * Function:    test_attr_scalar_write
+ *
+ * Purpose      Test scalar attribute writing functionality.
+ *
+ * Return       None
+ *-------------------------------------------------------------------------
+ */
+static void
+test_attr_scalar_write(FileAccPropList &fapl)
 {
     // Output message about test being performed
     SUBTEST("Basic Scalar Attribute Writing Functions");
 
     try {
-	// Create file
-	H5File fid1(FILE_SCALAR, H5F_ACC_TRUNC);
+        // Create file
+        H5File fid1(FILE_SCALAR, H5F_ACC_TRUNC, FileCreatPropList::DEFAULT, fapl);
 
-	// Create dataspace for dataset
-	hsize_t	dims1[] = {SPACE1_DIM1, SPACE1_DIM2, SPACE1_DIM3};
-	DataSpace sid1(SPACE1_RANK, dims1);
+        // Create dataspace for dataset
+        hsize_t   dims1[] = {SPACE1_DIM1, SPACE1_DIM2, SPACE1_DIM3};
+        DataSpace sid1(SPACE1_RANK, dims1);
 
-	// Create a dataset
-	DataSet dataset = fid1.createDataSet(DSET1_NAME, PredType::NATIVE_UCHAR,sid1);
+        // Create a dataset
+        DataSet dataset = fid1.createDataSet(DSET1_NAME, PredType::NATIVE_UCHAR, sid1);
 
-	// Close dataset's dataspace
-	sid1.close();
+        // Close dataset's dataspace
+        sid1.close();
 
-	// Create dataspace for attribute
-	DataSpace att_space(ATTR5_RANK, NULL);
+        // Create dataspace for attribute
+        DataSpace att_space(ATTR5_RANK, NULL);
 
-	// Create an attribute for the dataset
-	Attribute ds_attr = dataset.createAttribute (ATTR5_NAME, PredType::NATIVE_FLOAT, att_space);
+        // Create an attribute for the dataset
+        Attribute ds_attr = dataset.createAttribute(ATTR5_NAME, PredType::NATIVE_FLOAT, att_space);
 
-	// Try creating an attribute that already exists.  This should fail
-	// since two attributes cannot have the same name.  If an exception
-	// is not thrown for this action by createAttribute, then throw an
-	// invalid action exception.
-	try {
-	    Attribute invalid_attr = dataset.createAttribute (ATTR5_NAME, PredType::NATIVE_FLOAT, att_space);
+        // Try creating an attribute that already exists.  This should fail
+        // since two attributes cannot have the same name.  If an exception
+        // is not thrown for this action by createAttribute, then throw an
+        // invalid action exception.
+        try {
+            Attribute invalid_attr = dataset.createAttribute(ATTR5_NAME, PredType::NATIVE_FLOAT, att_space);
 
-	    // continuation here, that means no exception has been thrown
-	    throw InvalidActionException("H5File::createDataSet", "Library allowed overwrite of existing dataset");
-	}
-	catch (AttributeIException E) // catching invalid creating attribute
-        {} // do nothing, exception expected
+            // continuation here, that means no exception has been thrown
+            throw InvalidActionException("H5File::createDataSet",
+                                         "Library allowed overwrite of existing dataset");
+        }
+        catch (AttributeIException &E) // catching invalid creating attribute
+        {
+        } // do nothing, exception expected
 
-	// Write attribute information
-	ds_attr.write (PredType::NATIVE_FLOAT, &attr_data5);
+        // Write attribute information
+        ds_attr.write(PredType::NATIVE_FLOAT, &attr_data5);
 
-	PASSED();
+        PASSED();
     } // end try block
 
-    catch (Exception E) {
-	issue_fail_msg("test_attr_scalar_write()", __LINE__, __FILE__, E.getCDetailMsg());
+    catch (Exception &E) {
+        issue_fail_msg("test_attr_scalar_write()", __LINE__, __FILE__, E.getCDetailMsg());
     }
-}   // test_attr_scalar_write()
-
-/****************************************************************
-**
-**  test_attr_scalar_read(): Test scalar attribute reading functionality.
-**
-****************************************************************/
-static void test_attr_scalar_read()
+} // test_attr_scalar_write()
+
+/*-------------------------------------------------------------------------
+ * Function:    test_attr_scalar_read
+ *
+ * Purpose      Test scalar attribute reading functionality.
+ *
+ * Return       None
+ *-------------------------------------------------------------------------
+ */
+/* Epsilon for floating-point comparisons */
+#define FP_EPSILON 0.000001F
+
+static void
+test_attr_scalar_read(FileAccPropList &fapl)
 {
     // Output message about test being performed
     SUBTEST("Basic Scalar Attribute Reading Functions");
 
     try {
-	// Open file
-	H5File fid1(FILE_SCALAR, H5F_ACC_RDWR);
+        // Open file
+        H5File fid1(FILE_SCALAR, H5F_ACC_RDWR, fapl);
 
-	// Open the dataset
-	DataSet dataset = fid1.openDataSet(DSET1_NAME);
+        // Open the dataset
+        DataSet dataset = fid1.openDataSet(DSET1_NAME);
 
-	// Verify the correct number of attributes
-	int num_attrs = dataset.getNumAttrs();
-	verify_val(num_attrs, 1, "DataSet::getNumAttrs", __LINE__, __FILE__);
+        // Verify the correct number of attributes
+        int num_attrs = dataset.getNumAttrs();
+        verify_val(num_attrs, 1, "DataSet::getNumAttrs", __LINE__, __FILE__);
 
-	// Open an attribute for the dataset
-	Attribute ds_attr=dataset.openAttribute(ATTR5_NAME);
+        // Open an attribute for the dataset
+        Attribute ds_attr = dataset.openAttribute(ATTR5_NAME);
 
-	// Read attribute information
-	float read_data2=0.0;  // Buffer for reading 1st attribute
-	ds_attr.read(PredType::NATIVE_FLOAT,&read_data2);
-	verify_val(read_data2, attr_data5, "Attribute::read", __LINE__, __FILE__);
+        // Read attribute information
+        float read_data2 = 0.0; // Buffer for reading 1st attribute
+        ds_attr.read(PredType::NATIVE_FLOAT, &read_data2);
+        if (abs(read_data2 - attr_data5) > FLT_EPSILON)
+            TestErrPrintf("%d: attribute data different: read_data2=%f, "
+                          "attr_data5=%f\n",
+                          __LINE__, static_cast<double>(read_data2), static_cast<double>(attr_data5));
 
-	// Get the dataspace of the attribute
-	DataSpace att_space = ds_attr.getSpace();
+        // Get the dataspace of the attribute
+        DataSpace att_space = ds_attr.getSpace();
 
-	// Make certain the dataspace is scalar
-	H5S_class_t space_type = att_space.getSimpleExtentType();
-	verify_val(space_type, H5S_SCALAR, "DataSpace::getSimpleExtentType", __LINE__, __FILE__);
+        // Make certain the dataspace is scalar
+        H5S_class_t space_type = att_space.getSimpleExtentType();
+        verify_val(static_cast<long>(space_type), static_cast<long>(H5S_SCALAR),
+                   "DataSpace::getSimpleExtentType", __LINE__, __FILE__);
 
-	PASSED();
+        PASSED();
     } // end try block
 
-    catch (Exception E) {
-	issue_fail_msg("test_attr_scalar_read()", __LINE__, __FILE__, E.getCDetailMsg());
+    catch (Exception &E) {
+        issue_fail_msg("test_attr_scalar_read()", __LINE__, __FILE__, E.getCDetailMsg());
     }
-}   // test_attr_scalar_read()
-
-/****************************************************************
-**
-**  test_attr_mult_write(): Test multiple attributes
-**
-****************************************************************/
-static void test_attr_mult_write()
+} // test_attr_scalar_read()
+
+/*-------------------------------------------------------------------------
+ * Function:    test_attr_mult_write
+ *
+ * Purpose      Test writing multiple attributes.
+ *
+ * Return       None
+ *-------------------------------------------------------------------------
+ */
+static void
+test_attr_mult_write(FileAccPropList &fapl)
 {
     // Output message about test being performed
     SUBTEST("Multiple Attribute Writing Functions");
 
     try {
-	// Create file
-	H5File fid1 (FILE_MULTI, H5F_ACC_TRUNC);
+        // Create file
+        H5File fid1(FILE_MULTI, H5F_ACC_TRUNC, FileCreatPropList::DEFAULT, fapl);
 
-	// Create dataspace for dataset
-	hsize_t	dims1[] = {SPACE1_DIM1, SPACE1_DIM2, SPACE1_DIM3};
-	DataSpace ds_space (SPACE1_RANK, dims1);
+        // Create dataspace for dataset
+        hsize_t   dims1[] = {SPACE1_DIM1, SPACE1_DIM2, SPACE1_DIM3};
+        DataSpace ds_space(SPACE1_RANK, dims1);
 
-	// Create a dataset
-	DataSet dataset = fid1.createDataSet(DSET1_NAME, PredType::NATIVE_UCHAR, ds_space);
+        // Create a dataset
+        DataSet dataset = fid1.createDataSet(DSET1_NAME, PredType::NATIVE_UCHAR, ds_space);
 
-	// Create dataspace for 1st attribute
-	hsize_t	dims2[] = {ATTR1_DIM1};
-	DataSpace att_space (ATTR1_RANK, dims2);
+        // Create dataspace for 1st attribute
+        hsize_t   dims2[] = {ATTR1_DIM1};
+        DataSpace att_space(ATTR1_RANK, dims2);
 
-	// Create 1st attribute for the dataset
-	Attribute ds_attr = dataset.createAttribute (ATTR1_NAME, PredType::NATIVE_INT, att_space);
+        // Create 1st attribute for the dataset
+        Attribute ds_attr = dataset.createAttribute(ATTR1_NAME, PredType::NATIVE_INT, att_space);
 
-	// Write attribute information
-	ds_attr.write (PredType::NATIVE_INT, attr_data1);
+        // Write attribute information
+        ds_attr.write(PredType::NATIVE_INT, attr_data1);
 
-	// Create dataspace for 2nd attribute
-	hsize_t	dims3[] = {ATTR2_DIM1,ATTR2_DIM2};
-	DataSpace att2_space (ATTR2_RANK, dims3);
+        // Create dataspace for 2nd attribute
+        hsize_t   dims3[] = {ATTR2_DIM1, ATTR2_DIM2};
+        DataSpace att2_space(ATTR2_RANK, dims3);
 
-	// Create 2nd attribute for the dataset
-	Attribute ds_attr2 = dataset.createAttribute (ATTR2_NAME, PredType::NATIVE_INT, att2_space);
+        // Create 2nd attribute for the dataset
+        Attribute ds_attr2 = dataset.createAttribute(ATTR2_NAME, PredType::NATIVE_INT, att2_space);
 
-	// Write 2nd attribute information
-	ds_attr2.write (PredType::NATIVE_INT, attr_data2);
+        // Write 2nd attribute information
+        ds_attr2.write(PredType::NATIVE_INT, attr_data2);
 
-	// Create dataspace for 3rd attribute
-	hsize_t	dims4[] = {ATTR3_DIM1,ATTR3_DIM2,ATTR3_DIM3};
-	DataSpace att3_space (ATTR3_RANK, dims4);
+        // Create dataspace for 3rd attribute
+        hsize_t   dims4[] = {ATTR3_DIM1, ATTR3_DIM2, ATTR3_DIM3};
+        DataSpace att3_space(ATTR3_RANK, dims4);
 
-	// Create 3rd attribute for the dataset
-	Attribute ds_attr3 = dataset.createAttribute (ATTR3_NAME, PredType::NATIVE_DOUBLE, att3_space);
+        // Create 3rd attribute for the dataset
+        Attribute ds_attr3 = dataset.createAttribute(ATTR3_NAME, PredType::NATIVE_DOUBLE, att3_space);
 
-	// Try creating an attribute that already exists.  This should fail
-	// since two attributes cannot have the same name.  If an exception
-	// is not thrown for this action by createAttribute, then throw an
-	// invalid action exception.
-	try {
-	    Attribute invalid_attr = dataset.createAttribute (ATTR3_NAME, PredType::NATIVE_DOUBLE, att3_space);
+        // Try creating an attribute that already exists.  This should fail
+        // since two attributes cannot have the same name.  If an exception
+        // is not thrown for this action by createAttribute, then throw an
+        // invalid action exception.
+        try {
+            Attribute invalid_attr = dataset.createAttribute(ATTR3_NAME, PredType::NATIVE_DOUBLE, att3_space);
 
-	    // continuation here, that means no exception has been thrown
-	    throw InvalidActionException("DataSet::createAttribute", "Attempting to create a duplicate attribute");
-	}
-	catch (AttributeIException E) // catching invalid creating attribute
-        {} // do nothing, exception expected
+            // continuation here, that means no exception has been thrown
+            throw InvalidActionException("DataSet::createAttribute",
+                                         "Attempting to create a duplicate attribute");
+        }
+        catch (AttributeIException &E) // catching invalid creating attribute
+        {
+        } // do nothing, exception expected
 
-	// Write 3rd attribute information
-	ds_attr3.write (PredType::NATIVE_DOUBLE, attr_data3);
+        // Write 3rd attribute information
+        ds_attr3.write(PredType::NATIVE_DOUBLE, attr_data3);
 
-	PASSED();
+        PASSED();
     } // end try block
 
-    catch (Exception E) {
-	issue_fail_msg("test_attr_mult_write()", __LINE__, __FILE__, E.getCDetailMsg());
+    catch (Exception &E) {
+        issue_fail_msg("test_attr_mult_write()", __LINE__, __FILE__, E.getCDetailMsg());
     }
-}   // test_attr_mult_write()
-
-/****************************************************************
-**
-**  test_attr_mult_read(): Test reading multiple attributes.
-**
-****************************************************************/
-static void test_attr_mult_read()
+} // test_attr_mult_write()
+
+/*-------------------------------------------------------------------------
+ * Function:    test_attr_mult_read
+ *
+ * Purpose      Test reading multiple attributes.
+ *
+ * Return       None
+ *-------------------------------------------------------------------------
+ */
+static void
+test_attr_mult_read(FileAccPropList &fapl)
 {
-    int     read_data1[ATTR1_DIM1]={0}; // Buffer for reading 1st attribute
-    int     read_data2[ATTR2_DIM1][ATTR2_DIM2]={{0}}; // Buffer for reading 2nd attribute
-    double  read_data3[ATTR3_DIM1][ATTR3_DIM2][ATTR3_DIM3]={{{0}}}; // Buffer for reading 3rd attribute
-    hsize_t i,j,k;
+    int     read_data1[ATTR1_DIM1]                         = {0};     // Buffer for reading 1st attribute
+    int     read_data2[ATTR2_DIM1][ATTR2_DIM2]             = {{0}};   // Buffer for reading 2nd attribute
+    double  read_data3[ATTR3_DIM1][ATTR3_DIM2][ATTR3_DIM3] = {{{0}}}; // Buffer for reading 3rd attribute
+    hsize_t i, j, k;
 
-	// Output message about test being performed
+    // Output message about test being performed
     SUBTEST("Multiple Attribute Reading Functions");
 
     try {
-	// Open file
-	H5File fid1(FILE_MULTI, H5F_ACC_RDWR);
+        // Open file
+        H5File fid1(FILE_MULTI, H5F_ACC_RDWR, fapl);
 
-	// Open the dataset
-	DataSet dataset = fid1.openDataSet(DSET1_NAME);
+        // Open the dataset
+        DataSet dataset = fid1.openDataSet(DSET1_NAME);
 
-	// Verify the correct number of attributes
-	int num_attrs = dataset.getNumAttrs();
-	verify_val(num_attrs, 3, "DataSet::getNumAttrs", __LINE__, __FILE__);
+        // Verify the correct number of attributes
+        int num_attrs = dataset.getNumAttrs();
+        verify_val(num_attrs, 3, "DataSet::getNumAttrs", __LINE__, __FILE__);
 
-	// Open 1st attribute for the dataset
-	Attribute attr = dataset.openAttribute((unsigned)0);
+        // Open 1st attribute for the dataset
+        Attribute attr = dataset.openAttribute(static_cast<unsigned>(0));
 
-	/* Verify Dataspace */
+        /* Verify Dataspace */
 
-	// Get the dataspace of the attribute
-	DataSpace space = attr.getSpace();
+        // Get the dataspace of the attribute
+        DataSpace space = attr.getSpace();
 
-	// Get the rank of the dataspace and verify it
-	int rank = space.getSimpleExtentNdims();
-	verify_val(rank, ATTR1_RANK, "DataSpace::getSimpleExtentNdims", __LINE__, __FILE__);
+        // Get the rank of the dataspace and verify it
+        int rank = space.getSimpleExtentNdims();
+        verify_val(rank, ATTR1_RANK, "DataSpace::getSimpleExtentNdims", __LINE__, __FILE__);
 
-	// Get the dims of the dataspace and verify them
-	hsize_t dims[ATTR_MAX_DIMS];    // Attribute dimensions
-	int ndims = space.getSimpleExtentDims(dims);
-	if ((long)dims[0] != (long)ATTR1_DIM1)
-	    TestErrPrintf("%d:attribute dimensions different: dims[0]=%d, should be %d\n",__LINE__,(int)dims[0],ATTR1_DIM1);
+        // Get the dims of the dataspace and verify them
+        hsize_t dims[ATTR_MAX_DIMS]; // Attribute dimensions
+        (void)space.getSimpleExtentDims(dims);
+        if (dims[0] != ATTR1_DIM1)
+            TestErrPrintf("%d:attribute dimensions different: dims[0]=%d, should be %" PRIuHSIZE "\n",
+                          __LINE__, static_cast<int>(dims[0]), ATTR1_DIM1);
 
-	/* Verify Datatype */
+        /* Verify Datatype */
 
         // Get the class of the datatype that is used by attr
         H5T_class_t type_class = attr.getTypeClass();
 
         // Verify that the type is of integer datatype
-        verify_val(type_class, H5T_INTEGER, "Attribute::getTypeClass", __LINE__, __FILE__);
+        verify_val(static_cast<long>(type_class), static_cast<long>(H5T_INTEGER), "Attribute::getTypeClass",
+                   __LINE__, __FILE__);
 
-    	// Get the integer datatype
+        // Get the integer datatype
         IntType i_type1 = attr.getIntType();
 
-	// Get and verify the order of this type
-	H5T_order_t order = i_type1.getOrder();
-	verify_val(order, PredType::NATIVE_INT.getOrder(), "DataType::getOrder", __LINE__, __FILE__);
+        // Get and verify the order of this type
+        H5T_order_t order = i_type1.getOrder();
+        verify_val(static_cast<long>(order), static_cast<long>(PredType::NATIVE_INT.getOrder()),
+                   "DataType::getOrder", __LINE__, __FILE__);
 
-	// Get and verify the size of this type
-	size_t size = i_type1.getSize();
-	verify_val(size, PredType::NATIVE_INT.getSize(), "DataType::getSize", __LINE__, __FILE__);
+        // Get and verify the size of this type
+        size_t size = i_type1.getSize();
+        verify_val(size, PredType::NATIVE_INT.getSize(), "DataType::getSize", __LINE__, __FILE__);
 
-	// Read attribute information
-	attr.read(PredType::NATIVE_INT, read_data1);
+        // Read attribute information
+        attr.read(PredType::NATIVE_INT, read_data1);
 
-	// Verify values read in
-	for(i=0; i<ATTR1_DIM1; i++)
-	    if(attr_data1[i]!=read_data1[i])
-		TestErrPrintf("%d: attribute data different: attr_data1[%d]=%d,read_data1[%d]=%d\n",__LINE__,i,attr_data1[i],i,read_data1[i]);
+        // Verify values read in
+        for (i = 0; i < ATTR1_DIM1; i++)
+            if (attr_data1[i] != read_data1[i])
+                TestErrPrintf("%d: attribute data different: attr_data1[%" PRIuHSIZE
+                              "]=%d,read_data1[%" PRIuHSIZE "]=%d\n",
+                              __LINE__, i, attr_data1[i], i, read_data1[i]);
 
-	// Verify Name
-	H5std_string attr_name = attr.getName();
-	verify_val(attr_name, ATTR1_NAME, "DataType::getName", __LINE__, __FILE__);
+        // Verify Name
+        H5std_string attr_name = attr.getName();
+        verify_val(attr_name, ATTR1_NAME, "DataType::getName", __LINE__, __FILE__);
 
-	attr.close();
-	space.close();
+        attr.close();
+        space.close();
 
-	// Open 2nd attribute for the dataset
-	attr = dataset.openAttribute((unsigned)1);
+        // Open 2nd attribute for the dataset
+        attr = dataset.openAttribute(static_cast<unsigned>(1));
 
-	/* Verify Dataspace */
+        /* Verify Dataspace */
 
-	// Get the dataspace of the attribute
-	space = attr.getSpace();
+        // Get the dataspace of the attribute
+        space = attr.getSpace();
 
-	// Get the rank of the dataspace and verify it
-	rank = space.getSimpleExtentNdims();
-	verify_val(rank, ATTR2_RANK, "DataSpace::getSimpleExtentNdims", __LINE__, __FILE__);
+        // Get the rank of the dataspace and verify it
+        rank = space.getSimpleExtentNdims();
+        verify_val(rank, ATTR2_RANK, "DataSpace::getSimpleExtentNdims", __LINE__, __FILE__);
 
-	// Get the dims of the dataspace and verify them
-	ndims = space.getSimpleExtentDims(dims);
+        // Get the dims of the dataspace and verify them
+        (void)space.getSimpleExtentDims(dims);
 
-        verify_val((long)dims[0], (long)ATTR2_DIM1, "DataSpace::getSimpleExtentDims",__LINE__, __FILE__);
-        verify_val((long)dims[1], (long)ATTR2_DIM2, "DataSpace::getSimpleExtentDims",__LINE__, __FILE__);
+        verify_val(static_cast<long>(dims[0]), static_cast<long>(ATTR2_DIM1),
+                   "DataSpace::getSimpleExtentDims", __LINE__, __FILE__);
+        verify_val(static_cast<long>(dims[1]), static_cast<long>(ATTR2_DIM2),
+                   "DataSpace::getSimpleExtentDims", __LINE__, __FILE__);
 
-	/* Verify Datatype */
+        /* Verify Datatype */
 
         // Get the class of the datatype that is used by attr
         type_class = attr.getTypeClass();
 
         // Verify that the type is of integer datatype
-        verify_val(type_class, H5T_INTEGER, "Attribute::getTypeClass", __LINE__, __FILE__);
+        verify_val(static_cast<long>(type_class), static_cast<long>(H5T_INTEGER), "Attribute::getTypeClass",
+                   __LINE__, __FILE__);
 
-    	// Get the integer datatype
+        // Get the integer datatype
         IntType i_type2 = attr.getIntType();
 
-	// Get and verify the order of this type
-	order = i_type2.getOrder();
-	verify_val(order, PredType::NATIVE_INT.getOrder(), "DataType::getOrder", __LINE__, __FILE__);
-
-	// Get and verify the size of this type
-	size = i_type2.getSize();
-	verify_val(size, PredType::NATIVE_INT.getSize(), "DataType::getSize", __LINE__, __FILE__);
-
-	// Read attribute information
-	attr.read(PredType::NATIVE_INT, read_data2);
-	//attr.read(i_type, read_data2);
-
-	// Verify values read in
-	for(i=0; i<ATTR2_DIM1; i++)
-	  for(j=0; j<ATTR2_DIM2; j++)
-            if(attr_data2[i][j]!=read_data2[i][j])
-                TestErrPrintf("%d: attribute data different: attr_data2[%d][%d]=%d, read_data2[%d][%d]=%d\n",__LINE__,i,j,attr_data2[i][j],i,j,read_data2[i][j]);
-
-	// Verify Name
-	attr_name = attr.getName();
-	verify_val(attr_name, ATTR2_NAME, "DataType::getName", __LINE__, __FILE__);
-	attr.close();
-	space.close();
+        // Get and verify the order of this type
+        order = i_type2.getOrder();
+        verify_val(static_cast<long>(order), static_cast<long>(PredType::NATIVE_INT.getOrder()),
+                   "DataType::getOrder", __LINE__, __FILE__);
+
+        // Get and verify the size of this type
+        size = i_type2.getSize();
+        verify_val(size, PredType::NATIVE_INT.getSize(), "DataType::getSize", __LINE__, __FILE__);
+
+        // Read attribute information
+        attr.read(PredType::NATIVE_INT, read_data2);
+        // attr.read(i_type, read_data2);
+
+        // Verify values read in
+        for (i = 0; i < ATTR2_DIM1; i++)
+            for (j = 0; j < ATTR2_DIM2; j++)
+                if (attr_data2[i][j] != read_data2[i][j])
+                    TestErrPrintf("%d: attribute data different: attr_data2[%" PRIuHSIZE "][%" PRIuHSIZE
+                                  "]=%d, "
+                                  "read_data2[%" PRIuHSIZE "][%" PRIuHSIZE "]=%d\n",
+                                  __LINE__, i, j, attr_data2[i][j], i, j, read_data2[i][j]);
+
+        // Verify Name
+        attr_name = attr.getName();
+        verify_val(attr_name, ATTR2_NAME, "DataType::getName", __LINE__, __FILE__);
+        attr.close();
+        space.close();
 
-	// Open 3rd attribute for the dataset
-	attr = dataset.openAttribute((unsigned)2);
+        // Open 3rd attribute for the dataset
+        attr = dataset.openAttribute(static_cast<unsigned>(2));
 
-	/* Verify Dataspace */
+        /* Verify Dataspace */
 
-	// Get the dataspace of the attribute
-	space = attr.getSpace();
+        // Get the dataspace of the attribute
+        space = attr.getSpace();
 
-	// Get the rank of the dataspace and verify it
-	rank = space.getSimpleExtentNdims();
-	verify_val(rank, ATTR3_RANK, "DataSpace::getSimpleExtentNdims", __LINE__, __FILE__);
+        // Get the rank of the dataspace and verify it
+        rank = space.getSimpleExtentNdims();
+        verify_val(rank, ATTR3_RANK, "DataSpace::getSimpleExtentNdims", __LINE__, __FILE__);
 
-	// Get the dims of the dataspace and verify them
-	ndims = space.getSimpleExtentDims(dims);
-	verify_val((long)dims[0],(long)ATTR3_DIM1,"attribute dimensions",__FILE__,__LINE__);
-	verify_val((long)dims[1],(long)ATTR3_DIM2,"attribute dimensions",__FILE__,__LINE__);
-	verify_val((long)dims[2],(long)ATTR3_DIM3,"attribute dimensions",__FILE__,__LINE__);
+        // Get the dims of the dataspace and verify them
+        (void)space.getSimpleExtentDims(dims);
+        verify_val(static_cast<long>(dims[0]), static_cast<long>(ATTR3_DIM1), "attribute dimensions",
+                   __FILE__, __LINE__);
+        verify_val(static_cast<long>(dims[1]), static_cast<long>(ATTR3_DIM2), "attribute dimensions",
+                   __FILE__, __LINE__);
+        verify_val(static_cast<long>(dims[2]), static_cast<long>(ATTR3_DIM3), "attribute dimensions",
+                   __FILE__, __LINE__);
 
-	/* Verify Datatype */
+        /* Verify Datatype */
 
         // Get the class of the datatype that is used by attr
         type_class = attr.getTypeClass();
 
         // Verify that the type is of compound datatype
-        verify_val(type_class, H5T_FLOAT, "Attribute::getTypeClass", __LINE__, __FILE__);
+        verify_val(static_cast<long>(type_class), static_cast<long>(H5T_FLOAT), "Attribute::getTypeClass",
+                   __LINE__, __FILE__);
 
-    	// Get the double datatype
+        // Get the double datatype
         FloatType f_type = attr.getFloatType();
 
-	// Get and verify the order of this type
-	order = f_type.getOrder();
-	verify_val(order, PredType::NATIVE_DOUBLE.getOrder(), "DataType::getOrder", __LINE__, __FILE__);
-
-	// Get and verify the size of this type
-	size = f_type.getSize();
-	verify_val(size, PredType::NATIVE_DOUBLE.getSize(), "DataType::getSize", __LINE__, __FILE__);
-
-	// Read attribute information
-	attr.read(PredType::NATIVE_DOUBLE, read_data3);
-
-	// Verify values read in
-	for(i=0; i<ATTR3_DIM1; i++)
-	    for(j=0; j<ATTR3_DIM2; j++)
-		for(k=0; k<ATTR3_DIM3; k++)
-		    if(attr_data3[i][j][k]!=read_data3[i][j][k])
-			TestErrPrintf("%d: attribute data different: attr_data3[%d][%d][%d]=%f, read_data3[%d][%d][%d]=%f\n",__LINE__,i,j,k,attr_data3[i][j][k],i,j,k,read_data3[i][j][k]);
-
-	// Verify Name
-	attr_name = attr.getName();
-	verify_val(attr_name, ATTR3_NAME, "DataType::getName", __LINE__, __FILE__);
-
-	PASSED();
+        // Get and verify the order of this type
+        order = f_type.getOrder();
+        verify_val(static_cast<long>(order), static_cast<long>(PredType::NATIVE_DOUBLE.getOrder()),
+                   "DataType::getOrder", __LINE__, __FILE__);
+
+        // Get and verify the size of this type
+        size = f_type.getSize();
+        verify_val(size, PredType::NATIVE_DOUBLE.getSize(), "DataType::getSize", __LINE__, __FILE__);
+
+        // Read attribute information
+        attr.read(PredType::NATIVE_DOUBLE, read_data3);
+
+        // Verify values read in
+        for (i = 0; i < ATTR3_DIM1; i++)
+            for (j = 0; j < ATTR3_DIM2; j++)
+                for (k = 0; k < ATTR3_DIM3; k++)
+                    if (abs(attr_data3[i][j][k] - read_data3[i][j][k]) > DBL_EPSILON)
+                        TestErrPrintf("%d: attribute data different: attr_data3[%" PRIuHSIZE "][%" PRIuHSIZE
+                                      "][%" PRIuHSIZE "]=%f, "
+                                      "read_data3[%" PRIuHSIZE "][%" PRIuHSIZE "][%" PRIuHSIZE "]=%f\n",
+                                      __LINE__, i, j, k, attr_data3[i][j][k], i, j, k, read_data3[i][j][k]);
+
+        // Verify Name
+        attr_name = attr.getName();
+        verify_val(attr_name, ATTR3_NAME, "DataType::getName", __LINE__, __FILE__);
+
+        PASSED();
     } // end try block
 
-    catch (Exception E) {
-	issue_fail_msg("test_attr_mult_read()", __LINE__, __FILE__, E.getCDetailMsg());
+    catch (Exception &E) {
+        issue_fail_msg("test_attr_mult_read()", __LINE__, __FILE__, E.getCDetailMsg());
     }
-}   // test_attr_mult_read()
-
-/****************************************************************
-**
-**  test_attr_delete(): Test deleting attribute from different
-**			hdf5 objects.
-**
-****************************************************************/
-static void test_attr_delete()
+} // test_attr_mult_read()
+
+/*-------------------------------------------------------------------------
+ * Function:    test_attr_delete
+ *
+ * Purpose      Test deleting attribute from different hdf5 objects.
+ *
+ * Return       None
+ *-------------------------------------------------------------------------
+ */
+static void
+test_attr_delete(FileAccPropList &fapl)
 {
-    H5std_string  attr_name; // Buffer for attribute names
+    H5std_string attr_name; // Buffer for attribute names
 
     // Output message about test being performed
     SUBTEST("Removing Attribute Function");
 
     try {
-	// Open file.
-	H5File fid1(FILE_BASIC, H5F_ACC_RDWR);
+        // Open file.
+        H5File fid1(FILE_BASIC, H5F_ACC_RDWR, fapl);
 
-	// Get the number of file attributes
-	int num_attrs = fid1.getNumAttrs();
-	verify_val(num_attrs, 2, "H5File::getNumAttrs", __LINE__, __FILE__);
+        // Get the number of file attributes
+        int num_attrs = fid1.getNumAttrs();
+        verify_val(num_attrs, 2, "H5File::getNumAttrs", __LINE__, __FILE__);
 
-	// Delete the second file attribute
-	fid1.removeAttr(FATTR2_NAME);
+        // Delete the second file attribute
+        fid1.removeAttr(FATTR2_NAME);
 
-	// Get the number of file attributes
-	num_attrs = fid1.getNumAttrs();
-	verify_val(num_attrs, 1, "H5File::getNumAttrs", __LINE__, __FILE__);
+        // Get the number of file attributes
+        num_attrs = fid1.getNumAttrs();
+        verify_val(num_attrs, 1, "H5File::getNumAttrs", __LINE__, __FILE__);
 
-	// Verify the name of the only file attribute left
-	Attribute fattr = fid1.openAttribute((unsigned)0);
-	H5std_string attr_name = fattr.getName();
-	verify_val(attr_name, FATTR1_NAME, "Attribute::getName", __LINE__, __FILE__);
-	fattr.close();
-	
-	// Test deleting non-existing attribute
+        // Verify the name of the only file attribute left
+        Attribute fattr = fid1.openAttribute(static_cast<unsigned>(0));
+        attr_name       = fattr.getName();
+        verify_val(attr_name, FATTR1_NAME, "Attribute::getName", __LINE__, __FILE__);
+        fattr.close();
 
-	// Open the dataset
-	DataSet dataset = fid1.openDataSet(DSET1_NAME);
+        // Test deleting non-existing attribute
 
-	// Verify the correct number of attributes
-	num_attrs = dataset.getNumAttrs();
-	verify_val(num_attrs, 3, "DataSet::getNumAttrs", __LINE__, __FILE__);
+        // Open the dataset
+        DataSet dataset = fid1.openDataSet(DSET1_NAME);
 
-	// Try to delete bogus attribute, should fail
-	try {
-	    dataset.removeAttr("Bogus");
+        // Verify the correct number of attributes
+        num_attrs = dataset.getNumAttrs();
+        verify_val(num_attrs, 3, "DataSet::getNumAttrs", __LINE__, __FILE__);
 
-	    // continuation here, that means no exception has been thrown
-	    throw InvalidActionException("DataSet::removeAttr", "Attempting to remove non-existing attribute");
-	}
-	catch (AttributeIException E) // catching invalid removing attribute
-        {} // do nothing, exception expected
+        // Try to delete bogus attribute, should fail
+        try {
+            dataset.removeAttr("Bogus");
 
-	// Test deleting dataset's attributes
+            // continuation here, that means no exception has been thrown
+            throw InvalidActionException("DataSet::removeAttr",
+                                         "Attempting to remove non-existing attribute");
+        }
+        catch (AttributeIException &E) // catching invalid removing attribute
+        {
+        } // do nothing, exception expected
 
-	// Verify the correct number of attributes
-	num_attrs = dataset.getNumAttrs();
-	verify_val(num_attrs, 3, "DataSet::getNumAttrs", __LINE__, __FILE__);
+        // Test opening and deleting non-existing dataset's attributes
 
-	// Delete middle (2nd) attribute
-	dataset.removeAttr(ATTR2_NAME);
+        // Verify the correct number of attributes
+        num_attrs = dataset.getNumAttrs();
+        verify_val(num_attrs, 3, "DataSet::getNumAttrs", __LINE__, __FILE__);
 
-	// Verify the correct number of attributes
-	num_attrs = dataset.getNumAttrs();
-	verify_val(num_attrs, 2, "DataSet::getNumAttrs", __LINE__, __FILE__);
+        // Delete an attribute
+        dataset.removeAttr(ATTR2_NAME);
 
-	// Open 1st attribute for the dataset
-	Attribute attr = dataset.openAttribute((unsigned)0);
+        // Verify the correct number of attributes
+        num_attrs = dataset.getNumAttrs();
+        verify_val(num_attrs, 2, "DataSet::getNumAttrs", __LINE__, __FILE__);
 
-	// Verify Name
-	attr_name = attr.getName();
-	verify_val(attr_name, ATTR1_NAME, "Attribute::getName", __LINE__, __FILE__);
+#if 0 // commented this test out, awaiting HDFFV-11327 resolution
+      // Open 1st attribute for the dataset
+        Attribute attr = dataset.openAttribute(static_cast<unsigned>(0));
 
-	// Close attribute
-	attr.close();
+        // Verify Name
+        attr_name = attr.getName();
+        verify_val(attr_name, ATTR1_NAME, "Attribute::getName", __LINE__, __FILE__);
 
-	// Open last (formally 3rd) attribute for the dataset
-	attr = dataset.openAttribute((unsigned)1);
+        // Close attribute
+        attr.close();
 
-	// Verify Name
-	attr_name = attr.getName();
-	verify_val(attr_name, ATTR3_NAME, "Attribute::getName", __LINE__, __FILE__);
+        // Open last (formally 3rd) attribute for the dataset
+        attr = dataset.openAttribute(static_cast<unsigned>(1));
 
-	attr.close();
+        // Verify Name
+        attr_name = attr.getName();
+        verify_val(attr_name, ATTR3_NAME, "Attribute::getName", __LINE__, __FILE__);
 
-	// Delete first attribute
-	dataset.removeAttr(ATTR1_NAME);
+        attr.close();
+#endif
 
-	// Verify the correct number of attributes
-	num_attrs = dataset.getNumAttrs();
-	verify_val(num_attrs, 1, "DataSet::getNumAttrs", __LINE__, __FILE__);
+        // Try opening a deleted attribute, should fail
+        try {
+            Attribute exp_attr = dataset.openAttribute(ATTR2_NAME);
 
-	// Open the only attribute for the dataset (formally 3rd)
-	attr = dataset.openAttribute((unsigned)0);
+            // continuation here, that means no exception has been thrown
+            throw InvalidActionException("DataSet::removeAttr", "Attempting to open non-existing attribute");
+        }
+        catch (AttributeIException &E) // catching invalid removing attribute
+        {
+        } // do nothing, exception expected
+
+        // Delete an attribute
+        dataset.removeAttr(ATTR1_NAME);
+
+        // Verify the correct number of attributes
+        num_attrs = dataset.getNumAttrs();
+        verify_val(num_attrs, 1, "DataSet::getNumAttrs", __LINE__, __FILE__);
+
+#if 0 // commented this test out, awaiting HDFFV-11327 resolution
+      // Open the only attribute for the dataset (formally 3rd)
+        attr = dataset.openAttribute(static_cast<unsigned>(0));
+
+        // Verify Name
+        attr_name = attr.getName();
+        verify_val(attr_name, ATTR3_NAME, "Attribute::getName", __LINE__, __FILE__);
+        // Close attribute
+        attr.close();
+#endif
 
-	// Verify Name
-	attr_name = attr.getName();
-	verify_val(attr_name, ATTR3_NAME, "Attribute::getName", __LINE__, __FILE__);
-	// Close attribute
-	attr.close();
+        // Delete an attribute
+        dataset.removeAttr(ATTR3_NAME);
 
-	// Delete first attribute
-	dataset.removeAttr(ATTR3_NAME);
+        // Verify the correct number of attributes
+        num_attrs = dataset.getNumAttrs();
+        verify_val(num_attrs, 0, "DataSet::getNumAttrs", __LINE__, __FILE__);
 
-	// Verify the correct number of attributes
-	num_attrs = dataset.getNumAttrs();
-	verify_val(num_attrs, 0, "DataSet::getNumAttrs", __LINE__, __FILE__);
+        // Try removing a deleted attribute, should fail
+        try {
+            dataset.removeAttr(ATTR1_NAME);
 
-	PASSED();
+            // continuation here, that means no exception has been thrown
+            throw InvalidActionException("DataSet::removeAttr",
+                                         "Attempting to delete non-existing attribute");
+        }
+        catch (AttributeIException &E) // catching invalid removing attribute
+        {
+        } // do nothing, exception expected
+
+        PASSED();
     } // end try block
 
-    catch (Exception E) {
-	issue_fail_msg("test_attr_delete()", __LINE__, __FILE__, E.getCDetailMsg());
+    catch (Exception &E) {
+        issue_fail_msg("test_attr_delete()", __LINE__, __FILE__, E.getCDetailMsg());
     }
-}   // test_attr_delete()
-
-/****************************************************************
-**
-**  test_attr_dtype_shared(): Test code for using shared datatypes
-**				in attributes.
-**
-****************************************************************/
-static void test_attr_dtype_shared()
+} // test_attr_delete()
+
+/*-------------------------------------------------------------------------
+ * Function:    test_attr_dtype_shared
+ *
+ * Purpose      Test accessing attributes using shared datatypes.
+ *
+ * Return       None
+ *-------------------------------------------------------------------------
+ */
+static void
+test_attr_dtype_shared(FileAccPropList &fapl)
 {
-    int data=8;                 /* Data to write */
-    int rdata=0;                /* Read read in */
+    int data  = 8; // Data to write
+    int rdata = 0; // Data read in
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-    H5G_stat_t statbuf;         /* Object's information */
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
-    h5_stat_size_t filesize;             /* Size of file after modifications */
+    H5G_stat_t statbuf; // Object's information
+#endif
+    h5_stat_size_t filesize; // Size of file after modifications
 
     // Output message about test being performed
     SUBTEST("Shared Datatypes with Attributes");
 
     try {
-	// Create a file
-	H5File fid1(FILE_DTYPE, H5F_ACC_TRUNC);
+        // Create a file
+        H5File fid1(FILE_DTYPE, H5F_ACC_TRUNC, FileCreatPropList::DEFAULT, fapl);
 
-	// Close file
-	fid1.close();
+        // Close file
+        fid1.close();
 
-	// Get size of file
-	h5_stat_size_t empty_filesize;       // Size of empty file
-	empty_filesize = h5_get_file_size(FILE_DTYPE.c_str(), H5P_DEFAULT);
-	if (empty_filesize < 0)
+        // Get size of file
+        h5_stat_size_t empty_filesize; // Size of empty file
+        empty_filesize = h5_get_file_size(FILE_DTYPE.c_str(), H5P_DEFAULT);
+        if (empty_filesize < 0)
             TestErrPrintf("Line %d: file size wrong!\n", __LINE__);
 
-	// Open the file again
-	fid1.openFile(FILE_DTYPE, H5F_ACC_RDWR);
+        // Open the file again
+        fid1.openFile(FILE_DTYPE, H5F_ACC_RDWR);
 
-	// Enclosing to work around the issue of unused variables and/or
-	// objects created by copy constructors stay around until end of
-	// scope, causing incorrect number of ref counts.
-	{ // First enclosed block
+        // Enclosing to work around the issue of unused variables and/or
+        // objects created by copy constructors stay around until end of
+        // scope, causing incorrect number of ref counts.
+        { // First enclosed block
 
-	// Create a datatype to commit and use
-	IntType dtype(PredType::NATIVE_INT);
+            // Create a datatype to commit and use
+            IntType dtype(PredType::NATIVE_INT);
 
-	// Commit datatype to file
-	dtype.commit(fid1, TYPE1_NAME);
+            // Commit datatype to file
+            dtype.commit(fid1, TYPE1_NAME);
 
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-	// Check reference count on named datatype
-	fid1.getObjinfo(TYPE1_NAME, statbuf);
-	verify_val((int)statbuf.nlink, 1, "DataType::getObjinfo", __LINE__, __FILE__);
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
+            // Check reference count on named datatype
+            fid1.getObjinfo(TYPE1_NAME, statbuf);
+            verify_val(static_cast<int>(statbuf.nlink), 1, "DataType::getObjinfo", __LINE__, __FILE__);
+#endif
 
-	// Create dataspace for dataset
-	DataSpace dspace;
+            // Create dataspace for dataset
+            DataSpace dspace;
 
-	DataSet dset = fid1.createDataSet(DSET1_NAME, dtype, dspace);
+            DataSet dset = fid1.createDataSet(DSET1_NAME, dtype, dspace);
 
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-	// Check reference count on named datatype
-	fid1.getObjinfo(TYPE1_NAME, statbuf);
-	verify_val((int)statbuf.nlink, 2, "H5File::getObjinfo", __LINE__, __FILE__);
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
+            // Check reference count on named datatype
+            fid1.getObjinfo(TYPE1_NAME, statbuf);
+            verify_val(static_cast<int>(statbuf.nlink), 2, "H5File::getObjinfo", __LINE__, __FILE__);
+#endif
 
-	// Create attribute on dataset
-	Attribute attr = dset.createAttribute(ATTR1_NAME,dtype,dspace);
+            // Create attribute on dataset
+            Attribute attr = dset.createAttribute(ATTR1_NAME, dtype, dspace);
 
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-	// Check reference count on named datatype
-	fid1.getObjinfo(TYPE1_NAME, statbuf);
-	verify_val((int)statbuf.nlink, 3, "DataSet::getObjinfo", __LINE__, __FILE__);
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
+            // Check reference count on named datatype
+            fid1.getObjinfo(TYPE1_NAME, statbuf);
+            verify_val(static_cast<int>(statbuf.nlink), 3, "DataSet::getObjinfo", __LINE__, __FILE__);
+#endif
 
-        // Close attribute
-        attr.close();
+            // Close attribute
+            attr.close();
 
-	// Delete attribute
-	dset.removeAttr(ATTR1_NAME);
+            // Delete attribute
+            dset.removeAttr(ATTR1_NAME);
 
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-	// Check reference count on named datatype
-	fid1.getObjinfo(TYPE1_NAME, statbuf);
-	verify_val((int)statbuf.nlink, 2, "DataSet::getObjinfo after DataSet::removeAttr", __LINE__, __FILE__);
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
+            // Check reference count on named datatype
+            fid1.getObjinfo(TYPE1_NAME, statbuf);
+            verify_val(static_cast<int>(statbuf.nlink), 2, "DataSet::getObjinfo after DataSet::removeAttr",
+                       __LINE__, __FILE__);
+#endif
 
-        // Create attribute on dataset
-        attr = dset.createAttribute(ATTR1_NAME,dtype,dspace);
+            // Create attribute on dataset
+            attr = dset.createAttribute(ATTR1_NAME, dtype, dspace);
 
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-	// Check reference count on named datatype
-	fid1.getObjinfo(TYPE1_NAME, statbuf);
-	verify_val((int)statbuf.nlink, 3, "DataSet::createAttribute", __LINE__, __FILE__);
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
+            // Check reference count on named datatype
+            fid1.getObjinfo(TYPE1_NAME, statbuf);
+            verify_val(static_cast<int>(statbuf.nlink), 3, "DataSet::createAttribute", __LINE__, __FILE__);
+#endif
 
-	// Write data into the attribute
-	attr.write(PredType::NATIVE_INT,&data);
+            // Write data into the attribute
+            attr.write(PredType::NATIVE_INT, &data);
 
-	// Close attribute, dataset, dataspace, datatype, and file
-	attr.close();
-	dset.close();
-	dspace.close();
-	dtype.close();
-	} // end of first enclosing
+            // Close attribute, dataset, dataspace, datatype, and file
+            attr.close();
+            dset.close();
+            dspace.close();
+            dtype.close();
+        } // end of first enclosing
 
-	fid1.close();
+        fid1.close();
 
-	// Open the file again
-	fid1.openFile(FILE_DTYPE, H5F_ACC_RDWR);
+        // Open the file again
+        fid1.openFile(FILE_DTYPE, H5F_ACC_RDWR);
 
-	{ // Second enclosed block...
+        { // Second enclosed block...
 
-	// Open dataset
-	DataSet *dset2 = new DataSet (fid1.openDataSet(DSET1_NAME));
+            // Open dataset
+            DataSet *dset2 = new DataSet(fid1.openDataSet(DSET1_NAME));
 
-	// Open attribute
-	Attribute *attr2 = new Attribute (dset2->openAttribute(ATTR1_NAME));
+            // Open attribute
+            Attribute *attr2 = new Attribute(dset2->openAttribute(ATTR1_NAME));
 
-	// Read data from the attribute
-	attr2->read(PredType::NATIVE_INT, &rdata);
-	verify_val(data, rdata, "Attribute::read", __LINE__, __FILE__);
+            // Read data from the attribute
+            attr2->read(PredType::NATIVE_INT, &rdata);
+            verify_val(data, rdata, "Attribute::read", __LINE__, __FILE__);
 
-	// Close attribute and dataset
-	delete attr2;
-	delete dset2;
+            // Close attribute and dataset
+            delete attr2;
+            delete dset2;
 
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-	// Check reference count on named datatype
-	fid1.getObjinfo(TYPE1_NAME, statbuf);
-	verify_val((int)statbuf.nlink, 3, "DataSet::openAttribute", __LINE__, __FILE__);
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
-	} // end of second enclosing
+            // Check reference count on named datatype
+            fid1.getObjinfo(TYPE1_NAME, statbuf);
+            verify_val(static_cast<int>(statbuf.nlink), 3, "DataSet::openAttribute", __LINE__, __FILE__);
+#endif
+        } // end of second enclosing
 
-	// Unlink the dataset
-	fid1.unlink(DSET1_NAME);
+        // Unlink the dataset
+        fid1.unlink(DSET1_NAME);
 
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-	// Check reference count on named datatype
-	fid1.getObjinfo(TYPE1_NAME, statbuf);
-	verify_val((int)statbuf.nlink, 1, "H5File::unlink", __LINE__, __FILE__);
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
+        // Check reference count on named datatype
+        fid1.getObjinfo(TYPE1_NAME, statbuf);
+        verify_val(static_cast<int>(statbuf.nlink), 1, "H5File::unlink", __LINE__, __FILE__);
+#endif
 
-	// Unlink the named datatype
-	fid1.unlink(TYPE1_NAME);
+        // Unlink the named datatype
+        fid1.unlink(TYPE1_NAME);
 
-	// Close file
-	fid1.close();
+        // Close file
+        fid1.close();
 
-	// Check size of file
-	filesize = h5_get_file_size(FILE_DTYPE.c_str(), H5P_DEFAULT);
-	verify_val((long)filesize, (long)empty_filesize, "Checking file size", __LINE__, __FILE__);
+        // Check size of file
+        filesize = h5_get_file_size(FILE_DTYPE.c_str(), H5P_DEFAULT);
+        verify_val(static_cast<long>(filesize), static_cast<long>(empty_filesize), "Checking file size",
+                   __LINE__, __FILE__);
 
-	PASSED();
-    }   // end try block
+        PASSED();
+    } // end try block
 
-    catch (Exception E) {
-	issue_fail_msg("test_attr_dtype_shared()", __LINE__, __FILE__, E.getCDetailMsg());
+    catch (Exception &E) {
+        issue_fail_msg("test_attr_dtype_shared()", __LINE__, __FILE__, E.getCDetailMsg());
     }
-}   // test_attr_dtype_shared()
-
-/****************************************************************
-**
-**  test_string_attr(): Test read/write string attribute.
-**      Tests string attributes on groups.
-**
-****************************************************************/
+} // test_attr_dtype_shared()
+
+/*-------------------------------------------------------------------------
+ * Function:    test_string_attr
+ *
+ * Purpose      Test read/write string attribute.
+ *
+ * Return       None
+ *-------------------------------------------------------------------------
+ */
 /* Info for a string attribute */
 const H5std_string ATTR1_FL_STR_NAME("String_attr 1");
 const H5std_string ATTR2_FL_STR_NAME("String_attr 2");
 const H5std_string ATTR_VL_STR_NAME("String_attr");
 const H5std_string ATTRSTR_DATA("String Attribute");
-const int ATTR_LEN = 17;
+const int          ATTR_LEN = 17;
 
-static void test_string_attr()
+static void
+test_string_attr(FileAccPropList &fapl)
 {
     // Output message about test being performed
     SUBTEST("I/O on FL and VL String Attributes");
 
     try {
-	// Create file
-	H5File fid1(FILE_BASIC, H5F_ACC_RDWR);
-
-	//
-	// Fixed-lenth string attributes
-	//
-	// Create a fixed-length string datatype to refer to.
-	StrType fls_type(0, ATTR_LEN);
-
-	// Open the root group.
-	Group root = fid1.openGroup("/");
-
-	// Create dataspace for the attribute.
-	DataSpace att_space (H5S_SCALAR);
-
-	/* Test Attribute::write(...,const void *buf) with Fixed len string */
-
-	// Create an attribute for the root group.
-	Attribute gr_flattr1 = root.createAttribute(ATTR1_FL_STR_NAME, fls_type, att_space);
-
-	// Write data to the attribute.
-	gr_flattr1.write(fls_type, ATTRSTR_DATA.c_str());
-
-	/* Test Attribute::write(...,const H5std_string& strg) with FL string */
-
-	// Create an attribute for the root group.
-	Attribute gr_flattr2 = root.createAttribute(ATTR2_FL_STR_NAME, fls_type, att_space);
-
-	// Write data to the attribute.
-	gr_flattr2.write(fls_type, ATTRSTR_DATA);
-
-	/* Test Attribute::read(...,void *buf) with FL string */
-
-	// Read and verify the attribute string as a string of chars.
-	char flstring_att_check[ATTR_LEN];
-	gr_flattr1.read(fls_type, flstring_att_check);
-	if(HDstrcmp(flstring_att_check, ATTRSTR_DATA.c_str())!=0)
-	    TestErrPrintf("Line %d: Attribute data different: ATTRSTR_DATA=%s,flstring_att_check=%s\n",__LINE__, ATTRSTR_DATA.c_str(), flstring_att_check);
-
-	// Read and verify the attribute string as a string of chars; buffer
-	// is dynamically allocated.
-	size_t attr_size = gr_flattr1.getInMemDataSize();
-	char *fl_dyn_string_att_check;
-	fl_dyn_string_att_check = new char[attr_size+1];
-	gr_flattr1.read(fls_type, fl_dyn_string_att_check);
-	if(HDstrcmp(fl_dyn_string_att_check, ATTRSTR_DATA.c_str())!=0)
-	    TestErrPrintf("Line %d: Attribute data different: ATTRSTR_DATA=%s,flstring_att_check=%s\n",__LINE__, ATTRSTR_DATA.c_str(), fl_dyn_string_att_check);
-	delete []fl_dyn_string_att_check;
-
-	/* Test Attribute::read(...,H5std_string& strg) with FL string */
-
-	// Read and verify the attribute string as an std::string.
-	H5std_string read_flstr1;
-	gr_flattr1.read(fls_type, read_flstr1);
-	if (read_flstr1 != ATTRSTR_DATA)
-	    TestErrPrintf("Line %d: Attribute data different: ATTRSTR_DATA=%s,read_flstr1=%s\n",__LINE__, ATTRSTR_DATA.c_str(), read_flstr1.c_str());
-
-	// Read and verify the attribute string as a string of chars.
-	HDstrcpy(flstring_att_check, "");
-	gr_flattr2.read(fls_type, flstring_att_check);
-	if(HDstrcmp(flstring_att_check, ATTRSTR_DATA.c_str())!=0)
-	    TestErrPrintf("Line %d: Attribute data different: ATTRSTR_DATA=%s,flstring_att_check=%s\n",__LINE__, ATTRSTR_DATA.c_str(), flstring_att_check);
-
-	/* Test Attribute::read(...,H5std_string& strg) with FL string */
-
-	// Read and verify the attribute string as an std::string.
-	H5std_string read_flstr2;
-	gr_flattr2.read(fls_type, read_flstr2);
-	if (read_flstr2 != ATTRSTR_DATA)
-	    TestErrPrintf("Line %d: Attribute data different: ATTRSTR_DATA=%s,read_flstr2=%s\n",__LINE__, ATTRSTR_DATA.c_str(), read_flstr2.c_str());
-
-	//
-	// Variable-lenth string attributes
-	//
-	// Create a variable length string datatype to refer to.
-	StrType vls_type(0, H5T_VARIABLE);
-
-	// Create an attribute for the root group.
-	Attribute gr_vlattr = root.createAttribute(ATTR_VL_STR_NAME, vls_type, att_space);
-
-	// Write data to the attribute.
-	gr_vlattr.write(vls_type, ATTRSTR_DATA);
-
-	/* Test Attribute::read(...,void *buf) with Variable len string */
-	// Read and verify the attribute string as a string of chars.
-	char *string_att_check;
-	gr_vlattr.read(vls_type, &string_att_check);
-	if(HDstrcmp(string_att_check, ATTRSTR_DATA.c_str())!=0)
-	    TestErrPrintf("Line %d: Attribute data different: ATTRSTR_DATA=%s,string_att_check=%s\n",__LINE__, ATTRSTR_DATA.c_str(), string_att_check);
-	HDfree(string_att_check);
-
-	/* Test Attribute::read(...,H5std_string& strg) with VL string */
-	// Read and verify the attribute string as an std::string.
-	H5std_string read_str;
-	gr_vlattr.read(vls_type, read_str);
-	if (read_str != ATTRSTR_DATA)
-	    TestErrPrintf("Line %d: Attribute data different: ATTRSTR_DATA=%s,read_str=%s\n",__LINE__, ATTRSTR_DATA.c_str(), read_str.c_str());
-	PASSED();
+        // Create file
+        H5File fid1(FILE_BASIC, H5F_ACC_RDWR, fapl);
+
+        //
+        // Fixed-lenth string attributes
+        //
+        // Create a fixed-length string datatype to refer to.
+        StrType fls_type(0, ATTR_LEN);
+
+        // Open the root group.
+        Group root = fid1.openGroup("/");
+
+        // Create dataspace for the attribute.
+        DataSpace att_space(H5S_SCALAR);
+
+        /* Test Attribute::write(...,const void *buf) with Fixed len string */
+
+        // Create an attribute for the root group.
+        Attribute gr_flattr1 = root.createAttribute(ATTR1_FL_STR_NAME, fls_type, att_space);
+
+        // Write data to the attribute.
+        gr_flattr1.write(fls_type, ATTRSTR_DATA.c_str());
+
+        /* Test Attribute::write(...,const H5std_string& strg) with FL string */
+
+        // Create an attribute for the root group.
+        Attribute gr_flattr2 = root.createAttribute(ATTR2_FL_STR_NAME, fls_type, att_space);
+
+        // Write data to the attribute.
+        gr_flattr2.write(fls_type, ATTRSTR_DATA);
+
+        /* Test Attribute::read(...,void *buf) with FL string */
+
+        // Read and verify the attribute string as a string of chars.
+        char flstring_att_check[ATTR_LEN];
+        gr_flattr1.read(fls_type, flstring_att_check);
+        if (HDstrcmp(flstring_att_check, ATTRSTR_DATA.c_str()) != 0)
+            TestErrPrintf("Line %d: Attribute data different: ATTRSTR_DATA=%s,flstring_att_check=%s\n",
+                          __LINE__, ATTRSTR_DATA.c_str(), flstring_att_check);
+
+        // Read and verify the attribute string as a string of chars; buffer
+        // is dynamically allocated.
+        size_t attr_size = gr_flattr1.getInMemDataSize();
+        char  *fl_dyn_string_att_check;
+        fl_dyn_string_att_check = new char[attr_size + 1];
+        gr_flattr1.read(fls_type, fl_dyn_string_att_check);
+        if (HDstrcmp(fl_dyn_string_att_check, ATTRSTR_DATA.c_str()) != 0)
+            TestErrPrintf("Line %d: Attribute data different: ATTRSTR_DATA=%s,flstring_att_check=%s\n",
+                          __LINE__, ATTRSTR_DATA.c_str(), fl_dyn_string_att_check);
+        delete[] fl_dyn_string_att_check;
+
+        /* Test Attribute::read(...,H5std_string& strg) with FL string */
+
+        // Read and verify the attribute string as an std::string.
+        H5std_string read_flstr1;
+        gr_flattr1.read(fls_type, read_flstr1);
+        if (read_flstr1 != ATTRSTR_DATA)
+            TestErrPrintf("Line %d: Attribute data different: ATTRSTR_DATA=%s,read_flstr1=%s\n", __LINE__,
+                          ATTRSTR_DATA.c_str(), read_flstr1.c_str());
+
+        // Read and verify the attribute string as a string of chars.
+        HDstrcpy(flstring_att_check, "");
+        gr_flattr2.read(fls_type, flstring_att_check);
+        if (HDstrcmp(flstring_att_check, ATTRSTR_DATA.c_str()) != 0)
+            TestErrPrintf("Line %d: Attribute data different: ATTRSTR_DATA=%s,flstring_att_check=%s\n",
+                          __LINE__, ATTRSTR_DATA.c_str(), flstring_att_check);
+
+        /* Test Attribute::read(...,H5std_string& strg) with FL string */
+
+        // Read and verify the attribute string as an std::string.
+        H5std_string read_flstr2;
+        gr_flattr2.read(fls_type, read_flstr2);
+        if (read_flstr2 != ATTRSTR_DATA)
+            TestErrPrintf("Line %d: Attribute data different: ATTRSTR_DATA=%s,read_flstr2=%s\n", __LINE__,
+                          ATTRSTR_DATA.c_str(), read_flstr2.c_str());
+
+        //
+        // Variable-lenth string attributes
+        //
+        // Create a variable length string datatype to refer to.
+        StrType vls_type(0, H5T_VARIABLE);
+
+        // Create an attribute for the root group.
+        Attribute gr_vlattr = root.createAttribute(ATTR_VL_STR_NAME, vls_type, att_space);
+
+        // Write data to the attribute.
+        gr_vlattr.write(vls_type, ATTRSTR_DATA);
+
+        /* Test Attribute::read(...,void *buf) with Variable len string */
+        // Read and verify the attribute string as a string of chars.
+        char *string_att_check;
+        gr_vlattr.read(vls_type, &string_att_check);
+        if (HDstrcmp(string_att_check, ATTRSTR_DATA.c_str()) != 0)
+            TestErrPrintf("Line %d: Attribute data different: ATTRSTR_DATA=%s,string_att_check=%s\n",
+                          __LINE__, ATTRSTR_DATA.c_str(), string_att_check);
+        HDfree(string_att_check);
+
+        /* Test Attribute::read(...,H5std_string& strg) with VL string */
+        // Read and verify the attribute string as an std::string.
+        H5std_string read_str;
+        gr_vlattr.read(vls_type, read_str);
+        if (read_str != ATTRSTR_DATA)
+            TestErrPrintf("Line %d: Attribute data different: ATTRSTR_DATA=%s,read_str=%s\n", __LINE__,
+                          ATTRSTR_DATA.c_str(), read_str.c_str());
+        PASSED();
     } // end try block
 
-    catch (Exception E) {
-	issue_fail_msg("test_string_attr()", __LINE__, __FILE__, E.getCDetailMsg());
+    catch (Exception &E) {
+        issue_fail_msg("test_string_attr()", __LINE__, __FILE__, E.getCDetailMsg());
     }
-}   // test_string_attr()
-
-/****************************************************************
-**
-**  test_attr_exists(): Test checking for attribute existence.
-**	(additional attrExists tests are in test_attr_rename())
-**
-****************************************************************/
-static void test_attr_exists()
+} // test_string_attr()
+
+/*-------------------------------------------------------------------------
+ * Function:    test_attr_exists
+ *
+ * Purpose      Test checking for attribute existence.
+ *
+ * Return       None
+ *
+ * Note
+ *              Additional attrExists tests are in test_attr_rename().
+ *-------------------------------------------------------------------------
+ */
+static void
+test_attr_exists(FileAccPropList &fapl)
 {
     // Output message about test being performed
     SUBTEST("Check Attribute Existence");
 
     try {
-	// Open file.
-	H5File fid1(FILE_BASIC, H5F_ACC_RDWR);
+        // Open file.
+        H5File fid1(FILE_BASIC, H5F_ACC_RDWR, fapl);
+
+        // Open the root group.
+        Group root = fid1.openGroup("/");
+
+        // Check for existence of attribute
+        bool attr_exists = fid1.attrExists(ATTR1_FL_STR_NAME);
+        if (!attr_exists)
+            throw InvalidActionException("H5File::attrExists",
+                                         "fid1, ATTR1_FL_STR_NAMEAttribute should exist but does not");
+
+        // Check for existence of attribute
+        attr_exists = fid1.attrExists(FATTR1_NAME);
+        if (!attr_exists)
+            throw InvalidActionException("H5File::attrExists",
+                                         "fid1,FATTR2_NAMEAttribute should exist but does not");
+
+        // Open a group.
+        Group group = fid1.openGroup(GROUP1_NAME);
+
+        // Check for existence of attribute
+        attr_exists = group.attrExists(ATTR2_NAME);
+        if (!attr_exists)
+            throw InvalidActionException("H5File::attrExists",
+                                         "group, ATTR2_NAMEAttribute should exist but does not");
+
+        PASSED();
+    } // end try block
+
+    catch (InvalidActionException &E) {
+        issue_fail_msg("test_attr_exists()", __LINE__, __FILE__, E.getCDetailMsg());
+    }
+    catch (Exception &E) {
+        issue_fail_msg("test_attr_exists()", __LINE__, __FILE__, E.getCDetailMsg());
+    }
+} // test_attr_exists()
+
+/*-------------------------------------------------------------------------
+ * Function:    test_attr_dense_create
+ *
+ * Purpose      Test phase change properties
+ *
+ * Return       None
+ *-------------------------------------------------------------------------
+ */
+const H5std_string FILE_CRTPROPS("tattr_crt_properties.h5");
+const int          NAME_BUF_SIZE   = 1024;
+const unsigned     MAX_COMPACT_DEF = 8;
+const unsigned     MIN_DENSE_DEF   = 6;
+
+static void
+test_attr_dense_create(FileCreatPropList &fcpl, FileAccPropList &fapl)
+{
+    // Output message about test being performed
+    SUBTEST("Dense Attribute Storage Creation");
+
+    try {
+        // Create file
+        H5File fid1(FILE_CRTPROPS, H5F_ACC_TRUNC, fcpl, fapl);
+
+        // Close file
+        fid1.close();
+
+        // Get size of file
+        h5_stat_size_t empty_filesize; // Size of empty file
+        empty_filesize = h5_get_file_size(FILE_CRTPROPS.c_str(), fapl.getId());
+        if (empty_filesize < 0)
+            TestErrPrintf("Line %d: file size wrong!\n", __LINE__);
+
+        // Re-open file
+        fid1.openFile(FILE_CRTPROPS, H5F_ACC_RDWR, fapl);
+
+        // Create dataspace for dataset
+        DataSpace ds_space(H5S_SCALAR);
+
+        //  Create dataset creation property list.
+        DSetCreatPropList dcpl;
+
+        // Create a dataset
+        DataSet dataset = fid1.createDataSet(DSET1_NAME, PredType::NATIVE_UCHAR, ds_space, dcpl);
 
-	// Open the root group.
-	Group root = fid1.openGroup("/");
+        unsigned max_compact = 0, min_dense = 0;
 
-	// Check for existence of attribute
-	bool attr_exists = fid1.attrExists(ATTR1_FL_STR_NAME);
-	if (attr_exists == false)
-	    throw InvalidActionException("H5File::attrExists", "fid1, ATTR1_FL_STR_NAMEAttribute should exist but does not");
+        // Retrieve limits for compact/dense attribute storage
+        dcpl.getAttrPhaseChange(max_compact, min_dense);
+        verify_val(max_compact, MAX_COMPACT_DEF, "DSetCreatPropList::getAttrPhaseChange", __LINE__, __FILE__);
+        verify_val(min_dense, MIN_DENSE_DEF, "DSetCreatPropList::getAttrPhaseChange", __LINE__, __FILE__);
 
-	// Check for existence of attribute
-	attr_exists = fid1.attrExists(FATTR1_NAME);
-	if (attr_exists == false)
-	    throw InvalidActionException("H5File::attrExists", "fid1,FATTR2_NAMEAttribute should exist but does not");
+        // Set new compact/dense attribute storage limits to some random numbers
+        dcpl.setAttrPhaseChange(7, 5);
 
-	// Open a group.
-	Group group = fid1.openGroup(GROUP1_NAME);
+        // Retrieve limits for compact/dense attribute storage and verify them
+        dcpl.getAttrPhaseChange(max_compact, min_dense);
+        verify_val(max_compact, static_cast<unsigned>(7), "DSetCreatPropList::getAttrPhaseChange", __LINE__,
+                   __FILE__);
+        verify_val(min_dense, static_cast<unsigned>(5), "DSetCreatPropList::getAttrPhaseChange", __LINE__,
+                   __FILE__);
 
-	// Check for existence of attribute
-	attr_exists = group.attrExists(ATTR2_NAME);
-	if (attr_exists == false)
-	    throw InvalidActionException("H5File::attrExists", "group, ATTR2_NAMEAttribute should exist but does not");
+        // Close property list
+        dcpl.close();
 
-	PASSED();
+        // H5O__is_attr_dense_test - un-usable
+
+        // Add attributes, until just before converting to dense storage
+        char     attr_name[NAME_BUF_SIZE];
+        unsigned attr_num;
+        for (attr_num = 0; attr_num < max_compact; attr_num++) {
+            // Create attribute
+            snprintf(attr_name, sizeof(attr_name), "attr %02u", attr_num);
+            Attribute attr = dataset.createAttribute(attr_name, PredType::NATIVE_UINT, ds_space);
+
+            // Write data to the attribute
+            attr.write(PredType::NATIVE_UINT, &attr_num);
+        } // end for
+
+        // H5O__is_attr_dense_test - un-usable
+
+        { // Add one more attribute, to push into "dense" storage
+
+            // Create another attribute
+            snprintf(attr_name, sizeof(attr_name), "attr %02u", attr_num);
+            Attribute attr = dataset.createAttribute(attr_name, PredType::NATIVE_UINT, ds_space);
+
+            // Write data to the attribute
+            attr.write(PredType::NATIVE_UINT, &attr_num);
+        }
+
+        // Attempt to add attribute again, which should fail
+        try {
+            // Create another attribute
+            snprintf(attr_name, sizeof(attr_name), "attr %02u", attr_num);
+            Attribute attr = dataset.createAttribute(attr_name, PredType::NATIVE_UINT, ds_space);
+
+            // continuation here, that means no exception has been thrown
+            throw InvalidActionException("DataSet::createAttribute",
+                                         "Maximum number of attributes has been reached");
+        }
+        catch (AttributeIException &E) // catching invalid action
+        {
+        } // do nothing, exception expected
+
+        PASSED();
     } // end try block
 
-    catch (InvalidActionException E) {
-	issue_fail_msg("test_attr_exists()", __LINE__, __FILE__, E.getCDetailMsg());
-    }
-    catch (Exception E) {
-	issue_fail_msg("test_attr_exists()", __LINE__, __FILE__, E.getCDetailMsg());
+    catch (Exception &E) {
+        issue_fail_msg("test_attr_dense_create()", __LINE__, __FILE__, E.getCDetailMsg());
     }
-}   // test_attr_exists()
-
-/****************************************************************
-**
-**  test_attr(): Main attribute testing routine.
-**
-****************************************************************/
-#ifdef __cplusplus
-extern "C"
-#endif
-void test_attr()
+} // test_attr_dense_create()
+
+/*-------------------------------------------------------------------------
+ * Function:    test_attr_corder_create_basic
+ *
+ * Purpose      Test creation order properties
+ *
+ * Return       None
+ *-------------------------------------------------------------------------
+ */
+static void
+test_attr_corder_create_basic(FileCreatPropList &fcpl, FileAccPropList &fapl)
 {
     // Output message about test being performed
-    MESSAGE(5, ("Testing Attributes\n"));
+    SUBTEST("Basic Code for Attributes with Creation Order Info");
+
+    try {
+        // Create file
+        H5File fid1(FILE_CRTPROPS, H5F_ACC_TRUNC, fcpl, fapl);
+
+        //  Create dataset creation property list.
+        DSetCreatPropList dcpl;
+
+        // Get creation order indexing on object
+        unsigned crt_order_flags = 0;
+        crt_order_flags          = dcpl.getAttrCrtOrder();
+        verify_val(static_cast<long>(crt_order_flags), 0, "DSetCreatPropList::getAttrCrtOrder", __LINE__,
+                   __FILE__);
+
+        // Setting invalid combination of a attribute order creation order
+        // indexing on should fail
+        try {
+            dcpl.setAttrCrtOrder(H5P_CRT_ORDER_INDEXED);
+
+            // continuation here, that means no exception has been thrown
+            throw InvalidActionException("DSetCreatPropList::getAttrCrtOrder",
+                                         "Indexing cannot be set alone, order tracking is required");
+        }
+        catch (PropListIException &E) // catching invalid action
+        {
+        } // do nothing, exception expected
+
+        // Set attribute creation order tracking & indexing for object then
+        // verify them
+        dcpl.setAttrCrtOrder(H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED);
+        crt_order_flags = dcpl.getAttrCrtOrder();
+        verify_val(crt_order_flags, static_cast<unsigned>(H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED),
+                   "DSetCreatPropList::getAttrCrtOrder", __LINE__, __FILE__);
+
+        // Create dataspace for dataset
+        DataSpace ds_space(H5S_SCALAR);
+
+        // Create a dataset
+        DataSet dataset = fid1.createDataSet(DSET1_NAME, PredType::NATIVE_UCHAR, ds_space, dcpl);
+
+        // Close dataspace
+        ds_space.close();
+
+        // Check on dataset's attribute storage status.
+        // NOTE: Wrappers not available yet (H5O__is_attr_empty_test
+        // and H5O__is_attr_dense_test)
+
+        // Close dataset
+        dataset.close();
+
+        // Close property list
+        dcpl.close();
 
-    test_attr_basic_write();	// Test basic H5A writing code
-    test_attr_getname();	// Test overloads of Attribute::getName
-    test_attr_rename();		// Test renaming attribute
-    test_attr_basic_read(); 	// Test basic H5A reading code
+        // Close file
+        fid1.close();
 
-    test_attr_compound_write();	// Test complex datatype H5A writing code
-    test_attr_compound_read();	// Test complex datatype H5A reading code
+        // Re-open file
+        fid1.openFile(FILE_CRTPROPS, H5F_ACC_RDWR, fapl);
 
-    test_attr_scalar_write();	// Test scalar dataspace H5A writing code
-    test_attr_scalar_read();	// Test scalar dataspace H5A reading code
+        // Open dataset created previously
+        dataset = fid1.openDataSet(DSET1_NAME);
 
-    test_attr_mult_write();	// Test writing multiple attributes
-    test_attr_mult_read();	// Test reading multiple attributes
-    test_attr_delete();		// Test deleting attributes
+        // Retrieve dataset creation property list for the dataset
+        dcpl = dataset.getCreatePlist();
 
-    test_attr_dtype_shared();	// Test using shared datatypes in attributes
+        // Query the attribute creation properties
+        crt_order_flags = dcpl.getAttrCrtOrder();
+        verify_val(crt_order_flags, static_cast<unsigned>(H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED),
+                   "DSetCreatPropList::getAttrCrtOrder", __LINE__, __FILE__);
 
-    test_string_attr();		// Test read/write string attribute
-    test_attr_exists();		// Test H5Location::attrExists
+        PASSED();
+    } // end try block
+
+    catch (Exception &E) {
+        issue_fail_msg("test_attr_corder_create_basic()", __LINE__, __FILE__, E.getCDetailMsg());
+    }
+} // test_attr_corder_create_basic()
 
-}   // test_attr()
-
 /*-------------------------------------------------------------------------
- * Function:	cleanup_attr
- *
- * Purpose:	Cleanup temporary test files
+ * Function:    test_attr
  *
- * Return:	none
+ * Purpose      Main attribute testing routine
  *
- * Programmer:	Albert Cheng
- *              July 2, 1998
+ * Return       None
+ *-------------------------------------------------------------------------
+ */
+extern "C" void
+test_attr()
+{
+    // Output message about test being performed
+    MESSAGE(5, ("Testing Attributes\n"));
+
+    try {
+        // Create a default file access property list
+        FileAccPropList fapl;
+
+        // Copy the file access property list for new format test
+        FileAccPropList fapl_new = fapl;
+
+        // Set the "use the latest version of the format" bounds for creating
+        // objects in the file
+        fapl_new.setLibverBounds(H5F_LIBVER_LATEST, H5F_LIBVER_LATEST);
+
+        // Create a default file creation property list
+        FileCreatPropList fcpl;
+
+        // Copy the file creation property list for new format test
+        FileCreatPropList fcpl_new = fcpl;
+
+        // Wrappers for ..._shared_mesg_nindexes are not available, skip
+        // use_shared test
+
+        // Loop over using new group format
+        unsigned new_format;
+        for (new_format = FALSE; new_format <= TRUE; new_format++) {
+            FileAccPropList curr_fapl;
+
+            // Set the file access proplist for the type of format
+            if (new_format) {
+                MESSAGE(7, ("testing with new file format\n"));
+                curr_fapl = fapl_new;
+            }
+            else {
+                MESSAGE(7, ("testing with old file format\n"));
+                curr_fapl = fapl;
+            }
+
+            test_attr_basic_write(curr_fapl); // Test basic H5A writing code
+            test_attr_getname(curr_fapl);     // Test overloads of Attribute::getName
+            test_attr_rename(curr_fapl);      // Test renaming attribute
+            test_attr_basic_read(curr_fapl);  // Test basic H5A reading code
+
+            test_attr_compound_write(curr_fapl); // Test complex datatype H5A writing code
+            test_attr_compound_read(curr_fapl);  // Test complex datatype H5A reading code
+
+            test_attr_scalar_write(curr_fapl); // Test scalar dataspace H5A writing code
+            test_attr_scalar_read(curr_fapl);  // Test scalar dataspace H5A reading code
+
+            test_attr_mult_write(curr_fapl); // Test writing multiple attributes
+            test_attr_mult_read(curr_fapl);  // Test reading multiple attributes
+            test_attr_delete(curr_fapl);     // Test deleting attributes
+
+            test_attr_dtype_shared(curr_fapl); // Test using shared datatypes in attributes
+
+            test_string_attr(curr_fapl); // Test read/write string attribute
+            test_attr_exists(curr_fapl); // Test H5Location::attrExists
+
+            // Test with new format
+            if (new_format) {
+                // Test dense attribute storage creation
+                test_attr_dense_create(fcpl, curr_fapl);
+
+                // Test create objects with attribute creation info
+                test_attr_corder_create_basic(fcpl, curr_fapl);
+            }
+        } // end for
+    }     // end try block
+
+    catch (Exception &E) {
+        issue_fail_msg("test_attr()", __LINE__, __FILE__, E.getCDetailMsg());
+    }
+} // test_attr()
+
+/*-------------------------------------------------------------------------
+ * Function:    cleanup_attr
  *
- * Modifications:
+ * Purpose      Cleanup temporary test files
  *
+ * Return       None
  *-------------------------------------------------------------------------
  */
-#ifdef __cplusplus
-extern "C"
-#endif
-void cleanup_attr()
+extern "C" void
+cleanup_attr()
 {
     HDremove(FILE_BASIC.c_str());
     HDremove(FILE_COMPOUND.c_str());
     HDremove(FILE_SCALAR.c_str());
     HDremove(FILE_MULTI.c_str());
     HDremove(FILE_DTYPE.c_str());
+    HDremove(FILE_CRTPROPS.c_str());
 }
-
diff --git a/c++/test/tcompound.cpp b/c++/test/tcompound.cpp
index 156f438..96073d6 100644
--- a/c++/test/tcompound.cpp
+++ b/c++/test/tcompound.cpp
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*****************************************************************************
@@ -18,735 +15,665 @@
    tcompound.cpp - HDF5 C++ testing the compound data type functionality
 
  ***************************************************************************/
-
-#ifdef OLD_HEADER_FILENAME
-#include <iostream.h>
-#else
 #include <iostream>
-#endif
-#include <string>
-
-#ifndef H5_NO_NAMESPACE
-#ifndef H5_NO_STD
-    using std::cerr;
-    using std::endl;
-#endif  // H5_NO_STD
-#endif
+using std::cerr;
+using std::endl;
 
-#include "H5Cpp.h"      // C++ API header file
-
-#ifndef H5_NO_NAMESPACE
-    using namespace H5;
-#endif
+#include <string>
+#include "H5Cpp.h" // C++ API header file
+using namespace H5;
 
-#include "h5cpputil.h"  // C++ utilility header file
+#include "h5test.h"
+#include "h5cpputil.h" // C++ utilility header file
 
 /* Number of elements in each test */
-#define NTESTELEM	100000
+#define NTESTELEM 100000
 
 typedef struct complex_t {
-    double                  re;
-    double                  im;
+    double re;
+    double im;
 } complex_t;
 
-
 /*-------------------------------------------------------------------------
  * Function:    test_compound_1
  *
- * Purpose:     Tests various things about compound data types.
+ * Purpose      Tests various things about compound data types.
  *
- * Return:      None
+ * Return       None
  *
- * Programmer:  Binh-Minh Ribler (using C version)
+ * Programmer   Binh-Minh Ribler (using C version)
  *              January, 2007
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
-static void test_compound_1()
+static void
+test_compound_1()
 {
     // Output message about test being performed
     SUBTEST("Compound Data Types");
     try {
-	// Create an empty compound datatype
-	CompType complex_type(sizeof(complex_t));
+        // Create an empty compound datatype
+        CompType complex_type(sizeof(complex_t));
 
-	// Add a couple of fields
-	complex_type.insertMember("real", HOFFSET(complex_t, re), PredType::NATIVE_DOUBLE);
-	complex_type.insertMember("imaginary", HOFFSET(complex_t, im), PredType::NATIVE_DOUBLE);
-	PASSED();
-    }   // end of try block
+        // Add a couple of fields
+        complex_type.insertMember("real", HOFFSET(complex_t, re), PredType::NATIVE_DOUBLE);
+        complex_type.insertMember("imaginary", HOFFSET(complex_t, im), PredType::NATIVE_DOUBLE);
+        PASSED();
+    } // end of try block
 
-    catch (Exception E) {
-cerr << "test_compound_1 in catch" << endl;
+    catch (Exception &E) {
         issue_fail_msg(E.getCFuncName(), __LINE__, __FILE__, E.getCDetailMsg());
     }
-}   // test_compound_1()
+} // test_compound_1()
 
-
 /*-------------------------------------------------------------------------
- * Function:	test_compound_2
+ * Function:    test_compound_2
  *
- * Purpose:	Tests a compound type conversion where the source and
- *		destination are the same except for the order of the
- *		elements.
+ * Purpose      Tests a compound type conversion where the source and
+ *              destination are the same except for the order of the
+ *              elements.
  *
- * Return:	None
+ * Return       None
  *
- * Programmer:	Binh-Minh Ribler (use C version)
+ * Programmer   Binh-Minh Ribler (use C version)
  *              January, 2007
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
-static void test_compound_2()
+static void
+test_compound_2()
 {
     typedef struct {
-	int a, b, c[4], d, e;
+        int a, b, c[4], d, e;
     } src_typ_t;
     typedef struct {
-	int e, d, c[4], b, a;
+        int e, d, c[4], b, a;
     } dst_typ_t;
 
-    src_typ_t	  *s_ptr;
-    dst_typ_t	  *d_ptr;
-    const int	   nelmts = NTESTELEM;
-    const hsize_t  four = 4;
-    int		   i;
+    src_typ_t     *s_ptr;
+    dst_typ_t     *d_ptr;
+    const int      nelmts = NTESTELEM;
+    const hsize_t  four   = 4;
+    int            i;
     unsigned char *buf = NULL, *orig = NULL, *bkg = NULL;
-    ArrayType *array_dt = NULL;
+    ArrayType     *array_dt = NULL;
 
     // Output message about test being performed
     SUBTEST("Compound Element Reordering");
     try {
-	// Sizes should be the same, but be careful just in case
-	buf = (unsigned char*)HDmalloc(nelmts * MAX(sizeof(src_typ_t), sizeof(dst_typ_t)));
-	bkg = (unsigned char*)HDmalloc(nelmts * sizeof(dst_typ_t));
-	orig = (unsigned char*)HDmalloc(nelmts * sizeof(src_typ_t));
-	for (i=0; i<nelmts; i++) {
-	    s_ptr = ((src_typ_t*)orig) + i;
-	    s_ptr->a    = i*8+0;
-	    s_ptr->b    = i*8+1;
-	    s_ptr->c[0] = i*8+2;
-	    s_ptr->c[1] = i*8+3;
-	    s_ptr->c[2] = i*8+4;
-	    s_ptr->c[3] = i*8+5;
-	    s_ptr->d    = i*8+6;
-	    s_ptr->e    = i*8+7;
-	}
-	memcpy(buf, orig, nelmts*sizeof(src_typ_t));
-
-	// Build hdf5 datatypes
-	array_dt = new ArrayType(PredType::NATIVE_INT, 1, &four);
-
-	// Create an empty compound datatype
-	CompType st(sizeof(src_typ_t));
-	st.insertMember("a", HOFFSET(src_typ_t, a), PredType::NATIVE_INT);
-	st.insertMember("b", HOFFSET(src_typ_t, b), PredType::NATIVE_INT);
-	st.insertMember("c", HOFFSET(src_typ_t, c), *array_dt);
-	st.insertMember("d", HOFFSET(src_typ_t, d), PredType::NATIVE_INT);
-	st.insertMember("e", HOFFSET(src_typ_t, e), PredType::NATIVE_INT);
-	array_dt->close();
+        // Sizes should be the same, but be careful just in case
+        buf  = static_cast<unsigned char *>(HDmalloc(nelmts * MAX(sizeof(src_typ_t), sizeof(dst_typ_t))));
+        bkg  = static_cast<unsigned char *>(HDmalloc(nelmts * sizeof(dst_typ_t)));
+        orig = static_cast<unsigned char *>(HDmalloc(nelmts * sizeof(src_typ_t)));
+        for (i = 0; i < nelmts; i++) {
+            s_ptr       = (reinterpret_cast<src_typ_t *>(orig)) + i;
+            s_ptr->a    = i * 8 + 0;
+            s_ptr->b    = i * 8 + 1;
+            s_ptr->c[0] = i * 8 + 2;
+            s_ptr->c[1] = i * 8 + 3;
+            s_ptr->c[2] = i * 8 + 4;
+            s_ptr->c[3] = i * 8 + 5;
+            s_ptr->d    = i * 8 + 6;
+            s_ptr->e    = i * 8 + 7;
+        }
+        HDmemcpy(buf, orig, nelmts * sizeof(src_typ_t));
+
+        // Build hdf5 datatypes
+        array_dt = new ArrayType(PredType::NATIVE_INT, 1, &four);
+
+        // Create an empty compound datatype
+        CompType st(sizeof(src_typ_t));
+        st.insertMember("a", HOFFSET(src_typ_t, a), PredType::NATIVE_INT);
+        st.insertMember("b", HOFFSET(src_typ_t, b), PredType::NATIVE_INT);
+        st.insertMember("c", HOFFSET(src_typ_t, c), *array_dt);
+        st.insertMember("d", HOFFSET(src_typ_t, d), PredType::NATIVE_INT);
+        st.insertMember("e", HOFFSET(src_typ_t, e), PredType::NATIVE_INT);
+        array_dt->close();
         delete array_dt;
 
-	array_dt = new ArrayType(PredType::NATIVE_INT, 1, &four);
-
-	// Create an empty compound datatype
-	CompType dt(sizeof(dst_typ_t));
-	dt.insertMember("a", HOFFSET(dst_typ_t, a), PredType::NATIVE_INT);
-	dt.insertMember("b", HOFFSET(dst_typ_t, b), PredType::NATIVE_INT);
-	dt.insertMember("c", HOFFSET(dst_typ_t, c), *array_dt);
-	dt.insertMember("d", HOFFSET(dst_typ_t, d), PredType::NATIVE_INT);
-	dt.insertMember("e", HOFFSET(dst_typ_t, e), PredType::NATIVE_INT);
-	array_dt->close();
-
-	// Perform the conversion
-	st.convert(dt, (size_t)nelmts, buf, bkg);
-
-	// Compare results
-	for (i=0; i<nelmts; i++) {
-	    s_ptr = ((src_typ_t*)orig) + i;
-	    d_ptr = ((dst_typ_t*)buf)  + i;
-	    if (s_ptr->a    != d_ptr->a    ||
-		s_ptr->b    != d_ptr->b    ||
-		s_ptr->c[0] != d_ptr->c[0] ||
-		s_ptr->c[1] != d_ptr->c[1] ||
-		s_ptr->c[2] != d_ptr->c[2] ||
-		s_ptr->c[3] != d_ptr->c[3] ||
-		s_ptr->d    != d_ptr->d    ||
-		s_ptr->e    != d_ptr->e) {
-		H5_FAILED();
-		cerr << "    i=" << i << endl;
-		cerr << "    src={a=" << s_ptr->a << ", b=" << s_ptr->b
-		     << "c=[" << s_ptr->c[0] << "," << s_ptr->c[1] << ","
-		     << s_ptr->c[2] << "," << s_ptr->c[3] << ", d="
-		     << s_ptr->d << ", e=" << s_ptr->e << "}" << endl;
-		cerr << "    dst={a=" << s_ptr->a << ", b=" << s_ptr->b
-		     << "c=[" << s_ptr->c[0] << "," << s_ptr->c[1] << ","
-		     << s_ptr->c[2] << "," << s_ptr->c[3] << ", d="
-		     << s_ptr->d << ", e=" << s_ptr->e << "}" << endl;
-	    }
-    	}
-	// Release resources
-	HDfree(buf);
-	HDfree(bkg);
-	HDfree(orig);
-	s_ptr = NULL;
-	d_ptr = NULL;
-	st.close();
-	dt.close();
-	PASSED();
-    }   // end of try block
-
-    catch (Exception E) {
-cerr << "test_compound_2 in catch" << endl;
+        array_dt = new ArrayType(PredType::NATIVE_INT, 1, &four);
+
+        // Create an empty compound datatype
+        CompType dt(sizeof(dst_typ_t));
+        dt.insertMember("a", HOFFSET(dst_typ_t, a), PredType::NATIVE_INT);
+        dt.insertMember("b", HOFFSET(dst_typ_t, b), PredType::NATIVE_INT);
+        dt.insertMember("c", HOFFSET(dst_typ_t, c), *array_dt);
+        dt.insertMember("d", HOFFSET(dst_typ_t, d), PredType::NATIVE_INT);
+        dt.insertMember("e", HOFFSET(dst_typ_t, e), PredType::NATIVE_INT);
+        array_dt->close();
+
+        // Perform the conversion
+        st.convert(dt, static_cast<size_t>(nelmts), buf, bkg);
+
+        // Compare results
+        for (i = 0; i < nelmts; i++) {
+            s_ptr = (reinterpret_cast<src_typ_t *>(orig)) + i;
+            d_ptr = (reinterpret_cast<dst_typ_t *>(buf)) + i;
+            if (s_ptr->a != d_ptr->a || s_ptr->b != d_ptr->b || s_ptr->c[0] != d_ptr->c[0] ||
+                s_ptr->c[1] != d_ptr->c[1] || s_ptr->c[2] != d_ptr->c[2] || s_ptr->c[3] != d_ptr->c[3] ||
+                s_ptr->d != d_ptr->d || s_ptr->e != d_ptr->e) {
+                H5_FAILED();
+                cerr << "    i=" << i << endl;
+                cerr << "    src={a=" << s_ptr->a << ", b=" << s_ptr->b << "c=[" << s_ptr->c[0] << ","
+                     << s_ptr->c[1] << "," << s_ptr->c[2] << "," << s_ptr->c[3] << ", d=" << s_ptr->d
+                     << ", e=" << s_ptr->e << "}" << endl;
+                cerr << "    dst={a=" << s_ptr->a << ", b=" << s_ptr->b << "c=[" << s_ptr->c[0] << ","
+                     << s_ptr->c[1] << "," << s_ptr->c[2] << "," << s_ptr->c[3] << ", d=" << s_ptr->d
+                     << ", e=" << s_ptr->e << "}" << endl;
+            }
+        }
+        // Release resources
+        HDfree(buf);
+        HDfree(bkg);
+        HDfree(orig);
+        s_ptr = NULL;
+        d_ptr = NULL;
+        st.close();
+        dt.close();
+        PASSED();
+    } // end of try block
+
+    catch (Exception &E) {
         issue_fail_msg(E.getCFuncName(), __LINE__, __FILE__, E.getCDetailMsg());
     }
 
-    if(array_dt)
-        delete array_dt;
-}   // test_compound_2()
+    delete array_dt;
+} // test_compound_2()
 
-
 /*-------------------------------------------------------------------------
- * Function:	test_compound_3
+ * Function:    test_compound_3
  *
- * Purpose:	Tests compound conversions where the source and destination
- *		are the same except the destination is missing a couple
- *		members which appear in the source.
+ * Purpose      Tests compound conversions where the source and destination
+ *              are the same except the destination is missing a couple
+ *              members which appear in the source.
  *
- * Return:	None
+ * Return       None
  *
- * Programmer:	Binh-Minh Ribler (use C version)
+ * Programmer   Binh-Minh Ribler (use C version)
  *              January, 2007
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
-static void test_compound_3()
+static void
+test_compound_3()
 {
     typedef struct {
-	int a, b, c[4], d, e;
+        int a, b, c[4], d, e;
     } src_typ_t;
     typedef struct {
-	int a,    c[4],    e;
+        int a, c[4], e;
     } dst_typ_t;
 
-    src_typ_t	  *s_ptr;
-    dst_typ_t 	  *d_ptr;
-    int		   i;
-    const int	   nelmts = NTESTELEM;
-    const hsize_t  four = 4;
+    src_typ_t     *s_ptr;
+    dst_typ_t     *d_ptr;
+    int            i;
+    const int      nelmts = NTESTELEM;
+    const hsize_t  four   = 4;
     unsigned char *buf = NULL, *orig = NULL, *bkg = NULL;
-    ArrayType* array_dt = NULL;
+    ArrayType     *array_dt = NULL;
 
     // Output message about test being performed
     SUBTEST("Compound Datatype Subset Conversions");
     try {
-	/* Initialize */
-	buf = (unsigned char*)HDmalloc(nelmts * MAX(sizeof(src_typ_t), sizeof(dst_typ_t)));
-	bkg = (unsigned char*)HDmalloc(nelmts * sizeof(dst_typ_t));
-	orig = (unsigned char*)HDmalloc(nelmts * sizeof(src_typ_t));
-	for (i=0; i<nelmts; i++) {
-	    s_ptr = ((src_typ_t*)orig) + i;
-	    s_ptr->a    = i*8+0;
-	    s_ptr->b    = i*8+1;
-	    s_ptr->c[0] = i*8+2;
-	    s_ptr->c[1] = i*8+3;
-	    s_ptr->c[2] = i*8+4;
-	    s_ptr->c[3] = i*8+5;
-	    s_ptr->d    = i*8+6;
-	    s_ptr->e    = i*8+7;
-	}
-	memcpy(buf, orig, nelmts*sizeof(src_typ_t));
-
-	/* Build hdf5 datatypes */
-	array_dt = new ArrayType(PredType::NATIVE_INT, 1, &four);
-
-	// Create an empty compound datatype
-	CompType st(sizeof(src_typ_t));
-	st.insertMember("a", HOFFSET(src_typ_t, a), PredType::NATIVE_INT);
-	st.insertMember("b", HOFFSET(src_typ_t, b), PredType::NATIVE_INT);
-	st.insertMember("c", HOFFSET(src_typ_t, c), *array_dt);
-	st.insertMember("d", HOFFSET(src_typ_t, d), PredType::NATIVE_INT);
-	st.insertMember("e", HOFFSET(src_typ_t, e), PredType::NATIVE_INT);
-	array_dt->close();
+        /* Initialize */
+        buf  = static_cast<unsigned char *>(HDmalloc(nelmts * MAX(sizeof(src_typ_t), sizeof(dst_typ_t))));
+        bkg  = static_cast<unsigned char *>(HDmalloc(nelmts * sizeof(dst_typ_t)));
+        orig = static_cast<unsigned char *>(HDmalloc(nelmts * sizeof(src_typ_t)));
+        for (i = 0; i < nelmts; i++) {
+            s_ptr       = (reinterpret_cast<src_typ_t *>(orig)) + i;
+            s_ptr->a    = i * 8 + 0;
+            s_ptr->b    = i * 8 + 1;
+            s_ptr->c[0] = i * 8 + 2;
+            s_ptr->c[1] = i * 8 + 3;
+            s_ptr->c[2] = i * 8 + 4;
+            s_ptr->c[3] = i * 8 + 5;
+            s_ptr->d    = i * 8 + 6;
+            s_ptr->e    = i * 8 + 7;
+        }
+        memcpy(buf, orig, nelmts * sizeof(src_typ_t));
+
+        /* Build hdf5 datatypes */
+        array_dt = new ArrayType(PredType::NATIVE_INT, 1, &four);
+
+        // Create an empty compound datatype
+        CompType st(sizeof(src_typ_t));
+        st.insertMember("a", HOFFSET(src_typ_t, a), PredType::NATIVE_INT);
+        st.insertMember("b", HOFFSET(src_typ_t, b), PredType::NATIVE_INT);
+        st.insertMember("c", HOFFSET(src_typ_t, c), *array_dt);
+        st.insertMember("d", HOFFSET(src_typ_t, d), PredType::NATIVE_INT);
+        st.insertMember("e", HOFFSET(src_typ_t, e), PredType::NATIVE_INT);
+        array_dt->close();
         delete array_dt;
 
-	array_dt = new ArrayType(PredType::NATIVE_INT, 1, &four);
-
-	// Create an empty compound datatype
-	CompType dt(sizeof(dst_typ_t));
-	dt.insertMember("a", HOFFSET(dst_typ_t, a), PredType::NATIVE_INT);
-	dt.insertMember("c", HOFFSET(dst_typ_t, c), *array_dt);
-	dt.insertMember("e", HOFFSET(dst_typ_t, e), PredType::NATIVE_INT);
-	array_dt->close();
-
-	/* Perform the conversion */
-	st.convert(dt, (size_t)nelmts, buf, bkg);
-
-	/* Compare results */
-	for (i=0; i<nelmts; i++) {
-	    s_ptr = ((src_typ_t*)orig) + i;
-	    d_ptr = ((dst_typ_t*)buf)  + i;
-	    if (s_ptr->a    != d_ptr->a    ||
-		s_ptr->c[0] != d_ptr->c[0] ||
-		s_ptr->c[1] != d_ptr->c[1] ||
-		s_ptr->c[2] != d_ptr->c[2] ||
-		s_ptr->c[3] != d_ptr->c[3] ||
-		s_ptr->e    != d_ptr->e) {
-		H5_FAILED();
-		cerr << "    i=" << i << endl;
-		cerr << "    src={a=" << s_ptr->a << ", b=" << s_ptr->b
-		     << ", c=[" << s_ptr->c[0] << "," << s_ptr->c[1] << ","
-		     << s_ptr->c[2] << "," << s_ptr->c[3] << "], d="
-		     << s_ptr->d << ", e=" << s_ptr->e << "}" << endl;
-		cerr << "    dst={a=" << d_ptr->a
-		     << ", c=[" << d_ptr->c[0] << "," << d_ptr->c[1] << ","
-		     << d_ptr->c[2] << "," << d_ptr->c[3] << "], e="
-		     << d_ptr->e << "}" << endl;
-	    } // if
-	} // for
-
-	/* Release resources */
-	HDfree(buf);
-	HDfree(bkg);
-	HDfree(orig);
-	s_ptr = NULL;
-	d_ptr = NULL;
-	st.close();
-	dt.close();
-	PASSED();
-    }   // end of try block
-
-    catch (Exception E) {
-cerr << "test_compound_3 in catch" << endl;
-	issue_fail_msg(E.getCFuncName(), __LINE__, __FILE__, E.getCDetailMsg());
+        array_dt = new ArrayType(PredType::NATIVE_INT, 1, &four);
+
+        // Create an empty compound datatype
+        CompType dt(sizeof(dst_typ_t));
+        dt.insertMember("a", HOFFSET(dst_typ_t, a), PredType::NATIVE_INT);
+        dt.insertMember("c", HOFFSET(dst_typ_t, c), *array_dt);
+        dt.insertMember("e", HOFFSET(dst_typ_t, e), PredType::NATIVE_INT);
+        array_dt->close();
+
+        /* Perform the conversion */
+        st.convert(dt, static_cast<size_t>(nelmts), buf, bkg);
+
+        /* Compare results */
+        for (i = 0; i < nelmts; i++) {
+            s_ptr = (reinterpret_cast<src_typ_t *>(orig)) + i;
+            d_ptr = (reinterpret_cast<dst_typ_t *>(buf)) + i;
+            if (s_ptr->a != d_ptr->a || s_ptr->c[0] != d_ptr->c[0] || s_ptr->c[1] != d_ptr->c[1] ||
+                s_ptr->c[2] != d_ptr->c[2] || s_ptr->c[3] != d_ptr->c[3] || s_ptr->e != d_ptr->e) {
+                H5_FAILED();
+                cerr << "    i=" << i << endl;
+                cerr << "    src={a=" << s_ptr->a << ", b=" << s_ptr->b << ", c=[" << s_ptr->c[0] << ","
+                     << s_ptr->c[1] << "," << s_ptr->c[2] << "," << s_ptr->c[3] << "], d=" << s_ptr->d
+                     << ", e=" << s_ptr->e << "}" << endl;
+                cerr << "    dst={a=" << d_ptr->a << ", c=[" << d_ptr->c[0] << "," << d_ptr->c[1] << ","
+                     << d_ptr->c[2] << "," << d_ptr->c[3] << "], e=" << d_ptr->e << "}" << endl;
+            }
+        }
+
+        /* Release resources */
+        HDfree(buf);
+        HDfree(bkg);
+        HDfree(orig);
+        s_ptr = NULL;
+        d_ptr = NULL;
+        st.close();
+        dt.close();
+        PASSED();
+    } // end of try block
+
+    catch (Exception &E) {
+        issue_fail_msg(E.getCFuncName(), __LINE__, __FILE__, E.getCDetailMsg());
     }
 
-    if(array_dt)
-        delete array_dt;
-}   // test_compound_3()
+    delete array_dt;
+} // test_compound_3()
 
-
 /*-------------------------------------------------------------------------
- * Function:	test_compound_4
+ * Function:    test_compound_4
  *
- * Purpose:	Tests compound conversions when the destination has the same
- *		fields as the source but one or more of the fields are
- *		smaller.
+ * Purpose      Tests compound conversions when the destination has the same
+ *              fields as the source but one or more of the fields are
+ *              smaller.
  *
- * Return:	None
- *
- * Programmer:	Binh-Minh Ribler (use C version)
- *		January, 2007
- *
- * Modifications:
+ * Return       None
  *
+ * Programmer   Binh-Minh Ribler (use C version)
+ *              January, 2007
  *-------------------------------------------------------------------------
  */
-static void test_compound_4()
+static void
+test_compound_4()
 {
 
     typedef struct {
-	int a, b, c[4], d, e;
+        int a, b, c[4], d, e;
     } src_typ_t;
 
     typedef struct {
-	short b;
-	int a, c[4];
-	short d;
-	int e;
+        short b;
+        int   a, c[4];
+        short d;
+        int   e;
     } dst_typ_t;
 
-    src_typ_t	  *s_ptr;
-    dst_typ_t	  *d_ptr;
-    int		   i;
-    const int	   nelmts = NTESTELEM;
-    const hsize_t  four = 4;
+    src_typ_t     *s_ptr;
+    dst_typ_t     *d_ptr;
+    int            i;
+    const int      nelmts = NTESTELEM;
+    const hsize_t  four   = 4;
     unsigned char *buf = NULL, *orig = NULL, *bkg = NULL;
-    ArrayType* array_dt = NULL;
+    ArrayType     *array_dt = NULL;
 
     // Output message about test being performed
     SUBTEST("Compound Element Shrinking & Reordering");
     try {
-	/* Sizes should be the same, but be careful just in case */
-	buf = (unsigned char*)HDmalloc(nelmts * MAX(sizeof(src_typ_t), sizeof(dst_typ_t)));
-	bkg = (unsigned char*)HDmalloc(nelmts * sizeof(dst_typ_t));
-	orig = (unsigned char*)HDmalloc(nelmts * sizeof(src_typ_t));
-	for (i=0; i<nelmts; i++) {
-	    s_ptr = ((src_typ_t*)orig) + i;
-	    s_ptr->a    = i*8+0;
-	    s_ptr->b    = (i*8+1) & 0x7fff;
-	    s_ptr->c[0] = i*8+2;
-	    s_ptr->c[1] = i*8+3;
-	    s_ptr->c[2] = i*8+4;
-	    s_ptr->c[3] = i*8+5;
-	    s_ptr->d	    = (i*8+6) & 0x7fff;
-	    s_ptr->e    = i*8+7;
-	}
-	memcpy(buf, orig, nelmts*sizeof(src_typ_t));
-
-	/* Build hdf5 datatypes */
-	array_dt = new ArrayType(PredType::NATIVE_INT, 1, &four);
-
-	// Create an empty compound datatype
-	CompType st(sizeof(src_typ_t));
-	st.insertMember("a", HOFFSET(src_typ_t, a), PredType::NATIVE_INT);
-	st.insertMember("b", HOFFSET(src_typ_t, b), PredType::NATIVE_INT);
-	st.insertMember("c", HOFFSET(src_typ_t, c), *array_dt);
-	st.insertMember("d", HOFFSET(src_typ_t, d), PredType::NATIVE_INT);
-	st.insertMember("e", HOFFSET(src_typ_t, e), PredType::NATIVE_INT);
-	array_dt->close();
+        /* Sizes should be the same, but be careful just in case */
+        buf  = static_cast<unsigned char *>(HDmalloc(nelmts * MAX(sizeof(src_typ_t), sizeof(dst_typ_t))));
+        bkg  = static_cast<unsigned char *>(HDmalloc(nelmts * sizeof(dst_typ_t)));
+        orig = static_cast<unsigned char *>(HDmalloc(nelmts * sizeof(src_typ_t)));
+        for (i = 0; i < nelmts; i++) {
+            s_ptr       = (reinterpret_cast<src_typ_t *>(orig)) + i;
+            s_ptr->a    = i * 8 + 0;
+            s_ptr->b    = (i * 8 + 1) & 0x7fff;
+            s_ptr->c[0] = i * 8 + 2;
+            s_ptr->c[1] = i * 8 + 3;
+            s_ptr->c[2] = i * 8 + 4;
+            s_ptr->c[3] = i * 8 + 5;
+            s_ptr->d    = (i * 8 + 6) & 0x7fff;
+            s_ptr->e    = i * 8 + 7;
+        }
+        memcpy(buf, orig, nelmts * sizeof(src_typ_t));
+
+        /* Build hdf5 datatypes */
+        array_dt = new ArrayType(PredType::NATIVE_INT, 1, &four);
+
+        // Create an empty compound datatype
+        CompType st(sizeof(src_typ_t));
+        st.insertMember("a", HOFFSET(src_typ_t, a), PredType::NATIVE_INT);
+        st.insertMember("b", HOFFSET(src_typ_t, b), PredType::NATIVE_INT);
+        st.insertMember("c", HOFFSET(src_typ_t, c), *array_dt);
+        st.insertMember("d", HOFFSET(src_typ_t, d), PredType::NATIVE_INT);
+        st.insertMember("e", HOFFSET(src_typ_t, e), PredType::NATIVE_INT);
+        array_dt->close();
         delete array_dt;
 
-	array_dt = new ArrayType(PredType::NATIVE_INT, 1, &four);
-
-	// Create an empty compound datatype
-	CompType dt(sizeof(dst_typ_t));
-	dt.insertMember("a", HOFFSET(dst_typ_t, a), PredType::NATIVE_INT);
-	dt.insertMember("b", HOFFSET(dst_typ_t, b), PredType::NATIVE_SHORT);
-	dt.insertMember("c", HOFFSET(dst_typ_t, c), *array_dt);
-	dt.insertMember("d", HOFFSET(dst_typ_t, d), PredType::NATIVE_SHORT);
-	dt.insertMember("e", HOFFSET(dst_typ_t, e), PredType::NATIVE_INT);
-	array_dt->close();
-
-	/* Perform the conversion */
-	st.convert(dt, (size_t)nelmts, buf, bkg);
-
-	/* Compare results */
-	for (i=0; i<nelmts; i++) {
-	    s_ptr = ((src_typ_t*)orig) + i;
-	    d_ptr = ((dst_typ_t*)buf)  + i;
-	    if (s_ptr->a    != d_ptr->a    ||
-		s_ptr->b    != d_ptr->b    ||
-		s_ptr->c[0] != d_ptr->c[0] ||
-		s_ptr->c[1] != d_ptr->c[1] ||
-		s_ptr->c[2] != d_ptr->c[2] ||
-		s_ptr->c[3] != d_ptr->c[3] ||
-		s_ptr->d    != d_ptr->d    ||
-		s_ptr->e    != d_ptr->e)
-	    {
-		H5_FAILED();
-		cerr << "    i=" << i << endl;
-		cerr << "    src={a=" << s_ptr->a << ", b=" << s_ptr->b
-		     << "c=[" << s_ptr->c[0] << "," << s_ptr->c[1] << ","
-		     << s_ptr->c[2] << "," << s_ptr->c[3] << ", d="
-		     << s_ptr->d << ", e=" << s_ptr->e << "}" << endl;
-		cerr << "    dst={a=" << d_ptr->a << ", b=" << d_ptr->b
-		     << "c=[" << d_ptr->c[0] << "," << d_ptr->c[1] << ","
-		     << d_ptr->c[2] << "," << d_ptr->c[3] << ", d="
-		     << d_ptr->d << ", e=" << d_ptr->e << "}" << endl;
-	    } // if
-	} // for
-
-	/* Release resources */
-	HDfree(buf);
-	HDfree(bkg);
-	HDfree(orig);
-	s_ptr = NULL;
-	d_ptr = NULL;
-	st.close();
-	dt.close();
-	PASSED();
-    }   // end of try block
-
-    catch (Exception E) {
-cerr << "test_compound_4 in catch" << endl;
+        array_dt = new ArrayType(PredType::NATIVE_INT, 1, &four);
+
+        // Create an empty compound datatype
+        CompType dt(sizeof(dst_typ_t));
+        dt.insertMember("a", HOFFSET(dst_typ_t, a), PredType::NATIVE_INT);
+        dt.insertMember("b", HOFFSET(dst_typ_t, b), PredType::NATIVE_SHORT);
+        dt.insertMember("c", HOFFSET(dst_typ_t, c), *array_dt);
+        dt.insertMember("d", HOFFSET(dst_typ_t, d), PredType::NATIVE_SHORT);
+        dt.insertMember("e", HOFFSET(dst_typ_t, e), PredType::NATIVE_INT);
+        array_dt->close();
+
+        /* Perform the conversion */
+        st.convert(dt, static_cast<size_t>(nelmts), buf, bkg);
+
+        /* Compare results */
+        for (i = 0; i < nelmts; i++) {
+            s_ptr = (reinterpret_cast<src_typ_t *>(orig)) + i;
+            d_ptr = (reinterpret_cast<dst_typ_t *>(buf)) + i;
+            if (s_ptr->a != d_ptr->a || s_ptr->b != d_ptr->b || s_ptr->c[0] != d_ptr->c[0] ||
+                s_ptr->c[1] != d_ptr->c[1] || s_ptr->c[2] != d_ptr->c[2] || s_ptr->c[3] != d_ptr->c[3] ||
+                s_ptr->d != d_ptr->d || s_ptr->e != d_ptr->e) {
+                H5_FAILED();
+                cerr << "    i=" << i << endl;
+                cerr << "    src={a=" << s_ptr->a << ", b=" << s_ptr->b << "c=[" << s_ptr->c[0] << ","
+                     << s_ptr->c[1] << "," << s_ptr->c[2] << "," << s_ptr->c[3] << ", d=" << s_ptr->d
+                     << ", e=" << s_ptr->e << "}" << endl;
+                cerr << "    dst={a=" << d_ptr->a << ", b=" << d_ptr->b << "c=[" << d_ptr->c[0] << ","
+                     << d_ptr->c[1] << "," << d_ptr->c[2] << "," << d_ptr->c[3] << ", d=" << d_ptr->d
+                     << ", e=" << d_ptr->e << "}" << endl;
+            } // if
+        }     // for
+
+        /* Release resources */
+        HDfree(buf);
+        HDfree(bkg);
+        HDfree(orig);
+        s_ptr = NULL;
+        d_ptr = NULL;
+        st.close();
+        dt.close();
+        PASSED();
+    } // end of try block
+
+    catch (Exception &E) {
         issue_fail_msg(E.getCFuncName(), __LINE__, __FILE__, E.getCDetailMsg());
     }
 
-    if(array_dt)
-        delete array_dt;
-}   // test_compound_4()
+    delete array_dt;
+} // test_compound_4()
 
-
 /*-------------------------------------------------------------------------
- * Function:	test_compound_5
+ * Function:    test_compound_5
  *
- * Purpose:	Many versions of HDF5 have a bug in the optimized compound
+ * Purpose      Many versions of HDF5 have a bug in the optimized compound
  *              datatype conversion function, H5T_conv_struct_opt(), which
  *              is triggered when the top-level type contains a struct
  *              which must undergo a conversion.
  *
- * Return:	None
- *
- * Programmer:	Binh-Minh Ribler (use C version)
- *		January, 2007
- *
- * Modifications:
+ * Return       None
  *
+ * Programmer   Binh-Minh Ribler (use C version)
+ *              January, 2007
  *-------------------------------------------------------------------------
  */
-static void test_compound_5()
+static void
+test_compound_5()
 {
     typedef struct {
-        char    name[16];
-        short   tdim;
-        short   coll_ids[4];
+        char  name[16];
+        short tdim;
+        short coll_ids[4];
     } src_typ_t;
 
     typedef struct {
-        char    name[16];
-        short   tdim;
-        int     coll_ids[4];
+        char  name[16];
+        short tdim;
+        int   coll_ids[4];
     } dst_typ_t;
 
-    hsize_t      dims[1] = {4};
-    src_typ_t  src[2] = {{"one", 102, {104, 105, 106, 107}},
-                          {"two", 202, {204, 205, 206, 207}}};
-    dst_typ_t  *dst;
-    void        *buf = HDcalloc(2, sizeof(dst_typ_t));
-    void        *bkg = HDcalloc(2, sizeof(dst_typ_t));
-    ArrayType* array_dt = NULL;
+    hsize_t    dims[1] = {4};
+    src_typ_t  src[2]  = {{"one", 102, {104, 105, 106, 107}}, {"two", 202, {204, 205, 206, 207}}};
+    dst_typ_t *dst;
+    void      *buf      = HDcalloc(2, sizeof(dst_typ_t));
+    void      *bkg      = HDcalloc(2, sizeof(dst_typ_t));
+    ArrayType *array_dt = NULL;
 
     // Output message about test being performed
     SUBTEST("Optimized Struct Converter");
     try {
 
-	/* Build datatypes */
-	array_dt = new ArrayType(PredType::NATIVE_SHORT, 1, dims);
-	CompType short_array(4*sizeof(short));
-	short_array.insertMember("_", 0, *array_dt);
-	array_dt->close();
+        /* Build datatypes */
+        array_dt = new ArrayType(PredType::NATIVE_SHORT, 1, dims);
+        CompType short_array(4 * sizeof(short));
+        short_array.insertMember("_", 0, *array_dt);
+        array_dt->close();
         delete array_dt;
 
-	CompType int_array(4*sizeof(int));
-	array_dt = new ArrayType(PredType::NATIVE_INT, 1, dims);
-	int_array.insertMember("_", 0, *array_dt);
-	array_dt->close();
-
-	StrType strg(PredType::C_S1, 16);
-	CompType src_type(sizeof(src_typ_t));
-	src_type.insertMember("name", HOFFSET(src_typ_t, name), strg);
-	src_type.insertMember("tdim", HOFFSET(src_typ_t, tdim), PredType::NATIVE_SHORT);
-	src_type.insertMember("coll_ids", HOFFSET(src_typ_t, coll_ids), short_array);
-
-	CompType dst_type(sizeof(dst_typ_t));
-	dst_type.insertMember("name", HOFFSET(dst_typ_t, name), strg);
-	dst_type.insertMember("tdim", HOFFSET(dst_typ_t, tdim), PredType::NATIVE_SHORT);
-	dst_type.insertMember("coll_ids", HOFFSET(dst_typ_t, coll_ids), int_array);
-
-	/* Convert data */
-	memcpy(buf, src, sizeof(src));
-	src_type.convert(dst_type, (size_t)2, buf, bkg);
-	dst = (dst_typ_t*)buf;
-
-	/* Cleanup */
-	src_type.close();
-	dst_type.close();
-	strg.close();
-	short_array.close();
-	int_array.close();
-
-	/* Check results */
-	if (memcmp(src[1].name, dst[1].name, sizeof(src[1].name)) ||
-	    src[1].tdim!=dst[1].tdim ||
-	    src[1].coll_ids[0]!=dst[1].coll_ids[0] ||
-	    src[1].coll_ids[1]!=dst[1].coll_ids[1] ||
-	    src[1].coll_ids[2]!=dst[1].coll_ids[2] ||
-	    src[1].coll_ids[3]!=dst[1].coll_ids[3])
-	{ H5_FAILED(); }
-
-	/* Free memory buffers */
-	HDfree(buf);
-	HDfree(bkg);
-	dst = NULL;
-	PASSED();
-    }   // end of try block
-
-    catch (Exception E) {
-cerr << "test_compound_5 in catch" << endl;
+        CompType int_array(4 * sizeof(int));
+        array_dt = new ArrayType(PredType::NATIVE_INT, 1, dims);
+        int_array.insertMember("_", 0, *array_dt);
+        array_dt->close();
+
+        StrType  strg(PredType::C_S1, 16);
+        CompType src_type(sizeof(src_typ_t));
+        src_type.insertMember("name", HOFFSET(src_typ_t, name), strg);
+        src_type.insertMember("tdim", HOFFSET(src_typ_t, tdim), PredType::NATIVE_SHORT);
+        src_type.insertMember("coll_ids", HOFFSET(src_typ_t, coll_ids), short_array);
+
+        CompType dst_type(sizeof(dst_typ_t));
+        dst_type.insertMember("name", HOFFSET(dst_typ_t, name), strg);
+        dst_type.insertMember("tdim", HOFFSET(dst_typ_t, tdim), PredType::NATIVE_SHORT);
+        dst_type.insertMember("coll_ids", HOFFSET(dst_typ_t, coll_ids), int_array);
+
+        /* Convert data */
+        memcpy(buf, src, sizeof(src));
+        src_type.convert(dst_type, 2, buf, bkg);
+        dst = static_cast<dst_typ_t *>(buf);
+
+        /* Cleanup */
+        src_type.close();
+        dst_type.close();
+        strg.close();
+        short_array.close();
+        int_array.close();
+
+        /* Check results */
+        if (memcmp(src[1].name, dst[1].name, sizeof(src[1].name)) != 0 || src[1].tdim != dst[1].tdim ||
+            src[1].coll_ids[0] != dst[1].coll_ids[0] || src[1].coll_ids[1] != dst[1].coll_ids[1] ||
+            src[1].coll_ids[2] != dst[1].coll_ids[2] || src[1].coll_ids[3] != dst[1].coll_ids[3]) {
+            H5_FAILED();
+        }
+
+        /* Free memory buffers */
+        HDfree(buf);
+        HDfree(bkg);
+        dst = NULL;
+        PASSED();
+    } // end of try block
+
+    catch (Exception &E) {
         issue_fail_msg(E.getCFuncName(), __LINE__, __FILE__, E.getCDetailMsg());
     }
 
-    if(array_dt)
-        delete array_dt;
-}   // test_compound_5()
+    delete array_dt;
+} // test_compound_5()
 
-
 /*-------------------------------------------------------------------------
- * Function:	test_compound_6
+ * Function:    test_compound_6
  *
- * Purpose:	Tests compound conversions when the destination has the same
- *		fields as the source but one or more of the fields are
- *		larger.
+ * Purpose      Tests compound conversions when the destination has the same
+ *              fields as the source but one or more of the fields are
+ *              larger.
  *
- * Return:	None
- *
- * Programmer:	Binh-Minh Ribler (use C version)
- *		January, 2007
- *
- * Modifications:
+ * Return       None
  *
+ * Programmer   Binh-Minh Ribler (use C version)
+ *              January, 2007
  *-------------------------------------------------------------------------
  */
-static void test_compound_6()
+static void
+test_compound_6()
 {
     typedef struct {
-	short b;
-	short d;
+        short b;
+        short d;
     } src_typ_t;
 
     typedef struct {
-	long b;
-	long d;
+        long b;
+        long d;
     } dst_typ_t;
 
-    src_typ_t	  *s_ptr;
-    dst_typ_t	  *d_ptr;
-    int		   i;
-    const int	   nelmts = NTESTELEM;
-    unsigned char *buf=NULL, *orig=NULL, *bkg=NULL;
+    src_typ_t     *s_ptr;
+    dst_typ_t     *d_ptr;
+    int            i;
+    const int      nelmts = NTESTELEM;
+    unsigned char *buf = NULL, *orig = NULL, *bkg = NULL;
 
     // Output message about test being performed
     SUBTEST("Compound Element Growing");
     try {
-	/* Sizes should be the same, but be careful just in case */
-	buf = (unsigned char*)HDmalloc(nelmts * MAX(sizeof(src_typ_t), sizeof(dst_typ_t)));
-	bkg = (unsigned char*)HDmalloc(nelmts * sizeof(dst_typ_t));
-	orig = (unsigned char*)HDmalloc(nelmts * sizeof(src_typ_t));
-	for (i=0; i<nelmts; i++) {
-	    s_ptr = ((src_typ_t*)orig) + i;
-	    s_ptr->b    = (i*8+1) & 0x7fff;
-	    s_ptr->d    = (i*8+6) & 0x7fff;
-	}
-	memcpy(buf, orig, nelmts*sizeof(src_typ_t));
-
-	/* Build hdf5 datatypes */
-	CompType st(sizeof(src_typ_t));
-	st.insertMember("b", HOFFSET(src_typ_t, b), PredType::NATIVE_SHORT);
-	st.insertMember("d", HOFFSET(src_typ_t, d), PredType::NATIVE_SHORT);
-
-	CompType dt(sizeof(dst_typ_t));
-	dt.insertMember("b", HOFFSET(dst_typ_t, b), PredType::NATIVE_LONG);
-	dt.insertMember("d", HOFFSET(dst_typ_t, d), PredType::NATIVE_LONG);
-
-	/* Perform the conversion */
-	st.convert(dt, (size_t)nelmts, buf, bkg);
-
-	/* Compare results */
-	for (i=0; i<nelmts; i++) {
-	    s_ptr = ((src_typ_t*)orig) + i;
-	    d_ptr = ((dst_typ_t*)buf)  + i;
-	    if (s_ptr->b    != d_ptr->b    ||
-		s_ptr->d    != d_ptr->d)
-	    {
-		H5_FAILED();
-		cerr << "    i=" << i << endl;
-		cerr << "    src={b=" << s_ptr->b << ", d=" << s_ptr->d
-		     << "}" << endl;
-		cerr << "    dst={b=" << d_ptr->b << ", d=" << d_ptr->d
-		     << "}" << endl;
-	    } // if
-	} // for
-
-	/* Release resources */
-	HDfree(buf);
-	HDfree(bkg);
-	HDfree(orig);
-	s_ptr = NULL;
-	d_ptr = NULL;
-	st.close();
-	dt.close();
-	PASSED();
-    }   // end of try block
-
-    catch (Exception E) {
-cerr << "test_compound_6 in catch" << endl;
+        /* Sizes should be the same, but be careful just in case */
+        buf  = static_cast<unsigned char *>(HDmalloc(nelmts * MAX(sizeof(src_typ_t), sizeof(dst_typ_t))));
+        bkg  = static_cast<unsigned char *>(HDmalloc(nelmts * sizeof(dst_typ_t)));
+        orig = static_cast<unsigned char *>(HDmalloc(nelmts * sizeof(src_typ_t)));
+        for (i = 0; i < nelmts; i++) {
+            s_ptr    = (reinterpret_cast<src_typ_t *>(orig)) + i;
+            s_ptr->b = (i * 8 + 1) & 0x7fff;
+            s_ptr->d = (i * 8 + 6) & 0x7fff;
+        }
+        memcpy(buf, orig, nelmts * sizeof(src_typ_t));
+
+        /* Build hdf5 datatypes */
+        CompType st(sizeof(src_typ_t));
+        st.insertMember("b", HOFFSET(src_typ_t, b), PredType::NATIVE_SHORT);
+        st.insertMember("d", HOFFSET(src_typ_t, d), PredType::NATIVE_SHORT);
+
+        CompType dt(sizeof(dst_typ_t));
+        dt.insertMember("b", HOFFSET(dst_typ_t, b), PredType::NATIVE_LONG);
+        dt.insertMember("d", HOFFSET(dst_typ_t, d), PredType::NATIVE_LONG);
+
+        /* Perform the conversion */
+        st.convert(dt, static_cast<size_t>(nelmts), buf, bkg);
+
+        /* Compare results */
+        for (i = 0; i < nelmts; i++) {
+            s_ptr = (reinterpret_cast<src_typ_t *>(orig)) + i;
+            d_ptr = (reinterpret_cast<dst_typ_t *>(buf)) + i;
+            if (s_ptr->b != d_ptr->b || s_ptr->d != d_ptr->d) {
+                H5_FAILED();
+                cerr << "    i=" << i << endl;
+                cerr << "    src={b=" << s_ptr->b << ", d=" << s_ptr->d << "}" << endl;
+                cerr << "    dst={b=" << d_ptr->b << ", d=" << d_ptr->d << "}" << endl;
+            }
+        }
+
+        /* Release resources */
+        HDfree(buf);
+        HDfree(bkg);
+        HDfree(orig);
+        s_ptr = NULL;
+        d_ptr = NULL;
+        st.close();
+        dt.close();
+        PASSED();
+    } // end of try block
+
+    catch (Exception &E) {
         issue_fail_msg(E.getCFuncName(), __LINE__, __FILE__, E.getCDetailMsg());
     }
-}   // test_compound_6()
+} // test_compound_6()
 
 /*-------------------------------------------------------------------------
- * Function:	test_compound_7
- *
- * Purpose:	Tests inserting fields into compound datatypes when the field
- *		overlaps the end of the compound datatype.
- *
- * Return:	None
+ * Function:    test_compound_7
  *
- * Programmer:	Binh-Minh Ribler (use C version)
- *		January, 2007
+ * Purpose      Tests inserting fields into compound datatypes when the field
+ *              overlaps the end of the compound datatype.
  *
- * Modifications:
+ * Return       None
  *
+ * Programmer   Binh-Minh Ribler (use C version)
+ *              January, 2007
  *-------------------------------------------------------------------------
  */
-static void test_compound_7()
+static void
+test_compound_7()
 {
     typedef struct {
-	int a;
-	float b;
-	long c;
+        int   a;
+        float b;
+        long  c;
     } s1_typ_t;
 
     typedef struct {
-	int a;
-	float b;
-	long c;
-	double d;
+        int    a;
+        float  b;
+        long   c;
+        double d;
     } s2_typ_t;
 
     // Output message about test being performed
     SUBTEST("Compound Element Insertion");
     try {
-	CompType tid1(sizeof(s1_typ_t));
-
-	tid1.insertMember("a", HOFFSET(s1_typ_t,a),PredType::NATIVE_INT);
-	tid1.insertMember("b", HOFFSET(s1_typ_t,b),PredType::NATIVE_FLOAT);
-	tid1.insertMember("c", HOFFSET(s1_typ_t,c),PredType::NATIVE_LONG);
-
-	size_t type_size = tid1.getSize();
-	verify_val(type_size, sizeof(s1_typ_t), "DataType::getSize", __LINE__, __FILE__);
-
-	CompType tid2;
-	tid2.copy(tid1);
-
-	type_size = tid2.getSize();
-	verify_val_noteq(type_size, sizeof(s2_typ_t), "DataType::getSize", __LINE__, __FILE__);
-
-	/* Should not be able to insert field past end of compound datatype */
-	try {
-	    tid2.insertMember("d", HOFFSET(s2_typ_t, d), PredType::NATIVE_DOUBLE);
-	    // Should FAIL but didn't, so throw an invalid action exception
-	    throw InvalidActionException("CompType::insertMember", "Attempted to insert field past end of compound data type.");
-	} catch (DataTypeIException err) {}
-
-	/* Release resources */
-	tid1.close();
-	tid2.close();
-	PASSED();
-    }   // end of try block
-
-    catch (Exception E) {
-cerr << "test_compound_7 in catch" << endl;
+        CompType tid1(sizeof(s1_typ_t));
+
+        tid1.insertMember("a", HOFFSET(s1_typ_t, a), PredType::NATIVE_INT);
+        tid1.insertMember("b", HOFFSET(s1_typ_t, b), PredType::NATIVE_FLOAT);
+        tid1.insertMember("c", HOFFSET(s1_typ_t, c), PredType::NATIVE_LONG);
+
+        size_t type_size = tid1.getSize();
+        verify_val(type_size, sizeof(s1_typ_t), "DataType::getSize", __LINE__, __FILE__);
+
+        CompType tid2;
+        tid2.copy(tid1);
+
+        type_size = tid2.getSize();
+        verify_val_noteq(type_size, sizeof(s2_typ_t), "DataType::getSize", __LINE__, __FILE__);
+
+        /* Should not be able to insert field past end of compound datatype */
+        try {
+            tid2.insertMember("d", HOFFSET(s2_typ_t, d), PredType::NATIVE_DOUBLE);
+            // Should FAIL but didn't, so throw an invalid action exception
+            throw InvalidActionException("CompType::insertMember",
+                                         "Attempted to insert field past end of compound data type.");
+        }
+        catch (DataTypeIException &err) {
+        }
+
+        /* Release resources */
+        tid1.close();
+        tid2.close();
+        PASSED();
+    } // end of try block
+
+    catch (Exception &E) {
         issue_fail_msg(E.getCFuncName(), __LINE__, __FILE__, E.getCDetailMsg());
     }
-}   // test_compound_7()
-
+} // test_compound_7()
+
 /*-------------------------------------------------------------------------
- * Function:	test_compound_set_size
+ * Function:    test_compound_set_size
  *
- * Purpose:	Tests member function setSize() on compound datatype
+ * Purpose      Tests member function setSize() on compound datatype
  *
- * Return:	None
+ * Return       None
  *
- * Programmer:	Binh-Minh Ribler (use partial C version test_ooo_order)
+ * Programmer   Binh-Minh Ribler (use partial C version test_ooo_order)
  *              March, 2014
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 const H5std_string COMPFILE("tcompound_types.h5");
-static void test_compound_set_size()
+
+static void
+test_compound_set_size()
 {
     typedef struct {
-	int a, b, c[4], d, e;
+        int a, b, c[4], d, e;
     } src_typ_t;
 
     // Output message about test being performed
@@ -763,108 +690,97 @@ static void test_compound_set_size()
         dtype.insertMember("c", HOFFSET(src_typ_t, c), PredType::NATIVE_LONG);
         dtype.insertMember("d", HOFFSET(src_typ_t, d), PredType::NATIVE_DOUBLE);
 
-	// Verify that the compound is not packed
-	// bool packed = dtype.packed(); // not until C library provides API
-	// verify_val(packed, FALSE, "DataType::packed", __LINE__, __FILE__);
+        // Verify that the compound is not packed
+        // bool packed = dtype.packed(); // not until C library provides API
+        // verify_val(packed, FALSE, "DataType::packed", __LINE__, __FILE__);
 
-	dtype.commit(file, "dtype");
+        dtype.commit(file, "dtype");
 
-	// Close the type and file
-	dtype.close();
-	file.close();
+        // Close the type and file
+        dtype.close();
+        file.close();
 
-	// Open the file for read/write
-	file.openFile(COMPFILE, H5F_ACC_RDWR);
+        // Open the file for read/write
+        file.openFile(COMPFILE, H5F_ACC_RDWR);
 
-	// Open the data type "dtype"
-	CompType dtype_tmp = file.openCompType("dtype");
+        // Open the data type "dtype"
+        CompType dtype_tmp = file.openCompType("dtype");
 
-	// Make a copy of the data type
-	dtype = dtype_tmp;
+        // Make a copy of the data type
+        dtype.copy(dtype_tmp);
 
-	// Verify that the compound is not packed
-	// packed = dtype_tmp.packed(); // not until C library provides API
-	// verify_val(packed, FALSE, "DataType::packed", __LINE__, __FILE__);
+        // Verify that the compound is not packed
+        // packed = dtype_tmp.packed(); // not until C library provides API
+        // verify_val(packed, FALSE, "DataType::packed", __LINE__, __FILE__);
 
-	// Expand the type, and verify that it became unpacked
-	dtype.setSize((size_t)33);
-	// packed = dtype.packed(); // not until C library provides API
-	// verify_val(packed, FALSE, "DataType::packed", __LINE__, __FILE__);
+        // Expand the type, and verify that it became unpacked
+        dtype.setSize(33);
+        // packed = dtype.packed(); // not until C library provides API
+        // verify_val(packed, FALSE, "DataType::packed", __LINE__, __FILE__);
 
-	// Verify setSize() actually set size
-	size_t new_size = dtype.getSize();
-	verify_val(new_size, (size_t)33, "DataType::getSize", __LINE__, __FILE__);
+        // Verify setSize() actually set size
+        size_t new_size = dtype.getSize();
+        verify_val(static_cast<long>(new_size), 33, "DataType::getSize", __LINE__, __FILE__);
 
-	// Shrink the type, and verify that it became packed
-	dtype.setSize((size_t)32);
-	// packed = dtype.packed(); // not until C library provides API
-	// verify_val(packed, TRUE, "DataType::packed", __LINE__, __FILE__);
+        // Shrink the type, and verify that it became packed
+        dtype.setSize(32);
+        // packed = dtype.packed(); // not until C library provides API
+        // verify_val(packed, TRUE, "DataType::packed", __LINE__, __FILE__);
 
-	// Verify setSize() actually set size again
-	new_size = dtype.getSize();
-	verify_val(new_size, (size_t)32, "DataType::getSize", __LINE__, __FILE__);
+        // Verify setSize() actually set size again
+        new_size = dtype.getSize();
+        verify_val(static_cast<long>(new_size), 32, "DataType::getSize", __LINE__, __FILE__);
 
-	/* Close types and file */
-	dtype_tmp.close();
-	dtype.close();
-	file.close();
+        /* Close types and file */
+        dtype_tmp.close();
+        dtype.close();
+        file.close();
 
-	PASSED();
-    }   // end of try block
+        PASSED();
+    } // end of try block
 
-    catch (Exception E) {
+    catch (Exception &E) {
         issue_fail_msg(E.getCFuncName(), __LINE__, __FILE__, E.getCDetailMsg());
     }
-}   // test_compound_set_size()
-
+} // test_compound_set_size()
+
 /*-------------------------------------------------------------------------
- * Function:	test_compound
- *
- * Purpose:	Main compound datatype testing routine
- *
- * Return:	None
+ * Function:    test_compound
  *
- * Programmer:	Binh-Minh Ribler
- *		January 2007
+ * Purpose      Main compound datatype testing routine
  *
- * Modifications:
+ * Return       None
  *
+ * Programmer   Binh-Minh Ribler
+ *              January 2007
  *-------------------------------------------------------------------------
  */
-#ifdef __cplusplus
-extern "C"
-#endif
-void test_compound()
+extern "C" void
+test_compound()
 {
     // Output message about test being performed
     MESSAGE(5, ("Testing Compound Data Type operations\n"));
 
-    test_compound_1();	// various things about compound data types
-    test_compound_2();	// compound element reordering
-    test_compound_3();	// compound datatype subset conversions
-    test_compound_4();	// compound element shrinking & reordering
-    test_compound_5();	// optimized struct converter
-    test_compound_6();	// compound element growing
-    test_compound_7();	// compound element insertion
-    test_compound_set_size();	// set size on compound data types
-}   // test_compound()
-
-
+    test_compound_1();        // various things about compound data types
+    test_compound_2();        // compound element reordering
+    test_compound_3();        // compound datatype subset conversions
+    test_compound_4();        // compound element shrinking & reordering
+    test_compound_5();        // optimized struct converter
+    test_compound_6();        // compound element growing
+    test_compound_7();        // compound element insertion
+    test_compound_set_size(); // set size on compound data types
+} // test_compound()
+
 /*-------------------------------------------------------------------------
- * Function:	cleanup_compound
- *
- * Purpose:	Cleanup temporary test files - nothing at this time.
- *
- * Return:	none
+ * Function:    cleanup_compound
  *
- * Modifications:
+ * Purpose      Cleanup temporary test files - nothing at this time.
  *
+ * Return       None
  *-------------------------------------------------------------------------
  */
-#ifdef __cplusplus
-extern "C"
-#endif
-void cleanup_compound()
+extern "C" void
+cleanup_compound()
 {
     HDremove(COMPFILE.c_str());
-}   // cleanup_file
+} // cleanup_file
diff --git a/c++/test/tdspl.cpp b/c++/test/tdspl.cpp
index 5c1d953..308285f 100644
--- a/c++/test/tdspl.cpp
+++ b/c++/test/tdspl.cpp
@@ -1,147 +1,138 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*****************************************************************************
    FILE
    tdspl.cpp - HDF5 C++ testing the dataset memory and transfer property
-		list functionality
+               list functionality
 
  ***************************************************************************/
-
-#ifdef OLD_HEADER_FILENAME
-#include <iostream.h>
-#else
 #include <iostream>
-#endif
-#include <string>
-
-#ifndef H5_NO_NAMESPACE
-#ifndef H5_NO_STD
-    using std::cerr;
-    using std::endl;
-#endif  // H5_NO_STD
-#endif
-
-#include "H5Cpp.h"      // C++ API header file
+using std::cerr;
+using std::endl;
 
-#ifndef H5_NO_NAMESPACE
-    using namespace H5;
-#endif
+#include <string>
+#include "H5Cpp.h" // C++ API header file
+using namespace H5;
 
-#include "h5cpputil.h"  // C++ utilility header file
+#include "h5test.h"
+#include "h5cpputil.h" // C++ utilility header file
 
 const H5std_string FILENAME("tdatatransform.h5");
 
-static void test_transfplist()
+static void
+test_transfplist()
 {
-    const char* c_to_f = "(9/5.0)*x + 32";
-    const char* simple = "(4/2) * ( (2 + 4)/(5 - 2.5))"; /* this equals 4.8 */
+    const char *c_to_f = "(9/5.0)*x + 32";
+    const char *simple = "(4/2) * ( (2 + 4)/(5 - 2.5))"; /* this equals 4.8 */
     /* inverses the utrans transform in init_test to get back original array */
-    const char* utrans_inv = "(x/3)*4 - 100";
+    const char *utrans_inv = "(x/3)*4 - 100";
 
     SUBTEST("DSetMemXferPropList::set/getDataTransform()");
     try {
-	// Create various data set prop lists and set data transform expression.
-	DSetMemXferPropList dxpl_c_to_f(c_to_f);
-
-	DSetMemXferPropList dxpl_simple;
-	dxpl_simple.setDataTransform(simple);
-
-	DSetMemXferPropList dxpl_utrans_inv;
-	dxpl_utrans_inv.setDataTransform(utrans_inv);
-
-	//
-	// Make a copy of one of those prop lists then read the data transform
-	// expression and verify that it's the same as the original.
-	//
-
-	// Copy the prop list.
-	DSetMemXferPropList dxpl_c_to_f_copy;
-	dxpl_c_to_f_copy.copy(dxpl_c_to_f);
-
-	// Find out the length of the transform expression, allocate the buffer
-	// for it, then read and verify the expression from the copied plist
-	ssize_t tran_len = dxpl_c_to_f_copy.getDataTransform(NULL);
-	char *c_to_f_read = (char *)HDmalloc(tran_len+1);
-	HDmemset(c_to_f_read, 0, tran_len+1);
-	dxpl_c_to_f_copy.getDataTransform(c_to_f_read, tran_len+1);
-	verify_val((const char*)c_to_f_read, (const char*)c_to_f,
-		"DSetMemXferPropList::getDataTransform", __LINE__, __FILE__);
-	HDfree(c_to_f_read);
-
-	//
-	// Read the expression of each of the prop lists and verify the read
-	// expression
-	//
-
-	// Get and verify the expression with:
-	// ssize_t getDataTransform(char* exp, const size_t buf_size [default=0])
-	tran_len =  dxpl_c_to_f.getDataTransform(NULL);
-	c_to_f_read = (char *)HDmalloc(tran_len+1);
-	HDmemset(c_to_f_read, 0, tran_len+1);
-	dxpl_c_to_f.getDataTransform(c_to_f_read, tran_len+1);
-	verify_val((const char*)c_to_f_read, (const char*)c_to_f,
-		"DSetMemXferPropList::getDataTransform", __LINE__, __FILE__);
-	HDfree(c_to_f_read);
-
-	// Get and verify the expression with:
-	// H5std_string DSetMemXferPropList::getDataTransform()
-	H5std_string simple_read = dxpl_simple.getDataTransform();
-	verify_val((const char*)simple_read.c_str(), (const char*)simple,
-		"DSetMemXferPropList::getDataTransform", __LINE__, __FILE__);
-
-	// Get and verify the expression with:
-	// ssize_t getDataTransform(char* exp, const size_t buf_size)
-	tran_len = dxpl_utrans_inv.getDataTransform(NULL, 0);
-	char *utrans_inv_read = (char *)HDmalloc(tran_len+1);
-	HDmemset(utrans_inv_read, 0, tran_len+1);
-	dxpl_utrans_inv.getDataTransform(utrans_inv_read, tran_len+1);
-	verify_val((const char*)utrans_inv_read, (const char*)utrans_inv,
-		"DSetMemXferPropList::getDataTransform", __LINE__, __FILE__);
-	HDfree(utrans_inv_read);
-
-	PASSED();
+        // Create various data set prop lists and set data transform expression.
+        DSetMemXferPropList dxpl_c_to_f(c_to_f);
+
+        DSetMemXferPropList dxpl_simple;
+        dxpl_simple.setDataTransform(simple);
+
+        DSetMemXferPropList dxpl_utrans_inv;
+        dxpl_utrans_inv.setDataTransform(utrans_inv);
+
+        //
+        // Make a copy of one of those prop lists then read the data transform
+        // expression and verify that it's the same as the original.
+        //
+
+        // Copy the prop list.
+        DSetMemXferPropList dxpl_c_to_f_copy;
+        dxpl_c_to_f_copy.copy(dxpl_c_to_f);
+
+        // Find out the length of the transform expression, allocate the buffer
+        // for it, then read and verify the expression from the copied plist
+        size_t tran_len    = static_cast<size_t>(dxpl_c_to_f_copy.getDataTransform(NULL));
+        char  *c_to_f_read = static_cast<char *>(HDmalloc(tran_len + 1));
+        HDmemset(c_to_f_read, 0, tran_len + 1);
+        dxpl_c_to_f_copy.getDataTransform(c_to_f_read, tran_len + 1);
+        verify_val(const_cast<const char *>(c_to_f_read), const_cast<const char *>(c_to_f),
+                   "DSetMemXferPropList::getDataTransform", __LINE__, __FILE__);
+        HDfree(c_to_f_read);
+
+        //
+        // Read the expression of each of the prop lists and verify the read
+        // expression
+        //
+
+        // Get and verify the expression with:
+        // ssize_t getDataTransform(char* exp, const size_t buf_size [default=0])
+        tran_len    = static_cast<size_t>(dxpl_c_to_f.getDataTransform(NULL));
+        c_to_f_read = static_cast<char *>(HDmalloc(tran_len + 1));
+        HDmemset(c_to_f_read, 0, tran_len + 1);
+        dxpl_c_to_f.getDataTransform(c_to_f_read, tran_len + 1);
+        verify_val(const_cast<const char *>(c_to_f_read), const_cast<const char *>(c_to_f),
+                   "DSetMemXferPropList::getDataTransform", __LINE__, __FILE__);
+        HDfree(c_to_f_read);
+
+        // Get and verify the expression with:
+        // H5std_string DSetMemXferPropList::getDataTransform()
+        H5std_string simple_read = dxpl_simple.getDataTransform();
+        verify_val(const_cast<const char *>(simple_read.c_str()), const_cast<const char *>(simple),
+                   "DSetMemXferPropList::getDataTransform", __LINE__, __FILE__);
+
+        // Get and verify the expression with:
+        // ssize_t getDataTransform(char* exp, const size_t buf_size)
+        tran_len              = static_cast<size_t>(dxpl_utrans_inv.getDataTransform(NULL, 0));
+        char *utrans_inv_read = static_cast<char *>(HDmalloc(tran_len + 1));
+        HDmemset(utrans_inv_read, 0, tran_len + 1);
+        dxpl_utrans_inv.getDataTransform(utrans_inv_read, tran_len + 1);
+        verify_val(const_cast<const char *>(utrans_inv_read), const_cast<const char *>(utrans_inv),
+                   "DSetMemXferPropList::getDataTransform", __LINE__, __FILE__);
+        HDfree(utrans_inv_read);
+
+        PASSED();
     }
-    catch (Exception E) {
-	issue_fail_msg("test_transfplist", __LINE__, __FILE__, E.getCDetailMsg());
+    catch (Exception &E) {
+        issue_fail_msg("test_transfplist", __LINE__, __FILE__, E.getCDetailMsg());
     }
 }
 
-
-/****************************************************************
-**
-**  test_dsproplist(): Main dataset property list testing routine.
-**
-****************************************************************/
-#ifdef __cplusplus
-extern "C"
-#endif
-void test_dsproplist()
+/*-------------------------------------------------------------------------
+ * Function:    test_dsproplist
+ *
+ * Purpose      Main dataset property list testing routine
+ *
+ * Return       None
+ *-------------------------------------------------------------------------
+ */
+extern "C" void
+test_dsproplist()
 {
     // Output message about test being performed
     MESSAGE(5, ("Testing Generic Dataset Property Lists\n"));
 
     test_transfplist(); // test set/getDataTransform()
 
-}   // test_dsproplist()
-
-
-#ifdef __cplusplus
-extern "C"
-#endif
-void cleanup_dsproplist()
+} // test_dsproplist()
+
+/*-------------------------------------------------------------------------
+ * Function:    cleanup_dsproplist
+ *
+ * Purpose      Cleanup temporary test files
+ *
+ * Return       none
+ *-------------------------------------------------------------------------
+ */
+extern "C" void
+cleanup_dsproplist()
 {
     HDremove(FILENAME.c_str());
 }
diff --git a/c++/test/testhdf5.cpp b/c++/test/testhdf5.cpp
index 19b4f0d..518227d 100644
--- a/c++/test/testhdf5.cpp
+++ b/c++/test/testhdf5.cpp
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*****************************************************************************
@@ -28,90 +25,77 @@
    base functionality testing.
 
    EXTERNAL ROUTINES/VARIABLES:
-	TestInit(...) -- Initialize testing framework
-	TestInfo(...) -- Print test info
-	AddTest(...)  -- Setup a test function and add it to the list of tests
-	TestParseCmdLine(...) -- Parse command line arguments
-	PerformTests() -- Perform requested testing
-	GetTestSummary() -- Retrieve Summary request value
-	TestSummary() -- Display test summary
-	GetTestCleanup() -- Retrieve Cleanup request value
-	TestCleanup() -- Clean up files from testing
-	GetTestNumErrs() -- Retrieve the number of testing errors
+        TestInit(...) -- Initialize testing framework
+        TestInfo(...) -- Print test info
+        AddTest(...)  -- Setup a test function and add it to the list of tests
+        TestParseCmdLine(...) -- Parse command line arguments
+        PerformTests() -- Perform requested testing
+        GetTestSummary() -- Retrieve Summary request value
+        TestSummary() -- Display test summary
+        GetTestCleanup() -- Retrieve Cleanup request value
+        TestCleanup() -- Clean up files from testing
+        GetTestNumErrs() -- Retrieve the number of testing errors
 
  ***************************************************************************/
-
-#ifdef OLD_HEADER_FILENAME
-#include <iostream.h>
-#else
 #include <iostream>
-#endif
-#include <string>
-
-#ifndef H5_NO_NAMESPACE
-#ifndef H5_NO_STD
-    using std::cerr;
-    using std::endl;
-#endif  // H5_NO_STD
-#endif
+using std::cerr;
+using std::endl;
 
-#include "h5test.h"	// C test header file
-#include "H5Cpp.h"	// C++ API header file
-
-#ifndef H5_NO_NAMESPACE
-    using namespace H5;
-#endif  /* !H5_NO_NAMESPACE */
+#include <string>
+#include "H5Cpp.h" // C++ API header file
+using namespace H5;
 
-#include "h5cpputil.h"  // C++ utilility header file
+#include "h5test.h"
+#include "h5cpputil.h" // C++ utilility header file
 
 int
 main(int argc, char *argv[])
 {
-    try
-    {
-	// Turn of the auto-printing when failure occurs so that we can
-	// handle the errors appropriately since sometime failures are
-	// caused deliberately and expected.
-	Exception::dontPrint();
-	/* Initialize testing framework */
-	TestInit(argv[0], NULL, NULL);
-
-	// testing file creation and opening in tfile.cpp
-	AddTest("tfile", test_file, cleanup_file, "File I/O Operations", NULL);
-	// testing dataset functionalities in dset.cpp
-	AddTest("dsets", test_dset, cleanup_dsets, "Dataset I/O Operations", NULL);
-	// testing dataspace functionalities in th5s.cpp
-	AddTest("th5s",  test_h5s,  cleanup_h5s,  "Dataspaces", NULL);
-	// testing attribute functionalities in tattr.cpp
-	AddTest("tattr", test_attr, cleanup_attr,  "Attributes", NULL);
-	// testing object functionalities in tobject.cpp
-	AddTest("tobject", test_object, cleanup_object,  "Objects", NULL);
-	// testing reference functionalities in trefer.cpp
-	AddTest("trefer", test_reference, cleanup_reference,  "References", NULL);
-	// testing variable-length strings in tvlstr.cpp
-	AddTest("tvlstr", test_vlstrings, cleanup_vlstrings,  "Variable-Length Strings", NULL);
-	AddTest("ttypes", test_types, cleanup_types,  "Generic Data Types", NULL);
-	AddTest("tcompound", test_compound, cleanup_compound,  "Compound Data Types", NULL);
-	AddTest("tdspl", test_dsproplist, cleanup_dsproplist,  "Dataset Property List", NULL);
-	AddTest("tfilter", test_filters, cleanup_filters,  "Various Filters", NULL);
-	AddTest("tlinks", test_links, cleanup_links,  "Various Links", NULL);
-/* Comment out tests that are not done yet. - BMR, Feb 2001
-	AddTest("select", test_select, cleanup_select,  "Selections", NULL);
-	AddTest("time", test_time, cleanup_time,  "Time Datatypes", NULL);
-	AddTest("vltypes", test_vltypes, cleanup_vltypes,  "Variable-Length Datatypes", NULL);
-	AddTest("iterate", test_iterate, cleanup_iterate,  "Group & Attribute Iteration", NULL);
-	AddTest("array", test_array, cleanup_array,  "Array Datatypes", NULL);
-	AddTest("genprop", test_genprop, cleanup_genprop,  "Generic Properties", NULL);
-	AddTest("id", test_ids, NULL,  "User-Created Identifiers", NULL);
-
-Comment out tests that are not done yet */
-
-/* Tentative - BMR 2007/1/12
-	AddTest("enum", test_enum, cleanup_enum,  "Enum Data Types", NULL);
-*/
+    try {
+        // Turn of the auto-printing when failure occurs so that we can
+        // handle the errors appropriately since sometime failures are
+        // caused deliberately and expected.
+        Exception::dontPrint();
+        /* Initialize testing framework */
+        TestInit(argv[0], NULL, NULL);
+
+        // testing file creation and opening in tfile.cpp
+        AddTest("tfile", test_file, cleanup_file, "File I/O Operations", NULL);
+        // testing dataset functionalities in dset.cpp
+        AddTest("dsets", test_dset, cleanup_dsets, "Dataset I/O Operations", NULL);
+        // testing dataspace functionalities in th5s.cpp
+        AddTest("th5s", test_h5s, cleanup_h5s, "Dataspaces", NULL);
+        // testing attribute functionalities in tattr.cpp
+        AddTest("tattr", test_attr, cleanup_attr, "Attributes", NULL);
+        // testing object functionalities in tobject.cpp
+        AddTest("tobject", test_object, cleanup_object, "Objects", NULL);
+        // testing reference functionalities in trefer.cpp
+        AddTest("trefer", test_reference, cleanup_reference, "References", NULL);
+        // testing variable-length strings in tvlstr.cpp
+        AddTest("tvlstr", test_vlstrings, cleanup_vlstrings, "Variable-Length Strings", NULL);
+        AddTest("ttypes", test_types, cleanup_types, "Generic Data Types", NULL);
+        AddTest("tarray", test_array, cleanup_array, "Array Datatypes", NULL);
+        AddTest("tcompound", test_compound, cleanup_compound, "Compound Data Types", NULL);
+        AddTest("tdspl", test_dsproplist, cleanup_dsproplist, "Dataset Property List", NULL);
+        AddTest("tfilter", test_filters, cleanup_filters, "Various Filters", NULL);
+        AddTest("tlinks", test_links, cleanup_links, "Various Links", NULL);
+        /* Comment out tests that are not done yet. - BMR, Feb 2001
+                AddTest("select", test_select, cleanup_select,  "Selections", NULL);
+                AddTest("time", test_time, cleanup_time,  "Time Datatypes", NULL);
+                AddTest("vltypes", test_vltypes, cleanup_vltypes,  "Variable-Length Datatypes", NULL);
+        */
+        AddTest("iterate", test_iterate, cleanup_iterate, "Group & Attribute Iteration", NULL);
+        /*
+                AddTest("genprop", test_genprop, cleanup_genprop,  "Generic Properties", NULL);
+                AddTest("id", test_ids, NULL,  "User-Created Identifiers", NULL);
+
+        Comment out tests that are not done yet */
+
+        /* Tentative - BMR 2007/1/12
+                AddTest("enum", test_enum, cleanup_enum,  "Enum Data Types", NULL);
+        */
     }
-    catch (Exception E)
-    {
+    catch (Exception &E) {
         issue_fail_msg("Tests failed", __LINE__, __FILE__, E.getCDetailMsg());
     }
 
@@ -119,7 +103,7 @@ Comment out tests that are not done yet */
     TestInfo(argv[0]);
 
     /* Parse command line arguments */
-    TestParseCmdLine(argc,argv);
+    TestParseCmdLine(argc, argv);
 
     /* Perform requested testing */
     PerformTests();
@@ -129,8 +113,11 @@ Comment out tests that are not done yet */
         TestSummary();
 
     /* Clean up test files, if allowed */
-    if (GetTestCleanup() && !getenv("HDF5_NOCLEANUP"))
+    if (GetTestCleanup() && !getenv(HDF5_NOCLEANUP))
         TestCleanup();
 
+    /* Release test infrastructure */
+    TestShutdown();
+
     return (GetTestNumErrs());
 }
diff --git a/c++/test/tfile.cpp b/c++/test/tfile.cpp
index ad5e6fc..5677449 100644
--- a/c++/test/tfile.cpp
+++ b/c++/test/tfile.cpp
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*****************************************************************************
@@ -22,75 +19,63 @@
         h5_fileaccess() -- in h5test.c, returns a file access template
 
  ***************************************************************************/
-
-#ifdef OLD_HEADER_FILENAME
-#include <iostream.h>
-#else
 #include <iostream>
-#endif
-#include <string>
-
-#ifndef H5_NO_NAMESPACE
-#ifndef H5_NO_STD
-    using std::cerr;
-    using std::endl;
-#endif  // H5_NO_STD
-#endif
+using std::cerr;
+using std::endl;
 
-#include "H5Cpp.h"	// C++ API header file
-
-#ifndef H5_NO_NAMESPACE
-    using namespace H5;
-#endif
+#include <string>
+#include "H5Cpp.h" // C++ API header file
+using namespace H5;
+
+#include "h5test.h"
+#include "h5cpputil.h" // C++ utilility header file
+
+const hsize_t      F1_USERBLOCK_SIZE = 0;
+const size_t       F1_OFFSET_SIZE    = sizeof(haddr_t);
+const size_t       F1_LENGTH_SIZE    = sizeof(hsize_t);
+const unsigned     F1_SYM_LEAF_K     = 4;
+const unsigned     F1_SYM_INTERN_K   = 16;
+const H5std_string FILE1("tfile1.h5");
+
+const hsize_t      F2_USERBLOCK_SIZE = 512;
+const size_t       F2_OFFSET_SIZE    = 8;
+const size_t       F2_LENGTH_SIZE    = 8;
+const unsigned     F2_SYM_LEAF_K     = 8;
+const unsigned     F2_SYM_INTERN_K   = 32;
+const unsigned     F2_ISTORE         = 64;
+const H5std_string FILE2("tfile2.h5");
+
+const hsize_t      F3_USERBLOCK_SIZE = 0;
+const size_t       F3_OFFSET_SIZE    = F2_OFFSET_SIZE;
+const size_t       F3_LENGTH_SIZE    = F2_LENGTH_SIZE;
+const unsigned     F3_SYM_LEAF_K     = F2_SYM_LEAF_K;
+const unsigned     F3_SYM_INTERN_K   = F2_SYM_INTERN_K;
+const H5std_string FILE3("tfile3.h5");
+
+const int          KB = 1024;
+const H5std_string FILE4("tfile4.h5");
 
-#include "h5cpputil.h"	// C++ utilility header file
-
-const hsize_t F1_USERBLOCK_SIZE = (hsize_t)0;
-const size_t F1_OFFSET_SIZE = sizeof(haddr_t);
-const size_t F1_LENGTH_SIZE = sizeof(hsize_t);
-const unsigned F1_SYM_LEAF_K  = 4;
-const unsigned F1_SYM_INTERN_K = 16;
-const H5std_string    FILE1("tfile1.h5");
-
-const hsize_t F2_USERBLOCK_SIZE = (hsize_t)512;
-const size_t F2_OFFSET_SIZE = 8;
-const size_t F2_LENGTH_SIZE = 8;
-const unsigned F2_SYM_LEAF_K  = 8;
-const unsigned F2_SYM_INTERN_K = 32;
-const H5std_string    FILE2("tfile2.h5");
-
-const hsize_t F3_USERBLOCK_SIZE = (hsize_t)0;
-const size_t F3_OFFSET_SIZE = F2_OFFSET_SIZE;
-const size_t F3_LENGTH_SIZE = F2_LENGTH_SIZE;
-const unsigned F3_SYM_LEAF_K  = F2_SYM_LEAF_K;
-const unsigned F3_SYM_INTERN_K = F2_SYM_INTERN_K;
-const H5std_string    FILE3("tfile3.h5");
-
-const int KB =  1024;
-const H5std_string    FILE4("tfile4.h5");
-
-
 /*-------------------------------------------------------------------------
  * Function:    test_file_create
  *
- * Purpose:     Test file and template creations
+ * Purpose      Test file and template creations
  *
- * Return:      None
+ * Return       None
  *
- * Programmer:  Binh-Minh Ribler (use C version)
+ * Programmer   Binh-Minh Ribler (use C version)
  *              January, 2001
  *
  * Modifications:
- *	January, 2005: C tests' macro VERIFY casts values to 'long' for all
- *		       cases.  Since there are no operator<< for 'long long'
- *		       or int64 in VS C++ ostream, I casted the hsize_t values
- *		       passed to verify_val to 'long' as well.  If problems
- *		       arises later, this will have to be specificly handled
- *		       with a special routine.
- *
+ *        January, 2005: C tests' macro VERIFY casts values to 'long' for all
+ *                     cases.  Since there are no operator<< for 'long long'
+ *                     or int64 in VS C++ ostream, I casted the hsize_t values
+ *                     passed to verify_val to 'long' as well.  If problems
+ *                     arises later, this will have to be specifically handled
+ *                     with a special routine.
  *-------------------------------------------------------------------------
  */
-static void test_file_create()
+static void
+test_file_create()
 {
     // Output message about test being performed
     SUBTEST("File Creation I/O");
@@ -103,262 +88,283 @@ static void test_file_create()
     remove(FILE1.c_str());
 
     // Setting this to NULL for cleaning up in failure situations
-    H5File* file1 = NULL;
+    H5File *file1 = NULL;
     try {
-	// Create file FILE1
-	file1 = new H5File (FILE1, H5F_ACC_EXCL);
-
-	// Try to create the same file with H5F_ACC_TRUNC. This should fail
-	// because file1 is the same file and is currently open. Skip it on
-	// OpenVMS because it creates another version of the file.
-#ifndef H5_HAVE_FILE_VERSIONS
-	try {
-	    H5File file2 (FILE1, H5F_ACC_TRUNC);  // should throw E
-
-	    // Should FAIL but didn't, so throw an invalid action exception
-	    throw InvalidActionException("H5File constructor", "Attempted to create an existing file.");
-	}
-	catch( FileIException E ) // catch truncating existing file
-	{} // do nothing, FAIL expected
-#endif // H5_HAVE_FILE_VERSIONS
-
-	// Close file1
-	delete file1;
-	file1 = NULL;
-
-	// Try again with H5F_ACC_EXCL. This should fail because the file
-	// already exists from the previous steps.
-	try {
-	    H5File file2(FILE1, H5F_ACC_EXCL);  // should throw E
-
-	    // Should FAIL but didn't, so throw an invalid action exception
-	    throw InvalidActionException("H5File constructor", "File already exists.");
-	}
-	catch( FileIException E ) // catching creating existing file
-	{} // do nothing, FAIL expected
-
-    	// Test create with H5F_ACC_TRUNC. This will truncate the existing file.
-	file1 = new H5File (FILE1, H5F_ACC_TRUNC);
-
-	// Try to create first file again. This should fail because file1
-	// is the same file and is currently open. Skip it on OpenVMS because
-	// it creates another version of the file.
-#ifndef H5_HAVE_FILE_VERSIONS
-    	try {
-	    H5File file2 (FILE1, H5F_ACC_TRUNC);   // should throw E
-
-	    // Should FAIL but didn't, so throw an invalid action exception
-	    throw InvalidActionException("H5File constructor", "H5F_ACC_TRUNC attempt on an opened file.");
-	}
-	catch( FileIException E ) // catching truncating opened file
-	{} // do nothing, FAIL expected
-
-     	// Try with H5F_ACC_EXCL. This should fail too because the file already
-     	// exists. Skip it on OpenVMS because it creates another version of the file.
-    	try {
-	    H5File file3 (FILE1, H5F_ACC_EXCL);  // should throw E
-
-	    // Should FAIL but didn't, so throw an invalid action exception
-	    throw InvalidActionException("H5File constructor", "H5F_ACC_EXCL attempt on an existing file.");
-    	}
-	catch( FileIException E ) // catching H5F_ACC_EXCL on existing file
-	{} // do nothing, FAIL expected
-#endif /*H5_HAVE_FILE_VERSIONS*/
-
-    	// Get the file-creation template
-	FileCreatPropList tmpl1 = file1->getCreatePlist();
-
-	hsize_t ublock = tmpl1.getUserblock();
-	verify_val((long)ublock, (long)F1_USERBLOCK_SIZE, "FileCreatPropList::getUserblock", __LINE__, __FILE__);
-
-    	size_t  parm1, parm2;		// file-creation parameters
-	tmpl1.getSizes( parm1, parm2);
-	verify_val(parm1, F1_OFFSET_SIZE, "FileCreatPropList::getSizes", __LINE__, __FILE__);
-	verify_val(parm2, F1_LENGTH_SIZE, "FileCreatPropList::getSizes", __LINE__, __FILE__);
-
-        unsigned  iparm1,iparm2;        // file-creation parameters
-        tmpl1.getSymk( iparm1, iparm2);
+        // Create file FILE1
+        file1 = new H5File(FILE1, H5F_ACC_EXCL);
+
+        // Try to create the same file with H5F_ACC_TRUNC. This should fail
+        // because file1 is the same file and is currently open.
+        try {
+            H5File file2(FILE1, H5F_ACC_TRUNC); // should throw E
+
+            // Should FAIL but didn't, so throw an invalid action exception
+            throw InvalidActionException("H5File constructor", "Attempted to create an existing file.");
+        }
+        catch (FileIException &E) // catch truncating existing file
+        {
+        } // do nothing, FAIL expected
+
+        // Close file1
+        delete file1;
+        file1 = NULL;
+
+        // Try again with H5F_ACC_EXCL. This should fail because the file
+        // already exists from the previous steps.
+        try {
+            H5File file2(FILE1, H5F_ACC_EXCL); // should throw E
+
+            // Should FAIL but didn't, so throw an invalid action exception
+            throw InvalidActionException("H5File constructor", "File already exists.");
+        }
+        catch (FileIException &E) // catching creating existing file
+        {
+        } // do nothing, FAIL expected
+
+        // Test create with H5F_ACC_TRUNC. This will truncate the existing file.
+        file1 = new H5File(FILE1, H5F_ACC_TRUNC);
+
+        // Try to create first file again. This should fail because file1
+        // is the same file and is currently open.
+        try {
+            H5File file2(FILE1, H5F_ACC_TRUNC); // should throw E
+
+            // Should FAIL but didn't, so throw an invalid action exception
+            throw InvalidActionException("H5File constructor", "H5F_ACC_TRUNC attempt on an opened file.");
+        }
+        catch (FileIException &E) // catching truncating opened file
+        {
+        } // do nothing, FAIL expected
+
+        // Try with H5F_ACC_EXCL. This should fail too because the file already
+        // exists.
+        try {
+            H5File file3(FILE1, H5F_ACC_EXCL); // should throw E
+
+            // Should FAIL but didn't, so throw an invalid action exception
+            throw InvalidActionException("H5File constructor", "H5F_ACC_EXCL attempt on an existing file.");
+        }
+        catch (FileIException &E) // catching H5F_ACC_EXCL on existing file
+        {
+        } // do nothing, FAIL expected
+
+        // Get the file-creation template
+        FileCreatPropList tmpl1 = file1->getCreatePlist();
+
+        hsize_t ublock = tmpl1.getUserblock();
+        verify_val(static_cast<long>(ublock), static_cast<long>(F1_USERBLOCK_SIZE),
+                   "FileCreatPropList::getUserblock", __LINE__, __FILE__);
+
+        size_t parm1, parm2; // file-creation parameters
+        tmpl1.getSizes(parm1, parm2);
+        verify_val(parm1, F1_OFFSET_SIZE, "FileCreatPropList::getSizes", __LINE__, __FILE__);
+        verify_val(parm2, F1_LENGTH_SIZE, "FileCreatPropList::getSizes", __LINE__, __FILE__);
+
+        unsigned iparm1, iparm2; // file-creation parameters
+        tmpl1.getSymk(iparm1, iparm2);
         verify_val(iparm1, F1_SYM_INTERN_K, "FileCreatPropList::getSymk", __LINE__, __FILE__);
         verify_val(iparm2, F1_SYM_LEAF_K, "FileCreatPropList::getSymk", __LINE__, __FILE__);
 
-	// tmpl1 is automatically closed; if error occurs, it'll be
-	// caught in the catch block
+        // tmpl1 is automatically closed; if error occurs, it'll be
+        // caught in the catch block
 
-	// Close first file
-	delete file1;
+        // Close first file
+        delete file1;
     }
-    catch (InvalidActionException E)
-    {
+    catch (InvalidActionException &E) {
         cerr << " *FAILED*" << endl;
         cerr << "    <<<  " << E.getDetailMsg() << "  >>>" << endl << endl;
-        if (file1 != NULL) // clean up
-            delete file1;
+        // clean up
+        delete file1;
     }
     // catch all other exceptions
-    catch (Exception E)
-    {
-	issue_fail_msg("test_file_create()", __LINE__, __FILE__, E.getCDetailMsg());
-        if (file1 != NULL) // clean up
-            delete file1;
+    catch (Exception &E) {
+        issue_fail_msg("test_file_create()", __LINE__, __FILE__, E.getCDetailMsg());
+        // clean up
+        delete file1;
     }
 
     // Setting this to NULL for cleaning up in failure situations
-    FileCreatPropList* tmpl1 = NULL;
-    try
-    {
-    	// Create a new file with a non-standard file-creation template
-	tmpl1 = new FileCreatPropList;
-
-    	// Set the new file-creation parameters
-	tmpl1->setUserblock (F2_USERBLOCK_SIZE);
-	tmpl1->setSizes( F2_OFFSET_SIZE, F2_LENGTH_SIZE );
-	tmpl1->setSymk( F2_SYM_INTERN_K, F2_SYM_LEAF_K );
-
-     	// Try to create second file, with non-standard file-creation template
-     	// params.
-	H5File file2( FILE2, H5F_ACC_TRUNC, *tmpl1 );
-
-    	// Release file-creation template
-	delete tmpl1;
-	tmpl1 = NULL;
-
-	// Get the file-creation template
-	tmpl1 = new FileCreatPropList (file2.getCreatePlist());
-
-	// Get the file-creation parameters
-	hsize_t ublock = tmpl1->getUserblock();
-	verify_val((long)ublock, (long)F2_USERBLOCK_SIZE, "FileCreatPropList::getUserblock", __LINE__, __FILE__);
-
-    	size_t  parm1, parm2;		// file-creation parameters
-	tmpl1->getSizes( parm1, parm2);
-	verify_val(parm1, F2_OFFSET_SIZE, "FileCreatPropList::getSizes", __LINE__, __FILE__);
-	verify_val(parm2, F2_LENGTH_SIZE, "FileCreatPropList::getSizes", __LINE__, __FILE__);
-
-        unsigned  iparm1,iparm2;	// file-creation parameters
-        tmpl1->getSymk( iparm1, iparm2);
+    FileCreatPropList *tmpl1 = NULL;
+    try {
+        // Create a new file with a non-standard file-creation template
+        tmpl1 = new FileCreatPropList;
+
+        // Set the new file-creation parameters
+        tmpl1->setUserblock(F2_USERBLOCK_SIZE);
+        tmpl1->setSizes(F2_OFFSET_SIZE, F2_LENGTH_SIZE);
+        tmpl1->setSymk(F2_SYM_INTERN_K, F2_SYM_LEAF_K);
+
+        // Try to create second file, with non-standard file-creation template
+        // params.
+        H5File file2(FILE2, H5F_ACC_TRUNC, *tmpl1);
+
+        // Release file-creation template
+        delete tmpl1;
+        tmpl1 = NULL;
+
+        // Get the file-creation template
+        tmpl1 = new FileCreatPropList(file2.getCreatePlist());
+
+        // Get the file-creation parameters
+        hsize_t ublock = tmpl1->getUserblock();
+        verify_val(static_cast<long>(ublock), static_cast<long>(F2_USERBLOCK_SIZE),
+                   "FileCreatPropList::getUserblock", __LINE__, __FILE__);
+
+        size_t parm1, parm2; // file-creation parameters
+        tmpl1->getSizes(parm1, parm2);
+        verify_val(parm1, F2_OFFSET_SIZE, "FileCreatPropList::getSizes", __LINE__, __FILE__);
+        verify_val(parm2, F2_LENGTH_SIZE, "FileCreatPropList::getSizes", __LINE__, __FILE__);
+
+        unsigned iparm1, iparm2; // file-creation parameters
+        tmpl1->getSymk(iparm1, iparm2);
         verify_val(iparm1, F2_SYM_INTERN_K, "FileCreatPropList::getSymk", __LINE__, __FILE__);
         verify_val(iparm2, F2_SYM_LEAF_K, "FileCreatPropList::getSymk", __LINE__, __FILE__);
 
-	// Clone the file-creation template
-	FileCreatPropList tmpl2;
-	tmpl2.copy (*tmpl1);
+        // Clone the file-creation template
+        FileCreatPropList tmpl2;
+        tmpl2.copy(*tmpl1);
 
-	// Release file-creation template
-	delete tmpl1;
-	tmpl1 = NULL;
+        // Release file-creation template
+        delete tmpl1;
+        tmpl1 = NULL;
 
-	// Set the new file-creation parameter
-	tmpl2.setUserblock( F3_USERBLOCK_SIZE );
+        // Set the new file-creation parameter
+        tmpl2.setUserblock(F3_USERBLOCK_SIZE);
 
-	// Try to create second file, with non-standard file-creation template
-	// params
-	H5File file3( FILE3, H5F_ACC_TRUNC, tmpl2 );
+        // Try to create second file, with non-standard file-creation template
+        // params
+        H5File file3(FILE3, H5F_ACC_TRUNC, tmpl2);
 
-	// Get the file-creation template
-	tmpl1 = new FileCreatPropList (file3.getCreatePlist());
+        // Get the file-creation template
+        tmpl1 = new FileCreatPropList(file3.getCreatePlist());
 
-	// Get the file-creation parameters
-	ublock = tmpl1->getUserblock();
-	verify_val((long)ublock, (long)F3_USERBLOCK_SIZE, "FileCreatPropList::getUserblock", __LINE__, __FILE__);
+        // Get the file-creation parameters
+        ublock = tmpl1->getUserblock();
+        verify_val(static_cast<long>(ublock), static_cast<long>(F3_USERBLOCK_SIZE),
+                   "FileCreatPropList::getUserblock", __LINE__, __FILE__);
 
-	tmpl1->getSizes( parm1, parm2);
-	verify_val(parm1, F3_OFFSET_SIZE, "FileCreatPropList::getSizes", __LINE__, __FILE__);
-	verify_val(parm2, F3_LENGTH_SIZE, "FileCreatPropList::getSizes", __LINE__, __FILE__);
+        tmpl1->getSizes(parm1, parm2);
+        verify_val(parm1, F3_OFFSET_SIZE, "FileCreatPropList::getSizes", __LINE__, __FILE__);
+        verify_val(parm2, F3_LENGTH_SIZE, "FileCreatPropList::getSizes", __LINE__, __FILE__);
 
-    	tmpl1->getSymk( iparm1, iparm2);
-	verify_val(iparm1, F3_SYM_INTERN_K, "FileCreatPropList::getSymk", __LINE__, __FILE__);
-	verify_val(iparm2, F3_SYM_LEAF_K, "FileCreatPropList::getSymk", __LINE__, __FILE__);
+        tmpl1->getSymk(iparm1, iparm2);
+        verify_val(iparm1, F3_SYM_INTERN_K, "FileCreatPropList::getSymk", __LINE__, __FILE__);
+        verify_val(iparm2, F3_SYM_LEAF_K, "FileCreatPropList::getSymk", __LINE__, __FILE__);
 
-	// Release file-creation template
-	delete tmpl1;
-	PASSED();
+        // Release file-creation template
+        delete tmpl1;
+        PASSED();
     }
     // catch all exceptions
-    catch (Exception E)
-    {
-	issue_fail_msg("test_file_create()", __LINE__, __FILE__, E.getCDetailMsg());
-	if (tmpl1 != NULL)  // clean up
-	    delete tmpl1;
+    catch (Exception &E) {
+        issue_fail_msg("test_file_create()", __LINE__, __FILE__, E.getCDetailMsg());
+        // clean up
+        delete tmpl1;
     }
-}   // test_file_create()
+} // test_file_create()
 
-
 /*-------------------------------------------------------------------------
  * Function:    test_file_open
  *
- * Purpose:     Test file accesses
+ * Purpose      Test file accesses
  *
- * Return:      None
+ * Return       None
  *
- * Programmer:  Binh-Minh Ribler (use C version)
+ * Programmer   Binh-Minh Ribler (use C version)
  *              January, 2001
  *
  * Modifications:
- *	January, 2005: C tests' macro VERIFY casts values to 'long' for all
- *		       cases.  Since there are no operator<< for 'long long'
- *		       or int64 in VS C++ ostream, I casted the hsize_t values
- *		       passed to verify_val to 'long' as well.  If problems
- *		       arises later, this will have to be specificly handled
- *		       with a special routine.
- *
+ *        January, 2005: C tests' macro VERIFY casts values to 'long' for all
+ *                     cases.  Since there are no operator<< for 'long long'
+ *                     or int64 in VS C++ ostream, I casted the hsize_t values
+ *                     passed to verify_val to 'long' as well.  If problems
+ *                     arises later, this will have to be specifically handled
+ *                     with a special routine.
  *-------------------------------------------------------------------------
  */
-static void test_file_open()
+static void
+test_file_open()
 {
     // Output message about test being performed
     SUBTEST("File Opening I/O");
 
     try {
 
-	// Open first file
-	H5File file1 (FILE2, H5F_ACC_RDWR );
+        // Open first file
+        H5File file1(FILE2, H5F_ACC_RDWR);
 
-	// Get the file-creation template
-	FileCreatPropList tmpl1 = file1.getCreatePlist();
+        // Get the file-creation template
+        FileCreatPropList tmpl1 = file1.getCreatePlist();
 
-	// Get the file-creation parameters
-	hsize_t ublock = tmpl1.getUserblock();
-	verify_val((long)ublock, (long)F2_USERBLOCK_SIZE, "FileCreatPropList::getUserblock", __LINE__, __FILE__);
+        // Get the file-creation parameters
+        hsize_t ublock = tmpl1.getUserblock();
+        verify_val(static_cast<long>(ublock), static_cast<long>(F2_USERBLOCK_SIZE),
+                   "FileCreatPropList::getUserblock", __LINE__, __FILE__);
 
-    	size_t  parm1, parm2;		// file-creation parameters
-	tmpl1.getSizes( parm1, parm2);
-	verify_val(parm1, F2_OFFSET_SIZE, "FileCreatPropList::getSizes", __LINE__, __FILE__);
-	verify_val(parm2, F2_LENGTH_SIZE, "FileCreatPropList::getSizes", __LINE__, __FILE__);
+        size_t parm1, parm2; // file-creation parameters
+        tmpl1.getSizes(parm1, parm2);
+        verify_val(parm1, F2_OFFSET_SIZE, "FileCreatPropList::getSizes", __LINE__, __FILE__);
+        verify_val(parm2, F2_LENGTH_SIZE, "FileCreatPropList::getSizes", __LINE__, __FILE__);
 
-        unsigned  iparm1,iparm2;       // file-creation parameters
-        tmpl1.getSymk( iparm1, iparm2);
+        unsigned iparm1, iparm2; // file-creation parameters
+        tmpl1.getSymk(iparm1, iparm2);
         verify_val(iparm1, F2_SYM_INTERN_K, "FileCreatPropList::getSymk", __LINE__, __FILE__);
         verify_val(iparm2, F2_SYM_LEAF_K, "FileCreatPropList::getSymk", __LINE__, __FILE__);
 
-	PASSED();
-    }   // end of try block
+        // Test H5File constructor with existing file id
+        H5File file2(file1.getId());
+        file1.close();
+
+        // Try truncating the file, and it should fail because the file is
+        // still opened with file2.
+        try {
+            H5File file3(FILE2, H5F_ACC_TRUNC); // should throw E
+
+            // Should FAIL but didn't, so throw an invalid action exception
+            throw InvalidActionException("H5File constructor", "Attempt truncating an opened file.");
+        }
+        catch (FileIException &E) // catching H5F_ACC_TRUNC on opened file
+        {
+        } // do nothing, FAIL expected
+
+        // Now, really close the file.
+        file2.close();
 
-    catch( Exception E ) {
+        // Truncating should succeed now.
+        H5File file3(FILE2, H5F_ACC_TRUNC);
+
+        // Opening another file to file3 object, FILE2 should be closed, so
+        // the next attempt to truncate FILE2 should succeed.
+        file3.openFile(FILE1, H5F_ACC_RDONLY);
+        H5File file4(FILE2, H5F_ACC_TRUNC);
+
+        PASSED();
+    } // end of try block
+
+    catch (Exception &E) {
         issue_fail_msg("test_file_open()", __LINE__, __FILE__, E.getCDetailMsg());
     }
-}   // test_file_open()
+} // test_file_open()
 
-
 /*-------------------------------------------------------------------------
  * Function:    test_file_size
  *
- * Purpose:     Test file size.
+ * Purpose      Test file size.
  *
- * Return:      None
+ * Return       None
  *
- * Programmer:  Raymond Lu
+ * Programmer   Raymond Lu
  *              June, 2004
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
-static void test_file_size()
+static void
+test_file_size()
 {
     // Output message about test being performed
     SUBTEST("File Size");
 
-    hid_t	fapl_id;
+    hid_t fapl_id;
     fapl_id = h5_fileaccess(); // in h5test.c, returns a file access template
 
     try {
@@ -366,63 +372,120 @@ static void test_file_size()
         // list object to pass in H5File::H5File
         FileAccPropList fapl(fapl_id);
 
-    	// Set to sec2 driver.  Do we want to test other file drivers?
+        // Set to sec2 driver.  Do we want to test other file drivers?
         // They're not tested in C++.
         // File drivers seem not implemented.
-	// fapl.setSec2();
+        // fapl.setSec2();
 
         // Create a file
-	H5File file4( FILE4, H5F_ACC_TRUNC, FileCreatPropList::DEFAULT, fapl);
+        H5File file4(FILE4, H5F_ACC_TRUNC, FileCreatPropList::DEFAULT, fapl);
 
         // Get file size
         hsize_t file_size = file4.getFileSize();
 
         // Check if file size is reasonable.  It's supposed to be 2KB now.
-        if (file_size < 1*KB || file_size > 4*KB)
-            issue_fail_msg("test_file_size()", __LINE__, __FILE__, "getFileSize() returned unreasonable value");
+        if (file_size < 1 * KB || file_size > 4 * KB)
+            issue_fail_msg("test_file_size()", __LINE__, __FILE__,
+                           "getFileSize() returned unreasonable value");
 
-	// Get the amount of free space in the file
-	hssize_t free_space = file4.getFreeSpace();
+        // Get the amount of free space in the file
+        hssize_t free_space = file4.getFreeSpace();
 
-	// Check if it's reasonable.  It's 0 now.
-	if (free_space < 0 || free_space > 4*KB)
-	    issue_fail_msg("test_file_size()", __LINE__, __FILE__, "getFreeSpace returned unreasonable value");
+        // Check if it's reasonable.  It's 0 now.
+        if (free_space < 0 || free_space > 4 * KB)
+            issue_fail_msg("test_file_size()", __LINE__, __FILE__,
+                           "getFreeSpace returned unreasonable value");
 
-	PASSED();
-    }   // end of try block
+        PASSED();
+    } // end of try block
 
-    catch( Exception E ) {
+    catch (Exception &E) {
         issue_fail_msg("test_file_size()", __LINE__, __FILE__, E.getCDetailMsg());
     }
 
     // use C test utility routine to close property list.
-    H5Pclose(fapl_id);
+    herr_t ret = H5Pclose(fapl_id);
+    if (ret < 0)
+        issue_fail_msg("test_file_size()", __LINE__, __FILE__, "H5Pclose failed");
 
-}   // test_file_size()
+} // test_file_size()
 
-
 /*-------------------------------------------------------------------------
- * Function:    test_file_name
+ * Function:    test_file_num
  *
- * Purpose:     Test getting file's name.
+ * Purpose      Test file number.
  *
- * Return:      None
+ * Return       None
  *
- * Programmer:  Binh-Minh Ribler
- *              July, 2004
+ * Programmer   Quincey Koziol
+ *              April, 2019
+ *-------------------------------------------------------------------------
+ */
+static void
+test_file_num()
+{
+    // Output message about test being performed
+    SUBTEST("File Number");
+
+    hid_t fapl_id;
+    fapl_id = h5_fileaccess(); // in h5test.c, returns a file access template
+
+    try {
+        // Use the file access template id to create a file access prop.
+        // list object to pass in H5File::H5File
+        FileAccPropList fapl(fapl_id);
+
+        // Create two files
+        H5File file1(FILE1, H5F_ACC_TRUNC, FileCreatPropList::DEFAULT, fapl);
+        H5File file2(FILE2, H5F_ACC_TRUNC, FileCreatPropList::DEFAULT, fapl);
+
+        // Open the first file again
+        H5File file3(FILE1, H5F_ACC_RDWR);
+
+        // Get file numbers
+        unsigned long file_num1 = file1.getFileNum();
+        unsigned long file_num2 = file2.getFileNum();
+        unsigned long file_num3 = file3.getFileNum();
+
+        // Check file numbers
+        if (file_num1 == file_num2)
+            issue_fail_msg("test_file_num()", __LINE__, __FILE__, "getFileNum() returned wrong value");
+        if (file_num1 != file_num3)
+            issue_fail_msg("test_file_num()", __LINE__, __FILE__, "getFileNum() returned wrong value");
+
+        PASSED();
+    } // end of try block
+
+    catch (Exception &E) {
+        issue_fail_msg("test_file_num()", __LINE__, __FILE__, E.getCDetailMsg());
+    }
+
+    // use C test utility routine to close property list.
+    herr_t ret = H5Pclose(fapl_id);
+    if (ret < 0)
+        issue_fail_msg("test_file_num()", __LINE__, __FILE__, "H5Pclose failed");
+
+} // test_file_num()
+
+/*-------------------------------------------------------------------------
+ * Function:    test_file_name
  *
- * Modifications:
+ * Purpose      Test getting file's name.
  *
+ * Return       None
+ *
+ * Programmer   Binh-Minh Ribler
+ *              July, 2004
  *-------------------------------------------------------------------------
  */
-const int	RANK = 2;
-const int	NX = 4;
-const int	NY = 5;
-const H5std_string	GROUPNAME ("group");
-const H5std_string	DSETNAME ("dataset");
-const H5std_string	DATTRNAME ("dataset attribute");
-const H5std_string	FATTRNAME ("file attribute");
-const H5std_string	DTYPENAME ("compound");
+const int          RANK = 2;
+const int          NX   = 4;
+const int          NY   = 5;
+const H5std_string GROUPNAME("group");
+const H5std_string DSETNAME("dataset");
+const H5std_string DATTRNAME("dataset attribute");
+const H5std_string FATTRNAME("file attribute");
+const H5std_string DTYPENAME("compound");
 
 // Compound datatype
 typedef struct s1_t {
@@ -430,7 +493,8 @@ typedef struct s1_t {
     float        b;
 } s1_t;
 
-static void test_file_name()
+static void
+test_file_name()
 {
     // Output message about test being performed.
     SUBTEST("File Name");
@@ -438,70 +502,77 @@ static void test_file_name()
     H5std_string file_name;
     try {
         // Create a file using default properties.
-	H5File file4(FILE4, H5F_ACC_TRUNC);
+        H5File file4(FILE4, H5F_ACC_TRUNC);
 
         // Get file name from the file instance.
         file_name = file4.getFileName();
-	verify_val(file_name, FILE4, "H5File::getFileName", __LINE__, __FILE__);
+        verify_val(file_name, FILE4, "H5File::getFileName", __LINE__, __FILE__);
 
-	// Create a group in the root group.
-	Group group(file4.createGroup(GROUPNAME, 0));
+        // Create a group in the root group.
+        Group group(file4.createGroup(GROUPNAME, 0));
 
-	// Get and verify file name via a group.
-	file_name = group.getFileName();
-	verify_val(file_name, FILE4, "Group::getFileName", __LINE__, __FILE__);
+        // Get and verify file name via a group.
+        file_name = group.getFileName();
+        verify_val(file_name, FILE4, "Group::getFileName", __LINE__, __FILE__);
 
-	// Create the data space.
-	hsize_t dims[RANK] = {NX, NY};
-	DataSpace space(RANK, dims);
+        // Create the data space.
+        hsize_t   dims[RANK] = {NX, NY};
+        DataSpace space(RANK, dims);
 
-	// Create a new dataset.
-	DataSet dataset(file4.createDataSet (DSETNAME, PredType::NATIVE_INT, space));
+        // Create a new dataset.
+        DataSet dataset(file4.createDataSet(DSETNAME, PredType::NATIVE_INT, space));
 
-	// Get and verify file name via a dataset.
-	file_name = dataset.getFileName();
-	verify_val(file_name, FILE4, "DataSet::getFileName", __LINE__, __FILE__);
+        // Get and verify file name via a dataset.
+        file_name = dataset.getFileName();
+        verify_val(file_name, FILE4, "DataSet::getFileName", __LINE__, __FILE__);
 
-	// Create an attribute for the dataset.
-	Attribute attr(dataset.createAttribute(DATTRNAME, PredType::NATIVE_INT, space));
+        // Create an attribute for the dataset.
+        Attribute attr(dataset.createAttribute(DATTRNAME, PredType::NATIVE_INT, space));
 
-	// Get and verify file name via an attribute.
-	file_name = attr.getFileName();
-	verify_val(file_name, FILE4, "Attribute::getFileName", __LINE__, __FILE__);
+        // Get and verify file name via an attribute.
+        file_name = attr.getFileName();
+        verify_val(file_name, FILE4, "Attribute::getFileName", __LINE__, __FILE__);
 
-	// Create a compound datatype.
-	CompType comp_type (sizeof(s1_t));
+        // Create a compound datatype.
+        CompType comp_type(sizeof(s1_t));
 
-	// Insert fields.
-	comp_type.insertMember("a", HOFFSET(s1_t, a), PredType::NATIVE_INT);
-	comp_type.insertMember("b", HOFFSET(s1_t, b), PredType::NATIVE_FLOAT);
+        // Insert fields.
+        comp_type.insertMember("a", HOFFSET(s1_t, a), PredType::NATIVE_INT);
+        comp_type.insertMember("b", HOFFSET(s1_t, b), PredType::NATIVE_FLOAT);
 
-	// Save it on file.
-	comp_type.commit(file4, DTYPENAME);
+        // Save it on file.
+        comp_type.commit(file4, DTYPENAME);
 
-	// Get and verify file name via a committed datatype.
-	comp_type.getFileName();
-	verify_val(file_name, FILE4, "CompType::getFileName", __LINE__, __FILE__);
-	PASSED();
-    }   // end of try block
+        // Get and verify file name via a committed datatype.
+        comp_type.getFileName();
+        verify_val(file_name, FILE4, "CompType::getFileName", __LINE__, __FILE__);
+        PASSED();
+    } // end of try block
 
-    catch (Exception E) {
+    catch (Exception &E) {
         issue_fail_msg("test_file_name()", __LINE__, __FILE__, E.getCDetailMsg());
     }
+} // test_file_name()
 
-}   // test_file_name()
-
-
-#define NUM_OBJS	4
-#define NUM_ATTRS	3
-const int	RANK1 = 1;
-const int	ATTR1_DIM1 = 3;
-const H5std_string	FILE5("tfattrs.h5");
-const H5std_string	FATTR1_NAME ("file attribute 1");
-const H5std_string	FATTR2_NAME ("file attribute 2");
-int fattr_data[ATTR1_DIM1]={512,-234,98123}; /* Test data for file attribute */
-int dattr_data[ATTR1_DIM1]={256,-123,1000}; /* Test data for dataset attribute */
-static void test_file_attribute()
+/*-------------------------------------------------------------------------
+ *
+ * Function:    test_file_attribute
+ *
+ * Purpose      Test file attributes
+ *
+ * Return       None
+ *-------------------------------------------------------------------------
+ */
+const int          RANK1      = 1;
+const int          ATTR1_DIM1 = 3;
+const H5std_string FILE5("tfattrs.h5");
+const H5std_string FATTR1_NAME("file attribute 1");
+const H5std_string FATTR2_NAME("file attribute 2");
+int                fattr_data[ATTR1_DIM1] = {512, -234, 98123}; // Test data for file attribute
+int                dattr_data[ATTR1_DIM1] = {256, -123, 1000};  // Test data for dataset attribute
+
+static void
+test_file_attribute()
 {
     int rdata[ATTR1_DIM1];
     int i;
@@ -512,147 +583,472 @@ static void test_file_attribute()
     H5std_string file_name;
     try {
         // Create a file using default properties.
-	H5File file5(FILE5, H5F_ACC_TRUNC);
+        H5File file5(FILE5, H5F_ACC_TRUNC);
 
-	// Create the data space
-	hsize_t dims[RANK1] = {ATTR1_DIM1};
-	DataSpace space(RANK1, dims);
+        // Create the data space
+        hsize_t   dims[RANK1] = {ATTR1_DIM1};
+        DataSpace space(RANK1, dims);
 
-	// Create two attributes for the file
-	Attribute fattr1(file5.createAttribute(FATTR1_NAME, PredType::NATIVE_FLOAT, space));
-	Attribute fattr2(file5.createAttribute(FATTR2_NAME, PredType::NATIVE_INT, space));
+        // Create two attributes for the file
+        Attribute fattr1(file5.createAttribute(FATTR1_NAME, PredType::NATIVE_FLOAT, space));
+        Attribute fattr2(file5.createAttribute(FATTR2_NAME, PredType::NATIVE_INT, space));
 
-	fattr2.write(PredType::NATIVE_INT, fattr_data);
+        fattr2.write(PredType::NATIVE_INT, fattr_data);
 
-	try {
-	    // Try to create the same attribute again (should fail)
-	    Attribute fattr_dup(file5.createAttribute(FATTR2_NAME, PredType::NATIVE_INT, space));
-	    // Should FAIL but didn't, so throw an invalid action exception
-	    throw InvalidActionException("H5File createAttribute", "Attempted to create an existing attribute.");
-	}
-	catch( AttributeIException E ) // catch creating existing attribute
-	{} // do nothing, FAIL expected
+        try {
+            // Try to create the same attribute again (should fail)
+            Attribute fattr_dup(file5.createAttribute(FATTR2_NAME, PredType::NATIVE_INT, space));
+            // Should FAIL but didn't, so throw an invalid action exception
+            throw InvalidActionException("H5File createAttribute",
+                                         "Attempted to create an existing attribute.");
+        }
+        catch (AttributeIException &E) // catch creating existing attribute
+        {
+        } // do nothing, FAIL expected
 
-	// Create a new dataset
-	DataSet dataset(file5.createDataSet (DSETNAME, PredType::NATIVE_INT, space));
+        // Create a new dataset
+        DataSet dataset(file5.createDataSet(DSETNAME, PredType::NATIVE_INT, space));
 
-	// Create an attribute for the dataset
-	Attribute dattr(dataset.createAttribute(DATTRNAME, PredType::NATIVE_INT, space));
+        // Create an attribute for the dataset
+        Attribute dattr(dataset.createAttribute(DATTRNAME, PredType::NATIVE_INT, space));
 
-	// Write data to the second file attribute
-	dattr.write(PredType::NATIVE_INT, dattr_data);
+        // Write data to the second file attribute
+        dattr.write(PredType::NATIVE_INT, dattr_data);
 
-	// Test flushing out the data from the attribute object
+        // Test flushing out the data from the attribute object
         dattr.flush(H5F_SCOPE_GLOBAL);
 
-	// Get and verify the number of all objects in the file
-	// Current: 1 file, 2 file attr, 1 ds, and 1 ds attr.
-	ssize_t num_objs = file5.getObjCount(H5F_OBJ_ALL);
-	verify_val(num_objs, 5, "H5File::getObjCount", __LINE__, __FILE__);
-
-	num_objs = file5.getObjCount(H5F_OBJ_GROUP);
-	verify_val(num_objs, 0, "H5File::getObjCount(H5F_OBJ_GROUP)", __LINE__, __FILE__);
-	num_objs = file5.getObjCount(H5F_OBJ_DATASET);
-	verify_val(num_objs, 1, "H5File::getObjCount(H5F_OBJ_DATASET)", __LINE__, __FILE__);
-	num_objs = file5.getObjCount(H5F_OBJ_ATTR);
-	verify_val(num_objs, 3, "H5File::getObjCount(H5F_OBJ_ATTR)", __LINE__, __FILE__);
-	num_objs = file5.getObjCount(H5F_OBJ_DATATYPE);
-	verify_val(num_objs, 0, "H5File::getObjCount(H5F_OBJ_DATATYPE)", __LINE__, __FILE__);
-	num_objs = file5.getObjCount(H5F_OBJ_FILE);
-	verify_val(num_objs, 1, "H5File::getObjCount(H5F_OBJ_FILE)", __LINE__, __FILE__);
-	
-	// Get the file name using the attributes
-	H5std_string fname = fattr1.getFileName();
-	verify_val(fname, FILE5, "H5File::getFileName()", __LINE__, __FILE__);
-
-	fname.clear();
-	fname = dattr.getFileName();
-	verify_val(fname, FILE5, "H5File::getFileName()", __LINE__, __FILE__);
-
-	// Get the class of a file attribute's datatype
-	H5T_class_t atclass = fattr1.getTypeClass();
-	verify_val(atclass, H5T_FLOAT, "Attribute::getTypeClass()", __LINE__, __FILE__);
-
-	// Get and verify the number of attributes attached to a file
-	int n_attrs = file5.getNumAttrs();
-	verify_val(n_attrs, 2, "H5File::getNumAttrs()", __LINE__, __FILE__);
-
-	// Get and verify the number of attributes attached to a dataset
-	n_attrs = 0;
-	n_attrs = dataset.getNumAttrs();
-	verify_val(n_attrs, 1, "DataSet::getNumAttrs()", __LINE__, __FILE__);
-
-	// Read back attribute's data
-	HDmemset(rdata, 0, sizeof(rdata));
+        // Get and verify the number of all objects in the file
+        // Current: 1 file, 2 file attr, 1 ds, and 1 ds attr.
+        ssize_t num_objs = file5.getObjCount(H5F_OBJ_ALL);
+        verify_val(num_objs, 5, "H5File::getObjCount", __LINE__, __FILE__);
+
+        num_objs = file5.getObjCount(H5F_OBJ_GROUP);
+        verify_val(num_objs, 0, "H5File::getObjCount(H5F_OBJ_GROUP)", __LINE__, __FILE__);
+        num_objs = file5.getObjCount(H5F_OBJ_DATASET);
+        verify_val(num_objs, 1, "H5File::getObjCount(H5F_OBJ_DATASET)", __LINE__, __FILE__);
+        num_objs = file5.getObjCount(H5F_OBJ_ATTR);
+        verify_val(num_objs, 3, "H5File::getObjCount(H5F_OBJ_ATTR)", __LINE__, __FILE__);
+        num_objs = file5.getObjCount(H5F_OBJ_DATATYPE);
+        verify_val(num_objs, 0, "H5File::getObjCount(H5F_OBJ_DATATYPE)", __LINE__, __FILE__);
+        num_objs = file5.getObjCount(H5F_OBJ_FILE);
+        verify_val(num_objs, 1, "H5File::getObjCount(H5F_OBJ_FILE)", __LINE__, __FILE__);
+
+        // Get the file name using the attributes
+        H5std_string fname = fattr1.getFileName();
+        verify_val(fname, FILE5, "H5File::getFileName()", __LINE__, __FILE__);
+
+        fname.clear();
+        fname = dattr.getFileName();
+        verify_val(fname, FILE5, "H5File::getFileName()", __LINE__, __FILE__);
+
+        // Get the class of a file attribute's datatype
+        H5T_class_t atclass = fattr1.getTypeClass();
+        verify_val(static_cast<long>(atclass), static_cast<long>(H5T_FLOAT), "Attribute::getTypeClass()",
+                   __LINE__, __FILE__);
+
+        // Get and verify the number of attributes attached to a file
+        int n_attrs = file5.getNumAttrs();
+        verify_val(n_attrs, 2, "H5File::getNumAttrs()", __LINE__, __FILE__);
+
+        // Get and verify the number of attributes attached to a dataset
+        n_attrs = 0;
+        n_attrs = dataset.getNumAttrs();
+        verify_val(n_attrs, 1, "DataSet::getNumAttrs()", __LINE__, __FILE__);
+
+        // Read back attribute's data
+        HDmemset(rdata, 0, sizeof(rdata));
         dattr.read(PredType::NATIVE_INT, rdata);
         /* Check results */
         for (i = 0; i < ATTR1_DIM1; i++) {
             if (rdata[i] != dattr_data[i]) {
                 H5_FAILED();
-		cerr << endl;
-                cerr << "element [" << i << "] is " << rdata[i] <<
-			"but should have been " << dattr_data[i] << endl;
-                }
+                cerr << endl;
+                cerr << "element [" << i << "] is " << rdata[i] << "but should have been " << dattr_data[i]
+                     << endl;
             }
-	PASSED();
-    }   // end of try block
+        }
+        PASSED();
+    } // end of try block
 
-    catch (Exception E) {
+    catch (Exception &E) {
         issue_fail_msg("test_file_attribute()", __LINE__, __FILE__, E.getCDetailMsg());
     }
-}   // test_file_attribute()
-
+} // test_file_attribute()
+
 /*-------------------------------------------------------------------------
- * Function:    test_file
+ * Function:    test_libver_bounds_real
  *
- * Purpose:     Main file testing routine
+ * Purpose      Verify that a file created and modified with the
+ *              specified libver bounds has the specified object header
+ *              versions for the right objects.
  *
- * Return:      None
+ * Return       None
  *
- * Programmer:  Binh-Minh Ribler (use C version)
- *              January 2001
+ * Programmer   Binh-Minh Ribler (use C version)
+ *              March, 2015
+ *-------------------------------------------------------------------------
+ */
+const H5std_string FILE6("tfile5.h5");
+const H5std_string ROOTGROUP("/");
+const H5std_string GROUP1("/G1");
+const H5std_string SUBGROUP3("/G1/G3");
+
+static void
+test_libver_bounds_real(H5F_libver_t libver_create, unsigned oh_vers_create, H5F_libver_t libver_mod,
+                        unsigned oh_vers_mod)
+{
+    try {
+
+        /*
+         * Create a new file using the default creation property and access property
+         * with latest library version.
+         */
+        FileAccPropList fapl;
+        fapl.setLibverBounds(libver_create, H5F_LIBVER_LATEST);
+        H5File file(FILE6, H5F_ACC_TRUNC, FileCreatPropList::DEFAULT, fapl);
+
+        /*
+         * Make sure the root group has the correct object header version
+         */
+        unsigned obj_version = file.childObjVersion(ROOTGROUP);
+        verify_val(obj_version, oh_vers_create, "H5File::childObjVersion", __LINE__, __FILE__);
+
+        // Verify object header version another way
+        H5O_native_info_t ninfo;
+        HDmemset(&ninfo, 0, sizeof(ninfo));
+        file.getNativeObjinfo(ninfo, H5O_NATIVE_INFO_HDR);
+        verify_val(ninfo.hdr.version, oh_vers_create, "H5File::getNativeObjinfo", __LINE__, __FILE__);
+
+        /*
+         * Reopen the file and make sure the root group still has the correct
+         * version
+         */
+        file.close();
+
+        fapl.setLibverBounds(libver_mod, H5F_LIBVER_LATEST);
+
+        file.openFile(FILE6, H5F_ACC_RDWR, fapl);
+
+        obj_version = file.childObjVersion(ROOTGROUP);
+        verify_val(obj_version, oh_vers_create, "H5File::childObjVersion", __LINE__, __FILE__);
+
+        /*
+         * Create a group named "/G1" in the file, and make sure it has the correct
+         * object header version
+         */
+        Group group = file.createGroup(GROUP1);
+
+        obj_version = group.objVersion();
+        verify_val(obj_version, oh_vers_mod, "Group::objVersion", __LINE__, __FILE__);
+
+        // Verify object header version another way
+        HDmemset(&ninfo, 0, sizeof(ninfo));
+        group.getNativeObjinfo(ninfo, H5O_NATIVE_INFO_HDR);
+        verify_val(ninfo.hdr.version, oh_vers_mod, "Group::getNativeObjinfo", __LINE__, __FILE__);
+
+        group.close(); // close "/G1"
+
+        /*
+         * Create a group named "/G1/G3" in the file, and make sure it has the
+         * correct object header version
+         */
+        group = file.createGroup(SUBGROUP3);
+
+        obj_version = group.objVersion();
+        verify_val(obj_version, oh_vers_mod, "Group::objVersion", __LINE__, __FILE__);
+
+        group.close(); // close "/G1/G3"
+
+        /*
+         * Make sure the root group still has the correct object header version
+         */
+        obj_version = file.childObjVersion(ROOTGROUP);
+        verify_val(obj_version, oh_vers_create, "H5File::childObjVersion", __LINE__, __FILE__);
+
+        // Everything should be closed as they go out of scope
+    } // end of try block
+
+    catch (Exception &E) {
+        issue_fail_msg("test_libver_bounds_real()", __LINE__, __FILE__, E.getCDetailMsg());
+    }
+
+} /* end test_libver_bounds_real() */
+
+/*-------------------------------------------------------------------------
  *
- * Modifications:
+ * Function:    test_libver_bounds
  *
+ * Purpose      Verify that a file created and modified with various
+ *              libver bounds is handled correctly.
+ *
+ * Return       None
+ *
+ * Programmer   Binh-Minh Ribler (use C version)
+ *              March 2015
  *-------------------------------------------------------------------------
  */
-#ifdef __cplusplus
-extern "C"
-#endif
-void test_file()
+static void
+test_libver_bounds()
 {
     // Output message about test being performed
-    MESSAGE(5, ("Testing File I/O Operations\n"));
+    SUBTEST("Setting library version bounds");
+
+    /* Run the tests */
+    test_libver_bounds_real(H5F_LIBVER_EARLIEST, H5O_VERSION_1, H5F_LIBVER_LATEST, H5O_VERSION_2);
+    test_libver_bounds_real(H5F_LIBVER_LATEST, H5O_VERSION_2, H5F_LIBVER_EARLIEST, H5O_VERSION_2);
+    PASSED();
+} /* end test_libver_bounds() */
+
+/*-------------------------------------------------------------------------
+ * Function:    test_commonfg
+ *
+ * Purpose      Verify that H5File works as a root group.
+ *
+ * Return       None
+ *
+ * Programmer   Binh-Minh Ribler (use C version)
+ *              March, 2015
+ *-------------------------------------------------------------------------
+ */
+static void
+test_commonfg()
+{
+    // Output message about test being performed
+    SUBTEST("Root group");
+
+    try {
+        // Create a file using default properties.
+        H5File file4(FILE4, H5F_ACC_TRUNC);
+
+        // Try opening the root group.
+        Group rootgroup(file4.openGroup(ROOTGROUP));
+
+        // Create a group in the root group.
+        Group group(rootgroup.createGroup(GROUPNAME, 0));
+
+        // Create the data space.
+        hsize_t   dims[RANK] = {NX, NY};
+        DataSpace space(RANK, dims);
+
+        // Create a new dataset.
+        DataSet dataset(group.createDataSet(DSETNAME, PredType::NATIVE_INT, space));
+
+        // Get and verify file name via a dataset.
+        H5std_string file_name = dataset.getFileName();
+        verify_val(file_name, FILE4, "DataSet::getFileName", __LINE__, __FILE__);
 
-    test_file_create();	// Test file creation (also creation templates)
-    test_file_open();	// Test file opening
-    test_file_size();	// Test file size
-    test_file_name();	// Test getting file's name
-    test_file_attribute();	// Test file attribute feature
-}   // test_file()
+        // Create an attribute for the dataset.
+        Attribute attr(dataset.createAttribute(DATTRNAME, PredType::NATIVE_INT, space));
+
+        // Get and verify file name via an attribute.
+        file_name = attr.getFileName();
+        verify_val(file_name, FILE4, "Attribute::getFileName", __LINE__, __FILE__);
+
+        // Create an attribute for the file via root group.
+        Attribute rootg_attr(rootgroup.createAttribute(FATTRNAME, PredType::NATIVE_INT, space));
+
+        // Get and verify file name via an attribute.
+        file_name = attr.getFileName();
+        verify_val(file_name, FILE4, "Attribute::getFileName", __LINE__, __FILE__);
+
+        PASSED();
+    } // end of try block
+
+    catch (Exception &E) {
+        issue_fail_msg("test_commonfg()", __LINE__, __FILE__, E.getCDetailMsg());
+    }
+
+} /* end test_commonfg() */
 
-
 /*-------------------------------------------------------------------------
- * Function:	cleanup_file
+ * Function:    test_file_info
  *
- * Purpose:	Cleanup temporary test files
+ * Purpose      Verify that various properties in a file creation property
+ *              lists are stored correctly in the file and can be retrieved
+ *              when the file is re-opened.
  *
- * Return:	none
+ * Return       None
  *
- * Programmer:  (use C version)
+ * Programmer   Binh-Minh Ribler
+ *              February, 2017
+ *-------------------------------------------------------------------------
+ */
+const H5std_string FILE7("tfile7.h5");
+const hsize_t      FSP_SIZE_DEF = 4096;
+const hsize_t      FSP_SIZE512  = 512;
+
+static void
+test_file_info()
+{
+    // Output message about test being performed
+    SUBTEST("File general information");
+
+    hsize_t out_threshold = 0;     // Free space section threshold to get
+    hbool_t out_persist   = FALSE; // Persist free-space read
+    // File space handling strategy
+    H5F_fspace_strategy_t out_strategy = H5F_FSPACE_STRATEGY_FSM_AGGR;
+
+    try {
+        // Create a file using default properties.
+        H5File tempfile(FILE7, H5F_ACC_TRUNC);
+
+        // Get the file's version information.
+        H5F_info2_t finfo;
+        tempfile.getFileInfo(finfo);
+        verify_val(static_cast<long>(finfo.super.version), 0, "H5File::getFileInfo", __LINE__, __FILE__);
+        verify_val(static_cast<long>(finfo.free.version), 0, "H5File::getFileInfo", __LINE__, __FILE__);
+        verify_val(static_cast<long>(finfo.sohm.version), 0, "H5File::getFileInfo", __LINE__, __FILE__);
+
+        // Close the file.
+        tempfile.close();
+
+        // Create file creation property list.
+        FileCreatPropList fcpl;
+
+        // Retrieve file space information.
+        fcpl.getFileSpaceStrategy(out_strategy, out_persist, out_threshold);
+
+        // Verify file space information.
+        verify_val(static_cast<long>(out_strategy), static_cast<long>(H5F_FSPACE_STRATEGY_FSM_AGGR),
+                   "H5File::getFileInfo", __LINE__, __FILE__);
+        verify_val(out_persist, FALSE, "H5File::getFileInfo", __LINE__, __FILE__);
+        verify_val(static_cast<long>(out_threshold), 1, "H5File::getFileInfo", __LINE__, __FILE__);
+
+        /* Retrieve file space page size */
+        hsize_t out_fsp_psize = fcpl.getFileSpacePagesize();
+        verify_val(out_fsp_psize, FSP_SIZE_DEF, "FileCreatPropList::getFileSpacePagesize", __LINE__,
+                   __FILE__);
+
+        // Set various file information.
+        fcpl.setUserblock(F2_USERBLOCK_SIZE);
+        fcpl.setSizes(F2_OFFSET_SIZE, F2_LENGTH_SIZE);
+        fcpl.setSymk(F2_SYM_INTERN_K, F2_SYM_LEAF_K);
+        fcpl.setIstorek(F2_ISTORE);
+
+        hsize_t               threshold = 5;    // Free space section threshold to set
+        hbool_t               persist   = TRUE; // Persist free-space to set
+        H5F_fspace_strategy_t strategy  = H5F_FSPACE_STRATEGY_PAGE;
+
+        fcpl.setFileSpaceStrategy(strategy, persist, threshold);
+        fcpl.setFileSpacePagesize(FSP_SIZE512);
+
+        // Creating a file with the non-default file creation property list
+        // should create a version 1 superblock
+
+        // Create file with custom file creation property list.
+        H5File file7(FILE7, H5F_ACC_TRUNC, fcpl);
+
+        // Close the file creation property list.
+        fcpl.close();
+
+        // Get the file's version information.
+        file7.getFileInfo(finfo);
+        verify_val(static_cast<long>(finfo.super.version), 2, "H5File::getFileInfo", __LINE__, __FILE__);
+        verify_val(static_cast<long>(finfo.free.version), 0, "H5File::getFileInfo", __LINE__, __FILE__);
+        verify_val(static_cast<long>(finfo.sohm.version), 0, "H5File::getFileInfo", __LINE__, __FILE__);
+
+        // Close the file.
+        file7.close();
+
+        // Re-open the file.
+        file7.openFile(FILE7, H5F_ACC_RDONLY);
+
+        // Get the file's creation property list.
+        FileCreatPropList fcpl2 = file7.getCreatePlist();
+
+        // Get the file's version information.
+        file7.getFileInfo(finfo);
+        verify_val(static_cast<long>(finfo.super.version), 2, "H5File::getFileInfo", __LINE__, __FILE__);
+        verify_val(static_cast<long>(finfo.free.version), 0, "H5File::getFileInfo", __LINE__, __FILE__);
+        verify_val(static_cast<long>(finfo.sohm.version), 0, "H5File::getFileInfo", __LINE__, __FILE__);
+
+        // Retrieve the property values & check them.
+        hsize_t userblock = fcpl2.getUserblock();
+        verify_val(userblock, F2_USERBLOCK_SIZE, "FileCreatPropList::getUserblock", __LINE__, __FILE__);
+
+        size_t off_size = 0, len_size = 0;
+        fcpl2.getSizes(off_size, len_size);
+        verify_val(off_size, F2_OFFSET_SIZE, "FileCreatPropList::getSizes", __LINE__, __FILE__);
+        verify_val(len_size, F2_LENGTH_SIZE, "FileCreatPropList::getSizes", __LINE__, __FILE__);
+
+        unsigned sym_ik = 0, sym_lk = 0;
+        fcpl2.getSymk(sym_ik, sym_lk);
+        verify_val(sym_ik, F2_SYM_INTERN_K, "FileCreatPropList::getSymk", __LINE__, __FILE__);
+        verify_val(sym_lk, F2_SYM_LEAF_K, "FileCreatPropList::getSymk", __LINE__, __FILE__);
+
+        unsigned istore_ik = fcpl2.getIstorek();
+        verify_val(istore_ik, F2_ISTORE, "FileCreatPropList::getIstorek", __LINE__, __FILE__);
+
+        /*  ret=H5Pget_shared_mesg_nindexes(fcpl2,&nindexes);
+        CHECK(ret, FAIL, "H5Pget_shared_mesg_nindexes");
+        VERIFY(nindexes, MISC11_NINDEXES, "H5Pget_shared_mesg_nindexes");
+     */
+
+        // Get and verify the file space info from the creation property list */
+        fcpl2.getFileSpaceStrategy(out_strategy, out_persist, out_threshold);
+        verify_val(static_cast<long>(out_strategy), static_cast<long>(strategy),
+                   "FileCreatPropList::getFileSpaceStrategy", __LINE__, __FILE__);
+        verify_val(out_persist, persist, "FileCreatPropList::getFileSpaceStrategy", __LINE__, __FILE__);
+        verify_val(out_threshold, threshold, "FileCreatPropList::getFileSpaceStrategy", __LINE__, __FILE__);
+
+        out_fsp_psize = fcpl2.getFileSpacePagesize();
+        verify_val(out_fsp_psize, FSP_SIZE512, "FileCreatPropList::getFileSpacePagesize", __LINE__, __FILE__);
+
+        PASSED();
+    } // end of try block
+    catch (Exception &E) {
+        issue_fail_msg("test_filespace_info()", __LINE__, __FILE__, E.getCDetailMsg());
+    }
+} /* test_file_info() */
+
+/*-------------------------------------------------------------------------
+ * Function:    test_file
  *
- * Modifications:
+ * Purpose      Main file testing routine
+ *
+ * Return       None
+ *
+ * Programmer   Binh-Minh Ribler (use C version)
+ *              January 2001
+ *-------------------------------------------------------------------------
+ */
+extern "C" void
+test_file()
+{
+    // Output message about test being performed
+    MESSAGE(5, ("Testing File I/O Operations\n"));
+
+    test_file_create();    // Test file creation (also creation templates)
+    test_file_open();      // Test file opening
+    test_file_size();      // Test file size
+    test_file_num();       // Test file number
+    test_file_name();      // Test getting file's name
+    test_file_attribute(); // Test file attribute feature
+    test_libver_bounds();  // Test format version
+    test_commonfg();       // Test H5File as a root group
+    test_file_info();      // Test various file info
+} // test_file()
+
+/*-------------------------------------------------------------------------
+ * Function:    cleanup_file
+ *
+ * Purpose      Cleanup temporary test files
  *
+ * Return       none
  *-------------------------------------------------------------------------
  */
 #ifdef __cplusplus
 extern "C"
 #endif
-void cleanup_file()
+    void
+    cleanup_file()
 {
     HDremove(FILE1.c_str());
     HDremove(FILE2.c_str());
     HDremove(FILE3.c_str());
     HDremove(FILE4.c_str());
     HDremove(FILE5.c_str());
-}   // cleanup_file
+    HDremove(FILE6.c_str());
+    HDremove(FILE7.c_str());
+} // cleanup_file
diff --git a/c++/test/tfilter.cpp b/c++/test/tfilter.cpp
index 3edb83a..2d7dbb8 100644
--- a/c++/test/tfilter.cpp
+++ b/c++/test/tfilter.cpp
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*****************************************************************************
@@ -18,38 +15,28 @@
    tfilter.cpp - HDF5 C++ testing various filters and their combination.
 
  ***************************************************************************/
-
-#ifdef OLD_HEADER_FILENAME
-#include <iostream.h>
-#else
 #include <iostream>
-#endif
-#include <string>
+using std::cerr;
+using std::endl;
 
-#ifndef H5_NO_NAMESPACE
-#ifndef H5_NO_STD
-    using std::cerr;
-    using std::endl;
-#endif  // H5_NO_STD
-#endif
+#include <string>
+#include "H5Cpp.h" // C++ API header file
+using namespace H5;
 
-#include "H5Cpp.h"      // C++ API header file
+#include "h5test.h"
+#include "h5cpputil.h" // C++ utilility header file
 
-#ifndef H5_NO_NAMESPACE
-    using namespace H5;
+#ifdef H5_HAVE_FILTER_SZIP
+#define DSET_DIM1 100
+#define DSET_DIM2 200
 #endif
-
-#include "h5cpputil.h"  // C++ utilility header file
-
-#define DSET_DIM1	  100
-#define DSET_DIM2	  200
 #define FILTER_CHUNK_DIM1 2
 #define FILTER_CHUNK_DIM2 25
 
 // will do this function later or use it as guideline - BMR - 2007/01/26
 #if 0
 static herr_t test_filter_internal(hid_t fid, const char *name, hid_t dcpl,
-		int if_fletcher32, int corrupted, hsize_t *dset_size)
+                int if_fletcher32, int corrupted, hsize_t *dset_size)
 {
     cerr << "do nothing right now" << endl;
     return(0);
@@ -59,141 +46,134 @@ static herr_t test_filter_internal(hid_t fid, const char *name, hid_t dcpl,
 /* Temporary filter IDs used for testing */
 const int H5Z_FILTER_BOGUS = 305;
 
-#if 0 // UNUSED variables caused warning, so duplicated below with NULL instead
-static size_t filter_bogus(unsigned int flags, size_t cd_nelmts,
-    const unsigned int *cd_values, size_t nbytes, size_t *buf_size, void **buf);
-#endif
-static size_t filter_bogus(size_t nbytes);
+static size_t filter_bogus(unsigned int flags, size_t cd_nelmts, const unsigned int *cd_values, size_t nbytes,
+                           size_t *buf_size, void **buf);
+
 /* This message derives from H5Z */
 const H5Z_class2_t H5Z_BOGUS[1] = {{
-    H5Z_CLASS_T_VERS,       /* H5Z_class_t version */
-    H5Z_FILTER_BOGUS,           /* Filter id number             */
-    1, 1,               /* Encoding and decoding enabled */
-    "bogus",                    /* Filter name for debugging    */
-    NULL,                       /* The "can apply" callback     */
-    NULL,                       /* The "set local" callback     */
-    (H5Z_func_t)filter_bogus,   /* The actual filter function   */
+    H5Z_CLASS_T_VERS, /* H5Z_class_t version */
+    H5Z_FILTER_BOGUS, /* Filter id number             */
+    1, 1,             /* Encoding and decoding enabled */
+    "bogus",          /* Filter name for debugging    */
+    NULL,             /* The "can apply" callback     */
+    NULL,             /* The "set local" callback     */
+    filter_bogus,     /* The actual filter function   */
 }};
 
 /*-------------------------------------------------------------------------
  * Function:    filter_bogus
  *
- * Purpose:     A bogus compression method that doesn't do anything.
+ * Purpose      A bogus compression method that doesn't do anything.
  *
- * Return:      Success:        Data chunk size
+ * Return       Success: Data chunk size
  *
- *              Failure:        0
+ *              Failure: 0
  *
- * Programmer:  Robb Matzke
+ * Programmer   Robb Matzke
  *              Tuesday, April 21, 1998
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static size_t
-#if 0 // UNUSED variables caused warning, so duplicated below with NULL instead
-filter_bogus(unsigned int UNUSED flags, size_t UNUSED cd_nelmts,
-      const unsigned int UNUSED *cd_values, size_t nbytes,
-      size_t UNUSED *buf_size, void UNUSED **buf)
-#endif
-filter_bogus(size_t nbytes)
+filter_bogus(unsigned int flags, size_t cd_nelmts, const unsigned int *cd_values, size_t nbytes,
+             size_t *buf_size, void **buf)
 {
+    (void)flags;
+    (void)cd_nelmts;
+    (void)cd_values;
+    (void)buf_size;
+    (void)buf;
+
     return nbytes;
 }
 
 /*-------------------------------------------------------------------------
- * Function:	test_null_filter
+ * Function:    test_null_filter
  *
- * Purpose:	Test null I/O filter by itself.
+ * Purpose      Test null I/O filter by itself.
  *
- * Return:	None
+ * Return       None
  *
- * Programmer:	Binh-Minh Ribler (use C version, from dsets.c/test_filters)
- *		January, 2007
+ * Programmer   Binh-Minh Ribler (use C version, from dsets.c/test_filters)
+ *              January, 2007
  *
  * Modifications:
- *		Note: H5Z interface is not implemented yet.
- *
+ *              Note: H5Z interface is not implemented yet.
  *-------------------------------------------------------------------------
  */
-
-// Chunk dimensions
 const hsize_t chunk_size[2] = {FILTER_CHUNK_DIM1, FILTER_CHUNK_DIM2};
 
-static void test_null_filter()
+static void
+test_null_filter()
 {
     // Output message about test being performed
     SUBTEST("'Null' filter");
     try {
-	//hsize_t  null_size;          // Size of dataset with null filter
+        // hsize_t  null_size;          // Size of dataset with null filter
 
-	// Prepare dataset create property list
-	DSetCreatPropList dsplist;
-	dsplist.setChunk(2, chunk_size);
+        // Prepare dataset create property list
+        DSetCreatPropList dsplist;
+        dsplist.setChunk(2, chunk_size);
 
-	if (H5Zregister (H5Z_BOGUS)<0)
+        if (H5Zregister(H5Z_BOGUS) < 0)
             throw Exception("test_null_filter", "H5Zregister failed");
 
-	// Set some pretent filter
-	dsplist.setFilter(H5Z_FILTER_BOGUS);
+        // Set some pretent filter
+        dsplist.setFilter(H5Z_FILTER_BOGUS);
 
-	// this function is just a stub right now; will work on it later - BMR
-	//if(test_filter_internal(file,DSET_BOGUS_NAME,dc,DISABLE_FLETCHER32,DATA_NOT_CORRUPTED,&null_size)<0)
+        // this function is just a stub right now; will work on it later - BMR
+        // if(test_filter_internal(file,DSET_BOGUS_NAME,dc,DISABLE_FLETCHER32,DATA_NOT_CORRUPTED,&null_size)<0)
         //  throw Exception("test_null_filter", "test_filter_internal failed");
 
-	// Close objects.
-	dsplist.close();
-	PASSED();
+        // Close objects.
+        dsplist.close();
+        PASSED();
     } // end of try
 
     // catch all other exceptions
-    catch (Exception E)
-    {
+    catch (Exception &E) {
         issue_fail_msg("test_null_filter()", __LINE__, __FILE__, E.getCDetailMsg());
     }
-}  // test_null_filter
+} // test_null_filter
 
 /*-------------------------------------------------------------------------
- * Function:	test_szip_filter
+ * Function:    test_szip_filter
  *
- * Purpose:	Test SZIP filter by itself.
+ * Purpose      Test SZIP filter by itself.
  *
- * Return:	None
+ * Return       None
  *
- * Programmer:	Binh-Minh Ribler (partly from dsets.c/test_filters)
- *		January, 2007
+ * Programmer   Binh-Minh Ribler (partly from dsets.c/test_filters)
+ *              January, 2007
  *
  * Modifications:
- *		Note: H5Z interface is not implemented yet.
- *
+ *              Note: H5Z interface is not implemented yet.
  *-------------------------------------------------------------------------
  */
+const H5std_string DSET_SZIP_NAME("szipped dataset");
 
-const H5std_string      DSET_SZIP_NAME("szipped dataset");
-
-static void test_szip_filter(H5File& file1)
+static void
+test_szip_filter(H5File &file1)
 {
 #ifdef H5_HAVE_FILTER_SZIP
     int      points[DSET_DIM1][DSET_DIM2], check[DSET_DIM1][DSET_DIM2];
-    unsigned szip_options_mask=H5_SZIP_NN_OPTION_MASK;
-    unsigned szip_pixels_per_block=4;
+    unsigned szip_options_mask     = H5_SZIP_NN_OPTION_MASK;
+    unsigned szip_pixels_per_block = 4;
 
     // Output message about test being performed
     SUBTEST("szip filter (with encoder)");
 
-    if ( h5_szip_can_encode() == 1) {
-        char* tconv_buf = new char [1000];
+    if (h5_szip_can_encode() == 1) {
+        char *tconv_buf = new char[1000];
 
         try {
-            const hsize_t   size[2] = {DSET_DIM1, DSET_DIM2};
+            const hsize_t size[2] = {DSET_DIM1, DSET_DIM2};
 
             // Create the data space
             DataSpace space1(2, size, NULL);
 
             // Create a small conversion buffer to test strip mining (?)
             DSetMemXferPropList xfer;
-            xfer.setBuffer (1000, tconv_buf, NULL);
+            xfer.setBuffer(1000, tconv_buf, NULL);
 
             // Prepare dataset create property list
             DSetCreatPropList dsplist;
@@ -203,27 +183,26 @@ static void test_szip_filter(H5File& file1)
             dsplist.setSzip(szip_options_mask, szip_pixels_per_block);
 
             // Create a dataset with szip compression
-            DataSpace space2 (2, size, NULL);
-            DataSet dataset(file1.createDataSet (DSET_SZIP_NAME, PredType::NATIVE_INT, space2, dsplist));
+            DataSpace space2(2, size, NULL);
+            DataSet   dataset(file1.createDataSet(DSET_SZIP_NAME, PredType::NATIVE_INT, space2, dsplist));
 
             hsize_t i, j, n;
-            for (i=n=0; i<size[0]; i++)
-            {
-                for (j=0; j<size[1]; j++)
-                {
-                    points[i][j] = (int)n++;
+            for (i = n = 0; i < size[0]; i++) {
+                for (j = 0; j < size[1]; j++) {
+                    points[i][j] = static_cast<int>(n++);
                 }
             }
 
             // Write to the dataset then read back the values
-            dataset.write ((void*)points, PredType::NATIVE_INT, DataSpace::ALL, DataSpace::ALL, xfer);
-            dataset.read ((void*)check, PredType::NATIVE_INT, DataSpace::ALL, DataSpace::ALL, xfer);
+            dataset.write(static_cast<void *>(points), PredType::NATIVE_INT, DataSpace::ALL, DataSpace::ALL,
+                          xfer);
+            dataset.read(static_cast<void *>(check), PredType::NATIVE_INT, DataSpace::ALL, DataSpace::ALL,
+                         xfer);
 
             // Check that the values read are the same as the values written
             for (i = 0; i < size[0]; i++)
-                for (j = 0; j < size[1]; j++)
-                {
-                    int status = check_values (i, j, points[i][j], check[i][j]);
+                for (j = 0; j < size[1]; j++) {
+                    int status = check_values(i, j, points[i][j], check[i][j]);
                     if (status == -1)
                         throw Exception("test_szip_filter", "Failed in testing szip method");
                 }
@@ -232,78 +211,67 @@ static void test_szip_filter(H5File& file1)
         } // end of try
 
         // catch all other exceptions
-        catch (Exception E)
-        {
+        catch (Exception &E) {
             issue_fail_msg("test_szip_filter()", __LINE__, __FILE__, E.getCDetailMsg());
         }
 
         delete[] tconv_buf;
     } // if szip presents
     else {
-	SKIPPED();
+        SKIPPED();
     }
 
-#else /* H5_HAVE_FILTER_SZIP */
+#else  /* H5_HAVE_FILTER_SZIP */
     SUBTEST("szip filter");
     SKIPPED();
     H5std_string fname = file1.getFileName();
     cerr << "    Szip filter not enabled for file '" << fname << "'" << endl;
 #endif /* H5_HAVE_FILTER_SZIP */
-}  // test_szip_filter
-
-
-/****************************************************************
-**
-**  test_filters(): Main routine for testing filters.
-**
-****************************************************************/
-const H5std_string      FILE1("tfilters.h5");
-#ifdef __cplusplus
-extern "C"
-#endif
-void test_filters()
+} // test_szip_filter
+
+/*-------------------------------------------------------------------------
+ * Function:    test_filters
+ *
+ * Purpose      Main routine for testing filters
+ *
+ * Return       None
+ *-------------------------------------------------------------------------
+ */
+const H5std_string FILE1("tfilters.h5");
+extern "C" void
+test_filters()
 {
     // Output message about test being performed
     MESSAGE(5, ("Testing Various Filters\n"));
 
-    hid_t       fapl_id;
+    hid_t fapl_id;
     fapl_id = h5_fileaccess(); // in h5test.c, returns a file access template
 
-    try
-    {
+    try {
         // Use the file access template id to create a file access prop. list
         FileAccPropList fapl(fapl_id);
 
         H5File file1(FILE1, H5F_ACC_TRUNC, FileCreatPropList::DEFAULT, fapl);
 
-	// Test basic VL string datatype
-	test_null_filter();
-	test_szip_filter(file1);
+        // Test basic VL string datatype
+        test_null_filter();
+        test_szip_filter(file1);
     }
-    catch (Exception E)
-    {
+    catch (Exception &E) {
         issue_fail_msg("test_filters()", __LINE__, __FILE__, E.getCDetailMsg());
     }
-}   // test_filters()
+} // test_filters()
 
 /*-------------------------------------------------------------------------
- * Function:	cleanup_filters
- *
- * Purpose:	Cleanup temporary test files
+ * Function:    cleanup_filters
  *
- * Return:	none
- *
- * Programmer:	Quincey Koziol
- *              September 10, 1999
- *
- * Modifications:
+ * Purpose      Cleanup temporary test files
  *
+ * Return       none
  *-------------------------------------------------------------------------
  */
-#ifdef __cplusplus
-extern "C"
-#endif
-void cleanup_filters()
+extern "C" void
+cleanup_filters()
 {
     HDremove(FILE1.c_str());
 }
diff --git a/c++/test/th5s.cpp b/c++/test/th5s.cpp
index b7a39b4..3651aa3 100644
--- a/c++/test/th5s.cpp
+++ b/c++/test/th5s.cpp
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*****************************************************************************
@@ -21,56 +18,44 @@
    EXTERNAL ROUTINES/VARIABLES:
 
  ***************************************************************************/
-
-#ifdef OLD_HEADER_FILENAME
-#include <iostream.h>
-#else
 #include <iostream>
-#endif
-#include <string>
-
-#ifndef H5_NO_NAMESPACE
-#ifndef H5_NO_STD
-    using std::cerr;
-    using std::endl;
-#endif  // H5_NO_STD
-#endif
-
-#include "H5Cpp.h"	// C++ API header file
+using std::cerr;
+using std::endl;
 
-#ifndef H5_NO_NAMESPACE
-    using namespace H5;
-#endif
+#include <string>
+#include "H5Cpp.h" // C++ API header file
+using namespace H5;
 
-#include "h5cpputil.h"	// C++ utilility header file
-#include "H5srcdir.h"	// srcdir querying header file
+#include "h5test.h"
+#include "h5cpputil.h" // C++ utilility header file
+#include "H5srcdir.h"  // srcdir querying header file
 
-const H5std_string    TESTFILE("th5s.h5");
-const H5std_string    DATAFILE("th5s1.h5");
+const H5std_string TESTFILE("th5s.h5");
+const H5std_string DATAFILE("th5s1.h5");
 
 /* 3-D dataset with fixed dimensions */
 const H5std_string SPACE1_NAME("Space1");
-const int SPACE1_RANK = 3;
-const int SPACE1_DIM1 = 3;
-const int SPACE1_DIM2 = 15;
-const int SPACE1_DIM3 = 13;
+const int          SPACE1_RANK = 3;
+const int          SPACE1_DIM1 = 3;
+const int          SPACE1_DIM2 = 15;
+const int          SPACE1_DIM3 = 13;
 
 /* 4-D dataset with one unlimited dimension */
 const H5std_string SPACE2_NAME("Space2");
-const int SPACE2_RANK = 4;
-const int SPACE2_DIM1 = 0;
-const int SPACE2_DIM2 = 15;
-const int SPACE2_DIM3 = 13;
-const int SPACE2_DIM4 = 23;
-const hsize_t SPACE2_MAX1 = H5S_UNLIMITED;
-const hsize_t SPACE2_MAX2 = 15;
-const hsize_t SPACE2_MAX3 = 13;
-const hsize_t SPACE2_MAX4 = 23;
+const int          SPACE2_RANK = 4;
+const int          SPACE2_DIM1 = 0;
+const int          SPACE2_DIM2 = 15;
+const int          SPACE2_DIM3 = 13;
+const int          SPACE2_DIM4 = 23;
+const hsize_t      SPACE2_MAX1 = H5S_UNLIMITED;
+const hsize_t      SPACE2_MAX2 = 15;
+const hsize_t      SPACE2_MAX3 = 13;
+const hsize_t      SPACE2_MAX4 = 23;
 
 /* Scalar dataset with simple datatype */
 const H5std_string SPACE3_NAME("Scalar1");
-const int SPACE3_RANK = 0;
-unsigned space3_data=65;
+const int          SPACE3_RANK = 0;
+unsigned           space3_data = 65;
 
 /* Scalar dataset with compound datatype */
 const H5std_string SPACE4_NAME("Scalar2");
@@ -78,530 +63,509 @@ const H5std_string SPACE4_FIELDNAME1("c1");
 const H5std_string SPACE4_FIELDNAME2("u");
 const H5std_string SPACE4_FIELDNAME3("f");
 const H5std_string SPACE4_FIELDNAME4("c2");
-size_t space4_field1_off=0;
-size_t space4_field2_off=0;
-size_t space4_field3_off=0;
-size_t space4_field4_off=0;
+size_t             space4_field1_off = 0;
+size_t             space4_field2_off = 0;
+size_t             space4_field3_off = 0;
+size_t             space4_field4_off = 0;
 struct space4_struct {
-    char c1;
+    char     c1;
     unsigned u;
-    float f;
-    char c2;
- } space4_data={'v',987123,(float)-3.14,'g'}; /* Test data for 4th dataspace */
+    float    f;
+    char     c2;
+} space4_data = {'v', 987123, -3.14F, 'g'}; /* Test data for 4th dataspace */
 
 /* Null dataspace */
 int space5_data = 7;
 
 /*-------------------------------------------------------------------------
+ * Function:    test_h5s_basic
  *
- * Function:	test_h5s_basic
- *
- * Purpose:	Test basic H5S (dataspace) code
+ * Purpose      Test basic H5S (dataspace) code
  *
- * Return:	none
+ * Return       None
  *
- * Programmer:	Binh-Minh Ribler (using C version)
+ * Programmer   Binh-Minh Ribler (using C version)
  *              Mar 2001
  *
  * Modifications:
  *      January, 2005: C tests' macro VERIFY casts values to 'long' for all
- *		       cases.  Since there are no operator<< for 'long long'
- *		       or int64 in VS C++ ostream, I casted the hssize_t values
- *		       passed to verify_val to 'long' as well.  If problems
- *		       arises later, this will have to be specificly handled
- *		       with a special routine.
+ *              cases.  Since there are no operator<< for 'long long'
+ *              or int64 in VS C++ ostream, I casted the hssize_t values
+ *              passed to verify_val to 'long' as well.  If problems
+ *              arises later, this will have to be specifically handled
+ *              with a special routine.
  *     April 12, 2011: Raymond Lu
- *                     Starting from the 1.8.7 release, we allow dimension
- *                     size to be zero.  So I took out the test against it.
+ *              Starting from the 1.8.7 release, we allow dimension
+ *              size to be zero.  So I took out the test against it.
  *-------------------------------------------------------------------------
  */
-static void test_h5s_basic()
+static void
+test_h5s_basic()
 {
-    hsize_t		dims1[] = {SPACE1_DIM1, SPACE1_DIM2, SPACE1_DIM3};
-    hsize_t		dims2[] = {SPACE2_DIM1, SPACE2_DIM2, SPACE2_DIM3,
-				   SPACE2_DIM4};
-    hsize_t		dims3[H5S_MAX_RANK+1];
-    hsize_t		tmax[4];
+    hsize_t dims1[] = {SPACE1_DIM1, SPACE1_DIM2, SPACE1_DIM3};
+    hsize_t dims2[] = {SPACE2_DIM1, SPACE2_DIM2, SPACE2_DIM3, SPACE2_DIM4};
+    hsize_t dims3[H5S_MAX_RANK + 1];
+    hsize_t tmax[4];
 
     // Output message about test being performed
     SUBTEST("Dataspace Manipulation");
 
     try {
-	// Create simple dataspace sid1
-	DataSpace sid1 (SPACE1_RANK, dims1 );
-
-	// Get simple extent npoints of the dataspace sid1 and verify it
-	hssize_t	n;	 	// Number of dataspace elements
-	n = sid1.getSimpleExtentNpoints();
-	verify_val((long)n, (long)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3),
-	   "DataSpace::getSimpleExtentNpoints", __LINE__, __FILE__);
-
-	// Get the logical rank of dataspace sid1 and verify it
-	int	rank;		// Logical rank of dataspace
-	rank = sid1.getSimpleExtentNdims();
-	verify_val(rank, SPACE1_RANK, "DataSpace::getSimpleExtentNdims", __LINE__, __FILE__);
-
-	// Retrieves dimension size of dataspace sid1 and verify it
-	int ndims;		// Number of dimensions
-	hsize_t	tdims[4];	// Dimension array to test with
-	ndims = sid1.getSimpleExtentDims( tdims );
-	verify_val(ndims, SPACE1_RANK, "DataSpace::getSimpleExtentDims", __LINE__, __FILE__);
-	verify_val(HDmemcmp(tdims, dims1, SPACE1_RANK * sizeof(unsigned)), 0,
-	   "DataSpace::getSimpleExtentDims", __LINE__, __FILE__);
-
-	// Create simple dataspace sid2
-	hsize_t	max2[] = {SPACE2_MAX1, SPACE2_MAX2, SPACE2_MAX3, SPACE2_MAX4};
-	DataSpace sid2 (SPACE2_RANK, dims2, max2);
-
-	// Get simple extent npoints of dataspace sid2 and verify it
-	n = sid2.getSimpleExtentNpoints();
-	verify_val((long)n, (long)(SPACE2_DIM1 * SPACE2_DIM2 * SPACE2_DIM3 * SPACE2_DIM4),
-	   "DataSpace::getSimpleExtentNpoints", __LINE__, __FILE__);
-
-	// Get the logical rank of dataspace sid2 and verify it
-	rank = sid2.getSimpleExtentNdims();
-	verify_val(rank, SPACE2_RANK, "DataSpace::getSimpleExtentNdims", __LINE__, __FILE__);
-
-	// Retrieves dimension size and max size of dataspace sid2 and
-	// verify them
-	ndims = sid2.getSimpleExtentDims( tdims, tmax );
-	verify_val(HDmemcmp(tdims, dims2, SPACE2_RANK * sizeof(unsigned)), 0,
-	   "DataSpace::getSimpleExtentDims", __LINE__, __FILE__);
-	verify_val(HDmemcmp(tmax, max2, SPACE2_RANK * sizeof(unsigned)), 0,
-	   "DataSpace::getSimpleExtentDims", __LINE__, __FILE__);
-
-	// Check to be sure we can't create a simple data space that has too
-	// many dimensions.
-	try {
-	    DataSpace manydims_ds(H5S_MAX_RANK+1, dims3, NULL);
-
-	    // Should FAIL but didn't, so throw an invalid action exception
-	    throw InvalidActionException("DataSpace constructor", "Library allowed overwrite of existing dataset");
-	}
-	catch( DataSpaceIException E ) // Simple data space with too many dims
-	{} // do nothing, exception expected
-
-       /*
-	* Try reading a file that has been prepared that has a dataset with a
-	* higher dimensionality than what the library can handle.
-	*
-	* If this test fails and the H5S_MAX_RANK variable has changed, follow
-	* the instructions in space_overflow.c for regenating the th5s.h5 file.
-	*/
-	char *tmp_str = new char[TESTFILE.length()+1];
-	strcpy(tmp_str, TESTFILE.c_str());
-	const char *testfile = H5_get_srcdir_filename(tmp_str);
-	delete []tmp_str;
-
-	// Create file
-	H5File fid1(testfile, H5F_ACC_RDONLY);
-
-	// Try to open the dataset that has higher dimensionality than
-	// what the library can handle and this operation should fail.
-	try {
-	    DataSet dset1 = fid1.openDataSet( "dset" );
-
-	    // Should FAIL but didn't, so throw an invalid action exception
-	    throw InvalidActionException("H5File::openDataSet", "Opening a dataset with higher dimensionality than what the library can handle");
-	}
-	catch( FileIException E ) // catching higher dimensionality dataset
-	{} // do nothing, exception expected
-
-    // CHECK_I(ret, "H5Fclose");  // leave this here, later, fake a failure
-		// in the p_close see how this will handle it. - BMR
-
-	PASSED();
-    }	// end of try block
-
-    catch (InvalidActionException E)
-    {
+        // Create simple dataspace sid1
+        DataSpace sid1(SPACE1_RANK, dims1);
+
+        // Get simple extent npoints of the dataspace sid1 and verify it
+        hssize_t n; // Number of dataspace elements
+        n = sid1.getSimpleExtentNpoints();
+        verify_val(static_cast<long>(n), SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3,
+                   "DataSpace::getSimpleExtentNpoints", __LINE__, __FILE__);
+
+        // Get the logical rank of dataspace sid1 and verify it
+        int rank; // Logical rank of dataspace
+        rank = sid1.getSimpleExtentNdims();
+        verify_val(rank, SPACE1_RANK, "DataSpace::getSimpleExtentNdims", __LINE__, __FILE__);
+
+        // Retrieves dimension size of dataspace sid1 and verify it
+        int     ndims;    // Number of dimensions
+        hsize_t tdims[4]; // Dimension array to test with
+        ndims = sid1.getSimpleExtentDims(tdims);
+        verify_val(ndims, SPACE1_RANK, "DataSpace::getSimpleExtentDims", __LINE__, __FILE__);
+        verify_val(HDmemcmp(tdims, dims1, SPACE1_RANK * sizeof(unsigned)), 0,
+                   "DataSpace::getSimpleExtentDims", __LINE__, __FILE__);
+
+        // Create simple dataspace sid2
+        hsize_t   max2[] = {SPACE2_MAX1, SPACE2_MAX2, SPACE2_MAX3, SPACE2_MAX4};
+        DataSpace sid2(SPACE2_RANK, dims2, max2);
+
+        // Get simple extent npoints of dataspace sid2 and verify it
+        n = sid2.getSimpleExtentNpoints();
+        verify_val(static_cast<long>(n), SPACE2_DIM1 * SPACE2_DIM2 * SPACE2_DIM3 * SPACE2_DIM4,
+                   "DataSpace::getSimpleExtentNpoints", __LINE__, __FILE__);
+
+        // Get the logical rank of dataspace sid2 and verify it
+        rank = sid2.getSimpleExtentNdims();
+        verify_val(rank, SPACE2_RANK, "DataSpace::getSimpleExtentNdims", __LINE__, __FILE__);
+
+        // Retrieves dimension size and max size of dataspace sid2 and
+        // verify them
+        ndims = sid2.getSimpleExtentDims(tdims, tmax);
+        verify_val(HDmemcmp(tdims, dims2, SPACE2_RANK * sizeof(unsigned)), 0,
+                   "DataSpace::getSimpleExtentDims", __LINE__, __FILE__);
+        verify_val(HDmemcmp(tmax, max2, SPACE2_RANK * sizeof(unsigned)), 0, "DataSpace::getSimpleExtentDims",
+                   __LINE__, __FILE__);
+
+        // Check to be sure we can't create a simple data space that has too
+        // many dimensions.
+        try {
+            DataSpace manydims_ds(H5S_MAX_RANK + 1, dims3, NULL);
+
+            // Should FAIL but didn't, so throw an invalid action exception
+            throw InvalidActionException("DataSpace constructor",
+                                         "Library allowed overwrite of existing dataset");
+        }
+        catch (DataSpaceIException &E) // Simple data space with too many dims
+        {
+        } // do nothing, exception expected
+
+        /*
+         * Try reading a file that has been prepared that has a dataset with a
+         * higher dimensionality than what the library can handle.
+         *
+         * If this test fails and the H5S_MAX_RANK variable has changed, follow
+         * the instructions in space_overflow.c for regenating the th5s.h5 file.
+         */
+        char *tmp_str = new char[TESTFILE.length() + 1];
+        strcpy(tmp_str, TESTFILE.c_str());
+        const char *testfile = H5_get_srcdir_filename(tmp_str);
+        delete[] tmp_str;
+
+        // Create file
+        H5File fid1(testfile, H5F_ACC_RDONLY);
+
+        // Try to open the dataset that has higher dimensionality than
+        // what the library can handle and this operation should fail.
+        try {
+            DataSet dset1 = fid1.openDataSet("dset");
+
+            // Should FAIL but didn't, so throw an invalid action exception
+            throw InvalidActionException(
+                "H5File::openDataSet",
+                "Opening a dataset with higher dimensionality than what the library can handle");
+        }
+        catch (FileIException &E) // catching higher dimensionality dataset
+        {
+        } // do nothing, exception expected
+
+        // CHECK_I(ret, "H5Fclose");  // leave this here, later, fake a failure
+        // in the p_close see how this will handle it. - BMR
+
+        // When running in valgrind, this PASSED macro will be missed
+        PASSED();
+    } // end of try block
+
+    catch (InvalidActionException &E) {
         cerr << " FAILED" << endl;
         cerr << "    <<<  " << E.getDetailMsg() << "  >>>" << endl << endl;
     }
     // catch all other exceptions
-    catch (Exception E)
-    {
+    catch (Exception &E) {
         issue_fail_msg("test_h5s_basic()", __LINE__, __FILE__, E.getCDetailMsg());
     }
-}   // test_h5s_basic()
+} // test_h5s_basic()
 
 /*-------------------------------------------------------------------------
+ * Function:    test_h5s_scalar_write
  *
- * Function:	test_h5s_scalar_write
+ * Purpose      Test scalar H5S (dataspace) writing code
  *
- * Purpose:	Test scalar H5S (dataspace) writing code
+ * Return       None
  *
- * Return:	none
- *
- * Programmer:	Binh-Minh Ribler (using C version)
+ * Programmer   Binh-Minh Ribler (using C version)
  *              Mar 2001
  *
  * Modifications:
  *      January, 2005: C tests' macro VERIFY casts values to 'long' for all
- *		       cases.  Since there are no operator<< for 'long long'
- *		       or int64 in VS C++ ostream, I casted the hssize_t values
- *		       passed to verify_val to 'long' as well.  If problems
- *		       arises later, this will have to be specificly handled
- *		       with a special routine.
+ *              cases.  Since there are no operator<< for 'long long'
+ *              or int64 in VS C++ ostream, I casted the hssize_t values
+ *              passed to verify_val to 'long' as well.  If problems
+ *              arises later, this will have to be specifically handled
+ *              with a special routine.
  *-------------------------------------------------------------------------
  */
-static void test_h5s_scalar_write()
+static void
+test_h5s_scalar_write()
 {
     // Output message about test being performed
     SUBTEST("Scalar Dataspace Writing");
 
     try {
-	// Create file
-	H5File fid1(DATAFILE, H5F_ACC_TRUNC);
-
-	// Create scalar dataspace
-	DataSpace sid1(SPACE3_RANK, NULL);
-
-	//n = H5Sget_simple_extent_npoints(sid1);
-	hssize_t	n;	 	// Number of dataspace elements
-	n = sid1.getSimpleExtentNpoints();
-	verify_val((long)n, 1, "DataSpace::getSimpleExtentNpoints", __LINE__, __FILE__);
-
-	int	rank;		// Logical rank of dataspace
-	rank = sid1.getSimpleExtentNdims();
-	verify_val(rank, SPACE3_RANK, "DataSpace::getSimpleExtentNdims", __LINE__, __FILE__);
-
-	// Retrieves dimension size of dataspace sid1 and verify it
-	int ndims;		// Number of dimensions
-	hsize_t	tdims[4];	// Dimension array to test with
-	ndims = sid1.getSimpleExtentDims( tdims );
-	verify_val(ndims, 0, "DataSpace::getSimpleExtentDims", __LINE__, __FILE__);
-
-	// Verify extent type
-	H5S_class_t ext_type;   // Extent type
-	ext_type = sid1.getSimpleExtentType();
-	verify_val(ext_type, H5S_SCALAR, "DataSpace::getSimpleExtentType", __LINE__, __FILE__);
-
-	// Create and write a dataset
-	DataSet dataset = fid1.createDataSet("Dataset1", PredType::NATIVE_UINT,sid1);
-	dataset.write(&space3_data, PredType::NATIVE_UINT);
-
-	PASSED();
+        // Create file
+        H5File fid1(DATAFILE, H5F_ACC_TRUNC);
+
+        // Create scalar dataspace
+        DataSpace sid1(SPACE3_RANK, NULL);
+
+        // n = H5Sget_simple_extent_npoints(sid1);
+        hssize_t n; // Number of dataspace elements
+        n = sid1.getSimpleExtentNpoints();
+        verify_val(static_cast<long>(n), 1, "DataSpace::getSimpleExtentNpoints", __LINE__, __FILE__);
+
+        int rank; // Logical rank of dataspace
+        rank = sid1.getSimpleExtentNdims();
+        verify_val(rank, SPACE3_RANK, "DataSpace::getSimpleExtentNdims", __LINE__, __FILE__);
+
+        // Retrieves dimension size of dataspace sid1 and verify it
+        int     ndims;    // Number of dimensions
+        hsize_t tdims[4]; // Dimension array to test with
+        ndims = sid1.getSimpleExtentDims(tdims);
+        verify_val(ndims, 0, "DataSpace::getSimpleExtentDims", __LINE__, __FILE__);
+
+        // Verify extent type
+        H5S_class_t ext_type; // Extent type
+        ext_type = sid1.getSimpleExtentType();
+        verify_val(static_cast<long>(ext_type), static_cast<long>(H5S_SCALAR),
+                   "DataSpace::getSimpleExtentType", __LINE__, __FILE__);
+
+        // Create and write a dataset
+        DataSet dataset = fid1.createDataSet("Dataset1", PredType::NATIVE_UINT, sid1);
+        dataset.write(&space3_data, PredType::NATIVE_UINT);
+
+        PASSED();
     } // end of try block
-    catch (Exception E)
-    {
-	issue_fail_msg("test_h5s_scalar_write()", __LINE__, __FILE__, E.getCDetailMsg());
+    catch (Exception &E) {
+        issue_fail_msg("test_h5s_scalar_write()", __LINE__, __FILE__, E.getCDetailMsg());
     }
-}   // test_h5s_scalar_write()
+} // test_h5s_scalar_write()
 
 /*-------------------------------------------------------------------------
+ * Function:    test_h5s_scalar_read
  *
- * Function:	test_h5s_scalar_read
+ * Purpose      Test scalar H5S (dataspace) reading code
  *
- * Purpose:	Test scalar H5S (dataspace) reading code
+ * Return       None
  *
- * Return:	none
- *
- * Programmer:	Binh-Minh Ribler (using C version)
+ * Programmer   Binh-Minh Ribler (using C version)
  *              Mar 2001
  *
  * Modifications:
  *      January, 2005: C tests' macro VERIFY casts values to 'long' for all
- *		       cases.  Since there are no operator<< for 'long long'
- *		       or int64 in VS C++ ostream, I casted the hssize_t values
- *		       passed to verify_val to 'long' as well.  If problems
- *		       arises later, this will have to be specificly handled
- *		       with a special routine.
+ *              cases.  Since there are no operator<< for 'long long'
+ *              or int64 in VS C++ ostream, I casted the hssize_t values
+ *              passed to verify_val to 'long' as well.  If problems
+ *              arises later, this will have to be specifically handled
+ *              with a special routine.
  *-------------------------------------------------------------------------
  */
-static void test_h5s_scalar_read()
+static void
+test_h5s_scalar_read()
 {
-    hsize_t		tdims[4];	// Dimension array to test with
+    hsize_t tdims[4]; // Dimension array to test with
 
     // Output message about test being performed
     SUBTEST("Scalar Dataspace Reading");
 
     try {
-	// Open file
-	H5File fid1(DATAFILE, H5F_ACC_RDWR);
+        // Open file
+        H5File fid1(DATAFILE, H5F_ACC_RDWR);
 
-	// Create a dataset
-	DataSet dataset = fid1.openDataSet("Dataset1");
+        // Create a dataset
+        DataSet dataset = fid1.openDataSet("Dataset1");
 
-	DataSpace sid1 = dataset.getSpace();
+        DataSpace sid1 = dataset.getSpace();
 
-	// Get the number of dataspace elements
-	hssize_t n = sid1.getSimpleExtentNpoints();
-	verify_val((long)n, 1, "DataSpace::getSimpleExtentNpoints", __LINE__, __FILE__);
+        // Get the number of dataspace elements
+        hssize_t n = sid1.getSimpleExtentNpoints();
+        verify_val(static_cast<long>(n), 1, "DataSpace::getSimpleExtentNpoints", __LINE__, __FILE__);
 
-	// Get the logical rank of the dataspace
-	int ndims = sid1.getSimpleExtentNdims();
-	verify_val(ndims, SPACE3_RANK, "DataSpace::getSimpleExtentNdims", __LINE__, __FILE__);
+        // Get the logical rank of the dataspace
+        int ndims = sid1.getSimpleExtentNdims();
+        verify_val(ndims, SPACE3_RANK, "DataSpace::getSimpleExtentNdims", __LINE__, __FILE__);
 
-	ndims = sid1.getSimpleExtentDims(tdims);
-	verify_val(ndims, 0, "DataSpace::getSimpleExtentDims", __LINE__, __FILE__);
+        ndims = sid1.getSimpleExtentDims(tdims);
+        verify_val(ndims, 0, "DataSpace::getSimpleExtentDims", __LINE__, __FILE__);
 
-	// Read data back and verify it
-	unsigned      	rdata;      	// Scalar data read in
-	dataset.read(&rdata, PredType::NATIVE_UINT);
-	verify_val(rdata, space3_data, "DataSet::read", __LINE__, __FILE__);
+        // Read data back and verify it
+        unsigned rdata; // Scalar data read in
+        dataset.read(&rdata, PredType::NATIVE_UINT);
+        verify_val(rdata, space3_data, "DataSet::read", __LINE__, __FILE__);
 
-	PASSED();
-    }   // end of try block
-    catch (Exception E)
-    {
-	// all the exceptions caused by negative returned values by C APIs
-	issue_fail_msg("test_h5s_scalar_read()", __LINE__, __FILE__, E.getCDetailMsg());
+        PASSED();
+    } // end of try block
+    catch (Exception &E) {
+        // all the exceptions caused by negative returned values by C APIs
+        issue_fail_msg("test_h5s_scalar_read()", __LINE__, __FILE__, E.getCDetailMsg());
     }
 
-}   // test_h5s_scalar_read()
+} // test_h5s_scalar_read()
 
 /*-------------------------------------------------------------------------
+ * Function:    test_h5s_null
  *
- * Function:	test_h5s_null
+ * Purpose      Test null H5S (dataspace) code
  *
- * Purpose:	Test null H5S (dataspace) code
+ * Return       None
  *
- * Return:	none
- *
- * Programmer:	Raymond Lu (using C version)
+ * Programmer   Raymond Lu (using C version)
  *              May 18, 2004
  *
  * Modifications:
  *      January, 2005: C tests' macro VERIFY casts values to 'long' for all
- *		       cases.  Since there are no operator<< for 'long long'
- *		       or int64 in VS C++ ostream, I casted the hssize_t values
- *		       passed to verify_val to 'long' as well.  If problems
- *		       arises later, this will have to be specificly handled
- *		       with a special routine.
+ *              cases.  Since there are no operator<< for 'long long'
+ *              or int64 in VS C++ ostream, I casted the hssize_t values
+ *              passed to verify_val to 'long' as well.  If problems
+ *              arises later, this will have to be specifically handled
+ *              with a special routine.
  *-------------------------------------------------------------------------
  */
-static void test_h5s_null()
+static void
+test_h5s_null()
 {
     // Output message about test being performed
     SUBTEST("Null Dataspace Writing");
 
     try {
-	// Create file
-	H5File fid1(DATAFILE, H5F_ACC_TRUNC);
+        // Create file
+        H5File fid1(DATAFILE, H5F_ACC_TRUNC);
 
-	// Create scalar dataspace
-	DataSpace sid1(H5S_NULL);
+        // Create scalar dataspace
+        DataSpace sid1(H5S_NULL);
 
-	hssize_t	n;	 	// Number of dataspace elements
-	n = sid1.getSimpleExtentNpoints();
-	verify_val((long)n, 0, "DataSpace::getSimpleExtentNpoints", __LINE__, __FILE__);
+        hssize_t n; // Number of dataspace elements
+        n = sid1.getSimpleExtentNpoints();
+        verify_val(static_cast<long>(n), 0, "DataSpace::getSimpleExtentNpoints", __LINE__, __FILE__);
 
-	// Create a dataset
-	DataSet dataset = fid1.createDataSet("Dataset1", PredType::NATIVE_UINT,sid1);
+        // Create a dataset
+        DataSet dataset = fid1.createDataSet("Dataset1", PredType::NATIVE_UINT, sid1);
 
         // Try to write nothing to the dataset
-	dataset.write(&space5_data, PredType::NATIVE_INT);
+        dataset.write(&space5_data, PredType::NATIVE_INT);
 
         // Read the data.  Make sure no change to the buffer
-	dataset.read(&space5_data, PredType::NATIVE_INT);
-	verify_val(space5_data, 7, "DataSet::read", __LINE__, __FILE__);
+        dataset.read(&space5_data, PredType::NATIVE_INT);
+        verify_val(space5_data, 7, "DataSet::read", __LINE__, __FILE__);
 
-	PASSED();
+        PASSED();
     } // end of try block
-    catch (Exception E)
-    {
-	issue_fail_msg("test_h5s_null()", __LINE__, __FILE__, E.getCDetailMsg());
+    catch (Exception &E) {
+        issue_fail_msg("test_h5s_null()", __LINE__, __FILE__, E.getCDetailMsg());
     }
-}   // test_h5s_null()
+} // test_h5s_null()
 
 /*-------------------------------------------------------------------------
+ * Function:    test_h5s_compound_scalar_write
  *
- * Function:	test_h5s_compound_scalar_write
- *
- * Purpose:	Test scalar H5S (dataspace) writing for compound
- *		datatypes
+ * Purpose      Test scalar H5S (dataspace) writing for compound
+ *              datatypes
  *
- * Return:	none
+ * Return       None
  *
- * Programmer:	Binh-Minh Ribler (using C version)
+ * Programmer   Binh-Minh Ribler (using C version)
  *              Mar 2001
  *
  * Modifications:
  *      January, 2005: C tests' macro VERIFY casts values to 'long' for all
- *		       cases.  Since there are no operator<< for 'long long'
- *		       or int64 in VS C++ ostream, I casted the hssize_t values
- *		       passed to verify_val to 'long' as well.  If problems
- *		       arises later, this will have to be specificly handled
- *		       with a special routine.
+ *              cases.  Since there are no operator<< for 'long long'
+ *              or int64 in VS C++ ostream, I casted the hssize_t values
+ *              passed to verify_val to 'long' as well.  If problems
+ *              arises later, this will have to be specifically handled
+ *              with a special routine.
  *-------------------------------------------------------------------------
  */
-static void test_h5s_compound_scalar_write()
+static void
+test_h5s_compound_scalar_write()
 {
     // Output message about test being performed
     SUBTEST("Compound Dataspace Writing");
 
     try {
-	// Create file
-	H5File fid1(DATAFILE, H5F_ACC_TRUNC);
-
-	// Create the compound datatype.
-	CompType tid1(sizeof(struct space4_struct));
-	space4_field1_off=HOFFSET(struct space4_struct, c1);
-	tid1.insertMember(SPACE4_FIELDNAME1, space4_field1_off,
-		    PredType::NATIVE_SCHAR);
-	space4_field2_off=HOFFSET(struct space4_struct, u);
-	tid1.insertMember(SPACE4_FIELDNAME2, space4_field2_off,
-		    PredType::NATIVE_UINT);
-	space4_field3_off=HOFFSET(struct space4_struct, f);
-	tid1.insertMember(SPACE4_FIELDNAME3, space4_field3_off,
-		    PredType::NATIVE_FLOAT);
-	space4_field4_off=HOFFSET(struct space4_struct, c2);
-	tid1.insertMember(SPACE4_FIELDNAME4, space4_field4_off,
-		    PredType::NATIVE_SCHAR);
-
-	// Create scalar dataspace
-	DataSpace sid1(SPACE3_RANK, NULL);
-
-	// Get the number of dataspace elements
-	hssize_t n = sid1.getSimpleExtentNpoints();
-	verify_val((long)n, 1, "DataSpace::getSimpleExtentNpoints", __LINE__, __FILE__);
-
-	// Get the logical rank of the dataspace
-	int ndims = sid1.getSimpleExtentNdims();
-	verify_val(ndims, SPACE3_RANK, "DataSpace::getSimpleExtentNdims", __LINE__, __FILE__);
-
-	hsize_t		tdims[4];	// Dimension array to test with
-	ndims = sid1.getSimpleExtentDims(tdims);
-	verify_val(ndims, 0, "DataSpace::getSimpleExtentDims", __LINE__, __FILE__);
-
-	// Create and write a dataset
-	DataSet dataset = fid1.createDataSet("Dataset1", tid1, sid1);
-	dataset.write(&space4_data, tid1);
-
-	PASSED();
-    }	// end of try block
-    catch (Exception E)
-    {
-	// all the exceptions caused by negative returned values by C APIs
-	issue_fail_msg("test_h5s_compound_scalar_write()", __LINE__, __FILE__, E.getCDetailMsg());
+        // Create file
+        H5File fid1(DATAFILE, H5F_ACC_TRUNC);
+
+        // Create the compound datatype.
+        CompType tid1(sizeof(struct space4_struct));
+        space4_field1_off = HOFFSET(struct space4_struct, c1);
+        tid1.insertMember(SPACE4_FIELDNAME1, space4_field1_off, PredType::NATIVE_SCHAR);
+        space4_field2_off = HOFFSET(struct space4_struct, u);
+        tid1.insertMember(SPACE4_FIELDNAME2, space4_field2_off, PredType::NATIVE_UINT);
+        space4_field3_off = HOFFSET(struct space4_struct, f);
+        tid1.insertMember(SPACE4_FIELDNAME3, space4_field3_off, PredType::NATIVE_FLOAT);
+        space4_field4_off = HOFFSET(struct space4_struct, c2);
+        tid1.insertMember(SPACE4_FIELDNAME4, space4_field4_off, PredType::NATIVE_SCHAR);
+
+        // Create scalar dataspace
+        DataSpace sid1(SPACE3_RANK, NULL);
+
+        // Get the number of dataspace elements
+        hssize_t n = sid1.getSimpleExtentNpoints();
+        verify_val(static_cast<long>(n), 1, "DataSpace::getSimpleExtentNpoints", __LINE__, __FILE__);
+
+        // Get the logical rank of the dataspace
+        int ndims = sid1.getSimpleExtentNdims();
+        verify_val(ndims, SPACE3_RANK, "DataSpace::getSimpleExtentNdims", __LINE__, __FILE__);
+
+        hsize_t tdims[4]; // Dimension array to test with
+        ndims = sid1.getSimpleExtentDims(tdims);
+        verify_val(ndims, 0, "DataSpace::getSimpleExtentDims", __LINE__, __FILE__);
+
+        // Create and write a dataset
+        DataSet dataset = fid1.createDataSet("Dataset1", tid1, sid1);
+        dataset.write(&space4_data, tid1);
+
+        PASSED();
+    } // end of try block
+    catch (Exception &E) {
+        // all the exceptions caused by negative returned values by C APIs
+        issue_fail_msg("test_h5s_compound_scalar_write()", __LINE__, __FILE__, E.getCDetailMsg());
     }
-}   // test_h5s_compound_scalar_write()
+} // test_h5s_compound_scalar_write()
 
 /*-------------------------------------------------------------------------
+ * Function:    test_h5s_compound_scalar_read
  *
- * Function:	test_h5s_compound_scalar_read
- *
- * Purpose:	Test scalar H5S (dataspace) reading for compound
- *		datatypes
+ * Purpose      Test scalar H5S (dataspace) reading for compound
+ *              datatypes
  *
- * Return:	none
+ * Return       None
  *
- * Programmer:	Binh-Minh Ribler (using C version)
+ * Programmer   Binh-Minh Ribler (using C version)
  *              Mar 2001
  *
  * Modifications:
  *      January, 2005: C tests' macro VERIFY casts values to 'long' for all
- *		       cases.  Since there are no operator<< for 'long long'
- *		       or int64 in VS C++ ostream, I casted the hssize_t values
- *		       passed to verify_val to 'long' as well.  If problems
- *		       arises later, this will have to be specificly handled
- *		       with a special routine.
+ *              cases.  Since there are no operator<< for 'long long'
+ *              or int64 in VS C++ ostream, I casted the hssize_t values
+ *              passed to verify_val to 'long' as well.  If problems
+ *              arises later, this will have to be specifically handled
+ *              with a special routine.
  *-------------------------------------------------------------------------
  */
-static void test_h5s_compound_scalar_read()
+static void
+test_h5s_compound_scalar_read()
 {
-    hsize_t		tdims[4];	// Dimension array to test with
+    hsize_t tdims[4]; // Dimension array to test with
 
     // Output message about test being performed
     SUBTEST("Compound Dataspace Reading");
     try {
-	// Open file
-	H5File fid1(DATAFILE, H5F_ACC_RDWR);
-
-	// Create a dataset
-	DataSet dataset = fid1.openDataSet("Dataset1");
-
-	DataSpace sid1 = dataset.getSpace();
-
-	// Get the number of dataspace elements
-	hssize_t n = sid1.getSimpleExtentNpoints();
-	verify_val((long)n, 1, "DataSpace::getSimpleExtentNpoints", __LINE__, __FILE__);
-
-	// Get the logical rank of the dataspace
-	int ndims = sid1.getSimpleExtentNdims();
-	verify_val(ndims, SPACE3_RANK, "DataSpace::getSimpleExtentNdims", __LINE__, __FILE__);
-
-	ndims = sid1.getSimpleExtentDims(tdims);
-	verify_val(ndims, 0, "DataSpace::getSimpleExtentDims", __LINE__, __FILE__);
-
-	// Get the datatype of this dataset.
-	CompType type(dataset);
-
-	struct space4_struct rdata; 	// Scalar data read in
-	dataset.read(&rdata, type);
-
-	// Verify read data
-	if(HDmemcmp(&space4_data,&rdata,sizeof(struct space4_struct)))
-	{
-            cerr << "scalar data different: space4_data.c1="
-		<< space4_data.c1 << ", read_data4.c1=" << rdata.c1 << endl;
-            cerr << "scalar data different: space4_data.u="
-		<< space4_data.u << ", read_data4.u=" << rdata.u << endl;
-            cerr << "scalar data different: space4_data.f="
-		<< space4_data.f << ", read_data4.f=" << rdata.f << endl;
-            TestErrPrintf("scalar data different: space4_data.c1=%c, read_data4.c1=%c\n",
-		space4_data.c1, rdata.c2);
-	} // end if
-	PASSED();
-    }   // end of try block
-    catch (Exception E)
-    {
-	// all the exceptions caused by negative returned values by C APIs
-	issue_fail_msg("test_h5s_compound_scalar_read()", __LINE__, __FILE__, E.getCDetailMsg());
+        // Open file
+        H5File fid1(DATAFILE, H5F_ACC_RDWR);
+
+        // Create a dataset
+        DataSet dataset = fid1.openDataSet("Dataset1");
+
+        DataSpace sid1 = dataset.getSpace();
+
+        // Get the number of dataspace elements
+        hssize_t n = sid1.getSimpleExtentNpoints();
+        verify_val(static_cast<long>(n), 1, "DataSpace::getSimpleExtentNpoints", __LINE__, __FILE__);
+
+        // Get the logical rank of the dataspace
+        int ndims = sid1.getSimpleExtentNdims();
+        verify_val(ndims, SPACE3_RANK, "DataSpace::getSimpleExtentNdims", __LINE__, __FILE__);
+
+        ndims = sid1.getSimpleExtentDims(tdims);
+        verify_val(ndims, 0, "DataSpace::getSimpleExtentDims", __LINE__, __FILE__);
+
+        // Get the datatype of this dataset.
+        CompType type(dataset);
+
+        struct space4_struct rdata; // Scalar data read in
+        dataset.read(&rdata, type);
+
+        // Verify read data
+        if (HDmemcmp(&space4_data, &rdata, sizeof(struct space4_struct)) != 0) {
+            cerr << "scalar data different: space4_data.c1=" << space4_data.c1
+                 << ", read_data4.c1=" << rdata.c1 << endl;
+            cerr << "scalar data different: space4_data.u=" << space4_data.u << ", read_data4.u=" << rdata.u
+                 << endl;
+            cerr << "scalar data different: space4_data.f=" << space4_data.f << ", read_data4.f=" << rdata.f
+                 << endl;
+            TestErrPrintf("scalar data different: space4_data.c1=%c, read_data4.c1=%c\n", space4_data.c1,
+                          rdata.c2);
+        } // end if
+        PASSED();
+    } // end of try block
+    catch (Exception &E) {
+        // all the exceptions caused by negative returned values by C APIs
+        issue_fail_msg("test_h5s_compound_scalar_read()", __LINE__, __FILE__, E.getCDetailMsg());
     }
-}   // test_h5s_compound_scalar_read()
+} // test_h5s_compound_scalar_read()
 
 /*-------------------------------------------------------------------------
+ * Function:    test_h5s
  *
- * Function:	test_h5s
- *
- * Purpose:	Main dataspace testing routine
+ * Purpose      Main dataspace testing routine
  *
- * Return:	none
+ * Return       None
  *
- * Programmer:	Binh-Minh Ribler (using C version)
+ * Programmer   Binh-Minh Ribler (using C version)
  *              Mar 2001
- *
- * Modifications:
  *-------------------------------------------------------------------------
  */
-#ifdef __cplusplus
-extern "C"
-#endif
-void test_h5s()
+extern "C" void
+test_h5s()
 {
     // Output message about test being performed
     MESSAGE(5, ("Testing Dataspaces\n"));
 
-    test_h5s_basic();		// Test basic H5S code
-    test_h5s_scalar_write();	// Test scalar H5S writing code
-    test_h5s_scalar_read();	// Test scalar H5S reading code
-    test_h5s_null();		// Test null H5S code
-    test_h5s_compound_scalar_write();	// Test compound datatype scalar H5S writing code
-    test_h5s_compound_scalar_read();	// Test compound datatype scalar H5S reading code
-}   // test_h5s()
+    test_h5s_basic();                 // Test basic H5S code
+    test_h5s_scalar_write();          // Test scalar H5S writing code
+    test_h5s_scalar_read();           // Test scalar H5S reading code
+    test_h5s_null();                  // Test null H5S code
+    test_h5s_compound_scalar_write(); // Test compound datatype scalar H5S writing code
+    test_h5s_compound_scalar_read();  // Test compound datatype scalar H5S reading code
+} // test_h5s()
 
-
 /*-------------------------------------------------------------------------
- * Function:	cleanup_h5s
- *
- * Purpose:	Cleanup temporary test files
- *
- * Return:	none
+ * Function:    cleanup_h5s
  *
- * Programmer:	Albert Cheng
- *              July 2, 1998
- *
- * Modifications:
+ * Purpose      Cleanup temporary test files
  *
+ * Return       None
  *-------------------------------------------------------------------------
  */
-#ifdef __cplusplus
-extern "C"
-#endif
-void cleanup_h5s()
+extern "C" void
+cleanup_h5s()
 {
     HDremove(DATAFILE.c_str());
-}   // cleanup_h5s
-
+} // cleanup_h5s
diff --git a/c++/test/titerate.cpp b/c++/test/titerate.cpp
new file mode 100644
index 0000000..5d20f80
--- /dev/null
+++ b/c++/test/titerate.cpp
@@ -0,0 +1,480 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/*****************************************************************************
+    FILE
+        titerate.cpp - HDF5 C++ testing iterate related functionality
+
+ ***************************************************************************/
+#include <iostream>
+using std::cerr;
+using std::endl;
+
+#include <string>
+#include "H5Cpp.h" // C++ API header file
+using namespace H5;
+
+#include "h5test.h"
+#include "h5cpputil.h" // C++ utilility header file
+
+/* Number of datasets for group iteration test */
+#define NDATASETS 50
+
+/* Number of attributes for attribute iteration test */
+//#define NATTR 50
+
+/* Number of groups for second group iteration test */
+//#define ITER_NGROUPS 150
+
+/* General maximum length of names used */
+#define NAMELEN 80
+
+/* 1-D dataset with fixed dimensions */
+//#define SPACE1_RANK     1
+//#define SPACE1_DIM1     4
+
+const H5std_string FILE_ITERATE("titerate.h5");
+const H5std_string GROUP1("Top Group");
+const H5std_string GROUP1_PATH("/Top Group");
+const H5std_string GROUP1_1("Sub-Group 1.1");
+const H5std_string GROUP1_1_PATH("/Top Group/Sub-Group 1.1");
+const H5std_string GROUP1_2("Sub-Group 1.2");
+const H5std_string GROUP1_2_PATH("/Top Group/Sub-Group 1.2");
+const H5std_string DSET_DEFAULT_NAME("default");
+const H5std_string DSET_IN_FILE("Dataset in File");
+const H5std_string DSET_IN_FILE_PATH("/Dataset in File");
+const H5std_string DSET_IN_GRP1("Dataset in Group 1");
+const H5std_string DSET_IN_GRP1_PATH("/Top Group/Dataset in Group 1");
+const H5std_string DSET_IN_GRP1_2("Dataset in Group 1.2");
+const H5std_string DSET_IN_GRP1_2_PATH("/Top Group/Sub-Group 1.2/Dataset in Group 1.2");
+
+typedef enum { RET_ZERO, RET_TWO, RET_CHANGE, RET_CHANGE2 } iter_enum;
+
+/* Custom group iteration callback data */
+typedef struct {
+    char       name[NAMELEN]; /* The name of the object */
+    H5O_type_t type;          /* The type of the object */
+    iter_enum  command;       /* The type of return value */
+} iter_info;
+
+static int  iter_strcmp(const void *s1, const void *s2);
+static void printelems(const Group &group, const H5std_string &dsname, const H5std_string &atname);
+
+/*-------------------------------------------------------------------------
+ * Function:    iter_strcmp
+ *
+ * Purpose      String comparison routine for qsort
+ *-------------------------------------------------------------------------
+ */
+static int
+iter_strcmp(const void *s1, const void *s2)
+{
+    return (HDstrcmp(*reinterpret_cast<const char *const *>(s1), *reinterpret_cast<const char *const *>(s2)));
+}
+
+/*-------------------------------------------------------------------------
+ * Function:    liter_cb
+ *
+ * Purpose      Custom link iteration callback routine
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+liter_cb(hid_t H5_ATTR_UNUSED group, const char *name, const H5L_info2_t H5_ATTR_UNUSED *link_info,
+         void *op_data)
+{
+    iter_info *info   = static_cast<iter_info *>(op_data);
+    static int count  = 0;
+    static int count2 = 0;
+
+    HDstrcpy(info->name, name);
+
+    switch (info->command) {
+        case RET_ZERO:
+            return (0);
+
+        case RET_TWO:
+            return (2);
+
+        case RET_CHANGE:
+            count++;
+            return (count > 10 ? 1 : 0);
+
+        case RET_CHANGE2:
+            count2++;
+            return (count2 > 10 ? 1 : 0);
+
+        default:
+            printf("invalid iteration command");
+            return (-1);
+    } /* end switch */
+} /* end liter_cb() */
+
+/*-------------------------------------------------------------------------
+ * Function:    test_iter_group
+ *
+ * Purpose      Tests group iteration
+ *
+ * Return       Success: 0
+ *              Failure: -1
+ *
+ * Programmer   Binh-Minh Ribler
+ *              Friday, September 9, 2016
+ *-------------------------------------------------------------------------
+ */
+static void
+test_iter_group(FileAccPropList &fapl)
+{
+    hsize_t   idx;                   /* Index in the group */
+    char      name[NAMELEN];         /* temporary name buffer */
+    char     *lnames[NDATASETS + 2]; /* Names of the links created */
+    iter_info info;                  /* Custom iteration information */
+    herr_t    ret;                   /* Generic return value */
+
+    /* Output message about test being performed */
+    SUBTEST("Group Iteration");
+
+    /* Create the test file with the datasets */
+    try {
+        // Create file
+        H5File file(FILE_ITERATE, H5F_ACC_TRUNC, FileCreatPropList::DEFAULT, fapl);
+
+        /* Test iterating over empty group */
+        info.command = RET_ZERO;
+        idx          = 0;
+        ret          = H5Literate2(file.getId(), H5_INDEX_NAME, H5_ITER_INC, &idx, liter_cb, &info);
+        verify_val(ret, SUCCEED, "H5Literate", __LINE__, __FILE__);
+
+        DataType datatype(PredType::NATIVE_INT);
+
+        // Create a scalar file space
+        DataSpace filespace;
+
+        for (int i = 0; i < NDATASETS; i++) {
+            snprintf(name, sizeof(name), "Dataset %d", i);
+
+            // Create a dataset in the file
+            DataSet dataset = file.createDataSet(name, datatype, filespace);
+
+            /* Keep a copy of the dataset names */
+            lnames[i] = HDstrdup(name);
+            check_values(lnames[i], "HDstrdup returns NULL", __LINE__, __FILE__);
+        }
+
+        /* Create a group and named datatype under root group for testing */
+        Group grp(file.createGroup(GROUP1, 0));
+        lnames[NDATASETS] = HDstrdup("grp");
+        check_values(lnames[NDATASETS], "HDstrdup returns NULL", __LINE__, __FILE__);
+
+        datatype.commit(file, "dtype");
+        lnames[NDATASETS + 1] = HDstrdup("dtype");
+        check_values(lnames[NDATASETS], "HDstrdup returns NULL", __LINE__, __FILE__);
+
+        /* Sort the dataset names */
+        HDqsort(lnames, NDATASETS + 2, sizeof(char *), iter_strcmp);
+
+        /* Iterate through the datasets in the root group in various ways */
+
+        // Open data file to read
+        file.openFile(FILE_ITERATE, H5F_ACC_RDONLY, fapl);
+
+        // Open the root group
+        Group root_group(file.openGroup("/"));
+
+        // Get the number of object in the root group
+        hsize_t nobjs = root_group.getNumObjs();
+        verify_val(static_cast<long>(nobjs), NDATASETS + 2, "H5Gget_info", __LINE__, __FILE__);
+
+        H5std_string obj_name;
+        for (hsize_t i = 0; i < nobjs; i++) {
+            // H5O_info2_t oinfo;                /* Object info */
+
+            obj_name = root_group.getObjnameByIdx(i);
+            // ret = (herr_t)H5Lget_name_by_idx(root_group, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)i,
+            // dataset_name, (size_t)NAMELEN, H5P_DEFAULT);
+
+            // oinfo = root_group.childObjType((hsize_t)i, H5_INDEX_NAME, H5_ITER_INC,  ".");
+            // ret = H5Oget_info_by_idx(root_group, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)i, &oinfo,
+            // H5P_DEFAULT);
+        }
+
+        // Attempted to iterate with invalid index, should fail
+        try {
+            obj_name = root_group.getObjnameByIdx(NDATASETS + 3);
+
+            // Should FAIL but didn't, so throw an invalid action exception
+            throw InvalidActionException("Group::getObjnameByIdx", "Attempt to iterate with invalid index");
+        }
+        catch (GroupIException &invalid_action) // invalid index
+        {
+        } // do nothing, exception expected
+
+        // Attempted to iterate with negative index, should fail
+        try {
+            info.command = RET_ZERO;
+            idx          = HSIZE_UNDEF;
+            obj_name     = root_group.getObjnameByIdx(idx);
+
+            // Should FAIL but didn't, so throw an invalid action exception
+            throw InvalidActionException("Group::getObjnameByIdx", "Attempt to iterate with negative index");
+        }
+        catch (FileIException &invalid_action) // invalid index
+        {
+        }                                       // do nothing, exception expected
+        catch (GroupIException &invalid_action) // invalid index
+        {
+        } // do nothing, exception expected
+
+        /* Test skipping exactly as many entries as in the group */
+        try {
+            info.command = RET_ZERO;
+            idx          = NDATASETS + 2;
+            obj_name     = root_group.getObjnameByIdx(idx);
+
+            // Should FAIL but didn't, so throw an invalid action exception
+            throw InvalidActionException("Group::getObjnameByIdx", "Attempt to iterate with negative index");
+        }
+        catch (FileIException &invalid_action) // invalid index
+        {
+        }                                       // do nothing, exception expected
+        catch (GroupIException &invalid_action) // invalid index
+        {
+        } // do nothing, exception expected
+
+        /* Test skipping more entries than are in the group */
+        try {
+            info.command = RET_ZERO;
+            idx          = NDATASETS + 3;
+            obj_name     = root_group.getObjnameByIdx(idx);
+
+            // Should FAIL but didn't, so throw an invalid action exception
+            throw InvalidActionException("Group::getObjnameByIdx", "Attempt to iterate with negative index");
+        }
+        catch (FileIException &invalid_action) // invalid index
+        {
+        }                                       // do nothing, exception expected
+        catch (GroupIException &invalid_action) // invalid index
+        {
+        } // do nothing, exception expected
+
+        /* Free the dataset names */
+        for (int i = 0; i < NDATASETS + 2; i++)
+            HDfree(lnames[i]);
+
+        // Everything will be closed as they go out of scope
+
+        PASSED();
+    } // try block
+
+    // catch all other exceptions
+    catch (Exception &E) {
+        issue_fail_msg("test_iter_group", __LINE__, __FILE__);
+    }
+
+#if 0
+    /* Test all objects in group, when callback always returns 0 */
+    info.command = RET_ZERO;
+    idx = 0;
+    if((ret = H5Literate2(file, H5_INDEX_NAME, H5_ITER_INC, &idx, liter_cb, &info)) > 0)
+        TestErrPrintf("Group iteration function didn't return zero correctly!\n");
+
+    /* Test all objects in group, when callback always returns 1 */
+    /* This also tests the "restarting" ability, because the index changes */
+    info.command = RET_TWO;
+    i = 0;
+    idx = 0;
+    while((ret = H5Literate2(file, H5_INDEX_NAME, H5_ITER_INC, &idx, liter_cb, &info)) > 0) {
+        /* Verify return value from iterator gets propagated correctly */
+        verify_val(ret, 2, "H5Literate", __LINE__, __FILE__);
+
+        /* Increment the number of times "2" is returned */
+        i++;
+
+        /* Verify that the index is the correct value */
+        verify_val(idx, (hsize_t)i, "H5Literate", __LINE__, __FILE__);
+        if(idx > (NDATASETS + 2))
+            TestErrPrintf("Group iteration function walked too far!\n");
+
+        /* Verify that the correct name is retrieved */
+        if(HDstrcmp(info.name, lnames[(size_t)(idx - 1)]) != 0)
+            TestErrPrintf("Group iteration function didn't return name correctly for link - lnames[%u] = '%s'!\n", (unsigned)(idx - 1), lnames[(size_t)(idx - 1)]);
+    } /* end while */
+    verify_val(ret, -1, "H5Literate", __LINE__, __FILE__);
+
+    if(i != (NDATASETS + 2))
+        TestErrPrintf("%u: Group iteration function didn't perform multiple iterations correctly!\n", __LINE__);
+
+    /* Test all objects in group, when callback changes return value */
+    /* This also tests the "restarting" ability, because the index changes */
+    info.command = new_format ? RET_CHANGE2 : RET_CHANGE;
+    i = 0;
+    idx = 0;
+    while((ret = H5Literate2(file, H5_INDEX_NAME, H5_ITER_INC, &idx, liter_cb, &info)) >= 0) {
+        /* Verify return value from iterator gets propagated correctly */
+        verify_val(ret, 1, "H5Literate", __LINE__, __FILE__);
+
+        /* Increment the number of times "1" is returned */
+        i++;
+
+        /* Verify that the index is the correct value */
+        verify_val(idx, (hsize_t)(i + 10), "H5Literate", __LINE__, __FILE__);
+        if(idx > (NDATASETS + 2))
+            TestErrPrintf("Group iteration function walked too far!\n");
+
+        /* Verify that the correct name is retrieved */
+        if(HDstrcmp(info.name, lnames[(size_t)(idx - 1)]) != 0)
+            TestErrPrintf("Group iteration function didn't return name correctly for link - lnames[%u] = '%s'!\n", (unsigned)(idx - 1), lnames[(size_t)(idx - 1)]);
+    } /* end while */
+    verify_val(ret, -1, "H5Literate", __LINE__, __FILE__);
+
+    if(i != 42 || idx != 52)
+        TestErrPrintf("%u: Group iteration function didn't perform multiple iterations correctly!\n", __LINE__);
+
+    ret = H5Fclose(file);
+    CHECK(ret, FAIL, "H5Fclose");
+
+#endif
+} /* test_iter_group() */
+
+/*-------------------------------------------------------------------------
+ * Function:    printelems
+ *
+ * Purpose      Open an attribute and verify that it has a the correct name
+ *-------------------------------------------------------------------------
+ */
+const H5std_string FILE_NAME("test_member_access.h5");
+const H5std_string GRP_NAME("/Group_A");
+const H5std_string FDATASET_NAME("file dset");
+const H5std_string GDATASET_NAME("group dset");
+const H5std_string ATTR_NAME("Units");
+const H5std_string FATTR_NAME("F attr");
+const H5std_string GATTR_NAME("G attr");
+const int          DIM1 = 2;
+static void
+printelems(const Group &group, const H5std_string &dsname, const H5std_string &atname)
+{
+    try {
+        DataSet   d1(group.openDataSet(dsname));
+        DataSpace s1 = d1.getSpace();
+        s1.close();
+        d1.close();
+
+        unsigned     idx = 0;
+        Attribute    a1(group.openAttribute(idx));
+        H5std_string aname = a1.getName();
+        verify_val(aname, atname, "printelems", __LINE__, __FILE__);
+
+        a1.close();
+    }
+    // Catch all exceptions and rethrow so caller can handle
+    catch (Exception &E) {
+        throw;
+    }
+}
+
+/*-------------------------------------------------------------------------
+ * Function:    test_HDFFV_9920
+ *
+ * Purpose      Tests the fix for HDFFV-9920
+ *
+ * Programmer   Binh-Minh Ribler
+ *              Friday, September 9, 2016
+ *-------------------------------------------------------------------------
+ */
+static void
+test_HDFFV_9920()
+{
+    int     attr_data[2] = {100, 200};
+    hsize_t dims[1]      = {DIM1};
+
+    /* Output message about test being performed */
+    SUBTEST("Member access");
+
+    try {
+        // Create a new file and a group in it
+        H5File file(FILE_NAME, H5F_ACC_TRUNC);
+
+        Group gr1(file.createGroup(GRP_NAME));
+
+        // Create the data space for the attribute.
+        DataSpace dspace = DataSpace(1, dims);
+
+        DataSet fds = file.createDataSet(FDATASET_NAME, PredType::STD_I32BE, dspace);
+        DataSet gds = gr1.createDataSet(GDATASET_NAME, PredType::STD_I32BE, dspace);
+
+        // Create a file attribute and a group attribute.
+        Attribute fa1 = file.createAttribute(FATTR_NAME, PredType::STD_I32BE, dspace);
+        Attribute ga1 = gr1.createAttribute(GATTR_NAME, PredType::STD_I32BE, dspace);
+
+        // Write the attribute data.
+        fa1.write(PredType::NATIVE_INT, attr_data);
+        ga1.write(PredType::NATIVE_INT, attr_data);
+
+        fa1.close();
+        ga1.close();
+        fds.close();
+        gds.close();
+
+        // Verify the attributes have correct names.
+        printelems(file, FDATASET_NAME, FATTR_NAME);
+        printelems(gr1, GDATASET_NAME, GATTR_NAME);
+
+        PASSED();
+    } // end of try block
+
+    // Catch all failures for handling in the same way
+    catch (Exception &E) {
+        issue_fail_msg("test_HDFFV_9920()", __LINE__, __FILE__, E.getCDetailMsg());
+    }
+}
+
+/*-------------------------------------------------------------------------
+ * Function:    test_iterate
+ *
+ * Purpose      Tests iterate functionality
+ *
+ * Return       Success: 0
+ *              Failure: -1
+ *
+ * Programmer   Binh-Minh Ribler
+ *              Tuesday, September 6, 2016
+ *-------------------------------------------------------------------------
+ */
+extern "C" void
+test_iterate()
+{
+    // Output message about test being performed
+    MESSAGE(5, ("Testing Iterate Feature\n"));
+
+    // Create access property with latest library version.
+    FileAccPropList fapl;
+    fapl.setLibverBounds(H5F_LIBVER_LATEST, H5F_LIBVER_LATEST);
+
+    test_iter_group(fapl); // Test iterating groups
+    test_HDFFV_9920();     // Test the fix of HDFFV-9920
+    // test_iter_attr(fapl);    // Test iterating attributes
+
+} // test_iterate
+
+/*-------------------------------------------------------------------------
+ * Function:    cleanup_iterate
+ *
+ * Purpose      Cleanup temporary test files
+ *
+ * Return       none
+ *-------------------------------------------------------------------------
+ */
+extern "C" void
+cleanup_iterate()
+{
+    HDremove(FILE_ITERATE.c_str());
+    HDremove(FILE_NAME.c_str());
+} // cleanup_iterate
diff --git a/c++/test/tlinks.cpp b/c++/test/tlinks.cpp
index 291b649..ebb457a 100644
--- a/c++/test/tlinks.cpp
+++ b/c++/test/tlinks.cpp
@@ -4,12 +4,10 @@
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*****************************************************************************
@@ -18,705 +16,760 @@
         C link interface (H5L)
 
  ***************************************************************************/
-
-#ifdef OLD_HEADER_FILENAME
-#include <iostream.h>
-#else
 #include <iostream>
-#endif
-#include <string>
+using std::cerr;
+using std::endl;
 
-#ifndef H5_NO_NAMESPACE
-#ifndef H5_NO_STD
-    using std::cerr;
-    using std::endl;
-#endif  // H5_NO_STD
-#endif
+#include <string>
+#include "H5Cpp.h" // C++ API header file
+using namespace H5;
 
-#include "H5Cpp.h"      // C++ API header file
+#include "h5test.h"
+#include "h5cpputil.h" // C++ utilility header file
 
-#ifndef H5_NO_NAMESPACE
-    using namespace H5;
-#endif
+#define NAME_BUF_SIZE 1024
+#define H5L_DIM1      100
+#define H5L_DIM2      100
 
-#include "h5cpputil.h"  // C++ test utilility header file
+// Object visit structs
+typedef struct {
+    const char *path; /* Path to object */
+    H5O_type_t  type; /* Type of object */
+} obj_visit_t;
 
-// A lot of the definition inherited from C test links.c is left here until
-// the H5L API is implemented and tests are completed - BMR 10/19/2009
-/*
- * This file needs to access private information from the H5G package.
- * This file also needs to access the group testing code.
- */
-//#define H5G_PACKAGE
-//#define H5G_TESTING
-
-//#include "h5test.h"
-//#include "H5Gpkg.h"		/* Groups 				*/
-//#include "H5Iprivate.h"		/* IDs			  		*/
-//#include "H5Lprivate.h"         /* Links                                */
-
-/* File for external link test.  Created with gen_udlinks.c */
-#define LINKED_FILE  "be_extlink2.h5"
-
-#ifdef H5_VMS
-#if 0
-const char *FILENAME[] = {
-    "links0",
-    "links1",
-    "links2",
-    "links3",
-    "links4a", /* 4 */
-    "links4b", /* 5 */
-    "links4c", /* 6 */
-    "links4d", /* 7 */
-    "links5",  /* 8 */
-    "links6",  /* 9 */
-    "links7",  /* 10 */
-    "links8",  /* 11 */
-    "extlinks0",	/* 12: main files */
-    "[.tmp]extlinks0",	/* 13: */
-    "extlinks1",	/* 14: target files */
-    "[.tmp]extlinks1",	/* 15: */
-    "extlinks2",	/* 16: */
-    "[.tmp]extlinks2",	/* 17: */
-    "extlinks3",	/* 18: */
-    "[.tmp]extlinks3",	/* 19: */
-    "extlinks4",	/* 20: */
-    "[.tmp]extlinks4",	/* 21: */
-    "extlinks5",	/* 22: */
-    "[.tmp]extlinks6",	/* 23: */
-    "extlinks7",	/* 24: */
-    "[.tmp]extlinks7",	/* 25: */
-    "[.tmp]extlinks8",	/* 26: */
-    "extlinks9",	/* 27: */
-    "[.tmp]extlinks9",	/* 28: */
-    "extlinks10",	/* 29: */ /* TESTS for windows */
-    "[.tmp]extlinks10",	/* 30: */
-    "[.tmp]extlinks11",	/* 31: */
-    "[.tmp]extlinks12",	/* 32: */
-    "extlinks13",	/* 33: */
-    "[.tmp]extlinks13",	/* 34: */
-    "[.tmp]extlinks14",	/* 35: */
-    "[.tmp]extlinks15",	/* 36: */
-    "extlinks16A",	/* 37: */ /* TESTS for H5P_set_elink_fapl */
-    "extlinks16B",	/* 38: */
-    "extlinks17",	/* 39: */
-    "extlinks18A",	/* 40: */
-    "extlinks18B",	/* 41: */
-    "extlinks19A",	/* 42: */
-    "extlinks19B",	/* 43: */
-    "extlinks20",	/* 44: */
-    NULL
-};
-#endif // 0
-
-#define TMPDIR          "[.tmp]"
-#else
-#if 0
-const char *FILENAME[] = {
-    "links0",
-    "links1",
-    "links2",
-    "links3",
-    "links4a", /* 4 */
-    "links4b", /* 5 */
-    "links4c", /* 6 */
-    "links4d", /* 7 */
-    "links5",  /* 8 */
-    "links6",  /* 9 */
-    "links7",  /* 10 */
-    "links8",  /* 11 */
-    "extlinks0",	/* 12: main files */
-    "tmp/extlinks0",	/* 13: */
-    "extlinks1",	/* 14: target files */
-    "tmp/extlinks1",	/* 15: */
-    "extlinks2",	/* 16: */
-    "tmp/extlinks2",	/* 17: */
-    "extlinks3",	/* 18: */
-    "tmp/extlinks3",	/* 19: */
-    "extlinks4",	/* 20: */
-    "tmp/extlinks4",	/* 21: */
-    "extlinks5",	/* 22: */
-    "tmp/extlinks6",	/* 23: */
-    "extlinks7",	/* 24: */
-    "tmp/extlinks7",	/* 25: */
-    "tmp/extlinks8",	/* 26: */
-    "extlinks9",	/* 27: */
-    "tmp/extlinks9",	/* 28: */
-    "extlinks10",	/* 29: */ /* TESTS for windows */
-    "tmp/extlinks10",	/* 30: */
-    "tmp/extlinks11",	/* 31: */
-    "tmp/extlinks12",	/* 32: */
-    "extlinks13",	/* 33: */
-    "tmp/extlinks13",	/* 34: */
-    "tmp/extlinks14",	/* 35: */
-    "tmp/extlinks15",	/* 36: */
-    "extlinks16A",	/* 37: */ /* TESTS for H5P_set_elink_fapl */
-    "extlinks16B",	/* 38: */
-    "extlinks17",	/* 39: */
-    "extlinks18A",	/* 40: */
-    "extlinks18B",	/* 41: */
-    "extlinks19A",	/* 42: */
-    "extlinks19B",	/* 43: */
-    "extlinks20",	/* 44: */
-    NULL
-};
+// User data for callback function
+typedef struct {
+    unsigned           idx;  /* Index in object visit structure */
+    const obj_visit_t *info; /* Pointer to the object visit structure to use */
+} ovisit_ud_t;
 
-#endif // 0
+static const char *FILENAME[] = {"link0", "link1.h5", "link2.h5", "visit", NULL};
 
-#define TMPDIR          "tmp"
-#endif
+/*-------------------------------------------------------------------------
+ * Function:    test_basic_links
+ *
+ * Purpose      Test building a file with assorted links.
+ *
+ * Return       Success: 0
+ *              Failure: -1
+ *
+ * October 16, 2009
+ *-------------------------------------------------------------------------
+ */
+static void
+test_basic_links(hid_t fapl_id, hbool_t new_format)
+{
+    hsize_t size[1] = {1};
+    char    filename[NAME_BUF_SIZE];
 
-#define FAMILY_SIZE	1024
-#define CORE_INCREMENT  1024
-#define NUM400		400
+    // Use the file access template id to create a file access prop. list.
+    FileAccPropList fapl(fapl_id);
 
-/* do not do check_all_closed() for "ext*" files and "tmp/ext*" */
-#define EXTSTOP		12
+    try {
+        if (new_format)
+            SUBTEST("Link creation (w/new group format)")
+        else
+            SUBTEST("Link creation")
 
-#define LINK_BUF_SIZE   1024
-#define NAME_BUF_SIZE   1024
-#define MAX_NAME_LEN    ((64*1024)+1024)
+        h5_fixname(FILENAME[0], fapl_id, filename, sizeof filename);
+        H5File file(filename, H5F_ACC_TRUNC, FileCreatPropList::DEFAULT, fapl);
 
-/* Link type IDs */
-#define UD_HARD_TYPE 201
-#define UD_CB_TYPE H5L_TYPE_MAX
-#define UD_PLIST_TYPE 128
-#define UD_CBFAIL_TYPE UD_PLIST_TYPE
-#define UD_ERROR_TYPE 189
-#define UD_BAD_TYPE1 H5L_TYPE_HARD
-#define UD_BAD_TYPE2 (H5L_TYPE_UD_MIN - 5)
-#define UD_BAD_VERS (H5L_LINK_CLASS_T_VERS + 1)
+        // Create simple dataspace
+        DataSpace scalar(1, size, size);
 
-#define DEST_PROP_NAME "destination_group"
-#define REREG_TARGET_NAME "rereg_target"
+        // Create a group then close it by letting the object go out of scope
+        {
+            Group group(file.createGroup("grp1", 0));
+        }
 
-#define UD_CB_LINK_NAME "ud_callback_link"
-#define NEW_UD_CB_LINK_NAME "ud_callback_link2"
-#define UD_CB_TARGET "ud_target"
-#define UD_CB_TARGET_LEN 10
+        // Create a dataset then close it by letting the object go out of scope
+        {
+            DataSet dset1(file.createDataSet("dset1", PredType::NATIVE_INT, scalar));
+        }
 
-#define LE_FILENAME "le_extlink1.h5"
-#define BE_FILENAME "be_extlink1.h5"
+        hid_t file_id = file.getId();
 
-#define ELINK_CB_FAM_SIZE (hsize_t) 100
+        // Because these are not implemented in the C++ API yet, they are
+        // used so CommonFG::getLinkval can be tested.
+        // Create a hard link
+        if (H5Lcreate_hard(file_id, "dset1", H5L_SAME_LOC, "grp1/hard1", H5P_DEFAULT, H5P_DEFAULT) < 0)
+            throw Exception("test_basic_links", "H5Lcreate_hard failed");
 
-#define H5L_DIM1 100
-#define H5L_DIM2 100
+        // Create a symbolic link
+        if (H5Lcreate_soft("/dset1", file_id, "grp1/soft", H5P_DEFAULT, H5P_DEFAULT) < 0)
+            throw Exception("test_basic_links", "H5Lcreate_soft failed");
 
-/* Creation order macros */
-#define CORDER_GROUP_NAME       "corder_group"
-#define CORDER_SOFT_GROUP_NAME  "corder_soft_group"
-#define CORDER_NLINKS               18
-#define CORDER_ITER_STOP            3
-#define CORDER_EST_ENTRY_LEN        9
+        // Create a symbolic link to something that doesn't exist
+        if (H5Lcreate_soft("foobar", file_id, "grp1/dangle", H5P_DEFAULT, H5P_DEFAULT) < 0)
+            throw Exception("test_basic_links", "H5Lcreate_soft failed");
 
-/* Timestamp macros */
-#define TIMESTAMP_GROUP_1       "timestamp1"
-#define TIMESTAMP_GROUP_2       "timestamp2"
+        // Create a recursive symbolic link
+        if (H5Lcreate_soft("/grp1/recursive", file_id, "/grp1/recursive", H5P_DEFAULT, H5P_DEFAULT) < 0)
+            throw Exception("test_basic_links", "H5Lcreate_soft failed");
 
-/* Link iteration struct */
-typedef struct {
-    H5_iter_order_t order;      /* Direction of iteration */
-    unsigned ncalled;           /* # of times callback is entered */
-    unsigned nskipped;          /* # of links skipped */
-    int stop;                   /* # of iterations to stop after */
-    int64_t curr;               /* Current creation order value */
-    size_t max_visit;           /* Size of "visited link" flag array */
-    hbool_t *visited;           /* Pointer to array of "visited link" flags */
-} link_iter_info_t;
-
-#if 0
-/* Link visit structs */
-typedef struct {
-    const char *path;           /* Path to link */
-    H5L_type_t type;            /* Type of link */
-} link_visit_t;
-static const link_visit_t lvisit0[] = {
-    {"Dataset_zero", H5L_TYPE_HARD},
-    {"Group1", H5L_TYPE_HARD},
-    {"Group1/Dataset_one", H5L_TYPE_HARD},
-    {"Group1/Group2", H5L_TYPE_HARD},
-    {"Group1/Group2/Dataset_two", H5L_TYPE_HARD},
-    {"Group1/Group2/Type_two", H5L_TYPE_HARD},
-    {"Group1/Group2/hard_zero", H5L_TYPE_HARD},
-    {"Group1/Type_one", H5L_TYPE_HARD},
-    {"Group1/hard_one", H5L_TYPE_HARD},
-    {"Type_zero", H5L_TYPE_HARD},
-    {"ext_dangle", H5L_TYPE_EXTERNAL},
-    {"ext_one", H5L_TYPE_EXTERNAL},
-    {"hard_one", H5L_TYPE_HARD},
-    {"hard_two", H5L_TYPE_HARD},
-    {"hard_zero", H5L_TYPE_HARD},
-    {"soft_dangle", H5L_TYPE_SOFT},
-    {"soft_one", H5L_TYPE_SOFT},
-    {"soft_two", H5L_TYPE_SOFT}
-};
-static const link_visit_t lvisit1[] = {
-    {"Dataset_one", H5L_TYPE_HARD},
-    {"Group2", H5L_TYPE_HARD},
-    {"Group2/Dataset_two", H5L_TYPE_HARD},
-    {"Group2/Type_two", H5L_TYPE_HARD},
-    {"Group2/hard_zero", H5L_TYPE_HARD},
-    {"Group2/hard_zero/Dataset_zero", H5L_TYPE_HARD},
-    {"Group2/hard_zero/Group1", H5L_TYPE_HARD},
-    {"Group2/hard_zero/Type_zero", H5L_TYPE_HARD},
-    {"Group2/hard_zero/ext_dangle", H5L_TYPE_EXTERNAL},
-    {"Group2/hard_zero/ext_one", H5L_TYPE_EXTERNAL},
-    {"Group2/hard_zero/hard_one", H5L_TYPE_HARD},
-    {"Group2/hard_zero/hard_two", H5L_TYPE_HARD},
-    {"Group2/hard_zero/hard_zero", H5L_TYPE_HARD},
-    {"Group2/hard_zero/soft_dangle", H5L_TYPE_SOFT},
-    {"Group2/hard_zero/soft_one", H5L_TYPE_SOFT},
-    {"Group2/hard_zero/soft_two", H5L_TYPE_SOFT},
-    {"Type_one", H5L_TYPE_HARD},
-    {"hard_one", H5L_TYPE_HARD}
-};
-static const link_visit_t lvisit2[] = {
-    {"Dataset_two", H5L_TYPE_HARD},
-    {"Type_two", H5L_TYPE_HARD},
-    {"hard_zero", H5L_TYPE_HARD},
-    {"hard_zero/Dataset_zero", H5L_TYPE_HARD},
-    {"hard_zero/Group1", H5L_TYPE_HARD},
-    {"hard_zero/Group1/Dataset_one", H5L_TYPE_HARD},
-    {"hard_zero/Group1/Group2", H5L_TYPE_HARD},
-    {"hard_zero/Group1/Type_one", H5L_TYPE_HARD},
-    {"hard_zero/Group1/hard_one", H5L_TYPE_HARD},
-    {"hard_zero/Type_zero", H5L_TYPE_HARD},
-    {"hard_zero/ext_dangle", H5L_TYPE_EXTERNAL},
-    {"hard_zero/ext_one", H5L_TYPE_EXTERNAL},
-    {"hard_zero/hard_one", H5L_TYPE_HARD},
-    {"hard_zero/hard_two", H5L_TYPE_HARD},
-    {"hard_zero/hard_zero", H5L_TYPE_HARD},
-    {"hard_zero/soft_dangle", H5L_TYPE_SOFT},
-    {"hard_zero/soft_one", H5L_TYPE_SOFT},
-    {"hard_zero/soft_two", H5L_TYPE_SOFT}
-};
+        // Verify link values before closing the file
 
-typedef struct {
-    unsigned idx;               /* Index in link visit structure */
-    const link_visit_t *info;   /* Pointer to the link visit structure to use */
-} lvisit_ud_t;
+        H5std_string softlink_val = file.getLinkval("grp1/soft");
+        verify_val(softlink_val, "/dset1", "H5File::getLinkval grp1/soft", __LINE__, __FILE__);
 
+        H5std_string dngllink_val = file.getLinkval("grp1/dangle");
+        verify_val(dngllink_val, "foobar", "H5File::getLinkval grp1/dangle", __LINE__, __FILE__);
 
-/* Object visit structs */
-typedef struct {
-    const char *path;           /* Path to object */
-    H5O_type_t type;            /* Type of object */
-} obj_visit_t;
-static const obj_visit_t ovisit0_old[] = {
-    {".", H5O_TYPE_GROUP},
-    {"Dataset_zero", H5O_TYPE_DATASET},
-    {"Group1", H5O_TYPE_GROUP},
-    {"Group1/Dataset_one", H5O_TYPE_DATASET},
-    {"Group1/Group2", H5O_TYPE_GROUP},
-    {"Group1/Group2/Dataset_two", H5O_TYPE_DATASET},
-    {"Group1/Group2/Type_two", H5O_TYPE_NAMED_DATATYPE},
-    {"Group1/Type_one", H5O_TYPE_NAMED_DATATYPE},
-    {"Type_zero", H5O_TYPE_NAMED_DATATYPE}
-};
-static const obj_visit_t ovisit0_new[] = {
-    {".", H5O_TYPE_GROUP},
-    {"Dataset_zero", H5O_TYPE_DATASET},
-    {"Group1", H5O_TYPE_GROUP},
-    {"Group1/Dataset_one", H5O_TYPE_DATASET},
-    {"Group1/Group2", H5O_TYPE_GROUP},
-    {"Group1/Group2/Dataset_two", H5O_TYPE_DATASET},
-    {"Group1/Group2/Type_two", H5O_TYPE_NAMED_DATATYPE},
-    {"Group1/Type_one", H5O_TYPE_NAMED_DATATYPE},
-    {"Type_zero", H5O_TYPE_NAMED_DATATYPE}
-};
-static const obj_visit_t ovisit1_old[] = {
-    {".", H5O_TYPE_GROUP},
-    {"Dataset_one", H5O_TYPE_DATASET},
-    {"Group2", H5O_TYPE_GROUP},
-    {"Group2/Dataset_two", H5O_TYPE_DATASET},
-    {"Group2/Type_two", H5O_TYPE_NAMED_DATATYPE},
-    {"Group2/hard_zero", H5O_TYPE_GROUP},
-    {"Group2/hard_zero/Dataset_zero", H5O_TYPE_DATASET},
-    {"Group2/hard_zero/Type_zero", H5O_TYPE_NAMED_DATATYPE},
-    {"Type_one", H5O_TYPE_NAMED_DATATYPE}
-};
-static const obj_visit_t ovisit1_new[] = {
-    {".", H5O_TYPE_GROUP},
-    {"Dataset_one", H5O_TYPE_DATASET},
-    {"Group2", H5O_TYPE_GROUP},
-    {"Group2/Dataset_two", H5O_TYPE_DATASET},
-    {"Group2/Type_two", H5O_TYPE_NAMED_DATATYPE},
-    {"Group2/hard_zero", H5O_TYPE_GROUP},
-    {"Group2/hard_zero/Dataset_zero", H5O_TYPE_DATASET},
-    {"Group2/hard_zero/Type_zero", H5O_TYPE_NAMED_DATATYPE},
-    {"Type_one", H5O_TYPE_NAMED_DATATYPE}
-};
-static const obj_visit_t ovisit2_old[] = {
-    {".", H5O_TYPE_GROUP},
-    {"Dataset_two", H5O_TYPE_DATASET},
-    {"Type_two", H5O_TYPE_NAMED_DATATYPE},
-    {"hard_zero", H5O_TYPE_GROUP},
-    {"hard_zero/Dataset_zero", H5O_TYPE_DATASET},
-    {"hard_zero/Group1", H5O_TYPE_GROUP},
-    {"hard_zero/Group1/Dataset_one", H5O_TYPE_DATASET},
-    {"hard_zero/Group1/Type_one", H5O_TYPE_NAMED_DATATYPE},
-    {"hard_zero/Type_zero", H5O_TYPE_NAMED_DATATYPE}
-};
-static const obj_visit_t ovisit2_new[] = {
-    {".", H5O_TYPE_GROUP},
-    {"Dataset_two", H5O_TYPE_DATASET},
-    {"Type_two", H5O_TYPE_NAMED_DATATYPE},
-    {"hard_zero", H5O_TYPE_GROUP},
-    {"hard_zero/Dataset_zero", H5O_TYPE_DATASET},
-    {"hard_zero/Group1", H5O_TYPE_GROUP},
-    {"hard_zero/Group1/Dataset_one", H5O_TYPE_DATASET},
-    {"hard_zero/Group1/Type_one", H5O_TYPE_NAMED_DATATYPE},
-    {"hard_zero/Type_zero", H5O_TYPE_NAMED_DATATYPE}
-};
+        H5std_string reclink_val = file.getLinkval("grp1/recursive");
+        verify_val(reclink_val, "/grp1/recursive", "H5File::getLinkval grp1/recursive", __LINE__, __FILE__);
 
-typedef struct {
-    unsigned idx;               /* Index in object visit structure */
-    const obj_visit_t *info;    /* Pointer to the object visit structure to use */
-} ovisit_ud_t;
-#endif
+    } // end of try block
+    catch (Exception &E) {
+        issue_fail_msg("test_basic_links()", __LINE__, __FILE__, E.getCDetailMsg());
+    }
 
-static const char *FILENAME[] = {
-    "link0",
-    "link1.h5",
-    "link2.h5",
-    NULL
-};
+    // Open the file and check on the links in it
+    try {
+        // Open the file above
+        H5File file(filename, H5F_ACC_RDWR, FileCreatPropList::DEFAULT, fapl);
+
+        // Verify link existence
+        if (file.nameExists("dset1", LinkAccPropList::DEFAULT) != TRUE)
+            throw InvalidActionException("H5File::nameExists", "dset1 doesn't exist");
+        if (file.nameExists("grp1/soft", LinkAccPropList::DEFAULT) != TRUE)
+            throw InvalidActionException("H5File::nameExists", "grp1/soft doesn't exist");
+        // Deprecated
+        if (file.exists("dset1", LinkAccPropList::DEFAULT) != TRUE)
+            throw InvalidActionException("H5File::exists", "dset1 doesn't exist");
+        if (file.exists("grp1/soft", LinkAccPropList::DEFAULT) != TRUE)
+            throw InvalidActionException("H5File::exists", "grp1/soft doesn't exist");
+
+        // Verify link values
+        H5std_string softlink_val = file.getLinkval("grp1/soft");
+        verify_val(softlink_val, "/dset1", "H5File::getLinkval grp1/soft", __LINE__, __FILE__);
+
+        H5std_string reclink_val = file.getLinkval("grp1/recursive");
+        verify_val(reclink_val, "/grp1/recursive", "H5File::getLinkval grp1/recursive", __LINE__, __FILE__);
+
+        PASSED();
+    } // end of try block
+    catch (Exception &E) {
+        issue_fail_msg("test_basic_links()", __LINE__, __FILE__, E.getCDetailMsg());
+    }
+} // test_basic_links
 
-
 /*-------------------------------------------------------------------------
- * Function:	test_basic_links
+ * Function:    test_lcpl
  *
- * Purpose:	Test building a file with assorted links.
+ * Purpose:     Tests link creation property lists, specifically, the
+ *              character encoding property.
  *
- * Return:	Success:	0
+ * Return:      Success:        0
+ *              Failure:        number of errors
+ * March, 2018
+ *-------------------------------------------------------------------------
+ */
+const H5std_string GROUP1NAME("First_group");
+const H5std_string GROUP2NAME("Second_group");
+static void
+test_lcpl(hid_t fapl_id, hbool_t new_format)
+{
+    H5L_info2_t linfo;
+    char        filename[1024];
+    hsize_t     dims[2];
+
+    if (new_format)
+        SUBTEST("Link creation property lists (w/new group format)")
+    else
+        SUBTEST("Link creation property lists")
+
+    try {
+        FileAccPropList fapl(fapl_id);
+
+        // Create a new file.
+        h5_fixname(FILENAME[0], fapl_id, filename, sizeof filename);
+        H5File file(filename, H5F_ACC_TRUNC, FileCreatPropList::DEFAULT, fapl);
+
+        // Create and link a group with the default LCPL.
+        Group grp_1(file.createGroup(GROUP1NAME));
+        grp_1.close();
+
+        // Check that its character encoding is the default.
+        linfo = file.getLinkInfo(GROUP1NAME);
+        if (linfo.cset != H5T_CSET_ASCII)
+            throw InvalidActionException("H5Lget_info", "Character encoding is not default");
+
+        // Create and commit a datatype with the default LCPL.
+        IntType dtype(PredType::NATIVE_INT);
+        dtype.commit(file, "/type");
+        dtype.close();
+
+        // Check that its character encoding is the default.
+        linfo = file.getLinkInfo("/type");
+        verify_val(static_cast<long>(linfo.cset), static_cast<long>(H5T_CSET_ASCII),
+                   "Character encoding is not default", __LINE__, __FILE__);
+
+        // Create a simple dataspace.
+        dims[0] = H5L_DIM1;
+        dims[1] = H5L_DIM2;
+        DataSpace dspace(2, dims);
+
+        // Create a dataset using the default LCPL.
+        DataSet dset(file.createDataSet("/dataset", PredType::NATIVE_INT, dspace));
+        dset.close();
+
+        // Check that its character encoding is the default.
+        linfo = file.getLinkInfo("/dataset");
+        verify_val(static_cast<long>(linfo.cset), static_cast<long>(H5T_CSET_ASCII),
+                   "Character encoding is not default", __LINE__, __FILE__);
+
+        // Create a link creation property list with the UTF-8 character encoding.
+        LinkCreatPropList lcpl;
+        lcpl.setCharEncoding(H5T_CSET_UTF8);
+
+        // Create and link a group with the new LCPL.
+        Group grp_2(file.createGroup(GROUP2NAME, lcpl));
+        grp_2.close();
+
+        // Check that its character encoding is UTF-8.
+        linfo = file.getLinkInfo(GROUP2NAME);
+        verify_val(static_cast<long>(linfo.cset), static_cast<long>(H5T_CSET_UTF8),
+                   "Character encoding is not UTF-8", __LINE__, __FILE__);
+
+        PASSED();
+    } // end of try block
+    catch (Exception &E) {
+        issue_fail_msg("test_lcpl()", __LINE__, __FILE__, E.getCDetailMsg());
+    }
+} // end test_lcpl()
+
+/*-------------------------------------------------------------------------
+ * Function:    test_move
  *
- *		Failure:	-1
+ * Purpose:     Tests wrappers of H5Lmove()
  *
- * Programmer:	Binh-Minh Ribler
- *		October 16, 2009
+ * Return:      Success: 0
+ *              Failure: number of errors
+ * March, 2018
+ *-------------------------------------------------------------------------
+ */
+static void
+test_move(hid_t fapl_id, hbool_t new_format)
+{
+    char filename[1024];
+
+    if (new_format)
+        SUBTEST("Group::moveLink (w/new group format)")
+    else
+        SUBTEST("Group::moveLink")
+
+    try {
+        FileAccPropList fapl(fapl_id);
+
+        // Create two new files
+        h5_fixname(FILENAME[0], fapl_id, filename, sizeof filename);
+        H5File file_a(filename, H5F_ACC_TRUNC, FileCreatPropList::DEFAULT, fapl);
+        h5_fixname(FILENAME[1], fapl_id, filename, sizeof filename);
+        H5File file_b(filename, H5F_ACC_TRUNC, FileCreatPropList::DEFAULT, fapl);
+
+        // Create groups in first file
+        Group grp_1(file_a.createGroup(GROUP1NAME));
+        Group grp_2(file_a.createGroup(GROUP2NAME));
+        Group grp_move(grp_1.createGroup("group_move"));
+
+        // Create hard and soft links
+        grp_1.link(H5L_TYPE_HARD, "group_move", "hard");
+        grp_2.link(H5L_TYPE_SOFT, "/First_group/group_copy", "soft");
+
+        // Move a group across files, should fail
+        try {
+            grp_1.moveLink("group_move", file_b, "group_new_name");
+
+            // Should throw an exception but didn't
+            H5_FAILED();
+            cerr << "    Group group_move should not be moved across files" << endl;
+        }
+        catch (Exception &E) {
+            // expected
+        }
+
+        // Move a soft link across files, should succeed
+        grp_2.moveLink("soft", file_b, "soft_new_name");
+        if (file_b.exists("soft_new_name") != TRUE)
+            throw InvalidActionException("H5File::exists", "grp1/soft doesn't exist");
+
+        // Move a group across groups in the same file while renaming it
+        grp_1.moveLink("group_move", grp_2, "group_new_name");
+
+        // Open the group just moved to the new location. */
+        Group moved_grp = grp_2.openGroup("group_new_name");
+        moved_grp.close();
+
+        // Verify that the group is no longer in the original location
+        try {
+            moved_grp = grp_1.openGroup("group_move");
+
+            // Should throw an exception but didn't
+            H5_FAILED();
+            cerr << "    Group group_move should not be in original location" << endl;
+        }
+        catch (Exception &E) {
+            // expected
+        }
+
+        // Use H5Lmove to rename a group without moving it
+        H5std_string new_name("group_new_name");
+        H5std_string newer_name("group_newer_name");
+        grp_2.moveLink(new_name, newer_name);
+
+        // Open the group
+        moved_grp = grp_2.openGroup("group_newer_name");
+        moved_grp.close();
+
+        // Use H5Lmove to move a group without renaming it
+        grp_2.moveLink(newer_name, grp_1, newer_name);
+
+        // Open the group
+        moved_grp = grp_1.openGroup("group_newer_name");
+        moved_grp.close();
+
+        // Move the group while giving long paths
+        file_a.moveLink("/First_group/group_newer_name", grp_2, "/Second_group/group_newest_name");
+
+        // Open the group just moved to the new location
+        moved_grp = grp_2.openGroup("group_newest_name");
+        moved_grp.close();
+
+        // Verify that the groups are not in previous locations
+        try {
+            moved_grp = grp_1.openGroup("group_newer_name");
+            moved_grp.close();
+
+            H5_FAILED(); // Should throw an exception but didn't
+            cerr << "    Group group_newer_name should not be in GROUP1NAME" << endl;
+        }
+        catch (Exception &E) {
+            // expected
+        }
+        try {
+            moved_grp = grp_2.openGroup("group_newer_name");
+            moved_grp.close();
+
+            H5_FAILED(); // Should throw an exception but didn't
+            cerr << "    Group group_newer_name should not be in GROUP2NAME" << endl;
+        }
+        catch (Exception &E) {
+            // expected
+        }
+        try {
+            moved_grp = grp_2.openGroup("group_new_name");
+            moved_grp.close();
+
+            H5_FAILED(); // Should throw an exception but didn't
+            cerr << "    Group group_new_name should not be in GROUP2NAME" << endl;
+        }
+        catch (Exception &E) {
+            // expected
+        }
+        try {
+            moved_grp = grp_1.openGroup("group_copy");
+            moved_grp.close();
+
+            H5_FAILED(); // Should throw an exception but didn't
+            cerr << "    Group group_copy should not be in GROUP1NAME" << endl;
+        }
+        catch (Exception &E) {
+            // expected
+        }
+        PASSED();
+    } // end of try block
+    catch (Exception &E) {
+        issue_fail_msg("test_move()", __LINE__, __FILE__, E.getCDetailMsg());
+    }
+} // test_move
+
+/*-------------------------------------------------------------------------
+ * Function:    test_copy
  *
- * Modifications:
+ * Purpose:     Tests wrappers of H5Lcopy()
  *
+ * Return:      Success: 0
+ *              Failure: number of errors
+ * March, 2018
  *-------------------------------------------------------------------------
  */
-static void test_basic_links(hid_t fapl_id, hbool_t new_format)
+static void
+test_copy(hid_t fapl_id, hbool_t new_format)
 {
-    hsize_t	        size[1] = {1};
-    char		filename[NAME_BUF_SIZE];
-
-    // Use the file access template id to create a file access prop. list.
-    FileAccPropList fapl(fapl_id);
-
-    try
-    {
-	if(new_format)
-	    SUBTEST("Link creation (w/new group format)")
-	else
-	    SUBTEST("Link creation")
-
-	h5_fixname(FILENAME[0], fapl_id, filename, sizeof filename);
-	H5File file(filename, H5F_ACC_TRUNC, FileCreatPropList::DEFAULT, fapl);
-
-	// Create simple dataspace
-	DataSpace scalar (1, size, size);
-
-	// Create a group then close it by letting the object go out of scope
-	{
-	    Group group(file.createGroup("grp1", 0));
-	}
+    char filename[1024];
+
+    if (new_format)
+        SUBTEST("Group::copyLink (w/new group format)")
+    else
+        SUBTEST("Group::copyLink")
+
+    try {
+        // Create two new files
+        h5_fixname(FILENAME[0], fapl_id, filename, sizeof filename);
+        H5File file_a(filename, H5F_ACC_TRUNC, FileCreatPropList::DEFAULT, fapl_id);
+        h5_fixname(FILENAME[1], fapl_id, filename, sizeof filename);
+        H5File file_b(filename, H5F_ACC_TRUNC, FileCreatPropList::DEFAULT, fapl_id);
+
+        // Create groups in first file
+        Group grp_1(file_a.createGroup(GROUP1NAME));
+        Group grp_2(file_a.createGroup(GROUP2NAME));
+        Group grp_move(grp_1.createGroup("group_copy"));
+
+        // Create hard and soft links
+        grp_1.link("group_copy", H5L_SAME_LOC, "hard");
+        grp_2.link("/First_group/group_copy", "soft");
+
+        // Copy a group across files, should fail
+        try {
+            grp_1.copyLink("group_copy", file_b, "group_new_name");
+        }
+        catch (Exception &E) {
+            // expected
+        }
+
+        // Copy a soft link across files, should succeed
+        grp_2.copyLink("soft", file_b, "soft_new_name");
+        if (file_b.exists("soft_new_name") != TRUE)
+            throw InvalidActionException("H5File::exists", "soft_new_name doesn't exist");
+
+        // Move a group across groups in the same file while renaming it
+        H5std_string copy_name("group_copy");
+        H5std_string new_name("group_new_name");
+        grp_1.copyLink(copy_name, grp_2, new_name);
+
+        // Open the group just moved to the new location.
+        Group moved_grp(grp_2.openGroup("group_new_name"));
+        moved_grp.close();
+
+        // Verify that the group is also in the original location
+        moved_grp = grp_1.openGroup("group_copy");
+        moved_grp.close();
+
+        // Create a group in the same location with a different name
+        grp_2.copyLink("group_new_name", "group_newer_name");
+
+        // Open the group
+        moved_grp = grp_2.openGroup("group_newer_name");
+        moved_grp.close();
+
+        // Verify that the group is also in the original location
+        moved_grp = grp_2.openGroup("group_new_name");
+        moved_grp.close();
+
+        // Use H5Lcopy to copy to a different location with the same name
+        grp_2.copyLink("group_newer_name", grp_1, "group_newer_name");
+
+        // Open the group
+        moved_grp = grp_1.openGroup("group_newer_name");
+        moved_grp.close();
+
+        // Verify that the group is still in the previous location
+        moved_grp = grp_2.openGroup("group_new_name");
+        moved_grp.close();
+
+        // Copy the group while giving long paths
+        file_a.copyLink("/First_group/group_newer_name", grp_2, "/Second_group/group_newest_name");
+
+        // Open the newest group just moved to the new location
+        moved_grp = grp_2.openGroup("group_newest_name");
+        moved_grp.close();
+
+        // Verify that the group is still in all previous original locations
+        moved_grp = grp_1.openGroup("group_newer_name");
+        moved_grp.close();
+
+        moved_grp = grp_2.openGroup("group_newer_name");
+        moved_grp.close();
+
+        moved_grp = grp_2.openGroup("group_new_name");
+        moved_grp.close();
+
+        moved_grp = grp_1.openGroup("group_copy");
+        moved_grp.close();
+
+        // Delete "group_newer_name" from group 2, then try to open it.
+        grp_2.unlink("group_newer_name");
+        try {
+            moved_grp = grp_2.openGroup("group_newer_name");
+            moved_grp.close();
+
+            H5_FAILED(); // Should throw an exception but didn't
+            cerr << "    Group group_newer_name should not be in GROUP2NAME" << endl;
+        }
+        catch (Exception &E) {
+            // expected
+        }
+
+        // Delete "group_copy" from group 1, then try to open it.
+        grp_1.unlink("group_copy");
+        try {
+            moved_grp = grp_1.openGroup("group_copy");
+            moved_grp.close();
+
+            H5_FAILED(); // Should throw an exception but didn't
+            cerr << "    Group group_copy should not be in GROUP1NAME" << endl;
+        }
+        catch (Exception &E) {
+            // expected
+        }
+
+        PASSED();
+    } // end of try block
+    catch (Exception &E) {
+        issue_fail_msg("test_copy()", __LINE__, __FILE__, E.getCDetailMsg());
+    }
+} // test_copy
 
-	// Create a dataset then close it by letting the object go out of scope
-	{
-	    DataSet dset1(file.createDataSet("dset1", PredType::NATIVE_INT, scalar));
-	}
+/*-------------------------------------------------------------------------
+ * Function:    test_num_links
+ *
+ * Purpose      Test setting and getting limit of number of links
+ *
+ * Return       Success: 0
+ *              Failure: -1
+ *
+ * October 16, 2009
+ *-------------------------------------------------------------------------
+ */
+static void
+test_num_links(hid_t fapl_id, hbool_t new_format)
+{
+    char filename[NAME_BUF_SIZE];
 
-	hid_t file_id = file.getId();
+    if (new_format)
+        SUBTEST("Setting number of links (w/new group format)")
+    else
+        SUBTEST("Setting number of links")
 
-	// Because these are not implemented in the C++ API yet, they are
-	// used so CommonFG::getLinkval can be tested.
-	// Create a hard link
-	if(H5Lcreate_hard(
-		file_id, "dset1", H5L_SAME_LOC, "grp1/hard1",
-		H5P_DEFAULT, H5P_DEFAULT) < 0)
-	    throw Exception("test_basic_links", "H5Lcreate_hard failed");
+    try {
+        // Use the file access template id to create a file access prop. list.
+        FileAccPropList fapl(fapl_id);
 
-	// Create a symbolic link
-	if(H5Lcreate_soft(
-		"/dset1", file_id, "grp1/soft", H5P_DEFAULT, H5P_DEFAULT) < 0)
-	    throw Exception("test_basic_links", "H5Lcreate_soft failed");
+        h5_fixname(FILENAME[0], fapl_id, filename, sizeof filename);
+        H5File file(filename, H5F_ACC_RDWR, FileCreatPropList::DEFAULT, fapl);
 
-	// Create a symbolic link to something that doesn't exist
-	if(H5Lcreate_soft(
-		"foobar", file_id, "grp1/dangle", H5P_DEFAULT, H5P_DEFAULT) < 0)
-	    throw Exception("test_basic_links", "H5Lcreate_soft failed");
+        LinkAccPropList lapl;
+        size_t          nlinks = 5;
+        lapl.setNumLinks(nlinks);
 
-	// Create a recursive symbolic link
-	if(H5Lcreate_soft(
-		"/grp1/recursive", file_id, "/grp1/recursive",
-		H5P_DEFAULT, H5P_DEFAULT) < 0)
-	    throw Exception("test_basic_links", "H5Lcreate_soft failed");
+        // Read it back and verify
+        size_t read_nlinks = lapl.getNumLinks();
+        verify_val(read_nlinks, nlinks, "LinkAccPropList::setNumLinks", __LINE__, __FILE__);
 
-	// Verify link values before closing the file
+        PASSED();
+    } // end of try block
+    catch (Exception &E) {
+        issue_fail_msg("test_num_links()", __LINE__, __FILE__, E.getCDetailMsg());
+    }
+} // test_num_links
 
-	H5std_string softlink_val = file.getLinkval("grp1/soft");
-	verify_val(softlink_val, "/dset1", "H5File::getLinkval grp1/soft", __LINE__, __FILE__);
+// Data for visit on the file
+static const obj_visit_t file_visit[] = {
+    {".", H5O_TYPE_GROUP},
+    {"Data", H5O_TYPE_GROUP},
+    {"Data/Compressed_Data", H5O_TYPE_DATASET},
+    {"Data/Float_Data", H5O_TYPE_DATASET},
+};
 
-	H5std_string dngllink_val = file.getLinkval("grp1/dangle");
-	verify_val(dngllink_val, "foobar", "H5File::getLinkval grp1/dangle", __LINE__, __FILE__);
+// Data for visit on the group
+static const obj_visit_t group_visit[] = {
+    {".", H5O_TYPE_GROUP},
+    {"Compressed_Data", H5O_TYPE_DATASET},
+    {"Float_Data", H5O_TYPE_DATASET},
+};
 
-	H5std_string reclink_val = file.getLinkval("grp1/recursive");
-	verify_val(reclink_val, "/grp1/recursive", "H5File::getLinkval grp1/recursive", __LINE__, __FILE__);
+const H5std_string FILE_NAME("tvisit.h5");
+const H5std_string GROUP_NAME("/Data");
+const H5std_string DSET1_NAME("/Data/Compressed_Data");
+const H5std_string DSET2_NAME("/Data/Float_Data");
+const int          RANK = 2;
 
-    } // end of try block
-    catch (Exception E)
-    {
-	issue_fail_msg("test_basic_links()", __LINE__, __FILE__, E.getCDetailMsg());
-    }
+// Operator function
+static int
+visit_obj_cb(H5Object &obj, const H5std_string name, const H5O_info2_t *oinfo, void *_op_data)
+{
+    (void)obj; // Unused
 
-    // Open the file and check on the links in it
-    try
-    {
-	// Open the file above
-	H5File file(filename, H5F_ACC_RDWR, FileCreatPropList::DEFAULT, fapl);
+    ovisit_ud_t *op_data = static_cast<ovisit_ud_t *>(_op_data);
 
-	// Verify link existence
-	if(H5Lexists(file.getId(), "dset1", H5P_DEFAULT) != TRUE)
-	    throw InvalidActionException("H5Lexists", "dset1 doesn't exist");
-	if(H5Lexists(file.getId(), "grp1/soft", H5P_DEFAULT) != TRUE)
-	    throw InvalidActionException("H5Lexists", "grp1/soft doesn't exist");
+    // Check for correct object information
+    if (strcmp(op_data->info[op_data->idx].path, name.c_str()) != 0)
+        return (H5_ITER_ERROR);
+    if (op_data->info[op_data->idx].type != oinfo->type)
+        return (H5_ITER_ERROR);
 
-	// Verify link values
-	H5std_string softlink_val = file.getLinkval("grp1/soft");
-	verify_val(softlink_val, "/dset1", "H5File::getLinkval grp1/soft", __LINE__, __FILE__);
+    // Advance to next location
+    op_data->idx++;
 
-	H5std_string reclink_val = file.getLinkval("grp1/recursive");
-	verify_val(reclink_val, "/grp1/recursive", "H5File::getLinkval grp1/recursive", __LINE__, __FILE__);
+    return (H5_ITER_CONT);
+}
 
-	PASSED();
+/*-------------------------------------------------------------------------
+ * Function:    test_visit
+ *
+ * Purpose      Test H5Object::visit
+ *
+ * Return       None
+ *
+ * February 8, 2019
+ *-------------------------------------------------------------------------
+ */
+static void
+test_visit(hid_t fapl_id, hbool_t new_format)
+{
+    hsize_t dims[2];
+    hsize_t cdims[2];
+    char    filename[NAME_BUF_SIZE];
+
+    if (new_format)
+        SUBTEST("H5Object::visit (w/new group format)")
+    else
+        SUBTEST("H5Object::visit")
+
+    try {
+        // Use the file access template id to create a file access prop. list
+        FileAccPropList fapl(fapl_id);
+
+        // Build the hdf5 file name and create the file
+        h5_fixname(FILENAME[3], fapl_id, filename, sizeof filename);
+        H5File *file = new H5File(filename, H5F_ACC_TRUNC, FileCreatPropList::DEFAULT, fapl);
+
+        // Create a group
+        Group *group = new Group(file->createGroup(GROUP_NAME));
+
+        // Create a chunked/compressed dataset within this group specified by path
+        dims[0]                     = 20;
+        dims[1]                     = 2;
+        cdims[0]                    = 2;
+        cdims[1]                    = 2;
+        DataSpace        *dataspace = new DataSpace(RANK, dims); // create new dspace
+        DSetCreatPropList ds_creatplist;                         // create dataset creation prop list
+        ds_creatplist.setChunk(2, cdims);                        // then modify it for compression
+        ds_creatplist.setDeflate(6);
+
+        DataSet *dataset =
+            new DataSet(file->createDataSet(DSET1_NAME, PredType::NATIVE_INT, *dataspace, ds_creatplist));
+
+        delete dataset;
+        delete dataspace;
+
+        // Create another dataset
+        dims[0]   = 5;
+        dims[1]   = 2;
+        dataspace = new DataSpace(RANK, dims); // create second dspace
+        dataset   = new DataSet(file->createDataSet(DSET2_NAME, PredType::NATIVE_FLOAT, *dataspace));
+
+        // Close everything
+        delete dataset;
+        delete dataspace;
+        delete group;
+        delete file;
+
+        // Reopen the file and group in the file.
+        file  = new H5File(filename, H5F_ACC_RDWR);
+        group = new Group(file->openGroup("Data"));
+
+        // Open the group
+        dataset = new DataSet(group->openDataSet(DSET2_NAME));
+        delete dataset;
+
+        // Visit objects in the file
+        ovisit_ud_t udata; /* User-data for visiting */
+        udata.idx  = 0;
+        udata.info = file_visit;
+
+        file->visit(H5_INDEX_NAME, H5_ITER_INC, visit_obj_cb, &udata, H5O_INFO_BASIC);
+
+        // Visit objects in the group
+        udata.idx  = 0;
+        udata.info = group_visit;
+
+        group->visit(H5_INDEX_NAME, H5_ITER_INC, visit_obj_cb, &udata, H5O_INFO_BASIC);
+
+        // Close the group and file.
+        delete group;
+        delete file;
+
+        PASSED();
     } // end of try block
-    catch (Exception E)
-    {
-	issue_fail_msg("test_basic_links()", __LINE__, __FILE__, E.getCDetailMsg());
+    catch (Exception &E) {
+        cerr << "in catch" << endl;
+        issue_fail_msg("test_visit()", __LINE__, __FILE__, E.getCDetailMsg());
     }
-}
+} // test_visit()
 
-
 /*-------------------------------------------------------------------------
- * Function:	test_links
- *
- * Purpose:	Test links
+ * Function:    test_links
  *
- * Return:	None
+ * Purpose      Test links
  *
- * Programmer:	Binh-Minh Ribler
- *              October 16, 2009
+ * Return       None
  *
+ * October 16, 2009
  *-------------------------------------------------------------------------
  */
-#ifdef __cplusplus
-extern "C"
-#endif
-void test_links()
+extern "C" void
+test_links()
 {
-    hid_t	fapl_id, fapl2_id;    /* File access property lists */
-    hbool_t new_format;     /* Whether to use the new format or not */
-    const char  *envval;
-
-    envval = HDgetenv("HDF5_DRIVER");
-    if(envval == NULL)
-        envval = "nomatch";
+    hid_t    fapl_id, fapl2_id; /* File access property lists */
+    unsigned new_format;        /* Whether to use the new format or not */
 
-    fapl_id = h5_fileaccess();
+    if ((fapl_id = h5_fileaccess()) < 0)
+        throw Exception("test_links", "Unable to get file access property list");
 
     // Output message about test being performed
     MESSAGE(5, ("Testing Various Links\n"));
-    try
-    {
-	/* Copy the file access property list */
-	if((fapl2_id = H5Pcopy(fapl_id)) < 0)
-	    throw Exception("test_links", "H5Pcopy failed");
-
-	/* Set the "use the latest version of the format" bounds for creating objects in the file */
-	if(H5Pset_libver_bounds(fapl2_id, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
-	throw Exception("test_links", "H5Pset_libver_bounds failed");
-
-	/* Loop over using new group format */
-	for(new_format = FALSE; new_format <= TRUE; new_format++)
-	{
-	    hid_t my_fapl_id;
-
-	    /* Check for FAPL to use */
-	    if(new_format)
-		my_fapl_id = fapl2_id;
-	    else
-		my_fapl_id = fapl_id;
-
-	    /* General tests... (on both old & new format groups */
-	    // FileAccPropList may be passed in instead of fapl id
-	    test_basic_links(my_fapl_id, new_format);
-#if 0
-// these tests are from the C test links.c and left here for future
-// implementation of H5L API
-	nerrors += test_basic_links(fapl_id, new_format) < 0 ? 1 : 0;
-	nerrors += cklinks(my_fapl, new_format) < 0 ? 1 : 0;
-	nerrors += new_links(my_fapl, new_format) < 0 ? 1 : 0;
-	nerrors += ck_new_links(my_fapl, new_format) < 0 ? 1 : 0;
-	nerrors += long_links(my_fapl, new_format) < 0 ? 1 : 0;
-	nerrors += toomany(my_fapl, new_format) < 0 ? 1 : 0;
-
-	/* Test new H5L link creation routine */
-	nerrors += test_lcpl(my_fapl, new_format);
-        nerrors += test_move(my_fapl, new_format);
-        nerrors += test_copy(my_fapl, new_format);
-        nerrors += test_move_preserves(my_fapl, new_format);
-#ifndef H5_NO_DEPRECATED_SYMBOLS
-        nerrors += test_deprec(my_fapl, new_format);
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
-#ifndef H5_CANNOT_OPEN_TWICE
-        nerrors += external_link_root(my_fapl, new_format) < 0 ? 1 : 0;
-#endif /* H5_CANNOT_OPEN_TWICE */
-        nerrors += external_link_path(my_fapl, new_format) < 0 ? 1 : 0;
-        nerrors += external_link_mult(my_fapl, new_format) < 0 ? 1 : 0;
-#ifndef H5_CANNOT_OPEN_TWICE
-        nerrors += external_link_self(envval, my_fapl, new_format) < 0 ? 1 : 0;
-        nerrors += external_link_pingpong(envval, my_fapl, new_format) < 0 ? 1 : 0;
-        nerrors += external_link_toomany(my_fapl, new_format) < 0 ? 1 : 0;
-#endif /* H5_CANNOT_OPEN_TWICE */
-        nerrors += external_link_dangling(my_fapl, new_format) < 0 ? 1 : 0;
-        nerrors += external_link_recursive(my_fapl, new_format) < 0 ? 1 : 0;
-        nerrors += external_link_query(my_fapl, new_format) < 0 ? 1 : 0;
-        nerrors += external_link_unlink_compact(my_fapl, new_format) < 0 ? 1 : 0;
-        nerrors += external_link_unlink_dense(my_fapl, new_format) < 0 ? 1 : 0;
-        nerrors += external_link_move(my_fapl, new_format) < 0 ? 1 : 0;
-        nerrors += external_link_ride(my_fapl, new_format) < 0 ? 1 : 0;
-#ifndef H5_CANNOT_OPEN_TWICE
-        nerrors += external_link_closing(envval, my_fapl, new_format) < 0 ? 1 : 0;
-#endif /* H5_CANNOT_OPEN_TWICE */
-        nerrors += external_link_endian(new_format) < 0 ? 1 : 0;
-        nerrors += external_link_strong(my_fapl, new_format) < 0 ? 1 : 0;
-
-        /* tests for external link */
-        nerrors += external_link_env(my_fapl, new_format) < 0 ? 1 : 0;
-        nerrors += external_link_prefix(my_fapl, new_format) < 0 ? 1 : 0;
-        nerrors += external_link_abs_mainpath(my_fapl, new_format) < 0 ? 1 : 0;
-        nerrors += external_link_rel_mainpath(my_fapl, new_format) < 0 ? 1 : 0;
-        nerrors += external_link_cwd(my_fapl, new_format) < 0 ? 1 : 0;
-        nerrors += external_link_abstar(my_fapl, new_format) < 0 ? 1 : 0;
-        nerrors += external_link_abstar_cur(my_fapl, new_format) < 0 ? 1 : 0;
-        nerrors += external_link_reltar(my_fapl, new_format) < 0 ? 1 : 0;
-        nerrors += external_link_chdir(my_fapl, new_format) < 0 ? 1 : 0;
-        nerrors += external_set_elink_fapl1(my_fapl, new_format) < 0 ? 1 : 0;
-        nerrors += external_set_elink_fapl2(my_fapl, new_format) < 0 ? 1 : 0;
-        nerrors += external_set_elink_fapl3(new_format) < 0 ? 1 : 0;
-        nerrors += external_set_elink_acc_flags(my_fapl, new_format) < 0 ? 1 : 0;
-        nerrors += external_set_elink_cb(my_fapl, new_format) < 0 ? 1 : 0;
-
-#ifdef H5_HAVE_WINDOW_PATH
-        nerrors += external_link_win1(my_fapl, new_format) < 0 ? 1 : 0;
-        nerrors += external_link_win2(my_fapl, new_format) < 0 ? 1 : 0;
-        nerrors += external_link_win3(my_fapl, new_format) < 0 ? 1 : 0;
-        nerrors += external_link_win4(my_fapl, new_format) < 0 ? 1 : 0;
-        nerrors += external_link_win5(my_fapl, new_format) < 0 ? 1 : 0;
-        nerrors += external_link_win6(my_fapl, new_format) < 0 ? 1 : 0;
-        nerrors += external_link_win7(my_fapl, new_format) < 0 ? 1 : 0;
-        nerrors += external_link_win8(my_fapl, new_format) < 0 ? 1 : 0;
-        nerrors += external_link_win9(my_fapl, new_format) < 0 ? 1 : 0;
-#endif
-        /* These tests assume that external links are a form of UD links,
-         * so assume that everything that passed for external links
-         * above has already been tested for UD links.
-         */
-        if(new_format == TRUE) {
-            nerrors += ud_hard_links(fapl2) < 0 ? 1 : 0;     /* requires new format groups */
-            nerrors += ud_link_reregister(fapl2) < 0 ? 1 : 0;        /* requires new format groups */
-        } /* end if */
-
-        nerrors += ud_callbacks(my_fapl, new_format) < 0 ? 1 : 0;
-        nerrors += ud_link_errors(my_fapl, new_format) < 0 ? 1 : 0;
-        nerrors += lapl_udata(my_fapl, new_format) < 0 ? 1 : 0;
-        nerrors += lapl_nlinks(my_fapl, new_format) < 0 ? 1 : 0;
-        nerrors += linkinfo(my_fapl, new_format) < 0 ? 1 : 0;
-
-        /* Misc. extra tests, useful for both new & old format files */
-        nerrors += link_visit(my_fapl, new_format) < 0 ? 1 : 0;
-        nerrors += link_visit_by_name(my_fapl, new_format) < 0 ? 1 : 0;
-        nerrors += obj_visit(my_fapl, new_format) < 0 ? 1 : 0;
-        nerrors += obj_visit_by_name(my_fapl, new_format) < 0 ? 1 : 0;
-        nerrors += obj_visit_stop(my_fapl, new_format) < 0 ? 1 : 0;
-
-        /* Keep this test last, it's testing files that are used above */
-        /* do not do this for files used by external link tests */
-        nerrors += check_all_closed(my_fapl, new_format, EXTSTOP) < 0 ? 1 : 0;
-#endif // 0
-	} /* end for */
-
-#if 0
-    /* New group revision feature tests */
-    nerrors += corder_create_empty(fapl2) < 0 ? 1 : 0;
-/* XXX: when creation order indexing is fully working, go back and add checks
-*      to these tests to make certain that the creation order values are
-*      correct.
-*/
-    nerrors += corder_create_compact(fapl2) < 0 ? 1 : 0;
-    nerrors += corder_create_dense(fapl2) < 0 ? 1 : 0;
-    nerrors += corder_transition(fapl2) < 0 ? 1 : 0;
-    nerrors += corder_delete(fapl2) < 0 ? 1 : 0;
-    nerrors += link_info_by_idx(fapl2) < 0 ? 1 : 0;
-    nerrors += delete_by_idx(fapl2) < 0 ? 1 : 0;
-    nerrors += link_iterate(fapl2) < 0 ? 1 : 0;
-    nerrors += open_by_idx(fapl2) < 0 ? 1 : 0;
-    nerrors += object_info(fapl2) < 0 ? 1 : 0;
-    nerrors += group_info(fapl2) < 0 ? 1 : 0;
-    nerrors += timestamps(fapl2) < 0 ? 1 : 0;
-
-    /* Test new API calls on old-style groups */
-    nerrors += link_info_by_idx_old(fapl) < 0 ? 1 : 0;
-    nerrors += delete_by_idx_old(fapl) < 0 ? 1 : 0;
-    nerrors += link_iterate_old(fapl) < 0 ? 1 : 0;
-    nerrors += open_by_idx_old(fapl) < 0 ? 1 : 0;
-    nerrors += object_info_old(fapl) < 0 ? 1 : 0;
-    nerrors += group_info_old(fapl) < 0 ? 1 : 0;
-
-#endif
-	/* Close 2nd FAPL */
-	H5Pclose(fapl2_id);
-
-	h5_cleanup(FILENAME, fapl_id);
-
-	/* Test that external links can be used after a library reset.  MUST be
-	* called last so the reset doesn't interfere with the property lists.  This
-	* routine will delete its own file. */
-	/* nerrors += external_reset_register() < 0 ? 1 : 0;
- */
+    try {
+        /* Copy the file access property list */
+        if ((fapl2_id = H5Pcopy(fapl_id)) < 0)
+            throw Exception("test_links", "H5Pcopy failed");
+
+        /* Set the "use the latest version of the format" bounds for creating
+           objects in the file */
+        if (H5Pset_libver_bounds(fapl2_id, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
+            throw Exception("test_links", "H5Pset_libver_bounds failed");
+
+        /* Loop over using new group format */
+        for (new_format = FALSE; new_format <= TRUE; new_format++) {
+            hid_t my_fapl_id;
+
+            /* Check for FAPL to use */
+            if (new_format)
+                my_fapl_id = fapl2_id;
+            else
+                my_fapl_id = fapl_id;
+
+            /* General tests... (on both old & new format groups */
+            // FileAccPropList may be passed in instead of fapl id
+            test_basic_links(my_fapl_id, new_format);
+            test_num_links(my_fapl_id, new_format);
+            test_move(my_fapl_id, new_format);
+            test_copy(my_fapl_id, new_format);
+            test_lcpl(my_fapl_id, new_format);
+            test_visit(my_fapl_id, new_format);
+        } /* end for */
+
+        /* Close 2nd FAPL */
+        H5Pclose(fapl2_id);
+
+        h5_clean_files(FILENAME, fapl_id);
     }
-    catch (Exception E)
-    {
-	issue_fail_msg("test_links()", __LINE__, __FILE__, E.getCDetailMsg());
+    catch (Exception &E) {
+        issue_fail_msg("test_links()", __LINE__, __FILE__, E.getCDetailMsg());
     }
-
 }
 
 /*-------------------------------------------------------------------------
- * Function:	cleanup_links
- *
- * Purpose:	Cleanup temporary test files
+ * Function:    cleanup_links
  *
- * Return:	none
- *
- * Programmer:	Binh-Minh Ribler
- *		October 16, 2009
- *
- * Modifications:
+ * Purpose      Cleanup temporary test files
  *
+ * Return       none
  *-------------------------------------------------------------------------
  */
-#ifdef __cplusplus
-extern "C"
-#endif
-void cleanup_links()
+extern "C" void
+cleanup_links()
 {
     HDremove(FILENAME[0]);
+    HDremove(FILENAME[1]);
 }
-
diff --git a/c++/test/tobject.cpp b/c++/test/tobject.cpp
index c74d34a..696783d 100644
--- a/c++/test/tobject.cpp
+++ b/c++/test/tobject.cpp
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*****************************************************************************
@@ -18,320 +15,752 @@
    tobject.cpp - HDF5 C++ testing object related functionality
 
  ***************************************************************************/
-
-#ifdef OLD_HEADER_FILENAME
-#include <iostream.h>
-#else
 #include <iostream>
-#endif
-#include <string>
 
-#ifndef H5_NO_NAMESPACE
-#ifndef H5_NO_STD
-    using std::cerr;
-    using std::endl;
-#endif  // H5_NO_STD
-#endif
-
-#include "H5Cpp.h"      // C++ API header file
-
-#ifndef H5_NO_NAMESPACE
-    using namespace H5;
-#endif
-
-#include "h5cpputil.h"  // C++ utilility header file
-
-const H5std_string	FILE_OBJECTS("tobjects.h5");
-const H5std_string	GROUP1("Top Group");
-const H5std_string	GROUP1_PATH("/Top Group");
-const H5std_string	GROUP1_1("Sub-Group 1.1");
-const H5std_string	GROUP1_1_PATH("/Top Group/Sub-Group 1.1");
-const H5std_string	GROUP1_2("Sub-Group 1.2");
-const H5std_string	GROUP1_2_PATH("/Top Group/Sub-Group 1.2");
-const H5std_string	DSET_DEFAULT_NAME("default");
-const H5std_string	DSET_IN_FILE("Dataset in File");
-const H5std_string	DSET_IN_FILE_PATH("/Dataset in File");
-const H5std_string	DSET_IN_GRP1("Dataset in Group 1");
-const H5std_string	DSET_IN_GRP1_PATH("/Top Group/Dataset in Group 1");
-const H5std_string	DSET_IN_GRP1_2("Dataset in Group 1.2");
-const H5std_string	DSET_IN_GRP1_2_PATH("/Top Group/Sub-Group 1.2/Dataset in Group 1.2");
+#include <string>
+#include "H5Cpp.h" // C++ API header file
+using namespace H5;
+
+#include "h5test.h"
+#include "h5cpputil.h" // C++ utilility header file
+
+const H5std_string FILE_OBJECTS("tobjects.h5");
+const H5std_string FILE_OBJHDR("tobject_header.h5");
+const H5std_string GROUP1("Top Group");
+const H5std_string GROUP1_PATH("/Top Group");
+const H5std_string GROUP1_1("Sub-Group 1.1");
+const H5std_string GROUP1_1_PATH("/Top Group/Sub-Group 1.1");
+const H5std_string GROUP1_2("Sub-Group 1.2");
+const H5std_string GROUP1_2_PATH("/Top Group/Sub-Group 1.2");
+const H5std_string DSET_DEFAULT_NAME("default");
+const H5std_string DSET_IN_FILE("Dataset in File");
+const H5std_string DSET_IN_FILE_PATH("/Dataset in File");
+const H5std_string DSET_IN_GRP1("Dataset_in_Group_1");
+const H5std_string DSET_IN_GRP1_PATH("/Top Group/Dataset_in_Group_1");
+const H5std_string DSET_IN_GRP1_2("Dataset_in_Group_1.2");
+const H5std_string DSET_IN_GRP1_2_PATH("/Top Group/Sub-Group 1.2/Dataset_in_Group_1.2");
 
 /*-------------------------------------------------------------------------
- * Function:	test_get_objname
+ * Function:    test_get_objname
  *
- * Purpose:	Tests getting object name of groups and datasets.
+ * Purpose      Tests getting object name of groups and datasets.
  *
- * Return:	Success:	0
- *		Failure:	-1
+ * Description:
+ *        File structure:
+ *              GROUP1
+ *                  GROUP1_1
+ *                  GROUP1_2
+ *                      DSET_IN_GRP1_2
+ *                  DSET_IN_GRP1
+ *              DSET_IN_FILE
  *
- * Programmer:	Binh-Minh Ribler
- *		Friday, March 4, 2014
  *
- * Modifications:
+ * Return       Success: 0
+ *              Failure: -1
  *
+ * Programmer   Binh-Minh Ribler
+ *              Friday, March 4, 2014
  *-------------------------------------------------------------------------
  */
-static void test_get_objname()
+static void
+test_get_objname()
 {
     SUBTEST("H5Object::getObjName on Groups and Datasets");
 
     try {
-	// Create file
-	H5File file(FILE_OBJECTS, H5F_ACC_TRUNC);
+        // Create file
+        H5File file(FILE_OBJECTS, H5F_ACC_TRUNC);
 
-	// Create a top group and 2 subgroups
-	Group grp1 = file.createGroup(GROUP1, 0);
-	Group grp1_1 = grp1.createGroup(GROUP1_1, 0);
-	Group grp1_2 = grp1.createGroup(GROUP1_2, 0);
+        // Create a top group and 2 subgroups
+        Group grp1   = file.createGroup(GROUP1, 0);
+        Group grp1_1 = grp1.createGroup(GROUP1_1, 0);
+        Group grp1_2 = grp1.createGroup(GROUP1_2, 0);
 
-	// Get part of the group's name, random length using
-	// ssize_t getObjName(char* comment, size_t buf_size)
+        // Get part of the group's name, random length using
+        // ssize_t getObjName(char* comment, size_t buf_size)
 
-	// Get the length of the group's name first
-	ssize_t name_len = grp1.getObjName(NULL);
+        // Get the length of the group's name first
+        ssize_t name_len = grp1.getObjName(NULL);
 
-	// Random length is 4
-	if (name_len > 4)
-	{
-	    char* grp1_name = new char[5];
-	    name_len = grp1.getObjName(grp1_name, 5);
-	    verify_val((const char*)grp1_name, "/Top", "Group::getObjName", __LINE__, __FILE__);
-	    delete []grp1_name;
-	}
+        // Random length is 4
+        if (name_len > 4) {
+            char *grp1_name = new char[5];
+            name_len        = grp1.getObjName(grp1_name, 5);
+            verify_val(const_cast<const char *>(grp1_name), "/Top", "Group::getObjName", __LINE__, __FILE__);
+            delete[] grp1_name;
+        }
 
-	// Create a data space
-	hsize_t     dims[2];
-	dims[0] = 2;
-	dims[1] = 5;
-	DataSpace space (2, dims, NULL);
+        // Create a data space
+        hsize_t dims[2];
+        dims[0] = 2;
+        dims[1] = 5;
+        DataSpace space(2, dims, NULL);
 
-	// Create a dataset in the file
-	DataSet dsinfile = file.createDataSet(DSET_IN_FILE,
-			 PredType::NATIVE_DOUBLE, space);
+        // Create a dataset in the file
+        DataSet dsinfile = file.createDataSet(DSET_IN_FILE, PredType::NATIVE_DOUBLE, space);
 
-	// Create a dataset in the group
-	DataSet dsingrp = grp1.createDataSet(DSET_IN_GRP1,
-			 PredType::NATIVE_INT, space);
+        // Create a dataset in the group
+        DataSet dsingrp = grp1.createDataSet(DSET_IN_GRP1, PredType::NATIVE_INT, space);
 
-	// Get and verify the name of each dataset, using
-	// H5std_string getObjName() and
-	// ssize_t getObjName(H5std_string& obj_name, size_t len = 0)
-	H5std_string ds_name = dsinfile.getObjName();
-	verify_val(ds_name, DSET_IN_FILE_PATH, "DataSet::getObjName", __LINE__, __FILE__);
+        // Get and verify the name of each dataset, using
+        // H5std_string getObjName() and
+        // ssize_t getObjName(H5std_string& obj_name, size_t len = 0)
+        H5std_string ds_name = dsinfile.getObjName();
+        verify_val(ds_name, DSET_IN_FILE_PATH, "DataSet::getObjName", __LINE__, __FILE__);
 
-	name_len = dsingrp.getObjName(ds_name); // default len
-	verify_val(ds_name, DSET_IN_GRP1_PATH, "DataSet::getObjName", __LINE__, __FILE__);
+        name_len = dsingrp.getObjName(ds_name); // default len
+        verify_val(ds_name, DSET_IN_GRP1_PATH, "DataSet::getObjName", __LINE__, __FILE__);
 
-	// Close dataset
-	dsingrp.close();
+        // Close dataset
+        dsingrp.close();
 
-	// Create a dataset in sub-group 1.2
-	dsingrp = grp1_2.createDataSet(DSET_IN_GRP1_2, PredType::NATIVE_INT, space);
+        // Create a dataset in sub-group 1.2
+        dsingrp = grp1_2.createDataSet(DSET_IN_GRP1_2, PredType::NATIVE_INT, space);
 
-	// Get and verify the name of the dataset that belongs to subgroup
-	// 1.2, using H5std_string getObjName()
-	ds_name = dsingrp.getObjName();
-	verify_val(ds_name, DSET_IN_GRP1_2_PATH, "DataSet::getObjName", __LINE__, __FILE__);
+        // Get and verify the name of the dataset that belongs to subgroup
+        // 1.2, using H5std_string getObjName()
+        ds_name = dsingrp.getObjName();
+        verify_val(ds_name, DSET_IN_GRP1_2_PATH, "DataSet::getObjName", __LINE__, __FILE__);
 
-	// Close dataset
-	dsingrp.close();
+        // Close dataset
+        dsingrp.close();
 
-	// Reopen that same dataset then check the name again with another
-	// overload: ssize_t getObjName(H5std_string& obj_name, size_t len = 0)
-	dsingrp = grp1_2.openDataSet(DSET_IN_GRP1_2);
-	name_len = dsingrp.getObjName(ds_name);
-	verify_val(ds_name, DSET_IN_GRP1_2_PATH, "DataSet::getObjName", __LINE__, __FILE__);
+        // Reopen that same dataset then check the name again with another
+        // overload: ssize_t getObjName(H5std_string& obj_name, size_t len = 0)
+        dsingrp  = grp1_2.openDataSet(DSET_IN_GRP1_2);
+        name_len = dsingrp.getObjName(ds_name);
+        verify_val(ds_name, DSET_IN_GRP1_2_PATH, "DataSet::getObjName", __LINE__, __FILE__);
 
-	// Everything will be closed as they go out of scope
+        // Everything will be closed as they go out of scope
 
-	PASSED();
-    }	// try block
+        PASSED();
+    } // try block
 
     // catch all other exceptions
-    catch (Exception E)
-    {
-	issue_fail_msg("test_get_objname", __LINE__, __FILE__);
+    catch (Exception &E) {
+        issue_fail_msg("test_get_objname", __LINE__, __FILE__);
     }
-}   // test_get_objname
+} // test_get_objname
 
 /*-------------------------------------------------------------------------
- * Function:	test_get_objname_ontypes
+ * Function:    test_existance
  *
- * Purpose:	Test getting object name from various committed types.
+ * Purpose      Tests getting object name of groups and datasets.
  *
- * Return:	Success:	0
- *		Failure:	-1
+ * Description:
+ *        File structure:
+ *              GROUP1
+ *                  GROUP1_1
+ *                  GROUP1_2
+ *                      DSET_IN_GRP1_2
+ *                  DSET_IN_GRP1
+ *              DSET_IN_FILE
  *
- * Programmer:  Binh-Minh Ribler
- *		March 4, 2014
  *
- * Modifications:
+ * Return       Success: 0
+ *              Failure: -1
  *
+ * Programmer   Binh-Minh Ribler
+ *              Friday, March 4, 2014
  *-------------------------------------------------------------------------
  */
-static void test_get_objname_ontypes()
+static void
+test_existance()
 {
-    SUBTEST("H5Object::getObjName on Committed Datatypes");
+    SUBTEST("H5File::exists and Group::exists");
 
     try {
-	// Create a file with default prop lists
-	H5File file(FILE_OBJECTS, H5F_ACC_RDWR);
-
-	// Create a group
-	Group grp = file.createGroup ("typetests");
-
-	// Create a datatype and save it
-	IntType inttype(PredType::STD_B8LE);
-
-	DataType dtype(PredType::STD_B8LE);
-	dtype.commit(file, "STD_B8LE");
-
-	// Get and verify its name
-	H5std_string type_name = dtype.getObjName();
-	verify_val(type_name, "/STD_B8LE", "DataSet::getObjName", __LINE__, __FILE__);
+        // Open file
+        H5File file(FILE_OBJECTS, H5F_ACC_RDONLY);
+
+        // Check if GROUP1 exists in the file
+        bool exists = file.nameExists(GROUP1);
+        verify_val(exists, TRUE, "Group::nameExists GROUP1_1", __LINE__, __FILE__);
+        // Deprecated
+        exists = file.exists(GROUP1);
+        verify_val(exists, TRUE, "Group::exists GROUP1_1", __LINE__, __FILE__);
+
+        // Open GROUP1
+        Group grp1 = file.openGroup(GROUP1);
+
+        // Check if GROUP1_1 and GROUP1_2 exist in GROUP1
+        exists = grp1.nameExists(GROUP1_1);
+        verify_val(exists, TRUE, "Group::nameExists GROUP1_1", __LINE__, __FILE__);
+        exists = grp1.nameExists(GROUP1_2);
+        verify_val(exists, TRUE, "Group::nameExists GROUP1_2", __LINE__, __FILE__);
+        // Deprecated
+        exists = grp1.exists(GROUP1_1);
+        verify_val(exists, TRUE, "Group::exists GROUP1_1", __LINE__, __FILE__);
+        exists = grp1.exists(GROUP1_2);
+        verify_val(exists, TRUE, "Group::exists GROUP1_2", __LINE__, __FILE__);
+
+        // Check if DSET_IN_GRP1 exists in GROUP1
+        exists = grp1.nameExists(DSET_IN_GRP1);
+        verify_val(exists, TRUE, "Group::nameExists DSET_IN_GRP1", __LINE__, __FILE__);
+        // Deprecated
+        exists = grp1.exists(DSET_IN_GRP1);
+        verify_val(exists, TRUE, "Group::exists DSET_IN_GRP1", __LINE__, __FILE__);
+
+        // Open GROUP1_2
+        Group grp1_2 = grp1.openGroup(GROUP1_2);
+
+        // Check if DSET_IN_GRP1_2 exists in GROUP1_2
+        exists = grp1_2.nameExists(DSET_IN_GRP1_2);
+        verify_val(exists, TRUE, "Group::nameExists DSET_IN_GRP1_2", __LINE__, __FILE__);
+        // Deprecated
+        exists = grp1_2.exists(DSET_IN_GRP1_2);
+        verify_val(exists, TRUE, "Group::exists DSET_IN_GRP1_2", __LINE__, __FILE__);
+
+        // Check if a dataset exists given dataset as location with full path name
+        DataSet dset1 = file.openDataSet(DSET_IN_FILE);
+        exists        = dset1.nameExists("/Top Group/Dataset_in_Group_1");
+        verify_val(exists, TRUE, "Group::nameExists given dataset with full path name", __LINE__, __FILE__);
+
+        exists = grp1_2.nameExists(DSET_IN_GRP1);
+        verify_val(exists, FALSE, "Group::nameExists DSET_IN_GRP1", __LINE__, __FILE__);
+        // Deprecated
+        exists = dset1.exists("/Top Group/Dataset_in_Group_1");
+        verify_val(exists, TRUE, "Group::exists given dataset with full path name", __LINE__, __FILE__);
+        exists = grp1_2.exists(DSET_IN_GRP1);
+        verify_val(exists, FALSE, "Group::exists DSET_IN_GRP1", __LINE__, __FILE__);
+
+        // Everything will be closed as they go out of scope
+
+        PASSED();
+    } // try block
 
-	// Test getting type's name from copied type
-	DataType copied_type;
-	copied_type.copy(dtype);
-	copied_type.commit(file, "copy of STD_B8LE");
-	type_name = copied_type.getObjName();
-	verify_val(type_name, "/copy of STD_B8LE", "DataSet::getObjName", __LINE__, __FILE__);
-
-	// Test copying an integer predefined type
-	IntType new_int_type(PredType::NATIVE_INT);
-
-	// Name this datatype
-	new_int_type.commit(grp, "IntType NATIVE_INT");
-	ssize_t name_len = new_int_type.getObjName(type_name); // default len
-	verify_val(name_len, (ssize_t)HDstrlen("/typetests/IntType NATIVE_INT"), "DataSet::getObjName", __LINE__, __FILE__);
-	verify_val(type_name, "/typetests/IntType NATIVE_INT", "DataSet::getObjName", __LINE__, __FILE__);
+    // catch all other exceptions
+    catch (Exception &E) {
+        issue_fail_msg("test_existance", __LINE__, __FILE__);
+    }
+} // test_existance
 
-	// Close everything or they can be closed when objects go out of scope
-	dtype.close();
-	copied_type.close();
-	new_int_type.close();
-	grp.close();
+/*-------------------------------------------------------------------------
+ * Function:    test_get_objname_ontypes
+ *
+ * Purpose      Test getting object name from various committed types.
+ *
+ * Return       Success: 0
+ *              Failure: -1
+ *
+ * Programmer   Binh-Minh Ribler
+ *              March 4, 2014
+ *-------------------------------------------------------------------------
+ */
+static void
+test_get_objname_ontypes()
+{
+    SUBTEST("H5Object::getObjName on Committed Datatypes");
 
-	PASSED();
+    try {
+        // Create a file with default prop lists
+        H5File file(FILE_OBJECTS, H5F_ACC_RDWR);
+
+        // Create a group
+        Group grp = file.createGroup("typetests");
+
+        // Create a datatype and save it
+        IntType inttype(PredType::STD_B8LE);
+        inttype.commit(file, "INT type of STD_B8LE");
+
+        // Close the type then open it again to test getting its name
+        inttype.close();
+        inttype = file.openIntType("INT type of STD_B8LE"); // deprecated
+
+        // Get and verify its name
+        H5std_string inttype_name = inttype.getObjName();
+        verify_val(inttype_name, "/INT type of STD_B8LE", "DataType::getObjName", __LINE__, __FILE__);
+
+        // Close the type then open it again to test getting its name, but
+        // with the constructor this time
+        inttype.close();
+        IntType std_b8le(file, "INT type of STD_B8LE");
+
+        // Get and verify its name
+        H5std_string std_b8le_name = std_b8le.getObjName();
+        verify_val(std_b8le_name, "/INT type of STD_B8LE", "DataType::getObjName", __LINE__, __FILE__);
+
+        // Make copy of a predefined type and save it
+        DataType dtype(PredType::STD_B8LE);
+        dtype.commit(file, "STD_B8LE");
+
+        // Close the data type and file
+        dtype.close();
+        file.close();
+
+        // Re-open the file and the data type to test getting its name
+        file.openFile(FILE_OBJECTS, H5F_ACC_RDWR);
+        dtype = file.openDataType("STD_B8LE"); // deprecated
+
+        // Get and verify its name
+        H5std_string type_name = dtype.getObjName();
+        verify_val(type_name, "/STD_B8LE", "DataType::getObjName", __LINE__, __FILE__);
+
+        // Close the type and open it again with the constructor then test
+        // getting its name
+        dtype.close();
+        DataType dtype2(file, "STD_B8LE");
+        type_name = dtype2.getObjName();
+        verify_val(type_name, "/STD_B8LE", "DataType::getObjName", __LINE__, __FILE__);
+
+        // Test getting type's name from copied type
+        DataType copied_type;
+        copied_type.copy(dtype2);
+        copied_type.commit(file, "copy of STD_B8LE");
+        type_name = copied_type.getObjName();
+        verify_val(type_name, "/copy of STD_B8LE", "DataType::getObjName", __LINE__, __FILE__);
+
+        // Test copying an integer predefined type
+        IntType new_int_type(PredType::NATIVE_INT);
+
+        // Name this datatype
+        new_int_type.commit(grp, "IntType NATIVE_INT");
+        ssize_t name_len = new_int_type.getObjName(type_name); // default len
+        verify_val(name_len, static_cast<ssize_t>(HDstrlen("/typetests/IntType NATIVE_INT")),
+                   "DataType::getObjName", __LINE__, __FILE__);
+        verify_val(type_name, "/typetests/IntType NATIVE_INT", "DataType::getObjName", __LINE__, __FILE__);
+
+        // Close everything or they can be closed when objects go out of scope
+        dtype2.close();
+        copied_type.close();
+        new_int_type.close();
+        grp.close();
+
+        PASSED();
     } // end top try block
 
-    catch (Exception E)
-    {
-	issue_fail_msg("test_get_objname_ontypes", __LINE__, __FILE__);
+    catch (Exception &E) {
+        issue_fail_msg("test_get_objname_ontypes", __LINE__, __FILE__);
     }
-}   // test_get_objname_ontypes
+} // test_get_objname_ontypes
 
 /*-------------------------------------------------------------------------
- * Function:	test_get_objtype
- *
- * Purpose:	Tests getting object type
+ * Function:    test_get_objtype
  *
- * Return:	Success:	0
- *		Failure:	-1
+ * Purpose      Tests getting object type
  *
- * Programmer:	Binh-Minh Ribler
- *		Friday, March 4, 2014
- *
- * Modifications:
+ * Return       Success: 0
+ *              Failure: -1
  *
+ * Programmer   Binh-Minh Ribler
+ *              Friday, March 4, 2014
  *-------------------------------------------------------------------------
  */
-static void test_get_objtype()
+static void
+test_get_objtype()
 {
     SUBTEST("H5File::childObjType and H5Group::childObjType");
 
     try {
-	// Open file
-	H5File file(FILE_OBJECTS, H5F_ACC_RDWR);
-
-	// Open the top group
-	Group grp1 = file.openGroup(GROUP1);
+        // Open file
+        H5File file(FILE_OBJECTS, H5F_ACC_RDWR);
+
+        // Open the top group
+        Group grp1 = file.openGroup(GROUP1);
+
+        // Create a datatype and save it
+        DataType dtype(PredType::STD_I32LE);
+        dtype.commit(grp1, "STD_I32LE");
+
+        // Get and verify object type with
+        // H5O_type_t childObjType(const H5std_string& objname)
+        H5O_type_t objtype = file.childObjType(DSET_IN_FILE);
+        verify_val(static_cast<long>(objtype), static_cast<long>(H5O_TYPE_DATASET), "DataSet::childObjType",
+                   __LINE__, __FILE__);
+
+        // Get and verify object type with
+        // H5O_type_t childObjType(const char* objname)
+        objtype = grp1.childObjType(GROUP1_1.c_str());
+        verify_val(static_cast<long>(objtype), static_cast<long>(H5O_TYPE_GROUP), "DataSet::childObjType",
+                   __LINE__, __FILE__);
+
+        // Get and verify object type with
+        // H5O_type_t childObjType(hsize_t index, H5_index_t index_type,
+        // H5_iter_order_t order, const char* objname=".")
+        objtype = grp1.childObjType(1, H5_INDEX_NAME, H5_ITER_INC);
+        verify_val(static_cast<long>(objtype), static_cast<long>(H5O_TYPE_NAMED_DATATYPE),
+                   "DataSet::childObjType", __LINE__, __FILE__);
+
+        // Get and verify object type with
+        // H5O_type_t childObjType(hsize_t index,
+        // H5_index_t index_type=H5_INDEX_NAME,
+        // H5_iter_order_t order=H5_ITER_INC, const char* objname=".")
+        objtype = grp1.childObjType(2);
+        verify_val(static_cast<long>(objtype), static_cast<long>(H5O_TYPE_GROUP), "DataSet::childObjType",
+                   __LINE__, __FILE__);
+
+        // Everything will be closed as they go out of scope
+
+        PASSED();
+    } // try block
 
-	// Create a datatype and save it
-	DataType dtype(PredType::STD_I32LE);
-	dtype.commit(grp1, "STD_I32LE");
-
-	// Get and verify object type with
-	// H5O_type_t childObjType(const H5std_string& objname)
-	H5O_type_t objtype = file.childObjType(DSET_IN_FILE);
-	verify_val(objtype, H5O_TYPE_DATASET, "DataSet::childObjType", __LINE__, __FILE__);
+    // catch all other exceptions
+    catch (Exception &E) {
+        issue_fail_msg("test_get_objtype", __LINE__, __FILE__);
+    }
+} // test_get_objtype
 
-	// Get and verify object type with
-	// H5O_type_t childObjType(const char* objname)
-	objtype = grp1.childObjType(GROUP1_1.c_str());
-	verify_val(objtype, H5O_TYPE_GROUP, "DataSet::childObjType", __LINE__, __FILE__);
+/*-------------------------------------------------------------------------
+ * Function:    test_open_object_header
+ *
+ * Purpose      Test Group::getObjId function.
+ *
+ * Return       None
+ *
+ * Programmer   Binh-Minh Ribler (use C version)
+ *              March, 2017
+ *-------------------------------------------------------------------------
+ */
+const H5std_string GROUPNAME("group");
+const H5std_string DTYPENAME("group/datatype");
+const H5std_string DTYPENAME_INGRP("datatype");
+const H5std_string DSETNAME("dataset");
+#define RANK 2
+#define DIM0 5
+#define DIM1 10
+
+static void
+test_open_object_header()
+{
+    hsize_t dims[2];
 
-	// Get and verify object type with
-	// H5O_type_t childObjType(hsize_t index, H5_index_t index_type,
-	// H5_iter_order_t order, const char* objname=".")
-	objtype = grp1.childObjType((hsize_t)1, H5_INDEX_NAME, H5_ITER_INC);
-	verify_val(objtype, H5O_TYPE_NAMED_DATATYPE, "DataSet::childObjType", __LINE__, __FILE__);
+    // Output message about test being performed
+    SUBTEST("Group::getObjId");
 
-	// Get and verify object type with
-	// H5O_type_t childObjType(hsize_t index,
-	// H5_index_t index_type=H5_INDEX_NAME,
-	// H5_iter_order_t order=H5_ITER_INC, const char* objname=".")
-	objtype = grp1.childObjType((hsize_t)2);
-	verify_val(objtype, H5O_TYPE_GROUP, "DataSet::childObjType", __LINE__, __FILE__);
+    try {
+        // Create file FILE1
+        H5File file1(FILE_OBJHDR, H5F_ACC_TRUNC);
+        /* Create a group, dataset, and committed datatype within the file */
+
+        // Create a group in the root group
+        Group grp(file1.createGroup(GROUPNAME));
+        grp.close();
+
+        // Commit the type inside the file
+        IntType dtype(PredType::NATIVE_INT);
+        dtype.commit(file1, DTYPENAME);
+        dtype.close();
+
+        // Create a new dataset
+        dims[0] = DIM0;
+        dims[1] = DIM1;
+        DataSpace dspace(RANK, dims);
+        DataSet   dset(file1.createDataSet(DSETNAME, PredType::NATIVE_INT, dspace));
+
+        // Close dataset and dataspace
+        dset.close();
+        dspace.close();
+
+        // Now make sure that getObjId can open all three types of objects
+        hid_t obj_grp   = file1.getObjId(GROUPNAME);
+        hid_t obj_dtype = file1.getObjId(DTYPENAME);
+        hid_t obj_dset  = file1.getObjId(DSETNAME);
+
+        // Make sure that each is the right kind of ID
+        H5I_type_t id_type = IdComponent::getHDFObjType(obj_grp);
+        verify_val(static_cast<long>(id_type), static_cast<long>(H5I_GROUP), "H5Iget_type for group ID",
+                   __LINE__, __FILE__);
+        id_type = IdComponent::getHDFObjType(obj_dtype);
+        verify_val(static_cast<long>(id_type), static_cast<long>(H5I_DATATYPE), "H5Iget_type for datatype ID",
+                   __LINE__, __FILE__);
+        id_type = IdComponent::getHDFObjType(obj_dset);
+        verify_val(static_cast<long>(id_type), static_cast<long>(H5I_DATASET), "H5Iget_type for dataset ID",
+                   __LINE__, __FILE__);
+
+        /* Do something more complex with each of the IDs to make sure */
+
+        Group   grp2(obj_grp);
+        hsize_t num_objs = grp2.getNumObjs();
+        verify_val(static_cast<long>(num_objs), 1, "H5Gget_info", __LINE__, __FILE__);
+        // There should be one object, the datatype
+
+        // Close datatype object opened from the file
+        file1.closeObjId(obj_dtype);
+
+        dset.setId(obj_dset);
+        dspace         = dset.getSpace();
+        bool is_simple = dspace.isSimple();
+        verify_val(is_simple, true, "isSimple", __LINE__, __FILE__);
+        dspace.close();
+
+        // Open datatype object from the group
+        obj_dtype = grp2.getObjId(DTYPENAME_INGRP);
+
+        dtype.setId(obj_dtype);
+        H5T_class_t type_class = dtype.getClass();
+        verify_val(static_cast<long>(type_class), static_cast<long>(H5T_INTEGER), "H5Tget_class", __LINE__,
+                   __FILE__);
+        dtype.close();
+
+        // Close datatype object
+        grp2.closeObjId(obj_dtype);
+
+        // Close the group object
+        file1.closeObjId(obj_grp);
+
+        // Try doing something with group, the ID should still work
+        num_objs = grp2.getNumObjs();
+        verify_val(static_cast<long>(num_objs), 1, "H5Gget_info", __LINE__, __FILE__);
+
+        // Close the cloned group
+        grp2.close();
+
+        PASSED();
+    } // end of try block
+    // catch invalid action exception
+    catch (InvalidActionException &E) {
+        cerr << " in InvalidActionException" << endl;
+        cerr << " *FAILED*" << endl;
+        cerr << "    <<<  " << E.getDetailMsg() << "  >>>" << endl << endl;
+    }
+    // catch all other exceptions
+    catch (Exception &E) {
+        cerr << " in Exception" << endl;
+        issue_fail_msg("test_file_name()", __LINE__, __FILE__, E.getCDetailMsg());
+    }
+} // test_open_object_header
 
-	// Everything will be closed as they go out of scope
+/*-------------------------------------------------------------------------
+ * Function:    test_getobjectinfo_same_file
+ *
+ * Purpose      Test that querying the object info for objects in the same
+ *              file will return the same file "number".
+ *
+ * Return       None
+ *
+ * July, 2018
+ *-------------------------------------------------------------------------
+ */
+const H5std_string FILE_OBJINFO("tobject_getinfo.h5");
+const H5std_string GROUP1NAME("group1");
+const H5std_string GROUP2NAME("group2");
+static void
+test_getobjectinfo_same_file()
+{
+    H5O_info2_t oinfo1, oinfo2; /* Object info structs */
 
-	PASSED();
-    }	// try block
+    // Output message about test being performed
+    SUBTEST("Group::getObjinfo");
 
+    try {
+        // Create a new HDF5 file
+        H5File file1(FILE_OBJINFO, H5F_ACC_TRUNC);
+
+        // Create two groups in the file
+        Group grp1(file1.createGroup(GROUP1NAME));
+        Group grp2(file1.createGroup(GROUP2NAME));
+
+        // Reset object info
+        HDmemset(&oinfo1, 0, sizeof(oinfo1));
+        HDmemset(&oinfo2, 0, sizeof(oinfo2));
+
+        // Query the info of two groups and verify that they have the same
+        // file number
+        grp1.getObjinfo(oinfo1);
+        grp2.getObjinfo(oinfo2);
+        verify_val(oinfo1.fileno, oinfo2.fileno, "file number from getObjinfo", __LINE__, __FILE__);
+
+        // Close groups and file
+        grp1.close();
+        grp2.close();
+        file1.close();
+
+        // Open the file twice
+        file1.openFile(FILE_OBJINFO, H5F_ACC_RDWR);
+        H5File file2(FILE_OBJINFO, H5F_ACC_RDWR);
+
+        // Create two groups in the file
+        grp1 = file1.openGroup(GROUP1NAME);
+        grp2 = file2.openGroup(GROUP2NAME);
+
+        // Reset object info
+        HDmemset(&oinfo1, 0, sizeof(oinfo1));
+        HDmemset(&oinfo2, 0, sizeof(oinfo2));
+
+        // Query the info of two groups and verify that they have the same
+        // file number
+        grp1.getObjinfo(oinfo1);
+        grp2.getObjinfo(oinfo2);
+        verify_val(oinfo1.fileno, oinfo2.fileno, "file number from getObjinfo", __LINE__, __FILE__);
+
+        // Reset object info
+        HDmemset(&oinfo1, 0, sizeof(oinfo1));
+        HDmemset(&oinfo2, 0, sizeof(oinfo2));
+
+        file1.getObjinfo(GROUP1NAME, oinfo1);
+        file1.getObjinfo(GROUP2NAME, oinfo2);
+        verify_val(oinfo1.fileno, oinfo2.fileno, "file number from getObjectInfo", __LINE__, __FILE__);
+
+        // Close groups and files
+        grp1.close();
+        grp2.close();
+        file1.close();
+        file2.close();
+
+        PASSED();
+    } // end of try block
     // catch all other exceptions
-    catch (Exception E)
-    {
-	issue_fail_msg("test_get_objtype", __LINE__, __FILE__);
+    catch (Exception &E) {
+        cerr << " in Exception " << E.getCFuncName() << "detail: " << E.getCDetailMsg() << endl;
+        issue_fail_msg("test_getobjectinfo_same_file()", __LINE__, __FILE__, E.getCDetailMsg());
     }
-}   // test_get_objtype
+
+} // test_getobjectinfo_same_file
 
 /*-------------------------------------------------------------------------
- * Function:	test_objects
+ * Function:    test_intermediate_groups
+ *
+ * Purpose      Test that intermediate groups are created as specified by
+ *              the property setting.
  *
- * Purpose:	Tests HDF5 object related functionality
+ * Return       None
  *
- * Return:	Success: 0
- *		Failure: -1
+ * April, 2019
+ *-------------------------------------------------------------------------
+ */
+const H5std_string FILE_INTERGRPS("tobject_intergrps.h5");
+const H5std_string GROUP10NAME("/group10");
+const H5std_string GROUP11NAME("/group10/group11");
+const H5std_string GROUP12NAME("/group10/group11/group12");
+const H5std_string GROUP13NAME("/group10/group11/group12/group13");
+const H5std_string GROUP14NAME("/group10/group11/group12/group13/group14");
+const H5std_string GROUP14FROM13NAME("group14");
+const H5std_string GROUP20NAME("/group20");
+const H5std_string GROUP21NAME("/group20/group21");
+const H5std_string GROUP22NAME("group21/group22");
+const H5std_string GROUP22FULLNAME("/group20/group21/group22");
+static void
+test_intermediate_groups()
+{
+    // Output message about test being performed
+    SUBTEST("Group::set/getCreateIntermediateGroup");
+
+    try {
+        // Create a new HDF5 file
+        H5File file(FILE_INTERGRPS, H5F_ACC_TRUNC);
+
+        // Create a link create property list and set the "create
+        // intermediate groups" flag
+        LinkCreatPropList lcpl;
+        lcpl.setCreateIntermediateGroup(true);
+
+        // Verify value of create missing groups flag
+        bool crt_int_grps = lcpl.getCreateIntermediateGroup();
+        verify_val(crt_int_grps, true, "LinkCreatPropList::getCreateIntermediateGroup", __LINE__, __FILE__);
+
+        // Create GROUP12NAME with creating missing groups
+        Group grp12(file.createGroup(GROUP12NAME, lcpl));
+
+        // Missing groups: GROUP10NAME and GROUP11NAME
+
+        // Create GROUP14NAME without the use of link create plist, should
+        // fail because group GROUP13NAME is missing
+        try {
+            Group grp14_nopl(file.createGroup(GROUP14NAME));
+        }
+        catch (FileIException &expected1) {
+        } // Failure is ignored
+
+        // Create GROUP14NAME with the flag to create missing groups set
+        // to FALSE, should fail because group GROUP13NAME is missing
+
+        // Reset flag to not create missing groups
+        lcpl.setCreateIntermediateGroup(false);
+
+        // Verify value of create missing groups flag
+        crt_int_grps = lcpl.getCreateIntermediateGroup();
+        verify_val(crt_int_grps, false, "LinkCreatPropList::getCreateIntermediateGroup", __LINE__, __FILE__);
+
+        try {
+            Group grp14_false(file.createGroup(GROUP14NAME, lcpl));
+        }
+        catch (FileIException &expected2) {
+        } // Failure is ignored
+
+        // Set the flag to create missing groups set to TRUE
+        lcpl.setCreateIntermediateGroup(true);
+        crt_int_grps = lcpl.getCreateIntermediateGroup();
+        verify_val(crt_int_grps, true, "LinkCreatPropList::getCreateIntermediateGroup", __LINE__, __FILE__);
+
+        // Create GROUP14NAME with the use of link create plist
+        Group grp14(file.createGroup(GROUP14NAME, lcpl));
+
+        // Missing groups: GROUP13NAME
+
+        // Create group GROUP20NAME
+        Group grp20(file.createGroup(GROUP20NAME));
+
+        // Create group GROUP22NAME with missing group GROUP21NAME
+        Group grp22(grp20.createGroup(GROUP22NAME, lcpl));
+
+        // Close groups and file
+        grp12.close();
+        grp14.close();
+        grp20.close();
+        grp22.close();
+        file.close();
+
+        // Reopen the file
+        file.openFile(FILE_INTERGRPS, H5F_ACC_RDWR);
+
+        // Open the missing groups and various combinations
+        Group grp10(file.openGroup(GROUP10NAME));
+        Group grp11(file.openGroup(GROUP11NAME));
+        Group grp13(file.openGroup(GROUP13NAME));
+        Group grp14from13(grp13.openGroup(GROUP14FROM13NAME));
+        Group grp21(file.openGroup(GROUP21NAME));
+        Group grp22fromfile(file.openGroup(GROUP22FULLNAME));
+
+        PASSED();
+    } // end of try block
+    // catch all other exceptions
+    catch (Exception &E) {
+        cerr << " in Exception " << E.getCFuncName() << "detail: " << E.getCDetailMsg() << endl;
+        issue_fail_msg("test_intermediate_groups()", __LINE__, __FILE__, E.getCDetailMsg());
+    }
+
+} // test_intermediate_groups
+
+/*-------------------------------------------------------------------------
+ * Function:    test_object
  *
- * Programmer:	Binh-Minh Ribler
- *		Friday, Mar 4, 2014
+ * Purpose      Tests HDF5 object related functionality
  *
- * Modifications:
+ * Return       Success: 0
+ *              Failure: -1
  *
+ * March 4, 2014
  *-------------------------------------------------------------------------
  */
-#ifdef __cplusplus
-extern "C"
-#endif
-void test_object()
+extern "C" void
+test_object()
 {
     // Output message about test being performed
     MESSAGE(5, ("Testing Object Functions\n"));
 
-    test_get_objname();    // Test get object name from groups/datasets
-    test_get_objname_ontypes();	// Test get object name from types
-    test_get_objtype();    // Test get object type
+    test_get_objname();             // Test get object name from groups/datasets
+    test_existance();               // Test check for object existence
+    test_get_objname_ontypes();     // Test get object name from types
+    test_get_objtype();             // Test get object type
+    test_open_object_header();      // Test object header functions (H5O)
+    test_getobjectinfo_same_file(); // Test object info in same file
+    test_intermediate_groups();     // Test intermediate group property
 
-}   // test_objects
+} // test_object
 
 /*-------------------------------------------------------------------------
  * Function:    cleanup_objects
  *
- * Purpose:     Cleanup temporary test files
- *
- * Return:      none
- *
- * Programmer:  (use C version)
- *
- * Modifications:
+ * Purpose      Cleanup temporary test files
  *
+ * Return       None
  *-------------------------------------------------------------------------
  */
-#ifdef __cplusplus
-extern "C"
-#endif
-void cleanup_object()
+extern "C" void
+cleanup_object()
 {
     HDremove(FILE_OBJECTS.c_str());
+    HDremove(FILE_OBJHDR.c_str());
+    HDremove(FILE_OBJINFO.c_str());
+    HDremove(FILE_INTERGRPS.c_str());
 } // cleanup_objects
diff --git a/c++/test/trefer.cpp b/c++/test/trefer.cpp
index 9d072be..fc7931f 100644
--- a/c++/test/trefer.cpp
+++ b/c++/test/trefer.cpp
@@ -1,50 +1,42 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*****************************************************************************
    FILE
    trefer.cpp - HDF5 C++ testing the functionalities associated with the C
-		Reference interface (H5R)
+                Reference interface (H5R)
 
  ***************************************************************************/
-
-#ifdef OLD_HEADER_FILENAME
-#include <iostream.h>
-#else
 #include <iostream>
-#endif
-#include <string>
+using std::cerr;
+using std::endl;
 
-#include "H5Cpp.h"      // C++ API header file
-
-#ifndef H5_NO_NAMESPACE
-    using namespace H5;
-#endif
+#include <string>
+#include "H5Cpp.h" // C++ API header file
+using namespace H5;
 
-#include "h5cpputil.h"  // C++ utilility header file
+#include "h5test.h"
+#include "h5cpputil.h" // C++ utilility header file
 
-const H5std_string      FILE1("trefer1.h5");
-const H5std_string      FILE2("trefer2.h5");
+const H5std_string FILE1("trefer1.h5");
+const H5std_string FILE2("trefer2.h5");
 
 // Dataset 1
-const H5std_string      DSET1_NAME("Dataset1");
-const H5std_string      DSET2_NAME("Dataset2");
+const H5std_string DSET1_NAME("Dataset1");
+const H5std_string DSET2_NAME("Dataset2");
 
-const H5std_string MEMBER1( "a_name" );
-const H5std_string MEMBER2( "b_name" );
-const H5std_string MEMBER3( "c_name" );
+const H5std_string MEMBER1("a_name");
+const H5std_string MEMBER2("b_name");
+const H5std_string MEMBER3("c_name");
 
 // 1-D dataset with fixed dimensions
 const int SPACE1_RANK = 1;
@@ -61,753 +53,781 @@ const int POINT1_NPOINTS = 10;
 typedef struct s1_t {
     unsigned int a;
     unsigned int b;
-    float c;
+    float        c;
 } s1_t;
 
-/****************************************************************
-**
-**  test_reference_params(): Test basic H5R (reference) parameters
-**                           for correct processing
-**
-****************************************************************/
+/*-------------------------------------------------------------------------
+ * Function:    test_reference_params
+ *
+ * Purpose      Test basic H5R (reference) parameters for correct processing
+ *
+ * Return       None
+ *-------------------------------------------------------------------------
+ */
 static void
-test_reference_params(void)
+test_reference_params()
 {
     const char *write_comment = "Foo!"; /* Comments for group */
 
     // Output message about test being performed
     SUBTEST("Object Reference Parameters");
 
-    H5File* file1 = NULL;
+    H5File *file1 = NULL;
     try {
-	hobj_ref_t *wbuf,      // buffer to write to disk
-		   *rbuf,      // buffer read from disk
-		   *tbuf;      // temp. buffer read from disk
+        hobj_ref_t *wbuf, // buffer to write to disk
+            *rbuf,        // buffer read from disk
+            *tbuf;        // temp. buffer read from disk
 
-	// Allocate write & read buffers
-	int temp_size = MAX(sizeof(unsigned),sizeof(hobj_ref_t));
-	wbuf=(hobj_ref_t*)HDmalloc(temp_size*SPACE1_DIM1);
-	rbuf=(hobj_ref_t*)HDmalloc(temp_size*SPACE1_DIM1);
-	tbuf=(hobj_ref_t*)HDmalloc(temp_size*SPACE1_DIM1);
+        // Allocate write & read buffers
+        size_t temp_size = MAX(sizeof(unsigned), sizeof(hobj_ref_t));
+        wbuf             = static_cast<hobj_ref_t *>(HDmalloc(temp_size * SPACE1_DIM1));
+        rbuf             = static_cast<hobj_ref_t *>(HDmalloc(temp_size * SPACE1_DIM1));
+        tbuf             = static_cast<hobj_ref_t *>(HDmalloc(temp_size * SPACE1_DIM1));
 
         // Create file FILE1
-        file1 = new H5File (FILE1, H5F_ACC_TRUNC);
-
-	// Create dataspace for datasets
-	hsize_t	dims1[] = {SPACE1_DIM1};
-	DataSpace sid1(SPACE1_RANK, dims1);
-
-	// Create a group
-	Group group = file1->createGroup("Group1");
-
-	// Set group's comment
- 	group.setComment(".", write_comment);
-
-	// Create a dataset (inside /Group1)
-	DataSet dataset = group.createDataSet(DSET1_NAME, PredType::NATIVE_UINT, sid1);
-
-	unsigned *tu32;      // Temporary pointer to uint32 data
-	int i;
-	for (tu32=(unsigned *)wbuf, i=0; i<SPACE1_DIM1; i++)
-	    *tu32++=i*3; // from C test
-
-	// Write selection to disk
-	dataset.write(wbuf, PredType::NATIVE_UINT);
-
-	// Close Dataset
-	dataset.close();
-
-	// Create another dataset (inside /Group1)
-	dataset = group.createDataSet("Dataset2", PredType::NATIVE_UCHAR, sid1);
-
-	// Close Dataset
-	dataset.close();
-
-	// Create a datatype to refer to
-	CompType dtype1(sizeof(s1_t));
-
-	// Insert fields
-	dtype1.insertMember(MEMBER1, HOFFSET(s1_t, a), PredType::NATIVE_INT);
-	dtype1.insertMember(MEMBER2, HOFFSET(s1_t, b), PredType::NATIVE_INT);
-	dtype1.insertMember(MEMBER3, HOFFSET(s1_t, c), PredType::NATIVE_FLOAT);
-
-	// Save datatype for later
-	dtype1.commit(group, "Datatype1");
-
-	// Close datatype and group
-	dtype1.close();
-	group.close();
-
-	// Create a dataset
-	dataset = file1->createDataSet("Dataset3", PredType::STD_REF_OBJ, sid1);
-
-	/* Test parameters to H5Location::reference */
-	try {
-	    file1->reference(NULL, "/Group1/Dataset1");
-	} catch (ReferenceException E) {} // We expect this to fail
-	try {
-	    file1->reference(&wbuf[0], NULL);
-	} catch (ReferenceException E) {} // We expect this to fail
-	try {
-	    file1->reference(&wbuf[0], "");
-	} catch (ReferenceException E) {} // We expect this to fail
-	try {
-	    file1->reference(&wbuf[0], "/Group1/Dataset1", H5R_MAXTYPE);
-	} catch (ReferenceException E) {} // We expect this to fail
-	try {
-	    file1->reference(&wbuf[0], "/Group1/Dataset1", H5R_DATASET_REGION);
-	} catch (ReferenceException E) {} // We expect this to fail
-
-	// Close resources
-	dataset.close();
-	file1->close();
-	// Let sid1 go out of scope
-
-	// Free memory buffers
-	HDfree(wbuf);
-	HDfree(rbuf);
-	HDfree(tbuf);
-
-	PASSED();
+        file1 = new H5File(FILE1, H5F_ACC_TRUNC);
+
+        // Create dataspace for datasets
+        hsize_t   dims1[] = {SPACE1_DIM1};
+        DataSpace sid1(SPACE1_RANK, dims1);
+
+        // Create a group
+        Group group = file1->createGroup("Group1");
+
+        // Set group's comment
+        group.setComment(".", write_comment);
+
+        // Create a dataset (inside /Group1)
+        DataSet dataset = group.createDataSet(DSET1_NAME, PredType::NATIVE_UINT, sid1);
+
+        unsigned *tu32; // Temporary pointer to uint32 data
+        unsigned  i;
+        for (tu32 = reinterpret_cast<unsigned *>(wbuf), i = 0; i < SPACE1_DIM1; i++)
+            *tu32++ = i * 3; // from C test
+
+        // Write selection to disk
+        dataset.write(wbuf, PredType::NATIVE_UINT);
+
+        // Close Dataset
+        dataset.close();
+
+        // Create another dataset (inside /Group1)
+        dataset = group.createDataSet("Dataset2", PredType::NATIVE_UCHAR, sid1);
+
+        // Close Dataset
+        dataset.close();
+
+        // Create a datatype to refer to
+        CompType dtype1(sizeof(s1_t));
+
+        // Insert fields
+        dtype1.insertMember(MEMBER1, HOFFSET(s1_t, a), PredType::NATIVE_INT);
+        dtype1.insertMember(MEMBER2, HOFFSET(s1_t, b), PredType::NATIVE_INT);
+        dtype1.insertMember(MEMBER3, HOFFSET(s1_t, c), PredType::NATIVE_FLOAT);
+
+        // Save datatype for later
+        dtype1.commit(group, "Datatype1");
+
+        // Close datatype and group
+        dtype1.close();
+        group.close();
+
+        // Create a dataset
+        dataset = file1->createDataSet("Dataset3", PredType::STD_REF_OBJ, sid1);
+
+        /* Test parameters to H5Location::reference */
+        try {
+            file1->reference(NULL, "/Group1/Dataset1");
+        }
+        catch (ReferenceException &E) {
+        } // We expect this to fail
+        try {
+            file1->reference(&wbuf[0], NULL);
+        }
+        catch (ReferenceException &E) {
+        } // We expect this to fail
+        try {
+            file1->reference(&wbuf[0], "");
+        }
+        catch (ReferenceException &E) {
+        } // We expect this to fail
+        try {
+            file1->reference(&wbuf[0], "/Group1/Dataset1", H5R_MAXTYPE);
+        }
+        catch (ReferenceException &E) {
+        } // We expect this to fail
+        try {
+            file1->reference(&wbuf[0], "/Group1/Dataset1", H5R_DATASET_REGION);
+        }
+        catch (ReferenceException &E) {
+        } // We expect this to fail
+
+        // Close resources
+        dataset.close();
+        file1->close();
+        // Let sid1 go out of scope
+
+        // Free memory buffers
+        HDfree(wbuf);
+        HDfree(rbuf);
+        HDfree(tbuf);
+
+        PASSED();
     } // end try
-    catch (Exception E) {
-	issue_fail_msg("test_reference_param()",__LINE__,__FILE__,
-			E.getCFuncName(), E.getCDetailMsg());
+    catch (Exception &E) {
+        issue_fail_msg("test_reference_param()", __LINE__, __FILE__, E.getCFuncName(), E.getCDetailMsg());
     }
 
-    if(file1)
-        delete file1;
-}   /* test_reference_param() */
-
-/****************************************************************
-**
-**  test_reference_obj(): Test basic object reference functions
-**			  to various kinds of objects
-**
-****************************************************************/
-static void test_reference_obj(void)
+    delete file1;
+} /* test_reference_param() */
+
+/*-------------------------------------------------------------------------
+ * Function:    test_reference_obj
+ *
+ * Purpose      Test basic object reference functions to various kinds
+ *              of objects
+ *
+ * Return       None
+ *-------------------------------------------------------------------------
+ */
+static void
+test_reference_obj()
 {
-    int    i;          // counting variables
-    const  H5std_string write_comment="Foo!"; // Comments for group
+    const H5std_string write_comment = "Foo!"; // Comments for group
 
     // Output message about test being performed
     SUBTEST("Object Reference Functions");
 
-    H5File* file1 = NULL;
+    H5File *file1 = NULL;
     try {
-	hobj_ref_t *wbuf,      // buffer to write to disk
-		   *rbuf,      // buffer read from disk
-		   *tbuf;      // temp. buffer read from disk
+        hobj_ref_t *wbuf, // buffer to write to disk
+            *rbuf,        // buffer read from disk
+            *tbuf;        // temp. buffer read from disk
 
-	// Allocate write & read buffers
-	int temp_size = MAX(sizeof(unsigned),sizeof(hobj_ref_t));
-	wbuf=(hobj_ref_t*)HDmalloc(temp_size*SPACE1_DIM1);
-	rbuf=(hobj_ref_t*)HDmalloc(temp_size*SPACE1_DIM1);
-	tbuf=(hobj_ref_t*)HDmalloc(temp_size*SPACE1_DIM1);
+        // Allocate write & read buffers
+        size_t temp_size = MAX(sizeof(unsigned), sizeof(hobj_ref_t));
+        wbuf             = static_cast<hobj_ref_t *>(HDmalloc(temp_size * SPACE1_DIM1));
+        rbuf             = static_cast<hobj_ref_t *>(HDmalloc(temp_size * SPACE1_DIM1));
+        tbuf             = static_cast<hobj_ref_t *>(HDmalloc(temp_size * SPACE1_DIM1));
 
         // Create file FILE1
-        file1 = new H5File (FILE1, H5F_ACC_TRUNC);
+        file1 = new H5File(FILE1, H5F_ACC_TRUNC);
 
-	// Create dataspace for datasets
-	hsize_t	dims1[] = {SPACE1_DIM1};
-	DataSpace sid1(SPACE1_RANK, dims1);
+        // Create dataspace for datasets
+        hsize_t   dims1[] = {SPACE1_DIM1};
+        DataSpace sid1(SPACE1_RANK, dims1);
 
-	// Create dataset access property list
-	PropList dapl(H5P_DATASET_ACCESS);
+        // Create dataset access property list
+        PropList dapl(H5P_DATASET_ACCESS);
 
-	// Create a group
-	Group group = file1->createGroup("Group1");
+        // Create a group
+        Group group = file1->createGroup("Group1");
 
-	// Set group's comment
-	group.setComment(".", write_comment);
+        // Set group's comment
+        group.setComment(".", write_comment);
 
-	// Create a dataset (inside /Group1)
-	DataSet dataset = group.createDataSet(DSET1_NAME, PredType::NATIVE_UINT, sid1);
+        // Create a dataset (inside /Group1)
+        DataSet dataset = group.createDataSet(DSET1_NAME, PredType::NATIVE_UINT, sid1);
 
-	unsigned *tu32;      // Temporary pointer to uint32 data
-	for (tu32 = (unsigned *)wbuf, i = 0; i < SPACE1_DIM1; i++)
-	    *tu32++=i*3; // from C test
+        unsigned *tu32; // Temporary pointer to uint32 data
+        unsigned  i;
+        for (tu32 = reinterpret_cast<unsigned *>(wbuf), i = 0; i < SPACE1_DIM1; i++)
+            *tu32++ = i * 3; // from C test
 
-	// Write selection to disk
-	dataset.write(wbuf, PredType::NATIVE_UINT);
+        // Write selection to disk
+        dataset.write(wbuf, PredType::NATIVE_UINT);
 
-	// Close Dataset
-	dataset.close();
+        // Close Dataset
+        dataset.close();
 
-	// Create another dataset (inside /Group1)
-	dataset = group.createDataSet("Dataset2", PredType::NATIVE_UCHAR, sid1);
+        // Create another dataset (inside /Group1)
+        dataset = group.createDataSet("Dataset2", PredType::NATIVE_UCHAR, sid1);
 
-	// Close Dataset
-	dataset.close();
+        // Close Dataset
+        dataset.close();
 
-	// Create a datatype to refer to
-	CompType dtype1(sizeof(s1_t));
+        // Create a datatype to refer to
+        CompType dtype1(sizeof(s1_t));
 
-	// Insert fields
-	dtype1.insertMember(MEMBER1, HOFFSET(s1_t, a), PredType::NATIVE_INT);
-	dtype1.insertMember(MEMBER2, HOFFSET(s1_t, b), PredType::NATIVE_INT);
-	dtype1.insertMember(MEMBER3, HOFFSET(s1_t, c), PredType::NATIVE_FLOAT);
+        // Insert fields
+        dtype1.insertMember(MEMBER1, HOFFSET(s1_t, a), PredType::NATIVE_INT);
+        dtype1.insertMember(MEMBER2, HOFFSET(s1_t, b), PredType::NATIVE_INT);
+        dtype1.insertMember(MEMBER3, HOFFSET(s1_t, c), PredType::NATIVE_FLOAT);
 
-	// Save datatype for later
-	dtype1.commit(group, "Datatype1");
+        // Save datatype for later
+        dtype1.commit(group, "Datatype1");
 
-	// Close datatype and group
-	dtype1.close();
-	group.close();
+        // Close datatype and group
+        dtype1.close();
+        group.close();
 
-	// Create a dataset
-	dataset = file1->createDataSet("Dataset3", PredType::STD_REF_OBJ, sid1);
+        // Create a dataset
+        dataset = file1->createDataSet("Dataset3", PredType::STD_REF_OBJ, sid1);
 
-	// Create reference to dataset and test getRefObjType
-	file1->reference(&wbuf[0], "/Group1/Dataset1");
-	H5O_type_t refobj_type = dataset.getRefObjType(&wbuf[0], H5R_OBJECT);
-	verify_val(refobj_type, H5O_TYPE_DATASET, "DataSet::getRefObjType",__LINE__,__FILE__);
+        // Create reference to dataset and test getRefObjType
+        file1->reference(&wbuf[0], "/Group1/Dataset1");
+        H5O_type_t refobj_type = dataset.getRefObjType(&wbuf[0], H5R_OBJECT);
+        verify_val(static_cast<long>(refobj_type), static_cast<long>(H5O_TYPE_DATASET),
+                   "DataSet::getRefObjType", __LINE__, __FILE__);
 
-	// Create reference to dataset and test getRefObjType
-	file1->reference(&wbuf[1], "/Group1/Dataset2");
-	refobj_type = dataset.getRefObjType(&wbuf[1], H5R_OBJECT);
-	verify_val(refobj_type, H5O_TYPE_DATASET, "DataSet::getRefObjType",__LINE__,__FILE__);
+        // Create reference to dataset and test getRefObjType
+        file1->reference(&wbuf[1], "/Group1/Dataset2");
+        refobj_type = dataset.getRefObjType(&wbuf[1], H5R_OBJECT);
+        verify_val(static_cast<long>(refobj_type), static_cast<long>(H5O_TYPE_DATASET),
+                   "DataSet::getRefObjType", __LINE__, __FILE__);
 
-	// Create reference to group
-	file1->reference(&wbuf[2], "/Group1");
-	refobj_type = dataset.getRefObjType(&wbuf[2], H5R_OBJECT);
-	verify_val(refobj_type, H5O_TYPE_GROUP, "DataSet::getRefObjType",__LINE__,__FILE__);
+        // Create reference to group
+        file1->reference(&wbuf[2], "/Group1");
+        refobj_type = dataset.getRefObjType(&wbuf[2], H5R_OBJECT);
+        verify_val(static_cast<long>(refobj_type), static_cast<long>(H5O_TYPE_GROUP),
+                   "DataSet::getRefObjType", __LINE__, __FILE__);
 
-	// Create reference to named datatype
-	file1->reference(&wbuf[3], "/Group1/Datatype1");
-	refobj_type = dataset.getRefObjType(&wbuf[3], H5R_OBJECT);
-	verify_val(refobj_type, H5O_TYPE_NAMED_DATATYPE, "DataSet::getRefObjType",__LINE__,__FILE__);
+        // Create reference to named datatype
+        file1->reference(&wbuf[3], "/Group1/Datatype1");
+        refobj_type = dataset.getRefObjType(&wbuf[3], H5R_OBJECT);
+        verify_val(static_cast<long>(refobj_type), static_cast<long>(H5O_TYPE_NAMED_DATATYPE),
+                   "DataSet::getRefObjType", __LINE__, __FILE__);
 
-	// Write selection to disk
-	dataset.write(wbuf, PredType::STD_REF_OBJ);
+        // Write selection to disk
+        dataset.write(wbuf, PredType::STD_REF_OBJ);
 
-	// Close disk dataspace, dataset, and file
-	sid1.close();
-	dataset.close();
-	delete file1;
+        // Close disk dataspace, dataset, and file
+        sid1.close();
+        dataset.close();
+        delete file1;
 
-	// Re-open the file
-	file1 = new H5File(FILE1, H5F_ACC_RDWR);
+        // Re-open the file
+        file1 = new H5File(FILE1, H5F_ACC_RDWR);
 
-	// Open the dataset
-	dataset = file1->openDataSet("/Dataset3");
+        // Open the dataset
+        dataset = file1->openDataSet("/Dataset3");
 
-	// Read selection from disk
-	dataset.read(rbuf, PredType::STD_REF_OBJ);
+        // Read selection from disk
+        dataset.read(rbuf, PredType::STD_REF_OBJ);
 
-	// Dereference dataset object by ctor, from the location where
-	// 'dataset' is located
-	DataSet dset2(dataset, &rbuf[0], H5R_OBJECT, dapl);
+        // Dereference dataset object by ctor, from the location where
+        // 'dataset' is located
+        DataSet dset2(dataset, &rbuf[0], H5R_OBJECT, dapl);
 
-	// Check information in the referenced dataset
-	sid1 = dset2.getSpace();
-	hssize_t n_elements = sid1.getSimpleExtentNpoints();
-	verify_val((long)n_elements, 4, "DataSpace::getSimpleExtentNpoints",__LINE__,__FILE__);
+        // Check information in the referenced dataset
+        sid1                = dset2.getSpace();
+        hssize_t n_elements = sid1.getSimpleExtentNpoints();
+        verify_val(static_cast<long>(n_elements), 4, "DataSpace::getSimpleExtentNpoints", __LINE__, __FILE__);
 
-	// Read from disk
-	dset2.read(tbuf, PredType::NATIVE_UINT);
+        // Read from disk
+        dset2.read(tbuf, PredType::NATIVE_UINT);
 
-	for(tu32 = (unsigned *)tbuf, i = 0; i < SPACE1_DIM1; i++, tu32++)
-	   verify_val(*tu32, (uint32_t)(i*3), "DataSpace::getSimpleExtentNpoints",__LINE__,__FILE__);
+        for (tu32 = reinterpret_cast<unsigned *>(tbuf), i = 0; i < SPACE1_DIM1; i++, tu32++)
+            verify_val(*tu32, static_cast<uint32_t>(i * 3), "DataSpace::getSimpleExtentNpoints", __LINE__,
+                       __FILE__);
 
-	// Close dereferenced dataset
-	dset2.close();
+        // Close dereferenced dataset
+        dset2.close();
 
-	// Dereference group object from the location where 'dataset' is located
-	group.dereference(dataset, &rbuf[2]);
+        // Dereference group object from the location where 'dataset' is located
+        group.dereference(dataset, &rbuf[2]);
 
-	// Get group's comment using
-	// H5std_string getComment(const char* name, <buf_size=0 by default>)
-	H5std_string read_comment1 = group.getComment(".", 10);
-	verify_val(read_comment1.c_str(), write_comment, "Group::getComment",__LINE__,__FILE__);
+        // Get group's comment using
+        // H5std_string getComment(const char* name, <buf_size=0 by default>)
+        H5std_string read_comment1 = group.getComment(".", 10);
+        verify_val(read_comment1.c_str(), write_comment, "Group::getComment", __LINE__, __FILE__);
 
-	// Test with the old default value
-	read_comment1 = group.getComment(".", 256);
-	verify_val(read_comment1.c_str(), write_comment, "Group::getComment",__LINE__,__FILE__);
+        // Test with the old default value
+        read_comment1 = group.getComment(".", 256);
+        verify_val(read_comment1.c_str(), write_comment, "Group::getComment", __LINE__, __FILE__);
 
-	// Test that getComment handles failures gracefully, using
-	// H5std_string getComment(const char* name, <buf_size=0 by default>)
-	try {
-	    H5std_string read_comment_tmp = group.getComment(NULL);
-	}
-	catch (Exception E) {} // We expect this to fail
+        // Test that getComment handles failures gracefully, using
+        // H5std_string getComment(const char* name, <buf_size=0 by default>)
+        try {
+            H5std_string read_comment_tmp = group.getComment(NULL);
+        }
+        catch (Exception &E) {
+        } // We expect this to fail
 
-	// Close group
-	group.close();
+        // Close group
+        group.close();
 
-	/*
-	 * Verify correct referenced datatype
-	 */
-	// Open datatype object
-	dtype1.dereference(dataset, &rbuf[3]);
+        /*
+         * Verify correct referenced datatype
+         */
+        // Open datatype object
+        dtype1.dereference(dataset, &rbuf[3]);
 
-	// Verify correct datatype
+        // Verify correct datatype
         H5T_class_t tclass;
 
         tclass = dtype1.getClass();
-	verify_val(tclass, H5T_COMPOUND, "DataType::getClass",__LINE__,__FILE__);
-	int n_members = dtype1.getNmembers();
-        verify_val(n_members, 3, "CompType::getNmembers",__LINE__,__FILE__);
-
-	// Close all objects and file
-	dtype1.close();
-	dataset.close();
-	file1->close();
-
-	// Free allocated buffers
-	HDfree(wbuf);
-	HDfree(rbuf);
-	HDfree(tbuf);
-
-	PASSED();
+        verify_val(static_cast<long>(tclass), static_cast<long>(H5T_COMPOUND), "DataType::getClass", __LINE__,
+                   __FILE__);
+        int n_members = dtype1.getNmembers();
+        verify_val(n_members, 3, "CompType::getNmembers", __LINE__, __FILE__);
+
+        // Close all objects and file
+        dtype1.close();
+        dataset.close();
+        file1->close();
+
+        // Free allocated buffers
+        HDfree(wbuf);
+        HDfree(rbuf);
+        HDfree(tbuf);
+
+        PASSED();
     } // end try
-    catch (Exception E) {
-	issue_fail_msg("test_reference_obj()",__LINE__,__FILE__,
-			E.getCFuncName(), E.getCDetailMsg());
+    catch (Exception &E) {
+        issue_fail_msg("test_reference_obj()", __LINE__, __FILE__, E.getCFuncName(), E.getCDetailMsg());
     }
 
-    if(file1)
-        delete file1;
-}   // test_reference_obj()
-
-
-/****************************************************************
-**
-**  test_reference_group(): Test object reference functionality
-**      Tests for correct behavior of various routines on
-**	dereferenced group
-**
-****************************************************************/
-#define GROUPNAME       "/group"
-#define GROUPNAME2      "group2"
-#define GROUPNAME3      "group3"
-#define DSETNAME        "/dset"
-#define DSETNAME2       "dset2"
-#define NAME_SIZE       16
+    delete file1;
+} // test_reference_obj()
+
+/*-------------------------------------------------------------------------
+ * Function:    test_reference_group
+ *
+ * Purpose      Test object reference functionality on group.
+ *
+ * Return       None
+ *-------------------------------------------------------------------------
+ */
+#define GROUPNAME  "/group"
+#define GROUPNAME2 "group2"
+#define GROUPNAME3 "group3"
+#define DSETNAME   "/dset"
+#define DSETNAME2  "dset2"
 
 static void
-test_reference_group(void)
+test_reference_group()
 {
-    hobj_ref_t wref;	/* Reference to write */
-    hobj_ref_t rref;	/* Reference to read */
-    const  H5std_string write_comment="Foo!"; // Comments for group
+    hobj_ref_t         wref;                   /* Reference to write */
+    hobj_ref_t         rref;                   /* Reference to read */
+    const H5std_string write_comment = "Foo!"; // Comments for group
 
     // Output message about test being performed
     SUBTEST("Object Reference to Group");
 
-    H5File* file1 = NULL;
+    H5File *file1 = NULL;
     try {
-	/*
-	 * Create file with a group and a dataset containing an object
-	 *  reference to the group
-	 */
+        /*
+         * Create file with a group and a dataset containing an object
+         *  reference to the group
+         */
 
         // Create file FILE1
-        file1 = new H5File (FILE1, H5F_ACC_TRUNC);
+        file1 = new H5File(FILE1, H5F_ACC_TRUNC);
 
-	// Create scalar dataspace
-	DataSpace sid1;
+        // Create scalar dataspace
+        DataSpace sid1;
 
-	// Create a group
-	Group group = file1->createGroup(GROUPNAME);
+        // Create a group
+        Group group = file1->createGroup(GROUPNAME);
 
-	/* Create nested groups */
-	Group group2 = group.createGroup(GROUPNAME2);
-	group2.close();
-	group2 = group.createGroup(GROUPNAME3);
-	group2.close();
+        /* Create nested groups */
+        Group group2 = group.createGroup(GROUPNAME2);
+        group2.close();
+        group2 = group.createGroup(GROUPNAME3);
+        group2.close();
 
-	// Create bottom dataset
-	DataSet dset1 = group.createDataSet(DSETNAME2, PredType::NATIVE_INT, sid1);
-	dset1.close();
+        // Create bottom dataset
+        DataSet dset1 = group.createDataSet(DSETNAME2, PredType::NATIVE_INT, sid1);
+        dset1.close();
 
-	// Close group 1
-	group.close();
+        // Close group 1
+        group.close();
 
-	// Create dataset
-	DataSet dset2 = file1->createDataSet(DSETNAME, PredType::STD_REF_OBJ, sid1);
+        // Create dataset
+        DataSet dset2 = file1->createDataSet(DSETNAME, PredType::STD_REF_OBJ, sid1);
 
-	file1->reference(&wref, GROUPNAME);
+        file1->reference(&wref, GROUPNAME);
 
-	// Write selection to disk
-	dset2.write(&wref, PredType::STD_REF_OBJ);
+        // Write selection to disk
+        dset2.write(&wref, PredType::STD_REF_OBJ);
 
-	// Close resources
-	dset2.close();
-	sid1.close();
-	file1->close();
+        // Close resources
+        dset2.close();
+        sid1.close();
+        file1->close();
 
-	/*
-	 * Re-open the file and test deferencing group
-	 */
+        /*
+         * Re-open the file and test dereferencing group
+         */
 
-	// Re-open file
+        // Re-open file
         file1->openFile(FILE1, H5F_ACC_RDWR);
 
-	// Re-open dataset
-	dset1 = file1->openDataSet(DSETNAME);
+        // Re-open dataset
+        dset1 = file1->openDataSet(DSETNAME);
+
+        // Read in the reference
+        dset1.read(&rref, PredType::STD_REF_OBJ);
+
+        // Dereference to get the group
+        Group refgroup(dset1, &rref);
+
+        // Dereference group object the other way
+        group.dereference(dset1, &rref);
+
+        /*
+         * Various queries on the group opened
+         */
 
-	// Read in the reference
-	dset1.read(&rref, PredType::STD_REF_OBJ);
+        // Check number of objects in the group dereferenced by constructor
+        hsize_t nobjs = refgroup.getNumObjs();
+        verify_val(static_cast<long>(nobjs), 3, "H5Group::getNumObjs", __LINE__, __FILE__);
 
-	// Dereference to get the group
-	Group refgroup(dset1, &rref);
+        // Check number of objects in the group dereferenced by ::reference
+        nobjs = group.getNumObjs();
+        verify_val(static_cast<long>(nobjs), 3, "H5Group::getNumObjs", __LINE__, __FILE__);
 
-	// Dereference group object the other way
-	group.dereference(dset1, &rref);
+        // Check getting file name given the group dereferenced via constructor
+        H5std_string fname = refgroup.getFileName();
+        verify_val(fname, FILE1, "H5Group::getFileName", __LINE__, __FILE__);
 
-	/*
-	 * Various queries on the group opened
-	 */
+        // Check getting file name given the group dereferenced by ::reference
+        fname = group.getFileName();
+        verify_val(fname, FILE1, "H5Group::getFileName", __LINE__, __FILE__);
 
-	// Check number of objects in the group dereferenced by constructor
-	hsize_t nobjs = refgroup.getNumObjs();
-	verify_val(nobjs, (hsize_t)3, "H5Group::getNumObjs",__LINE__,__FILE__);
+        // Check object type using Group::getObjinfo()
+        H5O_info2_t oinfo;
+        HDmemset(&oinfo, 0, sizeof(oinfo));
+        group.getObjinfo(".", H5_INDEX_NAME, H5_ITER_INC, 0, oinfo);
+        verify_val(static_cast<long>(oinfo.type), static_cast<long>(H5O_TYPE_DATASET), "Group::getObjinfo",
+                   __LINE__, __FILE__);
 
-	// Check number of objects in the group dereferenced by ::reference
-	nobjs = group.getNumObjs();
-	verify_val(nobjs, (hsize_t)3, "H5Group::getNumObjs",__LINE__,__FILE__);
+        // Check for out of bound query by index
+        try {
+            HDmemset(&oinfo, 0, sizeof(oinfo));
+            group.getObjinfo(".", H5_INDEX_NAME, H5_ITER_INC, 9, oinfo);
 
-	// Check getting file name given the group dereferenced via constructor
-	H5std_string fname = refgroup.getFileName();
-	verify_val(fname, FILE1, "H5Group::getFileName",__LINE__,__FILE__);
-    
-	// Check getting file name given the group dereferenced by ::reference
-	fname = group.getFileName();
-	verify_val(fname, FILE1, "H5Group::getFileName",__LINE__,__FILE__);
+            // Should FAIL but didn't, so throw an invalid action exception
+            throw InvalidActionException("Group::getObjinfo", "Out of bound index.");
+        }
+        catch (Exception &err) {
+        } // do nothing, failure expected
 
-	// Unlink one of the objects in the dereferenced group, and re-check
-	refgroup.unlink(GROUPNAME2);
-	nobjs = refgroup.getNumObjs();
-	verify_val(nobjs, (hsize_t)2, "H5Group::getNumObjs",__LINE__,__FILE__);
+        // Unlink one of the objects in the dereferenced group, and re-check
+        refgroup.unlink(GROUPNAME2);
+        nobjs = refgroup.getNumObjs();
+        verify_val(static_cast<long>(nobjs), 2, "H5Group::getNumObjs", __LINE__, __FILE__);
 
-	// Close resources
-	group.close();
-	refgroup.close();
-	dset1.close();
-	file1->close();
+        // Close resources
+        group.close();
+        refgroup.close();
+        dset1.close();
+        file1->close();
 
-	PASSED();
+        PASSED();
     } // end try
-    catch (Exception E) {
-	issue_fail_msg("test_reference_group()",__LINE__,__FILE__,
-			E.getCFuncName(), E.getCDetailMsg());
+    catch (Exception &E) {
+        issue_fail_msg("test_reference_group()", __LINE__, __FILE__, E.getCFuncName(), E.getCDetailMsg());
     }
 
-    if(file1)
-        delete file1;
-}   /* test_reference_group() */
-
-/****************************************************************
-**
-**  test_reference_region_1D(): Test 1-D reference functionality
-**      Tests 1-D references to various kinds of objects
-**
-****************************************************************/
+    delete file1;
+} /* test_reference_group() */
+
+/*-------------------------------------------------------------------------
+ * Function:    test_reference_region_1D
+ *
+ * Purpose      Test 1-D reference functionality on various kinds of objects.
+ *
+ * Return       None
+ *-------------------------------------------------------------------------
+ */
 static void
-test_reference_region_1D(void)
+test_reference_region_1D()
 {
-    hsize_t	start[SPACE3_RANK];     /* Starting location of hyperslab */
-    hsize_t	stride[SPACE3_RANK];    /* Stride of hyperslab */
-    hsize_t	count[SPACE3_RANK];     /* Element count of hyperslab */
-    hsize_t	block[SPACE3_RANK];     /* Block size of hyperslab */
-    hsize_t	coord1[POINT1_NPOINTS][SPACE3_RANK]; /* Coordinates for point selection */
-    hsize_t *   coords;                 /* Coordinate buffer */
-    hsize_t	low[SPACE3_RANK];       /* Selection bounds */
-    hsize_t	high[SPACE3_RANK];      /* Selection bounds */
-    int         i;      /* counting variables */
+    hsize_t  start[SPACE3_RANK];                  /* Starting location of hyperslab */
+    hsize_t  stride[SPACE3_RANK];                 /* Stride of hyperslab */
+    hsize_t  count[SPACE3_RANK];                  /* Element count of hyperslab */
+    hsize_t  block[SPACE3_RANK];                  /* Block size of hyperslab */
+    hsize_t  coord1[POINT1_NPOINTS][SPACE3_RANK]; /* Coordinates for point selection */
+    hsize_t *coords;                              /* Coordinate buffer */
+    hsize_t  low[SPACE3_RANK];                    /* Selection bounds */
+    hsize_t  high[SPACE3_RANK];                   /* Selection bounds */
+    int      i;                                   /* counting variables */
 
     // Output message about test being performed
     SUBTEST("1-D Dataset Region Reference Functions");
 
     try {
-	hdset_reg_ref_t *wbuf,	// buffer to write to disk
-		   *rbuf;	// buffer read from disk
-	uint8_t    *dwbuf,	// Buffer for writing numeric data to disk
-		   *drbuf;	// Buffer for reading numeric data from disk
+        hdset_reg_ref_t *wbuf, // buffer to write to disk
+            *rbuf;             // buffer read from disk
+        uint8_t *dwbuf,        // Buffer for writing numeric data to disk
+            *drbuf;            // Buffer for reading numeric data from disk
 
-	// Allocate write & read buffers
-	wbuf = (hdset_reg_ref_t *)HDcalloc(sizeof(hdset_reg_ref_t), (size_t)SPACE1_DIM1);
-	rbuf = (hdset_reg_ref_t *)HDmalloc(sizeof(hdset_reg_ref_t) * SPACE1_DIM1);
-	dwbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE3_DIM1);
-	drbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)SPACE3_DIM1);
+        // Allocate write & read buffers
+        wbuf  = static_cast<hdset_reg_ref_t *>(HDcalloc(sizeof(hdset_reg_ref_t), SPACE1_DIM1));
+        rbuf  = static_cast<hdset_reg_ref_t *>(HDmalloc(sizeof(hdset_reg_ref_t) * SPACE1_DIM1));
+        dwbuf = static_cast<uint8_t *>(HDmalloc(sizeof(uint8_t) * SPACE3_DIM1));
+        drbuf = static_cast<uint8_t *>(HDcalloc(sizeof(uint8_t), SPACE3_DIM1));
 
         // Create file FILE1
         H5File file1(FILE2, H5F_ACC_TRUNC);
 
-	// Create dataspace for datasets
-	hsize_t	dims3[] = {SPACE3_DIM1};
-	DataSpace sid3(SPACE3_RANK, dims3);
-
-	// Create dataset access property list
-	PropList dapl(H5P_DATASET_ACCESS);
-
-	// Create a dataset
-	DataSet dset3 = file1.createDataSet(DSET2_NAME, PredType::STD_U8LE, sid3);
-
-	uint8_t *tu8;      // Temporary pointer to uint8 data
-	for (tu8 = dwbuf, i = 0; i < SPACE3_DIM1; i++)
-	    *tu8++ = i * 3; // from C test
-
-	// Write selection to disk
-	dset3.write(dwbuf, PredType::STD_U8LE);
-
-	// Close Dataset
-	dset3.close();
-
-	// Create dataspace for datasets
-	hsize_t	dims1[] = {SPACE1_DIM1};
-	DataSpace sid1(SPACE1_RANK, dims1);
-
-	// Create a dataset
-	DataSet dset1 = file1.createDataSet(DSET1_NAME, PredType::STD_REF_DSETREG, sid1);
+        // Create dataspace for datasets
+        hsize_t   dims3[] = {SPACE3_DIM1};
+        DataSpace sid3(SPACE3_RANK, dims3);
 
-	/*
-	 * Create references and prepare for testing
-	 */
+        // Create dataset access property list
+        PropList dapl(H5P_DATASET_ACCESS);
 
-	/* Select 15 2x1 hyperslabs for first reference */
-	start[0] = 2;
-	stride[0] = 5;
-	count[0] = 15;
-	block[0] = 2;
+        // Create a dataset
+        DataSet dset3 = file1.createDataSet(DSET2_NAME, PredType::STD_U8LE, sid3);
 
-	// Select a hyperslab region to add to the current selected region
-	sid3.selectHyperslab(H5S_SELECT_SET, count, start, stride, block);
+        uint8_t *tu8; // Temporary pointer to uint8 data
+        for (tu8 = dwbuf, i = 0; i < SPACE3_DIM1; i++)
+            *tu8++ = static_cast<uint8_t>(i); // from C test
 
-	// Get and verify the number of elements in a dataspace selection
-	hssize_t nelms = sid3.getSelectNpoints();
-	verify_val(nelms, 30, "DataSet::getRefObjType",__LINE__,__FILE__);
+        // Write selection to disk
+        dset3.write(dwbuf, PredType::STD_U8LE);
 
-	// Store first dataset region
-	file1.reference(&wbuf[0], "/Dataset2", sid3);
-
-	// Get and verify object type
-	H5O_type_t obj_type = dset1.getRefObjType(&wbuf[0], H5R_DATASET_REGION);
-	verify_val(obj_type, H5O_TYPE_DATASET, "DataSet::getRefObjType",__LINE__,__FILE__);
-
-	/* Select sequence of ten points for second reference */
-	coord1[0][0] = 16;
-	coord1[1][0] = 22;
-	coord1[2][0] = 38;
-	coord1[3][0] = 41;
-	coord1[4][0] = 52;
-	coord1[5][0] = 63;
-	coord1[6][0] = 70;
-	coord1[7][0] = 89;
-	coord1[8][0] = 97;
-	coord1[9][0] = 3;
-
-	// Selects array elements to be included in the selection for sid3
-	sid3.selectElements(H5S_SELECT_SET, (size_t)POINT1_NPOINTS, (const hsize_t *)coord1);
-
-	// Get and verify the number of elements in a dataspace selection
-	nelms = sid3.getSelectNpoints();
-	verify_val(nelms, 10, "DataSet::getRefObjType",__LINE__,__FILE__);
-
-	// Store first dataset region
-	file1.reference(&wbuf[1], "/Dataset2", sid3);
-
-	// Write selection to disk
-	dset1.write(wbuf, PredType::STD_REF_DSETREG);
-
-	// Close disk dataspace, dataset, and file
-	sid1.close();
-	dset1.close();
-	sid3.close();
-	file1.close();
-
-	/*
-	 * Testing various dereference functions
-	 */
-
-	// Re-open the file
-	file1.openFile(FILE2, H5F_ACC_RDWR);
-
-	// Open the dataset
-	dset1 = file1.openDataSet("/Dataset1");
-
-	// Read selection from disk
-	dset1.read(rbuf, PredType::STD_REF_DSETREG);
-
-	{ // Test DataSet::dereference
-	    dset3.dereference(dset1, &rbuf[0], H5R_DATASET_REGION, dapl);
-
-	    // Get and verify object type
-	    obj_type = dset1.getRefObjType(&rbuf[0], H5R_DATASET_REGION);
-	    verify_val(obj_type, H5O_TYPE_DATASET, "DataSet::getRefObjType",__LINE__,__FILE__);
-
-	    // Get dataspace of dset3 the verify number of elements
-	    sid1 = dset3.getSpace();
-	    nelms = sid1.getSimpleExtentNpoints();
-	    verify_val((long)nelms, 100, "DataSpace::getSimpleExtentNpoints",__LINE__,__FILE__);
-	} // End of test DataSet::dereference
-
-	{ // Test DataSet constructor -by dereference
-	    // Dereference dataset object by ctor, from the location where
-	    // 'dset1' is located
-	    DataSet newds(dset1, &rbuf[0], H5R_DATASET_REGION, dapl);
-
-	    // Get dataspace of newds then verify number of elements
-	    sid1 = newds.getSpace();
-	    nelms = sid1.getSimpleExtentNpoints();
-	    verify_val((long)nelms, 100, "DataSpace::getSimpleExtentNpoints",__LINE__,__FILE__);
-
-	    // Close objects for this mini test
-	    newds.close();
-	    sid1.close();
-	} // End of test DataSet constructor -by dereference
-
-	// Read from disk
-	dset3.read(drbuf, PredType::STD_U8LE);
-
-	for(tu8 = (uint8_t *)drbuf, i = 0; i < SPACE3_DIM1; i++, tu8++)
-	   verify_val(*tu8, (uint8_t)(i * 3), "DataSpace::getSimpleExtentNpoints",__LINE__,__FILE__);
-
-	/*
-	 * Test getting the referenced region
-	 */
-
-	// Get region
-	DataSpace reg_sp = dset1.getRegion(&rbuf[0]);
-
-	// Get and verify number of elements in a dataspace selection
-	nelms = reg_sp.getSelectNpoints();
-	verify_val((long)nelms, 30, "DataSpace::getSelectNpoints",__LINE__,__FILE__);
-
-	// Get and verify number of hyperslab blocks
-	nelms = reg_sp.getSelectHyperNblocks();
-	verify_val((long)nelms, 15, "DataSpace::getSelectNpoints",__LINE__,__FILE__);
-
-	/* Allocate space for the hyperslab blocks */
-	coords = (hsize_t *)HDmalloc(nelms * SPACE3_RANK * sizeof(hsize_t) * 2);
-
-	// Get the list of hyperslab blocks currently selected
-	reg_sp.getSelectHyperBlocklist((hsize_t)0, (hsize_t)nelms, coords);
-
-	// Verify values in the list
-	verify_val(coords[0], (hsize_t)2, "Hyperslab Coordinates",__LINE__,__FILE__);
-	verify_val(coords[1], (hsize_t)3, "Hyperslab Coordinates",__LINE__,__FILE__);
-	verify_val(coords[2], (hsize_t)7, "Hyperslab Coordinates",__LINE__,__FILE__);
-	verify_val(coords[3], (hsize_t)8, "Hyperslab Coordinates",__LINE__,__FILE__);
-	verify_val(coords[4],(hsize_t)12, "Hyperslab Coordinates",__LINE__,__FILE__);
-	verify_val(coords[5],(hsize_t)13, "Hyperslab Coordinates",__LINE__,__FILE__);
-	verify_val(coords[6],(hsize_t)17, "Hyperslab Coordinates",__LINE__,__FILE__);
-	verify_val(coords[7],(hsize_t)18, "Hyperslab Coordinates",__LINE__,__FILE__);
-	verify_val(coords[8],(hsize_t)22, "Hyperslab Coordinates",__LINE__,__FILE__);
-	verify_val(coords[9],(hsize_t)23, "Hyperslab Coordinates",__LINE__,__FILE__);
-	verify_val(coords[10],(hsize_t)27, "Hyperslab Coordinates",__LINE__,__FILE__);
-	verify_val(coords[11],(hsize_t)28, "Hyperslab Coordinates",__LINE__,__FILE__);
-	verify_val(coords[12],(hsize_t)32, "Hyperslab Coordinates",__LINE__,__FILE__);
-	verify_val(coords[13],(hsize_t)33, "Hyperslab Coordinates",__LINE__,__FILE__);
-	verify_val(coords[14],(hsize_t)37, "Hyperslab Coordinates",__LINE__,__FILE__);
-	verify_val(coords[15],(hsize_t)38, "Hyperslab Coordinates",__LINE__,__FILE__);
-	verify_val(coords[16],(hsize_t)42, "Hyperslab Coordinates",__LINE__,__FILE__);
-	verify_val(coords[17],(hsize_t)43, "Hyperslab Coordinates",__LINE__,__FILE__);
-	verify_val(coords[18],(hsize_t)47, "Hyperslab Coordinates",__LINE__,__FILE__);
-	verify_val(coords[19],(hsize_t)48, "Hyperslab Coordinates",__LINE__,__FILE__);
-	verify_val(coords[20],(hsize_t)52, "Hyperslab Coordinates",__LINE__,__FILE__);
-	verify_val(coords[21],(hsize_t)53, "Hyperslab Coordinates",__LINE__,__FILE__);
-	verify_val(coords[22],(hsize_t)57, "Hyperslab Coordinates",__LINE__,__FILE__);
-	verify_val(coords[23],(hsize_t)58, "Hyperslab Coordinates",__LINE__,__FILE__);
-	verify_val(coords[24],(hsize_t)62, "Hyperslab Coordinates",__LINE__,__FILE__);
-	verify_val(coords[25],(hsize_t)63, "Hyperslab Coordinates",__LINE__,__FILE__);
-	verify_val(coords[26],(hsize_t)67, "Hyperslab Coordinates",__LINE__,__FILE__);
-	verify_val(coords[27],(hsize_t)68, "Hyperslab Coordinates",__LINE__,__FILE__);
-	verify_val(coords[28],(hsize_t)72, "Hyperslab Coordinates",__LINE__,__FILE__);
-	verify_val(coords[29],(hsize_t)73, "Hyperslab Coordinates",__LINE__,__FILE__);
-
-	HDfree(coords);
-
-	// Check boundaries
-	reg_sp.getSelectBounds(low, high);
-	verify_val(low[0],(hsize_t)2, "DataSpace::getSelectBounds",__LINE__,__FILE__);
-	verify_val(high[0],(hsize_t)73, "DataSpace::getSelectBounds",__LINE__,__FILE__);
-
-	/* Close region space */
-	reg_sp.close();
-
-	/*
-	 * Another test on getting the referenced region
-	 */
-
-	// Get region
-	DataSpace elm_sp = dset1.getRegion(&rbuf[1]);
-
-	// Get and verify number of element points in the current selection
-	hssize_t nelmspts = elm_sp.getSelectElemNpoints();
-	verify_val((long)nelmspts, 10, "DataSpace::getSelectNpoints",__LINE__,__FILE__);
-
-	/* Allocate space for the hyperslab blocks */
-	coords = (hsize_t *)HDmalloc(nelmspts * SPACE3_RANK * sizeof(hsize_t));
-
-	// Get the list of element points currently selected
-	elm_sp.getSelectElemPointlist((hsize_t)0, (hsize_t)nelmspts, coords);
-
-	// Verify points
-	verify_val(coords[0], coord1[0][0], "Element Coordinates",__LINE__,__FILE__);
-	verify_val(coords[1], coord1[1][0], "Element Coordinates",__LINE__,__FILE__);
-	verify_val(coords[2], coord1[2][0], "Element Coordinates",__LINE__,__FILE__);
-	verify_val(coords[3], coord1[3][0], "Element Coordinates",__LINE__,__FILE__);
-	verify_val(coords[4], coord1[4][0], "Element Coordinates",__LINE__,__FILE__);
-	verify_val(coords[5], coord1[5][0], "Element Coordinates",__LINE__,__FILE__);
-	verify_val(coords[6], coord1[6][0], "Element Coordinates",__LINE__,__FILE__);
-	verify_val(coords[7], coord1[7][0], "Element Coordinates",__LINE__,__FILE__);
-	verify_val(coords[8], coord1[8][0], "Element Coordinates",__LINE__,__FILE__);
-	verify_val(coords[9], coord1[9][0], "Element Coordinates",__LINE__,__FILE__);
-
-	HDfree(coords);
-
-	// Check boundaries
-	elm_sp.getSelectBounds(low, high);
-	verify_val(low[0],(hsize_t)3, "DataSpace::getSelectBounds",__LINE__,__FILE__);
-	verify_val(high[0],(hsize_t)97, "DataSpace::getSelectBounds",__LINE__,__FILE__);
-
-	// Close element space
-	elm_sp.close();
-
-	// Close resources
-	sid1.close();
-	dset3.close();
-	dset1.close();
-	file1.close();
-
-	// Free memory buffers
-	HDfree(wbuf);
-	HDfree(rbuf);
-	HDfree(dwbuf);
-	HDfree(drbuf);
-
-	PASSED();
+        // Close Dataset
+        dset3.close();
+
+        // Create dataspace for datasets
+        hsize_t   dims1[] = {SPACE1_DIM1};
+        DataSpace sid1(SPACE1_RANK, dims1);
+
+        // Create a dataset
+        DataSet dset1 = file1.createDataSet(DSET1_NAME, PredType::STD_REF_DSETREG, sid1);
+
+        /*
+         * Create references and prepare for testing
+         */
+
+        /* Select 15 2x1 hyperslabs for first reference */
+        start[0]  = 2;
+        stride[0] = 5;
+        count[0]  = 15;
+        block[0]  = 2;
+
+        // Select a hyperslab region to add to the current selected region
+        sid3.selectHyperslab(H5S_SELECT_SET, count, start, stride, block);
+
+        // Get and verify the number of elements in a dataspace selection
+        hssize_t nelms = sid3.getSelectNpoints();
+        verify_val(nelms, 30, "DataSet::getRefObjType", __LINE__, __FILE__);
+
+        // Store first dataset region
+        file1.reference(&wbuf[0], "/Dataset2", sid3);
+
+        // Get and verify object type
+        H5O_type_t obj_type = dset1.getRefObjType(&wbuf[0], H5R_DATASET_REGION);
+        verify_val(static_cast<long>(obj_type), static_cast<long>(H5O_TYPE_DATASET), "DataSet::getRefObjType",
+                   __LINE__, __FILE__);
+
+        /* Select sequence of ten points for second reference */
+        coord1[0][0] = 16;
+        coord1[1][0] = 22;
+        coord1[2][0] = 38;
+        coord1[3][0] = 41;
+        coord1[4][0] = 52;
+        coord1[5][0] = 63;
+        coord1[6][0] = 70;
+        coord1[7][0] = 89;
+        coord1[8][0] = 97;
+        coord1[9][0] = 3;
+
+        // Selects array elements to be included in the selection for sid3
+        sid3.selectElements(H5S_SELECT_SET, POINT1_NPOINTS, reinterpret_cast<const hsize_t *>(coord1));
+
+        // Get and verify the number of elements in a dataspace selection
+        nelms = sid3.getSelectNpoints();
+        verify_val(nelms, 10, "DataSet::getRefObjType", __LINE__, __FILE__);
+
+        // Store first dataset region
+        file1.reference(&wbuf[1], "/Dataset2", sid3);
+
+        // Write selection to disk
+        dset1.write(wbuf, PredType::STD_REF_DSETREG);
+
+        // Close disk dataspace, dataset, and file
+        sid1.close();
+        dset1.close();
+        sid3.close();
+        file1.close();
+
+        /*
+         * Testing various dereference functions
+         */
+
+        // Re-open the file
+        file1.openFile(FILE2, H5F_ACC_RDWR);
+
+        // Open the dataset
+        dset1 = file1.openDataSet("/Dataset1");
+
+        // Read selection from disk
+        dset1.read(rbuf, PredType::STD_REF_DSETREG);
+
+        { // Test DataSet::dereference
+            dset3.dereference(dset1, &rbuf[0], H5R_DATASET_REGION, dapl);
+
+            // Get and verify object type
+            obj_type = dset1.getRefObjType(&rbuf[0], H5R_DATASET_REGION);
+            verify_val(static_cast<long>(obj_type), static_cast<long>(H5O_TYPE_DATASET),
+                       "DataSet::getRefObjType", __LINE__, __FILE__);
+
+            // Get dataspace of dset3 the verify number of elements
+            sid1  = dset3.getSpace();
+            nelms = sid1.getSimpleExtentNpoints();
+            verify_val(static_cast<long>(nelms), 100, "DataSpace::getSimpleExtentNpoints", __LINE__,
+                       __FILE__);
+        } // End of test DataSet::dereference
+
+        { // Test DataSet constructor -by dereference
+            // Dereference dataset object by ctor, from the location where
+            // 'dset1' is located
+            DataSet newds(dset1, &rbuf[0], H5R_DATASET_REGION, dapl);
+
+            // Get dataspace of newds then verify number of elements
+            sid1  = newds.getSpace();
+            nelms = sid1.getSimpleExtentNpoints();
+            verify_val(static_cast<long>(nelms), 100, "DataSpace::getSimpleExtentNpoints", __LINE__,
+                       __FILE__);
+
+            // Close objects for this mini test
+            newds.close();
+            sid1.close();
+        } // End of test DataSet constructor -by dereference
+
+        // Read from disk
+        dset3.read(drbuf, PredType::STD_U8LE);
+
+        for (tu8 = static_cast<uint8_t *>(drbuf), i = 0; i < SPACE3_DIM1; i++, tu8++)
+            verify_val(*tu8, static_cast<uint8_t>(i), "DataSpace::getSimpleExtentNpoints", __LINE__,
+                       __FILE__);
+
+        /*
+         * Test getting the referenced region
+         */
+
+        // Get region
+        DataSpace reg_sp = dset1.getRegion(&rbuf[0]);
+
+        // Get and verify number of elements in a dataspace selection
+        nelms = reg_sp.getSelectNpoints();
+        verify_val(static_cast<long>(nelms), 30, "DataSpace::getSelectNpoints", __LINE__, __FILE__);
+
+        // Get and verify number of hyperslab blocks
+        nelms = reg_sp.getSelectHyperNblocks();
+        verify_val(static_cast<long>(nelms), 15, "DataSpace::getSelectNpoints", __LINE__, __FILE__);
+
+        /* Allocate space for the hyperslab blocks */
+        coords =
+            static_cast<hsize_t *>(HDmalloc(static_cast<size_t>(nelms) * SPACE3_RANK * sizeof(hsize_t) * 2));
+
+        // Get the list of hyperslab blocks currently selected
+        reg_sp.getSelectHyperBlocklist(0, static_cast<hsize_t>(nelms), coords);
+
+        // Verify values in the list
+        verify_val(static_cast<long>(coords[0]), 2, "Hyperslab Coordinates", __LINE__, __FILE__);
+        verify_val(static_cast<long>(coords[1]), 3, "Hyperslab Coordinates", __LINE__, __FILE__);
+        verify_val(static_cast<long>(coords[2]), 7, "Hyperslab Coordinates", __LINE__, __FILE__);
+        verify_val(static_cast<long>(coords[3]), 8, "Hyperslab Coordinates", __LINE__, __FILE__);
+        verify_val(static_cast<long>(coords[4]), 12, "Hyperslab Coordinates", __LINE__, __FILE__);
+        verify_val(static_cast<long>(coords[5]), 13, "Hyperslab Coordinates", __LINE__, __FILE__);
+        verify_val(static_cast<long>(coords[6]), 17, "Hyperslab Coordinates", __LINE__, __FILE__);
+        verify_val(static_cast<long>(coords[7]), 18, "Hyperslab Coordinates", __LINE__, __FILE__);
+        verify_val(static_cast<long>(coords[8]), 22, "Hyperslab Coordinates", __LINE__, __FILE__);
+        verify_val(static_cast<long>(coords[9]), 23, "Hyperslab Coordinates", __LINE__, __FILE__);
+        verify_val(static_cast<long>(coords[10]), 27, "Hyperslab Coordinates", __LINE__, __FILE__);
+        verify_val(static_cast<long>(coords[11]), 28, "Hyperslab Coordinates", __LINE__, __FILE__);
+        verify_val(static_cast<long>(coords[12]), 32, "Hyperslab Coordinates", __LINE__, __FILE__);
+        verify_val(static_cast<long>(coords[13]), 33, "Hyperslab Coordinates", __LINE__, __FILE__);
+        verify_val(static_cast<long>(coords[14]), 37, "Hyperslab Coordinates", __LINE__, __FILE__);
+        verify_val(static_cast<long>(coords[15]), 38, "Hyperslab Coordinates", __LINE__, __FILE__);
+        verify_val(static_cast<long>(coords[16]), 42, "Hyperslab Coordinates", __LINE__, __FILE__);
+        verify_val(static_cast<long>(coords[17]), 43, "Hyperslab Coordinates", __LINE__, __FILE__);
+        verify_val(static_cast<long>(coords[18]), 47, "Hyperslab Coordinates", __LINE__, __FILE__);
+        verify_val(static_cast<long>(coords[19]), 48, "Hyperslab Coordinates", __LINE__, __FILE__);
+        verify_val(static_cast<long>(coords[20]), 52, "Hyperslab Coordinates", __LINE__, __FILE__);
+        verify_val(static_cast<long>(coords[21]), 53, "Hyperslab Coordinates", __LINE__, __FILE__);
+        verify_val(static_cast<long>(coords[22]), 57, "Hyperslab Coordinates", __LINE__, __FILE__);
+        verify_val(static_cast<long>(coords[23]), 58, "Hyperslab Coordinates", __LINE__, __FILE__);
+        verify_val(static_cast<long>(coords[24]), 62, "Hyperslab Coordinates", __LINE__, __FILE__);
+        verify_val(static_cast<long>(coords[25]), 63, "Hyperslab Coordinates", __LINE__, __FILE__);
+        verify_val(static_cast<long>(coords[26]), 67, "Hyperslab Coordinates", __LINE__, __FILE__);
+        verify_val(static_cast<long>(coords[27]), 68, "Hyperslab Coordinates", __LINE__, __FILE__);
+        verify_val(static_cast<long>(coords[28]), 72, "Hyperslab Coordinates", __LINE__, __FILE__);
+        verify_val(static_cast<long>(coords[29]), 73, "Hyperslab Coordinates", __LINE__, __FILE__);
+
+        HDfree(coords);
+
+        // Check boundaries
+        reg_sp.getSelectBounds(low, high);
+        verify_val(static_cast<long>(low[0]), 2, "DataSpace::getSelectBounds", __LINE__, __FILE__);
+        verify_val(static_cast<long>(high[0]), 73, "DataSpace::getSelectBounds", __LINE__, __FILE__);
+
+        /* Close region space */
+        reg_sp.close();
+
+        /*
+         * Another test on getting the referenced region
+         */
+
+        // Get region
+        DataSpace elm_sp = dset1.getRegion(&rbuf[1]);
+
+        // Get and verify number of element points in the current selection
+        hssize_t nelmspts = elm_sp.getSelectElemNpoints();
+        verify_val(static_cast<long>(nelmspts), 10, "DataSpace::getSelectNpoints", __LINE__, __FILE__);
+
+        /* Allocate space for the hyperslab blocks */
+        coords =
+            static_cast<hsize_t *>(HDmalloc(static_cast<size_t>(nelmspts) * SPACE3_RANK * sizeof(hsize_t)));
+
+        // Get the list of element points currently selected
+        elm_sp.getSelectElemPointlist(0, static_cast<hsize_t>(nelmspts), coords);
+
+        // Verify points
+        verify_val(coords[0], coord1[0][0], "Element Coordinates", __LINE__, __FILE__);
+        verify_val(coords[1], coord1[1][0], "Element Coordinates", __LINE__, __FILE__);
+        verify_val(coords[2], coord1[2][0], "Element Coordinates", __LINE__, __FILE__);
+        verify_val(coords[3], coord1[3][0], "Element Coordinates", __LINE__, __FILE__);
+        verify_val(coords[4], coord1[4][0], "Element Coordinates", __LINE__, __FILE__);
+        verify_val(coords[5], coord1[5][0], "Element Coordinates", __LINE__, __FILE__);
+        verify_val(coords[6], coord1[6][0], "Element Coordinates", __LINE__, __FILE__);
+        verify_val(coords[7], coord1[7][0], "Element Coordinates", __LINE__, __FILE__);
+        verify_val(coords[8], coord1[8][0], "Element Coordinates", __LINE__, __FILE__);
+        verify_val(coords[9], coord1[9][0], "Element Coordinates", __LINE__, __FILE__);
+
+        HDfree(coords);
+
+        // Check boundaries
+        elm_sp.getSelectBounds(low, high);
+        verify_val(static_cast<long>(low[0]), 3, "DataSpace::getSelectBounds", __LINE__, __FILE__);
+        verify_val(static_cast<long>(high[0]), 97, "DataSpace::getSelectBounds", __LINE__, __FILE__);
+
+        // Close element space
+        elm_sp.close();
+
+        // Close resources
+        sid1.close();
+        dset3.close();
+        dset1.close();
+        file1.close();
+
+        // Free memory buffers
+        HDfree(wbuf);
+        HDfree(rbuf);
+        HDfree(dwbuf);
+        HDfree(drbuf);
+
+        PASSED();
     } // end try
-    catch (Exception E) {
-	issue_fail_msg("test_reference_region_1D()",__LINE__,__FILE__,
-			E.getCFuncName(), E.getCDetailMsg());
+    catch (Exception &E) {
+        issue_fail_msg("test_reference_region_1D()", __LINE__, __FILE__, E.getCFuncName(), E.getCDetailMsg());
     }
-}   /* test_reference_region_1D() */
-
-
-/****************************************************************
-**
-**  test_reference_compat(): Test basic object reference functionality.
-**      Tests references to various kinds of objects using deprecated API.
-**
-****************************************************************/
-static void test_reference_compat(void)
-{
-   // Not yet
-}   // test_reference_compat()
-
-
-/****************************************************************
-**
-**  test_reference(): Main reference testing routine.
-**
-****************************************************************/
-#ifdef __cplusplus
-extern "C"
-#endif
-void test_reference(void)
+} /* test_reference_region_1D() */
+
+/*-------------------------------------------------------------------------
+ *
+ *  test_reference(): Main reference testing routine.
+ *
+ *-------------------------------------------------------------------------
+ */
+extern "C" void
+test_reference()
 {
     // Output message about test being performed
     MESSAGE(5, ("Testing References\n"));
@@ -816,22 +836,20 @@ void test_reference(void)
     test_reference_obj();       // Test basic object reference functionality
     test_reference_group();     // Test group reference functionality
     test_reference_region_1D(); // Test 1-D reference functionality
-    test_reference_compat();    // Tests deprecated reference routines (not yet)
-
-}   // test_reference()
-
-
-/****************************************************************
-** Function:	cleanup_reference
-** Purpose:	Cleanup temporary test files
-** Return:	none
-****************************************************************/
-#ifdef __cplusplus
-extern "C"
-#endif
-void cleanup_reference(void)
+
+} // test_reference()
+
+/*-------------------------------------------------------------------------
+ * Function:    cleanup_reference
+ *
+ * Purpose      Cleanup temporary test files
+ *
+ * Return       None
+ *-------------------------------------------------------------------------
+ */
+extern "C" void
+cleanup_reference()
 {
     HDremove(FILE1.c_str());
     HDremove(FILE2.c_str());
 }
-
diff --git a/c++/test/ttypes.cpp b/c++/test/ttypes.cpp
index 004723f..ff86213 100644
--- a/c++/test/ttypes.cpp
+++ b/c++/test/ttypes.cpp
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*****************************************************************************
@@ -18,34 +15,16 @@
    ttypes.cpp - HDF5 C++ testing the general datatype functionality
 
  ***************************************************************************/
-
-#ifdef OLD_HEADER_FILENAME
-#include <iostream.h>
-#else
 #include <iostream>
-#endif
-#include <string>
-
-#ifndef H5_NO_NAMESPACE
-#ifndef H5_NO_STD
-    using std::cerr;
-    using std::endl;
-#endif  // H5_NO_STD
-#endif
-
-#include "H5Cpp.h"      // C++ API header file
+using std::cerr;
+using std::endl;
 
-#ifndef H5_NO_NAMESPACE
-    using namespace H5;
-#endif
-
-#include "h5cpputil.h"  // C++ utilility header file
+#include <string>
+#include "H5Cpp.h" // C++ API header file
+using namespace H5;
 
-/*
- * Offset from alinged memory returned by malloc().  This can be used to test
- * that type conversions handle non-aligned buffers correctly.
- */
-#define ALIGNMENT	1
+#include "h5test.h"
+#include "h5cpputil.h" // C++ utilility header file
 
 /*
  * Define if you want to test alignment code on a machine that doesn't
@@ -57,117 +36,112 @@
 
 /* Alignment test stuff */
 #ifdef TEST_ALIGNMENT
-#define H5T_PACKAGE
+#define H5T_FRIEND
 #include "H5Tpkg.h"
 #endif
-#define SET_ALIGNMENT(TYPE,VAL) \
-    H5T_NATIVE_##TYPE##_ALIGN_g=MAX(H5T_NATIVE_##TYPE##_ALIGN_g, VAL)
+#define SET_ALIGNMENT(TYPE, VAL) H5T_NATIVE_##TYPE##_ALIGN_g = MAX(H5T_NATIVE_##TYPE##_ALIGN_g, VAL)
 #endif
- /* #include "H5Tpkg.h"
- */ 
-
-const char *FILENAME[] = {
-    "dtypes1.h5",
-    "dtypes2.h5",
-    "dtypes3.h5",
-    NULL
-};
-
-/*
- * Count up or down depending on whether the machine is big endian or little
- * endian.  If local variable `endian' is H5T_ORDER_BE then the result will
- * be I, otherwise the result will be Z-(I+1).
+/* #include "H5Tpkg.h"
  */
-#define ENDIAN(Z,I)	(H5T_ORDER_BE==endian?(I):(Z)-((I)+1))
 
+const char *FILENAME[] = {"dtypes1.h5",       "dtypes2.h5",           "dtypes3.h5", "dtypes4.h5",
+                          "encode_decode.h5", "h5_type_operators.h5", NULL};
 
-typedef enum flt_t {
-    FLT_FLOAT, FLT_DOUBLE, FLT_LDOUBLE, FLT_OTHER
-} flt_t;
+typedef enum flt_t { FLT_FLOAT, FLT_DOUBLE, FLT_LDOUBLE, FLT_OTHER } flt_t;
 
 typedef enum int_t {
-    INT_CHAR, INT_UCHAR, INT_SHORT, INT_USHORT, INT_INT, INT_UINT,
-    INT_LONG, INT_ULONG, INT_LLONG, INT_ULLONG, INT_OTHER
+    INT_CHAR,
+    INT_UCHAR,
+    INT_SHORT,
+    INT_USHORT,
+    INT_INT,
+    INT_UINT,
+    INT_LONG,
+    INT_ULONG,
+    INT_LLONG,
+    INT_ULLONG,
+    INT_OTHER
 } int_t;
 
-
+typedef struct {
+    int    a;
+    float  b;
+    long   c;
+    double d;
+} src_typ_t;
+
 /*-------------------------------------------------------------------------
  * Function:    test_classes
  *
- * Purpose:     Test type classes
- *
- * Return:      None.
+ * Purpose      Test type classes
  *
- * Programmer:  Binh-Minh Ribler (using C version)
- *		January, 2007
- *
- * Modifications:
+ * Return       None.
  *
+ * Programmer   Binh-Minh Ribler (using C version)
+ *              January, 2007
  *-------------------------------------------------------------------------
  */
-static void test_classes()
+static void
+test_classes()
 {
     SUBTEST("PredType::getClass()");
     try {
-	// maybe later, int curr_nerrors = GetTestNumErrs();
-
-	// PredType::NATIVE_INT should be in H5T_INTEGER class
-	H5T_class_t tcls = PredType::NATIVE_INT.getClass();
-	if (H5T_INTEGER!=tcls) {
-	    puts("    Invalid type class for H5T_NATIVE_INT");
-	}
-
-	// PredType::NATIVE_DOUBLE should be in H5T_FLOAT class
-	tcls = PredType::NATIVE_DOUBLE.getClass();
-	if (H5T_FLOAT!=tcls) {
-	verify_val(tcls, H5T_FLOAT, "test_class: invalid type class for NATIVE_DOUBLE -", __LINE__, __FILE__);
-	}
-	PASSED();
-    }   // end of try block
-    catch (Exception E) {
-	issue_fail_msg("test_classes", __LINE__, __FILE__, E.getCDetailMsg());
+        // maybe later, int curr_nerrors = GetTestNumErrs();
+
+        // PredType::NATIVE_INT should be in H5T_INTEGER class
+        H5T_class_t tcls = PredType::NATIVE_INT.getClass();
+        if (H5T_INTEGER != tcls) {
+            puts("    Invalid type class for H5T_NATIVE_INT");
+        }
+
+        // PredType::NATIVE_DOUBLE should be in H5T_FLOAT class
+        tcls = PredType::NATIVE_DOUBLE.getClass();
+        if (H5T_FLOAT != tcls) {
+            verify_val(static_cast<long>(tcls), static_cast<long>(H5T_FLOAT),
+                       "test_class: invalid type class for NATIVE_DOUBLE -", __LINE__, __FILE__);
+        }
+        PASSED();
+    } // end of try block
+    catch (Exception &E) {
+        issue_fail_msg("test_classes", __LINE__, __FILE__, E.getCDetailMsg());
     }
 }
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy
  *
- * Purpose:     Test datatype copy functionality
- *
- * Return:      Success:        0
- *
- *              Failure:        number of errors
- *
- * Programmer:  Binh-Minh Ribler (using C version)
- *		January, 2007
+ * Purpose      Test datatype copy functionality
  *
- * Modifications:
+ * Return       None
  *
+ * Programmer   Binh-Minh Ribler (using C version)
+ *              January, 2007
  *-------------------------------------------------------------------------
  */
-static void test_copy()
+static void
+test_copy()
 {
 
     SUBTEST("DataType::copy() and DataType::operator=");
     try {
-	// Test copying from a predefined datatype using DataType::operator=
-	DataType assigned_type;
-	assigned_type = PredType::NATIVE_SHORT;
+        // Test copying from a predefined datatype using DataType::operator=
+        DataType assigned_type;
+        assigned_type = PredType::NATIVE_SHORT;
 
         // Test copying a predefined type using DataType::copy
-	DataType copied_type;
-        copied_type.copy (PredType::STD_B8LE);
+        DataType copied_type;
+        copied_type.copy(PredType::STD_B8LE);
 
-	// Test copying a user-defined type using DataType::operator=
-	DataType assigned_usertype;
-	assigned_usertype = copied_type;
+        // Test copying a user-defined type using DataType::operator=
+        DataType assigned_usertype;
+        assigned_usertype = copied_type;
 
-	// Test copying from a user-defined datatype using DataType::copy
-	DataType copied_usertype;
-	copied_usertype.copy(copied_type);
+        // Test copying from a user-defined datatype using DataType::copy
+        DataType copied_usertype;
+        copied_usertype.copy(copied_type);
 
         // Test copying a user-defined int type using DataType::operator=
-        IntType orig_int(PredType::STD_B8LE);
+        IntType  orig_int(PredType::STD_B8LE);
         DataType generic_type;
         generic_type = orig_int;
 
@@ -178,410 +152,990 @@ static void test_copy()
         IntType another_int_type;
         another_int_type = new_int_type;
 
-	PASSED();
+        PASSED();
     }
-    catch (Exception E) {
-	issue_fail_msg("test_copy", __LINE__, __FILE__, E.getCDetailMsg());
+    catch (Exception &E) {
+        issue_fail_msg("test_copy", __LINE__, __FILE__, E.getCDetailMsg());
     }
 }
 
-
 /*-------------------------------------------------------------------------
- * Function:	test_query
+ * Function:    test_detect_type_class
  *
- * Purpose:	Tests query functions of compound and enumeration types.
+ * Purpose      Test DataType::detectClass()
  *
- * Return:	Success: 	0
+ * Return       None
  *
- *		Failure:	number of errors
+ * Programmer   Binh-Minh Ribler (using C version)
+ *              August, 2017
+ *-------------------------------------------------------------------------
+ */
+typedef struct { /* Struct with atomic fields */
+    int    i;
+    float  f;
+    char   c;
+    double d;
+    short  s;
+} atomic_typ_t;
+
+typedef struct { /* Struct with complex fields */
+    hobj_ref_t arr_r[3][3];
+    int        i;
+    hvl_t      vl_f;
+    hvl_t      vl_s;
+    char       c;
+    short      s;
+} complex_typ_t;
+
+static void
+test_detect_type_class()
+{
+
+    SUBTEST("DataType::detectClass()");
+    try {
+        bool in_class = false; // indicates whether a datatype is in a class
+
+        /*
+         * Test class of some atomic types.
+         */
+
+        // Native integers should be in the integer class
+        in_class = DataType::detectClass(PredType::NATIVE_INT, H5T_INTEGER);
+        verify_val(in_class, true, "DataType::detectClass() with H5T_INTEGER", __LINE__, __FILE__);
+
+        // Native integers should _not_ be in other classes
+        in_class = DataType::detectClass(PredType::NATIVE_INT, H5T_FLOAT);
+        verify_val(in_class, false, "DataType::detectClass() with H5T_FLOAT", __LINE__, __FILE__);
+        in_class = DataType::detectClass(PredType::NATIVE_INT, H5T_ARRAY);
+        verify_val(in_class, false, "DataType::detectClass() with H5T_ARRAY", __LINE__, __FILE__);
+        in_class = DataType::detectClass(PredType::NATIVE_INT, H5T_ENUM);
+        verify_val(in_class, false, "DataType::detectClass() with H5T_ENUM", __LINE__, __FILE__);
+
+        /*
+         *  Test class of a compound type with some atomic types as fields.
+         */
+
+        // Create a compound datatype and insert some atomic types
+        CompType atom_cmpd(sizeof(atomic_typ_t));
+        atom_cmpd.insertMember("i", HOFFSET(atomic_typ_t, i), PredType::NATIVE_INT);
+        atom_cmpd.insertMember("f", HOFFSET(atomic_typ_t, f), PredType::NATIVE_FLOAT);
+        atom_cmpd.insertMember("c", HOFFSET(atomic_typ_t, c), PredType::NATIVE_CHAR);
+        atom_cmpd.insertMember("d", HOFFSET(atomic_typ_t, d), PredType::NATIVE_DOUBLE);
+        atom_cmpd.insertMember("s", HOFFSET(atomic_typ_t, s), PredType::NATIVE_SHORT);
+
+        // Make certain that atom_cmpd is a compound type,
+        in_class = atom_cmpd.detectClass(H5T_COMPOUND);
+        verify_val(in_class, true, "CompType::detectClass() with H5T_COMPOUND", __LINE__, __FILE__);
+        // and that it contains a field of type integer
+        in_class = atom_cmpd.detectClass(H5T_INTEGER);
+        verify_val(in_class, true, "CompType::detectClass() with H5T_INTEGER", __LINE__, __FILE__);
+        // and a field of type float,
+        in_class = atom_cmpd.detectClass(H5T_FLOAT);
+        verify_val(in_class, true, "CompType::detectClass() with H5T_FLOAT", __LINE__, __FILE__);
+        // and that it doesn't contain any field of variable-length
+        in_class = atom_cmpd.detectClass(H5T_VLEN);
+        verify_val(in_class, false, "CompType::detectClass() with H5T_VLEN", __LINE__, __FILE__);
+
+        /*
+         *  Test class of array datatype
+         */
+
+        // Create an array datatype with an atomic base type
+        int       rank    = 2;      // Rank for array datatype
+        hsize_t   dims[2] = {3, 3}; // Dimensions for array datatype
+        ArrayType atom_arr(PredType::STD_REF_OBJ, rank, dims);
+
+        // Make certain that the correct classes can be detected
+        in_class = atom_arr.detectClass(H5T_ARRAY);
+        verify_val(in_class, true, "CompType::detectClass() with H5T_ARRAY", __LINE__, __FILE__);
+        in_class = atom_arr.detectClass(H5T_REFERENCE);
+        verify_val(in_class, true, "CompType::detectClass() with H5T_REFERENCE", __LINE__, __FILE__);
+
+        // Make certain that an incorrect class is not detected
+        in_class = atom_arr.detectClass(H5T_VLEN);
+        verify_val(in_class, false, "CompType::detectClass() with H5T_VLEN", __LINE__, __FILE__);
+        in_class = atom_arr.detectClass(H5T_FLOAT);
+        verify_val(in_class, false, "CompType::detectClass() with H5T_FLOAT", __LINE__, __FILE__);
+        in_class = atom_arr.detectClass(H5T_INTEGER);
+        verify_val(in_class, false, "CompType::detectClass() with H5T_INTEGER", __LINE__, __FILE__);
+
+        /*
+         *  Test class of VL datatype
+         */
+
+        // Create a VL datatype with an atomic base type of float
+        VarLenType atom_vlf(PredType::NATIVE_FLOAT);
+
+        // Make certain that the correct classes can be detected
+        in_class = atom_vlf.detectClass(H5T_VLEN);
+        verify_val(in_class, true, "CompType::detectClass() with H5T_VLEN", __LINE__, __FILE__);
+        in_class = atom_vlf.detectClass(H5T_FLOAT);
+        verify_val(in_class, true, "CompType::detectClass() with H5T_FLOAT", __LINE__, __FILE__);
+
+        // Make certain that an incorrect class is not detected
+        in_class = atom_vlf.detectClass(H5T_COMPOUND);
+        verify_val(in_class, false, "CompType::detectClass() with H5T_COMPOUND", __LINE__, __FILE__);
+        in_class = atom_vlf.detectClass(H5T_INTEGER);
+        verify_val(in_class, false, "CompType::detectClass() with H5T_INTEGER", __LINE__, __FILE__);
+
+        /*
+         *  Test class of VL datatype
+         */
+
+        // Create a VL datatype with an atomic base type of char.  It should be a VL
+        // but not a string class.
+        VarLenType atom_vlc(PredType::NATIVE_CHAR);
+
+        // Make certain that the correct classes can be detected
+        in_class = atom_vlc.detectClass(H5T_VLEN);
+        verify_val(in_class, true, "CompType::detectClass() with H5T_VLEN", __LINE__, __FILE__);
+        in_class = atom_vlc.detectClass(H5T_INTEGER);
+        verify_val(in_class, true, "CompType::detectClass() with H5T_INTEGER", __LINE__, __FILE__);
+
+        // Make certain that an incorrect class is not detected
+        in_class = atom_vlc.detectClass(H5T_STRING);
+        verify_val(in_class, false, "CompType::detectClass() with H5T_STRING", __LINE__, __FILE__);
+
+        /*
+         *  Test class of VL string datatype
+         */
+
+        // Create a VL string.  It should be a string, not a VL class.
+        StrType atom_vls(0, H5T_VARIABLE);
+
+        // Make certain that the correct classes can be detected
+        in_class = atom_vls.detectClass(H5T_STRING);
+        verify_val(in_class, true, "CompType::detectClass() with H5T_STRING", __LINE__, __FILE__);
+
+        // Make certain that an incorrect class is not detected
+        in_class = atom_vls.detectClass(H5T_VLEN);
+        verify_val(in_class, false, "CompType::detectClass() with H5T_VLEN", __LINE__, __FILE__);
+
+        /*
+         *  Test class of a compound type with some complex types as fields.
+         */
+
+        // Create a compound datatype with complex type fields
+        CompType cplx_cmpd(sizeof(complex_typ_t));
+        cplx_cmpd.insertMember("arr_r", HOFFSET(complex_typ_t, arr_r), atom_arr);
+        cplx_cmpd.insertMember("i", HOFFSET(complex_typ_t, i), PredType::NATIVE_INT);
+        cplx_cmpd.insertMember("vl_f", HOFFSET(complex_typ_t, vl_f), atom_vlf);
+        cplx_cmpd.insertMember("vl_s", HOFFSET(complex_typ_t, vl_s), atom_vls);
+        cplx_cmpd.insertMember("c", HOFFSET(complex_typ_t, c), PredType::NATIVE_CHAR);
+        cplx_cmpd.insertMember("s", HOFFSET(complex_typ_t, s), PredType::NATIVE_SHORT);
+
+        // Make certain that the correct classes can be detected
+        in_class = cplx_cmpd.detectClass(H5T_COMPOUND);
+        verify_val(in_class, true, "CompType::detectClass() with H5T_COMPOUND", __LINE__, __FILE__);
+        in_class = cplx_cmpd.detectClass(H5T_ARRAY);
+        verify_val(in_class, true, "CompType::detectClass() with H5T_ARRAY", __LINE__, __FILE__);
+        in_class = cplx_cmpd.detectClass(H5T_REFERENCE);
+        verify_val(in_class, true, "CompType::detectClass() with H5T_REFERENCE", __LINE__, __FILE__);
+        in_class = cplx_cmpd.detectClass(H5T_INTEGER);
+        verify_val(in_class, true, "CompType::detectClass() with H5T_INTEGER", __LINE__, __FILE__);
+        in_class = cplx_cmpd.detectClass(H5T_FLOAT);
+        verify_val(in_class, true, "CompType::detectClass() with H5T_FLOAT", __LINE__, __FILE__);
+        in_class = cplx_cmpd.detectClass(H5T_STRING);
+        verify_val(in_class, true, "CompType::detectClass() with H5T_STRING", __LINE__, __FILE__);
+        in_class = cplx_cmpd.detectClass(H5T_VLEN);
+        verify_val(in_class, true, "CompType::detectClass() with H5T_VLEN", __LINE__, __FILE__);
+
+        // Make certain that an incorrect class is not detected
+        in_class = cplx_cmpd.detectClass(H5T_TIME);
+        verify_val(in_class, false, "CompType::detectClass() with H5T_TIME", __LINE__, __FILE__);
+        in_class = cplx_cmpd.detectClass(H5T_ENUM);
+        verify_val(in_class, false, "CompType::detectClass() with H5T_ENUM", __LINE__, __FILE__);
+
+        PASSED();
+    }
+    catch (Exception &E) {
+        issue_fail_msg("test_detect_type_class", __LINE__, __FILE__, E.getCDetailMsg());
+    }
+}
+
+/*-------------------------------------------------------------------------
+ * Function:    test_vltype
  *
- * Programmer:	Binh-Minh Ribler (use C version)
- *		January, 2007
+ * Purpose      Tests VarLenType class
  *
- * Modifications:
+ * Return       None
  *
+ * Programmer   Binh-Minh Ribler (use C version)
+ *              August, 2017
  *-------------------------------------------------------------------------
  */
+static void
+test_vltype()
+{
+    // Output message about test being performed
+    SUBTEST("VarLenType functions");
+    try {
+        VarLenType vltype(PredType::NATIVE_INT);
+
+        bool in_class = vltype.detectClass(H5T_VLEN);
+        verify_val(in_class, true, "VarLenType::detectClass() with H5T_VLEN", __LINE__, __FILE__);
+        in_class = vltype.detectClass(H5T_INTEGER);
+        verify_val(in_class, true, "VarLenType::detectClass() with H5T_INTEGER", __LINE__, __FILE__);
+
+        // Test copy constructor
+        VarLenType vltype2(vltype);
+
+        // Verify that the copied type has a valid id
+        bool is_valid = IdComponent::isValid(vltype2.getId());
+        verify_val(is_valid, true, "isValid on vltype2", __LINE__, __FILE__);
+
+        in_class = vltype2.detectClass(H5T_VLEN);
+        verify_val(in_class, true, "VarLenType::detectClass() with H5T_VLEN for vltype2", __LINE__, __FILE__);
+        in_class = vltype2.detectClass(H5T_INTEGER);
+        verify_val(in_class, true, "VarLenType::detectClass() with H5T_INTEGER for vltype2", __LINE__,
+                   __FILE__);
+        in_class = vltype2.detectClass(H5T_FLOAT);
+        verify_val(in_class, false, "VarLenType::detectClass() with H5T_FLOAT for vltype2", __LINE__,
+                   __FILE__);
+
+        // Create a new file to use in this test
+        H5File file(FILENAME[3], H5F_ACC_TRUNC);
+
+        // Create a group in the file, to hold some varlentype
+        Group top_group(file.createGroup("top group"));
+
+        // Create a variable-length type
+        VarLenType first_vlt(PredType::NATIVE_FLOAT);
+
+        // Commit the type to the group
+        first_vlt.commit(top_group, "first variable-length type");
+
+        // Close it
+        first_vlt.close();
+
+        // Reopen it
+        VarLenType first_vlt_again(top_group, "first variable-length type");
+
+        // Trying to detect H5T_VLEN and H5T_FLOAT classes on this type,
+        // should both be true
+        in_class = vltype2.detectClass(H5T_VLEN);
+        verify_val(in_class, true, "VarLenType::detectClass() with H5T_VLEN for vltype2", __LINE__, __FILE__);
+        in_class = first_vlt_again.detectClass(H5T_FLOAT);
+        verify_val(in_class, true, "VarLenType::detectClass() with H5T_FLOAT for first_vlt_again", __LINE__,
+                   __FILE__);
+
+        PASSED();
+    } // end of try block
+    catch (Exception &E) {
+        issue_fail_msg("test_vltype", __LINE__, __FILE__, E.getCDetailMsg());
+    }
+} // test_vltype
 
+/*-------------------------------------------------------------------------
+ * Function:    test_query
+ *
+ * Purpose      Tests query functions of compound and enumeration types.
+ *
+ * Return       None
+ *
+ * Programmer   Binh-Minh Ribler (use C version)
+ *              January, 2007
+ *-------------------------------------------------------------------------
+ */
 const H5std_string CompT_NAME("Compound_type");
 const H5std_string EnumT_NAME("Enum_type");
 
-static void test_query()
+static void
+test_query()
 {
-    typedef struct {
-	int    a;
-	float  b;
-	long   c;
-	double d;
-    } src_typ_t;
-    short	enum_val;
+    short enum_val;
 
     // Output message about test being performed
     SUBTEST("Query functions of compound and enumeration types");
-    try
-    {
-	// Create File
-	H5File file(FILENAME[2], H5F_ACC_TRUNC);
-
-	// Create a compound datatype
-	CompType tid1(sizeof(src_typ_t));
-
-	tid1.insertMember("a", HOFFSET(src_typ_t, a), PredType::NATIVE_INT);
-	tid1.insertMember("b", HOFFSET(src_typ_t, b), PredType::NATIVE_FLOAT);
-	tid1.insertMember("c", HOFFSET(src_typ_t, c), PredType::NATIVE_LONG);
-	tid1.insertMember("d", HOFFSET(src_typ_t, d), PredType::NATIVE_DOUBLE);
-
-	// Create a enumerate datatype
-	EnumType tid2(sizeof(short));
-
-	tid2.insert("RED", (enum_val=0,&enum_val));
-	tid2.insert("GREEN", (enum_val=1,&enum_val));
-	tid2.insert("BLUE", (enum_val=2,&enum_val));
-	tid2.insert("ORANGE", (enum_val=3,&enum_val));
-	tid2.insert("YELLOW", (enum_val=4,&enum_val));
-
-	// Query member number and member index by name, for compound type
-	int nmembs = tid1.getNmembers();
-	verify_val(nmembs, 4, "CompType::getNmembers()", __LINE__, __FILE__);
-
-	int index = tid1.getMemberIndex("c");
-	verify_val(index, 2, "CompType::getMemberIndex()", __LINE__, __FILE__);
-
-	// Query member number and member index by name, for enumeration type.
-	nmembs = tid2.getNmembers();
-	verify_val(nmembs, 5, "EnumType::getNmembers()", __LINE__, __FILE__);
-
-	index = tid2.getMemberIndex("ORANGE");
-	verify_val(index, 3, "EnumType::getMemberIndex()", __LINE__, __FILE__);
-
-	// Commit compound datatype and close it
-	tid1.commit(file, CompT_NAME);
-	tid1.close();
-
-	// Commit enumeration datatype and close it
-	tid2.commit(file, EnumT_NAME);
-	tid2.close();
-
-	// Open the datatypes for query
-	tid1 = file.openCompType(CompT_NAME);
-	tid2 = file.openEnumType(EnumT_NAME);
-
-	// Query member number and member index by name, for compound type
-	nmembs = tid1.getNmembers();
-	verify_val(nmembs, 4, "CompType::getNmembers()", __LINE__, __FILE__);
-	index = tid1.getMemberIndex("c");
-	verify_val(index, 2, "CompType::getMemberIndex()", __LINE__, __FILE__);
-
-	// Query member number and member index by name, for enumeration type
-	nmembs = tid2.getNmembers();
-	verify_val(nmembs, 5, "EnumType::getNmembers()", __LINE__, __FILE__);
-	index = tid2.getMemberIndex("ORANGE");
-	verify_val(index, 3, "EnumType::getMemberIndex()", __LINE__, __FILE__);
-
-	// Close datatypes and file
-	tid1.close();
-	tid2.close();
-	file.close();
-
-	PASSED();
-    }   // end of try block
-    catch (Exception E) {
+    try {
+        // Create File
+        H5File file(FILENAME[2], H5F_ACC_TRUNC);
+
+        // Create a compound datatype
+        CompType tid1(sizeof(src_typ_t));
+
+        tid1.insertMember("a", HOFFSET(src_typ_t, a), PredType::NATIVE_INT);
+        tid1.insertMember("b", HOFFSET(src_typ_t, b), PredType::NATIVE_FLOAT);
+        tid1.insertMember("c", HOFFSET(src_typ_t, c), PredType::NATIVE_LONG);
+        tid1.insertMember("d", HOFFSET(src_typ_t, d), PredType::NATIVE_DOUBLE);
+
+        // Create a enumerate datatype
+        EnumType tid2(sizeof(short));
+
+        tid2.insert("RED", (enum_val = 0, &enum_val));
+        tid2.insert("GREEN", (enum_val = 1, &enum_val));
+        tid2.insert("BLUE", (enum_val = 2, &enum_val));
+        tid2.insert("ORANGE", (enum_val = 3, &enum_val));
+        tid2.insert("YELLOW", (enum_val = 4, &enum_val));
+
+        // Query member number and member index by name, for compound type
+        int nmembs = tid1.getNmembers();
+        verify_val(nmembs, 4, "CompType::getNmembers()", __LINE__, __FILE__);
+
+        int index = tid1.getMemberIndex("c");
+        verify_val(index, 2, "CompType::getMemberIndex()", __LINE__, __FILE__);
+
+        // Query member number and member index by name, for enumeration type.
+        nmembs = tid2.getNmembers();
+        verify_val(nmembs, 5, "EnumType::getNmembers()", __LINE__, __FILE__);
+
+        index = tid2.getMemberIndex("ORANGE");
+        verify_val(index, 3, "EnumType::getMemberIndex()", __LINE__, __FILE__);
+
+        // Commit compound datatype, and test getting the datatype creation
+        // prop list, then close it
+        tid1.commit(file, CompT_NAME);
+        PropList tcpl = tid1.getCreatePlist();
+        if (!IdComponent::isValid(tcpl.getId())) {
+            // Throw an invalid action exception
+            throw InvalidActionException("H5Object::createAttribute",
+                                         "Datatype creation property list is not valid");
+        }
+        tcpl.close();
+        tid1.close();
+
+        // Commit enumeration datatype, and test getting the datatype creation
+        // prop list, then close it
+        tid2.commit(file, EnumT_NAME);
+        tcpl = tid2.getCreatePlist();
+        if (!IdComponent::isValid(tcpl.getId())) {
+            // Throw an invalid action exception
+            throw InvalidActionException("H5Object::createAttribute",
+                                         "Datatype creation property list is not valid");
+        }
+        tcpl.close();
+        tid2.close();
+
+        // Open the datatypes for query.  Testing both ways
+
+        tid1 = file.openCompType(CompT_NAME);
+        tid1.close();
+        tid2 = file.openEnumType(EnumT_NAME);
+        tid2.close();
+
+        CompType comptype(file, CompT_NAME);
+        EnumType enumtype(file, EnumT_NAME);
+
+        // Query member number and member index by name, for compound type
+        nmembs = comptype.getNmembers();
+        verify_val(nmembs, 4, "CompType::getNmembers()", __LINE__, __FILE__);
+        index = comptype.getMemberIndex("c");
+        verify_val(index, 2, "CompType::getMemberIndex()", __LINE__, __FILE__);
+
+        // Query member number and member index by name, for enumeration type
+        nmembs = enumtype.getNmembers();
+        verify_val(nmembs, 5, "EnumType::getNmembers()", __LINE__, __FILE__);
+        index = enumtype.getMemberIndex("ORANGE");
+        verify_val(index, 3, "EnumType::getMemberIndex()", __LINE__, __FILE__);
+
+        // Close datatypes and file
+        comptype.close();
+        enumtype.close();
+        file.close();
+
+        // Try truncating the file to make sure reference counting is good.
+        // If any references to ids of the accessed types are left unterminated,
+        // the truncating will fail, because the file will not be closed in
+        // the file.close() above.
+        H5File file1(FILENAME[2], H5F_ACC_TRUNC);
+
+        PASSED();
+    } // end of try block
+    catch (Exception &E) {
         issue_fail_msg("test_query", __LINE__, __FILE__, E.getCDetailMsg());
     }
-}   // test_query
+} // test_query
 
-
 /*-------------------------------------------------------------------------
- * Function:	test_transient
- *
- * Purpose:	Tests transient datatypes.
- *
- * Return:	Success:	0
+ * Function:    test_transient
  *
- *		Failure:	number of errors
+ * Purpose      Tests transient datatypes.
  *
- * Programmer:	Binh-Minh Ribler (use C version)
- *		January, 2007
- *
- * Modifications:
+ * Return       None
  *
+ * Programmer   Binh-Minh Ribler (use C version)
+ *              January, 2007
  *-------------------------------------------------------------------------
  */
-const char* filename1 = "dtypes1.h5";
-static void test_transient ()
+
+static void
+test_transient()
 {
-    static hsize_t	ds_size[2] = {10, 20};
+    static hsize_t ds_size[2] = {10, 20};
 
     SUBTEST("Transient datatypes");
     try {
 
-	// Create the file and the dataspace.
-	H5File file(filename1, H5F_ACC_TRUNC);
-	DataSpace space(2, ds_size, ds_size);
-
-	// Copying a predefined type results in a modifiable copy
-	IntType type(PredType::NATIVE_INT);
-	type.setPrecision(256);
-
-	// It should not be possible to create an attribute for a transient type
-	try {
-	    Attribute attr(type.createAttribute("attr1", PredType::NATIVE_INT, space));
-	    // Should FAIL but didn't, so throw an invalid action exception
-	    throw InvalidActionException("H5Object::createAttribute", "Attempted to commit a predefined datatype.");
-	} catch (AttributeIException err) {}  // do nothing, failure expected
-
-	// Create a dataset from a transient datatype
-	// type.close(); - put trace in H5Tclose to make sure it's closed
-	type.copy(PredType::NATIVE_INT);
-	DataSet dset(file.createDataSet("dset1", type, space));
-
-	// The type returned from a dataset should not be modifiable
-	IntType itype(dset);
-	try {
-	    itype.setPrecision(256);
-
-	    // Should FAIL but didn't, so throw an invalid action exception
-	    throw InvalidActionException("PredType::setPrecision", "Dataset datatypes should not be modifiable!");
-	} catch (DataTypeIException err) {}
-	itype.close();
-
-	// Get a copy of the dataset's datatype by applying DataType::copy()
-	// to the dataset. The resulted datatype should be modifiable.
-	itype.copy(dset);
-	itype.setPrecision(256);
-	itype.close();
-
-	// Close the dataset and reopen it, testing that its type is still
-	// read-only.  (Note that a copy of it is modifiable.)
-	dset.close();
-	dset = file.openDataSet("dset1");
-
-	// Close objects and file.
-	dset.close();
-	file.close();
-	type.close();
-	space.close();
-	PASSED();
-    }   // end of try block
-    catch (Exception E) {
+        // Create the file and the dataspace.
+        H5File    file(FILENAME[0], H5F_ACC_TRUNC);
+        DataSpace space(2, ds_size, ds_size);
+
+        // Copying a predefined type results in a modifiable copy
+        IntType type(PredType::NATIVE_INT);
+        type.setPrecision(256);
+
+        // It should not be possible to create an attribute for a transient type
+        try {
+            Attribute attr(type.createAttribute("attr1", PredType::NATIVE_INT, space));
+            // Should FAIL but didn't, so throw an invalid action exception
+            throw InvalidActionException("H5Object::createAttribute",
+                                         "Attempted to commit a predefined datatype.");
+        }
+        catch (AttributeIException &err) {
+        } // do nothing, failure expected
+
+        // Create a dataset from a transient datatype
+        // type.close(); - put trace in H5Tclose to make sure it's closed
+        type.copy(PredType::NATIVE_INT);
+        DataSet dset(file.createDataSet("dset1", type, space));
+
+        // The type returned from a dataset should not be modifiable
+        IntType itype(dset);
+        try {
+            itype.setPrecision(256);
+
+            // Should FAIL but didn't, so throw an invalid action exception
+            throw InvalidActionException("PredType::setPrecision",
+                                         "Dataset datatypes should not be modifiable!");
+        }
+        catch (DataTypeIException &err) {
+        }
+        itype.close();
+
+        // Get a copy of the dataset's datatype by applying DataType::copy()
+        // to the dataset. The resulted datatype should be modifiable.
+        itype.copy(dset);
+        itype.setPrecision(256);
+        itype.close();
+
+        // Close the dataset and reopen it, testing that its type is still
+        // read-only.  (Note that a copy of it is modifiable.)
+        dset.close();
+        dset = file.openDataSet("dset1");
+
+        // Close objects and file.
+        dset.close();
+        file.close();
+        type.close();
+        space.close();
+        PASSED();
+    } // end of try block
+    catch (Exception &E) {
         issue_fail_msg("test_transient", __LINE__, __FILE__, E.getCDetailMsg());
     }
-}   // test_transient
+} // test_transient
 
-
 /*-------------------------------------------------------------------------
- * Function:	test_named
- *
- * Purpose:	Tests named datatypes.
+ * Function:    test_named
  *
- * Return:	Success:	0
+ * Purpose      Tests named datatypes.
  *
- *		Failure:	number of errors
- *
- * Programmer:	Binh-Minh Ribler (use C version)
- *		January, 2007
- *
- * Modifications:
+ * Return       None
  *
+ * Programmer   Binh-Minh Ribler (use C version)
+ *              January, 2007
  *-------------------------------------------------------------------------
  */
-const H5std_string filename2("dtypes2.h5");
-static void test_named ()
+
+static void
+test_named()
 {
-    static hsize_t	ds_size[2] = {10, 20};
-    hsize_t		i;
-    unsigned 		attr_data[10][20];
-    DataType           *ds_type = NULL;
+    static hsize_t ds_size[2] = {10, 20};
+    unsigned       attr_data[10][20];
+    DataType      *ds_type = NULL;
 
     SUBTEST("Named datatypes");
     try {
-	// Create the file.
-	H5File file(filename2, H5F_ACC_TRUNC);
+        // Create the file.
+        H5File file(FILENAME[1], H5F_ACC_TRUNC);
 
-	// Create a simple dataspace.
-	DataSpace space(2, ds_size, ds_size);
+        // Create a simple dataspace.
+        DataSpace space(2, ds_size, ds_size);
 
-	// Predefined types cannot be committed.
-	try {
-	    PredType nativeint(PredType::NATIVE_INT);
-	    nativeint.commit(file, "test_named_1 (should not exist)");
+        // Predefined types cannot be committed.
+        try {
+            PredType nativeint(PredType::NATIVE_INT);
+            nativeint.commit(file, "test_named_1 (should not exist)");
 
-	    // Should FAIL but didn't, so throw an invalid action exception
-	    throw InvalidActionException("PredType::commit", "Attempted to commit a predefined datatype.");
-	} catch (DataTypeIException err) {}
+            // Should FAIL but didn't, so throw an invalid action exception
+            throw InvalidActionException("PredType::commit", "Attempted to commit a predefined datatype.");
+        }
+        catch (DataTypeIException &err) {
+        }
 
-	// Copy a predefined datatype and commit the copy.
+        // Copy a predefined datatype and commit the copy.
         IntType itype(PredType::NATIVE_INT);
         itype.commit(file, "native-int");
 
-	// Test commit passing in const H5File& for prototype with const
-	try
-	{
-	    // Create random char type
-	    IntType atype(PredType::NATIVE_UCHAR);
-
-	    // Creating group, declared as const
-	    const Group const_grp = file.createGroup("GR as loc");
-
-	    // Commit type passing in const group; compilation would fail if
-	    // no matching prototype
-	    atype.commit(const_grp, "random uchar");
-	}   // end of try block
-	catch (Exception E) {
-	    issue_fail_msg("test_named", __LINE__, __FILE__, "Commit at const group");
-	}
-
-	// Check that it is committed.
-	if (itype.committed() == false)
-	    cerr << "IntType::committed() returned false" << endl;
-
-	// We should not be able to modify a type after it has been committed.
-	try {
-	    itype.setPrecision(256);	// attempt an invalid action...
-
-	    // Should FAIL but didn't, so throw an invalid action exception
-	    throw InvalidActionException("IntType::setPrecision", "Attempted to modify a committed datatype.");
-	} catch (DataTypeIException err) {}
-
-	// We should not be able to re-commit a committed type
-	try {
-	    itype.commit(file, "test_named_2 (should not exist)");
-
-	    // Should FAIL but didn't, so throw an invalid action exception
-	    throw InvalidActionException("IntType::commit", "Attempted to re-commit a committed datatype.");
-	} catch (DataTypeIException err) {} // do nothing, failure expected
-
-	// It should be possible to define an attribute for the named type
-	Attribute attr1 = itype.createAttribute("attr1", PredType::NATIVE_UCHAR, space);
-	for (i=0; i<ds_size[0]*ds_size[1]; i++)
-	    attr_data[0][i] = (int)i;/*tricky*/
-	attr1.write(PredType::NATIVE_UINT, attr_data);
-	attr1.close();
-
-	// Copying a committed type should result in a transient type which is
-	// not locked.
-	IntType trans_type;
-	trans_type.copy(itype);
-	bool iscommitted = trans_type.committed();
-	verify_val(iscommitted, 0, "DataType::committed() - Copying a named type should result in a transient type!", __LINE__, __FILE__);
-	trans_type.setPrecision(256);
-	trans_type.close();
-
-    /*
-     * Close the committed type and reopen it.  It should return a named type.
-* This had something to do with the way IntType was returned and assigned
-and caused itype.committed not working correctly.  So, use another_type for
-now.
-	itype.close();
-	itype = file.openIntType("native-int");
-	iscommitted = itype.committed();
-*/
-	IntType another_type = file.openIntType("native-int");
-	iscommitted = another_type.committed();
-	if (!iscommitted)
-	    throw InvalidActionException("IntType::committed()", "Opened named types should be named types!");
-
-	// Create a dataset that uses the named type, then get the dataset's
-	// datatype and make sure it's a named type.
-	DataSet dset = file.createDataSet("dset1", another_type, space);
-	ds_type = new DataType(dset.getDataType());
-	iscommitted = ds_type->committed();
-	if (!iscommitted)
-	    throw InvalidActionException("IntType::committed()", "1 Dataset type should be named type!");
-	dset.close();
-	ds_type->close();
+        // Test commit passing in const H5File& for prototype with const
+        try {
+            // Create random char type
+            IntType atype(PredType::NATIVE_UCHAR);
+
+            // Creating group, declared as const
+            const Group const_grp = file.createGroup("GR as loc");
+
+            // Commit type passing in const group; compilation would fail if
+            // no matching prototype
+            atype.commit(const_grp, "random uchar");
+        } // end of try block
+        catch (Exception &E) {
+            issue_fail_msg("test_named", __LINE__, __FILE__, "Commit at const group");
+        }
+
+        // Check that it is committed.
+        if (!itype.committed())
+            cerr << "IntType::committed() returned false" << endl;
+
+        // We should not be able to modify a type after it has been committed.
+        try {
+            itype.setPrecision(256); // attempt an invalid action...
+
+            // Should FAIL but didn't, so throw an invalid action exception
+            throw InvalidActionException("IntType::setPrecision",
+                                         "Attempted to modify a committed datatype.");
+        }
+        catch (DataTypeIException &err) {
+        }
+
+        // We should not be able to re-commit a committed type
+        try {
+            itype.commit(file, "test_named_2 (should not exist)");
+
+            // Should FAIL but didn't, so throw an invalid action exception
+            throw InvalidActionException("IntType::commit", "Attempted to re-commit a committed datatype.");
+        }
+        catch (DataTypeIException &err) {
+        } // do nothing, failure expected
+
+        // It should be possible to define an attribute for the named type
+        Attribute attr1 = itype.createAttribute("attr1", PredType::NATIVE_UCHAR, space);
+        for (hsize_t i = 0; i < ds_size[0]; i++) {
+            for (hsize_t j = 0; j < ds_size[1]; j++) {
+                attr_data[i][j] = static_cast<unsigned>(i * ds_size[1] + j);
+            }
+        }
+        attr1.write(PredType::NATIVE_UINT, attr_data);
+        attr1.close();
+
+        // Copying a committed type should result in a transient type which is
+        // not locked.
+        IntType trans_type;
+        trans_type.copy(itype);
+        bool iscommitted = trans_type.committed();
+        verify_val(iscommitted, 0,
+                   "DataType::committed() - Copying a named type should result in a transient type!",
+                   __LINE__, __FILE__);
+        trans_type.setPrecision(256);
+        trans_type.close();
+
+        // Close the committed type and reopen it.  It should be a named type.
+        itype.close();
+        itype       = file.openIntType("native-int");
+        iscommitted = itype.committed();
+        if (!iscommitted)
+            throw InvalidActionException("IntType::committed()", "Opened named types should be named types!");
+
+        // Create a dataset that uses the named type, then get the dataset's
+        // datatype and make sure it's a named type.
+        DataSet dset = file.createDataSet("dset1", itype, space);
+        ds_type      = new DataType(dset.getDataType());
+        iscommitted  = ds_type->committed();
+        if (!iscommitted)
+            throw InvalidActionException("IntType::committed()", "Dataset type should be named type!");
+        dset.close();
+        ds_type->close();
         delete ds_type;
 
-	// Reopen the dataset and its type, then make sure the type is
-	// a named type.
-	dset = file.openDataSet("dset1");
-	ds_type = new DataType(dset.getDataType());
-	iscommitted = ds_type->committed();
-	if (!iscommitted)
-	    throw InvalidActionException("IntType::committed()", "Dataset type should be named type!");
-
-	// Close the dataset and create another with the type returned from
-	// the first dataset.
-	dset.close();
-	dset = file.createDataSet("dset2", *ds_type, space);
-	ds_type->close();
-	dset.close();
+        // Reopen the dataset and its type, then make sure the type is
+        // a named type.
+        dset        = file.openDataSet("dset1");
+        ds_type     = new DataType(dset.getDataType());
+        iscommitted = ds_type->committed();
+        if (!iscommitted)
+            throw InvalidActionException("IntType::committed()", "Dataset type should be named type!");
+
+        // Close the dataset and create another with the type returned from
+        // the first dataset.
+        dset.close();
+        dset = file.createDataSet("dset2", *ds_type, space);
+        ds_type->close();
+        dset.close();
         delete ds_type;
 
-	// Reopen the second dataset and make sure the type is shared
-	dset = file.openDataSet("dset2");
-	ds_type = new DataType(dset.getDataType());
-	iscommitted = ds_type->committed();
-	if (!iscommitted)
-	    throw InvalidActionException("DataType::iscommitted()", "Dataset type should be named type!");
-	ds_type->close();
-
-	// Get the dataset datatype by applying DataType::copy() to the
-	// dataset. The resulted datatype should be modifiable.
-	IntType copied_type;
-	copied_type.copy(dset);
-	copied_type.setPrecision(256);
-	copied_type.close();
-
-	// Clean up
-	dset.close();
-	itype.close();
-	space.close();
-	file.close();
-	PASSED();
-    }   // end of try block
-    catch (Exception E) {
+        // Reopen the second dataset and make sure the type is shared
+        dset        = file.openDataSet("dset2");
+        ds_type     = new DataType(dset.getDataType());
+        iscommitted = ds_type->committed();
+        if (!iscommitted)
+            throw InvalidActionException("DataType::iscommitted()", "Dataset type should be named type!");
+        ds_type->close();
+
+        // Get the dataset datatype by applying DataType::copy() to the
+        // dataset. The resulted datatype should be modifiable.
+        IntType copied_type;
+        copied_type.copy(dset);
+        copied_type.setPrecision(256);
+        copied_type.close();
+
+        // Clean up
+        dset.close();
+        itype.close();
+        space.close();
+        file.close();
+        PASSED();
+    } // end of try block
+    catch (Exception &E) {
         issue_fail_msg("test_named", __LINE__, __FILE__, E.getCDetailMsg());
     }
 
-    if(ds_type)
-        delete ds_type;
-}   // test_named
-
-
-/****************************************************************
-**
-**  test_types(): Main datatypes testing routine.
-**
-****************************************************************/
-#ifdef __cplusplus
-extern "C"
-#endif
-void test_types()
+    delete ds_type;
+} // test_named
+
+/*-------------------------------------------------------------------------
+ * Function:    test_encode_decode
+ *
+ * Purpose      Test datatype encode/decode functionality.
+ *
+ * Return       None
+ *
+ * Programmer   Binh-Minh Ribler (using C version)
+ *              August, 2017
+ *-------------------------------------------------------------------------
+ */
+const int ARRAY1_RANK = 1;
+const int ARRAY1_DIM  = 10;
+
+static void
+test_encode_decode()
+{
+    short enum_val;
+
+    SUBTEST("DataType::encode() and DataType::decode()");
+    try {
+        // Create the file.
+        H5File file(FILENAME[4], H5F_ACC_TRUNC);
+
+        //
+        // Test with CompType
+        //
+
+        // Create a compound datatype
+        CompType cmptyp(sizeof(src_typ_t));
+
+        cmptyp.insertMember("a", HOFFSET(src_typ_t, a), PredType::NATIVE_INT);
+        cmptyp.insertMember("b", HOFFSET(src_typ_t, b), PredType::NATIVE_FLOAT);
+        cmptyp.insertMember("c", HOFFSET(src_typ_t, c), PredType::NATIVE_LONG);
+        cmptyp.insertMember("d", HOFFSET(src_typ_t, d), PredType::NATIVE_DOUBLE);
+
+        // Encode compound type in its buffer
+        cmptyp.encode();
+
+        // Verify that encoding had been done
+        verify_val(cmptyp.hasBinaryDesc(), true, "DataType::encode", __LINE__, __FILE__);
+
+        // Decode compound type's buffer to a new CompType
+        CompType *decoded_cmp_ptr(static_cast<CompType *>(cmptyp.decode()));
+
+        // Verify that the datatype was copied exactly via encoding/decoding
+        verify_val(cmptyp == *decoded_cmp_ptr, true, "DataType::decode", __LINE__, __FILE__);
+
+        // Verify again via querying member number and member index by name.
+        verify_val(decoded_cmp_ptr->getNmembers(), 4, "DataType::decode", __LINE__, __FILE__);
+        verify_val(decoded_cmp_ptr->getMemberIndex("c"), 2, "DataType::decode", __LINE__, __FILE__);
+
+        // Create a CompType instance from the pointer and verify it
+        CompType cmptyp_clone(*decoded_cmp_ptr);
+        verify_val(cmptyp == cmptyp_clone, true, "DataType::decode", __LINE__, __FILE__);
+        verify_val(cmptyp_clone.getNmembers(), 4, "DataType::decode", __LINE__, __FILE__);
+        verify_val(cmptyp_clone.getMemberIndex("c"), 2, "DataType::decode", __LINE__, __FILE__);
+
+        delete decoded_cmp_ptr;
+
+        //
+        // Test with EnumType
+        //
+
+        // Create a enumerate datatype
+        EnumType enumtyp(sizeof(short));
+
+        enumtyp.insert("RED", (enum_val = 0, &enum_val));
+        enumtyp.insert("GREEN", (enum_val = 1, &enum_val));
+        enumtyp.insert("BLUE", (enum_val = 2, &enum_val));
+        enumtyp.insert("ORANGE", (enum_val = 3, &enum_val));
+        enumtyp.insert("YELLOW", (enum_val = 4, &enum_val));
+
+        // Encode compound type in a buffer
+        enumtyp.encode();
+
+        // Verify that encoding had been done
+        verify_val(enumtyp.hasBinaryDesc(), true, "DataType::encode", __LINE__, __FILE__);
+
+        // Decode enumeration type's buffer to a new EnumType
+        EnumType *decoded_enum_ptr(static_cast<EnumType *>(enumtyp.decode()));
+
+        // Verify that the datatype was copied exactly via encoding/decoding
+        verify_val(enumtyp == *decoded_enum_ptr, true, "DataType::decode", __LINE__, __FILE__);
+
+        // Verify again via querying member number and member index by name.
+        verify_val(decoded_enum_ptr->getNmembers(), 5, "DataType::decode", __LINE__, __FILE__);
+        verify_val(decoded_enum_ptr->getMemberIndex("GREEN"), 1, "DataType::decode", __LINE__, __FILE__);
+
+        // Create a EnumType instance from the pointer and verify it
+        EnumType enumtyp_clone(*decoded_enum_ptr);
+        verify_val(enumtyp == enumtyp_clone, true, "DataType::decode", __LINE__, __FILE__);
+        verify_val(enumtyp_clone.getNmembers(), 5, "DataType::decode", __LINE__, __FILE__);
+        verify_val(enumtyp_clone.getMemberIndex("GREEN"), 1, "DataType::decode", __LINE__, __FILE__);
+
+        delete decoded_enum_ptr;
+
+        //
+        // Test with variable-length string
+        //
+
+        // Create a variable-length string type
+        StrType vlsttyp(PredType::C_S1);
+        vlsttyp.setSize(H5T_VARIABLE);
+
+        // Encode the variable-length type in its buffer
+        vlsttyp.encode();
+
+        // Verify that encoding had been done
+        verify_val(vlsttyp.hasBinaryDesc(), true, "DataType::encode", __LINE__, __FILE__);
+
+        // Decode the variable-length type's buffer to a new StrType
+        StrType *decoded_str_ptr(static_cast<StrType *>(vlsttyp.decode()));
+
+        verify_val(vlsttyp == *decoded_str_ptr, true, "DataType::decode", __LINE__, __FILE__);
+        verify_val(decoded_str_ptr->isVariableStr(), true, "DataType::decode", __LINE__, __FILE__);
+
+        delete decoded_str_ptr;
+
+        // Test decoding the type by way of DataType*
+
+        // Decode variable-length string type to a new DataType
+        DataType *decoded_vlstr_ptr(vlsttyp.decode());
+
+        // Create a StrType instance from the DataType object and verify it
+        StrType decoded_vlsttyp(decoded_vlstr_ptr->getId());
+        verify_val(vlsttyp == decoded_vlsttyp, true, "DataType::decode", __LINE__, __FILE__);
+        verify_val(decoded_vlsttyp.isVariableStr(), true, "DataType::decode", __LINE__, __FILE__);
+
+        delete decoded_vlstr_ptr;
+
+        //
+        // Test with ArrayType
+        //
+
+        hsize_t tdims1[] = {ARRAY1_DIM};
+
+        // Create an array datatype of the compound datatype
+        ArrayType arrtyp(cmptyp, ARRAY1_RANK, tdims1);
+
+        // Encode the array type in its buffer
+        arrtyp.encode();
+
+        // Verify that encoding had been done
+        verify_val(arrtyp.hasBinaryDesc(), true, "DataType::encode", __LINE__, __FILE__);
+
+        // Create an ArrayType instance from the decoded pointer and verify it
+        ArrayType *decoded_arr_ptr(static_cast<ArrayType *>(arrtyp.decode()));
+
+        verify_val(arrtyp == *decoded_arr_ptr, true, "DataType::decode", __LINE__, __FILE__);
+
+        delete decoded_arr_ptr;
+
+        // Test decoding the type by way of DataType*
+
+        // Decode the array type's buffer
+        DataType *decoded_dt_ptr = arrtyp.decode();
+
+        // Create a ArrayType instance from the decoded pointer and verify it
+        ArrayType decoded_arrtyp(decoded_dt_ptr->getId());
+        verify_val(arrtyp == decoded_arrtyp, true, "DataType::decode", __LINE__, __FILE__);
+        verify_val(decoded_arrtyp.getArrayNDims(), ARRAY1_RANK, "DataType::decode", __LINE__, __FILE__);
+
+        delete decoded_dt_ptr;
+
+        //
+        // Test with IntType
+        //
+
+        // Create an int datatype
+        IntType inttyp(PredType::NATIVE_UINT);
+
+        // Encode the array type in its buffer
+        inttyp.encode();
+
+        // Verify that encoding had been done
+        verify_val(inttyp.hasBinaryDesc(), true, "DataType::encode", __LINE__, __FILE__);
+
+        // Create an IntType instance from the decoded pointer and verify it
+        IntType   *decoded_int_ptr(static_cast<IntType *>(inttyp.decode()));
+        H5T_sign_t int_sign = decoded_int_ptr->getSign();
+        verify_val(static_cast<long>(int_sign), static_cast<long>(H5T_SGN_NONE), "DataType::decode", __LINE__,
+                   __FILE__);
+        verify_val(inttyp == *decoded_int_ptr, true, "DataType::decode", __LINE__, __FILE__);
+
+        delete decoded_int_ptr;
+
+        //
+        // Test decoding FloatType by way of DataType*
+        //
+
+        // Create a float datatype
+        FloatType flttyp(PredType::NATIVE_FLOAT);
+
+        // Encode the float type in its buffer
+        flttyp.encode();
+
+        // Verify that encoding had been done
+        verify_val(flttyp.hasBinaryDesc(), true, "DataType::encode", __LINE__, __FILE__);
+
+        // Decode the array type's buffer
+        DataType *decoded_flt_ptr(flttyp.decode());
+
+        // Create a IntType instance from the decoded pointer and verify it
+        FloatType decoded_flttyp(decoded_flt_ptr->getId());
+        verify_val(flttyp == decoded_flttyp, true, "DataType::decode", __LINE__, __FILE__);
+
+        // H5std_string norm_string;
+        // H5T_norm_t mant_norm = decoded_flttyp.getNorm(norm_string);
+        // verify_val(decoded_flttyp.isVariableStr(), true, "DataType::decode", __LINE__, __FILE__);
+
+        delete decoded_flt_ptr;
+
+        PASSED();
+    }
+    catch (Exception &E) {
+        issue_fail_msg("test_encode_decode", __LINE__, __FILE__, E.getCDetailMsg());
+    }
+}
+
+/*-------------------------------------------------------------------------
+ * Function:    test_operators
+ *
+ * Purpose      Test datatype encode/decode functionality.
+ *
+ * Return       None
+ *
+ * Programmer   Binh-Minh Ribler (using C version)
+ *              August, 2017
+ *-------------------------------------------------------------------------
+ */
+
+static void
+test_operators()
+{
+    short enum_val;
+
+    SUBTEST("DataType::operator== and DataType::operator!=");
+    try {
+        // Create the file.
+        H5File file(FILENAME[5], H5F_ACC_TRUNC);
+
+        //
+        // Test with CompType
+        //
+
+        // Create a compound datatype
+        CompType cmptyp(sizeof(src_typ_t));
+
+        cmptyp.insertMember("a", HOFFSET(src_typ_t, a), PredType::NATIVE_INT);
+        cmptyp.insertMember("b", HOFFSET(src_typ_t, b), PredType::NATIVE_FLOAT);
+        cmptyp.insertMember("c", HOFFSET(src_typ_t, c), PredType::NATIVE_LONG);
+        cmptyp.insertMember("d", HOFFSET(src_typ_t, d), PredType::NATIVE_DOUBLE);
+
+        // Copy this compound datatype
+        CompType clone_cmptyp(cmptyp);
+
+        // Verify that operator== and operator!= work properly
+        verify_val(cmptyp == clone_cmptyp, true, "DataType::operator==", __LINE__, __FILE__);
+        verify_val(cmptyp != clone_cmptyp, false, "DataType::operator!=", __LINE__, __FILE__);
+
+        //
+        // Test with EnumType
+        //
+
+        // Create an enumerate datatype
+        EnumType enumtyp(sizeof(short));
+
+        enumtyp.insert("RED", (enum_val = 0, &enum_val));
+        enumtyp.insert("GREEN", (enum_val = 1, &enum_val));
+        enumtyp.insert("BLUE", (enum_val = 2, &enum_val));
+
+        // Verify that operator== and operator!= work properly
+        verify_val(cmptyp == enumtyp, false, "DataType::operator==", __LINE__, __FILE__);
+        verify_val(cmptyp != enumtyp, true, "DataType::operator!=", __LINE__, __FILE__);
+
+        //
+        // Test with compound datatype's member
+        //
+
+        // Create random atomic datatypes
+        IntType   inttyp(PredType::NATIVE_INT);
+        FloatType flttyp(PredType::NATIVE_FLOAT);
+
+        // Get the NATIVE_INT member from the compound datatype above
+        IntType member_inttyp = cmptyp.getMemberIntType(0);
+
+        // Test various combinations
+        verify_val(inttyp == member_inttyp, true, "DataType::operator==", __LINE__, __FILE__);
+        verify_val(flttyp == member_inttyp, false, "DataType::operator==", __LINE__, __FILE__);
+        verify_val(flttyp != member_inttyp, true, "DataType::operator==", __LINE__, __FILE__);
+
+        // Get the NATIVE_FLOAT member from the compound datatype above
+        IntType member_flttyp = cmptyp.getMemberIntType(1);
+
+        // Test various combinations
+        verify_val(inttyp == member_flttyp, false, "DataType::operator==", __LINE__, __FILE__);
+        verify_val(flttyp != member_flttyp, false, "DataType::operator==", __LINE__, __FILE__);
+
+        PASSED();
+    }
+    catch (Exception &E) {
+        issue_fail_msg("test_operators", __LINE__, __FILE__, E.getCDetailMsg());
+    }
+} // test_operators
+
+/*-------------------------------------------------------------------------
+ * Function:    test_types
+ *
+ * Purpose      Main datatypes testing routine
+ *
+ * Return       None
+ *-------------------------------------------------------------------------
+ */
+extern "C" void
+test_types()
 {
     // Output message about test being performed
-    //MESSAGE("Testing Generic Data Types\n");
     MESSAGE(5, ("Testing Generic Data Types\n"));
 
     // Test basic datatypes
     test_classes();
     test_copy();
+    test_detect_type_class();
+    test_vltype();
     test_query();
     test_transient();
     test_named();
+    test_encode_decode();
+    test_operators();
 
-}   // test_types()
+} // test_types()
 
-
 /*-------------------------------------------------------------------------
- * Function:	cleanup_types
- *
- * Purpose:	Cleanup temporary test files
- *
- * Return:	none
+ * Function:    cleanup_types
  *
- * Programmer:	Quincey Koziol
- *		September 10, 1999
- *
- * Modifications:
+ * Purpose      Cleanup temporary test files
  *
+ * Return       None
  *-------------------------------------------------------------------------
  */
-#ifdef __cplusplus
-extern "C"
-#endif
-void cleanup_types()
+extern "C" void
+cleanup_types()
 {
-    for (int i = 0; i < 3; i++)
-	HDremove(FILENAME[i]);
-}  // cleanup_types
+    for (int i = 0; i < 6; i++)
+        HDremove(FILENAME[i]);
+} // cleanup_types
diff --git a/c++/test/tvlstr.cpp b/c++/test/tvlstr.cpp
index 7c81a8e..1cde7f1 100644
--- a/c++/test/tvlstr.cpp
+++ b/c++/test/tvlstr.cpp
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*****************************************************************************
@@ -20,52 +17,46 @@
    EXTERNAL ROUTINES/VARIABLES:
 
  ***************************************************************************/
-
-#ifdef OLD_HEADER_FILENAME
-#include <iostream.h>
-#else
 #include <iostream>
-#endif
-#include <string>
-
-#ifndef H5_NO_NAMESPACE
-#ifndef H5_NO_STD
-    using std::cerr;
-    using std::endl;
-#endif  // H5_NO_STD
-#endif
-
-#include "H5Cpp.h"      // C++ API header file
+using std::cerr;
+using std::endl;
 
-#ifndef H5_NO_NAMESPACE
-    using namespace H5;
-#endif
+#include <string>
+#include "H5Cpp.h" // C++ API header file
+using namespace H5;
 
-#include "h5cpputil.h"  // C++ utilility header file
+#include "h5test.h"
+#include "h5cpputil.h" // C++ utilility header file
 
 // Data file used in most test functions
 const H5std_string FILENAME("tvlstr.h5");
 
 // 1-D dataset with fixed dimensions
-const int SPACE1_RANK = 1;
+const int     SPACE1_RANK = 1;
 const hsize_t SPACE1_DIM1 = 4;
 
-/****************************************************************
-**
-**  test_vlstr_alloc_custom(): Test VL datatype custom memory
-**	allocation routines.  This routine just uses malloc to
-**	allocate the memory and increments the amount of memory
-**	allocated.  It is passed into setVlenMemManager.
-**
-**  Note: exact copy from the C version.
-**  (Not used now)
-****************************************************************/
+/*-------------------------------------------------------------------------
+ * Function:    test_vlstr_alloc_custom
+ *
+ * Purpose      Test VL datatype custom memory allocation routines.
+ *
+ * Return       None
+ *
+ * Description
+ *      This routine just uses malloc to allocate the memory and
+ *      increments the amount of memory allocated.  It is passed
+ *      into setVlenMemManager.
+ *
+ *  Note: exact copy from the C version.
+ *  (Not used now)
+ *-------------------------------------------------------------------------
+ */
 #if 0 // not used now
 static void *test_vlstr_alloc_custom(size_t size, void *info)
 {
-    void *ret_value=NULL;	// Pointer to return
+    void *ret_value=NULL;        // Pointer to return
     size_t *mem_used=(size_t *)info;  // Get the pointer to the memory used
-    size_t extra;		// Extra space needed
+    size_t extra;                // Extra space needed
 
     /*
      *  This weird contortion is required on the DEC Alpha to keep the
@@ -75,8 +66,8 @@ static void *test_vlstr_alloc_custom(size_t size, void *info)
     extra=MAX(sizeof(void *),sizeof(size_t));
 
     if((ret_value=HDmalloc(extra+size))!=NULL) {
-	*(size_t *)ret_value=size;
-	*mem_used+=size;
+        *(size_t *)ret_value=size;
+        *mem_used+=size;
     } // end if
     ret_value = ((unsigned char *)ret_value) + extra;
 
@@ -84,22 +75,28 @@ static void *test_vlstr_alloc_custom(size_t size, void *info)
 }
 #endif
 
-/****************************************************************
-**
-**  test_vlstr_free_custom(): Test VL datatype custom memory
-**	allocation routines.  This routine just uses free to
-**	release the memory and decrements the amount of memory
-**	allocated.  It is passed into setVlenMemManager.
-**
-**  Note: exact copy from the C version.
-**  (Not used now)
-****************************************************************/
+/*-------------------------------------------------------------------------
+ * Function:    test_vlstr_free_custom
+ *
+ * Purpose      Test VL datatype custom memory de-allocation routines.
+ *
+ * Return       None
+ *
+ * Description
+ *      This routine just uses free to release the memory and
+ *      decrements the amount of memory allocated.  It is passed
+ *      into setVlenMemManager.
+ *
+ *  Note: exact copy from the C version.
+ *  (Not used now)
+ *-------------------------------------------------------------------------
+ */
 #if 0 // not used now
 static void test_vlstr_free_custom(void *_mem, void *info)
 {
     unsigned char *mem;
     size_t *mem_used=(size_t *)info;  // Get the pointer to the memory used
-    size_t extra;		// Extra space needed
+    size_t extra;                     // Extra space needed
 
     /*
      *  This weird contortion is required on the DEC Alpha to keep the
@@ -117,14 +114,14 @@ static void test_vlstr_free_custom(void *_mem, void *info)
 #endif
 
 /*-------------------------------------------------------------------------
- * Function:	test_vlstring_dataset
+ * Function:    test_vlstring_dataset
  *
- * Purpose:	Test writing/reading VL strings on datasets.
+ * Purpose      Test writing/reading VL strings on datasets.
  *
- * Return:	None
+ * Return       None
  *
- * Programmer:	Binh-Minh Ribler (use C version)
- *		January, 2007
+ * Programmer   Binh-Minh Ribler (use C version)
+ *              January, 2007
  *
  *-------------------------------------------------------------------------
  */
@@ -135,568 +132,588 @@ static void test_vlstr_free_custom(void *_mem, void *info)
 const H5std_string DSET1_NAME("String_ds");
 const H5std_string DSET1_DATA("String Dataset");
 
-static void test_vlstring_dataset()
+static void
+test_vlstring_dataset()
 {
     char *dynstring_ds_write = NULL;
-    char *string_ds_check = NULL;
+    char *string_ds_check    = NULL;
 
     // Output message about test being performed
     SUBTEST("VL String on Datasets");
 
     try {
-	// Open the file
-	H5File file1(FILENAME, H5F_ACC_TRUNC);
+        // Open the file
+        H5File file1(FILENAME, H5F_ACC_TRUNC);
 
-	// Create a datatype to refer to.
-	StrType vlst(0, H5T_VARIABLE);
+        // Create a datatype to refer to.
+        StrType vlst(0, H5T_VARIABLE);
 
-	// Open the root group.
-	Group root = file1.openGroup("/");
+        // Open the root group.
+        Group root = file1.openGroup("/");
 
-	// Create dataspace for the dataset.
-	DataSpace ds_space (H5S_SCALAR);
+        // Create dataspace for the dataset.
+        DataSpace ds_space(H5S_SCALAR);
 
-	// Create an dataset in the root group.
-	DataSet dset1 = root.createDataSet(DSET1_NAME, vlst, ds_space);
+        // Create an dataset in the root group.
+        DataSet dset1 = root.createDataSet(DSET1_NAME, vlst, ds_space);
 
-	// Write data to the dataset.
-	dset1.write(DSET1_DATA, vlst);
+        // Write data to the dataset.
+        dset1.write(DSET1_DATA, vlst);
 
-	// Read and verify the dataset string as a string of chars.
-	dset1.read(&string_ds_check, vlst);
-	if(HDstrcmp(string_ds_check, DSET1_DATA.c_str())!=0)
-	    TestErrPrintf("Line %d: Attribute data different: DSET1_DATA=%s,string_ds_check=%s\n",__LINE__, DSET1_DATA.c_str(), string_ds_check);
+        // Read and verify the dataset string as a string of chars.
+        dset1.read(&string_ds_check, vlst);
+        if (HDstrcmp(string_ds_check, DSET1_DATA.c_str()) != 0)
+            TestErrPrintf("Line %d: Attribute data different: DSET1_DATA=%s,string_ds_check=%s\n", __LINE__,
+                          DSET1_DATA.c_str(), string_ds_check);
 
-	HDfree(string_ds_check);  // note: no need for std::string test
+        HDfree(string_ds_check); // note: no need for std::string test
         string_ds_check = NULL;
 
-	// Read and verify the dataset string as an std::string.
-	H5std_string read_str;
-	dset1.read(read_str, vlst);
-	if (read_str != DSET1_DATA)
-	    TestErrPrintf("Line %d: Attribute data different: DSET1_DATA=%s,read_str=%s\n",__LINE__, DSET1_DATA.c_str(), read_str.c_str());
+        // Read and verify the dataset string as an std::string.
+        H5std_string read_str;
+        dset1.read(read_str, vlst);
+        if (read_str != DSET1_DATA)
+            TestErrPrintf("Line %d: Attribute data different: DSET1_DATA=%s,read_str=%s\n", __LINE__,
+                          DSET1_DATA.c_str(), read_str.c_str());
 
-	// Close the dataset.
-	dset1.close();
+        // Close the dataset.
+        dset1.close();
 
-	// Test scalar type dataset with 1 value.
-	dset1 = root.createDataSet("test_scalar_small", vlst, ds_space);
+        // Test scalar type dataset with 1 value.
+        dset1 = root.createDataSet("test_scalar_small", vlst, ds_space);
 
-	dynstring_ds_write = (char*)HDcalloc(1, sizeof(char));
-	HDmemset(dynstring_ds_write, 'A', 1);
+        dynstring_ds_write = static_cast<char *>(HDcalloc(2, sizeof(char)));
+        HDmemset(dynstring_ds_write, 'A', 1);
 
-	// Write data to the dataset, then read it back.
-	dset1.write(&dynstring_ds_write, vlst);
-	dset1.read(&string_ds_check, vlst);
+        // Write data to the dataset, then read it back.
+        dset1.write(&dynstring_ds_write, vlst);
+        dset1.read(&string_ds_check, vlst);
 
-	// Verify data read.
-	if(HDstrcmp(string_ds_check,dynstring_ds_write)!=0)
-	    TestErrPrintf("VL string datasets don't match!, dynstring_ds_write=%s, string_ds_check=%s\n",dynstring_ds_write,string_ds_check);
-	HDfree(string_ds_check);
+        // Verify data read.
+        if (HDstrcmp(string_ds_check, dynstring_ds_write) != 0)
+            TestErrPrintf("VL string datasets don't match!, dynstring_ds_write=%s, string_ds_check=%s\n",
+                          dynstring_ds_write, string_ds_check);
+        HDfree(string_ds_check);
         string_ds_check = NULL;
-	dset1.close();
+        dset1.close();
 
-	// Open dataset DSET1_NAME again.
-	dset1 = root.openDataSet(DSET1_NAME);
+        // Open dataset DSET1_NAME again.
+        dset1 = root.openDataSet(DSET1_NAME);
 
-	// Close dataset and file
-	dset1.close();
-	file1.close();
+        // Close dataset and file
+        dset1.close();
+        file1.close();
 
-	PASSED();
+        PASSED();
     } // end try block
 
     // Catch all exceptions.
-    catch (Exception E) {
-	issue_fail_msg("test_vlstring_dataset()", __LINE__, __FILE__, E.getCDetailMsg());
+    catch (Exception &E) {
+        issue_fail_msg("test_vlstring_dataset()", __LINE__, __FILE__, E.getCDetailMsg());
     }
 
-    if(dynstring_ds_write)
+    if (dynstring_ds_write)
         HDfree(dynstring_ds_write);
-    if(string_ds_check)
-	HDfree(string_ds_check);
-}   // test_vlstring_dataset()
+    if (string_ds_check)
+        HDfree(string_ds_check);
+} // test_vlstring_dataset()
 
 /*-------------------------------------------------------------------------
- * Function:	test_vlstring_array_dataset
+ * Function:    test_vlstring_array_dataset
  *
- * Purpose:	Test writing/reading VL string array to/from datasets.
+ * Purpose      Test writing/reading VL string array to/from datasets.
  *
- * Return:	None
+ * Return       None
  *
- * Programmer:	Binh-Minh Ribler
- *		July, 2009
+ * Programmer   Binh-Minh Ribler
+ *              July, 2009
  *
  *-------------------------------------------------------------------------
  */
 const H5std_string DSSTRARR_NAME("StringArray_dset");
-static void test_vlstring_array_dataset()
+
+static void
+test_vlstring_array_dataset()
 {
-    const char *string_ds_array[SPACE1_DIM1]= {
-        "Line 1", "Line 2", "Line 3", "Line 4"
-        };   // Information to write
+    const char *string_ds_array[SPACE1_DIM1] = {"Line 1", "Line 2", "Line 3",
+                                                "Line 4"}; // Information to write
 
     // Output message about test being performed
     SUBTEST("VL String Array on Datasets");
 
-    H5File* file1 = NULL;
+    H5File *file1 = NULL;
     try {
         // Create file.
-	file1 = new H5File(FILENAME, H5F_ACC_RDWR);
+        file1 = new H5File(FILENAME, H5F_ACC_RDWR);
 
         // Create dataspace for datasets.
-        hsize_t dims1[] = {SPACE1_DIM1};
+        hsize_t   dims1[] = {SPACE1_DIM1};
         DataSpace ds_space(SPACE1_RANK, dims1);
 
-	// Create a datatype to refer to.
-	StrType vlst(0, H5T_VARIABLE);
-
-	// Create and write a dataset.
-	DataSet dataset(file1->createDataSet(DSSTRARR_NAME, vlst, ds_space));
-	dataset.write(string_ds_array, vlst);
-
-	// Read and verify the dataset using strings of chars as buffer.
-	// Note: reading by array of H5std_string doesn't work yet.
-	char *string_ds_check[SPACE1_DIM1];
-	dataset.read(string_ds_check, vlst);
-
-	hsize_t ii;
-	for (ii = 0; ii < SPACE1_DIM1; ii++)
-	{
-	    if(HDstrcmp(string_ds_check[ii], string_ds_array[ii])!=0)
-		TestErrPrintf("Line %d: Dataset data different: written=%s,read=%s\n",__LINE__, string_ds_array[ii], string_ds_check[ii]);
-
-	    HDfree(string_ds_check[ii]);
-	}
-
-	// Close objects that are no longer needed.
-	dataset.close();
-	ds_space.close();
-
-	//
-	// Test with scalar data space.
-	//
-
-	// Create H5S_SCALAR data space.
-	DataSpace scalar_space;
-
-	// Create and write another dataset.
-	DataSet dataset2(file1->createDataSet("Dataset2", vlst, scalar_space));
-	char *wdata2 = (char*)HDcalloc(65534, sizeof(char));
-	HDmemset(wdata2, 'A', 65533);
-	dataset2.write(&wdata2, vlst);
-
-	char *rdata2;
-	dataset2.read(&rdata2, vlst);
-	if (HDstrcmp(wdata2, rdata2)!=0)
-	    TestErrPrintf("Line %d: Dataset data different: written=%s,read=%s\n",__LINE__, wdata2, rdata2);
-
-	// Release resources from second dataset operation.
-	scalar_space.close();
-	dataset2.close();
-	HDfree(wdata2);
-	HDfree(rdata2);
-
-	// Close objects and file.
-	dataset2.close();
-	vlst.close();
-	file1->close();
-
-	PASSED();
+        // Create a datatype to refer to.
+        StrType vlst(0, H5T_VARIABLE);
+
+        // Create and write a dataset.
+        DataSet dataset(file1->createDataSet(DSSTRARR_NAME, vlst, ds_space));
+        dataset.write(string_ds_array, vlst);
+
+        // Read and verify the dataset using strings of chars as buffer.
+        // Note: reading by array of H5std_string doesn't work yet.
+        char *string_ds_check[SPACE1_DIM1];
+        dataset.read(string_ds_check, vlst);
+
+        hsize_t ii;
+        for (ii = 0; ii < SPACE1_DIM1; ii++) {
+            if (HDstrcmp(string_ds_check[ii], string_ds_array[ii]) != 0)
+                TestErrPrintf("Line %d: Dataset data different: written=%s,read=%s\n", __LINE__,
+                              string_ds_array[ii], string_ds_check[ii]);
+
+            HDfree(string_ds_check[ii]);
+        }
+
+        // Close objects that are no longer needed.
+        dataset.close();
+        ds_space.close();
+
+        //
+        // Test with scalar data space.
+        //
+
+        // Create H5S_SCALAR data space.
+        DataSpace scalar_space;
+
+        // Create and write another dataset.
+        DataSet dataset2(file1->createDataSet("Dataset2", vlst, scalar_space));
+        char   *wdata2 = static_cast<char *>(HDcalloc(65534, sizeof(char)));
+        HDmemset(wdata2, 'A', 65533);
+        dataset2.write(&wdata2, vlst);
+
+        char *rdata2;
+        dataset2.read(&rdata2, vlst);
+        if (HDstrcmp(wdata2, rdata2) != 0)
+            TestErrPrintf("Line %d: Dataset data different: written=%s,read=%s\n", __LINE__, wdata2, rdata2);
+
+        // Release resources from second dataset operation.
+        scalar_space.close();
+        dataset2.close();
+        HDfree(wdata2);
+        HDfree(rdata2);
+
+        // Close objects and file.
+        dataset2.close();
+        vlst.close();
+        file1->close();
+
+        PASSED();
     } // end try
 
     // Catch all exceptions.
-    catch (Exception E)
-    {
-	issue_fail_msg("test_vlstring_array_dataset()", __LINE__, __FILE__, E.getCDetailMsg());
+    catch (Exception &E) {
+        issue_fail_msg("test_vlstring_array_dataset()", __LINE__, __FILE__, E.getCDetailMsg());
     }
 
-    if(file1)
-	delete file1;
+    delete file1;
 } // end test_vlstring_array_dataset()
 
 /*-------------------------------------------------------------------------
- * Function:	test_vlstrings_special
+ * Function:    test_vlstrings_special
  *
- * Purpose:	Test VL string code for special string cases, nil and
- *		zero-sized.
+ * Purpose      Test VL string code for special string cases, nil and
+ *              zero-sized.
  *
- * Return:	None
+ * Return       None
  *
- * Programmer:	Binh-Minh Ribler (use C version)
- *		January, 2007
+ * Programmer   Binh-Minh Ribler (use C version)
+ *              January, 2007
  *
  *-------------------------------------------------------------------------
  */
-static void test_vlstrings_special()
+static void
+test_vlstrings_special()
 {
-    const char *wdata[SPACE1_DIM1] = {"one", "two", "", "four"};
+    const char *wdata[SPACE1_DIM1]  = {"one", "two", "", "four"};
     const char *wdata2[SPACE1_DIM1] = {NULL, NULL, NULL, NULL};
-    char *rdata[SPACE1_DIM1];   // Information read in
+    char       *rdata[SPACE1_DIM1]; // Information read in
 
     // Output message about test being performed.
     SUBTEST("Special VL Strings");
 
     try {
-	// Create file.
-	H5File file1(FILENAME, H5F_ACC_TRUNC);
+        // Create file.
+        H5File file1(FILENAME, H5F_ACC_TRUNC);
 
         // Create dataspace for datasets.
-        hsize_t dims1[] = {SPACE1_DIM1};
+        hsize_t   dims1[] = {SPACE1_DIM1};
         DataSpace sid1(SPACE1_RANK, dims1);
 
-	// Create a datatype to refer to.
-	StrType vlst(0, H5T_VARIABLE);
-
-	// Create a dataset.
-	DataSet dataset(file1.createDataSet("Dataset3", vlst, sid1));
-
-	// Read from the dataset before writing data.
-	dataset.read(rdata, vlst);
-
-	// Check data read in.
-	hsize_t ii;      	// counting variable
-	for (ii=0; ii<SPACE1_DIM1; ii++)
-	    if(rdata[ii]!=NULL)
-		TestErrPrintf("VL doesn't match!, rdata[%d]=%p\n",(int)ii,rdata[ii]);
-
-	// Write dataset to disk, then read it back.
-	dataset.write(wdata, vlst);
-	dataset.read(rdata, vlst);
-
-	// Compare data read in.
-	for (ii = 0; ii < SPACE1_DIM1; ii++) {
-	    size_t wlen = HDstrlen(wdata[ii]);
-	    size_t rlen = HDstrlen(rdata[ii]);
-	    if(wlen != rlen) {
-		TestErrPrintf("VL data lengths don't match!, strlen(wdata[%d])=%u, strlen(rdata[%d])=%u\n", (int)ii, (unsigned)wlen, (int)ii, (unsigned)rlen);
-		continue;
-	    } // end if
-	    if(HDstrcmp(wdata[ii],rdata[ii]) != 0) {
-		TestErrPrintf("VL data values don't match!, wdata[%d]=%s, rdata[%d]=%s\n", (int)ii, wdata[ii], (int)ii, rdata[ii]);
-		continue;
-	    } // end if
-	} // end for
-
-	// Reclaim the read VL data.
-	DataSet::vlenReclaim((void *)rdata, vlst, sid1);
-
-	// Close Dataset.
-	dataset.close();
-
-	/*
-	 * Create another dataset to test nil strings.
-	 */
-
-	// Create the property list and set the fill value for the second
-	// dataset.
-	DSetCreatPropList dcpl;
-	char *fill = NULL;	// Fill value
-	dcpl.setFillValue(vlst, &fill);
-	dataset = file1.createDataSet("Dataset4", vlst, sid1, dcpl);
-
-	// Close dataset creation property list.
-	dcpl.close();
-
-	// Read from dataset before writing data.
-	dataset.read(rdata, vlst);
-
-	// Check data read in.
-	for (ii=0; ii<SPACE1_DIM1; ii++)
-	  if(rdata[ii]!=NULL)
-	    TestErrPrintf("VL doesn't match!, rdata[%d]=%p\n",(int)ii,rdata[ii]);
-
-	// Try to write nil strings to disk.
-	dataset.write(wdata2, vlst);
-
-	// Read nil strings back from disk.
-	dataset.read(rdata, vlst);
-
-	// Check data read in.
-	for (ii=0; ii<SPACE1_DIM1; ii++)
-	  if(rdata[ii]!=NULL)
-	    TestErrPrintf("VL doesn't match!, rdata[%d]=%p\n",(int)ii,rdata[ii]);
-
-	// Close objects and file.
-	dataset.close();
-	vlst.close();
-	sid1.close();
-	file1.close();
-
-	PASSED();
+        // Create a datatype to refer to.
+        StrType vlst(0, H5T_VARIABLE);
+
+        // Create a dataset.
+        DataSet dataset(file1.createDataSet("Dataset3", vlst, sid1));
+
+        // Read from the dataset before writing data.
+        dataset.read(rdata, vlst);
+
+        // Check data read in.
+        hsize_t ii; // counting variable
+        for (ii = 0; ii < SPACE1_DIM1; ii++)
+            if (rdata[ii] != NULL)
+                TestErrPrintf("VL doesn't match!, rdata[%d]=%s\n", static_cast<int>(ii), rdata[ii]);
+
+        // Write dataset to disk, then read it back.
+        dataset.write(wdata, vlst);
+        dataset.read(rdata, vlst);
+
+        // Compare data read in.
+        for (ii = 0; ii < SPACE1_DIM1; ii++) {
+            size_t wlen = HDstrlen(wdata[ii]);
+            size_t rlen = HDstrlen(rdata[ii]);
+            if (wlen != rlen) {
+                TestErrPrintf("VL data lengths don't match!, strlen(wdata[%d])=%u, strlen(rdata[%d])=%u\n",
+                              static_cast<int>(ii), static_cast<unsigned>(wlen), static_cast<int>(ii),
+                              static_cast<unsigned>(rlen));
+                continue;
+            }
+            if (HDstrcmp(wdata[ii], rdata[ii]) != 0) {
+                TestErrPrintf("VL data values don't match!, wdata[%d]=%s, rdata[%d]=%s\n",
+                              static_cast<int>(ii), wdata[ii], static_cast<int>(ii), rdata[ii]);
+                continue;
+            }
+        }
+
+        // Reclaim the read VL data.
+        DataSet::vlenReclaim(static_cast<void *>(rdata), vlst, sid1);
+
+        // Close Dataset.
+        dataset.close();
+
+        /*
+         * Create another dataset to test nil strings.
+         */
+
+        // Create the property list and set the fill value for the second
+        // dataset.
+        DSetCreatPropList dcpl;
+        char             *fill = NULL; // Fill value
+        dcpl.setFillValue(vlst, &fill);
+        dataset = file1.createDataSet("Dataset4", vlst, sid1, dcpl);
+
+        // Close dataset creation property list.
+        dcpl.close();
+
+        // Read from dataset before writing data.
+        dataset.read(rdata, vlst);
+
+        // Check data read in.
+        for (ii = 0; ii < SPACE1_DIM1; ii++)
+            if (rdata[ii] != NULL)
+                TestErrPrintf("VL doesn't match!, rdata[%d]=%s\n", static_cast<int>(ii), rdata[ii]);
+
+        // Try to write nil strings to disk.
+        dataset.write(wdata2, vlst);
+
+        // Read nil strings back from disk.
+        dataset.read(rdata, vlst);
+
+        // Check data read in.
+        for (ii = 0; ii < SPACE1_DIM1; ii++)
+            if (rdata[ii] != NULL)
+                TestErrPrintf("VL doesn't match!, rdata[%d]=%s\n", static_cast<int>(ii), rdata[ii]);
+
+        // Close objects and file.
+        dataset.close();
+        vlst.close();
+        sid1.close();
+        file1.close();
+
+        PASSED();
     } // end try
 
     // Catch all exceptions.
-    catch (Exception E)
-    {
-	issue_fail_msg("test_vlstrings_special()", __LINE__, __FILE__, E.getCDetailMsg());
+    catch (Exception &E) {
+        issue_fail_msg("test_vlstrings_special()", __LINE__, __FILE__, E.getCDetailMsg());
     }
 } // test_vlstrings_special
 
 /*-------------------------------------------------------------------------
- * Function:	test_vlstring_type
+ * Function:    test_vlstring_type
  *
- * Purpose:	Test if VL string is treated as string.
+ * Purpose      Test if VL string is treated as string.
  *
- * Return:	None
+ * Return       None
  *
- * Programmer:	Binh-Minh Ribler (use C version)
- *		January, 2007
+ * Programmer   Binh-Minh Ribler (use C version)
+ *              January, 2007
  *
  *-------------------------------------------------------------------------
  */
-const H5std_string      VLSTR_TYPE("vl_string_type");
-static void test_vlstring_type()
+const H5std_string VLSTR_TYPE("vl_string_type");
+
+static void
+test_vlstring_type()
 {
     // Output message about test being performed.
     SUBTEST("VL String Type");
 
-    H5File* file1 = NULL;
+    H5File *file1 = NULL;
     try {
-	// Open file.
-	file1 = new H5File(FILENAME, H5F_ACC_RDWR);
-
-	// Create a datatype to refer to.
-	StrType vlst(PredType::C_S1);
-
-	// Change padding and verify it.
-	vlst.setStrpad(H5T_STR_NULLPAD);
-	H5T_str_t pad = vlst.getStrpad();
-	verify_val(pad, H5T_STR_NULLPAD, "StrType::getStrpad", __LINE__, __FILE__);
-
-	// Convert to variable-length string.
-	vlst.setSize(H5T_VARIABLE);
-
-	// Check if datatype is VL string.
-	H5T_class_t type_class = vlst.getClass();
-	verify_val(type_class, H5T_STRING, "DataType::getClass", __LINE__, __FILE__);
-	bool is_variable_str = vlst.isVariableStr();
-	verify_val(is_variable_str, true, "DataType::isVariableStr", __LINE__, __FILE__);
-
-	// Check default character set and padding.
-	H5T_cset_t cset = vlst.getCset();
-	verify_val(cset, H5T_CSET_ASCII, "StrType::getCset", __LINE__, __FILE__);
-	pad = vlst.getStrpad();
-	verify_val(pad, H5T_STR_NULLPAD, "StrType::getStrpad", __LINE__, __FILE__);
-
-	// Commit variable-length string datatype to storage.
-	vlst.commit(*file1, VLSTR_TYPE);
-
-	// Close datatype.
-	vlst.close();
-
-	// Try opening datatype again.
-	vlst = file1->openStrType(VLSTR_TYPE);
-
-	// Close datatype and file.
-	vlst.close();
-	file1->close();
+        // Open file.
+        file1 = new H5File(FILENAME, H5F_ACC_RDWR);
+
+        // Create a datatype to refer to.
+        StrType vlst(PredType::C_S1);
+
+        // Change padding and verify it.
+        vlst.setStrpad(H5T_STR_NULLPAD);
+        H5T_str_t pad = vlst.getStrpad();
+        verify_val(static_cast<long>(pad), static_cast<long>(H5T_STR_NULLPAD), "StrType::getStrpad", __LINE__,
+                   __FILE__);
+
+        // Convert to variable-length string.
+        vlst.setSize(H5T_VARIABLE);
+
+        // Check if datatype is VL string.
+        H5T_class_t type_class = vlst.getClass();
+        verify_val(static_cast<long>(type_class), static_cast<long>(H5T_STRING), "DataType::getClass",
+                   __LINE__, __FILE__);
+        bool is_variable_str = vlst.isVariableStr();
+        verify_val(is_variable_str, true, "DataType::isVariableStr", __LINE__, __FILE__);
+
+        // Check default character set and padding.
+        H5T_cset_t cset = vlst.getCset();
+        verify_val(static_cast<long>(cset), static_cast<long>(H5T_CSET_ASCII), "StrType::getCset", __LINE__,
+                   __FILE__);
+        pad = vlst.getStrpad();
+        verify_val(static_cast<long>(pad), static_cast<long>(H5T_STR_NULLPAD), "StrType::getStrpad", __LINE__,
+                   __FILE__);
+
+        // Commit variable-length string datatype to storage.
+        vlst.commit(*file1, VLSTR_TYPE);
+
+        // Close datatype.
+        vlst.close();
+
+        // Try opening datatype again.
+        vlst = file1->openStrType(VLSTR_TYPE); // deprecated
+
+        // Close again and reopen with constructor.
+        vlst.close();
+        StrType vlst1(*file1, VLSTR_TYPE);
+
+        // Close datatype and file.
+        vlst1.close();
+        file1->close();
         delete file1;
 
-	// Open file.
-	file1 = new H5File(FILENAME, H5F_ACC_RDWR);
+        // Open file.
+        file1 = new H5File(FILENAME, H5F_ACC_RDWR);
 
-	// Open the variable-length string datatype just created
-	vlst = file1->openStrType(VLSTR_TYPE);
+        // Open the variable-length string datatype just created
+        StrType vlst2(*file1, VLSTR_TYPE);
 
-	// Verify character set and padding
-	cset = vlst.getCset();
-	verify_val(cset, H5T_CSET_ASCII, "StrType::getCset", __LINE__, __FILE__);
-	pad = vlst.getStrpad();
-	verify_val(pad, H5T_STR_NULLPAD, "StrType::getStrpad", __LINE__, __FILE__);
+        // Verify character set and padding
+        cset = vlst2.getCset();
+        verify_val(static_cast<long>(cset), static_cast<long>(H5T_CSET_ASCII), "StrType::getCset", __LINE__,
+                   __FILE__);
+        pad = vlst2.getStrpad();
+        verify_val(static_cast<long>(pad), static_cast<long>(H5T_STR_NULLPAD), "StrType::getStrpad", __LINE__,
+                   __FILE__);
 
-	// Close datatype and file
-	vlst.close();
-	file1->close();
+        // Close datatype and file
+        vlst2.close();
+        file1->close();
 
-	PASSED();
+        PASSED();
     } // end try block
 
     // Catch all exceptions.
-    catch (Exception E)
-    {
+    catch (Exception &E) {
         issue_fail_msg("test_vlstring_type()", __LINE__, __FILE__, E.getCDetailMsg());
     }
 
-    if(file1)
-	delete file1;
+    delete file1;
 } // end test_vlstring_type()
 
 /*-------------------------------------------------------------------------
- * Function:	test_compact_vlstring
+ * Function:    test_compact_vlstring
  *
- * Purpose:	Test storing VL strings in compact datasets.
+ * Purpose      Test storing VL strings in compact datasets.
  *
- * Return:	None
+ * Return       None
  *
- * Programmer:	Binh-Minh Ribler (use C version)
- *		January, 2007
+ * Programmer   Binh-Minh Ribler (use C version)
+ *              January, 2007
  *
  *-------------------------------------------------------------------------
  */
-static void test_compact_vlstring()
+static void
+test_compact_vlstring()
 {
     // Output message about test being performed
     SUBTEST("VL Strings on Compact Dataset");
 
     try {
-	// Create file
-	H5File file1(FILENAME, H5F_ACC_TRUNC);
+        // Create file
+        H5File file1(FILENAME, H5F_ACC_TRUNC);
 
-	// Create dataspace for datasets
-        hsize_t dims1[] = {SPACE1_DIM1};
+        // Create dataspace for datasets
+        hsize_t   dims1[] = {SPACE1_DIM1};
         DataSpace sid1(SPACE1_RANK, dims1);
 
-	// Create a datatype to refer to
-	StrType vlst(0, H5T_VARIABLE);
-
-	// Create dataset create property list and set layout
-	DSetCreatPropList plist;
-	plist.setLayout(H5D_COMPACT);
-
-	// Create a dataset
-	DataSet dataset(file1.createDataSet("Dataset5", vlst, sid1, plist));
-
-	// Write dataset to disk
-	const char *wdata[SPACE1_DIM1] = {"one", "two", "three", "four"};
-	dataset.write(wdata, vlst);
-
-	// Read dataset from disk
-	char *rdata[SPACE1_DIM1];   // Information read in
-	dataset.read(rdata, vlst);
-
-	// Compare data read in
-	hsize_t i;
-	for (i=0; i<SPACE1_DIM1; i++) {
-	    if (HDstrlen(wdata[i])!=strlen(rdata[i])) {
-		TestErrPrintf("VL data length don't match!, strlen(wdata[%d])=%d, strlen(rdata[%d])=%d\n",(int)i,(int)strlen(wdata[i]),(int)i,(int)strlen(rdata[i]));
-		continue;
-	    } // end if
-	    if (HDstrcmp(wdata[i],rdata[i]) != 0) {
-		TestErrPrintf("VL data values don't match!, wdata[%d]=%s, rdata[%d]=%s\n",(int)i,wdata[i],(int)i,rdata[i]);
-		continue;
-	    } // end if
-	} // end for
-
-	// Reclaim the read VL data
-	DataSet::vlenReclaim((void *)rdata, vlst, sid1);
-
-	// Close objects and file
-	dataset.close();
-	vlst.close();
-	sid1.close();
-	plist.close();
-	file1.close();
-
-	PASSED();
+        // Create a datatype to refer to
+        StrType vlst(0, H5T_VARIABLE);
+
+        // Create dataset create property list and set layout
+        DSetCreatPropList plist;
+        plist.setLayout(H5D_COMPACT);
+
+        // Create a dataset
+        DataSet dataset(file1.createDataSet("Dataset5", vlst, sid1, plist));
+
+        // Write dataset to disk
+        const char *wdata[SPACE1_DIM1] = {"one", "two", "three", "four"};
+        dataset.write(wdata, vlst);
+
+        // Read dataset from disk
+        char *rdata[SPACE1_DIM1]; // Information read in
+        dataset.read(rdata, vlst);
+
+        // Compare data read in
+        hsize_t i;
+        for (i = 0; i < SPACE1_DIM1; i++) {
+            if (HDstrlen(wdata[i]) != strlen(rdata[i])) {
+                TestErrPrintf("VL data length don't match!, strlen(wdata[%d])=%d, strlen(rdata[%d])=%d\n",
+                              static_cast<int>(i), static_cast<int>(HDstrlen(wdata[i])), static_cast<int>(i),
+                              static_cast<int>(HDstrlen(rdata[i])));
+                continue;
+            } // end if
+            if (HDstrcmp(wdata[i], rdata[i]) != 0) {
+                TestErrPrintf("VL data values don't match!, wdata[%d]=%s, rdata[%d]=%s\n",
+                              static_cast<int>(i), wdata[i], static_cast<int>(i), rdata[i]);
+                continue;
+            } // end if
+        }     // end for
+
+        // Reclaim the read VL data
+        DataSet::vlenReclaim(static_cast<void *>(rdata), vlst, sid1);
+
+        // Close objects and file
+        dataset.close();
+        vlst.close();
+        sid1.close();
+        plist.close();
+        file1.close();
+
+        PASSED();
     } // end try
 
     // Catch all exceptions.
-    catch (Exception E)
-    {
+    catch (Exception &E) {
         issue_fail_msg("test_compact_vlstrings()", __LINE__, __FILE__, E.getCDetailMsg());
     }
-}   // test_compact_vlstrings
+} // test_compact_vlstrings
 
 /*-------------------------------------------------------------------------
- * Function:	test_vlstring_attribute
+ * Function:    test_vlstring_attribute
  *
- * Purpose:	Test writing/reading VL strings on attributes.
+ * Purpose      Test writing/reading VL strings on attributes.
  *
- * Return:	None
+ * Return       None
  *
- * Programmer:	Binh-Minh Ribler (use C version)
- *		January, 2007
+ * Programmer   Binh-Minh Ribler (use C version)
+ *              January, 2007
  *
  *-------------------------------------------------------------------------
  */
-// String for writing to attribute
-static char *string_att_write=NULL;
-
-// Info for a string attribute
+static char       *string_att_write = NULL;
 const H5std_string ATTRSTR_NAME("String_attr");
 const H5std_string ATTRSTR_DATA("String Attribute");
 
-static void test_vlstring_attribute()
+static void
+test_vlstring_attribute()
 {
     // Output message about test being performed
     SUBTEST("VL String on Attributes");
 
     try {
-	// Open the file
-	H5File file1(FILENAME, H5F_ACC_RDWR);
+        // Open the file
+        H5File file1(FILENAME, H5F_ACC_RDWR);
 
-	// Create a datatype to refer to.
-	StrType vlst(0, H5T_VARIABLE);
+        // Create a datatype to refer to.
+        StrType vlst(0, H5T_VARIABLE);
 
-	// Open the root group.
-	Group root = file1.openGroup("/");
+        // Open the root group.
+        Group root = file1.openGroup("/");
 
-	// Create dataspace for the attribute.
-	DataSpace att_space (H5S_SCALAR);
+        // Create dataspace for the attribute.
+        DataSpace att_space(H5S_SCALAR);
 
-	// Create an attribute for the root group.
-	Attribute gr_attr = root.createAttribute(ATTRSTR_NAME, vlst, att_space);
+        // Create an attribute for the root group.
+        Attribute gr_attr = root.createAttribute(ATTRSTR_NAME, vlst, att_space);
 
-	// Write data to the attribute.
-	gr_attr.write(vlst, ATTRSTR_DATA);
+        // Write data to the attribute.
+        gr_attr.write(vlst, ATTRSTR_DATA);
 
-	// Read and verify the attribute string as a string of chars.
-	char *string_att_check;
-	gr_attr.read(vlst, &string_att_check);
-	if(HDstrcmp(string_att_check, ATTRSTR_DATA.c_str())!=0)
-	    TestErrPrintf("Line %d: Attribute data different: ATTRSTR_DATA=%s,string_att_check=%s\n",__LINE__, ATTRSTR_DATA.c_str(), string_att_check);
+        // Read and verify the attribute string as a string of chars.
+        char *string_att_check;
+        gr_attr.read(vlst, &string_att_check);
+        if (HDstrcmp(string_att_check, ATTRSTR_DATA.c_str()) != 0)
+            TestErrPrintf("Line %d: Attribute data different: ATTRSTR_DATA=%s,string_att_check=%s\n",
+                          __LINE__, ATTRSTR_DATA.c_str(), string_att_check);
 
-	HDfree(string_att_check);  // note: no need for std::string test
+        HDfree(string_att_check); // note: no need for std::string test
 
-	// Read and verify the attribute string as an std::string.
-	H5std_string read_str;
-	gr_attr.read(vlst, read_str);
-	if (read_str != ATTRSTR_DATA)
-	    TestErrPrintf("Line %d: Attribute data different: ATTRSTR_DATA=%s,read_str=%s\n",__LINE__, ATTRSTR_DATA.c_str(), read_str.c_str());
+        // Read and verify the attribute string as an std::string.
+        H5std_string read_str;
+        gr_attr.read(vlst, read_str);
+        if (read_str != ATTRSTR_DATA)
+            TestErrPrintf("Line %d: Attribute data different: ATTRSTR_DATA=%s,read_str=%s\n", __LINE__,
+                          ATTRSTR_DATA.c_str(), read_str.c_str());
 
-	// Close group's attribute.
-	gr_attr.close();
+        // Close group's attribute.
+        gr_attr.close();
 
-	// Test creating a "large" sized string attribute
-	gr_attr = root.createAttribute("test_scalar_large", vlst, att_space);
+        // Test creating a "large" sized string attribute
+        gr_attr = root.createAttribute("test_scalar_large", vlst, att_space);
 
-	string_att_write = (char*)HDcalloc(8192, sizeof(char));
-	HDmemset(string_att_write, 'A', 8191);
+        string_att_write = static_cast<char *>(HDcalloc(8192, sizeof(char)));
+        HDmemset(string_att_write, 'A', 8191);
 
-	// Write data to the attribute, then read it back.
-	gr_attr.write(vlst, &string_att_write);
-	gr_attr.read(vlst, &string_att_check);
+        // Write data to the attribute, then read it back.
+        gr_attr.write(vlst, &string_att_write);
+        gr_attr.read(vlst, &string_att_check);
 
-	// Verify data read.
-	if(HDstrcmp(string_att_check,string_att_write)!=0)
-	    TestErrPrintf("VL string attributes don't match!, string_att_write=%s, string_att_check=%s\n",string_att_write,string_att_check);
+        // Verify data read.
+        if (HDstrcmp(string_att_check, string_att_write) != 0)
+            TestErrPrintf("VL string attributes don't match!, string_att_write=%s, string_att_check=%s\n",
+                          string_att_write, string_att_check);
 
-	// Release resources.
-	HDfree(string_att_check);
-	HDfree(string_att_write);
-	gr_attr.close();
-	file1.close();
+        // Release resources.
+        HDfree(string_att_check);
+        HDfree(string_att_write);
+        gr_attr.close();
+        file1.close();
 
-	PASSED();
+        PASSED();
     } // end try block
 
     // Catch all exceptions.
-    catch (Exception E) {
-	issue_fail_msg("test_vlstring_attribute()", __LINE__, __FILE__, E.getCDetailMsg());
+    catch (Exception &E) {
+        issue_fail_msg("test_vlstring_attribute()", __LINE__, __FILE__, E.getCDetailMsg());
     }
-}   // test_vlstring_attribute()
+} // test_vlstring_attribute()
 
 #if 0
 /*-------------------------------------------------------------------------
- * Function:	test_read_vl_string_attribute
+ * Function:    test_read_vl_string_attribute
  *
- * Purpose:	Test reading VL strings from attributes.
+ * Purpose      Test reading VL strings from attributes.
  *
- * Return:	None
+ * Return       None
  *
- * Programmer:	Binh-Minh Ribler (use C version)
- *		January, 2007
+ * Programmer   Binh-Minh Ribler (use C version)
+ *              January, 2007
  *
  *-------------------------------------------------------------------------
  */
@@ -707,256 +724,257 @@ static void test_read_vl_string_attribute()
     SUBTEST("reading VL String as attributes");
 
     try {
-	// Open file
-	H5File file1(FILENAME, H5F_ACC_RDONLY);
-
-	// Create a datatype to refer to.
-	StrType vlst(0, H5T_VARIABLE);
-
-	// Open the root group and its attribute named ATTRSTR_NAME.
-	Group root = file1.openGroup("/");
-	Attribute att = root.openAttribute(ATTRSTR_NAME);
-
-	// Test reading "normal" sized string attribute
-	char *string_att_check;
-	att.read(vlst, &string_att_check);
-	if(HDstrcmp(string_att_check,ATTRSTR_DATA.c_str())!=0)
-	    TestErrPrintf("VL string attributes don't match!, string_att=%s, string_att_check=%s\n",ATTRSTR_DATA.c_str(),string_att_check);
-	HDfree(string_att_check);
-	att.close();
-
-	// Test reading "large" sized string attribute
-	att = root.openAttribute("test_scalar_large");
-	att.read(vlst, &string_att_check);
-	if(HDstrcmp(string_att_check,string_att_write)!=0)
-	    TestErrPrintf("VL string attributes don't match!, string_att_write=%s, string_att_check=%s\n",string_att_write,string_att_check);
-	HDfree(string_att_check);
-	HDfree(string_att_write);   // Free string allocated in test_write_vl_string_attribute
-
-	// Close objects and file.
-	att.close();
-	vlst.close();
-	root.close();
-	file1.close();
-
-	PASSED();
+        // Open file
+        H5File file1(FILENAME, H5F_ACC_RDONLY);
+
+        // Create a datatype to refer to.
+        StrType vlst(0, H5T_VARIABLE);
+
+        // Open the root group and its attribute named ATTRSTR_NAME.
+        Group root = file1.openGroup("/");
+        Attribute att = root.openAttribute(ATTRSTR_NAME);
+
+        // Test reading "normal" sized string attribute
+        char *string_att_check;
+        att.read(vlst, &string_att_check);
+        if(HDstrcmp(string_att_check,ATTRSTR_DATA.c_str())!=0)
+            TestErrPrintf("VL string attributes don't match!, string_att=%s, string_att_check=%s\n",ATTRSTR_DATA.c_str(),string_att_check);
+        HDfree(string_att_check);
+        att.close();
+
+        // Test reading "large" sized string attribute
+        att = root.openAttribute("test_scalar_large");
+        att.read(vlst, &string_att_check);
+        if(HDstrcmp(string_att_check,string_att_write)!=0)
+            TestErrPrintf("VL string attributes don't match!, string_att_write=%s, string_att_check=%s\n",string_att_write,string_att_check);
+        HDfree(string_att_check);
+        HDfree(string_att_write);   // Free string allocated in test_write_vl_string_attribute
+
+        // Close objects and file.
+        att.close();
+        vlst.close();
+        root.close();
+        file1.close();
+
+        PASSED();
     } // end try
 
     // Catch all exceptions.
-    catch (Exception E) {
-	issue_fail_msg("test_read_vl_string_attribute()", __LINE__, __FILE__, E.getCDetailMsg());
+    catch (Exception& E)
+    {
+        issue_fail_msg("test_read_vl_string_attribute()", __LINE__, __FILE__, E.getCDetailMsg());
     }
 } // test_read_vl_string_attribute
 #endif // 2013: need to verify before adding to test
 
 /*-------------------------------------------------------------------------
- * Function:	test_vlstring_array_attribute
+ * Function:    test_vlstring_array_attribute
  *
- * Purpose:	Test writing/reading VL string array to/from attributes.
+ * Purpose      Test writing/reading VL string array to/from attributes.
  *
- * Return:	None
+ * Return       None
  *
- * Programmer:	Binh-Minh Ribler
- *		July, 2009
+ * Programmer   Binh-Minh Ribler
+ *              July, 2009
  *
  *-------------------------------------------------------------------------
  */
 const H5std_string ATTRSTRARR_NAME("StringArray_attr");
 
-static void test_vlstring_array_attribute()
+static void
+test_vlstring_array_attribute()
 {
-    const char *string_att_array[SPACE1_DIM1]= {
-        "Line 1", "Line 2", "Line 3", "Line 4"
-        };   // Information to write
+    const char *string_att_array[SPACE1_DIM1] = {"Line 1", "Line 2", "Line 3",
+                                                 "Line 4"}; // Information to write
 
     // Output message about test being performed
     SUBTEST("VL String Array on Attributes");
 
     try {
-	// Open the file
-	H5File file1(FILENAME, H5F_ACC_RDWR);
+        // Open the file
+        H5File file1(FILENAME, H5F_ACC_RDWR);
 
-	// Create a datatype to refer to.
-	StrType vlst(0, H5T_VARIABLE);
+        // Create a datatype to refer to.
+        StrType vlst(0, H5T_VARIABLE);
 
-	// Open the root group.
-	Group root = file1.openGroup("/");
+        // Open the root group.
+        Group root = file1.openGroup("/");
 
         // Create dataspace for datasets.
-        hsize_t dims1[] = {SPACE1_DIM1};
+        hsize_t   dims1[] = {SPACE1_DIM1};
         DataSpace att_space(SPACE1_RANK, dims1);
 
-	// Create an attribute for the root group.
-	Attribute gr_attr = root.createAttribute(ATTRSTRARR_NAME, vlst, att_space);
+        // Create an attribute for the root group.
+        Attribute gr_attr = root.createAttribute(ATTRSTRARR_NAME, vlst, att_space);
 
-	// Write data to the attribute.
-	gr_attr.write(vlst, string_att_array);
+        // Write data to the attribute.
+        gr_attr.write(vlst, string_att_array);
 
-	// Read and verify the attribute string as a string of chars.
-	// Note: reading by array of H5std_string doesn't work yet.
-	char *string_att_check[SPACE1_DIM1];
-	gr_attr.read(vlst, &string_att_check);
+        // Read and verify the attribute string as a string of chars.
+        // Note: reading by array of H5std_string doesn't work yet.
+        char *string_att_check[SPACE1_DIM1];
+        gr_attr.read(vlst, &string_att_check);
 
-	hsize_t ii;
-	for (ii = 0; ii < SPACE1_DIM1; ii++)
-	{
-	    if(HDstrcmp(string_att_check[ii], string_att_array[ii])!=0)
-		TestErrPrintf("Line %d: Attribute data different: written=%s,read=%s\n",__LINE__, string_att_check[ii], string_att_check[ii]);
+        hsize_t ii;
+        for (ii = 0; ii < SPACE1_DIM1; ii++) {
+            if (HDstrcmp(string_att_check[ii], string_att_array[ii]) != 0)
+                TestErrPrintf("Line %d: Attribute data different: written=%s,read=%s\n", __LINE__,
+                              string_att_check[ii], string_att_check[ii]);
 
-	    HDfree(string_att_check[ii]);  // note: no need for std::string test
-	}
+            HDfree(string_att_check[ii]); // note: no need for std::string test
+        }
 
-	// Close group's attribute.
-	gr_attr.close();
-	file1.close();
+        // Close group's attribute.
+        gr_attr.close();
+        file1.close();
 
-	PASSED();
+        PASSED();
     } // end try block
 
     // Catch all exceptions.
-    catch (Exception E) {
-	issue_fail_msg("test_vlstring_array_attribute()", __LINE__, __FILE__, E.getCDetailMsg());
+    catch (Exception &E) {
+        issue_fail_msg("test_vlstring_array_attribute()", __LINE__, __FILE__, E.getCDetailMsg());
     }
-}   // test_vlstring_array_attribute()
+} // test_vlstring_array_attribute()
 
 /* Helper routine for test_vl_rewrite() */
-static void write_scalar_dset(H5File& file, DataType& type, DataSpace& space,
-				char *name, char *data)
+static void
+write_scalar_dset(H5File &file, DataType &type, DataSpace &space, char *name, char *data)
 {
     DataSet dset;
     try {
-	dset = file.createDataSet(name, type, space);
-	dset.write(&data, type, space, space);
-	dset.close();
+        dset = file.createDataSet(name, type, space);
+        dset.write(&data, type, space, space);
+        dset.close();
     } // end try
-    catch (FileIException ferr) {
-	throw;
+    catch (FileIException &ferr) {
+        throw;
     }
-    catch (DataSetIException derr) {
-	throw;
+    catch (DataSetIException &derr) {
+        throw;
     }
 }
 
 /* Helper routine for test_vl_rewrite() */
-static void read_scalar_dset(H5File& file, DataType& type, DataSpace& space,
-				char *name, char *data)
+static void
+read_scalar_dset(H5File &file, DataType &type, DataSpace &space, char *name, char *data)
 {
-    char *data_read;
+    char   *data_read;
     DataSet dset;
     try {
-	dset = file.openDataSet(name);
-	dset.read(&data_read, type, space, space);
-	dset.close();
+        dset = file.openDataSet(name);
+        dset.read(&data_read, type, space, space);
+        dset.close();
 
-	if(HDstrcmp(data, data_read))
-	    TestErrPrintf("Expected %s for dataset %s but read %s\n", data, name, data_read);
+        if (HDstrcmp(data, data_read) != 0)
+            TestErrPrintf("Expected %s for dataset %s but read %s\n", data, name, data_read);
 
-	HDfree(data_read);
+        HDfree(data_read);
     } // end try
-    catch (FileIException ferr) {
-	throw;
+    catch (FileIException &ferr) {
+        throw;
     }
-    catch (DataSetIException derr) {
-	throw;
+    catch (DataSetIException &derr) {
+        throw;
     }
 }
 
 /*-------------------------------------------------------------------------
- * Function:	test_vl_rewrite
+ * Function:    test_vl_rewrite
  *
- * Purpose:	Test I/O on VL strings when many objects in the file
- *		have been linked/unlinked.
+ * Purpose      Test I/O on VL strings when many objects in the file
+ *              have been linked/unlinked.
  *
- * Return:	None
+ * Return       None
  *
- * Programmer:	Binh-Minh Ribler (use C version)
- *		January, 2007
+ * Programmer   Binh-Minh Ribler (use C version)
+ *              January, 2007
  *
  *-------------------------------------------------------------------------
  */
 const H5std_string FILENAME2("tvlstr2.h5");
-const int REWRITE_NDATASETS = 32;
-static void test_vl_rewrite()
+const int          REWRITE_NDATASETS = 32;
+
+static void
+test_vl_rewrite()
 {
     // Output message about test being performed
     SUBTEST("I/O on VL strings with link/unlink");
 
     try {
-	// Create the files.
-	H5File file1(FILENAME, H5F_ACC_TRUNC);
-	H5File file2(FILENAME2, H5F_ACC_TRUNC);
-
-	// Create the VL string datatype.
-	StrType type(0, H5T_VARIABLE);
-
-	// Create dataspace for the attribute.
-	DataSpace space (H5S_SCALAR);
-
-	// Create in file 1.
-	int i;
-	char name[256]; 	// Buffer for names & data
-	for (i=0; i<REWRITE_NDATASETS; i++) {
-	    sprintf(name, "/set_%d", i);
-	    write_scalar_dset(file1, type, space, name, name);
-	}
-
-	// Effectively copy data from file 1 to 2.
-	for (i=0; i<REWRITE_NDATASETS; i++) {
-	    sprintf(name, "/set_%d", i);
-	    read_scalar_dset(file1, type, space, name, name);
-	    write_scalar_dset(file2, type, space, name, name);
-	}
-
-	// Read back from file 2.
-	for (i=0; i<REWRITE_NDATASETS; i++) {
-	    sprintf(name, "/set_%d", i);
-	    read_scalar_dset(file2, type, space, name, name);
-	}
-
-	// Remove from file 2.
-	for (i=0; i<REWRITE_NDATASETS; i++) {
-	    sprintf(name, "/set_%d", i);
-	    file2.unlink(name);
-	}
-
-	// Effectively copy from file 1 to file 2.
-	for (i=0; i<REWRITE_NDATASETS; i++) {
-	    sprintf(name, "/set_%d", i);
-	    read_scalar_dset(file1, type, space, name, name);
-	    write_scalar_dset(file2, type, space, name, name);
-	}
-
-	// Close objects and file.
-	type.close();
-	space.close();
-	file1.close();
-	file2.close();
-
-	PASSED();
+        // Create the files.
+        H5File file1(FILENAME, H5F_ACC_TRUNC);
+        H5File file2(FILENAME2, H5F_ACC_TRUNC);
+
+        // Create the VL string datatype.
+        StrType type(0, H5T_VARIABLE);
+
+        // Create dataspace for the attribute.
+        DataSpace space(H5S_SCALAR);
+
+        // Create in file 1.
+        int  i;
+        char name[256]; // Buffer for names & data
+        for (i = 0; i < REWRITE_NDATASETS; i++) {
+            snprintf(name, sizeof(name), "/set_%d", i);
+            write_scalar_dset(file1, type, space, name, name);
+        }
+
+        // Effectively copy data from file 1 to 2.
+        for (i = 0; i < REWRITE_NDATASETS; i++) {
+            snprintf(name, sizeof(name), "/set_%d", i);
+            read_scalar_dset(file1, type, space, name, name);
+            write_scalar_dset(file2, type, space, name, name);
+        }
+
+        // Read back from file 2.
+        for (i = 0; i < REWRITE_NDATASETS; i++) {
+            snprintf(name, sizeof(name), "/set_%d", i);
+            read_scalar_dset(file2, type, space, name, name);
+        }
+
+        // Remove from file 2.
+        for (i = 0; i < REWRITE_NDATASETS; i++) {
+            snprintf(name, sizeof(name), "/set_%d", i);
+            file2.unlink(name);
+        }
+
+        // Effectively copy from file 1 to file 2.
+        for (i = 0; i < REWRITE_NDATASETS; i++) {
+            snprintf(name, sizeof(name), "/set_%d", i);
+            read_scalar_dset(file1, type, space, name, name);
+            write_scalar_dset(file2, type, space, name, name);
+        }
+
+        // Close objects and file.
+        type.close();
+        space.close();
+        file1.close();
+        file2.close();
+
+        PASSED();
     } // end try
 
     // Catch all exceptions.
-    catch (Exception E) {
-	issue_fail_msg("test_vl_rewrite()", __LINE__, __FILE__, E.getCDetailMsg());
+    catch (Exception &E) {
+        issue_fail_msg("test_vl_rewrite()", __LINE__, __FILE__, E.getCDetailMsg());
     }
 } // end test_vl_rewrite()
 
 /*-------------------------------------------------------------------------
- * Function:	test_vlstrings
+ * Function:    test_vlstrings
  *
- * Purpose:	VL string testing main routine.
+ * Purpose      VL string testing main routine.
  *
- * Return:	None
+ * Return       None
  *
- * Programmer:	Binh-Minh Ribler
- *		January, 2007
+ * Programmer   Binh-Minh Ribler
+ *              January, 2007
  *
  *-------------------------------------------------------------------------
  */
-#ifdef __cplusplus
-extern "C"
-#endif
-void test_vlstrings()
+extern "C" void
+test_vlstrings()
 {
     // Output message about test being performed
     MESSAGE(5, ("Testing Variable-Length Strings"));
@@ -978,29 +996,19 @@ void test_vlstrings()
     // Test writing VL datasets in files with lots of unlinking
     test_vl_rewrite();
 
-}   // test_vlstrings()
+} // test_vlstrings()
 
-
 /*-------------------------------------------------------------------------
- * Function:	cleanup_vlstrings
+ * Function:    cleanup_vlstrings
  *
- * Purpose:	Cleanup temporary test files
- *
- * Return:	none
- *
- * Programmer:	Quincey Koziol
- *              September 10, 1999
- *
- * Modifications:
+ * Purpose      Cleanup temporary test files
  *
+ * Return       none
  *-------------------------------------------------------------------------
  */
-#ifdef __cplusplus
-extern "C"
-#endif
-void cleanup_vlstrings()
+extern "C" void
+cleanup_vlstrings()
 {
     HDremove(FILENAME.c_str());
     HDremove(FILENAME2.c_str());
 }
-
diff --git a/config/BlankForm b/config/BlankForm
index 31116bf..55a3b49 100644
--- a/config/BlankForm
+++ b/config/BlankForm
@@ -1,17 +1,14 @@
-#							-*- shell-script -*-
+# -*- shell-script -*-
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 
 
 # This file is part of the HDF5 build script.  It is processed shortly
@@ -54,39 +51,39 @@ fi
 # Flags that end with `_CPPFLAGS' are passed to the compiler when
 # compiling but not when linking.
 #
-# DEBUG_CFLAGS		Flags to pass to the compiler to create a
-# DEBUG_CPPFLAGS	library suitable for use with debugging
-#			tools. Usually this list will exclude
-#			optimization switches (like `-O') and include
-#			switches that turn on symbolic debugging
-#			support (like `-g').
+# DEBUG_CFLAGS          Flags to pass to the compiler to create a
+# DEBUG_CPPFLAGS        library suitable for use with debugging
+#                       tools. Usually this list will exclude
+#                       optimization switches (like `-O') and include
+#                       switches that turn on symbolic debugging
+#                       support (like `-g').
 #
-# PROD_CFLAGS		Flags to pass to the compiler to create a
-# PROD_CPPFLAGS		production version of the library.  These
-#			usualy exclude symbolic debugging switches
-#			(like `-g') and include optimization switches
-#			(like `-O').
+# PROD_CFLAGS           Flags to pass to the compiler to create a
+# PROD_CPPFLAGS         production version of the library.  These
+#                       usually exclude symbolic debugging switches
+#                       (like `-g') and include optimization switches
+#                       (like `-O').
 #
-# PROFILE_CFLAGS	Flags to pass to the compiler to create a
-# PROFILE_CPPFLAGS	library suitable for performance testing (like 
-# 			`-pg').  This may or may not include debugging 
-# 			or production flags.
-#			
-# H5_CFLAGS		Flags can be added to this variable which
-#			might already be partially initialized.  These 
-#			flags will always be passed to the compiler
-#			and should include switches to turn on full
-#			warnings.  HDF5 attempts to be ANSI and Posix
-#			compliant and employ good programming
-#			practices resulting in few if any
-#			warnings.
+# PROFILE_CFLAGS        Flags to pass to the compiler to create a
+# PROFILE_CPPFLAGS      library suitable for performance testing (like 
+#                       `-pg').  This may or may not include debugging 
+#                       or production flags.
 #
-#			Warning flags do not have to be added to H5_CFLAGS
-#			variable if the compiler is the GNU gcc
-#			compiler or a descendent of gcc such as EGCS or PGCC.
+# H5_CFLAGS             Flags can be added to this variable which
+#                       might already be partially initialized.  These 
+#                       flags will always be passed to the compiler
+#                       and should include switches to turn on full
+#                       warnings.  HDF5 attempts to be ANSI and Posix
+#                       compliant and employ good programming
+#                       practices resulting in few if any
+#                       warnings.
+#
+#                       Warning flags do not have to be added to H5_CFLAGS
+#                       variable if the compiler is the GNU gcc
+#                       compiler or a descendent of gcc such as EGCS or PGCC.
 #
 # AM_CFLAGS             Flags added directly into this variable will
-#                       be propogated to the compiler wrapper scripts (h5cc,
+#                       be propagated to the compiler wrapper scripts (h5cc,
 #                       h5c++, et cetera) in addition to being used to compile 
 #                       the library.
 #
@@ -99,24 +96,24 @@ fi
 
 case $CC_BASENAME in
     gcc)
-	H5_CFLAGS="$H5_CFLAGS -Wsign-compare" #Only works for some versions
-	DEBUG_CFLAGS="-g -fverbose-asm"
-	DEBUG_CPPFLAGS=
-	PROD_CFLAGS="-O3 -fomit-frame-pointer"
-	PROD_CPPFLAGS=
-	PROFILE_CFLAGS="-pg"
-	PROFILE_CPPFLAGS=
-	;;
+        H5_CFLAGS="$H5_CFLAGS -Wsign-compare" #Only works for some versions
+        DEBUG_CFLAGS="-g -fverbose-asm"
+        DEBUG_CPPFLAGS=
+        PROD_CFLAGS="-O3 -fomit-frame-pointer"
+        PROD_CPPFLAGS=
+        PROFILE_CFLAGS="-pg"
+        PROFILE_CPPFLAGS=
+        ;;
 
     *)
-	H5_CFLAGS="$H5_CFLAGS -ansi"
-	DEBUG_CFLAGS="-g"
-	DEBUG_CPPFLAGS=
-	PROD_CFLAGS="-O"
-	PROD_CPPFLAGS=
-	PROFILE_CFLAGS="-pg"
-	PROFILE_CPPFLAGS=
-	;;
+        H5_CFLAGS="$H5_CFLAGS -ansi"
+        DEBUG_CFLAGS="-g"
+        DEBUG_CPPFLAGS=
+        PROD_CFLAGS="-O"
+        PROD_CPPFLAGS=
+        PROFILE_CFLAGS="-pg"
+        PROFILE_CPPFLAGS=
+        ;;
 esac
 
 
diff --git a/config/COPYING b/config/COPYING
deleted file mode 100644
index 6903daf..0000000
--- a/config/COPYING
+++ /dev/null
@@ -1,16 +0,0 @@
-
-  Copyright by  The HDF Group and 
-                The Board of Trustees of the University of Illinois. 
-  All rights reserved. 
-
-  The files and subdirectories in this directory are part of HDF5.  
-  The full HDF5 copyright notice, including terms governing use, 
-  modification, and redistribution, is contained in the files COPYING 
-  and Copyright.html.  COPYING can be found at the root of the source 
-  code distribution tree; Copyright.html can be found at the root 
-  level of an installed copy of the electronic HDF5 document set and 
-  is linked from the top-level documents page.  It can also be found 
-  at http://www.hdfgroup.org/HDF5/doc/Copyright.html.  If you do not 
-  have access to either file, you may request a copy from 
-  help@hdfgroup.org. 
-
diff --git a/config/Makefile.am.blank b/config/Makefile.am.blank
index a54c734..18afb60 100644
--- a/config/Makefile.am.blank
+++ b/config/Makefile.am.blank
@@ -1,16 +1,13 @@
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 
 ##
 ## Makefile.am
diff --git a/config/README.md b/config/README.md
new file mode 100644
index 0000000..8459b77
--- /dev/null
+++ b/config/README.md
@@ -0,0 +1,88 @@
+# The `config` directory
+
+## Intro
+
+HDF5 can be configured using both the GNU Autotools and CMake. We try to keep
+them in sync, but you can expect minor differences to crop up. Please create
+a GitHub issue for any differences noted. Note that with the Autotools, we
+do NOT check generated files into GitHub until release time, so you will
+need to generate `configure`, `Makefile.in`(s), etc. via `autogen.sh` in the
+project root if you want to build with that system.
+
+Configuration information for the HDF5 library and tools is (unfortunately)
+spread across the repository. Basic library configuration will generally
+be found in `configure.ac` (Autotools) and the root's `CMakeLists.txt` (CMake).
+Each subdirectory of the project also has its own `Makefile.am` or CMake build
+and test files.
+
+This directory contains a few important things:
+
+* Autotools OS- and compiler-specific configuration
+* CMake support files (in `cmake`)
+* Warning files shared between the two systems (in `*-warnings` directories)
+* CMake toolchain files (in `toolchain`)
+* CMake sanitizer files (in `sanitizer`)
+
+CMake will be documented elsewhere. This document focuses on the Autotools files
+and the shared warning files.
+
+## Autotools
+
+An Autotools build will first use `$host_cpu`, `$host_os`, etc. to try to find a
+suitable platform file in `config` to source and start checking compilers. The
+code that does this is in `configure.ac` (search for `host_os`). For example,
+MacOS will source the `apple` file and FreeBSD will source the `freebsd` file.
+There are a bunch of Linux files, but they all eventually invoke
+`linux-gnulibc1`.
+
+If you dig into one of these files, the way that they check for compilers is
+rather crude. Each OS script will simply source the various C, C++, and
+Fortran compiler files that are listed inside. Each compiler file checks
+the designated compiler's version output to see if there's a match, and if so,
+the flag processing proceeds, and a variable like `cc_flags_set` will be set
+at the end.
+
+In case it's not obvious, the C files end in `-flags`, C++ in `-cxxflags`, and
+Fortran in `-fflags`.
+
+When a compiler matches, the script will attempt to set the `CFLAGS`, etc.
+variables based on the platform and compiler's properties. There are typically
+a large number of flag categories (e.g., `DEBUG_OPT_CFLAGS`) that are
+conditionally appended to the canonical variables, like `AM_FLAGS`, by the
+remainder of the `configure` script.
+
+For the major compilers, like Clang and gcc, there will be a section at the
+end where we append version-specific flags, mainly for warnings. These are
+imported via a function in the script (`load_gnu_arguments()` for gcc). See
+below for more detail.
+
+## Warnings files
+
+Keeping the Autotools and CMake build files in sync has always been a bit of a
+struggle. One way that we help to ensure that the same flags are used in each
+build system is to import the warnings settings from text files that are
+maintained separately from the Autotools and CMake build files. We like to
+configure the compiler to be as crabby as possible so as to catch subtle bugs,
+so there are a LOT of warning flags for popular compilers like Clang and gcc.
+
+We've located these files in `config/*-warnings` directories. Each file
+represents a compiler version and contains the warning flags we set, one to a
+line. Lines that start with `#` are considered comment lines. You'll also see
+`developer` and `no-developer` flavors of compiler version files. The former
+corresponds to "developer flags" that are usually either only semi-useful and/or
+generate a lot of (usually unfixable) noise. The latter corresponds to things
+that we want to ensure do NOT appear in non-developer builds of the library.
+These might involve a different level setting (`-Wfoo=x`) or something that
+gets incorporated in a "conglomerate" flag like `-Wextra` so we need to set
+`-Wno-foo` in non-developer builds. Developer warnings can be turned on
+via a configure option. You will also sometimes see `error` files. Those are
+files that include warnings that will be considered errors if you have enabled
+the "warnings as errors" configure option set. Now that the library is largely
+warning-free, these are less useful than in the past as you can now just set
+-Werror directly in many cases (our configure script is smart about not running
+configure checks with -Werror).
+
+For anyone interested, we are always interested in improving both the OS and
+compiler files, so pull requests for those are always welcome, especially for
+platforms we don't have routine access to. If you are a compiler or platform
+expert/aficionado, please help us out!
diff --git a/config/apple b/config/apple
index 5203695..a8a219b 100644
--- a/config/apple
+++ b/config/apple
@@ -1,17 +1,14 @@
 #							-*- shell-script -*-
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 
 
 # This file is part of the HDF5 build script.  It is processed shortly
@@ -24,57 +21,60 @@
 # No support for OS older than darwin 10.X.
 if test "X-" = "X-$CC"; then
     case "$host_os" in
-	darwin10.*)	# Snow Leopard. Use gcc/g++ because clang++ is not available.
-	    CC=gcc
-	    CC_BASENAME=gcc
-	    ;;
-	*)
-	    CC=clang
-	    CC_BASENAME=clang
-
-	    # Production
-	    PROD_CFLAGS="-O3" 
-	    PROD_CPPFLAGS=
-
-	    # Debug
-	    DEBUG_CFLAGS="-g -O0"
-	    DEBUG_CPPFLAGS=
-
-	    # Profile
-	    # Use this for profiling with gprof
-	    # Just "-g" for now. More later.
-	    PROFILE_CFLAGS="-g"
-	    PROFILE_CPPFLAGS=
-	    ;;
+        darwin10.*)	# Snow Leopard. Use gcc/g++ because clang++ is not available.
+            CC=gcc
+            CC_BASENAME=gcc
+            ;;
+        *)
+            if test "X-$enable_parallel" = "X-yes"; then
+                # default to use mpicc which is the defacto MPI compiler name
+                CC=mpicc
+                CC_BASENAME=mpicc
+            else
+                CC=clang
+                CC_BASENAME=clang
+            fi
+
+            # Production
+            PROD_CFLAGS="-O3" 
+            PROD_CPPFLAGS=
+
+            # Debug
+            DEBUG_CFLAGS="-g -O0"
+            DEBUG_CPPFLAGS=
+
+            # Profile
+            # Use this for profiling with gprof
+            # Just "-g" for now. More later.
+            PROFILE_CFLAGS="-g"
+            PROFILE_CPPFLAGS=
+            ;;
     esac
 fi
 
-# Figure out compiler flags
+# Figure out C compiler flags
 . $srcdir/config/gnu-flags
+. $srcdir/config/clang-flags
+. $srcdir/config/intel-flags
+
 # temp patch: if GCC 4.2.1 is used in Lion or Mountain Lion systems, do not
 # use -O option as it causes failures in test/dt_arith.
 case "$host_os" in
     darwin1[12].*)   # lion & mountain lion
-	#echo cc_vendor=$cc_vendor'-'cc_version=$cc_version
-	case "$cc_vendor-$cc_version" in
-	    gcc-4.2.1)
-		# Remove any -O flags
-		#echo PROD_CFLAGS=$PROD_CFLAGS
-		PROD_CFLAGS="`echo $PROD_CFLAGS | sed -e 's/-O[0-3]*//'`"
-		#echo new PROD_CFLAGS=$PROD_CFLAGS
-		;;
-	esac
-	;;
+        #echo cc_vendor=$cc_vendor'-'cc_version=$cc_version
+        case "$cc_vendor-$cc_version" in
+            gcc-4.2.1)
+                # Remove any -O flags
+                #echo PROD_CFLAGS=$PROD_CFLAGS
+                PROD_CFLAGS="`echo $PROD_CFLAGS | sed -e 's/-O[0-3]*//'`"
+                #echo new PROD_CFLAGS=$PROD_CFLAGS
+                ;;
+        esac
+        ;;
 esac
- 
-. $srcdir/config/intel-flags
+
 if test "X-" = "X-$FC"; then
     case $CC_BASENAME in
-        clang)
-	    # clang has no fortran compiler. Use gfortran.
-            FC=gfortran
-            FC_BASENAME=gfortran
-            ;;
         gcc*)
             FC=gfortran
             FC_BASENAME=gfortran
@@ -83,15 +83,26 @@ if test "X-" = "X-$FC"; then
             FC=ifort
             FC_BASENAME=ifort
             ;;
+        mpicc*)
+            FC=mpif90
+            FC_BASENAME=mpif90
+            ;;
+        clang)
+            # clang has no fortran compiler. Use gfortran.
+            FC=gfortran
+            FC_BASENAME=gfortran
+            ;;
     esac
 fi
 
+# Figure out FORTRAN compiler flags
+. $srcdir/config/gnu-fflags
+. $srcdir/config/intel-fflags
+
+
+# The default C++ compiler is `clang++'.
 if test "X-" = "X-$CXX"; then
     case $CC_BASENAME in
-        clang)
-            CXX=clang++
-            CXX_BASENAME=clang++
-            ;;
         gcc)
             CXX=g++
             CXX_BASENAME=g++
@@ -100,18 +111,21 @@ if test "X-" = "X-$CXX"; then
             CXX=icpc
             CXX_BASENAME=icpc
             ;;
+        mpicc*)
+            FC=mpif90
+            FC_BASENAME=mpif90
+            ;;
+        clang)
+            CXX=clang++
+            CXX_BASENAME=clang++
+            ;;
     esac
 fi
 
-case $CXX_BASENAME in
-    clang++)
-	PROD_CXXFLAGS="-O3"
-	DEBUG_CXXFLAGS="-g -O0"
-	# Use this for profiling with gprof
-	# Just "-g" for now. More later.
-	PROFILE_CXXFLAGS="-g"
-	;;
-esac
+# Figure out C++ compiler flags
+. $srcdir/config/intel-cxxflags # Do this ahead of GNU to avoid icpc being detected as g++
+. $srcdir/config/gnu-cxxflags
+. $srcdir/config/clang-cxxflags
 
 # compiler version strings
 case $CC in
@@ -134,16 +148,15 @@ case $CC in
         echo "No match to get cc_version_info for $CC"
         ;;
 esac
+
 # Figure out Fortran compiler flags and version strings
 case $FC in
     *gfortran*)
-        . $srcdir/config/gnu-fflags
         fc_version_info=`$FC $FCFLAGS $H5_FCFLAGS --version 2>&1 |\
             grep 'GCC' | sed 's/\(.*(GCC) [-a-z0-9\. ]*\).*/\1/'`
         ;;
 
     *ifc*|*ifort*)
-        . $srcdir/config/intel-fflags
         fc_version_info=`$FC $FCFLAGS $H5_FCFLAGS -V 2>&1 | grep 'Version' |\
             sed 's/\(Intel.* Compiler\).*\( Version [a-z0-9\.]*\).*\( Build [0-9]*\)/\1\2\3/'`
         ;;
diff --git a/config/cce-fflags b/config/cce-fflags
new file mode 100644
index 0000000..813d4c7
--- /dev/null
+++ b/config/cce-fflags
@@ -0,0 +1,80 @@
+#							-*- shell-script -*-
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+
+
+# This file should be sourced into configure if the compiler is the
+# Cray Compiling Environment (CCE) compiler or a derivative.  It is careful not to do anything
+# if the compiler is not Cray; otherwise `cc_flags_set' is set to `yes'
+#
+
+# Get the compiler version in a way that works for cce
+# unless a compiler version is already known
+#
+#   cc_vendor:    The compiler name: Cray
+#   cc_version:   Version number: 8.3.0
+#
+if test X = "X$f9x_flags_set"; then
+    f9x_version="`$FC $FCFLAGS $H5_FCFLAGS -V 2>&1 |grep 'Cray'`"
+    if test X != "X$f9x_version"; then
+        f9x_vendor=cce
+        f9x_version=`echo $f9x_version |sed 's/.*Version \([-a-z0-9\.\-]*\).*/\1/'`
+        echo "compiler '$FC' is Cray $f9x_vendor-$f9x_version"
+	fc_version_info=$f9x_version
+    fi
+fi
+
+# Common Cray flags for various situations
+if test "X-cce" = "X-$f9x_vendor"; then
+    # Insert section about version specific problems from compiler flags here,
+    # if necessary.
+
+    arch=
+    # Architecture-specific flags
+    # Nothing currently. (Uncomment code below and modify to add any)
+    #case "$host_os-$host_cpu" in
+    #    *-i686)
+    #        arch="-march=i686"
+    #        ;;
+    #esac
+
+    # General
+    H5_FCFLAGS="${H5_FCFLAGS} -hnocaf"
+
+    # Production
+    PROD_FCFLAGS=
+
+    # Debug
+    DEBUG_FCFLAGS=
+
+    # Symbols
+    # -Wl,-s to remove all symbols for smaller file
+    SYMBOLS_FCFLAGS="-g"
+    NO_SYMBOLS_FCFLAGS="-Wl,-s"
+
+    # Profiling
+    # Use this for profiling with gprof
+    PROFILE_FCFLAGS="-p"
+
+    # Optimization
+    HIGH_OPT_FCFLAGS="-O3"
+    DEBUG_OPT_FCFLAGS="-O0"
+    NO_OPT_FCFLAGS="-O0"
+
+    # Flags are set
+    f9x_flags_set=yes
+fi
+
+# Clear f9x info if no flags set
+if test "X-$f9x_flags_set" = "X-"; then
+    f9x_vendor=
+    f9x_version=
+fi
diff --git a/config/cce-flags b/config/cce-flags
new file mode 100644
index 0000000..0903dec
--- /dev/null
+++ b/config/cce-flags
@@ -0,0 +1,85 @@
+#							-*- shell-script -*-
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+
+
+# This file should be sourced into configure if the compiler is the
+# Cray Compiling Environment (CCE) compiler or a derivative.  It is careful not to do anything
+# if the compiler is not Cray; otherwise `cc_flags_set' is set to `yes'
+#
+
+# Get the compiler version in a way that works for cce
+# unless a compiler version is already known
+#
+#   cc_vendor:    The compiler name: Cray
+#   cc_version:   Version number: 8.3.0
+#
+if test X = "X$cc_flags_set"; then
+    cc_version="`$CC $CFLAGS $H5_CFLAGS -V 2>&1 |grep 'Cray'`"
+    if test X != "X$cc_version"; then
+        cc_vendor=cce
+        cc_version=`echo $cc_version |sed 's/.*Version \([-a-z0-9\.\-]*\).*/\1/'`
+        echo "compiler '$CC' is Cray $cc_vendor-$cc_version"
+	cc_version_info=$cc_version
+	cxx_version_info=$cc_version
+    fi
+fi
+
+# Common Cray flags for various situations
+if test "X-cce" = "X-$cc_vendor"; then
+    # Insert section about version specific problems from compiler flags here,
+    # if necessary.
+
+    arch=
+    # Architecture-specific flags
+    # Nothing currently. (Uncomment code below and modify to add any)
+    #case "$host_os-$host_cpu" in
+    #    *-i686)
+    #        arch="-march=i686"
+    #        ;;
+    #esac
+
+    # General
+    # Default to C99 standard.
+    H5_CFLAGS="${H5_CFLAGS:--hc99 $arch}"
+
+    # Production
+    PROD_CFLAGS=
+
+    # Debug
+    # NDEBUG is handled explicitly in configure
+    DEBUG_CFLAGS=
+
+    # Symbols
+    # -Wl,-s to remove all symbols for smaller file
+    SYMBOLS_CFLAGS="-g"
+    NO_SYMBOLS_CFLAGS="-Wl,-s"
+
+    # Profiling
+    # Use this for profiling with gprof
+    PROFILE_CFLAGS="-p"
+
+    # Optimization
+    HIGH_OPT_CFLAGS="-O3"
+    DEBUG_OPT_CFLAGS="-O0"
+    NO_OPT_CFLAGS="-O0"
+
+    # Flags are set
+    cc_flags_set=yes
+
+fi
+
+# Clear cc info if no flags set
+if test "X-$cc_flags_set" = "X-"; then
+    cc_vendor=
+    cc_version=
+fi
+
diff --git a/config/clang-cxxflags b/config/clang-cxxflags
new file mode 100644
index 0000000..ead3152
--- /dev/null
+++ b/config/clang-cxxflags
@@ -0,0 +1,187 @@
+#                            -*- shell-script -*-
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+
+
+# This file should be sourced into configure if the compiler is the
+# Clang clang++ compiler or a derivative.  It is careful not to do anything
+# if the compiler is not Clang; otherwise 'cxx_flags_set' is set to 'yes'
+#
+
+#
+# For now, do not promote any warnings to errors.
+#
+WARNINGS_AS_ERRORS_DFLT=no
+
+#
+# This filter rewrites -Werror= as -W, in that way demoting warnings
+# promoted to errors back to warnings, if WARNINGS_AS_ERRORS is no.
+#
+demote_errors()
+{
+    if [ ${WARNINGS_AS_ERRORS:-${WARNINGS_AS_ERRORS_DFLT}} = no ]; then
+        sed 's,-Werror=,-W,g'
+    else
+        cat
+    fi
+}
+
+#
+# Prepend `$srcdir/config/clang-warnings/` to the filename suffix(es) given as
+# subroutine argument(s), remove comments starting with # and ending
+# at EOL, replace spans of whitespace (including newlines) with spaces,
+# and re-emit the file(s) thus filtered on the standard output stream.
+#
+load_clang_arguments()
+{
+    set -- $(for arg; do
+        sed 's,#.*$,,' $srcdir/config/clang-warnings/${arg} | demote_errors
+    done)
+    IFS=' ' echo "$*"
+}
+# Get the compiler version in a way that works for clang++
+# unless a compiler version is already known
+#
+#   cxx_vendor:    The compiler name: clang++
+#   cxx_version:   Version number: 6.0.0, 7.3.0, ... 10.0.1
+#
+if test "X-" = "X-$cxx_flags_set"; then
+    # clang++ -v will return version number following "clang" on Linux machines,
+    # but on Macs the version number will follow "Apple LLVM version"
+    cxx_version="`$CXX $CXXFLAGS $H5_CXXFLAGS -v 2>&1 |\
+        grep 'clang version' | sed 's/.*clang version \([-a-z0-9\.]*\).*/\1/'`"
+    if test -n "$cxx_version"; then
+        cxx_vendor="clang"
+    else
+        cxx_version="`$CXX $CXXFLAGS $H5_CXXFLAGS -v 2>&1 |\
+            grep 'Apple LLVM version' | sed 's/.*Apple LLVM version \([-a-z0-9\.]*\).*/\1/'`"
+        if test -n "$cxx_version"; then
+            cxx_vendor="Apple LLVM"
+        fi
+    fi
+    if test "X-" != "X-$cxx_version"; then
+
+        # Get the compiler version numbers
+        cxx_vers_major=`echo $cxx_version | cut -f1 -d.`
+        cxx_vers_minor=`echo $cxx_version | cut -f2 -d.`
+        cxx_vers_patch=`echo $cxx_version | cut -f3 -d.`
+        test -n "$cxx_vers_major" || cxx_vers_major=0
+        test -n "$cxx_vers_minor" || cxx_vers_minor=0
+        test -n "$cxx_vers_patch" || cxx_vers_patch=0
+    fi
+fi
+
+if test "X-clang" = "X-$cxx_vendor" -o "X-Apple LLVM" = "X-$cxx_vendor"; then
+    echo "compiler '$CXX' is $cxx_vendor-$cxx_version"
+    ###############################
+    # Architecture-specific flags #
+    ###############################
+
+    arch=
+    case "$host_os-$host_cpu" in
+        # FreeBSD sets the information from "uname -m" to the general machine
+        # architecture, not the specific CPU for the machine, so even our
+        # Pentium II Xeon server is set to "i386".  Once we know we are on a FreeBSD
+        # machine, use the "sysctl" command to get the CPU hardware model.
+        freebsd*-i386)
+            host_cpu_model=`sysctl -n hw.model`
+            case "$host_cpu_model" in
+                # Hmm.. this might not catch Celerons, but it won't hurt them either...
+                *Pro*|*II*|*III*|*IV*|*Athlon*)
+                    # architecture-specific optimizations cause problems
+                    # for some users who build binaries to be used on
+                    # multiple architectures.
+                    # arch="-march=i686"
+                ;;
+            esac
+            ;;
+
+        *-i686)
+                    # architecture-specific optimizations cause problems
+                    # for some users who build binaries to be used on
+                    # multiple architectures.
+                    # arch="-march=i686"
+            ;;
+    esac
+
+    H5_CXXFLAGS="$H5_CXXFLAGS $arch -std=c++11"
+
+    ##############
+    # Production #
+    ##############
+
+    # NDEBUG is handled explicitly by the configure script
+    PROD_CXXFLAGS=
+
+    #########
+    # Debug #
+    #########
+
+    # NDEBUG is handled explicitly by the configure script
+    # -g is handled by the symbols flags
+    DEBUG_CXXFLAGS="-ftrapv -fno-common"
+
+    ###########
+    # Symbols #
+    ###########
+
+    NO_SYMBOLS_CXXFLAGS=
+    SYMBOLS_CXXFLAGS="-g -fno-omit-frame-pointer"
+
+    #############
+    # Profiling #
+    #############
+
+    PROFILE_CXXFLAGS="-pg"
+
+    ################
+    # Optimization #
+    ################
+
+    HIGH_OPT_CXXFLAGS="-O3"
+    DEBUG_OPT_CXXFLAGS="-g"
+    NO_OPT_CXXFLAGS="-O0"
+
+    ############
+    # Warnings #
+    ############
+
+    ###########
+    # General #
+    ###########
+
+    H5_CXXFLAGS="$H5_CXXFLAGS $(load_clang_arguments general)"
+    H5_ECXXFLAGS="$H5_ECXXFLAGS $(load_clang_arguments error-general)"
+
+    ######################
+    # Developer warnings #
+    ######################
+
+    NO_DEVELOPER_WARNING_CXXFLAGS=$(load_clang_arguments no-developer-general)
+    DEVELOPER_WARNING_CXXFLAGS=$(load_clang_arguments developer-general)
+
+    #############################
+    # Version-specific warnings #
+    #############################
+
+
+    #################
+    # Flags are set #
+    #################
+    cxx_flags_set=yes
+fi
+
+# Clear cxx info if no flags set
+if test "X$cxx_flags_set" = "X"; then
+    cxx_vendor=
+    cxx_version=
+fi
+
diff --git a/config/clang-flags b/config/clang-flags
new file mode 100644
index 0000000..844d6af
--- /dev/null
+++ b/config/clang-flags
@@ -0,0 +1,209 @@
+#                            -*- shell-script -*-
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+
+
+# This file should be sourced into configure if the compiler is the
+# Clang compiler or a derivative.  It is careful not to do anything
+# if the compiler is not Clang; otherwise 'cc_flags_set' is set to 'yes'
+#
+
+#
+# For now, do not promote any warnings to errors.
+#
+WARNINGS_AS_ERRORS_DFLT=no
+
+#
+# This filter rewrites -Werror= as -W, in that way demoting warnings
+# promoted to errors back to warnings, if WARNINGS_AS_ERRORS is no.
+#
+demote_errors()
+{
+    if [ ${WARNINGS_AS_ERRORS:-${WARNINGS_AS_ERRORS_DFLT}} = no ]; then
+        sed 's,-Werror=,-W,g'
+    else
+        cat
+    fi
+}
+
+#
+# Prepend `$srcdir/config/clang-warnings/` to the filename suffix(es) given as
+# subroutine argument(s), remove comments starting with # and ending
+# at EOL, replace spans of whitespace (including newlines) with spaces,
+# and re-emit the file(s) thus filtered on the standard output stream.
+#
+load_clang_arguments()
+{
+    set -- $(for arg; do
+        sed 's,#.*$,,' $srcdir/config/clang-warnings/${arg} | demote_errors
+    done)
+    IFS=' ' echo "$*"
+}
+# Get the compiler version in a way that works for clang
+# unless a compiler version is already known
+#
+#   cc_vendor:    The compiler name: clang
+#   cc_version:   Version number: 6.0.0, 7.3.0, ... 10.0.1
+#
+if test "X-" = "X-$cc_flags_set"; then
+    # clang -v will return version number following "clang" on Linux machines,
+    # but on Xcode the version number will follow "Apple LLVM version"
+    # Note that the Xcode reported LLVM version doesn't match the canonical
+    # LLVM version, so you'll need to do different version checks for
+    # Xcode.
+    cc_version="`$CC $CFLAGS $H5_CFLAGS -v 2>&1 |\
+        grep 'clang version' | sed 's/.*clang version \([-a-z0-9\.]*\).*/\1/'`"
+    if test -n "$cc_version"; then
+        cc_vendor="clang"
+    else
+        cc_version="`$CC $CFLAGS $H5_CFLAGS -v 2>&1 |\
+            grep 'Apple LLVM version' | sed 's/.*Apple LLVM version \([-a-z0-9\.]*\).*/\1/'`"
+        if test -n "$cc_version"; then
+            cc_vendor="Apple LLVM"
+        fi
+    fi
+    if test "X-" != "X-$cc_version"; then
+
+        # Get the compiler version numbers
+        cc_vers_major=`echo $cc_version | cut -f1 -d.`
+        cc_vers_minor=`echo $cc_version | cut -f2 -d.`
+        cc_vers_patch=`echo $cc_version | cut -f3 -d.`
+        test -n "$cc_vers_major" || cc_vers_major=0
+        test -n "$cc_vers_minor" || cc_vers_minor=0
+        test -n "$cc_vers_patch" || cc_vers_patch=0
+    fi
+fi
+
+if test "X-clang" = "X-$cc_vendor" -o "X-Apple LLVM" = "X-$cc_vendor"; then
+    echo "compiler '$CC' is $cc_vendor-$cc_version"
+    ###############################
+    # Architecture-specific flags #
+    ###############################
+
+    arch=
+    case "$host_os-$host_cpu" in
+        # FreeBSD sets the information from "uname -m" to the general machine
+        # architecture, not the specific CPU for the machine, so even our
+        # Pentium II Xeon server is set to "i386".  Once we know we are on a FreeBSD
+        # machine, use the "sysctl" command to get the CPU hardware model.
+        freebsd*-i386)
+            host_cpu_model=`sysctl -n hw.model`
+            case "$host_cpu_model" in
+                # Hmm.. this might not catch Celerons, but it won't hurt them either...
+                *Pro*|*II*|*III*|*IV*|*Athlon*)
+                    # architecture-specific optimizations cause problems
+                    # for some users who build binaries to be used on
+                    # multiple architectures.
+                    # arch="-march=i686"
+                ;;
+            esac
+            ;;
+
+        *-i686)
+                    # architecture-specific optimizations cause problems
+                    # for some users who build binaries to be used on
+                    # multiple architectures.
+                    # arch="-march=i686"
+            ;;
+    esac
+
+    case "$host_os-$host_cpu" in
+        # cygwin needs the "-std=c99" flag removed, so make
+        # a specific case for Cygwin without the flag and a default
+        # case to add the flag everywhere else
+        cygwin-*)
+            ;;
+
+        *)
+            H5_CFLAGS="$H5_CFLAGS -std=c99"
+            ;;
+    esac
+
+    H5_CFLAGS="$H5_CFLAGS $arch"
+
+    ##############
+    # Production #
+    ##############
+
+    # NDEBUG is handled explicitly by the configure script
+    PROD_CFLAGS=
+
+    #########
+    # Debug #
+    #########
+
+    # NDEBUG is handled explicitly by the configure script
+    # -g is handled by the symbols flags
+    DEBUG_CFLAGS="-ftrapv -fno-common"
+
+    ###########
+    # Symbols #
+    ###########
+
+    NO_SYMBOLS_CFLAGS=
+    SYMBOLS_CFLAGS="-g"
+
+    #############
+    # Profiling #
+    #############
+
+    PROFILE_CFLAGS="-pg"
+
+    ################
+    # Optimization #
+    ################
+
+    HIGH_OPT_CFLAGS="-O3"
+    NO_OPT_CFLAGS="-O0"
+
+    # -Og is only understood by clang 4+ and Xcode 9+
+    # Otherwise use -O1 (which is what -Og usually equates to)
+    if test "X-clang" = "X-$cc_vendor" -a $cc_vers_major -ge 4 -o "X-Apple LLVM" = "X-$cc_vendor" -a $cc_vers_major -ge 9; then
+        DEBUG_OPT_CFLAGS="-Og"
+    else
+        DEBUG_OPT_CFLAGS="-O1"
+    fi
+
+    ############
+    # Warnings #
+    ############
+
+    ###########
+    # General #
+    ###########
+
+    H5_CFLAGS="$H5_CFLAGS $(load_clang_arguments general)"
+    H5_ECFLAGS="$H5_ECFLAGS $(load_clang_arguments error-general)"
+
+    ######################
+    # Developer warnings #
+    ######################
+
+    NO_DEVELOPER_WARNING_CFLAGS=$(load_clang_arguments no-developer-general)
+    DEVELOPER_WARNING_CFLAGS=$(load_clang_arguments developer-general)
+
+    #############################
+    # Version-specific warnings #
+    #############################
+
+
+    #################
+    # Flags are set #
+    #################
+    cc_flags_set=yes
+fi
+
+# Clear cc info if no flags set
+if test "X$cc_flags_set" = "X"; then
+    cc_vendor=
+    cc_version=
+fi
+
diff --git a/config/clang-warnings/developer-general b/config/clang-warnings/developer-general
new file mode 100644
index 0000000..b80552f
--- /dev/null
+++ b/config/clang-warnings/developer-general
@@ -0,0 +1,3 @@
+-Wmissing-noreturn
+-Wsometimes-uninitialized
+-Wswitch-enum
diff --git a/config/clang-warnings/error-general b/config/clang-warnings/error-general
new file mode 100644
index 0000000..883dff7
--- /dev/null
+++ b/config/clang-warnings/error-general
@@ -0,0 +1,80 @@
+#
+# HDF5 code should not trigger the following warnings under any
+# circumstances, so ask the compiler to treat them as errors:
+#
+-Werror=bad-function-cast
+-Werror=implicit-function-declaration
+-Werror=incompatible-pointer-types
+-Werror=missing-declarations
+-Werror=packed
+-Werror=shadow
+-Werror=switch
+#
+# NOTE: Following files are not compatible with incompatible-pointer-types as errors
+#     src/H5Dchunk.c,src/H5Dint.c,src/H5Gint.c,src/H5HFcache.c,src/H5I.c,src/H5T.c
+-Wno-error=incompatible-pointer-types-discards-qualifiers
+#
+#
+# NOTE: File Driver files are not compatible with these warnings as errors
+#     H5FDdirect.c,H5FDmpio.c,H5FDros3.c,
+#       -Werror=unused-function
+#
+-Wunused-function
+#
+#     H5FDdrvr_module.h
+#       -Werror=unused-variable
+#
+-Wunused-variable
+#
+#     H5VLpassthru.c
+#       -Werror=unused-parameter
+#
+-Wunused-parameter
+#
+#
+#
+# NOTE: Tools files are not compatible with these warnings as errors
+#     lib/h5tools.c
+#       -Werror=cast-align
+#
+-Wcast-align
+#
+#     lib/h5tools_utils.c
+#       -Werror=unused-parameter
+#
+#
+# NOTE: JNI files are not compatible with these warnings as errors
+#     jni/h5pDCPLImp.c,jni/nativeData.c,jni/h5util.c,jni/h5rImp.c
+#     jni/h5sImp.c,jni/h5tImp.c
+#       -Werror=cast-align
+#     jni/h5util.c
+#       -Werror=format(-overflow)
+#
+-Wformat
+#
+#
+#Examples and tests do not use the same set of extensive warning flags as libraries
+# Here is a list of tests and examples that have issues with the stricter warnings as error
+#
+# NOTE: Test files are not compatible with these warnings as errors
+#     thread_id.c,
+#       -Werror=unused-function
+#     dsets.c
+#       -Werror=unused-parameter
+#
+#
+# NOTE: Examples files are not compatible with these warnings as errors
+#     h5_vds-eiger.c,h5_vds-exclim.c,h5_vds.c,h5_vds-exc.c,h5_vds-percival-unlim-maxmin.c
+#     h5_vds-percival.c,h5_read.c,h5_rdwt.c,h5_mount.c,h5_extend.c,h5_extend_write.c
+#     h5_write.c,h5_vds-simpleIO.c,h5_ref2reg_deprec.c,h5_crtgrp.c,h5_select.c
+#     h5_vds-percival-unlim.c,h5_crtatt.c,h5_group.c,h5_attribute.c,h5_crtdat.c
+#     h5_reference_deprec.c
+#     h5_rdwt.c,h5_crtgrp.c,h5_crtatt.c,h5_crtdat.c
+#       -Werror=strict-prototypes
+#     h5_rdwt.c,h5_crtgrp.c,h5_crtatt.c,h5_crtdat.c
+#       -Werror=old-style-definition
+#     h5_vds-exclim.c,h5_vds.c,h5_vds-exc.c,
+#       -Werror=unused-variable
+#     h5_elink_unix2win.c,h5_extlink.c,h5_attribute.c
+#       -Werror=unused-parameter
+
diff --git a/config/clang-warnings/general b/config/clang-warnings/general
new file mode 100644
index 0000000..433dff9
--- /dev/null
+++ b/config/clang-warnings/general
@@ -0,0 +1,20 @@
+# general clang warnings flags
+-Wall
+-Warray-bounds
+-Wcast-qual
+-Wconversion
+-Wdouble-promotion
+-Wextra
+-Wformat=2
+-Wframe-larger-than=16384
+-Wimplicit-fallthrough
+-Wnull-dereference
+-Wunused-const-variable
+-Wwrite-strings
+-Wpedantic
+-Wvolatile-register-var
+# NOTE: Due to the divergence in the C and C++, we're dropping support for
+# compiling the C library with a C++ compiler and dropping the -Wc++-compat
+# warning.
+#
+-Wno-c++-compat
diff --git a/config/clang-warnings/no-developer-general b/config/clang-warnings/no-developer-general
new file mode 100644
index 0000000..2bf1703
--- /dev/null
+++ b/config/clang-warnings/no-developer-general
@@ -0,0 +1 @@
+-Wno-missing-noreturn
diff --git a/config/cmake/CMakeFindJavaCommon.cmake b/config/cmake/CMakeFindJavaCommon.cmake
new file mode 100644
index 0000000..528791d
--- /dev/null
+++ b/config/cmake/CMakeFindJavaCommon.cmake
@@ -0,0 +1,30 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See https://cmake.org/licensing for details.
+
+
+# Do not include this module directly from code outside CMake!
+set(_JAVA_HOME "")
+if(JAVA_HOME AND IS_DIRECTORY "${JAVA_HOME}")
+  set(_JAVA_HOME "${JAVA_HOME}")
+  set(_JAVA_HOME_EXPLICIT 1)
+else()
+  set(_ENV_JAVA_HOME "")
+  if(DEFINED ENV{JAVA_HOME})
+    file(TO_CMAKE_PATH "$ENV{JAVA_HOME}" _ENV_JAVA_HOME)
+  endif()
+  if(_ENV_JAVA_HOME AND IS_DIRECTORY "${_ENV_JAVA_HOME}")
+    set(_JAVA_HOME "${_ENV_JAVA_HOME}")
+    set(_JAVA_HOME_EXPLICIT 1)
+  else()
+    set(_CMD_JAVA_HOME "")
+    if(APPLE AND EXISTS "/usr/libexec/java_home")
+      execute_process(COMMAND /usr/libexec/java_home
+        OUTPUT_VARIABLE _CMD_JAVA_HOME OUTPUT_STRIP_TRAILING_WHITESPACE)
+    endif()
+    if(_CMD_JAVA_HOME AND IS_DIRECTORY "${_CMD_JAVA_HOME}")
+      set(_JAVA_HOME "${_CMD_JAVA_HOME}")
+      set(_JAVA_HOME_EXPLICIT 0)
+    endif()
+    unset(_CMD_JAVA_HOME)
+  endif()
+  unset(_ENV_JAVA_HOME)
+endif()
diff --git a/config/cmake/CPack.Info.plist.in b/config/cmake/CPack.Info.plist.in
new file mode 100644
index 0000000..08d371b
--- /dev/null
+++ b/config/cmake/CPack.Info.plist.in
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>CFBundleDevelopmentRegion</key>
+  <string>English</string>
+  <key>CFBundleExecutable</key>
+  <string>@CPACK_PACKAGE_FILE_NAME@</string>
+  <key>CFBundleIconFile</key>
+  <string>@CPACK_BUNDLE_ICON@</string>
+  <key>CFBundleIdentifier</key>
+  <string>org.@CPACK_PACKAGE_VENDOR@.@CPACK_PACKAGE_NAME@@CPACK_MODULE_VERSION_SUFFIX@</string>
+  <key>CFBundleInfoDictionaryVersion</key>
+  <string>6.0</string>
+  <key>CFBundlePackageType</key>
+  <string>FMWK</string>
+  <key>CFBundleSignature</key>
+  <string>????</string>
+  <key>CFBundleVersion</key>
+  <string>@CPACK_PACKAGE_VERSIO@</string>
+  <key>CFBundleShortVersionString</key>
+  <string>@CPACK_SHORT_VERSION_STRING@</string>
+  <key>CSResourcesFileMapped</key>
+  <true/>
+</dict>
+</plist>
diff --git a/config/cmake/CTestCustom.cmake b/config/cmake/CTestCustom.cmake
index 41cb488..6676ca6 100644
--- a/config/cmake/CTestCustom.cmake
+++ b/config/cmake/CTestCustom.cmake
@@ -1,188 +1,178 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
 set (CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS 3000)
- 
+# Allow full output to go to CDash set to 0
+set (CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE 50000)
+set (CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE 50000)
+# WARNING!  This could be a lot of output and could overwhelm CDash and the
+# MySQL DB so this might not be a good idea!
+
 set (CTEST_CUSTOM_WARNING_EXCEPTION
     ${CTEST_CUSTOM_WARNING_EXCEPTION}
-#    "H5detect.c.[0-9]+.[ \t]*:[ \t]*warning C4090:"
-#    "H5detect.c.[0-9]+.[ \t]*:[ \t]*warning:[ \t]*passing argument"
-#    "H5detect.c[0-9 \t:]*warning:[ \t]*passing argument"
-#    "note.*expected.*void.*but argument is of type.*volatile"
-#    "H5Tconv.c[0-9 \t:]*warning:[ \t]*comparison is always false due to limited range of data type"
-#    "H5Ztrans.c.[0-9]+.[ \t]*:[ \t]*warning C4244"
-#    "SZIP.src.*:[ \t]*warning"
+    "note.*expected.*void.*but argument is of type.*volatile"
+    "plugin-build.*:[ \t]*warning"
+    "stamp.verify"
+    "CMake Warning*stamp"
+    "src.ZLIB.*:[ \t]*warning"
+    "warning LNK4197:.*ZLIB-prefix"
+    "src.SZIP.*:[ \t]*warning"
 #    "POSIX name for this item is deprecated"
     "disabling jobserver mode"
     "config.cmake.xlatefile.c"
-#    "warning.*implicit declaration of function"
+    "warning.*unknown pragma"
+    "warning.*unrecognized .pragma"
 #    "note: expanded from macro"
-#    "fpp:[ \t]*warning:[ \t]*cannot remove H5_DEBUG_API - not a predefined macro"
+    # HDDFFV-11074
+    "This directive is not standard"
+    ".*note.*expected.*void.*but argument is of type.*volatile.*"
+    ".*src.SZIP.*:[ \t]*warning.*"
+    ".*src.ZLIB.*:[ \t]*warning.*"
+    ".*src.JPEG.*:[ \t]*warning.*"
+    ".*POSIX name for this item is deprecated.*"
+    ".*disabling jobserver mode.*"
+    ".*warning.*implicit declaration of function.*"
+    ".*note: expanded from macro.*"
 )
- 
+
 set (CTEST_CUSTOM_MEMCHECK_IGNORE
     ${CTEST_CUSTOM_MEMCHECK_IGNORE}
     H5TEST-flush1           #designed to fail
     H5TEST-flush2           #designed to need flush1
     H5TEST-error_test       #uses runTest.cmake
     H5TEST-err_compat       #uses runTest.cmake
-    H5TEST-links_env        #uses runTest.cmake
     H5TEST-testlibinfo      #uses grepTest.cmake
-    H5TEST-clear-testhdf5-objects
+    #########
     H5TEST-clear-objects
-    H5TEST-clear-cache-objects
-    H5TEST-clear-cache_api-objects
-    H5TEST-clear-cache_tagging-objects
-    H5TEST-clear-ttsafe-objects
-    H5TEST-clear-err_compat-objects
-    H5TEST-clear-error_test-objects
-    H5TEST-clear-links_env-objects
+    H5TEST-cache-clear-objects
+    H5TEST-cache_image-clear-objects
+    H5TEST-del_many_dense_attrs-clear-objects
+    H5TEST-external_env-clear-objects
+    H5TEST-filenotclosed-clear-objects
+    H5TEST-flush-clear-objects
+    H5TEST-links_env-clear-objects
+    H5TEST-testflushrefresh-clear-objects
+    H5TEST-testhdf5-clear-objects
+    H5TEST-vds_env-clear-objects
     PERFORM_h5perform-clear-objects
-    HL_TOOLS-clear-objects
     HL_test-clear-objects
-    HL_fortran_test-clear-objects
+    HL_test-clean-objects
+    HL_FORTRAN_test-clear-objects
+    HL_FORTRAN_test-clean-objects
+    FORTRAN_testhdf5-clear-objects
+    FORTRAN_testhdf5-clean-objects
+    FORTRAN_flush1-clear-objects
+    FORTRAN_flush1-clean-objects
+    CPP_testhdf5-clear-objects
+    CPP_testhdf5-clean-objects
+    ######### examples #########
+    EXAMPLES-clear-objects
+    EXAMPLES-clean-objects
+    CPP_ex-clear-objects
+    CPP_ex-clean-objects
+    CPP_ex_tutr-clear-objects
+    CPP_ex_tutr-clean-objects
+    HL_ex-clear-objects
+    HL_ex-clean-objects
+    f90_ex-clear-objects
+    f90_ex-clean-objects
+    HL_CPP_ptableTest-clear-objects
+    HL_CPP_ptableTest-clean-objects
+    HL_CPP_ex_ptExampleFL-clear-objects
+    HL_CPP_ex_ptExampleFL-clean-objects
+    HL_FORTRAN_f90_ex-clear-objects
+    HL_FORTRAN_f90_ex-clean-objects
+    ######### tools/h5clear #########
+    H5CLEAR-clearall-objects
+    H5CLEAR-h5clear_gentest      # does not close ids by design
     ######### tools/h5copy #########
     H5COPY-clearall-objects
     ######### tools/h5diff #########
     H5DIFF-clearall-objects
     ######### tools/h5dump #########
-    H5DUMP-clearall-objects
-    H5DUMP_PACKED_BITS-clearall-objects
-    H5DUMP-XML-clearall-objects
+    H5DUMP-t128bit_float      #uses grepTest.cmake
+    ######### tools/h5format_convert #########
+    H5FC-clearall-objects
     ######### tools/h5import #########
+    H5IMPORT-h5importtest-clear-objects
     H5IMPORT-clear-objects
     ######### tools/h5jam #########
-    H5JAM-SETUP-N_twithub_u10_c-clear-objects
-    H5JAM-SETUP-N_twithub_u10_c
-    H5JAM-N_twithub_u10_c-clear-objects
-    H5JAM-NONE_COPY-N_twithub_u10_c
-    H5JAM-CHECKFILE-N_twithub_u10_c-clear-objects
-    H5JAM-SETUP-N_twithub_u511_c-clear-objects
-    H5JAM-SETUP-N_twithub_u511_c
-    H5JAM-N_twithub_u511_c-clear-objects
-    H5JAM-NONE_COPY-N_twithub_u511_c
-    H5JAM-CHECKFILE-N_twithub_u511_c-clear-objects
-    H5JAM-SETUP-N_twithub_u512_c-clear-objects
-    H5JAM-SETUP-N_twithub_u512_c
-    H5JAM-N_twithub_u512_c-clear-objects
-    H5JAM-NONE_COPY-N_twithub_u512_c
-    H5JAM-CHECKFILE-N_twithub_u512_c-clear-objects
-    H5JAM-SETUP-N_twithub_u513_c-clear-objects
-    H5JAM-SETUP-N_twithub_u513_c
-    H5JAM-N_twithub_u513_c-clear-objects
-    H5JAM-NONE_COPY-N_twithub_u513_c
-    H5JAM-CHECKFILE-N_twithub_u513_c-clear-objects
-    H5JAM-SETUP-N_twithub513_u10_c-clear-objects
-    H5JAM-SETUP-N_twithub513_u10_c
-    H5JAM-N_twithub513_u10_c-clear-objects
-    H5JAM-NONE_COPY-N_twithub513_u10_c
-    H5JAM-CHECKFILE-N_twithub513_u10_c-clear-objects
-    H5JAM-SETUP-N_twithub513_u511_c-clear-objects
-    H5JAM-SETUP-N_twithub513_u511_c
-    H5JAM-N_twithub513_u511_c-clear-objects
-    H5JAM-NONE_COPY-N_twithub513_u511_c
-    H5JAM-CHECKFILE-N_twithub513_u511_c-clear-objects
-    H5JAM-SETUP-N_twithub513_u512_c-clear-objects
-    H5JAM-SETUP-N_twithub513_u512_c
-    H5JAM-N_twithub513_u512_c-clear-objects
-    H5JAM-NONE_COPY-N_twithub513_u512_c
-    H5JAM-CHECKFILE-N_twithub513_u512_c-clear-objects
-    H5JAM-SETUP-N_twithub513_u513_c-clear-objects
-    H5JAM-SETUP-N_twithub513_u513_c
-    H5JAM-N_twithub513_u513_c-clear-objects
-    H5JAM-NONE_COPY-N_twithub513_u513_c
-    H5JAM-CHECKFILE-N_twithub513_u513_c-clear-objects
-    H5JAM-CHECKFILE-twithub_u10_c-clear-objects
-    H5JAM-twithub_u511_c-clear-objects
-    H5JAM-CHECKFILE-twithub_u511_c-clear-objects
-    H5JAM-twithub_u512_c-clear-objects
-    H5JAM-CHECKFILE-twithub_u512_c-clear-objects
-    H5JAM-twithub_u513_c-clear-objects
-    H5JAM-CHECKFILE-twithub_u513_c-clear-objects
-    H5JAM-twithub513_u10_c-clear-objects
-    H5JAM-CHECKFILE-twithub513_u10_c-clear-objects
-    H5JAM-twithub513_u511_c-clear-objects
-    H5JAM-CHECKFILE-twithub513_u511_c-clear-objects
-    H5JAM-twithub513_u512_c-clear-objects
-    H5JAM-CHECKFILE-twithub513_u512_c-clear-objects
-    H5JAM-twithub513_u513_c-clear-objects
-    H5JAM-CHECKFILE-twithub513_u513_c-clear-objects
-    H5JAM-SETUP-twithub_tall-clear-objects
-    H5JAM-SETUP-twithub_tall
-    H5JAM-UNJAM-twithub_tall-clear-objects
-    H5JAM-UNJAM_D-twithub_tall-clear-objects
-    H5JAM-CHECKFILE-twithub_tall-clear-objects
-    H5JAM-SETUP-twithub513_tall-clear-objects
-    H5JAM-SETUP-twithub513_tall
-    H5JAM-UNJAM-twithub513_tall-clear-objects
-    H5JAM-UNJAM_D-twithub513_tall-clear-objects
-    H5JAM-CHECKFILE-twithub513_tall-clear-objects
-    H5JAM-SETUP-N_twithub_tall-clear-objects
-    H5JAM-SETUP-N_twithub_tall
-    H5JAM-UNJAM-N_twithub_tall-clear-objects
-    H5JAM-UNJAM_D-N_twithub_tall-clear-objects
-    H5JAM-CHECKFILE-N_twithub_tall-clear-objects
-    H5JAM-SETUP-N_twithub513_tall-clear-objects
-    H5JAM-SETUP-N_twithub513_tall
-    H5JAM-UNJAM-N_twithub513_tall-clear-objects
-    H5JAM-UNJAM_D-N_twithub513_tall-clear-objects
-    H5JAM-CHECKFILE-N_twithub513_tall-clear-objects
-    H5JAM-SETUP-D_twithub_tall-clear-objects
-    H5JAM-SETUP-D_twithub_tall
-    H5JAM-UNJAM-D_twithub_tall-clear-objects
-    H5JAM-UNJAM_D-D_twithub_tall-clear-objects
-    H5JAM-CHECKFILE-D_twithub_tall-clear-objects
-    H5JAM-SETUP-D_twithub513_tall-clear-objects
-    H5JAM-SETUP-D_twithub513_tall
-    H5JAM-UNJAM-D_twithub513_tall-clear-objects
-    H5JAM-UNJAM_D-D_twithub513_tall-clear-objects
-    H5JAM-CHECKFILE-D_twithub513_tall-clear-objects
-    H5JAM-CHECKFILE-ta_u513-clear-objects
-    H5JAM-twithub_u10-clear-objects
-    H5JAM-CHECKFILE-twithub_u10-clear-objects
-    H5JAM-twithub_u511-clear-objects
-    H5JAM-CHECKFILE-twithub_u511-clear-objects
-    H5JAM-twithub_u512-clear-objects
-    H5JAM-CHECKFILE-twithub_u512-clear-objects
-    H5JAM-twithub_u513-clear-objects
-    H5JAM-CHECKFILE-twithub_u513-clear-objects
-    H5JAM-twithub513_u10-clear-objects
-    H5JAM-CHECKFILE-twithub513_u10-clear-objects
-    H5JAM-twithub513_u511-clear-objects
-    H5JAM-CHECKFILE-twithub513_u511-clear-objects
-    H5JAM-twithub513_u512-clear-objects
-    H5JAM-CHECKFILE-twithub513_u512-clear-objects
-    H5JAM-twithub513_u513-clear-objects
-    H5JAM-CHECKFILE-twithub513_u513-clear-objects
-    H5JAM-twithub_u10_c-clear-objects
-    H5JAM-tall_u10-clear-objects
-    H5JAM-CHECKFILE-tall_u10-clear-objects
-    H5JAM-tall_u511-clear-objects
-    H5JAM-CHECKFILE-tall_u511-clear-objects
-    H5JAM-tall_u512-clear-objects
-    H5JAM-CHECKFILE-tall_u512-clear-objects
-    H5JAM-tall_u513-clear-objects
-    H5JAM-CHECKFILE-tall_u513-clear-objects
-    H5JAM-SETUP-ta_u10-clear-objects
-    H5JAM-SETUP-ta_u10
-    H5JAM-ta_u10-clear-objects
-    H5JAM-NONE_COPY-ta_u10
-    H5JAM-CHECKFILE-ta_u10-clear-objects
-    H5JAM-SETUP-ta_u511-clear-objects
-    H5JAM-SETUP-ta_u511
-    H5JAM-ta_u511-clear-objects
-    H5JAM-NONE_COPY-ta_u511
-    H5JAM-CHECKFILE-ta_u511-clear-objects
-    H5JAM-SETUP-ta_u512-clear-objects
-    H5JAM-SETUP-ta_u512
-    H5JAM-ta_u512-clear-objects
-    H5JAM-NONE_COPY-ta_u512
-    H5JAM-CHECKFILE-ta_u512-clear-objects
-    H5JAM-SETUP-ta_u513-clear-objects
-    H5JAM-SETUP-ta_u513
-    H5JAM-ta_u513-clear-objects
-    H5JAM-NONE_COPY-ta_u513
     ######### tools/h5ls #########
     H5LS-clearall-objects
+    H5LS_VDS-clearall-objects
     ######### tools/h5repack #########
     H5REPACK-clearall-objects
+    H5REPACK-add_alignment-clear-objects
+    H5REPACK-add_userblock-clear-objects
+    H5REPACK-all_filters-clear-objects
+    H5REPACK-attr-clear-objects
+    H5REPACK-committed_dt-clear-objects
+    H5REPACK-deflate_convert-clear-objects
+    H5REPACK-deflate_copy-clear-objects
+    H5REPACK-deflate_file-clear-objects
+    H5REPACK-deflate_remove-clear-objects
+    H5REPACK-early-clear-objects
+    H5REPACK-error4-clear-objects
+    H5REPACK-family-clear-objects
+    H5REPACK-fill-clear-objects
+    H5REPACK-fletcher_all-clear-objects
+    H5REPACK-fletcher_copy-clear-objects
+    H5REPACK-fletcher_individual-clear-objects
+    H5REPACK-fletcher_remove-clear-objects
+    H5REPACK-global_filters-clear-objects
+    H5REPACK-gt_mallocsize-clear-objects
+    H5REPACK-gzip_all-clear-objects
+    H5REPACK-gzip_individual-clear-objects
+    H5REPACK-hlink-clear-objects
+    H5REPACK-layout-clear-objects
+    H5REPACK-native_attr-clear-objects
+    H5REPACK-native_fill-clear-objects
+    H5REPACK-nbit_add-clear-objects
+    H5REPACK-nbit_copy-clear-objects
+    H5REPACK-nbit_remove-clear-objects
+    H5REPACK-nested_8bit_enum-clear-objects
+    H5REPACK-objs-clear-objects
+    H5REPACK-remove_all-clear-objects
+    H5REPACK-scale_add-clear-objects
+    H5REPACK-scale_copy-clear-objects
+    H5REPACK-scale_remove-clear-objects
+    H5REPACK-shuffle_all-clear-objects
+    H5REPACK-shuffle_copy-clear-objects
+    H5REPACK-shuffle_individual-clear-objects
+    H5REPACK-shuffle_remove-clear-objects
+    H5REPACK-szip_all-clear-objects
+    H5REPACK-szip_convert-clear-objects
+    H5REPACK-szip_copy-clear-objects
+    H5REPACK-szip_individual-clear-objects
+    H5REPACK-szip_remove-clear-objects
+    H5REPACK-upgrade_layout-clear-objects
+    H5REPACK_DMP-attrregion-clear-objects
+    H5REPACK_DMP-crtorder-clear-objects
+    H5REPACK_DMP-dataregion-clear-objects
+    H5REPACK_DMP-deflate_limit-clear-objects
+    H5REPACK-bug1814-clear-objects
+    H5REPACK-HDFFV-5932-clear-objects
+    H5REPACK-HDFFV-7840-clear-objects
+    H5REPACK_META-meta_long-clear-objects
+    H5REPACK_META-meta_short-clear-objects
+    H5REPACK_STAT-GS_AGGR-clear-objects
+    H5REPACK_STAT-S_AGGR-clear-objects
+    H5REPACK_STAT-SP_NONE-clear-objects
+    H5REPACK_STAT-SP_PAGE-clear-objects
+    H5REPACK_STAT-SPT_FSM_AGGR-clear-objects
+    H5REPACK_STAT-STG_PAGE-clear-objects
+    #########
+    H5REPACK_META-meta_long
+    H5REPACK_META-meta_short
+    #########
     H5REPACK-gzip_verbose_filters                       #uses runTest.cmake
     H5REPACK_VERIFY_LAYOUT-dset2_chunk_20x10            #uses grepTest.cmake
     H5REPACK_VERIFY_LAYOUT_ALL-chunk_20x10              #uses grepTest.cmake
@@ -204,12 +194,22 @@ set (CTEST_CUSTOM_MEMCHECK_IGNORE
     H5REPACK_VERIFY_LAYOUT_ALL-layout_long_switches     #uses grepTest.cmake
     H5REPACK_VERIFY_LAYOUT_ALL-layout_short_switches    #uses grepTest.cmake
     H5REPACK-plugin
+    H5REPACK_CMP-plugin_zero
+    #########
+    ADD_H5_VERIFY_INVALIDBOUNDS-h5repack-latest_latest_invalid-clear-objects
+    H5REPACK_VERIFY_SUPERBLOCK-SB_IS_0-clear-objects
+    H5REPACK_VERIFY_SUPERBLOCK-SB_IS_2-clear-objects
+    H5REPACK_VERIFY_SUPERBLOCK-SB_IS_3-clear-objects
     ######### tools/h5stat #########
     H5STAT-clearall-objects
     ######### tools/misc #########
     H5REPART-clearall-objects
     H5MKGRP-clearall-objects
-    ######### examples #########
-    EXAMPLES-clear-objects
-    CPP_ex-clear-objects
+    ######### tools/perform #########
+    PERFORM_h5perform-clearall-objects
+    ######### hl/tools #########
+    HL_TOOLS-clear-objects
+    HL_TOOLS-clean-objects
+    H5WATCH-clearall-objects
+    H5WATCH-cleanall-objects
 )
diff --git a/config/cmake/CTestScript.cmake b/config/cmake/CTestScript.cmake
new file mode 100644
index 0000000..a2b122c
--- /dev/null
+++ b/config/cmake/CTestScript.cmake
@@ -0,0 +1,169 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
+cmake_minimum_required (VERSION 3.18)
+########################################################
+# For any comments please contact cdashhelp@hdfgroup.org
+#
+########################################################
+# -----------------------------------------------------------
+# -- Get environment
+# -----------------------------------------------------------
+if (NOT SITE_OS_NAME)
+  ## machine name not provided - attempt to discover with uname
+  ## -- set hostname
+  ## --------------------------
+  find_program (HOSTNAME_CMD NAMES hostname)
+  exec_program (${HOSTNAME_CMD} ARGS OUTPUT_VARIABLE HOSTNAME)
+  set (CTEST_SITE  "${HOSTNAME}${CTEST_SITE_EXT}")
+  find_program (UNAME NAMES uname)
+  macro (getuname name flag)
+    exec_program ("${UNAME}" ARGS "${flag}" OUTPUT_VARIABLE "${name}")
+  endmacro ()
+
+  getuname (osname -s)
+  getuname (osrel  -r)
+  getuname (cpu    -m)
+  message (STATUS "Dashboard script uname output: ${osname}-${osrel}-${cpu}\n")
+
+  set (CTEST_BUILD_NAME  "${osname}-${osrel}-${cpu}")
+  if (SITE_BUILDNAME_SUFFIX)
+    set (CTEST_BUILD_NAME  "${SITE_BUILDNAME_SUFFIX}-${CTEST_BUILD_NAME}")
+  endif ()
+  set (BUILD_OPTIONS "${ADD_BUILD_OPTIONS}")
+else ()
+  ## machine name provided
+  ## --------------------------
+  if (CMAKE_HOST_UNIX)
+    set(CTEST_BUILD_NAME "${SITE_OS_NAME}-${SITE_OS_VERSION}-${SITE_OS_BITS}-${SITE_COMPILER_NAME}-${SITE_COMPILER_VERSION}")
+  else ()
+    set(CTEST_BUILD_NAME "${SITE_OS_NAME}-${SITE_OS_VERSION}-${SITE_COMPILER_NAME}")
+  endif ()
+  if (SITE_BUILDNAME_SUFFIX)
+    set(CTEST_BUILD_NAME "${CTEST_BUILD_NAME}-${SITE_BUILDNAME_SUFFIX}")
+  endif ()
+  set (BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILDNAME:STRING=${CTEST_BUILD_NAME}")
+endif ()
+
+#-----------------------------------------------------------------------------
+# MacOS machines need special options
+#-----------------------------------------------------------------------------
+if (APPLE)
+  # Compiler choice
+  execute_process (COMMAND xcrun --find cc OUTPUT_VARIABLE XCODE_CC OUTPUT_STRIP_TRAILING_WHITESPACE)
+  execute_process (COMMAND xcrun --find c++ OUTPUT_VARIABLE XCODE_CXX OUTPUT_STRIP_TRAILING_WHITESPACE)
+  set (ENV{CC} "${XCODE_CC}")
+  set (ENV{CXX} "${XCODE_CXX}")
+
+  set (BUILD_OPTIONS "${BUILD_OPTIONS} -DCTEST_USE_LAUNCHERS:BOOL=ON -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=OFF")
+endif ()
+
+#-----------------------------------------------------------------------------
+set (NEED_REPOSITORY_CHECKOUT 0)
+set (CTEST_CMAKE_COMMAND "\"${CMAKE_COMMAND}\"")
+if (CTEST_USE_TAR_SOURCE)
+  ## Uncompress source if tar or zip file provided
+  ## --------------------------
+  if (WIN32 AND NOT MINGW)
+    message (STATUS "extracting... [${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_DASHBOARD_ROOT}\\${CTEST_USE_TAR_SOURCE}.zip]")
+    execute_process (COMMAND ${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_DASHBOARD_ROOT}\\${CTEST_USE_TAR_SOURCE}.zip RESULT_VARIABLE rv)
+  else ()
+    message (STATUS "extracting... [${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_DASHBOARD_ROOT}/${CTEST_USE_TAR_SOURCE}.tar]")
+    execute_process (COMMAND ${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_DASHBOARD_ROOT}/${CTEST_USE_TAR_SOURCE}.tar RESULT_VARIABLE rv)
+  endif ()
+
+  if (NOT rv EQUAL 0)
+    message (STATUS "extracting... [error-(${rv}) clean up]")
+    file (REMOVE_RECURSE "${CTEST_SOURCE_DIRECTORY}")
+    message (FATAL_ERROR "error: extract of ${CTEST_USE_TAR_SOURCE} failed")
+  endif ()
+endif ()
+
+#-----------------------------------------------------------------------------
+## Clear the build directory
+## --------------------------
+set (CTEST_START_WITH_EMPTY_BINARY_DIRECTORY TRUE)
+if (EXISTS "${CTEST_BINARY_DIRECTORY}" AND IS_DIRECTORY "${CTEST_BINARY_DIRECTORY}")
+  ctest_empty_binary_directory (${CTEST_BINARY_DIRECTORY})
+else ()
+  file (MAKE_DIRECTORY "${CTEST_BINARY_DIRECTORY}")
+endif ()
+
+# Use multiple CPU cores to build
+include (ProcessorCount)
+ProcessorCount (N)
+if (NOT N EQUAL 0)
+  if (MAX_PROC_COUNT)
+    if (N GREATER MAX_PROC_COUNT)
+      set (N ${MAX_PROC_COUNT})
+    endif ()
+  endif ()
+  if (NOT WIN32)
+    set (CTEST_BUILD_FLAGS -j${N})
+  endif ()
+  set (ctest_test_args ${ctest_test_args} PARALLEL_LEVEL ${N})
+endif ()
+
+#-----------------------------------------------------------------------------
+# Initialize the CTEST commands
+#------------------------------
+set(CTEST_CONFIGURE_TOOLSET  "")
+if(CMAKE_GENERATOR_TOOLSET)
+  set(CTEST_CONFIGURE_TOOLSET  "-T${CMAKE_GENERATOR_TOOLSET}")
+endif()
+set(CTEST_CONFIGURE_ARCHITECTURE  "")
+if(CMAKE_GENERATOR_ARCHITECTURE)
+  set(CTEST_CONFIGURE_ARCHITECTURE  "-A${CMAKE_GENERATOR_ARCHITECTURE}")
+endif()
+set (CTEST_CONFIGURE_COMMAND
+    "${CTEST_CMAKE_COMMAND} -C \"${CTEST_SOURCE_DIRECTORY}/config/cmake/cacheinit.cmake\" -DCMAKE_BUILD_TYPE:STRING=${CTEST_CONFIGURATION_TYPE} ${BUILD_OPTIONS} \"-G${CTEST_CMAKE_GENERATOR}\" \"${CTEST_CONFIGURE_ARCHITECTURE}\" \"${CTEST_CONFIGURE_TOOLSET}\" \"${CTEST_SOURCE_DIRECTORY}\""
+)
+#-----------------------------------------------------------------------------
+
+#-----------------------------------------------------------------------------
+## -- set output to english
+set ($ENV{LC_MESSAGES}  "en_EN")
+
+#-----------------------------------------------------------------------------
+  configure_file(${CTEST_SOURCE_DIRECTORY}/config/cmake/CTestCustom.cmake ${CTEST_BINARY_DIRECTORY}/CTestCustom.cmake)
+  ctest_read_custom_files ("${CTEST_BINARY_DIRECTORY}")
+#-----------------------------------------------------------------------------
+  ## NORMAL process
+  ## -- LOCAL_SUBMIT reports to CDash server
+  ## --------------------------
+  ctest_start (Experimental)
+  ctest_configure (BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
+  if (LOCAL_SUBMIT)
+    ctest_submit (PARTS Configure Notes)
+  endif ()
+  if (${res} LESS 0 OR ${res} GREATER 0)
+    file (APPEND ${CTEST_SCRIPT_DIRECTORY}/FailedCTest.txt "Failed Configure: ${res}\n")
+  endif ()
+
+  ctest_build (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND RETURN_VALUE res NUMBER_ERRORS errval)
+  if (LOCAL_SUBMIT)
+    ctest_submit (PARTS Build)
+  endif ()
+  if (${res} LESS 0 OR ${res} GREATER 0 OR ${errval} GREATER 0)
+    file (APPEND ${CTEST_SCRIPT_DIRECTORY}/FailedCTest.txt "Failed ${errval} Build: ${res}\n")
+  endif ()
+
+  ctest_test (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND ${ctest_test_args} RETURN_VALUE res)
+  if (LOCAL_SUBMIT)
+    ctest_submit (PARTS Test)
+  endif()
+  if (${res} LESS 0 OR ${res} GREATER 0)
+    file (APPEND ${CTEST_SCRIPT_DIRECTORY}/FailedCTest.txt "Failed Tests: ${res}\n")
+  endif ()
+  if (${res} LESS 0 OR ${res} GREATER 0)
+    message (FATAL_ERROR "tests FAILED")
+  endif ()
+#-----------------------------------------------------------------------------
diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake
index 0aa4f1c..70a2104 100644
--- a/config/cmake/ConfigureChecks.cmake
+++ b/config/cmake/ConfigureChecks.cmake
@@ -1,47 +1,588 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
 #-----------------------------------------------------------------------------
 # Include all the necessary files for macros
 #-----------------------------------------------------------------------------
+include (CheckFunctionExists)
+include (CheckIncludeFile)
+include (CheckIncludeFiles)
+include (CheckLibraryExists)
+include (CheckSymbolExists)
+include (CheckTypeSize)
+include (CheckVariableExists)
+include (TestBigEndian)
+include (CheckStructHasMember)
+
 set (HDF_PREFIX "H5")
-include (${HDF_RESOURCES_EXT_DIR}/ConfigureChecks.cmake)
-include (${CMAKE_ROOT}/Modules/TestForSTDNamespace.cmake)
+
+# Check for Darwin (not just Apple - we also want to catch OpenDarwin)
+if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+    set (${HDF_PREFIX}_HAVE_DARWIN 1)
+endif ()
+
+# Check for Solaris
+if (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
+    set (${HDF_PREFIX}_HAVE_SOLARIS 1)
+endif ()
+
+#-----------------------------------------------------------------------------
+# This MACRO checks IF the symbol exists in the library and IF it
+# does, it appends library to the list.
+#-----------------------------------------------------------------------------
+set (LINK_LIBS "")
+macro (CHECK_LIBRARY_EXISTS_CONCAT LIBRARY SYMBOL VARIABLE)
+  CHECK_LIBRARY_EXISTS ("${LIBRARY};${LINK_LIBS}" ${SYMBOL} "" ${VARIABLE})
+  if (${VARIABLE})
+    set (LINK_LIBS ${LINK_LIBS} ${LIBRARY})
+  endif ()
+endmacro ()
+
+# ----------------------------------------------------------------------
+# WINDOWS Hard code Values
+# ----------------------------------------------------------------------
+set (WINDOWS)
+
+if (MINGW)
+  set (${HDF_PREFIX}_HAVE_MINGW 1)
+  set (WINDOWS 1) # MinGW tries to imitate Windows
+  set (CMAKE_REQUIRED_FLAGS "-DWIN32_LEAN_AND_MEAN=1 -DNOGDI=1")
+  set (__USE_MINGW_ANSI_STDIO 1)
+endif ()
+
+if (WIN32 AND NOT MINGW)
+  if (NOT UNIX)
+    set (WINDOWS 1)
+    set (CMAKE_REQUIRED_FLAGS "/DWIN32_LEAN_AND_MEAN=1 /DNOGDI=1")
+    if (MSVC)
+      set (${HDF_PREFIX}_HAVE_VISUAL_STUDIO 1)
+    endif ()
+  endif ()
+endif ()
+
+if (WINDOWS)
+  set (HDF5_REQUIRED_LIBRARIES "ws2_32.lib;wsock32.lib")
+  set (${HDF_PREFIX}_HAVE_WIN32_API 1)
+  set (${HDF_PREFIX}_HAVE_LIBM 1)
+  set (${HDF_PREFIX}_HAVE_STRDUP 1)
+  if (NOT MINGW)
+    set (${HDF_PREFIX}_HAVE_GETHOSTNAME 1)
+  endif ()
+  if (NOT UNIX AND NOT CYGWIN)
+    set (${HDF_PREFIX}_HAVE_GETCONSOLESCREENBUFFERINFO 1)
+    set (${HDF_PREFIX}_GETTIMEOFDAY_GIVES_TZ 1)
+    set (${HDF_PREFIX}_HAVE_TIMEZONE 1)
+    set (${HDF_PREFIX}_HAVE_GETTIMEOFDAY 1)
+    set (${HDF_PREFIX}_HAVE_LIBWS2_32 1)
+    set (${HDF_PREFIX}_HAVE_LIBWSOCK32 1)
+  endif ()
+endif ()
+
+# ----------------------------------------------------------------------
+# END of WINDOWS Hard code Values
+# ----------------------------------------------------------------------
+
+if (NOT WINDOWS)
+  TEST_BIG_ENDIAN (${HDF_PREFIX}_WORDS_BIGENDIAN)
+endif ()
+
+#-----------------------------------------------------------------------------
+# Check IF header file exists and add it to the list.
+#-----------------------------------------------------------------------------
+macro (CHECK_INCLUDE_FILE_CONCAT FILE VARIABLE)
+  CHECK_INCLUDE_FILES ("${USE_INCLUDES};${FILE}" ${VARIABLE})
+  if (${VARIABLE})
+    set (USE_INCLUDES ${USE_INCLUDES} ${FILE})
+  endif ()
+endmacro ()
+
+#-----------------------------------------------------------------------------
+#  Check for the existence of certain header files
+#-----------------------------------------------------------------------------
+CHECK_INCLUDE_FILE_CONCAT ("sys/file.h"      ${HDF_PREFIX}_HAVE_SYS_FILE_H)
+CHECK_INCLUDE_FILE_CONCAT ("sys/ioctl.h"     ${HDF_PREFIX}_HAVE_SYS_IOCTL_H)
+CHECK_INCLUDE_FILE_CONCAT ("sys/resource.h"  ${HDF_PREFIX}_HAVE_SYS_RESOURCE_H)
+CHECK_INCLUDE_FILE_CONCAT ("sys/socket.h"    ${HDF_PREFIX}_HAVE_SYS_SOCKET_H)
+CHECK_INCLUDE_FILE_CONCAT ("sys/stat.h"      ${HDF_PREFIX}_HAVE_SYS_STAT_H)
+CHECK_INCLUDE_FILE_CONCAT ("sys/time.h"      ${HDF_PREFIX}_HAVE_SYS_TIME_H)
+CHECK_INCLUDE_FILE_CONCAT ("sys/types.h"     ${HDF_PREFIX}_HAVE_SYS_TYPES_H)
+CHECK_INCLUDE_FILE_CONCAT ("features.h"      ${HDF_PREFIX}_HAVE_FEATURES_H)
+CHECK_INCLUDE_FILE_CONCAT ("dirent.h"        ${HDF_PREFIX}_HAVE_DIRENT_H)
+CHECK_INCLUDE_FILE_CONCAT ("unistd.h"        ${HDF_PREFIX}_HAVE_UNISTD_H)
+CHECK_INCLUDE_FILE_CONCAT ("pwd.h"           ${HDF_PREFIX}_HAVE_PWD_H)
+CHECK_INCLUDE_FILE_CONCAT ("globus/common.h" ${HDF_PREFIX}_HAVE_GLOBUS_COMMON_H)
+CHECK_INCLUDE_FILE_CONCAT ("pdb.h"           ${HDF_PREFIX}_HAVE_PDB_H)
+CHECK_INCLUDE_FILE_CONCAT ("pthread.h"       ${HDF_PREFIX}_HAVE_PTHREAD_H)
+CHECK_INCLUDE_FILE_CONCAT ("srbclient.h"     ${HDF_PREFIX}_HAVE_SRBCLIENT_H)
+CHECK_INCLUDE_FILE_CONCAT ("string.h"        ${HDF_PREFIX}_HAVE_STRING_H)
+CHECK_INCLUDE_FILE_CONCAT ("strings.h"       ${HDF_PREFIX}_HAVE_STRINGS_H)
+CHECK_INCLUDE_FILE_CONCAT ("stdlib.h"        ${HDF_PREFIX}_HAVE_STDLIB_H)
+CHECK_INCLUDE_FILE_CONCAT ("dlfcn.h"         ${HDF_PREFIX}_HAVE_DLFCN_H)
+CHECK_INCLUDE_FILE_CONCAT ("netinet/in.h"    ${HDF_PREFIX}_HAVE_NETINET_IN_H)
+CHECK_INCLUDE_FILE_CONCAT ("netdb.h"         ${HDF_PREFIX}_HAVE_NETDB_H)
+CHECK_INCLUDE_FILE_CONCAT ("arpa/inet.h"     ${HDF_PREFIX}_HAVE_ARPA_INET_H)
+if (WINDOWS)
+  CHECK_INCLUDE_FILE_CONCAT ("shlwapi.h"         ${HDF_PREFIX}_HAVE_SHLWAPI_H)
+  # Checking for StrStrIA in the library is not relaible for mingw32 to stdcall
+  set (LINK_LIBS ${LINK_LIBS} "shlwapi")
+endif ()
+
+## Check for non-standard extension quadmath.h
+
+CHECK_INCLUDE_FILES(quadmath.h C_HAVE_QUADMATH)
+if (${C_HAVE_QUADMATH})
+  set(${HDF_PREFIX}_HAVE_QUADMATH_H 1)
+else ()
+  set(${HDF_PREFIX}_HAVE_QUADMATH_H 0)
+endif ()
+
+if (CYGWIN)
+  set (${HDF_PREFIX}_HAVE_LSEEK64 0)
+endif ()
+
+#-----------------------------------------------------------------------------
+#  Check for the math library "m"
+#-----------------------------------------------------------------------------
+if (MINGW OR NOT WINDOWS)
+  CHECK_LIBRARY_EXISTS_CONCAT ("m" ceil     ${HDF_PREFIX}_HAVE_LIBM)
+  CHECK_LIBRARY_EXISTS_CONCAT ("dl" dlopen     ${HDF_PREFIX}_HAVE_LIBDL)
+  CHECK_LIBRARY_EXISTS_CONCAT ("ws2_32" WSAStartup  ${HDF_PREFIX}_HAVE_LIBWS2_32)
+  CHECK_LIBRARY_EXISTS_CONCAT ("wsock32" gethostbyname ${HDF_PREFIX}_HAVE_LIBWSOCK32)
+endif ()
+
+# UCB (BSD) compatibility library
+CHECK_LIBRARY_EXISTS_CONCAT ("ucb"    gethostname  ${HDF_PREFIX}_HAVE_LIBUCB)
+
+# For other tests to use the same libraries
+set (HDF5_REQUIRED_LIBRARIES ${HDF5_REQUIRED_LIBRARIES} ${LINK_LIBS})
+
+set (USE_INCLUDES "")
+if (WINDOWS)
+  set (USE_INCLUDES ${USE_INCLUDES} "windows.h")
+endif ()
+
+# For other specific tests, use this MACRO.
+macro (HDF_FUNCTION_TEST OTHER_TEST)
+  if (NOT DEFINED ${HDF_PREFIX}_${OTHER_TEST})
+    set (MACRO_CHECK_FUNCTION_DEFINITIONS "-D${OTHER_TEST} ${CMAKE_REQUIRED_FLAGS}")
+
+    foreach (def
+        HAVE_SYS_TIME_H
+        HAVE_UNISTD_H
+        HAVE_SYS_TYPES_H
+        HAVE_SYS_SOCKET_H
+    )
+      if ("${${HDF_PREFIX}_${def}}")
+        set (MACRO_CHECK_FUNCTION_DEFINITIONS "${MACRO_CHECK_FUNCTION_DEFINITIONS} -D${def}")
+      endif ()
+    endforeach ()
+
+    if (LARGEFILE)
+      set (MACRO_CHECK_FUNCTION_DEFINITIONS
+          "${MACRO_CHECK_FUNCTION_DEFINITIONS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE"
+      )
+    endif ()
+
+    message (TRACE "Performing ${OTHER_TEST}")
+    try_compile (${OTHER_TEST}
+        ${CMAKE_BINARY_DIR}
+        ${HDF_RESOURCES_DIR}/HDFTests.c
+        COMPILE_DEFINITIONS "${MACRO_CHECK_FUNCTION_DEFINITIONS}"
+        LINK_LIBRARIES "${HDF5_REQUIRED_LIBRARIES}"
+        OUTPUT_VARIABLE OUTPUT
+    )
+    if (${OTHER_TEST})
+      set (${HDF_PREFIX}_${OTHER_TEST} 1 CACHE INTERNAL "Other test ${FUNCTION}")
+      message (VERBOSE "Performing Other Test ${OTHER_TEST} - Success")
+    else ()
+      message (VERBOSE "Performing Other Test ${OTHER_TEST} - Failed")
+      set (${HDF_PREFIX}_${OTHER_TEST} "" CACHE INTERNAL "Other test ${FUNCTION}")
+      file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
+          "Performing Other Test ${OTHER_TEST} failed with the following output:\n"
+          "${OUTPUT}\n"
+      )
+    endif ()
+  endif ()
+endmacro ()
+
+#-----------------------------------------------------------------------------
+#  Check for large file support
+#-----------------------------------------------------------------------------
+
+# The linux-lfs option is deprecated.
+set (LINUX_LFS 0)
+
+set (HDF_EXTRA_C_FLAGS)
+set (HDF_EXTRA_FLAGS)
+if (MINGW OR NOT WINDOWS)
+  if (CMAKE_SYSTEM_NAME MATCHES "Linux")
+    # Linux Specific flags
+    # This was originally defined as _POSIX_SOURCE which was updated to
+    # _POSIX_C_SOURCE=199506L to expose a greater amount of POSIX
+    # functionality so clock_gettime and CLOCK_MONOTONIC are defined
+    # correctly. This was later updated to 200112L so that
+    # posix_memalign() is visible for the direct VFD code on Linux
+    # systems.
+    # POSIX feature information can be found in the gcc manual at:
+    # http://www.gnu.org/s/libc/manual/html_node/Feature-Test-Macros.html
+    set (HDF_EXTRA_C_FLAGS -D_POSIX_C_SOURCE=200809L)
+
+    # Need to add this so that O_DIRECT is visible for the direct
+    # VFD on Linux systems.
+    set (HDF_EXTRA_C_FLAGS ${HDF_EXTRA_C_FLAGS} -D_GNU_SOURCE)
+
+    option (HDF_ENABLE_LARGE_FILE "Enable support for large (64-bit) files on Linux." ON)
+    if (HDF_ENABLE_LARGE_FILE AND NOT DEFINED TEST_LFS_WORKS_RUN)
+      set (msg "Performing TEST_LFS_WORKS")
+      try_run (TEST_LFS_WORKS_RUN   TEST_LFS_WORKS_COMPILE
+          ${CMAKE_BINARY_DIR}
+          ${HDF_RESOURCES_DIR}/HDFTests.c
+          COMPILE_DEFINITIONS "-DTEST_LFS_WORKS"
+      )
+
+      # The LARGEFILE definitions were from the transition period
+      # and are probably no longer needed. The FILE_OFFSET_BITS
+      # check should be generalized for all POSIX systems as it
+      # is in the Autotools.
+      if (TEST_LFS_WORKS_COMPILE)
+        if (TEST_LFS_WORKS_RUN MATCHES 0)
+          set (TEST_LFS_WORKS 1 CACHE INTERNAL ${msg})
+          set (LARGEFILE 1)
+          set (HDF_EXTRA_FLAGS ${HDF_EXTRA_FLAGS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE)
+          message (VERBOSE "${msg}... yes")
+        else ()
+          set (TEST_LFS_WORKS "" CACHE INTERNAL ${msg})
+          message (VERBOSE "${msg}... no")
+          file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
+                "Test TEST_LFS_WORKS Run failed with the following exit code:\n ${TEST_LFS_WORKS_RUN}\n"
+          )
+        endif ()
+      else ()
+        set (TEST_LFS_WORKS "" CACHE INTERNAL ${msg})
+        message (VERBOSE "${msg}... no")
+        file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
+            "Test TEST_LFS_WORKS Compile failed\n"
+        )
+      endif ()
+    endif ()
+    set (CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} ${HDF_EXTRA_FLAGS})
+  endif ()
+endif ()
+
+#-----------------------------------------------------------------------------
+# Check for HAVE_OFF64_T functionality
+#-----------------------------------------------------------------------------
+if (MINGW OR NOT WINDOWS)
+  HDF_FUNCTION_TEST (HAVE_OFF64_T)
+  if (${HDF_PREFIX}_HAVE_OFF64_T)
+    CHECK_FUNCTION_EXISTS (lseek64            ${HDF_PREFIX}_HAVE_LSEEK64)
+  endif ()
+
+  CHECK_FUNCTION_EXISTS (fseeko               ${HDF_PREFIX}_HAVE_FSEEKO)
+
+  CHECK_STRUCT_HAS_MEMBER("struct stat64" st_blocks "sys/types.h;sys/stat.h" HAVE_STAT64_STRUCT)
+  if (HAVE_STAT64_STRUCT)
+    CHECK_FUNCTION_EXISTS (stat64             ${HDF_PREFIX}_HAVE_STAT64)
+  endif ()
+endif ()
+
+#-----------------------------------------------------------------------------
+#  Check the size in bytes of all the int and float types
+#-----------------------------------------------------------------------------
+macro (HDF_CHECK_TYPE_SIZE type var)
+  set (aType ${type})
+  set (aVar  ${var})
+  message (TRACE "Checking size of ${aType} and storing into ${aVar}")
+  CHECK_TYPE_SIZE (${aType}   ${aVar})
+  if (NOT ${aVar})
+    set (${aVar} 0 CACHE INTERNAL "SizeOf for ${aType}")
+    message (TRACE "Size of ${aType} was NOT Found")
+  endif ()
+endmacro ()
+
+HDF_CHECK_TYPE_SIZE (char           ${HDF_PREFIX}_SIZEOF_CHAR)
+HDF_CHECK_TYPE_SIZE (short          ${HDF_PREFIX}_SIZEOF_SHORT)
+HDF_CHECK_TYPE_SIZE (int            ${HDF_PREFIX}_SIZEOF_INT)
+HDF_CHECK_TYPE_SIZE (unsigned       ${HDF_PREFIX}_SIZEOF_UNSIGNED)
+if (NOT APPLE)
+  HDF_CHECK_TYPE_SIZE (long         ${HDF_PREFIX}_SIZEOF_LONG)
+endif ()
+HDF_CHECK_TYPE_SIZE ("long long"    ${HDF_PREFIX}_SIZEOF_LONG_LONG)
+
+HDF_CHECK_TYPE_SIZE (float          ${HDF_PREFIX}_SIZEOF_FLOAT)
+HDF_CHECK_TYPE_SIZE (double         ${HDF_PREFIX}_SIZEOF_DOUBLE)
+HDF_CHECK_TYPE_SIZE ("long double"  ${HDF_PREFIX}_SIZEOF_LONG_DOUBLE)
+
+HDF_CHECK_TYPE_SIZE (int8_t         ${HDF_PREFIX}_SIZEOF_INT8_T)
+HDF_CHECK_TYPE_SIZE (uint8_t        ${HDF_PREFIX}_SIZEOF_UINT8_T)
+HDF_CHECK_TYPE_SIZE (int_least8_t   ${HDF_PREFIX}_SIZEOF_INT_LEAST8_T)
+HDF_CHECK_TYPE_SIZE (uint_least8_t  ${HDF_PREFIX}_SIZEOF_UINT_LEAST8_T)
+HDF_CHECK_TYPE_SIZE (int_fast8_t    ${HDF_PREFIX}_SIZEOF_INT_FAST8_T)
+HDF_CHECK_TYPE_SIZE (uint_fast8_t   ${HDF_PREFIX}_SIZEOF_UINT_FAST8_T)
+
+HDF_CHECK_TYPE_SIZE (int16_t        ${HDF_PREFIX}_SIZEOF_INT16_T)
+HDF_CHECK_TYPE_SIZE (uint16_t       ${HDF_PREFIX}_SIZEOF_UINT16_T)
+HDF_CHECK_TYPE_SIZE (int_least16_t  ${HDF_PREFIX}_SIZEOF_INT_LEAST16_T)
+HDF_CHECK_TYPE_SIZE (uint_least16_t ${HDF_PREFIX}_SIZEOF_UINT_LEAST16_T)
+HDF_CHECK_TYPE_SIZE (int_fast16_t   ${HDF_PREFIX}_SIZEOF_INT_FAST16_T)
+HDF_CHECK_TYPE_SIZE (uint_fast16_t  ${HDF_PREFIX}_SIZEOF_UINT_FAST16_T)
+
+HDF_CHECK_TYPE_SIZE (int32_t        ${HDF_PREFIX}_SIZEOF_INT32_T)
+HDF_CHECK_TYPE_SIZE (uint32_t       ${HDF_PREFIX}_SIZEOF_UINT32_T)
+HDF_CHECK_TYPE_SIZE (int_least32_t  ${HDF_PREFIX}_SIZEOF_INT_LEAST32_T)
+HDF_CHECK_TYPE_SIZE (uint_least32_t ${HDF_PREFIX}_SIZEOF_UINT_LEAST32_T)
+HDF_CHECK_TYPE_SIZE (int_fast32_t   ${HDF_PREFIX}_SIZEOF_INT_FAST32_T)
+HDF_CHECK_TYPE_SIZE (uint_fast32_t  ${HDF_PREFIX}_SIZEOF_UINT_FAST32_T)
+
+HDF_CHECK_TYPE_SIZE (int64_t        ${HDF_PREFIX}_SIZEOF_INT64_T)
+HDF_CHECK_TYPE_SIZE (uint64_t       ${HDF_PREFIX}_SIZEOF_UINT64_T)
+HDF_CHECK_TYPE_SIZE (int_least64_t  ${HDF_PREFIX}_SIZEOF_INT_LEAST64_T)
+HDF_CHECK_TYPE_SIZE (uint_least64_t ${HDF_PREFIX}_SIZEOF_UINT_LEAST64_T)
+HDF_CHECK_TYPE_SIZE (int_fast64_t   ${HDF_PREFIX}_SIZEOF_INT_FAST64_T)
+HDF_CHECK_TYPE_SIZE (uint_fast64_t  ${HDF_PREFIX}_SIZEOF_UINT_FAST64_T)
+
+HDF_CHECK_TYPE_SIZE (size_t       ${HDF_PREFIX}_SIZEOF_SIZE_T)
+HDF_CHECK_TYPE_SIZE (ssize_t      ${HDF_PREFIX}_SIZEOF_SSIZE_T)
+if (NOT ${HDF_PREFIX}_SIZEOF_SSIZE_T)
+  set (${HDF_PREFIX}_SIZEOF_SSIZE_T 0)
+endif ()
+if (MINGW OR NOT WINDOWS)
+  HDF_CHECK_TYPE_SIZE (ptrdiff_t    ${HDF_PREFIX}_SIZEOF_PTRDIFF_T)
+endif ()
+
+HDF_CHECK_TYPE_SIZE (off_t          ${HDF_PREFIX}_SIZEOF_OFF_T)
+HDF_CHECK_TYPE_SIZE (off64_t        ${HDF_PREFIX}_SIZEOF_OFF64_T)
+if (NOT ${HDF_PREFIX}_SIZEOF_OFF64_T)
+  set (${HDF_PREFIX}_SIZEOF_OFF64_T 0)
+endif ()
+HDF_CHECK_TYPE_SIZE (time_t          ${HDF_PREFIX}_SIZEOF_TIME_T)
 
 #-----------------------------------------------------------------------------
-# Option to Clear File Buffers before write --enable-clear-file-buffers
+# Extra C99 types
 #-----------------------------------------------------------------------------
-option (HDF5_Enable_Clear_File_Buffers "Securely clear file buffers before writing to file" ON)
-if (HDF5_Enable_Clear_File_Buffers)
-  set (H5_CLEAR_MEMORY 1)
-endif (HDF5_Enable_Clear_File_Buffers)
-MARK_AS_ADVANCED (HDF5_Enable_Clear_File_Buffers)
+
+# Size of bool
+set (CMAKE_EXTRA_INCLUDE_FILES stdbool.h)
+HDF_CHECK_TYPE_SIZE (_Bool        ${HDF_PREFIX}_SIZEOF_BOOL)
+
+if (MINGW OR NOT WINDOWS)
+  #-----------------------------------------------------------------------------
+  # Check if the dev_t type is a scalar type
+  #-----------------------------------------------------------------------------
+  HDF_FUNCTION_TEST (DEV_T_IS_SCALAR)
+
+  # ----------------------------------------------------------------------
+  # Check for MONOTONIC_TIMER support (used in clock_gettime).  This has
+  # to be done after any POSIX/BSD defines to ensure that the test gets
+  # the correct POSIX level on linux.
+  CHECK_VARIABLE_EXISTS (CLOCK_MONOTONIC HAVE_CLOCK_MONOTONIC)
+
+  #-----------------------------------------------------------------------------
+  # Check a bunch of time functions
+  #-----------------------------------------------------------------------------
+  CHECK_STRUCT_HAS_MEMBER("struct tm" tm_gmtoff "time.h" ${HDF_PREFIX}_HAVE_TM_GMTOFF)
+  CHECK_STRUCT_HAS_MEMBER("struct tm" __tm_gmtoff "time.h" ${HDF_PREFIX}_HAVE___TM_GMTOFF)
+  if (${HDF_PREFIX}_HAVE_SYS_TIME_H)
+    CHECK_STRUCT_HAS_MEMBER("struct tm" tz_minuteswest "sys/types.h;sys/time.h;time.h" ${HDF_PREFIX}_HAVE_STRUCT_TIMEZONE)
+  else ()
+    CHECK_STRUCT_HAS_MEMBER("struct tm" tz_minuteswest "sys/types.h;time.h" ${HDF_PREFIX}_HAVE_STRUCT_TIMEZONE)
+  endif ()
+  CHECK_FUNCTION_EXISTS (gettimeofday      ${HDF_PREFIX}_HAVE_GETTIMEOFDAY)
+  foreach (time_test
+#      HAVE_TIMEZONE
+      GETTIMEOFDAY_GIVES_TZ
+      HAVE_TM_ZONE
+      HAVE_STRUCT_TM_TM_ZONE
+  )
+    HDF_FUNCTION_TEST (${time_test})
+  endforeach ()
+  if (NOT CYGWIN AND NOT MINGW)
+      HDF_FUNCTION_TEST (HAVE_TIMEZONE)
+  endif ()
+
+  # ----------------------------------------------------------------------
+  # Does the struct stat have the st_blocks field?  This field is not POSIX.
+  #
+  CHECK_STRUCT_HAS_MEMBER("struct stat" st_blocks "sys/types.h;sys/stat.h" ${HDF_PREFIX}_HAVE_STAT_ST_BLOCKS)
+
+  # ----------------------------------------------------------------------
+  # How do we figure out the width of a tty in characters?
+  #
+  CHECK_FUNCTION_EXISTS (ioctl             ${HDF_PREFIX}_HAVE_IOCTL)
+  CHECK_STRUCT_HAS_MEMBER ("struct videoconfig" numtextcols "" ${HDF_PREFIX}_HAVE_STRUCT_VIDEOCONFIG)
+  CHECK_STRUCT_HAS_MEMBER ("struct text_info" screenwidth "" ${HDF_PREFIX}_HAVE_STRUCT_TEXT_INFO)
+  CHECK_FUNCTION_EXISTS (_getvideoconfig   ${HDF_PREFIX}_HAVE__GETVIDEOCONFIG)
+  CHECK_FUNCTION_EXISTS (gettextinfo       ${HDF_PREFIX}_HAVE_GETTEXTINFO)
+  CHECK_FUNCTION_EXISTS (_scrsize          ${HDF_PREFIX}_HAVE__SCRSIZE)
+  if (NOT CYGWIN)
+    CHECK_FUNCTION_EXISTS (GetConsoleScreenBufferInfo    ${HDF_PREFIX}_HAVE_GETCONSOLESCREENBUFFERINFO)
+  endif ()
+  CHECK_SYMBOL_EXISTS (TIOCGWINSZ "sys/ioctl.h" ${HDF_PREFIX}_HAVE_TIOCGWINSZ)
+  CHECK_SYMBOL_EXISTS (TIOCGETD   "sys/ioctl.h" ${HDF_PREFIX}_HAVE_TIOCGETD)
+
+  # ----------------------------------------------------------------------
+  # cygwin user credentials are different then on linux
+  #
+  if (NOT CYGWIN AND NOT MINGW)
+    CHECK_FUNCTION_EXISTS (getpwuid        ${HDF_PREFIX}_HAVE_GETPWUID)
+  endif ()
+endif ()
+
+#-----------------------------------------------------------------------------
+# Check for some functions that are used
+#
+CHECK_FUNCTION_EXISTS (alarm             ${HDF_PREFIX}_HAVE_ALARM)
+CHECK_FUNCTION_EXISTS (fcntl             ${HDF_PREFIX}_HAVE_FCNTL)
+CHECK_FUNCTION_EXISTS (flock             ${HDF_PREFIX}_HAVE_FLOCK)
+CHECK_FUNCTION_EXISTS (fork              ${HDF_PREFIX}_HAVE_FORK)
+
+CHECK_FUNCTION_EXISTS (gethostname       ${HDF_PREFIX}_HAVE_GETHOSTNAME)
+CHECK_FUNCTION_EXISTS (getrusage         ${HDF_PREFIX}_HAVE_GETRUSAGE)
+CHECK_FUNCTION_EXISTS (lstat             ${HDF_PREFIX}_HAVE_LSTAT)
+
+CHECK_FUNCTION_EXISTS (pread             ${HDF_PREFIX}_HAVE_PREAD)
+CHECK_FUNCTION_EXISTS (pwrite            ${HDF_PREFIX}_HAVE_PWRITE)
+CHECK_FUNCTION_EXISTS (rand_r            ${HDF_PREFIX}_HAVE_RAND_R)
+CHECK_FUNCTION_EXISTS (random            ${HDF_PREFIX}_HAVE_RANDOM)
+CHECK_FUNCTION_EXISTS (setsysinfo        ${HDF_PREFIX}_HAVE_SETSYSINFO)
+
+CHECK_FUNCTION_EXISTS (siglongjmp        ${HDF_PREFIX}_HAVE_SIGLONGJMP)
+CHECK_FUNCTION_EXISTS (sigsetjmp         ${HDF_PREFIX}_HAVE_SIGSETJMP)
+CHECK_FUNCTION_EXISTS (sigprocmask       ${HDF_PREFIX}_HAVE_SIGPROCMASK)
+
+CHECK_FUNCTION_EXISTS (srandom           ${HDF_PREFIX}_HAVE_SRANDOM)
+CHECK_FUNCTION_EXISTS (strcasestr        ${HDF_PREFIX}_HAVE_STRCASESTR)
+CHECK_FUNCTION_EXISTS (strdup            ${HDF_PREFIX}_HAVE_STRDUP)
+CHECK_FUNCTION_EXISTS (symlink           ${HDF_PREFIX}_HAVE_SYMLINK)
+
+CHECK_FUNCTION_EXISTS (tmpfile           ${HDF_PREFIX}_HAVE_TMPFILE)
+CHECK_FUNCTION_EXISTS (asprintf          ${HDF_PREFIX}_HAVE_ASPRINTF)
+CHECK_FUNCTION_EXISTS (vasprintf         ${HDF_PREFIX}_HAVE_VASPRINTF)
+CHECK_FUNCTION_EXISTS (waitpid           ${HDF_PREFIX}_HAVE_WAITPID)
+
+#-----------------------------------------------------------------------------
+# sigsetjmp is special; may actually be a macro
+#-----------------------------------------------------------------------------
+if (NOT ${HDF_PREFIX}_HAVE_SIGSETJMP)
+  CHECK_SYMBOL_EXISTS (sigsetjmp "setjmp.h" ${HDF_PREFIX}_HAVE_MACRO_SIGSETJMP)
+  if (${HDF_PREFIX}_HAVE_MACRO_SIGSETJMP)
+    set (${HDF_PREFIX}_HAVE_SIGSETJMP 1)
+  endif ()
+endif ()
+
+#-----------------------------------------------------------------------------
+# Check a bunch of other functions
+#-----------------------------------------------------------------------------
+if (MINGW OR NOT WINDOWS)
+  foreach (other_test
+      HAVE_ATTRIBUTE
+      SYSTEM_SCOPE_THREADS
+      HAVE_SOCKLEN_T
+  )
+    HDF_FUNCTION_TEST (${other_test})
+  endforeach ()
+endif ()
+
+#-----------------------------------------------------------------------------
+# Check if InitOnceExecuteOnce is available
+#-----------------------------------------------------------------------------
+if (WINDOWS)
+  if (NOT HDF_NO_IOEO_TEST)
+    message (VERBOSE "Checking for InitOnceExecuteOnce:")
+  if (NOT DEFINED ${HDF_PREFIX}_HAVE_IOEO)
+    if (LARGEFILE)
+      set (CMAKE_REQUIRED_DEFINITIONS
+          "${CURRENT_TEST_DEFINITIONS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE"
+      )
+    endif ()
+    set (MACRO_CHECK_FUNCTION_DEFINITIONS "-DHAVE_IOEO ${CMAKE_REQUIRED_FLAGS}")
+    if (CMAKE_REQUIRED_INCLUDES)
+      set (CHECK_C_SOURCE_COMPILES_ADD_INCLUDES "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}")
+    else ()
+      set (CHECK_C_SOURCE_COMPILES_ADD_INCLUDES)
+    endif ()
+
+    TRY_RUN(HAVE_IOEO_EXITCODE HAVE_IOEO_COMPILED
+        ${CMAKE_BINARY_DIR}
+        ${HDF_RESOURCES_DIR}/HDFTests.c
+        COMPILE_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS} ${MACRO_CHECK_FUNCTION_DEFINITIONS}"
+        LINK_LIBRARIES "${HDF5_REQUIRED_LIBRARIES}"
+        CMAKE_FLAGS "${CHECK_C_SOURCE_COMPILES_ADD_INCLUDES} -DCMAKE_SKIP_RPATH:BOOL=${CMAKE_SKIP_RPATH}"
+        COMPILE_OUTPUT_VARIABLE OUTPUT
+    )
+    # if it did not compile make the return value fail code of 1
+    if (NOT HAVE_IOEO_COMPILED)
+      set (HAVE_IOEO_EXITCODE 1)
+    endif ()
+    # if the return value was 0 then it worked
+    if ("${HAVE_IOEO_EXITCODE}" EQUAL 0)
+      set (${HDF_PREFIX}_HAVE_IOEO 1 CACHE INTERNAL "Test InitOnceExecuteOnce")
+      message (VERBOSE "Performing Test InitOnceExecuteOnce - Success")
+      file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
+        "Performing C SOURCE FILE Test InitOnceExecuteOnce succeeded with the following output:\n"
+        "${OUTPUT}\n"
+        "Return value: ${HAVE_IOEO}\n")
+    else ()
+      if (CMAKE_CROSSCOMPILING AND "${HAVE_IOEO_EXITCODE}" MATCHES  "FAILED_TO_RUN")
+        set (${HDF_PREFIX}_HAVE_IOEO "${HAVE_IOEO_EXITCODE}")
+      else ()
+        set (${HDF_PREFIX}_HAVE_IOEO "" CACHE INTERNAL "Test InitOnceExecuteOnce")
+      endif ()
+
+      message (VERBOSE "Performing Test InitOnceExecuteOnce - Failed")
+      file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
+        "Performing InitOnceExecuteOnce Test  failed with the following output:\n"
+        "${OUTPUT}\n"
+        "Return value: ${HAVE_IOEO_EXITCODE}\n")
+    endif ()
+  endif ()
+  endif ()
+endif ()
+
+# ----------------------------------------------------------------------
+# Set the flag to indicate that the machine can handle converting
+# denormalized floating-point values.
+# (This flag should be set for all machines, except for the Crays, where
+# the cache value is set in its config file)
+#-----------------------------------------------------------------------------
+set (${HDF_PREFIX}_CONVERT_DENORMAL_FLOAT 1)
+
+# ----------------------------------------------------------------------
+# Set a special flag when using memory sanity checkers like Valgrind.
+# This disables the free lists, as the memory reuse scheme they implement
+# can hide memory problems.
+#-----------------------------------------------------------------------------
+if (HDF5_ENABLE_USING_MEMCHECKER)
+  set (${HDF_PREFIX}_USING_MEMCHECKER 1)
+endif ()
 
 #-----------------------------------------------------------------------------
 # Option for --enable-strict-format-checks
 #-----------------------------------------------------------------------------
 option (HDF5_STRICT_FORMAT_CHECKS "Whether to perform strict file format checks" OFF)
 if (HDF5_STRICT_FORMAT_CHECKS)
-  set (H5_STRICT_FORMAT_CHECKS 1)
-endif (HDF5_STRICT_FORMAT_CHECKS)
+  set (${HDF_PREFIX}_STRICT_FORMAT_CHECKS 1)
+endif ()
 MARK_AS_ADVANCED (HDF5_STRICT_FORMAT_CHECKS)
 
-#-----------------------------------------------------------------------------
-# Option for --enable-metadata-trace-file
-#-----------------------------------------------------------------------------
-option (HDF5_METADATA_TRACE_FILE "Enable metadata trace file collection" OFF)
-if (HDF5_METADATA_TRACE_FILE)
-  set (H5_METADATA_TRACE_FILE 1)
-endif (HDF5_METADATA_TRACE_FILE)
-MARK_AS_ADVANCED (HDF5_METADATA_TRACE_FILE)
-
 # ----------------------------------------------------------------------
 # Decide whether the data accuracy has higher priority during data
-# conversions.  If not, some hard conversions will still be prefered even
+# conversions.  If not, some hard conversions will still be preferred even
 # though the data may be wrong (for example, some compilers don't
 # support denormalized floating values) to maximize speed.
-#
+#-----------------------------------------------------------------------------
 option (HDF5_WANT_DATA_ACCURACY "IF data accuracy is guaranteed during data conversions" ON)
 if (HDF5_WANT_DATA_ACCURACY)
-  set (H5_WANT_DATA_ACCURACY 1)
-endif (HDF5_WANT_DATA_ACCURACY)
+  set (${HDF_PREFIX}_WANT_DATA_ACCURACY 1)
+endif ()
 MARK_AS_ADVANCED (HDF5_WANT_DATA_ACCURACY)
 
 # ----------------------------------------------------------------------
@@ -49,161 +590,287 @@ MARK_AS_ADVANCED (HDF5_WANT_DATA_ACCURACY)
 # checked and data conversion exceptions are returned.  This is mainly
 # for the speed optimization of hard conversions.  Soft conversions can
 # actually benefit little.
-#
+#-----------------------------------------------------------------------------
 option (HDF5_WANT_DCONV_EXCEPTION "exception handling functions is checked during data conversions" ON)
 if (HDF5_WANT_DCONV_EXCEPTION)
-  set (H5_WANT_DCONV_EXCEPTION 1)
-endif (HDF5_WANT_DCONV_EXCEPTION)
+  set (${HDF_PREFIX}_WANT_DCONV_EXCEPTION 1)
+endif ()
 MARK_AS_ADVANCED (HDF5_WANT_DCONV_EXCEPTION)
 
 # ----------------------------------------------------------------------
 # Check if they would like the function stack support compiled in
-#
+#-----------------------------------------------------------------------------
 option (HDF5_ENABLE_CODESTACK "Enable the function stack tracing (for developer debugging)." OFF)
 if (HDF5_ENABLE_CODESTACK)
-  set (H5_HAVE_CODESTACK 1)
-endif (HDF5_ENABLE_CODESTACK)
+  set (${HDF_PREFIX}_HAVE_CODESTACK 1)
+endif ()
 MARK_AS_ADVANCED (HDF5_ENABLE_CODESTACK)
 
+# ----------------------------------------------------------------------
+# Check if they would like to use file locking by default
 #-----------------------------------------------------------------------------
-#  Are we going to use HSIZE_T
+option (HDF5_USE_FILE_LOCKING "Use file locking by default (mainly for SWMR)" ON)
+if (HDF5_USE_FILE_LOCKING)
+  set (${HDF_PREFIX}_USE_FILE_LOCKING 1)
+endif ()
+
+# ----------------------------------------------------------------------
+# Check if they would like to ignore file locks when disabled on a file system
 #-----------------------------------------------------------------------------
-option (HDF5_ENABLE_HSIZET "Enable datasets larger than memory" ON)
-if (HDF5_ENABLE_HSIZET)
-  set (${HDF_PREFIX}_HAVE_LARGE_HSIZET 1)
-endif (HDF5_ENABLE_HSIZET)
+option (HDF5_IGNORE_DISABLED_FILE_LOCKS "Ignore file locks when disabled on file system" ON)
+if (HDF5_IGNORE_DISABLED_FILE_LOCKS)
+  set (${HDF_PREFIX}_IGNORE_DISABLED_FILE_LOCKS 1)
+endif ()
+
+# Set the libhdf5.settings file variable
+if (HDF5_IGNORE_DISABLED_FILE_LOCKS AND HDF5_USE_FILE_LOCKING)
+  set (HDF5_FILE_LOCKING_SETTING "best-effort")
+elseif (HDF5_IGNORE_DISABLED_FILE_LOCKS)
+  set (HDF5_FILE_LOCKING_SETTING "yes")
+else ()
+  set (HDF5_FILE_LOCKING_SETTING "no")
+endif ()
 
 # so far we have no check for this
-set (H5_HAVE_TMPFILE 1)
+set (${HDF_PREFIX}_HAVE_TMPFILE 1)
 
 # TODO --------------------------------------------------------------------------
 # Should the Default Virtual File Driver be compiled?
 # This is hard-coded now but option should added to match configure
-#
-set (H5_DEFAULT_VFD H5FD_SEC2)
+#-----------------------------------------------------------------------------
+set (${HDF_PREFIX}_DEFAULT_VFD H5FD_SEC2)
 
-if (NOT DEFINED "H5_DEFAULT_PLUGINDIR")
+if (NOT DEFINED "${HDF_PREFIX}_DEFAULT_PLUGINDIR")
   if (WINDOWS)
-    set (H5_DEFAULT_PLUGINDIR "%ALLUSERSPROFILE%\\\\hdf5\\\\lib\\\\plugin")
-  else (WINDOWS)
-    set (H5_DEFAULT_PLUGINDIR "/usr/local/hdf5/lib/plugin")
-  endif (WINDOWS)
-endif (NOT DEFINED "H5_DEFAULT_PLUGINDIR")
+    set (${HDF_PREFIX}_DEFAULT_PLUGINDIR "%ALLUSERSPROFILE%\\\\hdf5\\\\lib\\\\plugin")
+  else ()
+    set (${HDF_PREFIX}_DEFAULT_PLUGINDIR "/usr/local/hdf5/lib/plugin")
+  endif ()
+endif ()
 
 if (WINDOWS)
-  set (H5_HAVE_WINDOWS 1)
+  set (${HDF_PREFIX}_HAVE_WINDOWS 1)
   # ----------------------------------------------------------------------
   # Set the flag to indicate that the machine has window style pathname,
   # that is, "drive-letter:\" (e.g. "C:") or "drive-letter:/" (e.g. "C:/").
   # (This flag should be _unset_ for all machines, except for Windows)
-  set (H5_HAVE_WINDOW_PATH 1)
-endif (WINDOWS)
+  #-----------------------------------------------------------------------
+  set (${HDF_PREFIX}_HAVE_WINDOW_PATH 1)
+endif ()
 
 # ----------------------------------------------------------------------
 # END of WINDOWS Hard code Values
 # ----------------------------------------------------------------------
 
-CHECK_FUNCTION_EXISTS (difftime          H5_HAVE_DIFFTIME)
-#CHECK_FUNCTION_EXISTS (gettimeofday      H5_HAVE_GETTIMEOFDAY)
-#  Since gettimeofday is not defined any where standard, lets look in all the
-#  usual places. On MSVC we are just going to use ::clock()
-if (NOT MSVC)
-  if ("H5_HAVE_TIME_GETTIMEOFDAY" MATCHES "^H5_HAVE_TIME_GETTIMEOFDAY$")
-    TRY_COMPILE (HAVE_TIME_GETTIMEOFDAY
-        ${CMAKE_BINARY_DIR}
-        ${HDF_RESOURCES_EXT_DIR}/GetTimeOfDayTest.cpp
-        COMPILE_DEFINITIONS -DTRY_TIME_H
-        OUTPUT_VARIABLE OUTPUT
-    )
-    if (HAVE_TIME_GETTIMEOFDAY STREQUAL "TRUE")
-      set (H5_HAVE_TIME_GETTIMEOFDAY "1" CACHE INTERNAL "H5_HAVE_TIME_GETTIMEOFDAY")
-      set (H5_HAVE_GETTIMEOFDAY "1" CACHE INTERNAL "H5_HAVE_GETTIMEOFDAY")
-    endif (HAVE_TIME_GETTIMEOFDAY STREQUAL "TRUE")
-  endif ("H5_HAVE_TIME_GETTIMEOFDAY" MATCHES "^H5_HAVE_TIME_GETTIMEOFDAY$")
-
-  if ("H5_HAVE_SYS_TIME_GETTIMEOFDAY" MATCHES "^H5_HAVE_SYS_TIME_GETTIMEOFDAY$")
-    TRY_COMPILE (HAVE_SYS_TIME_GETTIMEOFDAY
-        ${CMAKE_BINARY_DIR}
-        ${HDF_RESOURCES_EXT_DIR}/GetTimeOfDayTest.cpp
-        COMPILE_DEFINITIONS -DTRY_SYS_TIME_H
-        OUTPUT_VARIABLE OUTPUT
-    )
-    if (HAVE_SYS_TIME_GETTIMEOFDAY STREQUAL "TRUE")
-      set (H5_HAVE_SYS_TIME_GETTIMEOFDAY "1" CACHE INTERNAL "H5_HAVE_SYS_TIME_GETTIMEOFDAY")
-      set (H5_HAVE_GETTIMEOFDAY "1" CACHE INTERNAL "H5_HAVE_GETTIMEOFDAY")
-    endif (HAVE_SYS_TIME_GETTIMEOFDAY STREQUAL "TRUE")
-  endif ("H5_HAVE_SYS_TIME_GETTIMEOFDAY" MATCHES "^H5_HAVE_SYS_TIME_GETTIMEOFDAY$")
-
-  if (NOT HAVE_SYS_TIME_GETTIMEOFDAY AND NOT H5_HAVE_GETTIMEOFDAY)
-    message (STATUS "---------------------------------------------------------------")
-    message (STATUS "Function 'gettimeofday()' was not found. HDF5 will use its")
-    message (STATUS "  own implementation.. This can happen on older versions of")
-    message (STATUS "  MinGW on Windows. Consider upgrading your MinGW installation")
-    message (STATUS "  to a newer version such as MinGW 3.12")
-    message (STATUS "---------------------------------------------------------------")
-  endif (NOT HAVE_SYS_TIME_GETTIMEOFDAY AND NOT H5_HAVE_GETTIMEOFDAY)
-endif (NOT MSVC)
-
 # Find the library containing clock_gettime()
-if (NOT WINDOWS)
-  CHECK_FUNCTION_EXISTS(clock_gettime CLOCK_GETTIME_IN_LIBC)
-  CHECK_LIBRARY_EXISTS(rt clock_gettime "" CLOCK_GETTIME_IN_LIBRT)
-  CHECK_LIBRARY_EXISTS(posix4 clock_gettime "" CLOCK_GETTIME_IN_LIBPOSIX4)
+if (MINGW OR NOT WINDOWS)
+  CHECK_FUNCTION_EXISTS (clock_gettime CLOCK_GETTIME_IN_LIBC)
+  CHECK_LIBRARY_EXISTS (rt clock_gettime "" CLOCK_GETTIME_IN_LIBRT)
+  CHECK_LIBRARY_EXISTS (posix4 clock_gettime "" CLOCK_GETTIME_IN_LIBPOSIX4)
   if (CLOCK_GETTIME_IN_LIBC)
-    set (H5_HAVE_CLOCK_GETTIME 1)
+    set (${HDF_PREFIX}_HAVE_CLOCK_GETTIME 1)
   elseif (CLOCK_GETTIME_IN_LIBRT)
-    set (H5_HAVE_CLOCK_GETTIME 1)
+    set (${HDF_PREFIX}_HAVE_CLOCK_GETTIME 1)
     list (APPEND LINK_LIBS rt)
   elseif (CLOCK_GETTIME_IN_LIBPOSIX4)
-    set (H5_HAVE_CLOCK_GETTIME 1)
+    set (${HDF_PREFIX}_HAVE_CLOCK_GETTIME 1)
     list (APPEND LINK_LIBS posix4)
-  endif (CLOCK_GETTIME_IN_LIBC)
-endif (NOT WINDOWS)
+  endif ()
+endif ()
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 #  Check if Direct I/O driver works
 #-----------------------------------------------------------------------------
 if (NOT WINDOWS)
-  option (HDF5_ENABLE_DIRECT_VFD "Build the Direct I/O Virtual File Driver" ON)
+  option (HDF5_ENABLE_DIRECT_VFD "Build the Direct I/O Virtual File Driver" OFF)
   if (HDF5_ENABLE_DIRECT_VFD)
     set (msg "Performing TEST_DIRECT_VFD_WORKS")
     set (MACRO_CHECK_FUNCTION_DEFINITIONS "-DTEST_DIRECT_VFD_WORKS -D_GNU_SOURCE ${CMAKE_REQUIRED_FLAGS}")
     TRY_RUN (TEST_DIRECT_VFD_WORKS_RUN   TEST_DIRECT_VFD_WORKS_COMPILE
         ${CMAKE_BINARY_DIR}
-        ${HDF_RESOURCES_EXT_DIR}/HDFTests.c
+        ${HDF_RESOURCES_DIR}/HDFTests.c
         CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_FUNCTION_DEFINITIONS}
         OUTPUT_VARIABLE OUTPUT
     )
     if (TEST_DIRECT_VFD_WORKS_COMPILE)
-      if (TEST_DIRECT_VFD_WORKS_RUN  MATCHES 0)
+      if (TEST_DIRECT_VFD_WORKS_RUN EQUAL "0")
         HDF_FUNCTION_TEST (HAVE_DIRECT)
         set (CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS} -D_GNU_SOURCE")
         add_definitions ("-D_GNU_SOURCE")
-      else (TEST_DIRECT_VFD_WORKS_RUN  MATCHES 0)
+      else ()
         set (TEST_DIRECT_VFD_WORKS "" CACHE INTERNAL ${msg})
-        message (STATUS "${msg}... no")
+        message (VERBOSE "${msg}... no")
         file (APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log
               "Test TEST_DIRECT_VFD_WORKS Run failed with the following output and exit code:\n ${OUTPUT}\n"
         )
-      endif (TEST_DIRECT_VFD_WORKS_RUN  MATCHES 0)
-    else (TEST_DIRECT_VFD_WORKS_COMPILE )
+      endif ()
+    else ()
       set (TEST_DIRECT_VFD_WORKS "" CACHE INTERNAL ${msg})
-      message (STATUS "${msg}... no")
+      message (VERBOSE "${msg}... no")
       file (APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log
           "Test TEST_DIRECT_VFD_WORKS Compile failed with the following output:\n ${OUTPUT}\n"
       )
-    endif (TEST_DIRECT_VFD_WORKS_COMPILE)
-  endif (HDF5_ENABLE_DIRECT_VFD)
-endif (NOT WINDOWS)
+    endif ()
+  endif ()
+endif ()
+
+#-----------------------------------------------------------------------------
+#  Check if ROS3 driver can be built
+#-----------------------------------------------------------------------------
+option (HDF5_ENABLE_ROS3_VFD "Build the ROS3 Virtual File Driver" OFF)
+  if (HDF5_ENABLE_ROS3_VFD)
+    find_package(CURL REQUIRED)
+    find_package(OpenSSL REQUIRED)
+    if (${CURL_FOUND} AND ${OPENSSL_FOUND})
+      set (${HDF_PREFIX}_HAVE_ROS3_VFD 1)
+      list (APPEND LINK_LIBS ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES})
+      INCLUDE_DIRECTORIES (${CURL_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIR})
+    else ()
+      message (WARNING "The Read-Only S3 VFD was requested but cannot be built.\nPlease check that openssl and cURL are available on your\nsystem, and/or re-configure without option HDF5_ENABLE_ROS3_VFD.")
+    endif ()
+endif ()
+
+# ----------------------------------------------------------------------
+# Check whether we can build the Mirror VFD
+# ----------------------------------------------------------------------
+option (HDF5_ENABLE_MIRROR_VFD "Build the Mirror Virtual File Driver" OFF)
+if (HDF5_ENABLE_MIRROR_VFD)
+  if ( ${HDF_PREFIX}_HAVE_NETINET_IN_H AND
+       ${HDF_PREFIX}_HAVE_NETDB_H      AND
+       ${HDF_PREFIX}_HAVE_ARPA_INET_H  AND
+       ${HDF_PREFIX}_HAVE_SYS_SOCKET_H AND
+       ${HDF_PREFIX}_HAVE_FORK)
+      set (${HDF_PREFIX}_HAVE_MIRROR_VFD 1)
+  else()
+    message(WARNING "The socket-based Mirror VFD was requested but cannot be built. System prerequisites are not met.")
+  endif()
+endif()
+
+#-----------------------------------------------------------------------------
+# Check if C has __float128 extension (used for Fortran only)
+#-----------------------------------------------------------------------------
+
+if (HDF5_BUILD_FORTRAN)
+  HDF_CHECK_TYPE_SIZE(__float128 _SIZEOF___FLOAT128)
+  if (${_SIZEOF___FLOAT128})
+    set (${HDF_PREFIX}_HAVE_FLOAT128 1)
+    set (${HDF_PREFIX}_SIZEOF___FLOAT128 ${_SIZEOF___FLOAT128})
+  else ()
+    set (${HDF_PREFIX}_HAVE_FLOAT128 0)
+    set (${HDF_PREFIX}_SIZEOF___FLOAT128 0)
+  endif ()
 
+  HDF_CHECK_TYPE_SIZE(_Quad _SIZEOF__QUAD)
+  if (NOT ${_SIZEOF__QUAD})
+    set (${HDF_PREFIX}_SIZEOF__QUAD 0)
+  else ()
+    set (${HDF_PREFIX}_SIZEOF__QUAD ${_SIZEOF__QUAD})
+  endif ()
+
+#-----------------------------------------------------------------------------
+# The provided CMake C macros don't provide a general compile/run function
+# so this one is used.
+#-----------------------------------------------------------------------------
+  set (RUN_OUTPUT_PATH_DEFAULT ${CMAKE_BINARY_DIR})
+  macro (C_RUN FUNCTION_NAME SOURCE_CODE RETURN_VAR RETURN_OUTPUT_VAR)
+      message (VERBOSE "Detecting C ${FUNCTION_NAME}")
+      file (WRITE
+          ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testCCompiler1.c
+          ${SOURCE_CODE}
+      )
+      TRY_RUN (RUN_RESULT_VAR COMPILE_RESULT_VAR
+          ${CMAKE_BINARY_DIR}
+          ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testCCompiler1.c
+          COMPILE_DEFINITIONS "-D_SIZEOF___FLOAT128=${H5_SIZEOF___FLOAT128};-D_HAVE_QUADMATH_H=${H5_HAVE_QUADMATH_H}"
+          COMPILE_OUTPUT_VARIABLE COMPILEOUT
+          RUN_OUTPUT_VARIABLE OUTPUT_VAR
+      )
+
+      set (${RETURN_OUTPUT_VAR} ${OUTPUT_VAR})
+
+      message (VERBOSE "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ")
+      message (VERBOSE "Test COMPILE_RESULT_VAR ${COMPILE_RESULT_VAR} ")
+      message (VERBOSE "Test COMPILE_OUTPUT ${COMPILEOUT} ")
+      message (VERBOSE "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ")
+      message (VERBOSE "Test RUN_RESULT_VAR ${RUN_RESULT_VAR} ")
+      message (VERBOSE "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ")
+
+      if (COMPILE_RESULT_VAR)
+        if (RUN_RESULT_VAR EQUAL "0")
+          set (${RETURN_VAR} 1 CACHE INTERNAL "Have C function ${FUNCTION_NAME}")
+          message (VERBOSE "Testing C ${FUNCTION_NAME} - OK")
+          file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
+              "Determining if the C ${FUNCTION_NAME} exists passed with the following output:\n"
+              "${OUTPUT_VAR}\n\n"
+          )
+        else ()
+          message (VERBOSE "Testing C ${FUNCTION_NAME} - Fail")
+          set (${RETURN_VAR} 0 CACHE INTERNAL "Have C function ${FUNCTION_NAME}")
+          file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
+              "Determining if the C ${FUNCTION_NAME} exists failed with the following output:\n"
+              "${OUTPUT_VAR}\n\n")
+        endif ()
+      else ()
+          message (FATAL_ERROR "Compilation of C ${FUNCTION_NAME} - Failed")
+      endif ()
+  endmacro ()
+
+  set (PROG_SRC
+      "
+#include <float.h>\n\
+#include <stdio.h>\n\
+#define CHECK_FLOAT128 _SIZEOF___FLOAT128\n\
+#if CHECK_FLOAT128!=0\n\
+#if _HAVE_QUADMATH_H!=0\n\
+#include <quadmath.h>\n\
+#endif\n\
+#ifdef FLT128_DIG\n\
+#define C_FLT128_DIG FLT128_DIG\n\
+#else\n\
+#define C_FLT128_DIG 0\n\
+#endif\n\
+#else\n\
+#define C_FLT128_DIG 0\n\
+#endif\n\
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L\n\
+#define C_LDBL_DIG DECIMAL_DIG\n\
+#else\n\
+#define C_LDBL_DIG LDBL_DIG\n\
+#endif\n\nint main() {\nprintf(\"\\%d\\\;\\%d\\\;\", C_LDBL_DIG, C_FLT128_DIG)\\\;\n\nreturn 0\\\;\n}\n
+       "
+  )
+
+  C_RUN ("maximum decimal precision for C" ${PROG_SRC} PROG_RES PROG_OUTPUT4)
+  message (STATUS "Testing maximum decimal precision for C - ${PROG_OUTPUT4}")
+
+  # dnl The output from the above program will be:
+  # dnl  -- long double decimal precision  --  __float128 decimal precision
+
+  list (GET PROG_OUTPUT4 0 H5_LDBL_DIG)
+  list (GET PROG_OUTPUT4 1 H5_FLT128_DIG)
+
+  if (${HDF_PREFIX}_SIZEOF___FLOAT128 EQUAL "0" OR FLT128_DIG EQUAL "0")
+    set (${HDF_PREFIX}_HAVE_FLOAT128 0)
+    set (${HDF_PREFIX}_SIZEOF___FLOAT128 0)
+    set (_PAC_C_MAX_REAL_PRECISION ${H5_LDBL_DIG})
+  else ()
+    set (_PAC_C_MAX_REAL_PRECISION ${H5_FLT128_DIG})
+  endif ()
+  if (NOT ${_PAC_C_MAX_REAL_PRECISION})
+    set (${HDF_PREFIX}_PAC_C_MAX_REAL_PRECISION 0)
+  else ()
+    set (${HDF_PREFIX}_PAC_C_MAX_REAL_PRECISION ${_PAC_C_MAX_REAL_PRECISION})
+  endif ()
+  message (STATUS "maximum decimal precision for C var - ${${HDF_PREFIX}_PAC_C_MAX_REAL_PRECISION}")
+
+endif()
 
 #-----------------------------------------------------------------------------
 # Macro to determine the various conversion capabilities
 #-----------------------------------------------------------------------------
-MACRO (H5ConversionTests TEST msg)
-  if ("${TEST}" MATCHES "^${TEST}$")
-   # message (STATUS "===> ${TEST}")
+macro (H5ConversionTests TEST msg)
+  if (NOT DEFINED ${TEST})
     TRY_RUN (${TEST}_RUN   ${TEST}_COMPILE
         ${CMAKE_BINARY_DIR}
         ${HDF_RESOURCES_DIR}/ConversionTests.c
@@ -211,41 +878,26 @@ MACRO (H5ConversionTests TEST msg)
         OUTPUT_VARIABLE OUTPUT
     )
     if (${TEST}_COMPILE)
-      if (${TEST}_RUN  MATCHES 0)
+      if (${TEST}_RUN EQUAL "0")
         set (${TEST} 1 CACHE INTERNAL ${msg})
-        message (STATUS "${msg}... yes")
-      else (${TEST}_RUN  MATCHES 0)
+        message (VERBOSE "${msg}... yes")
+      else ()
         set (${TEST} "" CACHE INTERNAL ${msg})
-        message (STATUS "${msg}... no")
+        message (VERBOSE "${msg}... no")
         file (APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log
               "Test ${TEST} Run failed with the following output and exit code:\n ${OUTPUT}\n"
         )
-      endif (${TEST}_RUN  MATCHES 0)
-    else (${TEST}_COMPILE )
+      endif ()
+    else ()
       set (${TEST} "" CACHE INTERNAL ${msg})
-      message (STATUS "${msg}... no")
+      message (VERBOSE "${msg}... no")
       file (APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log
           "Test ${TEST} Compile failed with the following output:\n ${OUTPUT}\n"
       )
-    endif (${TEST}_COMPILE)
-
-  endif ("${TEST}" MATCHES "^${TEST}$")
-ENDMACRO (H5ConversionTests)
+    endif ()
 
-#-----------------------------------------------------------------------------
-# Macro to make some of the conversion tests easier to write/read
-#-----------------------------------------------------------------------------
-MACRO (H5MiscConversionTest  VAR TEST msg)
-  if ("${TEST}" MATCHES "^${TEST}$")
-    if (${VAR})
-      set (${TEST} 1 CACHE INTERNAL ${msg})
-      message (STATUS "${msg}... yes")
-    else (${VAR})
-      set (${TEST} "" CACHE INTERNAL ${msg})
-      message (STATUS "${msg}... no")
-    endif (${VAR})
-  endif ("${TEST}" MATCHES "^${TEST}$")
-ENDMACRO (H5MiscConversionTest)
+  endif ()
+endmacro ()
 
 #-----------------------------------------------------------------------------
 # Check various conversion capabilities
@@ -253,63 +905,43 @@ ENDMACRO (H5MiscConversionTest)
 
 # ----------------------------------------------------------------------
 # Set the flag to indicate that the machine is using a special algorithm to convert
-# 'long double' to '(unsigned) long' values.  (This flag should only be set for 
-# the IBM Power6 Linux.  When the bit sequence of long double is 
-# 0x4351ccf385ebc8a0bfcc2a3c3d855620, the converted value of (unsigned)long 
+# 'long double' to '(unsigned) long' values.  (This flag should only be set for
+# the IBM Power6 Linux.  When the bit sequence of long double is
+# 0x4351ccf385ebc8a0bfcc2a3c3d855620, the converted value of (unsigned)long
 # is 0x004733ce17af227f, not the same as the library's conversion to 0x004733ce17af2282.
 # The machine's conversion gets the correct value.  We define the macro and disable
 # this kind of test until we figure out what algorithm they use.
-#
-H5ConversionTests (H5_LDOUBLE_TO_LONG_SPECIAL  "Checking IF your system converts long double to (unsigned) long values with special algorithm")
+#-----------------------------------------------------------------------------
+H5ConversionTests (${HDF_PREFIX}_LDOUBLE_TO_LONG_SPECIAL  "Checking IF your system converts long double to (unsigned) long values with special algorithm")
 # ----------------------------------------------------------------------
 # Set the flag to indicate that the machine is using a special algorithm
-# to convert some values of '(unsigned) long' to 'long double' values.  
-# (This flag should be off for all machines, except for IBM Power6 Linux, 
-# when the bit sequences are 003fff..., 007fff..., 00ffff..., 01ffff..., 
-# ..., 7fffff..., the compiler uses a unknown algorithm.  We define a 
+# to convert some values of '(unsigned) long' to 'long double' values.
+# (This flag should be off for all machines, except for IBM Power6 Linux,
+# when the bit sequences are 003fff..., 007fff..., 00ffff..., 01ffff...,
+# ..., 7fffff..., the compiler uses a unknown algorithm.  We define a
 # macro and skip the test for now until we know about the algorithm.
-#
-H5ConversionTests (H5_LONG_TO_LDOUBLE_SPECIAL "Checking IF your system can convert (unsigned) long to long double values with special algorithm")
+#-----------------------------------------------------------------------------
+H5ConversionTests (${HDF_PREFIX}_LONG_TO_LDOUBLE_SPECIAL "Checking IF your system can convert (unsigned) long to long double values with special algorithm")
+# ----------------------------------------------------------------------
+# Set the flag to indicate that the machine can accurately convert
+# 'long double' to '(unsigned) long long' values.  (This flag should be set for
+# all machines, except for Mac OS 10.4 and SGI IRIX64 6.5.  When the bit sequence
+# of long double is 0x4351ccf385ebc8a0bfcc2a3c..., the values of (unsigned)long long
+# start to go wrong on these two machines.  Adjusting it higher to
+# 0x4351ccf385ebc8a0dfcc... or 0x4351ccf385ebc8a0ffcc... will make the converted
+# values wildly wrong.  This test detects this wrong behavior and disable the test.
+#-----------------------------------------------------------------------------
+H5ConversionTests (${HDF_PREFIX}_LDOUBLE_TO_LLONG_ACCURATE "Checking IF correctly converting long double to (unsigned) long long values")
 # ----------------------------------------------------------------------
 # Set the flag to indicate that the machine can accurately convert
 # '(unsigned) long long' to 'long double' values.  (This flag should be set for
 # all machines, except for Mac OS 10.4, when the bit sequences are 003fff...,
 # 007fff..., 00ffff..., 01ffff..., ..., 7fffff..., the converted values are twice
 # as big as they should be.
-#
-H5ConversionTests (H5_LLONG_TO_LDOUBLE_CORRECT "Checking IF correctly converting (unsigned) long long to long double values")
-# ----------------------------------------------------------------------
-# Set the flag to indicate that the machine generates bad code
-# for the H5VM_log2_gen() routine in src/H5VMprivate.h
-# (This flag should be set to no for all machines, except for SGI IRIX64,
-# where the cache value is set to yes in it's config file)
-#
-if (H5_BAD_LOG2_CODE_GENERATED MATCHES ^H5_BAD_LOG2_CODE_GENERATED$)
-  set (H5_BAD_LOG2_CODE_GENERATED 0 CACHE INTERNAL "Define if your system generates wrong code for log2 routine")
-  message (STATUS "Checking IF your system generates wrong code for log2 routine... no")
-endif (H5_BAD_LOG2_CODE_GENERATED MATCHES ^H5_BAD_LOG2_CODE_GENERATED$)
+#-----------------------------------------------------------------------------
+H5ConversionTests (${HDF_PREFIX}_LLONG_TO_LDOUBLE_CORRECT "Checking IF correctly converting (unsigned) long long to long double values")
 # ----------------------------------------------------------------------
-# Check if pointer alignments are enforced
-#
-H5ConversionTests (H5_NO_ALIGNMENT_RESTRICTIONS "Checking IF alignment restrictions are strictly enforced")
-
-# Define a macro for Cygwin (on XP only) where the compiler has rounding
-#   problem converting from unsigned long long to long double */
-if (CYGWIN)
-  set (H5_CYGWIN_ULLONG_TO_LDOUBLE_ROUND_PROBLEM 1)
-endif (CYGWIN)
-
-# -----------------------------------------------------------------------
-# wrapper script variables
-# 
-set (prefix ${CMAKE_INSTALL_PREFIX})
-set (exec_prefix "\${prefix}")
-set (libdir "${exec_prefix}/lib")
-set (includedir "\${prefix}/include")
-set (host_os ${CMAKE_HOST_SYSTEM_NAME})
-set (CC ${CMAKE_C_COMPILER})
-set (CXX ${CMAKE_CXX_COMPILER})
-set (FC ${CMAKE_Fortran_COMPILER})
-foreach (LINK_LIB ${LINK_LIBS})
-  set (LIBS "${LIBS} -l${LINK_LIB}")
-endforeach (LINK_LIB ${LINK_LIBS})
+# Set the flag to indicate that the machine can accurately convert
+# some long double values
+#-----------------------------------------------------------------------------
+H5ConversionTests (${HDF_PREFIX}_DISABLE_SOME_LDOUBLE_CONV "Checking IF the cpu is power9 and cannot correctly converting long double values")
diff --git a/config/cmake/ConversionTests.c b/config/cmake/ConversionTests.c
index beba01d..80de31f 100644
--- a/config/cmake/ConversionTests.c
+++ b/config/cmake/ConversionTests.c
@@ -1,6 +1,31 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#if defined(__has_attribute)
+#   if __has_attribute(no_sanitize)
+#       define HDF_NO_UBSAN __attribute__((no_sanitize("undefined")))
+#   else
+#       define HDF_NO_UBSAN
+#   endif
+#else
+#   define HDF_NO_UBSAN
+#endif
+
 #ifdef H5_LDOUBLE_TO_LONG_SPECIAL_TEST
 
-int main(void)
+#include <string.h>
+#include <stdlib.h>
+
+int HDF_NO_UBSAN main(void)
 {
     long double         ld = 20041683600089727.779961L;
     long                ll;
@@ -9,45 +34,49 @@ int main(void)
     unsigned char       s2[8];
     int                 ret = 1;
 
-    if(sizeof(long double) == 16 && sizeof(long) == 8) {
-	/*make sure the long double type has 16 bytes in size and
-	 * 11 bits of exponent.  If it is,
-	 *the bit sequence should be like below.  It's not
-	 *a decent way to check but this info isn't available. */
-	memcpy(s, &ld, 16);
-	if(s[0]==0x43 && s[1]==0x51 && s[2]==0xcc && s[3]==0xf3 &&
-		s[4]==0x85 && s[5]==0xeb && s[6]==0xc8 && s[7]==0xa0 &&
-		s[8]==0xbf && s[9]==0xcc && s[10]==0x2a && s[11]==0x3c) {
-
-	    /* Assign the hexadecimal value of long double type. */
-	    s[0]=0x43; s[1]=0x51; s[2]=0xcc; s[3]=0xf3;
-	    s[4]=0x85; s[5]=0xeb; s[6]=0xc8; s[7]=0xa0;
-	    s[8]=0xbf; s[9]=0xcc; s[10]=0x2a; s[11]=0x3c;
-	    s[12]=0x3d; s[13]=0x85; s[14]=0x56; s[15]=0x20;
-
-	    memcpy(&ld, s, 16);
-
-	    ll = (long)ld;
-	    memcpy(s2, &ll, 8);
-
-	    /* The library's algorithm converts it to 0x 00 47 33 ce 17 af 22 82
-	     * and gets wrong value 20041683600089730 on the IBM Power6 Linux.
-	     * But the IBM Power6 Linux converts it to 0x00 47 33 ce 17 af 22 7f
-	     * and gets the correct value 20041683600089727.  It uses some special
-	     * algorithm.  We're going to define the macro and skip the test until
-	     * we can figure out how they do it. */
-	    if(s2[0]==0x00 && s2[1]==0x47 && s2[2]==0x33 && s2[3]==0xce &&
-		    s2[4]==0x17 && s2[5]==0xaf && s2[6]==0x22 && s2[7]==0x7f)
-		ret = 0;
-
-	    ull = (unsigned long)ld;
-	    memcpy(s2, &ull, 8);
-
-	    /* The unsigned long is the same as signed long. */
-	    if(s2[0]==0x00 && s2[1]==0x47 && s2[2]==0x33 && s2[3]==0xce &&
-		    s2[4]==0x17 && s2[5]==0xaf && s2[6]==0x22 && s2[7]==0x7f)
-		ret = 0;
-	}
+    if (sizeof(long double) == 16 && sizeof(long) == 8) {
+        /* Make sure the long double type has 16 bytes in size and
+         * 11 bits of exponent.  If it is, the bit sequence should be
+         * like below.  It's not a decent way to check but this info
+         * isn't available.
+         */
+        memcpy(s, &ld, 16);
+        if (s[0]==0x43 && s[1]==0x51 && s[2]==0xcc && s[3]==0xf3 &&
+            s[4]==0x85 && s[5]==0xeb && s[6]==0xc8 && s[7]==0xa0 &&
+            s[8]==0xbf && s[9]==0xcc && s[10]==0x2a && s[11]==0x3c) {
+
+            /* Assign the hexadecimal value of long double type. */
+            s[0]=0x43; s[1]=0x51; s[2]=0xcc; s[3]=0xf3;
+            s[4]=0x85; s[5]=0xeb; s[6]=0xc8; s[7]=0xa0;
+            s[8]=0xbf; s[9]=0xcc; s[10]=0x2a; s[11]=0x3c;
+            s[12]=0x3d; s[13]=0x85; s[14]=0x56; s[15]=0x20;
+
+            memcpy(&ld, s, 16);
+
+            ll = (long)ld;
+            memcpy(s2, &ll, 8);
+
+            /* The library's algorithm converts it to 0x 00 47 33 ce 17 af 22 82
+             * and gets wrong value 20041683600089730 on the IBM Power6 Linux.
+             * But the IBM Power6 Linux converts it to 0x00 47 33 ce 17 af 22 7f
+             * and gets the correct value 20041683600089727.  It uses some special
+             * algorithm.  We're going to define the macro and skip the test until
+             * we can figure out how they do it.
+             */
+            if (s2[0]==0x00 && s2[1]==0x47 && s2[2]==0x33 && s2[3]==0xce &&
+                s2[4]==0x17 && s2[5]==0xaf && s2[6]==0x22 && s2[7]==0x7f)
+
+                ret = 0;
+
+            ull = (unsigned long)ld;
+            memcpy(s2, &ull, 8);
+
+            /* The unsigned long is the same as signed long */
+            if(s2[0]==0x00 && s2[1]==0x47 && s2[2]==0x33 && s2[3]==0xce &&
+               s2[4]==0x17 && s2[5]==0xaf && s2[6]==0x22 && s2[7]==0x7f)
+
+                ret = 0;
+        }
     }
 
 done:
@@ -58,7 +87,10 @@ done:
 
 #ifdef H5_LONG_TO_LDOUBLE_SPECIAL_TEST
 
-int main(void)
+#include <string.h>
+#include <stdlib.h>
+
+int HDF_NO_UBSAN main(void)
 {
     long double         ld;
     long                ll;
@@ -66,58 +98,118 @@ int main(void)
     unsigned char       s[16];
     int                 flag=0, ret=1;
 
-    /*Determine if long double has 16 byte in size, 11 bit exponent, and
-     *the bias is 0x3ff */
-    if(sizeof(long double) == 16) {
-	ld = 1.0L;
-	memcpy(s, &ld, 16);
-	if(s[0]==0x3f && s[1]==0xf0 && s[2]==0x00 && s[3]==0x00 &&
-		s[4]==0x00 && s[5]==0x00 && s[6]==0x00 && s[7]==0x00)
-	    flag = 1;
-    }
+    /* Determine if long double has 16 byte in size, 11 bit exponent, and
+     * the bias is 0x3ff
+     */
+    if (sizeof(long double) == 16) {
+        ld = 1.0L;
+        memcpy(s, &ld, 16);
 
-    if(flag==1 && sizeof(long)==8) {
-	ll = 0x003fffffffffffffL;
-	ld = (long double)ll;
-	memcpy(s, &ld, 16);
-	/* The library converts the value to 0x434fffffffffffff8000000000000000.
-	 * In decimal it is 18014398509481982.000000, one value short of the original.
-	 * The IBM Power6 Linux converts it to 0x4350000000000000bff0000000000000.
-	 * The value is correct in decimal. It uses some special
-	 * algorithm.  We're going to define the macro and skip the test until
-	 * we can figure out how they do it. */
-	if(s[0]==0x43 && s[1]==0x50 && s[2]==0x00 && s[3]==0x00 &&
-		s[4]==0x00 && s[5]==0x00 && s[6]==0x00 && s[7]==0x00 &&
-		s[8]==0xbf && s[9]==0xf0 && s[10]==0x00 && s[11]==0x00 &&
-		s[12]==0x00 && s[13]==0x00 && s[14]==0x00 && s[15]==0x00)
-	    ret = 0;
+        if (s[0]==0x3f && s[1]==0xf0 && s[2]==0x00 && s[3]==0x00 &&
+            s[4]==0x00 && s[5]==0x00 && s[6]==0x00 && s[7]==0x00)
+
+            flag = 1;
     }
-    if(flag==1 && sizeof(unsigned long)==8) {
-	ull = 0xffffffffffffffffUL;
-	ld = (long double)ull;
-	memcpy(s, &ld, 16);
-	/* Use a different value from signed long to test. The problem is the same
-	 * for both long and unsigned long. The value is 18446744073709551615.
-	 * The library converts the value to 0x43effffffffffffffe000000000000000.
-	 * In decimal it's 18446744073709548544.000000, very different from the original.
-	 * The IBM Power6 Linux converts it to 0x43f0000000000000bff0000000000000.
-	 * The value is correct in decimal. It uses some special
-	 * algorithm.  We're going to define the macro and skip the test until
-	 * we can figure out how they do it. */
-	if(s[0]==0x43 && s[1]==0xf0 && s[2]==0x00 && s[3]==0x00 &&
-		s[4]==0x00 && s[5]==0x00 && s[6]==0x00 && s[7]==0x00 &&
-		s[8]==0xbf && s[9]==0xf0 && s[10]==0x00 && s[11]==0x00 &&
-		s[12]==0x00 && s[13]==0x00 && s[14]==0x00 && s[15]==0x00)
-	    ret = 0;
+
+    if (flag==1 && sizeof(long)==8) {
+        ll = 0x003fffffffffffffL;
+        ld = (long double)ll;
+        memcpy(s, &ld, 16);
+
+        /* The library converts the value to 0x434fffffffffffff8000000000000000.
+         * In decimal it is 18014398509481982.000000, one value short of the original.
+         * The IBM Power6 Linux converts it to 0x4350000000000000bff0000000000000.
+         * The value is correct in decimal. It uses some special
+         * algorithm.  We're going to define the macro and skip the test until
+         * we can figure out how they do it.
+         */
+        if (s[0]==0x43 && s[1]==0x50 && s[2]==0x00 && s[3]==0x00 &&
+            s[4]==0x00 && s[5]==0x00 && s[6]==0x00 && s[7]==0x00 &&
+            s[8]==0xbf && s[9]==0xf0 && s[10]==0x00 && s[11]==0x00 &&
+            s[12]==0x00 && s[13]==0x00 && s[14]==0x00 && s[15]==0x00)
+
+            ret = 0;
     }
+
+    if (flag==1 && sizeof(unsigned long)==8) {
+        ull = 0xffffffffffffffffUL;
+        ld = (long double)ull;
+        memcpy(s, &ld, 16);
+
+        /* Use a different value from signed long to test. The problem is the same
+         * for both long and unsigned long. The value is 18446744073709551615.
+         * The library converts the value to 0x43effffffffffffffe000000000000000.
+         * In decimal it's 18446744073709548544.000000, very different from the original.
+         * The IBM Power6 Linux converts it to 0x43f0000000000000bff0000000000000.
+         * The value is correct in decimal. It uses some special
+         * algorithm.  We're going to define the macro and skip the test until
+         * we can figure out how they do it.
+         */
+        if (s[0]==0x43 && s[1]==0xf0 && s[2]==0x00 && s[3]==0x00 &&
+            s[4]==0x00 && s[5]==0x00 && s[6]==0x00 && s[7]==0x00 &&
+            s[8]==0xbf && s[9]==0xf0 && s[10]==0x00 && s[11]==0x00 &&
+            s[12]==0x00 && s[13]==0x00 && s[14]==0x00 && s[15]==0x00)
+
+            ret = 0;
+        }
 done:
     exit(ret);
 }
 
 #endif
 
+#ifdef H5_LDOUBLE_TO_LLONG_ACCURATE_TEST
+
+#include <string.h>
+#include <stdlib.h>
+
+int HDF_NO_UBSAN main(void)
+{
+    long double         ld = 20041683600089727.779961L;
+    long long           ll;
+    unsigned long long  ull;
+    unsigned char       s[16];
+    int                 ret = 0;
+
+    if (sizeof(long double) == 16) {
+        /* Make sure the long double type is the same as the failing type
+         * which has 16 bytes in size and 11 bits of exponent.  If it is,
+         * the bit sequence should be like below.  It's not
+         * a decent way to check but this info isn't available.
+         */
+        memcpy(s, &ld, 16);
+
+        if (s[0]==0x43 && s[1]==0x51 && s[2]==0xcc && s[3]==0xf3 &&
+            s[4]==0x85 && s[5]==0xeb && s[6]==0xc8 && s[7]==0xa0 &&
+            s[8]==0xbf && s[9]==0xcc && s[10]==0x2a && s[11]==0x3c) {
+
+            /* Slightly adjust the bit sequence (s[8]=0xdf).  The converted
+             * values will go wild on Mac OS 10.4 and IRIX64 6.5.
+             */
+            s[0]=0x43; s[1]=0x51; s[2]=0xcc; s[3]=0xf3;
+            s[4]=0x85; s[5]=0xeb; s[6]=0xc8; s[7]=0xa0;
+            s[8]=0xdf; s[9]=0xcc; s[10]=0x2a; s[11]=0x3c;
+            s[12]=0x3d; s[13]=0x85; s[14]=0x56; s[15]=0x20;
+
+            memcpy(&ld, s, 16);
+            ll = (long long)ld;
+            ull = (unsigned long long)ld;
+
+            if (ll != 20041683600089728 || ull != 20041683600089728)
+                ret = 1;
+        }
+    }
+done:
+    exit(ret);
+}
+#endif
+
 #ifdef H5_LLONG_TO_LDOUBLE_CORRECT_TEST
-int main(void)
+
+#include <string.h>
+#include <stdlib.h>
+
+int HDF_NO_UBSAN main(void)
 {
     long double         ld;
     long long           ll;
@@ -125,90 +217,68 @@ int main(void)
     unsigned char       s[16];
     int                 flag=0, ret=0;
 
-    /*Determine if long double has 16 byte in size, 11 bit exponent, and
-     *the bias is 0x3ff */
-    if(sizeof(long double) == 16) {
+    /* Determine if long double has 16 byte in size, 11 bit exponent, and
+     * the bias is 0x3ff
+     */
+    if (sizeof(long double) == 16) {
         ld = 1.0L;
         memcpy(s, &ld, 16);
-        if(s[0]==0x3f && s[1]==0xf0 && s[2]==0x00 && s[3]==0x00 &&
+        if (s[0]==0x3f && s[1]==0xf0 && s[2]==0x00 && s[3]==0x00 &&
             s[4]==0x00 && s[5]==0x00 && s[6]==0x00 && s[7]==0x00)
+
             flag = 1;
     }
 
-    if(flag==1 && sizeof(long long)==8) {
+    if (flag==1 && sizeof(long long)==8) {
         ll = 0x01ffffffffffffffLL;
         ld = (long double)ll;
         memcpy(s, &ld, 16);
-        /*Check if the bit sequence is as supposed to be*/
-        if(s[0]!=0x43 || s[1]!=0x7f || s[2]!=0xff || s[3]!=0xff ||
+
+        /* Check if the bit sequence is as expected*/
+        if (s[0]!=0x43 || s[1]!=0x7f || s[2]!=0xff || s[3]!=0xff ||
             s[4]!=0xff || s[5]!=0xff || s[6]!=0xff || s[7]!=0xff ||
             s[8]!=0xf0 || s[9]!=0x00 || s[10]!=0x00 || s[11]!=0x00)
+
             ret = 1;
     }
-    if(flag==1 && sizeof(unsigned long long)==8) {
+    if (flag==1 && sizeof(unsigned long long)==8) {
         ull = 0x01ffffffffffffffULL;
         ld = (long double)ull;
         memcpy(s, &ld, 16);
-        if(s[0]!=0x43 || s[1]!=0x7f || s[2]!=0xff || s[3]!=0xff ||
+
+        if (s[0]!=0x43 || s[1]!=0x7f || s[2]!=0xff || s[3]!=0xff ||
             s[4]!=0xff || s[5]!=0xff || s[6]!=0xff || s[7]!=0xff ||
             s[8]!=0xf0 || s[9]!=0x00 || s[10]!=0x00 || s[11]!=0x00)
+
             ret = 1;
     }
+
 done:
     exit(ret);
 }
 #endif
 
-#ifdef H5_NO_ALIGNMENT_RESTRICTIONS_TEST
+#ifdef H5_DISABLE_SOME_LDOUBLE_CONV_TEST
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-typedef struct {
-    size_t len;
-    void *p;
-} hvl_t;
-
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-extern "C"
-#  endif
-int FC_DUMMY_MAIN()
-{ return 1;}
-#endif
-#endif
-int
-main ()
+int HDF_NO_UBSAN main(void)
 {
+    FILE *fp;
+    char cpu[64];
 
-    char *chp = "beefs";
-    char **chpp = malloc (2 * sizeof (char *));
-    char **chpp2;
-    hvl_t vl = { 12345, (void *) chp };
-    hvl_t *vlp;
-    hvl_t *vlp2;
-
-    memcpy ((void *) ((char *) chpp + 1), &chp, sizeof (char *));
-    chpp2 = (char **) ((char *) chpp + 1);
-    if (strcmp (*chpp2, chp)) {
-        free (chpp);
-        return 1;
-    }
-    free (chpp);
-
-    vlp = malloc (2 * sizeof (hvl_t));
-    memcpy ((void *) ((char *) vlp + 1), &vl, sizeof (hvl_t));
-    vlp2 = (hvl_t *) ((char *) vlp + 1);
-    if (vlp2->len != vl.len || vlp2->p != vl.p) {
-        free (vlp);
-        return 1;
-    }
-    free (vlp);
+    fp = popen("uname -m", "r");
 
-  ;
-  return 0;
+    fgets(cpu, sizeof(cpu)-1, fp);
+
+    pclose(fp);
+
+    if (strncmp(cpu, "ppc64le", 7) == 0)
+        return 0;
+
+    return 1;
 }
 
 #endif
-
diff --git a/config/cmake/FindCIRCLE.cmake b/config/cmake/FindCIRCLE.cmake
new file mode 100644
index 0000000..b36d76c
--- /dev/null
+++ b/config/cmake/FindCIRCLE.cmake
@@ -0,0 +1,49 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+#[=======================================================================[.rst:
+FindCIRCLE
+--------
+
+Find the native CIRCLE includes and library
+
+This module defines
+
+::
+
+  CIRCLE_INCLUDE_DIR, where to find CIRCLE.h, etc.
+  CIRCLE_LIBRARIES, the libraries required to use CIRCLE.
+  CIRCLE_FOUND, If false, do not try to use CIRCLE.
+
+also defined, but not for general use are
+
+::
+
+  CIRCLE_LIBRARY, where to find the CIRCLE library.
+#]=======================================================================]
+
+if(DEFINED ENV{MFU_ROOT})
+  set(ENV{MFU_INCLUDE} "$ENV{MFU_ROOT}/include")
+  set(ENV{MFU_LIB} "$ENV{MFU_ROOT}/lib")
+  set(ENV{MFU_LIB64} "$ENV{MFU_ROOT}/lib64")
+else()
+  message("CIRCLE_LIBRARY: If you have problems building this library,\nconsider setting the MFU_ROOT environment variable to indicate\nwhere to find the support libraries and header files!")
+endif()
+
+find_path(CIRCLE_INCLUDE_DIR
+  NAMES libcircle.h
+  HINTS ENV MFU_INCLUDE)
+
+find_library(CIRCLE_LIBRARY
+  NAMES circle
+  HINTS ENV MFU_LIB ENV MFU_LIB64
+  )
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(CIRCLE REQUIRED_VARS CIRCLE_LIBRARY CIRCLE_INCLUDE_DIR)
+
+if(CIRCLE_FOUND)
+  set(CIRCLE_LIBRARIES ${CIRCLE_LIBRARY} )
+endif()
+
+mark_as_advanced(CIRCLE_INCLUDE_DIR CIRCLE_LIBRARY)
diff --git a/config/cmake/FindDTCMP.cmake b/config/cmake/FindDTCMP.cmake
new file mode 100644
index 0000000..b95ef20
--- /dev/null
+++ b/config/cmake/FindDTCMP.cmake
@@ -0,0 +1,48 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+#[=======================================================================[.rst:
+FindDTCMP
+--------
+
+Find the native DTCMP includes and library
+
+This module defines
+
+::
+
+  DTCMP_INCLUDE_DIR, where to find DTCMP.h, etc.
+  DTCMP_LIBRARIES, the libraries required to use DTCMP.
+  DTCMP_FOUND, If false, do not try to use DTCMP.
+
+also defined, but not for general use are
+
+::
+
+  DTCMP_LIBRARY, where to find the DTCMP library.
+#]=======================================================================]
+
+if(DEFINED ENV{MFU_ROOT})
+  set(ENV{MFU_INCLUDE} "$ENV{MFU_ROOT}/include")
+  set(ENV{MFU_LIB} "$ENV{MFU_ROOT}/lib")
+  set(ENV{MFU_LIB64} "$ENV{MFU_ROOT}/lib64")
+else()
+  message("DTCMP_LIBRARY: If you have problems building this library,\nconsider setting the MFU_ROOT environment variable to indicate\nwhere to find the support libraries and header files!")
+endif()
+
+find_path(DTCMP_INCLUDE_DIR
+  NAMES dtcmp.h
+  HINTS ENV MFU_INCLUDE)
+
+find_library(DTCMP_LIBRARY
+  NAMES dtcmp
+  HINTS ENV MFU_LIB ENV MFU_LIB64)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(DTCMP REQUIRED_VARS DTCMP_LIBRARY DTCMP_INCLUDE_DIR)
+
+if(DTCMP_FOUND)
+  set(DTCMP_LIBRARIES ${DTCMP_LIBRARY} )
+endif()
+
+mark_as_advanced(DTCMP_INCLUDE_DIR DTCMP_LIBRARY)
diff --git a/config/cmake/FindHDF5.cmake.in b/config/cmake/FindHDF5.cmake.in
deleted file mode 100644
index fbc49f1..0000000
--- a/config/cmake/FindHDF5.cmake.in
+++ /dev/null
@@ -1,86 +0,0 @@
-#
-# To be used by projects that make use of Cmakeified hdf5-@HDF5_PACKAGE_VERSION@
-#
-
-#
-# Find the HDF5 includes and get all installed hdf5 library settings from
-# HDF5-config.cmake file : Requires a CMake compatible hdf5-1.8.5 or later 
-# for this feature to work. The following vars are set if hdf5 is found.
-#
-# HDF5_FOUND               - True if found, otherwise all other vars are undefined
-# HDF5_INCLUDE_DIR         - The include dir for main *.h files
-# HDF5_FORTRAN_INCLUDE_DIR - The include dir for fortran modules and headers
-# HDF5_VERSION_STRING      - full version (e.g. @HDF5_PACKAGE_VERSION@)
-# HDF5_VERSION_MAJOR       - major part of version (e.g. @HDF5_PACKAGE_VERSION_MAJOR@)
-# HDF5_VERSION_MINOR       - minor part (e.g. @HDF5_PACKAGE_VERSION_MINOR@)
-# 
-# The following boolean vars will be defined
-# HDF5_ENABLE_PARALLEL  - 1 if HDF5 parallel supported
-# HDF5_BUILD_FORTRAN    - 1 if HDF5 was compiled with fortran on
-# HDF5_BUILD_CPP_LIB    - 1 if HDF5 was compiled with cpp on
-# HDF5_BUILD_TOOLS      - 1 if HDF5 was compiled with tools on
-# HDF5_BUILD_HL_LIB     - 1 if HDF5 was compiled with high level on
-# HDF5_BUILD_HL_CPP_LIB - 1 if HDF5 was compiled with high level and cpp on
-# 
-# Target names that are valid (depending on enabled options)
-# will be the following
-#
-# hdf5              : HDF5 C library
-# hdf5_tools        : the tools library
-# hdf5_f90cstub     : used by Fortran to C interface
-# hdf5_fortran      : Fortran HDF5 library
-# hdf5_cpp          : HDF5 cpp interface library
-# hdf5_hl           : High Level library
-# hdf5_hl_f90cstub  : used by Fortran to C interface to High Level library
-# hdf5_hl_fortran   : Fortran High Level library
-# hdf5_hl_cpp       : High Level cpp interface library
-# 
-# To aid in finding HDF5 as part of a subproject set
-# HDF5_ROOT_DIR_HINT to the location where @HDF5_PACKAGE@@HDF_PACKAGE_EXT@-config.cmake lies
-
-include (SelectLibraryConfigurations)
-include (FindPackageHandleStandardArgs)
-
-# The HINTS option should only be used for values computed from the system.
-set (_HDF5_HINTS
-    $ENV{HOME}/.local
-    $ENV{HDF5_ROOT}
-    $ENV{HDF5_ROOT_DIR_HINT}
-)
-# Hard-coded guesses should still go in PATHS. This ensures that the user
-# environment can always override hard guesses.
-set (_HDF5_PATHS
-    $ENV{HOME}/.local
-    $ENV{HDF5_ROOT}
-    $ENV{HDF5_ROOT_DIR_HINT}
-    /usr/lib/@HDF5_PACKAGE@
-    /usr/share/@HDF5_PACKAGE@
-    /usr/local/@HDF5_PACKAGE@
-    /usr/local/@HDF5_PACKAGE@/share
-)
-
-FIND_PATH (HDF5_ROOT_DIR "@HDF5_PACKAGE@@HDF_PACKAGE_EXT@-config.cmake"
-    HINTS ${_HDF5_HINTS}
-    PATHS ${_HDF5_PATHS}
-    PATH_SUFFIXES
-        cmake/@HDF5_PACKAGE@
-        lib/cmake/@HDF5_PACKAGE@
-        share/cmake/@HDF5_PACKAGE@
-)
-
-FIND_PATH (HDF5_INCLUDE_DIRS "H5public.h"
-    HINTS ${_HDF5_HINTS}
-    PATHS ${_HDF5_PATHS}
-    PATH_SUFFIXES
-        include
-        Include
-)
-
-# For backwards compatibility we set HDF5_INCLUDE_DIR to the value of
-# HDF5_INCLUDE_DIRS
-set ( HDF5_INCLUDE_DIR "${HDF5_INCLUDE_DIRS}" )
-
-if (HDF5_INCLUDE_DIR)
-  set (HDF5_FOUND "YES")
-  include (${HDF5_ROOT_DIR}/@HDF5_PACKAGE@@HDF_PACKAGE_EXT@-config.cmake)
-endif (HDF5_INCLUDE_DIR)
diff --git a/config/cmake/FindHDFS.cmake b/config/cmake/FindHDFS.cmake
new file mode 100644
index 0000000..e401a94
--- /dev/null
+++ b/config/cmake/FindHDFS.cmake
@@ -0,0 +1,70 @@
+
+# DerivedFrom: https://github.com/cloudera/Impala/blob/cdh5-trunk/cmake_modules/FindHDFS.cmake
+# - Find HDFS (hdfs.h and libhdfs.so)
+# This module defines
+#  Hadoop_VERSION, version string of ant if found
+#  HDFS_INCLUDE_DIR, directory containing hdfs.h
+#  HDFS_LIBRARIES, location of libhdfs.so
+#  HDFS_FOUND, whether HDFS is found.
+
+exec_program($ENV{HADOOP_HOME}/bin/hadoop ARGS version OUTPUT_VARIABLE Hadoop_VERSION
+             RETURN_VALUE Hadoop_RETURN)
+
+# currently only looking in HADOOP_HOME
+find_path(HDFS_INCLUDE_DIR hdfs.h PATHS
+  $ENV{HADOOP_HOME}/include/
+  # make sure we don't accidentally pick up a different version
+  NO_DEFAULT_PATH
+)
+
+if ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
+  set(arch_hint "x64")
+elseif ("$ENV{LIB}" MATCHES "(amd64|ia64)")
+  set(arch_hint "x64")
+else ()
+  set(arch_hint "x86")
+endif()
+
+message(STATUS "Architecture: ${arch_hint}")
+
+if ("${arch_hint}" STREQUAL "x64")
+  set(HDFS_LIB_PATHS $ENV{HADOOP_HOME}/lib/native)
+else ()
+  set(HDFS_LIB_PATHS $ENV{HADOOP_HOME}/lib/native)
+endif ()
+
+message(STATUS "HDFS_LIB_PATHS: ${HDFS_LIB_PATHS}")
+
+find_library(HDFS_LIB NAMES hdfs PATHS
+  ${HDFS_LIB_PATHS}
+  # make sure we don't accidentally pick up a different version
+  NO_DEFAULT_PATH
+)
+
+if (HDFS_LIB)
+  set(HDFS_FOUND TRUE)
+  set(HDFS_LIBRARIES ${HDFS_LIB})
+  set(HDFS_STATIC_LIB ${HDFS_LIB_PATHS}/${CMAKE_STATIC_LIBRARY_PREFIX}hdfs${CMAKE_STATIC_LIBRARY_SUFFIX})
+
+  add_library(hdfs_static STATIC IMPORTED)
+  set_target_properties(hdfs_static PROPERTIES IMPORTED_LOCATION ${HDFS_STATIC_LIB})
+else ()
+  set(HDFS_FOUND FALSE)
+endif ()
+
+if (HDFS_FOUND)
+  if (NOT HDFS_FIND_QUIETLY)
+    message(STATUS "${Hadoop_VERSION}")
+    message(STATUS "HDFS_INCLUDE_DIR: ${HDFS_INCLUDE_DIR}")
+    message(STATUS "HDFS_LIBRARIES: ${HDFS_LIBRARIES}")
+    message(STATUS "hdfs_static: ${HDFS_STATIC_LIB}")
+  endif ()
+else ()
+  message(FATAL_ERROR "HDFS includes and libraries NOT found."
+    "(${HDFS_INCLUDE_DIR}, ${HDFS_LIB})")
+endif ()
+
+mark_as_advanced(
+  HDFS_LIBRARIES
+  HDFS_INCLUDE_DIR
+)
diff --git a/config/cmake/FindMFU.cmake b/config/cmake/FindMFU.cmake
new file mode 100644
index 0000000..2a4278a
--- /dev/null
+++ b/config/cmake/FindMFU.cmake
@@ -0,0 +1,98 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
+#########################################################################
+
+# - Derived from the FindTiff.cmake and FindJPEG.cmake that is included with cmake
+# FindMFU
+
+# Find the native MFU includes and library
+
+# Imported targets
+##################
+
+# This module defines the following :prop_tgt:`IMPORTED` targets:
+#
+# MFU::MFU
+#  The MFU library, if found.
+#
+# Result variables
+###################
+
+# This module will set the following variables in your project:
+
+#  MFU_FOUND, true if the MFU headers and libraries were found.
+#  MFU_INCLUDE_DIR, the directory containing the MFU headers.
+#  MFU_INCLUDE_DIRS, the directory containing the MFU headers.
+#  MFU_LIBRARIES, libraries to link against to use MFU.
+
+# Cache variables
+#################
+
+# The following variables may also be set:
+
+#  MFU_LIBRARY, where to find the MFU library.
+# message (STATUS "Finding MFU library and headers..." )
+#########################################################################
+
+
+
+FIND_PATH(MFU_INCLUDE_DIR
+  NAMES mfu.h
+  HINTS "$ENV{MFU_ROOT}/include"
+)
+FIND_LIBRARY(MFU_LIBRARY
+  NAMES mfu
+  HINTS "$ENV{MFU_ROOT}/lib64"
+)
+
+if(NOT MFU_LIBRARY)
+  set(mfu_names ${MFU_NAMES} mfu libmfu)
+  find_library(MFU_LIBRARY NAMES ${mfu_names})
+  include(SelectLibraryConfigurations)
+  select_library_configurations(MFU)
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(MFU
+  REQUIRED_VARS MFU_LIBRARY MFU_INCLUDE_DIR)
+
+if(MFU_FOUND)
+  set(MFU_LIBRARIES "${MFU_LIBRARY}")
+  set(MFU_INCLUDE_DIRS "${MFU_INCLUDE_DIR}")
+  set(LL_PATH "$ENV{MFU_ROOT}/lib64:$ENV{MFU_ROOT}/lib")
+  if(NOT TARGET MFU::MFU)
+    add_library(MFU::MFU UNKNOWN IMPORTED)
+    if(MFU_INCLUDE_DIRS)
+      set_target_properties(MFU::MFU PROPERTIES
+        INTERFACE_INCLUDE_DIRECTORIES "${MFU_INCLUDE_DIRS}")
+    endif()
+    if(EXISTS "${MFU_LIBRARY}")
+      set_target_properties(MFU::MFU PROPERTIES
+        IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+        IMPORTED_LOCATION "${MFU_LIBRARY}")
+    endif()
+  endif()
+endif()
+
+# Report the results.
+if (NOT MFU_FOUND)
+  set (MFU_DIR_MESSAGE
+      "Mfu was not found. Make sure MFU_LIBRARY and MFU_INCLUDE_DIR are set or set the MFU_INSTALL environment variable."
+  )
+  if (NOT MFU_FIND_QUIETLY)
+    message (VERBOSE "${MFU_DIR_MESSAGE}")
+  else ()
+    if (MFU_FIND_REQUIRED)
+      message (FATAL_ERROR "Mfu was NOT found and is Required by this project")
+    endif ()
+  endif ()
+endif ()
diff --git a/config/cmake/FindSZIP.cmake b/config/cmake/FindSZIP.cmake
new file mode 100644
index 0000000..b96a732
--- /dev/null
+++ b/config/cmake/FindSZIP.cmake
@@ -0,0 +1,127 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
+#########################################################################
+
+# - Derived from the FindTiff.cmake and FindJPEG.cmake that is included with cmake
+# FindSZIP
+
+# Find the native SZIP includes and library
+
+# Imported targets
+##################
+
+# This module defines the following :prop_tgt:`IMPORTED` targets:
+#
+# SZIP::SZIP
+#  The SZIP library, if found.
+#
+# Result variables
+###################
+
+# This module will set the following variables in your project:
+
+#  SZIP_FOUND, true if the SZIP headers and libraries were found.
+#  SZIP_INCLUDE_DIR, the directory containing the SZIP headers.
+#  SZIP_INCLUDE_DIRS, the directory containing the SZIP headers.
+#  SZIP_LIBRARIES, libraries to link against to use SZIP.
+
+# Cache variables
+#################
+
+# The following variables may also be set:
+
+#  SZIP_LIBRARY, where to find the SZIP library.
+#  SZIP_LIBRARY_DEBUG - Debug version of SZIP library
+#  SZIP_LIBRARY_RELEASE - Release Version of SZIP library
+
+# message (STATUS "Finding SZIP library and headers..." )
+#########################################################################
+
+
+find_path(SZIP_INCLUDE_DIR szlib.h)
+
+set(szip_names ${SZIP_NAMES} sz szip szip-static libsz libszip libszip-static)
+foreach(name ${szip_names})
+  list (APPEND szip_names_debug "${name}d")
+endforeach()
+
+if(NOT SZIP_LIBRARY)
+  find_library(SZIP_LIBRARY_RELEASE NAMES ${szip_names})
+  find_library(SZIP_LIBRARY_DEBUG NAMES ${szip_names_debug})
+  include(SelectLibraryConfigurations)
+  select_library_configurations(SZIP)
+  mark_as_advanced(SZIP_LIBRARY_RELEASE SZIP_LIBRARY_DEBUG)
+endif()
+unset(szip_names)
+unset(szip_names_debug)
+
+if(SZIP_INCLUDE_DIR AND EXISTS "${SZIP_INCLUDE_DIR}/SZconfig.h")
+    file(STRINGS "${SZIP_INCLUDE_DIR}/SZconfig.h" szip_version_str
+         REGEX "^#define[\t ]+SZIP_PACKAGE_VERSION[\t ]+.*")
+
+    string(REGEX REPLACE "^#define[\t ]+SZIP_PACKAGE_VERSION[\t ]+([0-9]+).*"
+           "\\1" SZIP_VERSION "${szip_version_str}")
+    unset(szip_version_str)
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(SZIP
+  REQUIRED_VARS SZIP_LIBRARY SZIP_INCLUDE_DIR
+  VERSION_VAR SZIP_VERSION)
+
+if(SZIP_FOUND)
+  set(SZIP_LIBRARIES ${SZIP_LIBRARY})
+  set(SZIP_INCLUDE_DIRS "${SZIP_INCLUDE_DIR}")
+
+  if(NOT TARGET SZIP::SZIP)
+    add_library(SZIP::SZIP UNKNOWN IMPORTED)
+    if(SZIP_INCLUDE_DIRS)
+      set_target_properties(SZIP::SZIP PROPERTIES
+        INTERFACE_INCLUDE_DIRECTORIES "${SZIP_INCLUDE_DIRS}")
+    endif()
+    if(EXISTS "${SZIP_LIBRARY}")
+      set_target_properties(SZIP::SZIP PROPERTIES
+        IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+        IMPORTED_LOCATION "${SZIP_LIBRARY}")
+    endif()
+    if(EXISTS "${SZIP_LIBRARY_RELEASE}")
+      set_property(TARGET SZIP::SZIP APPEND PROPERTY
+        IMPORTED_CONFIGURATIONS RELEASE)
+      set_target_properties(SZIP::SZIP PROPERTIES
+        IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C"
+        IMPORTED_LOCATION_RELEASE "${SZIP_LIBRARY_RELEASE}")
+    endif()
+    if(EXISTS "${SZIP_LIBRARY_DEBUG}")
+      set_property(TARGET SZIP::SZIP APPEND PROPERTY
+        IMPORTED_CONFIGURATIONS DEBUG)
+      set_target_properties(SZIP::SZIP PROPERTIES
+        IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "C"
+        IMPORTED_LOCATION_DEBUG "${SZIP_LIBRARY_DEBUG}")
+    endif()
+  endif()
+endif()
+
+mark_as_advanced(SZIP_LIBRARY SZIP_INCLUDE_DIR)
+
+# Report the results.
+if (NOT SZIP_FOUND)
+  set (SZIP_DIR_MESSAGE
+      "SZip was not found. Make sure SZIP_LIBRARY and SZIP_INCLUDE_DIR are set or set the SZIP_INSTALL environment variable."
+  )
+  if (NOT SZIP_FIND_QUIETLY)
+    message (VERBOSE "${SZIP_DIR_MESSAGE}")
+  else ()
+    if (SZIP_FIND_REQUIRED)
+      message (FATAL_ERROR "SZip was NOT found and is Required by this project")
+    endif ()
+  endif ()
+endif ()
diff --git a/config/cmake/GetTimeOfDayTest.cpp b/config/cmake/GetTimeOfDayTest.cpp
new file mode 100644
index 0000000..b35efa5
--- /dev/null
+++ b/config/cmake/GetTimeOfDayTest.cpp
@@ -0,0 +1,26 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+#if defined (TRY_SYS_TIME_H)
+#include <sys/time.h>
+/* #include <time.h> */
+#endif
+
+
+#if defined (TRY_TIME_H)
+#include <time.h>
+#endif
+
+int main(int argc, char **argv) {
+	  struct timeval t1;
+	  gettimeofday(&t1, 0x00);
+	return 0;
+}
diff --git a/config/cmake/H5cxx_config.h.in b/config/cmake/H5cxx_config.h.in
deleted file mode 100644
index c4e1c03..0000000
--- a/config/cmake/H5cxx_config.h.in
+++ /dev/null
@@ -1,5 +0,0 @@
-/* src/H5cxx_config.h.in Created manually. */
-
-/* Define if offsetof extension is present */
-#cmakedefine HAVE_OFFSETOF ${HAVE_OFFSETOF}
-
diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in
index 47dd7ed..da23cb3 100644
--- a/config/cmake/H5pubconf.h.in
+++ b/config/cmake/H5pubconf.h.in
@@ -1,3 +1,14 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /* H5pubconf.h  Generated By CMake during the configuration */
 
 #ifndef H5_CONFIG_H_
@@ -15,43 +26,16 @@
 /* Define if using a Windows compiler (i.e. Visual Studio) */
 #cmakedefine H5_HAVE_VISUAL_STUDIO @H5_HAVE_VISUAL_STUDIO@
 
-/* Defined if HDF5 was built with CMake AND build as a shared library */
-#cmakedefine H5_BUILT_AS_DYNAMIC_LIB @H5_BUILT_AS_DYNAMIC_LIB@
-
-/* Defined if HDF5 was built with CMake AND build as a static library */
-#cmakedefine H5_BUILT_AS_STATIC_LIB @H5_BUILT_AS_STATIC_LIB@
-
-/* Defined if HDF5 CPP  was built with CMake AND build as a shared library  */
-#cmakedefine H5_CPP_BUILT_AS_DYNAMIC_LIB @H5_CPP_BUILT_AS_DYNAMIC_LIB@
-
-/* Defined if HDF5 CPP  was built with CMake AND build as a static library  */
-#cmakedefine H5_CPP_BUILT_AS_STATIC_LIB @H5_CPP_BUILT_AS_STATIC_LIB@
-
-/* Defined if HDF5 HL was built with CMake AND build as a shared library */
-#cmakedefine H5_HL_BUILT_AS_DYNAMIC_LIB @H5_HL_BUILT_AS_DYNAMIC_LIB@
-
-/* Defined if HDF5 HL was built with CMake AND build as a static library */
-#cmakedefine H5_HL_BUILT_AS_STATIC_LIB @H5_HL_BUILT_AS_STATIC_LIB@
-
-/* Define if building universal (internal helper macro) */
-#cmakedefine H5_AC_APPLE_UNIVERSAL_BUILD @H5_AC_APPLE_UNIVERSAL_BUILD@
-
-/* Define if your system generates wrong code for log2 routine. */
-#cmakedefine H5_BAD_LOG2_CODE_GENERATED @H5_BAD_LOG2_CODE_GENERATED@
-
-/* Define if the memory buffers being written to disk should be cleared before
-   writing. */
-#cmakedefine H5_CLEAR_MEMORY @H5_CLEAR_MEMORY@
-
-/* Define if C++ compiler recognizes offsetof */
-#cmakedefine H5_CXX_HAVE_OFFSETOF @H5_CXX_HAVE_OFFSETOF@
-
 /* Define the default plugins path to compile */
 #cmakedefine H5_DEFAULT_PLUGINDIR "@H5_DEFAULT_PLUGINDIR@"
 
-/* Define if `dev_t' is a scalar */
+/* Define if dev_t is a scalar */
 #cmakedefine H5_DEV_T_IS_SCALAR @H5_DEV_T_IS_SCALAR@
 
+/* Define if your system is IBM ppc64le and cannot convert some long double
+   values correctly. */
+#cmakedefine H5_DISABLE_SOME_LDOUBLE_CONV @H5_DISABLE_SOME_LDOUBLE_CONV@
+
 /* Define to dummy `main' function (if any) required to link to the Fortran
    libraries. */
 #cmakedefine H5_FC_DUMMY_MAIN @H5_FC_DUMMY_MAIN@
@@ -66,39 +50,67 @@
 /* As FC_FUNC, but for C identifiers containing underscores. */
 #define @H5_FC_FUNC_@
 
+/* Define if Fortran C_LONG_DOUBLE is different from C_DOUBLE */
+#define H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE @H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE@
+
+/* Define if we have Fortran C_LONG_DOUBLE */
+#define H5_FORTRAN_HAVE_C_LONG_DOUBLE @H5_FORTRAN_HAVE_C_LONG_DOUBLE@
+
+/* Define if we have Fortran intrinsic C_SIZEOF */
+#cmakedefine H5_FORTRAN_HAVE_C_SIZEOF @H5_FORTRAN_HAVE_C_SIZEOF@
+
+/* Define if we have Fortran intrinsic SIZEOF */
+#cmakedefine H5_FORTRAN_HAVE_SIZEOF @H5_FORTRAN_HAVE_SIZEOF@
+
+/* Define if we have Fortran intrinsic STORAGE_SIZE */
+#cmakedefine H5_FORTRAN_HAVE_STORAGE_SIZE @H5_FORTRAN_HAVE_STORAGE_SIZE@
+
+/* Determine the size of C long double */
+#cmakedefine H5_FORTRAN_SIZEOF_LONG_DOUBLE @H5_FORTRAN_SIZEOF_LONG_DOUBLE@
+
+/* Define Fortran compiler ID */
+#define H5_Fortran_COMPILER_ID @CMAKE_Fortran_COMPILER_ID@
+
+/* Define number of valid Fortran INTEGER KINDs (must be defined before F_IKIND)*/
+#cmakedefine H5_H5CONFIG_F_NUM_IKIND @H5_H5CONFIG_F_NUM_IKIND@
+
+/* Define valid Fortran INTEGER KINDs */
+#cmakedefine H5_H5CONFIG_F_IKIND @H5_H5CONFIG_F_IKIND@
+
+/* Define number of valid Fortran REAL KINDs (must be defined before F_RKIND) */
+#cmakedefine H5_H5CONFIG_F_NUM_RKIND @H5_H5CONFIG_F_NUM_RKIND@
+
+/* Define valid Fortran REAL KINDs */
+#cmakedefine H5_H5CONFIG_F_RKIND @H5_H5CONFIG_F_RKIND@
+
+/* Define valid Fortran REAL KINDs Sizeof */
+#cmakedefine H5_H5CONFIG_F_RKIND_SIZEOF @H5_H5CONFIG_F_RKIND_SIZEOF@
+
 /* Define to 1 if you have the `alarm' function. */
 #cmakedefine H5_HAVE_ALARM @H5_HAVE_ALARM@
 
+/* Define to 1 if you have the <arpa/inet.h> header file. */
+#cmakedefine H5_HAVE_ARPA_INET_H @H5_HAVE_ARPA_INET_H@
+
 /* Define to 1 if you have the `asprintf' function. */
 #cmakedefine H5_HAVE_ASPRINTF @H5_HAVE_ASPRINTF@
 
 /* Define if the __attribute__(()) extension is present */
 #cmakedefine H5_HAVE_ATTRIBUTE @H5_HAVE_ATTRIBUTE@
 
-/* Define if the compiler understands C99 designated initialization of structs
-   and unions */
-#cmakedefine H5_HAVE_C99_DESIGNATED_INITIALIZER @H5_HAVE_C99_DESIGNATED_INITIALIZER@
-
-/* Define if the compiler understands the __func__ keyword */
-#cmakedefine H5_HAVE_C99_FUNC @H5_HAVE_C99_FUNC@
-
 /* Define to 1 if you have the `clock_gettime' function. */
 #cmakedefine H5_HAVE_CLOCK_GETTIME @H5_HAVE_CLOCK_GETTIME@
 
 /* Define if the function stack tracing code is to be compiled in */
 #cmakedefine H5_HAVE_CODESTACK @H5_HAVE_CODESTACK@
 
+/* Define to 1 if you have the <curl/curl.h> header file. */
+#cmakedefine H5_HAVE_CURL_CURL_H @H5_HAVE_CURL_H@
+
 /* Define if Darwin or Mac OS X */
 #cmakedefine H5_HAVE_DARWIN @H5_HAVE_DARWIN@
 
-/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't.
-   */
-#cmakedefine H5_HAVE_DECL_TZNAME @H5_HAVE_DECL_TZNAME@
-
-/* Define to 1 if you have the `difftime' function. */
-#cmakedefine H5_HAVE_DIFFTIME @H5_HAVE_DIFFTIME@
-
-/* Define if the direct I/O virtual file driver should be compiled */
+/* Define if the direct I/O virtual file driver (VFD) should be compiled */
 #cmakedefine H5_HAVE_DIRECT @H5_HAVE_DIRECT@
 
 /* Define to 1 if you have the <dirent.h> header file. */
@@ -107,12 +119,12 @@
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #cmakedefine H5_HAVE_DLFCN_H @H5_HAVE_DLFCN_H@
 
-/* Define to 1 if you have the <dmalloc.h> header file. */
-#cmakedefine H5_HAVE_DMALLOC_H @H5_HAVE_DMALLOC_H@
-
 /* Define if library information should be embedded in the executables */
 #cmakedefine H5_HAVE_EMBEDDED_LIBINFO @H5_HAVE_EMBEDDED_LIBINFO@
 
+/* Define to 1 if you have the `fcntl' function. */
+#cmakedefine H5_HAVE_FCNTL @H5_HAVE_FCNTL@
+
 /* Define to 1 if you have the <features.h> header file. */
 #cmakedefine H5_HAVE_FEATURES_H @H5_HAVE_FEATURES_H@
 
@@ -122,35 +134,20 @@
 /* Define if support for szip filter is enabled */
 #cmakedefine H5_HAVE_FILTER_SZIP @H5_HAVE_FILTER_SZIP@
 
-/* Define to 1 if you have the `fork' function. */
-#cmakedefine H5_HAVE_FORK @H5_HAVE_FORK@
+/* Determine if __float128 is available */
+#cmakedefine H5_HAVE_FLOAT128 @H5_HAVE_FLOAT128@
 
-/* Define to 1 if you have the `frexpf' function. */
-#cmakedefine H5_HAVE_FREXPF @H5_HAVE_FREXPF@
+/* Define to 1 if you have the `flock' function. */
+#cmakedefine H5_HAVE_FLOCK @H5_HAVE_FLOCK@
 
-/* Define to 1 if you have the `frexpl' function. */
-#cmakedefine H5_HAVE_FREXPL @H5_HAVE_FREXPL@
+/* Define to 1 if you have the `fork' function. */
+#cmakedefine H5_HAVE_FORK @H5_HAVE_FORK@
 
 /* Define to 1 if you have the `fseeko' function. */
 #cmakedefine H5_HAVE_FSEEKO @H5_HAVE_FSEEKO@
 
-/* Define to 1 if you have the `fseeko64' function. */
-#cmakedefine H5_HAVE_FSEEKO64 @H5_HAVE_FSEEKO64@
-
-/* Define to 1 if you have the `fstat64' function. */
-#cmakedefine H5_HAVE_FSTAT64 @H5_HAVE_FSTAT64@
-
-/* Define to 1 if you have the `ftello' function. */
-#cmakedefine H5_HAVE_FTELLO @H5_HAVE_FTELLO@
-
-/* Define to 1 if you have the `ftello64' function. */
-#cmakedefine H5_HAVE_FTELLO64 @H5_HAVE_FTELLO64@
-
-/* Define to 1 if you have the `ftruncate64' function. */
-#cmakedefine H5_HAVE_FTRUNCATE64 @H5_HAVE_FTRUNCATE64@
-
-/* Define if the compiler understands the __FUNCTION__ keyword */
-#cmakedefine H5_HAVE_FUNCTION @H5_HAVE_FUNCTION@
+/* Determine if INTEGER*16 is available */
+#cmakedefine H5_HAVE_Fortran_INTEGER_SIZEOF_16 @H5_HAVE_Fortran_INTEGER_SIZEOF_16@
 
 /* Define to 1 if you have the `GetConsoleScreenBufferInfo' function. */
 #cmakedefine H5_HAVE_GETCONSOLESCREENBUFFERINFO @H5_HAVE_GETCONSOLESCREENBUFFERINFO@
@@ -170,58 +167,40 @@
 /* Define to 1 if you have the `gettimeofday' function. */
 #cmakedefine H5_HAVE_GETTIMEOFDAY @H5_HAVE_GETTIMEOFDAY@
 
-/* Define to 1 if you have the `gettimeofday' function declared in time.h . */
-#cmakedefine H5_HAVE_TIME_GETTIMEOFDAY @H5_HAVE_TIME_GETTIMEOFDAY@
-
-/* Define to 1 if you have the `gettimeofday' function declared in sys/time.h . */
-#cmakedefine H5_HAVE_SYS_TIME_GETTIMEOFDAY @H5_HAVE_SYS_TIME_GETTIMEOFDAY@
+/* Define to 1 if you have the <hdfs.h> header file. */
+#cmakedefine H5_HAVE_HDFS_H @H5_HAVE_HDFS_H@
 
-/* Define to 1 if you have the `get_fpc_csr' function. */
-#cmakedefine H5_HAVE_GET_FPC_CSR @H5_HAVE_GET_FPC_CSR@
-
-/* Define if library will contain instrumentation to detect correct
+/* Define if parallel library will contain instrumentation to detect correct
    optimization operation */
 #cmakedefine H5_HAVE_INSTRUMENTED_LIBRARY @H5_HAVE_INSTRUMENTED_LIBRARY@
 
-/* Define to 1 if you have the <inttypes.h> header file. */
-#cmakedefine H5_HAVE_INTTYPES_H @H5_HAVE_INTTYPES_H@
+/* Define if IOC VFD is built */
+#cmakedefine H5_HAVE_IOC_VFD @H5_HAVE_IOC_VFD@
 
 /* Define to 1 if you have the `ioctl' function. */
 #cmakedefine H5_HAVE_IOCTL @H5_HAVE_IOCTL@
 
-/* Define to 1 if you have the <io.h> header file. */
-#cmakedefine H5_HAVE_IO_H @H5_HAVE_IO_H@
+/* Define to 1 if you have the `crypto' library (-lcrypto). */
+#cmakedefine H5_HAVE_LIBCRYPTO @H5_HAVE_LIBCRYPTO@
+
+/* Define to 1 if you have the `curl' library (-lcurl). */
+#cmakedefine H5_HAVE_LIBCURL @H5_HAVE_LIBCURL@
 
 /* Define to 1 if you have the `dl' library (-ldl). */
 #cmakedefine H5_HAVE_LIBDL @H5_HAVE_LIBDL@
 
-/* Define to 1 if you have the `dmalloc' library (-ldmalloc). */
-#cmakedefine H5_HAVE_LIBDMALLOC @H5_HAVE_LIBDMALLOC@
+/* Proceed to build with libhdfs */
+#cmakedefine H5_HAVE_LIBHDFS @H5_HAVE_LIBHDFS@
+
+/* Define to 1 if you have the `jvm' library (-ljvm). */
+#cmakedefine H5_HAVE_LIBJVM @H5_HAVE_LIBJVM@
 
 /* Define to 1 if you have the `m' library (-lm). */
 #cmakedefine H5_HAVE_LIBM @H5_HAVE_LIBM@
 
-/* Define to 1 if you have the `mpe' library (-lmpe). */
-#cmakedefine H5_HAVE_LIBMPE @H5_HAVE_LIBMPE@
-
-/* Define to 1 if you have the `mpi' library (-lmpi). */
-#cmakedefine H5_HAVE_LIBMPI @H5_HAVE_LIBMPI@
-
-/* Define to 1 if you have the `mpich' library (-lmpich). */
-#cmakedefine H5_HAVE_LIBMPICH @H5_HAVE_LIBMPICH@
-
-/* Define to 1 if you have the `mpio' library (-lmpio). */
-#cmakedefine H5_HAVE_LIBMPIO @H5_HAVE_LIBMPIO@
-
-/* Define to 1 if you have the `nsl' library (-lnsl). */
-#cmakedefine H5_HAVE_LIBNSL @H5_HAVE_LIBNSL@
-
 /* Define to 1 if you have the `pthread' library (-lpthread). */
 #cmakedefine H5_HAVE_LIBPTHREAD @H5_HAVE_LIBPTHREAD@
 
-/* Define to 1 if you have the `socket' library (-lsocket). */
-#cmakedefine H5_HAVE_LIBSOCKET @H5_HAVE_LIBSOCKET@
-
 /* Define to 1 if you have the `sz' library (-lsz). */
 #cmakedefine H5_HAVE_LIBSZ @H5_HAVE_LIBSZ@
 
@@ -231,41 +210,56 @@
 /* Define to 1 if you have the `z' library (-lz). */
 #cmakedefine H5_HAVE_LIBZ @H5_HAVE_LIBZ@
 
-/* Define to 1 if you have the `longjmp' function. */
-#cmakedefine H5_HAVE_LONGJMP @H5_HAVE_LONGJMP@
-
 /* Define to 1 if you have the `lseek64' function. */
 #cmakedefine H5_HAVE_LSEEK64 @H5_HAVE_LSEEK64@
 
 /* Define to 1 if you have the `lstat' function. */
 #cmakedefine H5_HAVE_LSTAT @H5_HAVE_LSTAT@
 
-/* Define to 1 if you have the <mach/mach_time.h> header file. */
-#cmakedefine H5_HAVE_MACH_MACH_TIME_H @H5_HAVE_MACH_MACH_TIME_H@
+/* Define if the map API (H5M) should be compiled */
+#cmakedefine H5_HAVE_MAP_API @H5_HAVE_MAP_API@
 
-/* Define to 1 if you have the <memory.h> header file. */
-#cmakedefine H5_HAVE_MEMORY_H @H5_HAVE_MEMORY_H@
+/* Define whether the Mirror virtual file driver (VFD) will be compiled */
+#cmakedefine H5_HAVE_MIRROR_VFD @H5_HAVE_MIRROR_VFD@
 
-/* Define if we have MPE support */
-#cmakedefine H5_HAVE_MPE @H5_HAVE_MPE@
-
-/* Define to 1 if you have the <mpe.h> header file. */
-#cmakedefine H5_HAVE_MPE_H @H5_HAVE_MPE_H@
-
-/* Define if `MPI_Comm_c2f' and `MPI_Comm_f2c' exists */
+/* Define if MPI_Comm_c2f and MPI_Comm_f2c exist */
 #cmakedefine H5_HAVE_MPI_MULTI_LANG_Comm @H5_HAVE_MPI_MULTI_LANG_Comm@
 
-/* Define if `MPI_Info_c2f' and `MPI_Info_f2c' exists */
+/* Define if MPI_Info_c2f and MPI_Info_f2c exist */
 #cmakedefine H5_HAVE_MPI_MULTI_LANG_Info @H5_HAVE_MPI_MULTI_LANG_Info@
 
+/* Define to 1 if you have the <netdb.h> header file. */
+#cmakedefine H5_HAVE_NETDB_H @H5_HAVE_NETDB_H@
+
+/* Define to 1 if you have the <netinet/in.h> header file. */
+#cmakedefine H5_HAVE_NETINET_IN_H @H5_HAVE_NETINET_IN_H@
+
+/* Define to 1 if you have the <openssl/evp.h> header file. */
+#cmakedefine H5_HAVE_OPENSSL_EVP_H @H5_HAVE_OPENSSL_EVP_H@
+
+/* Define to 1 if you have the <openssl/hmac.h> header file. */
+#cmakedefine H5_HAVE_OPENSSL_HMAC_H @H5_HAVE_OPENSSL_HMAC_H@
+
+/* Define to 1 if you have the <openssl/sha.h> header file. */
+#cmakedefine H5_HAVE_OPENSSL_SHA_H @H5_HAVE_OPENSSL_SHA_H@
+
 /* Define if we have parallel support */
 #cmakedefine H5_HAVE_PARALLEL @H5_HAVE_PARALLEL@
 
+/* Define if we have support for writing to filtered datasets in parallel */
+#cmakedefine H5_HAVE_PARALLEL_FILTERED_WRITES @H5_HAVE_PARALLEL_FILTERED_WRITES@
+
+/* Define if both pread and pwrite exist. */
+#cmakedefine H5_HAVE_PREADWRITE @H5_HAVE_PREADWRITE@
+
 /* Define to 1 if you have the <pthread.h> header file. */
 #cmakedefine H5_HAVE_PTHREAD_H @H5_HAVE_PTHREAD_H@
 
-/* Define to 1 if you have the 'InitOnceExecuteOnce' function. */
-#cmakedefine H5_HAVE_WIN_THREADS @H5_HAVE_WIN_THREADS@
+/* Define to 1 if you have the <pwd.h> header file. */
+#cmakedefine H5_HAVE_PWD_H @H5_HAVE_PWD_H@
+
+/* Define to 1 if you have the <quadmath.h> header file. */
+#cmakedefine H5_HAVE_QUADMATH_H @H5_HAVE_QUADMATH_H@
 
 /* Define to 1 if you have the `random' function. */
 #cmakedefine H5_HAVE_RANDOM @H5_HAVE_RANDOM@
@@ -273,54 +267,37 @@
 /* Define to 1 if you have the `rand_r' function. */
 #cmakedefine H5_HAVE_RAND_R @H5_HAVE_RAND_R@
 
-/* Define to 1 if you have the `setjmp' function. */
-#cmakedefine H5_HAVE_SETJMP @H5_HAVE_SETJMP@
-
-/* Define to 1 if you have the <setjmp.h> header file. */
-#cmakedefine H5_HAVE_SETJMP_H @H5_HAVE_SETJMP_H@
+/* Define whether the Read-Only S3 virtual file driver (VFD) should be
+   compiled */
+#cmakedefine H5_HAVE_ROS3_VFD @H5_HAVE_ROS3_VFD@
 
 /* Define to 1 if you have the `setsysinfo' function. */
 #cmakedefine H5_HAVE_SETSYSINFO @H5_HAVE_SETSYSINFO@
 
-/* Define to 1 if you have the `sigaction' function. */
-#cmakedefine H5_HAVE_SIGACTION @H5_HAVE_SIGACTION@
-
 /* Define to 1 if you have the `siglongjmp' function. */
 #cmakedefine H5_HAVE_SIGLONGJMP @H5_HAVE_SIGLONGJMP@
 
-/* Define to 1 if you have the `signal' function. */
-#cmakedefine H5_HAVE_SIGNAL @H5_HAVE_SIGNAL@
-
 /* Define to 1 if you have the `sigprocmask' function. */
 #cmakedefine H5_HAVE_SIGPROCMASK @H5_HAVE_SIGPROCMASK@
 
 /* Define to 1 if you have the `sigsetjmp' function. */
 #cmakedefine H5_HAVE_SIGSETJMP @H5_HAVE_SIGSETJMP@
 
-/* Define to 1 if you have the `snprintf' function. */
-#cmakedefine H5_HAVE_SNPRINTF @H5_HAVE_SNPRINTF@
-
 /* Define to 1 if you have the `srandom' function. */
 #cmakedefine H5_HAVE_SRANDOM @H5_HAVE_SRANDOM@
 
 /* Define to 1 if you have the `stat64' function. */
 #cmakedefine H5_HAVE_STAT64 @H5_HAVE_STAT64@
 
-/* Define if `struct stat' has the `st_blocks' field */
+/* Define if struct stat has the st_blocks field */
 #cmakedefine H5_HAVE_STAT_ST_BLOCKS @H5_HAVE_STAT_ST_BLOCKS@
 
-/* Define to 1 if you have the <stddef.h> header file. */
-#cmakedefine H5_HAVE_STDDEF_H @H5_HAVE_STDDEF_H@
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#cmakedefine H5_HAVE_STDINT_H @H5_HAVE_STDINT_H@
-
-/* Define to 1 if you have the <stdint.h> header file for Cplusplus. */
-#cmakedefine H5_HAVE_STDINT_H_CXX @H5_HAVE_STDINT_H_CXX@
-
 /* Define to 1 if you have the <stdlib.h> header file. */
 #cmakedefine H5_HAVE_STDLIB_H @H5_HAVE_STDLIB_H@
 
+/* Define to 1 if you have the `strcasestr' function. */
+#cmakedefine H5_HAVE_STRCASESTR @H5_HAVE_STRCASESTR@
+
 /* Define to 1 if you have the `strdup' function. */
 #cmakedefine H5_HAVE_STRDUP @H5_HAVE_STRDUP@
 
@@ -330,27 +307,27 @@
 /* Define to 1 if you have the <string.h> header file. */
 #cmakedefine H5_HAVE_STRING_H @H5_HAVE_STRING_H@
 
-/* Define if `struct text_info' is defined */
+/* Define if struct text_info is defined */
 #cmakedefine H5_HAVE_STRUCT_TEXT_INFO @H5_HAVE_STRUCT_TEXT_INFO@
 
-/* Define if `struct videoconfig' is defined */
+/* Define if struct videoconfig is defined */
 #cmakedefine H5_HAVE_STRUCT_VIDEOCONFIG @H5_HAVE_STRUCT_VIDEOCONFIG@
 
+/* Define if Subfiling VFD is built */
+#cmakedefine H5_HAVE_SUBFILING_VFD @H5_HAVE_SUBFILING_VFD@
+
+/* Define if have stdatomic.h for Subfiling VFD */
+#cmakedefine H5_HAVE_STDATOMIC_H @H5_HAVE_STDATOMIC_H@
+
 /* Define to 1 if you have the `symlink' function. */
 #cmakedefine H5_HAVE_SYMLINK @H5_HAVE_SYMLINK@
 
-/* Define to 1 if you have the `system' function. */
-#cmakedefine H5_HAVE_SYSTEM @H5_HAVE_SYSTEM@
-
-/* Define to 1 if you have the <sys/fpu.h> header file. */
-#cmakedefine H5_HAVE_SYS_FPU_H @H5_HAVE_SYS_FPU_H@
+/* Define to 1 if you have the <sys/file.h> header file. */
+#cmakedefine H5_HAVE_SYS_FILE_H @H5_HAVE_SYS_FILE_H@
 
 /* Define to 1 if you have the <sys/ioctl.h> header file. */
 #cmakedefine H5_HAVE_SYS_IOCTL_H @H5_HAVE_SYS_IOCTL_H@
 
-/* Define to 1 if you have the <sys/proc.h> header file. */
-#cmakedefine H5_HAVE_SYS_PROC_H @H5_HAVE_SYS_PROC_H@
-
 /* Define to 1 if you have the <sys/resource.h> header file. */
 #cmakedefine H5_HAVE_SYS_RESOURCE_H @H5_HAVE_SYS_RESOURCE_H@
 
@@ -360,15 +337,6 @@
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #cmakedefine H5_HAVE_SYS_STAT_H @H5_HAVE_SYS_STAT_H@
 
-/* Define to 1 if you have the <sys/sysinfo.h> header file. */
-#cmakedefine H5_HAVE_SYS_SYSINFO_H @H5_HAVE_SYS_SYSINFO_H@
-
-/* Define to 1 if you have the <sys/timeb.h> header file. */
-#cmakedefine H5_HAVE_SYS_TIMEB_H @H5_HAVE_SYS_TIMEB_H@
-
-/* Define to 1 if you have the <time.h> header file. */
-#cmakedefine H5_HAVE_TIME_H @H5_HAVE_TIME_H@
-
 /* Define to 1 if you have the <sys/time.h> header file. */
 #cmakedefine H5_HAVE_SYS_TIME_H @H5_HAVE_SYS_TIME_H@
 
@@ -378,10 +346,15 @@
 /* Define to 1 if you have the <szlib.h> header file. */
 #cmakedefine H5_HAVE_SZLIB_H @H5_HAVE_SZLIB_H@
 
+#if defined(_WIN32) && !defined(H5_BUILT_AS_DYNAMIC_LIB)
+/* Not supported on WIN32 platforms with static linking */
+/* #undef H5_HAVE_THREADSAFE */
+#else
 /* Define if we have thread safe support */
-#cmakedefine H5_HAVE_THREADSAFE @H5_HAVE_THREADSAFE@
+# cmakedefine H5_HAVE_THREADSAFE @H5_HAVE_THREADSAFE@
+#endif
 
-/* Define if `timezone' is a global variable */
+/* Define if timezone is a global variable */
 #cmakedefine H5_HAVE_TIMEZONE @H5_HAVE_TIMEZONE@
 
 /* Define if the ioctl TIOCGETD is defined */
@@ -393,30 +366,24 @@
 /* Define to 1 if you have the `tmpfile' function. */
 #cmakedefine H5_HAVE_TMPFILE @H5_HAVE_TMPFILE@
 
-/* Define if `tm_gmtoff' is a member of `struct tm' */
+/* Define if tm_gmtoff is a member of struct tm */
 #cmakedefine H5_HAVE_TM_GMTOFF @H5_HAVE_TM_GMTOFF@
 
 /* Define to 1 if you have the <unistd.h> header file. */
 #cmakedefine H5_HAVE_UNISTD_H @H5_HAVE_UNISTD_H@
 
-/* Define to 1 if you have the `asprintf' function. */
-#cmakedefine H5_HAVE_ASPRINTF @H5_HAVE_ASPRINTF@
-
 /* Define to 1 if you have the `vasprintf' function. */
 #cmakedefine H5_HAVE_VASPRINTF @H5_HAVE_VASPRINTF@
 
-/* Define to 1 if you have the `vsnprintf' function. */
-#cmakedefine H5_HAVE_VSNPRINTF @H5_HAVE_VSNPRINTF@
-
 /* Define to 1 if you have the `waitpid' function. */
 #cmakedefine H5_HAVE_WAITPID @H5_HAVE_WAITPID@
 
+/* Define to 1 if you have the 'InitOnceExecuteOnce' function. */
+#cmakedefine H5_HAVE_WIN_THREADS @H5_HAVE_WIN_THREADS@
+
 /* Define if your system has window style path name. */
 #cmakedefine H5_HAVE_WINDOW_PATH @H5_HAVE_WINDOW_PATH@
 
-/* Define to 1 if you have the <winsock.h> header file. */
-#cmakedefine H5_HAVE_WINSOCK2_H @H5_HAVE_WINSOCK2_H@
-
 /* Define to 1 if you have the <zlib.h> header file. */
 #cmakedefine H5_HAVE_ZLIB_H @H5_HAVE_ZLIB_H@
 
@@ -426,9 +393,19 @@
 /* Define to 1 if you have the `_scrsize' function. */
 #cmakedefine H5_HAVE__SCRSIZE @H5_HAVE__SCRSIZE@
 
-/* Define if HDF5's high-level library headers should be included in hdf5.h */
+/* Define if the library will ignore file locks when disabled */
+#cmakedefine H5_IGNORE_DISABLED_FILE_LOCKS @H5_IGNORE_DISABLED_FILE_LOCKS@
+
+/* Define if the high-level library headers should be included in hdf5.h */
 #cmakedefine H5_INCLUDE_HL @H5_INCLUDE_HL@
 
+/* Define if new-style references should be used with dimension scales */
+#cmakedefine H5_DIMENSION_SCALES_WITH_NEW_REF @H5_DIMENSION_SCALES_WITH_NEW_REF@
+
+/* Define if your system can convert long double to (unsigned) long long
+   values correctly. */
+#cmakedefine H5_LDOUBLE_TO_LLONG_ACCURATE @H5_LDOUBLE_TO_LLONG_ACCURATE@
+
 /* Define if your system converts long double to (unsigned) long values with
    special algorithm. */
 #cmakedefine H5_LDOUBLE_TO_LONG_SPECIAL @H5_LDOUBLE_TO_LONG_SPECIAL@
@@ -441,16 +418,9 @@
    with special algorithm. */
 #cmakedefine H5_LONG_TO_LDOUBLE_SPECIAL @H5_LONG_TO_LDOUBLE_SPECIAL@
 
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
 #cmakedefine H5_LT_OBJDIR @H5_LT_OBJDIR@
 
-/* Define if the metadata trace file code is to be compiled in */
-#cmakedefine H5_METADATA_TRACE_FILE @H5_METADATA_TRACE_FILE@
-
-/* Define if we can violate pointer alignment restrictions */
-#cmakedefine H5_NO_ALIGNMENT_RESTRICTIONS @H5_NO_ALIGNMENT_RESTRICTIONS@
-
 /* Define if deprecated public API symbols are disabled */
 #cmakedefine H5_NO_DEPRECATED_SYMBOLS @H5_NO_DEPRECATED_SYMBOLS@
 
@@ -475,8 +445,14 @@
 /* Define to the version of this package. */
 #define H5_PACKAGE_VERSION "@HDF5_PACKAGE_VERSION_STRING@"
 
-/* Width for printf() for type `long long' or `__int64', use `ll' */
-#cmakedefine H5_PRINTF_LL_WIDTH @H5_PRINTF_LL_WIDTH@
+/* Determine the maximum decimal precision in C */
+#define H5_PAC_C_MAX_REAL_PRECISION @H5_PAC_C_MAX_REAL_PRECISION@
+
+/* Define Fortran Maximum Real Decimal Precision */
+#define H5_PAC_FC_MAX_REAL_PRECISION @H5_PAC_FC_MAX_REAL_PRECISION@
+
+/* The size of `bool', as computed by sizeof. */
+#cmakedefine H5_SIZEOF_BOOL @H5_SIZEOF_BOOL@
 
 /* The size of `char', as computed by sizeof. */
 #cmakedefine H5_SIZEOF_CHAR @H5_SIZEOF_CHAR@
@@ -527,6 +503,7 @@
 #cmakedefine H5_SIZEOF_INT_LEAST8_T @H5_SIZEOF_INT_LEAST8_T@
 
 #if !defined(__APPLE__)
+
 /* The size of `size_t', as computed by sizeof. */
 #cmakedefine H5_SIZEOF_SIZE_T @H5_SIZEOF_SIZE_T@
 
@@ -536,8 +513,17 @@
 /* The size of `long', as computed by sizeof. */
 #cmakedefine H5_SIZEOF_LONG @H5_SIZEOF_LONG@
 
+/* The size of `long double', as computed by sizeof. */
+#cmakedefine H5_SIZEOF_LONG_DOUBLE @H5_SIZEOF_LONG_DOUBLE@
+
 #else
-   # if defined(__LP64__) && __LP64__
+
+  /* On Apple, to support Universal Binaries (where multiple CPU
+     architectures exist in one library/executable), we can't assume
+     the machine doing the compiling has the same endianness or type
+     sizes as all the various architectures (PowerPC, Intel, ARM). */
+
+  # if defined(__LP64__) && __LP64__
   #define H5_SIZEOF_LONG 8
   #define H5_SIZEOF_SIZE_T 8
   #define H5_SIZEOF_SSIZE_T 8
@@ -547,13 +533,17 @@
   #define H5_SIZEOF_SSIZE_T 4
   # endif
 
-#endif
+  # if defined(__i386__) || defined(__x86_64__)
+  #define H5_SIZEOF_LONG_DOUBLE 16
+  # elif defined(__aarch64__)
+  #define H5_SIZEOF_LONG_DOUBLE 8
+  # else
+  #cmakedefine H5_SIZEOF_LONG_DOUBLE @H5_SIZEOF_LONG_DOUBLE@
+  # endif
 
-/* The size of `long double', as computed by sizeof. */
-#cmakedefine H5_SIZEOF_LONG_DOUBLE @H5_SIZEOF_LONG_DOUBLE@
+#endif
 
-/* Define size of long long and/or __int64 bit integer type only if the type
-   exists.  */
+/* The size of `long long', as computed by sizeof. */
 #if !defined(__APPLE__)
  #cmakedefine H5_SIZEOF_LONG_LONG @H5_SIZEOF_LONG_LONG@
 #else
@@ -572,6 +562,9 @@
 /* The size of `short', as computed by sizeof. */
 #cmakedefine H5_SIZEOF_SHORT @H5_SIZEOF_SHORT@
 
+/* The size of `time_t', as computed by sizeof. */
+#cmakedefine H5_SIZEOF_TIME_T @H5_SIZEOF_TIME_T@
+
 /* The size of `uint16_t', as computed by sizeof. */
 #cmakedefine H5_SIZEOF_UINT16_T @H5_SIZEOF_UINT16_T@
 
@@ -611,11 +604,11 @@
 /* The size of `unsigned', as computed by sizeof. */
 #cmakedefine H5_SIZEOF_UNSIGNED @H5_SIZEOF_UNSIGNED@
 
-/* The size of `__int64', as computed by sizeof. */
-#define H5_SIZEOF___INT64 @H5_SIZEOF___INT64@
+/* The size of `_Quad', as computed by sizeof. */
+#define H5_SIZEOF__QUAD @H5_SIZEOF__QUAD@
 
-/* Define to 1 if you have the ANSI C header files. */
-#cmakedefine H5_STDC_HEADERS @H5_STDC_HEADERS@
+/* The size of `__float128', as computed by sizeof. */
+#define H5_SIZEOF___FLOAT128 @H5_SIZEOF___FLOAT128@
 
 /* Define if strict file format checks are enabled */
 #cmakedefine H5_STRICT_FORMAT_CHECKS @H5_STRICT_FORMAT_CHECKS@
@@ -624,18 +617,27 @@
    PTHREAD_SCOPE_SYSTEM) call. */
 #cmakedefine H5_SYSTEM_SCOPE_THREADS @H5_SYSTEM_SCOPE_THREADS@
 
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#cmakedefine H5_TIME_WITH_SYS_TIME @H5_TIME_WITH_SYS_TIME@
-
-/* Define to 1 if your <sys/time.h> declares `struct tm'. */
-#cmakedefine H5_TM_IN_SYS_TIME @H5_TM_IN_SYS_TIME@
-
 /* Define using v1.6 public API symbols by default */
 #cmakedefine H5_USE_16_API_DEFAULT @H5_USE_16_API_DEFAULT@
 
 /* Define using v1.8 public API symbols by default */
 #cmakedefine H5_USE_18_API_DEFAULT @H5_USE_18_API_DEFAULT@
 
+/* Define using v1.10 public API symbols by default */
+#cmakedefine H5_USE_110_API_DEFAULT @H5_USE_110_API_DEFAULT@
+
+/* Define using v1.12 public API symbols by default */
+#cmakedefine H5_USE_112_API_DEFAULT @H5_USE_112_API_DEFAULT@
+
+/* Define using v1.14 public API symbols by default */
+#cmakedefine H5_USE_114_API_DEFAULT @H5_USE_114_API_DEFAULT@
+
+/* Define using v1.16 public API symbols by default */
+#cmakedefine H5_USE_116_API_DEFAULT @H5_USE_116_API_DEFAULT@
+
+/* Define if the library will use file locking */
+#cmakedefine H5_USE_FILE_LOCKING @H5_USE_FILE_LOCKING@
+
 /* Define if a memory checking tool will be used on the library, to cause
    library to be very picky about memory operations and also disable the
    internal free list manager code. */
@@ -644,11 +646,7 @@
 /* Version number of package */
 #define H5_VERSION "@HDF5_PACKAGE_VERSION_STRING@"
 
-/* Define if vsnprintf() returns the correct value for formatted strings that
-   don't fit into size allowed */
-#cmakedefine H5_VSNPRINTF_WORKS @H5_VSNPRINTF_WORKS@
-
-/* Data accuracy is prefered to speed during data conversions */
+/* Data accuracy is preferred to speed during data conversions */
 #cmakedefine H5_WANT_DATA_ACCURACY @H5_WANT_DATA_ACCURACY@
 
 /* Check exception handling functions during data conversions */
@@ -674,29 +672,10 @@
 /* Define for large files, on AIX-style hosts. */
 #cmakedefine H5__LARGE_FILES
 
-/* Define to empty if `const' does not conform to ANSI C. */
-#cmakedefine H5_const
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-#cmakedefine H5_inline @H5_inline@
-#endif
-
 /* Define to `long int' if <sys/types.h> does not define. */
 #cmakedefine H5_off_t
 
 /* Define to `long' if <sys/types.h> does not define. */
-#cmakedefine H5_ptrdiff_t
-
-/* Define to `unsigned long' if <sys/types.h> does not define. */
-#cmakedefine H5_size_t
-
-/* Define to `long' if <sys/types.h> does not define. */
 #cmakedefine H5_ssize_t
 
-#if defined(__cplusplus) && defined(inline)
-#undef inline
-#endif
-
 #endif
diff --git a/config/cmake/HDF518_Examples.cmake.in b/config/cmake/HDF518_Examples.cmake.in
deleted file mode 100644
index c6d0b39..0000000
--- a/config/cmake/HDF518_Examples.cmake.in
+++ /dev/null
@@ -1,126 +0,0 @@
-cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
-###############################################################################################################
-# This script will build and run the examples from a compressed file
-# Execute from a command line:
-#     ctest -S HDF518_Examples.cmake,HDF5Examples-0.1.1-Source -C Release -VV -O test.log
-###############################################################################################################
-
-set(INSTALLDIR "@CMAKE_INSTALL_PREFIX@")
-set(CTEST_CMAKE_GENERATOR "@CMAKE_GENERATOR@")
-set(STATICLIBRARIES "@H5_ENABLE_STATIC_LIB@")
-set(CTEST_SOURCE_NAME ${CTEST_SCRIPT_ARG})
-set(CTEST_DASHBOARD_ROOT ${CTEST_SCRIPT_DIRECTORY})
-set(CTEST_BUILD_CONFIGURATION "Release")
-#set(NO_MAC_FORTRAN "true")
-#set(BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF_BUILD_FORTRAN:BOOL=ON")
-#set(BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF_ENABLE_F2003:BOOL=ON)
-set(CTEST_USE_TAR_SOURCE "${CTEST_SCRIPT_ARG}")
-
-###############################################################################################################
-#     Adjust the following SET Commands as needed
-###############################################################################################################
-if(WIN32)
-  if(STATICLIBRARIES)
-    set(BUILD_OPTIONS "${BUILD_OPTIONS} -DUSE_SHARED_LIBS:BOOL=OFF")
-  endif(STATICLIBRARIES)
-  set(ENV{HDF5_DIR} "${INSTALLDIR}/cmake/hdf5")
-  set(CTEST_BINARY_NAME ${CTEST_SOURCE_NAME}\\build)
-  set(CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_SOURCE_NAME}")
-  set(CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_BINARY_NAME}")
-else(WIN32)
-  if(STATICLIBRARIES)
-    set(BUILD_OPTIONS "${BUILD_OPTIONS} -DUSE_SHARED_LIBS:BOOL=OFF -DCMAKE_ANSI_CFLAGS:STRING=-fPIC")
-  endif(STATICLIBRARIES)
-  set(ENV{HDF5_DIR} "${INSTALLDIR}/share/cmake/hdf5")
-  set(ENV{LD_LIBRARY_PATH} "${INSTALLDIR}/lib")
-  set(CTEST_BINARY_NAME ${CTEST_SOURCE_NAME}/build)
-  set(CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_SOURCE_NAME}")
-  set(CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_BINARY_NAME}")
-endif(WIN32)
-
-###############################################################################################################
-# For any comments please contact cdashhelp@hdfgroup.org
-#
-###############################################################################################################
- 
-#-----------------------------------------------------------------------------
-# MAC machines need special option
-#-----------------------------------------------------------------------------
-if(APPLE)
-  # Compiler choice
-  execute_process(COMMAND xcrun --find cc OUTPUT_VARIABLE XCODE_CC OUTPUT_STRIP_TRAILING_WHITESPACE)
-  execute_process(COMMAND xcrun --find c++ OUTPUT_VARIABLE XCODE_CXX OUTPUT_STRIP_TRAILING_WHITESPACE)
-  set(ENV{CC} "${XCODE_CC}")
-  set(ENV{CXX} "${XCODE_CXX}")
-  if(NOT NO_MAC_FORTRAN)
-    # Shared fortran is not supported, build static 
-    set(BUILD_OPTIONS "${BUILD_OPTIONS} -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_ANSI_CFLAGS:STRING=-fPIC")
-  else(NOT NO_MAC_FORTRAN)
-    set(BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF_BUILD_FORTRAN:BOOL=OFF")
-  endif(NOT NO_MAC_FORTRAN)
-  set(BUILD_OPTIONS "${BUILD_OPTIONS} -DCTEST_USE_LAUNCHERS:BOOL=ON -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=OFF")
-endif(APPLE)
- 
-#-----------------------------------------------------------------------------
-set(CTEST_CMAKE_COMMAND "\"${CMAKE_COMMAND}\"")
-## --------------------------
-if(CTEST_USE_TAR_SOURCE)
-  ## Uncompress source if tar or zip file provided
-  ## --------------------------
-  if(WIN32)
-    message(STATUS "extracting... [${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_USE_TAR_SOURCE}.zip]")
-    execute_process(COMMAND ${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_USE_TAR_SOURCE}.zip RESULT_VARIABLE rv)
-  else(WIN32)
-    message(STATUS "extracting... [${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_USE_TAR_SOURCE}.tar]")
-    execute_process(COMMAND ${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_USE_TAR_SOURCE}.tar RESULT_VARIABLE rv)
-  endif(WIN32)
- 
-  if(NOT rv EQUAL 0)
-    message(STATUS "extracting... [error-(${rv}) clean up]")
-    file(REMOVE_RECURSE "${CTEST_SOURCE_DIRECTORY}")
-    message(FATAL_ERROR "error: extract of ${CTEST_SOURCE_NAME} failed")
-  endif(NOT rv EQUAL 0)
-endif(CTEST_USE_TAR_SOURCE)
- 
-#-----------------------------------------------------------------------------
-## Clear the build directory
-## --------------------------
-set(CTEST_START_WITH_EMPTY_BINARY_DIRECTORY TRUE)
-if (EXISTS "${CTEST_BINARY_DIRECTORY}" AND IS_DIRECTORY "${CTEST_BINARY_DIRECTORY}")
-  ctest_empty_binary_directory(${CTEST_BINARY_DIRECTORY})
-else (EXISTS "${CTEST_BINARY_DIRECTORY}" AND IS_DIRECTORY "${CTEST_BINARY_DIRECTORY}")
-  file(MAKE_DIRECTORY "${CTEST_BINARY_DIRECTORY}")
-endif (EXISTS "${CTEST_BINARY_DIRECTORY}" AND IS_DIRECTORY "${CTEST_BINARY_DIRECTORY}")
-
-# Use multiple CPU cores to build
-include(ProcessorCount)
-ProcessorCount(N)
-if(NOT N EQUAL 0)
-  if(NOT WIN32)
-    set(CTEST_BUILD_FLAGS -j${N})
-  endif(NOT WIN32)
-  set(ctest_test_args ${ctest_test_args} PARALLEL_LEVEL ${N})
-endif()
-set (CTEST_CONFIGURE_COMMAND
-    "${CTEST_CMAKE_COMMAND} -C \"${CTEST_SOURCE_DIRECTORY}/config/cmake/cacheinit.cmake\" -DCMAKE_BUILD_TYPE:STRING=${CTEST_BUILD_CONFIGURATION} ${BUILD_OPTIONS} \"-G${CTEST_CMAKE_GENERATOR}\" \"${CTEST_SOURCE_DIRECTORY}\""
-)
- 
-#-----------------------------------------------------------------------------
-## -- set output to english
-set($ENV{LC_MESSAGES}  "en_EN")
- 
-#-----------------------------------------------------------------------------
-configure_file(${CTEST_SOURCE_DIRECTORY}/config/cmake/CTestCustom.cmake ${CTEST_BINARY_DIRECTORY}/CTestCustom.cmake)
-ctest_read_custom_files ("${CTEST_BINARY_DIRECTORY}")
-## NORMAL process
-## --------------------------
-ctest_start (Experimental)
-ctest_configure (BUILD "${CTEST_BINARY_DIRECTORY}")
-ctest_build (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND)
-ctest_test (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND ${ctest_test_args} RETURN_VALUE res)
-if(res GREATER 0)
-  message (FATAL_ERROR "tests FAILED")
-endif(res GREATER 0)
-#-----------------------------------------------------------------------------
-############################################################################################################## 
-message(STATUS "DONE")
-\ No newline at end of file
diff --git a/config/cmake/HDF5DeveloperBuild.cmake b/config/cmake/HDF5DeveloperBuild.cmake
new file mode 100644
index 0000000..40efb0e
--- /dev/null
+++ b/config/cmake/HDF5DeveloperBuild.cmake
@@ -0,0 +1,196 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
+
+# CMake settings for HDF5 Developer mode builds
+
+# Set CMake C++ flags based off of Debug build flags
+set (CMAKE_CXX_FLAGS_DEVELOPER ${CMAKE_CXX_FLAGS_DEBUG} CACHE STRING
+  "Flags used by the C++ compiler during developer builds." FORCE
+)
+
+# Set CMake C flags based off of Debug build flags. Add in -Og
+# option to disable some GCC optimizations that might affect
+# debugging negatively and also include some GCC compiler passes
+# that collect debugging information
+set (CMAKE_C_FLAGS_DEVELOPER "${CMAKE_C_FLAGS_DEBUG} -Og" CACHE STRING
+  "Flags used by the C compiler during developer builds." FORCE
+)
+
+# Set CMake binary linker flags based off of Debug binary linker flags
+set (CMAKE_EXE_LINKER_FLAGS_DEVELOPER ${CMAKE_EXE_LINKER_FLAGS_DEBUG}
+  CACHE STRING "Flags used for linking binaries during developer builds."
+  FORCE
+)
+
+# Set CMake shared library linker flags based off of Debug shared library
+# linker flags
+set (CMAKE_SHARED_LINKER_FLAGS_DEVELOPER ${CMAKE_SHARED_LINKER_FLAGS_DEBUG}
+  CACHE STRING "Flags used by the shared libraries linker during developer builds."
+  FORCE
+)
+
+mark_as_advanced (
+  CMAKE_CXX_FLAGS_DEVELOPER
+  CMAKE_C_FLAGS_DEVELOPER
+  CMAKE_EXE_LINKER_FLAGS_DEVELOPER
+  CMAKE_SHARED_LINKER_FLAGS_DEVELOPER
+)
+
+#-----------------------------------------------------------------------------
+# Define various HDF5 macros for debugging the library
+#-----------------------------------------------------------------------------
+
+# Enable debugging of various HDF5 modules
+set (HDF5_ENABLE_DEBUG_APIS ON CACHE BOOL "Turn on extra debug output in all packages" FORCE)
+
+# HDF5 module debug definitions for debug code which either isn't
+# currently integrated with HDF5_ENABLE_DEBUG_APIS, or which isn't
+# well integrated with HDF5's H5DEBUG(X) (where 'X' is a package
+# letter) system. This type of debug code usually always prints output
+# to stdout, regardless of whether debugging for its particular module
+# has been requested via the HDF5_DEBUG environment variable. Therefore,
+# we don't automatically enable this debug code, but allow developers
+# to quickly add those definitions into their build here, without
+# needing to hack up source files.
+option (HDF5_ENABLE_DEBUG_H5AC_DIRTY_BYTES "Enable printing of H5AC module dirty bytes information" OFF)
+mark_as_advanced (HDF5_ENABLE_DEBUG_H5AC_DIRTY_BYTES)
+if (HDF5_ENABLE_DEBUG_H5AC_DIRTY_BYTES)
+  list (APPEND HDF5_DEBUG_APIS H5AC_DEBUG_DIRTY_BYTES_CREATION)
+endif ()
+
+option (HDF5_ENABLE_DEBUG_H5FA "Enable debugging of H5FA module" OFF)
+mark_as_advanced (HDF5_ENABLE_DEBUG_H5FA)
+if (HDF5_ENABLE_DEBUG_H5FA)
+  list (APPEND HDF5_DEBUG_APIS H5FA_DEBUG)
+endif ()
+
+option (HDF5_ENABLE_DEBUG_H5FD_ALLOC "Enable debugging of H5FD module allocation code" OFF)
+mark_as_advanced (HDF5_ENABLE_DEBUG_H5FD_ALLOC)
+if (HDF5_ENABLE_DEBUG_H5FD_ALLOC)
+  list (APPEND HDF5_DEBUG_APIS H5FD_ALLOC_DEBUG)
+endif ()
+
+option (HDF5_ENABLE_DEBUG_H5FL "Enable debugging of H5FL module" OFF)
+mark_as_advanced (HDF5_ENABLE_DEBUG_H5FL)
+if (HDF5_ENABLE_DEBUG_H5FL)
+  list (APPEND HDF5_DEBUG_APIS H5FL_DEBUG)
+endif ()
+
+option (HDF5_ENABLE_DEBUG_H5FS "Enable debugging of H5FS module" OFF)
+mark_as_advanced (HDF5_ENABLE_DEBUG_H5FS)
+if (HDF5_ENABLE_DEBUG_H5FS)
+  list (APPEND HDF5_DEBUG_APIS H5FS_DEBUG)
+endif ()
+
+option (HDF5_ENABLE_DEBUG_H5FS_SINFO "Enable debugging of H5FS module section info" OFF)
+mark_as_advanced (HDF5_ENABLE_DEBUG_H5FS_SINFO)
+if (HDF5_ENABLE_DEBUG_H5FS_SINFO)
+  list (APPEND HDF5_DEBUG_APIS H5FS_SINFO_DEBUG)
+endif ()
+
+option (HDF5_ENABLE_DEBUG_H5MF_AGGR "Enable debugging of H5MF module aggregation code" OFF)
+mark_as_advanced (HDF5_ENABLE_DEBUG_H5MF_AGGR)
+if (HDF5_ENABLE_DEBUG_H5MF_AGGR)
+  list (APPEND HDF5_DEBUG_APIS H5MF_AGGR_DEBUG)
+endif ()
+
+option (HDF5_ENABLE_DEBUG_H5MF_ALLOC "Enable debugging of H5MF module allocation code" OFF)
+mark_as_advanced (HDF5_ENABLE_DEBUG_H5MF_ALLOC)
+if (HDF5_ENABLE_DEBUG_H5MF_ALLOC)
+  list (APPEND HDF5_DEBUG_APIS H5MF_ALLOC_DEBUG)
+endif ()
+
+option (HDF5_ENABLE_DEBUG_H5MF_ALLOC_MORE "Enable extra debugging of H5MF module allocation code" OFF)
+mark_as_advanced (HDF5_ENABLE_DEBUG_H5MF_ALLOC_MORE)
+if (HDF5_ENABLE_DEBUG_H5MF_ALLOC_MORE)
+  list (APPEND HDF5_DEBUG_APIS H5MF_ALLOC_DEBUG_MORE)
+endif ()
+
+option (HDF5_ENABLE_DEBUG_H5MF_ALLOC_DUMP "Enable printing of debugging info for H5MF module allocation code" OFF)
+mark_as_advanced (HDF5_ENABLE_DEBUG_H5MF_ALLOC_DUMP)
+if (HDF5_ENABLE_DEBUG_H5MF_ALLOC_DUMP)
+  list (APPEND HDF5_DEBUG_APIS H5MF_ALLOC_DEBUG_DUMP)
+endif ()
+
+option (HDF5_ENABLE_DEBUG_H5R "Enable debugging of H5R module" OFF)
+mark_as_advanced (HDF5_ENABLE_DEBUG_H5R)
+if (HDF5_ENABLE_DEBUG_H5R)
+  list (APPEND HDF5_DEBUG_APIS H5R_DEBUG)
+endif ()
+
+option (HDF5_ENABLE_DEBUG_H5S_HYPER "Enable debugging of H5S hyperslab code" OFF)
+mark_as_advanced (HDF5_ENABLE_DEBUG_H5S_HYPER)
+if (HDF5_ENABLE_DEBUG_H5S_HYPER)
+  list (APPEND HDF5_DEBUG_APIS H5S_HYPER_DEBUG)
+endif ()
+
+option (HDF5_ENABLE_DEBUG_H5T_REF "Enable debugging of H5T module reference code" OFF)
+mark_as_advanced (HDF5_ENABLE_DEBUG_H5T_REF)
+if (HDF5_ENABLE_DEBUG_H5T_REF)
+  list (APPEND HDF5_DEBUG_APIS H5T_REF_DEBUG)
+endif ()
+
+# HDF5 module debug definitions for debug code which may add
+# considerable amounts of overhead when enabled and is usually
+# only useful for specific circumstances rather than general
+# developer use.
+option (HDF5_ENABLE_DEBUG_H5B "Enable debugging of H5B module" OFF)
+mark_as_advanced (HDF5_ENABLE_DEBUG_H5B)
+if (HDF5_ENABLE_DEBUG_H5B)
+  list (APPEND HDF5_DEBUG_APIS H5B_DEBUG)
+endif ()
+
+option (HDF5_ENABLE_DEBUG_H5B2 "Enable debugging of H5B2 module" OFF)
+mark_as_advanced (HDF5_ENABLE_DEBUG_H5B2)
+if (HDF5_ENABLE_DEBUG_H5B2)
+  list (APPEND HDF5_DEBUG_APIS H5B2_DEBUG)
+endif ()
+
+option (HDF5_ENABLE_DEBUG_H5C_SANITY_CHECKS "Enable full sanity checking in H5C module" OFF)
+mark_as_advanced (HDF5_ENABLE_DEBUG_H5C_SANITY_CHECKS)
+if (HDF5_ENABLE_DEBUG_H5C_SANITY_CHECKS)
+  list (APPEND HDF5_DEBUG_APIS H5C_DO_SANITY_CHECKS)
+  list (APPEND HDF5_DEBUG_APIS H5C_DO_SLIST_SANITY_CHECKS)
+  list (APPEND HDF5_DEBUG_APIS H5C_DO_TAGGING_SANITY_CHECKS)
+  list (APPEND HDF5_DEBUG_APIS H5C_DO_EXTREME_SANITY_CHECKS)
+
+  # See note in H5Cprivate.h about this #define
+  # list (APPEND HDF5_DEBUG_APIS H5C_DO_MEMORY_SANITY_CHECKS=1)
+endif ()
+
+option (HDF5_ENABLE_DEBUG_H5FL_TRACK "Enable tracking of free list allocations" OFF)
+mark_as_advanced (HDF5_ENABLE_DEBUG_H5FL_TRACK)
+if (HDF5_ENABLE_DEBUG_H5FL_TRACK)
+  list (APPEND HDF5_DEBUG_APIS H5FL_TRACK)
+
+  # Free list tracking requires the codestack functionality
+  set (HDF5_ENABLE_CODESTACK ON CACHE BOOL "Enable the function stack tracing (for developer debugging)." FORCE)
+else ()
+  unset (HDF5_ENABLE_CODESTACK CACHE)
+endif ()
+
+option (HDF5_ENABLE_DEBUG_H5FS_ASSERT "Enable extra debugging of H5FS module" OFF)
+mark_as_advanced (HDF5_ENABLE_DEBUG_H5FS_ASSERT)
+if (HDF5_ENABLE_DEBUG_H5FS_ASSERT)
+  list (APPEND HDF5_DEBUG_APIS H5FS_DEBUG_ASSERT)
+endif ()
+
+# If HDF5 free list debugging wasn't specifically enabled, disable
+# free lists entirely for developer build modes, as they can
+# make certain types of issues (like references to stale pointers)
+# much more difficult to debug
+if (NOT HDF5_ENABLE_DEBUG_H5FL AND NOT HDF5_ENABLE_DEBUG_H5FL_TRACK)
+  list (APPEND HDF5_DEVELOPER_DEFS H5_NO_FREE_LISTS)
+endif ()
+
+# Enable strict checking of the file format
+list (APPEND HDF5_DEVELOPER_DEFS H5_STRICT_FORMAT_CHECKS)
diff --git a/config/cmake/HDF5Macros.cmake b/config/cmake/HDF5Macros.cmake
index ee9ed84..54543e0 100644
--- a/config/cmake/HDF5Macros.cmake
+++ b/config/cmake/HDF5Macros.cmake
@@ -1,19 +1,39 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
 #-------------------------------------------------------------------------------
-macro (H5_SET_LIB_OPTIONS libtarget libname libtype)
+macro (H5_SET_LIB_OPTIONS libtarget libname libtype libpackage)
   set (LIB_OUT_NAME "${libname}")
+  # SOVERSION passed in ARGN when shared
   if (${libtype} MATCHES "SHARED")
+    set (PACKAGE_SOVERSION ${HDF5_${libpackage}_PACKAGE_SOVERSION})
+    set (PACKAGE_COMPATIBILITY ${H5_${libpackage}_SOVERS_INTERFACE}.0.0)
+    set (PACKAGE_CURRENT ${H5_${libpackage}_SOVERS_INTERFACE}.${H5_${libpackage}_SOVERS_MINOR}.0)
     if (WIN32)
       set (LIBHDF_VERSION ${HDF5_PACKAGE_VERSION_MAJOR})
-    else (WIN32)
-      set (LIBHDF_VERSION ${HDF5_PACKAGE_VERSION})
-    endif (WIN32)
-    set_target_properties (${libtarget} PROPERTIES VERSION ${LIBHDF_VERSION})
+    else ()
+      set (LIBHDF_VERSION ${HDF5_${libpackage}_PACKAGE_SOVERSION_MAJOR})
+    endif ()
+    set_target_properties (${libtarget} PROPERTIES VERSION ${PACKAGE_SOVERSION})
     if (WIN32)
-        set (${LIB_OUT_NAME} "${LIB_OUT_NAME}-${HDF5_PACKAGE_SOVERSION}")
-    else (WIN32)
-        set_target_properties (${libtarget} PROPERTIES SOVERSION ${HDF5_PACKAGE_SOVERSION})
-    endif (WIN32)
-  endif (${libtype} MATCHES "SHARED")
+        set (${LIB_OUT_NAME} "${LIB_OUT_NAME}-${LIBHDF_VERSION}")
+    else ()
+        set_target_properties (${libtarget} PROPERTIES SOVERSION ${LIBHDF_VERSION})
+    endif ()
+    if (CMAKE_C_OSX_CURRENT_VERSION_FLAG)
+      set_property(TARGET ${libtarget} APPEND PROPERTY
+          LINK_FLAGS "${CMAKE_C_OSX_CURRENT_VERSION_FLAG}${PACKAGE_CURRENT} ${CMAKE_C_OSX_COMPATIBILITY_VERSION_FLAG}${PACKAGE_COMPATIBILITY}"
+      )
+    endif ()
+  endif ()
   HDF_SET_LIB_OPTIONS (${libtarget} ${LIB_OUT_NAME} ${libtype})
 
   #-- Apple Specific install_name for libraries
@@ -21,11 +41,66 @@ macro (H5_SET_LIB_OPTIONS libtarget libname libtype)
     option (HDF5_BUILD_WITH_INSTALL_NAME "Build with library install_name set to the installation path" OFF)
     if (HDF5_BUILD_WITH_INSTALL_NAME)
       set_target_properties (${libtarget} PROPERTIES
-          LINK_FLAGS "-current_version ${HDF5_PACKAGE_VERSION} -compatibility_version ${HDF5_PACKAGE_VERSION}"
           INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib"
           BUILD_WITH_INSTALL_RPATH ${HDF5_BUILD_WITH_INSTALL_NAME}
       )
-    endif (HDF5_BUILD_WITH_INSTALL_NAME)
-  endif (APPLE)
+    endif ()
+    if (HDF5_BUILD_FRAMEWORKS)
+      if (${libtype} MATCHES "SHARED")
+        # adapt target to build frameworks instead of dylibs
+        set_target_properties(${libtarget} PROPERTIES
+            XCODE_ATTRIBUTE_INSTALL_PATH "@rpath"
+            FRAMEWORK TRUE
+            FRAMEWORK_VERSION ${HDF5_PACKAGE_VERSION_MAJOR}
+            MACOSX_FRAMEWORK_IDENTIFIER org.hdfgroup.${libtarget}
+            MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${HDF5_PACKAGE_VERSION_MAJOR}
+            MACOSX_FRAMEWORK_BUNDLE_VERSION ${HDF5_PACKAGE_VERSION_MAJOR})
+      endif ()
+    endif ()
+  endif ()
+endmacro ()
+
+# Initialize the list of VFDs to be used for testing and create a test folder for each VFD
+macro (H5_SET_VFD_LIST)
+  set (VFD_LIST
+      sec2
+      stdio
+      core
+      core_paged
+      split
+      multi
+      family
+      splitter
+      #log - log VFD currently has file space allocation bugs
+  )
+
+  if (H5_HAVE_DIRECT)
+    list (APPEND VFD_LIST direct)
+  endif ()
+  if (H5_HAVE_PARALLEL)
+    # MPI I/O VFD is currently incompatible with too many tests in the VFD test set
+    # list (APPEND VFD_LIST mpio)
+  endif ()
+  if (H5_HAVE_MIRROR_VFD)
+    list (APPEND VFD_LIST mirror)
+  endif ()
+  if (H5_HAVE_ROS3_VFD)
+    list (APPEND VFD_LIST ros3)
+  endif ()
+  if (H5_HAVE_LIBHDFS)
+    list (APPEND VFD_LIST hdfs)
+  endif ()
+  if (H5_HAVE_SUBFILING_VFD)
+    list (APPEND VFD_LIST subfiling)
+  endif ()
+  if (H5_HAVE_WINDOWS)
+    list (APPEND VFD_LIST windows)
+  endif ()
+endmacro ()
 
-endmacro (H5_SET_LIB_OPTIONS)
+# Initialize the list of VFDs to be used for testing and create a test folder for each VFD
+macro (H5_CREATE_VFD_DIR)
+  foreach (vfdtest ${VFD_LIST})
+    file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/${vfdtest}")
+  endforeach ()
+endmacro ()
diff --git a/config/cmake/HDF5PluginCache.cmake b/config/cmake/HDF5PluginCache.cmake
new file mode 100644
index 0000000..e676919
--- /dev/null
+++ b/config/cmake/HDF5PluginCache.cmake
@@ -0,0 +1,31 @@
+# CMake cache file for external HDF5 filter plugins
+
+#########################
+# EXTERNAL cache entries
+#########################
+
+# examples are the tests for plugins
+set (H5PL_BUILD_TESTING ON CACHE BOOL "Enable H5PL testing" FORCE)
+set (BUILD_EXAMPLES ON CACHE BOOL "Build H5PL Examples" FORCE)
+
+set (HDF5_HDF5_HEADER "H5pubconf.h" CACHE STRING "Name of HDF5 header" FORCE)
+set (HDF5_LINK_LIBS ${HDF5_LIBSH_TARGET} CACHE STRING "HDF5 target" FORCE)
+#set (HDF5_INCLUDE_DIR $<TARGET_PROPERTY:${HDF5_LIBSH_TARGET},INCLUDE_DIRECTORIES> CACHE PATH "HDF5 include dirs" FORCE)
+set (HDF5_INCLUDE_DIR "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR}" CACHE PATH "HDF5 include dirs" FORCE)
+set (HDF5_INCLUDE_DIRS "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR}" CACHE PATH "HDF5 include dirs" FORCE)
+set (HDF5_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE STRING "HDF5 build folder" FORCE)
+
+set (HDF5_DUMP_EXECUTABLE $<TARGET_FILE:h5dump-shared> CACHE STRING "HDF5 h5dump target" FORCE)
+set (HDF5_REPACK_EXECUTABLE $<TARGET_FILE:h5repack-shared> CACHE STRING "HDF5 h5repack target" FORCE)
+
+set (H5PL_ALLOW_EXTERNAL_SUPPORT "${HDF5_ALLOW_EXTERNAL_SUPPORT}" CACHE STRING "Allow External Library Building (NO GIT TGZ)" FORCE)
+
+set (H5PL_GIT_URL "https://github.com/HDFGroup/hdf5_plugins.git" CACHE STRING "Use plugins from HDF Group repository" FORCE)
+set (H5PL_GIT_BRANCH "master" CACHE STRING "" FORCE)
+
+set (H5PL_TGZ_NAME "${PLUGIN_TGZ_NAME}" CACHE STRING "Use plugins from compressed file" FORCE)
+
+set (PL_PACKAGE_NAME "${PLUGIN_PACKAGE_NAME}" CACHE STRING "Name of plugins package" FORCE)
+set (H5PL_CPACK_ENABLE OFF CACHE BOOL "Enable CPack include and components" FORCE)
+
+set (H5PL_USE_GNU_DIRS ${HDF5_USE_GNU_DIRS} CACHE BOOL "TRUE to use GNU Coding Standard install directory variables" FORCE)
diff --git a/config/cmake/HDF5PluginMacros.cmake b/config/cmake/HDF5PluginMacros.cmake
new file mode 100644
index 0000000..a180d5d
--- /dev/null
+++ b/config/cmake/HDF5PluginMacros.cmake
@@ -0,0 +1,109 @@
+#-------------------------------------------------------------------------------
+# Plugins must be built SHARED
+#-------------------------------------------------------------------------------
+macro (EXTERNAL_PLUGIN_LIBRARY compress_type)
+  if (${compress_type} MATCHES "GIT")
+    FetchContent_Declare (PLUGIN
+        GIT_REPOSITORY ${PLUGIN_URL}
+        GIT_TAG ${PLUGIN_BRANCH}
+    )
+  elseif (${compress_type} MATCHES "TGZ")
+    FetchContent_Declare (PLUGIN
+        URL ${PLUGIN_URL}
+        URL_HASH ""
+    )
+  endif ()
+  FetchContent_GetProperties(PLUGIN)
+  message (VERBOSE "HDF5_INCLUDE_DIR=${HDF5_INCLUDE_DIR}")
+  if(NOT PLUGIN_POPULATED)
+    FetchContent_Populate(PLUGIN)
+    include (${HDF_RESOURCES_DIR}/HDF5PluginCache.cmake)
+    set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
+    add_subdirectory(${plugin_SOURCE_DIR} ${plugin_BINARY_DIR})
+    if (ENABLE_BLOSC)
+      add_dependencies (h5blosc ${HDF5_LIBSH_TARGET})
+      add_dependencies (h5ex_d_blosc ${HDF5_LIBSH_TARGET})
+      target_include_directories (h5ex_d_blosc PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR}")
+    endif ()
+    if (ENABLE_BSHUF)
+      add_dependencies (h5bshuf ${HDF5_LIBSH_TARGET})
+      add_dependencies (h5ex_d_bshuf ${HDF5_LIBSH_TARGET})
+      target_include_directories (h5ex_d_bshuf PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR}")
+    endif ()
+    if (ENABLE_BZIP2)
+      add_dependencies (h5bz2 ${HDF5_LIBSH_TARGET})
+      add_dependencies (h5ex_d_bzip2 ${HDF5_LIBSH_TARGET})
+      target_include_directories (h5ex_d_bzip2 PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR}")
+    endif ()
+    if (ENABLE_JPEG)
+      add_dependencies (h5jpeg ${HDF5_LIBSH_TARGET})
+      add_dependencies (h5ex_d_jpeg ${HDF5_LIBSH_TARGET})
+      target_include_directories (h5ex_d_jpeg PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR}")
+    endif ()
+    if (ENABLE_LZ4)
+      add_dependencies (h5lz4 ${HDF5_LIBSH_TARGET})
+      add_dependencies (h5ex_d_lz4 ${HDF5_LIBSH_TARGET})
+      target_include_directories (h5ex_d_lz4 PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR}")
+    endif ()
+    if (ENABLE_LZF)
+      add_dependencies (h5lzf ${HDF5_LIBSH_TARGET})
+      add_dependencies (h5ex_d_lzf ${HDF5_LIBSH_TARGET})
+      target_include_directories (h5ex_d_lzf PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR}")
+    endif ()
+    if (ENABLE_MAFISC)
+      add_dependencies (h5mafisc ${HDF5_LIBSH_TARGET})
+      add_dependencies (h5ex_d_mafisc ${HDF5_LIBSH_TARGET})
+      target_include_directories (h5ex_d_mafisc PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR}")
+    endif ()
+    if (ENABLE_SZ)
+      add_dependencies (h5sz ${HDF5_LIBSH_TARGET})
+      add_dependencies (h5ex_d_sz ${HDF5_LIBSH_TARGET})
+      target_include_directories (h5ex_d_sz PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR}")
+    endif ()
+    if (ENABLE_ZFP)
+      add_dependencies (h5zfp ${HDF5_LIBSH_TARGET})
+      add_dependencies (h5ex_d_zfp ${HDF5_LIBSH_TARGET})
+      target_include_directories (h5ex_d_zfp PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR}")
+    endif ()
+    if (ENABLE_ZSTD)
+      add_dependencies (h5zstd ${HDF5_LIBSH_TARGET})
+      add_dependencies (h5ex_d_zstd ${HDF5_LIBSH_TARGET})
+      target_include_directories (h5ex_d_zstd PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR}")
+    endif ()
+  endif ()
+  message (VERBOSE "HDF5_INCLUDE_DIR=${HDF5_INCLUDE_DIR}")
+  set (PLUGIN_BINARY_DIR "${plugin_BINARY_DIR}")
+  set (PLUGIN_SOURCE_DIR "${plugin_SOURCE_DIR}")
+  set (PLUGIN_LIBRARY "PLUGIN")
+  set (PLUGIN_FOUND 1)
+endmacro ()
+
+#-------------------------------------------------------------------------------
+macro (FILTER_OPTION plname)
+  string(TOLOWER ${plname} PLUGIN_NAME)
+  option (ENABLE_${plname} "Enable Library Building for ${plname} plugin" ON)
+  if (ENABLE_${plname})
+    option (HDF_${plname}_USE_EXTERNAL "Use External Library Building for ${PLUGIN_NAME} plugin" 0)
+    if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
+      set (HDF_${plname}_USE_EXTERNAL 1 CACHE BOOL "Use External Library Building for ${PLUGIN_NAME} plugin" FORCE)
+      if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT")
+        set (HDF_${plname}_URL ${HDF_${plname}_GIT_URL})
+        set (HDF_${plname}_BRANCH ${HDF_${plname}_GIT_BRANCH})
+      elseif (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
+        if (NOT TGZPATH)
+          set (TGZPATH ${H5PL_SOURCE_DIR})
+        endif ()
+        set (HDF_${plname}_URL ${TGZPATH}/${HDF_${plname}_TGZ_NAME})
+      endif ()
+    endif ()
+    add_subdirectory (${plname})
+    set_global_variable (H5PL_LIBRARIES_TO_EXPORT "${H5PL_LIBRARIES_TO_EXPORT};${H5${plname}_LIBRARIES_TO_EXPORT}")
+  endif ()
+endmacro ()
+
+#-------------------------------------------------------------------------------
+macro (PACKAGE_PLUGIN_LIBRARY compress_type)
+  if (${compress_type} MATCHES "GIT" OR ${compress_type} MATCHES "TGZ")
+    message (STATUS "Filter PLUGIN is to be packaged")
+  endif ()
+endmacro ()
diff --git a/config/cmake/HDF5UseFortran.cmake b/config/cmake/HDF5UseFortran.cmake
new file mode 100644
index 0000000..79084cb
--- /dev/null
+++ b/config/cmake/HDF5UseFortran.cmake
@@ -0,0 +1,342 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
+
+#
+# This file provides functions for HDF5 specific Fortran support.
+#
+#-------------------------------------------------------------------------------
+enable_language (Fortran)
+
+set (HDF_PREFIX "H5")
+include (CheckFortranFunctionExists)
+
+include (CheckFortranSourceRuns)
+include (CheckFortranSourceCompiles)
+
+# Read source line beginning at the line matching Input:"START" and ending at the line matching Input:"END"
+macro (READ_SOURCE SOURCE_START SOURCE_END RETURN_VAR)
+  file (READ "${HDF5_SOURCE_DIR}/m4/aclocal_fc.f90" SOURCE_MASTER)
+  string (REGEX MATCH "${SOURCE_START}[\\\t\\\n\\\r[].+]*${SOURCE_END}" SOURCE_CODE ${SOURCE_MASTER})
+  set (RETURN_VAR "${SOURCE_CODE}")
+endmacro ()
+
+set (RUN_OUTPUT_PATH_DEFAULT ${CMAKE_BINARY_DIR})
+# The provided CMake Fortran macros don't provide a general compile/run function
+# so this one is used.
+#-----------------------------------------------------------------------------
+macro (FORTRAN_RUN FUNCTION_NAME SOURCE_CODE RUN_RESULT_VAR1 COMPILE_RESULT_VAR1 RETURN_VAR RETURN_OUTPUT_VAR)
+    message (VERBOSE "Detecting Fortran ${FUNCTION_NAME}")
+    file (WRITE
+        ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testFortranCompiler1.f90
+        "${SOURCE_CODE}"
+    )
+    TRY_RUN (RUN_RESULT_VAR COMPILE_RESULT_VAR
+        ${CMAKE_BINARY_DIR}
+        ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testFortranCompiler1.f90
+        LINK_LIBRARIES "${HDF5_REQUIRED_LIBRARIES}"
+        RUN_OUTPUT_VARIABLE OUTPUT_VAR
+    )
+    set (${RETURN_OUTPUT_VAR} ${OUTPUT_VAR})
+
+    if (${COMPILE_RESULT_VAR})
+      set(${RETURN_VAR} ${RUN_RESULT_VAR})
+      if (${RUN_RESULT_VAR} MATCHES 0)
+        message (VERBOSE "Testing Fortran ${FUNCTION_NAME} - OK")
+        file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
+            "Determining if the Fortran ${FUNCTION_NAME} exists passed\n"
+        )
+      else ()
+        message (VERBOSE "Testing Fortran ${FUNCTION_NAME} - Fail")
+        file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
+            "Determining if the Fortran ${FUNCTION_NAME} exists failed: ${RUN_RESULT_VAR}\n"
+        )
+      endif ()
+    else ()
+        message (VERBOSE "Compiling Fortran ${FUNCTION_NAME} - Fail")
+        file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
+            "Determining if the Fortran ${FUNCTION_NAME} compiles failed: ${COMPILE_RESULT_VAR}\n"
+        )
+        set(${RETURN_VAR} ${COMPILE_RESULT_VAR})
+    endif ()
+endmacro ()
+#-----------------------------------------------------------------------------
+#  Check to see C_LONG_DOUBLE is available
+
+READ_SOURCE("PROGRAM PROG_FC_HAVE_C_LONG_DOUBLE" "END PROGRAM PROG_FC_HAVE_C_LONG_DOUBLE" SOURCE_CODE)
+check_fortran_source_compiles (${SOURCE_CODE} FORTRAN_HAVE_C_LONG_DOUBLE SRC_EXT f90)
+
+if (${FORTRAN_HAVE_C_LONG_DOUBLE})
+  set (${HDF_PREFIX}_FORTRAN_HAVE_C_LONG_DOUBLE 1)
+else ()
+  set (${HDF_PREFIX}_FORTRAN_HAVE_C_LONG_DOUBLE 0)
+endif ()
+
+# Check to see C_LONG_DOUBLE is different from C_DOUBLE
+
+READ_SOURCE("MODULE type_mod" "END PROGRAM PROG_FC_C_LONG_DOUBLE_EQ_C_DOUBLE" SOURCE_CODE)
+check_fortran_source_compiles (${SOURCE_CODE} FORTRAN_C_LONG_DOUBLE_IS_UNIQUE SRC_EXT f90)
+if (${FORTRAN_C_LONG_DOUBLE_IS_UNIQUE})
+  set (${HDF_PREFIX}_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE 1)
+else ()
+  set (${HDF_PREFIX}_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE 0)
+endif ()
+
+## Set the sizeof function for use later in the fortran tests
+if (${HDF_PREFIX}_FORTRAN_HAVE_STORAGE_SIZE)
+  set (FC_SIZEOF_A "STORAGE_SIZE(a, c_size_t)/STORAGE_SIZE(c_char_'a',c_size_t)")
+  set (FC_SIZEOF_B "STORAGE_SIZE(b, c_size_t)/STORAGE_SIZE(c_char_'a',c_size_t)")
+  set (FC_SIZEOF_C "STORAGE_SIZE(c, c_size_t)/STORAGE_SIZE(c_char_'a',c_size_t)")
+elseif (${HDF_PREFIX}_FORTRAN_HAVE_C_SIZEOF)
+  set (FC_SIZEOF_A "SIZEOF(a)")
+  set (FC_SIZEOF_B "SIZEOF(b)")
+  set (FC_SIZEOF_C "SIZEOF(c)")
+else ()
+  message (FATAL_ERROR "Fortran compiler requires either intrinsic functions SIZEOF or STORAGE_SIZE")
+endif ()
+
+#-----------------------------------------------------------------------------
+# Determine the available KINDs for REALs and INTEGERs
+#-----------------------------------------------------------------------------
+
+READ_SOURCE ("PROGRAM FC_AVAIL_KINDS" "END PROGRAM FC_AVAIL_KINDS" SOURCE_CODE)
+FORTRAN_RUN ("REAL and INTEGER KINDs"
+    "${SOURCE_CODE}"
+    XX
+    YY
+    FC_AVAIL_KINDS_RESULT
+    PROG_OUTPUT
+)
+# dnl The output from the above program will be:
+# dnl    -- LINE 1 --  valid integer kinds (comma separated list)
+# dnl    -- LINE 2 --  valid real kinds (comma separated list)
+# dnl    -- LINE 3 --  max decimal precision for reals
+# dnl    -- LINE 4 --  number of valid integer kinds
+# dnl    -- LINE 5 --  number of valid real kinds
+#
+# Convert the string to a list of strings by replacing the carriage return with a semicolon
+string (REGEX REPLACE "[\r\n]+" ";" PROG_OUTPUT "${PROG_OUTPUT}")
+
+list (GET PROG_OUTPUT 0 pac_validIntKinds)
+list (GET PROG_OUTPUT 1 pac_validRealKinds)
+list (GET PROG_OUTPUT 2 ${HDF_PREFIX}_PAC_FC_MAX_REAL_PRECISION)
+
+# If the lists are empty then something went wrong.
+if (NOT pac_validIntKinds)
+    message (FATAL_ERROR "Failed to find available INTEGER KINDs for Fortran")
+endif ()
+if (NOT pac_validRealKinds)
+    message (FATAL_ERROR "Failed to find available REAL KINDs for Fortran")
+endif ()
+if (NOT ${HDF_PREFIX}_PAC_FC_MAX_REAL_PRECISION)
+    message (FATAL_ERROR "No output from Fortran decimal precision program")
+endif ()
+
+set (PAC_FC_ALL_INTEGER_KINDS "\{${pac_validIntKinds}\}")
+set (PAC_FC_ALL_REAL_KINDS "\{${pac_validRealKinds}\}")
+
+list (GET PROG_OUTPUT 3 NUM_IKIND)
+list (GET PROG_OUTPUT 4 NUM_RKIND)
+
+set (PAC_FORTRAN_NUM_INTEGER_KINDS "${NUM_IKIND}")
+
+set (${HDF_PREFIX}_H5CONFIG_F_NUM_IKIND "INTEGER, PARAMETER :: num_ikinds = ${NUM_IKIND}")
+set (${HDF_PREFIX}_H5CONFIG_F_IKIND "INTEGER, DIMENSION(1:num_ikinds) :: ikind = (/${pac_validIntKinds}/)")
+
+message (STATUS "....NUMBER OF INTEGER KINDS FOUND ${PAC_FORTRAN_NUM_INTEGER_KINDS}")
+message (STATUS "....REAL KINDS FOUND ${PAC_FC_ALL_REAL_KINDS}")
+message (STATUS "....INTEGER KINDS FOUND ${PAC_FC_ALL_INTEGER_KINDS}")
+message (STATUS "....MAX DECIMAL PRECISION ${${HDF_PREFIX}_PAC_FC_MAX_REAL_PRECISION}")
+
+#-----------------------------------------------------------------------------
+# Determine the available KINDs for REALs and INTEGERs
+#-----------------------------------------------------------------------------
+# **********
+# INTEGERS
+# **********
+string (REGEX REPLACE "," ";" VAR "${pac_validIntKinds}")
+
+foreach (KIND ${VAR})
+  set (PROG_SRC_${KIND}
+  "
+       PROGRAM main
+          USE ISO_C_BINDING
+          USE, INTRINSIC :: ISO_FORTRAN_ENV, ONLY : stderr=>ERROR_UNIT
+          IMPLICIT NONE
+          INTEGER (KIND=${KIND}) a
+          WRITE(stderr,'(I0)') ${FC_SIZEOF_A}
+       END
+   "
+  )
+  FORTRAN_RUN("INTEGER KIND SIZEOF" ${PROG_SRC_${KIND}} XX YY VALIDINTKINDS_RESULT_${KIND} PROG_OUTPUT1)
+  string (REGEX REPLACE "[\r\n]+" "" PROG_OUTPUT1 "${PROG_OUTPUT1}")
+  set (pack_int_sizeof "${pack_int_sizeof} ${PROG_OUTPUT1},")
+endforeach ()
+
+if (pack_int_sizeof STREQUAL "")
+   message (FATAL_ERROR "Failed to find available INTEGER KINDs for Fortran")
+endif ()
+
+string (STRIP ${pack_int_sizeof} pack_int_sizeof)
+
+#Remove trailing comma
+string (REGEX REPLACE ",$" "" pack_int_sizeof "${pack_int_sizeof}")
+#Remove spaces
+string (REGEX REPLACE " " "" pack_int_sizeof "${pack_int_sizeof}")
+
+set (PAC_FC_ALL_INTEGER_KINDS_SIZEOF "\{${pack_int_sizeof}\}")
+
+message (VERBOSE "....FOUND SIZEOF for INTEGER KINDs ${PAC_FC_ALL_INTEGER_KINDS_SIZEOF}")
+# **********
+# REALS
+# **********
+string (REGEX REPLACE "," ";" VAR "${pac_validRealKinds}")
+
+#find the maximum kind of the real
+list (LENGTH VAR LEN_VAR)
+math (EXPR _LEN "${LEN_VAR}-1")
+list (GET VAR ${_LEN} max_real_fortran_kind)
+
+foreach (KIND ${VAR} )
+  set (PROG_SRC2_${KIND}
+  "
+       PROGRAM main
+          USE ISO_C_BINDING
+          USE, INTRINSIC :: ISO_FORTRAN_ENV, ONLY : stderr=>ERROR_UNIT
+          IMPLICIT NONE
+          REAL (KIND=${KIND}) a
+          WRITE(stderr,'(I0)') ${FC_SIZEOF_A}
+       END
+  "
+  )
+  FORTRAN_RUN ("REAL KIND SIZEOF" ${PROG_SRC2_${KIND}} XX YY VALIDREALKINDS_RESULT_${KIND} PROG_OUTPUT2)
+  string (REGEX REPLACE "[\r\n]+" "" PROG_OUTPUT2 "${PROG_OUTPUT2}")
+  set (pack_real_sizeof "${pack_real_sizeof} ${PROG_OUTPUT2},")
+endforeach ()
+
+if (pack_real_sizeof STREQUAL "")
+   message (FATAL_ERROR "Failed to find available REAL KINDs for Fortran")
+endif ()
+
+string(STRIP ${pack_real_sizeof} pack_real_sizeof)
+
+#Remove trailing comma
+string (REGEX REPLACE ",$" "" pack_real_sizeof "${pack_real_sizeof}")
+#Remove spaces
+string (REGEX REPLACE " " "" pack_real_sizeof "${pack_real_sizeof}")
+
+set (${HDF_PREFIX}_H5CONFIG_F_RKIND_SIZEOF "INTEGER, DIMENSION(1:num_rkinds) :: rkind_sizeof = (/${pack_real_sizeof}/)")
+
+message (STATUS "....FOUND SIZEOF for REAL KINDs \{${pack_real_sizeof}\}")
+
+set (PAC_FC_ALL_REAL_KINDS_SIZEOF "\{${pack_real_sizeof}\}")
+
+#find the maximum kind of the real
+string (REGEX REPLACE "," ";" VAR "${pack_real_sizeof}")
+list (LENGTH VAR LEN_VAR)
+math (EXPR _LEN "${LEN_VAR}-1")
+list (GET VAR ${_LEN} max_real_fortran_sizeof)
+
+#-----------------------------------------------------------------------------
+# Find sizeof of native kinds
+#-----------------------------------------------------------------------------
+set (PROG_SRC3
+  "
+       PROGRAM main
+          USE ISO_C_BINDING
+          USE, INTRINSIC :: ISO_FORTRAN_ENV, ONLY : stderr=>ERROR_UNIT
+          IMPLICIT NONE
+          INTEGER a
+          REAL b
+          DOUBLE PRECISION c
+          WRITE(stderr,*) ${FC_SIZEOF_A}
+          WRITE(stderr,*) kind(a)
+          WRITE(stderr,*) ${FC_SIZEOF_B}
+          WRITE(stderr,*) kind(b)
+          WRITE(stderr,*) ${FC_SIZEOF_C}
+          WRITE(stderr,*) kind(c)
+       END
+  "
+)
+FORTRAN_RUN ("SIZEOF NATIVE KINDs" ${PROG_SRC3} XX YY PAC_SIZEOF_NATIVE_KINDS_RESULT PROG_OUTPUT3)
+# dnl The output from the above program will be:
+# dnl    -- LINE 1 --  sizeof INTEGER
+# dnl    -- LINE 2 --  kind of INTEGER
+# dnl    -- LINE 3 --  sizeof REAL
+# dnl    -- LINE 4 --  kind of REAL
+# dnl    -- LINE 5 --  sizeof DOUBLE PRECISION
+# dnl    -- LINE 6 --  kind of DOUBLE PRECISION
+#
+# Convert the string to a list of strings by replacing the carriage return with a semicolon
+string (REGEX REPLACE "[\r\n]+" ";" PROG_OUTPUT3 "${PROG_OUTPUT3}")
+
+list (GET PROG_OUTPUT3 0 PAC_FORTRAN_NATIVE_INTEGER_SIZEOF)
+list (GET PROG_OUTPUT3 1 PAC_FORTRAN_NATIVE_INTEGER_KIND)
+list (GET PROG_OUTPUT3 2 PAC_FORTRAN_NATIVE_REAL_SIZEOF)
+list (GET PROG_OUTPUT3 3 PAC_FORTRAN_NATIVE_REAL_KIND)
+list (GET PROG_OUTPUT3 4 PAC_FORTRAN_NATIVE_DOUBLE_SIZEOF)
+list (GET PROG_OUTPUT3 5 PAC_FORTRAN_NATIVE_DOUBLE_KIND)
+
+if (NOT PAC_FORTRAN_NATIVE_INTEGER_SIZEOF)
+   message (FATAL_ERROR "Failed to find SIZEOF NATIVE INTEGER KINDs for Fortran")
+endif ()
+if (NOT PAC_FORTRAN_NATIVE_REAL_SIZEOF)
+   message (FATAL_ERROR "Failed to find SIZEOF NATIVE REAL KINDs for Fortran")
+endif ()
+if (NOT PAC_FORTRAN_NATIVE_DOUBLE_SIZEOF)
+   message (FATAL_ERROR "Failed to find SIZEOF NATIVE DOUBLE KINDs for Fortran")
+endif ()
+if (NOT PAC_FORTRAN_NATIVE_INTEGER_KIND)
+   message (FATAL_ERROR "Failed to find KIND of NATIVE INTEGER for Fortran")
+endif ()
+if (NOT PAC_FORTRAN_NATIVE_REAL_KIND)
+   message (FATAL_ERROR "Failed to find KIND of NATIVE REAL for Fortran")
+endif ()
+if (NOT PAC_FORTRAN_NATIVE_DOUBLE_KIND)
+   message (FATAL_ERROR "Failed to find KIND of NATIVE DOUBLE for Fortran")
+endif ()
+
+
+set (${HDF_PREFIX}_FORTRAN_SIZEOF_LONG_DOUBLE ${${HDF_PREFIX}_SIZEOF_LONG_DOUBLE})
+
+# remove the invalid kind from the list
+if (NOT(${${HDF_PREFIX}_SIZEOF___FLOAT128} EQUAL 0))
+   if (NOT(${${HDF_PREFIX}_SIZEOF___FLOAT128} EQUAL ${max_real_fortran_sizeof})
+       AND NOT(${${HDF_PREFIX}_FORTRAN_SIZEOF_LONG_DOUBLE} EQUAL ${max_real_fortran_sizeof})
+       # account for the fact that the C compiler can have 16-byte __float128 and the fortran compiler only has 8-byte doubles,
+       # so we don't want to remove the 8-byte fortran doubles.
+       AND NOT(${PAC_FORTRAN_NATIVE_DOUBLE_SIZEOF} EQUAL ${max_real_fortran_sizeof}))
+     message (WARNING "
+          Fortran REAL(KIND=${max_real_fortran_kind}) is $max_real_fortran_sizeof Bytes, but no corresponding C float type exists of that size
+                                           !!! Fortran interfaces will not be generated for REAL(KIND=${max_real_fortran_kind}) !!!")
+     string (REGEX REPLACE ",[0-9]+}" "}" PAC_FC_ALL_REAL_KINDS ${PAC_FC_ALL_REAL_KINDS})
+     string (REGEX REPLACE ",[0-9]+}" "}" PAC_FC_ALL_REAL_KINDS_SIZEOF ${PAC_FC_ALL_REAL_KINDS_SIZEOF})
+     math (EXPR NUM_RKIND "${NUM_RKIND} - 1")
+   endif ()
+endif ()
+
+set (${HDF_PREFIX}_H5CONFIG_F_NUM_RKIND "INTEGER, PARAMETER :: num_rkinds = ${NUM_RKIND}")
+
+string (REGEX REPLACE "{" "" OUT_VAR1 ${PAC_FC_ALL_REAL_KINDS})
+string (REGEX REPLACE "}" "" OUT_VAR1 ${OUT_VAR1})
+set (${HDF_PREFIX}_H5CONFIG_F_RKIND "INTEGER, DIMENSION(1:num_rkinds) :: rkind = (/${OUT_VAR1}/)")
+
+string (REGEX REPLACE "{" "" OUT_VAR2 ${PAC_FC_ALL_REAL_KINDS_SIZEOF})
+string (REGEX REPLACE "}" "" OUT_VAR2 ${OUT_VAR2})
+set (${HDF_PREFIX}_H5CONFIG_F_RKIND_SIZEOF "INTEGER, DIMENSION(1:num_rkinds) :: rkind_sizeof = (/${OUT_VAR2}/)")
+
+# Setting definition if there is a 16 byte fortran integer
+string (FIND ${PAC_FC_ALL_INTEGER_KINDS_SIZEOF} "16" pos)
+if (${pos} EQUAL -1)
+  set (${HDF_PREFIX}_HAVE_Fortran_INTEGER_SIZEOF_16 0)
+else ()
+  set (${HDF_PREFIX}_HAVE_Fortran_INTEGER_SIZEOF_16 1)
+endif ()
diff --git a/config/cmake/HDF5_Examples.cmake.in b/config/cmake/HDF5_Examples.cmake.in
new file mode 100644
index 0000000..d2661a7
--- /dev/null
+++ b/config/cmake/HDF5_Examples.cmake.in
@@ -0,0 +1,114 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
+cmake_minimum_required (VERSION 3.18)
+###############################################################################################################
+# This script will build and run the examples from a folder
+# Execute from a command line:
+#     ctest -S HDF5_Examples.cmake,OPTION=VALUE -C Release -VV -O test.log
+###############################################################################################################
+
+set(CTEST_CMAKE_GENERATOR "@CMAKE_GENERATOR@")
+if("@CMAKE_GENERATOR_TOOLSET@")
+  set(CMAKE_GENERATOR_TOOLSET "@CMAKE_GENERATOR_TOOLSET@")
+endif()
+if("@CMAKE_GENERATOR_ARCHITECTURE@")
+  set(CMAKE_GENERATOR_ARCHITECTURE "@CMAKE_GENERATOR_ARCHITECTURE@")
+endif()
+set(CTEST_DASHBOARD_ROOT ${CTEST_SCRIPT_DIRECTORY})
+
+# handle input parameters to script.
+#INSTALLDIR - HDF5 root folder
+#CTEST_CONFIGURATION_TYPE - Release, Debug, RelWithDebInfo
+#CTEST_SOURCE_NAME - name of source folder; HDF5Examples
+if(DEFINED CTEST_SCRIPT_ARG)
+  # transform ctest script arguments of the form
+  # script.ctest,var1=value1,var2=value2
+  # to variables with the respective names set to the respective values
+  string(REPLACE "," ";" script_args "${CTEST_SCRIPT_ARG}")
+  foreach(current_var ${script_args})
+    if("${current_var}" MATCHES "^([^=]+)=(.+)$")
+      set("${CMAKE_MATCH_1}" "${CMAKE_MATCH_2}")
+    endif()
+  endforeach()
+endif()
+
+###################################################################
+### Following Line is one of [Release, RelWithDebInfo, Debug] #####
+set(CTEST_CONFIGURATION_TYPE "$ENV{CMAKE_CONFIG_TYPE}")
+if(NOT DEFINED CTEST_CONFIGURATION_TYPE)
+  set(CTEST_CONFIGURATION_TYPE "Release")
+endif()
+set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCTEST_CONFIGURATION_TYPE:STRING=${CTEST_CONFIGURATION_TYPE}")
+##################################################################
+
+if(NOT DEFINED INSTALLDIR)
+  if(WIN32)
+    set(INSTALLDIR "%ProgramFiles%/HDF_Group/@HDF5_PACKAGE_NAME@/@HDF5_PACKAGE_VERSION@")
+  else()
+    set(INSTALLDIR "@CMAKE_INSTALL_PREFIX@")
+  endif()
+endif()
+
+if(NOT DEFINED CTEST_SOURCE_NAME)
+  set(CTEST_SOURCE_NAME "HDF5Examples")
+endif()
+
+if(NOT DEFINED HDF_LOCAL)
+  set(CDASH_LOCAL "NO")
+else()
+  set(CDASH_LOCAL "YES")
+endif()
+if(NOT DEFINED CTEST_SITE)
+  set(CTEST_SITE "local")
+endif()
+if(NOT DEFINED CTEST_BUILD_NAME)
+  set(CTEST_BUILD_NAME "examples")
+endif()
+set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILDNAME:STRING=${CTEST_BUILD_NAME}")
+
+#TAR_SOURCE - name of tarfile
+#if(NOT DEFINED TAR_SOURCE)
+#  set(CTEST_USE_TAR_SOURCE "HDF5Examples-2.0.1-Source")
+#endif()
+
+###############################################################################################################
+set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ROOT:PATH=${INSTALLDIR}")
+if(WIN32)
+  set(SITE_OS_NAME "Windows")
+  set(CTEST_BINARY_NAME ${CTEST_SOURCE_NAME}\\build)
+  set(CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_SOURCE_NAME}")
+  set(CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_BINARY_NAME}")
+else()
+  set(ENV{LD_LIBRARY_PATH} "${INSTALLDIR}/lib")
+  set(CTEST_BINARY_NAME ${CTEST_SOURCE_NAME}/build)
+  set(CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_SOURCE_NAME}")
+  set(CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_BINARY_NAME}")
+endif()
+### default HDF5_PLUGIN_PATH to where the filter libraries are located
+set(ENV{HDF5_PLUGIN_PATH} "${INSTALLDIR}/lib/plugin")
+if(${CDASH_LOCAL})
+  set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCDASH_LOCAL:BOOL=ON")
+endif()
+set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACKAGE_NAME:STRING=@HDF5_PACKAGE@@HDF_PACKAGE_EXT@")
+
+###############################################################################################################
+# For any comments please contact cdashhelp@hdfgroup.org
+#
+###############################################################################################################
+
+if(WIN32)
+  include(${CTEST_SCRIPT_DIRECTORY}\\HDF5_Examples_options.cmake)
+  include(${CTEST_SCRIPT_DIRECTORY}\\CTestScript.cmake)
+else()
+  include(${CTEST_SCRIPT_DIRECTORY}/HDF5_Examples_options.cmake)
+  include(${CTEST_SCRIPT_DIRECTORY}/CTestScript.cmake)
+endif()
diff --git a/config/cmake/HDF5_Examples_options.cmake b/config/cmake/HDF5_Examples_options.cmake
new file mode 100644
index 0000000..cdd49eb
--- /dev/null
+++ b/config/cmake/HDF5_Examples_options.cmake
@@ -0,0 +1,68 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
+#############################################################################################
+####  Change default configuration of options in config/cmake/cacheinit.cmake file        ###
+####  format: set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DXXX:YY=ZZZZ")                 ###
+####  DEFAULT:                                                                            ###
+####         BUILD_SHARED_LIBS:BOOL=OFF                                                   ###
+####         HDF_BUILD_C:BOOL=ON                                                          ###
+####         HDF_BUILD_CXX:BOOL=OFF                                                       ###
+####         HDF_BUILD_FORTRAN:BOOL=OFF                                                   ###
+####         HDF_BUILD_JAVA:BOOL=OFF                                                      ###
+####         HDF_BUILD_FILTERS:BOOL=OFF                                                   ###
+####         BUILD_TESTING:BOOL=OFF                                                       ###
+####         HDF_ENABLE_PARALLEL:BOOL=OFF                                                 ###
+####         HDF_ENABLE_THREADSAFE:BOOL=OFF                                               ###
+#############################################################################################
+
+### uncomment/comment and change the following lines for other configuration options
+### build with shared libraries
+#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DBUILD_SHARED_LIBS:BOOL=ON")
+
+#############################################################################################
+####      languages       ####
+### disable C builds
+#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF_BUILD_C:BOOL=OFF")
+
+### enable C++ builds
+#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF_BUILD_CXX:BOOL=ON")
+
+### enable Fortran builds
+#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF_BUILD_FORTRAN:BOOL=ON")
+
+### enable JAVA builds
+#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF_BUILD_JAVA:BOOL=ON")
+
+#############################################################################################
+### enable FILTERS builds
+#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF_BUILD_FILTERS:BOOL=ON")
+### default HDF5_PLUGIN_PATH to where the filter libraries are located
+#set(ENV{HDF5_PLUGIN_PATH} "${INSTALLDIR}/lib/plugin")
+
+#############################################################################################
+### enable parallel program builds
+#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF_ENABLE_PARALLEL:BOOL=ON")
+
+#############################################################################################
+### match the hdf5 library namespace
+set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_NAMESPACE:STRING=hdf5::")
+
+#############################################################################################
+### enable threadsafe program builds
+#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF_ENABLE_THREADSAFE:BOOL=ON")
+
+#############################################################################################
+### enable test program builds, requires reference files in testfiles subdirectory
+#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DBUILD_TESTING:BOOL=ON")
+#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCOMPARE_TESTING:BOOL=ON")
+
+#############################################################################################
diff --git a/config/cmake/HDFCXXCompilerFlags.cmake b/config/cmake/HDFCXXCompilerFlags.cmake
new file mode 100644
index 0000000..b1e4b3c
--- /dev/null
+++ b/config/cmake/HDFCXXCompilerFlags.cmake
@@ -0,0 +1,326 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
+ENABLE_LANGUAGE (CXX)
+
+set (CMAKE_CXX_STANDARD 11)
+set (CMAKE_CXX_STANDARD_REQUIRED TRUE)
+
+set (CMAKE_CXX_EXTENSIONS OFF)
+
+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_SANITIZER_FLAGS} ${CMAKE_CXX_FLAGS}")
+message (VERBOSE "Warnings Configuration: CXX default: ${CMAKE_CXX_FLAGS}")
+#-----------------------------------------------------------------------------
+# Compiler specific flags : Shouldn't there be compiler tests for these
+#-----------------------------------------------------------------------------
+if (WIN32 AND CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+  set (_INTEL_WINDOWS 1)
+endif ()
+
+if (WIN32 AND CMAKE_CXX_COMPILER_ID MATCHES "[Cc]lang" AND "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC")
+  set (_CLANG_MSVC_WINDOWS 1)
+endif()
+
+# MSVC 14.28 enables C5105, but the Windows SDK 10.0.18362.0 triggers it.
+if ((_CLANG_MSVC_WINDOWS OR CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") AND CMAKE_CXX_COMPILER_LOADED)
+  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc")
+  if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.28)
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -wd5105")
+  endif ()
+endif ()
+
+if (CMAKE_CXX_COMPILER_ID STREQUAL SunPro AND CMAKE_CXX_COMPILER_LOADED)
+  if (NOT DEFINED CMAKE_CXX${CMAKE_CXX_STANDARD}_STANDARD_COMPILE_OPTION)
+    if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.13)
+      if (NOT CMAKE_CXX_STANDARD OR CMAKE_CXX_STANDARD EQUAL 98)
+        set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++03")
+      endif ()
+    else ()
+      set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -library=stlport4")
+    endif ()
+  endif ()
+endif ()
+
+if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED)
+  set (CMAKE_CXX_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_CXX_FLAGS}")
+  if (${HDF_CFG_NAME} MATCHES "Debug" OR ${HDF_CFG_NAME} MATCHES "Developer")
+    if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
+      set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Og -ftrapv -fno-common")
+    endif ()
+  else ()
+    if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
+      set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstdarg-opt")
+    endif ()
+    if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0)
+      if (HDF5_ENABLE_BUILD_DIAGS)
+        message (STATUS "... default color and URL extended diagnostic messages enabled")
+      else ()
+        message (STATUS "... disable color and URL extended diagnostic messages")
+        set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-urls=never -fno-diagnostics-color")
+      endif ()
+    endif ()
+  endif ()
+endif ()
+
+#-----------------------------------------------------------------------------
+# Option to allow the user to disable compiler warnings
+#-----------------------------------------------------------------------------
+if (HDF5_DISABLE_COMPILER_WARNINGS)
+  message (STATUS "....Compiler warnings are suppressed")
+  # MSVC uses /w to suppress warnings.  It also complains if another
+  # warning level is given, so remove it.
+  if (MSVC)
+    set (HDF5_WARNINGS_BLOCKED 1)
+    if (CMAKE_CXX_COMPILER_LOADED)
+      string (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+      set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W0")
+    endif ()
+  endif ()
+  if (WIN32)
+    add_definitions (-D_CRT_SECURE_NO_WARNINGS)
+  endif ()
+
+  # Most compilers use -w to suppress warnings.
+  if (NOT HDF5_WARNINGS_BLOCKED)
+    if (CMAKE_CXX_COMPILER_LOADED)
+      set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
+    endif ()
+  endif ()
+endif ()
+
+#-----------------------------------------------------------------------------
+# HDF5 library compile options
+#-----------------------------------------------------------------------------
+
+if (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
+  list (APPEND HDF5_CMAKE_CXX_FLAGS "-erroff=%none -DBSD_COMP")
+else ()
+  # General flags
+  #
+  # Note that some of the flags listed here really should be developer
+  # flags (listed in a separate variable, below) but we put them here
+  # because they are not raised by the current code and we'd like to
+  # know if they do start showing up.
+  #
+  # NOTE: Don't add -Wpadded here since we can't/won't fix the (many)
+  # warnings that are emitted. If you need it, add it at configure time.
+  if (CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+    if (_INTEL_WINDOWS)
+      ADD_H5_FLAGS (HDF5_CMAKE_CXX_FLAGS "${HDF5_SOURCE_DIR}/config/intel-warnings/win-general")
+    else ()
+      ADD_H5_FLAGS (HDF5_CMAKE_CXX_FLAGS "${HDF5_SOURCE_DIR}/config/intel-warnings/general")
+    endif()
+    if (NOT _INTEL_WINDOWS)
+      if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 15.0)
+        ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/intel-warnings/15")
+      endif()
+      if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 18.0)
+        ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/intel-warnings/18")
+      endif()
+    endif()
+  elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED
+        AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 4.8)
+      # add the general CXX flags for g++ compiler versions 4.8 and above.
+      ADD_H5_FLAGS (HDF5_CMAKE_CXX_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-general")
+      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-error-general")
+    endif ()
+  elseif (CMAKE_CXX_COMPILER_ID MATCHES "[Cc]lang")
+    ADD_H5_FLAGS (HDF5_CMAKE_CXX_FLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/general")
+  elseif (CMAKE_CXX_COMPILER_ID STREQUAL "PGI")
+    list (APPEND HDF5_CMAKE_CXX_FLAGS "-Minform=inform")
+  endif ()
+  message (VERBOSE "CMAKE_CXX_FLAGS_GENERAL=${HDF5_CMAKE_CXX_FLAGS}")
+endif ()
+
+#-----------------------------------------------------------------------------
+# Option to allow the user to enable developer warnings
+# Developer warnings (suggestions from gcc, not code problems)
+#-----------------------------------------------------------------------------
+if (HDF5_ENABLE_DEV_WARNINGS)
+  message (STATUS "....HDF5 developer group warnings are enabled")
+  if (CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+    ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/intel-warnings/developer-general")
+  elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    # Use the C warnings as CXX warnings are the same
+    ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-general")
+  elseif (CMAKE_CXX_COMPILER_ID MATCHES "[Cc]lang")
+    ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/developer-general")
+  endif ()
+else ()
+  if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    # Use the C warnings as CXX warnings are the same
+    ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-general")
+  elseif (CMAKE_CXX_COMPILER_ID MATCHES "[Cc]lang")
+    ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/no-developer-general")
+  endif ()
+endif ()
+
+if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+  # Technically, variable-length arrays are part of the C99 standard, but
+  #   we should approach them a bit cautiously... Only needed for gcc 4.X
+  if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0 AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 4.8)
+    # Use the C warnings as CXX warnings are the same
+    ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/4.8-4.last")
+  endif ()
+
+  # Append more extra warning flags that only gcc 4.8+ knows about
+  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
+    ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-4.8")
+    if (HDF5_ENABLE_DEV_WARNINGS)
+      # Use the C warnings as CXX warnings are the same
+      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-developer-4.8")
+    else ()
+      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-cxx-developer-4.8")
+    endif ()
+  endif ()
+
+  # Append more extra warning flags that only gcc 4.9+ knows about
+  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9)
+    # Use the C warnings as CXX warnings are the same
+    ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-4.9")
+  endif ()
+
+  # Append more extra warning flags that only gcc 5.1+ knows about
+  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
+    # autotools always add the C flags with the CXX flags
+    ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-5")
+    ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-error-5")
+  endif ()
+
+  # Append more extra warning flags that only gcc 6.x+ knows about
+  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0)
+    # Use the C warnings as CXX warnings are the same
+    ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/6")
+  endif ()
+
+  # Append more extra warning flags that only gcc 7.x+ knows about
+  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0)
+    # Use the C warnings as CXX warnings are the same
+    ADD_H5_FLAGS (H5_CXxFLAGS2 "${HDF5_SOURCE_DIR}/config/gnu-warnings/7")
+    if (HDF5_ENABLE_DEV_WARNINGS)
+    # Use the C warnings as CXX warnings are the same
+      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-7")
+    #else ()
+    #  ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-7")
+    endif ()
+  endif ()
+
+  # Append more extra warning flags that only gcc 8.x+ knows about
+  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8.0)
+    # Use the C warnings as CXX warnings are the same
+    ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/8")
+    ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/error-8")
+    if (HDF5_ENABLE_DEV_WARNINGS)
+      # Use the C warnings as CXX warnings are the same
+      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-8")
+    else ()
+      # autotools always add the C flags with the CXX flags
+      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-8")
+    endif ()
+  endif ()
+
+  # Append more extra warning flags that only gcc 9.x+ knows about
+  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0)
+    # Use the C warnings as CXX warnings are the same
+    ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-9")
+  endif ()
+
+  # Append more extra warning flags that only gcc 9.3+ knows about
+  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.3)
+    # do not use C warnings, gnu-warnings 9.3, no cxx warnings
+    # ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/9.3")
+  endif ()
+
+  # Append more extra warning flags that only gcc 10.x+ knows about
+  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0)
+    if (HDF5_ENABLE_DEV_WARNINGS)
+      # Use the C warnings as CXX warnings are the same
+      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-10")
+    #else ()
+    #  ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-10")
+    endif ()
+  endif ()
+endif ()
+
+#-----------------------------------------------------------------------------
+# Option to allow the user to enable all warnings
+#-----------------------------------------------------------------------------
+if (HDF5_ENABLE_ALL_WARNINGS)
+  message (STATUS "....All Warnings are enabled")
+  if (MSVC)
+    if (HDF5_ENABLE_DEV_WARNINGS)
+      if (CMAKE_CXX_COMPILER_LOADED)
+        string (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+        list (APPEND HDF5_CMAKE_CXX_FLAGS "/Wall" "/wd4668")
+      endif ()
+    else ()
+      if (CMAKE_CXX_COMPILER_LOADED)
+        string (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+        list (APPEND HDF5_CMAKE_CXX_FLAGS "/W3" "/wd4100" "/wd4706" "/wd4127")
+      endif ()
+    endif ()
+  else ()
+    if (CMAKE_CXX_COMPILER_LOADED)
+      list (APPEND HDF5_CMAKE_CXX_FLAGS ${H5_CXXFLAGS})
+    endif ()
+  endif ()
+endif ()
+
+#-----------------------------------------------------------------------------
+# This is in here to help some of the GCC based IDES like Eclipse
+# and code blocks parse the compiler errors and warnings better.
+#-----------------------------------------------------------------------------
+if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED)
+  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fmessage-length=0")
+endif ()
+
+#-----------------------------------------------------------------------------
+# Option for --enable-symbols
+# This option will force/override the default setting for all configurations
+#-----------------------------------------------------------------------------
+if (HDF5_ENABLE_SYMBOLS MATCHES "YES")
+  if (CMAKE_CXX_COMPILER_LOADED)
+    if (CMAKE_CXX_COMPILER_ID STREQUAL "Intel" AND NOT _INTEL_WINDOWS)
+      set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g")
+    elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+      set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g")
+    endif ()
+  endif ()
+elseif (HDF5_ENABLE_SYMBOLS MATCHES "NO")
+  if (CMAKE_CXX_COMPILER_LOADED)
+    if (CMAKE_CXX_COMPILER_ID STREQUAL "Intel" AND NOT _INTEL_WINDOWS)
+      set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-s")
+    elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+      set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s")
+    endif ()
+  endif ()
+endif ()
+
+#-----------------------------------------------------------------------------
+# Option for --enable-profiling
+# This option will force/override the default setting for all configurations
+#-----------------------------------------------------------------------------
+if (HDF5_ENABLE_PROFILING)
+  if (CMAKE_CXX_COMPILER_LOADED)
+    list (APPEND HDF5_CMAKE_CXX_FLAGS "${PROFILE_CXXFLAGS}")
+  endif ()
+endif ()
+
+#-----------------------------------------------------------------------------
+# Option for --enable-optimization
+# This option will force/override the default setting for all configurations
+#-----------------------------------------------------------------------------
+if (HDF5_ENABLE_OPTIMIZATION)
+  if (CMAKE_CXX_COMPILER_LOADED)
+    list (APPEND HDF5_CMAKE_CXX_FLAGS "${OPTIMIZE_CXXFLAGS}")
+  endif ()
+endif ()
diff --git a/config/cmake/HDFCompilerFlags.cmake b/config/cmake/HDFCompilerFlags.cmake
new file mode 100644
index 0000000..504c163
--- /dev/null
+++ b/config/cmake/HDFCompilerFlags.cmake
@@ -0,0 +1,386 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
+set(CMAKE_C_STANDARD 99)
+set(CMAKE_C_STANDARD_REQUIRED TRUE)
+
+set (CMAKE_C_FLAGS "${CMAKE_C99_STANDARD_COMPILE_OPTION} ${CMAKE_C_FLAGS}")
+set (CMAKE_C_FLAGS "${CMAKE_C_SANITIZER_FLAGS} ${CMAKE_C_FLAGS}")
+message (VERBOSE "Warnings Configuration: C default: ${CMAKE_C_FLAGS}")
+#-----------------------------------------------------------------------------
+# Compiler specific flags : Shouldn't there be compiler tests for these
+#-----------------------------------------------------------------------------
+if(WIN32 AND CMAKE_C_COMPILER_ID STREQUAL "Intel")
+  set(_INTEL_WINDOWS 1)
+endif()
+
+if(WIN32 AND CMAKE_C_COMPILER_ID MATCHES "[Cc]lang" AND "x${CMAKE_C_SIMULATE_ID}" STREQUAL "xMSVC")
+  set(_CLANG_MSVC_WINDOWS 1)
+endif()
+
+# Disable deprecation warnings for standard C functions.
+# really only needed for newer versions of VS, but should
+# not hurt other versions, and this will work into the
+# future
+if(MSVC OR _INTEL_WINDOWS OR _CLANG_MSVC_WINDOWS)
+  add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
+endif()
+
+if(MSVC)
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stack:10000000")
+endif()
+
+# MSVC 14.28 enables C5105, but the Windows SDK 10.0.18362.0 triggers it.
+if(CMAKE_C_COMPILER_ID STREQUAL "MSVC" AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 19.28)
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -wd5105")
+endif()
+
+if(_CLANG_MSVC_WINDOWS AND "x${CMAKE_C_COMPILER_FRONTEND_VARIANT}" STREQUAL "xGNU")
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Xlinker -stack:20000000")
+endif()
+
+if (CMAKE_COMPILER_IS_GNUCC)
+  set (CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS}")
+  if (${HDF_CFG_NAME} MATCHES "Debug" OR ${HDF_CFG_NAME} MATCHES "Developer")
+    if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 5.0)
+      set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Og -ftrapv -fno-common")
+    endif ()
+  else ()
+    if (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 5.0)
+      set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstdarg-opt")
+    endif ()
+    if (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 10.0)
+      #-----------------------------------------------------------------------------
+      # Option to allow the user to enable build extended diagnostics
+      #
+      # This should NOT be on by default as it can cause process issues.
+      #-----------------------------------------------------------------------------
+      option (HDF5_ENABLE_BUILD_DIAGS "Enable color and URL extended diagnostic messages" OFF)
+      if (HDF5_ENABLE_BUILD_DIAGS)
+        message (STATUS "... default color and URL extended diagnostic messages enabled")
+      else ()
+        message (STATUS "... disable color and URL extended diagnostic messages")
+        set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fdiagnostics-urls=never -fno-diagnostics-color")
+      endif ()
+    endif ()
+  endif ()
+endif ()
+
+#-----------------------------------------------------------------------------
+# Option to allow the user to disable compiler warnings
+#-----------------------------------------------------------------------------
+option (HDF5_DISABLE_COMPILER_WARNINGS "Disable compiler warnings" OFF)
+if (HDF5_DISABLE_COMPILER_WARNINGS)
+  message (STATUS "....Compiler warnings are suppressed")
+  # MSVC uses /w to suppress warnings.  It also complains if another
+  # warning level is given, so remove it.
+  if (MSVC)
+    set (HDF5_WARNINGS_BLOCKED 1)
+    string (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W0")
+  endif ()
+  if (WIN32)
+    add_definitions (-D_CRT_SECURE_NO_WARNINGS)
+  endif ()
+  # Borland uses -w- to suppress warnings.
+  if (BORLAND)
+    set (HDF5_WARNINGS_BLOCKED 1)
+    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w-")
+  endif ()
+
+  # Most compilers use -w to suppress warnings.
+  if (NOT HDF5_WARNINGS_BLOCKED)
+    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w")
+  endif ()
+endif ()
+
+#-----------------------------------------------------------------------------
+# HDF5 library compile options
+#-----------------------------------------------------------------------------
+
+#-----------------------------------------------------------------------------
+# Option to allow the user to interpret certain warnings as errors
+#
+# This should NOT be on by default as it can cause a lot of conflicts with
+# new operating systems and compiler versions. Header files that are out of
+# our control (MPI, HDFS, etc.) can also raise warnings.
+#-----------------------------------------------------------------------------
+option (HDF5_ENABLE_WARNINGS_AS_ERRORS "Interpret some warnings as errors" OFF)
+if (HDF5_ENABLE_WARNINGS_AS_ERRORS)
+  message (STATUS "...some warnings will be interpreted as errors")
+endif ()
+
+if (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
+  list (APPEND HDF5_CMAKE_C_FLAGS "-erroff=%none -DBSD_COMP")
+else ()
+  # General flags
+  #
+  # Note that some of the flags listed here really should be developer
+  # flags (listed in a separate variable, below) but we put them here
+  # because they are not raised by the current code and we'd like to
+  # know if they do start showing up.
+  #
+  # NOTE: Don't add -Wpadded here since we can't/won't fix the (many)
+  # warnings that are emitted. If you need it, add it at configure time.
+  if (CMAKE_C_COMPILER_ID STREQUAL "Intel")
+    if (_INTEL_WINDOWS)
+      ADD_H5_FLAGS (HDF5_CMAKE_C_FLAGS "${HDF5_SOURCE_DIR}/config/intel-warnings/win-general")
+    else ()
+      ADD_H5_FLAGS (HDF5_CMAKE_C_FLAGS "${HDF5_SOURCE_DIR}/config/intel-warnings/general")
+    endif()
+    if (NOT _INTEL_WINDOWS)
+      if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 15.0)
+        ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/intel-warnings/15")
+      endif()
+      # this is just a failsafe
+      list (APPEND H5_CFLAGS "-finline-functions")
+      if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 18.0)
+        ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/intel-warnings/18")
+      endif()
+    endif()
+  elseif (CMAKE_C_COMPILER_ID STREQUAL "GNU")
+    # Add general CFlags for GCC versions 4.8 and above
+    if (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 4.8)
+      ADD_H5_FLAGS (HDF5_CMAKE_C_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/general")
+      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/error-general")
+    endif ()
+    # gcc automatically inlines based on the optimization level
+    # this is just a failsafe
+    list (APPEND H5_CFLAGS "-finline-functions")
+  elseif (CMAKE_C_COMPILER_ID MATCHES "[Cc]lang")
+    ADD_H5_FLAGS (HDF5_CMAKE_C_FLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/general")
+    ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/error-general")
+  elseif (CMAKE_C_COMPILER_ID STREQUAL "PGI")
+    list (APPEND HDF5_CMAKE_C_FLAGS "-Minform=inform")
+  endif ()
+  message (VERBOSE "CMAKE_C_FLAGS_GENERAL=${HDF5_CMAKE_C_FLAGS}")
+endif ()
+
+#-----------------------------------------------------------------------------
+# Option to allow the user to enable developer warnings
+# Developer warnings (suggestions from gcc, not code problems)
+#-----------------------------------------------------------------------------
+option (HDF5_ENABLE_DEV_WARNINGS "Enable HDF5 developer group warnings" OFF)
+if (${HDF_CFG_NAME} MATCHES "Developer")
+  # Developer build modes should always have these types of warnings enabled
+  set (HDF5_ENABLE_DEV_WARNINGS ON CACHE BOOL "Enable HDF5 developer group warnings" FORCE)
+endif ()
+if (HDF5_ENABLE_DEV_WARNINGS)
+  message (STATUS "....HDF5 developer group warnings are enabled")
+  if (CMAKE_C_COMPILER_ID STREQUAL "Intel")
+    if (_INTEL_WINDOWS)
+      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/intel-warnings/win-developer-general")
+    else ()
+      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/intel-warnings/developer-general")
+    endif ()
+  elseif (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 4.8)
+    ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-general")
+  elseif (CMAKE_C_COMPILER_ID MATCHES "[Cc]lang")
+    ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/developer-general")
+  endif ()
+else ()
+  if (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 4.8)
+    ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-general")
+  elseif (CMAKE_C_COMPILER_ID MATCHES "[Cc]lang")
+    ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/no-developer-general")
+  endif ()
+endif ()
+
+if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
+  # Technically, variable-length arrays are part of the C99 standard, but
+  #   we should approach them a bit cautiously... Only needed for gcc 4.X
+  if (CMAKE_C_COMPILER_VERSION VERSION_LESS 5.0 AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 4.8)
+    ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/4.8-4.last")
+  endif ()
+
+  # Append more extra warning flags that only gcc 4.8+ knows about
+  if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.8)
+    ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/4.8")
+    if (HDF5_ENABLE_DEV_WARNINGS)
+      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-4.8")
+    else ()
+      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-4.8")
+    endif ()
+  endif ()
+
+  # Append more extra warning flags that only gcc 4.9+ knows about
+  if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.9)
+    ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/4.9")
+  endif ()
+
+  # Append more extra warning flags that only gcc 5.x+ knows about
+  if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 5.0)
+    ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/5")
+    ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/error-5")
+  endif ()
+
+  # Append more extra warning flags that only gcc 6.x+ knows about
+  if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 6.0)
+    ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/6")
+  endif ()
+
+  # Append more extra warning flags that only gcc 7.x+ knows about
+  if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 7.0)
+    ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/7")
+    ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/error-7")
+    if (HDF5_ENABLE_DEV_WARNINGS)
+      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-7")
+    #else ()
+    #  ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-7")
+    endif ()
+  endif ()
+
+  # Append more extra warning flags that only gcc 8.x+ knows about
+  if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 8.0)
+    ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/8")
+    ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/error-8")
+    if (HDF5_ENABLE_DEV_WARNINGS)
+      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-8")
+    else ()
+      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-8")
+    endif ()
+  endif ()
+
+  # Append more extra warning flags that only gcc 9.x+ knows about
+  if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 9.0)
+    ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/9")
+  endif ()
+
+  # Append more extra warning flags that only gcc 9.3+ knows about
+  if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 9.3)
+    ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/9.3")
+  endif ()
+
+  # Append more extra warning flags that only gcc 10.x+ knows about
+  if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 10.0)
+    if (HDF5_ENABLE_DEV_WARNINGS)
+      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-10")
+    #else ()
+    #  ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-10")
+    endif ()
+  endif ()
+
+  # Append more extra warning flags that only gcc 12.x+ knows about
+  # or which should only be enabled for gcc 12.x+
+  if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 12.0)
+    if (HDF5_ENABLE_DEV_WARNINGS)
+      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-12")
+    #else ()
+    #  ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-12")
+    endif ()
+  endif ()
+endif ()
+
+#-----------------------------------------------------------------------------
+# Option to allow the user to enable debug output
+# from various HDF5 modules
+#-----------------------------------------------------------------------------
+option (HDF5_ENABLE_DEBUG_APIS "Turn on extra debug output in all packages" OFF)
+if (HDF5_ENABLE_DEBUG_APIS)
+  # Add standard debug definitions to any existing ones
+  list (APPEND HDF5_DEBUG_APIS
+      H5AC_DEBUG
+      H5CX_DEBUG
+      H5D_DEBUG
+      H5D_CHUNK_DEBUG
+      H5F_DEBUG
+      H5HL_DEBUG
+      H5I_DEBUG
+      H5O_DEBUG
+      H5S_DEBUG
+      H5T_DEBUG
+      H5Z_DEBUG
+  )
+endif ()
+
+#-----------------------------------------------------------------------------
+# Option to allow the user to enable all warnings
+#-----------------------------------------------------------------------------
+option (HDF5_ENABLE_ALL_WARNINGS "Enable all warnings" ON)
+if (HDF5_ENABLE_ALL_WARNINGS)
+  message (STATUS "....All Warnings are enabled")
+  if (MSVC)
+    if (HDF5_ENABLE_DEV_WARNINGS)
+      string (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+      list (APPEND HDF5_CMAKE_C_FLAGS "/Wall" "/wd4668")
+    else ()
+      string (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+      list (APPEND HDF5_CMAKE_C_FLAGS "/W3" "/wd4100" "/wd4706" "/wd4127")
+    endif ()
+  else ()
+    list (APPEND HDF5_CMAKE_C_FLAGS ${H5_CFLAGS})
+  endif ()
+endif ()
+
+#-----------------------------------------------------------------------------
+# This is in here to help some of the GCC based IDES like Eclipse
+# and code blocks parse the compiler errors and warnings better.
+#-----------------------------------------------------------------------------
+if (CMAKE_COMPILER_IS_GNUCC)
+  set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fmessage-length=0")
+endif ()
+
+#-----------------------------------------------------------------------------
+# Option for --enable-asserts
+# By default, CMake adds NDEBUG to CMAKE_${lang}_FLAGS for Release build types
+# This option will force/override the default setting for all configurations
+#-----------------------------------------------------------------------------
+#option (HDF5_ENABLE_ASSERTS "Determines whether NDEBUG is defined to control assertions." OFF)
+set (HDF5_ENABLE_ASSERTS "OFF" CACHE STRING "Determines whether NDEBUG is defined to control assertions (OFF NO YES)")
+set_property (CACHE HDF5_ENABLE_ASSERTS PROPERTY STRINGS OFF NO YES)
+if (HDF5_ENABLE_ASSERTS MATCHES "YES")
+  add_compile_options ("-UNDEBUG")
+elseif (HDF5_ENABLE_ASSERTS MATCHES "NO")
+  add_compile_options ("-DNDEBUG")
+endif ()
+MARK_AS_ADVANCED (HDF5_ENABLE_ASSERTS)
+
+#-----------------------------------------------------------------------------
+# Option for --enable-symbols
+# This option will force/override the default setting for all configurations
+#-----------------------------------------------------------------------------
+#option (HDF5_ENABLE_SYMBOLS "Add debug symbols to the library independent of the build mode and optimization level." OFF)
+set (HDF5_ENABLE_SYMBOLS "OFF" CACHE STRING "Add debug symbols to the library independent of the build mode and optimization level (OFF NO YES)")
+set_property (CACHE HDF5_ENABLE_SYMBOLS PROPERTY STRINGS OFF NO YES)
+if (HDF5_ENABLE_SYMBOLS MATCHES "YES")
+  if (CMAKE_C_COMPILER_ID STREQUAL "Intel" AND NOT _INTEL_WINDOWS)
+    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g")
+  elseif (CMAKE_C_COMPILER_ID STREQUAL "GNU")
+    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -fno-omit-frame-pointer")
+  endif ()
+elseif (HDF5_ENABLE_SYMBOLS MATCHES "NO")
+  if (CMAKE_C_COMPILER_ID STREQUAL "Intel" AND NOT _INTEL_WINDOWS)
+    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,-s")
+  elseif (CMAKE_C_COMPILER_ID STREQUAL "GNU")
+    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -s")
+  endif ()
+endif ()
+MARK_AS_ADVANCED (HDF5_ENABLE_SYMBOLS)
+
+#-----------------------------------------------------------------------------
+# Option for --enable-profiling
+# This option will force/override the default setting for all configurations
+#-----------------------------------------------------------------------------
+option (HDF5_ENABLE_PROFILING "Enable profiling flags independently from the build mode." OFF)
+if (HDF5_ENABLE_PROFILING)
+  list (APPEND HDF5_CMAKE_C_FLAGS "${PROFILE_CFLAGS}")
+endif ()
+MARK_AS_ADVANCED (HDF5_ENABLE_PROFILING)
+
+#-----------------------------------------------------------------------------
+# Option for --enable-optimization
+# This option will force/override the default setting for all configurations
+#-----------------------------------------------------------------------------
+option (HDF5_ENABLE_OPTIMIZATION "Enable optimization flags/settings independently from the build mode" OFF)
+if (HDF5_ENABLE_OPTIMIZATION)
+  list (APPEND HDF5_CMAKE_C_FLAGS "${OPTIMIZE_CFLAGS}")
+endif ()
+MARK_AS_ADVANCED (HDF5_ENABLE_OPTIMIZATION)
diff --git a/config/cmake/HDFFortranCompilerFlags.cmake b/config/cmake/HDFFortranCompilerFlags.cmake
new file mode 100644
index 0000000..86d0431
--- /dev/null
+++ b/config/cmake/HDFFortranCompilerFlags.cmake
@@ -0,0 +1,127 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
+
+message (VERBOSE "Warnings Configuration: default Fortran: ${CMAKE_Fortran_FLAGS}")
+
+#-----------------------------------------------------------------------------
+# Option to allow the user to disable compiler warnings
+#-----------------------------------------------------------------------------
+if (HDF5_DISABLE_COMPILER_WARNINGS)
+  message (STATUS "....Compiler warnings are suppressed")
+  # MSVC uses /w to suppress warnings.  It also complains if another
+  # warning level is given, so remove it.
+  if (MSVC)
+    set (HDF5_WARNINGS_BLOCKED 1)
+    if (CMAKE_Fortran_COMPILER_ID STREQUAL "Intel")
+      set (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} /warn:none")
+    endif ()
+  endif ()
+  if (WIN32)
+    add_definitions (-D_CRT_SECURE_NO_WARNINGS)
+  endif ()
+  # Borland uses -w- to suppress warnings.
+  if (BORLAND)
+    set (HDF5_WARNINGS_BLOCKED 1)
+    set (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -w-")
+  endif ()
+
+  # Most compilers use -w to suppress warnings.
+  if (NOT HDF5_WARNINGS_BLOCKED)
+    set (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -w")
+  endif ()
+endif ()
+
+#-----------------------------------------------------------------------------
+# HDF5 library compile options
+#-----------------------------------------------------------------------------
+if (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 10.0)
+  if (HDF5_ENABLE_BUILD_DIAGS)
+    message (STATUS "... default color and URL extended diagnostic messages enabled")
+  else ()
+    message (STATUS "... disable color and URL extended diagnostic messages")
+    set (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fdiagnostics-urls=never -fno-diagnostics-color")
+  endif ()
+endif ()
+
+if (NOT MSVC AND NOT MINGW)
+  # General flags
+  if (CMAKE_Fortran_COMPILER_ID STREQUAL "Intel")
+    ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/intel-warnings/ifort-general")
+    list (APPEND HDF5_CMAKE_Fortran_FLAGS "-free")
+  elseif (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
+    ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-general")
+    if (HDF5_ENABLE_DEV_WARNINGS)
+      ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-developer-general")
+    else ()
+      ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-no-developer-general")
+    endif ()
+    list (APPEND HDF5_CMAKE_Fortran_FLAGS "-ffree-form" "-fimplicit-none")
+    if (CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 8.0 AND NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 4.6)
+      list (APPEND HDF5_CMAKE_Fortran_FLAGS "-std=f2008ts")
+    else ()
+      list (APPEND HDF5_CMAKE_Fortran_FLAGS "-std=f2008")
+    endif ()
+  elseif (CMAKE_Fortran_COMPILER_ID STREQUAL "PGI")
+    list (APPEND HDF5_CMAKE_Fortran_FLAGS "-Mfreeform" "-Mdclchk" "-Mstandard" "-Mallocatable=03")
+  endif ()
+  message (VERBOSE "HDF5_CMAKE_Fortran_FLAGS=${HDF5_CMAKE_Fortran_FLAGS}")
+
+  if (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
+    # Append more extra warning flags that only gcc 4.8+ knows about
+    if (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 4.8)
+      ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-4.8")
+      if (HDF5_ENABLE_DEV_WARNINGS)
+        ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-developer-4.8")
+      else ()
+        ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-no-developer-4.8")
+      endif ()
+    endif ()
+
+    # Append more extra warning flags that only gcc 4.9+ knows about
+    #if (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 4.9)
+    #  ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-4.9")
+    #endif ()
+
+    # Append more extra warning flags that only gcc 5.x+ knows about
+    if (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 5.0)
+      if (HDF5_ENABLE_DEV_WARNINGS)
+        ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-developer-5")
+      endif ()
+    endif ()
+
+    # Append more extra warning flags that only gcc 6.x+ knows about
+    if (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 6.0)
+      ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-6")
+    endif ()
+
+    # Append more extra warning flags that only gcc 7.x+ knows about
+    #if (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7.0)
+    #  ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-7")
+    #endif ()
+
+    # Append more extra warning flags that only gcc 8.x+ knows about
+    if (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 8.0)
+      ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-8")
+    endif ()
+
+    # Append more extra warning flags that only gcc 9.x+ knows about
+    #if (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 9.0)
+    #  ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-9")
+    #endif ()
+  endif ()
+else ()
+  if (CMAKE_Fortran_COMPILER_ID STREQUAL "Intel")
+    ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/intel-warnings/win-ifort-general")
+    list (APPEND HDF5_CMAKE_Fortran_FLAGS "/stand:f03" "/free")
+  endif ()
+endif ()
+
diff --git a/config/cmake/HDFLibMacros.cmake b/config/cmake/HDFLibMacros.cmake
new file mode 100644
index 0000000..51e16c1
--- /dev/null
+++ b/config/cmake/HDFLibMacros.cmake
@@ -0,0 +1,277 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
+#-------------------------------------------------------------------------------
+macro (EXTERNAL_JPEG_LIBRARY compress_type jpeg_pic)
+  # May need to build JPEG with PIC on x64 machines with gcc
+  # Need to use CMAKE_ANSI_CFLAGS define so that compiler test works
+
+  if (${compress_type} MATCHES "GIT")
+    EXTERNALPROJECT_ADD (JPEG
+        GIT_REPOSITORY ${JPEG_URL}
+        GIT_TAG ${JPEG_BRANCH}
+        INSTALL_COMMAND ""
+        CMAKE_ARGS
+            -DBUILD_SHARED_LIBS:BOOL=OFF
+            -DJPEG_PACKAGE_EXT:STRING=${HDF_PACKAGE_EXT}
+            -DJPEG_EXTERNALLY_CONFIGURED:BOOL=OFF
+            -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
+            -DCMAKE_DEBUG_POSTFIX:STRING=${CMAKE_DEBUG_POSTFIX}
+            -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
+            -DCMAKE_RUNTIME_OUTPUT_DIRECTORY:PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
+            -DCMAKE_LIBRARY_OUTPUT_DIRECTORY:PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
+            -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY:PATH=${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}
+            -DCMAKE_PDB_OUTPUT_DIRECTORY:PATH=${CMAKE_PDB_OUTPUT_DIRECTORY}
+            -DCMAKE_ANSI_CFLAGS:STRING=${jpeg_pic}
+            -DHDF_USE_GNU_DIRS:STRING=${HDF5_USE_GNU_DIRS}
+            -DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHITECTURES}
+            -DCMAKE_TOOLCHAIN_FILE:STRING=${CMAKE_TOOLCHAIN_FILE}
+            -DPACKAGE_NAMESPACE=${HDF_PACKAGE_NAMESPACE}
+    )
+  elseif (${compress_type} MATCHES "TGZ")
+    EXTERNALPROJECT_ADD (JPEG
+        URL ${JPEG_URL}
+        URL_MD5 ""
+        INSTALL_COMMAND ""
+        CMAKE_ARGS
+            -DBUILD_SHARED_LIBS:BOOL=OFF
+            -DJPEG_PACKAGE_EXT:STRING=${HDF_PACKAGE_EXT}
+            -DJPEG_EXTERNALLY_CONFIGURED:BOOL=OFF
+            -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
+            -DCMAKE_DEBUG_POSTFIX:STRING=${CMAKE_DEBUG_POSTFIX}
+            -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
+            -DCMAKE_RUNTIME_OUTPUT_DIRECTORY:PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
+            -DCMAKE_LIBRARY_OUTPUT_DIRECTORY:PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
+            -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY:PATH=${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}
+            -DCMAKE_PDB_OUTPUT_DIRECTORY:PATH=${CMAKE_PDB_OUTPUT_DIRECTORY}
+            -DCMAKE_ANSI_CFLAGS:STRING=${jpeg_pic}
+            -DHDF_USE_GNU_DIRS:STRING=${HDF5_USE_GNU_DIRS}
+            -DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHITECTURES}
+            -DCMAKE_TOOLCHAIN_FILE:STRING=${CMAKE_TOOLCHAIN_FILE}
+            -DPACKAGE_NAMESPACE=${HDF_PACKAGE_NAMESPACE}
+    )
+  endif ()
+  externalproject_get_property (JPEG BINARY_DIR SOURCE_DIR)
+
+##include (${BINARY_DIR}/${JPEG_PACKAGE_NAME}${HDF_PACKAGE_EXT}-targets.cmake)
+# Create imported target jpeg-static
+  add_library(${HDF_PACKAGE_NAMESPACE}jpeg-static STATIC IMPORTED)
+  HDF_IMPORT_SET_LIB_OPTIONS (${HDF_PACKAGE_NAMESPACE}jpeg-static "jpeg" STATIC "")
+  add_dependencies (${HDF_PACKAGE_NAMESPACE}jpeg-static JPEG)
+  set (JPEG_STATIC_LIBRARY "${HDF_PACKAGE_NAMESPACE}jpeg-static")
+  set (JPEG_LIBRARIES ${JPEG_STATIC_LIBRARY})
+
+  set (JPEG_INCLUDE_DIR_GEN "${BINARY_DIR}")
+  set (JPEG_INCLUDE_DIR "${SOURCE_DIR}/src")
+  set (JPEG_FOUND 1)
+  set (JPEG_INCLUDE_DIRS ${JPEG_INCLUDE_DIR_GEN} ${JPEG_INCLUDE_DIR})
+endmacro ()
+
+#-------------------------------------------------------------------------------
+macro (PACKAGE_JPEG_LIBRARY compress_type)
+  add_custom_target (JPEG-GenHeader-Copy ALL
+      COMMAND ${CMAKE_COMMAND} -E copy_if_different ${JPEG_INCLUDE_DIR_GEN}/jconfig.h ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/
+      COMMENT "Copying ${JPEG_INCLUDE_DIR_GEN}/jconfig.h to ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/"
+  )
+  set (EXTERNAL_HEADER_LIST ${EXTERNAL_HEADER_LIST} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/jconfig.h)
+  if (${compress_type} MATCHES "GIT" OR ${compress_type} MATCHES "TGZ")
+    add_dependencies (JPEG-GenHeader-Copy JPEG)
+  endif ()
+endmacro ()
+
+#-------------------------------------------------------------------------------
+macro (EXTERNAL_SZIP_LIBRARY compress_type encoding)
+  if (${compress_type} MATCHES "GIT")
+#    FetchContent_Declare (SZIP
+#        GIT_REPOSITORY ${SZIP_URL}
+#        GIT_TAG ${SZIP_BRANCH}
+#    )
+    EXTERNALPROJECT_ADD (SZIP
+        GIT_REPOSITORY ${SZIP_URL}
+        GIT_TAG ${SZIP_BRANCH}
+        INSTALL_COMMAND ""
+        CMAKE_ARGS
+            -DBUILD_SHARED_LIBS:BOOL=OFF
+            -DSZIP_PACKAGE_EXT:STRING=${HDF_PACKAGE_EXT}
+            -DSZIP_EXTERNALLY_CONFIGURED:BOOL=OFF
+            -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
+            -DCMAKE_DEBUG_POSTFIX:STRING=${CMAKE_DEBUG_POSTFIX}
+            -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
+            -DCMAKE_RUNTIME_OUTPUT_DIRECTORY:PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
+            -DCMAKE_LIBRARY_OUTPUT_DIRECTORY:PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
+            -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY:PATH=${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}
+            -DCMAKE_PDB_OUTPUT_DIRECTORY:PATH=${CMAKE_PDB_OUTPUT_DIRECTORY}
+            -DCMAKE_ANSI_CFLAGS:STRING=${CMAKE_ANSI_CFLAGS}
+            -DSZIP_ENABLE_ENCODING:BOOL=${encoding}
+            -DHDF_USE_GNU_DIRS:STRING=${HDF5_USE_GNU_DIRS}
+            -DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHITECTURES}
+            -DCMAKE_TOOLCHAIN_FILE:STRING=${CMAKE_TOOLCHAIN_FILE}
+            -DPACKAGE_NAMESPACE=${HDF_PACKAGE_NAMESPACE}
+    )
+  elseif (${compress_type} MATCHES "TGZ")
+#    FetchContent_Declare (SZIP
+#        URL ${SZIP_URL}
+#        URL_HASH ""
+#    )
+    EXTERNALPROJECT_ADD (SZIP
+        URL ${SZIP_URL}
+        URL_MD5 ""
+        INSTALL_COMMAND ""
+        CMAKE_ARGS
+            -DBUILD_SHARED_LIBS:BOOL=OFF
+            -DSZIP_PACKAGE_EXT:STRING=${HDF_PACKAGE_EXT}
+            -DSZIP_EXTERNALLY_CONFIGURED:BOOL=OFF
+            -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
+            -DCMAKE_DEBUG_POSTFIX:STRING=${CMAKE_DEBUG_POSTFIX}
+            -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
+            -DCMAKE_RUNTIME_OUTPUT_DIRECTORY:PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
+            -DCMAKE_LIBRARY_OUTPUT_DIRECTORY:PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
+            -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY:PATH=${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}
+            -DCMAKE_PDB_OUTPUT_DIRECTORY:PATH=${CMAKE_PDB_OUTPUT_DIRECTORY}
+            -DCMAKE_ANSI_CFLAGS:STRING=${CMAKE_ANSI_CFLAGS}
+            -DSZIP_ENABLE_ENCODING:BOOL=${encoding}
+            -DHDF_USE_GNU_DIRS:STRING=${HDF5_USE_GNU_DIRS}
+            -DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHITECTURES}
+            -DCMAKE_TOOLCHAIN_FILE:STRING=${CMAKE_TOOLCHAIN_FILE}
+            -DPACKAGE_NAMESPACE=${HDF_PACKAGE_NAMESPACE}
+    )
+  endif ()
+  externalproject_get_property (SZIP BINARY_DIR SOURCE_DIR)
+#  FetchContent_GetProperties(SZIP)
+#  if(NOT SZIP_POPULATED)
+#    FetchContent_Populate(SZIP)
+#    add_subdirectory(${szip_SOURCE_DIR} ${szip_BINARY_DIR})
+#  endif()
+#
+##include (${BINARY_DIR}/${SZIP_PACKAGE_NAME}${HDF_PACKAGE_EXT}-targets.cmake)
+# Create imported target szip-static
+  if (USE_LIBAEC)
+    add_library(${HDF_PACKAGE_NAMESPACE}szaec-static STATIC IMPORTED)
+    HDF_IMPORT_SET_LIB_OPTIONS (${HDF_PACKAGE_NAMESPACE}szaec-static "szaec" STATIC "")
+    add_dependencies (${HDF_PACKAGE_NAMESPACE}szaec-static SZIP)
+    add_library(${HDF_PACKAGE_NAMESPACE}aec-static STATIC IMPORTED)
+    HDF_IMPORT_SET_LIB_OPTIONS (${HDF_PACKAGE_NAMESPACE}aec-static "aec" STATIC "")
+    add_dependencies (${HDF_PACKAGE_NAMESPACE}aec-static SZIP)
+    set (SZIP_STATIC_LIBRARY "${HDF_PACKAGE_NAMESPACE}szaec-static;${HDF_PACKAGE_NAMESPACE}aec-static")
+  else ()
+    add_library(${HDF_PACKAGE_NAMESPACE}szip-static STATIC IMPORTED)
+    HDF_IMPORT_SET_LIB_OPTIONS (${HDF_PACKAGE_NAMESPACE}szip-static "szip" STATIC "")
+    add_dependencies (${HDF_PACKAGE_NAMESPACE}szip-static SZIP)
+    set (SZIP_STATIC_LIBRARY "${HDF_PACKAGE_NAMESPACE}szip-static")
+  endif ()
+  set (SZIP_LIBRARIES ${SZIP_STATIC_LIBRARY})
+
+  set (SZIP_INCLUDE_DIR_GEN "${BINARY_DIR}")
+  if (USE_LIBAEC)
+    set (SZIP_INCLUDE_DIR "${SOURCE_DIR}/include")
+  else ()
+    set (SZIP_INCLUDE_DIR "${SOURCE_DIR}/src")
+  endif ()
+  set (SZIP_FOUND 1)
+  set (SZIP_INCLUDE_DIRS ${SZIP_INCLUDE_DIR_GEN} ${SZIP_INCLUDE_DIR})
+endmacro ()
+
+#-------------------------------------------------------------------------------
+macro (PACKAGE_SZIP_LIBRARY compress_type)
+  set (SZIP_HDR "SZconfig")
+  if (USE_LIBAEC)
+    set (SZIP_HDR "aec_config")
+  else ()
+    set (SZIP_HDR "libaec_Export")
+  endif ()
+  add_custom_target (SZIP-GenHeader-Copy ALL
+      COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SZIP_INCLUDE_DIR_GEN}/${SZIP_HDR}.h ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/
+      COMMENT "Copying ${SZIP_INCLUDE_DIR_GEN}/${SZIP_HDR}.h to ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/"
+  )
+  set (EXTERNAL_HEADER_LIST ${EXTERNAL_HEADER_LIST} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${SZIP_HDR}.h)
+  if (${compress_type} MATCHES "GIT" OR ${compress_type} MATCHES "TGZ")
+    add_dependencies (SZIP-GenHeader-Copy SZIP)
+  endif ()
+endmacro ()
+
+#-------------------------------------------------------------------------------
+macro (EXTERNAL_ZLIB_LIBRARY compress_type)
+  if (${compress_type} MATCHES "GIT")
+    EXTERNALPROJECT_ADD (HDF5_ZLIB
+        GIT_REPOSITORY ${ZLIB_URL}
+        GIT_TAG ${ZLIB_BRANCH}
+        INSTALL_COMMAND ""
+        CMAKE_ARGS
+            -DBUILD_SHARED_LIBS:BOOL=OFF
+            -DZLIB_PACKAGE_EXT:STRING=${HDF_PACKAGE_EXT}
+            -DZLIB_EXTERNALLY_CONFIGURED:BOOL=OFF
+            -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
+            -DCMAKE_DEBUG_POSTFIX:STRING=${CMAKE_DEBUG_POSTFIX}
+            -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
+            -DCMAKE_RUNTIME_OUTPUT_DIRECTORY:PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
+            -DCMAKE_LIBRARY_OUTPUT_DIRECTORY:PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
+            -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY:PATH=${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}
+            -DCMAKE_PDB_OUTPUT_DIRECTORY:PATH=${CMAKE_PDB_OUTPUT_DIRECTORY}
+            -DCMAKE_ANSI_CFLAGS:STRING=${CMAKE_ANSI_CFLAGS}
+            -DHDF_USE_GNU_DIRS:STRING=${HDF5_USE_GNU_DIRS}
+            -DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHITECTURES}
+            -DCMAKE_TOOLCHAIN_FILE:STRING=${CMAKE_TOOLCHAIN_FILE}
+            -DPACKAGE_NAMESPACE=${HDF_PACKAGE_NAMESPACE}
+    )
+  elseif (${compress_type} MATCHES "TGZ")
+    EXTERNALPROJECT_ADD (HDF5_ZLIB
+        URL ${ZLIB_URL}
+        URL_MD5 ""
+        INSTALL_COMMAND ""
+        CMAKE_ARGS
+            -DBUILD_SHARED_LIBS:BOOL=OFF
+            -DZLIB_PACKAGE_EXT:STRING=${HDF_PACKAGE_EXT}
+            -DZLIB_EXTERNALLY_CONFIGURED:BOOL=OFF
+            -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
+            -DCMAKE_DEBUG_POSTFIX:STRING=${CMAKE_DEBUG_POSTFIX}
+            -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
+            -DCMAKE_RUNTIME_OUTPUT_DIRECTORY:PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
+            -DCMAKE_LIBRARY_OUTPUT_DIRECTORY:PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
+            -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY:PATH=${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}
+            -DCMAKE_PDB_OUTPUT_DIRECTORY:PATH=${CMAKE_PDB_OUTPUT_DIRECTORY}
+            -DCMAKE_ANSI_CFLAGS:STRING=${CMAKE_ANSI_CFLAGS}
+            -DHDF_USE_GNU_DIRS:STRING=${HDF5_USE_GNU_DIRS}
+            -DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHITECTURES}
+            -DCMAKE_TOOLCHAIN_FILE:STRING=${CMAKE_TOOLCHAIN_FILE}
+            -DPACKAGE_NAMESPACE=${HDF_PACKAGE_NAMESPACE}
+    )
+  endif ()
+  externalproject_get_property (HDF5_ZLIB BINARY_DIR SOURCE_DIR)
+
+  if (NOT ZLIB_LIB_NAME)
+    set (ZLIB_LIB_NAME "z")
+  endif ()
+##include (${BINARY_DIR}/${ZLIB_PACKAGE_NAME}${HDF_PACKAGE_EXT}-targets.cmake)
+# Create imported target zlib-static
+  add_library(${HDF_PACKAGE_NAMESPACE}zlib-static STATIC IMPORTED)
+#  add_library(${HDF_PACKAGE_NAMESPACE}zlib-static ALIAS zlib-static)
+  HDF_IMPORT_SET_LIB_OPTIONS (${HDF_PACKAGE_NAMESPACE}zlib-static ${ZLIB_LIB_NAME} STATIC "")
+  add_dependencies (${HDF_PACKAGE_NAMESPACE}zlib-static HDF5_ZLIB)
+  set (ZLIB_STATIC_LIBRARY "${HDF_PACKAGE_NAMESPACE}zlib-static")
+  set (ZLIB_LIBRARIES ${ZLIB_STATIC_LIBRARY})
+
+  set (ZLIB_INCLUDE_DIR_GEN "${BINARY_DIR}")
+  set (ZLIB_INCLUDE_DIR "${SOURCE_DIR}")
+  set (ZLIB_FOUND 1)
+  set (ZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIR_GEN} ${ZLIB_INCLUDE_DIR})
+endmacro ()
+
+#-------------------------------------------------------------------------------
+macro (PACKAGE_ZLIB_LIBRARY compress_type)
+  add_custom_target (ZLIB-GenHeader-Copy ALL
+      COMMAND ${CMAKE_COMMAND} -E copy_if_different ${ZLIB_INCLUDE_DIR_GEN}/zconf.h ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/
+      COMMENT "Copying ${ZLIB_INCLUDE_DIR_GEN}/zconf.h to ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/"
+  )
+  set (EXTERNAL_HEADER_LIST ${EXTERNAL_HEADER_LIST} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/zconf.h)
+  if (${compress_type} MATCHES "GIT" OR ${compress_type} MATCHES "TGZ")
+    add_dependencies (ZLIB-GenHeader-Copy HDF5_ZLIB)
+  endif ()
+endmacro ()
diff --git a/config/cmake/HDFMacros.cmake b/config/cmake/HDFMacros.cmake
new file mode 100644
index 0000000..1af513b
--- /dev/null
+++ b/config/cmake/HDFMacros.cmake
@@ -0,0 +1,505 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
+
+#-------------------------------------------------------------------------------
+macro (SET_HDF_BUILD_TYPE)
+  get_property (_isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+  if (_isMultiConfig)
+    set (HDF_CFG_NAME ${CMAKE_BUILD_TYPE})
+    set (HDF_BUILD_TYPE ${CMAKE_CFG_INTDIR})
+    set (HDF_CFG_BUILD_TYPE \${CMAKE_INSTALL_CONFIG_NAME})
+  else ()
+    set (HDF_CFG_BUILD_TYPE ".")
+    if (CMAKE_BUILD_TYPE)
+      set (HDF_CFG_NAME ${CMAKE_BUILD_TYPE})
+      set (HDF_BUILD_TYPE ${CMAKE_BUILD_TYPE})
+    else ()
+      set (HDF_CFG_NAME "Release")
+      set (HDF_BUILD_TYPE "Release")
+    endif ()
+  endif ()
+  if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+    message (VERBOSE "Setting build type to 'RelWithDebInfo' as none was specified.")
+    set (CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Choose the type of build." FORCE)
+    # Set the possible values of build type for cmake-gui
+    set_property (CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release"
+      "MinSizeRel" "RelWithDebInfo" "Developer")
+  endif ()
+endmacro ()
+
+#-------------------------------------------------------------------------------
+macro (SET_GLOBAL_VARIABLE name value)
+  set (${name} ${value} CACHE INTERNAL "Used to pass variables between directories" FORCE)
+endmacro ()
+
+#-------------------------------------------------------------------------------
+macro (IDE_GENERATED_PROPERTIES SOURCE_PATH HEADERS SOURCES)
+  #set (source_group_path "Source/AIM/${NAME}")
+  string (REPLACE "/" "\\\\" source_group_path ${SOURCE_PATH})
+  source_group (${source_group_path} FILES ${HEADERS} ${SOURCES})
+
+  #-- The following is needed if we ever start to use OS X Frameworks but only
+  #--  works on CMake 2.6 and greater
+  #set_property (SOURCE ${HEADERS}
+  #       PROPERTY MACOSX_PACKAGE_LOCATION Headers/${NAME}
+  #)
+endmacro ()
+
+#-------------------------------------------------------------------------------
+macro (IDE_SOURCE_PROPERTIES SOURCE_PATH HEADERS SOURCES)
+  #  install (FILES ${HEADERS}
+  #       DESTINATION include/R3D/${NAME}
+  #       COMPONENT Headers
+  #  )
+
+  string (REPLACE "/" "\\\\" source_group_path ${SOURCE_PATH}  )
+  source_group (${source_group_path} FILES ${HEADERS} ${SOURCES})
+
+  #-- The following is needed if we ever start to use OS X Frameworks but only
+  #--  works on CMake 2.6 and greater
+  #set_property (SOURCE ${HEADERS}
+  #       PROPERTY MACOSX_PACKAGE_LOCATION Headers/${NAME}
+  #)
+endmacro ()
+
+#-------------------------------------------------------------------------------
+macro (INSTALL_TARGET_PDB libtarget targetdestination targetcomponent)
+  if (WIN32 AND MSVC AND NOT DISABLE_PDB_FILES)
+    get_target_property (target_type ${libtarget} TYPE)
+    if (${libtype} MATCHES "SHARED")
+      set (targetfilename $<TARGET_PDB_FILE:${libtarget}>)
+    else ()
+      get_property (target_name TARGET ${libtarget} PROPERTY $<IF:$<OR:$<CONFIG:Debug>,$<CONFIG:Developer>>,OUTPUT_NAME_DEBUG,OUTPUT_NAME_RELWITHDEBINFO>)
+      set (targetfilename $<TARGET_FILE_DIR:${libtarget}>/${target_name}.pdb)
+    endif ()
+    install (
+      FILES ${targetfilename}
+      DESTINATION ${targetdestination}
+      CONFIGURATIONS Debug RelWithDebInfo
+      COMPONENT ${targetcomponent}
+      OPTIONAL
+    )
+  endif ()
+endmacro ()
+
+#-------------------------------------------------------------------------------
+macro (INSTALL_PROGRAM_PDB progtarget targetdestination targetcomponent)
+  if (WIN32 AND MSVC)
+    install (
+      FILES $<TARGET_PDB_FILE:${progtarget}>
+      DESTINATION ${targetdestination}
+      CONFIGURATIONS Debug RelWithDebInfo
+      COMPONENT ${targetcomponent}
+      OPTIONAL
+    )
+  endif ()
+endmacro ()
+
+#-------------------------------------------------------------------------------
+macro (HDF_SET_LIB_OPTIONS libtarget libname libtype)
+  if (${libtype} MATCHES "SHARED")
+    set (LIB_RELEASE_NAME "${libname}")
+    set (LIB_DEBUG_NAME "${libname}${CMAKE_DEBUG_POSTFIX}")
+  else ()
+    if (WIN32 AND NOT MINGW)
+      set (LIB_RELEASE_NAME "lib${libname}")
+      set (LIB_DEBUG_NAME "lib${libname}${CMAKE_DEBUG_POSTFIX}")
+    else ()
+      set (LIB_RELEASE_NAME "${libname}")
+      set (LIB_DEBUG_NAME "${libname}${CMAKE_DEBUG_POSTFIX}")
+    endif ()
+  endif ()
+
+  set_target_properties (${libtarget} PROPERTIES
+      OUTPUT_NAME                ${LIB_RELEASE_NAME}
+#      OUTPUT_NAME_DEBUG          ${LIB_DEBUG_NAME}
+      OUTPUT_NAME_DEVELOPER      ${LIB_DEBUG_NAME}
+      OUTPUT_NAME_RELEASE        ${LIB_RELEASE_NAME}
+      OUTPUT_NAME_MINSIZEREL     ${LIB_RELEASE_NAME}
+      OUTPUT_NAME_RELWITHDEBINFO ${LIB_RELEASE_NAME}
+  )
+
+  if (${libtype} MATCHES "STATIC")
+    if (WIN32)
+      set_target_properties (${libtarget} PROPERTIES
+          COMPILE_PDB_NAME_DEBUG          ${LIB_DEBUG_NAME}
+          COMPILE_PDB_NAME_DEVELOPER      ${LIB_DEBUG_NAME}
+          COMPILE_PDB_NAME_RELEASE        ${LIB_RELEASE_NAME}
+          COMPILE_PDB_NAME_MINSIZEREL     ${LIB_RELEASE_NAME}
+          COMPILE_PDB_NAME_RELWITHDEBINFO ${LIB_RELEASE_NAME}
+          COMPILE_PDB_OUTPUT_DIRECTORY    "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}"
+      )
+    endif ()
+  endif ()
+
+  option (HDF5_MSVC_NAMING_CONVENTION "Use MSVC Naming conventions for Shared Libraries" OFF)
+  if (HDF5_MSVC_NAMING_CONVENTION AND MINGW AND ${libtype} MATCHES "SHARED")
+    set_target_properties (${libtarget} PROPERTIES
+        IMPORT_SUFFIX ".lib"
+        IMPORT_PREFIX ""
+        PREFIX ""
+    )
+  endif ()
+endmacro ()
+
+#-------------------------------------------------------------------------------
+macro (HDF_IMPORT_SET_LIB_OPTIONS libtarget libname libtype libversion)
+  HDF_SET_LIB_OPTIONS (${libtarget} ${libname} ${libtype})
+
+  if (${importtype} MATCHES "IMPORT")
+    set (importprefix "${CMAKE_STATIC_LIBRARY_PREFIX}")
+  endif ()
+  if (${HDF_CFG_NAME} MATCHES "Debug" OR ${HDF_CFG_NAME} MATCHES "Developer")
+    set (IMPORT_LIB_NAME ${LIB_DEBUG_NAME})
+  else ()
+    set (IMPORT_LIB_NAME ${LIB_RELEASE_NAME})
+  endif ()
+
+  if (${libtype} MATCHES "SHARED")
+    if (WIN32)
+      if (MINGW)
+        set_target_properties (${libtarget} PROPERTIES
+            IMPORTED_IMPLIB "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${IMPORT_LIB_NAME}.lib"
+            IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${IMPORT_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
+        )
+      else ()
+        set_target_properties (${libtarget} PROPERTIES
+            IMPORTED_IMPLIB "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${HDF_BUILD_TYPE}/${CMAKE_IMPORT_LIBRARY_PREFIX}${IMPORT_LIB_NAME}${CMAKE_IMPORT_LIBRARY_SUFFIX}"
+            IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${HDF_BUILD_TYPE}/${CMAKE_IMPORT_LIBRARY_PREFIX}${IMPORT_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
+        )
+      endif ()
+    else ()
+      if (MINGW)
+        set_target_properties (${libtarget} PROPERTIES
+            IMPORTED_IMPLIB "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${IMPORT_LIB_NAME}.lib"
+            IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${IMPORT_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
+        )
+      elseif (CYGWIN)
+        set_target_properties (${libtarget} PROPERTIES
+            IMPORTED_IMPLIB "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_IMPORT_LIBRARY_PREFIX}${IMPORT_LIB_NAME}${CMAKE_IMPORT_LIBRARY_SUFFIX}"
+            IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_IMPORT_LIBRARY_PREFIX}${IMPORT_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
+        )
+      else ()
+        set_target_properties (${libtarget} PROPERTIES
+            IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_SHARED_LIBRARY_PREFIX}${IMPORT_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
+            IMPORTED_SONAME "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_SHARED_LIBRARY_PREFIX}${IMPORT_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.${libversion}"
+            SOVERSION "${libversion}"
+        )
+      endif ()
+    endif ()
+  else ()
+    if (WIN32 AND NOT MINGW)
+      set_target_properties (${libtarget} PROPERTIES
+          IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${HDF_BUILD_TYPE}/${IMPORT_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}"
+          IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+      )
+    else ()
+      set_target_properties (${libtarget} PROPERTIES
+          IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_STATIC_LIBRARY_PREFIX}${IMPORT_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}"
+          IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+      )
+    endif ()
+  endif ()
+endmacro ()
+
+#-------------------------------------------------------------------------------
+macro (TARGET_C_PROPERTIES wintarget libtype)
+  target_compile_options(${wintarget} PRIVATE
+      $<$<C_COMPILER_ID:MSVC>:${WIN_COMPILE_FLAGS}>
+      $<$<CXX_COMPILER_ID:MSVC>:${WIN_COMPILE_FLAGS}>
+  )
+  if(MSVC)
+    set_property(TARGET ${wintarget} APPEND PROPERTY LINK_FLAGS "${WIN_LINK_FLAGS}")
+  endif()
+endmacro ()
+
+#-----------------------------------------------------------------------------
+# Configure the README.md file for the binary package
+#-----------------------------------------------------------------------------
+macro (HDF_README_PROPERTIES target_fortran)
+  set (BINARY_SYSTEM_NAME ${CMAKE_SYSTEM_NAME})
+  set (BINARY_PLATFORM "${CMAKE_SYSTEM_NAME}")
+  if (WIN32)
+    set (BINARY_EXAMPLE_ENDING "zip")
+    set (BINARY_INSTALL_ENDING "msi")
+    if (CMAKE_CL_64)
+      set (BINARY_SYSTEM_NAME "win64")
+    else ()
+      set (BINARY_SYSTEM_NAME "win32")
+    endif ()
+    if (${CMAKE_SYSTEM_VERSION} MATCHES "6.1")
+      set (BINARY_PLATFORM "${BINARY_PLATFORM} 7")
+    elseif (${CMAKE_SYSTEM_VERSION} MATCHES "6.2")
+      set (BINARY_PLATFORM "${BINARY_PLATFORM} 8")
+    elseif (${CMAKE_SYSTEM_VERSION} MATCHES "6.3")
+      set (BINARY_PLATFORM "${BINARY_PLATFORM} 10")
+    endif ()
+    if (CMAKE_C_COMPILER_ID MATCHES "Intel")
+      set (BINARY_PLATFORM "${BINARY_PLATFORM} Intel")
+      if (${CMAKE_C_COMPILER_VERSION} MATCHES "^17.*")
+        set (BINARY_PLATFORM "${BINARY_PLATFORM}, using Intel 17")
+      elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^18.*")
+        set (BINARY_PLATFORM "${BINARY_PLATFORM}, using Intel 18")
+      elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^19.*")
+        set (BINARY_PLATFORM "${BINARY_PLATFORM}, using Intel 19")
+      else ()
+        set (BINARY_PLATFORM "${BINARY_PLATFORM}, using Intel ${CMAKE_C_COMPILER_VERSION}")
+      endif ()
+    elseif (CMAKE_C_COMPILER_ID MATCHES "MSVC")
+      set (BINARY_PLATFORM "${BINARY_PLATFORM} ${MSVC_C_ARCHITECTURE_ID}")
+      if (${CMAKE_C_COMPILER_VERSION} MATCHES "^16.*")
+        set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2010")
+      elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^15.*")
+        set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2008")
+      elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^17.*")
+        set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2012")
+      elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^18.*")
+        set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2013")
+      elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^19.*")
+        if (${CMAKE_C_COMPILER_VERSION} MATCHES "^19.0.*")
+          set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2015")
+        elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^19.1.*")
+          set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2017")
+        elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^19.2.*")
+          set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2019")
+        elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^19.3.*")
+          set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2022")
+        else ()
+          set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO ???")
+        endif ()
+      else ()
+        set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO ${CMAKE_C_COMPILER_VERSION}")
+      endif ()
+    endif ()
+  elseif (APPLE)
+    set (BINARY_EXAMPLE_ENDING "tar.gz")
+    set (BINARY_INSTALL_ENDING "sh") # if packaging changes - use dmg
+    set (BINARY_PLATFORM "${BINARY_PLATFORM} ${CMAKE_SYSTEM_VERSION} ${CMAKE_SYSTEM_PROCESSOR}")
+    set (BINARY_PLATFORM "${BINARY_PLATFORM}, using ${CMAKE_C_COMPILER_ID} C ${CMAKE_C_COMPILER_VERSION}")
+  else ()
+    set (BINARY_EXAMPLE_ENDING "tar.gz")
+    set (BINARY_INSTALL_ENDING "sh")
+    set (BINARY_PLATFORM "${BINARY_PLATFORM} ${CMAKE_SYSTEM_VERSION} ${CMAKE_SYSTEM_PROCESSOR}")
+    set (BINARY_PLATFORM "${BINARY_PLATFORM}, using ${CMAKE_C_COMPILER_ID} C ${CMAKE_C_COMPILER_VERSION}")
+  endif ()
+
+  if (target_fortran)
+    set (BINARY_PLATFORM "${BINARY_PLATFORM} / ${CMAKE_Fortran_COMPILER_ID} Fortran")
+  endif ()
+
+  if (ONLY_SHARED_LIBS)
+    set (LIB_TYPE "Shared")
+  elseif (BUILD_SHARED_LIBS)
+    set (LIB_TYPE "Static and Shared")
+  else ()
+    set (LIB_TYPE "Static")
+  endif ()
+
+  configure_file (
+      ${HDF_RESOURCES_DIR}/README.md.cmake.in
+      ${CMAKE_BINARY_DIR}/README.md @ONLY
+  )
+endmacro ()
+
+macro (HDFTEST_COPY_FILE src dest target)
+    add_custom_command(
+        OUTPUT  "${dest}"
+        COMMAND "${CMAKE_COMMAND}"
+        ARGS     -E copy_if_different "${src}" "${dest}"
+        DEPENDS "${src}"
+    )
+    list (APPEND ${target}_list "${dest}")
+endmacro ()
+
+macro (HDF_DIR_PATHS package_prefix)
+  option (HDF5_USE_GNU_DIRS "TRUE to use GNU Coding Standard install directory variables, FALSE to use historical settings" FALSE)
+  if (HDF5_USE_GNU_DIRS)
+    include(GNUInstallDirs)
+    if (NOT ${package_prefix}_INSTALL_BIN_DIR)
+      set (${package_prefix}_INSTALL_BIN_DIR ${CMAKE_INSTALL_BINDIR})
+    endif ()
+    if (NOT ${package_prefix}_INSTALL_LIB_DIR)
+      set (${package_prefix}_INSTALL_LIB_DIR ${CMAKE_INSTALL_LIBDIR})
+    endif ()
+    if (NOT ${package_prefix}_INSTALL_JAR_DIR)
+      set (${package_prefix}_INSTALL_JAR_DIR ${CMAKE_INSTALL_LIBDIR})
+    endif ()
+    if (NOT ${package_prefix}_INSTALL_INCLUDE_DIR)
+      set (${package_prefix}_INSTALL_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR})
+    endif ()
+    if (NOT ${package_prefix}_INSTALL_MODULE_DIR)
+      set (${package_prefix}_INSTALL_MODULE_DIR ${CMAKE_INSTALL_INCLUDEDIR}/mod)
+    endif ()
+    if (NOT ${package_prefix}_INSTALL_DATA_DIR)
+      set (${package_prefix}_INSTALL_DATA_DIR ${CMAKE_INSTALL_DATADIR})
+    endif ()
+    if (NOT ${package_prefix}_INSTALL_CMAKE_DIR)
+      set (${package_prefix}_INSTALL_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake)
+    endif ()
+    if (NOT ${package_prefix}_INSTALL_DOC_DIR)
+      set (${package_prefix}_INSTALL_DOC_DIR ${CMAKE_INSTALL_DOCDIR})
+    endif ()
+    message(STATUS "GNU: ${${package_prefix}_INSTALL_DOC_DIR}")
+  endif ()
+
+  if (APPLE)
+    option (${package_prefix}_BUILD_FRAMEWORKS "TRUE to build as frameworks libraries, FALSE to build according to BUILD_SHARED_LIBS" FALSE)
+  endif ()
+
+  if (NOT ${package_prefix}_INSTALL_BIN_DIR)
+    set (${package_prefix}_INSTALL_BIN_DIR bin)
+  endif ()
+  if (NOT ${package_prefix}_INSTALL_LIB_DIR)
+    if (APPLE)
+      if (${package_prefix}_BUILD_FRAMEWORKS)
+        set (${package_prefix}_INSTALL_JAR_DIR ../Java)
+      else ()
+        set (${package_prefix}_INSTALL_JAR_DIR lib)
+      endif ()
+      set (${package_prefix}_INSTALL_FMWK_DIR ${CMAKE_INSTALL_FRAMEWORK_PREFIX})
+    else ()
+      set (${package_prefix}_INSTALL_JAR_DIR lib)
+    endif ()
+    set (${package_prefix}_INSTALL_LIB_DIR lib)
+  endif ()
+  if (NOT ${package_prefix}_INSTALL_INCLUDE_DIR)
+    set (${package_prefix}_INSTALL_INCLUDE_DIR include)
+  endif ()
+  if (NOT ${package_prefix}_INSTALL_MODULE_DIR)
+    set (${package_prefix}_INSTALL_MODULE_DIR mod)
+  endif ()
+  if (NOT ${package_prefix}_INSTALL_DATA_DIR)
+    if (NOT MSVC)
+      if (APPLE)
+        if (${package_prefix}_BUILD_FRAMEWORKS)
+          set (${package_prefix}_INSTALL_EXTRA_DIR ../SharedSupport)
+        else ()
+          set (${package_prefix}_INSTALL_EXTRA_DIR share)
+        endif ()
+        set (${package_prefix}_INSTALL_FWRK_DIR ${CMAKE_INSTALL_FRAMEWORK_PREFIX})
+      endif ()
+      set (${package_prefix}_INSTALL_DATA_DIR share)
+    else ()
+      set (${package_prefix}_INSTALL_DATA_DIR ".")
+    endif ()
+  endif ()
+  if (NOT ${package_prefix}_INSTALL_CMAKE_DIR)
+    set (${package_prefix}_INSTALL_CMAKE_DIR cmake)
+  endif ()
+  if (NOT ${package_prefix}_INSTALL_DOC_DIR)
+    set (${package_prefix}_INSTALL_DOC_DIR ${${package_prefix}_INSTALL_DATA_DIR})
+  endif ()
+  message(STATUS "Final: ${${package_prefix}_INSTALL_DOC_DIR}")
+
+  # Always use full RPATH, i.e. don't skip the full RPATH for the build tree
+  set (CMAKE_SKIP_BUILD_RPATH  FALSE)
+  # when building, don't use the install RPATH already
+  # (but later on when installing)
+  set (CMAKE_INSTALL_RPATH_USE_LINK_PATH  FALSE)
+  # add the automatically determined parts of the RPATH
+  # which point to directories outside the build tree to the install RPATH
+  set (CMAKE_BUILD_WITH_INSTALL_RPATH ON)
+  if (APPLE)
+    set (CMAKE_INSTALL_NAME_DIR "@rpath")
+    set (CMAKE_INSTALL_RPATH
+        "@executable_path/../${${package_prefix}_INSTALL_LIB_DIR}"
+        "@executable_path/"
+        "@loader_path/../${${package_prefix}_INSTALL_LIB_DIR}"
+        "@loader_path/"
+    )
+  else ()
+    set (CMAKE_INSTALL_RPATH "\$ORIGIN/../${${package_prefix}_INSTALL_LIB_DIR}:\$ORIGIN/")
+  endif ()
+
+  if (DEFINED ADDITIONAL_CMAKE_PREFIX_PATH AND EXISTS "${ADDITIONAL_CMAKE_PREFIX_PATH}")
+    set (CMAKE_PREFIX_PATH ${ADDITIONAL_CMAKE_PREFIX_PATH} ${CMAKE_PREFIX_PATH})
+  endif ()
+
+  #set the default debug suffix for all library targets
+  if(NOT CMAKE_DEBUG_POSTFIX)
+    if (WIN32)
+      set (CMAKE_DEBUG_POSTFIX "_D")
+    else ()
+      set (CMAKE_DEBUG_POSTFIX "_debug")
+    endif ()
+  endif ()
+
+  SET_HDF_BUILD_TYPE()
+
+#-----------------------------------------------------------------------------
+# Setup output Directories
+#-----------------------------------------------------------------------------
+  if (NOT ${package_prefix}_EXTERNALLY_CONFIGURED)
+    set (CMAKE_RUNTIME_OUTPUT_DIRECTORY
+        ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Executables."
+    )
+    set (CMAKE_LIBRARY_OUTPUT_DIRECTORY
+        ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Libraries"
+    )
+    set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY
+        ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all static libraries."
+    )
+    set (CMAKE_Fortran_MODULE_DIRECTORY
+        ${PROJECT_BINARY_DIR}/mod CACHE PATH "Single Directory for all fortran modules."
+    )
+    get_property(_isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+    if(_isMultiConfig)
+      set (CMAKE_TEST_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE})
+      set (CMAKE_PDB_OUTPUT_DIRECTORY
+          ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all pdb files."
+      )
+    else ()
+      set (CMAKE_TEST_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+    endif ()
+  else ()
+    # if we are externally configured, but the project uses old cmake scripts
+    # this may not be set and utilities like H5detect will fail
+    if (NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
+      set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
+    endif ()
+  endif ()
+
+  if (NOT ${package_prefix}_EXTERNALLY_CONFIGURED AND CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+    if (CMAKE_HOST_UNIX)
+      set (CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/HDF_Group/${HDF5_PACKAGE_NAME}/${HDF5_PACKAGE_VERSION}"
+        CACHE PATH "Install path prefix, prepended onto install directories." FORCE)
+    else ()
+      GetDefaultWindowsPrefixBase(CMAKE_GENERIC_PROGRAM_FILES)
+      set (CMAKE_INSTALL_PREFIX
+        "${CMAKE_GENERIC_PROGRAM_FILES}/HDF_Group/${HDF5_PACKAGE_NAME}/${HDF5_PACKAGE_VERSION}"
+        CACHE PATH "Install path prefix, prepended onto install directories." FORCE)
+      set (CMAKE_GENERIC_PROGRAM_FILES)
+    endif ()
+  endif ()
+endmacro ()
+
+macro (ADD_H5_FLAGS h5_flag_var infile)
+  file (STRINGS ${infile} TEST_FLAG_STREAM)
+  #message (TRACE "TEST_FLAG_STREAM=${TEST_FLAG_STREAM}")
+  list (LENGTH TEST_FLAG_STREAM len_flag)
+  if (len_flag GREATER 0)
+    math (EXPR _FP_LEN "${len_flag} - 1")
+    foreach (line RANGE 0 ${_FP_LEN})
+      list (GET TEST_FLAG_STREAM ${line} str_flag)
+      string (REGEX REPLACE "^#.*" "" str_flag "${str_flag}")
+      #message (TRACE "str_flag=${str_flag}")
+      if (NOT HDF5_ENABLE_WARNINGS_AS_ERRORS)
+        string (REGEX REPLACE "-Werror=" "-W" str_flag "${str_flag}")
+      endif ()
+      if (str_flag)
+        list (APPEND ${h5_flag_var} "${str_flag}")
+      endif ()
+    endforeach ()
+  endif ()
+  #message (TRACE "h5_flag_var=${${h5_flag_var}}")
+endmacro ()
+
diff --git a/config/cmake/HDFTests.c b/config/cmake/HDFTests.c
new file mode 100644
index 0000000..96460d7
--- /dev/null
+++ b/config/cmake/HDFTests.c
@@ -0,0 +1,217 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+
+/* A simple test program to see if a function "works" */
+#define SIMPLE_TEST(x) int main(){ x; return 0; }
+
+
+#ifdef HAVE_ATTRIBUTE
+
+int
+main ()
+{
+    int __attribute__((unused)) x;
+
+    return 0;
+}
+
+#endif /* HAVE_ATTRIBUTE */
+
+#ifdef HAVE_TIMEZONE
+
+#ifdef HAVE_SYS_TIME_H
+#   include <sys/time.h>
+#endif
+#include <time.h>
+SIMPLE_TEST(timezone = 0);
+
+#endif /* HAVE_TIMEZONE */
+
+#ifdef SYSTEM_SCOPE_THREADS
+#include <stdlib.h>
+#include <pthread.h>
+
+int main(void)
+{
+    pthread_attr_t attribute;
+    int ret;
+
+    pthread_attr_init(&attribute);
+    ret = pthread_attr_setscope(&attribute, PTHREAD_SCOPE_SYSTEM);
+    if (ret == 0)
+        return 0;
+    return 1;
+}
+
+#endif /* SYSTEM_SCOPE_THREADS */
+
+#ifdef HAVE_SOCKLEN_T
+
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef HAVE_UNISTD_H
+#   include <unistd.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#   include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#   include <sys/socket.h>
+#endif
+
+SIMPLE_TEST(socklen_t foo);
+
+#endif /* HAVE_SOCKLEN_T */
+
+#ifdef DEV_T_IS_SCALAR
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+int main ()
+{
+    dev_t d1, d2;
+    if (d1 == d2)
+        return 0;
+    return 1;
+}
+
+#endif /* DEV_T_IS_SCALAR */
+
+#ifdef HAVE_OFF64_T
+
+#include <sys/types.h>
+
+int main()
+{
+    off64_t n = 0;
+    return (int)n;
+}
+#endif
+
+#ifdef TEST_DIRECT_VFD_WORKS
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+int main(void)
+{
+    int fid;
+
+    if ((fid = open("tst_file", O_CREAT | O_TRUNC | O_DIRECT, 0755)) < 0)
+        return 1;
+    close(fid);
+    remove("tst_file");
+
+    return 0;
+}
+#endif
+
+#ifdef HAVE_DIRECT
+       SIMPLE_TEST(posix_memalign());
+#endif
+
+#ifdef HAVE_DEFAULT_SOURCE
+/* Check default source */
+#include <features.h>
+
+int
+main(void)
+{
+#ifdef __GLIBC_PREREQ
+    return __GLIBC_PREREQ(2,19);
+#else
+    return 0;
+#endif
+}
+#endif
+
+#ifdef TEST_LFS_WORKS
+
+/* Return 0 when LFS is available and 1 otherwise.  */
+
+#define _LARGEFILE_SOURCE
+#define _LARGEFILE64_SOURCE
+#define _LARGE_FILES
+#define _FILE_OFFSET_BITS 64
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <assert.h>
+#include <stdio.h>
+
+#define OFF_T_64 (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+
+int main(int argc, char **argv)
+{
+
+    /* Check that off_t can hold 2^63 - 1 and perform basic operations... */
+    if (OFF_T_64 % 2147483647 != 1)
+        return 1;
+
+    /* stat breaks on SCO OpenServer */
+    struct stat buf;
+    stat(argv[0], &buf);
+    if (!S_ISREG(buf.st_mode))
+        return 2;
+
+    FILE *file = fopen(argv[0], "r");
+    off_t offset = ftello(file);
+    fseek(file, offset, SEEK_CUR);
+    fclose(file);
+    return 0;
+}
+#endif
+
+#ifdef GETTIMEOFDAY_GIVES_TZ
+#include <time.h>
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+int main(void)
+{
+    struct timeval tv;
+    struct timezone tz;
+
+    tz.tz_minuteswest = 7777;  /* Initialize to an unreasonable number */
+    tz.tz_dsttime = 7;
+
+    gettimeofday(&tv, &tz);
+
+    /* Check whether the function returned any value at all */
+    if (tz.tz_minuteswest == 7777 && tz.tz_dsttime == 7)
+        return 1;
+    else
+        return 0;
+}
+#endif
+
+#ifdef HAVE_IOEO
+
+#include <windows.h>
+typedef void (WINAPI *PGNSI)(LPSYSTEM_INFO);
+int main ()
+{
+    PGNSI pGNSI;
+
+    pGNSI = (PGNSI) GetProcAddress(GetModuleHandle(TEXT("kernel32.dll")), "InitOnceExecuteOnce");
+
+    if (NULL == pGNSI)
+        return 1;
+    else
+        return 0;
+}
+
+#endif /* HAVE_IOEO */
diff --git a/config/cmake/HDFUseFortran.cmake b/config/cmake/HDFUseFortran.cmake
new file mode 100644
index 0000000..61adffd
--- /dev/null
+++ b/config/cmake/HDFUseFortran.cmake
@@ -0,0 +1,138 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
+#
+# This file provides functions for Fortran support.
+#
+#-------------------------------------------------------------------------------
+enable_language (Fortran)
+set (HDF_PREFIX "H5")
+
+include (CheckFortranSourceRuns)
+include (CheckFortranSourceCompiles)
+
+#-------------------------------------------------------------------------------
+#  Fix Fortran flags if we are compiling statically on Windows using
+#  Windows_MT.cmake from config/cmake/UserMacros
+#-------------------------------------------------------------------------------
+if (BUILD_STATIC_CRT_LIBS)
+  TARGET_STATIC_CRT_FLAGS ()
+endif ()
+
+#-----------------------------------------------------------------------------
+# Detect name mangling convention used between Fortran and C
+#-----------------------------------------------------------------------------
+include (FortranCInterface)
+FortranCInterface_HEADER (
+    ${CMAKE_BINARY_DIR}/FCMangle.h
+    MACRO_NAMESPACE "H5_FC_"
+    SYMBOL_NAMESPACE "H5_FC_"
+)
+
+file (STRINGS ${CMAKE_BINARY_DIR}/FCMangle.h CONTENTS REGEX "H5_FC_GLOBAL\\(.*,.*\\) +(.*)")
+string (REGEX MATCH "H5_FC_GLOBAL\\(.*,.*\\) +(.*)" RESULT ${CONTENTS})
+set (H5_FC_FUNC "H5_FC_FUNC(name,NAME) ${CMAKE_MATCH_1}")
+
+file (STRINGS ${CMAKE_BINARY_DIR}/FCMangle.h CONTENTS REGEX "H5_FC_GLOBAL_\\(.*,.*\\) +(.*)")
+string (REGEX MATCH "H5_FC_GLOBAL_\\(.*,.*\\) +(.*)" RESULT ${CONTENTS})
+set (H5_FC_FUNC_ "H5_FC_FUNC_(name,NAME) ${CMAKE_MATCH_1}")
+
+#test code source
+set (SIZEOF_CODE
+  "
+       PROGRAM main
+       i = sizeof(x)
+       END PROGRAM
+  "
+)
+set (C_SIZEOF_CODE
+  "
+       PROGRAM main
+         USE ISO_C_BINDING
+         INTEGER(C_INT) :: a
+         INTEGER(C_SIZE_T) :: result
+         result = c_sizeof(a)
+       END PROGRAM
+  "
+)
+set (STORAGE_SIZE_CODE
+  "
+       PROGRAM main
+         INTEGER :: a
+         INTEGER :: result
+         result = storage_size(a)
+       END PROGRAM
+  "
+)
+set (ISO_FORTRAN_ENV_CODE
+  "
+       PROGRAM main
+         USE, INTRINSIC :: ISO_FORTRAN_ENV
+       END PROGRAM
+  "
+)
+set (REALISNOTDOUBLE_CODE
+  "
+       MODULE type_mod
+         INTERFACE h5t
+           MODULE PROCEDURE h5t_real
+           MODULE PROCEDURE h5t_dble
+         END INTERFACE
+       CONTAINS
+         SUBROUTINE h5t_real(r)
+           REAL :: r
+         END SUBROUTINE h5t_real
+         SUBROUTINE h5t_dble(d)
+           DOUBLE PRECISION :: d
+         END SUBROUTINE h5t_dble
+       END MODULE type_mod
+       PROGRAM main
+         USE type_mod
+         REAL :: r
+         DOUBLE PRECISION :: d
+         CALL h5t(r)
+         CALL h5t(d)
+       END PROGRAM main
+  "
+)
+set (ISO_C_BINDING_CODE
+  "
+       PROGRAM main
+            USE iso_c_binding
+            IMPLICIT NONE
+            TYPE(C_PTR) :: ptr
+            TYPE(C_FUNPTR) :: funptr
+            INTEGER(C_INT64_T) :: c_int64_type
+            CHARACTER(LEN=80, KIND=c_char), TARGET :: ichr
+            ptr = C_LOC(ichr(1:1))
+       END PROGRAM
+  "
+)
+
+if (HDF5_REQUIRED_LIBRARIES)
+  set (CMAKE_REQUIRED_LIBRARIES "${HDF5_REQUIRED_LIBRARIES}")
+endif ()
+check_fortran_source_compiles (${SIZEOF_CODE} ${HDF_PREFIX}_FORTRAN_HAVE_SIZEOF SRC_EXT f90)
+check_fortran_source_compiles (${C_SIZEOF_CODE} ${HDF_PREFIX}_FORTRAN_HAVE_C_SIZEOF SRC_EXT f90)
+check_fortran_source_compiles (${STORAGE_SIZE_CODE} ${HDF_PREFIX}_FORTRAN_HAVE_STORAGE_SIZE SRC_EXT f90)
+check_fortran_source_compiles (${ISO_FORTRAN_ENV_CODE} ${HDF_PREFIX}_HAVE_ISO_FORTRAN_ENV SRC_EXT f90)
+check_fortran_source_compiles (${REALISNOTDOUBLE_CODE} ${HDF_PREFIX}_FORTRAN_DEFAULT_REAL_NOT_DOUBLE SRC_EXT f90)
+check_fortran_source_compiles (${ISO_C_BINDING_CODE} ${HDF_PREFIX}_FORTRAN_HAVE_ISO_C_BINDING SRC_EXT f90)
+
+#-----------------------------------------------------------------------------
+# Add debug information (intel Fortran : JB)
+#-----------------------------------------------------------------------------
+if (CMAKE_Fortran_COMPILER MATCHES ifort)
+    if (WIN32 AND NOT MINGW)
+        set (CMAKE_Fortran_FLAGS_DEBUG "/debug:full /dbglibs " CACHE STRING "flags" FORCE)
+        set (CMAKE_EXE_LINKER_FLAGS_DEBUG "/DEBUG" CACHE STRING "flags" FORCE)
+    endif ()
+endif ()
diff --git a/config/cmake/NSIS.InstallOptions.ini.in b/config/cmake/NSIS.InstallOptions.ini.in
new file mode 100644
index 0000000..9954f28
--- /dev/null
+++ b/config/cmake/NSIS.InstallOptions.ini.in
@@ -0,0 +1,37 @@
+[Settings]
+NumFields=5
+
+[Field 1]
+Type=label
+Text=By default the @CPACK_PACKAGE_NAME@ bin directory is added to the system PATH. This allows shared library (dll) discovery (if installed) and running HDF5 tools from the command line.
+Left=0
+Right=-1
+Top=0
+Bottom=20
+
+[Field 2]
+Type=radiobutton
+Text=Do not add @CPACK_PACKAGE_NAME@ to the system PATH
+Left=0
+Right=-1
+Top=30
+Bottom=40
+State=0
+
+[Field 3]
+Type=radiobutton
+Text=Add @CPACK_PACKAGE_NAME@ to the system PATH for all users
+Left=0
+Right=-1
+Top=40
+Bottom=50
+State=1
+
+[Field 4]
+Type=radiobutton
+Text=Add @CPACK_PACKAGE_NAME@ to the system PATH for current user
+Left=0
+Right=-1
+Top=50
+Bottom=60
+State=0
diff --git a/config/cmake/NSIS.template.in b/config/cmake/NSIS.template.in
new file mode 100644
index 0000000..db79466
--- /dev/null
+++ b/config/cmake/NSIS.template.in
@@ -0,0 +1,974 @@
+; CPack install script designed for a nmake build
+
+;--------------------------------
+; You must define these values
+
+  !define VERSION "@CPACK_PACKAGE_VERSION@"
+  !define PATCH  "@CPACK_PACKAGE_VERSION_PATCH@"
+  !define INST_DIR "@CPACK_TEMPORARY_DIRECTORY@"
+
+;--------------------------------
+;Variables
+
+  Var MUI_TEMP
+  Var STARTMENU_FOLDER
+  Var SV_ALLUSERS
+  Var START_MENU
+  Var DO_NOT_ADD_TO_PATH
+  Var ADD_TO_PATH_ALL_USERS
+  Var ADD_TO_PATH_CURRENT_USER
+  Var INSTALL_DESKTOP
+  Var IS_DEFAULT_INSTALLDIR
+;--------------------------------
+;Include Modern UI
+
+  !include "MUI.nsh"
+
+  ;Default installation folder
+  InstallDir "@CPACK_NSIS_INSTALL_ROOT@\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
+
+;--------------------------------
+;General
+
+  ;Name and file
+  Name "@CPACK_NSIS_PACKAGE_NAME@"
+  OutFile "@CPACK_TOPLEVEL_DIRECTORY@/@CPACK_OUTPUT_FILE_NAME@"
+
+  ;Set compression
+  SetCompressor @CPACK_NSIS_COMPRESSOR@
+
+@CPACK_NSIS_DEFINES@
+
+  !include Sections.nsh
+
+;--- Component support macros: ---
+; The code for the add/remove functionality is from:
+;   http://nsis.sourceforge.net/Add/Remove_Functionality
+; It has been modified slightly and extended to provide
+; inter-component dependencies.
+Var AR_SecFlags
+Var AR_RegFlags
+@CPACK_NSIS_SECTION_SELECTED_VARS@
+
+; Loads the "selected" flag for the section named SecName into the
+; variable VarName.
+!macro LoadSectionSelectedIntoVar SecName VarName
+ SectionGetFlags ${${SecName}} $${VarName}
+ IntOp $${VarName} $${VarName} & ${SF_SELECTED}  ;Turn off all other bits
+!macroend
+
+; Loads the value of a variable... can we get around this?
+!macro LoadVar VarName
+  IntOp $R0 0 + $${VarName}
+!macroend
+
+; Sets the value of a variable
+!macro StoreVar VarName IntValue
+  IntOp $${VarName} 0 + ${IntValue}
+!macroend
+
+!macro InitSection SecName
+  ;  This macro reads component installed flag from the registry and
+  ;changes checked state of the section on the components page.
+  ;Input: section index constant name specified in Section command.
+
+  ClearErrors
+  ;Reading component status from registry
+  ReadRegDWORD $AR_RegFlags HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@\Components\${SecName}" "Installed"
+  IfErrors "default_${SecName}"
+    ;Status will stay default if registry value not found
+    ;(component was never installed)
+  IntOp $AR_RegFlags $AR_RegFlags & ${SF_SELECTED} ;Turn off all other bits
+  SectionGetFlags ${${SecName}} $AR_SecFlags  ;Reading default section flags
+  IntOp $AR_SecFlags $AR_SecFlags & 0xFFFE  ;Turn lowest (enabled) bit off
+  IntOp $AR_SecFlags $AR_RegFlags | $AR_SecFlags      ;Change lowest bit
+
+  ; Note whether this component was installed before
+  !insertmacro StoreVar ${SecName}_was_installed $AR_RegFlags
+  IntOp $R0 $AR_RegFlags & $AR_RegFlags
+
+  ;Writing modified flags
+  SectionSetFlags ${${SecName}} $AR_SecFlags
+
+ "default_${SecName}:"
+ !insertmacro LoadSectionSelectedIntoVar ${SecName} ${SecName}_selected
+!macroend
+
+!macro FinishSection SecName
+  ;  This macro reads section flag set by user and removes the section
+  ;if it is not selected.
+  ;Then it writes component installed flag to registry
+  ;Input: section index constant name specified in Section command.
+
+  SectionGetFlags ${${SecName}} $AR_SecFlags  ;Reading section flags
+  ;Checking lowest bit:
+  IntOp $AR_SecFlags $AR_SecFlags & ${SF_SELECTED}
+  IntCmp $AR_SecFlags 1 "leave_${SecName}"
+    ;Section is not selected:
+    ;Calling Section uninstall macro and writing zero installed flag
+    !insertmacro "Remove_${${SecName}}"
+    WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@\Components\${SecName}" \
+  "Installed" 0
+    Goto "exit_${SecName}"
+
+ "leave_${SecName}:"
+    ;Section is selected:
+    WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@\Components\${SecName}" \
+  "Installed" 1
+
+ "exit_${SecName}:"
+!macroend
+
+!macro RemoveSection_CPack SecName
+  ;  This macro is used to call section's Remove_... macro
+  ;from the uninstaller.
+  ;Input: section index constant name specified in Section command.
+
+  !insertmacro "Remove_${${SecName}}"
+!macroend
+
+; Determine whether the selection of SecName changed
+!macro MaybeSelectionChanged SecName
+  !insertmacro LoadVar ${SecName}_selected
+  SectionGetFlags ${${SecName}} $R1
+  IntOp $R1 $R1 & ${SF_SELECTED} ;Turn off all other bits
+
+  ; See if the status has changed:
+  IntCmp $R0 $R1 "${SecName}_unchanged"
+  !insertmacro LoadSectionSelectedIntoVar ${SecName} ${SecName}_selected
+
+  IntCmp $R1 ${SF_SELECTED} "${SecName}_was_selected"
+  !insertmacro "Deselect_required_by_${SecName}"
+  goto "${SecName}_unchanged"
+
+  "${SecName}_was_selected:"
+  !insertmacro "Select_${SecName}_depends"
+
+  "${SecName}_unchanged:"
+!macroend
+;--- End of Add/Remove macros ---
+
+;--------------------------------
+;Interface Settings
+
+  !define MUI_HEADERIMAGE
+  !define MUI_ABORTWARNING
+
+;--------------------------------
+; path functions
+
+!verbose 3
+!include "WinMessages.NSH"
+!verbose 4
+
+;----------------------------------------
+; based upon a script of "Written by KiCHiK 2003-01-18 05:57:02"
+;----------------------------------------
+!verbose 3
+!include "WinMessages.NSH"
+!verbose 4
+;====================================================
+; get_NT_environment
+;     Returns: the selected environment
+;     Output : head of the stack
+;====================================================
+!macro select_NT_profile UN
+Function ${UN}select_NT_profile
+   StrCmp $ADD_TO_PATH_ALL_USERS "1" 0 environment_single
+      DetailPrint "Selected environment for all users"
+      Push "all"
+      Return
+   environment_single:
+      DetailPrint "Selected environment for current user only."
+      Push "current"
+      Return
+FunctionEnd
+!macroend
+!insertmacro select_NT_profile ""
+!insertmacro select_NT_profile "un."
+;----------------------------------------------------
+!define NT_current_env 'HKCU "Environment"'
+!define NT_all_env     'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'
+
+!ifndef WriteEnvStr_RegKey
+  !ifdef ALL_USERS
+    !define WriteEnvStr_RegKey \
+       'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'
+  !else
+    !define WriteEnvStr_RegKey 'HKCU "Environment"'
+  !endif
+!endif
+
+; AddToPath - Adds the given dir to the search path.
+;        Input - head of the stack
+;        Note - Win9x systems requires reboot
+
+Function AddToPath
+  Exch $0
+  Push $1
+  Push $2
+  Push $3
+
+  # don't add if the path doesn't exist
+  IfFileExists "$0\*.*" "" AddToPath_done
+
+  ReadEnvStr $1 PATH
+  ; if the path is too long for a NSIS variable NSIS will return a 0
+  ; length string.  If we find that, then warn and skip any path
+  ; modification as it will trash the existing path.
+  StrLen $2 $1
+  IntCmp $2 0 CheckPathLength_ShowPathWarning CheckPathLength_Done CheckPathLength_Done
+    CheckPathLength_ShowPathWarning:
+    Messagebox MB_OK|MB_ICONEXCLAMATION "Warning! PATH too long installer unable to modify PATH!"
+    Goto AddToPath_done
+  CheckPathLength_Done:
+  Push "$1;"
+  Push "$0;"
+  Call StrStr
+  Pop $2
+  StrCmp $2 "" "" AddToPath_done
+  Push "$1;"
+  Push "$0\;"
+  Call StrStr
+  Pop $2
+  StrCmp $2 "" "" AddToPath_done
+  GetFullPathName /SHORT $3 $0
+  Push "$1;"
+  Push "$3;"
+  Call StrStr
+  Pop $2
+  StrCmp $2 "" "" AddToPath_done
+  Push "$1;"
+  Push "$3\;"
+  Call StrStr
+  Pop $2
+  StrCmp $2 "" "" AddToPath_done
+
+  Call IsNT
+  Pop $1
+  StrCmp $1 1 AddToPath_NT
+    ; Not on NT
+    StrCpy $1 $WINDIR 2
+    FileOpen $1 "$1\autoexec.bat" a
+    FileSeek $1 -1 END
+    FileReadByte $1 $2
+    IntCmp $2 26 0 +2 +2 # DOS EOF
+      FileSeek $1 -1 END # write over EOF
+    FileWrite $1 "$\r$\nSET PATH=%PATH%;$3$\r$\n"
+    FileClose $1
+    SetRebootFlag true
+    Goto AddToPath_done
+
+  AddToPath_NT:
+    StrCmp $ADD_TO_PATH_ALL_USERS "1" ReadAllKey
+      ReadRegStr $1 ${NT_current_env} "PATH"
+      Goto DoTrim
+    ReadAllKey:
+      ReadRegStr $1 ${NT_all_env} "PATH"
+    DoTrim:
+    StrCmp $1 "" AddToPath_NTdoIt
+      Push $1
+      Call Trim
+      Pop $1
+      StrCpy $0 "$1;$0"
+    AddToPath_NTdoIt:
+      StrCmp $ADD_TO_PATH_ALL_USERS "1" WriteAllKey
+        WriteRegExpandStr ${NT_current_env} "PATH" $0
+        Goto DoSend
+      WriteAllKey:
+        WriteRegExpandStr ${NT_all_env} "PATH" $0
+      DoSend:
+      SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
+
+  AddToPath_done:
+    Pop $3
+    Pop $2
+    Pop $1
+    Pop $0
+FunctionEnd
+
+
+; RemoveFromPath - Remove a given dir from the path
+;     Input: head of the stack
+
+Function un.RemoveFromPath
+  Exch $0
+  Push $1
+  Push $2
+  Push $3
+  Push $4
+  Push $5
+  Push $6
+
+  IntFmt $6 "%c" 26 # DOS EOF
+
+  Call un.IsNT
+  Pop $1
+  StrCmp $1 1 unRemoveFromPath_NT
+    ; Not on NT
+    StrCpy $1 $WINDIR 2
+    FileOpen $1 "$1\autoexec.bat" r
+    GetTempFileName $4
+    FileOpen $2 $4 w
+    GetFullPathName /SHORT $0 $0
+    StrCpy $0 "SET PATH=%PATH%;$0"
+    Goto unRemoveFromPath_dosLoop
+
+    unRemoveFromPath_dosLoop:
+      FileRead $1 $3
+      StrCpy $5 $3 1 -1 # read last char
+      StrCmp $5 $6 0 +2 # if DOS EOF
+        StrCpy $3 $3 -1 # remove DOS EOF so we can compare
+      StrCmp $3 "$0$\r$\n" unRemoveFromPath_dosLoopRemoveLine
+      StrCmp $3 "$0$\n" unRemoveFromPath_dosLoopRemoveLine
+      StrCmp $3 "$0" unRemoveFromPath_dosLoopRemoveLine
+      StrCmp $3 "" unRemoveFromPath_dosLoopEnd
+      FileWrite $2 $3
+      Goto unRemoveFromPath_dosLoop
+      unRemoveFromPath_dosLoopRemoveLine:
+        SetRebootFlag true
+        Goto unRemoveFromPath_dosLoop
+
+    unRemoveFromPath_dosLoopEnd:
+      FileClose $2
+      FileClose $1
+      StrCpy $1 $WINDIR 2
+      Delete "$1\autoexec.bat"
+      CopyFiles /SILENT $4 "$1\autoexec.bat"
+      Delete $4
+      Goto unRemoveFromPath_done
+
+  unRemoveFromPath_NT:
+    StrCmp $ADD_TO_PATH_ALL_USERS "1" unReadAllKey
+      ReadRegStr $1 ${NT_current_env} "PATH"
+      Goto unDoTrim
+    unReadAllKey:
+      ReadRegStr $1 ${NT_all_env} "PATH"
+    unDoTrim:
+    StrCpy $5 $1 1 -1 # copy last char
+    StrCmp $5 ";" +2 # if last char != ;
+      StrCpy $1 "$1;" # append ;
+    Push $1
+    Push "$0;"
+    Call un.StrStr ; Find `$0;` in $1
+    Pop $2 ; pos of our dir
+    StrCmp $2 "" unRemoveFromPath_done
+      ; else, it is in path
+      # $0 - path to add
+      # $1 - path var
+      StrLen $3 "$0;"
+      StrLen $4 $2
+      StrCpy $5 $1 -$4 # $5 is now the part before the path to remove
+      StrCpy $6 $2 "" $3 # $6 is now the part after the path to remove
+      StrCpy $3 $5$6
+
+      StrCpy $5 $3 1 -1 # copy last char
+      StrCmp $5 ";" 0 +2 # if last char == ;
+        StrCpy $3 $3 -1 # remove last char
+
+      StrCmp $ADD_TO_PATH_ALL_USERS "1" unWriteAllKey
+        WriteRegExpandStr ${NT_current_env} "PATH" $3
+        Goto unDoSend
+      unWriteAllKey:
+        WriteRegExpandStr ${NT_all_env} "PATH" $3
+      unDoSend:
+      SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
+
+  unRemoveFromPath_done:
+    Pop $6
+    Pop $5
+    Pop $4
+    Pop $3
+    Pop $2
+    Pop $1
+    Pop $0
+FunctionEnd
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Uninstall sutff
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+###########################################
+#            Utility Functions            #
+###########################################
+
+;====================================================
+; IsNT - Returns 1 if the current system is NT, 0
+;        otherwise.
+;     Output: head of the stack
+;====================================================
+; IsNT
+; no input
+; output, top of the stack = 1 if NT or 0 if not
+;
+; Usage:
+;   Call IsNT
+;   Pop $R0
+;  ($R0 at this point is 1 or 0)
+
+!macro IsNT un
+Function ${un}IsNT
+  Push $0
+  ReadRegStr $0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
+  StrCmp $0 "" 0 IsNT_yes
+  ; we are not NT.
+  Pop $0
+  Push 0
+  Return
+
+  IsNT_yes:
+    ; NT!!!
+    Pop $0
+    Push 1
+FunctionEnd
+!macroend
+!insertmacro IsNT ""
+!insertmacro IsNT "un."
+
+; StrStr
+; input, top of stack = string to search for
+;        top of stack-1 = string to search in
+; output, top of stack (replaces with the portion of the string remaining)
+; modifies no other variables.
+;
+; Usage:
+;   Push "this is a long ass string"
+;   Push "ass"
+;   Call StrStr
+;   Pop $R0
+;  ($R0 at this point is "ass string")
+
+!macro StrStr un
+Function ${un}StrStr
+Exch $R1 ; st=haystack,old$R1, $R1=needle
+  Exch    ; st=old$R1,haystack
+  Exch $R2 ; st=old$R1,old$R2, $R2=haystack
+  Push $R3
+  Push $R4
+  Push $R5
+  StrLen $R3 $R1
+  StrCpy $R4 0
+  ; $R1=needle
+  ; $R2=haystack
+  ; $R3=len(needle)
+  ; $R4=cnt
+  ; $R5=tmp
+  loop:
+    StrCpy $R5 $R2 $R3 $R4
+    StrCmp $R5 $R1 done
+    StrCmp $R5 "" done
+    IntOp $R4 $R4 + 1
+    Goto loop
+done:
+  StrCpy $R1 $R2 "" $R4
+  Pop $R5
+  Pop $R4
+  Pop $R3
+  Pop $R2
+  Exch $R1
+FunctionEnd
+!macroend
+!insertmacro StrStr ""
+!insertmacro StrStr "un."
+
+Function Trim ; Added by Pelaca
+	Exch $R1
+	Push $R2
+Loop:
+	StrCpy $R2 "$R1" 1 -1
+	StrCmp "$R2" " " RTrim
+	StrCmp "$R2" "$\n" RTrim
+	StrCmp "$R2" "$\r" RTrim
+	StrCmp "$R2" ";" RTrim
+	GoTo Done
+RTrim:
+	StrCpy $R1 "$R1" -1
+	Goto Loop
+Done:
+	Pop $R2
+	Exch $R1
+FunctionEnd
+
+Function ConditionalAddToRegisty
+  Pop $0
+  Pop $1
+  StrCmp "$0" "" ConditionalAddToRegisty_EmptyString
+    WriteRegStr SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@" \
+    "$1" "$0"
+    ;MessageBox MB_OK "Set Registry: '$1' to '$0'"
+    DetailPrint "Set install registry entry: '$1' to '$0'"
+  ConditionalAddToRegisty_EmptyString:
+FunctionEnd
+
+;--------------------------------
+
+!ifdef CPACK_USES_DOWNLOAD
+Function DownloadFile
+    IfFileExists $INSTDIR\* +2
+    CreateDirectory $INSTDIR
+    Pop $0
+
+    ; Skip if already downloaded
+    IfFileExists $INSTDIR\$0 0 +2
+    Return
+
+    StrCpy $1 "@CPACK_DOWNLOAD_SITE@"
+
+  try_again:
+    NSISdl::download "$1/$0" "$INSTDIR\$0"
+
+    Pop $1
+    StrCmp $1 "success" success
+    StrCmp $1 "Cancelled" cancel
+    MessageBox MB_OK "Download failed: $1"
+  cancel:
+    Return
+  success:
+FunctionEnd
+!endif
+
+;--------------------------------
+; Installation types
+@CPACK_NSIS_INSTALLATION_TYPES@
+
+;--------------------------------
+; Component sections
+@CPACK_NSIS_COMPONENT_SECTIONS@
+
+;--------------------------------
+; Define some macro setting for the gui
+@CPACK_NSIS_INSTALLER_MUI_ICON_CODE@
+@CPACK_NSIS_INSTALLER_ICON_CODE@
+@CPACK_NSIS_INSTALLER_MUI_COMPONENTS_DESC@
+@CPACK_NSIS_INSTALLER_MUI_FINISHPAGE_RUN_CODE@
+
+;--------------------------------
+;Pages
+  !insertmacro MUI_PAGE_WELCOME
+
+  !insertmacro MUI_PAGE_LICENSE "@CPACK_RESOURCE_FILE_LICENSE@"
+  Page custom InstallOptionsPage
+  !insertmacro MUI_PAGE_DIRECTORY
+
+  ;Start Menu Folder Page Configuration
+  !define MUI_STARTMENUPAGE_REGISTRY_ROOT "SHCTX"
+  !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@"
+  !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
+  !insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER
+
+  @CPACK_NSIS_PAGE_COMPONENTS@
+
+  !insertmacro MUI_PAGE_INSTFILES
+  !insertmacro MUI_PAGE_FINISH
+
+  !insertmacro MUI_UNPAGE_CONFIRM
+  !insertmacro MUI_UNPAGE_INSTFILES
+
+;--------------------------------
+;Languages
+
+  !insertmacro MUI_LANGUAGE "English" ;first language is the default language
+  !insertmacro MUI_LANGUAGE "Albanian"
+  !insertmacro MUI_LANGUAGE "Arabic"
+  !insertmacro MUI_LANGUAGE "Basque"
+  !insertmacro MUI_LANGUAGE "Belarusian"
+  !insertmacro MUI_LANGUAGE "Bosnian"
+  !insertmacro MUI_LANGUAGE "Breton"
+  !insertmacro MUI_LANGUAGE "Bulgarian"
+  !insertmacro MUI_LANGUAGE "Croatian"
+  !insertmacro MUI_LANGUAGE "Czech"
+  !insertmacro MUI_LANGUAGE "Danish"
+  !insertmacro MUI_LANGUAGE "Dutch"
+  !insertmacro MUI_LANGUAGE "Estonian"
+  !insertmacro MUI_LANGUAGE "Farsi"
+  !insertmacro MUI_LANGUAGE "Finnish"
+  !insertmacro MUI_LANGUAGE "French"
+  !insertmacro MUI_LANGUAGE "German"
+  !insertmacro MUI_LANGUAGE "Greek"
+  !insertmacro MUI_LANGUAGE "Hebrew"
+  !insertmacro MUI_LANGUAGE "Hungarian"
+  !insertmacro MUI_LANGUAGE "Icelandic"
+  !insertmacro MUI_LANGUAGE "Indonesian"
+  !insertmacro MUI_LANGUAGE "Irish"
+  !insertmacro MUI_LANGUAGE "Italian"
+  !insertmacro MUI_LANGUAGE "Japanese"
+  !insertmacro MUI_LANGUAGE "Korean"
+  !insertmacro MUI_LANGUAGE "Kurdish"
+  !insertmacro MUI_LANGUAGE "Latvian"
+  !insertmacro MUI_LANGUAGE "Lithuanian"
+  !insertmacro MUI_LANGUAGE "Luxembourgish"
+  !insertmacro MUI_LANGUAGE "Macedonian"
+  !insertmacro MUI_LANGUAGE "Malay"
+  !insertmacro MUI_LANGUAGE "Mongolian"
+  !insertmacro MUI_LANGUAGE "Norwegian"
+  !insertmacro MUI_LANGUAGE "Polish"
+  !insertmacro MUI_LANGUAGE "Portuguese"
+  !insertmacro MUI_LANGUAGE "PortugueseBR"
+  !insertmacro MUI_LANGUAGE "Romanian"
+  !insertmacro MUI_LANGUAGE "Russian"
+  !insertmacro MUI_LANGUAGE "Serbian"
+  !insertmacro MUI_LANGUAGE "SerbianLatin"
+  !insertmacro MUI_LANGUAGE "SimpChinese"
+  !insertmacro MUI_LANGUAGE "Slovak"
+  !insertmacro MUI_LANGUAGE "Slovenian"
+  !insertmacro MUI_LANGUAGE "Spanish"
+  !insertmacro MUI_LANGUAGE "Swedish"
+  !insertmacro MUI_LANGUAGE "Thai"
+  !insertmacro MUI_LANGUAGE "TradChinese"
+  !insertmacro MUI_LANGUAGE "Turkish"
+  !insertmacro MUI_LANGUAGE "Ukrainian"
+  !insertmacro MUI_LANGUAGE "Welsh"
+
+
+;--------------------------------
+;Reserve Files
+
+  ;These files should be inserted before other files in the data block
+  ;Keep these lines before any File command
+  ;Only for solid compression (by default, solid compression is enabled for BZIP2 and LZMA)
+
+  ReserveFile "NSIS.InstallOptions.ini"
+  !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
+
+;--------------------------------
+;Installer Sections
+
+Section "-Core installation"
+  ;Use the entire tree produced by the INSTALL target.  Keep the
+  ;list of directories here in sync with the RMDir commands below.
+  SetOutPath "$INSTDIR"
+  @CPACK_NSIS_EXTRA_PREINSTALL_COMMANDS@
+  @CPACK_NSIS_FULL_INSTALL@
+
+  ;Store installation folder
+  WriteRegStr SHCTX "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@" "" $INSTDIR
+
+  ;Create uninstaller
+  WriteUninstaller "$INSTDIR\Uninstall.exe"
+  Push "DisplayName"
+  Push "@CPACK_NSIS_DISPLAY_NAME@"
+  Call ConditionalAddToRegisty
+  Push "DisplayVersion"
+  Push "@CPACK_PACKAGE_VERSION@"
+  Call ConditionalAddToRegisty
+  Push "Publisher"
+  Push "@CPACK_PACKAGE_VENDOR@"
+  Call ConditionalAddToRegisty
+  Push "UninstallString"
+  Push "$INSTDIR\Uninstall.exe"
+  Call ConditionalAddToRegisty
+  Push "NoRepair"
+  Push "1"
+  Call ConditionalAddToRegisty
+
+  !ifdef CPACK_NSIS_ADD_REMOVE
+  ;Create add/remove functionality
+  Push "ModifyPath"
+  Push "$INSTDIR\AddRemove.exe"
+  Call ConditionalAddToRegisty
+  !else
+  Push "NoModify"
+  Push "1"
+  Call ConditionalAddToRegisty
+  !endif
+
+  ; Optional registration
+  Push "DisplayIcon"
+  Push "$INSTDIR\@CPACK_NSIS_INSTALLED_ICON_NAME@"
+  Call ConditionalAddToRegisty
+  Push "HelpLink"
+  Push "@CPACK_NSIS_HELP_LINK@"
+  Call ConditionalAddToRegisty
+  Push "URLInfoAbout"
+  Push "@CPACK_NSIS_URL_INFO_ABOUT@"
+  Call ConditionalAddToRegisty
+  Push "Contact"
+  Push "@CPACK_NSIS_CONTACT@"
+  Call ConditionalAddToRegisty
+  !insertmacro MUI_INSTALLOPTIONS_READ $INSTALL_DESKTOP "NSIS.InstallOptions.ini" "Field 5" "State"
+  !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+
+  ;Create shortcuts
+  CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
+@CPACK_NSIS_CREATE_ICONS@
+@CPACK_NSIS_CREATE_ICONS_EXTRA@
+  CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
+
+  ;Read a value from an InstallOptions INI file
+  !insertmacro MUI_INSTALLOPTIONS_READ $DO_NOT_ADD_TO_PATH "NSIS.InstallOptions.ini" "Field 2" "State"
+  !insertmacro MUI_INSTALLOPTIONS_READ $ADD_TO_PATH_ALL_USERS "NSIS.InstallOptions.ini" "Field 3" "State"
+  !insertmacro MUI_INSTALLOPTIONS_READ $ADD_TO_PATH_CURRENT_USER "NSIS.InstallOptions.ini" "Field 4" "State"
+
+  ; Write special uninstall registry entries
+  Push "StartMenu"
+  Push "$STARTMENU_FOLDER"
+  Call ConditionalAddToRegisty
+  Push "DoNotAddToPath"
+  Push "$DO_NOT_ADD_TO_PATH"
+  Call ConditionalAddToRegisty
+  Push "AddToPathAllUsers"
+  Push "$ADD_TO_PATH_ALL_USERS"
+  Call ConditionalAddToRegisty
+  Push "AddToPathCurrentUser"
+  Push "$ADD_TO_PATH_CURRENT_USER"
+  Call ConditionalAddToRegisty
+  Push "InstallToDesktop"
+  Push "$INSTALL_DESKTOP"
+  Call ConditionalAddToRegisty
+
+  !insertmacro MUI_STARTMENU_WRITE_END
+
+@CPACK_NSIS_EXTRA_INSTALL_COMMANDS@
+
+SectionEnd
+
+Section "-Add to path"
+  Push $INSTDIR\bin
+  StrCmp "@CPACK_NSIS_MODIFY_PATH@" "ON" 0 doNotAddToPath
+  StrCmp $DO_NOT_ADD_TO_PATH "1" doNotAddToPath 0
+    Call AddToPath
+  doNotAddToPath:
+SectionEnd
+
+;--------------------------------
+; Create custom pages
+Function InstallOptionsPage
+  !insertmacro MUI_HEADER_TEXT "Install Options" "Choose options for installing @CPACK_NSIS_PACKAGE_NAME@"
+  !insertmacro MUI_INSTALLOPTIONS_DISPLAY "NSIS.InstallOptions.ini"
+
+FunctionEnd
+
+;--------------------------------
+; determine admin versus local install
+Function un.onInit
+
+  ClearErrors
+  UserInfo::GetName
+  IfErrors noLM
+  Pop $0
+  UserInfo::GetAccountType
+  Pop $1
+  StrCmp $1 "Admin" 0 +3
+    SetShellVarContext all
+    ;MessageBox MB_OK 'User "$0" is in the Admin group'
+    Goto done
+  StrCmp $1 "Power" 0 +3
+    SetShellVarContext all
+    ;MessageBox MB_OK 'User "$0" is in the Power Users group'
+    Goto done
+
+  noLM:
+    ;Get installation folder from registry if available
+
+  done:
+
+FunctionEnd
+
+;--- Add/Remove callback functions: ---
+!macro SectionList MacroName
+  ;This macro used to perform operation on multiple sections.
+  ;List all of your components in following manner here.
+@CPACK_NSIS_COMPONENT_SECTION_LIST@
+!macroend
+
+Section -FinishComponents
+  ;Removes unselected components and writes component status to registry
+  !insertmacro SectionList "FinishSection"
+
+!ifdef CPACK_NSIS_ADD_REMOVE
+  ; Get the name of the installer executable
+  System::Call 'kernel32::GetModuleFileNameA(i 0, t .R0, i 1024) i r1'
+  StrCpy $R3 $R0
+
+  ; Strip off the last 13 characters, to see if we have AddRemove.exe
+  StrLen $R1 $R0
+  IntOp $R1 $R0 - 13
+  StrCpy $R2 $R0 13 $R1
+  StrCmp $R2 "AddRemove.exe" addremove_installed
+
+  ; We're not running AddRemove.exe, so install it
+  CopyFiles $R3 $INSTDIR\AddRemove.exe
+
+  addremove_installed:
+!endif
+SectionEnd
+;--- End of Add/Remove callback functions ---
+
+;--------------------------------
+; Component dependencies
+Function .onSelChange
+  !insertmacro SectionList MaybeSelectionChanged
+FunctionEnd
+
+;--------------------------------
+;Uninstaller Section
+
+Section "Uninstall"
+  ReadRegStr $START_MENU SHCTX \
+   "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@" "StartMenu"
+  ;MessageBox MB_OK "Start menu is in: $START_MENU"
+  ReadRegStr $DO_NOT_ADD_TO_PATH SHCTX \
+    "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@" "DoNotAddToPath"
+  ReadRegStr $ADD_TO_PATH_ALL_USERS SHCTX \
+    "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@" "AddToPathAllUsers"
+  ReadRegStr $ADD_TO_PATH_CURRENT_USER SHCTX \
+    "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@" "AddToPathCurrentUser"
+  ;MessageBox MB_OK "Add to path: $DO_NOT_ADD_TO_PATH all users: $ADD_TO_PATH_ALL_USERS"
+  ReadRegStr $INSTALL_DESKTOP SHCTX \
+    "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@" "InstallToDesktop"
+  ;MessageBox MB_OK "Install to desktop: $INSTALL_DESKTOP "
+
+@CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS@
+
+  ;Remove files we installed.
+  ;Keep the list of directories here in sync with the File commands above.
+@CPACK_NSIS_DELETE_FILES@
+@CPACK_NSIS_DELETE_DIRECTORIES@
+
+!ifdef CPACK_NSIS_ADD_REMOVE
+  ;Remove the add/remove program
+  Delete "$INSTDIR\AddRemove.exe"
+!endif
+
+  ;Remove the uninstaller itself.
+  Delete "$INSTDIR\Uninstall.exe"
+  DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@"
+
+  ;Remove the installation directory if it is empty.
+  RMDir "$INSTDIR"
+
+  ; Remove the registry entries.
+  DeleteRegKey SHCTX "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@"
+
+  ; Removes all optional components
+  !insertmacro SectionList "RemoveSection_CPack"
+
+  !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
+
+  Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
+@CPACK_NSIS_DELETE_ICONS@
+@CPACK_NSIS_DELETE_ICONS_EXTRA@
+
+  ;Delete empty start menu parent directories
+  StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"
+
+  startMenuDeleteLoop:
+    ClearErrors
+    RMDir $MUI_TEMP
+    GetFullPathName $MUI_TEMP "$MUI_TEMP\.."
+
+    IfErrors startMenuDeleteLoopDone
+
+    StrCmp "$MUI_TEMP" "$SMPROGRAMS" startMenuDeleteLoopDone startMenuDeleteLoop
+  startMenuDeleteLoopDone:
+
+  ; If the user changed the shortcut, then untinstall may not work. This should
+  ; try to fix it.
+  StrCpy $MUI_TEMP "$START_MENU"
+  Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
+@CPACK_NSIS_DELETE_ICONS_EXTRA@
+
+  ;Delete empty start menu parent directories
+  StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"
+
+  secondStartMenuDeleteLoop:
+    ClearErrors
+    RMDir $MUI_TEMP
+    GetFullPathName $MUI_TEMP "$MUI_TEMP\.."
+
+    IfErrors secondStartMenuDeleteLoopDone
+
+    StrCmp "$MUI_TEMP" "$SMPROGRAMS" secondStartMenuDeleteLoopDone secondStartMenuDeleteLoop
+  secondStartMenuDeleteLoopDone:
+
+  DeleteRegKey /ifempty SHCTX "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@"
+
+  Push $INSTDIR\bin
+  StrCmp $DO_NOT_ADD_TO_PATH_ "1" doNotRemoveFromPath 0
+    Call un.RemoveFromPath
+  doNotRemoveFromPath:
+SectionEnd
+
+;--------------------------------
+; determine admin versus local install
+; Is install for "AllUsers" or "JustMe"?
+; Default to "JustMe" - set to "AllUsers" if admin or on Win9x
+; This function is used for the very first "custom page" of the installer.
+; This custom page does not show up visibly, but it executes prior to the
+; first visible page and sets up $INSTDIR properly...
+; Choose different default installation folder based on SV_ALLUSERS...
+; "Program Files" for AllUsers, "My Documents" for JustMe...
+
+Function .onInit
+  StrCmp "@CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL@" "ON" 0 inst
+
+  ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@" "UninstallString"
+  StrCmp $0 "" inst
+
+  MessageBox MB_YESNOCANCEL|MB_ICONEXCLAMATION \
+  "@CPACK_NSIS_PACKAGE_NAME@ is already installed. $\n$\nDo you want to uninstall the old version before installing the new one?" \
+  IDYES uninst IDNO inst
+  Abort
+
+;Run the uninstaller
+uninst:
+  ClearErrors
+  StrLen $2 "\Uninstall.exe"
+  StrCpy $3 $0 -$2 # remove "\Uninstall.exe" from UninstallString to get path
+  ExecWait '$0 _?=$3' ;Do not copy the uninstaller to a temp file
+
+  IfErrors uninst_failed inst
+uninst_failed:
+  MessageBox MB_OK|MB_ICONSTOP "Uninstall failed."
+  Abort
+
+
+inst:
+  ; Reads components status for registry
+  !insertmacro SectionList "InitSection"
+
+  ; check to see if /D has been used to change
+  ; the install directory by comparing it to the
+  ; install directory that is expected to be the
+  ; default
+  StrCpy $IS_DEFAULT_INSTALLDIR 0
+  StrCmp "$INSTDIR" "@CPACK_NSIS_INSTALL_ROOT@\@CPACK_PACKAGE_INSTALL_DIRECTORY@" 0 +2
+    StrCpy $IS_DEFAULT_INSTALLDIR 1
+
+  StrCpy $SV_ALLUSERS "JustMe"
+  ; if default install dir then change the default
+  ; if it is installed for JustMe
+  StrCmp "$IS_DEFAULT_INSTALLDIR" "1" 0 +2
+    StrCpy $INSTDIR "$DOCUMENTS\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
+
+  ClearErrors
+  UserInfo::GetName
+  IfErrors noLM
+  Pop $0
+  UserInfo::GetAccountType
+  Pop $1
+  StrCmp $1 "Admin" 0 +4
+    SetShellVarContext all
+    ;MessageBox MB_OK 'User "$0" is in the Admin group'
+    StrCpy $SV_ALLUSERS "AllUsers"
+    Goto done
+  StrCmp $1 "Power" 0 +4
+    SetShellVarContext all
+    ;MessageBox MB_OK 'User "$0" is in the Power Users group'
+    StrCpy $SV_ALLUSERS "AllUsers"
+    Goto done
+
+  noLM:
+    StrCpy $SV_ALLUSERS "AllUsers"
+    ;Get installation folder from registry if available
+
+  done:
+  StrCmp $SV_ALLUSERS "AllUsers" 0 +3
+    StrCmp "$IS_DEFAULT_INSTALLDIR" "1" 0 +2
+      StrCpy $INSTDIR "@CPACK_NSIS_INSTALL_ROOT@\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
+
+  StrCmp "@CPACK_NSIS_MODIFY_PATH@" "ON" 0 noOptionsPage
+    !insertmacro MUI_INSTALLOPTIONS_EXTRACT "NSIS.InstallOptions.ini"
+
+  noOptionsPage:
+FunctionEnd
diff --git a/config/cmake/PkgInfo.in b/config/cmake/PkgInfo.in
index e530f88..ae54035 100644
--- a/config/cmake/PkgInfo.in
+++ b/config/cmake/PkgInfo.in
@@ -1 +1 @@
-FMWK????
-\ No newline at end of file
+FMWK????
diff --git a/config/cmake/README.md.cmake.in b/config/cmake/README.md.cmake.in
new file mode 100644
index 0000000..b60e729
--- /dev/null
+++ b/config/cmake/README.md.cmake.in
@@ -0,0 +1,80 @@
+@HDF5_PACKAGE_NAME@ version @HDF5_PACKAGE_VERSION_STRING@
+------------------------------------------------------------------------------
+
+This directory contains the binary (release) distribution of
+@HDF5_PACKAGE_NAME@ @HDF5_PACKAGE_VERSION_MAJOR@ that was compiled on;
+    @BINARY_PLATFORM@.
+
+It was built with the following options:
+    -- @LIB_TYPE@ C/C++/Fortran libraries
+    -- SZIP (encoder enabled) and ZLIB
+    -- @LIB_TYPE@ HDF5 tools
+    -- Java @Java_VERSION@
+
+The contents of this directory are:
+
+    COPYING                 - Copyright notice
+    README.md               - This file
+    @HDF5_PACKAGE_NAME@-@HDF5_PACKAGE_VERSION@-@BINARY_SYSTEM_NAME@.@BINARY_INSTALL_ENDING@    - HDF5 Install Package
+
+This binary was built with the ZLIB and SZIP/Libaec external libraries and are
+included for convenience.  Libaec is an unrestricted open-source replacement for SZIP
+(version 1.0.4, Encoder ENABLED).
+
+The official ZLIB and SZIP/Libaec pages are at:
+
+    ZLIB: https://git.savannah.gnu.org/cgit/gzip.git/
+        https://git.savannah.gnu.org/cgit/gzip.git/tree/COPYING
+    SZIP/Libaec: https://gitlab.dkrz.de/k202009/libaec
+        https://gitlab.dkrz.de/k202009/libaec/-/blob/master/Copyright.txt
+
+
+Installation
+===========================================================================
+1. Execute @HDF5_PACKAGE_NAME@-@HDF5_PACKAGE_VERSION@-@BINARY_SYSTEM_NAME@.@BINARY_INSTALL_ENDING@
+2. Follow prompts
+===========================================================================
+
+After Installation
+===========================================================================
+The examples folder, HDF5Examples, located in the
+HDF5 install folder, can be built and tested with CMake and the supplied
+HDF5_Examples.cmake file. The HDF5_Examples.cmake expects HDF5 to have
+been installed in the default location with above compilers (see the
+libhdf5.settings file in the lib install folder). Also, the CMake
+utility should be installed.
+
+To test the installation with the examples;
+    Create a directory to run the examples.
+    Copy HDF5Examples folder to this directory.
+    Copy CTestScript.cmake to this directory.
+    Copy HDF5_Examples.cmake to this directory.
+    Copy HDF5_Examples_options.cmake to this directory.
+    The default source folder is defined as "HDF5Examples". It can be changed
+        with the CTEST_SOURCE_NAME script option.
+    The default installation folder is defined as "@CMAKE_INSTALL_PREFIX@".
+        It can be changed with the INSTALLDIR script option.
+    The default ctest configuration is defined as "Release". It can be changed
+        with the CTEST_CONFIGURATION_TYPE script option. Note that this must
+        be the same as the value used with the -C command line option.
+    The default build configuration is defined to build and use static libraries.
+        Shared libraries can be used with the STATICONLYLIBRARIES script option set to "NO".
+    Other options can be changed by editing the HDF5_Examples_options.cmake file.
+
+    If the defaults are okay, execute from this directory:
+        ctest -S HDF5_Examples.cmake -C Release -V -O test.log
+    If the defaults need change, execute from this directory:
+        ctest -S HDF5_Examples.cmake,CTEST_SOURCE_NAME=MyExamples,INSTALLDIR=MyLocation -C Release -V -O test.log
+
+When executed, the ctest script will save the results to the log file, test.log, as
+indicated by the ctest command. If you wish the to see more build and test information,
+add "-VV" to the ctest command. The output should show;
+      100% tests passed, 0 tests failed out of 156.
+
+For more information see USING_CMake_Examples.txt in the install folder.
+===========================================================================
+
+Documentation for this release can be found at the following URL:
+     https://portal.hdfgroup.org/display/HDF5/HDF5
+
+Bugs should be reported to help@hdfgroup.org.
diff --git a/config/cmake/README.txt.cmake.in b/config/cmake/README.txt.cmake.in
deleted file mode 100644
index cc8baeb..0000000
--- a/config/cmake/README.txt.cmake.in
+++ /dev/null
@@ -1,56 +0,0 @@
-@HDF5_PACKAGE_NAME@ version @HDF5_PACKAGE_VERSION_STRING@
-------------------------------------------------------------------------------
-
-This directory contains the binary (release) distribution of 
-@HDF5_PACKAGE_NAME@ @HDF5_PACKAGE_VERSION_MAJOR@ that was compiled on;
-    @BINARY_PLATFORM@. 
-
-It was built with the following options: 
-    -- @LIB_TYPE@ C/C++/Fortran libraries
-    -- SZIP (encoder enabled) and ZLIB
-    -- @LIB_TYPE@ HDF5 tools
-
-The contents of this directory are:
-
-    COPYING                 - Copyright notice
-    README.txt              - This file
-    @HDF5_PACKAGE_NAME@-@HDF5_PACKAGE_VERSION@-@BINARY_SYSTEM_NAME@.@BINARY_INSTALL_ENDING@    - HDF5 Install Package
-
-Installation
-===========================================================================
-1. Execute @HDF5_PACKAGE_NAME@-@HDF5_PACKAGE_VERSION@-@BINARY_SYSTEM_NAME@.@BINARY_INSTALL_ENDING@
-2. Follow prompts
-===========================================================================
-
-After Installation
-===========================================================================
-The examples folder, HDF5Examples, located in the 
-HDF5 install folder, can be built and tested with CMake and the supplied
-HDF518_Examples.cmake file. The HDF518_Examples.cmake expects HDF5 to have
-been installed in the default location with above compilers. Also, the CMake 
-utility should be installed.
-
-To test the installation with the examples;
-    Create a directory to run the examples.
-    Copy HDF5Examples folder to this directory.
-    Copy HDF518_Examples.cmake to this directory.
-    Edit HDF518_Examples.cmake line 8 to set INSTALLDIR to where HDF5 is installed.
-       (The default should be correct unless you installed into a different folder.)
-    Execute from this directory: 
-        ctest -S HDF518_Examples.cmake,HDF5Examples-0.1.1-Source -C Release -V -O test.log
-
-When executed, the ctest script will save the results to the log file, test.log, as
-indicated by the ctest command. If you wish the to see more build and test information, 
-add "-VV" to the ctest command. The output should show;
-      100% tests passed, 0 tests failed out of 156.
-
-For more information see USING_CMake_Examples.txt in the install folder. 
-===========================================================================
-
-Documentation for this release can be found at the following URL:
-    http://www.hdfgroup.org/HDF5/doc/.
-
-See the HDF5 home page for further details:
-    http://hdfgroup.org/HDF5/
-
-Bugs should be reported to help@hdfgroup.org.
diff --git a/config/cmake/UseJava.cmake b/config/cmake/UseJava.cmake
new file mode 100644
index 0000000..1de08db
--- /dev/null
+++ b/config/cmake/UseJava.cmake
@@ -0,0 +1,1654 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See https://cmake.org/licensing for details.
+
+#[=======================================================================[.rst:
+UseJava
+-------
+
+This file provides support for ``Java``.  It is assumed that
+:module:`FindJava` has already been loaded.  See :module:`FindJava` for
+information on how to load Java into your ``CMake`` project.
+
+Synopsis
+^^^^^^^^
+
+.. parsed-literal::
+
+  `Creating and Installing JARS`_
+    `add_jar`_ (<target_name> [SOURCES] <source1> [<source2>...] ...)
+    `install_jar`_ (<target_name> DESTINATION <destination> [COMPONENT <component>])
+    `install_jni_symlink`_ (<target_name> DESTINATION <destination> [COMPONENT <component>])
+
+  `Header Generation`_
+    `create_javah`_ ((TARGET <target> | GENERATED_FILES <VAR>) CLASSES <class>... ...)
+
+  `Exporting JAR Targets`_
+    `install_jar_exports`_ (TARGETS <jars>... FILE <filename> DESTINATION <destination> ...)
+    `export_jars`_ (TARGETS <jars>... [NAMESPACE <namespace>] FILE <filename>)
+
+  `Finding JARs`_
+    `find_jar`_ (<VAR> NAMES <name1> [<name2>...] [PATHS <path1> [<path2>... ENV <var>]] ...)
+
+  `Creating Java Documentation`_
+    `create_javadoc`_ (<VAR> (PACKAGES <pkg1> [<pkg2>...] | FILES <file1> [<file2>...]) ...)
+
+Creating And Installing JARs
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. _add_jar:
+
+.. command:: add_jar
+
+  Creates a jar file containing java objects and, optionally, resources::
+
+    add_jar(<target_name>
+            [SOURCES] <source1> [<source2>...] [<resource1>...]
+            [INCLUDE_JARS <jar1> [<jar2>...]]
+            [ENTRY_POINT <entry>]
+            [VERSION <version>]
+            [MANIFEST <manifest>]
+            [OUTPUT_NAME <name>]
+            [OUTPUT_DIR <dir>]
+            [GENERATE_NATIVE_HEADERS <target>
+            [DESTINATION (<dir>|INSTALL <dir> [BUILD <dir>])]]
+            )
+
+  This command creates a ``<target_name>.jar``.  It compiles the given
+  ``<source>`` files and adds the given ``<resource>`` files to
+  the jar file.  Source files can be java files or listing files
+  (prefixed by ``@``).  If only resource files are given then just a jar file
+  is created.
+
+  ``SOURCES``
+    Compiles the specified source files and adds the result in the jar file.
+
+    .. versionadded:: 3.4
+      Support for response files, prefixed by ``@``.
+
+  ``INCLUDE_JARS``
+    The list of jars are added to the classpath when compiling the java sources
+    and also to the dependencies of the target. ``INCLUDE_JARS`` also accepts
+    other target names created by ``add_jar()``. For backwards compatibility,
+    jar files listed as sources are ignored (as they have been since the first
+    version of this module).
+
+  ``ENTRY_POINT``
+    Defines an entry point in the jar file.
+
+  ``VERSION``
+    Adds a version to the target output name.
+
+    The following example will create a jar file with the name
+    ``shibboleet-1.2.0.jar`` and will create a symlink ``shibboleet.jar``
+    pointing to the jar with the version information.
+
+    .. code-block:: cmake
+
+      add_jar(shibboleet shibbotleet.java VERSION 1.2.0)
+
+  ``MANIFEST``
+    Defines a custom manifest for the jar.
+
+  ``OUTPUT_NAME``
+    Specify a different output name for the target.
+
+  ``OUTPUT_DIR``
+    Sets the directory where the jar file will be generated. If not specified,
+    :variable:`CMAKE_CURRENT_BINARY_DIR` is used as the output directory.
+
+  ``GENERATE_NATIVE_HEADERS``
+    .. versionadded:: 3.11
+
+    Generates native header files for methods declared as native. These files
+    provide the connective glue that allow your Java and C code to interact.
+    An INTERFACE target will be created for an easy usage of generated files.
+    Sub-option ``DESTINATION`` can be used to specify the output directory for
+    generated header files.
+
+    This option requires, at least, version 1.8 of the JDK.
+
+    For an optimum usage of this option, it is recommended to include module
+    JNI before any call to ``add_jar()``. The produced target for native
+    headers can then be used to compile C/C++ sources with the
+    :command:`target_link_libraries` command.
+
+    .. code-block:: cmake
+
+      find_package(JNI)
+      add_jar(foo foo.java GENERATE_NATIVE_HEADERS foo-native)
+      add_library(bar bar.cpp)
+      target_link_libraries(bar PRIVATE foo-native)
+
+    .. versionadded:: 3.20
+      ``DESTINATION`` sub-option now supports the possibility to specify
+      different output directories for ``BUILD`` and ``INSTALL`` steps. If
+      ``BUILD`` directory is not specified, a default directory will be used.
+
+      To export the interface target generated by ``GENERATE_NATIVE_HEADERS``
+      option, sub-option ``INSTALL`` of ``DESTINATION`` is required:
+
+      .. code-block:: cmake
+
+        add_jar(foo foo.java GENERATE_NATIVE_HEADERS foo-native
+                             DESTINATION INSTALL include)
+        install(TARGETS foo-native EXPORT native)
+        install(DIRECTORY "$<TARGET_PROPERTY:foo-native,NATIVE_HEADERS_DIRECTORY>/"
+                DESTINATION include)
+        install(EXPORT native DESTINATION /to/export NAMESPACE foo)
+
+  Some variables can be set to customize the behavior of ``add_jar()`` as well
+  as the java compiler:
+
+  ``CMAKE_JAVA_COMPILE_FLAGS``
+    Specify additional flags to java compiler.
+
+  ``CMAKE_JAVA_INCLUDE_PATH``
+    Specify additional paths to the class path.
+
+  ``CMAKE_JNI_TARGET``
+    If the target is a JNI library, sets this boolean variable to ``TRUE`` to
+    enable creation of a JNI symbolic link (see also
+    :ref:`install_jni_symlink() <install_jni_symlink>`).
+
+  ``CMAKE_JAR_CLASSES_PREFIX``
+    If multiple jars should be produced from the same java source filetree,
+    to prevent the accumulation of duplicate class files in subsequent jars,
+    set/reset ``CMAKE_JAR_CLASSES_PREFIX`` prior to calling the ``add_jar()``:
+
+    .. code-block:: cmake
+
+      set(CMAKE_JAR_CLASSES_PREFIX com/redhat/foo)
+      add_jar(foo foo.java)
+
+      set(CMAKE_JAR_CLASSES_PREFIX com/redhat/bar)
+      add_jar(bar bar.java)
+
+  The ``add_jar()`` function sets the following target properties on
+  ``<target_name>``:
+
+  ``INSTALL_FILES``
+    The files which should be installed.  This is used by
+    :ref:`install_jar() <install_jar>`.
+  ``JNI_SYMLINK``
+    The JNI symlink which should be installed.  This is used by
+    :ref:`install_jni_symlink() <install_jni_symlink>`.
+  ``JAR_FILE``
+    The location of the jar file so that you can include it.
+  ``CLASSDIR``
+    The directory where the class files can be found.  For example to use them
+    with ``javah``.
+  ``NATIVE_HEADERS_DIRECTORY``
+    .. versionadded:: 3.20
+
+    The directory where native headers are generated. Defined when option
+    ``GENERATE_NATIVE_HEADERS`` is specified.
+
+.. _install_jar:
+
+.. command:: install_jar
+
+  This command installs the jar file to the given destination::
+
+   install_jar(<target_name> <destination>)
+   install_jar(<target_name> DESTINATION <destination> [COMPONENT <component>])
+
+  This command installs the ``<target_name>`` file to the given
+  ``<destination>``.  It should be called in the same scope as
+  :ref:`add_jar() <add_jar>` or it will fail.
+
+  .. versionadded:: 3.4
+    The second signature with ``DESTINATION`` and ``COMPONENT`` options.
+
+  ``DESTINATION``
+    Specify the directory on disk to which a file will be installed.
+
+  ``COMPONENT``
+    Specify an installation component name with which the install rule is
+    associated, such as "runtime" or "development".
+
+  The ``install_jar()`` command sets the following target properties
+  on ``<target_name>``:
+
+  ``INSTALL_DESTINATION``
+    Holds the ``<destination>`` as described above, and is used by
+    :ref:`install_jar_exports() <install_jar_exports>`.
+
+.. _install_jni_symlink:
+
+.. command:: install_jni_symlink
+
+  Installs JNI symlinks for target generated by :ref:`add_jar() <add_jar>`::
+
+   install_jni_symlink(<target_name> <destination>)
+   install_jni_symlink(<target_name> DESTINATION <destination> [COMPONENT <component>])
+
+  This command installs the ``<target_name>`` JNI symlinks to the given
+  ``<destination>``.  It should be called in the same scope as
+  :ref:`add_jar() <add_jar>` or it will fail.
+
+  .. versionadded:: 3.4
+    The second signature with ``DESTINATION`` and ``COMPONENT`` options.
+
+  ``DESTINATION``
+    Specify the directory on disk to which a file will be installed.
+
+  ``COMPONENT``
+    Specify an installation component name with which the install rule is
+    associated, such as "runtime" or "development".
+
+  Utilize the following commands to create a JNI symbolic link:
+
+  .. code-block:: cmake
+
+    set(CMAKE_JNI_TARGET TRUE)
+    add_jar(shibboleet shibbotleet.java VERSION 1.2.0)
+    install_jar(shibboleet ${LIB_INSTALL_DIR}/shibboleet)
+    install_jni_symlink(shibboleet ${JAVA_LIB_INSTALL_DIR})
+
+Header Generation
+^^^^^^^^^^^^^^^^^
+
+.. _create_javah:
+
+.. command:: create_javah
+
+  .. versionadded:: 3.4
+
+  Generates C header files for java classes::
+
+   create_javah(TARGET <target> | GENERATED_FILES <VAR>
+                CLASSES <class>...
+                [CLASSPATH <classpath>...]
+                [DEPENDS <depend>...]
+                [OUTPUT_NAME <path>|OUTPUT_DIR <path>]
+                )
+
+  .. deprecated:: 3.11
+    This command will no longer be supported starting with version 10 of the JDK
+    due to the `suppression of javah tool <http://openjdk.java.net/jeps/313>`_.
+    The :ref:`add_jar(GENERATE_NATIVE_HEADERS) <add_jar>` command should be
+    used instead.
+
+  Create C header files from java classes. These files provide the connective
+  glue that allow your Java and C code to interact.
+
+  There are two main signatures for ``create_javah()``.  The first signature
+  returns generated files through variable specified by the ``GENERATED_FILES``
+  option.  For example:
+
+  .. code-block:: cmake
+
+    create_javah(GENERATED_FILES files_headers
+      CLASSES org.cmake.HelloWorld
+      CLASSPATH hello.jar
+    )
+
+  The second signature for ``create_javah()`` creates a target which
+  encapsulates header files generation. E.g.
+
+  .. code-block:: cmake
+
+    create_javah(TARGET target_headers
+      CLASSES org.cmake.HelloWorld
+      CLASSPATH hello.jar
+    )
+
+  Both signatures share same options.
+
+  ``CLASSES``
+    Specifies Java classes used to generate headers.
+
+  ``CLASSPATH``
+    Specifies various paths to look up classes. Here ``.class`` files, jar
+    files or targets created by command add_jar can be used.
+
+  ``DEPENDS``
+    Targets on which the javah target depends.
+
+  ``OUTPUT_NAME``
+    Concatenates the resulting header files for all the classes listed by
+    option ``CLASSES`` into ``<path>``.  Same behavior as option ``-o`` of
+    ``javah`` tool.
+
+  ``OUTPUT_DIR``
+    Sets the directory where the header files will be generated.  Same behavior
+    as option ``-d`` of ``javah`` tool.  If not specified,
+    :variable:`CMAKE_CURRENT_BINARY_DIR` is used as the output directory.
+
+Exporting JAR Targets
+^^^^^^^^^^^^^^^^^^^^^
+
+.. _install_jar_exports:
+
+.. command:: install_jar_exports
+
+  .. versionadded:: 3.7
+
+  Installs a target export file::
+
+   install_jar_exports(TARGETS <jars>...
+                       [NAMESPACE <namespace>]
+                       FILE <filename>
+                       DESTINATION <destination> [COMPONENT <component>])
+
+  This command installs a target export file ``<filename>`` for the named jar
+  targets to the given ``<destination>`` directory.  Its function is similar to
+  that of :command:`install(EXPORT)`.
+
+  ``TARGETS``
+    List of targets created by :ref:`add_jar() <add_jar>` command.
+
+  ``NAMESPACE``
+    .. versionadded:: 3.9
+
+    The ``<namespace>`` value will be prepend to the target names as they are
+    written to the import file.
+
+  ``FILE``
+    Specify name of the export file.
+
+
+  ``DESTINATION``
+    Specify the directory on disk to which a file will be installed.
+
+  ``COMPONENT``
+    Specify an installation component name with which the install rule is
+    associated, such as "runtime" or "development".
+
+.. _export_jars:
+
+.. command:: export_jars
+
+  .. versionadded:: 3.7
+
+  Writes a target export file::
+
+   export_jars(TARGETS <jars>...
+               [NAMESPACE <namespace>]
+               FILE <filename>)
+
+  This command writes a target export file ``<filename>`` for the named ``<jars>``
+  targets.  Its function is similar to that of :command:`export`.
+
+  ``TARGETS``
+    List of targets created by :ref:`add_jar() <add_jar>` command.
+
+  ``NAMESPACE``
+    .. versionadded:: 3.9
+
+    The ``<namespace>`` value will be prepend to the target names as they are
+    written to the import file.
+
+  ``FILE``
+    Specify name of the export file.
+
+Finding JARs
+^^^^^^^^^^^^
+
+.. _find_jar:
+
+.. command:: find_jar
+
+  Finds the specified jar file::
+
+    find_jar(<VAR>
+             <name> | NAMES <name1> [<name2>...]
+             [PATHS <path1> [<path2>... ENV <var>]]
+             [VERSIONS <version1> [<version2>]]
+             [DOC "cache documentation string"]
+            )
+
+  This command is used to find a full path to the named jar.  A cache
+  entry named by ``<VAR>`` is created to store the result of this command.
+  If the full path to a jar is found the result is stored in the
+  variable and the search will not repeated unless the variable is
+  cleared.  If nothing is found, the result will be ``<VAR>-NOTFOUND``, and
+  the search will be attempted again next time ``find_jar()`` is invoked with
+  the same variable.
+
+  ``NAMES``
+    Specify one or more possible names for the jar file.
+
+  ``PATHS``
+    Specify directories to search in addition to the default locations.
+    The ``ENV`` var sub-option reads paths from a system environment variable.
+
+  ``VERSIONS``
+    Specify jar versions.
+
+  ``DOC``
+    Specify the documentation string for the ``<VAR>`` cache entry.
+
+Creating Java Documentation
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. _create_javadoc:
+
+.. command:: create_javadoc
+
+  Creates java documentation based on files and packages::
+
+    create_javadoc(<VAR>
+                   (PACKAGES <pkg1> [<pkg2>...] | FILES <file1> [<file2>...])
+                   [SOURCEPATH <sourcepath>]
+                   [CLASSPATH <classpath>]
+                   [INSTALLPATH <install path>]
+                   [DOCTITLE <the documentation title>]
+                   [WINDOWTITLE <the title of the document>]
+                   [AUTHOR (TRUE|FALSE)]
+                   [USE (TRUE|FALSE)]
+                   [VERSION (TRUE|FALSE)]
+                   )
+
+  The ``create_javadoc()`` command can be used to create java documentation.
+  There are two main signatures for ``create_javadoc()``.
+
+  The first signature works with package names on a path with source files:
+
+  .. code-block:: cmake
+
+    create_javadoc(my_example_doc
+                   PACKAGES com.example.foo com.example.bar
+                   SOURCEPATH "${CMAKE_CURRENT_SOURCE_DIR}"
+                   CLASSPATH ${CMAKE_JAVA_INCLUDE_PATH}
+                   WINDOWTITLE "My example"
+                   DOCTITLE "<h1>My example</h1>"
+                   AUTHOR TRUE
+                   USE TRUE
+                   VERSION TRUE
+                  )
+
+  The second signature for ``create_javadoc()`` works on a given list of files:
+
+  .. code-block:: cmake
+
+    create_javadoc(my_example_doc
+                   FILES java/A.java java/B.java
+                   CLASSPATH ${CMAKE_JAVA_INCLUDE_PATH}
+                   WINDOWTITLE "My example"
+                   DOCTITLE "<h1>My example</h1>"
+                   AUTHOR TRUE
+                   USE TRUE
+                   VERSION TRUE
+                  )
+
+  Both signatures share most of the options. For more details please read the
+  javadoc manpage.
+
+  ``PACKAGES``
+    Specify java packages.
+
+  ``FILES``
+    Specify java source files. If relative paths are specified, they are
+    relative to :variable:`CMAKE_CURRENT_SOURCE_DIR`.
+
+  ``SOURCEPATH``
+    Specify the directory where to look for packages. By default,
+    :variable:`CMAKE_CURRENT_SOURCE_DIR` directory is used.
+
+  ``CLASSPATH``
+    Specify where to find user class files. Same behavior as option
+    ``-classpath`` of ``javadoc`` tool.
+
+  ``INSTALLPATH``
+    Specify where to install the java documentation. If you specified, the
+    documentation will be installed to
+    ``${CMAKE_INSTALL_PREFIX}/share/javadoc/<VAR>``.
+
+  ``DOCTITLE``
+    Specify the title to place near the top of the overview summary file.
+    Same behavior as option ``-doctitle`` of ``javadoc`` tool.
+
+  ``WINDOWTITLE``
+    Specify the title to be placed in the HTML ``<title>`` tag. Same behavior
+    as option ``-windowtitle`` of ``javadoc`` tool.
+
+  ``AUTHOR``
+    When value ``TRUE`` is specified, includes the ``@author`` text in the
+    generated docs. Same behavior as option  ``-author`` of ``javadoc`` tool.
+
+  ``USE``
+    When value ``TRUE`` is specified, creates class and package usage pages.
+    Includes one Use page for each documented class and package. Same behavior
+    as option ``-use`` of ``javadoc`` tool.
+
+  ``VERSION``
+    When value ``TRUE`` is specified, includes the version text in the
+    generated docs. Same behavior as option ``-version`` of ``javadoc`` tool.
+#]=======================================================================]
+
+include(CMakeParseArguments)
+
+function (__java_copy_file src dest comment)
+    add_custom_command(
+        OUTPUT  ${dest}
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different
+        ARGS    ${src}
+                ${dest}
+        DEPENDS ${src}
+        COMMENT ${comment}
+        )
+endfunction ()
+
+function(__java_lcat VAR)
+    foreach(_line IN LISTS ARGN)
+        string(APPEND ${VAR} "${_line}\n")
+    endforeach()
+
+    set(${VAR} "${${VAR}}" PARENT_SCOPE)
+endfunction()
+
+function(__java_export_jar VAR TARGET PATH)
+    get_target_property(_jarpath ${TARGET} JAR_FILE)
+    get_filename_component(_jarname ${_jarpath} NAME)
+    set(_target "${_jar_NAMESPACE}${TARGET}")
+    __java_lcat(${VAR}
+      "# Create imported target ${_target}"
+      "add_library(${_target} IMPORTED STATIC)"
+      "set_target_properties(${_target} PROPERTIES"
+      "  IMPORTED_LOCATION \"${PATH}/${_jarname}\""
+      "  JAR_FILE \"${PATH}/${_jarname}\")"
+      ""
+    )
+    set(${VAR} "${${VAR}}" PARENT_SCOPE)
+endfunction()
+
+# define helper scripts
+set(_JAVA_EXPORT_TARGETS_SCRIPT ${CMAKE_CURRENT_LIST_DIR}/javaTargets.cmake.in)
+set(_JAVA_CLASS_FILELIST_SCRIPT ${CMAKE_CURRENT_LIST_DIR}/UseJavaClassFilelist.cmake)
+set(_JAVA_SYMLINK_SCRIPT ${CMAKE_CURRENT_LIST_DIR}/UseJavaSymlinks.cmake)
+
+if (CMAKE_HOST_WIN32 AND NOT CYGWIN AND CMAKE_HOST_SYSTEM_NAME MATCHES "Windows")
+    set(_UseJava_PATH_SEP "$<SEMICOLON>")
+else ()
+    set(_UseJava_PATH_SEP ":")
+endif()
+
+function(add_jar _TARGET_NAME)
+
+    cmake_parse_arguments(_add_jar
+      ""
+      "VERSION;OUTPUT_DIR;OUTPUT_NAME;ENTRY_POINT;MANIFEST"
+      "SOURCES;INCLUDE_JARS;GENERATE_NATIVE_HEADERS"
+      ${ARGN}
+    )
+
+    # In CMake < 2.8.12, add_jar used variables which were set prior to calling
+    # add_jar for customizing the behavior of add_jar. In order to be backwards
+    # compatible, check if any of those variables are set, and use them to
+    # initialize values of the named arguments. (Giving the corresponding named
+    # argument will override the value set here.)
+    #
+    # New features should use named arguments only.
+    if(NOT DEFINED _add_jar_VERSION AND DEFINED CMAKE_JAVA_TARGET_VERSION)
+        set(_add_jar_VERSION "${CMAKE_JAVA_TARGET_VERSION}")
+    endif()
+    if(NOT DEFINED _add_jar_OUTPUT_DIR AND DEFINED CMAKE_JAVA_TARGET_OUTPUT_DIR)
+        set(_add_jar_OUTPUT_DIR "${CMAKE_JAVA_TARGET_OUTPUT_DIR}")
+    endif()
+    if(NOT DEFINED _add_jar_OUTPUT_NAME AND DEFINED CMAKE_JAVA_TARGET_OUTPUT_NAME)
+        set(_add_jar_OUTPUT_NAME "${CMAKE_JAVA_TARGET_OUTPUT_NAME}")
+        # reset
+        set(CMAKE_JAVA_TARGET_OUTPUT_NAME)
+    endif()
+    if(NOT DEFINED _add_jar_ENTRY_POINT AND DEFINED CMAKE_JAVA_JAR_ENTRY_POINT)
+        set(_add_jar_ENTRY_POINT "${CMAKE_JAVA_JAR_ENTRY_POINT}")
+    endif()
+
+    # This *should* still work if <resources1>... are included without a
+    # named RESOURCES argument.  In that case, the old behavior of potentially
+    # misplacing the within the Jar will behave as previously (incorrectly)
+    set(_JAVA_SOURCE_FILES ${_add_jar_SOURCES} ${_add_jar_UNPARSED_ARGUMENTS})
+
+    if (NOT DEFINED _add_jar_OUTPUT_DIR)
+        set(_add_jar_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR})
+    else()
+        get_filename_component(_add_jar_OUTPUT_DIR ${_add_jar_OUTPUT_DIR} ABSOLUTE)
+    endif()
+    # ensure output directory exists
+    file (MAKE_DIRECTORY "${_add_jar_OUTPUT_DIR}")
+
+    if (_add_jar_ENTRY_POINT)
+        set(_ENTRY_POINT_OPTION e)
+        set(_ENTRY_POINT_VALUE ${_add_jar_ENTRY_POINT})
+    endif ()
+
+    if (_add_jar_MANIFEST)
+        set(_MANIFEST_OPTION m)
+        get_filename_component (_MANIFEST_VALUE "${_add_jar_MANIFEST}" ABSOLUTE)
+    endif ()
+
+    unset (_GENERATE_NATIVE_HEADERS)
+    if (_add_jar_GENERATE_NATIVE_HEADERS)
+      # Raise an error if JDK version is less than 1.8 because javac -h is not supported
+      # by earlier versions.
+      if (Java_VERSION VERSION_LESS 1.8)
+        message (FATAL_ERROR "ADD_JAR: GENERATE_NATIVE_HEADERS is not supported with this version of Java.")
+      endif()
+
+      unset (_GENERATE_NATIVE_HEADERS_OUTPUT_DESC)
+
+      cmake_parse_arguments (_add_jar_GENERATE_NATIVE_HEADERS "" "" "DESTINATION" ${_add_jar_GENERATE_NATIVE_HEADERS})
+      if (NOT _add_jar_GENERATE_NATIVE_HEADERS_UNPARSED_ARGUMENTS)
+        message (FATAL_ERROR "ADD_JAR: GENERATE_NATIVE_HEADERS: missing required argument.")
+      endif()
+      list (LENGTH _add_jar_GENERATE_NATIVE_HEADERS_UNPARSED_ARGUMENTS length)
+      if (length GREATER 1)
+        list (REMOVE_AT _add_jar_GENERATE_NATIVE_HEADERS_UNPARSED_ARGUMENTS 0)
+        message (FATAL_ERROR "ADD_JAR: GENERATE_NATIVE_HEADERS: ${_add_jar_GENERATE_NATIVE_HEADERS_UNPARSED_ARGUMENTS}: unexpected argument(s).")
+      endif()
+      if (NOT _add_jar_GENERATE_NATIVE_HEADERS_DESTINATION)
+        set (_add_jar_GENERATE_NATIVE_HEADERS_DESTINATION "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${_TARGET_NAME}.dir/native_headers")
+      else()
+        list (LENGTH _add_jar_GENERATE_NATIVE_HEADERS_DESTINATION length)
+        if (NOT length EQUAL 1)
+          cmake_parse_arguments (_add_jar_GENERATE_NATIVE_HEADERS_DESTINATION "" "BUILD;INSTALL" "" "${_add_jar_GENERATE_NATIVE_HEADERS_DESTINATION}")
+          if (_add_jar_GENERATE_NATIVE_HEADERS_DESTINATION_UNPARSED_ARGUMENTS)
+            message (FATAL_ERROR "ADD_JAR: GENERATE_NATIVE_HEADERS: DESTINATION: ${_add_jar_GENERATE_NATIVE_HEADERS_DESTINATION_UNPARSED_ARGUMENTS}: unexpected argument(s).")
+          endif()
+          if (NOT _add_jar_GENERATE_NATIVE_HEADERS_DESTINATION_INSTALL)
+            message (FATAL_ERROR "ADD_JAR: GENERATE_NATIVE_HEADERS: DESTINATION: INSTALL sub-option is required.")
+          endif()
+          if (NOT _add_jar_GENERATE_NATIVE_HEADERS_DESTINATION_BUILD)
+            set(_add_jar_GENERATE_NATIVE_HEADERS_DESTINATION_BUILD "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${_TARGET_NAME}.dir/native_headers")
+          endif()
+          set(_add_jar_GENERATE_NATIVE_HEADERS_DESTINATION "${_add_jar_GENERATE_NATIVE_HEADERS_DESTINATION_BUILD}")
+          set(_GENERATE_NATIVE_HEADERS_OUTPUT_DESC "$<BUILD_INTERFACE:${_add_jar_GENERATE_NATIVE_HEADERS_DESTINATION_BUILD}>" "$<INSTALL_INTERFACE:${_add_jar_GENERATE_NATIVE_HEADERS_DESTINATION_INSTALL}>")
+        endif()
+      endif()
+
+      set (_GENERATE_NATIVE_HEADERS_TARGET ${_add_jar_GENERATE_NATIVE_HEADERS_UNPARSED_ARGUMENTS})
+      set (_GENERATE_NATIVE_HEADERS_OUTPUT_DIR "${_add_jar_GENERATE_NATIVE_HEADERS_DESTINATION}")
+      set (_GENERATE_NATIVE_HEADERS -h "${_GENERATE_NATIVE_HEADERS_OUTPUT_DIR}")
+      if(NOT _GENERATE_NATIVE_HEADERS_OUTPUT_DESC)
+        set(_GENERATE_NATIVE_HEADERS_OUTPUT_DESC "${_GENERATE_NATIVE_HEADERS_OUTPUT_DIR}")
+      endif()
+    endif()
+
+    if (LIBRARY_OUTPUT_PATH)
+        set(CMAKE_JAVA_LIBRARY_OUTPUT_PATH ${LIBRARY_OUTPUT_PATH})
+    else ()
+        set(CMAKE_JAVA_LIBRARY_OUTPUT_PATH ${_add_jar_OUTPUT_DIR})
+    endif ()
+
+    set(CMAKE_JAVA_INCLUDE_PATH
+        ${CMAKE_JAVA_INCLUDE_PATH}
+        ${CMAKE_CURRENT_SOURCE_DIR}
+        ${CMAKE_JAVA_OBJECT_OUTPUT_PATH}
+        ${CMAKE_JAVA_LIBRARY_OUTPUT_PATH}
+    )
+
+    foreach (JAVA_INCLUDE_DIR IN LISTS CMAKE_JAVA_INCLUDE_PATH)
+       string(APPEND CMAKE_JAVA_INCLUDE_PATH_FINAL "${_UseJava_PATH_SEP}${JAVA_INCLUDE_DIR}")
+    endforeach()
+
+    set(CMAKE_JAVA_CLASS_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${_TARGET_NAME}.dir")
+
+    set(_JAVA_TARGET_OUTPUT_NAME "${_TARGET_NAME}.jar")
+    if (_add_jar_OUTPUT_NAME AND _add_jar_VERSION)
+        set(_JAVA_TARGET_OUTPUT_NAME "${_add_jar_OUTPUT_NAME}-${_add_jar_VERSION}.jar")
+        set(_JAVA_TARGET_OUTPUT_LINK "${_add_jar_OUTPUT_NAME}.jar")
+    elseif (_add_jar_VERSION)
+        set(_JAVA_TARGET_OUTPUT_NAME "${_TARGET_NAME}-${_add_jar_VERSION}.jar")
+        set(_JAVA_TARGET_OUTPUT_LINK "${_TARGET_NAME}.jar")
+    elseif (_add_jar_OUTPUT_NAME)
+        set(_JAVA_TARGET_OUTPUT_NAME "${_add_jar_OUTPUT_NAME}.jar")
+    endif ()
+
+    set(_JAVA_CLASS_FILES)
+    set(_JAVA_COMPILE_FILES)
+    set(_JAVA_COMPILE_FILELISTS)
+    set(_JAVA_DEPENDS)
+    set(_JAVA_COMPILE_DEPENDS)
+    set(_JAVA_RESOURCE_FILES)
+    set(_JAVA_RESOURCE_FILES_RELATIVE)
+    foreach(_JAVA_SOURCE_FILE IN LISTS _JAVA_SOURCE_FILES)
+        get_filename_component(_JAVA_EXT ${_JAVA_SOURCE_FILE} EXT)
+        get_filename_component(_JAVA_FILE ${_JAVA_SOURCE_FILE} NAME_WE)
+        get_filename_component(_JAVA_PATH ${_JAVA_SOURCE_FILE} PATH)
+        get_filename_component(_JAVA_FULL ${_JAVA_SOURCE_FILE} ABSOLUTE)
+
+        if (_JAVA_SOURCE_FILE MATCHES "^@(.+)$")
+            get_filename_component(_JAVA_FULL ${CMAKE_MATCH_1} ABSOLUTE)
+            list(APPEND _JAVA_COMPILE_FILELISTS ${_JAVA_FULL})
+
+        elseif (_JAVA_EXT MATCHES ".java")
+            file(RELATIVE_PATH _JAVA_REL_BINARY_PATH ${CMAKE_CURRENT_BINARY_DIR} ${_JAVA_FULL})
+            file(RELATIVE_PATH _JAVA_REL_SOURCE_PATH ${CMAKE_CURRENT_SOURCE_DIR} ${_JAVA_FULL})
+            string(LENGTH ${_JAVA_REL_BINARY_PATH} _BIN_LEN)
+            string(LENGTH ${_JAVA_REL_SOURCE_PATH} _SRC_LEN)
+            if (_BIN_LEN LESS _SRC_LEN)
+                set(_JAVA_REL_PATH ${_JAVA_REL_BINARY_PATH})
+            else ()
+                set(_JAVA_REL_PATH ${_JAVA_REL_SOURCE_PATH})
+            endif ()
+            get_filename_component(_JAVA_REL_PATH ${_JAVA_REL_PATH} PATH)
+
+            list(APPEND _JAVA_COMPILE_FILES ${_JAVA_SOURCE_FILE})
+            set(_JAVA_CLASS_FILE "${CMAKE_JAVA_CLASS_OUTPUT_PATH}/${_JAVA_REL_PATH}/${_JAVA_FILE}.class")
+            set(_JAVA_CLASS_FILES ${_JAVA_CLASS_FILES} ${_JAVA_CLASS_FILE})
+
+        elseif (_JAVA_EXT MATCHES ".jar"
+                OR _JAVA_EXT MATCHES ".war"
+                OR _JAVA_EXT MATCHES ".ear"
+                OR _JAVA_EXT MATCHES ".sar")
+            # Ignored for backward compatibility
+
+        elseif (_JAVA_EXT STREQUAL "")
+            list(APPEND CMAKE_JAVA_INCLUDE_PATH ${JAVA_JAR_TARGET_${_JAVA_SOURCE_FILE}} ${JAVA_JAR_TARGET_${_JAVA_SOURCE_FILE}_CLASSPATH})
+            list(APPEND _JAVA_DEPENDS ${JAVA_JAR_TARGET_${_JAVA_SOURCE_FILE}})
+
+        else ()
+            __java_copy_file(${CMAKE_CURRENT_SOURCE_DIR}/${_JAVA_SOURCE_FILE}
+                             ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/${_JAVA_SOURCE_FILE}
+                             "Copying ${_JAVA_SOURCE_FILE} to the build directory")
+            list(APPEND _JAVA_RESOURCE_FILES ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/${_JAVA_SOURCE_FILE})
+            list(APPEND _JAVA_RESOURCE_FILES_RELATIVE ${_JAVA_SOURCE_FILE})
+        endif ()
+    endforeach()
+
+    foreach(_JAVA_INCLUDE_JAR IN LISTS _add_jar_INCLUDE_JARS)
+        if (TARGET ${_JAVA_INCLUDE_JAR})
+            get_target_property(_JAVA_JAR_PATH ${_JAVA_INCLUDE_JAR} JAR_FILE)
+            if (_JAVA_JAR_PATH)
+                string(APPEND CMAKE_JAVA_INCLUDE_PATH_FINAL "${_UseJava_PATH_SEP}${_JAVA_JAR_PATH}")
+                list(APPEND CMAKE_JAVA_INCLUDE_PATH ${_JAVA_JAR_PATH})
+                list(APPEND _JAVA_DEPENDS ${_JAVA_INCLUDE_JAR})
+                list(APPEND _JAVA_COMPILE_DEPENDS ${_JAVA_JAR_PATH})
+            else ()
+                message(SEND_ERROR "add_jar: INCLUDE_JARS target ${_JAVA_INCLUDE_JAR} is not a jar")
+            endif ()
+        else ()
+            string(APPEND CMAKE_JAVA_INCLUDE_PATH_FINAL "${_UseJava_PATH_SEP}${_JAVA_INCLUDE_JAR}")
+            list(APPEND CMAKE_JAVA_INCLUDE_PATH "${_JAVA_INCLUDE_JAR}")
+            list(APPEND _JAVA_DEPENDS "${_JAVA_INCLUDE_JAR}")
+            list(APPEND _JAVA_COMPILE_DEPENDS "${_JAVA_INCLUDE_JAR}")
+        endif ()
+    endforeach()
+
+    if (_JAVA_COMPILE_FILES OR _JAVA_COMPILE_FILELISTS)
+        set (_JAVA_SOURCES_FILELISTS)
+
+        if (_JAVA_COMPILE_FILES)
+            # Create the list of files to compile.
+            set(_JAVA_SOURCES_FILE ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/java_sources)
+            string(REPLACE ";" "\"\n\"" _JAVA_COMPILE_STRING "\"${_JAVA_COMPILE_FILES}\"")
+            file(WRITE ${_JAVA_SOURCES_FILE} ${_JAVA_COMPILE_STRING})
+            list (APPEND _JAVA_SOURCES_FILELISTS "@${_JAVA_SOURCES_FILE}")
+        endif()
+        if (_JAVA_COMPILE_FILELISTS)
+            foreach (_JAVA_FILELIST IN LISTS _JAVA_COMPILE_FILELISTS)
+                list (APPEND _JAVA_SOURCES_FILELISTS "@${_JAVA_FILELIST}")
+            endforeach()
+        endif()
+
+        # Compile the java files and create a list of class files
+        add_custom_command(
+            # NOTE: this command generates an artificial dependency file
+            OUTPUT ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/java_compiled_${_TARGET_NAME}
+            COMMAND ${Java_JAVAC_EXECUTABLE}
+                ${CMAKE_JAVA_COMPILE_FLAGS}
+                -classpath "${CMAKE_JAVA_INCLUDE_PATH_FINAL}"
+                -d ${CMAKE_JAVA_CLASS_OUTPUT_PATH}
+                ${_GENERATE_NATIVE_HEADERS}
+                ${_JAVA_SOURCES_FILELISTS}
+            COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/java_compiled_${_TARGET_NAME}
+            DEPENDS ${_JAVA_COMPILE_FILES} ${_JAVA_COMPILE_FILELISTS} ${_JAVA_COMPILE_DEPENDS}
+            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+            COMMENT "Building Java objects for ${_TARGET_NAME}.jar"
+        )
+        add_custom_command(
+            OUTPUT ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/java_class_filelist
+            COMMAND ${CMAKE_COMMAND}
+                -DCMAKE_JAVA_CLASS_OUTPUT_PATH=${CMAKE_JAVA_CLASS_OUTPUT_PATH}
+                -DCMAKE_JAR_CLASSES_PREFIX=${CMAKE_JAR_CLASSES_PREFIX}
+                -P ${_JAVA_CLASS_FILELIST_SCRIPT}
+            DEPENDS ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/java_compiled_${_TARGET_NAME}
+            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+        )
+    else ()
+        # create an empty java_class_filelist
+        if (NOT EXISTS ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/java_class_filelist)
+            file(WRITE ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/java_class_filelist "")
+        endif()
+    endif ()
+
+    # create the jar file
+    set(_JAVA_JAR_OUTPUT_PATH
+      "${_add_jar_OUTPUT_DIR}/${_JAVA_TARGET_OUTPUT_NAME}")
+    if (CMAKE_JNI_TARGET)
+        add_custom_command(
+            OUTPUT ${_JAVA_JAR_OUTPUT_PATH}
+            COMMAND ${Java_JAR_EXECUTABLE}
+                -cf${_ENTRY_POINT_OPTION}${_MANIFEST_OPTION} ${_JAVA_JAR_OUTPUT_PATH} ${_ENTRY_POINT_VALUE} ${_MANIFEST_VALUE}
+                ${_JAVA_RESOURCE_FILES_RELATIVE} @java_class_filelist
+            COMMAND ${CMAKE_COMMAND}
+                -D_JAVA_TARGET_DIR=${_add_jar_OUTPUT_DIR}
+                -D_JAVA_TARGET_OUTPUT_NAME=${_JAVA_TARGET_OUTPUT_NAME}
+                -D_JAVA_TARGET_OUTPUT_LINK=${_JAVA_TARGET_OUTPUT_LINK}
+                -P ${_JAVA_SYMLINK_SCRIPT}
+            COMMAND ${CMAKE_COMMAND}
+                -D_JAVA_TARGET_DIR=${_add_jar_OUTPUT_DIR}
+                -D_JAVA_TARGET_OUTPUT_NAME=${_JAVA_JAR_OUTPUT_PATH}
+                -D_JAVA_TARGET_OUTPUT_LINK=${_JAVA_TARGET_OUTPUT_LINK}
+                -P ${_JAVA_SYMLINK_SCRIPT}
+            DEPENDS ${_JAVA_RESOURCE_FILES} ${_JAVA_DEPENDS} ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/java_class_filelist
+            WORKING_DIRECTORY ${CMAKE_JAVA_CLASS_OUTPUT_PATH}
+            COMMENT "Creating Java archive ${_JAVA_TARGET_OUTPUT_NAME}"
+        )
+    else ()
+        add_custom_command(
+            OUTPUT ${_JAVA_JAR_OUTPUT_PATH}
+            COMMAND ${Java_JAR_EXECUTABLE}
+                -cf${_ENTRY_POINT_OPTION}${_MANIFEST_OPTION} ${_JAVA_JAR_OUTPUT_PATH} ${_ENTRY_POINT_VALUE} ${_MANIFEST_VALUE}
+                ${_JAVA_RESOURCE_FILES_RELATIVE} @java_class_filelist
+            COMMAND ${CMAKE_COMMAND}
+                -D_JAVA_TARGET_DIR=${_add_jar_OUTPUT_DIR}
+                -D_JAVA_TARGET_OUTPUT_NAME=${_JAVA_TARGET_OUTPUT_NAME}
+                -D_JAVA_TARGET_OUTPUT_LINK=${_JAVA_TARGET_OUTPUT_LINK}
+                -P ${_JAVA_SYMLINK_SCRIPT}
+            WORKING_DIRECTORY ${CMAKE_JAVA_CLASS_OUTPUT_PATH}
+            DEPENDS ${_JAVA_RESOURCE_FILES} ${_JAVA_DEPENDS} ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/java_class_filelist
+            COMMENT "Creating Java archive ${_JAVA_TARGET_OUTPUT_NAME}"
+        )
+    endif ()
+
+    # Add the target and make sure we have the latest resource files.
+    add_custom_target(${_TARGET_NAME} ALL DEPENDS ${_JAVA_JAR_OUTPUT_PATH})
+
+    set_property(
+        TARGET
+            ${_TARGET_NAME}
+        PROPERTY
+            INSTALL_FILES
+                ${_JAVA_JAR_OUTPUT_PATH}
+    )
+
+    if (_JAVA_TARGET_OUTPUT_LINK)
+        set_property(
+            TARGET
+                ${_TARGET_NAME}
+            PROPERTY
+                INSTALL_FILES
+                    ${_JAVA_JAR_OUTPUT_PATH}
+                    ${_add_jar_OUTPUT_DIR}/${_JAVA_TARGET_OUTPUT_LINK}
+        )
+
+        if (CMAKE_JNI_TARGET)
+            set_property(
+                TARGET
+                    ${_TARGET_NAME}
+                PROPERTY
+                    JNI_SYMLINK
+                        ${_add_jar_OUTPUT_DIR}/${_JAVA_TARGET_OUTPUT_LINK}
+            )
+        endif ()
+    endif ()
+
+    set_property(
+        TARGET
+            ${_TARGET_NAME}
+        PROPERTY
+            JAR_FILE
+                ${_JAVA_JAR_OUTPUT_PATH}
+    )
+
+    set_property(
+        TARGET
+            ${_TARGET_NAME}
+        PROPERTY
+            CLASSDIR
+                ${CMAKE_JAVA_CLASS_OUTPUT_PATH}
+    )
+
+  if (_GENERATE_NATIVE_HEADERS)
+    # create an INTERFACE library encapsulating include directory for generated headers
+    add_library (${_GENERATE_NATIVE_HEADERS_TARGET} INTERFACE)
+    target_include_directories (${_GENERATE_NATIVE_HEADERS_TARGET} INTERFACE
+      "${_GENERATE_NATIVE_HEADERS_OUTPUT_DESC}"
+      ${JNI_INCLUDE_DIRS})
+    set_property(TARGET ${_GENERATE_NATIVE_HEADERS_TARGET} PROPERTY NATIVE_HEADERS_DIRECTORY "${_GENERATE_NATIVE_HEADERS_OUTPUT_DIR}")
+    # this INTERFACE library depends on jar generation
+    add_dependencies (${_GENERATE_NATIVE_HEADERS_TARGET} ${_TARGET_NAME})
+
+    set_property (DIRECTORY APPEND PROPERTY ADDITIONAL_CLEAN_FILES
+      "${_GENERATE_NATIVE_HEADERS_OUTPUT_DIR}")
+  endif()
+endfunction()
+
+function(INSTALL_JAR _TARGET_NAME)
+    if (ARGC EQUAL 2)
+      set (_DESTINATION ${ARGV1})
+    else()
+      cmake_parse_arguments(_install_jar
+        ""
+        "DESTINATION;COMPONENT"
+        ""
+        ${ARGN})
+      if (_install_jar_DESTINATION)
+        set (_DESTINATION ${_install_jar_DESTINATION})
+      else()
+        message(SEND_ERROR "install_jar: ${_TARGET_NAME}: DESTINATION must be specified.")
+      endif()
+
+      if (_install_jar_COMPONENT)
+        set (_COMPONENT COMPONENT ${_install_jar_COMPONENT})
+      endif()
+    endif()
+
+    get_property(__FILES
+        TARGET
+            ${_TARGET_NAME}
+        PROPERTY
+            INSTALL_FILES
+    )
+    set_property(
+        TARGET
+            ${_TARGET_NAME}
+        PROPERTY
+            INSTALL_DESTINATION
+            ${_DESTINATION}
+    )
+
+    if (__FILES)
+        install(
+            FILES
+                ${__FILES}
+            DESTINATION
+                ${_DESTINATION}
+            ${_COMPONENT}
+        )
+    else ()
+        message(SEND_ERROR "install_jar: The target ${_TARGET_NAME} is not known in this scope.")
+    endif ()
+endfunction()
+
+function(INSTALL_JNI_SYMLINK _TARGET_NAME)
+    if (ARGC EQUAL 2)
+      set (_DESTINATION ${ARGV1})
+    else()
+      cmake_parse_arguments(_install_jni_symlink
+        ""
+        "DESTINATION;COMPONENT"
+        ""
+        ${ARGN})
+      if (_install_jni_symlink_DESTINATION)
+        set (_DESTINATION ${_install_jni_symlink_DESTINATION})
+      else()
+        message(SEND_ERROR "install_jni_symlink: ${_TARGET_NAME}: DESTINATION must be specified.")
+      endif()
+
+      if (_install_jni_symlink_COMPONENT)
+        set (_COMPONENT COMPONENT ${_install_jni_symlink_COMPONENT})
+      endif()
+    endif()
+
+    get_property(__SYMLINK
+        TARGET
+            ${_TARGET_NAME}
+        PROPERTY
+            JNI_SYMLINK
+    )
+
+    if (__SYMLINK)
+        install(
+            FILES
+                ${__SYMLINK}
+            DESTINATION
+                ${_DESTINATION}
+            ${_COMPONENT}
+        )
+    else ()
+        message(SEND_ERROR "install_jni_symlink: The target ${_TARGET_NAME} is not known in this scope.")
+    endif ()
+endfunction()
+
+function (find_jar VARIABLE)
+    set(_jar_names)
+    set(_jar_files)
+    set(_jar_versions)
+    set(_jar_paths
+        /usr/share/java/
+        /usr/local/share/java/
+        ${Java_JAR_PATHS})
+    set(_jar_doc "NOTSET")
+
+    set(_state "name")
+
+    foreach (arg IN LISTS ARGN)
+        if (_state STREQUAL "name")
+            if (arg STREQUAL "VERSIONS")
+                set(_state "versions")
+            elseif (arg STREQUAL "NAMES")
+                set(_state "names")
+            elseif (arg STREQUAL "PATHS")
+                set(_state "paths")
+            elseif (arg STREQUAL "DOC")
+                set(_state "doc")
+            else ()
+                set(_jar_names ${arg})
+                if (_jar_doc STREQUAL "NOTSET")
+                    set(_jar_doc "Finding ${arg} jar")
+                endif ()
+            endif ()
+        elseif (_state STREQUAL "versions")
+            if (arg STREQUAL "NAMES")
+                set(_state "names")
+            elseif (arg STREQUAL "PATHS")
+                set(_state "paths")
+            elseif (arg STREQUAL "DOC")
+                set(_state "doc")
+            else ()
+                set(_jar_versions ${_jar_versions} ${arg})
+            endif ()
+        elseif (_state STREQUAL "names")
+            if (arg STREQUAL "VERSIONS")
+                set(_state "versions")
+            elseif (arg STREQUAL "PATHS")
+                set(_state "paths")
+            elseif (arg STREQUAL "DOC")
+                set(_state "doc")
+            else ()
+                set(_jar_names ${_jar_names} ${arg})
+                if (_jar_doc STREQUAL "NOTSET")
+                    set(_jar_doc "Finding ${arg} jar")
+                endif ()
+            endif ()
+        elseif (_state STREQUAL "paths")
+            if (arg STREQUAL "VERSIONS")
+                set(_state "versions")
+            elseif (arg STREQUAL "NAMES")
+                set(_state "names")
+            elseif (arg STREQUAL "DOC")
+                set(_state "doc")
+            else ()
+                set(_jar_paths ${_jar_paths} ${arg})
+            endif ()
+        elseif (_state STREQUAL "doc")
+            if (arg STREQUAL "VERSIONS")
+                set(_state "versions")
+            elseif (arg STREQUAL "NAMES")
+                set(_state "names")
+            elseif (arg STREQUAL "PATHS")
+                set(_state "paths")
+            else ()
+                set(_jar_doc ${arg})
+            endif ()
+        endif ()
+    endforeach ()
+
+    if (NOT _jar_names)
+        message(FATAL_ERROR "find_jar: No name to search for given")
+    endif ()
+
+    foreach (jar_name IN LISTS _jar_names)
+        foreach (version IN LISTS _jar_versions)
+            set(_jar_files ${_jar_files} ${jar_name}-${version}.jar)
+        endforeach ()
+        set(_jar_files ${_jar_files} ${jar_name}.jar)
+    endforeach ()
+
+    find_file(${VARIABLE}
+        NAMES   ${_jar_files}
+        PATHS   ${_jar_paths}
+        DOC     ${_jar_doc}
+        NO_DEFAULT_PATH)
+endfunction ()
+
+function(create_javadoc _target)
+    set(_javadoc_packages)
+    set(_javadoc_files)
+    set(_javadoc_overview)
+    set(_javadoc_sourcepath)
+    set(_javadoc_classpath)
+    set(_javadoc_installpath "${CMAKE_INSTALL_PREFIX}/share/javadoc")
+    set(_javadoc_doctitle)
+    set(_javadoc_windowtitle)
+    set(_javadoc_author FALSE)
+    set(_javadoc_version FALSE)
+    set(_javadoc_use FALSE)
+
+    set(_state "package")
+
+    foreach (arg IN LISTS ARGN)
+        if (_state STREQUAL "package")
+            if (arg STREQUAL "PACKAGES")
+                set(_state "packages")
+            elseif (arg STREQUAL "FILES")
+                set(_state "files")
+            elseif (arg STREQUAL "SOURCEPATH")
+                set(_state "sourcepath")
+            elseif (arg STREQUAL "OVERVIEW")
+                set(_state "overview")
+            elseif (arg STREQUAL "CLASSPATH")
+                set(_state "classpath")
+            elseif (arg STREQUAL "INSTALLPATH")
+                set(_state "installpath")
+            elseif (arg STREQUAL "DOCTITLE")
+                set(_state "doctitle")
+            elseif (arg STREQUAL "WINDOWTITLE")
+                set(_state "windowtitle")
+            elseif (arg STREQUAL "AUTHOR")
+                set(_state "author")
+            elseif (arg STREQUAL "USE")
+                set(_state "use")
+            elseif (arg STREQUAL "VERSION")
+                set(_state "version")
+            else ()
+                set(_javadoc_packages ${arg})
+                set(_state "packages")
+            endif ()
+        elseif (_state STREQUAL "packages")
+            if (arg STREQUAL "FILES")
+                set(_state "files")
+            elseif (arg STREQUAL "SOURCEPATH")
+                set(_state "sourcepath")
+            elseif (arg STREQUAL "OVERVIEW")
+                set(_state "overview")
+            elseif (arg STREQUAL "CLASSPATH")
+                set(_state "classpath")
+            elseif (arg STREQUAL "INSTALLPATH")
+                set(_state "installpath")
+            elseif (arg STREQUAL "DOCTITLE")
+                set(_state "doctitle")
+            elseif (arg STREQUAL "WINDOWTITLE")
+                set(_state "windowtitle")
+            elseif (arg STREQUAL "AUTHOR")
+                set(_state "author")
+            elseif (arg STREQUAL "USE")
+                set(_state "use")
+            elseif (arg STREQUAL "VERSION")
+                set(_state "version")
+            else ()
+                list(APPEND _javadoc_packages ${arg})
+            endif ()
+        elseif (_state STREQUAL "files")
+            if (arg STREQUAL "PACKAGES")
+                set(_state "packages")
+            elseif (arg STREQUAL "SOURCEPATH")
+                set(_state "sourcepath")
+            elseif (arg STREQUAL "OVERVIEW")
+                set(_state "overview")
+            elseif (arg STREQUAL "CLASSPATH")
+                set(_state "classpath")
+            elseif (arg STREQUAL "INSTALLPATH")
+                set(_state "installpath")
+            elseif (arg STREQUAL "DOCTITLE")
+                set(_state "doctitle")
+            elseif (arg STREQUAL "WINDOWTITLE")
+                set(_state "windowtitle")
+            elseif (arg STREQUAL "AUTHOR")
+                set(_state "author")
+            elseif (arg STREQUAL "USE")
+                set(_state "use")
+            elseif (arg STREQUAL "VERSION")
+                set(_state "version")
+            else ()
+                list(APPEND _javadoc_files ${arg})
+            endif ()
+        elseif (_state STREQUAL "sourcepath")
+            if (arg STREQUAL "PACKAGES")
+                set(_state "packages")
+            elseif (arg STREQUAL "FILES")
+                set(_state "files")
+            elseif (arg STREQUAL "OVERVIEW")
+                set(_state "overview")
+            elseif (arg STREQUAL "CLASSPATH")
+                set(_state "classpath")
+            elseif (arg STREQUAL "INSTALLPATH")
+                set(_state "installpath")
+            elseif (arg STREQUAL "DOCTITLE")
+                set(_state "doctitle")
+            elseif (arg STREQUAL "WINDOWTITLE")
+                set(_state "windowtitle")
+            elseif (arg STREQUAL "AUTHOR")
+                set(_state "author")
+            elseif (arg STREQUAL "USE")
+                set(_state "use")
+            elseif (arg STREQUAL "VERSION")
+                set(_state "version")
+            else ()
+                list(APPEND _javadoc_sourcepath ${arg})
+            endif ()
+        elseif (_state STREQUAL "classpath")
+            if (arg STREQUAL "PACKAGES")
+                set(_state "packages")
+            elseif (arg STREQUAL "FILES")
+                set(_state "files")
+            elseif (arg STREQUAL "OVERVIEW")
+                set(_state "overview")
+            elseif (arg STREQUAL "SOURCEPATH")
+                set(_state "sourcepath")
+            elseif (arg STREQUAL "INSTALLPATH")
+                set(_state "installpath")
+            elseif (arg STREQUAL "DOCTITLE")
+                set(_state "doctitle")
+            elseif (arg STREQUAL "WINDOWTITLE")
+                set(_state "windowtitle")
+            elseif (arg STREQUAL "AUTHOR")
+                set(_state "author")
+            elseif (arg STREQUAL "USE")
+                set(_state "use")
+            elseif (arg STREQUAL "VERSION")
+                set(_state "version")
+            else ()
+                list(APPEND _javadoc_classpath ${arg})
+            endif ()
+        elseif (_state STREQUAL "installpath")
+            if (arg STREQUAL "PACKAGES")
+                set(_state "packages")
+            elseif (arg STREQUAL "FILES")
+                set(_state "files")
+            elseif (arg STREQUAL "SOURCEPATH")
+                set(_state "sourcepath")
+            elseif (arg STREQUAL "OVERVIEW")
+                set(_state "overview")
+            elseif (arg STREQUAL "DOCTITLE")
+                set(_state "doctitle")
+            elseif (arg STREQUAL "WINDOWTITLE")
+                set(_state "windowtitle")
+            elseif (arg STREQUAL "AUTHOR")
+                set(_state "author")
+            elseif (arg STREQUAL "USE")
+                set(_state "use")
+            elseif (arg STREQUAL "VERSION")
+                set(_state "version")
+            else ()
+                set(_javadoc_installpath ${arg})
+            endif ()
+        elseif (_state STREQUAL "doctitle")
+            if (${arg} STREQUAL "PACKAGES")
+                set(_state "packages")
+            elseif (arg STREQUAL "FILES")
+                set(_state "files")
+            elseif (arg STREQUAL "SOURCEPATH")
+                set(_state "sourcepath")
+            elseif (arg STREQUAL "OVERVIEW")
+                set(_state "overview")
+            elseif (arg STREQUAL "INSTALLPATH")
+                set(_state "installpath")
+            elseif (arg STREQUAL "CLASSPATH")
+                set(_state "classpath")
+            elseif (arg STREQUAL "WINDOWTITLE")
+                set(_state "windowtitle")
+            elseif (arg STREQUAL "AUTHOR")
+                set(_state "author")
+            elseif (arg STREQUAL "USE")
+                set(_state "use")
+            elseif (arg STREQUAL "VERSION")
+                set(_state "version")
+            else ()
+                set(_javadoc_doctitle ${arg})
+            endif ()
+        elseif (_state STREQUAL "windowtitle")
+            if (${arg} STREQUAL "PACKAGES")
+                set(_state "packages")
+            elseif (arg STREQUAL "FILES")
+                set(_state "files")
+            elseif (arg STREQUAL "SOURCEPATH")
+                set(_state "sourcepath")
+            elseif (arg STREQUAL "OVERVIEW")
+                set(_state "overview")
+            elseif (arg STREQUAL "CLASSPATH")
+                set(_state "classpath")
+            elseif (arg STREQUAL "INSTALLPATH")
+                set(_state "installpath")
+            elseif (arg STREQUAL "DOCTITLE")
+                set(_state "doctitle")
+            elseif (arg STREQUAL "AUTHOR")
+                set(_state "author")
+            elseif (arg STREQUAL "USE")
+                set(_state "use")
+            elseif (arg STREQUAL "VERSION")
+                set(_state "version")
+            else ()
+                set(_javadoc_windowtitle ${arg})
+            endif ()
+        elseif (_state STREQUAL "author")
+            if (arg STREQUAL "PACKAGES")
+                set(_state "packages")
+            elseif (arg STREQUAL "FILES")
+                set(_state "files")
+            elseif (arg STREQUAL "SOURCEPATH")
+                set(_state "sourcepath")
+            elseif (arg STREQUAL "OVERVIEW")
+                set(_state "overview")
+            elseif (arg STREQUAL "CLASSPATH")
+                set(_state "classpath")
+            elseif (arg STREQUAL "INSTALLPATH")
+                set(_state "installpath")
+            elseif (arg STREQUAL "DOCTITLE")
+                set(_state "doctitle")
+            elseif (arg STREQUAL "WINDOWTITLE")
+                set(_state "windowtitle")
+            elseif (arg STREQUAL "AUTHOR")
+                set(_state "author")
+            elseif (arg STREQUAL "USE")
+                set(_state "use")
+            elseif (arg STREQUAL "VERSION")
+                set(_state "version")
+            else ()
+                set(_javadoc_author ${arg})
+            endif ()
+        elseif (_state STREQUAL "use")
+            if (arg STREQUAL "PACKAGES")
+                set(_state "packages")
+            elseif (arg STREQUAL "FILES")
+                set(_state "files")
+            elseif (arg STREQUAL "SOURCEPATH")
+                set(_state "sourcepath")
+            elseif (arg STREQUAL "OVERVIEW")
+                set(_state "overview")
+            elseif (arg STREQUAL "CLASSPATH")
+                set(_state "classpath")
+            elseif (arg STREQUAL "INSTALLPATH")
+                set(_state "installpath")
+            elseif (arg STREQUAL "DOCTITLE")
+                set(_state "doctitle")
+            elseif (arg STREQUAL "WINDOWTITLE")
+                set(_state "windowtitle")
+            elseif (arg STREQUAL "AUTHOR")
+                set(_state "author")
+            elseif (arg STREQUAL "USE")
+                set(_state "use")
+            elseif (arg STREQUAL "VERSION")
+                set(_state "version")
+            else ()
+                set(_javadoc_use ${arg})
+            endif ()
+        elseif (_state STREQUAL "version")
+            if (arg STREQUAL "PACKAGES")
+                set(_state "packages")
+            elseif (arg STREQUAL "FILES")
+                set(_state "files")
+            elseif (arg STREQUAL "SOURCEPATH")
+                set(_state "sourcepath")
+            elseif (arg STREQUAL "OVERVIEW")
+                set(_state "overview")
+            elseif (arg STREQUAL "CLASSPATH")
+                set(_state "classpath")
+            elseif (arg STREQUAL "INSTALLPATH")
+                set(_state "installpath")
+            elseif (arg STREQUAL "DOCTITLE")
+                set(_state "doctitle")
+            elseif (arg STREQUAL "WINDOWTITLE")
+                set(_state "windowtitle")
+            elseif (arg STREQUAL "AUTHOR")
+                set(_state "author")
+            elseif (arg STREQUAL "USE")
+                set(_state "use")
+            elseif (arg STREQUAL "VERSION")
+                set(_state "version")
+            else ()
+                set(_javadoc_version ${arg})
+            endif ()
+        elseif (_state STREQUAL "overview")
+            if (arg STREQUAL "PACKAGES")
+                set(_state "packages")
+            elseif (arg STREQUAL "FILES")
+                set(_state "files")
+            elseif (arg STREQUAL "SOURCEPATH")
+                set(_state "sourcepath")
+            elseif (arg STREQUAL "CLASSPATH")
+                set(_state "classpath")
+            elseif (arg STREQUAL "INSTALLPATH")
+                set(_state "installpath")
+            elseif (arg STREQUAL "DOCTITLE")
+                set(_state "doctitle")
+            elseif (arg STREQUAL "WINDOWTITLE")
+                set(_state "windowtitle")
+            elseif (arg STREQUAL "AUTHOR")
+                set(_state "author")
+            elseif (arg STREQUAL "USE")
+                set(_state "use")
+            elseif (arg STREQUAL "VERSION")
+                set(_state "version")
+            else ()
+                set(_javadoc_overview ${arg})
+            endif ()
+        endif ()
+    endforeach ()
+
+    set(_javadoc_builddir ${CMAKE_CURRENT_BINARY_DIR}/javadoc/${_target})
+    set(_javadoc_options -d ${_javadoc_builddir})
+
+    if (_javadoc_sourcepath)
+        list(JOIN _javadoc_sourcepath "${_UseJava_PATH_SEP}" _javadoc_sourcepath)
+        list(APPEND _javadoc_options -sourcepath "\"${_javadoc_sourcepath}\"")
+    endif ()
+
+    if (_javadoc_overview)
+        list(JOIN _javadoc_overview "${_UseJava_PATH_SEP}" _javadoc_overview)
+        list(APPEND _javadoc_options -overview "\"${_javadoc_overview}\"")
+    endif ()
+
+    if (_javadoc_classpath)
+        list(JOIN _javadoc_classpath "${_UseJava_PATH_SEP}" _javadoc_classpath)
+        list(APPEND _javadoc_options -classpath "\"${_javadoc_classpath}\"")
+    endif ()
+
+    if (_javadoc_doctitle)
+        list(APPEND _javadoc_options -doctitle '${_javadoc_doctitle}')
+    endif ()
+
+    if (_javadoc_windowtitle)
+        list(APPEND _javadoc_options -windowtitle '${_javadoc_windowtitle}')
+    endif ()
+
+    if (_javadoc_author)
+        list(APPEND _javadoc_options -author)
+    endif ()
+
+    if (_javadoc_use)
+        list(APPEND _javadoc_options -use)
+    endif ()
+
+    if (_javadoc_version)
+        list(APPEND _javadoc_options -version)
+    endif ()
+
+    add_custom_target(${_target}_javadoc ALL
+        COMMAND ${Java_JAVADOC_EXECUTABLE}
+                -Xdoclint:none
+                ${_javadoc_options}
+                ${_javadoc_files}
+                ${_javadoc_packages}
+        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    )
+
+    install(
+        DIRECTORY ${_javadoc_builddir}
+        DESTINATION ${_javadoc_installpath}
+    )
+endfunction()
+
+function (create_javah)
+  if (Java_VERSION VERSION_GREATER_EQUAL 10)
+    message (FATAL_ERROR "create_javah: not supported with this Java version. Use add_jar(GENERATE_NATIVE_HEADERS) instead.")
+  elseif (Java_VERSION VERSION_GREATER_EQUAL 1.8)
+    message (DEPRECATION "create_javah: this command will no longer be supported starting with version 10 of JDK. Update your project by using command add_jar(GENERATE_NATIVE_HEADERS) instead.")
+  endif()
+
+    cmake_parse_arguments(_create_javah
+      ""
+      "TARGET;GENERATED_FILES;OUTPUT_NAME;OUTPUT_DIR"
+      "CLASSES;CLASSPATH;DEPENDS"
+      ${ARGN})
+
+    # ckeck parameters
+    if (NOT _create_javah_TARGET AND NOT _create_javah_GENERATED_FILES)
+      message (FATAL_ERROR "create_javah: TARGET or GENERATED_FILES must be specified.")
+    endif()
+    if (_create_javah_OUTPUT_NAME AND _create_javah_OUTPUT_DIR)
+      message (FATAL_ERROR "create_javah: OUTPUT_NAME and OUTPUT_DIR are mutually exclusive.")
+    endif()
+
+    if (NOT _create_javah_CLASSES)
+      message (FATAL_ERROR "create_javah: CLASSES is a required parameter.")
+    endif()
+
+    set (_output_files)
+
+    # handle javah options
+    set (_javah_options)
+
+    if (_create_javah_CLASSPATH)
+      # CLASSPATH can specify directories, jar files or targets created with add_jar command
+      set (_classpath)
+      foreach (_path IN LISTS _create_javah_CLASSPATH)
+        if (TARGET ${_path})
+          get_target_property (_jar_path ${_path} JAR_FILE)
+          if (_jar_path)
+            list (APPEND _classpath "${_jar_path}")
+            list (APPEND _create_javah_DEPENDS "${_path}")
+          else()
+            message(SEND_ERROR "create_javah: CLASSPATH target ${_path} is not a jar.")
+          endif()
+        elseif (EXISTS "${_path}")
+          list (APPEND _classpath "${_path}")
+          if (NOT IS_DIRECTORY "${_path}")
+            list (APPEND _create_javah_DEPENDS "${_path}")
+          endif()
+        else()
+          message(SEND_ERROR "create_javah: CLASSPATH entry ${_path} does not exist.")
+        endif()
+      endforeach()
+      string (REPLACE ";" "${_UseJava_PATH_SEP}" _classpath "${_classpath}")
+      list (APPEND _javah_options -classpath "${_classpath}")
+    endif()
+
+    if (_create_javah_OUTPUT_DIR)
+      list (APPEND _javah_options -d "${_create_javah_OUTPUT_DIR}")
+    endif()
+
+    if (_create_javah_OUTPUT_NAME)
+      list (APPEND _javah_options -o "${_create_javah_OUTPUT_NAME}")
+      set (_output_files "${_create_javah_OUTPUT_NAME}")
+
+      get_filename_component (_create_javah_OUTPUT_DIR "${_create_javah_OUTPUT_NAME}" DIRECTORY)
+      get_filename_component (_create_javah_OUTPUT_DIR "${_create_javah_OUTPUT_DIR}" ABSOLUTE)
+    endif()
+
+    if (NOT _create_javah_OUTPUT_DIR)
+      set (_create_javah_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}")
+    endif()
+
+    if (NOT _create_javah_OUTPUT_NAME)
+      # compute output names
+      foreach (_class IN LISTS _create_javah_CLASSES)
+        string (REPLACE "." "_" _c_header "${_class}")
+        set (_c_header  "${_create_javah_OUTPUT_DIR}/${_c_header}.h")
+        list (APPEND _output_files "${_c_header}")
+      endforeach()
+    endif()
+
+    # finalize custom command arguments
+    if (_create_javah_DEPENDS)
+      list (INSERT _create_javah_DEPENDS 0 DEPENDS)
+    endif()
+
+    add_custom_command (OUTPUT ${_output_files}
+      COMMAND "${Java_JAVAH_EXECUTABLE}" ${_javah_options} -jni ${_create_javah_CLASSES}
+      ${_create_javah_DEPENDS}
+      WORKING_DIRECTORY ${_create_javah_OUTPUT_DIR}
+      COMMENT "Building C header files from classes...")
+
+    if (_create_javah_TARGET)
+      add_custom_target (${_create_javah_TARGET} ALL DEPENDS ${_output_files})
+    endif()
+    if (_create_javah_GENERATED_FILES)
+      set (${_create_javah_GENERATED_FILES} ${_output_files} PARENT_SCOPE)
+    endif()
+endfunction()
+
+function(export_jars)
+    # Parse and validate arguments
+    cmake_parse_arguments(_export_jars
+      ""
+      "FILE;NAMESPACE"
+      "TARGETS"
+      ${ARGN}
+    )
+    if (NOT _export_jars_FILE)
+      message(SEND_ERROR "export_jars: FILE must be specified.")
+    endif()
+    if (NOT _export_jars_TARGETS)
+      message(SEND_ERROR "export_jars: TARGETS must be specified.")
+    endif()
+    set(_jar_NAMESPACE "${_export_jars_NAMESPACE}")
+
+    # Set content of generated exports file
+    string(REPLACE ";" " " __targets__ "${_export_jars_TARGETS}")
+    set(__targetdefs__ "")
+    foreach(_target IN LISTS _export_jars_TARGETS)
+        get_target_property(_jarpath ${_target} JAR_FILE)
+        get_filename_component(_jarpath ${_jarpath} PATH)
+        __java_export_jar(__targetdefs__ ${_target} "${_jarpath}")
+    endforeach()
+
+    # Generate exports file
+    configure_file(
+      ${_JAVA_EXPORT_TARGETS_SCRIPT}
+      ${_export_jars_FILE}
+      @ONLY
+    )
+endfunction()
+
+function(install_jar_exports)
+    # Parse and validate arguments
+    cmake_parse_arguments(_install_jar_exports
+      ""
+      "FILE;DESTINATION;COMPONENT;NAMESPACE"
+      "TARGETS"
+      ${ARGN}
+    )
+    if (NOT _install_jar_exports_FILE)
+      message(SEND_ERROR "install_jar_exports: FILE must be specified.")
+    endif()
+    if (NOT _install_jar_exports_DESTINATION)
+      message(SEND_ERROR "install_jar_exports: DESTINATION must be specified.")
+    endif()
+    if (NOT _install_jar_exports_TARGETS)
+      message(SEND_ERROR "install_jar_exports: TARGETS must be specified.")
+    endif()
+    set(_jar_NAMESPACE "${_install_jar_exports_NAMESPACE}")
+
+    if (_install_jar_exports_COMPONENT)
+      set (_COMPONENT COMPONENT ${_install_jar_exports_COMPONENT})
+    endif()
+
+    # Determine relative path from installed export file to install prefix
+    if(IS_ABSOLUTE "${_install_jar_exports_DESTINATION}")
+      file(RELATIVE_PATH _relpath
+        ${_install_jar_exports_DESTINATION}
+        ${CMAKE_INSTALL_PREFIX}
+      )
+    else()
+      file(RELATIVE_PATH _relpath
+        ${CMAKE_INSTALL_PREFIX}/${_install_jar_exports_DESTINATION}
+        ${CMAKE_INSTALL_PREFIX}
+      )
+    endif()
+
+    # Set up unique location for generated exports file
+    string(SHA256 _hash "${_install_jar_exports_DESTINATION}")
+    set(_tmpdir ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/JavaExports/${_hash})
+
+    # Set content of generated exports file
+    string(REPLACE ";" " " __targets__ "${_install_jar_exports_TARGETS}")
+    set(__targetdefs__ "set(_prefix \${CMAKE_CURRENT_LIST_DIR}/${_relpath})\n\n")
+    foreach(_target IN LISTS _install_jar_exports_TARGETS)
+        get_target_property(_dir ${_target} INSTALL_DESTINATION)
+        __java_export_jar(__targetdefs__ ${_target} "\${_prefix}/${_dir}")
+    endforeach()
+    __java_lcat(__targetdefs__ "\nunset(_prefix)")
+
+    # Generate and install exports file
+    configure_file(
+      ${_JAVA_EXPORT_TARGETS_SCRIPT}
+      ${_tmpdir}/${_install_jar_exports_FILE}
+      @ONLY
+    )
+    install(FILES ${_tmpdir}/${_install_jar_exports_FILE}
+            DESTINATION ${_install_jar_exports_DESTINATION}
+            ${_COMPONENT})
+endfunction()
diff --git a/config/cmake/UseJavaClassFilelist.cmake b/config/cmake/UseJavaClassFilelist.cmake
new file mode 100644
index 0000000..d90ca48
--- /dev/null
+++ b/config/cmake/UseJavaClassFilelist.cmake
@@ -0,0 +1,39 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See https://cmake.org/licensing for details.
+
+# This script creates a list of compiled Java class files to be added to
+# a jar file.  This avoids including cmake files which get created in
+# the binary directory.
+
+if (CMAKE_JAVA_CLASS_OUTPUT_PATH)
+    if (EXISTS "${CMAKE_JAVA_CLASS_OUTPUT_PATH}")
+
+        set(_JAVA_GLOBBED_FILES)
+        if (CMAKE_JAR_CLASSES_PREFIX)
+            foreach(JAR_CLASS_PREFIX ${CMAKE_JAR_CLASSES_PREFIX})
+                message(STATUS "JAR_CLASS_PREFIX: ${JAR_CLASS_PREFIX}")
+
+                file(GLOB_RECURSE _JAVA_GLOBBED_TMP_FILES "${CMAKE_JAVA_CLASS_OUTPUT_PATH}/${JAR_CLASS_PREFIX}/*.class")
+                if (_JAVA_GLOBBED_TMP_FILES)
+                    list(APPEND _JAVA_GLOBBED_FILES ${_JAVA_GLOBBED_TMP_FILES})
+                endif ()
+            endforeach()
+        else()
+            file(GLOB_RECURSE _JAVA_GLOBBED_FILES "${CMAKE_JAVA_CLASS_OUTPUT_PATH}/*.class")
+        endif ()
+
+        set(_JAVA_CLASS_FILES)
+        # file(GLOB_RECURSE foo RELATIVE) is broken so we need this.
+        foreach(_JAVA_GLOBBED_FILE ${_JAVA_GLOBBED_FILES})
+            file(RELATIVE_PATH _JAVA_CLASS_FILE ${CMAKE_JAVA_CLASS_OUTPUT_PATH} ${_JAVA_GLOBBED_FILE})
+            set(_JAVA_CLASS_FILES ${_JAVA_CLASS_FILES}${_JAVA_CLASS_FILE}\n)
+        endforeach()
+
+        # write to file
+        file(WRITE ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/java_class_filelist ${_JAVA_CLASS_FILES})
+
+    else ()
+        message(SEND_ERROR "FATAL: Java class output path doesn't exist")
+    endif ()
+else ()
+    message(SEND_ERROR "FATAL: Can't find CMAKE_JAVA_CLASS_OUTPUT_PATH")
+endif ()
diff --git a/config/cmake/UseJavaSymlinks.cmake b/config/cmake/UseJavaSymlinks.cmake
new file mode 100644
index 0000000..183a744
--- /dev/null
+++ b/config/cmake/UseJavaSymlinks.cmake
@@ -0,0 +1,16 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See https://cmake.org/licensing for details.
+
+# Helper script for UseJava.cmake
+
+if (UNIX AND _JAVA_TARGET_OUTPUT_LINK)
+    if (_JAVA_TARGET_OUTPUT_NAME)
+        find_program(LN_EXECUTABLE NAMES ln)
+
+        execute_process(
+            COMMAND ${LN_EXECUTABLE} -sf "${_JAVA_TARGET_OUTPUT_NAME}" "${_JAVA_TARGET_OUTPUT_LINK}"
+            WORKING_DIRECTORY ${_JAVA_TARGET_DIR}
+        )
+    else ()
+        message(SEND_ERROR "FATAL: Can't find _JAVA_TARGET_OUTPUT_NAME")
+    endif ()
+endif ()
diff --git a/config/cmake/UserMacros/Windows_MT.cmake b/config/cmake/UserMacros/Windows_MT.cmake
index a54f22c..15cffba 100644
--- a/config/cmake/UserMacros/Windows_MT.cmake
+++ b/config/cmake/UserMacros/Windows_MT.cmake
@@ -1,16 +1,28 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
 ########################################################
 #  Include file for user options
 ########################################################
 
 # To use this option, copy both the macro and option code
-# into the root UserMacros.cmake file. 
+# into the root UserMacros.cmake file. Then enable the option,
+# using the command line add "-DBUILD_STATIC_CRT_LIBS:BOOL=ON"
 # OR add an include to the root UserMacros.cmake file:
 # INCLUDE(path_to_file/WINDOWS_MT.cmake)
 
 #-----------------------------------------------------------------------------
 # Option to Build with Static CRT libraries on Windows
 #-------------------------------------------------------------------------------
-MACRO (TARGET_STATIC_CRT_FLAGS)
+macro (TARGET_STATIC_CRT_FLAGS)
   if (MSVC AND NOT BUILD_SHARED_LIBS)
     foreach (flag_var
         CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
@@ -19,23 +31,22 @@ MACRO (TARGET_STATIC_CRT_FLAGS)
         CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
       if (${flag_var} MATCHES "/MD")
         string (REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
-      endif (${flag_var} MATCHES "/MD")
-    endforeach (flag_var)
+      endif ()
+    endforeach ()
     foreach (flag_var
         CMAKE_Fortran_FLAGS CMAKE_Fortran_FLAGS_DEBUG CMAKE_Fortran_FLAGS_RELEASE
         CMAKE_Fortran_FLAGS_MINSIZEREL CMAKE_Fortran_FLAGS_RELWITHDEBINFO)
       if (${flag_var} MATCHES "/libs:dll")
         string (REGEX REPLACE "/libs:dll" "/libs:static" ${flag_var} "${${flag_var}}")
-      endif (${flag_var} MATCHES "/libs:dll")
-    endforeach (flag_var)
+      endif ()
+    endforeach ()
     set (WIN_COMPILE_FLAGS "")
     set (WIN_LINK_FLAGS "/NODEFAULTLIB:MSVCRT")
-  endif (MSVC AND NOT BUILD_SHARED_LIBS)
-ENDMACRO (TARGET_STATIC_CRT_FLAGS)
+  endif ()
+endmacro ()
 
 #-----------------------------------------------------------------------------
 option (BUILD_STATIC_CRT_LIBS "Build With Static CRT Libraries" OFF)
 if (BUILD_STATIC_CRT_LIBS)
   TARGET_STATIC_CRT_FLAGS ()
-endif (BUILD_STATIC_CRT_LIBS)
- 
-\ No newline at end of file
+endif ()
diff --git a/config/cmake/cacheinit.cmake b/config/cmake/cacheinit.cmake
index 87d4fcc..faa0533 100644
--- a/config/cmake/cacheinit.cmake
+++ b/config/cmake/cacheinit.cmake
@@ -1,20 +1,34 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
 # This is the CMakeCache file.
 
-########################
+#########################
 # EXTERNAL cache entries
-########################
-
-set (BUILD_SHARED_LIBS ON CACHE BOOL "Build Shared Libraries" FORCE)
+#########################
 
-set (BUILD_TESTING ON CACHE BOOL "Build HDF5 Unit Testing" FORCE)
+set (CMAKE_INSTALL_FRAMEWORK_PREFIX "Library/Frameworks" CACHE STRING "Frameworks installation directory" FORCE)
 
 set (HDF_PACKAGE_EXT "" CACHE STRING "Name of HDF package extension" FORCE)
 
+set (HDF_PACKAGE_NAMESPACE "hdf5::" CACHE STRING "Name for HDF package namespace (can be empty)" FORCE)
+
+set (HDF5_BUILD_CPP_LIB ON CACHE BOOL "Build C++ support" FORCE)
+
 set (HDF5_BUILD_FORTRAN ON CACHE BOOL "Build FORTRAN support" FORCE)
 
-set (HDF5_ENABLE_F2003 ON CACHE BOOL "Enable FORTRAN 2003 Standard" FORCE)
+set (HDF5_INSTALL_MOD_FORTRAN "NO" CACHE STRING "Copy FORTRAN mod files to include directory (NO SHARED STATIC)" FORCE)
+set_property (CACHE HDF5_INSTALL_MOD_FORTRAN PROPERTY STRINGS NO SHARED STATIC)
 
-set (HDF5_BUILD_GENERATORS OFF CACHE BOOL "Build Test Generators" FORCE)
+set (HDF5_BUILD_GENERATORS ON CACHE BOOL "Build Test Generators" FORCE)
 
 set (HDF5_ENABLE_Z_LIB_SUPPORT ON CACHE BOOL "Enable Zlib Filters" FORCE)
 
@@ -22,45 +36,159 @@ set (HDF5_ENABLE_SZIP_SUPPORT ON CACHE BOOL "Use SZip Filter" FORCE)
 
 set (HDF5_ENABLE_SZIP_ENCODING ON CACHE BOOL "Use SZip Encoding" FORCE)
 
-set (HDF5_ENABLE_HSIZET ON CACHE BOOL "Enable datasets larger than memory" FORCE)
+set (MPIEXEC_MAX_NUMPROCS "4" CACHE STRING "Minimum number of processes for HDF parallel tests" FORCE)
+
+set (HDF5_ENABLE_ALL_WARNINGS ON CACHE BOOL "Enable all warnings" FORCE)
 
-set (HDF5_ENABLE_UNSUPPORTED OFF CACHE BOOL "Enable unsupported combinations of configuration options" FORCE)
+set (HDF_TEST_EXPRESS "2" CACHE STRING "Control testing framework (0-3)" FORCE)
 
-set (HDF5_ENABLE_DEPRECATED_SYMBOLS ON CACHE BOOL "Enable deprecated public API symbols" FORCE)
+set (HDF5_MINGW_STATIC_GCC_LIBS ON CACHE BOOL "Statically link libgcc/libstdc++" FORCE)
 
-set (HDF5_ENABLE_DIRECT_VFD OFF CACHE BOOL "Build the Direct I/O Virtual File Driver" FORCE)
+set (HDF5_ALLOW_EXTERNAL_SUPPORT "NO" CACHE STRING "Allow External Library Building (NO GIT TGZ)" FORCE)
+set_property (CACHE HDF5_ALLOW_EXTERNAL_SUPPORT PROPERTY STRINGS NO GIT TGZ)
 
-set (HDF5_ENABLE_PARALLEL OFF CACHE BOOL "Enable parallel build (requires MPI)" FORCE)
+set (ZLIB_TGZ_NAME "ZLib.tar.gz" CACHE STRING "Use HDF5_ZLib from compressed file" FORCE)
+set (SZIP_TGZ_NAME "SZip.tar.gz" CACHE STRING "Use SZip from compressed file" FORCE)
+set (SZAEC_TGZ_NAME "LIBAEC.tar.gz" CACHE STRING "Use SZip AEC from compressed file" FORCE)
+set (USE_LIBAEC ON CACHE BOOL "Use libaec szip replacement" FORCE)
 
-set (MPIEXEC_MAX_NUMPROCS "3" CACHE STRING "Minimum number of processes for HDF parallel tests" FORCE)
+set (ZLIB_PACKAGE_NAME "zlib" CACHE STRING "Name of HDF5_ZLIB package" FORCE)
+set (LIBAEC_PACKAGE_NAME "libaec" CACHE STRING "Name of AEC SZIP package" FORCE)
+set (SZIP_PACKAGE_NAME "szip" CACHE STRING "Name of SZIP package" FORCE)
 
-set (HDF5_BUILD_PARALLEL_ALL OFF CACHE BOOL "Build Parallel Programs" FORCE)
+########################
+# filter plugin options
+########################
 
-set (HDF5_ENABLE_COVERAGE OFF CACHE BOOL "Enable code coverage for Libraries and Programs" FORCE)
+set (PLUGIN_TGZ_NAME "hdf5_plugins.tar.gz" CACHE STRING "Use PLUGINS from compressed file" FORCE)
 
-set (HDF5_ENABLE_USING_MEMCHECKER OFF CACHE BOOL "Indicate that a memory checker is used" FORCE)
+set (PLUGIN_PACKAGE_NAME "pl" CACHE STRING "Name of PLUGIN package" FORCE)
 
-set (HDF5_DISABLE_COMPILER_WARNINGS OFF CACHE BOOL "Disable compiler warnings" FORCE)
+#############
+# bitshuffle
+#############
 
-set (HDF5_USE_FOLDERS ON CACHE BOOL "Enable folder grouping of projects in IDEs." FORCE)
+set (BSHUF_GIT_URL "https://someurl/bitshuffle.git" CACHE STRING "Use BSHUF from HDF Group repository" FORCE)
+set (BSHUF_GIT_BRANCH "master" CACHE STRING "" FORCE)
 
-set (HDF5_USE_16_API_DEFAULT OFF CACHE BOOL "Use the HDF5 1.6.x API by default" FORCE)
+set (BSHUF_TGZ_NAME "bitshuffle.tar.gz" CACHE STRING "Use BSHUF from compressed file" FORCE)
 
-set (HDF5_USE_18_API_DEFAULT OFF CACHE BOOL "Use the HDF5 1.8.x API by default" FORCE)
+set (BSHUF_PACKAGE_NAME "bshuf" CACHE STRING "Name of BSHUF package" FORCE)
 
-set (HDF5_ENABLE_THREADSAFE OFF CACHE BOOL "(WINDOWS)Enable Threadsafety" FORCE)
+########
+# blosc
+########
 
-set (HDF5_PACKAGE_EXTLIBS OFF CACHE BOOL "(WINDOWS)CPACK - include external libraries" FORCE)
+set (BLOSC_GIT_URL "https://github.com/Blosc/c-blosc.git" CACHE STRING "Use BLOSC from GitHub repository" FORCE)
+set (BLOSC_GIT_BRANCH "master" CACHE STRING "" FORCE)
 
-set (HDF5_NO_PACKAGES OFF CACHE BOOL "CPACK - Disable packaging" FORCE)
+set (BLOSC_TGZ_NAME "c-blosc.tar.gz" CACHE STRING "Use BLOSC from compressed file" FORCE)
 
-set (HDF5_ALLOW_EXTERNAL_SUPPORT "NO" CACHE STRING "Allow External Library Building (NO SVN TGZ)" FORCE)
-set_property (CACHE HDF5_ALLOW_EXTERNAL_SUPPORT PROPERTY STRINGS NO SVN TGZ)
+set (BLOSC_PACKAGE_NAME "blosc" CACHE STRING "Name of BLOSC package" FORCE)
 
-set (ZLIB_TGZ_NAME "ZLib.tar.gz" CACHE STRING "Use ZLib from compressed file" FORCE)
+set (BLOSC_ZLIB_GIT_URL "https://someurl/zlib.git" CACHE STRING "Use BLOSC_ZLIB from HDF Group repository" FORCE)
+set (BLOSC_ZLIB_GIT_BRANCH "master" CACHE STRING "" FORCE)
 
-set (SZIP_TGZ_NAME "SZip.tar.gz" CACHE STRING "Use SZip from compressed file" FORCE)
+set (BLOSC_ZLIB_TGZ_NAME "ZLib.tar.gz" CACHE STRING "Use BLOSC_ZLib from compressed file" FORCE)
 
-set (ZLIB_PACKAGE_NAME "zlib" CACHE STRING "Name of ZLIB package" FORCE)
+set (BLOSC_ZLIB_PACKAGE_NAME "zlib" CACHE STRING "Name of BLOSC_ZLIB package" FORCE)
+
+########
+# bzip2
+########
+
+set (BZ2_GIT_URL "https://someurl/bzip2.git" CACHE STRING "Use BZ2 from HDF Group repository" FORCE)
+set (BZ2_GIT_BRANCH "master" CACHE STRING "" FORCE)
+
+set (BZ2_TGZ_NAME "BZ2.tar.gz" CACHE STRING "Use BZ2 from compressed file" FORCE)
+
+set (BZ2_PACKAGE_NAME "bz2" CACHE STRING "Name of BZ2 package" FORCE)
+
+########
+# fpzip
+########
+
+set (FPZIP_GIT_URL "https://https://github.com/LLNL/fpzip" CACHE STRING "Use FPZIP from GitHub repository" FORCE)
+set (FPZIP_GIT_BRANCH "master" CACHE STRING "" FORCE)
+
+set (FPZIP_TGZ_NAME "fpzip.tar.gz" CACHE STRING "Use FPZIP from compressed file" FORCE)
+
+set (FPZIP_PACKAGE_NAME "fpzip" CACHE STRING "Name of FPZIP package" FORCE)
+
+#######
+# jpeg
+#######
+
+set (JPEG_GIT_URL "https://someurl/jpeg.git" CACHE STRING "Use JPEG from HDF Group repository" FORCE)
+set (JPEG_GIT_BRANCH "jpeg9c" CACHE STRING "" FORCE)
+
+#set (JPEG_TGZ_NAME "JPEG9c.tar.gz" CACHE STRING "Use JPEG from compressed file" FORCE)
+set (JPEG_TGZ_NAME "JPEG.tar.gz" CACHE STRING "Use JPEG from compressed file" FORCE)
+
+set (JPEG_PACKAGE_NAME "jpeg" CACHE STRING "Name of JPEG package" FORCE)
+
+######
+# lz4
+######
+
+set (BUILD_LZ4_LIBRARY_SOURCE ON CACHE BOOL "build the lz4 library within the plugin" FORCE)
+
+set (LZ4_GIT_URL "https://someurl/lz4.git" CACHE STRING "Use LZ4 from HDF Group repository" FORCE)
+set (LZ4_GIT_BRANCH "master" CACHE STRING "" FORCE)
+
+set (LZ4_TGZ_NAME "lz4.tar.gz" CACHE STRING "Use LZ4 from compressed file" FORCE)
+
+set (LZ4_PACKAGE_NAME "lz4" CACHE STRING "Name of LZ4 package" FORCE)
+
+######
+# lzf
+######
+
+set (LZF_GIT_URL "https://someurl/lzf.git" CACHE STRING "Use LZF from HDF Group repository" FORCE)
+set (LZF_GIT_BRANCH "master" CACHE STRING "" FORCE)
+
+set (LZF_TGZ_NAME "lzf.tar.gz" CACHE STRING "Use LZF from compressed file" FORCE)
+
+set (LZF_PACKAGE_NAME "lzf" CACHE STRING "Name of LZF package" FORCE)
+
+#########
+# mafisc
+#########
+
+#set (BUILD_MAFISC_LIBRARY_SOURCE OFF CACHE BOOL "build the mafisc library within the plugin" FORCE)
+
+#set (MAFISC_PACKAGE_NAME "mafisc" CACHE STRING "Name of MAFISC package" FORCE)
+
+#####
+# sz
+#####
+
+set (SZ_GIT_URL "https://github.com/disheng222/SZ" CACHE STRING "Use SZ filter from GitHub repository" FORCE)
+set (SZ_GIT_BRANCH "master" CACHE STRING "" FORCE)
+
+set (SZ_TGZ_NAME "szf.tar.gz" CACHE STRING "Use SZ filter from compressed file" FORCE)
+
+set (SZ_PACKAGE_NAME "SZ" CACHE STRING "Name of SZ filter package" FORCE)
+
+######
+# zfp
+######
+
+set (ZFP_GIT_URL "https://github.com/LLNL/zfp.git" CACHE STRING "Use ZFP from GitHub repository" FORCE)
+set (ZFP_GIT_BRANCH "master" CACHE STRING "" FORCE)
+
+set (ZFP_TGZ_NAME "zfp.tar.gz" CACHE STRING "Use ZFP from compressed file" FORCE)
+
+set (ZFP_PACKAGE_NAME "zfp" CACHE STRING "Name of ZFP package" FORCE)
+
+######
+# zstd
+######
+
+set (ZSTD_GIT_URL "https://github.com/facebook/zstd" CACHE STRING "Use ZSTD from repository" FORCE)
+set (ZSTD_GIT_BRANCH "dev" CACHE STRING "" FORCE)
+
+set (ZSTD_TGZ_NAME "zstd.tar.gz" CACHE STRING "Use ZSTD from compressed file" FORCE)
+
+set (ZSTD_PACKAGE_NAME "zstd" CACHE STRING "Name of ZSTD package" FORCE)
 
-set (SZIP_PACKAGE_NAME "szip" CACHE STRING "Name of SZIP package" FORCE)
diff --git a/config/cmake/fileCompareTest.cmake b/config/cmake/fileCompareTest.cmake
new file mode 100644
index 0000000..18a29d9
--- /dev/null
+++ b/config/cmake/fileCompareTest.cmake
@@ -0,0 +1,97 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
+# fileCompareTest.cmake compares two files.
+
+# arguments checking
+if (NOT TEST_FOLDER)
+  message (FATAL_ERROR "Require TEST_FOLDER to be defined")
+endif ()
+if (NOT TEST_ONEFILE)
+  message (FATAL_ERROR "Require TEST_ONEFILE the first file to be defined")
+endif ()
+if (NOT TEST_TWOFILE)
+  message (FATAL_ERROR "Require TEST_TWOFILE the second file to be defined")
+endif ()
+if (NOT TEST_FUNCTION)
+  message (FATAL_ERROR "Require TEST_FUNCTION (LT,LTEQ,EQ,GTEQ,GT) to be defined")
+endif ()
+
+set (TEST_ONE_SIZE 0)
+set (TEST_TWO_SIZE 0)
+set (TEST_ONE_STRING 0)
+set (TEST_TWO_STRING 0)
+set (TEST_ONE_STRING_LEN 0)
+set (TEST_TWO_STRING_LEN 0)
+
+if (TEST_STRINGS STREQUAL "YES")
+  # find the length of the first file
+  #s1=`cat $ufile | wc -c | sed -e 's/ //g'`
+  file (STRINGS ${TEST_FOLDER}/${TEST_ONEFILE} TEST_ONE_STRING)
+  string (LENGTH ${TEST_ONE_STRING} TEST_ONE_STRING_LEN)
+
+  # Get the size of the second file.
+  file (STRINGS ${TEST_FOLDER}/${TEST_TWOFILE} TEST_TWO_STRING)
+  string (LENGTH ${TEST_TWO_STRING} TEST_TWO_STRING_LEN)
+
+  math (EXPR TEST_STRING_SIZE "${TEST_ONE_STRING_LEN} - ${TEST_TWO_STRING_LEN}" )
+
+  # now compare the outputs
+  execute_process (
+      COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol ${TEST_FOLDER}/${TEST_ONEFILE} ${TEST_FOLDER}/${TEST_TWOFILE}
+      RESULT_VARIABLE TEST_RESULT
+  )
+
+  message (VERBOSE "COMPARE Result: ${TEST_RESULT}: ${TEST_STRING_SIZE}=${TEST_U_STRING_LEN}-${TEST_O_STRING_LEN}")
+  # if the return value is !=${TEST_EXPECT} bail out
+  if (NOT TEST_RESULT EQUAL TEST_EXPECT)
+    message (FATAL_ERROR "Failed: The output of ${TEST_FOLDER}/${TEST_ONEFILE} did not match ${TEST_FOLDER}/${TEST_TWOFILE}.\n${TEST_ERROR}")
+  endif ()
+else ()
+  file (SIZE ${TEST_FOLDER}/${TEST_ONEFILE} TEST_ONE_SIZE)
+  file (SIZE ${TEST_FOLDER}/${TEST_TWOFILE} TEST_TWO_SIZE)
+  if (TEST_FUNCTION MATCHES "LT")
+    if (TEST_ONE_SIZE LESS TEST_TWO_SIZE)
+      message (VERBOSE "Passed: The size of ${TEST_FOLDER}/${TEST_ONEFILE} was less ${TEST_FOLDER}/${TEST_TWOFILE}")
+    else ()
+      message (FATAL_ERROR "The size of ${TEST_FOLDER}/${TEST_ONEFILE} was NOT less ${TEST_FOLDER}/${TEST_TWOFILE}")
+    endif ()
+  elseif (TEST_FUNCTION MATCHES "LTEQ")
+    if (TEST_ONE_SIZE LESS_EQUAL TEST_TWO_SIZE)
+      message (VERBOSES "Passed: The size of ${TEST_FOLDER}/${TEST_ONEFILE} was less or equal ${TEST_FOLDER}/${TEST_TWOFILE}")
+    else ()
+      message (FATAL_ERROR "The size of ${TEST_FOLDER}/${TEST_ONEFILE} was NOT less or equal ${TEST_FOLDER}/${TEST_TWOFILE}")
+    endif ()
+  elseif (TEST_FUNCTION MATCHES "EQ")
+    if (TEST_ONE_SIZE LESS_EQUAL TEST_TWO_SIZE)
+      message (VERBOSE "Passed: The size of ${TEST_FOLDER}/${TEST_ONEFILE} was equal ${TEST_FOLDER}/${TEST_TWOFILE}")
+    else ()
+      message (FATAL_ERROR "The size of ${TEST_FOLDER}/${TEST_ONEFILE} was NOT equal ${TEST_FOLDER}/${TEST_TWOFILE}")
+    endif ()
+  elseif (TEST_FUNCTION MATCHES "GTEQ")
+    if (TEST_ONE_SIZE LESS_EQUAL TEST_TWO_SIZE)
+      message (VERBOSE "Passed: The size of ${TEST_FOLDER}/${TEST_ONEFILE} was greater or equal ${TEST_FOLDER}/${TEST_TWOFILE}")
+    else ()
+      message (FATAL_ERROR "The size of ${TEST_FOLDER}/${TEST_ONEFILE} was NOT greater or equal ${TEST_FOLDER}/${TEST_TWOFILE}")
+    endif ()
+  elseif (TEST_FUNCTION MATCHES "GT")
+    if (TEST_ONE_SIZE LESS_EQUAL TEST_TWO_SIZE)
+      message (VERBOSE "Passed: The size of ${TEST_FOLDER}/${TEST_ONEFILE} was greater ${TEST_FOLDER}/${TEST_TWOFILE}")
+    else ()
+      message (FATAL_ERROR "The size of ${TEST_FOLDER}/${TEST_ONEFILE} was NOT greater ${TEST_FOLDER}/${TEST_TWOFILE}")
+    endif ()
+  else ()
+    message (FATAL_ERROR "Failed: Incorrect test size compare command provided.\n${TEST_ERROR}")
+  endif ()
+endif ()
+
+# everything went fine...
+
diff --git a/config/cmake/grepTest.cmake b/config/cmake/grepTest.cmake
new file mode 100644
index 0000000..9e80956
--- /dev/null
+++ b/config/cmake/grepTest.cmake
@@ -0,0 +1,209 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
+# grepTest.cmake executes a command and captures the output in a file. File is then compared
+# against a reference file. Exit status of command can also be compared.
+
+# arguments checking
+if (NOT TEST_PROGRAM)
+  message (FATAL_ERROR "Require TEST_PROGRAM to be defined")
+endif ()
+if (NOT TEST_FOLDER)
+  message (FATAL_ERROR "Require TEST_FOLDER to be defined")
+endif ()
+if (NOT TEST_OUTPUT)
+  message (FATAL_ERROR "Require TEST_OUTPUT to be defined")
+endif ()
+if (NOT TEST_FILTER)
+  message (STATUS "Optional TEST_FILTER to be defined")
+endif ()
+if (NOT TEST_REFERENCE)
+  message (FATAL_ERROR "Require TEST_REFERENCE to be defined")
+endif ()
+
+if (EXISTS "${TEST_FOLDER}/${TEST_OUTPUT}")
+  file (REMOVE ${TEST_FOLDER}/${TEST_OUTPUT})
+endif ()
+
+if (EXISTS "${TEST_FOLDER}/${TEST_OUTPUT}.err")
+  file (REMOVE ${TEST_FOLDER}/${TEST_OUTPUT}.err)
+endif ()
+
+message (STATUS "COMMAND: ${TEST_EMULATOR} ${TEST_PROGRAM} ${TEST_ARGS}")
+
+if (TEST_LIBRARY_DIRECTORY)
+  if (WIN32)
+    set (ENV{PATH} "$ENV{PATH};${TEST_LIBRARY_DIRECTORY}")
+  else ()
+    set (ENV{LD_LIBRARY_PATH} "$ENV{LD_LIBRARY_PATH}:${TEST_LIBRARY_DIRECTORY}")
+  endif ()
+endif ()
+
+if (TEST_ENV_VAR)
+  set (ENV{${TEST_ENV_VAR}} "${TEST_ENV_VALUE}")
+  message (TRACE "ENV:${TEST_ENV_VAR}=$ENV{${TEST_ENV_VAR}}")
+endif ()
+
+# run the test program, capture the stdout/stderr and the result var
+execute_process (
+    COMMAND ${TEST_EMULATOR} ${TEST_PROGRAM} ${TEST_ARGS}
+    WORKING_DIRECTORY ${TEST_FOLDER}
+    RESULT_VARIABLE TEST_RESULT
+    OUTPUT_FILE ${TEST_OUTPUT}
+    ERROR_FILE ${TEST_OUTPUT}.err
+    OUTPUT_VARIABLE TEST_OUT
+    ERROR_VARIABLE TEST_ERROR
+)
+
+message (STATUS "COMMAND Result: ${TEST_RESULT}")
+
+message (STATUS "COMMAND Error: ${TEST_ERROR}")
+
+# remove special output
+file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
+string (FIND TEST_STREAM "_pmi_alps" "${TEST_FIND_RESULT}")
+if (TEST_FIND_RESULT GREATER 0)
+  string (REGEX REPLACE "^.*_pmi_alps[^\n]+\n" "" TEST_STREAM "${TEST_STREAM}")
+  file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} ${TEST_STREAM})
+endif ()
+
+# if the TEST_ERRREF exists grep the error output with the error reference
+set (TEST_ERRREF_RESULT 0)
+if (TEST_ERRREF)
+  # if the .err file exists grep the error output with the error reference before comparing stdout
+  if (EXISTS "${TEST_FOLDER}/${TEST_OUTPUT}.err")
+    file (READ ${TEST_FOLDER}/${TEST_OUTPUT}.err TEST_ERR_STREAM)
+    list (LENGTH TEST_ERR_STREAM test_len)
+    if (test_len GREATER 0)
+      # TEST_ERRREF should always be matched
+      string (REGEX MATCH "${TEST_ERRREF}" TEST_MATCH ${TEST_ERR_STREAM})
+      string (COMPARE EQUAL "${TEST_ERRREF}" "${TEST_MATCH}" TEST_ERRREF_RESULT)
+      if (NOT TEST_ERRREF_RESULT)
+        message (FATAL_ERROR "Failed: The error output of ${TEST_PROGRAM} did not contain ${TEST_ERRREF}")
+      endif ()
+    endif ()
+  endif ()
+
+  #always compare output file to reference unless this must be skipped
+  set (TEST_COMPARE_RESULT 0)
+  if (NOT TEST_SKIP_COMPARE)
+    if (EXISTS "${TEST_FOLDER}/${TEST_REFERENCE}")
+      file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
+      list (LENGTH TEST_STREAM test_len)
+      if (test_len GREATER 0)
+        if (WIN32)
+          configure_file(${TEST_FOLDER}/${TEST_REFERENCE} ${TEST_FOLDER}/${TEST_REFERENCE}.tmp NEWLINE_STYLE CRLF)
+          if (EXISTS "${TEST_FOLDER}/${TEST_REFERENCE}.tmp")
+            file(RENAME ${TEST_FOLDER}/${TEST_REFERENCE}.tmp ${TEST_FOLDER}/${TEST_REFERENCE})
+          endif ()
+          #file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
+          #file (WRITE ${TEST_FOLDER}/${TEST_REFERENCE} "${TEST_STREAM}")
+        endif ()
+        if (NOT TEST_SORT_COMPARE)
+          # now compare the output with the reference
+          execute_process (
+              COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol ${TEST_FOLDER}/${TEST_OUTPUT} ${TEST_FOLDER}/${TEST_REFERENCE}
+              RESULT_VARIABLE TEST_COMPARE_RESULT
+          )
+        else ()
+          file (STRINGS ${TEST_FOLDER}/${TEST_OUTPUT} v1)
+          file (STRINGS ${TEST_FOLDER}/${TEST_REFERENCE} v2)
+          list (SORT v1)
+          list (SORT v2)
+          if (NOT v1 STREQUAL v2)
+            set(TEST_COMPARE_RESULT 1)
+          endif ()
+        endif ()
+
+        if (TEST_COMPARE_RESULT)
+          set (TEST_COMPARE_RESULT 0)
+          file (STRINGS ${TEST_FOLDER}/${TEST_OUTPUT} test_act)
+          list (LENGTH test_act len_act)
+          file (STRINGS ${TEST_FOLDER}/${TEST_REFERENCE} test_ref)
+          list (LENGTH test_ref len_ref)
+          if (len_act GREATER 0 AND len_ref GREATER 0)
+            math (EXPR _FP_LEN "${len_ref} - 1")
+            foreach (line RANGE 0 ${_FP_LEN})
+              list (GET test_act ${line} str_act)
+              list (GET test_ref ${line} str_ref)
+              if (NOT str_act STREQUAL str_ref)
+                if (str_act)
+                  set (TEST_COMPARE_RESULT 1)
+                  message (STATUS "line = ${line}\n***ACTUAL: ${str_act}\n****REFER: ${str_ref}\n")
+                endif ()
+              endif ()
+            endforeach ()
+          else ()
+            if (len_act EQUAL 0)
+              message (STATUS "COMPARE Failed: ${TEST_FOLDER}/${TEST_OUTPUT} is empty")
+            endif ()
+            if (len_ref EQUAL 0)
+              message (STATUS "COMPARE Failed: ${TEST_FOLDER}/${TEST_REFERENCE} is empty")
+            endif ()
+          endif ()
+          if (NOT len_act EQUAL len_ref)
+            set (TEST_COMPARE_RESULT 1)
+          endif ()
+        endif ()
+      endif ()
+
+      message (STATUS "COMPARE Result: ${TEST_COMPARE_RESULT}")
+
+      # again, if return value is !=0 scream and shout
+      if (TEST_COMPARE_RESULT)
+        message (FATAL_ERROR "Failed: The output of ${TEST_OUTPUT} did not match ${TEST_REFERENCE}")
+      endif ()
+    endif ()
+  endif ()
+else ()
+  # else grep the output with the reference
+  set (TEST_GREP_RESULT 0)
+  file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
+
+  # TEST_REFERENCE should always be matched
+  string (REGEX MATCH "${TEST_REFERENCE}" TEST_MATCH ${TEST_STREAM})
+  string (COMPARE EQUAL "${TEST_REFERENCE}" "${TEST_MATCH}" TEST_GREP_RESULT)
+  if (NOT TEST_GREP_RESULT)
+    message (FATAL_ERROR "Failed: The output of ${TEST_PROGRAM} did not contain ${TEST_REFERENCE}")
+  endif ()
+endif ()
+
+
+if (TEST_FILTER)
+  string (REGEX MATCH "${TEST_FILTER}" TEST_MATCH ${TEST_STREAM})
+  if (TEST_EXPECT)
+    # TEST_EXPECT (1) interprets TEST_FILTER as; NOT to match
+    string (LENGTH "${TEST_MATCH}" TEST_GREP_RESULT)
+    if (TEST_GREP_RESULT)
+      message (FATAL_ERROR "Failed: The output of ${TEST_PROGRAM} did contain ${TEST_FILTER}")
+    endif ()
+  endif ()
+endif ()
+
+if (NOT DEFINED ENV{HDF5_NOCLEANUP})
+  if (EXISTS "${TEST_FOLDER}/${TEST_OUTPUT}")
+    file (REMOVE ${TEST_FOLDER}/${TEST_OUTPUT})
+  endif ()
+
+  if (EXISTS "${TEST_FOLDER}/${TEST_OUTPUT}.err")
+    file (REMOVE ${TEST_FOLDER}/${TEST_OUTPUT}.err)
+  endif ()
+
+  if (TEST_DELETE_LIST)
+    foreach (dfile in ${TEST_DELETE_LIST})
+      file (REMOVE ${dfile})
+    endforeach ()
+  endif ()
+endif ()
+
+# everything went fine...
+message (STATUS "Passed: The output of ${TEST_PROGRAM} matched")
+
diff --git a/config/cmake/hdf.bmp b/config/cmake/hdf.bmp
new file mode 100644
index 0000000..9e9e4aa
--- /dev/null
+++ b/config/cmake/hdf.bmp
diff --git a/config/cmake/hdf.icns b/config/cmake/hdf.icns
new file mode 100644
index 0000000..66f025d
--- /dev/null
+++ b/config/cmake/hdf.icns
diff --git a/config/cmake/hdf.ico b/config/cmake/hdf.ico
new file mode 100644
index 0000000..26abc96
--- /dev/null
+++ b/config/cmake/hdf.ico
diff --git a/config/cmake/hdf5-config-version.cmake.in b/config/cmake/hdf5-config-version.cmake.in
index 5911fa7..20ce630 100644
--- a/config/cmake/hdf5-config-version.cmake.in
+++ b/config/cmake/hdf5-config-version.cmake.in
@@ -1,3 +1,14 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
 #-----------------------------------------------------------------------------
 # HDF5 Version file for install directory
 #-----------------------------------------------------------------------------
@@ -10,37 +21,37 @@
 
 set (PACKAGE_VERSION "@HDF5_VERSION_STRING@")
 
-if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
+if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
   set(PACKAGE_VERSION_COMPATIBLE FALSE)
 else()
-  if ("${PACKAGE_FIND_VERSION_MAJOR}" STREQUAL "@H5_VERS_MAJOR@")
-    
-    # exact match for version @H5_VERS_MAJOR@.@H5_VERS_MINOR@
-    if ("${PACKAGE_FIND_VERSION_MINOR}" STREQUAL "@H5_VERS_MINOR@")
-    
-      # compatible with any version @H5_VERS_MAJOR@.@H5_VERS_MINOR@.x
-      set (PACKAGE_VERSION_COMPATIBLE TRUE) 
-        
-      if ("${PACKAGE_FIND_VERSION_PATCH}" STREQUAL "@H5_VERS_RELEASE@")
-        set (PACKAGE_VERSION_EXACT TRUE)
-   
-        if ("${PACKAGE_FIND_VERSION_TWEAK}" STREQUAL "@H5_VERS_SUBRELEASE@")
-          # not using this yet
-        endif ("${PACKAGE_FIND_VERSION_TWEAK}" STREQUAL "@H5_VERS_SUBRELEASE@")
-      endif ("${PACKAGE_FIND_VERSION_PATCH}" STREQUAL "@H5_VERS_RELEASE@")
-    else ("${PACKAGE_FIND_VERSION_MINOR}" STREQUAL "@H5_VERS_MINOR@")
-      set (PACKAGE_VERSION_COMPATIBLE FALSE) 
-    endif ("${PACKAGE_FIND_VERSION_MINOR}" STREQUAL "@H5_VERS_MINOR@")
-  endif ("${PACKAGE_FIND_VERSION_MAJOR}" STREQUAL "@H5_VERS_MAJOR@")
+  if("@H5_VERS_MAJOR@.@H5_VERS_MINOR@" MATCHES "^([0-9]+)\\.([0-9]+)")
+    set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
+    set(CVF_VERSION_MINOR "${CMAKE_MATCH_2}")
+  else()
+    set(CVF_VERSION_MAJOR "@HDF5_VERSION_STRING@")
+    set(CVF_VERSION_MINOR "")
+  endif()
+
+  if((PACKAGE_FIND_VERSION_MAJOR STREQUAL CVF_VERSION_MAJOR) AND
+     (PACKAGE_FIND_VERSION_MINOR STRLESS_EQUAL CVF_VERSION_MINOR))
+    set(PACKAGE_VERSION_COMPATIBLE TRUE)
+  else()
+    set(PACKAGE_VERSION_COMPATIBLE FALSE)
+  endif()
+
+  if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
+      set(PACKAGE_VERSION_EXACT TRUE)
+  endif()
 endif()
 
+
 # if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
-if("${CMAKE_SIZEOF_VOID_P}"  STREQUAL ""  OR "@CMAKE_SIZEOF_VOID_P@" STREQUAL "")
+if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "@CMAKE_SIZEOF_VOID_P@" STREQUAL "")
    return()
 endif()
 
 # check that the installed version has the same 32/64bit-ness as the one which is currently searching:
-if(NOT "${CMAKE_SIZEOF_VOID_P}" STREQUAL "@CMAKE_SIZEOF_VOID_P@")
+if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "@CMAKE_SIZEOF_VOID_P@")
   math(EXPR installedBits "@CMAKE_SIZEOF_VOID_P@ * 8")
   set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
   set(PACKAGE_VERSION_UNSUITABLE TRUE)
diff --git a/config/cmake/hdf5-config.cmake.in b/config/cmake/hdf5-config.cmake.in
index 5b91df2..1a3fb7b 100644
--- a/config/cmake/hdf5-config.cmake.in
+++ b/config/cmake/hdf5-config.cmake.in
@@ -1,3 +1,14 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
 #-----------------------------------------------------------------------------
 # HDF5 Config file for compiling against hdf5 build/install directory
 #-----------------------------------------------------------------------------
@@ -6,12 +17,15 @@
 string(TOUPPER @HDF5_PACKAGE@ HDF5_PACKAGE_NAME)
 
 set (${HDF5_PACKAGE_NAME}_VALID_COMPONENTS
+    static
+    shared
     C
     CXX
     Fortran
     HL
     CXX_HL
     Fortran_HL
+    Java
     Tools
 )
 
@@ -20,37 +34,57 @@ set (${HDF5_PACKAGE_NAME}_VALID_COMPONENTS
 #-----------------------------------------------------------------------------
 set (${HDF5_PACKAGE_NAME}_ENABLE_PARALLEL @HDF5_ENABLE_PARALLEL@)
 set (${HDF5_PACKAGE_NAME}_BUILD_FORTRAN   @HDF5_BUILD_FORTRAN@)
-set (${HDF5_PACKAGE_NAME}_ENABLE_F2003    @HDF5_ENABLE_F2003@)
 set (${HDF5_PACKAGE_NAME}_BUILD_CPP_LIB   @HDF5_BUILD_CPP_LIB@)
+set (${HDF5_PACKAGE_NAME}_BUILD_JAVA      @HDF5_BUILD_JAVA@)
 set (${HDF5_PACKAGE_NAME}_BUILD_TOOLS     @HDF5_BUILD_TOOLS@)
 set (${HDF5_PACKAGE_NAME}_BUILD_HL_LIB    @HDF5_BUILD_HL_LIB@)
+set (${HDF5_PACKAGE_NAME}_BUILD_HL_TOOLS  @HDF5_BUILD_HL_TOOLS@)
+set (${HDF5_PACKAGE_NAME}_ENABLE_THREADSAFE @HDF5_ENABLE_THREADSAFE@)
+set (${HDF5_PACKAGE_NAME}_ENABLE_PLUGIN_SUPPORT @HDF5_ENABLE_PLUGIN_SUPPORT@)
 set (${HDF5_PACKAGE_NAME}_ENABLE_Z_LIB_SUPPORT @HDF5_ENABLE_Z_LIB_SUPPORT@)
 set (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_SUPPORT  @HDF5_ENABLE_SZIP_SUPPORT@)
 set (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_ENCODING @HDF5_ENABLE_SZIP_ENCODING@)
-set (${HDF5_PACKAGE_NAME}_BUILD_SHARED_LIBS    @BUILD_SHARED_LIBS@)
+set (${HDF5_PACKAGE_NAME}_BUILD_SHARED_LIBS    @H5_ENABLE_SHARED_LIB@)
+set (${HDF5_PACKAGE_NAME}_BUILD_STATIC_LIBS    @H5_ENABLE_STATIC_LIB@)
 set (${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS      @HDF5_PACKAGE_EXTLIBS@)
 set (${HDF5_PACKAGE_NAME}_EXPORT_LIBRARIES @HDF5_LIBRARIES_TO_EXPORT@)
+set (${HDF5_PACKAGE_NAME}_ARCHITECTURE "@CMAKE_GENERATOR_ARCHITECTURE@")
+set (${HDF5_PACKAGE_NAME}_TOOLSET "@CMAKE_GENERATOR_TOOLSET@")
+set (${HDF5_PACKAGE_NAME}_DEFAULT_API_VERSION "@DEFAULT_API_VERSION@")
+set (${HDF5_PACKAGE_NAME}_PARALLEL_FILTERED_WRITES "@PARALLEL_FILTERED_WRITES@")
 
 #-----------------------------------------------------------------------------
 # Dependencies
 #-----------------------------------------------------------------------------
 if (${HDF5_PACKAGE_NAME}_ENABLE_PARALLEL)
-  set (${HDF5_PACKAGE_NAME}_MPI_C_INCLUDE_PATH "@MPI_C_INCLUDE_PATH@")
+  set (${HDF5_PACKAGE_NAME}_MPI_C_INCLUDE_PATH "@MPI_C_INCLUDE_DIRS@")
   set (${HDF5_PACKAGE_NAME}_MPI_C_LIBRARIES    "@MPI_C_LIBRARIES@")
+  if (${HDF5_PACKAGE_NAME}_BUILD_FORTRAN)
+    set (${HDF5_PACKAGE_NAME}_MPI_Fortran_INCLUDE_PATH "@MPI_Fortran_INCLUDE_DIRS@")
+    set (${HDF5_PACKAGE_NAME}_MPI_Fortran_LIBRARIES    "@MPI_Fortran_LIBRARIES@")
+  endif ()
+
+  find_package(MPI QUIET REQUIRED)
+endif ()
+
+if (${HDF5_PACKAGE_NAME}_BUILD_JAVA)
+  set (${HDF5_PACKAGE_NAME}_JAVA_INCLUDE_DIRS
+      @PACKAGE_CURRENT_BUILD_DIR@/lib/jarhdf5-@HDF5_VERSION_STRING@.jar
+      @PACKAGE_CURRENT_BUILD_DIR@/lib/slf4j-api-1.7.33.jar
+      @PACKAGE_CURRENT_BUILD_DIR@/lib/slf4j-nop-1.7.33.jar
+  )
+  set (${HDF5_PACKAGE_NAME}_JAVA_LIBRARY "@PACKAGE_CURRENT_BUILD_DIR@/lib")
+  set (${HDF5_PACKAGE_NAME}_JAVA_LIBRARIES "${${HDF5_PACKAGE_NAME}_JAVA_LIBRARY}")
 endif ()
 
 #-----------------------------------------------------------------------------
 # Directories
 #-----------------------------------------------------------------------------
-set (${HDF5_PACKAGE_NAME}_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@" "${${HDF5_PACKAGE_NAME}_MPI_C_INCLUDE_PATH}")
+set (${HDF5_PACKAGE_NAME}_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@" "${${HDF5_PACKAGE_NAME}_MPI_C_INCLUDE_DIRS}")
 
 set (${HDF5_PACKAGE_NAME}_SHARE_DIR "@PACKAGE_SHARE_INSTALL_DIR@")
 set_and_check (${HDF5_PACKAGE_NAME}_BUILD_DIR "@PACKAGE_CURRENT_BUILD_DIR@")
 
-if (${HDF5_PACKAGE_NAME}_BUILD_FORTRAN)
-  set (${HDF5_PACKAGE_NAME}_INCLUDE_DIR_FORTRAN "@PACKAGE_INCLUDE_INSTALL_DIR@")
-endif ()
-  
 if (${HDF5_PACKAGE_NAME}_BUILD_CPP_LIB)
   set (${HDF5_PACKAGE_NAME}_INCLUDE_DIR_CPP "@PACKAGE_INCLUDE_INSTALL_DIR@")
 endif ()
@@ -68,82 +102,115 @@ if (${HDF5_PACKAGE_NAME}_BUILD_TOOLS)
   set_and_check (${HDF5_PACKAGE_NAME}_TOOLS_DIR "@PACKAGE_CURRENT_BUILD_DIR@/bin")
 endif ()
 
-if (HDF5_BUILD_SHARED_LIBS)
-  set (H5_BUILT_AS_DYNAMIC_LIB 1)
-else ()
-  set (H5_BUILT_AS_STATIC_LIB 1)
-endif ()
-
 #-----------------------------------------------------------------------------
 # Version Strings
 #-----------------------------------------------------------------------------
-set (HDF5_VERSION_STRING @HDF5_VERSION_STRING@)
-set (HDF5_VERSION_MAJOR  @HDF5_VERSION_MAJOR@)
-set (HDF5_VERSION_MINOR  @HDF5_VERSION_MINOR@)
+set (${HDF5_PACKAGE_NAME}_VERSION_STRING @HDF5_VERSION_STRING@)
+set (${HDF5_PACKAGE_NAME}_VERSION_MAJOR  @HDF5_VERSION_MAJOR@)
+set (${HDF5_PACKAGE_NAME}_VERSION_MINOR  @HDF5_VERSION_MINOR@)
 
 #-----------------------------------------------------------------------------
 # Don't include targets if this file is being picked up by another
 # project which has already built hdf5 as a subproject
 #-----------------------------------------------------------------------------
 if (NOT TARGET "@HDF5_PACKAGE@")
-  if (${HDF5_PACKAGE_NAME}_ENABLE_Z_LIB_SUPPORT AND ${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS AND NOT TARGET "zlib")
+  if (${HDF5_PACKAGE_NAME}_ENABLE_Z_LIB_SUPPORT AND ${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS)
     include (@PACKAGE_SHARE_INSTALL_DIR@/@ZLIB_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake)
   endif ()
-  if (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_SUPPORT AND ${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS AND NOT TARGET "szip")
+  if (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_SUPPORT AND ${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS)
     include (@PACKAGE_SHARE_INSTALL_DIR@/@SZIP_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake)
   endif ()
   include (@PACKAGE_SHARE_INSTALL_DIR@/@HDF5_PACKAGE@@HDF_PACKAGE_EXT@-targets.cmake)
 endif ()
 
-# Handle default component :
+# Handle default component(static) :
 if (NOT ${HDF5_PACKAGE_NAME}_FIND_COMPONENTS)
-    set (${HDF5_PACKAGE_NAME}_FIND_COMPONENTS C)
-    set (${HDF5_PACKAGE_NAME}_FIND_REQUIRED_C true)
+  if (${HDF5_PACKAGE_NAME}_BUILD_STATIC_LIBS)
+    set (${HDF5_PACKAGE_NAME}_LIB_TYPE)
+    set (${HDF5_PACKAGE_NAME}_FIND_COMPONENTS C HL static)
+    set (${HDF5_PACKAGE_NAME}_FIND_REQUIRED_static_C true)
+  else ()
+    set (${HDF5_PACKAGE_NAME}_LIB_TYPE)
+    set (${HDF5_PACKAGE_NAME}_FIND_COMPONENTS C HL shared)
+    set (${HDF5_PACKAGE_NAME}_FIND_REQUIRED_shared_C true)
+  endif ()
 endif ()
 
 # Handle requested components:
 list (REMOVE_DUPLICATES ${HDF5_PACKAGE_NAME}_FIND_COMPONENTS)
+foreach (comp IN LISTS ${HDF5_PACKAGE_NAME}_FIND_COMPONENTS)
+  if (comp STREQUAL "shared")
+    list (REMOVE_ITEM ${HDF5_PACKAGE_NAME}_FIND_COMPONENTS ${comp})
+    set (${HDF5_PACKAGE_NAME}_LIB_TYPE ${${HDF5_PACKAGE_NAME}_LIB_TYPE} ${comp})
+
+    if (${HDF5_PACKAGE_NAME}_BUILD_FORTRAN)
+      set (${HDF5_PACKAGE_NAME}_INCLUDE_DIR_FORTRAN "@PACKAGE_INCLUDE_INSTALL_DIR@/shared")
+    endif ()
+  elseif (comp STREQUAL "static")
+    list (REMOVE_ITEM ${HDF5_PACKAGE_NAME}_FIND_COMPONENTS ${comp})
+    set (${HDF5_PACKAGE_NAME}_LIB_TYPE ${${HDF5_PACKAGE_NAME}_LIB_TYPE} ${comp})
+
+    if (${HDF5_PACKAGE_NAME}_BUILD_FORTRAN)
+      set (${HDF5_PACKAGE_NAME}_INCLUDE_DIR_FORTRAN "@PACKAGE_INCLUDE_INSTALL_DIR@/static")
+    endif ()
+  endif ()
+endforeach ()
+foreach (libtype IN LISTS ${HDF5_PACKAGE_NAME}_LIB_TYPE)
   foreach (comp IN LISTS ${HDF5_PACKAGE_NAME}_FIND_COMPONENTS)
     set (hdf5_comp2)
-    if (${comp} MATCHES "C")
+    if (comp STREQUAL "C")
       set (hdf5_comp "hdf5")
-    elseif (${comp} MATCHES "CXX")
+    elseif (comp STREQUAL "CXX")
       set (hdf5_comp "hdf5_cpp")
-    elseif (${comp} MATCHES "HL")
+    elseif (comp STREQUAL "HL")
       set (hdf5_comp "hdf5_hl")
-    elseif (${comp} MATCHES "CXX_HL")
+    elseif (comp STREQUAL "CXX_HL")
       set (hdf5_comp "hdf5_hl_cpp")
-    elseif (${comp} MATCHES "Tools")
+    elseif (comp STREQUAL "Java")
+      set (hdf5_comp "hdf5_java")
+    elseif (comp STREQUAL "Tools")
       set (hdf5_comp "hdf5_tools")
-    elseif (${comp} MATCHES "Fortran")
+    elseif (comp STREQUAL "Fortran")
       set (hdf5_comp2 "hdf5_f90cstub")
       set (hdf5_comp "hdf5_fortran")
-    elseif (${comp} MATCHES "Fortran_HL")
+    elseif (comp STREQUAL "Fortran_HL")
       set (hdf5_comp2 "hdf5_hl_f90cstub")
       set (hdf5_comp "hdf5_hl_fortran")
     endif ()
-    list (FIND ${HDF5_PACKAGE_NAME}_EXPORT_LIBRARIES "${hdf5_comp}" HAVE_COMP) 
-    if (${HAVE_COMP} LESS 0) 
-      set (${HDF5_PACKAGE_NAME}_${comp}_FOUND 0)
+    if (comp STREQUAL "Java")
+      list (FIND ${HDF5_PACKAGE_NAME}_EXPORT_LIBRARIES "${hdf5_comp}" HAVE_COMP)
+    else ()
+      list (FIND ${HDF5_PACKAGE_NAME}_EXPORT_LIBRARIES "${hdf5_comp}-${libtype}" HAVE_COMP)
+    endif ()
+    if (${HAVE_COMP} LESS 0)
+      if (comp STREQUAL "Java")
+        set (${HDF5_PACKAGE_NAME}_${comp}_FOUND 0)
+      else ()
+        set (${HDF5_PACKAGE_NAME}_${libtype}_${comp}_FOUND 0)
+      endif ()
     else ()
       if (hdf5_comp2)
-        list (FIND ${HDF5_PACKAGE_NAME}_EXPORT_LIBRARIES "${hdf5_comp2}" HAVE_COMP2) 
+        list (FIND ${HDF5_PACKAGE_NAME}_EXPORT_LIBRARIES "${hdf5_comp2}-${libtype}" HAVE_COMP2)
         if (${HAVE_COMP2} LESS 0)
-          set (${HDF5_PACKAGE_NAME}_${comp}_FOUND 0)
+          set (${HDF5_PACKAGE_NAME}_${libtype}_${comp}_FOUND 0)
         else ()
-          set (${HDF5_PACKAGE_NAME}_${comp}_FOUND 1)
-          string(TOUPPER ${HDF5_PACKAGE_NAME}_${comp}_LIBRARY COMP_LIBRARY)
-          set (${COMP_LIBRARY} ${${COMP_LIBRARY}} ${hdf5_comp2} ${hdf5_comp})
+          set (${HDF5_PACKAGE_NAME}_${libtype}_${comp}_FOUND 1)
+          string(TOUPPER ${HDF5_PACKAGE_NAME}_${comp}_${libtype}_LIBRARY COMP_LIBRARY)
+          set (${COMP_LIBRARY} ${${COMP_LIBRARY}} @HDF_PACKAGE_NAMESPACE@${hdf5_comp2}-${libtype} @HDF_PACKAGE_NAMESPACE@${hdf5_comp}-${libtype})
         endif ()
-      else ()
+      elseif (comp STREQUAL "Java")
         set (${HDF5_PACKAGE_NAME}_${comp}_FOUND 1)
         string(TOUPPER ${HDF5_PACKAGE_NAME}_${comp}_LIBRARY COMP_LIBRARY)
-        set (${COMP_LIBRARY} ${${COMP_LIBRARY}} ${hdf5_comp})
+        set (${COMP_LIBRARY} ${${COMP_LIBRARY}} @HDF_PACKAGE_NAMESPACE@${hdf5_comp})
+      else ()
+        set (${HDF5_PACKAGE_NAME}_${libtype}_${comp}_FOUND 1)
+        string(TOUPPER ${HDF5_PACKAGE_NAME}_${comp}_${libtype}_LIBRARY COMP_LIBRARY)
+        set (${COMP_LIBRARY} ${${COMP_LIBRARY}} @HDF_PACKAGE_NAMESPACE@${hdf5_comp}-${libtype})
       endif ()
     endif ()
   endforeach ()
+endforeach ()
 
-  check_required_components(${HDF5_PACKAGE_NAME}_FIND_COMPONENTS)
-
-set (${HDF5_PACKAGE_NAME}_LIBRARIES ${${COMP_LIBRARY}})
-  
-\ No newline at end of file
+foreach (libtype IN LISTS ${HDF5_PACKAGE_NAME}_LIB_TYPE)
+  check_required_components(${HDF5_PACKAGE_NAME}_${libtype})
+endforeach ()
diff --git a/config/cmake/javaTargets.cmake.in b/config/cmake/javaTargets.cmake.in
new file mode 100644
index 0000000..6e14256
--- /dev/null
+++ b/config/cmake/javaTargets.cmake.in
@@ -0,0 +1,39 @@
+cmake_minimum_required(VERSION 2.8.12)
+cmake_policy(PUSH)
+cmake_policy(VERSION 2.8)
+
+#----------------------------------------------------------------
+# Generated CMake Java target import file.
+#----------------------------------------------------------------
+
+# Protect against multiple inclusion, which would fail when already imported targets are added once more.
+set(_targetsDefined)
+set(_targetsNotDefined)
+set(_expectedTargets)
+foreach(_expectedTarget @__targets__@)
+  list(APPEND _expectedTargets ${_expectedTarget})
+  if(TARGET ${_expectedTarget})
+    list(APPEND _targetsDefined ${_expectedTarget})
+  else()
+    list(APPEND _targetsNotDefined ${_expectedTarget})
+  endif()
+endforeach()
+if("%${_targetsDefined}" STREQUAL "%${_expectedTargets}")
+  unset(_targetsDefined)
+  unset(_targetsNotDefined)
+  unset(_expectedTargets)
+  cmake_policy(POP)
+  return()
+endif()
+if(NOT "${_targetsDefined}" STREQUAL "")
+  message(FATAL_ERROR
+    "Some (but not all) targets in this export set were already defined.\n"
+    "Targets Defined: ${_targetsDefined}\n"
+    "Targets not yet defined: ${_targetsNotDefined}\n")
+endif()
+unset(_targetsDefined)
+unset(_targetsNotDefined)
+unset(_expectedTargets)
+
+@__targetdefs__@
+cmake_policy(POP)
diff --git a/config/cmake/jrunTest.cmake b/config/cmake/jrunTest.cmake
new file mode 100644
index 0000000..21183af
--- /dev/null
+++ b/config/cmake/jrunTest.cmake
@@ -0,0 +1,319 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
+# jrunTest.cmake executes a command and captures the output in a file. File is then compared
+# against a reference file. Exit status of command can also be compared.
+cmake_policy(SET CMP0007 NEW)
+
+# arguments checking
+if (NOT TEST_TESTER)
+  message (FATAL_ERROR "Require TEST_TESTER to be defined")
+endif ()
+if (NOT TEST_PROGRAM)
+  message (FATAL_ERROR "Require TEST_PROGRAM to be defined")
+endif ()
+if (NOT TEST_LIBRARY_DIRECTORY)
+  message (STATUS "Require TEST_LIBRARY_DIRECTORY to be defined")
+endif ()
+if (NOT TEST_FOLDER)
+  message (FATAL_ERROR "Require TEST_FOLDER to be defined")
+endif ()
+if (NOT TEST_OUTPUT)
+  message (FATAL_ERROR "Require TEST_OUTPUT to be defined")
+endif ()
+if (NOT TEST_CLASSPATH)
+  message (STATUS "Require TEST_CLASSPATH to be defined")
+endif ()
+
+if (EXISTS "${TEST_FOLDER}/${TEST_OUTPUT}")
+  file (REMOVE ${TEST_FOLDER}/${TEST_OUTPUT})
+endif ()
+
+if (EXISTS "${TEST_FOLDER}/${TEST_OUTPUT}.err")
+  file (REMOVE ${TEST_FOLDER}/${TEST_OUTPUT}.err)
+endif ()
+
+if (NOT TEST_LOG_LEVEL)
+  set (LOG_LEVEL "info")
+else ()
+  set (LOG_LEVEL "${TEST_LOG_LEVEL}")
+endif ()
+
+if (NOT TEST_VOL)
+  message (STATUS "COMMAND: ${TEST_TESTER} -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=${LOG_LEVEL} -Djava.library.path=\"${TEST_LIBRARY_DIRECTORY}\" -cp \"${TEST_CLASSPATH}\" ${TEST_ARGS} ${TEST_PROGRAM} ${ARGN}")
+else ()
+  message (STATUS "USING ${TEST_VOL} ON COMMAND: ${TEST_TESTER} -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=${LOG_LEVEL} -Djava.library.path=\"${TEST_LIBRARY_DIRECTORY}\" -cp \"${TEST_CLASSPATH}\" ${TEST_ARGS} ${TEST_PROGRAM} ${ARGN}")
+  set (ENV{HDF5_VOL_CONNECTOR} "${TEST_VOL}")
+endif ()
+
+if (WIN32)
+  set (ENV{PATH} "$ENV{PATH}\\;${TEST_LIBRARY_DIRECTORY}")
+else ()
+  set (ENV{LD_LIBRARY_PATH} "$ENV{LD_LIBRARY_PATH}:${TEST_LIBRARY_DIRECTORY}")
+endif ()
+
+# run the test program, capture the stdout/stderr and the result var
+execute_process (
+    COMMAND ${TEST_TESTER} -Xmx1024M
+    -Dorg.slf4j.simpleLogger.defaultLogLevel=${LOG_LEVEL}
+    -Djava.library.path=${TEST_LIBRARY_DIRECTORY}
+    -cp "${TEST_CLASSPATH}" ${TEST_ARGS} ${TEST_PROGRAM}
+    ${ARGN}
+    WORKING_DIRECTORY ${TEST_FOLDER}
+    RESULT_VARIABLE TEST_RESULT
+    OUTPUT_FILE ${TEST_OUTPUT}
+    ERROR_FILE ${TEST_OUTPUT}.err
+    OUTPUT_VARIABLE TEST_OUT
+    ERROR_VARIABLE TEST_ERROR
+)
+
+message (STATUS "COMMAND Result: ${TEST_RESULT}")
+
+# if the .err file exists and ERRROR_APPEND is enabled
+if (EXISTS "${TEST_FOLDER}/${TEST_OUTPUT}.err")
+  file (READ ${TEST_FOLDER}/${TEST_OUTPUT}.err TEST_STREAM)
+  list (LENGTH TEST_STREAM test_len)
+  if (test_len GREATER 0)
+    if (TEST_MASK_FILE)
+      STRING(REGEX REPLACE "CurrentDir is [^\n]+\n" "CurrentDir is (dir name)\n" TEST_STREAM "${TEST_STREAM}")
+    endif ()
+
+    if (NOT ERROR_APPEND)
+      # write back to original .err file
+      file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT}.err "${TEST_STREAM}")
+    else ()
+      # append error output to the stdout output file
+      file (APPEND ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
+    endif ()
+  endif ()
+endif ()
+
+# if the output file or the .err file needs to mask out error stack info
+if (TEST_MASK_ERROR)
+  if (NOT TEST_ERRREF)
+    # the error stack has been appended to the output file
+    file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
+  else ()
+    # the error stack remains in the .err file
+    file (READ ${TEST_FOLDER}/${TEST_OUTPUT}.err TEST_STREAM)
+  endif ()
+  string (REGEX REPLACE "Time:[^\n]+\n" "Time:  XXXX\n" TEST_STREAM "${TEST_STREAM}")
+  string (REGEX REPLACE "thread [0-9]*:" "thread (IDs):" TEST_STREAM "${TEST_STREAM}")
+  string (REGEX REPLACE ": ([^\n]*)[.]c " ": (file name) " TEST_STREAM "${TEST_STREAM}")
+  string (REGEX REPLACE " line [0-9]*" " line (number)" TEST_STREAM "${TEST_STREAM}")
+  #string (REGEX REPLACE "v[1-9]*[.][0-9]*[.]" "version (number)." TEST_STREAM "${TEST_STREAM}")
+  string (REGEX REPLACE "HDF5 .[1-9]*[.][0-9]*[.][0-9]*[^)]*" "HDF5 (version (number)" TEST_STREAM "${TEST_STREAM}")
+  string (REGEX REPLACE "H5Eget_auto[1-2]*" "H5Eget_auto(1 or 2)" TEST_STREAM "${TEST_STREAM}")
+  string (REGEX REPLACE "H5Eset_auto[1-2]*" "H5Eset_auto(1 or 2)" TEST_STREAM "${TEST_STREAM}")
+  # write back the changes to the original files
+  if (NOT TEST_ERRREF)
+    file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
+  else ()
+    file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT}.err "${TEST_STREAM}")
+  endif ()
+endif ()
+
+# if the return value is !=expected bail out
+if (NOT TEST_RESULT EQUAL TEST_EXPECT)
+  message (STATUS "ERROR OUTPUT: ${TEST_STREAM}")
+  message (FATAL_ERROR "Failed: Test program ${TEST_PROGRAM} exited != 0.\n${TEST_ERROR}")
+endif ()
+
+message (STATUS "COMMAND Error: ${TEST_ERROR}")
+
+# compare output files to references unless this must be skipped
+set (TEST_COMPARE_RESULT 0)
+if (NOT TEST_SKIP_COMPARE)
+  if (EXISTS "${TEST_FOLDER}/${TEST_REFERENCE}")
+    file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
+    list (LENGTH TEST_STREAM test_len)
+    if (test_len GREATER 0)
+      if (WIN32)
+        configure_file(${TEST_FOLDER}/${TEST_REFERENCE} ${TEST_FOLDER}/${TEST_REFERENCE}.tmp NEWLINE_STYLE CRLF)
+        if (EXISTS "${TEST_FOLDER}/${TEST_REFERENCE}.tmp")
+          file(RENAME ${TEST_FOLDER}/${TEST_REFERENCE}.tmp ${TEST_FOLDER}/${TEST_REFERENCE})
+        endif ()
+        #file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
+        #file (WRITE ${TEST_FOLDER}/${TEST_REFERENCE} "${TEST_STREAM}")
+      endif ()
+
+      if (NOT TEST_SORT_COMPARE)
+        # now compare the output with the reference
+        execute_process (
+            COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol ${TEST_FOLDER}/${TEST_OUTPUT} ${TEST_FOLDER}/${TEST_REFERENCE}
+            RESULT_VARIABLE TEST_COMPARE_RESULT
+        )
+      else ()
+        file (STRINGS ${TEST_FOLDER}/${TEST_OUTPUT} v1)
+        file (STRINGS ${TEST_FOLDER}/${TEST_REFERENCE} v2)
+        list (SORT v1)
+        list (SORT v2)
+        if (NOT v1 STREQUAL v2)
+          set(TEST_COMPARE_RESULT 1)
+        endif ()
+      endif ()
+
+      if (TEST_COMPARE_RESULT)
+        set (TEST_COMPARE_RESULT 0)
+        file (STRINGS ${TEST_FOLDER}/${TEST_OUTPUT} test_act)
+        list (LENGTH test_act len_act)
+        file (STRINGS ${TEST_FOLDER}/${TEST_REFERENCE} test_ref)
+        list (LENGTH test_ref len_ref)
+        if (len_act GREATER 0 AND len_ref GREATER 0)
+          math (EXPR _FP_LEN "${len_ref} - 1")
+          foreach (line RANGE 0 ${_FP_LEN})
+            list (GET test_act ${line} str_act)
+            list (GET test_ref ${line} str_ref)
+            if (NOT str_act STREQUAL str_ref)
+              if (str_act)
+                set (TEST_COMPARE_RESULT 1)
+                message (STATUS "line = ${line}\n***ACTUAL: ${str_act}\n****REFER: ${str_ref}\n")
+              endif ()
+            endif ()
+          endforeach ()
+        else ()
+          if (len_act EQUAL 0)
+            message (STATUS "COMPARE Failed: ${TEST_FOLDER}/${TEST_OUTPUT} is empty")
+          endif ()
+          if (len_ref EQUAL 0)
+            message (STATUS "COMPARE Failed: ${TEST_FOLDER}/${TEST_REFERENCE} is empty")
+          endif ()
+        endif ()
+        if (NOT len_act EQUAL len_ref)
+          set (TEST_COMPARE_RESULT 1)
+        endif ()
+      endif ()
+    endif ()
+
+    message (STATUS "COMPARE Result: ${TEST_COMPARE_RESULT}")
+
+    # again, if return value is !=0 scream and shout
+    if (TEST_COMPARE_RESULT)
+      message (FATAL_ERROR "Failed: The output of ${TEST_OUTPUT} did not match ${TEST_REFERENCE}")
+    endif ()
+  endif ()
+
+  # now compare the .err file with the error reference, if supplied
+  set (TEST_ERRREF_RESULT 0)
+  if (TEST_ERRREF)
+    file (READ ${TEST_FOLDER}/${TEST_ERRREF} TEST_STREAM)
+    list (LENGTH TEST_STREAM test_len)
+    if (test_len GREATER 0)
+      if (WIN32)
+        configure_file(${TEST_FOLDER}/${TEST_ERRREF} ${TEST_FOLDER}/${TEST_ERRREF}.tmp NEWLINE_STYLE CRLF)
+        if (EXISTS "${TEST_FOLDER}/${TEST_ERRREF}.tmp")
+          file(RENAME ${TEST_FOLDER}/${TEST_ERRREF}.tmp ${TEST_FOLDER}/${TEST_ERRREF})
+        endif ()
+        #file (READ ${TEST_FOLDER}/${TEST_ERRREF} TEST_STREAM)
+        #file (WRITE ${TEST_FOLDER}/${TEST_ERRREF} "${TEST_STREAM}")
+      endif ()
+
+      # now compare the error output with the error reference
+      execute_process (
+          COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol ${TEST_FOLDER}/${TEST_OUTPUT}.err ${TEST_FOLDER}/${TEST_ERRREF}
+          RESULT_VARIABLE TEST_ERRREF_RESULT
+      )
+      if (TEST_ERRREF_RESULT)
+        set (TEST_ERRREF_RESULT 0)
+        file (STRINGS ${TEST_FOLDER}/${TEST_OUTPUT}.err test_act)
+        list (LENGTH test_act len_act)
+        file (STRINGS ${TEST_FOLDER}/${TEST_ERRREF} test_ref)
+        list (LENGTH test_ref len_ref)
+        math (EXPR _FP_LEN "${len_ref} - 1")
+        if (len_act GREATER 0 AND len_ref GREATER 0)
+          math (EXPR _FP_LEN "${len_ref} - 1")
+          foreach (line RANGE 0 ${_FP_LEN})
+            list (GET test_act ${line} str_act)
+            list (GET test_ref ${line} str_ref)
+            if (NOT str_act STREQUAL str_ref)
+              if (str_act)
+                set (TEST_ERRREF_RESULT 1)
+                message (STATUS "line = ${line}\n***ACTUAL: ${str_act}\n****REFER: ${str_ref}\n")
+              endif ()
+            endif ()
+          endforeach ()
+        else ()
+          if (len_act EQUAL 0)
+            message (STATUS "COMPARE Failed: ${TEST_FOLDER}/${TEST_OUTPUT}.err is empty")
+          endif ()
+          if (len_ref EQUAL 0)
+            message (STATUS "COMPARE Failed: ${TEST_FOLDER}/${TEST_ERRREF} is empty")
+          endif ()
+        endif ()
+        if (NOT len_act EQUAL len_ref)
+          set (TEST_ERRREF_RESULT 1)
+        endif ()
+      endif ()
+    endif ()
+
+    message (STATUS "COMPARE Result: ${TEST_ERRREF_RESULT}")
+
+    # again, if return value is !=0 scream and shout
+    if (TEST_ERRREF_RESULT)
+      message (FATAL_ERROR "Failed: The error output of ${TEST_OUTPUT}.err did not match ${TEST_ERRREF}")
+    endif ()
+  endif ()
+endif ()
+
+set (TEST_GREP_RESULT 0)
+if (TEST_GREP_COMPARE)
+  # now grep the output with the reference
+  file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
+  list (LENGTH TEST_STREAM test_len)
+  if (test_len GREATER 0)
+    # TEST_REFERENCE should always be matched
+    string (REGEX MATCH "${TEST_REFERENCE}" TEST_MATCH ${TEST_STREAM})
+    string (COMPARE EQUAL "${TEST_REFERENCE}" "${TEST_MATCH}" TEST_GREP_RESULT)
+    if (NOT TEST_GREP_RESULT)
+      message (FATAL_ERROR "Failed: The output of ${TEST_PROGRAM} did not contain ${TEST_REFERENCE}")
+    endif ()
+
+    string (REGEX MATCH "${TEST_FILTER}" TEST_MATCH ${TEST_STREAM})
+    if (TEST_EXPECT)
+      # TEST_EXPECT (1) interprets TEST_FILTER as; NOT to match
+      string (LENGTH "${TEST_MATCH}" TEST_GREP_RESULT)
+      if (TEST_GREP_RESULT)
+        message (FATAL_ERROR "Failed: The output of ${TEST_PROGRAM} did contain ${TEST_FILTER}")
+      endif ()
+    endif ()
+  endif ()
+endif ()
+
+# dump the output unless nodisplay option is set
+if (TEST_SKIP_COMPARE AND NOT TEST_NO_DISPLAY)
+  if (EXISTS "${TEST_FOLDER}/${TEST_OUTPUT}")
+    file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
+    execute_process (
+        COMMAND ${CMAKE_COMMAND} -E echo ${TEST_STREAM}
+        RESULT_VARIABLE TEST_RESULT
+    )
+  endif ()
+endif ()
+
+if (NOT DEFINED ENV{HDF5_NOCLEANUP})
+  if (EXISTS "${TEST_FOLDER}/${TEST_OUTPUT}")
+    file (REMOVE ${TEST_FOLDER}/${TEST_OUTPUT})
+  endif ()
+
+  if (EXISTS "${TEST_FOLDER}/${TEST_OUTPUT}.err")
+    file (REMOVE ${TEST_FOLDER}/${TEST_OUTPUT}.err)
+  endif ()
+
+  if (TEST_DELETE_LIST)
+    foreach (dfile in ${TEST_DELETE_LIST})
+      file (REMOVE ${dfile})
+    endforeach ()
+  endif ()
+endif ()
+
+# everything went fine...
+message (STATUS "${TEST_PROGRAM} Passed")
+
diff --git a/config/cmake/libh5cc.in b/config/cmake/libh5cc.in
new file mode 100644
index 0000000..4d25848
--- /dev/null
+++ b/config/cmake/libh5cc.in
@@ -0,0 +1,52 @@
+#! /bin/sh
+##
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+##
+
+prg=$0
+if [ ! -e "$prg" ]; then
+  case $prg in
+    (*/*) exit 1;;
+    (*) prg=$(command -v -- "$prg") || exit;;
+  esac
+fi
+dir=$(
+  cd -P -- "$(dirname -- "$prg")/.." && pwd -P
+) || exit
+prg=$dir/$(basename -- "$prg") || exit
+
+printf '%s\n' "$prg"
+printf 'dir is %s\n' "$dir"
+
+
+# Show the configuration summary of the library recorded in the
+# libhdf5.settings file residing in the lib directory.
+showconfigure()
+{
+  cat $dir/lib/libhdf5.settings
+  status=$?
+}
+
+export PKG_CONFIG_PATH=$dir/lib/pkgconfig
+
+for arg in $@ ; do
+  case "$arg" in
+    -showconfig)
+      showconfigure
+      exit $status
+      ;;
+    *)
+      @_PKG_CONFIG_COMPILER@ $@ `pkg-config --define-variable=prefix=$dir --cflags --libs @_PKG_CONFIG_LIBNAME@`
+      status=$?
+      exit $status
+      ;;
+  esac
+done
diff --git a/config/cmake/libhdf5.settings.cmake.in b/config/cmake/libhdf5.settings.cmake.in
index a036ff8..f2cf6c0 100644
--- a/config/cmake/libhdf5.settings.cmake.in
+++ b/config/cmake/libhdf5.settings.cmake.in
@@ -1,67 +1,91 @@
-      SUMMARY OF THE HDF5 CONFIGURATION
-      =================================
+        SUMMARY OF THE HDF5 CONFIGURATION
+        =================================
 
 General Information:
 -------------------
                    HDF5 Version: @HDF5_PACKAGE_VERSION_STRING@
                   Configured on: @CONFIG_DATE@
                   Configured by: @CMAKE_GENERATOR@
-                 Configure mode: CMAKE @CMAKE_VERSION@
                     Host system: @CMAKE_HOST_SYSTEM@
               Uname information: @CMAKE_SYSTEM_NAME@
                        Byte sex: @BYTESEX@
-                      Libraries: @BUILD_NAME_EXT@
              Installation point: @CMAKE_INSTALL_PREFIX@
 
 Compiling Options:
 ------------------
-               Compilation Mode: @CMAKE_BUILD_TYPE@
-                     C Compiler: @CMAKE_C_COMPILER@
-                         CFLAGS: @CMAKE_C_FLAGS@
-                      H5_CFLAGS: @H5_CFLAGS@
-                      AM_CFLAGS: @AM_CFLAGS@
-                       CPPFLAGS: @CPPFLAGS@
-                    H5_CPPFLAGS: @H5_CPPFLAGS@
-                    AM_CPPFLAGS: @AM_CPPFLAGS@
-               Shared Libraries: @H5_ENABLE_SHARED_LIB@
-               Static Libraries: @H5_ENABLE_STATIC_LIB@
+                     Build Mode: @CMAKE_BUILD_TYPE@
+              Debugging Symbols: @HDF5_ENABLE_SYMBOLS@
+                        Asserts: @HDF5_ENABLE_ASSERTS@
+                      Profiling: @HDF5_ENABLE_PROFILING@
+             Optimization Level: @HDF5_ENABLE_OPTIMIZATION@
+
+Linking Options:
+----------------
+                      Libraries: @BUILD_NAME_EXT@
   Statically Linked Executables: @BUILD_STATIC_EXECS@
                         LDFLAGS: @CMAKE_SHARED_LINKER_FLAGS@
+                     H5_LDFLAGS: @H5_LDFLAGS@
                      AM_LDFLAGS: @AM_LDFLAGS@
                 Extra libraries: @LINK_LIBS@
                        Archiver: @CMAKE_AR@
                          Ranlib: @CMAKE_RANLIB@
-              Debugged Packages: @DEBUG_PKG@
-                    API Tracing: @HDF5_ENABLE_TRACE@
 
 Languages:
 ----------
+                              C: YES
+                     C Compiler: @CMAKE_C_COMPILER@ @CMAKE_C_COMPILER_VERSION@
+                       CPPFLAGS: @CPPFLAGS@
+                    H5_CPPFLAGS: @H5_CPPFLAGS@
+                    AM_CPPFLAGS: @AM_CPPFLAGS@
+                         CFLAGS: @CMAKE_C_FLAGS@
+                      H5_CFLAGS: @HDF5_CMAKE_C_FLAGS@
+                      AM_CFLAGS: @AM_CFLAGS@
+               Shared C Library: @H5_ENABLE_SHARED_LIB@
+               Static C Library: @H5_ENABLE_STATIC_LIB@
+
                         Fortran: @HDF5_BUILD_FORTRAN@
-@BUILD_FORTRAN_CONDITIONAL_TRUE@               Fortran Compiler: @CMAKE_Fortran_COMPILER@
-@BUILD_FORTRAN_CONDITIONAL_TRUE@          Fortran 2003 Compiler: @HDF5_ENABLE_F2003@
+@BUILD_FORTRAN_CONDITIONAL_TRUE@               Fortran Compiler: @CMAKE_Fortran_COMPILER@ @CMAKE_Fortran_COMPILER_VERSION@
 @BUILD_FORTRAN_CONDITIONAL_TRUE@                  Fortran Flags: @CMAKE_Fortran_FLAGS@
-@BUILD_FORTRAN_CONDITIONAL_TRUE@               H5 Fortran Flags: @H5_FCFLAGS@
+@BUILD_FORTRAN_CONDITIONAL_TRUE@               H5 Fortran Flags: @HDF5_CMAKE_Fortran_FLAGS@
 @BUILD_FORTRAN_CONDITIONAL_TRUE@               AM Fortran Flags: @AM_FCFLAGS@
+@BUILD_FORTRAN_CONDITIONAL_TRUE@         Shared Fortran Library: @H5_ENABLE_SHARED_LIB@
+@BUILD_FORTRAN_CONDITIONAL_TRUE@         Static Fortran Library: @H5_ENABLE_STATIC_LIB@
+@BUILD_FORTRAN_CONDITIONAL_TRUE@               Module Directory: @CMAKE_Fortran_MODULE_DIRECTORY@
+
                             C++: @HDF5_BUILD_CPP_LIB@
-@BUILD_CXX_CONDITIONAL_TRUE@                   C++ Compiler: @CMAKE_CXX_COMPILER@
+@BUILD_CXX_CONDITIONAL_TRUE@                   C++ Compiler: @CMAKE_CXX_COMPILER@ @CMAKE_CXX_COMPILER_VERSION@
 @BUILD_CXX_CONDITIONAL_TRUE@                      C++ Flags: @CMAKE_CXX_FLAGS@
-@BUILD_CXX_CONDITIONAL_TRUE@                   H5 C++ Flags: @H5_CXXFLAGS@
+@BUILD_CXX_CONDITIONAL_TRUE@                   H5 C++ Flags: @HDF5_CMAKE_CXX_FLAGS@
 @BUILD_CXX_CONDITIONAL_TRUE@                   AM C++ Flags: @AM_CXXFLAGS@
+@BUILD_CXX_CONDITIONAL_TRUE@             Shared C++ Library: @H5_ENABLE_SHARED_LIB@
+@BUILD_CXX_CONDITIONAL_TRUE@             Static C++ Library: @H5_ENABLE_STATIC_LIB@
+
+                            JAVA: @HDF5_BUILD_JAVA@
+@BUILD_JAVA_CONDITIONAL_TRUE@                 JAVA Compiler: @CMAKE_Java_COMPILER@ @Java_VERSION@
 
 Features:
 ---------
-                  Parallel HDF5: @HDF5_ENABLE_PARALLEL@
-             High Level library: @HDF5_BUILD_HL_LIB@
-                   Threadsafety: @HDF5_ENABLE_THREADSAFE@
-            Default API Mapping: @DEFAULT_API_VERSION@
- With Deprecated Public Symbols: @HDF5_ENABLE_DEPRECATED_SYMBOLS@
-         I/O filters (external): @EXTERNAL_FILTERS@
-         I/O filters (internal): @FILTERS@
-                            MPE: @H5_HAVE_LIBLMPE@
-                     Direct VFD: @H5_HAVE_DIRECT@
-                        dmalloc: @H5_HAVE_LIBDMALLOC@
-Clear file buffers before write: @HDF5_Enable_Clear_File_Buffers@
-           Using memory checker: @HDF5_ENABLE_USING_MEMCHECKER@
-         Function Stack Tracing: @HDF5_ENABLE_CODESTACK@
-      Strict File Format Checks: @HDF5_STRICT_FORMAT_CHECKS@
-   Optimization Instrumentation: @HDF5_Enable_Instrument@
+                     Parallel HDF5: @HDF5_ENABLE_PARALLEL@
+  Parallel Filtered Dataset Writes: @PARALLEL_FILTERED_WRITES@
+                Large Parallel I/O: @LARGE_PARALLEL_IO@
+                High-level library: @HDF5_BUILD_HL_LIB@
+Dimension scales w/ new references: @DIMENSION_SCALES_WITH_NEW_REF@
+                  Build HDF5 Tests: @BUILD_TESTING@
+                  Build HDF5 Tools: @HDF5_BUILD_TOOLS@
+                   Build GIF Tools: @HDF5_BUILD_HL_GIF_TOOLS@
+                      Threadsafety: @HDF5_ENABLE_THREADSAFE@
+               Default API mapping: @DEFAULT_API_VERSION@
+    With deprecated public symbols: @HDF5_ENABLE_DEPRECATED_SYMBOLS@
+            I/O filters (external): @EXTERNAL_FILTERS@
+                        Direct VFD: @H5_HAVE_DIRECT@
+                        Mirror VFD: @H5_HAVE_MIRROR_VFD@
+                     Subfiling VFD: @H5_HAVE_SUBFILING_VFD@
+                (Read-Only) S3 VFD: @H5_HAVE_ROS3_VFD@
+              (Read-Only) HDFS VFD: @H5_HAVE_LIBHDFS@
+    Packages w/ extra debug output: @INTERNAL_DEBUG_OUTPUT@
+                       API Tracing: @HDF5_ENABLE_TRACE@
+              Using memory checker: @HDF5_ENABLE_USING_MEMCHECKER@
+            Function Stack Tracing: @HDF5_ENABLE_CODESTACK@
+                  Use file locking: @HDF5_FILE_LOCKING_SETTING@
+         Strict File Format Checks: @HDF5_STRICT_FORMAT_CHECKS@
+      Optimization Instrumentation: @HDF5_Enable_Instrument@
diff --git a/config/cmake/mccacheinit.cmake b/config/cmake/mccacheinit.cmake
index af506e6..dcd7ca6 100644
--- a/config/cmake/mccacheinit.cmake
+++ b/config/cmake/mccacheinit.cmake
@@ -1,78 +1,63 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
 # This is the CMakeCache file.
 
-########################
+#########################
 # EXTERNAL cache entries
-########################
+#########################
 
-set (BUILD_SHARED_LIBS OFF CACHE BOOL "Build Shared Libraries" FORCE)
+set (CMAKE_INSTALL_FRAMEWORK_PREFIX "Library/Frameworks" CACHE STRING "Frameworks installation directory" FORCE)
 
 set (BUILD_TESTING ON CACHE BOOL "Build HDF5 Unit Testing" FORCE)
 
 set (HDF_PACKAGE_EXT "" CACHE STRING "Name of HDF package extension" FORCE)
 
+set (HDF_PACKAGE_NAMESPACE "hdf5::" CACHE STRING "Name for HDF package namespace" FORCE)
+
 set (HDF5_BUILD_CPP_LIB ON CACHE BOOL "Build HDF5 C++ Library" FORCE)
 
 set (HDF5_BUILD_EXAMPLES ON CACHE BOOL "Build HDF5 Library Examples" FORCE)
 
 set (HDF5_BUILD_FORTRAN ON CACHE BOOL "Build FORTRAN support" FORCE)
 
-set (HDF5_ENABLE_F2003 ON CACHE BOOL "Enable FORTRAN 2003 Standard" FORCE)
-
 set (HDF5_BUILD_HL_LIB ON CACHE BOOL "Build HIGH Level HDF5 Library" FORCE)
 
 set (HDF5_BUILD_TOOLS ON CACHE BOOL "Build HDF5 Tools" FORCE)
 
-set (HDF5_BUILD_GENERATORS OFF CACHE BOOL "Build Test Generators" FORCE)
-
 set (HDF5_ENABLE_Z_LIB_SUPPORT ON CACHE BOOL "Enable Zlib Filters" FORCE)
 
 set (HDF5_ENABLE_SZIP_SUPPORT ON CACHE BOOL "Use SZip Filter" FORCE)
 
 set (HDF5_ENABLE_SZIP_ENCODING ON CACHE BOOL "Use SZip Encoding" FORCE)
 
-set (HDF5_ENABLE_HSIZET ON CACHE BOOL "Enable datasets larger than memory" FORCE)
-
-set (HDF5_ENABLE_UNSUPPORTED OFF CACHE BOOL "Enable unsupported combinations of configuration options" FORCE)
-
-set (HDF5_ENABLE_DEPRECATED_SYMBOLS ON CACHE BOOL "Enable deprecated public API symbols" FORCE)
-
-set (HDF5_ENABLE_DIRECT_VFD OFF CACHE BOOL "Build the Direct I/O Virtual File Driver" FORCE)
-
-set (HDF5_ENABLE_PARALLEL OFF CACHE BOOL "Enable parallel build (requires MPI)" FORCE)
-
-set (MPIEXEC_MAX_NUMPROCS "3" CACHE STRING "Minimum number of processes for HDF parallel tests" FORCE)
-
-set (HDF5_BUILD_PARALLEL_ALL OFF CACHE BOOL "Build Parallel Programs" FORCE)
-
-set (HDF5_ENABLE_COVERAGE OFF CACHE BOOL "Enable code coverage for Libraries and Programs" FORCE)
+set (MPIEXEC_MAX_NUMPROCS "4" CACHE STRING "Minimum number of processes for HDF parallel tests" FORCE)
 
 set (HDF5_ENABLE_USING_MEMCHECKER ON CACHE BOOL "Indicate that a memory checker is used" FORCE)
 
-set (HDF5_DISABLE_COMPILER_WARNINGS OFF CACHE BOOL "Disable compiler warnings" FORCE)
-
-set (HDF5_USE_FOLDERS ON CACHE BOOL "Enable folder grouping of projects in IDEs." FORCE)
-
-set (HDF5_USE_16_API_DEFAULT OFF CACHE BOOL "Use the HDF5 1.6.x API by default" FORCE)
-
-set (HDF5_USE_18_API_DEFAULT OFF CACHE BOOL "Use the HDF5 1.8.x API by default" FORCE)
-
-set (HDF5_ENABLE_THREADSAFE OFF CACHE BOOL "(WINDOWS)Enable Threadsafety" FORCE)
-
-set (HDF5_PACKAGE_EXTLIBS OFF CACHE BOOL "(WINDOWS)CPACK - include external libraries" FORCE)
-
 set (HDF5_NO_PACKAGES ON CACHE BOOL "CPACK - Disable packaging" FORCE)
 
-set (HDF5_ALLOW_EXTERNAL_SUPPORT "NO" CACHE STRING "Allow External Library Building (NO SVN TGZ)" FORCE)
-set_property (CACHE HDF5_ALLOW_EXTERNAL_SUPPORT PROPERTY STRINGS NO SVN TGZ)
+set (HDF5_ALLOW_EXTERNAL_SUPPORT "NO" CACHE STRING "Allow External Library Building (NO GIT TGZ)" FORCE)
+set_property (CACHE HDF5_ALLOW_EXTERNAL_SUPPORT PROPERTY STRINGS NO GIT TGZ)
 
 set (ZLIB_TGZ_NAME "ZLib.tar.gz" CACHE STRING "Use ZLib from compressed file" FORCE)
 
 set (SZIP_TGZ_NAME "SZip.tar.gz" CACHE STRING "Use SZip from compressed file" FORCE)
+set (SZAEC_TGZ_NAME "LIBAEC.tar.gz" CACHE STRING "Use SZip AEC from compressed file" FORCE)
+set (USE_LIBAEC ON CACHE BOOL "Use libaec szip replacement" FORCE)
 
 set (CMAKE_BUILD_TYPE "Debug" CACHE STRING "Build Debug" FORCE)
 
-set (CTEST_BUILD_CONFIGURATION "Debug" CACHE STRING "Build Debug" FORCE)
+set (CTEST_CONFIGURATION_TYPE "Debug" CACHE STRING "Build Debug" FORCE)
 
 set (ZLIB_PACKAGE_NAME "zlib" CACHE STRING "Name of ZLIB package" FORCE)
-
+set (LIBAEC_PACKAGE_NAME "libaec" CACHE STRING "Name of AEC SZIP package" FORCE)
 set (SZIP_PACKAGE_NAME "szip" CACHE STRING "Name of SZIP package" FORCE)
diff --git a/config/cmake/patch.xml b/config/cmake/patch.xml
index 70571c5..1bdff3e 100644
--- a/config/cmake/patch.xml
+++ b/config/cmake/patch.xml
@@ -1,5 +1,5 @@
 <CPackWiXPatch>
-	<CPackWiXFragment Id="CM_CP_libraries.bin.hdf5.dll">
+    <CPackWiXFragment Id="CM_CP_libraries.bin.hdf5.dll">
         <Environment Id="PATH" 
              Name="PATH" 
              Value="[CM_DP_libraries.bin]" 
@@ -7,5 +7,5 @@
              Part="last" 
              Action="set" 
              System="yes"/>
-	</CPackWiXFragment>
+    </CPackWiXFragment>
 </CPackWiXPatch>
diff --git a/config/cmake/runTest.cmake b/config/cmake/runTest.cmake
new file mode 100644
index 0000000..12b4818
--- /dev/null
+++ b/config/cmake/runTest.cmake
@@ -0,0 +1,397 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
+# runTest.cmake executes a command and captures the output in a file. File is then compared
+# against a reference file. Exit status of command can also be compared.
+cmake_policy(SET CMP0007 NEW)
+
+# arguments checking
+if (NOT TEST_PROGRAM)
+  message (FATAL_ERROR "Require TEST_PROGRAM to be defined")
+endif ()
+if (NOT TEST_FOLDER)
+  message (FATAL_ERROR "Require TEST_FOLDER to be defined")
+endif ()
+if (NOT TEST_OUTPUT)
+  message (FATAL_ERROR "Require TEST_OUTPUT to be defined")
+endif ()
+if (NOT TEST_EXPECT)
+  message (STATUS "Require TEST_EXPECT to be defined")
+endif ()
+
+if (EXISTS "${TEST_FOLDER}/${TEST_OUTPUT}")
+  file (REMOVE ${TEST_FOLDER}/${TEST_OUTPUT})
+endif ()
+
+if (EXISTS "${TEST_FOLDER}/${TEST_OUTPUT}.err")
+  file (REMOVE ${TEST_FOLDER}/${TEST_OUTPUT}.err)
+endif ()
+
+message (STATUS "COMMAND: ${TEST_EMULATOR} ${TEST_PROGRAM} ${TEST_ARGS}")
+
+if (TEST_LIBRARY_DIRECTORY)
+  if (WIN32)
+    set (ENV{PATH} "$ENV{PATH};${TEST_LIBRARY_DIRECTORY}")
+  else ()
+    set (ENV{LD_LIBRARY_PATH} "$ENV{LD_LIBRARY_PATH}:${TEST_LIBRARY_DIRECTORY}")
+  endif ()
+endif ()
+
+if (TEST_ENV_VAR)
+  set (ENV{${TEST_ENV_VAR}} "${TEST_ENV_VALUE}")
+  #message (STATUS "ENV:${TEST_ENV_VAR}=$ENV{${TEST_ENV_VAR}}")
+endif ()
+
+if (NOT TEST_INPUT)
+  # run the test program, capture the stdout/stderr and the result var
+  execute_process (
+      COMMAND ${TEST_EMULATOR} ${TEST_PROGRAM} ${TEST_ARGS}
+      WORKING_DIRECTORY ${TEST_FOLDER}
+      RESULT_VARIABLE TEST_RESULT
+      OUTPUT_FILE ${TEST_OUTPUT}
+      ERROR_FILE ${TEST_OUTPUT}.err
+      OUTPUT_VARIABLE TEST_OUT
+      ERROR_VARIABLE TEST_ERROR
+  )
+else ()
+  # run the test program with stdin, capture the stdout/stderr and the result var
+  execute_process (
+      COMMAND ${TEST_EMULATOR} ${TEST_PROGRAM} ${TEST_ARGS}
+      WORKING_DIRECTORY ${TEST_FOLDER}
+      RESULT_VARIABLE TEST_RESULT
+      INPUT_FILE ${TEST_INPUT}
+      OUTPUT_FILE ${TEST_OUTPUT}
+      ERROR_FILE ${TEST_OUTPUT}.err
+      OUTPUT_VARIABLE TEST_OUT
+      ERROR_VARIABLE TEST_ERROR
+  )
+endif ()
+
+if (TEST_REGEX)
+  # TEST_REGEX should always be matched
+  file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
+  string (REGEX MATCH "${TEST_REGEX}" REGEX_MATCH ${TEST_STREAM})
+  string (COMPARE EQUAL "${REGEX_MATCH}" "${TEST_MATCH}" REGEX_RESULT)
+  if (NOT REGEX_RESULT)
+    message (STATUS "Failed: The output of ${TEST_PROGRAM} did not contain ${TEST_MATCH}")
+  endif ()
+endif ()
+
+message (STATUS "COMMAND Result: ${TEST_RESULT}")
+
+# if the .err file exists and ERRROR_APPEND is enabled
+if (EXISTS "${TEST_FOLDER}/${TEST_OUTPUT}.err")
+  file (READ ${TEST_FOLDER}/${TEST_OUTPUT}.err TEST_STREAM)
+  list (LENGTH TEST_STREAM test_len)
+  if (test_len GREATER 0)
+    if (TEST_MASK_FILE)
+      STRING(REGEX REPLACE "CurrentDir is [^\n]+\n" "CurrentDir is (dir name)\n" TEST_STREAM "${TEST_STREAM}")
+    endif ()
+    # remove special output
+    string (REGEX REPLACE "^.*_pmi_alps[^\n]+\n" "" TEST_STREAM "${TEST_STREAM}")
+
+    if (NOT ERROR_APPEND)
+      # write back to original .err file
+      file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT}.err "${TEST_STREAM}")
+    else ()
+      # append error output to the stdout output file
+      file (APPEND ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
+    endif ()
+  endif ()
+endif ()
+
+# append the test result status with a predefined text
+if (TEST_APPEND)
+  file (APPEND ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_APPEND} ${TEST_RESULT}\n")
+endif ()
+
+# if the return value is !=${TEST_EXPECT} bail out
+if (NOT TEST_RESULT EQUAL TEST_EXPECT)
+  if (NOT TEST_NOERRDISPLAY)
+    if (EXISTS "${TEST_FOLDER}/${TEST_OUTPUT}")
+      file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
+      message (STATUS "Output :\n${TEST_STREAM}")
+    endif ()
+  endif ()
+  message (FATAL_ERROR "Failed: Test program ${TEST_PROGRAM} exited != ${TEST_EXPECT}.\n${TEST_ERROR}")
+endif ()
+
+message (STATUS "COMMAND Error: ${TEST_ERROR}")
+
+# remove special output
+file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
+string (FIND TEST_STREAM "_pmi_alps" TEST_FIND_RESULT)
+if (TEST_FIND_RESULT GREATER -1)
+  string (REGEX REPLACE "^.*_pmi_alps[^\n]+\n" "" TEST_STREAM "${TEST_STREAM}")
+  file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} ${TEST_STREAM})
+endif ()
+
+# remove special error output
+if (NOT TEST_ERRREF)
+  # the error stack has been appended to the output file
+  file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
+else ()
+  # the error stack remains in the .err file
+  file (READ ${TEST_FOLDER}/${TEST_OUTPUT}.err TEST_STREAM)
+endif ()
+string (FIND TEST_STREAM "no version information available" TEST_FIND_RESULT)
+if (TEST_FIND_RESULT GREATER -1)
+  string (REGEX REPLACE "^.*no version information available[^\n]+\n" "" TEST_STREAM "${TEST_STREAM}")
+  # write back the changes to the original files
+  if (NOT TEST_ERRREF)
+    file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
+  else ()
+    file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT}.err "${TEST_STREAM}")
+  endif ()
+endif ()
+
+# if the output file needs Storage text removed
+if (TEST_MASK)
+  file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
+  string (REGEX REPLACE "Storage:[^\n]+\n" "Storage:   <details removed for portability>\n" TEST_STREAM "${TEST_STREAM}")
+  file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
+endif ()
+
+# if the output file needs Modified text removed
+if (TEST_MASK_MOD)
+  file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
+  string (REGEX REPLACE "Modified:[^\n]+\n" "Modified:  XXXX-XX-XX XX:XX:XX XXX\n" TEST_STREAM "${TEST_STREAM}")
+  file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
+endif ()
+
+# if the output file or the .err file needs to mask out error stack info
+if (TEST_MASK_ERROR)
+  if (NOT TEST_ERRREF)
+    # the error stack has been appended to the output file
+    file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
+  else ()
+    # the error stack remains in the .err file
+    file (READ ${TEST_FOLDER}/${TEST_OUTPUT}.err TEST_STREAM)
+  endif ()
+  string (REGEX REPLACE "thread [0-9]*:" "thread (IDs):" TEST_STREAM "${TEST_STREAM}")
+  string (REGEX REPLACE ": ([^\n]*)[.]c " ": (file name) " TEST_STREAM "${TEST_STREAM}")
+  string (REGEX REPLACE " line [0-9]*" " line (number)" TEST_STREAM "${TEST_STREAM}")
+  string (REGEX REPLACE "v[1-9]*[.][0-9]*[.]" "version (number)." TEST_STREAM "${TEST_STREAM}")
+  string (REGEX REPLACE "[1-9]*[.][0-9]*[.][0-9]*[^)]*" "version (number)" TEST_STREAM "${TEST_STREAM}")
+  string (REGEX REPLACE "H5Eget_auto[1-2]*" "H5Eget_auto(1 or 2)" TEST_STREAM "${TEST_STREAM}")
+  string (REGEX REPLACE "H5Eset_auto[1-2]*" "H5Eset_auto(1 or 2)" TEST_STREAM "${TEST_STREAM}")
+  # write back the changes to the original files
+  if (NOT TEST_ERRREF)
+    file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
+  else ()
+    file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT}.err "${TEST_STREAM}")
+  endif ()
+endif ()
+
+# remove text from the output file
+if (TEST_FILTER)
+  file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
+  string (REGEX REPLACE "${TEST_FILTER}" "${TEST_FILTER_REPLACE}" TEST_STREAM "${TEST_STREAM}")
+  file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
+endif ()
+
+if (TEST_REF_FILTER)
+  #message (STATUS "TEST_REF_FILTER: ${TEST_APPEND}${TEST_REF_FILTER}")
+  file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
+  string (REGEX REPLACE "${TEST_REF_APPEND}" "${TEST_REF_FILTER}" TEST_STREAM "${TEST_STREAM}")
+  file (WRITE ${TEST_FOLDER}/${TEST_REFERENCE} "${TEST_STREAM}")
+endif ()
+
+# compare output files to references unless this must be skipped
+set (TEST_COMPARE_RESULT 0)
+if (NOT TEST_SKIP_COMPARE)
+  if (EXISTS "${TEST_FOLDER}/${TEST_REFERENCE}")
+    file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
+    list (LENGTH TEST_STREAM test_len)
+    if (test_len GREATER 0)
+    #  if (WIN32) # no longer needed for CMake > 3.15
+    #    configure_file(${TEST_FOLDER}/${TEST_REFERENCE} ${TEST_FOLDER}/${TEST_REFERENCE}.tmp NEWLINE_STYLE CRLF)
+    #    if (EXISTS "${TEST_FOLDER}/${TEST_REFERENCE}.tmp")
+    #      file(RENAME ${TEST_FOLDER}/${TEST_REFERENCE}.tmp ${TEST_FOLDER}/${TEST_REFERENCE})
+    #    endif ()
+    #    #file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
+    #    #file (WRITE ${TEST_FOLDER}/${TEST_REFERENCE} "${TEST_STREAM}")
+    #  endif ()
+
+      if (NOT TEST_SORT_COMPARE)
+        # now compare the output with the reference
+        execute_process (
+            COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol ${TEST_FOLDER}/${TEST_OUTPUT} ${TEST_FOLDER}/${TEST_REFERENCE}
+            RESULT_VARIABLE TEST_COMPARE_RESULT
+        )
+      else ()
+        file (STRINGS ${TEST_FOLDER}/${TEST_OUTPUT} v1)
+        file (STRINGS ${TEST_FOLDER}/${TEST_REFERENCE} v2)
+        list (SORT v1)
+        list (SORT v2)
+        if (NOT v1 STREQUAL v2)
+          set (TEST_COMPARE_RESULT 1)
+        endif ()
+      endif ()
+
+      if (TEST_COMPARE_RESULT)
+        set (TEST_COMPARE_RESULT 0)
+        file (STRINGS ${TEST_FOLDER}/${TEST_OUTPUT} test_act)
+        list (LENGTH test_act len_act)
+        file (STRINGS ${TEST_FOLDER}/${TEST_REFERENCE} test_ref)
+        list (LENGTH test_ref len_ref)
+        if (NOT len_act EQUAL len_ref)
+          set (TEST_COMPARE_RESULT 1)
+        endif ()
+        if (len_act GREATER 0 AND len_ref GREATER 0)
+          if (TEST_SORT_COMPARE)
+            list (SORT test_act)
+            list (SORT test_ref)
+          endif ()
+          math (EXPR _FP_LEN "${len_ref} - 1")
+          foreach (line RANGE 0 ${_FP_LEN})
+            list (GET test_act ${line} str_act)
+            list (GET test_ref ${line} str_ref)
+            if (NOT str_act STREQUAL str_ref)
+              if (str_act)
+                set (TEST_COMPARE_RESULT 1)
+                message (STATUS "line = ${line}\n***ACTUAL: ${str_act}\n****REFER: ${str_ref}\n")
+              endif ()
+            endif ()
+          endforeach ()
+        else ()
+          if (len_act EQUAL 0)
+            message (STATUS "COMPARE Failed: ${TEST_FOLDER}/${TEST_OUTPUT} is empty")
+          endif ()
+          if (len_ref EQUAL 0)
+            message (STATUS "COMPARE Failed: ${TEST_FOLDER}/${TEST_REFERENCE} is empty")
+          endif ()
+        endif ()
+      endif ()
+    endif ()
+
+    message (STATUS "COMPARE Result: ${TEST_COMPARE_RESULT}")
+
+    # again, if return value is !=0 scream and shout
+    if (TEST_COMPARE_RESULT)
+      message (FATAL_ERROR "Failed: The output of ${TEST_OUTPUT} did not match ${TEST_REFERENCE}")
+    endif ()
+  endif ()
+
+  # now compare the .err file with the error reference, if supplied
+  set (TEST_ERRREF_RESULT 0)
+  if (TEST_ERRREF)
+    file (READ ${TEST_FOLDER}/${TEST_ERRREF} TEST_STREAM)
+    list (LENGTH TEST_STREAM test_len)
+    if (test_len GREATER 0)
+    #  if (WIN32) # no longer needed for CMake > 3.15
+    #    configure_file(${TEST_FOLDER}/${TEST_ERRREF} ${TEST_FOLDER}/${TEST_ERRREF}.tmp NEWLINE_STYLE CRLF)
+    #    if (EXISTS "${TEST_FOLDER}/${TEST_ERRREF}.tmp")
+    #      file(RENAME ${TEST_FOLDER}/${TEST_ERRREF}.tmp ${TEST_FOLDER}/${TEST_ERRREF})
+    #    endif ()
+    #    #file (READ ${TEST_FOLDER}/${TEST_ERRREF} TEST_STREAM)
+    #    #file (WRITE ${TEST_FOLDER}/${TEST_ERRREF} "${TEST_STREAM}")
+    #  endif ()
+
+      # now compare the error output with the error reference
+      execute_process (
+          COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol ${TEST_FOLDER}/${TEST_OUTPUT}.err ${TEST_FOLDER}/${TEST_ERRREF}
+          RESULT_VARIABLE TEST_ERRREF_RESULT
+      )
+      if (TEST_ERRREF_RESULT)
+        set (TEST_ERRREF_RESULT 0)
+        file (STRINGS ${TEST_FOLDER}/${TEST_OUTPUT}.err test_act)
+        list (LENGTH test_act len_act)
+        file (STRINGS ${TEST_FOLDER}/${TEST_ERRREF} test_ref)
+        list (LENGTH test_ref len_ref)
+        math (EXPR _FP_LEN "${len_ref} - 1")
+        if (len_act GREATER 0 AND len_ref GREATER 0)
+          math (EXPR _FP_LEN "${len_ref} - 1")
+          foreach (line RANGE 0 ${_FP_LEN})
+            list (GET test_act ${line} str_act)
+            list (GET test_ref ${line} str_ref)
+            if (NOT str_act STREQUAL str_ref)
+              if (str_act)
+                set (TEST_ERRREF_RESULT 1)
+                message (STATUS "line = ${line}\n***ACTUAL: ${str_act}\n****REFER: ${str_ref}\n")
+              endif ()
+            endif ()
+          endforeach ()
+        else ()
+          if (len_act EQUAL 0)
+            message (STATUS "COMPARE Failed: ${TEST_FOLDER}/${TEST_OUTPUT}.err is empty")
+          endif ()
+          if (len_ref EQUAL 0)
+            message (STATUS "COMPARE Failed: ${TEST_FOLDER}/${TEST_ERRREF} is empty")
+          endif ()
+        endif ()
+        if (NOT len_act EQUAL len_ref)
+          set (TEST_ERRREF_RESULT 1)
+        endif ()
+      endif ()
+    endif ()
+
+    message (STATUS "COMPARE Result: ${TEST_ERRREF_RESULT}")
+
+    # again, if return value is !=0 scream and shout
+    if (TEST_ERRREF_RESULT)
+      message (FATAL_ERROR "Failed: The error output of ${TEST_OUTPUT}.err did not match ${TEST_ERRREF}")
+    endif ()
+  endif ()
+endif ()
+
+set (TEST_GREP_RESULT 0)
+if (TEST_GREP_COMPARE)
+  # now grep the output with the reference
+  file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
+  list (LENGTH TEST_STREAM test_len)
+  if (test_len GREATER 0)
+    # TEST_REFERENCE should always be matched
+    string (REGEX MATCH "${TEST_REFERENCE}" TEST_MATCH ${TEST_STREAM})
+    string (COMPARE EQUAL "${TEST_REFERENCE}" "${TEST_MATCH}" TEST_GREP_RESULT)
+    if (NOT TEST_GREP_RESULT)
+      message (FATAL_ERROR "Failed: The output of ${TEST_PROGRAM} did not contain ${TEST_REFERENCE}")
+    endif ()
+
+    string (REGEX MATCH "${TEST_FILTER}" TEST_MATCH ${TEST_STREAM})
+    if (TEST_EXPECT)
+      # TEST_EXPECT (1) interprets TEST_FILTER as; NOT to match
+      string (LENGTH "${TEST_MATCH}" TEST_GREP_RESULT)
+      if (TEST_GREP_RESULT)
+        message (FATAL_ERROR "Failed: The output of ${TEST_PROGRAM} did contain ${TEST_FILTER}")
+      endif ()
+    endif ()
+  endif ()
+endif ()
+
+# dump the output unless nodisplay option is set
+if (TEST_SKIP_COMPARE AND NOT TEST_NO_DISPLAY)
+  file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
+  execute_process (
+      COMMAND ${CMAKE_COMMAND} -E echo ${TEST_STREAM}
+      RESULT_VARIABLE TEST_RESULT
+  )
+endif ()
+
+if (NOT DEFINED ENV{HDF5_NOCLEANUP})
+  if (EXISTS "${TEST_FOLDER}/${TEST_OUTPUT}" AND NOT TEST_SAVE)
+    file (REMOVE ${TEST_FOLDER}/${TEST_OUTPUT})
+  endif ()
+
+  if (EXISTS "${TEST_FOLDER}/${TEST_OUTPUT}.err")
+    file (REMOVE ${TEST_FOLDER}/${TEST_OUTPUT}.err)
+  endif ()
+
+  if (TEST_DELETE_LIST)
+    foreach (dfile in ${TEST_DELETE_LIST})
+      file (REMOVE ${dfile})
+    endforeach ()
+  endif ()
+endif ()
+
+# everything went fine...
+message (STATUS "${TEST_PROGRAM} Passed")
+
diff --git a/config/cmake/scripts/CTestScript.cmake b/config/cmake/scripts/CTestScript.cmake
new file mode 100644
index 0000000..f277864
--- /dev/null
+++ b/config/cmake/scripts/CTestScript.cmake
@@ -0,0 +1,390 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
+cmake_minimum_required (VERSION 3.18)
+########################################################
+# This dashboard is maintained by The HDF Group
+# For any comments please contact cdashhelp@hdfgroup.org
+#
+########################################################
+# -----------------------------------------------------------
+# -- Get environment
+# -----------------------------------------------------------
+if (NOT SITE_OS_NAME)
+  ## machine name not provided - attempt to discover with uname
+  ## -- set hostname
+  ## --------------------------
+  find_program (HOSTNAME_CMD NAMES hostname)
+  exec_program (${HOSTNAME_CMD} ARGS OUTPUT_VARIABLE HOSTNAME)
+  set (CTEST_SITE  "${HOSTNAME}${CTEST_SITE_EXT}")
+  find_program (UNAME NAMES uname)
+  macro (getuname name flag)
+    exec_program ("${UNAME}" ARGS "${flag}" OUTPUT_VARIABLE "${name}")
+  endmacro ()
+
+  getuname (osname -s)
+  getuname (osrel  -r)
+  getuname (cpu    -m)
+  message (STATUS "Dashboard script uname output: ${osname}-${osrel}-${cpu}\n")
+
+  set (CTEST_BUILD_NAME  "${osname}-${osrel}-${cpu}")
+else ()
+  ## machine name provided
+  ## --------------------------
+  if (CMAKE_HOST_UNIX)
+    set (CTEST_BUILD_NAME "${SITE_OS_NAME}-${SITE_OS_VERSION}-${SITE_OS_BITS}-${SITE_COMPILER_NAME}-${SITE_COMPILER_VERSION}")
+  else ()
+    set (CTEST_BUILD_NAME "${SITE_OS_NAME}-${SITE_OS_VERSION}-${SITE_COMPILER_NAME}")
+  endif ()
+endif ()
+if (SITE_BUILDNAME_SUFFIX)
+  set (CTEST_BUILD_NAME  "${SITE_BUILDNAME_SUFFIX}-${CTEST_BUILD_NAME}")
+endif ()
+set (BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILDNAME:STRING=${CTEST_BUILD_NAME}")
+
+# Launchers work only with Makefile and Ninja generators.
+if(NOT "${CTEST_CMAKE_GENERATOR}" MATCHES "Make|Ninja" OR LOCAL_SKIP_TEST)
+  set(CTEST_USE_LAUNCHERS 0)
+  set(ENV{CTEST_USE_LAUNCHERS_DEFAULT} 0)
+  set(BUILD_OPTIONS "${BUILD_OPTIONS} -DCTEST_USE_LAUNCHERS:BOOL=OFF")
+else()
+  set(CTEST_USE_LAUNCHERS 1)
+  set(ENV{CTEST_USE_LAUNCHERS_DEFAULT} 1)
+  set(BUILD_OPTIONS "${BUILD_OPTIONS} -DCTEST_USE_LAUNCHERS:BOOL=ON")
+endif()
+
+#-----------------------------------------------------------------------------
+# MAC machines need special option
+#-----------------------------------------------------------------------------
+if (APPLE)
+  # Compiler choice
+  execute_process (COMMAND xcrun --find cc OUTPUT_VARIABLE XCODE_CC OUTPUT_STRIP_TRAILING_WHITESPACE)
+  execute_process (COMMAND xcrun --find c++ OUTPUT_VARIABLE XCODE_CXX OUTPUT_STRIP_TRAILING_WHITESPACE)
+  set (ENV{CC} "${XCODE_CC}")
+  set (ENV{CXX} "${XCODE_CXX}")
+
+  set (BUILD_OPTIONS "${BUILD_OPTIONS} -DCTEST_USE_LAUNCHERS:BOOL=ON -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=OFF")
+endif ()
+
+#-----------------------------------------------------------------------------
+set (NEED_REPOSITORY_CHECKOUT 0)
+set (CTEST_CMAKE_COMMAND "\"${CMAKE_COMMAND}\"")
+if (CTEST_USE_TAR_SOURCE)
+  ## Uncompress source if tar file provided
+  ## --------------------------
+  if (WIN32 AND NOT MINGW)
+    message (STATUS "extracting... [${CMAKE_EXECUTABLE_NAME} x ${CTEST_DASHBOARD_ROOT}\\${CTEST_USE_TAR_SOURCE}.zip]")
+    execute_process (COMMAND ${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_DASHBOARD_ROOT}\\${CTEST_USE_TAR_SOURCE}.zip RESULT_VARIABLE rv)
+  else ()
+    message (STATUS "extracting... [${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_DASHBOARD_ROOT}/${CTEST_USE_TAR_SOURCE}.tar]")
+    execute_process (COMMAND ${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_DASHBOARD_ROOT}/${CTEST_USE_TAR_SOURCE}.tar RESULT_VARIABLE rv)
+  endif ()
+
+  if (NOT rv EQUAL 0)
+    message (STATUS "extracting... [error-(${rv}) clean up]")
+    file (REMOVE_RECURSE "${CTEST_SOURCE_DIRECTORY}")
+    message (FATAL_ERROR "error: extract of ${CTEST_USE_TAR_SOURCE} failed")
+  endif ()
+
+  file (RENAME ${CTEST_DASHBOARD_ROOT}/${CTEST_USE_TAR_SOURCE} ${CTEST_SOURCE_DIRECTORY})
+  set (LOCAL_SKIP_UPDATE "TRUE")
+else ()
+  if (LOCAL_UPDATE)
+    if (CTEST_USE_GIT_SOURCE)
+      find_program (CTEST_GIT_COMMAND NAMES git git.cmd)
+      set (CTEST_GIT_UPDATE_OPTIONS)
+
+      if (NOT EXISTS "${CTEST_SOURCE_DIRECTORY}")
+        set (NEED_REPOSITORY_CHECKOUT 1)
+      endif ()
+
+      if (${NEED_REPOSITORY_CHECKOUT})
+        if (REPOSITORY_BRANCH)
+          set (CTEST_GIT_options "clone \"${REPOSITORY_URL}\" --branch  \"${REPOSITORY_BRANCH}\" --single-branch \"${CTEST_SOURCE_DIRECTORY}\" --recurse-submodules")
+        else ()
+          set (CTEST_GIT_options "clone \"${REPOSITORY_URL}\" \"${CTEST_SOURCE_DIRECTORY}\" --recurse-submodules")
+        endif ()
+        set (CTEST_CHECKOUT_COMMAND "${CTEST_GIT_COMMAND} ${CTEST_GIT_options}")
+      else ()
+        set (CTEST_GIT_options "pull")
+      endif ()
+      set (CTEST_UPDATE_COMMAND "${CTEST_GIT_COMMAND}")
+    else ()
+      ## --------------------------
+      ## use subversion to get source
+      #-----------------------------------------------------------------------------
+      ## cygwin does not handle the find_package() call
+      ## --------------------------
+      set (CTEST_UPDATE_COMMAND "SVNCommand")
+      if (NOT SITE_CYGWIN})
+        find_package (Subversion)
+        set (CTEST_SVN_COMMAND "${Subversion_SVN_EXECUTABLE}")
+        set (CTEST_UPDATE_COMMAND "${Subversion_SVN_EXECUTABLE}")
+      else ()
+        set (CTEST_SVN_COMMAND "/usr/bin/svn")
+        set (CTEST_UPDATE_COMMAND "/usr/bin/svn")
+      endif ()
+
+      if (NOT EXISTS "${CTEST_SOURCE_DIRECTORY}")
+        set (NEED_REPOSITORY_CHECKOUT 1)
+      endif ()
+
+      if (NOT CTEST_REPO_VERSION)
+        set (CTEST_REPO_VERSION "HEAD")
+      endif ()
+      if (${NEED_REPOSITORY_CHECKOUT})
+        set (CTEST_CHECKOUT_COMMAND
+            "\"${CTEST_SVN_COMMAND}\" co ${REPOSITORY_URL} \"${CTEST_SOURCE_DIRECTORY}\" -r ${CTEST_REPO_VERSION}")
+      else ()
+        if (CTEST_REPO_VERSION)
+          set (CTEST_SVN_UPDATE_OPTIONS "-r ${CTEST_REPO_VERSION}")
+        endif ()
+      endif ()
+    endif ()
+  endif ()
+endif ()
+
+#-----------------------------------------------------------------------------
+## Clear the build directory
+## --------------------------
+set (CTEST_START_WITH_EMPTY_BINARY_DIRECTORY TRUE)
+if (NOT EXISTS "${CTEST_BINARY_DIRECTORY}")
+  file (MAKE_DIRECTORY "${CTEST_BINARY_DIRECTORY}")
+else ()
+  ctest_empty_binary_directory (${CTEST_BINARY_DIRECTORY})
+endif ()
+
+# Use multiple CPU cores to build
+include (ProcessorCount)
+ProcessorCount (N)
+if (NOT N EQUAL 0)
+  if (MAX_PROC_COUNT)
+    if (N GREATER MAX_PROC_COUNT)
+      set (N ${MAX_PROC_COUNT})
+    endif ()
+  endif ()
+  if (NOT WIN32)
+    set (CTEST_BUILD_FLAGS -j${N})
+  endif ()
+  set (ctest_test_args ${ctest_test_args} PARALLEL_LEVEL ${N})
+endif ()
+
+#-----------------------------------------------------------------------------
+# Send the main script as a note.
+list (APPEND CTEST_NOTES_FILES
+    "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}"
+    "${CMAKE_CURRENT_LIST_FILE}"
+    "${CTEST_SOURCE_DIRECTORY}/config/cmake/cacheinit.cmake"
+)
+
+#-----------------------------------------------------------------------------
+# Check for required variables.
+# --------------------------
+foreach (req
+    CTEST_CMAKE_GENERATOR
+    CTEST_SITE
+    CTEST_BUILD_NAME
+  )
+  if (NOT DEFINED ${req})
+    message (FATAL_ERROR "The containing script must set ${req}")
+  endif ()
+endforeach ()
+
+#-----------------------------------------------------------------------------
+# Initialize the CTEST commands
+#------------------------------
+if (CMAKE_GENERATOR_TOOLSET)
+  set (CTEST_CONFIGURE_TOOLSET  "-T${CMAKE_GENERATOR_TOOLSET}")
+else ()
+  set (CTEST_CONFIGURE_TOOLSET  "")
+endif()
+if (CMAKE_GENERATOR_ARCHITECTURE)
+  set (CTEST_CONFIGURE_ARCHITECTURE  "-A${CMAKE_GENERATOR_ARCHITECTURE}")
+else ()
+  set (CTEST_CONFIGURE_ARCHITECTURE  "")
+endif()
+if (LOCAL_MEMCHECK_TEST)
+  if(LOCAL_USE_VALGRIND)
+    set (CTEST_MEMORYCHECK_COMMAND_OPTIONS "-v --tool=memcheck --leak-check=full --track-fds=yes --num-callers=50 --show-reachable=yes --track-origins=yes --malloc-fill=0xff --free-fill=0xfe")
+    find_program(CTEST_MEMORYCHECK_COMMAND NAMES valgrind)
+  endif()
+  set (CTEST_CONFIGURE_COMMAND
+      "${CTEST_CMAKE_COMMAND} -C \"${CTEST_SOURCE_DIRECTORY}/config/cmake/mccacheinit.cmake\" -DCMAKE_BUILD_TYPE:STRING=${CTEST_CONFIGURATION_TYPE} ${BUILD_OPTIONS} \"-G${CTEST_CMAKE_GENERATOR}\" \"${CTEST_CONFIGURE_ARCHITECTURE}\" \"${CTEST_CONFIGURE_TOOLSET}\" \"${CTEST_SOURCE_DIRECTORY}\""
+  )
+else ()
+  if (LOCAL_COVERAGE_TEST)
+    if(LOCAL_USE_GCOV)
+      find_program (CTEST_COVERAGE_COMMAND NAMES gcov)
+    endif ()
+  endif ()
+  set (CTEST_CONFIGURE_COMMAND
+      "${CTEST_CMAKE_COMMAND} -C \"${CTEST_SOURCE_DIRECTORY}/config/cmake/cacheinit.cmake\" -DCMAKE_BUILD_TYPE:STRING=${CTEST_CONFIGURATION_TYPE} ${BUILD_OPTIONS} \"-G${CTEST_CMAKE_GENERATOR}\" \"${CTEST_CONFIGURE_ARCHITECTURE}\" \"${CTEST_CONFIGURE_TOOLSET}\" \"${CTEST_SOURCE_DIRECTORY}\""
+  )
+endif ()
+
+#-----------------------------------------------------------------------------
+## -- set output to english
+set ($ENV{LC_MESSAGES}  "en_EN")
+
+# Print summary information.
+foreach (v
+    CTEST_SITE
+    CTEST_BUILD_NAME
+    CTEST_SOURCE_DIRECTORY
+    CTEST_BINARY_DIRECTORY
+    CTEST_CMAKE_GENERATOR
+    CTEST_CONFIGURATION_TYPE
+    CTEST_GIT_COMMAND
+    CTEST_CHECKOUT_COMMAND
+    CTEST_CONFIGURE_COMMAND
+    CTEST_SCRIPT_DIRECTORY
+    CTEST_USE_LAUNCHERS
+  )
+  set (vars "${vars}  ${v}=[${${v}}]\n")
+endforeach ()
+message (STATUS "Dashboard script configuration:\n${vars}\n")
+
+#-----------------------------------------------------------------------------
+
+###################################################################
+#########       Following is for submission to CDash   ############
+###################################################################
+if (NOT DEFINED MODEL)
+  set (MODEL "Experimental")
+endif ()
+
+set (ENV{CI_SITE_NAME} ${CTEST_SITE})
+set (ENV{CI_BUILD_NAME} ${CTEST_BUILD_NAME})
+set (ENV{CI_MODEL} ${MODEL})
+
+#-----------------------------------------------------------------------------
+  ## NORMAL process
+  ## -- LOCAL_UPDATE updates the source folder from svn
+  ## -- LOCAL_SUBMIT reports to CDash server
+  ## -- LOCAL_SKIP_TEST skips the test process (only builds)
+  ## -- LOCAL_MEMCHECK_TEST executes the Valgrind testing
+  ## -- LOCAL_COVERAGE_TEST executes code coverage process
+  ## --------------------------
+  ctest_start (${MODEL} GROUP ${MODEL})
+  if (LOCAL_UPDATE)
+    ctest_update (SOURCE "${CTEST_SOURCE_DIRECTORY}")
+  endif ()
+  configure_file (${CTEST_SOURCE_DIRECTORY}/config/cmake/CTestCustom.cmake ${CTEST_BINARY_DIRECTORY}/CTestCustom.cmake)
+  ctest_read_custom_files ("${CTEST_BINARY_DIRECTORY}")
+  ctest_configure (BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
+  if (LOCAL_SUBMIT)
+    ctest_submit (PARTS Update Configure Notes)
+  endif ()
+  if (${res} LESS 0 OR ${res} GREATER 0)
+    file (APPEND ${CTEST_SCRIPT_DIRECTORY}/FailedCTest.txt "Failed Configure: ${res}\n")
+  endif ()
+
+  # On Cray XC40, configuring fails in the Fortran section when using the craype-mic-knl module.
+  # When the configure phase is done with the craype-haswell module and the build phase is done
+  # with the craype-mic-knl module, configure succeeds and tests pass on the knl compute nodes
+  # for Intel, Cray, GCC and Clang compilers.  If the variables aren't set or if not
+  # cross compiling, the module switch will not occur.
+  if (CMAKE_CROSSCOMPILING AND COMPILENODE_HWCOMPILE_MODULE AND COMPUTENODE_HWCOMPILE_MODULE)
+      execute_process (COMMAND module switch ${COMPILENODE_HWCOMPILE_MODULE} ${COMPUTENODE_HWCOMPILE_MODULE})
+  endif ()
+
+  ctest_build (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND RETURN_VALUE res NUMBER_ERRORS errval)
+  if (LOCAL_SUBMIT)
+    ctest_submit (PARTS Build)
+  endif ()
+  if (${res} LESS 0 OR ${res} GREATER 0 OR ${errval} GREATER 0)
+    file (APPEND ${CTEST_SCRIPT_DIRECTORY}/FailedCTest.txt "Failed ${errval} Build: ${res}\n")
+  endif ()
+
+  if (NOT LOCAL_SKIP_TEST)
+    if (NOT LOCAL_MEMCHECK_TEST)
+      if (NOT LOCAL_BATCH_TEST)
+        ctest_test (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND ${ctest_test_args} RETURN_VALUE res)
+      else ()
+        file(STRINGS ${CTEST_BINARY_DIRECTORY}/Testing/TAG TAG_CONTENTS REGEX "^2([0-9]+)[-]([0-9]+)$")
+        if (LOCAL_BATCH_SCRIPT_COMMAND STREQUAL "raybsub")
+          execute_process (COMMAND ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_COMMAND} ${LOCAL_BATCH_SCRIPT_ARGS} ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_NAME})
+        else ()
+          if (LOCAL_BATCH_SCRIPT_COMMAND STREQUAL "qsub")
+            execute_process (COMMAND ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_NAME} ctestS.out)
+          else ()
+            execute_process (COMMAND ${LOCAL_BATCH_SCRIPT_COMMAND} ${LOCAL_BATCH_SCRIPT_ARGS} ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_NAME})
+          endif()
+        endif ()
+        message(STATUS "Check for existence of ${CTEST_BINARY_DIRECTORY}/ctestS.done")
+        execute_process(COMMAND ls ${CTEST_BINARY_DIRECTORY}/ctestS.done RESULT_VARIABLE result OUTPUT_QUIET ERROR_QUIET)
+        while(result)
+          ctest_sleep(60)
+          execute_process(COMMAND ls ${CTEST_BINARY_DIRECTORY}/ctestS.done RESULT_VARIABLE result OUTPUT_QUIET ERROR_QUIET)
+        endwhile(result)
+        message(STATUS "Serial tests completed.")
+        if (LOCAL_SUBMIT)
+          ctest_submit (PARTS Test)
+        endif ()
+        if (LOCAL_BATCH_SCRIPT_PARALLEL_NAME)
+          unset(result CACHE)
+          if (LOCAL_BATCH_SCRIPT_COMMAND STREQUAL "raybsub")
+            execute_process (COMMAND ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_COMMAND} ${LOCAL_BATCH_SCRIPT_ARGS} ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_PARALLEL_NAME})
+          else ()
+            if (LOCAL_BATCH_SCRIPT_COMMAND STREQUAL "qsub")
+              execute_process (COMMAND ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_NAME} ctestP.out)
+            else ()
+              execute_process (COMMAND ${LOCAL_BATCH_SCRIPT_COMMAND} ${LOCAL_BATCH_SCRIPT_ARGS} ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_PARALLEL_NAME})
+            endif ()
+          endif ()
+          message(STATUS "Check for existence of ${CTEST_BINARY_DIRECTORY}/ctestP.done")
+          execute_process(COMMAND ls ${CTEST_BINARY_DIRECTORY}/ctestP.done RESULT_VARIABLE result OUTPUT_QUIET ERROR_QUIET)
+          while(result)
+            ctest_sleep(60)
+            execute_process(COMMAND ls ${CTEST_BINARY_DIRECTORY}/ctestP.done RESULT_VARIABLE result OUTPUT_QUIET ERROR_QUIET)
+          endwhile(result)
+          message(STATUS "parallel tests completed.")
+        endif()
+      endif ()
+      if (LOCAL_SUBMIT)
+        ctest_submit (PARTS Test)
+      endif ()
+      if (${res} LESS 0 OR ${res} GREATER 0)
+        file (APPEND ${CTEST_SCRIPT_DIRECTORY}/FailedCTest.txt "Failed Tests: ${res}\n")
+      endif ()
+    else ()
+      ctest_memcheck (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND ${ctest_test_args})
+      if (LOCAL_SUBMIT)
+        ctest_submit (PARTS MemCheck)
+      endif ()
+    endif ()
+    if (LOCAL_COVERAGE_TEST)
+      ctest_coverage (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND)
+      if (LOCAL_SUBMIT)
+        ctest_submit (PARTS Coverage)
+      endif ()
+    endif ()
+    if (LOCAL_SUBMIT)
+      ctest_submit (PARTS Done)
+    endif ()
+  endif ()
+
+  if (NOT LOCAL_MEMCHECK_TEST AND NOT LOCAL_NO_PACKAGE AND NOT LOCAL_SKIP_BUILD)
+    ##-----------------------------------------------
+    ## Package the product
+    ##-----------------------------------------------
+    execute_process (COMMAND cpack -C ${CTEST_CONFIGURATION_TYPE} -V
+      WORKING_DIRECTORY ${CTEST_BINARY_DIRECTORY}
+      RESULT_VARIABLE cpackResult
+      OUTPUT_VARIABLE cpackLog
+      ERROR_VARIABLE cpackLog.err
+    )
+    file (WRITE ${CTEST_BINARY_DIRECTORY}/cpack.log "${cpackLog.err}" "${cpackLog}")
+    if (cpackResult GREATER 0)
+      file (APPEND ${CTEST_SCRIPT_DIRECTORY}/FailedCTest.txt "Failed packaging: ${cpackResult}:${cpackLog.err} \n")
+    endif ()
+  endif ()
+#-----------------------------------------------------------------------------
diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake
new file mode 100644
index 0000000..2fbb26c
--- /dev/null
+++ b/config/cmake/scripts/HDF5config.cmake
@@ -0,0 +1,264 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
+#############################################################################################
+### ${CTEST_SCRIPT_ARG} is of the form OPTION=VALUE                                       ###
+### BUILD_GENERATOR required [Unix, VS2019, VS201964, VS2017, VS201764, VS2015, VS201564] ###
+### ctest -S HDF5config.cmake,BUILD_GENERATOR=VS201764 -C Release -VV -O hdf5.log         ###
+#############################################################################################
+
+cmake_minimum_required (VERSION 3.18)
+############################################################################
+# Usage:
+#     ctest -S HDF5config.cmake,OPTION=VALUE -C Release -VV -O test.log
+# where valid options for OPTION are:
+#     BUILD_GENERATOR - The cmake build generator:
+#            MinGW     * MinGW Makefiles
+#            Unix      * Unix Makefiles
+#            VS2019    * Visual Studio 16 2019
+#            VS201964  * Visual Studio 16 2019
+#            VS2017    * Visual Studio 15 2017
+#            VS201764  * Visual Studio 15 2017 Win64
+#            VS2015    * Visual Studio 14 2015
+#            VS201564  * Visual Studio 14 2015 Win64
+#            VS2013    * Visual Studio 12 2013
+#            VS201364  * Visual Studio 12 2013 Win64
+#
+#     INSTALLDIR  -  root folder where hdf5 is installed
+#     CTEST_CONFIGURATION_TYPE  - Release, Debug, etc
+#     CTEST_SOURCE_NAME  -  source folder
+##############################################################################
+
+set (CTEST_SOURCE_VERSION "1.15.0")
+set (CTEST_SOURCE_VERSEXT "")
+
+##############################################################################
+# handle input parameters to script.
+#BUILD_GENERATOR - which CMake generator to use, required
+#INSTALLDIR - HDF5-1.13.x root folder
+#CTEST_CONFIGURATION_TYPE - Release, Debug, RelWithDebInfo
+#CTEST_SOURCE_NAME - name of source folder; HDF5-1.13.x
+#MODEL - CDash group name
+#HPC - run alternate configurations for HPC machines; sbatch, bsub, raybsub, qsub
+#MPI - enable MPI
+if (DEFINED CTEST_SCRIPT_ARG)
+    # transform ctest script arguments of the form
+    # script.ctest,var1=value1,var2=value2
+    # to variables with the respective names set to the respective values
+    string (REPLACE "," ";" script_args "${CTEST_SCRIPT_ARG}")
+    foreach (current_var ${script_args})
+        if ("${current_var}" MATCHES "^([^=]+)=(.+)$")
+            set ("${CMAKE_MATCH_1}" "${CMAKE_MATCH_2}")
+        endif ()
+    endforeach ()
+endif ()
+
+#HPC - run alternate configurations for HPC machines
+if (DEFINED HPC)
+  set (BUILD_GENERATOR "Unix")
+endif ()
+
+# build generator must be defined
+if (NOT DEFINED BUILD_GENERATOR)
+  message (FATAL_ERROR "BUILD_GENERATOR must be defined - Unix, VS2019, VS201964, VS2017, VS201764, VS2015, VS201564")
+endif ()
+
+###################################################################
+### Following Line is one of [Release, RelWithDebInfo, Debug] #####
+###        (default use command line -C value)
+set (CTEST_CONFIGURATION_TYPE "$ENV{CMAKE_CONFIG_TYPE}")
+###################################################################
+
+if (NOT DEFINED INSTALLDIR)
+  if (WIN32)
+    set (INSTALLDIR "%ProgramFiles%/HDF_Group/HDF5/${CTEST_SOURCE_VERSION}")
+  else ()
+    set (INSTALLDIR "${CTEST_SCRIPT_DIRECTORY}/HDF_Group/HDF5/${CTEST_SOURCE_VERSION}")
+  endif ()
+endif ()
+if (NOT DEFINED CTEST_CONFIGURATION_TYPE)
+  set (CTEST_CONFIGURATION_TYPE "Release")
+endif ()
+if (NOT DEFINED CTEST_SOURCE_NAME)
+  set (CTEST_SOURCE_NAME "hdf5-${CTEST_SOURCE_VERSION}${CTEST_SOURCE_VERSEXT}")
+endif ()
+
+set (CTEST_BINARY_NAME "build")
+set (CTEST_DASHBOARD_ROOT "${CTEST_SCRIPT_DIRECTORY}")
+if (WIN32 AND NOT MINGW)
+  set (CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_SOURCE_NAME}")
+  set (CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_BINARY_NAME}")
+else ()
+  set (CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_SOURCE_NAME}")
+  set (CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_BINARY_NAME}")
+endif ()
+
+###################################################################
+#########       Following describes compiler           ############
+if (NOT DEFINED HPC)
+  if (NOT DEFINED BUILD_GENERATOR)
+    message (FATAL_ERROR "BUILD_GENERATOR must be defined - Unix, VS2019, VS201964, VS2017, VS201764, VS2015, VS201564")
+  endif ()
+  if (WIN32 AND NOT MINGW)
+    set (SITE_OS_NAME "Windows")
+    set (SITE_OS_VERSION "WIN10")
+    if (BUILD_GENERATOR STREQUAL "VS201964")
+      set (CTEST_CMAKE_GENERATOR "Visual Studio 16 2019")
+      set (CMAKE_GENERATOR_ARCHITECTURE "x64")
+      set (SITE_OS_BITS "64")
+      set (SITE_COMPILER_NAME "vs2019")
+      set (SITE_COMPILER_VERSION "16")
+    elseif (BUILD_GENERATOR STREQUAL "VS2019")
+      set (CTEST_CMAKE_GENERATOR "Visual Studio 16 2019")
+      set (CMAKE_GENERATOR_ARCHITECTURE "Win32")
+      set (SITE_OS_BITS "32")
+      set (SITE_COMPILER_NAME "vs2019")
+      set (SITE_COMPILER_VERSION "16")
+    elseif (BUILD_GENERATOR STREQUAL "VS201764")
+      set (CTEST_CMAKE_GENERATOR "Visual Studio 15 2017 Win64")
+      set (SITE_OS_BITS "64")
+      set (SITE_COMPILER_NAME "vs2017")
+      set (SITE_COMPILER_VERSION "15")
+    elseif (BUILD_GENERATOR STREQUAL "VS2017")
+      set (CTEST_CMAKE_GENERATOR "Visual Studio 15 2017")
+      set (SITE_OS_BITS "32")
+      set (SITE_COMPILER_NAME "vs2017")
+      set (SITE_COMPILER_VERSION "15")
+    elseif (BUILD_GENERATOR STREQUAL "VS201564")
+      set (CTEST_CMAKE_GENERATOR "Visual Studio 14 2015 Win64")
+      set (SITE_OS_BITS "64")
+      set (SITE_COMPILER_NAME "vs2015")
+      set (SITE_COMPILER_VERSION "14")
+    elseif (BUILD_GENERATOR STREQUAL "VS2015")
+      set (CTEST_CMAKE_GENERATOR "Visual Studio 14 2015")
+      set (SITE_OS_BITS "32")
+      set (SITE_COMPILER_NAME "vs2015")
+      set (SITE_COMPILER_VERSION "14")
+    elseif (BUILD_GENERATOR STREQUAL "VS201364")
+      set (CTEST_CMAKE_GENERATOR "Visual Studio 12 2013 Win64")
+      set (SITE_OS_BITS "64")
+      set (SITE_COMPILER_NAME "vs2013")
+      set (SITE_COMPILER_VERSION "12")
+    elseif (BUILD_GENERATOR STREQUAL "VS2013")
+      set (CTEST_CMAKE_GENERATOR "Visual Studio 12 2013")
+      set (SITE_OS_BITS "32")
+      set (SITE_COMPILER_NAME "vs2013")
+      set (SITE_COMPILER_VERSION "12")
+    elseif (BUILD_GENERATOR STREQUAL "VS201264")
+      set (CTEST_CMAKE_GENERATOR "Visual Studio 11 2012 Win64")
+      set (SITE_OS_BITS "64")
+      set (SITE_COMPILER_NAME "vs2012")
+      set (SITE_COMPILER_VERSION "11")
+    elseif (BUILD_GENERATOR STREQUAL "VS2012")
+      set (CTEST_CMAKE_GENERATOR "Visual Studio 11 2012")
+      set (SITE_OS_BITS "32")
+      set (SITE_COMPILER_NAME "vs2012")
+      set (SITE_COMPILER_VERSION "11")
+    else ()
+      message (FATAL_ERROR "Invalid BUILD_GENERATOR must be - Unix, VS2019, VS201964, VS2017, VS201764, VS2015, VS201564")
+    endif ()
+  ##  Set the following to unique id your computer  ##
+    set (CTEST_SITE "WIN7${BUILD_GENERATOR}.XXXX")
+  else ()
+    if (MINGW)
+      set (CTEST_CMAKE_GENERATOR "MinGW Makefiles")
+    else ()
+      set (CTEST_CMAKE_GENERATOR "Unix Makefiles")
+    endif ()
+  ##  Set the following to unique id your computer  ##
+    if (APPLE)
+     set (CTEST_SITE "MAC.XXXX")
+    else ()
+      set (CTEST_SITE "LINUX.XXXX")
+    endif ()
+    if (APPLE)
+      execute_process (COMMAND xcrun --find cc OUTPUT_VARIABLE XCODE_CC OUTPUT_STRIP_TRAILING_WHITESPACE)
+      execute_process (COMMAND xcrun --find c++ OUTPUT_VARIABLE XCODE_CXX OUTPUT_STRIP_TRAILING_WHITESPACE)
+      set (ENV{CC} "${XCODE_CC}")
+      set (ENV{CXX} "${XCODE_CXX}")
+      set (CTEST_USE_LAUNCHERS        1)
+    endif ()
+  endif ()
+else ()
+  set (CTEST_SITE "${SITE_OS_NAME}")
+  set (CTEST_CMAKE_GENERATOR "Unix Makefiles")
+endif ()
+###################################################################
+
+###################################################################
+#####       Following controls CDash submission               #####
+#set (LOCAL_SUBMIT "TRUE")
+#####       Following controls test process                   #####
+#set (LOCAL_SKIP_TEST "TRUE")
+#set (LOCAL_MEMCHECK_TEST "TRUE")
+#set (LOCAL_COVERAGE_TEST "TRUE")
+#####       Following controls cpack command                  #####
+#set (LOCAL_NO_PACKAGE "TRUE")
+#####       Following controls source update                  #####
+#set (LOCAL_UPDATE "TRUE")
+set (REPOSITORY_URL "https://github.com/HDFGroup/hdf5.git")
+set (REPOSITORY_BRANCH "develop")
+
+#uncomment to use a compressed source file: *.tar on linux or mac *.zip on windows
+#set(CTEST_USE_TAR_SOURCE "${CTEST_SOURCE_VERSION}")
+###################################################################
+
+
+###################################################################
+
+if (WIN32 AND NOT MINGW)
+  set (BINFILEBASE "HDF5-${CTEST_SOURCE_VERSION}${CTEST_SOURCE_VERSEXT}-win${SITE_OS_BITS}")
+  include (${CTEST_SCRIPT_DIRECTORY}\\HDF5options.cmake)
+  include (${CTEST_SCRIPT_DIRECTORY}\\CTestScript.cmake)
+  if (EXISTS "${CTEST_BINARY_DIRECTORY}\\${BINFILEBASE}.exe")
+    file (COPY "${CTEST_BINARY_DIRECTORY}\\${BINFILEBASE}.exe" DESTINATION ${CTEST_SCRIPT_DIRECTORY})
+  endif ()
+  if (EXISTS "${CTEST_BINARY_DIRECTORY}\\${BINFILEBASE}.msi")
+    file (COPY "${CTEST_BINARY_DIRECTORY}\\${BINFILEBASE}.msi" DESTINATION  ${CTEST_SCRIPT_DIRECTORY})
+  endif ()
+  if (EXISTS "${CTEST_BINARY_DIRECTORY}\\${BINFILEBASE}.zip")
+    file (COPY "${CTEST_BINARY_DIRECTORY}\\${BINFILEBASE}.zip" DESTINATION  ${CTEST_SCRIPT_DIRECTORY})
+  endif ()
+else ()
+  set (BINFILEBASE "HDF5-${CTEST_SOURCE_VERSION}${CTEST_SOURCE_VERSEXT}")
+  include (${CTEST_SCRIPT_DIRECTORY}/HDF5options.cmake)
+  if (DEFINED HPC)
+    include (${CTEST_SOURCE_DIRECTORY}/config/cmake/scripts/HPC/${HPC}-HDF5options.cmake)
+  endif ()
+  include (${CTEST_SCRIPT_DIRECTORY}/CTestScript.cmake)
+  if (APPLE)
+    if (EXISTS "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Darwin.dmg")
+      file (COPY "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Darwin.dmg" DESTINATION ${CTEST_SCRIPT_DIRECTORY})
+    endif ()
+    if (EXISTS "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Darwin.tar.gz")
+      file (COPY "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Darwin.tar.gz" DESTINATION  ${CTEST_SCRIPT_DIRECTORY})
+    endif ()
+    if (EXISTS "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Darwin.sh")
+      file (COPY "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Darwin.sh" DESTINATION ${CTEST_SCRIPT_DIRECTORY})
+    endif ()
+  else ()
+    if (CYGWIN)
+      if (EXISTS "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-CYGWIN.sh")
+        file (COPY "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-CYGWIN.sh" DESTINATION ${CTEST_SCRIPT_DIRECTORY})
+      endif ()
+      if (EXISTS "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-CYGWIN.tar.gz")
+        file (COPY "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-CYGWIN.tar.gz" DESTINATION  ${CTEST_SCRIPT_DIRECTORY})
+      endif ()
+    else ()
+      if (EXISTS "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Linux.sh")
+        file (COPY "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Linux.sh" DESTINATION ${CTEST_SCRIPT_DIRECTORY})
+      endif ()
+      if (EXISTS "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Linux.tar.gz")
+        file (COPY "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Linux.tar.gz" DESTINATION  ${CTEST_SCRIPT_DIRECTORY})
+      endif ()
+    endif ()
+  endif ()
+endif ()
diff --git a/config/cmake/scripts/HDF5options.cmake b/config/cmake/scripts/HDF5options.cmake
new file mode 100644
index 0000000..7a5d327
--- /dev/null
+++ b/config/cmake/scripts/HDF5options.cmake
@@ -0,0 +1,109 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
+#############################################################################################
+####  Change default configuration of options in config/cmake/cacheinit.cmake file        ###
+####  format: set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DXXX:YY=ZZZZ")                 ###
+#############################################################################################
+
+### uncomment/comment and change the following lines for other configuration options
+
+#############################################################################################
+####      maximum parallel processor count for build and test       ####
+#set (MAX_PROC_COUNT 8)
+
+#############################################################################################
+####      alternate toolsets (Windows usually)        ####
+#set (CMAKE_GENERATOR_TOOLSET "Intel C++ Compiler 17.0")
+
+#############################################################################################
+### use a toolchain file (supported everywhere)       ####
+
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=config/toolchain/intel.cmake")
+
+#############################################################################################
+####      Only build static libraries       ####
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DBUILD_SHARED_LIBS:BOOL=OFF")
+####      Only build shared libraries       ####
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DONLY_SHARED_LIBS:BOOL=OFF")
+####      Add PIC option on linux/mac       ####
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_ANSI_CFLAGS:STRING=-fPIC")
+
+#############################################################################################
+####      fortran enabled      ####
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=ON")
+####      fortran disabled      ####
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=OFF")
+
+#############################################################################################
+####      java enabled      ####
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
+####      java disabled      ####
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=OFF")
+
+#############################################################################################
+### change install prefix (default use INSTALLDIR value)
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_INSTALL_PREFIX:PATH=${INSTALLDIR}")
+
+#############################################################################################
+####      ext libraries       ####
+
+### ext libs from tgz
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ALLOW_EXTERNAL_SUPPORT:STRING=TGZ -DTGZPATH:PATH=${CTEST_SCRIPT_DIRECTORY}")
+### ext libs from git
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ALLOW_EXTERNAL_SUPPORT:STRING=GIT")
+### ext libs on system
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ALLOW_EXTERNAL_SUPPORT:STRING=NO")
+#set(ENV{ZLIB_ROOT} "some_location")
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DZLIB_LIBRARY:FILEPATH=some_location/lib/zlib.lib -DZLIB_INCLUDE_DIR:PATH=some_location/include")
+#set(ENV{SZIP_ROOT} "some_location")
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DSZIP_LIBRARY:FILEPATH=some_location/lib/szlib.lib -DSZIP_INCLUDE_DIR:PATH=some_location/include")
+
+### disable using ext zlib
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=OFF")
+### disable using ext szip
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF")
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=OFF")
+
+####      package examples       ####
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACK_EXAMPLES:BOOL=ON -DHDF5_EXAMPLES_COMPRESSED:STRING=HDF5Examples-2.0.1-Source.tar.gz -DHDF5_EXAMPLES_COMPRESSED_DIR:PATH=${CTEST_SCRIPT_DIRECTORY}")
+
+#############################################################################################
+### enable parallel builds
+if (DEFINED MPI)
+  set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PARALLEL:BOOL=ON")
+  set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=OFF")
+  set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=OFF")
+  set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_THREADSAFE:BOOL=OFF")
+endif()
+#############################################################################################
+### enable thread-safety builds
+
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_THREADSAFE:BOOL=ON")
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PARALLEL:BOOL=OFF")
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=OFF")
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=OFF")
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_HL_LIB:BOOL=OFF")
+
+#############################################################################################
+### disable test program builds
+
+#If using CTestScript.cmake file be sure to uncomment set (LOCAL_SKIP_TEST "TRUE")
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DBUILD_TESTING:BOOL=OFF")
+
+#############################################################################################
+### disable packaging
+
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_NO_PACKAGES:BOOL=ON")
+### Create install package with external libraries (szip, zlib)
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACKAGE_EXTLIBS:BOOL=ON")
+
+#############################################################################################
diff --git a/config/cmake/scripts/HPC/bsub-HDF5options.cmake b/config/cmake/scripts/HPC/bsub-HDF5options.cmake
new file mode 100644
index 0000000..37fdb8b
--- /dev/null
+++ b/config/cmake/scripts/HPC/bsub-HDF5options.cmake
@@ -0,0 +1,31 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
+#############################################################################################
+####  Change default configuration of options in config/cmake/cacheinit.cmake file        ###
+####  format: set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DXXX:YY=ZZZZ")                 ###
+#############################################################################################
+if (DEFINED MPI)
+    # maximum parallel processor count for build and test       ####
+    set (MAX_PROC_COUNT 8)
+endif()
+#############################################################################################
+### options to run test scripts in batch commands
+set (LOCAL_BATCH_SCRIPT_COMMAND "bsub")
+set (LOCAL_BATCH_TEST "TRUE")
+set (LOCAL_BATCH_SCRIPT_NAME "ctestS.lsf")
+set (LOCAL_BATCH_SCRIPT_PARALLEL_NAME "ctestP.lsf")
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DLOCAL_BATCH_TEST:BOOL=ON")
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DLOCAL_BATCH_SCRIPT_NAME:STRING=${LOCAL_BATCH_SCRIPT_NAME}")
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DLOCAL_BATCH_SCRIPT_PARALLEL_NAME:STRING=${LOCAL_BATCH_SCRIPT_PARALLEL_NAME}")
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DMPIEXEC_EXECUTABLE:STRING=srun")
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DMPIEXEC_NUMPROC_FLAG:STRING=-n")
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DMPIEXEC_MAX_NUMPROCS:STRING=6")
diff --git a/config/cmake/scripts/HPC/qsub-HDF5options.cmake b/config/cmake/scripts/HPC/qsub-HDF5options.cmake
new file mode 100644
index 0000000..fe33546
--- /dev/null
+++ b/config/cmake/scripts/HPC/qsub-HDF5options.cmake
@@ -0,0 +1,42 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
+#############################################################################################
+####  Change default configuration of options in config/cmake/cacheinit.cmake file        ###
+####  format: set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DXXX:YY=ZZZZ")                 ###
+#############################################################################################
+if (DEFINED MPI)
+    # maximum parallel processor count for build and test       ####
+    set (MAX_PROC_COUNT 8)
+endif()
+#############################################################################################
+### options to run test scripts in batch commands
+set (LOCAL_BATCH_SCRIPT_NAME "ctest.qsub")
+set (LOCAL_BATCH_SCRIPT_PARALLEL_NAME "ctest.qsub")
+if (DEFINED KNL)
+  ### some additions and alternatives to cross compile on haswell for knl
+  set (COMPUTENODE_HWCOMPILE_MODULE "craype-mic-knl")
+  set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=config/toolchain/crayle.cmake")
+endif ()
+set (LOCAL_BATCH_SCRIPT_COMMAND "qsub")
+set (LOCAL_BATCH_TEST "TRUE")
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DLOCAL_BATCH_TEST:BOOL=ON")
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DLOCAL_BATCH_SCRIPT_NAME:STRING=${LOCAL_BATCH_SCRIPT_NAME}")
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DLOCAL_BATCH_SCRIPT_PARALLEL_NAME:STRING=${LOCAL_BATCH_SCRIPT_PARALLEL_NAME}")
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DMPIEXEC_EXECUTABLE:STRING=aprun")
+# Option to suppress writing job statistics; to avoid issues with h5diff comparisons.
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DMPIEXEC_PREFLAGS:STRING=-q")
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DMPIEXEC_NUMPROC_FLAG:STRING=-n")
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DMPIEXEC_MAX_NUMPROCS:STRING=6")
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DACCOUNT_ID:STRING=${LOCAL_BATCH_SCRIPT_ARGS}")
+
+#############################################################################################
+#############################################################################################
diff --git a/config/cmake/scripts/HPC/raybsub-HDF5options.cmake b/config/cmake/scripts/HPC/raybsub-HDF5options.cmake
new file mode 100644
index 0000000..89ce4f0
--- /dev/null
+++ b/config/cmake/scripts/HPC/raybsub-HDF5options.cmake
@@ -0,0 +1,32 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
+#############################################################################################
+####  Change default configuration of options in config/cmake/cacheinit.cmake file        ###
+####  format: set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DXXX:YY=ZZZZ")                 ###
+#############################################################################################
+if (DEFINED MPI)
+    # maximum parallel processor count for build and test       ####
+    set (MAX_PROC_COUNT 8)
+endif()
+#############################################################################################
+### options to run test scripts in batch commands
+set (LOCAL_BATCH_SCRIPT_COMMAND "raybsub")
+set (LOCAL_BATCH_TEST "TRUE")
+set (LOCAL_BATCH_SCRIPT_NAME "ray_ctestS.lsf")
+set (LOCAL_BATCH_SCRIPT_PARALLEL_NAME "ray_ctestP.lsf")
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DLOCAL_BATCH_TEST:BOOL=ON")
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DLOCAL_BATCH_SCRIPT_COMMAND:STRING=${LOCAL_BATCH_SCRIPT_COMMAND}")
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DLOCAL_BATCH_SCRIPT_NAME:STRING=${LOCAL_BATCH_SCRIPT_NAME}")
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DLOCAL_BATCH_SCRIPT_PARALLEL_NAME:STRING=${LOCAL_BATCH_SCRIPT_PARALLEL_NAME}")
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DMPIEXEC_EXECUTABLE:STRING=mpirun")
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DMPIEXEC_NUMPROC_FLAG:STRING=-np")
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DMPIEXEC_MAX_NUMPROCS:STRING=6")
diff --git a/config/cmake/scripts/HPC/sbatch-HDF5options.cmake b/config/cmake/scripts/HPC/sbatch-HDF5options.cmake
new file mode 100644
index 0000000..ddf4858
--- /dev/null
+++ b/config/cmake/scripts/HPC/sbatch-HDF5options.cmake
@@ -0,0 +1,43 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
+#############################################################################################
+####  Change default configuration of options in config/cmake/cacheinit.cmake file        ###
+####  format: set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DXXX:YY=ZZZZ")                 ###
+#############################################################################################
+if (DEFINED MPI)
+    # maximum parallel processor count for build and test       ####
+    set (MAX_PROC_COUNT 8)
+endif()
+#############################################################################################
+### options to run test scripts in batch commands
+if (DEFINED KNL)
+  ### some additions and alternatives to cross compile on haswell for knl
+  set (COMPILENODE_HWCOMPILE_MODULE "craype-haswell")
+  set (COMPUTENODE_HWCOMPILE_MODULE "craype-mic-knl")
+  set (LOCAL_BATCH_SCRIPT_NAME "knl_ctestS.sl")
+  set (LOCAL_BATCH_SCRIPT_PARALLEL_NAME "knl_ctestP.sl")
+  set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=config/toolchain/crayle.cmake")
+else ()
+  set (LOCAL_BATCH_SCRIPT_NAME "ctestS.sl")
+  set (LOCAL_BATCH_SCRIPT_PARALLEL_NAME "ctestP.sl")
+endif ()
+set (LOCAL_BATCH_SCRIPT_COMMAND "sbatch")
+set (LOCAL_BATCH_TEST "TRUE")
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DLOCAL_BATCH_TEST:BOOL=ON")
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DLOCAL_BATCH_SCRIPT_NAME:STRING=${LOCAL_BATCH_SCRIPT_NAME}")
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DLOCAL_BATCH_SCRIPT_PARALLEL_NAME:STRING=${LOCAL_BATCH_SCRIPT_PARALLEL_NAME}")
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DMPIEXEC_EXECUTABLE:STRING=srun")
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DMPIEXEC_NUMPROC_FLAG:STRING=-n")
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DMPIEXEC_MAX_NUMPROCS:STRING=6")
+
+#############################################################################################
+#############################################################################################
diff --git a/config/cmake/userblockTest.cmake b/config/cmake/userblockTest.cmake
index 2e0740b..dde66c9 100644
--- a/config/cmake/userblockTest.cmake
+++ b/config/cmake/userblockTest.cmake
@@ -1,31 +1,42 @@
-# runTest.cmake executes a command and captures the output in a file. File is then compared
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
+# userblockTest.cmake executes a command and captures the output in a file. File is then compared
 # against a reference file. Exit status of command can also be compared.
 
 # arguments checking
 if (NOT TEST_PROGRAM)
   message (FATAL_ERROR "Require TEST_PROGRAM tellub to be defined")
-endif (NOT TEST_PROGRAM)
+endif ()
 if (NOT TEST_GET_PROGRAM)
   message (FATAL_ERROR "Require TEST_GET_PROGRAM getub to be defined")
-endif (NOT TEST_GET_PROGRAM)
+endif ()
 if (NOT TEST_FOLDER)
-  message ( FATAL_ERROR "Require TEST_FOLDER to be defined")
-endif (NOT TEST_FOLDER)
+  message (FATAL_ERROR "Require TEST_FOLDER to be defined")
+endif ()
 if (NOT TEST_HFILE)
   message (FATAL_ERROR "Require TEST_HFILE the hdf file to be defined")
-endif (NOT TEST_HFILE)
+endif ()
 if (NOT TEST_UFILE)
   message (FATAL_ERROR "Require TEST_UFILE the ub file to be defined")
-endif (NOT TEST_UFILE)
+endif ()
 if (NOT TEST_CHECKUB)
   message (STATUS "Require TEST_CHECKUB - YES or NO - to be defined")
-endif (NOT TEST_CHECKUB)
+endif ()
 #if (NOT TEST_EXPECT)
 #  message (STATUS "Require TEST_EXPECT to be defined")
-#endif (NOT TEST_EXPECT)
+#endif ()
 #if (NOT TEST_OFILE)
 #  message (FATAL_ERROR "Require TEST_OFILE the original hdf file to be defined")
-#endif (NOT TEST_OFILE)
+#endif ()
 
 set (TEST_U_STRING_LEN 0)
 set (TEST_O_STRING_LEN 0)
@@ -43,78 +54,78 @@ if (TEST_CHECKUB STREQUAL "YES")
     # 'tellub' calls H5Fget_user_block to get the size
     #  of the user block
     #s2=`$JAM_BIN/tellub $origfile`
-    EXECUTE_PROCESS (
-        COMMAND ${TEST_PROGRAM} ${TEST_OFILE}
+    execute_process (
+        COMMAND ${TEST_EMULATOR} ${TEST_PROGRAM} ${TEST_OFILE}
         WORKING_DIRECTORY ${TEST_FOLDER}
         RESULT_VARIABLE TEST_RESULT
         OUTPUT_FILE ${TEST_HFILE}.len.txt
-        OUTPUT_VARIABLE TEST_ERROR
+        OUTPUT_VARIABLE TEST_OUT
         ERROR_VARIABLE TEST_ERROR
     )
-    if (NOT ${TEST_RESULT} STREQUAL "0")
+    if (TEST_RESULT)
       message (FATAL_ERROR "Failed: The output of ${TEST_PROGRAM} ${TEST_OFILE} is: ${TEST_ERROR}")
-    endif (NOT ${TEST_RESULT} STREQUAL "0")
+    endif ()
     file (READ ${TEST_HFILE}.len.txt TEST_O_STRING_LEN)
-  endif (TEST_OFILE)
-   
-  MATH( EXPR TEST_STRING_SIZE "${TEST_U_STRING_LEN} + ${TEST_O_STRING_LEN}" )
- 
-  if (NOT TEST_O_STRING_LEN STREQUAL "0")
+  endif ()
+
+  math( EXPR TEST_STRING_SIZE "${TEST_U_STRING_LEN} + ${TEST_O_STRING_LEN}" )
+
+  if (TEST_O_STRING_LEN)
     #$JAM_BIN/getub -c $s2 $origfile > $cmpfile
-    EXECUTE_PROCESS (
-        COMMAND ${TEST_GET_PROGRAM} -c ${TEST_O_STRING_LEN} ${TEST_OFILE}
+    execute_process (
+        COMMAND ${TEST_EMULATOR} ${TEST_GET_PROGRAM} -c ${TEST_O_STRING_LEN} ${TEST_OFILE}
         WORKING_DIRECTORY ${TEST_FOLDER}
         RESULT_VARIABLE TEST_RESULT
         OUTPUT_FILE ${TEST_HFILE}-ub.cmp
-        OUTPUT_VARIABLE TEST_ERROR
+        OUTPUT_VARIABLE TEST_OUT
         ERROR_VARIABLE TEST_ERROR
         OUTPUT_STRIP_TRAILING_WHITESPACE
     )
     #cat $ufile >> $cmpfile
     file (STRINGS ${TEST_UFILE} TEST_STREAM NEWLINE_CONSUME)
-    file (APPEND ${TEST_HFILE}-ub.cmp "${TEST_STREAM}") 
-  else (NOT TEST_O_STRING_LEN STREQUAL "0")
+    file (APPEND ${TEST_HFILE}-ub.cmp "${TEST_STREAM}")
+  else ()
     file (STRINGS ${TEST_UFILE} TEST_STREAM NEWLINE_CONSUME)
     file (WRITE ${TEST_HFILE}-ub.cmp ${TEST_STREAM})
-  endif (NOT TEST_O_STRING_LEN STREQUAL "0")
+  endif ()
 
   #$JAM_BIN/getub -c $size $hfile > $tfile
-  EXECUTE_PROCESS (
-      COMMAND ${TEST_GET_PROGRAM} -c ${TEST_STRING_SIZE} ${TEST_HFILE}
+  execute_process (
+      COMMAND ${TEST_EMULATOR} ${TEST_GET_PROGRAM} -c ${TEST_STRING_SIZE} ${TEST_HFILE}
       WORKING_DIRECTORY ${TEST_FOLDER}
       RESULT_VARIABLE TEST_RESULT
       OUTPUT_FILE ${TEST_HFILE}.cmp
-      OUTPUT_VARIABLE TEST_ERROR
+      OUTPUT_VARIABLE TEST_OUT
       ERROR_VARIABLE TEST_ERROR
       OUTPUT_STRIP_TRAILING_WHITESPACE
   )
 
   # now compare the outputs
-  EXECUTE_PROCESS (
-      COMMAND ${CMAKE_COMMAND} -E compare_files ${TEST_HFILE}-ub.cmp ${TEST_HFILE}.cmp
+  execute_process (
+      COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol ${TEST_HFILE}-ub.cmp ${TEST_HFILE}.cmp
       RESULT_VARIABLE TEST_RESULT
   )
 
   message (STATUS "COMPARE Result: ${TEST_RESULT}: ${TEST_STRING_SIZE}=${TEST_U_STRING_LEN}+${TEST_O_STRING_LEN}")
   # if the return value is !=${TEST_EXPECT} bail out
-  if (NOT ${TEST_RESULT} STREQUAL ${TEST_EXPECT})
+  if (NOT TEST_RESULT EQUAL TEST_EXPECT)
     message (FATAL_ERROR "Failed: The output of ${TEST_HFILE}-ub did not match ${TEST_HFILE}.\n${TEST_ERROR}")
-  endif (NOT ${TEST_RESULT} STREQUAL ${TEST_EXPECT})
-else (TEST_CHECKUB STREQUAL "YES")
+  endif ()
+else ()
     # call 'ubsize' to get the size of the user block
     #ubsize=`$JAM_BIN/tellub $hfile`
-    EXECUTE_PROCESS (
-        COMMAND ${TEST_PROGRAM} ${TEST_HFILE}
+    execute_process (
+        COMMAND ${TEST_EMULATOR} ${TEST_PROGRAM} ${TEST_HFILE}
         WORKING_DIRECTORY ${TEST_FOLDER}
         RESULT_VARIABLE TEST_H_STRING_LEN
-        OUTPUT_VARIABLE TEST_ERROR
+        OUTPUT_VARIABLE TEST_OUT
         ERROR_VARIABLE TEST_ERROR
     )
-  if (NOT TEST_H_STRING_LEN STREQUAL "0")
+  if (TEST_H_STRING_LEN)
     message (FATAL_ERROR "Failed: The output of ${TEST_HFILE} was NOT empty")
-  endif (NOT TEST_H_STRING_LEN STREQUAL "0")
-endif (TEST_CHECKUB STREQUAL "YES")
+  endif ()
+endif ()
 
 # everything went fine...
-message ("Passed: The output of CHECK matched expectation")
+message (STATUS "Passed: The output of CHECK matched expectation")
 
diff --git a/config/cmake/version.plist.in b/config/cmake/version.plist.in
new file mode 100644
index 0000000..817d89e
--- /dev/null
+++ b/config/cmake/version.plist.in
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+
+<plist version="1.0">
+<dict>
+    <key>BuildVersion</key>
+    <string>@CPACK_PACKAGE_VERSION_MAJOR@</string>
+    <key>CFBundleShortVersionString</key>
+    <string>@CPACK_APPLE_GUI_SHORT_VERSION_STRING@</string>
+    <key>CFBundleVersion</key>
+    <string>@CPACK_APPLE_GUI_SHORT_VERSION_STRING@</string>
+    <key>ProjectName</key>
+    <string>@CPACK_APPLE_GUI_BUNDLE_NAME@</string>
+    <key>SourceVersion</key>
+    <string>@CPACK_PACKAGE_VERSION_MINOR@</string>
+</dict>
+</plist>
diff --git a/config/cmake/vfdTest.cmake b/config/cmake/vfdTest.cmake
index d3cb87e..fadc67f 100644
--- a/config/cmake/vfdTest.cmake
+++ b/config/cmake/vfdTest.cmake
@@ -1,50 +1,92 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
 # vfdTest.cmake executes a command and captures the output in a file. Command uses specified VFD.
 # Exit status of command can also be compared.
 
 # arguments checking
 if (NOT TEST_PROGRAM)
   message (FATAL_ERROR "Require TEST_PROGRAM to be defined")
-endif (NOT TEST_PROGRAM)
-#if (NOT TEST_ARGS)
-#  message (STATUS "Require TEST_ARGS to be defined")
-#endif (NOT TEST_ARGS)
-#if (NOT TEST_EXPECT)
-#  message (STATUS "Require TEST_EXPECT to be defined")
-#endif (NOT TEST_EXPECT)
+endif ()
 if (NOT TEST_FOLDER)
-  message ( FATAL_ERROR "Require TEST_FOLDER to be defined")
-endif (NOT TEST_FOLDER)
+  message (FATAL_ERROR "Require TEST_FOLDER to be defined")
+endif ()
 if (NOT TEST_VFD)
   message (FATAL_ERROR "Require TEST_VFD to be defined")
-endif (NOT TEST_VFD)
+endif ()
 
-set (ERROR_APPEND 1)
+if (EXISTS "${TEST_FOLDER}/${TEST_OUTPUT}")
+  file (REMOVE ${TEST_FOLDER}/${TEST_OUTPUT})
+endif ()
 
-message (STATUS "USING ${TEST_VFD} ON COMMAND: ${TEST_PROGRAM} ${TEST_ARGS}")
+if (EXISTS "${TEST_FOLDER}/${TEST_OUTPUT}.err")
+  file (REMOVE ${TEST_FOLDER}/${TEST_OUTPUT}.err)
+endif ()
+
+# if there is not an error reference file add the error output to the stdout file
+#if (NOT TEST_ERRREF)
+#  set (ERROR_APPEND 1)
+#endif ()
+
+message (STATUS "USING ${TEST_VFD} ON COMMAND: ${TEST_EMULATOR} ${TEST_PROGRAM} ${TEST_ARGS}")
 
 set (ENV{HDF5_DRIVER} "${TEST_VFD}")
+
 # run the test program, capture the stdout/stderr and the result var
-EXECUTE_PROCESS (
-    COMMAND ${TEST_PROGRAM} ${TEST_ARGS}
+execute_process (
+    COMMAND ${TEST_EMULATOR} ${TEST_PROGRAM} ${TEST_ARGS}
     WORKING_DIRECTORY ${TEST_FOLDER}
+    RESULT_VARIABLE TEST_RESULT
     OUTPUT_FILE ${TEST_OUTPUT}_${TEST_VFD}.out
     ERROR_FILE ${TEST_OUTPUT}_${TEST_VFD}.err
-    OUTPUT_VARIABLE TEST_ERROR
+    OUTPUT_VARIABLE TEST_OUT
     ERROR_VARIABLE TEST_ERROR
 )
 
 message (STATUS "COMMAND Result: ${TEST_RESULT}")
 
-if (ERROR_APPEND)
+# if the .err file exists and ERRROR_APPEND is enabled
+if (ERROR_APPEND AND EXISTS "${TEST_FOLDER}/${TEST_OUTPUT}_${TEST_VFD}.err")
   file (READ ${TEST_FOLDER}/${TEST_OUTPUT}_${TEST_VFD}.err TEST_STREAM)
-  file (APPEND ${TEST_FOLDER}/${TEST_OUTPUT}_${TEST_VFD}.out "${TEST_STREAM}") 
-endif (ERROR_APPEND)
+  file (APPEND ${TEST_FOLDER}/${TEST_OUTPUT}_${TEST_VFD}.out "${TEST_STREAM}")
+endif ()
 
 # if the return value is !=${TEST_EXPECT} bail out
-if (NOT ${TEST_RESULT} STREQUAL ${TEST_EXPECT})
-  message ( FATAL_ERROR "Failed: Test program ${TEST_PROGRAM} exited != ${TEST_EXPECT}.\n${TEST_ERROR}")
-endif (NOT ${TEST_RESULT} STREQUAL ${TEST_EXPECT})
+if (NOT TEST_RESULT EQUAL TEST_EXPECT)
+  if (NOT TEST_NOERRDISPLAY)
+    if (EXISTS "${TEST_FOLDER}/${TEST_OUTPUT}_${TEST_VFD}.out")
+      file (READ ${TEST_FOLDER}/${TEST_OUTPUT}_${TEST_VFD}.out TEST_STREAM)
+      message (STATUS "Output USING ${TEST_VFD}:\n${TEST_STREAM}")
+    endif ()
+  endif ()
+  message (FATAL_ERROR "Failed: Test program ${TEST_PROGRAM} exited != ${TEST_EXPECT}.\n${TEST_ERROR}")
+endif ()
 
-# everything went fine...
-message ("Passed: The ${TEST_PROGRAM} program used vfd ${TEST_VFD}")
+message (STATUS "COMMAND Error: ${TEST_ERROR}")
 
+if (NOT DEFINED ENV{HDF5_NOCLEANUP})
+  if (EXISTS "${TEST_FOLDER}/${TEST_OUTPUT}")
+    file (REMOVE ${TEST_FOLDER}/${TEST_OUTPUT})
+  endif ()
+
+  if (EXISTS "${TEST_FOLDER}/${TEST_OUTPUT}.err")
+    file (REMOVE ${TEST_FOLDER}/${TEST_OUTPUT}.err)
+  endif ()
+
+  if (TEST_DELETE_LIST)
+    foreach (dfile in ${TEST_DELETE_LIST})
+      file (REMOVE ${dfile})
+    endforeach ()
+  endif ()
+endif ()
+
+# everything went fine...
+message (STATUS "Passed: The ${TEST_PROGRAM} program used vfd ${TEST_VFD}")
diff --git a/config/cmake/volTest.cmake b/config/cmake/volTest.cmake
new file mode 100644
index 0000000..a47c3e9
--- /dev/null
+++ b/config/cmake/volTest.cmake
@@ -0,0 +1,92 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
+# volTest.cmake executes a command and captures the output in a file. Command uses specified VOL.
+# Exit status of command can also be compared.
+
+# arguments checking
+if (NOT TEST_PROGRAM)
+  message (FATAL_ERROR "Require TEST_PROGRAM to be defined")
+endif ()
+if (NOT TEST_FOLDER)
+  message (FATAL_ERROR "Require TEST_FOLDER to be defined")
+endif ()
+if (NOT TEST_VOL)
+  message (FATAL_ERROR "Require TEST_VOL to be defined")
+endif ()
+
+if (EXISTS "${TEST_FOLDER}/${TEST_OUTPUT}")
+  file (REMOVE ${TEST_FOLDER}/${TEST_OUTPUT})
+endif ()
+
+if (EXISTS "${TEST_FOLDER}/${TEST_OUTPUT}.err")
+  file (REMOVE ${TEST_FOLDER}/${TEST_OUTPUT}.err)
+endif ()
+
+# if there is not an error reference file add the error output to the stdout file
+#if (NOT TEST_ERRREF)
+#  set (ERROR_APPEND 1)
+#endif ()
+
+message (STATUS "USING ${TEST_VOL} ON COMMAND: ${TEST_EMULATOR} ${TEST_PROGRAM} ${TEST_ARGS}")
+
+set (ENV{HDF5_VOL_CONNECTOR} "${TEST_VOL}")
+
+# run the test program, capture the stdout/stderr and the result var
+execute_process (
+    COMMAND ${TEST_EMULATOR} ${TEST_PROGRAM} ${TEST_ARGS}
+    WORKING_DIRECTORY ${TEST_FOLDER}
+    RESULT_VARIABLE TEST_RESULT
+    OUTPUT_FILE ${TEST_OUTPUT}.out
+    ERROR_FILE ${TEST_OUTPUT}.err
+    OUTPUT_VARIABLE TEST_OUT
+    ERROR_VARIABLE TEST_ERROR
+)
+
+message (STATUS "COMMAND Result: ${TEST_RESULT}")
+
+# if the .err file exists and ERRROR_APPEND is enabled
+if (ERROR_APPEND AND EXISTS "${TEST_FOLDER}/${TEST_OUTPUT}.err")
+  file (READ ${TEST_FOLDER}/${TEST_OUTPUT}.err TEST_STREAM)
+  file (APPEND ${TEST_FOLDER}/${TEST_OUTPUT}.out "${TEST_STREAM}")
+endif ()
+
+# if the return value is !=${TEST_EXPECT} bail out
+if (NOT TEST_RESULT EQUAL TEST_EXPECT)
+  if (NOT TEST_NOERRDISPLAY)
+    if (EXISTS "${TEST_FOLDER}/${TEST_OUTPUT}.out")
+      file (READ ${TEST_FOLDER}/${TEST_OUTPUT}.out TEST_STREAM)
+      message (STATUS "Output USING ${TEST_VOL}:\n${TEST_STREAM}")
+    endif ()
+  endif ()
+  message (FATAL_ERROR "Failed: Test program ${TEST_PROGRAM} exited != ${TEST_EXPECT}.\n${TEST_ERROR}")
+endif ()
+
+message (STATUS "COMMAND Error: ${TEST_ERROR}")
+
+if (NOT DEFINED ENV{HDF5_NOCLEANUP})
+  if (EXISTS "${TEST_FOLDER}/${TEST_OUTPUT}")
+    file (REMOVE ${TEST_FOLDER}/${TEST_OUTPUT})
+  endif ()
+
+  if (EXISTS "${TEST_FOLDER}/${TEST_OUTPUT}.err")
+    file (REMOVE ${TEST_FOLDER}/${TEST_OUTPUT}.err)
+  endif ()
+
+  if (TEST_DELETE_LIST)
+    foreach (dfile in ${TEST_DELETE_LIST})
+      file (REMOVE ${dfile})
+    endforeach ()
+  endif ()
+endif ()
+
+# everything went fine...
+message (STATUS "Passed: The ${TEST_PROGRAM} program used vol ${TEST_VOL}")
diff --git a/config/cmake/wait_H5Tinit.cmake b/config/cmake/wait_H5Tinit.cmake
new file mode 100644
index 0000000..a8781fe
--- /dev/null
+++ b/config/cmake/wait_H5Tinit.cmake
@@ -0,0 +1,11 @@
+cmake_minimum_required (VERSION 3.18)
+
+message(STATUS "Check for existence of ${HDF5_GENERATED_SOURCE_DIR}/H5Tinit.c")
+execute_process(COMMAND ls ${HDF5_GENERATED_SOURCE_DIR}/H5Tinit.c RESULT_VARIABLE H5TI_result OUTPUT_QUIET ERROR_QUIET)
+while(H5TI_result)
+  ctest_sleep(30)
+  message(STATUS "Checking again for existence of ${HDF5_GENERATED_SOURCE_DIR}/H5Tinit.c")
+  execute_process(COMMAND ls ${HDF5_GENERATED_SOURCE_DIR}/H5Tinit.c RESULT_VARIABLE H5TI_result OUTPUT_QUIET ERROR_QUIET)
+endwhile(H5TI_result)
+file (TOUCH "${HDF5_BINARY_DIR}/H5Tinit_created")
+message(STATUS "Found ${HDF5_GENERATED_SOURCE_DIR}/H5Tinit.c")
diff --git a/config/commence.am b/config/commence.am
index 554c9fb..1f0dc2e 100644
--- a/config/commence.am
+++ b/config/commence.am
@@ -2,17 +2,14 @@
 ## (Use double hashes for copyright notice so that automake treats it as
 ## comments and does not pass it to Makefile.in)
 ## Copyright by The HDF Group.
-## Copyright by the Board of Trustees of the University of Illinois.
 ## All rights reserved.
 ##
 ## This file is part of HDF5.  The full HDF5 copyright notice, including
 ## terms governing use, modification, and redistribution, is contained in
-## the files COPYING and Copyright.html.  COPYING can be found at the root
-## of the source code distribution tree; Copyright.html can be found at the
-## root level of an installed copy of the electronic HDF5 document set and
-## is linked from the top-level documents page.  It can also be found at
-## http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-## access to either file, you may request a copy from help@hdfgroup.org.
+## the COPYING file, which can be found at the root of the source code
+## distribution tree, or in https://www.hdfgroup.org/licenses.
+## If you do not have access to either file, you may request a copy from
+## help@hdfgroup.org.
 
 
 ## Textually included in the beginning of every HDF5 Makefile.am
@@ -37,6 +34,7 @@ LIBH5TEST=$(top_builddir)/test/libh5test.la
 LIBH5F=$(top_builddir)/fortran/src/libhdf5_fortran.la
 LIBH5FTEST=$(top_builddir)/fortran/test/libh5test_fortran.la
 LIBH5CPP=$(top_builddir)/c++/src/libhdf5_cpp.la
+LIBH5JNI=$(top_builddir)/java/src/jni/libhdf5_java.la
 LIBH5TOOLS=$(top_builddir)/tools/lib/libh5tools.la
 LIBH5_HL=$(top_builddir)/hl/src/libhdf5_hl.la
 LIBH5F_HL=$(top_builddir)/hl/fortran/src/libhdf5hl_fortran.la
@@ -45,15 +43,15 @@ LIBH5CPP_HL=$(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
 # Install directories that automake doesn't know about
 docdir = $(exec_prefix)/doc
 
-# Note that in svn revision 19400 the '/' after DESTDIR in H5* variables below  
-# has been removed. According to the official description of DESTDIR by Gnu at 
-# http://www.gnu.org/prep/standards/html_node/DESTDIR.html, DESTDIR is 
-# prepended to the normal and complete install path that it precedes for the 
-# purpose of installing in a temporary directory which is useful for building 
-# rpms and other packages.  The '/' after ${DESTDIR} will be followed by another 
-# '/' at the beginning of the normal install path.  When DESTDIR is empty the  
-# path then begins with '//', which is incorrect and causes problems at least for 
-# Cygwin.   
+# Note that in svn revision 19400 the '/' after DESTDIR in H5* variables below
+# has been removed. According to the official description of DESTDIR by GNU at
+# http://www.gnu.org/prep/standards/html_node/DESTDIR.html, DESTDIR is
+# prepended to the normal and complete install path that it precedes for the
+# purpose of installing in a temporary directory which is useful for building
+# rpms and other packages.  The '/' after ${DESTDIR} will be followed by another
+# '/' at the beginning of the normal install path.  When DESTDIR is empty the
+# path then begins with '//', which is incorrect and causes problems at least for
+# Cygwin.
 
 # Scripts used to build examples
 # If only shared libraries have been installed, have h5cc build examples with
@@ -63,11 +61,11 @@ H5CC_PP=${DESTDIR}$(bindir)/h5pcc
 H5FC=${DESTDIR}$(bindir)/h5fc
 H5FC_PP=${DESTDIR}$(bindir)/h5pfc
 H5CPP=${DESTDIR}$(bindir)/h5c++
-  
+
 
 # H5_CFLAGS holds flags that should be used when building hdf5,
 # but which should not be exported to h5cc for building other programs.
-# AM_CFLAGS is an automake construct which should be used by Makefiles 
+# AM_CFLAGS is an automake construct which should be used by Makefiles
 # instead of CFLAGS, as CFLAGS is reserved solely for the user to define.
 # This applies to FCFLAGS, CXXFLAGS, CPPFLAGS, and LDFLAGS as well.
 
@@ -89,16 +87,16 @@ F9XMODFLAG=@F9XMODFLAG@
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
-# *.clog and *.clog2 are from the MPE option.
-CHECK_CLEANFILES=*.chkexe *.chklog *.clog *.clog2
+CHECK_CLEANFILES=*.chkexe *.chklog
 
 # List all build rules defined by HDF5 Makefiles as "PHONY" targets here.
 # This tells the Makefiles that these targets are not files to be built but
 # commands that should be executed even if a file with the same name already
 # exists.
 .PHONY: build-check-clean build-check-p build-check-s build-lib build-progs \
-        build-tests check-clean check-install check-p check-s check-vfd \
-        install-doc lib progs tests uninstall-doc _exec_check-s _test help
+	build-tests check-clean check-install check-p check-s check-vfd \
+	check-passthrough-vol install-doc lib progs tests uninstall-doc \
+	_exec_check-s _test help trace doxygen
 
 help:
 	@$(top_srcdir)/bin/makehelp
diff --git a/config/conclude.am b/config/conclude.am
index 1ba56fb..227f0d3 100644
--- a/config/conclude.am
+++ b/config/conclude.am
@@ -2,37 +2,35 @@
 ## (Use double hashes for copyright notice so that automake treats it as
 ## comments and does not pass it to Makefile.in)
 ## Copyright by The HDF Group.
-## Copyright by the Board of Trustees of the University of Illinois.
 ## All rights reserved.
 ##
 ## This file is part of HDF5.  The full HDF5 copyright notice, including
 ## terms governing use, modification, and redistribution, is contained in
-## the files COPYING and Copyright.html.  COPYING can be found at the root
-## of the source code distribution tree; Copyright.html can be found at the
-## root level of an installed copy of the electronic HDF5 document set and
-## is linked from the top-level documents page.  It can also be found at
-## http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-## access to either file, you may request a copy from help@hdfgroup.org.
+## the COPYING file, which can be found at the root of the source code
+## distribution tree, or in https://www.hdfgroup.org/licenses.
+## If you do not have access to either file, you may request a copy from
+## help@hdfgroup.org.
 
 
 ## Textually included at the end of most HDF5 Makefiles.am.
 ## Contains build rules.
 
-# Automake needs to be taught how to build lib, progs, and tests targets.
+# Automake needs to be taught how to build lib, progs and tests targets.
 # These will be filled in automatically for the most part (e.g.,
 # lib_LIBRARIES are built for lib target), but EXTRA_LIB, EXTRA_PROG, and
 # EXTRA_TEST variables are supplied to allow the user to force targets to
-# be built at certain times. 
+# be built at certain times.
 LIB = $(lib_LIBRARIES) $(lib_LTLIBRARIES) $(noinst_LIBRARIES)                 \
       $(noinst_LTLIBRARIES) $(check_LIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LIB)
 PROGS = $(bin_PROGRAMS) $(bin_SCRIPTS) $(noinst_PROGRAMS) $(noinst_SCRIPTS)   \
         $(EXTRA_PROG)
-chk_TESTS = $(check_PROGRAMS) $(check_SCRIPTS) $(EXTRA_TEST) 
-TESTS = $(TEST_PROG) $(TEST_SCRIPT) $(EXTRA_TEST) 
+chk_TESTS = $(check_PROGRAMS) $(check_SCRIPTS) $(EXTRA_TEST)
+TESTS = $(TEST_PROG) $(TEST_SCRIPT) $(EXTRA_TEST)
 
 TEST_EXTENSIONS = .sh
 SH_LOG_COMPILER = $(SHELL)
 AM_SH_LOG_FLAGS =
+REALTIMEOUTPUT = $(realtimeOutput)
 
 # lib/progs/tests targets recurse into subdirectories. build-* targets
 # build files in this directory.
@@ -69,7 +67,7 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(chk_TESTS)
 # make install-doc doesn't do anything outside of doc directory, but
 # Makefiles should recognize it.
 # UPDATE: docs no longer reside in this build tree, so this target
-# is depreciated.
+# is deprecated.
 install-doc uninstall-doc:
 	@echo "Nothing to be done."
 
@@ -123,34 +121,83 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 	   tname=$(@:.chkexe_=)$(EXEEXT);\
 	   log=$(@:.chkexe_=.chklog); \
 	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \
+	   if [ $(@:.chkexe_=.chkexe) -nt $${tname} ]; then \
 	      echo "No need to test $${tname} again."; \
 	   else \
-	      echo "============================" > $${log}; \
-	      if test "X$(FORTRAN_API)" = "Xyes"; then \
-	         echo "Fortran API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "Fortran API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(CXX_API)" = "Xyes"; then \
-	         echo "C++ API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "C++ API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log};\
-	      else \
-	         echo "Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "$(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      fi; \
-	      echo "============================" >> $${log}; \
-	      srcdir="$(srcdir)" \
-	         $(TIME) $(RUNEXEC) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \
-	         && touch $(@:.chkexe_=.chkexe) || \
-	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	         (cat $${log} && false) || exit 1; \
+              if test -n "$(REALTIMEOUTPUT)"; then \
+                 echo "============================" | tee $${log}; \
+              else \
+                 echo "============================" > $${log}; \
+              fi; \
+              if test "X$(FORTRAN_API)" = "Xyes"; then \
+                 echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \
+                 if test -n "$(REALTIMEOUTPUT)"; then \
+                    echo "Fortran API: Test log for $${tname} $(TEST_FLAGS)" | tee -a $${log}; \
+                 else \
+                    echo "Fortran API: Test log for $${tname} $(TEST_FLAGS)" >> $${log}; \
+                 fi; \
+              elif test "X$(CXX_API)" = "Xyes"; then \
+                 echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \
+                 if test -n "$(REALTIMEOUTPUT)"; then \
+                    echo "C++ API: Test log for $${tname} $(TEST_FLAGS)" | tee -a $${log};\
+                 else \
+                    echo "C++ API: Test log for $${tname} $(TEST_FLAGS)" >> $${log};\
+                 fi; \
+              else \
+                 echo "Testing: $${tname} $(TEST_FLAGS)"; \
+                 if test -n "$(REALTIMEOUTPUT)"; then \
+                    echo "Test log for $${tname} $(TEST_FLAGS)" | tee -a $${log}; \
+                 else \
+                    echo "Test log for $${tname} $(TEST_FLAGS)" >> $${log}; \
+                 fi; \
+              fi; \
+              if test -n "$(REALTIMEOUTPUT)"; then \
+                if test -n "$(HDF5_VOL_CONNECTOR)"; then \
+                  echo "VOL connector: $(HDF5_VOL_CONNECTOR)" | tee -a $${log}; \
+                fi; \
+                if test -n "$(HDF5_DRIVER)"; then \
+                  echo "Virtual file driver (VFD): $(HDF5_DRIVER)" | tee -a $${log}; \
+                fi; \
+              else \
+                if test -n "$(HDF5_VOL_CONNECTOR)"; then \
+                  echo "VOL connector: $(HDF5_VOL_CONNECTOR)" >> $${log}; \
+                fi; \
+                if test -n "$(HDF5_DRIVER)"; then \
+                  echo "Virtual file driver (VFD): $(HDF5_DRIVER)" >> $${log}; \
+                fi; \
+              fi; \
+              if test -n "$(REALTIMEOUTPUT)"; then \
+                 echo "============================" | tee -a $${log}; \
+              else \
+                 echo "============================" >> $${log}; \
+              fi; \
+              if test -n "$(REALTIMEOUTPUT)"; then \
+                 srcdir="$(srcdir)" \
+                 $(TIME) $(RUNEXEC) ./$${tname} $(TEST_FLAGS) | tee -a $${log} 2>&1 \
+                 && touch $(@:.chkexe_=.chkexe) || \
+                 (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
+                 (cat $${log} && false) || exit 1; \
+              else \
+                 srcdir="$(srcdir)" \
+                 $(TIME) $(RUNEXEC) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \
+                 && touch $(@:.chkexe_=.chkexe) || \
+                 (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
+                 (cat $${log} && false) || exit 1; \
+              fi; \
 	      echo "" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
-	      echo "============================" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
-	      cat $${log}; \
+              if test -n "$(REALTIMEOUTPUT)"; then \
+                 echo "Finished testing $${tname} $(TEST_FLAGS)" | tee -a $${log}; \
+                 echo "============================" | tee -a $${log}; \
+              else \
+                 echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
+                 echo "============================" >> $${log}; \
+              fi; \
+              if test -z "$(REALTIMEOUTPUT)"; then \
+                 cat $${log}; \
+              fi; \
 	   fi; \
 	fi
- 
+
 # The dummysh.chkexe here prevents the target from being
 # empty if there are no tests in the current directory.
 # $${log} is the log file.
@@ -162,7 +209,14 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
 	   chkname=`basename $(@:.chkexe_=.chkexe)`;\
 	   log=`basename $(@:.chkexe_=.chklog)`; \
 	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer $${chkname} $$cmd $(SCRIPT_DEPEND); then \
+	   newer=true; \
+	   for i in $${cmd} $(SCRIPT_DEPEND); do \
+              if [ $${chkname} -ot $$i ]; then \
+		 newer=false; \
+		 break; \
+	      fi; \
+           done; \
+	   if $${newer}; then \
 	      echo "No need to test $${tname} again."; \
 	   else \
 	      echo "============================" > $${log}; \
@@ -201,7 +255,7 @@ build-check-p: $(LIB) $(PROGS) $(chk_TESTS)
 	    echo "**** Hint ****";                                            \
 	    echo "Parallel test files reside in the current directory"        \
 	         "by default.";                                               \
-	    echo "Set HDF5_PARAPREFIX to use another directory. E.g.,";       \
+	    echo "Set HDF5_PARAPREFIX to use another directory. e.g.,";       \
 	    echo "    HDF5_PARAPREFIX=/PFS/user/me";                          \
 	    echo "    export HDF5_PARAPREFIX";                                \
 	    echo "    make check";                                            \
@@ -222,6 +276,35 @@ build-check-p: $(LIB) $(PROGS) $(chk_TESTS)
 	    echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
 	fi
 
+VFD_LIST = sec2 stdio core core_paged split multi family splitter
+
+# log VFD currently has file space allocation bugs
+# VFD_LIST += log
+
+if DIRECT_VFD_CONDITIONAL
+  VFD_LIST += direct
+endif
+if BUILD_PARALLEL_CONDITIONAL
+  # MPI I/O VFD is currently incompatible with too many tests in the VFD test set
+  # VFD_LIST += mpio
+endif
+if MIRROR_VFD_CONDITIONAL
+  # Mirror VFD needs network configuration, etc. and isn't easy to set
+  # reasonable defaults for that info.
+  # VFD_LIST += mirror
+endif
+if ROS3_VFD_CONDITIONAL
+  VFD_LIST += ros3
+endif
+if HDFS_VFD_CONDITIONAL
+  VFD_LIST += hdfs
+endif
+if SUBFILING_VFD_CONDITIONAL
+  # Several VFD tests fail with Subfiling since it
+  # doesn't currently support collective I/O
+  # VFD_LIST += subfiling
+endif
+
 # Run test with different Virtual File Driver
 check-vfd: $(LIB) $(PROGS) $(chk_TESTS)
 	@for vfd in $(VFD_LIST) dummy; do                                     \
@@ -233,3 +316,25 @@ check-vfd: $(LIB) $(PROGS) $(chk_TESTS)
 	        HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check || exit 1;    \
 	    fi;                                                               \
 	done
+
+# Test with just the native connector, with a single pass-through connector
+# and with a doubly-stacked pass-through.
+#
+# native = 0
+# pass-through = 1
+VOL_LIST = native "pass_through under_vol=0;under_info={}" \
+           "pass_through under_vol=1;under_info={under_vol=0;under_info={}}"
+
+# Run test with different passthrough Virtual Object Layer Connector
+# NOTE: Will only succeed with passthrough VOL connectors that use
+#       the native VOL connector as the terminal connector.
+check-passthrough-vol: $(LIB) $(PROGS) $(chk_TESTS)
+	@for vol in $(VOL_LIST) dummy; do                                     \
+	    if test "$$vol" != dummy; then                                    \
+	        echo "============================";                          \
+	        echo "Testing VOL Connector: \"$$vol\"";                      \
+	        echo "============================";                          \
+	        $(MAKE) $(AM_MAKEFLAGS) check-clean || exit 1;                \
+	        HDF5_VOL_CONNECTOR="$$vol" $(MAKE) $(AM_MAKEFLAGS) check || exit 1;    \
+	    fi;                                                               \
+	done
diff --git a/config/conclude_fc.am b/config/conclude_fc.am
new file mode 100644
index 0000000..d26016a
--- /dev/null
+++ b/config/conclude_fc.am
@@ -0,0 +1,32 @@
+## config/conclude_fc.am
+## (Use double hashes for copyright notice so that automake treats it as
+## comments and does not pass it to Makefile.in)
+## Copyright by The HDF Group.
+## All rights reserved.
+##
+## This file is part of HDF5.  The full HDF5 copyright notice, including
+## terms governing use, modification, and redistribution, is contained in
+## the COPYING file, which can be found at the root of the source code
+## distribution tree, or in https://www.hdfgroup.org/licenses.
+## If you do not have access to either file, you may request a copy from
+## help@hdfgroup.org.
+
+
+## Textually included at the end of the Fortran HDF5 Makefiles.am.
+
+# Makefile.am include fragment with Fortran helper rules and macros.
+
+# AM_FCCPPFLAGS, FCCPPFLAGS are currently not used.
+
+PPFCCOMPILE = $(FC) $(FCDEFS) $(DEFAULT_INCLUDES)  $(FCINCLUDES) $(AM_FCCPPFLAGS) $(FCCPPFLAGS) $(AM_FCFLAGS) $(FCFLAGS)
+LTPPFCCOMPILE = $(LIBTOOL) --silent --tag=FC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(PPFCCOMPILE)
+
+# Treat all .f90 and .F90 files as preprocessed Fortran.
+.f90.o:
+	@if $(AM_V_P); then set -x; else echo "  PPFC     $@"; fi;    \
+	$(PPFCCOMPILE) -c -o $@ $<
+.F90.o:
+	@if $(AM_V_P); then set -x; else echo "  PPFC     $@"; fi;    \
+	$(PPFCCOMPILE) -c -o $@ $<
+
+include $(top_srcdir)/config/conclude.am
diff --git a/config/cygwin b/config/cygwin
new file mode 100644
index 0000000..9cc6401
--- /dev/null
+++ b/config/cygwin
@@ -0,0 +1,21 @@
+#              -*- shell-script -*-
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+
+
+# This file is part of the HDF5 build script.  It is processed shortly
+# after configure starts and defines, among other things, flags for
+# the various compile modes.
+#
+# See BlankForm in this directory for details.
+
+# Use the linux-gnulibc1 file.
+. $srcdir/config/linux-gnulibc1
diff --git a/config/examples.am b/config/examples.am
index 8597a16..09a9a24 100644
--- a/config/examples.am
+++ b/config/examples.am
@@ -2,17 +2,14 @@
 ## (Use double hashes for copyright notice so that automake treats it as
 ## comments and does not pass it to Makefile.in)
 ## Copyright by The HDF Group.
-## Copyright by the Board of Trustees of the University of Illinois.
 ## All rights reserved.
 ##
 ## This file is part of HDF5.  The full HDF5 copyright notice, including
 ## terms governing use, modification, and redistribution, is contained in
-## the files COPYING and Copyright.html.  COPYING can be found at the root
-## of the source code distribution tree; Copyright.html can be found at the
-## root level of an installed copy of the electronic HDF5 document set and
-## is linked from the top-level documents page.  It can also be found at
-## http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-## access to either file, you may request a copy from help@hdfgroup.org.
+## the COPYING file, which can be found at the root of the source code
+## distribution tree, or in https://www.hdfgroup.org/licenses.
+## If you do not have access to either file, you may request a copy from
+## help@hdfgroup.org.
 
 ## Textually included near the end of HDF5 Makefiles in example directories.
 ## Contains boilerplate for building, installing, and cleaning example
@@ -35,7 +32,7 @@
 ## INSTALL_TOP_FILES
 ##
 ## EXAMPLEDIR
-## The directory into which examples should be installed. 
+## The directory into which examples should be installed.
 ##
 ## Build rules for $(EXTRA_PROG).
 ## Dependencies for example programs.
@@ -53,9 +50,9 @@ CLEANFILES=$(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA)
 
 # How to create EXAMPLEDIR if it doesn't already exist
 $(EXAMPLEDIR):
-	-$(top_srcdir)/bin/mkdirs $@
+	mkdir -p -m 755 $@
 $(EXAMPLETOPDIR):
-	-$(top_srcdir)/bin/mkdirs $@
+	mkdir -p -m 755 $@
 
 # Install and uninstall rules.  We install the source files, not the
 # example programs themselves.
@@ -64,7 +61,7 @@ install-data-local:
 uninstall-local:
 	@$(MAKE) $(AM_MAKEFLAGS) uninstall-examples
 
-install-examples: $(EXAMPLEDIR) $(INSTALL_FILES) 
+install-examples: $(EXAMPLEDIR) $(INSTALL_FILES)
 	@for f in X $(INSTALL_FILES); do                                     \
 	  if test $$f != X; then                                             \
 	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);    \
@@ -111,7 +108,7 @@ installcheck-local:
 	  H5CCFLAGS="-shlib" $(MAKE) $(AM_MAKEFLAGS) check;                \
 	else                                                              \
 	  $(MAKE) $(AM_MAKEFLAGS) check;                                   \
-	fi 
+	fi
 	@if test "$(INSTALL_FILES)" -a $(TEST_EXAMPLES_SCRIPT) -a -d $(EXAMPLEDIR); then \
 	    echo "============================";                                         \
 	    echo "Testing $(TEST_EXAMPLES_SCRIPT)";                                      \
diff --git a/config/freebsd b/config/freebsd
index e42ca60..2fb962f 100644
--- a/config/freebsd
+++ b/config/freebsd
@@ -1,17 +1,14 @@
 #							-*- shell-script -*-
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 
 
 # This file is part of the HDF5 build script.  It is processed shortly
@@ -20,24 +17,31 @@
 #
 # See BlankForm in this directory for details.
 
-# The default compiler is `gcc'
+# The default compiler is 'cc'
 if test "X-" = "X-$CC"; then
-  CC=gcc
-  CC_BASENAME=gcc
+  CC=cc
+  CC_BASENAME=cc
 fi
 
-# Figure out C compiler flags
+# Figure out clang C compiler flags
+. $srcdir/config/clang-flags
+
+# Figure out GNU C compiler flags
 . $srcdir/config/gnu-flags
 
 # Figure out Intel C compiler flags
 . $srcdir/config/intel-flags
 
 # The default Fortran 90 compiler
+# No default Fortran compiler for clang. flang exists on
+# FreeBSD as a port, but this is tied to an ancient LLVM
+# and lacks Fortran 2003 features which causes configure
+# to fail.
 if test "X-" = "X-$FC"; then
     case $CC_BASENAME in
         gcc*|pgcc*)
-            FC=gfortran40
-            FC_BASENAME=gfortran40
+            FC=gfortran
+            FC_BASENAME=gfortran
             ;;
         icc*)
             FC=ifort
@@ -56,3 +60,16 @@ fi
 # Figure out Intel F90 compiler flags
 . $srcdir/config/intel-fflags
 
+# The default C++ compiler
+
+# The default compiler is 'c++'.
+if test -z "$CXX"; then
+  CXX=c++
+  CXX_BASENAME=c++
+fi
+
+# Figure out Clang CXX compiler flags
+. $srcdir/config/clang-cxxflags
+
+# Figure out GNU CXX compiler flags
+. $srcdir/config/gnu-cxxflags
diff --git a/config/gnu-cxxflags b/config/gnu-cxxflags
new file mode 100644
index 0000000..f409ab4
--- /dev/null
+++ b/config/gnu-cxxflags
@@ -0,0 +1,285 @@
+#                            -*- shell-script -*-
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+
+
+# This file should be sourced into configure if the compiler is the
+# GNU g++ compiler or a derivative.  It is careful not to do anything
+# if the compiler is not GNU; otherwise `cxx_flags_set' is set to `yes'
+#
+
+#
+# For now, do not promote any warnings to errors.
+#
+WARNINGS_AS_ERRORS_DFLT=no
+
+#
+# This filter rewrites -Werror= as -W, in that way demoting warnings
+# promoted to errors back to warnings, if WARNINGS_AS_ERRORS is no.
+#
+demote_errors()
+{
+    if [ ${WARNINGS_AS_ERRORS:-${WARNINGS_AS_ERRORS_DFLT}} = no ]; then
+        sed 's,-Werror=,-W,g'
+    else
+        cat
+    fi
+}
+
+#
+# Prepend `$srcdir/config/gnu-warnings/` to the filename suffix(es) given as
+# subroutine argument(s), remove comments starting with # and ending
+# at EOL, replace spans of whitespace (including newlines) with spaces,
+# and re-emit the file(s) thus filtered on the standard output stream.
+#
+load_gnu_arguments()
+{
+    set -- $(for arg; do
+        sed 's,#.*$,,' $srcdir/config/gnu-warnings/${arg} | demote_errors
+    done)
+    IFS=' ' echo "$*"
+}
+
+# Get the compiler version in a way that works for g++
+# unless a compiler version is already known
+#
+#   cxx_vendor:    The compiler name: g++
+#   cxx_version:   Version number: 2.91.60, 2.7.2.1
+#
+if test "X-" = "X-$cxx_flags_set"; then
+    # PathScale compiler spits out gcc version string too. Need to
+    # filter it out.
+    # icc beginning with version 12 includes a "gcc version compatibility"
+    # string, causing the gcc H5_CXXFLAGS to be erroneously added.  The line
+    # "grep -v 'icc version'" causes the discarding of any output
+    # containing 'icc version'.  The cxx_version for icc is correctly determined
+    # and flags added in the intel-flags script.
+    cxx_version="`$CXX $CXXFLAGS $H5_CXXFLAGS -v 2>&1 | grep -v 'PathScale' |\
+        grep -v '^icc.*version' |\
+        grep 'gcc version' | sed 's/.*gcc version \([-a-z0-9\.]*\).*/\1/'`"
+    cxx_vendor=`echo $cxx_version |sed 's/\([a-z]*\).*/\1/'`
+    cxx_version=`echo $cxx_version |sed 's/[-a-z]//g'`
+    if test X = "X$cxx_vendor" -a X != "X$cxx_version"; then
+        cxx_vendor=g++
+    fi
+    if test "-" != "$cxx_vendor-$cxx_version"; then
+        echo "compiler '$CXX' is GNU $cxx_vendor-$cxx_version"
+    fi
+
+    # Get the compiler version numbers
+    cxx_vers_major=`echo $cxx_version | cut -f1 -d.`
+    cxx_vers_minor=`echo $cxx_version | cut -f2 -d.`
+    cxx_vers_patch=`echo $cxx_version | cut -f3 -d.`
+    test -n "$cxx_vers_major" || cxx_vers_major=0
+    test -n "$cxx_vers_minor" || cxx_vers_minor=0
+    test -n "$cxx_vers_patch" || cxx_vers_patch=0
+    cxx_vers_all=`expr $cxx_vers_major '*' 1000000 + $cxx_vers_minor '*' 1000 + $cxx_vers_patch`
+fi
+
+if test "X-g++" = "X-$cxx_vendor"; then
+
+    ###############################
+    # Architecture-specific flags #
+    ###############################
+
+    arch=
+    case "$host_os-$host_cpu" in
+        # FreeBSD sets the information from "uname -m" to the general machine
+        # architecture, not the specific CPU for the machine, so even our
+        # Pentium II Xeon server is set to "i386".  Once we know we are on a FreeBSD
+        # machine, use the "sysctl" command to get the CPU hardware model.
+        freebsd*-i386)
+            host_cpu_model=`sysctl -n hw.model`
+            case "$host_cpu_model" in
+                # Hmm.. this might not catch Celerons, but it won't hurt them either...
+                *Pro*|*II*|*III*|*IV*|*Athlon*)
+                    # architecture-specific optimizations cause problems
+                    # for some users who build binaries to be used on
+                    # multiple architectures.
+                    # arch="-march=i686"
+                ;;
+            esac
+            ;;
+
+        *-i686)
+                    # architecture-specific optimizations cause problems
+                    # for some users who build binaries to be used on
+                    # multiple architectures.
+                    # arch="-march=i686"
+            ;;
+    esac
+
+    # C++-specific
+    H5_CXXFLAGS="$H5_CXXFLAGS $arch -std=c++11"
+
+    ##############
+    # Production #
+    ##############
+
+    # NDEBUG is handled explicitly by the configure script
+    if test $cxx_vers_major -le 4; then
+        PROD_CXXFLAGS=
+    else
+        PROD_CXXFLAGS="-fstdarg-opt"
+    fi
+
+    #########
+    # Debug #
+    #########
+
+    # NDEBUG is handled explicitly by the configure script
+    # -g is handled by the symbols flags
+    if test $cxx_vers_major -le 4; then
+        DEBUG_CXXFLAGS=
+    else
+        DEBUG_CXXFLAGS="-ftrapv -fno-common"
+    fi
+
+    ########################
+    # Enhanced Diagnostics #
+    ########################
+
+    if test $cxx_vers_major -ge 10; then
+        NO_DIAGS_CXXFLAGS="-fdiagnostics-urls=never -fno-diagnostics-color"
+    fi
+    DIAGS_CXXFLAGS=
+
+    ###########
+    # Symbols #
+    ###########
+
+    NO_SYMBOLS_CXXFLAGS="-s"
+    SYMBOLS_CXXFLAGS="-g"
+
+    #############
+    # Profiling #
+    #############
+
+    PROFILE_CXXFLAGS="-pg"
+
+    ################
+    # Optimization #
+    ################
+
+    if test $cxx_vers_major -le 4; then
+        HIGH_OPT_CXXFLAGS="-O3"
+        DEBUG_OPT_CXXFLAGS=
+    else
+        HIGH_OPT_CXXFLAGS="-O3"
+        DEBUG_OPT_CXXFLAGS="-Og"
+    fi
+    NO_OPT_CXXFLAGS="-O0"
+
+    ############
+    # Warnings #
+    ############
+
+
+    ###########
+    # General #
+    ###########
+
+    # Add various general warning flags in gnu-warnings for gcc versions 4.8 and later.
+    if test $cxx_vers_major -eq 4 -a $cxx_vers_minor -ge 8 -o $cxx_vers_major -ge 5; then
+        H5_CXXFLAGS="$H5_CXXFLAGS $(load_gnu_arguments cxx-general)"
+        H5_ECXXFLAGS="$H5_ECXXFLAGS $(load_gnu_arguments cxx-error-general)"
+
+        ######################
+        # Developer warnings #
+        ######################
+
+        # Use the C warnings as CXX warnings are the same
+        NO_DEVELOPER_WARNING_CXXFLAGS=$(load_gnu_arguments no-developer-general)
+        DEVELOPER_WARNING_CXXFLAGS=$(load_gnu_arguments developer-general)
+
+    fi
+
+    #######################
+    # gcc 4 special cases #
+    #######################
+
+    # GCC 4.8 through the end of GCC 4 series
+    if test $cxx_vers_major -eq 4 -a $cxx_vers_minor -ge 8; then
+        # Use the C warnings as CXX warnings are the same
+        H5_CXXFLAGS="$H5_CXXFLAGS $(load_gnu_arguments 4.8-4.last)"
+    fi
+
+    #############################
+    # Version-specific warnings #
+    #############################
+
+    # gcc >= 4.8
+    if test $cxx_vers_major -ge 5 -o $cxx_vers_major -eq 4 -a $cxx_vers_minor -ge 8; then
+        H5_CXXFLAGS="$H5_CXXFLAGS $(load_gnu_arguments cxx-4.8)"
+        # Use the C warnings as CXX warnings are the same
+        DEVELOPER_WARNING_CXXFLAGS="$DEVELOPER_WARNING_CXXFLAGS $(load_gnu_arguments cxx-developer-4.8)"
+        NO_DEVELOPER_WARNING_CXXFLAGS="$NO_DEVELOPER_WARNING_CXXFLAGS $(load_gnu_arguments no-cxx-developer-4.8)"
+    fi
+
+    # gcc >= 4.9
+    if test $cxx_vers_major -ge 5 -o $cxx_vers_major -eq 4 -a $cxx_vers_minor -ge 9; then
+        H5_CXXFLAGS="$H5_CXXFLAGS $(load_gnu_arguments cxx-4.9)"
+    fi
+
+    # gcc >= 5
+    if test $cxx_vers_major -ge 5; then
+        H5_CXXFLAGS="$H5_CXXFLAGS $(load_gnu_arguments cxx-5)"
+        H5_ECXXFLAGS="$H5_ECXXFLAGS $(load_gnu_arguments cxx-error-5)"
+    fi
+
+    # gcc >= 6
+    if test $cxx_vers_major -ge 6; then
+        # Use the C warnings as CXX warnings are the same
+        H5_CXXFLAGS="$H5_CXXFLAGS $(load_gnu_arguments 6)"
+    fi
+
+    # gcc >= 7
+    if test $cxx_vers_major -ge 7; then
+        # Use the C warnings as CXX warnings are the same
+        H5_CXXFLAGS="$H5_CXXFLAGS $(load_gnu_arguments 7)"
+        DEVELOPER_WARNING_CXXFLAGS="$DEVELOPER_WARNING_CXXFLAGS $(load_gnu_arguments developer-7)"
+    fi
+
+    # gcc 8
+    if test $cxx_vers_major -ge 8; then
+        # Use the C warnings as CXX warnings are the same
+        H5_CXXFLAGS="$H5_CXXFLAGS $(load_gnu_arguments 8)"
+        #H5_ECXXFLAGS="$H5_ECXXFLAGS $(load_gnu_arguments error-8)"
+        # Use the C warnings as CXX warnings are the same
+        DEVELOPER_WARNING_CXXFLAGS="$DEVELOPER_WARNING_CXXFLAGS $(load_gnu_arguments developer-8)"
+        NO_DEVELOPER_WARNING_CXXFLAGS="$NO_DEVELOPER_WARNING_CXXFLAGS $(load_gnu_arguments no-developer-8)"
+    fi
+
+    # gcc 9
+    if test $cxx_vers_major -ge 9; then
+        H5_CXXFLAGS="$H5_CXXFLAGS $(load_gnu_arguments cxx-9)"
+    fi
+
+    # gcc >= 9.3
+        # no cxx warnings, do NOT use C warnings
+
+    # gcc >= 10
+    if test $cxx_vers_major -ge 10; then
+        # Use the C warnings as CXX warnings are the same
+        DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS $(load_gnu_arguments developer-10)"
+    fi
+
+    #################
+    # Flags are set #
+    #################
+    cxx_flags_set=yes
+fi
+
+# Clear cxx info if no flags set
+if test "X$cxx_flags_set" = "X"; then
+  cxx_vendor=
+  cxx_version=
+fi
diff --git a/config/gnu-fflags b/config/gnu-fflags
index 1d6caa1..b3385ec 100644
--- a/config/gnu-fflags
+++ b/config/gnu-fflags
@@ -1,17 +1,14 @@
-#							-*- shell-script -*-
+#                            -*- shell-script -*-
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 
 
 # This file should be sourced into configure if the compiler is the
@@ -19,6 +16,20 @@
 # if the compiler is not GNU; otherwise `f9x_flags_set' is set to `yes'
 #
 
+#
+# Prepend `$srcdir/config/gnu-warnings/` to the filename suffix(es) given as
+# subroutine argument(s), remove comments starting with # and ending
+# at EOL, replace spans of whitespace (including newlines) with spaces,
+# and re-emit the file(s) thus filtered on the standard output stream.
+#
+load_gnu_arguments()
+{
+    set -- $(for arg; do
+        sed 's,#.*$,,' $srcdir/config/gnu-warnings/${arg}
+    done)
+    IFS=' ' echo "$*"
+}
+
 # Get the compiler version in a way that works for GNU fortran
 # gfortran unless a compiler version is already known
 #
@@ -27,9 +38,8 @@
 #
 if test X = "X$f9x_flags_set"; then
     f9x_version="`$FC $FCFLAGS $H5_FCFLAGS -v 2>&1 |grep 'gcc version' |\
-	        sed 's/.*gcc version \([-a-z0-9\.]*\).*/\1/'`"
+            sed 's/.*gcc version \([-a-z0-9\.]*\).*/\1/'`"
     if test X != "X$f9x_version"; then
-#        is_mpi="`$FC $FCFLAGS $H5_FCFLAGS -help 2>&1 |grep 'link MPI'`"
         f9x_vendor=`echo $f9x_version |sed 's/\([a-z]*\).*/\1/'`
         f9x_version=`echo $f9x_version |sed 's/[-a-z]//g'`
         if test X = "X$f9x_vendor" -a X != "X$f9x_version"; then
@@ -39,24 +49,36 @@ if test X = "X$f9x_flags_set"; then
             echo "compiler '$FC' is GNU $f9x_vendor-$f9x_version"
         fi
 
-        # Some version numbers
+        # Get the compiler version numbers
         f9x_vers_major=`echo $f9x_version | cut -f1 -d.`
         f9x_vers_minor=`echo $f9x_version | cut -f2 -d.`
         f9x_vers_patch=`echo $f9x_version | cut -f3 -d.`
         test -n "$f9x_vers_major" || f9x_vers_major=0
         test -n "$f9x_vers_minor" || f9x_vers_minor=0
         test -n "$f9x_vers_patch" || f9x_vers_patch=0
-        f9x_vers_all=`expr $f9x_vers_major '*' 1000000 + $f9x_vers_minor '*' 1000 + $f9x_vers_patch`
     fi
 fi
 
-# Common GNU flags for various situations
 if test "X-gfortran" = "X-$f9x_vendor"; then
-    # Insert section about version specific problems from gnu-flags here, if
-    # necessary.
+
+    FC_BASENAME=gfortran
+    F9XSUFFIXFLAG=""
+    FSEARCH_DIRS=""
+
+    # Need Fortran 2008 support for storage_size() in gcc 4.6 on
+    # (2008ts in some versions)
+    if test $f9x_vers_major -ge 8; then
+        H5_FCFLAGS="$H5_FCFLAGS -std=f2008"
+    elif test $f9x_vers_major -ge 5 -o $f9x_vers_major -eq 4 -a $f9x_vers_minor -ge 6; then
+        H5_FCFLAGS="$H5_FCFLAGS -std=f2008ts"
+    fi
+
+
+    ###############################
+    # Architecture-specific flags #
+    ###############################
 
     arch=
-    # Architecture-specific flags
     # Nothing currently. (Uncomment code below and modify to add any)
     #case "$host_os-$host_cpu" in
     #    *-i686)
@@ -64,30 +86,107 @@ if test "X-gfortran" = "X-$f9x_vendor"; then
     #        ;;
     #esac
 
-    # Host-specific flags
-    # Nothing currently. (Uncomment code below and modify to add any)
-    #case "`hostname`" in
-    #    sleipnir.ncsa.uiuc.edu)
-    #        arch="$arch -pipe"
-    #        ;;
-    #esac
+    H5_FCFLAGS="$H5_FCFLAGS $arch"
 
-    # General
-    FC_BASENAME=gfortran40
-    F9XSUFFIXFLAG=""
-    FSEARCH_DIRS=""
-    H5_FCFLAGS="$H5_FCFLAGS -pedantic -Wall -Wconversion -Wunderflow -Wimplicit-interface -W"
+    ##############
+    # Production #
+    ##############
+
+    PROD_FCFLAGS=
+
+    #########
+    # Debug #
+    #########
+
+    if test $f9x_vers_major -ge 5 -o $f9x_vers_major -eq 4 -a $f9x_vers_minor -ge 5; then
+        DEBUG_FCFLAGS="-fcheck=all"
+    else
+        DEBUG_FCFLAGS="-fbounds-check"
+    fi
+
+    ########################
+    # Enhanced Diagnostics #
+    ########################
+
+    if test $f9x_vers_major -ge 10; then
+        NO_DIAGS_FCFLAGS="-fdiagnostics-urls=never -fno-diagnostics-color"
+    fi
+    DIAGS_FCFLAGS=
+
+    ###########
+    # Symbols #
+    ###########
+
+    NO_SYMBOLS_FCFLAGS="-s"
+    SYMBOLS_FCFLAGS="-g"
+
+    #############
+    # Profiling #
+    #############
+
+    PROFILE_FCFLAGS="-pg"
+
+    ################
+    # Optimization #
+    ################
+
+    if test $f9x_vers_major -le 4; then
+        HIGH_OPT_FCFLAGS="-O3"
+        DEBUG_OPT_FCFLAGS=
+    else
+        HIGH_OPT_FCFLAGS="-O3"
+        DEBUG_OPT_FCFLAGS="-Og"
+    fi
+    NO_OPT_FCFLAGS="-O0"
+
+    ############
+    # Warnings #
+    ############
+
+    ###########
+    # General #
+    ###########
+
+    H5_FCFLAGS="$H5_FCFLAGS $(load_gnu_arguments gfort-general)"
 
-    # Production
-    PROD_FCFLAGS="-O2 -s"
+    NO_DEVELOPER_WARNING_FCFLAGS="$NO_DEVELOPER_WARNING_FCFLAGS $(load_gnu_arguments gfort-no-developer-general)"
+    DEVELOPER_WARNING_FCFLAGS="$DEVELOPER_WARNING_FCFLAGS $(load_gnu_arguments gfort-developer-general)"
 
-    # Debug
-    DEBUG_FCFLAGS="-g -fbounds-check"
+    #############################
+    # Version-specific warnings #
+    #############################
+
+    # gfortran >= 4.8
+    if test $f9x_vers_major -ge 5 -o $f9x_vers_major -eq 4 -a $f9x_vers_minor -ge 8; then
+        H5_FCFLAGS="$H5_FCFLAGS $(load_gnu_arguments gfort-4.8)"
+        DEVELOPER_WARNING_FCFLAGS="$DEVELOPER_WARNING_FCFLAGS $(load_gnu_arguments gfort-developer-4.8)"
+        NO_DEVELOPER_WARNING_FCFLAGS="$NO_DEVELOPER_WARNING_FCFLAGS $(load_gnu_arguments gfort-no-developer-4.8)"
+    fi
+
+    # gfortran 4.9 (nothing new)
+
+    # gfortran >= 5
+    if test $f9x_vers_major -ge 5; then
+        DEVELOPER_WARNING_FCFLAGS="$DEVELOPER_WARNING_FCFLAGS $(load_gnu_arguments gfort-developer-5)"
+    fi
+
+    # gfortran >= 6
+    if test $f9x_vers_major -ge 6; then
+        H5_FCFLAGS="$H5_FCFLAGS $(load_gnu_arguments gfort-6)"
+    fi
+
+    # gfortran 7 (nothing new)
+
+    # gfortran >= 8
+    if test $f9x_vers_major -ge 8; then
+        H5_FCFLAGS="$H5_FCFLAGS $(load_gnu_arguments gfort-8)"
+    fi
 
-    # Profile
-    PROFILE_FCFLAGS="-g -pg"
+    # gfortran 9 (nothing new)
 
-    # Flags are set
+    #################
+    # Flags are set #
+    #################
     f9x_flags_set=yes
 fi
 
diff --git a/config/gnu-flags b/config/gnu-flags
index 6c33808..546f601 100644
--- a/config/gnu-flags
+++ b/config/gnu-flags
@@ -1,116 +1,94 @@
-#							-*- shell-script -*-
+#                            -*- shell-script -*-
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 
 
 # This file should be sourced into configure if the compiler is the
 # GNU gcc compiler or a derivative.  It is careful not to do anything
-# if the compiler is not GNU; otherwise `cc_flags_set' is set to `yes'
+# if the compiler is not GNU; otherwise 'cc_flags_set' is set to 'yes'
 #
 
-# Get the compiler version in a way that works for gcc, egcs, and
-# pgcc unless a compiler version is already known
 #
-#   cc_vendor:    The compiler name: gcc, egcs, or pgcc
+# For now, do not promote any warnings to errors.
+#
+WARNINGS_AS_ERRORS_DFLT=no
+
+#
+# This filter rewrites -Werror= as -W, in that way demoting warnings
+# promoted to errors back to warnings, if WARNINGS_AS_ERRORS is no.
+#
+demote_errors()
+{
+    if [ ${WARNINGS_AS_ERRORS:-${WARNINGS_AS_ERRORS_DFLT}} = no ]; then
+        sed 's,-Werror=,-W,g'
+    else
+        cat
+    fi
+}
+
+#
+# Prepend `$srcdir/config/gnu-warnings/` to the filename suffix(es) given as
+# subroutine argument(s), remove comments starting with # and ending
+# at EOL, replace spans of whitespace (including newlines) with spaces,
+# and re-emit the file(s) thus filtered on the standard output stream.
+#
+load_gnu_arguments()
+{
+    set -- $(for arg; do
+        sed 's,#.*$,,' $srcdir/config/gnu-warnings/${arg} | demote_errors
+    done)
+    IFS=' ' echo "$*"
+}
+
+# Get the compiler version in a way that works for gcc
+# unless a compiler version is already known
+#
+#   cc_vendor:    The compiler name: gcc
 #   cc_version:   Version number: 2.91.60, 2.7.2.1
 #
-if test X = "X$cc_flags_set"; then
+if test "X-" = "X-$cc_flags_set"; then
     # PathScale compiler spits out gcc version string too. Need to
     # filter it out.
-    # icc beginning with version 12 includes a "gcc version compatiblilty"
+    # icc beginning with version 12 includes a "gcc version compatibility"
     # string, causing the gcc H5_CFLAGS to be erroneously added.  The line
     # "grep -v 'icc version'" causes the discarding of any output
     # containing 'icc version'.  The cc_version for icc is correctly determined
     # and flags added in the intel-flags script.
     cc_version="`$CC $CFLAGS $H5_CFLAGS -v 2>&1 | grep -v 'PathScale' |\
-        grep -v 'icc version' |\
+        grep -v '^icc.*version' |\
         grep 'gcc version' | sed 's/.*gcc version \([-a-z0-9\.]*\).*/\1/'`"
     cc_vendor=`echo $cc_version |sed 's/\([a-z]*\).*/\1/'`
     cc_version=`echo $cc_version |sed 's/[-a-z]//g'`
     if test X = "X$cc_vendor" -a X != "X$cc_version"; then
-	cc_vendor=gcc
+        cc_vendor=gcc
     fi
     if test "-" != "$cc_vendor-$cc_version"; then
-	echo "compiler '$CC' is GNU $cc_vendor-$cc_version"
+        echo "compiler '$CC' is GNU $cc_vendor-$cc_version"
     fi
 
-    # Some version numbers
+    # Get the compiler version numbers
     cc_vers_major=`echo $cc_version | cut -f1 -d.`
     cc_vers_minor=`echo $cc_version | cut -f2 -d.`
     cc_vers_patch=`echo $cc_version | cut -f3 -d.`
     test -n "$cc_vers_major" || cc_vers_major=0
     test -n "$cc_vers_minor" || cc_vers_minor=0
     test -n "$cc_vers_patch" || cc_vers_patch=0
-    cc_vers_all=`expr $cc_vers_major '*' 1000000 + $cc_vers_minor '*' 1000 + $cc_vers_patch`
 fi
 
-# GCC compilers before gcc-2.8.1 have problems with `long long'.
-if test gcc = "$cc_vendor" -a "$cc_vers_all" -lt 2008001; then
-    cat <<EOF
-    **
-    ** This compiler may be unable to properly compile the long long
-    ** data type used extensively by hdf5. There may be other code 
-    ** generation problems also, especially when optimizations are 
-    ** enabled.  Please upgrade to at least GNU gcc version 2.8.1 
-    ** before reporting bugs to the HDF5 team.
-    **
-EOF
-    sleep 5
-
-# GCC v2.96 (shipped with RH7.x) has problems with `float'-> `double' conversions.
-elif test gcc = "$cc_vendor" -a "$cc_vers_all" -eq 2096000; then
-   cat <<EOF
-    **
-    ** This compiler may have problems converting 'float' values to
-    ** 'double' values.  There may be other code generation problems
-    ** as well.
-    **
-    ** Please use a different version of gcc before reporting bugs.
-    **
-EOF
-       sleep 5
-
-# Current EGCS compilers have problems with `long long' and register
-# allocation when optimizations are turned on for x86 systems.
-elif test egcs = "$cc_vendor" -a "$cc_vers_all" -le 2091066; then
-       cat <<EOF
-    **
-    ** This compiler may have problems allocating registers when
-    ** optimizations are enabled on some platforms.
-    **
-EOF
-       sleep 5
-
-# All current versions of PGCC have problems also.
-elif test pgcc = "$cc_vendor" -a "$cc_vers_all" -le 2091066; then	    
-    cat <<EOF
-    **
-    ** This compiler may have problems allocating registers for long
-    ** long data types when optimizations are enabled. There may be
-    ** other code generation problems as well. We know of no version
-    ** of pgcc which is capable of compiling HDF5 in production mode.
-    ** Please use gcc-2.8 or egcs-1.1.1 before reporting bugs.
-    **
-EOF
-    sleep 5
+if test "X-gcc" = "X-$cc_vendor"; then
 
-fi
+    ###############################
+    # Architecture-specific flags #
+    ###############################
 
-# Common GCC flags for various situations
-case "$cc_vendor-$cc_version" in
-  gcc*|egcs*|pgcc*)
-    # Architecture-specific flags
     arch=
     case "$host_os-$host_cpu" in
         # FreeBSD sets the information from "uname -m" to the general machine
@@ -138,753 +116,179 @@ case "$cc_vendor-$cc_version" in
             ;;
     esac
 
-    # Host-specific flags
-    case "`hostname`" in
-        sleipnir.ncsa.uiuc.edu)
-            arch="$arch -pipe"
+    case "$host_os-$host_cpu" in
+        # Cygwin needs the "-std=c99" flag removed.
+        cygwin-*)
+            ;;
+        # On Solaris, gcc needs the gnu99 standard to pick up certain POSIX
+        # things. Do NOT use this as the gcc norm as this encourages the use
+        # of non-standard gcc extensions.
+        *solaris*)
+            H5_CFLAGS="$H5_CFLAGS -std=gnu99"
+            ;;
+        # Everybody else gets c99 as the standard.
+        *)
+            H5_CFLAGS="$H5_CFLAGS -std=c99"
             ;;
     esac
 
-    # General
-    H5_CFLAGS="$H5_CFLAGS $arch -ansi -pedantic -Wall -W -Wundef -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wconversion -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline"
-
-    # Production
-    case "$cc_vendor-$cc_version" in
-      gcc-2.95.[34])
-        PROD_CFLAGS="-O3"
-        ;;
-      gcc-3.*)
-        PROD_CFLAGS="-O3"
-        ;;
-      gcc-4.*)
-        PROD_CFLAGS="-O3"
-        ;;
-      *)
-        PROD_CFLAGS="-O"
-        ;;
-    esac
-
-    PROD_CFLAGS="$PROD_CFLAGS -fomit-frame-pointer -finline-functions"
-    PROD_CPPFLAGS=
-
-    # Debug
-    DEBUG_CFLAGS="-g -fverbose-asm"
-    DEBUG_CPPFLAGS=
-
-    # Profile
-    PROFILE_CFLAGS="-g -pg"
-    PROFILE_CPPFLAGS=
-
-    # Flags are set
-    cc_flags_set=yes
-    ;;
-esac
-
-# Version specific GCC flags
-#
-# Please follow the pattern below by adding new versions at the top, copying
-# the information from the previous version and adding modifications to that.
-case "$cc_vendor-$cc_version" in
-
-# Closer to the gcc 4.10 release, we should check for additional flags to
-# include and break it out into it's own section, like the other versions
-# below. -QAK
-  gcc-4.9*)
-    # Replace -ansi flag with -std=c99 flag
-    H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-ansi/-std=c99/g'`"
-
-    # Append warning flags
-    # Don't use the '-Wtraditional' flag, we're way past having K&R C code
-    # H5_CFLAGS="$H5_CFLAGS -Wtraditional"
-    # Don't use the '-Wtraditional-conversion' flag, there's too many warnings
-    #  from GCC's assert macro
-    # H5_CFLAGS="$H5_CFLAGS -Wtraditional-conversion"
-
-    # Append warning flags from gcc-3* case
-    # (don't use -Wpadded flag for normal builds, many of the warnings its
-    #   issuing can't be fixed and they are making it hard to detect other,
-    #   more important warnings)
-    #H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
-    H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute"
-
-    # Append warning flags from gcc-3.2* case
-    H5_CFLAGS="$H5_CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization"
-
-    # Enable more format checking flags, beyond the basic -Wformat included
-    # in -Wall
-    H5_CFLAGS="$H5_CFLAGS -Wformat=2"
-
-    # The "unreachable code" warning appears to be reliable now...
-    H5_CFLAGS="$H5_CFLAGS -Wunreachable-code"
-
-    # Append warning flags from gcc-3.3* case
-    H5_CFLAGS="$H5_CFLAGS -Wendif-labels"
-
-    # Append warning flags from gcc-3.4* case
-    H5_CFLAGS="$H5_CFLAGS -Wdeclaration-after-statement -Wold-style-definition -Winvalid-pch"
-
-    # Replace old -W flag with new -Wextra flag
-    H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-W\ /-Wextra\ /g'`"
-
-    # Append more extra warning flags that only gcc4.0+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wvariadic-macros -Winit-self -Wmissing-include-dirs -Wswitch-default -Wswitch-enum -Wunused-macros"
-
-    # Append more extra warning flags that only gcc 4.1+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wunsafe-loop-optimizations -Wc++-compat"
-
-    # Append more extra warning flags that only gcc 4.2+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wstrict-overflow"
-
-    # Append more extra warning flags that only gcc 4.3+ know about
-    #
-    # Technically, variable-length arrays are part of the C99 standard, but
-    #   we should approach them a bit cautiously... -QAK
-    H5_CFLAGS="$H5_CFLAGS -Wlogical-op -Wlarger-than=2048 -Wvla"
-
-    # Append more extra warning flags that only gcc 4.4+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wsync-nand -Wframe-larger-than=16384 -Wpacked-bitfield-compat"
-
-    # Append more extra warning flags that only gcc 4.5+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wstrict-overflow=5 -Wjump-misses-init -Wunsuffixed-float-constants"
-
-    # Append more extra warning flags that only gcc 4.6+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wdouble-promotion -Wsuggest-attribute=const -Wtrampolines"
-
-    # Append more extra warning flags that only gcc 4.7+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wstack-usage=8192 -Wvector-operation-performance -Wsuggest-attribute=pure -Wsuggest-attribute=noreturn"
-
-    # Append more extra warning flags that only gcc 4.8+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wsuggest-attribute=format"
-
-    # Append more extra warning flags that only gcc 4.9+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wdate-time -Wopenmp-simd"
-
-    # Try out the new "stack protector" feature in gcc 4.1
-    # (Strictly speaking this isn't really a "warning" flag, so it's added to
-    #   the debugging flags)
-    #DEBUG_CFLAGS="$DEBUG_CFLAGS -Wstack-protector -fstack-protector-all"
-    ;;
-
-  gcc-4.8*)
-    # Replace -ansi flag with -std=c99 flag
-    H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-ansi/-std=c99/g'`"
-
-    # Append warning flags
-    # Don't use the '-Wtraditional' flag, we're way past having K&R C code
-    # H5_CFLAGS="$H5_CFLAGS -Wtraditional"
-    # Don't use the '-Wtraditional-conversion' flag, there's too many warnings
-    #  from GCC's assert macro
-    # H5_CFLAGS="$H5_CFLAGS -Wtraditional-conversion"
-
-    # Append warning flags from gcc-3* case
-    # (don't use -Wpadded flag for normal builds, many of the warnings its
-    #   issuing can't be fixed and they are making it hard to detect other,
-    #   more important warnings)
-    #H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
-    H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute"
-
-    # Append warning flags from gcc-3.2* case
-    H5_CFLAGS="$H5_CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization"
-
-    # Enable more format checking flags, beyond the basic -Wformat included
-    # in -Wall
-    H5_CFLAGS="$H5_CFLAGS -Wformat=2"
-
-    # The "unreachable code" warning appears to be reliable now...
-    H5_CFLAGS="$H5_CFLAGS -Wunreachable-code"
-
-    # Append warning flags from gcc-3.3* case
-    H5_CFLAGS="$H5_CFLAGS -Wendif-labels"
-
-    # Append warning flags from gcc-3.4* case
-    H5_CFLAGS="$H5_CFLAGS -Wdeclaration-after-statement -Wold-style-definition -Winvalid-pch"
-
-    # Replace old -W flag with new -Wextra flag
-    H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-W\ /-Wextra\ /g'`"
-
-    # Append more extra warning flags that only gcc4.0+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wvariadic-macros -Winit-self -Wmissing-include-dirs -Wswitch-default -Wswitch-enum -Wunused-macros"
-
-    # Append more extra warning flags that only gcc 4.1+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wunsafe-loop-optimizations -Wc++-compat"
-
-    # Append more extra warning flags that only gcc 4.2+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wstrict-overflow"
-
-    # Append more extra warning flags that only gcc 4.3+ know about
-    #
-    # Technically, variable-length arrays are part of the C99 standard, but
-    #   we should approach them a bit cautiously... -QAK
-    H5_CFLAGS="$H5_CFLAGS -Wlogical-op -Wlarger-than=2048 -Wvla"
-
-    # Append more extra warning flags that only gcc 4.4+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wsync-nand -Wframe-larger-than=16384 -Wpacked-bitfield-compat"
-
-    # Append more extra warning flags that only gcc 4.5+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wstrict-overflow=5 -Wjump-misses-init"
-
-    # Append more extra warning flags that only gcc 4.6+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wdouble-promotion -Wsuggest-attribute=const -Wtrampolines"
-
-    # Append more extra warning flags that only gcc 4.7+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wstack-usage=8192 -Wvector-operation-performance -Wsuggest-attribute=pure -Wsuggest-attribute=noreturn"
-
-    # Append more extra warning flags that only gcc 4.8+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wsuggest-attribute=format"
-
-    # Try out the new "stack protector" feature in gcc 4.1
-    # (Strictly speaking this isn't really a "warning" flag, so it's added to
-    #   the debugging flags)
-    #DEBUG_CFLAGS="$DEBUG_CFLAGS -Wstack-protector -fstack-protector-all"
-    ;;
-
-  gcc-4.7*)
-    # Replace -ansi flag with -std=c99 flag
-    H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-ansi/-std=c99/g'`"
-
-    # Append warning flags
-    # Don't use the '-Wtraditional' flag, we're way past having K&R C code
-    # H5_CFLAGS="$H5_CFLAGS -Wtraditional"
-    # Don't use the '-Wtraditional-conversion' flag, there's too many warnings
-    #  from GCC's assert macro
-    # H5_CFLAGS="$H5_CFLAGS -Wtraditional-conversion"
-
-    # Append warning flags from gcc-3* case
-    # (don't use -Wpadded flag for normal builds, many of the warnings its
-    #   issuing can't be fixed and they are making it hard to detect other,
-    #   more important warnings)
-    #H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
-    H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute"
-
-    # Append warning flags from gcc-3.2* case
-    H5_CFLAGS="$H5_CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization"
-
-    # Enable more format checking flags, beyond the basic -Wformat included
-    # in -Wall
-    H5_CFLAGS="$H5_CFLAGS -Wformat=2"
-
-    # The "unreachable code" warning appears to be reliable now...
-    # (this warning was removed in gcc 4.5+)
-    #H5_CFLAGS="$H5_CFLAGS -Wunreachable-code"
-
-    # Append warning flags from gcc-3.3* case
-    H5_CFLAGS="$H5_CFLAGS -Wendif-labels"
-
-    # Append warning flags from gcc-3.4* case
-    H5_CFLAGS="$H5_CFLAGS -Wdeclaration-after-statement -Wold-style-definition -Winvalid-pch"
-
-    # Replace old -W flag with new -Wextra flag
-    H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-W\ /-Wextra\ /g'`"
-
-    # Append more extra warning flags that only gcc4.0+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wvariadic-macros -Winit-self -Wmissing-include-dirs -Wswitch-default -Wswitch-enum -Wunused-macros"
-
-    # Append more extra warning flags that only gcc 4.1+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wunsafe-loop-optimizations -Wc++-compat"
-
-    # Append more extra warning flags that only gcc 4.2+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wstrict-overflow"
-
-    # Append more extra warning flags that only gcc 4.3+ know about
-    #
-    # Technically, variable-length arrays are part of the C99 standard, but
-    #   we should approach them a bit cautiously... -QAK
-    H5_CFLAGS="$H5_CFLAGS -Wlogical-op -Wlarger-than=2048 -Wvla"
-
-    # Append more extra warning flags that only gcc 4.4+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wsync-nand -Wframe-larger-than=16384 -Wpacked-bitfield-compat"
-
-    # Append more extra warning flags that only gcc 4.5+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wstrict-overflow=5 -Wjump-misses-init -Wunsuffixed-float-constants"
-
-    # Append more extra warning flags that only gcc 4.6+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wdouble-promotion -Wsuggest-attribute=const -Wtrampolines"
-
-    # Append more extra warning flags that only gcc 4.7+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wstack-usage=8192 -Wvector-operation-performance -Wsuggest-attribute=pure -Wsuggest-attribute=noreturn"
-
-    # Try out the new "stack protector" feature in gcc 4.1
-    # (Strictly speaking this isn't really a "warning" flag, so it's added to
-    #   the debugging flags)
-    #DEBUG_CFLAGS="$DEBUG_CFLAGS -Wstack-protector -fstack-protector-all"
-    ;;
-
-  gcc-4.6*)
-    # Replace -ansi flag with -std=c99 flag
-    H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-ansi/-std=c99/g'`"
-
-    # Disable warnings about using 'long long' type
-    H5_CFLAGS="$H5_CFLAGS -Wno-long-long"
-
-    # Append warning flags from gcc-3* case
-    # (don't use -Wpadded flag for normal builds, many of the warnings its
-    #   issuing can't be fixed and they are making it hard to detect other,
-    #   more important warnings)
-    #H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
-    H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute"
-
-    # Append warning flags from gcc-3.2* case
-    H5_CFLAGS="$H5_CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization"
-
-    # Enable more format checking flags, beyond the basic -Wformat included
-    # in -Wall
-    H5_CFLAGS="$H5_CFLAGS -Wformat=2"
-
-    # The "unreachable code" warning appears to be reliable now...
-    # (this warning was removed in gcc 4.5+)
-    #H5_CFLAGS="$H5_CFLAGS -Wunreachable-code"
-
-    # Append warning flags from gcc-3.3* case
-    H5_CFLAGS="$H5_CFLAGS -Wendif-labels"
-
-    # Append warning flags from gcc-3.4* case
-    H5_CFLAGS="$H5_CFLAGS -Wdeclaration-after-statement -Wold-style-definition -Winvalid-pch"
-
-    # Replace old -W flag with new -Wextra flag
-    H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-W\ /-Wextra\ /g'`"
-
-    # Append more extra warning flags that only gcc4.0+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wvariadic-macros -Wnonnull -Winit-self -Wmissing-include-dirs -Wswitch-default -Wswitch-enum -Wunused-macros"
-
-    # Append more extra warning flags that only gcc 4.1+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wunsafe-loop-optimizations -Wc++-compat"
-
-    # Append more extra warning flags that only gcc 4.2+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wstrict-overflow"
-
-    # Append more extra warning flags that only gcc 4.3+ know about
-    #
-    # Technically, variable-length arrays are part of the C99 standard, but
-    #   we should approach them a bit cautiously... -QAK
-    H5_CFLAGS="$H5_CFLAGS -Wlogical-op -Wlarger-than=2048 -Wvla"
-
-    # Append more extra warning flags that only gcc 4.4+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wsync-nand -Wframe-larger-than=16384 -Wpacked-bitfield-compat"
-
-    # Append more extra warning flags that only gcc 4.5+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wstrict-aliasing -Wstrict-overflow=5 -Wjump-misses-init -Wunsuffixed-float-constants"
-
-    # Append more extra warning flags that only gcc 4.6+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wdouble-promotion -Wsuggest-attribute=const -Wtrampolines"
-
-    # Try out the new "stack protector" feature in gcc 4.1
-    # (Strictly speaking this isn't really a "warning" flag, so it's added to
-    #   the debugging flags)
-    #DEBUG_CFLAGS="$DEBUG_CFLAGS -Wstack-protector -fstack-protector-all"
-    ;;
+    H5_CFLAGS="$H5_CFLAGS $arch"
 
-  gcc-4.5*)
-    # Replace -ansi flag with -std=c99 flag
-    H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-ansi/-std=c99/g'`"
+    ##############
+    # Production #
+    ##############
 
-    # Disable warnings about using 'long long' type
-    H5_CFLAGS="$H5_CFLAGS -Wno-long-long"
-
-    # Append warning flags from gcc-3* case
-    # (don't use -Wpadded flag for normal builds, many of the warnings its
-    #   issuing can't be fixed and they are making it hard to detect other,
-    #   more important warnings)
-    #H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
-    H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute"
-
-    # Append warning flags from gcc-3.2* case
-    H5_CFLAGS="$H5_CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization"
-
-    # Enable more format checking flags, beyond the basic -Wformat included
-    # in -Wall
-    H5_CFLAGS="$H5_CFLAGS -Wformat=2"
-
-    # The "unreachable code" warning appears to be reliable now...
-    # (this warning was removed in gcc 4.5+)
-    #H5_CFLAGS="$H5_CFLAGS -Wunreachable-code"
-
-    # Append warning flags from gcc-3.3* case
-    H5_CFLAGS="$H5_CFLAGS -Wendif-labels"
-
-    # Append warning flags from gcc-3.4* case
-    H5_CFLAGS="$H5_CFLAGS -Wdeclaration-after-statement -Wold-style-definition -Winvalid-pch"
-
-    # Replace old -W flag with new -Wextra flag
-    H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-W\ /-Wextra\ /g'`"
-
-    # Append more extra warning flags that only gcc4.0+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wvariadic-macros -Wnonnull -Winit-self -Wmissing-include-dirs -Wswitch-default -Wswitch-enum -Wunused-macros"
-
-    # Append more extra warning flags that only gcc 4.1+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wunsafe-loop-optimizations -Wc++-compat"
-
-    # Append more extra warning flags that only gcc 4.2+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wstrict-overflow"
-
-    # Append more extra warning flags that only gcc 4.3+ know about
-    #
-    # Technically, variable-length arrays are part of the C99 standard, but
-    #   we should approach them a bit cautiously... -QAK
-    H5_CFLAGS="$H5_CFLAGS -Wlogical-op -Wlarger-than=2048 -Wvla"
-
-    # Append more extra warning flags that only gcc 4.4+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wsync-nand -Wframe-larger-than=16384 -Wpacked-bitfield-compat"
-
-    # Append more extra warning flags that only gcc 4.5+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wstrict-aliasing -Wstrict-overflow=5 -Wjump-misses-init -Wunsuffixed-float-constants"
-
-    # Try out the new "stack protector" feature in gcc 4.1
-    # (Strictly speaking this isn't really a "warning" flag, so it's added to
-    #   the debugging flags)
-    #DEBUG_CFLAGS="$DEBUG_CFLAGS -Wstack-protector -fstack-protector-all"
-    ;;
-
-  gcc-4.4*)
-    # Replace -ansi flag with -std=c99 flag
-    H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-ansi/-std=c99/g'`"
-
-    # Disable warnings about using 'long long' type
-    H5_CFLAGS="$H5_CFLAGS -Wno-long-long"
-
-    # Append warning flags from gcc-3* case
-    # (don't use -Wpadded flag for normal builds, many of the warnings its
-    #   issuing can't be fixed and they are making it hard to detect other,
-    #   more important warnings)
-    #H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
-    H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute"
-
-    # Append warning flags from gcc-3.2* case
-    H5_CFLAGS="$H5_CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization"
-
-    # Enable more format checking flags, beyond the basic -Wformat included
-    # in -Wall
-    H5_CFLAGS="$H5_CFLAGS -Wformat=2"
-
-    # The "unreachable code" warning appears to be reliable now...
-    H5_CFLAGS="$H5_CFLAGS -Wunreachable-code"
-
-    # Append warning flags from gcc-3.3* case
-    H5_CFLAGS="$H5_CFLAGS -Wendif-labels"
-
-    # Append warning flags from gcc-3.4* case
-    H5_CFLAGS="$H5_CFLAGS -Wdeclaration-after-statement -Wold-style-definition -Winvalid-pch"
-
-    # Replace old -W flag with new -Wextra flag
-    H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-W\ /-Wextra\ /g'`"
-
-    # Append more extra warning flags that only gcc4.0+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wvariadic-macros -Wnonnull -Winit-self -Wmissing-include-dirs -Wswitch-default -Wswitch-enum -Wunused-macros"
-
-    # Append more extra warning flags that only gcc 4.1+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wunsafe-loop-optimizations -Wc++-compat"
-
-    # Append more extra warning flags that only gcc 4.2+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wstrict-overflow"
-
-    # Append more extra warning flags that only gcc 4.3+ know about
-    #
-    # Technically, variable-length arrays are part of the C99 standard, but
-    #   we should approach them a bit cautiously... -QAK
-    H5_CFLAGS="$H5_CFLAGS -Wlogical-op -Wlarger-than=2048 -Wvla"
-
-    # Append more extra warning flags that only gcc 4.4+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wsync-nand -Wframe-larger-than=16384 -Wpacked-bitfield-compat"
-
-    # Try out the new "stack protector" feature in gcc 4.1
-    # (Strictly speaking this isn't really a "warning" flag, so it's added to
-    #   the debugging flags)
-    #DEBUG_CFLAGS="$DEBUG_CFLAGS -Wstack-protector -fstack-protector-all"
-    ;;
-
-  gcc-4.3*)
-    # Replace -ansi flag with -std=c99 flag
-    H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-ansi/-std=c99/g'`"
-
-    # Disable warnings about using 'long long' type
-    H5_CFLAGS="$H5_CFLAGS -Wno-long-long"
-
-    # Append warning flags from gcc-3* case
-    # (don't use -Wpadded flag for normal builds, many of the warnings its
-    #   issuing can't be fixed and they are making it hard to detect other,
-    #   more important warnings)
-    #H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
-    H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute"
-
-    # Append warning flags from gcc-3.2* case
-    H5_CFLAGS="$H5_CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization"
-
-    # Enable more format checking flags, beyond the basic -Wformat included
-    # in -Wall
-    H5_CFLAGS="$H5_CFLAGS -Wformat=2"
-
-    # The "unreachable code" warning appears to be reliable now...
-    H5_CFLAGS="$H5_CFLAGS -Wunreachable-code"
-
-    # Append warning flags from gcc-3.3* case
-    H5_CFLAGS="$H5_CFLAGS -Wendif-labels"
-
-    # Append warning flags from gcc-3.4* case
-    H5_CFLAGS="$H5_CFLAGS -Wdeclaration-after-statement -Wold-style-definition -Winvalid-pch"
-
-    # Replace old -W flag with new -Wextra flag
-    H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-W\ /-Wextra\ /g'`"
-
-    # Append more extra warning flags that only gcc4.0+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wvariadic-macros -Wnonnull -Winit-self -Wmissing-include-dirs -Wswitch-default -Wswitch-enum -Wunused-macros"
-
-    # Append more extra warning flags that only gcc 4.1+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wunsafe-loop-optimizations -Wc++-compat -Wvolatile-register-var"
-
-    # Append more extra warning flags that only gcc 4.2+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wstrict-overflow"
-
-    # Append more extra warning flags that only gcc 4.3+ know about
-    #
-    # Technically, variable-length arrays are part of the C99 standard, but
-    #   we should approach them a bit cautiously... -QAK
-    H5_CFLAGS="$H5_CFLAGS -Wlogical-op -Wvla"
-
-    # Try out the new "stack protector" feature in gcc 4.1
-    # (Strictly speaking this isn't really a "warning" flag, so it's added to
-    #   the debugging flags)
-    #DEBUG_CFLAGS="$DEBUG_CFLAGS -Wstack-protector -fstack-protector-all"
-    ;;
-
-  gcc-4.2*)
-    # Replace -ansi flag with -std=c99 flag
-    H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-ansi/-std=c99/g'`"
-
-    # Disable warnings about using 'long long' type
-    H5_CFLAGS="$H5_CFLAGS -Wno-long-long"
-
-    # Append warning flags from gcc-3* case
-    # (don't use -Wpadded flag for normal builds, many of the warnings its
-    #   issuing can't be fixed and they are making it hard to detect other,
-    #   more important warnings)
-    #H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
-    H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute"
-
-    # Append warning flags from gcc-3.2* case
-    H5_CFLAGS="$H5_CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization"
-
-    # Enable more format checking flags, beyond the basic -Wformat included
-    # in -Wall
-    H5_CFLAGS="$H5_CFLAGS -Wformat=2"
-
-    # The "unreachable code" warning does not appear to be reliable yet...
-    H5_CFLAGS="$H5_CFLAGS -Wunreachable-code"
-
-    # Append warning flags from gcc-3.3* case
-    H5_CFLAGS="$H5_CFLAGS -Wendif-labels"
-
-    # Append warning flags from gcc-3.4* case
-    H5_CFLAGS="$H5_CFLAGS -Wdeclaration-after-statement -Wold-style-definition -Winvalid-pch"
-
-    # Replace old -W flag with new -Wextra flag
-    H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-W\ /-Wextra\ /g'`"
-
-    # Append more extra warning flags that only gcc 4.0+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wvariadic-macros -Wnonnull -Winit-self -Wmissing-include-dirs -Wswitch-default -Wswitch-enum -Wunused-macros"
-
-    # Append more extra warning flags that only gcc 4.1+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wunsafe-loop-optimizations -Wc++-compat -Wvolatile-register-var"
-
-    # Append more extra warning flags that only gcc 4.2+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wstrict-overflow"
-
-    # Try out the new "stack protector" feature in gcc 4.1
-    # (Strictly speaking this isn't really a "warning" flag, so it's added to
-    #   the debugging flags)
-    #DEBUG_CFLAGS="$DEBUG_CFLAGS -Wstack-protector -fstack-protector-all"
-    ;;
-
-  gcc-4.1.*)
-    # Replace -ansi flag with -std=c99 flag
-    H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-ansi/-std=c99/g'`"
-
-    # Disable warnings about using 'long long' type
-    H5_CFLAGS="$H5_CFLAGS -Wno-long-long"
-
-    # Append warning flags from gcc-3* case
-    # (don't use -Wpadded flag for normal builds, many of the warnings its
-    #   issuing can't be fixed and they are making it hard to detect other,
-    #   more important warnings)
-    #H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
-    H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute"
-
-    # Append warning flags from gcc-3.2* case
-    H5_CFLAGS="$H5_CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization"
-
-    # Enable more format checking flags, beyond the basic -Wformat included
-    # in -Wall
-    H5_CFLAGS="$H5_CFLAGS -Wformat=2"
-
-    # The "unreachable code" warning does not appear to be reliable yet...
-    H5_CFLAGS="$H5_CFLAGS -Wunreachable-code"
-
-    # Append warning flags from gcc-3.3* case
-    H5_CFLAGS="$H5_CFLAGS -Wendif-labels"
-
-    # Append warning flags from gcc-3.4* case
-    H5_CFLAGS="$H5_CFLAGS -Wdeclaration-after-statement -Wold-style-definition -Winvalid-pch"
-
-    # Replace old -W flag with new -Wextra flag
-    H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-W\ /-Wextra\ /g'`"
-
-    # Append more extra warning flags that only gcc 4.0+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wvariadic-macros -Wnonnull -Winit-self -Wmissing-include-dirs -Wswitch-default -Wswitch-enum -Wunused-macros"
-
-    # Append more extra warning flags that only gcc 4.1+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wunsafe-loop-optimizations -Wc++-compat -Wvolatile-register-var"
-
-    # Try out the new "stack protector" feature in gcc 4.1
-    # (Strictly speaking this isn't really a "warning" flag, so it's added to
-    #   the debugging flags)
-    #DEBUG_CFLAGS="$DEBUG_CFLAGS -Wstack-protector -fstack-protector-all"
-    ;;
-
-  gcc-4.0*)
-    # Replace -ansi flag with -std=c99 flag
-    H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-ansi/-std=c99/g'`"
-
-    # Disable warnings about using 'long long' type
-    H5_CFLAGS="$H5_CFLAGS -Wno-long-long"
-
-    # Append warning flags from gcc-3* case
-    # (don't use -Wpadded flag for normal builds, many of the warnings its
-    #   issuing can't be fixed and they are making it hard to detect other,
-    #   more important warnings)
-    #H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
-    H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute"
-
-    # Append warning flags from gcc-3.2* case
-    H5_CFLAGS="$H5_CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization"
-
-    # The "format=2" warning generates too many warnings about valid
-    # usage in the library.
-    #CFLAGS="$CFLAGS -Wformat=2"
-
-    # The "unreachable code" warning does not appear to be reliable yet...
-    #CFLAGS="$CFLAGS -Wunreachable-code"
-
-    # Append warning flags from gcc-3.3* case
-    H5_CFLAGS="$H5_CFLAGS -Wendif-labels"
+    # NDEBUG is handled explicitly by the configure script
+    if test $cc_vers_major -le 4; then
+        PROD_CFLAGS=
+    else
+        PROD_CFLAGS="-fstdarg-opt"
+    fi
 
-    # Append warning flags from gcc-3.4* case
-    H5_CFLAGS="$H5_CFLAGS -Wdeclaration-after-statement -Wold-style-definition -Winvalid-pch"
+    #########
+    # Debug #
+    #########
 
-    # Replace old -W flag with new -Wextra flag
-    H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-W\ /-Wextra\ /g'`"
+    # NDEBUG is handled explicitly by the configure script
+    # -g is handled by the symbols flags
+    if test $cc_vers_major -le 4; then
+        DEBUG_CFLAGS=
+    else
+        DEBUG_CFLAGS="-ftrapv -fno-common"
+    fi
 
-    # Append more extra warning flags that only gcc 4.0+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wvariadic-macros -Wnonnull -Winit-self -Wmissing-include-dirs -Wswitch-default -Wswitch-enum -Wunused-macros"
-    ;;
+    ########################
+    # Enhanced Diagnostics #
+    ########################
 
-  gcc-3.4*)
-    # Replace -ansi flag with -std=c99 flag
-    H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-ansi/-std=c99/g'`"
+    if test $cc_vers_major -ge 10; then
+        NO_DIAGS_CFLAGS="-fdiagnostics-urls=never -fno-diagnostics-color"
+    fi
+    DIAGS_CFLAGS=
 
-    # Disable warnings about using 'long long' type
-    H5_CFLAGS="$H5_CFLAGS -Wno-long-long"
+    ###########
+    # Symbols #
+    ###########
 
-    # Append warning flags from gcc-3* case
-    # (don't use -Wpadded flag for normal builds, many of the warnings its
-    #   issuing can't be fixed and they are making it hard to detect other,
-    #   more important warnings)
-    #H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
-    H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute"
+    NO_SYMBOLS_CFLAGS="-s"
+    SYMBOLS_CFLAGS="-g -fno-omit-frame-pointer"
 
-    # Append warning flags from gcc-3.2* case
-    H5_CFLAGS="$H5_CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization"
+    #############
+    # Profiling #
+    #############
 
-    # The "format=2" warning generates too many warnings about valid
-    # usage in the library.
-    #CFLAGS="$CFLAGS -Wformat=2"
+    PROFILE_CFLAGS="-pg"
 
-    # The "unreachable code" warning does not appear to be reliable yet...
-    #CFLAGS="$CFLAGS -Wunreachable-code"
+    ################
+    # Optimization #
+    ################
 
-    # Append warning flags from gcc-3.3* case
-    H5_CFLAGS="$H5_CFLAGS -Wendif-labels"
+    if test $cc_vers_major -le 4; then
+        HIGH_OPT_CFLAGS="-O3"
+        DEBUG_OPT_CFLAGS=
+    else
+        HIGH_OPT_CFLAGS="-O3"
+        DEBUG_OPT_CFLAGS="-Og"
+    fi
+    NO_OPT_CFLAGS="-O0"
 
-    # Append more extra warning flags that only gcc3.4+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wdeclaration-after-statement -Wold-style-definition -Winvalid-pch"
+    ############
+    # Warnings #
+    ############
 
-    # Replace old -W flag with new -Wextra flag
-    H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-W\ /-Wextra\ /g'`"
-    ;;
+    ###########
+    # General #
+    ###########
 
-  gcc-3.3*)
-    # Replace -ansi flag with -std=c99 flag
-    H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-ansi/-std=c99/g'`"
+    # Add various general warning flags in gnu-warnings for gcc versions 4.8 and later.
+    if test $cc_vers_major -eq 4 -a $cc_vers_minor -ge 8 -o $cc_vers_major -gt 4; then
+        H5_CFLAGS="$H5_CFLAGS $(load_gnu_arguments general)"
+        H5_ECFLAGS="$H5_ECFLAGS $(load_gnu_arguments error-general)"
 
-    # Disable warnings about using 'long long' type
-    H5_CFLAGS="$H5_CFLAGS -Wno-long-long"
+        ######################
+        # Developer warnings #
+        ######################
 
-    # Append warning flags from gcc-3* case
-    # (don't use -Wpadded flag for normal builds, many of the warnings its
-    #   issuing can't be fixed and they are making it hard to detect other,
-    #   more important warnings)
-    #H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
-    H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute"
+        NO_DEVELOPER_WARNING_CFLAGS=$(load_gnu_arguments no-developer-general)
+        DEVELOPER_WARNING_CFLAGS=$(load_gnu_arguments developer-general)
 
-    # Append warning flags from gcc-3.2* case
-    H5_CFLAGS="$H5_CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization"
+    fi
 
-    # The "format=2" warning generates too many warnings about valid
-    # usage in the library.
-    #CFLAGS="$CFLAGS -Wformat=2"
+    #######################
+    # gcc 4 special cases #
+    #######################
 
-    # The "unreachable code" warning does not appear to be reliable yet...
-    #CFLAGS="$CFLAGS -Wunreachable-code"
+    # GCC 4.8 through the end of GCC 4 series
+    if test $cc_vers_major -eq 4 -a $cc_vers_minor -ge 8; then
+        H5_CFLAGS="$H5_CFLAGS $(load_gnu_arguments 4.8-4.last)"
+    fi
 
-    # Append more extra warning flags that only gcc3.3+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wendif-labels"
-    ;;
+    #############################
+    # Version-specific warnings #
+    #############################
 
-  gcc-3.2*)
-    # Replace -ansi flag with -std=c99 flag
-    H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-ansi/-std=c99/g'`"
+    # gcc >= 4.8
+    if test $cc_vers_major -ge 5 -o $cc_vers_major -eq 4 -a $cc_vers_minor -ge 8; then
+        H5_CFLAGS="$H5_CFLAGS $(load_gnu_arguments 4.8)"
+        DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS $(load_gnu_arguments developer-4.8)"
+        NO_DEVELOPER_WARNING_CFLAGS="$NO_DEVELOPER_WARNING_CFLAGS $(load_gnu_arguments no-developer-4.8)"
+    fi
 
-    # Disable warnings about using 'long long' type
-    H5_CFLAGS="$H5_CFLAGS -Wno-long-long"
+    # gcc >= 4.9
+    if test $cc_vers_major -ge 5 -o $cc_vers_major -eq 4 -a $cc_vers_minor -ge 9; then
+        H5_CFLAGS="$H5_CFLAGS $(load_gnu_arguments 4.9)"
+    fi
 
-    # Append warning flags from gcc-3* case
-    # (don't use -Wpadded flag for normal builds, many of the warnings its
-    #   issuing can't be fixed and they are making it hard to detect other,
-    #   more important warnings)
-    #H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
-    H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute"
+    # gcc >= 5
+    if test $cc_vers_major -ge 5; then
+        H5_CFLAGS="$H5_CFLAGS $(load_gnu_arguments 5)"
+        H5_ECFLAGS="$H5_ECFLAGS $(load_gnu_arguments error-5)"
+    fi
 
-    # Append more extra warning flags that only gcc3.2+ know about
-    H5_CFLAGS="$H5_CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization"
+    # gcc >= 6
+    if test $cc_vers_major -ge 6; then
+        H5_CFLAGS="$H5_CFLAGS $(load_gnu_arguments 6)"
+    fi
 
-    # The "format=2" warning generates too many warnings about valid
-    # usage in the library.
-    #CFLAGS="$CFLAGS -Wformat=2"
+    # gcc >= 7
+    if test $cc_vers_major -ge 7; then
+        H5_CFLAGS="$H5_CFLAGS $(load_gnu_arguments 7)"
+        H5_ECFLAGS="$H5_ECFLAGS $(load_gnu_arguments error-7)"
+        DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS $(load_gnu_arguments developer-7)"
+    fi
 
-    # The "unreachable code" warning does not appear to be reliable yet...
-    #CFLAGS="$CFLAGS -Wunreachable-code"
-    ;;
+    # gcc 8
+    if test $cc_vers_major -ge 8; then
+        H5_CFLAGS="$H5_CFLAGS $(load_gnu_arguments 8)"
+        H5_ECFLAGS="$H5_ECFLAGS $(load_gnu_arguments error-8)"
+        DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS $(load_gnu_arguments developer-8)"
+        NO_DEVELOPER_WARNING_CFLAGS="$NO_DEVELOPER_WARNING_CFLAGS $(load_gnu_arguments no-developer-8)"
+    fi
 
-  gcc-3*)
-    # Replace -ansi flag with -std=c99 flag
-    H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-ansi/-std=c99/g'`"
+    # gcc 9
+    if test $cc_vers_major -ge 9; then
+        H5_CFLAGS="$H5_CFLAGS $(load_gnu_arguments 9)"
+    fi
 
-    # Disable warnings about using 'long long' type
-    H5_CFLAGS="$H5_CFLAGS -Wno-long-long"
+    # gcc >= 9.3
+    if test $cc_vers_major -ge 10 -o $cc_vers_major -eq 9 -a $cc_vers_minor -ge 3; then
+        H5_CFLAGS="$H5_CFLAGS $(load_gnu_arguments 9.3)"
+    fi
 
-    # Append some extra warning flags that only gcc3+ know about
-    # (don't use -Wpadded flag for normal builds, many of the warnings its
-    #   issuing can't be fixed and they are making it hard to detect other,
-    #   more important warnings)
-    #H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
-    H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute"
-    ;;
+    # gcc >= 10
+    if test $cc_vers_major -ge 10; then
+        DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS $(load_gnu_arguments developer-10)"
+    fi
 
-  gcc-2.9[56]*)
-    # Disable warnings about using 'long long' type
-    H5_CFLAGS="$H5_CFLAGS -Wno-long-long"
-    ;;
-esac
+    #################
+    # Flags are set #
+    #################
+    cc_flags_set=yes
+fi
 
 # Clear cc info if no flags set
 if test "X$cc_flags_set" = "X"; then
-  cc_vendor=
-  cc_version=
+    cc_vendor=
+    cc_version=
 fi
+
diff --git a/config/gnu-warnings/4.8 b/config/gnu-warnings/4.8
new file mode 100644
index 0000000..8a19289
--- /dev/null
+++ b/config/gnu-warnings/4.8
@@ -0,0 +1,22 @@
+# warning flags added for GCC >= 4.3
+-Wlarger-than=2560
+-Wlogical-op
+
+# warning flags added for GCC >= 4.4
+-Wframe-larger-than=16384
+-Wpacked-bitfield-compat
+-Wsync-nand
+
+# This warning can only be truly addressed using the gcc extension of
+# using D to indicate doubles (e.g., 1.23D).
+-Wno-unsuffixed-float-constants
+
+# warning flags added for GCC >= 4.6
+-Wdouble-promotion
+-Wtrampolines
+
+# warning flag added for GCC >= 4.7
+-Wstack-usage=8192
+
+# warning flag added for GCC >= 4.8
+-Wmaybe-uninitialized
diff --git a/config/gnu-warnings/4.8-4.last b/config/gnu-warnings/4.8-4.last
new file mode 100644
index 0000000..2db90fb
--- /dev/null
+++ b/config/gnu-warnings/4.8-4.last
@@ -0,0 +1,3 @@
+# -Wvla was later incorporated into -Wpedantic and
+# only needs to be specified explicitly for gcc 4
+-Wvla
diff --git a/config/gnu-warnings/4.9 b/config/gnu-warnings/4.9
new file mode 100644
index 0000000..78aa929
--- /dev/null
+++ b/config/gnu-warnings/4.9
@@ -0,0 +1 @@
+-Wdate-time
diff --git a/config/gnu-warnings/5 b/config/gnu-warnings/5
new file mode 100644
index 0000000..32cb196
--- /dev/null
+++ b/config/gnu-warnings/5
@@ -0,0 +1,2 @@
+-Warray-bounds=2
+-Wc99-c11-compat
diff --git a/config/gnu-warnings/6 b/config/gnu-warnings/6
new file mode 100644
index 0000000..736a446
--- /dev/null
+++ b/config/gnu-warnings/6
@@ -0,0 +1,9 @@
+#
+# Careful!  -Wduplicated-cond, combined with HDF5's heavy use of
+# macros, can make a lot of noise.
+#
+-Wduplicated-cond
+-Whsa
+-Wnormalized
+-Wnull-dereference
+-Wunused-const-variable
diff --git a/config/gnu-warnings/7 b/config/gnu-warnings/7
new file mode 100644
index 0000000..cb8834a
--- /dev/null
+++ b/config/gnu-warnings/7
@@ -0,0 +1,5 @@
+-Walloca
+-Walloc-zero
+-Wduplicated-branches
+-Wformat-overflow=2
+-Wformat-truncation=1
diff --git a/config/gnu-warnings/8 b/config/gnu-warnings/8
new file mode 100644
index 0000000..5e7519d
--- /dev/null
+++ b/config/gnu-warnings/8
@@ -0,0 +1,3 @@
+-Wattribute-alias
+-Wcast-align=strict
+-Wshift-overflow=2
diff --git a/config/gnu-warnings/9 b/config/gnu-warnings/9
new file mode 100644
index 0000000..c084350
--- /dev/null
+++ b/config/gnu-warnings/9
@@ -0,0 +1,2 @@
+-Wattribute-alias=2
+-Wmissing-profile
diff --git a/config/gnu-warnings/9.3 b/config/gnu-warnings/9.3
new file mode 100644
index 0000000..f37fdd6
--- /dev/null
+++ b/config/gnu-warnings/9.3
@@ -0,0 +1 @@
+-Wc11-c2x-compat
diff --git a/config/gnu-warnings/cxx-4.8 b/config/gnu-warnings/cxx-4.8
new file mode 100644
index 0000000..387c41e
--- /dev/null
+++ b/config/gnu-warnings/cxx-4.8
@@ -0,0 +1,19 @@
+# warning flags added for GCC >= 4.3
+-Wlarger-than=2560
+-Wlogical-op
+
+# warning flags added for GCC >= 4.4
+-Wframe-larger-than=16384
+-Wpacked-bitfield-compat
+-Wsync-nand
+
+# warning flags added for GCC >= 4.6
+-Wdouble-promotion
+-Wtrampolines
+
+# warning flag added for GCC >= 4.7
+-Wstack-usage=8192
+
+# warning flag added for GCC >= 4.8
+-Wmaybe-uninitialized
+
diff --git a/config/gnu-warnings/cxx-4.9 b/config/gnu-warnings/cxx-4.9
new file mode 100644
index 0000000..30553bd
--- /dev/null
+++ b/config/gnu-warnings/cxx-4.9
@@ -0,0 +1,2 @@
+-Wdate-time
+-Wopenmp-simd
diff --git a/config/gnu-warnings/cxx-5 b/config/gnu-warnings/cxx-5
new file mode 100644
index 0000000..723e448
--- /dev/null
+++ b/config/gnu-warnings/cxx-5
@@ -0,0 +1 @@
+-Warray-bounds=2
diff --git a/config/gnu-warnings/cxx-9 b/config/gnu-warnings/cxx-9
new file mode 100644
index 0000000..8f843a4
--- /dev/null
+++ b/config/gnu-warnings/cxx-9
@@ -0,0 +1,4 @@
+-Wattribute-alias=2
+-Wmissing-profile
+# Turn this on when the C++ wrappers obey the Rule of Five
+-Wno-deprecated-copy
diff --git a/config/gnu-warnings/cxx-developer-4.8 b/config/gnu-warnings/cxx-developer-4.8
new file mode 100644
index 0000000..f5fbdad
--- /dev/null
+++ b/config/gnu-warnings/cxx-developer-4.8
@@ -0,0 +1,21 @@
+# developer warning flag added for GCC >= 4.5
+#
+# strict-overflow level 5 catches a LOT of false positives, but is useful
+# for detecting overflow conditions.
+#
+-Wstrict-overflow=5
+
+# developer warning flag added for GCC >= 4.6
+-Wsuggest-attribute=const
+
+# developer warning flags added for GCC >= 4.7
+-Wsuggest-attribute=noreturn
+-Wsuggest-attribute=pure
+#
+# It's not clear that -Wvector-operation-performance warnings are
+# actionable, so they are demoted to "developer" warnings.
+#
+-Wvector-operation-performance
+
+# developer warning flag added for GCC >= 4.8
+-Wsuggest-attribute=format
diff --git a/config/gnu-warnings/cxx-error-5 b/config/gnu-warnings/cxx-error-5
new file mode 100644
index 0000000..8cc8c9d
--- /dev/null
+++ b/config/gnu-warnings/cxx-error-5
@@ -0,0 +1,11 @@
+#
+# In GCC 4.4.7, the compiler gripes about shadowed global
+# declarations when a local variable uses the name of a
+# function that's in a system header file.  For some reason,
+# later versions of GCC (e.g., 5.2.0) don't complain about
+# the shadowed globals.  Maybe later versions are less fussy?
+# Anyway, the shadowing seems to be harmless, and GCC 4.4.7
+# is not a supported compiler, so let us promote shadowed globals
+# warnings to errors only for GCC 5 and later.
+#
+-Werror=shadow
diff --git a/config/gnu-warnings/cxx-error-general b/config/gnu-warnings/cxx-error-general
new file mode 100644
index 0000000..85cd9a3
--- /dev/null
+++ b/config/gnu-warnings/cxx-error-general
@@ -0,0 +1,32 @@
+#
+# HDF5 code should not trigger the following warnings under any
+# circumstances, so ask the compiler to treat them as errors:
+#
+# NOTE: c++/test files are not compatible with these warnings as errors
+#     c++/test/tcompound.cpp
+#       -Werror=cast-align
+-Wcast-align
+# NOTE: c++/src files are not compatible with these warnings as errors
+#     c++/src/H5Object.cpp
+#       -Werror=missing-declarations
+-Wmissing-declarations
+-Werror=packed
+-Werror=redundant-decls
+-Werror=switch
+# NOTE: c++/test files are not compatible with these warnings as errors
+#     c++/test/tattr.cpp
+#       -Werror=unused-but-set-variable
+-Wunused-but-set-variable
+-Werror=unused-function
+-Werror=unused-variable
+# NOTE: c++/src files are not compatible with these warnings as errors
+#     c++/src/H5Object.cpp,c++/src/H5StrType.cpp,c++/src/H5PredType.cpp
+#       -Werror=unused-parameter
+-Wunused-parameter
+#
+# Other files not compatible
+# NOTE: c++/test files are not compatible with these warnings as errors
+#     c++/test/titerate.cpp,c++/test/tarray.cpp
+#       -Werror=missing-declarations
+#     c++/test/titerate.cpp,c++/test/tarray.cpp,c++/test/tlinks.cpp,c++/test/ttypes.cpp,c++/test/dsets.cpp
+#       -Werror=unused-parameter
diff --git a/config/gnu-warnings/cxx-general b/config/gnu-warnings/cxx-general
new file mode 100644
index 0000000..1626524
--- /dev/null
+++ b/config/gnu-warnings/cxx-general
@@ -0,0 +1,30 @@
+# Note that some of the flags listed here really should be developer
+# flags (listed in separate files, gnu-warnings-developer*) but we put
+# them here because they are not raised by the current code and we'd like to
+# know if they do start showing up.
+#
+# NOTE: Don't add -Wpadded here since we can't/won't fix the (many)
+# warnings that are emitted. If you need it, add it from the
+# environment variable at configure time.
+-Wall
+-Wcast-qual
+-Wconversion
+-Wctor-dtor-privacy
+-Weffc++
+-Wextra
+-Wfloat-equal
+-Wformat=2
+-Winit-self
+-Winvalid-pch
+-Wmissing-include-dirs
+-Wnon-virtual-dtor
+-Wold-style-cast
+-Woverloaded-virtual
+-Wreorder
+-Wshadow
+-Wsign-promo
+##-Wunreachable-code
+-Wundef
+##-Wvariadic-macros
+-Wwrite-strings
+-pedantic
diff --git a/config/gnu-warnings/developer-10 b/config/gnu-warnings/developer-10
new file mode 100644
index 0000000..022c97f
--- /dev/null
+++ b/config/gnu-warnings/developer-10
@@ -0,0 +1,2 @@
+# New warning
+-Warith-conversion
diff --git a/config/gnu-warnings/developer-12 b/config/gnu-warnings/developer-12
new file mode 100644
index 0000000..0835d96
--- /dev/null
+++ b/config/gnu-warnings/developer-12
@@ -0,0 +1,4 @@
+# Enable GCC's static analyzer for GCC 12+
+# (Temporarily disabled as the analyzer currently adds significant
+# compile time overhead for a few test files like cache.c)
+# -fanalyzer
diff --git a/config/gnu-warnings/developer-4.8 b/config/gnu-warnings/developer-4.8
new file mode 100644
index 0000000..be7720c
--- /dev/null
+++ b/config/gnu-warnings/developer-4.8
@@ -0,0 +1,29 @@
+# developer warning flags added for GCC >= 4.5
+#
+# -Wjump-misses-init makes lots of noise for a questionable benefit.
+# Can jumping over an initialization in C cause any harm, if
+# the variable is never *used* before it has been initialized?
+#
+-Wjump-misses-init
+
+# developer warning flag added for GCC >= 4.5
+#
+# strict-overflow level 5 catches a LOT of false positives, but is useful
+# for detecting overflow conditions.
+#
+-Wstrict-overflow=5
+
+# developer warning flag added for GCC >= 4.6
+-Wsuggest-attribute=const
+
+# developer warning flags added for GCC >= 4.7
+-Wsuggest-attribute=noreturn
+-Wsuggest-attribute=pure
+#
+# It's not clear that -Wvector-operation-performance warnings are
+# actionable, so they are demoted to "developer" warnings.
+#
+-Wvector-operation-performance
+
+# developer warning flag added for GCC >= 4.8
+-Wsuggest-attribute=format
diff --git a/config/gnu-warnings/developer-7 b/config/gnu-warnings/developer-7
new file mode 100644
index 0000000..2a3ce7e
--- /dev/null
+++ b/config/gnu-warnings/developer-7
@@ -0,0 +1 @@
+-Wstringop-overflow=2
diff --git a/config/gnu-warnings/developer-8 b/config/gnu-warnings/developer-8
new file mode 100644
index 0000000..a2ba7ca
--- /dev/null
+++ b/config/gnu-warnings/developer-8
@@ -0,0 +1,3 @@
+-Wstringop-overflow=4
+-Wsuggest-attribute=cold
+-Wsuggest-attribute=malloc
diff --git a/config/gnu-warnings/developer-general b/config/gnu-warnings/developer-general
new file mode 100644
index 0000000..460b874
--- /dev/null
+++ b/config/gnu-warnings/developer-general
@@ -0,0 +1,10 @@
+# (suggestions from gcc, not code problems)
+-Waggregate-return
+-Wdisabled-optimization
+-Winline
+-Wmissing-format-attribute
+-Wmissing-noreturn
+-Wswitch-default
+-Wswitch-enum
+-Wunsafe-loop-optimizations
+-Wunused-macros
diff --git a/config/gnu-warnings/error-5 b/config/gnu-warnings/error-5
new file mode 100644
index 0000000..282ee3f
--- /dev/null
+++ b/config/gnu-warnings/error-5
@@ -0,0 +1,13 @@
+-Werror=incompatible-pointer-types
+-Werror=int-conversion
+#
+# In GCC 4.4.7, the compiler gripes about shadowed global
+# declarations when a local variable uses the name of a
+# function that's in a system header file.  For some reason,
+# later versions of GCC (e.g., 5.2.0) don't complain about
+# the shadowed globals.  Maybe later versions are less fussy?
+# Anyway, the shadowing seems to be harmless, and GCC 4.4.7
+# is not a supported compiler, so let us promote shadowed globals
+# warnings to errors only for GCC 5 and later.
+#
+-Werror=shadow
diff --git a/config/gnu-warnings/error-7 b/config/gnu-warnings/error-7
new file mode 100644
index 0000000..8eb9fe4
--- /dev/null
+++ b/config/gnu-warnings/error-7
@@ -0,0 +1 @@
+-Werror=restrict
diff --git a/config/gnu-warnings/error-8 b/config/gnu-warnings/error-8
new file mode 100644
index 0000000..36c1414
--- /dev/null
+++ b/config/gnu-warnings/error-8
@@ -0,0 +1,9 @@
+-Werror=cast-function-type
+#
+# For GCC 8, promote maybe-initialized warnings to an error.  GCC 8
+# reports 0 maybe-uninitialized warnings where earlier versions
+# make many false reports.  GCC 8 seems to analyze calls to static
+# in order to detect initializations that occur there.  It's possible
+# that GCC 8 only performs that analysis at -O3, though.
+#
+-Werror=maybe-uninitialized
diff --git a/config/gnu-warnings/error-general b/config/gnu-warnings/error-general
new file mode 100644
index 0000000..73d1dd5
--- /dev/null
+++ b/config/gnu-warnings/error-general
@@ -0,0 +1,63 @@
+#
+# HDF5 code should not trigger the following warnings under any
+# circumstances, so ask the compiler to treat them as errors:
+#
+-Werror=bad-function-cast
+-Werror=cast-align
+-Werror=format
+-Werror=implicit-function-declaration
+-Werror=int-to-pointer-cast
+-Werror=missing-declarations
+-Werror=missing-prototypes
+-Werror=nested-externs
+-Werror=old-style-definition
+-Werror=packed
+-Werror=pointer-sign
+-Werror=pointer-to-int-cast
+-Werror=redundant-decls
+-Werror=strict-prototypes
+-Werror=switch
+-Werror=unused-but-set-variable
+-Werror=unused-variable
+#
+#-Werror=discarded-qualifiers
+#
+#
+# NOTE: File Driver files are not compatible with these warnings as errors
+#     H5FDdirect.c,H5FDmpio.c,H5FDros3.c,
+#       -Werror=unused-function
+#
+-Wunused-function
+#
+#     H5VLpassthru.c
+#       -Werror=unused-parameter
+#
+-Wunused-parameter
+#
+#Examples and tests do not use the same set of extensive warning flags as libraries
+# Here is a list of tests and examples that have issues with the stricter warnings as error
+#
+# NOTE: Test files are not compatible with these warnings as errors
+#     thread_id.c,
+#       -Werror=unused-function
+#     dsets.c
+#       -Werror=unused-parameter
+#     external.c,perform/sio_engine.c
+#       -Werror=format(-truncation)
+#
+#
+# NOTE: Examples files are not compatible with these warnings as errors
+#     h5_vds-eiger.c,h5_vds-exclim.c,h5_vds.c,h5_vds-exc.c,h5_vds-percival-unlim-maxmin.c
+#     h5_vds-percival.c,h5_read.c,h5_rdwt.c,h5_mount.c,h5_extend.c,h5_extend_write.c
+#     h5_write.c,h5_vds-simpleIO.c,h5_ref2reg_deprec.c,h5_crtgrp.c,h5_select.c
+#     h5_vds-percival-unlim.c,h5_crtatt.c,h5_group.c,h5_attribute.c,h5_crtdat.c
+#     h5_reference_deprec.c
+#     h5_rdwt.c,h5_crtgrp.c,h5_crtatt.c,h5_crtdat.c
+#       -Werror=strict-prototypes
+#     h5_rdwt.c,h5_crtgrp.c,h5_crtatt.c,h5_crtdat.c
+#       -Werror=old-style-definition
+#     h5_vds-exclim.c,h5_vds.c,h5_vds-exc.c,
+#       -Werror=unused-variable
+#     h5_elink_unix2win.c,h5_extlink.c,h5_attribute.c
+#       -Werror=unused-parameter
+
diff --git a/config/gnu-warnings/general b/config/gnu-warnings/general
new file mode 100644
index 0000000..df4c613
--- /dev/null
+++ b/config/gnu-warnings/general
@@ -0,0 +1,26 @@
+# Note that some of the flags listed here really should be developer
+# flags (listed in separate files, gnu-warnings-developer*) but we put
+# them here because they are not raised by the current code and we'd like to
+# know if they do start showing up.
+#
+# NOTE: Don't add -Wpadded here since we can't/won't fix the (many)
+# warnings that are emitted. If you need it, add it from the
+# environment variable at configure time.
+-Wall
+-Wcast-qual
+-Wconversion
+-Wextra
+-Wfloat-equal
+-Wformat=2
+-Winit-self
+-Winvalid-pch
+-Wmissing-include-dirs
+-Wshadow
+-Wundef
+-Wwrite-strings
+-pedantic
+# NOTE: Due to the divergence in the C and C++, we're dropping support for
+# compiling the C library with a C++ compiler and dropping the -Wc++-compat
+# warning.
+#
+-Wno-c++-compat
diff --git a/config/gnu-warnings/gfort-4.8 b/config/gnu-warnings/gfort-4.8
new file mode 100644
index 0000000..f986072
--- /dev/null
+++ b/config/gnu-warnings/gfort-4.8
@@ -0,0 +1,16 @@
+# warning flags added for gfortran >= 4.4
+-Wintrinsics-std
+
+# warning flag added for gfortran >= 4.5
+-Wimplicit-procedure
+
+# warning flags added for gfortran >= 4.7
+-Wreal-q-constant
+-Wfunction-elimination
+
+# warning flags added for gfortran >= 4.8
+-Wrealloc-lhs
+-Wrealloc-lhs-all
+# Turn off warnings for passing non-ANSI types to BIND().
+# We pass a lot of hid_t, etc. types so this generates a LOT of spurious warnings.
+-Wno-c-binding-type
diff --git a/config/gnu-warnings/gfort-6 b/config/gnu-warnings/gfort-6
new file mode 100644
index 0000000..f70466c
--- /dev/null
+++ b/config/gnu-warnings/gfort-6
@@ -0,0 +1 @@
+-Winteger-division
diff --git a/config/gnu-warnings/gfort-8 b/config/gnu-warnings/gfort-8
new file mode 100644
index 0000000..5097365
--- /dev/null
+++ b/config/gnu-warnings/gfort-8
@@ -0,0 +1 @@
+-Wfrontend-loop-interchange
diff --git a/config/gnu-warnings/gfort-developer-4.8 b/config/gnu-warnings/gfort-developer-4.8
new file mode 100644
index 0000000..20effdc
--- /dev/null
+++ b/config/gnu-warnings/gfort-developer-4.8
@@ -0,0 +1,3 @@
+# warning flags added for gfortran >= 4.4
+-Warray-temporaries
+
diff --git a/config/gnu-warnings/gfort-developer-5 b/config/gnu-warnings/gfort-developer-5
new file mode 100644
index 0000000..c5d3850
--- /dev/null
+++ b/config/gnu-warnings/gfort-developer-5
@@ -0,0 +1 @@
+-Wuse-without-only
diff --git a/config/gnu-warnings/gfort-developer-general b/config/gnu-warnings/gfort-developer-general
new file mode 100644
index 0000000..dde15fe
--- /dev/null
+++ b/config/gnu-warnings/gfort-developer-general
@@ -0,0 +1,3 @@
+# There is no easy way in Fortran to indicate parameters are intentionally
+# unused and many callbacks will have these, generating a lot of noise.
+-Wunused-dummy-argument
diff --git a/config/gnu-warnings/gfort-general b/config/gnu-warnings/gfort-general
new file mode 100644
index 0000000..4028316
--- /dev/null
+++ b/config/gnu-warnings/gfort-general
@@ -0,0 +1,12 @@
+# Note that some of the flags listed here really should be developer
+# flags (listed in separate files, gnu-warnings-developer*) but we put
+# them here because they are not raised by the current code and we'd like to
+# know if they do start showing up.
+-Waliasing
+-Wall
+-Wcharacter-truncation
+-Wextra
+-Wimplicit-interface
+-Wsurprising
+-Wunderflow
+-pedantic
diff --git a/config/gnu-warnings/gfort-no-developer-4.8 b/config/gnu-warnings/gfort-no-developer-4.8
new file mode 100644
index 0000000..82274ef
--- /dev/null
+++ b/config/gnu-warnings/gfort-no-developer-4.8
@@ -0,0 +1,3 @@
+# warning flags added for gfortran >= 4.4
+-Wno-array-temporaries
+
diff --git a/config/gnu-warnings/gfort-no-developer-general b/config/gnu-warnings/gfort-no-developer-general
new file mode 100644
index 0000000..bfcba22
--- /dev/null
+++ b/config/gnu-warnings/gfort-no-developer-general
@@ -0,0 +1,3 @@
+# There is no easy way in Fortran to indicate parameters are intentionally
+# unused and many callbacks will have these, generating a lot of noise.
+-Wno-unused-dummy-argument
diff --git a/config/gnu-warnings/no-cxx-developer-4.8 b/config/gnu-warnings/no-cxx-developer-4.8
new file mode 100644
index 0000000..d4d00e3
--- /dev/null
+++ b/config/gnu-warnings/no-cxx-developer-4.8
@@ -0,0 +1,12 @@
+# no-developer warning flag added for GCC >= 4.5
+-Wstrict-overflow=2
+
+# no-developer warning flag added for GCC >= 4.6
+-Wno-suggest-attribute=const
+
+# no-developer warning flags added for GCC >= 4.7
+-Wno-suggest-attribute=noreturn
+-Wno-suggest-attribute=pure
+
+# no-developer warning flag added for GCC >= 4.8
+-Wno-suggest-attribute=format
diff --git a/config/gnu-warnings/no-developer-4.8 b/config/gnu-warnings/no-developer-4.8
new file mode 100644
index 0000000..412b907
--- /dev/null
+++ b/config/gnu-warnings/no-developer-4.8
@@ -0,0 +1,13 @@
+# no-developer warning flags added for GCC >= 4.5
+-Wno-jump-misses-init
+-Wstrict-overflow=2
+
+# no-developer warning flag added for GCC >= 4.6
+-Wno-suggest-attribute=const
+
+# no-developer warning flags added for GCC >= 4.7
+-Wno-suggest-attribute=noreturn
+-Wno-suggest-attribute=pure
+
+# no-developer warning flag added for GCC >= 4.8
+-Wno-suggest-attribute=format
diff --git a/config/gnu-warnings/no-developer-8 b/config/gnu-warnings/no-developer-8
new file mode 100644
index 0000000..2134bad
--- /dev/null
+++ b/config/gnu-warnings/no-developer-8
@@ -0,0 +1,2 @@
+-Wno-suggest-attribute=cold
+-Wno-suggest-attribute=malloc
diff --git a/config/gnu-warnings/no-developer-general b/config/gnu-warnings/no-developer-general
new file mode 100644
index 0000000..18831dd
--- /dev/null
+++ b/config/gnu-warnings/no-developer-general
@@ -0,0 +1,8 @@
+-Wno-aggregate-return
+-Wno-inline
+-Wno-missing-format-attribute
+-Wno-missing-noreturn
+# NOTE: -pedantic includes -Woverlength-strings which triggers a warning
+# regarding the library settings string (H5libhdf5_settings). We'll turn
+# it off here but leave it on in the developer flags.
+-Wno-overlength-strings
diff --git a/config/i386-pc-cygwin32 b/config/i386-pc-cygwin32
deleted file mode 100644
index 93a8d29..0000000
--- a/config/i386-pc-cygwin32
+++ /dev/null
@@ -1,31 +0,0 @@
-#							-*- shell-script -*-
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-
-
-# This file is part of the HDF5 build script.  It is processed shortly
-# after configure starts and defines, among other things, flags for
-# the various compile modes.
-#
-# See BlankForm in this directory for details.
-
-# The default compiler is `gcc'.
-if test "X-" =  "X-$CC"; then
-  CC=gcc
-  CC_BASENAME=gcc
-  LD=ld
-fi
-
-# Figure out compiler flags
-. $srcdir/config/gnu-flags
diff --git a/config/i686-pc-cygwin b/config/i686-pc-cygwin
deleted file mode 100644
index 9b1ab74..0000000
--- a/config/i686-pc-cygwin
+++ /dev/null
@@ -1,121 +0,0 @@
-#              -*- shell-script -*-
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-
-
-# This file is part of the HDF5 build script.  It is processed shortly
-# after configure starts and defines, among other things, flags for
-# the various compile modes.
-#
-# See BlankForm in this directory for details.
-
-# The default compiler is `gcc'.
-if test -z "$CC"; then
-   CC=gcc
-   CC_BASENAME=gcc
-fi
-
-# Figure out GNU C compiler flags
-. $srcdir/config/gnu-flags
-
-# Figure out PGI C compiler flags
-. $srcdir/config/pgi-flags
-
-# Figure out Intel C compiler flags
-. $srcdir/config/intel-flags
-
-# The default Fortran 90 compiler
-if test "X-" = "X-$FC"; then
-    case $CC_BASENAME in
-        gcc*)
-            FC=gfortran
-            FCLIBS=-lgcc
-            FC_BASENAME=gfortran
-            ;;
-        pgcc*)
-            FC=pgf90
-            FC_BASENAME=pgf90
-            ;;
-        icc*)
-            FC=ifort
-            FC_BASENAME=ifort
-            ;;
-        mpicc*)
-            FC=mpif90
-            FC_BASENAME=mpif90
-            ;;
-    esac
-else
-    case $FC in
-        # The PGI and Intel compilers are automatically detected below
-        ifc*|ifort*|pgf90*)
-            ;;
-        gfortran)
-            FCLIBS=-lgcc
-            ;;
-        g95)
-            FCLIBS=-lgcc
-            ;;
-        *)
-            # Figure out which compiler we are using: pgf90 or Absoft f95
-            RM='rm -f'
-            tmpfile=/tmp/cmpver.$$
-            $FC -V >$tmpfile
-            if test -s "$tmpfile"; then 
-                if( grep -s 'Absoft' $tmpfile > /dev/null) then
-                    FC_BASENAME=f95
-                fi 
-                if( grep -s 'pgf90' $tmpfile > /dev/null) then
-                    FC_BASENAME=pgf90
-                fi 
-            fi
-            $RM $tmpfile
-            ;;
-    esac
-fi
-
-# Figure out PGI F90 compiler flags
-. $srcdir/config/pgi-fflags
-
-# Figure out Intel F90 compiler flags
-. $srcdir/config/intel-fflags
-
-case $FC_BASENAME in
-    #
-    # Absoft compiler
-    #
-    f95)
-        # Set required flag for compiling C stubs
-        H5_CFLAGS="$H5_CFLAGS -DH5_ABSOFT" 
-
-        F9XSUFFIXFLAG=""
-# We force compiler to use upper case for external names 
-# (just in case since this should be a default EIP)
-        H5_FCFLAGS="$H5_FCFLAGS -YEXT_NAMES=UCS"
-        FSEARCH_DIRS=""
-        DEBUG_FCFLAGS="-g"
-        PROD_FCFLAGS="-O"
-        PROFILE_FCFLAGS="-g -pg"
-        f9x_flags_set=yes
-        ;;
-
-esac  
-
-# The default C++ compiler
-
-# The default compiler is `g++'.
-if test -z "$CXX"; then
-  CXX=g++
-  CXX_BASENAME=g++
-fi
diff --git a/config/ibm-aix b/config/ibm-aix
index 28498e2..b2f5d05 100644
--- a/config/ibm-aix
+++ b/config/ibm-aix
@@ -1,17 +1,14 @@
 #							-*- shell-script -*-
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 
 # Configuration file for building on the IBM AIX platforms.
 # This file is part of the HDF5 build script.  It is processed shortly
@@ -49,19 +46,35 @@ if test "X-" = "X-$FC"; then
   fi
 fi
 
-# While we try to avoid setting FCFLAGS directly for use in compilation, in 
-# this case we need the -k flag present for some configure checks. As such, 
-# the configure script saves the user's set FCFLAGS before running, and 
-# restores them when complete. We must then set up both FCFLAGS and H5_FCFLAGS 
+# While we try to avoid setting FCFLAGS directly for use in compilation, in
+# this case we need the -k flag present for some configure checks. As such,
+# the configure script saves the user's set FCFLAGS before running, and
+# restores them when complete. We must then set up both FCFLAGS and H5_FCFLAGS
 # to ensure the flag is present for both configure as well as for the build.
 if test "X-" = "X-$f9x_flags_set"; then
   F9XSUFFIXFLAG="-qsuffix=f=f90"
   FCFLAGS="$FCFLAGS ${F9XSUFFIXFLAG}"
   H5_FCFLAGS="$H5_FCFLAGS ${F9XSUFFIXFLAG}"
   FSEARCH_DIRS="-I./ -I../src"
-  DEBUG_FCFLAGS="-g"
-  PROD_FCFLAGS="-O"
-  PROFILE_FCFLAGS="-g -pg"
+
+  # Production
+  PROD_FCFLAGS=
+
+  # Debug
+  DEBUG_FCFLAGS=
+
+  # Symbols
+  SYMBOLS_FCFLAGS="-g"
+  NO_SYMBOLS_FCFLAGS=
+
+  # Profiling
+  PROFILE_FCFLAGS="-pg"
+
+  # Optimization
+  HIGH_OPT_FCFLAGS="-O"
+  DEBUG_OPT_FCFLAGS=
+  NO_OPT_FCFLAGS=
+
   f9x_flags_set=yes
 fi
 
@@ -91,13 +104,30 @@ case $CC_BASENAME in
     ;;
 
   *)
+    # Undetermined compiler
+    # Use very generic flags
     H5_CFLAGS="$H5_CFLAGS -ansi"
-    DEBUG_CFLAGS="-g"
-    DEBUG_CPPFLAGS=
-    PROD_CFLAGS="-O"
-    PROD_CPPFLAGS=
+
+    # Production
+    PROD_CFLAGS=
+
+    # Debug
+    DEBUG_CFLAGS=
+
+    # Symbols
+    SYMBOLS_CFLAGS="-g"
+    NO_SYMBOLS_CFLAGS=
+
+    # Profiling
     PROFILE_CFLAGS="-pg"
-    PROFILE_CPPFLAGS=
+
+    # Optimization
+    HIGH_OPT_CFLAGS="-O"
+    DEBUG_OPT_CFLAGS=
+    NO_OPT_CFLAGS=
+
+    # Flags are set
+    cc_flags_set=yes
     ;;
 esac
 
@@ -118,8 +148,6 @@ ac_cv_sizeof_char=${ac_cv_sizeof_char=1}
 ac_cv_sizeof_short=${ac_cv_sizeof_short=2}
 ac_cv_sizeof_int=${ac_cv_sizeof_int=4}
 ac_cv_sizeof_long_long=${ac_cv_sizeof_long_long=8}
-# Do not cache __int64 since it is not a standard C type and some compilers
-# (e.g., gcc) does not support it.
 ac_cv_sizeof_float=${ac_cv_sizeof_float=4}
 ac_cv_sizeof_double=${ac_cv_sizeof_double=8}
 ac_cv_sizeof_long_double=${ac_cv_sizeof_long_double=8}
diff --git a/config/ibm-flags b/config/ibm-flags
index a1dfa2a..37ecd20 100644
--- a/config/ibm-flags
+++ b/config/ibm-flags
@@ -1,17 +1,14 @@
 #							-*- shell-script -*-
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 
 
 # This file should be sourced into configure if the compiler is the
@@ -55,16 +52,35 @@ if test "XL" = "$cc_vendor"; then
 
     # Turn off shared lib option.  It causes some test suite to fail.
     enable_shared="${enable_shared:-no}"
+    
     # Make sure this is applied to other API compile options such as C++.
     AM_CFLAGS="$AM_CFLAGS"
-    H5_CFLAGS="-qlanglvl=stdc99 $H5_CFLAGS"
-    DEBUG_CFLAGS="-g -qfullpath"
-    DEBUG_CPPFLAGS=
+
+    # -qflag=w:w makes the lowest level of reported compile issues to be "warning"
+    # instead of "information". This suppresses a very large number of messages
+    # concerning the portability of __inline__.
+    H5_CFLAGS="-qlanglvl=stdc99 -qflag=w:w $H5_CFLAGS"
+
+    # Production
+    PROD_CFLAGS=
+
+    # Debug
+    # NDEBUG is handled explicitly in configure
+    DEBUG_CFLAGS="-qfullpath"
+
+    # Symbols
+    SYMBOLS_CFLAGS="-g"
+    NO_SYMBOLS_CFLAGS=
+
+    # Profiling
+    PROFILE_CFLAGS="-pg"
+
+    # Optimization
     # -O causes test/dtypes to fail badly. Turn it off for now.
-    PROD_CFLAGS=""
-    PROD_CPPFLAGS=
-    PROFILE_CFLAGS="-g -qfullpath -pg"
-    PROFILE_CPPFLAGS=
+    HIGH_OPT_CFLAGS=
+    DEBUG_OPT_CFLAGS=
+    NO_OPT_CFLAGS=
+
     # Flags are set
     cc_flags_set=yes
 fi
@@ -103,3 +119,4 @@ if test X != X$CXX; then
 
     fi
 fi
+
diff --git a/config/intel-cxxflags b/config/intel-cxxflags
new file mode 100644
index 0000000..107b087
--- /dev/null
+++ b/config/intel-cxxflags
@@ -0,0 +1,185 @@
+#                            -*- shell-script -*-
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+
+
+# This file should be sourced into configure if the compiler is the
+# Intel icpc compiler or a derivative.  It is careful not to do anything
+# if the compiler is not Intel; otherwise `cxx_flags_set' is set to `yes'
+#
+
+#
+# Prepend `$srcdir/config/intel-warnings/` to the filename suffix(es) given as
+# subroutine argument(s), remove comments starting with # and ending
+# at EOL, replace spans of whitespace (including newlines) with spaces,
+# and re-emit the file(s) thus filtered on the standard output stream.
+#
+load_intel_arguments()
+{
+    set -- $(for arg; do
+        sed 's,#.*$,,' $srcdir/config/intel-warnings/${arg}
+    done)
+    IFS=' ' echo "$*"
+}
+
+# Get the compiler version in a way that works for icpc
+# icpc unless a compiler version is already known
+#
+#   cxx_vendor:    The compiler name: icpc
+#   cxx_version:   Version number: 8.0
+#
+if test X = "X$cxx_flags_set"; then
+    cxx_version="`$CXX $CXXFLAGS $H5_CXXFLAGS -V 2>&1 |grep 'Version'`"
+    if test X != "X$cxx_version"; then
+        cxx_vendor=icpc
+        cxx_version=`echo $cxx_version |sed 's/.*Version \([-a-z0-9\.\-]*\).*/\1/'`
+        echo "compiler '$CXX' is Intel $cxx_vendor-$cxx_version"
+
+        # Some version numbers
+        # Intel version numbers are of the form: "major.minor"
+        cxx_vers_major=`echo $cxx_version | cut -f1 -d.`
+        cxx_vers_minor=`echo $cxx_version | cut -f2 -d.`
+        #cxx_vers_patch=`echo $cxx_version | cut -f2 -d.`
+        test -n "$cxx_vers_major" || cxx_vers_major=0
+        test -n "$cxx_vers_minor" || cxx_vers_minor=0
+        test -n "$cxx_vers_patch" || cxx_vers_patch=0
+        cxx_vers_all=`expr $cxx_vers_major '*' 1000000 + $cxx_vers_minor '*' 1000 + $cxx_vers_patch`
+    fi
+fi
+
+# Common Intel flags for various situations
+if test "X-icpc" = "X-$cxx_vendor"; then
+    # Insert section about version specific problems from compiler flags here,
+    # if necessary.
+
+    arch=
+    # Architecture-specific flags
+    # Nothing currently. (Uncomment code below and modify to add any)
+    #case "$host_os-$host_cpu" in
+    #    *-i686)
+    #        arch="-march=i686"
+    #        ;;
+    #esac
+
+    # Host-specific flags
+    # Nothing currently. (Uncomment code below and modify to add any)
+    #case "`hostname`" in
+    #    sleipnir.ncsa.uiuc.edu)
+    #        arch="$arch -pipe"
+    #        ;;
+    #esac
+
+    ###########
+    # General #
+    ###########
+
+    # Default to C++11 standard
+    H5_CXXFLAGS="$H5_CXXFLAGS $arch -std=c++11"
+
+    ##############
+    # Production #
+    ##############
+
+    PROD_CXXFLAGS=
+
+    #########
+    # Debug #
+    #########
+
+    # NDEBUG is handled explicitly in configure
+    # -g is handled by the symbols flags
+    DEBUG_CXXFLAGS=
+
+    ###########
+    # Symbols #
+    ###########
+
+    NO_SYMBOLS_CXXFLAGS="-Wl,-s"
+    SYMBOLS_CXXFLAGS="-g"
+
+    #############
+    # Profiling #
+    #############
+
+    PROFILE_CXXFLAGS="-p"
+
+    ################
+    # Optimization #
+    ################
+
+    HIGH_OPT_CXXFLAGS="-O3"
+    DEBUG_OPT_CXXFLAGS="-O0"
+    NO_OPT_CXXFLAGS="-O0"
+
+    ############
+    # Warnings #
+    ############
+
+    ###########
+    # General #
+    ###########
+
+    # Add various general warning flags in intel-warnings.
+    # Use the C warnings as CXX warnings are the same
+    H5_CXXFLAGS="$H5_CXXFLAGS $(load_intel_arguments general)"
+
+    ######################
+    # Developer warnings #
+    ######################
+
+    # Use the C warnings as CXX warnings are the same
+    #NO_DEVELOPER_WARNING_CXXFLAGS=$(load_intel_arguments no-developer-general)
+    #DEVELOPER_WARNING_CXXFLAGS=$(load_intel_arguments developer-general)
+
+    #############################
+    # Version-specific warnings #
+    #############################
+
+    # intel == 8.0
+    if test $cxx_vers_major -eq 8 -a $cxx_vers_minor -eq 0; then
+        # v8.0 -O3 infinite loops when compiling test/tselect.c. Use -O2.
+        HIGH_OPT_CFLAGS="-O2"
+    fi
+
+    # intel == 10
+    if test $cxx_vers_major -eq 10; then
+        HIGH_OPT_CFLAGS="-O1"
+    fi
+
+    # intel >= 15
+    if test $cxx_vers_major -ge 15; then
+        # Use the C warnings as CXX warnings are the same
+        H5_CXXFLAGS="$H5_CXXFLAGS $(load_intel_arguments 15)"
+    fi
+
+    # intel >= 18
+    if test $cxx_vers_major -ge 18; then
+        # Use the C warnings as CXX warnings are the same
+        H5_CXXFLAGS="$H5_CXXFLAGS $(load_intel_arguments 18)"
+    fi
+
+    # intel <= 19
+    if test $cxx_vers_major -le 19; then
+        # Use the C warnings as CXX warnings are the same
+        H5_CXXFLAGS="$H5_CXXFLAGS $(load_intel_arguments general-19)"
+    fi
+
+    #################
+    # Flags are set #
+    #################
+    cxx_flags_set=yes
+fi
+
+# Clear cxx info if no flags set
+if test "X-$cxx_flags_set" = "X-"; then
+    cxx_vendor=
+    cxx_version=
+fi
diff --git a/config/intel-fflags b/config/intel-fflags
index 3e33fc9..ad1ce7c 100644
--- a/config/intel-fflags
+++ b/config/intel-fflags
@@ -1,17 +1,14 @@
-#							-*- shell-script -*-
+#                            -*- shell-script -*-
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 
 
 # This file should be sourced into configure if the compiler is the
@@ -19,6 +16,20 @@
 # if the compiler is not Intel; otherwise `f9x_flags_set' is set to `yes'
 #
 
+#
+# Prepend `$srcdir/config/intel-warnings/` to the filename suffix(es) given as
+# subroutine argument(s), remove comments starting with # and ending
+# at EOL, replace spans of whitespace (including newlines) with spaces,
+# and re-emit the file(s) thus filtered on the standard output stream.
+#
+load_intel_arguments()
+{
+    set -- $(for arg; do
+        sed 's,#.*$,,' $srcdir/config/intel-warnings/${arg}
+    done)
+    IFS=' ' echo "$*"
+}
+
 # Get the compiler version in a way that works for ifort
 # ifort unless a compiler version is already known
 #
@@ -44,13 +55,17 @@ if test X = "X$f9x_flags_set"; then
     fi
 fi
 
-# Common Intel flags for various situations
 if test "X-ifort" = "X-$f9x_vendor"; then
-    # Insert section about version specific problems from gnu-flags here, if
-    # necessary.
+
+    FC_BASENAME=ifort
+    F9XSUFFIXFLAG=""
+    FSEARCH_DIRS=""
+
+    ###############################
+    # Architecture-specific flags #
+    ###############################
 
     arch=
-    # Architecture-specific flags
     # Nothing currently. (Uncomment code below and modify to add any)
     #case "$host_os-$host_cpu" in
     #    *-i686)
@@ -66,23 +81,58 @@ if test "X-ifort" = "X-$f9x_vendor"; then
     #        ;;
     #esac
 
-    # General
-    FC_BASENAME=ifort
-    F9XSUFFIXFLAG=""
-    FSEARCH_DIRS=""
-    H5_FCFLAGS="$H5_FCFLAGS"
+    ##############
+    # Production #
+    ##############
+
+    PROD_FCFLAGS=
 
-    # Production
-    PROD_FCFLAGS="-O3"
+    #########
+    # Debug #
+    #########
 
-    # Debug
-    DEBUG_FCFLAGS="-g -check all"
+    DEBUG_FCFLAGS="-check all"
 
-    # Profile
-    # Use this for profiling with gprof
-    PROFILE_FCFLAGS="-g -p"
+    ###########
+    # Symbols #
+    ###########
 
-    # Flags are set
+    NO_SYMBOLS_FCFLAGS=
+    SYMBOLS_FCFLAGS="-g"
+
+    #############
+    # Profiling #
+    #############
+
+    PROFILE_FCFLAGS="-p"
+
+    ################
+    # Optimization #
+    ################
+
+    HIGH_OPT_FCFLAGS="-O3"
+    DEBUG_OPT_FCFLAGS=
+    NO_OPT_FCFLAGS=
+
+    ############
+    # Warnings #
+    ############
+
+    ###########
+    # General #
+    ###########
+
+    H5_FCFLAGS="$H5_FCFLAGS -free"
+    H5_FCFLAGS="$H5_FCFLAGS $(load_intel_arguments ifort-general)"
+
+    #############################
+    # Version-specific warnings #
+    #############################
+
+
+    #################
+    # Flags are set #
+    #################
     f9x_flags_set=yes
 fi
 
@@ -92,4 +142,3 @@ if test "X-$f9x_flags_set" = "X-"; then
   f9x_version=
 fi
 
-
diff --git a/config/intel-flags b/config/intel-flags
index 3187daf..fbec7ef 100644
--- a/config/intel-flags
+++ b/config/intel-flags
@@ -1,17 +1,14 @@
-#							-*- shell-script -*-
+#                            -*- shell-script -*-
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 
 
 # This file should be sourced into configure if the compiler is the
@@ -19,6 +16,20 @@
 # if the compiler is not Intel; otherwise `cc_flags_set' is set to `yes'
 #
 
+#
+# Prepend `$srcdir/config/intel-warnings/` to the filename suffix(es) given as
+# subroutine argument(s), remove comments starting with # and ending
+# at EOL, replace spans of whitespace (including newlines) with spaces,
+# and re-emit the file(s) thus filtered on the standard output stream.
+#
+load_intel_arguments()
+{
+    set -- $(for arg; do
+        sed 's,#.*$,,' $srcdir/config/intel-warnings/${arg}
+    done)
+    IFS=' ' echo "$*"
+}
+
 # Get the compiler version in a way that works for icc
 # icc unless a compiler version is already known
 #
@@ -66,47 +77,101 @@ if test "X-icc" = "X-$cc_vendor"; then
     #        ;;
     #esac
 
-    # General
+    ###########
+    # General #
+    ###########
+
     # Default to C99 standard.
-    H5_CFLAGS="${H5_CFLAGS:--std=c99 $arch}"
+    H5_CFLAGS="$H5_CFLAGS $arch -std=c99"
 
-    # Production is set to default; see settings for specific version further down
-    PROD_CFLAGS="-O" 
-    PROD_CPPFLAGS=
+    ##############
+    # Production #
+    ##############
 
-    # Debug
-    DEBUG_CFLAGS="-Wcheck -Wall -g -O0"
-    DEBUG_CPPFLAGS=
+    PROD_CFLAGS=
 
-    # Profile
-    # Use this for profiling with gprof
-    PROFILE_CFLAGS="-g -p"
-    PROFILE_CPPFLAGS=
+    #########
+    # Debug #
+    #########
 
-    # Flags are set
-    cc_flags_set=yes
+    # NDEBUG is handled explicitly in configure
+    DEBUG_CFLAGS=
 
-fi
+    ###########
+    # Symbols #
+    ###########
 
-# Version specific ICC flags
-#
-# Please follow the pattern below by adding new versions at the top, copying
-# the information from the previous version and adding modifications to that.
-# The default at the bottom will apply if no earlier version matches.
-case "$cc_vendor-$cc_version" in
-    icc-10*)
-        PROD_CFLAGS="-O1 -Wl,-s"
-        ;;
-    icc-8.0*)
-	# v8.0 -O3 infinite loops when compiling test/tselect.c. Use -O2.
-	PROD_CFLAGS="-O2 -Wl,-s"
-	;;
-    icc-*)
-        # -s became obsolete; we also fixed bugs that allow us to enable higher level
-        # of optimization starting with 1.8.7
-        PROD_CFLAGS="-O3"
-        ;;
-esac
+    NO_SYMBOLS_CFLAGS="-Wl,-s"
+    SYMBOLS_CFLAGS="-g"
+
+    #############
+    # Profiling #
+    #############
+
+    PROFILE_CFLAGS="-p"
+
+    ################
+    # Optimization #
+    ################
+
+    HIGH_OPT_CFLAGS="-O3"
+    DEBUG_OPT_CFLAGS="-O0"
+    NO_OPT_CFLAGS="-O0"
+
+    ############
+    # Warnings #
+    ############
+
+    ###########
+    # General #
+    ###########
+
+    # Add various general warning flags in intel-warnings.
+    H5_CFLAGS="$H5_CFLAGS $(load_intel_arguments general)"
+
+    ######################
+    # Developer warnings #
+    ######################
+
+    #NO_DEVELOPER_WARNING_CFLAGS=$(load_intel_arguments no-developer-general)
+    #DEVELOPER_WARNING_CFLAGS=$(load_intel_arguments developer-general)
+
+    #############################
+    # Version-specific warnings #
+    #############################
+
+    # intel == 8.0
+    if test $cc_vers_major -eq 8 -a $cc_vers_minor -eq 0; then
+        # v8.0 -O3 infinite loops when compiling test/tselect.c. Use -O2.
+        HIGH_OPT_CFLAGS="-O2"
+    fi
+
+    # intel == 10
+    if test $cc_vers_major -eq 10; then
+        HIGH_OPT_CFLAGS="-O1"
+    fi
+
+    # intel >= 15
+    if test $cc_vers_major -ge 15; then
+        H5_CFLAGS="$H5_CFLAGS $(load_intel_arguments 15)"
+    fi
+
+    # intel >= 18
+    if test $cc_vers_major -ge 18; then
+        H5_CFLAGS="$H5_CFLAGS $(load_intel_arguments 18)"
+    fi
+
+    # intel <= 19
+    # this file has warnings only available before oneapi versions
+    if test $cc_vers_major -le 19; then
+        H5_CFLAGS="$H5_CFLAGS $(load_intel_arguments general-19)"
+    fi
+
+    #################
+    # Flags are set #
+    #################
+    cc_flags_set=yes
+fi
 
 # Clear cc info if no flags set
 if test "X-$cc_flags_set" = "X-"; then
diff --git a/config/intel-warnings/15 b/config/intel-warnings/15
new file mode 100644
index 0000000..6746f97
--- /dev/null
+++ b/config/intel-warnings/15
@@ -0,0 +1,19 @@
+-Wcomment
+-Wdeprecated
+-Wextra-tokens
+-Wformat
+-Wformat-security
+-Wmain
+-Wmissing-declarations
+-Wmissing-prototypes
+-Wp64
+-Wpointer-arith
+-Wreturn-type
+-Wshadow
+-Wstrict-prototypes
+-Wtrigraphs
+-Wuninitialized
+-Wunknown-pragmas
+-Wunused-function
+-Wunused-variable
+-Wwrite-strings
diff --git a/config/intel-warnings/18 b/config/intel-warnings/18
new file mode 100644
index 0000000..02bcdea
--- /dev/null
+++ b/config/intel-warnings/18
@@ -0,0 +1,2 @@
+-Wic-pointer
+-Wsign-compare
diff --git a/config/intel-warnings/developer-general b/config/intel-warnings/developer-general
new file mode 100644
index 0000000..fae56f0
--- /dev/null
+++ b/config/intel-warnings/developer-general
@@ -0,0 +1,4 @@
+-Winline
+-Wreorder
+-Wport
+-Wstrict-aliasing
diff --git a/config/intel-warnings/general b/config/intel-warnings/general
new file mode 100644
index 0000000..bd866b6
--- /dev/null
+++ b/config/intel-warnings/general
@@ -0,0 +1 @@
+-Wall
diff --git a/config/intel-warnings/ifort-general b/config/intel-warnings/ifort-general
new file mode 100644
index 0000000..1644c7c
--- /dev/null
+++ b/config/intel-warnings/ifort-general
@@ -0,0 +1 @@
+-warn all
diff --git a/config/intel-warnings/win-developer-general b/config/intel-warnings/win-developer-general
new file mode 100644
index 0000000..6cd7ed7
--- /dev/null
+++ b/config/intel-warnings/win-developer-general
@@ -0,0 +1 @@
+/Wport
diff --git a/config/intel-warnings/win-general b/config/intel-warnings/win-general
new file mode 100644
index 0000000..ef54b2b
--- /dev/null
+++ b/config/intel-warnings/win-general
@@ -0,0 +1 @@
+/Wall
diff --git a/config/intel-warnings/win-ifort-general b/config/intel-warnings/win-ifort-general
new file mode 100644
index 0000000..a335959
--- /dev/null
+++ b/config/intel-warnings/win-ifort-general
@@ -0,0 +1 @@
+/warn:all
diff --git a/config/libhdf5.fpc.in b/config/libhdf5.fpc.in
new file mode 100644
index 0000000..c28c2f9
--- /dev/null
+++ b/config/libhdf5.fpc.in
@@ -0,0 +1,16 @@
+prefix=@_PKG_CONFIG_PREFIX@
+exec_prefix=@_PKG_CONFIG_EXEC_PREFIX@
+libdir=@_PKG_CONFIG_LIBDIR@
+includedir=@_PKG_CONFIG_INCLUDEDIR@
+moddir=@_PKG_CONFIG_MODULEDIR@
+
+Name: @_PKG_CONFIG_LIBNAME@
+Description: HDF5 (Hierarchical Data Format 5) Software Library
+Version: @_PKG_CONFIG_VERSION@
+
+Cflags: -I${includedir}
+Fflags: -I${moddir}
+Libs: -L${libdir} @_PKG_CONFIG_SH_LIBS@
+Requires: @_PKG_CONFIG_REQUIRES@
+Libs.private: @_PKG_CONFIG_LIBS_PRIVATE@ @_PKG_CONFIG_LIBS@
+Requires.private: @_PKG_CONFIG_REQUIRES_PRIVATE@
diff --git a/config/libhdf5.pc.in b/config/libhdf5.pc.in
new file mode 100644
index 0000000..4a2ebaa
--- /dev/null
+++ b/config/libhdf5.pc.in
@@ -0,0 +1,14 @@
+prefix=@_PKG_CONFIG_PREFIX@
+exec_prefix=@_PKG_CONFIG_EXEC_PREFIX@
+libdir=@_PKG_CONFIG_LIBDIR@
+includedir=@_PKG_CONFIG_INCLUDEDIR@
+
+Name: @_PKG_CONFIG_LIBNAME@
+Description: HDF5 (Hierarchical Data Format 5) Software Library
+Version: @_PKG_CONFIG_VERSION@
+
+Cflags: -I${includedir}
+Libs: -L${libdir} @_PKG_CONFIG_SH_LIBS@
+Requires: @_PKG_CONFIG_REQUIRES@
+Libs.private: @_PKG_CONFIG_LIBS_PRIVATE@ @_PKG_CONFIG_LIBS@
+Requires.private: @_PKG_CONFIG_REQUIRES_PRIVATE@
diff --git a/config/linux-gnu b/config/linux-gnu
index 912a93b..0431f94 100644
--- a/config/linux-gnu
+++ b/config/linux-gnu
@@ -1,17 +1,14 @@
 #							-*- shell-script -*-
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 
 
 # This is the same as linux-gnulibc1
diff --git a/config/linux-gnuaout b/config/linux-gnuaout
index 912a93b..0431f94 100644
--- a/config/linux-gnuaout
+++ b/config/linux-gnuaout
@@ -1,17 +1,14 @@
 #							-*- shell-script -*-
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 
 
 # This is the same as linux-gnulibc1
diff --git a/config/linux-gnueabihf b/config/linux-gnueabihf
new file mode 100644
index 0000000..596bf3a
--- /dev/null
+++ b/config/linux-gnueabihf
@@ -0,0 +1,16 @@
+#							-*- shell-script -*-
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+
+# ARM for Raspberry Pi, etc.
+# This is the same as linux-gnulibc1
+
+. $srcdir/config/linux-gnulibc1
diff --git a/config/linux-gnulibc1 b/config/linux-gnulibc1
index c18c02d..ab7e28f 100644
--- a/config/linux-gnulibc1
+++ b/config/linux-gnulibc1
@@ -1,17 +1,14 @@
 #							-*- shell-script -*-
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 
 
 # This file is part of the HDF5 build script.  It is processed shortly
@@ -38,9 +35,15 @@ fi
 # Figure out PGI C compiler flags
 . $srcdir/config/pgi-flags
 
+# Figure out CCE C compiler flags
+. $srcdir/config/cce-flags
+
 # Figure out Intel C compiler flags
 . $srcdir/config/intel-flags
 
+# Figure out Clang C compiler flags
+. $srcdir/config/clang-flags
+
 # Use default Fortran 90 compiler according to what C compiler is used.
 if test "X-" = "X-$FC"; then
     case $CC_BASENAME in
@@ -48,7 +51,7 @@ if test "X-" = "X-$FC"; then
             FC=gfortran
             FC_BASENAME=gfortran
             ;;
-	pgcc*)
+        pgcc*)
             FC=pgf90
             FC_BASENAME=pgf90
             ;;
@@ -60,6 +63,11 @@ if test "X-" = "X-$FC"; then
             FC=mpif90
             FC_BASENAME=mpif90
             ;;
+        clang*)
+            # clang has no fortran compiler. Use gfortran.
+            FC=gfortran
+            FC_BASENAME=gfortran
+            ;;
     esac
 else
     case $FC in
@@ -83,16 +91,35 @@ else
             $RM $tmpfile
             fc_version_info=`$FC -V | grep Absoft`
             ;;
-
+         # The NAG compiler
+	 nagfor*|nagftn*)
+            RM='rm -f'
+            tmpfile=/tmp/cmpver.$$
+            $FC -V >& $tmpfile
+            if test -s "$tmpfile"; then
+                if( grep -s 'NAG Fortran' $tmpfile > /dev/null) then
+                    FC_BASENAME=nagfor
+                fi
+            fi
+            fc_version_info=`grep "NAG Fortran" $tmpfile`
+            echo "compiler '$FC' is $fc_version_info"
+            $RM $tmpfile
+	    ;;
          *)
             ;;
     esac
 fi
 
-# Figure out PGI F90 compiler flags
+# Figure out GNU FC compiler flags
+. $srcdir/config/gnu-fflags
+
+# Figure out PGI FC compiler flags
 . $srcdir/config/pgi-fflags
 
-# Figure out Intel F90 compiler flags
+# Figure out CCE FC compiler flags
+. $srcdir/config/cce-fflags
+
+# Figure out Intel FC compiler flags
 . $srcdir/config/intel-fflags
 
 case $FC_BASENAME in
@@ -101,16 +128,63 @@ case $FC_BASENAME in
     #
     f95)
         # Set required flag for compiling C stubs
-        H5_CFLAGS="$H5_CFLAGS" 
+        H5_CFLAGS="$H5_CFLAGS"
+
+        F9XSUFFIXFLAG=""
+# We force compiler to use upper case for external names
+# (just in case since this should be a default EIP)
+        H5_FCFLAGS="$H5_FCFLAGS"
+        FSEARCH_DIRS=""
+
+        # Production
+        PROD_FCFLAGS=
+
+        # Debug
+        DEBUG_FCFLAGS=
+
+        # Symbols
+        SYMBOLS_FCFLAGS="-g"
+        NO_SYMBOLS_FCFLAGS="-s"
+
+        # Profiling
+        PROFILE_FCFLAGS="-pg"
+
+        # Optimization
+        HIGH_OPT_FCFLAGS="-O"
+        DEBUG_OPT_FCFLAGS=
+        NO_OPT_FCFLAGS=
+
+        f9x_flags_set=yes
+        ;;
+#
+#   NAG compiler
+#
+    nagfor)
 
         F9XSUFFIXFLAG=""
-# We force compiler to use upper case for external names 
+# We force compiler to use upper case for external names
 # (just in case since this should be a default EIP)
         H5_FCFLAGS="$H5_FCFLAGS"
         FSEARCH_DIRS=""
-        DEBUG_FCFLAGS="-g"
-        PROD_FCFLAGS="-O"
-        PROFILE_FCFLAGS="-g -pg"
+
+        # Production
+        PROD_FCFLAGS=
+
+        # Debug
+        DEBUG_FCFLAGS="-C"
+
+        # Symbols
+        SYMBOLS_FCFLAGS="-g"
+        NO_SYMBOLS_FCFLAGS="-s"
+
+        # Profiling
+        PROFILE_FCFLAGS="-pg"
+
+        # Optimization
+        HIGH_OPT_FCFLAGS="-O"
+        DEBUG_OPT_FCFLAGS="-O0"
+        NO_OPT_FCFLAGS="-O0"
+
         f9x_flags_set=yes
         ;;
 
@@ -124,7 +198,24 @@ if test -z "$CXX"; then
   CXX_BASENAME=g++
 fi
 
+# Figure out Intel CXX compiler flags
+# Do this ahead of GNU to avoid icpc being detected as g++
+. $srcdir/config/intel-cxxflags
+
+# Figure out GNU CXX compiler flags
+. $srcdir/config/gnu-cxxflags
+
+# Figure out PGI CXX compiler flags
+. $srcdir/config/pgi-cxxflags
+
+# Figure out Clang CXX compiler flags
+. $srcdir/config/clang-cxxflags
+
 # compiler version strings
+
+# check if the compiler_version_info is already set
+if test -z "$cc_version_info"; then
+
 case $CC in
     # whatever matches *pgcc* will also match *gcc*, so this one must come first
     *pgcc*)
@@ -139,6 +230,7 @@ case $CC in
     *mpicc*)
         cc_version_info=`$CC $CCFLAGS $H5_CCFLAGS -v 2>&1 | grep 'version' |\
             sed 's/^[a-z0-9]* for //' |\
+            sed 's/\"/\\\"/g' |\
             sed 's/^\([a-z]* \)/ built with \1/1'`
         cc_version_info=`echo $cc_version_info`
         ;; 
@@ -148,12 +240,21 @@ case $CC in
             sed 's/\(Intel.* Compiler\).*\( Version [a-z0-9\.]*\).*\( Build [0-9]*\)/\1\2\3/'`
         ;;
 
+    *clang*)
+        cc_version_info="`$CC $CFLAGS $H5_CFLAGS --version 2>&1 |\
+            grep 'clang version' | sed 's/.*clang version \([-a-z0-9\.]*\).*/\1/'`"
+        ;;
+
     *)
         echo "No match to get cc_version_info for $CC"
         ;;
 esac
 
+fi
+
 # get fortran version info
+# check if the compiler_version_info is already set
+if test -z "$fc_version_info"; then
 case $FC in
     *gfortran*)
         fc_version_info=`$FC $FCFLAGS $H5_FCFLAGS --version 2>&1 |\
@@ -163,6 +264,7 @@ case $FC in
     *mpif90*)
         fc_version_info=`$FC $FCFLAGS $H5_FCFLAGS -v 2>&1 | grep 'version' |\
             sed 's/^[a-z0-9]* for //' |\
+            sed 's/\"/\\\"/g' |\
             sed 's/^\([a-z]* \)/ built with \1/1'`
         fc_version_info=`echo $fc_version_info`
         ;;
@@ -194,15 +296,33 @@ case $FC in
     *pgf90*)
         fc_version_info=`$FC $FCFLAGS $H5_FCFLAGS -V 2>&1 | grep 'pgf90'`
         ;;
+    *nagfor*|*nagftn*)
+        RM='rm -f'
+        tmpfile=/tmp/cmpver.$$
+        $FC -V >& $tmpfile
+        if test -s "$tmpfile"; then
+           if( grep -s 'NAG Fortran' $tmpfile > /dev/null) then
+               FC_BASENAME=nagfor
+           fi
+        fi
+        fc_version_info=`grep "NAG Fortran" $tmpfile`
+        $RM $tmpfile
+        echo "compiler '$FC' is $fc_version_info"
+	;;
 
      *)
         echo "No match to get fc_version_info for $FC"
         ;;
 esac
-
+fi
 
 # get c++ version info
+# check if the compiler_version_info is already set
+if test -z "$cxx_version_info"; then
 case $CXX in
+    *pgc++*)
+        cxx_version_info=`$CXX $CXXFLAGS $H5_CXXFLAGS -V 2>&1 | grep 'pgc++'`
+        ;;
     *g++*)
         cxx_version_info=`$CXX $CXXFLAGS $H5_CXXFLAGS --version 2>&1 |\
             grep 'GCC' | sed 's/\(.*(GCC) [-a-z0-9\. ]*\).*/\1/'`
@@ -211,10 +331,6 @@ case $CXX in
         cxx_version_info=`$CXX $CXXFLAGS $H5_CXXFLAGS -V 2>&1 | grep 'Version' |\
             sed 's/\(Intel.* Compiler\).*\( Version [a-z0-9\.]*\).*\( Build [0-9]*\)/\1\2\3/'`
         ;;
-    *pgCC*)
-        cxx_version_info=`$CXX $CXXFLAGS $H5_CXXFLAGS -V 2>&1 | grep 'pgCC'`
-        ;;
-
     *mpicxx*)
         cxx_version_info=`$CXX $CXXFLAGS $H5_CXXFLAGS -v 2>&1 | grep 'version' |\
             sed 's/^[a-z0-9]* for //' |\
@@ -222,8 +338,13 @@ case $CXX in
         cxx_version_info=`echo $cxx_version_info`
         ;; 
 
+    *clang++*)
+        cxx_version_info="`$CXX $CXXFLAGS $H5_CXXFLAGS --version 2>&1 |\
+            grep 'clang version' | sed 's/.*clang version \([-a-z0-9\.]*\).*/\1/'`"
+        ;;
+
     *)
         echo "No match to get cxx_version_info for $CXX"
         ;;
 esac
-
+fi
diff --git a/config/linux-gnulibc2 b/config/linux-gnulibc2
index 76526b8..f1433bf 100644
--- a/config/linux-gnulibc2
+++ b/config/linux-gnulibc2
@@ -1,17 +1,14 @@
 #							-*- shell-script -*-
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 
 
 # This file is part of the HDF5 build script.  It is processed shortly
diff --git a/config/lt_vers.am b/config/lt_vers.am
index 41d7e81..fade5bf 100644
--- a/config/lt_vers.am
+++ b/config/lt_vers.am
@@ -2,25 +2,22 @@
 ## (Use double hashes for copyright notice so that automake treats it as
 ## comments and does not pass it to Makefile.in)
 ## Copyright by The HDF Group.
-## Copyright by the Board of Trustees of the University of Illinois.
 ## All rights reserved.
 ##
 ## This file is part of HDF5.  The full HDF5 copyright notice, including
 ## terms governing use, modification, and redistribution, is contained in
-## the files COPYING and Copyright.html.  COPYING can be found at the root
-## of the source code distribution tree; Copyright.html can be found at the
-## root level of an installed copy of the electronic HDF5 document set and
-## is linked from the top-level documents page.  It can also be found at
-## http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-## access to either file, you may request a copy from help@hdfgroup.org.
+## the COPYING file, which can be found at the root of the source code
+## distribution tree, or in https://www.hdfgroup.org/licenses.
+## If you do not have access to either file, you may request a copy from
+## help@hdfgroup.org.
 ##
 # Add libtool shared library version numbers to the HDF5 library
 # See libtool versioning documentation online.
 # After making changes, run bin/reconfigure to update other configure related
 # files like Makefile.in.
-LT_VERS_INTERFACE = 6
-LT_VERS_REVISION = 206
+LT_VERS_INTERFACE = 1000
 LT_VERS_AGE = 0
+LT_VERS_REVISION = 0
 
 ## If the API changes *at all*, increment LT_VERS_INTERFACE and
 ## reset LT_VERS_REVISION to 0.
@@ -40,23 +37,32 @@ LT_VERS_AGE = 0
 ## Note that this versioning system doesn't attempt to handle
 ## the effects of the H5_V1_x_COMPAT flag.
 ##
-## Since the revision number is automatically incremented by
-## bin/h5vers, don't move LT_VERS_REVISION from the fourth line
-## without also editing the script!
+## Version numbers for wrapper shared library files.
+LT_CXX_VERS_INTERFACE = 1000
+LT_CXX_VERS_REVISION = 0
+LT_CXX_VERS_AGE = 0
 
+LT_F_VERS_INTERFACE = 1000
+LT_F_VERS_REVISION = 0
+LT_F_VERS_AGE = 0
 
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+LT_HL_VERS_INTERFACE = 1000
+LT_HL_VERS_REVISION = 0
+LT_HL_VERS_AGE = 0
 
+LT_HL_CXX_VERS_INTERFACE = 1000
+LT_HL_CXX_VERS_REVISION = 0
+LT_HL_CXX_VERS_AGE = 0
 
+LT_HL_F_VERS_INTERFACE = 1000
+LT_HL_F_VERS_REVISION = 0
+LT_HL_F_VERS_AGE = 0
+
+LT_JAVA_VERS_INTERFACE = 1000
+LT_JAVA_VERS_REVISION = 0
+LT_JAVA_VERS_AGE = 0
+
+LT_TOOLS_VERS_INTERFACE = 1000
+LT_TOOLS_VERS_REVISION = 0
+LT_TOOLS_VERS_AGE = 0
 
diff --git a/config/netbsd b/config/netbsd
new file mode 100644
index 0000000..04761f2
--- /dev/null
+++ b/config/netbsd
@@ -0,0 +1,55 @@
+#							-*- shell-script -*-
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+
+
+# This file is part of the HDF5 build script.  It is processed shortly
+# after configure starts and defines, among other things, flags for
+# the various compile modes.
+#
+# See BlankForm in this directory for details.
+
+# The default compiler is `gcc'
+if test "X-" = "X-$CC"; then
+  CC=gcc
+  CC_BASENAME=gcc
+fi
+
+# Figure out C compiler flags
+. $srcdir/config/gnu-flags
+
+# Figure out Intel C compiler flags
+. $srcdir/config/intel-flags
+
+# The default Fortran 90 compiler
+if test "X-" = "X-$FC"; then
+    case $CC_BASENAME in
+        gcc*|pgcc*)
+            FC=gfortran
+            FC_BASENAME=gfortran
+            ;;
+        icc*)
+            FC=ifort
+            FC_BASENAME=ifort
+            ;;
+        mpicc*)
+            FC=mpif90
+            FC_BASENAME=mpif90
+            ;;
+    esac
+fi
+
+# Figure out FORTRAN compiler flags
+. $srcdir/config/gnu-fflags
+
+# Figure out Intel F90 compiler flags
+. $srcdir/config/intel-fflags
+
diff --git a/config/pgi-cxxflags b/config/pgi-cxxflags
new file mode 100644
index 0000000..7d8bdeb
--- /dev/null
+++ b/config/pgi-cxxflags
@@ -0,0 +1,101 @@
+#                            -*- shell-script -*-
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+
+
+# This file should be sourced into configure if the compiler is the
+# PGI pgc++ compiler or a derivative.  It is careful not to do anything
+# if the compiler is not PGI; otherwise `cxx_flags_set' is set to `yes'
+#
+
+# Get the compiler version in a way that works for pgc++
+# pgc++ unless a compiler version is already known
+#
+#   cxx_vendor:    The compiler name: pgc++
+#   cxx_version:   Version number: 5.0-2, 5.2-2
+#
+if test X = "X$cxx_flags_set"; then
+    cxx_version="`$CXX $CXXFLAGS -V 2>&1 |grep '^pgc++ '`"
+    if test X != "X$cxx_version"; then
+        cxx_vendor=`echo $cxx_version |sed 's/\([a-z]*++\).*/\1/'`
+        cxx_version=`echo $cxx_version |sed 's/pgc++ \([-a-z0-9\.\-]*\).*/\1/'`
+        echo "compiler '$CXX' is PGI $cxx_vendor-$cxx_version"
+
+        # Some version numbers
+        # PGI version numbers are of the form: "major.minor-patch"
+        cxx_vers_major=`echo $cxx_version | cut -f1 -d.`
+        cxx_vers_minor=`echo $cxx_version | cut -f2 -d. | cut -f1 -d-`
+        cxx_vers_patch=`echo $cxx_version | cut -f2 -d. | cut -f2 -d-`
+        test -n "$cxx_vers_major" || cxx_vers_major=0
+        test -n "$cxx_vers_minor" || cxx_vers_minor=0
+        test -n "$cxx_vers_patch" || cxx_vers_patch=0
+        cxx_vers_all=`expr $cxx_vers_major '*' 1000000 + $cxx_vers_minor '*' 1000 + $cxx_vers_patch`
+    fi
+fi
+
+# Common PGI flags for various situations
+if test "X-pgc++" = "X-$cxx_vendor"; then
+
+    ###########
+    # General #
+    ###########
+
+    # Default to C++11 standard
+    H5_CXXFLAGS="$H5_CXXFLAGS -std=c++11 -Minform=warn"
+
+    ##############
+    # Production #
+    ##############
+
+    PROD_CXXFLAGS=
+
+    #########
+    # Debug #
+    #########
+
+    # NDEBUG is handled explicitly in configure
+    # -g is handled by the symbols flags
+    DEBUG_CXXFLAGS="-Mbounds"
+
+    ###########
+    # Symbols #
+    ###########
+
+    NO_SYMBOLS_CXXFLAGS="-s"
+    SYMBOLS_CXXFLAGS="-g"
+
+    #############
+    # Profiling #
+    #############
+
+    PROFILE_CXXFLAGS="-Mprof=func,line"
+    # Use this for profiling with gprof
+    #PROFILE_CXXFLAGS="-pg"
+
+    ################
+    # Optimization #
+    ################
+
+    HIGH_OPT_CXXFLAGS="-O4"
+    DEBUG_OPT_CXXFLAGS="-gopt -O2"
+    NO_OPT_CXXFLAGS="-O0"
+
+    #################
+    # Flags are set #
+    #################
+    cxx_flags_set=yes
+fi
+
+# Clear cxx info if no flags set
+if test "X-$cxx_flags_set" = "X-"; then
+    cxx_vendor=
+    cxx_version=
+fi
diff --git a/config/pgi-fflags b/config/pgi-fflags
index 6cb8930..5ec8368 100644
--- a/config/pgi-fflags
+++ b/config/pgi-fflags
@@ -1,17 +1,14 @@
-#							-*- shell-script -*-
+#                            -*- shell-script -*-
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 
 
 # This file should be sourced into configure if the compiler is the
@@ -47,11 +44,12 @@ fi
 
 # Common PGI flags for various situations
 if test "X-pgf90" = "X-$f9x_vendor"; then
-    # Insert section about version specific problems from gnu-flags here, if
-    # necessary.
+
+    ###############################
+    # Architecture-specific flags #
+    ###############################
 
     arch=
-    # Architecture-specific flags
     # Nothing currently. (Uncomment code below and modify to add any)
     #case "$host_os-$host_cpu" in
     #    *-i686)
@@ -67,14 +65,10 @@ if test "X-pgf90" = "X-$f9x_vendor"; then
     #        ;;
     #esac
 
-    # General
-    FC_BASENAME=pgf90
-    F9XSUFFIXFLAG=""
-    FSEARCH_DIRS=""
-    # Uncomment the following to add something specific for FCFLAGS.
-    #FCFLAGS="$FCFLAGS"
+    ##############
+    # Production #
+    ##############
 
-    # Production
     # Check for MPI wrapper being used and tweak down compiler options
     # Comment out the Tweaking since it caused problems to mpich1.2.6.
     # Need to investigate the reasons to tweak.
@@ -83,17 +77,57 @@ if test "X-pgf90" = "X-$f9x_vendor"; then
     #else
     #    PROD_FCFLAGS="-O2 -s"
     #fi
-    PROD_FCFLAGS="-fast -s -Mnoframe"
+    PROD_FCFLAGS="-fast -Mnoframe"
 
-    # Debug
-    DEBUG_FCFLAGS="-g -Mbounds -Mchkptr -Mdclchk"
+    #########
+    # Debug #
+    #########
 
-    # Profile
-    PROFILE_FCFLAGS="-g -Mprof=func,line"
+    DEBUG_FCFLAGS="-Mbounds -Mchkptr -Mdclchk"
+
+    ###########
+    # Symbols #
+    ###########
+
+    NO_SYMBOLS_FCFLAGS="-s"
+    SYMBOLS_FCFLAGS="-g"
+
+    #############
+    # Profiling #
+    #############
+
+    PROFILE_FCFLAGS="-Mprof=func,line"
     # Use this for profiling with gprof
-    #PROFILE_FCFLAGS="-g -pg"
+    #PROFILE_FCFLAGS="-pg"
+
+    ################
+    # Optimization #
+    ################
+
+    HIGH_OPT_FCFLAGS=
+    DEBUG_OPT_FCFLAGS=
+    NO_OPT_FCFLAGS=
 
-    # Flags are set
+    ############
+    # Warnings #
+    ############
+
+    ###########
+    # General #
+    ###########
+
+    FC_BASENAME=pgf90
+    Fortran_COMPILER_ID=PGI
+    F9XSUFFIXFLAG=""
+    FSEARCH_DIRS=""
+    # Uncomment the following to add something specific for FCFLAGS.
+    #FCFLAGS="$FCFLAGS"
+
+
+
+    #################
+    # Flags are set #
+    #################
     f9x_flags_set=yes
 fi
 
@@ -103,4 +137,3 @@ if test "X-$f9x_flags_set" = "X-"; then
   f9x_version=
 fi
 
-
diff --git a/config/pgi-flags b/config/pgi-flags
index 29e6f05..19dd912 100644
--- a/config/pgi-flags
+++ b/config/pgi-flags
@@ -1,17 +1,14 @@
-#							-*- shell-script -*-
+#                            -*- shell-script -*-
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 
 
 # This file should be sourced into configure if the compiler is the
@@ -47,8 +44,8 @@ fi
 
 # Common PGI flags for various situations
 if test "X-pgcc" = "X-$cc_vendor"; then
-    # Insert section about version specific problems from gnu-flags here, if
-    # necessary.
+    # Insert section about version specific problems from compiler flags here,
+    # if necessary.
 
     arch=
     # Architecture-specific flags
@@ -67,42 +64,59 @@ if test "X-pgcc" = "X-$cc_vendor"; then
     #        ;;
     #esac
 
-    # General
-    H5_CFLAGS="$H5_CFLAGS $arch -c99 -Minform=inform"
-
-    # Production
-    case "$cc_vendor-$cc_version" in
-      # Tweak down compiler optimizations for v10.6, it has a bug
-      pgcc-10.6*)
-        PROD_CFLAGS="-O1 -s"
-        ;;
-      # Tweak down compiler optimizations for v9.x
-      pgcc-9.*)
-        PROD_CFLAGS="-O1 -s"
-        ;;
-      *)
-        PROD_CFLAGS="-fast -s"
-        ;;
-    esac
-    PROD_CPPFLAGS=
-
-    # Debug
-    DEBUG_CFLAGS="-g -Mbounds"
-    DEBUG_CPPFLAGS=
-
-    # Profile
-    PROFILE_CFLAGS="-g -Mprof=func,line"
+    ###########
+    # General #
+    ###########
+
+    # Default to C99 standard.
+    H5_CFLAGS="$H5_CFLAGS $arch -c99 -Minform=warn"
+
+    ##############
+    # Production #
+    ##############
+
+    # NDEBUG is handled explicitly by the configure script
+    PROD_CFLAGS="-fast"
+
+    #########
+    # Debug #
+    #########
+
+    # NDEBUG is handled explicitly by the configure script
+    # -g is handled by the symbols flags
+    DEBUG_CFLAGS="-Mbounds"
+
+    ###########
+    # Symbols #
+    ###########
+
+    NO_SYMBOLS_CFLAGS="-s"
+    SYMBOLS_CFLAGS="-g"
+
+    #############
+    # Profiling #
+    #############
+
+    PROFILE_CFLAGS="-Mprof=func,line"
     # Use this for profiling with gprof
-    #PROFILE_CFLAGS="-g -pg"
-    PROFILE_CPPFLAGS=
+    #PROFILE_CFLAGS="-pg"
 
-    # Flags are set
-    cc_flags_set=yes
+    ################
+    # Optimization #
+    ################
+
+    HIGH_OPT_CFLAGS="-O4"
+    DEBUG_OPT_CFLAGS="-gopt -O2"
+    NO_OPT_CFLAGS="-O0"
 
+    #################
+    # Flags are set #
+    #################
+    cc_flags_set=yes
 fi
 
 # Clear cc info if no flags set
 if test "X-$cc_flags_set" = "X-"; then
-  cc_vendor=
-  cc_version=
+    cc_vendor=
+    cc_version=
 fi
diff --git a/config/powerpc-ibm-aix5.x b/config/powerpc-ibm-aix5.x
deleted file mode 100644
index 50a4e8c..0000000
--- a/config/powerpc-ibm-aix5.x
+++ /dev/null
@@ -1,21 +0,0 @@
-#							-*- shell-script -*-
-#
-# Copyright by The HDF Group.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-
-# Configuration file for building on the IBM POWER AIX platforms.
-# This file is part of the HDF5 build script.  It is processed shortly
-# after configure starts and defines, among other things, flags for
-# the various compile modes.
-
-# Use the generic ibm-aix.
-. $srcdir/config/ibm-aix
diff --git a/config/sanitizer/LICENSE b/config/sanitizer/LICENSE
new file mode 100644
index 0000000..895657b
--- /dev/null
+++ b/config/sanitizer/LICENSE
@@ -0,0 +1,174 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+\ No newline at end of file
diff --git a/config/sanitizer/README.md b/config/sanitizer/README.md
new file mode 100644
index 0000000..0d5fb6c
--- /dev/null
+++ b/config/sanitizer/README.md
@@ -0,0 +1,307 @@
+# CMake Scripts <!-- omit in toc -->
+
+[![pipeline status](https://git.stabletec.com/other/cmake-scripts/badges/master/pipeline.svg)](https://git.stabletec.com/other/cmake-scripts/commits/master)
+[![license](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](https://git.stabletec.com/other/cmake-scripts/blob/master/LICENSE)
+
+This is a collection of quite useful scripts that expand the possibilities for building software with CMake, by making some things easier and otherwise adding new build types
+
+- [C++ Standards `c++-standards.cmake`](#c-standards-c-standardscmake)
+- [Sanitizer Builds `sanitizers.cmake`](#sanitizer-builds-sanitizerscmake)
+- [Code Coverage `code-coverage.cmake`](#code-coverage-code-coveragecmake)
+  - [Added Targets](#added-targets)
+  - [Usage](#usage)
+    - [Example 1 - All targets instrumented](#example-1---all-targets-instrumented)
+      - [1a - Via global command](#1a---via-global-command)
+      - [1b - Via target commands](#1b---via-target-commands)
+    - [Example 2: Target instrumented, but with regex pattern of files to be excluded from report](#example-2-target-instrumented-but-with-regex-pattern-of-files-to-be-excluded-from-report)
+    - [Example 3: Target added to the 'ccov' and 'ccov-all' targets](#example-3-target-added-to-the-ccov-and-ccov-all-targets)
+- [Compiler Options `compiler-options.cmake`](#compiler-options-compiler-optionscmake)
+- [Dependency Graph `dependency-graph.cmake`](#dependency-graph-dependency-graphcmake)
+  - [Required Arguments](#required-arguments)
+    - [OUTPUT_TYPE *STR*](#output_type-str)
+  - [Optional Arguments](#optional-arguments)
+    - [ADD_TO_DEP_GRAPH](#add_to_dep_graph)
+    - [TARGET_NAME *STR*](#target_name-str)
+    - [OUTPUT_DIR *STR*](#output_dir-str)
+- [Doxygen `doxygen.cmake`](#doxygen-doxygencmake)
+  - [Optional Arguments](#optional-arguments-1)
+    - [ADD_TO_DOC](#add_to_doc)
+    - [INSTALLABLE](#installable)
+    - [PROCESS_DOXYFILE](#process_doxyfile)
+    - [TARGET_NAME *STR*](#target_name-str-1)
+    - [OUTPUT_DIR *STR*](#output_dir-str-1)
+    - [INSTALL_PATH *STR*](#install_path-str)
+    - [DOXYFILE_PATH *STR*](#doxyfile_path-str)
+- [Prepare the Catch Test Framework `prepare_catch.cmake`](#prepare-the-catch-test-framework-prepare_catchcmake)
+  - [Optional Arguments](#optional-arguments-2)
+    - [COMPILED_CATCH](#compiled_catch)
+    - [CATCH1](#catch1)
+    - [CLONE](#clone)
+- [Tools `tools.cmake`](#tools-toolscmake)
+  - [clang-tidy](#clang-tidy)
+  - [include-what-you-use](#include-what-you-use)
+  - [cppcheck](#cppcheck)
+- [Formatting `formatting.cmake`](#formatting-formattingcmake)
+  - [clang-format](#clang-format)
+  - [cmake-format](#cmake-format)
+
+## C++ Standards [`c++-standards.cmake`](c++-standards.cmake)
+
+Using the functions `cxx_11()`, `cxx_14()`, `cxx_17()` or `cxx_20()` this adds the appropriate flags for both unix and MSVC compilers, even for those before 3.11 with improper support.
+
+These obviously force the standard to be required, and also disables compiler-specific extensions, ie `--std=gnu++11`. This helps to prevent fragmenting the code base with items not available elsewhere, adhering to the agreed C++ standards only.
+
+## Sanitizer Builds [`sanitizers.cmake`](sanitizers.cmake)
+
+Sanitizers are tools that perform checks during a program’s runtime and returns issues, and as such, along with unit testing, code coverage and static analysis, is another tool to add to the programmers toolbox. And of course, like the previous tools, are tragically simple to add into any project using CMake, allowing any project and developer to quickly and easily use.
+
+A quick rundown of the tools available, and what they do:
+- [LeakSanitizer](https://clang.llvm.org/docs/LeakSanitizer.html) detects memory leaks, or issues where memory is allocated and never deallocated, causing programs to slowly consume more and more memory, eventually leading to a crash.
+- [AddressSanitizer](https://clang.llvm.org/docs/AddressSanitizer.html) is a fast memory error detector. It is useful for detecting most issues dealing with memory, such as:
+    - Out of bounds accesses to heap, stack, global
+    - Use after free
+    - Use after return
+    - Use after scope
+    - Double-free, invalid free
+    - Memory leaks (using LeakSanitizer)
+- [ThreadSanitizer](https://clang.llvm.org/docs/ThreadSanitizer.html) detects data races for multi-threaded code.
+- [UndefinedBehaviourSanitizer](https://clang.llvm.org/docs/UndefinedBehaviorSanitizer.html) detects the use of various features of C/C++ that are explicitly listed as resulting in undefined behaviour. Most notably:
+    - Using misaligned or null pointer.
+    - Signed integer overflow
+    - Conversion to, from, or between floating-point types which would overflow the destination
+    - Division by zero
+    - Unreachable code
+- [MemorySanitizer](https://clang.llvm.org/docs/MemorySanitizer.html) detects uninitialized reads.
+
+These are used by declaring the `USE_SANITIZER` CMake variable as one of:
+- Address
+- Memory
+- MemoryWithOrigins
+- Undefined
+- Thread
+- Address;Undefined
+- Undefined;Address
+- Leak
+
+## Code Coverage [`code-coverage.cmake`](code-coverage.cmake)
+
+![Code Coverage Examples](img/code-cov.png)
+
+> In computer science, test coverage is a measure used to describe the degree to which the source code of a program is executed when a particular test suite runs. A program with high test coverage, measured as a percentage, has had more of its source code executed during testing, which suggests it has a lower chance of containing undetected software bugs compared to a program with low test coverage. Many different metrics can be used to calculate test coverage; some of the most basic are the percentage of program subroutines and the percentage of program statements called during execution of the test suite. 
+>
+> [Wikipedia, Code Coverage](https://en.wikipedia.org/wiki/Code_coverage)
+
+Code coverage is the detailing of, during the execution of a binary, which regions, functions, or lines of code are *actually* executed. This can be used in a number of ways, from figuring out areas that automated testing is lacking or not touching, to giving a user an instrumented binary to determine which areas of code are used most/least to determine which areas to focus on. Although this does come with the caveat that coverage is no guarantee of good testing, just of what code has been.
+
+Coverage here is supported on both GCC and Clang. GCC requires the `lcov` program, and Clang requires `llvm-cov` and `llvm-profdata`, often provided with the llvm toolchain.
+
+To enable, turn on the `CODE_COVERAGE` variable.
+
+### Added Targets
+
+- GCOV/LCOV:
+    - ccov : Generates HTML code coverage report for every target added with 'AUTO' parameter.
+    - ccov-${TARNGET_NAME} : Generates HTML code coverage report for the associated named target.
+    - ccov-all : Generates HTML code coverage report, merging every target added with 'ALL' parameter into a single detailed report.
+    - ccov-all-capture : Generates an all-merged.info file, for use with coverage dashboards (e.g. codecov.io, coveralls).
+- LLVM-COV:
+    - ccov : Generates HTML code coverage report for every target added with 'AUTO' parameter.
+    - ccov-report : Generates HTML code coverage report for every target added with 'AUTO' parameter.
+    - ccov-${TARGET_NAME} : Generates HTML code coverage report.
+    - ccov-rpt-${TARGET_NAME} : Prints to command line summary per-file coverage information.
+    - ccov-show-${TARGET_NAME} : Prints to command line detailed per-line coverage information.
+    - ccov-all : Generates HTML code coverage report, merging every target added with 'ALL' parameter into a single detailed report.
+    - ccov-all-report : Prints summary per-file coverage information for every target added with ALL' parameter to the command line.
+
+### Usage
+
+To enable any code coverage instrumentation/targets, the single CMake option of `CODE_COVERAGE` needs to be set to 'ON', either by GUI, ccmake, or on the command line ie `-DCODE_COVERAGE=ON`.
+
+From this point, there are two primary methods for adding instrumentation to targets:
+1. A blanket instrumentation by calling `add_code_coverage()`, where all targets in that directory and all subdirectories are automatically instrumented.
+2. Per-target instrumentation by calling `target_code_coverage(<TARGET_NAME>)`, where the target is given and thus only that target is instrumented. This applies to both libraries and executables.
+
+To add coverage targets, such as calling `make ccov` to generate the actual coverage information for perusal or consumption, call `target_code_coverage(<TARGET_NAME>)` on an *executable* target.
+
+**NOTE:** For more options, please check the actual [`code-coverage.cmake`](code-coverage.cmake) file.
+
+#### Example 1 - All targets instrumented
+
+In this case, the coverage information reported will will be that of the `theLib` library target and `theExe` executable.
+
+##### 1a - Via global command
+
+```
+add_code_coverage() # Adds instrumentation to all targets
+
+add_library(theLib lib.cpp)
+
+add_executable(theExe main.cpp)
+target_link_libraries(theExe PRIVATE theLib)
+target_code_coverage(theExe) # As an executable target, adds the 'ccov-theExe' target (instrumentation already added via global anyways) for generating code coverage reports.
+```
+
+##### 1b - Via target commands
+
+```
+add_library(theLib lib.cpp)
+target_code_coverage(theLib) # As a library target, adds coverage instrumentation but no targets.
+
+add_executable(theExe main.cpp)
+target_link_libraries(theExe PRIVATE theLib)
+target_code_coverage(theExe) # As an executable target, adds the 'ccov-theExe' target and instrumentation for generating code coverage reports.
+```
+
+#### Example 2: Target instrumented, but with regex pattern of files to be excluded from report
+
+```
+add_executable(theExe main.cpp non_covered.cpp)
+target_code_coverage(theExe EXCLUDE non_covered.cpp) # As an executable target, the reports will exclude the non-covered.cpp file.
+```
+
+#### Example 3: Target added to the 'ccov' and 'ccov-all' targets
+
+```
+add_code_coverage_all_targets(EXCLUDE test/*) # Adds the 'ccov-all' target set and sets it to exclude all files in test/ folders.
+
+add_executable(theExe main.cpp non_covered.cpp)
+target_code_coverage(theExe AUTO ALL EXCLUDE non_covered.cpp test/*) # As an executable target, adds to the 'ccov' and ccov-all' targets, and the reports will exclude the non-covered.cpp file, and any files in a test/ folder.
+```
+
+## Compiler Options [`compiler-options.cmake`](compiler-options.cmake)
+
+Allows for easy use of some pre-made compiler options for the major compilers.
+
+Using `-DENABLE_ALL_WARNINGS=ON` will enable almost all of the warnings available for a compiler:
+
+| Compiler | Options       |
+| :------- | :------------ |
+| MSVC     | /W4           |
+| GCC      | -Wall -Wextra |
+| Clang    | -Wall -Wextra |
+
+Using `-DENABLE_EFFECTIVE_CXX=ON` adds the `-Weffc++` for both GCC and clang.
+
+Using `-DGENERATE_DEPENDENCY_DATA=ON` generates `.d` files along with regular object files on a per-source file basis on GCC/Clang compilers. These files contains the list of all header files used during compilation of that compilation unit.
+
+## Dependency Graph [`dependency-graph.cmake`](dependency-graph.cmake)
+
+CMake, with the dot application available, will build a visual representation of the library/executable dependencies, like so:
+![Dependency Graph](img/dp-graph.png)
+
+### Required Arguments
+
+#### OUTPUT_TYPE *STR*
+The type of output of `dot` to produce. Can be whatever `dot` itself supports (eg. png, ps, pdf).
+
+### Optional Arguments
+
+#### ADD_TO_DEP_GRAPH
+If specified, add this generated target to be a dependency of the more general `dep-graph` target.
+
+#### TARGET_NAME *STR*
+The name to give the doc target. (Default: doc-${PROJECT_NAME})
+
+#### OUTPUT_DIR *STR*
+The directory to place the generated output
+
+## Doxygen [`doxygen.cmake`](doxygen.cmake)
+
+Builds doxygen documentation with a default 'Doxyfile.in' or with a specified one, and can make the results installable (under the `doc` install target)
+
+This can only be used once per project, as each target generated is as `doc-${PROJECT_NAME}` unless TARGET_NAME is specified.
+
+### Optional Arguments
+
+#### ADD_TO_DOC
+If specified, adds this generated target to be a dependency of the more general `doc` target.
+
+#### INSTALLABLE
+Adds the generated documentation to the generic `install` target, under the `documentation` installation group.
+
+#### PROCESS_DOXYFILE
+If set, then will process the found Doxyfile through the CMAKE `configure_file` function for macro replacements before using it. (@ONLY)
+
+#### TARGET_NAME *STR*
+The name to give the doc target. (Default: doc-${PROJECT_NAME})
+
+#### OUTPUT_DIR *STR*
+The directory to place the generated output. (Default: ${CMAKE_CURRENT_BINARY_DIR}/doc)
+
+#### INSTALL_PATH *STR*
+The path to install the documenttation under. (if not specified, defaults to 'share/${PROJECT_NAME})
+
+#### DOXYFILE_PATH *STR*
+The given doxygen file to use/process. (Defaults to'${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile')
+
+## Prepare the Catch Test Framework [`prepare_catch.cmake`](prepare_catch.cmake)
+
+The included `prepare_catch` function contained within attempts to add the infrastructure necessary for automatically adding C/C++ tests using the Catch2 library, including either an interface or pre-compiled 'catch' target library.
+
+It first attempts to find the header on the local machine, and failing that, clones the single header variant for use. It does make the determination between pre-C++11 and will use Catch1.X rather than Catch2 (when cloned), automatically or forced.. Adds a subdirectory of tests/ if it exists from the macro's calling location.
+
+### Optional Arguments
+
+#### COMPILED_CATCH
+If this option is specified, then generates the 'catch' target as a library with catch already pre-compiled as part of the library. Otherwise acts just an interface library for the header location.
+
+#### CATCH1
+Force the use of Catch1.X, rather than auto-detecting the C++ version in use.
+
+#### CLONE
+Force cloning of Catch, rather than attempting to use a locally-found variant.
+
+## Tools [`tools.cmake`](tools.cmake)
+
+### clang-tidy
+
+> clang-tidy is a clang-based C++ “linter” tool. Its purpose is to provide an extensible framework for diagnosing and fixing typical programming errors, like style violations, interface misuse, or bugs that can be deduced via static analysis. clang-tidy is modular and provides a convenient interface for writing new checks.
+>
+> [clang-tidy page](https://clang.llvm.org/extra/clang-tidy/)
+
+When detected, [clang-tidy](https://clang.llvm.org/extra/clang-tidy/) can be enabled by using the option of `-DCLANG_TIDY=ON`, as it is disabled by default.
+
+To use, add the `clang_tidy()` function, with the arguments being the options to pass to the clang tidy program, such as '-checks=*'.
+
+### include-what-you-use
+
+This tool helps to organize headers for all files encompass all items being used in that file, without accidentally relying upon headers deep down a chain of other headers. This is disabled by default, and can be enabled via have the program installed and adding `-DIWYU=ON`.
+
+To use, add the `include_what_you_use()` function, with the arguments being the options to pass to the program.
+
+### cppcheck
+
+This tool is another static analyzer in the vein of clang-tidy, which focuses on having no false positives. This is by default disabled, and can be enabled via have the program installed and adding `-DCPPCHECK=ON`.
+
+To use, add the `cppcheck()` function, with the arguments being the options to pass to the program.
+
+## Formatting [`formatting.cmake`](formatting.cmake)
+
+### clang-format
+
+Allows to automatically perform code formatting using the clang-format program, by calling an easy-to-use target ala `make format`. It requires a target name, and the list of files to format. As well, if the target name is the name of another target, then all files associated with that target will be added, and the target name changed to be `format_<TARGET>`. As well, any targets otherwise listed with the files will also have their files imported for formatting.
+
+```
+file(GLOB_RECURSE ALL_CODE_FILES
+    ${PROJECT_SOURCE_DIR}/src/*.[ch]pp
+    ${PROJECT_SOURCE_DIR}/src/*.[ch]
+    ${PROJECT_SOURCE_DIR}/include/*.[h]pp
+    ${PROJECT_SOURCE_DIR}/include/*.[h]
+    ${PROJECT_SOURCE_DIR}/example/*.[ch]pp
+    ${PROJECT_SOURCE_DIR}/example/*.[ch]
+)
+
+clang_format(TARGET_NAME ${ALL_CODE_FILES})
+```
+
+### cmake-format
+
+Similar to the clang-format above, creates a target `cmake-format` when the `cmake_format(<FILES>)` function is defined in CMake scripts, and any <FILES> passed in will be formatted by the cmake-format program, if it is found.
+
+```
+file(GLOB_RECURSE CMAKE_FILES
+    CMakeLists.txt
+)
+
+cmake_format(TARGET_NAME ${CMAKE_FILES})
+```
+\ No newline at end of file
diff --git a/config/sanitizer/code-coverage.cmake b/config/sanitizer/code-coverage.cmake
new file mode 100644
index 0000000..3a99024
--- /dev/null
+++ b/config/sanitizer/code-coverage.cmake
@@ -0,0 +1,537 @@
+#
+# Copyright (C) 2018 by George Cave - gcave@stablecoder.ca
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+# USAGE: To enable any code coverage instrumentation/targets, the single CMake
+# option of `CODE_COVERAGE` needs to be set to 'ON', either by GUI, ccmake, or
+# on the command line.
+#
+# From this point, there are two primary methods for adding instrumentation to
+# targets: 1 - A blanket instrumentation by calling `add_code_coverage()`, where
+# all targets in that directory and all subdirectories are automatically
+# instrumented. 2 - Per-target instrumentation by calling
+# `target_code_coverage(<TARGET_NAME>)`, where the target is given and thus only
+# that target is instrumented. This applies to both libraries and executables.
+#
+# To add coverage targets, such as calling `make ccov` to generate the actual
+# coverage information for perusal or consumption, call
+# `target_code_coverage(<TARGET_NAME>)` on an *executable* target.
+#
+# Example 1: All targets instrumented
+#
+# In this case, the coverage information reported will will be that of the
+# `theLib` library target and `theExe` executable.
+#
+# 1a: Via global command
+#
+# ~~~
+# add_code_coverage() # Adds instrumentation to all targets
+#
+# add_library(theLib lib.cpp)
+#
+# add_executable(theExe main.cpp)
+# target_link_libraries(theExe PRIVATE theLib)
+# target_code_coverage(theExe) # As an executable target, adds the 'ccov-theExe' target (instrumentation already added via global anyways) for generating code coverage reports.
+# ~~~
+#
+# 1b: Via target commands
+#
+# ~~~
+# add_library(theLib lib.cpp)
+# target_code_coverage(theLib) # As a library target, adds coverage instrumentation but no targets.
+#
+# add_executable(theExe main.cpp)
+# target_link_libraries(theExe PRIVATE theLib)
+# target_code_coverage(theExe) # As an executable target, adds the 'ccov-theExe' target and instrumentation for generating code coverage reports.
+# ~~~
+#
+# Example 2: Target instrumented, but with regex pattern of files to be excluded
+# from report
+#
+# ~~~
+# add_executable(theExe main.cpp non_covered.cpp)
+# target_code_coverage(theExe EXCLUDE non_covered.cpp test/*) # As an executable target, the reports will exclude the non-covered.cpp file, and any files in a test/ folder.
+# ~~~
+#
+# Example 3: Target added to the 'ccov' and 'ccov-all' targets
+#
+# ~~~
+# add_code_coverage_all_targets(EXCLUDE test/*) # Adds the 'ccov-all' target set and sets it to exclude all files in test/ folders.
+#
+# add_executable(theExe main.cpp non_covered.cpp)
+# target_code_coverage(theExe AUTO ALL EXCLUDE non_covered.cpp test/*) # As an executable target, adds to the 'ccov' and ccov-all' targets, and the reports will exclude the non-covered.cpp file, and any files in a test/ folder.
+# ~~~
+
+# Options
+option(
+  CODE_COVERAGE
+  "Builds targets with code coverage instrumentation. (Requires GCC or Clang)"
+  OFF)
+
+# Programs
+if(WIN32)
+  find_program(LLVM_COV_PATH llvm-cov PATHS ENV VS2019INSTALLDIR PATH_SUFFIXES "VC/Tools/Llvm/x64/bin")
+  find_program(LLVM_PROFDATA_PATH llvm-profdata PATHS ENV VS2019INSTALLDIR PATH_SUFFIXES "VC/Tools/Llvm/x64/bin")
+  find_program(LCOV_PATH lcov PATHS ENV VS2019INSTALLDIR PATH_SUFFIXES "VC/Tools/Llvm/x64/bin")
+  find_program(GENHTML_PATH genhtml PATHS ENV VS2019INSTALLDIR PATH_SUFFIXES "VC/Tools/Llvm/x64/bin")
+else()
+  find_program(LLVM_COV_PATH llvm-cov)
+  find_program(LLVM_PROFDATA_PATH llvm-profdata)
+  find_program(LCOV_PATH lcov)
+  find_program(GENHTML_PATH genhtml)
+endif()
+
+# Variables
+set(CMAKE_COVERAGE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/ccov)
+
+# Common initialization/checks
+if(CODE_COVERAGE AND NOT CODE_COVERAGE_ADDED)
+  set(CODE_COVERAGE_ADDED ON)
+
+  # Common Targets
+  add_custom_target(
+    ccov-preprocessing
+    COMMAND ${CMAKE_COMMAND} -E make_directory
+            ${CMAKE_COVERAGE_OUTPUT_DIRECTORY}
+    DEPENDS ccov-clean)
+
+  if(CMAKE_C_COMPILER_ID MATCHES "[Cc]lang" OR CMAKE_CXX_COMPILER_ID MATCHES "[Cc]lang")
+    # Messages
+    message(STATUS "Building with llvm Code Coverage Tools")
+
+    if(NOT LLVM_COV_PATH)
+      message(FATAL_ERROR "llvm-cov not found! Aborting.")
+    else()
+      # Version number checking for 'EXCLUDE' compatibility
+      execute_process(COMMAND ${LLVM_COV_PATH} --version
+                      OUTPUT_VARIABLE LLVM_COV_VERSION_CALL_OUTPUT)
+      string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" LLVM_COV_VERSION
+                   ${LLVM_COV_VERSION_CALL_OUTPUT})
+
+      if(LLVM_COV_VERSION VERSION_LESS "7.0.0")
+        message(
+          WARNING
+            "target_code_coverage()/add_code_coverage_all_targets() 'EXCLUDE' option only available on llvm-cov >= 7.0.0"
+        )
+      endif()
+    endif()
+
+    # Targets
+    add_custom_target(
+      ccov-clean
+      COMMAND rm -f ${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/binaries.list
+      COMMAND rm -f ${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/profraw.list)
+
+    # Used to get the shared object file list before doing the main all-
+    # processing
+    add_custom_target(
+      ccov-libs
+      COMMAND ;
+      COMMENT "libs ready for coverage report.")
+
+  elseif(CMAKE_C_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+    # Messages
+    message(STATUS "Building with lcov Code Coverage Tools")
+
+    if(CMAKE_BUILD_TYPE)
+      string(TOUPPER ${CMAKE_BUILD_TYPE} upper_build_type)
+      if(NOT ${upper_build_type} STREQUAL "DEBUG")
+        message(
+          WARNING
+            "Code coverage results with an optimized (non-Debug) build may be misleading"
+        )
+      endif()
+    else()
+      message(
+        WARNING
+          "Code coverage results with an optimized (non-Debug) build may be misleading"
+      )
+    endif()
+    if(NOT LCOV_PATH)
+      message(FATAL_ERROR "lcov not found! Aborting...")
+    endif()
+    if(NOT GENHTML_PATH)
+      message(FATAL_ERROR "genhtml not found! Aborting...")
+    endif()
+
+    # Targets
+    add_custom_target(ccov-clean COMMAND ${LCOV_PATH} --directory
+                                         ${CMAKE_BINARY_DIR} --zerocounters)
+
+  else()
+    set(CODE_COVERAGE_ADDED OFF)
+    message(STATUS "Code coverage requires Clang or GCC.(${CMAKE_C_COMPILER_ID})")
+  endif()
+endif()
+
+# Adds code coverage instrumentation to a library, or instrumentation/targets
+# for an executable target.
+# ~~~
+# EXECUTABLE ADDED TARGETS:
+# GCOV/LCOV:
+# ccov : Generates HTML code coverage report for every target added with 'AUTO' parameter.
+# ccov-${TARGET_NAME} : Generates HTML code coverage report for the associated named target.
+# ccov-all : Generates HTML code coverage report, merging every target added with 'ALL' parameter into a single detailed report.
+#
+# LLVM-COV:
+# ccov : Generates HTML code coverage report for every target added with 'AUTO' parameter.
+# ccov-report : Generates HTML code coverage report for every target added with 'AUTO' parameter.
+# ccov-${TARGET_NAME} : Generates HTML code coverage report.
+# ccov-report-${TARGET_NAME} : Prints to command line summary per-file coverage information.
+# ccov-show-${TARGET_NAME} : Prints to command line detailed per-line coverage information.
+# ccov-all : Generates HTML code coverage report, merging every target added with 'ALL' parameter into a single detailed report.
+# ccov-all-report : Prints summary per-file coverage information for every target added with ALL' parameter to the command line.
+#
+# Required:
+# TARGET_NAME - Name of the target to generate code coverage for.
+# Optional:
+# AUTO - Adds the target to the 'ccov' target so that it can be run in a batch with others easily. Effective on executable targets.
+# ALL - Adds the target to the 'ccov-all' and 'ccov-all-report' targets, which merge several executable targets coverage data to a single report. Effective on executable targets.
+# EXTERNAL - For GCC's lcov, allows the profiling of 'external' files from the processing directory
+# EXCLUDE <REGEX_PATTERNS> - Excludes files of the patterns provided from coverage. **These do not copy to the 'all' targets.**
+# OBJECTS <TARGETS> - For executables ONLY, if the provided targets are shared libraries, adds coverage information to the output
+# ~~~
+function(target_code_coverage TARGET_NAME)
+  # Argument parsing
+  set(options AUTO ALL EXTERNAL)
+  set(multi_value_keywords EXCLUDE OBJECTS)
+  cmake_parse_arguments(target_code_coverage "${options}" ""
+                        "${multi_value_keywords}" ${ARGN})
+
+  if(CODE_COVERAGE)
+
+    # Add code coverage instrumentation to the target's linker command
+    if(CMAKE_C_COMPILER_ID MATCHES "[Cc]lang" OR CMAKE_CXX_COMPILER_ID MATCHES "[Cc]lang")
+      target_compile_options(${TARGET_NAME} PRIVATE -fprofile-instr-generate
+                                                    -fcoverage-mapping --coverage)
+      set_property(
+        TARGET ${TARGET_NAME}
+        APPEND_STRING
+        PROPERTY LINK_FLAGS "-fprofile-instr-generate ")
+      set_property(
+        TARGET ${TARGET_NAME}
+        APPEND_STRING
+        PROPERTY LINK_FLAGS "-fcoverage-mapping ")
+    elseif(CMAKE_C_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+      target_compile_options(${TARGET_NAME} PRIVATE -fprofile-arcs
+                                                    -ftest-coverage --coverage)
+      target_link_libraries(${TARGET_NAME} PRIVATE gcov)
+    endif()
+
+    # Targets
+    get_target_property(target_type ${TARGET_NAME} TYPE)
+
+    # Add shared library to processing for 'all' targets
+    if(target_type STREQUAL "SHARED_LIBRARY" AND target_code_coverage_ALL)
+      if(CMAKE_C_COMPILER_ID MATCHES "[Cc]lang" OR CMAKE_CXX_COMPILER_ID MATCHES "[Cc]lang")
+        add_custom_target(
+          ccov-run-${TARGET_NAME}
+          COMMAND echo "-object=$<TARGET_FILE:${TARGET_NAME}>" >>
+                  ${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/binaries.list
+          DEPENDS ccov-preprocessing ${TARGET_NAME})
+
+        if(NOT TARGET ccov-libs)
+          message(
+            FATAL_ERROR
+              "Calling target_code_coverage with 'ALL' must be after a call to 'add_code_coverage_all_targets'."
+          )
+        endif()
+
+        add_dependencies(ccov-libs ccov-run-${TARGET_NAME})
+      endif()
+    endif()
+
+    # For executables add targets to run and produce output
+    if(target_type STREQUAL "EXECUTABLE")
+      if(CMAKE_C_COMPILER_ID MATCHES "[Cc]lang" OR CMAKE_CXX_COMPILER_ID MATCHES "(Apple)?Cc]lang")
+
+        # If there are shared objects to also work with, generate the string to
+        # add them here
+        foreach(SO_TARGET ${target_code_coverage_OBJECTS})
+          # Check to see if the target is a shared object
+          if(TARGET ${SO_TARGET})
+            get_target_property(SO_TARGET_TYPE ${SO_TARGET} TYPE)
+            if(${SO_TARGET_TYPE} STREQUAL "SHARED_LIBRARY")
+              set(SO_OBJECTS ${SO_OBJECTS} -object=$<TARGET_FILE:${SO_TARGET}>)
+            endif()
+          endif()
+        endforeach()
+
+        # Run the executable, generating raw profile data
+        add_custom_target(
+          ccov-run-${TARGET_NAME}
+          COMMAND LLVM_PROFILE_FILE=${TARGET_NAME}.profraw
+                  $<TARGET_FILE:${TARGET_NAME}>
+          COMMAND echo "-object=$<TARGET_FILE:${TARGET_NAME}>" >>
+                  ${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/binaries.list
+          COMMAND echo "${CMAKE_CURRENT_BINARY_DIR}/${TARGET_NAME}.profraw " >>
+                  ${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/profraw.list
+          DEPENDS ccov-preprocessing ccov-libs ${TARGET_NAME})
+
+        # Merge the generated profile data so llvm-cov can process it
+        add_custom_target(
+          ccov-processing-${TARGET_NAME}
+          COMMAND ${LLVM_PROFDATA_PATH} merge -sparse ${TARGET_NAME}.profraw -o
+                  ${TARGET_NAME}.profdata
+          DEPENDS ccov-run-${TARGET_NAME})
+
+        # Ignore regex only works on LLVM >= 7
+        if(LLVM_COV_VERSION VERSION_GREATER_EQUAL "7.0.0")
+          foreach(EXCLUDE_ITEM ${target_code_coverage_EXCLUDE})
+            set(EXCLUDE_REGEX ${EXCLUDE_REGEX}
+                              -ignore-filename-regex='${EXCLUDE_ITEM}')
+          endforeach()
+        endif()
+
+        # Print out details of the coverage information to the command line
+        add_custom_target(
+          ccov-show-${TARGET_NAME}
+          COMMAND
+            ${LLVM_COV_PATH} show $<TARGET_FILE:${TARGET_NAME}> ${SO_OBJECTS}
+            -instr-profile=${TARGET_NAME}.profdata -show-line-counts-or-regions
+            ${EXCLUDE_REGEX}
+          DEPENDS ccov-processing-${TARGET_NAME})
+
+        # Print out a summary of the coverage information to the command line
+        add_custom_target(
+          ccov-report-${TARGET_NAME}
+          COMMAND ${LLVM_COV_PATH} report $<TARGET_FILE:${TARGET_NAME}>
+                  ${SO_OBJECTS} -instr-profile=${TARGET_NAME}.profdata
+                  ${EXCLUDE_REGEX}
+          DEPENDS ccov-processing-${TARGET_NAME})
+
+        # Generates HTML output of the coverage information for perusal
+        add_custom_target(
+          ccov-${TARGET_NAME}
+          COMMAND
+            ${LLVM_COV_PATH} show $<TARGET_FILE:${TARGET_NAME}> ${SO_OBJECTS}
+            -instr-profile=${TARGET_NAME}.profdata -show-line-counts-or-regions
+            -output-dir=${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/${TARGET_NAME}
+            -format="html" ${EXCLUDE_REGEX}
+          DEPENDS ccov-processing-${TARGET_NAME})
+
+      elseif(CMAKE_C_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+        set(COVERAGE_INFO
+            "${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/${TARGET_NAME}.info")
+
+        # Run the executable, generating coverage information
+        add_custom_target(
+          ccov-run-${TARGET_NAME}
+          COMMAND $<TARGET_FILE:${TARGET_NAME}>
+          DEPENDS ccov-preprocessing ${TARGET_NAME})
+
+        # Generate exclusion string for use
+        foreach(EXCLUDE_ITEM ${target_code_coverage_EXCLUDE})
+          set(EXCLUDE_REGEX ${EXCLUDE_REGEX} --remove ${COVERAGE_INFO}
+                            '${EXCLUDE_ITEM}')
+        endforeach()
+
+        if(EXCLUDE_REGEX)
+          set(EXCLUDE_COMMAND ${LCOV_PATH} ${EXCLUDE_REGEX} --output-file
+                              ${COVERAGE_INFO})
+        else()
+          set(EXCLUDE_COMMAND ;)
+        endif()
+
+        if(NOT ${target_code_coverage_EXTERNAL})
+          set(EXTERNAL_OPTION --no-external)
+        endif()
+
+        # Capture coverage data
+        add_custom_target(
+          ccov-capture-${TARGET_NAME}
+          COMMAND ${CMAKE_COMMAND} -E remove ${COVERAGE_INFO}
+          COMMAND ${LCOV_PATH} --directory ${CMAKE_BINARY_DIR} --zerocounters
+          COMMAND $<TARGET_FILE:${TARGET_NAME}>
+          COMMAND
+            ${LCOV_PATH} --directory ${CMAKE_BINARY_DIR} --base-directory
+            ${CMAKE_SOURCE_DIR} --capture ${EXTERNAL_OPTION} --output-file
+            ${COVERAGE_INFO}
+          COMMAND ${EXCLUDE_COMMAND}
+          DEPENDS ccov-preprocessing ${TARGET_NAME})
+
+        # Generates HTML output of the coverage information for perusal
+        add_custom_target(
+          ccov-${TARGET_NAME}
+          COMMAND ${GENHTML_PATH} -o
+                  ${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/${TARGET_NAME}
+                  ${COVERAGE_INFO}
+          DEPENDS ccov-capture-${TARGET_NAME})
+      endif()
+
+      add_custom_command(
+        TARGET ccov-${TARGET_NAME}
+        POST_BUILD
+        COMMAND ;
+        COMMENT
+          "Open ${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/${TARGET_NAME}/index.html in your browser to view the coverage report."
+      )
+
+      # AUTO
+      if(target_code_coverage_AUTO)
+        if(NOT TARGET ccov)
+          add_custom_target(ccov)
+        endif()
+        add_dependencies(ccov ccov-${TARGET_NAME})
+
+        if(NOT CMAKE_COMPILER_IS_GNUCXX)
+          if(NOT TARGET ccov-report)
+            add_custom_target(ccov-report)
+          endif()
+          add_dependencies(ccov-report ccov-report-${TARGET_NAME})
+        endif()
+      endif()
+
+      # ALL
+      if(target_code_coverage_ALL)
+        if(NOT TARGET ccov-all-processing)
+          message(
+            FATAL_ERROR
+              "Calling target_code_coverage with 'ALL' must be after a call to 'add_code_coverage_all_targets'."
+          )
+        endif()
+
+        add_dependencies(ccov-all-processing ccov-run-${TARGET_NAME})
+      endif()
+    endif()
+  endif()
+endfunction()
+
+# Adds code coverage instrumentation to all targets in the current directory and
+# any subdirectories. To add coverage instrumentation to only specific targets,
+# use `target_code_coverage`.
+function(add_code_coverage)
+  if(CMAKE_C_COMPILER_ID MATCHES "[Cc]lang" OR CMAKE_CXX_COMPILER_ID MATCHES "[Cc]lang")
+    add_compile_options(-fprofile-instr-generate -fcoverage-mapping --coverage)
+    add_link_options(-fprofile-instr-generate -fcoverage-mapping --coverage)
+  elseif(CMAKE_C_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+    add_compile_options(-fprofile-arcs -ftest-coverage --coverage)
+    link_libraries(gcov)
+  endif()
+endfunction()
+
+# Adds the 'ccov-all' type targets that calls all targets added via
+# `target_code_coverage` with the `ALL` parameter, but merges all the coverage
+# data from them into a single large report  instead of the numerous smaller
+# reports. Also adds the ccov-all-capture Generates an all-merged.info file, for
+# use with coverage dashboards (e.g. codecov.io, coveralls).
+# ~~~
+# Optional:
+# EXCLUDE <REGEX_PATTERNS> - Excludes files of the regex patterns provided from coverage.
+# ~~~
+function(add_code_coverage_all_targets)
+  # Argument parsing
+  set(multi_value_keywords EXCLUDE)
+  cmake_parse_arguments(add_code_coverage_all_targets "" ""
+                        "${multi_value_keywords}" ${ARGN})
+
+  if(CODE_COVERAGE)
+    if(CMAKE_C_COMPILER_ID MATCHES "[Cc]lang" OR CMAKE_CXX_COMPILER_ID MATCHES "[Cc]lang")
+
+      # Merge the profile data for all of the run executables
+      add_custom_target(
+        ccov-all-processing
+        COMMAND
+          ${LLVM_PROFDATA_PATH} merge -o
+          ${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/all-merged.profdata -sparse `cat
+          ${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/profraw.list`)
+
+      # Regex exclude only available for LLVM >= 7
+      if(LLVM_COV_VERSION VERSION_GREATER_EQUAL "7.0.0")
+        foreach(EXCLUDE_ITEM ${add_code_coverage_all_targets_EXCLUDE})
+          set(EXCLUDE_REGEX ${EXCLUDE_REGEX}
+                            -ignore-filename-regex='${EXCLUDE_ITEM}')
+        endforeach()
+      endif()
+
+      # Print summary of the code coverage information to the command line
+      add_custom_target(
+        ccov-all-report
+        COMMAND
+          ${LLVM_COV_PATH} report `cat
+          ${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/binaries.list`
+          -instr-profile=${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/all-merged.profdata
+          ${EXCLUDE_REGEX}
+        DEPENDS ccov-all-processing)
+
+      # Export coverage information so continuous integration tools (e.g.
+      # Jenkins) can consume it
+      add_custom_target(
+        ccov-all-export
+        COMMAND
+          ${LLVM_COV_PATH} export `cat
+          ${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/binaries.list`
+          -instr-profile=${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/all-merged.profdata
+          -format="text" ${EXCLUDE_REGEX} >
+          ${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/coverage.json
+        DEPENDS ccov-all-processing)
+
+      # Generate HTML output of all added targets for perusal
+      add_custom_target(
+        ccov-all
+        COMMAND
+          ${LLVM_COV_PATH} show `cat
+          ${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/binaries.list`
+          -instr-profile=${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/all-merged.profdata
+          -show-line-counts-or-regions
+          -output-dir=${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/all-merged
+          -format="html" ${EXCLUDE_REGEX}
+        DEPENDS ccov-all-processing)
+
+    elseif(CMAKE_C_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+      set(COVERAGE_INFO "${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/all-merged.info")
+
+      # Nothing required for gcov
+      add_custom_target(ccov-all-processing COMMAND ;)
+
+      # Exclusion regex string creation
+      foreach(EXCLUDE_ITEM ${add_code_coverage_all_targets_EXCLUDE})
+        set(EXCLUDE_REGEX ${EXCLUDE_REGEX} --remove ${COVERAGE_INFO}
+                          '${EXCLUDE_ITEM}')
+      endforeach()
+
+      if(EXCLUDE_REGEX)
+        set(EXCLUDE_COMMAND ${LCOV_PATH} ${EXCLUDE_REGEX} --output-file
+                            ${COVERAGE_INFO})
+      else()
+        set(EXCLUDE_COMMAND ;)
+      endif()
+
+      # Capture coverage data
+      add_custom_target(
+        ccov-all-capture
+        COMMAND ${CMAKE_COMMAND} -E remove ${COVERAGE_INFO}
+        COMMAND ${LCOV_PATH} --directory ${CMAKE_BINARY_DIR} --capture
+                --output-file ${COVERAGE_INFO}
+        COMMAND ${EXCLUDE_COMMAND}
+        DEPENDS ccov-all-processing)
+
+      # Generates HTML output of all targets for perusal
+      add_custom_target(
+        ccov-all
+        COMMAND ${GENHTML_PATH} -o ${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/all-merged
+                ${COVERAGE_INFO}
+        DEPENDS ccov-all-capture)
+
+    endif()
+
+    add_custom_command(
+      TARGET ccov-all
+      POST_BUILD
+      COMMAND ;
+      COMMENT
+        "Open ${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/all-merged/index.html in your browser to view the coverage report."
+    )
+  endif()
+endfunction()
diff --git a/config/sanitizer/formatting.cmake b/config/sanitizer/formatting.cmake
new file mode 100644
index 0000000..5aaa2a6
--- /dev/null
+++ b/config/sanitizer/formatting.cmake
@@ -0,0 +1,92 @@
+#
+# Copyright (C) 2019 by George Cave - gcave@stablecoder.ca
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+#
+# clang-format
+#
+find_program(CLANG_FORMAT_EXE "clang-format")
+mark_as_advanced(FORCE CLANG_FORMAT_EXE)
+if(CLANG_FORMAT_EXE)
+  message(STATUS "clang-format found: ${CLANG_FORMAT_EXE}")
+else()
+  message(STATUS "clang-format not found!")
+endif()
+
+# Generates a 'format' target using a custom name, files, and include
+# directories all being parameters.
+#
+# Do note that in order for sources to be inherited properly, the source paths
+# must be reachable from where the macro is called, or otherwise require a full
+# path for proper inheritance.
+#
+# ~~~
+# Required:
+# TARGET_NAME - The name of the target to create.
+#
+# Optional: ARGN - The list of targets OR files to format. Relative and absolute
+# paths are accepted.
+# ~~~
+function(clang_format TARGET_NAME)
+  if(CLANG_FORMAT_EXE)
+    set(FORMAT_FILES)
+    # Check through the ARGN's, determine existent files
+    foreach(item IN LISTS ARGN)
+      if(TARGET ${item})
+        # If the item is a target, then we'll attempt to grab the associated
+        # source files from it.
+        get_target_property(_TARGET_TYPE ${item} TYPE)
+        if(NOT
+           _TARGET_TYPE
+           STREQUAL
+           "INTERFACE_LIBRARY")
+          get_property(
+            _TEMP
+            TARGET ${item}
+            PROPERTY SOURCES)
+          foreach(iter IN LISTS _TEMP)
+            if(EXISTS ${iter})
+              set(FORMAT_FILES ${FORMAT_FILES} ${iter})
+            endif()
+          endforeach()
+        endif()
+      elseif(EXISTS ${item})
+        # Check if it's a full file path
+        set(FORMAT_FILES ${FORMAT_FILES} ${item})
+      elseif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${item})
+        # Check if it's based on the current source dir
+        set(FORMAT_FILES ${FORMAT_FILES} ${CMAKE_CURRENT_SOURCE_DIR}/${item})
+      endif()
+    endforeach()
+
+    # Make the target
+    if(FORMAT_FILES)
+      if(TARGET ${TARGET_NAME})
+        message(
+          ERROR
+          "Cannot create clang-format target '${TARGET_NAME}', already exists.")
+      else()
+        add_custom_target(${TARGET_NAME} COMMAND ${CLANG_FORMAT_EXE} -i -style=file ${FORMAT_FILES})
+
+        if(NOT TARGET format)
+          add_custom_target(format)
+        endif()
+
+        add_dependencies(format ${TARGET_NAME})
+      endif()
+    endif()
+
+  endif()
+endfunction()
+
diff --git a/config/sanitizer/sanitizers.cmake b/config/sanitizer/sanitizers.cmake
new file mode 100644
index 0000000..b06992f
--- /dev/null
+++ b/config/sanitizer/sanitizers.cmake
@@ -0,0 +1,103 @@
+#
+# Copyright (C) 2018 by George Cave - gcave@stablecoder.ca
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+set(USE_SANITIZER
+    ""
+    CACHE
+      STRING
+      "Compile with a sanitizer. Options are: Address, Memory, MemoryWithOrigins, Undefined, Thread, Leak, 'Address;Undefined'"
+)
+
+function(append value)
+  foreach(variable ${ARGN})
+    set(${variable}
+        "${${variable}} ${value}"
+        PARENT_SCOPE)
+  endforeach(variable)
+endfunction()
+
+message(STATUS "USE_SANITIZER=${USE_SANITIZER}, CMAKE_C_COMPILER_ID=${CMAKE_C_COMPILER_ID}")
+if(USE_SANITIZER)
+  if(INTEL_CLANG OR CMAKE_C_COMPILER_ID MATCHES "[Cc]lang")
+    set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
+    if(UNIX)
+      append("-fno-omit-frame-pointer" CMAKE_C_SANITIZER_FLAGS CMAKE_CXX_SANITIZER_FLAGS)
+      message(STATUS "Building with sanitize, base flags=${CMAKE_C_SANITIZER_FLAGS}")
+
+      if(uppercase_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
+        append("-O1" CMAKE_C_SANITIZER_FLAGS CMAKE_CXX_SANITIZER_FLAGS)
+      endif()
+
+      if(USE_SANITIZER MATCHES "([Aa]ddress);([Uu]ndefined)"
+         OR USE_SANITIZER MATCHES "([Uu]ndefined);([Aa]ddress)")
+        message(STATUS "Building with Address, Undefined sanitizers")
+        append("-fsanitize=address,undefined" CMAKE_C_SANITIZER_FLAGS CMAKE_CXX_SANITIZER_FLAGS)
+        set(MEMCHECK_TYPE AddressSanitizer)
+      elseif(USE_SANITIZER MATCHES "([Aa]ddress)")
+        # Optional: -fno-optimize-sibling-calls -fsanitize-address-use-after-scope
+        message(STATUS "Building with Address sanitizer")
+        append("-fsanitize=address" CMAKE_C_SANITIZER_FLAGS CMAKE_CXX_SANITIZER_FLAGS)
+        set(MEMCHECK_TYPE AddressSanitizer)
+      elseif(USE_SANITIZER MATCHES "([Mm]emory([Ww]ith[Oo]rigins)?)")
+        # Optional: -fno-optimize-sibling-calls -fsanitize-memory-track-origins=2
+        append("-fsanitize=memory" CMAKE_C_SANITIZER_FLAGS CMAKE_CXX_SANITIZER_FLAGS)
+        if(USE_SANITIZER MATCHES "([Mm]emory[Ww]ith[Oo]rigins)")
+          message(STATUS "Building with MemoryWithOrigins sanitizer")
+          append("-fsanitize-memory-track-origins" CMAKE_C_SANITIZER_FLAGS CMAKE_CXX_SANITIZER_FLAGS)
+        else()
+          message(STATUS "Building with Memory sanitizer")
+        endif()
+        set(MEMCHECK_TYPE MemorySanitizer)
+      elseif(USE_SANITIZER MATCHES "([Uu]ndefined)")
+        message(STATUS "Building with Undefined sanitizer")
+        append("-fsanitize=undefined" CMAKE_C_SANITIZER_FLAGS CMAKE_CXX_SANITIZER_FLAGS)
+        if(EXISTS "${BLACKLIST_FILE}")
+          append("-fsanitize-blacklist=${BLACKLIST_FILE}" CMAKE_C_SANITIZER_FLAGS CMAKE_CXX_SANITIZER_FLAGS)
+        endif()
+        set(MEMCHECK_TYPE UndefinedBehaviorSanitizer)
+      elseif(USE_SANITIZER MATCHES "([Tt]hread)")
+        message(STATUS "Building with Thread sanitizer")
+        append("-fsanitize=thread" CMAKE_C_SANITIZER_FLAGS CMAKE_CXX_SANITIZER_FLAGS)
+        set(MEMCHECK_TYPE ThreadSanitizer)
+      elseif(USE_SANITIZER MATCHES "([Ll]eak)")
+        message(STATUS "Building with Leak sanitizer")
+        append("-fsanitize=leak" CMAKE_C_SANITIZER_FLAGS CMAKE_CXX_SANITIZER_FLAGS)
+       set(MEMCHECK_TYPE LeakSanitizer)
+      else()
+        message(
+          FATAL_ERROR "Unsupported value of USE_SANITIZER: ${USE_SANITIZER}")
+      endif()
+    elseif(MSVC)
+      if(USE_SANITIZER MATCHES "([Aa]ddress)")
+        message(STATUS "Building with Address sanitizer")
+        append("-fsanitize=address" CMAKE_C_SANITIZER_FLAGS CMAKE_CXX_SANITIZER_FLAGS)
+      else()
+        message(FATAL_ERROR "This sanitizer not yet supported in the MSVC environment: ${USE_SANITIZER}")
+      endif()
+    else()
+      message(FATAL_ERROR "USE_SANITIZER is not supported on this platform.")
+    endif()
+  elseif(MSVC)
+    if(USE_SANITIZER MATCHES "([Aa]ddress)")
+      message(STATUS "Building with Address sanitizer")
+      append("/fsanitize=address" CMAKE_C_SANITIZER_FLAGS CMAKE_CXX_SANITIZER_FLAGS)
+    else()
+      message(FATAL_ERROR "This sanitizer not yet supported in the MSVC environment: ${USE_SANITIZER}")
+    endif()
+  else()
+    message(FATAL_ERROR "USE_SANITIZER is not supported on this platform.")
+  endif()
+endif()
diff --git a/config/sanitizer/tools.cmake b/config/sanitizer/tools.cmake
new file mode 100644
index 0000000..3a41ad4
--- /dev/null
+++ b/config/sanitizer/tools.cmake
@@ -0,0 +1,114 @@
+#
+# Copyright (C) 2018-2020 by George Cave - gcave@stablecoder.ca
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+option(CLANG_TIDY "Turns on clang-tidy processing if it is found." OFF)
+option(IWYU "Turns on include-what-you-use processing if it is found." OFF)
+option(CPPCHECK "Turns on cppcheck processing if it is found." OFF)
+
+# Adds clang-tidy checks to the compilation, with the given arguments being used
+# as the options set.
+macro(clang_tidy)
+  if(CLANG_TIDY AND CLANG_TIDY_EXE)
+    set(CMAKE_CXX_CLANG_TIDY ${CLANG_TIDY_EXE} ${ARGN})
+  endif()
+endmacro()
+
+# Adds include_what_you_use to the compilation, with the given arguments being
+# used as the options set.
+macro(include_what_you_use)
+  if(IWYU AND IWYU_EXE)
+    set(CMAKE_CXX_INCLUDE_WHAT_YOU_USE ${IWYU_EXE} ${ARGN})
+  endif()
+endmacro()
+
+# Adds cppcheck to the compilation, with the given arguments being used as the
+# options set.
+macro(cppcheck)
+  if(CPPCHECK AND CPPCHECK_EXE)
+    set(CMAKE_CXX_CPPCHECK ${CPPCHECK_EXE} ${ARGN})
+  endif()
+endmacro()
+
+find_program(CLANG_TIDY_EXE NAMES "clang-tidy")
+mark_as_advanced(FORCE CLANG_TIDY_EXE)
+if(CLANG_TIDY_EXE)
+  message(STATUS "clang-tidy found: ${CLANG_TIDY_EXE}")
+  if(NOT CLANG_TIDY)
+    message(STATUS "clang-tidy NOT ENABLED via 'CLANG_TIDY' variable!")
+    set(CMAKE_CXX_CLANG_TIDY
+        ""
+        CACHE STRING "" FORCE) # delete it
+  endif()
+elseif(CLANG_TIDY)
+  message(SEND_ERROR "Cannot enable clang-tidy, as executable not found!")
+  set(CMAKE_CXX_CLANG_TIDY
+      ""
+      CACHE STRING "" FORCE) # delete it
+else()
+  message(STATUS "clang-tidy not found!")
+  set(CMAKE_CXX_CLANG_TIDY
+      ""
+      CACHE STRING "" FORCE) # delete it
+endif()
+
+find_program(IWYU_EXE NAMES "include-what-you-use")
+mark_as_advanced(FORCE IWYU_EXE)
+if(IWYU_EXE)
+  message(STATUS "include-what-you-use found: ${IWYU_EXE}")
+  if(NOT IWYU)
+    message(STATUS "include-what-you-use NOT ENABLED via 'IWYU' variable!")
+    set(CMAKE_CXX_INCLUDE_WHAT_YOU_USE
+        ""
+        CACHE STRING "" FORCE) # delete it
+  endif()
+elseif(IWYU)
+  message(
+    SEND_ERROR "Cannot enable include-what-you-use, as executable not found!")
+  set(CMAKE_CXX_INCLUDE_WHAT_YOU_USE
+      ""
+      CACHE STRING "" FORCE) # delete it
+else()
+  message(STATUS "include-what-you-use not found!")
+  set(CMAKE_CXX_INCLUDE_WHAT_YOU_USE
+      ""
+      CACHE STRING "" FORCE) # delete it
+endif()
+
+find_program(CPPCHECK_EXE NAMES "cppcheck")
+mark_as_advanced(FORCE CPPCHECK_EXE)
+if(CPPCHECK_EXE)
+  message(STATUS "cppcheck found: ${CPPCHECK_EXE}")
+  if(CPPCHECK)
+    set(CMAKE_CXX_CPPCHECK
+        "${CPPCHECK_EXE};--enable=warning,performance,portability,missingInclude;--template=\"[{severity}][{id}] {message} {callstack} \(On {file}:{line}\)\";--suppress=missingIncludeSystem;--quiet;--verbose;--force"
+    )
+  endif()
+  if(NOT CPPCHECK)
+    message(STATUS "cppcheck NOT ENABLED via 'CPPCHECK' variable!")
+    set(CMAKE_CXX_CPPCHECK
+        ""
+        CACHE STRING "" FORCE) # delete it
+  endif()
+elseif(CPPCHECK)
+  message(SEND_ERROR "Cannot enable cppcheck, as executable not found!")
+  set(CMAKE_CXX_CPPCHECK
+      ""
+      CACHE STRING "" FORCE) # delete it
+else()
+  message(STATUS "cppcheck not found!")
+  set(CMAKE_CXX_CPPCHECK
+      ""
+      CACHE STRING "" FORCE) # delete it
+endif()
diff --git a/config/site-specific/BlankForm b/config/site-specific/BlankForm
index c31383c..a5e8921 100644
--- a/config/site-specific/BlankForm
+++ b/config/site-specific/BlankForm
@@ -1,17 +1,14 @@
 #							-*- shell-script -*-
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 
 
 # This file is part of the HDF5 build script. It is processed shortly
diff --git a/config/solaris b/config/solaris
new file mode 100644
index 0000000..e99a2bc
--- /dev/null
+++ b/config/solaris
@@ -0,0 +1,216 @@
+#							-*- shell-script -*-
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+
+
+# This file is part of the HDF5 build script.  It is processed shortly
+# after configure starts and defines, among other things, flags for
+# the various compile modes.
+#
+# See BlankForm in this directory for details
+
+# The default compiler is `sunpro cc'
+if test "X-" =  "X-$CC"; then
+  CC=cc
+  CC_BASENAME=cc
+fi
+
+# Try gcc compiler flags
+. $srcdir/config/gnu-flags
+
+# Try solaris native compiler flags
+if test "X-" = "X-$cc_flags_set"; then
+  # HDF5 must be built with a C99 compiler on Solaris
+  # -erroff=%none turns on all warnings
+  H5_CFLAGS="$H5_CFLAGS -xc99=all -erroff=%none"
+
+  # Production
+  # NDEBUG is handled explicitly by the configure script
+  PROD_CFLAGS=
+
+  # Debug
+  # NDEBUG is handled explicitly by the configure script
+  # -g is handled by the symbols flags
+  DEBUG_CFLAGS=
+
+  # Symbols
+  # -g produces output for dbx, NOT gdb. You can use "gdb on" from
+  # inside gdb to use gdb commands if you need to debug.
+  # If you want a LOT of debugging information (at the expense of
+  # really slow code), try using -g3. That will even let you debug
+  # into macros.
+  # -s strips symbols, as in gcc
+  NO_SYMBOLS_CFLAGS="-s"
+  SYMBOLS_CFLAGS="-g"
+
+  # Profile
+  # This produces profiling output for gprof. If you want to use
+  # the Solaris profiler, use -xprofile instead.
+  PROFILE_CFLAGS="-xpg"
+
+  # Optimization
+  # -O has switched to -xO{1|2|3|4|5}. -xO3 is probably a good compromise
+  # for the daily tests, but you might want to switch to -xO2 or lower
+  # if you are actively debugging.
+  HIGH_OPT_CFLAGS="-xO5"
+  DEBUG_OPT_CFLAGS="-xO3"
+  NO_OPT_CFLAGS=
+
+  cc_flags_set=yes
+    # Special linking flag is needed to build with Fortran on Solaris 5.9
+    system_version="`uname -r`"
+    case "$system_version" in
+	5.9*)
+	    # Need the xopenmp flag to build the Fortran library
+	    if test X-$enable_fortran = X-yes; then
+		AM_LDFLAGS="$AM_LDFLAGS -xopenmp=stubs"
+	    fi
+	    ;;
+    esac
+
+fi
+
+LIBS="$LIBS"
+
+# The default Fortran 90 compiler
+
+if test "X-" = "X-$FC"; then
+  FC=f90
+fi
+
+if test "X-" = "X-$f9x_flags_set"; then
+  F9XSUFFIXFLAG=""
+  FSEARCH_DIRS=""
+
+  H5_FCFLAGS="$H5_FCFLAGS"
+
+  # TODO: Revisit these flags.
+
+  # Production
+  # NDEBUG is handled explicitly by the configure script
+  PROD_FCFLAGS=
+
+  # Debug
+  # NDEBUG is handled explicitly by the configure script
+  # -g is handled by the symbols flags
+  DEBUG_FCFLAGS=
+
+  # Symbols
+  NO_SYMBOLS_FCFLAGS=
+  SYMBOLS_FCFLAGS="-g"
+
+  # Profile
+  PROFILE_FCFLAGS=
+
+  # Optimization
+  # -g produces rather slow code. "-g -O" produces much faster code with some
+  # loss of debugger functions such as not able to print local variables.
+  HIGH_OPT_FCFLAGS="-O2"
+  DEBUG_OPT_FCFLAGS="-O"
+  NO_OPT_FCFLAGS=
+
+  f9x_flags_set=yes
+fi
+
+# The default C++ compiler
+
+# The default compiler is `sunpro cc'
+if test -z "$CXX"; then
+  CXX=CC
+  CXX_BASENAME=CC
+fi
+
+# Try gcc compiler flags
+#. $srcdir/config/gnu-flags
+
+cxx_version="`$CXX -V 2>&1 |grep 'WorkShop' |\
+                sed 's/.*WorkShop.*C++ \([0-9\.]*\).*/\1/'`"
+
+cxx_vers_major=`echo $cxx_version | cut -f1 -d.`
+cxx_vers_minor=`echo $cxx_version | cut -f2 -d.`
+cxx_vers_patch=`echo $cxx_version | cut -f3 -d.`
+
+# Specify the "-features=tmplife" if the compiler can handle this...
+if test -n "$cxx_version"; then
+  if test $cxx_vers_major -ge 5 -a $cxx_vers_minor -ge 3 -o $cxx_vers_major -gt 5; then
+    H5_CXXFLAGS="$H5_CXXFLAGS -features=tmplife"
+  fi
+fi
+
+# Try solaris native compiler flags
+if test -z "$cxx_flags_set"; then
+  H5_CXXFLAGS="$H5_CXXFLAGS -instances=static"
+  H5_CPPFLAGS="$H5_CPPFLAGS -LANG:std"
+
+  # Production
+  # NDEBUG is handled explicitly by the configure script
+  PROD_CXXFLAGS=
+
+  # Debug
+  # NDEBUG is handled explicitly by the configure script
+  # -g is handled by the symbols flags
+  DEBUG_CXXFLAGS=
+
+  # Symbols
+  NO_SYMBOLS_CXXFLAGS="-s"
+  SYMBOLS_CXXFLAGS="-g"
+
+  # Profile
+  PROFILE_CXXFLAGS="-xpg"
+
+  # Optimization
+  # -g produces rather slow code. "-g -O" produces much faster code with some
+  # loss of debugger functions such as not able to print local variables.
+  HIGH_OPT_CXXFLAGS="-O"
+  DEBUG_OPT_CXXFLAGS="-O"
+  NO_OPT_CXXFLAGS=
+
+  cxx_flags_set=yes
+fi
+
+# compiler version strings
+case $CC in
+    *cc*)
+        cc_version_info=`$CC $CFLAGS $H5_CFLAGS -V 2>&1 | grep 'Sun' |\
+            sed 's/.*\(Sun .*\)/\1 /'`
+        ;;
+
+    *)
+        echo "No match to get cc_version_info for $CC"
+        ;;
+esac
+echo "C compiler '$CC' is $cc_version_info"
+
+case $FC in
+    # The PGI and Intel compilers are automatically detected below
+    *f90*)
+        fc_version_info=`$FC $FCFLAGS $H5_FCFLAGS -V 2>&1 | grep 'Sun' |\
+            sed 's/.*\(Sun .*\)/\1 /'`
+        ;;
+
+     *)
+        echo "No match to get fc_version_info for $FC"
+        ;;
+esac
+echo "Fortran compiler '$FC' is $fc_version_info"
+
+# get c++ version info
+case $CXX in
+    *CC*)
+        cxx_version_info=`$CXX $CXXFLAGS $H5_CXXFLAGS -V 2>&1 | grep 'Sun' |\
+            sed 's/.*\(Sun .*\)/\1 /'`
+        ;;
+
+    *)
+        echo "No match to get cxx_version_info for $CXX"
+        ;;
+esac
+
diff --git a/config/solaris2.x b/config/solaris2.x
deleted file mode 100644
index 310c373..0000000
--- a/config/solaris2.x
+++ /dev/null
@@ -1,159 +0,0 @@
-#							-*- shell-script -*-
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-
-
-# This file is part of the HDF5 build script.  It is processed shortly
-# after configure starts and defines, among other things, flags for
-# the various compile modes.
-#
-# See BlankForm in this directory for details
-
-# The default compiler is `sunpro cc'
-if test "X-" =  "X-$CC"; then
-  CC=cc
-  CC_BASENAME=cc
-fi
-
-# Try gcc compiler flags
-. $srcdir/config/gnu-flags
-
-# Try solaris native compiler flags
-if test "X-" = "X-$cc_flags_set"; then
-  H5_CFLAGS="$H5_CFLAGS -erroff=%none -DBSD_COMP"
-  # -g produces rather slow code. "-g -O" produces much faster code with some
-  # loss of debugger functions such as not able to print local variables.
-  DEBUG_CFLAGS="-g -O"
-  DEBUG_CPPFLAGS=
-  PROD_CFLAGS="-O -s"
-  PROD_CPPFLAGS=
-  PROFILE_CFLAGS=-xpg
-  PROFILE_CPPFLAGS=
-  cc_flags_set=yes
-# Special linking flag is needed to build with Fortran on Solaris 5.9
-    system_version="`uname -r`"
-    case "$system_version" in
-	5.9*)
-	    # Need the xopenmp flag to build the Fortran library
-	    if test X-$enable_fortran = X-yes; then
-		AM_LDFLAGS="$AM_LDFLAGS -xopenmp=stubs"
-	    fi
-	    ;;
-    esac
-
-  # Turn off optimization flag for SUNpro compiler versions 4.x which
-  # have an optimization bug.  Version 5.0 works.
-  ($CC -V 2>&1) | grep -s 'cc: .* C 4\.' >/dev/null 2>&1 \
-       && PROD_CFLAGS="`echo $PROD_CFLAGS | sed -e 's/-O//'`"
-fi
-
-LIBS="$LIBS"
-
-# The default Fortran 90 compiler
-
-if test "X-" = "X-$FC"; then
-  FC=f90
-fi
-
-if test "X-" = "X-$f9x_flags_set"; then
-  F9XSUFFIXFLAG=""
-  FSEARCH_DIRS=""
-  H5_FCFLAGS="$H5_FCFLAGS"
-  # -g produces rather slow code. "-g -O" produces much faster code with some
-  # loss of debugger functions such as not able to print local variables.
-  DEBUG_FCFLAGS="-g -O"
-  PROD_FCFLAGS="-O2"
-  PROFILE_FCFLAGS=""
-  f9x_flags_set=yes
-fi
-
-# The default C++ compiler
-
-# The default compiler is `sunpro cc'
-if test -z "$CXX"; then
-  CXX=CC
-  CXX_BASENAME=CC
-fi
-
-# Try gcc compiler flags
-#. $srcdir/config/gnu-flags
-
-cxx_version="`$CXX -V 2>&1 |grep 'WorkShop' |\
-                sed 's/.*WorkShop.*C++ \([0-9\.]*\).*/\1/'`"
-
-cxx_vers_major=`echo $cxx_version | cut -f1 -d.`
-cxx_vers_minor=`echo $cxx_version | cut -f2 -d.`
-cxx_vers_patch=`echo $cxx_version | cut -f3 -d.`
-
-# Specify the "-features=tmplife" if the compiler can handle this...
-if test -n "$cxx_version"; then
-  if test $cxx_vers_major -ge 5 -a $cxx_vers_minor -ge 3 -o $cxx_vers_major -gt 5; then
-    H5_CXXFLAGS="$H5_CXXFLAGS -features=tmplife"
-  fi
-fi
-
-# Try solaris native compiler flags
-if test -z "$cxx_flags_set"; then
-  H5_CXXFLAGS="$H5_CXXFLAGS -instances=static"
-  H5_CPPFLAGS="$H5_CPPFLAGS -LANG:std"
-  # -g produces rather slow code. "-g -O" produces much faster code with some
-  # loss of debugger functions such as not able to print local variables.
-  DEBUG_CXXFLAGS="-g -O"
-  DEBUG_CPPFLAGS=
-  PROD_CXXFLAGS="-O -s"
-  PROD_CPPFLAGS=
-  PROFILE_CXXFLAGS=-xpg
-  PROFILE_CPPFLAGS=
-  cxx_flags_set=yes
-fi
-
-# compiler version strings
-case $CC in
-    *cc*)
-        cc_version_info=`$CC $CFLAGS $H5_CFLAGS -V 2>&1 | grep 'Sun' |\
-            sed 's/.*\(Sun .*\)/\1 /'`
-        ;;
-
-    *)
-        echo "No match to get cc_version_info for $CC"
-        ;;
-esac
-echo "C compiler '$CC' is $cc_version_info"
-
-case $FC in
-    # The PGI and Intel compilers are automatically detected below
-    *f90*)
-        fc_version_info=`$FC $FCFLAGS $H5_FCFLAGS -V 2>&1 | grep 'Sun' |\
-            sed 's/.*\(Sun .*\)/\1 /'`
-        ;;
-
-     *)
-        echo "No match to get fc_version_info for $FC"
-        ;;
-esac
-echo "Fortran compiler '$FC' is $fc_version_info"
-
-# get c++ version info
-case $CXX in
-    *CC*)
-        cxx_version_info=`$CXX $CXXFLAGS $H5_CXXFLAGS -V 2>&1 | grep 'Sun' |\
-            sed 's/.*\(Sun .*\)/\1 /'`
-        ;;
-
-    *)
-        echo "No match to get cxx_version_info for $CXX"
-        ;;
-esac
-
-
diff --git a/config/toolchain/GCC.cmake b/config/toolchain/GCC.cmake
new file mode 100644
index 0000000..c41d0ca
--- /dev/null
+++ b/config/toolchain/GCC.cmake
@@ -0,0 +1,11 @@
+# Uncomment the following line and the correct system name to use cross-compiling
+#set(CMAKE_SYSTEM_NAME Linux)
+
+set(CMAKE_COMPILER_VENDOR "GCC")
+
+set(CMAKE_C_COMPILER cc)
+set(CMAKE_CXX_COMPILER c++)
+set(CMAKE_Fortran_COMPILER gfortran)
+
+# the following is used if cross-compiling
+set(CMAKE_CROSSCOMPILING_EMULATOR "")
diff --git a/config/toolchain/PGI.cmake b/config/toolchain/PGI.cmake
new file mode 100644
index 0000000..ec58cbb
--- /dev/null
+++ b/config/toolchain/PGI.cmake
@@ -0,0 +1,11 @@
+# Uncomment the following to use cross-compiling
+#set(CMAKE_SYSTEM_NAME Linux)
+
+set(CMAKE_COMPILER_VENDOR "PGI")
+
+set(CMAKE_C_COMPILER pgcc)
+set(CMAKE_CXX_COMPILER pgc++)
+set(CMAKE_Fortran_COMPILER pgf90)
+
+# the following is used if cross-compiling
+set(CMAKE_CROSSCOMPILING_EMULATOR "")
diff --git a/config/toolchain/aarch64.cmake b/config/toolchain/aarch64.cmake
new file mode 100644
index 0000000..adb8639
--- /dev/null
+++ b/config/toolchain/aarch64.cmake
@@ -0,0 +1,17 @@
+set(TOOLCHAIN_PREFIX aarch64-linux-gnu)
+set(ANDROID_NDK /opt/android-ndk-r25b-linux/android-ndk-r25b)
+set (CMAKE_SYSTEM_NAME Android)
+set (CMAKE_ANDROID_ARCH_ABI x86_64)
+#set (CMAKE_ANDROID_STANDALONE_TOOLCHAIN ${ANDROID_NDK}/build/cmake/andriod.toolchain.cmake)
+set (CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}-gcc)
+set (CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}-g++)
+#set (CMAKE_RC_COMPILER ${TOOLCHAIN_PREFIX}-windres)
+set (CMAKE_Fortran_COMPILER ${TOOLCHAIN_PREFIX}-gfortran)
+set (CMAKE_FIND_ROOT_PATH /usr/${TOOLCHAIN_PREFIX})
+set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+set (CMAKE_CROSSCOMPILING_EMULATOR qemu-aarch64)
+
+include_directories(/usr/${TOOLCHAIN_PREFIX}/include)
+
diff --git a/config/toolchain/build32.cmake b/config/toolchain/build32.cmake
new file mode 100644
index 0000000..a2566c3
--- /dev/null
+++ b/config/toolchain/build32.cmake
@@ -0,0 +1,79 @@
+if (WIN32)
+  set (CMAKE_SYSTEM_NAME Windows)
+  set (CMAKE_GENERATOR_PLATFORM "x86")
+elseif(APPLE)
+  set (CMAKE_OSX_ARCHITECTURES "i386")
+elseif(MINGW)
+  set (CMAKE_SYSTEM_NAME Windows)
+  set (TOOLCHAIN_PREFIX i686-w64-mingw32)
+  set (CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}-gcc)
+  set (CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}-g++)
+  set (CMAKE_RC_COMPILER ${TOOLCHAIN_PREFIX}-windres)
+  set (CMAKE_Fortran_COMPILER ${TOOLCHAIN_PREFIX}-gfortran)
+
+  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32" CACHE STRING "c++ flags")
+  set (CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -m32" CACHE STRING "c flags")
+
+  set (LIB32 /usr/lib) # Fedora
+
+  if (EXISTS "/usr/lib32")
+    set (LIB32 /usr/lib32) # Arch, Solus
+  endif ()
+
+  set (CMAKE_SYSTEM_LIBRARY_PATH ${LIB32} CACHE STRING "system library search path" FORCE)
+  set (CMAKE_LIBRARY_PATH        ${LIB32} CACHE STRING "library search path"        FORCE)
+
+  # this is probably unlikely to be needed, but just in case
+  set (CMAKE_EXE_LINKER_FLAGS    "-m32 -L${LIB32}" CACHE STRING "executable linker flags"     FORCE)
+  set (CMAKE_SHARED_LINKER_FLAGS "-m32 -L${LIB32}" CACHE STRING "shared library linker flags" FORCE)
+  set (CMAKE_MODULE_LINKER_FLAGS "-m32 -L${LIB32}" CACHE STRING "module linker flags"         FORCE)
+
+  # on Fedora and Arch and similar, point pkgconfig at 32 bit .pc files. We have
+  # to include the regular system .pc files as well (at the end), because some
+  # are not always present in the 32 bit directory
+  if (EXISTS "${LIB32}/pkgconfig")
+    set (ENV{PKG_CONFIG_LIBDIR} ${LIB32}/pkgconfig:/usr/share/pkgconfig:/usr/lib/pkgconfig:/usr/lib64/pkgconfig)
+  endif ()
+
+  set (CMAKE_FIND_ROOT_PATH /usr/${TOOLCHAIN_PREFIX})
+  set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+  set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+  set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+  set (CMAKE_CROSSCOMPILING_EMULATOR wine)
+
+  include_directories(/usr/${TOOLCHAIN_PREFIX}/include)
+  set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS On CACHE BOOL "Export windows symbols")
+else ()
+  set (CMAKE_SYSTEM_NAME Linux)
+
+  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32" CACHE STRING "c++ flags")
+  set (CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -m32" CACHE STRING "c flags")
+
+  set (LIB32 /usr/lib) # Fedora
+
+  if (EXISTS "/usr/lib32")
+    set (LIB32 /usr/lib32) # Arch, Solus
+  endif ()
+
+  set (CMAKE_SYSTEM_LIBRARY_PATH ${LIB32} CACHE STRING "system library search path" FORCE)
+  set (CMAKE_LIBRARY_PATH        ${LIB32} CACHE STRING "library search path"        FORCE)
+
+  # this is probably unlikely to be needed, but just in case
+  set (CMAKE_EXE_LINKER_FLAGS    "-m32 -L${LIB32}" CACHE STRING "executable linker flags"     FORCE)
+  set (CMAKE_SHARED_LINKER_FLAGS "-m32 -L${LIB32}" CACHE STRING "shared library linker flags" FORCE)
+  set (CMAKE_MODULE_LINKER_FLAGS "-m32 -L${LIB32}" CACHE STRING "module linker flags"         FORCE)
+
+  # on Fedora and Arch and similar, point pkgconfig at 32 bit .pc files. We have
+  # to include the regular system .pc files as well (at the end), because some
+  # are not always present in the 32 bit directory
+  if (EXISTS "${LIB32}/pkgconfig")
+    set (ENV{PKG_CONFIG_LIBDIR} ${LIB32}/pkgconfig:/usr/share/pkgconfig:/usr/lib/pkgconfig:/usr/lib64/pkgconfig)
+  endif ()
+# where is the target environment
+  set (CMAKE_FIND_ROOT_PATH ${LIB32})
+# search for programs in the build host directories
+  set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+# for libraries and headers in the target directories
+  set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+  set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+endif ()
diff --git a/config/toolchain/clang.cmake b/config/toolchain/clang.cmake
new file mode 100644
index 0000000..af176aa
--- /dev/null
+++ b/config/toolchain/clang.cmake
@@ -0,0 +1,16 @@
+# Uncomment the following to use cross-compiling
+#set(CMAKE_SYSTEM_NAME Linux)
+
+set(CMAKE_COMPILER_VENDOR "clang")
+
+if(WIN32)
+  set(CMAKE_C_COMPILER clang-cl)
+  set(CMAKE_CXX_COMPILER clang-cl)
+else()
+  set(CMAKE_C_COMPILER clang)
+  set(CMAKE_CXX_COMPILER clang++)
+endif()
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
+# the following is used if cross-compiling
+set(CMAKE_CROSSCOMPILING_EMULATOR "")
diff --git a/config/toolchain/crayle.cmake b/config/toolchain/crayle.cmake
new file mode 100644
index 0000000..bf7cf69
--- /dev/null
+++ b/config/toolchain/crayle.cmake
@@ -0,0 +1,10 @@
+# The following line will use cross-compiling
+set(CMAKE_SYSTEM_NAME Linux)
+
+set(CMAKE_COMPILER_VENDOR "CrayLinuxEnvironment")
+
+set(CMAKE_C_COMPILER cc)
+set(CMAKE_Fortran_COMPILER ftn)
+
+# the following is used if cross-compiling
+set(CMAKE_CROSSCOMPILING_EMULATOR "")
diff --git a/config/toolchain/intel.cmake b/config/toolchain/intel.cmake
new file mode 100644
index 0000000..ae1d2f8
--- /dev/null
+++ b/config/toolchain/intel.cmake
@@ -0,0 +1,18 @@
+# Uncomment the following to use cross-compiling
+#set(CMAKE_SYSTEM_NAME Linux)
+
+set(CMAKE_COMPILER_VENDOR "intel")
+
+if(USE_SANITIZER)
+  set(CMAKE_C_COMPILER icl)
+  set(CMAKE_CXX_COMPILER icl++)
+  set(CMAKE_Fortran_COMPILER ifort)
+  set(INTEL_CLANG ON)
+else ()
+  set(CMAKE_C_COMPILER icc)
+  set(CMAKE_CXX_COMPILER icpc)
+  set(CMAKE_Fortran_COMPILER ifort)
+endif ()
+
+# the following is used if cross-compiling
+set(CMAKE_CROSSCOMPILING_EMULATOR "")
diff --git a/config/toolchain/mingw64.cmake b/config/toolchain/mingw64.cmake
new file mode 100644
index 0000000..1830488
--- /dev/null
+++ b/config/toolchain/mingw64.cmake
@@ -0,0 +1,14 @@
+set(TOOLCHAIN_PREFIX x86_64-w64-mingw32)
+set (CMAKE_SYSTEM_NAME Windows)
+set (CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}-gcc)
+set (CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}-g++)
+set (CMAKE_RC_COMPILER ${TOOLCHAIN_PREFIX}-windres)
+set (CMAKE_Fortran_COMPILER ${TOOLCHAIN_PREFIX}-gfortran)
+set (CMAKE_FIND_ROOT_PATH /usr/${TOOLCHAIN_PREFIX})
+set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+set (CMAKE_CROSSCOMPILING_EMULATOR wine64)
+
+include_directories(/usr/${TOOLCHAIN_PREFIX}/include)
+set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS On CACHE BOOL "Export windows symbols")
diff --git a/config/x86_64-pc-cygwin b/config/x86_64-pc-cygwin
deleted file mode 100644
index 9b1ab74..0000000
--- a/config/x86_64-pc-cygwin
+++ /dev/null
@@ -1,121 +0,0 @@
-#              -*- shell-script -*-
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-
-
-# This file is part of the HDF5 build script.  It is processed shortly
-# after configure starts and defines, among other things, flags for
-# the various compile modes.
-#
-# See BlankForm in this directory for details.
-
-# The default compiler is `gcc'.
-if test -z "$CC"; then
-   CC=gcc
-   CC_BASENAME=gcc
-fi
-
-# Figure out GNU C compiler flags
-. $srcdir/config/gnu-flags
-
-# Figure out PGI C compiler flags
-. $srcdir/config/pgi-flags
-
-# Figure out Intel C compiler flags
-. $srcdir/config/intel-flags
-
-# The default Fortran 90 compiler
-if test "X-" = "X-$FC"; then
-    case $CC_BASENAME in
-        gcc*)
-            FC=gfortran
-            FCLIBS=-lgcc
-            FC_BASENAME=gfortran
-            ;;
-        pgcc*)
-            FC=pgf90
-            FC_BASENAME=pgf90
-            ;;
-        icc*)
-            FC=ifort
-            FC_BASENAME=ifort
-            ;;
-        mpicc*)
-            FC=mpif90
-            FC_BASENAME=mpif90
-            ;;
-    esac
-else
-    case $FC in
-        # The PGI and Intel compilers are automatically detected below
-        ifc*|ifort*|pgf90*)
-            ;;
-        gfortran)
-            FCLIBS=-lgcc
-            ;;
-        g95)
-            FCLIBS=-lgcc
-            ;;
-        *)
-            # Figure out which compiler we are using: pgf90 or Absoft f95
-            RM='rm -f'
-            tmpfile=/tmp/cmpver.$$
-            $FC -V >$tmpfile
-            if test -s "$tmpfile"; then 
-                if( grep -s 'Absoft' $tmpfile > /dev/null) then
-                    FC_BASENAME=f95
-                fi 
-                if( grep -s 'pgf90' $tmpfile > /dev/null) then
-                    FC_BASENAME=pgf90
-                fi 
-            fi
-            $RM $tmpfile
-            ;;
-    esac
-fi
-
-# Figure out PGI F90 compiler flags
-. $srcdir/config/pgi-fflags
-
-# Figure out Intel F90 compiler flags
-. $srcdir/config/intel-fflags
-
-case $FC_BASENAME in
-    #
-    # Absoft compiler
-    #
-    f95)
-        # Set required flag for compiling C stubs
-        H5_CFLAGS="$H5_CFLAGS -DH5_ABSOFT" 
-
-        F9XSUFFIXFLAG=""
-# We force compiler to use upper case for external names 
-# (just in case since this should be a default EIP)
-        H5_FCFLAGS="$H5_FCFLAGS -YEXT_NAMES=UCS"
-        FSEARCH_DIRS=""
-        DEBUG_FCFLAGS="-g"
-        PROD_FCFLAGS="-O"
-        PROFILE_FCFLAGS="-g -pg"
-        f9x_flags_set=yes
-        ;;
-
-esac  
-
-# The default C++ compiler
-
-# The default compiler is `g++'.
-if test -z "$CXX"; then
-  CXX=g++
-  CXX_BASENAME=g++
-fi
diff --git a/configure b/configure
deleted file mode 100755
index 197fae4..0000000
--- a/configure
+++ /dev/null
@@ -1,33892 +0,0 @@
-#! /bin/sh
-# From configure.ac Id: configure.ac 22697 2012-08-19 14:35:47Z hdftest .
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for HDF5 1.9.216.
-#
-# Report bugs to <help@hdfgroup.org>.
-#
-#
-# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
-#
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-# Use a proper internal environment variable to ensure we don't fall
-  # into an infinite loop, continuously re-executing ourselves.
-  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
-    _as_can_reexec=no; export _as_can_reexec;
-    # We cannot yet assume a decent shell, so we have to provide a
-# neutralization value for shells without unset; and this also
-# works around shells that cannot unset nonexistent variables.
-# Preserve -v and -x to the replacement shell.
-BASH_ENV=/dev/null
-ENV=/dev/null
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-case $- in # ((((
-  *v*x* | *x*v* ) as_opts=-vx ;;
-  *v* ) as_opts=-v ;;
-  *x* ) as_opts=-x ;;
-  * ) as_opts= ;;
-esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-as_fn_exit 255
-  fi
-  # We don't want this to propagate to other subprocesses.
-          { _as_can_reexec=; unset _as_can_reexec;}
-if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
-else
-  case \`(set -o) 2>/dev/null\` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-"
-  as_required="as_fn_return () { (exit \$1); }
-as_fn_success () { as_fn_return 0; }
-as_fn_failure () { as_fn_return 1; }
-as_fn_ret_success () { return 0; }
-as_fn_ret_failure () { return 1; }
-
-exitcode=0
-as_fn_success || { exitcode=1; echo as_fn_success failed.; }
-as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
-as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
-as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
-
-else
-  exitcode=1; echo positional parameters were not saved.
-fi
-test x\$exitcode = x0 || exit 1
-test -x / || exit 1"
-  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
-  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
-  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-
-  test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
-    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
-    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
-    PATH=/empty FPATH=/empty; export PATH FPATH
-    test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
-      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1"
-  if (eval "$as_required") 2>/dev/null; then :
-  as_have_required=yes
-else
-  as_have_required=no
-fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_found=false
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  as_found=:
-  case $as_dir in #(
-	 /*)
-	   for as_base in sh bash ksh sh5; do
-	     # Try only shells that exist, to save several forks.
-	     as_shell=$as_dir/$as_base
-	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  CONFIG_SHELL=$as_shell as_have_required=yes
-		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  break 2
-fi
-fi
-	   done;;
-       esac
-  as_found=false
-done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-  CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
-IFS=$as_save_IFS
-
-
-      if test "x$CONFIG_SHELL" != x; then :
-  export CONFIG_SHELL
-             # We cannot yet assume a decent shell, so we have to provide a
-# neutralization value for shells without unset; and this also
-# works around shells that cannot unset nonexistent variables.
-# Preserve -v and -x to the replacement shell.
-BASH_ENV=/dev/null
-ENV=/dev/null
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-case $- in # ((((
-  *v*x* | *x*v* ) as_opts=-vx ;;
-  *v* ) as_opts=-v ;;
-  *x* ) as_opts=-x ;;
-  * ) as_opts= ;;
-esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-exit 255
-fi
-
-    if test x$as_have_required = xno; then :
-  $as_echo "$0: This script requires a shell more modern than all"
-  $as_echo "$0: the shells that I found on your system."
-  if test x${ZSH_VERSION+set} = xset ; then
-    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
-  else
-    $as_echo "$0: Please tell bug-autoconf@gnu.org and help@hdfgroup.org
-$0: about your system, including any error possibly output
-$0: before this message. Then install a modern shell, or
-$0: manually run the script under such a shell if you do
-$0: have one."
-  fi
-  exit 1
-fi
-fi
-fi
-SHELL=${CONFIG_SHELL-/bin/sh}
-export SHELL
-# Unset more variables known to interfere with behavior of common tools.
-CLICOLOR_FORCE= GREP_OPTIONS=
-unset CLICOLOR_FORCE GREP_OPTIONS
-
-## --------------------- ##
-## M4sh Shell Functions. ##
-## --------------------- ##
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
-  test -f "$1" && test -x "$1"
-} # as_fn_executable_p
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-  fi
-  $as_echo "$as_me: error: $2" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-
-  as_lineno_1=$LINENO as_lineno_1a=$LINENO
-  as_lineno_2=$LINENO as_lineno_2a=$LINENO
-  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
-  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
-  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
-
-  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
-  # already done that, so ensure we don't try to do so again and fall
-  # in an infinite loop.  This has already happened in practice.
-  _as_can_reexec=no; export _as_can_reexec
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -pR'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -pR'
-  fi
-else
-  as_ln_s='cp -pR'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-
-test -n "$DJDIR" || exec 7<&0 </dev/null
-exec 6>&1
-
-# Name of the host.
-# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_clean_files=
-ac_config_libobj_dir=.
-LIBOBJS=
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-
-# Identity of this package.
-PACKAGE_NAME='HDF5'
-PACKAGE_TARNAME='hdf5'
-PACKAGE_VERSION='1.9.216'
-PACKAGE_STRING='HDF5 1.9.216'
-PACKAGE_BUGREPORT='help@hdfgroup.org'
-PACKAGE_URL=''
-
-ac_unique_file="src/H5.c"
-ac_default_prefix=`pwd`/hdf5
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-ac_subst_vars='am__EXEEXT_FALSE
-am__EXEEXT_TRUE
-LTLIBOBJS
-LIBOBJS
-HAVE_SHARED_CONDITIONAL_FALSE
-HAVE_SHARED_CONDITIONAL_TRUE
-SEARCH
-BUILD_HDF5_HL_CONDITIONAL_FALSE
-BUILD_HDF5_HL_CONDITIONAL_TRUE
-BUILD_FORTRAN_CONDITIONAL_FALSE
-BUILD_FORTRAN_CONDITIONAL_TRUE
-BUILD_PARALLEL_CONDITIONAL_FALSE
-BUILD_PARALLEL_CONDITIONAL_TRUE
-BUILD_CXX_CONDITIONAL_FALSE
-BUILD_CXX_CONDITIONAL_TRUE
-STRICT_FORMAT_CHECKS
-DEFAULT_API_VERSION
-DEPRECATED_SYMBOLS
-BUILD_ALL_CONDITIONAL_FALSE
-BUILD_ALL_CONDITIONAL_TRUE
-ROOT
-CXX_VERSION
-FC_VERSION
-CC_VERSION
-WORDS_BIGENDIAN
-BYTESEX
-CONFIG_MODE
-CONFIG_USER
-CONFIG_DATE
-H5_VERSION
-DIRECT_VFD_CONDITIONAL_FALSE
-DIRECT_VFD_CONDITIONAL_TRUE
-ADD_PARALLEL_FILES
-USINGMEMCHECKER
-CLEARFILEBUF
-INSTRUMENT_LIBRARY
-TRACE_API
-DEBUG_PKG
-H5_LONE_COLON
-HAVE_PTHREAD
-BUILD_SHARED_SZIP_CONDITIONAL_FALSE
-BUILD_SHARED_SZIP_CONDITIONAL_TRUE
-LL_PATH
-USE_FILTER_SZIP
-USE_FILTER_DEFLATE
-AM_MAKEFLAGS
-LT_STATIC_EXEC
-USE_PLUGINS_CONDITIONAL_FALSE
-USE_PLUGINS_CONDITIONAL_TRUE
-CPP
-OTOOL64
-OTOOL
-LIPO
-NMEDIT
-DSYMUTIL
-MANIFEST_TOOL
-RANLIB
-ac_ct_AR
-LN_S
-NM
-ac_ct_DUMPBIN
-DUMPBIN
-LD
-FGREP
-EGREP
-GREP
-SED
-LIBTOOL
-OBJDUMP
-DLLTOOL
-AS
-CXX_SHARED_CONDITIONAL_FALSE
-CXX_SHARED_CONDITIONAL_TRUE
-H5_CXX_SHARED
-FORTRAN_SHARED_CONDITIONAL_FALSE
-FORTRAN_SHARED_CONDITIONAL_TRUE
-H5_FORTRAN_SHARED
-TESTPARALLEL
-RUNPARALLEL
-RUNSERIAL
-PARALLEL
-TIME
-TR
-AR
-PERL
-HL_FOR
-HL
-CXXCPP
-am__fastdepCXX_FALSE
-am__fastdepCXX_TRUE
-CXXDEPMODE
-ac_ct_CXX
-CXXFLAGS
-FORTRAN_DEFAULT_REALisDBLE_F_FALSE
-FORTRAN_DEFAULT_REALisDBLE_F_TRUE
-FORTRAN_2003_CONDITIONAL_F_FALSE
-FORTRAN_2003_CONDITIONAL_F_TRUE
-FORTRAN_HAVE_STORAGE_SIZE_FALSE
-FORTRAN_HAVE_STORAGE_SIZE_TRUE
-FORTRAN_HAVE_C_SIZEOF_FALSE
-FORTRAN_HAVE_C_SIZEOF_TRUE
-FORTRAN_HAVE_SIZEOF_FALSE
-FORTRAN_HAVE_SIZEOF_TRUE
-FCLIBS
-F9XMODEXT
-F9XMODFLAG
-FSEARCH_DIRS
-F9XSUFFIXFLAG
-FCFLAGS_f90
-ac_ct_FC
-FCFLAGS
-OBJECT_NAMELEN_DEFAULT_F
-SIZE_T
-HID_T
-HSSIZE_T
-HSIZE_T
-HADDR_T
-R_INTEGER
-R_LARGE
-HAVE_FORTRAN_2003
-HDF5_INTERFACES
-am__fastdepCC_FALSE
-am__fastdepCC_TRUE
-CCDEPMODE
-am__nodep
-AMDEPBACKSLASH
-AMDEP_FALSE
-AMDEP_TRUE
-am__quote
-am__include
-DEPDIR
-OBJEXT
-EXEEXT
-ac_ct_CC
-LDFLAGS
-CFLAGS
-CC
-UNAME_INFO
-enable_static
-enable_shared
-STATIC_SHARED
-THREADSAFE
-DIRECT_VFD
-HAVE_DMALLOC
-CODESTACK
-INSTRUMENT
-HDF5_HL
-CXX
-HDF_CXX
-FC2003
-FC
-HDF_FORTRAN2003
-HDF_FORTRAN
-STATIC_EXEC
-MPE
-EXTERNAL_FILTERS
-AM_LDFLAGS
-AM_CPPFLAGS
-AM_CXXFLAGS
-AM_FCFLAGS
-AM_CFLAGS
-H5_LDFLAGS
-H5_CXXFLAGS
-H5_FCFLAGS
-H5_CPPFLAGS
-H5_CFLAGS
-CPPFLAGS
-host_os
-host_vendor
-host_cpu
-host
-build_os
-build_vendor
-build_cpu
-build
-MAINT
-MAINTAINER_MODE_FALSE
-MAINTAINER_MODE_TRUE
-AM_BACKSLASH
-AM_DEFAULT_VERBOSITY
-AM_DEFAULT_V
-AM_V
-am__untar
-am__tar
-AMTAR
-am__leading_dot
-SET_MAKE
-AWK
-mkdir_p
-MKDIR_P
-INSTALL_STRIP_PROGRAM
-STRIP
-install_sh
-MAKEINFO
-AUTOHEADER
-AUTOMAKE
-AUTOCONF
-ACLOCAL
-VERSION
-PACKAGE
-CYGPATH_W
-am__isrc
-INSTALL_DATA
-INSTALL_SCRIPT
-INSTALL_PROGRAM
-target_alias
-host_alias
-build_alias
-LIBS
-ECHO_T
-ECHO_N
-ECHO_C
-DEFS
-mandir
-localedir
-libdir
-psdir
-pdfdir
-dvidir
-htmldir
-infodir
-docdir
-oldincludedir
-includedir
-localstatedir
-sharedstatedir
-sysconfdir
-datadir
-datarootdir
-libexecdir
-sbindir
-bindir
-program_transform_name
-prefix
-exec_prefix
-PACKAGE_URL
-PACKAGE_BUGREPORT
-PACKAGE_STRING
-PACKAGE_VERSION
-PACKAGE_TARNAME
-PACKAGE_NAME
-PATH_SEPARATOR
-SHELL'
-ac_subst_files=''
-ac_user_opts='
-enable_option_checking
-enable_silent_rules
-enable_maintainer_mode
-enable_dependency_tracking
-enable_unsupported
-enable_fortran
-enable_fortran2003
-enable_cxx
-enable_hl
-enable_shared
-enable_static
-with_pic
-enable_fast_install
-with_gnu_ld
-with_sysroot
-enable_libtool_lock
-enable_static_exec
-enable_sharedlib_rpath
-enable_production
-with_fnord
-with_dmalloc
-with_zlib
-with_szlib
-enable_threadsafe
-with_pthread
-enable_debug
-enable_codestack
-enable_metadata_trace_file
-enable_trace
-enable_instrument
-enable_clear_file_buffers
-enable_using_memchecker
-enable_parallel
-with_mpe
-enable_direct_vfd
-with_default_plugindir
-enable_dconv_exception
-enable_dconv_accuracy
-enable_build_all
-enable_deprecated_symbols
-with_default_api_version
-enable_strict_format_checks
-enable_embedded_libinfo
-'
-      ac_precious_vars='build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-FC
-FCFLAGS
-CXX
-CXXFLAGS
-CCC
-CXXCPP
-CPP'
-
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-ac_unrecognized_opts=
-ac_unrecognized_sep=
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
-
-ac_prev=
-ac_dashdash=
-for ac_option
-do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval $ac_prev=\$ac_option
-    ac_prev=
-    continue
-  fi
-
-  case $ac_option in
-  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *=)   ac_optarg= ;;
-  *)    ac_optarg=yes ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case $ac_dashdash$ac_option in
-  --)
-    ac_dashdash=yes ;;
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-    datadir=$ac_optarg ;;
-
-  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-  | --dataroo | --dataro | --datar)
-    ac_prev=datarootdir ;;
-  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-    datarootdir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=no ;;
-
-  -docdir | --docdir | --docdi | --doc | --do)
-    ac_prev=docdir ;;
-  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-    docdir=$ac_optarg ;;
-
-  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-    ac_prev=dvidir ;;
-  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-    dvidir=$ac_optarg ;;
-
-  -enable-* | --enable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=\$ac_optarg ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
-
-  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-    ac_prev=htmldir ;;
-  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-  | --ht=*)
-    htmldir=$ac_optarg ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir=$ac_optarg ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
-
-  -localedir | --localedir | --localedi | --localed | --locale)
-    ac_prev=localedir ;;
-  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-    localedir=$ac_optarg ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst | --locals)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-    localstatedir=$ac_optarg ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
-
-  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-    ac_prev=pdfdir ;;
-  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-    pdfdir=$ac_optarg ;;
-
-  -psdir | --psdir | --psdi | --psd | --ps)
-    ac_prev=psdir ;;
-  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-    psdir=$ac_optarg ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=\$ac_optarg ;;
-
-  -without-* | --without-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=no ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
-
-  -*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information"
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    case $ac_envvar in #(
-      '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
-    esac
-    eval $ac_envvar=\$ac_optarg
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error $? "missing argument to $ac_option"
-fi
-
-if test -n "$ac_unrecognized_opts"; then
-  case $enable_option_checking in
-    no) ;;
-    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
-  esac
-fi
-
-# Check all directory arguments for consistency.
-for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-		datadir sysconfdir sharedstatedir localstatedir includedir \
-		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
-do
-  eval ac_val=\$$ac_var
-  # Remove trailing slashes.
-  case $ac_val in
-    */ )
-      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
-      eval $ac_var=\$ac_val;;
-  esac
-  # Be sure to have absolute directory names.
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* )  continue;;
-    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-  esac
-  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error $? "working directory cannot be determined"
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error $? "pwd does not report name of working directory"
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$as_myself" ||
-$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_myself" : 'X\(//\)[^/]' \| \
-	 X"$as_myself" : 'X\(//\)$' \| \
-	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  srcdir=$ac_confdir
-  if test ! -r "$srcdir/$ac_unique_file"; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r "$srcdir/$ac_unique_file"; then
-  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
-	pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
-  srcdir=.
-fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-esac
-for ac_var in $ac_precious_vars; do
-  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_env_${ac_var}_value=\$${ac_var}
-  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # Omit some internal or obsolete options to make the list less imposing.
-  # This message is too long to be a string in the A/UX 3.1 sh.
-  cat <<_ACEOF
-\`configure' configures HDF5 1.9.216 to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking ...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR            user executables [EPREFIX/bin]
-  --sbindir=DIR           system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR        program executables [EPREFIX/libexec]
-  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --libdir=DIR            object code libraries [EPREFIX/lib]
-  --includedir=DIR        C header files [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR           info documentation [DATAROOTDIR/info]
-  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/hdf5]
-  --htmldir=DIR           html documentation [DOCDIR]
-  --dvidir=DIR            dvi documentation [DOCDIR]
-  --pdfdir=DIR            pdf documentation [DOCDIR]
-  --psdir=DIR             ps documentation [DOCDIR]
-_ACEOF
-
-  cat <<\_ACEOF
-
-Program names:
-  --program-prefix=PREFIX            prepend PREFIX to installed program names
-  --program-suffix=SUFFIX            append SUFFIX to installed program names
-  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-  case $ac_init_help in
-     short | recursive ) echo "Configuration of HDF5 1.9.216:";;
-   esac
-  cat <<\_ACEOF
-
-Optional Features:
-  --disable-option-checking  ignore unrecognized --enable/--with options
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-silent-rules   less verbose build output (undo: "make V=1")
-  --disable-silent-rules  verbose build output (undo: "make V=0")
-  --enable-maintainer-mode
-                          enable make rules and dependencies not useful (and
-                          sometimes confusing) to the casual installer
-  --enable-dependency-tracking
-                          do not reject slow dependency extractors
-  --disable-dependency-tracking
-                          speeds up one-time build
-  --enable-unsupported    Allow unsupported combinations of configure options
-  --enable-fortran        Compile the Fortran 90/95 interface [default=no]
-  --enable-fortran2003    Compile the Fortran 2003 interface, must also
-                          specify --enable-fortran [default=no]
-  --enable-cxx            Compile the C++ interface [default=no]
-  --enable-hl             Enable the high level library [default=yes]
-  --enable-shared[=PKGS]  build shared libraries [default=yes]
-  --enable-static[=PKGS]  build static libraries [default=yes]
-  --enable-fast-install[=PKGS]
-                          optimize for fast installation [default=yes]
-  --disable-libtool-lock  avoid locking (might break parallel builds)
-  --enable-static-exec    Install only statically linked executables
-                          [default=no]
-  --disable-sharedlib-rpath
-                          Disable use of the '=Wl,-rpath' linker option
-  --enable-production     Determines how to run the compiler.
-  --enable-threadsafe     Enable thread-safe capability. This will disable the
-                          high-level library. You can override this behavior
-                          by specifying --enable-hl and --enable-unsupported.
-                          [default=no]
-  --enable-debug=all      Turn on debugging in all packages. One may also
-                          specify a comma-separated list of package names
-                          without the leading H5 or the word no. The default
-                          is most packages if production is disabled; no if it
-                          is enabled.
-  --enable-codestack      Enable the function stack tracing (for developer
-                          debugging).
-  --enable-metadata-trace-file
-                          Enable metadata trace file collection.
-  --enable-trace          Enable API tracing capability. Default=no if debug
-                          is disabled.
-  --enable-instrument     Enable library instrumentation of optimization
-                          tracing. Default=no if debug is disabled.
-  --enable-clear-file-buffers
-                          Securely clear file buffers before writing to file.
-                          Default=yes.
-  --enable-using-memchecker
-                          Enable this option if a memory allocation and/or
-                          bounds checking tool will be used on the HDF5
-                          library. Enabling this causes the library to be more
-                          picky about it's memory operations and also disables
-                          the library's free space manager code. Default=no.
-  --enable-parallel       Search for MPI-IO and MPI support files
-  --enable-direct-vfd     Build the direct I/O virtual file driver (VFD). This
-                          is based on the POSIX (sec2) VFD and requires the
-                          open() call to take the O_DIRECT flag. [default=no]
-  --enable-dconv-exception
-                          if exception handling functions is checked during
-                          data conversions [default=yes]
-  --enable-dconv-accuracy if data accuracy is guaranteed during data
-                          conversions [default=yes]
-  --enable-build-all      Build helper programs that only developers should
-                          need [default=no]
-  --enable-deprecated-symbols
-                          Enable deprecated public API symbols [default=yes]
-  --enable-strict-format-checks
-                          Enable strict file format checks, default=yes if
-                          debug flag is enabled, no otherwise
-  --enable-embedded-libinfo
-                          Enable embedded library information [default=yes]
-
-Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
-                          both]
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-  --with-sysroot=DIR Search for dependent libraries within DIR
-                        (or the compiler's sysroot if not specified).
-
- For the following --with-xxx options, you can specify where the header
- files and libraries are in two different ways:
-
-    --with-xxx=INC,LIB - Specify individually the include directory and
-                         library directory separated by a comma
-    --with-xxx=DIR     - Specify only the directory which contains the
-                         include/ and lib/ subdirectories
-
-  --with-dmalloc=DIR      Use dmalloc memory debugging aid [default=no]
-  --with-zlib=DIR         Use zlib library for external deflate I/O filter
-                          [default=yes]
-  --with-szlib=DIR        Use szlib library for external szlib I/O filter
-                          [default=no]
-  --with-pthread=DIR      Specify alternative path to Pthreads library when
-                          thread-safe capability is built.
-  --with-mpe=DIR          Use MPE instrumentation [default=no]
-  --with-default-plugindir=location
-                          Specify default location for plugins
-                          [default="/usr/local/hdf5/lib/plugin"]
-  --with-default-api-version=(v16|v18|v110)
-                          Specify default release version of public symbols
-                          [default=v110]
-
-Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
-              you have headers in a nonstandard directory <include dir>
-  FC          Fortran compiler command
-  FCFLAGS     Fortran compiler flags
-  CXX         C++ compiler command
-  CXXFLAGS    C++ compiler flags
-  CXXCPP      C++ preprocessor
-  CPP         C preprocessor
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-Report bugs to <help@hdfgroup.org>.
-_ACEOF
-ac_status=$?
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" ||
-      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
-      continue
-    ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-    cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-    elif test -f "$ac_srcdir/configure"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure" --help=recursive
-    else
-      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi || ac_status=$?
-    cd "$ac_pwd" || { ac_status=$?; break; }
-  done
-fi
-
-test -n "$ac_init_help" && exit $ac_status
-if $ac_init_version; then
-  cat <<\_ACEOF
-HDF5 configure 1.9.216
-generated by GNU Autoconf 2.69
-
-Copyright (C) 2012 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit
-fi
-
-## ------------------------ ##
-## Autoconf initialization. ##
-## ------------------------ ##
-
-# ac_fn_c_try_compile LINENO
-# --------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
-  if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_compile
-
-# ac_fn_fc_try_compile LINENO
-# ---------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_fc_try_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
-  if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_fc_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_fc_try_compile
-
-# ac_fn_c_try_link LINENO
-# -----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_link ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 test -x conftest$ac_exeext
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_link
-
-# ac_fn_fc_try_link LINENO
-# ------------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_fc_try_link ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_fc_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 test -x conftest$ac_exeext
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_fc_try_link
-
-# ac_fn_cxx_try_compile LINENO
-# ----------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_cxx_try_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
-  if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_cxx_try_compile
-
-# ac_fn_cxx_try_cpp LINENO
-# ------------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_cxx_try_cpp ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } > conftest.i && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-    ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_cxx_try_cpp
-
-# ac_fn_cxx_try_link LINENO
-# -------------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_cxx_try_link ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 test -x conftest$ac_exeext
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_cxx_try_link
-
-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists and can be compiled using the include files in
-# INCLUDES, setting the cache variable VAR accordingly.
-ac_fn_c_check_header_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_header_compile
-
-# ac_fn_c_try_cpp LINENO
-# ----------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_cpp ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } > conftest.i && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-    ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_cpp
-
-# ac_fn_c_try_run LINENO
-# ----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_c_try_run ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-       $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_retval=$ac_status
-fi
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_run
-
-# ac_fn_c_check_func LINENO FUNC VAR
-# ----------------------------------
-# Tests whether FUNC exists, setting the cache variable VAR accordingly
-ac_fn_c_check_func ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $2 innocuous_$2
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $2 (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $2
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $2 ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$2 || defined __stub___$2
-choke me
-#endif
-
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-return $2 ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_func
-
-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-# the include files in INCLUDES and setting the cache variable VAR
-# accordingly.
-ac_fn_c_check_header_mongrel ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval \${$3+:} false; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_header_compiler=yes
-else
-  ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <$2>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  ac_header_preproc=yes
-else
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
-  yes:no: )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## -------------------------------- ##
-## Report this to help@hdfgroup.org ##
-## -------------------------------- ##"
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=\$ac_header_compiler"
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_header_mongrel
-
-# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
-# -------------------------------------------
-# Tests whether TYPE exists after having included INCLUDES, setting cache
-# variable VAR accordingly.
-ac_fn_c_check_type ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=no"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-if (sizeof ($2))
-	 return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-if (sizeof (($2)))
-	    return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  eval "$3=yes"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_type
-
-# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
-# --------------------------------------------
-# Tries to find the compile-time value of EXPR in a program that includes
-# INCLUDES, setting VAR accordingly. Returns whether the value could be
-# computed
-ac_fn_c_compute_int ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if test "$cross_compiling" = yes; then
-    # Depending upon the size, compute the lo and hi bounds.
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-static int test_array [1 - 2 * !(($2) >= 0)];
-test_array [0] = 0;
-return test_array [0];
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0;
-return test_array [0];
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_hi=$ac_mid; break
-else
-  as_fn_arith $ac_mid + 1 && ac_lo=$as_val
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-static int test_array [1 - 2 * !(($2) < 0)];
-test_array [0] = 0;
-return test_array [0];
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-static int test_array [1 - 2 * !(($2) >= $ac_mid)];
-test_array [0] = 0;
-return test_array [0];
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_lo=$ac_mid; break
-else
-  as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  ac_lo= ac_hi=
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0;
-return test_array [0];
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_hi=$ac_mid
-else
-  as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in #((
-?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
-'') ac_retval=1 ;;
-esac
-  else
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-static long int longval () { return $2; }
-static unsigned long int ulongval () { return $2; }
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (($2) < 0)
-    {
-      long int i = longval ();
-      if (i != ($2))
-	return 1;
-      fprintf (f, "%ld", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ($2))
-	return 1;
-      fprintf (f, "%lu", i);
-    }
-  /* Do not output a trailing newline, as this causes \r\n confusion
-     on some platforms.  */
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  echo >>conftest.val; read $3 <conftest.val; ac_retval=0
-else
-  ac_retval=1
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-rm -f conftest.val
-
-  fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_compute_int
-
-# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
-# ---------------------------------------------
-# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
-# accordingly.
-ac_fn_c_check_decl ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  as_decl_name=`echo $2|sed 's/ *(.*//'`
-  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
-$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-#ifndef $as_decl_name
-#ifdef __cplusplus
-  (void) $as_decl_use;
-#else
-  (void) $as_decl_name;
-#endif
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_decl
-cat >config.log <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by HDF5 $as_me 1.9.216, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-exec 5>>config.log
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    $as_echo "PATH: $as_dir"
-  done
-IFS=$as_save_IFS
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *\'*)
-      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
-    2)
-      as_fn_append ac_configure_args1 " '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      as_fn_append ac_configure_args " '$ac_arg'"
-      ;;
-    esac
-  done
-done
-{ ac_configure_args0=; unset ac_configure_args0;}
-{ ac_configure_args1=; unset ac_configure_args1;}
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    $as_echo "## ---------------- ##
-## Cache variables. ##
-## ---------------- ##"
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-(
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-  (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-      ;; #(
-    *)
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-)
-    echo
-
-    $as_echo "## ----------------- ##
-## Output variables. ##
-## ----------------- ##"
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=\$$ac_var
-      case $ac_val in
-      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-      esac
-      $as_echo "$ac_var='\''$ac_val'\''"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      $as_echo "## ------------------- ##
-## File substitutions. ##
-## ------------------- ##"
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	$as_echo "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      $as_echo "## ----------- ##
-## confdefs.h. ##
-## ----------- ##"
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      $as_echo "$as_me: caught signal $ac_signal"
-    $as_echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
-    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
-
-$as_echo "/* confdefs.h */" > confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_URL "$PACKAGE_URL"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
-if test -n "$CONFIG_SITE"; then
-  # We do not want a PATH search for config.site.
-  case $CONFIG_SITE in #((
-    -*)  ac_site_file1=./$CONFIG_SITE;;
-    */*) ac_site_file1=$CONFIG_SITE;;
-    *)   ac_site_file1=./$CONFIG_SITE;;
-  esac
-elif test "x$prefix" != xNONE; then
-  ac_site_file1=$prefix/share/config.site
-  ac_site_file2=$prefix/etc/config.site
-else
-  ac_site_file1=$ac_default_prefix/share/config.site
-  ac_site_file2=$ac_default_prefix/etc/config.site
-fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
-do
-  test "x$ac_site_file" = xNONE && continue
-  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file" \
-      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5; }
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special files
-  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
-  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-      *)                      . "./$cache_file";;
-    esac
-  fi
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
-	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	  ac_cache_corrupted=:
-	else
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-	  eval $ac_var=\$ac_old_val
-	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
-$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
-$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
-fi
-## -------------------- ##
-## Main body of script. ##
-## -------------------- ##
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-ac_config_headers="$ac_config_headers src/H5config.h"
-
-
-ac_aux_dir=
-for ac_dir in bin "$srcdir"/bin; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in bin \"$srcdir\"/bin" "$LINENO" 5
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-
-
-## AM_INIT_AUTOMAKE takes a list of options that should be applied to
-## every Makefile.am when automake is run.
-am__api_version='1.14'
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
-if test -z "$INSTALL"; then
-if ${ac_cv_path_install+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in #((
-  ./ | .// | /[cC]/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    rm -rf conftest.one conftest.two conftest.dir
-	    echo one > conftest.one
-	    echo two > conftest.two
-	    mkdir conftest.dir
-	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
-	      test -s conftest.one && test -s conftest.two &&
-	      test -s conftest.dir/conftest.one &&
-	      test -s conftest.dir/conftest.two
-	    then
-	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	      break 3
-	    fi
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-
-  done
-IFS=$as_save_IFS
-
-rm -rf conftest.one conftest.two conftest.dir
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
-$as_echo_n "checking whether build environment is sane... " >&6; }
-# Reject unsafe characters in $srcdir or the absolute working directory
-# name.  Accept space and tab only in the latter.
-am_lf='
-'
-case `pwd` in
-  *[\\\"\#\$\&\'\`$am_lf]*)
-    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
-esac
-case $srcdir in
-  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
-esac
-
-# Do 'set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   am_has_slept=no
-   for am_try in 1 2; do
-     echo "timestamp, slept: $am_has_slept" > conftest.file
-     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-     if test "$*" = "X"; then
-	# -L didn't work.
-	set X `ls -t "$srcdir/configure" conftest.file`
-     fi
-     if test "$*" != "X $srcdir/configure conftest.file" \
-	&& test "$*" != "X conftest.file $srcdir/configure"; then
-
-	# If neither matched, then we have a broken ls.  This can happen
-	# if, for instance, CONFIG_SHELL is bash and it inherits a
-	# broken ls alias from the environment.  This has actually
-	# happened.  Such a system could not be considered "sane".
-	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
-  alias in your environment" "$LINENO" 5
-     fi
-     if test "$2" = conftest.file || test $am_try -eq 2; then
-       break
-     fi
-     # Just in case.
-     sleep 1
-     am_has_slept=yes
-   done
-   test "$2" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   as_fn_error $? "newly created file is older than distributed files!
-Check your system clock" "$LINENO" 5
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-# If we didn't sleep, we still need to ensure time stamps of config.status and
-# generated files are strictly newer.
-am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
-  ( sleep 1 ) &
-  am_sleep_pid=$!
-fi
-
-rm -f conftest.file
-
-test "$program_prefix" != NONE &&
-  program_transform_name="s&^&$program_prefix&;$program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.
-# By default was `s,x,x', remove it if useless.
-ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
-program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-
-if test x"${MISSING+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-  *)
-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-  esac
-fi
-# Use eval to expand $SHELL
-if eval "$MISSING --is-lightweight"; then
-  am_missing_run="$MISSING "
-else
-  am_missing_run=
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
-fi
-
-if test x"${install_sh}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-  *)
-    install_sh="\${SHELL} $am_aux_dir/install-sh"
-  esac
-fi
-
-# Installed binaries are usually stripped using 'strip' when the user
-# run "make install-strip".  However 'strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the 'STRIP' environment variable to overrule this program.
-if test "$cross_compiling" != no; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
-$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
-if test -z "$MKDIR_P"; then
-  if ${ac_cv_path_mkdir+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in mkdir gmkdir; do
-	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
-	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-	     'mkdir (GNU coreutils) '* | \
-	     'mkdir (coreutils) '* | \
-	     'mkdir (fileutils) '4.1*)
-	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
-	       break 3;;
-	   esac
-	 done
-       done
-  done
-IFS=$as_save_IFS
-
-fi
-
-  test -d ./--version && rmdir ./--version
-  if test "${ac_cv_path_mkdir+set}" = set; then
-    MKDIR_P="$ac_cv_path_mkdir -p"
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for MKDIR_P within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    MKDIR_P="$ac_install_sh -d"
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
-$as_echo "$MKDIR_P" >&6; }
-
-for ac_prog in gawk mawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AWK+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$AWK" && break
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  SET_MAKE=
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-
-# Check whether --enable-silent-rules was given.
-if test "${enable_silent_rules+set}" = set; then :
-  enableval=$enable_silent_rules;
-fi
-
-case $enable_silent_rules in # (((
-  yes) AM_DEFAULT_VERBOSITY=0;;
-   no) AM_DEFAULT_VERBOSITY=1;;
-    *) AM_DEFAULT_VERBOSITY=1;;
-esac
-am_make=${MAKE-make}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
-$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
-if ${am_cv_make_support_nested_variables+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if $as_echo 'TRUE=$(BAR$(V))
-BAR0=false
-BAR1=true
-V=1
-am__doit:
-	@$(TRUE)
-.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
-  am_cv_make_support_nested_variables=yes
-else
-  am_cv_make_support_nested_variables=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
-$as_echo "$am_cv_make_support_nested_variables" >&6; }
-if test $am_cv_make_support_nested_variables = yes; then
-    AM_V='$(V)'
-  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
-  AM_V=$AM_DEFAULT_VERBOSITY
-  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
-AM_BACKSLASH='\'
-
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  am__isrc=' -I$(srcdir)'
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-
-
-# Define the identity of the package.
- PACKAGE='hdf5'
- VERSION='1.9.216'
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
-
-# Some tools Automake needs.
-
-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-
-
-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-
-
-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-
-
-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-
-
-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
-# For better backward compatibility.  To be removed once Automake 1.9.x
-# dies out for good.  For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
-mkdir_p='$(MKDIR_P)'
-
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-# Always define AMTAR for backward compatibility.  Yes, it's still used
-# in the wild :-(  We should find a proper way to deprecate it ...
-AMTAR='$${TAR-tar}'
-
-
-# We'll loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar  pax cpio none'
-
-am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
-
-
-
-
-
-
-# POSIX will say in a future version that running "rm -f" with no argument
-# is OK; and we want to be able to make that assumption in our Makefile
-# recipes.  So use an aggressive probe to check that the usage we want is
-# actually supported "in the wild" to an acceptable degree.
-# See automake bug#10828.
-# To make any issue more visible, cause the running configure to be aborted
-# by default if the 'rm' program in use doesn't match our expectations; the
-# user can still override this though.
-if rm -f && rm -fr && rm -rf; then : OK; else
-  cat >&2 <<'END'
-Oops!
-
-Your 'rm' program seems unable to run without file operands specified
-on the command line, even when the '-f' option is present.  This is contrary
-to the behaviour of most rm programs out there, and not conforming with
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-
-Please tell bug-automake@gnu.org about your system, including the value
-of your $PATH and any error possibly output before this message.  This
-can help us improve future automake versions.
-
-END
-  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
-    echo 'Configuration will proceed anyway, since you have set the' >&2
-    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
-    echo >&2
-  else
-    cat >&2 <<'END'
-Aborting the configuration process, to ensure you take notice of the issue.
-
-You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
-
-If you want to complete the configuration process using your problematic
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-to "yes", and re-run configure.
-
-END
-    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
-  fi
-fi
-# Check whether --enable-silent-rules was given.
-if test "${enable_silent_rules+set}" = set; then :
-  enableval=$enable_silent_rules;
-fi
-
-case $enable_silent_rules in # (((
-  yes) AM_DEFAULT_VERBOSITY=0;;
-   no) AM_DEFAULT_VERBOSITY=1;;
-    *) AM_DEFAULT_VERBOSITY=0;;
-esac
-am_make=${MAKE-make}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
-$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
-if ${am_cv_make_support_nested_variables+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if $as_echo 'TRUE=$(BAR$(V))
-BAR0=false
-BAR1=true
-V=1
-am__doit:
-	@$(TRUE)
-.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
-  am_cv_make_support_nested_variables=yes
-else
-  am_cv_make_support_nested_variables=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
-$as_echo "$am_cv_make_support_nested_variables" >&6; }
-if test $am_cv_make_support_nested_variables = yes; then
-    AM_V='$(V)'
-  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
-  AM_V=$AM_DEFAULT_VERBOSITY
-  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
-AM_BACKSLASH='\'
-
-
-## AM_MAINTAINER_MODE turns off "rebuild rules" that contain dependencies
-## for Makefiles, configure, src/H5config.h, etc.  If AM_MAINTAINER_MODE
-## is *not* included here, these files will be rebuilt if out of date.
-## This is a problem because if users try to build on a machine with
-## the wrong versions of autoconf and automake, these files will be
-## rebuilt with the wrong versions and bad things can happen.
-## Also, CVS doesn't preserve dependencies between timestamps, so
-## Makefiles will often think rebuilding needs to occur when it doesn't.
-## Developers should './configure --enable-maintainer-mode' to turn on
-## rebuild rules.
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
-$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
-    # Check whether --enable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then :
-  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
-else
-  USE_MAINTAINER_MODE=no
-fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
-$as_echo "$USE_MAINTAINER_MODE" >&6; }
-   if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi
-
-  MAINT=$MAINTAINER_MODE_TRUE
-
-
-
-## ----------------------------------------------------------------------
-## Set prefix default (install directory) to a directory in the build area.
-## This allows multiple src-dir builds within one host.
-
-
-## Run post processing on files created by configure.
-## src/H5pubconf.h:
-## Generate src/H5pubconf.h from src/H5config.h by prepending H5_ to all
-## macro names. This avoid name conflict between HDF5 macro names and those
-## generated by another software package that uses the HDF5 library.
-## src/libhdf5.settings:
-## Remove all lines begun with "#" which are generated by CONDITIONAL's of
-## configure.
-ac_config_commands="$ac_config_commands pubconf"
-
-
-## It's possible to configure for a host other than the one on which
-## configure is currently running by using the --host=foo flag.
-## For machines on which HDF5 is often configured, it can be convenient
-## to specify the name of the machine rather than its canonical type.
-case $host_alias in
-  redstorm)
-    host_alias=x86_64-redstorm-linux-gnu
-    ;;
-esac
-
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if ${ac_cv_build+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
-  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if ${ac_cv_host+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "x$host_alias" = x; then
-  ac_cv_host=$ac_cv_build
-else
-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
-
-
-## H5_CFLAGS (and company) are for CFLAGS that should be used on HDF5, but
-## not exported to h5cc (or h5fc, etc.)
-
-
-
-
-
-
-## AM_CFLAGS (and company) are for CFLAGS that should be used on HDF5,
-## and WILL be exported to h5cc (or h5fc, etc) if set by configure.
-
-
-
-
-
-
-## Make sure flags are set to something (otherwise macros may set them later).
-AM_CFLAGS="${AM_CFLAGS}"
-AM_CXXFLAGS="${AM_CXXFLAGS}"
-AM_FCFLAGS="${AM_FCFLAGS}"
-AM_CPPFLAGS="${AM_CPPFLAGS}"
-AM_LDFLAGS="${AM_LDFLAGS}"
-CFLAGS="${CFLAGS}"
-CXXFLAGS="${CXXFLAGS}"
-FCFLAGS="${FCFLAGS}"
-CPPFLAGS="${CPPFLAGS}"
-LDFLAGS="${LDFLAGS}"
-
-## Configure may need to alter any of the *FLAGS variables in order for
-## various checks to work correctly. Save the user's value here so it
-## can be restored once all configure checks are complete.
-saved_user_CFLAGS="$CFLAGS"
-saved_user_CXXFLAGS="$CXXFLAGS"
-saved_user_FCFLAGS="$FCFLAGS"
-saved_user_LDFLAGS="$LDFLAGS"
-saved_user_CPPFLAGS="$CPPFLAGS"
-
-## Support F9X variable to define Fortran compiler if FC variable is
-## not used.  This should be deprecated in the future.
-if test "x" = "x$FC"; then
-  FC=${F9X}
-fi
-
-## ----------------------------------------------------------------------
-## Dump all shell variables values.
-##
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking shell variables initial values" >&5
-$as_echo_n "checking shell variables initial values... " >&6; }
-set >&5
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
-$as_echo "done" >&6; }
-
-## Define all symbol variables used for configure summary.
-## EXTERNAL_FILTERS equals all external filters. Default none.
-## MPE: whether MPE option is enabled. Default no.
-## STATIC_EXEC: whether static-exec is enabled. Default no.
-## HDF_FORTRAN: whether Fortran is enabled. Default no.
-## HDF_FORTRAN2003: whether Fortran 2003 is enabled. Default no.
-## FC: Fortran compiler.
-## HDF_CXX: whether C++ is enabled. Default no.
-## CXX: C++ compiler.
-## HDF5_HL: whether high-level library is enabled. Default is yes.
-## INSTRUMENT: whether INSTRUMENT is enabled. No default set here.
-## CODESTACK: whether CODESTACK is enabled. Default no.
-## HAVE_DMALLOC: whether system has dmalloc support. Default no.
-## DIRECT_VFD: whether DIRECT_VFD is enabled. Default no.
-## THREADSAFE: whether THREADSAFE is enabled. Default no.
-## STATIC_SHARED: whether static and/or shared libraries are requested.
-## enable_shared: whether shared lib is enabled.
-## enable_static: whether static lib is enabled.
-## UNAME_INFO: System information.
-
-
- MPE=no
- STATIC_EXEC=no
- HDF_FORTRAN=no
- HDF_FORTRAN2003=no
- HDF_FORTRAN=no
- HDF_FORTRAN2003=no
- HDF_CXX=no
- HDF_CXX=no
- HDF5_HL=yes
-
- CODESTACK=no
- HAVE_DMALLOC=no
- DIRECT_VFD=no
- THREADSAFE=no
-
-
-
- UNAME_INFO=`uname -a`
-
-## ----------------------------------------------------------------------
-## Some platforms have broken basename, and/or xargs programs. Check
-## that it actually does what it's supposed to do. Catch this early
-## since configure relies upon them heavily and there's no use continuing
-## if it's broken.
-##
-
-## Avoid depending upon Character Ranges.
-## These are defined by autoconf.
-## as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-## as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if basename works" >&5
-$as_echo_n "checking if basename works... " >&6; }
-BASENAME_TEST="`basename /foo/bar/baz/qux/basename_works`"
-if test $BASENAME_TEST != "basename_works"; then
-  as_fn_error $? "basename program doesn't work" "$LINENO" 5
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if xargs works" >&5
-$as_echo_n "checking if xargs works... " >&6; }
-XARGS_TEST="`echo /foo/bar/baz/qux/xargs_works | xargs basename`"
-if test $XARGS_TEST != "xargs_works"; then
-  as_fn_error $? "xargs program doesn't work" "$LINENO" 5
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
-
-## ----------------------------------------------------------------------
-## Check that the cache file was build on the same host as what we're
-## running on now.
-##
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cached host" >&5
-$as_echo_n "checking for cached host... " >&6; }
-if ${hdf5_cv_host+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  hdf5_cv_host="none"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hdf5_cv_host" >&5
-$as_echo "$hdf5_cv_host" >&6; };
-if test $hdf5_cv_host = "none"; then
-  hdf5_cv_host=$host
-elif test $hdf5_cv_host != $host; then
-  echo "The config.cache file was generated on $hdf5_cv_host but"
-  echo "this is $host.  Please remove that file and try again."
-  as_fn_error $? "config.cache file is invalid" "$LINENO" 5
-fi
-
-## ----------------------------------------------------------------------
-## Source any special files that we need.  These files normally aren't
-## present but can be used by the maintainers to fine tune things like
-## turning on debug or profiling flags for the compiler.  The search order
-## is:
-##
-##	CPU-VENDOR-OS
-##	VENDOR-OS
-##	CPU-OS
-##	CPU-VENDOR
-##	OS
-##	VENDOR
-##	CPU
-##
-## If the `OS' ends with a version number then remove it. For instance,
-## `freebsd3.1' would become `freebsd'
-
-case $host_os in
-  aix*)
-    host_os_novers=aix
-    ;;
-  freebsd*)
-    host_os_novers=freebsd
-    ;;
-  osf4.*)
-    host_os_novers=osf4.x
-    ;;
-  osf5.*)
-    host_os_novers=osf5.x
-    ;;
-  solaris2.*)
-    host_os_novers=solaris2.x
-    ;;
-  *)
-    host_os_novers=$host_os
-    ;;
-esac
-
-host_config="none"
-for f in $host_cpu-$host_vendor-$host_os \
-         $host_cpu-$host_vendor-$host_os_novers \
-         $host_vendor-$host_os \
-         $host_vendor-$host_os_novers \
-         $host_cpu-$host_os \
-         $host_cpu-$host_os_novers \
-         $host_cpu-$host_vendor \
-         $host_os \
-         $host_os_novers \
-         $host_vendor \
-         $host_cpu ; do
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for config $f" >&5
-$as_echo_n "checking for config $f... " >&6; }
-  if test -f "$srcdir/config/$f"; then
-    host_config=$srcdir/config/$f
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
-$as_echo "found" >&6; }
-    break
-  fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-done
-if test "X$host_config" != "Xnone"; then
-  CC_BASENAME="`echo $CC | cut -f1 -d' ' | xargs basename 2>/dev/null`"
-  . $host_config
-fi
-
-## Source any special site-specific file
-hname="`hostname`"
-while test -n "$hname"; do
-  file=$srcdir/config/site-specific/host-$hname
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for config $file" >&5
-$as_echo_n "checking for config $file... " >&6; }
-  if test -f "$file"; then
-    . $file
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
-$as_echo "found" >&6; }
-    break
-  fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  hname_tmp=$hname
-  hname="`echo $hname | cut -d. -f2-99`"
-  test "$hname_tmp" = "$hname" && break
-done
-
-## ----------------------------------------------------------------------
-## Some built-in configure checks can only see CFLAGS (not AM_CFLAGS), so
-## we need to add this in so configure works as intended. We will need to
-## reset this value at the end of configure, to preserve the user's settings.
-CFLAGS="${AM_CFLAGS} ${CFLAGS}"
-FCFLAGS="${AM_FCFLAGS} ${FCFLAGS}"
-CXXFLAGS="${AM_CXXFLAGS} ${CXXFLAGS}"
-CPPFLAGS="${AM_CPPFLAGS} ${CPPFLAGS}"
-LDFLAGS="${AM_LDFLAGS} ${LDFLAGS}"
-
-## ----------------------------------------------------------------------
-## Enable dependency tracking unless the configure options or a
-## site-specific file told us not to.  This prevents configure from
-## silently disabling dependencies for some compilers.
-##
-if test -z "${enable_dependency_tracking}"; then
-  enable_dependency_tracking="yes"
-fi
-
-## ----------------------------------------------------------------------
-## Check for programs.
-##
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-
-
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
-
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-
-# The possible output files:
-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
-
-ac_rmfiles=
-for ac_file in $ac_files
-do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-  esac
-done
-rm -f $ac_rmfiles
-
-if { { ac_try="$ac_link_default"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link_default") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-	then :; else
-	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	fi
-	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
-	# argument, so we may need to know it at that point already.
-	# Even if this section looks crufty: it has the advantage of
-	# actually working.
-	break;;
-    * )
-	break;;
-  esac
-done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
-else
-  ac_file=''
-fi
-if test -z "$ac_file"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
-ac_exeext=$ac_cv_exeext
-
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
-if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  break;;
-    * ) break;;
-  esac
-done
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-rm -f conftest conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdio.h>
-int
-main ()
-{
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files="$ac_clean_files conftest.out"
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-if test "$cross_compiling" != yes; then
-  { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-  if { ac_try='./conftest$ac_cv_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5; }
-    fi
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
-rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if ${ac_cv_objext+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  for ac_file in conftest.o conftest.obj conftest.*; do
-  test -f "$ac_file" || continue;
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-else
-  CFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-struct stat;
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_c89=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
-
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
-$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
-if ${am_cv_prog_cc_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-  # Make sure it works both with $CC and with simple cc.
-  # Following AC_PROG_CC_C_O, we do the test twice because some
-  # compilers refuse to overwrite an existing .o file with -o,
-  # though they will create one.
-  am_cv_prog_cc_c_o=yes
-  for am_i in 1 2; do
-    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
-   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } \
-         && test -f conftest2.$ac_objext; then
-      : OK
-    else
-      am_cv_prog_cc_c_o=no
-      break
-    fi
-  done
-  rm -f core conftest*
-  unset am_i
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
-$as_echo "$am_cv_prog_cc_c_o" >&6; }
-if test "$am_cv_prog_cc_c_o" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-DEPDIR="${am__leading_dot}deps"
-
-ac_config_commands="$ac_config_commands depfiles"
-
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo this is the am__doit target
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
-  am__include=include
-  am__quote=
-  _am_result=GNU
-  ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   case `$am_make -s -f confmf 2> /dev/null` in #(
-   *the\ am__doit\ target*)
-     am__include=.include
-     am__quote="\""
-     _am_result=BSD
-     ;;
-   esac
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
-
-# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then :
-  enableval=$enable_dependency_tracking;
-fi
-
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-  am__nodep='_no'
-fi
- if test "x$enable_dependency_tracking" != xno; then
-  AMDEP_TRUE=
-  AMDEP_FALSE='#'
-else
-  AMDEP_TRUE='#'
-  AMDEP_FALSE=
-fi
-
-
-
-depcc="$CC"   am_compiler_list=
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CC_dependencies_compiler_type+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named 'D' -- because '-MD' means "put the output
-  # in D".
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  am__universal=false
-  case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-      # Solaris 10 /bin/sh.
-      echo '/* dummy */' > sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle '-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs.
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # After this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested.
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok '-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
-
-
-CC_BASENAME="`echo $CC | cut -f1 -d' ' | xargs basename 2>/dev/null`"
-
-## ----------------------------------------------------------------------------
-## Configure disallows unsupported combinations of options. However, users
-## may want to override and build with unsupported combinations for their
-## own use. They can use the --enable-unsupported configure flag, which
-## ignores any errors from configure due to incompatible flags.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if unsupported combinations of configure options are allowed" >&5
-$as_echo_n "checking if unsupported combinations of configure options are allowed... " >&6; }
-# Check whether --enable-unsupported was given.
-if test "${enable_unsupported+set}" = set; then :
-  enableval=$enable_unsupported; ALLOW_UNSUPPORTED=$enableval
-fi
-
-
-case "X-$ALLOW_UNSUPPORTED" in
-  X-|X-no)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    ;;
-  X-yes)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-    ;;
-  *)
-    ;;
-esac
-
-## ----------------------------------------------------------------------
-## Check if they would like the Fortran interface compiled
-##
- HDF5_INTERFACES=""
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if Fortran interface enabled" >&5
-$as_echo_n "checking if Fortran interface enabled... " >&6; }
-# Check whether --enable-fortran was given.
-if test "${enable_fortran+set}" = set; then :
-  enableval=$enable_fortran; HDF_FORTRAN=$enableval
-fi
-
-
-if test "X$HDF_FORTRAN" = "Xyes"; then
-  echo "yes"
-else
-  echo "no"
-fi
-
-
-## ----------------------------------------------------------------------
-## Check if they would like the Fortran 2003 interface compiled
-##
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if Fortran 2003 interface enabled" >&5
-$as_echo_n "checking if Fortran 2003 interface enabled... " >&6; }
-# Check whether --enable-fortran2003 was given.
-if test "${enable_fortran2003+set}" = set; then :
-  enableval=$enable_fortran2003; HDF_FORTRAN2003=$enableval
-fi
-
-
-## ----------------------------------------------------------------------
-## Check to make sure --enable-fortran is present if --enable-fortran2003
-## was specified
-
-if test "X$HDF_FORTRAN2003" = "Xyes" && test "X$HDF_FORTRAN" = "Xno"; then
-  echo "no"
-  as_fn_error $? "--enable-fortran must be used with --enable-fortran2003" "$LINENO" 5
-else
-  if test "X$HDF_FORTRAN2003" = "Xyes" && test "X$HDF_FORTRAN" = "Xyes"; then
-    echo "yes"
-  else
-    echo "no"
-  fi
-fi
-
-if test "X$HDF_FORTRAN" = "Xyes"; then
-
-   HDF_FORTRAN=yes
-
-
-  HDF5_INTERFACES="$HDF5_INTERFACES fortran"
-
-  ## --------------------------------------------------------------------
-  ## HDF5 integer variables for the H5fortran_types.f90 file.
-  ##
-
-
-
-
-
-
-
-
-
-  ## --------------------------------------------------------------------
-  ## Fortran source extention
-  ##
-  ac_ext=${ac_fc_srcext-f}
-ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
-ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_fc_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  for ac_prog in gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn nagfor xlf90 f90 pgf90 pghpf epcf90 g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_FC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$FC"; then
-  ac_cv_prog_FC="$FC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_FC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-FC=$ac_cv_prog_FC
-if test -n "$FC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FC" >&5
-$as_echo "$FC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$FC" && break
-  done
-fi
-if test -z "$FC"; then
-  ac_ct_FC=$FC
-  for ac_prog in gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn nagfor xlf90 f90 pgf90 pghpf epcf90 g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_FC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_FC"; then
-  ac_cv_prog_ac_ct_FC="$ac_ct_FC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_FC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_FC=$ac_cv_prog_ac_ct_FC
-if test -n "$ac_ct_FC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_FC" >&5
-$as_echo "$ac_ct_FC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_FC" && break
-done
-
-  if test "x$ac_ct_FC" = x; then
-    FC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    FC=$ac_ct_FC
-  fi
-fi
-
-
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for Fortran compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-rm -f a.out
-
-# If we don't use `.F' as extension, the preprocessor is not run on the
-# input file.  (Note that this only needs to work for GNU compilers.)
-ac_save_ext=$ac_ext
-ac_ext=F
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Fortran compiler" >&5
-$as_echo_n "checking whether we are using the GNU Fortran compiler... " >&6; }
-if ${ac_cv_fc_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat > conftest.$ac_ext <<_ACEOF
-      program main
-#ifndef __GNUC__
-       choke me
-#endif
-
-      end
-_ACEOF
-if ac_fn_fc_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_fc_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fc_compiler_gnu" >&5
-$as_echo "$ac_cv_fc_compiler_gnu" >&6; }
-ac_ext=$ac_save_ext
-ac_test_FCFLAGS=${FCFLAGS+set}
-ac_save_FCFLAGS=$FCFLAGS
-FCFLAGS=
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $FC accepts -g" >&5
-$as_echo_n "checking whether $FC accepts -g... " >&6; }
-if ${ac_cv_prog_fc_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  FCFLAGS=-g
-cat > conftest.$ac_ext <<_ACEOF
-      program main
-
-      end
-_ACEOF
-if ac_fn_fc_try_compile "$LINENO"; then :
-  ac_cv_prog_fc_g=yes
-else
-  ac_cv_prog_fc_g=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_fc_g" >&5
-$as_echo "$ac_cv_prog_fc_g" >&6; }
-if test "$ac_test_FCFLAGS" = set; then
-  FCFLAGS=$ac_save_FCFLAGS
-elif test $ac_cv_prog_fc_g = yes; then
-  if test "x$ac_cv_fc_compiler_gnu" = xyes; then
-    FCFLAGS="-g -O2"
-  else
-    FCFLAGS="-g"
-  fi
-else
-  if test "x$ac_cv_fc_compiler_gnu" = xyes; then
-    FCFLAGS="-O2"
-  else
-    FCFLAGS=
-  fi
-fi
-
-if test $ac_compiler_gnu = yes; then
-  GFC=yes
-else
-  GFC=
-fi
-ac_ext=${ac_fc_srcext-f}
-ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
-ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_fc_compiler_gnu
-
-
-ac_ext=${ac_fc_srcext-f}
-ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
-ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_fc_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Fortran flag to compile .f90 files" >&5
-$as_echo_n "checking for Fortran flag to compile .f90 files... " >&6; }
-if ${ac_cv_fc_srcext_f90+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_ext=f90
-ac_fcflags_srcext_save=$ac_fcflags_srcext
-ac_fcflags_srcext=
-ac_cv_fc_srcext_f90=unknown
-case $ac_ext in #(
-  [fF]77) ac_try=f77;; #(
-  *) ac_try=f95;;
-esac
-for ac_flag in none -qsuffix=f=f90 -Tf "-x $ac_try"; do
-  test "x$ac_flag" != xnone && ac_fcflags_srcext="$ac_flag"
-  cat > conftest.$ac_ext <<_ACEOF
-      program main
-
-      end
-_ACEOF
-if ac_fn_fc_try_compile "$LINENO"; then :
-  ac_cv_fc_srcext_f90=$ac_flag; break
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest.$ac_objext conftest.f90
-ac_fcflags_srcext=$ac_fcflags_srcext_save
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fc_srcext_f90" >&5
-$as_echo "$ac_cv_fc_srcext_f90" >&6; }
-if test "x$ac_cv_fc_srcext_f90" = xunknown; then
-  as_fn_error $? "Fortran could not compile .f90 files" "$LINENO" 5
-else
-  ac_fc_srcext=f90
-  if test "x$ac_cv_fc_srcext_f90" = xnone; then
-    ac_fcflags_srcext=""
-    FCFLAGS_f90=""
-  else
-    ac_fcflags_srcext=$ac_cv_fc_srcext_f90
-    FCFLAGS_f90=$ac_cv_fc_srcext_f90
-  fi
-
-
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-
-  ## --------------------------------------------------------------------
-  ## Check for a Fortran compiler and how to include modules.
-  ##
-  ac_ext=${ac_fc_srcext-f}
-ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
-ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_fc_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  for ac_prog in gfortran ifort pgf90 pathf90 pathf95 xlf90 xlf95 xlf2003 f90 epcf90 f95 fort lf95 g95 ifc efc gfc
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_FC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$FC"; then
-  ac_cv_prog_FC="$FC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_FC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-FC=$ac_cv_prog_FC
-if test -n "$FC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FC" >&5
-$as_echo "$FC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$FC" && break
-  done
-fi
-if test -z "$FC"; then
-  ac_ct_FC=$FC
-  for ac_prog in gfortran ifort pgf90 pathf90 pathf95 xlf90 xlf95 xlf2003 f90 epcf90 f95 fort lf95 g95 ifc efc gfc
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_FC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_FC"; then
-  ac_cv_prog_ac_ct_FC="$ac_ct_FC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_FC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_FC=$ac_cv_prog_ac_ct_FC
-if test -n "$ac_ct_FC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_FC" >&5
-$as_echo "$ac_ct_FC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_FC" && break
-done
-
-  if test "x$ac_ct_FC" = x; then
-    FC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    FC=$ac_ct_FC
-  fi
-fi
-
-
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for Fortran compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-rm -f a.out
-
-# If we don't use `.F' as extension, the preprocessor is not run on the
-# input file.  (Note that this only needs to work for GNU compilers.)
-ac_save_ext=$ac_ext
-ac_ext=F
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Fortran compiler" >&5
-$as_echo_n "checking whether we are using the GNU Fortran compiler... " >&6; }
-if ${ac_cv_fc_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat > conftest.$ac_ext <<_ACEOF
-      program main
-#ifndef __GNUC__
-       choke me
-#endif
-
-      end
-_ACEOF
-if ac_fn_fc_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_fc_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fc_compiler_gnu" >&5
-$as_echo "$ac_cv_fc_compiler_gnu" >&6; }
-ac_ext=$ac_save_ext
-ac_test_FCFLAGS=${FCFLAGS+set}
-ac_save_FCFLAGS=$FCFLAGS
-FCFLAGS=
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $FC accepts -g" >&5
-$as_echo_n "checking whether $FC accepts -g... " >&6; }
-if ${ac_cv_prog_fc_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  FCFLAGS=-g
-cat > conftest.$ac_ext <<_ACEOF
-      program main
-
-      end
-_ACEOF
-if ac_fn_fc_try_compile "$LINENO"; then :
-  ac_cv_prog_fc_g=yes
-else
-  ac_cv_prog_fc_g=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_fc_g" >&5
-$as_echo "$ac_cv_prog_fc_g" >&6; }
-if test "$ac_test_FCFLAGS" = set; then
-  FCFLAGS=$ac_save_FCFLAGS
-elif test $ac_cv_prog_fc_g = yes; then
-  if test "x$ac_cv_fc_compiler_gnu" = xyes; then
-    FCFLAGS="-g -O2"
-  else
-    FCFLAGS="-g"
-  fi
-else
-  if test "x$ac_cv_fc_compiler_gnu" = xyes; then
-    FCFLAGS="-O2"
-  else
-    FCFLAGS=
-  fi
-fi
-
-if test $ac_compiler_gnu = yes; then
-  GFC=yes
-else
-  GFC=
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking what $FC does with modules" >&5
-$as_echo_n "checking what $FC does with modules... " >&6; }
-ac_ext=${ac_fc_srcext-f}
-ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
-ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_fc_compiler_gnu
-
-
-test -d conftestdir || mkdir conftestdir
-cd conftestdir
-rm -rf *
-
-cat >conftest.$ac_ext <<EOF
-      module module
-         integer foo
-      end module module
-EOF
-
-eval $ac_compile
-modfiles=""
-F9XMODEXT=""
-
-for f in conftest.o module.mod MODULE.mod module.M MODULE.M; do
-  if test -f "$f" ; then
-    modfiles="$f"
-
-    case "$f" in
-      *.o)   F9XMODEXT="o" ;;
-      *.mod) F9XMODEXT="mod" ;;
-      *.M)   F9XMODEXT="M" ;;
-    esac
-  fi
-done
-
-echo $modfiles 6>&1
-if test "$modfiles" = file.o; then
-  echo $ac_n "checking whether $FC -em is saner""... $ac_c" 1>&6
-  OLD_FCFLAGS=$FCFLAGS
-  FCFLAGS="$FCFLAGS -em"
-  eval $ac_compile
-  modfiles=""
-  for f in file.o module.mod MODULE.mod module.M MODULE.M; do
-    test -f $f && modfiles="$f"
-  done
-  if test "$modfiles" = "file.o"; then
-    FCFLAGS=$OLD_FCFLAGS
-    echo no 6>&1
-  else
-    echo yes 6>&1
-  fi
-fi
-cd ..
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how $FC finds modules" >&5
-$as_echo_n "checking how $FC finds modules... " >&6; }
-
-for flag in "-I" "-M" "-p"; do
-  cat >conftest.$ac_ext <<EOF
-      program conftest
-          use module
-      end program conftest
-EOF
-
-  ac_compile='${FC-f90} $FCFLAGS ${flag}conftestdir -c conftest.$ac_ext 1>&5'
-
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    F9XMODFLAG=$flag
-    break
-  fi
-done
-
-if test -n "$F9XMODFLAG"; then
-  echo $F9XMODFLAG 1>&6
-  FCFLAGS="$F9XMODFLAG. $FCFLAGS"
-else
-  echo unknown 1>&6
-fi
-
-
-rm -rf conftest*
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-  ## Change to the Fortran 90 language
-  ac_ext=${ac_fc_srcext-f}
-ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
-ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_fc_compiler_gnu
-
-
-  ## --------------------------------------------------------------------
-  ## Define wrappers for the C compiler to use Fortran function names
-  ##
-  ac_ext=${ac_fc_srcext-f}
-ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
-ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_fc_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to get verbose linking output from $FC" >&5
-$as_echo_n "checking how to get verbose linking output from $FC... " >&6; }
-if ${ac_cv_prog_fc_v+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat > conftest.$ac_ext <<_ACEOF
-      program main
-
-      end
-_ACEOF
-if ac_fn_fc_try_compile "$LINENO"; then :
-  ac_cv_prog_fc_v=
-# Try some options frequently used verbose output
-for ac_verb in -v -verbose --verbose -V -\#\#\#; do
-  cat > conftest.$ac_ext <<_ACEOF
-      program main
-
-      end
-_ACEOF
-
-# Compile and link our simple test program by passing a flag (argument
-# 1 to this macro) to the Fortran compiler in order to get
-# "verbose" output that we can then parse for the Fortran linker
-# flags.
-ac_save_FCFLAGS=$FCFLAGS
-FCFLAGS="$FCFLAGS $ac_verb"
-eval "set x $ac_link"
-shift
-$as_echo "$as_me:${as_lineno-$LINENO}: $*" >&5
-# gfortran 4.3 outputs lines setting COLLECT_GCC_OPTIONS, COMPILER_PATH,
-# LIBRARY_PATH; skip all such settings.
-ac_fc_v_output=`eval $ac_link 5>&1 2>&1 |
-  sed '/^Driving:/d; /^Configured with:/d;
-      '"/^[_$as_cr_Letters][_$as_cr_alnum]*=/d"`
-$as_echo "$ac_fc_v_output" >&5
-FCFLAGS=$ac_save_FCFLAGS
-
-rm -rf conftest*
-
-# On HP/UX there is a line like: "LPATH is: /foo:/bar:/baz" where
-# /foo, /bar, and /baz are search directories for the Fortran linker.
-# Here, we change these into -L/foo -L/bar -L/baz (and put it first):
-ac_fc_v_output="`echo $ac_fc_v_output |
-	grep 'LPATH is:' |
-	sed 's|.*LPATH is\(: *[^ ]*\).*|\1|;s|: */| -L/|g'` $ac_fc_v_output"
-
-# FIXME: we keep getting bitten by quoted arguments; a more general fix
-#        that detects unbalanced quotes in FLIBS should be implemented
-#        and (ugh) tested at some point.
-case $ac_fc_v_output in
-  # With xlf replace commas with spaces,
-  # and remove "-link" and closing parenthesis.
-  *xlfentry*)
-    ac_fc_v_output=`echo $ac_fc_v_output |
-      sed '
-        s/,/ /g
-        s/ -link / /g
-        s/) *$//
-      '
-    ` ;;
-
-  # With Intel ifc, ignore the quoted -mGLOB_options_string stuff (quoted
-  # $LIBS confuse us, and the libraries appear later in the output anyway).
-  *mGLOB_options_string*)
-    ac_fc_v_output=`echo $ac_fc_v_output | sed 's/"-mGLOB[^"]*"/ /g'` ;;
-
-  # Portland Group compiler has singly- or doubly-quoted -cmdline argument
-  # Singly-quoted arguments were reported for versions 5.2-4 and 6.0-4.
-  # Doubly-quoted arguments were reported for "PGF90/x86 Linux/x86 5.0-2".
-  *-cmdline\ * | *-ignore\ * | *-def\ *)
-    ac_fc_v_output=`echo $ac_fc_v_output | sed "\
-	s/-cmdline  *'[^']*'/ /g; s/-cmdline  *\"[^\"]*\"/ /g
-	s/-ignore  *'[^']*'/ /g; s/-ignore  *\"[^\"]*\"/ /g
-	s/-def  *'[^']*'/ /g; s/-def  *\"[^\"]*\"/ /g"` ;;
-
-  # If we are using fort77 (the f2c wrapper) then filter output and delete quotes.
-  *fort77*f2c*gcc*)
-    ac_fc_v_output=`echo "$ac_fc_v_output" | sed -n '
-        /:[	 ]\+Running[	 ]\{1,\}"gcc"/{
-          /"-c"/d
-          /[.]c"*/d
-          s/^.*"gcc"/"gcc"/
-          s/"//gp
-        }'` ;;
-
-  # If we are using Cray Fortran then delete quotes.
-  *cft90*)
-    ac_fc_v_output=`echo $ac_fc_v_output | sed 's/"//g'` ;;
-esac
-
-
-  # look for -l* and *.a constructs in the output
-  for ac_arg in $ac_fc_v_output; do
-     case $ac_arg in
-	[\\/]*.a | ?:[\\/]*.a | -[lLRu]*)
-	  ac_cv_prog_fc_v=$ac_verb
-	  break 2 ;;
-     esac
-  done
-done
-if test -z "$ac_cv_prog_fc_v"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot determine how to obtain linking information from $FC" >&5
-$as_echo "$as_me: WARNING: cannot determine how to obtain linking information from $FC" >&2;}
-fi
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: compilation failed" >&5
-$as_echo "$as_me: WARNING: compilation failed" >&2;}
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_fc_v" >&5
-$as_echo "$ac_cv_prog_fc_v" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Fortran libraries of $FC" >&5
-$as_echo_n "checking for Fortran libraries of $FC... " >&6; }
-if ${ac_cv_fc_libs+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "x$FCLIBS" != "x"; then
-  ac_cv_fc_libs="$FCLIBS" # Let the user override the test.
-else
-
-cat > conftest.$ac_ext <<_ACEOF
-      program main
-
-      end
-_ACEOF
-
-# Compile and link our simple test program by passing a flag (argument
-# 1 to this macro) to the Fortran compiler in order to get
-# "verbose" output that we can then parse for the Fortran linker
-# flags.
-ac_save_FCFLAGS=$FCFLAGS
-FCFLAGS="$FCFLAGS $ac_cv_prog_fc_v"
-eval "set x $ac_link"
-shift
-$as_echo "$as_me:${as_lineno-$LINENO}: $*" >&5
-# gfortran 4.3 outputs lines setting COLLECT_GCC_OPTIONS, COMPILER_PATH,
-# LIBRARY_PATH; skip all such settings.
-ac_fc_v_output=`eval $ac_link 5>&1 2>&1 |
-  sed '/^Driving:/d; /^Configured with:/d;
-      '"/^[_$as_cr_Letters][_$as_cr_alnum]*=/d"`
-$as_echo "$ac_fc_v_output" >&5
-FCFLAGS=$ac_save_FCFLAGS
-
-rm -rf conftest*
-
-# On HP/UX there is a line like: "LPATH is: /foo:/bar:/baz" where
-# /foo, /bar, and /baz are search directories for the Fortran linker.
-# Here, we change these into -L/foo -L/bar -L/baz (and put it first):
-ac_fc_v_output="`echo $ac_fc_v_output |
-	grep 'LPATH is:' |
-	sed 's|.*LPATH is\(: *[^ ]*\).*|\1|;s|: */| -L/|g'` $ac_fc_v_output"
-
-# FIXME: we keep getting bitten by quoted arguments; a more general fix
-#        that detects unbalanced quotes in FLIBS should be implemented
-#        and (ugh) tested at some point.
-case $ac_fc_v_output in
-  # With xlf replace commas with spaces,
-  # and remove "-link" and closing parenthesis.
-  *xlfentry*)
-    ac_fc_v_output=`echo $ac_fc_v_output |
-      sed '
-        s/,/ /g
-        s/ -link / /g
-        s/) *$//
-      '
-    ` ;;
-
-  # With Intel ifc, ignore the quoted -mGLOB_options_string stuff (quoted
-  # $LIBS confuse us, and the libraries appear later in the output anyway).
-  *mGLOB_options_string*)
-    ac_fc_v_output=`echo $ac_fc_v_output | sed 's/"-mGLOB[^"]*"/ /g'` ;;
-
-  # Portland Group compiler has singly- or doubly-quoted -cmdline argument
-  # Singly-quoted arguments were reported for versions 5.2-4 and 6.0-4.
-  # Doubly-quoted arguments were reported for "PGF90/x86 Linux/x86 5.0-2".
-  *-cmdline\ * | *-ignore\ * | *-def\ *)
-    ac_fc_v_output=`echo $ac_fc_v_output | sed "\
-	s/-cmdline  *'[^']*'/ /g; s/-cmdline  *\"[^\"]*\"/ /g
-	s/-ignore  *'[^']*'/ /g; s/-ignore  *\"[^\"]*\"/ /g
-	s/-def  *'[^']*'/ /g; s/-def  *\"[^\"]*\"/ /g"` ;;
-
-  # If we are using fort77 (the f2c wrapper) then filter output and delete quotes.
-  *fort77*f2c*gcc*)
-    ac_fc_v_output=`echo "$ac_fc_v_output" | sed -n '
-        /:[	 ]\+Running[	 ]\{1,\}"gcc"/{
-          /"-c"/d
-          /[.]c"*/d
-          s/^.*"gcc"/"gcc"/
-          s/"//gp
-        }'` ;;
-
-  # If we are using Cray Fortran then delete quotes.
-  *cft90*)
-    ac_fc_v_output=`echo $ac_fc_v_output | sed 's/"//g'` ;;
-esac
-
-
-
-ac_cv_fc_libs=
-
-# Save positional arguments (if any)
-ac_save_positional="$@"
-
-set X $ac_fc_v_output
-while test $# != 1; do
-  shift
-  ac_arg=$1
-  case $ac_arg in
-	[\\/]*.a | ?:[\\/]*.a)
-	    ac_exists=false
-  for ac_i in $ac_cv_fc_libs; do
-    if test x"$ac_arg" = x"$ac_i"; then
-      ac_exists=true
-      break
-    fi
-  done
-
-  if test x"$ac_exists" = xtrue; then :
-
-else
-  ac_cv_fc_libs="$ac_cv_fc_libs $ac_arg"
-fi
-	  ;;
-	-bI:*)
-	    ac_exists=false
-  for ac_i in $ac_cv_fc_libs; do
-    if test x"$ac_arg" = x"$ac_i"; then
-      ac_exists=true
-      break
-    fi
-  done
-
-  if test x"$ac_exists" = xtrue; then :
-
-else
-  if test "$ac_compiler_gnu" = yes; then
-  for ac_link_opt in $ac_arg; do
-    ac_cv_fc_libs="$ac_cv_fc_libs -Xlinker $ac_link_opt"
-  done
-else
-  ac_cv_fc_libs="$ac_cv_fc_libs $ac_arg"
-fi
-fi
-	  ;;
-	  # Ignore these flags.
-	-lang* | -lcrt*.o | -lc | -lgcc* | -lSystem | -libmil | -little \
-	  |-LANG:=* | -LIST:* | -LNO:* | -link)
-	  ;;
-	-lkernel32)
-	  case $host_os in
-	  *cygwin*) ;;
-	  *) ac_cv_fc_libs="$ac_cv_fc_libs $ac_arg"
-	    ;;
-	  esac
-	  ;;
-	-[LRuYz])
-	  # These flags, when seen by themselves, take an argument.
-	  # We remove the space between option and argument and re-iterate
-	  # unless we find an empty arg or a new option (starting with -)
-	  case $2 in
-	     "" | -*);;
-	     *)
-		ac_arg="$ac_arg$2"
-		shift; shift
-		set X $ac_arg "$@"
-		;;
-	  esac
-	  ;;
-	-YP,*)
-	  for ac_j in `$as_echo "$ac_arg" | sed -e 's/-YP,/-L/;s/:/ -L/g'`; do
-	      ac_exists=false
-  for ac_i in $ac_cv_fc_libs; do
-    if test x"$ac_j" = x"$ac_i"; then
-      ac_exists=true
-      break
-    fi
-  done
-
-  if test x"$ac_exists" = xtrue; then :
-
-else
-  ac_arg="$ac_arg $ac_j"
-			       ac_cv_fc_libs="$ac_cv_fc_libs $ac_j"
-fi
-	  done
-	  ;;
-	-[lLR]*)
-	    ac_exists=false
-  for ac_i in $ac_cv_fc_libs; do
-    if test x"$ac_arg" = x"$ac_i"; then
-      ac_exists=true
-      break
-    fi
-  done
-
-  if test x"$ac_exists" = xtrue; then :
-
-else
-  ac_cv_fc_libs="$ac_cv_fc_libs $ac_arg"
-fi
-	  ;;
-	-zallextract*| -zdefaultextract)
-	  ac_cv_fc_libs="$ac_cv_fc_libs $ac_arg"
-	  ;;
-	  # Ignore everything else.
-  esac
-done
-# restore positional arguments
-set X $ac_save_positional; shift
-
-# We only consider "LD_RUN_PATH" on Solaris systems.  If this is seen,
-# then we insist that the "run path" must be an absolute path (i.e. it
-# must begin with a "/").
-case `(uname -sr) 2>/dev/null` in
-   "SunOS 5"*)
-      ac_ld_run_path=`$as_echo "$ac_fc_v_output" |
-			sed -n 's,^.*LD_RUN_PATH *= *\(/[^ ]*\).*$,-R\1,p'`
-      test "x$ac_ld_run_path" != x &&
-	if test "$ac_compiler_gnu" = yes; then
-  for ac_link_opt in $ac_ld_run_path; do
-    ac_cv_fc_libs="$ac_cv_fc_libs -Xlinker $ac_link_opt"
-  done
-else
-  ac_cv_fc_libs="$ac_cv_fc_libs $ac_ld_run_path"
-fi
-      ;;
-esac
-fi # test "x$[]_AC_LANG_PREFIX[]LIBS" = "x"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fc_libs" >&5
-$as_echo "$ac_cv_fc_libs" >&6; }
-FCLIBS="$ac_cv_fc_libs"
-
-
-ac_ext=${ac_fc_srcext-f}
-ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
-ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_fc_compiler_gnu
-
-
-ac_ext=${ac_fc_srcext-f}
-ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
-ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_fc_compiler_gnu
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dummy main to link with Fortran libraries" >&5
-$as_echo_n "checking for dummy main to link with Fortran libraries... " >&6; }
-if ${ac_cv_fc_dummy_main+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_fc_dm_save_LIBS=$LIBS
- LIBS="$LIBS $FCLIBS"
- ac_fortran_dm_var=FC_DUMMY_MAIN
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
- # First, try linking without a dummy main:
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_fortran_dummy_main=none
-else
-  ac_cv_fortran_dummy_main=unknown
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-
- if test $ac_cv_fortran_dummy_main = unknown; then
-   for ac_func in MAIN__ MAIN_ __main MAIN _MAIN __MAIN main_ main__ _main; do
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#define $ac_fortran_dm_var $ac_func
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_fortran_dummy_main=$ac_func; break
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-   done
- fi
- ac_ext=${ac_fc_srcext-f}
-ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
-ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_fc_compiler_gnu
- ac_cv_fc_dummy_main=$ac_cv_fortran_dummy_main
- rm -rf conftest*
- LIBS=$ac_fc_dm_save_LIBS
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fc_dummy_main" >&5
-$as_echo "$ac_cv_fc_dummy_main" >&6; }
-FC_DUMMY_MAIN=$ac_cv_fc_dummy_main
-if test "$FC_DUMMY_MAIN" != unknown; then :
-  if test $FC_DUMMY_MAIN != none; then
-
-cat >>confdefs.h <<_ACEOF
-#define FC_DUMMY_MAIN $FC_DUMMY_MAIN
-_ACEOF
-
-  if test "x$ac_cv_fc_dummy_main" = "x$ac_cv_f77_dummy_main"; then
-
-$as_echo "#define FC_DUMMY_MAIN_EQ_F77 1" >>confdefs.h
-
-  fi
-fi
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "linking to Fortran libraries from C fails
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-
-ac_ext=${ac_fc_srcext-f}
-ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
-ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_fc_compiler_gnu
-
-ac_ext=${ac_fc_srcext-f}
-ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
-ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_fc_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Fortran name-mangling scheme" >&5
-$as_echo_n "checking for Fortran name-mangling scheme... " >&6; }
-if ${ac_cv_fc_mangling+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat > conftest.$ac_ext <<_ACEOF
-      subroutine foobar()
-      return
-      end
-      subroutine foo_bar()
-      return
-      end
-_ACEOF
-if ac_fn_fc_try_compile "$LINENO"; then :
-  mv conftest.$ac_objext cfortran_test.$ac_objext
-
-  ac_save_LIBS=$LIBS
-  LIBS="cfortran_test.$ac_objext $LIBS $FCLIBS"
-
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-  ac_success=no
-  for ac_foobar in foobar FOOBAR; do
-    for ac_underscore in "" "_"; do
-      ac_func="$ac_foobar$ac_underscore"
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_success=yes; break 2
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-    done
-  done
-  ac_ext=${ac_fc_srcext-f}
-ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
-ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_fc_compiler_gnu
-
-  if test "$ac_success" = "yes"; then
-     case $ac_foobar in
-	foobar)
-	   ac_case=lower
-	   ac_foo_bar=foo_bar
-	   ;;
-	FOOBAR)
-	   ac_case=upper
-	   ac_foo_bar=FOO_BAR
-	   ;;
-     esac
-
-     ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-     ac_success_extra=no
-     for ac_extra in "" "_"; do
-	ac_func="$ac_foo_bar$ac_underscore$ac_extra"
-	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_success_extra=yes; break
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-     done
-     ac_ext=${ac_fc_srcext-f}
-ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
-ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_fc_compiler_gnu
-
-     if test "$ac_success_extra" = "yes"; then
-	ac_cv_fc_mangling="$ac_case case"
-	if test -z "$ac_underscore"; then
-	   ac_cv_fc_mangling="$ac_cv_fc_mangling, no underscore"
-	else
-	   ac_cv_fc_mangling="$ac_cv_fc_mangling, underscore"
-	fi
-	if test -z "$ac_extra"; then
-	   ac_cv_fc_mangling="$ac_cv_fc_mangling, no extra underscore"
-	else
-	   ac_cv_fc_mangling="$ac_cv_fc_mangling, extra underscore"
-	fi
-      else
-	ac_cv_fc_mangling="unknown"
-      fi
-  else
-     ac_cv_fc_mangling="unknown"
-  fi
-
-  LIBS=$ac_save_LIBS
-  rm -rf conftest*
-  rm -f cfortran_test*
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compile a simple Fortran program
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fc_mangling" >&5
-$as_echo "$ac_cv_fc_mangling" >&6; }
-
-ac_ext=${ac_fc_srcext-f}
-ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
-ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_fc_compiler_gnu
-
-ac_ext=${ac_fc_srcext-f}
-ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
-ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_fc_compiler_gnu
-case $ac_cv_fc_mangling in
-  "lower case, no underscore, no extra underscore")
-	  $as_echo "#define FC_FUNC(name,NAME) name" >>confdefs.h
-
-	  $as_echo "#define FC_FUNC_(name,NAME) name" >>confdefs.h
- ;;
-  "lower case, no underscore, extra underscore")
-	  $as_echo "#define FC_FUNC(name,NAME) name" >>confdefs.h
-
-	  $as_echo "#define FC_FUNC_(name,NAME) name ## _" >>confdefs.h
- ;;
-  "lower case, underscore, no extra underscore")
-	  $as_echo "#define FC_FUNC(name,NAME) name ## _" >>confdefs.h
-
-	  $as_echo "#define FC_FUNC_(name,NAME) name ## _" >>confdefs.h
- ;;
-  "lower case, underscore, extra underscore")
-	  $as_echo "#define FC_FUNC(name,NAME) name ## _" >>confdefs.h
-
-	  $as_echo "#define FC_FUNC_(name,NAME) name ## __" >>confdefs.h
- ;;
-  "upper case, no underscore, no extra underscore")
-	  $as_echo "#define FC_FUNC(name,NAME) NAME" >>confdefs.h
-
-	  $as_echo "#define FC_FUNC_(name,NAME) NAME" >>confdefs.h
- ;;
-  "upper case, no underscore, extra underscore")
-	  $as_echo "#define FC_FUNC(name,NAME) NAME" >>confdefs.h
-
-	  $as_echo "#define FC_FUNC_(name,NAME) NAME ## _" >>confdefs.h
- ;;
-  "upper case, underscore, no extra underscore")
-	  $as_echo "#define FC_FUNC(name,NAME) NAME ## _" >>confdefs.h
-
-	  $as_echo "#define FC_FUNC_(name,NAME) NAME ## _" >>confdefs.h
- ;;
-  "upper case, underscore, extra underscore")
-	  $as_echo "#define FC_FUNC(name,NAME) NAME ## _" >>confdefs.h
-
-	  $as_echo "#define FC_FUNC_(name,NAME) NAME ## __" >>confdefs.h
- ;;
-  *)
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unknown Fortran name-mangling scheme" >&5
-$as_echo "$as_me: WARNING: unknown Fortran name-mangling scheme" >&2;}
-	  ;;
-esac
-
-ac_ext=${ac_fc_srcext-f}
-ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
-ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_fc_compiler_gnu
-
-
-  ## --------------------------------------------------------------------
-  ## See if the fortran compiler supports the intrinsic function "SIZEOF"
-
-  HAVE_SIZEOF_FORTRAN="no"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Fortran compiler supports intrinsic SIZEOF" >&5
-$as_echo_n "checking if Fortran compiler supports intrinsic SIZEOF... " >&6; }
-  cat > conftest.$ac_ext <<_ACEOF
-
-   PROGRAM main
-     i = sizeof(x)
-   END PROGRAM
-
-_ACEOF
-if ac_fn_fc_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-     	HAVE_SIZEOF_FORTRAN="yes"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-
-
-  ## See if the fortran compiler supports the intrinsic function "C_SIZEOF"
-
-  HAVE_C_SIZEOF_FORTRAN="no"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Fortran compiler supports intrinsic C_SIZEOF" >&5
-$as_echo_n "checking if Fortran compiler supports intrinsic C_SIZEOF... " >&6; }
-  cat > conftest.$ac_ext <<_ACEOF
-
-   PROGRAM main
-     USE ISO_C_BINDING
-     INTEGER(C_INT) :: a
-     INTEGER(C_SIZE_T) :: result
-     result = C_SIZEOF(a)
-   END PROGRAM
-
-_ACEOF
-if ac_fn_fc_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-     	HAVE_C_SIZEOF_FORTRAN="yes"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-
-
-  ## See if the fortran compiler supports the intrinsic function "STORAGE_SIZE"
-
-  HAVE_STORAGE_SIZE_FORTRAN="no"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Fortran compiler supports intrinsic STORAGE_SIZE" >&5
-$as_echo_n "checking if Fortran compiler supports intrinsic STORAGE_SIZE... " >&6; }
-  cat > conftest.$ac_ext <<_ACEOF
-
-   PROGRAM main
-     INTEGER :: a
-     INTEGER :: result
-     result = STORAGE_SIZE(a)
-   END PROGRAM
-
-_ACEOF
-if ac_fn_fc_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-     	HAVE_STORAGE_SIZE_FORTRAN="yes"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-
-
-
-  ## Check to see if -r8 was specified to determine if we need to
-  ## compile the DOUBLE PRECISION interfaces.
-
-  FORTRAN_DEFAULT_REALisDBLE="no"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Fortran default REAL is DOUBLE PRECISION" >&5
-$as_echo_n "checking if Fortran default REAL is DOUBLE PRECISION... " >&6; }
-
-  cat > conftest.$ac_ext <<_ACEOF
-
-     MODULE type_mod
-       INTERFACE h5t
-         MODULE PROCEDURE h5t_real
-         MODULE PROCEDURE h5t_dble
-       END INTERFACE
-     CONTAINS
-       SUBROUTINE h5t_real(r)
-         REAL :: r
-       END SUBROUTINE h5t_real
-       SUBROUTINE h5t_dble(d)
-         DOUBLE PRECISION :: d
-       END SUBROUTINE h5t_dble
-     END MODULE type_mod
-     PROGRAM main
-       USE type_mod
-       REAL :: r
-       DOUBLE PRECISION :: d
-       CALL h5t(r)
-       CALL h5t(d)
-     END PROGRAM main
-
-_ACEOF
-if ac_fn_fc_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            FORTRAN_DEFAULT_REALisDBLE="yes"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
-  if test "X$HDF_FORTRAN2003" = "Xyes"; then
-
-    ## Checking if the compiler supports the required Fortran 2003 features and
-    ## disable Fortran 2003 if it does not.
-
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Fortran compiler version compatible with Fortran 2003 HDF" >&5
-$as_echo_n "checking if Fortran compiler version compatible with Fortran 2003 HDF... " >&6; }
-    HAVE_FORTRAN_2003="no"
-    HAVE_F2003_REQUIREMENTS="no"
-    cat > conftest.$ac_ext <<_ACEOF
-      program main
-
-
-        USE iso_c_binding
-        IMPLICIT NONE
-        TYPE(C_PTR) :: ptr
-        TYPE(C_FUNPTR) :: funptr
-        CHARACTER(LEN=80, KIND=c_char), TARGET :: ichr
-
-        ptr = C_LOC(ichr(1:1))
-
-
-      end
-_ACEOF
-if ac_fn_fc_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-        HAVE_F2003_REQUIREMENTS=yes
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-
-
-    if test "X$HAVE_F2003_REQUIREMENTS" = "Xno"; then
-      as_fn_error $? "Fortran compiler lacks required Fortran 2003 features; unsupported Fortran 2003 compiler, remove --enable-fortran2003" "$LINENO" 5
-    else
-      HAVE_FORTRAN_2003="yes"
-    fi
-  fi
-else
-  FC="no"
-fi
-
-## Change back to the C language
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
- if test "X$HAVE_SIZEOF_FORTRAN" = "Xyes"; then
-  FORTRAN_HAVE_SIZEOF_TRUE=
-  FORTRAN_HAVE_SIZEOF_FALSE='#'
-else
-  FORTRAN_HAVE_SIZEOF_TRUE='#'
-  FORTRAN_HAVE_SIZEOF_FALSE=
-fi
-
- if test "X$HAVE_C_SIZEOF_FORTRAN" = "Xyes"; then
-  FORTRAN_HAVE_C_SIZEOF_TRUE=
-  FORTRAN_HAVE_C_SIZEOF_FALSE='#'
-else
-  FORTRAN_HAVE_C_SIZEOF_TRUE='#'
-  FORTRAN_HAVE_C_SIZEOF_FALSE=
-fi
-
- if test "X$HAVE_STORAGE_SIZE_FORTRAN" = "Xyes"; then
-  FORTRAN_HAVE_STORAGE_SIZE_TRUE=
-  FORTRAN_HAVE_STORAGE_SIZE_FALSE='#'
-else
-  FORTRAN_HAVE_STORAGE_SIZE_TRUE='#'
-  FORTRAN_HAVE_STORAGE_SIZE_FALSE=
-fi
-
- if test "X$HAVE_FORTRAN_2003" = "Xyes"; then
-  FORTRAN_2003_CONDITIONAL_F_TRUE=
-  FORTRAN_2003_CONDITIONAL_F_FALSE='#'
-else
-  FORTRAN_2003_CONDITIONAL_F_TRUE='#'
-  FORTRAN_2003_CONDITIONAL_F_FALSE=
-fi
-
- if test "X$FORTRAN_DEFAULT_REALisDBLE" = "Xyes"; then
-  FORTRAN_DEFAULT_REALisDBLE_F_TRUE=
-  FORTRAN_DEFAULT_REALisDBLE_F_FALSE='#'
-else
-  FORTRAN_DEFAULT_REALisDBLE_F_TRUE='#'
-  FORTRAN_DEFAULT_REALisDBLE_F_FALSE=
-fi
-
-
-## ----------------------------------------------------------------------
-## Check if they would like the C++ interface compiled
-##
-## We need to check for a C++ compiler unconditionally, since
-## AC_PROG_CXX defines some macros that Automake 1.9.x uses and will
-## miss even if c++ is not enabled.
-  ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -z "$CXX"; then
-  if test -n "$CCC"; then
-    CXX=$CCC
-  else
-    if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CXX=$ac_cv_prog_CXX
-if test -n "$CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CXX" && break
-  done
-fi
-if test -z "$CXX"; then
-  ac_ct_CXX=$CXX
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CXX"; then
-  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CXX="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-if test -n "$ac_ct_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-$as_echo "$ac_ct_CXX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CXX" && break
-done
-
-  if test "x$ac_ct_CXX" = x; then
-    CXX="g++"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CXX=$ac_ct_CXX
-  fi
-fi
-
-  fi
-fi
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if ${ac_cv_cxx_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GXX=yes
-else
-  GXX=
-fi
-ac_test_CXXFLAGS=${CXXFLAGS+set}
-ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
-$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if ${ac_cv_prog_cxx_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-   ac_cxx_werror_flag=yes
-   ac_cv_prog_cxx_g=no
-   CXXFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_cv_prog_cxx_g=yes
-else
-  CXXFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-else
-  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-	 CXXFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_cv_prog_cxx_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
-$as_echo "$ac_cv_prog_cxx_g" >&6; }
-if test "$ac_test_CXXFLAGS" = set; then
-  CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
-  if test "$GXX" = yes; then
-    CXXFLAGS="-g -O2"
-  else
-    CXXFLAGS="-g"
-  fi
-else
-  if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
-  else
-    CXXFLAGS=
-  fi
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-depcc="$CXX"  am_compiler_list=
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named 'D' -- because '-MD' means "put the output
-  # in D".
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CXX_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  am__universal=false
-  case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-      # Solaris 10 /bin/sh.
-      echo '/* dummy */' > sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle '-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs.
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # After this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested.
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok '-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CXX_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CXX_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
-CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
-  am__fastdepCXX_TRUE=
-  am__fastdepCXX_FALSE='#'
-else
-  am__fastdepCXX_TRUE='#'
-  am__fastdepCXX_FALSE=
-fi
-
-
-  ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
-$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
-if test -z "$CXXCPP"; then
-  if ${ac_cv_prog_CXXCPP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CXXCPP needs to be expanded
-    for CXXCPP in "$CXX -E" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-  break
-fi
-
-    done
-    ac_cv_prog_CXXCPP=$CXXCPP
-
-fi
-  CXXCPP=$ac_cv_prog_CXXCPP
-else
-  ac_cv_prog_CXXCPP=$CXXCPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
-$as_echo "$CXXCPP" >&6; }
-ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-	## this is checked for when AC_HEADER_STDC is done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if c++ interface enabled" >&5
-$as_echo_n "checking if c++ interface enabled... " >&6; }
-
-# Check whether --enable-cxx was given.
-if test "${enable_cxx+set}" = set; then :
-  enableval=$enable_cxx; HDF_CXX=$enableval
-fi
-
-
-if test "X$HDF_CXX" = "Xyes"; then
-  echo "yes"
-  HDF5_INTERFACES="$HDF5_INTERFACES c++"
-
-  ## Change to the C++ language
-  ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-  # Checking if C++ needs old style header files in includes
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX needs old style header files in includes" >&5
-$as_echo_n "checking if $CXX needs old style header files in includes... " >&6; }
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <iostream>
-
-int main(void) { return 0; }
-
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-    CXXFLAGS="${CXXFLAGS} -DOLD_HEADER_FILENAME"
-    AM_CXXFLAGS="${AM_CXXFLAGS} -DOLD_HEADER_FILENAME"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-
-
-  # Checking if C++ can handle namespaces
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX can handle namespaces" >&5
-$as_echo_n "checking if $CXX can handle namespaces... " >&6; }
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-namespace H5 {
-int fnord;
-}
-
-int main(void) {
-   using namespace H5;
-   fnord = 37;
-   return 0;
-}
-
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-     CXXFLAGS="${CXXFLAGS} -DH5_NO_NAMESPACE"
-     AM_CXXFLAGS="${AM_CXXFLAGS} -DH5_NO_NAMESPACE"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-
-
-  # Checking if C++ has offsetof extension
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX has offsetof extension" >&5
-$as_echo_n "checking if $CXX has offsetof extension... " >&6; }
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-  #include <stdio.h>
-  #include <stddef.h>
-
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-
-    struct index_st
-    {
-      unsigned char type;
-      unsigned char num;
-      unsigned int len;
-    };
-    typedef struct index_st index_t;
-    int x,y;
-    x = offsetof(struct index_st, len);
-    y = offsetof(index_t, num)
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define CXX_HAVE_OFFSETOF 1" >>confdefs.h
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-
-
-  # if C++ can handle static cast
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX can handle static cast" >&5
-$as_echo_n "checking if $CXX can handle static cast... " >&6; }
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int main(void) {
-   float test_float;
-   int test_int;
-   test_float = 37.0;
-   test_int = static_cast <int> (test_float);
-   return 0;
-}
-
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    CXXFLAGS="${CXXFLAGS} -DNO_STATIC_CAST"
-    AM_CXXFLAGS="${AM_CXXFLAGS} -DNO_STATIC_CAST"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  CXX="no"
-fi
-
-## Change back to the C language
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-## ----------------------------------------------------------------------
-## Check if they would like the High Level library  compiled
-##
-
- HL=""
-## name of fortran folder inside "hl", if FORTRAN compile is requested
- HL_FOR=""
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if high level library is enabled" >&5
-$as_echo_n "checking if high level library is enabled... " >&6; }
-# Check whether --enable-hl was given.
-if test "${enable_hl+set}" = set; then :
-  enableval=$enable_hl; HDF5_HL=$enableval
-else
-  HDF5_HL=yes
-fi
-
-
-if test "X$HDF5_HL" = "Xyes"; then
- echo "yes"
- HL="hl"
-
-$as_echo "#define INCLUDE_HL 1" >>confdefs.h
-
-
-  ## If Fortran's default real is double precision and HL is being built then configure
-  ## should fail due to bug HDFFV-889.
-  if test "X$FORTRAN_DEFAULT_REALisDBLE" = "Xyes"; then
-    as_fn_error $? "Fortran high-level routines are not supported when the default REAL is DOUBLE PRECISION, use configure option --disable-hl." "$LINENO" 5
-  fi
-else
- echo "no"
-fi
-
-
-## ----------------------------------------------------------------------
-## Check if they have Perl installed on their system. We only need Perl
-## if they're using a GNU compiler.
-##
- PERL=""
-if test "X$GCC" = "Xyes"; then
-  for ac_prog in perl
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_PERL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$PERL"; then
-  ac_cv_prog_PERL="$PERL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_PERL="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-PERL=$ac_cv_prog_PERL
-if test -n "$PERL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
-$as_echo "$PERL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$PERL" && break
-done
-
-fi
-
-## ----------------------------------------------------------------------
-## Check which archiving tool to use. This needs to be done before
-## the AM_PROG_LIBTOOL macro.
-##
-
-if test -z "$AR"; then
-  for ac_prog in ar xar
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AR="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AR=$ac_cv_prog_AR
-if test -n "$AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-$as_echo "$AR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$AR" && break
-done
-test -n "$AR" || AR=":"
-
-fi
-
-
-## Export the AR macro so that it will be placed in the libtool file
-## correctly.
-export AR
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  SET_MAKE=
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-
-
-
-## ----------------------------------------------------------------------
-## Set up ${TR} which is used to process DEBUG_PKG.
-# Extract the first word of "tr", so it can be a program name with args.
-set dummy tr; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_TR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $TR in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_TR="$TR" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_TR="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-TR=$ac_cv_path_TR
-if test -n "$TR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TR" >&5
-$as_echo "$TR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-
-## ----------------------------------------------------------------------
-## Check that time can be used with srcdir.  This is okay on most systems,
-## but seems to cause problems on Cygwin.
-## The solution on Cygwin is not to record execution time for tests.
-##
-## Note: This is still true as of Cygwin 1.7.32 (Aug 2014) on both 32-
-## and 64-bit platforms. Given how long this has been true, it seems
-## unlikely to change, but we should probably re-test this periodically.
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if srcdir= and time commands work together" >&5
-$as_echo_n "checking if srcdir= and time commands work together... " >&6; }
-
-
-TIME=time
-TIME_TEST=`foo="bar" ${TIME} echo 'baz' 2> /dev/null | grep baz`
-
-if test "X${TIME_TEST}" = "Xbaz"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  TIME=
-fi
-
-
-## The following variables are used to distinguish between building a
-## serial and parallel library.
-##
-##    HAVE_PARALLEL	-- defined in H5config.h if we are building
-##			   a parallel library even if configure wasn't
-##			   able to find some header file or library that
-##			   might be required. This is defined if the
-##			   user explicitly states
-##			   that a parallel library is being built by supplying
-##			   the `--enable-parallel' configure switch.
-##
-##    PARALLEL		-- This variable is set to a non-null value if
-##			   we're building a parallel version of the library.
-##
-##    RUNSERIAL	        -- This is a command which will be prepended to
-##			   the executable name to run the executable using
-##			   a single process. For serial versions of the
-##			   library this will normally be empty. For parallel
-##			   versions it might be something like `mpiexec -n 1'.
-##			   The value of this variable is substituted in *.in
-##			   files.
-##
-##    RUNPARALLEL	-- This is a command which will be prepended to
-##			   the executable name to run the executable on
-##			   multiple processors. For the serial library the
-##			   value will normally be the empty string. For
-##			   parallel library it should be something like
-##			   "mpiexec -n \$\${NPROCS:=6}" where NPROCS will
-##			   eventually contain the number of processors on which
-##			   to run the executable (the double dollarsigns are to
-##			   protect the expansion until make executes the
-##			   command).  The value of this variable is
-##			   substituted in *.in files.
-##
-
-
-
-
-
-## ----------------------------------------------------------------------
-## Fortran libraries are not currently supported on Mac. Disable them.
-## (this is overridable with --enable-unsupported).
-##
-
-H5_FORTRAN_SHARED="no"
-if test "X${HDF_FORTRAN}" = "Xyes" && test "X${enable_shared}" != "Xno"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if shared Fortran libraries are supported" >&5
-$as_echo_n "checking if shared Fortran libraries are supported... " >&6; }
-  H5_FORTRAN_SHARED="yes"
-
-  ## Disable fortran shared libraries on Mac. (MAM - 03/30/11)
-
-  case "`uname`" in
-    Darwin*)
-    H5_FORTRAN_SHARED="no"
-    CHECK_WARN="Shared Fortran libraries not currently supported on Mac."
-      ;;
-  esac
-
-  ## Report results of check(s)
-
-  if test "X${H5_FORTRAN_SHARED}" = "Xno"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $CHECK_WARN" >&5
-$as_echo "$as_me: WARNING: $CHECK_WARN" >&2;}
-    if test "X${ALLOW_UNSUPPORTED}" != "Xyes"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling shared Fortran libraries." >&5
-$as_echo "$as_me: WARNING: Disabling shared Fortran libraries." >&2;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: To override this behavior, please use --enable-unsupported configure option." >&5
-$as_echo "$as_me: WARNING: To override this behavior, please use --enable-unsupported configure option." >&2;}
-        if test "X${enable_static}" = "Xno"; then
-          as_fn_error $? "both static and shared Fortran libraries are disabled" "$LINENO" 5
-        fi
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Allowing unsupported Fortran shared libraries due to use of --enable-unsupported flag" >&5
-$as_echo "$as_me: WARNING: Allowing unsupported Fortran shared libraries due to use of --enable-unsupported flag" >&2;}
-      H5_FORTRAN_SHARED="yes"
-    fi
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  fi
-fi
-
- if test "X$H5_FORTRAN_SHARED" = "Xyes"; then
-  FORTRAN_SHARED_CONDITIONAL_TRUE=
-  FORTRAN_SHARED_CONDITIONAL_FALSE='#'
-else
-  FORTRAN_SHARED_CONDITIONAL_TRUE='#'
-  FORTRAN_SHARED_CONDITIONAL_FALSE=
-fi
-
-
-## ----------------------------------------------------------------------
-## Disable C++ shared libraries if +DD64 flag is detected.
-##
-
-H5_CXX_SHARED="no"
-if test "X${HDF_CXX}" = "Xyes" && test "X${enable_shared}" != "Xno"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if shared C++ libraries are supported" >&5
-$as_echo_n "checking if shared C++ libraries are supported... " >&6; }
-  H5_CXX_SHARED="yes"
-
-  ## Disable C++ shared libraries if DD64 flag is being used.
-
-  if (echo dummy ${CXX} ${CXXLD} ${CFLAGS} ${CXXFLAGS} ${LDFLAGS} | grep 'DD64') > /dev/null; then
-    H5_CXX_SHARED="no"
-    CHECK_WARN="Shared C++ libraries not currently supported with +DD64 flag."
-  fi
-
-  ## Report results of check(s)
-
-  if test "X${H5_CXX_SHARED}" = "Xno"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $CHECK_WARN" >&5
-$as_echo "$as_me: WARNING: $CHECK_WARN" >&2;}
-    if test "X${ALLOW_UNSUPPORTED}" != "Xyes"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling shared C++ libraries." >&5
-$as_echo "$as_me: WARNING: Disabling shared C++ libraries." >&2;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: To override this behavior, please use --enable-unsupported configure option." >&5
-$as_echo "$as_me: WARNING: To override this behavior, please use --enable-unsupported configure option." >&2;}
-      if test "X${enable_static}" = "Xno"; then
-        as_fn_error $? "both static and shared C++ libraries are disabled" "$LINENO" 5
-      fi
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Allowing unsupported C++ shared librares due to use of --enable-unsupported flag" >&5
-$as_echo "$as_me: WARNING: Allowing unsupported C++ shared librares due to use of --enable-unsupported flag" >&2;}
-    fi
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  fi
-fi
-
- if test "X$H5_CXX_SHARED" = "Xyes"; then
-  CXX_SHARED_CONDITIONAL_TRUE=
-  CXX_SHARED_CONDITIONAL_FALSE='#'
-else
-  CXX_SHARED_CONDITIONAL_TRUE='#'
-  CXX_SHARED_CONDITIONAL_FALSE=
-fi
-
-
-## ----------------------------------------------------------------------
-## pgcc version 6.0x have optimization (-O, -O2 or -O3) problem.  Detect
-## these versions and add option "-Mx,28,0x8" to the compiler to avoid
-## the problem if optimization is enabled.
-##
-
-if (${CC-cc} -V 2>&1 | grep '^pgcc 6.0') > /dev/null && test "X$enable_production" = "Xyes"; then
-    echo 'adding compiler flag to avoid optimization problem in pgcc'
-    CC="${CC-cc} -Mx,28,0x8"
-fi
-
-## ----------------------------------------------------------------------
-## Shared libraries are not currently supported under Cygwin, so configure
-## disables them unless --enable-unsupported has been supplied by the user.
-
-if test "X${ALLOW_UNSUPPORTED}" != "Xyes"; then
-  case "`uname`" in
-    CYGWIN*)
-      if test "X${enable_shared}" = "Xyes"; then
-        echo '    warning: shared libraries are not supported on Cygwin!'
-        echo '    disabling shared libraries'
-        echo '    use --enable-unsupported to override this warning and keep shared libraries enabled'
-      fi
-      enable_shared="no"
-      ;;
-  esac
-fi
-
-## ----------------------------------------------------------------------
-## Windows won't create DLLs without the following macro.
-##
-enable_win32_dll=yes
-
-case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
-set dummy ${ac_tool_prefix}as; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AS+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AS="${ac_tool_prefix}as"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AS=$ac_cv_prog_AS
-if test -n "$AS"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
-$as_echo "$AS" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_AS"; then
-  ac_ct_AS=$AS
-  # Extract the first word of "as", so it can be a program name with args.
-set dummy as; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_AS+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_AS"; then
-  ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_AS="as"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_AS=$ac_cv_prog_ac_ct_AS
-if test -n "$ac_ct_AS"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
-$as_echo "$ac_ct_AS" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_AS" = x; then
-    AS="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    AS=$ac_ct_AS
-  fi
-else
-  AS="$ac_cv_prog_AS"
-fi
-
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DLLTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DLLTOOL=$ac_cv_prog_DLLTOOL
-if test -n "$DLLTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
-$as_echo "$DLLTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_DLLTOOL"; then
-  ac_ct_DLLTOOL=$DLLTOOL
-  # Extract the first word of "dlltool", so it can be a program name with args.
-set dummy dlltool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_DLLTOOL"; then
-  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
-if test -n "$ac_ct_DLLTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
-$as_echo "$ac_ct_DLLTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_DLLTOOL" = x; then
-    DLLTOOL="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DLLTOOL=$ac_ct_DLLTOOL
-  fi
-else
-  DLLTOOL="$ac_cv_prog_DLLTOOL"
-fi
-
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
-set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OBJDUMP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OBJDUMP"; then
-  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OBJDUMP=$ac_cv_prog_OBJDUMP
-if test -n "$OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-$as_echo "$OBJDUMP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OBJDUMP"; then
-  ac_ct_OBJDUMP=$OBJDUMP
-  # Extract the first word of "objdump", so it can be a program name with args.
-set dummy objdump; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OBJDUMP"; then
-  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
-if test -n "$ac_ct_OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-$as_echo "$ac_ct_OBJDUMP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OBJDUMP" = x; then
-    OBJDUMP="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OBJDUMP=$ac_ct_OBJDUMP
-  fi
-else
-  OBJDUMP="$ac_cv_prog_OBJDUMP"
-fi
-
-  ;;
-esac
-
-test -z "$AS" && AS=as
-
-
-
-
-
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-
-
-
-
-
-test -z "$OBJDUMP" && OBJDUMP=objdump
-
-
-
-
-
-
-
-
-## ----------------------------------------------------------------------
-## Create libtool.  If shared/static libraries are going to be enabled
-## or disabled, it should happen before these macros.
-
-case `pwd` in
-  *\ * | *\	*)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
-esac
-
-
-
-macro_version='2.4.2'
-macro_revision='1.3337'
-
-
-
-
-
-
-
-
-
-
-
-
-
-ltmain="$ac_aux_dir/ltmain.sh"
-
-# Backslashify metacharacters that are still active within
-# double-quoted strings.
-sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
-$as_echo_n "checking how to print strings... " >&6; }
-# Test print first, because it will be a builtin if present.
-if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
-   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='print -r --'
-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='printf %s\n'
-else
-  # Use this function as a fallback that always works.
-  func_fallback_echo ()
-  {
-    eval 'cat <<_LTECHO_EOF
-$1
-_LTECHO_EOF'
-  }
-  ECHO='func_fallback_echo'
-fi
-
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
-    $ECHO ""
-}
-
-case "$ECHO" in
-  printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
-$as_echo "printf" >&6; } ;;
-  print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
-$as_echo "print -r" >&6; } ;;
-  *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
-$as_echo "cat" >&6; } ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if ${ac_cv_path_SED+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-     for ac_i in 1 2 3 4 5 6 7; do
-       ac_script="$ac_script$as_nl$ac_script"
-     done
-     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
-     { ac_script=; unset ac_script;}
-     if test -z "$SED"; then
-  ac_path_SED_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_SED" || continue
-# Check for GNU ac_path_SED and select it if it is found.
-  # Check for GNU $ac_path_SED
-case `"$ac_path_SED" --version 2>&1` in
-*GNU*)
-  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo '' >> "conftest.nl"
-    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_SED_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_SED="$ac_path_SED"
-      ac_path_SED_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_SED_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_SED"; then
-    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
-  fi
-else
-  ac_cv_path_SED=$SED
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-$as_echo "$ac_cv_path_SED" >&6; }
- SED="$ac_cv_path_SED"
-  rm -f conftest.sed
-
-test -z "$SED" && SED=sed
-Xsed="$SED -e 1s/^X//"
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if ${ac_cv_path_GREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$GREP"; then
-  ac_path_GREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in grep ggrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_GREP" || continue
-# Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_GREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_GREP"; then
-    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_GREP=$GREP
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_path_EGREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-   then ac_cv_path_EGREP="$GREP -E"
-   else
-     if test -z "$EGREP"; then
-  ac_path_EGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in egrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_EGREP" || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
-  # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'EGREP' >> "conftest.nl"
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_EGREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_EGREP=$EGREP
-fi
-
-   fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
-$as_echo_n "checking for fgrep... " >&6; }
-if ${ac_cv_path_FGREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-   then ac_cv_path_FGREP="$GREP -F"
-   else
-     if test -z "$FGREP"; then
-  ac_path_FGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in fgrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_FGREP" || continue
-# Check for GNU ac_path_FGREP and select it if it is found.
-  # Check for GNU $ac_path_FGREP
-case `"$ac_path_FGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'FGREP' >> "conftest.nl"
-    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_FGREP="$ac_path_FGREP"
-      ac_path_FGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_FGREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_FGREP"; then
-    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_FGREP=$FGREP
-fi
-
-   fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
-$as_echo "$ac_cv_path_FGREP" >&6; }
- FGREP="$ac_cv_path_FGREP"
-
-
-test -z "$GREP" && GREP=grep
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then :
-  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi
-
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
-$as_echo_n "checking for ld used by $CC... " >&6; }
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [\\/]* | ?:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
-      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
-$as_echo_n "checking for non-GNU ld... " >&6; }
-fi
-if ${lt_cv_path_LD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
-	;;
-      *)
-	test "$with_gnu_ld" != yes && break
-	;;
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
-fi
-
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-$as_echo "$LD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if ${lt_cv_prog_gnu_ld+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  # I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-$as_echo "$lt_cv_prog_gnu_ld" >&6; }
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
-$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
-if ${lt_cv_path_NM+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-    lt_nm_to_check="$lt_nm_to_check nm"
-  fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS="$lt_save_ifs"
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm="$ac_dir/$lt_tmp_nm"
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
-	#   nm: unknown option "B" ignored
-	# Tru64's nm complains that /dev/null is an invalid object file
-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-	*/dev/null* | *'Invalid file or object type'*)
-	  lt_cv_path_NM="$tmp_nm -B"
-	  break
-	  ;;
-	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	  */dev/null*)
-	    lt_cv_path_NM="$tmp_nm -p"
-	    break
-	    ;;
-	  *)
-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	    continue # so that we can try to find one that supports BSD flags
-	    ;;
-	  esac
-	  ;;
-	esac
-      fi
-    done
-    IFS="$lt_save_ifs"
-  done
-  : ${lt_cv_path_NM=no}
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
-$as_echo "$lt_cv_path_NM" >&6; }
-if test "$lt_cv_path_NM" != "no"; then
-  NM="$lt_cv_path_NM"
-else
-  # Didn't find any BSD compatible name lister, look for dumpbin.
-  if test -n "$DUMPBIN"; then :
-    # Let the user override the test.
-  else
-    if test -n "$ac_tool_prefix"; then
-  for ac_prog in dumpbin "link -dump"
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DUMPBIN+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DUMPBIN"; then
-  ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DUMPBIN=$ac_cv_prog_DUMPBIN
-if test -n "$DUMPBIN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
-$as_echo "$DUMPBIN" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$DUMPBIN" && break
-  done
-fi
-if test -z "$DUMPBIN"; then
-  ac_ct_DUMPBIN=$DUMPBIN
-  for ac_prog in dumpbin "link -dump"
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_DUMPBIN"; then
-  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
-if test -n "$ac_ct_DUMPBIN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
-$as_echo "$ac_ct_DUMPBIN" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_DUMPBIN" && break
-done
-
-  if test "x$ac_ct_DUMPBIN" = x; then
-    DUMPBIN=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DUMPBIN=$ac_ct_DUMPBIN
-  fi
-fi
-
-    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
-    *COFF*)
-      DUMPBIN="$DUMPBIN -symbols"
-      ;;
-    *)
-      DUMPBIN=:
-      ;;
-    esac
-  fi
-
-  if test "$DUMPBIN" != ":"; then
-    NM="$DUMPBIN"
-  fi
-fi
-test -z "$NM" && NM=nm
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
-$as_echo_n "checking the name lister ($NM) interface... " >&6; }
-if ${lt_cv_nm_interface+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_nm_interface="BSD nm"
-  echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
-  (eval "$ac_compile" 2>conftest.err)
-  cat conftest.err >&5
-  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-  cat conftest.err >&5
-  (eval echo "\"\$as_me:$LINENO: output\"" >&5)
-  cat conftest.out >&5
-  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-    lt_cv_nm_interface="MS dumpbin"
-  fi
-  rm -f conftest*
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
-$as_echo "$lt_cv_nm_interface" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
-$as_echo_n "checking whether ln -s works... " >&6; }
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-$as_echo "no, using $LN_S" >&6; }
-fi
-
-# find the maximum length of command line arguments
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
-$as_echo_n "checking the maximum length of command line arguments... " >&6; }
-if ${lt_cv_sys_max_cmd_len+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-    i=0
-  teststring="ABCD"
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
-
-  cygwin* | mingw* | cegcc*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  mint*)
-    # On MiNT this can take a long time and run out of memory.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
-
-  interix*)
-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-    lt_cv_sys_max_cmd_len=196608
-    ;;
-
-  os2*)
-    # The test takes a long time on OS/2.
-    lt_cv_sys_max_cmd_len=8192
-    ;;
-
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  sco3.2v5*)
-    lt_cv_sys_max_cmd_len=102400
-    ;;
-  sysv5* | sco5v6* | sysv4.2uw2*)
-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-    if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[	 ]//'`
-    else
-      lt_cv_sys_max_cmd_len=32768
-    fi
-    ;;
-  *)
-    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    else
-      # Make teststring a little bigger before we do anything with it.
-      # a 1K string should be a reasonable start.
-      for i in 1 2 3 4 5 6 7 8 ; do
-        teststring=$teststring$teststring
-      done
-      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-      # If test is not a shell built-in, we'll probably end up computing a
-      # maximum length that is only half of the actual maximum length, but
-      # we can't tell.
-      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
-	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
-	      test $i != 17 # 1/2 MB should be enough
-      do
-        i=`expr $i + 1`
-        teststring=$teststring$teststring
-      done
-      # Only check the string length outside the loop.
-      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
-      teststring=
-      # Add a significant safety factor because C++ compilers can tack on
-      # massive amounts of additional arguments before passing them to the
-      # linker.  It appears as though 1/2 is a usable value.
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    fi
-    ;;
-  esac
-
-fi
-
-if test -n $lt_cv_sys_max_cmd_len ; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
-$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
-$as_echo "none" >&6; }
-fi
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-
-
-
-
-
-: ${CP="cp -f"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
-$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
-  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
-      = c,a/b,b/c, \
-    && eval 'test $(( 1 + 1 )) -eq 2 \
-    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-  && xsi_shell=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
-$as_echo "$xsi_shell" >&6; }
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
-$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
-    >/dev/null 2>&1 \
-  && lt_shell_append=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
-$as_echo "$lt_shell_append" >&6; }
-
-
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  lt_unset=unset
-else
-  lt_unset=false
-fi
-
-
-
-
-
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-  lt_SP2NL='tr \040 \012'
-  lt_NL2SP='tr \015\012 \040\040'
-  ;;
- *) # EBCDIC based system
-  lt_SP2NL='tr \100 \n'
-  lt_NL2SP='tr \r\n \100\100'
-  ;;
-esac
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
-$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
-if ${lt_cv_to_host_file_cmd+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
-        ;;
-    esac
-    ;;
-  *-*-cygwin* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_noop
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
-        ;;
-    esac
-    ;;
-  * ) # unhandled hosts (and "normal" native builds)
-    lt_cv_to_host_file_cmd=func_convert_file_noop
-    ;;
-esac
-
-fi
-
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
-$as_echo "$lt_cv_to_host_file_cmd" >&6; }
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
-$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
-if ${lt_cv_to_tool_file_cmd+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  #assume ordinary cross tools, or native build.
-lt_cv_to_tool_file_cmd=func_convert_file_noop
-case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
-        ;;
-    esac
-    ;;
-esac
-
-fi
-
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
-$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
-$as_echo_n "checking for $LD option to reload object files... " >&6; }
-if ${lt_cv_ld_reload_flag+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_reload_flag='-r'
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
-$as_echo "$lt_cv_ld_reload_flag" >&6; }
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    if test "$GCC" != yes; then
-      reload_cmds=false
-    fi
-    ;;
-  darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
-esac
-
-
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
-set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OBJDUMP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OBJDUMP"; then
-  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OBJDUMP=$ac_cv_prog_OBJDUMP
-if test -n "$OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-$as_echo "$OBJDUMP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OBJDUMP"; then
-  ac_ct_OBJDUMP=$OBJDUMP
-  # Extract the first word of "objdump", so it can be a program name with args.
-set dummy objdump; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OBJDUMP"; then
-  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
-if test -n "$ac_ct_OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-$as_echo "$ac_ct_OBJDUMP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OBJDUMP" = x; then
-    OBJDUMP="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OBJDUMP=$ac_ct_OBJDUMP
-  fi
-else
-  OBJDUMP="$ac_cv_prog_OBJDUMP"
-fi
-
-test -z "$OBJDUMP" && OBJDUMP=objdump
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
-$as_echo_n "checking how to recognize dependent libraries... " >&6; }
-if ${lt_cv_deplibs_check_method+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix[4-9]*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi[45]*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin*)
-  # func_win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='func_win32_libid'
-  ;;
-
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump',
-  # unless we find 'file', for example because we are cross-compiling.
-  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
-  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
-    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-    lt_cv_file_magic_cmd='func_win32_libid'
-  else
-    # Keep this pattern in sync with the one in func_win32_libid.
-    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
-    lt_cv_file_magic_cmd='$OBJDUMP -f'
-  fi
-  ;;
-
-cegcc*)
-  # use the weaker test based on 'objdump'. See mingw*.
-  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-freebsd* | dragonfly*)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-haiku*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case $host_cpu in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
-interix[3-9]*)
-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
-  fi
-  ;;
-
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-*nto* | *qnx*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-openbsd*)
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-rdos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.3*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  pc)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-tpf*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
-$as_echo "$lt_cv_deplibs_check_method" >&6; }
-
-file_magic_glob=
-want_nocaseglob=no
-if test "$build" = "$host"; then
-  case $host_os in
-  mingw* | pw32*)
-    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
-      want_nocaseglob=yes
-    else
-      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
-    fi
-    ;;
-  esac
-fi
-
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DLLTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DLLTOOL=$ac_cv_prog_DLLTOOL
-if test -n "$DLLTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
-$as_echo "$DLLTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_DLLTOOL"; then
-  ac_ct_DLLTOOL=$DLLTOOL
-  # Extract the first word of "dlltool", so it can be a program name with args.
-set dummy dlltool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_DLLTOOL"; then
-  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
-if test -n "$ac_ct_DLLTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
-$as_echo "$ac_ct_DLLTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_DLLTOOL" = x; then
-    DLLTOOL="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DLLTOOL=$ac_ct_DLLTOOL
-  fi
-else
-  DLLTOOL="$ac_cv_prog_DLLTOOL"
-fi
-
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
-$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
-if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_sharedlib_from_linklib_cmd='unknown'
-
-case $host_os in
-cygwin* | mingw* | pw32* | cegcc*)
-  # two different shell functions defined in ltmain.sh
-  # decide which to use based on capabilities of $DLLTOOL
-  case `$DLLTOOL --help 2>&1` in
-  *--identify-strict*)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
-    ;;
-  *)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
-    ;;
-  esac
-  ;;
-*)
-  # fallback: assume linklib IS sharedlib
-  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
-  ;;
-esac
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
-$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
-sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
-test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  for ac_prog in ar
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AR=$ac_cv_prog_AR
-if test -n "$AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-$as_echo "$AR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$AR" && break
-  done
-fi
-if test -z "$AR"; then
-  ac_ct_AR=$AR
-  for ac_prog in ar
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_AR"; then
-  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_AR="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_AR=$ac_cv_prog_ac_ct_AR
-if test -n "$ac_ct_AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-$as_echo "$ac_ct_AR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_AR" && break
-done
-
-  if test "x$ac_ct_AR" = x; then
-    AR="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    AR=$ac_ct_AR
-  fi
-fi
-
-: ${AR=ar}
-: ${AR_FLAGS=cru}
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
-$as_echo_n "checking for archiver @FILE support... " >&6; }
-if ${lt_cv_ar_at_file+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ar_at_file=no
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  echo conftest.$ac_objext > conftest.lst
-      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
-      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
-  (eval $lt_ar_try) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-      if test "$ac_status" -eq 0; then
-	# Ensure the archiver fails upon bogus file names.
-	rm -f conftest.$ac_objext libconftest.a
-	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
-  (eval $lt_ar_try) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-	if test "$ac_status" -ne 0; then
-          lt_cv_ar_at_file=@
-        fi
-      fi
-      rm -f conftest.* libconftest.a
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
-$as_echo "$lt_cv_ar_at_file" >&6; }
-
-if test "x$lt_cv_ar_at_file" = xno; then
-  archiver_list_spec=
-else
-  archiver_list_spec=$lt_cv_ar_at_file
-fi
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-test -z "$STRIP" && STRIP=:
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_RANLIB+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-$as_echo "$RANLIB" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-$as_echo "$ac_ct_RANLIB" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    RANLIB=$ac_ct_RANLIB
-  fi
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-test -z "$RANLIB" && RANLIB=:
-
-
-
-
-
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
-    ;;
-  *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
-fi
-
-case $host_os in
-  darwin*)
-    lock_old_archive_extraction=yes ;;
-  *)
-    lock_old_archive_extraction=no ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
-$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
-if ${lt_cv_sys_global_symbol_pipe+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[BCDEGRST]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
-
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[BCDT]'
-  ;;
-cygwin* | mingw* | pw32* | cegcc*)
-  symcode='[ABCDGISTW]'
-  ;;
-hpux*)
-  if test "$host_cpu" = ia64; then
-    symcode='[ABCDEGRST]'
-  fi
-  ;;
-irix* | nonstopux*)
-  symcode='[BCDEGRST]'
-  ;;
-osf*)
-  symcode='[BCDEGQRST]'
-  ;;
-solaris*)
-  symcode='[BDRT]'
-  ;;
-sco3.2v5*)
-  symcode='[DT]'
-  ;;
-sysv4.2uw2*)
-  symcode='[DT]'
-  ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
-  symcode='[ABDT]'
-  ;;
-sysv4)
-  symcode='[DFNSTU]'
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[ABCDGIRSTW]' ;;
-esac
-
-# Transform an extracted symbol line into a proper C declaration.
-# Some systems (esp. on ia64) link data and code symbols differently,
-# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
-
-# Try without a prefix underscore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\2"
-
-  # Write the raw and C identifiers.
-  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-    # Fake it for dumpbin and say T for any non-static function
-    # and D for any global variable.
-    # Also find C++ and __fastcall symbols from MSVC++,
-    # which start with @ or ?.
-    lt_cv_sys_global_symbol_pipe="$AWK '"\
-"     {last_section=section; section=\$ 3};"\
-"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
-"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-"     \$ 0!~/External *\|/{next};"\
-"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-"     {if(hide[section]) next};"\
-"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
-"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
-"     ' prfx=^$ac_symprfx"
-  else
-    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-  fi
-  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<_LT_EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(void);
-void nm_test_func(void){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-_LT_EOF
-
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
-  (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
-	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<_LT_EOF > conftest.$ac_ext
-/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
-   relocations are performed -- see ld's documentation on pseudo-relocs.  */
-# define LT_DLSYM_CONST
-#elif defined(__osf__)
-/* This system does not cope well with relocations in const data.  */
-# define LT_DLSYM_CONST
-#else
-# define LT_DLSYM_CONST const
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-_LT_EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
-
-	  cat <<_LT_EOF >> conftest.$ac_ext
-
-/* The mapping between symbol names and symbols.  */
-LT_DLSYM_CONST struct {
-  const char *name;
-  void       *address;
-}
-lt__PROGRAM__LTX_preloaded_symbols[] =
-{
-  { "@PROGRAM@", (void *) 0 },
-_LT_EOF
-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
-	  cat <<\_LT_EOF >> conftest.$ac_ext
-  {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt__PROGRAM__LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-_LT_EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_globsym_save_LIBS=$LIBS
-	  lt_globsym_save_CFLAGS=$CFLAGS
-	  LIBS="conftstm.$ac_objext"
-	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
-	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest${ac_exeext}; then
-	    pipe_works=yes
-	  fi
-	  LIBS=$lt_globsym_save_LIBS
-	  CFLAGS=$lt_globsym_save_CFLAGS
-	else
-	  echo "cannot find nm_test_func in $nlist" >&5
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&5
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
-    fi
-  else
-    echo "$progname: failed program was:" >&5
-    cat conftest.$ac_ext >&5
-  fi
-  rm -rf conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
-
-fi
-
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-$as_echo "failed" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-fi
-
-# Response file support.
-if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-  nm_file_list_spec='@'
-elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
-  nm_file_list_spec='@'
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
-$as_echo_n "checking for sysroot... " >&6; }
-
-# Check whether --with-sysroot was given.
-if test "${with_sysroot+set}" = set; then :
-  withval=$with_sysroot;
-else
-  with_sysroot=no
-fi
-
-
-lt_sysroot=
-case ${with_sysroot} in #(
- yes)
-   if test "$GCC" = yes; then
-     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
-   fi
-   ;; #(
- /*)
-   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
-   ;; #(
- no|'')
-   ;; #(
- *)
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
-$as_echo "${with_sysroot}" >&6; }
-   as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
-   ;;
-esac
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
-$as_echo "${lt_sysroot:-no}" >&6; }
-
-
-
-
-
-# Check whether --enable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then :
-  enableval=$enable_libtool_lock;
-fi
-
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.$ac_objext` in
-      *ELF-32*)
-	HPUX_IA64_MODE="32"
-	;;
-      *ELF-64*)
-	HPUX_IA64_MODE="64"
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    if test "$lt_cv_prog_gnu_ld" = yes; then
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -melf32bsmip"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -melf32bmipn32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -melf64bmip"
-	;;
-      esac
-    else
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -32"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -n32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -64"
-	  ;;
-      esac
-    fi
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.o` in
-      *32-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_i386_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_i386"
-	    ;;
-	  ppc64-*linux*|powerpc64-*linux*)
-	    LD="${LD-ld} -m elf32ppclinux"
-	    ;;
-	  s390x-*linux*)
-	    LD="${LD-ld} -m elf_s390"
-	    ;;
-	  sparc64-*linux*)
-	    LD="${LD-ld} -m elf32_sparc"
-	    ;;
-	esac
-	;;
-      *64-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_x86_64_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_x86_64"
-	    ;;
-	  ppc*-*linux*|powerpc*-*linux*)
-	    LD="${LD-ld} -m elf64ppc"
-	    ;;
-	  s390*-*linux*|s390*-*tpf*)
-	    LD="${LD-ld} -m elf64_s390"
-	    ;;
-	  sparc*-*linux*)
-	    LD="${LD-ld} -m elf64_sparc"
-	    ;;
-	esac
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
-$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
-if ${lt_cv_cc_needs_belf+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  lt_cv_cc_needs_belf=yes
-else
-  lt_cv_cc_needs_belf=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-     ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
-$as_echo "$lt_cv_cc_needs_belf" >&6; }
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-*-*solaris*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.o` in
-    *64-bit*)
-      case $lt_cv_prog_gnu_ld in
-      yes*)
-        case $host in
-        i?86-*-solaris*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        sparc*-*-solaris*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-        esac
-        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
-        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
-          LD="${LD-ld}_sol2"
-        fi
-        ;;
-      *)
-	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-	  LD="${LD-ld} -64"
-	fi
-	;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-esac
-
-need_locks="$enable_libtool_lock"
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
-set dummy ${ac_tool_prefix}mt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$MANIFEST_TOOL"; then
-  ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
-if test -n "$MANIFEST_TOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
-$as_echo "$MANIFEST_TOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
-  ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
-  # Extract the first word of "mt", so it can be a program name with args.
-set dummy mt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_MANIFEST_TOOL"; then
-  ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
-if test -n "$ac_ct_MANIFEST_TOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
-$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_MANIFEST_TOOL" = x; then
-    MANIFEST_TOOL=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
-  fi
-else
-  MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
-fi
-
-test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
-$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
-if ${lt_cv_path_mainfest_tool+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_path_mainfest_tool=no
-  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
-  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
-  cat conftest.err >&5
-  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
-    lt_cv_path_mainfest_tool=yes
-  fi
-  rm -f conftest*
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
-$as_echo "$lt_cv_path_mainfest_tool" >&6; }
-if test "x$lt_cv_path_mainfest_tool" != xyes; then
-  MANIFEST_TOOL=:
-fi
-
-
-
-
-
-
-  case $host_os in
-    rhapsody* | darwin*)
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DSYMUTIL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DSYMUTIL"; then
-  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DSYMUTIL=$ac_cv_prog_DSYMUTIL
-if test -n "$DSYMUTIL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
-$as_echo "$DSYMUTIL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_DSYMUTIL"; then
-  ac_ct_DSYMUTIL=$DSYMUTIL
-  # Extract the first word of "dsymutil", so it can be a program name with args.
-set dummy dsymutil; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_DSYMUTIL"; then
-  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
-if test -n "$ac_ct_DSYMUTIL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
-$as_echo "$ac_ct_DSYMUTIL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_DSYMUTIL" = x; then
-    DSYMUTIL=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DSYMUTIL=$ac_ct_DSYMUTIL
-  fi
-else
-  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
-set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_NMEDIT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$NMEDIT"; then
-  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-NMEDIT=$ac_cv_prog_NMEDIT
-if test -n "$NMEDIT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
-$as_echo "$NMEDIT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_NMEDIT"; then
-  ac_ct_NMEDIT=$NMEDIT
-  # Extract the first word of "nmedit", so it can be a program name with args.
-set dummy nmedit; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_NMEDIT"; then
-  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_NMEDIT="nmedit"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
-if test -n "$ac_ct_NMEDIT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
-$as_echo "$ac_ct_NMEDIT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_NMEDIT" = x; then
-    NMEDIT=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    NMEDIT=$ac_ct_NMEDIT
-  fi
-else
-  NMEDIT="$ac_cv_prog_NMEDIT"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
-set dummy ${ac_tool_prefix}lipo; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_LIPO+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$LIPO"; then
-  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-LIPO=$ac_cv_prog_LIPO
-if test -n "$LIPO"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
-$as_echo "$LIPO" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_LIPO"; then
-  ac_ct_LIPO=$LIPO
-  # Extract the first word of "lipo", so it can be a program name with args.
-set dummy lipo; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_LIPO"; then
-  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_LIPO="lipo"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
-if test -n "$ac_ct_LIPO"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
-$as_echo "$ac_ct_LIPO" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_LIPO" = x; then
-    LIPO=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    LIPO=$ac_ct_LIPO
-  fi
-else
-  LIPO="$ac_cv_prog_LIPO"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}otool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OTOOL"; then
-  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OTOOL=$ac_cv_prog_OTOOL
-if test -n "$OTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
-$as_echo "$OTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OTOOL"; then
-  ac_ct_OTOOL=$OTOOL
-  # Extract the first word of "otool", so it can be a program name with args.
-set dummy otool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OTOOL"; then
-  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_OTOOL="otool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
-if test -n "$ac_ct_OTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
-$as_echo "$ac_ct_OTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OTOOL" = x; then
-    OTOOL=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OTOOL=$ac_ct_OTOOL
-  fi
-else
-  OTOOL="$ac_cv_prog_OTOOL"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
-set dummy ${ac_tool_prefix}otool64; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OTOOL64+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OTOOL64"; then
-  ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OTOOL64=$ac_cv_prog_OTOOL64
-if test -n "$OTOOL64"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
-$as_echo "$OTOOL64" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OTOOL64"; then
-  ac_ct_OTOOL64=$OTOOL64
-  # Extract the first word of "otool64", so it can be a program name with args.
-set dummy otool64; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OTOOL64"; then
-  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_OTOOL64="otool64"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
-if test -n "$ac_ct_OTOOL64"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
-$as_echo "$ac_ct_OTOOL64" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OTOOL64" = x; then
-    OTOOL64=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OTOOL64=$ac_ct_OTOOL64
-  fi
-else
-  OTOOL64="$ac_cv_prog_OTOOL64"
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
-$as_echo_n "checking for -single_module linker flag... " >&6; }
-if ${lt_cv_apple_cc_single_mod+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_apple_cc_single_mod=no
-      if test -z "${LT_MULTI_MODULE}"; then
-	# By default we will add the -single_module flag. You can override
-	# by either setting the environment variable LT_MULTI_MODULE
-	# non-empty at configure time, or by adding -multi_module to the
-	# link flags.
-	rm -rf libconftest.dylib*
-	echo "int foo(void){return 1;}" > conftest.c
-	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
--dynamiclib -Wl,-single_module conftest.c" >&5
-	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
-        _lt_result=$?
-	# If there is a non-empty error log, and "single_module"
-	# appears in it, assume the flag caused a linker warning
-        if test -s conftest.err && $GREP single_module conftest.err; then
-	  cat conftest.err >&5
-	# Otherwise, if the output was created with a 0 exit code from
-	# the compiler, it worked.
-	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
-	  lt_cv_apple_cc_single_mod=yes
-	else
-	  cat conftest.err >&5
-	fi
-	rm -rf libconftest.dylib*
-	rm -f conftest.*
-      fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
-$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
-$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-if ${lt_cv_ld_exported_symbols_list+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_exported_symbols_list=no
-      save_LDFLAGS=$LDFLAGS
-      echo "_main" > conftest.sym
-      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  lt_cv_ld_exported_symbols_list=yes
-else
-  lt_cv_ld_exported_symbols_list=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-	LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
-$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
-$as_echo_n "checking for -force_load linker flag... " >&6; }
-if ${lt_cv_ld_force_load+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_force_load=no
-      cat > conftest.c << _LT_EOF
-int forced_loaded() { return 2;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
-      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
-      echo "$AR cru libconftest.a conftest.o" >&5
-      $AR cru libconftest.a conftest.o 2>&5
-      echo "$RANLIB libconftest.a" >&5
-      $RANLIB libconftest.a 2>&5
-      cat > conftest.c << _LT_EOF
-int main() { return 0;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
-      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
-      _lt_result=$?
-      if test -s conftest.err && $GREP force_load conftest.err; then
-	cat conftest.err >&5
-      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
-	lt_cv_ld_force_load=yes
-      else
-	cat conftest.err >&5
-      fi
-        rm -f conftest.err libconftest.a conftest conftest.c
-        rm -rf conftest.dSYM
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
-$as_echo "$lt_cv_ld_force_load" >&6; }
-    case $host_os in
-    rhapsody* | darwin1.[012])
-      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-    darwin1.*)
-      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-    darwin*) # darwin 5.x on
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-	10.[012]*)
-	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-	10.*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-      esac
-    ;;
-  esac
-    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-      _lt_dar_single_mod='$single_module'
-    fi
-    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-    else
-      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    fi
-    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
-      _lt_dsymutil='~$DSYMUTIL $lib || :'
-    else
-      _lt_dsymutil=
-    fi
-    ;;
-  esac
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if ${ac_cv_prog_CPP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdc=yes
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-for ac_header in dlfcn.h
-do :
-  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
-"
-if test "x$ac_cv_header_dlfcn_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DLFCN_H 1
-_ACEOF
-
-fi
-
-done
-
-
-
-func_stripname_cnf ()
-{
-  case ${2} in
-  .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
-  *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
-  esac
-} # func_stripname_cnf
-
-
-
-
-
-# Set options
-enable_dlopen=yes
-
-
-
-
-
-            # Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then :
-  enableval=$enable_shared; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_shared=yes
-fi
-
-
-
-
-
-
-
-
-
-  # Check whether --enable-static was given.
-if test "${enable_static+set}" = set; then :
-  enableval=$enable_static; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_static=yes
-fi
-
-
-
-
-
-
-
-
-
-
-# Check whether --with-pic was given.
-if test "${with_pic+set}" = set; then :
-  withval=$with_pic; lt_p=${PACKAGE-default}
-    case $withval in
-    yes|no) pic_mode=$withval ;;
-    *)
-      pic_mode=default
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for lt_pkg in $withval; do
-	IFS="$lt_save_ifs"
-	if test "X$lt_pkg" = "X$lt_p"; then
-	  pic_mode=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  pic_mode=default
-fi
-
-
-test -z "$pic_mode" && pic_mode=default
-
-
-
-
-
-
-
-  # Check whether --enable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then :
-  enableval=$enable_fast_install; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_fast_install=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_fast_install=yes
-fi
-
-
-
-
-
-
-
-
-
-
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-test -z "$LN_S" && LN_S="ln -s"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-if test -n "${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
-$as_echo_n "checking for objdir... " >&6; }
-if ${lt_cv_objdir+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
-$as_echo "$lt_cv_objdir" >&6; }
-objdir=$lt_cv_objdir
-
-
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define LT_OBJDIR "$lt_cv_objdir/"
-_ACEOF
-
-
-
-
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Global variables:
-ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$LD" && LD=ld
-test -z "$ac_objext" && ac_objext=o
-
-for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-
-
-# Only perform the check for file, if the check method requires it
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
-$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-if ${lt_cv_path_MAGIC_CMD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MAGIC_CMD in
-[\\/*] |  ?:[\\/]*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/${ac_tool_prefix}file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-
-
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
-$as_echo_n "checking for file... " >&6; }
-if ${lt_cv_path_MAGIC_CMD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MAGIC_CMD in
-[\\/*] |  ?:[\\/]*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  else
-    MAGIC_CMD=:
-  fi
-fi
-
-  fi
-  ;;
-esac
-
-# Use C for the default configuration in the libtool script
-
-lt_save_CC="$CC"
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-objext=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}'
-
-
-
-
-
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-# Save the default compiler, since it gets overwritten when the other
-# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
-compiler_DEFAULT=$CC
-
-# save warnings/boilerplate of simple test code
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$RM conftest*
-
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$RM -r conftest*
-
-
-if test -n "$compiler"; then
-
-lt_prog_compiler_no_builtin_flag=
-
-if test "$GCC" = yes; then
-  case $cc_basename in
-  nvcc*)
-    lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
-  *)
-    lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
-  esac
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_rtti_exceptions=no
-   ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="-fno-rtti -fno-exceptions"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_rtti_exceptions=yes
-     fi
-   fi
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-
-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-else
-    :
-fi
-
-fi
-
-
-
-
-
-
-  lt_prog_compiler_wl=
-lt_prog_compiler_pic=
-lt_prog_compiler_static=
-
-
-  if test "$GCC" = yes; then
-    lt_prog_compiler_wl='-Wl,'
-    lt_prog_compiler_static='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            lt_prog_compiler_pic='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
-            lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      lt_prog_compiler_pic='-DDLL_EXPORT'
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic='-fno-common'
-      ;;
-
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      lt_prog_compiler_static=
-      ;;
-
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic='-fPIC'
-	;;
-      esac
-      ;;
-
-    interix[3-9]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      lt_prog_compiler_can_build_shared=no
-      enable_shared=no
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      lt_prog_compiler_pic='-fPIC -shared'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic=-Kconform_pic
-      fi
-      ;;
-
-    *)
-      lt_prog_compiler_pic='-fPIC'
-      ;;
-    esac
-
-    case $cc_basename in
-    nvcc*) # Cuda Compiler Driver 2.2
-      lt_prog_compiler_wl='-Xlinker '
-      if test -n "$lt_prog_compiler_pic"; then
-        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
-      fi
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      lt_prog_compiler_wl='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static='-Bstatic'
-      else
-	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic='-DDLL_EXPORT'
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      lt_prog_compiler_wl='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      lt_prog_compiler_wl='-Wl,'
-      # PIC (with -KPIC) is the default.
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
-      case $cc_basename in
-      # old Intel for x86_64 which still supported -KPIC.
-      ecc*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-KPIC'
-	lt_prog_compiler_static='-static'
-        ;;
-      # icc used to be incompatible with GCC.
-      # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-fPIC'
-	lt_prog_compiler_static='-static'
-        ;;
-      # Lahey Fortran 8.1.
-      lf95*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='--shared'
-	lt_prog_compiler_static='--static'
-	;;
-      nagfor*)
-	# NAG Fortran compiler
-	lt_prog_compiler_wl='-Wl,-Wl,,'
-	lt_prog_compiler_pic='-PIC'
-	lt_prog_compiler_static='-Bstatic'
-	;;
-      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-fpic'
-	lt_prog_compiler_static='-Bstatic'
-        ;;
-      ccc*)
-        lt_prog_compiler_wl='-Wl,'
-        # All Alpha code is PIC.
-        lt_prog_compiler_static='-non_shared'
-        ;;
-      xl* | bgxl* | bgf* | mpixl*)
-	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-qpic'
-	lt_prog_compiler_static='-qstaticlink'
-	;;
-      *)
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  lt_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl=''
-	  ;;
-	*Sun\ F* | *Sun*Fortran*)
-	  lt_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl='-Qoption ld '
-	  ;;
-	*Sun\ C*)
-	  # Sun C 5.9
-	  lt_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl='-Wl,'
-	  ;;
-        *Intel*\ [CF]*Compiler*)
-	  lt_prog_compiler_wl='-Wl,'
-	  lt_prog_compiler_pic='-fPIC'
-	  lt_prog_compiler_static='-static'
-	  ;;
-	*Portland\ Group*)
-	  lt_prog_compiler_wl='-Wl,'
-	  lt_prog_compiler_pic='-fpic'
-	  lt_prog_compiler_static='-Bstatic'
-	  ;;
-	esac
-	;;
-      esac
-      ;;
-
-    newsos6)
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      lt_prog_compiler_pic='-fPIC -shared'
-      ;;
-
-    osf3* | osf4* | osf5*)
-      lt_prog_compiler_wl='-Wl,'
-      # All OSF/1 code is PIC.
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    rdos*)
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    solaris*)
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
-	lt_prog_compiler_wl='-Qoption ld ';;
-      *)
-	lt_prog_compiler_wl='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      lt_prog_compiler_wl='-Qoption ld '
-      lt_prog_compiler_pic='-PIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	lt_prog_compiler_pic='-Kconform_pic'
-	lt_prog_compiler_static='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    unicos*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_can_build_shared=no
-      ;;
-
-    uts4*)
-      lt_prog_compiler_pic='-pic'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    *)
-      lt_prog_compiler_can_build_shared=no
-      ;;
-    esac
-  fi
-
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic=
-    ;;
-  *)
-    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
-    ;;
-esac
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-if ${lt_cv_prog_compiler_pic+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
-$as_echo "$lt_cv_prog_compiler_pic" >&6; }
-lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-if ${lt_cv_prog_compiler_pic_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic_works=no
-   ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_pic_works=yes
-     fi
-   fi
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
-$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
-
-if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-    case $lt_prog_compiler_pic in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-     esac
-else
-    lt_prog_compiler_pic=
-     lt_prog_compiler_can_build_shared=no
-fi
-
-fi
-
-
-
-
-
-
-
-
-
-
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if ${lt_cv_prog_compiler_static_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_static_works=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler_static_works=yes
-       fi
-     else
-       lt_cv_prog_compiler_static_works=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
-$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
-
-if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-    :
-else
-    lt_prog_compiler_static=
-fi
-
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-
-
-
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
-$as_echo_n "checking if we can lock with hard links... " >&6; }
-  hard_links=yes
-  $RM conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-$as_echo "$hard_links" >&6; }
-  if test "$hard_links" = no; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-
-  runpath_var=
-  allow_undefined_flag=
-  always_export_symbols=no
-  archive_cmds=
-  archive_expsym_cmds=
-  compiler_needs_object=no
-  enable_shared_with_static_runtimes=no
-  export_dynamic_flag_spec=
-  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  hardcode_automatic=no
-  hardcode_direct=no
-  hardcode_direct_absolute=no
-  hardcode_libdir_flag_spec=
-  hardcode_libdir_separator=
-  hardcode_minus_L=no
-  hardcode_shlibpath_var=unsupported
-  inherit_rpath=no
-  link_all_deplibs=unknown
-  module_cmds=
-  module_expsym_cmds=
-  old_archive_from_new_cmds=
-  old_archive_from_expsyms_cmds=
-  thread_safe_flag_spec=
-  whole_archive_flag_spec=
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  include_expsyms=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  # Exclude shared library initialization/finalization symbols.
-  extract_expsyms_cmds=
-
-  case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  esac
-
-  ld_shlibs=yes
-
-  # On some targets, GNU ld is compatible enough with the native linker
-  # that we're better off using the native interface for both.
-  lt_use_gnu_ld_interface=no
-  if test "$with_gnu_ld" = yes; then
-    case $host_os in
-      aix*)
-	# The AIX port of GNU ld has always aspired to compatibility
-	# with the native linker.  However, as the warning in the GNU ld
-	# block says, versions before 2.19.5* couldn't really create working
-	# shared libraries, regardless of the interface used.
-	case `$LD -v 2>&1` in
-	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
-	  *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
-	  *\ \(GNU\ Binutils\)\ [3-9]*) ;;
-	  *)
-	    lt_use_gnu_ld_interface=yes
-	    ;;
-	esac
-	;;
-      *)
-	lt_use_gnu_ld_interface=yes
-	;;
-    esac
-  fi
-
-  if test "$lt_use_gnu_ld_interface" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-    export_dynamic_flag_spec='${wl}--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-      whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      whole_archive_flag_spec=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>&1` in
-      *GNU\ gold*) supports_anon_versioning=yes ;;
-      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix[3-9]*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	ld_shlibs=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.19, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to install binutils
-*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
-*** You will then need to restart the configuration process.
-
-_LT_EOF
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            archive_expsym_cmds=''
-        ;;
-      m68k)
-            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            hardcode_libdir_flag_spec='-L$libdir'
-            hardcode_minus_L=yes
-        ;;
-      esac
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	allow_undefined_flag=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
-      # as there is no search path for DLLs.
-      hardcode_libdir_flag_spec='-L$libdir'
-      export_dynamic_flag_spec='${wl}--export-all-symbols'
-      allow_undefined_flag=unsupported
-      always_export_symbols=no
-      enable_shared_with_static_runtimes=yes
-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
-      exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
-
-      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    haiku*)
-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      link_all_deplibs=yes
-      ;;
-
-    interix[3-9]*)
-      hardcode_direct=no
-      hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-      export_dynamic_flag_spec='${wl}-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
-
-    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-      tmp_diet=no
-      if test "$host_os" = linux-dietlibc; then
-	case $cc_basename in
-	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
-	esac
-      fi
-      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-	 && test "$tmp_diet" = no
-      then
-	tmp_addflag=' $pic_flag'
-	tmp_sharedflag='-shared'
-	case $cc_basename,$host_cpu in
-        pgcc*)				# Portland Group C compiler
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95* | pgfortran*)
-					# Portland Group f77 and f90 compilers
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
-	  tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	  tmp_addflag=' -nofor_main' ;;
-	lf95*)				# Lahey Fortran 8.1
-	  whole_archive_flag_spec=
-	  tmp_sharedflag='--shared' ;;
-	xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
-	  tmp_sharedflag='-qmkshrobj'
-	  tmp_addflag= ;;
-	nvcc*)	# Cuda Compiler Driver 2.2
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  compiler_needs_object=yes
-	  ;;
-	esac
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)			# Sun C 5.9
-	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  compiler_needs_object=yes
-	  tmp_sharedflag='-G' ;;
-	*Sun\ F*)			# Sun Fortran 8.3
-	  tmp_sharedflag='-G' ;;
-	esac
-	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
-        if test "x$supports_anon_versioning" = xyes; then
-          archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	    echo "local: *; };" >> $output_objdir/$libname.ver~
-	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-        fi
-
-	case $cc_basename in
-	xlf* | bgf* | bgxlf* | mpixlf*)
-	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
-	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-	  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
-	  if test "x$supports_anon_versioning" = xyes; then
-	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	      echo "local: *; };" >> $output_objdir/$libname.ver~
-	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-	  fi
-	  ;;
-	esac
-      else
-        ld_shlibs=no
-      fi
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-	ld_shlibs=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-	ld_shlibs=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-	;;
-	*)
-	  # For security reasons, it is highly recommended that you always
-	  # use absolute paths for naming shared libraries, and exclude the
-	  # DT_RUNPATH tag from executables and libraries.  But doing so
-	  # requires that you compile everything twice, which is a pain.
-	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  else
-	    ld_shlibs=no
-	  fi
-	;;
-      esac
-      ;;
-
-    sunos4*)
-      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-    esac
-
-    if test "$ld_shlibs" = no; then
-      runpath_var=
-      hardcode_libdir_flag_spec=
-      export_dynamic_flag_spec=
-      whole_archive_flag_spec=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      allow_undefined_flag=unsupported
-      always_export_symbols=yes
-      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      hardcode_minus_L=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	hardcode_direct=unsupported
-      fi
-      ;;
-
-    aix[4-9]*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	# Also, AIX nm treats weak defined symbols like other global
-	# defined symbols, whereas GNU nm marks them as "W".
-	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	else
-	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
-	  for ld_flag in $LDFLAGS; do
-	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-	    aix_use_runtimelinking=yes
-	    break
-	  fi
-	  done
-	  ;;
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      archive_cmds=''
-      hardcode_direct=yes
-      hardcode_direct_absolute=yes
-      hardcode_libdir_separator=':'
-      link_all_deplibs=yes
-      file_list_spec='${wl}-f,'
-
-      if test "$GCC" = yes; then
-	case $host_os in aix4.[012]|aix4.[012].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	  # We have reworked collect2
-	  :
-	  else
-	  # We have old collect2
-	  hardcode_direct=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  hardcode_minus_L=yes
-	  hardcode_libdir_flag_spec='-L$libdir'
-	  hardcode_libdir_separator=
-	  fi
-	  ;;
-	esac
-	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
-	fi
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-	  fi
-	fi
-      fi
-
-      export_dynamic_flag_spec='${wl}-bexpall'
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      always_export_symbols=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	allow_undefined_flag='-berok'
-        # Determine the default libpath from the value encoded in an
-        # empty executable.
-        if test "${lt_cv_aix_libpath+set}" = set; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  if ${lt_cv_aix_libpath_+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-
-  lt_aix_libpath_sed='
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }'
-  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_="/usr/lib:/lib"
-  fi
-
-fi
-
-  aix_libpath=$lt_cv_aix_libpath_
-fi
-
-        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-      else
-	if test "$host_cpu" = ia64; then
-	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-	  allow_undefined_flag="-z nodefs"
-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an
-	 # empty executable.
-	 if test "${lt_cv_aix_libpath+set}" = set; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  if ${lt_cv_aix_libpath_+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-
-  lt_aix_libpath_sed='
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }'
-  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_="/usr/lib:/lib"
-  fi
-
-fi
-
-  aix_libpath=$lt_cv_aix_libpath_
-fi
-
-	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  no_undefined_flag=' ${wl}-bernotok'
-	  allow_undefined_flag=' ${wl}-berok'
-	  if test "$with_gnu_ld" = yes; then
-	    # We only use this code for GNU lds that support --whole-archive.
-	    whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	  else
-	    # Exported symbols can be pulled into shared objects from archives
-	    whole_archive_flag_spec='$convenience'
-	  fi
-	  archive_cmds_need_lc=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            archive_expsym_cmds=''
-        ;;
-      m68k)
-            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            hardcode_libdir_flag_spec='-L$libdir'
-            hardcode_minus_L=yes
-        ;;
-      esac
-      ;;
-
-    bsdi[45]*)
-      export_dynamic_flag_spec=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      case $cc_basename in
-      cl*)
-	# Native MSVC
-	hardcode_libdir_flag_spec=' '
-	allow_undefined_flag=unsupported
-	always_export_symbols=yes
-	file_list_spec='@'
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=".dll"
-	# FIXME: Setting linknames here is a bad hack.
-	archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-	  else
-	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-	  fi~
-	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-	  linknames='
-	# The linker will not automatically build a static lib if we build a DLL.
-	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
-	enable_shared_with_static_runtimes=yes
-	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-	# Don't use ranlib
-	old_postinstall_cmds='chmod 644 $oldlib'
-	postlink_cmds='lt_outputfile="@OUTPUT@"~
-	  lt_tool_outputfile="@TOOL_OUTPUT@"~
-	  case $lt_outputfile in
-	    *.exe|*.EXE) ;;
-	    *)
-	      lt_outputfile="$lt_outputfile.exe"
-	      lt_tool_outputfile="$lt_tool_outputfile.exe"
-	      ;;
-	  esac~
-	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-	    $RM "$lt_outputfile.manifest";
-	  fi'
-	;;
-      *)
-	# Assume MSVC wrapper
-	hardcode_libdir_flag_spec=' '
-	allow_undefined_flag=unsupported
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=".dll"
-	# FIXME: Setting linknames here is a bad hack.
-	archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
-	# The linker will automatically build a .lib file if we build a DLL.
-	old_archive_from_new_cmds='true'
-	# FIXME: Should let the user specify the lib program.
-	old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
-	enable_shared_with_static_runtimes=yes
-	;;
-      esac
-      ;;
-
-    darwin* | rhapsody*)
-
-
-  archive_cmds_need_lc=no
-  hardcode_direct=no
-  hardcode_automatic=yes
-  hardcode_shlibpath_var=unsupported
-  if test "$lt_cv_ld_force_load" = "yes"; then
-    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-
-  else
-    whole_archive_flag_spec=''
-  fi
-  link_all_deplibs=yes
-  allow_undefined_flag="$_lt_dar_allow_undefined"
-  case $cc_basename in
-     ifort*) _lt_dar_can_shared=yes ;;
-     *) _lt_dar_can_shared=$GCC ;;
-  esac
-  if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=func_echo_all
-    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-    archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-    module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-
-  else
-  ld_shlibs=no
-  fi
-
-      ;;
-
-    dgux*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_shlibpath_var=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2.*)
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
-      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L=yes
-      export_dynamic_flag_spec='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator=:
-	hardcode_direct=yes
-	hardcode_direct_absolute=yes
-	export_dynamic_flag_spec='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-
-	  # Older versions of the 11.00 compiler do not understand -b yet
-	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
-$as_echo_n "checking if $CC understands -b... " >&6; }
-if ${lt_cv_prog_compiler__b+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler__b=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS -b"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler__b=yes
-       fi
-     else
-       lt_cv_prog_compiler__b=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
-$as_echo "$lt_cv_prog_compiler__b" >&6; }
-
-if test x"$lt_cv_prog_compiler__b" = xyes; then
-    archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-else
-    archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-fi
-
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  hardcode_direct=no
-	  hardcode_shlibpath_var=no
-	  ;;
-	*)
-	  hardcode_direct=yes
-	  hardcode_direct_absolute=yes
-	  export_dynamic_flag_spec='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	# Try to use the -exported_symbol ld option, if it does not
-	# work, assume that -exports_file does not work either and
-	# implicitly export all symbols.
-	# This should be the same for all languages, so no per-tag cache variable.
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
-$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
-if ${lt_cv_irix_exported_symbol+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  save_LDFLAGS="$LDFLAGS"
-	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-	   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-int foo (void) { return 0; }
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  lt_cv_irix_exported_symbol=yes
-else
-  lt_cv_irix_exported_symbol=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-           LDFLAGS="$save_LDFLAGS"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
-$as_echo "$lt_cv_irix_exported_symbol" >&6; }
-	if test "$lt_cv_irix_exported_symbol" = yes; then
-          archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-	fi
-      else
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
-      fi
-      archive_cmds_need_lc='no'
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      inherit_rpath=yes
-      link_all_deplibs=yes
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    newsos6)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_shlibpath_var=no
-      ;;
-
-    *nto* | *qnx*)
-      ;;
-
-    openbsd*)
-      if test -f /usr/libexec/ld.so; then
-	hardcode_direct=yes
-	hardcode_shlibpath_var=no
-	hardcode_direct_absolute=yes
-	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	  export_dynamic_flag_spec='${wl}-E'
-	else
-	  case $host_os in
-	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	     hardcode_libdir_flag_spec='-R$libdir'
-	     ;;
-	   *)
-	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	     ;;
-	  esac
-	fi
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    os2*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      allow_undefined_flag=unsupported
-      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      archive_cmds_need_lc='no'
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      else
-	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	hardcode_libdir_flag_spec='-rpath $libdir'
-      fi
-      archive_cmds_need_lc='no'
-      hardcode_libdir_separator=:
-      ;;
-
-    solaris*)
-      no_undefined_flag=' -z defs'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-      else
-	case `$CC -V 2>&1` in
-	*"Compilers 5.0"*)
-	  wlarc=''
-	  archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
-	  ;;
-	*)
-	  wlarc='${wl}'
-	  archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-	  ;;
-	esac
-      fi
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_shlibpath_var=no
-      case $host_os in
-      solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *)
-	# The compiler driver will combine and reorder linker options,
-	# but understands `-z linker_flag'.  GCC discards it without `$wl',
-	# but is careful enough not to reorder.
-	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test "$GCC" = yes; then
-	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-	else
-	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
-	fi
-	;;
-      esac
-      link_all_deplibs=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  reload_cmds='$CC -r -o $output$reload_objs'
-	  hardcode_direct=no
-        ;;
-	motorola)
-	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var=no
-      ;;
-
-    sysv4.3*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var=no
-      export_dynamic_flag_spec='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	hardcode_shlibpath_var=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	ld_shlibs=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-      no_undefined_flag='${wl}-z,text'
-      archive_cmds_need_lc=no
-      hardcode_shlibpath_var=no
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      no_undefined_flag='${wl}-z,text'
-      allow_undefined_flag='${wl}-z,nodefs'
-      archive_cmds_need_lc=no
-      hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='${wl}-R,$libdir'
-      hardcode_libdir_separator=':'
-      link_all_deplibs=yes
-      export_dynamic_flag_spec='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_shlibpath_var=no
-      ;;
-
-    *)
-      ld_shlibs=no
-      ;;
-    esac
-
-    if test x$host_vendor = xsni; then
-      case $host in
-      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	export_dynamic_flag_spec='${wl}-Blargedynsym'
-	;;
-      esac
-    fi
-  fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
-$as_echo "$ld_shlibs" >&6; }
-test "$ld_shlibs" = no && can_build_shared=no
-
-with_gnu_ld=$with_gnu_ld
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-if ${lt_cv_archive_cmds_need_lc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  $RM conftest*
-	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } 2>conftest.err; then
-	  soname=conftest
-	  lib=conftest
-	  libobjs=conftest.$ac_objext
-	  deplibs=
-	  wl=$lt_prog_compiler_wl
-	  pic_flag=$lt_prog_compiler_pic
-	  compiler_flags=-v
-	  linker_flags=-v
-	  verstring=
-	  output_objdir=.
-	  libname=conftest
-	  lt_save_allow_undefined_flag=$allow_undefined_flag
-	  allow_undefined_flag=
-	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
-  (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-	  then
-	    lt_cv_archive_cmds_need_lc=no
-	  else
-	    lt_cv_archive_cmds_need_lc=yes
-	  fi
-	  allow_undefined_flag=$lt_save_allow_undefined_flag
-	else
-	  cat conftest.err 1>&5
-	fi
-	$RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
-$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
-      archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
-$as_echo_n "checking dynamic linker characteristics... " >&6; }
-
-if test "$GCC" = yes; then
-  case $host_os in
-    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-    *) lt_awk_arg="/^libraries:/" ;;
-  esac
-  case $host_os in
-    mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;;
-    *) lt_sed_strip_eq="s,=/,/,g" ;;
-  esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
-  case $lt_search_path_spec in
-  *\;*)
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
-    ;;
-  *)
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
-    ;;
-  esac
-  # Ok, now we have the path, separated by spaces, we can step through it
-  # and add multilib dir if necessary.
-  lt_tmp_lt_search_path_spec=
-  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-  for lt_sys_path in $lt_search_path_spec; do
-    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-    else
-      test -d "$lt_sys_path" && \
-	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-    fi
-  done
-  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
-BEGIN {RS=" "; FS="/|\n";} {
-  lt_foo="";
-  lt_count=0;
-  for (lt_i = NF; lt_i > 0; lt_i--) {
-    if ($lt_i != "" && $lt_i != ".") {
-      if ($lt_i == "..") {
-        lt_count++;
-      } else {
-        if (lt_count == 0) {
-          lt_foo="/" $lt_i lt_foo;
-        } else {
-          lt_count--;
-        }
-      }
-    }
-  }
-  if (lt_foo != "") { lt_freq[lt_foo]++; }
-  if (lt_freq[lt_foo] == 1) { print lt_foo; }
-}'`
-  # AWK program above erroneously prepends '/' to C:/dos/paths
-  # for these hosts.
-  case $host_os in
-    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
-      $SED 's,/\([A-Za-z]:\),\1,g'` ;;
-  esac
-  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix[4-9]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[01] | aix4.[01].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  case $host_cpu in
-  powerpc)
-    # Since July 2007 AmigaOS4 officially supports .so libraries.
-    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    ;;
-  m68k)
-    library_names_spec='$libname.ixlibrary $libname.a'
-    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-    ;;
-  esac
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[45]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32* | cegcc*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$cc_basename in
-  yes,*)
-    # gcc
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname~
-      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-      fi'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-
-      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
-      ;;
-    mingw* | cegcc*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    dynamic_linker='Win32 ld.exe'
-    ;;
-
-  *,cl*)
-    # Native MSVC
-    libname_spec='$name'
-    soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-    library_names_spec='${libname}.dll.lib'
-
-    case $build_os in
-    mingw*)
-      sys_lib_search_path_spec=
-      lt_save_ifs=$IFS
-      IFS=';'
-      for lt_path in $LIB
-      do
-        IFS=$lt_save_ifs
-        # Let DOS variable expansion print the short 8.3 style file name.
-        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
-        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
-      done
-      IFS=$lt_save_ifs
-      # Convert to MSYS style.
-      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
-      ;;
-    cygwin*)
-      # Convert to unix form, then to dos form, then back to unix form
-      # but this time dos style (no spaces!) so that the unix form looks
-      # like /cygdrive/c/PROGRA~1:/cygdr...
-      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
-      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
-      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      ;;
-    *)
-      sys_lib_search_path_spec="$LIB"
-      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH.
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      # FIXME: find the short name or the path components, as spaces are
-      # common. (e.g. "Program Files" -> "PROGRA~1")
-      ;;
-    esac
-
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-    dynamic_linker='Win32 link.exe'
-    ;;
-
-  *)
-    # Assume MSVC wrapper
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    dynamic_linker='Win32 ld.exe'
-    ;;
-  esac
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-
-  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[23].*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2.*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[01]* | freebsdelf3.[01]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
-  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-haiku*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  dynamic_linker="$host_os runtime_loader"
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  hppa*64*)
-    shrext_cmds='.sl'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
-  postinstall_cmds='chmod 555 $lib'
-  # or fails outright, so override atomically:
-  install_override_mode=555
-  ;;
-
-interix[3-9]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux # correct to gnu/linux during the next big refactor
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-
-  # Some binutils ld are patched to set DT_RUNPATH
-  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_shlibpath_overrides_runpath=no
-    save_LDFLAGS=$LDFLAGS
-    save_libdir=$libdir
-    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
-	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-  lt_cv_shlibpath_overrides_runpath=yes
-fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-    LDFLAGS=$save_LDFLAGS
-    libdir=$save_libdir
-
-fi
-
-  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
-
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-*nto* | *qnx*)
-  version_type=qnx
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='ldqnx.so'
-  ;;
-
-openbsd*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-    *)				need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[89] | openbsd2.[89].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-rdos*)
-  dynamic_linker=no
-  ;;
-
-solaris*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux # correct to gnu/linux during the next big refactor
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-tpf*)
-  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-uts4*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-$as_echo "$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
-hardcode_action=
-if test -n "$hardcode_libdir_flag_spec" ||
-   test -n "$runpath_var" ||
-   test "X$hardcode_automatic" = "Xyes" ; then
-
-  # We can hardcode non-existent directories.
-  if test "$hardcode_direct" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &&
-     test "$hardcode_minus_L" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action=unsupported
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
-$as_echo "$hardcode_action" >&6; }
-
-if test "$hardcode_action" = relink ||
-   test "$inherit_rpath" = yes; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-
-
-
-
-
-  if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32* | cegcc*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-    ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-    ;;
-
-  darwin*)
-  # if libdl is installed we need to link against it
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dl_dlopen=yes
-else
-  ac_cv_lib_dl_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-
-fi
-
-    ;;
-
-  *)
-    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-if test "x$ac_cv_func_shl_load" = xyes; then :
-  lt_cv_dlopen="shl_load"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
-$as_echo_n "checking for shl_load in -ldld... " >&6; }
-if ${ac_cv_lib_dld_shl_load+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load ();
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-return shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dld_shl_load=yes
-else
-  ac_cv_lib_dld_shl_load=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
-else
-  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = xyes; then :
-  lt_cv_dlopen="dlopen"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dl_dlopen=yes
-else
-  ac_cv_lib_dl_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
-$as_echo_n "checking for dlopen in -lsvld... " >&6; }
-if ${ac_cv_lib_svld_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_svld_dlopen=yes
-else
-  ac_cv_lib_svld_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
-$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
-$as_echo_n "checking for dld_link in -ldld... " >&6; }
-if ${ac_cv_lib_dld_dld_link+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dld_link ();
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-return dld_link ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dld_dld_link=yes
-else
-  ac_cv_lib_dld_dld_link=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
-$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
-if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
-$as_echo_n "checking whether a program can dlopen itself... " >&6; }
-if ${lt_cv_dlopen_self+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-/* When -fvisbility=hidden is used, assume the code has been annotated
-   correspondingly for the symbols needed.  */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
-#endif
-
-int fnord () { return 42; }
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else
-        {
-	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-          else puts (dlerror ());
-	}
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-  return status;
-}
-_LT_EOF
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&5 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
-$as_echo "$lt_cv_dlopen_self" >&6; }
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
-$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
-if ${lt_cv_dlopen_self_static+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self_static=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-/* When -fvisbility=hidden is used, assume the code has been annotated
-   correspondingly for the symbols needed.  */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
-#endif
-
-int fnord () { return 42; }
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else
-        {
-	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-          else puts (dlerror ());
-	}
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-  return status;
-}
-_LT_EOF
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&5 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self_static=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
-$as_echo "$lt_cv_dlopen_self_static" >&6; }
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-striplib=
-old_striplib=
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
-$as_echo_n "checking whether stripping libraries is possible... " >&6; }
-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-  darwin*)
-    if test -n "$STRIP" ; then
-      striplib="$STRIP -x"
-      old_striplib="$STRIP -S"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    fi
-    ;;
-  *)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    ;;
-  esac
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-  # Report which library types will actually be built
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
-$as_echo_n "checking if libtool supports shared libraries... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
-$as_echo "$can_build_shared" >&6; }
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
-$as_echo_n "checking whether to build shared libraries... " >&6; }
-  test "$can_build_shared" = "no" && enable_shared=no
-
-  # On AIX, shared libraries and static libraries use the same namespace, and
-  # are all built from PIC.
-  case $host_os in
-  aix3*)
-    test "$enable_shared" = yes && enable_static=no
-    if test -n "$RANLIB"; then
-      archive_cmds="$archive_cmds~\$RANLIB \$lib"
-      postinstall_cmds='$RANLIB $lib'
-    fi
-    ;;
-
-  aix[4-9]*)
-    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-      test "$enable_shared" = yes && enable_static=no
-    fi
-    ;;
-  esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
-$as_echo "$enable_shared" >&6; }
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
-$as_echo_n "checking whether to build static libraries... " >&6; }
-  # Make sure either enable_shared or enable_static is yes.
-  test "$enable_shared" = yes || enable_static=yes
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
-$as_echo "$enable_static" >&6; }
-
-
-
-
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC="$lt_save_CC"
-
-      if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-    (test "X$CXX" != "Xg++"))) ; then
-  ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
-$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
-if test -z "$CXXCPP"; then
-  if ${ac_cv_prog_CXXCPP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CXXCPP needs to be expanded
-    for CXXCPP in "$CXX -E" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-  break
-fi
-
-    done
-    ac_cv_prog_CXXCPP=$CXXCPP
-
-fi
-  CXXCPP=$ac_cv_prog_CXXCPP
-else
-  ac_cv_prog_CXXCPP=$CXXCPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
-$as_echo "$CXXCPP" >&6; }
-ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-else
-  _lt_caught_CXX_error=yes
-fi
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-archive_cmds_need_lc_CXX=no
-allow_undefined_flag_CXX=
-always_export_symbols_CXX=no
-archive_expsym_cmds_CXX=
-compiler_needs_object_CXX=no
-export_dynamic_flag_spec_CXX=
-hardcode_direct_CXX=no
-hardcode_direct_absolute_CXX=no
-hardcode_libdir_flag_spec_CXX=
-hardcode_libdir_separator_CXX=
-hardcode_minus_L_CXX=no
-hardcode_shlibpath_var_CXX=unsupported
-hardcode_automatic_CXX=no
-inherit_rpath_CXX=no
-module_cmds_CXX=
-module_expsym_cmds_CXX=
-link_all_deplibs_CXX=unknown
-old_archive_cmds_CXX=$old_archive_cmds
-reload_flag_CXX=$reload_flag
-reload_cmds_CXX=$reload_cmds
-no_undefined_flag_CXX=
-whole_archive_flag_spec_CXX=
-enable_shared_with_static_runtimes_CXX=no
-
-# Source file extension for C++ test sources.
-ac_ext=cpp
-
-# Object file extension for compiled C++ test sources.
-objext=o
-objext_CXX=$objext
-
-# No sense in running all these tests if we already determined that
-# the CXX compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_caught_CXX_error" != yes; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="int some_variable = 0;"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-
-
-
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-  # save warnings/boilerplate of simple test code
-  ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$RM conftest*
-
-  ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$RM -r conftest*
-
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC=$CC
-  lt_save_CFLAGS=$CFLAGS
-  lt_save_LD=$LD
-  lt_save_GCC=$GCC
-  GCC=$GXX
-  lt_save_with_gnu_ld=$with_gnu_ld
-  lt_save_path_LD=$lt_cv_path_LD
-  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-  else
-    $as_unset lt_cv_prog_gnu_ld
-  fi
-  if test -n "${lt_cv_path_LDCXX+set}"; then
-    lt_cv_path_LD=$lt_cv_path_LDCXX
-  else
-    $as_unset lt_cv_path_LD
-  fi
-  test -z "${LDCXX+set}" || LD=$LDCXX
-  CC=${CXX-"c++"}
-  CFLAGS=$CXXFLAGS
-  compiler=$CC
-  compiler_CXX=$CC
-  for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-
-
-  if test -n "$compiler"; then
-    # We don't want -fno-exception when compiling C++ code, so set the
-    # no_builtin_flag separately
-    if test "$GXX" = yes; then
-      lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
-    else
-      lt_prog_compiler_no_builtin_flag_CXX=
-    fi
-
-    if test "$GXX" = yes; then
-      # Set up default GNU C++ configuration
-
-
-
-# Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then :
-  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi
-
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
-$as_echo_n "checking for ld used by $CC... " >&6; }
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [\\/]* | ?:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
-      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
-$as_echo_n "checking for non-GNU ld... " >&6; }
-fi
-if ${lt_cv_path_LD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
-	;;
-      *)
-	test "$with_gnu_ld" != yes && break
-	;;
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
-fi
-
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-$as_echo "$LD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if ${lt_cv_prog_gnu_ld+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  # I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-$as_echo "$lt_cv_prog_gnu_ld" >&6; }
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-
-
-
-
-
-      # Check if GNU C++ uses GNU ld as the underlying linker, since the
-      # archiving commands below assume that GNU ld is being used.
-      if test "$with_gnu_ld" = yes; then
-        archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
-        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-        export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-
-        # If archive_cmds runs LD, not CC, wlarc should be empty
-        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-        #     investigate it a little bit more. (MM)
-        wlarc='${wl}'
-
-        # ancient GNU ld didn't support --whole-archive et. al.
-        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
-	  $GREP 'no-whole-archive' > /dev/null; then
-          whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-        else
-          whole_archive_flag_spec_CXX=
-        fi
-      else
-        with_gnu_ld=no
-        wlarc=
-
-        # A generic and very simple default shared library creation
-        # command for GNU C++ for the case where it uses the native
-        # linker, instead of GNU ld.  If possible, this setting should
-        # overridden to take advantage of the native linker features on
-        # the platform it is being used on.
-        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-      fi
-
-      # Commands to make compiler produce verbose output that lists
-      # what "hidden" libraries, object files and flags are used when
-      # linking a shared library.
-      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-
-    else
-      GXX=no
-      with_gnu_ld=no
-      wlarc=
-    fi
-
-    # PORTME: fill in a description of your system's C++ link characteristics
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-    ld_shlibs_CXX=yes
-    case $host_os in
-      aix3*)
-        # FIXME: insert proper C++ library support
-        ld_shlibs_CXX=no
-        ;;
-      aix[4-9]*)
-        if test "$host_cpu" = ia64; then
-          # On IA64, the linker does run time linking by default, so we don't
-          # have to do anything special.
-          aix_use_runtimelinking=no
-          exp_sym_flag='-Bexport'
-          no_entry_flag=""
-        else
-          aix_use_runtimelinking=no
-
-          # Test if we are trying to use run time linking or normal
-          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-          # need to do runtime linking.
-          case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
-	    for ld_flag in $LDFLAGS; do
-	      case $ld_flag in
-	      *-brtl*)
-	        aix_use_runtimelinking=yes
-	        break
-	        ;;
-	      esac
-	    done
-	    ;;
-          esac
-
-          exp_sym_flag='-bexport'
-          no_entry_flag='-bnoentry'
-        fi
-
-        # When large executables or shared objects are built, AIX ld can
-        # have problems creating the table of contents.  If linking a library
-        # or program results in "error TOC overflow" add -mminimal-toc to
-        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-        archive_cmds_CXX=''
-        hardcode_direct_CXX=yes
-        hardcode_direct_absolute_CXX=yes
-        hardcode_libdir_separator_CXX=':'
-        link_all_deplibs_CXX=yes
-        file_list_spec_CXX='${wl}-f,'
-
-        if test "$GXX" = yes; then
-          case $host_os in aix4.[012]|aix4.[012].*)
-          # We only want to do this on AIX 4.2 and lower, the check
-          # below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	    # We have reworked collect2
-	    :
-	  else
-	    # We have old collect2
-	    hardcode_direct_CXX=unsupported
-	    # It fails to find uninstalled libraries when the uninstalled
-	    # path is not listed in the libpath.  Setting hardcode_minus_L
-	    # to unsupported forces relinking
-	    hardcode_minus_L_CXX=yes
-	    hardcode_libdir_flag_spec_CXX='-L$libdir'
-	    hardcode_libdir_separator_CXX=
-	  fi
-          esac
-          shared_flag='-shared'
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag="$shared_flag "'${wl}-G'
-	  fi
-        else
-          # not using gcc
-          if test "$host_cpu" = ia64; then
-	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	  # chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-          else
-	    if test "$aix_use_runtimelinking" = yes; then
-	      shared_flag='${wl}-G'
-	    else
-	      shared_flag='${wl}-bM:SRE'
-	    fi
-          fi
-        fi
-
-        export_dynamic_flag_spec_CXX='${wl}-bexpall'
-        # It seems that -bexpall does not export symbols beginning with
-        # underscore (_), so it is better to generate a list of symbols to
-	# export.
-        always_export_symbols_CXX=yes
-        if test "$aix_use_runtimelinking" = yes; then
-          # Warning - without using the other runtime loading flags (-brtl),
-          # -berok will link without error, but may produce a broken library.
-          allow_undefined_flag_CXX='-berok'
-          # Determine the default libpath from the value encoded in an empty
-          # executable.
-          if test "${lt_cv_aix_libpath+set}" = set; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  if ${lt_cv_aix_libpath__CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-
-  lt_aix_libpath_sed='
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }'
-  lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$lt_cv_aix_libpath__CXX"; then
-    lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  if test -z "$lt_cv_aix_libpath__CXX"; then
-    lt_cv_aix_libpath__CXX="/usr/lib:/lib"
-  fi
-
-fi
-
-  aix_libpath=$lt_cv_aix_libpath__CXX
-fi
-
-          hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-
-          archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-        else
-          if test "$host_cpu" = ia64; then
-	    hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
-	    allow_undefined_flag_CXX="-z nodefs"
-	    archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-          else
-	    # Determine the default libpath from the value encoded in an
-	    # empty executable.
-	    if test "${lt_cv_aix_libpath+set}" = set; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  if ${lt_cv_aix_libpath__CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-
-  lt_aix_libpath_sed='
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }'
-  lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$lt_cv_aix_libpath__CXX"; then
-    lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  if test -z "$lt_cv_aix_libpath__CXX"; then
-    lt_cv_aix_libpath__CXX="/usr/lib:/lib"
-  fi
-
-fi
-
-  aix_libpath=$lt_cv_aix_libpath__CXX
-fi
-
-	    hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-	    # Warning - without using the other run time loading flags,
-	    # -berok will link without error, but may produce a broken library.
-	    no_undefined_flag_CXX=' ${wl}-bernotok'
-	    allow_undefined_flag_CXX=' ${wl}-berok'
-	    if test "$with_gnu_ld" = yes; then
-	      # We only use this code for GNU lds that support --whole-archive.
-	      whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	    else
-	      # Exported symbols can be pulled into shared objects from archives
-	      whole_archive_flag_spec_CXX='$convenience'
-	    fi
-	    archive_cmds_need_lc_CXX=yes
-	    # This is similar to how AIX traditionally builds its shared
-	    # libraries.
-	    archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-          fi
-        fi
-        ;;
-
-      beos*)
-	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	  allow_undefined_flag_CXX=unsupported
-	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	  # support --undefined.  This deserves some investigation.  FIXME
-	  archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	else
-	  ld_shlibs_CXX=no
-	fi
-	;;
-
-      chorus*)
-        case $cc_basename in
-          *)
-	  # FIXME: insert proper C++ library support
-	  ld_shlibs_CXX=no
-	  ;;
-        esac
-        ;;
-
-      cygwin* | mingw* | pw32* | cegcc*)
-	case $GXX,$cc_basename in
-	,cl* | no,cl*)
-	  # Native MSVC
-	  # hardcode_libdir_flag_spec is actually meaningless, as there is
-	  # no search path for DLLs.
-	  hardcode_libdir_flag_spec_CXX=' '
-	  allow_undefined_flag_CXX=unsupported
-	  always_export_symbols_CXX=yes
-	  file_list_spec_CXX='@'
-	  # Tell ltmain to make .lib files, not .a files.
-	  libext=lib
-	  # Tell ltmain to make .dll files, not .so files.
-	  shrext_cmds=".dll"
-	  # FIXME: Setting linknames here is a bad hack.
-	  archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-	  archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	      $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-	    else
-	      $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-	    fi~
-	    $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-	    linknames='
-	  # The linker will not automatically build a static lib if we build a DLL.
-	  # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true'
-	  enable_shared_with_static_runtimes_CXX=yes
-	  # Don't use ranlib
-	  old_postinstall_cmds_CXX='chmod 644 $oldlib'
-	  postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~
-	    lt_tool_outputfile="@TOOL_OUTPUT@"~
-	    case $lt_outputfile in
-	      *.exe|*.EXE) ;;
-	      *)
-		lt_outputfile="$lt_outputfile.exe"
-		lt_tool_outputfile="$lt_tool_outputfile.exe"
-		;;
-	    esac~
-	    func_to_tool_file "$lt_outputfile"~
-	    if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-	      $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-	      $RM "$lt_outputfile.manifest";
-	    fi'
-	  ;;
-	*)
-	  # g++
-	  # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
-	  # as there is no search path for DLLs.
-	  hardcode_libdir_flag_spec_CXX='-L$libdir'
-	  export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
-	  allow_undefined_flag_CXX=unsupported
-	  always_export_symbols_CXX=no
-	  enable_shared_with_static_runtimes_CXX=yes
-
-	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	    # If the export-symbols file already is a .def file (1st line
-	    # is EXPORTS), use it as is; otherwise, prepend...
-	    archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	      cp $export_symbols $output_objdir/$soname.def;
-	    else
-	      echo EXPORTS > $output_objdir/$soname.def;
-	      cat $export_symbols >> $output_objdir/$soname.def;
-	    fi~
-	    $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	  else
-	    ld_shlibs_CXX=no
-	  fi
-	  ;;
-	esac
-	;;
-      darwin* | rhapsody*)
-
-
-  archive_cmds_need_lc_CXX=no
-  hardcode_direct_CXX=no
-  hardcode_automatic_CXX=yes
-  hardcode_shlibpath_var_CXX=unsupported
-  if test "$lt_cv_ld_force_load" = "yes"; then
-    whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-
-  else
-    whole_archive_flag_spec_CXX=''
-  fi
-  link_all_deplibs_CXX=yes
-  allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
-  case $cc_basename in
-     ifort*) _lt_dar_can_shared=yes ;;
-     *) _lt_dar_can_shared=$GCC ;;
-  esac
-  if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=func_echo_all
-    archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-    module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-    archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-    module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-       if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-      archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
-      archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
-    fi
-
-  else
-  ld_shlibs_CXX=no
-  fi
-
-	;;
-
-      dgux*)
-        case $cc_basename in
-          ec++*)
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-          ghcx*)
-	    # Green Hills C++ Compiler
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-        esac
-        ;;
-
-      freebsd2.*)
-        # C++ shared libraries reported to be fairly broken before
-	# switch to ELF
-        ld_shlibs_CXX=no
-        ;;
-
-      freebsd-elf*)
-        archive_cmds_need_lc_CXX=no
-        ;;
-
-      freebsd* | dragonfly*)
-        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-        # conventions
-        ld_shlibs_CXX=yes
-        ;;
-
-      gnu*)
-        ;;
-
-      haiku*)
-        archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        link_all_deplibs_CXX=yes
-        ;;
-
-      hpux9*)
-        hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-        hardcode_libdir_separator_CXX=:
-        export_dynamic_flag_spec_CXX='${wl}-E'
-        hardcode_direct_CXX=yes
-        hardcode_minus_L_CXX=yes # Not in the search PATH,
-				             # but as the default
-				             # location of the library.
-
-        case $cc_basename in
-          CC*)
-            # FIXME: insert proper C++ library support
-            ld_shlibs_CXX=no
-            ;;
-          aCC*)
-            archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            # Commands to make compiler produce verbose output that lists
-            # what "hidden" libraries, object files and flags are used when
-            # linking a shared library.
-            #
-            # There doesn't appear to be a way to prevent this compiler from
-            # explicitly linking system object files so we need to strip them
-            # from the output so that they don't get included in the library
-            # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-            ;;
-          *)
-            if test "$GXX" = yes; then
-              archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            else
-              # FIXME: insert proper C++ library support
-              ld_shlibs_CXX=no
-            fi
-            ;;
-        esac
-        ;;
-
-      hpux10*|hpux11*)
-        if test $with_gnu_ld = no; then
-	  hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-	  hardcode_libdir_separator_CXX=:
-
-          case $host_cpu in
-            hppa*64*|ia64*)
-              ;;
-            *)
-	      export_dynamic_flag_spec_CXX='${wl}-E'
-              ;;
-          esac
-        fi
-        case $host_cpu in
-          hppa*64*|ia64*)
-            hardcode_direct_CXX=no
-            hardcode_shlibpath_var_CXX=no
-            ;;
-          *)
-            hardcode_direct_CXX=yes
-            hardcode_direct_absolute_CXX=yes
-            hardcode_minus_L_CXX=yes # Not in the search PATH,
-					         # but as the default
-					         # location of the library.
-            ;;
-        esac
-
-        case $cc_basename in
-          CC*)
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-          aCC*)
-	    case $host_cpu in
-	      hppa*64*)
-	        archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	      ia64*)
-	        archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	      *)
-	        archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	    esac
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-	    ;;
-          *)
-	    if test "$GXX" = yes; then
-	      if test $with_gnu_ld = no; then
-	        case $host_cpu in
-	          hppa*64*)
-	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	          ia64*)
-	            archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	          *)
-	            archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	        esac
-	      fi
-	    else
-	      # FIXME: insert proper C++ library support
-	      ld_shlibs_CXX=no
-	    fi
-	    ;;
-        esac
-        ;;
-
-      interix[3-9]*)
-	hardcode_direct_CXX=no
-	hardcode_shlibpath_var_CXX=no
-	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec_CXX='${wl}-E'
-	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-	# Instead, shared libraries are loaded at an image base (0x10000000 by
-	# default) and relocated if they conflict, which is a slow very memory
-	# consuming and fragmenting process.  To avoid this, we pick a random,
-	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-	archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	;;
-      irix5* | irix6*)
-        case $cc_basename in
-          CC*)
-	    # SGI C++
-	    archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-	    # necessary to make sure instantiated templates are included
-	    # in the archive.
-	    old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
-	    ;;
-          *)
-	    if test "$GXX" = yes; then
-	      if test "$with_gnu_ld" = no; then
-	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	      else
-	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
-	      fi
-	    fi
-	    link_all_deplibs_CXX=yes
-	    ;;
-        esac
-        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-        hardcode_libdir_separator_CXX=:
-        inherit_rpath_CXX=yes
-        ;;
-
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
-        case $cc_basename in
-          KCC*)
-	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	    # KCC will only create a shared library if the output file
-	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
-	    # to its proper name (with version) after linking.
-	    archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-	    archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-
-	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	    old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
-	    ;;
-	  icpc* | ecpc* )
-	    # Intel C++
-	    with_gnu_ld=yes
-	    # version 8.0 and above of icpc choke on multiply defined symbols
-	    # if we add $predep_objects and $postdep_objects, however 7.1 and
-	    # earlier do not add the objects themselves.
-	    case `$CC -V 2>&1` in
-	      *"Version 7."*)
-	        archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-		archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-		;;
-	      *)  # Version 8.0 or newer
-	        tmp_idyn=
-	        case $host_cpu in
-		  ia64*) tmp_idyn=' -i_dynamic';;
-		esac
-	        archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-		archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-		;;
-	    esac
-	    archive_cmds_need_lc_CXX=no
-	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-	    whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	    ;;
-          pgCC* | pgcpp*)
-            # Portland Group C++ compiler
-	    case `$CC -V` in
-	    *pgCC\ [1-5].* | *pgcpp\ [1-5].*)
-	      prelink_cmds_CXX='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
-	      old_archive_cmds_CXX='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
-		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
-		$RANLIB $oldlib'
-	      archive_cmds_CXX='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-	      archive_expsym_cmds_CXX='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-	      ;;
-	    *) # Version 6 and above use weak symbols
-	      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-	      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-	      ;;
-	    esac
-
-	    hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
-	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-	    whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-            ;;
-	  cxx*)
-	    # Compaq C++
-	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-
-	    runpath_var=LD_RUN_PATH
-	    hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-	    hardcode_libdir_separator_CXX=:
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
-	    ;;
-	  xl* | mpixl* | bgxl*)
-	    # IBM XL 8.0 on PPC, with GNU ld
-	    hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-	    archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    if test "x$supports_anon_versioning" = xyes; then
-	      archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~
-		cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-		echo "local: *; };" >> $output_objdir/$libname.ver~
-		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-	    fi
-	    ;;
-	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
-	    *Sun\ C*)
-	      # Sun C++ 5.9
-	      no_undefined_flag_CXX=' -zdefs'
-	      archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
-	      hardcode_libdir_flag_spec_CXX='-R$libdir'
-	      whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	      compiler_needs_object_CXX=yes
-
-	      # Not sure whether something based on
-	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
-	      # would be better.
-	      output_verbose_link_cmd='func_echo_all'
-
-	      # Archives containing C++ object files must be created using
-	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	      # necessary to make sure instantiated templates are included
-	      # in the archive.
-	      old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
-	      ;;
-	    esac
-	    ;;
-	esac
-	;;
-
-      lynxos*)
-        # FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-
-      m88k*)
-        # FIXME: insert proper C++ library support
-        ld_shlibs_CXX=no
-	;;
-
-      mvs*)
-        case $cc_basename in
-          cxx*)
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-	  *)
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-	esac
-	;;
-
-      netbsd*)
-        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	  archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-	  wlarc=
-	  hardcode_libdir_flag_spec_CXX='-R$libdir'
-	  hardcode_direct_CXX=yes
-	  hardcode_shlibpath_var_CXX=no
-	fi
-	# Workaround some broken pre-1.5 toolchains
-	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-	;;
-
-      *nto* | *qnx*)
-        ld_shlibs_CXX=yes
-	;;
-
-      openbsd2*)
-        # C++ shared libraries are fairly broken
-	ld_shlibs_CXX=no
-	;;
-
-      openbsd*)
-	if test -f /usr/libexec/ld.so; then
-	  hardcode_direct_CXX=yes
-	  hardcode_shlibpath_var_CXX=no
-	  hardcode_direct_absolute_CXX=yes
-	  archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-	  hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	    archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-	    export_dynamic_flag_spec_CXX='${wl}-E'
-	    whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-	  fi
-	  output_verbose_link_cmd=func_echo_all
-	else
-	  ld_shlibs_CXX=no
-	fi
-	;;
-
-      osf3* | osf4* | osf5*)
-        case $cc_basename in
-          KCC*)
-	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	    # KCC will only create a shared library if the output file
-	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
-	    # to its proper name (with version) after linking.
-	    archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	    hardcode_libdir_separator_CXX=:
-
-	    # Archives containing C++ object files must be created using
-	    # the KAI C++ compiler.
-	    case $host in
-	      osf3*) old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;;
-	      *) old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' ;;
-	    esac
-	    ;;
-          RCC*)
-	    # Rational C++ 2.4.1
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-          cxx*)
-	    case $host in
-	      osf3*)
-	        allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-		;;
-	      *)
-	        allow_undefined_flag_CXX=' -expect_unresolved \*'
-	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	        archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-	          echo "-hidden">> $lib.exp~
-	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
-	          $RM $lib.exp'
-	        hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-		;;
-	    esac
-
-	    hardcode_libdir_separator_CXX=:
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-	    ;;
-	  *)
-	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	      allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	      case $host in
-	        osf3*)
-	          archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-		  ;;
-	        *)
-	          archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-		  ;;
-	      esac
-
-	      hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-	      hardcode_libdir_separator_CXX=:
-
-	      # Commands to make compiler produce verbose output that lists
-	      # what "hidden" libraries, object files and flags are used when
-	      # linking a shared library.
-	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-
-	    else
-	      # FIXME: insert proper C++ library support
-	      ld_shlibs_CXX=no
-	    fi
-	    ;;
-        esac
-        ;;
-
-      psos*)
-        # FIXME: insert proper C++ library support
-        ld_shlibs_CXX=no
-        ;;
-
-      sunos4*)
-        case $cc_basename in
-          CC*)
-	    # Sun C++ 4.x
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-          lcc*)
-	    # Lucid
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-        esac
-        ;;
-
-      solaris*)
-        case $cc_basename in
-          CC* | sunCC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-            archive_cmds_need_lc_CXX=yes
-	    no_undefined_flag_CXX=' -zdefs'
-	    archive_cmds_CXX='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	    archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	    hardcode_libdir_flag_spec_CXX='-R$libdir'
-	    hardcode_shlibpath_var_CXX=no
-	    case $host_os in
-	      solaris2.[0-5] | solaris2.[0-5].*) ;;
-	      *)
-		# The compiler driver will combine and reorder linker options,
-		# but understands `-z linker_flag'.
-	        # Supported since Solaris 2.6 (maybe 2.5.1?)
-		whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
-	        ;;
-	    esac
-	    link_all_deplibs_CXX=yes
-
-	    output_verbose_link_cmd='func_echo_all'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	    # necessary to make sure instantiated templates are included
-	    # in the archive.
-	    old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
-	    ;;
-          gcx*)
-	    # Green Hills C++ Compiler
-	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-
-	    # The C++ compiler must be used to create the archive.
-	    old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-	    ;;
-          *)
-	    # GNU C++ compiler with Solaris linker
-	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	      no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
-	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	        # Commands to make compiler produce verbose output that lists
-	        # what "hidden" libraries, object files and flags are used when
-	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-	      else
-	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
-	        # platform.
-	        archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	        # Commands to make compiler produce verbose output that lists
-	        # what "hidden" libraries, object files and flags are used when
-	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-	      fi
-
-	      hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
-	      case $host_os in
-		solaris2.[0-5] | solaris2.[0-5].*) ;;
-		*)
-		  whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-		  ;;
-	      esac
-	    fi
-	    ;;
-        esac
-        ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-      no_undefined_flag_CXX='${wl}-z,text'
-      archive_cmds_need_lc_CXX=no
-      hardcode_shlibpath_var_CXX=no
-      runpath_var='LD_RUN_PATH'
-
-      case $cc_basename in
-        CC*)
-	  archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-      esac
-      ;;
-
-      sysv5* | sco3.2v5* | sco5v6*)
-	# Note: We can NOT use -z defs as we might desire, because we do not
-	# link with -lc, and that would cause any symbols used from libc to
-	# always be unresolved, which means just about no library would
-	# ever link correctly.  If we're not using GNU ld we use -z text
-	# though, which does catch some bad symbols but isn't as heavy-handed
-	# as -z defs.
-	no_undefined_flag_CXX='${wl}-z,text'
-	allow_undefined_flag_CXX='${wl}-z,nodefs'
-	archive_cmds_need_lc_CXX=no
-	hardcode_shlibpath_var_CXX=no
-	hardcode_libdir_flag_spec_CXX='${wl}-R,$libdir'
-	hardcode_libdir_separator_CXX=':'
-	link_all_deplibs_CXX=yes
-	export_dynamic_flag_spec_CXX='${wl}-Bexport'
-	runpath_var='LD_RUN_PATH'
-
-	case $cc_basename in
-          CC*)
-	    archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~
-	      '"$old_archive_cmds_CXX"
-	    reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~
-	      '"$reload_cmds_CXX"
-	    ;;
-	  *)
-	    archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    ;;
-	esac
-      ;;
-
-      tandem*)
-        case $cc_basename in
-          NCC*)
-	    # NonStop-UX NCC 3.20
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-        esac
-        ;;
-
-      vxworks*)
-        # FIXME: insert proper C++ library support
-        ld_shlibs_CXX=no
-        ;;
-
-      *)
-        # FIXME: insert proper C++ library support
-        ld_shlibs_CXX=no
-        ;;
-    esac
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
-$as_echo "$ld_shlibs_CXX" >&6; }
-    test "$ld_shlibs_CXX" = no && can_build_shared=no
-
-    GCC_CXX="$GXX"
-    LD_CXX="$LD"
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    # Dependencies to place before and after the object being linked:
-predep_objects_CXX=
-postdep_objects_CXX=
-predeps_CXX=
-postdeps_CXX=
-compiler_lib_search_path_CXX=
-
-cat > conftest.$ac_ext <<_LT_EOF
-class Foo
-{
-public:
-  Foo (void) { a = 0; }
-private:
-  int a;
-};
-_LT_EOF
-
-
-_lt_libdeps_save_CFLAGS=$CFLAGS
-case "$CC $CFLAGS " in #(
-*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
-*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
-*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
-esac
-
-if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  # Parse the compiler output and extract the necessary
-  # objects, libraries and library flags.
-
-  # Sentinel used to keep track of whether or not we are before
-  # the conftest object file.
-  pre_test_object_deps_done=no
-
-  for p in `eval "$output_verbose_link_cmd"`; do
-    case ${prev}${p} in
-
-    -L* | -R* | -l*)
-       # Some compilers place space between "-{L,R}" and the path.
-       # Remove the space.
-       if test $p = "-L" ||
-          test $p = "-R"; then
-	 prev=$p
-	 continue
-       fi
-
-       # Expand the sysroot to ease extracting the directories later.
-       if test -z "$prev"; then
-         case $p in
-         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
-         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
-         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
-         esac
-       fi
-       case $p in
-       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
-       esac
-       if test "$pre_test_object_deps_done" = no; then
-	 case ${prev} in
-	 -L | -R)
-	   # Internal compiler library paths should come after those
-	   # provided the user.  The postdeps already come after the
-	   # user supplied libs so there is no need to process them.
-	   if test -z "$compiler_lib_search_path_CXX"; then
-	     compiler_lib_search_path_CXX="${prev}${p}"
-	   else
-	     compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}"
-	   fi
-	   ;;
-	 # The "-l" case would never come before the object being
-	 # linked, so don't bother handling this case.
-	 esac
-       else
-	 if test -z "$postdeps_CXX"; then
-	   postdeps_CXX="${prev}${p}"
-	 else
-	   postdeps_CXX="${postdeps_CXX} ${prev}${p}"
-	 fi
-       fi
-       prev=
-       ;;
-
-    *.lto.$objext) ;; # Ignore GCC LTO objects
-    *.$objext)
-       # This assumes that the test object file only shows up
-       # once in the compiler output.
-       if test "$p" = "conftest.$objext"; then
-	 pre_test_object_deps_done=yes
-	 continue
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 if test -z "$predep_objects_CXX"; then
-	   predep_objects_CXX="$p"
-	 else
-	   predep_objects_CXX="$predep_objects_CXX $p"
-	 fi
-       else
-	 if test -z "$postdep_objects_CXX"; then
-	   postdep_objects_CXX="$p"
-	 else
-	   postdep_objects_CXX="$postdep_objects_CXX $p"
-	 fi
-       fi
-       ;;
-
-    *) ;; # Ignore the rest.
-
-    esac
-  done
-
-  # Clean up.
-  rm -f a.out a.exe
-else
-  echo "libtool.m4: error: problem compiling CXX test program"
-fi
-
-$RM -f confest.$objext
-CFLAGS=$_lt_libdeps_save_CFLAGS
-
-# PORTME: override above test on systems where it is broken
-case $host_os in
-interix[3-9]*)
-  # Interix 3.5 installs completely hosed .la files for C++, so rather than
-  # hack all around it, let's just trust "g++" to DTRT.
-  predep_objects_CXX=
-  postdep_objects_CXX=
-  postdeps_CXX=
-  ;;
-
-linux*)
-  case `$CC -V 2>&1 | sed 5q` in
-  *Sun\ C*)
-    # Sun C++ 5.9
-
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    if test "$solaris_use_stlport4" != yes; then
-      postdeps_CXX='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-
-solaris*)
-  case $cc_basename in
-  CC* | sunCC*)
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    # Adding this requires a known-good setup of shared libraries for
-    # Sun compiler versions before 5.6, else PIC objects from an old
-    # archive will be linked into the output, leading to subtle bugs.
-    if test "$solaris_use_stlport4" != yes; then
-      postdeps_CXX='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-esac
-
-
-case " $postdeps_CXX " in
-*" -lc "*) archive_cmds_need_lc_CXX=no ;;
-esac
- compiler_lib_search_dirs_CXX=
-if test -n "${compiler_lib_search_path_CXX}"; then
- compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    lt_prog_compiler_wl_CXX=
-lt_prog_compiler_pic_CXX=
-lt_prog_compiler_static_CXX=
-
-
-  # C++ specific cases for pic, static, wl, etc.
-  if test "$GXX" = yes; then
-    lt_prog_compiler_wl_CXX='-Wl,'
-    lt_prog_compiler_static_CXX='-static'
-
-    case $host_os in
-    aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_CXX='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            lt_prog_compiler_pic_CXX='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
-            lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-    mingw* | cygwin* | os2* | pw32* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
-      ;;
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic_CXX='-fno-common'
-      ;;
-    *djgpp*)
-      # DJGPP does not support shared libraries at all
-      lt_prog_compiler_pic_CXX=
-      ;;
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      lt_prog_compiler_static_CXX=
-      ;;
-    interix[3-9]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic_CXX=-Kconform_pic
-      fi
-      ;;
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-	;;
-      *)
-	lt_prog_compiler_pic_CXX='-fPIC'
-	;;
-      esac
-      ;;
-    *qnx* | *nto*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      lt_prog_compiler_pic_CXX='-fPIC -shared'
-      ;;
-    *)
-      lt_prog_compiler_pic_CXX='-fPIC'
-      ;;
-    esac
-  else
-    case $host_os in
-      aix[4-9]*)
-	# All AIX code is PIC.
-	if test "$host_cpu" = ia64; then
-	  # AIX 5 now supports IA64 processor
-	  lt_prog_compiler_static_CXX='-Bstatic'
-	else
-	  lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp'
-	fi
-	;;
-      chorus*)
-	case $cc_basename in
-	cxch68*)
-	  # Green Hills C++ Compiler
-	  # _LT_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-	  ;;
-	esac
-	;;
-      mingw* | cygwin* | os2* | pw32* | cegcc*)
-	# This hack is so that the source file can tell whether it is being
-	# built for inclusion in a dll (and should export symbols for example).
-	lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
-	;;
-      dgux*)
-	case $cc_basename in
-	  ec++*)
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    ;;
-	  ghcx*)
-	    # Green Hills C++ Compiler
-	    lt_prog_compiler_pic_CXX='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      freebsd* | dragonfly*)
-	# FreeBSD uses GNU C++
-	;;
-      hpux9* | hpux10* | hpux11*)
-	case $cc_basename in
-	  CC*)
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
-	    if test "$host_cpu" != ia64; then
-	      lt_prog_compiler_pic_CXX='+Z'
-	    fi
-	    ;;
-	  aCC*)
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
-	    case $host_cpu in
-	    hppa*64*|ia64*)
-	      # +Z the default
-	      ;;
-	    *)
-	      lt_prog_compiler_pic_CXX='+Z'
-	      ;;
-	    esac
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      interix*)
-	# This is c89, which is MS Visual C++ (no shared libs)
-	# Anyone wants to do a port?
-	;;
-      irix5* | irix6* | nonstopux*)
-	case $cc_basename in
-	  CC*)
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_static_CXX='-non_shared'
-	    # CC pic flag -KPIC is the default.
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
-	case $cc_basename in
-	  KCC*)
-	    # KAI C++ Compiler
-	    lt_prog_compiler_wl_CXX='--backend -Wl,'
-	    lt_prog_compiler_pic_CXX='-fPIC'
-	    ;;
-	  ecpc* )
-	    # old Intel C++ for x86_64 which still supported -KPIC.
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    lt_prog_compiler_static_CXX='-static'
-	    ;;
-	  icpc* )
-	    # Intel C++, used to be incompatible with GCC.
-	    # ICC 10 doesn't accept -KPIC any more.
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_pic_CXX='-fPIC'
-	    lt_prog_compiler_static_CXX='-static'
-	    ;;
-	  pgCC* | pgcpp*)
-	    # Portland Group C++ compiler
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_pic_CXX='-fpic'
-	    lt_prog_compiler_static_CXX='-Bstatic'
-	    ;;
-	  cxx*)
-	    # Compaq C++
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    lt_prog_compiler_pic_CXX=
-	    lt_prog_compiler_static_CXX='-non_shared'
-	    ;;
-	  xlc* | xlC* | bgxl[cC]* | mpixl[cC]*)
-	    # IBM XL 8.0, 9.0 on PPC and BlueGene
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_pic_CXX='-qpic'
-	    lt_prog_compiler_static_CXX='-qstaticlink'
-	    ;;
-	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
-	    *Sun\ C*)
-	      # Sun C++ 5.9
-	      lt_prog_compiler_pic_CXX='-KPIC'
-	      lt_prog_compiler_static_CXX='-Bstatic'
-	      lt_prog_compiler_wl_CXX='-Qoption ld '
-	      ;;
-	    esac
-	    ;;
-	esac
-	;;
-      lynxos*)
-	;;
-      m88k*)
-	;;
-      mvs*)
-	case $cc_basename in
-	  cxx*)
-	    lt_prog_compiler_pic_CXX='-W c,exportall'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      netbsd*)
-	;;
-      *qnx* | *nto*)
-        # QNX uses GNU C++, but need to define -shared option too, otherwise
-        # it will coredump.
-        lt_prog_compiler_pic_CXX='-fPIC -shared'
-        ;;
-      osf3* | osf4* | osf5*)
-	case $cc_basename in
-	  KCC*)
-	    lt_prog_compiler_wl_CXX='--backend -Wl,'
-	    ;;
-	  RCC*)
-	    # Rational C++ 2.4.1
-	    lt_prog_compiler_pic_CXX='-pic'
-	    ;;
-	  cxx*)
-	    # Digital/Compaq C++
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    lt_prog_compiler_pic_CXX=
-	    lt_prog_compiler_static_CXX='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      psos*)
-	;;
-      solaris*)
-	case $cc_basename in
-	  CC* | sunCC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    lt_prog_compiler_static_CXX='-Bstatic'
-	    lt_prog_compiler_wl_CXX='-Qoption ld '
-	    ;;
-	  gcx*)
-	    # Green Hills C++ Compiler
-	    lt_prog_compiler_pic_CXX='-PIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sunos4*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.x
-	    lt_prog_compiler_pic_CXX='-pic'
-	    lt_prog_compiler_static_CXX='-Bstatic'
-	    ;;
-	  lcc*)
-	    # Lucid
-	    lt_prog_compiler_pic_CXX='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-	case $cc_basename in
-	  CC*)
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    lt_prog_compiler_static_CXX='-Bstatic'
-	    ;;
-	esac
-	;;
-      tandem*)
-	case $cc_basename in
-	  NCC*)
-	    # NonStop-UX NCC 3.20
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      vxworks*)
-	;;
-      *)
-	lt_prog_compiler_can_build_shared_CXX=no
-	;;
-    esac
-  fi
-
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic_CXX=
-    ;;
-  *)
-    lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
-    ;;
-esac
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-if ${lt_cv_prog_compiler_pic_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
-$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; }
-lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
-if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic_works_CXX=no
-   ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_pic_works_CXX=yes
-     fi
-   fi
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
-$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
-
-if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
-    case $lt_prog_compiler_pic_CXX in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
-     esac
-else
-    lt_prog_compiler_pic_CXX=
-     lt_prog_compiler_can_build_shared_CXX=no
-fi
-
-fi
-
-
-
-
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if ${lt_cv_prog_compiler_static_works_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_static_works_CXX=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler_static_works_CXX=yes
-       fi
-     else
-       lt_cv_prog_compiler_static_works_CXX=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
-$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
-
-if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
-    :
-else
-    lt_prog_compiler_static_CXX=
-fi
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o_CXX=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o_CXX=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o_CXX=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o_CXX=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
-
-
-
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
-$as_echo_n "checking if we can lock with hard links... " >&6; }
-  hard_links=yes
-  $RM conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-$as_echo "$hard_links" >&6; }
-  if test "$hard_links" = no; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-
-  export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-  case $host_os in
-  aix[4-9]*)
-    # If we're using GNU nm, then we don't want the "-C" option.
-    # -C means demangle to AIX nm, but means don't demangle with GNU nm
-    # Also, AIX nm treats weak defined symbols like other global defined
-    # symbols, whereas GNU nm marks them as "W".
-    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-    else
-      export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-    fi
-    ;;
-  pw32*)
-    export_symbols_cmds_CXX="$ltdll_cmds"
-    ;;
-  cygwin* | mingw* | cegcc*)
-    case $cc_basename in
-    cl*)
-      exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-      ;;
-    *)
-      export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
-      exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
-      ;;
-    esac
-    ;;
-  *)
-    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-    ;;
-  esac
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
-$as_echo "$ld_shlibs_CXX" >&6; }
-test "$ld_shlibs_CXX" = no && can_build_shared=no
-
-with_gnu_ld_CXX=$with_gnu_ld
-
-
-
-
-
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc_CXX" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc_CXX=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds_CXX in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  $RM conftest*
-	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } 2>conftest.err; then
-	  soname=conftest
-	  lib=conftest
-	  libobjs=conftest.$ac_objext
-	  deplibs=
-	  wl=$lt_prog_compiler_wl_CXX
-	  pic_flag=$lt_prog_compiler_pic_CXX
-	  compiler_flags=-v
-	  linker_flags=-v
-	  verstring=
-	  output_objdir=.
-	  libname=conftest
-	  lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
-	  allow_undefined_flag_CXX=
-	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
-  (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-	  then
-	    lt_cv_archive_cmds_need_lc_CXX=no
-	  else
-	    lt_cv_archive_cmds_need_lc_CXX=yes
-	  fi
-	  allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
-	else
-	  cat conftest.err 1>&5
-	fi
-	$RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5
-$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; }
-      archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
-$as_echo_n "checking dynamic linker characteristics... " >&6; }
-
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix[4-9]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[01] | aix4.[01].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  case $host_cpu in
-  powerpc)
-    # Since July 2007 AmigaOS4 officially supports .so libraries.
-    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    ;;
-  m68k)
-    library_names_spec='$libname.ixlibrary $libname.a'
-    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-    ;;
-  esac
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[45]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32* | cegcc*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$cc_basename in
-  yes,*)
-    # gcc
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname~
-      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-      fi'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-
-      ;;
-    mingw* | cegcc*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    dynamic_linker='Win32 ld.exe'
-    ;;
-
-  *,cl*)
-    # Native MSVC
-    libname_spec='$name'
-    soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-    library_names_spec='${libname}.dll.lib'
-
-    case $build_os in
-    mingw*)
-      sys_lib_search_path_spec=
-      lt_save_ifs=$IFS
-      IFS=';'
-      for lt_path in $LIB
-      do
-        IFS=$lt_save_ifs
-        # Let DOS variable expansion print the short 8.3 style file name.
-        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
-        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
-      done
-      IFS=$lt_save_ifs
-      # Convert to MSYS style.
-      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
-      ;;
-    cygwin*)
-      # Convert to unix form, then to dos form, then back to unix form
-      # but this time dos style (no spaces!) so that the unix form looks
-      # like /cygdrive/c/PROGRA~1:/cygdr...
-      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
-      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
-      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      ;;
-    *)
-      sys_lib_search_path_spec="$LIB"
-      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH.
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      # FIXME: find the short name or the path components, as spaces are
-      # common. (e.g. "Program Files" -> "PROGRA~1")
-      ;;
-    esac
-
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-    dynamic_linker='Win32 link.exe'
-    ;;
-
-  *)
-    # Assume MSVC wrapper
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    dynamic_linker='Win32 ld.exe'
-    ;;
-  esac
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[23].*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2.*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[01]* | freebsdelf3.[01]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
-  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-haiku*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  dynamic_linker="$host_os runtime_loader"
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  hppa*64*)
-    shrext_cmds='.sl'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
-  postinstall_cmds='chmod 555 $lib'
-  # or fails outright, so override atomically:
-  install_override_mode=555
-  ;;
-
-interix[3-9]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux # correct to gnu/linux during the next big refactor
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-
-  # Some binutils ld are patched to set DT_RUNPATH
-  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_shlibpath_overrides_runpath=no
-    save_LDFLAGS=$LDFLAGS
-    save_libdir=$libdir
-    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
-	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-  lt_cv_shlibpath_overrides_runpath=yes
-fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-    LDFLAGS=$save_LDFLAGS
-    libdir=$save_libdir
-
-fi
-
-  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
-
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-*nto* | *qnx*)
-  version_type=qnx
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='ldqnx.so'
-  ;;
-
-openbsd*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-    *)				need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[89] | openbsd2.[89].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-rdos*)
-  dynamic_linker=no
-  ;;
-
-solaris*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux # correct to gnu/linux during the next big refactor
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-tpf*)
-  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-uts4*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-$as_echo "$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
-hardcode_action_CXX=
-if test -n "$hardcode_libdir_flag_spec_CXX" ||
-   test -n "$runpath_var_CXX" ||
-   test "X$hardcode_automatic_CXX" = "Xyes" ; then
-
-  # We can hardcode non-existent directories.
-  if test "$hardcode_direct_CXX" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
-     test "$hardcode_minus_L_CXX" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action_CXX=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action_CXX=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action_CXX=unsupported
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5
-$as_echo "$hardcode_action_CXX" >&6; }
-
-if test "$hardcode_action_CXX" = relink ||
-   test "$inherit_rpath_CXX" = yes; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-
-
-
-
-
-
-  fi # test -n "$compiler"
-
-  CC=$lt_save_CC
-  CFLAGS=$lt_save_CFLAGS
-  LDCXX=$LD
-  LD=$lt_save_LD
-  GCC=$lt_save_GCC
-  with_gnu_ld=$lt_save_with_gnu_ld
-  lt_cv_path_LDCXX=$lt_cv_path_LD
-  lt_cv_path_LD=$lt_save_path_LD
-  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-fi # test "$_lt_caught_CXX_error" != yes
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-
-      ac_ext=${ac_fc_srcext-f}
-ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
-ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_fc_compiler_gnu
-
-
-if test -z "$FC" || test "X$FC" = "Xno"; then
-  _lt_disable_FC=yes
-fi
-
-archive_cmds_need_lc_FC=no
-allow_undefined_flag_FC=
-always_export_symbols_FC=no
-archive_expsym_cmds_FC=
-export_dynamic_flag_spec_FC=
-hardcode_direct_FC=no
-hardcode_direct_absolute_FC=no
-hardcode_libdir_flag_spec_FC=
-hardcode_libdir_separator_FC=
-hardcode_minus_L_FC=no
-hardcode_automatic_FC=no
-inherit_rpath_FC=no
-module_cmds_FC=
-module_expsym_cmds_FC=
-link_all_deplibs_FC=unknown
-old_archive_cmds_FC=$old_archive_cmds
-reload_flag_FC=$reload_flag
-reload_cmds_FC=$reload_cmds
-no_undefined_flag_FC=
-whole_archive_flag_spec_FC=
-enable_shared_with_static_runtimes_FC=no
-
-# Source file extension for fc test sources.
-ac_ext=${ac_fc_srcext-f}
-
-# Object file extension for compiled fc test sources.
-objext=o
-objext_FC=$objext
-
-# No sense in running all these tests if we already determined that
-# the FC compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_FC" != yes; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="\
-      subroutine t
-      return
-      end
-"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code="\
-      program t
-      end
-"
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-
-
-
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-  # save warnings/boilerplate of simple test code
-  ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$RM conftest*
-
-  ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$RM -r conftest*
-
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC="$CC"
-  lt_save_GCC=$GCC
-  lt_save_CFLAGS=$CFLAGS
-  CC=${FC-"f95"}
-  CFLAGS=$FCFLAGS
-  compiler=$CC
-  GCC=$ac_cv_fc_compiler_gnu
-
-  compiler_FC=$CC
-  for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-
-
-  if test -n "$compiler"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
-$as_echo_n "checking if libtool supports shared libraries... " >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
-$as_echo "$can_build_shared" >&6; }
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
-$as_echo_n "checking whether to build shared libraries... " >&6; }
-    test "$can_build_shared" = "no" && enable_shared=no
-
-    # On AIX, shared libraries and static libraries use the same namespace, and
-    # are all built from PIC.
-    case $host_os in
-      aix3*)
-        test "$enable_shared" = yes && enable_static=no
-        if test -n "$RANLIB"; then
-          archive_cmds="$archive_cmds~\$RANLIB \$lib"
-          postinstall_cmds='$RANLIB $lib'
-        fi
-        ;;
-      aix[4-9]*)
-	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-	  test "$enable_shared" = yes && enable_static=no
-	fi
-        ;;
-    esac
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
-$as_echo "$enable_shared" >&6; }
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
-$as_echo_n "checking whether to build static libraries... " >&6; }
-    # Make sure either enable_shared or enable_static is yes.
-    test "$enable_shared" = yes || enable_static=yes
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
-$as_echo "$enable_static" >&6; }
-
-    GCC_FC="$ac_cv_fc_compiler_gnu"
-    LD_FC="$LD"
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    # Dependencies to place before and after the object being linked:
-predep_objects_FC=
-postdep_objects_FC=
-predeps_FC=
-postdeps_FC=
-compiler_lib_search_path_FC=
-
-cat > conftest.$ac_ext <<_LT_EOF
-      subroutine foo
-      implicit none
-      integer a
-      a=0
-      return
-      end
-_LT_EOF
-
-
-_lt_libdeps_save_CFLAGS=$CFLAGS
-case "$CC $CFLAGS " in #(
-*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
-*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
-*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
-esac
-
-if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  # Parse the compiler output and extract the necessary
-  # objects, libraries and library flags.
-
-  # Sentinel used to keep track of whether or not we are before
-  # the conftest object file.
-  pre_test_object_deps_done=no
-
-  for p in `eval "$output_verbose_link_cmd"`; do
-    case ${prev}${p} in
-
-    -L* | -R* | -l*)
-       # Some compilers place space between "-{L,R}" and the path.
-       # Remove the space.
-       if test $p = "-L" ||
-          test $p = "-R"; then
-	 prev=$p
-	 continue
-       fi
-
-       # Expand the sysroot to ease extracting the directories later.
-       if test -z "$prev"; then
-         case $p in
-         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
-         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
-         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
-         esac
-       fi
-       case $p in
-       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
-       esac
-       if test "$pre_test_object_deps_done" = no; then
-	 case ${prev} in
-	 -L | -R)
-	   # Internal compiler library paths should come after those
-	   # provided the user.  The postdeps already come after the
-	   # user supplied libs so there is no need to process them.
-	   if test -z "$compiler_lib_search_path_FC"; then
-	     compiler_lib_search_path_FC="${prev}${p}"
-	   else
-	     compiler_lib_search_path_FC="${compiler_lib_search_path_FC} ${prev}${p}"
-	   fi
-	   ;;
-	 # The "-l" case would never come before the object being
-	 # linked, so don't bother handling this case.
-	 esac
-       else
-	 if test -z "$postdeps_FC"; then
-	   postdeps_FC="${prev}${p}"
-	 else
-	   postdeps_FC="${postdeps_FC} ${prev}${p}"
-	 fi
-       fi
-       prev=
-       ;;
-
-    *.lto.$objext) ;; # Ignore GCC LTO objects
-    *.$objext)
-       # This assumes that the test object file only shows up
-       # once in the compiler output.
-       if test "$p" = "conftest.$objext"; then
-	 pre_test_object_deps_done=yes
-	 continue
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 if test -z "$predep_objects_FC"; then
-	   predep_objects_FC="$p"
-	 else
-	   predep_objects_FC="$predep_objects_FC $p"
-	 fi
-       else
-	 if test -z "$postdep_objects_FC"; then
-	   postdep_objects_FC="$p"
-	 else
-	   postdep_objects_FC="$postdep_objects_FC $p"
-	 fi
-       fi
-       ;;
-
-    *) ;; # Ignore the rest.
-
-    esac
-  done
-
-  # Clean up.
-  rm -f a.out a.exe
-else
-  echo "libtool.m4: error: problem compiling FC test program"
-fi
-
-$RM -f confest.$objext
-CFLAGS=$_lt_libdeps_save_CFLAGS
-
-# PORTME: override above test on systems where it is broken
-
-
-case " $postdeps_FC " in
-*" -lc "*) archive_cmds_need_lc_FC=no ;;
-esac
- compiler_lib_search_dirs_FC=
-if test -n "${compiler_lib_search_path_FC}"; then
- compiler_lib_search_dirs_FC=`echo " ${compiler_lib_search_path_FC}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-    lt_prog_compiler_wl_FC=
-lt_prog_compiler_pic_FC=
-lt_prog_compiler_static_FC=
-
-
-  if test "$GCC" = yes; then
-    lt_prog_compiler_wl_FC='-Wl,'
-    lt_prog_compiler_static_FC='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_FC='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            lt_prog_compiler_pic_FC='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
-            lt_prog_compiler_pic_FC='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      lt_prog_compiler_pic_FC='-DDLL_EXPORT'
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic_FC='-fno-common'
-      ;;
-
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      lt_prog_compiler_static_FC=
-      ;;
-
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic_FC='-fPIC'
-	;;
-      esac
-      ;;
-
-    interix[3-9]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      lt_prog_compiler_can_build_shared_FC=no
-      enable_shared=no
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      lt_prog_compiler_pic_FC='-fPIC -shared'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic_FC=-Kconform_pic
-      fi
-      ;;
-
-    *)
-      lt_prog_compiler_pic_FC='-fPIC'
-      ;;
-    esac
-
-    case $cc_basename in
-    nvcc*) # Cuda Compiler Driver 2.2
-      lt_prog_compiler_wl_FC='-Xlinker '
-      if test -n "$lt_prog_compiler_pic_FC"; then
-        lt_prog_compiler_pic_FC="-Xcompiler $lt_prog_compiler_pic_FC"
-      fi
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      lt_prog_compiler_wl_FC='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_FC='-Bstatic'
-      else
-	lt_prog_compiler_static_FC='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic_FC='-DDLL_EXPORT'
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      lt_prog_compiler_wl_FC='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic_FC='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static_FC='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      lt_prog_compiler_wl_FC='-Wl,'
-      # PIC (with -KPIC) is the default.
-      lt_prog_compiler_static_FC='-non_shared'
-      ;;
-
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
-      case $cc_basename in
-      # old Intel for x86_64 which still supported -KPIC.
-      ecc*)
-	lt_prog_compiler_wl_FC='-Wl,'
-	lt_prog_compiler_pic_FC='-KPIC'
-	lt_prog_compiler_static_FC='-static'
-        ;;
-      # icc used to be incompatible with GCC.
-      # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
-	lt_prog_compiler_wl_FC='-Wl,'
-	lt_prog_compiler_pic_FC='-fPIC'
-	lt_prog_compiler_static_FC='-static'
-        ;;
-      # Lahey Fortran 8.1.
-      lf95*)
-	lt_prog_compiler_wl_FC='-Wl,'
-	lt_prog_compiler_pic_FC='--shared'
-	lt_prog_compiler_static_FC='--static'
-	;;
-      nagfor*)
-	# NAG Fortran compiler
-	lt_prog_compiler_wl_FC='-Wl,-Wl,,'
-	lt_prog_compiler_pic_FC='-PIC'
-	lt_prog_compiler_static_FC='-Bstatic'
-	;;
-      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	lt_prog_compiler_wl_FC='-Wl,'
-	lt_prog_compiler_pic_FC='-fpic'
-	lt_prog_compiler_static_FC='-Bstatic'
-        ;;
-      ccc*)
-        lt_prog_compiler_wl_FC='-Wl,'
-        # All Alpha code is PIC.
-        lt_prog_compiler_static_FC='-non_shared'
-        ;;
-      xl* | bgxl* | bgf* | mpixl*)
-	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
-	lt_prog_compiler_wl_FC='-Wl,'
-	lt_prog_compiler_pic_FC='-qpic'
-	lt_prog_compiler_static_FC='-qstaticlink'
-	;;
-      *)
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  lt_prog_compiler_pic_FC='-KPIC'
-	  lt_prog_compiler_static_FC='-Bstatic'
-	  lt_prog_compiler_wl_FC=''
-	  ;;
-	*Sun\ F* | *Sun*Fortran*)
-	  lt_prog_compiler_pic_FC='-KPIC'
-	  lt_prog_compiler_static_FC='-Bstatic'
-	  lt_prog_compiler_wl_FC='-Qoption ld '
-	  ;;
-	*Sun\ C*)
-	  # Sun C 5.9
-	  lt_prog_compiler_pic_FC='-KPIC'
-	  lt_prog_compiler_static_FC='-Bstatic'
-	  lt_prog_compiler_wl_FC='-Wl,'
-	  ;;
-        *Intel*\ [CF]*Compiler*)
-	  lt_prog_compiler_wl_FC='-Wl,'
-	  lt_prog_compiler_pic_FC='-fPIC'
-	  lt_prog_compiler_static_FC='-static'
-	  ;;
-	*Portland\ Group*)
-	  lt_prog_compiler_wl_FC='-Wl,'
-	  lt_prog_compiler_pic_FC='-fpic'
-	  lt_prog_compiler_static_FC='-Bstatic'
-	  ;;
-	esac
-	;;
-      esac
-      ;;
-
-    newsos6)
-      lt_prog_compiler_pic_FC='-KPIC'
-      lt_prog_compiler_static_FC='-Bstatic'
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      lt_prog_compiler_pic_FC='-fPIC -shared'
-      ;;
-
-    osf3* | osf4* | osf5*)
-      lt_prog_compiler_wl_FC='-Wl,'
-      # All OSF/1 code is PIC.
-      lt_prog_compiler_static_FC='-non_shared'
-      ;;
-
-    rdos*)
-      lt_prog_compiler_static_FC='-non_shared'
-      ;;
-
-    solaris*)
-      lt_prog_compiler_pic_FC='-KPIC'
-      lt_prog_compiler_static_FC='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
-	lt_prog_compiler_wl_FC='-Qoption ld ';;
-      *)
-	lt_prog_compiler_wl_FC='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      lt_prog_compiler_wl_FC='-Qoption ld '
-      lt_prog_compiler_pic_FC='-PIC'
-      lt_prog_compiler_static_FC='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      lt_prog_compiler_wl_FC='-Wl,'
-      lt_prog_compiler_pic_FC='-KPIC'
-      lt_prog_compiler_static_FC='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	lt_prog_compiler_pic_FC='-Kconform_pic'
-	lt_prog_compiler_static_FC='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      lt_prog_compiler_wl_FC='-Wl,'
-      lt_prog_compiler_pic_FC='-KPIC'
-      lt_prog_compiler_static_FC='-Bstatic'
-      ;;
-
-    unicos*)
-      lt_prog_compiler_wl_FC='-Wl,'
-      lt_prog_compiler_can_build_shared_FC=no
-      ;;
-
-    uts4*)
-      lt_prog_compiler_pic_FC='-pic'
-      lt_prog_compiler_static_FC='-Bstatic'
-      ;;
-
-    *)
-      lt_prog_compiler_can_build_shared_FC=no
-      ;;
-    esac
-  fi
-
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic_FC=
-    ;;
-  *)
-    lt_prog_compiler_pic_FC="$lt_prog_compiler_pic_FC"
-    ;;
-esac
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-if ${lt_cv_prog_compiler_pic_FC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic_FC=$lt_prog_compiler_pic_FC
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_FC" >&5
-$as_echo "$lt_cv_prog_compiler_pic_FC" >&6; }
-lt_prog_compiler_pic_FC=$lt_cv_prog_compiler_pic_FC
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic_FC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_FC works" >&5
-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_FC works... " >&6; }
-if ${lt_cv_prog_compiler_pic_works_FC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic_works_FC=no
-   ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic_FC"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_pic_works_FC=yes
-     fi
-   fi
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_FC" >&5
-$as_echo "$lt_cv_prog_compiler_pic_works_FC" >&6; }
-
-if test x"$lt_cv_prog_compiler_pic_works_FC" = xyes; then
-    case $lt_prog_compiler_pic_FC in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic_FC=" $lt_prog_compiler_pic_FC" ;;
-     esac
-else
-    lt_prog_compiler_pic_FC=
-     lt_prog_compiler_can_build_shared_FC=no
-fi
-
-fi
-
-
-
-
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$lt_prog_compiler_wl_FC eval lt_tmp_static_flag=\"$lt_prog_compiler_static_FC\"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if ${lt_cv_prog_compiler_static_works_FC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_static_works_FC=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler_static_works_FC=yes
-       fi
-     else
-       lt_cv_prog_compiler_static_works_FC=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_FC" >&5
-$as_echo "$lt_cv_prog_compiler_static_works_FC" >&6; }
-
-if test x"$lt_cv_prog_compiler_static_works_FC" = xyes; then
-    :
-else
-    lt_prog_compiler_static_FC=
-fi
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o_FC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o_FC=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o_FC=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_FC" >&5
-$as_echo "$lt_cv_prog_compiler_c_o_FC" >&6; }
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o_FC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o_FC=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o_FC=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_FC" >&5
-$as_echo "$lt_cv_prog_compiler_c_o_FC" >&6; }
-
-
-
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o_FC" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
-$as_echo_n "checking if we can lock with hard links... " >&6; }
-  hard_links=yes
-  $RM conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-$as_echo "$hard_links" >&6; }
-  if test "$hard_links" = no; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-
-  runpath_var=
-  allow_undefined_flag_FC=
-  always_export_symbols_FC=no
-  archive_cmds_FC=
-  archive_expsym_cmds_FC=
-  compiler_needs_object_FC=no
-  enable_shared_with_static_runtimes_FC=no
-  export_dynamic_flag_spec_FC=
-  export_symbols_cmds_FC='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  hardcode_automatic_FC=no
-  hardcode_direct_FC=no
-  hardcode_direct_absolute_FC=no
-  hardcode_libdir_flag_spec_FC=
-  hardcode_libdir_separator_FC=
-  hardcode_minus_L_FC=no
-  hardcode_shlibpath_var_FC=unsupported
-  inherit_rpath_FC=no
-  link_all_deplibs_FC=unknown
-  module_cmds_FC=
-  module_expsym_cmds_FC=
-  old_archive_from_new_cmds_FC=
-  old_archive_from_expsyms_cmds_FC=
-  thread_safe_flag_spec_FC=
-  whole_archive_flag_spec_FC=
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  include_expsyms_FC=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  exclude_expsyms_FC='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  # Exclude shared library initialization/finalization symbols.
-  extract_expsyms_cmds=
-
-  case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  esac
-
-  ld_shlibs_FC=yes
-
-  # On some targets, GNU ld is compatible enough with the native linker
-  # that we're better off using the native interface for both.
-  lt_use_gnu_ld_interface=no
-  if test "$with_gnu_ld" = yes; then
-    case $host_os in
-      aix*)
-	# The AIX port of GNU ld has always aspired to compatibility
-	# with the native linker.  However, as the warning in the GNU ld
-	# block says, versions before 2.19.5* couldn't really create working
-	# shared libraries, regardless of the interface used.
-	case `$LD -v 2>&1` in
-	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
-	  *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
-	  *\ \(GNU\ Binutils\)\ [3-9]*) ;;
-	  *)
-	    lt_use_gnu_ld_interface=yes
-	    ;;
-	esac
-	;;
-      *)
-	lt_use_gnu_ld_interface=yes
-	;;
-    esac
-  fi
-
-  if test "$lt_use_gnu_ld_interface" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec_FC='${wl}-rpath ${wl}$libdir'
-    export_dynamic_flag_spec_FC='${wl}--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-      whole_archive_flag_spec_FC="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      whole_archive_flag_spec_FC=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>&1` in
-      *GNU\ gold*) supports_anon_versioning=yes ;;
-      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix[3-9]*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	ld_shlibs_FC=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.19, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to install binutils
-*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
-*** You will then need to restart the configuration process.
-
-_LT_EOF
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            archive_expsym_cmds_FC=''
-        ;;
-      m68k)
-            archive_cmds_FC='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            hardcode_libdir_flag_spec_FC='-L$libdir'
-            hardcode_minus_L_FC=yes
-        ;;
-      esac
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	allow_undefined_flag_FC=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds_FC='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	ld_shlibs_FC=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # _LT_TAGVAR(hardcode_libdir_flag_spec, FC) is actually meaningless,
-      # as there is no search path for DLLs.
-      hardcode_libdir_flag_spec_FC='-L$libdir'
-      export_dynamic_flag_spec_FC='${wl}--export-all-symbols'
-      allow_undefined_flag_FC=unsupported
-      always_export_symbols_FC=no
-      enable_shared_with_static_runtimes_FC=yes
-      export_symbols_cmds_FC='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
-      exclude_expsyms_FC='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
-
-      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-        archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	archive_expsym_cmds_FC='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-	ld_shlibs_FC=no
-      fi
-      ;;
-
-    haiku*)
-      archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      link_all_deplibs_FC=yes
-      ;;
-
-    interix[3-9]*)
-      hardcode_direct_FC=no
-      hardcode_shlibpath_var_FC=no
-      hardcode_libdir_flag_spec_FC='${wl}-rpath,$libdir'
-      export_dynamic_flag_spec_FC='${wl}-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      archive_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      archive_expsym_cmds_FC='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
-
-    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-      tmp_diet=no
-      if test "$host_os" = linux-dietlibc; then
-	case $cc_basename in
-	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
-	esac
-      fi
-      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-	 && test "$tmp_diet" = no
-      then
-	tmp_addflag=' $pic_flag'
-	tmp_sharedflag='-shared'
-	case $cc_basename,$host_cpu in
-        pgcc*)				# Portland Group C compiler
-	  whole_archive_flag_spec_FC='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95* | pgfortran*)
-					# Portland Group f77 and f90 compilers
-	  whole_archive_flag_spec_FC='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
-	  tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	  tmp_addflag=' -nofor_main' ;;
-	lf95*)				# Lahey Fortran 8.1
-	  whole_archive_flag_spec_FC=
-	  tmp_sharedflag='--shared' ;;
-	xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
-	  tmp_sharedflag='-qmkshrobj'
-	  tmp_addflag= ;;
-	nvcc*)	# Cuda Compiler Driver 2.2
-	  whole_archive_flag_spec_FC='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  compiler_needs_object_FC=yes
-	  ;;
-	esac
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)			# Sun C 5.9
-	  whole_archive_flag_spec_FC='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  compiler_needs_object_FC=yes
-	  tmp_sharedflag='-G' ;;
-	*Sun\ F*)			# Sun Fortran 8.3
-	  tmp_sharedflag='-G' ;;
-	esac
-	archive_cmds_FC='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
-        if test "x$supports_anon_versioning" = xyes; then
-          archive_expsym_cmds_FC='echo "{ global:" > $output_objdir/$libname.ver~
-	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	    echo "local: *; };" >> $output_objdir/$libname.ver~
-	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-        fi
-
-	case $cc_basename in
-	xlf* | bgf* | bgxlf* | mpixlf*)
-	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
-	  whole_archive_flag_spec_FC='--whole-archive$convenience --no-whole-archive'
-	  hardcode_libdir_flag_spec_FC='${wl}-rpath ${wl}$libdir'
-	  archive_cmds_FC='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
-	  if test "x$supports_anon_versioning" = xyes; then
-	    archive_expsym_cmds_FC='echo "{ global:" > $output_objdir/$libname.ver~
-	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	      echo "local: *; };" >> $output_objdir/$libname.ver~
-	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-	  fi
-	  ;;
-	esac
-      else
-        ld_shlibs_FC=no
-      fi
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	archive_cmds_FC='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	archive_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-	ld_shlibs_FC=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs_FC=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-	ld_shlibs_FC=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-	;;
-	*)
-	  # For security reasons, it is highly recommended that you always
-	  # use absolute paths for naming shared libraries, and exclude the
-	  # DT_RUNPATH tag from executables and libraries.  But doing so
-	  # requires that you compile everything twice, which is a pain.
-	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	    hardcode_libdir_flag_spec_FC='${wl}-rpath ${wl}$libdir'
-	    archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    archive_expsym_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  else
-	    ld_shlibs_FC=no
-	  fi
-	;;
-      esac
-      ;;
-
-    sunos4*)
-      archive_cmds_FC='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      hardcode_direct_FC=yes
-      hardcode_shlibpath_var_FC=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs_FC=no
-      fi
-      ;;
-    esac
-
-    if test "$ld_shlibs_FC" = no; then
-      runpath_var=
-      hardcode_libdir_flag_spec_FC=
-      export_dynamic_flag_spec_FC=
-      whole_archive_flag_spec_FC=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      allow_undefined_flag_FC=unsupported
-      always_export_symbols_FC=yes
-      archive_expsym_cmds_FC='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      hardcode_minus_L_FC=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	hardcode_direct_FC=unsupported
-      fi
-      ;;
-
-    aix[4-9]*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	# Also, AIX nm treats weak defined symbols like other global
-	# defined symbols, whereas GNU nm marks them as "W".
-	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  export_symbols_cmds_FC='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	else
-	  export_symbols_cmds_FC='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
-	  for ld_flag in $LDFLAGS; do
-	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-	    aix_use_runtimelinking=yes
-	    break
-	  fi
-	  done
-	  ;;
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      archive_cmds_FC=''
-      hardcode_direct_FC=yes
-      hardcode_direct_absolute_FC=yes
-      hardcode_libdir_separator_FC=':'
-      link_all_deplibs_FC=yes
-      file_list_spec_FC='${wl}-f,'
-
-      if test "$GCC" = yes; then
-	case $host_os in aix4.[012]|aix4.[012].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	  # We have reworked collect2
-	  :
-	  else
-	  # We have old collect2
-	  hardcode_direct_FC=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  hardcode_minus_L_FC=yes
-	  hardcode_libdir_flag_spec_FC='-L$libdir'
-	  hardcode_libdir_separator_FC=
-	  fi
-	  ;;
-	esac
-	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
-	fi
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-	  fi
-	fi
-      fi
-
-      export_dynamic_flag_spec_FC='${wl}-bexpall'
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      always_export_symbols_FC=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	allow_undefined_flag_FC='-berok'
-        # Determine the default libpath from the value encoded in an
-        # empty executable.
-        if test "${lt_cv_aix_libpath+set}" = set; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  if ${lt_cv_aix_libpath__FC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat > conftest.$ac_ext <<_ACEOF
-      program main
-
-      end
-_ACEOF
-if ac_fn_fc_try_link "$LINENO"; then :
-
-  lt_aix_libpath_sed='
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }'
-  lt_cv_aix_libpath__FC=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$lt_cv_aix_libpath__FC"; then
-    lt_cv_aix_libpath__FC=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  if test -z "$lt_cv_aix_libpath__FC"; then
-    lt_cv_aix_libpath__FC="/usr/lib:/lib"
-  fi
-
-fi
-
-  aix_libpath=$lt_cv_aix_libpath__FC
-fi
-
-        hardcode_libdir_flag_spec_FC='${wl}-blibpath:$libdir:'"$aix_libpath"
-        archive_expsym_cmds_FC='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-      else
-	if test "$host_cpu" = ia64; then
-	  hardcode_libdir_flag_spec_FC='${wl}-R $libdir:/usr/lib:/lib'
-	  allow_undefined_flag_FC="-z nodefs"
-	  archive_expsym_cmds_FC="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an
-	 # empty executable.
-	 if test "${lt_cv_aix_libpath+set}" = set; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  if ${lt_cv_aix_libpath__FC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat > conftest.$ac_ext <<_ACEOF
-      program main
-
-      end
-_ACEOF
-if ac_fn_fc_try_link "$LINENO"; then :
-
-  lt_aix_libpath_sed='
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }'
-  lt_cv_aix_libpath__FC=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$lt_cv_aix_libpath__FC"; then
-    lt_cv_aix_libpath__FC=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  if test -z "$lt_cv_aix_libpath__FC"; then
-    lt_cv_aix_libpath__FC="/usr/lib:/lib"
-  fi
-
-fi
-
-  aix_libpath=$lt_cv_aix_libpath__FC
-fi
-
-	 hardcode_libdir_flag_spec_FC='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  no_undefined_flag_FC=' ${wl}-bernotok'
-	  allow_undefined_flag_FC=' ${wl}-berok'
-	  if test "$with_gnu_ld" = yes; then
-	    # We only use this code for GNU lds that support --whole-archive.
-	    whole_archive_flag_spec_FC='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	  else
-	    # Exported symbols can be pulled into shared objects from archives
-	    whole_archive_flag_spec_FC='$convenience'
-	  fi
-	  archive_cmds_need_lc_FC=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  archive_expsym_cmds_FC="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            archive_expsym_cmds_FC=''
-        ;;
-      m68k)
-            archive_cmds_FC='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            hardcode_libdir_flag_spec_FC='-L$libdir'
-            hardcode_minus_L_FC=yes
-        ;;
-      esac
-      ;;
-
-    bsdi[45]*)
-      export_dynamic_flag_spec_FC=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      case $cc_basename in
-      cl*)
-	# Native MSVC
-	hardcode_libdir_flag_spec_FC=' '
-	allow_undefined_flag_FC=unsupported
-	always_export_symbols_FC=yes
-	file_list_spec_FC='@'
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=".dll"
-	# FIXME: Setting linknames here is a bad hack.
-	archive_cmds_FC='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-	archive_expsym_cmds_FC='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-	  else
-	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-	  fi~
-	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-	  linknames='
-	# The linker will not automatically build a static lib if we build a DLL.
-	# _LT_TAGVAR(old_archive_from_new_cmds, FC)='true'
-	enable_shared_with_static_runtimes_FC=yes
-	exclude_expsyms_FC='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-	export_symbols_cmds_FC='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-	# Don't use ranlib
-	old_postinstall_cmds_FC='chmod 644 $oldlib'
-	postlink_cmds_FC='lt_outputfile="@OUTPUT@"~
-	  lt_tool_outputfile="@TOOL_OUTPUT@"~
-	  case $lt_outputfile in
-	    *.exe|*.EXE) ;;
-	    *)
-	      lt_outputfile="$lt_outputfile.exe"
-	      lt_tool_outputfile="$lt_tool_outputfile.exe"
-	      ;;
-	  esac~
-	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-	    $RM "$lt_outputfile.manifest";
-	  fi'
-	;;
-      *)
-	# Assume MSVC wrapper
-	hardcode_libdir_flag_spec_FC=' '
-	allow_undefined_flag_FC=unsupported
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=".dll"
-	# FIXME: Setting linknames here is a bad hack.
-	archive_cmds_FC='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
-	# The linker will automatically build a .lib file if we build a DLL.
-	old_archive_from_new_cmds_FC='true'
-	# FIXME: Should let the user specify the lib program.
-	old_archive_cmds_FC='lib -OUT:$oldlib$oldobjs$old_deplibs'
-	enable_shared_with_static_runtimes_FC=yes
-	;;
-      esac
-      ;;
-
-    darwin* | rhapsody*)
-
-
-  archive_cmds_need_lc_FC=no
-  hardcode_direct_FC=no
-  hardcode_automatic_FC=yes
-  hardcode_shlibpath_var_FC=unsupported
-  if test "$lt_cv_ld_force_load" = "yes"; then
-    whole_archive_flag_spec_FC='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-    compiler_needs_object_FC=yes
-  else
-    whole_archive_flag_spec_FC=''
-  fi
-  link_all_deplibs_FC=yes
-  allow_undefined_flag_FC="$_lt_dar_allow_undefined"
-  case $cc_basename in
-     ifort*) _lt_dar_can_shared=yes ;;
-     *) _lt_dar_can_shared=$GCC ;;
-  esac
-  if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=func_echo_all
-    archive_cmds_FC="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-    module_cmds_FC="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-    archive_expsym_cmds_FC="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-    module_expsym_cmds_FC="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-
-  else
-  ld_shlibs_FC=no
-  fi
-
-      ;;
-
-    dgux*)
-      archive_cmds_FC='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec_FC='-L$libdir'
-      hardcode_shlibpath_var_FC=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      archive_cmds_FC='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      hardcode_libdir_flag_spec_FC='-R$libdir'
-      hardcode_direct_FC=yes
-      hardcode_shlibpath_var_FC=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2.*)
-      archive_cmds_FC='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_FC=yes
-      hardcode_minus_L_FC=yes
-      hardcode_shlibpath_var_FC=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
-      archive_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-      hardcode_libdir_flag_spec_FC='-R$libdir'
-      hardcode_direct_FC=yes
-      hardcode_shlibpath_var_FC=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds_FC='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds_FC='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec_FC='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator_FC=:
-      hardcode_direct_FC=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L_FC=yes
-      export_dynamic_flag_spec_FC='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	archive_cmds_FC='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_FC='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec_FC='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator_FC=:
-	hardcode_direct_FC=yes
-	hardcode_direct_absolute_FC=yes
-	export_dynamic_flag_spec_FC='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L_FC=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds_FC='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds_FC='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds_FC='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds_FC='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds_FC='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	archive_cmds_FC='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec_FC='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator_FC=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  hardcode_direct_FC=no
-	  hardcode_shlibpath_var_FC=no
-	  ;;
-	*)
-	  hardcode_direct_FC=yes
-	  hardcode_direct_absolute_FC=yes
-	  export_dynamic_flag_spec_FC='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L_FC=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	archive_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	# Try to use the -exported_symbol ld option, if it does not
-	# work, assume that -exports_file does not work either and
-	# implicitly export all symbols.
-	# This should be the same for all languages, so no per-tag cache variable.
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
-$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
-if ${lt_cv_irix_exported_symbol+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  save_LDFLAGS="$LDFLAGS"
-	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-	   cat > conftest.$ac_ext <<_ACEOF
-
-      subroutine foo
-      end
-_ACEOF
-if ac_fn_fc_try_link "$LINENO"; then :
-  lt_cv_irix_exported_symbol=yes
-else
-  lt_cv_irix_exported_symbol=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-           LDFLAGS="$save_LDFLAGS"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
-$as_echo "$lt_cv_irix_exported_symbol" >&6; }
-	if test "$lt_cv_irix_exported_symbol" = yes; then
-          archive_expsym_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-	fi
-      else
-	archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
-      fi
-      archive_cmds_need_lc_FC='no'
-      hardcode_libdir_flag_spec_FC='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_FC=:
-      inherit_rpath_FC=yes
-      link_all_deplibs_FC=yes
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	archive_cmds_FC='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	archive_cmds_FC='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      hardcode_libdir_flag_spec_FC='-R$libdir'
-      hardcode_direct_FC=yes
-      hardcode_shlibpath_var_FC=no
-      ;;
-
-    newsos6)
-      archive_cmds_FC='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_FC=yes
-      hardcode_libdir_flag_spec_FC='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_FC=:
-      hardcode_shlibpath_var_FC=no
-      ;;
-
-    *nto* | *qnx*)
-      ;;
-
-    openbsd*)
-      if test -f /usr/libexec/ld.so; then
-	hardcode_direct_FC=yes
-	hardcode_shlibpath_var_FC=no
-	hardcode_direct_absolute_FC=yes
-	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	  archive_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	  hardcode_libdir_flag_spec_FC='${wl}-rpath,$libdir'
-	  export_dynamic_flag_spec_FC='${wl}-E'
-	else
-	  case $host_os in
-	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	     archive_cmds_FC='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	     hardcode_libdir_flag_spec_FC='-R$libdir'
-	     ;;
-	   *)
-	     archive_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	     hardcode_libdir_flag_spec_FC='${wl}-rpath,$libdir'
-	     ;;
-	  esac
-	fi
-      else
-	ld_shlibs_FC=no
-      fi
-      ;;
-
-    os2*)
-      hardcode_libdir_flag_spec_FC='-L$libdir'
-      hardcode_minus_L_FC=yes
-      allow_undefined_flag_FC=unsupported
-      archive_cmds_FC='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      old_archive_from_new_cmds_FC='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	allow_undefined_flag_FC=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_FC='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	allow_undefined_flag_FC=' -expect_unresolved \*'
-	archive_cmds_FC='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      archive_cmds_need_lc_FC='no'
-      hardcode_libdir_flag_spec_FC='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_FC=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	allow_undefined_flag_FC=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_FC='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec_FC='${wl}-rpath ${wl}$libdir'
-      else
-	allow_undefined_flag_FC=' -expect_unresolved \*'
-	archive_cmds_FC='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds_FC='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	hardcode_libdir_flag_spec_FC='-rpath $libdir'
-      fi
-      archive_cmds_need_lc_FC='no'
-      hardcode_libdir_separator_FC=:
-      ;;
-
-    solaris*)
-      no_undefined_flag_FC=' -z defs'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	archive_cmds_FC='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_FC='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-      else
-	case `$CC -V 2>&1` in
-	*"Compilers 5.0"*)
-	  wlarc=''
-	  archive_cmds_FC='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  archive_expsym_cmds_FC='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
-	  ;;
-	*)
-	  wlarc='${wl}'
-	  archive_cmds_FC='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds_FC='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-	  ;;
-	esac
-      fi
-      hardcode_libdir_flag_spec_FC='-R$libdir'
-      hardcode_shlibpath_var_FC=no
-      case $host_os in
-      solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *)
-	# The compiler driver will combine and reorder linker options,
-	# but understands `-z linker_flag'.  GCC discards it without `$wl',
-	# but is careful enough not to reorder.
-	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test "$GCC" = yes; then
-	  whole_archive_flag_spec_FC='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-	else
-	  whole_archive_flag_spec_FC='-z allextract$convenience -z defaultextract'
-	fi
-	;;
-      esac
-      link_all_deplibs_FC=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	archive_cmds_FC='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_FC='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      hardcode_libdir_flag_spec_FC='-L$libdir'
-      hardcode_direct_FC=yes
-      hardcode_minus_L_FC=yes
-      hardcode_shlibpath_var_FC=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  archive_cmds_FC='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct_FC=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  archive_cmds_FC='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  reload_cmds_FC='$CC -r -o $output$reload_objs'
-	  hardcode_direct_FC=no
-        ;;
-	motorola)
-	  archive_cmds_FC='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct_FC=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var_FC=no
-      ;;
-
-    sysv4.3*)
-      archive_cmds_FC='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var_FC=no
-      export_dynamic_flag_spec_FC='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	archive_cmds_FC='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	hardcode_shlibpath_var_FC=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	ld_shlibs_FC=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-      no_undefined_flag_FC='${wl}-z,text'
-      archive_cmds_need_lc_FC=no
-      hardcode_shlibpath_var_FC=no
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	archive_cmds_FC='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_FC='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_FC='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_FC='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      no_undefined_flag_FC='${wl}-z,text'
-      allow_undefined_flag_FC='${wl}-z,nodefs'
-      archive_cmds_need_lc_FC=no
-      hardcode_shlibpath_var_FC=no
-      hardcode_libdir_flag_spec_FC='${wl}-R,$libdir'
-      hardcode_libdir_separator_FC=':'
-      link_all_deplibs_FC=yes
-      export_dynamic_flag_spec_FC='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	archive_cmds_FC='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_FC='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_FC='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_FC='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      archive_cmds_FC='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec_FC='-L$libdir'
-      hardcode_shlibpath_var_FC=no
-      ;;
-
-    *)
-      ld_shlibs_FC=no
-      ;;
-    esac
-
-    if test x$host_vendor = xsni; then
-      case $host in
-      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	export_dynamic_flag_spec_FC='${wl}-Blargedynsym'
-	;;
-      esac
-    fi
-  fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_FC" >&5
-$as_echo "$ld_shlibs_FC" >&6; }
-test "$ld_shlibs_FC" = no && can_build_shared=no
-
-with_gnu_ld_FC=$with_gnu_ld
-
-
-
-
-
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc_FC" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc_FC=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds_FC in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-if ${lt_cv_archive_cmds_need_lc_FC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  $RM conftest*
-	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } 2>conftest.err; then
-	  soname=conftest
-	  lib=conftest
-	  libobjs=conftest.$ac_objext
-	  deplibs=
-	  wl=$lt_prog_compiler_wl_FC
-	  pic_flag=$lt_prog_compiler_pic_FC
-	  compiler_flags=-v
-	  linker_flags=-v
-	  verstring=
-	  output_objdir=.
-	  libname=conftest
-	  lt_save_allow_undefined_flag=$allow_undefined_flag_FC
-	  allow_undefined_flag_FC=
-	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_FC 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
-  (eval $archive_cmds_FC 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-	  then
-	    lt_cv_archive_cmds_need_lc_FC=no
-	  else
-	    lt_cv_archive_cmds_need_lc_FC=yes
-	  fi
-	  allow_undefined_flag_FC=$lt_save_allow_undefined_flag
-	else
-	  cat conftest.err 1>&5
-	fi
-	$RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_FC" >&5
-$as_echo "$lt_cv_archive_cmds_need_lc_FC" >&6; }
-      archive_cmds_need_lc_FC=$lt_cv_archive_cmds_need_lc_FC
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
-$as_echo_n "checking dynamic linker characteristics... " >&6; }
-
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix[4-9]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[01] | aix4.[01].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  case $host_cpu in
-  powerpc)
-    # Since July 2007 AmigaOS4 officially supports .so libraries.
-    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    ;;
-  m68k)
-    library_names_spec='$libname.ixlibrary $libname.a'
-    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-    ;;
-  esac
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[45]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32* | cegcc*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$cc_basename in
-  yes,*)
-    # gcc
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname~
-      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-      fi'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-
-      ;;
-    mingw* | cegcc*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    dynamic_linker='Win32 ld.exe'
-    ;;
-
-  *,cl*)
-    # Native MSVC
-    libname_spec='$name'
-    soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-    library_names_spec='${libname}.dll.lib'
-
-    case $build_os in
-    mingw*)
-      sys_lib_search_path_spec=
-      lt_save_ifs=$IFS
-      IFS=';'
-      for lt_path in $LIB
-      do
-        IFS=$lt_save_ifs
-        # Let DOS variable expansion print the short 8.3 style file name.
-        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
-        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
-      done
-      IFS=$lt_save_ifs
-      # Convert to MSYS style.
-      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
-      ;;
-    cygwin*)
-      # Convert to unix form, then to dos form, then back to unix form
-      # but this time dos style (no spaces!) so that the unix form looks
-      # like /cygdrive/c/PROGRA~1:/cygdr...
-      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
-      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
-      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      ;;
-    *)
-      sys_lib_search_path_spec="$LIB"
-      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH.
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      # FIXME: find the short name or the path components, as spaces are
-      # common. (e.g. "Program Files" -> "PROGRA~1")
-      ;;
-    esac
-
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-    dynamic_linker='Win32 link.exe'
-    ;;
-
-  *)
-    # Assume MSVC wrapper
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    dynamic_linker='Win32 ld.exe'
-    ;;
-  esac
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[23].*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2.*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[01]* | freebsdelf3.[01]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
-  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-haiku*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  dynamic_linker="$host_os runtime_loader"
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  hppa*64*)
-    shrext_cmds='.sl'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
-  postinstall_cmds='chmod 555 $lib'
-  # or fails outright, so override atomically:
-  install_override_mode=555
-  ;;
-
-interix[3-9]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux # correct to gnu/linux during the next big refactor
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-
-  # Some binutils ld are patched to set DT_RUNPATH
-  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_shlibpath_overrides_runpath=no
-    save_LDFLAGS=$LDFLAGS
-    save_libdir=$libdir
-    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_FC\"; \
-	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_FC\""
-    cat > conftest.$ac_ext <<_ACEOF
-      program main
-
-      end
-_ACEOF
-if ac_fn_fc_try_link "$LINENO"; then :
-  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-  lt_cv_shlibpath_overrides_runpath=yes
-fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-    LDFLAGS=$save_LDFLAGS
-    libdir=$save_libdir
-
-fi
-
-  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
-
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-*nto* | *qnx*)
-  version_type=qnx
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='ldqnx.so'
-  ;;
-
-openbsd*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-    *)				need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[89] | openbsd2.[89].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-rdos*)
-  dynamic_linker=no
-  ;;
-
-solaris*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux # correct to gnu/linux during the next big refactor
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-tpf*)
-  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-uts4*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-$as_echo "$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
-hardcode_action_FC=
-if test -n "$hardcode_libdir_flag_spec_FC" ||
-   test -n "$runpath_var_FC" ||
-   test "X$hardcode_automatic_FC" = "Xyes" ; then
-
-  # We can hardcode non-existent directories.
-  if test "$hardcode_direct_FC" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, FC)" != no &&
-     test "$hardcode_minus_L_FC" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action_FC=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action_FC=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action_FC=unsupported
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_FC" >&5
-$as_echo "$hardcode_action_FC" >&6; }
-
-if test "$hardcode_action_FC" = relink ||
-   test "$inherit_rpath_FC" = yes; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-
-
-
-
-
-
-  fi # test -n "$compiler"
-
-  GCC=$lt_save_GCC
-  CC=$lt_save_CC
-  CFLAGS=$lt_save_CFLAGS
-fi # test "$_lt_disable_FC" != yes
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-
-
-
-
-
-
-
-        ac_config_commands="$ac_config_commands libtool"
-
-
-
-
-# Only expand once:
-
-
-
-## ----------------------------------------------------------------------
-## Check if we should install only statically linked executables.
-##   This check needs to occur after libtool is initialized because
-##   we check a libtool cache value and may issue a warning based
-##   on its result.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should install only statically linked executables" >&5
-$as_echo_n "checking if we should install only statically linked executables... " >&6; }
-# Check whether --enable-static_exec was given.
-if test "${enable_static_exec+set}" = set; then :
-  enableval=$enable_static_exec; STATIC_EXEC=$enableval
-fi
-
-
-if test "X$STATIC_EXEC" = "Xyes"; then
-  echo "yes"
-  ## Issue a warning if -static flag is not supported.
-  if test "X$lt_cv_prog_compiler_static_works" = "Xno"; then
-      echo "    warning: -static flag not supported on this system; executable won't statically link shared system libraries."
-      LT_STATIC_EXEC=""
-  else
-    LT_STATIC_EXEC="-all-static"
-  fi
-else
-  echo "no"
-  LT_STATIC_EXEC=""
-fi
- if test "X$LT_STATIC_EXEC" = X; then
-  USE_PLUGINS_CONDITIONAL_TRUE=
-  USE_PLUGINS_CONDITIONAL_FALSE='#'
-else
-  USE_PLUGINS_CONDITIONAL_TRUE='#'
-  USE_PLUGINS_CONDITIONAL_FALSE=
-fi
-
-
-
-
-## Fix up the INSTALL macro if it's a relative path. We want the
-## full-path to the binary instead.
-case "$INSTALL" in
-  *install-sh*)
-    INSTALL='\${top_srcdir}/bin/install-sh -c'
-    ;;
-esac
-
-## ----------------------------------------------------------------------
-## Some users have reported problems with libtool's use of '-Wl,-rpath' to
-## link shared libraries in nondefault directories. Allow users to
-## disable embedding the rpath information in the executables and to
-## instead solely rely on the information in LD_LIBRARY_PATH.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if -Wl,-rpath should be used to link shared libs in nondefault directories" >&5
-$as_echo_n "checking if -Wl,-rpath should be used to link shared libs in nondefault directories... " >&6; }
-# Check whether --enable-sharedlib-rpath was given.
-if test "${enable_sharedlib_rpath+set}" = set; then :
-  enableval=$enable_sharedlib_rpath; RPATH=$enableval
-fi
-
-
-case "X-$RPATH" in
-  X-no)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    runpath_var=
-    hardcode_libdir_flag_spec=
-    hardcode_libdir_flag_spec_ld=
-    hardcode_into_libs=no
-    ;;
-  X-|X-yes)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-    ;;
-  *)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: error" >&5
-$as_echo "error" >&6; }
-    as_fn_error $? "\'$enableval\' is not a valid rpath type" "$LINENO" 5
-    ;;
-esac
-
-## ----------------------------------------------------------------------
-## Sometimes makes think the `.PATH:' appearing before the first rule
-## with an action should override the `all' default target. So we have
-## to decide what the proper syntax is.
-##
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how make searches directories" >&5
-$as_echo_n "checking how make searches directories... " >&6; }
-while true; do #for break
-  ## The most common method is `VPATH=DIR1 DIR2 ...'
-  cat >maketest <<EOF
-VPATH=$srcdir/config $srcdir/src $srcdir/bin
-.c.o:
-	cp $< H5.o
-
-foo: H5.o
-	rm -f H5.o
-	@echo works
-EOF
-
-  if (${MAKE-make} -f maketest foo) >/dev/null 2>&1; then
-    SEARCH_RULE='VPATH='
-    SEARCH_SEP=' '
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: VPATH=DIR1 DIR2 ..." >&5
-$as_echo "VPATH=DIR1 DIR2 ..." >&6; }
-    break
-  fi
-
-  ## The second most common method is like above except with the
-  ## directories separated by colons.
-  cat >maketest <<EOF
-VPATH=$srcdir/config:$srcdir/src:$srcdir/bin
-.c.o:
-	cp $< H5.o
-
-foo: H5.o
-	rm -f H5.o
-	@echo works
-EOF
-
-  if (${MAKE-make} -f maketest foo) >/dev/null 2>&1; then
-    SEARCH_RULE='VPATH='
-    SEARCH_SEP=':'
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: VPATH=DIR1:DIR2:..." >&5
-$as_echo "VPATH=DIR1:DIR2:..." >&6; }
-    break
-  fi
-
-  ## pmake uses the construct `.PATH: DIR1 DIR2
-  cat >maketest <<EOF
-.PATH: $srcdir/config $srcdir/src $srcdir/bin
-.c.o:
-	cp $< H5.o
-
-foo: H5.o
-	rm -f H5.o
-	@echo works
-EOF
-
-  if (MAKE= ${MAKE-make} -f maketest foo) >/dev/null 2>&1; then
-    SEARCH_RULE='.PATH: '
-    SEARCH_SEP=' '
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: .PATH: DIR1 DIR2 ..." >&5
-$as_echo ".PATH: DIR1 DIR2 ..." >&6; }
-    break
-  fi
-
-  ## No way for make to search directories
-  SEARCH_RULE='## SEARCH DISABLED: '
-  SEARCH_SEP=' '
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: it doesn't" >&5
-$as_echo "it doesn't" >&6; }
-  if test ! -f configure; then
-    as_fn_error $? "${MAKE-make} requires the build and source directories to be the same" "$LINENO" 5
-  fi
-  break
-done
-rm maketest
-
-## ----------------------------------------------------------------------
-## pmake will throw an error if variables are undefined in a Makefile.
-## These errors can be changed to warnings using the -V flag.
-##
- AM_MAKEFLAGS=""
-
-## Don't run test if MAKE is defined but is the empty string
-if test -n "${MAKE-make}"; then
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether make will build with undefined variables" >&5
-$as_echo_n "checking whether make will build with undefined variables... " >&6; }
-
-  cat >maketest <<EOF
-foo: \$(UNDEFINED) \$(UNDEFINED2)
-	@echo \$(UNDEFINED3) works
-EOF
-
-  if (${MAKE-make} -f maketest foo) >/dev/null 2>&1; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, setting -V flag" >&5
-$as_echo "no, setting -V flag" >&6; }
-    AM_MAKEFLAGS="\-V"
-  fi
-
-  rm maketest
-fi
-
-## ----------------------------------------------------------------------
-## Production flags?  Save the value in $CONFIG_MODE so we have it for
-## the record.
-##
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for production mode" >&5
-$as_echo_n "checking for production mode... " >&6; }
-# Check whether --enable-production was given.
-if test "${enable_production+set}" = set; then :
-  enableval=$enable_production;
-fi
-
-
-case "X-$enable_production" in
-  X-yes)
-    enable_production="yes"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: production" >&5
-$as_echo "production" >&6; }
-    CONFIG_MODE=production
-    H5_CFLAGS="$H5_CFLAGS $PROD_CFLAGS"
-    H5_CPPFLAGS="$H5_CPPFLAGS $PROD_CPPFLAGS"
-    H5_CXXFLAGS="$H5_CXXFLAGS $PROD_CXXFLAGS"
-    H5_FCFLAGS="$H5_FCFLAGS $PROD_FCFLAGS"
-    ;;
-  X-|X-no)
-    enable_production="no"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: development" >&5
-$as_echo "development" >&6; }
-    CONFIG_MODE=development
-    H5_CFLAGS="$H5_CFLAGS $DEBUG_CFLAGS"
-    H5_CPPFLAGS="$H5_CPPFLAGS $DEBUG_CPPFLAGS"
-    H5_CXXFLAGS="$H5_CXXFLAGS $DEBUG_CXXFLAGS"
-    H5_FCFLAGS="$H5_FCFLAGS $DEBUG_FCFLAGS"
-    ;;
-  X-pg|X-profile)
-    enable_production="profile"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: profile" >&5
-$as_echo "profile" >&6; }
-    CONFIG_MODE=profile
-    H5_CFLAGS="$H5_CFLAGS $PROFILE_CFLAGS"
-    H5_CPPFLAGS="$H5_CPPFLAGS $PROFILE_CPPFLAGS"
-    H5_CXXFLAGS="$H5_CXXFLAGS $PROFILE_CXXFLAGS"
-    H5_FCFLAGS="$H5_FCFLAGS $PROFILE_FCFLAGS"
-    ;;
-  *)
-    enable_production="user-defined"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: user-defined" >&5
-$as_echo "user-defined" >&6; }
-    CONFIG_MODE="$enableval"
-    ;;
-esac
-
-## ----------------------------------------------------------------------
-## Check for system libraries. "dl" stands for dynamically loaded library
-##
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ceil in -lm" >&5
-$as_echo_n "checking for ceil in -lm... " >&6; }
-if ${ac_cv_lib_m_ceil+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lm  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char ceil ();
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-return ceil ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_m_ceil=yes
-else
-  ac_cv_lib_m_ceil=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_ceil" >&5
-$as_echo "$ac_cv_lib_m_ceil" >&6; }
-if test "x$ac_cv_lib_m_ceil" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBM 1
-_ACEOF
-
-  LIBS="-lm $LIBS"
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dl_dlopen=yes
-else
-  ac_cv_lib_dl_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBDL 1
-_ACEOF
-
-  LIBS="-ldl $LIBS"
-
-fi
-
-
-if test "`uname`" = "SunOS" -o "`uname -sr`" = "HP-UX B.11.00"; then
-  ## ...for Solaris
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5
-$as_echo_n "checking for socket in -lsocket... " >&6; }
-if ${ac_cv_lib_socket_socket+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsocket  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char socket ();
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-return socket ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_socket_socket=yes
-else
-  ac_cv_lib_socket_socket=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5
-$as_echo "$ac_cv_lib_socket_socket" >&6; }
-if test "x$ac_cv_lib_socket_socket" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBSOCKET 1
-_ACEOF
-
-  LIBS="-lsocket $LIBS"
-
-fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xdr_int in -lnsl" >&5
-$as_echo_n "checking for xdr_int in -lnsl... " >&6; }
-if ${ac_cv_lib_nsl_xdr_int+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lnsl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char xdr_int ();
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-return xdr_int ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_nsl_xdr_int=yes
-else
-  ac_cv_lib_nsl_xdr_int=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_xdr_int" >&5
-$as_echo "$ac_cv_lib_nsl_xdr_int" >&6; }
-if test "x$ac_cv_lib_nsl_xdr_int" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBNSL 1
-_ACEOF
-
-  LIBS="-lnsl $LIBS"
-
-fi
-
-fi
-
-
-## ----------------------------------------------------------------------
-## Check for system header files.
-##
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdc=yes
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
-$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
-if ${ac_cv_header_time+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <sys/time.h>
-#include <time.h>
-
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-if ((struct tm *) 0)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_time=yes
-else
-  ac_cv_header_time=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
-$as_echo "$ac_cv_header_time" >&6; }
-if test $ac_cv_header_time = yes; then
-
-$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
-
-fi
-
-
-## Unix
-for ac_header in sys/resource.h sys/time.h unistd.h sys/ioctl.h sys/stat.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-for ac_header in sys/socket.h sys/types.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-for ac_header in stddef.h setjmp.h features.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-for ac_header in dirent.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "dirent.h" "ac_cv_header_dirent_h" "$ac_includes_default"
-if test "x$ac_cv_header_dirent_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DIRENT_H 1
-_ACEOF
-
-fi
-
-done
-
-for ac_header in stdint.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdint_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_STDINT_H 1
-_ACEOF
- C9x=yes
-fi
-
-done
-
-
-## Darwin
-for ac_header in mach/mach_time.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "mach/mach_time.h" "ac_cv_header_mach_mach_time_h" "$ac_includes_default"
-if test "x$ac_cv_header_mach_mach_time_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_MACH_MACH_TIME_H 1
-_ACEOF
-
-fi
-
-done
-
-## Also need to detect Darwin for pubconf
-case $host_os in
-  darwin*)
-
-$as_echo "#define HAVE_DARWIN 1" >>confdefs.h
-
-  ;;
-esac
-
-## Windows
-case "`uname`" in
-  CYGWIN*)
-    for ac_header in io.h sys/timeb.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-    ;;
-  MINGW*)
-    for ac_header in io.h winsock2.h sys/timeb.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lws2_32" >&5
-$as_echo_n "checking for main in -lws2_32... " >&6; }
-if ${ac_cv_lib_ws2_32_main+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lws2_32  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-return main ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_ws2_32_main=yes
-else
-  ac_cv_lib_ws2_32_main=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ws2_32_main" >&5
-$as_echo "$ac_cv_lib_ws2_32_main" >&6; }
-if test "x$ac_cv_lib_ws2_32_main" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBWS2_32 1
-_ACEOF
-
-  LIBS="-lws2_32 $LIBS"
-
-fi
-ac_cv_lib_ws2_32=ac_cv_lib_ws2_32_main
-
-    ;;
-  *)
-    for ac_header in io.h winsock2.h sys/timeb.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-    ;;
-esac
-
-case "$host" in
-  alpha*-dec*-osf*)
-    ## The <sys/sysinfo.h> and <sys/proc.h> are needed on the DEC
-    ## Alpha to turn off UAC fixing. We do *not* attempt to
-    ## locate these files on other systems because there are too
-    ## many problems with including them.
-    for ac_header in sys/sysinfo.h sys/proc.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-    ;;
-  mips*-sgi*)
-    ## The <sys/fpu.h> is needed on the SGI machines to turn off
-    ## denormalized floating-point values going to zero.  We do *not*
-    ## attempt to locate these files on other systems because there
-    ## may be problems with including them.
-    for ac_header in sys/fpu.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "sys/fpu.h" "ac_cv_header_sys_fpu_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_fpu_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SYS_FPU_H 1
-_ACEOF
-
-fi
-
-done
-
-    for ac_func in get_fpc_csr
-do :
-  ac_fn_c_check_func "$LINENO" "get_fpc_csr" "ac_cv_func_get_fpc_csr"
-if test "x$ac_cv_func_get_fpc_csr" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_GET_FPC_CSR 1
-_ACEOF
-
-fi
-done
-
-    ;;
-esac
-
-## ----------------------------------------------------------------------
-## Some platforms require that all symbols are resolved when a library
-## is linked. We can use the -no-undefined flag to tell libtool that
-## it will be able to build shared libraries on these architectures,
-## as it will not do so by default.
-##
-if test "X${enable_shared}" = "Xyes"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool needs -no-undefined flag to build shared libraries" >&5
-$as_echo_n "checking if libtool needs -no-undefined flag to build shared libraries... " >&6; }
-  case "`uname`" in
-    CYGWIN*|MINGW*|AIX*)
-      ## Add in the -no-undefined flag to LDFLAGS for libtool.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-      H5_LDFLAGS="$H5_LDFLAGS -no-undefined"
-      ;;
-    *)
-      ## Don't add in anything.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-      ;;
-  esac
-fi
-
-## ----------------------------------------------------------------------
-## Use the macro _AC_SYS_LARGEFILE_MACRO_VALUE to test defines
-## that might need to be set for largefile support to behave
-## correctly. This macro is defined in acsite.m4 and overrides
-## the version provided by Autoconf (as of v2.65). The custom
-## macro additionally adds the appropriate defines to AM_CPPFLAGS
-## so that later configure checks have them visible.
-
-## Check for _FILE_OFFSET_BITS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
-if ${ac_cv_sys_file_offset_bits+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  while :; do
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-		       && LARGE_OFF_T % 2147483647 == 1)
-		      ? 1 : -1];
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_file_offset_bits=no; break
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#define _FILE_OFFSET_BITS 64
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-		       && LARGE_OFF_T % 2147483647 == 1)
-		      ? 1 : -1];
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_file_offset_bits=64; break
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  ac_cv_sys_file_offset_bits=unknown
-  break
-done
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
-$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
-case $ac_cv_sys_file_offset_bits in #(
-  no | unknown) ;;
-  *)
-cat >>confdefs.h <<_ACEOF
-#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
-_ACEOF
-
-     AM_CPPFLAGS="-D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits $AM_CPPFLAGS";;
-esac
-rm -rf conftest*
-
-## Check for _LARGE_FILES
-if test "$ac_cv_sys_file_offset_bits" = unknown; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
-$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
-if ${ac_cv_sys_large_files+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  while :; do
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-		       && LARGE_OFF_T % 2147483647 == 1)
-		      ? 1 : -1];
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_large_files=no; break
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#define _LARGE_FILES 1
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-		       && LARGE_OFF_T % 2147483647 == 1)
-		      ? 1 : -1];
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_large_files=1; break
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  ac_cv_sys_large_files=unknown
-  break
-done
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
-$as_echo "$ac_cv_sys_large_files" >&6; }
-case $ac_cv_sys_large_files in #(
-  no | unknown) ;;
-  *)
-cat >>confdefs.h <<_ACEOF
-#define _LARGE_FILES $ac_cv_sys_large_files
-_ACEOF
-
-     AM_CPPFLAGS="-D_LARGE_FILES=$ac_cv_sys_large_files $AM_CPPFLAGS";;
-esac
-rm -rf conftest*
-fi
-
-## ----------------------------------------------------------------------
-## Add necessary defines for Linux Systems.
-##
-case "$host_cpu-$host_vendor-$host_os" in
-  *linux*)
-    ## Make available various LFS-related routines using the following
-    ## _LARGEFILE*_SOURCE macros.
-    AM_CPPFLAGS="-D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE $AM_CPPFLAGS"
-
-    ## Add POSIX support on Linux systems, so <features.h> defines
-    ## __USE_POSIX, which is required to get the prototype for fdopen
-    ## defined correctly in <stdio.h>.
-    ##
-    ## This flag was removed from h5cc as of 2009-10-17 when it was found
-    ## that the flag broke compiling netCDF-4 code with h5cc, but kept in
-    ## H5_CPPFLAGS because fdopen and HDfdopen fail without it. HDfdopen
-    ## is used only by H5_debug_mask which is used only when debugging in
-    ## H5_init_library (all in H5.c).  When the flag was removed this was
-    ## the only compile failure noted.
-    ##
-    ## This was originally defined as _POSIX_SOURCE which was updated to
-    ## _POSIX_C_SOURCE=199506L to expose a greater amount of POSIX
-    ## functionality so clock_gettime and CLOCK_MONOTONIC are defined
-    ## correctly. This was later updated to 200112L so that
-    ## posix_memalign() is visible for the direct VFD code on Linux
-    ## systems.
-    ##
-    ## POSIX feature information can be found in the gcc manual at:
-    ## http://www.gnu.org/s/libc/manual/html_node/Feature-Test-Macros.html
-    H5_CPPFLAGS="-D_POSIX_C_SOURCE=200112L $H5_CPPFLAGS"
-
-    ## Need to add this so that O_DIRECT is visible for the direct
-    ## VFD on Linux systems.
-    H5_CPPFLAGS="-D_GNU_SOURCE $H5_CPPFLAGS"
-
-    ## Also add BSD support on Linux systems, so <features.h> defines
-    ## __USE_BSD, which is required to get the prototype for strdup
-    ## defined correctly in <string.h> and snprintf & vsnprintf defined
-    ## correctly in <stdio.h>
-    ## Linking to the bsd-compat library is required as per the gcc manual:
-    ## http://www.gnu.org/s/libc/manual/html_node/Feature-Test-Macros.html
-    ## however, we do not do this since it breaks the big test on some
-    ## older platforms.
-    H5_CPPFLAGS="-D_BSD_SOURCE $H5_CPPFLAGS"
-    ;;
-esac
-
-## Need to add the AM_ and H5_ into CFLAGS/CPPFLAGS to make them visible
-## for configure checks.
-## Note: Both will be restored by the end of configure.
-CPPFLAGS="$H5_CPPFLAGS $AM_CPPFLAGS $CPPFLAGS"
-CFLAGS="$H5_CFLAGS $AM_CFLAGS $CFLAGS"
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-off64_t n = 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  for ac_func in lseek64 fseeko64 ftello64 ftruncate64
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: skipping test for lseek64(), fseeko64 , ftello64, ftruncate64() because off64_t is not defined" >&5
-$as_echo "skipping test for lseek64(), fseeko64 , ftello64, ftruncate64() because off64_t is not defined" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-for ac_func in fseeko ftello
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-struct stat64 sb;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  for ac_func in stat64 fstat64
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: skipping test for stat64() and fstat64()" >&5
-$as_echo "skipping test for stat64() and fstat64()" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-## ----------------------------------------------------------------------
-## Data types and their sizes.
-##
-ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
-if test "x$ac_cv_type_off_t" = xyes; then :
-
-else
-
-cat >>confdefs.h <<_ACEOF
-#define off_t long int
-_ACEOF
-
-fi
-
-ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = xyes; then :
-
-else
-
-cat >>confdefs.h <<_ACEOF
-#define size_t unsigned long
-_ACEOF
-
-fi
-
-ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default"
-if test "x$ac_cv_type_ssize_t" = xyes; then :
-
-else
-
-cat >>confdefs.h <<_ACEOF
-#define ssize_t long
-_ACEOF
-
-fi
-
-ac_fn_c_check_type "$LINENO" "ptrdiff_t" "ac_cv_type_ptrdiff_t" "$ac_includes_default"
-if test "x$ac_cv_type_ptrdiff_t" = xyes; then :
-
-else
-
-cat >>confdefs.h <<_ACEOF
-#define ptrdiff_t long
-_ACEOF
-
-fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
-$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if ${ac_cv_c_bigendian+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_c_bigendian=unknown
-    # See if we're dealing with a universal compiler.
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifndef __APPLE_CC__
-	       not a universal capable compiler
-	     #endif
-	     typedef int dummy;
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-	# Check for potential -arch flags.  It is not universal unless
-	# there are at least two -arch flags with different values.
-	ac_arch=
-	ac_prev=
-	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
-	 if test -n "$ac_prev"; then
-	   case $ac_word in
-	     i?86 | x86_64 | ppc | ppc64)
-	       if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
-		 ac_arch=$ac_word
-	       else
-		 ac_cv_c_bigendian=universal
-		 break
-	       fi
-	       ;;
-	   esac
-	   ac_prev=
-	 elif test "x$ac_word" = "x-arch"; then
-	   ac_prev=arch
-	 fi
-       done
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    if test $ac_cv_c_bigendian = unknown; then
-      # See if sys/param.h defines the BYTE_ORDER macro.
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-	     #include <sys/param.h>
-
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
-		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
-		     && LITTLE_ENDIAN)
-	      bogus endian macros
-	     #endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  # It does; now see whether it defined to BIG_ENDIAN or not.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-		#include <sys/param.h>
-
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-#if BYTE_ORDER != BIG_ENDIAN
-		 not big endian
-		#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_bigendian=yes
-else
-  ac_cv_c_bigendian=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    fi
-    if test $ac_cv_c_bigendian = unknown; then
-      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <limits.h>
-
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
-	      bogus endian macros
-	     #endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  # It does; now see whether it defined to _BIG_ENDIAN or not.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <limits.h>
-
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-#ifndef _BIG_ENDIAN
-		 not big endian
-		#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_bigendian=yes
-else
-  ac_cv_c_bigendian=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    fi
-    if test $ac_cv_c_bigendian = unknown; then
-      # Compile a test program.
-      if test "$cross_compiling" = yes; then :
-  # Try to guess by grepping values from an object file.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-short int ascii_mm[] =
-		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-		short int ascii_ii[] =
-		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-		int use_ascii (int i) {
-		  return ascii_mm[i] + ascii_ii[i];
-		}
-		short int ebcdic_ii[] =
-		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-		short int ebcdic_mm[] =
-		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-		int use_ebcdic (int i) {
-		  return ebcdic_mm[i] + ebcdic_ii[i];
-		}
-		extern int foo;
-
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-return use_ascii (foo) == use_ebcdic (foo);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
-	      ac_cv_c_bigendian=yes
-	    fi
-	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-	      if test "$ac_cv_c_bigendian" = unknown; then
-		ac_cv_c_bigendian=no
-	      else
-		# finding both strings is unlikely to happen, but who knows?
-		ac_cv_c_bigendian=unknown
-	      fi
-	    fi
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_includes_default
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-
-	     /* Are we little or big endian?  From Harbison&Steele.  */
-	     union
-	     {
-	       long int l;
-	       char c[sizeof (long int)];
-	     } u;
-	     u.l = 1;
-	     return u.c[sizeof (long int) - 1] == 1;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  ac_cv_c_bigendian=no
-else
-  ac_cv_c_bigendian=yes
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-    fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
-$as_echo "$ac_cv_c_bigendian" >&6; }
- case $ac_cv_c_bigendian in #(
-   yes)
-     $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
-;; #(
-   no)
-      ;; #(
-   universal)
-
-$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
-
-     ;; #(
-   *)
-     as_fn_error $? "unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
- esac
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of char" >&5
-$as_echo_n "checking size of char... " >&6; }
-if ${ac_cv_sizeof_char+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (char))" "ac_cv_sizeof_char"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_char" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (char)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_char=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_char" >&5
-$as_echo "$ac_cv_sizeof_char" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_CHAR $ac_cv_sizeof_char
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5
-$as_echo_n "checking size of short... " >&6; }
-if ${ac_cv_sizeof_short+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_short" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (short)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_short=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5
-$as_echo "$ac_cv_sizeof_short" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_SHORT $ac_cv_sizeof_short
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
-$as_echo_n "checking size of int... " >&6; }
-if ${ac_cv_sizeof_int+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_int" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (int)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_int=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
-$as_echo "$ac_cv_sizeof_int" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_INT $ac_cv_sizeof_int
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned" >&5
-$as_echo_n "checking size of unsigned... " >&6; }
-if ${ac_cv_sizeof_unsigned+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned))" "ac_cv_sizeof_unsigned"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_unsigned" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (unsigned)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_unsigned=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_unsigned" >&5
-$as_echo "$ac_cv_sizeof_unsigned" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_UNSIGNED $ac_cv_sizeof_unsigned
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
-$as_echo_n "checking size of long... " >&6; }
-if ${ac_cv_sizeof_long+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_long" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (long)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_long=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
-$as_echo "$ac_cv_sizeof_long" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
-$as_echo_n "checking size of long long... " >&6; }
-if ${ac_cv_sizeof_long_long+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_long_long" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (long long)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_long_long=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5
-$as_echo "$ac_cv_sizeof_long_long" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of __int64" >&5
-$as_echo_n "checking size of __int64... " >&6; }
-if ${ac_cv_sizeof___int64+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (__int64))" "ac_cv_sizeof___int64"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type___int64" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (__int64)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof___int64=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof___int64" >&5
-$as_echo "$ac_cv_sizeof___int64" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF___INT64 $ac_cv_sizeof___int64
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of float" >&5
-$as_echo_n "checking size of float... " >&6; }
-if ${ac_cv_sizeof_float+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (float))" "ac_cv_sizeof_float"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_float" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (float)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_float=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_float" >&5
-$as_echo "$ac_cv_sizeof_float" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_FLOAT $ac_cv_sizeof_float
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of double" >&5
-$as_echo_n "checking size of double... " >&6; }
-if ${ac_cv_sizeof_double+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (double))" "ac_cv_sizeof_double"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_double" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (double)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_double=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_double" >&5
-$as_echo "$ac_cv_sizeof_double" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_DOUBLE $ac_cv_sizeof_double
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long double" >&5
-$as_echo_n "checking size of long double... " >&6; }
-if ${ac_cv_sizeof_long_double+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long double))" "ac_cv_sizeof_long_double"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_long_double" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (long double)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_long_double=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_double" >&5
-$as_echo "$ac_cv_sizeof_long_double" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG_DOUBLE $ac_cv_sizeof_long_double
-_ACEOF
-
-
-
-## Checkpoint the cache
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes: double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \.
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
-  sed '
-     /^ac_cv_env_/b end
-     t clear
-     :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    if test "x$cache_file" != "x/dev/null"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
-      if test ! -f "$cache_file" || test -h "$cache_file"; then
-	cat confcache >"$cache_file"
-      else
-        case $cache_file in #(
-        */* | ?:*)
-	  mv -f confcache "$cache_file"$$ &&
-	  mv -f "$cache_file"$$ "$cache_file" ;; #(
-        *)
-	  mv -f confcache "$cache_file" ;;
-	esac
-      fi
-    fi
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-  fi
-fi
-rm -f confcache
-
-## Posix.1g types (C9x)
-cat >>confdefs.h <<\EOF
-#include <sys/types.h>
-EOF
-
-if test "X$C9x" = "Xyes"; then
-  cat >>confdefs.h <<\EOF
-#include <stdint.h>
-EOF
-fi
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int8_t" >&5
-$as_echo_n "checking size of int8_t... " >&6; }
-if ${ac_cv_sizeof_int8_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int8_t))" "ac_cv_sizeof_int8_t"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_int8_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (int8_t)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_int8_t=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int8_t" >&5
-$as_echo "$ac_cv_sizeof_int8_t" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_INT8_T $ac_cv_sizeof_int8_t
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of uint8_t" >&5
-$as_echo_n "checking size of uint8_t... " >&6; }
-if ${ac_cv_sizeof_uint8_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (uint8_t))" "ac_cv_sizeof_uint8_t"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_uint8_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (uint8_t)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_uint8_t=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_uint8_t" >&5
-$as_echo "$ac_cv_sizeof_uint8_t" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_UINT8_T $ac_cv_sizeof_uint8_t
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int_least8_t" >&5
-$as_echo_n "checking size of int_least8_t... " >&6; }
-if ${ac_cv_sizeof_int_least8_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int_least8_t))" "ac_cv_sizeof_int_least8_t"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_int_least8_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (int_least8_t)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_int_least8_t=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int_least8_t" >&5
-$as_echo "$ac_cv_sizeof_int_least8_t" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_INT_LEAST8_T $ac_cv_sizeof_int_least8_t
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of uint_least8_t" >&5
-$as_echo_n "checking size of uint_least8_t... " >&6; }
-if ${ac_cv_sizeof_uint_least8_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (uint_least8_t))" "ac_cv_sizeof_uint_least8_t"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_uint_least8_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (uint_least8_t)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_uint_least8_t=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_uint_least8_t" >&5
-$as_echo "$ac_cv_sizeof_uint_least8_t" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_UINT_LEAST8_T $ac_cv_sizeof_uint_least8_t
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int_fast8_t" >&5
-$as_echo_n "checking size of int_fast8_t... " >&6; }
-if ${ac_cv_sizeof_int_fast8_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int_fast8_t))" "ac_cv_sizeof_int_fast8_t"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_int_fast8_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (int_fast8_t)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_int_fast8_t=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int_fast8_t" >&5
-$as_echo "$ac_cv_sizeof_int_fast8_t" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_INT_FAST8_T $ac_cv_sizeof_int_fast8_t
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of uint_fast8_t" >&5
-$as_echo_n "checking size of uint_fast8_t... " >&6; }
-if ${ac_cv_sizeof_uint_fast8_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (uint_fast8_t))" "ac_cv_sizeof_uint_fast8_t"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_uint_fast8_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (uint_fast8_t)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_uint_fast8_t=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_uint_fast8_t" >&5
-$as_echo "$ac_cv_sizeof_uint_fast8_t" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_UINT_FAST8_T $ac_cv_sizeof_uint_fast8_t
-_ACEOF
-
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int16_t" >&5
-$as_echo_n "checking size of int16_t... " >&6; }
-if ${ac_cv_sizeof_int16_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int16_t))" "ac_cv_sizeof_int16_t"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_int16_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (int16_t)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_int16_t=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int16_t" >&5
-$as_echo "$ac_cv_sizeof_int16_t" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_INT16_T $ac_cv_sizeof_int16_t
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of uint16_t" >&5
-$as_echo_n "checking size of uint16_t... " >&6; }
-if ${ac_cv_sizeof_uint16_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (uint16_t))" "ac_cv_sizeof_uint16_t"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_uint16_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (uint16_t)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_uint16_t=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_uint16_t" >&5
-$as_echo "$ac_cv_sizeof_uint16_t" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_UINT16_T $ac_cv_sizeof_uint16_t
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int_least16_t" >&5
-$as_echo_n "checking size of int_least16_t... " >&6; }
-if ${ac_cv_sizeof_int_least16_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int_least16_t))" "ac_cv_sizeof_int_least16_t"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_int_least16_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (int_least16_t)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_int_least16_t=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int_least16_t" >&5
-$as_echo "$ac_cv_sizeof_int_least16_t" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_INT_LEAST16_T $ac_cv_sizeof_int_least16_t
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of uint_least16_t" >&5
-$as_echo_n "checking size of uint_least16_t... " >&6; }
-if ${ac_cv_sizeof_uint_least16_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (uint_least16_t))" "ac_cv_sizeof_uint_least16_t"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_uint_least16_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (uint_least16_t)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_uint_least16_t=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_uint_least16_t" >&5
-$as_echo "$ac_cv_sizeof_uint_least16_t" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_UINT_LEAST16_T $ac_cv_sizeof_uint_least16_t
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int_fast16_t" >&5
-$as_echo_n "checking size of int_fast16_t... " >&6; }
-if ${ac_cv_sizeof_int_fast16_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int_fast16_t))" "ac_cv_sizeof_int_fast16_t"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_int_fast16_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (int_fast16_t)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_int_fast16_t=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int_fast16_t" >&5
-$as_echo "$ac_cv_sizeof_int_fast16_t" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_INT_FAST16_T $ac_cv_sizeof_int_fast16_t
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of uint_fast16_t" >&5
-$as_echo_n "checking size of uint_fast16_t... " >&6; }
-if ${ac_cv_sizeof_uint_fast16_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (uint_fast16_t))" "ac_cv_sizeof_uint_fast16_t"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_uint_fast16_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (uint_fast16_t)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_uint_fast16_t=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_uint_fast16_t" >&5
-$as_echo "$ac_cv_sizeof_uint_fast16_t" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_UINT_FAST16_T $ac_cv_sizeof_uint_fast16_t
-_ACEOF
-
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int32_t" >&5
-$as_echo_n "checking size of int32_t... " >&6; }
-if ${ac_cv_sizeof_int32_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int32_t))" "ac_cv_sizeof_int32_t"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_int32_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (int32_t)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_int32_t=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int32_t" >&5
-$as_echo "$ac_cv_sizeof_int32_t" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_INT32_T $ac_cv_sizeof_int32_t
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of uint32_t" >&5
-$as_echo_n "checking size of uint32_t... " >&6; }
-if ${ac_cv_sizeof_uint32_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (uint32_t))" "ac_cv_sizeof_uint32_t"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_uint32_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (uint32_t)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_uint32_t=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_uint32_t" >&5
-$as_echo "$ac_cv_sizeof_uint32_t" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_UINT32_T $ac_cv_sizeof_uint32_t
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int_least32_t" >&5
-$as_echo_n "checking size of int_least32_t... " >&6; }
-if ${ac_cv_sizeof_int_least32_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int_least32_t))" "ac_cv_sizeof_int_least32_t"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_int_least32_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (int_least32_t)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_int_least32_t=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int_least32_t" >&5
-$as_echo "$ac_cv_sizeof_int_least32_t" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_INT_LEAST32_T $ac_cv_sizeof_int_least32_t
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of uint_least32_t" >&5
-$as_echo_n "checking size of uint_least32_t... " >&6; }
-if ${ac_cv_sizeof_uint_least32_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (uint_least32_t))" "ac_cv_sizeof_uint_least32_t"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_uint_least32_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (uint_least32_t)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_uint_least32_t=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_uint_least32_t" >&5
-$as_echo "$ac_cv_sizeof_uint_least32_t" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_UINT_LEAST32_T $ac_cv_sizeof_uint_least32_t
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int_fast32_t" >&5
-$as_echo_n "checking size of int_fast32_t... " >&6; }
-if ${ac_cv_sizeof_int_fast32_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int_fast32_t))" "ac_cv_sizeof_int_fast32_t"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_int_fast32_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (int_fast32_t)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_int_fast32_t=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int_fast32_t" >&5
-$as_echo "$ac_cv_sizeof_int_fast32_t" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_INT_FAST32_T $ac_cv_sizeof_int_fast32_t
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of uint_fast32_t" >&5
-$as_echo_n "checking size of uint_fast32_t... " >&6; }
-if ${ac_cv_sizeof_uint_fast32_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (uint_fast32_t))" "ac_cv_sizeof_uint_fast32_t"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_uint_fast32_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (uint_fast32_t)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_uint_fast32_t=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_uint_fast32_t" >&5
-$as_echo "$ac_cv_sizeof_uint_fast32_t" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_UINT_FAST32_T $ac_cv_sizeof_uint_fast32_t
-_ACEOF
-
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int64_t" >&5
-$as_echo_n "checking size of int64_t... " >&6; }
-if ${ac_cv_sizeof_int64_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int64_t))" "ac_cv_sizeof_int64_t"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_int64_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (int64_t)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_int64_t=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int64_t" >&5
-$as_echo "$ac_cv_sizeof_int64_t" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_INT64_T $ac_cv_sizeof_int64_t
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of uint64_t" >&5
-$as_echo_n "checking size of uint64_t... " >&6; }
-if ${ac_cv_sizeof_uint64_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (uint64_t))" "ac_cv_sizeof_uint64_t"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_uint64_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (uint64_t)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_uint64_t=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_uint64_t" >&5
-$as_echo "$ac_cv_sizeof_uint64_t" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_UINT64_T $ac_cv_sizeof_uint64_t
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int_least64_t" >&5
-$as_echo_n "checking size of int_least64_t... " >&6; }
-if ${ac_cv_sizeof_int_least64_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int_least64_t))" "ac_cv_sizeof_int_least64_t"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_int_least64_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (int_least64_t)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_int_least64_t=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int_least64_t" >&5
-$as_echo "$ac_cv_sizeof_int_least64_t" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_INT_LEAST64_T $ac_cv_sizeof_int_least64_t
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of uint_least64_t" >&5
-$as_echo_n "checking size of uint_least64_t... " >&6; }
-if ${ac_cv_sizeof_uint_least64_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (uint_least64_t))" "ac_cv_sizeof_uint_least64_t"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_uint_least64_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (uint_least64_t)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_uint_least64_t=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_uint_least64_t" >&5
-$as_echo "$ac_cv_sizeof_uint_least64_t" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_UINT_LEAST64_T $ac_cv_sizeof_uint_least64_t
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int_fast64_t" >&5
-$as_echo_n "checking size of int_fast64_t... " >&6; }
-if ${ac_cv_sizeof_int_fast64_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int_fast64_t))" "ac_cv_sizeof_int_fast64_t"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_int_fast64_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (int_fast64_t)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_int_fast64_t=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int_fast64_t" >&5
-$as_echo "$ac_cv_sizeof_int_fast64_t" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_INT_FAST64_T $ac_cv_sizeof_int_fast64_t
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of uint_fast64_t" >&5
-$as_echo_n "checking size of uint_fast64_t... " >&6; }
-if ${ac_cv_sizeof_uint_fast64_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (uint_fast64_t))" "ac_cv_sizeof_uint_fast64_t"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_uint_fast64_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (uint_fast64_t)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_uint_fast64_t=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_uint_fast64_t" >&5
-$as_echo "$ac_cv_sizeof_uint_fast64_t" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_UINT_FAST64_T $ac_cv_sizeof_uint_fast64_t
-_ACEOF
-
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5
-$as_echo_n "checking size of size_t... " >&6; }
-if ${ac_cv_sizeof_size_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_size_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (size_t)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_size_t=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5
-$as_echo "$ac_cv_sizeof_size_t" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of ssize_t" >&5
-$as_echo_n "checking size of ssize_t... " >&6; }
-if ${ac_cv_sizeof_ssize_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (ssize_t))" "ac_cv_sizeof_ssize_t"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_ssize_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (ssize_t)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_ssize_t=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_ssize_t" >&5
-$as_echo "$ac_cv_sizeof_ssize_t" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_SSIZE_T $ac_cv_sizeof_ssize_t
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of ptrdiff_t" >&5
-$as_echo_n "checking size of ptrdiff_t... " >&6; }
-if ${ac_cv_sizeof_ptrdiff_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (ptrdiff_t))" "ac_cv_sizeof_ptrdiff_t"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_ptrdiff_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (ptrdiff_t)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_ptrdiff_t=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_ptrdiff_t" >&5
-$as_echo "$ac_cv_sizeof_ptrdiff_t" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_PTRDIFF_T $ac_cv_sizeof_ptrdiff_t
-_ACEOF
-
-
-
-cat >>confdefs.h <<\EOF
-#include <sys/types.h> /*for off_t definition*/
-EOF
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of off_t" >&5
-$as_echo_n "checking size of off_t... " >&6; }
-if ${ac_cv_sizeof_off_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (off_t))" "ac_cv_sizeof_off_t"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_off_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (off_t)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_off_t=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_off_t" >&5
-$as_echo "$ac_cv_sizeof_off_t" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_OFF_T $ac_cv_sizeof_off_t
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of off64_t" >&5
-$as_echo_n "checking size of off64_t... " >&6; }
-if ${ac_cv_sizeof_off64_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (off64_t))" "ac_cv_sizeof_off64_t"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_off64_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (off64_t)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_off64_t=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_off64_t" >&5
-$as_echo "$ac_cv_sizeof_off64_t" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_OFF64_T $ac_cv_sizeof_off64_t
-_ACEOF
-
-
-
-## Checkpoint the cache
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes: double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \.
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
-  sed '
-     /^ac_cv_env_/b end
-     t clear
-     :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    if test "x$cache_file" != "x/dev/null"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
-      if test ! -f "$cache_file" || test -h "$cache_file"; then
-	cat confcache >"$cache_file"
-      else
-        case $cache_file in #(
-        */* | ?:*)
-	  mv -f confcache "$cache_file"$$ &&
-	  mv -f "$cache_file"$$ "$cache_file" ;; #(
-        *)
-	  mv -f confcache "$cache_file" ;;
-	esac
-      fi
-    fi
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-  fi
-fi
-rm -f confcache
-
-## ----------------------------------------------------------------------
-## Check if the dev_t type is a scalar type (must come after the check for
-## sys/types.h)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if dev_t is scalar" >&5
-$as_echo_n "checking if dev_t is scalar... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-dev_t d1, d2; if(d1==d2) return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-$as_echo "#define DEV_T_IS_SCALAR 1" >>confdefs.h
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-## ----------------------------------------------------------------------
-## Fake --with-xxx option to allow us to create a help message for the
-## following --with-xxx options which can take either a =DIR or =INC,LIB
-## specifier.
-##
-
-# Check whether --with-fnord was given.
-if test "${with_fnord+set}" = set; then :
-  withval=$with_fnord;
-fi
-
-
-## ----------------------------------------------------------------------
-## Is the dmalloc present? It has a header file `dmalloc.h' and a library
-## `-ldmalloc' and their locations might be specified with the `--with-dmalloc'
-## command-line switch. The value is an include path and/or a library path.
-## If the library path is specified then it must be preceded by a comma.
-##
-
-# Check whether --with-dmalloc was given.
-if test "${with_dmalloc+set}" = set; then :
-  withval=$with_dmalloc;
-else
-  withval=no
-fi
-
-
-case $withval in
-  yes)
-    HAVE_DMALLOC="yes"
-    for ac_header in dmalloc.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "dmalloc.h" "ac_cv_header_dmalloc_h" "$ac_includes_default"
-if test "x$ac_cv_header_dmalloc_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DMALLOC_H 1
-_ACEOF
-
-else
-  unset HAVE_DMALLOC
-fi
-
-done
-
-    if test "x$HAVE_DMALLOC" = "xyes"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dmalloc_shutdown in -ldmalloc" >&5
-$as_echo_n "checking for dmalloc_shutdown in -ldmalloc... " >&6; }
-if ${ac_cv_lib_dmalloc_dmalloc_shutdown+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldmalloc  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dmalloc_shutdown ();
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-return dmalloc_shutdown ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dmalloc_dmalloc_shutdown=yes
-else
-  ac_cv_lib_dmalloc_dmalloc_shutdown=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dmalloc_dmalloc_shutdown" >&5
-$as_echo "$ac_cv_lib_dmalloc_dmalloc_shutdown" >&6; }
-if test "x$ac_cv_lib_dmalloc_dmalloc_shutdown" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBDMALLOC 1
-_ACEOF
-
-  LIBS="-ldmalloc $LIBS"
-
-else
-  unset HAVE_DMALLOC
-fi
-
-    fi
-    if test -z "$HAVE_DMALLOC" -a -n "$HDF5_CONFIG_ABORT"; then
-      as_fn_error $? "couldn't find dmalloc library" "$LINENO" 5
-    fi
-    ;;
-  no)
-    HAVE_DMALLOC="no"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dmalloc library" >&5
-$as_echo_n "checking for dmalloc library... " >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: suppressed" >&5
-$as_echo "suppressed" >&6; }
-    ;;
-  *)
-    HAVE_DMALLOC="yes"
-    case "$withval" in
-      *,*)
-        dmalloc_inc="`echo $withval |cut -f1 -d,`"
-        dmalloc_lib="`echo $withval |cut -f2 -d, -s`"
-        ;;
-      *)
-        if test -n "$withval"; then
-          dmalloc_inc="$withval/include"
-          dmalloc_lib="$withval/lib"
-        fi
-        ;;
-    esac
-
-    ## Trying to include -I/usr/include and -L/usr/lib is redundant and
-    ## can mess some compilers up.
-    if test "X$dmalloc_inc" = "X/usr/include"; then
-      dmalloc_inc=""
-    fi
-    if test "X$dmalloc_lib" = "X/usr/lib"; then
-      dmalloc_lib=""
-    fi
-
-    saved_CPPFLAGS="$CPPFLAGS"
-    saved_AM_CPPFLAGS="$AM_CPPFLAGS"
-    saved_LDFLAGS="$LDFLAGS"
-    saved_AM_LDFLAGS="$AM_LDFLAGS"
-
-    if test -n "$dmalloc_inc"; then
-      CPPFLAGS="$CPPFLAGS -I$dmalloc_inc"
-      AM_CPPFLAGS="$AM_CPPFLAGS -I$dmalloc_inc"
-    fi
-
-    for ac_header in dmalloc.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "dmalloc.h" "ac_cv_header_dmalloc_h" "$ac_includes_default"
-if test "x$ac_cv_header_dmalloc_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DMALLOC_H 1
-_ACEOF
-
-else
-  CPPFLAGS="$saved_CPPFLAGS"; AM_CPPFLAGS="$saved_AM_CPPFLAGS" unset HAVE_DMALLOC
-fi
-
-done
-
-
-    if test "x$HAVE_DMALLOC" = "xyes"; then
-      if test -n "$dmalloc_lib"; then
-        LDFLAGS="$LDFLAGS -L$dmalloc_lib"
-        AM_LDFLAGS="$AM_LDFLAGS -L$dmalloc_lib"
-      fi
-
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dmalloc_shutdown in -ldmalloc" >&5
-$as_echo_n "checking for dmalloc_shutdown in -ldmalloc... " >&6; }
-if ${ac_cv_lib_dmalloc_dmalloc_shutdown+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldmalloc  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dmalloc_shutdown ();
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-return dmalloc_shutdown ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dmalloc_dmalloc_shutdown=yes
-else
-  ac_cv_lib_dmalloc_dmalloc_shutdown=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dmalloc_dmalloc_shutdown" >&5
-$as_echo "$ac_cv_lib_dmalloc_dmalloc_shutdown" >&6; }
-if test "x$ac_cv_lib_dmalloc_dmalloc_shutdown" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBDMALLOC 1
-_ACEOF
-
-  LIBS="-ldmalloc $LIBS"
-
-else
-  LDFLAGS="$saved_LDFLAGS"; AM_LDFLAGS="$saved_AM_LDFLAGS"; unset HAVE_DMALLOC
-fi
-
-    fi
-
-    if test -z "$HAVE_DMALLOC" -a -n "$HDF5_CONFIG_ABORT"; then
-      as_fn_error $? "couldn't find dmalloc library" "$LINENO" 5
-    fi
-    ;;
-esac
-
-## ----------------------------------------------------------------------
-## Is the GNU zlib present? It has a header file `zlib.h' and a library
-## `-lz' and their locations might be specified with the `--with-zlib'
-## command-line switch. The value is an include path and/or a library path.
-## If the library path is specified then it must be preceded by a comma.
-##
- USE_FILTER_DEFLATE="no"
-
-# Check whether --with-zlib was given.
-if test "${with_zlib+set}" = set; then :
-  withval=$with_zlib;
-else
-  withval=yes
-fi
-
-
-case $withval in
-  yes)
-    HAVE_ZLIB="yes"
-    for ac_header in zlib.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_zlib_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_ZLIB_H 1
-_ACEOF
- HAVE_ZLIB_H="yes"
-else
-  unset HAVE_ZLIB
-fi
-
-done
-
-    if test "x$HAVE_ZLIB" = "xyes" -a "x$HAVE_ZLIB_H" = "xyes"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress2 in -lz" >&5
-$as_echo_n "checking for compress2 in -lz... " >&6; }
-if ${ac_cv_lib_z_compress2+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lz  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char compress2 ();
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-return compress2 ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_z_compress2=yes
-else
-  ac_cv_lib_z_compress2=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_compress2" >&5
-$as_echo "$ac_cv_lib_z_compress2" >&6; }
-if test "x$ac_cv_lib_z_compress2" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBZ 1
-_ACEOF
-
-  LIBS="-lz $LIBS"
-
-else
-  unset HAVE_ZLIB
-fi
-
-    fi
-    if test -z "$HAVE_ZLIB"; then
-      if test -n "$HDF5_CONFIG_ABORT"; then
-        as_fn_error $? "couldn't find zlib library" "$LINENO" 5
-      fi
-    else
-      ac_fn_c_check_func "$LINENO" "compress2" "ac_cv_func_compress2"
-if test "x$ac_cv_func_compress2" = xyes; then :
-  HAVE_COMPRESS2="yes"
-fi
-
-    fi
-    ;;
-  no)
-    HAVE_ZLIB="no"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU zlib" >&5
-$as_echo_n "checking for GNU zlib... " >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: suppressed" >&5
-$as_echo "suppressed" >&6; }
-    ;;
-  *)
-    HAVE_ZLIB="yes"
-    case "$withval" in
-      *,*)
-        zlib_inc="`echo $withval | cut -f1 -d,`"
-        zlib_lib="`echo $withval | cut -f2 -d, -s`"
-        ;;
-      *)
-        if test -n "$withval"; then
-          zlib_inc="$withval/include"
-          zlib_lib="$withval/lib"
-        fi
-        ;;
-    esac
-
-    ## Trying to include -I/usr/include and -L/usr/lib is redundant and
-    ## can mess some compilers up.
-    if test "X$zlib_inc" = "X/usr/include"; then
-      zlib_inc=""
-    fi
-    if test "X$zlib_lib" = "X/usr/lib"; then
-      zlib_lib=""
-    fi
-
-    saved_CPPFLAGS="$CPPFLAGS"
-    saved_AM_CPPFLAGS="$AM_CPPFLAGS"
-    saved_LDFLAGS="$LDFLAGS"
-    saved_AM_LDFLAGS="$AM_LDFLAGS"
-
-    if test -n "$zlib_inc"; then
-      CPPFLAGS="$CPPFLAGS -I$zlib_inc"
-      AM_CPPFLAGS="$AM_CPPFLAGS -I$zlib_inc"
-    fi
-
-    for ac_header in zlib.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_zlib_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_ZLIB_H 1
-_ACEOF
- HAVE_ZLIB_H="yes"
-else
-  CPPFLAGS="$saved_CPPFLAGS"; AM_CPPFLAGS="$saved_AM_CPPFLAGS" unset HAVE_ZLIB
-fi
-
-done
-
-
-    if test -n "$zlib_lib"; then
-      LDFLAGS="$LDFLAGS -L$zlib_lib"
-      AM_LDFLAGS="$AM_LDFLAGS -L$zlib_lib"
-    fi
-
-    if test "x$HAVE_ZLIB" = "xyes" -a "x$HAVE_ZLIB_H" = "xyes"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress2 in -lz" >&5
-$as_echo_n "checking for compress2 in -lz... " >&6; }
-if ${ac_cv_lib_z_compress2+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lz  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char compress2 ();
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-return compress2 ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_z_compress2=yes
-else
-  ac_cv_lib_z_compress2=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_compress2" >&5
-$as_echo "$ac_cv_lib_z_compress2" >&6; }
-if test "x$ac_cv_lib_z_compress2" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBZ 1
-_ACEOF
-
-  LIBS="-lz $LIBS"
-
-else
-  LDFLAGS="$saved_LDFLAGS"; AM_LDFLAGS="$saved_AM_LDFLAGS"; unset HAVE_ZLIB
-fi
-
-    fi
-
-    if test -z "$HAVE_ZLIB"; then
-      if test -n "$HDF5_CONFIG_ABORT"; then
-        as_fn_error $? "couldn't find zlib library" "$LINENO" 5
-      fi
-    else
-      ac_fn_c_check_func "$LINENO" "compress2" "ac_cv_func_compress2"
-if test "x$ac_cv_func_compress2" = xyes; then :
-  HAVE_COMPRESS2="yes"
-fi
-
-    fi
-    ;;
-esac
-
-if test "x$HAVE_ZLIB" = "xyes" -a "x$HAVE_ZLIB_H" = "xyes" -a "x$HAVE_COMPRESS2" = "xyes"; then
-
-$as_echo "#define HAVE_FILTER_DEFLATE 1" >>confdefs.h
-
-  USE_FILTER_DEFLATE="yes"
-
-  ## Add "deflate" to external filter list
-  if test "X$EXTERNAL_FILTERS" != "X"; then
-    EXTERNAL_FILTERS="${EXTERNAL_FILTERS},"
-  fi
-  EXTERNAL_FILTERS="${EXTERNAL_FILTERS}deflate(zlib)"
-fi
-
-
-## ----------------------------------------------------------------------
-## Is the szlib present? It has a header file `szlib.h' and a library
-## `-lsz' and their locations might be specified with the `--with-szlib'
-## command-line switch. The value is an include path and/or a library path.
-## If the library path is specified then it must be preceded by a comma.
-##
- USE_FILTER_SZIP="no"
-
-# Check whether --with-szlib was given.
-if test "${with_szlib+set}" = set; then :
-  withval=$with_szlib;
-else
-  withval=no
-fi
-
-
-case $withval in
-  yes)
-    HAVE_SZLIB="yes"
-    for ac_header in szlib.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "szlib.h" "ac_cv_header_szlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_szlib_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SZLIB_H 1
-_ACEOF
- HAVE_SZLIB_H="yes"
-else
-  unset HAVE_SZLIB
-fi
-
-done
-
-    if test "x$HAVE_SZLIB" = "xyes" -a "x$HAVE_SZLIB_H" = "xyes"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SZ_BufftoBuffCompress in -lsz" >&5
-$as_echo_n "checking for SZ_BufftoBuffCompress in -lsz... " >&6; }
-if ${ac_cv_lib_sz_SZ_BufftoBuffCompress+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsz  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char SZ_BufftoBuffCompress ();
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-return SZ_BufftoBuffCompress ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_sz_SZ_BufftoBuffCompress=yes
-else
-  ac_cv_lib_sz_SZ_BufftoBuffCompress=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sz_SZ_BufftoBuffCompress" >&5
-$as_echo "$ac_cv_lib_sz_SZ_BufftoBuffCompress" >&6; }
-if test "x$ac_cv_lib_sz_SZ_BufftoBuffCompress" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBSZ 1
-_ACEOF
-
-  LIBS="-lsz $LIBS"
-
-else
-  unset HAVE_SZLIB
-fi
-
-    fi
-    if test -z "$HAVE_SZLIB" -a -n "$HDF5_CONFIG_ABORT"; then
-      as_fn_error $? "couldn't find szlib library" "$LINENO" 5
-    fi
-    ;;
-  no)
-    HAVE_SZLIB="no"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for szlib" >&5
-$as_echo_n "checking for szlib... " >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: suppressed" >&5
-$as_echo "suppressed" >&6; }
-    ;;
-  *)
-    HAVE_SZLIB="yes"
-    case "$withval" in
-      *,*)
-        szlib_inc="`echo $withval |cut -f1 -d,`"
-        szlib_lib="`echo $withval |cut -f2 -d, -s`"
-        ;;
-      *)
-        if test -n "$withval"; then
-          szlib_inc="$withval/include"
-          szlib_lib="$withval/lib"
-        fi
-        ;;
-    esac
-
-    ## Trying to include -I/usr/include and -L/usr/lib is redundant and
-    ## can mess some compilers up.
-    if test "X$szlib_inc" = "X/usr/include"; then
-      szlib_inc=""
-    fi
-    if test "X$szlib_lib" = "X/usr/lib"; then
-      szlib_lib=""
-    fi
-
-    saved_CPPFLAGS="$CPPFLAGS"
-    saved_AM_CPPFLAGS="$AM_CPPFLAGS"
-    saved_LDFLAGS="$LDFLAGS"
-    saved_AM_LDFLAGS="$AM_LDFLAGS"
-
-    if test -n "$szlib_inc"; then
-      CPPFLAGS="$CPPFLAGS -I$szlib_inc"
-      AM_CPPFLAGS="$AM_CPPFLAGS -I$szlib_inc"
-    fi
-
-    for ac_header in szlib.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "szlib.h" "ac_cv_header_szlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_szlib_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SZLIB_H 1
-_ACEOF
- HAVE_SZLIB_H="yes"
-else
-  CPPFLAGS="$saved_CPPFLAGS"; AM_CPPFLAGS="$saved_AM_CPPFLAGS" unset HAVE_SZLIB
-fi
-
-done
-
-
-    if test -n "$szlib_lib"; then
-      LDFLAGS="$LDFLAGS -L$szlib_lib"
-      AM_LDFLAGS="$AM_LDFLAGS -L$szlib_lib"
-    fi
-
-    if test "x$HAVE_SZLIB" = "xyes" -a "x$HAVE_SZLIB_H" = "xyes"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SZ_BufftoBuffCompress in -lsz" >&5
-$as_echo_n "checking for SZ_BufftoBuffCompress in -lsz... " >&6; }
-if ${ac_cv_lib_sz_SZ_BufftoBuffCompress+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsz  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char SZ_BufftoBuffCompress ();
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-return SZ_BufftoBuffCompress ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_sz_SZ_BufftoBuffCompress=yes
-else
-  ac_cv_lib_sz_SZ_BufftoBuffCompress=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sz_SZ_BufftoBuffCompress" >&5
-$as_echo "$ac_cv_lib_sz_SZ_BufftoBuffCompress" >&6; }
-if test "x$ac_cv_lib_sz_SZ_BufftoBuffCompress" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBSZ 1
-_ACEOF
-
-  LIBS="-lsz $LIBS"
-
-else
-  LDFLAGS="$saved_LDFLAGS"; AM_LDFLAGS="$saved_AM_LDFLAGS"; unset HAVE_SZLIB
-fi
-
-    fi
-
-    if test -z "$HAVE_SZLIB" -a -n "$HDF5_CONFIG_ABORT"; then
-      as_fn_error $? "couldn't find szlib library" "$LINENO" 5
-    fi
-    ;;
-esac
-
-if test "x$HAVE_SZLIB" = "xyes" -a "x$HAVE_SZLIB_H" = "xyes"; then
-  ## SZLIB library is available.  Check if it can encode
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for szlib encoder" >&5
-$as_echo_n "checking for szlib encoder... " >&6; }
-
-  ## Set LD_LIBRARY_PATH so encoder test can find the library and run.
-  ## Also add LL_PATH substitution to Makefiles so they can use the
-  ## path as well, for testing examples.
-  if test -z "$LD_LIBRARY_PATH"; then
-    export LD_LIBRARY_PATH="$szlib_lib"
-  else
-    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$szlib_lib"
-  fi
-
-   LL_PATH="$LD_LIBRARY_PATH"
-
-  if ${hdf5_cv_szlib_can_encode+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-        #include <szlib.h>
-
-        int main(void)
-        {
-                /* SZ_encoder_enabled returns 1 if encoder is present */
-            if(SZ_encoder_enabled() == 1)
-                exit(0);
-            else
-                exit(1);
-        }
-
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  hdf5_cv_szlib_can_encode=yes
-else
-  hdf5_cv_szlib_can_encode=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-
-
-
-$as_echo "#define HAVE_FILTER_SZIP 1" >>confdefs.h
-
-  USE_FILTER_SZIP="yes"
-
-  if test ${hdf5_cv_szlib_can_encode} = "yes"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  fi
-  if test ${hdf5_cv_szlib_can_encode} = "no"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  fi
-
-  ## Add "szip" to external filter list
-  if test ${hdf5_cv_szlib_can_encode} = "yes"; then
-    if test "X$EXTERNAL_FILTERS" != "X"; then
-      EXTERNAL_FILTERS="${EXTERNAL_FILTERS},"
-    fi
-    EXTERNAL_FILTERS="${EXTERNAL_FILTERS}szip(encoder)"
-  fi
-  if test ${hdf5_cv_szlib_can_encode} = "no"; then
-    if test "X$EXTERNAL_FILTERS" != "X"; then
-      EXTERNAL_FILTERS="${EXTERNAL_FILTERS},"
-    fi
-    EXTERNAL_FILTERS="${EXTERNAL_FILTERS}szip(no encoder)"
-  fi
-fi
-
- if test "X$USE_FILTER_SZIP" = "Xyes" && test "X$LL_PATH" != "X"; then
-  BUILD_SHARED_SZIP_CONDITIONAL_TRUE=
-  BUILD_SHARED_SZIP_CONDITIONAL_FALSE='#'
-else
-  BUILD_SHARED_SZIP_CONDITIONAL_TRUE='#'
-  BUILD_SHARED_SZIP_CONDITIONAL_FALSE=
-fi
-
-
-## Checkpoint the cache
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes: double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \.
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
-  sed '
-     /^ac_cv_env_/b end
-     t clear
-     :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    if test "x$cache_file" != "x/dev/null"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
-      if test ! -f "$cache_file" || test -h "$cache_file"; then
-	cat confcache >"$cache_file"
-      else
-        case $cache_file in #(
-        */* | ?:*)
-	  mv -f confcache "$cache_file"$$ &&
-	  mv -f "$cache_file"$$ "$cache_file" ;; #(
-        *)
-	  mv -f confcache "$cache_file" ;;
-	esac
-      fi
-    fi
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-  fi
-fi
-rm -f confcache
-
-## ----------------------------------------------------------------------
-## Enable thread-safe version of library.  It requires Pthreads support
-## on POSIX systems.
-##
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for thread safe support" >&5
-$as_echo_n "checking for thread safe support... " >&6; }
-# Check whether --enable-threadsafe was given.
-if test "${enable_threadsafe+set}" = set; then :
-  enableval=$enable_threadsafe; THREADSAFE=$enableval
-fi
-
-
-## NOTE: The high-level, C++, and Fortran interfaces are not compatible
-## with the thread-safety option because the lock is not hoisted
-## into the higher-level API calls.
-
-## The --enable-threadsafe flag is not compatible with --enable-cxx.
-## If the user tried to specify both flags, throw an error, unless
-## they also provided the --enable-unsupported flag.
-if test "X${ALLOW_UNSUPPORTED}" != "Xyes"; then
-  if test "X${HDF_CXX}" = "Xyes" -a "X${enable_threadsafe}" = "Xyes"; then
-    as_fn_error $? "--enable-cxx and --enable-threadsafe flags are incompatible. Use --enable-unsupported to override this error." "$LINENO" 5
-  fi
-fi
-
-## --enable-threadsafe is also incompatible with --enable-fortran unless
-## --enable-unsupported has been specified on the configure line.
-if test "X${ALLOW_UNSUPPORTED}" != "Xyes"; then
-  if test "X${HDF_FORTRAN}" = "Xyes" -a "X${enable_threadsafe}" = "Xyes"; then
-    as_fn_error $? "--enable-fortran and --enable-threadsafe flags are incompatible. Use --enable-unsupported to override this error." "$LINENO" 5
-  fi
-fi
-
-
-case "X-$THREADSAFE" in
-  X-|X-no)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    ;;
-  X-yes)
-    THREADSAFE=yes
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-    ;;
-  *)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: error" >&5
-$as_echo "error" >&6; }
-    as_fn_error $? "\'$enableval\' is not a valid threadsafe type" "$LINENO" 5
-    ;;
-esac
-
-if test "X$THREADSAFE" = "Xyes"; then
-
-$as_echo "#define HAVE_THREADSAFE 1" >>confdefs.h
-
-
-    ## ----------------------------------------------------------------------
-    ## Is the Pthreads library present?  It has a header file `pthread.h' and
-    ## a library `-lpthread' and their locations might be specified with the
-    ## `--with-pthread' command-line switch.  The value is an include path
-    ## and/or a library path.  If the library path is specified then it must
-    ## be preceded by a comma.
-    ##
-    ## Thread-safety in HDF5 only uses Pthreads via configure, so the
-    ## default is "check", though this only has an effect when
-    ## --enable-threadsafe is specified.
-     HAVE_PTHREAD=yes
-
-# Check whether --with-pthread was given.
-if test "${with_pthread+set}" = set; then :
-  withval=$with_pthread;
-else
-  withval=check
-fi
-
-
-    case "$withval" in
-      check | yes)
-        for ac_header in pthread.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
-if test "x$ac_cv_header_pthread_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_PTHREAD_H 1
-_ACEOF
-
-else
-  unset HAVE_PTHREAD
-fi
-
-done
-
-        if test "x$HAVE_PTHREAD" = "xyes"; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_self in -lpthread" >&5
-$as_echo_n "checking for pthread_self in -lpthread... " >&6; }
-if ${ac_cv_lib_pthread_pthread_self+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char pthread_self ();
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-return pthread_self ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_pthread_pthread_self=yes
-else
-  ac_cv_lib_pthread_pthread_self=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_self" >&5
-$as_echo "$ac_cv_lib_pthread_pthread_self" >&6; }
-if test "x$ac_cv_lib_pthread_pthread_self" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBPTHREAD 1
-_ACEOF
-
-  LIBS="-lpthread $LIBS"
-
-else
-  unset HAVE_PTHREAD
-fi
-
-        fi
-        ;;
-      no)
-        as_fn_error $? "Must use Pthreads with thread safety" "$LINENO" 5
-        ;;
-      *)
-        case "$withval" in
-          *,*)
-            pthread_inc="`echo $withval | cut -f1 -d,`"
-            pthread_lib="`echo $withval | cut -f2 -d, -s`"
-            ;;
-          *)
-            if test -n "$withval"; then
-              pthread_inc="$withval/include"
-              pthread_lib="$withval/lib"
-            fi
-            ;;
-        esac
-
-        ## Trying to include -I/usr/include and -L/usr/lib is redundant and
-        ## can mess some compilers up.
-        if test "X$pthread_inc" = "X/usr/include"; then
-          pthread_inc=""
-        fi
-        if test "X$pthread_lib" = "X/usr/lib"; then
-          pthread_lib=""
-        fi
-
-        if test -n "$pthread_inc"; then
-          saved_CPPFLAGS="$CPPFLAGS"
-          saved_AM_CPPFLAGS="$AM_CPPFLAGS"
-          CPPFLAGS="$CPPFLAGS -I$pthread_inc"
-          AM_CPPFLAGS="$AM_CPPFLAGS -I$pthread_inc"
-          for ac_header in pthread.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
-if test "x$ac_cv_header_pthread_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_PTHREAD_H 1
-_ACEOF
-
-else
-  CPPFLAGS="$saved_CPPFLAGS"; AM_CPPFLAGS="$saved_AM_CPPFLAGS"; unset HAVE_PTHREAD
-fi
-
-done
-
-        else
-          for ac_header in pthread.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
-if test "x$ac_cv_header_pthread_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_PTHREAD_H 1
-_ACEOF
-
-else
-  unset HAVE_PTHREAD
-fi
-
-done
-
-        fi
-
-        if test "x$HAVE_PTHREAD" = "xyes"; then
-          if test -n "$pthread_lib"; then
-            saved_LDFLAGS="$LDFLAGS"
-            saved_AM_LDFLAGS="$AM_LDFLAGS"
-            LDFLAGS="$LDFLAGS -L$pthread_lib"
-            AM_LDFLAGS="$AM_LDFLAGS -L$pthread_lib"
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_self in -lpthread" >&5
-$as_echo_n "checking for pthread_self in -lpthread... " >&6; }
-if ${ac_cv_lib_pthread_pthread_self+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char pthread_self ();
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-return pthread_self ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_pthread_pthread_self=yes
-else
-  ac_cv_lib_pthread_pthread_self=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_self" >&5
-$as_echo "$ac_cv_lib_pthread_pthread_self" >&6; }
-if test "x$ac_cv_lib_pthread_pthread_self" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBPTHREAD 1
-_ACEOF
-
-  LIBS="-lpthread $LIBS"
-
-else
-  LDFLAGS="$saved_LDFLAGS"; AM_LDFLAGS="$saved_AM_LDFLAGS"; unset HAVE_PTHREAD
-fi
-
-          else
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_self in -lpthread" >&5
-$as_echo_n "checking for pthread_self in -lpthread... " >&6; }
-if ${ac_cv_lib_pthread_pthread_self+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char pthread_self ();
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-return pthread_self ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_pthread_pthread_self=yes
-else
-  ac_cv_lib_pthread_pthread_self=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_self" >&5
-$as_echo "$ac_cv_lib_pthread_pthread_self" >&6; }
-if test "x$ac_cv_lib_pthread_pthread_self" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBPTHREAD 1
-_ACEOF
-
-  LIBS="-lpthread $LIBS"
-
-else
-  unset HAVE_PTHREAD
-fi
-
-          fi
-        fi
-        ;;
-    esac
-
-    ## ----------------------------------------------------------------------
-    ## Check if pthread_attr_setscope(&attribute, PTHREAD_SCOPE_SYSTEM)
-    ## is supported on this system
-    ##
-    ## Unfortunately, this probably needs to be an AC_RUN_IFELSE since
-    ## it's impossible to determine if PTHREAD_SCOPE_SYSTEM is
-    ## supported a priori. POSIX.1-2001 requires that a conformant
-    ## system need only support one of SYSTEM or PROCESS scopes.
-    ##
-    ## For cross-compiling, we've added a pessimistic 'no'. You can
-    ## hand-hack the config file if you know otherwise.
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking Pthreads supports system scope" >&5
-$as_echo_n "checking Pthreads supports system scope... " >&6; }
-    if ${hdf5_cv_system_scope_threads+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  hdf5_cv_system_scope_threads=no
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-            #if STDC_HEADERS
-            #include <stdlib.h>
-            #include <pthread.h>
-            #endif
-
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-
-            int main(void)
-            {
-              pthread_attr_t attribute;
-              int ret;
-
-              pthread_attr_init(&attribute);
-              ret=pthread_attr_setscope(&attribute, PTHREAD_SCOPE_SYSTEM);
-              exit(ret==0 ? 0 : 1);
-            }
-
-  ;
-  return 0;
-}
-
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  hdf5_cv_system_scope_threads=yes
-else
-  hdf5_cv_system_scope_threads=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-
-
-    if test ${hdf5_cv_system_scope_threads} = "yes"; then
-
-$as_echo "#define SYSTEM_SCOPE_THREADS 1" >>confdefs.h
-
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Always 'no' if cross-compiling. Edit the config file if your platform supports pthread_attr_setscope(&attribute, PTHREAD_SCOPE_SYSTEM)." >&5
-$as_echo "$as_me: Always 'no' if cross-compiling. Edit the config file if your platform supports pthread_attr_setscope(&attribute, PTHREAD_SCOPE_SYSTEM)." >&6;}
-    fi
-fi
-
-## ----------------------------------------------------------------------
-## Check for MONOTONIC_TIMER support (used in clock_gettime).  This has
-## to be done after any POSIX/BSD defines to ensure that the test gets
-## the correct POSIX level on linux.
-ac_fn_c_check_decl "$LINENO" "CLOCK_MONOTONIC" "ac_cv_have_decl_CLOCK_MONOTONIC" "#include <time.h>
-"
-if test "x$ac_cv_have_decl_CLOCK_MONOTONIC" = xyes; then :
-  have_clock_monotonic="yes"
-else
-  have_clock_monotonic="no"
-fi
-
-
-## ----------------------------------------------------------------------
-## How does one figure out the local time zone?  Anyone know of a
-## Posix way to do this?
-##
-
-## First check if `struct tm' has a `tm_gmtoff' member.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tm_gmtoff in struct tm" >&5
-$as_echo_n "checking for tm_gmtoff in struct tm... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-  #include <sys/time.h>
-  #include <time.h>
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-struct tm tm; tm.tm_gmtoff=0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-$as_echo "#define HAVE_TM_GMTOFF 1" >>confdefs.h
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-## Check whether the global variable `timezone' is defined.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for global timezone variable" >&5
-$as_echo_n "checking for global timezone variable... " >&6; }
-
-case "`uname`" in
-  CYGWIN*)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled in CYGWIN" >&5
-$as_echo "disabled in CYGWIN" >&6; }
-    ;;
-  *)
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-    #include <sys/time.h>
-    #include <time.h>
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-timezone=0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-
-$as_echo "#define HAVE_TIMEZONE 1" >>confdefs.h
-
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-    ;;
-esac
-
-
-## ----------------------------------------------------------------------
-## Does the struct stat have the st_blocks field?  This field is not Posix.
-##
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for st_blocks in struct stat" >&5
-$as_echo_n "checking for st_blocks in struct stat... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-  #include <sys/stat.h>
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-struct stat sb; sb.st_blocks=0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-$as_echo "#define HAVE_STAT_ST_BLOCKS 1" >>confdefs.h
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-## ----------------------------------------------------------------------
-## How do we figure out the width of a tty in characters?
-##
-for ac_func in _getvideoconfig gettextinfo
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-case "`uname`" in
-  CYGWIN*)
-    ;;
-  *)
-    for ac_func in GetConsoleScreenBufferInfo
-do :
-  ac_fn_c_check_func "$LINENO" "GetConsoleScreenBufferInfo" "ac_cv_func_GetConsoleScreenBufferInfo"
-if test "x$ac_cv_func_GetConsoleScreenBufferInfo" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_GETCONSOLESCREENBUFFERINFO 1
-_ACEOF
-
-fi
-done
-
-    ;;
-esac
-for ac_func in _scrsize ioctl
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct videoconfig" >&5
-$as_echo_n "checking for struct videoconfig... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-struct videoconfig w; w.numtextcols=0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-$as_echo "#define HAVE_STRUCT_VIDEOCONFIG 1" >>confdefs.h
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct text_info" >&5
-$as_echo_n "checking for struct text_info... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-struct text_info w; w.screenwidth=0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-$as_echo "#define HAVE_STRUCT_TEXT_INFO 1" >>confdefs.h
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIOCGWINSZ" >&5
-$as_echo_n "checking for TIOCGWINSZ... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/ioctl.h>
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-int w=TIOCGWINSZ;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-$as_echo "#define HAVE_TIOCGWINSZ 1" >>confdefs.h
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIOCGETD" >&5
-$as_echo_n "checking for TIOCGETD... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/ioctl.h>
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-int w=TIOCGETD;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-$as_echo "#define HAVE_TIOCGETD 1" >>confdefs.h
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
-## ----------------------------------------------------------------------
-## Check for functions.
-##
-## NOTE: clock_gettime may require linking to the rt or posix4 library
-##       so we'll search for it before calling AC_CHECK_FUNCS.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5
-$as_echo_n "checking for library containing clock_gettime... " >&6; }
-if ${ac_cv_search_clock_gettime+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char clock_gettime ();
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-return clock_gettime ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' rt posix4; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_clock_gettime=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_clock_gettime+:} false; then :
-  break
-fi
-done
-if ${ac_cv_search_clock_gettime+:} false; then :
-
-else
-  ac_cv_search_clock_gettime=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_clock_gettime" >&5
-$as_echo "$ac_cv_search_clock_gettime" >&6; }
-ac_res=$ac_cv_search_clock_gettime
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-fi
-
-for ac_func in alarm clock_gettime difftime fork frexpf frexpl
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-for ac_func in gethostname getpwuid getrusage gettimeofday
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-for ac_func in lstat rand_r random setsysinfo
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-for ac_func in signal longjmp setjmp siglongjmp sigsetjmp sigprocmask
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-for ac_func in snprintf srandom strdup symlink system
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-for ac_func in tmpfile asprintf vasprintf waitpid
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-## Check for vsnprintf() separately, so we can detect situations where it
-## doesn't return the correct size for formatted strings that are too large
-## for the buffer provided
-for ac_func in vsnprintf
-do :
-  ac_fn_c_check_func "$LINENO" "vsnprintf" "ac_cv_func_vsnprintf"
-if test "x$ac_cv_func_vsnprintf" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_VSNPRINTF 1
-_ACEOF
- ## Check if vsnprintf() returns correct size for strings that don't fit
-    ## into the size allowed.  If vsnprintf() works correctly on this platform,
-    ## it should return a value of 42 for the test below
-    ##
-    ## Note that vsnprintf fails in two different ways:
-    ##         - In IRIX64, calls to vnsprintf() with a formatted string that
-    ##                 is larger than the buffer size allowed incorrectly
-    ##                 return the size of the buffer minus one.
-    ##         - In HP/UX, calls to vsnprintf() with a formatted string that
-    ##                 is larger than the buffer size allowed incorrectly
-    ##                 return (-1)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if vsnprintf returns correct value" >&5
-$as_echo_n "checking if vsnprintf returns correct value... " >&6; }
-
-    if ${hdf5_cv_vsnprintf_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-
-int test_vsnprintf(const char *fmt,...)
-{
-    va_list     ap;
-    char *s = malloc(16);
-    int ret;
-
-    va_start(ap, fmt);
-    ret=vsnprintf(s,16,"%s",ap);
-    va_end(ap);
-
-    return(ret!=42 ? 1 : 0);
-}
-
-int main(void)
-{
-    exit(test_vsnprintf("%s","A string that is longer than 16 characters"));
-}
-
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  hdf5_cv_vsnprintf_works=yes
-else
-  hdf5_cv_vsnprintf_works=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-
-
-       if test ${hdf5_cv_vsnprintf_works} = "yes"; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define VSNPRINTF_WORKS 1" >>confdefs.h
-
-       else
-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-       fi
-
-fi
-done
-
-
-## ----------------------------------------------------------------------
-## Check that a lone colon can be used as an argument
-## This is not true on Cray X1, which interprets a lone colon as a
-## system command.
-##
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if lone colon can be used as an argument" >&5
-$as_echo_n "checking if lone colon can be used as an argument... " >&6; }
-if ${hdf5_cv_lone_colon+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  echo "int main(int argc, char * argv) {return 0;}" > conftest.c
-  $CC $CFLAGS conftest.c -o a.out> /dev/null 2> /dev/null
-  echo "./a.out :" > conftest.sh
-  chmod 700 conftest.sh
-
-  ./conftest.sh 2> conftest.out
-  rm -f a.out
-  TEST_OUTPUT=`cat conftest.out`
-
-  if test "X$TEST_OUTPUT" = "X"; then
-    hdf5_cv_lone_colon=yes
-  else
-    hdf5_cv_lone_colon=no
-  fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hdf5_cv_lone_colon" >&5
-$as_echo "$hdf5_cv_lone_colon" >&6; }
-
- H5_LONE_COLON="$hdf5_cv_lone_colon"
-
-## ----------------------------------------------------------------------
-## Check compiler characteristics
-##
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
-$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
-if ${ac_cv_c_const+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-
-#ifndef __cplusplus
-  /* Ultrix mips cc rejects this sort of thing.  */
-  typedef int charset[2];
-  const charset cs = { 0, 0 };
-  /* SunOS 4.1.1 cc rejects this.  */
-  char const *const *pcpcc;
-  char **ppc;
-  /* NEC SVR4.0.2 mips cc rejects this.  */
-  struct point {int x, y;};
-  static struct point const zero = {0,0};
-  /* AIX XL C 1.02.0.0 rejects this.
-     It does not let you subtract one const X* pointer from another in
-     an arm of an if-expression whose if-part is not a constant
-     expression */
-  const char *g = "string";
-  pcpcc = &g + (g ? g-g : 0);
-  /* HPUX 7.0 cc rejects these. */
-  ++pcpcc;
-  ppc = (char**) pcpcc;
-  pcpcc = (char const *const *) ppc;
-  { /* SCO 3.2v4 cc rejects this sort of thing.  */
-    char tx;
-    char *t = &tx;
-    char const *s = 0 ? (char *) 0 : (char const *) 0;
-
-    *t++ = 0;
-    if (s) return 0;
-  }
-  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
-    int x[] = {25, 17};
-    const int *foo = &x[0];
-    ++foo;
-  }
-  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-    typedef const int *iptr;
-    iptr p = 0;
-    ++p;
-  }
-  { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
-       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-    struct s { int j; const int *ap[3]; } bx;
-    struct s *b = &bx; b->j = 5;
-  }
-  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-    const int foo = 10;
-    if (!foo) return 0;
-  }
-  return !cs[0] && !zero.x;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_const=yes
-else
-  ac_cv_c_const=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
-$as_echo "$ac_cv_c_const" >&6; }
-if test $ac_cv_c_const = no; then
-
-$as_echo "#define const /**/" >>confdefs.h
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
-$as_echo_n "checking for inline... " >&6; }
-if ${ac_cv_c_inline+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_c_inline=no
-for ac_kw in inline __inline__ __inline; do
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifndef __cplusplus
-typedef int foo_t;
-static $ac_kw foo_t static_foo () {return 0; }
-$ac_kw foo_t foo () {return 0; }
-#endif
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_inline=$ac_kw
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  test "$ac_cv_c_inline" != no && break
-done
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
-$as_echo "$ac_cv_c_inline" >&6; }
-
-case $ac_cv_c_inline in
-  inline | yes) ;;
-  *)
-    case $ac_cv_c_inline in
-      no) ac_val=;;
-      *) ac_val=$ac_cv_c_inline;;
-    esac
-    cat >>confdefs.h <<_ACEOF
-#ifndef __cplusplus
-#define inline $ac_val
-#endif
-_ACEOF
-    ;;
-esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__ extension" >&5
-$as_echo_n "checking for __attribute__ extension... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-int __attribute__((unused)) x
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-$as_echo "#define HAVE_ATTRIBUTE 1" >>confdefs.h
-
-                 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __func__ extension" >&5
-$as_echo_n "checking for __func__ extension... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
- const char *fname = __func__;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-$as_echo "#define HAVE_C99_FUNC 1" >>confdefs.h
-
-                 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __FUNCTION__ extension" >&5
-$as_echo_n "checking for __FUNCTION__ extension... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
- const char *fname = __FUNCTION__;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-$as_echo "#define HAVE_FUNCTION 1" >>confdefs.h
-
-                 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 designated initialization support" >&5
-$as_echo_n "checking for C99 designated initialization support... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-
-                typedef struct {
-                    int x;
-                    union {
-                        int i;
-                        double d;
-                    } u;
-                } di_struct_t;
-                di_struct_t x = {0, { .d = 0.0}};
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-$as_echo "#define HAVE_C99_DESIGNATED_INITIALIZER 1" >>confdefs.h
-
-                 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-## ----------------------------------------------------------------------
-## Try to figure out how to print `long long'.  Some machines use `%lld'
-## and others use `%qd'.  There may be more!  The final `l' is a
-## default in case none of the others work.
-##
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print long long" >&5
-$as_echo_n "checking how to print long long... " >&6; }
-if ${hdf5_cv_printf_ll+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-
-for hdf5_cv_printf_ll in l ll L q unknown; do
-   if test "$cross_compiling" = yes; then :
-  continue
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-     #include <stdio.h>
-     #include <stdlib.h>
-     #include <string.h>
-
-     int main(void)
-     {
-	char *s = malloc(128);
-	long long x = (long long)1048576 * (long long)1048576;
-	sprintf(s,"%${hdf5_cv_printf_ll}d",x);
-	exit(strcmp(s,"1099511627776"));
-     }
-
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  break
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-done
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: %${hdf5_cv_printf_ll}d and %${hdf5_cv_printf_ll}u" >&5
-$as_echo "%${hdf5_cv_printf_ll}d and %${hdf5_cv_printf_ll}u" >&6; }
-
-cat >>confdefs.h <<_ACEOF
-#define PRINTF_LL_WIDTH "$hdf5_cv_printf_ll"
-_ACEOF
-
-
-
-## ----------------------------------------------------------------------
-## Turn on debugging by setting compiler flags
-## This must come after the enable-production since it depends on production.
-##
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for debug flags" >&5
-$as_echo_n "checking for debug flags... " >&6; }
-# Check whether --enable-debug was given.
-if test "${enable_debug+set}" = set; then :
-  enableval=$enable_debug; DEBUG_PKG=$enableval
-fi
-
-
-## Default to no if producton is enabled
-if test "X-$DEBUG_PKG" = X- ; then
-    if test "$enable_production" = yes ; then
-	DEBUG_PKG=no
-    else
-	DEBUG_PKG=yes
-    fi
-fi
-
-
-all_packages="ac,b,b2,d,e,f,g,hg,hl,i,mf,mm,o,p,s,t,v,z"
-case "X-$DEBUG_PKG" in
-  X-yes)
-    DEBUG_PKG="d,e,f,g,hg,i,mm,o,p,s,t,v,z"
-    H5_CPPFLAGS="$H5_CPPFLAGS -UNDEBUG"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: default ($DEBUG_PKG)" >&5
-$as_echo "default ($DEBUG_PKG)" >&6; }
-    ;;
-  X-all)
-    DEBUG_PKG=$all_packages
-    H5_CPPFLAGS="$H5_CPPFLAGS -UNDEBUG"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: all ($DEBUG_PKG)" >&5
-$as_echo "all ($DEBUG_PKG)" >&6; }
-    ;;
-  X-no|X-none)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
-$as_echo "none" >&6; }
-    DEBUG_PKG=
-    H5_CPPFLAGS="$H5_CPPFLAGS -DNDEBUG"
-    ;;
-  *)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEBUG_PKG" >&5
-$as_echo "$DEBUG_PKG" >&6; }
-    ;;
-esac
-
-if test -n "$DEBUG_PKG"; then
-  for pkg in `echo $DEBUG_PKG | ${TR} ${as_cr_letters}"," ${as_cr_LETTERS}" "`; do
-    H5_CPPFLAGS="$H5_CPPFLAGS -DH5${pkg}_DEBUG"
-  done
-fi
-
-## ----------------------------------------------------------------------
-## Check if they would like the function stack support compiled in
-##
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether function stack tracking is enabled" >&5
-$as_echo_n "checking whether function stack tracking is enabled... " >&6; }
-# Check whether --enable-codestack was given.
-if test "${enable_codestack+set}" = set; then :
-  enableval=$enable_codestack; CODESTACK=$enableval
-fi
-
-
-case "X-$CODESTACK" in
-  X-yes)
-      CODESTACK=yes
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define HAVE_CODESTACK 1" >>confdefs.h
-
-    ;;
-  *)
-      CODESTACK=no
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    ;;
-esac
-
-## ----------------------------------------------------------------------
-## Check if they would like the metadata trace file code compiled in
-##
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether metadata trace file code is enabled" >&5
-$as_echo_n "checking whether metadata trace file code is enabled... " >&6; }
-# Check whether --enable-metadata-trace-file was given.
-if test "${enable_metadata_trace_file+set}" = set; then :
-  enableval=$enable_metadata_trace_file; METADATATRACEFILE=$enableval
-fi
-
-
-case "X-$METADATATRACEFILE" in
-  X-yes)
-      METADATATRACEFILE=yes
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define METADATA_TRACE_FILE 1" >>confdefs.h
-
-    ;;
-  *)
-      METADATATRACEFILE=no
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    ;;
-esac
-
-## ----------------------------------------------------------------------
-## Enable tracing of the API
-## This must come after the enable-debug since it depends on debug.
-##
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for API tracing" >&5
-$as_echo_n "checking for API tracing... " >&6; };
-# Check whether --enable-trace was given.
-if test "${enable_trace+set}" = set; then :
-  enableval=$enable_trace; TRACE=$enableval
-fi
-
-
-## Default to no if debug is disabled
-if test "X-$TRACE" = X- ; then
-  if test -z "$DEBUG_PKG" ; then
-    TRACE=no
-  else
-    TRACE=yes
-  fi
-fi
-
-case "X-$TRACE" in
-  X-yes)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-    TRACE_API=yes
-    H5_CPPFLAGS="$H5_CPPFLAGS -DH5_DEBUG_API"
-    ;;
-  X-no|*)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    TRACE_API=no
-    H5_CPPFLAGS="$H5_CPPFLAGS -UH5_DEBUG_API"
-    ;;
-esac
-
-## ----------------------------------------------------------------------
-## Enable instrumenting of the library's internal operations
-## This must come after the enable-debug since it depends on debug.
-##
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for instrumented library" >&5
-$as_echo_n "checking for instrumented library... " >&6; };
-# Check whether --enable-instrument was given.
-if test "${enable_instrument+set}" = set; then :
-  enableval=$enable_instrument; INSTRUMENT=$enableval
-fi
-
-
-## Default to no if debug is disabled
-if test "X-$INSTRUMENT" = X- ; then
-  if test -z "$DEBUG_PKG" ; then
-    INSTRUMENT=no
-  else
-    INSTRUMENT=yes
-  fi
-fi
-
-case "X-$INSTRUMENT" in
-  X-yes)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-    INSTRUMENT_LIBRARY=yes
-
-$as_echo "#define HAVE_INSTRUMENTED_LIBRARY 1" >>confdefs.h
-
-    ;;
-  X-no|*)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    INSTRUMENT_LIBRARY=no
-    ;;
-esac
-
-## ----------------------------------------------------------------------
-## Check if they would like to securely clear file buffers before they are
-##     written.
-##
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to clear file buffers" >&5
-$as_echo_n "checking whether to clear file buffers... " >&6; }
-# Check whether --enable-clear-file-buffers was given.
-if test "${enable_clear_file_buffers+set}" = set; then :
-  enableval=$enable_clear_file_buffers; CLEARFILEBUF=$enableval
-fi
-
-
-case "X-$CLEARFILEBUF" in
-  *)
-      CLEARFILEBUF=yes
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define CLEAR_MEMORY 1" >>confdefs.h
-
-    ;;
-  X-no)
-      CLEARFILEBUF=no
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    ;;
-esac
-
-## ----------------------------------------------------------------------
-## Check if they would like to use a memory checking tool (like valgrind's
-##     'memcheck' tool, or Rational Purify, etc) and the library should be
-##     more scrupulous with it's memory operations.  Enabling this also
-##     disables the library's free space manager code.
-##
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a memory checking tool will be used" >&5
-$as_echo_n "checking whether a memory checking tool will be used... " >&6; }
-# Check whether --enable-using-memchecker was given.
-if test "${enable_using_memchecker+set}" = set; then :
-  enableval=$enable_using_memchecker; USINGMEMCHECKER=$enableval
-fi
-
-
-case "X-$USINGMEMCHECKER" in
-  X-yes)
-      USINGMEMCHECKER=yes
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define USING_MEMCHECKER 1" >>confdefs.h
-
-    ;;
-  *)
-      USINGMEMCHECKER=no
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    ;;
-esac
-
-## Checkpoint the cache
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes: double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \.
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
-  sed '
-     /^ac_cv_env_/b end
-     t clear
-     :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    if test "x$cache_file" != "x/dev/null"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
-      if test ! -f "$cache_file" || test -h "$cache_file"; then
-	cat confcache >"$cache_file"
-      else
-        case $cache_file in #(
-        */* | ?:*)
-	  mv -f confcache "$cache_file"$$ &&
-	  mv -f "$cache_file"$$ "$cache_file" ;; #(
-        *)
-	  mv -f confcache "$cache_file" ;;
-	esac
-      fi
-    fi
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-  fi
-fi
-rm -f confcache
-
-## What header files and libraries do we have to look for for parallel
-## support?  For the most part, search paths are already specified with
-## CPPFLAGS and LDFLAGS or are known to the compiler.
-##
-# Check whether --enable-parallel was given.
-if test "${enable_parallel+set}" = set; then :
-  enableval=$enable_parallel;
-fi
-
-
-## The --enable-parallel flag is not compatible with --enable-cxx.
-## If the user tried to specify both flags, throw an error, unless
-## they also provided the --enable-unsupported flag.
-if test "X${ALLOW_UNSUPPORTED}" != "Xyes"; then
-  if test "X${HDF_CXX}" = "Xyes" -a "X${enable_parallel}" = "Xyes"; then
-    as_fn_error $? "--enable-cxx and --enable-parallel flags are incompatible. Use --enable-unsupported to override this error." "$LINENO" 5
-  fi
-fi
-
-## --enable-parallel is also incompatible with --enable-threadsafe, unless
-## --enable-unsupported has been specified on the configure line.
-if test "X${ALLOW_UNSUPPORTED}" != "Xyes"; then
-  if test "X${THREADSAFE}" = "Xyes" -a "X${enable_parallel}" = "Xyes"; then
-    as_fn_error $? "--enable-threadsafe and --enable-parallel flags are incompatible. Use --enable-unsupported to override this error." "$LINENO" 5
-  fi
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for parallel support files" >&5
-$as_echo_n "checking for parallel support files... " >&6; }
-case "X-$enable_parallel" in
-  X-|X-no|X-none)
-    ## We are not compiling for parallel.
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: skipped" >&5
-$as_echo "skipped" >&6; }
-    ;;
-
-  X-yes)
-    ## We want to compile a parallel library with a compiler that
-    ## may already know how to link with MPI and MPI-IO.
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: provided by compiler" >&5
-$as_echo "provided by compiler" >&6; }
-    PARALLEL=yes
-
-    ## Try link a simple MPI program.
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a simple MPI-IO C program can be linked" >&5
-$as_echo_n "checking whether a simple MPI-IO C program can be linked... " >&6; }
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <mpi.h>
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
- MPI_Init(0, (void *)0);
-		      MPI_File_open(0, (void *)0, 0, 0, (void *)0);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-		    as_fn_error $? "unable to link a simple MPI-IO C program" "$LINENO" 5
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-
-    if test "X$HDF_FORTRAN" = "Xyes"; then
-
-
-      ac_ext=${ac_fc_srcext-f}
-ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
-ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_fc_compiler_gnu
-
-
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a simple MPI-IO Fortran program can be linked" >&5
-$as_echo_n "checking whether a simple MPI-IO Fortran program can be linked... " >&6; }
-      cat > conftest.$ac_ext <<_ACEOF
-
-          PROGRAM main
-          INCLUDE 'mpif.h'
-          INTEGER :: comm, amode, info, fh, ierror
-          CHARACTER(LEN=1) :: filename
-          CALL MPI_File_open( comm, filename, amode, info, fh, ierror)
-          END
-_ACEOF
-if ac_fn_fc_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	   as_fn_error $? "unable to link a simple MPI-IO Fortran program" "$LINENO" 5
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-
-      ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-    fi
-
-    ## Set RUNPARALLEL to mpiexec if not set yet.
-    if test "X$PARALLEL" = "Xyes" -a -z "$RUNPARALLEL"; then
-      RUNPARALLEL="mpiexec -n \$\${NPROCS:=6}"
-    fi
-    ;;
-
-  *)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: error" >&5
-$as_echo "error" >&6; }
-    as_fn_error $? "\'$enable_parallel\' is not a valid parallel search type" "$LINENO" 5
-    ;;
-esac
-
-## ----------------------------------------------------------------------
-## Print some other parallel information and do some sanity checks.
-##
- ADD_PARALLEL_FILES="no"
-
-if test -n "$PARALLEL"; then
-  ## The 'testpar' directory should participate in the build
-  TESTPARALLEL=testpar
-
-  ## We are building a parallel library
-
-$as_echo "#define HAVE_PARALLEL 1" >>confdefs.h
-
-
-  ## Display what we found about running programs
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking prefix for running on one processor" >&5
-$as_echo_n "checking prefix for running on one processor... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RUNSERIAL" >&5
-$as_echo "$RUNSERIAL" >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking prefix for running in parallel" >&5
-$as_echo_n "checking prefix for running in parallel... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RUNPARALLEL" >&5
-$as_echo "$RUNPARALLEL" >&6; }
-
-  ## There *must* be some way to run in parallel even if it's just the
-  ## word `none'.
-  if test -z "$RUNPARALLEL"; then
-    as_fn_error $? "no way to run a parallel program" "$LINENO" 5
-  fi
-
-  ## If RUNSERIAL or RUNPARALLEL is the word `none' then replace it with
-  ## the empty string. This means that no launch commands were requested,
-  ## so we will not use any launch commands.
-  if test "X$RUNSERIAL" = "Xnone"; then
-    RUNSERIAL=""
-  fi
-  if test "X$RUNPARALLEL" = "Xnone"; then
-    RUNPARALLEL=""
-  fi
-
-  if test "X$HDF_FORTRAN" = "Xyes"; then
-    ADD_PARALLEL_FILES="yes"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MPI_Comm_c2f and MPI_Comm_f2c functions" >&5
-$as_echo_n "checking for MPI_Comm_c2f and MPI_Comm_f2c functions... " >&6; }
-
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <mpi.h>
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-MPI_Comm c_comm; MPI_Comm_c2f(c_comm)
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-
-$as_echo "#define HAVE_MPI_MULTI_LANG_Comm 1" >>confdefs.h
-
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MPI_Info_c2f and MPI_Info_f2c functions" >&5
-$as_echo_n "checking for MPI_Info_c2f and MPI_Info_f2c functions... " >&6; }
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <mpi.h>
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-MPI_Info c_info; MPI_Info_c2f(c_info)
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-
-$as_echo "#define HAVE_MPI_MULTI_LANG_Info 1" >>confdefs.h
-
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  fi
-
-  ## --------------------------------------------------------------------
-  ## Do we want MPE instrumentation feature on?
-  ##
-  ## This must be done after enable-parallel is checked since it depends
-  ## on a mpich compiler.
-  ##
-  MPE=yes
-
-# Check whether --with-mpe was given.
-if test "${with_mpe+set}" = set; then :
-  withval=$with_mpe;
-else
-  withval=no
-fi
-
-
-  case "X-$withval" in
-    X-|X-no|X-none)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MPE" >&5
-$as_echo_n "checking for MPE... " >&6; }
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: suppressed" >&5
-$as_echo "suppressed" >&6; }
-      unset MPE
-      ;;
-    X-yes)
-      for ac_header in mpe.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "mpe.h" "ac_cv_header_mpe_h" "$ac_includes_default"
-if test "x$ac_cv_header_mpe_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_MPE_H 1
-_ACEOF
-
-else
-  unset MPE
-fi
-
-done
-
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MPE_Init_log in -lmpe" >&5
-$as_echo_n "checking for MPE_Init_log in -lmpe... " >&6; }
-if ${ac_cv_lib_mpe_MPE_Init_log+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lmpe  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char MPE_Init_log ();
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-return MPE_Init_log ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_mpe_MPE_Init_log=yes
-else
-  ac_cv_lib_mpe_MPE_Init_log=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mpe_MPE_Init_log" >&5
-$as_echo "$ac_cv_lib_mpe_MPE_Init_log" >&6; }
-if test "x$ac_cv_lib_mpe_MPE_Init_log" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBMPE 1
-_ACEOF
-
-  LIBS="-lmpe $LIBS"
-
-else
-  unset MPE
-fi
-
-      ;;
-    *)
-      case "$withval" in
-        *,*)
-          mpe_inc="`echo $withval | cut -f1 -d,`"
-          mpe_lib="`echo $withval | cut -f2 -d, -s`"
-          ;;
-        *)
-          if test -n "$withval"; then
-            mpe_inc="$withval/include"
-            mpe_lib="$withval/lib"
-          fi
-          ;;
-      esac
-
-      ## Trying to include -I/usr/include and -L/usr/lib is redundant and
-      ## can mess some compilers up.
-      if test "X$mpe_inc" = "X/usr/include"; then
-        mpe_inc=""
-      fi
-      if test "X$mpe_lib" = "X/usr/lib"; then
-        mpe_lib=""
-      fi
-
-      if test -n "$mpe_inc"; then
-        saved_CPPFLAGS="$CPPFLAGS"
-        saved_AM_CPPFLAGS="$AM_CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS -I$mpe_inc"
-        AM_CPPFLAGS="$AM_CPPFLAGS -I$mpe_inc"
-        for ac_header in mpe.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "mpe.h" "ac_cv_header_mpe_h" "$ac_includes_default"
-if test "x$ac_cv_header_mpe_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_MPE_H 1
-_ACEOF
-
-else
-  CPPFLAGS="$saved_CPPFLAGS"; AM_CPPFLAGS="$saved_AM_CPPFLAGS"; unset MPE
-fi
-
-done
-
-      else
-        for ac_header in mpe.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "mpe.h" "ac_cv_header_mpe_h" "$ac_includes_default"
-if test "x$ac_cv_header_mpe_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_MPE_H 1
-_ACEOF
-
-else
-  unset MPE
-fi
-
-done
-
-      fi
-
-      if test -n "$mpe_lib"; then
-        saved_LDFLAGS="$LDFLAGS"
-        saved_AM_LDFLAGS="$AM_LDFLAGS"
-        LDFLAGS="$LDFLAGS -L$mpe_lib"
-        AM_LDFLAGS="$AM_LDFLAGS -L$mpe_lib"
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MPE_Init_log in -lmpe" >&5
-$as_echo_n "checking for MPE_Init_log in -lmpe... " >&6; }
-if ${ac_cv_lib_mpe_MPE_Init_log+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lmpe  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char MPE_Init_log ();
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-return MPE_Init_log ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_mpe_MPE_Init_log=yes
-else
-  ac_cv_lib_mpe_MPE_Init_log=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mpe_MPE_Init_log" >&5
-$as_echo "$ac_cv_lib_mpe_MPE_Init_log" >&6; }
-if test "x$ac_cv_lib_mpe_MPE_Init_log" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBMPE 1
-_ACEOF
-
-  LIBS="-lmpe $LIBS"
-
-else
-  LDFLAGS="$saved_LDFLAGS"; AM_LDFLAGS="$saved_AM_LDFLAGS"; unset MPE
-fi
-
-      else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MPE_Init_log in -lmpe" >&5
-$as_echo_n "checking for MPE_Init_log in -lmpe... " >&6; }
-if ${ac_cv_lib_mpe_MPE_Init_log+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lmpe  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char MPE_Init_log ();
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-return MPE_Init_log ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_mpe_MPE_Init_log=yes
-else
-  ac_cv_lib_mpe_MPE_Init_log=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mpe_MPE_Init_log" >&5
-$as_echo "$ac_cv_lib_mpe_MPE_Init_log" >&6; }
-if test "x$ac_cv_lib_mpe_MPE_Init_log" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBMPE 1
-_ACEOF
-
-  LIBS="-lmpe $LIBS"
-
-else
-  unset MPE
-fi
-
-      fi
-      ;;
-  esac
-
-  if test "X-$MPE" = "X-yes"; then
-
-$as_echo "#define HAVE_MPE 1" >>confdefs.h
-
-  fi
-fi
-
-## ----------------------------------------------------------------------
-## Check if Direct I/O driver is enabled by --enable-direct-vfd
-##
-
-## Check these regardless. If the checks are moved inside the main
-## direct VFD block, the output is nested.
-
-if ${hdf5_cv_direct_io+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_fn_c_check_decl "$LINENO" "O_DIRECT" "ac_cv_have_decl_O_DIRECT" "#include <fcntl.h>
-"
-if test "x$ac_cv_have_decl_O_DIRECT" = xyes; then :
-  hdf5_cv_direct_io=yes
-else
-  hdf5_cv_direct_io=no
-fi
-
-fi
-
-if ${hdf5_cv_posix_memalign+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_fn_c_check_func "$LINENO" "posix_memalign" "ac_cv_func_posix_memalign"
-if test "x$ac_cv_func_posix_memalign" = xyes; then :
-  hdf5_cv_posix_memalign=yes
-else
-  hdf5_cv_posix_memalign=no
-fi
-
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the direct I/O virtual file driver (VFD) is enabled" >&5
-$as_echo_n "checking if the direct I/O virtual file driver (VFD) is enabled... " >&6; }
-
-# Check whether --enable-direct-vfd was given.
-if test "${enable_direct_vfd+set}" = set; then :
-  enableval=$enable_direct_vfd; DIRECT_VFD=$enableval
-else
-  DIRECT_VFD=no
-fi
-
-
-if test "X$DIRECT_VFD" = "Xyes"; then
-    if test ${hdf5_cv_direct_io} = "yes" && test ${hdf5_cv_posix_memalign} = "yes" ; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define HAVE_DIRECT 1" >>confdefs.h
-
-    else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-        DIRECT_VFD=no
-        as_fn_error $? "The direct VFD was requested but cannot be built. This is either
-                     due to O_DIRECT not being found in fcntl.h or a lack of
-                     posix_memalign() on your system. Please re-configure without
-                     specifying --enable-direct-vfd." "$LINENO" 5
-    fi
-else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "X$DIRECT_VFD" = "Xyes"; then
-  DIRECT_VFD_CONDITIONAL_TRUE=
-  DIRECT_VFD_CONDITIONAL_FALSE='#'
-else
-  DIRECT_VFD_CONDITIONAL_TRUE='#'
-  DIRECT_VFD_CONDITIONAL_FALSE=
-fi
-
-
-## ----------------------------------------------------------------------
-## Enable custom plugin default path for library.  It requires SHARED support.
-##
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for custom plugin default path definition" >&5
-$as_echo_n "checking for custom plugin default path definition... " >&6; }
-
-# Check whether --with-default-plugindir was given.
-if test "${with_default_plugindir+set}" = set; then :
-  withval=$with_default_plugindir;
-else
-  withval="/usr/local/hdf5/lib/plugin"
-fi
-
-
-if test "X$withval" = "X"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: default" >&5
-$as_echo "default" >&6; }
-    default_plugindir="/usr/local/hdf5/lib/plugin"
-else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $withval" >&5
-$as_echo "$withval" >&6; }
-    default_plugindir=$withval
-fi
-
-
-cat >>confdefs.h <<_ACEOF
-#define DEFAULT_PLUGINDIR "$default_plugindir"
-_ACEOF
-
-
-## ----------------------------------------------------------------------
-## Decide whether the presence of user's exception handling functions is
-## checked and data conversion exceptions are returned.  This is mainly
-## for the speed optimization of hard conversions.  Soft conversions can
-## actually benefit little.
-##
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether exception handling functions is checked during data conversions" >&5
-$as_echo_n "checking whether exception handling functions is checked during data conversions... " >&6; }
-# Check whether --enable-dconv-exception was given.
-if test "${enable_dconv_exception+set}" = set; then :
-  enableval=$enable_dconv_exception; DCONV_EXCEPTION=$enableval
-else
-  DCONV_EXCEPTION=yes
-fi
-
-
-if test "$DCONV_EXCEPTION" = "yes"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define WANT_DCONV_EXCEPTION 1" >>confdefs.h
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-## ----------------------------------------------------------------------
-## Decide whether the data accuracy has higher priority during data
-## conversions.  If not, some hard conversions will still be prefered even
-## though the data may be wrong (for example, some compilers don't
-## support denormalized floating values) to maximize speed.
-##
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether data accuracy is guaranteed during data conversions" >&5
-$as_echo_n "checking whether data accuracy is guaranteed during data conversions... " >&6; }
-# Check whether --enable-dconv-accuracy was given.
-if test "${enable_dconv_accuracy+set}" = set; then :
-  enableval=$enable_dconv_accuracy; DATA_ACCURACY=$enableval
-else
-  DATA_ACCURACY=yes
-fi
-
-
-if test "$DATA_ACCURACY" = "yes"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define WANT_DATA_ACCURACY 1" >>confdefs.h
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-## ----------------------------------------------------------------------
-## Set the flag to indicate that the machine has window style pathname,
-## that is, "drive-letter:\" (e.g. "C:") or "drive-letter:/" (e.g. "C:/").
-## (This flag should be _unset_ for all machines, except for Windows, where
-## it's set in the custom Windows H5pubconf.h file)
-##
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the machine has window style path name" >&5
-$as_echo_n "checking if the machine has window style path name... " >&6; }
-
-case "`uname`" in
-  MINGW*)
-
-$as_echo "#define HAVE_WINDOW_PATH 1" >>confdefs.h
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-    ;;
-  *)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    ;;
-esac
-
-## ----------------------------------------------------------------------
-## Set the flag to indicate that the machine is using a special algorithm to convert
-## 'long double' to '(unsigned) long' values.  (This flag should only be set for
-## the IBM Power6 Linux.  When the bit sequence of long double is
-## 0x4351ccf385ebc8a0bfcc2a3c3d855620, the converted value of (unsigned)long
-## is 0x004733ce17af227f, not the same as the library's conversion to 0x004733ce17af2282.
-## The machine's conversion gets the correct value.  We define the macro and disable
-## this kind of test until we figure out what algorithm they use.
-##
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if using special algorithm to convert long double to (unsigned) long values" >&5
-$as_echo_n "checking if using special algorithm to convert long double to (unsigned) long values... " >&6; }
-
-if test ${ac_cv_sizeof_long_double} = 0; then
-   hdf5_cv_ldouble_to_long_special=${hdf5_cv_ldouble_to_long_special=no}
-else
-   if ${hdf5_cv_ldouble_to_long_special+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-                #include <string.h>
-
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-
-                long double         ld = 20041683600089727.779961L;
-                long                ll;
-                unsigned long       ull;
-                unsigned char       s[16];
-                unsigned char       s2[8];
-                int                 ret = 1;
-
-                if(sizeof(long double) == 16 && sizeof(long) == 8) {
-                    /*make sure the long double type has 16 bytes in size and
-                     * 11 bits of exponent.  If it is,
-                     *the bit sequence should be like below.  It's not
-                     *a decent way to check but this info isn't available. */
-                    memcpy(s, &ld, 16);
-                    if(s[0]==0x43 && s[1]==0x51 && s[2]==0xcc && s[3]==0xf3 &&
-                        s[4]==0x85 && s[5]==0xeb && s[6]==0xc8 && s[7]==0xa0 &&
-                        s[8]==0xbf && s[9]==0xcc && s[10]==0x2a && s[11]==0x3c) {
-
-                        /* Assign the hexadecimal value of long double type. */
-                        s[0]=0x43; s[1]=0x51; s[2]=0xcc; s[3]=0xf3;
-                        s[4]=0x85; s[5]=0xeb; s[6]=0xc8; s[7]=0xa0;
-                        s[8]=0xbf; s[9]=0xcc; s[10]=0x2a; s[11]=0x3c;
-                        s[12]=0x3d; s[13]=0x85; s[14]=0x56; s[15]=0x20;
-
-                        memcpy(&ld, s, 16);
-
-                        ll = (long)ld;
-                        memcpy(s2, &ll, 8);
-
-                        /* The library's algorithm converts it to 0x 00 47 33 ce 17 af 22 82
-                         * and gets wrong value 20041683600089730 on the IBM Power6 Linux.
-                         * But the IBM Power6 Linux converts it to 0x00 47 33 ce 17 af 22 7f
-                         * and gets the correct value 20041683600089727.  It uses some special
-                         * algorithm.  We're going to define the macro and skip the test until
-                         * we can figure out how they do it. */
-                        if(s2[0]==0x00 && s2[1]==0x47 && s2[2]==0x33 && s2[3]==0xce &&
-                           s2[4]==0x17 && s2[5]==0xaf && s2[6]==0x22 && s2[7]==0x7f)
-                            ret = 0;
-
-                        ull = (unsigned long)ld;
-                        memcpy(s2, &ull, 8);
-
-                        /* The unsigned long is the same as signed long. */
-                        if(s2[0]==0x00 && s2[1]==0x47 && s2[2]==0x33 && s2[3]==0xce &&
-                           s2[4]==0x17 && s2[5]==0xaf && s2[6]==0x22 && s2[7]==0x7f)
-                            ret = 0;
-                    }
-                }
-                exit(ret);
-
-  ;
-  return 0;
-}
-
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  hdf5_cv_ldouble_to_long_special=yes
-else
-  hdf5_cv_ldouble_to_long_special=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-
-fi
-
-if test ${hdf5_cv_ldouble_to_long_special} = "yes"; then
-
-$as_echo "#define LDOUBLE_TO_LONG_SPECIAL 1" >>confdefs.h
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-## ----------------------------------------------------------------------
-## Set the flag to indicate that the machine is using a special algorithm
-## to convert some values of '(unsigned) long' to 'long double' values.
-## (This flag should be off for all machines, except for IBM Power6 Linux,
-## when the bit sequences are 003fff..., 007fff..., 00ffff..., 01ffff...,
-## ..., 7fffff..., the compiler uses a unknown algorithm.  We define a
-## macro and skip the test for now until we know about the algorithm.
-##
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if using special algorithm to convert (unsigned) long to long double values" >&5
-$as_echo_n "checking if using special algorithm to convert (unsigned) long to long double values... " >&6; }
-
-if test ${ac_cv_sizeof_long_double} = 0; then
-   hdf5_cv_long_to_ldouble_special=${hdf5_cv_long_to_ldouble_special=no}
-else
-   if ${hdf5_cv_long_to_ldouble_special+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-                #include <string.h>
-
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-
-                long double         ld;
-                long                ll;
-                unsigned long       ull;
-                unsigned char       s[16];
-                int                 flag=0, ret=1;
-
-                /*Determine if long double has 16 byte in size, 11 bit exponent, and
-                 *the bias is 0x3ff */
-                if(sizeof(long double) == 16) {
-                    ld = 1.0L;
-                    memcpy(s, &ld, 16);
-                    if(s[0]==0x3f && s[1]==0xf0 && s[2]==0x00 && s[3]==0x00 &&
-                        s[4]==0x00 && s[5]==0x00 && s[6]==0x00 && s[7]==0x00)
-                        flag = 1;
-                }
-
-                if(flag==1 && sizeof(long)==8) {
-                    ll = 0x003fffffffffffffL;
-                    ld = (long double)ll;
-                    memcpy(s, &ld, 16);
-                    /* The library converts the value to 0x434fffffffffffff8000000000000000.
-                     * In decimal it is 18014398509481982.000000, one value short of the original.
-                     * The IBM Power6 Linux converts it to 0x4350000000000000bff0000000000000.
-                     * The value is correct in decimal. It uses some special
-                     * algorithm.  We're going to define the macro and skip the test until
-                     * we can figure out how they do it. */
-                    if(s[0]==0x43 && s[1]==0x50 && s[2]==0x00 && s[3]==0x00 &&
-                        s[4]==0x00 && s[5]==0x00 && s[6]==0x00 && s[7]==0x00 &&
-                        s[8]==0xbf && s[9]==0xf0 && s[10]==0x00 && s[11]==0x00 &&
-                        s[12]==0x00 && s[13]==0x00 && s[14]==0x00 && s[15]==0x00)
-                        ret = 0;
-                }
-                if(flag==1 && sizeof(unsigned long)==8) {
-                    ull = 0xffffffffffffffffUL;
-                    ld = (long double)ull;
-                    memcpy(s, &ld, 16);
-                    /* Use a different value from signed long to test. The problem is the same
-                     * for both long and unsigned long. The value is 18446744073709551615.
-                     * The library converts the value to 0x43effffffffffffffe000000000000000.
-                     * In decimal it's 18446744073709548544.000000, very different from the original.
-                     * The IBM Power6 Linux converts it to 0x43f0000000000000bff0000000000000.
-                     * The value is correct in decimal. It uses some special
-                     * algorithm.  We're going to define the macro and skip the test until
-                     * we can figure out how they do it. */
-                    if(s[0]==0x43 && s[1]==0xf0 && s[2]==0x00 && s[3]==0x00 &&
-                        s[4]==0x00 && s[5]==0x00 && s[6]==0x00 && s[7]==0x00 &&
-                        s[8]==0xbf && s[9]==0xf0 && s[10]==0x00 && s[11]==0x00 &&
-                        s[12]==0x00 && s[13]==0x00 && s[14]==0x00 && s[15]==0x00)
-                        ret = 0;
-                }
-                exit(ret);
-
-  ;
-  return 0;
-}
-
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  hdf5_cv_long_to_ldouble_special=yes
-else
-  hdf5_cv_long_to_ldouble_special=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-
-fi
-
-if test ${hdf5_cv_long_to_ldouble_special} = "yes"; then
-
-$as_echo "#define LONG_TO_LDOUBLE_SPECIAL 1" >>confdefs.h
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-## ----------------------------------------------------------------------
-## Set the flag to indicate that the machine can accurately convert
-## '(unsigned) long long' to 'long double' values.  (This flag should be set for
-## all machines, except for Mac OS 10.4, when the bit sequences are 003fff...,
-## 007fff..., 00ffff..., 01ffff..., ..., 7fffff..., the converted values are twice
-## as big as they should be.
-##
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if correctly converting (unsigned) long long to long double values" >&5
-$as_echo_n "checking if correctly converting (unsigned) long long to long double values... " >&6; }
-
-if test ${ac_cv_sizeof_long_double} = 0; then
-   hdf5_cv_llong_to_ldouble_correct=${hdf5_cv_llong_to_ldouble_correct=no}
-else
-   if ${hdf5_cv_llong_to_ldouble_correct+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-        int main(void)
-        {
-            long double         ld;
-            long long           ll;
-            unsigned long long  ull;
-            unsigned char       s[16];
-            int                 flag=0, ret=0;
-
-            /*Determine if long double has 16 byte in size, 11 bit exponent, and
-             *the bias is 0x3ff */
-            if(sizeof(long double) == 16) {
-                ld = 1.0L;
-                memcpy(s, &ld, 16);
-                if(s[0]==0x3f && s[1]==0xf0 && s[2]==0x00 && s[3]==0x00 &&
-                    s[4]==0x00 && s[5]==0x00 && s[6]==0x00 && s[7]==0x00)
-                    flag = 1;
-            }
-
-            if(flag==1 && sizeof(long long)==8) {
-                ll = 0x01ffffffffffffffLL;
-                ld = (long double)ll;
-                memcpy(s, &ld, 16);
-                /*Check if the bit sequence is as supposed to be*/
-                if(s[0]!=0x43 || s[1]!=0x7f || s[2]!=0xff || s[3]!=0xff ||
-                    s[4]!=0xff || s[5]!=0xff || s[6]!=0xff || s[7]!=0xff ||
-                    s[8]!=0xf0 || s[9]!=0x00 || s[10]!=0x00 || s[11]!=0x00)
-                    ret = 1;
-            }
-            if(flag==1 && sizeof(unsigned long long)==8) {
-                ull = 0x01ffffffffffffffULL;
-                ld = (long double)ull;
-                memcpy(s, &ld, 16);
-                if(s[0]!=0x43 || s[1]!=0x7f || s[2]!=0xff || s[3]!=0xff ||
-                    s[4]!=0xff || s[5]!=0xff || s[6]!=0xff || s[7]!=0xff ||
-                    s[8]!=0xf0 || s[9]!=0x00 || s[10]!=0x00 || s[11]!=0x00)
-                    ret = 1;
-            }
-    done:
-            exit(ret);
-        }
-
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  hdf5_cv_llong_to_ldouble_correct=yes
-else
-  hdf5_cv_llong_to_ldouble_correct=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-
-fi
-
-if test ${hdf5_cv_llong_to_ldouble_correct} = "yes"; then
-
-$as_echo "#define LLONG_TO_LDOUBLE_CORRECT 1" >>confdefs.h
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-## ----------------------------------------------------------------------
-## Set the flag to indicate that the machine generates bad code
-## for the H5VM_log2_gen() routine in src/H5VMprivate.h
-## (This flag should be set to no for all machines, except for SGI IRIX64,
-## where the cache value is set to yes in it's config file)
-##
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if bad code for log2 routine is generated" >&5
-$as_echo_n "checking if bad code for log2 routine is generated... " >&6; }
-if ${hdf5_cv_bad_log2_code_generated+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  hdf5_cv_bad_log2_code_generated=no
-fi
-
-
-if test ${hdf5_cv_bad_log2_code_generated} = "yes"; then
-
-$as_echo "#define BAD_LOG2_CODE_GENERATED 1" >>confdefs.h
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-## ----------------------------------------------------------------------
-## Set some variables for general configuration information to be saved
-## and installed with the libraries (used to generate libhdf5.settings).
-##
-
-## HDF5 version from the first line of the README.txt file.
-H5_VERSION="`cut -d' ' -f3 $srcdir/README.txt | head -1`"
-
-
-## Configuration date
- CONFIG_DATE="`date`"
-
-## User doing the configuration
- CONFIG_USER="`whoami`@`hostname`"
-if test -n "$ORGANIZATION"; then
-  CONFIG_USER="$CONFIG_USER at $ORGANIZATION"
-fi
-
-## Configuration mode (production, development, profile, etc) saved above.
-
-
-## Byte sex from the AC_C_BIGENDIAN macro.
-
-if test "X$ac_cv_c_bigendian" = "Xyes"; then
-  BYTESEX="big-endian"
-else
-  BYTESEX="little-endian"
-fi
-
-
-if test "X$ac_cv_c_bigendian" = "Xyes"; then
-  WORDS_BIGENDIAN="yes"
-else
-  WORDS_BIGENDIAN="no"
-fi
-
-
-## Parallel support? (set above except empty if none)
-PARALLEL=${PARALLEL:-no}
-
-## Compiler with version information. This consists of the full path
-## name of the compiler and the reported version number.
-
-## Strip anything that looks like a flag off of $CC
-CC_NOFLAGS=`echo $CC | sed 's/ -.*//'`
-
-if `echo $CC_NOFLAGS | grep ^/ >/dev/null 2>&1`; then
-  CC_VERSION="$CC"
-else
-  CC_VERSION="$CC";
-  for x in `echo $PATH | sed -e 's/:/ /g'`; do
-    if test -x $x/$CC_NOFLAGS; then
-      CC_VERSION="$x/$CC"
-      break
-    fi
-  done
-fi
-if test -n "$cc_version_info"; then
-  CC_VERSION="$CC_VERSION ( $cc_version_info)"
-fi
-
-
-## Strip anything that looks like a flag off of $FC
-FC_NOFLAGS=`echo $FC | sed 's/ -.*//'`
-
-if `echo $FC_NOFLAGS | grep ^/ >/dev/null 2>&1`; then
-  FC_VERSION="$FC"
-else
-  FC_VERSION="$FC";
-  for x in `echo $PATH | sed -e 's/:/ /g'`; do
-    if test -x $x/$FC_NOFLAGS; then
-      FC_VERSION="$x/$FC"
-      break
-    fi
-  done
-fi
-if test -n "$fc_version_info"; then
-  FC_VERSION="$FC_VERSION ( $fc_version_info)"
-fi
-
-
-## Strip anything that looks like a flag off of $CXX
-CXX_NOFLAGS=`echo $CXX | sed 's/ -.*//'`
-
-if `echo $CXX_NOFLAGS | grep ^/ >/dev/null 2>&1`; then
-  CXX_VERSION="$CXX"
-else
-  CXX_VERSION="$FC";
-  for x in `echo $PATH | sed -e 's/:/ /g'`; do
-    if test -x $x/$CXX_NOFLAGS; then
-      CXX_VERSION="$x/$CXX"
-      break
-    fi
-  done
-fi
-if test -n "$cxx_version_info"; then
-  CXX_VERSION="$CXX_VERSION ( $cxx_version_info)"
-fi
-
-## ----------------------------------------------------------------------
-## Where is the root of the source tree. Give an absolute address so
-## we can find it no matter which directory of the distribution is our
-## current directory. The built-in pwd fails on some systems, but the
-## /bin/pwd version works OK.
-##
-if test -x /bin/pwd; then
-  pwd=/bin/pwd
-else
-  pwd=pwd
-fi
- ROOT="`$pwd`"
-
-## ----------------------------------------------------------------------
-## Some programs shouldn't be built by default (e.g., programs to generate
-## data files used by tests, some optional tests).
-## Check if they want such programs built anyway.
-##
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking additional programs should be built" >&5
-$as_echo_n "checking additional programs should be built... " >&6; }
-# Check whether --enable-build-all was given.
-if test "${enable_build_all+set}" = set; then :
-  enableval=$enable_build_all; BUILD_ALL=$enableval
-else
-  BUILD_ALL=no
-fi
-
-
-if test "X$BUILD_ALL" = "Xyes"; then
- echo "yes"
-else
- echo "no"
-fi
- if test "X$BUILD_ALL" = "Xyes"; then
-  BUILD_ALL_CONDITIONAL_TRUE=
-  BUILD_ALL_CONDITIONAL_FALSE='#'
-else
-  BUILD_ALL_CONDITIONAL_TRUE='#'
-  BUILD_ALL_CONDITIONAL_FALSE=
-fi
-
-
-## ----------------------------------------------------------------------
-## Enable deprecated public API symbols
-##
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if deprecated public symbols are available" >&5
-$as_echo_n "checking if deprecated public symbols are available... " >&6; };
-# Check whether --enable-deprecated-symbols was given.
-if test "${enable_deprecated_symbols+set}" = set; then :
-  enableval=$enable_deprecated_symbols; DEPREC_SYMBOLS=$enableval
-else
-  DEPREC_SYMBOLS=yes
-fi
-
-
-case "X-$DEPREC_SYMBOLS" in
-  X-yes)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-    DEPRECATED_SYMBOLS=yes
-    ;;
-  X-no|*)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    DEPRECATED_SYMBOLS=no
-
-$as_echo "#define NO_DEPRECATED_SYMBOLS 1" >>confdefs.h
-
-    ;;
-esac
-
-## --------------------------------------------------------------------------
-## Which version of the public APIs should the 'base' versioned symbols use?
-##
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which version of public symbols to use by default" >&5
-$as_echo_n "checking which version of public symbols to use by default... " >&6; }
-
-# Check whether --with-default-api-version was given.
-if test "${with_default_api_version+set}" = set; then :
-  withval=$with_default_api_version;
-else
-  withval=v110
-fi
-
-
-if test "X$withval" = "Xv16"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: v16" >&5
-$as_echo "v16" >&6; }
-    DEFAULT_API_VERSION=v16
-
-$as_echo "#define USE_16_API_DEFAULT 1" >>confdefs.h
-
-elif test "X$withval" = "Xv18"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: v18" >&5
-$as_echo "v18" >&6; }
-    DEFAULT_API_VERSION=v18
-elif test "X$withval" = "Xv110"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: v110" >&5
-$as_echo "v110" >&6; }
-    DEFAULT_API_VERSION=v110
-else
-    as_fn_error $? "invalid version of public symbols given" "$LINENO" 5
-fi
-
-## It's an error to try to disable deprecated public API symbols while
-## choosing an older version of the public API as the default. However,
-## if the user insists on doing this via the --enable-unsupported configure
-## flag, we'll let them.
-if test "X${ALLOW_UNSUPPORTED}" != "Xyes"; then
-  if test "X${DEFAULT_API_VERSION}" != "Xv110" -a "X${DEPRECATED_SYMBOLS}" = "Xno" ; then
-    as_fn_error $? "Removing old public API symbols not allowed when using them as default public API symbols. Use --enable-unsupported to override this error." "$LINENO" 5
-  fi
-fi
-
-## ----------------------------------------------------------------------
-## Enable strict file format checks
-##
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to perform strict file format checks" >&5
-$as_echo_n "checking whether to perform strict file format checks... " >&6; };
-# Check whether --enable-strict-format-checks was given.
-if test "${enable_strict_format_checks+set}" = set; then :
-  enableval=$enable_strict_format_checks; STRICT_CHECKS=$enableval
-fi
-
-
-## Default to yes if debug is enabled
-if test "X-$STRICT_CHECKS" = X- ; then
-  if test -z "$DEBUG_PKG" ; then
-    STRICT_CHECKS=no
-  else
-    STRICT_CHECKS=yes
-  fi
-fi
-
-case "X-$STRICT_CHECKS" in
-  X-yes)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-    STRICT_FORMAT_CHECKS=yes
-
-$as_echo "#define STRICT_FORMAT_CHECKS 1" >>confdefs.h
-
-    ;;
-  X-no|*)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    STRICT_FORMAT_CHECKS=no
-    ;;
-esac
-
-
-## ----------------------------------------------------------------------
-## Enable embedded library information
-##
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to have library information embedded in the executables" >&5
-$as_echo_n "checking whether to have library information embedded in the executables... " >&6; }
-# Check whether --enable-embedded-libinfo was given.
-if test "${enable_embedded_libinfo+set}" = set; then :
-  enableval=$enable_embedded_libinfo; enable_embedded_libinfo=$enableval
-else
-  enable_embedded_libinfo=yes
-fi
-
-
-   if test "${enable_embedded_libinfo}" = "yes"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define HAVE_EMBEDDED_LIBINFO 1" >>confdefs.h
-
-   else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    fi
-
-
-## ----------------------------------------------------------------------
-## Check if pointer alignments are enforced
-##
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if alignment restrictions are strictly enforced" >&5
-$as_echo_n "checking if alignment restrictions are strictly enforced... " >&6; }
-if test "$cross_compiling" = yes; then :
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown, assuming yes" >&5
-$as_echo "unknown, assuming yes" >&6; }
-
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-
-        #include <stdlib.h>
-        #include <string.h>
-
-        typedef struct {
-            size_t len;
-            void *p;
-        } hvl_t;
-
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-
-        char *chp = "beefs";
-        char **chpp = malloc (2 * sizeof (char *));
-        char **chpp2;
-        hvl_t vl = { 12345, (void *) chp };
-        hvl_t *vlp;
-        hvl_t *vlp2;
-
-        memcpy ((void *) ((char *) chpp + 1), &chp, sizeof (char *));
-        chpp2 = (char **) ((char *) chpp + 1);
-        if (strcmp (*chpp2, chp)) {
-            free (chpp);
-            return 1;
-        }
-        free (chpp);
-
-        vlp = malloc (2 * sizeof (hvl_t));
-        memcpy ((void *) ((char *) vlp + 1), &vl, sizeof (hvl_t));
-        vlp2 = (hvl_t *) ((char *) vlp + 1);
-        if (vlp2->len != vl.len || vlp2->p != vl.p) {
-            free (vlp);
-            return 1;
-        }
-        free (vlp);
-
-  ;
-  return 0;
-}
-
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-
-$as_echo "#define NO_ALIGNMENT_RESTRICTIONS 1" >>confdefs.h
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-else
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-
-
-## ----------------------------------------------------------------------
-## Restore user's CFLAGS.
-CFLAGS="$saved_user_CFLAGS"
-FCFLAGS="$saved_user_FCFLAGS"
-CXXFLAGS="$saved_user_CXXFLAGS"
-CPPFLAGS="$saved_user_CPPFLAGS"
-LDFLAGS="$saved_user_LDFLAGS"
-
-
-## ----------------------------------------------------------------------
-## Create automake conditionals to tell automake makefiles which directories
-## need to be compiled
-
- if test "X$HDF_CXX" = "Xyes"; then
-  BUILD_CXX_CONDITIONAL_TRUE=
-  BUILD_CXX_CONDITIONAL_FALSE='#'
-else
-  BUILD_CXX_CONDITIONAL_TRUE='#'
-  BUILD_CXX_CONDITIONAL_FALSE=
-fi
-
- if test -n "$TESTPARALLEL"; then
-  BUILD_PARALLEL_CONDITIONAL_TRUE=
-  BUILD_PARALLEL_CONDITIONAL_FALSE='#'
-else
-  BUILD_PARALLEL_CONDITIONAL_TRUE='#'
-  BUILD_PARALLEL_CONDITIONAL_FALSE=
-fi
-
- if test "X$HDF_FORTRAN" = "Xyes"; then
-  BUILD_FORTRAN_CONDITIONAL_TRUE=
-  BUILD_FORTRAN_CONDITIONAL_FALSE='#'
-else
-  BUILD_FORTRAN_CONDITIONAL_TRUE='#'
-  BUILD_FORTRAN_CONDITIONAL_FALSE=
-fi
-
- if test "X$HDF5_HL" = "Xyes"; then
-  BUILD_HDF5_HL_CONDITIONAL_TRUE=
-  BUILD_HDF5_HL_CONDITIONAL_FALSE='#'
-else
-  BUILD_HDF5_HL_CONDITIONAL_TRUE='#'
-  BUILD_HDF5_HL_CONDITIONAL_FALSE=
-fi
-
-
-
-## ----------------------------------------------------------------------
-## Build the Makefiles.
-##
-
-## The directory search list
- SEARCH='$(srcdir) $(top_builddir)/src $(top_srcdir)/src'
-cmd='echo $SEARCH |sed "s/ /'$SEARCH_SEP'/g"'
-SEARCH="$SEARCH_RULE`eval $cmd`"
-export SEARCH
-
-## Some cleanup stuff
-rm -f conftest conftest.o conftest.c dummy.o *.mod
-
-## Build config.status, touch the stamp files, and build all the Makefiles.
-## The order is such that the first `make' does not need to update any
-## configuration information. See config/commence.in for the order in which
-## things need to be done.
-
-## First the stamp1 file for H5config.h.in
-mkdir ./config >/dev/null 2>&1
-touch ./config/stamp1
-
-## Then the config.status file (but not makefiles)
-saved_no_create=$no_create
-no_create=yes
-
-PARALLEL_MAKE=""
-FORTRAN_PARALLEL_MAKE=""
-
-if test -n "$TESTPARALLEL"; then
-  PARALLEL_MAKE="$TESTPARALLEL/Makefile"
-
-  if test "X$HDF_FORTRAN" = "Xyes"; then
-    FORTRAN_PARALLEL_MAKE=fortran/$TESTPARALLEL/Makefile
-  fi
-fi
-: ${CONFIG_LT=./config.lt}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_LT" >&5
-$as_echo "$as_me: creating $CONFIG_LT" >&6;}
-as_write_fail=0
-cat >"$CONFIG_LT" <<_ASEOF || as_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate a libtool stub with the current configuration.
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>"$CONFIG_LT" <<\_ASEOF || as_write_fail=1
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-  fi
-  $as_echo "$as_me: error: $2" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -pR'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -pR'
-  fi
-else
-  as_ln_s='cp -pR'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
-  test -f "$1" && test -x "$1"
-} # as_fn_executable_p
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-exec 6>&1
-## --------------------------------- ##
-## Main body of "$CONFIG_LT" script. ##
-## --------------------------------- ##
-_ASEOF
-test $as_write_fail = 0 && chmod +x "$CONFIG_LT"
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-lt_cl_silent=false
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-
-lt_cl_help="\
-\`$as_me' creates a local libtool stub from the current configuration,
-for use in further configure time tests before the real libtool is
-generated.
-
-Usage: $0 [OPTIONS]
-
-  -h, --help      print this help, then exit
-  -V, --version   print version number, then exit
-  -q, --quiet     do not print progress messages
-  -d, --debug     don't remove temporary files
-
-Report bugs to <bug-libtool@gnu.org>."
-
-lt_cl_version="\
-HDF5 config.lt 1.9.216
-configured by $0, generated by GNU Autoconf 2.69.
-
-Copyright (C) 2011 Free Software Foundation, Inc.
-This config.lt script is free software; the Free Software Foundation
-gives unlimited permision to copy, distribute and modify it."
-
-while test $# != 0
-do
-  case $1 in
-    --version | --v* | -V )
-      echo "$lt_cl_version"; exit 0 ;;
-    --help | --h* | -h )
-      echo "$lt_cl_help"; exit 0 ;;
-    --debug | --d* | -d )
-      debug=: ;;
-    --quiet | --q* | --silent | --s* | -q )
-      lt_cl_silent=: ;;
-
-    -*) as_fn_error $? "unrecognized option: $1
-Try \`$0 --help' for more information." "$LINENO" 5 ;;
-
-    *) as_fn_error $? "unrecognized argument: $1
-Try \`$0 --help' for more information." "$LINENO" 5 ;;
-  esac
-  shift
-done
-
-if $lt_cl_silent; then
-  exec 6>/dev/null
-fi
-_LTEOF
-
-cat >>"$CONFIG_LT" <<_LTEOF
-
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-sed_quote_subst='$sed_quote_subst'
-double_quote_subst='$double_quote_subst'
-delay_variable_subst='$delay_variable_subst'
-AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`'
-DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
-OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
-macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
-macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
-enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
-enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
-pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
-enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
-SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
-ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
-PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
-host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
-host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
-host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
-build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
-build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
-build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
-SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
-Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
-GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
-EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
-FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
-LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
-NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
-LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
-max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
-ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
-exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
-lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
-lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
-lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
-lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
-lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
-reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
-reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
-deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
-file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
-file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
-want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
-sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
-AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
-AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
-archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
-STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
-RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
-old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
-old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
-lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
-CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
-CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
-compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
-GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
-nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
-lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
-objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
-MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
-need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
-MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
-DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
-NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
-LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
-OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
-OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
-libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
-shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
-extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
-archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
-export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
-whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
-compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
-old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
-archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
-archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
-module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
-module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
-with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
-allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
-no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
-hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
-hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
-hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
-hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
-hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
-inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
-link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
-always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
-export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
-exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
-include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
-prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
-postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
-file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
-variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
-need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
-need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
-version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
-runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
-shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
-shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
-libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
-library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
-soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
-install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
-postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
-finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
-finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
-hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
-sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
-sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
-enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
-enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
-enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
-old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
-striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
-compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`'
-predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`'
-postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`'
-predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`'
-postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`'
-compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`'
-LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`'
-LD_FC='`$ECHO "$LD_FC" | $SED "$delay_single_quote_subst"`'
-reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`'
-reload_flag_FC='`$ECHO "$reload_flag_FC" | $SED "$delay_single_quote_subst"`'
-reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-reload_cmds_FC='`$ECHO "$reload_cmds_FC" | $SED "$delay_single_quote_subst"`'
-old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-old_archive_cmds_FC='`$ECHO "$old_archive_cmds_FC" | $SED "$delay_single_quote_subst"`'
-compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
-compiler_FC='`$ECHO "$compiler_FC" | $SED "$delay_single_quote_subst"`'
-GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
-GCC_FC='`$ECHO "$GCC_FC" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag_FC='`$ECHO "$lt_prog_compiler_no_builtin_flag_FC" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_pic_FC='`$ECHO "$lt_prog_compiler_pic_FC" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_wl_FC='`$ECHO "$lt_prog_compiler_wl_FC" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_static_FC='`$ECHO "$lt_prog_compiler_static_FC" | $SED "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o_FC='`$ECHO "$lt_cv_prog_compiler_c_o_FC" | $SED "$delay_single_quote_subst"`'
-archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
-archive_cmds_need_lc_FC='`$ECHO "$archive_cmds_need_lc_FC" | $SED "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes_FC='`$ECHO "$enable_shared_with_static_runtimes_FC" | $SED "$delay_single_quote_subst"`'
-export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
-export_dynamic_flag_spec_FC='`$ECHO "$export_dynamic_flag_spec_FC" | $SED "$delay_single_quote_subst"`'
-whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
-whole_archive_flag_spec_FC='`$ECHO "$whole_archive_flag_spec_FC" | $SED "$delay_single_quote_subst"`'
-compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`'
-compiler_needs_object_FC='`$ECHO "$compiler_needs_object_FC" | $SED "$delay_single_quote_subst"`'
-old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-old_archive_from_new_cmds_FC='`$ECHO "$old_archive_from_new_cmds_FC" | $SED "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds_FC='`$ECHO "$old_archive_from_expsyms_cmds_FC" | $SED "$delay_single_quote_subst"`'
-archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-archive_cmds_FC='`$ECHO "$archive_cmds_FC" | $SED "$delay_single_quote_subst"`'
-archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-archive_expsym_cmds_FC='`$ECHO "$archive_expsym_cmds_FC" | $SED "$delay_single_quote_subst"`'
-module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-module_cmds_FC='`$ECHO "$module_cmds_FC" | $SED "$delay_single_quote_subst"`'
-module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-module_expsym_cmds_FC='`$ECHO "$module_expsym_cmds_FC" | $SED "$delay_single_quote_subst"`'
-with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`'
-with_gnu_ld_FC='`$ECHO "$with_gnu_ld_FC" | $SED "$delay_single_quote_subst"`'
-allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
-allow_undefined_flag_FC='`$ECHO "$allow_undefined_flag_FC" | $SED "$delay_single_quote_subst"`'
-no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
-no_undefined_flag_FC='`$ECHO "$no_undefined_flag_FC" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_FC='`$ECHO "$hardcode_libdir_flag_spec_FC" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_separator_FC='`$ECHO "$hardcode_libdir_separator_FC" | $SED "$delay_single_quote_subst"`'
-hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_direct_FC='`$ECHO "$hardcode_direct_FC" | $SED "$delay_single_quote_subst"`'
-hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_direct_absolute_FC='`$ECHO "$hardcode_direct_absolute_FC" | $SED "$delay_single_quote_subst"`'
-hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_minus_L_FC='`$ECHO "$hardcode_minus_L_FC" | $SED "$delay_single_quote_subst"`'
-hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_shlibpath_var_FC='`$ECHO "$hardcode_shlibpath_var_FC" | $SED "$delay_single_quote_subst"`'
-hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_automatic_FC='`$ECHO "$hardcode_automatic_FC" | $SED "$delay_single_quote_subst"`'
-inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
-inherit_rpath_FC='`$ECHO "$inherit_rpath_FC" | $SED "$delay_single_quote_subst"`'
-link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
-link_all_deplibs_FC='`$ECHO "$link_all_deplibs_FC" | $SED "$delay_single_quote_subst"`'
-always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
-always_export_symbols_FC='`$ECHO "$always_export_symbols_FC" | $SED "$delay_single_quote_subst"`'
-export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-export_symbols_cmds_FC='`$ECHO "$export_symbols_cmds_FC" | $SED "$delay_single_quote_subst"`'
-exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
-exclude_expsyms_FC='`$ECHO "$exclude_expsyms_FC" | $SED "$delay_single_quote_subst"`'
-include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
-include_expsyms_FC='`$ECHO "$include_expsyms_FC" | $SED "$delay_single_quote_subst"`'
-prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-prelink_cmds_FC='`$ECHO "$prelink_cmds_FC" | $SED "$delay_single_quote_subst"`'
-postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-postlink_cmds_FC='`$ECHO "$postlink_cmds_FC" | $SED "$delay_single_quote_subst"`'
-file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
-file_list_spec_FC='`$ECHO "$file_list_spec_FC" | $SED "$delay_single_quote_subst"`'
-hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_action_FC='`$ECHO "$hardcode_action_FC" | $SED "$delay_single_quote_subst"`'
-compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
-compiler_lib_search_dirs_FC='`$ECHO "$compiler_lib_search_dirs_FC" | $SED "$delay_single_quote_subst"`'
-predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`'
-predep_objects_FC='`$ECHO "$predep_objects_FC" | $SED "$delay_single_quote_subst"`'
-postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`'
-postdep_objects_FC='`$ECHO "$postdep_objects_FC" | $SED "$delay_single_quote_subst"`'
-predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`'
-predeps_FC='`$ECHO "$predeps_FC" | $SED "$delay_single_quote_subst"`'
-postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`'
-postdeps_FC='`$ECHO "$postdeps_FC" | $SED "$delay_single_quote_subst"`'
-compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`'
-compiler_lib_search_path_FC='`$ECHO "$compiler_lib_search_path_FC" | $SED "$delay_single_quote_subst"`'
-
-LTCC='$LTCC'
-LTCFLAGS='$LTCFLAGS'
-compiler='$compiler_DEFAULT'
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-\$1
-_LTECHO_EOF'
-}
-
-# Quote evaled strings.
-for var in AS \
-DLLTOOL \
-OBJDUMP \
-SHELL \
-ECHO \
-PATH_SEPARATOR \
-SED \
-GREP \
-EGREP \
-FGREP \
-LD \
-NM \
-LN_S \
-lt_SP2NL \
-lt_NL2SP \
-reload_flag \
-deplibs_check_method \
-file_magic_cmd \
-file_magic_glob \
-want_nocaseglob \
-sharedlib_from_linklib_cmd \
-AR \
-AR_FLAGS \
-archiver_list_spec \
-STRIP \
-RANLIB \
-CC \
-CFLAGS \
-compiler \
-lt_cv_sys_global_symbol_pipe \
-lt_cv_sys_global_symbol_to_cdecl \
-lt_cv_sys_global_symbol_to_c_name_address \
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
-nm_file_list_spec \
-lt_prog_compiler_no_builtin_flag \
-lt_prog_compiler_pic \
-lt_prog_compiler_wl \
-lt_prog_compiler_static \
-lt_cv_prog_compiler_c_o \
-need_locks \
-MANIFEST_TOOL \
-DSYMUTIL \
-NMEDIT \
-LIPO \
-OTOOL \
-OTOOL64 \
-shrext_cmds \
-export_dynamic_flag_spec \
-whole_archive_flag_spec \
-compiler_needs_object \
-with_gnu_ld \
-allow_undefined_flag \
-no_undefined_flag \
-hardcode_libdir_flag_spec \
-hardcode_libdir_separator \
-exclude_expsyms \
-include_expsyms \
-file_list_spec \
-variables_saved_for_relink \
-libname_spec \
-library_names_spec \
-soname_spec \
-install_override_mode \
-finish_eval \
-old_striplib \
-striplib \
-compiler_lib_search_dirs \
-predep_objects \
-postdep_objects \
-predeps \
-postdeps \
-compiler_lib_search_path \
-LD_CXX \
-LD_FC \
-reload_flag_CXX \
-reload_flag_FC \
-compiler_CXX \
-compiler_FC \
-lt_prog_compiler_no_builtin_flag_CXX \
-lt_prog_compiler_no_builtin_flag_FC \
-lt_prog_compiler_pic_CXX \
-lt_prog_compiler_pic_FC \
-lt_prog_compiler_wl_CXX \
-lt_prog_compiler_wl_FC \
-lt_prog_compiler_static_CXX \
-lt_prog_compiler_static_FC \
-lt_cv_prog_compiler_c_o_CXX \
-lt_cv_prog_compiler_c_o_FC \
-export_dynamic_flag_spec_CXX \
-export_dynamic_flag_spec_FC \
-whole_archive_flag_spec_CXX \
-whole_archive_flag_spec_FC \
-compiler_needs_object_CXX \
-compiler_needs_object_FC \
-with_gnu_ld_CXX \
-with_gnu_ld_FC \
-allow_undefined_flag_CXX \
-allow_undefined_flag_FC \
-no_undefined_flag_CXX \
-no_undefined_flag_FC \
-hardcode_libdir_flag_spec_CXX \
-hardcode_libdir_flag_spec_FC \
-hardcode_libdir_separator_CXX \
-hardcode_libdir_separator_FC \
-exclude_expsyms_CXX \
-exclude_expsyms_FC \
-include_expsyms_CXX \
-include_expsyms_FC \
-file_list_spec_CXX \
-file_list_spec_FC \
-compiler_lib_search_dirs_CXX \
-compiler_lib_search_dirs_FC \
-predep_objects_CXX \
-predep_objects_FC \
-postdep_objects_CXX \
-postdep_objects_FC \
-predeps_CXX \
-predeps_FC \
-postdeps_CXX \
-postdeps_FC \
-compiler_lib_search_path_CXX \
-compiler_lib_search_path_FC; do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-# Double-quote double-evaled strings.
-for var in reload_cmds \
-old_postinstall_cmds \
-old_postuninstall_cmds \
-old_archive_cmds \
-extract_expsyms_cmds \
-old_archive_from_new_cmds \
-old_archive_from_expsyms_cmds \
-archive_cmds \
-archive_expsym_cmds \
-module_cmds \
-module_expsym_cmds \
-export_symbols_cmds \
-prelink_cmds \
-postlink_cmds \
-postinstall_cmds \
-postuninstall_cmds \
-finish_cmds \
-sys_lib_search_path_spec \
-sys_lib_dlsearch_path_spec \
-reload_cmds_CXX \
-reload_cmds_FC \
-old_archive_cmds_CXX \
-old_archive_cmds_FC \
-old_archive_from_new_cmds_CXX \
-old_archive_from_new_cmds_FC \
-old_archive_from_expsyms_cmds_CXX \
-old_archive_from_expsyms_cmds_FC \
-archive_cmds_CXX \
-archive_cmds_FC \
-archive_expsym_cmds_CXX \
-archive_expsym_cmds_FC \
-module_cmds_CXX \
-module_cmds_FC \
-module_expsym_cmds_CXX \
-module_expsym_cmds_FC \
-export_symbols_cmds_CXX \
-export_symbols_cmds_FC \
-prelink_cmds_CXX \
-prelink_cmds_FC \
-postlink_cmds_CXX \
-postlink_cmds_FC; do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-ac_aux_dir='$ac_aux_dir'
-xsi_shell='$xsi_shell'
-lt_shell_append='$lt_shell_append'
-
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-
-
-    PACKAGE='$PACKAGE'
-    VERSION='$VERSION'
-    TIMESTAMP='$TIMESTAMP'
-    RM='$RM'
-    ofile='$ofile'
-
-
-
-
-
-
-
-_LTEOF
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $ofile" >&5
-$as_echo "$as_me: creating $ofile" >&6;}
-
-
-    # See if we are running on zsh, and set the options which allow our
-    # commands through without removal of \ escapes.
-    if test -n "${ZSH_VERSION+set}" ; then
-      setopt NO_GLOB_SUBST
-    fi
-
-    cfgfile="${ofile}T"
-    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
-    $RM "$cfgfile"
-
-    cat <<_LT_EOF >> "$cfgfile"
-#! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-#                 Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-#   This file is part of GNU Libtool.
-#
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-# The names of the tagged configurations supported by this script.
-available_tags="CXX FC "
-
-# ### BEGIN LIBTOOL CONFIG
-
-# Assembler program.
-AS=$lt_AS
-
-# DLL creation program.
-DLLTOOL=$lt_DLLTOOL
-
-# Object dumper program.
-OBJDUMP=$lt_OBJDUMP
-
-# Which release of libtool.m4 was used?
-macro_version=$macro_version
-macro_revision=$macro_revision
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# What type of objects to build.
-pic_mode=$pic_mode
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# An echo program that protects backslashes.
-ECHO=$lt_ECHO
-
-# The PATH separator for the build system.
-PATH_SEPARATOR=$lt_PATH_SEPARATOR
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# A sed program that does not truncate output.
-SED=$lt_SED
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="\$SED -e 1s/^X//"
-
-# A grep program that handles long lines.
-GREP=$lt_GREP
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# A literal string matcher.
-FGREP=$lt_FGREP
-
-# A BSD- or MS-compatible name lister.
-NM=$lt_NM
-
-# Whether we need soft or hard links.
-LN_S=$lt_LN_S
-
-# What is the maximum length of a command?
-max_cmd_len=$max_cmd_len
-
-# Object file suffix (normally "o").
-objext=$ac_objext
-
-# Executable file suffix (normally "").
-exeext=$exeext
-
-# whether the shell understands "unset".
-lt_unset=$lt_unset
-
-# turn spaces into newlines.
-SP2NL=$lt_lt_SP2NL
-
-# turn newlines into spaces.
-NL2SP=$lt_lt_NL2SP
-
-# convert \$build file names to \$host format.
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-
-# convert \$build files to toolchain format.
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method = "file_magic".
-file_magic_cmd=$lt_file_magic_cmd
-
-# How to find potential files when deplibs_check_method = "file_magic".
-file_magic_glob=$lt_file_magic_glob
-
-# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
-want_nocaseglob=$lt_want_nocaseglob
-
-# Command to associate shared and link libraries.
-sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
-
-# The archiver.
-AR=$lt_AR
-
-# Flags to create an archive.
-AR_FLAGS=$lt_AR_FLAGS
-
-# How to feed a file listing to the archiver.
-archiver_list_spec=$lt_archiver_list_spec
-
-# A symbol stripping program.
-STRIP=$lt_STRIP
-
-# Commands used to install an old-style archive.
-RANLIB=$lt_RANLIB
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Whether to use a lock for old archive extraction.
-lock_old_archive_extraction=$lock_old_archive_extraction
-
-# A C compiler.
-LTCC=$lt_CC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_CFLAGS
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration.
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair.
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# Transform the output of nm in a C name address pair when lib prefix is needed.
-global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
-
-# Specify filename containing input files for \$NM.
-nm_file_list_spec=$lt_nm_file_list_spec
-
-# The root where to search for dependent libraries,and in which our libraries should be installed.
-lt_sysroot=$lt_sysroot
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# Used to examine libraries when file_magic_cmd begins with "file".
-MAGIC_CMD=$MAGIC_CMD
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# Manifest tool.
-MANIFEST_TOOL=$lt_MANIFEST_TOOL
-
-# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
-DSYMUTIL=$lt_DSYMUTIL
-
-# Tool to change global to local symbols on Mac OS X.
-NMEDIT=$lt_NMEDIT
-
-# Tool to manipulate fat objects and archives on Mac OS X.
-LIPO=$lt_LIPO
-
-# ldd/readelf like tool for Mach-O binaries on Mac OS X.
-OTOOL=$lt_OTOOL
-
-# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
-OTOOL64=$lt_OTOOL64
-
-# Old archive suffix (normally "a").
-libext=$libext
-
-# Shared library suffix (normally ".so").
-shrext_cmds=$lt_shrext_cmds
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at link time.
-variables_saved_for_relink=$lt_variables_saved_for_relink
-
-# Do we need the "lib" prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Library versioning type.
-version_type=$version_type
-
-# Shared library runtime path variable.
-runpath_var=$runpath_var
-
-# Shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Permission mode override for installation of shared libraries.
-install_override_mode=$lt_install_override_mode
-
-# Command to use after installation of a shared archive.
-postinstall_cmds=$lt_postinstall_cmds
-
-# Command to use after uninstallation of a shared archive.
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# As "finish_cmds", except a single script fragment to be evaled but
-# not shown.
-finish_eval=$lt_finish_eval
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Compile-time system search path for libraries.
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries.
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-
-# The linker used to build libraries.
-LD=$lt_LD
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# Commands used to build an old-style archive.
-old_archive_cmds=$lt_old_archive_cmds
-
-# A language specific compiler.
-CC=$lt_compiler
-
-# Is the compiler the GNU compiler?
-with_gcc=$GCC
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc
-
-# Whether or not to disallow shared libs when runtime libs are static.
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec
-
-# Whether the compiler copes with passing no objects directly.
-compiler_needs_object=$lt_compiler_needs_object
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
-
-# Commands used to build a shared archive.
-archive_cmds=$lt_archive_cmds
-archive_expsym_cmds=$lt_archive_expsym_cmds
-
-# Commands used to build a loadable module if different from building
-# a shared archive.
-module_cmds=$lt_module_cmds
-module_expsym_cmds=$lt_module_expsym_cmds
-
-# Whether we are building with GNU ld or not.
-with_gnu_ld=$lt_with_gnu_ld
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag
-
-# Flag that enforces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
-
-# Whether we need a single "-rpath" flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator
-
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-# DIR into the resulting binary.
-hardcode_direct=$hardcode_direct
-
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-# DIR into the resulting binary and the resulting library dependency is
-# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
-# library is relocated.
-hardcode_direct_absolute=$hardcode_direct_absolute
-
-# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-# into the resulting binary.
-hardcode_minus_L=$hardcode_minus_L
-
-# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-# into the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var
-
-# Set to "yes" if building a shared library automatically hardcodes DIR
-# into the library and all subsequent libraries and executables linked
-# against it.
-hardcode_automatic=$hardcode_automatic
-
-# Set to yes if linker adds runtime paths of dependent libraries
-# to runtime path list.
-inherit_rpath=$inherit_rpath
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs
-
-# Set to "yes" if exported symbols are required.
-always_export_symbols=$always_export_symbols
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms
-
-# Commands necessary for linking programs (against libraries) with templates.
-prelink_cmds=$lt_prelink_cmds
-
-# Commands necessary for finishing linking programs.
-postlink_cmds=$lt_postlink_cmds
-
-# Specify filename containing input files.
-file_list_spec=$lt_file_list_spec
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action
-
-# The directories searched by this compiler when creating a shared library.
-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
-
-# Dependencies to place before and after the objects being linked to
-# create a shared library.
-predep_objects=$lt_predep_objects
-postdep_objects=$lt_postdep_objects
-predeps=$lt_predeps
-postdeps=$lt_postdeps
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path
-
-# ### END LIBTOOL CONFIG
-
-_LT_EOF
-
-  case $host_os in
-  aix3*)
-    cat <<\_LT_EOF >> "$cfgfile"
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-_LT_EOF
-    ;;
-  esac
-
-
-ltmain="$ac_aux_dir/ltmain.sh"
-
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" \
-     || (rm -f "$cfgfile"; exit 1)
-
-  if test x"$xsi_shell" = xyes; then
-  sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
-func_dirname ()\
-{\
-\    case ${1} in\
-\      */*) func_dirname_result="${1%/*}${2}" ;;\
-\      *  ) func_dirname_result="${3}" ;;\
-\    esac\
-} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_basename ()$/,/^} # func_basename /c\
-func_basename ()\
-{\
-\    func_basename_result="${1##*/}"\
-} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
-func_dirname_and_basename ()\
-{\
-\    case ${1} in\
-\      */*) func_dirname_result="${1%/*}${2}" ;;\
-\      *  ) func_dirname_result="${3}" ;;\
-\    esac\
-\    func_basename_result="${1##*/}"\
-} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
-func_stripname ()\
-{\
-\    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
-\    # positional parameters, so assign one to ordinary parameter first.\
-\    func_stripname_result=${3}\
-\    func_stripname_result=${func_stripname_result#"${1}"}\
-\    func_stripname_result=${func_stripname_result%"${2}"}\
-} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
-func_split_long_opt ()\
-{\
-\    func_split_long_opt_name=${1%%=*}\
-\    func_split_long_opt_arg=${1#*=}\
-} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
-func_split_short_opt ()\
-{\
-\    func_split_short_opt_arg=${1#??}\
-\    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
-} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
-func_lo2o ()\
-{\
-\    case ${1} in\
-\      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
-\      *)    func_lo2o_result=${1} ;;\
-\    esac\
-} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_xform ()$/,/^} # func_xform /c\
-func_xform ()\
-{\
-    func_xform_result=${1%.*}.lo\
-} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_arith ()$/,/^} # func_arith /c\
-func_arith ()\
-{\
-    func_arith_result=$(( $* ))\
-} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_len ()$/,/^} # func_len /c\
-func_len ()\
-{\
-    func_len_result=${#1}\
-} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-fi
-
-if test x"$lt_shell_append" = xyes; then
-  sed -e '/^func_append ()$/,/^} # func_append /c\
-func_append ()\
-{\
-    eval "${1}+=\\${2}"\
-} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
-func_append_quoted ()\
-{\
-\    func_quote_for_eval "${2}"\
-\    eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
-} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  # Save a `func_append' function call where possible by direct use of '+='
-  sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
-    && mv -f "$cfgfile.tmp" "$cfgfile" \
-      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-  test 0 -eq $? || _lt_function_replace_fail=:
-else
-  # Save a `func_append' function call even when '+=' is not available
-  sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
-    && mv -f "$cfgfile.tmp" "$cfgfile" \
-      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-  test 0 -eq $? || _lt_function_replace_fail=:
-fi
-
-if test x"$_lt_function_replace_fail" = x":"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
-$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
-fi
-
-
-   mv -f "$cfgfile" "$ofile" ||
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-
-
-    cat <<_LT_EOF >> "$ofile"
-
-# ### BEGIN LIBTOOL TAG CONFIG: CXX
-
-# The linker used to build libraries.
-LD=$lt_LD_CXX
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag_CXX
-reload_cmds=$lt_reload_cmds_CXX
-
-# Commands used to build an old-style archive.
-old_archive_cmds=$lt_old_archive_cmds_CXX
-
-# A language specific compiler.
-CC=$lt_compiler_CXX
-
-# Is the compiler the GNU compiler?
-with_gcc=$GCC_CXX
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_CXX
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_CXX
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_CXX
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_CXX
-
-# Whether or not to disallow shared libs when runtime libs are static.
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
-
-# Whether the compiler copes with passing no objects directly.
-compiler_needs_object=$lt_compiler_needs_object_CXX
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
-
-# Commands used to build a shared archive.
-archive_cmds=$lt_archive_cmds_CXX
-archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
-
-# Commands used to build a loadable module if different from building
-# a shared archive.
-module_cmds=$lt_module_cmds_CXX
-module_expsym_cmds=$lt_module_expsym_cmds_CXX
-
-# Whether we are building with GNU ld or not.
-with_gnu_ld=$lt_with_gnu_ld_CXX
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_CXX
-
-# Flag that enforces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_CXX
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
-
-# Whether we need a single "-rpath" flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
-
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-# DIR into the resulting binary.
-hardcode_direct=$hardcode_direct_CXX
-
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-# DIR into the resulting binary and the resulting library dependency is
-# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
-# library is relocated.
-hardcode_direct_absolute=$hardcode_direct_absolute_CXX
-
-# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-# into the resulting binary.
-hardcode_minus_L=$hardcode_minus_L_CXX
-
-# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-# into the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
-
-# Set to "yes" if building a shared library automatically hardcodes DIR
-# into the library and all subsequent libraries and executables linked
-# against it.
-hardcode_automatic=$hardcode_automatic_CXX
-
-# Set to yes if linker adds runtime paths of dependent libraries
-# to runtime path list.
-inherit_rpath=$inherit_rpath_CXX
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_CXX
-
-# Set to "yes" if exported symbols are required.
-always_export_symbols=$always_export_symbols_CXX
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_CXX
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_CXX
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_CXX
-
-# Commands necessary for linking programs (against libraries) with templates.
-prelink_cmds=$lt_prelink_cmds_CXX
-
-# Commands necessary for finishing linking programs.
-postlink_cmds=$lt_postlink_cmds_CXX
-
-# Specify filename containing input files.
-file_list_spec=$lt_file_list_spec_CXX
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_CXX
-
-# The directories searched by this compiler when creating a shared library.
-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
-
-# Dependencies to place before and after the objects being linked to
-# create a shared library.
-predep_objects=$lt_predep_objects_CXX
-postdep_objects=$lt_postdep_objects_CXX
-predeps=$lt_predeps_CXX
-postdeps=$lt_postdeps_CXX
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
-
-# ### END LIBTOOL TAG CONFIG: CXX
-_LT_EOF
-
-
-    cat <<_LT_EOF >> "$ofile"
-
-# ### BEGIN LIBTOOL TAG CONFIG: FC
-
-# The linker used to build libraries.
-LD=$lt_LD_FC
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag_FC
-reload_cmds=$lt_reload_cmds_FC
-
-# Commands used to build an old-style archive.
-old_archive_cmds=$lt_old_archive_cmds_FC
-
-# A language specific compiler.
-CC=$lt_compiler_FC
-
-# Is the compiler the GNU compiler?
-with_gcc=$GCC_FC
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_FC
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_FC
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_FC
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_FC
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_FC
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_FC
-
-# Whether or not to disallow shared libs when runtime libs are static.
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_FC
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_FC
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_FC
-
-# Whether the compiler copes with passing no objects directly.
-compiler_needs_object=$lt_compiler_needs_object_FC
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_FC
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_FC
-
-# Commands used to build a shared archive.
-archive_cmds=$lt_archive_cmds_FC
-archive_expsym_cmds=$lt_archive_expsym_cmds_FC
-
-# Commands used to build a loadable module if different from building
-# a shared archive.
-module_cmds=$lt_module_cmds_FC
-module_expsym_cmds=$lt_module_expsym_cmds_FC
-
-# Whether we are building with GNU ld or not.
-with_gnu_ld=$lt_with_gnu_ld_FC
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_FC
-
-# Flag that enforces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_FC
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_FC
-
-# Whether we need a single "-rpath" flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_FC
-
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-# DIR into the resulting binary.
-hardcode_direct=$hardcode_direct_FC
-
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-# DIR into the resulting binary and the resulting library dependency is
-# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
-# library is relocated.
-hardcode_direct_absolute=$hardcode_direct_absolute_FC
-
-# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-# into the resulting binary.
-hardcode_minus_L=$hardcode_minus_L_FC
-
-# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-# into the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_FC
-
-# Set to "yes" if building a shared library automatically hardcodes DIR
-# into the library and all subsequent libraries and executables linked
-# against it.
-hardcode_automatic=$hardcode_automatic_FC
-
-# Set to yes if linker adds runtime paths of dependent libraries
-# to runtime path list.
-inherit_rpath=$inherit_rpath_FC
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_FC
-
-# Set to "yes" if exported symbols are required.
-always_export_symbols=$always_export_symbols_FC
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_FC
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_FC
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_FC
-
-# Commands necessary for linking programs (against libraries) with templates.
-prelink_cmds=$lt_prelink_cmds_FC
-
-# Commands necessary for finishing linking programs.
-postlink_cmds=$lt_postlink_cmds_FC
-
-# Specify filename containing input files.
-file_list_spec=$lt_file_list_spec_FC
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_FC
-
-# The directories searched by this compiler when creating a shared library.
-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_FC
-
-# Dependencies to place before and after the objects being linked to
-# create a shared library.
-predep_objects=$lt_predep_objects_FC
-postdep_objects=$lt_postdep_objects_FC
-predeps=$lt_predeps_FC
-postdeps=$lt_postdeps_FC
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_FC
-
-# ### END LIBTOOL TAG CONFIG: FC
-_LT_EOF
-
-
-as_fn_exit 0
-_LTEOF
-chmod +x "$CONFIG_LT"
-
-# configure is writing to config.log, but config.lt does its own redirection,
-# appending to config.log, which fails on DOS, as config.log is still kept
-# open by configure.  Here we exec the FD to /dev/null, effectively closing
-# config.log, so it can be properly (re)opened and appended to by config.lt.
-lt_cl_success=:
-test "$silent" = yes &&
-  lt_config_lt_args="$lt_config_lt_args --quiet"
-exec 5>/dev/null
-$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
-exec 5>>config.log
-$lt_cl_success || as_fn_exit 1
-
-no_create=$saved_no_create
-
-## Then the stamp2 file for H5config.h
-touch ./config/stamp2
-
-## Finally the makefiles
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
-## Are we compiling static libraries, shared libraries, or both?  This
-## is only used for the libhdf5.settings file. We can't just look at
-## $enable_static and $enable_shared because if they're yes the ltconfig
-## might have decided that one or the other is simply not possible.
-## Therefore we have to ask the generated `libtool' shell script
-## which 'features' it has enabled.
-if (./libtool --features | grep '^enable shared libraries' > /dev/null); then
-  enable_shared=yes
-else
-  enable_shared=no
-fi
-
-if (./libtool --features | grep '^enable static libraries' > /dev/null); then
-  enable_static=yes
-else
-  enable_static=no
-fi
-
-if test "X$enable_static" = "Xyes" && test "X$enable_shared" = "Xyes"; then
-  STATIC_SHARED="static, shared"
-elif test "X$enable_static" = "Xyes"; then
-  STATIC_SHARED="static"
-elif test "X$enable_shared" = "Xyes"; then
-  STATIC_SHARED="shared"
-else
-  STATIC_SHARED="none"
-fi
-
-## ----------------------------------------------------------------------
-## Set a macro if shared library is enabled.
-##
- if test "X$enable_shared" = "Xyes"; then
-  HAVE_SHARED_CONDITIONAL_TRUE=
-  HAVE_SHARED_CONDITIONAL_FALSE='#'
-else
-  HAVE_SHARED_CONDITIONAL_TRUE='#'
-  HAVE_SHARED_CONDITIONAL_FALSE=
-fi
-
-
-ac_config_files="$ac_config_files src/libhdf5.settings Makefile src/Makefile test/Makefile test/testcheck_version.sh test/testerror.sh test/H5srcdir_str.h test/testlibinfo.sh test/testlinks_env.sh test/test_plugin.sh testpar/Makefile tools/Makefile tools/h5dump/Makefile tools/h5dump/testh5dump.sh tools/h5dump/testh5dumppbits.sh tools/h5dump/testh5dumpxml.sh tools/h5ls/testh5ls.sh tools/h5import/Makefile tools/h5import/h5importtestutil.sh tools/h5diff/Makefile tools/h5diff/testh5diff.sh tools/h5diff/testph5diff.sh tools/h5jam/Makefile tools/h5jam/testh5jam.sh tools/h5repack/Makefile tools/h5repack/h5repack.sh tools/h5repack/h5repack_plugin.sh tools/h5ls/Makefile tools/h5copy/Makefile tools/h5copy/testh5copy.sh tools/lib/Makefile tools/misc/Makefile tools/misc/h5cc tools/misc/testh5mkgrp.sh tools/misc/testh5repart.sh tools/h5stat/testh5stat.sh tools/h5stat/Makefile tools/perform/Makefile examples/Makefile examples/run-c-ex.sh examples/testh5cc.sh c++/Makefile c++/src/Makefile c++/src/h5c++ c++/test/Makefile c++/test/H5srcdir_str.h c++/examples/Makefile c++/examples/run-c++-ex.sh c++/examples/testh5c++.sh fortran/Makefile fortran/src/h5fc fortran/src/Makefile fortran/test/Makefile fortran/testpar/Makefile fortran/examples/Makefile fortran/examples/run-fortran-ex.sh fortran/examples/testh5fc.sh hl/Makefile hl/src/Makefile hl/test/Makefile hl/test/H5srcdir_str.h hl/tools/Makefile hl/tools/gif2h5/Makefile hl/tools/gif2h5/h52giftest.sh hl/examples/Makefile hl/examples/run-hlc-ex.sh hl/c++/Makefile hl/c++/src/Makefile hl/c++/test/Makefile hl/c++/examples/Makefile hl/c++/examples/run-hlc++-ex.sh hl/fortran/Makefile hl/fortran/src/Makefile hl/fortran/test/Makefile hl/fortran/examples/Makefile hl/fortran/examples/run-hlfortran-ex.sh"
-
-
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes: double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \.
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
-  sed '
-     /^ac_cv_env_/b end
-     t clear
-     :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    if test "x$cache_file" != "x/dev/null"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
-      if test ! -f "$cache_file" || test -h "$cache_file"; then
-	cat confcache >"$cache_file"
-      else
-        case $cache_file in #(
-        */* | ?:*)
-	  mv -f confcache "$cache_file"$$ &&
-	  mv -f "$cache_file"$$ "$cache_file" ;; #(
-        *)
-	  mv -f confcache "$cache_file" ;;
-	esac
-      fi
-    fi
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-DEFS=-DHAVE_CONFIG_H
-
-ac_libobjs=
-ac_ltlibobjs=
-U=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
-  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-  #    will be set to the directory where LIBOBJS objects are built.
-  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
-$as_echo_n "checking that generated files are newer than configure... " >&6; }
-   if test -n "$am_sleep_pid"; then
-     # Hide warnings about reused PIDs.
-     wait $am_sleep_pid 2>/dev/null
-   fi
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
-$as_echo "done" >&6; }
- if test -n "$EXEEXT"; then
-  am__EXEEXT_TRUE=
-  am__EXEEXT_FALSE='#'
-else
-  am__EXEEXT_TRUE='#'
-  am__EXEEXT_FALSE=
-fi
-
-if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-  as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  as_fn_error $? "conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${FORTRAN_HAVE_SIZEOF_TRUE}" && test -z "${FORTRAN_HAVE_SIZEOF_FALSE}"; then
-  as_fn_error $? "conditional \"FORTRAN_HAVE_SIZEOF\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${FORTRAN_HAVE_C_SIZEOF_TRUE}" && test -z "${FORTRAN_HAVE_C_SIZEOF_FALSE}"; then
-  as_fn_error $? "conditional \"FORTRAN_HAVE_C_SIZEOF\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${FORTRAN_HAVE_STORAGE_SIZE_TRUE}" && test -z "${FORTRAN_HAVE_STORAGE_SIZE_FALSE}"; then
-  as_fn_error $? "conditional \"FORTRAN_HAVE_STORAGE_SIZE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${FORTRAN_2003_CONDITIONAL_F_TRUE}" && test -z "${FORTRAN_2003_CONDITIONAL_F_FALSE}"; then
-  as_fn_error $? "conditional \"FORTRAN_2003_CONDITIONAL_F\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${FORTRAN_DEFAULT_REALisDBLE_F_TRUE}" && test -z "${FORTRAN_DEFAULT_REALisDBLE_F_FALSE}"; then
-  as_fn_error $? "conditional \"FORTRAN_DEFAULT_REALisDBLE_F\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${FORTRAN_SHARED_CONDITIONAL_TRUE}" && test -z "${FORTRAN_SHARED_CONDITIONAL_FALSE}"; then
-  as_fn_error $? "conditional \"FORTRAN_SHARED_CONDITIONAL\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${CXX_SHARED_CONDITIONAL_TRUE}" && test -z "${CXX_SHARED_CONDITIONAL_FALSE}"; then
-  as_fn_error $? "conditional \"CXX_SHARED_CONDITIONAL\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${USE_PLUGINS_CONDITIONAL_TRUE}" && test -z "${USE_PLUGINS_CONDITIONAL_FALSE}"; then
-  as_fn_error $? "conditional \"USE_PLUGINS_CONDITIONAL\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-
-if test -z "${BUILD_SHARED_SZIP_CONDITIONAL_TRUE}" && test -z "${BUILD_SHARED_SZIP_CONDITIONAL_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_SHARED_SZIP_CONDITIONAL\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${DIRECT_VFD_CONDITIONAL_TRUE}" && test -z "${DIRECT_VFD_CONDITIONAL_FALSE}"; then
-  as_fn_error $? "conditional \"DIRECT_VFD_CONDITIONAL\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${BUILD_ALL_CONDITIONAL_TRUE}" && test -z "${BUILD_ALL_CONDITIONAL_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_ALL_CONDITIONAL\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${BUILD_CXX_CONDITIONAL_TRUE}" && test -z "${BUILD_CXX_CONDITIONAL_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_CXX_CONDITIONAL\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${BUILD_PARALLEL_CONDITIONAL_TRUE}" && test -z "${BUILD_PARALLEL_CONDITIONAL_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_PARALLEL_CONDITIONAL\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${BUILD_FORTRAN_CONDITIONAL_TRUE}" && test -z "${BUILD_FORTRAN_CONDITIONAL_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_FORTRAN_CONDITIONAL\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${BUILD_HDF5_HL_CONDITIONAL_TRUE}" && test -z "${BUILD_HDF5_HL_CONDITIONAL_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_HDF5_HL_CONDITIONAL\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_SHARED_CONDITIONAL_TRUE}" && test -z "${HAVE_SHARED_CONDITIONAL_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_SHARED_CONDITIONAL\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-
-: "${CONFIG_STATUS=./config.status}"
-ac_write_fail=0
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-as_write_fail=0
-cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-  fi
-  $as_echo "$as_me: error: $2" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -pR'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -pR'
-  fi
-else
-  as_ln_s='cp -pR'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
-  test -f "$1" && test -x "$1"
-} # as_fn_executable_p
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-exec 6>&1
-## ----------------------------------- ##
-## Main body of $CONFIG_STATUS script. ##
-## ----------------------------------- ##
-_ASEOF
-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# Save the log message, to keep $0 and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by HDF5 $as_me 1.9.216, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
-_ACEOF
-
-case $ac_config_files in *"
-"*) set x $ac_config_files; shift; ac_config_files=$*;;
-esac
-
-case $ac_config_headers in *"
-"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
-esac
-
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-# Files that config.status was made for.
-config_files="$ac_config_files"
-config_headers="$ac_config_headers"
-config_commands="$ac_config_commands"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-ac_cs_usage="\
-\`$as_me' instantiates files and other configuration actions
-from templates according to the current configuration.  Unless the files
-and actions are specified as TAGs, all are instantiated by default.
-
-Usage: $0 [OPTION]... [TAG]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
-      --config     print configuration, then exit
-  -q, --quiet, --silent
-                   do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-      --file=FILE[:TEMPLATE]
-                   instantiate the configuration file FILE
-      --header=FILE[:TEMPLATE]
-                   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Configuration commands:
-$config_commands
-
-Report bugs to <help@hdfgroup.org>."
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
-ac_cs_version="\\
-HDF5 config.status 1.9.216
-configured by $0, generated by GNU Autoconf 2.69,
-  with options \\"\$ac_cs_config\\"
-
-Copyright (C) 2012 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-ac_pwd='$ac_pwd'
-srcdir='$srcdir'
-INSTALL='$INSTALL'
-MKDIR_P='$MKDIR_P'
-AWK='$AWK'
-test -n "\$AWK" || AWK=awk
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# The default lists apply if the user does not specify any file.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=?*)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  --*=)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=
-    ac_shift=:
-    ;;
-  *)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    $as_echo "$ac_cs_version"; exit ;;
-  --config | --confi | --conf | --con | --co | --c )
-    $as_echo "$ac_cs_config"; exit ;;
-  --debug | --debu | --deb | --de | --d | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    '') as_fn_error $? "missing file argument" ;;
-    esac
-    as_fn_append CONFIG_FILES " '$ac_optarg'"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
-    ac_need_defaults=false;;
-  --he | --h)
-    # Conflict between --help and --header
-    as_fn_error $? "ambiguous option: \`$1'
-Try \`$0 --help' for more information.";;
-  --help | --hel | -h )
-    $as_echo "$ac_cs_usage"; exit ;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) as_fn_error $? "unrecognized option: \`$1'
-Try \`$0 --help' for more information." ;;
-
-  *) as_fn_append ac_config_targets " $1"
-     ac_need_defaults=false ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-if \$ac_cs_recheck; then
-  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-  shift
-  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
-  CONFIG_SHELL='$SHELL'
-  export CONFIG_SHELL
-  exec "\$@"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-  $as_echo "$ac_log"
-} >&5
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-#
-# INIT-COMMANDS
-#
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-sed_quote_subst='$sed_quote_subst'
-double_quote_subst='$double_quote_subst'
-delay_variable_subst='$delay_variable_subst'
-AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`'
-DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
-OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
-macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
-macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
-enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
-enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
-pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
-enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
-SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
-ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
-PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
-host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
-host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
-host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
-build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
-build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
-build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
-SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
-Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
-GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
-EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
-FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
-LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
-NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
-LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
-max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
-ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
-exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
-lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
-lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
-lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
-lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
-lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
-reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
-reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
-deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
-file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
-file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
-want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
-sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
-AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
-AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
-archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
-STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
-RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
-old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
-old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
-lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
-CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
-CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
-compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
-GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
-nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
-lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
-objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
-MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
-need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
-MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
-DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
-NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
-LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
-OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
-OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
-libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
-shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
-extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
-archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
-export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
-whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
-compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
-old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
-archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
-archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
-module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
-module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
-with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
-allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
-no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
-hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
-hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
-hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
-hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
-hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
-inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
-link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
-always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
-export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
-exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
-include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
-prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
-postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
-file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
-variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
-need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
-need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
-version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
-runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
-shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
-shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
-libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
-library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
-soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
-install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
-postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
-finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
-finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
-hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
-sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
-sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
-enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
-enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
-enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
-old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
-striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
-compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`'
-predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`'
-postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`'
-predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`'
-postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`'
-compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`'
-LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`'
-LD_FC='`$ECHO "$LD_FC" | $SED "$delay_single_quote_subst"`'
-reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`'
-reload_flag_FC='`$ECHO "$reload_flag_FC" | $SED "$delay_single_quote_subst"`'
-reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-reload_cmds_FC='`$ECHO "$reload_cmds_FC" | $SED "$delay_single_quote_subst"`'
-old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-old_archive_cmds_FC='`$ECHO "$old_archive_cmds_FC" | $SED "$delay_single_quote_subst"`'
-compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
-compiler_FC='`$ECHO "$compiler_FC" | $SED "$delay_single_quote_subst"`'
-GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
-GCC_FC='`$ECHO "$GCC_FC" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag_FC='`$ECHO "$lt_prog_compiler_no_builtin_flag_FC" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_pic_FC='`$ECHO "$lt_prog_compiler_pic_FC" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_wl_FC='`$ECHO "$lt_prog_compiler_wl_FC" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_static_FC='`$ECHO "$lt_prog_compiler_static_FC" | $SED "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o_FC='`$ECHO "$lt_cv_prog_compiler_c_o_FC" | $SED "$delay_single_quote_subst"`'
-archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
-archive_cmds_need_lc_FC='`$ECHO "$archive_cmds_need_lc_FC" | $SED "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes_FC='`$ECHO "$enable_shared_with_static_runtimes_FC" | $SED "$delay_single_quote_subst"`'
-export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
-export_dynamic_flag_spec_FC='`$ECHO "$export_dynamic_flag_spec_FC" | $SED "$delay_single_quote_subst"`'
-whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
-whole_archive_flag_spec_FC='`$ECHO "$whole_archive_flag_spec_FC" | $SED "$delay_single_quote_subst"`'
-compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`'
-compiler_needs_object_FC='`$ECHO "$compiler_needs_object_FC" | $SED "$delay_single_quote_subst"`'
-old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-old_archive_from_new_cmds_FC='`$ECHO "$old_archive_from_new_cmds_FC" | $SED "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds_FC='`$ECHO "$old_archive_from_expsyms_cmds_FC" | $SED "$delay_single_quote_subst"`'
-archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-archive_cmds_FC='`$ECHO "$archive_cmds_FC" | $SED "$delay_single_quote_subst"`'
-archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-archive_expsym_cmds_FC='`$ECHO "$archive_expsym_cmds_FC" | $SED "$delay_single_quote_subst"`'
-module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-module_cmds_FC='`$ECHO "$module_cmds_FC" | $SED "$delay_single_quote_subst"`'
-module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-module_expsym_cmds_FC='`$ECHO "$module_expsym_cmds_FC" | $SED "$delay_single_quote_subst"`'
-with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`'
-with_gnu_ld_FC='`$ECHO "$with_gnu_ld_FC" | $SED "$delay_single_quote_subst"`'
-allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
-allow_undefined_flag_FC='`$ECHO "$allow_undefined_flag_FC" | $SED "$delay_single_quote_subst"`'
-no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
-no_undefined_flag_FC='`$ECHO "$no_undefined_flag_FC" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_FC='`$ECHO "$hardcode_libdir_flag_spec_FC" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_separator_FC='`$ECHO "$hardcode_libdir_separator_FC" | $SED "$delay_single_quote_subst"`'
-hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_direct_FC='`$ECHO "$hardcode_direct_FC" | $SED "$delay_single_quote_subst"`'
-hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_direct_absolute_FC='`$ECHO "$hardcode_direct_absolute_FC" | $SED "$delay_single_quote_subst"`'
-hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_minus_L_FC='`$ECHO "$hardcode_minus_L_FC" | $SED "$delay_single_quote_subst"`'
-hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_shlibpath_var_FC='`$ECHO "$hardcode_shlibpath_var_FC" | $SED "$delay_single_quote_subst"`'
-hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_automatic_FC='`$ECHO "$hardcode_automatic_FC" | $SED "$delay_single_quote_subst"`'
-inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
-inherit_rpath_FC='`$ECHO "$inherit_rpath_FC" | $SED "$delay_single_quote_subst"`'
-link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
-link_all_deplibs_FC='`$ECHO "$link_all_deplibs_FC" | $SED "$delay_single_quote_subst"`'
-always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
-always_export_symbols_FC='`$ECHO "$always_export_symbols_FC" | $SED "$delay_single_quote_subst"`'
-export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-export_symbols_cmds_FC='`$ECHO "$export_symbols_cmds_FC" | $SED "$delay_single_quote_subst"`'
-exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
-exclude_expsyms_FC='`$ECHO "$exclude_expsyms_FC" | $SED "$delay_single_quote_subst"`'
-include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
-include_expsyms_FC='`$ECHO "$include_expsyms_FC" | $SED "$delay_single_quote_subst"`'
-prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-prelink_cmds_FC='`$ECHO "$prelink_cmds_FC" | $SED "$delay_single_quote_subst"`'
-postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-postlink_cmds_FC='`$ECHO "$postlink_cmds_FC" | $SED "$delay_single_quote_subst"`'
-file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
-file_list_spec_FC='`$ECHO "$file_list_spec_FC" | $SED "$delay_single_quote_subst"`'
-hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_action_FC='`$ECHO "$hardcode_action_FC" | $SED "$delay_single_quote_subst"`'
-compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
-compiler_lib_search_dirs_FC='`$ECHO "$compiler_lib_search_dirs_FC" | $SED "$delay_single_quote_subst"`'
-predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`'
-predep_objects_FC='`$ECHO "$predep_objects_FC" | $SED "$delay_single_quote_subst"`'
-postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`'
-postdep_objects_FC='`$ECHO "$postdep_objects_FC" | $SED "$delay_single_quote_subst"`'
-predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`'
-predeps_FC='`$ECHO "$predeps_FC" | $SED "$delay_single_quote_subst"`'
-postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`'
-postdeps_FC='`$ECHO "$postdeps_FC" | $SED "$delay_single_quote_subst"`'
-compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`'
-compiler_lib_search_path_FC='`$ECHO "$compiler_lib_search_path_FC" | $SED "$delay_single_quote_subst"`'
-
-LTCC='$LTCC'
-LTCFLAGS='$LTCFLAGS'
-compiler='$compiler_DEFAULT'
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-\$1
-_LTECHO_EOF'
-}
-
-# Quote evaled strings.
-for var in AS \
-DLLTOOL \
-OBJDUMP \
-SHELL \
-ECHO \
-PATH_SEPARATOR \
-SED \
-GREP \
-EGREP \
-FGREP \
-LD \
-NM \
-LN_S \
-lt_SP2NL \
-lt_NL2SP \
-reload_flag \
-deplibs_check_method \
-file_magic_cmd \
-file_magic_glob \
-want_nocaseglob \
-sharedlib_from_linklib_cmd \
-AR \
-AR_FLAGS \
-archiver_list_spec \
-STRIP \
-RANLIB \
-CC \
-CFLAGS \
-compiler \
-lt_cv_sys_global_symbol_pipe \
-lt_cv_sys_global_symbol_to_cdecl \
-lt_cv_sys_global_symbol_to_c_name_address \
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
-nm_file_list_spec \
-lt_prog_compiler_no_builtin_flag \
-lt_prog_compiler_pic \
-lt_prog_compiler_wl \
-lt_prog_compiler_static \
-lt_cv_prog_compiler_c_o \
-need_locks \
-MANIFEST_TOOL \
-DSYMUTIL \
-NMEDIT \
-LIPO \
-OTOOL \
-OTOOL64 \
-shrext_cmds \
-export_dynamic_flag_spec \
-whole_archive_flag_spec \
-compiler_needs_object \
-with_gnu_ld \
-allow_undefined_flag \
-no_undefined_flag \
-hardcode_libdir_flag_spec \
-hardcode_libdir_separator \
-exclude_expsyms \
-include_expsyms \
-file_list_spec \
-variables_saved_for_relink \
-libname_spec \
-library_names_spec \
-soname_spec \
-install_override_mode \
-finish_eval \
-old_striplib \
-striplib \
-compiler_lib_search_dirs \
-predep_objects \
-postdep_objects \
-predeps \
-postdeps \
-compiler_lib_search_path \
-LD_CXX \
-LD_FC \
-reload_flag_CXX \
-reload_flag_FC \
-compiler_CXX \
-compiler_FC \
-lt_prog_compiler_no_builtin_flag_CXX \
-lt_prog_compiler_no_builtin_flag_FC \
-lt_prog_compiler_pic_CXX \
-lt_prog_compiler_pic_FC \
-lt_prog_compiler_wl_CXX \
-lt_prog_compiler_wl_FC \
-lt_prog_compiler_static_CXX \
-lt_prog_compiler_static_FC \
-lt_cv_prog_compiler_c_o_CXX \
-lt_cv_prog_compiler_c_o_FC \
-export_dynamic_flag_spec_CXX \
-export_dynamic_flag_spec_FC \
-whole_archive_flag_spec_CXX \
-whole_archive_flag_spec_FC \
-compiler_needs_object_CXX \
-compiler_needs_object_FC \
-with_gnu_ld_CXX \
-with_gnu_ld_FC \
-allow_undefined_flag_CXX \
-allow_undefined_flag_FC \
-no_undefined_flag_CXX \
-no_undefined_flag_FC \
-hardcode_libdir_flag_spec_CXX \
-hardcode_libdir_flag_spec_FC \
-hardcode_libdir_separator_CXX \
-hardcode_libdir_separator_FC \
-exclude_expsyms_CXX \
-exclude_expsyms_FC \
-include_expsyms_CXX \
-include_expsyms_FC \
-file_list_spec_CXX \
-file_list_spec_FC \
-compiler_lib_search_dirs_CXX \
-compiler_lib_search_dirs_FC \
-predep_objects_CXX \
-predep_objects_FC \
-postdep_objects_CXX \
-postdep_objects_FC \
-predeps_CXX \
-predeps_FC \
-postdeps_CXX \
-postdeps_FC \
-compiler_lib_search_path_CXX \
-compiler_lib_search_path_FC; do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-# Double-quote double-evaled strings.
-for var in reload_cmds \
-old_postinstall_cmds \
-old_postuninstall_cmds \
-old_archive_cmds \
-extract_expsyms_cmds \
-old_archive_from_new_cmds \
-old_archive_from_expsyms_cmds \
-archive_cmds \
-archive_expsym_cmds \
-module_cmds \
-module_expsym_cmds \
-export_symbols_cmds \
-prelink_cmds \
-postlink_cmds \
-postinstall_cmds \
-postuninstall_cmds \
-finish_cmds \
-sys_lib_search_path_spec \
-sys_lib_dlsearch_path_spec \
-reload_cmds_CXX \
-reload_cmds_FC \
-old_archive_cmds_CXX \
-old_archive_cmds_FC \
-old_archive_from_new_cmds_CXX \
-old_archive_from_new_cmds_FC \
-old_archive_from_expsyms_cmds_CXX \
-old_archive_from_expsyms_cmds_FC \
-archive_cmds_CXX \
-archive_cmds_FC \
-archive_expsym_cmds_CXX \
-archive_expsym_cmds_FC \
-module_cmds_CXX \
-module_cmds_FC \
-module_expsym_cmds_CXX \
-module_expsym_cmds_FC \
-export_symbols_cmds_CXX \
-export_symbols_cmds_FC \
-prelink_cmds_CXX \
-prelink_cmds_FC \
-postlink_cmds_CXX \
-postlink_cmds_FC; do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-ac_aux_dir='$ac_aux_dir'
-xsi_shell='$xsi_shell'
-lt_shell_append='$lt_shell_append'
-
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-
-
-    PACKAGE='$PACKAGE'
-    VERSION='$VERSION'
-    TIMESTAMP='$TIMESTAMP'
-    RM='$RM'
-    ofile='$ofile'
-
-
-
-
-
-ac_aux_dir='$ac_aux_dir'
-
-
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
-  case $ac_config_target in
-    "src/H5config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/H5config.h" ;;
-    "pubconf") CONFIG_COMMANDS="$CONFIG_COMMANDS pubconf" ;;
-    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
-    "src/libhdf5.settings") CONFIG_FILES="$CONFIG_FILES src/libhdf5.settings" ;;
-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-    "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
-    "test/testcheck_version.sh") CONFIG_FILES="$CONFIG_FILES test/testcheck_version.sh" ;;
-    "test/testerror.sh") CONFIG_FILES="$CONFIG_FILES test/testerror.sh" ;;
-    "test/H5srcdir_str.h") CONFIG_FILES="$CONFIG_FILES test/H5srcdir_str.h" ;;
-    "test/testlibinfo.sh") CONFIG_FILES="$CONFIG_FILES test/testlibinfo.sh" ;;
-    "test/testlinks_env.sh") CONFIG_FILES="$CONFIG_FILES test/testlinks_env.sh" ;;
-    "test/test_plugin.sh") CONFIG_FILES="$CONFIG_FILES test/test_plugin.sh" ;;
-    "testpar/Makefile") CONFIG_FILES="$CONFIG_FILES testpar/Makefile" ;;
-    "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
-    "tools/h5dump/Makefile") CONFIG_FILES="$CONFIG_FILES tools/h5dump/Makefile" ;;
-    "tools/h5dump/testh5dump.sh") CONFIG_FILES="$CONFIG_FILES tools/h5dump/testh5dump.sh" ;;
-    "tools/h5dump/testh5dumppbits.sh") CONFIG_FILES="$CONFIG_FILES tools/h5dump/testh5dumppbits.sh" ;;
-    "tools/h5dump/testh5dumpxml.sh") CONFIG_FILES="$CONFIG_FILES tools/h5dump/testh5dumpxml.sh" ;;
-    "tools/h5ls/testh5ls.sh") CONFIG_FILES="$CONFIG_FILES tools/h5ls/testh5ls.sh" ;;
-    "tools/h5import/Makefile") CONFIG_FILES="$CONFIG_FILES tools/h5import/Makefile" ;;
-    "tools/h5import/h5importtestutil.sh") CONFIG_FILES="$CONFIG_FILES tools/h5import/h5importtestutil.sh" ;;
-    "tools/h5diff/Makefile") CONFIG_FILES="$CONFIG_FILES tools/h5diff/Makefile" ;;
-    "tools/h5diff/testh5diff.sh") CONFIG_FILES="$CONFIG_FILES tools/h5diff/testh5diff.sh" ;;
-    "tools/h5diff/testph5diff.sh") CONFIG_FILES="$CONFIG_FILES tools/h5diff/testph5diff.sh" ;;
-    "tools/h5jam/Makefile") CONFIG_FILES="$CONFIG_FILES tools/h5jam/Makefile" ;;
-    "tools/h5jam/testh5jam.sh") CONFIG_FILES="$CONFIG_FILES tools/h5jam/testh5jam.sh" ;;
-    "tools/h5repack/Makefile") CONFIG_FILES="$CONFIG_FILES tools/h5repack/Makefile" ;;
-    "tools/h5repack/h5repack.sh") CONFIG_FILES="$CONFIG_FILES tools/h5repack/h5repack.sh" ;;
-    "tools/h5repack/h5repack_plugin.sh") CONFIG_FILES="$CONFIG_FILES tools/h5repack/h5repack_plugin.sh" ;;
-    "tools/h5ls/Makefile") CONFIG_FILES="$CONFIG_FILES tools/h5ls/Makefile" ;;
-    "tools/h5copy/Makefile") CONFIG_FILES="$CONFIG_FILES tools/h5copy/Makefile" ;;
-    "tools/h5copy/testh5copy.sh") CONFIG_FILES="$CONFIG_FILES tools/h5copy/testh5copy.sh" ;;
-    "tools/lib/Makefile") CONFIG_FILES="$CONFIG_FILES tools/lib/Makefile" ;;
-    "tools/misc/Makefile") CONFIG_FILES="$CONFIG_FILES tools/misc/Makefile" ;;
-    "tools/misc/h5cc") CONFIG_FILES="$CONFIG_FILES tools/misc/h5cc" ;;
-    "tools/misc/testh5mkgrp.sh") CONFIG_FILES="$CONFIG_FILES tools/misc/testh5mkgrp.sh" ;;
-    "tools/misc/testh5repart.sh") CONFIG_FILES="$CONFIG_FILES tools/misc/testh5repart.sh" ;;
-    "tools/h5stat/testh5stat.sh") CONFIG_FILES="$CONFIG_FILES tools/h5stat/testh5stat.sh" ;;
-    "tools/h5stat/Makefile") CONFIG_FILES="$CONFIG_FILES tools/h5stat/Makefile" ;;
-    "tools/perform/Makefile") CONFIG_FILES="$CONFIG_FILES tools/perform/Makefile" ;;
-    "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
-    "examples/run-c-ex.sh") CONFIG_FILES="$CONFIG_FILES examples/run-c-ex.sh" ;;
-    "examples/testh5cc.sh") CONFIG_FILES="$CONFIG_FILES examples/testh5cc.sh" ;;
-    "c++/Makefile") CONFIG_FILES="$CONFIG_FILES c++/Makefile" ;;
-    "c++/src/Makefile") CONFIG_FILES="$CONFIG_FILES c++/src/Makefile" ;;
-    "c++/src/h5c++") CONFIG_FILES="$CONFIG_FILES c++/src/h5c++" ;;
-    "c++/test/Makefile") CONFIG_FILES="$CONFIG_FILES c++/test/Makefile" ;;
-    "c++/test/H5srcdir_str.h") CONFIG_FILES="$CONFIG_FILES c++/test/H5srcdir_str.h" ;;
-    "c++/examples/Makefile") CONFIG_FILES="$CONFIG_FILES c++/examples/Makefile" ;;
-    "c++/examples/run-c++-ex.sh") CONFIG_FILES="$CONFIG_FILES c++/examples/run-c++-ex.sh" ;;
-    "c++/examples/testh5c++.sh") CONFIG_FILES="$CONFIG_FILES c++/examples/testh5c++.sh" ;;
-    "fortran/Makefile") CONFIG_FILES="$CONFIG_FILES fortran/Makefile" ;;
-    "fortran/src/h5fc") CONFIG_FILES="$CONFIG_FILES fortran/src/h5fc" ;;
-    "fortran/src/Makefile") CONFIG_FILES="$CONFIG_FILES fortran/src/Makefile" ;;
-    "fortran/test/Makefile") CONFIG_FILES="$CONFIG_FILES fortran/test/Makefile" ;;
-    "fortran/testpar/Makefile") CONFIG_FILES="$CONFIG_FILES fortran/testpar/Makefile" ;;
-    "fortran/examples/Makefile") CONFIG_FILES="$CONFIG_FILES fortran/examples/Makefile" ;;
-    "fortran/examples/run-fortran-ex.sh") CONFIG_FILES="$CONFIG_FILES fortran/examples/run-fortran-ex.sh" ;;
-    "fortran/examples/testh5fc.sh") CONFIG_FILES="$CONFIG_FILES fortran/examples/testh5fc.sh" ;;
-    "hl/Makefile") CONFIG_FILES="$CONFIG_FILES hl/Makefile" ;;
-    "hl/src/Makefile") CONFIG_FILES="$CONFIG_FILES hl/src/Makefile" ;;
-    "hl/test/Makefile") CONFIG_FILES="$CONFIG_FILES hl/test/Makefile" ;;
-    "hl/test/H5srcdir_str.h") CONFIG_FILES="$CONFIG_FILES hl/test/H5srcdir_str.h" ;;
-    "hl/tools/Makefile") CONFIG_FILES="$CONFIG_FILES hl/tools/Makefile" ;;
-    "hl/tools/gif2h5/Makefile") CONFIG_FILES="$CONFIG_FILES hl/tools/gif2h5/Makefile" ;;
-    "hl/tools/gif2h5/h52giftest.sh") CONFIG_FILES="$CONFIG_FILES hl/tools/gif2h5/h52giftest.sh" ;;
-    "hl/examples/Makefile") CONFIG_FILES="$CONFIG_FILES hl/examples/Makefile" ;;
-    "hl/examples/run-hlc-ex.sh") CONFIG_FILES="$CONFIG_FILES hl/examples/run-hlc-ex.sh" ;;
-    "hl/c++/Makefile") CONFIG_FILES="$CONFIG_FILES hl/c++/Makefile" ;;
-    "hl/c++/src/Makefile") CONFIG_FILES="$CONFIG_FILES hl/c++/src/Makefile" ;;
-    "hl/c++/test/Makefile") CONFIG_FILES="$CONFIG_FILES hl/c++/test/Makefile" ;;
-    "hl/c++/examples/Makefile") CONFIG_FILES="$CONFIG_FILES hl/c++/examples/Makefile" ;;
-    "hl/c++/examples/run-hlc++-ex.sh") CONFIG_FILES="$CONFIG_FILES hl/c++/examples/run-hlc++-ex.sh" ;;
-    "hl/fortran/Makefile") CONFIG_FILES="$CONFIG_FILES hl/fortran/Makefile" ;;
-    "hl/fortran/src/Makefile") CONFIG_FILES="$CONFIG_FILES hl/fortran/src/Makefile" ;;
-    "hl/fortran/test/Makefile") CONFIG_FILES="$CONFIG_FILES hl/fortran/test/Makefile" ;;
-    "hl/fortran/examples/Makefile") CONFIG_FILES="$CONFIG_FILES hl/fortran/examples/Makefile" ;;
-    "hl/fortran/examples/run-hlfortran-ex.sh") CONFIG_FILES="$CONFIG_FILES hl/fortran/examples/run-hlfortran-ex.sh" ;;
-
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
-  esac
-done
-
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
-  tmp= ac_tmp=
-  trap 'exit_status=$?
-  : "${ac_tmp:=$tmp}"
-  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
-' 0
-  trap 'as_fn_exit 1' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -d "$tmp"
-}  ||
-{
-  tmp=./conf$$-$RANDOM
-  (umask 077 && mkdir "$tmp")
-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
-ac_tmp=$tmp
-
-# Set up the scripts for CONFIG_FILES section.
-# No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
-if test -n "$CONFIG_FILES"; then
-
-
-ac_cr=`echo X | tr X '\015'`
-# On cygwin, bash can eat \r inside `` if the user requested igncr.
-# But we know of no other shell where ac_cr would be empty at this
-# point, so we can use a bashism as a fallback.
-if test "x$ac_cr" = x; then
-  eval ac_cr=\$\'\\r\'
-fi
-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\\r'
-else
-  ac_cs_awk_cr=$ac_cr
-fi
-
-echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
-_ACEOF
-
-
-{
-  echo "cat >conf$$subs.awk <<_ACEOF" &&
-  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-  echo "_ACEOF"
-} >conf$$subs.sh ||
-  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  . ./conf$$subs.sh ||
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-
-  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
-  if test $ac_delim_n = $ac_delim_num; then
-    break
-  elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-rm -f conf$$subs.sh
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
-_ACEOF
-sed -n '
-h
-s/^/S["/; s/!.*/"]=/
-p
-g
-s/^[^!]*!//
-:repl
-t repl
-s/'"$ac_delim"'$//
-t delim
-:nl
-h
-s/\(.\{148\}\)..*/\1/
-t more1
-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
-p
-n
-b repl
-:more1
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t nl
-:delim
-h
-s/\(.\{148\}\)..*/\1/
-t more2
-s/["\\]/\\&/g; s/^/"/; s/$/"/
-p
-b
-:more2
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t delim
-' <conf$$subs.awk | sed '
-/^[^""]/{
-  N
-  s/\n//
-}
-' >>$CONFIG_STATUS || ac_write_fail=1
-rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACAWK
-cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
-  for (key in S) S_is_set[key] = 1
-  FS = ""
-
-}
-{
-  line = $ 0
-  nfields = split(line, field, "@")
-  substed = 0
-  len = length(field[1])
-  for (i = 2; i < nfields; i++) {
-    key = field[i]
-    keylen = length(key)
-    if (S_is_set[key]) {
-      value = S[key]
-      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
-      len += length(value) + length(field[++i])
-      substed = 1
-    } else
-      len += 1 + keylen
-  }
-
-  print line
-}
-
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
-  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-else
-  cat
-fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
-  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
-_ACEOF
-
-# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
-h
-s///
-s/^/:/
-s/[	 ]*$/:/
-s/:\$(srcdir):/:/g
-s/:\${srcdir}:/:/g
-s/:@srcdir@:/:/g
-s/^:*//
-s/:*$//
-x
-s/\(=[	 ]*\).*/\1/
-G
-s/\n//
-s/^[^=]*=[	 ]*$//
-}'
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-fi # test -n "$CONFIG_FILES"
-
-# Set up the scripts for CONFIG_HEADERS section.
-# No need to generate them if there are no CONFIG_HEADERS.
-# This happens for instance with `./config.status Makefile'.
-if test -n "$CONFIG_HEADERS"; then
-cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
-BEGIN {
-_ACEOF
-
-# Transform confdefs.h into an awk script `defines.awk', embedded as
-# here-document in config.status, that substitutes the proper values into
-# config.h.in to produce config.h.
-
-# Create a delimiter string that does not exist in confdefs.h, to ease
-# handling of long lines.
-ac_delim='%!_!# '
-for ac_last_try in false false :; do
-  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_tt"; then
-    break
-  elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-# For the awk script, D is an array of macro values keyed by name,
-# likewise P contains macro parameters if any.  Preserve backslash
-# newline sequences.
-
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-sed -n '
-s/.\{148\}/&'"$ac_delim"'/g
-t rset
-:rset
-s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
-t def
-d
-:def
-s/\\$//
-t bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3"/p
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
-d
-:bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3\\\\\\n"\\/p
-t cont
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
-t cont
-d
-:cont
-n
-s/.\{148\}/&'"$ac_delim"'/g
-t clear
-:clear
-s/\\$//
-t bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/"/p
-d
-:bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
-b cont
-' <confdefs.h | sed '
-s/'"$ac_delim"'/"\\\
-"/g' >>$CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  for (key in D) D_is_set[key] = 1
-  FS = ""
-}
-/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
-  line = \$ 0
-  split(line, arg, " ")
-  if (arg[1] == "#") {
-    defundef = arg[2]
-    mac1 = arg[3]
-  } else {
-    defundef = substr(arg[1], 2)
-    mac1 = arg[2]
-  }
-  split(mac1, mac2, "(") #)
-  macro = mac2[1]
-  prefix = substr(line, 1, index(line, defundef) - 1)
-  if (D_is_set[macro]) {
-    # Preserve the white space surrounding the "#".
-    print prefix "define", macro P[macro] D[macro]
-    next
-  } else {
-    # Replace #undef with comments.  This is necessary, for example,
-    # in the case of _POSIX_SOURCE, which is predefined and required
-    # on some systems where configure will not decide to define it.
-    if (defundef == "undef") {
-      print "/*", prefix defundef, macro, "*/"
-      next
-    }
-  }
-}
-{ print }
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
-fi # test -n "$CONFIG_HEADERS"
-
-
-eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
-shift
-for ac_tag
-do
-  case $ac_tag in
-  :[FHLC]) ac_mode=$ac_tag; continue;;
-  esac
-  case $ac_mode$ac_tag in
-  :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
-  :[FH]-) ac_tag=-:-;;
-  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-  esac
-  ac_save_IFS=$IFS
-  IFS=:
-  set x $ac_tag
-  IFS=$ac_save_IFS
-  shift
-  ac_file=$1
-  shift
-
-  case $ac_mode in
-  :L) ac_source=$1;;
-  :[FH])
-    ac_file_inputs=
-    for ac_f
-    do
-      case $ac_f in
-      -) ac_f="$ac_tmp/stdin";;
-      *) # Look for the file first in the build tree, then in the source tree
-	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
-	 test -f "$ac_f" ||
-	   case $ac_f in
-	   [\\/$]*) false;;
-	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-	   esac ||
-	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
-      esac
-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      as_fn_append ac_file_inputs " '$ac_f'"
-    done
-
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
-    # use $as_me), people would be surprised to read:
-    #    /* config.h.  Generated by config.status.  */
-    configure_input='Generated from '`
-	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
-	`' by configure.'
-    if test x"$ac_file" != x-; then
-      configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
-    fi
-    # Neutralize special characters interpreted by sed in replacement strings.
-    case $configure_input in #(
-    *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`$as_echo "$configure_input" |
-       sed 's/[\\\\&|]/\\\\&/g'`;; #(
-    *) ac_sed_conf_input=$configure_input;;
-    esac
-
-    case $ac_tag in
-    *:-:* | *:-) cat >"$ac_tmp/stdin" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
-    esac
-    ;;
-  esac
-
-  ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  as_dir="$ac_dir"; as_fn_mkdir_p
-  ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
-  case $ac_mode in
-  :F)
-  #
-  # CONFIG_FILE
-  #
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-  esac
-  ac_MKDIR_P=$MKDIR_P
-  case $MKDIR_P in
-  [\\/$]* | ?:[\\/]* ) ;;
-  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
-  esac
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-ac_sed_dataroot='
-/datarootdir/ {
-  p
-  q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p'
-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  ac_datarootdir_hack='
-  s&@datadir@&$datadir&g
-  s&@docdir@&$docdir&g
-  s&@infodir@&$infodir&g
-  s&@localedir@&$localedir&g
-  s&@mandir@&$mandir&g
-  s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
-_ACEOF
-
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_sed_extra="$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s|@configure_input@|$ac_sed_conf_input|;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@top_build_prefix@&$ac_top_build_prefix&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-s&@INSTALL@&$ac_INSTALL&;t t
-s&@MKDIR_P@&$ac_MKDIR_P&;t t
-$ac_datarootdir_hack
-"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
-  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
-      "$ac_tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&2;}
-
-  rm -f "$ac_tmp/stdin"
-  case $ac_file in
-  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
-  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
-  esac \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
- ;;
-  :H)
-  #
-  # CONFIG_HEADER
-  #
-  if test x"$ac_file" != x-; then
-    {
-      $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
-    } >"$ac_tmp/config.h" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      rm -f "$ac_file"
-      mv "$ac_tmp/config.h" "$ac_file" \
-	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
-    fi
-  else
-    $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error $? "could not create -" "$LINENO" 5
-  fi
-# Compute "$ac_file"'s index in $config_headers.
-_am_arg="$ac_file"
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $_am_arg | $_am_arg:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
-$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$_am_arg" : 'X\(//\)[^/]' \| \
-	 X"$_am_arg" : 'X\(//\)$' \| \
-	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$_am_arg" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`/stamp-h$_am_stamp_count
- ;;
-
-  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
-$as_echo "$as_me: executing $ac_file commands" >&6;}
- ;;
-  esac
-
-
-  case $ac_file$ac_mode in
-    "pubconf":C)
-  echo "creating src/H5pubconf.h"
-  sed 's/#define /#define H5_/' <src/H5config.h |\
-    sed 's/#undef /#undef H5_/' >pubconf
-  if test ! -f src/H5pubconf.h; then
-    /bin/mv -f pubconf src/H5pubconf.h
-  elif (diff pubconf src/H5pubconf.h >/dev/null); then
-    rm -f pubconf
-    echo "src/H5pubconf.h is unchanged"
-  else
-    /bin/mv -f pubconf src/H5pubconf.h
-  fi
-  echo "Post process src/libhdf5.settings"
-  sed '/^#/d' < src/libhdf5.settings > libhdf5.settings.TMP
-  cp libhdf5.settings.TMP src/libhdf5.settings
-  rm -f libhdf5.settings.TMP
- ;;
-    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-  # Older Autoconf quotes --file arguments for eval, but not when files
-  # are listed without --file.  Let's play safe and only enable the eval
-  # if we detect the quoting.
-  case $CONFIG_FILES in
-  *\'*) eval set x "$CONFIG_FILES" ;;
-  *)   set x $CONFIG_FILES ;;
-  esac
-  shift
-  for mf
-  do
-    # Strip MF so we end up with the name of the file.
-    mf=`echo "$mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named 'Makefile.in', but
-    # some people rename them; so instead we look at the file content.
-    # Grep'ing the first line is not enough: some people post-process
-    # each Makefile.in and add a new line on top of each file to say so.
-    # Grep'ing the whole file is not good either: AIX grep has a line
-    # limit of 2048, but all sed's we know have understand at least 4000.
-    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-      dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$mf" : 'X\(//\)[^/]' \| \
-	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$mf" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-    else
-      continue
-    fi
-    # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running 'make'.
-    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-    test -z "$DEPDIR" && continue
-    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "$am__include" && continue
-    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # Find all dependency output files, they are included files with
-    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-    # simplest approach to changing $(DEPDIR) to its actual value in the
-    # expansion.
-    for file in `sed -n "
-      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
-      # Make sure the directory exists.
-      test -f "$dirpart/$file" && continue
-      fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$file" : 'X\(//\)[^/]' \| \
-	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      as_dir=$dirpart/$fdir; as_fn_mkdir_p
-      # echo "creating $dirpart/$file"
-      echo '# dummy' > "$dirpart/$file"
-    done
-  done
-}
- ;;
-    "libtool":C)
-
-    # See if we are running on zsh, and set the options which allow our
-    # commands through without removal of \ escapes.
-    if test -n "${ZSH_VERSION+set}" ; then
-      setopt NO_GLOB_SUBST
-    fi
-
-    cfgfile="${ofile}T"
-    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
-    $RM "$cfgfile"
-
-    cat <<_LT_EOF >> "$cfgfile"
-#! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-#                 Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-#   This file is part of GNU Libtool.
-#
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-# The names of the tagged configurations supported by this script.
-available_tags="CXX FC "
-
-# ### BEGIN LIBTOOL CONFIG
-
-# Assembler program.
-AS=$lt_AS
-
-# DLL creation program.
-DLLTOOL=$lt_DLLTOOL
-
-# Object dumper program.
-OBJDUMP=$lt_OBJDUMP
-
-# Which release of libtool.m4 was used?
-macro_version=$macro_version
-macro_revision=$macro_revision
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# What type of objects to build.
-pic_mode=$pic_mode
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# An echo program that protects backslashes.
-ECHO=$lt_ECHO
-
-# The PATH separator for the build system.
-PATH_SEPARATOR=$lt_PATH_SEPARATOR
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# A sed program that does not truncate output.
-SED=$lt_SED
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="\$SED -e 1s/^X//"
-
-# A grep program that handles long lines.
-GREP=$lt_GREP
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# A literal string matcher.
-FGREP=$lt_FGREP
-
-# A BSD- or MS-compatible name lister.
-NM=$lt_NM
-
-# Whether we need soft or hard links.
-LN_S=$lt_LN_S
-
-# What is the maximum length of a command?
-max_cmd_len=$max_cmd_len
-
-# Object file suffix (normally "o").
-objext=$ac_objext
-
-# Executable file suffix (normally "").
-exeext=$exeext
-
-# whether the shell understands "unset".
-lt_unset=$lt_unset
-
-# turn spaces into newlines.
-SP2NL=$lt_lt_SP2NL
-
-# turn newlines into spaces.
-NL2SP=$lt_lt_NL2SP
-
-# convert \$build file names to \$host format.
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-
-# convert \$build files to toolchain format.
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method = "file_magic".
-file_magic_cmd=$lt_file_magic_cmd
-
-# How to find potential files when deplibs_check_method = "file_magic".
-file_magic_glob=$lt_file_magic_glob
-
-# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
-want_nocaseglob=$lt_want_nocaseglob
-
-# Command to associate shared and link libraries.
-sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
-
-# The archiver.
-AR=$lt_AR
-
-# Flags to create an archive.
-AR_FLAGS=$lt_AR_FLAGS
-
-# How to feed a file listing to the archiver.
-archiver_list_spec=$lt_archiver_list_spec
-
-# A symbol stripping program.
-STRIP=$lt_STRIP
-
-# Commands used to install an old-style archive.
-RANLIB=$lt_RANLIB
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Whether to use a lock for old archive extraction.
-lock_old_archive_extraction=$lock_old_archive_extraction
-
-# A C compiler.
-LTCC=$lt_CC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_CFLAGS
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration.
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair.
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# Transform the output of nm in a C name address pair when lib prefix is needed.
-global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
-
-# Specify filename containing input files for \$NM.
-nm_file_list_spec=$lt_nm_file_list_spec
-
-# The root where to search for dependent libraries,and in which our libraries should be installed.
-lt_sysroot=$lt_sysroot
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# Used to examine libraries when file_magic_cmd begins with "file".
-MAGIC_CMD=$MAGIC_CMD
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# Manifest tool.
-MANIFEST_TOOL=$lt_MANIFEST_TOOL
-
-# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
-DSYMUTIL=$lt_DSYMUTIL
-
-# Tool to change global to local symbols on Mac OS X.
-NMEDIT=$lt_NMEDIT
-
-# Tool to manipulate fat objects and archives on Mac OS X.
-LIPO=$lt_LIPO
-
-# ldd/readelf like tool for Mach-O binaries on Mac OS X.
-OTOOL=$lt_OTOOL
-
-# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
-OTOOL64=$lt_OTOOL64
-
-# Old archive suffix (normally "a").
-libext=$libext
-
-# Shared library suffix (normally ".so").
-shrext_cmds=$lt_shrext_cmds
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at link time.
-variables_saved_for_relink=$lt_variables_saved_for_relink
-
-# Do we need the "lib" prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Library versioning type.
-version_type=$version_type
-
-# Shared library runtime path variable.
-runpath_var=$runpath_var
-
-# Shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Permission mode override for installation of shared libraries.
-install_override_mode=$lt_install_override_mode
-
-# Command to use after installation of a shared archive.
-postinstall_cmds=$lt_postinstall_cmds
-
-# Command to use after uninstallation of a shared archive.
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# As "finish_cmds", except a single script fragment to be evaled but
-# not shown.
-finish_eval=$lt_finish_eval
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Compile-time system search path for libraries.
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries.
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-
-# The linker used to build libraries.
-LD=$lt_LD
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# Commands used to build an old-style archive.
-old_archive_cmds=$lt_old_archive_cmds
-
-# A language specific compiler.
-CC=$lt_compiler
-
-# Is the compiler the GNU compiler?
-with_gcc=$GCC
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc
-
-# Whether or not to disallow shared libs when runtime libs are static.
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec
-
-# Whether the compiler copes with passing no objects directly.
-compiler_needs_object=$lt_compiler_needs_object
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
-
-# Commands used to build a shared archive.
-archive_cmds=$lt_archive_cmds
-archive_expsym_cmds=$lt_archive_expsym_cmds
-
-# Commands used to build a loadable module if different from building
-# a shared archive.
-module_cmds=$lt_module_cmds
-module_expsym_cmds=$lt_module_expsym_cmds
-
-# Whether we are building with GNU ld or not.
-with_gnu_ld=$lt_with_gnu_ld
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag
-
-# Flag that enforces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
-
-# Whether we need a single "-rpath" flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator
-
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-# DIR into the resulting binary.
-hardcode_direct=$hardcode_direct
-
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-# DIR into the resulting binary and the resulting library dependency is
-# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
-# library is relocated.
-hardcode_direct_absolute=$hardcode_direct_absolute
-
-# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-# into the resulting binary.
-hardcode_minus_L=$hardcode_minus_L
-
-# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-# into the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var
-
-# Set to "yes" if building a shared library automatically hardcodes DIR
-# into the library and all subsequent libraries and executables linked
-# against it.
-hardcode_automatic=$hardcode_automatic
-
-# Set to yes if linker adds runtime paths of dependent libraries
-# to runtime path list.
-inherit_rpath=$inherit_rpath
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs
-
-# Set to "yes" if exported symbols are required.
-always_export_symbols=$always_export_symbols
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms
-
-# Commands necessary for linking programs (against libraries) with templates.
-prelink_cmds=$lt_prelink_cmds
-
-# Commands necessary for finishing linking programs.
-postlink_cmds=$lt_postlink_cmds
-
-# Specify filename containing input files.
-file_list_spec=$lt_file_list_spec
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action
-
-# The directories searched by this compiler when creating a shared library.
-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
-
-# Dependencies to place before and after the objects being linked to
-# create a shared library.
-predep_objects=$lt_predep_objects
-postdep_objects=$lt_postdep_objects
-predeps=$lt_predeps
-postdeps=$lt_postdeps
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path
-
-# ### END LIBTOOL CONFIG
-
-_LT_EOF
-
-  case $host_os in
-  aix3*)
-    cat <<\_LT_EOF >> "$cfgfile"
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-_LT_EOF
-    ;;
-  esac
-
-
-ltmain="$ac_aux_dir/ltmain.sh"
-
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" \
-     || (rm -f "$cfgfile"; exit 1)
-
-  if test x"$xsi_shell" = xyes; then
-  sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
-func_dirname ()\
-{\
-\    case ${1} in\
-\      */*) func_dirname_result="${1%/*}${2}" ;;\
-\      *  ) func_dirname_result="${3}" ;;\
-\    esac\
-} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_basename ()$/,/^} # func_basename /c\
-func_basename ()\
-{\
-\    func_basename_result="${1##*/}"\
-} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
-func_dirname_and_basename ()\
-{\
-\    case ${1} in\
-\      */*) func_dirname_result="${1%/*}${2}" ;;\
-\      *  ) func_dirname_result="${3}" ;;\
-\    esac\
-\    func_basename_result="${1##*/}"\
-} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
-func_stripname ()\
-{\
-\    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
-\    # positional parameters, so assign one to ordinary parameter first.\
-\    func_stripname_result=${3}\
-\    func_stripname_result=${func_stripname_result#"${1}"}\
-\    func_stripname_result=${func_stripname_result%"${2}"}\
-} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
-func_split_long_opt ()\
-{\
-\    func_split_long_opt_name=${1%%=*}\
-\    func_split_long_opt_arg=${1#*=}\
-} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
-func_split_short_opt ()\
-{\
-\    func_split_short_opt_arg=${1#??}\
-\    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
-} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
-func_lo2o ()\
-{\
-\    case ${1} in\
-\      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
-\      *)    func_lo2o_result=${1} ;;\
-\    esac\
-} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_xform ()$/,/^} # func_xform /c\
-func_xform ()\
-{\
-    func_xform_result=${1%.*}.lo\
-} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_arith ()$/,/^} # func_arith /c\
-func_arith ()\
-{\
-    func_arith_result=$(( $* ))\
-} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_len ()$/,/^} # func_len /c\
-func_len ()\
-{\
-    func_len_result=${#1}\
-} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-fi
-
-if test x"$lt_shell_append" = xyes; then
-  sed -e '/^func_append ()$/,/^} # func_append /c\
-func_append ()\
-{\
-    eval "${1}+=\\${2}"\
-} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
-func_append_quoted ()\
-{\
-\    func_quote_for_eval "${2}"\
-\    eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
-} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  # Save a `func_append' function call where possible by direct use of '+='
-  sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
-    && mv -f "$cfgfile.tmp" "$cfgfile" \
-      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-  test 0 -eq $? || _lt_function_replace_fail=:
-else
-  # Save a `func_append' function call even when '+=' is not available
-  sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
-    && mv -f "$cfgfile.tmp" "$cfgfile" \
-      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-  test 0 -eq $? || _lt_function_replace_fail=:
-fi
-
-if test x"$_lt_function_replace_fail" = x":"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
-$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
-fi
-
-
-   mv -f "$cfgfile" "$ofile" ||
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-
-
-    cat <<_LT_EOF >> "$ofile"
-
-# ### BEGIN LIBTOOL TAG CONFIG: CXX
-
-# The linker used to build libraries.
-LD=$lt_LD_CXX
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag_CXX
-reload_cmds=$lt_reload_cmds_CXX
-
-# Commands used to build an old-style archive.
-old_archive_cmds=$lt_old_archive_cmds_CXX
-
-# A language specific compiler.
-CC=$lt_compiler_CXX
-
-# Is the compiler the GNU compiler?
-with_gcc=$GCC_CXX
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_CXX
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_CXX
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_CXX
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_CXX
-
-# Whether or not to disallow shared libs when runtime libs are static.
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
-
-# Whether the compiler copes with passing no objects directly.
-compiler_needs_object=$lt_compiler_needs_object_CXX
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
-
-# Commands used to build a shared archive.
-archive_cmds=$lt_archive_cmds_CXX
-archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
-
-# Commands used to build a loadable module if different from building
-# a shared archive.
-module_cmds=$lt_module_cmds_CXX
-module_expsym_cmds=$lt_module_expsym_cmds_CXX
-
-# Whether we are building with GNU ld or not.
-with_gnu_ld=$lt_with_gnu_ld_CXX
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_CXX
-
-# Flag that enforces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_CXX
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
-
-# Whether we need a single "-rpath" flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
-
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-# DIR into the resulting binary.
-hardcode_direct=$hardcode_direct_CXX
-
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-# DIR into the resulting binary and the resulting library dependency is
-# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
-# library is relocated.
-hardcode_direct_absolute=$hardcode_direct_absolute_CXX
-
-# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-# into the resulting binary.
-hardcode_minus_L=$hardcode_minus_L_CXX
-
-# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-# into the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
-
-# Set to "yes" if building a shared library automatically hardcodes DIR
-# into the library and all subsequent libraries and executables linked
-# against it.
-hardcode_automatic=$hardcode_automatic_CXX
-
-# Set to yes if linker adds runtime paths of dependent libraries
-# to runtime path list.
-inherit_rpath=$inherit_rpath_CXX
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_CXX
-
-# Set to "yes" if exported symbols are required.
-always_export_symbols=$always_export_symbols_CXX
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_CXX
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_CXX
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_CXX
-
-# Commands necessary for linking programs (against libraries) with templates.
-prelink_cmds=$lt_prelink_cmds_CXX
-
-# Commands necessary for finishing linking programs.
-postlink_cmds=$lt_postlink_cmds_CXX
-
-# Specify filename containing input files.
-file_list_spec=$lt_file_list_spec_CXX
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_CXX
-
-# The directories searched by this compiler when creating a shared library.
-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
-
-# Dependencies to place before and after the objects being linked to
-# create a shared library.
-predep_objects=$lt_predep_objects_CXX
-postdep_objects=$lt_postdep_objects_CXX
-predeps=$lt_predeps_CXX
-postdeps=$lt_postdeps_CXX
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
-
-# ### END LIBTOOL TAG CONFIG: CXX
-_LT_EOF
-
-
-    cat <<_LT_EOF >> "$ofile"
-
-# ### BEGIN LIBTOOL TAG CONFIG: FC
-
-# The linker used to build libraries.
-LD=$lt_LD_FC
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag_FC
-reload_cmds=$lt_reload_cmds_FC
-
-# Commands used to build an old-style archive.
-old_archive_cmds=$lt_old_archive_cmds_FC
-
-# A language specific compiler.
-CC=$lt_compiler_FC
-
-# Is the compiler the GNU compiler?
-with_gcc=$GCC_FC
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_FC
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_FC
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_FC
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_FC
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_FC
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_FC
-
-# Whether or not to disallow shared libs when runtime libs are static.
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_FC
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_FC
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_FC
-
-# Whether the compiler copes with passing no objects directly.
-compiler_needs_object=$lt_compiler_needs_object_FC
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_FC
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_FC
-
-# Commands used to build a shared archive.
-archive_cmds=$lt_archive_cmds_FC
-archive_expsym_cmds=$lt_archive_expsym_cmds_FC
-
-# Commands used to build a loadable module if different from building
-# a shared archive.
-module_cmds=$lt_module_cmds_FC
-module_expsym_cmds=$lt_module_expsym_cmds_FC
-
-# Whether we are building with GNU ld or not.
-with_gnu_ld=$lt_with_gnu_ld_FC
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_FC
-
-# Flag that enforces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_FC
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_FC
-
-# Whether we need a single "-rpath" flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_FC
-
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-# DIR into the resulting binary.
-hardcode_direct=$hardcode_direct_FC
-
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-# DIR into the resulting binary and the resulting library dependency is
-# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
-# library is relocated.
-hardcode_direct_absolute=$hardcode_direct_absolute_FC
-
-# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-# into the resulting binary.
-hardcode_minus_L=$hardcode_minus_L_FC
-
-# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-# into the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_FC
-
-# Set to "yes" if building a shared library automatically hardcodes DIR
-# into the library and all subsequent libraries and executables linked
-# against it.
-hardcode_automatic=$hardcode_automatic_FC
-
-# Set to yes if linker adds runtime paths of dependent libraries
-# to runtime path list.
-inherit_rpath=$inherit_rpath_FC
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_FC
-
-# Set to "yes" if exported symbols are required.
-always_export_symbols=$always_export_symbols_FC
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_FC
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_FC
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_FC
-
-# Commands necessary for linking programs (against libraries) with templates.
-prelink_cmds=$lt_prelink_cmds_FC
-
-# Commands necessary for finishing linking programs.
-postlink_cmds=$lt_postlink_cmds_FC
-
-# Specify filename containing input files.
-file_list_spec=$lt_file_list_spec_FC
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_FC
-
-# The directories searched by this compiler when creating a shared library.
-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_FC
-
-# Dependencies to place before and after the objects being linked to
-# create a shared library.
-predep_objects=$lt_predep_objects_FC
-postdep_objects=$lt_postdep_objects_FC
-predeps=$lt_predeps_FC
-postdeps=$lt_postdeps_FC
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_FC
-
-# ### END LIBTOOL TAG CONFIG: FC
-_LT_EOF
-
- ;;
-
-  esac
-done # for ac_tag
-
-
-as_fn_exit 0
-_ACEOF
-ac_clean_files=$ac_clean_files_save
-
-test $ac_write_fail = 0 ||
-  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit 1
-fi
-if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
-fi
-
-
-chmod 755 tools/misc/h5cc
-
-if test "X$HDF_FORTRAN" = "Xyes"; then
-  chmod 755 fortran/src/h5fc
-fi
-
-if test "X$HDF_CXX" = "Xyes"; then
-  chmod 755 c++/src/h5c++
-fi
-
-## We don't want inline defined for C++ compilers
-## Don't worry about the C++ ifdef wrappers in the H5pubconf file, since
-## 'H5_inline' isn't a C++ keyword.
-cat >> src/H5config.h <<EOF
-
-#if defined(__cplusplus) && defined(inline)
-#undef inline
-#endif
-EOF
-
-## show the configure settings
-cat src/libhdf5.settings
diff --git a/configure.ac b/configure.ac
index 91bad1d..b34355c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,22 +1,18 @@
 ## Process this file with autoconf to produce configure.
 ##
 ## Copyright by The HDF Group.
-## Copyright by the Board of Trustees of the University of Illinois.
 ## All rights reserved.
 ##
 ## This file is part of HDF5.  The full HDF5 copyright notice, including
 ## terms governing use, modification, and redistribution, is contained in
-## the files COPYING and Copyright.html.  COPYING can be found at the root
-## of the source code distribution tree; Copyright.html can be found at the
-## root level of an installed copy of the electronic HDF5 document set and
-## is linked from the top-level documents page.  It can also be found at
-## http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-## access to either file, you may request a copy from help@hdfgroup.org.
+## the COPYING file, which can be found at the root of the source code
+## distribution tree, or in https://www.hdfgroup.org/licenses.
+## If you do not have access to either file, you may request a copy from
+## help@hdfgroup.org.
 
 ## ----------------------------------------------------------------------
 ## Initialize configure.
 ##
-AC_REVISION($Id: configure.ac 22697 2012-08-19 14:35:47Z hdftest $)
 AC_PREREQ([2.69])
 
 ## AC_INIT takes the name of the package, the version number, and an
@@ -26,29 +22,59 @@ AC_PREREQ([2.69])
 ## NOTE: Do not forget to change the version number here when we do a
 ## release!!!
 ##
-AC_INIT([HDF5], [1.9.216], [help@hdfgroup.org])
+AC_INIT([HDF5], [1.15.0], [help@hdfgroup.org])
+
 AC_CONFIG_SRCDIR([src/H5.c])
-AC_CONFIG_HEADER([src/H5config.h])
+AC_CONFIG_HEADERS([src/H5config.h])
 
 AC_CONFIG_AUX_DIR([bin])
 AC_CONFIG_MACRO_DIR([m4])
 
 ## AM_INIT_AUTOMAKE takes a list of options that should be applied to
 ## every Makefile.am when automake is run.
-AM_INIT_AUTOMAKE([foreign])
-AM_SILENT_RULES([yes])
-
-## AM_MAINTAINER_MODE turns off "rebuild rules" that contain dependencies
-## for Makefiles, configure, src/H5config.h, etc.  If AM_MAINTAINER_MODE
-## is *not* included here, these files will be rebuilt if out of date.
-## This is a problem because if users try to build on a machine with
-## the wrong versions of autoconf and automake, these files will be
-## rebuilt with the wrong versions and bad things can happen.
-## Also, CVS doesn't preserve dependencies between timestamps, so
-## Makefiles will often think rebuilding needs to occur when it doesn't.
-## Developers should './configure --enable-maintainer-mode' to turn on
-## rebuild rules.
-AM_MAINTAINER_MODE
+AM_INIT_AUTOMAKE([foreign subdir-objects])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) # use silent rules where available - automake 1.11
+
+## AM_MAINTAINER_MODE determines the behavior of "rebuild rules" that contain
+## dependencies for Makefile.in files, configure, src/H5config.h, etc. If
+## AM_MAINTAINER_MODE is enabled, these files will be rebuilt if out of date.
+## When disabled, the autotools build files can get out of sync and the build
+## system will not complain or try to regenerate downstream files.
+##
+## The AM_MAINTAINER_MODE macro also determines whether the
+## --(enable|disable)-maintainer-mode configure option is available. When the
+## macro is present, with or without a parameter, the option will be added
+## to the generated configure script.
+##
+## In summary:
+##
+##  AM_MAINTAINER_MODE([enable])
+##      - Build dependencies ON by default
+##      - Configure option exists
+##
+##  AM_MAINTAINER_MODE([disable])
+##      - Build dependencies OFF by default
+##      - Configure option exists
+##
+##  AM_MAINTAINER_MODE
+##      - Build dependencies OFF by default
+##      - Configure option exists
+##
+##  No AM_MAINTAINER_MODE macro
+##      - Build dependencies ON by default
+##      - No configure option to control build dependencies
+##
+## The biggest concern for us is that version control systems like git
+## usually don't preserve dependencies between timestamps, so the build
+## system will often think that upstream build files like Makefile.am are
+## dirty and that rebuilding needs to occur when it doesn't. This is a problem
+## in release branches where we provide the autotools-generated files. Users
+## who don't have autoconf, automake, etc. will then have difficulty building
+## release branches checked out from git.
+##
+## By default, maintainer mode is enabled in development branches and disabled
+## in release branches.
+AM_MAINTAINER_MODE([enable])
 
 ## ----------------------------------------------------------------------
 ## Set prefix default (install directory) to a directory in the build area.
@@ -68,12 +94,12 @@ AC_CONFIG_COMMANDS([pubconf], [
   sed 's/#define /#define H5_/' <src/H5config.h |\
     sed 's/#undef /#undef H5_/' >pubconf
   if test ! -f src/H5pubconf.h; then
-    /bin/mv -f pubconf src/H5pubconf.h
+    mv -f pubconf src/H5pubconf.h
   elif (diff pubconf src/H5pubconf.h >/dev/null); then
     rm -f pubconf
     echo "src/H5pubconf.h is unchanged"
   else
-    /bin/mv -f pubconf src/H5pubconf.h
+    mv -f pubconf src/H5pubconf.h
   fi
   echo "Post process src/libhdf5.settings"
   sed '/^#/d' < src/libhdf5.settings > libhdf5.settings.TMP
@@ -85,21 +111,32 @@ AC_CONFIG_COMMANDS([pubconf], [
 ## configure is currently running by using the --host=foo flag.
 ## For machines on which HDF5 is often configured, it can be convenient
 ## to specify the name of the machine rather than its canonical type.
-case $host_alias in
-  redstorm)
-    host_alias=x86_64-redstorm-linux-gnu
-    ;;
-esac
+##
+## There are currently no hosts, but if there were they would be
+## listed by hostname and the alias would point to a file in
+## the config directory:
+##
+##case $host_alias in
+##  <some host>)
+##    host_alias=<config file in config directory>
+##    ;;
+##esac
 
 AC_CANONICAL_HOST
 AC_SUBST([CPPFLAGS])
+AC_SUBST([JNIFLAGS])
+AC_SUBST([AR_FLAGS])
 
 ## H5_CFLAGS (and company) are for CFLAGS that should be used on HDF5, but
 ## not exported to h5cc (or h5fc, etc.)
+##
 AC_SUBST([H5_CFLAGS])
 AC_SUBST([H5_CPPFLAGS])
 AC_SUBST([H5_FCFLAGS])
 AC_SUBST([H5_CXXFLAGS])
+AC_SUBST([H5_JNIFLAGS])
+AC_SUBST([H5_JAVACFLAGS])
+AC_SUBST([H5_JAVAFLAGS])
 AC_SUBST([H5_LDFLAGS])
 
 ## AM_CFLAGS (and company) are for CFLAGS that should be used on HDF5,
@@ -108,19 +145,31 @@ AC_SUBST([AM_CFLAGS])
 AC_SUBST([AM_FCFLAGS])
 AC_SUBST([AM_CXXFLAGS])
 AC_SUBST([AM_CPPFLAGS])
+AC_SUBST([AM_JNIFLAGS])
+AC_SUBST([AM_JAVACFLAGS])
+AC_SUBST([AM_JAVAFLAGS])
 AC_SUBST([AM_LDFLAGS])
 
-## Make sure flags are set to something (otherwise macros may set them later).
+## Make sure flags are initialized.
 AM_CFLAGS="${AM_CFLAGS}"
 AM_CXXFLAGS="${AM_CXXFLAGS}"
 AM_FCFLAGS="${AM_FCFLAGS}"
 AM_CPPFLAGS="${AM_CPPFLAGS}"
+AM_JNIFLAGS="${AM_JNIFLAGS}"
+AM_JAVACFLAGS="${AM_JAVACFLAGS}"
+AM_JAVAFLAGS="${AM_JAVAFLAGS}"
 AM_LDFLAGS="${AM_LDFLAGS}"
+
+## Flags passed in by the user
 CFLAGS="${CFLAGS}"
 CXXFLAGS="${CXXFLAGS}"
 FCFLAGS="${FCFLAGS}"
 CPPFLAGS="${CPPFLAGS}"
+JNIFLAGS="${JNIFLAGS}"
+JAVACFLAGS="${JAVACFLAGS}"
+JAVAFLAGS="${JAVAFLAGS}"
 LDFLAGS="${LDFLAGS}"
+AR_FLAGS="${AR_FLAGS}"
 
 ## Configure may need to alter any of the *FLAGS variables in order for
 ## various checks to work correctly. Save the user's value here so it
@@ -128,9 +177,19 @@ LDFLAGS="${LDFLAGS}"
 saved_user_CFLAGS="$CFLAGS"
 saved_user_CXXFLAGS="$CXXFLAGS"
 saved_user_FCFLAGS="$FCFLAGS"
+saved_user_JAVACFLAGS="$JAVACFLAGS"
+saved_user_JAVAFLAGS="$JAVAFLAGS"
 saved_user_LDFLAGS="$LDFLAGS"
 saved_user_CPPFLAGS="$CPPFLAGS"
 
+## Strip out -Werror from CFLAGS since that can cause checks to fail when
+## compiling the test program fails due to warnings
+CFLAGS="`echo $CFLAGS | sed -e 's/-Werror//g'`"
+CXXFLAGS="`echo $CXXFLAGS | sed -e 's/-Werror//g'`"
+FCFLAGS="`echo $FCFLAGS | sed -e 's/-Werror//g'`"
+JAVACFLAGS="`echo $JAVACFLAGS | sed -e 's/-Werror//g'`"
+CPPFLAGS="`echo $CPPFLAGS | sed -e 's/-Werror//g'`"
+
 ## Support F9X variable to define Fortran compiler if FC variable is
 ## not used.  This should be deprecated in the future.
 if test "x" = "x$FC"; then
@@ -144,58 +203,18 @@ AC_MSG_CHECKING([shell variables initial values])
 set >&AS_MESSAGE_LOG_FD
 AC_MSG_RESULT([done])
 
-## Define all symbol variables used for configure summary.
-## EXTERNAL_FILTERS equals all external filters. Default none.
-## MPE: whether MPE option is enabled. Default no.
-## STATIC_EXEC: whether static-exec is enabled. Default no.
-## HDF_FORTRAN: whether Fortran is enabled. Default no.
-## HDF_FORTRAN2003: whether Fortran 2003 is enabled. Default no.
-## FC: Fortran compiler.
-## HDF_CXX: whether C++ is enabled. Default no.
-## CXX: C++ compiler.
-## HDF5_HL: whether high-level library is enabled. Default is yes.
-## INSTRUMENT: whether INSTRUMENT is enabled. No default set here.
-## CODESTACK: whether CODESTACK is enabled. Default no.
-## HAVE_DMALLOC: whether system has dmalloc support. Default no.
-## DIRECT_VFD: whether DIRECT_VFD is enabled. Default no.
-## THREADSAFE: whether THREADSAFE is enabled. Default no.
-## STATIC_SHARED: whether static and/or shared libraries are requested.
-## enable_shared: whether shared lib is enabled.
-## enable_static: whether static lib is enabled.
-## UNAME_INFO: System information.
-
-AC_SUBST([EXTERNAL_FILTERS])
-AC_SUBST([MPE]) MPE=no
-AC_SUBST([STATIC_EXEC]) STATIC_EXEC=no
-AC_SUBST([HDF_FORTRAN]) HDF_FORTRAN=no
-AC_SUBST([HDF_FORTRAN2003]) HDF_FORTRAN2003=no
-AC_SUBST([FC]) HDF_FORTRAN=no
-AC_SUBST([FC2003]) HDF_FORTRAN2003=no
-AC_SUBST([HDF_CXX]) HDF_CXX=no
-AC_SUBST([CXX]) HDF_CXX=no
-AC_SUBST([HDF5_HL]) HDF5_HL=yes
-AC_SUBST([INSTRUMENT])
-AC_SUBST([CODESTACK]) CODESTACK=no
-AC_SUBST([HAVE_DMALLOC]) HAVE_DMALLOC=no
-AC_SUBST([DIRECT_VFD]) DIRECT_VFD=no
-AC_SUBST([THREADSAFE]) THREADSAFE=no
-AC_SUBST([STATIC_SHARED])
-AC_SUBST([enable_shared])
-AC_SUBST([enable_static])
-AC_SUBST([UNAME_INFO]) UNAME_INFO=`uname -a`
+## ----------------------------------------------------------------------
+## Save system information for the library settings file.
+##
+AC_SUBST([UNAME_INFO])
+UNAME_INFO=`uname -a`
 
 ## ----------------------------------------------------------------------
 ## Some platforms have broken basename, and/or xargs programs. Check
 ## that it actually does what it's supposed to do. Catch this early
-## since configure relies upon them heavily and there's no use continuing
-## if it's broken.
+## since configure and scripts relies upon them heavily and there's
+## no use continuing if it's broken.
 ##
-
-## Avoid depending upon Character Ranges.
-## These are defined by autoconf.
-## as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-## as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-
 AC_MSG_CHECKING([if basename works])
 BASENAME_TEST="`basename /foo/bar/baz/qux/basename_works`"
 if test $BASENAME_TEST != "basename_works"; then
@@ -204,6 +223,7 @@ else
   AC_MSG_RESULT([yes])
 fi
 
+## xargs basename used in configure to get the CC_BASENAME value
 AC_MSG_CHECKING([if xargs works])
 XARGS_TEST="`echo /foo/bar/baz/qux/xargs_works | xargs basename`"
 if test $XARGS_TEST != "xargs_works"; then
@@ -220,24 +240,60 @@ AC_CACHE_CHECK([for cached host], [hdf5_cv_host], [hdf5_cv_host="none"]);
 if test $hdf5_cv_host = "none"; then
   hdf5_cv_host=$host
 elif test $hdf5_cv_host != $host; then
-  echo "The config.cache file was generated on $hdf5_cv_host but"
-  echo "this is $host.  Please remove that file and try again."
-  AC_MSG_ERROR([config.cache file is invalid])
+  AC_MSG_ERROR([
+     The config.cache file was generated on $hdf5_cv_host but
+     this is $host.  Please remove that file and try again.
+     config.cache file is invalid])
+fi
+
+## ----------------------------------------------------------------------
+## Check if we should consider certain compiler warnings as errors
+##
+## We have to set WARNINGS_AS_ERRORS before sourcing a $host_config
+## file, below.
+##
+## These should NOT be on by default as the risk of breakage is high
+## when compiling HDF5 on new (or new versions) of platforms and
+## compilers. It can also cause failures when header files we have no
+## control over (e.g. MPI, HDFS) raise warnings.
+##
+AC_MSG_CHECKING([enable warnings as errors])
+AC_ARG_ENABLE([warnings-as-errors],
+              [AS_HELP_STRING([--enable-warnings-as-errors],
+                              [Determines whether certain warnings will be
+                               considered errors. This is mainly for use
+                               by HDF5 library developers.
+                               [default=no]
+                               ])],
+              [WARNINGS_AS_ERRORS=$enableval])
+
+## Set default
+if test "X-$WARNINGS_AS_ERRORS" = X- ; then
+  WARNINGS_AS_ERRORS=no
 fi
 
+case "X-$WARNINGS_AS_ERRORS" in
+  X-yes|X-no)
+    AC_MSG_RESULT([$WARNINGS_AS_ERRORS])
+    ;;
+  *)
+    AC_MSG_ERROR([Unrecognized value: $WARNINGS_AS_ERRORS])
+    ;;
+esac
+
 ## ----------------------------------------------------------------------
 ## Source any special files that we need.  These files normally aren't
 ## present but can be used by the maintainers to fine tune things like
 ## turning on debug or profiling flags for the compiler.  The search order
 ## is:
 ##
-##	CPU-VENDOR-OS
-##	VENDOR-OS
-##	CPU-OS
-##	CPU-VENDOR
-##	OS
-##	VENDOR
-##	CPU
+##    CPU-VENDOR-OS
+##    VENDOR-OS
+##    CPU-OS
+##    CPU-VENDOR
+##    OS
+##    VENDOR
+##    CPU
 ##
 ## If the `OS' ends with a version number then remove it. For instance,
 ## `freebsd3.1' would become `freebsd'
@@ -249,14 +305,11 @@ case $host_os in
   freebsd*)
     host_os_novers=freebsd
     ;;
-  osf4.*)
-    host_os_novers=osf4.x
-    ;;
-  osf5.*)
-    host_os_novers=osf5.x
+  netbsd*)
+    host_os_novers=netbsd
     ;;
-  solaris2.*)
-    host_os_novers=solaris2.x
+  solaris*)
+    host_os_novers=solaris
     ;;
   *)
     host_os_novers=$host_os
@@ -304,12 +357,125 @@ while test -n "$hname"; do
   test "$hname_tmp" = "$hname" && break
 done
 
+##
+## Enable/disable sanitizer checks for clang compilers, initially address sanitizer
+##
+AC_MSG_CHECKING([for clang sanitizer checks])
+AC_ARG_ENABLE([sanitize-checks],
+              [AS_HELP_STRING([--enable-sanitize-checks=address],
+                              [(clang/clang++ compilers only) Enable sanitize checks.
+                               Address is useful for detecting issues dealing with
+                               memory. See AddressSanitizer in config/sanitizer/README.md
+                               for more information.
+                               [default=none]
+                               ])],
+              [CLANG_SANITIZE_CHECKS=$enableval])
+
+# Set default
+if test "X-$CLANG_SANITIZE_CHECKS" = X- ; then
+  CLANG_SANITIZE_CHECKS=none
+fi
+
+if test "X$CC_BASENAME" = "Xclang"; then
+  AC_SUBST([CLANG_SANITIZE_CHECKS])
+
+  # There are several sanitizer tools.  At present we are testing
+  # and describing only -fsanitizer=address with autotools.
+  case "X-$CLANG_SANITIZE_CHECKS" in
+    X-no|X-none)
+      CLANG_SANITIZE_CHECKS=none
+      CLANG_SANITIZE_LIST=
+      ;;
+    *)
+      CLANG_SANITIZE_LIST=$CLANG_SANITIZE_CHECKS
+      ;;
+  esac
+  AC_MSG_RESULT([$CLANG_SANITIZE_CHECKS])
+
+  # Other tools can be added to the list of checks
+  # The clang compiler doesn't support some of them; they should be
+  # checked before adding them to the list in the help message.
+  # The sanitizers/sanitizers.cmake file lists these options:
+  # address, memory, memoryWithOrigins, undefined, thread, leak,
+  # 'address;undefined'.  Which and which combinations of these are
+  #  supported varies by compiler version, but unsupported options
+  # or combinations will result in configure errors reported in config.log.
+  # Comma separated lists of sanitize options will be entered intact in
+  # one -fsanitize=<list> flag.  Space separated lists will be entered in
+  # separate -fsanitize=<item> flags.
+  # NOTE: No sanity checking done here!
+  if test -n "$CLANG_SANITIZE_LIST"; then
+    H5_CFLAGS="$H5_CFLAGS -fno-omit-frame-pointer"
+    H5_CXXFLAGS="$H5_CXXFLAGS -fno-omit-frame-pointer"
+    for sanitizer in `echo $CLANG_SANITIZE_LIST`; do
+      H5_CFLAGS="$H5_CFLAGS -fsanitize=${sanitizer}"
+      H5_CXXFLAGS="$H5_CXXFLAGS -fsanitize=${sanitizer}"
+    done
+  fi
+fi
+
+## ----------------------------------------------------------------------
+## Determine build mode (debug, production, clean).
+## This has to be done early since the build mode is referred to
+## frequently.
+##
+AC_MSG_CHECKING([build mode])
+AC_ARG_ENABLE([build-mode],
+              [AS_HELP_STRING([--enable-build-mode=(debug|production|clean)],
+                              [Sets the build mode. Debug turns on symbols, API
+                               tracing, asserts, and debug optimization,
+                               as well as several other minor configure options
+                               that aid in debugging.
+                               Production turns high optimizations on.
+                               Clean turns nothing on and disables optimization
+                               (i.e.: a 'clean slate' configuration).
+                               All these settings can be overridden by using
+                               specific configure flags.
+                               [default=debug]
+                               ])],
+              [BUILD_MODE=$enableval])
+
+## Set the default
+## Depends on branch, set via script at branch creation time
+if test "X-$BUILD_MODE" = X- ; then
+    BUILD_MODE=debug
+fi
+
+## Allow this variable to be substituted in
+## other files (src/libhdf5.settings.in, etc.)
+AC_SUBST([BUILD_MODE])
+
+case "X-$BUILD_MODE" in
+  X-clean)
+    AC_MSG_RESULT([clean])
+    ;;
+  X-debug)
+    AC_DEFINE([DEBUG_BUILD], [1], [Define if this is a debug build.])
+    H5_CFLAGS="$H5_CFLAGS $DEBUG_CFLAGS"
+    H5_CPPFLAGS="$H5_CPPFLAGS $DEBUG_CPPFLAGS"
+    H5_CXXFLAGS="$H5_CXXFLAGS $DEBUG_CXXFLAGS"
+    H5_FCFLAGS="$H5_FCFLAGS $DEBUG_FCFLAGS"
+    AC_MSG_RESULT([debug])
+    ;;
+  X-production)
+    H5_CFLAGS="$H5_CFLAGS $PROD_CFLAGS"
+    H5_CPPFLAGS="$H5_CPPFLAGS $PROD_CPPFLAGS"
+    H5_CXXFLAGS="$H5_CXXFLAGS $PROD_CXXFLAGS"
+    H5_FCFLAGS="$H5_FCFLAGS $PROD_FCFLAGS"
+    AC_MSG_RESULT([production])
+    ;;
+  *)
+    AC_MSG_ERROR([Unrecognized build mode: $BUILD_MODE. Use debug, production, or clean.])
+esac
+
 ## ----------------------------------------------------------------------
 ## Some built-in configure checks can only see CFLAGS (not AM_CFLAGS), so
 ## we need to add this in so configure works as intended. We will need to
 ## reset this value at the end of configure, to preserve the user's settings.
 CFLAGS="${AM_CFLAGS} ${CFLAGS}"
 FCFLAGS="${AM_FCFLAGS} ${FCFLAGS}"
+JAVACFLAGS="${AM_JAVACFLAGS} ${JAVACFLAGS}"
+JAVAFLAGS="${AM_JAVAFLAGS} ${JAVAFLAGS}"
 CXXFLAGS="${AM_CXXFLAGS} ${CXXFLAGS}"
 CPPFLAGS="${AM_CPPFLAGS} ${CPPFLAGS}"
 LDFLAGS="${AM_LDFLAGS} ${LDFLAGS}"
@@ -340,7 +506,7 @@ AC_ARG_ENABLE([unsupported],
                               [Allow unsupported combinations of configure options])],
               [ALLOW_UNSUPPORTED=$enableval])
 
-case "X-$ALLOW_UNSUPPORTED" in 
+case "X-$ALLOW_UNSUPPORTED" in
   X-|X-no)
     AC_MSG_RESULT([no])
     ;;
@@ -352,51 +518,77 @@ case "X-$ALLOW_UNSUPPORTED" in
 esac
 
 ## ----------------------------------------------------------------------
-## Check if they would like the Fortran interface compiled
+## Data types and their sizes.
+##
+AC_TYPE_OFF_T
+AC_CHECK_TYPE([ssize_t], [],
+        [AC_DEFINE_UNQUOTED([ssize_t], [long],
+                [Define to `long' if <sys/types.h> does not define.])])
+AC_C_BIGENDIAN
+AC_CHECK_SIZEOF([char])
+AC_CHECK_SIZEOF([short])
+AC_CHECK_SIZEOF([int])
+AC_CHECK_SIZEOF([unsigned])
+AC_CHECK_SIZEOF([long])
+AC_CHECK_SIZEOF([long long])
+AC_CHECK_SIZEOF([float])
+AC_CHECK_SIZEOF([double])
+AC_CHECK_SIZEOF([long double])
+
+## ----------------------------------------------------------------------
+## Check if the Fortran interface should be enabled
 ##
+
+## This needs to be exposed for the library info file even if Fortran is disabled.
+AC_SUBST([HDF_FORTRAN])
+
+## Default is no Fortran
+HDF_FORTRAN=no
+
 AC_SUBST([HDF5_INTERFACES]) HDF5_INTERFACES=""
 AC_MSG_CHECKING([if Fortran interface enabled])
 AC_ARG_ENABLE([fortran],
               [AS_HELP_STRING([--enable-fortran],
-                              [Compile the Fortran 90/95 interface [default=no]])],
+                              [Compile the Fortran interface [default=no]])],
               [HDF_FORTRAN=$enableval])
 
-if test "X$HDF_FORTRAN" = "Xyes"; then
-  echo "yes"
-else
-  echo "no"
-fi
+AC_MSG_RESULT([$HDF_FORTRAN])
 
+if test "X$HDF_FORTRAN" = "Xyes"; then
 
 ## ----------------------------------------------------------------------
-## Check if they would like the Fortran 2003 interface compiled
+## Check for non-standard extension __FLOAT128
 ##
-AC_MSG_CHECKING([if Fortran 2003 interface enabled])
-AC_ARG_ENABLE([fortran2003],
-              [AS_HELP_STRING([--enable-fortran2003],
-                              [Compile the Fortran 2003 interface, must also specify --enable-fortran [default=no]])],
-              [HDF_FORTRAN2003=$enableval])
+  HAVE_FLOAT128=0
+  HAVE_QUADMATH=0
+  FLT128_DIG=0
+  LDBL_DIG=0
 
-## ----------------------------------------------------------------------
-## Check to make sure --enable-fortran is present if --enable-fortran2003 
-## was specified
+  AC_CHECK_SIZEOF([__float128])
+  AC_CHECK_SIZEOF([_Quad])
+  AC_CHECK_HEADERS([quadmath.h], [HAVE_QUADMATH=1], [])
+  PAC_FC_LDBL_DIG
 
-if test "X$HDF_FORTRAN2003" = "Xyes" && test "X$HDF_FORTRAN" = "Xno"; then
-  echo "no"
-  AC_MSG_ERROR([--enable-fortran must be used with --enable-fortran2003])
-else
-  if test "X$HDF_FORTRAN2003" = "Xyes" && test "X$HDF_FORTRAN" = "Xyes"; then
-    echo "yes"
+  AC_SUBST([PAC_C_MAX_REAL_PRECISION])
+
+  if test "$ac_cv_sizeof___float128" != 0 && test "$FLT128_DIG" != 0 ; then
+    AC_DEFINE([HAVE_FLOAT128], [1], [Determine if __float128 is available])
+    PAC_C_MAX_REAL_PRECISION=$FLT128_DIG
   else
-    echo "no"
+    PAC_C_MAX_REAL_PRECISION=$LDBL_DIG
   fi
-fi
+  AC_DEFINE_UNQUOTED([PAC_C_MAX_REAL_PRECISION], $PAC_C_MAX_REAL_PRECISION, [Determine the maximum decimal precision in C])
+  AC_MSG_RESULT([$PAC_C_MAX_REAL_PRECISION])
 
-if test "X$HDF_FORTRAN" = "Xyes"; then
+## We will output an include file for Fortran, H5config_f.inc which
+## contains various configure definitions used by the Fortran Library.
+## Prepend H5_ to all macro names. This avoids name conflict between HDF5 macro
+## names and those generated by another software package that uses the HDF5 library.
+  AC_CONFIG_HEADERS([fortran/src/H5config_f.inc],
+    [cat fortran/src/H5config_f.inc | sed '1d;s%^/\* \(.*\) \*/%\1%;s/#define /#define H5_/;s/#undef /#undef H5_/' >fortran/src/H5config_f.inc.tmp; mv -f fortran/src/H5config_f.inc.tmp fortran/src/H5config_f.inc])
+
+  AC_SUBST([FC])
 
-  AC_SUBST([FC]) HDF_FORTRAN=yes
-  AC_SUBST([HAVE_FORTRAN_2003])
-		
   HDF5_INTERFACES="$HDF5_INTERFACES fortran"
 
   ## --------------------------------------------------------------------
@@ -412,7 +604,7 @@ if test "X$HDF_FORTRAN" = "Xyes"; then
   AC_SUBST([OBJECT_NAMELEN_DEFAULT_F])
 
   ## --------------------------------------------------------------------
-  ## Fortran source extention
+  ## Fortran source extension
   ##
   AC_FC_SRCEXT([f90])
 
@@ -421,13 +613,28 @@ if test "X$HDF_FORTRAN" = "Xyes"; then
 
   ## --------------------------------------------------------------------
   ## Check for a Fortran compiler and how to include modules.
-  ## 
+  ##
   AC_PROG_FC([PAC_FC_SEARCH_LIST],)
   AC_F9X_MODS
 
+  ## Allow setting the fortran module install dir
+  AC_ARG_WITH([fmoddir],
+    [AS_HELP_STRING([--with-fmoddir=DIR], [Fortran module install directory])],
+    [fmoddir=$withval],
+    [fmoddir="\${includedir}"])
+  AC_SUBST([fmoddir], [$fmoddir])
+
   ## Change to the Fortran 90 language
   AC_LANG_PUSH(Fortran)
 
+  ## Checking if the compiler supports the required Fortran 2003 features and
+  ## stopping if it does not.
+  PAC_PROG_FC_HAVE_F2003_REQUIREMENTS
+
+  if test "X$HAVE_F2003_REQUIREMENTS" = "Xno"; then
+    AC_MSG_ERROR([Fortran compiler lacks required Fortran 2003 features; unsupported Fortran 2003 compiler, remove --enable-fortran])
+  fi
+
   ## --------------------------------------------------------------------
   ## Define wrappers for the C compiler to use Fortran function names
   ##
@@ -441,45 +648,157 @@ if test "X$HDF_FORTRAN" = "Xyes"; then
   PAC_PROG_FC_C_SIZEOF
 
   ## See if the fortran compiler supports the intrinsic function "STORAGE_SIZE"
-  PAC_PROG_FC_STORAGE_SIZE	
+  PAC_PROG_FC_STORAGE_SIZE
 
-  ## Check to see if -r8 was specified to determine if we need to
-  ## compile the DOUBLE PRECISION interfaces.
-  PAC_PROG_FC_DEFAULT_REALisDBLE	
+  ## Set the sizeof function for use later in the fortran tests
+  if test "X$HAVE_STORAGE_SIZE_FORTRAN" = "Xyes";then
+    FC_SIZEOF_A="STORAGE_SIZE(a, c_size_t)/STORAGE_SIZE(c_char_'a',c_size_t)"
+    FC_SIZEOF_B="STORAGE_SIZE(b, c_size_t)/STORAGE_SIZE(c_char_'a',c_size_t)"
+    FC_SIZEOF_C="STORAGE_SIZE(c, c_size_t)/STORAGE_SIZE(c_char_'a',c_size_t)"
+  else
+    if test "X$HAVE_SIZEOF_FORTRAN" = "Xyes";then
+      FC_SIZEOF_A="SIZEOF(a)"
+      FC_SIZEOF_B="SIZEOF(b)"
+      FC_SIZEOF_C="SIZEOF(c)"
+    else
+      ## If neither intrinsic functions SIZEOF or STORAGE_SIZE is available then stop configure with an error
+      AC_MSG_ERROR([Fortran compiler requires either intrinsic functions SIZEOF or STORAGE_SIZE])
+    fi
+  fi
+
+  ## See if the fortran compiler supports the intrinsic module "ISO_FORTRAN_ENV"
+  PAC_PROG_FC_ISO_FORTRAN_ENV
+  ## Check KIND and size of native integer
+  PAC_FC_NATIVE_INTEGER
+
+  ## Find all available KINDs
+  PAC_FC_AVAIL_KINDS
+  ## Find all sizeofs for available KINDs
+  PAC_FC_SIZEOF_INT_KINDS
+  PAC_FC_SIZEOF_REAL_KINDS
+
+  AC_SUBST([PAC_FC_ALL_REAL_KINDS])
+  AC_SUBST([PAC_FC_MAX_REAL_PRECISION])
+  AC_SUBST([PAC_FORTRAN_NUM_INTEGER_KINDS])
+  AC_SUBST([PAC_FC_ALL_INTEGER_KINDS])
+  AC_SUBST([PAC_FC_ALL_REAL_KINDS_SIZEOF])
+  AC_SUBST([PAC_FC_ALL_INTEGER_KINDS_SIZEOF])
+  AC_SUBST([PAC_FORTRAN_NATIVE_INTEGER_KIND])
+  AC_SUBST([PAC_FORTRAN_NATIVE_INTEGER_SIZEOF])
+  AC_SUBST([PAC_FORTRAN_NATIVE_REAL_KIND])
+  AC_SUBST([PAC_FORTRAN_NATIVE_REAL_SIZEOF])
+  AC_SUBST([PAC_FORTRAN_NATIVE_DOUBLE_KIND])
+  AC_SUBST([PAC_FORTRAN_NATIVE_DOUBLE_SIZEOF])
+  AC_SUBST([HAVE_Fortran_INTEGER_SIZEOF_16])
+  AC_SUBST([FORTRAN_HAVE_C_LONG_DOUBLE])
+  AC_SUBST([FORTRAN_C_LONG_DOUBLE_IS_UNIQUE])
+  AC_SUBST([H5CONFIG_F_NUM_RKIND])
+  AC_SUBST([H5CONFIG_F_RKIND])
+  AC_SUBST([H5CONFIG_F_RKIND_SIZEOF])
+  AC_SUBST([H5CONFIG_F_NUM_IKIND])
+  AC_SUBST([H5CONFIG_F_IKIND])
+  AC_SUBST([Fortran_COMPILER_ID])
+  Fortran_COMPILER_ID=none
+  AC_DEFINE_UNQUOTED([Fortran_COMPILER_ID], $Fortran_COMPILER_ID, [Define Fortran compiler ID])
+
+  ## Setting definition if there is a 16 byte fortran integer
+  if `echo $PAC_FC_ALL_INTEGER_KINDS_SIZEOF | grep '16' >/dev/null`; then
+    HAVE_Fortran_INTEGER_SIZEOF_16="1"
+    AC_DEFINE([HAVE_Fortran_INTEGER_SIZEOF_16], [1], [Determine if INTEGER*16 is available])
+  else
+    HAVE_Fortran_INTEGER_SIZEOF_16="0"
+    AC_DEFINE([HAVE_Fortran_INTEGER_SIZEOF_16], [0], [Determine if INTEGER*16 is available])
+  fi
 
-  if test "X$HDF_FORTRAN2003" = "Xyes"; then
+  if test "X$HAVE_STORAGE_SIZE_FORTRAN" = "Xyes"; then
+    AC_DEFINE([FORTRAN_HAVE_STORAGE_SIZE], [1], [Define if we have Fortran intrinsic STORAGE_SIZE])
+  fi
+
+  if test "X$HAVE_C_SIZEOF_FORTRAN" = "Xyes"; then
+    AC_DEFINE([FORTRAN_HAVE_C_SIZEOF], [1], [Define if we have Fortran intrinsic C_SIZEOF])
+  fi
 
-    ## Checking if the compiler supports the required Fortran 2003 features and
-    ## disable Fortran 2003 if it does not.
-    PAC_PROG_FC_HAVE_F2003_REQUIREMENTS
- 
-    if test "X$HAVE_F2003_REQUIREMENTS" = "Xno"; then
-      AC_MSG_ERROR([Fortran compiler lacks required Fortran 2003 features; unsupported Fortran 2003 compiler, remove --enable-fortran2003])
+  if test "X$HAVE_SIZEOF_FORTRAN" = "Xyes"; then
+    AC_DEFINE([FORTRAN_HAVE_SIZEOF], [1], [Define if we have Fortran intrinsic SIZEOF])
+  fi
+
+  ## See if C_LONG_DOUBLE is available
+  PAC_PROG_FC_HAVE_C_LONG_DOUBLE
+
+  FORTRAN_HAVE_C_LONG_DOUBLE="0"
+  if test "X$HAVE_C_LONG_DOUBLE_FORTRAN" = "Xyes"; then
+    FORTRAN_HAVE_C_LONG_DOUBLE="1"
+    AC_DEFINE([FORTRAN_HAVE_C_LONG_DOUBLE], [1], [Define if we have Fortran C_LONG_DOUBLE])
+  fi
+
+  ## Is C_LONG_DOUBLE different from C_DOUBLE
+  FORTRAN_C_LONG_DOUBLE_IS_UNIQUE="0"
+  if test "$FORTRAN_HAVE_C_LONG_DOUBLE" = "1"; then
+    PAC_PROG_FC_C_LONG_DOUBLE_EQ_C_DOUBLE
+    if test "X$C_LONG_DOUBLE_IS_UNIQUE_FORTRAN" = "Xyes"; then
+      FORTRAN_C_LONG_DOUBLE_IS_UNIQUE="1"
+      AC_DEFINE([FORTRAN_C_LONG_DOUBLE_IS_UNIQUE], [1], [Define if Fortran C_LONG_DOUBLE is different from C_DOUBLE])
     else
-      HAVE_FORTRAN_2003="yes"
+      FORTRAN_C_LONG_DOUBLE_IS_UNIQUE="0"
+    fi
+  fi
+
+  FORTRAN_SIZEOF_LONG_DOUBLE=${ac_cv_sizeof_long_double}
+  AC_DEFINE_UNQUOTED([FORTRAN_SIZEOF_LONG_DOUBLE], ["${ac_cv_sizeof_long_double}"], [Determine the size of C long double])
+
+  dnl get the largest sizeof for REAL kinds
+  max_real_fortran_sizeof="`echo $PAC_FC_ALL_REAL_KINDS_SIZEOF | sed -ne 's/.*,\([[0-9]]*\)}/\1/p'`"
+  max_real_fortran_kind="`echo $PAC_FC_ALL_REAL_KINDS | sed -ne 's/.*,\([[0-9]]*\)}/\1/p'`"
+
+  dnl remove the invalid kind from the list
+  if test "$ac_cv_sizeof___float128" != 0;then
+    if test "$ac_cv_sizeof___float128" != "$max_real_fortran_sizeof" &&
+       test "${ac_cv_sizeof_long_double}" != "$max_real_fortran_sizeof" &&
+       dnl account for the fact that the C compiler can have 16-byte __float128 and the Fortran compiler only has 8-byte doubles,
+       dnl so we don't want to remove the 8-byte Fortran doubles. This is sometimes the case if different C and Fortran vendors
+       dnl are used (for example gnu and pgi).
+       test "${ac_cv_sizeof_double}" != "$max_real_fortran_sizeof" ; then
+          AC_MSG_WARN([
+           Fortran REAL(KIND=$max_real_fortran_kind) is $max_real_fortran_sizeof Bytes, but no corresponding C float type exists of that size
+                     !!! Fortran interfaces will not be generated for REAL(KIND=$max_real_fortran_kind) !!!
+          ])
+      PAC_FC_ALL_REAL_KINDS="`echo $PAC_FC_ALL_REAL_KINDS | sed -e 's/,[[0-9]]\+}/}/g'`"
+      PAC_FC_ALL_REAL_KINDS_SIZEOF="`echo $PAC_FC_ALL_REAL_KINDS_SIZEOF | sed -e 's/,[[0-9]]\+}/}/g'`"
+
     fi
   fi
+  AC_MSG_CHECKING([for Fortran interoperable KINDS with C])
+  AC_MSG_RESULT([$PAC_FC_ALL_REAL_KINDS])
+
+  dnl count the number of real kinds
+  H5CONFIG_F_NUM_RKIND="INTEGER, PARAMETER :: num_rkinds = `echo \"[$]PAC_FC_ALL_REAL_KINDS\" |  tr -d -c ',\n' | awk '{ print length + 1; }'`"
+  H5CONFIG_F_RKIND="INTEGER, DIMENSION(1:num_rkinds) :: rkind = (/`echo $PAC_FC_ALL_REAL_KINDS | sed -e 's/{//g' | sed -e 's/}//g' | sed -e 's/ /,/g'`/)"
+  H5CONFIG_F_RKIND_SIZEOF="INTEGER, DIMENSION(1:num_rkinds) :: rkind_sizeof = (/`echo $PAC_FC_ALL_REAL_KINDS_SIZEOF | sed -e 's/{//g' | sed -e 's/}//g'| sed -e 's/ /,/g'`/)"
+
+  AC_DEFINE_UNQUOTED([H5CONFIG_F_NUM_RKIND], $H5CONFIG_F_NUM_RKIND, [Define number of valid Fortran REAL KINDs])
+  AC_DEFINE_UNQUOTED([H5CONFIG_F_RKIND], $H5CONFIG_F_RKIND, [Define valid Fortran REAL KINDs])
+  AC_DEFINE_UNQUOTED([H5CONFIG_F_RKIND_SIZEOF], $H5CONFIG_F_RKIND_SIZEOF, [Define valid Fortran REAL KINDs Sizeof])
+
+## Change back to the C language
+  AC_LANG_POP(Fortran)
 else
   FC="no"
 fi
 
-## Change back to the C language
-AC_LANG_POP(Fortran)
-
-AM_CONDITIONAL([FORTRAN_HAVE_SIZEOF], [test "X$HAVE_SIZEOF_FORTRAN" = "Xyes"])
-AM_CONDITIONAL([FORTRAN_HAVE_C_SIZEOF], [test "X$HAVE_C_SIZEOF_FORTRAN" = "Xyes"])
-AM_CONDITIONAL([FORTRAN_HAVE_STORAGE_SIZE], [test "X$HAVE_STORAGE_SIZE_FORTRAN" = "Xyes"])
-AM_CONDITIONAL([FORTRAN_2003_CONDITIONAL_F], [test "X$HAVE_FORTRAN_2003" = "Xyes"])
-AM_CONDITIONAL([FORTRAN_DEFAULT_REALisDBLE_F], [test "X$FORTRAN_DEFAULT_REALisDBLE" = "Xyes"])
-
 ## ----------------------------------------------------------------------
 ## Check if they would like the C++ interface compiled
 ##
+## This needs to be exposed for the library info file even if C++ is disabled.
+AC_SUBST([HDF_CXX])
+
+## Default is no C++
+HDF_CXX=no
+
 ## We need to check for a C++ compiler unconditionally, since
 ## AC_PROG_CXX defines some macros that Automake 1.9.x uses and will
 ## miss even if c++ is not enabled.
-  AC_PROG_CXX
-  AC_PROG_CXXCPP	## this is checked for when AC_HEADER_STDC is done
+AC_PROG_CXX
+AC_PROG_CXXCPP
 
 AC_MSG_CHECKING([if c++ interface enabled])
 
@@ -487,28 +806,18 @@ AC_ARG_ENABLE([cxx],
               [AS_HELP_STRING([--enable-cxx],
                               [Compile the C++ interface [default=no]])],
               [HDF_CXX=$enableval])
+AC_MSG_RESULT([$HDF_CXX])
 
 if test "X$HDF_CXX" = "Xyes"; then
-  echo "yes"
   HDF5_INTERFACES="$HDF5_INTERFACES c++"
 
+  ## Expose the compiler for *.in files
+  AC_SUBST([CXX])
+
   ## Change to the C++ language
   AC_LANG_PUSH(C++)
 
-  # Checking if C++ needs old style header files in includes
-  PAC_PROG_CXX_HEADERS
-
-  # Checking if C++ can handle namespaces
-  PAC_PROG_CXX_NAMESPACE
-  
-  # Checking if C++ has offsetof extension 
-  PAC_PROG_CXX_OFFSETOF
-
-  # if C++ can handle static cast
-  PAC_PROG_CXX_STATIC_CAST
-
 else
-  AC_MSG_RESULT([no])
   CXX="no"
 fi
 
@@ -520,51 +829,98 @@ AC_LANG_POP(C++)
 ## Check if they would like the High Level library  compiled
 ##
 
-AC_SUBST(HL) HL=""
-## name of fortran folder inside "hl", if FORTRAN compile is requested
-AC_SUBST(HL_FOR) HL_FOR=""
-AC_MSG_CHECKING([if high level library is enabled])
+## This needs to be exposed for the library info file even if the HL
+## library is disabled.
+AC_SUBST([HDF5_HL])
+AC_SUBST([HDF5_HL_TOOLS])
+AC_SUBST([HDF5_HL_GIF_TOOLS])
+
+## The high-level library and high-level tools are enabled unless the build mode
+## is clean.
+if test "X-$BUILD_MODE" = "X-clean" ; then
+  HDF5_HL=no
+  HDF5_HL_TOOLS=no
+else
+  HDF5_HL=yes
+  HDF5_HL_TOOLS=yes
+fi
+
+## high-level library directories (set when needed, blank until then)
+##
+## main high-level library
+AC_SUBST(HL)
+HL=""
+## Fortran high-level library
+AC_SUBST(HL_FOR)
+HL_FOR=""
+## Tools high-level library
+AC_SUBST(HL_TOOLS)
+HL_TOOLS=""
+
+AC_MSG_CHECKING([if the high-level library is enabled])
 AC_ARG_ENABLE([hl],
      [AS_HELP_STRING([--enable-hl],
-                     [Enable the high level library [default=yes]])],
-     [HDF5_HL=$enableval],
-     [HDF5_HL=yes])
+                     [Enable the high-level library.
+                     [default=yes (unless build mode = clean)]
+                     ])],
+     [HDF5_HL=$enableval])
 
-if test "X$HDF5_HL" = "Xyes"; then
- echo "yes"
+if test "X-$HDF5_HL" = "X-yes"; then
+ AC_MSG_RESULT([yes])
  HL="hl"
  AC_DEFINE([INCLUDE_HL], [1],
-           [Define if HDF5's high-level library headers should be included in hdf5.h])
-
-  ## If Fortran's default real is double precision and HL is being built then configure
-  ## should fail due to bug HDFFV-889.
-  if test "X$FORTRAN_DEFAULT_REALisDBLE" = "Xyes"; then
-    AC_MSG_ERROR([Fortran high-level routines are not supported when the default REAL is DOUBLE PRECISION, use configure option --disable-hl.])
-  fi
+           [Define if the high-level library headers should be included in hdf5.h])
 else
- echo "no"
+  AC_MSG_RESULT([no])
 fi
 
-
 ## ----------------------------------------------------------------------
-## Check if they have Perl installed on their system. We only need Perl
-## if they're using a GNU compiler.
+## Enable new references for dimension scales
 ##
-AC_SUBST([PERL]) PERL=""
-if test "X$GCC" = "Xyes"; then
-  AC_CHECK_PROGS([PERL], [perl],, [$PATH])
+AC_SUBST([DIMENSION_SCALES_WITH_NEW_REF])
+AC_MSG_CHECKING([whether to use new references with dimension scales]);
+AC_ARG_ENABLE([dimension-scales-with-new-ref],
+              [AS_HELP_STRING([--enable-dimension-scales-with-new-ref],
+                     [Use new references when creating dimension scales.
+                      [default=no]
+                     ])],
+             [DIMENSION_SCALES_WITH_NEW_REF=$enableval])
+
+## Set the default value to use old references.
+if test "X-$DIMENSION_SCALES_WITH_NEW_REF" = X- ; then
+  DIMENSION_SCALES_WITH_NEW_REF=no
 fi
 
+case "X-$DIMENSION_SCALES_WITH_NEW_REF" in
+  X-yes)
+    AC_MSG_RESULT([yes])
+    AC_DEFINE([DIMENSION_SCALES_WITH_NEW_REF], [1],
+              [Define if new references for dimension scales were requested])
+
+    ;;
+  X-no)
+    AC_MSG_RESULT([no])
+    ;;
+  *)
+    AC_MSG_ERROR([Unrecognized value: $DIMENSION_SCALES_WITH_NEW_REF])
+    ;;
+esac
+
 ## ----------------------------------------------------------------------
 ## Check which archiving tool to use. This needs to be done before
-## the AM_PROG_LIBTOOL macro.
+## the LT_INIT macro.
 ##
-
 if test -z "$AR"; then
   AC_CHECK_PROGS([AR], [ar xar], [:], [$PATH])
 fi
 AC_SUBST([AR])
 
+# Set the default ar flags to cr
+# The Automake default is to use cru and the 'u' causes ar
+# to emit warnings on some platforms.
+AR_FLAGS=cr
+
+
 ## Export the AR macro so that it will be placed in the libtool file
 ## correctly.
 export AR
@@ -574,7 +930,9 @@ AC_PROG_INSTALL
 
 
 ## ----------------------------------------------------------------------
-## Set up ${TR} which is used to process DEBUG_PKG.
+## Set up ${TR} which is used to process the package list for extra
+## debugging output in the C library.
+
 AC_PATH_PROG([TR], [tr])
 
 
@@ -604,36 +962,36 @@ fi
 ## The following variables are used to distinguish between building a
 ## serial and parallel library.
 ##
-##    HAVE_PARALLEL	-- defined in H5config.h if we are building
-##			   a parallel library even if configure wasn't
-##			   able to find some header file or library that
-##			   might be required. This is defined if the
-##			   user explicitly states
-##			   that a parallel library is being built by supplying
-##			   the `--enable-parallel' configure switch.
-##
-##    PARALLEL		-- This variable is set to a non-null value if
-##			   we're building a parallel version of the library.
-##
-##    RUNSERIAL	        -- This is a command which will be prepended to
-##			   the executable name to run the executable using
-##			   a single process. For serial versions of the
-##			   library this will normally be empty. For parallel
-##			   versions it might be something like `mpiexec -n 1'.
-##			   The value of this variable is substituted in *.in
-##			   files.
-##
-##    RUNPARALLEL	-- This is a command which will be prepended to
-##			   the executable name to run the executable on
-##			   multiple processors. For the serial library the
-##			   value will normally be the empty string. For
-##			   parallel library it should be something like
-##			   "mpiexec -n \$\${NPROCS:=6}" where NPROCS will
-##			   eventually contain the number of processors on which
-##			   to run the executable (the double dollarsigns are to
-##			   protect the expansion until make executes the
-##			   command).  The value of this variable is
-##			   substituted in *.in files.
+##    HAVE_PARALLEL    -- defined in H5config.h if we are building
+##               a parallel library even if configure wasn't
+##               able to find some header file or library that
+##               might be required. This is defined if the
+##               user explicitly states
+##               that a parallel library is being built by supplying
+##               the `--enable-parallel' configure switch.
+##
+##    PARALLEL        -- This variable is set to a non-null value if
+##               we're building a parallel version of the library.
+##
+##    RUNSERIAL            -- This is a command which will be prepended to
+##               the executable name to run the executable using
+##               a single process. For serial versions of the
+##               library this will normally be empty. For parallel
+##               versions it might be something like `mpiexec -n 1'.
+##               The value of this variable is substituted in *.in
+##               files.
+##
+##    RUNPARALLEL    -- This is a command which will be prepended to
+##               the executable name to run the executable on
+##               multiple processors. For the serial library the
+##               value will normally be the empty string. For
+##               parallel library it should be something like
+##               "mpiexec -n \$\${NPROCS:=6}" where NPROCS will
+##               eventually contain the number of processors on which
+##               to run the executable (the double dollarsigns are to
+##               protect the expansion until make executes the
+##               command).  The value of this variable is
+##               substituted in *.in files.
 ##
 AC_SUBST([PARALLEL])
 AC_SUBST([RUNSERIAL])
@@ -641,6 +999,62 @@ AC_SUBST([RUNPARALLEL])
 AC_SUBST([TESTPARALLEL])
 
 ## ----------------------------------------------------------------------
+## Check if they would like the Java native interface (JNI) compiled
+##
+
+## This needs to be exposed for the library info file even if Java is disabled.
+AC_SUBST([HDF_JAVA])
+
+## Default is no Java
+HDF_JAVA=no
+
+AC_SUBST([H5_CLASSPATH]) H5_CLASSPATH=""
+AC_MSG_CHECKING([if Java JNI interface enabled])
+
+AC_ARG_ENABLE([java],
+              [AS_HELP_STRING([--enable-java],
+                              [Compile the Java JNI interface [default=no]])],
+              [HDF_JAVA=$enableval])
+
+if test "X$HDF_JAVA" = "Xyes"; then
+  if test "X${enable_shared}" != "Xno"; then
+    AC_MSG_RESULT([yes])
+    if test "X$CLASSPATH" = "X"; then
+      H5_CLASSPATH=".:$srcdir/java/lib"
+    else
+      H5_CLASSPATH=".:$CLASSPATH:$srcdir/java/lib"
+    fi
+    ## Checks for programs.
+    AX_JAVA_OPTIONS
+    H5_JAVACFLAGS=$JAVACFLAGS
+    H5_JAVAFLAGS=$JAVAFLAGS
+    AX_PROG_JAVAC
+    AX_PROG_JAVA
+    AX_PROG_JAR
+    AX_PROG_JAVADOC
+    ## Find the include directories needed for building JNI code
+    AX_JNI_INCLUDE_DIR()
+    for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS
+    do
+      JNIFLAGS="$JNIFLAGS -I$JNI_INCLUDE_DIR"
+    done
+    ## Find junit for testing the JNI code
+    AX_CHECK_CLASSPATH()
+    CLASSPATH_ENV=$H5_CLASSPATH
+    AX_CHECK_JUNIT()
+    AX_CHECK_JAVA_HOME
+
+    AC_MSG_RESULT([yes])
+  else
+    AC_MSG_ERROR([Java requires shared libraries to be built])
+    HDF_JAVA="no"
+    AC_MSG_RESULT([no])
+  fi
+else
+  AC_MSG_RESULT([no])
+fi
+
+## ----------------------------------------------------------------------
 ## Fortran libraries are not currently supported on Mac. Disable them.
 ## (this is overridable with --enable-unsupported).
 ##
@@ -649,18 +1063,17 @@ H5_FORTRAN_SHARED="no"
 if test "X${HDF_FORTRAN}" = "Xyes" && test "X${enable_shared}" != "Xno"; then
   AC_MSG_CHECKING([if shared Fortran libraries are supported])
   H5_FORTRAN_SHARED="yes"
-
-  ## Disable fortran shared libraries on Mac. (MAM - 03/30/11)
-  
+  ## tell libtool to do the right thing with COMMON symbols, this fixes
+  ## corrupt values with COMMON and EQUIVALENCE when building shared
+  ## Fortran libraries on OSX with gnu and Intel compilers (HDFFV-2772).
   case "`uname`" in
     Darwin*)
-    H5_FORTRAN_SHARED="no"
-    CHECK_WARN="Shared Fortran libraries not currently supported on Mac."
-      ;;
+    H5_LDFLAGS="$H5_LDFLAGS -Wl,-commons,use_dylibs"
+    ;;
   esac
 
   ## Report results of check(s)
-  
+
   if test "X${H5_FORTRAN_SHARED}" = "Xno"; then
     AC_MSG_RESULT([no])
     AC_MSG_WARN([$CHECK_WARN])
@@ -682,104 +1095,219 @@ fi
 AM_CONDITIONAL([FORTRAN_SHARED_CONDITIONAL], [test "X$H5_FORTRAN_SHARED" = "Xyes"])
 
 ## ----------------------------------------------------------------------
-## Disable C++ shared libraries if +DD64 flag is detected.
+## Check if they would like to disable building tests
 ##
-AC_SUBST([H5_CXX_SHARED])
-H5_CXX_SHARED="no"
-if test "X${HDF_CXX}" = "Xyes" && test "X${enable_shared}" != "Xno"; then
-  AC_MSG_CHECKING([if shared C++ libraries are supported])
-  H5_CXX_SHARED="yes"
 
-  ## Disable C++ shared libraries if DD64 flag is being used.
-  
-  if (echo dummy ${CXX} ${CXXLD} ${CFLAGS} ${CXXFLAGS} ${LDFLAGS} | grep 'DD64') > /dev/null; then
-    H5_CXX_SHARED="no"
-    CHECK_WARN="Shared C++ libraries not currently supported with +DD64 flag."
-  fi
+## This needs to be exposed for the library info file.
+AC_SUBST([HDF5_TESTS])
 
-  ## Report results of check(s)
-  
-  if test "X${H5_CXX_SHARED}" = "Xno"; then
-    AC_MSG_RESULT([no])
-    AC_MSG_WARN([$CHECK_WARN])
-    if test "X${ALLOW_UNSUPPORTED}" != "Xyes"; then
-      AC_MSG_WARN([Disabling shared C++ libraries.])
-      AC_MSG_WARN([To override this behavior, please use --enable-unsupported configure option.])
-      if test "X${enable_static}" = "Xno"; then
-        AC_MSG_ERROR([both static and shared C++ libraries are disabled])
-      fi
-    else
-      AC_MSG_WARN([Allowing unsupported C++ shared librares due to use of --enable-unsupported flag])
-    fi
-  else
-    AC_MSG_RESULT([yes])
-  fi
-fi
+## Default is to build tests
+HDF5_TESTS=yes
+
+AC_MSG_CHECKING([if building tests is disabled])
+
+AC_ARG_ENABLE([tests],
+              [AS_HELP_STRING([--enable-tests],
+                              [Compile the HDF5 tests [default=yes]])],
+              [HDF5_TESTS=$enableval])
+
+AC_MSG_RESULT([$HDF5_TESTS])
 
-AM_CONDITIONAL([CXX_SHARED_CONDITIONAL], [test "X$H5_CXX_SHARED" = "Xyes"])
+## These need to be exposed for some tests.
+AC_SUBST([H5_UTILS_TEST_BUILDDIR])
+H5_UTILS_TEST_BUILDDIR='utils/test'
+AC_SUBST([H5_TEST_BUILDDIR])
+H5_TEST_BUILDDIR='test'
 
 ## ----------------------------------------------------------------------
-## pgcc version 6.0x have optimization (-O, -O2 or -O3) problem.  Detect
-## these versions and add option "-Mx,28,0x8" to the compiler to avoid
-## the problem if optimization is enabled.
+## Check what level of testing should be enabled
 ##
 
-if (${CC-cc} -V 2>&1 | grep '^pgcc 6.0') > /dev/null && test "X$enable_production" = "Xyes"; then
-    echo 'adding compiler flag to avoid optimization problem in pgcc'
-    CC="${CC-cc} -Mx,28,0x8"
-fi
+## Default is quickest testing
+TEST_EXPRESS_LEVEL_DEFAULT=3
+
+AC_MSG_CHECKING([if HDF5 testing intensity level is set])
+
+AC_ARG_ENABLE([test-express],
+              [AS_HELP_STRING([--enable-test-express=(0-3)],
+                              [Set HDF5 testing intensity level (0-3) [0 = exhaustive testing; 3 = quicker testing; default=3] Set environment variable HDF5TestExpress to override configured setting])],
+              [TEST_EXPRESS_LEVEL_DEFAULT=$enableval])
+
+case "X-$TEST_EXPRESS_LEVEL_DEFAULT" in
+  X-0|X-1|X-2|X-3)
+    AC_MSG_RESULT([$TEST_EXPRESS_LEVEL_DEFAULT])
+    ;;
+  *)
+    AC_MSG_RESULT([error])
+    AC_MSG_ERROR([$TEST_EXPRESS_LEVEL_DEFAULT is not a valid test express level])
+    ;;
+esac
+
+AC_DEFINE_UNQUOTED([TEST_EXPRESS_LEVEL_DEFAULT], [$TEST_EXPRESS_LEVEL_DEFAULT], [HDF5 testing intensity level])
 
 ## ----------------------------------------------------------------------
-## Shared libraries are not currently supported under Cygwin, so configure
-## disables them unless --enable-unsupported has been supplied by the user.
+## Check if they would like to disable building tools
+##
 
-if test "X${ALLOW_UNSUPPORTED}" != "Xyes"; then
-  case "`uname`" in
-    CYGWIN*)
-      if test "X${enable_shared}" = "Xyes"; then
-        echo '    warning: shared libraries are not supported on Cygwin!'
-        echo '    disabling shared libraries'
-        echo '    use --enable-unsupported to override this warning and keep shared libraries enabled'
-      fi
-      enable_shared="no"
-      ;;
-  esac
+## This needs to be exposed for the library info file.
+AC_SUBST([HDF5_TOOLS])
+
+## Default is to build tests and tools
+HDF5_TOOLS=yes
+
+AC_MSG_CHECKING([if building tools is disabled])
+
+AC_ARG_ENABLE([tools],
+              [AS_HELP_STRING([--enable-tools],
+                              [Compile the HDF5 tools [default=yes]])],
+              [HDF5_TOOLS=$enableval])
+
+AC_MSG_RESULT([$HDF5_TOOLS])
+
+## ----------------------------------------------------------------------
+## Check if they would like to disable building the high-level GIF
+## tools (they have unfixed CVE issues)
+##
+
+AC_MSG_CHECKING([if the high-level GIF tools are enabled])
+AC_ARG_ENABLE([hlgiftools],
+     [AS_HELP_STRING([--enable-hlgiftools],
+                     [Enable the high-level GIF tools. NOTE: These have unfixed CVE issues!
+                     [default=no]
+                     ])],
+     [HDF5_HL_GIF_TOOLS=$enableval])
+
+if test "X-$HDF5_TOOLS" = "X-yes" -a "X-$HDF5_HL" = "X-yes" -a "X-$HDF5_HL_GIF_TOOLS" = "X-yes"; then
+  AC_MSG_RESULT([yes])
+else
+  AC_MSG_RESULT([no])
+  HDF5_HL_GIF_TOOLS="no"
 fi
 
+
 ## ----------------------------------------------------------------------
-## Windows won't create DLLs without the following macro.
+## Check if they would like to enable building doxygen files
 ##
-AC_LIBTOOL_WIN32_DLL
+
+## This needs to be exposed for the library info file.
+AC_SUBST([HDF5_DOXYGEN])
+
+## Default is to not build DOXYGEN
+HDF5_DOXYGEN=no
+
+AC_MSG_CHECKING([if building doxygen is enabled])
+
+AC_ARG_ENABLE([doxygen],
+              [AS_HELP_STRING([--enable-doxygen],
+                              [Compile the HDF5 doxygen files [default=no]])],
+              [HDF5_DOXYGEN=$enableval])
+
+AC_MSG_RESULT([$HDF5_DOXYGEN])
+
+if test "X$HDF5_DOXYGEN" = "Xyes"; then
+  DX_DOXYGEN_FEATURE(ON)
+  DX_DOT_FEATURE(OFF)
+  DX_HTML_FEATURE(ON)
+  DX_CHM_FEATURE(OFF)
+  DX_CHI_FEATURE(OFF)
+  DX_MAN_FEATURE(ON)
+  DX_RTF_FEATURE(OFF)
+  DX_XML_FEATURE(OFF)
+  DX_PDF_FEATURE(OFF)
+  DX_PS_FEATURE(OFF)
+
+  AC_SUBST([DOXYGEN_PACKAGE])
+  AC_SUBST([DOXYGEN_VERSION_STRING])
+  AC_SUBST([DOXYGEN_DIR])
+  AC_SUBST([DOXYGEN_INCLUDE_ALIASES])
+  AC_SUBST([DOXYGEN_PROJECT_LOGO])
+  AC_SUBST([DOXYGEN_PROJECT_BRIEF])
+  AC_SUBST([DOXYGEN_INPUT_DIRECTORY])
+  AC_SUBST([DOXYGEN_OPTIMIZE_OUTPUT_FOR_C])
+  AC_SUBST([DOXYGEN_MACRO_EXPANSION])
+  AC_SUBST([DOXYGEN_OUTPUT_DIRECTORY])
+  AC_SUBST([DOXYGEN_EXAMPLES_DIRECTORY])
+  AC_SUBST([DOXYGEN_LAYOUT_FILE])
+  AC_SUBST([DOXYGEN_HTML_HEADER])
+  AC_SUBST([DOXYGEN_HTML_FOOTER])
+  AC_SUBST([DOXYGEN_HTML_EXTRA_STYLESHEET])
+  AC_SUBST([DOXYGEN_HTML_EXTRA_FILES])
+  AC_SUBST([DOXYGEN_TAG_FILE])
+  AC_SUBST([DOXYGEN_SERVER_BASED_SEARCH])
+  AC_SUBST([DOXYGEN_EXTERNAL_SEARCH])
+  AC_SUBST([DOXYGEN_SEARCHENGINE_URL])
+  AC_SUBST([DOXYGEN_STRIP_FROM_PATH])
+  AC_SUBST([DOXYGEN_STRIP_FROM_INC_PATH])
+  AC_SUBST([DOXYGEN_PREDEFINED])
+
+# SRCDIR Environment variables used inside doxygen macro for the source location:
+  DOXYGEN_PACKAGE=${PACKAGE_NAME}
+  DOXYGEN_VERSION_STRING=${PACKAGE_VERSION}
+  DOXYGEN_DIR='$(SRCDIR)/doxygen'
+  DOXYGEN_INCLUDE_ALIASES_PATH='$(SRCDIR)/doxygen'
+  DOXYGEN_INCLUDE_ALIASES='$(SRCDIR)/doxygen/aliases'
+  DOXYGEN_VERBATIM_VARS='DOXYGEN_INCLUDE_ALIASES'
+  DOXYGEN_PROJECT_LOGO='$(SRCDIR)/doxygen/img/HDFG-logo.png'
+  DOXYGEN_PROJECT_BRIEF='API Reference'
+  DOXYGEN_INPUT_DIRECTORY='$(SRCDIR) $(SRCDIR)/doxygen/dox'
+  DOXYGEN_OPTIMIZE_OUTPUT_FOR_C=YES
+  DOXYGEN_MACRO_EXPANSION=YES
+  DOXYGEN_OUTPUT_DIRECTORY=hdf5lib_docs
+  DOXYGEN_EXAMPLES_DIRECTORY='$(SRCDIR)/doxygen/dox/cookbook $(SRCDIR)/doxygen/examples $(SRCDIR)/src $(SRCDIR)/examples $(SRCDIR)/test'
+  DOXYGEN_LAYOUT_FILE='$(SRCDIR)/doxygen/hdf5doxy_layout.xml'
+  DOXYGEN_HTML_HEADER='$(SRCDIR)/doxygen/hdf5_header.html'
+  DOXYGEN_HTML_FOOTER='$(SRCDIR)/doxygen/hdf5_footer.html'
+  DOXYGEN_HTML_EXTRA_STYLESHEET='$(SRCDIR)/doxygen/hdf5doxy.css'
+  DOXYGEN_HTML_EXTRA_FILES='$(SRCDIR)/doxygen/hdf5_navtree_hacks.js'
+  DOXYGEN_TAG_FILE=hdf5.tag
+  DOXYGEN_SERVER_BASED_SEARCH=NO
+  DOXYGEN_EXTERNAL_SEARCH=NO
+  DOXYGEN_SEARCHENGINE_URL=
+  DOXYGEN_STRIP_FROM_PATH='$(SRCDIR)'
+  DOXYGEN_STRIP_FROM_INC_PATH='$(SRCDIR)'
+  DOXYGEN_PREDEFINED='H5_HAVE_DIRECT H5_HAVE_LIBHDFS H5_HAVE_MAP_API H5_HAVE_PARALLEL H5_HAVE_ROS3_VFD H5_DOXYGEN H5_HAVE_SUBFILING_VFD H5_HAVE_IOC_VFD'
+
+  DX_INIT_DOXYGEN([HDF5], [./doxygen/Doxyfile], [hdf5lib_docs])
+fi
+
 
 ## ----------------------------------------------------------------------
 ## Create libtool.  If shared/static libraries are going to be enabled
 ## or disabled, it should happen before these macros.
 LT_PREREQ([2.2])
-LT_INIT([dlopen])
+
+## ----------------------------------------------------------------------
+## dlopen - This will use an improved version of libtool
+## win32-dll - This will build clean dlls on win32 platforms.
+LT_INIT([dlopen,win32-dll])
 
 ## ----------------------------------------------------------------------
 ## Check if we should install only statically linked executables.
 ##   This check needs to occur after libtool is initialized because
-##   we check a libtool cache value and may issue a warning based 
+##   we check a libtool cache value and may issue a warning based
 ##   on its result.
+AC_SUBST([STATIC_EXEC])
+
+## Default is no
+STATIC_EXEC=no
+
 AC_MSG_CHECKING([if we should install only statically linked executables])
 AC_ARG_ENABLE([static_exec],
               [AS_HELP_STRING([--enable-static-exec],
                               [Install only statically linked executables
                                [default=no]])],
               [STATIC_EXEC=$enableval])
+AC_MSG_RESULT([$STATIC_EXEC])
 
 if test "X$STATIC_EXEC" = "Xyes"; then
-  echo "yes"
   ## Issue a warning if -static flag is not supported.
   if test "X$lt_cv_prog_compiler_static_works" = "Xno"; then
-      echo "    warning: -static flag not supported on this system; executable won't statically link shared system libraries."
-      LT_STATIC_EXEC=""
+    AC_MSG_WARN([-static flag not supported on this system; executable won't statically link shared system libraries.])
+    LT_STATIC_EXEC=""
   else
     LT_STATIC_EXEC="-all-static"
   fi
 else
-  echo "no"
   LT_STATIC_EXEC=""
 fi
 AM_CONDITIONAL([USE_PLUGINS_CONDITIONAL], [test "X$LT_STATIC_EXEC" = X])
@@ -823,215 +1351,40 @@ case "X-$RPATH" in
 esac
 
 ## ----------------------------------------------------------------------
-## Sometimes makes think the `.PATH:' appearing before the first rule
-## with an action should override the `all' default target. So we have
-## to decide what the proper syntax is.
-##
-AC_MSG_CHECKING([how make searches directories])
-while true; do #for break
-  ## The most common method is `VPATH=DIR1 DIR2 ...'
-  cat >maketest <<EOF
-VPATH=$srcdir/config $srcdir/src $srcdir/bin
-.c.o:
-	cp $< H5.o
-
-foo: H5.o
-	rm -f H5.o
-	@echo works
-EOF
-
-  if (${MAKE-make} -f maketest foo) >/dev/null 2>&1; then
-    SEARCH_RULE='VPATH='
-    SEARCH_SEP=' '
-    AC_MSG_RESULT([VPATH=DIR1 DIR2 ...])
-    break
-  fi
-
-  ## The second most common method is like above except with the
-  ## directories separated by colons.
-  cat >maketest <<EOF
-VPATH=$srcdir/config:$srcdir/src:$srcdir/bin
-.c.o:
-	cp $< H5.o
-
-foo: H5.o
-	rm -f H5.o
-	@echo works
-EOF
-
-  if (${MAKE-make} -f maketest foo) >/dev/null 2>&1; then
-    SEARCH_RULE='VPATH='
-    SEARCH_SEP=':'
-    AC_MSG_RESULT([VPATH=DIR1:DIR2:...])
-    break
-  fi
-
-  ## pmake uses the construct `.PATH: DIR1 DIR2
-  cat >maketest <<EOF
-.PATH: $srcdir/config $srcdir/src $srcdir/bin
-.c.o:
-	cp $< H5.o
-
-foo: H5.o
-	rm -f H5.o
-	@echo works
-EOF
-
-  if (MAKE= ${MAKE-make} -f maketest foo) >/dev/null 2>&1; then
-    SEARCH_RULE='.PATH: '
-    SEARCH_SEP=' '
-    AC_MSG_RESULT([.PATH: DIR1 DIR2 ...])
-    break
-  fi
-
-  ## No way for make to search directories
-  SEARCH_RULE='## SEARCH DISABLED: '
-  SEARCH_SEP=' '
-  AC_MSG_RESULT([it doesn't])
-  if test ! -f configure; then
-    AC_MSG_ERROR([${MAKE-make} requires the build and source directories to be the same])
-  fi
-  break
-done
-rm maketest
-
-## ----------------------------------------------------------------------
-## pmake will throw an error if variables are undefined in a Makefile.
-## These errors can be changed to warnings using the -V flag.
-##
-AC_SUBST([AM_MAKEFLAGS]) AM_MAKEFLAGS=""
-
-## Don't run test if MAKE is defined but is the empty string
-if test -n "${MAKE-make}"; then 
-
-  AC_MSG_CHECKING([whether make will build with undefined variables])
-
-  cat >maketest <<EOF
-foo: \$(UNDEFINED) \$(UNDEFINED2)
-	@echo \$(UNDEFINED3) works
-EOF
-
-  if (${MAKE-make} -f maketest foo) >/dev/null 2>&1; then
-    AC_MSG_RESULT([yes])
-  else
-    AC_MSG_RESULT([no, setting -V flag])
-    AM_MAKEFLAGS="\-V"
-  fi
-
-  rm maketest
-fi
-
-## ----------------------------------------------------------------------
-## Production flags?  Save the value in $CONFIG_MODE so we have it for
-## the record.
-##
-AC_MSG_CHECKING([for production mode])
-AC_ARG_ENABLE([production],
-              [AS_HELP_STRING([--enable-production],
-                              [Determines how to run the compiler.])])
-
-case "X-$enable_production" in
-  X-yes)
-    enable_production="yes"
-    AC_MSG_RESULT([production])
-    CONFIG_MODE=production
-    H5_CFLAGS="$H5_CFLAGS $PROD_CFLAGS"
-    H5_CPPFLAGS="$H5_CPPFLAGS $PROD_CPPFLAGS"
-    H5_CXXFLAGS="$H5_CXXFLAGS $PROD_CXXFLAGS"
-    H5_FCFLAGS="$H5_FCFLAGS $PROD_FCFLAGS"
-    ;;
-  X-|X-no)
-    enable_production="no"
-    AC_MSG_RESULT([development])
-    CONFIG_MODE=development
-    H5_CFLAGS="$H5_CFLAGS $DEBUG_CFLAGS"
-    H5_CPPFLAGS="$H5_CPPFLAGS $DEBUG_CPPFLAGS"
-    H5_CXXFLAGS="$H5_CXXFLAGS $DEBUG_CXXFLAGS"
-    H5_FCFLAGS="$H5_FCFLAGS $DEBUG_FCFLAGS"
-    ;;
-  X-pg|X-profile)
-    enable_production="profile"
-    AC_MSG_RESULT([profile])
-    CONFIG_MODE=profile
-    H5_CFLAGS="$H5_CFLAGS $PROFILE_CFLAGS"
-    H5_CPPFLAGS="$H5_CPPFLAGS $PROFILE_CPPFLAGS"
-    H5_CXXFLAGS="$H5_CXXFLAGS $PROFILE_CXXFLAGS"
-    H5_FCFLAGS="$H5_FCFLAGS $PROFILE_FCFLAGS"
-    ;;
-  *)
-    enable_production="user-defined"
-    AC_MSG_RESULT([user-defined])
-    CONFIG_MODE="$enableval"
-    ;;
-esac
-
-## ----------------------------------------------------------------------
 ## Check for system libraries. "dl" stands for dynamically loaded library
 ##
 AC_CHECK_LIB([m], [ceil])
 AC_CHECK_LIB([dl], [dlopen])
 
-if test "`uname`" = "SunOS" -o "`uname -sr`" = "HP-UX B.11.00"; then
-  ## ...for Solaris
-  AC_CHECK_LIB([socket], [socket])
-  AC_CHECK_LIB([nsl], [xdr_int])
-fi
-
-dnl AC_CHECK_LIB([coug], [main])		## ...for ASCI/Red
-
 ## ----------------------------------------------------------------------
 ## Check for system header files.
 ##
-AC_HEADER_STDC
-AC_HEADER_TIME
 
 ## Unix
-AC_CHECK_HEADERS([sys/resource.h sys/time.h unistd.h sys/ioctl.h sys/stat.h])
-AC_CHECK_HEADERS([sys/socket.h sys/types.h])
-AC_CHECK_HEADERS([stddef.h setjmp.h features.h])
-AC_CHECK_HEADERS([dirent.h])
-AC_CHECK_HEADERS([stdint.h], [C9x=yes])
+AC_CHECK_HEADERS([dirent.h features.h pwd.h unistd.h])
+AC_CHECK_HEADERS([sys/file.h sys/ioctl.h sys/resource.h])
+AC_CHECK_HEADERS([sys/stat.h sys/time.h sys/types.h])
 
 ## Darwin
-AC_CHECK_HEADERS([mach/mach_time.h])
-## Also need to detect Darwin for pubconf
+AC_SUBST([H5_IS_DARWIN])
+H5_IS_DARWIN="no"
 case $host_os in
   darwin*)
     AC_DEFINE([HAVE_DARWIN], [1], [Define if Darwin or Mac OS X])
-  ;;
+    H5_IS_DARWIN="yes"
+    ;;
 esac
 
 ## Windows
 case "`uname`" in
-  CYGWIN*)
-    AC_CHECK_HEADERS([io.h sys/timeb.h])
-    ;;
   MINGW*)
-    AC_CHECK_HEADERS([io.h winsock2.h sys/timeb.h])
-    AC_HAVE_LIBRARY([ws2_32])
-    ;;
-  *)
-    AC_CHECK_HEADERS([io.h winsock2.h sys/timeb.h])
+    # The Winsock library
+    AC_CHECK_LIB([ws2_32], [GetUserName])
     ;;
 esac
 
-case "$host" in
-  alpha*-dec*-osf*)
-    ## The <sys/sysinfo.h> and <sys/proc.h> are needed on the DEC
-    ## Alpha to turn off UAC fixing. We do *not* attempt to
-    ## locate these files on other systems because there are too
-    ## many problems with including them.
-    AC_CHECK_HEADERS([sys/sysinfo.h sys/proc.h])
-    ;;
-  mips*-sgi*)
-    ## The <sys/fpu.h> is needed on the SGI machines to turn off
-    ## denormalized floating-point values going to zero.  We do *not*
-    ## attempt to locate these files on other systems because there
-    ## may be problems with including them.
-    AC_CHECK_HEADERS([sys/fpu.h])
-    AC_CHECK_FUNCS([get_fpc_csr])
-    ;;
-esac
+# Mirror VFD networking
+AC_CHECK_HEADERS([arpa/inet.h netdb.h netinet/in.h sys/socket.h])
 
 ## ----------------------------------------------------------------------
 ## Some platforms require that all symbols are resolved when a library
@@ -1056,11 +1409,11 @@ fi
 
 ## ----------------------------------------------------------------------
 ## Use the macro _AC_SYS_LARGEFILE_MACRO_VALUE to test defines
-## that might need to be set for largefile support to behave 
+## that might need to be set for largefile support to behave
 ## correctly. This macro is defined in acsite.m4 and overrides
 ## the version provided by Autoconf (as of v2.65). The custom
-## macro additionally adds the appropriate defines to AM_CPPFLAGS 
-## so that later configure checks have them visible. 
+## macro additionally adds the appropriate defines to AM_CPPFLAGS
+## so that later configure checks have them visible.
 
 ## Check for _FILE_OFFSET_BITS
 _AC_SYS_LARGEFILE_MACRO_VALUE([_FILE_OFFSET_BITS], [64],
@@ -1081,16 +1434,12 @@ fi
 ##
 case "$host_cpu-$host_vendor-$host_os" in
   *linux*)
-    ## Make available various LFS-related routines using the following 
-    ## _LARGEFILE*_SOURCE macros.
-    AM_CPPFLAGS="-D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE $AM_CPPFLAGS"
-
     ## Add POSIX support on Linux systems, so <features.h> defines
     ## __USE_POSIX, which is required to get the prototype for fdopen
-    ## defined correctly in <stdio.h>. 
+    ## defined correctly in <stdio.h>.
     ##
     ## This flag was removed from h5cc as of 2009-10-17 when it was found
-    ## that the flag broke compiling netCDF-4 code with h5cc, but kept in 
+    ## that the flag broke compiling netCDF-4 code with h5cc, but kept in
     ## H5_CPPFLAGS because fdopen and HDfdopen fail without it. HDfdopen
     ## is used only by H5_debug_mask which is used only when debugging in
     ## H5_init_library (all in H5.c).  When the flag was removed this was
@@ -1101,122 +1450,63 @@ case "$host_cpu-$host_vendor-$host_os" in
     ## functionality so clock_gettime and CLOCK_MONOTONIC are defined
     ## correctly. This was later updated to 200112L so that
     ## posix_memalign() is visible for the direct VFD code on Linux
-    ## systems.
+    ## systems. Even later, this was changed to 200809L to support
+    ## pread/pwrite in VFDs.
     ##
     ## POSIX feature information can be found in the gcc manual at:
     ## http://www.gnu.org/s/libc/manual/html_node/Feature-Test-Macros.html
-    H5_CPPFLAGS="-D_POSIX_C_SOURCE=200112L $H5_CPPFLAGS"
+    H5_CPPFLAGS="-D_POSIX_C_SOURCE=200809L $H5_CPPFLAGS"
 
     ## Need to add this so that O_DIRECT is visible for the direct
     ## VFD on Linux systems.
     H5_CPPFLAGS="-D_GNU_SOURCE $H5_CPPFLAGS"
-
-    ## Also add BSD support on Linux systems, so <features.h> defines
-    ## __USE_BSD, which is required to get the prototype for strdup
-    ## defined correctly in <string.h> and snprintf & vsnprintf defined
-    ## correctly in <stdio.h>
-    ## Linking to the bsd-compat library is required as per the gcc manual:
-    ## http://www.gnu.org/s/libc/manual/html_node/Feature-Test-Macros.html
-    ## however, we do not do this since it breaks the big test on some 
-    ## older platforms.
-    H5_CPPFLAGS="-D_BSD_SOURCE $H5_CPPFLAGS"
     ;;
+
 esac
 
-## Need to add the AM_ and H5_ into CFLAGS/CPPFLAGS to make them visible 
+## Need to add the AM_ and H5_ into CFLAGS/CPPFLAGS to make them visible
 ## for configure checks.
 ## Note: Both will be restored by the end of configure.
 CPPFLAGS="$H5_CPPFLAGS $AM_CPPFLAGS $CPPFLAGS"
 CFLAGS="$H5_CFLAGS $AM_CFLAGS $CFLAGS"
 
-AC_TRY_COMPILE([#include <sys/types.h>],
-               [off64_t n = 0;],
-               [AC_CHECK_FUNCS([lseek64 fseeko64 ftello64 ftruncate64])],
-               [AC_MSG_RESULT([skipping test for lseek64(), fseeko64 , ftello64, ftruncate64() because off64_t is not defined])])
-AC_CHECK_FUNCS([fseeko ftello])
-AC_TRY_COMPILE([
-#include <sys/types.h>
-#include <sys/stat.h>],
-[struct stat64 sb;],
-[AC_CHECK_FUNCS([stat64 fstat64])],
-[AC_MSG_RESULT([skipping test for stat64() and fstat64()])])
-
-## ----------------------------------------------------------------------
-## Data types and their sizes.
-##
-AC_TYPE_OFF_T
-AC_CHECK_TYPE([size_t], [],
-        [AC_DEFINE_UNQUOTED([size_t], [unsigned long],
-                [Define to `unsigned long' if <sys/types.h> does not define.])])
-AC_CHECK_TYPE([ssize_t], [],
-        [AC_DEFINE_UNQUOTED([ssize_t], [long],
-                [Define to `long' if <sys/types.h> does not define.])])
-AC_CHECK_TYPE([ptrdiff_t], [],
-        [AC_DEFINE_UNQUOTED([ptrdiff_t], [long],
-                [Define to `long' if <sys/types.h> does not define.])])
-AC_C_BIGENDIAN
-AC_CHECK_SIZEOF([char], [1])
-AC_CHECK_SIZEOF([short], [2])
-AC_CHECK_SIZEOF([int], [4])
-AC_CHECK_SIZEOF([unsigned], [4])
-AC_CHECK_SIZEOF([long], [4])
-AC_CHECK_SIZEOF([long long], [8])
-AC_CHECK_SIZEOF([__int64], [8])
-AC_CHECK_SIZEOF([float], [4])
-AC_CHECK_SIZEOF([double], [8])
-AC_CHECK_SIZEOF([long double], [8])
-
 ## Checkpoint the cache
 AC_CACHE_SAVE
 
-## Posix.1g types (C9x)
-cat >>confdefs.h <<\EOF
-#include <sys/types.h>
-EOF
-
-if test "X$C9x" = "Xyes"; then
-  cat >>confdefs.h <<\EOF
-#include <stdint.h>
-EOF
-fi
-
-AC_CHECK_SIZEOF(        [int8_t], [1])
-AC_CHECK_SIZEOF(       [uint8_t], [1])
-AC_CHECK_SIZEOF(  [int_least8_t], [1])
-AC_CHECK_SIZEOF( [uint_least8_t], [1])
-AC_CHECK_SIZEOF(   [int_fast8_t], [1])
-AC_CHECK_SIZEOF(  [uint_fast8_t], [1])
-
-AC_CHECK_SIZEOF(       [int16_t], [2])
-AC_CHECK_SIZEOF(      [uint16_t], [2])
-AC_CHECK_SIZEOF( [int_least16_t], [2])
-AC_CHECK_SIZEOF([uint_least16_t], [2])
-AC_CHECK_SIZEOF(  [int_fast16_t], [2])
-AC_CHECK_SIZEOF( [uint_fast16_t], [2])
-
-AC_CHECK_SIZEOF(       [int32_t], [4])
-AC_CHECK_SIZEOF(      [uint32_t], [4])
-AC_CHECK_SIZEOF( [int_least32_t], [4])
-AC_CHECK_SIZEOF([uint_least32_t], [4])
-AC_CHECK_SIZEOF(  [int_fast32_t], [4])
-AC_CHECK_SIZEOF( [uint_fast32_t], [4])
-
-AC_CHECK_SIZEOF(       [int64_t], [8])
-AC_CHECK_SIZEOF(      [uint64_t], [8])
-AC_CHECK_SIZEOF( [int_least64_t], [8])
-AC_CHECK_SIZEOF([uint_least64_t], [8])
-AC_CHECK_SIZEOF(  [int_fast64_t], [8])
-AC_CHECK_SIZEOF( [uint_fast64_t], [8])
-
-AC_CHECK_SIZEOF([size_t], [4])
-AC_CHECK_SIZEOF([ssize_t], [4])
-AC_CHECK_SIZEOF([ptrdiff_t], [4])
-
-cat >>confdefs.h <<\EOF
-#include <sys/types.h> /*for off_t definition*/
-EOF
-AC_CHECK_SIZEOF([off_t], [4])
-AC_CHECK_SIZEOF([off64_t], [8])
+AC_CHECK_SIZEOF(        [int8_t])
+AC_CHECK_SIZEOF(       [uint8_t])
+AC_CHECK_SIZEOF(  [int_least8_t])
+AC_CHECK_SIZEOF( [uint_least8_t])
+AC_CHECK_SIZEOF(   [int_fast8_t])
+AC_CHECK_SIZEOF(  [uint_fast8_t])
+
+AC_CHECK_SIZEOF(       [int16_t])
+AC_CHECK_SIZEOF(      [uint16_t])
+AC_CHECK_SIZEOF( [int_least16_t])
+AC_CHECK_SIZEOF([uint_least16_t])
+AC_CHECK_SIZEOF(  [int_fast16_t])
+AC_CHECK_SIZEOF( [uint_fast16_t])
+
+AC_CHECK_SIZEOF(       [int32_t])
+AC_CHECK_SIZEOF(      [uint32_t])
+AC_CHECK_SIZEOF( [int_least32_t])
+AC_CHECK_SIZEOF([uint_least32_t])
+AC_CHECK_SIZEOF(  [int_fast32_t])
+AC_CHECK_SIZEOF( [uint_fast32_t])
+
+AC_CHECK_SIZEOF(       [int64_t])
+AC_CHECK_SIZEOF(      [uint64_t])
+AC_CHECK_SIZEOF( [int_least64_t])
+AC_CHECK_SIZEOF([uint_least64_t])
+AC_CHECK_SIZEOF(  [int_fast64_t])
+AC_CHECK_SIZEOF( [uint_fast64_t])
+
+AC_CHECK_SIZEOF([bool], [], [#include <stdbool.h>])
+AC_CHECK_SIZEOF([off_t])
+AC_CHECK_SIZEOF([ptrdiff_t])
+AC_CHECK_SIZEOF([size_t])
+AC_CHECK_SIZEOF([ssize_t])
+AC_CHECK_SIZEOF([time_t], [], [#include <time.h>])
 
 ## Checkpoint the cache
 AC_CACHE_SAVE
@@ -1225,17 +1515,16 @@ AC_CACHE_SAVE
 ## Check if the dev_t type is a scalar type (must come after the check for
 ## sys/types.h)
 AC_MSG_CHECKING([if dev_t is scalar])
-AC_TRY_COMPILE([
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
-  ],
-  [dev_t d1, d2; if(d1==d2) return 0;],
-  AC_DEFINE([DEV_T_IS_SCALAR], [1],
-            [Define if `dev_t' is a scalar])
-  AC_MSG_RESULT([yes]),
-  AC_MSG_RESULT([no])
-)
+  ]],
+  [[dev_t d1, d2; if(d1==d2) return 0;]])],
+  [AC_DEFINE([DEV_T_IS_SCALAR], [1],
+            [Define if dev_t is a scalar])
+  AC_MSG_RESULT([yes])],
+  [AC_MSG_RESULT([no])])
 
 ## ----------------------------------------------------------------------
 ## Fake --with-xxx option to allow us to create a help message for the
@@ -1254,82 +1543,12 @@ AC_ARG_WITH([fnord],
   ])
 
 ## ----------------------------------------------------------------------
-## Is the dmalloc present? It has a header file `dmalloc.h' and a library
-## `-ldmalloc' and their locations might be specified with the `--with-dmalloc'
-## command-line switch. The value is an include path and/or a library path.
-## If the library path is specified then it must be preceded by a comma.
+## Make the external filters list available to *.in files
+## At this point it's unset (no external filters by default) but it
+## will be filled in during the deflate (zlib) and szip processing
+## below.
 ##
-AC_ARG_WITH([dmalloc],
-            [AS_HELP_STRING([--with-dmalloc=DIR],
-                            [Use dmalloc memory debugging aid [default=no]])],,
-            [withval=no])
-
-case $withval in
-  yes)
-    HAVE_DMALLOC="yes"
-    AC_CHECK_HEADERS([dmalloc.h],, [unset HAVE_DMALLOC])
-    if test "x$HAVE_DMALLOC" = "xyes"; then
-      AC_CHECK_LIB([dmalloc], [dmalloc_shutdown],, [unset HAVE_DMALLOC])
-    fi
-    if test -z "$HAVE_DMALLOC" -a -n "$HDF5_CONFIG_ABORT"; then
-      AC_MSG_ERROR([couldn't find dmalloc library])
-    fi
-    ;;
-  no)
-    HAVE_DMALLOC="no"
-    AC_MSG_CHECKING([for dmalloc library])
-    AC_MSG_RESULT([suppressed])
-    ;;
-  *)
-    HAVE_DMALLOC="yes"
-    case "$withval" in
-      *,*)
-        dmalloc_inc="`echo $withval |cut -f1 -d,`"
-        dmalloc_lib="`echo $withval |cut -f2 -d, -s`"
-        ;;
-      *)
-        if test -n "$withval"; then
-          dmalloc_inc="$withval/include"
-          dmalloc_lib="$withval/lib"
-        fi
-        ;;
-    esac
-
-    ## Trying to include -I/usr/include and -L/usr/lib is redundant and
-    ## can mess some compilers up.
-    if test "X$dmalloc_inc" = "X/usr/include"; then
-      dmalloc_inc=""
-    fi
-    if test "X$dmalloc_lib" = "X/usr/lib"; then
-      dmalloc_lib=""
-    fi
-
-    saved_CPPFLAGS="$CPPFLAGS"
-    saved_AM_CPPFLAGS="$AM_CPPFLAGS"
-    saved_LDFLAGS="$LDFLAGS"
-    saved_AM_LDFLAGS="$AM_LDFLAGS"
-
-    if test -n "$dmalloc_inc"; then
-      CPPFLAGS="$CPPFLAGS -I$dmalloc_inc"
-      AM_CPPFLAGS="$AM_CPPFLAGS -I$dmalloc_inc"
-    fi
-
-    AC_CHECK_HEADERS([dmalloc.h],,[CPPFLAGS="$saved_CPPFLAGS"; AM_CPPFLAGS="$saved_AM_CPPFLAGS"] [unset HAVE_DMALLOC])
-
-    if test "x$HAVE_DMALLOC" = "xyes"; then
-      if test -n "$dmalloc_lib"; then
-        LDFLAGS="$LDFLAGS -L$dmalloc_lib"
-        AM_LDFLAGS="$AM_LDFLAGS -L$dmalloc_lib"
-      fi
-
-      AC_CHECK_LIB([dmalloc], [dmalloc_shutdown],, [LDFLAGS="$saved_LDFLAGS"; AM_LDFLAGS="$saved_AM_LDFLAGS"; unset HAVE_DMALLOC])
-    fi
-
-    if test -z "$HAVE_DMALLOC" -a -n "$HDF5_CONFIG_ABORT"; then
-      AC_MSG_ERROR([couldn't find dmalloc library])
-    fi
-    ;;
-esac
+AC_SUBST([EXTERNAL_FILTERS])
 
 ## ----------------------------------------------------------------------
 ## Is the GNU zlib present? It has a header file `zlib.h' and a library
@@ -1344,8 +1563,8 @@ AC_ARG_WITH([zlib],
                              filter [default=yes]])],,
             [withval=yes])
 
-case $withval in
-  yes)
+case "X-$withval" in
+  X-yes)
     HAVE_ZLIB="yes"
     AC_CHECK_HEADERS([zlib.h], [HAVE_ZLIB_H="yes"], [unset HAVE_ZLIB])
     if test "x$HAVE_ZLIB" = "xyes" -a "x$HAVE_ZLIB_H" = "xyes"; then
@@ -1359,9 +1578,9 @@ case $withval in
       AC_CHECK_FUNC([compress2], [HAVE_COMPRESS2="yes"])
     fi
     ;;
-  no)
+  X-|X-no|X-none)
     HAVE_ZLIB="no"
-    AC_MSG_CHECKING([for GNU zlib])
+    AC_MSG_CHECKING([for zlib])
     AC_MSG_RESULT([suppressed])
     ;;
   *)
@@ -1379,15 +1598,6 @@ case $withval in
         ;;
     esac
 
-    ## Trying to include -I/usr/include and -L/usr/lib is redundant and
-    ## can mess some compilers up.
-    if test "X$zlib_inc" = "X/usr/include"; then
-      zlib_inc=""
-    fi
-    if test "X$zlib_lib" = "X/usr/lib"; then
-      zlib_lib=""
-    fi
-
     saved_CPPFLAGS="$CPPFLAGS"
     saved_AM_CPPFLAGS="$AM_CPPFLAGS"
     saved_LDFLAGS="$LDFLAGS"
@@ -1430,7 +1640,7 @@ if test "x$HAVE_ZLIB" = "xyes" -a "x$HAVE_ZLIB_H" = "xyes" -a "x$HAVE_COMPRESS2"
   if test "X$EXTERNAL_FILTERS" != "X"; then
     EXTERNAL_FILTERS="${EXTERNAL_FILTERS},"
   fi
-  EXTERNAL_FILTERS="${EXTERNAL_FILTERS}deflate(zlib)"
+    EXTERNAL_FILTERS="${EXTERNAL_FILTERS}deflate(zlib)"
 fi
 
 
@@ -1440,6 +1650,7 @@ fi
 ## command-line switch. The value is an include path and/or a library path.
 ## If the library path is specified then it must be preceded by a comma.
 ##
+AC_SUBST([LL_PATH])
 AC_SUBST([USE_FILTER_SZIP]) USE_FILTER_SZIP="no"
 AC_ARG_WITH([szlib],
             [AS_HELP_STRING([--with-szlib=DIR],
@@ -1447,8 +1658,8 @@ AC_ARG_WITH([szlib],
                              filter [default=no]])],,
             [withval=no])
 
-case $withval in
-  yes)
+case "X-$withval" in
+  X-yes)
     HAVE_SZLIB="yes"
     AC_CHECK_HEADERS([szlib.h], [HAVE_SZLIB_H="yes"], [unset HAVE_SZLIB])
     if test "x$HAVE_SZLIB" = "xyes" -a "x$HAVE_SZLIB_H" = "xyes"; then
@@ -1458,7 +1669,7 @@ case $withval in
       AC_MSG_ERROR([couldn't find szlib library])
     fi
     ;;
-  no)
+  X-|X-no|X-none)
     HAVE_SZLIB="no"
     AC_MSG_CHECKING([for szlib])
     AC_MSG_RESULT([suppressed])
@@ -1477,38 +1688,32 @@ case $withval in
         fi
         ;;
     esac
-    
-    ## Trying to include -I/usr/include and -L/usr/lib is redundant and
-    ## can mess some compilers up.
-    if test "X$szlib_inc" = "X/usr/include"; then
-      szlib_inc=""
-    fi 
-    if test "X$szlib_lib" = "X/usr/lib"; then
-      szlib_lib=""
-    fi
-    
+
     saved_CPPFLAGS="$CPPFLAGS"
     saved_AM_CPPFLAGS="$AM_CPPFLAGS"
     saved_LDFLAGS="$LDFLAGS"
     saved_AM_LDFLAGS="$AM_LDFLAGS"
-    
+
     if test -n "$szlib_inc"; then
       CPPFLAGS="$CPPFLAGS -I$szlib_inc"
       AM_CPPFLAGS="$AM_CPPFLAGS -I$szlib_inc"
     fi
-    
-    AC_CHECK_HEADERS([szlib.h],
-                     [HAVE_SZLIB_H="yes"],
-                     [CPPFLAGS="$saved_CPPFLAGS"; AM_CPPFLAGS="$saved_AM_CPPFLAGS"] [unset HAVE_SZLIB])
 
     if test -n "$szlib_lib"; then
       LDFLAGS="$LDFLAGS -L$szlib_lib"
       AM_LDFLAGS="$AM_LDFLAGS -L$szlib_lib"
     fi
-    
-    if test "x$HAVE_SZLIB" = "xyes" -a "x$HAVE_SZLIB_H" = "xyes"; then
+
+    if test "x$HAVE_SZLIB" = "xyes"; then
       AC_CHECK_LIB([sz], [SZ_BufftoBuffCompress],,
-                   [LDFLAGS="$saved_LDFLAGS"; AM_LDFLAGS="$saved_AM_LDFLAGS"; unset HAVE_SZLIB])
+                   [CPPFLAGS="$saved_CPPFLAGS"; AM_CPPFLAGS="$saved_AM_CPPFLAGS"; LDFLAGS="$saved_LDFLAGS"; AM_LDFLAGS="$saved_AM_LDFLAGS"; unset HAVE_SZLIB])
+      if test -n "$HAVE_SZLIB"; then
+        AC_CHECK_HEADERS([szlib.h],
+                         [HAVE_SZLIB_H="yes"],
+                         [CPPFLAGS="$saved_CPPFLAGS"; AM_CPPFLAGS="$saved_AM_CPPFLAGS"] [unset HAVE_SZLIB])
+      else
+        AC_MSG_RESULT([Using SZ_BufftoBuffCompress from libsz in $szlib_lib failed.  Szip not enabled.])
+      fi
     fi
 
     if test -z "$HAVE_SZLIB" -a -n "$HDF5_CONFIG_ABORT"; then
@@ -1522,7 +1727,7 @@ if test "x$HAVE_SZLIB" = "xyes" -a "x$HAVE_SZLIB_H" = "xyes"; then
   AC_MSG_CHECKING([for szlib encoder])
 
   ## Set LD_LIBRARY_PATH so encoder test can find the library and run.
-  ## Also add LL_PATH substitution to Makefiles so they can use the 
+  ## Also add LL_PATH substitution to Makefiles so they can use the
   ## path as well, for testing examples.
   if test -z "$LD_LIBRARY_PATH"; then
     export LD_LIBRARY_PATH="$szlib_lib"
@@ -1530,45 +1735,42 @@ if test "x$HAVE_SZLIB" = "xyes" -a "x$HAVE_SZLIB_H" = "xyes"; then
     export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$szlib_lib"
   fi
 
-  AC_SUBST([LL_PATH]) LL_PATH="$LD_LIBRARY_PATH"
+  LL_PATH="$LD_LIBRARY_PATH"
 
   AC_CACHE_VAL([hdf5_cv_szlib_can_encode],
-        [AC_TRY_RUN([
-        #include <szlib.h>
-        
-        int main(void)
-        {       
+        [AC_RUN_IFELSE(
+            [AC_LANG_PROGRAM([
+                #include "szlib.h"
+            ],[[
                 /* SZ_encoder_enabled returns 1 if encoder is present */
-            if(SZ_encoder_enabled() == 1)
-                exit(0);
-            else
-                exit(1);
-        }
-        ], [hdf5_cv_szlib_can_encode=yes], [hdf5_cv_szlib_can_encode=no],)])
-    
-  AC_DEFINE([HAVE_FILTER_SZIP], [1], 
+                return SZ_encoder_enabled() != 1;
+            ]])]
+        , [hdf5_cv_szlib_can_encode=yes], [hdf5_cv_szlib_can_encode=no],)]
+   )
+
+  AC_DEFINE([HAVE_FILTER_SZIP], [1],
             [Define if support for szip filter is enabled])
   USE_FILTER_SZIP="yes"
 
   if test ${hdf5_cv_szlib_can_encode} = "yes"; then
     AC_MSG_RESULT([yes])
-  fi 
+  fi
   if test ${hdf5_cv_szlib_can_encode} = "no"; then
     AC_MSG_RESULT([no])
-  fi 
-    
+  fi
+
   ## Add "szip" to external filter list
   if test ${hdf5_cv_szlib_can_encode} = "yes"; then
     if test "X$EXTERNAL_FILTERS" != "X"; then
       EXTERNAL_FILTERS="${EXTERNAL_FILTERS},"
     fi
-    EXTERNAL_FILTERS="${EXTERNAL_FILTERS}szip(encoder)"
-  fi 
+      EXTERNAL_FILTERS="${EXTERNAL_FILTERS}szip(encoder)"
+  fi
   if test ${hdf5_cv_szlib_can_encode} = "no"; then
     if test "X$EXTERNAL_FILTERS" != "X"; then
       EXTERNAL_FILTERS="${EXTERNAL_FILTERS},"
     fi
-    EXTERNAL_FILTERS="${EXTERNAL_FILTERS}szip(no encoder)"
+      EXTERNAL_FILTERS="${EXTERNAL_FILTERS}szip(no encoder)"
   fi
 fi
 
@@ -1581,18 +1783,33 @@ AC_CACHE_SAVE
 ## Enable thread-safe version of library.  It requires Pthreads support
 ## on POSIX systems.
 ##
+AC_SUBST([THREADSAFE])
+
+## Default is no thread-safety
+THREADSAFE=no
+
 AC_MSG_CHECKING([for thread safe support])
 AC_ARG_ENABLE([threadsafe],
               [AS_HELP_STRING([--enable-threadsafe],
-                              [Enable thread-safe capability. This will disable the high-level library.
-                              You can override this behavior by specifying --enable-hl and --enable-unsupported.
+                              [Enable thread-safe capability. Not compatible with the high-level library, Fortran, or C++ wrappers.
                               [default=no]])],
               [THREADSAFE=$enableval])
 
-## NOTE: The high-level, C++, and Fortran interfaces are not compatible
+## The high-level, C++, Fortran and Java interfaces are not compatible
 ## with the thread-safety option because the lock is not hoisted
 ## into the higher-level API calls.
 
+## --enable-threadsafe is incompatible with --enable-hl unless
+## --enable-unsupported has been specified on the configure line.
+##
+## Note that the high-level library is enabled by default so most
+## users will have to add --disable-hl to the configure options.
+if test "X${ALLOW_UNSUPPORTED}" != "Xyes"; then
+  if test "X${HDF5_HL}" = "Xyes" -a "X${enable_threadsafe}" = "Xyes"; then
+    AC_MSG_ERROR([The thread-safe library is incompatible with the high-level library. --disable-hl can be used to prevent building the high-level library (recommended). Alternatively, --enable-unsupported will allow building the high-level library, though this configuration is not supported by The HDF Group.])
+  fi
+fi
+
 ## The --enable-threadsafe flag is not compatible with --enable-cxx.
 ## If the user tried to specify both flags, throw an error, unless
 ## they also provided the --enable-unsupported flag.
@@ -1610,13 +1827,21 @@ if test "X${ALLOW_UNSUPPORTED}" != "Xyes"; then
   fi
 fi
 
+## --enable-threadsafe is also incompatible with --enable-java unless
+## --enable-unsupported has been specified on the configure line.
+if test "X${ALLOW_UNSUPPORTED}" != "Xyes"; then
+  if test "X${HDF_JAVA}" = "Xyes" -a "X${enable_threadsafe}" = "Xyes"; then
+    AC_MSG_ERROR([--enable-java and --enable-threadsafe flags are incompatible. Use --enable-unsupported to override this error.])
+  fi
+fi
+
 
 case "X-$THREADSAFE" in
   X-|X-no)
     AC_MSG_RESULT([no])
     ;;
   X-yes)
-    THREADSAFE=yes 
+    THREADSAFE=yes
     AC_MSG_RESULT([yes])
     ;;
   *)
@@ -1669,15 +1894,6 @@ if test "X$THREADSAFE" = "Xyes"; then
             ;;
         esac
 
-        ## Trying to include -I/usr/include and -L/usr/lib is redundant and
-        ## can mess some compilers up.
-        if test "X$pthread_inc" = "X/usr/include"; then
-          pthread_inc=""
-        fi
-        if test "X$pthread_lib" = "X/usr/lib"; then
-          pthread_lib=""
-        fi
-
         if test -n "$pthread_inc"; then
           saved_CPPFLAGS="$CPPFLAGS"
           saved_AM_CPPFLAGS="$AM_CPPFLAGS"
@@ -1718,20 +1934,15 @@ if test "X$THREADSAFE" = "Xyes"; then
     AC_CACHE_VAL([hdf5_cv_system_scope_threads],
       [AC_RUN_IFELSE(
         [AC_LANG_PROGRAM([
-            #if STDC_HEADERS
             #include <stdlib.h>
             #include <pthread.h>
-            #endif
         ],[
-            int main(void)
-            {
               pthread_attr_t attribute;
               int ret;
 
               pthread_attr_init(&attribute);
               ret=pthread_attr_setscope(&attribute, PTHREAD_SCOPE_SYSTEM);
               exit(ret==0 ? 0 : 1);
-            }
         ])]
       , [hdf5_cv_system_scope_threads=yes], [hdf5_cv_system_scope_threads=no], [hdf5_cv_system_scope_threads=no])])
 
@@ -1747,7 +1958,7 @@ fi
 
 ## ----------------------------------------------------------------------
 ## Check for MONOTONIC_TIMER support (used in clock_gettime).  This has
-## to be done after any POSIX/BSD defines to ensure that the test gets
+## to be done after any POSIX defines to ensure that the test gets
 ## the correct POSIX level on linux.
 AC_CHECK_DECL([CLOCK_MONOTONIC],[have_clock_monotonic="yes"],[have_clock_monotonic="no"],[[#include <time.h>]])
 
@@ -1758,11 +1969,12 @@ AC_CHECK_DECL([CLOCK_MONOTONIC],[have_clock_monotonic="yes"],[have_clock_monoton
 
 ## First check if `struct tm' has a `tm_gmtoff' member.
 AC_MSG_CHECKING([for tm_gmtoff in struct tm])
-AC_TRY_COMPILE([
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
   #include <sys/time.h>
-  #include <time.h>], [struct tm tm; tm.tm_gmtoff=0;],
+  #include <time.h>
+]], [[struct tm tm; tm.tm_gmtoff=0;]])],
   [AC_DEFINE([HAVE_TM_GMTOFF], [1],
-          [Define if `tm_gmtoff' is a member of `struct tm'])
+          [Define if tm_gmtoff is a member of struct tm])
     AC_MSG_RESULT([yes])],
   [AC_MSG_RESULT([no])])
 
@@ -1774,11 +1986,11 @@ case "`uname`" in
     AC_MSG_RESULT([disabled in CYGWIN])
     ;;
   *)
-    AC_TRY_LINK([
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([[
     #include <sys/time.h>
-    #include <time.h>], [timezone=0;],
+    #include <time.h>]], [[timezone=0;]])],
     [AC_DEFINE([HAVE_TIMEZONE], [1],
-              [Define if `timezone' is a global variable])
+              [Define if timezone is a global variable])
       AC_MSG_RESULT([yes])],
     [AC_MSG_RESULT([no])])
     ;;
@@ -1786,13 +1998,13 @@ esac
 
 
 ## ----------------------------------------------------------------------
-## Does the struct stat have the st_blocks field?  This field is not Posix.
+## Does the struct stat have the st_blocks field? This field is not POSIX.
 ##
 AC_MSG_CHECKING([for st_blocks in struct stat])
-AC_TRY_COMPILE([
-  #include <sys/stat.h>],[struct stat sb; sb.st_blocks=0;],
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+  #include <sys/stat.h>]],[[struct stat sb; sb.st_blocks=0;]])],
   [AC_DEFINE([HAVE_STAT_ST_BLOCKS], [1],
-          [Define if `struct stat' has the `st_blocks' field])
+          [Define if struct stat has the st_blocks field])
     AC_MSG_RESULT([yes])],
   [AC_MSG_RESULT([no])])
 
@@ -1804,34 +2016,38 @@ case "`uname`" in
   CYGWIN*)
     ;;
   *)
-    AC_CHECK_FUNCS([GetConsoleScreenBufferInfo])
+    AC_CHECK_FUNCS([GetConsoleScreenBufferInfo getpwuid])
     ;;
 esac
 AC_CHECK_FUNCS([_scrsize ioctl])
 
 AC_MSG_CHECKING([for struct videoconfig])
-AC_TRY_COMPILE(,[struct videoconfig w; w.numtextcols=0;],
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],[[struct videoconfig w; w.numtextcols=0;]])],
   [AC_DEFINE([HAVE_STRUCT_VIDEOCONFIG], [1],
-          [Define if `struct videoconfig' is defined])
+          [Define if struct videoconfig is defined])
     AC_MSG_RESULT([yes])],
   [AC_MSG_RESULT([no])])
 
 AC_MSG_CHECKING([for struct text_info])
-AC_TRY_COMPILE(, [struct text_info w; w.screenwidth=0;],
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[struct text_info w; w.screenwidth=0;]])],
   [AC_DEFINE([HAVE_STRUCT_TEXT_INFO], [1],
-          [Define if `struct text_info' is defined])
+          [Define if struct text_info is defined])
     AC_MSG_RESULT([yes])],
   [AC_MSG_RESULT([no])])
 
 AC_MSG_CHECKING([for TIOCGWINSZ])
-AC_TRY_COMPILE([#include <sys/ioctl.h>],[int w=TIOCGWINSZ;],
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#include <sys/ioctl.h>
+]],[[int w=TIOCGWINSZ;]])],
   [AC_DEFINE([HAVE_TIOCGWINSZ], [1],
           [Define if the ioctl TIOGWINSZ is defined])
     AC_MSG_RESULT([yes])],
   [AC_MSG_RESULT([no])])
 
 AC_MSG_CHECKING([for TIOCGETD])
-AC_TRY_COMPILE([#include <sys/ioctl.h>],[int w=TIOCGETD;],
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#include <sys/ioctl.h>
+]],[[int w=TIOCGETD;]])],
   [AC_DEFINE([HAVE_TIOCGETD], [1],
           [Define if the ioctl TIOCGETD is defined])
     AC_MSG_RESULT([yes])],
@@ -1844,349 +2060,513 @@ AC_TRY_COMPILE([#include <sys/ioctl.h>],[int w=TIOCGETD;],
 ## NOTE: clock_gettime may require linking to the rt or posix4 library
 ##       so we'll search for it before calling AC_CHECK_FUNCS.
 AC_SEARCH_LIBS([clock_gettime], [rt posix4])
-AC_CHECK_FUNCS([alarm clock_gettime difftime fork frexpf frexpl])
-AC_CHECK_FUNCS([gethostname getpwuid getrusage gettimeofday])
+AC_CHECK_FUNCS([alarm asprintf clock_gettime fcntl flock fork])
+AC_CHECK_FUNCS([gethostname getrusage gettimeofday])
 AC_CHECK_FUNCS([lstat rand_r random setsysinfo])
-AC_CHECK_FUNCS([signal longjmp setjmp siglongjmp sigsetjmp sigprocmask])
-AC_CHECK_FUNCS([snprintf srandom strdup symlink system])
-AC_CHECK_FUNCS([tmpfile asprintf vasprintf waitpid])
-
-## Check for vsnprintf() separately, so we can detect situations where it
-## doesn't return the correct size for formatted strings that are too large
-## for the buffer provided
-AC_CHECK_FUNCS([vsnprintf],
-
-    ## Check if vsnprintf() returns correct size for strings that don't fit
-    ## into the size allowed.  If vsnprintf() works correctly on this platform,
-    ## it should return a value of 42 for the test below
-    ##
-    ## Note that vsnprintf fails in two different ways:
-    ##         - In IRIX64, calls to vnsprintf() with a formatted string that
-    ##                 is larger than the buffer size allowed incorrectly
-    ##                 return the size of the buffer minus one.
-    ##         - In HP/UX, calls to vsnprintf() with a formatted string that
-    ##                 is larger than the buffer size allowed incorrectly
-    ##                 return (-1)
-    AC_MSG_CHECKING([if vsnprintf returns correct value])
-
-    AC_CACHE_VAL([hdf5_cv_vsnprintf_works],
-        AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-
-int test_vsnprintf(const char *fmt,...)
-{
-    va_list     ap;
-    char *s = malloc(16);
-    int ret;
-
-    va_start(ap, fmt);
-    ret=vsnprintf(s,16,"%s",ap);
-    va_end(ap);
-
-    return(ret!=42 ? 1 : 0);
-}
-
-int main(void)
-{
-    exit(test_vsnprintf("%s","A string that is longer than 16 characters"));
-}
-   ],[hdf5_cv_vsnprintf_works=yes],[hdf5_cv_vsnprintf_works=no],))
-
-       if test ${hdf5_cv_vsnprintf_works} = "yes"; then
-          AC_MSG_RESULT([yes])
-          AC_DEFINE([VSNPRINTF_WORKS], [1],
-                    [Define if vsnprintf() returns the correct value for formatted strings that don't fit into size allowed])
-       else
-          AC_MSG_RESULT([no])
-       fi
-    ,)
-
-## ----------------------------------------------------------------------
-## Check that a lone colon can be used as an argument
-## This is not true on Cray X1, which interprets a lone colon as a
-## system command.
-##
-AC_CACHE_CHECK([if lone colon can be used as an argument],
-               [hdf5_cv_lone_colon],
-               [
-  echo "int main(int argc, char * argv[]) {return 0;}" > conftest.c
-  $CC $CFLAGS conftest.c -o a.out> /dev/null 2> /dev/null
-  echo "./a.out :" > conftest.sh
-  chmod 700 conftest.sh
-
-  ./conftest.sh 2> conftest.out
-  rm -f a.out
-  TEST_OUTPUT=`cat conftest.out`
-
-  if test "X$TEST_OUTPUT" = "X"; then
-    hdf5_cv_lone_colon=yes
-  else
-    hdf5_cv_lone_colon=no
-  fi
-               ])
-
-AC_SUBST([H5_LONE_COLON]) H5_LONE_COLON="$hdf5_cv_lone_colon"
+AC_CHECK_FUNCS([siglongjmp sigsetjmp sigprocmask])
+AC_CHECK_FUNCS([srandom strcasestr strdup symlink])
+AC_CHECK_FUNCS([tmpfile vasprintf waitpid])
 
 ## ----------------------------------------------------------------------
 ## Check compiler characteristics
 ##
-AC_C_CONST
-AC_C_INLINE
-
 AC_MSG_CHECKING([for __attribute__ extension])
-AC_TRY_COMPILE(,[int __attribute__((unused)) x],
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],[[int __attribute__((unused)) x]])],
                [AC_DEFINE([HAVE_ATTRIBUTE], [1],
                          [Define if the __attribute__(()) extension is present])
                  AC_MSG_RESULT([yes])],
                [AC_MSG_RESULT([no])])
 
-AC_MSG_CHECKING([for __func__ extension])
-AC_TRY_COMPILE(,[ const char *fname = __func__; ],
-               [AC_DEFINE([HAVE_C99_FUNC], [1],
-                         [Define if the compiler understands the __func__ keyword])
-                 AC_MSG_RESULT([yes])],
-               [AC_MSG_RESULT([no])])
-AC_MSG_CHECKING([for __FUNCTION__ extension])
-AC_TRY_COMPILE(,[ const char *fname = __FUNCTION__; ],
-               [AC_DEFINE([HAVE_FUNCTION], [1],
-                         [Define if the compiler understands the __FUNCTION__ keyword])
-                 AC_MSG_RESULT([yes])],
-               [AC_MSG_RESULT([no])])
-AC_MSG_CHECKING([for C99 designated initialization support])
-AC_TRY_COMPILE(,[
-                typedef struct {
-                    int x;
-                    union {
-                        int i;
-                        double d;
-                    } u;
-                } di_struct_t;
-                di_struct_t x = {0, { .d = 0.0}}; ],
-               [AC_DEFINE([HAVE_C99_DESIGNATED_INITIALIZER], [1],
-                         [Define if the compiler understands C99 designated initialization of structs and unions])
-                 AC_MSG_RESULT([yes])],
-               [AC_MSG_RESULT([no])])
+## ----------------------------------------------------------------------
+## Remove old ways of determining debug/production build.
+## These were used in 1.8.x and earlier. We should probably keep these checks
+## around to help people migrate to 1.10.x and newer versions.
+##
+AC_ARG_ENABLE([debug],
+              [AS_HELP_STRING([--enable-debug], [OPTION CHANGE: use --enable-build-mode=debug])],
+              [AC_MSG_ERROR([--enable-debug is no longer supported, use --enable-build-mode=debug instead.])])
+
+AC_ARG_ENABLE([production],
+              [AS_HELP_STRING([--enable-production], [OPTION CHANGE: use --enable-build-mode=production])],
+              [AC_MSG_ERROR([--enable-production is no longer supported, use --enable-build-mode=production instead.])])
+
 
 ## ----------------------------------------------------------------------
-## Try to figure out how to print `long long'.  Some machines use `%lld'
-## and others use `%qd'.  There may be more!  The final `l' is a
-## default in case none of the others work.
+## Check if the compiler should include build diagnostics
 ##
-AC_MSG_CHECKING([how to print long long])
-AC_CACHE_VAL([hdf5_cv_printf_ll], [
+AC_MSG_CHECKING([enable build diagnostics])
+AC_ARG_ENABLE([diags],
+              [AS_HELP_STRING([--enable-diags=(yes|no|<custom>)],
+                              [Allow default enhanced diagnostics to the build.
+                               This is independent of the build mode and optimization
+                               level.
+                               [default=no]
+                               ])],
+              [DIAGS=$enableval])
 
-for hdf5_cv_printf_ll in l ll L q unknown; do
-   AC_TRY_RUN([
-     #include <stdio.h>
-     #include <stdlib.h>
-     #include <string.h>
+## Set default
+if test "X-$DIAGS" = X- ; then
+  DIAGS=no
+fi
 
-     int main(void)
-     {
-	char *s = malloc(128);
-	long long x = (long long)1048576 * (long long)1048576;
-	sprintf(s,"%${hdf5_cv_printf_ll}d",x);
-	exit(strcmp(s,"1099511627776"));
-     }
-   ], [break],,[continue])
-done])
+## Allow this variable to be substituted in
+## other files (src/libhdf5.settings.in, etc.)
+AC_SUBST([DIAGS])
 
-AC_MSG_RESULT([%${hdf5_cv_printf_ll}d and %${hdf5_cv_printf_ll}u])
-AC_DEFINE_UNQUOTED([PRINTF_LL_WIDTH], ["$hdf5_cv_printf_ll"], 
-                   [Width for printf() for type `long long' or `__int64', use `ll'])
+case "X-$DIAGS" in
+  X-yes)
+    H5_CFLAGS="$H5_CFLAGS $DIAGS_CFLAGS"
+    H5_CXXFLAGS="$H5_CXXFLAGS $DIAGS_CXXFLAGS"
+    H5_FCFLAGS="$H5_FCFLAGS $DIAGS_FCFLAGS"
+    AC_MSG_RESULT([yes])
+    ;;
+  X-no)
+    H5_CFLAGS="$H5_CFLAGS $NO_DIAGS_CFLAGS"
+    H5_CXXFLAGS="$H5_CXXFLAGS $NO_DIAGS_CXXFLAGS"
+    H5_FCFLAGS="$H5_FCFLAGS $NO_DIAGS_FCFLAGS"
+    AC_MSG_RESULT([no])
+    ;;
+  *)
+    H5_CFLAGS="$H5_CFLAGS $DIAGS"
+    H5_CXXFLAGS="$H5_CXXFLAGS $DIAGS"
+    H5_FCFLAGS="$H5_FCFLAGS $DIAGS"
+    DIAGS="custom ($DIAGS)"
+    AC_MSG_RESULT([$DIAGS])
+    ;;
+esac
 
 
 ## ----------------------------------------------------------------------
-## Turn on debugging by setting compiler flags
-## This must come after the enable-production since it depends on production.
+## Check if the compiler should include symbols
 ##
-AC_MSG_CHECKING([for debug flags])
-AC_ARG_ENABLE([debug],
-              [AS_HELP_STRING([--enable-debug=all],
-                              [Turn on debugging in all packages. One may
-                               also specify a comma-separated list of
-                               package names without the leading H5 or
-                               the word no. The default is most packages
-			       if production is disabled; no if it is enabled.
+AC_MSG_CHECKING([enable debugging symbols])
+AC_ARG_ENABLE([symbols],
+              [AS_HELP_STRING([--enable-symbols=(yes|no|<custom>)],
+                              [Add debug symbols to the library (e.g.: build with -g).
+                               This is independent of the build mode and optimization
+                               level. The custom string allows special settings like
+                               -ggdb, etc. to be used.
+                               [default=yes if debug build, otherwise no]
                                ])],
-              [DEBUG_PKG=$enableval])
+              [SYMBOLS=$enableval])
 
-## Default to no if producton is enabled
-if test "X-$DEBUG_PKG" = X- ; then
-    if test "$enable_production" = yes ; then
-	DEBUG_PKG=no
-    else
-	DEBUG_PKG=yes
-    fi
+## Set default
+if test "X-$SYMBOLS" = X- ; then
+  if test "X-$BUILD_MODE" = "X-debug" ; then
+    SYMBOLS=yes
+  else
+    SYMBOLS=no
+  fi
 fi
 
-AC_SUBST([DEBUG_PKG])
-all_packages="ac,b,b2,d,e,f,g,hg,hl,i,mf,mm,o,p,s,t,v,z"
-case "X-$DEBUG_PKG" in
+## Allow this variable to be substituted in
+## other files (src/libhdf5.settings.in, etc.)
+AC_SUBST([SYMBOLS])
+
+case "X-$SYMBOLS" in
   X-yes)
-    DEBUG_PKG="d,e,f,g,hg,i,mm,o,p,s,t,v,z"
-    H5_CPPFLAGS="$H5_CPPFLAGS -UNDEBUG"
-    AC_MSG_RESULT([default ($DEBUG_PKG)])
+    H5_CFLAGS="$H5_CFLAGS $SYMBOLS_CFLAGS"
+    H5_CXXFLAGS="$H5_CXXFLAGS $SYMBOLS_CXXFLAGS"
+    H5_FCFLAGS="$H5_FCFLAGS $SYMBOLS_FCFLAGS"
+    AC_MSG_RESULT([yes])
+    ;;
+  X-no)
+    H5_CFLAGS="$H5_CFLAGS $NO_SYMBOLS_CFLAGS"
+    H5_CXXFLAGS="$H5_CXXFLAGS $NO_SYMBOLS_CXXFLAGS"
+    H5_FCFLAGS="$H5_FCFLAGS $NO_SYMBOLS_FCFLAGS"
+    AC_MSG_RESULT([no])
     ;;
-  X-all)
-    DEBUG_PKG=$all_packages
+  *)
+    H5_CFLAGS="$H5_CFLAGS $SYMBOLS"
+    H5_CXXFLAGS="$H5_CXXFLAGS $SYMBOLS"
+    H5_FCFLAGS="$H5_FCFLAGS $SYMBOLS"
+    SYMBOLS="custom ($SYMBOLS)"
+    AC_MSG_RESULT([$SYMBOLS])
+    ;;
+esac
+
+## ----------------------------------------------------------------------
+## Check if the assert macro should be enabled
+##
+AC_MSG_CHECKING([enable asserts])
+AC_ARG_ENABLE([asserts],
+              [AS_HELP_STRING([--enable-asserts],
+                              [Determines whether NDEBUG is defined or not, which
+                               controls assertions.
+                               This is independent of the build mode and presence
+                               of debugging symbols.
+                               [default=yes if debug build, otherwise no]
+                               ])],
+              [ASSERTS=$enableval])
+
+## Set default
+if test "X-$ASSERTS" = X- ; then
+  if test "X-$BUILD_MODE" = "X-debug" ; then
+    ASSERTS=yes
+  else
+    ASSERTS=no
+  fi
+fi
+
+## Allow this variable to be substituted in
+## other files (src/libhdf5.settings.in, etc.)
+AC_SUBST([ASSERTS])
+
+case "X-$ASSERTS" in
+  X-yes)
     H5_CPPFLAGS="$H5_CPPFLAGS -UNDEBUG"
-    AC_MSG_RESULT([all ($DEBUG_PKG)])
+    AC_MSG_RESULT([yes])
     ;;
-  X-no|X-none)
-    AC_MSG_RESULT([none])
-    DEBUG_PKG=
+  X-no)
     H5_CPPFLAGS="$H5_CPPFLAGS -DNDEBUG"
+    AC_MSG_RESULT([no])
     ;;
   *)
-    AC_MSG_RESULT([$DEBUG_PKG])
+    AC_MSG_ERROR([Unrecognized value: $ASSERTS])
     ;;
 esac
 
-if test -n "$DEBUG_PKG"; then
-  for pkg in `echo $DEBUG_PKG | ${TR} ${as_cr_letters}"," ${as_cr_LETTERS}" "`; do
-    H5_CPPFLAGS="$H5_CPPFLAGS -DH5${pkg}_DEBUG"
-  done
-fi
+## Incorporate the potentially warning-to-error promoting flags after
+## feature tests.  Some of the tests (e.g., `off_t`) generate compilation
+## errors with the flags we chose for the HDF5 library and tools.
+##
+H5_CFLAGS="$H5_CFLAGS $H5_ECFLAGS"
+H5_CXXFLAGS="$H5_CXXFLAGS $H5_ECXXFLAGS"
 
 ## ----------------------------------------------------------------------
-## Check if they would like the function stack support compiled in
+## Check if developer warnings should be turned on
+## These are warnings that provide suggestions like gcc's -Wsuggest-attribute.
+## They do not indicate code problems.
 ##
-AC_MSG_CHECKING([whether function stack tracking is enabled])
-AC_ARG_ENABLE([codestack],
-              [AS_HELP_STRING([--enable-codestack],
-                              [Enable the function stack tracing (for developer debugging).])],
-              [CODESTACK=$enableval])
+## Note that developers don't need to build with these regularly. They
+## are just handy to check once in a while (before releases, etc.).
+##
+AC_MSG_CHECKING([enable developer warnings])
+AC_ARG_ENABLE([developer-warnings],
+              [AS_HELP_STRING([--enable-developer-warnings],
+                              [Determines whether developer warnings will be
+                               emitted. These are usually performance suggestions
+                               (e.g. -Wsuggest-attribute) and do not flag poor code
+                               quality.
+                               [default=no]
+                               ])],
+              [DEV_WARNINGS=$enableval])
 
-case "X-$CODESTACK" in
+## Set default
+if test "X-$DEV_WARNINGS" = X- ; then
+  DEV_WARNINGS=no
+fi
+
+case "X-$DEV_WARNINGS" in
   X-yes)
-      CODESTACK=yes
-      AC_MSG_RESULT([yes])
-      AC_DEFINE([HAVE_CODESTACK], [1],
-                [Define if the function stack tracing code is to be compiled in])
+    H5_CFLAGS="$H5_CFLAGS $DEVELOPER_WARNING_CFLAGS"
+    H5_FCFLAGS="$H5_FCFLAGS $DEVELOPER_WARNING_FCFLAGS"
+    AC_MSG_RESULT([yes])
+    ;;
+  X-no)
+    H5_CFLAGS="$H5_CFLAGS $NO_DEVELOPER_WARNING_CFLAGS"
+    H5_FCFLAGS="$H5_FCFLAGS $NO_DEVELOPER_WARNING_FCFLAGS"
+    AC_MSG_RESULT([no])
     ;;
   *)
-      CODESTACK=no
-      AC_MSG_RESULT([no])
+    AC_MSG_ERROR([Unrecognized value: $DEV_WARNINGS])
     ;;
 esac
 
 ## ----------------------------------------------------------------------
-## Check if they would like the metadata trace file code compiled in
+## Check if the compiler should use profiling flags/settings
 ##
-AC_MSG_CHECKING([whether metadata trace file code is enabled])
-AC_ARG_ENABLE([metadata-trace-file],
-              [AS_HELP_STRING([--enable-metadata-trace-file],
-                              [Enable metadata trace file collection.])],
-              [METADATATRACEFILE=$enableval])
+AC_MSG_CHECKING([profiling])
+AC_ARG_ENABLE([profiling],
+              [AS_HELP_STRING([--enable-profiling=(yes|no|<custom>)],
+                              [Enable profiling flags (e.g.: -pg).
+                               This can be set independently from the build mode.
+                               The custom setting can be used to pass alternative
+                               profiling flags (e.g.: -P for using Prof with gcc).
+                               [default=no]
+                               ])],
+              [PROFILING=$enableval])
+
+## Default is no profiling
+if test "X-$PROFILING" = X- ; then
+    PROFILING=no
+fi
+
+## Allow this variable to be substituted in
+## other files (src/libhdf5.settings.in, etc.)
+AC_SUBST([PROFILING])
 
-case "X-$METADATATRACEFILE" in
+case "X-$PROFILING" in
   X-yes)
-      METADATATRACEFILE=yes
-      AC_MSG_RESULT([yes])
-      AC_DEFINE([METADATA_TRACE_FILE], [1],
-                [Define if the metadata trace file code is to be compiled in])
+    H5_CFLAGS="$H5_CFLAGS $PROFILE_CFLAGS"
+    H5_CXXFLAGS="$H5_CXXFLAGS $PROFILE_CXXFLAGS"
+    H5_FCFLAGS="$H5_FCFLAGS $PROFILE_FCFLAGS"
+    AC_MSG_RESULT([yes])
+    ;;
+  X-no)
+    AC_MSG_RESULT([no])
     ;;
   *)
-      METADATATRACEFILE=no
-      AC_MSG_RESULT([no])
+    H5_CFLAGS="$H5_CFLAGS $PROFILING"
+    H5_CXXFLAGS="$H5_CXXFLAGS $PROFILING"
+    H5_FCFLAGS="$H5_FCFLAGS $PROFILING"
+    PROFILING="custom ($PROFILING)"
+    AC_MSG_RESULT([$PROFILING])
     ;;
 esac
 
 ## ----------------------------------------------------------------------
-## Enable tracing of the API
-## This must come after the enable-debug since it depends on debug.
+## Check if the compiler should use a particular optimization setting
 ##
-AC_SUBST([TRACE_API])
-AC_MSG_CHECKING([for API tracing]);
-AC_ARG_ENABLE([trace],
-              [AS_HELP_STRING([--enable-trace],
-                              [Enable API tracing capability. Default=no
-                               if debug is disabled.])],
-              [TRACE=$enableval])
-
-## Default to no if debug is disabled
-if test "X-$TRACE" = X- ; then
-  if test -z "$DEBUG_PKG" ; then
-    TRACE=no
-  else
-    TRACE=yes
-  fi
+AC_MSG_CHECKING([optimization level])
+AC_ARG_ENABLE([optimization],
+              [AS_HELP_STRING([--enable-optimization=(high|debug|none|<custom>)],
+                              [Enable optimization flags/settings (e.g.: -O3).
+                               This can be set independently from the build mode.
+                               Optimizations for a given compiler can be specified
+                               at several levels: High, with aggressive optimizations
+                               turned on; debug, with optimizations that are
+                               unlikely to interfere with debugging or profiling;
+                               and none, with no optimizations at all.
+                               See the compiler-specific config/*-flags file for more
+                               details.
+                               Alternatively, optimization options can
+                               be specified directly by specifying them as a
+                               string value. These custom optimzation flags will
+                               completely replace all other optimization flags.
+                               [default depends on build mode: debug=debug,
+                                production=high, clean=none]
+                               ])],
+              [OPTIMIZATION=$enableval])
+
+## Set the default optimization level. This depends on the compiler mode.
+if test "X-$OPTIMIZATION" = X- ; then
+  case "X-$BUILD_MODE" in
+  X-debug)
+    OPTIMIZATION=debug
+    ;;
+  X-production)
+    OPTIMIZATION=high
+    ;;
+  X-clean)
+    OPTIMIZATION=none
+    ;;
+  esac
+fi
+
+## Allow this variable to be substituted in
+## other files (src/libhdf5.settings.in, etc.)
+AC_SUBST([OPTIMIZATION])
+
+case "X-$OPTIMIZATION" in
+  X-high)
+    H5_CFLAGS="$H5_CFLAGS $HIGH_OPT_CFLAGS"
+    H5_CXXFLAGS="$H5_CXXFLAGS $HIGH_OPT_CXXFLAGS"
+    H5_FCFLAGS="$H5_FCFLAGS $HIGH_OPT_FCFLAGS"
+    AC_MSG_RESULT([high])
+    ;;
+  X-debug)
+    H5_CFLAGS="$H5_CFLAGS $DEBUG_OPT_CFLAGS"
+    H5_CXXFLAGS="$H5_CXXFLAGS $DEBUG_OPT_CXXFLAGS"
+    H5_FCFLAGS="$H5_FCFLAGS $DEBUG_OPT_FCFLAGS"
+    AC_MSG_RESULT([debug])
+    ;;
+  X-none)
+    H5_CFLAGS="$H5_CFLAGS $NO_OPT_CFLAGS"
+    H5_CXXFLAGS="$H5_CXXFLAGS $NO_OPT_CXXFLAGS"
+    H5_FCFLAGS="$H5_FCFLAGS $NO_OPT_FCFLAGS"
+    AC_MSG_RESULT([none])
+    ;;
+  *)
+    H5_CFLAGS="$H5_CFLAGS $OPTIMIZATION"
+    H5_CXXFLAGS="$H5_CXXFLAGS $OPTIMIZATION"
+    H5_FCFLAGS="$H5_FCFLAGS $OPTIMIZATION"
+    OPTIMIZATION="custom ($OPTIMIZATION)"
+    AC_MSG_RESULT([$OPTIMIZATION])
+    ;;
+esac
+
+## ----------------------------------------------------------------------
+## Check if file locking should be used
+##
+AC_MSG_CHECKING([enable file locking])
+AC_ARG_ENABLE([file-locking],
+              [AS_HELP_STRING([--enable-file-locking=(yes|no|best-effort)],
+                              [Sets the default for whether or not to use file
+                               locking when opening files. Can be overridden
+                               with the HDF5_USE_FILE_LOCKING environment variable
+                               and the H5Pset_file_locking() API call.
+                               best-effort attempts to use file locking but does
+                               not fail when file locks have been disabled on
+                               the file system (useful with Lustre).
+                               [default=best-effort]
+                               ])],
+              [DESIRED_FILE_LOCKING=$enableval])
+
+## Set defaults
+if test "X-$DESIRED_FILE_LOCKING" = X- ; then
+  DESIRED_FILE_LOCKING=best-effort
 fi
 
-case "X-$TRACE" in
+## Allow this variable to be substituted in
+## other files (src/libhdf5.settings.in, etc.)
+AC_SUBST([DESIRED_FILE_LOCKING])
+AC_SUBST([USE_FILE_LOCKING])
+AC_SUBST([IGNORE_DISABLED_FILE_LOCKS])
+
+case "X-$DESIRED_FILE_LOCKING" in
+  X-best-effort)
+      AC_MSG_RESULT([best-effort])
+      AC_DEFINE([USE_FILE_LOCKING], [1],
+                [Define if the library will use file locking])
+      AC_DEFINE([IGNORE_DISABLED_FILE_LOCKS], [1],
+                [Define if the library will ignore file locks when disabled])
+    ;;
   X-yes)
-    AC_MSG_RESULT([yes])
-    TRACE_API=yes
-    H5_CPPFLAGS="$H5_CPPFLAGS -DH5_DEBUG_API"
+      AC_MSG_RESULT([yes])
+      AC_DEFINE([USE_FILE_LOCKING], [1],
+                [Define if the library will use file locking])
     ;;
-  X-no|*)
-    AC_MSG_RESULT([no])
-    TRACE_API=no
-    H5_CPPFLAGS="$H5_CPPFLAGS -UH5_DEBUG_API"
+  X-no)
+      AC_MSG_RESULT([no])
+    ;;
+  *)
+      AC_MSG_ERROR([Unrecognized value: $USE_FILE_LOCKING])
     ;;
 esac
 
+
 ## ----------------------------------------------------------------------
-## Enable instrumenting of the library's internal operations
-## This must come after the enable-debug since it depends on debug.
+## Enable/disable internal package-level debugging output
 ##
-AC_SUBST([INSTRUMENT_LIBRARY])
-AC_MSG_CHECKING([for instrumented library]);
-AC_ARG_ENABLE([instrument],
-              [AS_HELP_STRING([--enable-instrument],
-                              [Enable library instrumentation of optimization
-                                tracing.  Default=no if debug is disabled.])],
-              [INSTRUMENT=$enableval])
+AC_MSG_CHECKING([for internal debug output])
+AC_ARG_ENABLE([internal-debug],
+              [AS_HELP_STRING([--enable-internal-debug=(yes|all|no|none|<pkg list>)],
+                              [Enable extra debugging output on HDF5 library
+                               errors. One may also specify a comma-separated
+                               list of package names without the leading H5.
+                               This is independent of the build mode
+                               and is mainly of interest to HDF Group developers.
+                               Yes/all and no/none are synonymous.
+                               [default=all if debug build, otherwise none]
+                               ])],
+              [INTERNAL_DEBUG_OUTPUT=$enableval])
 
-## Default to no if debug is disabled
-if test "X-$INSTRUMENT" = X- ; then
-  if test -z "$DEBUG_PKG" ; then
-    INSTRUMENT=no
+## Set default
+if test "X-$INTERNAL_DEBUG_OUTPUT" = X- ; then
+  if test "X-$BUILD_MODE" = "X-debug" ; then
+    INTERNAL_DEBUG_OUTPUT=all
   else
-    INSTRUMENT=yes
+    INTERNAL_DEBUG_OUTPUT=none
   fi
 fi
 
-case "X-$INSTRUMENT" in
-  X-yes)
-    AC_MSG_RESULT([yes])
-    INSTRUMENT_LIBRARY=yes
-    AC_DEFINE([HAVE_INSTRUMENTED_LIBRARY], [1],
-              [Define if library will contain instrumentation to detect correct optimization operation])
+AC_SUBST([INTERNAL_DEBUG_OUTPUT])
+
+## These are all the packages that use H5*_DEBUG.
+## There is no harm in specifying a package not in this list;
+## you'll just get an unused H5<pkg>_DEBUG symbol.
+##
+## Some packages that define debug checks or output are
+## too specialized or have huge performance hits. These
+## are not listed in the "all" packages list.
+##
+## all_packages="AC,B,B2,D,F,FA,FL,FS,HL,I,O,S,T,Z"
+all_packages="AC,B2,CX,D,F,HL,I,O,S,T,Z"
+
+case "X-$INTERNAL_DEBUG_OUTPUT" in
+  X-yes|X-all)
+    INTERNAL_DEBUG_OUTPUT=$all_packages
+    DEBUG_PKG_LIST=$all_packages
     ;;
-  X-no|*)
-    AC_MSG_RESULT([no])
-    INSTRUMENT_LIBRARY=no
+  X-no|X-none)
+    INTERNAL_DEBUG_OUTPUT=none
+    DEBUG_PKG_LIST=
+    ;;
+  *)
+    DEBUG_PKG_LIST=$INTERNAL_DEBUG_OUTPUT
     ;;
 esac
+AC_MSG_RESULT([$INTERNAL_DEBUG_OUTPUT])
+
+## Define H5*_DEBUG symbols that control package output
+## NOTE: No sanity checking done here!
+if test -n "$DEBUG_PKG_LIST"; then
+  for pkg in `echo $DEBUG_PKG_LIST | ${TR} ${as_cr_letters}"," ${as_cr_LETTERS}" "`; do
+    H5_CPPFLAGS="$H5_CPPFLAGS -DH5${pkg}_DEBUG"
+  done
+fi
 
 ## ----------------------------------------------------------------------
-## Check if they would like to securely clear file buffers before they are
-##     written.
+## Check if they would like the function stack support compiled in
 ##
-AC_SUBST([CLEARFILEBUF])
-AC_MSG_CHECKING([whether to clear file buffers])
-AC_ARG_ENABLE([clear-file-buffers],
-              [AS_HELP_STRING([--enable-clear-file-buffers],
-                              [Securely clear file buffers before writing
-                              to file.  Default=yes.])],
-              [CLEARFILEBUF=$enableval])
+AC_MSG_CHECKING([whether function stack tracking is enabled])
+AC_ARG_ENABLE([codestack],
+              [AS_HELP_STRING([--enable-codestack],
+                              [Enable the function stack tracing (for developer debugging).
+                               [default=no]
+                              ])],
+              [CODESTACK=$enableval])
 
-case "X-$CLEARFILEBUF" in
-  *)
-      CLEARFILEBUF=yes
+## Set the default level.
+if test "X-$CODESTACK" = X- ; then
+  CODESTACK=no
+fi
+
+## Allow this variable to be substituted in
+## other files (src/libhdf5.settings.in, etc.)
+AC_SUBST([CODESTACK])
+
+case "X-$CODESTACK" in
+  X-yes)
       AC_MSG_RESULT([yes])
-      AC_DEFINE([CLEAR_MEMORY], [1],
-                [Define if the memory buffers being written to disk should be
-                cleared before writing.])
+      AC_DEFINE([HAVE_CODESTACK], [1],
+                [Define if the function stack tracing code is to be compiled in])
     ;;
   X-no)
-      CLEARFILEBUF=no
       AC_MSG_RESULT([no])
     ;;
+  *)
+      AC_MSG_ERROR([Unrecognized value: $CODESTACK])
+    ;;
+esac
+
+## ----------------------------------------------------------------------
+## Enable tracing of the API
+##
+AC_MSG_CHECKING([for API tracing]);
+AC_ARG_ENABLE([trace],
+              [AS_HELP_STRING([--enable-trace],
+                              [Enable HDF5 API tracing capability.
+                               [default=yes if debug build, otherwise no]
+                               ])],
+              [TRACE_API=$enableval])
+
+## Set the default level.
+if test "X-$TRACE_API" = X- ; then
+  if test "X-$BUILD_MODE" = "X-debug" ; then
+    TRACE_API=yes
+  else
+    TRACE_API=no
+  fi
+fi
+
+## Allow this variable to be substituted in
+## other files (src/libhdf5.settings.in, etc.)
+AC_SUBST([TRACE_API])
+
+case "X-$TRACE_API" in
+  X-yes)
+    AC_MSG_RESULT([yes])
+    H5_CPPFLAGS="$H5_CPPFLAGS -DH5_DEBUG_API"
+    ;;
+  X-no)
+    AC_MSG_RESULT([no])
+    H5_CPPFLAGS="$H5_CPPFLAGS -UH5_DEBUG_API"
+    ;;
+  *)
+    AC_MSG_ERROR([Unrecognized value: $TRACE_API])
+    ;;
 esac
 
 ## ----------------------------------------------------------------------
@@ -2195,31 +2575,41 @@ esac
 ##     more scrupulous with it's memory operations.  Enabling this also
 ##     disables the library's free space manager code.
 ##
-AC_SUBST([USINGMEMCHECKER])
 AC_MSG_CHECKING([whether a memory checking tool will be used])
 AC_ARG_ENABLE([using-memchecker],
               [AS_HELP_STRING([--enable-using-memchecker],
                               [Enable this option if a memory allocation and/or
                               bounds checking tool will be used on the HDF5
                               library.  Enabling this causes the library to be
-                              more picky about it's memory operations and also
+                              more picky about its memory operations and also
                               disables the library's free space manager code.
-                              Default=no.])],
+                              [default=no]
+                              ])],
               [USINGMEMCHECKER=$enableval])
 
+## Allow this variable to be substituted in
+## other files (src/libhdf5.settings.in, etc.)
+AC_SUBST([USINGMEMCHECKER])
+
+## Set the default level.
+if test "X-$USINGMEMCHECKER" = X- ; then
+  USINGMEMCHECKER=no
+fi
+
 case "X-$USINGMEMCHECKER" in
   X-yes)
-      USINGMEMCHECKER=yes
-      AC_MSG_RESULT([yes])
       AC_DEFINE([USING_MEMCHECKER], [1],
                 [Define if a memory checking tool will be used on the library,
                 to cause library to be very picky about memory operations and
                 also disable the internal free list manager code.])
+      AC_MSG_RESULT([yes])
     ;;
-  *)
-      USINGMEMCHECKER=no
+  X-no)
       AC_MSG_RESULT([no])
     ;;
+  *)
+      AC_MSG_ERROR([Unrecognized value: $USINGMEMCHECKER])
+    ;;
 esac
 
 ## Checkpoint the cache
@@ -2242,11 +2632,12 @@ if test "X${ALLOW_UNSUPPORTED}" != "Xyes"; then
   fi
 fi
 
-## --enable-parallel is also incompatible with --enable-threadsafe, unless
-## --enable-unsupported has been specified on the configure line.
+## The --enable-parallel flag is not compatible with --enable-java.
+## If the user tried to specify both flags, throw an error, unless
+## they also provided the --enable-unsupported flag.
 if test "X${ALLOW_UNSUPPORTED}" != "Xyes"; then
-  if test "X${THREADSAFE}" = "Xyes" -a "X${enable_parallel}" = "Xyes"; then
-    AC_MSG_ERROR([--enable-threadsafe and --enable-parallel flags are incompatible. Use --enable-unsupported to override this error.])
+  if test "X${HDF_JAVA}" = "Xyes" -a "X${enable_parallel}" = "Xyes"; then
+    AC_MSG_ERROR([--enable-java and --enable-parallel flags are incompatible. Use --enable-unsupported to override this error.])
   fi
 fi
 
@@ -2266,11 +2657,11 @@ case "X-$enable_parallel" in
     ## Try link a simple MPI program.
     AC_MSG_CHECKING([whether a simple MPI-IO C program can be linked])
     AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <mpi.h>]],
-                   [[ MPI_Init(0, (void *)0); 
-		      MPI_File_open(0, (void *)0, 0, 0, (void *)0);]])], 
-		   [AC_MSG_RESULT([yes])],
-	  	   [AC_MSG_RESULT([no])
-		    AC_MSG_ERROR([unable to link a simple MPI-IO C program])])
+                   [[ MPI_Init(0, (void *)0);
+            MPI_File_open(0, (void *)0, 0, 0, (void *)0);]])],
+        [AC_MSG_RESULT([yes])],
+            [AC_MSG_RESULT([no])
+            AC_MSG_ERROR([unable to link a simple MPI-IO C program])])
 
     if test "X$HDF_FORTRAN" = "Xyes"; then
       PAC_PROG_FC_MPI_CHECK
@@ -2290,12 +2681,19 @@ esac
 
 ## ----------------------------------------------------------------------
 ## Print some other parallel information and do some sanity checks.
+## Needs to be done outside of the PARALLEL block since the serial
+## build also needs to have values defined.
 ##
 AC_SUBST([ADD_PARALLEL_FILES]) ADD_PARALLEL_FILES="no"
+AC_SUBST([INSTRUMENT_LIBRARY]) INSTRUMENT_LIBRARY=no
+AC_SUBST([PARALLEL_FILTERED_WRITES])
+AC_SUBST([LARGE_PARALLEL_IO])
 
 if test -n "$PARALLEL"; then
-  ## The 'testpar' directory should participate in the build
-  TESTPARALLEL=testpar
+  if test "X$HDF5_TESTS" = "Xyes"; then
+    ## The 'testpar' directory should participate in the build
+    TESTPARALLEL=testpar
+  fi
 
   ## We are building a parallel library
   AC_DEFINE([HAVE_PARALLEL], [1], [Define if we have parallel support])
@@ -2313,7 +2711,7 @@ if test -n "$PARALLEL"; then
   fi
 
   ## If RUNSERIAL or RUNPARALLEL is the word `none' then replace it with
-  ## the empty string. This means that no launch commands were requested, 
+  ## the empty string. This means that no launch commands were requested,
   ## so we will not use any launch commands.
   if test "X$RUNSERIAL" = "Xnone"; then
     RUNSERIAL=""
@@ -2326,103 +2724,375 @@ if test -n "$PARALLEL"; then
     ADD_PARALLEL_FILES="yes"
     AC_MSG_CHECKING([for MPI_Comm_c2f and MPI_Comm_f2c functions])
 
-    AC_TRY_LINK([#include <mpi.h>],
-      [MPI_Comm c_comm; MPI_Comm_c2f(c_comm)],
-      AC_DEFINE([HAVE_MPI_MULTI_LANG_Comm], [1],
-                [Define if `MPI_Comm_c2f' and `MPI_Comm_f2c' exists])
-      AC_MSG_RESULT([yes]),
-      AC_MSG_RESULT([no])
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+    #include <mpi.h>
+    ]],
+      [[MPI_Comm c_comm; MPI_Comm_c2f(c_comm)]])],
+      [AC_DEFINE([HAVE_MPI_MULTI_LANG_Comm], [1],
+                 [Define if MPI_Comm_c2f and MPI_Comm_f2c exist])
+                 AC_MSG_RESULT([yes])],
+                 [AC_MSG_RESULT([no])]
     )
 
     AC_MSG_CHECKING([for MPI_Info_c2f and MPI_Info_f2c functions])
-    AC_TRY_LINK([#include <mpi.h>],
-      [MPI_Info c_info; MPI_Info_c2f(c_info)],
-      AC_DEFINE([HAVE_MPI_MULTI_LANG_Info], [1],
-                [Define if `MPI_Info_c2f' and `MPI_Info_f2c' exists])
-      AC_MSG_RESULT([yes]),
-      AC_MSG_RESULT([no])
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <mpi.h>]],
+      [[MPI_Info c_info; MPI_Info_c2f(c_info)]])],
+      [AC_DEFINE([HAVE_MPI_MULTI_LANG_Info], [1],
+                [Define if MPI_Info_c2f and MPI_Info_f2c exist])
+                AC_MSG_RESULT([yes])],
+                [AC_MSG_RESULT([no])]
     )
   fi
 
-  ## --------------------------------------------------------------------
-  ## Do we want MPE instrumentation feature on?
+  ## ----------------------------------------------------------------------
+  ## Enable instrumenting of the library's internal operations
+  ## in parallel builds.
+  ##
+
+  ## Set default
+  if test "X-$BUILD_MODE" = "X-debug" ; then
+    INSTRUMENT_LIBRARY=yes
+  else
+    INSTRUMENT_LIBRARY=no
+  fi
+
+  AC_MSG_CHECKING([for instrumented library]);
+  AC_ARG_ENABLE([instrument],
+                [AS_HELP_STRING([--enable-instrument],
+                                [Enable library instrumentation of optimization
+                                  tracing (only used with parallel builds).
+                                  [default=yes if a parallel debug build, otherwise no]
+                                ])],
+                [INSTRUMENT_LIBRARY=$enableval])
+
+  ## Allow this variable to be substituted in
+  ## other files (src/libhdf5.settings.in, etc.)
+  AC_SUBST([INSTRUMENT_LIBRARY])
+
+  case "X-$INSTRUMENT_LIBRARY" in
+    X-yes)
+      AC_DEFINE([HAVE_INSTRUMENTED_LIBRARY], [1],
+                [Define if parallel library will contain instrumentation to detect correct optimization operation])
+      AC_MSG_RESULT([yes])
+      ;;
+    X-no)
+      AC_MSG_RESULT([no])
+      ;;
+    *)
+      AC_MSG_ERROR([Unrecognized value: $INSTRUMENT_LIBRARY])
+      ;;
+  esac
+
+  ## ----------------------------------------------------------------------
+  ## Check for the MPI functions necessary for the Parallel Compression
+  ## feature. If these are not present, issue a warning that Parallel
+  ## Compression will be disabled.
   ##
-  ## This must be done after enable-parallel is checked since it depends
-  ## on a mpich compiler.
+  AC_MSG_CHECKING([for MPI_Ibarrier/MPI_Issend/MPI_Iprobe/MPI_Irecv functions])
+
+  AC_LINK_IFELSE(
+      [AC_LANG_PROGRAM(
+          [[
+              #include <mpi.h>
+          ]],
+          [[
+              int flag;
+              MPI_Init(0, (void *) 0);
+              MPI_Ibarrier(0, (void *) 0);
+              MPI_Issend((void *) 0, 0, 0, 0, 0, 0, (void *) 0);
+              MPI_Iprobe(0, 0, 0, &flag, (void *) 0);
+              MPI_Irecv((void *) 0, 0, 0, 0, 0, 0, (void *) 0);
+          ]]
+      )],
+      [AC_MSG_RESULT([yes])
+       PARALLEL_FILTERED_WRITES=yes
+       AC_DEFINE([HAVE_PARALLEL_FILTERED_WRITES], [1], [Define if we have support for writing to filtered datasets in parallel])],
+      [AC_MSG_RESULT([no])
+       AC_MSG_WARN([A simple MPI program using the MPI_Ibarrier, MPI_Issend, MPI_Iprobe and MPI_Irecv functions could not be compiled and linked.
+                    Parallel writes of filtered data will be disabled.])
+       PARALLEL_FILTERED_WRITES=no]
+  )
+
+  ## ----------------------------------------------------------------------
+  ## Check for the MPI-3 functions necessary for the big I/O feature.
+  ## If these are not present, issue a warning that the big I/O feature
+  ## will be disabled.
   ##
-  MPE=yes
-  AC_ARG_WITH([mpe],
-              [AS_HELP_STRING([--with-mpe=DIR],
-                              [Use MPE instrumentation [default=no]])],,
+  AC_MSG_CHECKING([for MPI_Get_elements_x and MPI_Type_size_x functions])
+
+  AC_LINK_IFELSE(
+      [AC_LANG_PROGRAM(
+          [[
+              #include <mpi.h>
+          ]],
+          [[
+              MPI_Count count;
+              MPI_Init(0, (void *) 0);
+              MPI_Get_elements_x(0, 0, &count);
+              MPI_Type_size_x(0, &count);
+          ]]
+      )],
+      [AC_MSG_RESULT([yes])
+       LARGE_PARALLEL_IO=yes],
+      [AC_MSG_RESULT([no])
+       AC_MSG_WARN([A simple MPI program using the MPI_Get_elements_x and MPI_Type_size_x functions could not be compiled and linked.
+                    Reading/Writing >2GB of data in a single parallel I/O operation will be disabled.])
+       LARGE_PARALLEL_IO=no]
+  )
+
+fi
+
+## ----------------------------------------------------------------------
+
+## Build parallel tools if parallel tools, parallel, and build tools options
+## are all enabled.
+##
+AC_SUBST([PARALLEL_TOOLS])
+
+## Default is no parallel tools
+PARALLEL_TOOLS=no
+
+AC_MSG_CHECKING([parallel tools])
+AC_ARG_ENABLE([parallel-tools],
+              [AS_HELP_STRING([--enable-parallel-tools],
+                              [Enable building parallel tools.
+                              [default=no]])],
+              [PARALLEL_TOOLS=$enableval])
+
+if test "X${PARALLEL_TOOLS}" = "Xyes"; then
+  if test "X${HDF5_TOOLS}" != "Xyes"; then
+    AC_MSG_ERROR([--enable-tools is required for --enable-parallel-tools])
+  fi
+  if test "X${PARALLEL}" != "Xyes"; then
+    AC_MSG_ERROR([--enable-parallel is required for --enable-parallel-tools])
+  fi
+fi
+
+case "X-$PARALLEL_TOOLS" in
+  X-|X-no)
+    AC_MSG_RESULT([no])
+  ;;
+  X-yes)
+    AC_MSG_RESULT([yes])
+  ;;
+  *)
+  ;;
+esac
+
+if test "X${PARALLEL_TOOLS}" = "Xyes"; then
+  ## Is the mpiFileUtils library (libmfu) required and available?
+  ##
+  AC_SUBST([H5DWALK_LDFLAGS])
+  AC_SUBST([H5DWALK_LIBS])
+  AC_SUBST([H5DWALK_CPPFLAGS])
+
+  H5DWALK_LDFLAGS="${H5DWALK_LDFLAGS}"
+
+  ## Default is not present
+  HAVE_LIBMFU=no
+
+  AC_ARG_WITH([libmfu],
+              [AS_HELP_STRING([--with-libmfu=DIR],
+                              [Use the libmfu library [default=no]])],,
               [withval=no])
 
   case "X-$withval" in
+    X-yes)
+      HAVE_LIBMFU="yes"
+      AC_CHECK_HEADERS([mfu.h],, [unset HAVE_LIBMFU])
+      if test "x$HAVE_LIBMFU" = "xyes"; then
+        AC_CHECK_LIB([mfu], [mfu_init], [H5DWALK_LIBS="-lmfu"], [unset HAVE_LIBMFU])
+      fi
+      if test -z "$HAVE_LIBMFU" -a -n "$HDF5_CONFIG_ABORT"; then
+        AC_MSG_ERROR([couldn't find libmfu library])
+      fi
+      ;;
     X-|X-no|X-none)
-      AC_MSG_CHECKING([for MPE])
+      HAVE_LIBMFU="no"
+      AC_MSG_CHECKING([for libmfu library])
       AC_MSG_RESULT([suppressed])
-      unset MPE
-      ;;
-    X-yes)
-      AC_CHECK_HEADERS([mpe.h],, [unset MPE])
-      AC_CHECK_LIB([mpe], [MPE_Init_log],, [unset MPE])
       ;;
     *)
+      HAVE_LIBMFU="yes"
       case "$withval" in
         *,*)
-          mpe_inc="`echo $withval | cut -f1 -d,`"
-          mpe_lib="`echo $withval | cut -f2 -d, -s`"
+          libmfu_inc="`echo $withval |cut -f1 -d,`"
+          libmfu_lib="`echo $withval |cut -f2 -d, -s`"
           ;;
         *)
           if test -n "$withval"; then
-            mpe_inc="$withval/include"
-            mpe_lib="$withval/lib"
+            libmfu_inc="$withval/include"
+            libmfu_lib="$withval/lib64"
+            libcircle_lib="$withval/lib"
           fi
           ;;
       esac
-  
-      ## Trying to include -I/usr/include and -L/usr/lib is redundant and
-      ## can mess some compilers up.
-      if test "X$mpe_inc" = "X/usr/include"; then
-        mpe_inc=""
-      fi
-      if test "X$mpe_lib" = "X/usr/lib"; then
-        mpe_lib=""
-      fi
-  
-      if test -n "$mpe_inc"; then
-        saved_CPPFLAGS="$CPPFLAGS"
-        saved_AM_CPPFLAGS="$AM_CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS -I$mpe_inc"
-        AM_CPPFLAGS="$AM_CPPFLAGS -I$mpe_inc"
-        AC_CHECK_HEADERS([mpe.h],, [CPPFLAGS="$saved_CPPFLAGS"; AM_CPPFLAGS="$saved_AM_CPPFLAGS"; unset MPE])
-      else
-        AC_CHECK_HEADERS([mpe.h],, [unset MPE])
-      fi
-  
-      if test -n "$mpe_lib"; then
-        saved_LDFLAGS="$LDFLAGS"
-        saved_AM_LDFLAGS="$AM_LDFLAGS"
-        LDFLAGS="$LDFLAGS -L$mpe_lib"
-        AM_LDFLAGS="$AM_LDFLAGS -L$mpe_lib"
-        AC_CHECK_LIB([mpe], [MPE_Init_log],,
-                     [LDFLAGS="$saved_LDFLAGS"; AM_LDFLAGS="$saved_AM_LDFLAGS"; unset MPE])
-      else
-        AC_CHECK_LIB([mpe], [MPE_Init_log],, [unset MPE])
+
+      saved_CPPFLAGS="$CPPFLAGS"
+      saved_AM_CPPFLAGS="$AM_CPPFLAGS"
+      saved_LDFLAGS="$LDFLAGS"
+      saved_AM_LDFLAGS="$AM_LDFLAGS"
+
+  ## For these checks we need the libmfu locations added to CPPFLAGS,
+  ## AM_CPPFLAGS, LDFLAGS, and AM_LDFLAGS.  The third param should set them
+  ## back to these saved values.  If the checks pass, then normally these four
+  ## flag variables would be updated, but in this case we put the changes in
+  ## variables specific to H5DWALK since they aren't used elsewhere.
+    if test -n "$libmfu_inc"; then
+      CPPFLAGS="$CPPFLAGS -I$libmfu_inc"
+      AM_CPPFLAGS="$AM_CPPFLAGS -I$libmfu_inc"
+    fi
+
+    if test -n "$libmfu_lib"; then
+      LDFLAGS="$LDFLAGS -L$libmfu_lib -L$libcircle_lib"
+      AM_LDFLAGS="$AM_LDFLAGS -L$libmfu_lib -L$libcircle_lib"
+    fi
+
+    if test "x$HAVE_LIBMFU" = "xyes"; then
+      AC_CHECK_LIB([mfu], [mfu_init],[H5DWALK_LIBS="-lmfu"], [CPPFLAGS="$saved_CPPFLAGS"; AM_CPPFLAGS="$saved_AM_CPPFLAGS"; LDFLAGS="$saved_LDFLAGS"; AM_LDFLAGS="$saved_AM_LDFLAGS"; unset HAVE_LIBMFU])
+      if test -n "$HAVE_LIBMFU"; then
+        AC_CHECK_HEADERS([mfu.h],[H5DWALK_CPPFLAGS="-I$libmfu_inc"],[CPPFLAGS="$saved_CPPFLAGS"; AM_CPPFLAGS="$saved_AM_CPPFLAGS"; LDFLAGS="$saved_LDFLAGS"; AM_LDFLAGS="$saved_AM_LDFLAGS"; unset HAVE_LIBMFU])
       fi
-      ;;
+    fi
+
+    if test -z "$HAVE_LIBMFU" -a -n "$HDF5_CONFIG_ABORT"; then
+      AC_MSG_ERROR([couldn't find libmfu library])
+    else
+      H5DWALK_LDFLAGS="-L$libmfu_lib -L$libcircle_lib"
+    fi
+
+    if test -z  "$LD_LIBRARY_PATH"; then
+      export LD_LIBRARY_PATH="$libmfu_lib:$libcircle_lib"
+    else
+      export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$libmfu_lib:$libcircle_lib"
+    fi
+
+    LL_PATH="$LD_LIBRARY_PATH"
+    ;;
   esac
+fi
 
-  if test "X-$MPE" = "X-yes"; then
-    AC_DEFINE([HAVE_MPE], [1], [Define if we have MPE support])
-  fi
+##
+AM_CONDITIONAL([PARALLEL_TOOLS_CONDITIONAL], [test "X$HAVE_LIBMFU" = "Xyes"])
+
+## ----------------------------------------------------------------------
+## Check if the map API is enabled by --enable-map-api
+##
+AC_SUBST([MAP_API])
+
+## Default is no map API
+MAP_API=no
+
+AC_MSG_CHECKING([if the map API (H5M) is enabled])
+
+AC_ARG_ENABLE([map-api],
+              [AS_HELP_STRING([--enable-map-api],
+                              [Build the map API (H5M).
+                               This is not yet supported in the native file format
+                               and requires a VOL connector that supports it.
+                               [default=no]])],
+              [MAP_API=$enableval], [MAP_API=no])
+
+if test "X$MAP_API" = "Xyes"; then
+    AC_MSG_RESULT([yes])
+    AC_DEFINE([HAVE_MAP_API], [1],
+            [Define if the map API (H5M) should be compiled])
+else
+    AC_MSG_RESULT([no])
+fi
+
+## ----------------------------------------------------------------------
+## Check if Subfiling I/O driver is enabled by --enable-subfiling-vfd
+##
+AC_SUBST([SUBFILING_VFD])
+AC_SUBST([HAVE_MERCURY])
+
+## Default is no subfiling VFD
+SUBFILING_VFD=no
+HAVE_MERCURY="no"
+
+## Always include subfiling directory so public header files are available
+CPPFLAGS="$CPPFLAGS -I$ac_abs_confdir/src/H5FDsubfiling"
+AM_CPPFLAGS="$AM_CPPFLAGS -I$ac_abs_confdir/src/H5FDsubfiling"
+
+AC_MSG_CHECKING([if the subfiling I/O virtual file driver (VFD) is enabled])
+
+AC_ARG_ENABLE([subfiling-vfd],
+              [AS_HELP_STRING([--enable-subfiling-vfd],
+                              [Build the subfiling I/O virtual file driver (VFD). Requires --enable-parallel.
+                               [default=no]])],
+              [SUBFILING_VFD=$enableval], [SUBFILING_VFD=no])
+
+if test "X$SUBFILING_VFD" = "Xyes"; then
+    AC_MSG_RESULT([yes])
+    AC_DEFINE([HAVE_SUBFILING_VFD], [1],
+            [Define if the subfiling I/O virtual file driver (VFD) should be compiled])
+    AC_DEFINE([HAVE_IOC_VFD], [1],
+            [Define if the I/O Concentrator virtual file driver (VFD) should be compiled])
+
+    if test "X${PARALLEL}" != "Xyes"; then
+      AC_MSG_ERROR([--enable-parallel is required for --enable-subfiling-vfd])
+    fi
+
+    ## ----------------------------------------------------------------------
+    ## Check for MPI_Comm_split_type availability
+    ##
+    AC_MSG_CHECKING([for MPI_Comm_split_type function])
+
+    AC_LINK_IFELSE(
+      [AC_LANG_PROGRAM(
+          [[
+              #include <mpi.h>
+          ]],
+          [[
+              MPI_Comm intra_comm;
+              MPI_Init(0, (void *) 0);
+              MPI_Comm_split_type(MPI_COMM_WORLD, MPI_COMM_TYPE_SHARED, 0, MPI_INFO_NULL, &intra_comm);
+          ]]
+      )],
+      [AC_MSG_RESULT([yes])],
+      [AC_MSG_RESULT([no])
+       AC_MSG_ERROR([unable to link MPI program that uses MPI_Comm_split_type])
+       ]
+    )
+
+    # Set-up mercury
+    HAVE_MERCURY="yes"
+    mercury_dir="$ac_abs_confdir/src/H5FDsubfiling/mercury"
+    mercury_inc="$mercury_dir/src/util"
+
+    CPPFLAGS="$CPPFLAGS -I$mercury_inc"
+    AM_CPPFLAGS="$AM_CPPFLAGS -I$mercury_inc"
+
+    HAVE_STDATOMIC_H="yes"
+    AC_CHECK_HEADERS([stdatomic.h],,[HAVE_STDATOMIC_H="no"])
+    if test "x$HAVE_STDATOMIC_H" = "xno"; then
+      AC_MSG_ERROR([Subfiling VFD requires atomic operations support. C11 stdatomic.h NOT available.])
+    fi
+
+    # Checks for libraries.
+    AC_SEARCH_LIBS([shm_open], [rt])
+    AC_CHECK_LIB([pthread], [pthread_self],[], [echo "Error: Required library pthread not found." && exit 1])
+
+else
+    AC_MSG_RESULT([no])
 fi
 
+## Subfiling and IOC VFD files are not built if not required.
+AM_CONDITIONAL([SUBFILING_VFD_CONDITIONAL], [test "X$SUBFILING_VFD" = "Xyes"])
+# IOC VFD is currently only built when subfiling is enabled
+AM_CONDITIONAL([IOC_VFD_CONDITIONAL], [test "X$SUBFILING_VFD" = "Xyes"])
+# Mercury is currently only needed if  subfiling is enabled
+AM_CONDITIONAL([HAVE_MERCURY_CONDITIONAL], [test "X$HAVE_MERCURY" = "Xyes"])
+
+
 ## ----------------------------------------------------------------------
 ## Check if Direct I/O driver is enabled by --enable-direct-vfd
 ##
+AC_SUBST([DIRECT_VFD])
 
-## Check these regardless. If the checks are moved inside the main
-## direct VFD block, the output is nested.
+## Default is no direct VFD
+DIRECT_VFD=no
 
 AC_CACHE_VAL([hdf5_cv_direct_io],
     AC_CHECK_DECL([O_DIRECT], [hdf5_cv_direct_io=yes], [hdf5_cv_direct_io=no], [[#include <fcntl.h>]]))
@@ -2456,9 +3126,208 @@ else
     AC_MSG_RESULT([no])
 fi
 
+## Direct VFD files are not built if not required.
 AM_CONDITIONAL([DIRECT_VFD_CONDITIONAL], [test "X$DIRECT_VFD" = "Xyes"])
 
 ## ----------------------------------------------------------------------
+## Check whether the Mirror VFD can be built.
+## Auto-enabled if the required libraries are present.
+##
+AC_SUBST([MIRROR_VFD])
+
+## Default is no Mirror VFD
+MIRROR_VFD=no
+
+AC_ARG_ENABLE([mirror-vfd],
+              [AS_HELP_STRING([--enable-mirror-vfd],
+                              [Build the socket-based Mirror virtual file driver (VFD).
+                               [default=no]])],
+              [MIRROR_VFD=$enableval], [MIRROR_VFD=no])
+
+if test "X$MIRROR_VFD" = "Xyes"; then
+
+    AC_CHECK_HEADERS([arpa/inet.h],, [unset MIRROR_VFD])
+    AC_CHECK_HEADERS([netinet/in.h],, [unset MIRROR_VFD])
+    AC_CHECK_HEADERS([netdb.h],, [unset MIRROR_VFD])
+    AC_CHECK_HEADERS([sys/socket.h],, [unset MIRROR_VFD])
+    AC_CHECK_FUNC([fork], [], [unset MIRROR_VFD])
+
+    AC_MSG_CHECKING([if the Mirror virtual file driver (VFD) can be built])
+    if test "X$MIRROR_VFD" = "Xyes"; then
+        AC_DEFINE([HAVE_MIRROR_VFD], [1],
+                [Define whether the Mirror virtual file driver (VFD) will be compiled])
+        AC_MSG_RESULT([yes])
+    else
+        AC_MSG_RESULT([no])
+        MIRROR_VFD=no
+        AC_MSG_ERROR([The Mirror VFD cannot be built.
+                      Missing one or more of: arpa/inet.h, netinet/in.h,
+                      netdb.h, sys/socket.h, fork().])
+    fi
+else
+    AC_MSG_CHECKING([if the Mirror virtual file driver (VFD) is enabled])
+    AC_MSG_RESULT([no])
+    MIRROR_VFD=no
+fi
+
+## Mirror VFD files built only if able.
+AM_CONDITIONAL([MIRROR_VFD_CONDITIONAL], [test "X$MIRROR_VFD" = "Xyes"])
+
+## ----------------------------------------------------------------------
+## Check if Read-Only S3 virtual file driver is enabled by --enable-ros3-vfd
+##
+AC_SUBST([ROS3_VFD])
+
+## Default is no Read-Only S3 VFD
+ROS3_VFD=no
+
+AC_ARG_ENABLE([ros3-vfd],
+              [AS_HELP_STRING([--enable-ros3-vfd],
+                              [Build the Read-Only S3 virtual file driver (VFD).
+                               [default=no]])],
+              [ROS3_VFD=$enableval], [ROS3_VFD=no])
+
+if test "X$ROS3_VFD" = "Xyes"; then
+    AC_CHECK_HEADERS([curl/curl.h],, [unset ROS3_VFD])
+    AC_CHECK_HEADERS([openssl/evp.h],, [unset ROS3_VFD])
+    AC_CHECK_HEADERS([openssl/hmac.h],, [unset ROS3_VFD])
+    AC_CHECK_HEADERS([openssl/sha.h],, [unset ROS3_VFD])
+    if test "X$ROS3_VFD" = "Xyes"; then
+        AC_CHECK_LIB([curl], [curl_global_init],, [unset ROS3_VFD])
+        AC_CHECK_LIB([crypto], [EVP_sha256],, [unset ROS3_VFD])
+    fi
+
+    AC_MSG_CHECKING([if the Read-Only S3 virtual file driver (VFD) is enabled])
+    if test "X$ROS3_VFD" = "Xyes"; then
+        AC_DEFINE([HAVE_ROS3_VFD], [1],
+                [Define whether the Read-Only S3 virtual file driver (VFD) should be compiled])
+        AC_MSG_RESULT([yes])
+    else
+        AC_MSG_RESULT([no])
+        ROS3_VFD=no
+        AC_MSG_ERROR([The Read-Only S3 VFD was requested but cannot be built.
+                      Please check that openssl and cURL are available on your
+                      system, and/or re-configure without option
+                      --enable-ros3-vfd.])
+    fi
+else
+    AC_MSG_CHECKING([if the Read-Only S3 virtual file driver (VFD) is enabled])
+    AC_MSG_RESULT([no])
+    ROS3_VFD=no
+
+fi
+
+## Read-only S3 files are not built if not required.
+AM_CONDITIONAL([ROS3_VFD_CONDITIONAL], [test "X$ROS3_VFD" = "Xyes"])
+
+
+## ----------------------------------------------------------------------
+## Is libhdfs (Hadoop Distributed File System) present?
+## It might be specified with the `--with-libhdfs' command-line switch.
+## If found, enables the HDFS VFD.
+##
+AC_SUBST([HAVE_LIBHDFS])
+AC_ARG_WITH([libhdfs],
+            [AS_HELP_STRING([--with-libhdfs=DIR],
+                            [Provide libhdfs library to enable HDFS virtual file driver (VFD) [default=no]])],,
+            [withval=no])
+
+case $withval in
+  no)
+    HAVE_LIBHDFS="no"
+    AC_MSG_CHECKING([for libhdfs])
+    AC_MSG_RESULT([suppressed])
+    ;;
+  *)
+    HAVE_LIBHDFS="yes"
+    case "$withval" in
+      *,*)
+        libhdfs_inc="`echo $withval |cut -f1 -d,`"
+        libhdfs_lib="`echo $withval |cut -f2 -d, -s`"
+        ;;
+      yes)
+        libhdfs_inc="$HADOOP_HOME/include"
+        libhdfs_lib="$HADOOP_HOME/lib"
+        ;;
+      *)
+        if test -n "$withval"; then
+          libhdfs_inc="$withval/include"
+          libhdfs_lib="$withval/lib"
+        fi
+        ;;
+    esac
+
+    if test -n "$libhdfs_inc"; then
+      CPPFLAGS="$CPPFLAGS -I$libhdfs_inc"
+      AM_CPPFLAGS="$AM_CPPFLAGS -I$libhdfs_inc"
+    fi
+    AC_CHECK_HEADERS([hdfs.h],,
+                     [unset HAVE_LIBHDFS])
+
+    if test "x$HAVE_LIBHDFS" = "xyes"; then
+      dnl Check for '-ljvm' needed by libhdfs
+      JNI_LDFLAGS=""
+      if test $JAVA_HOME != ""
+      then
+        JNI_LDFLAGS="-L$JAVA_HOME/jre/lib/$OS_ARCH -L$JAVA_HOME/jre/lib/$OS_ARCH/server"
+      fi
+      ldflags_bak=$LDFLAGS
+      LDFLAGS="$LDFLAGS $JNI_LDFLAGS"
+      AC_CHECK_LIB([jvm], [JNI_GetCreatedJavaVMs])
+      LDFLAGS=$ldflags_bak
+      AC_SUBST([JNI_LDFLAGS])
+      if test -n "$libhdfs_lib"; then
+        ## Hadoop distribution hides libraries down one level in 'lib/native'
+        libhdfs_lib="$libhdfs_lib/native"
+        LDFLAGS="$LDFLAGS -L$libhdfs_lib $JNI_LDFLAGS"
+        AM_LDFLAGS="$AM_LDFLAGS -L$libhdfs_lib $JNI_LDFLAGS"
+      fi
+      AC_CHECK_LIB([hdfs], [hdfsConnect],,
+                   [unset HAVE_LIBHDFS])
+    fi
+
+    if test -z "$HAVE_LIBHDFS"; then
+      AC_MSG_ERROR([Set to use libhdfs library, but could not find or use
+                    libhdfs. Please verify that the path to HADOOP_HOME is
+                    valid, and/or reconfigure without --with-libhdfs.])
+    fi
+    ;;
+esac
+
+if test "x$HAVE_LIBHDFS" = "xyes"; then
+  AC_DEFINE([HAVE_LIBHDFS], [1],
+            [Proceed to build with libhdfs])
+fi
+
+## Read-only HDFS files are not built if not required.
+AM_CONDITIONAL([HDFS_VFD_CONDITIONAL], [test "X$HAVE_LIBHDFS" = "Xyes"])
+
+## Checkpoint the cache
+AC_CACHE_SAVE
+
+## ----------------------------------------------------------------------
+## Use custom examples path.
+##
+AC_MSG_CHECKING([for custom examples path definition])
+AC_ARG_WITH([examplesdir],
+            [AS_HELP_STRING([--with-examplesdir=location],
+                            [Specify path for examples
+                            [default="DATAROOTDIR/hdf5_examples"]])],,
+            withval="${datarootdir}/hdf5_examples")
+
+if test "X$withval" = "X"; then
+    AC_MSG_RESULT([default])
+    examplesdir="${datarootdir}/hdf5_examples"
+else
+    AC_MSG_RESULT([$withval])
+    examplesdir=$withval
+fi
+
+AC_SUBST([examplesdir])
+AC_DEFINE_UNQUOTED([EXAMPLESDIR], ["$examplesdir"],
+            [Define the examples directory])
+
+## ----------------------------------------------------------------------
 ## Enable custom plugin default path for library.  It requires SHARED support.
 ##
 AC_MSG_CHECKING([for custom plugin default path definition])
@@ -2483,12 +3352,12 @@ AC_DEFINE_UNQUOTED([DEFAULT_PLUGINDIR], ["$default_plugindir"],
 ## Decide whether the presence of user's exception handling functions is
 ## checked and data conversion exceptions are returned.  This is mainly
 ## for the speed optimization of hard conversions.  Soft conversions can
-## actually benefit little.  
+## actually benefit little.
 ##
 AC_MSG_CHECKING([whether exception handling functions is checked during data conversions])
 AC_ARG_ENABLE([dconv-exception],
               [AS_HELP_STRING([--enable-dconv-exception],
-                              [if exception handling functions is checked during 
+                              [if exception handling functions is checked during
                               data conversions [default=yes]])],
               [DCONV_EXCEPTION=$enableval], [DCONV_EXCEPTION=yes])
 
@@ -2502,21 +3371,21 @@ fi
 
 ## ----------------------------------------------------------------------
 ## Decide whether the data accuracy has higher priority during data
-## conversions.  If not, some hard conversions will still be prefered even
-## though the data may be wrong (for example, some compilers don't 
+## conversions.  If not, some hard conversions will still be preferred even
+## though the data may be wrong (for example, some compilers don't
 ## support denormalized floating values) to maximize speed.
-## 
+##
 AC_MSG_CHECKING([whether data accuracy is guaranteed during data conversions])
 AC_ARG_ENABLE([dconv-accuracy],
               [AS_HELP_STRING([--enable-dconv-accuracy],
-                              [if data accuracy is guaranteed during 
+                              [if data accuracy is guaranteed during
                               data conversions [default=yes]])],
               [DATA_ACCURACY=$enableval], [DATA_ACCURACY=yes])
 
 if test "$DATA_ACCURACY" = "yes"; then
   AC_MSG_RESULT([yes])
   AC_DEFINE([WANT_DATA_ACCURACY], [1],
-            [Data accuracy is prefered to speed during data conversions])
+            [Data accuracy is preferred to speed during data conversions])
 else
   AC_MSG_RESULT([no])
 fi
@@ -2542,72 +3411,27 @@ esac
 
 ## ----------------------------------------------------------------------
 ## Set the flag to indicate that the machine is using a special algorithm to convert
-## 'long double' to '(unsigned) long' values.  (This flag should only be set for 
-## the IBM Power6 Linux.  When the bit sequence of long double is 
-## 0x4351ccf385ebc8a0bfcc2a3c3d855620, the converted value of (unsigned)long 
+## 'long double' to '(unsigned) long' values.  (This flag should only be set for
+## the IBM Power6 Linux.  When the bit sequence of long double is
+## 0x4351ccf385ebc8a0bfcc2a3c3d855620, the converted value of (unsigned)long
 ## is 0x004733ce17af227f, not the same as the library's conversion to 0x004733ce17af2282.
 ## The machine's conversion gets the correct value.  We define the macro and disable
 ## this kind of test until we figure out what algorithm they use.
 ##
 AC_MSG_CHECKING([if using special algorithm to convert long double to (unsigned) long values])
 
+## NOTE: Place all configure test programs into cmake's source file, then use a preprocessor directive
+## to select the proper test program. This is done by echoing the #define and cat'ing the cmake
+## source file. (HDFFV-9467)
+
+TEST_SRC="`(echo \"#define H5_LDOUBLE_TO_LONG_SPECIAL_TEST 1\"; cat $srcdir/config/cmake/ConversionTests.c)`"
+
 if test ${ac_cv_sizeof_long_double} = 0; then
    hdf5_cv_ldouble_to_long_special=${hdf5_cv_ldouble_to_long_special=no}
 else
    AC_CACHE_VAL([hdf5_cv_ldouble_to_long_special],
         [AC_RUN_IFELSE(
-            [AC_LANG_PROGRAM([
-                #include <string.h>
-            ],[[
-                long double         ld = 20041683600089727.779961L;
-                long                ll;
-                unsigned long       ull;
-                unsigned char       s[16];
-                unsigned char       s2[8];
-                int                 ret = 1;
-                
-                if(sizeof(long double) == 16 && sizeof(long) == 8) {
-                    /*make sure the long double type has 16 bytes in size and 
-                     * 11 bits of exponent.  If it is,
-                     *the bit sequence should be like below.  It's not 
-                     *a decent way to check but this info isn't available. */   
-                    memcpy(s, &ld, 16);
-                    if(s[0]==0x43 && s[1]==0x51 && s[2]==0xcc && s[3]==0xf3 &&
-                        s[4]==0x85 && s[5]==0xeb && s[6]==0xc8 && s[7]==0xa0 &&
-                        s[8]==0xbf && s[9]==0xcc && s[10]==0x2a && s[11]==0x3c) {
-
-                        /* Assign the hexadecimal value of long double type. */
-                        s[0]=0x43; s[1]=0x51; s[2]=0xcc; s[3]=0xf3;
-                        s[4]=0x85; s[5]=0xeb; s[6]=0xc8; s[7]=0xa0;
-                        s[8]=0xbf; s[9]=0xcc; s[10]=0x2a; s[11]=0x3c;
-                        s[12]=0x3d; s[13]=0x85; s[14]=0x56; s[15]=0x20;
-
-                        memcpy(&ld, s, 16);
-
-                        ll = (long)ld;
-                        memcpy(s2, &ll, 8);
-
-                        /* The library's algorithm converts it to 0x 00 47 33 ce 17 af 22 82
-                         * and gets wrong value 20041683600089730 on the IBM Power6 Linux.
-                         * But the IBM Power6 Linux converts it to 0x00 47 33 ce 17 af 22 7f
-                         * and gets the correct value 20041683600089727.  It uses some special
-                         * algorithm.  We're going to define the macro and skip the test until
-                         * we can figure out how they do it. */
-                        if(s2[0]==0x00 && s2[1]==0x47 && s2[2]==0x33 && s2[3]==0xce &&
-                           s2[4]==0x17 && s2[5]==0xaf && s2[6]==0x22 && s2[7]==0x7f)
-                            ret = 0;
-
-                        ull = (unsigned long)ld;
-                        memcpy(s2, &ull, 8);
-
-                        /* The unsigned long is the same as signed long. */
-                        if(s2[0]==0x00 && s2[1]==0x47 && s2[2]==0x33 && s2[3]==0xce &&
-                           s2[4]==0x17 && s2[5]==0xaf && s2[6]==0x22 && s2[7]==0x7f)
-                            ret = 0;
-                    }    
-                }   
-                exit(ret);
-        ]])]
+            [AC_LANG_SOURCE([$TEST_SRC])]
     , [hdf5_cv_ldouble_to_long_special=yes], [hdf5_cv_ldouble_to_long_special=no],)])
 fi
 
@@ -2621,74 +3445,22 @@ fi
 
 ## ----------------------------------------------------------------------
 ## Set the flag to indicate that the machine is using a special algorithm
-## to convert some values of '(unsigned) long' to 'long double' values.  
-## (This flag should be off for all machines, except for IBM Power6 Linux, 
-## when the bit sequences are 003fff..., 007fff..., 00ffff..., 01ffff..., 
-## ..., 7fffff..., the compiler uses a unknown algorithm.  We define a 
+## to convert some values of '(unsigned) long' to 'long double' values.
+## (This flag should be off for all machines, except for IBM Power6 Linux,
+## when the bit sequences are 003fff..., 007fff..., 00ffff..., 01ffff...,
+## ..., 7fffff..., the compiler uses a unknown algorithm.  We define a
 ## macro and skip the test for now until we know about the algorithm.
 ##
 AC_MSG_CHECKING([if using special algorithm to convert (unsigned) long to long double values])
 
+TEST_SRC="`(echo \"#define H5_LONG_TO_LDOUBLE_SPECIAL_TEST 1\"; cat $srcdir/config/cmake/ConversionTests.c)`"
+
 if test ${ac_cv_sizeof_long_double} = 0; then
    hdf5_cv_long_to_ldouble_special=${hdf5_cv_long_to_ldouble_special=no}
 else
    AC_CACHE_VAL([hdf5_cv_long_to_ldouble_special],
         [AC_RUN_IFELSE(
-            [AC_LANG_PROGRAM([
-                #include <string.h>
-            ],[[
-                long double         ld;
-                long                ll;
-                unsigned long       ull;
-                unsigned char       s[16];
-                int                 flag=0, ret=1;
-            
-                /*Determine if long double has 16 byte in size, 11 bit exponent, and
-                 *the bias is 0x3ff */ 
-                if(sizeof(long double) == 16) { 
-                    ld = 1.0L;
-                    memcpy(s, &ld, 16);
-                    if(s[0]==0x3f && s[1]==0xf0 && s[2]==0x00 && s[3]==0x00 &&
-                        s[4]==0x00 && s[5]==0x00 && s[6]==0x00 && s[7]==0x00) 
-                        flag = 1; 
-                }
-                 
-                if(flag==1 && sizeof(long)==8) {
-                    ll = 0x003fffffffffffffL;
-                    ld = (long double)ll;
-                    memcpy(s, &ld, 16);
-                    /* The library converts the value to 0x434fffffffffffff8000000000000000.
-                     * In decimal it is 18014398509481982.000000, one value short of the original.
-                     * The IBM Power6 Linux converts it to 0x4350000000000000bff0000000000000.
-                     * The value is correct in decimal. It uses some special
-                     * algorithm.  We're going to define the macro and skip the test until
-                     * we can figure out how they do it. */
-                    if(s[0]==0x43 && s[1]==0x50 && s[2]==0x00 && s[3]==0x00 &&
-                        s[4]==0x00 && s[5]==0x00 && s[6]==0x00 && s[7]==0x00 &&
-                        s[8]==0xbf && s[9]==0xf0 && s[10]==0x00 && s[11]==0x00 &&
-                        s[12]==0x00 && s[13]==0x00 && s[14]==0x00 && s[15]==0x00)
-                        ret = 0;
-                }        
-                if(flag==1 && sizeof(unsigned long)==8) {
-                    ull = 0xffffffffffffffffUL;
-                    ld = (long double)ull;
-                    memcpy(s, &ld, 16);
-                    /* Use a different value from signed long to test. The problem is the same
-                     * for both long and unsigned long. The value is 18446744073709551615.
-                     * The library converts the value to 0x43effffffffffffffe000000000000000.
-                     * In decimal it's 18446744073709548544.000000, very different from the original.
-                     * The IBM Power6 Linux converts it to 0x43f0000000000000bff0000000000000.
-                     * The value is correct in decimal. It uses some special
-                     * algorithm.  We're going to define the macro and skip the test until
-                     * we can figure out how they do it. */
-                    if(s[0]==0x43 && s[1]==0xf0 && s[2]==0x00 && s[3]==0x00 &&
-                        s[4]==0x00 && s[5]==0x00 && s[6]==0x00 && s[7]==0x00 &&
-                        s[8]==0xbf && s[9]==0xf0 && s[10]==0x00 && s[11]==0x00 &&
-                        s[12]==0x00 && s[13]==0x00 && s[14]==0x00 && s[15]==0x00)
-                        ret = 0;
-                }        
-                exit(ret);
-        ]])]
+            [AC_LANG_SOURCE([$TEST_SRC])]
     , [hdf5_cv_long_to_ldouble_special=yes], [hdf5_cv_long_to_ldouble_special=no],)])
 fi
 
@@ -2702,59 +3474,54 @@ fi
 
 ## ----------------------------------------------------------------------
 ## Set the flag to indicate that the machine can accurately convert
-## '(unsigned) long long' to 'long double' values.  (This flag should be set for 
-## all machines, except for Mac OS 10.4, when the bit sequences are 003fff...,
-## 007fff..., 00ffff..., 01ffff..., ..., 7fffff..., the converted values are twice
-## as big as they should be. 
+## 'long double' to '(unsigned) long long' values.  (This flag should
+## be set for all machines, except for Mac OS 10.4, SGI IRIX64 6.5 and
+## Powerpc Linux using XL compilers.
+## When the bit sequence of long double is 0x4351ccf385ebc8a0bfcc2a3c...,
+## the values of (unsigned)long long start to go wrong on these
+## two machines.  Adjusting it higher to 0x4351ccf385ebc8a0dfcc... or
+## 0x4351ccf385ebc8a0ffcc... will make the converted values wildly wrong.
+## This test detects this wrong behavior and disable the test.
+##
+AC_MSG_CHECKING([if correctly converting long double to (unsigned) long long values])
+
+TEST_SRC="`(echo \"#define H5_LDOUBLE_TO_LLONG_ACCURATE_TEST 1\"; cat $srcdir/config/cmake/ConversionTests.c)`"
+
+if test ${ac_cv_sizeof_long_double} = 0; then
+   hdf5_cv_ldouble_to_llong_accurate=${hdf5_cv_ldouble_to_llong_accurate=no}
+else
+   AC_CACHE_VAL([hdf5_cv_ldouble_to_llong_accurate],
+        [AC_RUN_IFELSE([AC_LANG_SOURCE([$TEST_SRC])],
+        [hdf5_cv_ldouble_to_llong_accurate=yes], [hdf5_cv_ldouble_to_llong_accurate=no],[])])
+fi
+
+if test ${hdf5_cv_ldouble_to_llong_accurate} = "yes"; then
+  AC_DEFINE([LDOUBLE_TO_LLONG_ACCURATE], [1],
+            [Define if your system can convert long double to (unsigned) long long values correctly.])
+  AC_MSG_RESULT([yes])
+else
+  AC_MSG_RESULT([no])
+fi
+
+
+## ----------------------------------------------------------------------
+## Set the flag to indicate that the machine can accurately convert
+## '(unsigned) long long' to 'long double' values.  (This flag should be
+## set for all machines, except for Mac OS 10.4 and Powerpc Linux using
+## XL compilers.
+## When the bit sequences are 003fff..., 007fff..., 00ffff..., 01ffff...,
+## ..., 7fffff..., the converted values are twice as big as they should be.
 ##
 AC_MSG_CHECKING([if correctly converting (unsigned) long long to long double values])
 
+TEST_SRC="`(echo \"#define H5_LLONG_TO_LDOUBLE_CORRECT_TEST 1\"; cat $srcdir/config/cmake/ConversionTests.c)`"
+
 if test ${ac_cv_sizeof_long_double} = 0; then
    hdf5_cv_llong_to_ldouble_correct=${hdf5_cv_llong_to_ldouble_correct=no}
 else
    AC_CACHE_VAL([hdf5_cv_llong_to_ldouble_correct],
-        [AC_TRY_RUN([
-        int main(void)
-        {
-            long double         ld;
-            long long           ll;
-            unsigned long long  ull;
-            unsigned char       s[16];
-            int                 flag=0, ret=0;
-        
-            /*Determine if long double has 16 byte in size, 11 bit exponent, and
-             *the bias is 0x3ff */ 
-            if(sizeof(long double) == 16) { 
-                ld = 1.0L;
-                memcpy(s, &ld, 16);
-                if(s[0]==0x3f && s[1]==0xf0 && s[2]==0x00 && s[3]==0x00 &&
-                    s[4]==0x00 && s[5]==0x00 && s[6]==0x00 && s[7]==0x00) 
-                    flag = 1; 
-            }
-             
-            if(flag==1 && sizeof(long long)==8) {
-                ll = 0x01ffffffffffffffLL;
-                ld = (long double)ll;
-                memcpy(s, &ld, 16);
-                /*Check if the bit sequence is as supposed to be*/
-                if(s[0]!=0x43 || s[1]!=0x7f || s[2]!=0xff || s[3]!=0xff ||
-                    s[4]!=0xff || s[5]!=0xff || s[6]!=0xff || s[7]!=0xff ||
-                    s[8]!=0xf0 || s[9]!=0x00 || s[10]!=0x00 || s[11]!=0x00)
-                    ret = 1;
-            }        
-            if(flag==1 && sizeof(unsigned long long)==8) {
-                ull = 0x01ffffffffffffffULL;
-                ld = (long double)ull;
-                memcpy(s, &ld, 16);
-                if(s[0]!=0x43 || s[1]!=0x7f || s[2]!=0xff || s[3]!=0xff ||
-                    s[4]!=0xff || s[5]!=0xff || s[6]!=0xff || s[7]!=0xff ||
-                    s[8]!=0xf0 || s[9]!=0x00 || s[10]!=0x00 || s[11]!=0x00)
-                    ret = 1;
-            }        
-    done:
-            exit(ret);
-        }
-        ], [hdf5_cv_llong_to_ldouble_correct=yes], [hdf5_cv_llong_to_ldouble_correct=no],)])
+        [AC_RUN_IFELSE([AC_LANG_SOURCE([$TEST_SRC])],
+        [hdf5_cv_llong_to_ldouble_correct=yes], [hdf5_cv_llong_to_ldouble_correct=no],[])])
 fi
 
 if test ${hdf5_cv_llong_to_ldouble_correct} = "yes"; then
@@ -2766,17 +3533,24 @@ else
 fi
 
 ## ----------------------------------------------------------------------
-## Set the flag to indicate that the machine generates bad code
-## for the H5VM_log2_gen() routine in src/H5VMprivate.h
-## (This flag should be set to no for all machines, except for SGI IRIX64,
-## where the cache value is set to yes in it's config file)
+## Set the flag to indicate that the machine is IBM ppc64le and cannot
+## accurately convert some long double values.
 ##
-AC_MSG_CHECKING([if bad code for log2 routine is generated])
-AC_CACHE_VAL([hdf5_cv_bad_log2_code_generated], [hdf5_cv_bad_log2_code_generated=no])
+AC_MSG_CHECKING([if the system is IBM ppc64le and cannot correctly convert some long double values])
+
+TEST_SRC="`(echo \"#define H5_DISABLE_SOME_LDOUBLE_CONV_TEST 1\"; cat $srcdir/config/cmake/ConversionTests.c)`"
+
+if test ${ac_cv_sizeof_long_double} = 0; then
+   hdf5_cv_disable_some_ldouble_conv=${hdf5_cv_disable_some_ldouble_conv=no}
+else
+   AC_CACHE_VAL([hdf5_cv_disable_some_ldouble_conv],
+        [AC_RUN_IFELSE([AC_LANG_SOURCE([$TEST_SRC])],
+        [hdf5_cv_disable_some_ldouble_conv=yes], [hdf5_cv_disable_some_ldouble_conv=no],[])])
+fi
 
-if test ${hdf5_cv_bad_log2_code_generated} = "yes"; then
-  AC_DEFINE([BAD_LOG2_CODE_GENERATED], [1],
-            [Define if your system generates wrong code for log2 routine.])
+if test ${hdf5_cv_disable_some_ldouble_conv} = "yes"; then
+  AC_DEFINE([DISABLE_SOME_LDOUBLE_CONV], [1],
+            [Define if your system is IBM ppc64le and cannot convert some long double values correctly.])
   AC_MSG_RESULT([yes])
 else
   AC_MSG_RESULT([no])
@@ -2787,8 +3561,8 @@ fi
 ## and installed with the libraries (used to generate libhdf5.settings).
 ##
 
-## HDF5 version from the first line of the README.txt file.
-H5_VERSION="`cut -d' ' -f3 $srcdir/README.txt | head -1`"
+## HDF5 version from the first line of the README.md file.
+H5_VERSION="`cut -d' ' -f3 $srcdir/README.md | head -1`"
 AC_SUBST([H5_VERSION])
 
 ## Configuration date
@@ -2800,7 +3574,7 @@ if test -n "$ORGANIZATION"; then
   CONFIG_USER="$CONFIG_USER at $ORGANIZATION"
 fi
 
-## Configuration mode (production, development, profile, etc) saved above.
+## Configuration mode (production, debug, etc.) saved above.
 AC_SUBST([CONFIG_MODE])
 
 ## Byte sex from the AC_C_BIGENDIAN macro.
@@ -2822,6 +3596,12 @@ AC_SUBST([WORDS_BIGENDIAN])
 ## Parallel support? (set above except empty if none)
 PARALLEL=${PARALLEL:-no}
 
+## Parallel writes to filtered datasets support?
+PARALLEL_FILTERED_WRITES=${PARALLEL_FILTERED_WRITES:-no}
+
+## >2GB writes in parallel support?
+LARGE_PARALLEL_IO=${LARGE_PARALLEL_IO:-no}
+
 ## Compiler with version information. This consists of the full path
 ## name of the compiler and the reported version number.
 AC_SUBST([CC_VERSION])
@@ -2869,7 +3649,7 @@ CXX_NOFLAGS=`echo $CXX | sed 's/ -.*//'`
 if `echo $CXX_NOFLAGS | grep ^/ >/dev/null 2>&1`; then
   CXX_VERSION="$CXX"
 else
-  CXX_VERSION="$FC";
+  CXX_VERSION="$CXX";
   for x in `echo $PATH | sed -e 's/:/ /g'`; do
     if test -x $x/$CXX_NOFLAGS; then
       CXX_VERSION="$x/$CXX"
@@ -2881,6 +3661,27 @@ if test -n "$cxx_version_info"; then
   CXX_VERSION="$CXX_VERSION ( $cxx_version_info)"
 fi
 
+AC_SUBST([JAVA_VERSION])
+## Strip anything that looks like a flag off of $JAVA
+JAVA_NOFLAGS=`echo $JAVA | sed 's/ -.*//'`
+
+if `echo $JAVA_NOFLAGS | grep ^/ >/dev/null 2>&1`; then
+  JAVA_VERSION="$JAVA"
+else
+  JAVA_VERSION="$JAVA";
+  for x in `echo $PATH | sed -e 's/:/ /g'`; do
+    if test -x $x/$JAVA_NOFLAGS; then
+      JAVA_VERSION="$x/$JAVA"
+      break
+    fi
+  done
+fi
+java_version_info=`$JAVA -version 2>&1 |\
+  grep 'version' | sed -e 's/version "//' | sed -e 's/"//'`
+if test -n "$java_version_info"; then
+  JAVA_VERSION="$JAVA_VERSION ($java_version_info)"
+fi
+
 ## ----------------------------------------------------------------------
 ## Where is the root of the source tree. Give an absolute address so
 ## we can find it no matter which directory of the distribution is our
@@ -2905,24 +3706,28 @@ AC_ARG_ENABLE([build-all],
                      [Build helper programs that only developers should need [default=no]])],
      [BUILD_ALL=$enableval],
      [BUILD_ALL=no])
-
-if test "X$BUILD_ALL" = "Xyes"; then
- echo "yes"
-else
- echo "no"
-fi
+AC_MSG_RESULT([$BUILD_ALL])
 AM_CONDITIONAL([BUILD_ALL_CONDITIONAL], [test "X$BUILD_ALL" = "Xyes"])
 
 ## ----------------------------------------------------------------------
 ## Enable deprecated public API symbols
 ##
+
+## Enabled unless the build mode is clean.
+if test "X-$BUILD_MODE" = "X-clean" ; then
+  DEPREC_SYMBOLS=no
+else
+  DEPREC_SYMBOLS=yes
+fi
+
 AC_SUBST([DEPRECATED_SYMBOLS])
 AC_MSG_CHECKING([if deprecated public symbols are available]);
 AC_ARG_ENABLE([deprecated-symbols],
               [AS_HELP_STRING([--enable-deprecated-symbols],
-                     [Enable deprecated public API symbols [default=yes]])],
-             [DEPREC_SYMBOLS=$enableval],
-             [DEPREC_SYMBOLS=yes])
+                     [Enable deprecated public API symbols.
+                     [default=yes (unless build mode = clean)]
+                     ])],
+              [DEPREC_SYMBOLS=$enableval])
 
 case "X-$DEPREC_SYMBOLS" in
   X-yes)
@@ -2944,11 +3749,13 @@ esac
 AC_SUBST([DEFAULT_API_VERSION])
 AC_MSG_CHECKING([which version of public symbols to use by default])
 AC_ARG_WITH([default-api-version],
-            [AS_HELP_STRING([--with-default-api-version=(v16|v18|v110)],
+            [AS_HELP_STRING([--with-default-api-version=(default|v16|v18|v110|v112|v114|v116)],
                             [Specify default release version of public symbols
-                             [default=v110]])],,
-            [withval=v110])
+                             [default=v116]])],,
+            [withval=v116])
 
+## Allowing "default" allows the GitHub CI to check that we didn't forget
+## to change the defaults when creating a new major version
 if test "X$withval" = "Xv16"; then
     AC_MSG_RESULT([v16])
     DEFAULT_API_VERSION=v16
@@ -2957,9 +3764,28 @@ if test "X$withval" = "Xv16"; then
 elif test "X$withval" = "Xv18"; then
     AC_MSG_RESULT([v18])
     DEFAULT_API_VERSION=v18
+    AC_DEFINE([USE_18_API_DEFAULT], [1],
+              [Define using v1.8 public API symbols by default])
 elif test "X$withval" = "Xv110"; then
     AC_MSG_RESULT([v110])
     DEFAULT_API_VERSION=v110
+    AC_DEFINE([USE_110_API_DEFAULT], [1],
+              [Define using v1.10 public API symbols by default])
+elif test "X$withval" = "Xv112"; then
+    AC_MSG_RESULT([v112])
+    DEFAULT_API_VERSION=v112
+    AC_DEFINE([USE_112_API_DEFAULT], [1],
+              [Define using v1.12 public API symbols by default])
+elif test "X$withval" = "Xv114"; then
+    AC_MSG_RESULT([v114])
+    DEFAULT_API_VERSION=v114
+    AC_DEFINE([USE_114_API_DEFAULT], [1],
+              [Define using v1.14 public API symbols by default])
+elif test "X$withval" = "Xv116" -o "X$withval" = "Xdefault"; then
+    AC_MSG_RESULT([v116])
+    DEFAULT_API_VERSION=v116
+    AC_DEFINE([USE_116_API_DEFAULT], [1],
+              [Define using v1.16 public API symbols by default])
 else
     AC_MSG_ERROR([invalid version of public symbols given])
 fi
@@ -2969,7 +3795,7 @@ fi
 ## if the user insists on doing this via the --enable-unsupported configure
 ## flag, we'll let them.
 if test "X${ALLOW_UNSUPPORTED}" != "Xyes"; then
-  if test "X${DEFAULT_API_VERSION}" != "Xv110" -a "X${DEPRECATED_SYMBOLS}" = "Xno" ; then
+  if test "X${DEFAULT_API_VERSION}" != "Xv116" -a "X${DEPRECATED_SYMBOLS}" = "Xno" ; then
     AC_MSG_ERROR([Removing old public API symbols not allowed when using them as default public API symbols. Use --enable-unsupported to override this error.])
   fi
 fi
@@ -2981,29 +3807,72 @@ AC_SUBST([STRICT_FORMAT_CHECKS])
 AC_MSG_CHECKING([whether to perform strict file format checks]);
 AC_ARG_ENABLE([strict-format-checks],
               [AS_HELP_STRING([--enable-strict-format-checks],
-                     [Enable strict file format checks, default=yes if
-                        debug flag is enabled, no otherwise])],
-             [STRICT_CHECKS=$enableval])
-
-## Default to yes if debug is enabled
-if test "X-$STRICT_CHECKS" = X- ; then
-  if test -z "$DEBUG_PKG" ; then
-    STRICT_CHECKS=no
+                     [Enable strict file format checks.
+                      [default=yes if debug build, otherwise no]
+                     ])],
+             [STRICT_FORMAT_CHECKS=$enableval])
+
+## Set the default level. This depends on the compiler mode.
+if test "X-$STRICT_FORMAT_CHECKS" = X- ; then
+  if test "X-$BUILD_MODE" = "X-debug" ; then
+    STRICT_FORMAT_CHECKS=yes
   else
-    STRICT_CHECKS=yes
+    STRICT_FORMAT_CHECKS=no
   fi
 fi
 
-case "X-$STRICT_CHECKS" in
+case "X-$STRICT_FORMAT_CHECKS" in
   X-yes)
     AC_MSG_RESULT([yes])
-    STRICT_FORMAT_CHECKS=yes
     AC_DEFINE([STRICT_FORMAT_CHECKS], [1],
               [Define if strict file format checks are enabled])
     ;;
-  X-no|*)
+  X-no)
     AC_MSG_RESULT([no])
-    STRICT_FORMAT_CHECKS=no
+    ;;
+  *)
+    AC_MSG_ERROR([Unrecognized value: $STRICT_FORMAT_CHECKS])
+    ;;
+esac
+
+
+## ----------------------------------------------------------------------
+## Enable use of pread/pwrite instead of read/write in certain VFDs.
+##
+AC_SUBST([PREADWRITE])
+
+## Check these first to avoid interspersed output in the AC_ARG_ENABLE line
+## below. (Probably overkill to check for both, but we'll be extra careful)
+PREADWRITE_HAVE_BOTH=yes
+AC_CHECK_FUNC([pread], [], [PREADWRITE_HAVE_BOTH=no])
+AC_CHECK_FUNC([pwrite], [], [PREADWRITE_HAVE_BOTH=no])
+
+AC_MSG_CHECKING([whether to use pread/pwrite instead of read/write in certain VFDs])
+AC_ARG_ENABLE([preadwrite],
+              [AS_HELP_STRING([--enable-preadwrite],
+                              [Enable using pread/pwrite instead of read/write in sec2/log/core VFDs.
+                              [default=yes if pread/pwrite are present]])],
+              [PREADWRITE=$enableval])
+
+## Set the default level.
+if test "X-$PREADWRITE" = X- ; then
+  PREADWRITE=yes
+fi
+
+case "X-$PREADWRITE" in
+  X-yes)
+      if test "X-$PREADWRITE_HAVE_BOTH" = "X-yes"; then
+        AC_DEFINE([HAVE_PREADWRITE], [1], [Define if both pread and pwrite exist.])
+        AC_MSG_RESULT([yes])
+      else
+        AC_MSG_RESULT([no])
+      fi
+    ;;
+  X-no)
+      AC_MSG_RESULT([no])
+    ;;
+  *)
+      AC_MSG_ERROR([Unrecognized value: $PREADWRITE])
     ;;
 esac
 
@@ -3014,9 +3883,9 @@ esac
 AC_MSG_CHECKING([whether to have library information embedded in the executables])
 AC_ARG_ENABLE([embedded-libinfo],
     [AS_HELP_STRING([--enable-embedded-libinfo],
-	[Enable embedded library information [default=yes]])],
-	[enable_embedded_libinfo=$enableval],
-	[enable_embedded_libinfo=yes])
+    [Enable embedded library information [default=yes]])],
+    [enable_embedded_libinfo=$enableval],
+    [enable_embedded_libinfo=yes])
 
    if test "${enable_embedded_libinfo}" = "yes"; then
       AC_MSG_RESULT([yes])
@@ -3028,59 +3897,13 @@ AC_ARG_ENABLE([embedded-libinfo],
 
 
 ## ----------------------------------------------------------------------
-## Check if pointer alignments are enforced
-##
-AC_MSG_CHECKING([if alignment restrictions are strictly enforced])
-AC_RUN_IFELSE([
-    AC_LANG_PROGRAM([
-        #include <stdlib.h>
-        #include <string.h>
-
-        typedef struct {
-            size_t len;
-            void *p;
-        } hvl_t;
-        ], [
-        char *chp = "beefs";
-        char **chpp = malloc (2 * sizeof (char *));
-        char **chpp2;
-        hvl_t vl = { 12345, (void *) chp };
-        hvl_t *vlp;
-        hvl_t *vlp2;
-
-        memcpy ((void *) ((char *) chpp + 1), &chp, sizeof (char *));
-        chpp2 = (char **) ((char *) chpp + 1);
-        if (strcmp (*chpp2, chp)) {
-            free (chpp);
-            return 1;
-        }
-        free (chpp);
-
-        vlp = malloc (2 * sizeof (hvl_t));
-        memcpy ((void *) ((char *) vlp + 1), &vl, sizeof (hvl_t));
-        vlp2 = (hvl_t *) ((char *) vlp + 1);
-        if (vlp2->len != vl.len || vlp2->p != vl.p) {
-            free (vlp);
-            return 1;
-        }
-        free (vlp);
-    ])
-    ], [
-    AC_DEFINE([NO_ALIGNMENT_RESTRICTIONS], [1], [Define if we can violate pointer alignment restrictions])
-    AC_MSG_RESULT([no])
-    ], [
-    AC_MSG_RESULT([yes])
-    ], [
-    AC_MSG_RESULT([unknown, assuming yes])
-    ])
-
-
-## ----------------------------------------------------------------------
 ## Restore user's CFLAGS.
 CFLAGS="$saved_user_CFLAGS"
 FCFLAGS="$saved_user_FCFLAGS"
 CXXFLAGS="$saved_user_CXXFLAGS"
 CPPFLAGS="$saved_user_CPPFLAGS"
+JAVACFLAGS="$saved_user_JAVACFLAGS"
+JAVAFLAGS="$saved_user_JAVAFLAGS"
 LDFLAGS="$saved_user_LDFLAGS"
 
 
@@ -3089,10 +3912,15 @@ LDFLAGS="$saved_user_LDFLAGS"
 ## need to be compiled
 
 AM_CONDITIONAL([BUILD_CXX_CONDITIONAL], [test "X$HDF_CXX" = "Xyes"])
-AM_CONDITIONAL([BUILD_PARALLEL_CONDITIONAL], [test -n "$TESTPARALLEL"])
+AM_CONDITIONAL([BUILD_PARALLEL_CONDITIONAL], [test "X$PARALLEL" = "Xyes"])
 AM_CONDITIONAL([BUILD_FORTRAN_CONDITIONAL], [test "X$HDF_FORTRAN" = "Xyes"])
+AM_CONDITIONAL([BUILD_JAVA_CONDITIONAL], [test "X$HDF_JAVA" = "Xyes"])
 AM_CONDITIONAL([BUILD_HDF5_HL_CONDITIONAL], [test "X$HDF5_HL" = "Xyes"])
-
+AM_CONDITIONAL([BUILD_TESTS_CONDITIONAL], [test "X$HDF5_TESTS" = "Xyes"])
+AM_CONDITIONAL([BUILD_TESTS_PARALLEL_CONDITIONAL], [test -n "$TESTPARALLEL"])
+AM_CONDITIONAL([BUILD_TOOLS_CONDITIONAL], [test "X$HDF5_TOOLS" = "Xyes"])
+AM_CONDITIONAL([BUILD_TOOLS_HL_GIF_CONDITIONAL], [test "X$HDF5_HL_GIF_TOOLS" = "Xyes"])
+AM_CONDITIONAL([BUILD_DOXYGEN_CONDITIONAL], [test "X$HDF5_DOXYGEN" = "Xyes"])
 
 ## ----------------------------------------------------------------------
 ## Build the Makefiles.
@@ -3100,8 +3928,6 @@ AM_CONDITIONAL([BUILD_HDF5_HL_CONDITIONAL], [test "X$HDF5_HL" = "Xyes"])
 
 ## The directory search list
 AC_SUBST([SEARCH]) SEARCH='$(srcdir) $(top_builddir)/src $(top_srcdir)/src'
-cmd='echo $SEARCH |sed "s/ /'$SEARCH_SEP'/g"'
-SEARCH="$SEARCH_RULE`eval $cmd`"
 export SEARCH
 
 ## Some cleanup stuff
@@ -3157,6 +3983,11 @@ else
   enable_static=no
 fi
 
+## Expose things for *.in markup
+AC_SUBST([STATIC_SHARED])
+AC_SUBST([enable_shared])
+AC_SUBST([enable_static])
+
 if test "X$enable_static" = "Xyes" && test "X$enable_shared" = "Xyes"; then
   STATIC_SHARED="static, shared"
 elif test "X$enable_static" = "Xyes"; then
@@ -3167,6 +3998,27 @@ else
   STATIC_SHARED="none"
 fi
 
+if test "X$HDF_FORTRAN" = "Xyes"; then
+
+  ### libtool does not pass the correct argument linking (-Wl,-Wl,,) for the NAG Fortran compiler
+  ### on Linux (other OSs have not been tested).
+  ### Therefore, detect if we are using the NAG Fortran compiler, and replace the wl="-Wl," for Fortran to
+  ### wl="-Wl,-Wl,," in the libtool file. (HDFFV-10037)
+  case "`uname`" in
+    Linux*)
+
+    fortran_linux_linker_option="-Wl,"
+    if test "X$FC_BASENAME" = "Xnagfor"; then
+       fortran_linux_linker_option="-Wl,-Wl,,"
+    fi
+
+    ## Set the correct linker option for use in h5fc.in markup
+    AC_SUBST([fortran_linux_linker_option])
+    ;;
+  esac
+
+fi
+
 ## ----------------------------------------------------------------------
 ## Set a macro if shared library is enabled.
 ##
@@ -3174,45 +4026,88 @@ AM_CONDITIONAL([HAVE_SHARED_CONDITIONAL], [test "X$enable_shared" = "Xyes"])
 
 AC_CONFIG_FILES([src/libhdf5.settings
                  Makefile
+                 doxygen/Doxyfile
                  src/Makefile
                  test/Makefile
-                 test/testcheck_version.sh
-                 test/testerror.sh
                  test/H5srcdir_str.h
-                 test/testlibinfo.sh
-                 test/testlinks_env.sh
+                 test/test_abort_fail.sh
+                 test/test_check_version.sh
+                 test/test_error.sh
+                 test/test_external_env.sh
+                 test/test_flush_refresh.sh
+                 test/test_libinfo.sh
+                 test/test_links_env.sh
+                 test/test_mirror.sh
                  test/test_plugin.sh
+                 test/test_swmr.sh
+                 test/test_use_cases.sh
+                 test/test_vds_env.sh
+                 test/test_vds_swmr.sh
                  testpar/Makefile
+                 testpar/testpflush.sh
+                 utils/Makefile
+                 utils/mirror_vfd/Makefile
+                 utils/test/Makefile
+                 utils/tools/Makefile
+                 utils/tools/h5dwalk/Makefile
+                 utils/tools/test/Makefile
+                 utils/tools/test/h5dwalk/Makefile
+                 utils/tools/test/h5dwalk/copy_demo_files.sh
+                 utils/tools/test/h5dwalk/testh5dwalk.sh
                  tools/Makefile
-                 tools/h5dump/Makefile
-                 tools/h5dump/testh5dump.sh
-                 tools/h5dump/testh5dumppbits.sh
-                 tools/h5dump/testh5dumpxml.sh
-                 tools/h5ls/testh5ls.sh
-                 tools/h5import/Makefile
-                 tools/h5import/h5importtestutil.sh
-                 tools/h5diff/Makefile
-                 tools/h5diff/testh5diff.sh
-                 tools/h5diff/testph5diff.sh
-                 tools/h5jam/Makefile
-                 tools/h5jam/testh5jam.sh
-                 tools/h5repack/Makefile
-                 tools/h5repack/h5repack.sh
-                 tools/h5repack/h5repack_plugin.sh
-                 tools/h5ls/Makefile
-                 tools/h5copy/Makefile
-                 tools/h5copy/testh5copy.sh
                  tools/lib/Makefile
-                 tools/misc/Makefile
-                 tools/misc/h5cc
-                 tools/misc/testh5mkgrp.sh
-                 tools/misc/testh5repart.sh
-                 tools/h5stat/testh5stat.sh
-                 tools/h5stat/Makefile
-                 tools/perform/Makefile
+                 tools/libtest/Makefile
+                 tools/src/Makefile
+                 tools/src/h5dump/Makefile
+                 tools/src/h5import/Makefile
+                 tools/src/h5diff/Makefile
+                 tools/src/h5jam/Makefile
+                 tools/src/h5repack/Makefile
+                 tools/src/h5ls/Makefile
+                 tools/src/h5copy/Makefile
+                 tools/src/misc/Makefile
+                 tools/src/h5stat/Makefile
+                 tools/test/Makefile
+                 tools/test/h5dump/Makefile
+                 tools/test/h5dump/h5dump_plugin.sh
+                 tools/test/h5dump/testh5dump.sh
+                 tools/test/h5dump/testh5dumppbits.sh
+                 tools/test/h5dump/testh5dumpvds.sh
+                 tools/test/h5dump/testh5dumpxml.sh
+                 tools/test/h5ls/Makefile
+                 tools/test/h5ls/h5ls_plugin.sh
+                 tools/test/h5ls/testh5ls.sh
+                 tools/test/h5ls/testh5lsvds.sh
+                 tools/test/h5import/Makefile
+                 tools/test/h5import/h5importtestutil.sh
+                 tools/test/h5diff/Makefile
+                 tools/test/h5diff/h5diff_plugin.sh
+                 tools/test/h5diff/testh5diff.sh
+                 tools/test/h5diff/testph5diff.sh
+                 tools/src/h5format_convert/Makefile
+                 tools/test/h5format_convert/Makefile
+                 tools/test/h5format_convert/testh5fc.sh
+                 tools/test/h5jam/Makefile
+                 tools/test/h5jam/testh5jam.sh
+                 tools/test/h5repack/Makefile
+                 tools/test/h5repack/h5repack.sh
+                 tools/test/h5repack/h5repack_plugin.sh
+                 tools/test/h5copy/Makefile
+                 tools/test/h5copy/testh5copy.sh
+                 tools/test/misc/Makefile
+                 tools/test/misc/testh5clear.sh
+                 tools/test/misc/testh5mkgrp.sh
+                 tools/test/misc/testh5repart.sh
+                 tools/test/misc/vds/Makefile
+                 tools/test/h5stat/Makefile
+                 tools/test/h5stat/testh5stat.sh
+                 tools/src/h5perf/Makefile
+                 tools/test/perform/Makefile
                  examples/Makefile
                  examples/run-c-ex.sh
                  examples/testh5cc.sh
+                 bin/h5cc
+                 bin/Makefile
                  c++/Makefile
                  c++/src/Makefile
                  c++/src/h5c++
@@ -3224,11 +4119,26 @@ AC_CONFIG_FILES([src/libhdf5.settings
                  fortran/Makefile
                  fortran/src/h5fc
                  fortran/src/Makefile
+                 fortran/src/H5fort_type_defines.h
                  fortran/test/Makefile
                  fortran/testpar/Makefile
                  fortran/examples/Makefile
                  fortran/examples/run-fortran-ex.sh
                  fortran/examples/testh5fc.sh
+                 java/Makefile
+                 java/src/Makefile
+                 java/src/jni/Makefile
+                 java/test/Makefile
+                 java/test/junit.sh
+                 java/examples/Makefile
+                 java/examples/intro/Makefile
+                 java/examples/intro/JavaIntroExample.sh
+                 java/examples/datasets/Makefile
+                 java/examples/datasets/JavaDatasetExample.sh
+                 java/examples/datatypes/Makefile
+                 java/examples/datatypes/JavaDatatypeExample.sh
+                 java/examples/groups/Makefile
+                 java/examples/groups/JavaGroupExample.sh
                  hl/Makefile
                  hl/src/Makefile
                  hl/test/Makefile
@@ -3236,6 +4146,8 @@ AC_CONFIG_FILES([src/libhdf5.settings
                  hl/tools/Makefile
                  hl/tools/gif2h5/Makefile
                  hl/tools/gif2h5/h52giftest.sh
+                 hl/tools/h5watch/Makefile
+                 hl/tools/h5watch/testh5watch.sh
                  hl/examples/Makefile
                  hl/examples/run-hlc-ex.sh
                  hl/c++/Makefile
@@ -3249,27 +4161,52 @@ AC_CONFIG_FILES([src/libhdf5.settings
                  hl/fortran/examples/Makefile
                  hl/fortran/examples/run-hlfortran-ex.sh])
 
-AC_OUTPUT
+AC_CONFIG_FILES([utils/subfiling_vfd/h5fuse.sh], [chmod +x utils/subfiling_vfd/h5fuse.sh])
 
-chmod 755 tools/misc/h5cc
+AC_CONFIG_COMMANDS([.classes], [], [$MKDIR_P java/src/.classes;
+                $MKDIR_P java/test/.classes;
+                $MKDIR_P java/examples/intro/.classes;
+                $MKDIR_P java/examples/datasets/.classes;
+                $MKDIR_P java/examples/datatypes/.classes;
+                $MKDIR_P java/examples/groups/.classes])
 
-if test "X$HDF_FORTRAN" = "Xyes"; then
-  chmod 755 fortran/src/h5fc
-fi
+AC_OUTPUT
 
+chmod 755 bin/h5cc
 if test "X$HDF_CXX" = "Xyes"; then
   chmod 755 c++/src/h5c++
 fi
 
-## We don't want inline defined for C++ compilers
-## Don't worry about the C++ ifdef wrappers in the H5pubconf file, since
-## 'H5_inline' isn't a C++ keyword.
-cat >> src/H5config.h <<EOF
 
-#if defined(__cplusplus) && defined(inline)
-#undef inline
-#endif
-EOF
+if test "X$HDF_FORTRAN" = "Xyes"; then
+  chmod 755 fortran/src/h5fc
+  ## libtool does not pass the correct argument linker (wl=) for the Intel Fortran compiler
+  ## on OS X, which is needed when building shared libraries on OS X.  This script
+  ## replaces the 3rd occurrence, which is for Fortran, of wl="" with wl="-Wl," (HDFFV-2772)
+  case "`uname`" in
+    Darwin*)
+      cat libtool | awk '/wl=\"/{c++;if(c==3){sub("wl=\"\"","wl=\"-Wl,\"");c=0}}1' > libtool.tmp && mv -f libtool.tmp libtool && chmod 755 libtool
+      ;;
+  esac
+
+  ### libtool does not pass the correct argument linking (-Wl,-Wl,,) for the NAG Fortran compiler
+  ### on Linux (other OSs have not been tested).
+  ### Therefore, detect if we are using the NAG Fortran compiler, and replace the wl="-Wl," for Fortran to
+  ### wl="-Wl,-Wl,," in the libtool file. (HDFFV-10037)
+  case "`uname`" in
+    Linux*)
+      if test "X$FC_BASENAME" = "Xnagfor"; then
+         cat libtool | awk '/BEGIN LIBTOOL TAG CONFIG: FC/{flag=1}flag&&/wl=/{$NF="wl=\"-Wl,-Wl,,\"";flag=0}1' > libtool.tmp && mv -f libtool.tmp libtool && chmod 755 libtool
+      fi
+      ;;
+  esac
+fi
+
+## HDF5 configure code created by autotools with gcc 4.9.2 is adding problematic
+## linker flags:  -l with no library name; -l <libname>, specifically gfortran or m.
+## This sed script corrects "-l <libname>" first and then "-l " with no library name.
+## If the order is not preserved, all instances of "-l " will be removed.
+sed -e '/^postdeps/ s/-l \([a-zA-Z]\)/-l\1/g' -e '/^postdeps/ s/-l //g' -i libtool
 
 ## show the configure settings
 cat src/libhdf5.settings
diff --git a/doc/arch/README.md b/doc/arch/README.md
new file mode 100644
index 0000000..125e5a2
--- /dev/null
+++ b/doc/arch/README.md
@@ -0,0 +1,90 @@
+# An Overview of the HDF5 Library Architecture
+
+## [Purpose, Objectives, and Values](./purpose_objectives_values.md)
+
+## Data and Metadata
+
+### Mapping User Data to HDF5 Files
+
+#### The HDF5 File Format
+
+### Mapping User Data to Storage
+
+### Data Retained in the Library
+
+## Functional Decomposition
+
+### Components
+
+#### Selection
+#### Datatype Conversion
+#### Filter Pipeline
+#### Caching & Buffering
+#### File-space Management
+#### Opening a File
+#### Creating an Object
+#### Dataset I/O
+
+### Use Cases
+
+#### Parallel HDF5
+#### SWMR
+#### VDS
+#### Paged Allocation
+#### …
+
+### Feature (In-)Compatibility Matrix
+
+## Modular Library Organization
+
+### Library Internals
+
+#### Boilerplate and Misc.
+#### Memory Allocation and Free Lists
+#### API Contexts
+#### Metadata Cache
+#### Files and the Open File List
+#### Platform Independence
+
+### Modules
+
+#### IDs
+#### Property Lists
+#### Error Handling
+#### File Objects
+#### Datasets
+#### Groups and Links
+#### Datatypes
+#### Dataspaces
+#### Attributes
+
+### Extension Interfaces
+
+#### Filters
+#### Virtual File Layer and Virtual File Drivers
+#### Virtual Object Layer
+
+### Language Bindings
+
+#### General Considerations
+#### Fortran
+#### Java
+
+## Performance Considerations
+
+## Library Development and Maintenance
+
+### Build Process
+
+### Testing
+
+#### Macro Schemes
+#### `testhdf5`
+#### Other Test Programs
+#### (Power)Shell Scripts
+#### CMake vs Autotools
+#### VOL and VFD Inclusion/Exclusion
+
+### Versioning and Releases
+
+## References
diff --git a/doc/arch/purpose_objectives_values.md b/doc/arch/purpose_objectives_values.md
new file mode 100644
index 0000000..880e4e4
--- /dev/null
+++ b/doc/arch/purpose_objectives_values.md
@@ -0,0 +1,78 @@
+## Purpose, Objectives, & Values
+
+The purpose of the HDF5 library is to ensure efficient and equitable access to science and engineering data stored in HDF5 across platforms and environments, now and forever. Toward that purpose, the two main objectives are:
+
+1. Self-describing data
+2. Portable encapsulation and access.
+
+Self-describing data captures all information about itself necessary to reproduce and interpret it as intended by its producer. A storage representation must preserve the self-describing nature when transferring such representations over a network or to different storage. At the same time, it should be accompanied by a portable library that allows applications to access the data without knowing anything about the details of the representation.
+
+The "marriage"[^1] of the HDF5 file format and library is a specific implementation of the primitives and operations defined by the HDF5 data model and adapted for several specific use cases.
+
+![HDF5 models and implementations](https://docs.hdfgroup.org/hdf5/develop/Dmodel_fig1.gif)
+
+The following values[^2][^3] guide the implementation (in no particular order):
+
+<dl>
+  <dt>Extensibility</dt>
+  <dd>The degree to which behavior and appearance can be changed by users.
+    <ul>
+      <li>Datatypes, conversions</li>
+      <li>Filters</li>
+      <li>Links</li>
+      <li>Data virtualization</li>
+      <li>Storage types</li>
+    </ul>
+    Evolution of the file format
+    <ul>
+      <li>Micro-versioning</li>
+    </ul>
+  </dd>
+
+  <dt>Compatibility, Longevity, &amp; Stability</dt>
+  <dd>Things that worked before continue to work the same indefinitely
+    <ul>
+      <li>Quasi-fixed data model</li>
+      <li>Backward- and forward compatibility</li>
+      <li>API Versioning</li>
+      <li>File format specification</li>
+    </ul>
+  </dd>
+  
+  <dt>Efficiency</dt>
+  <dd>Effective operation as measured by a comparison of production with cost (as in time, storage, energy, etc.)
+    <ul>
+      <li>Algorithmic complexity</li>
+      <li>Scalability</li>
+    </ul>
+  </dd>
+  
+  <dt>Maintainability</dt>
+  <dd>The degree to which it can be modified without introducing fault
+    <ul>
+      <li>Additive software construction</li>
+    </ul>
+  </dd>
+  
+  <dt>Progressiveness</dt>
+  <dd>A measure of eagerness to make progress and leverage modern storage technology</dd>
+  
+  <dt>Freedom</dt>
+  <dd>Specifically, free software means users have the four essential freedoms:
+    <ul>
+      <li>The freedom to run the program as you wish, for any purpose (freedom 0).</li>
+      <li>The freedom to study how the program works, and change it so it does your computing as you wish (freedom 1). Access to the source code is a precondition for this.</li>
+      <li>The freedom to redistribute copies so you can help others (freedom 2).</li>
+      <li>The freedom to distribute copies of your modified versions to others (freedom 3). By doing this you can give the whole community a chance to benefit from your changes. Access to the source code is a precondition for this.</li>
+    </ul>
+  </dd>
+  
+  
+</dl>
+
+
+
+
+[^1]: Jeffrey A. Kuehn: [Faster Libraries for Creating Network-Portable Self-Describing Datasets](https://cug.org/5-publications/proceedings_attendee_lists/1997CD/S96PROC/289_293.PDF), CUG 1996 Spring Proceedings
+[^2]: Chris Hanson & Gerald Jay Sussman: [Software Design for Flexibility: How to Avoid Programming Yourself into a Corner](https://mitpress.mit.edu/9780262045490/software-design-for-flexibility/), MIT Press.
+[^3]: Free Software Foundation: [What is Free Software?](https://www.gnu.org/philosophy/free-sw.en.html)
diff --git a/doc/arch/put_architecture_docs_here.md b/doc/arch/put_architecture_docs_here.md
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/doc/arch/put_architecture_docs_here.md
diff --git a/doc/branches-explained.md b/doc/branches-explained.md
new file mode 100644
index 0000000..5b55ec7
--- /dev/null
+++ b/doc/branches-explained.md
@@ -0,0 +1,40 @@
+# HDF5 Git Branching Model Explained
+
+This document describes current HDF5 branches. 
+
+Branches are tested nightly and testing results are available at https://cdash-internal.hdfgroup.org/ and https://cdash.hdfgroup.org/. 
+Commits that break daily testing should be fixed by 3:00 pm Central time or reverted.  
+We encourage code contributors to check the status of their commits. If you have any questions, please contact help@hdfgroup.org.
+ 
+## `develop`
+Develop is the main branch whose source code always reflects a state with the latest delivered development changes for the next major release of HDF5. 
+This is also considered the integration branch, as **all** new features are integrated into this branch from respective feature branches. Although
+develop is considered an integration branch, it is not an unstable branch. All code merged to develop is expected to pass all GitHub actions and daily tests.
+
+## `Maintenance branches`
+Each currently supported release line of HDF5 (e.g. 1.8.x, 1.10.x, 1.12.x) has an associated branch with the name hdf5\_1\_10, etc.. 
+Maintenance branches are similar to the develop branch, except the source code in a maintenance branch always reflects a state 
+with the latest delivered development changes for the next **maintenance** release of that particular supported release-line of HDF5. 
+**Some** new features will be integrated into a release maintenance branch, depending on whether or not those features can be 
+introduced in minor releases.  Maintenance branches are removed when a release-line is retired from support.
+
+## `Release branches`
+Release branches are used to prepare a new production release. They are primarily used to allow for last minute dotting of i's and crossing of t's 
+(things like setting the release version, finalizing release notes, and generating Autotools files) and do not include new development. 
+They are created from the maintenance branch at the time of the maintenance release and have 
+names like hdf5\_1\_10\_N, where N is the minor release number. Once the release is  done it is tagged, with a slightly different format: hdf5-1\_\10\_N. 
+Release branches are deleted after the tag has been created. If we have to create a patch version of a release (which is rare), we create a branch off of the tag.
+
+## `feature/*`
+Feature branches are temporary branches used to develop new features in HDF5.
+Feature branches branch off of develop and exist as long as the feature is under development. 
+When the feature is complete, the branch is merged back into develop, as well as into any support branches in which the change will be included, and then the feature branch is removed.
+
+Ideally, all feature branches should contain a BRANCH.md file in the root directory that explains the purpose of the branch, contact information for the person responsible, and, if possible, some clues about the branch's life cycle (so we have an idea about when it can be deleted, merged, or declared inactive).
+
+Minor bug fixes and refactoring work usually takes place on personal forks, not feature branches.
+
+## `inactive/*`
+These branches are for experimental features that were developed in the past, have not been merged to develop, and are not under active development. The exception to this is that some feature branches are labeled inactive and preserved for a short time after merging to develop. Integration branches are usually not kept in sync with the develop branch.
+
+As for feature branches, inactive branches should have a BRANCH.md file as described above.
diff --git a/doc/code-conventions.md b/doc/code-conventions.md
new file mode 100644
index 0000000..ff3b4cf
--- /dev/null
+++ b/doc/code-conventions.md
@@ -0,0 +1,57 @@
+# HDF5 Library Code Conventions
+
+This document describes some practices that are new, or newly
+documented, starting in 2020.
+
+## Function / Variable Attributes
+
+In H5private.h, the library provides platform-independent macros
+for qualifying function and variable definitions.
+
+### Functions that accept `printf(3)` and `scanf(3)` format strings
+
+Label functions that accept a `printf(3)`-compliant format string with
+`H5_ATTR_FORMAT(printf,format_argno,variadic_argno)`, where
+the format string is the `format_argno`th argument (counting from 1)
+and the variadic arguments start with the `variadic_argno`th.
+
+Functions that accept a `scanf(3)`-compliant format string should
+be labeled `H5_ATTR_FORMAT(scanf,format_argno,variadic_argno)`.
+
+### Functions that do never return
+
+The definition of a function that always causes the program to abort and hang
+should be labeled `H5_ATTR_NORETURN` to help the compiler see which flows of
+control are infeasible.
+
+### Other attributes
+
+**TBD**
+
+### Unused variables and parameters
+
+Compilers will warn about unused parameters and variables—developers should pay
+attention to those warnings and make an effort to prevent them.
+
+Some function parameters and variables are unused in *all* configurations of
+the project.  Ordinarily, such parameters and variables should be deleted.
+However, sometimes it is possible to foresee a parameter being used, or
+removing it would change an API, or a parameter has to be defined to conform a
+function to some function pointer type.  In those cases, it's permissible to
+mark a symbol `H5_ATTR_UNUSED`.
+
+Other parameters and variables are unused in *some* configurations of the
+project, but not all.  A symbol may fall into disuse in some configuration in
+the future—then the compiler should warn, and the symbol should not be
+defined—so developers should try to label a sometimes-unused symbol with an
+attribute that's specific to the configurations where the symbol is (or is not)
+expected to be used.  The library provides the following attributes for that
+purpose:
+
+* `H5_ATTR_DEPRECATED_USED`: used only if deprecated symbols are enabled
+* `H5_ATTR_NDEBUG_UNUSED`: used only if `NDEBUG` is *not* \#defined
+* `H5_ATTR_DEBUG_API_USED`: used if the debug API is enabled
+* `H5_ATTR_PARALLEL_UNUSED`: used only if Parallel HDF5 *is not* configured
+* `H5_ATTR_PARALLEL_USED`: used only if Parallel HDF5 *is* configured
+
+Some attributes may be phased in or phased out in the future.
diff --git a/doc/file-locking.md b/doc/file-locking.md
new file mode 100644
index 0000000..4f7fb39
--- /dev/null
+++ b/doc/file-locking.md
@@ -0,0 +1,366 @@
+# File Locking in HDF5
+
+This document describes the file locking scheme that was added to HDF5 in
+version 1.10.0 and how you can work around it, if you choose to do so. I'll
+try to keep it understandable for everyone, though diving into technical
+details is unavoidable, given the complexity of the material. We're in the
+process of converting the HDF5 user guide (UG) to Doxygen and this document
+will eventually be rolled up into those files as we update things.
+
+**Parallel HDF5 Note**
+
+Everything written here is from the perspective of serial HDF5. When we say
+that you can't access a file for write access from more than one process, we
+mean "from more than one independent, serial process". Parallel HDF5 can
+obviously write to a file from more than one process, but that involves
+IPC and multiple processes working together, not independent processes with
+no knowledge of each other, which is what the file locks are for.
+
+
+## Why file locks?
+
+The short answer is: "To prevent you from corrupting your HDF5 files and/or
+crashing your reader processes."
+
+The long answer is more complicated.
+
+An HDF5 file's state exists in two places when it is open for writing:
+
+1. The HDF5 file itself
+2. The HDF5 library's various caches
+
+One of those caches is the metadata cache, which stores things like B-tree
+nodes that we use to locate data in the file. Problems arise when parent
+objects are flushed to storage before child objects. If a reader tries to
+load unflushed children, the object's file offset could point at garbage
+and it will encounter library failures as it tries to access the non-existent
+objects.
+
+Keep in mind that the HDF5 library is not analogous to a database server. The
+HDF5 library is just a simple shared library, like libjpeg. Library state is
+maintained per-library-instance and there is no IPC between HDF5 libraries
+loaded by different processes (exception: collective operations in parallel
+HDF5, but that's not what were talking about here).
+
+Prior to HDF5 1.10.0, concurrent access to an HDF5 file by multiple processes,
+when one or more processes is a writer, was not supported. There was no
+enforcement mechanism for this. We simply told people not to do it.
+
+In HDF5 1.10.0, we updated the library to allow the single-writer / multiple-readers
+(SWMR - pronounced "swimmer") access pattern. This setup allows one writer and
+multiple readers to access the same file, as long as a certain protocol is
+followed concerning file opening order and setting the right flags. Since
+synchronization might be tricky to pull off and the consequences of getting
+it wrong could result in corrupt files or crashed readers, we decided to add
+a file locking scheme to help users get it right. Since this would also help
+prevent harmful accesses when SWMR is not in use, we decided to switch the
+file locking scheme on by default. This scheme has been carried forward into
+HDF5 1.12 and 1.13 (soon to be 1.14).
+
+Note that the current implementation of SWMR is only useful for appending to chunked
+datasets. Creating file objects like groups and datasets is not supported
+in the current SWMR implementation.
+
+Unfortunately, this file locking scheme has caused problems for some users.
+This is usually people who are working on network file systems like NFS or
+on parallel file systems, especially when file locks have been disabled, which
+often causes lock calls to fail. As a result of this, we've added work-arounds
+to disable the file locking scheme over the years.
+
+## The existing scheme
+
+There are two parts to the file locking scheme. One is the file lock itself.
+The second is a mark we make in the HDF5 file's superblock. The superblock
+mark isn't really that important for understanding the file locking, but since
+it's entwined with the file locking scheme, we'll cover it in the
+algorithm below. The lower-level details of file lock implementations are
+described in the appendix, but the semantics are straightforward: Locks are
+mandatory unless disabled, always for the entire file, and non-blocking. They
+are also not required for SWMR operations and simply exist to help you set up
+SWMR and prevent dangerous file access.
+
+Here's how it all works:
+
+1. The first thing we do is check if we're using file locks
+
+    - We first check the file locking property in the file access property list
+      (fapl). The default value of this property is set at configure time when
+      the library is built.
+    - Next we check the value of the `HDF5_USE_FILE_LOCKING` environment variable,
+      which was previously parsed at library startup. If this is set,
+      we use the value to override the property list setting.
+
+    The particulars of the ways you can disable file locks are described in a
+    separate section below.
+
+    If we are not using file locking, no further file locking operations will
+    take place.
+
+2. We also check for ignoring file locks when they are disabled on the file system.
+
+    - The environment variable setting for this is checked at VFD initialization
+      time for all library VFDs.
+    - We check the value in the fapl in the `open` callback. The default value for
+      this property was set at configure time when the library was built.
+
+3. When we open a file, we lock it based on the file access flags:
+
+    - If the `H5F_ACC_RDWR` flag is set, use an exclusive lock
+    - Otherwise use a shared lock
+
+    If we are ignoring disabled file locks (see below), we will silently swallow
+    lock API call failure when locks are not implemented on the file system.
+
+4. If the VFD supports locking and the file is open for writing, we mark the
+   file consistency flags in the file's superblock to indicate this.
+
+    **NOTE!**
+
+    - The VFD has to have a lock callback for this to happen. It doesn't matter if
+      the locking was disabled - the check is simply for the callback.
+    - We mark the superblock in **ANY** write case - both SWMR and non-SWMR.
+    - Only the latest version of the superblock is marked in this way. If you
+      open up a file that wasn't created with the 1.10.0 or later file format,
+      it won't get the superblock mark, even if it's been opened for writing.
+
+    According to the file format document and H5Fpkg.h:
+
+    - Bit 0 is set if the file is open for writing (`H5F_SUPER_WRITE_ACCESS`)
+    - Bit 2 is set if the file is open for SWMR writing (`H5F_SUPER_SWMR_WRITE_ACCESS`)
+
+    We check these superblock flags on file open and error out if they are
+    unsuitable.
+
+    - If the file is already opened for non-SWMR writing, no other process can open
+      it.
+    - If the file is open for SWMR writing, only SWMR readers can open the file.
+    - If you try to open a file for reading with `H5F_ACC_SWMR_READ` set and the
+      file does not have the SWMR writer bits set in the superblock, the open
+      call will fail.
+
+    This scheme is often confused with the file locking, so it's included here,
+    even though it's a bit tangential to the locks themselves.
+
+5. If the file is open for SWMR writing (`H5F_ACC_SWMR_WRITE` is set), we
+   remove the file lock just before the open call completes.
+
+6. We normally don't explicitly unlock the file on file close. We let the OS
+   handle it when the file descriptors are closed since file locks don't
+   normally surivive closing the underlying file descriptor.
+
+**TL;DR**
+
+When locks are available, HDF5 files will be exclusively locked while they are
+in use. The exception to this are files that are opened for SWMR writing, which
+are unlocked. Files that are open for any kind of writing get a "writing"
+superblock mark that HDF5 1.10.0+ will respect and refuse to open outside of SWMR.
+
+## `H5Fstart_swmr_write()`
+
+This API call can be used to switch an open file to "SWMR writing" mode as
+if it had been opened with the `H5F_ACC_SWMR_WRITE` flag set. This is used
+when code needs to perform SWMR-forbidden operations like creating groups
+and datasets before appending data to datasets using SWMR.
+
+Most of the work of this API call involves flushing out the library caches
+in preparation for SWMR access, but there are a few locking operations that
+take place under the hood:
+
+- The file's superblock is marked as in the SWMR writer case, above.
+- For a brief period of time in the call, we convert the exclusive lock to
+  a shared lock. It's unclear why this was done and we'll look into removing
+  this.
+- At the end of the call, the lock is removed, as in the SWMR write open
+  case described above.
+
+## Disabling the locks
+
+There are several ways to disable the locks, depending on which version of the
+HDF5 library you are working with. This section will describe the file lock
+disable schemes as they exist in late 2022. The current library versions at
+this time are 1.10.9, 1.12.3, and 1.13.2. File locks are not present in HDF5
+1.8. The lock feature matrix later in this document will describe the
+limitations of earlier versions.
+
+### Configure option
+
+You can set the file locking defaults at configure time. This sets the defaults
+for the associated properties in the fapl. Users can override the configure
+defaults using `H5Pset_file_locking()` or the `HDF5_USE_FILE_LOCKING`
+environment variable.
+
+- Autotools
+
+    `--enable-file-locking=(yes|no|best-effort)` sets the file locking behavior.
+    `on` and `off` should be self-explanatory. `best-effort` turns file locking
+    on but ignores file locks when they are disabled (default: `best-effort`).
+
+- CMake
+
+    - set `IGNORE_DISABLED_FILE_LOCK` to `ON` to ignore file locks when they
+      are disabled on the file system (default: `ON`).
+    - set `HDF5_USE_FILE_LOCKING` to `OFF` to disable file locks (default: `ON`)
+
+### `H5Pset_file_locking()`
+
+This API call can be used to override the configure defaults. It takes
+`hbool_t` parameters for both the file locking and "ignore file locks when
+disabled on the file system" parameters. The values set here can be
+overridden by the file locking environment variable.
+
+There is a corresponding `H5Pget_file_locking()` call that can be used to check
+the currently set values of both properties in the fapl. **NOTE** that this
+call just checks the property list values. It does **NOT** check the
+environment variables!
+
+### Environment variables
+
+The `HDF5_USE_FILE_LOCKING` environment variable overrides all other file
+locking settings.
+
+HDF5 1.10.0
+- No file locking environment variable
+
+HDF5 1.10.1 - 1.10.6, 1.12.0:
+- `FALSE` turns file locking off
+- Anything else turns file locking on
+- Neither of these values ignores disabled file locks
+- Environment variable parsed at file create/open time
+
+HDF5 1.10.7+, 1.12.1+, 1.13.x:
+- `FALSE` or `0` disables file locking
+- `TRUE` or `1` enables file locking
+- `BEST_EFFORT` enables file locking and ignores disabled file locks
+- Anything else gives you the defaults
+- Environment variable parsed at library startup
+
+### Lock disable scheme interactions
+
+As mentioned above and reiterated here:
+- Configure-time settings set fapl defaults
+- `H5Pset_file_locking()` overrides configure-time defaults
+- The environment variable setting overrides all
+
+If you want to check that file locking is on, you'll need to check the fapl
+setting AND check the environment variable, which can override the fapl.
+
+**!!! WARNING !!!**
+
+Disabling the file locks is at your own risk. If more than one writer process
+modifies an HDF5 file at the same time, the file could be corrupted. If a
+reader process reads a file that is being modified by a writer, the writer
+process might attempt to read garbage and encounter errors or even crash.
+
+In the case of:
+
+- A single process accessing a file with write access
+- Any number of processes accessing a file read-only
+
+You can safely disable the file locking scheme.
+
+If you are trying to set up SWMR without the benefit of the file locks, you'll
+just need to be extra careful that you hold to rules for SWMR access.
+
+## Feature Matrix
+
+The following table indicates which versions of the library support which file
+lock features. 1.13.0 and 1.13.1 are experimental releases (basically glorified
+release candidates) so they are not included here.
+
+**Locks**
+
+- P = POSIX locks only, Windows was a no-op that always succeeded
+- WP = POSIX and Windows locks
+- (-) = POSIX no-op lock fails
+- (+) = POSIX no-op lock passes
+
+**Configure Option and Environment Variable**
+
+- on/off = sets file locks on/off
+- try = can also set "best effort", where locks are on but ignored if disabled
+
+|Version|Has locks|Configure option|`H5Pset_file_locking()`|`HDF5_USE_FILE_LOCKING`|
+|-------|---------|----------------|-----------------------|-----------------------|
+|1.8.x|No|-|-|-|
+|1.10.0|P(-)|-|-|-|
+|1.10.1|P(-)|-|-|on/off|
+|1.10.2|P(-)|-|-|on/off|
+|1.10.3|P(-)|-|-|on/off|
+|1.10.4|P(-)|-|-|on/off|
+|1.10.5|P(-)|-|-|on/off|
+|1.10.6|P(-)|-|-|on/off|
+|1.10.7|P(+)|try|Y|try|
+|1.10.8|WP(+)|try|Y|try|
+|1.10.9|WP(+)|try|Y|try|
+|1.12.0|P(-)|-|-|on/off|
+|1.12.1|WP(+)|try|Y|try|
+|1.12.2|WP(+)|try|Y|try|
+|1.13.2|WP(+)|try|Y|try|
+
+
+## Appendix: File lock implementation
+
+The file lock system is implemented with `flock(2)` as the archetype since it
+has simple semantics and we don't need range locking. Locks are advisory on many
+systems, but this shouldn't be a problem for most users since the HDF5 library
+always respects them. If you have a program that parses or modifies HDF5 files
+independently of the HDF5 library, you'll want to be mindful of any potential
+for concurrent access across processes.
+
+On Unix systems, we call `flock()` directly when it's available and pass
+`LOCK_SH` (shared lock), `LOCK_EX` (exclusive lock), and `LOCK_UN` (unlock) as
+described in the algorithm section. All locks are non-blocking, so we set the
+`LOCK_NB` flag. Sadly, `flock(2)` is not POSIX and it doesn't lock files over
+NFS. We didn't consider a lack of NFS support a problem since SWMR isn't
+supported on networked file systems like NFS (write order preservation isn't
+guaranteed) and `flock(2)` usually doesn't fail when you attempt to lock NFS
+files.
+
+On Unix systems without `flock(2)`, we implement a scheme based on `fcntl(2)`
+(`Pflock()` in `H5system.c`). On these systems we use `F_SETLK` (non-blocking)
+as the operation and set `l_type` in `struct flock` to be:
+
+- `F_UNLOCK` for `LOCK_UN`
+- `F_WRLOCK` for `LOCK_EX`
+- `F_RDLOCK` for `LOCK_SH`
+
+We set the range to be the entire file. Most Unix-like systems have `flock()`
+these days, so this system probably isn't very well tested.
+
+We don't use `fcntl`-based open file locks or mandatory locking anywhere. The
+former scheme is non-POSIX and the latter is deprecated.
+
+On Windows, we use `LockFileEx()` and `UnlockFileEx()` to lock the entire file
+(`Wflock()` in `H5system.c`). We set `LOCKFILE_FAIL_IMMEDIATELY` to get
+non-blocking locks and set `LOCKFILE_EXCLUSIVE_LOCK` when we want an exclusive
+lock. SWMR isn't well-tested on Windows, so this scheme hasn't been as
+thoroughly vetted as the `flock`-based scheme.
+
+On non-Windows systems where neither `flock(2)` nor `fcntl(2)` is available,
+we substitute a no-op stub that always succeeds (`Nflock()` in `H5system.c`).
+In the past, the stub always failed (see the matrix for when we made the switch).
+We currently know of no non-Windows systems where neither call is available
+so this scheme is not well-tested.
+
+One thing that should be immediately apparent to anyone familiar with file
+locking, is that all of these schemes have subtly different semantics. We're
+using file locking in a fairly crude manner, though, and lock use has always
+been optional, so we consider this a lower-order concern.
+
+Locks are implemented at the VFD level via `lock` and `unlock` callbacks. The
+VFDs that implement file locks are: core (w/ backing store), direct, log, sec2,
+and stdio (`flock(2)` locks only). The family, multi, and splitter VFDs invoke
+the lock callback of their underlying sub-files. The onion and MPI-IO VFDs do NOT
+use locks, even though they create normal, on-disk native HDF5 files. The
+read-only S3 VFD and HDFS VFDs do not use file locking since they use
+alternative storage schemes.
+
+Lock failures are detected by checking to see if `errno` is set to `ENOSYS`.
+This is not particularly sophisticated and was implemented as a way of working
+around disabled locks on popular parallel file systems.
+
+One other thing to note here is that, in all of the locking schemes we use, the
+file locks do not survive process termination, so you don't have to worry
+about files being locked forever if a process exits abnormally. If a writer
+crashed and the library didn't clear the superblock mark, you can remove it with
+the h5clear command-line tool, which is built with the library.
diff --git a/doc/getting-started-with-hdf5-development.md b/doc/getting-started-with-hdf5-development.md
new file mode 100644
index 0000000..732d817
--- /dev/null
+++ b/doc/getting-started-with-hdf5-development.md
@@ -0,0 +1,866 @@
+# Getting Started with HDF5 Development
+
+## Introduction
+
+The purpose of this document is to introduce new HDF5 developers to some of the
+quirks of our source code. It's not a style guide (see the forthcoming HDF5
+style guide for that), but instead describes the most commonly encountered
+features that are likely to trip up someone who has never worked with the HDF5
+source code before.
+
+Corrections and suggestions for improvement should be handled via GitHub pull
+requests and issues.
+
+## Getting started
+
+### Building the library for development
+
+You don't really need special configuration settings for building the library
+as a developer.
+
+Some tips that may be useful:
+
+* Building in debug mode will turn on additional checks in many packages.
+  You'll probably want to start coding in debug mode.
+* You can turn symbols on independently of debug/production mode.
+* If you will be looking at memory issues via tools like valgrind, you will
+  need to turn off the free lists, which recycle memory so we can avoid
+  calling malloc/free. This is done using the `--enable-using-memchecker`
+  configure option. Some developers build with this all the time, as the
+  memory recyclilng can hide problems like use-after-free.
+* You can enable developer warnings via `--enable-developer-warnings`. These
+  warnings generate a lot of noise, but the output can occasionally be useful.
+  I probably wouldn't turn them on all the time, though, as they can make it
+  harder to spot warnings that we care about.
+* You can set warnings as errors. We have an older scheme that does this for
+  a subset of errors or you can simply specify `-Werror`, etc. as a part of
+  `CFLAGS`. Configure is smart enough to strip it out when it runs configure
+  checks. We build the C library with -Werror on GitHub, so you'll need to fix
+  your warnings before creating a pull request.
+* CMake has a developer mode that turns most these settings on.
+
+
+### Branches
+
+Please see `doc/branches-explained.md` for an explanation of our branching strategy.
+
+For new small features, we have developers create feature branches in their own
+repositories and then create pull requests into the canonical HDF5 repository.
+For larger work, especially when the work will be done by multiple people, we
+create feature branches named `feature/<feature>`. If work stops on a feature
+branch, we rename it to `inactive/<feature>`.
+
+If you create a feature branch in the canonical HDFGroup repository, please
+create a `BRANCH.md` text file in the repository root and explain:
+
+* The branch's purpose
+* Contact info for someone who can tell us about the branch
+* Clues about when the branch will be merged or can be considered for retirement
+
+The purpose of this document is to avoid orphan branches with no clear
+provenance.
+
+
+### Pull requests
+
+The process of creating a pull request is explained in `CONTRIBUTING.md`.
+
+
+## A brief tour of the source code
+
+Here's a quick guide to where you can find things in our source tree. Some of these directories have README.md files of their own.
+
+`bin/`
+Scripts we use for building the software and misc. tools.
+
+`c++/`
+Source, tests, and examples for the C++ language wrapper.
+
+`config/`
+Configuration files for both the Autotools and CMake.
+
+`doc/`
+Miscellaneous documents, mostly in markdown format.
+
+`doxygen/`
+Mainly Doxygen build files and other top-level Doxygen things. The Doxygen content is spread across the library's header files but some content can be found here when it has no other obvious home.
+
+`examples/`
+C library examples. Fortran and C++ examples are located in their corresponding wrapper directory.
+
+`fortran/`
+Source, tests, and examples for the Fortran language wrapper.
+
+`hl/`
+Source, tests, and examples for the high-level library.
+
+`java/`
+Source, tests, and examples for the JNI language wrapper and the corresponding OO Java library.
+
+`m4/`
+m4 build scripts used by the Autotools. CMake ignores these.
+
+`release_docs/`
+Install instructions and release notes.
+
+`src/`
+Source code for the C library.
+
+`test/`
+C library test code. Described in much more detail below.
+
+`testpar/`
+Parallel C library test code. Described in much more detail below.
+
+`tools/`
+HDF5 command-line tools code, associated tools tests, and the input test files.
+
+`utils/`
+Small utility programs that don't belong anywhere else.
+
+
+## General Things
+
+### Necessary software
+
+In order to do development work on the HDF5 library, you will need to have
+a few things available.
+
+* A C99-compatible C compiler (MSVC counts). C11 is required to build the subfiling feature.
+* Either CMake or the Autotools (Autoconf, Automake, libtool)
+* Perl is needed to run some scripts, even on Windows
+* A C++11-compatible compiler if you want to build the C++ wrappers
+* A Fortran 2003-compatible compiler if you want to build the Fortran wrappers
+* A Java 8-compatible compiler if you want to build the Java wrappers
+* flex/lex and bison/yacc if you want to modify the high-level parsers
+* A development version of zlib is necessary for zlib compression
+* A development version of szip is necessary for szip compression
+* An MPI-3 compatible MPI library must be installed for parallel HDF5 development
+* clang-format is handy for formatting your code before submission to GitHub. The formatter will automatically update your PR if it's mis-formatted, though, so this isn't strictly necessary.
+* codespell is useful to identify spelling issues before submission to GitHub. The codespell action won't automatically correct your code, but it will point out spelling errors, so this also isn't strictly necessary.
+
+These are the requirements for working on the develop branch. Maintenance
+branches may relax the required versions somewhat. For example, HDF5 1.12 and
+earlier only require C++98.
+
+Certain optional features may require additional libraries to be installed. You'll need curl and some S3 components installed to build the read-only S3 VFD, for example.
+
+### Platform-independence
+
+HDF5 assumes you have a C99 compiler and, to a certain extent, a POSIX-like
+environment (other languages will be discussed later). On most operating systems
+in common use, this will be a reasonable assumption. The biggest exception to
+this has been Windows, which, until recently, had poor C99 compliance and spotty
+POSIX functionality. To work around differences in platforms and compilers,
+we've implemented a compatibility scheme.
+
+Unlike most codebases, which test for features and inject their own normal-looking
+functions when there are deficiencies, HDF5 uses a scheme where we prefix all
+C and POSIX calls with `HD` (e.g., `HDmalloc`). The `H5private.h` header handles
+most of the fixup for Unix-like operating systems and defines the HD replacements.
+For Windows, we first parse the `H5win32defs.h` file, which maps missing Windows
+and MSVC functionality to POSIX and C99 calls. `H5private.h` tests for previously
+defined HD calls and skips redefining it if it already exists. H5system.c
+includes Windows glue code as well as a few functions we need to paper over
+differences in Unix-like systems.
+
+One thing to keep in mind when looking at our platform-independence layer is
+that it is quite old, having been authored when the Unix world was much more
+fragmented and C99 was uncommon. We've slowly been reworking it as POSIX has
+standardized and C99 become widespread.
+
+Another thing to keep in mind is that we're fairly conservative about deprecating
+support for older platforms and compilers. There's an awful lot of ancient
+hardware that requires HDF5, so we try to only make major changes to things
+like language requirements when we increment the major version (minor version
+prior to HDF5 2.0).
+
+### C99
+
+We assume you have a C99 compiler. Subfiling uses some C11 features, but that is
+compiled on demand and we are not moving that requirement to the rest of the
+library. All modern compilers we've tested can handle HDF5's C99 requirements,
+even Microsoft's. In the future, we'll remove the `HD` prefixes from all standard
+C library calls.
+
+One quirk of HDF5's age, is the `hbool_t` type, which was created before C99
+Booleans were widespread and which uses `TRUE` and `FALSE` macros for its values
+instead of C99's `true` and `false`. We plan to switch this over to C99's Boolean
+types sometime in the near future.
+
+### POSIX
+
+We assume basic POSIX.1-2008 functionality is present. When a POSIX (or common Unix)
+function is missing on a popular platform, we implement a shim or macro
+in `H5private.h` and/or `H5system.c`. Systems that need a lot of help, like
+Windows, have gotten special headers in the past (e.g., `H5win32defs.h`) but
+now that most platforms implement the POSIX and C99 functionality we need, these
+special headers are less necessary.
+
+### Threads
+
+Thread-safety was originally implemented using Pthreads, with Win32 support
+bolted on later. No other thread libraries are supported. The subfiling
+feature uses multiple threads under the hood, but that's out of scope for
+an introductory document. Thread-related code is largely confined to the `H5TS`
+files, where we define HDF5-specific primitives and then map Pthread or Win32
+implementations onto them.
+
+### C++
+
+The C++ Wrappers require C++11. We generally only require the rule of three
+for the classes.
+
+### Fortran
+
+The Fortran wrappers require Fortran 2003.
+
+### Java
+
+The Java wrappers require Java 8.
+
+### Warning suppression
+
+In the rare cases where we've decided to suppress a warning, we have a set
+of function-like macros that we use for that. They are located in `H5private.h`
+and have the form `H5_<compiler>_DIAG_(OFF|ON)` and take the name of the warning
+they are suppressing as a parameter. They were originally designed for gcc and
+extended to clang. They have not been updated for other compilers. Instead,
+we have plans to revamp the macro system to be more generic and extensible.
+
+We try to configure the compilers we use the most for maximum grumpiness and
+then fix all the warnings we can. Please don't use the warning suppression
+macros in lieu of actually fixing the underlying problems.
+
+## Build Systems
+
+We support building the library with both the Autotools and CMake. We'd like to
+eventually move to only having one build system, which would be CMake since
+the Autotools don't really support Windows, but that seems unlikely to happen
+anytime soon. With few exceptions, any new feature, test, or configure
+option should be supported in both build systems.
+
+The particulars of the build systems can be found in the `config` directory
+and its subdirectories.
+
+## Working in the library
+
+### Anatomy of an HDF5 API call
+
+HDF5 API calls have a uniform structure imposed by our function enter/leave and
+error handling schemes. We currently stick to this boilerplate for ALL
+functions, though this may change in the future. The general boilerplate varies
+slightly between internal and public API calls.
+
+Here's an example of an internal API call:
+
+```c
+/*
+ * Function comments of dubious value
+ */
+herr_t
+H5X_do_stuff(/*parameters*/)
+{
+	/* variables go here */
+	void *foo = NULL;
+	herr_t ret_value = SUCCEED;
+
+	FUNC_ENTER_NOAPI(FAIL)
+
+	HDassert(/*parameter check*/);
+
+	if (H5X_other_call() < 0)
+		HGOTO_ERROR(H5E_MAJ, H5E_MIN, FAIL, "badness")
+
+done:
+	if (ret_value < 0)
+		/* do error cleanup */
+	/* do regular cleanup stuff */
+
+	FUNC_LEAVE_NOAPI(ret_value);
+}
+```
+
+There are a couple of things to note here.
+
+* Each function call has a header comment block. The information you'll find in
+  most function comments is not particularly helpful. We're going to improve the
+  format of this. 
+* Most functions will return `herr_t` or `hid_t` ID. We try to avoid other
+  return types and instead use out parameters to return things to the user.
+* The name will be of the form `H5X_do_something()` with one or two underscores
+  after the `H5X`. The naming scheme will be explained later.
+* Even though C99 allows declarations anywhere in the function, we put most of
+  them at the top of the file, with the exception of loop variables and
+  variables that are "in scope" inside an ifdef.
+* We generally initialize values that may need to be freed or otherwise cleaned
+  up to a "bad" value like `NULL` or `H5I_INVALID_HID` so we can better clean up
+  resources on function exit, especially when there have been errors.
+* Most non-void functions will declare a variable called `ret_value`. This is
+  used by the error handling macros. It's usually the last thing declared in
+  the variable block.
+* Every function starts with a `FUNC_ENTER macro`, discussed later in this
+  document.
+* Most internal calls will check parameters via asserts.
+* We check the return value of any call that can return an error, using the form
+  shown.
+* On errors, an error macro is invoked. These are described later in this
+  document.
+* Any function that returns an error will have a `done` target. Most error
+  macros jump to this location on errors.
+* We do most cleanup at the end of the function, after the `done` target. There
+  are special `DONE` flavors of error macro that we use in post-`done` cleanup
+  code to detect and report errors without loops.
+* Almost every function ends with a `FUNC_LEAVE` macro.
+
+And here's an example of a public API call:
+
+```c
+/*
+ * Doxygen stuff goes here
+ */
+herr_t
+H5Xdo_api_stuff(/*parameters*/)
+{
+	/* variables go here */
+	herr_t ret_value = SUCCEED;
+
+	FUNC_ENTER_API(FAIL)
+	H5TRACE3(/*stuff*/)
+
+	if (/*parameter check*/)
+		HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "badness")
+
+	/* VOL setup */
+
+	if (H5VL_call() < 0)
+		HGOTO_ERROR(H5E_FOO, H5E_BAR, FAIL, "badness")
+
+done:
+	if (ret_value < 0)
+		/* do error cleanup */
+	/* do regular cleanup stuff */
+
+	FUNC_LEAVE_API(ret_value);
+}
+
+```
+
+A public API call differs little from an internal call. The biggest differences:
+
+* Public API calls are commented using Doxygen. This is how we generate the
+  reference manual entries.
+* The name will have the form `H5Xdo_stuff()`, with no underscores after the `H5X`.
+* The function enter macro is `FUNC_ENTER_API` (or similar). Under the hood, this
+  one differs quite a bit from an internal function enter macro. It checks for
+  package initialization, for example, and acquires the global lock in thread-safe HDF5.
+* There is a `TRACE` macro. This helps with API tracing and is applied by a
+  script invoked by `autogen.sh` (Autotools) or CMake. You probably don't need
+  to worry much about this.
+* Parameter checking uses the regular HDF5 error scheme and invokes 
+  `HGOTO_ERROR` macros on errors.
+* In storage-related calls, there will usually be some VOL setup (HDF5 1.12.x
+  and later) and in lieu of a regular internal API call, there will be an `H5VL`
+  VOL call.
+* The function exit macro will be `FUNC_LEAVE_API` (or similar). This is where
+  we release the global thread-safe lock, etc.
+
+
+### Public, private, package
+
+HDF5 is divided into _packages_, which encapsulate related functionality. Each
+has a prefix of the form `H5X(Y)`. An example is the dataset package, which has
+the prefix `H5D`. Hopefully, you are familiar with this from the public API. In
+addition to the public packages, we all know and love, there are many internal
+packages that are not visible to the public via API calls, like `H5FL` (free
+lists / memory pools) and `H5B2` (version 2 B-trees). There's also an `H5`
+package that deals with very low-level things like library startup.
+
+API calls, types, etc. in HDF5 have three levels of visibility. From most to
+least visible, these are:
+
+* Public
+* Private
+* Package
+
+**Public** things are in the public API. They are usually found in `H5Xpublic.h`
+header files. API calls are of the form `H5Xfoo()`, with no underscores between
+the package name and the rest of the function name.
+
+**Private** things are for use across the HDF5 library, and can be used outside the packages
+that contain them. They collectively make up the "internal library API". API
+calls are of the form `H5X_foo()` with one underscore between the package
+name and the rest of the function name.
+
+**Package** things are for use inside the package and the compiler will
+complain if you include them outside of the package they belong to. They
+collectively make up the "internal package API". API calls are of the form
+`H5X__foo()` with *two* underscores between the package name and the rest of the
+function name. The concept of "friend" packages exists and you can declare this
+by defining `<package>_FRIEND` in a file. This will let you include the package
+header from a package in a file that it is not a member of. Doing this is
+strongly discouraged, though. Test functions are often declared in package
+headers as they expose package internals and test programs can include
+multiple package headers so they can check on internal package state.
+
+Note that the underscore scheme is primarily for API calls and does not extend
+to things like types and symbols. Another thing to keep in mind is that the
+difference between package and private API calls can be somewhat arbitrary.
+We're hoping to improve the coherence of the internal APIs via refactoring.
+
+
+### Function enter and leave macros
+
+Function enter and leave macros are added to almost all HDF5 API calls. This is
+where we set up error handling (see below) and things like the thread-safety
+global lock (in public API calls). There are different flavors depending on the
+API call and it's very important that they are appropriate for the function they
+mark up.
+
+The various combinations you are most likely to encounter:
+
+|Macro|Use|
+|-----|---|
+|`FUNC_ENTER_API`|Used when entering a public API call|
+|`FUNC_ENTER_NOAPI`|Used when entering a private API call|
+|`FUNC_ENTER_PACKAGE`|Used when entering a package API call|
+
+There are also `_NO_INIT` flavors of some of these macros. These are usually
+small utility functions that don't initialize the library, like
+`H5is_library_threadsafe()`. They are uncommon.
+
+You may also come across `_NO_FS` ("no function stack") flavors that don't push
+themselves on the stack. These are rare.
+
+For the most part, you will be using the `API`, `NOAPI`, and `PACKAGE` macros.
+
+You may see other versions if you are working in a maintenance branch, like the
+`STATIC` macros that we removed in 1.13. We've been working to reduce the
+complexity and number of these macros and we don't always push that downstream
+due to the scope of the changes involved. You should be able to figure out what
+any new macros do based on what you've seen here, though.
+
+### Error macros
+
+Almost all HDF5 functions return an error code, usually -1 or some typedef'd
+equivalent. Functions that return `void` should be avoided, even if the function
+cannot fail. Instead, return an `herr_t` value and always return `SUCCEED`.
+
+|Type|Error Value|
+|----|-----------|
+|`herr_t`|`FAIL`|
+|any signed integer type|-1|
+|`hid_t`|`H5I_INVALID_HID`|
+|`htri_t`|`FAIL`|
+|`haddr_t`|`HADDR_UNDEF`|
+|pointer|`NULL`|
+
+We've been trying to move away from using anything other than `herr_t` or `hid_t`
+to return errors, as eliminating half of a variable's potential values just so
+we can return a 'bad' value on errors seems unwise in a library that is
+designed to scale.
+
+`herr_t` is a typedef'd signed integer. In the library, we only define two
+values for it: `SUCCEED` and `FAIL`, which are defined to 0 and -1, respectively,
+in `H5private.h`. We do not export these values, so public API calls just note
+that `herr_t` values will be negative on failure and non-negative on success.
+
+Most of the error handling is performed using macros. The only extra setup you
+will have to do is:
+
+1. Create a variable named `ret_value` with the same type
+as the return value for the function. If the type is `herr_t` it is frequently
+set to `SUCCEED` and will be set to `FAIL` on errors. In most other cases,
+the value is initialized to the 'bad' value and the function's code will set
+`ret_value` to a 'good' value at some point, with errors setting it back to
+the 'bad' value.
+
+2. Create a done target (`done:`) just before you start your error cleanup.
+This will be the point to which the error macros will jump.
+
+We check for errors on almost all internal lines of C code that could putatively
+fail. The general format is this:
+
+```c
+if (function_that_could_fail(foo, bar) < 0)
+    HGOTO_ERROR(H5E_<major>, H5E_<minor>, <bad value>, "tell me about badness")
+```
+
+`HGOTO_ERROR` is one of a set of macros defined in `H5Eprivate.h`. This macro
+pops an error on the error stack and sets the return value to `<bad value>`,
+then jumps to the `done:` target.
+
+Major and minor codes are a frequent cause of confusion. A full list of them
+can be found in `H5err.txt`, which is processed into the actual error header
+files at configure time by the `bin/make_err` script. The original intent was for major and minor error
+codes to be strongly associated. i.e., a given minor code would *only* be used
+with its associated major code. Unfortunately, this has not been the case in
+practice, and the emitted text can appear nonsensical in error
+stack dumps. Even worse, the major and minor error codes are used inconsitently
+throughout the library, making interpreting them almost impossible for
+external users. We hope to address this deficiency in the near future.
+
+In the meantime, the following guidelines can be helpful:
+
+1. Use `H5E_ARGS` as the major error category when parsing function parameters. The minor code will usually be `H5E_BADVALUE`, `H5E_BADRANGE`, or `H5E_BADTYPE`.
+2. Otherwise use the same major code throughout the source file. There is almost a 1-1 correspondence between packages and major error codes.
+3. Pick the minor code that seems to match the API call. You can grep through the library to find similar uses.
+4. The string at the end of the `HGOTO_ERROR` macro is much more important, so make sure that is helpful
+
+You will still sometimes see the major error code match the package of a failing
+function call. We're trying to fix those as we come across them.
+
+Since the `HGOTO_ERROR` macro jumps to the `done:` target, you can't use it
+after the `done:` target without creating a loop. Instead, you'll need to use
+the `HDONE_ERROR` macro, which will handle errors without jumping to the target.
+Instead, processing will continue after pushing the error and setting the
+return value, in the hopes that we can clean up as much as possible.
+
+At the end of the function, the `FUNC_LEAVE` macro will return `ret_value`.
+
+### Trace macros
+
+These are automatically generated for public C library API calls by the
+`bin/trace` script, which scans the source code, looking for functions of the
+form `H5X(Y?)<whatever>()`, to which it will add or update the `H5TRACE` macros.
+
+`H5TRACE` macros are only added to public C library API calls. They are NOT
+added to the language wrappers, tools code, high-level library, etc.
+
+You should never have to modify an `H5TRACE` macro. Either point `bin/trace` at
+your source file or run `autogen.sh` (which runs `bin/trace` over the C files
+in `src`). `bin/trace` is a Perl script, so you'll need to have that available.
+
+
+### Memory - `H5MM` and `H5FL`
+
+In the C library itself, we use `H5MM` and `H5FL` calls to allocate and free
+memory instead of directly using the standard C library calls.
+
+The `H5MM` package was originally designed so that it would be easy to swap in a
+memory allocator of the developer's choosing. In practice, this has rarely
+been a useful feature, and we are thinking about removing this scheme. In
+the meantime, almost all memory allocations in the C library will use the
+`H5MM` (or `H5FL`) package.
+
+In the past, we added memory allocation sanity checking to the `H5MM` calls
+which added heap canaries to memory allocations and performed sanity checking
+and gathered statistics. These were turned on by default in debug builds
+for many years. Unfortunately, there is interplay between library-allocated
+and externally-allocated memory in the filter pipeline where the heap canaries
+can easily get corrupted and cause problems. We also have some API calls that
+return library-allocated memory to the user, which can cause problems if they
+then use `free(3)` to free it. Given these problems, we now have the sanity
+checks turned off by default in all build modes. You can turn them back on via
+configure/CMake options, but it's normally easier to use external tools like
+valgrind or the compiler's memory debugging options.
+
+`H5FL` provides memory pools (*Free Lists*) that create a set of fixed-size allocations
+of a certain type that the library will re-use as needed. They use `H5MM` calls
+under the hood and can be useful when the library creates and frees a lot of
+objects of that type. It's difficult to give a good guideline as to when to use
+the `H5FL` calls and when to use the `H5MM` calls, but it's probably best to
+lean towards `H5MM` unless you can identify a clear performance hit due to
+memory cycling. Current library usage can be a good guide, but keep in mind that
+the free lists are probably overused in the library. Another thing to keep in
+mind is that the free lists can hide memory errors, like use-after-free. Some
+developers always turn them off and you'll need to turn them off when running
+memory checkers like valgrind.
+
+Using free list calls differs little from using `H5MM` calls. There are
+equivalents for `malloc(3)`, `calloc(3)`, and `free(3)`:
+
+| C Library|`H5FL`|
+|----------|------|
+|`malloc`|`H5FL_MALLOC`|
+|`calloc`|`H5FL_CALLOC`|
+|`free`|`H5FL_FREE`|
+
+Since free lists provide pre-allocated memory of a fixed size, you can't
+reallocate free list memory and there's no `H5FL` `realloc(3)` equivalent.
+
+You'll also need to add a setup macro to the top of the file. There are a few
+flavors defined in `H5FLprivate.h`. Each creates global free list variables,
+so there are flavors for extern, static, etc.
+
+|Macro|Purpose|
+|-----|-------|
+|`H5FL_DEFINE`|Define a free list that will be used in several files|
+|`H5FL_EXTERN`|Define a free list that was defined in another file|
+|`H5FL_DEFINE_STATIC`|Define a free list that will only be used in this file|
+
+You will also see `ARR`, `BLK`, `SEQ`, and `FAC` flavors of the macros. Their
+use is beyond the scope of a guide for beginners.
+
+## Testing
+
+### Two macro schemes
+
+The HDF5 C library is tested via a collection of small programs in the `test/`
+directory. There are a few schemes in use:
+
+- `testhdf5` - A larger, composite test program composed of several test files, most of which start with 't' (e.g., `tcoords.c`)
+- Shell/Powershell scripts that test things like SWMR and flush/refresh behavior. These scripts run small sub-programs.
+- Everything else. These are self-contained test programs that are built and run independently by the test harness.
+
+
+The test programs do not use a standard test framework like cppunit, but instead
+use HDF5-specific macros to set up the tests and report errors. There are two
+sets of macros, one in `testhdf5.h` and another in `h5test.h`.
+Originally, the `testhdf5` programs used the macros in `testhdf5.h` and everything
+else used the macros in `h5test.h`, but over time the tests have evolved so that
+all tests usually include both headers.
+
+This is unfortunate, because it's very important to not mix up the "test framework
+macros" in each scheme. The `testhdf5.h` macros register errors by setting global
+variables and normally continue with the test when they encounter errors. The
+`h5test.h` macros indicate errors by jumping to an error target and returning
+a `FAIL` `herr_t` value. If you combine these two macro sets, you may
+accidentally create tests that fail but do not register the failure.
+
+We are aware that our testing scheme needs some work and we'll be working to
+improve it over the next year or so.
+
+The command-line tools are tested using a different scheme and are discussed elsewhere.
+
+### `testhdf5.h`
+
+The macros in this file are almost exclusively used in the `testhdf5` program.
+They register errors by incrementing a global error count that is inspected at
+the end of each test (not each test *function*, but each *test* - e.g., after
+`test_file()` in `tfile.c` runs, but not when the individual functions it
+calls run).
+
+Test functions generally look like this:
+
+```c
+static void
+test_something()
+{
+    /* Variables go here */
+    int out = -1;
+    herr_t ret;
+
+    MESSAGE(5, ("Testing a thing\n"));
+
+    ret = H5Xsome_api_call(&out);
+    CHECK(ret, FAIL, "H5Xsome_api_call()");
+    VERIFY(out, 6, "incorrect value for out");
+}
+
+```
+
+The `MESSAGE` macro just dumps the name of what we're testing when we've the
+verbosity cranked up. The confusingly-named `CHECK` and `VERIFY` macros are
+members of a suite of check macros in `testhdf5.h`. `CHECK` macros check to
+see if a variable is **NOT** a value, `VERIFY` macros check to see if a variable
+**IS** a value. There are different flavors of macro to match different types
+so be sure to use the right one to avoid compiler warnings and spurious errors.
+Under the hood, these macros will emit error information and increment the
+global error variables.
+
+Tests are added to `testhdf5` in `testhdf5.c` using the `AddTest()` call. 
+Each test will have a driver function, usually named something like `test_<thing>()`
+that invokes the test functions in the file.
+Most tests will cleanup their files using a `cleanup_<thing>()` call. If you are
+deleting HDF5 files, you should use `H5Fdelete()` instead of `remove(3)` so
+that files can be cleaned even when they use alternative VFDs or VOL connectors.
+You'll also need to add prototypes for any new test driver or cleanup functions
+to `testhdf5.h`.
+
+Because these macros interact with global variables that are only used in the
+testhdf5 program, they are useless anywhere else in the library. Even worse, it
+will *look* like you are testing functionality, but errors will not be picked
+up by the non-testhdf5 programs, hiding problems.
+
+### `h5test.h`
+
+These are the most commonly used macros and are used throughout the test code,
+even in places that are not specifically tests. Unlike the scheme used in
+the `testhdf5` program, these macros work more like the library, jumping to
+an `error:` target on errors. There is no common `ret_value` variable, however.
+
+Test functions will usually look like this:
+
+```c
+static herr_t
+test_something()
+{
+    hid_t fapl_id = H5I_INVALID_HID;
+    hid_t fid = H5I_INVALID_HID;
+    char filename[1024];
+    int *buf = NULL;
+
+    TESTING("Testing some feature");
+
+    if ((fapl_id = h5_fileaccess()) < 0)
+        TEST_ERROR;
+    h5_fixname(FILENAME[0], fapl, filename, sizeof(filename));
+
+    if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id)) < 0)
+        TEST_ERROR;
+
+    /* Many more calls here */
+
+    PASSED();
+    return SUCCEED;
+
+error:
+
+    HDfree(buf);
+
+    H5E_BEGIN_TRY
+    {
+        H5Fclose(fid);
+    }
+    H5E_END_TRY;
+
+    return FAIL;
+}
+```
+
+Tests begin with a `TESTING` macro that emits some text (unlike the `testhdf5`
+case, this is always dumped). Any errors will be handled by one of the
+`TEST_ERROR` macros. For the most part, `TEST_ERROR` will suffice, but there
+are others in `h5test.h` if you want to emit custom text, dump the HDF5 error
+stack when it would not normally be triggered, etc.
+
+Most tests will be set up to run with arbitrary VFDs. To do this, you set the
+fapl ID using the `h5_fileaccess()` function, which will check the `HDF5_DRIVER`
+environment variable and set the fapl's VFD accordingly. The `h5_fixname()`
+call can then be used to get a VFD-appropriate filename for the `H5Fcreate()`,
+etc. call.
+
+In the `error` section, we clean up resources and return a 'bad' value, which
+will usually either be `FAIL` or -1.
+
+The `main()` function of each test program will usually start out by calling
+`h5_reset()`, then run each test, incrementing an error count variable if a
+test fails. The exit code and text will be set based on the error count.
+
+### Scripts
+
+If you need to fire off multiple programs to test a new feature, you may have
+to do this via a script. These are normally named `test_<thing>.sh.in`. The
+`.in` is because the scripts are often modified and copied during the configure
+step. In the past, we have tried to stick to POSIX Bourne shell scripts, but
+many scripts now require bash.
+
+If you write a new test script, it is important to also add a Powershell
+equivalent for testing on Windows.
+
+It's helpful to run any new shell scripts through `shellcheck`
+(https://www.shellcheck.net/) to ensure that your scripts are free from
+common problems.
+
+
+### Parallel tests (in `testpar/`)
+
+To be covered in a future update of this guide...
+
+### Adding new tests
+
+All new HDF5 library functionality (including bugfixes) should have a test.
+Some rules of thumb:
+
+- If you need to run multiple programs, you'll need to create a script and some test programs. Use the macros in `h5test.h` to handle errors in your test programs.
+- If a suitable test program already exists (especially if your tests will be small), add your new tests to the existing file. 
+- If you need to create a new test program, create one that uses the `h5test.h` macros.
+- Avoid adding new tests to `testhdf5` or using the macros in `testhdf5.h`.
+
+Don't forget that you'll need to add your test program or script to the lists in
+both the CMake and Autotools test files (`CMakeLists.txt` and `Makefile.am` in
+`test/` respectively). For simple tests, you just need to add your new test to
+the list of tests.
+
+All new tests **MUST** run under both the Autotools and CMake. Ideally, they
+should also work on Windows, but we're willing to overlook this for things
+that are unlikely to be useful on that platform.
+
+## Documentation
+
+We have moved the user guide and reference manual to Doxygen. All public API
+calls and symbols should have Doxygen markup in the public header file. New major
+features should be documented in the user guide. This Doxygen content is located in
+the package's module header file (`H5Xmodule.h`). Language wrapper calls 
+(C++/Fortran/Java) should also have Doxygen markup, which will be located with
+the wrapper source code. Images and other common Doxygen files belong in the
+`doxygen` directory.
+
+Internal documentation for developer consumption is currently stored as Markdown
+files in the `doc` directory. This may change in the future. Documentation that
+helps understand the contents of a directory is often stored in a README.md
+Markdown file in that directory.
+
+Build and install documentation is stored in text files in `release_docs`. This
+is admittedly not the best place for this. History files are also kept here.
+
+## Command-Line Tools
+
+The HDF5 command-line tools are written in C and built with the library by default.
+The code is organized into a central tools library (in the `tools/lib` directory)
+that includes some common functionality and the individual programs, each of which
+has its own directory in `tools/src`. A few of the smaller tools are aggregated
+into the `tools/src/misc` directory. Only h5diff has a parallel version at this
+time and the parallel-specific functionality is in the `tools/src/h5diff/ph5diff_main.c` file.
+Some h5diff functionality has also made its way into the tools library.
+The tools code is not as well organized as the main library, so there's more opportunity
+for refactoring here.
+
+Also worth noting is that the command-line tools only use **public** HDF5 API
+calls, even though they include `H5private.h` in order to take advantage of
+the platform-independence scheme we use in the main library and some private
+utility functions.
+
+There are also a few tools in the high-level library. The gif2h5 and h52gif tools
+are poorly-written and have known security issues, so they will soon be moved
+to a separate repository, leaving h5watch as the only high-level command-line tool.
+
+### Source code
+
+The source code for the tools likes more like standard C code and uses its own
+set of macros, which are defined in the tools library header files. There are
+no `FUNC_ENTER` macros, you do not need to define a `ret_value` variable,
+and the error macros are greatly simplified. Errors are usually handled by
+a `TOOLS_ERROR` macro (or `TOOLS_GOTO_ERROR` if you need to jump to a `done:`
+target to handle cleanup).
+One area where the tools need a lot more work is in handling errors. The tools
+code frequently ignores errors, often in functions that return `void`.
+
+A "tools-only" consideration is the use of command-line arguments. We try to
+be conservative about these, even though they really aren't in the "public API"
+in the same way as API calls are. Additions and changes to the options will
+probably result in some discussion.
+
+### Tools tests
+
+In most cases, a tool will be run against an input HDF5 file with a particular
+set of command-line parameters, the exit code checked, and the output compared
+with a standard output file. In some cases, errors are expected and standard
+error files will be compared. These standard error files often contain HDF5
+error stack dumps, which can cause spurious tool test "failures" when we
+make changes to the main HDF5 C library.
+
+Test files can be located in a few places in the `tools` directory tree.
+Common input files that are used with multiple tools are kept in `tools/testfiles`.
+Input files that are used with just one tool are located in `tools/test/<tool>/testfiles`.
+Expected output files are located with their respective HDF5 files and end in `.txt`.
+Expected error files are also located with their respective HDF5 files and end in `.err`.
+h5dump files will usually have `.ddl` and `.xml` output files and there will
+usually be `.<tool>` files that contain help output.
+The test files are generated by programs with `gentest` in their name, though
+we typically check the generated HDF5 files in instead of recreating them
+as a part of running the tools tests.
+
+The Autotools aggregate the tools tests in per-tool shell scripts in the
+`tools/test/<tool>` directory. Each script starts with a few utility functions
+that perform setup, compare files, clean output, etc. and the test commands
+will appear at the end. CMake works similarly, but each test is set up in
+the CMakeLists.txt and CMakeTests.cmake files in the same directory.
+
+Adding a new test will usually involve:
+- Adding a new function to the appropriate generator program to create a new HDF5 file
+- Adding your new test to the CMake and Autotools test scripts, as described above
+- Adding appropriate output and/or error files for comparison
+
+You MUST add new tests to both the Autotools and CMake.
diff --git a/doc/img/release-schedule.plantuml b/doc/img/release-schedule.plantuml
new file mode 100644
index 0000000..c724dc9
--- /dev/null
+++ b/doc/img/release-schedule.plantuml
@@ -0,0 +1,34 @@
+The release timeline was generated on PlantUML (https://plantuml.com)
+
+The current script:
+
+@startgantt
+
+title HDF5 Release Schedule
+
+projectscale monthly
+Project starts 2022-01-01
+
+[1.8] starts 2022-01-01 and lasts 57 weeks
+[1.8.23] happens 2023-01-31
+[1.8] is colored in #F76969
+
+[1.10] starts 2022-01-01 and lasts 104 weeks
+[1.10.9] happens 2022-05-31
+[1.10.10] happens 2023-02-28
+[1.10.10] displays on same row as [1.10.9]
+[1.10] is colored in #F6DD60
+
+[1.12] starts 2022-01-01 and lasts 65 weeks
+[1.12.2] happens 2022-04-30
+[1.12.3] happens 2023-03-31
+[1.12.3] displays on same row as [1.12.2]
+[1.12] is colored in #88CCEE
+
+[1.14] starts at 2023-01-01 and lasts 52 weeks
+[1.14.0] happens at 2022-12-31
+[1.14.1] happens at 2023-04-30
+[1.14.1] displays on same row as [1.14.0]
+[1.14] is colored in #B187CF
+
+@endgantt
diff --git a/doc/img/release-schedule.png b/doc/img/release-schedule.png
new file mode 100644
index 0000000..b96f741
--- /dev/null
+++ b/doc/img/release-schedule.png
diff --git a/doc/library-init-shutdown.md b/doc/library-init-shutdown.md
new file mode 100644
index 0000000..917d213
--- /dev/null
+++ b/doc/library-init-shutdown.md
@@ -0,0 +1,56 @@
+# HDF5 Library initialization and shutdown
+
+## Application perspective
+
+### Implicit initialization and shutdown
+
+When a developer exports a new symbol as part of the HDF5 library,
+they should make sure that an application cannot enter the library in an
+uninitialized state through a new API function, or read an uninitialized
+value from a non-function HDF5 symbol.
+
+The HDF5 library initializes itself when an application either enters
+the library through an API function call such as `H5Fopen`, or when
+an application evaluates an HDF5 symbol that represents either a
+property-list identifier such as `H5F_ACC_RDONLY` or `H5F_ACC_RDWR`,
+a property-list class identifier such as `H5P_FILE_ACCESS`, a VFD
+identifier such as `H5FD_FAMILY` or `H5FD_SEC2`, or a type identifier
+such as `H5T_NATIVE_INT64`.
+
+The library sets a flag when initialization occurs and as long as the
+flag is set, skips initialization.
+
+The library provides a couple of macros that initialize the library
+as necessary.  The library is initialized as a side-effect of the
+`FUNC_ENTER_API*` macros used at the top of most API functions.  HDF5
+library symbols other than functions are provided through `#define`s
+that use `H5OPEN` to introduce a library-initialization call (`H5open`)
+at each site where a non-function symbol is used.
+
+Ordinarily the library registers an `atexit(3)` handler to shut itself
+down when the application exits.
+
+### Explicit initialization and shutdown
+
+An application may use an API call, `H5open`, to explicitly initialize
+the library.  `H5close` explicitly shuts down the library.
+
+## Library internals perspective
+
+No matter how library initializion begins, eventually the internal
+function `H5_init_library` will be called.  `H5_init_library` is
+responsible for calling the initializers for every internal HDF5
+library module (aka "package") in the correct order so that no module is
+initialized before its prerequisite modules.  A table in `H5_init_library`
+establishes the order of initialization.  If a developer adds a
+module to the library that it is appropriate to initialize with the rest
+of the library, then they should insert its initializer into the right
+place in the table.
+
+`H5_term_library` drives library shutdown.  Library shutdown is
+table-driven, too.  If a developer adds a module that needs to release
+resources during library shutdown, then they should add a call at the
+right place to the shutdown table.  Note that some entries in the shutdown
+table are marked as "barriers," and if a new module should only be
+shutdown *strictly after* the preceding modules, then it should be marked
+as a barrier.  See the comments in `H5_term_library` for more information.
diff --git a/doc/parallel-compression.md b/doc/parallel-compression.md
new file mode 100644
index 0000000..e4fa822
--- /dev/null
+++ b/doc/parallel-compression.md
@@ -0,0 +1,313 @@
+# HDF5 Parallel Compression
+
+## Introduction
+
+When an HDF5 dataset is created, the application can specify
+optional data filters to be applied to the dataset (as long as
+the dataset uses a chunked data layout). These filters may
+perform compression, shuffling, checksumming/error detection
+and more on the dataset data. The filters are added to a filter
+pipeline for the dataset and are automatically applied to the
+data during dataset writes and reads.
+
+Prior to the HDF5 1.10.2 release, a parallel HDF5 application
+could read datasets with filters applied to them, but could
+not write to those datasets in parallel. The datasets would
+have to first be written in a serial HDF5 application or from
+a single MPI rank in a parallel HDF5 application. This
+restriction was in place because:
+
+ - Updating the data in filtered datasets requires management
+   of file metadata, such as the dataset's chunk index and file
+   space for data chunks, which must be done collectively in
+   order for MPI ranks to have a consistent view of the file.
+   At the time, HDF5 lacked the collective coordination of
+   this metadata management.
+
+ - When multiple MPI ranks are writing independently to the
+   same chunk in a dataset (even if their selected portions of
+   the chunk don't overlap), the whole chunk has to be read,
+   unfiltered, modified, re-filtered and then written back to
+   disk. This read-modify-write style of operation would cause
+   conflicts among the MPI ranks and lead to an inconsistent
+   view of the file.
+
+Introduced in the HDF5 1.10.2 release, the parallel compression
+feature allows an HDF5 application to write in parallel to
+datasets with filters applied to them, as long as collective
+I/O is used. The feature introduces new internal infrastructure
+that coordinates the collective management of the file metadata
+between MPI ranks during dataset writes. It also accounts for
+multiple MPI ranks writing to a chunk by assigning ownership to
+one of the MPI ranks, at which point the other MPI ranks send
+their modifications to the owning MPI rank.
+
+The parallel compression feature is always enabled when HDF5
+is built with parallel enabled, but the feature may be disabled
+if the necessary MPI-3 routines are not available. Therefore,
+HDF5 conditionally defines the macro `H5_HAVE_PARALLEL_FILTERED_WRITES`
+which an application can check for to see if the feature is
+available.
+
+## Examples
+
+Using the parallel compression feature is very similar to using
+compression in serial HDF5, except that dataset writes **must**
+be collective:
+
+```
+hid_t dxpl_id = H5Pcreate(H5P_DATASET_XFER);
+H5Pset_dxpl_mpio(dxpl_id, H5FD_MPIO_COLLECTIVE);
+H5Dwrite(..., dxpl_id, ...);
+```
+
+The following are two simple examples of using the parallel compression
+feature:
+
+[ph5_filtered_writes.c](https://github.com/HDFGroup/hdf5/blob/develop/examples/ph5_filtered_writes.c)
+
+[ph5_filtered_writes_no_sel.c](https://github.com/HDFGroup/hdf5/blob/develop/examples/ph5_filtered_writes_no_sel.c)
+
+The former contains simple examples of using the parallel
+compression feature to write to compressed datasets, while the
+latter contains an example of how to write to compressed datasets
+when one or MPI ranks don't have any data to write to a dataset.
+Remember that the feature requires these writes to use collective
+I/O, so the MPI ranks which have nothing to contribute must still
+participate in the collective write call.
+
+## Incremental file space allocation support
+
+HDF5's [file space allocation time](https://portal.hdfgroup.org/display/HDF5/H5P_SET_ALLOC_TIME)
+is a dataset creation property that can have significant effects
+on application performance, especially if the application uses
+parallel HDF5. In a serial HDF5 application, the default file space
+allocation time for chunked datasets is "incremental". This means
+that allocation of space in the HDF5 file for data chunks is
+deferred until data is first written to those chunks. In parallel
+HDF5, the file space allocation time was previously always forced
+to "early", which allocates space in the file for all of a dataset's
+data chunks at creation time (or during the first open of a dataset
+if it was created serially). This would ensure that all the necessary
+file space was allocated so MPI ranks could perform independent I/O
+operations on a dataset without needing further coordination of file
+metadata as described previously.
+
+While this strategy has worked in the past, it has some noticeable
+drawbacks. For one, the larger the chunked dataset being created,
+the more noticeable overhead there will be during dataset creation
+as all of the data chunks are being allocated in the HDF5 file.
+Further, these data chunks will, by default, be [filled](https://portal.hdfgroup.org/display/HDF5/H5P_SET_FILL_VALUE)
+with HDF5's default fill data value, leading to extraordinary
+dataset creation overhead and resulting in pre-filling large
+portions of a dataset that the application might have been planning
+to overwrite anyway. Even worse, there will be more initial overhead
+from compressing that fill data before writing it out, only to have
+it read back in, unfiltered and modified the first time a chunk is
+written to. In the past, it was typically suggested that parallel
+HDF5 applications should use [H5Pset_fill_time](https://portal.hdfgroup.org/display/HDF5/H5P_SET_FILL_TIME)
+with a value of `H5D_FILL_TIME_NEVER` in order to disable writing of
+the fill value to dataset chunks, but this isn't ideal if the
+application actually wishes to make use of fill values. 
+
+With [improvements made](https://www.hdfgroup.org/2022/03/parallel-compression-improvements-in-hdf5-1-13-1/)
+to the parallel compression feature for the HDF5 1.13.1 release,
+"incremental" file space allocation is now the default for datasets
+created in parallel *only if they have filters applied to them*.
+"Early" file space allocation is still supported for these datasets
+if desired and is still forced for datasets created in parallel that
+do *not* have filters applied to them. This change should significantly
+reduce the overhead of creating filtered datasets in parallel HDF5
+applications and should be helpful to applications that wish to
+use a fill value for these datasets. It should also help significantly
+reduce the size of the HDF5 file, as file space for the data chunks
+is allocated as needed rather than all at once.
+
+## Performance Considerations
+
+Since getting good performance out of HDF5's parallel compression
+feature involves several factors, the following is a list of
+performance considerations (generally from most to least important)
+and best practices to take into account when trying to get the
+optimal performance out of the parallel compression feature.
+
+### Begin with a good chunking strategy
+
+[Starting with a good chunking strategy](https://portal.hdfgroup.org/display/HDF5/Chunking+in+HDF5)
+will generally have the largest impact on overall application
+performance. The different chunking parameters can be difficult
+to fine-tune, but it is essential to start with a well-performing
+chunking layout before adding compression and parallel I/O into
+the mix. Compression itself adds overhead and may have side
+effects that necessitate further adjustment of the chunking
+parameters and HDF5 application settings. Consider that the
+chosen chunk size becomes a very important factor when compression
+is involved, as data chunks have to be completely read and
+re-written to perform partial writes to the chunk.
+
+[Improving I/O performance with HDF5 compressed datasets](http://portal.hdfgroup.org/display/HDF5/Improving+IO+Performance+When+Working+with+HDF5+Compressed+Datasets)
+is a useful reference for more information on getting good
+performance when using a chunked dataset layout.
+
+### Avoid chunk sharing
+
+Since the parallel compression feature has to assign ownership
+of data chunks to a single MPI rank in order to avoid the
+previously described read-modify-write issue, an HDF5 application
+may need to take care when determining how a dataset will be
+divided up among the MPI ranks writing to it. Each dataset data
+chunk that is written to by more than 1 MPI rank will incur extra
+MPI overhead as one of the ranks takes ownership and the other
+ranks send it their data and information about where in the chunk
+that data belongs. While not always possible to do, an HDF5
+application will get the best performance out of parallel compression
+if it can avoid writing in a way that causes more than 1 MPI rank
+to write to any given data chunk in a dataset.
+
+### Collective metadata operations
+
+The parallel compression feature typically works with a significant
+amount of metadata related to the management of the data chunks
+in datasets. In initial performance results gathered from various
+HPC machines, it was found that the parallel compression feature
+did not scale well at around 8k MPI ranks and beyond. On further
+investigation, it became obvious that the bottleneck was due to
+heavy filesystem pressure from the metadata management for dataset
+data chunks as they changed size (as a result of data compression)
+and moved around in the HDF5 file.
+
+Enabling collective metadata operations in the HDF5 application
+(as in the below snippet) showed significant improvement in
+performance and scalability and is generally always recommended
+unless application performance shows negative benefits by doing
+so.
+
+```
+...
+hid_t fapl_id = H5Pcreate(H5P_FILE_ACCESS);
+H5Pset_fapl_mpio(fapl_id, MPI_COMM_WORLD, MPI_INFO_NULL);
+H5Pset_all_coll_metadata_ops(fapl_id, 1);
+H5Pset_coll_metadata_write(fapl_id, 1);
+hid_t file_id = H5Fcreate("file.h5", H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id);
+...
+```
+
+### Align chunks in the file
+
+The natural layout of an HDF5 file may cause dataset data
+chunks to end up at addresses in the file that do not align
+well with the underlying file system, possibly leading to
+poor performance. As an example, Lustre performance is generally
+good when writes are aligned with the chosen stripe size.
+The HDF5 application can use [H5Pset_alignment](https://portal.hdfgroup.org/display/HDF5/H5P_SET_ALIGNMENT)
+to have a bit more control over where objects in the HDF5
+file end up. However, do note that setting the alignment
+of objects generally wastes space in the file and has the
+potential to dramatically increase its resulting size, so
+caution should be used when choosing the alignment parameters.
+
+[H5Pset_alignment](https://portal.hdfgroup.org/display/HDF5/H5P_SET_ALIGNMENT)
+has two parameters that control the alignment of objects in
+the HDF5 file, the "threshold" value and the alignment
+value. The threshold value specifies that any object greater
+than or equal in size to that value will be aligned in the
+file at addresses which are multiples of the chosen alignment
+value. While the value 0 can be specified for the threshold
+to make every object in the file be aligned according to
+the alignment value, this isn't generally recommended, as it
+will likely waste an excessive amount of space in the file.
+
+In the example below, the chosen dataset chunk size is
+provided for the threshold value and 1MiB is specified for
+the alignment value. Assuming that 1MiB is an optimal
+alignment value (e.g., assuming that it matches well with
+the Lustre stripe size), this should cause dataset data
+chunks to be well-aligned and generally give good write
+performance.
+
+```
+hid_t fapl_id = H5Pcreate(H5P_FILE_ACCESS);
+H5Pset_fapl_mpio(fapl_id, MPI_COMM_WORLD, MPI_INFO_NULL);
+/* Assuming Lustre stripe size is 1MiB, align data chunks
+   in the file to address multiples of 1MiB. */
+H5Pset_alignment(fapl_id, dataset_chunk_size, 1048576);
+hid_t file_id = H5Fcreate("file.h5", H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id);
+```
+
+### File free space managers
+
+As data chunks in a dataset get written to and compressed,
+they can change in size and be relocated in the HDF5 file.
+Since parallel compression usually involves many data chunks
+in a file, this can create significant amounts of free space
+in the file over its lifetime and eventually cause performance
+issues.
+
+An HDF5 application can use [H5Pset_file_space_strategy](http://portal.hdfgroup.org/display/HDF5/H5P_SET_FILE_SPACE_STRATEGY)
+with a value of `H5F_FSPACE_STRATEGY_PAGE` to enable the paged
+aggregation feature, which can accumulate metadata and raw
+data for dataset data chunks into well-aligned, configurably
+sized "pages" for better performance. However, note that using
+the paged aggregation feature will cause any setting from
+[H5Pset_alignment](https://portal.hdfgroup.org/display/HDF5/H5P_SET_ALIGNMENT)
+to be ignored. While an application should be able to get
+comparable performance effects by [setting the size of these pages](http://portal.hdfgroup.org/display/HDF5/H5P_SET_FILE_SPACE_PAGE_SIZE) to be equal to the value that
+would have been set for [H5Pset_alignment](https://portal.hdfgroup.org/display/HDF5/H5P_SET_ALIGNMENT),
+this may not necessarily be the case and should be studied.
+
+Note that [H5Pset_file_space_strategy](http://portal.hdfgroup.org/display/HDF5/H5P_SET_FILE_SPACE_STRATEGY)
+has a `persist` parameter. This determines whether or not the
+file free space manager should include extra metadata in the
+HDF5 file about free space sections in the file. If this
+parameter is `false`, any free space in the HDF5 file will
+become unusable once the HDF5 file is closed. For parallel
+compression, it's generally recommended that `persist` be set
+to `true`, as this will keep better track of file free space
+for data chunks between accesses to the HDF5 file.
+
+```
+hid_t fcpl_id = H5Pcreate(H5P_FILE_CREATE);
+/* Use persistent free space manager with paged aggregation */
+H5Pset_file_space_strategy(fcpl_id, H5F_FSPACE_STRATEGY_PAGE, 1, 1);
+/* Assuming Lustre stripe size is 1MiB, set page size to that */
+H5Pset_file_space_page_size(fcpl_id, 1048576);
+...
+hid_t file_id = H5Fcreate("file.h5", H5F_ACC_TRUNC, fcpl_id, fapl_id);
+```
+
+### Low-level collective vs. independent I/O
+
+While the parallel compression feature requires that the HDF5
+application set and maintain collective I/O at the application
+interface level (via [H5Pset_dxpl_mpio](https://portal.hdfgroup.org/display/HDF5/H5P_SET_DXPL_MPIO)),
+it does not require that the actual MPI I/O that occurs at
+the lowest layers of HDF5 be collective; independent I/O may
+perform better depending on the application I/O patterns and
+parallel file system performance, among other factors. The
+application may use [H5Pset_dxpl_mpio_collective_opt](https://portal.hdfgroup.org/display/HDF5/H5P_SET_DXPL_MPIO_COLLECTIVE_OPT)
+to control this setting and see which I/O method provides the
+best performance.
+
+```
+hid_t dxpl_id = H5Pcreate(H5P_DATASET_XFER);
+H5Pset_dxpl_mpio(dxpl_id, H5FD_MPIO_COLLECTIVE);
+H5Pset_dxpl_mpio_collective_opt(dxpl_id, H5FD_MPIO_INDIVIDUAL_IO); /* Try independent I/O */
+H5Dwrite(..., dxpl_id, ...);
+```
+
+### Runtime HDF5 Library version
+
+An HDF5 application can use the [H5Pset_libver_bounds](http://portal.hdfgroup.org/display/HDF5/H5P_SET_LIBVER_BOUNDS)
+routine to set the upper and lower bounds on library versions
+to use when creating HDF5 objects. For parallel compression
+specifically, setting the library version to the latest available
+version can allow access to better/more efficient chunk indexing
+types and data encoding methods. For example:
+
+```
+...
+hid_t fapl_id = H5Pcreate(H5P_FILE_ACCESS);
+H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST);
+hid_t file_id = H5Fcreate("file.h5", H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id);
+...
+```
diff --git a/doxygen/CMakeLists.txt b/doxygen/CMakeLists.txt
new file mode 100644
index 0000000..a56e831
--- /dev/null
+++ b/doxygen/CMakeLists.txt
@@ -0,0 +1,48 @@
+cmake_minimum_required (VERSION 3.18)
+project (HDF5_DOXYGEN C)
+
+#-----------------------------------------------------------------------------
+# Option to build documentation
+#-----------------------------------------------------------------------------
+if (DOXYGEN_FOUND)
+  set (DOXYGEN_PACKAGE ${HDF5_PACKAGE_NAME})
+  set (DOXYGEN_VERSION_STRING ${HDF5_PACKAGE_VERSION_STRING})
+  set (DOXYGEN_DIR ${HDF5_DOXYGEN_DIR})
+  set (DOXYGEN_INCLUDE_ALIASES_PATH ${HDF5_DOXYGEN_DIR})
+  set (DOXYGEN_INCLUDE_ALIASES aliases)
+  set (DOXYGEN_VERBATIM_VARS DOXYGEN_INCLUDE_ALIASES)
+  set (DOXYGEN_PROJECT_LOGO ${HDF5_DOXYGEN_DIR}/img/HDFG-logo.png)
+  set (DOXYGEN_PROJECT_BRIEF "API Reference")
+  set (DOXYGEN_INPUT_DIRECTORY "${HDF5_SOURCE_DIR} ${HDF5_DOXYGEN_DIR}/dox ${HDF5_GENERATED_SOURCE_DIR}")
+  set (DOXYGEN_OPTIMIZE_OUTPUT_FOR_C YES)
+  set (DOXYGEN_MACRO_EXPANSION YES)
+  set (DOXYGEN_OUTPUT_DIRECTORY ${HDF5_BINARY_DIR}/hdf5lib_docs)
+  set (DOXYGEN_EXAMPLES_DIRECTORY "${HDF5_DOXYGEN_DIR}/dox/cookbook ${HDF5_DOXYGEN_DIR}/examples ${HDF5_SRC_DIR} ${HDF5_SOURCE_DIR}/examples ${HDF5_TEST_SRC_DIR}")
+  set (DOXYGEN_LAYOUT_FILE ${HDF5_DOXYGEN_DIR}/hdf5doxy_layout.xml)
+  set (DOXYGEN_HTML_HEADER ${HDF5_DOXYGEN_DIR}/hdf5_header.html)
+  set (DOXYGEN_HTML_FOOTER ${HDF5_DOXYGEN_DIR}/hdf5_footer.html)
+  set (DOXYGEN_HTML_EXTRA_STYLESHEET ${HDF5_DOXYGEN_DIR}/hdf5doxy.css)
+  set (DOXYGEN_HTML_EXTRA_FILES "${HDF5_DOXYGEN_DIR}/hdf5_navtree_hacks.js")
+  set (DOXYGEN_TAG_FILE ${HDF5_BINARY_DIR}/hdf5.tag)
+  set (DOXYGEN_SERVER_BASED_SEARCH NO)
+  set (DOXYGEN_EXTERNAL_SEARCH NO)
+  set (DOXYGEN_SEARCHENGINE_URL)
+  set (DOXYGEN_STRIP_FROM_PATH ${HDF5_SOURCE_DIR})
+  set (DOXYGEN_STRIP_FROM_INC_PATH ${HDF5_SOURCE_DIR})
+  set (DOXYGEN_PREDEFINED "H5_HAVE_DIRECT H5_HAVE_LIBHDFS H5_HAVE_MAP_API H5_HAVE_PARALLEL H5_HAVE_ROS3_VFD H5_DOXYGEN H5_HAVE_SUBFILING_VFD H5_HAVE_IOC_VFD")
+
+# This configure and individual custom targets work together
+  # Replace variables inside @@ with the current values
+  configure_file (${HDF5_DOXYGEN_DIR}/Doxyfile.in ${HDF5_BINARY_DIR}/Doxyfile @ONLY)
+
+  install (
+      DIRECTORY ${HDF5_BINARY_DIR}/hdf5lib_docs/html
+      DESTINATION ${HDF5_INSTALL_DOC_DIR}
+      COMPONENT Documents
+  )
+
+  if (NOT TARGET doxygen)
+    add_custom_target (doxygen)
+  endif ()
+
+endif ()
diff --git a/doxygen/Doxyfile.in b/doxygen/Doxyfile.in
new file mode 100644
index 0000000..d9b0fe9
--- /dev/null
+++ b/doxygen/Doxyfile.in
@@ -0,0 +1,2553 @@
+# Doxyfile
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
+# The format is:
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the configuration
+# file that follow. The default is UTF-8 which is also the encoding used for all
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
+# iconv built into libc) for the transcoding. See
+# https://www.gnu.org/software/libiconv/ for the list of possible encodings.
+# The default value is: UTF-8.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
+
+PROJECT_NAME           = @DOXYGEN_PACKAGE@
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
+
+PROJECT_NUMBER         = @DOXYGEN_VERSION_STRING@
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          = @DOXYGEN_PROJECT_BRIEF@
+
+# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
+# in the documentation. The maximum height of the logo should not exceed 55
+# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
+# the logo to the output directory.
+
+PROJECT_LOGO           = @DOXYGEN_PROJECT_LOGO@
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = @DOXYGEN_OUTPUT_DIRECTORY@
+
+# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
+# directories (in 2 levels) under the output directory of each output format and
+# will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise causes
+# performance problems for the file system.
+# The default value is: NO.
+
+CREATE_SUBDIRS         = NO
+
+# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
+# characters to appear in the names of generated files. If set to NO, non-ASCII
+# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
+# U+3044.
+# The default value is: NO.
+
+ALLOW_UNICODE_NAMES    = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
+# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
+# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
+# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
+# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
+# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
+# Ukrainian and Vietnamese.
+# The default value is: English.
+
+OUTPUT_LANGUAGE        = English
+
+# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all generated output in the proper direction.
+# Possible values are: None, LTR, RTL and Context.
+# The default value is: None.
+
+OUTPUT_TEXT_DIRECTION  = None
+
+# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
+# description of a member or function before the detailed description
+#
+# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+# The default value is: YES.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator that is
+# used to form the text in various listings. Each string in this list, if found
+# as the leading text of the brief description, will be stripped from the text
+# and the result, after processing the whole list, is used as the annotated
+# text. Otherwise, the brief description is used as-is. If left blank, the
+# following values are used ($name is automatically replaced with the name of
+# the entity):The $name class, The $name widget, The $name file, is, provides,
+# specifies, contains, represents, a, an and the.
+
+ABBREVIATE_BRIEF       = "The $name class" \
+                         "The $name widget" \
+                         "The $name file" \
+                         is \
+                         provides \
+                         specifies \
+                         contains \
+                         represents \
+                         a \
+                         an \
+                         the
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# doxygen will generate a detailed section even if there is only a brief
+# description.
+# The default value is: NO.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+# The default value is: NO.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
+# before files name in the file list and in the header files. If set to NO the
+# shortest path that makes the file name unique will be used
+# The default value is: YES.
+
+FULL_PATH_NAMES        = YES
+
+# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
+# Stripping is only done if one of the specified strings matches the left-hand
+# part of the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the path to
+# strip.
+#
+# Note that you can specify absolute paths here, but also relative paths, which
+# will be relative from the directory where doxygen is started.
+# This tag requires that the tag FULL_PATH_NAMES is set to YES.
+
+STRIP_FROM_PATH        = @DOXYGEN_STRIP_FROM_PATH@
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
+# path mentioned in the documentation of a class, which tells the reader which
+# header file to include in order to use a class. If left blank only the name of
+# the header file containing the class definition is used. Otherwise one should
+# specify the list of include paths that are normally passed to the compiler
+# using the -I flag.
+
+STRIP_FROM_INC_PATH    = @DOXYGEN_STRIP_FROM_INC_PATH@
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
+# less readable) file names. This can be useful is your file systems doesn't
+# support long names like on DOS, Mac, or CD-ROM.
+# The default value is: NO.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
+# first line (until the first dot) of a Javadoc-style comment as the brief
+# description. If set to NO, the Javadoc-style will behave just like regular Qt-
+# style comments (thus requiring an explicit @brief command for a brief
+# description.)
+# The default value is: NO.
+
+JAVADOC_AUTOBRIEF      = NO
+
+# If the JAVADOC_BANNER tag is set to YES then doxygen will interpret a line
+# such as
+# /***************
+# as being the beginning of a Javadoc-style comment "banner". If set to NO, the
+# Javadoc-style will behave just like regular comments and it will not be
+# interpreted by doxygen.
+# The default value is: NO.
+
+JAVADOC_BANNER         = NO
+
+# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
+# line (until the first dot) of a Qt-style comment as the brief description. If
+# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
+# requiring an explicit \brief command for a brief description.)
+# The default value is: NO.
+
+QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
+# a brief description. This used to be the default behavior. The new default is
+# to treat a multi-line C++ comment block as a detailed description. Set this
+# tag to YES if you prefer the old behavior instead.
+#
+# Note that setting this tag to YES also means that rational rose comments are
+# not recognized any more.
+# The default value is: NO.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
+# documentation from any documented member that it re-implements.
+# The default value is: YES.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
+# page for each member. If set to NO, the documentation of a member will be part
+# of the file/class/namespace that contains it.
+# The default value is: NO.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
+# uses this value to replace tabs by spaces in code fragments.
+# Minimum value: 1, maximum value: 16, default value: 4.
+
+TAB_SIZE               = 4
+
+# This tag can be used to specify a number of aliases that act as commands in
+# the documentation. An alias has the form:
+# name=value
+# For example adding
+# "sideeffect=@par Side Effects:\n"
+# will allow you to put the command \sideeffect (or @sideeffect) in the
+# documentation, which will result in a user-defined paragraph with heading
+# "Side Effects:". You can put \n's in the value part of an alias to insert
+# newlines (in the resulting output). You can put ^^ in the value part of an
+# alias to insert a newline as if a physical newline was in the original file.
+# When you need a literal { or } or , in the value part of an alias you have to
+# escape them by means of a backslash (\), this can lead to conflicts with the
+# commands \{ and \} for these it is advised to use the version @{ and @} or use
+# a double escape (\\{ and \\})
+
+ALIASES                =
+
+@INCLUDE_PATH          = @DOXYGEN_INCLUDE_ALIASES_PATH@
+@INCLUDE               = @DOXYGEN_INCLUDE_ALIASES@
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C. For
+# instance, some of the names that are used will be different. The list of all
+# members will be omitted, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_FOR_C  = YES
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
+# Python sources only. Doxygen will then generate output that is more tailored
+# for that language. For instance, namespaces will be presented as packages,
+# qualified scopes will look different, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_JAVA   = YES
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources. Doxygen will then generate output that is tailored for Fortran.
+# The default value is: NO.
+
+OPTIMIZE_FOR_FORTRAN   = YES
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for VHDL.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Set the OPTIMIZE_OUTPUT_SLICE tag to YES if your project consists of Slice
+# sources only. Doxygen will then generate output that is more tailored for that
+# language. For instance, namespaces will be presented as modules, types will be
+# separated into more groups, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_SLICE  = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension, and
+# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
+# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
+# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
+# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
+# tries to guess whether the code is fixed or free formatted code, this is the
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
+#
+# Note: For files without extension you can use no_extension as a placeholder.
+#
+# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
+# the files are not read by doxygen.
+
+EXTENSION_MAPPING      =
+
+# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# according to the Markdown format, which allows for more readable
+# documentation. See https://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you can
+# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# case of backward compatibilities issues.
+# The default value is: YES.
+
+MARKDOWN_SUPPORT       = YES
+
+# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up
+# to that level are automatically included in the table of contents, even if
+# they do not have an id attribute.
+# Note: This feature currently applies only to Markdown headings.
+# Minimum value: 0, maximum value: 99, default value: 5.
+# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
+
+TOC_INCLUDE_HEADINGS   = 5
+
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by putting a % sign in front of the word or
+# globally by setting AUTOLINK_SUPPORT to NO.
+# The default value is: YES.
+
+AUTOLINK_SUPPORT       = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should set this
+# tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string);
+# versus func(std::string) {}). This also make the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+# The default value is: NO.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+# The default value is: NO.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
+# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen
+# will parse them like normal C++ but will assume all classes use public instead
+# of private inheritance when no explicit protection keyword is present.
+# The default value is: NO.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES will make
+# doxygen to replace the get and set methods by a property in the documentation.
+# This will only work if the methods are indeed getting or setting a simple
+# type. If this is not the case, or you want to show the methods anyway, you
+# should set this option to NO.
+# The default value is: YES.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+# The default value is: NO.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# If one adds a struct or class to a group and this option is enabled, then also
+# any nested class or struct is added to the same group. By default this option
+# is disabled and one has to add nested compounds explicitly via \ingroup.
+# The default value is: NO.
+
+GROUP_NESTED_COMPOUNDS = NO
+
+# Set the SUBGROUPING tag to YES to allow class member groups of the same type
+# (for instance a group of public functions) to be put as a subgroup of that
+# type (e.g. under the Public Functions section). Set it to NO to prevent
+# subgrouping. Alternatively, this can be done per class using the
+# \nosubgrouping command.
+# The default value is: YES.
+
+SUBGROUPING            = YES
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
+# are shown inside the group in which they are included (e.g. using \ingroup)
+# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
+# and RTF).
+#
+# Note that this feature does not work in combination with
+# SEPARATE_MEMBER_PAGES.
+# The default value is: NO.
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
+# with only public data fields or simple typedef fields will be shown inline in
+# the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO, structs, classes, and unions are shown on a separate page (for HTML and
+# Man pages) or section (for LaTeX and RTF).
+# The default value is: NO.
+
+INLINE_SIMPLE_STRUCTS  = NO
+
+# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
+# enum is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically be
+# useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+# The default value is: NO.
+
+TYPEDEF_HIDES_STRUCT   = YES
+
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can be
+# an expensive process and often the same symbol appears multiple times in the
+# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# doxygen will become slower. If the cache is too large, memory is wasted. The
+# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
+# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
+# symbols. At the end of a run doxygen will report the cache usage and suggest
+# the optimal cache size from a speed point of view.
+# Minimum value: 0, maximum value: 9, default value: 0.
+
+LOOKUP_CACHE_SIZE      = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
+# documentation are documented, even if no documentation was available. Private
+# class members and static file members will be hidden unless the
+# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
+# Note: This will also disable the warnings about undocumented members that are
+# normally produced when WARNINGS is set to YES.
+# The default value is: NO.
+
+EXTRACT_ALL            = YES
+
+# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
+# be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIVATE        = NO
+
+# If the EXTRACT_PRIV_VIRTUAL tag is set to YES, documented private virtual
+# methods of a class will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIV_VIRTUAL   = NO
+
+# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
+# scope will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PACKAGE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
+# included in the documentation.
+# The default value is: NO.
+
+EXTRACT_STATIC         = YES
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO,
+# only classes defined in header files are included. Does not have any effect
+# for Java sources.
+# The default value is: YES.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. If set to YES, local methods,
+# which are defined in the implementation section but not in the interface are
+# included in the documentation. If set to NO, only methods in the interface are
+# included.
+# The default value is: NO.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base name of
+# the file that contains the anonymous namespace. By default anonymous namespace
+# are hidden.
+# The default value is: NO.
+
+EXTRACT_ANON_NSPACES   = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
+# undocumented members inside documented classes or files. If set to NO these
+# members will be included in the various overviews, but no documentation
+# section is generated. This option has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy. If set
+# to NO, these classes will be included in the various overviews. This option
+# has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
+# The default value is: NO.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# documentation blocks found inside the body of a function. If set to NO, these
+# blocks will be appended to the function's detailed documentation block.
+# The default value is: NO.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation that is typed after a
+# \internal command is included. If the tag is set to NO then the documentation
+# will be excluded. Set it to YES to include the internal documentation.
+# The default value is: NO.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
+# names in lower-case letters. If set to YES, upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# (including Cygwin) ands Mac users are advised to set this option to NO.
+# The default value is: system dependent.
+
+CASE_SENSE_NAMES       = NO
+
+# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# their full class and namespace scopes in the documentation. If set to YES, the
+# scope will be hidden.
+# The default value is: NO.
+
+HIDE_SCOPE_NAMES       = YES
+
+# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
+# append additional text to a page's title, such as Class Reference. If set to
+# YES the compound reference will be hidden.
+# The default value is: NO.
+
+HIDE_COMPOUND_REFERENCE= NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# the files that are included by a file in the documentation of that file.
+# The default value is: YES.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
+# grouped member an include statement to the documentation, telling the reader
+# which file to include in order to use the member.
+# The default value is: NO.
+
+SHOW_GROUPED_MEMB_INC  = NO
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# files with double quotes in the documentation rather than with sharp brackets.
+# The default value is: NO.
+
+FORCE_LOCAL_INCLUDES   = NO
+
+# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
+# documentation for inline members.
+# The default value is: YES.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# (detailed) documentation of file and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order.
+# The default value is: YES.
+
+SORT_MEMBER_DOCS       = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
+# The default value is: NO.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO the constructors will appear in the
+# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
+# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
+# member documentation.
+# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
+# detailed member documentation.
+# The default value is: NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# of group names into alphabetical order. If set to NO the group names will
+# appear in their defined order.
+# The default value is: NO.
+
+SORT_GROUP_NAMES       = YES
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
+# fully-qualified names, including namespaces. If set to NO, the class list will
+# be sorted only by class name, not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the alphabetical
+# list.
+# The default value is: NO.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# type resolution of all parameters of a function it will reject a match between
+# the prototype and the implementation of a member function even if there is
+# only one candidate or it is obvious which candidate to choose by doing a
+# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# accept a match between prototype and implementation in such cases.
+# The default value is: NO.
+
+STRICT_PROTO_MATCHING  = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
+# list. This list is created by putting \todo commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
+# list. This list is created by putting \test commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
+# list. This list is created by putting \bug commands in the documentation.
+# The default value is: YES.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
+# the deprecated list. This list is created by putting \deprecated commands in
+# the documentation.
+# The default value is: YES.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional documentation
+# sections, marked by \if <section_label> ... \endif and \cond <section_label>
+# ... \endcond blocks.
+
+ENABLED_SECTIONS       =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
+# initial value of a variable or macro / define can have for it to appear in the
+# documentation. If the initializer consists of more lines than specified here
+# it will be hidden. Use a value of 0 to hide initializers completely. The
+# appearance of the value of individual variables and macros / defines can be
+# controlled using \showinitializer or \hideinitializer command in the
+# documentation regardless of this setting.
+# Minimum value: 0, maximum value: 10000, default value: 30.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
+# the bottom of the documentation of classes and structs. If set to YES, the
+# list will mention the files that were used to generate the documentation.
+# The default value is: YES.
+
+SHOW_USED_FILES        = YES
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
+# will remove the Files entry from the Quick Index and from the Folder Tree View
+# (if specified).
+# The default value is: YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
+# page. This will remove the Namespaces entry from the Quick Index and from the
+# Folder Tree View (if specified).
+# The default value is: YES.
+
+SHOW_NAMESPACES        = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command command input-file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
+# by doxygen. Whatever the program writes to standard output is used as the file
+# version. For an example see the documentation.
+
+FILE_VERSION_FILTER    =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file.
+#
+# Note that if you run doxygen from a directory containing a file called
+# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# tag is left empty.
+
+LAYOUT_FILE            = @DOXYGEN_LAYOUT_FILE@
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
+# the reference definitions. This must be a list of .bib files. The .bib
+# extension is automatically appended if omitted. This requires the bibtex tool
+# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info.
+# For LaTeX the style of the bibliography can be controlled using
+# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. See also \cite for info how to create references.
+
+CITE_BIB_FILES         =
+
+#---------------------------------------------------------------------------
+# Configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated to
+# standard output by doxygen. If QUIET is set to YES this implies that the
+# messages are off.
+# The default value is: NO.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
+# this implies that the warnings are on.
+#
+# Tip: Turn warnings on while writing the documentation.
+# The default value is: YES.
+
+WARNINGS               = YES
+
+# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
+# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: YES.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some parameters
+# in a documented function, or documenting parameters that don't exist or using
+# markup commands wrongly.
+# The default value is: YES.
+
+WARN_IF_DOC_ERROR      = YES
+
+# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
+# are documented, but have no documentation for their parameters or return
+# value. If set to NO, doxygen will only warn about wrong or incomplete
+# parameter documentation, but not about the absence of documentation. If
+# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
+# The default value is: NO.
+
+WARN_NO_PARAMDOC       = NO
+
+# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
+# a warning is encountered.
+# The default value is: NO.
+
+WARN_AS_ERROR          = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that doxygen
+# can produce. The string should contain the $file, $line, and $text tags, which
+# will be replaced by the file and line number from which the warning originated
+# and the warning text. Optionally the format may contain $version, which will
+# be replaced by the version of the file (if it could be obtained via
+# FILE_VERSION_FILTER)
+# The default value is: $file:$line: $text.
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning and error
+# messages should be written. If left blank the output is written to standard
+# error (stderr).
+
+WARN_LOGFILE           =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag is used to specify the files and/or directories that contain
+# documented source files. You may enter file names like myfile.cpp or
+# directories like /usr/src/myproject. Separate the files or directories with
+# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
+# Note: If this tag is empty the current directory is searched.
+
+INPUT                  = @DOXYGEN_INPUT_DIRECTORY@
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
+# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
+# documentation (see: https://www.gnu.org/software/libiconv/) for the list of
+# possible encodings.
+# The default value is: UTF-8.
+
+INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
+# *.h) to filter out the source-files in the directories.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# read by doxygen.
+#
+# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
+# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
+# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (to be provided as doxygen
+# C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
+
+FILE_PATTERNS  = H5*public.h H5*module.h H5*develop.h H5FD*.h \
+                 H5VLconnector.h H5VLconnector_passthru.h H5VLnative.h H5PLextern.h \
+                 H5Zdevelop.h \
+                 H5version.h \
+                 H5*.java \
+                 HDF*.java \
+                 *.F90 \
+                 *.dox \
+                 H5Cpp.h H5AbstractDs.h H5AtomType.h H5Attribute.h H5CommonFG.h H5CompType.h \
+                 H5DataSet.h H5DataSpace.h H5DataType.h H5OcreatProp.h H5DaccProp.h H5DcreatProp.h \
+                 H5DxferProp.h H5EnumType.h H5Exception.h H5FaccProp.h H5FcreatProp.h H5File.h \
+                 H5FloatType.h H5Group.h H5IdComponent.h H5Include.h H5IntType.h H5LcreatProp.h \
+                 H5LaccProp.h H5Library.h H5Location.h H5Object.h H5PredType.h H5PropList.h H5StrType.h \
+                 H5ArrayType.h H5VarLenType.h
+
+# The RECURSIVE tag can be used to specify whether or not subdirectories should
+# be searched for input files as well.
+# The default value is: NO.
+
+RECURSIVE              = YES
+
+# The EXCLUDE tag can be used to specify files and/or directories that should be
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+#
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
+
+EXCLUDE                = examples
+
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
+# from the input.
+# The default value is: NO.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories.
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       = */fortran/test/*
+EXCLUDE_PATTERNS      += */fortran/testpar/*
+EXCLUDE_PATTERNS      += */fortran/examples/*
+EXCLUDE_PATTERNS      += */fortran/src/*.c
+EXCLUDE_PATTERNS      += */fortran/src/*.h
+EXCLUDE_PATTERNS      += */hl/fortran/examples/*
+EXCLUDE_PATTERNS      += */hl/fortran/test/*
+EXCLUDE_PATTERNS      += */hl/fortran/src/*.c
+EXCLUDE_PATTERNS      += */hl/fortran/src/*.h
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories use the pattern */test/*
+
+EXCLUDE_SYMBOLS        =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or directories
+# that contain example code fragments that are included (see the \include
+# command).
+
+EXAMPLE_PATH           = @DOXYGEN_EXAMPLES_DIRECTORY@
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank all
+# files are included.
+
+EXAMPLE_PATTERNS       = *.c
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude commands
+# irrespective of the value of the RECURSIVE tag.
+# The default value is: NO.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or directories
+# that contain images that are to be included in the documentation (see the
+# \image command).
+
+IMAGE_PATH             = @DOXYGEN_DIR@/img
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command:
+#
+# <filter> <input-file>
+#
+# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
+# name of an input file. Doxygen will then use the output that the filter
+# program writes to standard output. If FILTER_PATTERNS is specified, this tag
+# will be ignored.
+#
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
+
+INPUT_FILTER           =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form: pattern=filter
+# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
+# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
+# patterns match the file name, INPUT_FILTER is applied.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
+
+FILTER_PATTERNS        =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will also be used to filter the input files that are used for
+# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# The default value is: NO.
+
+FILTER_SOURCE_FILES    = NO
+
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
+# it is also possible to disable source filtering for a specific pattern using
+# *.ext= (so without naming a filter).
+# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
+
+FILTER_SOURCE_PATTERNS =
+
+# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (index.html). This can be useful if you have a project on for instance GitHub
+# and want to reuse the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE =
+
+#---------------------------------------------------------------------------
+# Configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
+# generated. Documented entities will be cross-referenced with these sources.
+#
+# Note: To get rid of all source code in the generated output, make sure that
+# also VERBATIM_HEADERS is set to NO.
+# The default value is: NO.
+
+SOURCE_BROWSER         = NO
+
+# Setting the INLINE_SOURCES tag to YES will include the body of functions,
+# classes and enums directly into the documentation.
+# The default value is: NO.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
+# special comment blocks from generated source code fragments. Normal C, C++ and
+# Fortran comments will always remain visible.
+# The default value is: YES.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
+# entity all documented functions referencing it will be listed.
+# The default value is: NO.
+
+REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES then for each documented function
+# all documented entities called/used by that function will be listed.
+# The default value is: NO.
+
+REFERENCES_RELATION    = NO
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
+# to YES then the hyperlinks from functions in REFERENCES_RELATION and
+# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
+# link to the documentation.
+# The default value is: YES.
+
+REFERENCES_LINK_SOURCE = NO
+
+# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
+# source code will show a tooltip with additional information such as prototype,
+# brief description and links to the definition and documentation. Since this
+# will make the HTML file larger and loading of large files a bit slower, you
+# can opt to disable this feature.
+# The default value is: YES.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+SOURCE_TOOLTIPS        = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code will
+# point to the HTML generated by the htags(1) tool instead of doxygen built-in
+# source browser. The htags tool is part of GNU's global source tagging system
+# (see https://www.gnu.org/software/global/global.html). You will need version
+# 4.8.6 or higher.
+#
+# To use it do the following:
+# - Install the latest version of global
+# - Enable SOURCE_BROWSER and USE_HTAGS in the configuration file
+# - Make sure the INPUT points to the root of the source tree
+# - Run doxygen as normal
+#
+# Doxygen will invoke htags (and that will in turn invoke gtags), so these
+# tools must be available from the command line (i.e. in the search path).
+#
+# The result: instead of the source browser generated by doxygen, the links to
+# source code will now point to the output of htags.
+# The default value is: NO.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
+# verbatim copy of the header file for each class for which an include is
+# specified. Set to NO to disable this.
+# See also: Section \class.
+# The default value is: YES.
+
+VERBATIM_HEADERS       = NO
+
+# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the
+# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the
+# cost of reduced performance. This can be particularly helpful with template
+# rich C++ code for which doxygen's built-in parser lacks the necessary type
+# information.
+# Note: The availability of this option depends on whether or not doxygen was
+# generated with the -Duse_libclang=ON option for CMake.
+# The default value is: NO.
+
+CLANG_ASSISTED_PARSING = NO
+
+# If clang assisted parsing is enabled you can provide the compiler with command
+# line options that you would normally use when invoking the compiler. Note that
+# the include paths will already be set by doxygen for the files and directories
+# specified with INPUT and INCLUDE_PATH.
+# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
+
+CLANG_OPTIONS          =
+
+# If clang assisted parsing is enabled you can provide the clang parser with the
+# path to the compilation database (see:
+# http://clang.llvm.org/docs/HowToSetupToolingForLLVM.html) used when the files
+# were built. This is equivalent to specifying the "-p" option to a clang tool,
+# such as clang-check. These options will then be passed to the parser.
+# Note: The availability of this option depends on whether or not doxygen was
+# generated with the -Duse_libclang=ON option for CMake.
+
+CLANG_DATABASE_PATH    =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
+# compounds will be generated. Enable this if the project contains a lot of
+# classes, structs, unions or interfaces.
+# The default value is: YES.
+
+ALPHABETICAL_INDEX     = YES
+
+# In case all classes in a project start with a common prefix, all classes will
+# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
+# can be used to specify a prefix (or a list of prefixes) that should be ignored
+# while generating the index headers.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+IGNORE_PREFIX          = H5
+
+#---------------------------------------------------------------------------
+# Configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
+# The default value is: YES.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
+# generated HTML page (for example: .htm, .php, .asp).
+# The default value is: .html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
+# each generated HTML page. If the tag is left blank doxygen will generate a
+# standard header.
+#
+# To get valid HTML the header file that includes any scripts and style sheets
+# that doxygen needs, which is dependent on the configuration options used (e.g.
+# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
+# default header using
+# doxygen -w html new_header.html new_footer.html new_stylesheet.css
+# YourConfigFile
+# and then modify the file new_header.html. See also section "Doxygen usage"
+# for information on how to generate the default header that doxygen normally
+# uses.
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. For a description
+# of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_HEADER            = @DOXYGEN_HTML_HEADER@
+
+# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
+# generated HTML page. If the tag is left blank doxygen will generate a standard
+# footer. See HTML_HEADER for more information on how to generate a default
+# footer and what special commands can be used inside the footer. See also
+# section "Doxygen usage" for information on how to generate the default footer
+# that doxygen normally uses.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FOOTER            = @DOXYGEN_HTML_FOOTER@
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
+# sheet that is used by each HTML page. It can be used to fine-tune the look of
+# the HTML output. If left blank doxygen will generate a default style sheet.
+# See also section "Doxygen usage" for information on how to generate the style
+# sheet that doxygen normally uses.
+# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
+# it is more robust and this tag (HTML_STYLESHEET) will in the future become
+# obsolete.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_STYLESHEET        =
+
+# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# cascading style sheets that are included after the standard style sheets
+# created by doxygen. Using this option one can overrule certain style aspects.
+# This is preferred over using HTML_STYLESHEET since it does not replace the
+# standard style sheet and is therefore more robust against future updates.
+# Doxygen will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list). For an example see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_STYLESHEET  = @DOXYGEN_HTML_EXTRA_STYLESHEET@
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
+# files will be copied as-is; there are no commands or markers available.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_FILES       = @DOXYGEN_HTML_EXTRA_FILES@
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
+# will adjust the colors in the style sheet and background images according to
+# this color. Hue is specified as an angle on a colorwheel, see
+# https://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
+# purple, and 360 is red again.
+# Minimum value: 0, maximum value: 359, default value: 220.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_HUE    = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
+# in the HTML output. For a value of 0 the output will use grayscales only. A
+# value of 255 will produce the most vivid colors.
+# Minimum value: 0, maximum value: 255, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_SAT    = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
+# luminance component of the colors in the HTML output. Values below 100
+# gradually make the output lighter, whereas values above 100 make the output
+# darker. The value divided by 100 is the actual gamma applied, so 80 represents
+# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
+# change the gamma.
+# Minimum value: 40, maximum value: 240, default value: 80.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_GAMMA  = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting this
+# to YES can help to show when doxygen was last run and thus if the
+# documentation is up to date.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_TIMESTAMP         = YES
+
+# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
+# documentation will contain a main index with vertical navigation menus that
+# are dynamically created via JavaScript. If disabled, the navigation index will
+# consists of multiple levels of tabs that are statically embedded in every HTML
+# page. Disable this option to support browsers that do not have JavaScript,
+# like the Qt help browser.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_MENUS     = NO
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_SECTIONS  = YES
+
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
+# shown in the various tree structured indices initially; the user can expand
+# and collapse entries dynamically later on. Doxygen will expand the tree to
+# such a level that at most the specified number of entries are visible (unless
+# a fully collapsed tree already exceeds this amount). So setting the number of
+# entries 1 will produce a full collapsed tree by default. 0 is a special value
+# representing an infinite number of entries and will result in a full expanded
+# tree by default.
+# Minimum value: 0, maximum value: 9999, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files will be
+# generated that can be used as input for Apple's Xcode 3 integrated development
+# environment (see: https://developer.apple.com/xcode/), introduced with OSX
+# 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# Makefile in the HTML output directory. Running make will produce the docset in
+# that directory and running make install will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
+# startup. See https://developer.apple.com/library/archive/featuredarticles/Doxy
+# genXcode/_index.html for more information.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_DOCSET        = NO
+
+# This tag determines the name of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# The default value is: Doxygen generated docs.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# This tag specifies a string that should uniquely identify the documentation
+# set bundle. This should be a reverse domain-name style string, e.g.
+# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+
+# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+# The default value is: org.doxygen.Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+
+# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
+# The default value is: Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_NAME  = Publisher
+
+# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
+# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
+# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
+# (see: https://www.microsoft.com/en-us/download/details.aspx?id=21138) on
+# Windows.
+#
+# The HTML Help Workshop contains a compiler that can convert all HTML output
+# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
+# files are now used as the Windows 98 help format, and will replace the old
+# Windows help format (.hlp) on all Windows platforms in the future. Compressed
+# HTML files also contain an index, a table of contents, and you can search for
+# words in the documentation. The HTML workshop also contains a viewer for
+# compressed HTML files.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_HTMLHELP      = NO
+
+# The CHM_FILE tag can be used to specify the file name of the resulting .chm
+# file. You can add a path in front of the file if the result should not be
+# written to the html output directory.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_FILE               =
+
+# The HHC_LOCATION tag can be used to specify the location (absolute path
+# including file name) of the HTML help compiler (hhc.exe). If non-empty,
+# doxygen will try to run the HTML help compiler on the generated index.hhp.
+# The file has to be specified with full path.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+HHC_LOCATION           =
+
+# The GENERATE_CHI flag controls if a separate .chi index file is generated
+# (YES) or that it should be included in the master .chm file (NO).
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+GENERATE_CHI           = NO
+
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
+# and project file content.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_INDEX_ENCODING     =
+
+# The BINARY_TOC flag controls whether a binary table of contents is generated
+# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
+# enables the Previous and Next buttons.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members to
+# the table of contents of the HTML help documentation and to the tree view.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+TOC_EXPAND             = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
+# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
+# (.qch) of the generated HTML documentation.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
+# the file name of the resulting .qch file. The path specified is relative to
+# the HTML output folder.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QCH_FILE               =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
+# Project output. For more information please see Qt Help Project / Namespace
+# (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#namespace).
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_NAMESPACE          = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
+# Help Project output. For more information please see Qt Help Project / Virtual
+# Folders (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#virtual-
+# folders).
+# The default value is: doc.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
+# filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_NAME   =
+
+# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_ATTRS  =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's filter section matches. Qt Help Project / Filter Attributes (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#filter-attributes).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_SECT_FILTER_ATTRS  =
+
+# The QHG_LOCATION tag can be used to specify the location of Qt's
+# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
+# generated .qhp file.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHG_LOCATION           =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
+# generated, together with the HTML files, they form an Eclipse help plugin. To
+# install this plugin and make it available under the help contents menu in
+# Eclipse, the contents of the directory containing the HTML and XML files needs
+# to be copied into the plugins directory of eclipse. The name of the directory
+# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
+# After copying Eclipse needs to be restarted before the help appears.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_ECLIPSEHELP   = NO
+
+# A unique identifier for the Eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have this
+# name. Each documentation set should have its own identifier.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
+
+ECLIPSE_DOC_ID         = org.doxygen.Project
+
+# If you want full control over the layout of the generated HTML pages it might
+# be necessary to disable the index and replace it with your own. The
+# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
+# of each HTML page. A value of NO enables the index and the value YES disables
+# it. Since the tabs in the index contain the same information as the navigation
+# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+DISABLE_INDEX          = YES
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information. If the tag
+# value is set to YES, a side panel will be generated containing a tree-like
+# index structure (just like the one that is generated for HTML Help). For this
+# to work a browser that supports JavaScript, DHTML, CSS and frames is required
+# (i.e. any modern browser). Windows users are probably better off using the
+# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
+# further fine-tune the look of the index. As an example, the default style
+# sheet generated by doxygen has an example that shows how to put an image at
+# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
+# the same information as the tab index, you could consider setting
+# DISABLE_INDEX to YES when enabling this option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_TREEVIEW      = YES
+
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
+# doxygen will group on one line in the generated HTML documentation.
+#
+# Note that a value of 0 will completely suppress the enum values from appearing
+# in the overview section.
+# Minimum value: 0, maximum value: 20, default value: 4.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
+# to set the initial width (in pixels) of the frame in which the tree is shown.
+# Minimum value: 0, maximum value: 1500, default value: 250.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+TREEVIEW_WIDTH         = 250
+
+# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
+# external symbols imported via tag files in a separate window.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+EXT_LINKS_IN_WINDOW    = NO
+
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png The default and svg Looks nicer but requires the
+# pdf2svg tool.
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT    = png
+
+# Use this tag to change the font size of LaTeX formulas included as images in
+# the HTML documentation. When you change the font size after a successful
+# doxygen run you need to manually remove any form_*.png images from the HTML
+# output directory to force them to be regenerated.
+# Minimum value: 8, maximum value: 50, default value: 10.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_FONTSIZE       = 10
+
+# Use the FORMULA_TRANSPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are not
+# supported properly for IE 6.0, but are supported on all modern browsers.
+#
+# Note that when changing this option you need to delete any form_*.png files in
+# the HTML output directory before the changes have effect.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_TRANSPARENT    = YES
+
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE      =
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
+# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
+# installed or if you want to formulas look prettier in the HTML output. When
+# enabled you may also need to install MathJax separately and configure the path
+# to it using the MATHJAX_RELPATH option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+USE_MATHJAX            = NO
+
+# When MathJax is enabled you can set the default output format to be used for
+# the MathJax output. See the MathJax site (see:
+# http://docs.mathjax.org/en/latest/output.html) for more details.
+# Possible values are: HTML-CSS (which is slower, but has the best
+# compatibility), NativeMML (i.e. MathML) and SVG.
+# The default value is: HTML-CSS.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_FORMAT         = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the HTML
+# output directory using the MATHJAX_RELPATH option. The destination directory
+# should contain the MathJax.js script. For instance, if the mathjax directory
+# is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
+# Content Delivery Network so you can quickly see the result without installing
+# MathJax. However, it is strongly recommended to install a local copy of
+# MathJax from https://www.mathjax.org before deployment.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_RELPATH        = https://cdn.jsdelivr.net/npm/mathjax@2
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+# extension names that should be enabled during MathJax rendering. For example
+# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_EXTENSIONS     =
+
+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
+# of code that will be used on startup of the MathJax code. See the MathJax site
+# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
+# example see the documentation.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_CODEFILE       =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
+# the HTML output. The underlying search engine uses javascript and DHTML and
+# should work on any modern browser. Note that when using HTML help
+# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
+# there is already a search function so this one should typically be disabled.
+# For large projects the javascript based search engine can be slow, then
+# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
+# search using the keyboard; to jump to the search box use <access key> + S
+# (what the <access key> is depends on the OS and browser, but it is typically
+# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
+# key> to jump into the search results window, the results can be navigated
+# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
+# the search. The filter options can be selected when the cursor is inside the
+# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
+# to select a filter and <Enter> or <escape> to activate or cancel the filter
+# option.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+SEARCHENGINE           = YES
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a web server instead of a web client using JavaScript. There
+# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
+# setting. When disabled, doxygen will generate a PHP script for searching and
+# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
+# and searching needs to be provided by external tools. See the section
+# "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SERVER_BASED_SEARCH    = @DOXYGEN_SERVER_BASED_SEARCH@
+
+# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
+# search results.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: https://xapian.org/).
+#
+# See the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH        = @DOXYGEN_EXTERNAL_SEARCH@
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will return the search results when EXTERNAL_SEARCH is enabled.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: https://xapian.org/). See the section "External Indexing and
+# Searching" for details.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHENGINE_URL       = @DOXYGEN_SEARCHENGINE_URL@
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+# The default file is: searchdata.xml.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHDATA_FILE        = searchdata.xml
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH_ID     =
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
+# to a relative location where the documentation can be found. The format is:
+# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTRA_SEARCH_MAPPINGS  =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
+# The default value is: YES.
+
+GENERATE_LATEX         = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked.
+#
+# Note that when not enabling USE_PDFLATEX the default is latex when enabling
+# USE_PDFLATEX the default is pdflatex and when in the later case latex is
+# chosen this is overwritten by pdflatex. For specific output languages the
+# default can have been set differently, this depends on the implementation of
+# the output language.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_CMD_NAME         =
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
+# index for LaTeX.
+# Note: This tag is used in the Makefile / make.bat.
+# See also: LATEX_MAKEINDEX_CMD for the part in the generated output file
+# (.tex).
+# The default file is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# The LATEX_MAKEINDEX_CMD tag can be used to specify the command name to
+# generate index for LaTeX. In case there is no backslash (\) as first character
+# it will be automatically added in the LaTeX code.
+# Note: This tag is used in the generated output file (.tex).
+# See also: MAKEINDEX_CMD_NAME for the part in the Makefile / make.bat.
+# The default value is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_MAKEINDEX_CMD    = makeindex
+
+# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used by the
+# printer.
+# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
+# 14 inches) and executive (7.25 x 10.5 inches).
+# The default value is: a4.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PAPER_TYPE             = a4
+
+# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
+# that should be included in the LaTeX output. The package can be specified just
+# by its name or with the correct syntax as to be used with the LaTeX
+# \usepackage command. To get the times font for instance you can specify :
+# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times}
+# To use the option intlimits with the amsmath package you can specify:
+# EXTRA_PACKAGES=[intlimits]{amsmath}
+# If left blank no extra packages will be included.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+EXTRA_PACKAGES         =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
+# generated LaTeX document. The header should contain everything until the first
+# chapter. If it is left blank doxygen will generate a standard header. See
+# section "Doxygen usage" for information on how to let doxygen write the
+# default header to a separate file.
+#
+# Note: Only use a user-defined header if you know what you are doing! The
+# following commands have a special meaning inside the header: $title,
+# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
+# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
+# string, for the replacement values of the other commands the user is referred
+# to HTML_HEADER.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HEADER           =
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
+# generated LaTeX document. The footer should contain everything after the last
+# chapter. If it is left blank doxygen will generate a standard footer. See
+# LATEX_HEADER for more information on how to generate a default footer and what
+# special commands can be used inside the footer.
+#
+# Note: Only use a user-defined footer if you know what you are doing!
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_FOOTER           =
+
+# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# LaTeX style sheets that are included after the standard style sheets created
+# by doxygen. Using this option one can overrule certain style aspects. Doxygen
+# will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list).
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_STYLESHEET =
+
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the LATEX_OUTPUT output
+# directory. Note that the files will be copied as-is; there are no commands or
+# markers available.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_FILES      =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
+# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
+# contain links (just like the HTML output) instead of page references. This
+# makes the output suitable for online browsing using a PDF viewer.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PDF_HYPERLINKS         = YES
+
+# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
+# the PDF file directly from the LaTeX files. Set this option to YES, to get a
+# higher quality PDF documentation.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+USE_PDFLATEX           = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
+# command to the generated LaTeX files. This will instruct LaTeX to keep running
+# if errors occur, instead of asking the user for help. This option is also used
+# when generating formulas in HTML.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BATCHMODE        = NO
+
+# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
+# index chapters (such as File Index, Compound Index, etc.) in the output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HIDE_INDICES     = NO
+
+# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
+# code with syntax highlighting in the LaTeX output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_SOURCE_CODE      = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. See
+# https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# The default value is: plain.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BIB_STYLE        = plain
+
+# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
+# page will contain the date and time when the page was generated. Setting this
+# to NO can help when comparing the output of multiple runs.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_TIMESTAMP        = NO
+
+# The LATEX_EMOJI_DIRECTORY tag is used to specify the (relative or absolute)
+# path from which the emoji images will be read. If a relative path is entered,
+# it will be relative to the LATEX_OUTPUT directory. If left blank the
+# LATEX_OUTPUT directory will be used.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EMOJI_DIRECTORY  =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
+# RTF output is optimized for Word 97 and may not look too pretty with other RTF
+# readers/editors.
+# The default value is: NO.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: rtf.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
+# contain hyperlink fields. The RTF file will contain links (just like the HTML
+# output) instead of page references. This makes the output suitable for online
+# browsing using Word or some other Word compatible readers that support those
+# fields.
+#
+# Note: WordPad (write) and others do not support links.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# configuration file, i.e. a series of assignments. You only have to provide
+# replacements, missing definitions are set to their default value.
+#
+# See also section "Doxygen usage" for information on how to generate the
+# default style sheet that doxygen normally uses.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_STYLESHEET_FILE    =
+
+# Set optional variables used in the generation of an RTF document. Syntax is
+# similar to doxygen's configuration file. A template extensions file can be
+# generated using doxygen -e rtf extensionFile.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_EXTENSIONS_FILE    =
+
+# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
+# with syntax highlighting in the RTF output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_SOURCE_CODE        = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
+# classes and files.
+# The default value is: NO.
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it. A directory man3 will be created inside the directory specified by
+# MAN_OUTPUT.
+# The default directory is: man.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to the generated
+# man pages. In case the manual section does not start with a number, the number
+# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
+# optional.
+# The default value is: .3.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_EXTENSION          = .3
+
+# The MAN_SUBDIR tag determines the name of the directory created within
+# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
+# MAN_EXTENSION with the initial . removed.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_SUBDIR             =
+
+# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+# will generate one additional man file for each entity documented in the real
+# man page(s). These additional files only source the real man page, but without
+# them the man command would be unable to find the correct page.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
+# captures the structure of the code including all documentation.
+# The default value is: NO.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: xml.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_OUTPUT             = xml
+
+# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
+# listings (including syntax highlighting and cross-referencing information) to
+# the XML output. Note that enabling this will significantly increase the size
+# of the XML output.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_PROGRAMLISTING     = YES
+
+# If the XML_NS_MEMB_FILE_SCOPE tag is set to YES, doxygen will include
+# namespace members in file scope as well, matching the HTML output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_NS_MEMB_FILE_SCOPE = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
+# that can be used to generate PDF.
+# The default value is: NO.
+
+GENERATE_DOCBOOK       = NO
+
+# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it.
+# The default directory is: docbook.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_OUTPUT         = docbook
+
+# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
+# program listings (including syntax highlighting and cross-referencing
+# information) to the DOCBOOK output. Note that enabling this will significantly
+# increase the size of the DOCBOOK output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_PROGRAMLISTING = NO
+
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
+# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures
+# the structure of the code including all documentation. Note that this feature
+# is still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
+# file that captures the structure of the code including all documentation.
+#
+# Note that this feature is still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
+# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
+# output from the Perl module output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
+# formatted so it can be parsed by a human reader. This is useful if you want to
+# understand what is going on. On the other hand, if this tag is set to NO, the
+# size of the Perl module output will be much smaller and Perl will parse it
+# just the same.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file are
+# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
+# so different doxyrules.make files included by the same Makefile don't
+# overwrite each other's variables.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
+# C-preprocessor directives found in the sources and include files.
+# The default value is: YES.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
+# in the source code. If set to NO, only conditional compilation will be
+# performed. Macro expansion can be done in a controlled way by setting
+# EXPAND_ONLY_PREDEF to YES.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+MACRO_EXPANSION        = YES
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+# the macro expansion is limited to the macros specified with the PREDEFINED and
+# EXPAND_AS_DEFINED tags.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES, the include files in the
+# INCLUDE_PATH will be searched if a #include is found.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by the
+# preprocessor.
+# This tag requires that the tag SEARCH_INCLUDES is set to YES.
+
+INCLUDE_PATH           =
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will be
+# used.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+INCLUDE_FILE_PATTERNS  =
+
+# The PREDEFINED tag can be used to specify one or more macro names that are
+# defined before the preprocessor is started (similar to the -D option of e.g.
+# gcc). The argument of the tag is a list of macros of the form: name or
+# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
+# is assumed. To prevent a macro definition from being undefined via #undef or
+# recursively expanded use the := operator instead of the = operator.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+PREDEFINED             = @DOXYGEN_PREDEFINED@
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+# tag can be used to specify a list of macro names that should be expanded. The
+# macro definition that is found in the sources will be used. Use the PREDEFINED
+# tag if you want to use a different macro definition that overrules the
+# definition found in the source code.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_AS_DEFINED      =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+# remove all references to function-like macros that are alone on a line, have
+# an all uppercase name, and do not end with a semicolon. Such function macros
+# are typically used for boiler-plate code, and will confuse the parser if not
+# removed.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES tag can be used to specify one or more tag files. For each tag
+# file the location of the external documentation should be added. The format of
+# a tag file without this location is as follows:
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where loc1 and loc2 can be relative or absolute paths or URLs. See the
+# section "Linking to external documentation" for more information about the use
+# of tag files.
+# Note: Each tag file must have a unique name (where the name does NOT include
+# the path). If a tag file is not located in the directory in which doxygen is
+# run, you must also specify the path to the tagfile here.
+
+TAGFILES               =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
+# tag file that is based on the input files it reads. See section "Linking to
+# external documentation" for more information about the usage of tag files.
+
+GENERATE_TAGFILE       = @DOXYGEN_TAG_FILE@
+
+# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
+# the class index. If set to NO, only the inherited external classes will be
+# listed.
+# The default value is: NO.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will be
+# listed.
+# The default value is: YES.
+
+EXTERNAL_GROUPS        = YES
+
+# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
+# the related pages index. If set to NO, only the current project's pages will
+# be listed.
+# The default value is: YES.
+
+EXTERNAL_PAGES         = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
+# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
+# NO turns the diagrams off. Note that this option also works with HAVE_DOT
+# disabled, but it is recommended to install and use dot, since it yields more
+# powerful graphs.
+# The default value is: YES.
+
+CLASS_DIAGRAMS         = YES
+
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
+
+DIA_PATH               =
+
+# If set to YES the inheritance and collaboration graphs will hide inheritance
+# and usage relations if the target is undocumented or is not a class.
+# The default value is: YES.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz (see:
+# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# Bell Labs. The other options in this section have no effect if this option is
+# set to NO
+# The default value is: NO.
+
+HAVE_DOT               = NO
+
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
+# to run in parallel. When set to 0 doxygen will base this on the number of
+# processors available in the system. You can set it explicitly to a value
+# larger than 0 to get control over the balance between CPU load and processing
+# speed.
+# Minimum value: 0, maximum value: 32, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_NUM_THREADS        = 0
+
+# When you want a differently looking font in the dot files that doxygen
+# generates you can specify the font name using DOT_FONTNAME. You need to make
+# sure dot is able to find the font, which can be done by putting it in a
+# standard location or by setting the DOTFONTPATH environment variable or by
+# setting DOT_FONTPATH to the directory containing the font.
+# The default value is: Helvetica.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTNAME           = Helvetica
+
+# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
+# dot graphs.
+# Minimum value: 4, maximum value: 24, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the default font as specified with
+# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
+# the path where dot can find it using this tag.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTPATH           =
+
+# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
+# each documented class showing the direct and indirect inheritance relations.
+# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
+# graph for each documented class showing the direct and indirect implementation
+# dependencies (inheritance, containment, and class references variables) of the
+# class with other documented classes.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+COLLABORATION_GRAPH    = YES
+
+# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
+# groups, showing the direct groups dependencies.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LOOK               = NO
+
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
+# class node. If there are many fields or methods and many nodes the graph may
+# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
+# number of items for each type to make the size more manageable. Set this to 0
+# for no limit. Note that the threshold may be exceeded by 50% before the limit
+# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
+# but if the number exceeds 15, the total amount of fields shown is limited to
+# 10.
+# Minimum value: 0, maximum value: 100, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LIMIT_NUM_FIELDS   = 10
+
+# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
+# collaboration graphs will show the relations between templates and their
+# instances.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+TEMPLATE_RELATIONS     = NO
+
+# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
+# YES then doxygen will generate a graph for each documented file showing the
+# direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDE_GRAPH          = YES
+
+# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
+# set to YES then doxygen will generate a graph for each documented file showing
+# the direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command. Disabling a call graph can be
+# accomplished by means of the command \hidecallgraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALL_GRAPH             = NO
+
+# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
+# functions only using the \callergraph command. Disabling a caller graph can be
+# accomplished by means of the command \hidecallergraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALLER_GRAPH           = NO
+
+# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
+# hierarchy of all classes instead of a textual one.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
+# dependencies a directory has on other directories in a graphical way. The
+# dependency relations are determined by the #include relations between the
+# files in the directories.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. For an explanation of the image formats see the section
+# output formats in the documentation of the dot tool (Graphviz (see:
+# http://www.graphviz.org/)).
+# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
+# to make the SVG files visible in IE 9+ (other browsers do not have this
+# requirement).
+# Possible values are: png, jpg, gif, svg, png:gd, png:gd:gd, png:cairo,
+# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
+# png:gdiplus:gdiplus.
+# The default value is: png.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_IMAGE_FORMAT       = png
+
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+#
+# Note that this requires a modern browser other than Internet Explorer. Tested
+# and working are Firefox, Chrome, Safari, and Opera.
+# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
+# the SVG files visible. Older versions of IE do not have SVG support.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INTERACTIVE_SVG        = NO
+
+# The DOT_PATH tag can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_PATH               =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the \dotfile
+# command).
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOTFILE_DIRS           =
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
+
+MSCFILE_DIRS           =
+
+# The DIAFILE_DIRS tag can be used to specify one or more directories that
+# contain dia files that are included in the documentation (see the \diafile
+# command).
+
+DIAFILE_DIRS           =
+
+# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
+# path where java can find the plantuml.jar file. If left blank, it is assumed
+# PlantUML is not used or called during a preprocessing step. Doxygen will
+# generate a warning when it encounters a \startuml command in this case and
+# will not generate output for the diagram.
+
+PLANTUML_JAR_PATH      =
+
+# When using plantuml, the PLANTUML_CFG_FILE tag can be used to specify a
+# configuration file for plantuml.
+
+PLANTUML_CFG_FILE      =
+
+# When using plantuml, the specified paths are searched for files specified by
+# the !include statement in a plantuml block.
+
+PLANTUML_INCLUDE_PATH  =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
+# that will be shown in the graph. If the number of nodes in a graph becomes
+# larger than this value, doxygen will truncate the graph, which is visualized
+# by representing a node as a red box. Note that doxygen if the number of direct
+# children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
+# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# Minimum value: 0, maximum value: 10000, default value: 50.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_GRAPH_MAX_NODES    = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
+# generated by dot. A depth value of 3 means that only nodes reachable from the
+# root by following a path via at most 3 edges will be shown. Nodes that lay
+# further from the root node will be omitted. Note that setting this option to 1
+# or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+# Minimum value: 0, maximum value: 1000, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not seem
+# to support this out of the box.
+#
+# Warning: Depending on the platform used, enabling this option may lead to
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
+# read).
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10) support
+# this, this feature is disabled by default.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_MULTI_TARGETS      = NO
+
+# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
+# explaining the meaning of the various boxes and arrows in the dot generated
+# graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
+# files that are used to generate the various graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_CLEANUP            = YES
diff --git a/doxygen/aliases b/doxygen/aliases
new file mode 100644
index 0000000..3fc7e10
--- /dev/null
+++ b/doxygen/aliases
@@ -0,0 +1,382 @@
+ALIASES += THG="The HDF Group"
+
+################################################################################
+# Styling
+################################################################################
+
+ALIASES += Bold{1}="<b>\1</b>"
+ALIASES += Emph{1}="<em>\1</em>"
+ALIASES += Code{1}="<tt>\1</tt>"
+
+################################################################################
+# Return values
+################################################################################
+
+ALIASES += success{1}="\Bold{Success:} \1"
+ALIASES += failure{1}="\Bold{Failure:} \1"
+
+ALIASES += herr_t="Returns a non-negative value if successful; otherwise returns a negative value."
+ALIASES += herr_t_iter="\li Zero causes the iterator to continue, returning zero when the iteration is complete. \li A positive value causes the iterator to immediately return that positive value, indicating short-circuit success. \li A negative value causes the iterator to immediately return that value, indicating failure."
+ALIASES += hid_t{1}="Returns a \1 identifier if successful; otherwise returns #H5I_INVALID_HID. "
+ALIASES += hid_ti{1}="Returns an \1 identifier if successful; otherwise returns #H5I_INVALID_HID. "
+ALIASES += hid_tv{1}="Returns an \1 identifier if successful; otherwise returns a negative value. "
+ALIASES += htri_t="Returns zero (false), a positive (true) or a negative (failure) value."
+
+ALIASES += api_vers_2{3}="\1() is a macro that is mapped to either \2() or \3().\n\see \ref api-compat-macros"
+ALIASES += api_vers_3{4}="\1() is a macro that is mapped to either \2() or \3() or \4().\n\see \ref api-compat-macros"
+ALIASES += api_vers_4{5}="\1() is a macro that is mapped to either \2() or \3() or \4() or \5().\n\see \ref api-compat-macros"
+
+ALIASES += deprecation_note{1}="\deprecated Superseded by \1."
+
+################################################################################
+# General
+################################################################################
+
+ALIASES += idx_type="\param[in] idx_type Index type"
+ALIASES += idx_type{1}="\param[in] \1 Index type"
+
+ALIASES += order="\param[in] order Iteration order"
+ALIASES += order{1}="\param[in] \1 Iteration order"
+
+ALIASES += op="\param[in] op Callback function"
+ALIASES += op{1}="\param[in] \1 Callback function"
+
+ALIASES += op_data="\param[in,out] op_data User-defined callback function context"
+ALIASES += op_data{1}="\param[in,out] \1 User-defined callback function context"
+
+ALIASES += op_data_in="\param[in] op_data User-defined callback function context"
+ALIASES += op_data_in{1}="\param[in] \1 User-defined callback function context"
+
+################################################################################
+# Asynchronous
+################################################################################
+
+ALIASES += async_variant_of{1}="Asynchronous version of \1()"
+
+################################################################################
+# Attributes
+################################################################################
+
+ALIASES += attr_id="\param[in] attr_id Attribute identifier"
+ALIASES += attr_id{1}="\param[in] \1 Attribute identifier"
+
+################################################################################
+# Dataset
+################################################################################
+
+ALIASES += dset_id="\param[in] dset_id Dataset identifier"
+ALIASES += dset_id{1}="\param[in] \1 Dataset identifier"
+
+################################################################################
+# Dataspaces
+################################################################################
+
+ALIASES += space_id="\param[in] space_id Dataspace identifier"
+ALIASES += space_id{1}="\param[in] \1 Dataspace identifier"
+
+################################################################################
+# Dataypes
+################################################################################
+
+ALIASES += type_id="\param[in] type_id Datatype identifier"
+ALIASES += type_id{1}="\param[in] \1 Datatype identifier"
+
+ALIASES += file_type_id{1}="\param[in] \1 Datatype (in-file) identifier"
+ALIASES += mem_type_id{1}="\param[in] \1 Datatype (in-memory) identifier"
+
+################################################################################
+# Errors
+################################################################################
+
+ALIASES += estack_id="\param[in] estack_id Error stack identifier"
+ALIASES += estack_id{1}="\param[in] \1 Error stack identifier"
+
+################################################################################
+# Files
+################################################################################
+
+ALIASES += file_id="\param[in] file_id File identifier"
+ALIASES += file_id{1}="\param[in] \1 File identifier"
+
+ALIASES += fapl_id="\param[in] fapl_id File access property list identifier"
+ALIASES += fapl_id{1}="\param[in] \1 File access property list identifier"
+
+ALIASES += fcpl_id="\param[in] fcpl_id File creation property list identifier"
+ALIASES += fcpl_id{1}="\param[in] \1 File creation property list identifier"
+
+################################################################################
+# Groups
+################################################################################
+
+ALIASES += group_id="\param[in] group_id Group identifier"
+ALIASES += group_id{1}="\param[in] \1 Group identifier"
+
+################################################################################
+# Locations
+################################################################################
+
+ALIASES += loc_id="\param[in] loc_id Location identifier"
+ALIASES += loc_id{1}="\param[in] \1 Location identifier"
+
+ALIASES += fgdt_loc_id="\loc_id. The identifier may be that of a file, group, dataset, or named datatype."
+ALIASES += fgdt_loc_id{1}="\loc_id{\1}. The identifier may be that of a file, group, dataset, or named datatype."
+
+ALIASES += fgdta_loc_id="\loc_id. The identifier may be that of a file, group, dataset, named datatype, or attribute."
+ALIASES += fgdta_loc_id{1}="\loc_id{\1}. The identifier may be that of a file, group, dataset, named datatype, or attribute."
+
+ALIASES += fg_loc_id="\loc_id. The identifier may be that of a file or group."
+ALIASES += fg_loc_id{1}="\loc_id{\1}. The identifier may be that of a file or group."
+
+################################################################################
+# Maps
+################################################################################
+
+ALIASES += map_id="\param[in] map_id Map identifier"
+ALIASES += map_id{1}="\param[in] \1 Map identifier"
+
+################################################################################
+# Property lists
+################################################################################
+
+ALIASES += plist_unused{1}="\note The \p \1 parameter is currently not used; specify #H5P_DEFAULT."
+
+ALIASES += aapl_id="\param[in] aapl_id Attribute access property list identifier"
+ALIASES += aapl_id{1}="\param[in] \1 Attribute access property list identifier"
+
+ALIASES += acpl_id="\param[in] acpl_id Attribute creation property list identifier"
+ALIASES += acpl_id{1}="\param[in] \1 Attribute creation property list identifier"
+
+ALIASES += dapl_id="\param[in] dapl_id Dataset access property list identifier"
+ALIASES += dapl_id{1}="\param[in] \1 Dataset access property list identifier"
+
+ALIASES += dcpl_id="\param[in] dcpl_id Dataset creation property list identifier"
+ALIASES += dcpl_id{1}="\param[in] \1 Dataset creation property list identifier"
+
+ALIASES += dxpl_id="\param[in] dxpl_id Dataset transfer property list identifier"
+ALIASES += dxpl_id{1}="\param[in] \1 Dataset transfer property list identifier"
+
+ALIASES += gacpl_id="\param[in] plist_id File, group, dataset, datatype, link, or attribute access property list identifier"
+ALIASES += gacpl_id{1}="\param[in] \1 File, group, dataset, datatype, link, or attribute access property list identifier"
+
+ALIASES += gapl_id="\param[in] gapl_id Group access property list identifier"
+ALIASES += gapl_id{1}="\param[in] \1 Group access property list identifier"
+
+ALIASES += gcpl_id="\param[in] gcpl_id Group creation property list identifier"
+ALIASES += gcpl_id{1}="\param[in] \1 Group creation property list identifier"
+
+ALIASES += lapl_id="\param[in] lapl_id Link access property list identifier"
+ALIASES += lapl_id{1}="\param[in] \1 Link access property list identifier"
+
+ALIASES += lcpl_id="\param[in] lcpl_id Link creation property list identifier"
+ALIASES += lcpl_id{1}="\param[in] \1 Link creation property list identifier"
+
+ALIASES += mapl_id="\param[in] mapl_id Map access property list identifier"
+ALIASES += mapl_id{1}="\param[in] \1 Map access property list identifier"
+
+ALIASES += mcpl_id="\param[in] mcpl_id Map creation property list identifier"
+ALIASES += mcpl_id{1}="\param[in] \1 Map creation property list identifier"
+
+ALIASES += oapl_id="\param[in] oapl_id Object access property list identifier"
+ALIASES += oapl_id{1}="\param[in] \1 Object access property list identifier"
+
+ALIASES += ocpl_id="\param[in] oapl_id Object creation property list identifier"
+ALIASES += ocpl_id{1}="\param[in] \1 Object creation property list identifier"
+
+ALIASES += plist_id="\param[in] plist_id Property list identifier"
+ALIASES += plist_id{1}="\param[in] \1 Property list identifier"
+
+ALIASES += plistcls_id="\param[in] plistcls_id Property list class identifier"
+ALIASES += plistcls_id{1}="\param[in] \1 Property list class identifier"
+
+ALIASES += rapl_id="\param[in] rapl_id Reference access property list identifier"
+ALIASES += rapl_id{1}="\param[in] \1 Reference access property list identifier"
+
+ALIASES += tapl_id="\param[in] tapl_id Datatype access property list identifier"
+ALIASES += tapl_id{1}="\param[in] \1 Datatype access property list identifier"
+
+ALIASES += tcpl_id="\param[in] tcpl_id Datatype creation property list identifier"
+ALIASES += tcpl_id{1}="\param[in] \1 Datatype creation property list identifier"
+
+ALIASES += vipl_id="\param[in] vipl_id VOL initialization property list identifier"
+ALIASES += vipl_id{1}="\param[in] \1 vipl_id VOL initialization property list identifier"
+
+################################################################################
+# Objects
+################################################################################
+
+ALIASES += obj_id="\param[in] obj_id Object identifier"
+ALIASES += obj_id{1}="\param[in] \1 Object identifier"
+ALIASES += loc_obj_id{1}="\param[in] \1 Location identifier of object"
+
+ALIASES += fgdta_obj_id="\obj_id. The identifier may be that of a file, group, dataset, named datatype, or attribute."
+ALIASES += fgdta_obj_id{1}="\obj_id{\1}. The identifier may be that of a file, group, dataset, named datatype, or attribute."
+ALIASES += fgdta_loc_obj_id{1}="\loc_obj_id{\1}. The identifier may be that of a file, group, dataset, named datatype, or attribute."
+
+################################################################################
+# Asynchronous Arguments
+################################################################################
+
+ALIASES += app_file="\param[in] app_file For internal use only, not a visible user parameter"
+ALIASES += app_func="\param[in] app_func For internal use only, not a visible user parameter"
+ALIASES += app_line="\param[in] app_line For internal use only, not a visible user parameter"
+ALIASES += es_id="\param[in] es_id Event set identifier"
+ALIASES += es_id{1}="\param[in] \1 Event set identifier"
+
+################################################################################
+# Others
+################################################################################
+
+ALIASES += cpp_c_api_note="\attention \Bold{C++ Developers using HDF5 C-API functions beware:}\n Several functions in this C-API take function pointers or callbacks as arguments. Examples include H5Pset_elink_cb(), H5Pset_type_conv_cb(), H5Tconvert(), and H5Ewalk2(). Application code must ensure that those callback functions return normally such to allow the HDF5 to manage its resources and maintain a consistent state. For instance, those functions must not use the C \c setjmp / \c longjmp mechanism to leave those callback functions. Within the context of C++, any exceptions thrown within the callback function must be caught, such as with a \Code{catch(…)} statement. Any exception state can be placed within the provided user data function call arguments, and may be thrown again once the calling function has returned. Exceptions raised and not handled inside the callback are not supported as it might leave the HDF5 library in an inconsistent state. Similarly, using C++20 coroutines cannot be used as callbacks, since they do not support plain return statements. If a callback function yields execution to another C++20 coroutine calling HDF5 functions as well, this may lead to undefined behavior."
+ALIASES += par_compr_note="\attention If you are planning to use compression with parallel HDF5, ensure that calls to H5Dwrite() occur in collective mode. In other words, all MPI ranks (in the relevant communicator) call H5Dwrite() and pass a dataset transfer property list with the MPI-IO collective option property set to #H5FD_MPIO_COLLECTIVE_IO.\n Note that data transformations are currently \Bold{not} supported when writing to datasets in parallel and with compression enabled."
+ALIASES += sa_metadata_ops="\sa \li H5Pget_all_coll_metadata_ops() \li H5Pget_coll_metadata_write() \li H5Pset_all_coll_metadata_ops() \li H5Pset_coll_metadata_write() \li \ref maybe_metadata_reads"
+
+################################################################################
+# References
+################################################################################
+
+ALIASES += ref_cons_semantics="<a href=\"https://portal.hdfgroup.org/display/HDF5/Enabling+a+Strict+Consistency+Semantics+Model+in+Parallel+HDF5\">Enabling a Strict Consistency Semantics Model in Parallel HDF5</a>"
+ALIASES += ref_dld_filters="<a href=\"https://portal.hdfgroup.org/display/HDF5/HDF5+Dynamically+Loaded+Filters\">HDF5 Dynamically Loaded Filters</a>"
+ALIASES += ref_file_image_ops="<a href=\"https://portal.hdfgroup.org/display/HDF5/HDF5+File+Image+Operations\">HDF5 File Image Operations</a>"
+ALIASES += ref_filter_pipe="<a href=\"https://portal.hdfgroup.org/display/HDF5/HDF5+Data+Flow+Pipeline+for+H5Dread\">Data Flow Pipeline for H5Dread()</a>"
+ALIASES += ref_group_impls="<a href=\"https://portal.hdfgroup.org/display/HDF5/Groups\">Group implementations in HDF5</a>"
+ALIASES += ref_h5lib_relver="<a href=\"https://portal.hdfgroup.org/display/HDF5/HDF5+Library+Release+Version+Numbers\">HDF5 Library Release Version Numbers</a>"
+ALIASES += ref_mdc_in_hdf5="<a href=\"https://portal.hdfgroup.org/display/HDF5/Metadata+Caching+in+HDF5\">Metadata Caching in HDF5</a>"
+ALIASES += ref_mdc_logging="<a href=\"https://portal.hdfgroup.org/display/HDF5/H5F_START_MDC_LOGGING\">Metadata Cache Logging</a>"
+ALIASES += ref_news_112="<a href=\"https://portal.hdfgroup.org/display/HDF5/New+Features+in+HDF5+Release+1.12\">New Features in HDF5 Release 1.12</a>"
+ALIASES += ref_h5ocopy="<a href=\"https://portal.hdfgroup.org/display/HDF5/Copying+Committed+Datatypes+with+H5Ocopy\">Copying Committed Datatypes with H5Ocopy()</a>"
+ALIASES += ref_sencode_fmt_change="<a href=\"https://portal.hdfgroup.org/pages/viewpage.action?pageId=58100093&preview=/58100093/58100094/encode_format_RFC.pdf\">RFC H5Secnode() / H5Sdecode() Format Change</a>"
+ALIASES += ref_vlen_strings="\Emph{Creating variable-length string datatypes}"
+ALIASES += ref_vol_doc="VOL documentation"
+
+################################################################################
+# RFCs
+################################################################################
+
+ALIASES += ref_rfc20220819="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/Terminal_VOL_Connector_Feature_Flags.pdf\">Terminal VOL Connector Feature Flags</a>"
+ALIASES += ref_rfc20210528="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/RFC_multi_thread.pdf\">Multi-Thread HDF5</a>"
+ALIASES += ref_rfc20210219="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/selection_io_RFC_210610.pdf\">Selection I/O</a>"
+ALIASES += ref_rfc20200213="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/RFC_VFD_subfiling_200424.pdf\">VFD Sub-filing</a>"
+ALIASES += ref_rfc20200210="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/Onion_VFD_RFC_211122.pdf\">Onion VFD</a>"
+ALIASES += ref_rfc20190923="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/2019-09-23-RFC_VOL_feature_flags.pdf\">Virtual Object Layer (VOL) API Compatibility</a>"
+ALIASES += ref_rfc20190715="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/var_len_data_sketch_design_190715.pdf\">Variable-Length Data in HDF5 Sketch Design</a>"
+ALIASES += ref_rfc20190410="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/RFC_VFD_Plugin.docx.pdf\">A Plugin Interface for HDF5 Virtual File Drivers</a>"
+ALIASES += ref_rfc20181231="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/RFC_Min_Obj_Headers_181231.pdf\">Dataset Object Header Size</a>"
+ALIASES += ref_rfc20181220="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/3.2.1_3.2.2_deliverable_181220_v4.pdf\">MS 3.2 – Addressing Scalability: Scalability of open, close, flush CASE STUDY: CGNS Hotspot analysis of CGNS cgp_open</a>"
+ALIASES += ref_rfc20180830="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/RFC_Sparse_Chunks180830.pdf\">Sparse Chunks</a>"
+ALIASES += ref_rfc20180829="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/mirror_VFD_RFC_2018-10-05.pdf\">H5FD_MIRROR Virtual File Driver</a>"
+ALIASES += ref_rfc20180815="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/splitter_VFD_RFC_180830.pdf\">Splitter_VFD</a>"
+ALIASES += ref_rfc20180712="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/RFC_Update_to_HDF5_References.pdf\">Update to HDF5 References</a>"
+ALIASES += ref_rfc20180620="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/RFC-Chunking%20Functions-2018-06-20-v3.docx.pdf\">Chunk query functionality in HDF5</a>"
+ALIASES += ref_rfc20180610="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/VFD_SWMR_RFC_220519.pdf\">VFD SWMR</a>"
+ALIASES += ref_rfc20180321="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/RFC-API_Contexts-2018-03-21.docx.pdf\">API Contexts</a>"
+ALIASES += ref_rfc20180125="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/enhance_h5clear.docx.pdf\">Enhancement to the tool <tt>h5clear</tt></a>"
+ALIASES += ref_rfc20170707="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/H5Sencode_format.docx.pdf\"><tt>H5Sencode/H5Sdecode</tt> Format Change</a>"
+ALIASES += ref_rfc20160105="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/RFC-bounds.pdf\">Setting Bounds for Object Creation in HDF5 1.10.0</a>"
+ALIASES += ref_rfc20150915="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/2015-09-28-RFC-HDF5-1.10.0-File-Format-Superblock-Changes-EP.docx.pdf\">File Format Changes in HDF5 1.10.0</a>"
+ALIASES += ref_rfc20150709="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/RFC-Page_Buffering.pdf\">Page Buffering</a>"
+ALIASES += ref_rfc20150615="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/cache_image_RFC_150929-QAK.docx.pdf\">Metadata Cache Image</a>"
+ALIASES += ref_rfc20150429="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/new_datatypes.pdf\">New Datatypes</a>"
+ALIASES += ref_rfc20150424="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/RFC-CollectiveMetadataWrites.pdf\">Collective Metadata Writes</a>"
+ALIASES += ref_rfc20150423="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/RFC-CollectiveMetadataReads.pdf\">Enabling Collective Metadata Reads</a>"
+ALIASES += ref_rfc20150301="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/sent_RFC_format_convert-v3.docx.pdf\">The Tool to Handle HDF5 File Format Compatibility for Chunked Datasets</a>"
+ALIASES += ref_rfc20150212="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/RFC_H5LTget_hardlinkds.docx.pdf\"><tt>H5LTget_hardlinks</tt> – High-level API to list all the hard links to an object</a>"
+ALIASES += ref_rfc20150205="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/RFC_F2003_v6.docx.pdf\">HDF5 Fortran Wrappers Maintenance: Dropping Support for Non-Fortran 2003 Standard Compliant Compilers</a>"
+ALIASES += ref_rfc20150202="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/RFC%20New%20Autotools%20Behavior.docx.pdf\">New Autotools Behavior</a>"
+ALIASES += ref_rfc20141210="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/HDF5-VDS-requirements-use-cases-2014-12-10.pdf\">HDF5 Virtual Dataset</a>"
+ALIASES += ref_rfc20141201="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/RFC%20filter%20memory%20issues%20on%20Windows.docx.pdf\">Allocate/Free Mismatches in HDF5 Filter Code on Windows</a>"
+ALIASES += ref_rfc20140916="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/RFC_VOL.pdf\">Virtual Object Layer</a>"
+ALIASES += ref_rfc20140827="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/CompressNChunk_RFC.pdf\">Chunking and Compression Performance Tool Requirements</a>"
+ALIASES += ref_rfc20140729="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/h5fis_accessible.pdf\">Replacing H5Fis_hdf5() with H5Fis_accessible()</a>"
+ALIASES += ref_rfc20140722="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/64bit_hid_t-v1.docx.pdf\">Switching to a 64-bit <tt>hid_t</tt> Space in HDF5</a>"
+ALIASES += ref_rfc20140717="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/analysis_ext.pdf\">Data Analysis Extensions</a>"
+ALIASES += ref_rfc20140707="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/2014-08-28-RFC_VOL.pdf\">Virtual Object Layer</a>"
+ALIASES += ref_rfc20140524="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/RFC-Why%20does%20not%20compression%20work-GH-EP.docx.pdf\">HDF5 Compression Demystified</a>"
+ALIASES += ref_rfc20140318="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/RFC%20H5free_memory%20v2.pdf\">Freeing Memory Allocated by the HDF5 Library</a>"
+ALIASES += ref_rfc20140313="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/RFC-Compat-Tool-v2.docx.pdf\">Options to handle compatibility issues for HDF5 files</a>"
+ALIASES += ref_rfc20140224="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/Design-MetadataCache-Logging-THG20140224-v4.pdf\">Design: Metadata Cache Logging</a>"
+ALIASES += ref_rfc20131211="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/RFC%20H5Ocork%20v5%20new%20fxn%20names.pdf\">Fine-Grained Control of Metadata Cache Flushes</a>"
+ALIASES += ref_rfc20130930="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/RFC-Read-Attempts-for-Metadata-with-Checksum-v3.pdf\">Read Attempts for Metadata with Checksum</a>"
+ALIASES += ref_rfc20130919="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/core%20CFD%20paging%20v5.docx.pdf\">Core VFD Backing Store Paged Writes</a>"
+ALIASES += ref_rfc20130630="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/Design-HDF5-FlushDependencyTesting-20130630-v1.1.pdf\">Flush Dependency Testing</a>"
+ALIASES += ref_rfc20130316="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/HDF5DynamicallyLoadedFilters.pdf\">HDF5 Dynamically Loaded Filters</a>"
+ALIASES += ref_rfc20121114="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/DECTRIS%20Integration%20RFC%202012-11-29.pdf\">Direct Chunk Write</a>"
+ALIASES += ref_rfc20121024="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/FileSpaceManagement.pdf\">HDF5 File Space Management</a>"
+ALIASES += ref_rfc20120828="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/H5HPC_MultiDset_RW_IO_RFC.pdf\">New HDF5 API Routines for HPC Applications - Read/Write Multiple Datasets in an HDF5 file</a>"
+ALIASES += ref_rfc20120523="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/paged_aggregation.pdf\">HDF5 File Space Management: Paged Aggregation</a>"
+ALIASES += ref_rfc20120501="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/HDF5FileImageOperations.pdf\">HDF5 File Image Operations</a>"
+ALIASES += ref_rfc20120305="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/RFC%20PHDF5%20Consistency%20Semantics%20MC%20120328.docx.pdf\">Enabling a Strict Consistency Semantics Model in Parallel HDF5</a>"
+ALIASES += ref_rfc20120220="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/h5repack_improve_hyperslab_over_chunked_dataset_v1.pdf\"><tt>h5repack</tt>: Improved Hyperslab selections for Large Chunked Datasets</a>"
+ALIASES += ref_rfc20120120="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/2012-1-25-Maintainers-guide-for-datatype.docx.pdf\">A Maintainer’s Guide for the Datatype Module in HDF5 Library</a>"
+ALIASES += ref_rfc20120104="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/RFC_actual_io_v4-1_done.docx.pdf\">Actual I/O Mode</a>"
+ALIASES += ref_rfc20111119="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/RFC-H5Ocompare-review_v6.pdf\">New public functions to handle comparison</a>"
+ALIASES += ref_rfc20110825="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/2011-08-31-RFC_H5Ocopy_Named_DT_v2.docx.pdf\">Merging Named Datatypes in H5Ocopy()</a>"
+ALIASES += ref_rfc20110811="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/RFC_Enhancement_Hyperslab_Selection-1.4.docx.pdf\">Expanding the HDF5 Hyperslab Selection Interface</a>"
+ALIASES += ref_rfc20110726="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/metadata_aggregation_RFC_v03.docx.pdf\">HDF5 File Space Allocation and Aggregation</a>"
+ALIASES += ref_rfc20110614="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/RFC_h5dump_refactor_v3.docx.pdf\"> Refactor <tt>h5dump</tt> to Improve Maintenance</a>"
+ALIASES += ref_rfc20110329="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/RFC_Tools_Extlink_Cache_v3_r2.docx.pdf\">Support External Link Open File Cache in HDF5 Tools</a>"
+ALIASES += ref_rfc20110118="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/RFC%20for%20h5diff%20Attribute%20Comparisons_v7.docx.pdf\"><tt>h5diff</tt> Attribute Comparisons</a>"
+ALIASES += ref_rfc20101122="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/RFC_swmr_timeouts_v2.docx.pdf\">SWMR Timeouts</a>"
+ALIASES += ref_rfc20101104="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/CacheExternalLinkFileOpens.pdf\">Caching Files Opened Through External Links</a>"
+ALIASES += ref_rfc20101018="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/HDF5-comparisons_v3-RFC-2011-08-03.pdf\">HDF5 File and Object Comparison Specification</a>"
+ALIASES += ref_rfc20100902="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/H5edit-RFC-Draft-v5.pdf\"><tt>h5edit</tt> – An HDF5 File Editing Tool</a>"
+ALIASES += ref_rfc20100727="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/RFC_HDF5_reservedCharacters-v2.pdf\">Reserved Characters for HDF5 Applications</a>"
+ALIASES += ref_rfc20100726="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/H5HPC_RFC-2010-09-28.pdf\">High-Level HDF5 API routines for HPC Applications</a>"
+ALIASES += ref_rfc20100511="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/RFC_h5diff_exclude_obj_v1_3.pdf\"><tt>h5diff</tt> – Exclude Object(s) from Comparison</a>"
+ALIASES += ref_rfc20100422="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/RFC_gen_attribute_tool_v2_f.pdf\">Generating attributes into an object with a tool</a>"
+ALIASES += ref_rfc20100312="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/RFC_Support_HDF518_in_Tools.pdf\">Supporting HDF5 1.8 in HDF5 Command Line Tools</a>"
+ALIASES += ref_rfc20091218="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/RCF_h5diff_link_v1.2.docx.pdf\">Supporting soft-link and external-link for <tt>h5diff</tt></a>"
+ALIASES += ref_rfc20090907="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/RFC_Tools_Lib_v2.pdf\">HDF5 Tools Library Functions</a>"
+ALIASES += ref_rfc20090612="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/RFC_h5diff_default_epsilon.pdf\">Default EPSILON values for comparing floating point data</a>"
+ALIASES += ref_rfc20081218="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/RFC_h5diff_NonComparable.pdf\">Reporting of Non-Comparable Datasets by <tt>h5diff</tt></a>"
+ALIASES += ref_rfc20081205="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/RFC_elink_callback.pdf\">External Link Traversal Callback</a>"
+ALIASES += ref_rfc20081030="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/RFC_chunk_cache_functions.pdf\">Setting Raw Data Chunk Cache Parameters in HDF5</a>"
+ALIASES += ref_rfc20080915="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/FileFreeSpacePerformance.pdf\">Performance Report for Free-space Manager</a>"
+ALIASES += ref_rfc20080904="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/ExternalLinkFileAccessProperty.pdf\">Setting File Access Property List for accessing External Link</a>"
+ALIASES += ref_rfc20080728="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/RFC_Native_Time_Types.pdf\">Native Time Types in HDF5</a>"
+ALIASES += ref_rfc20080723="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/RFC_Special_Values_in_HDF5.pdf\">Special Values in HDF5</a>"
+ALIASES += ref_rfc20080301="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/DynamicTransformations_RFC.pdf\">Dynamic Transformations to HDF5 Data</a>"
+ALIASES += ref_rfc20080209="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/RFC-Using-SVN-branching-Feb9.pdf\">Using SVN branching to improve software development process at THG</a>"
+ALIASES += ref_rfc20080206="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/RFC-HIS-REL-1.8_Feb6.pdf\">Maintaining the <tt>HISTORY.txt</tt> and <tt>RELEASE.txt</tt> files in HDF5</a>"
+ALIASES += ref_rfc20071111="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/AURA-corruption-2007-11-12.pdf\">Addressing HDF5 file corruption issue</a>"
+ALIASES += ref_rfc20071018="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/RFC_NaNsHDF5.pdf\"><tt>NaN</tt> detection in HDF5</a>"
+ALIASES += ref_rfc20070801="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/Metadata_Journaling_RFC.pdf\">Metadata Journaling to Improve Crash Survivability</a>"
+ALIASES += ref_rfc20070413="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/API_Compatibility_RFC.txt.pdf\">API Compatibility Strategies for HDF5</a>"
+ALIASES += ref_rfc20070115="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/PrivateHeap.pdf\">A \"Private\" Heap for HDF5</a>"
+ALIASES += ref_rfc20060623="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/coll_ind_dd6.pdf\">Performance Comparison of Collective I/O and Independent I/O with Derived Datatypes</a>"
+ALIASES += ref_rfc20060604="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/h5stat_spec_v3_2006-06-04.pdf\"><tt>h5stat</tt> tool</a>"
+ALIASES += ref_rfc20060505="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/Simple%20Performance%20Test%20on%20Fletcher32%20Filter.pdf\">Simple Performance Test on Fletcher32 Filter</a>"
+ALIASES += ref_rfc20060410="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/h5chk_Requirements.pdf\">Requirement Specifications of an HDF5 File Format Validation Tool</a>"
+ALIASES += ref_rfc20060317="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/sec2driver-RFC.pdf\">Proposed changes to the <tt>sec2</tt> driver </a>"
+ALIASES += ref_rfc20060124="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/FITS%20to%20HDF5%20mapping.pdf\">Mapping FITS data to HDF5</a>"
+ALIASES += ref_rfc20040811="<a href=\"https://docs.hdfgroup.org/hdf5/rfc/text-dtype.htm.pdf\">Conversion Between Text and Datatype</a>"
+
+################################################################################
+# The Usual Suspects
+################################################################################
+
+ALIASES += click4more="(Click on a enumerator, field, or type for more information.)"
+ALIASES += csets="<table><tr><td>#H5T_CSET_ASCII</td><td>US ASCII</td></tr><tr><td>#H5T_CSET_UTF8</td><td>UTF-8 Unicode encoding</td></tr></table>"
+ALIASES += datatype_class=" \li #H5T_INTEGER \li #H5T_FLOAT \li #H5T_STRING \li #H5T_BITFIELD \li #H5T_OPAQUE \li #H5T_COMPOUND \li #H5T_REFERENCE \li #H5T_ENUM \li #H5T_VLEN \li #H5T_ARRAY"
+ALIASES += file_access="<table><tr><td>#H5F_ACC_RDWR</td><td>File was opened with read/write access.</td></tr><tr><td>#H5F_ACC_RDONLY</td><td>File was opened with read-only access.</td></tr><tr><td>#H5F_ACC_SWMR_WRITE</td><td>File was opened with read/write access for a single-writer/multiple-reader (SWMR) scenario. Note that the writer process must also open the file with the #H5F_ACC_RDWR flag.</td></tr><tr><td>#H5F_ACC_SWMR_READ</td><td>File was opened with read-only access for a single-writer/multiple-reader (SWMR) scenario. Note that the reader process must also open the file with the #H5F_ACC_RDONLY flag.</td></tr></table>"
+ALIASES += id_types="<table><tr><td>#H5I_FILE</td><td>File</td></tr><tr><td>#H5I_GROUP</td><td>Group</td></tr><tr><td>#H5I_DATATYPE</td><td>Datatype</td></tr><tr><td>#H5I_DATASPACE</td><td>Dataspace</td></tr><tr><td>#H5I_DATASET</td><td>Dataset</td></tr><tr><td>#H5I_ATTR</td><td>Attribute</td></tr></table>"
+ALIASES += indexes="<table><tr><td>#H5_INDEX_NAME</td><td>Lexicographic order on name</td></tr><tr><td>#H5_INDEX_CRT_ORDER</td><td>Index on creation order</td></tr></table>"
+ALIASES += link_types="<table><tr><td>#H5L_TYPE_HARD</td><td>Hard link</td></tr><tr><td>#H5L_TYPE_SOFT</td><td>Soft link</td></tr><tr><td>#H5L_TYPE_EXTERNAL</td><td>External link</td></tr><tr><td>#H5L_TYPE_ERROR</td><td>Error</td></tr></table>"
+ALIASES += mem_types="<table><tr><td>#H5FD_MEM_DEFAULT</td><td>The default file memory allocation type</td></tr><tr><td>#H5FD_MEM_SUPER</td><td>File memory allocated for Superblock</td></tr><tr><td>#H5FD_MEM_BTREE</td><td>File memory allocated for B-tree</td></tr><tr><td>#H5FD_MEM_DRAW</td><td>File memory allocated for raw data</td></tr><tr><td>#H5FD_MEM_GHEAP</td><td>File memory allocated for Global Heap</td></tr><tr><td>#H5FD_MEM_LHEAP</td><td>File memory allocated for Local Heap</td></tr><tr><td>#H5FD_MEM_OHDR</td><td>File memory allocated for Object Header</td></tr></table>"
+ALIASES += norm_type="<table><tr><td>#H5T_NORM_IMPLIED</td><td>0</td><td>MSB of mantissa is not stored, always 1</td></tr><tr><td>#H5T_NORM_MSBSET</td><td>1</td><td>MSB of mantissa is always 1</td></tr><tr><td>#H5T_NORM_NONE</td><td>2</td><td>Mantissa is not normalized</td></tr></table>"
+ALIASES += obj_types="<table><tr><td>#H5F_OBJ_FILE</td><td>Files only</td></tr><tr><td>#H5F_OBJ_DATASET</td><td>Datasets only</td></tr><tr><td>#H5F_OBJ_GROUP</td><td>Groups only</td></tr><tr><td>#H5F_OBJ_DATATYPE</td><td>Named datatypes only</td></tr><tr><td>#H5F_OBJ_ATTR</td><td>Attributes only</td></tr><tr><td>#H5F_OBJ_ALL</td><td>All of the above</td></tr></tr><tr><td>#H5F_OBJ_LOCAL</td><td>Restrict search to objects opened through current file identifier.</td></tr></table> \attention #H5F_OBJ_LOCAL does not stand alone; it is effective only when used in combination with one or more of the preceding types. For example, #H5F_OBJ_DATASET | #H5F_OBJ_GROUP | #H5F_OBJ_LOCAL would count all datasets and groups opened through the current file identifier."
+ALIASES += orders="<table><tr><td>#H5_ITER_INC</td><td>Increasing order</td></tr><tr><td>#H5_ITER_DEC</td><td>Decreasing order</td></tr><tr><td>#H5_ITER_NATIVE</td><td>Fastest available order</td></tr></table>"
+ALIASES += padding_type="<table><tr><td>#H5T_PAD_ZERO</td><td>0</td><td>Set background to zeros</td></tr><tr><td>#H5T_PAD_ONE</td><td>1</td><td>Set background to ones</td></tr><tr><td>#H5T_PAD_BACKGROUND</td><td>2</td><td>Leave background alone</td></tr></table>"
+ALIASES += scopes="<table><tr><td>#H5F_SCOPE_GLOBAL</td><td>Flushes the entire virtual file</td></tr><tr><td>#H5F_SCOPE_LOCAL</td><td>Flushes only the specified file</td></tr></table>"
+ALIASES += sign_prop="<table><tr><td>#H5T_SGN_NONE</td><td>0</td><td>Unsigned integer type</td></tr><tr><td>#H5T_SGN_2</td><td>1</td><td>Two's complement signed integer type</td></tr></table>"
+ALIASES += storage_type="<table><tr><td>#H5G_STORAGE_TYPE_COMPACT</td><td>Compact storage</td></tr><tr><td>#H5G_STORAGE_TYPE_DENSE</td><td>Indexed storage</td></tr><tr><td>#H5G_STORAGE_TYPE_SYMBOL_TABLE</td><td>Symbol tables, the original HDF5 structure</td></tr></table>"
+ALIASES += str_pad_type="<table><tr><td>#H5T_STR_NULLTERM</td><td>0</td><td>Null terminate (as C does)</td></tr><tr><td>#H5T_STR_NULLPAD</td><td>1</td><td>Pad with zeros</td></tr><tr><td>#H5T_STR_SPACEPAD</td><td>2</td><td>Pad with spaces (as FORTRAN does)</td></tr></table>"
+ALIASES += see_virtual=" \see Supporting Functions: H5Pget_layout(), H5Pset_layout(), H5Sget_regular_hyperslab(), H5Sis_regular_hyperslab(), H5Sselect_hyperslab() \see VDS Functions: H5Pget_virtual_count(), H5Pget_virtual_dsetname(), H5Pget_virtual_filename(), H5Pget_virtual_prefix(), H5Pget_virtual_printf_gap(), H5Pget_virtual_srcspace(), H5Pget_virtual_view(), H5Pget_virtual_vspace(), H5Pset_virtual(), H5Pset_virtual_prefix(), H5Pset_virtual_printf_gap(), H5Pset_virtual_view()"
+ALIASES += obj_info_fields="<table><tr><th>Flag</th><th>Purpose</th></tr><tr><td>#H5O_INFO_BASIC</td><td>Fill in the fileno, addr, type, and rc fields</td></tr><tr> <td>#H5O_INFO_TIME</td><td>Fill in the atime, mtime, ctime, and btime fields</td></tr><tr> <td>#H5O_INFO_NUM_ATTRS</td> <td>Fill in the num_attrs field</td></tr><tr><td>#H5O_INFO_HDR</td><td>Fill in the num_attrs field</td></tr><tr><td>#H5O_INFO_META_SIZE</td><td>Fill in the meta_size field</td></tr><tr><td>#H5O_INFO_ALL</td><td>#H5O_INFO_BASIC | #H5O_INFO_TIME | #H5O_INFO_NUM_ATTRS | #H5O_INFO_HDR | #H5O_INFO_META_SIZE</td></tr></table>"
+
+################################################################################
+# FORTRAN
+################################################################################
+
+ALIASES += fortran_error="Returns 0 if successful and -1 if it fails."
+ALIASES += fortran_approved="The preferred API, Fortran 2003 version."
+ALIASES += fortran_obsolete="Obsolete API, use the Fortran 2003 version instead."
diff --git a/doxygen/dox/APIVersions.dox b/doxygen/dox/APIVersions.dox
new file mode 100644
index 0000000..3658f06
--- /dev/null
+++ b/doxygen/dox/APIVersions.dox
@@ -0,0 +1,173 @@
+/**
+ * \ingroup H5A
+ * \def H5Acreate
+ * \api_vers_2{H5Acreate,H5Acreate1,H5Acreate2}
+ */
+
+/**
+ * \ingroup H5A
+ * \def H5Aiterate
+ * \api_vers_2{H5Aiterate,H5Aiterate1,H5Aiterate2}
+ */
+
+/**
+ * \ingroup H5D
+ * \def H5Dcreate
+ * \api_vers_2{H5Dcreate,H5Dcreate1,H5Dcreate2}
+ */
+
+/**
+ * \ingroup H5E
+ * \def H5Eget_auto
+ * \api_vers_2{H5Eget_auto,H5Eget_auto1,H5Eget_auto2}
+ */
+
+/**
+ * \ingroup H5E
+ * \def H5Eprint
+ * \api_vers_2{H5Eprint,H5Eprint1,H5Eprint2}
+ */
+
+/**
+ * \ingroup H5E
+ * \def H5Epush
+ * \api_vers_2{H5Epush,H5Epush1,H5Epush2}
+ */
+
+/**
+ * \ingroup H5E
+ * \def H5Eset_auto
+ * \api_vers_2{H5Eset_auto,H5Eset_auto1,H5Eset_auto2}
+ */
+
+/**
+ * \ingroup H5E
+ * \def H5Ewalk
+ * \api_vers_2{H5Ewalk,H5Ewalk1,H5Ewalk2}
+ */
+
+/**
+ * \ingroup H5F
+ * \def H5Fget_info
+ * \api_vers_2{H5Fget_info,H5Fget_info1,H5Fget_info2}
+ */
+
+/**
+ * \ingroup H5G
+ * \def H5Gcreate
+ * \api_vers_2{H5Gcreate,H5Gcreate1,H5Gcreate2}
+ */
+
+/**
+ * \ingroup H5G
+ * \def H5Gopen
+ * \api_vers_2{H5Gopen,H5Gopen1,H5Gopen2}
+ */
+
+/**
+ * \ingroup H5L
+ * \def H5Lget_info
+ * \api_vers_2{H5Lget_info,H5Lget_info1,H5Lget_info2}
+ */
+
+/**
+ * \ingroup H5L
+ * \def H5Lget_info_by_idx
+ * \api_vers_2{H5Lget_info_by_idx,H5Lget_info_by_idx1,H5Lget_info_by_idx2}
+ */
+
+/**
+ * \ingroup TRAV
+ * \def H5Literate
+ * \api_vers_2{H5Literate,H5Literate1,H5Literate2}
+ */
+
+/**
+ * \ingroup TRAV
+ * \def H5Literate_by_name
+ * \api_vers_2{H5Literate_by_name,H5Literate_by_name1,H5Literate_by_name2}
+ */
+
+/**
+ * \ingroup TRAV
+ * \def H5Lvisit
+ * \api_vers_2{H5Lvisit,H5Lvisit1,H5Lvisit2}
+ */
+
+/**
+ * \ingroup TRAV
+ * \def H5Lvisit_by_name
+ * \api_vers_2{H5Lvisit_by_name,H5Lvisit_by_name1,H5Lvisit_by_name2}
+ */
+
+/**
+ * \ingroup H5O
+ * \def H5Oget_info
+ * \api_vers_3{H5Oget_info,H5Oget_info1,H5Oget_info2,H5Oget_info3}
+ */
+
+/**
+ * \ingroup H5O
+ * \def H5Oget_info_by_idx
+ * \api_vers_3{H5Oget_info_by_idx,H5Oget_info_by_idx1,H5Oget_info_by_idx2,H5Oget_info_by_idx3}
+ */
+
+/**
+ * \ingroup H5O
+ * \def H5Oget_info_by_name
+ * \api_vers_3{H5Oget_info_by_name,H5Oget_info_by_name1,H5Oget_info_by_name2,H5Oget_info_by_name3}
+ */
+
+/**
+ * \ingroup H5O
+ * \def H5Ovisit
+ * \api_vers_3{H5Ovisit,H5Ovisit1,H5Ovisit2,H5Ovisit3}
+ */
+
+/**
+ * \ingroup H5O
+ * \def H5Ovisit_by_name
+ * \api_vers_3{H5Ovisit_by_name,H5Ovisit_by_name1,H5Ovisit_by_name2,H5Ovisit_by_name3}
+ */
+
+/**
+ * \ingroup H5R
+ * \def H5Rdereference
+ * \api_vers_2{H5Rdereference,H5Rdereference1,H5Rdereference2}
+ */
+
+/**
+ * \ingroup H5R
+ * \def H5Rget_obj_type
+ * \api_vers_3{H5Rget_obj_type,H5Rget_obj_type1,H5Rget_obj_type2,H5R_get_obj_type3}
+ */
+
+/**
+ * \ingroup H5S
+ * \def H5Sencode
+ * \api_vers_2{H5Sencode,H5Sencode1,H5Sencode2}
+ */
+
+/**
+ * \ingroup H5T
+ * \def H5Tcommit
+ * \api_vers_2{H5Tcommit,H5Tcommit1,H5Tcommit2}
+ */
+
+/**
+ * \ingroup H5T
+ * \def H5Topen
+ * \api_vers_2{H5Topen,H5Topen1,H5Topen2}
+ */
+
+/**
+ * \ingroup ARRAY
+ * \def H5Tarray_create
+ * \api_vers_2{H5Tarray_create,H5Tarray_create1,H5Tarray_create2}
+ */
+
+/**
+ * \ingroup ARRAY
+ * \def H5Tget_array_dims
+ * \api_vers_2{H5Tget_array_dims,H5Tget_array_dims1,H5Tget_array_dims2}
+ */
diff --git a/doxygen/dox/About.dox b/doxygen/dox/About.dox
new file mode 100644
index 0000000..a8b31d7
--- /dev/null
+++ b/doxygen/dox/About.dox
@@ -0,0 +1,127 @@
+/** \page About About
+
+\section about_history History
+
+The implementation of this documentation set is based on the fantastic work of the
+<a href="https://eigen.tuxfamily.org/index.php?title=Main_Page">Eigen project</a>.
+Please refer to their <a href="https://gitlab.com/libeigen/eigen">GitLab repository</a>
+and the online version of their
+<a href="http://eigen.tuxfamily.org/dox/">Doxygen-based documentation</a>.
+Not only does Eigen set a standard as a piece of software, but also as an example
+of <em>documentation done right</em>.
+
+\section about_documentation Documentation about Documentation
+
+In this section, we describe common documentation maintenance tasks.
+
+\subsection plain_html Including Plain HTML Pages
+
+The most common use case for this is the inclusion of older documentation.
+New documentation should, whenever possible, be created using Doxygen markdown!
+
+Use Doxygen's <a href="https://www.doxygen.nl/manual/commands.html#cmdhtmlinclude"><code>htmlinclude</code></a>
+special command to include existing plain HTML pages.
+
+An example from this documentation set can be seen
+<a href="https://github.com/HDFGroup/hdf5/blob/develop/doxygen/dox/FileFormatSpec.dox">here</a>.
+
+\subsection new_rm_entry Creating a New Reference Manual Entry
+
+Please refer to the \ref RMT for guidance on how to create a new reference manual entry.
+
+\subsubsection new_example Adding and Referencing API Examples
+
+For each HDF5 module, such as \Code{H5F}, there is an examples source file called
+\Code{H5*_examples.c}. For example, the \Code{H5F} API examples are located in
+<a href="https://github.com/HDFGroup/hdf5/blob/develop/doxygen/examples/H5F_examples.c">
+<code>H5F_examples.c</code></a>. Examples are code blocks marked as Doxygen
+<a href="https://www.doxygen.nl/manual/commands.html#cmdsnippet">snippets</a>.
+For example, the source code for the H5Fcreate() API sample is located between
+the
+\verbatim
+//! <!-- [create] -->
+...
+//! <!-- [create] -->
+\endverbatim
+comments in
+<a href="https://github.com/HDFGroup/hdf5/blob/develop/doxygen/examples/H5F_examples.c">
+<code>H5F_examples.c</code></a>.
+
+Add a new API example by adding a new code block enclosed between matching
+snippet tags. The name of the tag is usually the function name stripped of
+the module prefix.
+
+The inclusion of such a block of code can then be triggered via Doxygen's
+<a href="https://www.doxygen.nl/manual/commands.html#cmdsnippet"><code>snippet</code></a>
+special command. For example, the following markup
+\verbatim
+* \snippet H5F_examples.c create
+\endverbatim
+yields
+\snippet H5F_examples.c create
+
+\subsubsection api_macro Adding an API Macro
+
+API macros are handled by the <code>api_vers_2, api_vers_3, api_vers_4</code>
+custom commands. The numbers indicate the number of potential API function
+mappings. For example, H5Acreate() has two potential mappings, H5Acreate1() and
+H5Acreate2(). To trigger the creation of a reference manual entry for H5Acreate()
+use the following markup:
+\verbatim
+\api_vers_2{H5Acreate,H5Acreate1,H5Acreate2}
+\endverbatim
+This yields:
+
+\api_vers_2{H5Acreate,H5Acreate1,H5Acreate2}
+
+\subsection custom_commands Creating Custom Commands
+
+See Doxygen's <a href="https://www.doxygen.nl/manual/custcmd.html">Custom Commands documentation</a>
+as a general reference.
+
+All custom commands for this project are located in the
+<a href="https://github.com/HDFGroup/hdf5/blob/develop/doxygen/aliases"><tt>aliases</tt></a>
+file in the <a href="https://github.com/HDFGroup/hdf5/tree/develop/doxygen"><tt>doxygen</tt></a>
+subdirectory of the <a href="https://github.com/HDFGroup/hdf5">main HDF5 repo</a>.
+
+The custom commands are grouped in sections. Find a suitable section for your command or
+ask for help if unsure!
+
+\subsection new_rfc Adding a New RFC or Referencing an Existing RFC
+
+For ease of reference, we define custom commands for each RFC in the <tt>RFCs</tt> section
+of the
+<a href="https://github.com/HDFGroup/hdf5/blob/develop/doxygen/aliases"><tt>aliases</tt></a>
+file. For example the custom command \Code{ref_rfc20141210} can be used to insert a
+reference to "RFC: Virtual Object Layer". In other words, the markup
+\verbatim
+\ref_rfc20141210
+\endverbatim
+yields a clickable link:
+
+\ref_rfc20141210
+
+To add a new RFC, add a custom command for the RFC to the
+<a href="https://github.com/HDFGroup/hdf5/blob/develop/doxygen/aliases"><tt>aliases</tt></a>
+file. The naming convention for the custom command is \Code{ref_rfcYYYYMMDD},
+where \Code{YYYYMMDD} is the ID of the RFC. The URL is composed of the prefix
+\verbatim
+https://docs.hdfgroup.org/hdf5/rfc/
+\endverbatim
+and the name of your RFC file, typically, a PDF file, i.e., the full URL would
+be
+\verbatim
+https://docs.hdfgroup.org/hdf5/rfc/my_great_rfc_name.pdf
+\endverbatim
+
+\subsection hosting How Do Updates and Changes Get Published?
+
+Currently, the files underlying this documentation website are stored in an
+bucket on AWS S3. The top-level bucket is <pre>s3://docs.hdfgroup.org/hdf5/</pre>
+There are folders for the <tt>development</tt> branch and all supported release
+version.
+
+Talk to your friendly IT-team if you need write access, or you need someone to
+push an updated version for you!
+
+*/
+\ No newline at end of file
diff --git a/doxygen/dox/Cookbook.dox b/doxygen/dox/Cookbook.dox
new file mode 100644
index 0000000..56523e2
--- /dev/null
+++ b/doxygen/dox/Cookbook.dox
@@ -0,0 +1,19 @@
+/** \page Cookbook Cookbook
+
+ Healthy, everyday recipes for every taste and budget...
+
+\ref Files
+\li \ref CB_FreeSpace
+\li \ref CB_RemoveUnusedSpace
+\li \ref CB_UserBlock
+
+\ref Attributes
+\li \ref CB_LargeAttributes
+
+\ref Accessibility
+\li \ref CB_MaintainCompat
+
+\ref Performance
+\li \ref CB_MDCPerf
+
+ */
+\ No newline at end of file
diff --git a/doxygen/dox/DDLBNF110.dox b/doxygen/dox/DDLBNF110.dox
new file mode 100644
index 0000000..6d6b67e
--- /dev/null
+++ b/doxygen/dox/DDLBNF110.dox
@@ -0,0 +1,650 @@
+/** \page DDLBNF110 DDL in BNF through HDF5 1.10
+
+\todo Revise this & break it up!
+
+\section intro110 Introduction
+
+This document contains the data description language (DDL) for an HDF5 file. The
+description is in Backus-Naur Form (BNF).
+
+\section expo110 Explanation of Symbols
+
+This section contains a brief explanation of the symbols used in the DDL.
+
+\code{.unparsed}
+::=                      defined as
+ <tname>                  a token with the name tname
+ <a> | <b>                one of <a> or <b>
+ <a>opt                   zero or one occurrence of <a>
+ <a>*                     zero or more occurrence of <a>
+ <a>+                     one or more occurrence of <a>
+ [0-9]                    an element in the range between 0 and 9
+ '['                      the token within the quotes (used for special characters)
+ TBD                      To Be Decided
+\endcode
+
+\section ddl110 The DDL
+
+\code{.unparsed}
+<file> ::= HDF5 <file_name> { <file_super_block>opt <root_group> }
+
+<file_name> ::= <identifier>
+
+<file_super_block> ::= SUPER_BLOCK {
+                           SUPERBLOCK_VERSION <int_value>
+                           FREELIST_VERSION <int_value>
+                           SYMBOLTABLE_VERSION <int_value>
+                           OBJECTHEADER_VERSION <int_value>
+                           OFFSET_SIZE <int_value>
+                           LENGTH_SIZE <int_value>
+                           BTREE_RANK <int_value>
+                           BTREE_LEAF <int_value>
+                           ISTORE_K <int_value>
+                           <super_block_filespace>
+                           USER_BLOCK {
+                               USERBLOCK_SIZE <int_value>
+                           }
+                       }
+
+<super_block_filespace> ::= FILE_SPACE_STRATEGY <super_block_strategy>
+                            FREE_SPACE_PERSIST <boolean_value>
+                            FREE_SPACE_SECTION_THRESHOLD <int_value>
+                            FILE_SPACE_PAGE_SIZE <int_value>
+
+<super_block_strategy> ::= H5F_FSPACE_STRATEGY_FSM_AGGR | H5F_FSPACE_STRATEGY_PAGE |
+                             H5F_FSPACE_STRATEGY_AGGR | H5F_FSPACE_STRATEGY_NONE |
+                             Unknown strategy
+
+<root_group> ::= GROUP "/" {
+                     <anon_named_datatype>*
+                     <object_id>opt
+                     <group_comment>opt
+                     <group_attribute>*
+                     <group_member>*
+                 }
+
+<datatype> ::= <atomic_type> | <compound_type> | <variable_length_type> | <array_type>
+
+<anon_named_datatype> ::= DATATYPE <anon_named_type_name> {
+                              <datatype>
+                          }
+
+<anon_named_type_name> ::= the assigned name for anonymous named type is
+                           in the form of #oid, where oid is the object id
+                           of the type
+
+<atomic_type> ::= <integer> | <float> | <time> | <string> |
+                  <bitfield> | <opaque> | <reference> | <enum>
+
+<boolean_value> ::= FALSE | TRUE
+
+<integer> ::= H5T_STD_I8BE     | H5T_STD_I8LE      |
+              H5T_STD_I16BE    | H5T_STD_I16LE     |
+              H5T_STD_I32BE    | H5T_STD_I32LE     |
+              H5T_STD_I64BE    | H5T_STD_I64LE     |
+              H5T_STD_U8BE     | H5T_STD_U8LE      |
+              H5T_STD_U16BE    | H5T_STD_U16LE     |
+              H5T_STD_U32BE    | H5T_STD_U32LE     |
+              H5T_STD_U64BE    | H5T_STD_U64LE     |
+              H5T_NATIVE_CHAR  | H5T_NATIVE_UCHAR  |
+              H5T_NATIVE_SHORT | H5T_NATIVE_USHORT |
+              H5T_NATIVE_INT   | H5T_NATIVE_UINT   |
+              H5T_NATIVE_LONG  | H5T_NATIVE_ULONG  |
+              H5T_NATIVE_LLONG | H5T_NATIVE_ULLONG
+
+<float> ::= H5T_IEEE_F32BE   | H5T_IEEE_F32LE     |
+            H5T_IEEE_F64BE   | H5T_IEEE_F64LE     |
+            H5T_NATIVE_FLOAT |  H5T_NATIVE_DOUBLE |
+            H5T_NATIVE_LDOUBLE
+
+<time> ::= H5T_TIME: not yet implemented
+
+<string> ::= H5T_STRING {
+                 STRSIZE <strsize>;
+                 STRPAD <strpad>;
+                 CSET <cset>;
+                 CTYPE <ctype>;
+             }
+
+<strsize> ::= <int_value>
+
+<strpad> ::= H5T_STR_NULLTERM | H5T_STR_NULLPAD | H5T_STR_SPACEPAD
+
+<cset> ::= H5T_CSET_ASCII | H5T_CSET_UTF8
+
+<ctype> ::= H5T_C_S1 | H5T_FORTRAN_S1
+
+<bitfield> ::= H5T_STD_B8BE     | H5T_STD_B8LE      |
+               H5T_STD_B16BE    | H5T_STD_B16LE     |
+               H5T_STD_B32BE    | H5T_STD_B32LE     |
+               H5T_STD_B64BE    | H5T_STD_B64LE
+
+<opaque> ::= H5T_OPAQUE {
+                 OPAQUE_TAG <identifier>;
+                 OPAQUE_SIZE <int_value>;opt
+             }
+
+<reference> ::= H5T_REFERENCE { <ref_type> }
+
+<ref_type> ::= H5T_STD_REF_OBJECT | H5T_STD_REF_DSETREG
+
+<compound_type> ::= H5T_COMPOUND {
+                        <member_type_def>+
+                    }
+
+<member_type_def> ::= <datatype> <field_name>;
+
+<field_name> ::= <identifier>
+
+<variable_length_type> ::= H5T_VLEN { <datatype> }
+
+<array_type> ::= H5T_ARRAY { <dim_sizes> <datatype> }
+
+<dim_sizes> ::= '['<dimsize>']' | '['<dimsize>']'<dim_sizes>
+
+<dimsize> ::= <int_value>
+
+<attribute> ::= ATTRIBUTE <attr_name> {
+                    <dataset_type>
+                    <dataset_space>
+                    <data>opt
+                }
+
+<attr_name> ::= <identifier>
+
+<dataset_type> ::= DATATYPE <path_name> | <datatype>
+
+<enum> ::= H5T_ENUM {
+               <enum_base_type> <enum_def>+
+           }
+
+<enum_base_type> ::= <integer>
+// Currently enums can only hold integer type data, but they may be expanded
+// in the future to hold any datatype
+
+<enum_def> ::= <enum_symbol> <enum_val>;
+
+<enum_symbol> ::= <identifier>
+
+<enum_val> ::= <int_value>
+
+<path_name> ::= <path_part>+
+
+<path_part> ::= /<identifier>
+
+<dataspace> ::= <scalar_space> | <simple_space> | <complex_space> | <null_space>
+
+<null_space> ::= NULL
+
+<scalar_space> ::= SCALAR
+
+<simple_space> ::= SIMPLE { <current_dims> / <max_dims> }
+
+<complex_space> ::= COMPLEX { <complex_space_definition> }
+
+<dataset_space> ::= DATASPACE <path_name> | <dataspace>
+
+<current_dims> ::= <dims>
+
+<max_dims> ::= '(' <max_dim_list> ')'
+
+<max_dim_list> ::= <max_dim> | <max_dim>, <max_dim_list>
+
+<max_dim> ::= <int_value> | H5S_UNLIMITED
+
+<data> ::= <subset> | <data_values>
+
+<data_values> ::= DATA {
+               <scalar_space_data> | <simple_space_data>
+           }
+
+<scalar_space_data> ::= <any_element>
+
+<any_element> ::= <atomic_element> | <compound_element> |
+                  <variable_length_element> | <array_element>
+
+<any_data_seq> ::= <any_element> | <any_element>, <any_data_seq>
+
+<atomic_element> :: = <integer_data> | <float_data>    | <time_data>   |
+                     <string_data>  | <bitfield_data> | <opaque_data> |
+                     <enum_data>    | <reference_data>
+
+<subset> ::= SUBSET {
+                 <start>;
+                 <stride>;
+                 <count>;
+                 <block>;
+                 DATA {
+                     <simple_space_data>
+                 }
+             }
+
+<start> ::= START (<coor_list>)
+
+<stride> ::= STRIDE (<pos_list>)
+
+<count> ::= COUNT (<max_dim_list>)
+
+<block> ::= BLOCK (<max_dim_list>)
+
+<coor_list> ::= <coor_data>, <coor_list> | <coor_data>
+
+<coor_data> ::= <integer_data> | H5S_UNLIMITED
+
+<integer_data> ::= <int_value>
+
+<float_data> ::= a floating point number
+
+<time_data> ::= DATA{ not yet implemented.}
+
+<string_data> ::= a string
+// A string is enclosed in double quotes.
+// If a string is displayed on more than one line, string concatenate
+// operator '//'is used.
+
+<bitfield_data> ::= <hex_value>
+
+<opaque_data> ::= <hex_value>:<hex_value> | <hex_value>
+
+<enum_data> ::= <enum_symbol>
+
+<reference_data> ::= <object_ref_data> | <data_region_data> | <attribute_data> | NULL
+
+<object_ref_data> ::= <object_type> <object_num>
+
+<object_type> ::= DATASET | GROUP | DATATYPE
+
+<object_id> ::= OBJECTID { <object_num> }
+
+<object_num> ::= <int_value>:<int_value> | <int_value>
+
+<attribute_data> ::= ATTRIBUTE <attr_name>
+
+<data_region_data> ::= DATASET <dataset_name> {
+                           <data_region_type>opt <data_region_data_list>
+                           <dataset_type>opt <dataset_space>opt
+                           <data>opt
+                       }
+
+<data_region_type> ::= REGION_TYPE <data_region_data_type>
+
+<data_region_data_type> ::= POINT | BLOCK
+
+<data_region_data_list> ::= <data_region_data_info>, <data_region_data_list> |
+                            <data_region_data_info>
+
+<data_region_data_info> ::= <region_info> | <point_info>
+
+<region_info> ::= (<lower_region_vals>)-(<upper_region_vals>)
+
+<lower_region_vals> ::= <lower_bound>, <lower_region_vals> | <lower_bound>
+
+<upper_region_vals> ::= <upper_bound>, <upper_region_vals> | <upper_bound>
+
+<lower_bound> ::= <int_value>
+
+<upper_bound> ::= <int_value>
+
+<point_info> ::= (<point_vals>)
+
+<point_vals> ::= <int_value> | <int_value>, <point_vals>
+
+<compound_element> ::= { <any_data_seq> }
+
+<atomic_simple_data> :: = <atomic_element>, <atomic_simple_data> |
+                          <atomic_element>
+
+<simple_space_data> :: = <any_data_seq>
+
+<variable_length_element> ::= ( <any_data_seq> )
+
+<array_element> ::= '[' <any_data_seq> ']'
+
+<named_datatype> ::= DATATYPE <type_name> { <datatype> }
+
+<type_name> ::= <identifier>
+
+<hardlink> ::= HARDLINK <path_name>
+
+<group> ::= GROUP <group_name> { <hardlink> | <group_info> }
+
+<group_comment> ::= COMMENT <string_data>
+
+<group_name> ::= <identifier>
+
+<group_info> ::= <object_id>opt <group_comment>opt <group_attribute>*
+                 <group_member>*
+
+<group_attribute> ::= <attribute>
+
+<group_member> ::= <named_datatype> | <group> | <dataset> |
+                   <softlink> | <external_link>
+
+<dataset> ::= DATASET <dataset_name> { <hardlink> | <dataset_info> }
+
+<dataset_info> ::= <dataset_type>
+                   <dataset_space>
+                   <dcpl_info>opt
+                   <dataset_attribute>* <object_id>opt
+                   <data>opt
+// Tokens above can be in any order as long as <data> is
+// after <dataset_type> and <dataset_space>.
+
+<dcpl_info> ::= <storagelayout>
+                <compression_filters>
+                <fillvalue>
+                <allocationtime>
+
+<dataset_name> ::= <identifier>
+
+<storagelayout> :: =  STORAGE_LAYOUT {
+                         <contiguous_layout> | <chunked_layout> |
+                         <compact_layout> | <virtual_layout>
+                    }
+
+<contiguous_layout> ::= CONTIGUOUS
+                        <internal_layout> | <external_layout>
+
+<chunked_layout> ::= CHUNKED <dims>
+                     <filter_ratio>opt
+
+<compact_layout> ::= COMPACT
+                     <size>
+
+<internal_layout> ::= <size>
+                      <offset>
+
+<external_layout> ::= EXTERNAL {
+                          <external_file>+
+                      }
+
+<virtual_layout> ::= <vmaps>*opt
+
+<vmaps> ::= MAPPING <int_value> {
+                <virtual_map>
+                <source_map>
+            }
+
+<virtual_map> ::= VIRTUAL {
+                      <vmaps_selection>
+                  }
+
+<source_map> ::= SOURCE {
+                     FILE <file_name>
+                     DATASET <dataset_name>
+                     <vmaps_selection>
+                 }
+
+<vmaps_selection> ::= <regular_hyperslab> | <irregular_hyperslab> |
+                      <select_points> | <select_none> | <select_all>
+
+<regular_hyperslab> ::= SELECTION REGULAR_HYPERSLAB {
+                          <start>
+                          <stride>
+                          <count>
+                          <block>
+                      }
+
+<irregular_hyperslab> ::= SELECTION IRREGULAR_HYPERSLAB {
+                              <region_info>+
+                          }
+
+<select_points> ::= SELECTION POINT {
+                        (<coor_list>)+
+                    }
+
+<select_none> ::= SELECTION NONE
+
+<select_all> ::= SELECTION ALL
+
+<dims> ::= (<dims_values>)
+
+<dims_values> ::= <int_value> | <int_value>, <dims_values>
+
+<external_file> ::= FILENAME <file_name> <size> <offset>
+
+<offset> ::= OFFSET <int_value>
+
+<size> ::= SIZE <int_value>
+
+<filter_ratio> ::= <size> | <compressionratio>
+
+<compressionratio> :: = <size> (<float_data>:1 COMPRESSION)
+
+<compression_filters> :: = FILTERS {
+                               <filter_type>+ | NONE
+                          }
+
+<filter_type> :: = <filter_deflate>   | <filter_shuffle>     |
+                    <filter_flecther> | <filter_szip>        |
+                    <filter_nbit>     | <filter_scaleoffset> |
+                    <filter_default>
+
+<filter_default> :: = <filter_user> {
+                          FILTER_ID <int_value>
+                          <filter_comment>opt
+                          <filter_params>opt
+                     }
+
+<filter_user> :: = USER_DEFINED_FILTER
+
+<filter_deflate> :: = COMPRESSION DEFLATE { LEVEL <int_value> }
+
+<filter_shuffle> :: = PREPROCESSING SHUFFLE
+
+<filter_flecther> :: = CHECKSUM FLETCHER32
+
+<filter_szip> :: = COMPRESSION SZIP {
+                       PIXELS_PER_BLOCK <int_value>
+                       <filter_szip_mode>opt
+                       <filter_szip_coding>opt
+                       <filter_szip_order>opt
+                       <filter_szip_header>opt
+                  }
+
+<filter_szip_mode> :: = MODE HARDWARE | K13
+
+<filter_szip_coding> :: = CODING ENTROPY | NEAREST NEIGHBOUR
+
+<filter_szip_order> :: = BYTE_ORDER LSB | MSB
+
+<filter_szip_header> :: = HEADER RAW
+
+<filter_nbit> :: = CHECKSUM NBIT
+
+<filter_scaleoffset> :: = COMPRESSION SCALEOFFSET { MIN BITS <int_value> }
+
+<filter_comment> :: = COMMENT  <identifier>
+
+<filter_params> :: = PARAMS { <int_value>* }
+
+<fillvalue> ::= FILLVALUE {
+                    FILL_TIME H5D_FILL_TIME_ALLOC | H5D_FILL_TIME_NEVER | H5D_FILL_TIME_IFSET
+                    VALUE H5D_FILL_VALUE_UNDEFINED | H5D_FILL_VALUE_DEFAULT | <any_element>
+                }
+
+<allocationtime> ::= ALLOCATION_TIME {
+                         H5D_ALLOC_TIME_EARLY | H5D_ALLOC_TIME_INCR |
+                         H5D_ALLOC_TIME_LATE
+                     }
+
+<dataset_attribute> ::= <attribute>
+
+<softlink> ::= SOFTLINK <softlink_name> {
+                   LINKTARGET <target>
+               }
+
+<softlink_name> ::= <identifier>
+
+<target> ::= <identifier>
+
+<external_link> ::= EXTERNAL_LINK <external_link_name> {
+                        TARGETFILE <targetfile>
+                        TARGETPATH <targetpath> <targetobj>opt
+                    }
+
+<external_link_name> ::= <identifier>
+
+<user_defined_link> ::= USERDEFINED_LINK <external_link_name> {
+                            LINKCLASS <user_link_type>
+                        }
+
+<user_link_type> ::= <int_value>
+
+<targetfile> ::= <file_name>
+
+<targetpath> ::= <identifier>
+
+<targetobj> ::= <named_datatype> | <group> | <dataset>
+
+<identifier> ::= "a string"
+// character '/' should be used with care.
+
+<pos_list> ::= <pos_int>, <pos_list> | <pos_int>
+
+<int_value> ::= 0 | <pos_int>
+
+<pos_int> ::= [1-9][0-9]*
+
+<hex_value> ::= 0x[0-F][0-F]+ | [0-F][0-F]+
+\endcode
+
+\section example110 An Example of an HDF5 File in DDL
+
+\code{.unparsed}
+HDF5 "example.h5" {
+GROUP "/" {
+   ATTRIBUTE "attr1" {
+      DATATYPE H5T_STRING {
+           STRSIZE 17;
+           STRPAD H5T_STR_NULLTERM;
+           CSET H5T_CSET_ASCII;
+           CTYPE H5T_C_S1;
+         }
+      DATASPACE SCALAR
+      DATA {
+         "string attribute"
+      }
+   }
+   DATASET "dset1" {
+      DATATYPE H5T_STD_I32BE
+      DATASPACE SIMPLE { ( 10, 10 ) / ( 10, 10 ) }
+      DATA {
+         0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+         0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+         0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+         0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+         0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+         0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+         0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+         0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+         0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+         0, 1, 2, 3, 4, 5, 6, 7, 8, 9
+      }
+   }
+   DATASET "dset2" {
+      DATATYPE H5T_COMPOUND {
+         H5T_STD_I32BE "a";
+         H5T_IEEE_F32BE "b";
+         H5T_IEEE_F64BE "c";
+      }
+      DATASPACE SIMPLE { ( 5 ) / ( 5 ) }
+      DATA {
+         {
+            1,
+            0.1,
+            0.01
+         },
+         {
+            2,
+            0.2,
+            0.02
+         },
+         {
+            3,
+            0.3,
+            0.03
+         },
+         {
+            4,
+            0.4,
+            0.04
+         },
+         {
+            5,
+            0.5,
+            0.05
+         }
+      }
+   }
+   GROUP "group1" {
+      COMMENT "This is a comment for group1";
+      DATASET "dset3" {
+         DATATYPE "/type1"
+         DATASPACE SIMPLE { ( 5 ) / ( 5 ) }
+         DATA {
+            {
+               [ 0, 1, 2, 3 ],
+               [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
+                 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
+                 0.3, 0.3, 0.3, 0.3, 0.3, 0.3,
+                 0.4, 0.4, 0.4, 0.4, 0.4, 0.4,
+                 0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
+            },
+            {
+               [ 0, 1, 2, 3 ],
+               [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
+                 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
+                 0.3, 0.3, 0.3, 0.3, 0.3, 0.3,
+                 0.4, 0.4, 0.4, 0.4, 0.4, 0.4,
+                 0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
+            },
+            {
+               [ 0, 1, 2, 3 ],
+               [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
+                 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
+                 0.3, 0.3, 0.3, 0.3, 0.3, 0.3,
+                 0.4, 0.4, 0.4, 0.4, 0.4, 0.4,
+                 0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
+            },
+            {
+               [ 0, 1, 2, 3 ],
+               [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
+                 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
+                 0.3, 0.3, 0.3, 0.3, 0.3, 0.3,
+                 0.4, 0.4, 0.4, 0.4, 0.4, 0.4,
+                 0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
+            },
+            {
+               [ 0, 1, 2, 3 ],
+               [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
+                 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
+                 0.3, 0.3, 0.3, 0.3, 0.3, 0.3,
+                 0.4, 0.4, 0.4, 0.4, 0.4, 0.4,
+                 0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
+            }
+         }
+      }
+   }
+   DATASET "dset3" {
+      DATATYPE H5T_VLEN { H5T_STD_I32LE }
+      DATASPACE SIMPLE { ( 4 ) / ( 4 ) }
+      DATA {
+         (0), (10, 11), (20, 21, 22), (30, 31, 32, 33)
+      }
+   }
+   GROUP "group2" {
+      HARDLINK "/group1"
+   }
+   SOFTLINK "slink1" {
+      LINKTARGET "somevalue"
+   }
+   DATATYPE "type1" H5T_COMPOUND {
+      H5T_ARRAY { [4] H5T_STD_I32BE } "a";
+      H5T_ARRAY { [5][6] H5T_IEEE_F32BE } "b";
+   }
+}
+}
+\endcode
+
+ */
+\ No newline at end of file
diff --git a/doxygen/dox/DDLBNF112.dox b/doxygen/dox/DDLBNF112.dox
new file mode 100644
index 0000000..6809a06
--- /dev/null
+++ b/doxygen/dox/DDLBNF112.dox
@@ -0,0 +1,653 @@
+/** \page DDLBNF112 DDL in BNF for HDF5 1.12 and above
+
+\todo Revise this & break it up!
+
+\section intro112 Introduction
+
+This document contains the data description language (DDL) for an HDF5 file. The
+description is in Backus-Naur Form (BNF).
+
+\section expo112 Explanation of Symbols
+
+This section contains a brief explanation of the symbols used in the DDL.
+
+\code{.unparsed}
+::=                      defined as
+ <tname>                  a token with the name tname
+ <a> | <b>                one of <a> or <b>
+ <a>opt                   zero or one occurrence of <a>
+ <a>*                     zero or more occurrence of <a>
+ <a>+                     one or more occurrence of <a>
+ [0-9]                    an element in the range between 0 and 9
+ '['                      the token within the quotes (used for special characters)
+ TBD                      To Be Decided
+\endcode
+
+\section ddl112 The DDL
+
+\code{.unparsed}
+<file> ::= HDF5 <file_name> { <file_super_block>opt <root_group> }
+
+<file_name> ::= <identifier>
+
+<file_super_block> ::= SUPER_BLOCK {
+                           SUPERBLOCK_VERSION <int_value>
+                           FREELIST_VERSION <int_value>
+                           SYMBOLTABLE_VERSION <int_value>
+                           OBJECTHEADER_VERSION <int_value>
+                           OFFSET_SIZE <int_value>
+                           LENGTH_SIZE <int_value>
+                           BTREE_RANK <int_value>
+                           BTREE_LEAF <int_value>
+                           ISTORE_K <int_value>
+                           <super_block_filespace>
+                           USER_BLOCK {
+                               USERBLOCK_SIZE <int_value>
+                           }
+                       }
+
+<super_block_filespace> ::= FILE_SPACE_STRATEGY <super_block_strategy>
+                            FREE_SPACE_PERSIST <boolean_value>
+                            FREE_SPACE_SECTION_THRESHOLD <int_value>
+                            FILE_SPACE_PAGE_SIZE <int_value>
+
+<super_block_strategy> ::= H5F_FSPACE_STRATEGY_FSM_AGGR | H5F_FSPACE_STRATEGY_PAGE |
+                             H5F_FSPACE_STRATEGY_AGGR | H5F_FSPACE_STRATEGY_NONE |
+                             Unknown strategy
+
+<root_group> ::= GROUP "/" {
+                     <anon_named_datatype>*
+                     <object_id>opt
+                     <group_comment>opt
+                     <group_attribute>*
+                     <group_member>*
+                 }
+
+<datatype> ::= <atomic_type> | <compound_type> | <variable_length_type> | <array_type>
+
+<anon_named_datatype> ::= DATATYPE <anon_named_type_name> {
+                              <datatype>
+                          }
+
+<anon_named_type_name> ::= the assigned name for anonymous named type is
+                           in the form of #oid, where oid is the object id
+                           of the type
+
+<atomic_type> ::= <integer> | <float> | <time> | <string> |
+                  <bitfield> | <opaque> | <reference> | <enum>
+
+<boolean_value> ::= FALSE | TRUE
+
+<integer> ::= H5T_STD_I8BE     | H5T_STD_I8LE      |
+              H5T_STD_I16BE    | H5T_STD_I16LE     |
+              H5T_STD_I32BE    | H5T_STD_I32LE     |
+              H5T_STD_I64BE    | H5T_STD_I64LE     |
+              H5T_STD_U8BE     | H5T_STD_U8LE      |
+              H5T_STD_U16BE    | H5T_STD_U16LE     |
+              H5T_STD_U32BE    | H5T_STD_U32LE     |
+              H5T_STD_U64BE    | H5T_STD_U64LE     |
+              H5T_NATIVE_CHAR  | H5T_NATIVE_UCHAR  |
+              H5T_NATIVE_SHORT | H5T_NATIVE_USHORT |
+              H5T_NATIVE_INT   | H5T_NATIVE_UINT   |
+              H5T_NATIVE_LONG  | H5T_NATIVE_ULONG  |
+              H5T_NATIVE_LLONG | H5T_NATIVE_ULLONG
+
+<float> ::= H5T_IEEE_F32BE   | H5T_IEEE_F32LE     |
+            H5T_IEEE_F64BE   | H5T_IEEE_F64LE     |
+            H5T_NATIVE_FLOAT |  H5T_NATIVE_DOUBLE |
+            H5T_NATIVE_LDOUBLE
+
+<time> ::= H5T_TIME: not yet implemented
+
+<string> ::= H5T_STRING {
+                 STRSIZE <strsize>;
+                 STRPAD <strpad>;
+                 CSET <cset>;
+                 CTYPE <ctype>;
+             }
+
+<strsize> ::= <int_value>
+
+<strpad> ::= H5T_STR_NULLTERM | H5T_STR_NULLPAD | H5T_STR_SPACEPAD
+
+<cset> ::= H5T_CSET_ASCII | H5T_CSET_UTF8
+
+<ctype> ::= H5T_C_S1 | H5T_FORTRAN_S1
+
+<bitfield> ::= H5T_STD_B8BE     | H5T_STD_B8LE      |
+               H5T_STD_B16BE    | H5T_STD_B16LE     |
+               H5T_STD_B32BE    | H5T_STD_B32LE     |
+               H5T_STD_B64BE    | H5T_STD_B64LE
+
+<opaque> ::= H5T_OPAQUE {
+                 OPAQUE_TAG <identifier>;
+                 OPAQUE_SIZE <int_value>;opt
+             }
+
+<reference> ::= H5T_REFERENCE { <ref_type> }
+
+<ref_type> ::= H5T_STD_REF_OBJECT | H5T_STD_REF_DSETREG | H5T_STD_REF | UNDEFINED
+
+<compound_type> ::= H5T_COMPOUND {
+                        <member_type_def>+
+                    }
+
+<member_type_def> ::= <datatype> <field_name>;
+
+<field_name> ::= <identifier>
+
+<variable_length_type> ::= H5T_VLEN { <datatype> }
+
+<array_type> ::= H5T_ARRAY { <dim_sizes> <datatype> }
+
+<dim_sizes> ::= '['<dimsize>']' | '['<dimsize>']'<dim_sizes>
+
+<dimsize> ::= <int_value>
+
+<attribute> ::= ATTRIBUTE <attr_name> {
+                    <dataset_type>
+                    <dataset_space>
+                    <data>opt
+                }
+
+<attr_name> ::= <identifier>
+
+<dataset_type> ::= DATATYPE <path_name> | <datatype>
+
+<enum> ::= H5T_ENUM {
+               <enum_base_type> <enum_def>+
+           }
+
+<enum_base_type> ::= <integer>
+// Currently enums can only hold integer type data, but they may be expanded
+// in the future to hold any datatype
+
+<enum_def> ::= <enum_symbol> <enum_val>;
+
+<enum_symbol> ::= <identifier>
+
+<enum_val> ::= <int_value>
+
+<path_name> ::= <path_part>+
+
+<path_part> ::= /<identifier>
+
+<dataspace> ::= <scalar_space> | <simple_space> | <complex_space> | <null_space>
+
+<null_space> ::= NULL
+
+<scalar_space> ::= SCALAR
+
+<simple_space> ::= SIMPLE { <current_dims> / <max_dims> }
+
+<complex_space> ::= COMPLEX { <complex_space_definition> }
+
+<dataset_space> ::= DATASPACE <path_name> | <dataspace>
+
+<current_dims> ::= <dims>
+
+<max_dims> ::= '(' <max_dim_list> ')'
+
+<max_dim_list> ::= <max_dim> | <max_dim>, <max_dim_list>
+
+<max_dim> ::= <int_value> | H5S_UNLIMITED
+
+<data> ::= <subset> | <data_values>
+
+<data_values> ::= DATA {
+               <scalar_space_data> | <simple_space_data>
+           }
+
+<scalar_space_data> ::= <any_element>
+
+<any_element> ::= <atomic_element> | <compound_element> |
+                  <variable_length_element> | <array_element>
+
+<any_data_seq> ::= <any_element> | <any_element>, <any_data_seq>
+
+<atomic_element> :: = <integer_data> | <float_data>    | <time_data>   |
+                     <string_data>  | <bitfield_data> | <opaque_data> |
+                     <enum_data>    | <reference_data>
+
+<subset> ::= SUBSET {
+                 <start>;
+                 <stride>;
+                 <count>;
+                 <block>;
+                 DATA {
+                     <simple_space_data>
+                 }
+             }
+
+<start> ::= START (<coor_list>)
+
+<stride> ::= STRIDE (<pos_list>)
+
+<count> ::= COUNT (<max_dim_list>)
+
+<block> ::= BLOCK (<max_dim_list>)
+
+<coor_list> ::= <coor_data>, <coor_list> | <coor_data>
+
+<coor_data> ::= <integer_data> | H5S_UNLIMITED
+
+<integer_data> ::= <int_value>
+
+<float_data> ::= a floating point number
+
+<time_data> ::= DATA{ not yet implemented.}
+
+<string_data> ::= a string
+// A string is enclosed in double quotes.
+// If a string is displayed on more than one line, string concatenate
+// operator '//'is used.
+
+<bitfield_data> ::= <hex_value>
+
+<opaque_data> ::= <hex_value>:<hex_value> | <hex_value>
+
+<enum_data> ::= <enum_symbol>
+
+<reference_data> ::= <object_ref_data> | <data_region_data> | <attribute_data> | NULL
+
+<object_ref_data> ::= <object_type> <object_ref>
+
+<object_type> ::= ATTRIBUTE | DATASET | GROUP | DATATYPE
+
+<object_ref> ::= <object_id>
+
+<object_id> ::= <path_name> | OBJECTID { <object_num> }
+
+<object_num> ::= <int_value>:<int_value> | <int_value>
+
+<attribute_data> ::= ATTRIBUTE <attr_name>opt
+                           <data>opt
+
+<data_region_data> ::= DATASET <dataset_name> {
+                           <data_region_type>opt <data_region_data_list>
+                           <dataset_type>opt <dataset_space>opt
+                           <data>opt
+                       }
+
+<data_region_type> ::= REGION_TYPE <data_region_data_type>
+
+<data_region_data_type> ::= POINT | BLOCK
+
+<data_region_data_list> ::= <data_region_data_info>, <data_region_data_list> |
+                            <data_region_data_info>
+
+<data_region_data_info> ::= <region_info> | <point_info>
+
+<region_info> ::= (<lower_region_vals>)-(<upper_region_vals>)
+
+<lower_region_vals> ::= <lower_bound>, <lower_region_vals> | <lower_bound>
+
+<upper_region_vals> ::= <upper_bound>, <upper_region_vals> | <upper_bound>
+
+<lower_bound> ::= <int_value>
+
+<upper_bound> ::= <int_value>
+
+<point_info> ::= (<point_vals>)
+
+<point_vals> ::= <int_value> | <int_value>, <point_vals>
+
+<compound_element> ::= { <any_data_seq> }
+
+<atomic_simple_data> :: = <atomic_element>, <atomic_simple_data> |
+                          <atomic_element>
+
+<simple_space_data> :: = <any_data_seq>
+
+<variable_length_element> ::= ( <any_data_seq> )
+
+<array_element> ::= '[' <any_data_seq> ']'
+
+<named_datatype> ::= DATATYPE <type_name> { <datatype> }
+
+<type_name> ::= <identifier>
+
+<hardlink> ::= HARDLINK <path_name>
+
+<group> ::= GROUP <group_name> { <hardlink> | <group_info> }
+
+<group_comment> ::= COMMENT <string_data>
+
+<group_name> ::= <identifier>
+
+<group_info> ::= <object_id>opt <group_comment>opt <group_attribute>*
+                 <group_member>*
+
+<group_attribute> ::= <attribute>
+
+<group_member> ::= <named_datatype> | <group> | <dataset> |
+                   <softlink> | <external_link>
+
+<dataset> ::= DATASET <dataset_name> { <hardlink> | <dataset_info> }
+
+<dataset_info> ::= <dataset_type>
+                   <dataset_space>
+                   <dcpl_info>opt
+                   <dataset_attribute>* <object_id>opt
+                   <data>opt
+// Tokens above can be in any order as long as <data> is
+// after <dataset_type> and <dataset_space>.
+
+<dcpl_info> ::= <storagelayout>
+                <compression_filters>
+                <fillvalue>
+                <allocationtime>
+
+<dataset_name> ::= <identifier>
+
+<storagelayout> :: =  STORAGE_LAYOUT {
+                         <contiguous_layout> | <chunked_layout> |
+                         <compact_layout> | <virtual_layout>
+                    }
+
+<contiguous_layout> ::= CONTIGUOUS
+                        <internal_layout> | <external_layout>
+
+<chunked_layout> ::= CHUNKED <dims>
+                     <filter_ratio>opt
+
+<compact_layout> ::= COMPACT
+                     <size>
+
+<internal_layout> ::= <size>
+                      <offset>
+
+<external_layout> ::= EXTERNAL {
+                          <external_file>+
+                      }
+
+<virtual_layout> ::= <vmaps>*opt
+
+<vmaps> ::= MAPPING <int_value> {
+                <virtual_map>
+                <source_map>
+            }
+
+<virtual_map> ::= VIRTUAL {
+                      <vmaps_selection>
+                  }
+
+<source_map> ::= SOURCE {
+                     FILE <file_name>
+                     DATASET <dataset_name>
+                     <vmaps_selection>
+                 }
+
+<vmaps_selection> ::= <regular_hyperslab> | <irregular_hyperslab> |
+                      <select_points> | <select_none> | <select_all>
+
+<regular_hyperslab> ::= SELECTION REGULAR_HYPERSLAB {
+                          <start>
+                          <stride>
+                          <count>
+                          <block>
+                      }
+
+<irregular_hyperslab> ::= SELECTION IRREGULAR_HYPERSLAB {
+                              <region_info>+
+                          }
+
+<select_points> ::= SELECTION POINT {
+                        (<coor_list>)+
+                    }
+
+<select_none> ::= SELECTION NONE
+
+<select_all> ::= SELECTION ALL
+
+<dims> ::= (<dims_values>)
+
+<dims_values> ::= <int_value> | <int_value>, <dims_values>
+
+<external_file> ::= FILENAME <file_name> <size> <offset>
+
+<offset> ::= OFFSET <int_value>
+
+<size> ::= SIZE <int_value>
+
+<filter_ratio> ::= <size> | <compressionratio>
+
+<compressionratio> :: = <size> (<float_data>:1 COMPRESSION)
+
+<compression_filters> :: = FILTERS {
+                               <filter_type>+ | NONE
+                          }
+
+<filter_type> :: = <filter_deflate>   | <filter_shuffle>     |
+                    <filter_flecther> | <filter_szip>        |
+                    <filter_nbit>     | <filter_scaleoffset> |
+                    <filter_default>
+
+<filter_default> :: = <filter_user> {
+                          FILTER_ID <int_value>
+                          <filter_comment>opt
+                          <filter_params>opt
+                     }
+
+<filter_user> :: = USER_DEFINED_FILTER
+
+<filter_deflate> :: = COMPRESSION DEFLATE { LEVEL <int_value> }
+
+<filter_shuffle> :: = PREPROCESSING SHUFFLE
+
+<filter_flecther> :: = CHECKSUM FLETCHER32
+
+<filter_szip> :: = COMPRESSION SZIP {
+                       PIXELS_PER_BLOCK <int_value>
+                       <filter_szip_mode>opt
+                       <filter_szip_coding>opt
+                       <filter_szip_order>opt
+                       <filter_szip_header>opt
+                  }
+
+<filter_szip_mode> :: = MODE HARDWARE | K13
+
+<filter_szip_coding> :: = CODING ENTROPY | NEAREST NEIGHBOUR
+
+<filter_szip_order> :: = BYTE_ORDER LSB | MSB
+
+<filter_szip_header> :: = HEADER RAW
+
+<filter_nbit> :: = CHECKSUM NBIT
+
+<filter_scaleoffset> :: = COMPRESSION SCALEOFFSET { MIN BITS <int_value> }
+
+<filter_comment> :: = COMMENT  <identifier>
+
+<filter_params> :: = PARAMS { <int_value>* }
+
+<fillvalue> ::= FILLVALUE {
+                    FILL_TIME H5D_FILL_TIME_ALLOC | H5D_FILL_TIME_NEVER | H5D_FILL_TIME_IFSET
+                    VALUE H5D_FILL_VALUE_UNDEFINED | H5D_FILL_VALUE_DEFAULT | <any_element>
+                }
+
+<allocationtime> ::= ALLOCATION_TIME {
+                         H5D_ALLOC_TIME_EARLY | H5D_ALLOC_TIME_INCR |
+                         H5D_ALLOC_TIME_LATE
+                     }
+
+<dataset_attribute> ::= <attribute>
+
+<softlink> ::= SOFTLINK <softlink_name> {
+                   LINKTARGET <target>
+               }
+
+<softlink_name> ::= <identifier>
+
+<target> ::= <identifier>
+
+<external_link> ::= EXTERNAL_LINK <external_link_name> {
+                        TARGETFILE <targetfile>
+                        TARGETPATH <targetpath> <targetobj>opt
+                    }
+
+<external_link_name> ::= <identifier>
+
+<user_defined_link> ::= USERDEFINED_LINK <external_link_name> {
+                            LINKCLASS <user_link_type>
+                        }
+
+<user_link_type> ::= <int_value>
+
+<targetfile> ::= <file_name>
+
+<targetpath> ::= <identifier>
+
+<targetobj> ::= <named_datatype> | <group> | <dataset>
+
+<identifier> ::= "a string"
+// character '/' should be used with care.
+
+<pos_list> ::= <pos_int>, <pos_list> | <pos_int>
+
+<int_value> ::= 0 | <pos_int>
+
+<pos_int> ::= [1-9][0-9]*
+
+<hex_value> ::= 0x[0-F][0-F]+ | [0-F][0-F]+
+\endcode
+
+\section example112 An Example of an HDF5 File in DDL
+
+\code{.unparsed}
+HDF5 "example.h5" {
+GROUP "/" {
+   ATTRIBUTE "attr1" {
+      DATATYPE H5T_STRING {
+           STRSIZE 17;
+           STRPAD H5T_STR_NULLTERM;
+           CSET H5T_CSET_ASCII;
+           CTYPE H5T_C_S1;
+         }
+      DATASPACE SCALAR
+      DATA {
+         "string attribute"
+      }
+   }
+   DATASET "dset1" {
+      DATATYPE H5T_STD_I32BE
+      DATASPACE SIMPLE { ( 10, 10 ) / ( 10, 10 ) }
+      DATA {
+         0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+         0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+         0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+         0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+         0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+         0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+         0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+         0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+         0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+         0, 1, 2, 3, 4, 5, 6, 7, 8, 9
+      }
+   }
+   DATASET "dset2" {
+      DATATYPE H5T_COMPOUND {
+         H5T_STD_I32BE "a";
+         H5T_IEEE_F32BE "b";
+         H5T_IEEE_F64BE "c";
+      }
+      DATASPACE SIMPLE { ( 5 ) / ( 5 ) }
+      DATA {
+         {
+            1,
+            0.1,
+            0.01
+         },
+         {
+            2,
+            0.2,
+            0.02
+         },
+         {
+            3,
+            0.3,
+            0.03
+         },
+         {
+            4,
+            0.4,
+            0.04
+         },
+         {
+            5,
+            0.5,
+            0.05
+         }
+      }
+   }
+   GROUP "group1" {
+      COMMENT "This is a comment for group1";
+      DATASET "dset3" {
+         DATATYPE "/type1"
+         DATASPACE SIMPLE { ( 5 ) / ( 5 ) }
+         DATA {
+            {
+               [ 0, 1, 2, 3 ],
+               [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
+                 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
+                 0.3, 0.3, 0.3, 0.3, 0.3, 0.3,
+                 0.4, 0.4, 0.4, 0.4, 0.4, 0.4,
+                 0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
+            },
+            {
+               [ 0, 1, 2, 3 ],
+               [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
+                 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
+                 0.3, 0.3, 0.3, 0.3, 0.3, 0.3,
+                 0.4, 0.4, 0.4, 0.4, 0.4, 0.4,
+                 0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
+            },
+            {
+               [ 0, 1, 2, 3 ],
+               [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
+                 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
+                 0.3, 0.3, 0.3, 0.3, 0.3, 0.3,
+                 0.4, 0.4, 0.4, 0.4, 0.4, 0.4,
+                 0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
+            },
+            {
+               [ 0, 1, 2, 3 ],
+               [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
+                 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
+                 0.3, 0.3, 0.3, 0.3, 0.3, 0.3,
+                 0.4, 0.4, 0.4, 0.4, 0.4, 0.4,
+                 0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
+            },
+            {
+               [ 0, 1, 2, 3 ],
+               [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
+                 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
+                 0.3, 0.3, 0.3, 0.3, 0.3, 0.3,
+                 0.4, 0.4, 0.4, 0.4, 0.4, 0.4,
+                 0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
+            }
+         }
+      }
+   }
+   DATASET "dset3" {
+      DATATYPE H5T_VLEN { H5T_STD_I32LE }
+      DATASPACE SIMPLE { ( 4 ) / ( 4 ) }
+      DATA {
+         (0), (10, 11), (20, 21, 22), (30, 31, 32, 33)
+      }
+   }
+   GROUP "group2" {
+      HARDLINK "/group1"
+   }
+   SOFTLINK "slink1" {
+      LINKTARGET "somevalue"
+   }
+   DATATYPE "type1" H5T_COMPOUND {
+      H5T_ARRAY { [4] H5T_STD_I32BE } "a";
+      H5T_ARRAY { [5][6] H5T_IEEE_F32BE } "b";
+   }
+}
+}
+\endcode
+
+*/
+\ No newline at end of file
diff --git a/doxygen/dox/FTS.dox b/doxygen/dox/FTS.dox
new file mode 100644
index 0000000..9dae7c1
--- /dev/null
+++ b/doxygen/dox/FTS.dox
@@ -0,0 +1,8 @@
+/** \page FTS Full-Text Search
+
+\htmlonly
+<script async src="https://cse.google.com/cse.js?cx=75c754173f9b90804"></script>
+<div class="gcse-search"></div>
+\endhtmlonly
+
+*/
+\ No newline at end of file
diff --git a/doxygen/dox/FileFormatSpec.dox b/doxygen/dox/FileFormatSpec.dox
new file mode 100644
index 0000000..fc10574
--- /dev/null
+++ b/doxygen/dox/FileFormatSpec.dox
@@ -0,0 +1,23 @@
+/** \page FMT3 HDF5 File Format Specification Version 3.0
+
+\htmlinclude H5.format.html
+
+*/
+
+/** \page FMT2 HDF5 File Format Specification Version 2.0
+
+\htmlinclude H5.format.2.0.html
+
+*/
+
+/** \page FMT11 HDF5 File Format Specification Version 1.1
+
+\htmlinclude H5.format.1.1.html
+
+*/
+
+/** \page FMT1 HDF5 File Format Specification Version 1.0
+
+\htmlinclude H5.format.1.0.html
+
+*/
+\ No newline at end of file
diff --git a/doxygen/dox/GettingStarted.dox b/doxygen/dox/GettingStarted.dox
new file mode 100644
index 0000000..29c5033
--- /dev/null
+++ b/doxygen/dox/GettingStarted.dox
@@ -0,0 +1,100 @@
+/** @page GettingStarted Getting Started with HDF5
+
+Navigate back: \ref index "Main"
+<hr>
+
+\section sec_learn Learning HDF5
+There are several resources for learning about HDF5. The HDF Group provides an on-line HDF5 tutorial,
+documentation, examples, and videos. There are also tutorials provided by other organizations that are very useful for learning about HDF5.
+
+\subsection subsec_learn_intro The HDF Group Resources
+For a quick introduction to HDF5 see the following:
+<table>
+<tr>
+<td style="background-color:#F5F5F5">
+@ref IntroHDF5
+</td>
+<td>
+A very brief introduction to HDF5 and the HDF5 programming model and APIs
+</td>
+</tr>
+<tr>
+<td style="background-color:#F5F5F5">
+@ref LearnHDFView
+</td>
+<td>
+A tutorial for learning how to use HDFView. NO programming involved!
+</td>
+</tr>
+<tr>
+<td style="background-color:#F5F5F5">
+@ref LearnBasics
+</td>
+<td>
+Step by step instructions for learning HDF5 that include programming examples
+</td>
+</tr>
+</table>
+
+\subsection subsec_learn_tutor The HDF Group Tutorials and Examples
+These tutorials and examples are available for learning about the HDF5 High Level APIs, tools,
+Parallel HDF5, and the HDF5-1.10 VDS and SWMR new features:
+<table>
+<tr>
+<td style="background-color:#F5F5F5">
+<a href="https://portal.hdfgroup.org/display/HDF5/Introduction+to+the+HDF5+High+Level+APIs">Using the High Level APIs</a>
+</td>
+<td>
+\ref H5LT    \ref H5IM    \ref H5TB    \ref H5PT    \ref H5DS
+</td>
+</tr>
+<tr>
+<td style="background-color:#F5F5F5">
+<a href="https://portal.hdfgroup.org/display/HDF5/Introduction+to+Parallel+HDF5">Introduction to Parallel HDF5</a>
+</td>
+<td>
+A brief introduction to Parallel HDF5. If you are new to HDF5 please see the @ref LearnBasics topic first. 
+</td>
+</tr>
+<tr>
+<td style="background-color:#F5F5F5">
+\ref ViewTools
+</td>
+<td>
+\li @ref LearnHDFView
+\li @ref ViewToolsCommand
+\li @ref ViewToolsJPSS
+</td>
+</tr>
+<tr>
+<td style="background-color:#F5F5F5">
+HDF5-1.10 New Features
+</td>
+<td>
+\li <a href="https://portal.hdfgroup.org/display/HDF5/Introduction+to+the+Virtual+Dataset++-+VDS">Introduction to the Virtual Dataset - VDS</a>
+\li <a href="https://portal.hdfgroup.org/pages/viewpage.action?pageId=48812567">Introduction to Single-Writer/Multiple-Reader (SWMR)</a>
+</td>
+</tr>
+<tr>
+<td style="background-color:#F5F5F5">
+Example Programs
+</td>
+<td>
+\ref HDF5Examples
+</td>
+</tr>
+<tr>
+<td style="background-color:#F5F5F5">
+Videos
+</td>
+<td>
+\li <a href="https://www.youtube.com/watch?v=BAjsCldRMMc">Introduction to HDF5</a>
+\li <a href="https://www.youtube.com/watch?v=qrI27pI0P1E">Parallel HDF5</a>
+</td>
+</tr>
+</table>
+
+<hr>
+Navigate back: \ref index "Main"
+
+*/
diff --git a/doxygen/dox/Glossary.dox b/doxygen/dox/Glossary.dox
new file mode 100644
index 0000000..9ccd27d
--- /dev/null
+++ b/doxygen/dox/Glossary.dox
@@ -0,0 +1,565 @@
+/** \page GLS Glossary
+
+\section GLS_A A
+
+<DL>
+  <DT>Array datatype</DT>
+  <DD>A family of HDF5 datatypes whose elements are arrays of a fixed rank (≤
+  32) and fixed finite extent. All array elements must be of the same HDF5
+  datatype.</DD>
+</DL>
+
+<DL>
+  <DT>Array variable</DT>
+  <DD><P>A variable that can store (logically) dense, rectilinear, multidimensional
+      arrays of elements of a given HDF5 datatype.</P>
+    <P>The combination of array rank (dimensionality) and extent is called an
+    array variable's shape. This includes the degenerate array shapes of a
+    singleton (scalar) and the empty array (null).</P>
+    <P>The array element datatype is sometimes referred to as the array
+    variable's type, which is not entirely accurate because the array variable's
+    type is 'array of element type' rather than 'element type'.</P>
+    <P>In HDF5, there are two kinds of array variables, attributes and datasets,
+      and the distinction is functional (i.e., how they can be used) rather than
+      conceptual. Attributes are commonly used for descriptive "light-weight"
+      HDF5 object metadata while datasets are HDF5 objects used to store
+      "heavy-weight" problem-sized data.</P>
+  </DD>
+</DL>
+
+<DL>
+  <DT>Attribute</DT>
+  <DD><P>A named array variable that is associated with an HDF5 object, its
+      owner or attributee, and used to represent application domain-specific
+      metadata of the object. Intuitively, the set of an object's attributes can
+      be thought of as its key-value pair collection. Attribute names (keys) can
+      be arbitrary Unicode strings, but must be unique per object, i.e., an
+      object can have at most one attribute with a given name.</P>
+    <P>A scalar attribute is an attribute backed by a singleton array
+    variable. A null attribute is attribute backed by an empty array
+    variable.</P>
+</DD>
+</DL>
+
+\section GLS_B B
+
+<DL>
+  <DT>Bitfield datatype</DT>
+  <DD>A family of HDF5 datatypes whose elements are fixed-width bit fields.</DD>
+</DL>
+
+\section GLS_C C
+
+<DL>
+  <DT>Chunked layout</DT>
+  <DD>
+    <P>A dataset storage layout where the dataset elements are partitioned into
+      fixed-size multidimensional chunks or tiles. Chunked layout is mandatory
+      for datasets with one or more dimensions of indefinite (infinite) extent
+      or where compression or other filters are applied to the dataset elements.</P>
+    <P>Chunked layout may improve I/O performance for certain access patterns.</P>
+</DD>
+</DL>
+
+<DL>
+  <DT>Committed datatype</DT>
+  <DD>An immutable kind of HDF5 object that is used to store an HDF5 datatype
+  definition, which can be referenced by multiple array variables. When linked
+  to an HDF5 group, a committed datatype can be located by an HDF5 path name,
+  and is sometimes called a named datatype.</DD>
+</DL>
+
+<DL>
+  <DT>Compact layout</DT>
+  <DD></DD>
+</DL>
+
+<DL>
+  <DT>Compound datatype</DT>
+  <DD>
+    <P>A family of HDF5 datatypes whose elements are records with named fields
+    of other HDF5 datatypes. Currently, on ASCII field names are supported.</P>
+    <P>Similar to a <CODE>struct</CODE> in C or a <CODE>COMMON</CODE> block in
+    Fortran.</P>
+</DD>
+</DL>
+
+<DL>
+  <DT>Contiguous layout</DT>
+  <DD>A dataset storage layout where the dataset elements are physically stored
+  in an HDF5 file as a contiguous block of bytes.</DD>
+</DL>
+
+\section GLS_D D
+
+<DL>
+  <DT>Dataset</DT>
+  <DD>
+    <P>A kind of HDF5 object, a linked array variable. which can be located in
+      an HDF5 file through a path name. Datasets are commonly used to store
+      "heavy-weight" problem-sized data.</P>
+    <P>The HDF5 library offers a lot of features aimed at optimized dataset
+      access and storage, including compression and partial I/O.</P>
+</DD>
+</DL>
+
+<DL>
+  <DT>Dataspace</DT>
+  <DD>The shape of an array variable. With the exception of degenerate cases
+  (empty set, singleton), this is a rectilinear lattice or grid of a certain
+  rank (dimensionality) and extent.</DD>
+</DL>
+
+<DL>
+  <DT>Datatype</DT>
+  <DD>
+    <P>An HDF5 datatype consists of an abstract data type (a set of elements)
+    and a bit-level representation of these elements in storage such as an HDF5
+    file or memory.</P>
+    <P>The HDF5 library comes with a large set of predefined datatypes and
+    offers mechanisms for creating user-defined datatypes.</P>
+    <P>The ten major families or classes of HDF5 datatypes are:</P>
+    <UL>
+      <LI>Integer datatypes</LI>
+      <LI>Floating-point number datatypes</LI>
+      <LI>String datatypes</LI>
+      <LI>Bitfield datatypes</LI>
+      <LI>Opaque datatypes</LI>
+      <LI>Compound datatypes</LI>
+      <LI>Reference datatypes</LI>
+      <LI>Enumerated datatypes</LI>
+      <LI>Variable-length sequence datatypes</LI>
+      <LI>Array datatypes</LI>
+    </UL>
+</DD>
+</DL>
+
+\section GLS_E E
+
+<DL>
+  <DT>Enumeration datatype</DT>
+  <DD>A family of HDF5 datatypes whose elements represent named integer values
+  called members or enumerators. Currently, only ASCII names are supported.</DD>
+</DL>
+
+<DL>
+  <DT>External layout</DT>
+  <DD>A form of contiguous layout where a dataset's elements are physically
+  stored in unformatted binary files outside the HDF5 file.</DD>
+</DL>
+
+<DL>
+  <DT>External link</DT>
+  <DD>An HDF5 link whose destination is specified as a pair of an HDF5 file name
+and an HDF5 path name in that file.</DD>
+</DL>
+
+\section GLS_F F
+
+<DL>
+  <DT>Field</DT>
+  <DD>See compound datatype.</DD>
+</DL>
+
+<DL>
+  <DT>File</DT>
+  <DD>
+    <OL>
+      <LI>A byte stream (in a storage context such as a file system or in
+      memory) formatted according to the HDF5 File Format Specification.</LI>
+      <LI>A (logical) container for HDF5 objects.</LI>
+    </OL>
+  </DD>
+</DL>
+
+<DL>
+  <DT>File format</DT>
+  <DD></DD>
+</DL>
+
+<DL>
+  <DT>Fill value</DT>
+  <DD></DD>
+</DL>
+
+<DL>
+  <DT>Filter</DT>
+  <DD></DD>
+</DL>
+
+\section GLS_G G
+
+<DL>
+  <DT>Group</DT>
+  <DD>
+    <P>A kind of HDF5 object that stores a collection of HDF5 links. Each HDF5
+    file contains at least one group, it's root group.</P>
+    <P>Among the destinations of an HDF5 group's links may be other HDF5 groups
+    (including the group itself!). This ability is sometimes referred to as the
+    closure property of groups. It is the basis for creating hierarchical or
+    more general graph-like structures.</P>
+</DD>
+</DL>
+
+\section GLS_H H
+
+<DL>
+  <DT>Hard link</DT>
+  <DD>An HDF5 link whose destination is specified (internally) as the address of
+  an HDF5 object in the same HDF5 file.</DD>
+</DL>
+
+<DL>
+  <DT>Hierarchy</DT>
+  <DD>See group.</DD>
+</DL>
+
+<DL>
+  <DT>Hyperslab</DT>
+  <DD>
+    <P>A regular multidimensional pattern described by four vectors whose length
+    equals the rank of the pattern.</P>
+    <OL>
+      <LI><CODE>start</CODE> - the offset where the first block of the hyperslab begins</LI>
+      <LI><CODE>stride</CODE> - the offset between pattern blocks</LI>
+      <LI><CODE>count</CODE> - the number of blocks</LI>
+      <LI><CODE>block</CODE> - the extent of an individual pattern block</LI>
+    </OL>
+    <P>For example, the black squares on a (two-dimensional) chessboard with
+      origin at <CODE>(0,0)</CODE> can be represented as the union of two
+      hyperslabs representing the even <CODE>(0,2,4,6)</CODE> and
+      odd <CODE>(1,3,5,7)</CODE> rows, respectively.</P>
+    <IMG SRC="https://upload.wikimedia.org/wikipedia/commons/thumb/d/d7/Chessboard480.svg/176px-Chessboard480.svg.png"/>
+    <P>The hyperslab parameters for the even rows are: <CODE>start (0,0)</CODE>,
+      <CODE>stride (2,2)</CODE>, <CODE>count (4,4)</CODE>, <CODE>block
+        (1,1)</CODE>. Likewise the parameters for the odd rows are: <CODE>start
+        (1,1)</CODE>, <CODE>stride (2,2)</CODE>, <CODE>count
+        (4,4)</CODE>, <CODE>block (1,1)</CODE>.</P>
+</DD>
+</DL>
+
+\section GLS_I I
+
+<DL>
+  <DT>Identifier</DT>
+  <DD>An opaque, transient handle used by the HDF5 library to manipulate
+  in-memory representations of HDF5 items.</DD>
+</DL>
+
+\section GLS_L L
+
+<DL>
+  <DT>Library</DT>
+  <DD></DD>
+</DL>
+
+<DL>
+  <DT>Link</DT>
+  <DD>
+    <P>A named, uni-directional association between a source and a
+    destination. In HDF5, the source is always the HDF5 group that hosts the
+    link in its link collection.</P>
+    <P>There are several ways to specify a link's destination:</P>
+    <UL>
+      <LI>The address of an HDF5 object in the same HDF5 file; so-called hard
+      link.</LI>
+      <LI>A path name in the same or a different file; so-called soft or
+      external link.</LI>
+      <LI>User-defined</LI>
+    </UL>
+    <P>A link name can be any Unicode string that does not contain slashes
+      (<CODE>"/"</CODE>) or consists of a single dot character
+      (<CODE>"."</CODE>). A link name must be unique in a group's link
+      collection.</P>
+  </DD>
+</DL>
+
+\section GLS_M M
+
+<DL>
+  <DT>Metadata</DT>
+  <DD>Data that in a given context has a descriptive or documentation function
+  for other data. Typically, the metadata is small compared to the data it
+  describes.</DD>
+</DL>
+
+<DL>
+  <DT>Member</DT>
+  <DD>
+    <P>A link destination is sometimes referred to as a member of the link's
+    source (group). This way of speaking invites confusion: A destination (e.g.,
+    object) can be the destination of multiple links in the same (!) or
+    different groups. It would then be a "member" of a given group with
+    multiplicity greater than one and be a member of multiple groups.</P>
+    <P> It is the link that is a member of the group's link collection and not
+    the link destination.</P>
+  </DD>
+</DL>
+
+\section GLS_N N
+
+<DL>
+  <DT>Name</DT>
+  <DD>
+    <P>A Unicode string that depending on the item it names might be subject to
+    certain character restrictions, such as ASCII-encoded only. In HDF5, the
+    user might encounter the following names:</P>
+    <UL>
+      <LI>A link name</LI>
+      <LI>A path name</LI>
+      <LI>An attribute name</LI>
+      <LI>A field name (compound datatypes)</LI>
+      <LI>A constant name (enumeration datatypes)</LI>
+      <LI>A tag name (opaque datatypes)</LI>
+      <LI>A file name</LI>
+    </UL>
+  </DD>
+</DL>
+
+
+<DL>
+  <DT>Named datatype</DT>
+  <DD>See committed datatype.</DD>
+</DL>
+
+<DL>
+  <DT>Null dataspace</DT>
+  <DD>A shape which represents the empty set. Array variables with this shape
+  cannot store any values.</DD>
+</DL>
+
+\section GLS_O O
+
+<DL>
+  <DT>Object</DT>
+  <DD>An HDF5 group, dataset or named datatype; an HDF5 item that can be linked
+  to zero or more groups and decorated with zero or more HDF5 attributes.</DD>
+</DL>
+
+<DL>
+  <DT>Object reference</DT>
+  <DD>
+    <OL>
+      <LI>A datatype for representing references to objects in a file.</LI>
+      <LI>A value of the object reference datatype.</LI>
+    </OL>
+  </DD>
+</DL>
+
+<DL>
+  <DT>Opaque datatype</DT>
+  <DD>A family of HDF5 datatypes whose elements are byte sequences of a given
+  fixed length. An opaque datatype can be tagged with a sequence of up to 256
+  ASCII characters, e.g., MIME code.</DD>
+</DL>
+
+\section GLS_P P
+
+<DL>
+  <DT>Path name</DT>
+  <DD>A Unicode string that is the concatenation of link names separated by
+    slashes (<CODE>'/'</CODE>). In HDF5, path names are used to locate and refer
+    to HDF5 objects.</DD>
+</DL>
+
+<DL>
+  <DT>Plugin</DT>
+  <DD>An HDF5 library feature or capability that can be added dynamically at
+    application run time rather than library compilation time. Plugins are
+    usually implemented as shared libraries, and their discovery and loading
+    behavior can be controlled programmatically or through environment
+    variables.
+  </DD>
+</DL>
+
+<DL>
+  <DT>Point selection</DT>
+  <DD>A dataspace selection that consists of a set of points (coordinates) in
+  the same dataspace.</DD>
+</DL>
+
+<DL>
+  <DT>Property list</DT>
+  <DD>
+    <P>An HDF5 API construct, a means of customizing the behavior of the HDF5
+    library when creating, accessing or modifying HDF5 items.</P>
+    <P>While the default property settings are sufficient in many cases, certain
+    HDF5 features, such as compression, can be reasonably controlled only by the
+    user who has to provide the desired settings via property lists.</P>
+</DD>
+</DL>
+
+\section GLS_R R
+
+<DL>
+  <DT>Rank</DT>
+  <DD>The number of dimensions of a non-null dataspace.</DD>
+</DL>
+
+<DL>
+  <DT>Reference</DT>
+  <DD>
+    <OL>
+      <LI>An HDF5 object reference</LI>
+      <LI>An HDF5 dataset region reference</LI>
+    </OL>
+  </DD>
+</DL>
+
+<DL>
+  <DT>Reference datatype</DT>
+  <DD>
+    <OL>
+      <LI>An HDF5 datatype whose elements represent references to HDF5
+      objects.</LI>
+      <LI>An HDF5 datatype whose elements represent references to regions of an
+      HDF5 dataset.</LI>
+    </OL>
+  </DD>
+</DL>
+
+<DL>
+  <DT>Region reference</DT>
+  <DD>See dataset region reference.</DD>
+</DL>
+
+<DL>
+  <DT>Root group</DT>
+  <DD>
+    <P>An HDF5 group that is present in all HDF5 files and that acts as the
+    entry or base point for all other data stored in an HDF5 file.</P>
+    <P>The root group is "the mother of all objects" in an HDF5 file in the
+    sense that all objects (and their attributes) can be discovered,
+    beginning at the root group, by combinations of the following
+    operations:</P>
+    <UL>
+      <LI>Link traversal</LI>
+      <LI>De-referencing of object references</LI>
+    </UL>
+    <P>This discovery is portable and robust with respect to file-internal
+    storage reorganization.</P>
+</DD>
+</DL>
+
+\section GLS_S S
+
+<DL>
+  <DT>Scalar dataspace</DT>
+  <DD>A kind of HDF5 dataspace that has the shape of a singleton, i.e., a set
+  containing a single element. Array variables with this shape store exactly one
+  element.</DD>
+</DL>
+
+<DL>
+  <DT>Selection</DT>
+  <DD>
+    <OL>
+      <LI>A subset of points of an HDF5 dataspace. The subset might be a point
+        selection or a combination (union, intersection, etc.) of hyperslabs.</LI>
+      <LI>A subset of dataset elements associated with a dataspace selection as
+      described under 1.</LI>
+    </OL>
+  </DD>
+</DL>
+
+<DL>
+  <DT>Serialization</DT>
+  <DD>
+    <OL>
+      <LI>The flattening of an N-dimensional array into a 1-dimensional
+        array.</LI>
+      <LI>The encoding of a complex data item as a linear byte stream.</LI>
+    </OL>
+  </DD>
+</DL>
+
+<DL>
+  <DT>Soft link</DT>
+  <DD>A kind of HDF5 link in which the link destination is specified as an HDF5
+  path name. The path name may or may not refer to an actual object.</DD>
+</DL>
+
+<DL>
+  <DT>Storage layout</DT>
+  <DD>The storage arrangement for dataset elements, links in a group's link
+  collection, or attributes in an object's attribute collection.</DD>
+</DL>
+
+<DL>
+  <DT>String datatype</DT>
+  <DD></DD>
+</DL>
+
+<DL>
+  <DT>Super block</DT>
+  <DD>An HDF5 file format primitive; a block of data which contains information
+  required to access HDF5 files in a portable manner on multiple platforms. The
+  super block contains information such as version numbers, the size of offsets
+  and lengths, and the location of the root group.</DD>
+</DL>
+
+<DL>
+  <DT>SWMR</DT>
+  <DD>Single Writer Multiple Reader, a file access mode in which a single
+  process is permitted to write data to an HDF5 file while other processes are
+  permitted to read data from the same file without the need of inter-process
+  communication or synchronization.</DD>
+</DL>
+
+<DL>
+  <DT>Symbolic link</DT>
+  <DD>An external link or a soft link.</DD>
+</DL>
+
+\section GLS_U U
+
+<DL>
+  <DT>User block</DT>
+  <DD>An HDF5 file format primitive that allows one to set aside a fixed-size
+  (at least 512 bytes or any power of 2 thereafter) contiguous range of bytes at
+  the beginning of an HDF5 file for application purposes which will be
+  skipped/ignored by the HDF5 library.</DD>
+</DL>
+
+<DL>
+  <DT>UTF-8</DT>
+  <DD>
+    <P>A variable-length (1-4 bytes per code point) encoding of the Unicode set
+    of code points. This is the encoding supported by HDF5 to represent Unicode
+    strings.</P>
+    <P>The ASCII encoding is a proper subset of UTF-8.</P>
+</DD>
+</DL>
+
+\section GLS_V V
+
+<DL>
+  <DT>Variable-length (sequence) datatype</DT>
+  <DD>A family of HDF5 datatypes whose elements are variable-length sequences of
+  a given datatype.</DD>
+</DL>
+
+<DL>
+  <DT>Virtual Dataset (VDS)</DT>
+  <DD>An HDF5 dataset with virtual storage layout. A dataset whose elements are
+  partially or entirely stored physically in other datasets.</DD>
+</DL>
+
+<DL>
+  <DT>Virtual File Driver (VFD)</DT>
+  <DD></DD>
+</DL>
+
+
+<DL>
+  <DT>Virtual layout</DT>
+  <DD></DD>
+</DL>
+
+
+<DL>
+  <DT>Virtual Object Layer (VOL)</DT>
+  <DD></DD>
+</DL>
+
+*/
diff --git a/doxygen/dox/H5AC_cache_config_t.dox b/doxygen/dox/H5AC_cache_config_t.dox
new file mode 100644
index 0000000..3faecd5
--- /dev/null
+++ b/doxygen/dox/H5AC_cache_config_t.dox
@@ -0,0 +1,415 @@
+/**
+ * \page H5AC-cache-config-t Metadata Cache Configuration
+ * \tableofcontents
+ *
+ * \section gcf General configuration fields
+ *
+ * \par version
+ *      Integer field containing the version number of this version
+ *      of the H5AC_cache_config_t structure.  Any instance of
+ *      H5AC_cache_config_t passed to the cache must have a known
+ *      version number, or an error will be flagged.
+ *
+ * \par rpt_fcn_enabled
+ * \parblock
+ *    Boolean field used to enable and disable the default
+ *    reporting function.  This function is invoked every time the
+ *    automatic cache resize code is run, and reports on its activities.
+ *
+ *    This is a debugging function, and should normally be turned off.
+ * \endparblock
+ *
+ * \par open_trace_file
+ * \parblock
+ *     Boolean field indicating whether the trace_file_name
+ *     field should be used to open a trace file for the cache.
+ *
+ *     \Emph{*** DEPRECATED ***} Use \Code{H5Fstart/stop} logging functions instead
+ *
+ *     The trace file is a debugging feature that allow the capture of
+ *     top level metadata cache requests for purposes of debugging and/or
+ *     optimization.  This field should normally be set to \c FALSE, as
+ *     trace file collection imposes considerable overhead.
+ *
+ *     This field should only be set to \c TRUE when the trace_file_name
+ *     contains the full path of the desired trace file, and either
+ *     there is no open trace file on the cache, or the \c close_trace_file
+ *     field is also \c TRUE.
+ * \endparblock
+ *
+ * \par close_trace_file
+ * \parblock
+ *     Boolean field indicating whether the current trace
+ *     file (if any) should be closed.
+ *
+ *     \Emph{*** DEPRECATED ***} Use \Code{H5Fstart/stop} logging functions instead
+ *
+ *     See the above comments on the open_trace_file field.  This field
+ *     should be set to \c FALSE unless there is an open trace file on the
+ *     cache that you wish to close.
+ * \endparblock
+ *
+ * \par trace_file_name
+ * \parblock
+ *     Full path of the trace file to be opened if the
+ *     open_trace_file field is \c TRUE.
+ *
+ *     \Emph{*** DEPRECATED ***} Use \Code{H5Fstart/stop} logging functions instead
+ *
+ *     In the parallel case, an ascii representation of the mpi rank of
+ *     the process will be appended to the file name to yield a unique
+ *     trace file name for each process.
+ *
+ *     The length of the path must not exceed #H5AC__MAX_TRACE_FILE_NAME_LEN
+ *     characters.
+ * \endparblock
+ *
+ * \par evictions_enabled
+ * \parblock
+ *     Boolean field used to either report the current
+ *     evictions enabled status of the cache, or to set the cache's
+ *     evictions enabled status.
+ *
+ *     In general, the metadata cache should always be allowed to
+ *     evict entries.  However, in some cases it is advantageous to
+ *     disable evictions briefly, and thereby postpone metadata
+ *     writes.  However, this must be done with care, as the cache
+ *     can grow quickly.  If you do this, re-enable evictions as
+ *     soon as possible and monitor cache size.
+ *
+ *     At present, evictions can only be disabled if automatic
+ *     cache resizing is also disabled (that is, \Code{(incr_mode ==
+ *     H5C_incr__off ) && ( decr_mode == H5C_decr__off )}).  There
+ *     is no logical reason why this should be so, but it simplifies
+ *     implementation and testing, and I can't think of any reason
+ *     why it would be desirable.  If you can think of one, I'll
+ *     revisit the issue. (JM)
+ * \endparblock
+ *
+ * \par set_initial_size
+ *      Boolean flag indicating whether the size of the
+ *      initial size of the cache is to be set to the value given in
+ *      the initial_size field.  If set_initial_size is \c FALSE, the
+ *      initial_size field is ignored.
+ *
+ * \par initial_size
+ *      If enabled, this field contain the size the cache is
+ *      to be set to upon receipt of this structure.  Needless to say,
+ *      initial_size must lie in the closed interval \Code{[min_size, max_size]}.
+ *
+ * \par min_clean_fraction
+ *      \c double in the range 0 to 1 indicating the fraction
+ *      of the cache that is to be kept clean.  This field is only used
+ *      in parallel mode. Typical values are 0.1 to 0.5.
+ *
+ * \par max_size
+ *      Maximum size to which the cache can be adjusted.  The
+ *      supplied value must fall in the closed interval
+ *      \Code{[MIN_MAX_CACHE_SIZE, MAX_MAX_CACHE_SIZE]}.  Also, \c max_size must
+ *      be greater than or equal to \c min_size.
+ *
+ * \par min_size
+ *      Minimum size to which the cache can be adjusted.  The
+ *      supplied value must fall in the closed interval
+ *      \Code{[H5C__MIN_MAX_CACHE_SIZE, H5C__MAX_MAX_CACHE_SIZE]}.  Also, \c min_size
+ *      must be less than or equal to \c max_size.
+ *
+ * \par epoch_length
+ * \parblock
+ *      Number of accesses on the cache over which to collect
+ *      hit rate stats before running the automatic cache resize code,
+ *      if it is enabled.
+ *
+ *      At the end of an epoch, we discard prior hit rate data and start
+ *      collecting afresh.  The epoch_length must lie in the closed
+ *      interval \Code{[H5C__MIN_AR_EPOCH_LENGTH, H5C__MAX_AR_EPOCH_LENGTH]}.
+ * \endparblock
+ *
+ *
+ * \section csicf Cache size increase control fields
+ *
+ * \par incr_mode
+ *      Instance of the \c H5C_cache_incr_mode enumerated type whose
+ *      value indicates how we determine whether the cache size should be
+ *      increased.  At present there are two possible values:
+ *      \li \c H5C_incr__off:  Don't attempt to increase the size of the cache
+ *              automatically.\n
+ *              When this increment mode is selected, the remaining fields
+ *              in the cache size increase section ar ignored.
+ *      \li \c H5C_incr__threshold: Attempt to increase the size of the cache
+ *              whenever the average hit rate over the last epoch drops
+ *              below the value supplied in the \c lower_hr_threshold
+ *              field.\n
+ *              Note that this attempt will fail if the cache is already
+ *              at its maximum size, or if the cache is not already using
+ *              all available space.
+ *
+ *      Note that you must set \c decr_mode to \c H5C_incr__off if you
+ *      disable metadata cache entry evictions.
+ *
+ * \par lower_hr_threshold
+ * \parblock
+ *      Lower hit rate threshold.  If the increment mode
+ *      (\c incr_mode) is \c H5C_incr__threshold and the hit rate drops below the
+ *      value supplied in this field in an epoch, increment the cache size by
+ *      \c size_increment.  Note that cache size may not be incremented above
+ *      \c max_size, and that the increment may be further restricted by the
+ *      \c max_increment field if it is enabled.
+ *
+ *      When enabled, this field must contain a value in the range [0.0, 1.0].
+ *      Depending on the \c incr_mode selected, it may also have to be less than
+ *      \c upper_hr_threshold.
+ * \endparblock
+ *
+ * \par increment
+ * \parblock
+ *      Double containing the multiplier used to derive the new
+ *      cache size from the old if a cache size increment is triggered.
+ *      The increment must be greater than 1.0, and should not exceed 2.0.
+ *
+ *      The new cache size is obtained my multiplying the current max cache
+ *      size by the increment, and then clamping to \c max_size and to stay
+ *      within the \c max_increment as necessary.
+ * \endparblock
+ *
+ * \par apply_max_increment
+ *      Boolean flag indicating whether the \c max_increment
+ *      field should be used to limit the maximum cache size increment.
+ *
+ * \par max_increment
+ *      If enabled by the \c apply_max_increment field described
+ *      above, this field contains the maximum number of bytes by which the
+ *      cache size can be increased in a single re-size.
+ *
+ * \par flash_incr_mode
+ * \parblock
+ *      Instance of the \c H5C_cache_flash_incr_mode enumerated
+ *      type whose value indicates whether and by which algorithm we should
+ *      make flash increases in the size of the cache to accommodate insertion
+ *      of large entries and large increases in the size of a single entry.
+ *
+ *      The addition of the flash increment mode was occasioned by performance
+ *      problems that appear when a local heap is increased to a size in excess
+ *      of the current cache size.  While the existing re-size code dealt with
+ *      this eventually, performance was very bad for the remainder of the
+ *      epoch.
+ *
+ *      At present, there are two possible values for the \c flash_incr_mode:
+ *
+ *      \li \c H5C_flash_incr__off:  Don't perform flash increases in the size of the cache.
+ *
+ *      \li \c H5C_flash_incr__add_space:  Let \c x be either the size of a newly
+ *          newly inserted entry, or the number of bytes by which the
+ *          size of an existing entry has been increased.\n
+ *          If \Code{x > flash_threshold * current max cache size},
+ *          increase the current maximum cache size by \Code{x * flash_multiple}
+ *          less any free space in the cache, and star a new epoch.  For
+ *          now at least, pay no attention to the maximum increment.
+ *
+ *      In both of the above cases, the flash increment pays no attention to
+ *      the maximum increment (at least in this first incarnation), but DOES
+ *      stay within max_size.
+ *
+ *      With a little thought, it should be obvious that the above flash
+ *      cache size increase algorithm is not sufficient for all circumstances
+ *      -- for example, suppose the user round robins through
+ *      \Code{(1/flash_threshold) +1} groups, adding one data set to each on each
+ *      pass.  Then all will increase in size at about the same time, requiring
+ *      the max cache size to at least double to maintain acceptable
+ *      performance, however the above flash increment algorithm will not be
+ *      triggered.
+ *
+ *      Hopefully, the add space algorithms detailed above will be sufficient
+ *      for the performance problems encountered to date.  However, we should
+ *      expect to revisit the issue.
+ * \endparblock
+ *
+ * \par flash_multiple
+ *      Double containing the multiple described above in the
+ *      \c H5C_flash_incr__add_space section of the discussion of the
+ *      \c flash_incr_mode section.  This field is ignored unless \c flash_incr_mode
+ *      is \c H5C_flash_incr__add_space.
+ *
+ * \par flash_threshold
+ *      Double containing the factor by which current max cache
+ *      size is multiplied to obtain the size threshold for the add_space flash
+ *      increment algorithm.  The field is ignored unless \c flash_incr_mode is
+ *      \c H5C_flash_incr__add_space.
+ *
+ *
+ * \section csdcf Cache size decrease control fields
+ *
+ * \par decr_mode
+ * \parblock
+ *      Instance of the \c H5C_cache_decr_mode enumerated type whose
+ *      value indicates how we determine whether the cache size should be
+ *      decreased.  At present there are four possibilities.
+ *
+ *      \li \c H5C_decr__off:  Don't attempt to decrease the size of the cache
+ *              automatically.\n
+ *              When this increment mode is selected, the remaining fields
+ *              in the cache size decrease section are ignored.
+ *      \li \c H5C_decr__threshold: Attempt to decrease the size of the cache
+ *              whenever the average hit rate over the last epoch rises
+ *              above the value supplied in the \c upper_hr_threshold
+ *              field.
+ *      \li \c H5C_decr__age_out:  At the end of each epoch, search the cache for
+ *              entries that have not been accessed for at least the number
+ *              of epochs specified in the epochs_before_eviction field, and
+ *              evict these entries.  Conceptually, the maximum cache size
+ *              is then decreased to match the new actual cache size.  However,
+ *              this reduction may be modified by the \c min_size, the
+ *              \c max_decrement, and/or the \c empty_reserve.
+ *      \li \c H5C_decr__age_out_with_threshold:  Same as age_out, but we only
+ *              attempt to reduce the cache size when the hit rate observed
+ *              over the last epoch exceeds the value provided in the
+ *              \c upper_hr_threshold field.
+ *
+ *      Note that you must set \c decr_mode to \c H5C_decr__off if you
+ *      disable metadata cache entry evictions.
+ * \endparblock
+ *
+ * \par upper_hr_threshold
+ * \parblock
+ *      Upper hit rate threshold.  The use of this field
+ *      varies according to the current \c decr_mode :
+ *
+ *      \c H5C_decr__off or \c H5C_decr__age_out:  The value of this field is
+ *              ignored.
+ *
+ *      \li \c H5C_decr__threshold:  If the hit rate exceeds this threshold in any
+ *              epoch, attempt to decrement the cache size by size_decrement.\n
+ *              Note that cache size may not be decremented below \c min_size.\n
+ *              Note also that if the \c upper_threshold is 1.0, the cache size\n
+ *              will never be reduced.
+ *
+ *      \li \c H5C_decr__age_out_with_threshold:  If the hit rate exceeds this
+ *              threshold in any epoch, attempt to reduce the cache size
+ *              by evicting entries that have not been accessed for more
+ *              than the specified number of epochs.
+ * \endparblock
+ *
+ * \par decrement
+ * \parblock
+ *      This field is only used when the decr_mode is
+ *      \c H5C_decr__threshold.
+ *
+ *      The field is a double containing the multiplier used to derive the
+ *      new cache size from the old if a cache size decrement is triggered.
+ *      The decrement must be in the range 0.0 (in which case the cache will
+ *      try to contract to its minimum size) to 1.0 (in which case the
+ *      cache will never shrink).
+ * \endparblock
+ *
+ * \par apply_max_decrement
+ *      Boolean flag used to determine whether decrements
+ *      in cache size are to be limited by the \c max_decrement field.
+ *
+ * \par max_decrement
+ *      Maximum number of bytes by which the cache size can be
+ *      decreased in a single re-size.  Note that decrements may also be
+ *      restricted by the \c min_size of the cache, and (in age out modes) by
+ *      the \c empty_reserve field.
+ *
+ * \par epochs_before_eviction
+ * \parblock
+ *      Integer field used in \c H5C_decr__age_out and
+ *      \c H5C_decr__age_out_with_threshold decrement modes.
+ *
+ *      This field contains the number of epochs an entry must remain
+ *      unaccessed before it is evicted in an attempt to reduce the
+ *      cache size.  If applicable, this field must lie in the range
+ *      \Code{[1, H5C__MAX_EPOCH_MARKERS]}.
+ * \endparblock
+ *
+ * \par apply_empty_reserve
+ *      Boolean field controlling whether the empty_reserve
+ *      field is to be used in computing the new cache size when the
+ *      decr_mode is H5C_decr__age_out or H5C_decr__age_out_with_threshold.
+ *
+ * \par empty_reserve
+ * \parblock
+ *      To avoid a constant racheting down of cache size by small
+ *      amounts in the \c H5C_decr__age_out and \c H5C_decr__age_out_with_threshold
+ *      modes, this field allows one to require that any cache size
+ *      reductions leave the specified fraction of unused space in the cache.
+ *
+ *      The value of this field must be in the range [0.0, 1.0].  I would
+ *      expect typical values to be in the range of 0.01 to 0.1.
+ * \endparblock
+ *
+ *
+ * \section pcf Parallel Configuration Fields
+ *
+ * In PHDF5, all operations that modify metadata must be executed collectively.
+ *
+ * We used to think that this was enough to ensure consistency across the
+ * metadata caches, but since we allow processes to read metadata individually,
+ * the order of dirty entries in the LRU list can vary across processes,
+ * which can result in inconsistencies between the caches.
+ *
+ * PHDF5 uses several strategies to prevent such inconsistencies in metadata,
+ * all of which use the fact that the same stream of dirty metadata is seen
+ * by all processes for purposes of synchronization.  This is done by
+ * having each process count the number of bytes of dirty metadata generated,
+ * and then running a "sync point" whenever this count exceeds a user
+ * specified threshold (see \c dirty_bytes_threshold below).
+ *
+ * The current metadata write strategy is indicated by the
+ * \c metadata_write_strategy field.  The possible values of this field, along
+ * with the associated metadata write strategies are discussed below.
+ *
+ * \par dirty_bytes_threshold
+ * \parblock
+ *    Threshold of dirty byte creation used to
+ *    synchronize updates between caches. (See above for outline and
+ *    motivation.)
+ *
+ *    This value MUST be consistent across all processes accessing the
+ *    file.  This field is ignored unless HDF5 has been compiled for
+ *    parallel.
+ * \endparblock
+ *
+ * \par metadata_write_strategy
+ *    Integer field containing a code indicating the
+ *    desired metadata write strategy.  The valid values of this field
+ *    are enumerated and discussed below:
+ *
+ *    \li #H5AC_METADATA_WRITE_STRATEGY__PROCESS_0_ONLY\n
+ *    When metadata_write_strategy is set to this value, only process
+ *    zero is allowed to write dirty metadata to disk.  All other
+ *    processes must retain dirty metadata until they are informed at
+ *    a sync point that the dirty metadata in question has been written
+ *    to disk.\n
+ *    When the sync point is reached (or when there is a user generated
+ *    flush), process zero flushes sufficient entries to bring it into
+ *    compliance with its min clean size (or flushes all dirty entries in
+ *    the case of a user generated flush), broad casts the list of
+ *    entries just cleaned to all the other processes, and then exits
+ *    the sync point.\n
+ *    Upon receipt of the broadcast, the other processes mark the indicated
+ *    entries as clean, and leave the sync point as well.
+ *
+ *    \li #H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED\n
+ *    In the distributed metadata write strategy, process zero still makes
+ *    the decisions as to what entries should be flushed, but the actual
+ *    flushes are distributed across the processes in the computation to
+ *    the extent possible.\n
+ *    In this strategy, when a sync point is triggered (either by dirty
+ *    metadata creation or manual flush), all processes enter a barrier.\n
+ *    On the other side of the barrier, process 0 constructs an ordered
+ *    list of the entries to be flushed, and then broadcasts this list
+ *    to the caches in all the processes.\n
+ *    All processes then scan the list of entries to be flushed, flushing
+ *    some, and marking the rest as clean.  The algorithm for this purpose
+ *    ensures that each entry in the list is flushed exactly once, and
+ *    all are marked clean in each cache.\n
+ *    Note that in the case of a flush of the cache, no message passing
+ *    is necessary, as all processes have the same list of dirty entries,
+ *    and all of these entries must be flushed.  Thus in this case it is
+ *    sufficient for each process to sort its list of dirty entries after
+ *    leaving the initial barrier, and use this list as if it had been
+ *    received from process zero.\n
+ *    To avoid possible messages from the past/future, all caches must
+ *    wait until all caches are done before leaving the sync point.
+ */
+\ No newline at end of file
diff --git a/doxygen/dox/IntroHDF5.dox b/doxygen/dox/IntroHDF5.dox
new file mode 100644
index 0000000..ec46217
--- /dev/null
+++ b/doxygen/dox/IntroHDF5.dox
@@ -0,0 +1,627 @@
+/** @page IntroHDF5 Introduction to HDF5
+
+Navigate back: \ref index "Main" / \ref GettingStarted
+<hr>
+
+\section sec_intro_desc HDF5 Description
+HDF5 consists of a file format for storing HDF5 data, a data model for logically organizing and accessing
+HDF5 data from an application, and the software (libraries, language interfaces, and tools) for working with this format.
+
+\subsection subsec_intro_desc_file File Format
+HDF5 consists of a file format for storing HDF5 data, a data model for logically organizing and accessing HDF5 data from an application,
+and the software (libraries, language interfaces, and tools) for working with this format.
+
+\subsection subsec_intro_desc_dm Data Model
+The HDF5 Data Model, also known as the HDF5 Abstract (or Logical) Data Model consists of
+the building blocks for data organization and specification in HDF5.
+
+An HDF5 file (an object in itself) can be thought of as a container (or group) that holds
+a variety of heterogeneous data objects (or datasets). The datasets can be images, tables,
+graphs, and even documents, such as PDF or Excel:
+
+<table>
+<tr>
+<td>
+\image html fileobj.png
+</td>
+</tr>
+</table>
+
+The two primary objects in the HDF5 Data Model are groups and datasets.
+
+There are also a variety of other objects in the HDF5 Data Model that support groups and datasets,
+including datatypes, dataspaces, properties and attributes.
+
+\subsubsection subsec_intro_desc_dm_group Groups
+HDF5 groups (and links) organize data objects. Every HDF5 file contains a root group that can
+contain other groups or be linked to objects in other files.
+
+<table>
+<caption>There are two groups in the HDF5 file depicted above: Viz and SimOut.
+Under the Viz group are a variety of images and a table that is shared with the SimOut group.
+The SimOut group contains a 3-dimensional array, a 2-dimensional array and a link to a 2-dimensional
+array in another HDF5 file.</caption>
+<tr>
+<td>
+\image html group.png
+</td>
+</tr>
+</table>
+
+Working with groups and group members is similar in many ways to working with directories and files
+in UNIX. As with UNIX directories and files, objects in an HDF5 file are often described by giving
+their full (or absolute) path names.
+\li / signifies the root group.
+\li /foo signifies a member of the root group called foo.
+\li /foo/zoo signifies a member of the group foo, which in turn is a member of the root group.
+
+\subsubsection subsec_intro_desc_dm_dset Datasets
+HDF5 datasets organize and contain the “raw” data values. A dataset consists of metadata
+that describes the data, in addition to the data itself:
+
+<table>
+<caption>In this picture, the data is stored as a three dimensional dataset of size 4 x 5 x 6 with an integer datatype.
+It contains attributes, Time and Pressure, and the dataset is chunked and compressed.</caption>
+<tr>
+<td>
+\image html dataset.png
+</td>
+</tr>
+</table>
+
+Datatypes, dataspaces, properties and (optional) attributes are HDF5 objects that describe a dataset.
+The datatype describes the individual data elements.
+
+\subsection subsec_intro_desc_props Datatypes, Dataspaces, Properties and Attributes
+
+\subsubsection subsec_intro_desc_prop_dtype Datatypes
+The datatype describes the individual data elements in a dataset. It provides complete information for
+data conversion to or from that datatype.
+
+<table>
+<caption>In the dataset depicted, each element of the dataset is a 32-bit integer.</caption>
+<tr>
+<td>
+\image html datatype.png
+</td>
+</tr>
+</table>
+
+Datatypes in HDF5 can be grouped into:
+<ul>
+<li>
+<b>Pre-Defined Datatypes</b>: These are datatypes that are created by HDF5. They are actually opened (and closed)
+by HDF5 and can have different values from one HDF5 session to the next. There are two types of pre-defined datatypes:
+<ul>
+<li>
+Standard datatypes are the same on all platforms and are what you see in an HDF5 file. Their names are of the form
+H5T_ARCH_BASE where ARCH is an architecture name and BASE is a programming type name. For example, #H5T_IEEE_F32BE
+indicates a standard Big Endian floating point type.
+</li>
+<li>
+Native datatypes are used to simplify memory operations (reading, writing) and are NOT the same on different platforms.
+For example, #H5T_NATIVE_INT indicates an int (C).
+</li>
+</ul>
+</li>
+<li>
+<b>Derived Datatypes</b>: These are datatypes that are created or derived from the pre-defined datatypes.
+An example of a commonly used derived datatype is a string of more than one character. Compound datatypes
+are also derived types.  A compound datatype can be used to create a simple table, and can also be nested,
+in which it includes one more other compound datatypes.
+<table>
+<caption>This is an example of a dataset with a compound datatype. Each element in the dataset consists
+of a 16-bit integer, a character, a 32-bit integer, and a 2x3x2 array of 32-bit floats (the datatype).
+It is a 2-dimensional 5 x 3 array (the dataspace). The datatype should not be confused with the dataspace.
+</caption>
+<tr>
+<td>
+\image html cmpnddtype.png
+</td>
+</tr>
+</table>
+</li>
+</ul>
+
+\subsubsection subsec_intro_desc_prop_dspace Dataspaces
+A dataspace describes the layout of a dataset’s data elements. It can consist of no elements (NULL),
+a single element (scalar), or a simple array.
+
+<table>
+<caption>This image illustrates a dataspace that is an array with dimensions of 5 x 3 and a rank (number of dimensions) of 2.</caption>
+<tr>
+<td>
+\image html dataspace1.png
+</td>
+</tr>
+</table>
+
+A dataspace can have dimensions that are fixed (unchanging) or unlimited, which means they can grow
+in size (i.e. they are extendible).
+
+There are two roles of a dataspace:
+\li It contains the spatial information (logical layout) of a dataset stored in a file. This includes the rank and dimensions of a dataset, which are a permanent part of the dataset definition.
+\li It describes an application’s data buffers and data elements participating in I/O. In other words, it can be used to select a portion or subset of a dataset.
+
+<table>
+<caption>The dataspace is used to describe both the logical layout of a dataset and a subset of a dataset.</caption>
+<tr>
+<td>
+\image html dataspace.png
+</td>
+</tr>
+</table>
+
+\subsubsection subsec_intro_desc_prop_property Properties
+A property is a characteristic or feature of an HDF5 object. There are default properties which
+handle the most common needs. These default properties can be modified using the HDF5 Property
+List API to take advantage of more powerful or unusual features of HDF5 objects.
+
+<table>
+<tr>
+<td>
+\image html properties.png
+</td>
+</tr>
+</table>
+
+For example, the data storage layout property of a dataset is contiguous by default. For better
+performance, the layout can be modified to be chunked or chunked and compressed:
+
+\subsubsection subsec_intro_desc_prop_attr Attributes
+Attributes can optionally be associated with HDF5 objects. They have two parts: a name and a value.
+Attributes are accessed by opening the object that they are attached to so are not independent objects.
+Typically an attribute is small in size and contains user metadata about the object that it is attached to.
+
+Attributes look similar to HDF5 datasets in that they have a datatype and dataspace. However, they
+do not support partial I/O operations, and they cannot be compressed or extended.
+
+\subsection subsec_intro_desc_soft HDF5 Software
+The HDF5 software is written in C and includes optional wrappers for C++, FORTRAN (90 and F2003),
+and Java. The HDF5 binary distribution consists of the HDF5 libraries, include files, command-line
+utilities, scripts for compiling applications, and example programs.
+
+\subsubsection subsec_intro_desc_soft_apis HDF5 APIs and Libraries
+There are APIs for each type of object in HDF5. For example, all C routines in the HDF5 library
+begin with a prefix of the form H5*, where * is one or two uppercase letters indicating the type
+of object on which the function operates:
+\li @ref H5A     <b>A</b>ttribute Interface
+\li @ref H5D     <b>D</b>ataset Interface
+\li @ref H5F     <b>F</b>ile Interface
+
+The HDF5 High Level APIs simplify many of the steps required to create and access objects, as well
+as providing templates for storing objects. Following is a list of the High Level APIs:
+\li @ref H5LT – simplifies steps in creating datasets and attributes
+\li @ref H5IM – defines a standard for storing images in HDF5
+\li @ref H5TB – condenses the steps required to create tables
+\li @ref H5DS – provides a standard for dimension scale storage
+\li @ref H5PT – provides a standard for storing packet data
+
+\subsubsection subsec_intro_desc_soft_tools Tools
+Useful tools for working with HDF5 files include:
+\li h5dump:             A utility to dump or display the contents of an HDF5 File
+\li h5cc, h5c++, h5fc:  Unix scripts for compiling applications
+\li HDFView:            A java browser to view HDF (HDF4 and HDF5) files
+
+<h4>h5dump</h4>
+The h5dump utility displays the contents of an HDF5 file in Data Description Language (\ref DDLBNF110).
+Below is an example of h5dump output for an HDF5 file that contains no objects:
+\code
+$ h5dump file.h5
+   HDF5 "file.h5" {
+   GROUP "/" {
+   }
+   }
+\endcode
+
+With large files and datasets the output from h5dump can be overwhelming.
+There are options that can be used to examine specific parts of an HDF5 file.
+Some useful h5dump options are included below:
+\code
+   -H, --header      Display header information only (no data)
+   -d <name>      Display a dataset with a specified path and name
+   -p                          Display properties
+   -n                          Display the contents of the file
+\endcode
+
+<h4>h5cc, h5fc, h5c++</h4>
+The built HDF5 binaries include the h5cc, h5fc, h5c++ compile scripts for compiling applications.
+When using these scripts there is no need to specify the HDF5 libraries and include files.
+Compiler options can be passed to the scripts.
+
+<h4>HDFView</h4>
+The HDFView tool allows browsing of data in HDF (HDF4 and HDF5) files. 
+
+\section sec_intro_pm Introduction to the HDF5 Programming Model and APIs
+The HDF5 Application Programming Interface is extensive, but a few functions do most of the work.
+
+To introduce the programming model, examples in Python and C are included below. The Python examples
+use the HDF5 Python APIs (h5py). See the Examples from "Learning the Basics" page for complete examples
+that can be downloaded and run for C, FORTRAN, C++, Java and Python.
+
+The general paradigm for working with objects in HDF5 is to:
+\li Open the object.
+\li Access the object.
+\li Close the object.
+
+The library imposes an order on the operations by argument dependencies. For example, a file must be
+opened before a dataset because the dataset open call requires a file handle as an argument. Objects
+can be closed in any order. However, once an object is closed it no longer can be accessed.
+
+Keep the following in mind when looking at the example programs included in this section:
+<ul>
+<li>
+<ul>
+<li>
+C routines begin with the prefix “H5*” where * is a single letter indicating the object on which the
+operation is to be performed.
+</li>
+<li>
+FORTRAN routines are similar; they begin with “h5*” and end with “_f”.
+</li>
+<li>
+Java routines are similar; the routine names begin with “H5*” and are prefixed with “H5.” as the class. Constants are
+in the HDF5Constants class and are prefixed with "HDF5Constants.". The function arguments
+are usually similar, @see @ref HDF5LIB
+</li>
+</ul>
+For example:
+<ul>
+<li>
+File Interface:<ul><li>#H5Fopen (C)</li><li>h5fopen_f (FORTRAN)</li><li>H5.H5Fopen (Java)</li></ul>
+</li>
+<li>
+Dataset Interface:<ul><li>#H5Dopen (C)</li><li>h5dopen_f (FORTRAN)</li><li>H5.H5Dopen (Java)</li></ul>
+</li>
+<li>
+Dataspace interface:<ul><li>#H5Sclose (C)</li><li>h5sclose_f (FORTRAN)</li><li>H5.H5Sclose (Java)</li></ul>
+</li>
+</ul>
+The HDF5 Python APIs use methods associated with specific objects.
+</li>
+<li>
+For portability, the HDF5 library has its own defined types. Some common types that you will see
+in the example code are:
+<ul>
+<li>
+#hid_t is used for object handles
+</li>
+<li>
+hsize_t is used for dimensions
+</li>
+<li>
+#herr_t is used for many return values
+</li>
+</ul>
+</li>
+<li>
+Language specific files must be included in applications:
+<ul>
+<li>
+Python:   Add <code>"import h5py / import numpy"</code>
+</li>
+<li>
+C:        Add <code>"#include hdf5.h"</code>
+</li>
+<li>
+FORTRAN:  Add <code>"USE HDF5"</code> and call h5open_f and h5close_f to initialize and close the HDF5 FORTRAN interface
+</li>
+<li>
+Java:     Add <code>"import hdf.hdf5lib.H5;
+                     import hdf.hdf5lib.HDF5Constants;"</code>
+</li>
+</ul>
+</li>
+</ul>
+
+\subsection subsec_intro_pm_file Steps to create a file
+To create an HDF5 file you must:
+\li Specify property lists (or use the defaults).
+\li Create the file.
+\li Close the file (and property lists if needed).
+
+Example:
+<table>
+<caption>The following Python and C examples create a file, file.h5, and then close it.
+The resulting HDF5 file will only contain a root group:</caption>
+<tr>
+<td>
+\image html crtf-pic.png
+</td>
+</tr>
+</table>
+
+Calling h5py.File with ‘w’ for the file access flag will create a new HDF5 file and overwrite
+an existing file with the same name.  “file” is the file handle returned from opening the file.
+When finished with the file, it must be closed. When not specifying property lists, the default
+property lists are used:
+
+<table>
+<tr>
+<td>
+<em>Python</em>
+\code
+   import h5py
+   file = h5py.File (‘file.h5’, ‘w’)
+   file.close ()
+\endcode
+</td>
+</tr>
+</table>
+
+The H5Fcreate function creates an HDF5 file. #H5F_ACC_TRUNC is the file access flag to create a new
+file and overwrite an existing file with the same name, and #H5P_DEFAULT is the value specified to
+use a default property list.
+
+<table>
+<tr>
+<td>
+<em>C</em>
+\code
+   #include “hdf5.h”
+
+   int main() {
+       hid_t       file_id;
+       herr_t      status;
+
+       file_id = H5Fcreate ("file.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);   
+       status = H5Fclose (file_id);
+   }
+\endcode
+</td>
+</tr>
+</table>
+
+\subsection subsec_intro_pm_dataset Steps to create a dataset
+As described previously, an HDF5 dataset consists of the raw data, as well as the metadata that
+describes the data (datatype, spatial information, and properties). To create a dataset you must:
+\li Define the dataset characteristics (datatype, dataspace, properties).
+\li Decide which group to attach the dataset to.
+\li Create the dataset.
+\li Close the dataset handle from step 3.
+
+Example:
+<table>
+<caption>The code excerpts below show the calls that need to be made to create a 4 x 6 integer dataset dset
+in a file dset.h5. The dataset will be located in the root group:</caption>
+<tr>
+<td>
+\image html crtdset.png
+</td>
+</tr>
+</table>
+
+With Python, the creation of the dataspace is included as a parameter in the dataset creation method.
+Just one call will create a 4 x 6 integer dataset dset. A pre-defined Big Endian 32-bit integer datatype
+is specified. The create_dataset method creates the dataset in the root group (the file object).
+The dataset is close by the Python interface.
+
+<table>
+<tr>
+<td>
+<em>Python</em>
+\code
+   dataset = file.create_dataset("dset",(4, 6), h5py.h5t.STD_I32BE)
+\endcode
+</td>
+</tr>
+</table>
+
+To create the same dataset in C, you must specify the dataspace with the #H5Screate_simple function,
+create the dataset by calling #H5Dcreate, and then close the dataspace and dataset with calls to #H5Dclose
+and #H5Sclose. #H5P_DEFAULT is specified to use a default property list. Note that the file identifier
+(file_id) is passed in as the first parameter to #H5Dcreate, which creates the dataset in the root group.
+
+<table>
+<tr>
+<td>
+<em>C</em>
+\code
+   // Create the dataspace for the dataset.
+   dims[0] = 4;
+   dims[1] = 6;
+
+   dataspace_id = H5Screate_simple(2, dims, NULL);
+
+   // Create the dataset.
+   dataset_id = H5Dcreate (file_id, "/dset", H5T_STD_I32BE, dataspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+
+   // Close the dataset and dataspace
+   status = H5Dclose(dataset_id);
+   status = H5Sclose(dataspace_id);
+\endcode
+</td>
+</tr>
+</table>
+
+\subsection subsec_intro_pm_write Writing to or reading from a dataset
+Once you have created or opened a dataset you can write to it:
+
+<table>
+<tr>
+<td>
+<em>Python</em>
+\code
+   data = np.zeros((4,6))
+   for i in range(4):
+      for j in range(6):
+         data[i][j]= i*6+j+1
+
+   dataset[...] = data       <-- Write data to dataset
+   data_read = dataset[...]  <-- Read data from dataset
+\endcode
+</td>
+</tr>
+</table>
+
+#H5S_ALL is passed in for the memory and file dataspace parameters to indicate that the entire dataspace
+of the dataset is specified. These two parameters can be modified to allow subsetting of a dataset.
+The native predefined datatype, #H5T_NATIVE_INT, is used for reading and writing so that HDF5 will do
+any necessary integer conversions:
+
+<table>
+<tr>
+<td>
+<em>C</em>
+\code
+   status = H5Dwrite (dataset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset_data);
+   status = H5Dread (dataset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset_data);
+\endcode
+</td>
+</tr>
+</table>
+
+\subsection subsec_intro_pm_group Steps to create a group
+An HDF5 group is a structure containing zero or more HDF5 objects. Before you can create a group you must
+obtain the location identifier of where the group is to be created. Following are the steps that are required:
+\li Decide where to put the group – in the “root group” (or file identifier) or in another group. Open the group if it is not already open.
+\li Define properties or use the default.
+\li Create the group.
+\li Close the group.
+
+<table>
+<caption>Creates attributes that are attached to the dataset dset</caption>
+<tr>
+<td>
+\image html crtgrp.png
+</td>
+</tr>
+</table>
+
+The code below opens the dataset dset.h5 with read/write permission and creates a group MyGroup in the root group.
+Properties are not specified so the defaults are used:
+
+<table>
+<tr>
+<td>
+<em>Python</em>
+\code
+   import h5py
+   file = h5py.File('dset.h5', 'r+')  
+   group = file.create_group ('MyGroup')
+   file.close()
+\endcode
+</td>
+</tr>
+</table>
+
+To create the group MyGroup in the root group, you must call #H5Gcreate, passing in the file identifier returned
+from opening or creating the file. The default property lists are specified with #H5P_DEFAULT. The group is then
+closed:
+
+<table>
+<tr>
+<td>
+<em>C</em>
+\code
+   group_id = H5Gcreate (file_id, "MyGroup", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+   status = H5Gclose (group_id);
+\endcode
+</td>
+</tr>
+</table>
+
+\subsection subsec_intro_pm_attr Steps to create and write to an attribute
+To create an attribute you must open the object that you wish to attach the attribute to. Then you can create,
+access, and close the attribute as needed:
+\li Open the object that you wish to add an attribute to.
+\li Create the attribute
+\li Write to the attribute
+\li Close the attribute and the object it is attached to.
+
+<table>
+<caption>Creates attributes that are attached to the dataset dset</caption>
+<tr>
+<td>
+\image html crtatt.png
+</td>
+</tr>
+</table>
+
+The dataspace, datatype, and data are specified in the call to create an attribute in Python:
+
+<table>
+<tr>
+<td>
+<em>Python</em>
+\code
+   dataset.attrs["Units"] = “Meters per second”  <-- Create string
+   attr_data = np.zeros((2,))
+   attr_data[0] = 100
+   attr_data[1] = 200
+   dataset.attrs.create("Speed", attr_data, (2,), “i”) <-- Create Integer
+\endcode
+</td>
+</tr>
+</table>
+
+To create an integer attribute in C, you must create the dataspace, create the attribute, write
+to it and then close it in separate steps:
+
+<table>
+<tr>
+<td>
+<em>C</em>
+\code
+   hid_t       attribute_id, dataspace_id;  // identifiers
+   hsize_t     dims;
+   int         attr_data[2];
+   herr_t      status;
+
+      ...
+
+   // Initialize the attribute data.
+   attr_data[0] = 100;
+   attr_data[1] = 200;
+
+   // Create the data space for the attribute.
+   dims = 2;
+   dataspace_id = H5Screate_simple(1, &dims, NULL);
+
+   // Create a dataset attribute.
+   attribute_id = H5Acreate2 (dataset_id, "Units", H5T_STD_I32BE,
+                              dataspace_id, H5P_DEFAULT, H5P_DEFAULT);
+
+   // Write the attribute data.
+   status = H5Awrite(attribute_id, H5T_NATIVE_INT, attr_data);
+
+   // Close the attribute.
+   status = H5Aclose(attribute_id);
+
+   // Close the dataspace.
+   status = H5Sclose(dataspace_id);
+\endcode
+</td>
+</tr>
+</table>
+
+<hr>
+Navigate back: \ref index "Main" / \ref GettingStarted
+
+
+@page HDF5Examples HDF5 Examples
+Example programs of how to use HDF5 are provided below.
+For HDF-EOS specific examples, see the <a href="http://hdfeos.org/zoo/index.php">examples</a>
+of how to access and visualize NASA HDF-EOS files using IDL, MATLAB, and NCL on the
+<a href="http://hdfeos.org/">HDF-EOS Tools and Information Center</a> page.
+
+\section secHDF5Examples Examples
+\li \ref LBExamples
+\li <a href="https://portal.hdfgroup.org/display/HDF5/Examples+by+API">Examples by API</a>
+\li <a href="https://portal.hdfgroup.org/display/HDF5/Examples+in+the+Source+Code">Examples in the Source Code</a>
+\li <a href="https://portal.hdfgroup.org/display/HDF5/Other+Examples">Other Examples</a>
+
+\section secHDF5ExamplesCompile How To Compile
+For information on compiling in C, C++ and Fortran, see: \ref LBCompiling
+
+\section secHDF5ExamplesOther Other Examples
+<a href="http://hdfeos.org/zoo/index.php">IDL, MATLAB, and NCL Examples for HDF-EOS</a>
+Examples of how to access and visualize NASA HDF-EOS files using IDL, MATLAB, and NCL.
+
+<a href="https://support.hdfgroup.org/ftp/HDF5/examples/misc-examples/">Miscellaneous Examples</a>
+These (very old) examples resulted from working with users, and are not fully tested. Most of them are in C, with a few in Fortran and Java.
+
+<a href="https://support.hdfgroup.org/ftp/HDF5/examples/special_values_HDF5_example.tar">Using Special Values</a>
+These examples show how to create special values in an HDF5 application.
+
+*/
diff --git a/doxygen/dox/LearnBasics.dox b/doxygen/dox/LearnBasics.dox
new file mode 100644
index 0000000..298672d
--- /dev/null
+++ b/doxygen/dox/LearnBasics.dox
@@ -0,0 +1,183 @@
+/** @page LearnBasics Learning the Basics
+
+Navigate back: \ref index "Main" / \ref GettingStarted
+<hr>
+
+\section secIntro Introduction
+The following topics cover the basic features in HDF5. The topics build on each other and are
+intended to be completed in order. Some sections use files created in earlier sections. The
+examples used can also be found on the \ref LBExamples
+page and in the HDF5 source code (C, C++, Fortran).
+
+\section Topics Topics
+\li @subpage LBFileOrg
+\li @subpage LBAPI
+\li @subpage LBProg
+\li @subpage LBFileCreate
+\li @subpage LBDsetCreate
+\li @subpage LBDsetRW
+\li @subpage LBAttrCreate
+\li @subpage LBGrpCreate
+\li @subpage LBGrpCreateNames
+\li @subpage LBGrpDset
+\li @subpage LBDsetSubRW
+\li @subpage LBDatatypes
+\li @subpage LBPropsList
+\li @subpage LBDsetLayout
+\li @subpage LBExtDset
+\li @subpage LBComDset
+\li @subpage LBContents
+\li @subpage LBQuiz
+\li @subpage LBQuizAnswers
+\li @subpage LBCompiling
+\li @subpage LBTraining
+
+<hr>
+Navigate back: \ref index "Main" / \ref GettingStarted
+
+
+@page LBExamples Examples from Learning the Basics
+
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref LearnBasics
+<hr>
+
+\section secLBExamples
+These examples are used in the \ref LearnBasics topic. See \ref LBCompiling for details on compiling them.
+PLEASE NOTE that the example programs are listed in the order they are expected to be run. Some example
+programs use files created in earlier examples.
+
+\section secLBExamplesSrc HDF5 Source Code Examples
+These examples (C, C++, Fortran) are provided in the HDF5 source code and (Unix) binaries.
+<table>
+<tr>
+<th>Feature
+</th>
+<th>Examples
+</th>
+<th>Comments
+</th>
+<tr>
+<td>Create a file
+</td>
+<td>C  Fortran  C++  <a href="https://raw.githubusercontent.com/HDFGroup/hdf5/hdf5_1_10/java/examples/intro/H5_CreateFile.java">Java</a>  Python
+</td>
+<td>
+</td>
+</tr>
+<tr>
+<td>Create a dataset
+</td>
+<td><a href="https://raw.githubusercontent.com//HDFGroup/hdf5/hdf5_1_10/examples/h5_crtdat.c">C</a>  <a href="https://raw.githubusercontent.com/HDFGroup/hdf5/hdf5_1_10/fortran/examples/h5_crtdat.f90">Fortran</a>  <a href="https://raw.githubusercontent.com/HDFGroup/hdf5/hdf5_1_10/c++/examples/h5tutr_crtdat.cpp">C++</a>  <a href="https://raw.githubusercontent.com/HDFGroup/hdf5/hdf5_1_10/java/examples/intro/H5_CreateDataset.java">Java</a>  <a href="https://support.hdfgroup.org/ftp/HDF5/examples/Py/h5_crtdat.py">Python</a>
+</td>
+<td>
+</td>
+</tr>
+<tr>
+<td>Read and write to a dataset
+</td>
+<td><a href="https://raw.githubusercontent.com/HDFGroup/hdf5/hdf5_1_10/examples/h5_rdwt.c">C</a>  <a href="https://raw.githubusercontent.com/HDFGroup/hdf5/hdf5_1_10/fortran/examples/h5_rdwt.f90">Fortran</a>  <a href="https://raw.githubusercontent.com/HDFGroup/hdf5/hdf5_1_10/c++/examples/h5tutr_rdwt.cpp">C++</a>  <a href="https://raw.githubusercontent.com/HDFGroup/hdf5/hdf5_1_10/java/examples/intro/H5_ReadWrite.java">Java</a>  <a href="https://support.hdfgroup.org/ftp/HDF5/examples/Py/h5_rdwt.py">Python</a>
+</td>
+<td>
+</td>
+</tr>
+<tr>
+<td>Create an attribute
+</td>
+<td><a href="https://raw.githubusercontent.com/HDFGroup/hdf5/hdf5_1_10/examples/h5_crtatt.c">C</a>  <a href="https://raw.githubusercontent.com/HDFGroup/hdf5/hdf5_1_10/fortran/examples/h5_crtatt.f90">Fortran</a>  <a href="https://raw.githubusercontent.com/HDFGroup/hdf5/hdf5_1_10/c++/examples/h5tutr_crtatt.cpp">C++</a>  <a href="https://raw.githubusercontent.com/HDFGroup/hdf5/hdf5_1_10/java/examples/intro/H5_CreateAttribute.java">Java</a>  <a href="https://support.hdfgroup.org/ftp/HDF5/examples/Py/h5_crtatt.py">Python</a>
+</td>
+<td>
+</td>
+</tr>
+<tr>
+<td>Create a group
+</td>
+<td><a href="https://raw.githubusercontent.com/HDFGroup/hdf5/hdf5_1_10/examples/h5_crtgrp.c">C</a>  <a href="https://raw.githubusercontent.com/HDFGroup/hdf5/hdf5_1_10/fortran/examples/h5_crtgrp.f90">Fortran</a>  <a href="https://raw.githubusercontent.com/HDFGroup/hdf5/hdf5_1_10/c++/examples/h5tutr_crtgrp.cpp">C++</a>  <a href="https://raw.githubusercontent.com/HDFGroup/hdf5/hdf5_1_10/java/examples/intro/H5_CreateGroup.java">Java</a>  <a href="https://support.hdfgroup.org/ftp/HDF5/examples/Py/h5_crtgrp.py">Python</a>
+</td>
+<td>
+</td>
+</tr>
+<tr>
+<td>Create groups in a file using absolute and relative paths
+</td>
+<td><a href="https://raw.githubusercontent.com/HDFGroup/hdf5/hdf5_1_10/examples/h5_crtgrpar.c">C</a>  <a href="https://raw.githubusercontent.com/HDFGroup/hdf5/hdf5_1_10/fortran/examples/h5_crtgrpar.f90">Fortran</a>  <a href="https://raw.githubusercontent.com/HDFGroup/hdf5/hdf5_1_10/c++/examples/h5tutr_crtgrpar.cpp">C++</a>  <a href="https://raw.githubusercontent.com/HDFGroup/hdf5/hdf5_1_10/java/examples/intro/H5_CreateGroupAbsoluteRelative.java">Java</a>  <a href="https://support.hdfgroup.org/ftp/HDF5/examples/Py/h5_crtgrpar.py">Python</a>
+</td>
+<td>
+</td>
+</tr>
+<tr>
+<td>Create datasets in a group
+</td>
+<td><a href="https://raw.githubusercontent.com/HDFGroup/hdf5/hdf5_1_10/examples/h5_crtgrpd.c">C</a>  <a href="https://raw.githubusercontent.com/HDFGroup/hdf5/hdf5_1_10/fortran/examples/h5_crtgrpd.f90">Fortran</a>  <a href="https://raw.githubusercontent.com/HDFGroup/hdf5/hdf5_1_10/c++/examples/h5tutr_crtgrpd.cpp">C++</a>  <a href="https://raw.githubusercontent.com/HDFGroup/hdf5/hdf5_1_10/java/examples/intro/H5_CreateGroupDataset.java">Java</a>  <a href="https://support.hdfgroup.org/ftp/HDF5/examples/Py/h5_crtgrpd.py">Python</a>
+</td>
+<td>
+</td>
+</tr>
+<tr>
+<td>Create a file and dataset and select/read a subset from the dataset
+</td>
+<td><a href="https://raw.githubusercontent.com/HDFGroup/hdf5/hdf5_1_10/examples/h5_subset.c">C</a>  <a href="https://raw.githubusercontent.com/HDFGroup/hdf5/hdf5_1_10/fortran/examples/h5_subset.f90">Fortran</a>  <a href="https://raw.githubusercontent.com/HDFGroup/hdf5/hdf5_1_10/c++/examples/h5tutr_subset.cpp">C++</a>  Java  Python
+</td>
+<td>Also see examples to Write by row (and column) below.
+</td>
+</tr>
+<tr>
+<td>Create an extendible (unlimited dimension) dataset
+</td>
+<td><a href="https://raw.githubusercontent.com/HDFGroup/hdf5/hdf5_1_10/examples/h5_extend.c">C</a>  <a href="https://raw.githubusercontent.com/HDFGroup/hdf5/hdf5_1_10/fortran/examples/h5_extend.f90">Fortran</a>  <a href="https://raw.githubusercontent.com/HDFGroup/hdf5/hdf5_1_10/c++/examples/h5tutr_extend.cpp">C++</a>  Java  Python
+</td>
+<td>Also see examples to Extend by row (and column) below
+</td>
+</tr>
+<tr>
+<td>Create a chunked and compressed dataset
+</td>
+<td><a href="https://raw.githubusercontent.com/HDFGroup/hdf5/hdf5_1_10/examples/h5_cmprss.c">C</a>  <a href="https://raw.githubusercontent.com/HDFGroup/hdf5/hdf5_1_10/fortran/examples/h5_cmprss.f90">Fortran</a>  <a href="https://raw.githubusercontent.com/HDFGroup/hdf5/hdf5_1_10/c++/examples/h5tutr_cmprss.cpp">C++</a>  Java  <a href="https://support.hdfgroup.org/ftp/HDF5/examples/Py/h5_cmprss.py">Python</a>
+</td>
+<td>
+</td>
+</tr>
+</table>
+
+*See <a href="https://github.com/scotmartin1234/HDF5Mathematica">HDF5Mathematica</a> for user-contributed
+HDF5 Mathematica Wrappers and Introductory Tutorial Examples. The examples use P/Invoke.
+
+\section secLBExamplesAddl Additional Examples
+These examples make minor changes to the tutorial examples.
+<table>
+<tr>
+<th>Feature
+</th>
+<th>Examples
+</th>
+</tr>
+<tr>
+<td>Write by row
+</td>
+<td><a href="">C</a>  <a href="">Fortran</a>
+</td>
+</tr>
+<tr>
+<td>Write by column
+</td>
+<td><a href="">C</a>  <a href="">Fortran</a>
+</td>
+</tr>
+<tr>
+<td>Extend by row
+</td>
+<td><a href="">C</a>  <a href="">Fortran</a>
+</td>
+</tr>
+<tr>
+<td>Extend by column
+</td>
+<td><a href="">C</a>  <a href="">Fortran</a>
+</td>
+</tr>
+</table>
+
+
+<hr>
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref LearnBasics
+
+*/
diff --git a/doxygen/dox/LearnBasics1.dox b/doxygen/dox/LearnBasics1.dox
new file mode 100644
index 0000000..a9b6d0e
--- /dev/null
+++ b/doxygen/dox/LearnBasics1.dox
@@ -0,0 +1,1023 @@
+/** @page LBFileOrg HDF5 File Organization
+
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref LearnBasics
+<hr>
+
+\section secLBFileOrg HDF5 file
+An HDF5 file is a container for storing a variety of scientific data and is composed of two primary types of objects: groups and datasets.
+
+\li HDF5 group: a grouping structure containing zero or more HDF5 objects, together with supporting metadata
+\li HDF5 dataset: a multidimensional array of data elements, together with supporting metadata
+
+Any HDF5 group or dataset may have an associated attribute list. An HDF5 attribute is a user-defined HDF5 structure
+that provides extra information about an HDF5 object.
+
+Working with groups and datasets is similar in many ways to working with directories and files in UNIX. As with UNIX
+directories and files, an HDF5 object in an HDF5 file is often referred to by its full path name (also called an absolute path name).
+
+\li <code style="background-color:whitesmoke;">/</code>   signifies the root group.
+
+\li <code style="background-color:whitesmoke;">/foo</code>  signifies a member of the root group called foo.
+
+\li <code style="background-color:whitesmoke;">/foo/zoo</code>  signifies a member of the group foo, which in turn is a member of the root group.
+
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref LearnBasics
+
+@page LBAPI The HDF5 API
+
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref LearnBasics
+<hr>
+
+\section secLBAPI HDF5 C API
+The HDF5 library provides several interfaces, or APIs. These APIs provide routines for creating,
+accessing, and manipulating HDF5 files and objects.
+
+The library itself is implemented in C. To facilitate the work of FORTRAN 90, C++ and Java programmers,
+HDF5 function wrappers have been developed in each of these languages. This tutorial discusses the use
+of the C functions and the FORTRAN wrappers.
+
+All C routines in the HDF5 library begin with a prefix of the form H5*, where * is one or two uppercase
+letters indicating the type of object on which the function operates.
+The FORTRAN wrappers come in the form of subroutines that begin with h5 and end with _f.
+Java routine names begin with “H5*” and are prefixed with “H5.” as the class. Constants are
+in the HDF5Constants class and are prefixed with "HDF5Constants.".
+The APIs are listed below:
+<table>
+<tr>
+<th><strong>API</strong>
+</th>
+<th><strong>DESCRIPTION</strong>
+</th>
+</tr>
+<tr>
+<th><strong>H5</strong>
+</th>
+<td>Library Functions: general-purpose H5 functions
+</td>
+</tr>
+<tr>
+<th><strong>H5A</strong>
+</th>
+<td>Annotation Interface: attribute access and manipulation routines
+</td>
+</tr>
+<tr>
+<th><strong>H5D</strong>
+</th>
+<td>Dataset Interface: dataset access and manipulation routines
+</td>
+</tr>
+<tr>
+<th><strong>H5E</strong>
+</th>
+<td>Error Interface: error handling routines
+</td>
+</tr>
+<tr>
+<th><strong>H5F</strong>
+</th>
+<td>File Interface: file access routines
+</td>
+</tr>
+<tr>
+<th><strong>H5G</strong>
+</th>
+<td>Group Interface: group creation and operation routines
+</td>
+</tr>
+<tr>
+<th><strong>H5I</strong>
+</th>
+<td>Identifier Interface: identifier routines
+</td>
+</tr>
+<tr>
+<th><strong>H5L</strong>
+</th>
+<td>Link Interface: link routines
+</td>
+</tr>
+<tr>
+<th><strong>H5O</strong>
+</th>
+<td>Object Interface: object routines
+</td>
+</tr>
+<tr>
+<th><strong>H5P</strong>
+</th>
+<td>Property List Interface: object property list manipulation routines
+</td>
+</tr>
+<tr>
+<th><strong>H5R</strong>
+</th>
+<td>Reference Interface: reference routines
+</td>
+</tr>
+<tr>
+<th><strong>H5S</strong>
+</th>
+<td>Dataspace Interface: dataspace definition and access routines
+</td>
+</tr>
+<tr>
+<th><strong>H5T</strong>
+</th>
+<td>Datatype Interface: datatype creation and manipulation routines
+</td>
+</tr>
+<tr>
+<th><strong>H5Z</strong>
+</th>
+<td>Compression Interface: compression routine(s)
+</td>
+</tr>
+</table>
+
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref LearnBasics
+
+@page LBProg Programming Issues
+
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref LearnBasics
+<hr>
+
+Keep the following in mind when looking at the example programs included in this tutorial:
+
+\section LBProgAPI APIs vary with different languages
+\li C routines begin with the prefix “H5*” where * is a single letter indicating the object on which the operation is to be performed:
+<table>
+<tr>
+<td>File Interface: </td>
+<td>#H5Fopen</td>
+</tr><tr>
+<td>Dataset Interface:</td>
+<td>#H5Dopen</td>
+</tr>
+</table>
+
+\li FORTRAN routines begin with “h5*” and end with “_f”:
+<table>
+<tr>
+<td>File Interface: </td>
+<td>h5fopen_f</td>
+</tr><tr>
+<td>Dataset Interface:</td>
+<td>h5dopen_f</td>
+</tr>
+</table>
+
+\li Java routine names begin with “H5*” and are prefixed with “H5.” as the class. Constants are
+in the HDF5Constants class and are prefixed with "HDF5Constants.".:
+<table>
+<tr>
+<td>File Interface: </td>
+<td>H5.H5Fopen</td>
+</tr><tr>
+<td>Dataset Interface:</td>
+<td>H5.H5Dopen</td>
+</tr>
+</table>
+
+\li APIS for languages like C++, Java, and Python use methods associated with specific objects.
+
+\section LBProgTypes HDF5 library has its own defined types
+\li #hid_t is used for object handles
+\li hsize_t is used for dimensions
+\li #herr_t is used for many return values
+
+\section LBProgLang Language specific files must be included in applications
+<ul>
+<li>
+Python:   Add <code>"import h5py / import numpy"</code>
+</li>
+<li>
+C:        Add <code>"#include hdf5.h"</code>
+</li>
+<li>
+FORTRAN:  Add <code>"USE HDF5"</code> and call h5open_f and h5close_f to initialize and close the HDF5 FORTRAN interface
+</li>
+<li>
+Java:     Add <code>"import hdf.hdf5lib.H5;
+                     import hdf.hdf5lib.HDF5Constants;"</code>
+</li>
+</ul>
+
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref LearnBasics
+
+@page LBFileCreate Creating an HDF5 File
+
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref LearnBasics
+<hr>
+
+An HDF5 file is a binary file containing scientific data and supporting metadata.
+\section secLBFileCreate HDF5 File Access
+To create an HDF5 file, an application must specify not only a file name, but a file access mode,
+a file creation property list, and a file access property list. These terms are described below:
+<ul>
+<li><strong>File access mode:</strong><br />
+When creating a file, the file access mode specifies the action to take if the file already exists:
+<ul>
+<li>#H5F_ACC_TRUNC specifies that if the file already exists, the current contents will be deleted so
+that the application can rewrite the file with new data.
+</li>
+<li>#H5F_ACC_EXCL specifies that the open will fail if the file already exists. If the file does not
+already exist, the file access parameter is ignored.
+</li>
+</ul>
+In either case, the application has both read and write access to the successfully created file.
+<br />
+Note that there are two different access modes for opening existing files:
+<ul>
+<li>#H5F_ACC_RDONLY specifies that the application has read access but will not be allowed to write any data.
+</li>
+<li>#H5F_ACC_RDWR specifies that the application has read and write access.
+</li>
+</ul>
+</li>
+<li><strong>File creation property list:</strong><br />The file creation property list is used to
+control the file metadata. File metadata contains information about the size of the user-block*,
+the size of various file data structures used by the HDF5 library, etc. In this tutorial, the
+default file creation property list, #H5P_DEFAULT, is used.<br />
+ *The user-block is a fixed-length block of data located at the beginning of the file which is
+ignored by the HDF5 library. The user-block may be used to store any data or information found
+to be useful to applications.
+</li>
+<li><strong>File access property list:</strong><br />The file access property list is used to
+control different methods of performing I/O on files. It also can be used to control how a file
+is closed (whether or not to delay the actual file close until all objects in a file are closed).
+The default file access property list, #H5P_DEFAULT, is used in this tutorial.
+</li>
+</ul>
+
+Please refer to the \ref sec_file section of the \ref UG and \ref H5F section in the \ref RM for
+detailed information regarding file access/creation property lists and access modes.
+
+The steps to create and close an HDF5 file are as follows:
+<ol>
+<li>Specify the file creation and access property lists, if necessary.</li>
+<li>Create the file.</li>
+<li>Close the file, and if necessary, close the property lists.</li>
+</ol>
+
+\section secLBFileExample Programming Example
+
+\subsection subsecLBFileExampleDesc Description
+The following example code demonstrates how to create and close an HDF5 file.
+
+<em>C</em>
+\code
+#include "hdf5.h"
+   #define FILE "file.h5"
+
+   int main() {
+
+      hid_t       file_id;   /* file identifier */
+      herr_t      status;
+
+      /* Create a new file using default properties. */
+      file_id = H5Fcreate(FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+
+      /* Terminate access to the file. */
+      status = H5Fclose(file_id); 
+   }
+\endcode
+
+<em>Fortran</em>
+\code
+  PROGRAM FILEEXAMPLE
+
+     USE HDF5 ! This module contains all necessary modules 
+        
+     IMPLICIT NONE
+
+     CHARACTER(LEN=8), PARAMETER :: filename = "filef.h5" ! File name
+     INTEGER(HID_T) :: file_id                            ! File identifier
+ 
+     INTEGER     ::   error  ! Error flag
+     
+!
+!    Initialize FORTRAN interface.
+!
+     CALL h5open_f (error)
+     !
+     ! Create a new file using default properties.
+     ! 
+     CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, error)
+
+     !
+     ! Terminate access to the file.
+     !
+     CALL h5fclose_f(file_id, error)
+!
+!    Close FORTRAN interface.
+!
+     CALL h5close_f(error)
+     END PROGRAM FILEEXAMPLE
+\endcode
+
+See \ref LBExamples for the examples used in the Learning the Basics tutorial.
+
+For details on compiling an HDF5 application:
+[ \ref LBCompiling ]
+
+\subsection subsecLBFileExampleRem Remarks
+\li <strong>In C</strong>: The include file <code style="background-color:whitesmoke;">hdf5.h</code> contains definitions and declarations and must be included
+in any program that uses the HDF5 library.
+<br />
+<strong>In FORTRAN</strong>: The module <code style="background-color:whitesmoke;">HDF5</code> contains definitions and declarations and must be used in any
+program that uses the HDF5 library. Also note that #H5open MUST be called at the beginning of an HDF5 Fortran
+application (prior to any HDF5 calls) to initialize the library and variables. The #H5close call MUST be at
+the end of the HDF5 Fortran application.
+\li #H5Fcreate creates an HDF5 file and returns the file identifier.<br />
+For Fortran, the file creation property list and file access property list are optional. They can be omitted if the
+default values are to be used.<br />
+The root group is automatically created when a file is created. Every file has a root group and the path name of
+the root group is always <code style="background-color:whitesmoke;">/</code>.
+\li #H5Fclose terminates access to an HDF5 file.<br />
+When an HDF5 file is no longer accessed by a program, #H5Fclose must be called to release the resources used by the file.
+This call is mandatory.<br />
+Note that if #H5Fclose is called for a file, but one or more objects within the file remain open, those objects will
+remain accessible until they are individually closed. This can cause access problems for other users, if objects were
+inadvertently left open. A File Access property controls how the file is closed.
+
+\subsection subsecLBFileExampleCont File Contents
+The HDF Group has developed tools for examining the contents of HDF5 files. The tool used throughout the HDF5 tutorial
+is the HDF5 dumper, <code style="background-color:whitesmoke;">h5dump</code>, which displays the file contents in human-readable form. The output of <code style="background-color:whitesmoke;">h5dump</code> is an ASCII
+display formatted according to the HDF5 DDL grammar. This grammar is defined, using Backus-Naur Form, in the
+\ref DDLBNF110.
+
+To view the HDF5 file contents, simply type:
+\code
+h5dump <filename>
+\endcode
+
+<table>
+<caption>Describe the file contents of file.h5 using a directed graph.</caption>
+<tr>
+<td>
+\image html imgLBFile.gif
+</td>
+</tr>
+</table>
+
+The text description of <code style="background-color:whitesmoke;">file.h5</code>, as generated by <code style="background-color:whitesmoke;">h5dump</code>. The HDF5 file called <code style="background-color:whitesmoke;">file.h5</code>
+contains a group called <code style="background-color:whitesmoke;">/</code>, or the root group. (The file called <code style="background-color:whitesmoke;">filef.h5</code>, created by the FORTRAN version of the example,
+has the same output except that the filename shown is <code style="background-color:whitesmoke;">filef.h5</code>.)
+\code
+HDF5 "file.h5" {
+         GROUP "/" {
+         }
+         }
+\endcode
+
+\subsection subsecLBFileExampleDDL File Definition in DDL
+The simplified DDL file definition for creating an HDF5 file. For simplicity, a simplified DDL is used in this tutorial. A
+complete and more rigorous DDL can be found in the \ref DDLBNF110.
+
+The following symbol definitions are used in the DDL:
+\code
+        ::=               defined as
+        <tname>           a token with the name tname
+        <a> | <b>         one of <a> or <b>
+        <a>*              zero or more occurrences of <a>
+\endcode
+
+The simplified DDL for file definition is as follows:
+\code
+        <file> ::= HDF5 "<file_name>" { <root_group> }
+
+        <root_group> ::= GROUP "/" { <group_attribute>* 
+                                        <group_member>* }
+
+        <group_attribute> ::= <attribute>
+
+        <group_member> ::= <group> | <dataset>
+\endcode
+
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref LearnBasics
+
+@page LBDsetCreate Creating a Dataset
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref LearnBasics
+<hr>
+
+A dataset is a multidimensional array of data elements, together with supporting metadata. To create
+a dataset, the application program must specify the location at which to create the dataset, the
+dataset name, the datatype and dataspace of the data array, and the property lists.
+
+\section secLBDsetCreateDtype Datatypes
+A datatype is a collection of properties, all of which can be stored on disk, and which, when taken as
+a whole, provide complete information for data conversion to or from that datatype.
+
+There are two categories of datatypes in HDF5:
+<ul>
+<li><strong>Pre-defined</strong>:   These datatypes are opened and closed by HDF5.<br />
+Pre-defined datatypes can be atomic or composite:
+<ul><li>Atomic datatypes cannot be decomposed into smaller datatype units at the API level. For example: integer, float, reference, string.</li>
+<li>Composite datatypes are aggregations of one or more datatypes. For example: array, variable length, enumeration, compound.</li></ul>
+</li>
+<li><strong>Derived</strong>:   These datatypes are created or derived from the pre-defined types.<br />
+A simple example of creating a derived datatype is using the string datatype, H5T_C_S1, to create strings of more than one character:<br />
+\code
+      hid_t strtype;                     // Datatype ID
+      herr_t status;
+
+      strtype = H5Tcopy (H5T_C_S1);
+      status = H5Tset_size (strtype, 5); // create string of length 5
+\endcode
+</li>
+</ul>
+
+Shown below is the HDF5 pre-defined datatypes.
+\code
+                                          +--  integer
+                                          +--  floating point
+                        +---- atomic  ----+--  date and time
+                        |                 +--  character string
+       HDF5 datatypes --|                 +--  bitfield
+                        |                 +--  opaque
+                        |
+                        +---- compound
+\endcode
+
+Some of the HDF5 predefined atomic datatypes are listed below.
+
+<table>
+<caption>Examples of HDF5 predefined datatypes</caption>
+<tr>
+<th><strong>Datatype</strong></th>
+<th><strong>Description</strong></th>
+</tr>
+<tr>
+<th><strong>H5T_STD_I32LE</strong></th>
+<td>Four-byte, little-endian, signed, two's complement integer</td>
+</tr>
+<tr>
+<th><strong>H5T_STD_U16BE</strong></th>
+<td>Two-byte, big-endian, unsigned integer</td>
+</tr>
+<tr>
+<th><strong>H5T_IEEE_F32BE</strong></th>
+<td>Four-byte, big-endian, IEEE floating point</td>
+</tr>
+<tr>
+<th><strong>H5T_IEEE_F64LE</strong></th>
+<td>Eight-byte, little-endian, IEEE floating point</td>
+</tr>
+<tr>
+<th><strong>H5T_C_S1</strong></th>
+<td>One-byte, null-terminated string of eight-bit characters</td>
+</tr>
+</table>
+
+<table>
+<caption>Examples of HDF5 predefined native datatypes</caption>
+<tr>
+<th><strong>Native Datatype</strong></th>
+<th><strong>Corresponding C or FORTRAN Type</strong></th>
+</tr>
+<tr>
+<th span="2"><strong>C</strong></th>
+</tr>
+<tr>
+<th><strong>H5T_NATIVE_INT</strong></th>
+<td>int</td>
+</tr>
+<tr>
+<th><strong>H5T_NATIVE_FLOAT</strong></th>
+<td>float</td>
+</tr>
+<tr>
+<th><strong>H5T_NATIVE_CHAR</strong></th>
+<td>char</td>
+</tr>
+<tr>
+<th><strong>H5T_NATIVE_DOUBLE</strong></th>
+<td>double</td>
+</tr>
+<tr>
+<th><strong>H5T_NATIVE_LDOUBLE</strong></th>
+<td>long double</td>
+</tr>
+<tr>
+<th span="2"><strong>Fortran</strong></th>
+</tr>
+<tr>
+<th><strong>H5T_NATIVE_INTEGER</strong></th>
+<td>integer</td>
+</tr>
+<tr>
+<th><strong>H5T_NATIVE_REAL</strong></th>
+<td>real</td>
+</tr>
+<tr>
+<th><strong>H5T_NATIVE_DOUBLE</strong></th>
+<td>double precision</td>
+</tr>
+<tr>
+<th><strong>H5T_NATIVE_CHARACTER</strong></th>
+<td>character</td>
+</tr>
+</table>
+
+In this tutorial, we consider only HDF5 predefined integers.
+
+For further information on datatypes, see \ref sec_datatype in the \ref UG, in addition to the \ref LBDatatypes tutorial topic.
+
+\section secLBDsetCreateDspace Datasets and Dataspaces
+A dataspace describes the dimensionality of the data array. A dataspace is either a regular N-dimensional
+array of data points, called a simple dataspace, or a more general collection of data points organized
+in another manner, called a complex dataspace. In this tutorial, we only consider simple dataspaces.
+
+<em>HDF5 dataspaces</em>
+\code
+                         +-- simple
+       HDF5 dataspaces --|
+                         +-- complex
+\endcode
+The dimensions of a dataset can be fixed (unchanging), or they may be unlimited, which means that they are
+extensible. A dataspace can also describe a portion of a dataset, making it possible to do partial
+I/O operations on selections.
+
+\section secLBDsetCreateProp Property Lists
+Property lists are a mechanism for modifying the default behavior when creating or accessing objects. For
+more information on property lists see the \ref LBPropsList tutorial topic.
+
+The following property lists can be specified when creating a dataset:
+\li Dataset Creation Property List<br />
+When creating a dataset, HDF5 allows the user to specify how raw data is organized and/or compressed on
+disk. This information is stored in a dataset creation property list and passed to the dataset interface.
+The raw data on disk can be stored contiguously (in the same linear way that it is organized in memory),
+partitioned into chunks, stored externally, etc. In this tutorial, we use the default dataset creation
+property list (contiguous storage layout and no compression). For more information about dataset creation
+property lists, see \ref sec_dataset in the \ref UG.
+\li Link Creation Property List<br />
+The link creation property list governs creation of the link(s) by which a new dataset is accessed and the
+creation of any intermediate groups that may be missing.
+\li Dataset Access Property List<br />
+Dataset access property lists are properties that can be specified when accessing a dataset.
+
+\section secLBDsetCreateSteps Steps to Create a Dataset
+To create an empty dataset (no data written) the following steps need to be taken:
+<ol>
+<li>Obtain the location identifier where the dataset is to be created.</li>
+<li>Define or specify the dataset characteristics:
+<ol>
+<li>Define a datatype or specify a pre-defined datatype.</li>
+<li>Define a dataspace.</li>
+<li>Specify the property list(s) or use the default.</li>
+</ol></li>
+<li>Create the dataset.</li>
+<li>Close the datatype, the dataspace, and the property list(s) if necessary.</li>
+<li>Close the dataset.</li>
+</ol>
+In HDF5, datatypes and dataspaces are independent objects which are created separately from any dataset
+that they might be attached to. Because of this, the creation of a dataset requires the definition of
+the datatype and dataspace. In this tutorial, we use the HDF5 predefined datatypes (integer) and consider
+only simple dataspaces. Hence, only the creation of dataspace objects is needed.
+
+\section secLBDsetCreateHL High Level APIs
+The High Level \ref H5LT include functions that simplify and condense the steps for
+creating datasets in HDF5. The examples in the following section use the standard APIs. For a
+quick start you may prefer to look at the \ref H5LT at this time.
+
+If you plan to work with images, please look at the High Level \ref H5IM, as well.
+
+\section secLBDsetCreateProg Programming Example
+
+\subsection subsecLBDsetCreateProgDesc Description
+See \ref LBExamples for the examples used in the \ref LearnBasics tutorial.
+
+The example shows how to create an empty dataset. It creates a file called <code style="background-color:whitesmoke;">dset.h5</code>
+in the C version (<code style="background-color:whitesmoke;">dsetf.h5</code> in Fortran), defines the dataset dataspace, creates a
+dataset which is a 4x6 integer array, and then closes the dataspace, the dataset, and the file.
+
+For details on compiling an HDF5 application: [ \ref LBCompiling ]
+
+\subsection subsecLBDsetCreateProgRem Remarks
+#H5Screate_simple creates a new simple dataspace and returns a dataspace identifier.
+#H5Sclose releases and terminates access to a dataspace.
+
+<em>C</em>
+\code
+    dataspace_id = H5Screate_simple (rank, dims, maxdims);
+    status = H5Sclose (dataspace_id );
+\endcode
+
+<em>FORTRAN</em>
+\code
+    CALL h5screate_simple_f (rank, dims, dataspace_id, hdferr, maxdims=max_dims)
+         or
+    CALL h5screate_simple_f (rank, dims, dataspace_id, hdferr)
+
+    CALL h5sclose_f (dataspace_id, hdferr)
+\endcode
+
+#H5Dcreate creates an empty dataset at the specified location and returns a dataset identifier.
+#H5Dclose closes the dataset and releases the resource used by the dataset. This call is mandatory.
+
+<em>C</em>
+\code
+   dataset_id = H5Dcreate(file_id, "/dset", H5T_STD_I32BE, dataspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+   status = H5Dclose (dataset_id);
+\endcode
+
+<em>FORTRAN</em>
+\code
+   CALL h5dcreate_f (loc_id, name, type_id, dataspace_id, dset_id, hdferr)
+   CALL h5dclose_f (dset_id, hdferr)
+\endcode
+
+Note that if using the pre-defined datatypes in FORTRAN, then a call must be made to initialize and terminate access to the pre-defined datatypes:
+\code
+  CALL h5open_f (hdferr)
+  CALL h5close_f (hdferr)
+\endcode
+
+H5open must be called before any HDF5 library subroutine calls are made;
+H5close must be called after the final HDF5 library subroutine call.
+
+See the programming example for an illustration of the use of these calls.
+
+\subsection subsecLBDsetCreateContent File Contents
+The contents of the file dset.h5 (dsetf.h5 for FORTRAN) are shown below:
+<table>
+<caption>Contents of dset.h5 ( dsetf.h5)</caption>
+<tr>
+<td>
+\image html imgLBDsetCreate.gif
+</td>
+</tr>
+</table>
+<table>
+<tr>
+<th>dset.h5 in DDL</th>
+<th>dsetf.h5 in DDL</th>
+<tr>
+<td>
+\code
+HDF5 "dset.h5" {
+GROUP "/" {
+   DATASET "dset" {
+      DATATYPE { H5T_STD_I32BE }
+      DATASPACE { SIMPLE ( 4, 6 ) / ( 4, 6 ) }
+      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
+      }
+   }
+}
+}
+\endcode
+</td>
+<td>
+\code
+HDF5 "dsetf.h5" {
+GROUP "/" {
+   DATASET "dset" {
+      DATATYPE { H5T_STD_I32BE }
+      DATASPACE { SIMPLE ( 6, 4 ) / ( 6, 4 ) }
+      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
+      }
+   }
+}
+}
+\endcode
+</td>
+</tr>
+</table>
+Note in above that #H5T_STD_I32BE, a 32-bit Big Endian integer, is an HDF atomic datatype.
+
+\subsection subsecLBDsetCreateProgDDL Dataset Definition in DDL
+The following is the simplified DDL dataset definition:
+\code
+      <dataset> ::= DATASET "<dataset_name>" { <datatype>
+                                               <dataspace>
+                                               <data>
+                                               <dataset_attribute>* }
+
+      <datatype> ::= DATATYPE { <atomic_type> }
+
+      <dataspace> ::= DATASPACE { SIMPLE <current_dims> / <max_dims> }
+
+      <dataset_attribute> ::= <attribute>
+\endcode
+
+<hr>
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref LearnBasics
+
+@page LBDsetRW Reading From and Writing To a Dataset
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref LearnBasics
+<hr>
+
+\section secLBDsetRW Dataset I/O Operation
+During a dataset I/O operation, the library transfers raw data between memory and the file. The data in memory
+can have a datatype different from that of the file and can also be of a different size (i.e., the data in
+memory is a subset of the dataset elements, or vice versa). Therefore, to perform read or write operations,
+the application program must specify:
+\li The dataset
+\li The dataset's datatype in memory
+\li The dataset's dataspace in memory
+\li The dataset's dataspace in the file
+\li The dataset transfer property list<br />
+<ul>
+<li>(The dataset transfer property list controls various aspects of the I/O operations, such as the number
+of processes participating in a collective I/O request or hints to the library to control caching of raw
+data. In this tutorial, we use the default dataset transfer property list.)</li>
+</ul>
+\li The data buffer
+
+The steps to read from or write to a dataset are as follows:
+<ol>
+<li>Obtain the dataset identifier.</li>
+<li>Specify the memory datatype.</li>
+<li>Specify the memory dataspace.</li>
+<li>Specify the file dataspace.</li>
+<li>Specify the transfer properties.</li>
+<li>Perform the desired operation on the dataset.</li>
+<li>Close the dataset.</li>
+<li>Close the dataspace, datatype, and property list if necessary.</li>
+</ol>
+
+To read from or write to a dataset, the #H5Dread and #H5Dwrite routines are used.
+
+<em>C</em>
+\code
+   status = H5Dread (set_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf );
+   status = H5Dwrite (set_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf);
+\endcode
+
+<em>Fortran</em>
+\code
+   CALL h5dread_f(dset_id, mem_type_id, buf, dims, error, &
+                     mem_space_id=mspace_id, file_space_id=fspace_id, &
+                     xfer_prp=xfer_plist_id)
+        or
+   CALL h5dread_f(dset_id, mem_type_id, buf, dims,  error)
+
+
+   CALL h5dwrite_f(dset_id, mem_type_id, buf, dims, error, &
+                     mem_space_id=mspace_id, file_space_id=fspace_id, &
+                     xfer_prp=xfer_plist_id)
+        or
+   CALL h5dwrite_f(dset_id, mem_type_id, buf, dims, error)
+\endcode
+
+\section secLBDsetRWHL High Level APIs
+The High Level \ref H5LT include functions that simplify and condense the steps for creating and
+reading datasets. Please be sure to review them, in addition to this tutorial.
+
+\section secLBDsetRWEx Programming Example
+
+\subsection secLBDsetRWExDesc Description
+See \ref LBExamples for the examples used in the \ref LearnBasics tutorial.
+
+The example shows how to read and write an existing dataset. It opens the file created in the previous example,
+obtains the dataset identifier for the dataset <code style="background-color:whitesmoke;">/dset</code>, writes the dataset to the file, then reads
+the dataset back. It then closes the dataset and file.
+
+Note that #H5S_ALL is passed in for both the memory and file dataspace parameters in the read and write calls.
+This indicates that the entire dataspace of the dataset will be read or written to. #H5S_ALL by itself does not
+necessarily have this meaning. See the \ref RM entry for #H5Dread or #H5Dwrite for more information on using #H5S_ALL.
+
+For details on compiling an HDF5 application:
+[ \ref LBCompiling ]
+
+\subsection secLBDsetRWExRem Remarks
+#H5Fopen opens an existing file and returns a file identifier.
+
+#H5Dopen opens an existing dataset with the specified name and location.
+
+#H5Dwrite writes raw data from an application buffer to the specified dataset, converting from the datatype and
+dataspace of the dataset in memory to the datatype and dataspace of the dataset in the file. Specifying #H5S_ALL
+for both the memory and file dataspaces indicates that the entire dataspace of the dataset is to be written to.
+#H5S_ALL by itself does not necessarily have this meaning. See the \ref RM entry for #H5Dwrite for more information
+on using #H5S_ALL.
+
+#H5Dread reads raw data from the specified dataset to an application buffer, converting from the file datatype and
+dataspace to the memory datatype and dataspace. Specifying #H5S_ALL for both the memory and file dataspaces
+indicates that the entire dataspace of the dataset is to be read. #H5S_ALL by itself does not necessarily have
+this meaning. See the \ref RM entry for #H5Dread for more information on using #H5S_ALL.
+
+\subsection secLBDsetRWExCont File Contents
+
+Shown below is the contents of dset.h5 (created by the C program).
+
+<em>dset.h5 in DDL</em>
+\code
+      HDF5 "dset.h5" {
+      GROUP "/" {
+         DATASET "dset" {
+            DATATYPE { H5T_STD_I32BE }
+            DATASPACE { SIMPLE ( 4, 6 ) / ( 4, 6 ) }
+            DATA {
+               1, 2, 3, 4, 5, 6,
+               7, 8, 9, 10, 11, 12,
+               13, 14, 15, 16, 17, 18,
+               19, 20, 21, 22, 23, 24
+            }
+         }
+      }
+      }
+\endcode
+
+Shown below is the contents of dsetf.h5 (created by the FORTRAN program).
+
+<em>dsetf.h5 in DDL</em>
+\code
+      HDF5 "dsetf.h5" {
+      GROUP "/" {
+         DATASET "dset" {
+            DATATYPE { H5T_STD_I32BE }
+            DATASPACE { SIMPLE ( 6, 4 ) / ( 6, 4 ) }
+                  DATA {
+               1, 7, 13, 19,
+               2, 8, 14, 20,
+               3, 9, 15, 21,
+               4, 10, 16, 22,
+               5, 11, 17, 23,
+               6, 12, 18, 24
+            }
+         }
+      }
+      }
+\endcode
+
+<hr>
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref LearnBasics
+
+@page LBAttrCreate Creating an Attribute
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref LearnBasics
+<hr>
+
+Attributes are small datasets that can be used to describe the nature and/or the intended usage of
+the object they are attached to. In this section, we show how to create, read, and write an attribute.
+
+\section secLBAttrCreate Creating an attribute
+Creating an attribute is similar to creating a dataset. To create an attribute, the application must
+specify the object which the attribute is attached to, the datatype and dataspace of the attribute
+data, and the attribute creation property list.
+
+The steps to create an attribute are as follows:
+<ol>
+<li>Obtain the object identifier that the attribute is to be attached to.</li>
+<li>Define the characteristics of the attribute and specify the attribute creation property list.
+<ul>
+<li>Define the datatype.</li>
+<li>Define the dataspace.</li>
+<li>Specify the attribute creation property list.</li>
+</ul></li>
+<li>Create the attribute.</li>
+<li>Close the attribute and datatype, dataspace, and attribute creation property list, if necessary.</li>
+</ol>
+
+To create and close an attribute, the calling program must use #H5Acreate and #H5Aclose. For example:
+
+<em>C</em>
+\code
+  attr_id = H5Acreate (dataset_id, "Units", H5T_STD_I32BE, dataspace_id, H5P_DEFAULT, H5P_DEFAULT)
+  status = H5Aclose (attr_id);
+\endcode
+
+<em>Fortran</em>
+\code
+  CALL h5acreate_f (dset_id, attr_nam, type_id, space_id, attr_id, &
+                    hdferr, creation_prp=creat_plist_id)
+  or
+  CALL h5acreate_f (dset_id, attr_nam, type_id, space_id, attr_id, hdferr)
+
+  CALL h5aclose_f (attr_id, hdferr)
+\endcode
+
+\section secLBAttrCreateRW Reading/Writing an attribute
+Attributes may only be read or written as an entire object; no partial I/O is supported. Therefore,
+to perform I/O operations on an attribute, the application needs only to specify the attribute and
+the attribute's memory datatype.
+
+The steps to read or write an attribute are as follows.
+<ol>
+<li>Obtain the attribute identifier.</li>
+<li>Specify the attribute's memory datatype.</li>
+<li>Perform the desired operation.</li>
+<li>Close the memory datatype if necessary.</li>
+</ol>
+
+To read and/or write an attribute, the calling program must contain the #H5Aread and/or
+#H5Awrite routines. For example:
+
+<em>C</em>
+\code
+  status = H5Aread (attr_id, mem_type_id, buf);
+  status = H5Awrite (attr_id, mem_type_id, buf);
+\endcode
+
+<em>Fortran</em>
+\code
+  CALL h5awrite_f (attr_id, mem_type_id, buf, dims, hdferr)  
+  CALL h5aread_f (attr_id, mem_type_id, buf, dims, hdferr)
+\endcode
+
+\section secLBAttrCreateHL High Level APIs
+The High Level \ref H5LT include functions that simplify and condense the steps for creating and
+reading datasets. Please be sure to review them, in addition to this tutorial.
+
+\section secLBAttrCreateRWEx Programming Example
+
+\subsection secLBAttrCreateRWExDesc Description
+See \ref LBExamples for the examples used in the \ref LearnBasics tutorial.
+
+The example shows how to create and write a dataset attribute. It opens an existing file <code style="background-color:whitesmoke;">dset.h5</code>
+in C (<code style="background-color:whitesmoke;">dsetf.h5</code> in FORTRAN), obtains the identifier of the dataset <code style="background-color:whitesmoke;">/dset</code>, defines
+the attribute's dataspace, creates the dataset attribute, writes the attribute, and then closes the attribute's
+dataspace, attribute, dataset, and file.
+
+For details on compiling an HDF5 application:
+[ \ref LBCompiling ]
+
+\subsection secLBAttrCreateRWExRem Remarks
+#H5Acreate creates an attribute which is attached to the object specified by the first parameter, and returns an identifier.
+
+#H5Awrite writes the entire attribute, and returns the status of the write.
+
+When an attribute is no longer accessed by a program, #H5Aclose must be called to release the attribute from use.
+An #H5Aclose/h5aclose_f call is mandatory.
+
+\subsection secLBAttrCreateRWExCont File Contents
+
+Shown below is the contents and the attribute definition of <code style="background-color:whitesmoke;">dset.h5</code> (created by the C program).
+
+<em>dset.h5 in DDL</em>
+\code
+HDF5 "dset.h5" {
+GROUP "/" {
+DATASET "dset" {
+DATATYPE { H5T_STD_I32BE }
+DATASPACE { SIMPLE ( 4, 6 ) / ( 4, 6 ) }
+DATA {
+ 1, 2, 3, 4, 5, 6,
+ 7, 8, 9, 10, 11, 12,
+ 13, 14, 15, 16, 17, 18,
+ 19, 20, 21, 22, 23, 24
+}
+ATTRIBUTE "attr" {
+ DATATYPE { H5T_STD_I32BE }
+ DATASPACE { SIMPLE ( 2 ) / ( 2 ) }
+ DATA {
+    100, 200
+ }
+}
+}
+}
+}
+\endcode
+
+Shown below is the contents and the attribute definition of <code style="background-color:whitesmoke;">dsetf.h5</code> (created by the FORTRAN program).
+
+<em>dsetf.h5 in DDL</em>
+\code
+HDF5 "dsetf.h5" {
+GROUP "/" {
+DATASET "dset" {
+DATATYPE { H5T_STD_I32BE }
+DATASPACE { SIMPLE ( 6, 4 ) / ( 6, 4 ) }
+DATA {
+ 1, 7, 13, 19,
+ 2, 8, 14, 20,
+ 3, 9, 15, 21,
+ 4, 10, 16, 22,
+ 5, 11, 17, 23,
+ 6, 12, 18, 24
+}
+ATTRIBUTE "attr" {
+ DATATYPE { H5T_STD_I32BE }
+ DATASPACE { SIMPLE ( 2 ) / ( 2 ) }
+ DATA {
+    100, 200
+ }
+}
+}
+}
+}
+\endcode
+
+\subsection secLBAttrCreateRWExDDL Attribute Definition in DDL
+
+<em>HDF5 Attribute Definition</em>
+\code
+<attribute> ::= ATTRIBUTE "<attr_name>" { <datatype>
+                       <dataspace>
+                       <data>  }
+\endcode
+
+<hr>
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref LearnBasics
+
+*/
diff --git a/doxygen/dox/LearnBasics2.dox b/doxygen/dox/LearnBasics2.dox
new file mode 100644
index 0000000..ffcb971
--- /dev/null
+++ b/doxygen/dox/LearnBasics2.dox
@@ -0,0 +1,1159 @@
+/** @page LBGrpCreate Creating an Group
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref LearnBasics
+<hr>
+
+\section secLBGrpCreate Creating an group
+An HDF5 group is a structure containing zero or more HDF5 objects. The two primary HDF5 objects are groups and datasets. To create a group, the calling program must:
+<ol>
+<li>Obtain the location identifier where the group is to be created.</li>
+<li>Create the group.</li>
+<li>Close the group.</li>
+</ol>
+
+To create a group, the calling program must call #H5Gcreate.
+To close the group, #H5Gclose must be called. The close call is mandatory.
+
+For example:
+
+<em>C</em>
+\code
+  group_id = H5Gcreate(file_id, "/MyGroup", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+  status = H5Gclose (group_id);
+\endcode
+
+<em>Fortran</em>
+\code
+  CALL h5gcreate_f (loc_id, name, group_id, error)
+  CALL h5gclose_f (group_id, error)
+\endcode
+
+\section secLBGrpCreateRWEx Programming Example
+
+\subsection secLBGrpCreateRWExDesc Description
+See \ref LBExamples for the examples used in the \ref LearnBasics tutorial.
+
+The example shows how to create and close a group. It creates a file called <code style="background-color:whitesmoke;">group.h5</code> in C
+(<code style="background-color:whitesmoke;">groupf.h5</code> for FORTRAN), creates a group called MyGroup in the root group, and then closes the group and file.
+
+For details on compiling an HDF5 application:
+[ \ref LBCompiling ]
+
+\subsection secLBGrpCreateRWExCont File Contents
+
+Shown below is the contents and the definition of the group of <code style="background-color:whitesmoke;">group.h5</code> (created by the C program).
+(The FORTRAN program creates the HDF5 file <code style="background-color:whitesmoke;">groupf.h5</code> and the resulting DDL shows the filename
+<code style="background-color:whitesmoke;">groupf.h5</code> in the first line.)
+<table>
+<caption>The Contents of group.h5.</caption>
+<tr>
+<td>
+\image html imggrpcreate.gif
+</td>
+</tr>
+</table>
+
+<em>group.h5 in DDL</em>
+\code
+HDF5 "group.h5" {
+GROUP "/" {
+   GROUP "MyGroup" {
+   }
+}
+}
+\endcode
+
+<hr>
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref LearnBasics
+
+@page LBGrpCreateNames Creating Groups using Absolute and Relative Names
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref LearnBasics
+<hr>
+
+Recall that to create an HDF5 object, we have to specify the location where the object is to be created.
+This location is determined by the identifier of an HDF5 object and the name of the object to be created.
+The name of the created object can be either an absolute name or a name relative to the specified identifier.
+In the previous example, we used the file identifier and the absolute name <code style="background-color:whitesmoke;">/MyGroup</code> to create a group.
+
+In this section, we discuss HDF5 names and show how to use absolute and relative names.
+
+\section secLBGrpCreateNames Names
+HDF5 object names are a slash-separated list of components. There are few restrictions on names: component
+names may be any length except zero and may contain any character except slash (<code style="background-color:whitesmoke;">/</code>) and the null terminator.
+A full name may be composed of any number of component names separated by slashes, with any of the component
+names being the special name <code style="background-color:whitesmoke;">.</code> (a dot or period). A name which begins with a slash is an <em>absolute name</em> which
+is accessed beginning with the root group of the file; all other names are <em>relative names</em> and and the named
+object is accessed beginning with the specified group. A special case is the name <code style="background-color:whitesmoke;">/</code> (or equivalent) which
+refers to the root group.
+
+Functions which operate on names generally take a location identifier, which can be either a file identifier
+or a group identifier, and perform the lookup with respect to that location. Several possibilities are
+described in the following table:
+
+<table>
+<tr>
+<th><strong>Location Type</strong></th>
+<th><strong>Object Name</strong></th>
+<th><strong>Description</strong></th>
+</tr>
+<tr>
+<th><strong>File identifier</strong></th>
+<td>/foo/bar</td>
+<td>The object bar in group foo in the root group.</td>
+</tr>
+<tr>
+<th><strong>Group identifier</strong></th>
+<td>/foo/bar</td>
+<td>The object bar in group foo in the root group of the file containing the specified group.
+In other words, the group identifier's only purpose is to specify a file.</td>
+</tr>
+<tr>
+<th><strong>File identifier</strong></th>
+<td>/</td>
+<td>The root group of the specified file.</td>
+</tr>
+<tr>
+<th><strong>Group identifier</strong></th>
+<td>/</td>
+<td>The root group of the file containing the specified group.</td>
+</tr>
+<tr>
+<th><strong>Group identifier</strong></th>
+<td>foo/bar</td>
+<td>The object bar in group foo in the specified group.</td>
+</tr>
+<tr>
+<th><strong>File identifier</strong></th>
+<td>.</td>
+<td>The root group of the file.</td>
+</tr>
+<tr>
+<th><strong>Group identifier</strong></th>
+<td>.</td>
+<td>The specified group.</td>
+</tr>
+<tr>
+<th><strong>Other identifier</strong></th>
+<td>.</td>
+<td>The specified object.</td>
+</tr>
+</table>
+
+\section secLBGrpCreateNamesEx Programming Example
+
+\subsection secLBGrpCreateNamesExDesc Description
+See \ref LBExamples for the examples used in the \ref LearnBasics tutorial.
+
+The example code shows how to create groups using absolute and relative names. It creates three groups: the first two groups are created using
+the file identifier and the group absolute names while the third group is created using a group identifier and a name relative to the specified group.
+
+For details on compiling an HDF5 application:
+[ \ref LBCompiling ]
+
+\subsection secLBGrpCreateNamesExRem Remarks
+#H5Gcreate creates a group at the location specified by a location identifier and a name. The location identifier
+can be a file identifier or a group identifier and the name can be relative or absolute.
+
+The first #H5Gcreate/h5gcreate_f creates the group <code style="background-color:whitesmoke;">MyGroup</code> in the root group of the specified file.
+
+The second #H5Gcreate/h5gcreate_f creates the group <code style="background-color:whitesmoke;">Group_A</code> in the group <code style="background-color:whitesmoke;">MyGroup</code> in the root group of the specified
+file. Note that the parent group (<code style="background-color:whitesmoke;">MyGroup</code>) already exists.
+
+The third #H5Gcreate/h5gcreate_f creates the group <code style="background-color:whitesmoke;">Group_B</code> in the specified group.
+
+\subsection secLBGrpCreateNamesExCont File Contents
+
+Shown below is the contents and the definition of the group of <code style="background-color:whitesmoke;">groups.h5</code> (created by the C program).
+(The FORTRAN program creates the HDF5 file <code style="background-color:whitesmoke;">groupsf.h5</code> and the resulting DDL shows the filename
+<code style="background-color:whitesmoke;">groupsf.h5</code> in the first line.)
+<table>
+<caption>The Contents of groups.h5.</caption>
+<tr>
+<td>
+\image html imggrps.gif
+</td>
+</tr>
+</table>
+
+<em>groups.h5 in DDL</em>
+\code
+HDF5 "groups.h5" {
+GROUP "/" {
+ GROUP "MyGroup" {
+    GROUP "Group_A" {
+    }
+    GROUP "Group_B" {
+    }
+ }
+}
+}
+\endcode
+
+<hr>
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref LearnBasics
+
+@page LBGrpDset Creating Datasets in Groups
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref LearnBasics
+<hr>
+
+\section secLBGrpDset Datasets in Groups
+We have shown how to create groups, datasets, and attributes. In this section, we show how to create
+datasets in groups. Recall that #H5Dcreate creates a dataset at the location specified by a location
+identifier and a name. Similar to #H5Gcreate, the location identifier can be a file identifier or a
+group identifier and the name can be relative or absolute. The location identifier and the name
+together determine the location where the dataset is to be created. If the location identifier and
+name refer to a group, then the dataset is created in that group.
+
+\section secLBGrpDsetEx Programming Example
+
+\subsection secLBGrpDsetExDesc Description
+See \ref LBExamples for the examples used in the \ref LearnBasics tutorial.
+
+The example shows how to create a dataset in a particular group. It opens the file created in the previous example and creates two datasets:
+
+For details on compiling an HDF5 application:
+[ \ref LBCompiling ]
+
+\subsection secLBGrpDsetExCont File Contents
+
+Shown below is the contents and the definition of the group of <code style="background-color:whitesmoke;">groups.h5</code> (created by the C program).
+(The FORTRAN program creates the HDF5 file <code style="background-color:whitesmoke;">groupsf.h5</code> and the resulting DDL shows the filename
+<code style="background-color:whitesmoke;">groupsf.h5</code> in the first line.)
+<table>
+<caption>The contents of the file groups.h5 (groupsf.h5 for FORTRAN)</caption>
+<tr>
+<td>
+\image html imggrpdsets.gif
+</td>
+</tr>
+</table>
+
+<em>groups.h5 in DDL</em>
+\code
+HDF5 "groups.h5" {
+GROUP "/" {
+GROUP "MyGroup" {
+GROUP "Group_A" {
+ DATASET "dset2" {
+    DATATYPE { H5T_STD_I32BE }
+    DATASPACE { SIMPLE ( 2, 10 ) / ( 2, 10 ) }
+    DATA {
+       1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
+       1, 2, 3, 4, 5, 6, 7, 8, 9, 10
+    }
+ }
+}
+GROUP "Group_B" {
+}
+DATASET "dset1" {
+ DATATYPE { H5T_STD_I32BE }
+ DATASPACE { SIMPLE ( 3, 3 ) / ( 3, 3 ) }
+ DATA {
+    1, 2, 3,
+    1, 2, 3,
+    1, 2, 3
+ }
+}
+}
+}
+}
+\endcode
+
+<em>groupsf.h5 in DDL</em>
+\code
+HDF5 "groupsf.h5" {
+GROUP "/" {
+GROUP "MyGroup" {
+GROUP "Group_A" {
+ DATASET "dset2" {
+    DATATYPE { H5T_STD_I32BE }
+    DATASPACE { SIMPLE ( 10, 2 ) / ( 10, 2 ) }
+    DATA {
+       1, 1,
+       2, 2,
+       3, 3,
+       4, 4,
+       5, 5,
+       6, 6,
+       7, 7,
+       8, 8,
+       9, 9,
+       10, 10
+    }
+ }
+}
+GROUP "Group_B" {
+}
+DATASET "dset1" {
+ DATATYPE { H5T_STD_I32BE }
+ DATASPACE { SIMPLE ( 3, 3 ) / ( 3, 3 ) }
+ DATA {
+    1, 1, 1,
+    2, 2, 2,
+    3, 3, 3
+ }
+}
+}
+}
+}
+\endcode
+
+<hr>
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref LearnBasics
+
+@page LBDsetSubRW Reading From or Writing To a Subset of a Dataset
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref LearnBasics
+<hr>
+
+\section secLBDsetSubRW Dataset Subsets
+There are two ways that you can select a subset in an HDF5 dataset and read or write to it:
+<ul><li>
+<strong>Hyperslab Selection</strong>:  The #H5Sselect_hyperslab call selects a logically contiguous
+collection of points in a dataspace, or a regular pattern of points or blocks in a dataspace.
+</li><li>
+<strong>Element Selection</strong>: The #H5Sselect_elements call selects elements in an array.
+</li></ul>
+
+HDF5 allows you to read from or write to a portion or subset of a dataset by:
+\li Selecting a Subset of the Dataset's Dataspace,
+\li Selecting a Memory Dataspace,
+\li Reading From or Writing to a Dataset Subset.
+
+\section secLBDsetSubRWSel Selecting a Subset of the Dataset's Dataspace
+First you must obtain the dataspace of a dataset in a file by calling #H5Dget_space.
+
+Then select a subset of that dataspace by calling #H5Sselect_hyperslab. The <em>offset</em>, <em>count</em>, <em>stride</em>
+and <em>block</em> parameters of this API define the shape and size of the selection. They must be arrays
+with the same number of dimensions as the rank of the dataset's dataspace. These arrays <strong>ALL</strong> work
+together to define a selection. A change to one of these arrays can affect the others.
+\li \em offset: An array that specifies the offset of the starting element of the specified hyperslab.
+\li \em count: An array that determines how many blocks to select from the dataspace in each dimension. If the block
+size for a dimension is one then the count is the number of elements along that dimension.
+\li \em stride: An array that allows you to sample elements along a dimension. For example, a stride of one (or NULL)
+will select every element along a dimension, a stride of two will select every other element, and a stride of three
+will select an element after every two elements.
+\li \em block: An array that determines the size of the element block selected from a dataspace. If the block size
+is one or NULL then the block size is a single element in that dimension.
+
+\section secLBDsetSubRWMem Selecting a Memory Dataspace
+You must select a memory dataspace in addition to a file dataspace before you can read a subset from or write a subset
+to a dataset. A memory dataspace can be specified by calling #H5Screate_simple.
+
+The memory dataspace passed to the read or write call must contain the same number of elements as the file dataspace.
+The number of elements in a dataspace selection can be determined with the #H5Sget_select_npoints API.
+
+\section secLBDsetSubRWSub Reading From or Writing To a Dataset Subset
+To read from or write to a dataset subset, the #H5Dread and #H5Dwrite routines are used. The memory and file dataspace
+identifiers from the selections that were made are passed into the read or write call. For example (C):
+\code
+    status = H5Dwrite (.., .., memspace_id, dataspace_id, .., ..);
+\endcode
+
+\section secLBDsetSubRWProg Programming Example
+
+\subsection subsecLBDsetSubRWProgDesc Description
+See \ref LBExamples for the examples used in the \ref LearnBasics tutorial.
+
+The example creates an 8 x 10 integer dataset in an HDF5 file. It then selects and writes to a 3 x 4 subset
+of the dataset created with the dimensions offset by 1 x 2. (If using Fortran, the dimensions will be swapped.
+The dataset will be 10 x 8, the subset will be 4 x 3, and the offset will be 2 x 1.)
+
+PLEASE NOTE that the examples and images below were created using C.
+
+The following image shows the dataset that gets written originally, and the subset of data that gets modified
+afterwards. Dimension 0 is vertical and Dimension 1 is horizontal as shown below:
+<table>
+<tr>
+<td>
+\image html LBDsetSubRWProg.png
+</td>
+</tr>
+</table>
+
+The subset on the right above is created using these values for offset, count stride, and block:
+\code
+offset = {1, 2}
+
+count = {3, 4}
+
+stride = {1, 1}
+
+block = {1, 1}
+\endcode
+
+\subsection subsecLBDsetSubRWProgExper Experiments with Different Selections
+Following are examples of changes that can be made to the example code provided to better understand
+how to make selections.
+
+\subsubsection subsubsecLBDsetSubRWProgExperOne Example 1
+By default the example code will select and write to a 3 x 4 subset. You can modify the count
+parameter in the example code to select a different subset, by changing the value of
+DIM0_SUB (C, C++) / dim0_sub (Fortran) near the top. Change its value to 7 to create a 7 x 4 subset:
+<table>
+<tr>
+<td>
+\image html imgLBDsetSubRW11.png
+</td>
+</tr>
+</table>
+
+If you were to change the subset to 8 x 4, the selection would be beyond the extent of the dimension:
+<table>
+<tr>
+<td>
+\image html imgLBDsetSubRW12.png
+</td>
+</tr>
+</table>
+
+The write will fail with the error: "<strong>file selection+offset not within extent</strong>"
+
+\subsubsection subsubsecLBDsetSubRWProgExperTwo Example 2
+In the example code provided, the memory and file dataspaces passed to the H5Dwrite call have the
+same size, 3 x 4 (DIM0_SUB x DIM1_SUB). Change the size of the memory dataspace to be 4 x 4 so that
+they do not match, and then compile:
+\code
+    dimsm[0] = DIM0_SUB + 1;
+    dimsm[1] = DIM1_SUB;
+    memspace_id = H5Screate_simple (RANK, dimsm, NULL);
+\endcode
+The code will fail with the error: "<strong>src and dest data spaces have different sizes</strong>"
+
+How many elements are in the memory and file dataspaces that were specified above? Add these lines:
+\code
+    hssize_t    size;
+  
+    /* Just before H5Dwrite call the following */
+    size = H5Sget_select_npoints (memspace_id);
+    printf ("\nmemspace_id size: %i\n", size);
+    size = H5Sget_select_npoints (dataspace_id);
+    printf ("dataspace_id size: %i\n", size);
+\endcode
+
+You should see these lines followed by the error:
+\code
+    memspace_id size: 16
+    dataspace_id size: 12
+\endcode
+
+\subsubsection subsubsecLBDsetSubRWProgExperThree Example 3
+This example shows the selection that occurs if changing the values of the <em>offset</em>, <em>count</em>,
+<em>stride</em> and <em>block</em> parameters in the example code.
+
+This will select two blocks. The <em>count</em> array specifies the number of blocks. The <em>block</em> array
+specifies the size of a block. The <em>stride</em> must be modified to accommodate the block <em>size</em>.
+<table>
+<tr>
+<td>
+\image html imgLBDsetSubRW31.png
+</td>
+</tr>
+</table>
+
+Now try modifying the count as shown below. The write will fail because the selection goes beyond the extent of the dimension:
+<table>
+<tr>
+<td>
+\image html imgLBDsetSubRW32.png
+</td>
+</tr>
+</table>
+
+If the offset were 1x1 (instead of 1x2), then the selection can be made:
+<table>
+<tr>
+<td>
+\image html imgLBDsetSubRW33.png
+</td>
+</tr>
+</table>
+
+The selections above were tested with the
+<a href="https://support.hdfgroup.org/ftp/HDF5/examples/howto/subset/h5_subsetbk.c">h5_subsetbk.c</a>
+example code. The memory dataspace was defined as one-dimensional.
+
+\subsection subsecLBDsetSubRWProgRem Remarks
+\li In addition to #H5Sselect_hyperslab, this example introduces the #H5Dget_space call to obtain the dataspace of a dataset.
+\li If using the default values for the stride and block parameters of #H5Sselect_hyperslab, then, for C you can specify NULL
+for these parameters, rather than passing in an array for each, and for Fortran 90 you can omit these parameters.
+
+<hr>
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref LearnBasics
+
+@page LBDatatypes Datatype Basics
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref LearnBasics
+<hr>
+
+\section secLBDtype What is a Datatype?
+A datatype is a collection of datatype properties which provide complete information for data conversion to or from that datatype.
+
+Datatypes in HDF5 can be grouped as follows:
+\li <strong>Pre-Defined Datatypes</strong>:   These are datatypes that are created by HDF5. They are actually opened
+(and closed) by HDF5, and can have a different value from one HDF5 session to the next.
+\li <strong>Derived Datatypes</strong>:   These are datatypes that are created or derived from the pre-defined datatypes.
+Although created from pre-defined types, they represent a category unto themselves. An example of a commonly used derived
+datatype is a string of more than one character.
+
+\section secLBDtypePre Pre-defined Datatypes
+The properties of pre-defined datatypes are:
+\li Pre-defined datatypes are opened and closed by HDF5.
+\li A pre-defined datatype is a handle and is NOT PERSISTENT. Its value can be different from one HDF5 session to the next.
+\li Pre-defined datatypes are Read-Only.
+\li As mentioned, other datatypes can be derived from pre-defined datatypes.
+
+There are two types of pre-defined datatypes, standard (file) and native.
+
+<h4>Standard</h4>
+A standard (or file) datatype can be:
+<ul>
+<li><strong>Atomic</strong>: A datatype which cannot be decomposed into smaller datatype units at the API level.
+The atomic datatypes are:
+<ul>
+<li>integer</li>
+<li>float</li>
+<li>string (1-character)</li>
+<li>date and time</li>
+<li>bitfield</li>
+<li>reference</li>
+<li>opaque</li>
+</ul>
+</li>
+<li><strong>Composite</strong>: An aggregation of one or more datatypes.
+Composite datatypes include:
+<ul>
+<li>array</li>
+<li>variable length</li>
+<li>enumeration</li>
+<li>compound datatypes</li>
+</ul>
+Array, variable length, and enumeration datatypes are defined in terms of a single atomic datatype,
+whereas a compound datatype is a datatype composed of a sequence of datatypes.
+</li>
+</ul>
+
+<table>
+<tr>
+<th><strong>Notes</strong></th>
+</tr>
+<tr>
+<td>
+\li  Standard pre-defined datatypes are the SAME on all platforms.
+\li  They are the datatypes that you see in an HDF5 file.
+\li  They are typically used when creating a dataset.
+</td>
+</tr>
+</table>
+
+<h4>Native</h4>
+Native pre-defined datatypes are used for memory operations, such as reading and writing. They are
+NOT THE SAME on different platforms. They are similar to C type names, and are aliased to the
+appropriate HDF5 standard pre-defined datatype for a given platform.
+
+For example, when on an Intel based PC, #H5T_NATIVE_INT is aliased to the standard pre-defined type,
+#H5T_STD_I32LE. On a MIPS machine, it is aliased to #H5T_STD_I32BE.
+<table>
+<tr>
+<th><strong>Notes</strong></th>
+</tr>
+<tr>
+<td>
+\li  Native datatypes are NOT THE SAME on all platforms.
+\li  Native datatypes simplify memory operations (read/write). The HDF5 library automatically converts as needed.
+\li  Native datatypes are NOT in an HDF5 File. The standard pre-defined datatype that a native datatype corresponds
+to is what you will see in the file. 
+</td>
+</tr>
+</table>
+
+<h4>Pre-Defined</h4>
+The following table shows the native types and the standard pre-defined datatypes they correspond
+to. (Keep in mind that HDF5 can convert between datatypes, so you can specify a buffer of a larger
+type for a dataset of a given type. For example, you can read a dataset that has a short datatype
+into a long integer buffer.)
+
+<table>
+<caption>Some HDF5 pre-defined native datatypes and corresponding standard (file) type</caption>
+<tr>
+<th><strong>C Type</strong></th>
+<th><strong>HDF5 Memory Type</strong></th>
+<th><strong>HDF5 File Type*</strong></th>
+</tr>
+<tr>
+<th span="3"><strong>Integer</strong></th>
+</tr>
+<tr>
+<td>int</td>
+<td>#H5T_NATIVE_INT</td>
+<td>#H5T_STD_I32BE or #H5T_STD_I32LE</td>
+</tr>
+<tr>
+<td>short</td>
+<td>#H5T_NATIVE_SHORT</td>
+<td>#H5T_STD_I16BE or #H5T_STD_I16LE</td>
+</tr>
+<tr>
+<td>long</td>
+<td>#H5T_NATIVE_LONG</td>
+<td>#H5T_STD_I32BE, #H5T_STD_I32LE,
+  #H5T_STD_I64BE or #H5T_STD_I64LE</td>
+</tr>
+<tr>
+<td>long long</td>
+<td>#H5T_NATIVE_LLONG</td>
+<td>#H5T_STD_I64BE or #H5T_STD_I64LE</td>
+</tr>
+<tr>
+<td>unsigned int</td>
+<td>#H5T_NATIVE_UINT</td>
+<td>#H5T_STD_U32BE or #H5T_STD_U32LE</td>
+</tr>
+<tr>
+<td>unsigned short</td>
+<td>#H5T_NATIVE_USHORT</td>
+<td>#H5T_STD_U16BE or #H5T_STD_U16LE</td>
+</tr>
+<tr>
+<td>unsigned long</td>
+<td>#H5T_NATIVE_ULONG</td>
+<td>#H5T_STD_U32BE, #H5T_STD_U32LE,
+  #H5T_STD_U64BE or #H5T_STD_U64LE</td>
+</tr>
+<tr>
+<td>unsigned long long</td>
+<td>#H5T_NATIVE_ULLONG</td>
+<td>#H5T_STD_U64BE or #H5T_STD_U64LE</td>
+</tr>
+<tr>
+<th span="3"><strong>Float</strong></th>
+</tr>
+<tr>
+<td>float</td>
+<td>#H5T_NATIVE_FLOAT</td>
+<td>#H5T_IEEE_F32BE or #H5T_IEEE_F32LE</td>
+</tr>
+<tr>
+<td>double</td>
+<td>#H5T_NATIVE_DOUBLE</td>
+<td>#H5T_IEEE_F64BE or #H5T_IEEE_F64LE</td>
+</tr>
+</table>
+
+<table>
+<caption>Some HDF5 pre-defined native datatypes and corresponding standard (file) type</caption>
+<tr>
+<th><strong>F90 Type</strong></th>
+<th><strong>HDF5 Memory Type</strong></th>
+<th><strong>HDF5 File Type*</strong></th>
+</tr>
+<tr>
+<td>integer</td>
+<td>H5T_NATIVE_INTEGER</td>
+<td>#H5T_STD_I32BE(8,16) or #H5T_STD_I32LE(8,16)</td>
+</tr>
+<tr>
+<td>real</td>
+<td>H5T_NATIVE_REAL</td>
+<td>#H5T_IEEE_F32BE or #H5T_IEEE_F32LE</td>
+</tr>
+<tr>
+<td>double-precision</td>
+<td>#H5T_NATIVE_DOUBLE</td>
+<td>#H5T_IEEE_F64BE or #H5T_IEEE_F64LE</td>
+</tr>
+</table>
+
+<table>
+<tr>
+<td>* Note that the HDF5 File Types listed are those that are most commonly created.
+  The file type created depends on the compiler switches and platforms being
+  used. For example, on the Cray an integer is 64-bit, and using #H5T_NATIVE_INT (C)
+  or H5T_NATIVE_INTEGER (F90) would result in an #H5T_STD_I64BE file type.</td>
+</tr>
+</table>
+
+The following code is an example of when you would use standard pre-defined datatypes vs. native types:
+\code
+   #include "hdf5.h"
+
+   main() {
+
+      hid_t       file_id, dataset_id, dataspace_id;  
+      herr_t      status;
+      hsize_t     dims[2]={4,6};
+      int         i, j, dset_data[4][6];
+
+      for (i = 0; i < 4; i++)
+           for (j = 0; j < 6; j++)
+            dset_data[i][j] = i * 6 + j + 1;
+
+      file_id = H5Fcreate ("dtypes.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+
+      dataspace_id = H5Screate_simple (2, dims, NULL);
+
+      dataset_id = H5Dcreate (file_id, "/dset", H5T_STD_I32BE, dataspace_id, 
+                              H5P_DEFAULT);
+
+      status = H5Dwrite (dataset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, 
+                         H5P_DEFAULT, dset_data);
+
+      status = H5Dclose (dataset_id);
+
+      status = H5Fclose (file_id);
+   }
+\endcode
+By using the native types when reading and writing, the code that reads from or writes to a dataset
+can be the same for different platforms.
+
+Can native types also be used when creating a dataset? Yes. However, just be aware that the resulting
+datatype in the file will be one of the standard pre-defined types and may be different than expected.
+
+What happens if you do not use the correct native datatype for a standard (file) datatype? Your data
+may be incorrect or not what you expect.
+
+\section secLBDtypeDer Derived Datatypes
+ANY pre-defined datatype can be used to derive user-defined datatypes.
+
+To create a datatype derived from a pre-defined type:
+<ol>
+<li>Make a copy of the pre-defined datatype:
+\code
+    tid = H5Tcopy (H5T_STD_I32BE);
+\endcode
+</li>
+<li>Change the datatype.</li>
+</ol>
+
+There are numerous datatype functions that allow a user to alter a pre-defined datatype. See
+\ref subsecLBDtypeSpecStr below for a simple example.
+
+Refer to the \ref H5T in the \ref RM. Example functions are #H5Tset_size and #H5Tset_precision.
+
+\section secLBDtypeSpec Specific Datatypes
+On the <a href="https://portal.hdfgroup.org/display/HDF5/Examples+by+API">Examples by API</a>
+page under <a href="https://confluence.hdfgroup.org/display/HDF5/Examples+by+API#ExamplesbyAPI-datatypes">Datatypes</a>
+you will find many example programs for creating and reading datasets with different datatypes.
+
+Below is additional information on some of the datatypes. See
+the <a href="https://portal.hdfgroup.org/display/HDF5/Examples+by+API">Examples by API</a>
+page for examples of these datatypes.
+
+\subsection subsecLBDtypeSpec Array Datatype vs Array Dataspace
+#H5T_ARRAY is a datatype, and it should not be confused with the dataspace of a dataset. The dataspace
+of a dataset can consist of a regular array of elements. For example, the datatype for a dataset
+could be an atomic datatype like integer, and the dataset could be an N-dimensional appendable array,
+as specified by the dataspace. See #H5Screate and #H5Screate_simple for details. 
+
+Unlimited dimensions and subsetting are not supported when using the #H5T_ARRAY datatype.
+
+The #H5T_ARRAY datatype was primarily created to address the simple case of a compound datatype
+when all members of the compound datatype are of the same type and there is no need to subset by
+compound datatype members. Creation of such a datatype is more efficient and I/O also requires
+less work, because there is no alignment involved.
+
+\subsection subsecLBDtypeSpecArr Array Datatype
+The array class of datatypes, #H5T_ARRAY, allows the construction of true, homogeneous,
+multi-dimensional arrays. Since these are homogeneous arrays, each element of the array
+will be of the same datatype, designated at the time the array is created.
+
+Users may be confused by this datatype, as opposed to a dataset with a simple atomic
+datatype (eg. integer) that is an array. See subsecLBDtypeSpec for more information.
+
+Arrays can be nested. Not only is an array datatype used as an element of an HDF5 dataset,
+but the elements of an array datatype may be of any datatype, including another array datatype.
+
+Array datatypes <strong>cannot be subdivided for I/O</strong>; the entire array must be transferred from one
+dataset to another.
+
+Within certain limitations, outlined in the next paragraph, array datatypes may be N-dimensional
+and of any dimension size. <strong>Unlimited dimensions, however, are not supported</strong>. Functionality similar
+to unlimited dimension arrays is available through the use of variable-length datatypes.
+
+The maximum number of dimensions, i.e., the maximum rank, of an array datatype is specified by
+the HDF5 library constant #H5S_MAX_RANK. The minimum rank is 1 (one). All dimension sizes must
+be greater than 0 (zero).
+
+One array datatype may only be converted to another array datatype if the number of dimensions
+and the sizes of the dimensions are equal and the datatype of the first array's elements can be
+converted to the datatype of the second array's elements.
+
+\subsubsection subsubsecLBDtypeSpecArrAPI Array Datatype APIs
+There are three functions that are specific to array datatypes: one, #H5Tarray_create, for creating
+an array datatype, and two, #H5Tget_array_ndims and #H5Tget_array_dims
+for working with existing array datatypes.
+
+<h4>Creating</h4>
+The function #H5Tarray_create creates a new array datatype object. Parameters specify
+\li the base datatype of each element of the array,
+\li the rank of the array, i.e., the number of dimensions,
+\li the size of each dimension, and
+\li the dimension permutation of the array, i.e., whether the elements of the array are listed in C or FORTRAN order.
+
+<h4>Working with existing array datatypes</h4>
+When working with existing arrays, one must first determine the the rank, or number of dimensions, of the array.
+
+The function #H5Tget_array_dims returns the rank of a specified array datatype.
+
+In many instances, one needs further information. The function #H5Tget_array_dims retrieves the
+permutation of the array and the size of each dimension.
+
+\subsection subsecLBDtypeSpecCmpd Compound
+
+\subsubsection subsubsecLBDtypeSpecCmpdProp Properties of compound datatypes
+A compound datatype is similar to a struct in C or a common block in Fortran. It is a collection of
+one or more atomic types or small arrays of such types. To create and use of a compound datatype
+you need to refer to various properties of the data compound datatype:
+\li It is of class compound.
+\li It has a fixed total size, in bytes.
+\li It consists of zero or more members (defined in any order) with unique names and which occupy non-overlapping regions within the datum.
+\li Each member has its own datatype.
+\li Each member is referenced by an index number between zero and N-1, where N is the number of members in the compound datatype.
+\li Each member has a name which is unique among its siblings in a compound datatype.
+\li Each member has a fixed byte offset, which is the first byte (smallest byte address) of that member in a compound datatype.
+\li Each member can be a small array of up to four dimensions.
+
+Properties of members of a compound datatype are defined when the member is added to the compound type and cannot be subsequently modified.
+
+\subsubsection subsubsecLBDtypeSpecCmpdDef Defining compound datatypes
+Compound datatypes must be built out of other datatypes. First, one creates an empty compound
+datatype and specifies its total size. Then members are added to the compound datatype in any order.
+
+Member names. Each member must have a descriptive name, which is the key used to uniquely identify
+the member within the compound datatype. A member name in an HDF5 datatype does not necessarily
+have to be the same as the name of the corresponding member in the C struct in memory, although
+this is often the case. Nor does one need to define all members of the C struct in the HDF5
+compound datatype (or vice versa).
+
+Offsets. Usually a C struct will be defined to hold a data point in memory, and the offsets of the
+members in memory will be the offsets of the struct members from the beginning of an instance of the
+struct. The library defines the macro to compute the offset of a member within a struct:
+\code
+  HOFFSET(s,m)
+\endcode
+This macro computes the offset of member m within a struct variable s.
+
+Here is an example in which a compound datatype is created to describe complex numbers whose type
+is defined by the complex_t struct.
+\code
+typedef struct {
+   double re;   /*real part */
+   double im;   /*imaginary part */
+} complex_t;
+
+complex_t tmp;  /*used only to compute offsets */
+hid_t complex_id = H5Tcreate (H5T_COMPOUND, sizeof tmp);
+H5Tinsert (complex_id, "real", HOFFSET(tmp,re), H5T_NATIVE_DOUBLE);
+H5Tinsert (complex_id, "imaginary", HOFFSET(tmp,im), H5T_NATIVE_DOUBLE);
+\endcode
+
+\subsection subsecLBDtypeSpecRef Reference
+There are two types of Reference datatypes in HDF5:
+\li \ref subsubsecLBDtypeSpecRefObj
+\li \ref subsubsecLBDtypeSpecRefDset
+
+\subsubsection subsubsecLBDtypeSpecRefObj Reference to objects
+In HDF5, objects (i.e. groups, datasets, and named datatypes) are usually accessed by name.
+There is another way to access stored objects -- by reference.
+
+An object reference is based on the relative file address of the object header in the file
+and is constant for the life of the object. Once a reference to an object is created and
+stored in a dataset in the file, it can be used to dereference the object it points to.
+References are handy for creating a file index or for grouping related objects by storing
+references to them in one dataset.
+
+<h4>Creating and storing references to objects</h4>
+The following steps are involved in creating and storing file references to objects:
+<ol>
+<li>Create the objects or open them if they already exist in the file.</li>
+<li>Create a dataset to store the objects' references, by specifying #H5T_STD_REF_OBJ as the datatype</li>
+<li>Create and store references to the objects in a buffer, using #H5Rcreate.</li>
+<li>Write a buffer with the references to the dataset, using #H5Dwrite with the #H5T_STD_REF_OBJ datatype.</li>
+</ol>
+
+<h4>Reading references and accessing objects using references</h4>
+The following steps are involved:
+<ol>
+<li>Open the dataset with the references and read them. The #H5T_STD_REF_OBJ datatype must be used to describe the memory datatype.</li>
+<li>Use the read reference to obtain the identifier of the object the reference points to using #H5Rdereference.</li>
+<li>Open the dereferenced object and perform the desired operations.</li>
+<li>Close all objects when the task is complete.</li>
+</ol>
+
+\subsubsection subsubsecLBDtypeSpecRefDset Reference to a dataset region
+A dataset region reference points to a dataset selection in another dataset.
+A reference to the dataset selection (region) is constant for the life of the dataset.
+
+<h4>Creating and storing references to dataset regions</h4>
+The following steps are involved in creating and storing references to a dataset region:
+\li Create a dataset to store the dataset region (selection), by passing in #H5T_STD_REF_DSETREG for the datatype when calling #H5Dcreate.
+\li Create selection(s) in existing dataset(s) using #H5Sselect_hyperslab and/or #H5Sselect_elements.
+\li Create reference(s) to the selection(s) using #H5Rcreate and store them in a buffer.
+\li Write the references to the dataset regions in the file.
+\li Close all objects.
+
+<h4>Reading references to dataset regions</h4>
+The following steps are involved in reading references to dataset regions and referenced dataset regions (selections).
+<ol>
+<li>Open and read the dataset containing references to the dataset regions.
+The datatype #H5T_STD_REF_DSETREG must be used during read operation.</li>
+<li>Use #H5Rdereference to obtain the dataset identifier from the read dataset region reference.
+    OR
+    Use #H5Rget_region to obtain the dataspace identifier for the dataset containing the selection from the read dataset region reference.
+</li>
+<li>With the dataspace identifier, the \ref H5S interface functions, H5Sget_select_*,
+can be used to obtain information about the selection.</li>
+<li>Close all objects when they are no longer needed.</li>
+</ol>
+
+The dataset with the region references was read by #H5Dread with the #H5T_STD_REF_DSETREG datatype specified.
+
+The read reference can be used to obtain the dataset identifier by calling #H5Rdereference or by obtaining
+obtain spacial information (dataspace and selection) with the call to #H5Rget_region.
+
+The reference to the dataset region has information for both the dataset itself and its selection. In both functions:
+\li The first parameter is an identifier of the dataset with the region references.
+\li The second parameter specifies the type of reference stored. In this example, a reference to the dataset region is stored.
+\li The third parameter is a buffer containing the reference of the specified type.
+
+This example introduces several H5Sget_select_* functions used to obtain information about selections:
+<table>
+<caption>Examples of HDF5 predefined datatypes</caption>
+<tr>
+<th><strong>Function</strong></th>
+<th><strong>Description</strong></th>
+</tr>
+<tr>
+<td>#H5Sget_select_npoints</td>
+<td>Returns the number of elements in the hyperslab</td>
+</tr>
+<tr>
+<td>#H5Sget_select_hyper_nblocks</td>
+<td>Returns the number of blocks in the hyperslab</td>
+</tr>
+<tr>
+<td>#H5Sget_select_hyper_blocklist</td>
+<td>Returns the "lower left" and "upper right" coordinates of the blocks in the hyperslab selection</td>
+</tr>
+<tr>
+<td>#H5Sget_select_bounds</td>
+<td>Returns the coordinates of the "minimal" block containing a hyperslab selection</td>
+</tr>
+<tr>
+<td>#H5Sget_select_elem_npoints</td>
+<td>Returns the number of points in the element selection</td>
+</tr>
+<tr>
+<td>#H5Sget_select_elem_pointlist</td>
+<td>Returns the coordinates of points in the element selection</td>
+</tr>
+</table>
+
+\subsection subsecLBDtypeSpecStr String
+A simple example of creating a derived datatype is using the string datatype,
+#H5T_C_S1 (#H5T_FORTRAN_S1) to create strings of more than one character. Strings
+can be stored as either fixed or variable length, and may have different rules
+for padding of unused storage.
+
+\subsubsection subsecLBDtypeSpecStrFix Fixed Length 5-character String Datatype
+\code
+    hid_t strtype;                     /* Datatype ID */
+    herr_t status;
+
+    strtype = H5Tcopy (H5T_C_S1);
+    status = H5Tset_size (strtype, 5); /* create string of length 5 */
+\endcode
+
+\subsubsection subsecLBDtypeSpecStrVar Variable Length String Datatype
+\code
+    strtype = H5Tcopy (H5T_C_S1);
+    status = H5Tset_size (strtype, H5T_VARIABLE);
+\endcode
+
+The ability to derive datatypes from pre-defined types allows users to create any number of datatypes,
+from simple to very complex.
+
+As the term implies, variable length strings are strings of varying lengths. They are stored internally
+in a heap, potentially impacting efficiency in the following ways:
+\li Heap storage requires more space than regular raw data storage.
+\li Heap access generally reduces I/O efficiency because it requires individual read or write operations
+for each data element rather than one read or write per dataset or per data selection.
+\li A variable length dataset consists of pointers to the heaps of data, not the actual data. Chunking
+and filters, including compression, are not available for heaps.
+
+See \ref subsubsec_datatype_other_strings in the \ref UG, for more information on how fixed and variable
+length strings are stored.
+
+\subsection subsecLBDtypeSpecVL Variable Length
+Variable-length (VL) datatypes are sequences of an existing datatype (atomic, VL, or compound)
+which are not fixed in length from one dataset location to another. In essence, they are similar
+to C character strings -- a sequence of a type which is pointed to by a particular type of
+pointer -- although they are implemented more closely to FORTRAN strings by including an explicit
+length in the pointer instead of using a particular value to terminate the sequence.
+
+VL datatypes are useful to the scientific community in many different ways, some of which are listed below:
+<ul>
+<li>Ragged arrays: Multi-dimensional ragged arrays can be implemented with the last (fastest changing)
+dimension being ragged by using a VL datatype as the type of the element stored. (Or as a field in a compound datatype.)
+</li>
+<li>Fractal arrays: If a compound datatype has a VL field of another compound type with VL fields
+(a nested VL datatype), this can be used to implement ragged arrays of ragged arrays, to whatever
+nesting depth is required for the user.
+</li>
+<li>Polygon lists: A common storage requirement is to efficiently store arrays of polygons with
+different numbers of vertices. VL datatypes can be used to efficiently and succinctly describe an
+array of polygons with different numbers of vertices.
+</li>
+<li>Character strings: Perhaps the most common use of VL datatypes will be to store C-like VL character
+strings in dataset elements or as attributes of objects.
+</li>
+<li>Indices: An array of VL object references could be used as an index to all the objects in a file
+which contain a particular sequence of dataset values. Perhaps an array something like the following:
+\code
+    Value1: Object1, Object3,  Object9
+    Value2: Object0, Object12, Object14, Object21, Object22
+    Value3: Object2
+    Value4: <none>
+    Value5: Object1, Object10, Object12
+        .
+        .
+\endcode
+</li>
+<li>Object Tracking: An array of VL dataset region references can be used as a method of tracking
+objects or features appearing in a sequence of datasets. Perhaps an array of them would look like:
+\code
+    Feature1: Dataset1:Region,  Dataset3:Region,  Dataset9:Region
+    Feature2: Dataset0:Region,  Dataset12:Region, Dataset14:Region,
+              Dataset21:Region, Dataset22:Region
+    Feature3: Dataset2:Region
+    Feature4: <none>
+    Feature5: Dataset1:Region,  Dataset10:Region, Dataset12:Region
+        .
+        .
+\endcode
+</li>
+</ul>
+
+\subsubsection subsubsecLBDtypeSpecVLMem Variable-length datatype memory management
+With each element possibly being of different sequence lengths for a dataset with a VL datatype,
+the memory for the VL datatype must be dynamically allocated. Currently there are two methods
+of managing the memory for VL datatypes: the standard C malloc/free memory allocation routines
+or a method of calling user-defined memory management routines to allocate or free memory. Since
+the memory allocated when reading (or writing) may be complicated to release, an HDF5 routine is
+provided to traverse a memory buffer and free the VL datatype information without leaking memory.
+
+\subsubsection subsubsecLBDtypeSpecVLDiv Variable-length datatypes cannot be divided
+VL datatypes are designed so that they cannot be subdivided by the library with selections, etc.
+This design was chosen due to the complexities in specifying selections on each VL element of a
+dataset through a selection API that is easy to understand. Also, the selection APIs work on
+dataspaces, not on datatypes. At some point in time, we may want to create a way for dataspaces
+to have VL components to them and we would need to allow selections of those VL regions, but
+that is beyond the scope of this document.
+
+\subsubsection subsubsecLBDtypeSpecVLErr What happens if the library runs out of memory while reading?
+It is possible for a call to #H5Dread to fail while reading in VL datatype information if the memory
+required exceeds that which is available. In this case, the #H5Dread call will fail gracefully and any
+VL data which has been allocated prior to the memory shortage will be returned to the system via the
+memory management routines detailed below. It may be possible to design a partial read API function
+at a later date, if demand for such a function warrants.
+
+\subsubsection subsubsecLBDtypeSpecVLStr Strings as variable-length datatypes
+Since character strings are a special case of VL data that is implemented in many different ways on
+different machines and in different programming languages, they are handled somewhat differently from
+other VL datatypes in HDF5.
+
+HDF5 has native VL strings for each language API, which are stored the same way on disk, but are
+exported through each language API in a natural way for that language. When retrieving VL strings
+from a dataset, users may choose to have them stored in memory as a native VL string or in HDF5's
+#hvl_t struct for VL datatypes.
+
+VL strings may be created in one of two ways: by creating a VL datatype with a base type of
+#H5T_C_S1 and setting its length to #H5T_VARIABLE. The second method is used to access native VL strings in memory. The
+library will convert between the two types, but they are stored on disk using different datatypes
+and have different memory representations.
+
+Multi-byte character representations, such as \em UNICODE or \em wide characters in C/C++, will need the
+appropriate character and string datatypes created so that they can be described properly through
+the datatype API. Additional conversions between these types and the current ASCII characters
+will also be required.
+
+Variable-width character strings (which might be compressed data or some other encoding) are not
+currently handled by this design. We will evaluate how to implement them based on user feedback.
+
+\subsubsection subsubsecLBDtypeSpecVLAPIs Variable-length datatype APIs
+
+<h4>Creation</h4>
+VL datatypes are created with the #H5Tvlen_create function as follows:
+\code
+type_id = H5Tvlen_create(hid_t base_type_id);
+\endcode
+The base datatype will be the datatype that the sequence is composed of, characters for character
+strings, vertex coordinates for polygon lists, etc. The base datatype specified for the VL datatype
+can be of any HDF5 datatype, including another VL datatype, a compound datatype, or an atomic datatype.
+
+<h4>Querying base datatype of VL datatype</h4>
+It may be necessary to know the base datatype of a VL datatype before memory is allocated, etc.
+The base datatype is queried with the #H5Tget_super function, described in the \ref H5T documentation.
+
+<h4>Querying minimum memory required for VL information</h4>
+It order to predict the memory usage that #H5Dread may need to allocate to store VL data while
+reading the data, the #H5Dvlen_get_buf_size function is provided:
+\code
+herr_t H5Dvlen_get_buf_size(hid_t dataset_id, hid_t type_id, hid_t space_id, hsize_t *size)
+\endcode
+This routine checks the number of bytes required to store the VL data from the dataset, using
+the \em space_id for the selection in the dataset on disk and the \em type_id for the memory representation
+of the VL data in memory. The *\em size value is modified according to how many bytes are required
+to store the VL data in memory.
+
+<h4>Specifying how to manage memory for the VL datatype</h4>
+The memory management method is determined by dataset transfer properties passed into the
+#H5Dread and #H5Dwrite functions with the dataset transfer property list.
+
+Default memory management is set by using #H5P_DEFAULT for the dataset transfer
+property list identifier. If #H5P_DEFAULT is used with #H5Dread, the system \em malloc and \em free
+calls will be used for allocating and freeing memory. In such a case, #H5P_DEFAULT should
+also be passed as the property list identifier to #H5Dvlen_reclaim.
+
+The rest of this subsection is relevant only to those who choose not to use default memory management.
+
+The user can choose whether to use the system \em malloc and \em free calls or user-defined, or custom,
+memory management functions. If user-defined memory management functions are to be used, the
+memory allocation and free routines must be defined via #H5Pset_vlen_mem_manager(), as follows:
+\code
+herr_t H5Pset_vlen_mem_manager(hid_t plist_id, H5MM_allocate_t alloc, void *alloc_info, H5MM_free_t free, void *free_info)
+\endcode
+The \em alloc and \em free parameters identify the memory management routines to be used. If the user
+has defined custom memory management routines, \em alloc and/or \em free should be set to make those
+routine calls (i.e., the name of the routine is used as the value of the parameter); if the user
+prefers to use the system's \em malloc and/or \em free, the \em alloc and \em free parameters, respectively, should be set to \em NULL
+
+The prototypes for the user-defined functions would appear as follows:
+\code
+typedef void *(*H5MM_allocate_t)(size_t size, void *info) ; typedef void (*H5MM_free_t)(void *mem, void *free_info) ;
+\endcode
+The \em alloc_info and \em free_info parameters can be used to pass along any required information to
+the user's memory management routines.
+
+In summary, if the user has defined custom memory management routines, the name(s) of the routines
+are passed in the \em alloc and \em free parameters and the custom routines' parameters are passed in the
+\em alloc_info and \em free_info parameters. If the user wishes to use the system \em malloc and \em free functions,
+the \em alloc and/or \em free parameters are set to \em NULL and the \em alloc_info and \em free_info parameters are ignored.
+
+<h4>Recovering memory from VL buffers read in</h4>
+The complex memory buffers created for a VL datatype may be reclaimed with the #H5Dvlen_reclaim
+function call, as follows:
+\code
+herr_t H5Dvlen_reclaim(hid_t type_id, hid_t space_id, hid_t plist_id, void *buf);
+\endcode
+
+The \em type_id must be the datatype stored in the buffer, \em space_id describes the selection for the
+memory buffer to free the VL datatypes within, \em plist_id is the dataset transfer property list
+which was used for the I/O transfer to create the buffer, and \em buf is the pointer to the buffer
+to free the VL memory within. The VL structures (#hvl_t) in the user's buffer are modified to zero
+out the VL information after it has been freed.
+
+If nested VL datatypes were used to create the buffer, this routine frees them from the bottom up,
+releasing all the memory without creating memory leaks.
+
+<hr>
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref LearnBasics
+
+*/
diff --git a/doxygen/dox/LearnBasics3.dox b/doxygen/dox/LearnBasics3.dox
new file mode 100644
index 0000000..2fe0f52
--- /dev/null
+++ b/doxygen/dox/LearnBasics3.dox
@@ -0,0 +1,1015 @@
+/** @page LBPropsList Property Lists Basics
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref LearnBasics
+<hr>
+
+\section secLBPList What is a Property (or Property List)?
+In HDF5, a property or property list is a characteristic or feature associated with an HDF5 object.
+There are default properties which handle the most common needs. These default properties are
+specified by passing in #H5P_DEFAULT for the Property List parameter of a function. Default properties
+can be modified by use of the \ref H5P interface and function parameters.
+
+The \ref H5P API allows a user to take advantage of the more powerful features in HDF5. It typically
+supports unusual cases when creating or accessing HDF5 objects. There is a programming model for
+working with Property Lists in HDF5 (see below).
+
+For examples of modifying a property list, see these tutorial topics:
+\li \see \ref LBDsetLayout
+\li \see \ref LBExtDset
+\li \see \ref LBComDset
+
+There are many Property Lists associated with creating and accessing objects in HDF5. See the
+\ref H5P Interface documentation in the HDF5 \ref RM for a list of the different
+properties associated with HDF5 interfaces.
+
+In summary:
+\li Properties are features of HDF5 objects, that can be changed by use of the Property List API and function parameters.
+\li Property lists provide a mechanism for adding functionality to HDF5 calls without increasing the number of arguments used for a given call.
+\li The Property List API supports unusual cases when creating and accessing HDF5 objects.
+
+\section secLBPListProg Programming Model
+Default properties are specified by simply passing in #H5P_DEFAULT (C) / H5P_DEFAULT_F (F90) for
+the property list parameter in those functions for which properties can be changed.
+
+The programming model for changing a property list is as follows:
+\li Create a copy or "instance" of the desired pre-defined property type, using the #H5Pcreate call. This
+will return a property list identifier. Please see the \ref RM entry for #H5Pcreate, for a comprehensive
+list of the property types.
+\li With the property list identifier, modify the property, using the \ref H5P APIs.
+\li Modify the object feature, by passing the property list identifier into the corresponding HDF5 object function.
+\li Close the property list when done, using #H5Pclose.
+
+<hr>
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref LearnBasics
+
+@page LBDsetLayout Dataset Storage Layout
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref LearnBasics
+<hr>
+
+\section secLBDsetLayoutDesc Description of a Dataset
+
+\section secLBDsetLayout Dataset Storage Layout
+The storage information, or storage layout, defines how the raw data values in the dataset are
+physically stored on disk. There are three ways that a dataset can be stored:
+\li contiguous
+\li chunked
+\li compact
+
+See the #H5Pset_layout/#H5Pget_layout APIs for details.
+
+\subsection subsecLBDsetLayoutCont Contiguous
+If the storage layout is contiguous, then the raw data values will be stored physically adjacent
+to each other in the HDF5 file (in one contiguous block). This is the default layout for a dataset.
+In other words, if you do not explicitly change the storage layout for the dataset, then it will
+be stored contiguously.
+<table>
+<tr>
+<td>
+\image html tutr-locons.png
+</td>
+</tr>
+</table>
+
+\subsection subsecLBDsetLayoutChunk Chunked
+With a chunked storage layout the data is stored in equal-sized blocks or chunks of
+a pre-defined size. The HDF5 library always writes and reads the entire chunk:
+<table>
+<tr>
+<td>
+\image html tutr-lochk.png
+</td>
+</tr>
+</table>
+
+Each chunk is stored as a separate contiguous block in the HDF5 file. There is a chunk index
+which keeps track of the chunks associated with a dataset:
+<table>
+<tr>
+<td>
+\image html tutr-lochks.png
+</td>
+</tr>
+</table>
+
+
+\subsubsection susubsecLBDsetLayoutChunkWhy Why Chunking ?
+Chunking is required for enabling compression and other filters, as well as for creating extendible
+or unlimited dimension datasets.
+
+It is also commonly used when subsetting very large datasets. Using the chunking layout can
+greatly improve performance when subsetting large datasets, because only the chunks required
+will need to be accessed. However, it is easy to use chunking without considering the consequences
+of the chunk size, which can lead to strikingly poor performance.
+
+Note that a chunk always has the same rank as the dataset and the chunk's dimensions do not need
+to be factors of the dataset dimensions.
+
+Writing or reading a chunked dataset is transparent to the application. You would use the same
+set of operations that you would use for a contiguous dataset. For example:
+\code
+   H5Dopen (...);
+   H5Sselect_hyperslab (...);
+   H5Dread (...);
+\endcode
+
+\subsubsection susubsecLBDsetLayoutChunkProb Problems Using Chunking
+Issues that can cause performance problems with chunking include:
+\li Chunks are too small.
+If a very small chunk size is specified for a dataset it can cause the dataset to be excessively
+large and it can result in degraded performance when accessing the dataset. The smaller the chunk
+size the more chunks that HDF5 has to keep track of, and the more time it will take to search for a chunk.
+\li Chunks are too large.
+An entire chunk has to be read and uncompressed before performing an operation. There can be a
+performance penalty for reading a small subset, if the chunk size is substantially larger than
+the subset. Also, a dataset may be larger than expected if there are chunks that only contain a
+small amount of data.
+\li A chunk does not fit in the Chunk Cache.
+Every chunked dataset has a chunk cache associated with it that has a default size of 1 MB. The
+purpose of the chunk cache is to improve performance by keeping chunks that are accessed frequently
+in memory so that they do not have to be accessed from disk. If a chunk is too large to fit in the
+chunk cache, it can significantly degrade performance. However, the size of the chunk cache can be
+increased by calling #H5Pset_chunk_cache.
+
+It is a good idea to:
+\li Avoid very small chunk sizes, and be aware of the 1 MB chunk cache size default.
+\li Test the data with different chunk sizes to determine the optimal chunk size to use.
+\li Consider the chunk size in terms of the most common access patterns that will be used once the dataset has been created.
+
+\subsection subsecLBDsetLayoutCom Compact
+A compact dataset is one in which the raw data is stored in the object header of the dataset.
+This layout is for very small datasets that can easily fit in the object header.
+
+The compact layout can improve storage and access performance for files that have many very tiny
+datasets. With one I/O access both the header and data values can be read. The compact layout reduces
+the size of a file, as the data is stored with the header which will always be allocated for a dataset.
+However, the object header is 64 KB in size, so this layout can only be used for very small datasets.
+
+\section secLBDsetLayoutProg Programming Model to Modify the Storage Layout
+To modify the storage layout, the following steps must be done:
+\li Create a Dataset Creation Property list. (See #H5Pcreate)
+\li Modify the property list.
+To use chunked storage layout, call: #H5Pset_chunk
+To use the compact storage layout, call: #H5Pset_layout
+\li Create a dataset with the modified property list. (See #H5Dcreate)
+\li Close the property list. (See #H5Pclose)
+For example code, see the \ref HDF5Examples page.
+Specifically look at the <a href="https://portal.hdfgroup.org/display/HDF5/Examples+by+API">Examples by API</a>.
+There are examples for different languages.
+
+The C example to create a chunked dataset is:
+<a href="https://support.hdfgroup.org/ftp/HDF5/examples/examples-by-api/hdf5-examples/1_8/C/H5D/h5ex_d_chunk.c">h5ex_d_chunk.c</a>
+The C example to create a compact dataset is:
+<a href="https://support.hdfgroup.org/ftp/HDF5/examples/examples-by-api/hdf5-examples/1_8/C/H5D/h5ex_d_compact.c">h5ex_d_compact.c</a>
+
+\section secLBDsetLayoutChange Changing the Layout after Dataset Creation
+The dataset layout is a Dataset Creation Property List. This means that once the dataset has been
+created the dataset layout cannot be changed. The h5repack utility can be used to write a file
+to a new with a new layout.
+
+\section secLBDsetLayoutSource Sources of Information
+<a href="https://confluence.hdfgroup.org/display/HDF5/Chunking+in+HDF5">Chunking in HDF5</a>
+(See the documentation on <a href="https://confluence.hdfgroup.org/display/HDF5/Advanced+Topics+in+HDF5">Advanced Topics in HDF5</a>)
+\see \ref sec_plist in the HDF5 \ref UG.
+
+<hr>
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref LearnBasics
+
+
+@page LBExtDset Extendible Datasets
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref LearnBasics
+<hr>
+
+\section secLBExtDsetCreate Creating an Extendible Dataset
+An extendible dataset is one whose dimensions can grow. HDF5 allows you to define a dataset to have
+certain initial dimensions, then to later increase the size of any of the initial dimensions.
+
+HDF5 requires you to use chunking to define extendible datasets. This makes it possible to extend
+datasets efficiently without having to excessively reorganize storage. (To use chunking efficiently,
+be sure to see the advanced topic, <a href="https://confluence.hdfgroup.org/display/HDF5/Chunking+in+HDF5">Chunking in HDF5</a>.)
+
+The following operations are required in order to extend a dataset:
+\li Declare the dataspace of the dataset to have unlimited dimensions for all dimensions that might eventually be extended.
+\li Set dataset creation properties to enable chunking.
+\li Create the dataset.
+\li Extend the size of the dataset.
+
+\section secLBExtDsetProg Programming Example
+
+\subsection subsecLBExtDsetProgDesc Description
+See \ref LBExamples for the examples used in the \ref LearnBasics tutorial.
+
+The example shows how to create a 3 x 3 extendible dataset, write to that dataset, extend the dataset
+to 10x3, and write to the dataset again.
+
+For details on compiling an HDF5 application:
+[ \ref LBCompiling ]
+
+\subsection subsecLBExtDsetProgRem Remarks
+\li An unlimited dimension dataspace is specified with the #H5Screate_simple call, by passing in
+#H5S_UNLIMITED as an element of the maxdims array.
+\li The #H5Pcreate call creates a new property as an instance of a property list class. For creating
+an extendible array dataset, pass in #H5P_DATASET_CREATE for the property list class.
+\li The #H5Pset_chunk call modifies a Dataset Creation Property List instance to store a chunked
+layout dataset and sets the size of the chunks used.
+\li To extend an unlimited dimension dataset use the the #H5Dset_extent call. Please be aware that
+after this call, the dataset's dataspace must be refreshed with #H5Dget_space before more data can be accessed.
+\li The #H5Pget_chunk call retrieves the size of chunks for the raw data of a chunked layout dataset.
+\li Once there is no longer a need for a Property List instance, it should be closed with the #H5Pclose call.
+
+<hr>
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref LearnBasics
+
+@page LBComDset Compressed Datasets
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref LearnBasics
+<hr>
+
+\section secLBComDsetCreate Creating a Compressed Dataset
+HDF5 requires you to use chunking to create a compressed dataset. (To use chunking efficiently,
+be sure to see the advanced topic, <a href="https://confluence.hdfgroup.org/display/HDF5/Chunking+in+HDF5">Chunking in HDF5</a>.)
+
+The following operations are required in order to create a compressed dataset:
+\li Create a dataset creation property list.
+\li Modify the dataset creation property list instance to enable chunking and to enable compression.
+\li Create the dataset.
+\li Close the dataset creation property list and dataset.
+
+For more information on compression, see the FAQ question on <a href="https://confluence.hdfgroup.org/display/HDF5/Using+Compression+in+HDF5">Using Compression in HDF5</a>.
+
+\section secLBComDsetProg Programming Example
+
+\subsection subsecLBComDsetProgDesc Description
+See \ref LBExamples for the examples used in the \ref LearnBasics tutorial.
+
+The example creates a chunked and ZLIB compressed dataset. It also includes comments for what needs
+to be done to create an SZIP compressed dataset. The example then reopens the dataset, prints the
+filter information, and reads the dataset.
+
+For details on compiling an HDF5 application:
+[ \ref LBCompiling ]
+
+\subsection subsecLBComDsetProgRem Remarks
+\li The #H5Pset_chunk call modifies a Dataset Creation Property List instance to store a chunked layout
+dataset and sets the size of the chunks used.
+\li The #H5Pset_deflate call modifies the Dataset Creation Property List instance to use ZLIB or DEFLATE
+compression. The #H5Pset_szip call modifies it to use SZIP compression. There are different compression
+parameters required for each compression method.
+\li SZIP compression can only be used with atomic datatypes that are integer, float, or char. It cannot be
+applied to compound, array, variable-length, enumerations, or other user-defined datatypes. The call
+to #H5Dcreate will fail if attempting to create an SZIP compressed dataset with a non-allowed datatype.
+The conflict can only be detected when the property list is used.
+
+<hr>
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref LearnBasics
+
+@page LBContents Discovering the Contents of an HDF5 File
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref LearnBasics
+<hr>
+
+\section secLBContents Discovering what is in an HDF5 file
+HDFView and h5dump are standalone tools which cannot be called within an application, and using
+#H5Dopen and #H5Dread require that you know the name of the HDF5 dataset. How would an application
+that has no prior knowledge of an HDF5 file be able to determine or discover the contents of it,
+much like HDFView and h5dump?
+
+The answer is that there are ways to discover the contents of an HDF5 file, by using the
+\ref H5G, \ref H5L and \ref H5O APIs:
+\li The \ref H5G interface (covered earlier) consists of routines for working with groups. A group is
+a structure that can be used to organize zero or more HDF5 objects, not unlike a Unix directory.
+\li The \ref H5L interface consists of link routines. A link is a path between groups. The \ref H5L interface
+allows objects to be accessed by use of these links.
+\li The \ref H5O interface consists of routines for working with objects. Datasets, groups, and committed
+datatypes are all objects in HDF5.
+
+Interface routines that simplify the process:
+\li #H5Literate traverses the links in a specified group, in the order of the specified index, using a
+user-defined callback routine. (A callback function is one that will be called when a certain condition
+is met, at a certain point in the future.)
+\li #H5Ovisit / #H5Lvisit recursively visit all objects/links accessible from a specified object/group.
+
+
+\section secLBContentsProg Programming Example
+
+\subsection subsecLBContentsProgUsing Using #H5Literate, #H5Lvisit and #H5Ovisit
+For example code, see the \ref HDF5Examples page.
+Specifically look at the <a href="https://portal.hdfgroup.org/display/HDF5/Examples+by+API">Examples by API</a>.
+There are examples for different languages, where examples of using #H5Literate and #H5Ovisit/#H5Lvisit are included.
+
+The h5ex_g_traverse example traverses a file using H5Literate:
+\li C: <a href="https://support.hdfgroup.org/ftp/HDF5/examples/examples-by-api/hdf5-examples/1_8/C/H5G/h5ex_g_traverse.c">h5ex_g_traverse.c</a>
+\li F90: <a href="https://support.hdfgroup.org/ftp/HDF5/examples/examples-by-api/hdf5-examples/1_8/FORTRAN/H5G/h5ex_g_traverse_F03.f90">h5ex_g_traverse_F03.f90</a>
+
+The h5ex_g_visit example traverses a file using H5Ovisit and H5Lvisit:
+\li C: <a href="https://support.hdfgroup.org/ftp/HDF5/examples/examples-by-api/hdf5-examples/1_8/C/H5G/h5ex_g_visit.c">h5ex_g_visit.c</a>
+\li F90:  <a href="https://support.hdfgroup.org/ftp/HDF5/examples/examples-by-api/hdf5-examples/1_8/FORTRAN/H5G/h5ex_g_visit_F03.f90">h5ex_g_visit_F03.f90</a>
+
+<hr>
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref LearnBasics
+
+@page LBQuiz Learning the basics QUIZ
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref LearnBasics
+<hr>
+
+\ref LBFileOrg
+<ol>
+<li>Name and describe the two primary objects that can be stored in an HDF5 file.
+</li>
+<li>What is an attribute?
+</li>
+<li>Give the path name for an object called <code style="background-color:whitesmoke;">harry</code> that is a member of a group called <code style="background-color:whitesmoke;">dick</code>, which, in turn, is a member of the root group.
+</li>
+</ol>
+
+\ref LBAPI
+<ol>
+<li>Describe the purpose of each of the following HDF5 APIs:
+\code
+       H5A, H5D, H5E, H5F, H5G, H5T, H5Z 
+\endcode
+</li>
+</ol>
+
+\ref LBFileCreate
+<ol>
+<li>What two HDF5 routines must be called to create an HDF5 file?
+</li>
+<li>What include file must be included in any file that uses the HDF5 library?
+</li>
+<li>An HDF5 file is never completely empty because as soon as it is created, it automatically contains a certain primary object. What is that object?
+</li>
+</ol>
+
+\ref LBDsetCreate
+<ol>
+<li>Name and describe two major datatype categories.
+</li>
+<li>List the HDF5 atomic datatypes. Give an example of a predefined datatype. How would you create a string dataset?
+</li>
+<li>What does the dataspace describe? What are the major characteristics of the simple dataspace?
+</li>
+<li>What information needs to be passed to the #H5Dcreate function, i.e., what information is needed to describe a dataset at creation time?
+</li>
+</ol>
+
+
+\ref LBDsetRW
+<ol>
+<li>What are six pieces of information which need to be specified for reading and writing a dataset?
+</li>
+<li>Why are both the memory dataspace and file dataspace needed for read/write operations, while only the memory datatype is required?
+</li>
+<li>In Figure 6.1, what does this line mean?
+\code
+DATASPACE { SIMPLE (4 , 6 ) / ( 4 , 6 ) }
+\endcode
+</li>
+</ol>
+
+
+\ref LBAttrCreate
+<ol>
+<li>What is an attribute?
+</li>
+<li>Can partial I/O operations be performed on attributes?
+</li>
+</ol>
+
+
+\ref LBGrpCreate
+<ol>
+<li>What are the two primary objects that can be included in a group?
+</li>
+</ol>
+
+
+\ref LBGrpCreateNames
+<ol>
+<li>Group names can be specified in two ways. What are these two types of group names?
+</li>
+<li>You have a dataset named <code style="background-color:whitesmoke;">moo</code> in the group <code style="background-color:whitesmoke;">boo</code>, which is in the group <code style="background-color:whitesmoke;">foo</code>, which, in turn,
+is in the <code style="background-color:whitesmoke;">root</code> group. How would you specify an absolute name to access this dataset?
+</li>
+</ol>
+
+
+\ref LBGrpDset
+<ol>
+<li>Describe a way to access the dataset moo described in the previous section
+(question 2) using a relative name. Describe a way to access the same dataset using an absolute name.
+</li>
+</ol>
+
+<hr>
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref LearnBasics
+
+@page LBQuizAnswers Learning the basics QUIZ with Answers
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref LearnBasics
+<hr>
+
+\ref LBFileOrg
+<ol>
+<li>Name and describe the two primary objects that can be stored in an HDF5 file.
+<table>
+<tr>
+<th><strong>Answer</strong>
+</th>
+<td>Group: A grouping structure containing zero or more HDF5 objects, together with supporting metadata.<br />
+Dataset: A multidimensional array of data elements, together with supporting metadata.
+</td>
+</tr>
+</table>
+</li>
+<li>What is an attribute?
+<table>
+<tr>
+<th><strong>Answer</strong>
+</th>
+<td>An HDF5 attribute is a user-defined HDF5 structure that provides extra information about an HDF5 object.
+</td>
+</tr>
+</table>
+</li>
+<li>Give the path name for an object called <code style="background-color:whitesmoke;">harry</code> that is a member of a group called <code style="background-color:whitesmoke;">dick</code>, which, in turn, is a member of the root group.
+<table>
+<tr>
+<th><strong>Answer</strong>
+</th>
+<td>/dick/harry
+</td>
+</tr>
+</table>
+</li>
+</ol>
+
+\ref LBAPI
+<ol>
+<li>Describe the purpose of each of the following HDF5 APIs:
+\code
+       H5A, H5D, H5E, H5F, H5G, H5T, H5Z 
+\endcode
+<table>
+<tr>
+<th><strong>Answer</strong>
+</th>
+<td>H5A: Attribute access and manipulation routines
+<br />
+H5D: Dataset access and manipulation routines
+<br />
+H5E: Error handling routines H5F: File access routines
+<br />
+H5G: Routines for creating and operating on groups
+<br />
+H5T: Routines for creating and manipulating the datatypes of dataset elements
+<br />
+H5Z: Data compression routines
+</td>
+</tr>
+</table>
+</li>
+</ol>
+
+\ref LBFileCreate
+<ol>
+<li>What two HDF5 routines must be called to create an HDF5 file?
+<table>
+<tr>
+<th><strong>Answer</strong>
+</th>
+<td>#H5Fcreate and #H5Fclose.
+</td>
+</tr>
+</table>
+</li>
+<li>What include file must be included in any file that uses the HDF5 library?
+<table>
+<tr>
+<th><strong>Answer</strong>
+</th>
+<td>hdf5.h must be included because it contains definitions and declarations used by the library.
+</td>
+</tr>
+</table>
+</li>
+<li>An HDF5 file is never completely empty because as soon as it is created, it automatically contains a certain primary object. What is that object?
+<table>
+<tr>
+<th><strong>Answer</strong>
+</th>
+<td>The root group.
+</td>
+</tr>
+</table>
+</li>
+</ol>
+
+\ref LBDsetCreate
+<ol>
+<li>Name and describe two major datatype categories.
+<table>
+<tr>
+<th><strong>Answer</strong>
+</th>
+<td>Atomic datatype: An atomic datatype cannot be decomposed into smaller units at the API level.
+<br />
+Compound datatype: A compound datatype is a collection of atomic and compound datatypes, or small arrays of such types.
+</td>
+</tr>
+</table>
+</li>
+<li>List the HDF5 atomic datatypes. Give an example of a predefined datatype. How would you create a string dataset?
+<table>
+<tr>
+<th><strong>Answer</strong>
+</th>
+<td>There are six HDF5 atomic datatypes: integer, floating point, date and time, character string, bit field, and opaque.
+<br />
+Examples of predefined datatypes include the following:<br />
+\li #H5T_IEEE_F32LE - 4-byte little-endian, IEEE floating point
+\li #H5T_NATIVE_INT - native integer
+
+You would create a string dataset with the #H5T_C_S1 datatype, and set the size of the string with the #H5Tset_size call.
+</td>
+</tr>
+</table>
+</li>
+<li>What does the dataspace describe? What are the major characteristics of the simple dataspace?
+<table>
+<tr>
+<th><strong>Answer</strong>
+</th>
+<td>The dataspace describes the dimensionality of the dataset. A simple dataspace is characterized by its rank and dimension sizes.
+</td>
+</tr>
+</table>
+</li>
+<li>What information needs to be passed to the #H5Dcreate function, i.e., what information is needed to describe a dataset at creation time?
+<table>
+<tr>
+<th><strong>Answer</strong>
+</th>
+<td>The dataset location, name, dataspace, datatype, and dataset creation property list.
+</td>
+</tr>
+</table>
+</li>
+</ol>
+
+
+\ref LBDsetRW
+<ol>
+<li>What are six pieces of information which need to be specified for reading and writing a dataset?
+<table>
+<tr>
+<th><strong>Answer</strong>
+</th>
+<td>The dataset identifier, the dataset's datatype and dataspace in memory, the dataspace in the file,
+the dataset transfer property list, and a data buffer.
+</td>
+</tr>
+</table>
+</li>
+<li>Why are both the memory dataspace and file dataspace needed for read/write operations, while only the memory datatype is required?
+<table>
+<tr>
+<th><strong>Answer</strong>
+</th>
+<td>A dataset's file datatype is not required for a read/write operation because the file datatype is specified
+when the dataset is created and cannot be changed. Both file and memory dataspaces are required for dataset
+subsetting and for performing partial I/O operations.
+</td>
+</tr>
+</table>
+</li>
+<li>In Figure 6.1, what does this line mean?
+\code
+DATASPACE { SIMPLE (4 , 6 ) / ( 4 , 6 ) }
+\endcode
+<table>
+<tr>
+<th><strong>Answer</strong>
+</th>
+<td>It means that the dataset dset has a simple dataspace with the current dimensions (4,6) and the maximum size of the dimensions (4,6).
+</td>
+</tr>
+</table>
+</li>
+</ol>
+
+
+\ref LBAttrCreate
+<ol>
+<li>What is an attribute?
+<table>
+<tr>
+<th><strong>Answer</strong>
+</th>
+<td>An attribute is a dataset attached to an object. It describes the nature and/or the intended usage of the object.
+</td>
+</tr>
+</table>
+</li>
+<li>Can partial I/O operations be performed on attributes?
+<table>
+<tr>
+<th><strong>Answer</strong>
+</th>
+<td>No.
+</td>
+</tr>
+</table>
+</li>
+</ol>
+
+
+\ref LBGrpCreate
+<ol>
+<li>What are the two primary objects that can be included in a group?
+<table>
+<tr>
+<th><strong>Answer</strong>
+</th>
+<td>A group and a dataset.
+</td>
+</tr>
+</table>
+</li>
+</ol>
+
+
+\ref LBGrpCreateNames
+<ol>
+<li>Group names can be specified in two ways. What are these two types of group names?
+<table>
+<tr>
+<th><strong>Answer</strong>
+</th>
+<td>Relative and absolute.
+</td>
+</tr>
+</table>
+</li>
+<li>You have a dataset named <code style="background-color:whitesmoke;">moo</code> in the group <code style="background-color:whitesmoke;">boo</code>, which is in the group <code style="background-color:whitesmoke;">foo</code>, which, in turn,
+is in the <code style="background-color:whitesmoke;">root</code> group. How would you specify an absolute name to access this dataset?
+<table>
+<tr>
+<th><strong>Answer</strong>
+</th>
+<td>/foo/boo/moo
+</td>
+</tr>
+</table>
+</li>
+</ol>
+
+
+\ref LBGrpDset
+<ol>
+<li>Describe a way to access the dataset moo described in the previous section
+(question 2) using a relative name. Describe a way to access the same dataset using an absolute name.
+<table>
+<tr>
+<th><strong>Answer</strong>
+</th>
+<td>Access the group /foo and get the group ID. Access the group boo using the group ID obtained in Step 1.
+Access the dataset moo using the group ID obtained in Step 2.
+\code
+gid = H5Gopen (file_id, "/foo", 0); /* absolute path */ 
+gid1 = H5Gopen (gid, "boo", 0); /* relative path */ 
+did = H5Dopen (gid1, "moo"); /* relative path */ 
+\endcode
+Access the group /foo and get the group ID. Access the dataset boo/moo with the group ID just obtained.
+\code
+gid = H5Gopen (file_id, "/foo", 0); /* absolute path */ 
+did = H5Dopen (gid, "boo/moo"); /* relative path */ 
+\endcode
+Access the dataset with an absolute path.
+\code
+did = H5Dopen (file_id, "/foo/boo/moo"); /* absolute path */
+\endcode
+</td>
+</tr>
+</table>
+</li>
+</ol>
+
+<hr>
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref LearnBasics
+
+@page LBCompiling Compiling HDF5 Applications
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref LearnBasics
+<hr>
+
+\section secLBCompiling Tools and Instructions on Compiling
+Compiling applications to use the HDF5 Library can be as simple as executing:
+\code
+h5cc -o myprog myprog.c
+\endcode
+
+As an application's file base evolves, there are better solutions using autotools and makefiles or
+CMake and CMakeLists.txt files. Many tutorials and references can be found with a simple search.
+
+This tutorial section will discuss the use of compile scripts on Linux.
+See the \ref secLBCompilingVS section for compiling with Visual Studio.
+
+\section secLBCompilingLinux Compile Scripts
+When the library is built, the following compile scripts are included:
+\li h5cc:  compile script for HDF5 C programs
+\li h5fc:  compile script for HDF5 F90 programs
+\li h5c++: compile script for HDF5 C++ programs
+
+These scripts are easilye used to compile single file applications, such as those included in the tutorial.
+<table>
+<tr>
+<th><strong>Warning</strong>
+</th>
+<td>The h5cc/h5fc/h5c++ compile scripts are included when building with configure. Versions of
+these compile scripts have also been added to CMake for Linux ONLY. The CMake versions rely on pkgconfig files.
+</td>
+</tr>
+</table>
+
+<h4>Examples of Using the Unix Compile Scripts:</h4>
+Following are examples of compiling and running an application with the Unix compile scripts:
+\code
+   h5fc myprog.f90
+   ./a.out
+
+   h5cc -o myprog myprog.c
+   ./myprog 
+\endcode
+
+To see how the libraries linked in with a compile script were configured and built, use the
+-showconfig option. For example, if using h5cc type:
+\code
+   h5cc -showconfig
+\endcode
+
+<h4>Detailed Description of Unix Compile Scripts:</h4>
+The h5cc, h5c++, and h5fc compile scripts come with the HDF5 binary distributions (include files,
+libraries, and utilities) for the platforms we support. The h5c++ and h5fc utilities are ONLY present
+if the library was built with C++ and Fortran.
+
+\section secLBCompilingVS Using Visual Studio
+
+   1. If you are building on 64-bit Windows, find the "Platform" dropdown
+      and select "x64". Also select the correct Configuration (Debug, Release, RelWithDebInfo, etc)
+
+   2. Set up path for external headers
+
+      The HDF5 install path settings will need to be in the project property sheets per project.
+      Go to "Project" and select "Properties", find "Configuration Properties",
+      and then "C/C++".
+
+      2.1 Add the header path to the "Additional Include Directories" setting. Under "C/C++"
+          find "General" and select "Additional Include Directories". Select "Edit" from the dropdown
+          and add the HDF5 install/include path to the list.
+          (Ex: "C:\Program Files\HDF_Group\HDF5\1.10.9\include")
+
+      2.2 Building applications with the dynamic/shared hdf5 libraries requires
+          that the "H5_BUILT_AS_DYNAMIC_LIB" compile definition be used. Under "C/C++"
+          find "Preprocessor" and select "Preprocessor Definitions". Select "Edit" from the dropdown
+          and add "H5_BUILT_AS_DYNAMIC_LIB" to the list.
+
+   3. Set up path for external libraries
+
+      The HDF5 install path/lib settings will need to be in the project property sheets per project.
+      Go to "Project" and select "Properties", find "Configuration Properties",
+      and then "Linker".
+
+      3.1 Add the libraries to the "Additional Dependencies" setting. Under "Linker"
+          find "Input" and select "Additional Dependencies". Select "Edit" from the dropdown
+          and add the required HDF5 install/lib path to the list.
+          (Ex: "C:\Program Files\HDF_Group\HDF5\1.10.9\lib\hdf5.lib")
+
+      3.2 For static builds, the external libraries should be added.
+          For example, to compile a C++ application, enter:
+          libhdf5_cpp.lib libhdf5.lib libz.lib libszaec.lib libaec.lib
+
+\section secLBCompilingLibs HDF5 Libraries
+Following are the libraries included with HDF5. Whether you are using the Unix compile scripts or
+Makefiles, or are compiling on Windows, these libraries are or may need to be specified. The order
+they are specified is important on Linux:
+
+<table>
+<caption>HDF5 Static Libraries</caption>
+<tr>
+<th>Library</th>
+<th>Linux Name</th>
+<th>Mac Name</th>
+<th>Windows Name</th>
+</tr>
+<tr>
+<td>
+\code
+HDF5 High Level C++ APIs 
+HDF5 C++ Library  
+HDF5 High Level Fortran APIs
+HDF5 Fortran Library
+HDF5 High Level C APIs
+HDF5 C Library
+\endcode
+</td>
+<td>
+\code
+libhdf5_hl_cpp.a
+libhdf5_cpp.a
+libhdf5hl_fortran.a
+libhdf5_fortran.a
+libhdf5_hl.a
+libhdf5.a
+\endcode
+</td>
+<td>
+\code
+libhdf5_hl_cpp.a
+libhdf5_cpp.a
+libhdf5hl_fortran.a
+libhdf5_fortran.a
+libhdf5_hl.a
+libhdf5.a
+\endcode
+</td>
+<td>
+<em>Windows</em>
+\code
+libhdf5_hl_cpp.lib
+libhdf5_cpp.lib
+libhdf5hl_fortran.lib
+libhdf5_fortran.lib
+libhdf5_hl.lib
+libhdf5.lib
+\endcode
+</tr>
+</table>
+
+<table>
+<caption>HDF5 Shared Libraries</caption>
+<tr>
+<th>Library</th>
+<th>Linux Name</th>
+<th>Mac Name</th>
+<th>Windows Name</th>
+</tr>
+<tr>
+<td>
+\code
+HDF5 High Level C++ APIs 
+HDF5 C++ Library  
+HDF5 High Level Fortran APIs
+HDF5 Fortran Library
+HDF5 High Level C APIs
+HDF5 C Library
+\endcode
+</td>
+<td>
+\code
+libhdf5_hl_cpp.so
+libhdf5_cpp.so
+libhdf5hl_fortran.so
+libhdf5_fortran.so
+libhdf5_hl.so
+libhdf5.so
+\endcode
+</td>
+<td>
+\code
+libhdf5_hl_cpp.dylib
+libhdf5_cpp.dylib
+libhdf5hl_fortran.dylib
+libhdf5_fortran.dylib
+libhdf5_hl.dylib
+libhdf5.dylib
+\endcode
+</td>
+<td>
+\code
+hdf5_hl_cpp.lib
+hdf5_cpp.lib
+hdf5hl_fortran.lib
+hdf5_fortran.lib
+hdf5_hl.lib
+hdf5.lib
+\endcode
+</tr>
+</table>
+
+<table>
+<caption>External Libraries</caption>
+<tr>
+<th>Library</th>
+<th>Linux Name</th>
+<th>Mac Name</th>
+<th>Windows Name</th>
+</tr>
+<tr>
+<td>
+\code
+SZIP Compression Library
+SZIP Compression Library
+ZLIB or DEFLATE Compression Library
+\endcode
+</td>
+<td>
+\code
+libszaec.a
+libaec.a
+libz.a
+\endcode
+</td>
+<td>
+\code
+libszaec.a
+libaec.a
+libz.a
+\endcode
+</td>
+<td>
+\code
+libszaec.lib
+libaec.lib
+libz.lib
+\endcode
+</td>
+</tr>
+</table>
+
+The pre-compiled binaries, in particular, are built (if at all possible) with these libraries as well as with
+SZIP and ZLIB. If using shared libraries you may need to add the path to the library to LD_LIBRARY_PATH on Linux
+or on WINDOWS you may need to add the path to the bin folder to PATH.
+
+\section secLBCompilingCMake Compiling an Application with CMake
+
+\subsection subsecLBCompilingCMakeScripts CMake Scripts for Building Applications
+Simple scripts are provided for building applications with different languages and options.
+See <a href="https://confluence.hdfgroup.org/display/support/CMake+Scripts+for+Building+Applications">CMake Scripts for Building Applications</a>.
+
+For a more complete script (and to help resolve issues) see the script provided with the HDF5 Examples project.
+
+\subsection subsecLBCompilingCMakeExamples HDF5 Examples
+The installed HDF5 can be verified by compiling the HDF5 Examples project, included with the CMake built HDF5 binaries
+in the share folder or you can go to the <a href="https://github.com/HDFGroup/hdf5_examples">HDF5 Examples</a> github repository.
+
+Go into the share directory and follow the instructions in USING_CMake_examples.txt to build the examples.
+
+In general, users must first set the HDF5_ROOT environment variable to the installed location of the CMake
+configuration files for HDF5. For example, on Windows the following path might be set:
+
+\code
+   HDF5_ROOT=C:/Program Files/HDF_Group/HDF5/1.N.N
+\endcode
+
+\subsection subsecLBCompilingCMakeTroubless Troubleshooting CMake
+<h4>How do you use find_package with HDF5?</h4>
+To use find_package you will first need to make sure that HDF5_ROOT is set correctly. For setting this
+environment variable see the Preconditions in the USING_HDF5_CMake.txt file in the share directory.
+
+See the CMakeLists.txt file provided with these examples for how to use find_package with HDF5.
+
+Please note that the find_package invocation changed to require "shared" or "static":
+\code
+      FIND_PACKAGE(HDF5 COMPONENTS C HL NO_MODULE REQUIRED shared)
+      FIND_PACKAGE(HDF5 COMPONENTS C HL NO_MODULE REQUIRED static)  
+\endcode
+
+Previously, the find_package invocation was: 
+\code
+      FIND_PACKAGE(HDF5 COMPONENTS C HL NO_MODULE REQUIRED)
+\endcode
+
+<h4>My platform/compiler is not included. Can I still use the configuration files?</h4>
+Yes, you can but you will have to edit the HDF5_Examples.cmake file and update the variable:
+\code
+   CTEST_CMAKE_GENERATOR  
+\endcode
+
+The generators for your platform can be seen by typing:
+\code
+   cmake --help
+\endcode
+
+<h4>What do I do if the build fails?</h4>
+I received an error during the build and the application binary is not in the
+build directory as I expected. How do I determine what the problem is?
+
+If the error is not clear, then the first thing you may want to do is replace the -V (Dash Uppercase Vee)
+option for ctest in the build script to -VV (Dash Uppercase Vee Uppercase Vee). Then remove the build
+directory and re-run the build script. The output should be more verbose.
+
+If the error is still not clear, then check the log files. You will find those in the build directory.
+For example, on Unix the log files will be in:
+\code
+   build/Testing/Temporary/  
+\endcode
+There are log files for the configure, test, and build. 
+
+<hr>
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref LearnBasics
+
+@page LBTraining Training Videos
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref LearnBasics
+<hr>
+
+<a href="https://confluence.hdfgroup.org/display/HDF5/Training+Videos">Training Videos</a>
+
+<hr>
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref LearnBasics
+
+*/
diff --git a/doxygen/dox/LearnHDFView.dox b/doxygen/dox/LearnHDFView.dox
new file mode 100644
index 0000000..b1f632c
--- /dev/null
+++ b/doxygen/dox/LearnHDFView.dox
@@ -0,0 +1,472 @@
+/** @page LearnHDFView Learning HDF5 with HDFView
+
+Navigate back: \ref index "Main" / \ref GettingStarted
+<hr>
+
+This tutorial enables you to get a feel for HDF5 by using the HDFView browser. It does NOT require
+any programming experience.
+
+\section sec_learn_hv_install HDFView Installation
+\li Download and install HDFView. It can be downloaded from the <a href="https://portal.hdfgroup.org/display/support/Download+HDFView">Download HDFView</a> page.
+\li Obtain the  <a href="https://support.hdfgroup.org/ftp/HDF5/examples/files/tutorial/storm1.txt">storm1.txt</a> text file, used in the tutorial.
+
+\section sec_learn_hv_begin Begin Tutorial
+Once you have HDFView installed, bring it up and you are ready to begin the tutorial.
+
+<table style="background-color:#FAFAD2">
+<caption>
+Unable to complete tutorial because fields are greyed out?
+</caption>
+<tr>
+<td>
+This tutorial requires that the default HDFView File Access Mode be Read / Write. If fields are greyed out so that you cannot select them, then the File Access Mode is Read Only.
+
+To change the File Access Mode follow these steps:
+<ul>
+<li>Bring up HDFView</li>
+<li>Left-mouse click on the Tools pull-down menu and select User Options.</li>
+<li>A Preferences window pops up with the General Settings tab selected.
+About half-way down you will see Default File Access Mode.
+Select Read / Write.</li>
+<li>Click on Apply and Close at the bottom of the window.</li>
+<li>Close down HDFView.</li>
+<li>Bring HDFView back up and try the tutorial again.</li>
+PLEASE BE AWARE that selecting a File Access Mode of Read / Write can result in changes to the timestamp of HDF files that are viewed with HDFView. In general, a File Access Mode
+of Read Only should be used to ensure that this does not occur.
+</ul>
+</td>
+</tr>
+</table>
+
+\subsection subsec_learn_hv_begin_topics Topics Covered
+Following are the topics covered in the tutorial. The first topic creates the file that is used in
+the subsequent topics.
+<ul>
+<li>@ref subsec_learn_hv_topics_file</li>
+<li>@ref subsec_learn_hv_topics_image</li>
+<li>@ref subsec_learn_hv_topics_attr</li>
+<li>@ref subsec_learn_hv_topics_compress</li>
+<li>@ref subsec_learn_hv_topics_subset</li>
+<li>@ref subsec_learn_hv_topics_table</li>
+</ul>
+
+\section sec_learn_hv_topics Topics
+
+\subsection subsec_learn_hv_topics_file Creating a New HDF5 File with a Contiguous Dataset
+The steps below describe how to create a file (storm.h5), group (/Data), and a contiguous dataset
+(/Data/Storm) using HDFView. A group is an HDF5 object that allows objects to be collected together.
+A dataset is an array of data values. A contiguous dataset is one that is stored as a single block
+in the HDF5 file.
+<ul>
+<li>Select the <em>File</em> pull-down menu at the top left, and then select <em>New -> HDF5</em>.</li>
+<li>Specify a location and type in <em>storm.h5</em> for the name of your file, and click on the <em>Save</em> button.
+You will see the <em>storm.h5</em> file in the TableView:
+<table>
+<tr>
+<td>
+\image html storm.png 
+</td>
+</tr>
+</table>
+</li>
+<li>Right click on <em>storm.h5</em>, and select <em>New -> Group</em>.</li>
+<li>Enter <em>Data</em> for the name of the group and then click the <em>Ok</em> button. You will see the group <em>Data</em> in the TableView.
+<table>
+<tr>
+<td>
+\image html DataGroup.png 
+</td>
+</tr>
+</table>
+</li>
+<li>Right click on the group <em>Data</em> and select <em>New -> Dataset</em>.</li>
+<li>A window pops up on the right. Fill in the information as follows, and then click <em>Ok</em> (leave the
+Datatype information as is):
+<table>
+<tr>
+<th>Dataset Name
+</th>
+<td><em>Storm</em>
+</td>
+</tr>
+<tr>
+<th>Under Dataspace, Current size
+</th>
+<td>57x57
+</td>
+</tr>
+<tr>
+<th>Layout
+</th>
+<td><em>Contiguous</em> (default)
+</td>
+</tr>
+</table>
+</li>
+<li>Click to expand the <em>Data</em> group in the tree view to see the <em>Storm</em> dataset:
+<table>
+<tr>
+<td>
+\image html StormDataset.png 
+</td>
+</tr>
+</table>
+</li>
+<li>Double left click on the <em>Storm</em> dataset in the tree view. A window with an empty spreadsheet pops open.</li>
+<li>Copy the data from the <a href="https://support.hdfgroup.org/ftp/HDF5/examples/files/tutorial/storm1.txt">storm1.txt</a> file into the dataset.
+
+If you downloaded <a href="https://support.hdfgroup.org/ftp/HDF5/examples/files/tutorial/storm1.txt">storm1.txt</a>,
+then click on the <em>Import/Export Data</em> menu and select <em>Import Data from -> Text File</em>.
+Specify a location, select <a href="https://support.hdfgroup.org/ftp/HDF5/examples/files/tutorial/storm1.txt">storm1.txt</a>
+and click on the <em>Open</em> button. Answer <em>Yes</em> in the dialog box that
+pops up (which asks if you wish to paste the selected data).
+
+Alternately, you can copy/paste directly. Select and copy the data in a separate window. Position your
+cursor at (0,0) in your table, and select <em>Paste</em> from the <em>Table</em> menu.
+
+The values will be entered into the spreadsheet.
+<table>
+<tr>
+<td>
+\image html datasetwdata.png 
+</td>
+</tr>
+</table>
+</li>
+<li><em>Table -> Close</em> the dataset, and save the data.</li>
+</ul>
+
+\subsection subsec_learn_hv_topics_image Displaying a Dataset as an Image
+Any dataset can be viewed as an image in HDFView. Below are the steps that demonstrate this.
+<ul>
+<li>Right click on <em>Storm</em> in the tree view, and select <em>Open As</em>.</li>
+<li>Select the <em>Image</em> button under <em>Display As</em> (near the top) in the Dataset Selection window that pops
+up. Then click <em>OK</em> at the bottom of the window to display the image.
+<table>
+<tr>
+<td>
+\image html showasimage.png 
+</td>
+</tr>
+</table>
+</li>
+<li>The rainbow icon brings you to the Image Palette window. Click on that to play with the palette
+(GrayWave probably is the best choice). Close.</li>
+</ul>
+
+\subsection subsec_learn_hv_topics_attr Creating Attributes
+Additional information to describe an object can be stored in attributes. An attribute can be
+added to a group or dataset with HDFView.
+
+The following illustrates how to add an attribute to the group <em>/Data</em>:
+<ul>
+<li>Click on the <em>/Data</em> folder in the tree view. You will see two tabs, <em>Object Attribute Info</em> and
+<em>General Object Info</em>, in the pane on the right site of the HDFView window.
+<table>
+<tr>
+<td>
+\image html noattrs.png 
+</td>
+</tr>
+</table>
+</li>
+<li>With the left mouse button, select the <em>Add Attribute</em> button.</li>
+<li>Select the <em>Add Attribute</em> button to add an attribute with these values:</li>
+<table>
+<tr>
+<th>Name
+</th>
+<td><em>BatchID</em>
+</td>
+</tr>
+<tr>
+<th>Type
+</th>
+<td>INTEGER
+</td>
+</tr>
+<tr>
+<th>Size (bits)
+</th>
+<td>32
+</td>
+</table>
+<li>Select the <em>Ok</em> button. The attribute will show up under the <em>Object Attribute Info</em> tab.</li>
+<li>Double-click the BatchID attribute line to open the data table for BatchID.</li>
+<li>Click in the first cell and enter <em>3343</em> followed by the enter key.</li>
+<li><em>Table -> Close</em>, answer <em>Yes</em> in the dialog box that
+pops up (which asks if you wish to paste the selected data).</li>
+</ul>
+Adding an attribute to a dataset is very similar to adding an attribute to a group. For example,
+the following adds an attribute to the <em>/Storm</em> dataset:
+<ul>
+<li>Left mouse click on the <em>/Storm</em> dataset in the tree view. You will see the <em>Object Attribute
+Info</em> and <em>General Object Info</em> tabs on the right</li>
+<li>In the <em>Object Attribute Info</em> pane select the <em>Add Attribute</em> button and enter an attribute with
+these values. (Be sure to add a <em>String Length</em> or the string will be truncated to one character!):</li>
+<table>
+<tr>
+<th>Name
+</th>
+<td><em>Units</em>
+</td>
+</tr>
+<tr>
+<th>Type
+</th>
+<td>STRING
+</td>
+</tr>
+<tr>
+<th>String Length
+</th>
+<td>3
+</td>
+</table>
+<li>Select the <em>Ok</em> button. The attribute will show up under the <em>Object Attribute Info</em> tab.</li>
+<li>Double-click the Units attribute line to open the data table for Units.</li>
+<li>Click in the first cell and enter <em>m/s</em> followed by the enter key.</li>
+<li><em>Table -> Close</em>, answer <em>Yes</em> in the dialog box that
+pops up (which asks if you wish to paste the selected data).
+<table>
+<tr>
+<td>
+\image html scarletletter.png 
+</td>
+</tr>
+</table>
+</li>
+</ul>
+
+\subsection subsec_learn_hv_topics_compress Creating a Compressed and Chunked Dataset
+A chunked and compressed dataset can be created using HDFView. A compressed dataset is a dataset
+whose size has been compressed to take up less space. In order to compress an HDF5 dataset, the
+dataset must be stored with a chunked dataset layout (as multiple <em>chunks</em> that are stored separately
+in the file).
+
+Please note that the chunk sizes used in this topic are for demonstration purposes only. For
+information on chunking and specifying an appropriate chunk size, see the
+<a href="https://confluence.hdfgroup.org/display/HDF5/Chunking+in+HDF5">Chunking in HDF5</a> documentation.
+
+Also see the HDF5 Tutorial topic on \ref secLBComDsetCreate.
+<ul>
+<li>Right click on storm.h5. Select <em>New -> Group</em>.</li>
+<li>Enter <em>Image</em> for the name of the group, and click the <em>OK</em> button to create the group.
+<table>
+<tr>
+<td>
+\image html newgroupimage.png 
+</td>
+</tr>
+</table>
+</li>
+<li>Right click on the <em>Image</em> group, and select <em>New -> Dataset</em>.</li>
+<li>Enter the following information for the dataset. Leave the <em>Datatype</em> as is (INTEGER):
+<table>
+<tr>
+<th>Dataset name
+</th>
+<td><em>Another Storm</em>
+</td>
+</tr>
+<tr>
+<th>Under Dataspace, Current size
+</th>
+<td>57x57
+</td>
+</tr>
+<tr>
+<th>Storage Layout
+</th>
+<td>Chunked
+</td>
+</tr>
+<tr>
+<th>Chunk Size
+</th>
+<td>20x20
+</td>
+</tr>
+<tr>
+<th>Compression
+</th>
+<td>gzip
+</td>
+</tr>
+<tr>
+<th>Compression Level
+</th>
+<td>9
+</td>
+</table>
+You will see the <em>Another Storm</em> dataset in the <em>Image</em> group:
+<table>
+<tr>
+<td>
+\image html hdfview-anthrstrm.png 
+</td>
+</tr>
+</table>
+</li>
+<li>Double left-mouse click on the <em>Another Storm</em> dataset to display the spreadsheet:
+<table>
+<tr>
+<td>
+\image html hdfview-anthrstrm-sprdsht.png 
+</td>
+</tr>
+</table>
+</li>
+<li>Copy the data from the <a href="https://support.hdfgroup.org/ftp/HDF5/examples/files/tutorial/storm1.txt">storm1.txt</a> file into the dataset. (See the previous topic for copying
+<a href="https://support.hdfgroup.org/ftp/HDF5/examples/files/tutorial/storm1.txt">storm1.txt</a> into a dataset.)</li>
+<li><em>Table -> Close</em>, and save the data.</li>
+<li>Right click on <em>Another Storm</em>, and select <em>Open As</em>.</li>
+<li>Select the <em>Image</em> button in the Dataset Selection window that pops up. Click the <em>Ok</em> button at the
+bottom of the window to view the dataset as an image.
+<table>
+<tr>
+<td>
+\image html hdfview-anthrstrm-img.png 
+</td>
+</tr>
+</table>
+</li>
+</ul>
+
+\subsection subsec_learn_hv_topics_subset Creating an Image and a Subset
+A previous topic demonstrated how to view any dataset as an image in HDFView. With HDFView you can also
+create an image to begin with, as is shown below.
+<ul>
+<li>Right click on the <em>Data</em> group and select <em>New -> Image</em>.</li>
+<li>A window pops up on the right. Enter the following and then click <em>Ok</em>:</li>
+<table>
+<tr>
+<th>Image name
+</th>
+<td><em>Storm Image</em>
+</td>
+</tr>
+<tr>
+<th>Height
+</th>
+<td>57
+</td>
+</tr>
+<tr>
+<th>Width
+</th>
+<td>57
+</td>
+</table>
+
+<li>Close the dataset.</li>
+<li>Expand the <em>Data</em> group to see its contents. You will see the <em>Storm Image</em> dataset.
+<table>
+<tr>
+<td>
+\image html hdfview-imgicon.png 
+</td>
+</tr>
+</table>
+</li>
+<li>
+Add data to the <em>Storm Image</em> dataset as was shown previously:
+<ul>
+<li>Right click on <em>Storm Image</em>, and select <em>Open As</em> to open the Dataset Selection window.</li>
+<li>Click on the <em>Spreadsheet</em> button at the top left of the Dataset Selection window to view the image
+as a spreadsheet.</li>
+<li>Copy the data from the <a href="https://support.hdfgroup.org/ftp/HDF5/examples/files/tutorial/storm1.txt">storm1.txt</a> file into the dataset.</li>
+<li>Close the dataset and save the data.</li>
+</ul>
+</li>
+<li>Left double click on <em>Storm Image</em> to see the image. Close the dataset.</li>
+<li>Right click on <em>Storm Image</em> and select <em>Open As</em> to bring up the Data Selection window.</li>
+<li>Select a subset by clicking the left mouse on the image in the window and dragging the mouse.
+Notice that the Height and Width values change. Select to display it as an image. Click <em>Ok</em>.
+<table>
+<tr>
+<td>
+\image html hdfview-imgsubset.png 
+</td>
+</tr>
+</table>
+</li>
+<li>Position the cursor in the middle of the image. Press Shift+Left Mouse button and hold, and then
+drag the mouse to select another subset.</li>
+<li>Select <em>Image->Write Selection to Image</em>. Enter <em>Subset</em> for the new image name. Click <em>Ok</em>. The <em>Subset</em>
+image will appear in the tree view on the left.</li>
+<li>Left double click on the image <em>Subset</em> to bring it up on the right.
+<table>
+<tr>
+<td>
+\image html hdfview-newimgsubset.png 
+</td>
+</tr>
+</table>
+</li>
+<li>Close the <em>Subset</em> image.</li>
+</ul>
+
+\subsection subsec_learn_hv_topics_table Creating a Table (Compound Dataset)
+A dataset with a compound datatype contains data elements that consist of multiple fields. If the
+dataspace for the compound dataset is one-dimensional, then the dataset can be viewed as a table in
+HDFView, as is shown below.
+<ul>
+<li>Right button click on the group <em>Data</em>. Select <em>New -> Compound DS</em>.</li>
+<li>A window pops up. Only fill in the following fields:
+<table>
+<tr>
+<th>Dataset name
+</th>
+<td>Table
+</td>
+</tr>
+<tr>
+<th>Dataspace (Current size only)
+</th>
+<td>4
+</td>
+</tr>
+<tr>
+<th>Compound Datatype Properties:
+<br />Number of Members
+</th>
+<td>3
+</td>
+</tr>
+<tr>
+<th>Compound Datatype Properties:
+<br /><em>Name</em> / Datatype / Size
+</th>
+<td><em>Description</em> / string / 4
+<br /><em>Temperature</em> / float / 1
+<br /><em>Pressure</em> / double / 1
+</td>
+</tr>
+</table>
+
+<table>
+<tr>
+<td>
+\image html hdfview-newcmpd.png 
+</td>
+</tr>
+</table>
+</li>
+<li>Click Ok at the bottom.</li>
+<li>Open the Data group (if it is not open) and double left click on the Table object.
+<table>
+<tr>
+<td>
+\image html hdfview-table.png 
+</td>
+</tr>
+</table>
+</li>
+<li>Close the dataset.</li>
+</ul>
+
+<hr>
+Navigate back: \ref index "Main" / \ref GettingStarted
+
+*/
diff --git a/doxygen/dox/MetadataCachingInHDF5.dox b/doxygen/dox/MetadataCachingInHDF5.dox
new file mode 100644
index 0000000..ce7f0df
--- /dev/null
+++ b/doxygen/dox/MetadataCachingInHDF5.dox
@@ -0,0 +1,1020 @@
+/** \page TNMDC Metadata Caching in HDF5
+
+\todo Revise this!
+
+\section intro Introduction
+
+In the 1.6.4 release, we introduced a re-implementation of the metadata
+cache. That release contained an incomplete version of the cache which could not
+be controlled via the API. The version in the 1.8 release is more mature and
+includes new API calls that allow the user program to configure the metadata
+cache both on file open and at run time.
+
+From the user perspective, the most striking effect of the new cache should be a
+large reduction in the cache memory requirements when working with complex HDF5
+files.
+
+Those working with such files may also notice a reduction in file close time.
+
+Those working with HDF5 files with a simple structure shouldn't notice any
+particular changes in most cases. In rare cases, there may be a significant
+improvement in performance.
+
+The remainder of this document contains an architectural overview of the old and
+new metadata caches, a discussion of algorithms used to automatically adjust
+cache size to circumstances, and a high-level discussion of the cache
+configuration controls. It can be safely skipped by anyone who works only with
+HDF5 files with relatively simple structure (i.e. no huge groups, no datasets
+with large numbers of chunks, and no objects with large numbers of attributes.)
+
+On the other hand, it is mandatory reading if you want to use something other
+than the default metadata cache configuration. The documentation on the metadata
+cache-related API calls will not make much sense without this background.
+
+\section oldnew Old and New Metadata Cache
+
+\subsection old The Old Metadata Cache
+
+The old metadata cache indexed the cache with a hash table with no provision for
+collisions. Instead, collisions were handled by evicting the existing entry to
+make room for the new entry. Aside from flushes, there was no other mechanism
+for evicting entries, so the replacement policy could best be described as
+"Evict on Collision".
+
+As a result, if two frequently used entries hashed to the same location, they
+would evict each other regularly. To decrease the likelihood of this situation,
+the default hash table size was set fairly large -- slightly more than
+10,000. This worked well, but since the size of metadata entries is not bounded,
+and since entries were only evicted on collision, the large hash table size
+allowed the cache size to explode when working with HDF5 files with complex
+structure.
+
+The "Evict on Collision" replacement policy also caused problems with the
+parallel version of the HDF5 library, as a collision with a dirty entry could
+force a write in response to a metadata read. Since all metadata writes must be
+collective in the parallel case while reads need not be, this could cause the
+library to hang if only some of the processes participated in a metadata read
+that forced a write. Prior to the implementation of the new metadata cache, we
+dealt with this issue by maintaining a shadow cache for dirty entries evicted by
+a read.
+
+\subsection new The New Metadata Cache
+
+The new metadata cache was designed to address the above issues. After
+implementation, it became evident that the working set size for HDF5 files
+varies widely depending on both structure and access patterns. Thus it was
+necessary to add support for cache size adjustment under either automatic or
+user program control (see section 2.3 for details).
+
+When the cache is operating under direct user program control, it is also
+possible to temporarily disable evictions from the metadata cache so as to
+maximize raw data throughput at the expense of allowing the cache to grow
+without bound until evictions are enabled again.
+
+Structurally, the new metadata cache can be thought of as a heavily modified
+version of the UNIX buffer cache as described in chapter three of M. J. Bach's
+"The Design of the UNIX Operating System" In essence, the UNIX buffer cache uses
+a hash table with chaining to index a pool of fixed-size buffers. It uses the
+LRU replacement policy to select candidates for eviction.
+
+Since HDF5 metadata entries are not of fixed size and may grow arbitrarily
+large, the size of the new metadata cache cannot be controlled by setting a
+maximum number of entries. Instead, the new cache keeps a running sum of the
+sizes of all entries and attempts to evict entries as necessary to stay within a
+user-specified maximum size. (Note the use of the word "attempts" here -- as
+will be seen, it is possible for the cache to exceed its currently specified
+maximum size.) At present, the LRU replacement policy is the only option for
+selecting candidates for eviction.
+
+Per the standard Unix buffer cache, dirty entries are given two passes through
+the LRU list before being evicted. The first time they reach the end of the LRU
+list, they are flushed, marked as clean, and moved to the head of the LRU
+list. When a clean entry reaches the end of the LRU list, it is simply evicted
+if space is needed.
+
+The cache cannot evict entries that are locked, and thus it will temporarily
+grow beyond its maximum size if there are insufficient unlocked entries
+available for eviction.
+
+In the parallel version of the library, only the cache running under process 0
+of the file communicator is allowed to write metadata to file. All the other
+caches must retain dirty metadata until the process 0 cache tells them that the
+metadata is clean.
+
+Since all operations modifying metadata must be collective, all caches see the
+same stream of dirty metadata. This fact is used to allow them to synchronize
+every n bytes of dirty metadata, where n is a user-configurable value that
+defaults to 256 KB.
+
+To avoid sending the other caches messages from the future, process 0 must not
+write any dirty entries until it reaches a synchronization point. When it
+reaches a synchronization point, it writes entries as needed, and then
+broadcasts the list of flushed entries to the other caches. The caches on the
+other processes use this list to mark entries clean before they leave the
+synchronization point, allowing them to evict those entries as needed.
+
+The caches will also synchronize on a user-initiated flush.
+
+To minimize overhead when running in parallel, the cache maintains a "clean" LRU
+list in addition to the regular LRU list. This list contains only clean entries
+and is used as a source of candidates for eviction when flushing dirty entries
+is not allowed.
+
+Since flushing entries is forbidden most of the time when running in parallel,
+the caches can be forced to exceed their maximum sizes if they run out of clean
+entries to evict.
+
+To decrease the likelihood of this event, the new cache allows the user to
+specify a minimum clean size -- which is a minimum total size of all the entries
+on the clean LRU plus all unused space in the cache.
+
+While the clean LRU list is only maintained in the parallel version of the HDF5
+library, the notion of a minimum clean size still applies in the serial
+case. Here it is used to force a mix of clean and dirty entries in the cache
+even in the write-only case.
+
+This, in turn, reduces the number of redundant flushes by avoiding the case in
+which the cache fills with dirty metadata and all entries must be flushed before
+a clean entry can be evicted to make room for a new entry.
+
+Observe that in both the serial and parallel cases, the maintenance of a minimum
+clean size modifies the replacement policy, as dirty entries may be flushed
+earlier than would otherwise be the case so as to maintain the desired amount of
+clean and/or empty space in the cache.
+
+While the new metadata cache only supports the LRU replacement policy at
+present, that may change. Support for multiple replacement policies was very
+much in mind when the cache was designed, as was the ability to switch
+replacement policies at run time. The situation has been complicated by the
+later addition of the adaptive cache resizing requirement, as two of the
+resizing algorithms piggyback on the LRU list. However, if there is a need for
+additional replacement policies, it shouldn't be too hard to implement them.
+
+\section adapt Adaptive Cache Resizing in the New Metadata Cache
+
+As mentioned earlier, the metadata working set size for an HDF5 file varies
+wildly depending on the structure of the file and the access pattern. For
+example, a 2MB limit on metadata cache size is excessive for an H5repack of
+almost all HDF5 files we have tested. However, I have a file submitted by one of
+our users that will run a 13% hit rate with this cache size and will lock up one
+of our Linux boxes using the old metadata cache. Increase the new metadata cache
+size to 4 MB, and the hit rate exceeds 99%.
+
+In this case, the main culprit is a root group with more than 20,000 entries in
+it. As a result, the root group heap exceeds 1 MB, which tends to crowd out the
+rest of the metadata in a 2 MB cache
+
+This case and a number of synthetic tests convinced us that we needed to modify
+the new metadata cache to expand and contract according to need within
+user-specified bounds.
+
+I was unable to find any previous work on this problem, so I invented solutions
+as I went along. If you are aware of prior work, please send me references. The
+closest I was able to come was a group of embedded CPU designers who were
+turning off sections of their cache to conserve power.
+
+\subsection increasing Increasing the Cache Size
+
+In the context of the HDF5 library, the problem of increasing the cache size as
+necessary to contain the current working set turns out to involve two rather
+different issues.
+
+The first of these, which was recognized immediately, is the problem of
+recognizing long term changes in working set size, and increasing the cache size
+accordingly, while not reacting to transients.
+
+The second, which I recognized the hard way, is to adjust the cache size for
+sudden, dramatic increases in working set size caused by requests for large
+pieces of metadata which may be larger than the current metadata cache size.
+
+The algorithms for handling these situations are discussed below. These problems
+are largely orthogonal to each other, so both algorithms may be used
+simultaneously.
+
+\subsubsection hrtcsi  Hit Rate Threshold Cache Size Increment
+
+Perhaps the most obvious heuristic for identifying cases in which the cache is
+too small involves monitoring the hit rate. If the hit rate is low for a while,
+and the cache is at its current maximum size, the current maximum cache size is
+probably too small.
+
+The hit rate threshold algorithm for increasing cache size applies this
+intuition directly.
+
+Hit rate statistics are collected over a user-specified number of cache
+accesses. This period is known as an epoch.
+
+At the end of each epoch, the hit rate is computed, and the counters are
+reset. If the hit rate is below a user-specified threshold and the cache is at
+its current maximum size, the maximum size of the cache is increased by a
+user-specified multiple. If required, the new cache maximum size is clipped to
+stay within the user-specified upper bound on the maximum cache size, and
+optionally, within a user-specified maximum increment.
+
+My tests indicate that this algorithm works well in most cases. However, in a
+synthetic test in which hit rate increased slowly with cache size, and load
+remained steady for many epochs, I observed a case in which cache size increased
+until the hit rate just exceeded the specified minimum and then stalled. This is
+a problem, as to avoid volatility, it is necessary to set the minimum hit rate
+threshold well below the desired hit rate. Thus we may find ourselves with a
+cache running with a 91% hit rate when we really want it to increase its size
+until the hit rate is about 99%.
+
+If this case occurs frequently in actual use, I will have to come up with an
+improved algorithm. Please let me know if you see this behavior. However, I had
+to work rather hard to create it in my synthetic tests, so I would expect it to
+be uncommon.
+
+\subsubsection fcsi Flash Cache Size Increment
+
+A fundamental problem with the above algorithm is that contains the hidden
+assumption that cache entries are relatively small in comparison to the cache
+itself. While I knew this assumption was not generally true when I developed the
+algorithm, I thought that cases, where it failed, would be so rare as to not be
+worth considering, as even if they did occur, the above algorithm would rectify
+the situation within an epoch or two.
+
+While it is true that such occurrences are rare, and it is true that the hit
+rate threshold cache size increment algorithm will rectify the situation
+eventually, the performance degradation experienced by users while waiting for
+the epoch to end was so extreme that some way of accelerating response to such
+situations was essential.
+
+To understand the problem, consider the following use case:
+
+Suppose we create a group, and then repeatedly create a new data set in the
+group, write some data to it and then close it.
+
+In some versions of the HDF5 file format, the names of the datasets will be
+stored in a local heap associated with the group, and the space for that heap
+will be allocated in a single, contiguous chunk. When this local heap is full,
+we allocate a new chunk twice the size of the old, copy the data from the old
+local heap into the new, and discard the old local heap.
+
+By default, the minimum metadata cache size is set to 2 MB. Thus in this use
+case, our hit rate will be fine as long as the local heap is no larger than a
+little less than 2 MB, as the group related metadata is accessed frequently and
+never evicted, and the data set related metadata is never accessed once the data
+set is closed, and thus is evicted smoothly to make room for new data sets.
+
+All this changes abruptly when the local heap finally doubles in size to a value
+above the slightly less than 2 MB limit. All of a sudden, the local heap is the
+size of the metadata cache, and the cache must constantly swap it in to access
+it, and then swap it out to make room for other metadata.
+
+The hit rate threshold-based algorithm for increasing the cache size will fix
+this problem eventually, but performance will be very bad until it does, as the
+metadata cache will largely ineffective until its size is increased.
+
+An obvious heuristic for addressing this "big rock in a small pond" issue is to
+watch for large "incoming rocks", and increase the size of the "pond" if the
+rock is so big that it will force most of the "water" out of the "pond".
+
+The add space flash cache size increment algorithm applies this intuition
+directly:
+
+Let x be either the size of a newly inserted entry, a newly loaded entry, or the
+number of bytes by which the size of an existing entry has been increased
+(i.e. the size of the "rock").
+
+If x is greater than some user-specified fraction of the current maximum cache
+size, increase the current maximum cache size by x times some user-specified
+multiple, less any free space that was in the cache, to begin with. Further, to
+avoid confusing the other cache size increment/decrement code, start a new
+epoch.
+
+At present, this algorithm pays no attention to any user-specified limit on the
+maximum size of any single cache size increase, but it DOES stay within the
+user-specified upper bound on the maximum cache size.
+
+While it should be easy to see how this algorithm could be fooled into
+inactivity by a large number of entries that were not quite large enough to
+cross the threshold, in practice it seems to work reasonably well.
+
+Needless to say, I will revisit the issue should this cease to be the case.
+
+\subsection decreasing Decreasing the Cache Size
+
+Identifying cases in which the maximum cache size is larger than necessary
+turned out to be more difficult.
+
+\subsubsection hrtcsr Hit Rate Threshold Cache Size Reduction
+
+One obvious heuristic is to monitor the hit rate and guess that we can safely
+decrease cache size if the hit rate exceeds some user-supplied threshold (say
+.99995). The hit rate threshold size decrement algorithm implemented in the new
+metadata cache implements this intuition as follows:
+
+At the end of each epoch (this is the same epoch that is used in the cache size
+increment algorithm), the hit rate is compared with the user-specified
+threshold. If the hit rate exceeds that threshold, the current maximum cache
+size is decreased by a user-specified factor. If required, the size of the
+reduction is clipped to stay within a user-specified lower bound on the maximum
+cache size, and optionally, within a user-specified maximum decrement.
+
+In my synthetic tests, this algorithm works poorly. Even with a very high
+threshold and a small maximum reduction, it results in cache size
+oscillations. The size increment code typically increments the maximum cache
+size above the working set size. This results in a high hit rate, which causes
+the threshold size decrement code to reduce the maximum cache size below the
+working set size, which causes the hit rate to crash causing the cycle to
+repeat. The resulting average hit rate is poor.
+
+It remains to be seen if this behavior will be seen in the field. The algorithm
+is available for use, but it wouldn't be my first choice. If you use it, please
+report back.
+
+\subsubsection acsr Ageout Cache Size Reduction
+
+Another heuristic for dealing with oversized cache conditions is to look for
+entries that haven't been accessed for a long time, evict them, and reduce the
+cache size accordingly.
+
+The age out cache size reduction applies this intuition as follows: At the end
+of each epoch (again the same epoch as used in the cache size increment
+algorithm), all entries that haven't been accessed for a user-configurable
+number of epochs (1 - 10 at present) are evicted. The maximum cache size is then
+reduced to equal the sum of the sizes of the remaining entries. The size of the
+reduction is clipped to stay within a user-specified lower bound on maximum
+cache size, and optionally, within a user-specified maximum decrement.
+
+In addition, the user may specify a minimum fraction of the cache which must be
+empty before the cache size is reduced. Thus if an empty reserve of 0.1 was
+specified on a 10 MB cache, there would be no cache size reduction unless the
+eviction of aged out entries resulted in more than 1 MB of empty space. Further,
+even after the reduction, the cache would be one-tenth empty.
+
+In my synthetic tests, the age out algorithm works rather well, although it is
+somewhat sensitive to the epoch length and age out period selection.
+
+\subsubsection awhrtcsr Ageout With Hit Rate Threshold Cache Size Reduction
+
+To address these issues, I combined the hit rate threshold and age out
+heuristics.
+
+Age out with threshold works just like age out, except that the algorithm is not
+run unless the hit rate exceeded a user-specified threshold in the previous
+epoch.
+
+In my synthetic tests, age out with threshold seems to work nicely, with no
+observed oscillation. Thus I have selected it as the default cache size
+reduction algorithm.
+
+For those interested in such things, the age out algorithm is implemented by
+inserting a marker entry at the head of the LRU list at the beginning of each
+epoch. Entries that haven't been accessed for at least n epochs are simply
+entries that appear in the LRU list after the n-th marker at the end of an
+epoch.
+
+\section configuring Configuring the New Metadata Cache
+
+Due to a lack of resources, the design work on the automatic cache size
+adjustment algorithms was done hastily, using primarily synthetic tests. I don't
+think I spent more than a couple weeks writing and running performance tests --
+most time went into coding and functional testing.
+
+As a result, while I think the algorithms provided for adaptive cache resizing
+will work well in actual use, I don't really know (although preliminary results
+from the field are promising). Fortunately, the issue shouldn't arise for the
+vast majority of HDF5 users, and those for whom it may arise should be savvy
+enough to recognize problems and deal with them.
+
+For this latter class of users, I have implemented a number of new API calls
+allowing the user to select and configure the cache resize algorithms, or to
+turn them off and control cache size directly from the user program. There are
+also API calls that allow the user program to monitor hit rate and cache size.
+
+From the user perspective, all the cache configuration data for a given file is
+contained in an instance of the \ref H5AC_cache_config_t structure -- the definition
+of which is given below:
+
+\snippet H5ACpublic.h H5AC_cache_config_t_snip
+
+This structure is defined in \c H5ACpublic.h. Each field is discussed below and in
+the associated header comment.
+
+The C API allows you to get and set this structure directly. Unfortunately, the
+Fortran API has to do this with individual parameters for each of the fields
+(with the exception of version).
+
+While the API calls are discussed individually in the reference manual, the
+following high-level discussion of what fields to change for different purposes
+should be useful.
+
+\subsection gconfig General Configuration
+
+The \c version field is intended to allow \THG to change the \c
+H5AC_cache_config_t structure without breaking old code. For now, this field
+should always be set to \c H5AC__CURR_CACHE_CONFIG_VERSION, even when you are
+getting the current configuration data from the cache. The library needs the
+version number to know where fields are located with reference to the supplied
+base address.
+
+The \ref H5AC_cache_config_t.rpt_fcn_enabled "rpt_fcn_enabled" field is a
+boolean flag that allows you to turn on and off the resize reporting function
+that reports the activities of the adaptive cache resize code at the end of each
+epoch -- assuming that it is enabled.
+
+The report function is unsupported, so you are on your own if you use it. Since
+it dumps status data to stdout, you should not attempt to use it with Windows
+unless you modify the source. You may find it useful if you want to experiment
+with different adaptive resize configurations. It is also a convenient way of
+diagnosing poor cache configuration. Finally, if you do lots of runs with
+identical behavior, you can use it to determine the metadata cache size needed
+in each phase of your program so you can set the required cache sizes manually.
+
+The trace file fields are also unsupported. They allow one to open and close a
+trace file in which all calls to the metadata cache are logged in a
+user-specified file for later analysis. The feature is intended primarily for
+THG use in debugging or optimizing the metadata cache in cases where users in
+the field observe obscure failures or poor performance that we cannot re-create
+in the lab. The trace file will allow us to re-create the exact sequence of
+cache operations that are triggering the problem.
+
+At present we do not have a playback utility for trace files, although I imagine
+that we will write one quickly when and if we need it.
+
+To enable the trace file, you load the full path of the desired trace file into
+\ref H5AC_cache_config_t.trace_file_name "trace_file_name", and set \ref
+H5AC_cache_config_t.open_trace_file "open_trace_file" to \c TRUE. In the
+parallel case, an ASCII representation of the rank of each process is appended
+to the supplied trace file name to create a unique trace file name for that
+process.
+
+To close an open trace file, set \ref H5AC_cache_config_t.close_trace_file
+"close_trace_file" to \c TRUE.
+
+It must be emphasized that you are on your own if you play with the trace file
+feature absent a request from \THG. Needless to say, the trace file feature is
+disabled by default. If you enable it, you will take a large performance hit and
+generate huge trace files.
+
+The \ref H5AC_cache_config_t.evictions_enabled "evictions_enabled" field is a
+boolean flag allowing the user to disable the eviction of entries from the
+metadata cache. Under normal operation conditions, this field will always be set
+to \c TRUE.
+
+In rare circumstances, the raw data throughput requirements may be so high that
+the user wishes to postpone metadata writes so as to reserve I/O throughput for
+raw data. The \ref H5AC_cache_config_t.evictions_enabled "evictions_enabled"
+field exists to allow this -- although the user is to be warned that the
+metadata cache will grow without bound while evictions are disabled. Thus
+evictions should be re-enabled as soon as possible, and it may be wise to
+monitor cache size and statistics (to see how to enable statistics, see the
+debugging facilities section below).
+
+Evictions may only be disabled when the automatic cache resize code is disabled
+as well. Thus to disable evictions, not only must the user set the \ref
+H5AC_cache_config_t.evictions_enabled "evictions_enabled" field to \c FALSE, but
+he must also set \ref H5AC_cache_config_t.incr_mode "incr_mode" to
+#H5C_incr__off, set \ref H5AC_cache_config_t.flash_incr_mode "flash_incr_mode"
+to #H5C_flash_incr__off, and set \ref H5AC_cache_config_t.decr_mode "decr_mode"
+to #H5C_decr__off.
+
+To re-enable evictions, just set \ref H5AC_cache_config_t.evictions_enabled
+"evictions_enabled" back to \c TRUE.
+
+Before passing on to other subjects, it is worth re-iterating that disabling
+evictions is an extreme step. Before attempting it, you might consider setting a
+large cache size manually, and flushing the cache just before high raw data
+throughput is required. This may yield the desired results without the risks
+inherent in disabling evictions.
+
+The \ref H5AC_cache_config_t.set_initial_size "set_initial_size" and \ref
+H5AC_cache_config_t.initial_size "initial_size" fields allow you to specify an
+initial maximum cache size. If \ref H5AC_cache_config_t.set_initial_size
+"set_initial_size" is \c TRUE, \ref H5AC_cache_config_t.initial_size
+"initial_size" must lie in the interval [\ref H5AC_cache_config_t.min_size
+"min_size", \ref H5AC_cache_config_t.max_size "max_size"] (see below for a
+discussion of the \ref H5AC_cache_config_t.min_size "min_size" and \ref
+H5AC_cache_config_t.max_size "max_size" fields).
+
+If you disable the adaptive cache resizing code (done by setting \ref
+H5AC_cache_config_t.incr_mode "incr_mode" to #H5C_incr__off, \ref
+H5AC_cache_config_t.flash_incr_mode "flash_incr_mode" to #H5C_flash_incr__off,
+and \ref H5AC_cache_config_t.decr_mode "decr_mode" to #H5C_decr__off), you can
+use these fields to control maximum cache size manually, as the maximum cache
+size will remain at the initial size.
+
+Note, that the maximum cache size is only modified when \ref
+H5AC_cache_config_t.set_initial_size "set_initial_size" is \c TRUE. This allows
+the use of configurations specified at compile time to change resize
+configuration without altering the current maximum size of the cache. Without
+this feature, an additional call would be required to get the current maximum
+cache size so as to set the \ref H5AC_cache_config_t.initial_size "initial_size"
+to the current maximum cache size, and thereby avoid changing it.
+
+The \ref H5AC_cache_config_t.min_clean_fraction "min_clean_fraction" sets the
+current minimum clean size as a fraction of the current max cache size. While
+this field was originally used only in the parallel version of the library, it
+now applies to the serial version as well. Its value must lie in the range
+\Code{[0.0, 1.0]}. 0.01 is reasonable in the serial case, and 0.3 in the
+parallel.
+
+A potential interaction, discovered at release 1.8.3, between the enforcement of
+the \ref H5AC_cache_config_t.min_clean_fraction "min_clean_fraction" and the
+adaptive cache resize code can severely degrade performance. While this
+interaction is easily dealt with in the serial case by setting \ref
+H5AC_cache_config_t.min_clean_fraction "min_clean_fraction" to 0.01, the problem
+is more difficult in the parallel case. Please see the Interactions section
+below for further details.
+
+The \ref H5AC_cache_config_t.max_size "max_size" and \ref
+H5AC_cache_config_t.min_size "min_size" fields specify the range of maximum
+sizes that may be set for the cache by the automatic resize code. \ref
+H5AC_cache_config_t.min_size "min_size" must be less than or equal to
+\ref H5AC_cache_config_t.max_size "max_size", and both must lie in the range
+\Code{[H5C__MIN_MAX_CACHE_SIZE, H5C__MAX_MAX_CACHE_SIZE]} -- currently [1 KB,
+128 MB]. If you routinely run a cache size in the top half of this range, you
+should increase the hash table size. To do this, modify the \c
+H5C__HASH_TABLE_LEN \Code{\#define} in \c H5Cpkg.h and re-compile. At present,
+\c H5C__HASH_TABLE_LEN must be a power of two.
+
+The \c epoch_length is the number of cache accesses between runs of the adaptive
+cache size control algorithms. It is ignored if these algorithms are turned
+off. It must lie in the range \Code{[H5C__MIN_AR_EPOCH_LENGTH,
+H5C__MAX_AR_EPOCH_LENGTH]} -- currently [100, 1000000]. The above constants are
+defined in \c H5Cprivate.h. 50000 is a reasonable value.
+
+\subsection increment Increment Configuration
+
+The \ref H5AC_cache_config_t.incr_mode "incr_mode" field specifies the cache
+size increment algorithm used. Its value must be a member of the \ref
+H5C_cache_incr_mode enum type -- currently either #H5C_incr__off or
+#H5C_incr__threshold (note the double underscores after \c "incr"). This type is
+defined in H5Cpublic.h.
+
+If \ref H5AC_cache_config_t.incr_mode "incr_mode" is set to #H5C_incr__off,
+regular automatic cache size increases are disabled, and the \ref
+H5AC_cache_config_t.lower_hr_threshold "lower_hr_threshold", \ref
+H5AC_cache_config_t.increment "increment", \ref
+H5AC_cache_config_t.apply_max_increment "apply_max_increment", and \ref
+H5AC_cache_config_t.max_increment "max_increment", fields are ignored.
+
+The \ref H5AC_cache_config_t.flash_incr_mode "flash_incr_mode" field specifies
+the flash cache size increment algorithm used. Its value must be a member of the
+\ref H5C_cache_flash_incr_mode enum type -- currently either
+#H5C_flash_incr__off or #H5C_flash_incr__add_space (note the double underscores
+after \c "incr"). This type is defined in H5Cpublic.h.
+
+If \ref H5AC_cache_config_t.flash_incr_mode "flash_incr_mode" is set to
+#H5C_flash_incr__off, flash cache size increases are disabled, and the \ref
+H5AC_cache_config_t.flash_multiple "flash_multiple", and \ref
+H5AC_cache_config_t.flash_threshold "flash_threshold", fields are ignored.
+
+\subsubsection hrtcsic Hit Rate Threshold Cache Size Increase Configuration
+
+If \ref H5AC_cache_config_t.incr_mode "incr_mode" is #H5C_incr__threshold, the
+cache size is increased via the hit rate threshold algorithm. The remaining
+fields in the section are then used as follows:
+
+\ref H5AC_cache_config_t.lower_hr_threshold "lower_hr_threshold" is the
+threshold below which the hit rate must fall to trigger an increase. The value
+must lie in the range \Code{[0.0 - 1.0]}. In my tests, a relatively high value
+seems to work best -- 0.9 for example.
+
+\ref H5AC_cache_config_t.increment "increment" is the factor by which the old
+maximum cache size is multiplied to obtain an initial new maximum cache size
+when an increment is needed. The actual change in size may be smaller as
+required by \ref H5AC_cache_config_t.max_size "max_size" (above) and \c
+max_increment (discussed below). increment must be greater than or equal to
+1.0. If you set it to 1.0, you will effectively turn off the increment code. 2.0
+is a reasonable value.
+
+\ref H5AC_cache_config_t.apply_max_increment "apply_max_increment" and \ref
+H5AC_cache_config_t.max_increment "max_increment" allow the user to specify a
+maximum increment. If \ref H5AC_cache_config_t.apply_max_increment
+"apply_max_increment" is \c TRUE, the cache size will never be increased by more
+than the number of bytes specified in \ref H5AC_cache_config_t.max_increment
+"max_increment" in any single increase.
+
+\subsubsection fcsic Flash Cache Size Increase Configuration
+
+If \ref H5AC_cache_config_t.flash_incr_mode "flash_incr_mode" is set to
+#H5C_flash_incr__add_space, flash cache size increases are enabled. The size of
+the cache will be increased under the following circumstances:
+
+Let \c t be the current maximum cache size times the value of the \ref
+H5AC_cache_config_t.flash_threshold "flash_threshold" field.
+
+Let \c x be either the size of the newly inserted entry, the size of the newly
+loaded entry, or the number of bytes added to the size of the entry under
+consideration for triggering a flash cache size increase.
+
+If \Code{t < x}, the basic condition for a flash cache size increase is met, and
+we proceed as follows:
+
+Let \c space_needed equal \c x less the amount of free space in the cache.
+
+Further, let \ref H5AC_cache_config_t.increment "increment" equal \c
+space_needed times the value of the \ref H5AC_cache_config_t.flash_multiple
+"flash_multiple" field. If \ref H5AC_cache_config_t.increment "increment" plus
+the current cache size is greater than \ref H5AC_cache_config_t.max_size
+"max_size" (discussed above), reduce \ref H5AC_cache_config_t.increment
+"increment" so that \ref H5AC_cache_config_t.increment "increment" plus the
+current cache size is equal to \ref H5AC_cache_config_t.max_size "max_size".
+
+If the increment is greater than zero, increase the current cache size by \ref
+H5AC_cache_config_t.increment "increment". To avoid confusing the other cache
+size increment or decrement algorithms, start a new epoch. Note, however, that
+we do not cycle the epoch markers if some variant of the age out algorithm is in
+use.
+
+The use of the \ref H5AC_cache_config_t.flash_threshold "flash_threshold" field
+is discussed above. It must be a floating-point value in the range of
+\Code{[0.1, 1.0]}. 0.25 is a reasonable value.
+
+The use of the \ref H5AC_cache_config_t.flash_multiple "flash_multiple" field is
+also discussed above. It must be a floating-point value in the range of
+\Code{[0.1, 10.0]}. 1.4 is a reasonable value.
+
+\subsection decrement Decrement Configuration
+
+The \ref H5AC_cache_config_t.decr_mode "decr_mode" field specifies the cache
+size decrement algorithm used. Its value must be a member of the \ref
+H5C_cache_decr_mode enum type -- currently either #H5C_decr__off,
+#H5C_decr__threshold, #H5C_decr__age_out, or #H5C_decr__age_out_with_threshold
+(note the double underscores after \c "decr"). This type is defined in
+H5Cpublic.h.
+
+If \ref H5AC_cache_config_t.decr_mode "decr_mode" is set to #H5C_decr__off,
+automatic cache size decreases are disabled, and the remaining fields in the
+cache size decrease control section are ignored.
+
+\subsubsection hrtcsdc Hit Rate Threshold Cache Size Decrease Configuration
+
+If \ref H5AC_cache_config_t.decr_mode "decr_mode" is #H5C_decr__threshold, the
+cache size is decreased by the threshold algorithm, and the remaining fields of
+the decrement section are used as follows:
+
+\ref H5AC_cache_config_t.upper_hr_threshold "upper_hr_threshold" is the
+threshold above which the hit rate must rise to trigger cache size reduction. It
+must be in the range \Code{[0.0, 1.0]}. In my synthetic tests, very high values
+like .9995 or .99995 seemed to work best.
+
+\ref H5AC_cache_config_t.decrement "decrement" is the factor by which the
+current maximum cache size is multiplied to obtain a tentative new maximum cache
+size. It must lie in the range \Code{[0.0, 1.0]}. Relatively large values like
+.9 seem to work best in my synthetic tests. Note that the actual size reduction
+may be smaller as required by \ref H5AC_cache_config_t.min_size "min_size" and
+\ref H5AC_cache_config_t.max_decrement "max_decrement" (discussed below).  \ref
+H5AC_cache_config_t.apply_max_decrement "apply_max_decrement" and \ref
+H5AC_cache_config_t.max_decrement "max_decrement" allow the user to specify a
+maximum decrement. If \ref H5AC_cache_config_t.apply_max_decrement
+"apply_max_decrement" is \c TRUE, the cache size will never be reduced by more
+than \ref H5AC_cache_config_t.max_decrement "max_decrement" bytes in any single
+reduction.
+
+With the hit rate threshold cache size decrement algorithm, the remaining fields
+in the section are ignored.
+
+\subsubsection dacsr Ageout Cache Size Reduction
+
+If \ref H5AC_cache_config_t.decr_mode "decr_mode" is #H5C_decr__age_out the
+cache size is decreased by the ageout algorithm, and the remaining fields of the
+decrement section are used as follows:
+
+\ref H5AC_cache_config_t.epochs_before_eviction "epochs_before_eviction" is the
+number of epochs an entry must reside unaccessed in the cache before it is
+evicted. This value must lie in the range \Code{[1, H5C__MAX_EPOCH_MARKERS]}. \c
+H5C__MAX_EPOCH_MARKERS is defined in H5Cprivate.h, and is currently set to 10.
+
+\ref H5AC_cache_config_t.apply_max_decrement "apply_max_decrement" and \ref
+H5AC_cache_config_t.max_decrement "max_decrement" are used as in section
+2.4.3.1.
+
+\ref H5AC_cache_config_t.apply_empty_reserve "apply_emty_reserve" and \ref
+H5AC_cache_config_t.empty_reserve "empty_reserve" allow the user to specify a
+minimum empty reserve as discussed in section 2.3.2.2. An empty reserve of 0.05
+or 0.1 seems to work well.
+
+The \ref H5AC_cache_config_t.decrement "decrement" and \ref
+H5AC_cache_config_t.upper_hr_threshold "upper_hr_threshold" fields are ignored
+in this case.
+
+\subsubsection dawhrtcsr Ageout With Hit Rate Threshold Cache Size Reduction
+
+If \ref H5AC_cache_config_t.decr_mode "decr_mode" is
+#H5C_decr__age_out_with_threshold, the cache size is decreased by the ageout
+with hit rate threshold algorithm, and the fields of decrement section are used
+as per the Ageout algorithm (see 5.3.2) with the exception of \ref
+H5AC_cache_config_t.upper_hr_threshold "upper_hr_threshold".
+
+Here, \ref H5AC_cache_config_t.upper_hr_threshold "upper_hr_threshold" is the
+threshold above which the hit rate must rise to trigger cache size reduction. It
+must be in the range \Code{[0.0, 1.0]}. In my synthetic tests, high values like
+.999 seemed to work well.
+
+\subsection parallel Parallel Configuration
+
+This section is a catch-all for parallel specific configuration data. At
+present, it has only one field --
+\ref H5AC_cache_config_t.dirty_bytes_threshold "dirty_bytes_threshold".
+
+In PHDF5, all operations that modify metadata must be executed collectively. We
+used to think that this was enough to ensure consistency across the metadata
+caches, but since we allow processes to read metadata individually, the order of
+dirty entries in the LRU list can vary across processes. This, in turn, can
+change the order in which dirty metadata cache entries reach the bottom of the
+LRU and are flushed to disk -- opening the door to messages from the past and
+messages from the future bugs.
+
+To prevent this, only the metadata cache on process 0 of the file communicator
+is allowed to write to file, and then only after entering a sync point with the
+other caches. After it writes entries to file, it sends the base addresses of
+the now clean entries to the other caches, so they can mark these entries clean
+as well, and then leaves the sync point. The other caches mark the specified
+entries as clean before they leave the sync point as well. (Observe, that since
+all caches see the same stream of dirty metadata, they will all have the same
+set of dirty entries upon sync point entry and exit.)
+
+The different caches know when to synchronize by counting the number of bytes of
+dirty metadata created by the collective operations modifying metadata. Whenever
+this count exceeds the value specified in the \ref
+H5AC_cache_config_t.dirty_bytes_threshold "dirty_bytes_threshold", they all
+enter the sync point, and process 0 flushes down to its minimum clean size and
+sends the list of newly cleaned entries to the other caches.
+
+Needless to say, the value of the \ref H5AC_cache_config_t.dirty_bytes_threshold
+"dirty_bytes_threshold" field must be consistent across all the caches operating
+on a given file.
+
+All dirty metadata can also by flushed under programmatic control via the
+H5Fflush() call. This call must be collective and will reset the dirty data
+counts on each metadata cache.
+
+Absent calls to H5Fflush(), dirty metadata will only be flushed when the \ref
+H5AC_cache_config_t.dirty_bytes_threshold "dirty_bytes_threshold" is exceeded,
+and then only down to the H5AC_cache_config_t.min_clean_fraction
+"min_clean_fraction". Thus, if a program does all its metadata modifications in
+one phase, and then doesn't modify metadata thereafter, a residue of dirty
+metadata will be frozen in the metadata caches for the remainder of the
+computation -- effectively reducing the sizes of the caches.
+
+In the default configuration, the caches will eventually resize themselves to
+maintain an acceptable hit rate. However, this will take time, and it will
+increase the application's footprint in memory.
+
+If your application behaves in this manner, you can avoid this by a collective
+call to H5Fflush() immediately after the metadata modification phase.
+
+\subsection interactions Interactions
+
+Evictions may not be disabled unless the automatic cache resize code is disabled
+as well (by setting \ref H5AC_cache_config_t.decr_mode "decr_mode" to
+#H5C_decr__off, \c flash_decr_mode to #H5C_flash_incr__add_space, and \ref
+H5AC_cache_config_t.incr_mode "incr_mode" to #H5C_incr__off) -- thus placing the
+cache size under the direct control of the user program.
+
+There is no logical necessity for this restriction. It is imposed because it
+simplifies testing greatly and because I can't see any reason why one would want
+to disable evictions while the automatic cache size adjustment code was
+enabled. This restriction can be relaxed if anyone can come up with a good
+reason to do so.
+
+At present, there are two interactions between the increment and decrement
+sections of the configuration.
+
+If \ref H5AC_cache_config_t.incr_mode "incr_mode" is #H5C_incr__threshold, and
+\ref H5AC_cache_config_t.decr_mode "decr_mode" is either #H5C_decr__threshold or
+#H5C_decr__age_out_with_threshold, then \ref
+H5AC_cache_config_t.lower_hr_threshold "lower_hr_threshold" must be strictly
+less than \ref H5AC_cache_config_t.upper_hr_threshold "upper_hr_threshold".
+
+Also, if the flash cache size increment code is enabled and is triggered, it
+will restart the current epoch without calling any other cache size increment or
+decrement code.
+
+In both the serial and parallel cases, there is the potential for an interaction
+between the \ref H5AC_cache_config_t.min_clean_fraction "min_clean_fraction" and
+the cache size increment code that can severely degrade
+performance. Specifically, if the \ref H5AC_cache_config_t.min_clean_fraction
+"min_clean_fraction" is large enough, it is possible that keeping the specified
+fraction of the cache clean may generate enough flushes to seriously degrade
+performance even though the hit rate is excellent.
+
+In the serial case, this is easily dealt with by selecting a very small \ref
+H5AC_cache_config_t.min_clean_fraction "min_clean_fraction" -- 0.01 for example
+-- as this still avoids the "metadata blizzard" phenomenon that appears when the
+cache fills with dirty metadata and must then flush all of it before evicting an
+entry to make space for a new entry.
+
+The problem is more difficult in the parallel case, as the \ref
+H5AC_cache_config_t.min_clean_fraction "min_clean_fraction" is used to ensure
+that the cache contains clean entries that can be evicted to make space for new
+entries when metadata writes are forbidden -- i.e. between sync points.
+
+This issue was discovered shortly before release 1.8.3 and an automated solution
+has not been implemented. Should it become an issue for an application, try
+manually setting the cache size to ~1.5 times the maximum working set size for
+the application, and leave \ref H5AC_cache_config_t.min_clean_fraction
+"min_clean_fraction" set to 0.3.
+
+You can approximate the working set size of your application via repeated calls
+to H5Fget_mdc_size() and H5Fget_mdc_hit_rate() while running your program with
+the cache resize code enabled. The maximum value returned by H5Fget_mdc_size()
+should be a reasonable approximation -- particularly if the associated hit rate
+is good. In the parallel case, there is also an interaction between \c
+min_clean_fraction and \ref H5AC_cache_config_t.dirty_bytes_threshold
+"dirty_bytes_threshold". Absent calls to H5Fflush() (discussed above), the upper
+bound on the amount of dirty data in the metadata caches will oscillate between
+(1 - \ref H5AC_cache_config_t.min_clean_fraction "min_clean_fraction") times
+current maximum cache size, and that value plus the \ref
+H5AC_cache_config_t.dirty_bytes_threshold "dirty_bytes_threshold". Needless to
+say, it will be best if the \ref H5AC_cache_config_t.min_size "min_size", \ref
+H5AC_cache_config_t.min_clean_fraction "min_clean_fraction", and the \ref
+H5AC_cache_config_t.dirty_bytes_threshold "dirty_bytes_threshold"
+are chosen so that the cache can't fill with dirty data.
+
+\subsection defaults Default Metadata Cache Configuration
+
+Starting with release 1.8.3, HDF5 provides different default metadata cache
+configurations depending on whether the library is compiled for serial or
+parallel.
+
+The default configuration for the serial case is as follows:
+
+\code{.c}
+{
+  /* int         version                = */ H5C__CURR_AUTO_SIZE_CTL_VER,
+  /* hbool_t     rpt_fcn_enabled        = */ FALSE,
+  /* hbool_t     open_trace_file        = */ FALSE,
+  /* hbool_t     close_trace_file       = */ FALSE,
+  /* char        trace_file_name[]      = */ "",
+  /* hbool_t     evictions_enabled      = */ TRUE,
+  /* hbool_t     set_initial_size       = */ TRUE,
+  /* size_t      initial_size           = */ ( 2 * 1024 * 1024),
+  /* double      min_clean_fraction     = */ 0.01,
+  /* size_t      max_size               = */ (32 * 1024 * 1024),
+  /* size_t      min_size               = */ ( 1 * 1024 * 1024),
+  /* long int    epoch_length           = */ 50000,
+  /* enum H5C_cache_incr_mode incr_mode = */ H5C_incr__threshold,
+  /* double      lower_hr_threshold     = */ 0.9,
+  /* double      increment              = */ 2.0,
+  /* hbool_t     apply_max_increment    = */ TRUE,
+  /* size_t      max_increment          = */ (4 * 1024 * 1024),
+  /* enum H5C_cache_flash_incr_mode       */
+  /*                    flash_incr_mode = */ H5C_flash_incr__add_space,
+  /* double      flash_multiple         = */ 1.4,
+  /* double      flash_threshold        = */ 0.25,
+  /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
+  /* double      upper_hr_threshold     = */ 0.999,
+  /* double      decrement              = */ 0.9,
+  /* hbool_t     apply_max_decrement    = */ TRUE,
+  /* size_t      max_decrement          = */ (1 * 1024 * 1024),
+  /* int         epochs_before_eviction = */ 3,
+  /* hbool_t     apply_empty_reserve    = */ TRUE,
+  /* double      empty_reserve          = */ 0.1,
+  /* int         dirty_bytes_threshold  = */ (256 * 1024)
+}
+\endcode
+
+The default configuration for the parallel case is as follows:
+
+\code{.c}
+{
+  /* int         version                = */ H5C__CURR_AUTO_SIZE_CTL_VER,
+  /* hbool_t     rpt_fcn_enabled        = */ FALSE,
+  /* hbool_t     open_trace_file        = */ FALSE,
+  /* hbool_t     close_trace_file       = */ FALSE,
+  /* char        trace_file_name[]      = */ "",
+  /* hbool_t     evictions_enabled      = */ TRUE,
+  /* hbool_t     set_initial_size       = */ TRUE,
+  /* size_t      initial_size           = */ ( 2 * 1024 * 1024),
+  /* double      min_clean_fraction     = */ 0.3,
+  /* size_t      max_size               = */ (32 * 1024 * 1024),
+  /* size_t      min_size               = */ ( 1 * 1024 * 1024),
+  /* long int    epoch_length           = */ 50000,
+  /* enum H5C_cache_incr_mode incr_mode = */ H5C_incr__threshold,
+  /* double      lower_hr_threshold     = */ 0.9,
+  /* double      increment              = */ 2.0,
+  /* hbool_t     apply_max_increment    = */ TRUE,
+  /* size_t      max_increment          = */ (4 * 1024 * 1024),
+  /* enum H5C_cache_flash_incr_mode       */
+  /*                    flash_incr_mode = */ H5C_flash_incr__add_space,
+  /* double      flash_multiple         = */ 1.0,
+  /* double      flash_threshold        = */ 0.25,
+  /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
+  /* double      upper_hr_threshold     = */ 0.999,
+  /* double      decrement              = */ 0.9,
+  /* hbool_t     apply_max_decrement    = */ TRUE,
+  /* size_t      max_decrement          = */ (1 * 1024 * 1024),
+  /* int         epochs_before_eviction = */ 3,
+  /* hbool_t     apply_empty_reserve    = */ TRUE,
+  /* double      empty_reserve          = */ 0.1,
+  /* int         dirty_bytes_threshold  = */ (256 * 1024)
+}
+\endcode
+
+The default serial configuration should be adequate for most serial HDF5 users.
+
+The same may not be true for the default parallel configuration due to the
+interaction between the \ref H5AC_cache_config_t.min_clean_fraction "min_clean_fraction" and the cache size increase code. See
+the Interactions section for further details.
+
+Should you need to change the default configuration, it can be found in
+H5ACprivate.h. Look for the definition of H5AC__DEFAULT_RESIZE_CONFIG.
+
+\section controlling Controlling the New Metadata Cache Size From Your Program
+
+You have already seen how \ref H5AC_cache_config_t has facilities that allow you
+to control the metadata cache size directly. Use H5Fget_mdc_config() and
+H5Fset_mdc_config() to get and set the metadata cache configuration on an open
+file. Use H5Pget_mdc_config() and H5Pset_mdc_config() to get and set the initial
+metadata cache configuration in a file access property list. Recall that this
+list contains configuration data used when opening a file.
+
+Use H5Fget_mdc_hit_rate() to get the average hit rate since the last time the
+hit rate stats were reset. This happens automatically at the beginning of each
+epoch if the adaptive cache resize code is enabled. You can also do it manually
+with H5Freset_mdc_hit_rate_stats(). Be careful about doing this if the adaptive
+cache resize code is enabled, as you may confuse it.
+
+Use H5Fget_mdc_size() to get metadata cache size data on an open file.
+
+Finally, note that cache size and cache footprint are two different things -- in
+my tests, the cache footprint (as inferred from the UNIX \c top command) is
+typically about three times the maximum cache size. I haven't tracked it down
+yet, but I would guess that most of this is due to the very small typical cache
+entry size combined with the rather large size of the cache entry header
+structure. This should be investigated further, but there are other matters of
+higher priority.
+
+\section news New Metadata Cache Debugging Facilities
+
+The new metadata cache has a variety of debugging facilities that may be of
+use. I doubt that any other than the report function and the trace file will
+ever be accessible via the API, but they are relatively easy to turn on in the
+source code.
+
+Note that none of this should be viewed as supported -- it is described here on
+the off chance that you want to use it, but you are on your own if you do. Also,
+there are no promises as to consistency between versions.
+
+As mentioned above, you can use the \ref H5AC_cache_config_t.rpt_fcn_enabled "rpt_fcn_enabled" field of the
+configuration structure to enable the default reporting function
+(H5C_def_auto_resize_rpt_fcn() in H5C.c). If this function doesn't work for you,
+you will have to write your own. In particular, remember that it uses \c stdout,
+so it will probably be unhappy under Windows.
+
+Again, remember that this facility is not supported. Further, it is likely to
+change every time I do any serious work on the cache.
+
+There is also an extensive statistics collection code. Use
+H5C_COLLECT_CACHE_STATS and H5C_COLLECT_CACHE_ENTRY_STATS in H5Cprivate.h to
+turn this on. If you also turn on H5AC_DUMP_STATS_ON_CLOSE in H5ACprivate.h,
+stats will be dumped when you close a file. Alternatively you can call
+H5C_stats() and H5C_stats__reset() within the library to dump and reset
+stats. Both of these functions are defined in H5C.c.
+
+Finally, the cache also contains an extensive sanity checking code. Much of this
+is turned on when you compile in debug mode, but to enable the full suite, turn
+on H5C_DO_SANITY_CHECKS in H5Cprivate.h.
+
+\section trouble Trouble Shooting
+
+Absent major bugs in the cache, the only troubleshooting you should have to do
+is diagnosing and fixing problems with your cache configuration.
+
+Assuming it runs on your platform (I've only used it under Linux), the reporting
+function is probably the most convenient diagnosis tool. However, since it is
+unsupported code, I will not discuss it further beyond directing you to the
+source (H5C_def_auto_resize_rpt_fcn() in H5C.c).
+
+Absent the reporting function, regular calls to H5Fget_mdc_hit_rate() should
+give you a good idea of the hit rate over time. Remember that the hit rate stats
+are reset at the end of each epoch (when adaptive cache resizing is enabled), so
+you should expect some jitter.
+
+Similar calls to H5Fget_mdc_size() should allow you to monitor cache size and
+the fraction of the current maximum cache size that is actually in use.
+
+If the hit rate is consistently low, and the cache it at its current maximum
+size, increasing the maximum size is an obvious fix.
+
+If you see hit rate and cache size oscillations, try disabling adaptive cache
+resizing and setting a fixed cache size a bit greater than the high end of the
+cache size oscillations you observed.
+
+If the hit rate oscillations don't go away, you are probably looking at a
+feature of your application that can't be helped without major changes to the
+cache. Please send along a description of the situation.
+
+If the oscillations do go away, you may be able to come up with a configuration
+that deals with the situation. If that fails, control the cache size manually,
+and write to me, so I can try to develop an adaptive resize algorithm that works
+in your case.
+
+Needless to say, you should give the cache a few epochs to adapt to
+circumstances. If that is too slow for you, try manual cache size control.
+
+If you find it necessary to disable evictions, you may find it useful to enable
+the internal statistics collection code mentioned above in the section on
+debugging facilities.
+
+Amongst many other things, the stats code will report the maximum cache size,
+and the average successful and unsuccessful search depths in the hash table. If
+these latter figures are significantly above 1, you should increase the size of
+the hash table.
+
+ */
+\ No newline at end of file
diff --git a/doxygen/dox/Overview.dox b/doxygen/dox/Overview.dox
new file mode 100644
index 0000000..3d171f7
--- /dev/null
+++ b/doxygen/dox/Overview.dox
@@ -0,0 +1,47 @@
+
+/** \mainpage notitle
+
+This is the documentation set for HDF5.
+It includes specifications and documentation
+of software and tools developed and maintained by
+<a href="https://www.hdfgroup.org/">The HDF Group</a>. It is impractical to document
+the entire HDF5 ecosystem in one place, and you should also consult the documentation
+sets of the many outstanding community projects.
+
+For a first contact with HDF5, the best place is to have a look at the \link
+GettingStarted getting started \endlink page that shows you how to write and
+compile your first program with HDF5.
+
+The \b main \b documentation is organized by documentation flavor. Most
+technical documentation consists to varying degrees of information related to
+<em>tasks</em>, <em>concepts</em>, or <em>reference</em> material. As its title
+suggests, the \link RM Reference Manual \endlink is 100% reference material,
+while the \link Cookbook \endlink is focused on tasks. The different guide-type
+documents cover a mix of tasks, concepts, and reference, to help a specific
+<em>audience</em> succeed.
+
+\par Versions
+     Version-specific documentation (see the version in the title area) can be found
+     here:
+     - HDF5 <code>develop</code> branch (this site)
+     - <a href="https://docs.hdfgroup.org/hdf5/v1_14/index.html">HDF5 1.14.x</a>
+     - <a href="https://docs.hdfgroup.org/hdf5/v1_12/index.html">HDF5 1.12.x</a>
+     - <a href="https://docs.hdfgroup.org/hdf5/v1_10/index.html">HDF5 1.10.x</a>
+     - <a href="https://docs.hdfgroup.org/hdf5/v1_8/index.html">HDF5 1.8.x</a>
+
+\par Search
+     If you are looking for a specific function, constant, type, etc., use the
+     search box in the top right-hand corner!\n Otherwise, check out the
+     \link FTS full-text search\endlink.
+
+\par Offline reading
+     You can <a href="hdf5-doc.tgz">download</a> it as a tgz archive for offline reading.
+
+\par History
+     A snapshot (~April 2017) of the pre-Doxygen HDF5 documentation can be found
+     <a href="https://docs.hdfgroup.org/archive/support/HDF5/doc/index.html">here</a>.
+
+\par ToDo List
+     There is plenty of <a href="./todo.html">unfinished business</a>.
+
+*/
diff --git a/doxygen/dox/PredefinedDatatypeTables.dox b/doxygen/dox/PredefinedDatatypeTables.dox
new file mode 100644
index 0000000..fbafa94
--- /dev/null
+++ b/doxygen/dox/PredefinedDatatypeTables.dox
@@ -0,0 +1,22 @@
+/** \page predefined_datatypes_tables HDF5 Predefined Datatypes
+ *
+ * The following datatypes are predefined in HDF5.
+ *
+ * \snippet{doc} tables/predefinedDatatypes.dox predefined_ieee_datatypes_table
+ * 
+ * \snippet{doc} tables/predefinedDatatypes.dox predefined_std_datatypes_table
+ *
+ * \snippet{doc} tables/predefinedDatatypes.dox predefined_unix_datatypes_table
+ *
+ * \snippet{doc} tables/predefinedDatatypes.dox predefined_string_datatypes_table
+ *
+ * \snippet{doc} tables/predefinedDatatypes.dox predefined_intel_datatypes_table
+ *
+ * \snippet{doc} tables/predefinedDatatypes.dox predefined_dec_datatypes_table
+ *
+ * \snippet{doc} tables/predefinedDatatypes.dox predefined_mips_datatypes_table
+ *
+ * \snippet{doc} tables/predefinedDatatypes.dox predefined_native_datatypes_table
+ *
+ * \snippet{doc} tables/predefinedDatatypes.dox predefined_c9x_datatypes_table
+ */
diff --git a/doxygen/dox/RFC.dox b/doxygen/dox/RFC.dox
new file mode 100644
index 0000000..1b1141b
--- /dev/null
+++ b/doxygen/dox/RFC.dox
@@ -0,0 +1,104 @@
+/** \page RFC RFCs
+
+<table>
+<tr><th>RFC ID</th><th>Title</th></tr>
+<tr> <td>2022-08-19</td> <td>\ref_rfc20220819</td></tr>
+<tr> <td>2021-05-28</td> <td>\ref_rfc20210528</td></tr>
+<tr> <td>2021-02-19</td> <td>\ref_rfc20210219</td></tr>
+<tr> <td>2020-02-13</td> <td>\ref_rfc20200213</td></tr>
+<tr> <td>2020-02-10</td> <td>\ref_rfc20200210</td></tr>
+<tr> <td>2019-09-23</td> <td>\ref_rfc20190923</td></tr>
+<tr> <td>2019-07-15</td> <td>\ref_rfc20190715</td></tr>
+<tr> <td>2019-04-10</td> <td>\ref_rfc20190410</td></tr>
+<tr> <td>2018-12-31</td> <td>\ref_rfc20181231</td></tr>
+<tr> <td>2018-12-20</td> <td>\ref_rfc20181220</td></tr>
+<tr> <td>2018-08-30</td> <td>\ref_rfc20180830</td></tr>
+<tr> <td>2018-08-29</td> <td>\ref_rfc20180829</td></tr>
+<tr> <td>2018-08-15</td> <td>\ref_rfc20180815</td></tr>
+<tr> <td>2018-07-12</td> <td>\ref_rfc20180712</td></tr>
+<tr> <td>2018-06-20</td> <td>\ref_rfc20180620</td></tr>
+<tr> <td>2018-06-10</td> <td>\ref_rfc20180610</td></tr>
+<tr> <td>2018-03-21</td> <td>\ref_rfc20180321</td></tr>
+<tr> <td>2018-01-25</td> <td>\ref_rfc20180125</td></tr>
+<tr> <td>2017-07-07</td> <td>\ref_rfc20170707</td></tr>
+<tr> <td>2016-01-05</td> <td>\ref_rfc20160105</td></tr>
+<tr> <td>2015-09-15</td> <td>\ref_rfc20150915</td></tr>
+<tr> <td>2015-07-09</td> <td>\ref_rfc20150709</td></tr>
+<tr> <td>2015-06-15</td> <td>\ref_rfc20150615</td></tr>
+<tr> <td>2015-04-29</td> <td>\ref_rfc20150429</td></tr>
+<tr> <td>2015-04-24</td> <td>\ref_rfc20150424</td></tr>
+<tr> <td>2015-04-23</td> <td>\ref_rfc20150423</td></tr>
+<tr> <td>2015-03-01</td> <td>\ref_rfc20150301</td></tr>
+<tr> <td>2015-02-12</td> <td>\ref_rfc20150212</td></tr>
+<tr> <td>2015-02-05</td> <td>\ref_rfc20150205</td></tr>
+<tr> <td>2015-02-02</td> <td>\ref_rfc20150202</td></tr>
+<tr> <td>2014-12-10</td> <td>\ref_rfc20141210</td></tr>
+<tr> <td>2014-12-01</td> <td>\ref_rfc20141201</td></tr>
+<tr> <td>2014-09-16</td> <td>\ref_rfc20140916</td></tr>
+<tr> <td>2014-08-27</td> <td>\ref_rfc20140827</td></tr>
+<tr> <td>2014-07-29</td> <td>\ref_rfc20140729</td></tr>
+<tr> <td>2014-07-22</td> <td>\ref_rfc20140722</td></tr>
+<tr> <td>2014-07-17</td> <td>\ref_rfc20140717</td></tr>
+<tr> <td>2014-07-07</td> <td>\ref_rfc20140707</td></tr>
+<tr> <td>2014-05-24</td> <td>\ref_rfc20140524</td></tr>
+<tr> <td>2014-03-18</td> <td>\ref_rfc20140318</td></tr>
+<tr> <td>2014-03-13</td> <td>\ref_rfc20140313</td></tr>
+<tr> <td>2014-02-24</td> <td>\ref_rfc20140224</td></tr>
+<tr> <td>2013-12-11</td> <td>\ref_rfc20131211</td></tr>
+<tr> <td>2013-09-30</td> <td>\ref_rfc20130930</td></tr>
+<tr> <td>2013-09-19</td> <td>\ref_rfc20130919</td></tr>
+<tr> <td>2013-06-30</td> <td>\ref_rfc20130630</td></tr>
+<tr> <td>2013-03-16</td> <td>\ref_rfc20130316</td></tr>
+<tr> <td>2012-11-14</td> <td>\ref_rfc20121114</td></tr>
+<tr> <td>2012-10-24</td> <td>\ref_rfc20121024</td></tr>
+<tr> <td>2012-08-28</td> <td>\ref_rfc20120828</td></tr>
+<tr> <td>2012-05-23</td> <td>\ref_rfc20120523</td></tr>
+<tr> <td>2012-05-01</td> <td>\ref_rfc20120501</td></tr>
+<tr> <td>2012-03-05</td> <td>\ref_rfc20120305</td></tr>
+<tr> <td>2012-02-20</td> <td>\ref_rfc20120220</td></tr>
+<tr> <td>2012-01-20</td> <td>\ref_rfc20120120</td></tr>
+<tr> <td>2012-01-04</td> <td>\ref_rfc20120104</td></tr>
+<tr> <td>2011-11-19</td> <td>\ref_rfc20111119</td></tr>
+<tr> <td>2011-08-25</td> <td>\ref_rfc20110825</td></tr>
+<tr> <td>2011-08-11</td> <td>\ref_rfc20110811</td></tr>
+<tr> <td>2011-07-26</td> <td>\ref_rfc20110726</td></tr>
+<tr> <td>2011-06-14</td> <td>\ref_rfc20110614</td></tr>
+<tr> <td>2011-03-29</td> <td>\ref_rfc20110329</td></tr>
+<tr> <td>2011-01-18</td> <td>\ref_rfc20110118</td></tr>
+<tr> <td>2010-11-22</td> <td>\ref_rfc20101122</td></tr>
+<tr> <td>2010-11-04</td> <td>\ref_rfc20101104</td></tr>
+<tr> <td>2010-10-18</td> <td>\ref_rfc20101018</td></tr>
+<tr> <td>2010-09-02</td> <td>\ref_rfc20100902</td></tr>
+<tr> <td>2010-07-27</td> <td>\ref_rfc20100727</td></tr>
+<tr> <td>2010-07-26</td> <td>\ref_rfc20100726</td></tr>
+<tr> <td>2010-05-11</td> <td>\ref_rfc20100511</td></tr>
+<tr> <td>2010-04-22</td> <td>\ref_rfc20100422</td></tr>
+<tr> <td>2010-03-12</td> <td>\ref_rfc20100312</td></tr>
+<tr> <td>2009-12-18</td> <td>\ref_rfc20091218</td></tr>
+<tr> <td>2009-09-07</td> <td>\ref_rfc20090907</td></tr>
+<tr> <td>2009-06-12</td> <td>\ref_rfc20090612</td></tr>
+<tr> <td>2008-12-18</td> <td>\ref_rfc20081218</td></tr>
+<tr> <td>2008-12-05</td> <td>\ref_rfc20081205</td></tr>
+<tr> <td>2008-10-30</td> <td>\ref_rfc20081030</td></tr>
+<tr> <td>2008-09-15</td> <td>\ref_rfc20080915</td></tr>
+<tr> <td>2008-09-04</td> <td>\ref_rfc20080904</td></tr>
+<tr> <td>2008-07-28</td> <td>\ref_rfc20080728</td></tr>
+<tr> <td>2008-07-23</td> <td>\ref_rfc20080723</td></tr>
+<tr> <td>2008-03-01</td> <td>\ref_rfc20080301</td></tr>
+<tr> <td>2008-02-09</td> <td>\ref_rfc20080209</td></tr>
+<tr> <td>2008-02-06</td> <td>\ref_rfc20080206</td></tr>
+<tr> <td>2007-11-11</td> <td>\ref_rfc20071111</td></tr>
+<tr> <td>2007-10-18</td> <td>\ref_rfc20071018</td></tr>
+<tr> <td>2007-08-01</td> <td>\ref_rfc20070801</td></tr>
+<tr> <td>2007-04-13</td> <td>\ref_rfc20070413</td></tr>
+<tr> <td>2007-01-15</td> <td>\ref_rfc20070115</td></tr>
+<tr> <td>2006-06-23</td> <td>\ref_rfc20060623</td></tr>
+<tr> <td>2006-06-04</td> <td>\ref_rfc20060604</td></tr>
+<tr> <td>2006-05-05</td> <td>\ref_rfc20060505</td></tr>
+<tr> <td>2006-04-10</td> <td>\ref_rfc20060410</td></tr>
+<tr> <td>2006-03-17</td> <td>\ref_rfc20060317</td></tr>
+<tr> <td>2006-01-24</td> <td>\ref_rfc20060124</td></tr>
+<tr> <td>2004-08-11</td> <td>\ref_rfc20040811</td></tr>
+</table>
+
+*/
diff --git a/doxygen/dox/ReferenceManual.dox b/doxygen/dox/ReferenceManual.dox
new file mode 100644
index 0000000..b9bcd49
--- /dev/null
+++ b/doxygen/dox/ReferenceManual.dox
@@ -0,0 +1,181 @@
+/** \page RM HDF5 Reference Manual
+
+The functions provided by the HDF5 API are grouped into the following
+\Emph{modules}:
+
+<table>
+<tr><th>Modules</th></tr>
+<tr valign="top">
+<td>
+<table>
+<caption>Core Reference Manual Modules</caption>
+<tr><th>Module</th><th colspan="4">Language</th><th>Description</th></tr>
+<tr>
+<th>Attributes (H5A)</th><td>@ref H5A "C"</td><td>@ref H5::Attribute "C++"</td><td>@ref FH5A "Fortran"</td><td>@ref JH5A "Java"</td><td>HDF5 attribute is a small metadata object describing the nature and/or intended usage of a primary data object.
+</td>
+</tr>
+<tr>
+<th>Datasets (H5D)</th><td>@ref H5D "C"</td><td>@ref H5::DataSet "C++"</td><td>@ref FH5D "Fortran"</td><td>@ref JH5D "Java"</td><td>Manage HDF5 datasets, including the transfer of data between memory and disk and the description of dataset properties.
+</td>
+</tr>
+<tr>
+<th>Dataspaces (H5S)</th><td>@ref H5S "C"</td><td>@ref H5::DataSpace "C++"</td><td>@ref FH5S "Fortran"</td><td>@ref JH5S "Java"</td><td>HDF5 dataspaces describe the shape of datasets in memory or in HDF5 files.
+</td>
+</tr>
+<tr>
+<th>Datatypes (H5T)</th><td>@ref H5T "C"</td><td>@ref H5::DataType "C++"</td><td>@ref FH5T "Fortran"</td><td>@ref JH5T "Java"</td><td>HDF5 datatypes describe the element type of HDF5 datasets and attributes.
+</td>
+</tr>
+<tr>
+<th>Error Handling (H5E)</th><td>@ref H5E "C"</td><td>@ref H5::Exception "C++"</td><td>@ref FH5E "Fortran"</td><td>@ref JH5E "Java"</td><td>HDF5 library error reporting.
+</td>
+</tr>
+<tr>
+<th>Event Set (H5ES)</th><td>@ref H5ES "C"</td><td>"C++"</td><td>"Fortran"</td><td>"Java"</td><td>HDF5 event set life cycle used with HDF5 VOL connectors that enable the asynchronous feature in HDF5.
+</td>
+</tr>
+<tr>
+<th>Files (H5F)</th><td>@ref H5F "C"</td><td>@ref H5::H5File "C++"</td><td>@ref FH5F "Fortran"</td><td>@ref JH5F "Java"</td><td>Manage HDF5 files.
+</td>
+</tr>
+<tr>
+<th>Filters (H5Z)</th><td>@ref H5Z "C"</td><td>"C++"</td><td>@ref FH5Z "Fortran"</td><td>@ref JH5Z "Java"</td><td>Manage HDF5 user-defined filters
+</td>
+</tr>
+<tr>
+<th>Groups (H5G)</th><td>@ref H5G "C"</td><td>@ref H5::Group "C++"</td><td>@ref FH5G "Fortran"</td><td>@ref JH5G "Java"</td><td>Manage HDF5 groups.
+</td>
+</tr>
+<tr>
+<th>Identifiers (H5I)</th><td>@ref H5I "C"</td><td>@ref H5::IdComponent "C++"</td><td>@ref FH5I "Fortran"</td><td>@ref JH5I "Java"</td><td>Manage identifiers defined by the HDF5 library.
+</td>
+</tr>
+<tr>
+<th>Library General (%H5)</th><td>@ref H5 "C"</td><td>@ref H5::H5Library "C++"</td><td>@ref FH5 "Fortran"</td><td>@ref JH5 "Java"</td><td>Manage the life cycle of HDF5 library instances.
+</td>
+</tr>
+<tr>
+<th>Links (H5L)</th><td>@ref H5L "C"</td><td>"C++"</td><td>@ref FH5L "Fortran"</td><td>@ref JH5L "Java"</td><td>Manage HDF5 links and link types.
+</td>
+</tr>
+<tr>
+<th>Objects (H5O)</th><td>@ref H5O "C"</td><td>"C++"</td><td>@ref FH5O "Fortran"</td><td>@ref JH5O "Java"</td><td>Manage HDF5 objects (groups, datasets, datatype objects).
+</td>
+</tr>
+<tr>
+<th>Property Lists (H5P)</th><td>@ref H5P "C"</td><td>@ref H5::PropList "C++"</td><td>@ref FH5P "Fortran"</td><td>@ref JH5P "Java"</td><td>HDF5 property lists are the main vehicle to configure the behavior of HDF5 API functions.
+</td>
+</tr>
+<tr>
+<th>Dynamically-loaded Plugins (H5PL)</th><td>@ref H5PL "C"</td><td>"C++"</td><td>"Fortran"</td><td>@ref JH5PL "Java"</td><td>Manage the loading behavior of HDF5 plugins.
+</td>
+</tr>
+<tr>
+<th>References (H5R)</th><td>@ref H5R "C"</td><td>"C++"</td><td>@ref FH5R "Fortran"</td><td>@ref JH5R "Java"</td><td>Manage HDF5 references (HDF5 objects, attributes, and selections on datasets a.k.a. dataset regions).
+</td>
+</tr>
+<tr>
+<th>VOL Connector (H5VL)</th><td>@ref H5VL "C"</td><td>"C++"</td><td>@ref FH5VL "Fortran"</td><td>@ref JH5VL "Java"</td><td>Manage HDF5 VOL connector plugins.
+</td>
+</tr>
+</table>
+<table>
+<caption>High-level Reference Manual Modules</caption>
+<tr><th>Module</th><th colspan="4"></th>Language<th>Description</th></tr>
+<tr>
+<th>HDF5 Lite APIs (H5LT,H5LD)</th><td>@ref H5LT "C"</td><td>"C++"</td><td>@ref FH5LT "Fortran"</td><td>"Java"</td><td>Functions to simplify creating and manipulating datasets, attributes and other features.
+</td>
+</tr>
+<tr>
+<th>HDF5 Images API (H5IM)</th><td>@ref H5IM "C"</td><td>"C++"</td><td>@ref FH5IM "Fortran"</td><td>"Java"</td><td>Creating and manipulating HDF5 datasets intended to be interpreted as images.
+</td>
+</tr>
+<tr>
+<th>HDF5 Table APIs (H5TB)</th><td>@ref H5TB "C"</td><td>"C++"</td><td>@ref FH5TB "Fortran"</td><td>"Java"</td><td>Creating and manipulating HDF5 datasets intended to be interpreted as tables.
+</td>
+</tr>
+<tr>
+<th>HDF5 Packet Table APIs (H5PT)</th><td>@ref H5PT "C"</td><td>"C++"</td><td>"Fortran"</td><td>"Java"</td><td>Creating and manipulating HDF5 datasets to support append- and read-only operations on table data.
+</td>
+</tr>
+<tr>
+<th>HDF5 Dimension Scales APIs (H5DS)</th><td>@ref H5DS "C"</td><td>"C++"</td><td>@ref FH5DS "Fortran"</td><td>"Java"</td><td>Creating and manipulating HDF5 datasets that are associated with the dimension of another HDF5 dataset.
+</td>
+</tr>
+<tr>
+<th>HDF5 Optimizations APIs (H5DO)</th><td>@ref H5DO "C"</td><td>"C++"</td><td>"Fortran"</td><td>"Java"</td><td>Bypassing default HDF5 behavior in order to optimize for specific use cases.
+</td>
+</tr>
+<tr>
+<th>Extensions (H5LR, H5LT)</th><td>@ref H5LR "C"</td><td>"C++"</td><td>"Fortran"</td><td>"Java"</td><td>
+</td>
+</tr>
+</table>
+</td>
+</tr>
+<tr><td>
+<table>
+<caption>Additional Java Reference Manual Modules</caption>
+<tr>
+<td>@ref HDF5CONST</td><td>This class contains C constants and enumerated types of HDF5 library.
+</td>
+</tr>
+<tr>
+<td>@ref HDFNATIVE</td><td>This class encapsulates native methods to deal with arrays of numbers, converting from numbers to bytes and bytes to numbers.
+</td>
+</tr>
+<tr>
+<td>@ref HDFARRAY</td><td>This is a class for handling multidimensional arrays for HDF.
+</td>
+</tr>
+<tr>
+<td>@ref ERRORS</td><td>The class HDF5Exception returns errors from the Java HDF5 Interface.
+</td>
+</tr>
+</table>
+</td>
+</tr>
+<tr>
+<td>
+\ref predefined_datatypes_tables<br />
+<a href="./deprecated.html">Deprecated functions</a><br />
+Functions with \ref ASYNC<br />
+\ref api-compat-macros
+</td>
+</tr>
+</table>
+
+Follow these simple rules and stay out of trouble:
+
+\li \Bold{Handle discipline:} The HDF5 API is rife with handles or
+    identifiers, which you typically obtain by creating new HDF5 items, copying
+    items, or retrieving facets of items. Consequently, \Bold{and most importantly}, you are 
+    responsible for releasing the underlying
+    resources via the matching \Code{H5*close()} call, or deal with the consequences
+    of resource leakage.
+\li \Bold{Closed means closed:} Do not pass identifiers that were previously
+    \Code{H5*close()}-d to other API functions! It will generate an error.
+\li \Bold{Dynamic memory allocation:} The API contains a few functions in which the
+    HDF5 library dynamically allocates memory on the caller's behalf. The caller owns
+    this memory and eventually must free it by calling H5free_memory() and not language-explicit memory functions.
+\li \Bold{Be careful with that saw:} Do not modify the underlying collection when an
+    iteration is in progress!
+\li \Bold{Use of locations:} Certain API functions, typically called \Code{H5***_by_name}
+    use a combination of identifiers and path names to refer to HDF5 objects.
+    If the identifier fully specifies the object in question, pass \Code{'.'} (a dot)
+    for the name!
+
+</td>
+</tr>
+</table>
+
+\cpp_c_api_note
+
+\par Don't like what you see? - You can help to improve this Reference Manual
+     Complete the survey linked near the top of this page!\n
+     We treat documentation like code: Fork the
+     <a href="https://github.com/HDFGroup/hdf5">HDF5 repo</a>, make changes, and create a
+     <a href="https://github.com/HDFGroup/hdf5/pulls">pull request</a> !\n
+     See the \ref RMT for general guidance.
+
+*/
diff --git a/doxygen/dox/Specifications.dox b/doxygen/dox/Specifications.dox
new file mode 100644
index 0000000..e352f40
--- /dev/null
+++ b/doxygen/dox/Specifications.dox
@@ -0,0 +1,58 @@
+/** \page SPEC Specifications
+
+\section DDL
+
+\li \ref DDLBNF110
+\li \ref DDLBNF112
+
+\section File Format
+
+\li \ref FMT1
+\li \ref FMT11
+\li \ref FMT2
+\li \ref FMT3
+
+\section Other
+
+\li \ref IMG
+\li \ref TBL
+\li <a href="https://support.hdfgroup.org/HDF5/doc/HL/H5DS_Spec.pdf">
+      HDF5 Dimension Scale Specification</a>
+
+*/
+
+/** \page FMT3 HDF5 File Format Specification Version 3.0
+
+\htmlinclude H5.format.html
+
+*/
+
+/** \page FMT2 HDF5 File Format Specification Version 2.0
+
+\htmlinclude H5.format.2.0.html
+
+*/
+
+/** \page FMT11 HDF5 File Format Specification Version 1.1
+
+\htmlinclude H5.format.1.1.html
+
+*/
+
+/** \page FMT1 HDF5 File Format Specification Version 1.0
+
+\htmlinclude H5.format.1.0.html
+
+*/
+
+/** \page IMG HDF5 Image and Palette Specification Version 1.2
+
+\htmlinclude ImageSpec.html
+
+*/
+
+/** \page TBL HDF5 Table Specification Version 1.0
+
+\htmlinclude TableSpec.html
+
+*/
diff --git a/doxygen/dox/TechnicalNotes.dox b/doxygen/dox/TechnicalNotes.dox
new file mode 100644
index 0000000..bca81e4
--- /dev/null
+++ b/doxygen/dox/TechnicalNotes.dox
@@ -0,0 +1,48 @@
+/** \page TN Technical Notes
+
+\li \ref api-compat-macros
+\li \ref APPDBG
+\li \ref FMTDISC
+\li \ref FILTER
+\li \ref IOFLOW
+\li \ref TNMDC
+\li \ref MT
+\li \ref VFL
+
+ */
+
+/** \page MT HDF5 Thread Safe library
+
+\htmlinclude ThreadSafeLibrary.html
+
+*/
+
+/** \page IOFLOW HDF5 Raw I/O Flow Notes
+
+\htmlinclude IOFlow.html
+
+*/
+
+/** \page VFL HDF5 Virtual File Layer
+
+\htmlinclude VFL.html
+
+*/
+
+/** \page FMTDISC HDF5 File Format Discussion
+
+\htmlinclude FileFormat.html
+
+*/
+
+/** \page FILTER HDF5 Filters
+
+\htmlinclude Filters.html
+
+*/
+
+/** \page APPDBG Debugging HDF5 Applications
+
+\htmlinclude DebuggingHDF5Applications.html
+
+*/
+\ No newline at end of file
diff --git a/doxygen/dox/UsersGuide.dox b/doxygen/dox/UsersGuide.dox
new file mode 100644
index 0000000..10b4ba1
--- /dev/null
+++ b/doxygen/dox/UsersGuide.dox
@@ -0,0 +1,439 @@
+/** \page UG HDF5 User Guide
+
+<center>
+HDF5 Release 1.14
+
+\image html HDFG-logo.png "The HDF Group"
+
+</center>
+
+\ref sec_data_model
+\li \ref subsec_data_model_intro
+\li \ref subsec_data_model_abstract
+    <ul>
+        <li> \ref subsubsec_data_model_abstract_file
+        <li> \ref subsubsec_data_model_abstract_group
+        <li> \ref subsubsec_data_model_abstract_dataset
+        <li> \ref subsubsec_data_model_abstract_space
+        <li> \ref subsubsec_data_model_abstract_type
+        <li> \ref subsubsec_data_model_abstract_attr
+        <li> \ref subsubsec_data_model_abstract_plist
+        <li> \ref subsubsec_data_model_abstract_link
+    </ul>
+\li \ref subsec_data_model_storage
+    <ul>
+        <li> \ref subsubsec_data_model_storage_spec
+        <li> \ref subsubsec_data_model_storage_imple
+    </ul>
+\li \ref subsec_data_model_structure
+    <ul>
+        <li> \ref subsubsec_data_model_structure_file
+        <li> \ref subsubsec_data_model_structure_path
+        <li> \ref subsubsec_data_model_structure_example
+    </ul>
+
+\ref sec_program
+\li \ref subsec_program_intro
+\li \ref subsec_program_model
+    <ul>
+        <li> \ref subsubsec_program_model_create
+        <li> \ref subsubsec_program_model_dset
+        <li> \ref subsubsec_program_model_close
+        <li> \ref subsubsec_program_model_data
+        <li> \ref subsubsec_program_model_partial
+        <li> \ref subsubsec_program_model_info
+        <li> \ref subsubsec_program_model_compound
+        <li> \ref subsubsec_program_model_extend
+        <li> \ref subsubsec_program_model_group
+        <li> \ref subsubsec_program_model_attr
+    </ul>
+\li \ref subsec_program_transfer_pipeline
+
+\ref sec_file
+\li \ref subsec_file_intro
+\li \ref subsec_file_access_modes
+\li \ref subsec_file_creation_access
+\li \ref subsec_file_drivers
+\li \ref subsec_file_program_model
+    <ul>
+        <li> \ref subsubsec_file_program_model_create
+        <li> \ref subsubsec_file_program_model_open
+        <li> \ref subsubsec_file_program_model_close
+    </ul>
+\li \ref subsec_file_h5dump
+\li \ref subsec_file_summary
+\li \ref subsec_file_create
+\li \ref subsec_file_closes
+\li \ref subsec_file_property_lists
+    <ul>
+        <li> \ref subsubsec_file_property_lists_create
+        <li> \ref subsubsec_file_property_lists_props
+        <li> \ref subsubsec_file_property_lists_access
+    </ul>
+\li \ref subsec_file_alternate_drivers
+    <ul>
+        <li> \ref subsubsec_file_alternate_drivers_id
+        <li> \ref subsubsec_file_alternate_drivers_sec2
+        <li> \ref subsubsec_file_alternate_drivers_direct
+        <li> \ref subsubsec_file_alternate_drivers_log
+        <li> \ref subsubsec_file_alternate_drivers_win
+        <li> \ref subsubsec_file_alternate_drivers_stdio
+        <li> \ref subsubsec_file_alternate_drivers_mem
+        <li> \ref subsubsec_file_alternate_drivers_family
+        <li> \ref subsubsec_file_alternate_drivers_multi
+        <li> \ref subsubsec_file_alternate_drivers_split
+        <li> \ref subsubsec_file_alternate_drivers_par
+    </ul>
+\li \ref subsec_file_examples
+    <ul>
+        <li> \ref subsubsec_file_examples_trunc
+        <li> \ref subsubsec_file_examples_props
+        <li> \ref subsubsec_file_examples_access
+    </ul>
+\li \ref subsec_file_multiple
+
+\ref sec_group
+\li \ref subsec_group_intro
+\li \ref subsec_group_descr
+    <ul>
+        <li> \ref subsubsec_group_descr_object
+        <li> \ref subsubsec_group_descr_model
+        <li> \ref subsubsec_group_descr_path
+        <li> \ref subsubsec_group_descr_impl
+    </ul>
+\li \ref subsec_group_h5dump
+\li \ref subsec_group_function
+\li \ref subsec_group_program
+    <ul>
+        <li> \ref subsubsec_group_program_create
+        <li> \ref subsubsec_group_program_open
+        <li> \ref subsubsec_group_program_dataset
+        <li> \ref subsubsec_group_program_close
+        <li> \ref subsubsec_group_program_links
+        <li> \ref subsubsec_group_program_info
+        <li> \ref subsubsec_group_program_objs
+        <li> \ref subsubsec_group_program_all
+    </ul>
+\li \ref subsec_group_examples
+
+\ref sec_dataset
+\li \ref subsec_dataset_intro
+\li \ref subsec_dataset_function
+\li \ref subsec_dataset_program
+    <ul>
+        <li> \ref subsubsec_dataset_program_general
+        <li> \ref subsubsec_dataset_program_create
+        <li> \ref subsubsec_dataset_program_transfer
+        <li> \ref subsubsec_dataset_program_read
+    </ul>
+\li \ref subsec_dataset_transfer Data Transfer
+    <ul>
+        <li> \ref subsubsec_dataset_transfer_pipe
+        <li> \ref subsubsec_dataset_transfer_filter
+        <li> \ref subsubsec_dataset_transfer_drive
+        <li> \ref subsubsec_dataset_transfer_props
+        <li> \ref subsubsec_dataset_transfer_store
+        <li> \ref subsubsec_dataset_transfer_partial
+    </ul>
+\li \ref subsec_dataset_allocation
+    <ul>
+        <li> \ref subsubsec_dataset_allocation_store
+        <li> \ref subsubsec_dataset_allocation_delete
+        <li> \ref subsubsec_dataset_allocation_release
+        <li> \ref subsubsec_dataset_allocation_ext
+    </ul>
+\li \ref subsec_dataset_filters
+    <ul>
+        <li> \ref subsubsec_dataset_filters_nbit
+        <li> \ref subsubsec_dataset_filters_scale
+        <li> \ref subsubsec_dataset_filters_szip
+    </ul>
+
+\ref sec_datatype
+\li \ref subsec_datatype_intro
+\li \ref subsec_datatype_model
+    <ul>
+        <li> \ref subsubsec_datatype_model_class
+        <li> \ref subsubsec_datatype_model_predefine
+    </ul>
+\li \ref subsec_datatype_usage
+    <ul>
+        <li> \ref subsubsec_datatype_usage_object
+        <li> \ref subsubsec_datatype_usage_create
+        <li> \ref subsubsec_datatype_usage_transfer
+        <li> \ref subsubsec_datatype_usage_discover
+        <li> \ref subsubsec_datatype_usage_user
+    </ul>
+\li \ref subsec_datatype_function
+\li \ref subsec_datatype_program
+    <ul>
+        <li> \ref subsubsec_datatype_program_discover
+        <li> \ref subsubsec_datatype_program_define
+    </ul>
+\li \ref subsec_datatype_other
+    <ul>
+        <li> \ref subsubsec_datatype_other_strings
+        <li> \ref subsubsec_datatype_other_refs
+        <li> \ref subsubsec_datatype_other_enum
+        <li> \ref subsubsec_datatype_other_opaque
+        <li> \ref subsubsec_datatype_other_bitfield
+    </ul>
+\li \ref subsec_datatype_fill
+\li \ref subsec_datatype_complex
+    <ul>
+        <li> \ref subsubsec_datatype_complex_create
+        <li> \ref subsubsec_datatype_complex_analyze
+    </ul>
+\li \ref subsec_datatype_life
+\li \ref subsec_datatype_transfer
+\li \ref subsec_datatype_text
+
+\ref sec_dataspace
+\li \ref subsec_dataspace_intro
+\li \ref subsec_dataspace_function
+\li \ref subsec_dataspace_program
+    <ul>
+        <li> \ref subsubsec_dataspace_program_object
+        <li> \ref subsubsec_dataspace_program_model
+    </ul>
+\li \ref subsec_dataspace_transfer
+    <ul>
+        <li> \ref subsubsec_dataspace_transfer_select
+        <li> \ref subsubsec_dataspace_transfer_model
+    </ul>
+\li \ref subsec_dataspace_select
+\li \ref subsec_dataspace_refer
+    <ul>
+        <li> \ref subsubsec_dataspace_refer_use
+        <li> \ref subsubsec_dataspace_refer_create
+        <li> \ref subsubsec_dataspace_refer_read
+    </ul>
+\li \ref subsec_dataspace_sample
+
+\ref sec_attribute
+\li \ref subsec_attribute_intro
+\li \ref subsec_attribute_program
+    <ul>
+        <li> <!-- \subsubsection subsubsec_attribute_program_exist --> To Open and Read or Write an Existing Attribute </li>
+    </ul>
+\li \ref subsec_error_H5A
+\li \ref subsec_attribute_work
+    <ul>
+        <li> \ref subsubsec_attribute_work_struct
+        <li> \ref subsubsec_attribute_work_create
+        <li> \ref subsubsec_attribute_work_access
+        <li> \ref subsubsec_attribute_work_info
+        <li> \ref subsubsec_attribute_work_iterate
+        <li> \ref subsubsec_attribute_work_delete
+        <li> \ref subsubsec_attribute_work_close
+    </ul>
+\li \ref subsec_attribute_special
+
+\ref sec_error
+\li \ref subsec_error_intro
+\li \ref subsec_error_program
+\li \ref subsec_error_H5E
+\li \ref subsec_error_ops
+    <ul>
+        <li> \ref subsubsec_error_ops_stack
+        <li> \ref subsubsec_error_ops_print
+        <li> \ref subsubsec_error_ops_mute
+        <li> \ref subsubsec_error_ops_custom_print
+        <li> \ref subsubsec_error_ops_walk
+        <li> \ref subsubsec_error_ops_travers
+    </ul>
+\li \ref subsec_error_adv
+    <ul>
+        <li> \ref subsubsec_error_adv_more
+        <li> \ref subsubsec_error_adv_app
+    </ul>
+
+\ref sec_plist
+\li \ref subsec_plist_intro
+\li \ref subsec_plist_class
+    <ul>
+        <li> \ref subsubsec_plist_class
+        <li> \ref subsubsec_plist_lists
+        <li> \ref subsubsec_plist_props
+    </ul>
+\li \ref subsec_plist_program
+    <ul>
+        <li> \ref subsubsec_plist_default
+        <li> \ref subsubsec_plist_basic
+        <li> \ref subsubsec_plist_additional
+    </ul>
+\li \ref subsec_plist_generic
+\li \ref subsec_plist_H5P
+\li \ref subsec_plist_resources
+\li \ref subsec_plist_notes
+
+\ref sec_vol
+\li \ref subsec_vol_intro
+\li \ref subsec_vol_abstract_layer
+\li \ref subsec_vol_quickstart
+    <ul>
+        <li> \ref subsubsec_vol_quick_read
+        <li> \ref subsubsec_vol_quick_use
+        <li> \ref subsubsec_vol_quick_set
+        <li> \ref subsubsec_vol_quick_update
+        <li> \ref subsubsec_vol_quick_plugin
+        <li> \ref subsubsec_vol_quick_opt
+    </ul>
+\li \ref subsec_vol_connect
+    <ul>
+        <li> \ref subsubsec_vol_connect_register
+        <li> \ref subsubsec_vol_connect_version
+        <li> \ref subsubsec_vol_connect_reg_calls
+        <li> \ref subsubsec_vol_connect_set_vol
+        <li> \ref subsubsec_vol_connect_search
+        <li> \ref subsubsec_vol_connect_param
+        <li> \ref subsubsec_vol_connect_env
+    </ul>
+\li \ref subsec_vol_adapt
+    <ul>
+        <li> \ref subsubsec_vol_adapt_token
+        <li> \ref subsubsec_vol_adapt_api
+        <li> \ref subsubsec_vol_adapt_native
+    </ul>
+\li \ref subsec_vol_lang
+    <ul>
+        <li> \ref subsubsec_vol_lang_c
+        <li> \ref subsubsec_vol_lang_fort
+        <li> \ref subsubsec_vol_lang_java
+    </ul>
+\li \ref subsec_vol_cl
+\li \ref subsec_vol_compat
+    <ul>
+        <li> \ref subsubsec_vol_compat_native
+        <li> \ref subsubsec_vol_compat_indep
+        <li> \ref subsubsec_vol_compat_opt
+    </ul>
+
+\ref sec_async
+\li \ref subsec_async_intro
+
+\ref sec_map
+
+\ref sec_addition
+
+\page AR_UG Additional Resources
+
+\section sec_addition Additional Resources
+These documents provide additional information for the use and tuning of specific HDF5 features.
+ <table style=" border-spacing:0; padding-left:6.00pt; padding-top:6.00pt; padding-right:6.00pt; padding-bottom:6.00pt; float:aligncenter; width:100%; max-width:432.00pt;" cellspacing="0">
+  <caption x-list-start="1" style="font-size: 12.0pt;">Table of Additional resources</caption>
+  <tr style="height: 23.00pt;">
+  <th style="width: 234.000pt; border-top-style: solid; border-top-width: 1px; border-top-color: #228a22; border-bottom-style: solid; border-bottom-width: 1px; border-bottom-color: #228a22; vertical-align : top;padding-left: 6.00pt; padding-top: 3.00pt; padding-right: 6.00pt; padding-bottom: 3.00pt;">
+  <p>Document</p>
+</th>
+  <th style="width: 198.000pt; border-top-style: solid; border-top-width: 1px; border-top-color: #228a22; border-bottom-style: solid; border-bottom-width: 1px; border-bottom-color: #228a22; vertical-align : top;padding-left: 6.00pt; padding-top: 3.00pt; padding-right: 6.00pt; padding-bottom: 3.00pt;">
+  <p>Comments</p>
+</th>
+</tr>
+  <tr style="height: 23.00pt;">
+  <td style="width: 234.000pt; border-bottom-style: solid; border-bottom-width: 1px; border-bottom-color: #228a22; vertical-align: top;padding-left: 6.00pt; padding-top: 3.00pt; padding-right: 6.00pt; padding-bottom: 3.00pt;">
+  <p style="font-style: italic; color: #0000ff;"><span>@ref HDF5Examples</span></p>
+</td>
+  <td style="width: 198.000pt; border-bottom-style: solid; border-bottom-width: 1px; border-bottom-color: #228a22; vertical-align: top;padding-left: 6.00pt; padding-top: 3.00pt; padding-right: 6.00pt; padding-bottom: 3.00pt;">
+  <p>Code examples by API. </p>
+</td>
+</tr>
+  <tr style="height: 36.00pt;">
+  <td style="width: 234.000pt; border-bottom-style: solid; border-bottom-width: 1px; border-bottom-color: #228a22; vertical-align: top;padding-left: 6.00pt; padding-top: 3.00pt; padding-right: 6.00pt; padding-bottom: 3.00pt;">
+  <p style="font-style: italic; color: #0000ff;"><span><a href="http://www.hdfgroup.org/HDF5/doc/Advanced/Chunking/index.html">Chunking in HDF5</a></span></p>
+</td>
+  <td style="width: 198.000pt; border-bottom-style: solid; border-bottom-width: 1px; border-bottom-color: #228a22; vertical-align: top;padding-left: 6.00pt; padding-top: 3.00pt; padding-right: 6.00pt; padding-bottom: 3.00pt;">
+  <p>Structuring the use of chunking and tuning it for performance.</p>
+</td>
+</tr>
+  <tr style="height: 36.00pt;">
+  <td style="width: 234.000pt; border-bottom-style: solid; border-bottom-width: 1px; border-bottom-color: #228a22; vertical-align: top;padding-left: 6.00pt; padding-top: 3.00pt; padding-right: 6.00pt; padding-bottom: 3.00pt;">
+  <p style="font-style: italic; color: #0000ff;"><span class="FM_LT_LinkText"><a href="http://www.hdfgroup.org/HDF5/doc/Advanced/DirectChunkWrite/UsingDirectChunkWrite.pdf">Using the Direct Chunk Write Function</a></span></p>
+</td>
+  <td style="width: 198.000pt; border-bottom-style: solid; border-bottom-width: 1px; border-bottom-color: #228a22; vertical-align: top;padding-left: 6.00pt; padding-top: 3.00pt; padding-right: 6.00pt; padding-bottom: 3.00pt;">
+  <p>Describes another way that chunks can be written to datasets.</p>
+</td>
+</tr>
+  <tr style="height: 88.00pt;">
+  <td style="width: 234.000pt; border-bottom-style: solid; border-bottom-width: 1px; border-bottom-color: #228a22; vertical-align: top;padding-left: 6.00pt; padding-top: 3.00pt; padding-right: 6.00pt; padding-bottom: 3.00pt;">
+  <p style="font-style: italic; color: #0000ff;"><span><a href="http://www.hdfgroup.org/HDF5/doc/Advanced/CommittedDatatypeCopying/CopyingCommittedDatatypesWithH5Ocopy.pdf">Copying Committed Datatypes with H5Ocopy</a></span></p>
+</td>
+  <td style="width: 198.000pt; border-bottom-style: solid; border-bottom-width: 1px; border-bottom-color: #228a22; vertical-align: top;padding-left: 6.00pt; padding-top: 3.00pt; padding-right: 6.00pt; padding-bottom: 3.00pt;">
+  <p>Describes how to copy to another file a dataset that uses a committed datatype or an object with an attribute that uses a committed datatype so that the committed datatype in the destination file can be used by multiple objects.</p>
+</td>
+</tr>
+  <tr style="height: 36.00pt;">
+  <td style="width: 234.000pt; border-bottom-style: solid; border-bottom-width: 1px; border-bottom-color: #228a22; vertical-align: top;padding-left: 6.00pt; padding-top: 3.00pt; padding-right: 6.00pt; padding-bottom: 3.00pt;">
+  <p style="font-style: italic; color: #0000ff;"><span><a href="http://www.hdfgroup.org/HDF5/doc/Advanced/MetadataCache/index.html">Metadata Caching in HDF5</a></span></p>
+</td>
+  <td style="width: 198.000pt; border-bottom-style: solid; border-bottom-width: 1px; border-bottom-color: #228a22; vertical-align: top;padding-left: 6.00pt; padding-top: 3.00pt; padding-right: 6.00pt; padding-bottom: 3.00pt;">
+  <p>Managing the HDF5 metadata cache and tuning it for performance.</p>
+</td>
+</tr>
+  <tr style="height: 49.00pt;">
+  <td style="width: 234.000pt; border-bottom-style: solid; border-bottom-width: 1px; border-bottom-color: #228a22; vertical-align: top;padding-left: 6.00pt; padding-top: 3.00pt; padding-right: 6.00pt; padding-bottom: 3.00pt;">
+  <p style="font-style: italic; color: #0000ff;"><span><a href="http://www.hdfgroup.org/HDF5/doc/Advanced/DynamicallyLoadedFilters/HDF5DynamicallyLoadedFilters.pdf">HDF5 Dynamically Loaded Filters</a></span></p>
+</td>
+  <td style="width: 198.000pt; border-bottom-style: solid; border-bottom-width: 1px; border-bottom-color: #228a22; vertical-align: top;padding-left: 6.00pt; padding-top: 3.00pt; padding-right: 6.00pt; padding-bottom: 3.00pt;">
+  <p>Describes how an HDF5 application can apply a filter that is not registered with the HDF5 Library.</p>
+</td>
+</tr>
+  <tr style="height: 62.00pt;">
+  <td style="width: 234.000pt; border-bottom-style: solid; border-bottom-width: 1px; border-bottom-color: #228a22; vertical-align: top;padding-left: 6.00pt; padding-top: 3.00pt; padding-right: 6.00pt; padding-bottom: 3.00pt;">
+  <p style="font-style: italic; color: #0000ff;"><span><a href="http://www.hdfgroup.org/HDF5/doc/Advanced/FileImageOperations/HDF5FileImageOperations.pdf">HDF5 File Image Operations</a></span></p>
+</td>
+  <td style="width: 198.000pt; border-bottom-style: solid; border-bottom-width: 1px; border-bottom-color: #228a22; vertical-align: top;padding-left: 6.00pt; padding-top: 3.00pt; padding-right: 6.00pt; padding-bottom: 3.00pt;">
+  <p>Describes how to work with HDF5 files in memory. Disk I/O is not required when file images are opened, created, read from, or written to.</p>
+</td>
+</tr>
+  <tr style="height: 62.00pt;">
+  <td style="width: 234.000pt; border-bottom-style: solid; border-bottom-width: 1px; border-bottom-color: #228a22; vertical-align: top;padding-left: 6.00pt; padding-top: 3.00pt; padding-right: 6.00pt; padding-bottom: 3.00pt;">
+  <p style="font-style: italic; color: #0000ff;"><span><a href="http://www.hdfgroup.org/HDF5/doc/Advanced/ModifiedRegionWrites/ModifiedRegionWrites.pdf">Modified Region Writes</a></span></p>
+</td>
+  <td style="width: 198.000pt; border-bottom-style: solid; border-bottom-width: 1px; border-bottom-color: #228a22; vertical-align: top;padding-left: 6.00pt; padding-top: 3.00pt; padding-right: 6.00pt; padding-bottom: 3.00pt;">
+  <p>Describes how to set write operations for in-memory files so that only modified regions are written to storage. Available when the Core (Memory) VFD is used.</p>
+</td>
+</tr>
+  <tr style="height: 36.00pt;">
+  <td style="width: 234.000pt; border-bottom-style: solid; border-bottom-width: 1px; border-bottom-color: #228a22; vertical-align: top;padding-left: 6.00pt; padding-top: 3.00pt; padding-right: 6.00pt; padding-bottom: 3.00pt;">
+  <p style="font-style: italic; color: #0000ff;"><span><a href="http://www.hdfgroup.org/HDF5/doc/Advanced/UsingIdentifiers/index.html">Using Identifiers</a></span></p>
+</td>
+  <td style="width: 198.000pt; border-bottom-style: solid; border-bottom-width: 1px; border-bottom-color: #228a22; vertical-align: top;padding-left: 6.00pt; padding-top: 3.00pt; padding-right: 6.00pt; padding-bottom: 3.00pt;">
+  <p>Describes how identifiers behave and how they should be treated.</p>
+</td>
+</tr>
+  <tr style="height: 36.00pt;">
+  <td style="width: 234.000pt; border-bottom-style: solid; border-bottom-width: 1px; border-bottom-color: #228a22; vertical-align: top;padding-left: 6.00pt; padding-top: 3.00pt; padding-right: 6.00pt; padding-bottom: 3.00pt;">
+  <p style="font-style: italic; color: #0000ff;"><span><a href="http://www.hdfgroup.org/HDF5/doc/Advanced/UsingUnicode/index.html">Using UTF-8 Encoding in HDF5 Applications</a></span></p>
+</td>
+  <td style="width: 198.000pt; border-bottom-style: solid; border-bottom-width: 1px; border-bottom-color: #228a22; vertical-align: top;padding-left: 6.00pt; padding-top: 3.00pt; padding-right: 6.00pt; padding-bottom: 3.00pt;">
+  <p>Describes the use of UTF-8 Unicode character encodings in HDF5 applications.</p>
+</td>
+</tr>
+  <tr style="height: 49.00pt;">
+  <td style="width: 234.000pt; border-bottom-style: solid; border-bottom-width: 1px; border-bottom-color: #228a22; vertical-align: top;padding-left: 6.00pt; padding-top: 3.00pt; padding-right: 6.00pt; padding-bottom: 3.00pt;">
+  <p style="font-style: italic; color: #0000ff;"><span><a href="http://www.hdfgroup.org/HDF5/doc/Advanced/FreeingMemory/FreeingMemoryAllocatedByTheHdf5Library.pdf">Freeing Memory Allocated by the HDF5 Library</a></span></p>
+</td>
+  <td style="width: 198.000pt; border-bottom-style: solid; border-bottom-width: 1px; border-bottom-color: #228a22; vertical-align: top;padding-left: 6.00pt; padding-top: 3.00pt; padding-right: 6.00pt; padding-bottom: 3.00pt;">
+  <p>Describes how inconsistent memory management can cause heap corruption or resource leaks and possible solutions.</p>
+</td>
+</tr>
+  <tr style="height: 23.00pt;">
+  <td style="width: 234.000pt; border-bottom-style: solid; border-bottom-width: 1px; border-bottom-color: #228a22; vertical-align: top;padding-left: 6.00pt; padding-top: 3.00pt; padding-right: 6.00pt; padding-bottom: 3.00pt;">
+  <p style="font-style: italic; color: #0000ff;"><span><a href="http://www.hdfgroup.org/HDF5/doc/Glossary.html">HDF5 Glossary</a></span></p>
+</td>
+  <td style="width: 198.000pt; border-bottom-style: solid; border-bottom-width: 1px; border-bottom-color: #228a22; vertical-align: top;padding-left: 6.00pt; padding-top: 3.00pt; padding-right: 6.00pt; padding-bottom: 3.00pt;">
+  <p>A glossary of terms.</p>
+</td>
+</tr>
+ </table>
+
+Previous Chapter \ref sec_plist
+
+\par Don't like what you see? - You can help to improve this User Guide
+     Complete the survey linked near the top of this page!\n
+     We treat documentation like code: Fork the
+     <a href="https://github.com/HDFGroup/hdf5">HDF5 repo</a>, make changes, and create a
+     <a href="https://github.com/HDFGroup/hdf5/pulls">pull request</a> !\n
+
+*/
+\ No newline at end of file
diff --git a/doxygen/dox/VOLConnGuide.dox b/doxygen/dox/VOLConnGuide.dox
new file mode 100644
index 0000000..fb662a0
--- /dev/null
+++ b/doxygen/dox/VOLConnGuide.dox
@@ -0,0 +1,4908 @@
+/** \page VOL_Connector HDF5 Virtual Object Layer (VOL) Connector Author Guide
+
+Navigate back: \ref index "Main"
+<hr>
+
+\section secVOLIntro Introduction
+The Virtual Object Layer (VOL) is an abstraction layer in the HDF5 library which intercepts all API
+calls that could potentially access objects in an HDF5 container and forwards those calls to object drivers
+referred to as <em>VOL connectors</em>. The architecture of this feature is described in the \ref H5VL_UG
+and VOL Architecture and Internals Documentation and will not be duplicated here.
+
+This guide is for people who are interested in developing their own VOL connector for the HDF5 library.
+It is assumed that the reader has good knowledge of the VOL architecture obtained by reading the VOL
+architectural design document.
+
+\section secVOLCreate Creating a New Connector
+
+\subsection subsecVOLOverview Overview
+Creating a new VOL connector can be a complicated process. You will need to map your storage system
+to the HDF5 data model through the lens of the VOL and this may involve some impedance mismatch that
+you will have to work around. The good news is that the HDF5 library has been re-engineered to handle
+arbitrary, connector-specific data structures via the VOL callbacks, so no knowledge of the library internals
+is necessary to write a VOL connector.
+
+Writing a VOL connector requires these things:
+\li Decide on library vs plugin vs internal.
+\li Set up your build/test files (CMake, Autotools, etc.).
+\li Fill in some boilerplate information in yourH5VLclasststruct.
+\li Decide how you will perform any necessary initialization needed by your storage system.
+\li Map Storage to HDF5 File Objects
+\li Create implementations for the callbacks you need to support.
+\li Test the connector.
+
+Each of the steps listed above is described in more detail in this section of the document.
+
+The "model then implement" steps can be performed iteratively. You might begin by only supporting files,
+datasets, and groups and only allowing basic operations on them. In some cases, this may be all that is
+needed. As your needs grow, you can repeat those steps and increase the connector's HDF5 API coverage
+at a pace that makes sense for your users.
+
+Also, note that this document only covers writing VOL connectors using the C programming language. It
+is often possible to write connectors in other programming languages (e.g.;  Python) via the language's C
+interop facilities, but that topic is out of scope for this document.
+
+\subsection subsecVOL112dep The HDF5 1.12.x VOL Interface Is DEPRECATED
+Important changes were made to the VOL interface for HDF5 1.13.0 and, due to binary compatibility issues,
+these cannot be merged to HDF5 1.12.x. For this reason, VOL connector development should be shifted to
+target 1.13.0 as no further development of the VOL interface will take place on the 1.12.x branch. Unlike the
+other development branches of the library, there is no hdf5_1_13 branch - all HDF5 1.13.0 development is
+taking place in the develop branch of the HDF5 repository and 1.13.x branches will split off from that.
+
+Note also that HDF5 1.13.0 is considered an unstable branch, and the API and file format are subject to
+change ("unstable" means "not yet finalized", not "buggy"). The VOL feature is under active development
+and, although it is nearing its final form, may change further before the stable HDF5 1.14.0 release targeted
+for 2022.
+
+\subsection subsecVOLRelated VOL-Related HDF5 Header Files
+Use of the VOL, including topics such as registration and loading VOL plugins, is described in the \ref H5VL_UG.
+
+Public header Files you will need to be familiar with include:
+<table>
+<tr>
+<td>H5VLpublic.h
+</td>
+<td>Public VOL header.
+</td>
+</tr>
+<tr>
+<td>H5VLconnector.h
+</td>
+<td>Main header for connector authors. Contains definitions for the main VOL struct and callbacks, enum values, etc.
+</td>
+</tr>
+<tr>
+<td>H5VLconnector_passthru.h
+</td>
+<td>Helper routines for passthrough connector authors.
+</td>
+</tr>
+<tr>
+<td>H5VLnative.h
+</td>
+<td>Native VOL connector header. May be useful if your connector will attempt to implement native HDF5 API calls that are handled via the optional callbacks.
+</td>
+</tr>
+<tr>
+<td>H5PLextern.h
+</td>
+<td>Needed if your connector will be built as a plugin.
+</td>
+</tr>
+</table>
+
+Many VOL connectors are listed on The HDF Group's VOL plugin registration page, located at:
+<a href="https://portal.hdfgroup.org/display/support/Registered+VOL+Connectors">Registered VOL Connectors</a>.
+Not all of these VOL connectors are supported by The HDF Group and the level of completeness varies, but the
+connectors found there can serve as examples of working implementations
+
+\subsection subsecVOLLPI Library vs Plugin vs Internal
+When building a VOL connector, you have several options:
+
+<h4>Library</h4>
+The connector can be built as a normal shared or static library. Software that uses your connector will have
+to link to it just like any other library. This can be convenient since you don't have to deal with plugin paths
+and searching for the connector at runtime, but it also means that software which uses your connector will
+have to be built and linked against it.
+
+<h4>Plugin</h4>
+You can also build your connector as a dynamically loaded plugin. The mechanism for this is the same
+mechanism used to dynamically load HDF5 filter plugins. This can allow use of your connector via the
+VOL environment variable, without modifying the application, but requires your plugin to be discoverable
+at runtime. See the \ref H5VL_UG for more information about using HDF5 plugins.
+
+To build your connector as a plugin, you will have to include <b>H5PLextern.h</b>
+(a public header distributed with  the  library) and  implement the #H5PLget_plugin_type
+#H5PLget_plugin_info calls, both of which are trivial to code up. It also often requires your connector
+to be built with certain compile/link options. The VOL connector template does all of these things.
+
+The HDF5 library's plugin loading code will call #H5PLget_plugin_type
+to determine the type of plugin(e.g.; filter, VOL) and #H5PLget_plugin_info
+to get the class struct, which allows the library to query the plugin for its name and value to see if it has found
+a requested plugin. When a match is found, the library will use the class struct to register the connector and map its callbacks.
+
+For the HDF5 library to be able to load an external plugin dynamically, the plugin developer has to define
+two public routines with the following name and signature:
+\code
+  H5PL_type_t H5PLget_plugin_type(void);
+  const void *H5PLget_plugin_info(void);
+\endcode
+
+To show how easy this is to accomplish, here is the complete implementation of those functions in the
+template VOL connector:
+\code
+H5PL_type_t H5PLget_plugin_type(void) { return H5PL_TYPE_VOL; }
+const void *H5PLget_plugin_info(void) { return &template_class_g; }
+\endcode
+
+\ref H5PLget_plugin_type should return the library type which should always be #H5PL_TYPE_VOL.
+#H5PLget_plugin_info should return a pointer to the plugin structure defining the VOL plugin with all the callbacks.
+For example, consider an external plugin defined as:
+\code
+  static const H5VL_class_t H5VL_foo_g = {
+      2,     // version
+      12345, // value
+      "foo", // name
+      ...
+  }
+\endcode
+
+The plugin would implement the two routines as:
+\code
+  H5PL_type_t H5PLget_plugin_type(void)
+      {return H5PL_TYPE_VOL;}
+  const void *H5PLget_plugin_info(void)
+      {return &H5VL_foo_g;}
+\endcode
+
+<h4>Internal</h4>
+Your VOL connector can also be constructed as a part of the HDF5 library. This works in the same way
+as the stdio and multi virtual file drivers (VFDs) and does not require knowledge of HDF5 internals or
+use of non-public API calls. You simply have to add your connector's files to the
+Makefile.am and/or CMakeLists.txt files in the source distribution's src directory. This requires maintaining
+a private build of the library, though, and is not recommended.
+
+\subsection subsecVOLBuild Build Files / VOL Template
+We have created a template terminal VOL connector that includes both Autotools and CMake build files. The
+constructed VOL connector includes no real functionality, but can be registered and loaded as a plugin.
+
+The VOL template can be found here:
+<a href="https://github.com/HDFGroup/vol-template">VOL template</a>
+
+The purpose of this template is to quickly get you to the point where you can begin filling in the callback
+functions and writing tests. You can copy this code to your own repository to serve as the basis for your
+new connector.
+
+A template passthrough VOL is also available. This will be discussed in the section on passthrough connectors.
+
+\subsection subsecVOLBoil H5VL_class_t Boilerplate
+Several fields in the H5VLclasststruct will need to be filled in.
+
+In HDF5 1.13.0, the <em>version</em> field will be 2, indicating the connector targets version 2 of the
+#H5VL_class_t struct.  Version 1 of the struct was never formally released and only available in the
+develop branch of the HDF5 git repository. Version 0 is used in the deprecated HDF5 1.12.x branch.
+
+Every connector needs a <em>name</em> and <em>value</em>. The library will use these when loading and registering the
+connector (as described in the \ref H5VL_UG), so they should be unique in your ecosystem.
+
+VOL connector values are integers, with a maximum value of 65535. Values from 0 to 255 are reserved
+for internal use by The HDF Group. The native VOL connector has a value of 0. Values of 256 to 511
+are for connector testing and should not be found in the wild. Values of 512 to 65535 are for external
+connectors.
+
+As is the case with HDF5 filters, The HDF Group can assign you an official VOL connector value. Please
+contact <a href="help@hdfgroup.org">help@hdfgroup.org</a> for help with this. We currently do not register connector names, though the
+name you've chosen will appear on the registered VOL connectors page.
+
+As noted above, registered VOL connectors will be listed at:
+<a href="https://portal.hdfgroup.org/display/support/Registered+VOL+Connectors">Registered VOL Connectors</a>
+
+A new \b conn_version field has been added to the class struct for 1.13. This field is currently not used by
+the library so its use is determined by the connector author. Best practices for this field will be determined
+in the near future and this part of the guide will be updated.
+
+The \b cap_flags field is used to determine the capabilities of the VOL connector. At this time, the use of this
+field is limited to indicating thread-safety, asynchronous capabilities, and ability to produce native HDF5
+files. Supported flags can be found in \ref H5VLconnector.h.
+\code
+// Capability flags for connector
+#define H5VL_CAP_FLAG_NONE     0        // No special connector capabilities
+#define H5VL_CAP_FLAG_THREADSAFE 0x01   // Connector is threadsafe
+#define H5VL_CAP_FLAG_ASYNC    0x02     // Connector performs operations asynchronously
+#define H5VL_CAP_FLAG_NATIVE_FILES 0x04 // Connector produces native file format
+\endcode
+
+\subsection subsecVOLInit Initialization and Shutdown
+You'll need to decide how to perform any initialization and shutdown tasks that are required by your
+connector. There are initialize and terminate callbacks in the #H5VL_class_t struct to handle this. They
+are invoked when the connector is registered and unregistered, respectively. The initialize callback can take
+a VOL initialization property list, so any properties you need for initialization can be applied to it. The
+HDF5 library currently makes no use of the vipl so there are no default vipl properties.
+
+If this is unsuitable, you may have to create custom connector-specific API calls to handle initialization and
+termination. It may also be useful to perform operations in a custom API call used to set the VOL connector
+in the fapl.
+
+The initialization and terminate callbacks:
+\code
+  herr_t (*initialize)(hid_t vipl_id); // Connector initialization callback
+  herr_t (*terminate)(void);           // Connector termination callback
+\endcode
+
+\subsection subsecVOLMap Map Storage to HDF5 File Objects
+The most difficult part of designing a new VOL connector is going to determining how to support HDF5
+file objects and operations using your storage system. There isn't much specific advice to give here, as each
+connector will have unique needs, but a forthcoming "tutorial" connector will set up a simple connector and
+demonstrate this process.
+
+\subsection subsecVOLFillIn Fill In VOL Callbacks
+For each file object you support in your connector (including the file itself), you will need to create a
+data struct to hold whatever file object metadata that are needed by your connector. For example, a data
+structure for a VOL connector based on text files might have a file struct that contains a file pointer for the
+text file, buffers used for caching data, etc. Pointers to these data structures are where your connector's
+state is stored and are returned to the HDF5 library from the create/open/etc. callbacks such as
+<em>dataset create</em>.
+
+Once you have your data structures, you'll need to create your own implementations of the callback functions
+and map them via your #H5VL_class_t struct.
+
+\subsection subsecVOLOpt Handling Optional Operations
+Handling optional operations has changed significantly in HDF5 1.13.0. In the past, optional operations were
+specified using an integer <em>opt_type</em> parameter. This proved to be a problem with pass-through connectors,
+though, as it was possible to have <em>opt_type</em> clash if two connectors used the same <em>opt_type</em> values.
+
+The new scheme allows a connector to register an optional operation with the library and receive a dynamically-allocated
+<em>opt_type</em> value for the operation.
+
+The following API calls can be used to manage the optional operations:
+\code
+  herr_t H5VLregister_opt_operation(H5VL_subclass_t subcls, const char *op_name, int *op_val);
+  herr_t H5VLfind_opt_operation(H5VL_subclass_t subcls, const char *op_name, int *op_val);
+  herr_t H5VLunregister_opt_operation(H5VL_subclass_t subcls, const char *op_name)
+\endcode
+
+The <em>register</em> call is used to register an operation for a subclass (file, etc.) and the <em>opt_type</em> parameter
+that the library assigned to the operation will be returned via the <em>opt_val</em> parameter. This value can then
+be passed to one of the subclass-specific API calls (listed below). If you need to find an existing optional
+call's assigned <em>opt_type</em> value by name, you can use the <em>find</em> call.
+
+One recommended way to handle optional calls is to <em>register</em> all the optional calls at startup, saving the
+values in connector state, then use these cached values in your optional calls. The assigned values should be
+unregistered using the <em>unregister</em> call when the connector shuts down.
+
+Subclass-specific optional calls:
+\code
+herr_t H5VLattr_optional_op(const char *app_file, const char *app_func, unsigned app_line,
+                            hid_t attr_id, H5VL_optional_args_t *args, hid_t dxpl_id, hid_t es_id);
+herr_t H5VLdataset_optional_op(const char *app_file, const char *app_func, unsigned app_line,
+                            hid_t dset_id, H5VL_optional_args_t *args, hid_t dxpl_id, hid_t es_id);
+herr_t H5VLdatatype_optional_op(const char *app_file, const char *app_func, unsigned app_line,
+                            hid_t type_id, H5VL_optional_args_t *args, hid_t dxpl_id, hid_tes_id);
+herr_t H5VLfile_optional_op(const char *app_file, const char *app_func, unsigned app_line,
+                            hid_t file_id, H5VL_optional_args_t *args, hid_t dxpl_id, hid_t es_id);
+herr_t H5VLgroup_optional_op(const char *app_file, const char *app_func, unsigned app_line,
+                            hid_t group_id, H5VL_optional_args_t *args, hid_t dxpl_id, hid_t es_id);
+herr_t H5VLlink_optional_op(const char *app_file, const char *app_func, unsigned app_line,
+                            hid_t loc_id, const char *name, hid_t lapl_id, H5VL_optional_args_t *args,
+                            hid_t dxpl_id, hid_t es_id);
+herr_t H5VLobject_optional_op(const char *app_file, const char *app_func, unsigned app_line,
+                            hid_t loc_id, const char *name, hid_t lapl_id,
+                            H5VL_optional_args_t *args, hid_t dxpl_id, hid_t es_id);
+herr_t H5VLrequest_optional_op(void *req, hid_t connector_id, H5VL_optional_args_t *args);
+\endcode
+
+\subsection subsecVOLTest Testing Your Connector
+At the time of writing, some of the HDF5 library tests have been abstracted out of the library with their
+native-file-format-only sections removed and added to a VOL test suite available here:
+<a href="https://github.com/HDFGroup/vol-tests">vol-tests</a>
+
+This is an evolving set of tests, so see the documentation in that repository for instructions as to its use.
+You may want to clone and modify and/or extend these tests for use with your own connector.
+
+In the future, we plan to modify the HDF5 test suite that ships with the library to use a future VOL
+capabilities flags scheme to selectively run tests that a particular connector supports. As this is a large task,
+it may be some time before that work is complete.
+
+\subsection subsecVOLPassthrough Passthrough Connectors
+Coming Soon
+
+\subsection subsecVOLAsync Asynchronous Operations
+Coming Soon
+
+\section secVOLRef VOL Connector Interface Reference
+Each VOL connector should be of type #H5VL_class_t:
+<table>
+<tr>
+<td>
+<em>VOL connector class, H5VLpublic.h</em>
+\snippet H5VLconnector.h H5VL_class_t_snip
+</td>
+</tr>
+</table>
+
+The <em>version</em> field is the version of the #H5VL_class_t struct. This is identical to how the <em>version</em> field is
+used in the #H5Z_class2_t struct for filters.
+
+The <em>value</em> field is a unique integer identifier that should be between 512 and 65535 for external, non-library
+connectors.
+
+The <em>name</em> field is a string that uniquely identifies the VOL connector name.
+
+The <em>conn_version</em> is the connector version. This is currently not used by the library.
+
+The <em>cap_flags</em> holds bitwise capability/feature flags that determine which operations and capabilities are
+supported by a the VOL connector. These fields were enumerated in the previous section.
+
+The <em>initialize</em> field is a function pointer to a routine that a connector implements to set up or initialize
+access to the connector. Implementing this function by the connector is not required since some connectors
+do not require any set up to start accessing the connector. In that case, the value of the function pointer
+should be set to NULL. Connector specific variables that are required to be passed from users should be
+passed through the VOL initialize property list. Generic properties can be added to this property class
+for user-defined connectors that cannot modify the HDF5 library to add internal properties. For more
+information consult the property list reference manual pages.
+
+The <em>terminate</em> field is a function pointer to a routine that a connector implements to terminate or finalize
+access to the connector. Implementing this function by the connector is not required since some connectors
+do not require any termination phase to the connector. In that case, the value of the function pointer should
+be set to NULL.
+
+The rest of the fields in the #H5VL_class_t struct are "subclasses" that define all the VOL function callbacks
+that are mapped to from the HDF5 API layer. Those subclasses are categorized into three categories, VOL
+Framework, Data Model, and Infrastructure / Services.
+
+VOL Framework classes provide functionality for working with the VOL connectors themselves (e.g., working
+with connector strings) and with wrapping and unwrapping objects for passthrough connectors.
+
+Data Model classes are those that provide functionality for accessing an HDF5 container and objects in that
+container as defined by the HDF5 data model.
+
+Infrastructure / Service classes are those that provide services for users that are not related to the data model
+specifically. Asynchronous operations, for example, are a service that most connectors can implement, so we
+add a class for it in the VOL structure.
+
+If a service becomes generic enough and common among many connectors, a class for it should be added
+to the VOL structure. However, many connectors can/will provide services that are not shared by other
+connectors. A good way to support these services is through an optional callback in the VOL structure which
+can be a hook from the API to the connector that provides those services, passing any necessary arguments
+needed without the HDF5 library having to worry about supporting that service. A similar API operation
+to allow users to use that service will be added. This API call would be similar to an "ioctl" call where any
+kind of operation can be supported and passed down to the connector that has enough knowledge from the
+user to interpret the type of the operation. All classes and their defined callbacks will be detailed in the
+following sub-sections.
+
+To handle that large set of API routines, each class in the Data Model category has three generic callbacks,
+<em>get</em>, <em>specific</em>, and <em>optional</em> to handle the three set of API operations outline above respectively. To
+handle the varying parameters that can be passed to the callback, each callback will take a struct parameter
+that includes an enum <em>get/specific</em> or integer <em>optional</em> field indicating the operation and a union of the
+possible parameters <em>get/specific</em> or void pointer to the parameters <em>optional</em>.
+
+The optional args struct used for all optional operations:
+\code
+// Struct for all 'optional' callbacks
+typedef struct H5VL_optional_args_t {
+  int  op_type; // Operation to perform
+  void *args;   // Pointer to operation's argument struct
+} H5VL_optional_args_t;
+\endcode
+
+The <em>opt_type</em> member is the value assigned by the library when the optional operation was registered (or
+<em>defined</em> in the case of the native VOL connector) and the <em>args</em> member is a pointer to the optional
+operation's parameters (usually passed in as a struct).
+
+Note that this differs from the HDF5 1.12.x scheme, which used <em>va_lists</em>.
+
+The <em>optional</em> callback is a free for all callback where anything from the API layer is passed in directly.
+This callback is used to support connector specific operations in the API that other connectors should or
+would not know about. More information about types and the arguments for each type will be detailed in
+the corresponding class arguments.
+
+\subsection subsecVOLRefMap Mapping the API to the Callbacks
+The callback interface defined for the VOL has to be general enough to handle all the HDF5 API operations
+that would access the file. Furthermore, it has to capture future additions to the HDF5 library with little to
+no changes to the callback interface. Changing the interface often whenever new features are added would
+be discouraging to connector developers since that would mean reworking their VOL connector structure.
+To remedy this issue, every callback will contain two parameters:
+<ul>
+<li>A data transfer property list (DXPL) which allows that API to put some properties on for the connectors
+to retrieve if they have to for particular operations, without having to add arguments to the VOL
+callback function.</li>
+<li>A pointer to a request <em>(void **req)</em> to handle asynchronous operations if the HDF5 library adds
+support for them in future releases. hat pointer is set by the VOL connector to a request object it
+creates to manage progress on that asynchronous operation. If the <em>req</em> is <em>NULL</em>, that means that the
+API operation is blocking and so the connector would not execute the operation asynchronously. If
+the connector does not support asynchronous operations, it needs not to worry about this field and
+leaves it unset.</li>
+</ul>
+
+In order to keep the number of the VOL object classes and callbacks concise and readable, it was decided
+not to have a one-to-one mapping between API operation and callbacks. The parameter names and types
+will be detailed when describing each callback in their respective sections.
+
+The HDF5 library provides several routines to access an object in the container.  For example, to open an
+attribute on a group object, the user could use #H5Aopen and pass the group identifier directly where the
+attribute needs to be opened. Alternatively, the user could use #H5Aopen_by_name or #H5Aopen_by_idx
+to open the attribute, which provides a more flexible way of locating the attribute, whether by a starting
+object location and a path or an index type and traversal order. All those types of accesses usually map to
+one VOL callback with a parameter that indicates the access type. In the example of opening an attribute,
+the three API open routine will map to the same VOL open callback but with a different location parameter.
+The same applies to all types of routines that have multiple types of accesses. The location parameter is a
+structure defined in:
+
+<em>Structure to hold parameters for object locations, H5VLconnector.h</em>
+\code
+//
+// Structure to hold parameters for object locations.
+// either: BY_SELF, BY_NAME, BY_IDX, BY_TOKEN
+
+typedef struct H5VL_loc_params_t {
+  H5I_type_t obj_type;  // The object type of the location object
+  H5VL_loc_type_t type; // The location type
+  union { // parameters of the location
+    H5VL_loc_by_token_t   loc_by_token;
+    H5VL_loc_by_name_t    loc_by_name;
+    H5VL_loc_by_idx_t     loc_by_idx;
+    }loc_data;
+  } H5VL_loc_params_t
+
+//
+// Types for different ways that objects are located in an
+// HDF5 container.
+typedef enum H5VL_loc_type_t {
+  // starting location is the target object
+  H5VL_OBJECT_BY_SELF,
+
+  // location defined by object and path in H5VL_loc_by_name_t
+  H5VL_OBJECT_BY_NAME,
+
+  // location defined by object, path, and index in H5VL_loc_by_idx_t
+  H5VL_OBJECT_BY_IDX,
+  
+  // location defined by token (e.g. physical address) in H5VL_loc_by_token_t
+  H5VL_OBJECT_BY_TOKEN,
+} H5VL_loc_type_t;
+
+typedef struct H5VL_loc_by_name {
+  const char *name; // The path relative to the starting location
+  hid_t lapl_id;    // The link access property list
+}H5VL_loc_by_name_t;
+
+typedef struct H5VL_loc_by_idx {
+  const char *name;      // The path relative to the starting location
+  H5_index_t idx_type;   // Type of index
+  H5_iter_order_t order; // Index traversal order
+  hsize_t n;             // Position in index
+  hid_t lapl_id;         // The link access property list
+}H5VL_loc_by_idx_t;
+
+typedef struct H5VL_loc_by_token {
+  void *token; // arbitrary token (physical address of location in native VOL)
+}H5VL_loc_by_token_t;
+\endcode
+
+\subsection subsecVOLRefConn Connector Information Callbacks
+This section's callbacks involve the connector-specific information that will be associated with the VOL in
+the fapl via <b>H5Pset_fapl_<name></b> et al. This data is copied into the fapl so the library needs these functions to
+manage this in a way that prevents resource leaks.
+
+The <em>to_str</em> and <em>from_str</em> callbacks are used to convert the connector-specific data to and from a configuration
+string. There is no official way to construct VOL configuration strings, so the format used (JSON,
+XML, getopt-style processing, etc.) is up to the connector author. These connector configuration strings
+can be used to set up a VOL connector via mechanisms like command-line parameters and environment
+variables.
+
+<em>Info class for connector information routines, H5VLconnector.h</em>
+\code
+// VOL connector info fields & callbacks 
+typedef struct H5VL_info_class_t {
+    size_t size;                     // Size of the VOL info
+    void *(*copy)(const void *info); // Callback to create a copy of the VOL info
+    herr_t (*cmp)(int *cmp_value, const void *info1, const void *info2); // Callback to compare VOL info
+    herr_t (*free)(void *info);                       // Callback to release a VOL info
+    herr_t (*to_str)(const void *info, char **str);   // Callback to serialize connector's info into a string
+    herr_t (*from_str)(const char *str, void **info); // Callback to deserialize a string into connector's info
+} H5VL_info_class_t;
+\endcode
+
+\subsubsection subsubsecVOLRefConnsize info: size
+The <em>size</em> field indicates the size required to store any special information that the connector needs.
+
+If the connector requires no special information, set this field to zero.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  size_t size;
+\endcode
+</td>
+</tr>
+</table>
+
+\subsubsection subsubsecVOLRefConncopy info: copy
+The <em>copy</em> callback is invoked when the connector is selected for use with <b>H5Pset_fapl_<name></b>, the
+connector-specific set call, etc. Where possible, the information should be deep copied in such a way that the original
+data can be freed.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  void * (*copy)(const void *info);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  info  (IN): The connector-specific info to copy.
+\endcode
+</td>
+</tr>
+</table>
+
+\subsubsection subsubsecVOLRefConncmp info: cmp
+The <em>cmp</em> callback is used to determine if two connector-specific data structs are identical and helps the library
+manage connector resources.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*cmp)(int *cmp_value, const void *info1, const void *info2);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  cmp_value  (OUT): A strcmp-like compare value.
+  info1      (IN):  The 1st connector-specific info to copy.
+  info2      (IN):  The 2nd connector-specific info to copy.
+\endcode
+</td>
+</tr>
+</table>
+
+\subsubsection subsubsecVOLRefConnfree info: free
+The <em>free</em> callback is used to clean up the connector-specific information that was copied when set in the
+fapl via the <em>copy</em> callback.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*free)(void *info);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  info  (IN): The connector-specific info to free.
+\endcode
+</td>
+</tr>
+</table>
+
+\subsubsection subsubsecVOLRefConnto info: to_str
+The <em>to_str</em> callback converts a connector-specific information structure to a connector-specific configuration
+string. It is the opposite of the <em>from_str</em> callback.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*to_str)(const void *info, char **str);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  info  (IN):  The connector-specific info to convert to a configuration string.
+  str   (OUT): The constructed configuration string.
+\endcode
+</td>
+</tr>
+</table>
+
+\subsubsection subsubsecVOLRefConnfrom info: from_str
+The <em>from_str</em> callback converts a connector-specific configuration string to a connector-specific information
+structure. It is the opposite of the <em>to_str</em> callback.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*from_str)(const char *str, void **info);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  str  (IN):  The connector-specific configuration string.
+  info (OUT): The connector-specific info generated from the configuration string.
+\endcode
+</td>
+</tr>
+</table>
+
+\subsection subsecVOLRefWrap Object Wrap Callbacks
+The object wrap callbacks are used by passthrough connectors to wrap/unwrap objects and contexts when
+passing them up and down the VOL chain.
+
+<em>Wrap class for object wrapping routines, H5VLconnector.h</em>
+\code
+typedef struct H5VL_wrap_class_t {
+    void *(*get_object)(const void *obj);    // Callback to retrieve underlying object
+    herr_t (*get_wrap_ctx)(const void *obj, void **wrap_ctx); // Callback to retrieve the object wrapping context for the connector
+    void *(*wrap_object)(void *obj, H5I_type_t obj_type, void *wrap_ctx); // Callback to wrap a library object
+    void *(*unwrap_object)(void *obj);       // Callback to unwrap a library object
+    herr_t (*free_wrap_ctx)(void *wrap_ctx); // Callback to release the object wrapping context for the connector
+} H5VL_wrap_class_t;
+\endcode
+
+\subsubsection subsubsecVOLRefWrapobj wrap: get_object
+Retrieves an underlying object.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  void * (*get_object)(const void *obj);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  obj  (IN): Object being unwrapped.
+\endcode
+</td>
+</tr>
+</table>
+
+\subsubsection subsubsecVOLRefWrapctx wrap: get_wrap_ctx
+Get a VOL connector's object wrapping context.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*get_wrap_ctx)(const void *obj, void **wrap_ctx);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  obj      (IN):  Object for which we need a context.
+  wrap_ctx (OUT): Context.
+\endcode
+</td>
+</tr>
+</table>
+
+\subsubsection subsubsecVOLRefWrapwrap wrap: wrap_object
+Asks a connector to wrap an underlying object.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  void * (*wrap_object)(void *obj, H5I_type_t obj_type, void *wrap_ctx);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  obj       (IN): Object being wrapped.
+  obj_type  (IN): Object type (see H5Ipublic.h).
+  wrap_ctx  (IN): Context.
+\endcode
+</td>
+</tr>
+</table>
+
+\subsubsection subsubsecVOLRefWrapunwrap wrap: unwrap_object
+Unwrap an object from connector.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  void * (*unwrap_object)(void *obj);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  obj  (IN): Object being unwrapped.
+\endcode
+</td>
+</tr>
+</table>
+
+\subsubsection subsubsecVOLRefWrapfree wrap: free_wrap_ctx
+Release a VOL connector's object wrapping context.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*free_wrap_ctx)(void *wrap_ctx);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  wrap_ctx  (IN): Context to be freed.
+\endcode
+</td>
+</tr>
+</table>
+
+\subsection subsecVOLRefAttr The Attribute Function Callbacks
+The attribute API routines (\ref H5A) allow HDF5 users to create and manage HDF5 attributes. All the \ref H5A
+API routines that modify the HDF5 container map to one of the attribute callback routines in this class
+that the connector needs to implement.
+
+<em>Structure for attribute callback routines, H5VLconnector.h</em>
+\code
+typedef struct H5VL_attr_class_t {
+    void *(*create)(void *obj, const H5VL_loc_params_t *loc_params, const char *attr_name, hid_t type_id,
+                    hid_t space_id, hid_t acpl_id, hid_t aapl_id, hid_t dxpl_id, void **req);
+    void *(*open)(void *obj, const H5VL_loc_params_t *loc_params, const char *attr_name, hid_t aapl_id,
+                  hid_t dxpl_id, void **req);
+    herr_t (*read)(void *attr, hid_t mem_type_id, void *buf, hid_t dxpl_id, void **req);
+    herr_t (*write)(void *attr, hid_t mem_type_id, const void *buf, hid_t dxpl_id, void **req);
+    herr_t (*get)(void *obj, H5VL_attr_get_args_t *args, hid_t dxpl_id, void **req);
+    herr_t (*specific)(void *obj, const H5VL_loc_params_t *loc_params, H5VL_attr_specific_args_t *args,
+                       hid_t dxpl_id, void **req);
+    herr_t (*optional)(void *obj, H5VL_optional_args_t *args, hid_t dxpl_id, void **req);
+    herr_t (*close)(void *attr, hid_t dxpl_id, void **req);
+} H5VL_attr_class_t;
+\endcode
+
+\subsubsection subsubsecVOLRefAttrcreate attr: create
+The <em>create</em> callback in the attribute class creates an attribute object in the container of the location object
+and returns a pointer to the attribute structure containing information to access the attribute in future calls.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  void *(*create)(void *obj, H5VL_loc_params_t *loc_params, const char *attr_name, hid_t type_id, hid_t space_id, hid_t acpl_id, hid_t aapl_id, hid_t dxpl_id, void **req);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  obj        (IN): Pointer to an object where the attribute needs to be created or where the look-up
+                   of the target object needs to start.
+  loc_params (IN): Pointer to the location parameters as explained in "Mapping the API to the Callbacks".
+  attr_name  (IN): The name of the attribute to be created.
+  type_id    (IN): The datatype of the attribute.
+  space_id   (IN): The dataspace of the attribute.
+  acpl_id    (IN): The attribute creation property list.
+  aapl_id    (IN): The attribute access property list.
+  dxpl_id    (IN): The data transfer property list.
+  req    (IN/OUT): A pointer to the asynchronous request of the operation created by the connector.
+\endcode
+</td>
+</tr>
+</table>
+
+\subsubsection subsubsecVOLRefAttropen attr: open
+The <em>open</em> callback in the attribute class opens an attribute object in the container of the location object and
+returns a pointer to the attribute structure containing information to access the attribute in future calls.<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  void *(*open)(void *obj, H5VL_loc_params_t *loc_params, const char *attr_name, hid_t aapl_id, hid_t dxpl_id, void **req);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  obj        (IN): Pointer to an object where the attribute needs to be opened or where the look-up
+                   of the target object needs to start.
+  loc_params (IN): Pointer to the location parameters as explained in "Mapping the API to the Callbacks".
+  attr_name  (IN): The name of the attribute to be opened.
+  aapl_id    (IN): The attribute access property list.
+  dxpl_id    (IN): The data transfer property list.
+  req    (IN/OUT): A pointer to the asynchronous request of the operation created by the connector.
+\endcode
+</td>
+</tr>
+</table>
+
+\subsubsection subsubsecVOLRefAttrread attr: read
+The <em>read</em> callback in the attribute class reads data from the attribute object and returns an <em>herr_t</em> indicating
+success or failure.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*read)(void *attr, hid_t mem_type_id, void *buf, hid_t dxpl_id, void **req);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  attr        (IN): Pointer to the attribute object.
+  mem_type_id (IN): The memory datatype of the attribute.
+  buf        (OUT): Data buffer to be read into.
+  dxpl_id     (IN): The data transfer property list.
+  req     (IN/OUT): A pointer to the asynchronous request of the operation created by the connector.
+\endcode
+</td>
+</tr>
+</table>
+
+\subsubsection subsubsecVOLRefAttrwrite attr: write
+The <em>write</em> callback in the attribute class writes data to the attribute object and returns an <em>herr_t</em> indicating
+success or failure.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*write)(void *attr, hid_t mem_type_id, const void *buf, hid_t dxpl_id, void **req);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  attr        (IN): Pointer to the attribute object.
+  mem_type_id (IN): The memory datatype of the attribute.
+  buf         (IN): Data buffer to be written.
+  dxpl_id     (IN): The data transfer property list.
+  req     (IN/OUT): A pointer to the asynchronous request of the operation created by the connector.
+\endcode
+</td>
+</tr>
+</table>
+
+\subsubsection subsubsecVOLRefAttrget attr: get
+The <em>get</em> callback in the attribute class retrieves information about the attribute as specified in the <em>get_type</em> parameter.
+It returns an <em>herr_t</em> indicating success or failure
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*get)(void *obj, H5VL_attr_get_args_t *args, hid_t dxpl_id, void **req);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  obj      (IN): An attribute or location object where information needs to be retrieved from.
+  args (IN/OUT): A pointer to the arguments struct.
+  dxpl_id  (IN): The data transfer property list.
+  req  (IN/OUT): A pointer to the asynchronous request of the operation created by the connector.
+\endcode
+</td>
+</tr>
+</table>
+
+\code
+/* Values for attribute 'get' operations */
+typedef enum H5VL_attr_get_t {
+    H5VL_ATTR_GET_ACPL,         /* creation property list              */
+    H5VL_ATTR_GET_INFO,         /* info                                */
+    H5VL_ATTR_GET_NAME,         /* access property list                */
+    H5VL_ATTR_GET_SPACE,        /* dataspace                           */
+    H5VL_ATTR_GET_STORAGE_SIZE, /* storage size                        */
+    H5VL_ATTR_GET_TYPE          /* datatype                            */
+} H5VL_attr_get_t;
+
+/* Parameters for attribute 'get_name' operation */
+typedef struct H5VL_attr_get_name_args_t {
+    H5VL_loc_params_t loc_params;    /* Location parameters for object access */
+    size_t            buf_size;      /* Size of attribute name buffer */
+    char             *buf;           /* Buffer for attribute name (OUT) */
+    size_t           *attr_name_len; /* Actual length of attribute name (OUT) */
+} H5VL_attr_get_name_args_t;
+
+/* Parameters for attribute 'get_info' operation */
+typedef struct H5VL_attr_get_info_args_t {
+    H5VL_loc_params_t loc_params; /* Location parameters for object access */
+    const char       *attr_name;  /* Attribute name (for get_info_by_name) */
+    H5A_info_t       *ainfo;      /* Attribute info (OUT) */
+} H5VL_attr_get_info_args_t;
+
+/* Parameters for attribute 'get' operations */
+typedef struct H5VL_attr_get_args_t {
+    H5VL_attr_get_t op_type; /* Operation to perform */
+
+    /* Parameters for each operation */
+    union {
+        /* H5VL_ATTR_GET_ACPL */
+        struct {
+            hid_t acpl_id; /* Attribute creation property list ID (OUT) */
+        } get_acpl;
+
+        /* H5VL_ATTR_GET_INFO */
+        H5VL_attr_get_info_args_t get_info; /* Attribute info */
+
+        /* H5VL_ATTR_GET_NAME */
+        H5VL_attr_get_name_args_t get_name; /* Attribute name */
+
+        /* H5VL_ATTR_GET_SPACE */
+        struct {
+            hid_t space_id; /* Dataspace ID (OUT) */
+        } get_space;
+
+        /* H5VL_ATTR_GET_STORAGE_SIZE */
+        struct {
+            hsize_t *data_size; /* Size of attribute in file (OUT) */
+        } get_storage_size;
+
+        /* H5VL_ATTR_GET_TYPE */
+        struct {
+            hid_t type_id; /* Datatype ID (OUT) */
+        } get_type;
+    } args;
+} H5VL_attr_get_args_t;
+\endcode
+
+\subsubsection subsubsecVOLRefAttrspec attr: specific
+The <em>specific</em> callback in the attribute class implements specific operations on HDF5 attributes as specified
+in the <em>specific_type</em> parameter.  It returns an <em>herr_t</em> indicating success or failure.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*specific)(void *obj, H5VL_loc_params_t *loc_params, H5VL_attr_specific_args_t *args, hid_t dxpl_id, void **req);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  obj        (IN): The location object where the operation needs to happen.
+  loc_params (IN): A pointer to the location parameters as explained in "Mapping the API to the Callbacks".
+  args   (IN/OUT): A pointer to the arguments struct.
+  dxpl_id    (IN): The data transfer property list.
+  req    (IN/OUT): A pointer to the asynchronous request of the operation created by the connector.
+\endcode
+</td>
+</tr>
+</table>
+
+\code
+/* Values for attribute 'specific' operation */
+typedef enum H5VL_attr_specific_t {
+    H5VL_ATTR_DELETE,        /* H5Adelete(_by_name)  */
+    H5VL_ATTR_DELETE_BY_IDX, /* H5Adelete_by_idx     */
+    H5VL_ATTR_EXISTS,        /* H5Aexists(_by_name)  */
+    H5VL_ATTR_ITER,          /* H5Aiterate(_by_name) */
+    H5VL_ATTR_RENAME         /* H5Arename(_by_name)  */
+} H5VL_attr_specific_t;
+
+/* Parameters for attribute 'iterate' operation */
+typedef struct H5VL_attr_iterate_args_t {
+    H5_index_t      idx_type; /* Type of index to iterate over */
+    H5_iter_order_t order;    /* Order of index iteration */
+    hsize_t        *idx;      /* Start/stop iteration index (IN/OUT) */
+    H5A_operator2_t op;       /* Iteration callback function */
+    void           *op_data;  /* Iteration callback context */
+} H5VL_attr_iterate_args_t;
+
+/* Parameters for attribute 'delete_by_idx' operation */
+typedef struct H5VL_attr_delete_by_idx_args_t {
+    H5_index_t      idx_type; /* Type of index to iterate over */
+    H5_iter_order_t order;    /* Order of index iteration */
+    hsize_t         n;        /* Iteration index */
+} H5VL_attr_delete_by_idx_args_t;
+
+/* Parameters for attribute 'specific' operations */
+typedef struct H5VL_attr_specific_args_t {
+    H5VL_attr_specific_t op_type; /* Operation to perform */
+
+    /* Parameters for each operation */
+    union {
+        /* H5VL_ATTR_DELETE */
+        struct {
+            const char *name; /* Name of attribute to delete */
+        } del;
+
+        /* H5VL_ATTR_DELETE_BY_IDX */
+        H5VL_attr_delete_by_idx_args_t delete_by_idx;
+
+        /* H5VL_ATTR_EXISTS */
+        struct {
+            const char *name;   /* Name of attribute to check */
+            hbool_t    *exists; /* Whether attribute exists (OUT) */
+        } exists;
+
+        /* H5VL_ATTR_ITER */
+        H5VL_attr_iterate_args_t iterate;
+
+        /* H5VL_ATTR_RENAME */
+        struct {
+            const char *old_name; /* Name of attribute to rename */
+            const char *new_name; /* New attribute name */
+        } rename;
+    } args;
+} H5VL_attr_specific_args_t;
+\endcode
+
+\subsubsection subsubsecVOLRefAttropt attr: optional
+The <em>optional</em> callback in the attribute class implements connector specific operations on an HDF5 attribute.
+It returns an <em>herr_t</em> indicating success or failure.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*optional)(void *obj, H5VL_optional_args_t *args, hid_t dxpl_id, void **req);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  obj      (IN): The container or object where the operation needs to happen.
+  args (IN/OUT): A pointer to the arguments struct.
+  dxpl_id  (IN): The data transfer property list.
+  req  (IN/OUT): A pointer to the asynchronous request of the operation created by the connector.
+\endcode
+</td>
+</tr>
+</table>
+Each connector that requires connector-specific operations should compare the value of the <em>op_type</em> field of
+the #H5VL_optional_args_t struct with the values returned from calling #H5VLregister_opt_operation to
+determine how to handle the optional call and interpret the arguments passed in the struct.
+
+\subsubsection subsubsecVOLRefAttrclose attr: close
+The <em>close</em> callback in the attribute class terminates access to the attribute object and free all resources it
+was consuming, and returns an <em>herr_t</em> indicating success or failure.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*close)(void *attr, hid_t dxpl_id, void **req);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  attr     (IN): Pointer to the attribute object.
+  dxpl_id  (IN): The data transfer property list.
+  req  (IN/OUT): A pointer to the asynchronous request of the operation created by the connector.
+\endcode
+</td>
+</tr>
+</table>
+
+\subsection subsecVOLRefDset Dataset Callbacks
+The dataset API routines (\ref H5D) allow HDF5 users to create and manage HDF5 datasets. All the \ref H5D API
+routines that modify the HDF5 container map to one of the dataset callback routines in this class that the
+connector needs to implement.
+
+<em>Structure for dataset callback routines, H5VLconnector.h</em>
+\code
+typedef struct H5VL_dataset_class_t {
+    void *(*create)(void *obj, const H5VL_loc_params_t *loc_params, const char *name, hid_t lcpl_id,
+                    hid_t type_id, hid_t space_id, hid_t dcpl_id, hid_t dapl_id, hid_t dxpl_id, void **req);
+    void *(*open)(void *obj, const H5VL_loc_params_t *loc_params, const char *name, hid_t dapl_id,
+                  hid_t dxpl_id, void **req);
+    herr_t (*read)(size_t count, void *dset[], hid_t mem_type_id[], hid_t mem_space_id[],
+                   hid_t file_space_id[], hid_t dxpl_id, void *buf[], void **req);
+    herr_t (*write)(size_t count, void *dset[], hid_t mem_type_id[], hid_t mem_space_id[],
+                    hid_t file_space_id[], hid_t dxpl_id, const void *buf[], void **req);
+    herr_t (*get)(void *obj, H5VL_dataset_get_args_t *args, hid_t dxpl_id, void **req);
+    herr_t (*specific)(void *obj, H5VL_dataset_specific_args_t *args, hid_t dxpl_id, void **req);
+    herr_t (*optional)(void *obj, H5VL_optional_args_t *args, hid_t dxpl_id, void **req);
+    herr_t (*close)(void *dset, hid_t dxpl_id, void **req);
+} H5VL_dataset_class_t;
+\endcode
+
+\subsubsection subsubsecVOLRefDsetcreate dataset: create
+The <em>create</em> callback in the dataset class creates a dataset object in the container of the location object and
+returns a pointer to the dataset structure containing information to access the dataset in future calls.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  void *(*create)(void *obj, H5VL_loc_params_t *loc_params, const char *name, hid_t lcpl_id,hid_t type_id, hid_t space_id, hid_t dcpl_id, hid_t dapl_id, hid_t dxpl_id, void **req);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  obj        (IN): Pointer to an object where the dataset needs to be created or where the look-up of
+                   the target object needs to start.
+  loc_params (IN): Pointer to the location parameters as explained in "Mapping the API to the Callbacks".
+                   The type can be only H5VL_OBJECT_BY_SELF in this callback.
+  name       (IN): The name of the dataset to be created.
+  lcpl_id    (IN): The link creation property list.
+  type_id    (IN): The datatype of the dataset.
+  space_id   (IN): The dataspace of the dataset.
+  dcpl_id    (IN): The dataset creation property list.
+  dapl_id    (IN): The dataset access property list.
+  dxpl_id    (IN): The data transfer property list.
+  req    (IN/OUT): A pointer to the asynchronous request of the operation created by the connector.
+\endcode
+</td>
+</tr>
+</table>
+
+\subsubsection subsubsecVOLRefDsetopen dataset: open
+The <em>open</em> callback in the dataset class opens a dataset object in the container of the location object and
+returns a pointer to the dataset structure containing information to access the dataset in future calls.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  void *(*open)(void *obj, H5VL_loc_params_t *loc_params, const char *name, hid_t dapl_id, hid_t dxpl_id, void **req);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  obj        (IN): Pointer to an object where the dataset needs to be opened or where the look-up of the target object needs to start.
+  loc_params (IN): Pointer to the location parameters as explained in "Mapping the API to the Callbacks".
+                   The type can be only H5VL_OBJECT_BY_SELF in this callback.
+  name       (IN): The name of the dataset to be opened.
+  dapl_id    (IN): The dataset access property list.
+  dxpl_id    (IN): The data transfer property list.
+  req    (IN/OUT): A pointer to the asynchronous request of the operation created by the connector.
+\endcode
+</td>
+</tr>
+</table>
+
+\subsubsection subsubsecVOLRefDsetread dataset: read
+The <em>read</em> callback in the dataset class reads data from the dataset object and returns an <em>herr_t</em> indicating
+success or failure.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*read)(void *dset, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t dxpl_id, void *buf, void **req);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  dset          (IN): Pointer to the dataset object.
+  mem_type_id   (IN): The memory datatype of the data.
+  mem_space_id  (IN): The memory dataspace selection.
+  file_space_id (IN): The file dataspace selection.
+  dxpl_id       (IN): The data transfer property list.
+  buf          (OUT): Data buffer to be read into.
+  req       (IN/OUT): A pointer to the asynchronous request of the operation created by the connector.
+\endcode
+</td>
+</tr>
+</table>
+
+\subsubsection subsubsecVOLRefDsetwrite dataset: write
+The <em>write</em> callback in the dataset class writes data to the dataset object and returns an <em>herr_t</em> indicating
+success or failure.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*write)(void *dset, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t dxpl_id, const void *buf, void **req);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  dset          (IN): Pointer to the dataset object.
+  mem_type_id   (IN): The memory datatype of the data.
+  mem_space_id  (IN): The memory dataspace selection.
+  file_space_id (IN): The file dataspace selection.
+  dxpl_id       (IN): The data transfer property list.
+  buf           (IN): Data buffer to be written from.
+  req       (IN/OUT): A pointer to the asynchronous request of the operation created by the connector.
+\endcode
+</td>
+</tr>
+</table>
+
+\subsubsection subsubsecVOLRefDsetget dataset: get
+The <em>get</em> callback in the dataset class retrieves information about the dataset as specified in the <em>get_type</em>
+parameter.It returns an <em>herr_t</em> indicating success or failure.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*get)(void *dset, H5VL_dataset_get_args_t *args, hid_t dxpl_id, void **req);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  dset     (IN): The dataset object where information needs to be retrieved from.
+  args (IN/OUT): A pointer to the arguments struct.
+  dxpl_id  (IN): The data transfer property list.
+  req  (IN/OUT): A pointer to the asynchronous request of the operation created by the connector.
+\endcode
+</td>
+</tr>
+</table>
+\code
+/* Values for dataset 'get' operation */
+typedef enum H5VL_dataset_get_t {
+    H5VL_DATASET_GET_DAPL,         /* access property list                */
+    H5VL_DATASET_GET_DCPL,         /* creation property list              */
+    H5VL_DATASET_GET_SPACE,        /* dataspace                           */
+    H5VL_DATASET_GET_SPACE_STATUS, /* space status                        */
+    H5VL_DATASET_GET_STORAGE_SIZE, /* storage size                        */
+    H5VL_DATASET_GET_TYPE          /* datatype                            */
+} H5VL_dataset_get_t;
+
+/* Parameters for dataset 'get' operations */
+typedef struct H5VL_dataset_get_args_t {
+    H5VL_dataset_get_t op_type; /* Operation to perform */
+
+    /* Parameters for each operation */
+    union {
+        /* H5VL_DATASET_GET_DAPL */
+        struct {
+            hid_t dapl_id; /* Dataset access property list ID (OUT) */
+        } get_dapl;
+
+        /* H5VL_DATASET_GET_DCPL */
+        struct {
+            hid_t dcpl_id; /* Dataset creation property list ID (OUT) */
+        } get_dcpl;
+
+        /* H5VL_DATASET_GET_SPACE */
+        struct {
+            hid_t space_id; /* Dataspace ID (OUT) */
+        } get_space;
+
+        /* H5VL_DATASET_GET_SPACE_STATUS */
+        struct {
+            H5D_space_status_t *status; /* Storage space allocation status (OUT) */
+        } get_space_status;
+
+        /* H5VL_DATASET_GET_STORAGE_SIZE */
+        struct {
+            hsize_t *storage_size; /* Size of dataset's storage (OUT) */
+        } get_storage_size;
+
+        /* H5VL_DATASET_GET_TYPE */
+        struct {
+            hid_t type_id; /* Datatype ID (OUT) */
+        } get_type;
+    } args;
+} H5VL_dataset_get_args_t;
+\endcode
+
+\subsubsection subsubsecVOLRefDsetspec dataset: specific
+The <em>specific</em> callback in the dataset class implements specific operations on HDF5 datasets as specified in
+the <em>specific_type</em> parameter. It returns an <em>herr_t</em> indicating success or failure.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*specific)(void *obj, H5VL_file_specific_args_t *args, hid_t dxpl_id, void **req);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  obj      (IN): The dset where the operation needs to happen.
+  args (IN/OUT): A pointer to the arguments struct.
+  dxpl_id  (IN): The data transfer property list.
+  req  (IN/OUT): A pointer to the asynchronous request of the operation created by the connector.
+\endcode
+</td>
+</tr>
+</table>
+\code
+/* Values for dataset 'specific' operation */
+typedef enum H5VL_dataset_specific_t {
+    H5VL_DATASET_SET_EXTENT, /* H5Dset_extent                       */
+    H5VL_DATASET_FLUSH,      /* H5Dflush                            */
+    H5VL_DATASET_REFRESH     /* H5Drefresh                          */
+} H5VL_dataset_specific_t;
+
+/* Parameters for dataset 'specific' operations */
+typedef struct H5VL_dataset_specific_args_t {
+    H5VL_dataset_specific_t op_type; /* Operation to perform */
+
+    /* Parameters for each operation */
+    union {
+        /* H5VL_DATASET_SET_EXTENT */
+        struct {
+            const hsize_t *size; /* New dataspace extent */
+        } set_extent;
+
+        /* H5VL_DATASET_FLUSH */
+        struct {
+            hid_t dset_id; /* Dataset ID (IN) */
+        } flush;
+
+        /* H5VL_DATASET_REFRESH */
+        struct {
+            hid_t dset_id; /* Dataset ID (IN) */
+        } refresh;
+    } args;
+} H5VL_dataset_specific_args_t;
+\endcode
+
+\subsubsection subsubsecVOLRefDsetopt dataset: optional
+The <em>optional</em> callback in the dataset class implements connector specific operations on an HDF5 dataset.
+It returns an <em>herr_t</em> indicating success or failure.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*optional)(void *obj, H5VL_optional_args_t *args, hid_t dxpl_id, void **req);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  obj      (IN): The container or object where the operation needs to happen.
+  args (IN/OUT): A pointer to the arguments struct.
+  dxpl_id  (IN): The data transfer property list.
+  req  (IN/OUT): A pointer to the asynchronous request of the operation created by the connector.
+\endcode
+</td>
+</tr>
+</table>
+Each connector that requires connector-specific operations should compare the value of the <em>op_type</em> field of
+the #H5VL_optional_args_t struct with the values returned from calling #H5VLregister_opt_operation to
+determine how to handle the optional call and interpret the arguments passed in the struct.
+
+\subsubsection subsubsecVOLRefDsetclose dataset: close
+The <em>close</em> callback in the dataset class terminates access to the dataset object and free all resources it was
+consuming and returns an <em>herr_t</em> indicating success or failure.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*close)(void *dset, hid_t dxpl_id, void **req);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  dset    (IN): Pointer to the dataset object.
+  dxpl_id (IN): The data transfer property list.
+  req (IN/OUT): A pointer to the asynchronous request of the operation created by the connector.
+\endcode
+</td>
+</tr>
+</table>
+
+\subsection subsecVOLRefDType Datatype Callbacks
+The HDF5 datatype routines (\ref H5T) allow users to create and manage HDF5 datatypes.  Those routines are
+divided into two categories. One that operates on all types of datatypes but do not modify the contents of the
+container (all in memory), and others that operate on named datatypes by accessing the container. When
+a user creates an HDF5 datatype, it is still an object in memory space (transient datatype) that has not
+been added to the HDF5 containers. Only when a user commits the HDF5 datatype, it becomes persistent
+in the container. Those are called named/committed datatypes. The transient H5T routines should work
+on named datatypes nevertheless.
+
+All the \ref H5T API routines that modify the HDF5 container map to one of the named datatype callback
+routines in this class that the connector needs to implement.
+
+<em>Structure for datatype callback routines, H5VLconnector.h</em>
+\code
+typedef struct H5VL_datatype_class_t {
+    void *(*commit)(void *obj, const H5VL_loc_params_t *loc_params, const char *name, hid_t type_id,
+                    hid_t lcpl_id, hid_t tcpl_id, hid_t tapl_id, hid_t dxpl_id, void **req);
+    void *(*open)(void *obj, const H5VL_loc_params_t *loc_params, const char *name, hid_t tapl_id,
+                  hid_t dxpl_id, void **req);
+    herr_t (*get)(void *obj, H5VL_datatype_get_args_t *args, hid_t dxpl_id, void **req);
+    herr_t (*specific)(void *obj, H5VL_datatype_specific_args_t *args, hid_t dxpl_id, void **req);
+    herr_t (*optional)(void *obj, H5VL_optional_args_t *args, hid_t dxpl_id, void **req);
+    herr_t (*close)(void *dt, hid_t dxpl_id, void **req);
+} H5VL_datatype_class_t;
+\endcode
+
+\subsubsection subsubsecVOLRefDTypecommit datatype: commit
+The <em>commit</em> callback in the named datatype class creates a datatype object in the container of the location
+object and returns a pointer to the datatype structure containing information to access the datatype in
+future calls.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  void *(*commit)(void *obj, H5VL_loc_params_t *loc_params, const char *name, hid_t type_id, hid_t lcpl_id, hid_t tcpl_id, hid_t tapl_id, hid_t dxpl_id, void **req);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  obj        (IN): Pointer to an object where the datatype needs to be committed or where the look-up of the target object needs to start.
+  loc_params (IN): Pointer to location parameters as explained in "Mapping the API to the Callbacks".
+                   In this call, the location type is always H5VL_OBJECT_BY_SELF.
+  name       (IN): The name of the datatype to be created.
+  typeid     (IN): The transient datatype identifier to be committed.
+  lcpl_id    (IN): The link creation property list.
+  tcpl_id    (IN): The datatype creation property list.
+  tapl_id    (IN): The datatype access property list.
+  dxpl_id    (IN): The data transfer property list.
+  req    (IN/OUT): A pointer to the asynchronous request of the operation created by the connector.
+\endcode
+</td>
+</tr>
+</table>
+
+\subsubsection subsubsecVOLRefDTypeopen datatype: open
+The <em>open</em> callback in the named datatype class opens a previously committed datatype object in the container
+of the location object and returns a pointer to the datatype structure containing information to access the
+datatype in future calls.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  void *(*open) (void *obj, H5VL_loc_params_t *loc_params, const char * name, hid_t tapl_id, hid_t dxpl_id, void **req);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  obj        (IN): Pointer to an object where the datatype needs to be opened or where the look-up
+                   of the target object needs to start.
+  loc_params (IN): Pointer to location parameters as explained in "Mapping the API to the Callbacks".
+                   In this call, the location type is always H5VL_OBJECT_BY_SELF.
+  name       (IN): The name of the datatype to be opened.
+  tapl_id    (IN): The datatype access property list.
+  dxpl_id    (IN): The data transfer property list.
+  req    (IN/OUT): A pointer to the asynchronous request of the operation created by the connector.
+\endcode
+</td>
+</tr>
+</table>
+
+\subsubsection subsubsecVOLRefDTypeget datatype: get
+The <em>get</em> callback in the named datatype class retrieves information about the named datatype as specified
+in thegettypeparameter.It returns an <em>herr_t</em> indicating success or failure.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*get) (void *obj, H5VL_datatype_get_args_t *args, hid_t dxpl_id, void **req);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  obj      (IN): The named datatype to retrieve information from.
+  args (IN/OUT): A pointer to the arguments struct.
+  dxpl_id  (IN): The data transfer property list.
+  req  (IN/OUT): A pointer to the asynchronous request of the operation created by the connector.
+\endcode
+</td>
+</tr>
+</table>
+\code
+/* Values for datatype 'get' operation */
+typedef enum H5VL_datatype_get_t {
+    H5VL_DATATYPE_GET_BINARY_SIZE, /* Get size of serialized form of transient type */
+    H5VL_DATATYPE_GET_BINARY,      /* Get serialized form of transient type         */
+    H5VL_DATATYPE_GET_TCPL         /* Datatype creation property list               */
+} H5VL_datatype_get_t;
+
+/* Parameters for datatype 'get' operations */
+typedef struct H5VL_datatype_get_args_t {
+    H5VL_datatype_get_t op_type; /* Operation to perform */
+
+    /* Parameters for each operation */
+    union {
+        /* H5VL_DATATYPE_GET_BINARY_SIZE */
+        struct {
+            size_t *size; /* Size of serialized form of datatype (OUT) */
+        } get_binary_size;
+
+        /* H5VL_DATATYPE_GET_BINARY */
+        struct {
+            void  *buf;      /* Buffer to store serialized form of datatype (OUT) */
+            size_t buf_size; /* Size of serialized datatype buffer */
+        } get_binary;
+
+        /* H5VL_DATATYPE_GET_TCPL */
+        struct {
+            hid_t tcpl_id; /* Named datatype creation property list ID (OUT) */
+        } get_tcpl;
+    } args;
+} H5VL_datatype_get_args_t;
+\endcode
+
+\subsubsection subsubsecVOLRefDTypespec datatype: specific
+The <em>specific</em> callback in the datatype class implements specific operations on HDF5 named datatypes as
+specified in the <em>specific_type</em> parameter.  It returns an <em>herr_t</em> indicating success or failure.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*specific)(void *obj, H5VL_loc_params_t *loc_params, H5VL_object_specific_args_t *args, hid_t dxpl_id, void **req);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  obj        (IN): The container or object where the operation needs to happen.
+  loc_params (IN): Pointer to location parameters as explained in "Mapping the API to the Callbacks".
+  args   (IN/OUT): A pointer to the arguments struct.
+  dxpl_id    (IN): The data transfer property list.
+  req    (IN/OUT): A pointer to the asynchronous request of the operation created by the connector.
+\endcode
+</td>
+</tr>
+</table>
+\code
+/* Values for datatype 'specific' operation */
+typedef enum H5VL_datatype_specific_t {
+    H5VL_DATATYPE_FLUSH,  /* H5Tflush */
+    H5VL_DATATYPE_REFRESH /* H5Trefresh */
+} H5VL_datatype_specific_t;
+
+/* Parameters for datatype 'specific' operations */
+typedef struct H5VL_datatype_specific_args_t {
+    H5VL_datatype_specific_t op_type; /* Operation to perform */
+
+    /* Parameters for each operation */
+    union {
+        /* H5VL_DATATYPE_FLUSH */
+        struct {
+            hid_t type_id; /* Named datatype ID (IN) */
+        } flush;
+
+        /* H5VL_DATATYPE_REFRESH */
+        struct {
+            hid_t type_id; /* Named datatype ID (IN) */
+        } refresh;
+    } args;
+} H5VL_datatype_specific_args_t;
+\endcode
+
+\subsubsection subsubsecVOLRefDTypeopt datatype: optional
+The <em>optional</em> callback in the datatype class implements connector specific operations on an HDF5 datatype.
+It returns an <em>herr_t</em> indicating success or failure.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*optional)(void *obj, H5VL_optional_args_t *args, hid_t dxpl_id, void **req);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  obj      (IN): The container or object where the operation needs to happen.
+  args (IN/OUT): A pointer to the arguments struct.
+  dxpl_id  (IN): The data transfer property list.
+  req  (IN/OUT): A pointer to the asynchronous request of the operation created by the connector.
+\endcode
+</td>
+</tr>
+</table>
+
+Each connector that requires connector-specific operations should compare the value of the <em>op_type</em> field of
+the #H5VL_optional_args_t struct with the values returned from calling #H5VLregister_opt_operation to
+determine how to handle the optional call and interpret the arguments passed in the struct.
+
+\subsubsection subsubsecVOLRefDTypeclose datatype: close
+The <em>close</em> callback in the named datatype class terminates access to the datatype object and free all
+resources it was consuming and returns an <em>herr_t</em> indicating success or failure.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*close) (void *dt, hid_t dxpl_id, void **req);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  dt      (IN): Pointer to the datatype object.
+  dxpl_id (IN): The data transfer property list.
+  req (IN/OUT): A pointer to the asynchronous request of the operation created by the connector.
+\endcode
+</td>
+</tr>
+</table>
+
+\subsection subsecVOLRefFile File Callbacks
+The file API routines (\ref H5F) allow HDF5 users to create and manage HDF5 containers. All the \ref H5F API
+routines that modify the HDF5 container map to one of the file callback routines in  his class that the
+connector needs to implement.
+
+<em>File class for file API routines, H5VLconnector.h</em>
+\code
+typedef struct H5VL_file_class_t {
+    void *(*create)(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id, hid_t dxpl_id,
+                    void **req);
+    void *(*open)(const char *name, unsigned flags, hid_t fapl_id, hid_t dxpl_id, void **req);
+    herr_t (*get)(void *obj, H5VL_file_get_args_t *args, hid_t dxpl_id, void **req);
+    herr_t (*specific)(void *obj, H5VL_file_specific_args_t *args, hid_t dxpl_id, void **req);
+    herr_t (*optional)(void *obj, H5VL_optional_args_t *args, hid_t dxpl_id, void **req);
+    herr_t (*close)(void *file, hid_t dxpl_id, void **req);
+} H5VL_file_class_t;
+\endcode
+
+\subsubsection subsubsecVOLRefFilecreate file: create
+The <em>create</em> callback in the file class should create a container and returns a pointer to the file structure
+created by the connector containing information to access the container in future calls.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  void *(*create)(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id, hid_tdxpl_id, void **req);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  name    (IN): The name of the container to be created.
+  flags   (IN): The creation flags of the container.
+  fcpl_id (IN): The file creation property list.
+  fapl_id (IN): The file access property list.
+  dxpl_id (IN): The data transfer property list.
+  req (IN/OUT): A pointer to the asynchronous request of the operation created by the connector.
+\endcode
+</td>
+</tr>
+</table>
+
+\subsubsection subsubsecVOLRefFileopen file: open
+The <em>open</em> callback in the file class should open a container and returns a pointer to the file structure created
+by the connector containing information to access the container in future calls.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  void *(*open)(const char *name, unsigned flags, hid_t fapl_id, hid_t dxpl_id, void **req);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  name    (IN): The name of the container to open.
+  flags   (IN): The open flags of the container.
+  fapl_id (IN): The file access property list.
+  dxpl_id (IN): The data transfer property list.
+  req (IN/OUT): A pointer to the asynchronous request of the operation created by the connector.
+\endcode
+</td>
+</tr>
+</table>
+
+\subsubsection subsubsecVOLRefFileget file: get
+The <em>get</em> callback in the file class should retrieve information about the container as specified in the <em>get_type</em>
+parameter. It returns an <em>herr_t</em> indicating success or failure.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*get)(void *obj, H5VL_file_get_args_t *args, hid_t dxpl_id, void **req);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  obj      (IN): The container or object where information needs to be retrieved from.
+  args (IN/OUT): A pointer to the arguments struct.
+  dxpl_id  (IN): The data transfer property list.
+  req  (IN/OUT): A pointer to the asynchronous request of the operation created by the connector.
+\endcode
+</td>
+</tr>
+</table>
+\code
+/* Info for H5VL_FILE_GET_CONT_INFO */
+typedef struct H5VL_file_cont_info_t {
+    unsigned version;       /* version information (keep first) */
+    uint64_t feature_flags; /* Container feature flags          */
+                            /* (none currently defined)         */
+    size_t token_size;      /* Size of tokens                   */
+    size_t blob_id_size;    /* Size of blob IDs                 */
+} H5VL_file_cont_info_t;
+
+/* Values for file 'get' operation */
+typedef enum H5VL_file_get_t {
+    H5VL_FILE_GET_CONT_INFO, /* file get container info              */
+    H5VL_FILE_GET_FAPL,      /* file access property list            */
+    H5VL_FILE_GET_FCPL,      /* file creation property list          */
+    H5VL_FILE_GET_FILENO,    /* file number                          */
+    H5VL_FILE_GET_INTENT,    /* file intent                          */
+    H5VL_FILE_GET_NAME,      /* file name                            */
+    H5VL_FILE_GET_OBJ_COUNT, /* object count in file                 */
+    H5VL_FILE_GET_OBJ_IDS    /* object ids in file                   */
+} H5VL_file_get_t;
+
+/* Parameters for file 'get_name' operation */
+typedef struct H5VL_file_get_name_args_t {
+    H5I_type_t type;          /* ID type of object pointer */
+    size_t     buf_size;      /* Size of file name buffer (IN) */
+    char      *buf;           /* Buffer for file name (OUT) */
+    size_t    *file_name_len; /* Actual length of file name (OUT) */
+} H5VL_file_get_name_args_t;
+
+/* Parameters for file 'get_obj_ids' operation */
+typedef struct H5VL_file_get_obj_ids_args_t {
+    unsigned types;    /* Type of objects to count */
+    size_t   max_objs; /* Size of array of object IDs */
+    hid_t   *oid_list; /* Array of object IDs (OUT) */
+    size_t  *count;    /* # of objects (OUT) */
+} H5VL_file_get_obj_ids_args_t;
+
+/* Parameters for file 'get' operations */
+typedef struct H5VL_file_get_args_t {
+    H5VL_file_get_t op_type; /* Operation to perform */
+
+    /* Parameters for each operation */
+    union {
+        /* H5VL_FILE_GET_CONT_INFO */
+        struct {
+            H5VL_file_cont_info_t *info; /* Container info (OUT) */
+        } get_cont_info;
+
+        /* H5VL_FILE_GET_FAPL */
+        struct {
+            hid_t fapl_id; /* File access property list (OUT) */
+        } get_fapl;
+
+        /* H5VL_FILE_GET_FCPL */
+        struct {
+            hid_t fcpl_id; /* File creation property list (OUT) */
+        } get_fcpl;
+
+        /* H5VL_FILE_GET_FILENO */
+        struct {
+            unsigned long *fileno; /* File "number" (OUT) */
+        } get_fileno;
+
+        /* H5VL_FILE_GET_INTENT */
+        struct {
+            unsigned *flags; /* File open/create intent flags (OUT) */
+        } get_intent;
+
+        /* H5VL_FILE_GET_NAME */
+        H5VL_file_get_name_args_t get_name;
+
+        /* H5VL_FILE_GET_OBJ_COUNT */
+        struct {
+            unsigned types; /* Type of objects to count */
+            size_t  *count; /* # of objects (OUT) */
+        } get_obj_count;
+
+        /* H5VL_FILE_GET_OBJ_IDS */
+        H5VL_file_get_obj_ids_args_t get_obj_ids;
+    } args;
+} H5VL_file_get_args_t;
+\endcode
+
+\subsubsection subsubsecVOLRefFilespec file: specific
+The <em>specific</em> callback in the file class implements specific operations on HDF5 files as specified in the
+<em>specific_type</em> parameter. It returns an <em>herr_t</em> indicating success or failure.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*specific)(void *obj, H5VL_file_specific_args_t *args, hid_t dxpl_id, void **req);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  obj      (IN): The container or object where the operation needs to happen.
+  args (IN/OUT): A pointer to the arguments struct.
+  dxpl_id  (IN): The data transfer property list.
+  req  (IN/OUT): A pointer to the asynchronous request of the operation created by the connector.
+\endcode
+</td>
+</tr>
+</table>
+\code
+/* Values for file 'specific' operation */
+typedef enum H5VL_file_specific_t {
+    H5VL_FILE_FLUSH,         /* Flush file                       */
+    H5VL_FILE_REOPEN,        /* Reopen the file                  */
+    H5VL_FILE_IS_ACCESSIBLE, /* Check if a file is accessible    */
+    H5VL_FILE_DELETE,        /* Delete a file                    */
+    H5VL_FILE_IS_EQUAL       /* Check if two files are the same  */
+} H5VL_file_specific_t;
+
+/* Parameters for file 'specific' operations */
+typedef struct H5VL_file_specific_args_t {
+    H5VL_file_specific_t op_type; /* Operation to perform */
+
+    /* Parameters for each operation */
+    union {
+        /* H5VL_FILE_FLUSH */
+        struct {
+            H5I_type_t  obj_type; /* Type of object to use */
+            H5F_scope_t scope;    /* Scope of flush operation */
+        } flush;
+
+        /* H5VL_FILE_REOPEN */
+        struct {
+            void **file; /* File object for new file (OUT) */
+        } reopen;
+
+        /* H5VL_FILE_IS_ACCESSIBLE */
+        struct {
+            const char *filename;   /* Name of file to check */
+            hid_t       fapl_id;    /* File access property list to use */
+            hbool_t    *accessible; /* Whether file is accessible with FAPL settings (OUT) */
+        } is_accessible;
+
+        /* H5VL_FILE_DELETE */
+        struct {
+            const char *filename; /* Name of file to delete */
+            hid_t       fapl_id;  /* File access property list to use */
+        } del;
+
+        /* H5VL_FILE_IS_EQUAL */
+        struct {
+            void    *obj2;      /* Second file object to compare against */
+            hbool_t *same_file; /* Whether files are the same (OUT) */
+        } is_equal;
+    } args;
+} H5VL_file_specific_args_t;
+\endcode
+
+\subsubsection subsubsecVOLRefFileopt file: optional
+The <em>optional</em> callback in the file class implements connector specific operations on an HDF5 container. It
+returns an <em>herr_t</em> indicating success or failure.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*optional)(void *obj, H5VL_optional_args_t *args, hid_t dxpl_id, void **req);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  obj      (IN): The container or object where the operation needs to happen.
+  args (IN/OUT): A pointer to the arguments struct.
+  dxpl_id  (IN): The data transfer property list.
+  req  (IN/OUT): A pointer to the asynchronous request of the operation created by the connector.
+\endcode
+</td>
+</tr>
+</table>
+Each connector that requires connector-specific operations should compare the value of the <em>op_type</em> field of
+the #H5VL_optional_args_t struct with the values returned from calling #H5VLregister_opt_operation to
+determine how to handle the optional call and interpret the arguments passed in the struct.
+
+\subsubsection subsubsecVOLRefFileclose file: close
+The <em>close</em> callback in the file class should terminate access to the file object and free all resources it was
+consuming, and returns an <em>herr_t</em> indicating success or failure.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*close)(void *file, hid_t dxpl_id, void **req);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  file     (IN): Pointer to the file.
+  dxpl_id  (IN): The data transfer property list.
+  req  (IN/OUT): A pointer to the asynchronous request of the operation created by the connector.
+\endcode
+</td>
+</tr>
+</table>
+
+\subsection subsecVOLRefGrp Group Callbacks
+The group API routines (\ref H5G) allow HDF5 users to create and manage HDF5 groups.  All the \ref H5G API
+routines that modify the HDF5 container map to one of the group callback routines in this class that the
+connector needs to implement.
+
+<em>Structure for group callback routines, H5VLconnector.h</em>
+\code
+typedef struct H5VL_group_class_t {
+    void *(*create)(void *obj, const H5VL_loc_params_t *loc_params, const char *name, hid_t lcpl_id,
+                    hid_t gcpl_id, hid_t gapl_id, hid_t dxpl_id, void **req);
+    void *(*open)(void *obj, const H5VL_loc_params_t *loc_params, const char *name, hid_t gapl_id,
+                  hid_t dxpl_id, void **req);
+    herr_t (*get)(void *obj, H5VL_group_get_args_t *args, hid_t dxpl_id, void **req);
+    herr_t (*specific)(void *obj, H5VL_group_specific_args_t *args, hid_t dxpl_id, void **req);
+    herr_t (*optional)(void *obj, H5VL_optional_args_t *args, hid_t dxpl_id, void **req);
+    herr_t (*close)(void *grp, hid_t dxpl_id, void **req);
+} H5VL_group_class_t;
+\endcode
+
+\subsubsection subsubsecVOLRefGrpcreate group: create
+The <em>create</em> callback in the group class creates a group object in the container of the location object and
+returns a pointer to the group structure containing information to access the group in future calls.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  void *(*create)(void *obj, H5VL_loc_params_t *loc_params, const char *name, hid_t gcpl_id,hid_t gapl_id, hid_t dxpl_id, void **req);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  obj        (IN): Pointer to an object where the group needs to be created or where the look-up of
+                   the target object needs to start.
+  loc_params (IN): Pointer to the location parameters as explained in "Mapping the API to the Callbacks".
+                   The type can be only H5VL_OBJECT_BY_SELF in this callback.
+  name       (IN): The name of the group to be created.
+  dcpl_id    (IN): The group creation property list. It contains all the group creation properties in
+                   addition to the link creation property list of the create operation (an hid_t) that can be
+                   retrieved with the property H5VL_GRP_LCPL_ID.
+  gapl_id    (IN): The group access property list.
+  dxpl_id    (IN): The data transfer property list.
+  req    (IN/OUT): A pointer to the asynchronous request of the operation created by the connector.
+\endcode
+</td>
+</tr>
+</table>
+
+\subsubsection subsubsecVOLRefGrpopen group: open
+The <em>open</em> callback in the group class opens a group object in the container of the location object and returns
+a pointer to the group structure containing information to access the group in future calls.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  void *(*open)(void *obj, H5VL_loc_params_t *loc_params, const char *name, hid_t gapl_id, hid_t dxpl_id, void **req);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  obj        (IN): Pointer to an object where the group needs to be opened or where the look-up of the target object needs to start.
+  loc_params (IN): Pointer to the location parameters as explained in "Mapping the API to the Callbacks".
+                   The type can be only H5VL_OBJECT_BY_SELF in this callback.
+  name       (IN): The name of the group to be opened.
+  gapl_id    (IN): The group access property list.
+  dxpl_id    (IN): The data transfer property list.
+  req    (IN/OUT): A pointer to the asynchronous request of the operation created by the connector.
+\endcode
+</td>
+</tr>
+</table>
+
+\subsubsection subsubsecVOLRefGrpget group: get
+The <em>get</em> callback  in  the  group  class  retrieves  information  about  the  group  as  specified  in  the <em>get_type</em>
+parameter.  It returns an <em>herr_t</em> indicating success or failure.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*get)(void *obj, H5VL_group_get_args_t *args, hid_t dxpl_id, void **req)
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  obj        (IN): The group object where information needs to be retrieved from.
+  args   (IN/OUT): A pointer to the arguments struct.
+  dxpl_id    (IN): The data transfer property list.
+  req    (IN/OUT): A pointer to the asynchronous request of the operation created by the connector.
+\endcode
+</td>
+</tr>
+</table>
+\code
+/* Values for group 'get' operation */
+typedef enum H5VL_group_get_t {
+    H5VL_GROUP_GET_GCPL, /* group creation property list     */
+    H5VL_GROUP_GET_INFO  /* group info                       */
+} H5VL_group_get_t;
+
+/* Parameters for group 'get_info' operation */
+typedef struct H5VL_group_get_info_args_t {
+    H5VL_loc_params_t loc_params; /* Location parameters for object access */
+    H5G_info_t       *ginfo;      /* Group info (OUT) */
+} H5VL_group_get_info_args_t;
+
+/* Parameters for group 'get' operations */
+typedef struct H5VL_group_get_args_t {
+    H5VL_group_get_t op_type; /* Operation to perform */
+
+    /* Parameters for each operation */
+    union {
+        /* H5VL_GROUP_GET_GCPL */
+        struct {
+            hid_t gcpl_id; /* Group creation property list (OUT) */
+        } get_gcpl;
+
+        /* H5VL_GROUP_GET_INFO */
+        H5VL_group_get_info_args_t get_info; /* Group info */
+    } args;
+} H5VL_group_get_args_t;
+\endcode
+
+\subsubsection subsubsecVOLRefGrpspec group: specific
+The <em>specific</em> callback in the group class implements specific operations on HDF5 groups as specified in the
+<em>specific_type</em> parameter.  It returns an <em>herr_t</em> indicating success or failure.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*specific)(void *obj, H5VL_loc_params_t *loc_params, H5VL_object_specific_args_t *args, hid_t dxpl_id, void **req);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  obj        (IN): The container or object where the operation needs to happen.
+  loc_params (IN): Pointer to the location parameters as explained in "Mapping the API to the Callbacks".
+  args   (IN/OUT): A pointer to the arguments struct.
+  dxpl_id    (IN): The data transfer property list.
+  req    (IN/OUT): A pointer to the asynchronous request of the operation created by the connector.
+\endcode
+</td>
+</tr>
+</table>
+\code
+/* Values for group 'specific' operation */
+typedef enum H5VL_group_specific_t {
+    H5VL_GROUP_MOUNT,   /* Mount a file on a group          */
+    H5VL_GROUP_UNMOUNT, /* Unmount a file on a group        */
+    H5VL_GROUP_FLUSH,   /* H5Gflush                         */
+    H5VL_GROUP_REFRESH  /* H5Grefresh                       */
+} H5VL_group_specific_t;
+
+/* Parameters for group 'mount' operation */
+typedef struct H5VL_group_spec_mount_args_t {
+    const char *name;       /* Name of location to mount child file */
+    void       *child_file; /* Pointer to child file object */
+    hid_t       fmpl_id;    /* File mount property list to use */
+} H5VL_group_spec_mount_args_t;
+
+/* Parameters for group 'specific' operations */
+typedef struct H5VL_group_specific_args_t {
+    H5VL_group_specific_t op_type; /* Operation to perform */
+
+    /* Parameters for each operation */
+    union {
+        /* H5VL_GROUP_MOUNT */
+        H5VL_group_spec_mount_args_t mount;
+
+        /* H5VL_GROUP_UNMOUNT */
+        struct {
+            const char *name; /* Name of location to unmount child file */
+        } unmount;
+
+        /* H5VL_GROUP_FLUSH */
+        struct {
+            hid_t grp_id; /* Group ID (IN) */
+        } flush;
+
+        /* H5VL_GROUP_REFRESH */
+        struct {
+            hid_t grp_id; /* Group ID (IN) */
+        } refresh;
+    } args;
+} H5VL_group_specific_args_t;
+\endcode
+
+\subsubsection subsubsecVOLRefGrpopt group: optional
+The <em>optional</em> callback in the group class implements connector specific operations on an HDF5 group.  It
+returns an <em>herr_t</em> indicating success or failure.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*optional)(void *obj, H5VL_optional_args_t *args, hid_t dxpl_id, void **req);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  obj        (IN): The container or object where the operation needs to happen.
+  args   (IN/OUT): A pointer to the arguments struct.
+  dxpl_id    (IN): The data transfer property list.
+  req    (IN/OUT): A pointer to the asynchronous request of the operation created by the connector.
+\endcode
+</td>
+</tr>
+</table>
+Each connector that requires connector-specific operations should compare the value of the <em>op_type</em> field of
+the #H5VL_optional_args_t struct with the values returned from calling #H5VLregister_opt_operation to
+determine how to handle the optional call and interpret the arguments passed in the struct.
+
+\subsubsection subsubsecVOLRefGrpclose group: close
+The <em>close</em> callback in the group class terminates access to the group object and frees all resources it was
+consuming, and returns an <em>herr_t</em> indicating success or failure.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*close)(void *group, hid_t dxpl_id, void **req);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  group      (IN): Pointer to the group object.
+  dxpl_id    (IN): The data transfer property list.
+  req    (IN/OUT): A pointer to the asynchronous request of the operation created by the connector.
+\endcode
+</td>
+</tr>
+</table>
+
+\subsection subsecVOLRefLink Link Callbacks
+The link API routines (\ref H5L) allow HDF5 users to create and manage HDF5 links. All the \ref H5L API routines
+that modify the HDF5 container map to one of the link callback routines in this class that the connector
+needs to implement.
+
+<em>Structure for link callback routines, H5VLconnector.h</em>
+\code
+typedef struct H5VL_link_class_t {
+    herr_t (*create)(H5VL_link_create_args_t *args, void *obj, const H5VL_loc_params_t *loc_params,
+                     hid_t lcpl_id, hid_t lapl_id, hid_t dxpl_id, void **req);
+    herr_t (*copy)(void *src_obj, const H5VL_loc_params_t *loc_params1, void *dst_obj,
+                   const H5VL_loc_params_t *loc_params2, hid_t lcpl_id, hid_t lapl_id, hid_t dxpl_id,
+                   void **req);
+    herr_t (*move)(void *src_obj, const H5VL_loc_params_t *loc_params1, void *dst_obj,
+                   const H5VL_loc_params_t *loc_params2, hid_t lcpl_id, hid_t lapl_id, hid_t dxpl_id,
+                   void **req);
+    herr_t (*get)(void *obj, const H5VL_loc_params_t *loc_params, H5VL_link_get_args_t *args, hid_t dxpl_id,
+                  void **req);
+    herr_t (*specific)(void *obj, const H5VL_loc_params_t *loc_params, H5VL_link_specific_args_t *args,
+                       hid_t dxpl_id, void **req);
+    herr_t (*optional)(void *obj, const H5VL_loc_params_t *loc_params, H5VL_optional_args_t *args,
+                       hid_t dxpl_id, void **req);
+} H5VL_link_class_t;
+\endcode
+
+\subsubsection subsubsecVOLRefLinkcreate link: create
+The <em>create</em> callback in the group class creates a hard, soft, external, or user-defined link in the container.
+It returns an <em>herr_t</em> indicating success or failure.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*create)(H5VL_link_create_args_t *args, void *obj, H5VL_loc_params_t *loc_params, hid_t lcpl_id, hid_t lapl_id, hid_t dxpl_id, void **req)
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  args   (IN/OUT): A pointer to the arguments struct.
+  obj        (IN): Pointer to an object where the link needs to be created from.
+  loc_params (IN): Pointer to the location parameters as explained in "Mapping the API to the Callbacks" for the source object.
+  lcplid     (IN): The link creation property list. It contains all the link creation properties in
+                   addition to other API parameters depending on the creation type, which will be detailed next.
+  laplid     (IN): The link access property list.
+  dxpl_id    (IN): The data transfer property list.
+  req    (IN/OUT): A pointer to the asynchronous request of the operation created by the connector.
+\endcode
+</td>
+</tr>
+</table>
+\code
+/* Link create types for VOL */
+typedef enum H5VL_link_create_t {
+    H5VL_LINK_CREATE_HARD,
+    H5VL_LINK_CREATE_SOFT,
+    H5VL_LINK_CREATE_UD
+} H5VL_link_create_t;
+
+/* Parameters for link 'create' operations */
+typedef struct H5VL_link_create_args_t {
+    H5VL_link_create_t op_type; /* Operation to perform */
+
+    /* Parameters for each operation */
+    union {
+        /* H5VL_LINK_CREATE_HARD */
+        struct {
+            void             *curr_obj;        /* Current object */
+            H5VL_loc_params_t curr_loc_params; /* Location parameters for current object */
+        } hard;
+
+        /* H5VL_LINK_CREATE_SOFT */
+        struct {
+            const char *target; /* Target of soft link */
+        } soft;
+
+        /* H5VL_LINK_CREATE_UD */
+        struct {
+            H5L_type_t  type;     /* Type of link to create */
+            const void *buf;      /* Buffer that contains link info */
+            size_t      buf_size; /* Size of link info buffer */
+        } ud;
+    } args;
+} H5VL_link_create_args_t;
+\endcode
+
+\subsubsection subsubsecVOLRefLinkcopy link: copy
+The <em>copy</em> callback in the link class copies a link within the HDF5 container. It returns an <em>herr_t</em> indicating
+success or failure.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*copy)(void *src_obj, H5VL_loc_params_t *loc_params1, void *dst_obj, H5VL_loc_params_t *loc_params2, hid_t lcpl_id, hid_t lapl_id, hid_t dxpl_id, void **req);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  src_obj     (IN): original/source object or file.
+  loc_params1 (IN): Pointer to the location parameters for the source object as explained in "Mapping the API to the Callbacks".
+                    The type can be only H5VL_OBJECT_BY_NAME in this callback.
+  dst_obj     (IN): destination object or file.
+  loc_params2 (IN): Pointer to the location parameters for the destination object as explained in "Mapping the API to the Callbacks".
+                    The type can be only H5VL_OBJECT_BY_NAME in this callback.
+  lcpl_id     (IN): The link creation property list.
+  lapl_id     (IN): The link access property list.
+  dxpl_id     (IN): The data transfer property list.
+  req     (IN/OUT): A pointer to the asynchronous request of the operation created by the connector.
+\endcode
+</td>
+</tr>
+</table>
+
+\subsubsection subsubsecVOLRefLinkmove link: move
+The <em>move</em> callback in the link class moves a link within the HDF5 container.  It returns an <em>herr_t</em> indicating
+success or failure.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*move)(void *src_obj, H5VL_loc_params_t *loc_params1, void *dst_obj, H5VL_loc_params_t *loc_params2, hid_t lcpl_id, hid_t lapl_id, hid_t dxpl_id, void **req);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  src_obj     (IN): original/source object or file.
+  loc_params1 (IN): Pointer to the location parameters for the source object as explained in "Mapping the API to the Callbacks".
+                    The type can be only H5VL_OBJECT_BY_NAME in this callback.
+  dst_obj     (IN): destination object or file.
+  loc_params2 (IN): Pointer to the location parameters for the destination object as explained in "Mapping the API to the Callbacks".
+                    The type can be only H5VL_OBJECT_BY_NAME in this callback.
+  lcpl_id     (IN): The link creation property list.
+  lapl_id     (IN): The link access property list.
+  dxpl_id     (IN): The data transfer property list.
+  req     (IN/OUT): A pointer to the asynchronous request of the operation created by the connector.
+\endcode
+</td>
+</tr>
+</table>
+
+\subsubsection subsubsecVOLRefLinkget link: get
+The <em>get</em> callback in the link class retrieves information about links as specified in the <em>get_type</em> parameter.
+It returns an <em>herr_t</em> indicating success or failure.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*get)(void *obj, H5VL_loc_params_t *loc_params, H5VL_link_get_args_t *args, hid_t dxpl_id, void **req);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  obj        (IN): The file or group object where information needs to be retrieved from.
+  loc_params  (IN): Pointer to the location parameters for the destination object as explained in "Mapping the API to the Callbacks".
+                   The type can be only H5VL_OBJECT_BY_NAME or H5VL_OBJECT_BY_IDX in this callback.
+  args   (IN/OUT): A pointer to the arguments struct.
+  dxpl_id    (IN): The data transfer property list.
+  req    (IN/OUT): A pointer to the asynchronous request of the operation created by the connector.
+\endcode
+</td>
+</tr>
+</table>
+\code
+/* Values for link 'get' operation */
+typedef enum H5VL_link_get_t {
+    H5VL_LINK_GET_INFO, /* link info                         */
+    H5VL_LINK_GET_NAME, /* link name                         */
+    H5VL_LINK_GET_VAL   /* link value                        */
+} H5VL_link_get_t;
+
+/* Parameters for link 'get' operations */
+typedef struct H5VL_link_get_args_t {
+    H5VL_link_get_t op_type; /* Operation to perform */
+
+    /* Parameters for each operation */
+    union {
+        /* H5VL_LINK_GET_INFO */
+        struct {
+            H5L_info2_t *linfo; /* Pointer to link's info (OUT) */
+        } get_info;
+
+        /* H5VL_LINK_GET_NAME */
+        struct {
+            size_t  name_size; /* Size of link name buffer (IN) */
+            char   *name;      /* Buffer for link name (OUT) */
+            size_t *name_len;  /* Actual length of link name (OUT) */
+        } get_name;
+
+        /* H5VL_LINK_GET_VAL */
+        struct {
+            size_t buf_size; /* Size of link value buffer (IN) */
+            void  *buf;      /* Buffer for link value (OUT) */
+        } get_val;
+    } args;
+} H5VL_link_get_args_t;
+\endcode
+
+\subsubsection subsubsecVOLRefLinkspec link: specific
+The <em>specific</em> callback in the link class implements specific operations on HDF5 links as specified in
+the <em>specific_type</em> parameter.  It returns an <em>herr_t</em> indicating success or failure.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*specific)(void *obj, H5VL_loc_params_t *loc_params, H5VL_link_specific_args_t *args, hid_t dxpl_id, void **req)
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  obj        (IN): The location object where operation needs to happen.
+  loc_params (IN): Pointer to the location parameters for the destination object as explained in "Mapping the API to the Callbacks".
+  args   (IN/OUT): A pointer to the arguments struct.
+  dxpl_id    (IN): The data transfer property list.
+  req    (IN/OUT): A pointer to the asynchronous request of the operation created by the connector.
+\endcode
+</td>
+</tr>
+</table>
+\code
+/* Values for link 'specific' operation */
+typedef enum H5VL_link_specific_t {
+    H5VL_LINK_DELETE, /* H5Ldelete(_by_idx)                */
+    H5VL_LINK_EXISTS, /* link existence                    */
+    H5VL_LINK_ITER    /* H5Literate/visit(_by_name)              */
+} H5VL_link_specific_t;
+
+/* Parameters for link 'iterate' operation */
+typedef struct H5VL_link_iterate_args_t {
+    hbool_t         recursive; /* Whether iteration is recursive */
+    H5_index_t      idx_type;  /* Type of index to iterate over */
+    H5_iter_order_t order;     /* Order of index iteration */
+    hsize_t        *idx_p;     /* Start/stop iteration index (OUT) */
+    H5L_iterate2_t  op;        /* Iteration callback function */
+    void           *op_data;   /* Iteration callback context */
+} H5VL_link_iterate_args_t;
+
+/* Parameters for link 'specific' operations */
+typedef struct H5VL_link_specific_args_t {
+    H5VL_link_specific_t op_type; /* Operation to perform */
+
+    /* Parameters for each operation */
+    union {
+        /* H5VL_LINK_DELETE */
+        /* No args */
+
+        /* H5VL_LINK_EXISTS */
+        struct {
+            hbool_t *exists; /* Whether link exists (OUT) */
+        } exists;
+
+        /* H5VL_LINK_ITER */
+        H5VL_link_iterate_args_t iterate;
+    } args;
+} H5VL_link_specific_args_t;
+\endcode
+
+\subsubsection subsubsecVOLRefLinkopt link: optional
+The <em>optional</em> callback in the link class implements connector specific operations on an HDF5 link. It returns
+an <em>herr_t</em> indicating success or failure.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*optional)(void *obj, const H5VL_loc_params_t *loc_params, H5VL_optional_args_t *args, hid_t dxpl_id, void **req);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  obj        (IN): The container or object where operation needs to happen.
+  loc_params (IN): Pointer to the location parameters for the destination object as explained in "Mapping the API to the Callbacks".
+  args   (IN/OUT): A pointer to the arguments struct.
+  dxpl_id    (IN): The data transfer property list.
+  req    (IN/OUT): A pointer to the asynchronous request of the operation created by the connector.
+\endcode
+</td>
+</tr>
+</table>
+Each connector that requires connector-specific operations should compare the value of the <em>op_type</em> field of
+the #H5VL_optional_args_t struct with the values returned from calling #H5VLregister_opt_operation to
+determine how to handle the optional call and interpret the arguments passed in the struct.
+
+\subsection subsecVOLRefObj Object Callbacks
+The object API routines (\ref H5O) allow HDF5 users to manage HDF5 group, dataset, and named datatype
+objects. All the \ref H5O API routines that modify the HDF5 container map to one of the object callback
+routines in this class that the connector needs to implement.
+
+<em>Structure for object callback routines, H5VLconnector.h</em>
+\code
+typedef struct H5VL_object_class_t {
+    void *(*open)(void *obj, const H5VL_loc_params_t *loc_params, H5I_type_t *opened_type, hid_t dxpl_id,
+                  void **req);
+    herr_t (*copy)(void *src_obj, const H5VL_loc_params_t *loc_params1, const char *src_name, void *dst_obj,
+                   const H5VL_loc_params_t *loc_params2, const char *dst_name, hid_t ocpypl_id, hid_t lcpl_id,
+                   hid_t dxpl_id, void **req);
+    herr_t (*get)(void *obj, const H5VL_loc_params_t *loc_params, H5VL_object_get_args_t *args, hid_t dxpl_id,
+                  void **req);
+    herr_t (*specific)(void *obj, const H5VL_loc_params_t *loc_params, H5VL_object_specific_args_t *args,
+                       hid_t dxpl_id, void **req);
+    herr_t (*optional)(void *obj, const H5VL_loc_params_t *loc_params, H5VL_optional_args_t *args,
+                       hid_t dxpl_id, void **req);
+} H5VL_object_class_t;
+\endcode
+
+\subsubsection subsubsecVOLRefObjopen object: open
+The <em>open</em> callback in the object class opens the object in the container of the location object and returns a
+pointer to the object structure containing information to access the object in future calls.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  void *(*open)(void *obj, H5VL_loc_params_t *loc_params, H5I_type_t *opened_type, hid_t dxpl_id, void **req);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  obj          (IN): The container or object where operation needs to happen.
+  loc_params   (IN): Pointer to the location parameters for the destination object as explained in "Mapping the API to the Callbacks".
+  opened_type (OUT): Buffer to return the type of the object opened (H5I_GROUP or H5I_DATASET or H5I_DATATYPE).
+  dxpl_id      (IN): The data transfer property list.
+  req      (IN/OUT): A pointer to the asynchronous request of the operation created by the connector.
+\endcode
+</td>
+</tr>
+</table>
+
+\subsubsection subsubsecVOLRefObjcopy object: copy
+The <em>copy</em> callback in the object class copies the object from the source object to the destination object. It
+returns an <em>herr_t</em> indicating success or failure.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*copy)(void *src_obj, H5VL_loc_params_t *loc_params1, const char *src_name, void *dst_obj, H5VL_loc_params_t *loc_params2, const char *dst_name, hid_t ocpypl_id, hid_t lcpl_id, hid_t dxpl_id, void **req)
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  src_obj     (IN): Pointer to location of the source object to be copied.
+  loc_params1 (IN): Pointer to the location parameters for the source object as explained in "Mapping the API to the Callbacks".
+                    The type can be only H5VL_OBJECT_BY_SELF in this callback.
+  src_name    (IN): Name of the source object to be copied.
+  dst_obj     (IN): Pointer to location of the destination object or file.
+  loc_params2 (IN): Pointer to the location parameters for the destination object as explained in "Mapping the API to the Callbacks".
+                    The type can be only H5VL_OBJECT_BY_SELF in this callback.
+  dst_name    (IN): Name o be assigned to the new copy.
+  ocpypl_id   (IN): The object copy property list.
+  lcpl_id     (IN): The link creation property list.
+  dxpl_id     (IN): The data transfer property list.
+  req     (IN/OUT): A pointer to the asynchronous request of the operation created by the connector.
+\endcode
+</td>
+</tr>
+</table>
+
+\subsubsection subsubsecVOLRefObjget object: get
+The <em>get</em> callback in the object class retrieves information about the object as specified in
+the <em>get_type</em> parameter.It returns an <em>herr_t</em> indicating success or failure.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*get)(void *obj, H5VL_loc_params_t *loc_params, H5VL_object_get_args_t *args, hid_t dxpl_id, void **req)
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  obj        (IN): A location object where information needs to be retrieved from.
+  loc_params (IN): Pointer to the location parameters for the destination object as explained in "Mapping the API to the Callbacks".
+  args   (IN/OUT): A pointer to the arguments struct.
+  dxpl_id    (IN): The data transfer property list.
+  req     IN/OUT): A pointer to the asynchronous request of the operation created by the connector.
+\endcode
+</td>
+</tr>
+</table>
+\code
+/* Values for object 'get' operation */
+typedef enum H5VL_object_get_t {
+    H5VL_OBJECT_GET_FILE, /* object file                       */
+    H5VL_OBJECT_GET_NAME, /* object name                       */
+    H5VL_OBJECT_GET_TYPE, /* object type                       */
+    H5VL_OBJECT_GET_INFO  /* H5Oget_info(_by_idx|name)         */
+} H5VL_object_get_t;
+
+/* Parameters for object 'get' operations */
+typedef struct H5VL_object_get_args_t {
+    H5VL_object_get_t op_type; /* Operation to perform */
+
+    /* Parameters for each operation */
+    union {
+        /* H5VL_OBJECT_GET_FILE */
+        struct {
+            void **file; /* File object (OUT) */
+        } get_file;
+
+        /* H5VL_OBJECT_GET_NAME */
+        struct {
+            size_t  buf_size; /* Size of name buffer (IN) */
+            char   *buf;      /* Buffer for name (OUT) */
+            size_t *name_len; /* Actual length of name (OUT) */
+        } get_name;
+
+        /* H5VL_OBJECT_GET_TYPE */
+        struct {
+            H5O_type_t *obj_type; /* Type of object (OUT) */
+        } get_type;
+
+        /* H5VL_OBJECT_GET_INFO */
+        struct {
+            unsigned     fields; /* Flags for fields to retrieve */
+            H5O_info2_t *oinfo;  /* Pointer to object info (OUT) */
+        } get_info;
+    } args;
+} H5VL_object_get_args_t;
+\endcode
+
+\subsubsection subsubsecVOLRefObjspec object: specific
+The <em>specific</em> callback in the object class implements specific operations on HDF5 objects as specified in
+the <em>specific_type</em> parameter.  It returns an <em>herr_t</em> indicating success or failure.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*specific)(void *obj, H5VL_loc_params_t *loc_params, H5VL_object_specific_args_t *args, hid_t dxpl_id, void **req);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  obj        (IN): A location object where he operation needs to happen.
+  loc_params (IN): Pointer to the location parameters for the destination object as explained in "Mapping the API to the Callbacks".
+  args   (IN/OUT): A pointer to the arguments struct.
+  dxpl_id    (IN): The data transfer property list.
+  req     IN/OUT): A pointer to the asynchronous request of the operation created by the connector.
+\endcode
+</td>
+</tr>
+</table>
+\code
+/* Values for object 'specific' operation */
+typedef enum H5VL_object_specific_t {
+    H5VL_OBJECT_CHANGE_REF_COUNT, /* H5Oincr/decr_refcount             */
+    H5VL_OBJECT_EXISTS,           /* H5Oexists_by_name                 */
+    H5VL_OBJECT_LOOKUP,           /* Lookup object                     */
+    H5VL_OBJECT_VISIT,            /* H5Ovisit(_by_name)                */
+    H5VL_OBJECT_FLUSH,            /* H5{D|G|O|T}flush                  */
+    H5VL_OBJECT_REFRESH           /* H5{D|G|O|T}refresh                */
+} H5VL_object_specific_t;
+
+/* Parameters for object 'visit' operation */
+typedef struct H5VL_object_visit_args_t {
+    H5_index_t      idx_type; /* Type of index to iterate over */
+    H5_iter_order_t order;    /* Order of index iteration */
+    unsigned        fields;   /* Flags for fields to provide in 'info' object for 'op' callback */
+    H5O_iterate2_t  op;       /* Iteration callback function */
+    void           *op_data;  /* Iteration callback context */
+} H5VL_object_visit_args_t;
+
+/* Parameters for object 'specific' operations */
+typedef struct H5VL_object_specific_args_t {
+    H5VL_object_specific_t op_type; /* Operation to perform */
+
+    /* Parameters for each operation */
+    union {
+        /* H5VL_OBJECT_CHANGE_REF_COUNT */
+        struct {
+            int delta; /* Amount to modify object's refcount */
+        } change_rc;
+
+        /* H5VL_OBJECT_EXISTS */
+        struct {
+            hbool_t *exists; /* Whether object exists (OUT) */
+        } exists;
+
+        /* H5VL_OBJECT_LOOKUP */
+        struct {
+            H5O_token_t *token_ptr; /* Pointer to token for lookup (OUT) */
+        } lookup;
+
+        /* H5VL_OBJECT_VISIT */
+        H5VL_object_visit_args_t visit;
+
+        /* H5VL_OBJECT_FLUSH */
+        struct {
+            hid_t obj_id; /* Object ID (IN) */
+        } flush;
+
+        /* H5VL_OBJECT_REFRESH */
+        struct {
+            hid_t obj_id; /* Object ID (IN) */
+        } refresh;
+    } args;
+} H5VL_object_specific_args_t;
+\endcode
+
+\subsubsection subsubsecVOLRefObjopt object: optional
+The <em>optional</em> callback in the object class implements connector specific operations on an HDF5 object.  It
+returns an <em>herr_t</em> indicating success or failure.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*optional)(void *obj, const H5VL_loc_params_t *loc_params, H5VL_optional_args_t *args, hid_t dxpl_id, void **req);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  obj        (IN): A container or object where he operation needs to happen.
+  loc_params (IN): Pointer to the location parameters for the destination object as explained in "Mapping the API to the Callbacks".
+  args   (IN/OUT): A pointer to the arguments struct.
+  dxpl_id    (IN): The data transfer property list.
+  req     IN/OUT): A pointer to the asynchronous request of the operation created by the connector.
+\endcode
+</td>
+</tr>
+</table>
+Each connector that requires connector-specific operations should compare the value of the <em>op_type</em> field of
+the #H5VL_optional_args_t struct with the values returned from calling #H5VLregister_opt_operation to
+determine how to handle the optional call and interpret the arguments passed in the struct.
+
+\subsection subsecVOLRefIntrospect Introspection Callbacks
+<em>Structure for VOL connector introspection callback routines, H5VLconnector.h</em>
+\code
+typedef struct H5VL_introspect_class_t {
+    herr_t (*get_conn_cls)(void *obj, H5VL_get_conn_lvl_t lvl, const struct H5VL_class_t **conn_cls);
+    herr_t (*get_cap_flags)(const void *info, uint64_t *cap_flags);
+    herr_t (*opt_query)(void *obj, H5VL_subclass_t cls, int opt_type, uint64_t *flags);
+} H5VL_introspect_class_t;
+\endcode
+
+\subsubsection subsubsecVOLRefIntrospectcls introspect: get_conn_cls
+Get a connector's #H5VL_class_t struct.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*get_conn_cls)(void *obj, H5VL_get_conn_lvl_t lvl, const struct H5VL_class_t **conn_cls);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  obj  (IN): The VOL object.
+  lvl  (IN): Current or terminal connector.
+  cls (OUT): A const pointer to the connector.
+\endcode
+</td>
+</tr>
+</table>
+<em>The "lvl" argument is an enum:</em>
+\code
+/* "Levels" for 'get connector class' introspection callback */
+typedef enum H5VL_get_conn_lvl_t {
+    H5VL_GET_CONN_LVL_CURR, /* Get "current" connector (for this object) */
+    H5VL_GET_CONN_LVL_TERM  /* Get "terminal" connector (for this object) */
+                            /* (Recursively called, for pass-through connectors) */
+                            /* (Connectors that "split" must choose which connector to return) */
+} H5VL_get_conn_lvl_t;
+\endcode
+
+\subsubsection subsubsecVOLRefIntrospecflags introspect: get_cap_flags
+Get a connector's capability flags.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*get_cap_flags)(const void *info, unsigned *cap_flags)
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  info       (IN): A const pointer to pertinent VOL info.
+  cap_flags (OUT): A pointer to capability flags.
+\endcode
+</td>
+</tr>
+</table>
+
+\subsubsection subsubsecVOLRefIntrospecquery introspect: opt_query
+Query a class for a capability or functionality.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*opt_query)(void *obj, H5VL_subclass_t cls, int opt_type, hbool_t *supported);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  obj        (IN): The VOL object.
+  cls        (IN): The VOL 'class' to query.
+  opt_type   (IN): The specific option to query.
+  supported (OUT): Whether the operation is supported or not.
+\endcode
+</td>
+</tr>
+</table>
+<em>The "cls" argument is an enum:</em>
+\code
+// Enum type for each VOL subclass
+// (Used for various queries, etc)
+typedef enum H5VL_subclass_t {
+    H5VL_SUBCLS_NONE,     // Operations outside of a subclass
+    H5VL_SUBCLS_INFO,     // 'Info' subclass
+    H5VL_SUBCLS_WRAP,     // 'Wrap' subclass
+    H5VL_SUBCLS_ATTR,     // 'Attribute' subclass
+    H5VL_SUBCLS_DATASET,  // 'Dataset' subclass
+    H5VL_SUBCLS_DATATYPE, // 'Named datatype' subclass
+    H5VL_SUBCLS_FILE,     // 'File' subclass
+    H5VL_SUBCLS_GROUP,    // 'Group' subclass
+    H5VL_SUBCLS_LINK,     // 'Link' subclass
+    H5VL_SUBCLS_OBJECT,   // 'Object' subclass
+    H5VL_SUBCLS_REQUEST,  // 'Request' subclass
+    H5VL_SUBCLS_BLOB,     // 'Blob' subclass
+    H5VL_SUBCLS_TOKEN     // 'Token' subclass
+} H5VL_subclass_t;
+\endcode
+
+\subsection subsecVOLRefReq Request (Async) Callbacks
+<em>Structure for async request callback routines, H5VLconnector.h</em>
+\code
+typedef struct H5VL_request_class_t {
+    herr_t (*wait)(void *req, uint64_t timeout, H5VL_request_status_t *status);
+    herr_t (*notify)(void *req, H5VL_request_notify_t cb, void *ctx);
+    herr_t (*cancel)(void *req, H5VL_request_status_t *status);
+    herr_t (*specific)(void *req, H5VL_request_specific_args_t *args);
+    herr_t (*optional)(void *req, H5VL_optional_args_t *args);
+    herr_t (*free)(void *req);
+} H5VL_request_class_t;
+\endcode
+
+\subsubsection subsubsecVOLRefReqwait request: wait
+Wait (with a timeout) for an async operation to complete. Releases the request if the operation has completed
+and the connector callback succeeds.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*wait)(void *req, uint64_t timeout, H5VL_request_status_t *status);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  req     (IN): The async request on which to wait.
+  timeout (IN): The timeout value.
+  status  (IN): The status.
+\endcode
+</td>
+</tr>
+</table>
+<em>The "status" argument is an enum:</em>
+\code
+/* Status values for async request operations */
+typedef enum H5VL_request_status_t {
+    H5VL_REQUEST_STATUS_IN_PROGRESS, /* Operation has not yet completed                       */
+    H5VL_REQUEST_STATUS_SUCCEED,     /* Operation has completed, successfully                 */
+    H5VL_REQUEST_STATUS_FAIL,        /* Operation has completed, but failed                   */
+    H5VL_REQUEST_STATUS_CANT_CANCEL, /* An attempt to cancel this operation was made, but it  */
+                                     /*  can't be canceled immediately.  The operation has    */
+                                     /*  not completed successfully or failed, and is not yet */
+                                     /*  in progress.  Another attempt to cancel it may be    */
+                                     /*  attempted and may (or may not) succeed.              */
+    H5VL_REQUEST_STATUS_CANCELED     /* Operation has not completed and was canceled          */
+} H5VL_request_status_t;
+\endcode
+
+\subsubsection subsubsecVOLRefReqnotify request: notify
+Registers a user callback to be invoked when an asynchronous operation completes. Releases the request if
+connector callback succeeds.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*notify)(void *req, H5VL_request_notify_t cb, void *ctx);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  req (IN): The async request that will receive the notify callback.
+  cb  (IN): The notify callback for the request.
+  ctx (IN): The request's context.
+\endcode
+</td>
+</tr>
+</table>
+<em>The "cb" argument is an enum:</em>
+\code
+  typedef herr_t (*H5VL_request_notify_t)(void *ctx, H5ES_status_t status)
+\endcode
+
+\subsubsection subsubsecVOLRefReqcancel request: cancel
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*cancel)(void *req, H5VL_request_status_t *status);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  req    (IN): The async request to be cancelled.
+  status (IN): The status.
+\endcode
+</td>
+</tr>
+</table>
+<em>The "status" argument is an enum:</em>
+\code
+/* Status values for async request operations */
+typedef enum H5VL_request_status_t {
+    H5VL_REQUEST_STATUS_IN_PROGRESS, /* Operation has not yet completed                       */
+    H5VL_REQUEST_STATUS_SUCCEED,     /* Operation has completed, successfully                 */
+    H5VL_REQUEST_STATUS_FAIL,        /* Operation has completed, but failed                   */
+    H5VL_REQUEST_STATUS_CANT_CANCEL, /* An attempt to cancel this operation was made, but it  */
+                                     /*  can't be canceled immediately.  The operation has    */
+                                     /*  not completed successfully or failed, and is not yet */
+                                     /*  in progress.  Another attempt to cancel it may be    */
+                                     /*  attempted and may (or may not) succeed.              */
+    H5VL_REQUEST_STATUS_CANCELED     /* Operation has not completed and was canceled          */
+} H5VL_request_status_t;
+\endcode
+
+\subsubsection subsubsecVOLRefReqspec request: specific
+Perform a specific operation on an asynchronous request.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*specific)(void *req, H5VL_request_specific_args_t *args);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  req      (IN): The async request on which to perform the operation.
+  args (IN/OUT): A pointer to the arguments struct.
+\endcode
+</td>
+</tr>
+</table>
+\code
+/* Values for async request 'specific' operation */
+typedef enum H5VL_request_specific_t {
+    H5VL_REQUEST_GET_ERR_STACK, /* Retrieve error stack for failed operation */
+    H5VL_REQUEST_GET_EXEC_TIME  /* Retrieve execution time for operation */
+} H5VL_request_specific_t;
+
+/* Parameters for request 'specific' operations */
+typedef struct H5VL_request_specific_args_t {
+    H5VL_request_specific_t op_type; /* Operation to perform */
+
+    /* Parameters for each operation */
+    union {
+        /* H5VL_REQUEST_GET_ERR_STACK */
+        struct {
+            hid_t err_stack_id; /* Error stack ID for operation (OUT) */
+        } get_err_stack;
+
+        /* H5VL_REQUEST_GET_EXEC_TIME */
+        struct {
+            uint64_t *exec_ts;   /* Timestamp for start of task execution (OUT) */
+            uint64_t *exec_time; /* Duration of task execution (in ns) (OUT) */
+        } get_exec_time;
+    } args;
+} H5VL_request_specific_args_t;
+\endcode
+
+\subsubsection subsubsecVOLRefReqopt request: optional
+Perform a connector-specific operation for a request.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*optional)(void *req, H5VL_optional_args_t *args);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  req      (IN): The async request on which to perform the operation.
+  args (IN/OUT): A pointer to the arguments struct.
+\endcode
+</td>
+</tr>
+</table>
+Each connector that requires connector-specific operations should compare the value of the <em>op_type</em> field of
+the #H5VL_optional_args_t struct with the values returned from calling #H5VLregister_opt_operation to
+determine how to handle the optional call and interpret the arguments passed in the struct.
+
+\subsubsection subsubsecVOLRefReqfree request: free
+Frees an asynchronous request.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*free)(void *req);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  req (IN): The async request to be freed.
+\endcode
+</td>
+</tr>
+</table>
+
+\subsection subsecVOLRefBlob Blob Callbacks
+<em>Structure for blob callback routines, H5VLconnector.h</em>
+\code
+typedef struct H5VL_blob_class_t {
+    herr_t (*put)(void *obj, const void *buf, size_t size, void *blob_id, void *ctx);
+    herr_t (*get)(void *obj, const void *blob_id, void *buf, size_t size, void *ctx);
+    herr_t (*specific)(void *obj, void *blob_id, H5VL_blob_specific_args_t *args);
+    herr_t (*optional)(void *obj, void *blob_id, H5VL_optional_args_t *args);
+} H5VL_blob_class_t;
+\endcode
+
+\subsubsection subsubsecVOLRefBlobput blob: put
+Put a blob through the VOL.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*put)(void *obj, const void *buf, size_t size, void *blob_id, void *ctx);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  obj      (IN): Pointer to the blob container.
+  buf      (IN): Pointer to the blob.
+  size     (IN): Size of the blob.
+  blob_id (OUT): Pointer to the blob's connector-specific ID.
+  ctx      (IN): Connector-specific blob context.
+\endcode
+</td>
+</tr>
+</table>
+
+\subsubsection subsubsecVOLRefBlobget blob: get
+Get a blob through the VOL.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*get)(void *obj, const void *blob_id, void *buf, size_t size, void *ctx);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  obj     (IN): Pointer to the blob container.
+  blob_id (IN): Pointer to the blob's connector-specific ID.
+  buf (IN/OUT): Pointer to the blob.
+  size    (IN): Size of the blob.
+  ctx     (IN): Connector-specific blob context.
+\endcode
+</td>
+</tr>
+</table>
+
+\subsubsection subsubsecVOLRefBlobspec blob: specific
+Perform a defined operation on a blob via the VOL.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*specific)(void *obj, void *blob_id, H5VL_blob_specific_args_t *args);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  obj      (IN): Pointer to the blob container.
+  blob_id  (IN): Pointer to the blob's connector-specific ID.
+  args (IN/OUT): A pointer to the arguments struct.
+\endcode
+</td>
+</tr>
+</table>
+\code
+/* Values for 'blob' 'specific' operation */
+typedef enum H5VL_blob_specific_t {
+    H5VL_BLOB_DELETE, /* Delete a blob (by ID) */
+    H5VL_BLOB_ISNULL, /* Check if a blob ID is "null" */
+    H5VL_BLOB_SETNULL /* Set a blob ID to the connector's "null" blob ID value */
+} H5VL_blob_specific_t;
+
+/* Parameters for blob 'specific' operations */
+typedef struct H5VL_blob_specific_args_t {
+    H5VL_blob_specific_t op_type; /* Operation to perform */
+
+    /* Parameters for each operation */
+    union {
+        /* H5VL_BLOB_DELETE */
+        /* No args */
+
+        /* H5VL_BLOB_ISNULL */
+        struct {
+            hbool_t *isnull; /* Whether blob ID is "null" (OUT) */
+        } is_null;
+
+        /* H5VL_BLOB_SETNULL */
+        /* No args */
+    } args;
+} H5VL_blob_specific_args_t;
+\endcode
+
+\subsubsection subsubsecVOLRefBlobopt blob: optional
+Perform a connector-specific operation on a blob via the VOL
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*optional)(void *obj, void *blob_id, H5VL_optional_args_t *args);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  obj      (IN): Pointer to the blob container.
+  blob_id  (IN): Pointer to the blob's connector-specific ID.
+  args (IN/OUT): A pointer to the arguments struct.
+\endcode
+</td>
+</tr>
+</table>
+Each connector that requires connector-specific operations should compare the value of the <em>op_type</em> field of
+the #H5VL_optional_args_t struct with the values returned from calling #H5VLregister_opt_operation to
+determine how to handle the optional call and interpret the arguments passed in the struct
+
+\subsection subsecVOLRefToken Token Callbacks
+<em>Structure for token callback routines, H5VLconnector.h</em>
+\code
+typedef struct H5VL_token_class_t {
+    herr_t (*cmp)(void *obj, const H5O_token_t *token1, const H5O_token_t *token2, int *cmp_value);
+    herr_t (*to_str)(void *obj, H5I_type_t obj_type, const H5O_token_t *token, char **token_str);
+    herr_t (*from_str)(void *obj, H5I_type_t obj_type, const char *token_str, H5O_token_t *token);
+} H5VL_token_class_t;
+\endcode
+
+\subsubsection subsubsecVOLRefTokencmp token: cmp
+Compares two tokens and outputs a value like strcmp.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*cmp)(void *obj, const H5O_token_t *token1, const H5O_token_t *token2, int *cmp_value);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  obj        (IN): The underlying VOL object.
+  token1     (IN): The first token to compare.
+  token2     (IN): The second token to compare.
+  cmp_value (OUT): A value like strcmp.
+\endcode
+</td>
+</tr>
+</table>
+
+\subsubsection subsubsecVOLRefTokento token: to_str
+Converts a token to a string representation.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*to_str)(void *obj, H5I_type_t obj_type, const H5O_token_t *token, char **token_str)
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  obj        (IN): The underlying VOL object.
+  obj_type   (IN): The type of the object.
+  token      (IN): The token to turn into a string representation.
+  token_str (OUT): The string representation of the token.
+\endcode
+</td>
+</tr>
+</table>
+<em>The "obj_type" argument is an enum: (from H5Ipublic.h)</em>
+\snippet H5Ipublic.h H5I_type_t_snip
+The only values which should be used for this call are:
+\li #H5I_GROUP
+\li #H5I_DATATYPE
+\li #H5I_DATASET
+\li #H5I_MAP
+
+as these are the only objects for which tokens are valid.
+
+\subsubsection subsubsecVOLRefTokenfrom token: from_str
+Converts a string representation of a token to a token.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*from_str)(void *obj, H5I_type_t obj_type, const char *token_str, H5O_token_t *token);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  obj       (IN): The underlying VOL object.
+  obj_type  (IN): The type of the object.
+  token_str (IN): The string representation of the token.
+  token    (OUT): The token reated from the string representation.
+\endcode
+</td>
+</tr>
+</table>
+<em>The "obj_type" argument is an enum: (from H5Ipublic.h)</em>
+\snippet H5Ipublic.h H5I_type_t_snip
+The only values which should be used for this call are:
+\li #H5I_GROUP
+\li #H5I_DATATYPE
+\li #H5I_DATASET
+\li #H5I_MAP
+
+as these are the only objects for which tokens are valid.
+
+\subsection subsecVOLRefOpt Optional Generic Callback
+A <em>generic</em> optional callback is provided for services that are specific to a connector.
+The <em>optional</em> callback has the following definition.  It returns an <em>herr_t</em> indicating success or failure.
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t (*optional)(void *obj, H5VL_optional_args_t *args, hid_t dxpl_id, void **req);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  obj      (IN): A container or object where he operation needs to happen.
+  args (IN/OUT): A pointer to the arguments struct.
+  dxpl_id  (IN): The data transfer property list.
+  req   IN/OUT): A pointer to the asynchronous request of the operation created by the connector.
+\endcode
+</td>
+</tr>
+</table>
+
+\section secVOLNew New VOL API Routines
+API routines have been added to the HDF5 library to manage VOL connectors. This section details each
+new API call and explains its intended usage. Additionally, a set of API calls that map directly to the VOL
+callbacks themselves have been added to aid in the development of passthrough connectors which can be
+stacked and/or split. A list of these API calls is given in an appendix.
+
+\subsection subsecVOLNewPub H5VLpublic.h
+The API calls in this header are for VOL management and general use (i.e., not limited to VOL connector authors).
+
+\subsubsection subsubsecVOLNewPubregname H5VLregister_connector_by_name
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  hid_t H5VLregister_connector_by_name(const char *connector_name, hid_t vipl_id);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  connector_name (IN): The connector name to search for and register.
+  vipl_id        (IN): An ID for a VOL initialization property list (vipl).
+\endcode
+</td>
+</tr>
+</table>
+Registers a VOL connector with the HDF5 library given the name of the connector and returns an identifier
+for it (#H5I_INVALID_HID on errors). If the connector is already registered, the library will create a new
+identifier for it and returns it to the user; otherwise the library will search the plugin path for a connector
+of that name, loading and registering it, returning an ID for it, if found. See the \ref H5VL_UG for more
+information on loading plugins and the search paths.
+
+\subsubsection subsubsecVOLNewPubregval H5VLregister_connector_by_value
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  hid_t H5VLregister_connector_by_value(H5VL_class_value_t connector_value, hid_t vipl_id);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  connector_value (IN): The connector value to search for and register.
+  vipl_id         (IN): An ID for a VOL initialization property list (vipl).
+\endcode
+</td>
+</tr>
+</table>
+Registers a VOL connector with the HDF5 library given a value for the connector and returns an identifier
+for it (#H5I_INVALID_HID on errors). If the connector is already registered, the library will create a new
+identifier for it and returns it to the user; otherwise the library will search the plugin path for a connector
+of that name, loading and registering it, returning an ID for it, if found. See the VOL User Guide for more
+information on loading plugins and the search paths.
+
+\subsubsection subsubsecVOLNewPubis_name H5VLis_connector_registered_by_name
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  htri_t H5VLis_connector_registered_by_name(const char *name);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  name (IN): The connector name to check for.
+\endcode
+</td>
+</tr>
+</table>
+Checks if a VOL connector is registered with the library given the connector name and returns TRUE/FALSE
+on success, otherwise it returns a negative value.
+
+\subsubsection subsubsecVOLNewPubis_value H5VLis_connector_registered_by_value
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  htri_t H5VLis_connector_registered_by_value(H5VL_class_value_t connector_value);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  connector_value (IN): The connector value to check for.
+\endcode
+</td>
+</tr>
+</table>
+Checks if a VOL connector is registered with the library given the connector value and returns TRUE/FALSE
+on success, otherwise it returns a negative value.
+
+\subsubsection subsubsecVOLNewPubget_id H5VLget_connector_id
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  hid_t H5VLget_connector_id(hid_t obj_id);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  obj_id (IN): An ID for an HDF5 VOL object.
+\endcode
+</td>
+</tr>
+</table>
+Given a VOL object such as a dataset or an attribute, this function returns an identifier for its associated
+connector. If the ID is not a VOL object (such as a dataspace or uncommitted datatype), #H5I_INVALID_HID
+is returned. The identifier must be released with a call to #H5VLclose.
+
+\subsubsection subsubsecVOLNewPubget_by_name H5VLget_connector_id_by_name
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  hid_t H5VLget_connector_id_by_name(const char *name);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  name (IN): The connector name to check for.
+\endcode
+</td>
+</tr>
+</table>
+Given a connector name that is registered with the library, this function returns an identifier for the connector.
+If the connector is not registered with the library, #H5I_INVALID_HID is returned.The identifier must be
+released with a call to #H5VLclose.
+
+\subsubsection subsubsecVOLNewPubget_by_value H5VLget_connector_id_by_value
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  hid_t H5VLget_connector_id_by_value(H5VL_class_value_t connector_value);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  connector_value (IN): The connector value to check for.
+\endcode
+</td>
+</tr>
+</table>
+Given a connector value that is registered with the library, this function returns an identifier for the connector.
+If the connector is not registered with the library, #H5I_INVALID_HID is returned.The identifier must be
+released with a call to #H5VLclose.
+
+\subsubsection subsubsecVOLNewPubget_name H5VLget_connector_name
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  ssize_t H5VLget_connector_name(hid_t id, char *name /*out*/, size_t size);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  id    (IN): The object identifier to check.
+  name (OUT): Buffer pointer to put the connector name. If NULL, the library just returns thesize required to store the connector name.
+  size  (IN): the size of the passed in buffer.
+\endcode
+</td>
+</tr>
+</table>
+Retrieves the name of a VOL connector given an object identifier that was created/opened  ith it. On
+success, the name length is returned.
+
+\subsubsection subsubsecVOLNewPubclose H5VLclose
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t H5VLclose(hid_t connector_id);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  connector_id (IN): A valid identifier of the connector to close.
+\endcode
+</td>
+</tr>
+</table>
+Shuts down access to the connector that the identifier points to and release resources associated with it.
+
+\subsubsection subsubsecVOLNewPubunreg H5VLunregister_connector
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t H5VLunregister_connector(hid_t connector_id);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  connector_id (IN): A valid identifier of the connector to unregister.
+\endcode
+</td>
+</tr>
+</table>
+Unregisters a connector from the library and return a positive value on success otherwise return a negative
+value. The native VOL connector cannot be unregistered (this will return a negative #herr_t value).
+
+\subsubsection subsubsecVOLNewPubquery H5VLquery_optional
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t H5VLquery_optional(hid_t obj_id, H5VL_subclass_t subcls, int opt_type, uint64_t *flags);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  obj_id   (IN): A valid identifier of a VOL-managed object.
+  subcls   (IN): The subclass of the optional operation.
+  opt_type (IN): The optional operation. The native VOL connector uses hard-coded values. Other
+                 VOL connectors get this value when the optional operations are registered.
+  flags   (OUT): Bitwise flags indicating support and behavior.
+\endcode
+</td>
+</tr>
+</table>
+Determines if a connector or connector stack (determined from the passed-in object) supports an optional
+operation. The returned flags (listed below) not only indicate whether the operation is supported or not,
+but also give a sense of the option's behavior (useful for pass-through connectors).
+
+Bitwise query flag values:
+\code
+  #define H5VL_OPT_QUERY_SUPPORTED       0x0001 /* VOL connector supports this operation */
+  #define H5VL_OPT_QUERY_READ_DATA       0x0002 /* Operation reads data for object */
+  #define H5VL_OPT_QUERY_WRITE_DATA      0x0004 /* Operation writes data for object */
+  #define H5VL_OPT_QUERY_QUERY_METADATA  0x0008 /* Operation reads metadata for object */
+  #define H5VL_OPT_QUERY_MODIFY_METADATA 0x0010 /* Operation modifies metadata for object */
+  #define H5VL_OPT_QUERY_COLLECTIVE      0x0020 /* Operation is collective (operations without this flag are assumed to be independent) */
+  #define H5VL_OPT_QUERY_NO_ASYNC        0x0040 /* Operation may NOT be executed asynchronously */
+  #define H5VL_OPT_QUERY_MULTI_OBJ       0x0080 /* Operation involves multiple objects */
+\endcode
+
+\subsection subsecVOLNewConn H5VLconnector.h
+This functionality is intended for VOL connector authors and includes helper functions that are useful for
+writing connectors.
+
+API calls to manage optional operations are also found in this header file. These are discussed in the section
+on optional operations, above.
+
+\subsubsection subsubsecVOLNewConnreg H5VLregister_connector
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  hid_t H5VLregister_connector(const H5VL_class_t *cls, hid_t vipl_id);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  cls     (IN): A pointer to the connector structure to register.
+  vipl_id (IN): An ID for a VOL initialization property list (vipl).
+\endcode
+</td>
+</tr>
+</table>
+Registers a user-defined VOL connector with the HDF5 library and returns an identifier for that connector
+(#H5I_INVALID_HID on errors). This function is used when the application has direct access to the connector
+it wants to use and is able to obtain a pointer for the connector structure to pass to the HDF5 library.
+
+\subsubsection subsubsecVOLNewConnobj H5VLobject
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  void *H5VLobject(hid_t obj_id);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  obj_id (IN): identifier of the object to dereference.
+\endcode
+</td>
+</tr>
+</table>
+Retrieves a pointer to the VOL object from an HDF5 file or object identifier.
+
+\subsubsection subsubsecVOLNewConnget H5VLget_file_type
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  hid_t H5VLget_file_type(void *file_obj, hid_t connector_id, hid_t dtype_id);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  file_obj     (IN): pointer to a file or file object's connector-specific data.
+  connector_id (IN): A valid identifier of the connector to use.
+  dtype_id     (IN): A valid identifier for the type.
+\endcode
+</td>
+</tr>
+</table>
+Returns a copy of the <em>dtype_id</em> parameter but with the location set to be in the file. Returns a negative
+value (#H5I_INVALID_HID) on errors.
+
+\subsubsection subsubsecVOLNewConnpeek_name H5VLpeek_connector_id_by_name
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  hid_t H5VLpeek_connector_id_by_name(const char *name);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  name (IN): name of the connector to query.
+\endcode
+</td>
+</tr>
+</table>
+Retrieves the ID for a registered VOL connector based on a connector name. This is done without duplicating
+the ID and transferring ownership to the caller (as it normally the case in the HDF5 library). The ID returned
+from this operation should not be closed. This is intended for use by VOL connectors to find their own ID.
+Returns a negative value (#H5I_INVALID_HID) on errors.
+
+\subsubsection subsubsecVOLNewConnpeek_value H5VLpeek_connector_id_by_value
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  hid_t H5VLpeek_connector_id_by_value(H5VL_class_value_t value);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  value (IN): value of the connector to query.
+\endcode
+</td>
+</tr>
+</table>
+Retrieves the ID for a registered VOL connector based on a connector value. This is done without duplicating
+the ID and transferring ownership to the caller (as it normally the case in the HDF5 library). The ID returned
+from this operation should not be closed. This is intended for use by VOL connectors to find their own ID.
+Returns a negative value (#H5I_INVALID_HID) on errors.
+
+\subsection subsecVOLNewPass H5VLconnector_passthru.h
+This functionality is intended for VOL connector authors who are writing pass-through connectors and
+includes helper functions that are useful for writing such connectors. Callback equivalent functions can be
+found in this header as well. A list of these functions is included as an appendix to this document.
+
+\subsubsection subsubsecVOLNewPasscmp H5VLcmp_connector_cls
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t H5VLcmp_connector_cls(int *cmp, hid_t connector_id1, hid_t connector_id2);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  cmp          (OUT): a value like strcmp.
+  connector_id1 (IN): the ID of the first connector to compare.
+  connector_id2 (IN): the ID of the second connector to compare
+\endcode
+</td>
+</tr>
+</table>
+Compares two connectors (given by the connector IDs) to see if they refer to the same connector underneath.
+Returns a positive value on success and a negative value on errors.
+
+\subsubsection subsubsecVOLNewPasswrap H5VLwrap_register
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  hid_t  H5VLwrap_register(void *obj, H5I_type_t type);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  obj  (IN): an object to wrap.
+  type (IN): the type of the object (see below).
+\endcode
+</td>
+</tr>
+</table>
+Wrap an internal object with a "wrap context" and register and return an hidt for the resulting object.
+This routine is mainly targeted toward wrapping objects for iteration routine callbacks
+(i.e. the callbacks from H5Aiterate*, H5Literate* / H5Lvisit*, and H5Ovisit* ). Using it in an application
+will return an error indicating the API context isn't available or can't be retrieved.
+he type must be a VOL-managed object class:
+\li #H5I_FILE
+\li #H5I_GROUP
+\li #H5I_DATATYPE
+\li #H5I_DATASET
+\li #H5I_MAP
+\li #H5I_ATTR
+
+\subsubsection subsubsecVOLNewPassretrieve H5VLretrieve_lib_state
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t H5VLretrieve_lib_state(void **state);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  state (OUT): the library state.
+\endcode
+</td>
+</tr>
+</table>
+Retrieves a copy of the internal state of the HDF5 library, so that it can be restored later. Returns a positive
+value on success and a negative value on errors.
+
+\subsubsection subsubsecVOLNewPassstar H5VLstart_lib_state
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t H5VLstart_lib_state(void);
+\endcode
+</td>
+</tr>
+</table>
+Opens a new internal state for the HDF5 library. Returns a positive value on success and a negative value
+on errors.
+
+\subsubsection subsubsecVOLNewPassrestore H5VLrestore_lib_state
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t H5VLrestore_lib_state(const void *state);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  state (IN): the library state.
+\endcode
+</td>
+</tr>
+</table>
+Restores the internal state of the HDF5 library. Returns a positive value on success and a negative value on errors.
+
+\subsubsection subsubsecVOLNewPassfinish H5VLfinish_lib_state
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t H5VLfinish_lib_state(void);
+\endcode
+</td>
+</tr>
+</table>
+Closes the state of the library, undoing the effects of #H5VLstart_lib_state. Returns a positive value on
+success and a negative value on errors.
+
+\subsubsection subsubsecVOLNewPassfree H5VLfree_lib_state
+<table>
+<tr>
+<th>Signature:</th>
+</tr>
+<tr>
+<td>
+\code
+  herr_t H5VLfree_lib_state(void *state);
+\endcode
+</td>
+</tr>
+<tr>
+<th>Arguments:</th>
+</tr>
+<tr>
+<td>
+\code
+  state (IN): the library state.
+\endcode
+</td>
+</tr>
+</table>
+Free a retrieved library state.  Returns a positive value on success and a negative value on errors.
+
+\section secVOLAppA Appendix A Mapping of VOL Callbacks to HDF5 API Calls
+<table>
+<tr>
+<td>VOL Callback</td>
+<td>HDF5 API Call</td>
+</tr>
+<tr>
+<th colspan="2">FILE</th>
+</tr>
+<tr>
+<td>create</td>
+<td>\li #H5Fcreate</td>
+</tr>
+<tr>
+<td>open</td>
+<td>
+\li #H5Fopen
+</td>
+</tr>
+<tr>
+<td>get</td>
+<td>
+\li #H5Fget_access_plist
+\li #H5Fget_create_plist
+\li #H5Fget_fileno
+\li #H5Fget_intent
+\li #H5Fget_name
+\li #H5Fget_obj_count
+\li #H5Fget_obj_ids
+</td>
+</tr>
+<tr>
+<td>specific</td>
+<td>
+\li #H5Fdelete
+\li #H5Fflush
+\li #H5Fis_accessible
+\li #H5Fis_hdf5 (deprecated, hard-coded to use native connector)
+\li #H5Freopen
+</td>
+</tr>
+<tr>
+<td>close</td>
+<td>
+\li #H5Fclose
+</td>
+</tr>
+<tr>
+<th colspan="2">GROUP</th>
+</tr>
+<tr>
+<td>create</td>
+<td>
+\li #H5Gcreate1 (deprecated)
+\li #H5Gcreate2
+\li #H5Gcreate_anon
+</td>
+</tr>
+<tr>
+<td>open</td>
+<td>
+\li #H5Gopen1 (deprecated)
+\li #H5Gopen2
+</td>
+</tr>
+<tr>
+<td>get</td>
+<td>
+\li #H5Gget_create_plist
+\li #H5Gget_info
+\li #H5Gget_info_by_idx
+\li #H5Gget_info_by_name
+\li #H5Gget_num_objs (deprecated)
+</td>
+</tr>
+<tr>
+<td>specific</td>
+<td>
+\li #H5Fmount
+\li #H5Funmount
+\li #H5Gflush
+\li #H5Grefresh
+</td>
+</tr>
+<tr>
+<td>close</td>
+<td>
+\li #H5Gclose
+</td>
+</tr>
+<tr>
+<th colspan="2">DATASET</th>
+</tr>
+<tr>
+<td>create</td>
+<td>
+\li #H5Dcreate1 (deprecated)
+\li #H5Dcreate2
+</td>
+</tr>
+<tr>
+<td>open</td>
+<td>
+\li #H5Dopen1 (deprecated)
+\li #H5Dopen2
+</td>
+</tr>
+<tr>
+<td>read</td>
+<td>
+\li #H5Dread
+</td>
+</tr>
+<tr>
+<td>write</td>
+<td>
+\li #H5Dwrite
+</td>
+</tr>
+<tr>
+<td>get</td>
+<td>
+\li #H5Dget_access_plist
+\li #H5Dget_create_plist
+\li #H5Dget_space
+\li #H5Dget_space_status
+\li #H5Dget_storage_size
+\li #H5Dget_type
+</td>
+</tr>
+<tr>
+<td>specific</td>
+<td>
+\li #H5Dextend (deprecated)
+\li #H5Dflush
+\li #H5Drefresh
+\li #H5Dset_extent
+</td>
+</tr>
+<tr>
+<td>close</td>
+<td>
+\li #H5Dclose
+</td>
+</tr>
+<tr>
+<th colspan="2">OBJECT</th>
+</tr>
+<tr>
+<td>open</td>
+<td>
+\li #H5Oopen
+\li #H5Oopen_by_addr (deprecated)
+\li #H5Oopen_by_idx
+\li #H5Oopen_by_token
+</td>
+</tr>
+<tr>
+<td>copy</td>
+<td>
+\li #H5Ocopy
+</td>
+</tr>
+<tr>
+<td>get</td>
+<td>
+\li #H5Oget_info1 (deprecated)
+\li #H5Oget_info2 (deprecated)
+\li #H5Oget_info3
+</td>
+</tr>
+<tr>
+<td>specific</td>
+<td>
+\li #H5Odecr_refcount
+\li #H5Oexists_by_name
+\li #H5Oflush
+\li #H5Oincr_refcount
+\li #H5Orefresh
+\li #H5Ovisit_by_name1 (deprecated)
+\li #H5Ovisit_by_name2 (deprecated)
+\li #H5Ovisit_by_name3
+\li #H5Ovisit1 (deprecated)
+\li #H5Ovisit2 (deprecated)
+\li #H5Ovisit3
+</td>
+</tr>
+<tr>
+<td>close</td>
+<td>
+\li #H5Oclose
+</td>
+</tr>
+<tr>
+<th colspan="2">LINK</th>
+</tr>
+<tr>
+<td>create</td>
+<td>
+\li #H5Glink (deprecated)
+\li #H5Glink2 (deprecated)
+\li #H5Lcreate_hard
+\li #H5Lcreate_soft
+\li #H5Lcreate_ud
+\li #H5Olink
+</td>
+</tr>
+<tr>
+<td>copy</td>
+<td>
+\li #H5Lcopy
+</td>
+</tr>
+<tr>
+<td>move</td>
+<td>
+\li #H5Gmove (deprecated)
+\li #H5Gmove2 (deprecated)
+\li #H5Lmove
+</td>
+</tr>
+<tr>
+<td>get</td>
+<td>
+\li #H5Gget_linkval (deprecated)
+\li #H5Lget_info1 (deprecated)
+\li #H5Lget_info2
+\li #H5Lget_info_by_idx
+\li #H5Lget_name_by_idx
+\li #H5Lget_val
+\li #H5Lget_val_by_idx
+</td>
+</tr>
+<tr>
+<td>specific</td>
+<td>
+\li #H5Gunlink (deprecated)
+\li #H5Ldelete
+\li #H5Ldelete_by_idx
+\li #H5Lexists
+\li #H5Literate1 (deprecated)
+\li #H5Literate2
+\li #H5Literate_by_name1 (deprecated)
+\li #H5Literate_by_name2
+\li #H5Lvisit1 (deprecated)
+\li #H5Lvisit2
+\li #H5Lvisit_by_name1 (deprecated)
+\li #H5Lvisit_by_name2
+</td>
+</tr>
+<tr>
+<th colspan="2">DATATYPE</th>
+</tr>
+<tr>
+<td>commit</td>
+<td>
+\li #H5Tcommit1 (deprecated)
+\li #H5Tcommit2
+\li #H5Tcommit+anon
+</td>
+</tr>
+<tr>
+<td>open</td>
+<td>
+\li #H5Topen1 (deprecated)
+\li #H5Topen2
+</td>
+</tr>
+<tr>
+<td>get</td>
+<td>
+\li #H5Tget_create_plist
+</td>
+</tr>
+<tr>
+<td>specific</td>
+<td>
+\li #H5Tflush
+\li #H5Trefresh
+</td>
+</tr>
+<tr>
+<td>close</td>
+<td>
+\li #H5Tclose
+</td>
+</tr>
+<tr>
+<th colspan="2">ATTRIBUTE</th>
+</tr>
+<tr>
+<td>create</td>
+<td>
+\li #H5Acreate1 (deprecated)
+\li #H5Acreate2
+\li #H5Acreate_by_name
+</td>
+</tr>
+<tr>
+<td>open</td>
+<td>
+\li #H5Aopen
+\li #H5Aopen_by_idx
+\li #H5Aopen_by_name
+\li #H5Aopen_idx (deprecated)
+\li #H5Aopen_name (deprecated)
+</td>
+</tr>
+<tr>
+<td>read</td>
+<td>
+\li #H5Aread
+</td>
+</tr>
+<tr>
+<td>write</td>
+<td>
+\li #H5Awrite
+</td>
+</tr>
+<tr>
+<td>get</td>
+<td>
+\li #H5Aget_create_plist
+\li #H5Aget_info
+\li #H5Aget_info_by_idx
+\li #H5Aget_info_by_name
+\li #H5Aget_name
+\li #H5Aget_name_by_idx
+\li #H5Aget_space
+\li #H5Aget_storage_size
+\li #H5Aget_type
+</td>
+</tr>
+<tr>
+<td>specific</td>
+<td>
+\li #H5Adelete
+\li #H5Adelete_by_idx
+\li #H5Adelete_by_name
+\li #H5Aexists
+\li #H5Aexists_by_name
+\li #H5Aiterate1 (deprecated)
+\li #H5Aiterate2
+\li #H5Aiterate_by_name
+\li #H5Arename
+\li #H5Arename_by_name
+</td>
+</tr>
+<tr>
+<td>close</td>
+<td>
+\li #H5Aclose
+</td>
+</tr>
+</table>
+
+\section secVOLAppB Appendix B Callback Wrapper API Calls for Passthrough Connector Authors
+\code
+/* Pass-through callbacks */
+H5_DLL void  *H5VLget_object(void *obj, hid_t connector_id);
+H5_DLL herr_t H5VLget_wrap_ctx(void *obj, hid_t connector_id, void **wrap_ctx);
+H5_DLL void  *H5VLwrap_object(void *obj, H5I_type_t obj_type, hid_t connector_id, void *wrap_ctx);
+H5_DLL void  *H5VLunwrap_object(void *obj, hid_t connector_id);
+H5_DLL herr_t H5VLfree_wrap_ctx(void *wrap_ctx, hid_t connector_id);
+
+/* Public wrappers for generic callbacks */
+H5_DLL herr_t H5VLinitialize(hid_t connector_id, hid_t vipl_id);
+H5_DLL herr_t H5VLterminate(hid_t connector_id);
+H5_DLL herr_t H5VLget_cap_flags(hid_t connector_id, uint64_t *cap_flags);
+H5_DLL herr_t H5VLget_value(hid_t connector_id, H5VL_class_value_t *conn_value);
+
+/* Public wrappers for info fields and callbacks */
+H5_DLL herr_t H5VLcopy_connector_info(hid_t connector_id, void **dst_vol_info, void *src_vol_info);
+H5_DLL herr_t H5VLcmp_connector_info(int *cmp, hid_t connector_id, const void *info1, const void *info2);
+H5_DLL herr_t H5VLfree_connector_info(hid_t connector_id, void *vol_info);
+H5_DLL herr_t H5VLconnector_info_to_str(const void *info, hid_t connector_id, char **str);
+H5_DLL herr_t H5VLconnector_str_to_info(const char *str, hid_t connector_id, void **info);
+
+/* Public wrappers for attribute callbacks */
+H5_DLL void  *H5VLattr_create(void *obj, const H5VL_loc_params_t *loc_params, hid_t connector_id,
+                              const char *attr_name, hid_t type_id, hid_t space_id, hid_t acpl_id,
+                              hid_t aapl_id, hid_t dxpl_id, void **req);
+H5_DLL void  *H5VLattr_open(void *obj, const H5VL_loc_params_t *loc_params, hid_t connector_id,
+                            const char *name, hid_t aapl_id, hid_t dxpl_id, void **req);
+H5_DLL herr_t H5VLattr_read(void *attr, hid_t connector_id, hid_t dtype_id, void *buf, hid_t dxpl_id,
+                            void **req);
+H5_DLL herr_t H5VLattr_write(void *attr, hid_t connector_id, hid_t dtype_id, const void *buf, hid_t dxpl_id,
+                             void **req);
+H5_DLL herr_t H5VLattr_get(void *obj, hid_t connector_id, H5VL_attr_get_args_t *args, hid_t dxpl_id,
+                           void **req);
+H5_DLL herr_t H5VLattr_specific(void *obj, const H5VL_loc_params_t *loc_params, hid_t connector_id,
+                                H5VL_attr_specific_args_t *args, hid_t dxpl_id, void **req);
+H5_DLL herr_t H5VLattr_optional(void *obj, hid_t connector_id, H5VL_optional_args_t *args, hid_t dxpl_id,
+                                void **req);
+H5_DLL herr_t H5VLattr_close(void *attr, hid_t connector_id, hid_t dxpl_id, void **req);
+
+/* Public wrappers for dataset callbacks */
+H5_DLL void  *H5VLdataset_create(void *obj, const H5VL_loc_params_t *loc_params, hid_t connector_id,
+                                 const char *name, hid_t lcpl_id, hid_t type_id, hid_t space_id, hid_t dcpl_id,
+                                 hid_t dapl_id, hid_t dxpl_id, void **req);
+H5_DLL void  *H5VLdataset_open(void *obj, const H5VL_loc_params_t *loc_params, hid_t connector_id,
+                               const char *name, hid_t dapl_id, hid_t dxpl_id, void **req);
+H5_DLL herr_t H5VLdataset_read(size_t count, void *dset[], hid_t connector_id, hid_t mem_type_id[],
+                               hid_t mem_space_id[], hid_t file_space_id[], hid_t plist_id, void *buf[],
+                               void **req);
+H5_DLL herr_t H5VLdataset_write(size_t count, void *dset[], hid_t connector_id, hid_t mem_type_id[],
+                                hid_t mem_space_id[], hid_t file_space_id[], hid_t plist_id,
+                                const void *buf[], void **req);
+H5_DLL herr_t H5VLdataset_get(void *dset, hid_t connector_id, H5VL_dataset_get_args_t *args, hid_t dxpl_id,
+                              void **req);
+H5_DLL herr_t H5VLdataset_specific(void *obj, hid_t connector_id, H5VL_dataset_specific_args_t *args,
+                                   hid_t dxpl_id, void **req);
+H5_DLL herr_t H5VLdataset_optional(void *obj, hid_t connector_id, H5VL_optional_args_t *args, hid_t dxpl_id,
+                                   void **req);
+H5_DLL herr_t H5VLdataset_close(void *dset, hid_t connector_id, hid_t dxpl_id, void **req);
+
+/* Public wrappers for named datatype callbacks */
+H5_DLL void  *H5VLdatatype_commit(void *obj, const H5VL_loc_params_t *loc_params, hid_t connector_id,
+                                  const char *name, hid_t type_id, hid_t lcpl_id, hid_t tcpl_id, hid_t tapl_id,
+                                  hid_t dxpl_id, void **req);
+H5_DLL void  *H5VLdatatype_open(void *obj, const H5VL_loc_params_t *loc_params, hid_t connector_id,
+                                const char *name, hid_t tapl_id, hid_t dxpl_id, void **req);
+H5_DLL herr_t H5VLdatatype_get(void *dt, hid_t connector_id, H5VL_datatype_get_args_t *args, hid_t dxpl_id,
+                               void **req);
+H5_DLL herr_t H5VLdatatype_specific(void *obj, hid_t connector_id, H5VL_datatype_specific_args_t *args,
+                                    hid_t dxpl_id, void **req);
+H5_DLL herr_t H5VLdatatype_optional(void *obj, hid_t connector_id, H5VL_optional_args_t *args, hid_t dxpl_id,
+                                    void **req);
+H5_DLL herr_t H5VLdatatype_close(void *dt, hid_t connector_id, hid_t dxpl_id, void **req);
+
+/* Public wrappers for file callbacks */
+H5_DLL void  *H5VLfile_create(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id, hid_t dxpl_id,
+                              void **req);
+H5_DLL void  *H5VLfile_open(const char *name, unsigned flags, hid_t fapl_id, hid_t dxpl_id, void **req);
+H5_DLL herr_t H5VLfile_get(void *file, hid_t connector_id, H5VL_file_get_args_t *args, hid_t dxpl_id,
+                           void **req);
+H5_DLL herr_t H5VLfile_specific(void *obj, hid_t connector_id, H5VL_file_specific_args_t *args, hid_t dxpl_id,
+                                void **req);
+H5_DLL herr_t H5VLfile_optional(void *obj, hid_t connector_id, H5VL_optional_args_t *args, hid_t dxpl_id,
+                                void **req);
+H5_DLL herr_t H5VLfile_close(void *file, hid_t connector_id, hid_t dxpl_id, void **req);
+
+/* Public wrappers for group callbacks */
+H5_DLL void  *H5VLgroup_create(void *obj, const H5VL_loc_params_t *loc_params, hid_t connector_id,
+                               const char *name, hid_t lcpl_id, hid_t gcpl_id, hid_t gapl_id, hid_t dxpl_id,
+                               void **req);
+H5_DLL void  *H5VLgroup_open(void *obj, const H5VL_loc_params_t *loc_params, hid_t connector_id,
+                             const char *name, hid_t gapl_id, hid_t dxpl_id, void **req);
+H5_DLL herr_t H5VLgroup_get(void *obj, hid_t connector_id, H5VL_group_get_args_t *args, hid_t dxpl_id,
+                            void **req);
+H5_DLL herr_t H5VLgroup_specific(void *obj, hid_t connector_id, H5VL_group_specific_args_t *args,
+                                 hid_t dxpl_id, void **req);
+H5_DLL herr_t H5VLgroup_optional(void *obj, hid_t connector_id, H5VL_optional_args_t *args, hid_t dxpl_id,
+                                 void **req);
+H5_DLL herr_t H5VLgroup_close(void *grp, hid_t connector_id, hid_t dxpl_id, void **req);
+
+/* Public wrappers for link callbacks */
+H5_DLL herr_t H5VLlink_create(H5VL_link_create_args_t *args, void *obj, const H5VL_loc_params_t *loc_params,
+                              hid_t connector_id, hid_t lcpl_id, hid_t lapl_id, hid_t dxpl_id, void **req);
+H5_DLL herr_t H5VLlink_copy(void *src_obj, const H5VL_loc_params_t *loc_params1, void *dst_obj,
+                            const H5VL_loc_params_t *loc_params2, hid_t connector_id, hid_t lcpl_id,
+                            hid_t lapl_id, hid_t dxpl_id, void **req);
+H5_DLL herr_t H5VLlink_move(void *src_obj, const H5VL_loc_params_t *loc_params1, void *dst_obj,
+                            const H5VL_loc_params_t *loc_params2, hid_t connector_id, hid_t lcpl_id,
+                            hid_t lapl_id, hid_t dxpl_id, void **req);
+H5_DLL herr_t H5VLlink_get(void *obj, const H5VL_loc_params_t *loc_params, hid_t connector_id,
+                           H5VL_link_get_args_t *args, hid_t dxpl_id, void **req);
+H5_DLL herr_t H5VLlink_specific(void *obj, const H5VL_loc_params_t *loc_params, hid_t connector_id,
+                                H5VL_link_specific_args_t *args, hid_t dxpl_id, void **req);
+H5_DLL herr_t H5VLlink_optional(void *obj, const H5VL_loc_params_t *loc_params, hid_t connector_id,
+                                H5VL_optional_args_t *args, hid_t dxpl_id, void **req);
+
+/* Public wrappers for object callbacks */
+H5_DLL void  *H5VLobject_open(void *obj, const H5VL_loc_params_t *loc_params, hid_t connector_id,
+                              H5I_type_t *opened_type, hid_t dxpl_id, void **req);
+H5_DLL herr_t H5VLobject_copy(void *src_obj, const H5VL_loc_params_t *loc_params1, const char *src_name,
+                              void *dst_obj, const H5VL_loc_params_t *loc_params2, const char *dst_name,
+                              hid_t connector_id, hid_t ocpypl_id, hid_t lcpl_id, hid_t dxpl_id, void **req);
+H5_DLL herr_t H5VLobject_get(void *obj, const H5VL_loc_params_t *loc_params, hid_t connector_id,
+                             H5VL_object_get_args_t *args, hid_t dxpl_id, void **req);
+H5_DLL herr_t H5VLobject_specific(void *obj, const H5VL_loc_params_t *loc_params, hid_t connector_id,
+                                  H5VL_object_specific_args_t *args, hid_t dxpl_id, void **req);
+H5_DLL herr_t H5VLobject_optional(void *obj, const H5VL_loc_params_t *loc_params, hid_t connector_id,
+                                  H5VL_optional_args_t *args, hid_t dxpl_id, void **req);
+
+/* Public wrappers for connector/container introspection callbacks */
+H5_DLL herr_t H5VLintrospect_get_conn_cls(void *obj, hid_t connector_id, H5VL_get_conn_lvl_t lvl,
+                                          const H5VL_class_t **conn_cls);
+H5_DLL herr_t H5VLintrospect_get_cap_flags(const void *info, hid_t connector_id, uint64_t *cap_flags);
+H5_DLL herr_t H5VLintrospect_opt_query(void *obj, hid_t connector_id, H5VL_subclass_t subcls, int opt_type,
+                                       uint64_t *flags);
+
+/* Public wrappers for asynchronous request callbacks */
+H5_DLL herr_t H5VLrequest_wait(void *req, hid_t connector_id, uint64_t timeout,
+                               H5VL_request_status_t *status);
+H5_DLL herr_t H5VLrequest_notify(void *req, hid_t connector_id, H5VL_request_notify_t cb, void *ctx);
+H5_DLL herr_t H5VLrequest_cancel(void *req, hid_t connector_id, H5VL_request_status_t *status);
+H5_DLL herr_t H5VLrequest_specific(void *req, hid_t connector_id, H5VL_request_specific_args_t *args);
+H5_DLL herr_t H5VLrequest_optional(void *req, hid_t connector_id, H5VL_optional_args_t *args);
+H5_DLL herr_t H5VLrequest_free(void *req, hid_t connector_id);
+
+/* Public wrappers for blob callbacks */
+H5_DLL herr_t H5VLblob_put(void *obj, hid_t connector_id, const void *buf, size_t size, void *blob_id,
+                           void *ctx);
+H5_DLL herr_t H5VLblob_get(void *obj, hid_t connector_id, const void *blob_id, void *buf, size_t size,
+                           void *ctx);
+H5_DLL herr_t H5VLblob_specific(void *obj, hid_t connector_id, void *blob_id,
+                                H5VL_blob_specific_args_t *args);
+H5_DLL herr_t H5VLblob_optional(void *obj, hid_t connector_id, void *blob_id, H5VL_optional_args_t *args);
+
+/* Public wrappers for token callbacks */
+H5_DLL herr_t H5VLtoken_cmp(void *obj, hid_t connector_id, const H5O_token_t *token1,
+                            const H5O_token_t *token2, int *cmp_value);
+H5_DLL herr_t H5VLtoken_to_str(void *obj, H5I_type_t obj_type, hid_t connector_id, const H5O_token_t *token,
+                               char **token_str);
+H5_DLL herr_t H5VLtoken_from_str(void *obj, H5I_type_t obj_type, hid_t connector_id, const char *token_str,
+                                 H5O_token_t *token);
+
+/* Public wrappers for generic 'optional' callback */
+H5_DLL herr_t H5VLoptional(void *obj, hid_t connector_id, H5VL_optional_args_t *args, hid_t dxpl_id,
+                           void **req);
+\endcode
+
+\section secVOLAppC Appendix C Native VOL Connector Optional Values By Subclass
+\code
+/* H5VL_SUBCLS_ATTR */
+#define H5VL_NATIVE_ATTR_ITERATE_OLD 0 /* H5Aiterate (deprecated routine) */
+
+/* H5VL_SUBCLS_DATASET */
+#define H5VL_NATIVE_DATASET_FORMAT_CONVERT          0  /* H5Dformat_convert (internal) */
+#define H5VL_NATIVE_DATASET_GET_CHUNK_INDEX_TYPE    1  /* H5Dget_chunk_index_type      */
+#define H5VL_NATIVE_DATASET_GET_CHUNK_STORAGE_SIZE  2  /* H5Dget_chunk_storage_size    */
+#define H5VL_NATIVE_DATASET_GET_NUM_CHUNKS          3  /* H5Dget_num_chunks            */
+#define H5VL_NATIVE_DATASET_GET_CHUNK_INFO_BY_IDX   4  /* H5Dget_chunk_info            */
+#define H5VL_NATIVE_DATASET_GET_CHUNK_INFO_BY_COORD 5  /* H5Dget_chunk_info_by_coord   */
+#define H5VL_NATIVE_DATASET_CHUNK_READ              6  /* H5Dchunk_read                */
+#define H5VL_NATIVE_DATASET_CHUNK_WRITE             7  /* H5Dchunk_write               */
+#define H5VL_NATIVE_DATASET_GET_VLEN_BUF_SIZE       8  /* H5Dvlen_get_buf_size         */
+#define H5VL_NATIVE_DATASET_GET_OFFSET              9  /* H5Dget_offset                */
+#define H5VL_NATIVE_DATASET_CHUNK_ITER              10 /* H5Dchunk_iter                */
+
+/* H5VL_SUBCLS_FILE */
+#define H5VL_NATIVE_FILE_CLEAR_ELINK_CACHE            0  /* H5Fclear_elink_file_cache            */
+#define H5VL_NATIVE_FILE_GET_FILE_IMAGE               1  /* H5Fget_file_image                    */
+#define H5VL_NATIVE_FILE_GET_FREE_SECTIONS            2  /* H5Fget_free_sections                 */
+#define H5VL_NATIVE_FILE_GET_FREE_SPACE               3  /* H5Fget_freespace                     */
+#define H5VL_NATIVE_FILE_GET_INFO                     4  /* H5Fget_info1/2                       */
+#define H5VL_NATIVE_FILE_GET_MDC_CONF                 5  /* H5Fget_mdc_config                    */
+#define H5VL_NATIVE_FILE_GET_MDC_HR                   6  /* H5Fget_mdc_hit_rate                  */
+#define H5VL_NATIVE_FILE_GET_MDC_SIZE                 7  /* H5Fget_mdc_size                      */
+#define H5VL_NATIVE_FILE_GET_SIZE                     8  /* H5Fget_filesize                      */
+#define H5VL_NATIVE_FILE_GET_VFD_HANDLE               9  /* H5Fget_vfd_handle                    */
+#define H5VL_NATIVE_FILE_RESET_MDC_HIT_RATE           10 /* H5Freset_mdc_hit_rate_stats          */
+#define H5VL_NATIVE_FILE_SET_MDC_CONFIG               11 /* H5Fset_mdc_config                    */
+#define H5VL_NATIVE_FILE_GET_METADATA_READ_RETRY_INFO 12 /* H5Fget_metadata_read_retry_info      */
+#define H5VL_NATIVE_FILE_START_SWMR_WRITE             13 /* H5Fstart_swmr_write                  */
+#define H5VL_NATIVE_FILE_START_MDC_LOGGING            14 /* H5Fstart_mdc_logging                 */
+#define H5VL_NATIVE_FILE_STOP_MDC_LOGGING             15 /* H5Fstop_mdc_logging                  */
+#define H5VL_NATIVE_FILE_GET_MDC_LOGGING_STATUS       16 /* H5Fget_mdc_logging_status            */
+#define H5VL_NATIVE_FILE_FORMAT_CONVERT               17 /* H5Fformat_convert                    */
+#define H5VL_NATIVE_FILE_RESET_PAGE_BUFFERING_STATS   18 /* H5Freset_page_buffering_stats        */
+#define H5VL_NATIVE_FILE_GET_PAGE_BUFFERING_STATS     19 /* H5Fget_page_buffering_stats          */
+#define H5VL_NATIVE_FILE_GET_MDC_IMAGE_INFO           20 /* H5Fget_mdc_image_info                */
+#define H5VL_NATIVE_FILE_GET_EOA                      21 /* H5Fget_eoa                           */
+#define H5VL_NATIVE_FILE_INCR_FILESIZE                22 /* H5Fincrement_filesize                */
+#define H5VL_NATIVE_FILE_SET_LIBVER_BOUNDS            23 /* H5Fset_latest_format/libver_bounds   */
+#define H5VL_NATIVE_FILE_GET_MIN_DSET_OHDR_FLAG       24 /* H5Fget_dset_no_attrs_hint            */
+#define H5VL_NATIVE_FILE_SET_MIN_DSET_OHDR_FLAG       25 /* H5Fset_dset_no_attrs_hint            */
+#ifdef H5_HAVE_PARALLEL
+#define H5VL_NATIVE_FILE_GET_MPI_ATOMICITY 26 /* H5Fget_mpi_atomicity                 */
+#define H5VL_NATIVE_FILE_SET_MPI_ATOMICITY 27 /* H5Fset_mpi_atomicity                 */
+#endif
+#define H5VL_NATIVE_FILE_POST_OPEN 28 /* Adjust file after open, with wrapping context */
+
+/* H5VL_SUBCLS_GROUP */
+#define H5VL_NATIVE_GROUP_ITERATE_OLD 0 /* HG5Giterate (deprecated routine) */
+#define H5VL_NATIVE_GROUP_GET_OBJINFO 1 /* HG5Gget_objinfo (deprecated routine) */
+
+/* H5VL_SUBCLS_OBJECT */
+#define H5VL_NATIVE_OBJECT_GET_COMMENT              0 /* H5G|H5Oget_comment, H5Oget_comment_by_name   */
+#define H5VL_NATIVE_OBJECT_SET_COMMENT              1 /* H5G|H5Oset_comment, H5Oset_comment_by_name   */
+#define H5VL_NATIVE_OBJECT_DISABLE_MDC_FLUSHES      2 /* H5Odisable_mdc_flushes                       */
+#define H5VL_NATIVE_OBJECT_ENABLE_MDC_FLUSHES       3 /* H5Oenable_mdc_flushes                        */
+#define H5VL_NATIVE_OBJECT_ARE_MDC_FLUSHES_DISABLED 4 /* H5Oare_mdc_flushes_disabled                  */
+#define H5VL_NATIVE_OBJECT_GET_NATIVE_INFO          5 /* H5Oget_native_info(_by_idx, _by_name)        */
+\endcode
+
+<hr>
+Navigate back: \ref index "Main" / \ref VOL_Connector
+*/
diff --git a/doxygen/dox/ViewTools.dox b/doxygen/dox/ViewTools.dox
new file mode 100644
index 0000000..2212d4b
--- /dev/null
+++ b/doxygen/dox/ViewTools.dox
@@ -0,0 +1,1196 @@
+/** @page ViewTools Tools for Viewing and Editing HDF5 Files
+
+Navigate back: \ref index "Main" / \ref GettingStarted
+<hr>
+
+\section secToolsBasic Basic Facts about HDF5
+The following are basic facts about HDF5 files to keep in mind while completing these tutorial topics:
+\li All HDF5 files contain a root group "/".
+\li There are two primary objects in HDF5, a group and a dataset:<br />
+    Groups allow objects to be organized into a group structure, such as a tree.<br />
+    Datasets contain raw data values.
+\li Additional information about an HDF5 object may optionally be stored in attributes attached to the object.
+
+\section secToolsTopics Tutorial Topics
+<table>
+<tr>
+<th>Tutorial Topic</th>
+<th>Description</th>
+</tr>
+<tr>
+<td>
+@ref LearnHDFView
+</td>
+<td>Use HDFView to create, edit and view files.
+</td>
+</tr>
+<tr>
+<td>
+@ref ViewToolsCommand
+</td>
+<td>Use the HDF5 command-line tools for viewing, editing, and comparing HDF5 files.
+</td>
+</tr>
+<tr>
+<td>@ref ViewToolsJPSS
+</td>
+<td>Use HDF5 tools to examine and work with JPSS NPP files.
+</td>
+</tr>
+</table>
+
+<hr>
+Navigate back: \ref index "Main" / \ref GettingStarted
+
+@page ViewToolsCommand Command-line Tools
+Navigate back: \ref index "Main" / \ref GettingStarted
+<hr>
+
+\section secViewToolsCommandObtain Obtain Tools and Files (Optional)
+Pre-built binaries for Linux and Windows are distributed within the respective HDF5 binary release
+packages, which can be obtained from the <a href="https://portal.hdfgroup.org/display/support/Download+HDF5">Download HDF5</a> page.
+
+HDF5 files can be obtained from various places such as \ref HDF5Examples and <a href="http://www.hdfeos.org/">HDF-EOS and Tools and
+Information Center</a>. Specifically, the following examples are used in this tutorial topic:
+\li HDF5 Files created from compiling the \ref LBExamples
+\li HDF5 Files on the <a href="https://portal.hdfgroup.org/display/HDF5/Examples+by+API">Examples by API</a> page
+\li NPP JPSS files, <a href="https://support.hdfgroup.org/ftp/HDF5/examples/files/tutorial/SVM01_npp_d20130524_t1255132_e1256374_b08146_c20130524192048864992_noaa_ops.h5.gz">SVM01_npp.. (gzipped)</a>
+and <a href="https://support.hdfgroup.org/ftp/HDF5/examples/files/tutorial/SVM09_npp_d20120229_t0849107_e0854511_b01759_c20120229145452682127_noaa_ops.h5.gz">SVM09_npp.. (gzipped)</a>
+\li HDF-EOS <a href="https://support.hdfgroup.org/ftp/HDF5/examples/files/tutorial/OMI-Aura.he5">OMI-Aura file</a>
+
+\section secViewToolsCommandTutor Tutorial Topics
+A variety of command-line tools are included in the HDF5 binary distribution. There are tools to view,
+edit, convert and compare HDF5 files. This tutorial discusses the tools by their functionality. It
+does not cover all of the HDF5 tools.
+
+<table>
+<tr>
+<th>Tool Category</th>
+<th>Topic</th>
+<th>Tools Used</th>
+</tr>
+<tr>
+<td><strong>@ref ViewToolsView</strong></td>
+<td>@ref secViewToolsViewContent</td>
+<td>h5dump and h5ls
+</td>
+</tr>
+<tr>
+<td></td>
+<td>@ref secViewToolsViewDset</td>
+<td>h5dump and h5ls
+</td>
+</tr>
+<tr>
+<td></td>
+<td>@ref secViewToolsViewGrps</td>
+<td>h5dump and h5ls
+</td>
+</tr>
+<tr>
+<td></td>
+<td>@ref secViewToolsViewAttr</td>
+<td>h5dump
+</td>
+</tr>
+<tr>
+<td></td>
+<td>@ref secViewToolsViewSub</td>
+<td>h5dump
+</td>
+</tr>
+<tr>
+<td></td>
+<td>@ref secViewToolsViewDtypes</td>
+<td>h5dump
+</td>
+</tr>
+<tr>
+<td>@ref ViewToolsEdit</td>
+<td>@ref secViewToolsEditRemove</td>
+<td>h5repack
+</td>
+</tr>
+<tr>
+<td></td>
+<td>@ref secViewToolsEditChange</td>
+<td>h5repack
+</td>
+</tr>
+<tr>
+<td></td>
+<td>@ref secViewToolsEditApply</td>
+<td>h5repack
+</td>
+</tr>
+<tr>
+<td></td>
+<td>@ref secViewToolsEditCopy</td>
+<td>h5copy
+</td>
+</tr>
+<tr>
+<td></td>
+<td>@ref secViewToolsEditAdd</td>
+<td>h5jam and h5unjam
+</td>
+</tr>
+<tr>
+<td>@ref ViewToolsConvert</td>
+<td>@ref secViewToolsConvertASCII</td>
+<td>h5dump
+</td>
+</tr>
+<tr>
+<td></td>
+<td>@ref secViewToolsConvertBinary</a></td>
+<td>h5dump
+</td>
+</tr>
+<tr>
+<td></td>
+<td>@ref secViewToolsConvertExport</td>
+<td>h5dump and h5import
+</td>
+</tr>
+</table>
+
+<hr>
+Navigate back: \ref index "Main" / \ref GettingStarted
+
+@page ViewToolsView Command-line Tools For Viewing HDF5 Files
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref ViewToolsCommand
+<hr>
+
+\section secViewToolsViewTOC Contents
+<ul>
+<li>\ref secViewToolsViewContent</li>
+<li>\ref secViewToolsViewDset</li>
+<li>\ref secViewToolsViewGrps</li>
+<li>\ref secViewToolsViewAttr</li>
+<li>\ref secViewToolsViewSub</li>
+<li>\ref secViewToolsViewDtypes</li>
+</ul>
+
+\section secViewToolsViewContent File Content and Structure
+The h5dump and h5ls tools can both be used to view the contents of an HDF5 file. The tools are discussed below:
+<ul>
+<li>\ref subsecViewToolsViewContent_h5dump</li>
+<li>\ref subsecViewToolsViewContent_h5ls</li>
+</ul>
+
+\subsection subsecViewToolsViewContent_h5dump h5dump
+The h5dump tool dumps or displays the contents of an HDF5 file (textually). By default if you specify no options,
+h5dump will display the entire contents of a file. There are many h5dump options for examining specific details
+of a file. To see all of the available h5dump options, specify the <code style="background-color:whitesmoke;">-h</code>
+or <code style="background-color:whitesmoke;">--help</code> option: 
+\code
+h5dump -h
+\endcode
+
+The following h5dump options can be helpful in viewing the content and structure of a file:
+<table>
+<tr>
+<th>Option</th>
+<th>Description</th>
+<th>Comment</th>
+</tr>
+<tr>
+<td>-n, --contents
+</td>
+<td>Displays a list of the objects in a file
+</td>
+<td>See @ref subsubsecViewToolsViewContent_h5dumpEx1
+</td>
+</tr>
+<tr>
+<td>-n 1, --contents=1
+</td>
+<td>Displays a list of the objects and attributes in a file
+</td>
+<td>See @ref subsubsecViewToolsViewAttr_h5dumpEx6
+</td>
+</tr>
+<tr>
+<td>-H, --header
+</td>
+<td>Displays header information only (no data)
+</td>
+<td>See @ref subsubsecViewToolsViewContent_h5dumpEx2
+</td>
+</tr>
+<tr>
+<td>-A 0, --onlyattr=0
+</td>
+<td>Suppresses the display of attributes
+</td>
+<td>See @ref subsubsecViewToolsViewContent_h5dumpEx2
+</td>
+</tr>
+<tr>
+<td>-N P, --any_path=P
+</td>
+<td>Displays any object or attribute that matches path P
+</td>
+<td>See @ref subsubsecViewToolsViewAttr_h5dumpEx6
+</td>
+</tr>
+</table>
+
+\subsubsection subsubsecViewToolsViewContent_h5dumpEx1 Example 1
+The following command displays a list of the objects in the file OMI-Aura.he5 (an HDF-EOS5 file):
+\code
+h5dump -n OMI-Aura.he5
+\endcode
+
+As shown in the output below, the objects (groups, datasets) are listed to the left, followed by their
+names. You can see that this file contains two root groups, HDFEOS and HDFEOS INFORMATION:
+\code
+HDF5 "OMI-Aura.he5" {
+FILE_CONTENTS {
+ group      /
+ group      /HDFEOS
+ group      /HDFEOS/ADDITIONAL
+ group      /HDFEOS/ADDITIONAL/FILE_ATTRIBUTES
+ group      /HDFEOS/GRIDS
+ group      /HDFEOS/GRIDS/OMI Column Amount O3
+ group      /HDFEOS/GRIDS/OMI Column Amount O3/Data Fields
+ dataset    /HDFEOS/GRIDS/OMI Column Amount O3/Data Fields/ColumnAmountO3
+ dataset    /HDFEOS/GRIDS/OMI Column Amount O3/Data Fields/RadiativeCloudFraction
+ dataset    /HDFEOS/GRIDS/OMI Column Amount O3/Data Fields/SolarZenithAngle
+ dataset    /HDFEOS/GRIDS/OMI Column Amount O3/Data Fields/ViewingZenithAngle
+ group      /HDFEOS INFORMATION
+ dataset    /HDFEOS INFORMATION/StructMetadata.0
+ }
+}
+\endcode
+
+\subsubsection subsubsecViewToolsViewContent_h5dumpEx2 Example 2
+The file structure of the OMI-Aura.he5 file can be seen with the following command. The -A 0 option suppresses the display of attributes:
+\code
+h5dump -H -A 0 OMI-Aura.he5
+\endcode
+
+Output of this command is shown below:
+\code
+HDF5 "OMI-Aura.he5" {
+GROUP "/" {
+   GROUP "HDFEOS" {
+      GROUP "ADDITIONAL" {
+         GROUP "FILE_ATTRIBUTES" {
+         }
+      }
+      GROUP "GRIDS" {
+         GROUP "OMI Column Amount O3" {
+            GROUP "Data Fields" {
+               DATASET "ColumnAmountO3" {
+                  DATATYPE  H5T_IEEE_F32LE
+                  DATASPACE  SIMPLE { ( 720, 1440 ) / ( 720, 1440 ) }
+               }
+               DATASET "RadiativeCloudFraction" {
+                  DATATYPE  H5T_IEEE_F32LE
+                  DATASPACE  SIMPLE { ( 720, 1440 ) / ( 720, 1440 ) }
+               }
+               DATASET "SolarZenithAngle" {
+                  DATATYPE  H5T_IEEE_F32LE
+                  DATASPACE  SIMPLE { ( 720, 1440 ) / ( 720, 1440 ) }
+               }
+               DATASET "ViewingZenithAngle" {
+                  DATATYPE  H5T_IEEE_F32LE
+                  DATASPACE  SIMPLE { ( 720, 1440 ) / ( 720, 1440 ) }
+               }
+            }
+         }
+      }
+   }
+   GROUP "HDFEOS INFORMATION" {
+      DATASET "StructMetadata.0" {
+         DATATYPE  H5T_STRING {
+            STRSIZE 32000;
+            STRPAD H5T_STR_NULLTERM;
+            CSET H5T_CSET_ASCII;
+            CTYPE H5T_C_S1;
+         }
+         DATASPACE  SCALAR
+      }
+   }
+}
+}
+\endcode
+
+\subsection subsecViewToolsViewContent_h5ls h5ls
+The h5ls tool by default just displays the objects in the root group. It will not display
+items in groups beneath the root group unless specified. Useful h5ls options for viewing
+file content and structure are:
+<table>
+<tr>
+<th>Option</th>
+<th>Description</th>
+<th>Comment</th>
+</tr>
+<tr>
+<td>-r
+</td>
+<td>Lists all groups and objects recursively
+</td>
+<td>See @ref subsubsecViewToolsViewContent_h5lsEx3
+</td>
+</tr>
+<tr>
+<td>-v
+</td>
+<td>Generates verbose output (lists dataset properties, attributes 
+and attribute values, but no dataset values)
+</td>
+<td>
+</td>
+</tr>
+</table>
+
+\subsubsection subsubsecViewToolsViewContent_h5lsEx3 Example 3
+The following command shows the contents of the HDF-EOS5 file OMI-Aura.he5. The output is similar to h5dump, except that h5ls also shows dataspace information for each dataset:
+\code
+h5ls -r OMI-Aura.he5
+\endcode
+
+The output is shown below:
+\code
+/                        Group
+/HDFEOS                  Group
+/HDFEOS/ADDITIONAL       Group
+/HDFEOS/ADDITIONAL/FILE_ATTRIBUTES Group
+/HDFEOS/GRIDS            Group
+/HDFEOS/GRIDS/OMI\ Column\ Amount\ O3 Group
+/HDFEOS/GRIDS/OMI\ Column\ Amount\ O3/Data\ Fields Group
+/HDFEOS/GRIDS/OMI\ Column\ Amount\ O3/Data\ Fields/ColumnAmountO3 Dataset {720, 1440}
+/HDFEOS/GRIDS/OMI\ Column\ Amount\ O3/Data\ Fields/RadiativeCloudFraction Dataset {720, 1440}
+/HDFEOS/GRIDS/OMI\ Column\ Amount\ O3/Data\ Fields/SolarZenithAngle Dataset {720, 1440}
+/HDFEOS/GRIDS/OMI\ Column\ Amount\ O3/Data\ Fields/ViewingZenithAngle Dataset {720, 1440}
+/HDFEOS\ INFORMATION     Group
+/HDFEOS\ INFORMATION/StructMetadata.0 Dataset {SCALAR}
+\endcode
+
+\section secViewToolsViewDset Datasets and Dataset Properties
+Both h5dump and h5ls can be used to view specific datasets.
+<ul>
+<li>\ref subsecViewToolsViewDset_h5dump</li>
+<li>\ref subsecViewToolsViewDset_h5ls</li>
+</ul>
+
+\subsection subsecViewToolsViewDset_h5dump h5dump
+Useful h5dump options for examining specific datasets include:
+<table>
+<tr>
+<th>Option</th>
+<th>Description</th>
+<th>Comment</th>
+</tr>
+<tr>
+<td>-d D, --dataset=D
+</td>
+<td>Displays dataset D
+</td>
+<td>See @ref subsubsecViewToolsViewDset_h5dumpEx4
+</td>
+</tr>
+<tr>
+<td> -H, --header
+</td>
+<td>Displays header information only
+</td>
+<td>See @ref subsubsecViewToolsViewDset_h5dumpEx4
+</td>
+</tr>
+<tr>
+<td>-p, --properties
+</td>
+<td>Displays dataset filters, storage layout, and fill value properties
+</td>
+<td>See @ref subsubsecViewToolsViewDset_h5dumpEx5
+</td>
+</tr>
+<tr>
+<td>-A 0, --onlyattr=0
+</td>
+<td>Suppresses the display of attributes
+</td>
+<td>See @ref subsubsecViewToolsViewContent_h5dumpEx2
+</td>
+</tr>
+<tr>
+<td>-N P, --any_path=P
+</td>
+<td>Displays any object or attribute that matches path P
+</td>
+<td>See @ref subsubsecViewToolsViewAttr_h5dumpEx6
+</td>
+</tr>
+</table>
+
+\subsubsection subsubsecViewToolsViewDset_h5dumpEx4 Example 4
+A specific dataset can be viewed with <code style="background-color:whitesmoke;">h5dump</code> using the <code style="background-color:whitesmoke;">-d D</code> option and specifying the entire
+path and name of the dataset for <code style="background-color:whitesmoke;">D</code>. The path is important in identifying the correct dataset,
+as there can be multiple datasets with the same name. The path can be determined by looking at
+the objects in the file with <code style="background-color:whitesmoke;">h5dump -n</code>.
+
+The following example uses the <code style="background-color:whitesmoke;">groups.h5</code> file that is created by the
+\ref LBExamples
+example <code style="background-color:whitesmoke;">h5_crtgrpar.c</code>. To display <code style="background-color:whitesmoke;">dset1</code> in the <code style="background-color:whitesmoke;">groups.h5</code> file below, specify dataset
+<code style="background-color:whitesmoke;">/MyGroup/dset1</code>. The <code style="background-color:whitesmoke;">-H</code> option is used to suppress printing of the data values:
+
+<em>Contents of groups.h5</em>
+\code
+   $ h5dump -n groups.h5
+   HDF5 "groups.h5" {
+   FILE_CONTENTS {
+    group      /
+    group      /MyGroup
+    group      /MyGroup/Group_A
+    dataset    /MyGroup/Group_A/dset2
+    group      /MyGroup/Group_B
+    dataset    /MyGroup/dset1
+    }
+   }
+\endcode
+
+<em>Display dataset "dset1"</em>
+\code
+   $ h5dump -d "/MyGroup/dset1" -H groups.h5
+   HDF5 "groups.h5" {
+   DATASET "/MyGroup/dset1" {
+      DATATYPE  H5T_STD_I32BE
+      DATASPACE  SIMPLE { ( 3, 3 ) / ( 3, 3 ) }
+   }
+   }
+\endcode
+
+\subsubsection subsubsecViewToolsViewDset_h5dumpEx5 Example 5
+The <code style="background-color:whitesmoke;">-p</code> option is used to examine the the dataset filters, storage layout, and fill value properties of a dataset.
+
+This option can be useful for checking how well compression works, or even for analyzing performance
+and dataset size issues related to chunking. (The smaller the chunk size, the more chunks that HDF5
+has to keep track of, which increases the size of the file and potentially affects performance.)
+
+In the file shown below the dataset <code style="background-color:whitesmoke;">/DS1</code> is both chunked and compressed:
+\code
+   $ h5dump -H -p -d "/DS1" h5ex_d_gzip.h5
+   HDF5 "h5ex_d_gzip.h5" {
+   DATASET "/DS1" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 32, 64 ) / ( 32, 64 ) }
+      STORAGE_LAYOUT {
+         CHUNKED ( 4, 8 )
+         SIZE 5278 (1.552:1 COMPRESSION)
+      }
+      FILTERS {
+         COMPRESSION DEFLATE { LEVEL 9 }
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  0
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_INCR
+      }
+   }
+   }
+\endcode
+
+You can obtain the <code style="background-color:whitesmoke;">h5ex_d_gzip.c</code> program that created this file, as well as the file created,
+from the <a href="https://portal.hdfgroup.org/display/HDF5/Examples+by+API">Examples by API</a> page.
+
+\subsection subsecViewToolsViewDset_h5ls h5ls
+Specific datasets can be specified with <code style="background-color:whitesmoke;">h5ls</code> by simply adding the dataset path and dataset after the
+file name. As an example, this command displays dataset <code style="background-color:whitesmoke;">dset2</code> in the <code style="background-color:whitesmoke;">groups.h5</code>
+file used in @ref subsubsecViewToolsViewDset_h5dumpEx4 :
+\code
+h5ls groups.h5/MyGroup/Group_A/dset2
+\endcode
+
+Just the dataspace information gets displayed:
+\code
+dset2 Dataset {2, 10}
+\endcode
+
+The following options can be used to see detailed information about a dataset.
+<table>
+<tr>
+<th>Option</th>
+<th>Description</th>
+</tr>
+<tr>
+<td>-v, --verbose
+</td>
+<td>Generates verbose output (lists dataset properties, attributes 
+and attribute values, but no dataset values)
+</td>
+</tr>
+<tr>
+<td>-d, --data
+</td>
+<td>Displays dataset values
+</td>
+</tr>
+</table>
+
+The output of using <code style="background-color:whitesmoke;">-v</code> is shown below:
+\code
+   $ h5ls -v groups.h5/MyGroup/Group_A/dset2
+   Opened "groups.h5" with sec2 driver.
+   dset2                    Dataset {2/2, 10/10}
+       Location:  1:3840
+       Links:     1
+       Storage:   80 logical bytes, 80 allocated bytes, 100.00% utilization
+       Type:      32-bit big-endian integer
+\endcode
+
+The output of using <code style="background-color:whitesmoke;">-d</code> is shown below:
+\code
+   $ h5ls -d groups.h5/MyGroup/Group_A/dset2
+   dset2                    Dataset {2, 10}
+       Data:
+           (0,0) 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
+\endcode
+
+\section secViewToolsViewGrps Groups
+Both h5dump and h5ls can be used to view specific groups in a file.
+<ul>
+<li>\ref subsecViewToolsViewGrps_h5dump</li>
+<li>\ref subsecViewToolsViewGrps_h5ls</li>
+</ul>
+
+\subsection subsecViewToolsViewGrps_h5dump h5dump
+The <code style="background-color:whitesmoke;">h5dump</code> options that are useful for examining groups are:
+<table>
+<tr>
+<th>Option</th>
+<th>Description</th>
+</tr>
+<tr>
+<td>-g G, --group=G
+</td>
+<td>Displays group G and its members
+</td>
+</tr>
+<tr>
+<td>-H, --header
+</td>
+<td>Displays header information only
+</td>
+</tr>
+<tr>
+<td>-A 0, --onlyattr=0
+</td>
+<td>Suppresses the display of attributes
+</td>
+</tr>
+</table>
+
+To view the contents of the <code style="background-color:whitesmoke;">HDFEOS</code> group in the OMI file mentioned previously, you can specify the path and name of the group as follows:
+\code
+h5dump -g "/HDFEOS" -H -A 0 OMI-Aura.he5
+\endcode
+
+The <code style="background-color:whitesmoke;">-A 0</code> option suppresses attributes and <code style="background-color:whitesmoke;">-H</code> suppresses printing of data values:
+\code
+   HDF5 "OMI-Aura.he5" {
+   GROUP "/HDFEOS" {
+      GROUP "ADDITIONAL" {
+         GROUP "FILE_ATTRIBUTES" {
+         }
+      }
+      GROUP "GRIDS" {
+         GROUP "OMI Column Amount O3" {
+            GROUP "Data Fields" {
+               DATASET "ColumnAmountO3" {
+                  DATATYPE  H5T_IEEE_F32LE
+                  DATASPACE  SIMPLE { ( 720, 1440 ) / ( 720, 1440 ) }
+               }
+               DATASET "RadiativeCloudFraction" {
+                  DATATYPE  H5T_IEEE_F32LE
+                  DATASPACE  SIMPLE { ( 720, 1440 ) / ( 720, 1440 ) }
+               }
+               DATASET "SolarZenithAngle" {
+                  DATATYPE  H5T_IEEE_F32LE
+                  DATASPACE  SIMPLE { ( 720, 1440 ) / ( 720, 1440 ) }
+               }
+               DATASET "ViewingZenithAngle" {
+                  DATATYPE  H5T_IEEE_F32LE
+                  DATASPACE  SIMPLE { ( 720, 1440 ) / ( 720, 1440 ) }
+               }
+            }
+         }
+      }
+   }
+   }
+\endcode
+
+\subsection subsecViewToolsViewGrps_h5ls h5ls
+You can view the contents of a group with <code style="background-color:whitesmoke;">h5ls</code>/ by specifying the group after the file name.
+To use <code style="background-color:whitesmoke;">h5ls</code> to view the contents of the <code style="background-color:whitesmoke;">/HDFEOS</code> group in the <code style="background-color:whitesmoke;">OMI-Aura.he5</code> file, type:
+\code
+h5ls -r OMI-Aura.he5/HDFEOS
+\endcode
+
+The output of this command is:
+\code
+   /ADDITIONAL              Group
+   /ADDITIONAL/FILE_ATTRIBUTES Group
+   /GRIDS                   Group
+   /GRIDS/OMI\ Column\ Amount\ O3 Group
+   /GRIDS/OMI\ Column\ Amount\ O3/Data\ Fields Group
+   /GRIDS/OMI\ Column\ Amount\ O3/Data\ Fields/ColumnAmountO3 Dataset {720, 1440}
+   /GRIDS/OMI\ Column\ Amount\ O3/Data\ Fields/RadiativeCloudFraction Dataset {720, 1440}
+   /GRIDS/OMI\ Column\ Amount\ O3/Data\ Fields/SolarZenithAngle Dataset {720, 1440}
+   /GRIDS/OMI\ Column\ Amount\ O3/Data\ Fields/ViewingZenithAngle Dataset {720, 1440}
+\endcode
+
+If you specify the <code style="background-color:whitesmoke;">-v</code> option, you can also see the attributes and properties of the datasets.
+
+\section secViewToolsViewAttr Attributes
+
+\subsection subsecViewToolsViewAttr_h5dump h5dump
+Attributes are displayed by default if using <code style="background-color:whitesmoke;">h5dump</code>. Some files contain many attributes, which
+can make it difficult to examine the objects in the file. Shown below are options that can help
+when using <code style="background-color:whitesmoke;">h5dump</code> to work with files that have attributes.
+
+\subsubsection subsubsecViewToolsViewAttr_h5dumpEx6 Example 6
+The <code style="background-color:whitesmoke;">-a</code> A option will display an attribute. However, the path to the attribute must be included
+when specifying this option. For example, to see the <code style="background-color:whitesmoke;">ScaleFactor</code> attribute in the <code style="background-color:whitesmoke;">OMI-Aura.he5</code> file, type:
+\code
+h5dump -a "/HDFEOS/GRIDS/OMI Column Amount O3/Data Fields/SolarZenithAngle/ScaleFactor" OMI-Aura.he5
+\endcode
+
+This command displays:
+\code
+   HDF5 "OMI-Aura.he5" {
+   ATTRIBUTE "ScaleFactor" {
+      DATATYPE  H5T_IEEE_F64LE
+      DATASPACE  SIMPLE { ( 1 ) / ( 1 ) }
+      DATA {
+      (0): 1
+      }
+   }
+   }
+\endcode
+
+How can you determine the path to the attribute? This can be done by looking at the file contents with the <code style="background-color:whitesmoke;">-n 1</code> option:
+\code
+h5dump -n 1 OMI-Aura.he5
+\endcode
+
+Below is a portion of the output for this command:
+\code
+   HDF5 "OMI-Aura.he5" {
+   FILE_CONTENTS {
+    group      /
+    group      /HDFEOS
+    group      /HDFEOS/ADDITIONAL
+    group      /HDFEOS/ADDITIONAL/FILE_ATTRIBUTES
+    attribute  /HDFEOS/ADDITIONAL/FILE_ATTRIBUTES/EndUTC
+    attribute  /HDFEOS/ADDITIONAL/FILE_ATTRIBUTES/GranuleDay
+    attribute  /HDFEOS/ADDITIONAL/FILE_ATTRIBUTES/GranuleDayOfYear
+    attribute  /HDFEOS/ADDITIONAL/FILE_ATTRIBUTES/GranuleMonth
+    attribute  /HDFEOS/ADDITIONAL/FILE_ATTRIBUTES/GranuleYear
+    attribute  /HDFEOS/ADDITIONAL/FILE_ATTRIBUTES/InstrumentName
+    attribute  /HDFEOS/ADDITIONAL/FILE_ATTRIBUTES/OrbitNumber
+    attribute  /HDFEOS/ADDITIONAL/FILE_ATTRIBUTES/OrbitPeriod
+    attribute  /HDFEOS/ADDITIONAL/FILE_ATTRIBUTES/PGEVersion
+    attribute  /HDFEOS/ADDITIONAL/FILE_ATTRIBUTES/Period
+    attribute  /HDFEOS/ADDITIONAL/FILE_ATTRIBUTES/ProcessLevel
+    attribute  /HDFEOS/ADDITIONAL/FILE_ATTRIBUTES/StartUTC
+    attribute  /HDFEOS/ADDITIONAL/FILE_ATTRIBUTES/TAI93At0zOfGranule
+
+    ...
+\endcode
+
+There can be multiple objects or attributes with the same name in a file. How can you make sure
+you are finding the correct object or attribute? You can first determine how many attributes
+there are with a specified name, and then examine the paths to them.
+
+The <code style="background-color:whitesmoke;">-N</code> option can be used to display all objects or attributes with a given name.
+For example, there are four attributes with the name <code style="background-color:whitesmoke;">ScaleFactor</code> in the <code style="background-color:whitesmoke;">OMI-Aura.he5</code> file,
+as can be seen below with the <code style="background-color:whitesmoke;">-N</code> option:
+\code
+h5dump -N ScaleFactor OMI-Aura.he5
+\endcode
+
+It outputs:
+\code
+HDF5 "OMI-Aura.he5" {
+ATTRIBUTE "ScaleFactor" {
+   DATATYPE  H5T_IEEE_F64LE
+   DATASPACE  SIMPLE { ( 1 ) / ( 1 ) }
+   DATA {
+   (0): 1
+   }
+}
+ATTRIBUTE "ScaleFactor" {
+   DATATYPE  H5T_IEEE_F64LE
+   DATASPACE  SIMPLE { ( 1 ) / ( 1 ) }
+   DATA {
+   (0): 1
+   }
+}
+ATTRIBUTE "ScaleFactor" {
+   DATATYPE  H5T_IEEE_F64LE
+   DATASPACE  SIMPLE { ( 1 ) / ( 1 ) }
+   DATA {
+   (0): 1
+   }
+}
+ATTRIBUTE "ScaleFactor" {
+   DATATYPE  H5T_IEEE_F64LE
+   DATASPACE  SIMPLE { ( 1 ) / ( 1 ) }
+   DATA {
+   (0): 1
+   }
+}
+}
+\endcode
+
+\subsection subsecViewToolsViewAttr_h5ls h5ls
+If you include the <code style="background-color:whitesmoke;">-v</code> (verbose) option for <code style="background-color:whitesmoke;">h5ls</code>, you will see all of the attributes for the
+specified file, dataset or group. You cannot display individual attributes.
+
+\section secViewToolsViewSub Dataset Subset
+
+\subsection subsecViewToolsViewSub_h5dump h5dump
+If you have a very large dataset, you may wish to subset or see just a portion of the dataset.
+This can be done with the following <code style="background-color:whitesmoke;">h5dump</code> options.
+<table>
+<tr>
+<th>Option</th>
+<th>Description</th>
+</tr>
+<tr>
+<td>-d D, --dataset=D
+</td>
+<td>Dataset D
+</td>
+</tr>
+<tr>
+<td>-s START, --start=START
+</td>
+<td>Offset or start of subsetting selection
+</td>
+</tr>
+<tr>
+<td>-S STRIDE, --stride=STRIDE
+</td>
+<td>Stride (sampling along a dimension). The default (unspecified, or 1) selects 
+every element along a dimension, a value of 2 selects every other element,
+a value of 3 selects every third element, ...
+</td>
+</tr>
+<tr>
+<td>-c COUNT, --count=COUNT
+</td>
+<td>Number of blocks to include in the selection
+</td>
+</tr>
+<tr>
+<td>-k BLOCK, --block=BLOCK
+</td>
+<td>Size of the block in a hyperslab. The default (unspecified, or 1) is for 
+the block size to be the size of a single element.
+</td>
+</tr>
+</table>
+
+The <code style="background-color:whitesmoke;">START (s)</code>, <code style="background-color:whitesmoke;">STRIDE (S)</code>, <code style="background-color:whitesmoke;">COUNT (c)</code>, and <code style="background-color:whitesmoke;">BLOCK (k)</code> options
+define the shape and size of the selection. They are arrays with the same number of dimensions as the rank
+of the dataset's dataspace, and they all work together to define the selection. A change to one of
+these arrays can affect the others.
+
+When specifying these h5dump options, a comma is used as the delimiter for each dimension in the
+option value. For example, with a 2-dimensional dataset, the option value is specified as "H,W",
+where H is the height and W is the width. If the offset is 0 for both dimensions, then
+<code style="background-color:whitesmoke;">START</code> would be specified as follows:
+\code
+-s "0,0"
+\endcode
+
+There is also a shorthand way to specify these options with brackets at the end of the dataset name:
+\code
+-d DATASETNAME[s;S;c;k]
+\endcode
+
+Multiple dimensions are separated by commas. For example, a subset for a 2-dimensional dataset would be specified as follows:
+\code
+-d DATASETNAME[s,s;S,S;c,c;k,k]
+\endcode
+
+For a detailed understanding of how selections works, see the #H5Sselect_hyperslab API in the \ref RM.
+
+The dataset SolarZenithAngle in the OMI-Aura.he5 file can be used to illustrate these options. This
+dataset is a 2-dimensional dataset of size 720 (height) x 1440 (width). Too much data will be displayed
+by simply viewing the specified dataset with the <code style="background-color:whitesmoke;">-d</code> option:
+\code
+h5dump -d "HDFEOS/GRIDS/OMI Column Amount O3/Data Fields/SolarZenithAngle" OMI-Aura.he5
+\endcode
+
+Subsetting narrows down the output that is displayed. In the following example, the first
+15x10 elements (-c "15,10") are specified, beginning with position (0,0) (-s "0,0"):
+\code
+    h5dump -A 0 -d "HDFEOS/GRIDS/OMI Column Amount O3/Data Fields/SolarZenithAngle" -s "0,0" -c "15,10" -w 0 OMI-Aura.he5
+\endcode
+
+If using the shorthand method, specify:
+\code
+    h5dump -A 0 -d "HDFEOS/GRIDS/OMI Column Amount O3/Data Fields/SolarZenithAngle[0,0;;15,10;]" -w 0 OMI-Aura.he5
+\endcode
+
+Where, the <code style="background-color:whitesmoke;">-d</code> option must be specified
+before subsetting options (if not using the shorthand method).
+
+The <code style="background-color:whitesmoke;">-A 0</code> option suppresses the printing of attributes.
+
+The <code style="background-color:whitesmoke;">-w 0</code> option sets the number of columns of output to the maximum allowed value (65535).
+This ensures that there are enough columns specified for displaying the data.
+
+Either command displays:
+\code
+   HDF5 "OMI-Aura.he5" {
+   DATASET "HDFEOS/GRIDS/OMI Column Amount O3/Data Fields/SolarZenithAngle" {
+      DATATYPE  H5T_IEEE_F32LE
+      DATASPACE  SIMPLE { ( 720, 1440 ) / ( 720, 1440 ) }
+      SUBSET {
+         START ( 0, 0 );
+         STRIDE ( 1, 1 );
+         COUNT ( 15, 10 );
+         BLOCK ( 1, 1 );
+         DATA {
+         (0,0): 79.403, 79.403, 79.403, 79.403, 79.403, 79.403, 79.403, 79.403, 79.403, 79.403,
+         (1,0): 79.071, 79.071, 79.071, 79.071, 79.071, 79.071, 79.071, 79.071, 79.071, 79.071,
+         (2,0): 78.867, 78.867, 78.867, 78.867, 78.867, 78.867, 78.867, 78.867, 78.867, 78.867,
+         (3,0): 78.632, 78.632, 78.632, 78.632, 78.632, 78.632, 78.632, 78.632, 78.632, 78.632,
+         (4,0): 78.429, 78.429, 78.429, 78.429, 78.429, 78.429, 78.429, 78.429, 78.429, 78.429,
+         (5,0): 78.225, 78.225, 78.225, 78.225, 78.225, 78.225, 78.225, 78.225, 78.225, 78.225,
+         (6,0): 78.021, 78.021, 78.021, 78.021, 78.021, 78.021, 78.021, 78.021, 78.021, 78.021,
+         (7,0): 77.715, 77.715, 77.715, 77.715, 77.715, 77.715, 77.715, 77.715, 77.715, 77.715,
+         (8,0): 77.511, 77.511, 77.511, 77.511, 77.511, 77.511, 77.511, 77.511, 77.511, 77.511,
+         (9,0): 77.658, 77.658, 77.658, 77.307, 77.307, 77.307, 77.307, 77.307, 77.307, 77.307,
+         (10,0): 77.556, 77.556, 77.556, 77.556, 77.556, 77.556, 77.556, 77.556, 77.102, 77.102,
+         (11,0): 78.408, 78.408, 78.408, 78.408, 78.408, 78.408, 78.408, 78.408, 77.102, 77.102,
+         (12,0): 76.34, 78.413, 78.413, 78.413, 78.413, 78.413, 78.413, 78.413, 78.413, 78.413,
+         (13,0): 78.107, 78.107, 78.107, 78.107, 78.107, 78.107, 78.107, 78.107, 78.107, 77.195,
+         (14,0): 78.005, 78.005, 78.005, 78.005, 78.005, 78.005, 76.991, 76.991, 76.991, 76.991
+         }
+      }
+   }
+   }
+\endcode
+
+What if we wish to read three rows of three elements at a time (-c "3,3"), where each element
+is a 2 x 3 block (-k "2,3") and we wish to begin reading from the second row (-s "1,0")?
+
+You can do that with the following command:
+\code
+ h5dump -A 0 -d "HDFEOS/GRIDS/OMI Column Amount O3/Data Fields/SolarZenithAngle" 
+        -s "1,0" -S "2,3" -c "3,3" -k "2,3" -w 0 OMI-Aura.he5
+\endcode
+
+In this case, the stride must be specified as 2 by 3 (or larger) to accommodate the reading of 2 by 3 blocks.
+If it is smaller, the command will fail with the error,
+\code
+h5dump error: wrong subset selection; blocks overlap.
+\endcode
+
+The output of the above command is shown below:
+\code
+   HDF5 "OMI-Aura.he5" {
+   DATASET "HDFEOS/GRIDS/OMI Column Amount O3/Data Fields/SolarZenithAngle" {
+      DATATYPE  H5T_IEEE_F32LE
+      DATASPACE  SIMPLE { ( 720, 1440 ) / ( 720, 1440 ) }
+      SUBSET {
+         START ( 1, 0 );
+         STRIDE ( 2, 3 );
+         COUNT ( 3, 3 );
+         BLOCK ( 2, 3 );
+         DATA {
+          (1,0): 79.071, 79.071, 79.071, 79.071, 79.071, 79.071, 79.071, 79.071, 79.071,
+          (2,0): 78.867, 78.867, 78.867, 78.867, 78.867, 78.867, 78.867, 78.867, 78.867,
+          (3,0): 78.632, 78.632, 78.632, 78.632, 78.632, 78.632, 78.632, 78.632, 78.632,
+          (4,0): 78.429, 78.429, 78.429, 78.429, 78.429, 78.429, 78.429, 78.429, 78.429,
+          (5,0): 78.225, 78.225, 78.225, 78.225, 78.225, 78.225, 78.225, 78.225, 78.225,
+          (6,0): 78.021, 78.021, 78.021, 78.021, 78.021, 78.021, 78.021, 78.021, 78.021
+         }
+      }
+   }
+   }
+\endcode
+
+\section secViewToolsViewDtypes Datatypes
+
+\subsection subsecViewToolsViewDtypes_h5dump h5dump
+The following datatypes are discussed, using the output of <code style="background-color:whitesmoke;">h5dump</code> with HDF5 files from the
+<a href="https://portal.hdfgroup.org/display/HDF5/Examples+by+API">Examples by API</a> page:
+<ul>
+<li>@ref subsubsecViewToolsViewDtypes_array</li>
+<li>@ref subsubsecViewToolsViewDtypes_objref</li>
+<li>@ref subsubsecViewToolsViewDtypes_regref</li>
+<li>@ref subsubsecViewToolsViewDtypes_string</li>
+</ul>
+
+\subsubsection subsubsecViewToolsViewDtypes_array Array
+Users have been confused by the difference between an Array datatype (#H5T_ARRAY) and a dataset that
+(has a dataspace that) is an array.
+
+Typically, these users want a dataset that has a simple datatype (like integer or float) that is an
+array, like the following dataset <code style="background-color:whitesmoke;">/DS1</code>. It has a datatype of #H5T_STD_I32LE (32-bit Little-Endian Integer)
+and is a 4 by 7 array:
+\code
+$ h5dump h5ex_d_rdwr.h5
+HDF5 "h5ex_d_rdwr.h5" {
+GROUP "/" {
+   DATASET "DS1" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 7 ) / ( 4, 7 ) }
+      DATA {
+      (0,0): 0, -1, -2, -3, -4, -5, -6,
+      (1,0): 0, 0, 0, 0, 0, 0, 0,
+      (2,0): 0, 1, 2, 3, 4, 5, 6,
+      (3,0): 0, 2, 4, 6, 8, 10, 12
+      }
+   }
+}
+} 
+\endcode
+
+Contrast that with the following dataset that has both an Array datatype and is an array:
+\code
+$ h5dump h5ex_t_array.h5
+HDF5 "h5ex_t_array.h5" {
+GROUP "/" {
+   DATASET "DS1" {
+      DATATYPE  H5T_ARRAY { [3][5] H5T_STD_I64LE }
+      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) }
+      DATA {
+      (0): [ 0, 0, 0, 0, 0,
+            0, -1, -2, -3, -4,
+            0, -2, -4, -6, -8 ],
+      (1): [ 0, 1, 2, 3, 4,
+            1, 1, 1, 1, 1,
+            2, 1, 0, -1, -2 ],
+      (2): [ 0, 2, 4, 6, 8,
+            2, 3, 4, 5, 6,
+            4, 4, 4, 4, 4 ],
+      (3): [ 0, 3, 6, 9, 12,
+            3, 5, 7, 9, 11,
+            6, 7, 8, 9, 10 ]
+      }
+   }
+}
+}
+\endcode
+
+In this file, dataset <code style="background-color:whitesmoke;">/DS1</code> has a datatype of
+\code
+H5T_ARRAY { [3][5] H5T_STD_I64LE }
+\endcode
+and it also has a dataspace of
+\code
+SIMPLE { ( 4 ) / ( 4 ) }
+\endcode
+In other words, it is an array of four elements, in which each element is a 3 by 5 array of #H5T_STD_I64LE.
+
+This dataset is much more complex. Also note that subsetting cannot be done on Array datatypes.
+
+See this <a href="https://portal.hdfgroup.org/display/knowledge/H5T_ARRAY+Datatype">FAQ</a> for more information on the Array datatype.
+
+\subsubsection subsubsecViewToolsViewDtypes_objref Object Reference
+An Object Reference is a reference to an entire object (dataset, group, or named datatype).
+A dataset with an Object Reference datatype consists of one or more Object References.
+An Object Reference dataset can be used as an index to an HDF5 file.
+
+The <code style="background-color:whitesmoke;">/DS1</code> dataset in the following file (<code style="background-color:whitesmoke;">h5ex_t_objref.h5</code>) is an Object Reference dataset.
+It contains two references, one to group <code style="background-color:whitesmoke;">/G1</code> and the other to dataset <code style="background-color:whitesmoke;">/DS2</code>:
+\code
+$ h5dump h5ex_t_objref.h5
+HDF5 "h5ex_t_objref.h5" {
+GROUP "/" {
+   DATASET "DS1" {
+      DATATYPE  H5T_REFERENCE { H5T_STD_REF_OBJECT }
+      DATASPACE  SIMPLE { ( 2 ) / ( 2 ) }
+      DATA {
+      (0): GROUP 1400 /G1 , DATASET 800 /DS2
+      }
+   }
+   DATASET "DS2" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  NULL
+      DATA {
+      }
+   }
+   GROUP "G1" {
+   }
+}
+}
+\endcode
+
+\subsubsection subsubsecViewToolsViewDtypes_regref Region Reference
+A Region Reference is a reference to a selection within a dataset. A selection can be either
+individual elements or a hyperslab. In <code style="background-color:whitesmoke;">h5dump</code> you will see the name of the dataset along with
+the elements or slab that is selected. A dataset with a Region Reference datatype consists of
+one or more Region References.
+
+An example of a Region Reference dataset (<code style="background-color:whitesmoke;">h5ex_t_regref.h5</code>) can be found on the
+<a href="https://portal.hdfgroup.org/display/HDF5/Examples+by+API">Examples by API</a> page,
+under Datatypes. If you examine this dataset with <code style="background-color:whitesmoke;">h5dump</code> you will see that <code style="background-color:whitesmoke;">/DS1</code> is a
+Region Reference dataset as indicated by its datatype, highlighted in bold below:
+\code
+$ h5dump  h5ex_t_regref.h5
+HDF5 "h5ex_t_regref.h5" {
+GROUP "/" {
+   DATASET "DS1" {
+          DATATYPE  H5T_REFERENCE { H5T_STD_REF_DSETREG }
+      DATASPACE  SIMPLE { ( 2 ) / ( 2 ) }
+      DATA {
+         DATASET /DS2 {(0,1), (2,11), (1,0), (2,4)},
+         DATASET /DS2 {(0,0)-(0,2), (0,11)-(0,13), (2,0)-(2,2), (2,11)-(2,13)}
+      }
+   }
+   DATASET "DS2" {
+      DATATYPE  H5T_STD_I8LE
+      DATASPACE  SIMPLE { ( 3, 16 ) / ( 3, 16 ) }
+      DATA {
+      (0,0): 84, 104, 101, 32, 113, 117, 105, 99, 107, 32, 98, 114, 111, 119,
+      (0,14): 110, 0,
+      (1,0): 102, 111, 120, 32, 106, 117, 109, 112, 115, 32, 111, 118, 101,
+      (1,13): 114, 32, 0,
+      (2,0): 116, 104, 101, 32, 53, 32, 108, 97, 122, 121, 32, 100, 111, 103,
+      (2,14): 115, 0
+      }
+   }
+}
+}
+\endcode
+
+It contains two Region References:
+\li A selection of four individual elements in dataset <code style="background-color:whitesmoke;">/DS2 : (0,1), (2,11), (1,0), (2,4)</code>
+See the #H5Sselect_elements API in the \ref UG for information on selecting individual elements.
+\li A selection of these blocks in dataset <code style="background-color:whitesmoke;">/DS2 : (0,0)-(0,2), (0,11)-(0,13), (2,0)-(2,2), (2,11)-(2,13)</code>
+See the #H5Sselect_hyperslab API in the \ref UG for how to do hyperslab selection.
+ 
+
+If you look at the code that creates the dataset (<code style="background-color:whitesmoke;">h5ex_t_regref.c</code>) you will see that the
+first reference is created with these calls:
+\code
+  status = H5Sselect_elements (space, H5S_SELECT_SET, 4, coords[0]);
+  status = H5Rcreate (&wdata[0], file, DATASET2, H5R_DATASET_REGION, space);
+\endcode
+
+where the buffer containing the coordinates to select is:
+\code
+   coords[4][2] = { {0,  1},
+                    {2, 11},
+                    {1,  0},
+                    {2,  4} },
+\endcode
+
+The second reference is created by calling,
+\code
+  status = H5Sselect_hyperslab (space, H5S_SELECT_SET, start, stride, count, block);
+  status = H5Rcreate (&wdata[1], file, DATASET2, H5R_DATASET_REGION, space);
+\endcode
+where start, stride, count, and block have these values:
+\code
+     start[2] =  {0, 0},
+     stride[2] = {2, 11},
+     count[2] =  {2, 2},
+     block[2] =  {1, 3};
+\endcode
+
+These start, stride, count, and block values will select the elements shown in bold in the dataset:
+\code
+84 104 101 32 113 117 105  99 107  32  98 114 111 119 110 0
+102 111 120 32 106 117 109 112 115  32 111 118 101 114  32 0
+116 104 101 32  53  32 108  97 122 121  32 100 111 103 115 0
+\endcode
+
+If you use <code style="background-color:whitesmoke;">h5dump</code> to select a subset of dataset
+<code style="background-color:whitesmoke;">/DS2</code> with these start, stride, count, and block values, you will see that the same elements are selected:
+\code
+$ h5dump -d "/DS2" -s "0,0" -S "2,11" -c "2,2" -k "1,3" h5ex_t_regref.h5
+HDF5 "h5ex_t_regref.h5" {
+DATASET "/DS2" {
+   DATATYPE  H5T_STD_I8LE
+   DATASPACE  SIMPLE { ( 3, 16 ) / ( 3, 16 ) }
+   SUBSET {
+      START ( 0, 0 );
+      STRIDE ( 2, 11 );
+      COUNT ( 2, 2 );
+      BLOCK ( 1, 3 );
+      DATA {
+      (0,0): 84, 104, 101, 114, 111, 119,
+      (2,0): 116, 104, 101, 100, 111, 103
+      }
+   }
+}
+}
+\endcode
+
+For more information on selections, see the tutorial topic on
+@ref LBDsetSubRW. Also see the
+\ref secViewToolsViewSub tutorial topic on using <code style="background-color:whitesmoke;">h5dump</code> to view a subset.
+
+\subsubsection subsubsecViewToolsViewDtypes_string String
+There are two types of string data, fixed length strings and variable length strings.
+
+Below is the <code style="background-color:whitesmoke;">h5dump</code> output for two files that have the same strings written to them. In one file,
+the strings are fixed in length, and in the other, the strings have different sizes (and are variable in size).
+
+<em>Dataset of Fixed Length Strings</em>
+\code
+HDF5 "h5ex_t_string.h5" {
+GROUP "/" {
+   DATASET "DS1" {
+      DATATYPE  H5T_STRING {
+         STRSIZE 7;
+         STRPAD H5T_STR_SPACEPAD;
+         CSET H5T_CSET_ASCII;
+         CTYPE H5T_C_S1;
+      }
+      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) }
+      DATA {
+      (0): "Parting", "is such", "sweet  ", "sorrow."
+      }
+   }
+}
+}
+\endcode
+
+<em>Dataset of Variable Length Strings</em>
+\code
+HDF5 "h5ex_t_vlstring.h5" {
+GROUP "/" {
+   DATASET "DS1" {
+      DATATYPE  H5T_STRING {
+         STRSIZE H5T_VARIABLE;
+         STRPAD H5T_STR_SPACEPAD;
+         CSET H5T_CSET_ASCII;
+         CTYPE H5T_C_S1;
+      }
+      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) }
+      DATA {
+      (0): "Parting", "is such", "sweet", "sorrow."
+      }
+   }
+}
+}
+\endcode
+
+You might wonder which to use. Some comments to consider are included below.
+\li In general, a variable length string dataset is more complex than a fixed length string. If you don't
+specifically need a variable length type, then just use the fixed length string.
+\li A variable length dataset consists of pointers to heaps in different locations in the file. For this
+reason, a variable length dataset cannot be compressed. (Basically, the pointers get compressed and
+not the actual data!) If compression is needed, then do not use variable length types.
+\li If you need to create an array of of different length strings, you can either use fixed length strings
+along with compression, or use a variable length string.
+
+<hr>
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref ViewToolsCommand
+
+*/
diff --git a/doxygen/dox/ViewTools2.dox b/doxygen/dox/ViewTools2.dox
new file mode 100644
index 0000000..4d8788a
--- /dev/null
+++ b/doxygen/dox/ViewTools2.dox
@@ -0,0 +1,786 @@
+/** @page ViewToolsEdit Command-line Tools For Editing HDF5 Files
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref ViewToolsCommand
+<hr>
+
+\section secViewToolsEditTOC Contents
+<ul>
+<li>\ref secViewToolsEditRemove</li>
+<li>\ref secViewToolsEditChange</li>
+<li>\ref secViewToolsEditApply</li>
+<li>\ref secViewToolsEditCopy</li>
+<li>\ref secViewToolsEditAdd</li>
+</ul>
+
+\section secViewToolsEditRemove Remove Inaccessible Objects and Unused Space in a File
+HDF5 files may accumulate unused space when they are read and rewritten to or if objects are deleted within
+them. With many edits and deletions this unused space can add up to a sizable amount.
+
+The <code style="background-color:whitesmoke;">h5repack</code> tool can be used to remove unused space in an HDF5
+file. If no options other than the input and output HDF5 files are specified on the
+<code style="background-color:whitesmoke;">h5repack</code> command line, it will write the file to the new
+file, getting rid of the unused space:
+\code
+h5repack <input file> <output file>
+\endcode
+
+\section secViewToolsEditChange Change a Dataset's Storage Layout
+The <code style="background-color:whitesmoke;">h5repack</code> utility can be used to change a dataset's storage
+layout. By default, the storage layout of a dataset is defined at creation time and it cannot be changed.
+However, with h5repack you can write an HDF5 file to a new file and change the layout for objects in the new file.
+
+The <code style="background-color:whitesmoke;">-l</code> option in <code style="background-color:whitesmoke;">h5repack</code>
+is used to change the layout for an object. The string following the <code style="background-color:whitesmoke;">-l</code>
+option defines the layout type and parameters for specified objects (or all objects):
+\code
+h5repack -l [list of objects:]<layout type>=<layout parameters> <input file> <output file>
+\endcode
+
+If no object is specified, then everything in the input file will be written to the output file with the specified
+layout type and parameters. If objects are specified then everything in the input file will be written to the
+output file as is, except for those specified objects. They will be written to the output file with the given
+layout type and parameters.
+
+Following is a description of the dataset layouts and the <code style="background-color:whitesmoke;">h5repack</code>
+options to use to change a dataset:
+<table>
+<tr>
+<th>Storage Layout</th><th>h5repack Option</th><th>Description</th>
+</tr>
+<tr>
+<td>Contiguous  
+</td>
+<td>CONTI
+</td>
+<td>Data is stored physically together
+</td>
+</tr>
+<tr>
+<td>Chunked 
+</td>
+<td>CHUNK=DIM[xDIM...xDIM]
+</td>
+<td>Data is stored in DIM[xDIM...xDIM] chunks
+</td>
+</tr>
+<tr>
+<td>Compact 
+</td>
+<td>COMPA
+</td>
+<td>Data is stored in the header of the object (less I/O)
+</td>
+</tr>
+</table>
+
+If you type <code style="background-color:whitesmoke;">h5repack -h</code> on the command line, you will see
+a detailed usage statement with examples of modifying the layout.
+
+In the following example, the dataset <code style="background-color:whitesmoke;">/dset</code> in the file
+dset.h5 is contiguous, as shown by the <code style="background-color:whitesmoke;">h5dump -pH</code> command.
+The <code style="background-color:whitesmoke;">h5repack</code> utility writes dset.h5 to a new file, dsetrpk.h5,
+where the dataset <code style="background-color:whitesmoke;">dset</code> is chunked. This can be seen by examining
+the resulting dsetrpk.h5 file with <code style="background-color:whitesmoke;">h5dump</code>, as shown:
+\code
+$ h5dump -pH dset.h5
+HDF5 "dset.h5" {
+GROUP "/" {
+   DATASET "dset" {
+      DATATYPE  H5T_STD_I32BE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( 4, 6 ) }
+      STORAGE_LAYOUT {
+         CONTIGUOUS
+         SIZE 96
+         OFFSET 1400
+      }
+      FILTERS {
+         NONE
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  0
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_LATE
+      }
+   }
+}
+}
+
+$ h5repack -l dset:CHUNK=4x6 dset.h5 dsetrpk.h5
+
+$ h5dump -pH dsetrpk.h5
+HDF5 "dsetrpk.h5" {
+GROUP "/" {
+   DATASET "dset" {
+      DATATYPE  H5T_STD_I32BE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( 4, 6 ) }
+      STORAGE_LAYOUT {
+         CHUNKED ( 4, 6 )
+         SIZE 96
+      }
+      FILTERS {
+         NONE
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  0
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_INCR
+      }
+   }
+}
+}
+\endcode
+
+There can be many reasons that the storage layout needs to be changed for a dataset. For example,
+there may be a performance issue with a dataset due to a small chunk size.
+
+\section secViewToolsEditApply Apply Compression Filter to a Dataset
+The <code style="background-color:whitesmoke;">h5repack</code> utility can be used to compress or
+remove compression from a dataset in a file. By default, compression cannot be added to or removed
+from a dataset once it has been created. However, with <code style="background-color:whitesmoke;">h5repack</code>
+you can write a file to a new file and specify a compression filter to apply to a dataset or datasets in the new file.
+
+To apply a filter to an object in an HDF5 file, specify the <code style="background-color:whitesmoke;">-f</code> option,
+where the string following the <code style="background-color:whitesmoke;">-f</code> option defines the filter and
+its parameters (if there are any) to apply to a given object or objects:
+\code
+h5repack -f [list of objects:]<name of filter>=<filter parameters> <input file> <output file>
+\endcode
+
+If no objects are specified then everything in the input file will be written to the output file with
+the filter and parameters specified. If objects are specified, then everything in the input file will
+be written to the output file as is, except for the specified objects. They will be written to the
+output file with the filter and parameters specified.
+
+If you type <code style="background-color:whitesmoke;">h5repack --help</code> on the command line,
+you will see a detailed usage statement with examples of modifying a filter. There are actually
+numerous filters that you can apply to a dataset:
+<table>
+<tr>
+<th>Filter<th></th>Options</th>
+</tr>
+<tr>
+<td>GZIP compression (levels 1-9)
+<td>GZIP=&lt;deflation level&gt;
+</td>
+</tr>
+<tr>
+<td>SZIP compression
+<td>SZIP=<pixels per block,coding>
+</td>
+</tr>
+<tr>
+<td>Shuffle filter
+<td>SHUF
+</td>
+</tr>
+<tr>
+<td>Checksum filter
+<td>FLET
+</td>
+</tr>
+<tr>
+<td>NBIT compression
+<td>NBIT
+</td>
+</tr>
+<tr>
+<td>HDF5 Scale/Offset filter
+<td>SOFF=<scale_factor,scale_type>
+</td>
+</tr>
+<tr>
+<td>User defined filter
+<td>UD=<filter_number,cd_value_count,value_1[,value_2,...,value_N]>
+</td>
+</tr>
+<tr>
+<td>Remove ALL filters
+</td>
+<td>NONE
+</td>
+</tr>
+</table>
+
+Be aware that a dataset must be chunked to apply compression to it. If the dataset is not already chunked,
+then <code style="background-color:whitesmoke;">h5repack</code> will apply chunking to it. Both chunking
+and compression cannot be applied to a dataset at the same time with <code style="background-color:whitesmoke;">h5repack</code>.
+
+In the following example,
+\li <em>h5dump</em> lists the properties for the objects in <em>dset.h5</em>. Note that the dataset <em>dset</em> is contiguous.
+\li <em>h5repack</em> writes dset.h5 into a new file <em>dsetrpk.h5</em>, applying GZIP Level 5 compression to the dataset <em>/dset</em> in dsetrpk.h5.
+\li <em>h5dump</em> lists the properties for the new <em>dsetrpk.h5</em> file. Note that <em>/dset</em> is both compressed and chunked.
+
+<em>Example</em>
+\code
+$ h5dump -pH dset.h5
+HDF5 "dset.h5" {
+GROUP "/" {
+   DATASET "dset" {
+      DATATYPE  H5T_STD_I32BE
+      DATASPACE  SIMPLE { ( 12, 18 ) / ( 12, 18 ) }
+      STORAGE_LAYOUT {
+         CONTIGUOUS
+         SIZE 864
+         OFFSET 1400
+      }
+      FILTERS {
+         NONE
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  0
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_LATE
+      }
+   }
+}
+}
+
+$ h5repack -f dset:GZIP=5 dset.h5 dsetrpk.h5
+
+$ h5dump -pH dsetrpk.h5
+HDF5 "dsetrpk.h5" {
+GROUP "/" {
+   DATASET "dset" {
+      DATATYPE  H5T_STD_I32BE
+      DATASPACE  SIMPLE { ( 12, 18 ) / ( 12, 18 ) }
+      STORAGE_LAYOUT {
+         CHUNKED ( 12, 18 )
+         SIZE 160 (5.400:1 COMPRESSION)
+      }
+      FILTERS {
+         COMPRESSION DEFLATE { LEVEL 5 }
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  0
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_INCR
+      }
+   }
+}
+}
+\endcode
+
+\section secViewToolsEditCopy Copy Objects to Another File
+The <code style="background-color:whitesmoke;">h5copy</code> utility can be used to copy an object or
+objects from one HDF5 file to another or to a different location in the same file. It uses the
+#H5Ocopy and #H5Lcopy APIs in HDF5.
+
+Following are some of the options that can be used with <code style="background-color:whitesmoke;">h5copy</code>.
+<table>
+<tr>
+<th>h5copy Options</th><th>Description</th>
+</tr>
+<tr>
+<td>-i, --input
+</td>
+<td>Input file name
+</td>
+</tr>
+<tr>
+<td>-o, --output
+</td>
+<td>Output file name
+</td>
+</tr>
+<tr>
+<td>-s, --source
+</td>
+<td>Source object name
+</td>
+</tr>
+<tr>
+<td>-d, --destination
+</td>
+<td>Destination object name
+</td>
+</tr>
+<tr>
+<td>-p, --parents
+</td>
+<td>Make parent groups as needed
+</td>
+</tr>
+<tr>
+<td>-v, --verbose
+</td>
+<td>Verbose mode
+</td>
+</tr>
+<tr>
+<td>-f, --flag
+</td>
+<td>Flag type
+</td>
+</tr>
+</table>
+
+For a complete list of options and information on using <code style="background-color:whitesmoke;">h5copy</code>, type:
+\code
+h5copy --help
+\endcode
+
+In the example below, the dataset <code style="background-color:whitesmoke;">/MyGroup/Group_A/dset2</code>
+in <code style="background-color:whitesmoke;">groups.h5</code> gets copied to the root
+("<code style="background-color:whitesmoke;">/</code>") group of a new file,
+<code style="background-color:whitesmoke;">newgroup.h5</code>, with the name
+<code style="background-color:whitesmoke;">dset3</code>:
+\code
+$h5dump -H groups.h5
+HDF5 "groups.h5" {
+GROUP "/" {
+   GROUP "MyGroup" {
+      GROUP "Group_A" {
+         DATASET "dset2" {
+            DATATYPE  H5T_STD_I32BE
+            DATASPACE  SIMPLE { ( 2, 10 ) / ( 2, 10 ) }
+         }
+      }
+      GROUP "Group_B" {
+      }
+      DATASET "dset1" {
+         DATATYPE  H5T_STD_I32BE
+         DATASPACE  SIMPLE { ( 3, 3 ) / ( 3, 3 ) }
+      }
+   }
+}
+}
+
+$ h5copy -i groups.h5 -o newgroup.h5 -s /MyGroup/Group_A/dset2 -d /dset3
+
+$ h5dump -H newgroup.h5
+HDF5 "newgroup.h5" {
+GROUP "/" {
+   DATASET "dset3" {
+      DATATYPE  H5T_STD_I32BE
+      DATASPACE  SIMPLE { ( 2, 10 ) / ( 2, 10 ) }
+   }
+}
+}
+\endcode
+
+There are also <code style="background-color:whitesmoke;">h5copy</code> flags that can be specified
+with the <code style="background-color:whitesmoke;">-f</code> option. In the example below, the
+<code style="background-color:whitesmoke;">-f shallow</code> option specifies to copy only the
+immediate members of the group <code style="background-color:whitesmoke;">/MyGroup</code> from
+the <code style="background-color:whitesmoke;">groups.h5</code> file mentioned above to a new
+file <code style="background-color:whitesmoke;">mygrouponly.h5</code>:
+\code
+h5copy -v -i groups.h5 -o mygrouponly.h5 -s /MyGroup -d /MyGroup -f shallow
+\endcode
+
+The output of the above command is shown below. The verbose option <code style="background-color:whitesmoke;">-v</code>
+describes the action that was taken, as shown in the highlighted text.
+\code
+Copying file <groups.h5> and object </MyGroup> to file <mygrouponly.h5> and object </MyGroup>
+Using shallow flag
+
+$ h5dump -H mygrouponly.h5
+HDF5 "mygrouponly.h5" {
+GROUP "/" {
+   GROUP "MyGroup" {
+      GROUP "Group_A" {
+      }
+      GROUP "Group_B" {
+      }
+      DATASET "dset1" {
+         DATATYPE  H5T_STD_I32BE
+         DATASPACE  SIMPLE { ( 3, 3 ) / ( 3, 3 ) }
+      }
+   }
+}
+}
+\endcode
+
+\section secViewToolsEditAdd Add or Remove User Block from File
+The user block is a space in an HDF5 file that is not interpreted by the HDF5 library. It is a property
+list that can be added when creating a file. See the #H5Pset_userblock API in the \ref RM for more
+information regarding this property.
+
+Once created in a file, the user block cannot be removed. However, you can use the
+<code style="background-color:whitesmoke;">h5jam</code> and <code style="background-color:whitesmoke;">h5unjam</code>
+utilities to add or remove a user block from a file into a new file.
+
+These two utilities work similarly, except that <code style="background-color:whitesmoke;">h5jam</code>
+adds a user block to a file and <code style="background-color:whitesmoke;">h5unjam</code> removes the user
+block. You can also overwrite or delete a user block in a file.
+
+Specify the <code style="background-color:whitesmoke;">-h</code> option to see a complete list of options
+that can be used with <code style="background-color:whitesmoke;">h5jam</code> and
+<code style="background-color:whitesmoke;">h5unjam</code>. For example:
+\code
+   h5jam -h
+   h5unjam -h
+\endcode
+
+Below are the basic options for adding or removing a user block with <code style="background-color:whitesmoke;">h5jam</code>
+and <code style="background-color:whitesmoke;">h5unjam</code>:
+
+<table>
+<tr>
+<th>h5copy Options</th><th>Description</th>
+</tr>
+<tr>
+<td>-i
+</td>
+<td>Input File
+</td>
+</tr>
+<tr>
+<td>-o
+</td>
+<td>Output File
+</td>
+</tr>
+<tr>
+<td>-u
+</td>
+<td>File to add or remove from user block
+</td>
+</tr>
+</table>
+
+Let's say you wanted to add the program that creates an HDF5 file to its user block. As an example, you
+can take the <code style="background-color:whitesmoke;">h5_crtgrpar.c</code> program from the
+\ref LBExamples
+and add it to the file it creates, <code style="background-color:whitesmoke;">groups.h5</code>. This can
+be done with <code style="background-color:whitesmoke;">h5jam</code>, as follows:
+\code
+h5jam -i groups.h5 -u h5_crtgrpar.c -o groupsub.h5
+\endcode
+
+You can actually view the file with more <code style="background-color:whitesmoke;">groupsub.h5</code>
+to see that the <code style="background-color:whitesmoke;">h5_crtgrpar.c</code> file is indeed included.
+
+To remove the user block that was just added, type:
+\code
+h5unjam -i groupsub.h5 -u h5_crtgrparNEW.c -o groups-noub.h5
+\endcode
+
+This writes the user block in the file <code style="background-color:whitesmoke;">groupsub.h5</code>
+into <code style="background-color:whitesmoke;">h5_crtgrparNEW.c</code>. The new HDF5 file,
+<code style="background-color:whitesmoke;">groups-noub.h5</code>, will not contain a user block.
+
+<hr>
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref ViewToolsCommand
+
+*/
+
+/** @page ViewToolsConvert Command-line Tools For Converting HDF5 Files
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref ViewToolsCommand
+<hr>
+
+\section secViewToolsConvertTOC Contents
+<ul>
+<li>\ref secViewToolsConvertASCII</li>
+<li>\ref secViewToolsConvertBinary</li>
+<li>\ref secViewToolsConvertExport</li>
+</ul>
+
+\section secViewToolsConvertASCII Output HDF5 Dataset into an ASCII File (to Import into Excel and Other Applications)
+The <code style="background-color:whitesmoke;">h5dump</code> utility can be used to convert an HDF5 dataset
+into an ASCII file, which can then be imported into Excel and other applications. The following options are used:
+<table>
+<tr>
+<th>Options</th><th>Description</th>
+</tr>
+<tr>
+<td> -d D, --dataset=D
+</td>
+<td>Display dataset D
+</td>
+</tr>
+<tr>
+<td> -o F, --output=F 
+</td>
+<td>Output raw data into file F
+</td>
+</tr>
+<tr>
+<td> -y, --noindex
+</td>
+<td>Suppress printing of array indices with the data
+</td>
+</tr>
+<tr>
+<td> -w N, --width=N
+</td>
+<td>Set N number of columns of output. A value of 0
+sets the number to 65535 (the maximum)
+</td>
+</tr>
+</table>
+
+As an example, <code style="background-color:whitesmoke;">h5_crtdat.c</code> from the \ref LBDsetCreate
+HDF5 Tutorial topic, creates the file <code style="background-color:whitesmoke;">dset.h5</code> with
+a dataset <code style="background-color:whitesmoke;">/dset</code> that is a 4 x 6 integer array. The
+following is displayed when viewing <code style="background-color:whitesmoke;">dset.h5</code> with
+<code style="background-color:whitesmoke;">h5dump</code>:
+\code
+$ h5dump dset.h5
+HDF5 "dset.h5" {
+GROUP "/" {
+   DATASET "dset" {
+      DATATYPE  H5T_STD_I32BE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( 4, 6 ) }
+      DATA {
+      (0,0): 1, 2, 3, 4, 5, 6,
+      (1,0): 7, 8, 9, 10, 11, 12,
+      (2,0): 13, 14, 15, 16, 17, 18,
+      (3,0): 19, 20, 21, 22, 23, 24
+      }
+   }
+}
+}
+\endcode
+
+The following command will output the values of the <code style="background-color:whitesmoke;">/dset</code>
+dataset to the ASCII file <code style="background-color:whitesmoke;">dset.asci</code>:
+\code
+h5dump -d /dset -o dset.asci -y -w 50 dset.h5
+\endcode
+
+In particular, note that:
+\li The default behavior of <code style="background-color:whitesmoke;">h5dump</code> is to print indices,
+and the <code style="background-color:whitesmoke;">-y</code> option suppresses this.
+\li The <code style="background-color:whitesmoke;">-w 50</code> option tells
+<code style="background-color:whitesmoke;">h5dump</code> to allow 50 columns for outputting the data. The
+value specified must be large enough to accommodate the dimension size of the dataset multiplied by the
+number of positions and spaces needed to print each value. If the value is not large enough, the output
+will wrap to the next line, and the data will not display as expected in Excel or other applications. To
+ensure that the output does not wrap to the next line, you can also specify 0 (zero) for the
+<code style="background-color:whitesmoke;">-w</code> option.
+
+In addition to creating the ASCII file <code style="background-color:whitesmoke;">dset.asci</code>, the
+above command outputs the metadata of the specified dataset:
+\code
+HDF5 "dset.h5" {
+DATASET "/dset" {
+   DATATYPE  H5T_STD_I32BE
+   DATASPACE  SIMPLE { ( 4, 6 ) / ( 4, 6 ) }
+   DATA {
+   }
+}
+}
+\endcode
+
+The <code style="background-color:whitesmoke;">dset.asci</code> file will contain the values for the dataset:
+\code
+      1, 2, 3, 4, 5, 6,
+      7, 8, 9, 10, 11, 12,
+      13, 14, 15, 16, 17, 18,
+      19, 20, 21, 22, 23, 24
+\endcode
+
+\section secViewToolsConvertBinary Output HDF5 Dataset into Binary File
+The <code style="background-color:whitesmoke;">h5dump</code> utility can be used to convert an
+HDF5 dataset to a binary file with the following options:
+<table>
+<tr>
+<th>Options</th><th>Description</th>
+</tr>
+<tr>
+<td>-d D, --dataset=D
+</td>
+<td>Display dataset D
+</td>
+</tr>
+<tr>
+<td>-o F, --output=F 
+</td>
+<td>Output raw data into file F
+</td>
+</tr>
+<tr>
+<td>-b B, --binary=B
+</td>
+<td>Binary file output of form B.
+Valid values are: LE, BE, NATIVE, FILE
+</td>
+</tr>
+</table>
+
+As an example, <code style="background-color:whitesmoke;">h5_crtdat.c</code> from the
+\ref LBDsetCreate HDF5 Tutorial topic, creates the file dset.h5 with a dataset
+<code style="background-color:whitesmoke;">/dset</code> that is a 4 x 6 integer array. The
+following is displayed when viewing <code style="background-color:whitesmoke;">dset.h5</code>
+with <code style="background-color:whitesmoke;">h5dump</code>:
+\code
+$ h5dump -d /dset/ dset.h5
+HDF5 "dset.h5" {
+DATASET "/dset/" {
+   DATATYPE  H5T_STD_I32BE
+   DATASPACE  SIMPLE { ( 4, 6 ) / ( 4, 6 ) }
+   DATA {
+   (0,0): 1, 2, 3, 4, 5, 6,
+   (1,0): 7, 8, 9, 10, 11, 12,
+   (2,0): 13, 14, 15, 16, 17, 18,
+   (3,0): 19, 20, 21, 22, 23, 24
+   }
+}
+}
+\endcode
+
+As specified by the <code style="background-color:whitesmoke;">-d</code> and
+<code style="background-color:whitesmoke;">-o</code> options, the following
+<code style="background-color:whitesmoke;">h5dump</code> command will output the values of the dataset
+<code style="background-color:whitesmoke;">/dset </code>to a file called
+<code style="background-color:whitesmoke;">dset.bin</code>. The <code style="background-color:whitesmoke;">-b</code>
+option specifies that the output will be binary in Little Endian format (LE).
+
+\code
+h5dump -d /dset -b LE -o dset.bin dset.h5
+\endcode
+
+This command outputs the metadata for the dataset, as well as creating the binary file
+<code style="background-color:whitesmoke;">dset.bin</code>:
+\code
+HDF5 "dset.h5" {
+DATASET "/dset" {
+   DATATYPE  H5T_STD_I32BE
+   DATASPACE  SIMPLE { ( 4, 6 ) / ( 4, 6 ) }
+   DATA {
+   }
+}
+}
+\endcode
+
+If you look at the resulting <code style="background-color:whitesmoke;">dset.bin</code> file with
+a binary editor, you will see that it contains the dataset's values. For example (on Linux) you will see:
+\code
+$ od -t d dset.bin
+0000000           1           2           3           4
+0000020           5           6           7           8
+0000040           9          10          11          12
+0000060          13          14          15          16
+0000100          17          18          19          20
+0000120          21          22          23          24
+0000140
+\endcode
+
+\section secViewToolsConvertExport Export from h5dump and Import into HDF5
+The <code style="background-color:whitesmoke;">h5import</code> utility can use the output of
+<code style="background-color:whitesmoke;">h5dump</code> as input to create a dataset or file.
+
+The <code style="background-color:whitesmoke;">h5dump</code> utility must first create two files:
+\li A DDL file, which will be used as an <code style="background-color:whitesmoke;">h5import</code> configuration file
+\li A raw data file containing the data to be imported
+
+The DDL file must be generated with the <code style="background-color:whitesmoke;">h5dump -p</code> option, to generate properties.
+
+The raw data file that can be imported into HDF5 using this method may contain either numeric or string data with the following restrictions:
+\li Numeric data requires the use of the <code style="background-color:whitesmoke;">h5dump -b</code> option to produce a binary data file.
+\li String data must be written with the <code style="background-color:whitesmoke;">h5dump -y</code> and
+<code style="background-color:whitesmoke;">--width=1</code> options, generating a single column of strings without indices.
+
+Two examples follow: the first imports a dataset with a numeric datatype. Note that numeric data requires
+the use of the <code style="background-color:whitesmoke;">h5dump -b</code> option to produce a binary data
+file. The example program (<code style="background-color:whitesmoke;">h5_crtdat.c</code>) that creates this
+file is included with the \ref IntroHDF5 tutorial and can be obtained from the \ref LBExamples page:
+\code
+h5dump -p -d "/dset" --ddl=dsetbin.dmp -o dset.bin -b dset.h5
+h5import dset.bin -c dsetbin.dmp -o new-dset.h5
+\endcode
+
+The output before and after running these commands is shown below:
+\code
+$  h5dump dset.h5
+HDF5 "dset.h5" {
+GROUP "/" {
+   DATASET "dset" {
+      DATATYPE  H5T_STD_I32BE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( 4, 6 ) }
+      DATA {
+      (0,0): 1, 2, 3, 4, 5, 6,
+      (1,0): 7, 8, 9, 10, 11, 12,
+      (2,0): 13, 14, 15, 16, 17, 18,
+      (3,0): 19, 20, 21, 22, 23, 24
+      }
+   }
+}
+}
+$ h5dump -p -d "/dset" --ddl=dsetbin.dmp -o dset.bin -b dset.h5
+
+$ h5import dset.bin -c dsetbin.dmp -o new-dset.h5
+
+$ h5dump new-dset.h5
+HDF5 "new-dset.h5" {
+GROUP "/" {
+   DATASET "dset" {
+      DATATYPE  H5T_STD_I32BE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( 4, 6 ) }
+      DATA {
+      (0,0): 1, 2, 3, 4, 5, 6,
+      (1,0): 7, 8, 9, 10, 11, 12,
+      (2,0): 13, 14, 15, 16, 17, 18,
+      (3,0): 19, 20, 21, 22, 23, 24
+      }
+   }
+}
+}
+\endcode
+
+The second example imports string data. The example program that creates this file can be downloaded
+from the <a href="https://portal.hdfgroup.org/display/HDF5/Examples+by+API">Examples by API</a> page.
+
+Note that string data requires use of the <code style="background-color:whitesmoke;">h5dump -y</code>
+option to exclude indexes and the <code style="background-color:whitesmoke;">h5dump --width=1</code>
+option to generate a single column of strings. The <code style="background-color:whitesmoke;">-o</code>
+option outputs the data into an ASCII file.
+\code
+h5dump -p -d "/DS1" -O vlstring.dmp -o vlstring.ascii -y --width=1 h5ex_t_vlstring.h5
+h5import vlstring.ascii -c vlstring.dmp -o new-vlstring.h5
+\endcode
+
+The output before and after running these commands is shown below:
+\code
+$ h5dump h5ex_t_vlstring.h5
+HDF5 "h5ex_t_vlstring.h5" {
+GROUP "/" {
+   DATASET "DS1" {
+      DATATYPE  H5T_STRING {
+         STRSIZE H5T_VARIABLE;
+         STRPAD H5T_STR_SPACEPAD;
+         CSET H5T_CSET_ASCII;
+         CTYPE H5T_C_S1;
+      }
+      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) }
+      DATA {
+      (0): "Parting", "is such", "sweet", "sorrow."
+      }
+   }
+}
+}
+
+$ h5dump -p -d "/DS1" -O vlstring.dmp -o vlstring.ascii -y --width=1 h5ex_t_vlstring.h5
+
+$ h5import vlstring.ascii -c vlstring.dmp -o new-vlstring.h5
+
+$ h5dump new-vlstring.h5
+HDF5 "new-vlstring.h5" {
+GROUP "/" {
+   DATASET "DS1" {
+      DATATYPE  H5T_STRING {
+         STRSIZE H5T_VARIABLE;
+         STRPAD H5T_STR_NULLTERM;
+         CSET H5T_CSET_ASCII;
+         CTYPE H5T_C_S1;
+      }
+      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) }
+      DATA {
+      (0): "Parting", "is such", "sweet", "sorrow."
+      }
+   }
+}
+\endcode
+
+<hr>
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref ViewToolsCommand
+
+*/
diff --git a/doxygen/dox/ViewToolsJPSS.dox b/doxygen/dox/ViewToolsJPSS.dox
new file mode 100644
index 0000000..9c15395
--- /dev/null
+++ b/doxygen/dox/ViewToolsJPSS.dox
@@ -0,0 +1,763 @@
+/** @page ViewToolsJPSS Use Case: Examining a JPSS NPP File With HDF5 Tools
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref ViewToolsCommand
+<hr>
+
+\section secViewToolsJPSSTOC Contents
+<ul>
+<li>\ref secViewToolsJPSSDeter</li>
+<li>\ref secViewToolsJPSSView</li>
+<li>\ref secViewToolsJPSSExam</li>
+</ul>
+
+This tutorial illustrates how to use the HDF5 tools to examine NPP files from the JPSS project. The following files are discussed:
+\code
+SVM09_npp_d20120229_t0849107_e0854511_b01759_c20120229145452682127_noaa_ops.h5 (<a href="https://support.hdfgroup.org/ftp/HDF5/examples/files/tutorial/SVM09_npp_d20120229_t0849107_e0854511_b01759_c20120229145452682127_noaa_ops.h5.gz">gzipped file</a>)
+SVM01_npp_d20130524_t1255132_e1256374_b08146_c20130524192048864992_noaa_ops.h5 (<a href="https://support.hdfgroup.org/ftp/HDF5/examples/files/tutorial/SVM01_npp_d20130524_t1255132_e1256374_b08146_c20130524192048864992_noaa_ops.h5.gz">gzipped file</a>)
+\endcode
+
+\section secViewToolsJPSSDeter Determining File Contents
+The first thing you may want to do is determine what is in your file. You can use the command-line tools or HDFView to do this:
+\li @ref subsecViewToolsJPSSDeter_h5dump
+\li @ref subsecViewToolsJPSSDeter_h5ls
+\li @ref subsecViewToolsJPSSDeter_HDFView
+
+JPSS NPP files all contain two root level groups:
+<table>
+<tr>
+<th>Group</th><th>Description</th>
+</tr>
+<tr>
+<td>/All_Data
+</td>
+<td>Contains the raw data and optional geo-location information.
+</td>
+</tr>
+<tr>
+<td>/Data_Products
+</td>
+<td>Contains a dataset ending in <code style="background-color:whitesmoke;">Aggr</code> with
+references to objects in the <code style="background-color:whitesmoke;">/All_Data</code> group.
+Contains granules (datasets with a name ending in <code style="background-color:whitesmoke;">Gran_#</code>)
+with references to selected regions in datasets under <code style="background-color:whitesmoke;">/All_Data</code>.
+</td>
+</tr>
+</table>
+
+\subsection subsecViewToolsJPSSDeter_h5dump h5dump
+With <code style="background-color:whitesmoke;">h5dump</code> you can see a list of the objects
+in the file using the <code style="background-color:whitesmoke;">-n</code> option:
+\code
+h5dump -n <file>
+\endcode
+
+For example:
+\code
+$ h5dump -n SVM09_npp_d20120229_t0849107_e0854511_b01759_c20120229145452682127_noaa_ops.h5
+HDF5 "SVM09_npp_d20120229_t0849107_e0854511_b01759_c20120229145452682127_noaa_ops.h5" {
+FILE_CONTENTS {
+ group      /
+ group      /All_Data
+ group      /All_Data/VIIRS-M9-SDR_All
+ dataset    /All_Data/VIIRS-M9-SDR_All/ModeGran
+ dataset    /All_Data/VIIRS-M9-SDR_All/ModeScan
+ dataset    /All_Data/VIIRS-M9-SDR_All/NumberOfBadChecksums
+ dataset    /All_Data/VIIRS-M9-SDR_All/NumberOfDiscardedPkts
+ dataset    /All_Data/VIIRS-M9-SDR_All/NumberOfMissingPkts
+ dataset    /All_Data/VIIRS-M9-SDR_All/NumberOfScans
+ dataset    /All_Data/VIIRS-M9-SDR_All/PadByte1
+ dataset    /All_Data/VIIRS-M9-SDR_All/QF1_VIIRSMBANDSDR
+ dataset    /All_Data/VIIRS-M9-SDR_All/QF2_SCAN_SDR
+ dataset    /All_Data/VIIRS-M9-SDR_All/QF3_SCAN_RDR
+ dataset    /All_Data/VIIRS-M9-SDR_All/QF4_SCAN_SDR
+ dataset    /All_Data/VIIRS-M9-SDR_All/QF5_GRAN_BADDETECTOR
+ dataset    /All_Data/VIIRS-M9-SDR_All/Radiance
+ dataset    /All_Data/VIIRS-M9-SDR_All/RadianceFactors
+ dataset    /All_Data/VIIRS-M9-SDR_All/Reflectance
+ dataset    /All_Data/VIIRS-M9-SDR_All/ReflectanceFactors
+ group      /Data_Products
+ group      /Data_Products/VIIRS-M9-SDR
+ dataset    /Data_Products/VIIRS-M9-SDR/VIIRS-M9-SDR_Aggr
+ dataset    /Data_Products/VIIRS-M9-SDR/VIIRS-M9-SDR_Gran_0
+ dataset    /Data_Products/VIIRS-M9-SDR/VIIRS-M9-SDR_Gran_1
+ dataset    /Data_Products/VIIRS-M9-SDR/VIIRS-M9-SDR_Gran_2
+ dataset    /Data_Products/VIIRS-M9-SDR/VIIRS-M9-SDR_Gran_3
+ }
+}
+\endcode
+
+In the output above you can see that there are four granules (ending in
+<code style="background-color:whitesmoke;">Gran_#</code>) in the
+<code style="background-color:whitesmoke;">/Data_Products/VIIRS-M9-SDR/</code> group.
+
+\subsection subsecViewToolsJPSSDeter_h5ls h5ls
+With <code style="background-color:whitesmoke;">h5ls</code> you can see a list of the objects in the
+file using the <code style="background-color:whitesmoke;">-lr</code>
+options. The <code style="background-color:whitesmoke;">h5ls</code> utility also shows shape and size
+(dataspace) information about datasets.
+\code
+h5ls -lr <file>
+\endcode
+
+For example:
+\code
+$ h5ls -lr SVM09_npp_d20120229_t0849107_e0854511_b01759_c20120229145452682127_noaa_ops.h5
+/                        Group
+/All_Data                Group
+/All_Data/VIIRS-M9-SDR_All Group
+/All_Data/VIIRS-M9-SDR_All/ModeGran Dataset {4/Inf}
+/All_Data/VIIRS-M9-SDR_All/ModeScan Dataset {192/Inf}
+/All_Data/VIIRS-M9-SDR_All/NumberOfBadChecksums Dataset {192/Inf}
+/All_Data/VIIRS-M9-SDR_All/NumberOfDiscardedPkts Dataset {192/Inf}
+/All_Data/VIIRS-M9-SDR_All/NumberOfMissingPkts Dataset {192/Inf}
+/All_Data/VIIRS-M9-SDR_All/NumberOfScans Dataset {4/Inf}
+/All_Data/VIIRS-M9-SDR_All/PadByte1 Dataset {12/Inf}
+/All_Data/VIIRS-M9-SDR_All/QF1_VIIRSMBANDSDR Dataset {3072/Inf, 3200/Inf}
+/All_Data/VIIRS-M9-SDR_All/QF2_SCAN_SDR Dataset {192/Inf}
+/All_Data/VIIRS-M9-SDR_All/QF3_SCAN_RDR Dataset {192/Inf}
+/All_Data/VIIRS-M9-SDR_All/QF4_SCAN_SDR Dataset {3072/Inf}
+/All_Data/VIIRS-M9-SDR_All/QF5_GRAN_BADDETECTOR Dataset {64/Inf}
+/All_Data/VIIRS-M9-SDR_All/Radiance Dataset {3072/Inf, 3200/Inf}
+/All_Data/VIIRS-M9-SDR_All/RadianceFactors Dataset {8/Inf}
+/All_Data/VIIRS-M9-SDR_All/Reflectance Dataset {3072/Inf, 3200/Inf}
+/All_Data/VIIRS-M9-SDR_All/ReflectanceFactors Dataset {8/Inf}
+/Data_Products           Group
+/Data_Products/VIIRS-M9-SDR Group
+/Data_Products/VIIRS-M9-SDR/VIIRS-M9-SDR_Aggr Dataset {16/Inf}
+/Data_Products/VIIRS-M9-SDR/VIIRS-M9-SDR_Gran_0 Dataset {16/Inf}
+/Data_Products/VIIRS-M9-SDR/VIIRS-M9-SDR_Gran_1 Dataset {16/Inf}
+/Data_Products/VIIRS-M9-SDR/VIIRS-M9-SDR_Gran_2 Dataset {16/Inf}
+/Data_Products/VIIRS-M9-SDR/VIIRS-M9-SDR_Gran_3 Dataset {16/Inf}
+\endcode
+Note that the <code style="background-color:whitesmoke;">Inf</code> indicates that those datasets are appendable or unlimited in size.
+
+\subsection subsecViewToolsJPSSDeter_HDFView HDFView
+If you open the file in HDFView, it will display the file and the root level groups within
+it in the TreeView on the left. An HDF5 file is a folder with a "5" in the middle, followed
+by the file name. There are two folders (groups) within the JPSS file
+(<code style="background-color:whitesmoke;">All_Data/</code> and <code style="background-color:whitesmoke;">Data Products/</code>),
+which you can select to see their contents:
+<table>
+<tr>
+<td>
+\image html hdfview-tree.png 
+</td>
+</tr>
+</table>
+
+If you click twice with the left-mouse button on a folder or group in the TreeView, the contents
+of the folder will be listed. If you click twice on an object such as a dataset, a window with
+the object's values will be displayed.
+
+Underneath the <code style="background-color:whitesmoke;">VIIRS-M1-SDR</code> folder are what HDF5
+calls datasets. The scarlet letter <code style="background-color:whitesmoke;">"A"</code> attached
+to the group and datasets under <code style="background-color:whitesmoke;">Data_Products/</code>
+indicates that there are attributes associated with them.
+
+\section secViewToolsJPSSView Viewing the User Block
+All JPSS files contain a user block in XML with information about the file. The user block is an
+optional space allocated at the beginning of an HDF5 file that is not interpreted by the HDF5
+library. Its size is a multiple of 512.
+
+Since the user block in JPSS files is stored in ASCII and it is stored at the beginning of an
+HDF5 file, you could use a text editor or viewer to examine it. However, there are HDF5 utilities
+that can help with this:
+<table>
+<tr>
+<th>Utility</th><th>Description</th>
+</tr>
+<tr>
+<td>h5unjam
+</td>
+<td>Extracts a user block from an HDF5 file
+</td>
+</tr>
+<tr>
+<td>h5dump
+</td>
+<td>The -B (--superblock) option displays the size of the user block in an HDF5 file
+</td>
+</tr>
+</table>
+
+\subsection subsecViewToolsJPSSView_h5unjam h5unjam
+The \ref secViewToolsEditAdd tutorial topic discusses the use of the
+<code style="background-color:whitesmoke;">h5jam</code> and <code style="background-color:whitesmoke;">h5unjam</code>
+utilities for adding or removing a user block from a file. An input HDF5 file
+(<code style="background-color:whitesmoke;">-i</code>), output HDF5 file
+(<code style="background-color:whitesmoke;">-o</code>), and user block text file
+(<code style="background-color:whitesmoke;">-u</code>) can be specified with these tools. You can use the
+<code style="background-color:whitesmoke;">h5unjam</code> tool to extract and view the user block in a JPSS file:
+\code
+h5unjam -i <Input HDF5 File> -o <Output HDF5 File> -u <User Block File>
+\endcode
+
+For example this command will extract the user block into the file UB.xml:
+\code
+$ h5unjam -i SVM09_npp_d20120229_t0849107_e0854511_b01759_c20120229145452682127_noaa_ops.h5 
+          -o svm09-noUB.h5 -u UB.xml
+\endcode
+
+The input HDF5 file remains unchanged. The output HDF5 file will not contain the user block.
+The <code style="background-color:whitesmoke;">UB.xml</code> file contains the user block
+which can be viewed with a browser.
+
+\subsection subsecViewToolsJPSSView_h5dump h5dump
+The h5dump utility has the <code style="background-color:whitesmoke;">-B (--superblock)</code> option for displaying the superblock in an HDF5 file.
+The superblock contains information about the file such as the file signature, file consistency flags,
+the number of bytes to store addresses and size of an object, as well as the size of the user block:
+\code
+h5dump -B (--superblock)
+\endcode
+
+Below is an example (Unix):
+\code
+$ h5dump -B -H SVM09_npp_d20120229_t0849107_e0854511_b01759_c20120229145452682127_noaa_ops.h5 | more
+HDF5 "SVM09_npp_d20120229_t0849107_e0854511_b01759_c20120229145452682127_noaa_ops.h5" {
+SUPER_BLOCK {
+   SUPERBLOCK_VERSION 0
+   FREELIST_VERSION 0
+   SYMBOLTABLE_VERSION 0
+   OBJECTHEADER_VERSION 0
+   OFFSET_SIZE 8
+   LENGTH_SIZE 8
+   BTREE_RANK 16
+   BTREE_LEAF 4
+   ISTORE_K 32
+   USER_BLOCK {
+      USERBLOCK_SIZE 1024
+   }
+}
+\endcode
+
+Once you have the size of the user block, you can extract it from the file using system commands.
+For example, on Unix platforms you can use the head command-line tool:
+\code
+head -c <USERBLOCK_SIZE> <JPSS File> >& USERBLOCK.xml
+\endcode
+
+There are Unix tools for Windows that may work, such as <a href="http://gnuwin32.sourceforge.net/packages/coreutils.htm">CoreUtils for Windows</a>.
+
+\section secViewToolsJPSSExam Examining a Granule
+<ul>
+<li>@ref subsecViewToolsJPSSExam_h5dump<br />
+<ul>
+<li>@ref subsubsecViewToolsJPSSExam_h5dumpRegRef</li>
+<li>@ref subsubsecViewToolsJPSSExam_h5dumpQuality</li>
+<li>@ref subsubsecViewToolsJPSSExam_h5dumpProps</li>
+</ul></li>
+<li>@ref subsecViewToolsJPSSExamr_HDFView</li>
+</ul>
+
+\subsection subsecViewToolsJPSSExam_h5dump h5dump
+There are several options that you may first want to use when examining a granule with h5dump:
+<table>
+<tr>
+<th>Option</th><th>Description</th>
+</tr>
+<tr>
+<td>-H, --header
+</td>
+<td>Prints header (metadata) information only
+</td>
+</tr>
+<tr>
+<td>-d D, --dataset=D
+</td>
+<td>Specifies the granule dataset
+</td>
+</tr>
+<tr>
+<td>-A 0, --onlyattr=0
+</td>
+<td>Suppresses attributes
+</td>
+</tr>
+<tr>
+<td>-p, --properties
+</td>
+<td>Show properties of datasets
+(See Properties)
+</td>
+</tr>
+</table>
+
+You would specify the dataset (<code style="background-color:whitesmoke;">-d D</code>) and the
+<code style="background-color:whitesmoke;">-H</code> options to view the metadata associated with
+a specific granule. There are many attributes associated with a granule and
+<code style="background-color:whitesmoke;">-A 0</code> can be used to suppress those.
+
+For example:
+\code
+h5dump -H -A 0 -d "/Data_Products/VIIRS-M9-SDR/VIIRS-M9-SDR_Gran_0" 
+        SVM09_npp_d20120229_t0849107_e0854511_b01759_c20120229145452682127_noaa_ops.h5
+\endcode
+
+This command displays:
+\code
+   HDF5 "SVM09_npp_d20120229_t0849107_e0854511_b01759_c20120229145452682127_noaa_ops.h5" {
+   DATASET "/Data_Products/VIIRS-M9-SDR/VIIRS-M9-SDR_Gran_0" {
+      DATATYPE  H5T_REFERENCE { H5T_STD_REF_DSETREG }
+      DATASPACE  SIMPLE { ( 16 ) / ( H5S_UNLIMITED ) }
+   }
+   }
+\endcode
+
+To see the actual contents of the granule remove the <code style="background-color:whitesmoke;">-H</code> option:
+\code
+h5dump -A 0 -d "/Data_Products/VIIRS-M9-SDR/VIIRS-M9-SDR_Gran_0" 
+       SVM09_npp_d20120229_t0849107_e0854511_b01759_c20120229145452682127_noaa_ops.h5
+\endcode
+
+The above command displays:
+\code
+HDF5 "SVM09_npp_d20120229_t0849107_e0854511_b01759_c20120229145452682127_noaa_ops.h5" {
+DATASET "/Data_Products/VIIRS-M9-SDR/VIIRS-M9-SDR_Gran_0" {
+   DATATYPE  H5T_REFERENCE { H5T_STD_REF_DSETREG }
+   DATASPACE  SIMPLE { ( 16 ) / ( H5S_UNLIMITED ) }
+   DATA {
+      DATASET /All_Data/VIIRS-M9-SDR_All/Radiance {(0,0)-(767,3199)},
+      DATASET /All_Data/VIIRS-M9-SDR_All/Reflectance {(0,0)-(767,3199)},
+      DATASET /All_Data/VIIRS-M9-SDR_All/ModeScan {(0)-(47)},
+      DATASET /All_Data/VIIRS-M9-SDR_All/ModeGran {(0)-(0)},
+      DATASET /All_Data/VIIRS-M9-SDR_All/PadByte1 {(0)-(2)},
+      DATASET /All_Data/VIIRS-M9-SDR_All/NumberOfScans {(0)-(0)},
+      DATASET /All_Data/VIIRS-M9-SDR_All/NumberOfMissingPkts {(0)-(47)},
+      DATASET /All_Data/VIIRS-M9-SDR_All/NumberOfBadChecksums {(0)-(47)},
+      DATASET /All_Data/VIIRS-M9-SDR_All/NumberOfDiscardedPkts {(0)-(47)},
+      DATASET /All_Data/VIIRS-M9-SDR_All/QF1_VIIRSMBANDSDR {(0,0)-(767,3199)},
+      DATASET /All_Data/VIIRS-M9-SDR_All/QF2_SCAN_SDR {(0)-(47)},
+      DATASET /All_Data/VIIRS-M9-SDR_All/QF3_SCAN_RDR {(0)-(47)},
+      DATASET /All_Data/VIIRS-M9-SDR_All/QF4_SCAN_SDR {(0)-(767)},
+      DATASET /All_Data/VIIRS-M9-SDR_All/QF5_GRAN_BADDETECTOR {(0)-(15)},
+      DATASET /All_Data/VIIRS-M9-SDR_All/RadianceFactors {(0)-(1)},
+      DATASET /All_Data/VIIRS-M9-SDR_All/ReflectanceFactors {(0)-(1)}
+   }
+}
+}
+\endcode
+
+As you can see in the output above, the datatype for this dataset is:
+\code
+DATATYPE  H5T_REFERENCE { H5T_STD_REF_DSETREG }
+\endcode
+
+This indicates that it is a dataset specifically for storing references to regions (or subsets)
+in other datasets. The dataset contains 16 such references, and more can be added to it, as
+indicated by the dataspace (in other words it is unlimited):
+\code
+DATASPACE  SIMPLE { ( 16 ) / ( H5S_UNLIMITED ) }
+\endcode
+
+\subsubsection subsubsecViewToolsJPSSExam_h5dumpRegRef Viewing a Region Reference
+What if we wanted to look at the <code style="background-color:whitesmoke;">NumberOfScans</code> data for a specific granule in a file?
+
+First, we may be interested in determining whether the scans were done at night or in the day. If a scan was at night, there will be no data.
+
+The attribute <code style="background-color:whitesmoke;">N_Day_Night_Flag</code> is used to determine when the scan was done. If you don't know where this attribute is located, you can use the <code style="background-color:whitesmoke;">-N</code> option to search for it in the file. If you were to run this command on the <code style="background-color:whitesmoke;">SVM09</code> file used above, you would see that the <code style="background-color:whitesmoke;">N_Day_Night_Flag</code> attribute has a value of <code style="background-color:whitesmoke;">Night</code> for the four granules in the file. Indeed, if you actually examine the <code style="background-color:whitesmoke;">NumberOfScans</code> data, you will see that only fill values are written.
+
+For that reason we will examine the <code style="background-color:whitesmoke;">NumberOfScans</code> data for the <code style="background-color:whitesmoke;">SVMO1</code> file below, as it was obtained during the day:
+\code
+h5dump -N N_Day_Night_Flag SVM01_npp_d20130524_t1255132_e1256374_b08146_c20130524192048864992_noaa_ops.h5
+\endcode
+
+It displays:
+\code
+HDF5 "SVM01_npp_d20130524_t1255132_e1256374_b08146_c20130524192048864992_noaa_ops.h5" {
+ATTRIBUTE "N_Day_Night_Flag" {
+   DATATYPE  H5T_STRING {
+      STRSIZE 4;
+      STRPAD H5T_STR_NULLTERM;
+      CSET H5T_CSET_ASCII;
+      CTYPE H5T_C_S1;
+   }
+   DATASPACE  SIMPLE { ( 1, 1 ) / ( 1, 1 ) }
+   DATA {
+   (0,0): "Day"
+   }
+}
+}
+\endcode
+
+There is just one granule in this <code style="background-color:whitesmoke;">SVM01</code> file, as shown below:
+\code
+$ h5dump -n SVM01_npp_d20130524_t1255132_e1256374_b08146_c20130524192048864992_noaa_ops.h5
+HDF5 "SVM01_npp_d20130524_t1255132_e1256374_b08146_c20130524192048864992_noaa_ops.h5" {
+FILE_CONTENTS {
+ group      /
+ group      /All_Data
+ group      /All_Data/VIIRS-M1-SDR_All
+ dataset    /All_Data/VIIRS-M1-SDR_All/ModeGran
+ dataset    /All_Data/VIIRS-M1-SDR_All/ModeScan
+ dataset    /All_Data/VIIRS-M1-SDR_All/NumberOfBadChecksums
+ dataset    /All_Data/VIIRS-M1-SDR_All/NumberOfDiscardedPkts
+ dataset    /All_Data/VIIRS-M1-SDR_All/NumberOfMissingPkts
+ dataset    /All_Data/VIIRS-M1-SDR_All/NumberOfScans
+ dataset    /All_Data/VIIRS-M1-SDR_All/PadByte1
+ dataset    /All_Data/VIIRS-M1-SDR_All/QF1_VIIRSMBANDSDR
+ dataset    /All_Data/VIIRS-M1-SDR_All/QF2_SCAN_SDR
+ dataset    /All_Data/VIIRS-M1-SDR_All/QF3_SCAN_RDR
+ dataset    /All_Data/VIIRS-M1-SDR_All/QF4_SCAN_SDR
+ dataset    /All_Data/VIIRS-M1-SDR_All/QF5_GRAN_BADDETECTOR
+ dataset    /All_Data/VIIRS-M1-SDR_All/Radiance
+ dataset    /All_Data/VIIRS-M1-SDR_All/RadianceFactors
+ dataset    /All_Data/VIIRS-M1-SDR_All/Reflectance
+ dataset    /All_Data/VIIRS-M1-SDR_All/ReflectanceFactors
+ group      /Data_Products
+ group      /Data_Products/VIIRS-M1-SDR
+ dataset    /Data_Products/VIIRS-M1-SDR/VIIRS-M1-SDR_Aggr
+ dataset    /Data_Products/VIIRS-M1-SDR/VIIRS-M1-SDR_Gran_0
+ }
+}
+\endcode
+
+Now examine the references in the <code style="background-color:whitesmoke;">VIIRS-M1-SDR_Gran_0</code> granule
+\code
+$ h5dump -A 0 -d "/Data_Products/VIIRS-M1-SDR/VIIRS-M1-SDR_Gran_0" 
+       SVM01_npp_d20130524_t1255132_e1256374_b08146_c20130524192048864992_noaa_ops.h5
+HDF5 "SVM01_npp_d20130524_t1255132_e1256374_b08146_c20130524192048864992_noaa_ops.h5" {
+DATASET "/Data_Products/VIIRS-M1-SDR/VIIRS-M1-SDR_Gran_0" {
+   DATATYPE  H5T_REFERENCE { H5T_STD_REF_DSETREG }
+   DATASPACE  SIMPLE { ( 16 ) / ( H5S_UNLIMITED ) }
+   DATA {
+      DATASET /All_Data/VIIRS-M1-SDR_All/Radiance {(0,0)-(767,3199)},
+      DATASET /All_Data/VIIRS-M1-SDR_All/Reflectance {(0,0)-(767,3199)},
+      DATASET /All_Data/VIIRS-M1-SDR_All/ModeScan {(0)-(47)},
+      DATASET /All_Data/VIIRS-M1-SDR_All/ModeGran {(0)-(0)},
+      DATASET /All_Data/VIIRS-M1-SDR_All/PadByte1 {(0)-(2)},
+      DATASET /All_Data/VIIRS-M1-SDR_All/NumberOfScans {(0)-(0)},
+      DATASET /All_Data/VIIRS-M1-SDR_All/NumberOfMissingPkts {(0)-(47)},
+      DATASET /All_Data/VIIRS-M1-SDR_All/NumberOfBadChecksums {(0)-(47)},
+      DATASET /All_Data/VIIRS-M1-SDR_All/NumberOfDiscardedPkts {(0)-(47)},
+      DATASET /All_Data/VIIRS-M1-SDR_All/QF1_VIIRSMBANDSDR {(0,0)-(767,3199)},
+      DATASET /All_Data/VIIRS-M1-SDR_All/QF2_SCAN_SDR {(0)-(47)},
+      DATASET /All_Data/VIIRS-M1-SDR_All/QF3_SCAN_RDR {(0)-(47)},
+      DATASET /All_Data/VIIRS-M1-SDR_All/QF4_SCAN_SDR {(0)-(767)},
+      DATASET /All_Data/VIIRS-M1-SDR_All/QF5_GRAN_BADDETECTOR {(0)-(15)},
+      DATASET /All_Data/VIIRS-M1-SDR_All/RadianceFactors {(0)-(1)},
+      DATASET /All_Data/VIIRS-M1-SDR_All/ReflectanceFactors {(0)-(1)}
+   }
+}
+}
+\endcode
+
+In the output above, you can see that the <code style="background-color:whitesmoke;">NumberOfScans</code>
+reference is the sixth reference in the granule counting from the top.
+
+The list of references shown above is a 0-based index to the dataset. Therefore, to specify
+<code style="background-color:whitesmoke;">NumberOfScans</code>, enter a start offset of
+<code style="background-color:whitesmoke;">5</code> for the <code style="background-color:whitesmoke;">-s</code>
+option (the sixth reference minus 1). To see the region reference data, use the <code style="background-color:whitesmoke;">-R</code> option.
+
+This command will display the data in the <code style="background-color:whitesmoke;">NumberOfScans</code> region reference:
+\code
+h5dump -A 0 -d "/Data_Products/VIIRS-M1-SDR/VIIRS-M1-SDR_Gran_0" -s 5 -R
+       SVM01_npp_d20130524_t1255132_e1256374_b08146_c20130524192048864992_noaa_ops.h5
+\endcode
+
+It displays the number of scans (48):
+\code
+HDF5 "SVM01_npp_d20130524_t1255132_e1256374_b08146_c20130524192048864992_noaa_ops.h5" {
+DATASET "/Data_Products/VIIRS-M1-SDR/VIIRS-M1-SDR_Gran_0" {
+   DATATYPE  H5T_REFERENCE { H5T_STD_REF_DSETREG }
+   DATASPACE  SIMPLE { ( 16 ) / ( H5S_UNLIMITED ) }
+   SUBSET {
+      START ( 5 );
+      STRIDE ( 1 );
+      COUNT ( 1 );
+      BLOCK ( 1 );
+      DATA {
+      (5): DATASET /All_Data/VIIRS-M1-SDR_All/NumberOfScans {
+         (5): REGION_TYPE BLOCK  (0)-(0)
+         (5): DATATYPE  H5T_STD_I32BE
+         (5): DATASPACE  SIMPLE { ( 1 ) / ( H5S_UNLIMITED ) }
+         (5): DATA {
+            (0): 48
+         (5):  }
+      (5): }
+      }
+   }
+}
+}
+\endcode
+
+The <code style="background-color:whitesmoke;">-s</code> option may be familiar as one of the options
+that was described in the \ref secViewToolsViewSub tutorial topic. The other subsetting options are not included,
+indicating that the default values are used.
+
+If you leave off the <code style="background-color:whitesmoke;">-R</code> option, you will see the subset selection, but not the data:
+\code
+$ h5dump -A 0 -d "/Data_Products/VIIRS-M1-SDR/VIIRS-M1-SDR_Gran_0" -s 5 
+   SVM01_npp_d20130524_t1255132_e1256374_b08146_c20130524192048864992_noaa_ops.h5
+HDF5 "SVM01_npp_d20130524_t1255132_e1256374_b08146_c20130524192048864992_noaa_ops.h5" {
+DATASET "/Data_Products/VIIRS-M1-SDR/VIIRS-M1-SDR_Gran_0" {
+   DATATYPE  H5T_REFERENCE { H5T_STD_REF_DSETREG }
+   DATASPACE  SIMPLE { ( 16 ) / ( H5S_UNLIMITED ) }
+   SUBSET {
+      START ( 5 );
+      STRIDE ( 1 );
+      COUNT ( 1 );
+      BLOCK ( 1 );
+      DATA {
+         DATASET /All_Data/VIIRS-M1-SDR_All/NumberOfScans {(0)-(0)}
+      }
+   }
+}
+}
+\endcode
+
+\subsubsection subsubsecViewToolsJPSSExam_h5dumpQuality Viewing a Quality Flag
+The quality flags in an NPP file can be viewed with h5dump using the <code style="background-color:whitesmoke;">-M</code>
+option. Quality flags are packed into each integer value in a quality flag dataset. Quality flag datasets in NPP
+files begin with the letters <code style="background-color:whitesmoke;">QF</code>.
+
+In the following NPP file, there are five Quality Flag datasets
+(<code style="background-color:whitesmoke;">/All_Data/VIIRS-M1-SDR_All/QF*</code>):
+\code
+$ h5dump -n SVM01_npp_d20130524_t1255132_e1256374_b08146_c20130524192048864992_noaa_ops.h5
+HDF5 "SVM01_npp_d20130524_t1255132_e1256374_b08146_c20130524192048864992_noaa_ops.h5" {
+FILE_CONTENTS {
+ group      /
+ group      /All_Data
+ group      /All_Data/VIIRS-M1-SDR_All
+ dataset    /All_Data/VIIRS-M1-SDR_All/ModeGran
+ dataset    /All_Data/VIIRS-M1-SDR_All/ModeScan
+ dataset    /All_Data/VIIRS-M1-SDR_All/NumberOfBadChecksums
+ dataset    /All_Data/VIIRS-M1-SDR_All/NumberOfDiscardedPkts
+ dataset    /All_Data/VIIRS-M1-SDR_All/NumberOfMissingPkts
+ dataset    /All_Data/VIIRS-M1-SDR_All/NumberOfScans
+ dataset    /All_Data/VIIRS-M1-SDR_All/PadByte1
+ dataset    /All_Data/VIIRS-M1-SDR_All/QF1_VIIRSMBANDSDR
+ dataset    /All_Data/VIIRS-M1-SDR_All/QF2_SCAN_SDR
+ dataset    /All_Data/VIIRS-M1-SDR_All/QF3_SCAN_RDR
+ dataset    /All_Data/VIIRS-M1-SDR_All/QF4_SCAN_SDR
+ dataset    /All_Data/VIIRS-M1-SDR_All/QF5_GRAN_BADDETECTOR
+ dataset    /All_Data/VIIRS-M1-SDR_All/Radiance
+ dataset    /All_Data/VIIRS-M1-SDR_All/RadianceFactors
+ dataset    /All_Data/VIIRS-M1-SDR_All/Reflectance
+ dataset    /All_Data/VIIRS-M1-SDR_All/ReflectanceFactors
+ group      /Data_Products
+ group      /Data_Products/VIIRS-M1-SDR
+ dataset    /Data_Products/VIIRS-M1-SDR/VIIRS-M1-SDR_Aggr
+ dataset    /Data_Products/VIIRS-M1-SDR/VIIRS-M1-SDR_Gran_0
+ }
+}
+\endcode
+
+The flags in this particular dataset happen to be stored in every two bits of each quality flag dataset
+element, and the values range from 0 to 2. In other words, to see the quality flag values for this
+dataset, these bits would be examined: 0 and 1, 2 and 3, 4 and 5, or 6 and 7 (This information was
+obtained from the Product Profile XML File.)
+
+For example, bits 0 and 1 in the <code style="background-color:whitesmoke;">VQF1_VIIRSMBANDSDR</code> dataset specify the flag that
+"Indicates calibration quality due to bad space view offsets, OBC view offsets, etc or use of a
+previous calibration view". It has 3 values: Good (0), Poor (1), or No Calibration (2).
+
+The <code style="background-color:whitesmoke;">-M</code> option is used to specify the quality
+flag bit offset (<code style="background-color:whitesmoke;">O</code>) and length (<code style="background-color:whitesmoke;">L</code>):
+\code
+h5dump -d DATASET -M O,L FILE
+\endcode
+
+To view the first quality flag (0-1) in a 5 x 6 subset of the <code style="background-color:whitesmoke;">QF1_VIIRSMBANDSDR</code> dataset, specify:
+\code
+h5dump -d "/All_Data/VIIRS-M1-SDR_All/QF1_VIIRSMBANDSDR[0,0;;5,6;]" 
+       -M 0,2 SVM01_npp_d20130524_t1255132_e1256374_b08146_c20130524192048864992_noaa_ops.h5
+\endcode
+
+This outputs:
+\code
+HDF5 "SVM01_npp_d20130524_t1255132_e1256374_b08146_c20130524192048864992_noaa_ops.h5" {
+DATASET "/All_Data/VIIRS-M1-SDR_All/QF1_VIIRSMBANDSDR" {
+   DATATYPE  H5T_STD_U8BE
+   DATASPACE  SIMPLE { ( 768, 3200 ) / ( H5S_UNLIMITED, H5S_UNLIMITED ) }
+   PACKED_BITS OFFSET=0 LENGTH=2
+   SUBSET {
+      START ( 0, 0 );
+      STRIDE ( 1, 1 );
+      COUNT ( 5, 6 );
+      BLOCK ( 1, 1 );
+      DATA {
+      (0,0): 2, 2, 2, 2, 2, 2,
+      (1,0): 2, 2, 2, 2, 2, 2,
+      (2,0): 0, 0, 0, 0, 0, 0,
+      (3,0): 0, 0, 0, 0, 0, 0,
+      (4,0): 0, 0, 0, 0, 0, 0
+      }
+   }
+}
+}
+\endcode
+
+To view more than one quality flag at a time simply add the bit offset and length values to
+<code style="background-color:whitesmoke;">-M</code>, separated by commas. For example, this
+<code style="background-color:whitesmoke;">-M</code> option specifies bits 0-1 and 2-3:
+\code
+h5dump -d DATASET -M 0,2,2,2 FILE
+\endcode
+
+\subsubsection subsubsecViewToolsJPSSExam_h5dumpProps Properties
+To view properties of a specific dataset with <code style="background-color:whitesmoke;">h5dump</code>
+use the <code style="background-color:whitesmoke;">-p</code> option along with the
+<code style="background-color:whitesmoke;">-d</code> option. Depending on the number of attributes
+and the amount of data, the <code style="background-color:whitesmoke;">-A 0</code> and
+<code style="background-color:whitesmoke;">-H</code> options can also be specified to suppress
+printing of attributes and data values:
+\code
+h5dump -p -H -A 0 -d DATASET
+\endcode
+
+The <code style="background-color:whitesmoke;">-p</code> option shows any compression filters
+associated with a dataset, as well as layout and fill value information. This option can be helpful
+in diagnosing performance and other issues.
+
+As an example, examine the <code style="background-color:whitesmoke;">/All_Data/VIIRS-M1-SDR_All/Radiance</code>
+dataset in the <code style="background-color:whitesmoke;">SVM01</code> file:
+\code
+$ h5dump -p -H -A 0 -d "/All_Data/VIIRS-M1-SDR_All/Radiance" 
+   SVM01_npp_d20130524_t1255132_e1256374_b08146_c20130524192048864992_noaa_ops.h5
+HDF5 "SVM01_npp_d20130524_t1255132_e1256374_b08146_c20130524192048864992_noaa_ops.h5" {
+DATASET "/All_Data/VIIRS-M1-SDR_All/Radiance" {
+   DATATYPE  H5T_STD_U16BE
+   DATASPACE  SIMPLE { ( 768, 3200 ) / ( H5S_UNLIMITED, H5S_UNLIMITED ) }
+   STORAGE_LAYOUT {
+      CHUNKED ( 768, 3200 )
+      SIZE 4915200
+   }
+   FILTERS {
+      NONE
+   }
+   FILLVALUE {
+      FILL_TIME H5D_FILL_TIME_IFSET
+      VALUE  65529
+   }
+   ALLOCATION_TIME {
+      H5D_ALLOC_TIME_INCR
+   }
+}
+}
+\endcode
+
+We can see that the chunk size for this dataset is 768 x 3200, and the storage size is 4915200.
+
+What if the chunk size were smaller?
+
+The dataset was modified to have a chunk size of 1 x 10, using the
+<code style="background-color:whitesmoke;">h5repack</code> utility, as shown below.
+\code
+$ h5repack -l /All_Data/VIIRS-M1-SDR_All/Radiance:CHUNK=1x10 
+   SVM01_npp_d20130524_t1255132_e1256374_b08146_c20130524192048864992_noaa_ops.h5 SVM01repack.h5
+
+$ h5dump -p -H -A 0 -d "/All_Data/VIIRS-M1-SDR_All/Radiance" SVM01repack.h5
+HDF5 "SVM01repack.h5" {
+DATASET "/All_Data/VIIRS-M1-SDR_All/Radiance" {
+   DATATYPE  H5T_STD_U16BE
+   DATASPACE  SIMPLE { ( 768, 3200 ) / ( H5S_UNLIMITED, H5S_UNLIMITED ) }
+   STORAGE_LAYOUT {
+      CHUNKED ( 1, 10 )
+      SIZE 4915200
+   }
+   FILTERS {
+      NONE
+   }
+   FILLVALUE {
+      FILL_TIME H5D_FILL_TIME_IFSET
+      VALUE  65529
+   }
+   ALLOCATION_TIME {
+      H5D_ALLOC_TIME_INCR
+   }
+}
+}
+\endcode
+
+In this case, the storage size of the dataset is the same, but the size of the file almost doubled!:
+\code
+$ ls -1sh
+total 35M
+12M SVM01_npp_d20130524_t1255132_e1256374_b08146_c20130524192048864992_noaa_ops.h5
+23M SVM01repack.h5
+\endcode
+
+In general, the smaller the chunk size, the more chunks that HDF5 has to keep track of, which increases
+the size of the file and can affect performance.
+
+\subsection subsecViewToolsJPSSExamr_HDFView HDFView
+As mentioned previously, the structure of an HDF5 file is displayed in the TreeView on the left side of the HDFView screen,
+and you can click on objects and have metadata information displayed on the right side.
+
+To discover more about the granule <code style="background-color:whitesmoke;">/Data_Products/VIIRS-M1-SDR/VIIRS-M1-SDR_Gran_0</code>
+in the <code style="background-color:whitesmoke;">SVM01</code> file shown below in the TreeView, position
+the mouse over the granule and click to select. Properties for the object is displayed on the right side of the HDFView screen.
+You can see Datatype and Dataspace information on the <code style="background-color:whitesmoke;">General Object Info</code>
+tab, any Attributes associated with the granulewill be on the
+<code style="background-color:whitesmoke;">Object Attribute Info</code> tab. In the
+<code style="background-color:whitesmoke;">General Object Info</code>, you can see that the dataset is a
+Region Reference dataset, and that there are sixteen Region References in this dataset:
+<table>
+<tr>
+<td>
+\image html hdfview-prop.png 
+</td>
+</tr>
+</table>
+
+To examine the data in the granule, click twice on it with the left mouse button in the TreeView,
+and it will open in a new window.:
+<table>
+<tr>
+<td>
+\image html hdfview-regref.png 
+</td>
+</tr>
+</table>
+
+If you click twice with the left mouse button on the fifth Region Reference
+<code style="background-color:whitesmoke;">/All_Data/VIIRS-M1-SDR_All/NumberOfScans</code> a window
+will pop up with the value(s) of the reference:
+<table>
+<tr>
+<td>
+\image html hdfview-regref2.png 
+</td>
+</tr>
+</table>
+
+You can also set a user option to automatically show the value(s) in a Region Reference. Under the
+<code style="background-color:whitesmoke;">Tools</code> pull-down menu, select
+<code style="background-color:whitesmoke;">User Options</code> and then select
+<code style="background-color:whitesmoke;">HDF Settings</code> and then select
+<code style="background-color:whitesmoke;">Show RegRef Values</code> in the
+<code style="background-color:whitesmoke;">Data</code> section (see the middle of the image below):
+<table>
+<tr>
+<td>
+\image html hdfview-regrefval.png 
+</td>
+</tr>
+</table>
+
+Then you will automatically see the values of the Region Reference when you open it and select an entry:
+<table>
+<tr>
+<td>
+\image html hdfview-regref1.png 
+</td>
+</tr>
+</table>
+
+You can view and set quality flags by clicking the right mouse button over a quality flags dataset under
+<code style="background-color:whitesmoke;">All_Data</code> and selecting
+<code style="background-color:whitesmoke;">Open As</code> from the pop-up menu. In the middle of
+the window that pops up, you will see where you can specify <code style="background-color:whitesmoke;">Bitmask</code> options.
+<table>
+<tr>
+<td>
+\image html hdfview-qf.png 
+</td>
+</tr>
+</table>
+
+<hr>
+Navigate back: \ref index "Main" / \ref GettingStarted / \ref ViewToolsCommand
+
+*/
diff --git a/doxygen/dox/api-compat-macros.dox b/doxygen/dox/api-compat-macros.dox
new file mode 100644
index 0000000..4a1578d
--- /dev/null
+++ b/doxygen/dox/api-compat-macros.dox
@@ -0,0 +1,898 @@
+/** \page api-compat-macros API Compatibility Macros
+
+  \section audience Audience
+  The target audience for this document has existing applications that use the
+  HDF5 library, and is considering moving to the latest HDF5 release to take
+  advantage of the latest library features and enhancements.
+
+  \section compat-issues Compatibility Issues
+  With each major release of HDF5, such as 1.12 or 1.10, certain compatibility
+  issues must be considered when migrating applications from an earlier major
+  release.
+
+  This document describes the approach taken by The HDF Group to help existing
+  users of HDF5 address compatibility issues in the HDF5 API.
+
+  \section summary Summary and Motivation
+  In response to new and evolving requirements for the library and data format,
+  several basic functions have changed since HDF5 was first released. To allow
+  existing applications to continue to compile and run properly, all versions
+  of these functions have been retained in the later releases of the HDF5 library.
+
+  Given the scope of changes available with each major release of HDF5, and
+  recognizing the potentially time-consuming task of editing all the affected
+  calls in user applications, The HDF Group has created a set of macros that
+  can be used to flexibly and easily map existing API calls to previous release
+  functions. We refer to these as the \Emph{API compatibility macros}.
+
+  The HDF Group generally encourages users to update applications to work with
+  the latest HDF5 library release so that all new features and enhancements are
+  available to them. At the same time, The HDF Group understands that, under
+  some circumstances, updating applications may not be feasible or necessary.
+  The API compatibility macros, described in this document, provide a bridge
+  from old APIs to new and can be particularly helpful in situations such as these:
+  <ul>
+  <li>Source code is not available - only binaries are available; updating the
+      application is not feasible.</li>
+  <li>Source code is available, but there are no resources to update it.</li>
+  <li>Source code is available, as are resources to update it, but the old
+      version works quite well so updates are not a priority. At the same time,
+      it is desirable to take advantage of certain efficiencies in the newer HDF5
+      release that do not require code changes.</li>
+  <li>Source code is available, as are resources to update it, but the applications
+      are large or complex, and must continue to run while the code updates are
+      carried out.</li>
+  </ul>
+
+  \section using Understanding and Using the Macros
+  As part of latest HDF5 release, several functions that existed in previous
+  versions of the library were updated with new calling parameters and given
+  new names. The updated versions of the functions have a number (for, e.g., '2')
+  at the end of the original function name. The original versions of these
+  functions were retained and renamed to have an earlier number (for, e.g., '1')
+  at the end of the original function name.
+
+  For example, consider the function \Code{H5Lvisit} in HDF5 release 1.10
+  as compared with 1.12:
+
+  <table>
+  <tr>
+  <th>Original function name and signature in 1.10.0</th>
+  <td colspan="1">
+  \Code{herr_t H5Lvisit(hid_t grp_id, H5_index_t idx_type, H5_iter_order_t order, H5L_iterate_t op, void *op_data)}
+  </td>
+  </tr>
+  <tr>
+  <th>Updated function and signature, introduced in release 1.12.0</th>
+  <td colspan="1">
+  \Code{herr_t H5Lvisit2(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, H5L_iterate2_t op, void *op_data)}
+  </td>
+  </tr>
+  <tr><th>Original function and signature, renamed in release 1.12.0</th>
+  <td colspan="1">
+  \Code{herr_t H5Lvisit1(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, H5L_iterate1_t op, void *op_data)}
+  </td>
+  </tr>
+  <tr><th>API compatibility macro, introduced in release 1.12.0</th>
+  <td colspan="1">
+  \Code{H5Lvisit}
+  <p>The macro, \Code{H5Lvisit}, will be mapped to either \Code{H5Lvisit1} or
+     \Code{H5Lvisit2}. The mapping is determined by a combination of the
+     configuration options use to build the HDF5 library and compile-time
+     options used to build the application. The calling parameters used with the
+     \Code{H5Lvisit} compatibility macro should match the number and type of the
+     function the macros will be mapped to (\Code{H5Lvisit1} or \Code{H5Lvisit2}).
+  </p>
+  <p>The function names ending in '1' or '2' are referred to as \Emph{versioned names},
+     and the corresponding functions are referred to as \Emph{versioned functions}.
+     For new code development, The HDF Group recommends use of the compatibility macro
+     mapped to the latest version of the function. The original version of the function
+     should be considered deprecated and, in general, should not be used when developing
+     new code.
+  </p>
+  </td>
+  </tr>
+  </table>
+
+  \section options Compatibility Macro Mapping Options
+  To determine the mapping for a given API compatibility macro in a given application,
+  a combination of user-controlled selections, collectively referred to as the
+  \Emph{compatibility macro mapping options}, is considered in the following sequence:
+
+  <table border="0" style="width: 100.0%;">
+  <tr>
+  <td valign="top" width="50%">
+  <ol>
+  <li>What compatibility macro configuration option was used to build the HDF5 library?
+      We refer to this selection as the \Emph{library mapping}.</li>
+  <li>Was a compatibility macro global compile-time option specified when the application
+      was built? We refer to this (optional) selection as the \Emph{application mapping}.
+      If an application mapping exists, it overrides the library mapping.
+      \Emph{(See adjacent notes.)}</li>
+  <li>Were any compatibility macro function-level compile-time options specified when the
+      application was built? We refer to these (optional) selections as \Emph{function mappings}.
+      If function mappings exist, they override library and application mappings for the
+      relevant API compatibility macros. \Emph{(See adjacent notes.)}</li>
+  </ol>
+  </td>
+  <td valign="top" width="50%">
+  <table border="1" cellpadding="10" style="width: 100.0%;">
+  <tr><td>
+  \Bold{Notes:} An application mapping can map APIs to the same version or to a version
+  older than the configured library mapping. When the application attempts to map APIs
+  to a newer version of the API than the library was configured with, it will fail to
+  "upgrade" the mapping (and may fail silently).
+
+  When it is necessary to "upgrade" the macro mappings from those set in the library mapping,
+  it must be done at the per-function level, using the function-level mappings. As long as
+  one does not try to map a function to a version that was compiled out in the library mapping,
+  individual functions can be upgraded or downgraded freely.
+  </td>
+  </tr>
+  </table>
+  </td>
+  </tr>
+  </table>
+
+  \subsection lib-options Library Mapping Options
+  When the HDF5 library is built, \Code{configure} flags can be used to control the API
+  compatibility macro mapping behavior exhibited by the library. This behavior can be
+  overridden by application and function mappings. One configure flag excludes deprecated
+  functions from the HDF5 library, making them unavailable to applications linked with the
+  library.
+
+  <div align="center">Table 1:  Library Mapping Options
+  <table border="1" cellpadding="3">
+  <tr>
+  <th>\Code{configure} flag</th>
+  <th>Macros map to release <br/> (versioned function; \Code{H5Lvisit} shown)</th>
+  <th>Deprecated functions available? <br/> (\Code{H5Lvisit1})</th>
+  </tr>
+  <tr align="center">
+  <td>\Code{--with-default-api-version=v112} <br/> (the default in 1.12)</td>
+  <td>1.12.x (\Code{H5Lvisit2})</td>
+  <td>yes</td>
+  </tr>
+  <tr align="center">
+  <td align="left">\Code{--with-default-api-version=v110}</td>
+  <td>1.10.x (\Code{H5Lvisit1})</td>
+  <td>yes</td>
+  </tr>
+  <tr align="center">
+  <td align="left">\Code{--with-default-api-version=v18}</td>
+  <td>1.8.x (\Code{H5Lvisit1})</td>
+  <td>yes</td>
+  </tr>
+  <tr align="center">
+  <td align="left">\Code{--with-default-api-version=v16}</td>
+  <td>1.6.x (\Code{H5Lvisit1})</td>
+  <td>yes</td>
+  </tr>
+  <tr align="center">
+  <td align="left">\Code{--disable-deprecated-symbols}</td>
+  <td>1.12.x (\Code{H5Lvisit2})</td>
+  <td>no</td>
+  </tr>
+  </table>
+  </div>
+  Refer to the file \Code{libhdf5.settings} in the directory where the HDF5 library is
+  installed to determine the \Code{configure} flags used to build the library. In particular,
+  look for the two lines shown here under \Emph{Features}:
+
+  \Code{Default API mapping: v112}
+
+  \Code{With deprecated public symbols: yes}
+
+  \subsection app-options Application Mapping Options
+  When an application using HDF5 APIs is built and linked with the HDF5 library,
+  compile-time options to \Code{h5cc} can be used to control the API compatibility
+  macro mapping behavior exhibited by the application. The application mapping
+  overrides the behavior specified by the library mapping, and can be overridden
+  on a function-by-function basis by the function mappings.
+
+  If the HDF5 library was configured with the \Code{--disable-deprecated-symbols} flag, then
+  the deprecated functions will not be available, regardless of the application mapping options.
+
+  <div align="center">Table 2:  Application Mapping Options
+  <table border="1" cellpadding="3">
+  <tr>
+  <th>\Code{h5cc} option</th>
+  <th>Macros map to release <br/>(versioned function; \Code{H5Lvisit} shown)</th>
+  <th>Deprecated functions available? <br/>(\Code{H5Lvisit1})</th>
+  </tr>
+  <tr align="center">
+  <td align="left">\Code{-DH5_USE_112_API} <br/> \Emph{(Default behavior if no option specified.)}</td>
+  <td>1.12.x (\Code{HLvisit2})</td>
+  <td>yes* <br/> \Emph{*if available in library}</td>
+  </tr>
+  <tr align="center">
+  <td align="left">\Code{-DH5_USE_110_API}</td>
+  <td>1.10.x (\Code{HLvisit1})</td>
+  <td>yes* <br/> \Emph{*if available in library}</td>
+  </tr>
+  <tr align="center">
+  <td align="left">\Code{-DH5_USE_18_API}</td>
+  <td>1.8.x (\Code{H5Lvisit1})</td>
+  <td>yes* <br/> \Emph{*if available in library}</td>
+  </tr>
+  <tr align="center">
+  <td align="left">\Code{-DH5_USE_16_API}</td>
+  <td>1.6.x (\Code{H5Lvisit1})</td>
+  <td>yes* <br/> \Emph{*if available in library}</td>
+  </tr>
+  <tr align="center">
+  <td align="left">\Code{-DH5_NO_DEPRECATED_SYMBOLS}</td>
+  <td>1.10.x (\Code{H5Lvisit1})</td>
+  <td>no</td>
+  </tr>
+  </table>
+  </div>
+
+  \subsection fun-options Function Mapping Options
+  Function mappings are specified when the application is built. These mappings
+  can be used to control the mapping of the API compatibility macros to
+  underlying functions on a function-by-function basis. The function mappings
+  override the library and application mappings discussed earlier.
+
+  If the HDF5 library was configured with the \Code{--disable-deprecated-symbols}
+  flag, or \Code{-DH5_NO_DEPRECATED_SYMBOLS} is used to compile the application,
+  then the deprecated functions will not be available, regardless of the function
+  mapping options.
+
+  For every function with multiple available versions, a compile-time version flag
+  can be defined to selectively map the function macro to the desired versioned
+  function. The function mapping consists of the function name followed by
+  &quot;\Code{_vers}&quot; which is mapped by number to a specific function or
+  struct:
+  <table>
+  <tr>
+  <th>Macro</th>
+  <th>Function Mapping</th>
+  <th>Mapped to function or struct</th>
+  </tr>
+  <tr><td>\Code{H5xxx}</td>
+  <td>\Code{H5xxx_vers=1}</td>
+  <td>\Code{H5xxx1}</td>
+  </tr>
+  <tr>
+  <td> </td>
+  <td>\Code{H5xxx_vers=2}</td>
+  <td>\Code{H5xxx2}</td>
+  </tr>
+  </table>
+
+  For example, in version 1.10 the \Code{H5Rreference} macro can be mapped to
+  either \Code{H5Rreference1} or \Code{H5Rreference2}. When used, the value of
+  the \Code{H5Rreference_vers} compile-time version flag determines which
+  function will be called:
+
+  <ul>
+  <li>When \Code{H5Rreference_vers} is set to \Code{1}, the macro \Code{H5Rreference}
+      will be mapped to \Code{H5Rreference1}. <br/>
+      \Code{H5cc ... -DH5Rreference_vers=1 ...}</li>
+  <li>When \Code{H5Rdereference_vers} is set to \Code{2}, the macro \Code{H5Rdereference}
+      will be mapped to \Code{H5Rdereference2}. <br/>
+      \Code{h5cc ... -DH5Rreference_vers=2 ...}</li>
+  <li>When \Code{H5Rreference_vers} is not set, the macro \Code{H5Rreference} will be
+      mapped to either \Code{H5Rreference1} or \Code{H5Rreference2}, based on the
+      application mapping, if one was specified, or on the library mapping. <br/>
+      \Code{h5cc ... }</li>
+  </ul>
+
+  \warning Please be aware that some function mappings use mapped structures, as
+           well. If compiling an application with a function mapping that uses
+           a mapped structure, you must include each function and mapped structure
+           plus EVERY function that uses the mapped structure, whether or not that
+           function is used in the application. \Emph{In 1.12, mappings of structures
+           are used by the H5L and H5O function mappings.}\n\n
+           For example, an application \Code{application.c} only calls \Code{H5Lvisit},
+           \Code{H5Ovisit}, and \Code{H5Oget_info_by_name}. To compile this application
+           with 1.10 APIs in 1.12 with the function specific mappings, then not only must
+           \Code{H5Lvisit_vers}, \Code{H5Ovisit_vers}, and \Code{H5Oget_info_by_name_vers}
+           be specified on the command line, but the mapped structures and every
+           function that uses the mapped structures must be included, as well.
+           The full compile line is shown below:
+           \code{.sh}
+           h5cc -DH5Lvisit_vers=1 -DH5Ovisit_vers=1 -DH5Oget_info_by_name_vers=1 \
+                -DH5Lvisit_by_name_vers=1 -DH5Literate_vers=1 \
+                -DH5Literate_by_name_vers= -DH5O_info_t_vers=1 -DH5L_info_t_vers=1 \
+                -DH5L_iterate_t_vers=1 -DH5Lget_info_by_idx_vers=1 \
+                -DH5Lget_info_vers=1 application.c
+           \endcode
+
+  \subsubsection fun-options-112 Function Mapping Options in Releases 1.12.x
+  <table>
+  <tr>
+  <th style="text-align: left;">Macro <br/> (\Code{H5xxx})</th>
+  <th>Default function used if no macro specified
+  <ul><li>Function/struct mapping:\Code{H5xxx_vers=N}</li></ul>
+  </th>
+  <th>Function used  if specifying 1.10
+  <ul><li>Function/struct mapping: \Code{H5xxx_vers=1}</li></ul>
+  </th>
+  </tr>
+  <tr>
+  <td>H5Lget_info()</td>
+  <td>H5Lget_info2()
+  <ul>
+  <li>Function mapping:\Code{H5Lget_info_vers=2}</li>
+  <li>Struct mapping:\Code{H5L_info_t_vers=2}</li>
+  </ul>
+  </td>
+  <td>H5Lget_info1()
+  <ul>
+  <li>Function mapping \Code{H5Lget_info_vers=1}</li>
+  <li>Struct mapping: \Code{H5L_info_t_vers=1}</li>
+  </ul>
+  </td>
+  </tr>
+  <tr>
+  <td>H5Lget_info_by_idx()</td>
+  <td>H5Lget_info_by_idx2()
+  <ul>
+  <li>Function mapping: \Code{H5Lget_info_by_idx_vers=2}</li>
+  <li>Struct mapping: \Code{H5L_info_t_vers=2}</li>
+  </ul>
+  </td>
+  <td>H5Lget_info_by_idx1()
+  <ul>
+  <li>Function mapping: \Code{H5Lget_info_by_idx_vers=1}</li>
+  <li>Struct mapping: \Code{H5L_info_t_vers=1}</li>
+  </ul>
+  </td>
+  </tr>
+  <tr>
+  <td>H5Literate()</td>
+  <td>H5Literate2()
+  <ul>
+  <li>Function mapping: \Code{H5Literate_vers=2}</li>
+  <li>Struct mapping: \Code{H5L_iterate_t_vers=2}</li>
+  </ul>
+  </td>
+  <td>H5Literate1()
+  <ul>
+  <li>Function mapping: \Code{H5Literate_vers=1}</li>
+  <li>Struct mapping: \Code{H5L_iterate_t_vers=1}</li>
+  </ul>
+  </td>
+  </tr>
+  <tr>
+  <td>H5Literate_by_name()</td>
+  <td>H5Literate_by_name2()
+  <ul>
+  <li>Function mapping: \Code{H5Literate_by_name_vers=2}</li>
+  <li>Struct mapping: \Code{H5L_iterate_t_vers=2}</li>
+  </ul>
+  </td>
+  <td>H5Literate_by_name1()
+  <ul>
+  <li>Function mapping: \Code{H5Literate_by_name_vers=1}</li>
+  <li>Struct mapping: \Code{H5L_iterate_t_vers=1}</li>
+  </ul>
+  </td>
+  </tr>
+  <tr>
+  <td>H5Lvisit()</td>
+  <td>H5Lvisit2()
+  <ul>
+  <li>Function mapping: \Code{H5Lvisit_vers=2}</li>
+  <li>Struct mapping: \Code{H5L_iterate_t_vers=2}</li>
+  </ul>
+  </td>
+  <td>H5Lvisit1()
+  <ul>
+  <li>Function mapping: \Code{H5Lvisit_vers=1}</li>
+  <li>Struct mapping: \Code{H5L_iterate_t_vers=1}</li>
+  </ul>
+  </td>
+  </tr>
+  <tr>
+  <td>H5Lvisit_by_name()</td>
+  <td>H5Lvisit_by_name2()
+  <ul>
+  <li>Function mapping: \Code{H5Lvisit_by_name_vers=2}</li>
+  <li>Struct mapping: \Code{H5L_iterate_t_vers=2}</li>
+  </ul>
+  </td>
+  <td>H5Lvisit_by_name1()
+  <ul>
+  <li>Function mapping: \Code{H5Lvisit_by_name_vers=1}</li>
+  <li>Struct mapping: \Code{H5L_iterate_t_vers=1}</li>
+  </ul>
+  </td>
+  </tr>
+  <tr>
+  <td>H5Oget_info()</td>
+  <td>H5Oget_info3()
+  <ul>
+  <li>Function mapping: \Code{H5Oget_info_vers=3}</li>
+  <li>Struct mapping: \Code{H5O_info_t_vers=2}</li>
+  </ul>
+  </td>
+  <td>H5Oget_info1()
+  <ul>
+  <li>Function mapping: \Code{H5Oget_info_vers=1}</li>
+  <li>Struct mapping: \Code{H5O_info_t_vers=1}</li>
+  </ul>
+  </td>
+  </tr>
+  <tr>
+  <td>H5Oget_info_by_idx()</td>
+  <td>H5Oget_info_by_idx3()
+  <ul><li>Function mapping: \Code{H5Oget_info_by_idx_vers=3}</li>
+  <li>Struct mapping: \Code{H5O_info_t_vers=2}</li>
+  </ul>
+  </td>
+  <td>H5Oget_info_by_idx1()
+  <ul>
+  <li>Function mapping: \Code{H5Oget_info_by_idx_vers=1}</li>
+  <li>Struct mapping: \Code{H5O_info_t_vers=1}</li>
+  </ul>
+  </td>
+  </tr>
+  <tr>
+  <td>H5Oget_info_by_name()</td>
+  <td>H5Oget_info_by_name3()
+  <ul>
+  <li>Function mapping: \Code{H5O_get_info_by_name_vers=3}</li>
+  <li>Struct mapping: \Code{H5O_info_t_vers=2}</li>
+  </ul>
+  </td>
+  <td>H5Oget_info_by_name1()
+  <ul>
+  <li>Function mapping: \Code{H5O_get_info_by_name_vers=1}</li>
+  <li>Struct mapping: \Code{H5O_info_t_vers=1}</li>
+  </ul>
+  </td>
+  </tr>
+  <tr>
+  <td>H5Ovisit()</td>
+  <td>H5Ovisit3()
+  <ul>
+  <li>Function mapping: \Code{H5Ovisit_vers=3}</li>
+  <li>Struct mapping: \Code{H5O_iterate_t_vers=2}</li>
+  </ul>
+  </td>
+  <td>H5Ovisit1()
+  <ul><li>Function mapping: \Code{H5Ovisit_vers=1}</li>
+  <li>Struct mapping: \Code{H5O_iterate_t_vers=1}</li>
+  </ul>
+  </td>
+  </tr>
+  <tr>
+  <td>H5Ovisit_by_name()</td>
+  <td>H5Ovisit_by_name3()
+  <ul>
+  <li>Function mapping: \Code{H5Ovisit_by_name_vers=3}</li>
+  <li>Struct mapping: \Code{H5O_iterate_t_vers=2}</li>
+  </ul>
+  </td>
+  <td>H5Ovisit_by_name1()
+  <ul>
+  <li>Function mapping: \Code{H5Ovisit_by_name_vers=1}</li>
+  <li>Struct mapping: \Code{H5O_iterate_t_vers=1}</li>
+  </ul>
+  </td>
+  </tr>
+  <tr>
+  <td>H5Pencode()</td>
+  <td>H5Pencode2()
+  <ul>
+  <li>Function mapping: \Code{H5Pencode_vers=2}</li>
+  </ul>
+  </td>
+  <td>H5Pencode1()
+  <ul>
+  <li>Function mapping: \Code{H5Pencode_vers=1}</li>
+  </ul>
+  </td>
+  </tr>
+  <tr>
+  <td>H5Sencode()</td>
+  <td>H5Sencode2()
+  <ul>
+  <li>Function mapping: \Code{H5Sencode_vers=2}</li>
+  </ul>
+  </td>
+  <td>H5Sencode1()
+  <ul>
+  <li>Function mapping: \Code{H5Sencode_vers=1}</li>
+  </ul>
+  </td>
+  </tr>
+  </table>
+
+  \subsubsection fun-options-110 Function Mapping Options in Releases 1.10.x
+  <table>
+  <tr>
+  <th>Macro</th>
+  <th>Default function used <br/> <sub>(if no macro specified)</sub></th>
+  <th>Introduced in</th>
+  <th>\Code{h5cc} version flag and value</th>
+  <th>Mapped to function or struct</th>
+  </tr>
+  <tr>
+  <td rowspan="2">H5Rdereference()</td>
+  <td rowspan="2">H5Rdereference2()</td>
+  <td rowspan="2">HDF5-1.10.0</td>
+  <td>\Code{-DH5Rdereference_vers=1}</td>
+  <td>H5Rdereference1()</td>
+  </tr>
+  <tr>
+  <td>\Code{-DH5Rdereference_vers=2}</td>
+  <td>H5Rdereference2()</td>
+  </tr>
+  <tr>
+  <td rowspan="2">H5Fget_info()</td>
+  <td rowspan="2">H5Fget_info2()</td>
+  <td rowspan="2">HDF5-1.10.0</td>
+  <td>\Code{-DH5Fget_info_vers=1}</td>
+  <td>H5Fget_info1() with struct \ref H5F_info1_t</td>
+  </tr>
+  <tr>
+  <td>\Code{-DH5Fget_info_vers=2}</td>
+  <td>H5Fget_info2() with struct \ref H5F_info2_t</td>
+  </tr>
+  <tr>
+  <td rowspan="2">H5Oget_info()</td>
+  <td rowspan="2">H5Oget_info1()</td>
+  <td rowspan="2">HDF5-1.10.3</td>
+  <td>\Code{-DH5Oget_info_vers=1}</td>
+  <td>H5Oget_info1()</td>
+  </tr>
+  <tr>
+  <td>\Code{-DH5Oget_info_vers=2}</td>
+  <td>H5Oget_info2()</td>
+  </tr>
+  <tr>
+  <td rowspan="2">H5Oget_info_by_idx()</td>
+  <td rowspan="2">H5Oget_info_by_idx1()</td>
+  <td rowspan="2">HDF5-1.10.3</td>
+  <td>\Code{-DH5Oget_info_by_idx_vers=1}</td>
+  <td>H5Oget_info_by_idx1()</td>
+  </tr>
+  <tr>
+  <td>\Code{-DH5Oget_info_by_idx_vers=2}</td>
+  <td>H5Oget_info_by_idx2()</td>
+  </tr>
+  <tr>
+  <td rowspan="2">H5Oget_info_by_name()</td>
+  <td rowspan="2">H5Oget_info_by_name1()</td>
+  <td rowspan="2">HDF5-1.10.3</td>
+  <td>\Code{-DH5Oget_info_by_name_vers=1}</td>
+  <td>H5Oget_info_by_name1()</td>
+  </tr>
+  <tr>
+  <td>\Code{-DH5Oget_info_by_name_vers=2}</td>
+  <td>H5Oget_info_by_name2()</td>
+  </tr>
+  <tr>
+  <td rowspan="2">H5Ovisit()</td>
+  <td rowspan="2">H5Ovisit1()</td>
+  <td rowspan="2">HDF5-1.10.3</td>
+  <td>\Code{-DH5Ovisit_vers=1}</td>
+  <td>H5Ovisit1()</td>
+  </tr>
+  <tr>
+  <td>\Code{-DH5Ovisit_vers=2}</td>
+  <td>H5Ovisit2()</td>
+  </tr>
+  <tr>
+  <td rowspan="2">H5Ovisit_by_name()</td>
+  <td rowspan="2">H5Ovisit_by_name1()</td>
+  <td rowspan="2">HDF5-1.10.3</td>
+  <td>\Code{-DH5Ovisit_by_name_vers=1}</td>
+  <td>H5Ovisit_by_name1()</td>
+  </tr>
+  <tr>
+  <td>\Code{-DH5Ovisit_by_name_vers=2}</td>
+  <td>H5Ovisit_by_name2()</td>
+  </tr>
+  </table>
+
+  \subsubsection fun-options-18 Function Mapping Options in Releases 1.8.x
+  At release 1.8.0, the API compatibility macros, function mapping compile-time
+  version flags and values, and corresponding versioned functions listed in the
+  following table were introduced. If the application being compiled to run with
+  any 1.10.x release was written to use any 1.6.x release of HDF5, you must also
+  consider these macros and mapping options.
+
+  <div align="center">Table 5:  Function Mapping Options in Releases 1.8.x
+  <table border="1" cellpadding="3" style="width: 90.0%;">
+  <tr>
+  <th>Macro</th>
+  <th><code>h5cc</code> version flag and value</th>
+  <th>Mapped to function <br/> or struct</th>
+  </tr>
+  <tr>
+  <td rowspan="2">H5Acreate()</td>
+  <td>\Code{DH5Acreate_vers=1}</td>
+  <td>H5Acreate1()</td>
+  </tr>
+  <tr>
+  <td>\Code{DH5Acreate_vers=2}</td>
+  <td>H5Acreate2()</td>
+  </tr>
+  <tr>
+  <td rowspan="2">H5Aiterate()</td>
+  <td>\Code{DH5Aiterate_vers=1}</td>
+  <td>H5Aiterate1() <br/> with struct \ref H5A_operator1_t</td>
+  </tr>
+  <tr>
+  <td>\Code{DH5Aiterate_vers=2}</td>
+  <td>H5Aiterate2() <br/> with struct \ref H5A_operator2_t</td>
+  </tr>
+  <tr>
+  <td rowspan="2">H5Dcreate()</td>
+  <td>\Code{DH5Dcreate_vers=1}</td>
+  <td>H5Dcreate1()</td>
+  </tr>
+  <tr>
+  <td>\Code{DH5Dcreate_vers=2}</td>
+  <td>H5Dcreate2()</td>
+  </tr>
+  <tr><td rowspan="2">H5Dopen()</td>
+  <td>\Code{DH5Dopen_vers=1}</td>
+  <td>H5Dopen1()</td>
+  </tr>
+  <tr>
+  <td>\Code{DH5Dopen_vers=2}</td>
+  <td>H5Dopen2()</td>
+  </tr>
+  <tr>
+  <td rowspan="2">H5Eclear()</td>
+  <td>\Code{DH5Eclear_vers=1}</td>
+  <td>H5Eclear1()</td>
+  </tr>
+  <tr>
+  <td>\Code{DH5Eclear_vers=2}</td>
+  <td>H5Eclear2()</td>
+  </tr>
+  <tr>
+  <td rowspan="2">H5Eprint()</td>
+  <td>\Code{DH5Eprint_vers=1}</td>
+  <td>H5Eprint1()</td>
+  </tr>
+  <tr>
+  <td>\Code{DH5Eprint_vers=2}</td>
+  <td>H5Eprint2()</td>
+  </tr>
+  <tr>
+  <td rowspan="2">H5Epush()</td>
+  <td>\Code{DH5Epush_vers=1}</td>
+  <td>H5Epush1()</td>
+  </tr>
+  <tr>
+  <td>\Code{DH5Epush_vers=2}</td>
+  <td>H5Epush2()</td>
+  </tr>
+  <tr>
+  <td rowspan="2">H5Eset_auto()</td>
+  <td>\Code{DH5Eset_auto_vers=1}</td>
+  <td>H5Eset_auto1()</td>
+  </tr>
+  <tr>
+  <td>\Code{DH5Eset_auto_vers=2}</td>
+  <td>H5Eset_auto2()</td>
+  </tr>
+  <tr>
+  <td rowspan="2">H5Eget_auto()</td>
+  <td>\Code{DH5Eget_auto_vers=1}</td>
+  <td>H5Eget_auto1()</td>
+  </tr>
+  <tr>
+  <td>\Code{DH5Eget_auto_vers=2}</td>
+  <td>H5Eget_auto2()</td>
+  </tr>
+  <tr>
+  <td rowspan="2">\ref H5E_auto_t <br/> struct for H5Eset_auto() <br/> and H5Eget_auto()</td>
+  <td>\Code{DH5E_auto_t_vers=1}</td>
+  <td>\ref H5E_auto1_t</td>
+  </tr>
+  <tr>
+  <td>\Code{DH5E_auto_t_vers=2}</td>
+  <td>\ref H5E_auto2_t</td>
+  </tr>
+  <tr>
+  <td rowspan="2">H5Ewalk()</td>
+  <td>\Code{DH5Ewalk_vers=1}</td>
+  <td>H5Ewalk1() <br/> with callback \ref H5E_walk1_t <br/> and struct \ref H5E_error1_t</td>
+  </tr>
+  <tr>
+  <td>\Code{DH5Ewalk_vers=2}</td>
+  <td>H5Ewalk2() <br/> with callback \ref H5E_walk2_t <br/> and struct \ref H5E_error2_t</td>
+  </tr>
+  <tr>
+  <td rowspan="2">H5Gcreate()</td>
+  <td>\Code{DH5Gcreate_vers=1}</td>
+  <td>H5Gcreate1()</td>
+  </tr>
+  <tr>
+  <td>\Code{DH5Gcreate_vers=2}</td>
+  <td>H5Gcreate2()</td>
+  </tr>
+  <tr>
+  <td rowspan="2">H5Gopen()</td>
+  <td>\Code{DH5Gopen_vers=1}</td>
+  <td>H5Gopen1()</td>
+  </tr>
+  <tr>
+  <td>\Code{DH5Gopen_vers=2}</td>
+  <td>H5Gopen2()</td>
+  </tr>
+  <tr>
+  <td rowspan="2">H5Pget_filter()</td>
+  <td>\Code{DH5Pget_filter_vers=1}</td>
+  <td>H5Pget_filter1()</td>
+  </tr>
+  <tr>
+  <td>\Code{DH5Pget_filter_vers=2}</td>
+  <td>H5Pget_filter2()</td>
+  </tr>
+  <tr>
+  <td rowspan="2">H5Pget_filter_by_id()</td>
+  <td>\Code{DH5Pget_filter_by_id_vers=1}</td>
+  <td>H5Pget_filter_by_id1()</td>
+  </tr>
+  <tr>
+  <td>\Code{DH5Pget_filter_by_id_vers=2}</td>
+  <td>H5Pget_filter_by_id2()</td>
+  </tr>
+  <tr>
+  <td rowspan="2">H5Pinsert()</td>
+  <td>\Code{DH5Pinsert_vers=1}</td>
+  <td>H5Pinsert1()</td>
+  </tr>
+  <tr>
+  <td>\Code{DH5Pinsert_vers=2}</td>
+  <td>H5Pinsert2()</td>
+  </tr>
+  <tr>
+  <td rowspan="2">H5Pregister()</td>
+  <td>\Code{DH5Pregister_vers=1}</td>
+  <td>H5Pregister1()</td>
+  </tr>
+  <tr>
+  <td>\Code{DH5Pregister_vers=2}</td>
+  <td>H5Pregister2()</td>
+  </tr>
+  <tr>
+  <td rowspan="2">H5Rget_obj_type()</td>
+  <td>\Code{DH5Rget_obj_typevers=1}</td>
+  <td>H5Rget_obj_type1()</td>
+  </tr>
+  <tr>
+  <td>\Code{DH5Rget_obj_type_vers=2}</td>
+  <td>H5Rget_obj_type2()</td>
+  </tr>
+  <tr>
+  <td rowspan="2">H5Tarray_create()</td>
+  <td>\Code{DH5Tarray_create_vers=1}</td>
+  <td>H5Tarray_create1()</td>
+  </tr>
+  <tr>
+  <td>\Code{DH5Tarray_create_vers=2}</td>
+  <td>H5Tarray_create2()</td>
+  </tr>
+  <tr>
+  <td rowspan="2">H5Tcommit()</td>
+  <td>\Code{DH5Tcommit_vers=1}</td>
+  <td>H5Tcommit1()</td>
+  </tr>
+  <tr>
+  <td>\Code{DH5Tcommit_vers=2}</td>
+  <td>H5Tcommit2()</td>
+  </tr>
+  <tr>
+  <td rowspan="2">H5Tget_array_dims()</td>
+  <td>\Code{DH5Tget_array_dims_vers=1}</td>
+  <td>H5Tget_array_dims1()</td>
+  </tr>
+  <tr>
+  <td>\Code{DH5Tget_array_dims_vers=2}</td>
+  <td>H5Tget_array_dims2()</td>
+  </tr>
+  <tr>
+  <td rowspan="2">H5Topen()</td>
+  <td>\Code{DH5Topen_vers=1}</td>
+  <td>H5Topen1()</td>
+  </tr>
+  <tr>
+  <td>\Code{DH5Topen_vers=2}</td>
+  <td>H5Topen2()</td>
+  </tr>
+  <tr>
+  <td rowspan="2">\ref H5Z_class_t struct for H5Zregister()</td>
+  <td>\Code{DH5Z_class_t_vers=1}</td>
+  <td>\ref H5Z_class1_t</td>
+  </tr>
+  <tr>
+  <td>\Code{DH5Z_class_t_vers=2}</td>
+  <td>\ref H5Z_class2_t</td>
+  </tr>
+  </table>
+  </div>
+
+  \subsubsection further Further Information
+  It is possible to specify multiple function mappings for a single application build:
+  \code{.sh}
+  h5cc ... -DH5Rdereference_vers=1 -DH5Fget_info_vers=2 ...
+  \endcode
+  As a result of the function and struct mappings in this compile example, all
+  occurrences of the macro \Code{H5Rdereference} will be mapped to \Code{H5Rdereference1}
+  and all occurrences of the macro \Code{H5Fget_info} will be mapped to \Code{H5Fget_info2}
+  for the application being built.
+
+  The function and struct mappings can be used to guarantee that a given API compatibility
+  macro will be mapped to the desired underlying function or struct version regardless of
+  the library or application mappings. In cases where an application may benefit greatly
+  from features offered by some of the later APIs, or must continue to use some earlier
+  API versions for compatibility reasons, this fine-grained control may be very important.
+
+  As noted earlier, the function mappings can only reference versioned functions that are
+  included in the HDF5 library, as determined by the configure flag used to build the
+  library. For example, if the HDF5 library being linked with the application was built
+  with the \Code{--disable-deprecated-symbols} option, version 1 of the underlying functions
+  would not be available, and the example above that defined \Code{H5Rdereference_vers=1}
+  would not be supported.
+
+  The function mappings do not negate any available functions. If \Code{H5Rdereference1}
+  is available in the installed version of the HDF5 library, and the application was not
+  compiled with the \Code{-DH5_NO_DEPRECATED_SYMBOLS} flag, the function \Code{H5Rdereference1}
+  will remain available to the application through its versioned name. Similarly,
+  \Code{H5Rdereference2} will remain available to the application as \Code{H5Rdereference2}.
+  The function mapping version flag \Code{H5Rdereference_vers} only controls the mapping of
+  the API compatibility macro \Code{H5Rdereference} to one of the two available functions.
+
+  This can be especially useful in any case where the programmer does not have direct control
+  over global macro definitions, such as when writing code meant to be copied to multiple
+  applications or when writing code in a header file.
+
+  \section macros Compatibility Macros in HDF5 1.6.8 and Later
+  A series of similar compatibility macros were introduced into the release 1.6
+  series of the library, starting with release 1.6.8. These macros simply alias the
+  '1' version functions, callbacks, and typedefs listed above to their original
+  non-numbered names.
+
+  These macros were strictly a forward-looking feature at that time; they were not
+  necessary for compatibility in 1.6.x. These macros were created at that time to
+  enable writing code that could be used with any version of the library after 1.6.8
+  and any library compilation options except \Code{H5_NO_DEPRECATED_SYMBOLS}, by always
+  using the '1' version of versioned functions and types. For example, \Code{H5Dopen1}
+  will always be interpreted in exactly the same manner by any version of the library
+  since 1.6.8.
+
+  \section use-case Common Use Case
+  A common scenario where the API compatibility macros may be helpful is the migration
+  of an existing application to a new HDF5 release. An incremental migration plan is
+  outlined here:
+  <ol>
+  <li>Build the HDF5 library without specifying any library mapping \Code{configure}
+      flag. In this default mode, the 1.6.x, 1.8.x, and 1.10.x versions of the
+      underlying functions are available, and the API compatibility macros will
+      be mapped to the current HDF5 versioned functions.</li>
+  <li>Compile the application with the \Code{-DH5_USE_NN_API} application mapping
+      option if it was written for use with an earlier HDF5 library. Because the
+      application mapping overrides the library mapping, the macros will all be
+      mapped to the earlier versions of the functions.</li>
+  <li>Remap one API compatibility macro at a time (or sets of macros), to use the
+      current HDF5 versions. At each stage, use the function mappings to map the macros
+      being worked on to the current versions. For example, use the
+      \Code{-DH5Rdereference_vers=2} version flag setting to remap the \Code{H5Rdereference}
+      macro to \Code{H5Rdereference2}, the 1.10.x version.
+
+      During this step, the application code will need to be modified to change the calling
+      parameters used with the API compatibility macros to match the number and type
+      of the 1.10.x versioned functions. The macro name, for example \Code{H5Rdereference},
+      should continue to be used in the code, to allow for possible re-mappings to later
+      versioned functions in a future release.</li>
+   <li>After all macros have been migrated to the latest versioned functions in step 3,
+       compile the application without any application or function mappings. This build
+       uses the library mappings set in step 1, and maps API compatibility macros to the
+       latest versions.</li>
+   <li>Finally, compile the application with the application mapping
+       \Code{-DH5_NO_DEPRECATED_SYMBOLS}, and address any failures to complete
+       the application migration process.</li>
+   </ol>
+
+ */
+\ No newline at end of file
diff --git a/doxygen/dox/cookbook/Accessibility.c b/doxygen/dox/cookbook/Accessibility.c
new file mode 100644
index 0000000..f4cc905
--- /dev/null
+++ b/doxygen/dox/cookbook/Accessibility.c
@@ -0,0 +1,48 @@
+/* -*- c-file-style: "stroustrup" -*- */
+
+#include "hdf5.h"
+
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int
+main(void)
+{
+    int ret_val = EXIT_SUCCESS;
+
+    //! <!-- [set_libver_bounds] -->
+    {
+        __label__ fail_fapl, fail_file;
+        hid_t fapl, file, aspace, attr;
+
+        if ((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_fapl;
+        }
+#if H5_VERSION_GE(1, 10, 0)
+        if (H5Pset_libver_bounds(fapl, H5F_LIBVER_V18, H5F_LIBVER_V18) < 0) {
+#elif H5_VERSION_GE(1, 8, 0)
+        if (H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) {
+#else
+#error Only HDF5 1.8.x and later supported.
+#endif
+            ret_val = EXIT_FAILURE;
+            goto fail_file;
+        }
+        if ((file = H5Fcreate("set_libver_bounds.h5", H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_file;
+        }
+
+        H5Fclose(file);
+fail_file:
+        H5Pclose(fapl);
+fail_fapl:;
+    }
+    //! <!-- [set_libver_bounds] -->
+
+    assert(ret_val == EXIT_SUCCESS);
+
+    return ret_val;
+}
diff --git a/doxygen/dox/cookbook/Accessibility.dox b/doxygen/dox/cookbook/Accessibility.dox
new file mode 100644
index 0000000..28009be
--- /dev/null
+++ b/doxygen/dox/cookbook/Accessibility.dox
@@ -0,0 +1,39 @@
+/** \page Accessibility
+
+\section secAccessibility Accessibility
+
+\subsection CB_MaintainCompat Maintaining Compatibility with other HDF5 Library Versions
+
+\par Problem
+You want to ensure that the HDF5 files you produce or modify are accessible by all
+releavnt tools and applications
+
+\par Solution
+For HDF5 items (objects, attributes, etc.) that you would like to
+create in new or existing HDF5 files, ascertain the supported range of HDF5
+library versions as lower and upper bounds. When creating new or opening
+existing HDF5 files, use a file access property list and configure the supported
+range via the H5Pset_libver_bounds() function.\n
+In the example below, we restrict HDF5 item creation to the HDF5 1.8.x family of
+library versions.
+\snippet{lineno} Accessibility.c set_libver_bounds
+
+\par Discussion
+See RFC \ref_rfc20160105 for a detailed and comprehensive account of HDF5
+versioning (library, file format spec., etc.) and the H5Pset_libver_bounds()
+function.\n
+The default range #H5F_LIBVER_EARLIEST (low) - #H5F_LIBVER_LATEST (high) offers the
+widest compatibility range, but may not be suitable for certain (feature-)use
+cases.\n
+The HDF5 library comes with a \Emph{forward-} and \Emph{backward-compatibility}
+guarantee: This means that the latest version of the library can always read
+HDF5 files created by a version realesed earlier (backward compatibility).
+It also means that a given release of the library can read the contents of
+HDF5 files created with later versions of the library as long as the files
+do not contain features introduced in later versions (forward compatibility).
+
+\par See Also
+See the recipe \ref CB_LargeAttributes for an example where we use HDF5
+compatibility settings to enable the creation of large HDF5 attributes.
+
+*/
+\ No newline at end of file
diff --git a/doxygen/dox/cookbook/Attributes.c b/doxygen/dox/cookbook/Attributes.c
new file mode 100644
index 0000000..f4e894f
--- /dev/null
+++ b/doxygen/dox/cookbook/Attributes.c
@@ -0,0 +1,61 @@
+/* -*- c-file-style: "stroustrup" -*- */
+
+#include "hdf5.h"
+
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int
+main(void)
+{
+    int ret_val = EXIT_SUCCESS;
+
+    //! <!-- [large_attribute] -->
+    {
+        __label__ fail_attr, fail_aspace, fail_fapl, fail_file;
+        hid_t fapl, file, aspace, attr;
+
+        if ((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_fapl;
+        }
+#if H5_VERSION_GE(1, 10, 0)
+        if (H5Pset_libver_bounds(fapl, H5F_LIBVER_V18, H5F_LIBVER_LATEST) < 0) {
+#elif H5_VERSION_GE(1, 8, 0)
+        if (H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) {
+#else
+#error Only HDF5 1.8.x and later supported.
+#endif
+            ret_val = EXIT_FAILURE;
+            goto fail_file;
+        }
+        if ((file = H5Fcreate("large_attribute.h5", H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_file;
+        }
+
+        if ((aspace = H5Screate_simple(1, (hsize_t[]){1024 * 1024}, NULL)) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_aspace;
+        }
+        if ((attr = H5Acreate(file, "4MiB", H5T_IEEE_F32LE, aspace, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_attr;
+        }
+
+        H5Aclose(attr);
+fail_attr:
+        H5Sclose(aspace);
+fail_aspace:
+        H5Fclose(file);
+fail_file:
+        H5Pclose(fapl);
+fail_fapl:;
+    }
+    //! <!-- [large_attribute] -->
+
+    assert(ret_val == EXIT_SUCCESS);
+
+    return ret_val;
+}
diff --git a/doxygen/dox/cookbook/Attributes.dox b/doxygen/dox/cookbook/Attributes.dox
new file mode 100644
index 0000000..5914909
--- /dev/null
+++ b/doxygen/dox/cookbook/Attributes.dox
@@ -0,0 +1,38 @@
+/** \page Attributes
+
+\section secAttributes Attributes
+
+\subsection CB_LargeAttributes Creating "Large" HDF5 Attributes
+
+\par Problem
+You would like to use HDF5 attributes the size of whose values
+exceeds a few dozen kilobytes
+
+\par Solution
+A file format change in the HDF5 1.8.x family of library releases made it
+possible to have attributes larger than about 64 KiB. Ensure that the lower
+library version bound for new HDF5 item creation is at least 1.8.x, and create
+larger attributes as usual.\n
+In the example below, we create an attribute whose value occupies 4 MiB.
+
+\note This feature is only supported in HDF5 1.8.x+
+
+\snippet{lineno} Attributes.c large_attribute
+
+\par Discussion
+Large attributes are supported only in HDF5 versions 1.8.x and higher.
+This has implications for the accessibility of your HDF5 files and
+is your call.\n
+Since there are no size limitations for large attributes, it might
+seem tempting to mistake them for dataset stand-ins. This is not the
+case, for at least two reasons:
+1. Attributes decorate HDF5 objects, have their own local namespace,
+   and can't be link targets.
+2. Attribute I/O treats the attribute value as atomic, i.e., there
+   is no support for partial I/O. A large attribute will always be
+   read or written in its entirety.
+
+\par See Also
+See \ref CB_MaintainCompat for HDF5 compatibility implications.
+
+ */
+\ No newline at end of file
diff --git a/doxygen/dox/cookbook/Files.c b/doxygen/dox/cookbook/Files.c
new file mode 100644
index 0000000..b824933
--- /dev/null
+++ b/doxygen/dox/cookbook/Files.c
@@ -0,0 +1,87 @@
+/* -*- c-file-style: "stroustrup" -*- */
+
+#include "hdf5.h"
+
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int
+main(void)
+{
+    int ret_val = EXIT_SUCCESS;
+
+    //! <!-- [free_space] -->
+    {
+        __label__ fail_fcpl, fail_fapl, fail_file;
+        hid_t fcpl, fapl, file;
+
+        if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_fcpl;
+        }
+#if H5_VERSION_GE(1, 10, 1)
+        if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, 1, 4096) < 0) {
+#else
+#error HDF5 1.10.1+ required
+#endif
+            ret_val = EXIT_FAILURE;
+            goto fail_fapl;
+        }
+
+        if ((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_fapl;
+        }
+#if H5_VERSION_GE(1, 10, 1)
+        if (H5Pset_libver_bounds(fapl, H5F_LIBVER_V110, H5F_LIBVER_LATEST) < 0) {
+#else
+#error HDF5 1.10.x+ required
+#endif
+            ret_val = EXIT_FAILURE;
+            goto fail_file;
+        }
+
+        if ((file = H5Fcreate("free_space.h5", H5F_ACC_TRUNC, fcpl, fapl)) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_file;
+        }
+        H5Fclose(file);
+
+fail_file:
+        H5Pclose(fapl);
+fail_fapl:
+        H5Pclose(fcpl);
+fail_fcpl:;
+    }
+    //! <!-- [free_space] -->
+
+    //! <!-- [user_block] -->
+    {
+        __label__ fail_fcpl, fail_file;
+        hid_t fcpl, file;
+
+        if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_fcpl;
+        }
+        if (H5Pset_userblock(fcpl, 8192 * 1024) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_file;
+        }
+        if ((file = H5Fcreate("userblock.h5", H5F_ACC_TRUNC, fcpl, H5P_DEFAULT)) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_file;
+        }
+        H5Fclose(file);
+
+fail_file:
+        H5Pclose(fcpl);
+fail_fcpl:;
+    }
+    //! <!-- [user_block] -->
+
+    assert(ret_val == EXIT_SUCCESS);
+
+    return ret_val;
+}
diff --git a/doxygen/dox/cookbook/Files.dox b/doxygen/dox/cookbook/Files.dox
new file mode 100644
index 0000000..4893771
--- /dev/null
+++ b/doxygen/dox/cookbook/Files.dox
@@ -0,0 +1,71 @@
+/** \page Files
+
+\section secFiles Files
+
+\subsection CB_FreeSpace Tracking Free Space in HDF5 Files
+
+\par Problem
+You sometimes delete objects in HDF5 files and don't have new content to use the
+free space, but would like to reuse it in the future.
+
+\par Solution
+At file creation time, set the file space management strategy and persistence of
+free space tracking information via H5Pset_file_space_strategy().
+
+\note This feature is only supported in HDF5 1.10.1+.
+
+\snippet{lineno} Files.c free_space
+
+\par Discussion
+Free space tracking is supported only in HDF5 versions 1.10.x and higher.
+This has implications for the accessibility of your HDF5 files and
+should be considered carefully. If compatibility with previous versions of
+HDF5 must be maintained, space reclamation via \Code{h5repack} might be an option.\n
+The file space strategy #H5F_FSPACE_STRATEGY_FSM_AGGR is not the only option
+that supports free-space tracking. #H5F_FSPACE_STRATEGY_PAGE is another option,
+which adds paged allocation and is used most effectively with page buffering.\n
+For an in-depth account of HDF5 file space management, paged-allocation, and
+page buffering, see the following documents:
+\li \ref_rfc20121024
+\li \ref_rfc20120523
+\li \ref_rfc20150709
+
+\par See Also
+See \ref CB_MaintainCompat for HDF5 compatibility implications.
+
+
+\subsection CB_RemoveUnusedSpace Removing Unused Space from HDF5 Files
+
+\par Problem
+Based on estimates or \Code{h5stat} output you know that a large portion
+of an HDF5 file consists of free or unaccounted space, and you would like
+to remove it.
+
+
+\subsection CB_UserBlock Creating an HDF5 File User Block
+
+\par Problem
+You would like to include certain ancillary, non-HDF5 content in an
+HDF5 file such that it can be accessed without the HDF5 library.
+
+\par Solution
+Use a file creation property list in which the user block size is set via
+H5Pset_userblock(). In the example below, we create an 8 MiB user block.
+\snippet{lineno} Files.c user_block
+
+\par Discussion
+The user block begins at offset 0 and must be at least 512 bytes and a power
+of 2. The HDF5 library ignores any content between the beginning of the
+file and the end of the user block.\n
+You can add or strip a user block to/from an existing HDF5 file with the
+\Code{h5jam}/\Code{h5unjam} tool, respectively.
+\warning
+If you try to embed content into the user block for use by other applications,
+pay close attention to how they handle space beyond the last used byte in the
+user block or the user block in general. In the worst case, applications might
+try to truncate the rest of the file and destroy the HDF5 portion of the file.
+
+\par See Also
+References to related recipes
+
+ */
+\ No newline at end of file
diff --git a/doxygen/dox/cookbook/Performance.dox b/doxygen/dox/cookbook/Performance.dox
new file mode 100644
index 0000000..5e945b2
--- /dev/null
+++ b/doxygen/dox/cookbook/Performance.dox
@@ -0,0 +1,21 @@
+/** \page Performance
+
+\section secPerformance Performance
+
+\subsection CB_MDCPerf Assessing HDF5 Metadata Cache Performance
+
+\par Problem
+You are trying to diagnose and improve the I/O performance of an application
+and would like to understand if a simple metadata cache adjustment might
+yield substantial performance gains
+
+\par Solution
+The to-the-point solution, i.e., the solution w/o any background or explanation
+
+\par Discussion
+A discussion of the fine points and variants of the solution
+
+\par See Also
+References to related recipes
+
+ */
+\ No newline at end of file
diff --git a/doxygen/dox/high_level/extension.dox b/doxygen/dox/high_level/extension.dox
new file mode 100644
index 0000000..d754b96
--- /dev/null
+++ b/doxygen/dox/high_level/extension.dox
@@ -0,0 +1,615 @@
+/** \defgroup H5LR Extensions
+ *
+ * <em>Working with region references, hyperslab selections,
+ * and bit-fields (H5LR, H5LT)</em>
+ *
+ * The following reference manual entries describe high-level HDF5 C and Fortran APIs
+ * for working with region references, hyperslab selections, and bit-fields.
+ * These functions were created as part of a project supporting
+ * NPP/NPOESS Data Production and Exploitation (
+ * <a href="https://support.hdfgroup.org/projects/jpss/documentation">
+ * project</a>, <a href="https://gamma.hdfgroup.org/ftp/pub/outgoing/NPOESS/source">
+ * software </a>).
+ * While they were written to facilitate access to NPP, NPOESS, and JPSS
+ * data in the HDF5 format, these functions may be useful to anyone working
+ * with region references, hyperslab selections, or bit-fields.
+ *
+ * Note that these functions are not part of the standard HDF5 distribution; 
+ * the <a href="https://gamma.hdfgroup.org/ftp/pub/outgoing/NPOESS/source">
+ * software </a>
+ * must be separately downloaded and installed.
+ *
+ * A comprehensive guide to this library,
+ * <a href="https://support.hdfgroup.org/projects/jpss/documentation/HL/UG/NPOESS_HL-UG.pdf">
+ * <em>User Guide to the HDF5 High-level Library for Handling Region References and Hyperslab Selections</em></a>
+ * is available at
+ * https://support.hdfgroup.org/projects/jpss/documentation/HL/UG/NPOESS_HL-UG.pdf.
+ *
+ * - \ref H5LRcopy_reference
+ *        \n Copies data from the specified dataset to a new location and creates a reference to it.
+ * - \ref H5LRcopy_region
+ *        \n  Copies data from a referenced region to a region in a destination dataset.
+ * - \ref H5LRcreate_ref_to_all
+ *        \n  Creates a dataset with the region references to the data in all datasets located under a
+ *        specified group in a file or creates a dataset with object references to all objects (groups or datasets)
+ *        located under a specified group in a file.
+ * - \ref H5LRcreate_region_references
+ *        \n Creates an array of region references using an array of paths to
+ *        datasets and an array of corresponding hyperslab descriptions.
+ * - \ref H5LRget_region_info
+ *        \n Retrieves information about the data a region reference points to.
+ * - \ref H5LRmake_dataset
+ *        \n Creates and writes a dataset containing a list of region references.
+ * - \ref H5LRread_region
+ *        \n  Retrieves raw data pointed to by a region reference to an application buffer.
+ * - \ref H5LTcopy_region
+ *        \n Copies data from a specified region in a source dataset to a specified region in a destination dataset.
+ * - \ref H5LTread_bitfield_value
+ *        \n Retrieves the values of quality flags for each element to the application provided buffer.
+ * - \ref H5LTread_region
+ *        \n Reads selected data to an application buffer.
+ *
+ */
+
+/*-------------------------------------------------------------------------
+ *
+ * Make dataset functions
+ *
+ *-------------------------------------------------------------------------
+ */
+
+/**
+ * --------------------------------------------------------------------------
+ * \ingroup H5LR
+ *
+ * \brief Creates and writes a dataset containing a list of region references.
+ *
+ * \fgdta_loc_id
+ * \param[in] path          Path to the dataset being created
+ * \param[in] type_id       Datatype of the dataset
+ * \param[in] buf_size      Size of the \p loc_id_ref and \p buf arrays
+ * \param[in] loc_id_ref    Array of object identifiers; each identifier
+ *                          describes to which HDF5 file the corresponding
+ *                          region reference belongs to
+ * \param[in] buf           Array of region references
+ *
+ * \return \herr_t
+ *
+ * \details Given an array of size \p buf_size of region references \p buf,
+ *          the function will create a dataset with path \p path, at location
+ *          specified by \p loc_id and of a datatype specified by \p type_id,
+ *          and will write data associated with each region reference in the order
+ *          corresponding to the order of the region references in the buffer.
+ *          It is assumed that all referenced hyperslabs have the same dimensionality,
+ *          and only the size of the slowest changing dimension may differ.
+ *          Each reference in the \p buf array belongs to the file identified
+ *          by the corresponding object identifiers in the array \p loc_id_ref.
+ *
+ *          If \p path does not exist in \p loc_id then the function will
+ *          create the path specified by \p path automatically.
+ *
+ * \version 1.1 Fortran wrapper introduced in this release.
+ *
+ * \since 1.0
+ *
+ */
+H5_HLRDLL herr_t H5LRmake_dataset(hid_t loc_id,
+                 const char *path,
+                 hid_t type_id, const size_t buf_size,
+                 const hid_t *loc_id_ref,
+                 const hdset_reg_ref_t *buf);
+
+/*-------------------------------------------------------------------------
+ *
+ * Make and manipulate dataset region references functions
+ *
+ *-------------------------------------------------------------------------
+ */
+
+/**
+ * --------------------------------------------------------------------------
+ * \ingroup H5LR
+ *
+ * \brief Creates an array of region references using an array of paths to
+ *        datasets and an array of corresponding hyperslab descriptions.
+ *
+ * \param[in] obj_id        File identifier for the HDF5 file containing
+ *                          the referenced regions or an object identifier
+ *                          for any object in that file
+ * \param[in] num_elem      Number of elements in the \p path and \p buf arrays
+ * \param[in] path          Array of pointers to strings, which contain
+ *                          the paths to the target datasets for the region references
+ * \param[in] block_coord   Array of hyperslab coordinate
+ * \param[out] buf          Buffer for returning an array of region references
+ *
+ * \return \herr_t
+ *
+ * \note    **Motivation:**
+ * \note    H5LRcreate_region_references() is useful when creating
+ *          large numbers of similar region references.
+ *
+ * \details H5LRcreate_region_references() creates a list of region references
+ *          given an array of paths to datasets and another array listing the
+ *          corner coordinates of the corresponding hyperslabs.
+ *
+ *          \p path parameter is an array of pointers to strings.
+ *
+ *          \p num_elem specifies the number of region references to be created,
+ *          thus specifying the size of the \p path and \p _buf arrays.
+ *
+ *          Buffer \p block_coord has size 2*rank and is the coordinates of the
+ *          starting point following by the coordinates of the ending point of
+ *          the hyperslab, repeated \p num_elem times for each hyperslab.
+ *          For example, creating two region references to two hyperslabs,
+ *          one with a rectangular hyperslab region starting at element (2,2)
+ *          to element (5,4) and the second rectangular region starting at
+ *          element (7,7) to element (9,10), results in \p block_coord
+ *          being {2,2,5,4, 7,7,9,10}.
+ *
+ *          The rank of the hyperslab will be the same as the rank of the
+ *          target dataset. H5LRcreate_region_references() will retrieve
+ *          the rank for each dataset and will use those values to interpret
+ *          the values in the buffer. Please note that rank may vary from one
+ *          dataset to another.
+ *
+ * \version 1.1 Fortran wrapper introduced in this release.
+ *
+ * \since 1.0
+ *
+ */
+H5_HLRDLL herr_t H5LRcreate_region_references(hid_t obj_id,
+                      size_t num_elem,
+                      const char **path,
+                      const hsize_t *block_coord,
+                      hdset_reg_ref_t *buf);
+
+/**
+ * --------------------------------------------------------------------------
+ * \ingroup H5LR
+ *
+ * \brief Copies data from the specified dataset to a new location and creates a reference to it.
+ *
+ * \param[in] obj_id        Identifier of any object in a file an HDF5 reference belongs to
+ * \param[in] ref           Reference to the datasets region
+ * \param[in] file          Name of the destination file
+ * \param[in] path          Full path to the destination dataset
+ * \param[in] block_coord   Hyperslab coordinates in the destination dataset
+ * \param[out] ref_new      Region reference to the new location of data
+ *
+ * \return \herr_t
+ *
+ * \details Given a data set pointed to by a region reference, the function
+ *          H5LRcopy_reference() will copy the hyperslab data referenced by
+ *          a datasets region reference into existing dataset specified by
+ *          its path \p path in the file with the name \p file, and to location
+ *          specified by the hyperslab coordinates \p block_coord. It will
+ *          create the region reference \p ref_new to point to the new location.
+ *          The number of elements in the old and newly specified regions has
+ *          to be the same.
+ *
+ *          Buffer \p block_coord has size 2*rank and is the coordinates of
+ *          the starting point following by the coordinates of the ending
+ *          point of the hyperslab. For example, to extract a rectangular
+ *          hyperslab region starting at element (2,2) to element (5,4)
+ *          then \p block_coord would be {2, 2, 5, 4}.
+ *
+ * \version 1.1 Fortran wrapper introduced in this release.
+ *
+ * \since 1.0
+ *
+ */
+H5_HLRDLL herr_t H5LRcopy_reference(hid_t obj_id, hdset_reg_ref_t *ref, const char *file,
+                     const char *path, const hsize_t *block_coord,
+                     hdset_reg_ref_t *ref_new);
+
+/**
+ * --------------------------------------------------------------------------
+ * \ingroup H5LR
+ *
+ * \brief Copies data from a referenced region to a region in a destination dataset.
+ *
+ * \param[in] obj_id        Identifier of any object in a file
+ *                          dataset region reference belongs to
+ * \param[in] ref           Dataset region reference
+ * \param[in] file          Name of the destination file
+ * \param[in] path          Full path to the destination dataset
+ * \param[in] block_coord   Hyperslab coordinates in the destination dataset
+ *
+ * \return \herr_t
+ *
+ * \details Given a dataset region reference \p ref in a source file
+ *          specified by an identifier of any object in that file
+ *          \p obj_id, the function will write data to the existing
+ *          dataset \p path in file \p file to the simple hyperslab
+ *          specified by \p block_coord.
+ *
+ *          Buffer \p block_coord has size 2*rank and is the coordinates
+ *          of the starting point following by the coordinates of the
+ *          ending point of the hyperslab. For example, to specify a
+ *          rectangular hyperslab destination region starting at element
+ *          (2,2) to element (5,4) then \p block_coord would be {2, 2, 5, 4}.
+ *
+ *          If \p path does not exist in the destination file (as may be
+ *          the case when writing to a new file) then the dataset will be
+ *          copied directly to the \p path and \p block_coord will be
+ *          disregarded.
+ *
+ * \version 1.1 Fortran wrapper introduced in this release.
+ *
+ * \since 1.0
+ *
+ */
+H5_HLRDLL herr_t H5LRcopy_region(hid_t obj_id,
+                 hdset_reg_ref_t *ref,
+                 const char *file,
+                 const char *path,
+                 const hsize_t *block_coord);
+
+/**
+ * --------------------------------------------------------------------------
+ * \ingroup H5LR
+ *
+ * \brief Creates a dataset with the region references to the data
+ *        in all datasets located under a specified group in a file
+ *        or creates a dataset with object references to all objects
+ *        (groups or datasets) located under a specified group in a file.
+ *
+ * \fg_loc_id
+ * \param[in] group_path    Absolute or relative path to the group at which traversal starts
+ * \param[in] ds_path       Absolute or relative path to the dataset with region references to be created
+ * \param[in] index_type    Index_type; see valid values below in description
+ * \param[in] order         Order in which index is traversed; see valid values below in description
+ * \param[in] ref_type      Reference type; see valid values below in description
+ *
+ * \return \herr_t
+ *
+ * \details H5LRcreate_ref_to_all() creates a dataset with the
+ *          region references to the data in all datasets located
+ *          under a specified group in a file or creates a dataset with
+ *          object references to all objects (groups or datasets) located
+ *          under a specified group in a file.
+ *
+ *          Given a dataset path \p ds_path in a file specified by the
+ *          \p loc_id identifier, the function H5LRcreate_ref_to_all()
+ *          will create a contiguous one-dimensional dataset with the
+ *          region references or object references depending on the value
+ *          of the \p ref_type parameter. When \p ref_type is
+ *          #H5R_DATASET_REGION, each region reference points to all data
+ *          in a dataset encountered by an internally called H5Lvisit()
+ *          routine, which starts at the group specified by the \p loc_id
+ *          and \p group_path parameters. In a like manner, when
+ *          \p ref_type is #H5R_OBJECT, each object reference points to
+ *          an object (a group or a dataset) encountered by H5Lvisit().
+ *
+ *          If \p ds_path does not exist in \p loc_id then the function
+ *          will create the path specified by \p ds_path automatically.
+ *
+ *          \p index_type specifies the index to be used.
+ *          Valid values include the following:
+ *          - #H5_INDEX_NAME        Alphanumeric index on name
+ *          - #H5_INDEX_CRT_ORDER   Index on creation order
+ *
+ *          \p order specifies the order in which objects are to be
+ *          inspected along the index specified in \p index_type.
+ *          Valid values include the following:
+ *          - #H5_ITER_INC      Increasing order
+ *          - #H5_ITER_DEC      Decreasing order
+ *          - #H5_ITER_NATIVE   Fastest available order
+ *
+ *          For more detailed information on these two parameters,
+ *          @see H5Lvisit().
+ *
+ *          \p ref_type specifies the type of the reference to be used.
+ *          Valid values include the following:
+ *          - #H5R_DATASET_REGION   Dataset region reference
+ *          - #H5R_OBJECT           Object reference
+ *
+ * \version 1.1 Fortran wrapper introduced in this release.
+ *
+ * \since 1.0
+ *
+ */
+H5_HLRDLL herr_t H5LRcreate_ref_to_all(hid_t loc_id, const char *group_path,
+                  const char *ds_path, H5_index_t index_type, H5_iter_order_t order, H5R_type_t ref_type);
+
+/*-------------------------------------------------------------------------
+ *
+ * Read dataset functions
+ *
+ *-------------------------------------------------------------------------
+ */
+
+/**
+ * --------------------------------------------------------------------------
+ * \ingroup H5LR
+ *
+ * \brief Retrieves raw data pointed to by a region reference 
+ *        to an application buffer.
+ *
+ * \param[in] obj_id        File identifier for the HDF5 file containing
+ *                          the dataset with the referenced region or an
+ *                          object identifier for any object in that file
+ * \param[in] ref           Region reference specifying data to be read in
+ * \param[in] mem_type      Memory datatype of data read from referenced
+ *                          region into the application buffer
+ * \param[in,out] numelem   Number of elements to be read into buffer \p buf
+ * \param[out] buf          Buffer in which data is returned to the application
+ *
+ * \return \herr_t
+ *
+ * \details H5LRread_region() reads data pointed to by the region
+ *          reference \p ref into the buffer \p buf.
+ *
+ *          \p numelem specifies the number of elements to be read
+ *          into \p buf. When the size of the reference region is unknown,
+ *          H5LRread_region() can be called with \p buf set to NULL;
+ *          the number of elements in the referenced region will be returned
+ *          in \p numelem.
+ *
+ *          The buffer buf must be big enough to hold \p numelem elements
+ *          of type \p mem_type. For example, if data is read from the referenced
+ *          region into an integer buffer, \p mem_type should be #H5T_NATIVE_INT
+ *          and the buffer must be at least \c sizeof(int) * \p numelem  bytes
+ *          in size. This buffer must be allocated by the application.
+ *
+ * \version 1.1 Fortran wrapper introduced in this release.
+ *
+ * \since 1.0
+ *
+ */
+H5_HLRDLL herr_t H5LRread_region(hid_t obj_id,
+                 const hdset_reg_ref_t *ref,
+                 hid_t mem_type,
+                 size_t *numelem,
+                 void *buf );
+
+/*-------------------------------------------------------------------------
+ *
+ * Query dataset functions
+ *
+ *-------------------------------------------------------------------------
+ */
+
+/**
+ * --------------------------------------------------------------------------
+ * \ingroup H5LR
+ *
+ * \brief Retrieves information about the data a region reference points to.
+ *
+ * \param[in] obj_id        Identifier of any object in an HDF5 file the region reference belongs to.
+ * \param[in] ref           Region reference to query
+ * \param[in,out] len       Size of the buffer to store \p path in.
+ *                          NOTE: if \p *path is not NULL then \p *len must be the appropriate length
+ * \param[out] path         Full path that a region reference points to
+ * \param[out] rank         The number of dimensions of the dataset
+ *                          dimensions of the dataset pointed by region reference.
+ * \param[out] dtype        Datatype of the dataset pointed by the region reference.
+ * \param[out] sel_type     Type of the selection (point or hyperslab)
+ * \param[in,out] numelem   Number of coordinate blocks or selected elements.
+ * \param[out] buf          Buffer containing description of the region pointed by region reference
+ *
+ * \return \herr_t
+ *
+ * \details H5LRget_region_info() queries information about the data
+ *          pointed by a region reference \p ref. It returns one of the
+ *          absolute paths to a dataset, length of the path, dataset’s rank
+ *          and datatype, description of the referenced region and type of
+ *          the referenced region. Any output argument can be NULL if that
+ *          argument does not need to be returned.
+ *
+ *          The parameter \p obj_id is an identifier for any object in the
+ *          HDF5 file containing the referenced object. For example, it can
+ *          be an identifier of a dataset the region reference belongs to
+ *          or an identifier of an HDF5 file the dataset with region references
+ *          is stored in.
+ *
+ *          The parameter \p ref is a region reference to query.
+ *
+ *          The parameter \p path is a pointer to application allocated
+ *          buffer of size \p len+1 to return an absolute path to a dataset
+ *          the region reference points to.
+ *
+ *          The parameter \p len is a length of absolute path string plus
+ *          the \0 string terminator. If path parameter is NULL, actual
+ *          length of the path (+1 for \0 string terminator) is returned to
+ *          application and can be used to allocate buffer path of an
+ *          appropriate length \p len.
+ *
+ *          The parameter \p sel_type describes the type of the selected
+ *          region. Possible values can be #H5S_SEL_POINTS for point
+ *          selection and #H5S_SEL_HYPERSLABS for hyperslab selection.
+ *
+ *          The parameter \p numelem describes how many elements will be
+ *          placed in the buffer \p buf. The number should be interpreted
+ *          using the value of \p sel_type.
+ *
+ *          If value of \p sel_type is #H5S_SEL_HYPERSLABS, the parameter
+ *          \p buf contains \p numelem blocks of the coordinates for each
+ *          simple hyperslab of the referenced region. Each block has
+ *          length \c 2*\p rank and is organized as follows: <"start" coordinate>,
+ *          immediately followed by <"opposite" corner coordinate>.
+ *          The total size of the buffer to hold the description of the
+ *          region will be \c 2*\p rank*\p numelem. If region reference
+ *          points to a contiguous sub-array, then the value of \p numelem
+ *          is 1 and the block contains coordinates of the upper left and
+ *          lower right corners of the sub-array (or simple hyperslab).
+ *
+ *          If value of \p sel_type is #H5S_SEL_POINTS, the parameter \p buf
+ *          contains \p numelem blocks of the coordinates for each selected
+ *          point of the referenced region. Each block has length \p rank
+ *          and contains coordinates of the element. The total size of the
+ *          buffer to hold the description of the region will be
+ *          \p rank* \p numelem.
+ *
+ *
+ * \version 1.1 Fortran wrapper introduced in this release.
+ *
+ * \since 1.0
+ *
+ */
+H5_HLRDLL herr_t H5LRget_region_info(hid_t obj_id,
+                     const hdset_reg_ref_t *ref,
+                     size_t *len, 
+                     char *path,
+                     int *rank,
+                     hid_t *dtype,
+                     H5S_sel_type *sel_type,
+                     size_t *numelem,
+                     hsize_t *buf );
+
+
+
+/*-------------------------------------------------------------------------
+ *
+ * Make dataset functions
+ *
+ *-------------------------------------------------------------------------
+ */
+
+/**
+ * --------------------------------------------------------------------------
+ * \ingroup H5LR
+ *
+ * \brief Copies data from a specified region in a source dataset
+ *        to a specified region in a destination dataset
+ *
+ * \param[in] file_src          Name of the source file
+ * \param[in] path_src          Full path to the source dataset
+ * \param[in] block_coord_src   Hyperslab coordinates in the source dataset
+ * \param[in] file_dest         Name of the destination file
+ * \param[in] path_dest         Full path to the destination dataset
+ * \param[in] block_coord_dset  Hyperslab coordinates in the destination dataset
+ *
+ * \return \herr_t
+ *
+ * \details Given a path to a dataset \p path_src in a file with the
+ *          name \p file_src, and description of a simple hyperslab of
+ *          the source \p block_coord_src, the function will write data
+ *          to the dataset \p path_dest in file \p file_dest to the
+ *          simple hyperslab specified by \p block_coord_dset.
+ *          The arrays \p block_coord_src and \p block_coord_dset have
+ *          a length of 2*rank and are the coordinates of the starting
+ *          point following by the coordinates of the ending point of the
+ *          hyperslab. For example, to specify a rectangular hyperslab
+ *          destination region starting at element (2,2) to element (5,4)
+ *          then \p block_coord_dset would be {2, 2, 5, 4}.
+ *
+ *          If \p path_dest does not exist in the destination file
+ *          (as may be the case when writing to a new file) then the
+ *          dataset will be copied directly to the \p path_dest and
+ *          \p block_coord_dset will be disregarded.
+ *
+ * \version 1.1 Fortran wrapper introduced in this release.
+ *
+ * \since 1.0
+ *
+ */
+H5_HLRDLL herr_t H5LTcopy_region(const char *file_src,
+                 const char *path_src,
+                 const hsize_t *block_coord_src,
+                 const char *file_dest,
+                 const char *path_dest,
+                 const hsize_t *block_coord_dset);
+
+/*-------------------------------------------------------------------------
+ *
+ * Read dataset functions
+ *
+ *-------------------------------------------------------------------------
+ */
+
+/**
+ * --------------------------------------------------------------------------
+ * \ingroup H5LR
+ *
+ * \brief Reads selected data to an application buffer.
+ *
+ * \param[in] file          Name of file
+ * \param[in] path          Full path to a dataset
+ * \param[in] block_coord   Hyperslab coordinates
+ * \param[in] mem_type      Memory datatype, describing the buffer the referenced data will be read into
+ * \param[out] buf          Buffer containing data from the referenced region
+ *
+ * \return \herr_t
+ *
+ * \details H5LTread_region() reads data from a region described by
+ *          the hyperslab coordinates in \p block_coord, located in
+ *          the dataset specified by its absolute path \p path in a
+ *          file specified by its name \p file. Data is read into a
+ *          buffer \p buf of the datatype that corresponds to the
+ *          HDF5 datatype specified by \p mem_type.
+ *
+ *          Buffer \p block_coord has size 2*rank and is the coordinates
+ *          of the starting point following by the coordinates of the
+ *          ending point of the hyperslab. For example, to extract a
+ *          rectangular hyperslab region starting at element (2,2) to
+ *          element (5,4) then \p block_coord would be {2, 2, 5, 4}.
+ *
+ *          Buffer \p buf should be big enough to hold selected elements
+ *          of the type that corresponds to the \p mem_type
+ *
+ * \version 1.1 Fortran wrapper introduced in this release.
+ *
+ * \since 1.0
+ *
+ */
+H5_HLRDLL herr_t  H5LTread_region(const char *file,
+                  const char *path,
+                  const hsize_t *block_coord,
+                  hid_t mem_type,
+                  void *buf );
+
+/**
+ * --------------------------------------------------------------------------
+ * \ingroup H5LR
+ *
+ * \brief Retrieves the values of quality flags for each element
+ *        to the application provided buffer.
+ *
+ * \param[in] dset_id   Identifier of the dataset with bit-field values
+ * \param[in] num_values    Number of the values to be extracted
+ * \param[in] offset        Array of staring bits to be extracted from
+ *                          the element; valid values: 0 (zero) through 7
+ * \param[in] lengths       Array of the number of bits to be extracted for each value
+ * \param[in] space         Dataspace identifier, describing the elements
+ *                          to be read from the dataset with bit-field values
+ * \param[out] buf          Buffer to read the values in
+ *
+ * \return \herr_t
+ *
+ * \details H5LTread_bitfield_value() reads selected elements from a
+ *          dataset specified by its identifier \p dset_id, and unpacks
+ *          the bit-field values to a buffer \p buf.
+ *
+ *          The parameter \p space is a space identifier that indicates
+ *          which elements of the dataset should be read.
+ *
+ *          The parameter \p offset is an array of length \p num_values;
+ *          the i<sup>th</sup> element of the array holds the value of the
+ *          starting bit of the i<sup>th</sup> bit-field value.
+ *          Valid values are: 0 (zero) through 7.
+ *
+ *          The parameter \p lengths is an array of length \p num_values;
+ *          the i<sup>th</sup> element of the array holds the number of
+ *          bits to be extracted for the i<sup>th</sup> bit-field value.
+ *          Extracted bits will be interpreted as a base-2 integer value.
+ *          Each value will be converted to the base-10 integer value and
+ *          stored in the application buffer.
+ *
+ *          Buffer \p buf is allocated by the application and should be big
+ *          enough to hold \c num_sel_elem * \p num_values elements of the
+ *          specified type, where \c num_sel_elem is a number of the elements
+ *          to be read from the dataset. Data in the buffer is organized
+ *          as \p num_values values for the first element, followed by the
+ *          \p num_values values for the second element, ... , followed by
+ *          the \p num_values values for the
+ *          \c num_selected_elem<sup>th</sup> element.
+ *
+ * \version 1.1 Fortran wrapper introduced in this release.
+ *
+ * \since 1.0
+ *
+ */
+H5_HLRDLL herr_t H5LTread_bitfield_value(hid_t dset_id, int num_values, const unsigned *offset,
+                 const unsigned *lengths, hid_t space, int *buf);
+
diff --git a/doxygen/dox/maybe_metadata_reads.dox b/doxygen/dox/maybe_metadata_reads.dox
new file mode 100644
index 0000000..1bb53e0
--- /dev/null
+++ b/doxygen/dox/maybe_metadata_reads.dox
@@ -0,0 +1,50 @@
+/**
+ * \page maybe_metadata_reads Functions with No Access Property List Parameter that May Generate Metadata Reads
+ *
+ * \ingroup GACPL
+ *
+ * Currently there are several operations in HDF5 that can issue metadata reads
+ * from the metadata cache, but that take no property list. It is therefore not
+ * possible to set a collective requirement individually for those operations. The
+ * only solution with the HDF5 1.10.0 release is to set the collective requirement
+ * globally on H5Fopen() or H5Fcreate() for all metadata operations to be
+ * collective.
+ *
+ * The following is a list of those functions in the HDF5 library. This list is
+ * integral to the discussion in the H5Pset_all_coll_metadata_ops() entry:
+ *
+ * H5Awrite(), H5Aread(), H5Arename(), H5Aiterate2(), H5Adelete(), H5Aexists()
+ *
+ * H5Dget_space_status(), H5Dget_storage_size(), H5Dset_extent(), H5Ddebug(),
+ * H5Dclose(), H5Dget_create_plist(), H5Dget_space() (for virtual datasets)
+ *
+ * H5Gget_create_plist(), H5Gget_info(), H5Gclose()
+ *
+ * H5Literate(), H5Lvisit()
+ *
+ * H5Rcreate(), H5Rdereference2() (for object references),
+ * H5Rget_region(), H5Rget_obj_type2(), H5Rget_name()
+ *
+ * H5Ocopy(), H5Oopen_by_addr(), H5Oincr_refcount(), H5Odecr_refcount(),
+ * H5Oget_info(), H5Oset_comment(), H5Ovisit()
+ *
+ * H5Fis_hdf5(), H5Fflush(), H5Fclose(), H5Fget_file_image(), H5Freopen(),
+ * H5Fget_freespace(), H5Fget_info2(), H5Fget_free_sections(), H5Fmount(),
+ * H5Funmount()
+ *
+ * H5Iget_name()
+ *
+ * H5Tget_create_plist(), H5Tclose()
+ *
+ * H5Zunregister()
+ *
+ * In addition, \b most deprecated functions fall into this category.
+ *
+ * The HDF Group may address the above limitation in a future major release, but
+ * no decision has been made at this time. Such a change might, for example,
+ * include adding new versions of some or all the above functions with an extra
+ * property list parameter to allow an individual setting for the collective
+ * calling requirement.
+ *
+ * \sa_metadata_ops
+ */
diff --git a/doxygen/dox/rm-template.dox b/doxygen/dox/rm-template.dox
new file mode 100644
index 0000000..1e9f2d7
--- /dev/null
+++ b/doxygen/dox/rm-template.dox
@@ -0,0 +1,99 @@
+/** \page RMT Reference Manual (RM) Page Template
+
+We treat documentation like code and use
+<a href="https://www.doxygen.nl/index.html">Doxygen</a> to
+<a href="https://github.com/HDFGroup/hdf5/blob/develop/src/H5Fpublic.h">markup
+comments in the code</a> or create
+<a href="https://github.com/HDFGroup/hdf5/blob/develop/doxygen/dox/Overview.dox">stand-alone pages</a>.
+
+Every RM entry consists of a subset of the elements listed below. Not every RM
+entry warrants the full set. More is better, and we can, perhaps, distinguish
+minimal, typical, and great RM entries.
+
+A minimal RM entry must include elements 1-3, 8, 11, and 7 if applicable.
+
+A \Emph{typical} RM entry is a minimal RM entry that in addition has elements
+9, 10, and 12.
+
+A \Bold{great} RM entry is a typical RM entry plus everything else.
+
+The current RM is a mixed bag. Take what's there with a pinch of salt and apply
+the <a href="https://www.oreilly.com/library/view/97-things-every/9780596809515/ch08.html">Scout Rule</a>!
+
+\par RM entry elements
+
+1. Module indication
+   - Indicate the HDF5 module in which the function will appear.
+     \verbatim
+     * \ingroup H5XYZ
+     \endverbatim
+2. Synopsis
+   - A phrase or sentence that summarizes the function's purpose
+     \verbatim
+     * \brief Simplifies your life
+     \endverbatim
+3. Prototype (parameters and return value)
+   - A description of the function parameters and return value
+     \verbatim
+     * \param[in]     name1 Description of IN parameter \p name1
+     * \param[out]    name2 Description of OUT parameter \p name2
+     * \param[in,out] name3 Description of INOUT parameter \p name3
+     * \return Returns what you always wanted
+     \endverbatim
+   - Clearly indicate the parameter direction as \c in, \c out, or
+     \Code{in,out}
+   - Make reference to other parameters using \Code{\\p}
+4. Preconditions
+   - A set of preconditions that must be met.
+     \verbatim
+     * \pre The argument supplied in parameter \p name2 must be even.
+     \endverbatim
+5. Invariants
+   - A set of invariants.
+     \verbatim
+     * \invariant The mouse pointer will always be visible.
+     \endverbatim
+6. Postconditions
+   - What will be true when the function returns.
+     \verbatim
+     * \post On error, the output parameters will be unmodified.
+     \endverbatim
+7. Deprecation note
+   - If a function was deprecated, list the version in which the function was
+     deprecated (below), why it was deprecated, and which function(s) succeed it.
+     \verbatim
+     * \deprecated Deprecated in favor of another great function.
+     \endverbatim
+8. Details
+   - A detailed description of the function's behavior
+     \verbatim
+     * \details This is the heart of the matter. Try to be helpful!
+     \endverbatim
+9. Example
+   - The function in context and action, usually a (Doxygen) snippet.
+     \verbatim
+     * \par Example
+     * \snippet H5F_examples.c minimal
+     \endverbatim
+10. Instruction (attention, note, warning)
+   - Behaviors, features, side-effects, etc. the user should be aware of
+     \verbatim
+     * \note  Dear reader, ...
+     *
+     * \attention Colorless green ideas sleep furiously.
+     *
+     * \warning Don't do this at home!
+     \endverbatim
+11. Since
+   - The HDF5 library version in which the function was introduced
+     \verbatim
+     * \since 1.MAJOR.MINOR
+     \endverbatim
+12. Version
+   - Use this element to record a deprecation version, a change in parameter
+     types, changes in behavior, etc.
+     \verbatim
+     * \version 1.MAJOR.MINOR Function was deprecated in this release
+     \endverbatim
+
+*/
diff --git a/doxygen/examples/DebuggingHDF5Applications.html b/doxygen/examples/DebuggingHDF5Applications.html
new file mode 100644
index 0000000..3390887
--- /dev/null
+++ b/doxygen/examples/DebuggingHDF5Applications.html
@@ -0,0 +1,392 @@
+<html>
+  <head>
+    <title>Debugging HDF5 Applications</title>
+
+    <h2>Introduction</h2>
+
+    <p>The HDF5 library contains a number of debugging features to
+      make programmers' lives easier including the ability to print
+      detailed error messages, check invariant conditions, display
+      timings and other statistics, and trace API function calls and
+      return values.
+
+    </p><dl>
+      <dt><b>Error Messages</b>
+      </dt><dd>Error messages are normally displayed automatically on the
+	standard error stream and include a stack trace of the library
+	including file names, line numbers, and function names. The
+	application has complete control over how error messages are
+	displayed and can disable the display on a permanent or
+	temporary basis. Refer to the documentation for the H5E error
+	handling package.
+
+	<br><br>
+      </dd><dt><b>Invariant Conditions</b>
+      </dt><dd>Unless <code>NDEBUG</code> is defined during compiling, the
+	library will include code to verify that invariant conditions
+	have the expected values.  When a problem is detected the
+	library will display the file and line number within the
+	library and the invariant condition that failed.  A core dump
+	may be generated for post mortem debugging. The code to
+	perform these checks can be included on a per-package bases.
+
+	<br><br>
+      </dd><dt><b>Timings and Statistics</b>
+      </dt><dd>The library can be configured to accumulate certain
+	statistics about things like cache performance, datatype
+	conversion, data space conversion, and data filters. The code
+	is included on a per-package basis and enabled at runtime by
+	an environment variable.
+
+	<br><br>
+      </dd><dt><b>API Tracing</b>
+      </dt><dd>All API calls made by an application can be displayed and
+	include formal argument names and actual values and the
+	function return value. This code is also conditionally
+	included at compile time and enabled at runtime.
+    </dd></dl>
+
+    <p>The statistics and tracing can be displayed on any output
+      stream (including streams opened by the shell) with output from
+      different packages even going to different streams.
+
+    </p><h2>Error Messages</h2>
+
+    <p>By default any API function that fails will print an error
+      stack to the standard error stream.
+
+    </p><p>
+      </p><center>
+	<table border="" align="center" width="100%">
+	  <tbody><tr>
+	    <td>
+	      <p><code></code></p><pre><code>
+HDF5-DIAG: Error detected in thread 0.  Back trace follows.
+  #000: H5F.c line 1245 in H5Fopen(): unable to open file
+    major(04): File interface
+    minor(10): Unable to open file
+  #001: H5F.c line 846 in H5F_open(): file does not exist
+    major(04): File interface
+    minor(10): Unable to open file
+	      </code></pre>
+	    </td>
+	  </tr>
+	</tbody></table>
+      </center>
+
+    <p>The error handling package (H5E) is described
+      <a href="./group___h5_e.html">elsewhere</a>.
+
+    </p><h2>Invariant Conditions</h2>
+
+    <p>To include checks for invariant conditions the library should
+      be configured with <code>--disable-production</code>, the
+      default for versions before 1.2. The library designers have made
+      every attempt to handle error conditions gracefully but an
+      invariant condition assertion may fail in certain cases.  The
+      output from a failure usually looks something like this:
+
+    </p><p>
+      </p><center>
+	<table border="" align="center" width="100%">
+	  <tbody><tr>
+	    <td>
+	      <p><code></code></p><pre><code>
+Assertion failed: H5.c:123: i&lt;NELMTS(H5_debug_g)
+IOT Trap, core dumped.
+	      </code></pre>
+	    </td>
+	  </tr>
+	</tbody></table>
+      </center>
+
+    <h2>Timings and Statistics</h2>
+
+    <p>Code to accumulate statistics is included at compile time by
+      using the <code>--enable-debug</code> configure switch. The
+      switch can be followed by an equal sign and a comma-separated
+      list of package names or else a default list is used.
+
+    </p><p>
+      </p><center>
+        <table border="" align="center" width="80%">
+          <tbody><tr>
+            <th>Name</th>
+	    <th>Default</th>
+            <th>Description</th>
+          </tr>
+	  <tr>
+	    <td align="center">a</td>
+	    <td align="center">No</td>
+	    <td>Attributes</td>
+	  </tr>
+	  <tr>
+	    <td align="center">ac</td>
+	    <td align="center">Yes</td>
+	    <td>Meta data cache</td>
+	  </tr>
+	  <tr>
+	    <td align="center">b</td>
+	    <td align="center">Yes</td>
+	    <td>B-Trees</td>
+	  </tr>
+	  <tr>
+	    <td align="center">d</td>
+	    <td align="center">Yes</td>
+	    <td>Datasets</td>
+	  </tr>
+	  <tr>
+	    <td align="center">e</td>
+	    <td align="center">Yes</td>
+	    <td>Error handling</td>
+	  </tr>
+	  <tr>
+	    <td align="center">f</td>
+	    <td align="center">Yes</td>
+	    <td>Files</td>
+	  </tr>
+	  <tr>
+	    <td align="center">g</td>
+	    <td align="center">Yes</td>
+	    <td>Groups</td>
+	  </tr>
+	  <tr>
+	    <td align="center">hg</td>
+	    <td align="center">Yes</td>
+	    <td>Global heap</td>
+	  </tr>
+	  <tr>
+	    <td align="center">hl</td>
+	    <td align="center">No</td>
+	    <td>Local heaps</td>
+	  </tr>
+	  <tr>
+	    <td align="center">i</td>
+	    <td align="center">Yes</td>
+	    <td>Interface abstraction</td>
+	  </tr>
+	  <tr>
+	    <td align="center">mf</td>
+	    <td align="center">No</td>
+	    <td>File memory management</td>
+	  </tr>
+	  <tr>
+	    <td align="center">mm</td>
+	    <td align="center">Yes</td>
+	    <td>Library memory management</td>
+	  </tr>
+	  <tr>
+	    <td align="center">o</td>
+	    <td align="center">No</td>
+	    <td>Object headers and messages</td>
+	  </tr>
+	  <tr>
+	    <td align="center">p</td>
+	    <td align="center">Yes</td>
+	    <td>Property lists</td>
+	  </tr>
+	  <tr>
+	    <td align="center">s</td>
+	    <td align="center">Yes</td>
+	    <td>Data spaces</td>
+	  </tr>
+	  <tr>
+	    <td align="center">t</td>
+	    <td align="center">Yes</td>
+	    <td>Datatypes</td>
+	  </tr>
+	  <tr>
+	    <td align="center">v</td>
+	    <td align="center">Yes</td>
+	    <td>Vectors</td>
+	  </tr>
+	  <tr>
+	    <td align="center">z</td>
+	    <td align="center">Yes</td>
+	    <td>Raw data filters</td>
+	  </tr>
+        </tbody></table>
+      </center>
+
+    <p>In addition to including the code at compile time the
+      application must enable each package at runtime.  This is done
+      by listing the package names in the <code>HDF5_DEBUG</code>
+      environment variable. That variable may also contain file
+      descriptor numbers (the default is `2') which control the output
+      for all following packages up to the next file number.  The
+      word <code>all</code> refers to all packages. Any word my be
+      preceded by a minus sign to turn debugging off for the package.
+
+    </p><p>
+      </p><center>
+	<table border="" align="center" width="100%">
+	  <caption align="top"><b>Sample debug specifications</b></caption>
+	  <tbody><tr valign="top">
+	    <td><code>all</code></td>
+	    <td>This causes debugging output from all packages to be
+	      sent to the standard error stream.</td>
+	  </tr>
+	  <tr valign="top">
+	    <td><code>all -t -s</code></td>
+	    <td>Debugging output for all packages except datatypes
+	      and data spaces will appear on the standard error
+	      stream.</td>
+	  </tr>
+	  <tr valign="top">
+	    <td><code>-all ac 255 t,s</code></td>
+	    <td>This disables all debugging even if the default was to
+	      debug something, then output from the meta data cache is
+	      send to the standard error stream and output from data
+	      types and spaces is sent to file descriptor 255 which
+	      should be redirected by the shell.</td>
+	  </tr>
+	</tbody></table>
+      </center>
+
+    <p>The components of the <code>HDF5_DEBUG</code> value may be
+      separated by any non-lowercase letter.
+
+    </p><h2>API Tracing</h2>
+
+    <p>The HDF5 library can trace API calls by printing the
+      function name, the argument names and their values, and the
+      return value. Some people like to see lots of output during
+      program execution instead of using a good symbolic debugger, and
+      this feature is intended for their consumption.  For example,
+      the output from <code>h5ls foo</code> after turning on tracing,
+      includes:
+
+    </p><p>
+      </p><center>
+	<table border="" align="center" width="100%">
+	  <tbody><tr>
+	    <td>
+	      <code><pre>
+H5Tcopy(type=184549388) = 184549419 (type);
+H5Tcopy(type=184549392) = 184549424 (type);
+H5Tlock(type=184549424) = SUCCEED;
+H5Tcopy(type=184549393) = 184549425 (type);
+H5Tlock(type=184549425) = SUCCEED;
+H5Fopen(filename="foo", flags=0, access=H5P_DEFAULT) = FAIL;
+HDF5-DIAG: Error detected in thread 0.  Back trace follows.
+  #000: H5F.c line 1245 in H5Fopen(): unable to open file
+    major(04): File interface
+    minor(10): Unable to open file
+  #001: H5F.c line 846 in H5F_open(): file does not exist
+    major(04): File interface
+    minor(10): Unable to open file
+	      </pre></code>
+	    </td>
+	  </tr>
+	</tbody></table>
+      </center>
+
+    <p>The code that performs the tracing must be included in the
+      library by specifying the <code>--enable-trace</code>
+      configuration switch (the default for versions before 1.2). Then
+      the word <code>trace</code> must appear in the value of the
+      <code>HDF5_DEBUG</code> variable.  The output will appear on the
+      last file descriptor before the word <code>trace</code> or two
+      (standard error) by default.
+
+    </p><p>
+      </p><center>
+	<table border="" align="center" width="100%">
+	  <tbody><tr>
+	    <td>To display the trace on the standard error stream:
+	      <code><pre>$ env HDF5_DEBUG=trace a.out
+	      </pre></code>
+	    </td>
+	  </tr>
+	  <tr>
+	    <td>To send the trace to a file:
+	      <code><pre>$ env HDF5_DEBUG="55 trace" a.out 55&gt;trace-output
+	      </pre></code>
+	    </td>
+	  </tr>
+	</tbody></table>
+      </center>
+
+    <h3>Performance</h3>
+
+    <p>If the library was not configured for tracing then there is no
+      unnecessary overhead since all tracing code is excluded.
+      However, if tracing is enabled but not used there is a small
+      penalty. First, code size is larger because of extra
+      statically-declared character strings used to store argument
+      types and names and extra auto variable pointer in each
+      function.  Also, execution is slower because each function sets
+      and tests a local variable and each API function calls the
+      <code>H5_trace()</code> function.
+
+    </p><p>If tracing is enabled and turned on then the penalties from the
+      previous paragraph apply plus the time required to format each
+      line of tracing information.  There is also an extra call to
+      H5_trace() for each API function to print the return value.
+
+    </p><h3>Safety</h3>
+
+    <p>The tracing mechanism is invoked for each API function before
+      arguments are checked for validity.  If bad arguments are passed
+      to an API function it could result in a segmentation fault.
+      However, the tracing output is line-buffered so all previous
+      output will appear.
+
+    </p><h3>Completeness</h3>
+
+    <p>There are two API functions that don't participate in
+      tracing. They are <code>H5Eprint()</code> and
+      <code>H5Eprint_cb()</code> because their participation would
+      mess up output during automatic error reporting.
+
+    </p><p>On the other hand, a number of API functions are called during
+      library initialization and they print tracing information.
+
+    </p><h3>Implementation</h3>
+
+    <p>For those interested in the implementation here is a
+      description.  Each API function should have a call to one of the
+      <code>H5TRACE()</code> macros immediately after the
+      <code>FUNC_ENTER()</code> macro.  The first argument is the
+      return type encoded as a string.  The second argument is the
+      types of all the function arguments encoded as a string.  The
+      remaining arguments are the function arguments.  This macro was
+      designed to be as terse and unobtrousive as possible.
+
+    </p><p>In order to keep the <code>H5TRACE()</code> calls synchronized
+      with the source code we've written a perl script which gets
+      called automatically just before Makefile dependencies are
+      calculated for the file.  However, this only works when one is
+      using GNU make.  To reinstrument the tracing explicitly, invoke
+      the <code>trace</code> program from the hdf5 bin directory with
+      the names of the source files that need to be updated.  If any
+      file needs to be modified then a backup is created by appending
+      a tilde to the file name.
+
+    </p><p>
+      </p><center>
+	<table border="" align="center" width="100%">
+	  <caption align="top"><b>Explicit Instrumentation</b></caption>
+	  <tbody><tr>
+	    <td>
+	      <code><pre>
+$ ../bin/trace *.c
+H5E.c: in function `H5Ewalk_cb':
+H5E.c:336: warning: trace info was not inserted
+	      </pre></code>
+	    </td>
+	  </tr>
+	</tbody></table>
+      </center>
+
+    <p>Note: The warning message is the result of a comment of the
+      form <code>/*NO TRACE*/</code> somewhere in the function
+      body. Tracing information will not be updated or inserted if
+      such a comment exists.
+
+    </p><p>Error messages have the same format as a compiler so that they
+      can be parsed from program development environments like
+      Emacs. Any function which generates an error will not be
+      modified.</p>
+
+</body></html>
diff --git a/doxygen/examples/FF-IH_FileGroup.gif b/doxygen/examples/FF-IH_FileGroup.gif
new file mode 100644
index 0000000..b0d76f5
--- /dev/null
+++ b/doxygen/examples/FF-IH_FileGroup.gif
diff --git a/doxygen/examples/FF-IH_FileObject.gif b/doxygen/examples/FF-IH_FileObject.gif
new file mode 100644
index 0000000..8eba623
--- /dev/null
+++ b/doxygen/examples/FF-IH_FileObject.gif
diff --git a/doxygen/examples/FileFormat.html b/doxygen/examples/FileFormat.html
new file mode 100644
index 0000000..fc35357
--- /dev/null
+++ b/doxygen/examples/FileFormat.html
@@ -0,0 +1,1275 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!-- saved from url=(0072)https://gamma.hdfgroup.org/papers/HISS/030515.FileFormat/FileFormat.html -->
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>HDF5 File Format Discussion</title>
+
+  <meta name="author" content="Quincey Koziol">
+</head>
+
+<body text="#000000" bgcolor="#FFFFFF">
+
+<style type="text/css">
+OL.loweralpha { list-style-type: lower-alpha }
+OL.upperroman { list-style-type: upper-roman }
+</style>
+
+<style type="text/css">
+TD CAPTION EM { color: red }
+TD EM { color: blue }
+TABLE CAPTION STRONG { font-size: larger }
+</style>
+
+<center><h1>HDF5 File Format Discussion</h1></center>
+<center><h3>Quincey Koziol<br>
+            koziol@ncsa.uiuc.edu<br>
+            May 15, 2003
+</h3></center>
+
+<ol class="upperroman">
+
+<li><h3><u>Document's Audience:</u></h3>
+
+<ul>
+    <li>Current H5 library designers and knowledgable external developers.</li>
+</ul>
+
+</li><li><h3><u>Background Reading:</u></h3>
+
+<dl>
+    <dt><a href="https://docs.hdfgroup.org/hdf5/develop/_s_p_e_c.html">HDF5 File Format Specification</a>
+        </dt><dd>This describes the current HDF5 file format.
+</dd></dl>
+
+</li><li><h3><u>Introduction:</u></h3>
+
+<dl>
+    <dt><strong>What is this document about?</strong></dt>
+        <dd>This document attempts to explain the HDF5 file format
+            specification with a few examples and describes some potential
+            improvements to the format specification.
+        </dd> <br>
+</dl>
+
+</li><li><h3><u>File Format Examples:</u></h3>
+
+<p>This section has several small programs and describes the format of a file
+created with each of them.
+</p>
+
+<p>Example program one - <em>Create an empty file</em>:
+</p><pre> <code>
+#include "hdf5.h"
+#include <assert.h>
+
+int main()
+{
+    hid_t fid;      /* File ID */
+    herr_t ret;     /* Generic return value */
+
+    /* Create the file */
+    fid=H5Fcreate("example1.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    assert(fid&gt;=0);
+
+    /* Close the file */
+    ret=H5Fclose(fid);
+    assert(ret&gt;=0);
+
+    return(0);
+}
+</assert.h></code> </pre>
+
+    <center>
+      <table border="" align="center" cellpadding="4" width="80%">
+	<caption align="top">
+	  <strong>Super Block</strong>
+	</caption>
+
+	<tbody><tr align="center">
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr align="center">
+	  <td>\211</td>
+	  <td>'H'</td>
+	  <td>'D'</td>
+	  <td>'F'</td>
+	</tr>
+
+	<tr align="center">
+	  <td>\r</td>
+	  <td>\n</td>
+	  <td>\032</td>
+	  <td>\n</td>
+	</tr>
+
+	<tr align="center">
+	  <td>0</td>
+	  <td>0</td>
+	  <td>0</td>
+	  <td>0</td>
+	</tr>
+
+	<tr align="center">
+	  <td>0</td>
+	  <td>8</td>
+	  <td>8</td>
+	  <td>0</td>
+	</tr>
+
+	<tr align="center">
+	  <td colspan="2">4</td>
+	  <td colspan="2">16</td>
+	</tr>
+
+	<tr align="center">
+	  <td colspan="4">0x00000003</td>
+	</tr>
+
+	<tr align="center">
+	  <td colspan="4">0</td>
+	</tr>
+
+	<tr align="center">
+          <td colspan="4"><br>0xffffffffffffffff<br><br></td>
+	</tr>
+
+	<tr align="center">
+	  <td colspan="4">?</td>
+	</tr>
+
+	<tr align="center">
+          <td colspan="4"><br>0xffffffffffffffff<br><br></td>
+	</tr>
+
+	<tr align="center">
+	  <td colspan="4">
+	      <table border="" width="100%">
+		<tbody><tr align="center">
+		  <td colspan="4">0</td>
+		</tr>
+
+		<tr align="center">
+		  <td colspan="4"><br>928<br><br></td>
+		</tr>
+
+		<tr align="center">
+		  <td colspan="4">H5G_CACHED_STAB (1)</td>
+		</tr>
+
+		<tr align="center">
+		  <td colspan="4">0</td>
+		</tr>
+
+		<tr align="center">
+		  <td colspan="4">
+                      <table border="" width="100%">
+                        <tbody><tr align="center">
+                          <td colspan="4"><br>384<br><br></td>
+                        </tr>
+                        <tr align="center">
+                          <td colspan="4"><br>96<br><br></td>
+                        </tr>
+                      </tbody></table>
+                  </td>
+		</tr>
+	      </tbody></table>
+          </td>
+	</tr>
+      </tbody></table>
+    </center>
+<br>
+<pre> <code>
+%h5debug example1.h5
+
+Reading signature at address 0 (rel)
+File Super Block...
+File name:                                         example1.h5
+File access flags                                  0x00000000
+File open reference count:                         1
+Address of super block:                            0 (abs)
+Size of user block:                                0 bytes
+Super block version number:                        0
+Free list version number:                          0
+Root group symbol table entry version number:      0
+Shared header version number:                      0
+Size of file offsets (haddr_t type):               8 bytes
+Size of file lengths (hsize_t type):               8 bytes
+Symbol table leaf node 1/2 rank:                   4
+Symbol table internal node 1/2 rank:               16
+File consistency flags:                            0x00000003
+Base address:                                      0 (abs)
+Free list address:                                 UNDEF (rel)
+Address of driver information block:               UNDEF (rel)
+Root group symbol table entry:
+   Name offset into private heap:                  0
+   Object header address:                          928
+   Dirty:                                          Yes
+   Cache info type:                                Symbol Table
+   Cached information:
+      B-tree address:                              384
+      Heap address:                                96
+</code> </pre>
+
+
+    <center>
+      <table border="" cellpadding="4" width="80%">
+	<caption align="top">
+	  <strong>Root Group Object Header</strong>
+	</caption>
+
+	<tbody><tr align="center">
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr align="center">
+	  <td colspan="1" width="25%">1</td>
+	  <td colspan="1" width="25%">0</td>
+	  <td colspan="2" width="50%">2</td>
+	</tr>
+	<tr align="center">
+	  <td colspan="4">1</td>
+	</tr>
+	<tr align="center">
+	  <td colspan="4">32</td>
+	</tr>
+	<tr align="center">
+	  <td colspan="2">0x0011</td>
+	  <td colspan="2">16</td>
+	</tr>
+	<tr align="center">
+	  <td>0x01</td>
+	  <td colspan="3">0</td>
+	</tr>
+	<tr align="center">
+	  <td colspan="4">
+              <table border="" width="100%">
+                <tbody><tr align="center">
+                  <td colspan="4"><br>384<br><br></td>
+                </tr>
+                <tr align="center">
+                  <td colspan="4"><br>96<br><br></td>
+                </tr>
+              </tbody></table>
+          </td>
+	</tr>
+	<tr align="center">
+	  <td colspan="2">0</td>
+	  <td colspan="2">0</td>
+	</tr>
+	<tr align="center">
+	  <td>0x00</td>
+	  <td colspan="3">0</td>
+	</tr>
+      </tbody></table>
+    </center>
+<br>
+<pre> <code>
+%h5debug example1.h5 928
+
+New address: 928
+Reading signature at address 928 (rel)
+Object Header...
+Dirty:                                             0
+Version:                                           1
+Header size (in bytes):                            16
+Number of links:                                   1
+Number of messages (allocated):                    2 (32)
+Number of chunks (allocated):                      1 (8)
+Chunk 0...
+   Dirty:                                          0
+   Address:                                        944
+   Size in bytes:                                  32
+Message 0...
+   Message ID (sequence number):                   0x0011 stab(0)
+   Shared message:                                 No
+   Constant:                                       Yes
+   Raw size in obj header:                         16 bytes
+   Chunk number:                                   0
+   Message Information:
+      B-tree address:                              384
+      Name heap address:                           96
+Message 1...
+   Message ID (sequence number):                   0x0000 null(0)
+   Shared message:                                 No
+   Constant:                                       No
+   Raw size in obj header:                         0 bytes
+   Chunk number:                                   0
+   Message Information:
+      <no info="" for="" this="" message="">
+</no></code> </pre>
+
+	    <center>
+	      <table border="" cellpadding="4" width="80%">
+		<caption align="top">
+		  <strong>Root Group Local Heap</strong>
+		</caption>
+
+		<tbody><tr align="center">
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+		</tr>
+
+		<tr align="center">
+                  <td>'H'</td>
+                  <td>'E'</td>
+                  <td>'A'</td>
+                  <td>'P'</td>
+		</tr>
+
+		<tr align="center">
+		  <td colspan="4">0</td>
+		</tr>
+
+		<tr align="center">
+		  <td colspan="4">256</td>
+		</tr>
+
+		<tr align="center">
+		  <td colspan="4">8</td>
+		</tr>
+
+		<tr align="center">
+		  <td colspan="4">128</td>
+		</tr>
+	      </tbody></table>
+	    </center>
+<br>
+
+<pre> <code>
+%h5debug example1.h5 96
+
+New address: 96
+Reading signature at address 96 (rel)
+Local Heap...
+Dirty:                                             0
+Header size (in bytes):                            32
+Address of heap data:                              128
+Data bytes allocated on disk:                      256
+Data bytes allocated in core:                      256
+Free Blocks (offset, size):
+   Block #0:                                        8,      248
+Percent of heap used:                              3.12%
+Data follows (`__' indicates free region)...
+     0: 00 00 00 00 00 00 00 00  __ __ __ __ __ __ __ __ ........
+    16: __ __ __ __ __ __ __ __  __ __ __ __ __ __ __ __
+    32: __ __ __ __ __ __ __ __  __ __ __ __ __ __ __ __
+    48: __ __ __ __ __ __ __ __  __ __ __ __ __ __ __ __
+    64: __ __ __ __ __ __ __ __  __ __ __ __ __ __ __ __
+    80: __ __ __ __ __ __ __ __  __ __ __ __ __ __ __ __
+    96: __ __ __ __ __ __ __ __  __ __ __ __ __ __ __ __
+   112: __ __ __ __ __ __ __ __  __ __ __ __ __ __ __ __
+   128: __ __ __ __ __ __ __ __  __ __ __ __ __ __ __ __
+   144: __ __ __ __ __ __ __ __  __ __ __ __ __ __ __ __
+   160: __ __ __ __ __ __ __ __  __ __ __ __ __ __ __ __
+   176: __ __ __ __ __ __ __ __  __ __ __ __ __ __ __ __
+   192: __ __ __ __ __ __ __ __  __ __ __ __ __ __ __ __
+   208: __ __ __ __ __ __ __ __  __ __ __ __ __ __ __ __
+   224: __ __ __ __ __ __ __ __  __ __ __ __ __ __ __ __
+   240: __ __ __ __ __ __ __ __  __ __ __ __ __ __ __ __
+
+</code> </pre>
+
+	    <center>
+	      <table border="" cellpadding="4" width="80%">
+		<caption align="top">
+		  <strong>Root Group B-tree</strong>
+		</caption>
+
+		<tbody><tr align="center">
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+
+		</tr><tr align="center">
+                  <td>'T'</td>
+                  <td>'R'</td>
+                  <td>'E'</td>
+                  <td>'E'</td>
+
+		</tr><tr align="center">
+		  <td>0</td>
+		  <td>0</td>
+		  <td colspan="2">0</td>
+
+		</tr><tr align="center">
+		  <td colspan="4"><br>0xffffffffffffffff<br><br></td>
+
+		</tr><tr align="center">
+		  <td colspan="4"><br>0xffffffffffffffff<br><br></td>
+
+	      </tr></tbody></table>
+	    </center>
+<br>
+<pre> <code>
+%h5debug example1.h5 384 96
+
+New address: 384
+Reading signature at address 384 (rel)
+Tree type ID:                                      H5B_SNODE_ID
+Size of node:                                      544
+Size of raw (disk) key:                            8
+Dirty flag:                                        False
+Number of initial dirty children:                  0
+Level:                                             0
+Address of left sibling:                           UNDEF
+Address of right sibling:                          UNDEF
+Number of children (max):                          0 (32)
+
+</code> </pre>
+
+<p></p>
+
+<p>Example program two - <em>Create a file with a single dataset in it</em>:
+</p><pre> <code>
+#include "hdf5.h"
+#include <assert.h>
+
+int main()
+{
+    hid_t fid;      /* File ID */
+    hid_t sid;      /* Dataspace ID */
+    hid_t did;      /* Dataset ID */
+    herr_t ret;     /* Generic return value */
+
+    /* Create the file */
+    fid=H5Fcreate("example2.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    assert(fid&gt;=0);
+
+    /* Create a scalar dataspace for the dataset */
+    sid=H5Screate(H5S_SCALAR);
+    assert(sid&gt;=0);
+
+    /* Create a trivial dataset */
+    did=H5Dcreate(fid, "Dataset", H5T_NATIVE_INT, sid, H5P_DEFAULT);
+    assert(did&gt;=0);
+
+    /* Close the dataset */
+    ret=H5Dclose(did);
+    assert(ret&gt;=0);
+
+    /* Close the dataspace */
+    ret=H5Sclose(sid);
+    assert(ret&gt;=0);
+
+    /* Close the file */
+    ret=H5Fclose(fid);
+    assert(ret&gt;=0);
+
+    return(0);
+}
+</assert.h></code> </pre>
+
+    <center>
+      <table border="" align="center" cellpadding="4" width="80%">
+	<caption align="top">
+	  <strong>Super Block</strong>
+	</caption>
+
+	<tbody><tr align="center">
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr align="center">
+	  <td>\211</td>
+	  <td>'H'</td>
+	  <td>'D'</td>
+	  <td>'F'</td>
+	</tr>
+
+	<tr align="center">
+	  <td>\r</td>
+	  <td>\n</td>
+	  <td>\032</td>
+	  <td>\n</td>
+	</tr>
+
+	<tr align="center">
+	  <td>0</td>
+	  <td>0</td>
+	  <td>0</td>
+	  <td>0</td>
+	</tr>
+
+	<tr align="center">
+	  <td>0</td>
+	  <td>8</td>
+	  <td>8</td>
+	  <td>0</td>
+	</tr>
+
+	<tr align="center">
+	  <td colspan="2">4</td>
+	  <td colspan="2">16</td>
+	</tr>
+
+	<tr align="center">
+	  <td colspan="4">0x00000003</td>
+	</tr>
+
+	<tr align="center">
+	  <td colspan="4">0</td>
+	</tr>
+
+	<tr align="center">
+          <td colspan="4"><br>0xffffffffffffffff<br><br></td>
+	</tr>
+
+	<tr align="center">
+	  <td colspan="4">?</td>
+	</tr>
+
+	<tr align="center">
+          <td colspan="4"><br>0xffffffffffffffff<br><br></td>
+	</tr>
+
+	<tr align="center">
+	  <td colspan="4">
+	      <table border="" width="100%">
+		<tbody><tr align="center">
+		  <td colspan="4">0</td>
+		</tr>
+
+		<tr align="center">
+		  <td colspan="4"><br>928<br><br></td>
+		</tr>
+
+		<tr align="center">
+		  <td colspan="4">H5G_CACHED_STAB (1)</td>
+		</tr>
+
+		<tr align="center">
+		  <td colspan="4">0</td>
+		</tr>
+
+		<tr align="center">
+		  <td colspan="4">
+                      <table border="" width="100%">
+                        <tbody><tr align="center">
+                          <td colspan="4"><br>384<br><br></td>
+                        </tr>
+                        <tr align="center">
+                          <td colspan="4"><br>96<br><br></td>
+                        </tr>
+                      </tbody></table>
+                  </td>
+		</tr>
+	      </tbody></table>
+          </td>
+	</tr>
+      </tbody></table>
+    </center>
+<br>
+<pre> <code>
+%h5debug example2.h5
+
+Reading signature at address 0 (rel)
+File Super Block...
+File name:                                         example2.h5
+File access flags                                  0x00000000
+File open reference count:                         1
+Address of super block:                            0 (abs)
+Size of user block:                                0 bytes
+Super block version number:                        0
+Free list version number:                          0
+Root group symbol table entry version number:      0
+Shared header version number:                      0
+Size of file offsets (haddr_t type):               8 bytes
+Size of file lengths (hsize_t type):               8 bytes
+Symbol table leaf node 1/2 rank:                   4
+Symbol table internal node 1/2 rank:               16
+File consistency flags:                            0x00000003
+Base address:                                      0 (abs)
+Free list address:                                 UNDEF (rel)
+Address of driver information block:               UNDEF (rel)
+Root group symbol table entry:
+   Name offset into private heap:                  0
+   Object header address:                          928
+   Dirty:                                          Yes
+   Cache info type:                                Symbol Table
+   Cached entry information:
+      B-tree address:                              384
+      Heap address:                                96
+</code> </pre>
+
+    <center>
+      <table border="" cellpadding="4" width="80%">
+	<caption align="top">
+	  <strong>Root Group Object Header</strong>
+	</caption>
+
+	<tbody><tr align="center">
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr align="center">
+	  <td colspan="1" width="25%">1</td>
+	  <td colspan="1" width="25%">0</td>
+	  <td colspan="2" width="50%">2</td>
+	</tr>
+	<tr align="center">
+	  <td colspan="4">1</td>
+	</tr>
+	<tr align="center">
+	  <td colspan="4">32</td>
+	</tr>
+	<tr align="center">
+	  <td colspan="2">0x0011</td>
+	  <td colspan="2">16</td>
+	</tr>
+	<tr align="center">
+	  <td>0x01</td>
+	  <td colspan="3">0</td>
+	</tr>
+	<tr align="center">
+	  <td colspan="4">
+              <table border="" width="100%">
+                <tbody><tr align="center">
+                  <td colspan="4"><br>384<br><br></td>
+                </tr>
+                <tr align="center">
+                  <td colspan="4"><br>96<br><br></td>
+                </tr>
+              </tbody></table>
+          </td>
+	</tr>
+	<tr align="center">
+	  <td colspan="2">0</td>
+	  <td colspan="2">0</td>
+	</tr>
+	<tr align="center">
+	  <td>0x00</td>
+	  <td colspan="3">0</td>
+	</tr>
+      </tbody></table>
+    </center>
+<br>
+<pre> <code>
+%h5debug example2.h5 928
+
+New address: 928
+Reading signature at address 928 (rel)
+Object Header...
+Dirty:                                             0
+Version:                                           1
+Header size (in bytes):                            16
+Number of links:                                   1
+Number of messages (allocated):                    2 (32)
+Number of chunks (allocated):                      1 (8)
+Chunk 0...
+   Dirty:                                          0
+   Address:                                        944
+   Size in bytes:                                  32
+Message 0...
+   Message ID:                                     0x0011 stab(0)
+   Shared message:                                 No
+   Constant:                                       Yes
+   Raw size in obj header:                         16 bytes
+   Chunk number:                                   0
+   Message Information:
+      B-tree address:                              384
+      Name heap address:                           96
+Message 1...
+   Message ID:                                     0x0000 null(0)
+   Shared message:                                 No
+   Constant:                                       No
+   Raw size in obj header:                         0 bytes
+   Chunk number:                                   0
+   Message Information:
+      <no info="" for="" this="" message="">
+</no></code> </pre>
+
+	    <center>
+	      <table border="" cellpadding="4" width="80%">
+		<caption align="top">
+		  <strong>Root Group Local Heap</strong>
+		</caption>
+
+		<tbody><tr align="center">
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+		</tr>
+
+		<tr align="center">
+                  <td>'H'</td>
+                  <td>'E'</td>
+                  <td>'A'</td>
+                  <td>'P'</td>
+		</tr>
+
+		<tr align="center">
+		  <td colspan="4">0</td>
+		</tr>
+
+		<tr align="center">
+		  <td colspan="4">256</td>
+		</tr>
+
+		<tr align="center">
+		  <td colspan="4">16</td>
+		</tr>
+
+		<tr align="center">
+		  <td colspan="4">128</td>
+		</tr>
+	      </tbody></table>
+	    </center>
+<br>
+
+<pre> <code>
+%h5debug example2.h5 96
+
+New address: 96
+Reading signature at address 96 (rel)
+Local Heap...
+Dirty:                                             0
+Header size (in bytes):                            32
+Address of heap data:                              128
+Data bytes allocated on disk:                      256
+Data bytes allocated in core:                      256
+Free Blocks (offset, size):
+   Block #0:                                       16,      240
+Percent of heap used:                              6.25%
+Data follows (`__' indicates free region)...
+      0: 00 00 00 00 00 00 00 00  44 61 74 61 73 65 74 00 ........Dataset.
+     16: __ __ __ __ __ __ __ __  __ __ __ __ __ __ __ __
+     32: __ __ __ __ __ __ __ __  __ __ __ __ __ __ __ __
+     48: __ __ __ __ __ __ __ __  __ __ __ __ __ __ __ __
+     64: __ __ __ __ __ __ __ __  __ __ __ __ __ __ __ __
+     80: __ __ __ __ __ __ __ __  __ __ __ __ __ __ __ __
+     96: __ __ __ __ __ __ __ __  __ __ __ __ __ __ __ __
+    112: __ __ __ __ __ __ __ __  __ __ __ __ __ __ __ __
+    128: __ __ __ __ __ __ __ __  __ __ __ __ __ __ __ __
+    144: __ __ __ __ __ __ __ __  __ __ __ __ __ __ __ __
+    160: __ __ __ __ __ __ __ __  __ __ __ __ __ __ __ __
+    176: __ __ __ __ __ __ __ __  __ __ __ __ __ __ __ __
+    192: __ __ __ __ __ __ __ __  __ __ __ __ __ __ __ __
+    208: __ __ __ __ __ __ __ __  __ __ __ __ __ __ __ __
+    224: __ __ __ __ __ __ __ __  __ __ __ __ __ __ __ __
+    240: __ __ __ __ __ __ __ __  __ __ __ __ __ __ __ __
+</code> </pre>
+
+	    <center>
+	      <table border="" cellpadding="4" width="80%">
+		<caption align="top">
+		  <strong>Root Group B-tree</strong>
+		</caption>
+
+		<tbody><tr align="center">
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+
+		</tr><tr align="center">
+                  <td>'T'</td>
+                  <td>'R'</td>
+                  <td>'E'</td>
+                  <td>'E'</td>
+
+		</tr><tr align="center">
+		  <td>0</td>
+		  <td>0</td>
+		  <td colspan="2">1</td>
+
+		</tr><tr align="center">
+		  <td colspan="4"><br>0xffffffffffffffff<br><br></td>
+
+		</tr><tr align="center">
+		  <td colspan="4"><br>0xffffffffffffffff<br><br></td>
+
+		</tr><tr align="center">
+		  <td colspan="4"><br>0<br><br></td>
+
+		</tr><tr align="center">
+		  <td colspan="4"><br>1248<br><br></td>
+
+		</tr><tr align="center">
+		  <td colspan="4"><br>8<br><br></td>
+
+	      </tr></tbody></table>
+	    </center>
+<br>
+<pre> <code>
+%h5debug example2.h5 384 96
+
+New address: 384
+Reading signature at address 384 (rel)
+Tree type ID:                                      H5B_SNODE_ID
+Size of node:                                      544
+Size of raw (disk) key:                            8
+Dirty flag:                                        False
+Number of initial dirty children:                  0
+Level:                                             0
+Address of left sibling:                           UNDEF
+Address of right sibling:                          UNDEF
+Number of children (max):                          1 (32)
+Child 0...
+   Address:                                        1248
+   Left Key:
+      Heap offset:                                 0
+      Name :
+   Right Key:
+      Heap offset:                                 8
+      Name :                                       Dataset
+</code> </pre>
+
+	    <center>
+	      <table border="" cellpadding="4" width="80%">
+		<caption align="top">
+		  <strong>Root Group B-tree Symbol Table Node</strong>
+		</caption>
+
+		<tbody><tr align="center">
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+
+		</tr><tr align="center">
+                  <td>'S'</td>
+                  <td>'N'</td>
+                  <td>'O'</td>
+                  <td>'D'</td>
+
+		</tr><tr align="center">
+		  <td>1</td>
+		  <td>0</td>
+		  <td colspan="2">1</td>
+
+		</tr><tr align="center">
+		  <td colspan="4">
+                      <table border="" width="100%">
+                        <tbody><tr align="center">
+                          <td colspan="4">8</td>
+                        </tr>
+
+                        <tr align="center">
+                          <td colspan="4"><br>976<br><br></td>
+                        </tr>
+
+                        <tr align="center">
+                          <td colspan="4">0</td>
+                        </tr>
+
+                        <tr align="center">
+                          <td colspan="4">0</td>
+                        </tr>
+
+                        <tr align="center">
+                          <td colspan="4"><br><br>0<br><br><br></td>
+                        </tr>
+                      </tbody></table>
+                  </td>
+
+	      </tr></tbody></table>
+	    </center>
+<br>
+<pre> <code>
+%h5debug example2.h5 1248 96
+
+New address: 1248
+Reading signature at address 1248 (rel)
+Symbol Table Node...
+Dirty:                                             No
+Size of Node (in bytes):                           328
+Number of Symbols:                                 1 of 8
+Symbol 0:
+   Name:                                           `Dataset'
+   Name offset into private heap:                  8
+   Object header address:                          976
+   Dirty:                                          No
+   Cache info type:                                Nothing Cached
+</code> </pre>
+
+    <center>
+      <table border="" cellpadding="4" width="90%">
+	<caption align="top">
+	  <strong>'/Dataset' Object Header</strong>
+	</caption>
+
+	<tbody><tr align="center">
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr align="center">
+	  <td colspan="1"><em>Version:</em> 1</td>
+	  <td colspan="1"><em>Reserved:</em> 0</td>
+	  <td colspan="2"><em>Number of Header Messages:</em> 6</td>
+	</tr>
+	<tr align="center">
+	  <td colspan="4"><em>Object Reference Count:</em> 1</td>
+	</tr>
+	<tr align="center">
+	  <td colspan="4"><em>Total Object Header Size:</em> 256</td>
+	</tr>
+<!-- Fill Value Header Message -->
+        <tr align="center">
+        <td colspan="4">
+        <table border="" width="100%">
+            <caption align="top" color="#80FFFF">
+              <em>Fill Value Header Message</em>
+            </caption>
+            <tbody><tr align="center">
+              <th width="25%"></th>
+              <th width="25%"></th>
+              <th width="25%"></th>
+              <th width="25%"></th>
+            </tr>
+
+            <tr align="center">
+            <!-- Object Header Message Type -->
+              <td colspan="2"><em>Message Type:</em> 0x0005</td>
+            <!-- Object Header Message Length -->
+              <td colspan="2"><em>Message Data Size:</em> 8</td>
+            </tr>
+            <tr align="center">
+            <!-- Object Header Message Flags -->
+              <td colspan="1"><em>Flags:</em> 0x01</td>
+            <!-- Reserved -->
+              <td colspan="3"><em>Reserved:</em> 0</td>
+            </tr>
+            <tr align="center">
+            <!-- Version -->
+              <td colspan="1"><em>Version:</em> 1</td>
+            <!-- Space Allocation Time -->
+              <td colspan="1"><em>Space Allocation Time:</em> 2 (Late)</td>
+            <!-- Fill Value Writing Time -->
+              <td colspan="1"><em>Fill Value Writing Time:</em> 0 (At allocation)</td>
+            <!-- Fill Value Defined -->
+              <td colspan="1"><em>Fill Value Defined:</em> 0 (Undefined)</td>
+            </tr>
+            <tr align="center">
+            <!-- Fill Value Datatype Size -->
+              <td colspan="4"><em>Fill Value Datatype Size:</em> 0 (Use dataset's datatype for fill-value datatype)</td>
+            </tr>
+        </tbody></table>
+        </td>
+        </tr>
+<!-- Datatype Header Message -->
+        <tr align="center">
+        <td colspan="4">
+        <table border="" width="100%">
+            <caption align="top">
+              <em>Datatype Header Message</em>
+            </caption>
+            <tbody><tr align="center">
+              <th width="25%"></th>
+              <th width="25%"></th>
+              <th width="25%"></th>
+              <th width="25%"></th>
+            </tr>
+
+            <tr align="center">
+            <!-- Object Header Message Type -->
+              <td colspan="2"><em>Message Type:</em> 0x0003</td>
+            <!-- Object Header Message Length -->
+              <td colspan="2"><em>Message Data Size:</em> 16</td>
+            </tr>
+            <tr align="center">
+            <!-- Object Header Message Flags -->
+              <td colspan="1"><em>Flags:</em> 0x01</td>
+            <!-- Reserved -->
+              <td colspan="3"><em>Reserved:</em> 0</td>
+            </tr>
+            <tr align="center">
+            <!-- Type Class and Version -->
+              <td colspan="1">
+              <table border="" width="100%">
+                <tbody><tr align="center">
+                  <td width="50%"><em>Version:</em> 0x1</td>
+                  <td><em>Class:</em> 0x0 (Fixed-Point)</td>
+                </tr>
+              </tbody></table>
+              </td>
+            <!-- Class Bit Field -->
+              <td colspan="3"><em>Fixed-Point Bit-Field:</em> 0x08 (Little-endian, No padding, Signed)</td>
+            </tr>
+            <tr align="center">
+            <!-- Type Size (in bytes) -->
+              <td colspan="4"><em>Size:</em> 4</td>
+            </tr>
+            <tr align="center">
+            <!-- Bit Offset -->
+              <td colspan="2"><em>Bit Offset:</em> 0</td>
+            <!-- Bit Precision -->
+              <td colspan="2"><em>Bit Precision:</em> 32</td>
+            </tr>
+            <tr align="center">
+            <!-- Message alignment filler -->
+              <td colspan="4"><em>Message Alignment Filler:</em> -</td>
+            </tr>
+        </tbody></table>
+        </td>
+        </tr>
+<!-- Dataspace Header Message -->
+        <tr align="center">
+        <td colspan="4">
+        <table border="" width="100%">
+            <caption align="top">
+              <em>Dataspace Header Message</em>
+            </caption>
+            <tbody><tr align="center">
+              <th width="25%"></th>
+              <th width="25%"></th>
+              <th width="25%"></th>
+              <th width="25%"></th>
+            </tr>
+
+            <tr align="center">
+            <!-- Object Header Message Type -->
+              <td colspan="2"><em>Message Type:</em> 0x0001</td>
+            <!-- Object Header Message Length -->
+              <td colspan="2"><em>Message Data Size:</em> 8</td>
+            </tr>
+            <tr align="center">
+            <!-- Object Header Message Flags -->
+              <td colspan="1"><em>Flags:</em> 0x00</td>
+            <!-- Reserved -->
+              <td colspan="3"><em>Reserved:</em> 0</td>
+            </tr>
+            <tr align="center">
+            <!-- Version -->
+              <td colspan="1"><em>Version:</em> 1</td>
+            <!-- Rank -->
+              <td colspan="1"><em>Rank:</em> 0 (Scalar)</td>
+            <!-- Flags -->
+              <td colspan="1"><em>Flags:</em> 0x00 (No maximum dimensions, no permutation information)</td>
+            <!-- Reserved -->
+              <td colspan="1"><em>Reserved:</em> 0</td>
+            </tr>
+            <tr align="center">
+            <!-- Reserved -->
+              <td colspan="4"><em>Reserved:</em> 0</td>
+            </tr>
+        </tbody></table>
+        </td>
+        </tr>
+<!-- Layout Header Message -->
+        <tr align="center">
+        <td colspan="4">
+        <table border="" width="100%">
+            <caption align="top">
+              <em>Layout Header Message</em>
+            </caption>
+            <tbody><tr align="center">
+              <th width="25%"></th>
+              <th width="25%"></th>
+              <th width="25%"></th>
+              <th width="25%"></th>
+            </tr>
+
+            <tr align="center">
+            <!-- Object Header Message Type -->
+              <td colspan="2"><em>Message Type:</em> 0x0008</td>
+            <!-- Object Header Message Length -->
+              <td colspan="2"><em>Message Data Size:</em> 24</td>
+            </tr>
+            <tr align="center">
+            <!-- Object Header Message Flags -->
+              <td colspan="1"><em>Flags:</em> 0x00</td>
+            <!-- Reserved -->
+              <td colspan="3"><em>Reserved:</em> 0</td>
+            </tr>
+            <tr align="center">
+            <!-- Version -->
+              <td colspan="1"><em>Version:</em> 1</td>
+            <!-- Rank -->
+              <td colspan="1"><em>Rank:</em> 1 (Dataspace rank+1)</td>
+            <!-- Class -->
+              <td colspan="1"><em>Class:</em> 1 (Contiguous)</td>
+            <!-- Reserved -->
+              <td colspan="1"><em>Reserved:</em> 0</td>
+            </tr>
+            <tr align="center">
+            <!-- Reserved -->
+              <td colspan="4"><em>Reserved:</em> 0</td>
+            </tr>
+            <tr align="center">
+            <!-- Address -->
+              <td colspan="4"><br><em>Address:</em> 0xffffffffffffffff (Undefined)<br><br></td>
+            </tr>
+            <tr align="center">
+            <!-- Layout Dimensions -->
+              <td colspan="4"><em>Dimension 0 Size:</em> 4 (Datatype size)</td>
+            </tr>
+            <tr align="center">
+            <!-- Message alignment filler -->
+              <td colspan="4"><em>Message Alignment Filler:</em> -</td>
+            </tr>
+        </tbody></table>
+        </td>
+        </tr>
+<!-- Modification Date & Time Header Message -->
+        <tr align="center">
+        <td colspan="4">
+        <table border="" width="100%">
+            <caption align="top">
+              <em>Modification Date &amp; Time Header Message</em>
+            </caption>
+            <tbody><tr align="center">
+              <th width="25%"></th>
+              <th width="25%"></th>
+              <th width="25%"></th>
+              <th width="25%"></th>
+            </tr>
+
+            <tr align="center">
+            <!-- Object Header Message Type -->
+              <td colspan="2"><em>Message Type:</em> 0x0012</td>
+            <!-- Object Header Message Length -->
+              <td colspan="2"><em>Message Data Size:</em> 8</td>
+            </tr>
+            <tr align="center">
+            <!-- Object Header Message Flags -->
+              <td colspan="1"><em>Flags:</em> 0x00</td>
+            <!-- Reserved -->
+              <td colspan="3"><em>Reserved:</em> 0</td>
+            </tr>
+            <tr align="center">
+            <!-- Version -->
+              <td colspan="1"><em>Version:</em> 1</td>
+            <!-- Reserved -->
+              <td colspan="3"><em>Reserved:</em> 0</td>
+            </tr>
+            <tr align="center">
+            <!-- Modification time -->
+              <td colspan="4"><em>Seconds Since Epoch:</em> 1052401700 (2003-05-08 08:48:20 CDT)</td>
+            </tr>
+        </tbody></table>
+        </td>
+        </tr>
+<!-- Null Header Message -->
+        <tr align="center">
+        <td colspan="4">
+        <table border="" width="100%">
+            <caption align="top">
+              <em>Null Header Message</em>
+            </caption>
+            <tbody><tr align="center">
+              <th width="25%"></th>
+              <th width="25%"></th>
+              <th width="25%"></th>
+              <th width="25%"></th>
+            </tr>
+
+            <tr align="center">
+              <td colspan="2"><em>Message Type:</em> 0x0000</td>
+              <td colspan="2"><em>Message Data Size:</em> 144</td>
+            </tr>
+            <tr align="center">
+              <td colspan="1"><em>Flags:</em> 0x00</td>
+              <td colspan="3"><em>Reserved:</em> 0</td>
+            </tr>
+        </tbody></table>
+        </td>
+        </tr>
+      </tbody></table>
+    </center>
+<br>
+<pre> <code>
+%h5debug example2.h5 976
+
+New address: 976
+Reading signature at address 976 (rel)
+Object Header...
+Dirty:                                             0
+Version:                                           1
+Header size (in bytes):                            16
+Number of links:                                   1
+Number of messages (allocated):                    6 (32)
+Number of chunks (allocated):                      1 (8)
+Chunk 0...
+   Dirty:                                          0
+   Address:                                        992
+   Size in bytes:                                  256
+Message 0...
+   Message ID (sequence number):                   0x0005 `fill_new' (0)
+   Shared:                                         No
+   Constant:                                       Yes
+   Raw size in obj header:                         8 bytes
+   Chunk number:                                   0
+   Message Information:
+      Version:                                     1
+      Space Allocation Time:                       Late
+      Fill Time:                                   On Allocation
+      Fill Value Defined:                          Undefined
+      Size:                                        0
+      Data type:                                   <dataset type="">
+Message 1...
+   Message ID (sequence number):                   0x0003 data_type(0)
+   Shared message:                                 No
+   Constant:                                       Yes
+   Raw size in obj header:                         16 bytes
+   Chunk number:                                   0
+   Message Information:
+      Type class:                                  integer
+      Size:                                        4 bytes
+      Byte order:                                  little endian
+      Precision:                                   32 bits
+      Offset:                                      0 bits
+      Low pad type:                                zero
+      High pad type:                               zero
+      Sign scheme:                                 2's comp
+Message 2...
+   Message ID (sequence number):                   0x0001 simple_dspace(0)
+   Shared message:                                 No
+   Constant:                                       No
+   Raw size in obj header:                         8 bytes
+   Chunk number:                                   0
+   Message Information:
+      Rank:                                        0
+Message 3...
+   Message ID (sequence number):                   0x0008 layout(0)
+   Shared message:                                 No
+   Constant:                                       No
+   Raw size in obj header:                         24 bytes
+   Chunk number:                                   0
+   Message Information:
+      Data address:                                UNDEF
+      Number of dimensions:                        1
+      Size:                                        {4}
+Message 4...
+   Message ID (sequence number):                   0x0012 mtime_new(0)
+   Shared message:                                 No
+   Constant:                                       No
+   Raw size in obj header:                         8 bytes
+   Chunk number:                                   0
+   Message Information:
+      Time:                                        2003-03-05 14:52:00 CST
+Message 5...
+   Message ID (sequence number):                   0x0000 null(0)
+   Shared message:                                 No
+   Constant:                                       No
+   Raw size in obj header:                         144 bytes
+   Chunk number:                                   0
+   Message Information:
+      <no info="" for="" this="" message="">
+</no></dataset></code> </pre>
+
+<p></p>
+
+</li></ol>
+
+
+
+</body></html>
diff --git a/doxygen/examples/FileFormatSpecChunkDiagram.jpg b/doxygen/examples/FileFormatSpecChunkDiagram.jpg
new file mode 100644
index 0000000..03fd90a
--- /dev/null
+++ b/doxygen/examples/FileFormatSpecChunkDiagram.jpg
diff --git a/doxygen/examples/Filters.html b/doxygen/examples/Filters.html
new file mode 100644
index 0000000..9f34be5
--- /dev/null
+++ b/doxygen/examples/Filters.html
@@ -0,0 +1,450 @@
+<html>
+  <head>
+    <title>Filters</title>
+    <h1>Filters in HDF5</h1>
+
+    <b>Note: Transient pipelines described in this document have not
+      been implemented.</b>
+
+    <h2>Introduction</h2>
+
+    <p>HDF5 allows chunked data to pass through user-defined filters
+      on the way to or from disk.  The filters operate on chunks of an
+      <code>H5D_CHUNKED</code> dataset can be arranged in a pipeline
+      so output of one filter becomes the input of the next filter.
+
+    </p><p>Each filter has a two-byte identification number (type
+      <code>H5Z_filter_t</code>) allocated by The HDF Group and can also be
+      passed application-defined integer resources to control its
+      behavior.  Each filter also has an optional ASCII comment
+      string.
+
+    </p>
+    <table>
+	  <tbody><tr>
+	      <th>Values for <code>H5Z_filter_t</code></th>
+	      <th>Description</th>
+	    </tr>
+
+	    <tr valign="top">
+	      <td><code>0-255</code></td>
+	      <td>These values are reserved for filters predefined and
+	        registered by the HDF5 library and of use to the general
+	        public.  They are described in a separate section
+	        below.</td>
+	    </tr>
+
+	    <tr valign="top">
+	      <td><code>256-511</code></td>
+	      <td>Filter numbers in this range are used for testing only
+	        and can be used temporarily by any organization.  No
+	        attempt is made to resolve numbering conflicts since all
+	        definitions are by nature temporary.</td>
+	    </tr>
+
+	    <tr valign="top">
+	      <td><code>512-65535</code></td>
+	      <td>Reserved for future assignment. Please contact the
+	        <a href="mailto:help@hdfgroup.org">HDF5 development team</a>
+            to reserve a value or range of values for
+	        use by your filters.</td>
+	</tr></tbody></table>
+
+    <h2>Defining and Querying the Filter Pipeline</h2>
+
+    <p>Two types of filters can be applied to raw data I/O: permanent
+      filters and transient filters.  The permanent filter pipeline is
+      defined when the dataset is created while the transient pipeline
+      is defined for each I/O operation.  During an
+      <code>H5Dwrite()</code> the transient filters are applied first
+      in the order defined and then the permanent filters are applied
+      in the order defined.  For an <code>H5Dread()</code> the
+      opposite order is used: permanent filters in reverse order, then
+      transient filters in reverse order.  An <code>H5Dread()</code>
+      must result in the same amount of data for a chunk as the
+      original <code>H5Dwrite()</code>.
+
+    </p><p>The permanent filter pipeline is defined by calling
+      <code>H5Pset_filter()</code> for a dataset creation property
+      list while the transient filter pipeline is defined by calling
+      that function for a dataset transfer property list.
+
+    </p><dl>
+      <dt><code>herr_t H5Pset_filter (hid_t <em>plist</em>,
+	      H5Z_filter_t <em>filter</em>, unsigned int <em>flags</em>,
+	      size_t <em>cd_nelmts</em>, const unsigned int
+	      <em>cd_values</em>[])</code>
+      </dt><dd>This function adds the specified <em>filter</em> and
+	    corresponding properties to the end of the transient or
+	    permanent output filter pipeline (depending on whether
+	    <em>plist</em> is a dataset creation or dataset transfer
+	    property list).  The <em>flags</em> argument specifies certain
+	    general properties of the filter and is documented below. The
+	    <em>cd_values</em> is an array of <em>cd_nelmts</em> integers
+	    which are auxiliary data for the filter.  The integer values
+	    will be stored in the dataset object header as part of the
+	    filter information.
+      </dd><dt><code>int H5Pget_nfilters (hid_t <em>plist</em>)</code>
+      </dt><dd>This function returns the number of filters defined in the
+	    permanent or transient filter pipeline depending on whether
+	    <em>plist</em> is a dataset creation or dataset transfer
+	    property list.  In each pipeline the filters are numbered from
+	    0 through <em>N</em>-1 where <em>N</em> is the value returned
+	    by this function. During output to the file the filters of a
+	    pipeline are applied in increasing order (the inverse is true
+	    for input).  Zero is returned if there are no filters in the
+	    pipeline and a negative value is returned for errors.
+      </dd><dt><code>H5Z_filter_t H5Pget_filter (hid_t <em>plist</em>,
+	      int <em>filter_number</em>, unsigned int *<em>flags</em>,
+	      size_t *<em>cd_nelmts</em>, unsigned int
+	      *<em>cd_values</em>, size_t namelen, char name[])</code>
+      </dt><dd>This is the query counterpart of
+	    <code>H5Pset_filter()</code> and returns information about a
+	    particular filter number in a permanent or transient pipeline
+	    depending on whether <em>plist</em> is a dataset creation or
+	    dataset transfer property list.  On input, <em>cd_nelmts</em>
+	    indicates the number of entries in the <em>cd_values</em>
+	    array allocated by the caller while on exit it contains the
+	    number of values defined by the filter.  The
+	    <em>filter_number</em> should be a value between zero and
+	    <em>N</em>-1 as described for <code>H5Pget_nfilters()</code>
+	    and the function will return failure (a negative value) if the
+	    filter number is out of range.  If <em>name</em> is a pointer
+	    to an array of at least <em>namelen</em> bytes then the filter
+	    name will be copied into that array.  The name will be null
+	    terminated if the <em>namelen</em> is large enough.  The
+	    filter name returned will be the name appearing in the file or
+	    else the name registered for the filter or else an empty string.
+    </dd></dl>
+
+    <p>The flags argument to the functions above is a bit vector of
+      the following fields:
+
+    </p>
+	  <table>
+	    <tbody><tr>
+	        <th>Values for <em>flags</em></th>
+	        <th>Description</th>
+	      </tr>
+
+	      <tr valign="top">
+	        <td><code>H5Z_FLAG_OPTIONAL</code></td>
+	        <td>If this bit is set then the filter is optional.  If
+	          the filter fails (see below) during an
+	          <code>H5Dwrite()</code> operation then the filter is
+	          just excluded from the pipeline for the chunk for which
+	          it failed; the filter will not participate in the
+	          pipeline during an <code>H5Dread()</code> of the chunk.
+	          This is commonly used for compression filters: if the
+	          compression result would be larger than the input then
+	          the compression filter returns failure and the
+	          uncompressed data is stored in the file.  If this bit is
+	          clear and a filter fails then the
+	          <code>H5Dwrite()</code> or <code>H5Dread()</code> also
+	          fails.</td>
+	      </tr>
+	  </tbody></table>
+
+    <h2>Defining Filters</h2>
+
+    <p>Each filter is bidirectional, handling both input and output to
+      the file, and a flag is passed to the filter to indicate the
+      direction.  In either case the filter reads a chunk of data from
+      a buffer, usually performs some sort of transformation on the
+      data, places the result in the same or new buffer, and returns
+      the buffer pointer and size to the caller. If something goes
+      wrong the filter should return zero to indicate a failure.
+
+    </p><p>During output, a filter that fails or isn't defined and is
+      marked as optional is silently excluded from the pipeline and
+      will not be used when reading that chunk of data.  A required
+      filter that fails or isn't defined causes the entire output
+      operation to fail. During input, any filter that has not been
+      excluded from the pipeline during output and fails or is not
+      defined will cause the entire input operation to fail.
+
+    </p><p>Filters are defined in two phases.  The first phase is to
+      define a function to act as the filter and link the function
+      into the application.  The second phase is to register the
+      function, associating the function with an
+      <code>H5Z_filter_t</code> identification number and a comment.
+
+    </p><dl>
+      <dt><code>typedef size_t (*H5Z_func_t)(unsigned int
+	      <em>flags</em>, size_t <em>cd_nelmts</em>, const unsigned int
+	      <em>cd_values</em>[], size_t <em>nbytes</em>, size_t
+	      *<em>buf_size</em>, void **<em>buf</em>)</code>
+      </dt><dd>The <em>flags</em>, <em>cd_nelmts</em>, and
+	    <em>cd_values</em> are the same as for the
+	    <code>H5Pset_filter()</code> function with the additional flag
+	    <code>H5Z_FLAG_REVERSE</code> which is set when the filter is
+	    called as part of the input pipeline. The input buffer is
+	    pointed to by <em>*buf</em> and has a total size of
+	    <em>*buf_size</em> bytes but only <em>nbytes</em> are valid
+	    data. The filter should perform the transformation in place if
+	    possible and return the number of valid bytes or zero for
+	    failure.  If the transformation cannot be done in place then
+	    the filter should allocate a new buffer with
+	    <code>malloc()</code> and assign it to <em>*buf</em>,
+	    assigning the allocated size of that buffer to
+	    <em>*buf_size</em>. The old buffer should be freed
+	    by calling <code>free()</code>.
+
+	    <br><br>
+      </dd><dt><code>herr_t H5Zregister (H5Z_filter_t <em>filter_id</em>,
+	      const char *<em>comment</em>, H5Z_func_t
+	      <em>filter</em>)</code>
+      </dt><dd>The <em>filter</em> function is associated with a filter
+	    number and a short ASCII comment which will be stored in the
+	    hdf5 file if the filter is used as part of a permanent
+	    pipeline during dataset creation.
+    </dd></dl>
+
+    <h2>Predefined Filters</h2>
+
+    <p>If <code>zlib</code> version 1.1.2 or later was found
+      during configuration then the library will define a filter whose
+      <code>H5Z_filter_t</code> number is
+      <code>H5Z_FILTER_DEFLATE</code>. Since this compression method
+      has the potential for generating compressed data which is larger
+      than the original, the <code>H5Z_FLAG_OPTIONAL</code> flag
+      should be turned on so such cases can be handled gracefully by
+      storing the original data instead of the compressed data.  The
+      <em>cd_nvalues</em> should be one with <em>cd_value[0]</em>
+      being a compression aggression level between zero and nine,
+      inclusive (zero is the fastest compression while nine results in
+      the best compression ratio).
+
+    </p><p>A convenience function for adding the
+      <code>H5Z_FILTER_DEFLATE</code> filter to a pipeline is:
+
+    </p><dl>
+      <dt><code>herr_t H5Pset_deflate (hid_t <em>plist</em>, unsigned
+	      <em>aggression</em>)</code>
+      </dt><dd>The deflate compression method is added to the end of the
+	    permanent or transient filter pipeline depending on whether
+	    <em>plist</em> is a dataset creation or dataset transfer
+	    property list. The <em>aggression</em> is a number between
+	    zero and nine (inclusive) to indicate the tradeoff between
+	    speed and compression ratio (zero is fastest, nine is best
+	    ratio).
+    </dd></dl>
+
+    <p>Even if the <code>zlib</code> isn't detected during
+      configuration the application can define
+      <code>H5Z_FILTER_DEFLATE</code> as a permanent filter.  If the
+      filter is marked as optional (as with
+      <code>H5Pset_deflate()</code>) then it will always fail and be
+      automatically removed from the pipeline.  Applications that read
+      data will fail only if the data is actually compressed; they
+      won't fail if <code>H5Z_FILTER_DEFLATE</code> was part of the
+      permanent output pipeline but was automatically excluded because
+      it didn't exist when the data was written.
+
+    </p><p><code>zlib</code> can be acquired from
+      <code><a href="http://www.cdrom.com/pub/infozip/zlib/">
+          http://www.cdrom.com/pub/infozip/zlib/</a></code>.
+
+    </p><h2>Example</h2>
+
+    <p>This example shows how to define and register a simple filter
+      that adds a checksum capability to the data stream.
+
+    </p><p>The function that acts as the filter always returns zero
+      (failure) if the <code>md5()</code> function was not detected at
+      configuration time (left as an exercise for the reader).
+      Otherwise the function is broken down to an input and output
+      half.  The output half calculates a checksum, increases the size
+      of the output buffer if necessary, and appends the checksum to
+      the end of the buffer.  The input half calculates the checksum
+      on the first part of the buffer and compares it to the checksum
+      already stored at the end of the buffer.  If the two differ then
+      zero (failure) is returned, otherwise the buffer size is reduced
+      to exclude the checksum.
+
+    </p>
+	  <table>
+	    <tbody><tr>
+	        <td>
+	          <p><code></code></p><pre><code>
+                  size_t
+                  md5_filter(unsigned int flags, size_t cd_nelmts,
+                  const unsigned int cd_values[], size_t nbytes,
+                  size_t *buf_size, void **buf)
+                  {
+                  #ifdef HAVE_MD5
+                  unsigned char       cksum[16];
+
+                  if (flags &amp; H5Z_REVERSE) {
+                  /* Input */
+                  assert(nbytes&gt;=16);
+                  md5(nbytes-16, *buf, cksum);
+
+                  /* Compare */
+                  if (memcmp(cksum, (char*)(*buf)+nbytes-16, 16)) {
+                  return 0; /*fail*/
+                  }
+
+                  /* Strip off checksum */
+                  return nbytes-16;
+
+                  } else {
+                  /* Output */
+                  md5(nbytes, *buf, cksum);
+
+                  /* Increase buffer size if necessary */
+                  if (nbytes+16&gt;*buf_size) {
+                  *buf_size = nbytes + 16;
+                  *buf = realloc(*buf, *buf_size);
+                  }
+
+                  /* Append checksum */
+                  memcpy((char*)(*buf)+nbytes, cksum, 16);
+                  return nbytes+16;
+                  }
+                  #else
+                  return 0; /*fail*/
+                  #endif
+                  }
+	          </code></pre>
+	        </td>
+	      </tr>
+	  </tbody></table>
+
+    <p>Once the filter function is defined it must be registered so
+      the HDF5 library knows about it.  Since we're testing this
+      filter we choose one of the <code>H5Z_filter_t</code> numbers
+      from the reserved range.  We'll randomly choose 305.
+
+    </p><p>
+    </p>
+	  <table>
+	    <tbody><tr>
+	        <td>
+	          <p><code></code></p><pre><code>
+                  #define FILTER_MD5 305
+                  herr_t status = H5Zregister(FILTER_MD5, "md5 checksum", md5_filter);
+	          </code></pre>
+	        </td>
+	      </tr>
+	  </tbody></table>
+
+    <p>Now we can use the filter in a pipeline.  We could have added
+      the filter to the pipeline before defining or registering the
+      filter as long as the filter was defined and registered by time
+      we tried to use it (if the filter is marked as optional then we
+      could have used it without defining it and the library would
+      have automatically removed it from the pipeline for each chunk
+      written before the filter was defined and registered).
+
+    </p><p>
+    </p>
+	  <table>
+	    <tbody><tr>
+	        <td>
+	          <p><code></code></p><pre><code>
+                  hid_t dcpl = H5Pcreate(H5P_DATASET_CREATE);
+                  hsize_t chunk_size[3] = {10,10,10};
+                  H5Pset_chunk(dcpl, 3, chunk_size);
+                  H5Pset_filter(dcpl, FILTER_MD5, 0, 0, NULL);
+                  hid_t dset = H5Dcreate(file, "dset", H5T_NATIVE_DOUBLE, space, dcpl);
+	          </code></pre>
+	        </td>
+	      </tr>
+	  </tbody></table>
+
+    <h2>6. Filter Diagnostics</h2>
+
+    <p>If the library is compiled with debugging turned on for the H5Z
+      layer (usually as a result of <code>configure
+        --enable-debug=z</code>) then filter statistics are printed when
+      the application exits normally or the library is closed.  The
+      statistics are written to the standard error stream and include
+      two lines for each filter that was used: one for input and one
+      for output.  The following fields are displayed:
+
+    </p><p>
+    </p>
+	  <table>
+	    <tbody><tr>
+	        <th>Field Name</th>
+	        <th>Description</th>
+	      </tr>
+
+	      <tr valign="top">
+	        <td>Method</td>
+	        <td>This is the name of the method as defined with
+	          <code>H5Zregister()</code> with the characters
+	          "&lt; or "&gt;" prepended to indicate
+	          input or output.</td>
+	      </tr>
+
+	      <tr valign="top">
+	        <td>Total</td>
+	        <td>The total number of bytes processed by the filter
+	          including errors.  This is the maximum of the
+	          <em>nbytes</em> argument or the return value.
+	      </td></tr>
+
+	      <tr valign="top">
+	        <td>Errors</td>
+	        <td>This field shows the number of bytes of the Total
+	          column which can be attributed to errors.</td>
+	      </tr>
+
+	      <tr valign="top">
+	        <td>User, System, Elapsed</td>
+	        <td>These are the amount of user time, system time, and
+	          elapsed time in seconds spent in the filter function.
+	          Elapsed time is sensitive to system load. These times
+	          may be zero on operating systems that don't support the
+	          required operations.</td>
+	      </tr>
+
+	      <tr valign="top">
+	        <td>Bandwidth</td>
+	        <td>This is the filter bandwidth which is the total
+	          number of bytes processed divided by elapsed time.
+	          Since elapsed time is subject to system load the
+	          bandwidth numbers cannot always be trusted.
+	          Furthermore, the bandwidth includes bytes attributed to
+	          errors which may significantly taint the value if the
+	          function is able to detect errors without much
+	          expense.</td>
+	      </tr>
+	  </tbody></table>
+
+    <p>
+    </p>
+	  <table>
+	    <caption align="bottom">
+	      <b>Example: Filter Statistics</b>
+	    </caption>
+	    <tbody><tr>
+	        <td>
+	          <p><code></code></p><pre><code>H5Z: filter statistics accumulated ov=
+                  er life of library:
+                  Method     Total  Errors  User  System  Elapsed Bandwidth
+                  ------     -----  ------  ----  ------  ------- ---------
+                  &gt;deflate  160000   40000  0.62    0.74     1.33 117.5 kBs
+                  &lt;deflate  120000       0  0.11    0.00     0.12 1.000 MBs
+	          </code></pre>
+	        </td>
+	      </tr>
+	  </tbody></table>
+
+    <hr>
+
+
+    <p><a name="fn1">Footnote 1:</a> Dataset chunks can be compressed
+      through the use of filters.  Developers should be aware that
+      reading and rewriting compressed chunked data can result in holes
+      in an HDF5 file.  In time, enough such holes can increase the
+      file size enough to impair application or library performance
+      when working with that file.  See
+      <a href="https://support.hdfgroup.org/HDF5/doc1.6/Performance.html#Freespace">
+        Freespace Management</a>
+      in the chapter
+      <a href="https://support.hdfgroup.org/HDF5/doc1.6/Performance.html">
+        Performance Analysis and Issues</a>.</p>
+</html>
diff --git a/doxygen/examples/H5.format.1.0.html b/doxygen/examples/H5.format.1.0.html
new file mode 100644
index 0000000..4eb0548
--- /dev/null
+++ b/doxygen/examples/H5.format.1.0.html
@@ -0,0 +1,4050 @@
+<html>
+  <head>
+    <title>
+      HDF5 File Format Specification
+    </title>
+  </head>
+  <body bgcolor="#FFFFFF">
+
+    <center>
+    <table border=0 width=90%>
+    <tr>
+    <td valign=top>
+    <ol type="I">
+      <li><a href="#Intro">Introduction</a>
+      <li><a href="#BootBlock">Disk Format Level 0 - File Signature and Super Block</a>
+      <li><a href="#Group">Disk Format Level 1 - File Infrastructure</a>
+        <font size=-2>
+	<ol type="A">
+	  <li><a href="#Btrees">Disk Format Level 1A - B-link Trees and B-tree Nodes</a>
+	  <li><a href="#SymbolTable">Disk Format Level 1B - Group</a>
+	  <li><a href="#SymbolTableEntry">Disk Format Level 1C - Group Entry</a>
+	  <li><a href="#LocalHeap">Disk Format Level 1D - Local Heaps</a>
+	  <li><a href="#GlobalHeap">Disk Format Level 1E - Global Heap</a>
+	  <li><a href="#FreeSpaceIndex">Disk Format Level 1F - Free-space Index</a>
+	</ol>
+        </font>
+      <li><a href="#DataObject">Disk Format Level 2 - Data Objects</a>
+        <font size=-2>
+	<ol type="A">
+	  <li><a href="#ObjectHeader">Disk Format Level 2a - Data Object Headers</a>
+	    <ol type="1">
+	      <li><a href="#NILMessage">Name: NIL</a>                                                       <!-- 0x0000 -->
+	      <li><a href="#SimpleDataSpace">Name: Simple Dataspace</a>                                     <!-- 0x0001 -->
+<!--
+	      <li><a href="#DataSpaceMessage">Name: Complex Dataspace</a>  -->                              <!-- 0x0002 -->
+	      <li><a href="#DataTypeMessage">Name: Datatype</a>                                             <!-- 0x0003 -->
+	      <li><a href="#FillValueMessage">Name: Data Storage - Fill Value</a>                           <!-- 0x0004 -->
+	      <li><a href="#ReservedMessage_0005">Name: Reserved - not assigned yet</a>                     <!-- 0x0005 -->
+	    </ol>
+        </ol>
+        </font>
+    </ol>
+    </td><td>&nbsp;&nbsp;</td><td valign=top>
+    <ol type="I" start="4">
+
+      <li><a href="#DataObject">Disk Format Level 2 - Data Objects</a>
+        <font size=-2><i>(Continued)</i>
+	<ol type="A">
+	  <li><a href="#ObjectHeader">Disk Format Level 2a - Data Object Headers</a><i>(Continued)</i>
+	    <ol type="1" start="6">
+	      <li><a href="#CompactDataStorageMessage">Name: Data Storage - Compact</a>                     <!-- 0x0006 -->
+	      <li><a href="#ExternalFileListMessage">Name: Data Storage - External Data Files</a>           <!-- 0x0007 -->
+	      <li><a href="#LayoutMessage">Name: Data Storage - Layout</a>                                  <!-- 0x0008 -->
+	      <li><a href="#ReservedMessage_0009">Name: Reserved - not assigned yet</a>                     <!-- 0x0009 -->
+	      <li><a href="#ReservedMessage_000A">Name: Reserved - not assigned yet</a>                     <!-- 0x000a -->
+	      <li><a href="#FilterMessage">Name: Data Storage - Filter Pipeline</a>                	     <!-- 0x000b -->
+	      <li><a href="#AttributeMessage">Name: Attribute</a>                                           <!-- 0x000c -->
+	      <li><a href="#NameMessage">Name: Object Name</a>                                              <!-- 0x000d -->
+	      <li><a href="#ModifiedMessage">Name: Object Modification Date and Time</a>                    <!-- 0x000e -->
+	      <li><a href="#SharedMessage">Name: Shared Object Message</a>                                  <!-- 0x000f -->
+	      <li><a href="#ContinuationMessage">Name: Object Header Continuation</a>                       <!-- 0x0010 -->
+	      <li><a href="#SymbolTableMessage">Name: Group Message</a>                                     <!-- 0x0011 -->
+	    </ol>
+	  <li><a href="#SharedObjectHeader">Disk Format: Level 2b - Shared Data Object Headers</a>
+	  <li><a href="#DataStorage">Disk Format: Level 2c - Data Object Data Storage</a>
+	</ol>
+        </font>
+    </ol>
+</td></tr>
+</table>
+</center>
+
+<br><br>
+
+
+    <h2>Introduction</h2>
+
+    <table align=right width=100>
+    <tr><td>&nbsp;</td><td align=center>
+        <hr>
+        <img src="FF-IH_FileGroup.gif" alt="HDF5 Groups" hspace=15 vspace=15>
+    </td><td>&nbsp;</td></tr>
+    <tr><td>&nbsp;</td><td align=center>
+        <strong>Figure 1:</strong> Relationships among the HDF5 root group, other groups, and objects
+        <hr>
+    </td><td>&nbsp;</td></tr>
+
+    <tr><td>&nbsp;</td><td align=center>
+        <img src="FF-IH_FileObject.gif" alt="HDF5 Objects" hspace=15 vspace=15>
+    </td><td>&nbsp;</td></tr>
+    <tr><td>&nbsp;</td><td align=center>
+        <strong>Figure 2:</strong> HDF5 objects -- datasets, datatypes, or dataspaces
+        <hr>
+    </td><td>&nbsp;</td></tr>
+    </table>
+
+
+    <P>The format of an HDF5 file on disk encompasses several
+      key ideas of the HDF4 and AIO file formats as well as
+      addressing some shortcomings therein.  The new format is
+      more self-describing than the HDF4 format and is more
+      uniformly applied to data objects in the file.
+
+    <P>An HDF5 file appears to the user as a directed graph.
+      The nodes of this graph are the higher-level HDF5 objects
+      that are exposed by the HDF5 APIs:
+
+      <ul>
+         <li>Groups
+         <li>Datasets
+         <li>Datatypes
+         <li>Dataspaces
+      </ul>
+
+    <P>At the lowest level, as information is actually written to the disk,
+       an HDF5 file is made up of the following objects:
+      <ul>
+         <li>A super block
+         <li>B-tree nodes (containing either symbol nodes or raw data chunks)
+         <li>Object headers
+
+         <li>Collections
+         <li>Local heaps
+         <li>Free space
+      </ul>
+
+      The HDF5 library uses these lower-level objects to represent the
+      higher-level objects that are then presented to the user or
+      to applications through the APIs.
+      For instance, a group is an object header that contains a message that
+      points to a local heap and to a B-tree which points to symbol nodes.
+      A dataset is an object header that contains messages that describe
+      datatype, space, layout, filters, external files, fill value, etc
+      with the layout message pointing to either a raw data chunk or to a
+      B-tree that points to raw data chunks.
+
+
+    <h3>This Document</h3>
+
+    <p>This document describes the lower-level data objects;
+      the higher-level objects and their properties are described
+      in the <a href="H5.user.html"><cite>HDF5 User Guide</cite></a>.
+
+
+<!--
+<blockquote>
+<pre>
+
+Elena> NOTE: give reference to the detailed discussion of the B-trees
+Elena>       when needed. Right now we do not have specification (only general one)
+Elena>       for the Symbol Table B-trees and B-trees used to manage chunked datasets.
+Elena>               B-trees
+Elena>                   General Discussion
+Elena>                   Object related discussions
+Elena>               Symbol Tables
+Elena>               Global heap
+Elena>               "Free-space object"
+
+
+</pre>
+</blockquote>
+-->
+
+
+
+    <P>Three levels of information comprise the file format.
+      Level 0 contains basic information for identifying and
+      defining information about the file.  Level 1 information contains
+      the group information (stored as a B-tree) and is used as the
+      index for all the objects in the file.  Level 2 is the rest
+      of the file and contains all of the data objects, with each object
+      partitioned into header information, also known as
+      <em>meta information</em>, and data.
+
+    <p>The sizes of various fields in the following layout tables are
+      determined by looking at the number of columns the field spans
+      in the table.  There are three exceptions: (1) The size may be
+      overridden by specifying a size in parentheses, (2) the size of
+      addresses is determined by the <em>Size of Offsets</em> field
+      in the super block, and (3) the size of size fields is determined
+      by the <em>Size of Lengths</em> field in the super block.
+
+
+
+<br><br>
+<br><br>
+
+
+    <h2><a name="BootBlock">
+	Disk Format: Level 0 - File Signature and Super Block</a></h2>
+
+    <P>The super block may begin at certain predefined offsets within
+      the HDF5 file, allowing a block of unspecified content for
+      users to place additional information at the beginning (and
+      end) of the HDF5 file without limiting the HDF5 library's
+      ability to manage the objects within the file itself.  This
+      feature was designed to accommodate wrapping an HDF5 file in
+      another file format or adding descriptive information to the
+      file without requiring the modification of the actual file's
+      information.  The super block is located by searching for the
+      HDF5 file signature at byte offset 0, byte offset 512 and at
+      successive locations in the file, each a multiple of two of
+      the previous location, i.e.  0, 512, 1024, 2048, etc.
+
+    <P>The super block is composed of a file signature, followed by
+      super block and group version numbers, information
+      about the sizes of offset and length values used to describe
+      items within the file, the size of each group page,
+      and a group entry for the root object in the file.
+
+    <p>
+    <center>
+      <table border align=center cellpadding=4 width="80%">
+	<caption align=top>
+	  <B>HDF5 Super Block Layout</B>
+	</caption>
+
+	<tr align=center>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4><br>HDF5 File Signature (8 bytes)<br><br></td>
+	</tr>
+
+	<tr align=center>
+	  <td>Version # of Super Block</td>
+	  <td>Version # of Global Free-space Storage</td>
+	  <td>Version # of Group</td>
+	  <td>Reserved</td>
+	</tr>
+
+	<tr align=center>
+	  <td>Version # of Shared Header Message Format</td>
+	  <td>Size of Offsets</td>
+	  <td>Size of Lengths</td>
+	  <td>Reserved (zero)</td>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=2>Group Leaf Node K</td>
+	  <td colspan=2>Group Internal Node K</td>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4>File Consistency Flags</td>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4>Base Address*</td>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4>Address of Global Free-space Heap*</td>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4>End of File Address*</td>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4>Driver Information Block Address*</td>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4>Root Group Address*</td>
+	</tr>
+      </table>
+
+      <table width="80%" border=0>
+        <tr><td>
+          <div align=right>
+            (Items marked with an asterisk (*) in the above table
+            <br>
+            are of the size specified in "Size of Offsets.")
+          </div>
+        </td></tr>
+      </table>
+    </center>
+
+    <p>
+    <center>
+      <table width="80%">
+	<tr>
+	  <th width="30%">Field Name</th>
+	  <th width="70%">Description</th>
+	</tr>
+
+	<tr valign=top>
+	  <td>File Signature</td>
+	  <td>This field contains a constant value and can be used to
+	    quickly identify a file as being an HDF5 file.  The
+	    constant value is designed to allow easy identification of
+	    an HDF5 file and to allow certain types of data corruption
+	    to be detected.  The file signature of an HDF5 file always
+	    contains the following values:
+
+	    <br><br><center>
+	      <table border align=center cellpadding=4 width="100%">
+		<tr align=center>
+		  <td>decimal</td>
+                  <td width="8%">137</td>
+		  <td width="8%">72</td>
+		  <td width="8%">68</td>
+		  <td width="8%">70</td>
+		  <td width="8%">13</td>
+		  <td width="8%">10</td>
+		  <td width="8%">26</td>
+		  <td width="8%">10</td>
+		</tr>
+
+		<tr align=center>
+		  <td>hexadecimal</td>
+		  <td width="8%">89</td>
+		  <td width="8%">48</td>
+		  <td width="8%">44</td>
+		  <td width="8%">46</td>
+		  <td width="8%">0d</td>
+		  <td width="8%">0a</td>
+		  <td width="8%">1a</td>
+		  <td width="8%">0a</td>
+		</tr>
+
+		<tr align=center>
+		  <td>ASCII C Notation</td>
+		  <td width="8%">\211</td>
+		  <td width="8%">H</td>
+		  <td width="8%">D</td>
+		  <td width="8%">F</td>
+		  <td width="8%">\r</td>
+		  <td width="8%">\n</td>
+		  <td width="8%">\032</td>
+		  <td width="8%">\n</td>
+		</tr>
+	      </table>
+	    </center>
+	    <br>
+
+	    This signature both identifies the file as an HDF5 file
+	    and provides for immediate detection of common
+	    file-transfer problems. The first two bytes distinguish
+	    HDF5 files on systems that expect the first two bytes to
+	    identify the file type uniquely. The first byte is
+	    chosen as a non-ASCII value to reduce the probability
+	    that a text file may be misrecognized as an HDF5 file;
+	    also, it catches bad file transfers that clear bit
+	    7. Bytes two through four name the format. The CR-LF
+	    sequence catches bad file transfers that alter newline
+	    sequences. The control-Z character stops file display
+	    under MS-DOS. The final line feed checks for the inverse
+	    of the CR-LF translation problem.  (This is a direct
+	    descendent of the PNG file signature.)</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Version Number of the Super Block</td>
+	  <td>This value is used to determine the format of the
+	    information in the super block.  When the format of the
+	    information in the super block is changed, the version number
+	    is incremented to the next integer and can be used to
+	    determine how the information in the super block is
+	    formatted.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Version Number of the Global Free-space Heap</td>
+	  <td>This value is used to determine the format of the
+	    information in the Global Free-space Heap.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Version Number of the Group</td>
+	  <td>This value is used to determine the format of the
+	    information in the Group.  When the format of
+	    the information in the Group is changed, the
+	    version number is incremented to the next integer and can be
+	    used to determine how the information in the Group
+	    is formatted.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Version Number of the Shared Header Message Format</td>
+	  <td>This value is used to determine the format of the
+	    information in a shared object header message, which is
+	    stored in the global small-data heap.  Since the format
+	    of the shared header messages differs from the private
+	    header messages, a version number is used to identify changes
+	    in the format.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Size of Offsets</td>
+	  <td>This value contains the number of bytes used to store
+	    addresses in the file.  The values for the addresses of
+	    objects in the file are offsets relative to a base address,
+	    usually the address of the super block signature.  This
+	    allows a wrapper to be added after the file is created
+	    without invalidating the internal offset locations.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Size of Lengths</td>
+	  <td>This value contains the number of bytes used to store
+	    the size of an object.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Group Leaf Node K</td>
+	  <td>Each leaf node of a group B-tree will have at
+	    least this many entries but not more than twice this
+	    many.  If a group has a single leaf node then it
+	    may have fewer entries.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Group Internal Node K</td>
+	  <td>Each internal node of a group B-tree will have
+	    at least K pointers to other nodes but not more than 2K
+	    pointers.  If the group has only one internal
+	    node then it might have fewer than K pointers.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Bytes per B-tree Page</td>
+	  <td>This value contains the number of bytes used for symbol
+	    pairs per page of the B-trees used in the file.  All
+	    B-tree pages will have the same size per page.
+	    <br>
+	    For 32-bit file offsets, 340 objects is the maximum
+	    per 4KB page; for 64-bit file offset, 254 objects will fit
+	    per 4KB page.  In general, the equation is:
+	    <br>
+		    <code>&nbsp;&nbsp;&nbsp;&lt;<i>number of objects</i>&gt; =
+		    <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+		    FLOOR((&lt;<i>page size</i>&gt; - &lt;<i>offset size</i>&gt;) /
+		    <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+		    (&lt;<i>Symbol size</i>&gt; + &lt;<i>offset size</i>&gt;))
+		    - 1 </code></td>
+		</tr>
+
+		<tr valign=top>
+		  <td>File Consistency Flags</td>
+		  <td>This value contains flags to indicate information
+		    about the consistency of the information contained
+		    within the file.  Currently, the following bit flags are
+		    defined:
+		    <ul>
+		    <li>Bit 0 set indicates that the file is opened for
+		    write-access.
+		    <li>Bit 1 set indicates that the file has
+		    been verified for consistency and is guaranteed to be
+		    consistent with the format defined in this document.
+		    <li>Bits 2-31 are reserved for future use.
+		    </ul>
+		    Bit 0 should be
+		    set as the first action when a file is opened for write
+		    access and should be cleared only as the final action
+		    when closing a file.  Bit 1 should be cleared during
+		    normal access to a file and only set after the file's
+		    consistency is guaranteed by the library or a
+		    consistency utility.</td>
+		</tr>
+
+		<tr valign=top>
+		  <td>Base Address</td>
+		  <td>This is the absolute file address of the first byte of
+		    the HDF5 data within the file.  The library currently
+		    constrains this value to be the absolute file address
+		    of the super block itself when creating new files;
+		    future versions of the library may provide greater
+		    flexibility.  Unless otherwise noted,
+		    all other file addresses are relative to this base
+		    address.</td>
+		</tr>
+
+		<tr valign=top>
+		  <td>Address of Global Free-space Heap</td>
+		  <td>Free-space management is not yet defined in the HDF5
+		    file format and is not handled by the library.
+		    Currently this field always contains the
+		    undefined address <code>0xfff...ff</code>.
+<!--
+		  <td>This value contains the relative address of the B-tree
+		    used to manage the blocks of data which are unused in the
+		    file currently.  The free-space heap is used to manage the
+		    blocks of bytes at the file-level which become unused when
+		    objects are moved within the file.</td>
+-->
+		</tr>
+
+		<tr valign=top>
+		  <td>End of File Address</td>
+		  <td>This is the relative file address of the first byte past
+		    the end of all HDF5 data.  It is used to determine whether a
+		    file has been accidentally truncated and as an address where
+		    file data allocation can occur if the free list is not
+		    used.</td>
+		</tr>
+
+                <tr valign=top>
+                  <td>Driver Information Block Address</td>
+                  <td>This is the relative file address of the file driver
+                    information block which contains driver-specific
+                    information needed to reopen the file. If there is no
+                    driver information block then this entry should be the
+                    undefined address (all bits set).</td>
+                </tr>
+
+		<tr valign=top>
+		  <td>Root Group Address</td>
+		  <td>This is the address of the root group (described later
+		    in this document), which serves as the entry point into
+		    the group graph.</td>
+		</tr>
+	      </table>
+	    </center>
+
+
+    <p>The <em>file driver information block</em> is an optional region of the
+      file which contains information needed by the file driver in
+      order to reopen a file.  The format of the file driver information
+      block is:
+
+    <p>
+    <center>
+      <table border align=center cellpadding=4 width="80%">
+        <caption align=top>
+          <B>Driver Information Block</B>
+        </caption>
+
+        <tr align=center>
+          <th width="25%">byte</th>
+          <th width="25%">byte</th>
+          <th width="25%">byte</th>
+          <th width="25%">byte</th>
+	</tr>
+
+        <tr align=center>
+          <td>Version</td>
+          <td colspan=3>Reserved (zero)</td>
+        </tr>
+
+        <tr align=center>
+          <td colspan=4>Driver Information Size (4 bytes)</td>
+        </tr>
+
+        <tr align=center>
+          <td colspan=4><br>Driver Identification (8 bytes)<br><br></td>
+        </tr>
+
+        <tr align=center>
+          <td colspan=4><br><br>Driver Information<br><br><br></td>
+        </tr>
+      </table>
+    </center>
+
+    <p>
+    <center>
+      <table align=center width="80%">
+       <tr>
+         <th width="30%">Field Name</th>
+         <th width="70%">Description</th>
+        </tr>
+
+        <tr valign=top>
+          <td>Version</td>
+          <td>The version number of the driver information block. The
+            file format documented here is version zero.</td>
+        </tr>
+
+        <tr valign=top>
+          <td>Driver Information Size</td>
+          <td>The size in bytes of the Driver Information part of this
+            structure.</td>
+        </tr>
+
+        <tr valign=top>
+          <td>Driver Identification</td>
+          <td>This is an eight-byte ASCII string without null
+            termination which identifies the driver and version number
+            of the Driver Information block. The predefined drivers
+            supplied with the HDF5 library are identified by the
+            letters <code>NCSA</code> followed by the first four characters of
+            the driver name. If the Driver Information block is not
+            the original version then the last letter(s) of the
+            identification will be replaced by a version number in
+            ASCII.
+            For example, the various versions of the <em>family driver</em>
+            will be identified by <code>NCSAfami</code>, <code>NCSAfam0</code>,
+            <code>NCSAfam1</code>, etc.
+            (<code>NCSAfami</code> is simply <code>NCSAfamily</code> truncated
+            to eight characters.  Subsequent identifiers will be created by
+            substituting sequential numerical values for the final character,
+            starting with zero.)
+            <p>
+            Identification for user-defined drivers
+            is arbitrary but should be unique.</td>
+        </tr>
+
+        <tr valign=top>
+          <td>Driver Information</td>
+          <td>Driver information is stored in a format defined by the
+            file driver and encoded/decoded by the driver callbacks
+            invoked from the <code>H5FD_sb_encode</code> and
+            <code>H5FD_sb_decode</code> functions.</td>
+        </tr>
+      </table>
+    </center>
+
+
+	<br><br>
+	<br><br>
+
+
+	    <h2><a name="Group">
+		Disk Format: Level 1 - File Infrastructure</a></h2>
+	    <h3><a name="Btrees">Disk Format: Level 1A - B-link Trees and B-tree Nodes</a></h3>
+
+	    <p>B-link trees allow flexible storage for objects which tend to grow
+	      in ways that cause the object to be stored discontiguously.  B-trees
+	      are described in various algorithms books including "Introduction to
+	      Algorithms" by Thomas H. Cormen, Charles E. Leiserson, and Ronald
+	      L. Rivest.  The B-link tree, in which the sibling nodes at a
+	      particular level in the tree are stored in a doubly-linked list,
+	      is described in the "Efficient Locking for Concurrent Operations
+	      on B-trees" paper by Phillip Lehman and S. Bing Yao as published
+	      in the <em>ACM Transactions on Database Systems</em>, Vol. 6,
+	      No. 4, December 1981.
+
+	    <p>The B-link trees implemented by the file format contain one more
+	      key than the number of children.  In other words, each child
+	      pointer out of a B-tree node has a left key and a right key.
+	      The pointers out of internal nodes point to sub-trees while
+	      the pointers out of leaf nodes point to symbol nodes and
+	      raw data chunks.
+	      Aside from that difference, internal nodes and leaf nodes
+	      are identical.
+
+	    <p>
+	    <center>
+	      <table border cellpadding=4 width="80%">
+		<caption align=top>
+		  <B>B-tree Nodes</B>
+		</caption>
+
+		<tr align=center>
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+
+		<tr align=center>
+		  <td colspan=4>Node Signature</td>
+
+		<tr align=center>
+		  <td>Node Type</td>
+		  <td>Node Level</td>
+		  <td colspan=2>Entries Used</td>
+
+		<tr align=center>
+		  <td colspan=4>Address of Left Sibling</td>
+
+		<tr align=center>
+		  <td colspan=4>Address of Right Sibling</td>
+
+		<tr align=center>
+		  <td colspan=4>Key 0 (variable size)</td>
+
+		<tr align=center>
+		  <td colspan=4>Address of Child 0</td>
+
+		<tr align=center>
+		  <td colspan=4>Key 1 (variable size)</td>
+
+		<tr align=center>
+		  <td colspan=4>Address of Child 1</td>
+
+		<tr align=center>
+		  <td colspan=4>...</td>
+
+		<tr align=center>
+		  <td colspan=4>Key 2<em>K</em> (variable size)</td>
+
+		<tr align=center>
+		  <td colspan=4>Address of Child 2<em>K</em></td>
+
+		<tr align=center>
+		  <td colspan=4>Key 2<em>K</em>+1 (variable size)</td>
+	      </table>
+	    </center>
+
+	    <p>
+	    <center>
+	      <table align=center width="80%">
+		<tr>
+		  <th width="30%">Field Name</th>
+		  <th width="70%">Description</th>
+		</tr>
+
+		<tr valign=top>
+		  <td>Node Signature</td>
+		  <td>The ASCII character string <code>TREE</code> is
+		    used to indicate the
+		    beginning of a B-link tree node.  This gives file
+		    consistency checking utilities a better chance of
+		    reconstructing a damaged file.</td>
+		</tr>
+
+		<tr valign=top>
+		  <td>Node Type</td>
+		  <td>Each B-link tree points to a particular type of data.
+		    This field indicates the type of data as well as
+		    implying the maximum degree <em>K</em> of the tree and
+		    the size of each Key field.
+		    <br>
+		    <dl compact>
+		      <dt>0
+		      <dd>This tree points to group nodes.
+		      <dt>1
+		      <dd>This tree points to a new data chunk.
+		    </dl>
+		  </td>
+		</tr>
+
+		<tr valign=top>
+		  <td>Node Level</td>
+		  <td>The node level indicates the level at which this node
+		    appears in the tree (leaf nodes are at level zero).  Not
+		    only does the level indicate whether child pointers
+		    point to sub-trees or to data, but it can also be used
+		    to help file consistency checking utilities reconstruct
+		    damaged trees.</td>
+		</tr>
+
+		<tr valign=top>
+		  <td>Entries Used</td>
+		  <td>This determines the number of children to which this
+		    node points.  All nodes of a particular type of tree
+		    have the same maximum degree, but most nodes will point
+		    to less than that number of children.  The valid child
+		    pointers and keys appear at the beginning of the node
+		    and the unused pointers and keys appear at the end of
+		    the node.  The unused pointers and keys have undefined
+		    values.</td>
+		</tr>
+
+		<tr valign=top>
+		  <td>Address of Left Sibling</td>
+		  <td>This is the file address of the left sibling of the
+		    current node relative to the super block.  If the current
+		    node is the left-most node at this level then this field
+		    is the undefined address (all bits set).</td>
+		</tr>
+
+		<tr valign=top>
+		  <td>Address of Right Sibling</td>
+		  <td>This is the file address of the right sibling of the
+		    current node relative to the super block.  If the current
+		    node is the right-most node at this level then this
+		    field is the undefined address (all bits set).</td>
+		</tr>
+
+		<tr valign=top>
+		  <td>Keys and Child Pointers</td>
+		  <td>Each tree has 2<em>K</em>+1 keys with 2<em>K</em>
+		    child pointers interleaved between the keys.  The number
+		    of keys and child pointers actually containing valid
+		    values is determined by the <em>Entries Used</em> field.  If
+		    that field is <em>N</em> then the B-link tree contains
+		    <em>N</em> child pointers and <em>N</em>+1 keys.</td>
+		</tr>
+
+		<tr valign=top>
+		  <td>Key</td>
+		  <td>The format and size of the key values is determined by
+		    the type of data to which this tree points.  The keys are
+		    ordered and are boundaries for the contents of the child
+		    pointer; that is, the key values represented by child
+		    <em>N</em> fall between Key <em>N</em> and Key
+		    <em>N</em>+1. Whether the interval is open or closed on
+		    each end is determined by the type of data to which the
+		    tree points.
+		    <p>
+		    The format of the key depends on the node type.
+		    For nodes of node type 1, the key is formatted as follows:
+		    <center>
+		    <table>
+		    <tr valign=top align=left>
+		      <td width=40%>Bytes 1-4</td>
+		      <td>Size of chunk in bytes.</td>
+		    <tr valign=top align=left></tr>
+		      <td>Bytes 4-8</td>
+		      <td>Filter mask, a 32-bit bitfield indicating which
+		        filters have been applied to that chunk.</td>
+		    </tr><tr valign=top align=left>
+		      <td><i>N</i> fields of 8 bytes each</td>
+		      <td>A 64-bit index indicating the offset of the
+		        chunk within the dataset where <i>N</i> is the number
+		        of dimensions of the dataset.  For example, if
+		        a chunk in a 3-dimensional dataset begins at the
+		        position <code>[5,5,5]</code>, there will be three
+		        such 8-bit indices, each with the value of
+		        <code>5</code>.</td>
+		    </tr>
+		    </table>
+		    </center>
+		    <p>
+		    For nodes of node type 0, the key is formatted as follows:
+		    <center>
+		    <table>
+		    <tr valign=top align=left>
+		      <td width=40%>A single field of <i>Size of Lengths</i>
+		        bytes</td>
+		      <td>Indicates the byte offset into the local heap
+		        for the first object name in the subtree which
+		        that key describes.</td>
+		    </tr>
+		    </table>
+		    </center>
+		    </td>
+		</tr>
+
+		<tr valign=top>
+		  <td>Child Pointers</td>
+		  <td>The tree node contains file addresses of subtrees or
+		    data depending on the node level.  Nodes at Level 0 point
+		    to data addresses, either data chunk or group nodes.
+		    Nodes at non-zero levels point to other nodes of the
+		    same B-tree.</td>
+		</tr>
+	      </table>
+	    </center>
+
+<p>
+	     Each B-tree node looks like this:
+
+	     <center>
+	     <table>
+	       <tr valign=top align=center>
+	         <td>key[0]</td><td>&nbsp;&nbsp;</td>
+	         <td>child[0]</td><td>&nbsp;&nbsp;</td>
+	         <td>key[1]</td><td>&nbsp;&nbsp;</td>
+	         <td>child[1]</td><td>&nbsp;&nbsp;</td>
+	         <td>key[2]</td><td>&nbsp;&nbsp;</td>
+	         <td>...</td><td>&nbsp;&nbsp;</td>
+	         <td>...</td><td>&nbsp;&nbsp;</td>
+	         <td>key[<i>N</i>-1]</td><td>&nbsp;&nbsp;</td>
+	         <td>child[<i>N</i>-1]</td><td>&nbsp;&nbsp;</td>
+	         <td>key[<i>N</i>]</td>
+	       </tr>
+	     </table>
+	     </center>
+
+	     where child[<i>i</i>] is a pointer to a sub-tree (at a level
+	     above Level 0) or to data (at Level 0).
+	     Each key[<i>i</i>] describes an <i>item</i> stored by the B-tree
+	     (a chunk or an object of a group node).  The range of values
+	     represented by child[<i>i</i>] are indicated by key[<i>i</i>]
+	     and key[<i>i</i>+1].
+
+
+	    <p>The following question must next be answered:
+	     "Is the value described by key[<i>i</i>] contained in
+             child[<i>i</i>-1] or in child[<i>i</i>]?"
+	     The answer depends on the type of tree.
+	     In trees for groups (node type 0) the object described by
+	     key[<i>i</i>] is the greatest object contained in
+	     child[<i>i</i>-1] while in chunk trees (node type 1) the
+	     chunk described by key[<i>i</i>] is the least chunk in
+	     child[<i>i</i>].
+
+	    <p>That means that key[0] for group trees is sometimes unused;
+	     it points to offset zero in the heap, which is always the
+	     empty string and compares as "less-than" any valid object name.
+
+	    <p>And key[<i>N</i>] for chunk trees is sometimes unused;
+	     it contains a chunk offset which compares as "greater-than"
+	     any other chunk offset and has a chunk byte size of zero
+	     to indicate that it is not actually allocated.
+
+
+	    <h3><a name="SymbolTable">Disk Format: Level 1B - Group and Symbol Nodes</a></h3>
+
+	    <p>A group is an object internal to the file that allows
+	      arbitrary nesting of objects (including other groups).
+	      A group maps a set of names to a set of file
+	      address relative to the base address.  Certain meta data
+	      for an object to which the group points can be duplicated
+	      in the group symbol table in addition to the object header.
+
+	    <p>An HDF5 object name space can be stored hierarchically by
+	      partitioning the name into components and storing each
+	      component in a group.  The group entry for a
+	      non-ultimate component points to the group containing
+	      the next component.  The group entry for the last
+	      component points to the object being named.
+
+	    <p>A group is a collection of group nodes pointed
+	      to by a B-link tree.  Each group node contains entries
+	      for one or more symbols.  If an attempt is made to add a
+	      symbol to an already full group node containing
+	      2<em>K</em> entries, then the node is split and one node
+	      contains <em>K</em> symbols and the other contains
+	      <em>K</em>+1 symbols.
+
+	    <p>
+	    <center>
+	      <table border cellpadding=4 width="80%">
+		<caption align=top>
+		  <B>Group Node (A Leaf of a B-tree)</B>
+		</caption>
+
+		<tr align=center>
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+
+		<tr align=center>
+		  <td colspan=4>Node Signature</td>
+
+		<tr align=center>
+		  <td>Version Number</td>
+		  <td>Reserved for Future Use</td>
+		  <td colspan=2>Number of Symbols</td>
+
+		<tr align=center>
+		  <td colspan=4><br><br>Group Entries<br><br><br></td>
+	      </table>
+	    </center>
+
+	    <p>
+	    <center>
+	      <table align=center width="80%">
+		<tr>
+		  <th width="30%">Field Name</th>
+		  <th width="70%">Description</th>
+		</tr>
+
+		<tr valign=top>
+		  <td>Node Signature</td>
+		  <td>The ASCII character string <code>SNOD</code> is
+		    used to indicate the
+		    beginning of a group node.  This gives file
+		    consistency checking utilities a better chance of
+		    reconstructing a damaged file.</td>
+		</tr>
+
+		<tr valign=top>
+		  <td>Version Number</td>
+		  <td>The version number for the group node.  This
+		    document describes version 1.</td>
+		</tr>
+
+		<tr valign=top>
+		  <td>Number of Symbols</td>
+		  <td>Although all group nodes have the same length,
+		    most contain fewer than the maximum possible number of
+		    symbol entries.  This field indicates how many entries
+		    contain valid data.  The valid entries are packed at the
+		    beginning of the group node while the remaining
+		    entries contain undefined values.</td>
+		</tr>
+
+		<tr valign=top>
+		  <td>Group Entries</td>
+		  <td>Each symbol has an entry in the group node.
+		    The format of the entry is described below.</td>
+		</tr>
+	      </table>
+	    </center>
+
+	    <h3><a name="SymbolTableEntry">
+		Disk Format: Level 1C - Group Entry </a></h3>
+
+	    <p>Each group entry in a group node is designed
+	      to allow for very fast browsing of stored objects.
+	      Toward that design goal, the group entries
+	      include space for caching certain constant meta data from the
+	      object header.
+
+	    <p>
+	    <center>
+	      <table border cellpadding=4 width="80%">
+		<caption align=top>
+		  <B>Group Entry</B>
+		</caption>
+
+		<tr align=center>
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+		</tr>
+
+		<tr align=center>
+		  <td colspan=4>Name Offset (&lt;size&gt; bytes)</td>
+		</tr>
+
+		<tr align=center>
+		  <td colspan=4>Object Header Address</td>
+		</tr>
+
+		<tr align=center>
+		  <td colspan=4>Cache Type</td>
+		</tr>
+
+		<tr align=center>
+		  <td colspan=4>Reserved</td>
+		</tr>
+
+		<tr align=center>
+		  <td colspan=4><br><br>Scratch-pad Space (16 bytes)<br><br><br></td>
+		</tr>
+	      </table>
+	    </center>
+
+	    <p>
+	    <center>
+	      <table align=center width="80%">
+		<tr>
+		  <th width="30%">Field Name</th>
+		  <th width="70%">Description</th>
+		</tr>
+
+		<tr valign=top>
+		  <td>Name Offset</td>
+		  <td>This is the byte offset into the group local
+		    heap for the name of the object. The name is null
+		    terminated.</td>
+		</tr>
+
+		<tr valign=top>
+		  <td>Object Header Address</td>
+		  <td>Every object has an object header which serves as a
+		    permanent location for the object's meta data.  In addition
+		    to appearing in the object header, some meta data can be
+		    cached in the scratch-pad space.</td>
+		</tr>
+
+		<tr valign=top>
+		  <td>Cache Type</td>
+		  <td>The cache type is determined from the object header.
+		    It also determines the format for the scratch-pad space.
+		    <br>
+		    <dl compact>
+		      <dt>0
+		      <dd>No data is cached by the group entry.  This
+			is guaranteed to be the case when an object header
+			has a link count greater than one.
+
+		      <dt>1
+		      <dd>Object header meta data is cached in the group
+		        entry.  This implies that the group
+			entry refers to another group.
+
+		      <dt>2
+		      <dd>The entry is a symbolic link.  The first four bytes
+			of the scratch-pad space are the offset into the local
+			heap for the link value.  The object header address
+			will be undefined.
+
+		      <dt><em>N</em>
+		      <dd>Other cache values can be defined later and
+		      libraries that do not understand the new values will
+		      still work properly.
+		    </dl>
+		  </td>
+		</tr>
+
+		<tr valign=top>
+		  <td>Reserved</td>
+		  <td>These four bytes are present so that the scratch-pad
+		    space is aligned on an eight-byte boundary.  They are
+		    always set to zero.</td>
+		</tr>
+
+		<tr valign=top>
+		  <td>Scratch-pad Space</td>
+		  <td>This space is used for different purposes, depending
+		    on the value of the Cache Type field. Any meta-data
+		    about a dataset object represented in the scratch-pad
+		    space is duplicated in the object header for that
+		    dataset.  This meta data can include the datatype
+		    and the size of the dataspace for a dataset whose datatype
+		    is atomic and whose dataspace is fixed and less than
+		    four dimensions.
+		    Furthermore, no data is cached in the group
+		    entry scratch-pad space if the object header for
+		    the group entry has a link count greater than
+		    one.</td>
+		</tr>
+	      </table>
+	    </center>
+
+	<h4>Format of the Scratch-pad Space</h4>
+
+	    <p>The group entry scratch-pad space is formatted
+	      according to the value in the Cache Type field.
+
+	    <p>If the Cache Type field contains the value zero
+	      (<code>0</code>) then no information is
+	      stored in the scratch-pad space.
+
+	    <p>If the Cache Type field contains the value one
+	      (<code>1</code>), then the scratch-pad space
+	      contains cached meta data for another object header
+	      in the following format:
+
+	    <p>
+	    <center>
+	      <table border cellpadding=4 width="80%">
+		<caption align=top>
+		  <B>Object Header Scratch-pad Format</B>
+		</caption>
+
+		<tr align=center>
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+
+		<tr align=center>
+		  <td colspan=4>Address of B-tree</td>
+
+		<tr align=center>
+		  <td colspan=4>Address of Name Heap</td>
+	      </table>
+	    </center>
+
+	    <p>
+	    <center>
+	      <table align=center width="80%">
+		<tr>
+		  <th width="30%">Field Name</th>
+		  <th width="70%">Description</th>
+		</tr>
+
+		<tr valign=top>
+		  <td>Address of B-tree</td>
+		  <td>This is the file address for the root of the
+		    group's B-tree.</td>
+		</tr>
+
+		<tr valign=top>
+		  <td>Address of Name Heap</td>
+		  <td>This is the file address for the group's local
+		    heap, in which are stored the symbol names.</td>
+		</tr>
+	      </table>
+	    </center>
+
+
+	    <p>If the Cache Type field contains the value two
+	      (<code>2</code>), then the scratch-pad space
+	      contains cached meta data for another symbolic link
+	      in the following format:
+
+	    <p>
+	    <center>
+	      <table border cellpadding=4 width="80%">
+		<caption align=top>
+		  <B>Symbolic Link Scratch-pad Format</B>
+		</caption>
+
+		<tr align=center>
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+		</tr>
+
+		<tr align=center>
+		  <td colspan=4>Offset to Link Value</td>
+		</tr>
+	      </table>
+	    </center>
+
+	    <p>
+	    <center>
+	      <table align=center width="80%">
+		<tr>
+		  <th width="30%">Field Name</th>
+		  <th width="70%">Description</th>
+		</tr>
+
+		<tr valign=top>
+		  <td>Offset to Link Value</td>
+		  <td>The value of a symbolic link (that is, the name of the
+		    thing to which it points) is stored in the local heap.
+		    This field is the 4-byte offset into the local heap for
+		    the start of the link value, which is null terminated.</td>
+		</tr>
+	      </table>
+	    </center>
+
+	    <h3><a name="LocalHeap">Disk Format: Level 1D - Local Heaps</a></h3>
+
+	    <p>A heap is a collection of small heap objects.  Objects can be
+	      inserted and removed from the heap at any time.
+	      The address of a heap does not change once the heap is created.
+	      References to objects are stored in the group table;
+	      the names of those objects are stored in the local heap.
+
+	    <p>
+	    <center>
+	      <table border cellpadding=4 width="80%">
+		<caption align=top>
+		  <b>Local Heaps</b>
+		</caption>
+
+		<tr align=center>
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+		</tr>
+
+		<tr align=center>
+		  <td colspan=4>Heap Signature</td>
+		</tr>
+
+		<tr align=center>
+		  <td colspan=4>Reserved (zero)</td>
+		</tr>
+
+		<tr align=center>
+		  <td colspan=4>Data Segment Size</td>
+		</tr>
+
+		<tr align=center>
+		  <td colspan=4>Offset to Head of Free-list (&lt;size&gt; bytes)</td>
+		</tr>
+
+		<tr align=center>
+		  <td colspan=4>Address of Data Segment</td>
+		</tr>
+	      </table>
+	    </center>
+
+	    <p>
+	    <center>
+	      <table align=center width="80%">
+		<tr>
+		  <th width="30%">Field Name</th>
+		  <th width="70%">Description</th>
+		</tr>
+
+		<tr valign=top>
+		  <td>Heap Signature</td>
+		  <td>The ASCII character string <code>HEAP</code>
+		    is used to indicate the
+		    beginning of a heap.  This gives file consistency
+		    checking utilities a better chance of reconstructing a
+		    damaged file.</td>
+		</tr>
+
+		<tr valign=top>
+		  <td>Data Segment Size</td>
+		  <td>The total amount of disk memory allocated for the heap
+		    data.  This may be larger than the amount of space
+		    required by the object stored in the heap.  The extra
+		    unused space holds a linked list of free blocks.</td>
+		</tr>
+
+		<tr valign=top>
+		  <td>Offset to Head of Free-list</td>
+		  <td>This is the offset within the heap data segment of the
+		    first free block (or all 0xff bytes if there is no free
+		    block).  The free block contains &lt;size&gt; bytes that
+		    are the offset of the next free chunk (or all 0xff bytes
+		    if this is the last free chunk) followed by &lt;size&gt;
+		    bytes that store the size of this free chunk.</td>
+		</tr>
+
+		<tr valign=top>
+		  <td>Address of Data Segment</td>
+		  <td>The data segment originally starts immediately after
+		    the heap header, but if the data segment must grow as a
+		    result of adding more objects, then the data segment may
+		    be relocated, in its entirety, to another part of the
+		    file.</td>
+		</tr>
+	      </table>
+	    </center>
+
+	    <p>Objects within the heap should be aligned on an 8-byte boundary.
+
+	    <h3><a name="GlobalHeap">Disk Format: Level 1E - Global Heap</a></h3>
+
+	    <p>Each HDF5 file has a global heap which stores various types of
+	      information which is typically shared between datasets.  The
+	      global heap was designed to satisfy these goals:
+
+	    <ol type="A">
+	      <li>Repeated access to a heap object must be efficient without
+		resulting in repeated file I/O requests. Since global heap
+		objects will typically be shared among several datasets, it is
+		probable that the object will be accessed repeatedly.
+
+		<br><br>
+	      <li>Collections of related global heap objects should result in
+		fewer and larger I/O requests.  For instance, a dataset of
+		void pointers will have a global heap object for each
+		pointer.  Reading the entire set of void pointer objects
+		should result in a few large I/O requests instead of one small
+		I/O request for each object.
+
+		<br><br>
+	      <li>It should be possible to remove objects from the global heap
+		and the resulting file hole should be eligible to be reclaimed
+		for other uses.
+		<br><br>
+	    </ol>
+
+	    <p>The implementation of the heap makes use of the memory
+	      management already available at the file level and combines that
+	      with a new top-level object called a <em>collection</em> to
+	      achieve Goal B. The global heap is the set of all collections.
+	      Each global heap object belongs to exactly one collection and
+	      each collection contains one or more global heap objects. For
+	      the purposes of disk I/O and caching, a collection is treated as
+	      an atomic object.
+
+	    <p>
+	    <center>
+	      <table border cellpadding=4 width="80%">
+		<caption align=top>
+		  <B>A Global Heap Collection</B>
+		</caption>
+
+		<tr align=center>
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+		</tr>
+
+		<tr align=center>
+		  <td colspan=4>Magic Number</td>
+		</tr>
+
+		<tr align=center>
+		  <td>Version</td>
+		  <td colspan=3>Reserved</td>
+		</td>
+
+		<tr align=center>
+		  <td colspan=4>Collection Size</td>
+		</tr>
+
+		<tr align=center>
+		  <td colspan=4><br>Global Heap Object 1
+	             <i>(described below)</i><br><br></td>
+		</tr>
+
+		<tr align=center>
+		  <td colspan=4><br>Global Heap Object 2<br><br></td>
+		</tr>
+
+		<tr align=center>
+		  <td colspan=4><br>...<br><br></td>
+		</tr>
+
+		<tr align=center>
+		  <td colspan=4><br>Global Heap Object <em>N</em><br><br></td>
+		</tr>
+
+		<tr align=center>
+		  <td colspan=4><br>Global Heap Object 0 (free space)<br><br></td>
+		</tr>
+	      </table>
+	    </center>
+
+	    <p>
+	    <center>
+	      <table align=center width="80%">
+		<tr>
+		  <th width="30%">Field Name</th>
+		  <th width="70%">Description</th>
+		</tr>
+
+		<tr valign=top>
+		  <td>Magic Number</td>
+		  <td>The magic number for global heap collections are the
+		    four bytes <code>G</code>, <code>C</code>, <code>O</code>,
+		    and <code>L</code>.</td>
+		</tr>
+
+		<tr valign=top>
+		  <td>Version</td>
+		  <td>Each collection has its own version number so that new
+		    collections can be added to old files.  This document
+		    describes version zero of the collections.
+		</tr>
+
+		<tr valign=top>
+		  <td>Collection Data Size</td>
+		  <td>This is the size in bytes of the entire collection
+		    including this field.  The default (and minimum)
+		    collection size is 4096 bytes which is a typical file
+		    system block size and which allows for 170 16-byte heap
+		    objects plus their overhead.</td>
+		</tr>
+
+		<tr valign=top>
+		  <td>Object 1 through <em>N</em></td>
+		  <td>The objects are stored in any order with no
+		    intervening unused space.</td>
+		</tr>
+
+		<tr valign=top>
+		  <td>Object 0</td>
+		  <td>Object 0 (zero), when present, represents the free space in
+		    the collection.  Free space always appears at the end of
+		    the collection.  If the free space is too small to store
+		    the header for Object 0 (described below) then the
+		    header is implied and the collection contains no free space.
+	      </table>
+	    </center>
+
+	    <p>
+	    <center>
+	      <table border cellpadding=4 width="80%">
+		<caption align=top>
+		  <B>Global Heap Object</B>
+		</caption>
+
+		<tr align=center>
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+		</tr>
+
+		<tr align=center>
+		  <td colspan=2>Object ID</td>
+		  <td colspan=2>Reference Count</td>
+		</tr>
+
+		<tr align=center>
+		  <td colspan=4>Reserved</td>
+		</tr>
+
+		<tr align=center>
+		  <td colspan=4>Object Data Size</td>
+		</tr>
+
+		<tr align=center>
+		  <td colspan=4><br>Object Data<br><br></td>
+		</tr>
+	      </table>
+	    </center>
+
+	    <p>
+	    <center>
+	      <table align=center width="80%">
+		<tr>
+		  <th width="30%">Field Name</th>
+		  <th width="70%">Description</th>
+		</tr>
+
+		<tr valign=top>
+		  <td>Object ID</td>
+		  <td>Each object has a unique identification number within a
+		    collection.  The identification numbers are chosen so that
+		    new objects have the smallest value possible with the
+		    exception that the identifier <code>0</code> always refers to the
+		    object which represents all free space within the
+		    collection.</td>
+		</tr>
+
+		<tr valign=top>
+		  <td>Reference Count</td>
+		  <td>All heap objects have a reference count field.  An
+		    object which is referenced from some other part of the
+		    file will have a positive reference count. The reference
+		    count for Object 0 is always zero.</td>
+		</tr>
+
+		<tr valign=top>
+		  <td>Reserved</td>
+		  <td>Zero padding to align next field on an 8-byte
+		    boundary.</td>
+		</tr>
+
+		<tr valign=top>
+		  <td>Object Size</td> <td>This is the size of the the fields
+		    above plus the object data stored for the object.  The
+		    actual storage size is rounded up to a multiple of
+		    eight.</td>
+		</tr>
+
+		<tr valign=top>
+		  <td>Object Data</td>
+		  <td>The object data is treated as a one-dimensional array
+		    of bytes to be interpreted by the caller.</td>
+		</tr>
+	      </table>
+	    </center>
+
+	    <h3><a name="FreeSpaceIndex">Disk Format: Level 1F - Free-space Heap</a></h3>
+
+	    <p>The Free-space Index is a collection of blocks of data,
+	      dispersed throughout the file, which are currently not used by
+	      any file objects.
+
+	    <p>The super block contains a pointer to root of the free-space description;
+	      that pointer is currently (i.e., in HDF5 Release 1.2) required
+	      to be the undefined address <code>0xfff...ff</code>.
+
+	    <p>The free-sapce index is not otherwise publicly defined at this time.
+
+
+	<!--
+	    <p>The Free-space Index is a collection of blocks of data,
+	      dispersed throughout the file, which are currently not used by
+	      any file objects.  The blocks of data are indexed by a B-tree of
+	      their length within the file.
+
+
+	    <p>Each B-tree page is composed of the following entries and
+	      B-tree management information, organized as follows:
+
+	    <p>
+	    <center>
+	      <table border cellpadding=4 width="80%">
+		<caption align=bottom>
+		  <B>HDF5 Free-space Heap Page</B>
+		</caption>
+
+		<tr align=center>
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+
+		<tr align=center>
+		  <td colspan=4>Free-space Heap Signature</td>
+		<tr align=center>
+		  <td colspan=4>B-tree Left-link Offset</td>
+		<tr align=center>
+		  <td colspan=4><br>Length of Free-block #1<br> <br></td>
+	<tr align=center>
+	  <td colspan=4><br>Offset of Free-block #1<br> <br></td>
+	<tr align=center>
+	  <td colspan=4>.<br>.<br>.<br></td>
+	<tr align=center>
+	  <td colspan=4><br>Length of Free-block #n<br> <br></td>
+	<tr align=center>
+	  <td colspan=4><br>Offset of Free-block #n<br> <br></td>
+	<tr align=center>
+	  <td colspan=4>"High" Offset</td>
+	<tr align=center>
+	  <td colspan=4>Right-link Offset</td>
+      </table>
+    </center>
+
+    <p>
+    <dl>
+      <dt> The elements of the free-space heap page are described below:
+      <dd>
+	<dl>
+	  <dt>Free-space Heap Signature: (4 bytes)
+	  <dd>The ASCII character string <code>FREE</code>
+	    is used to indicate the
+	    beginning of a free-space heap B-tree page.  This gives
+	    file consistency checking utilities a better chance of
+	    reconstructing a damaged file.
+
+	  <dt>B-tree Left-link Offset: (&lt;offset&gt; bytes)
+	  <dd>This value is used to indicate the offset of all offsets
+	    in the B-link-tree which are smaller than the value of the
+	    offset in entry #1.  This value is also used to indicate a
+	    leaf node in the B-link-tree by being set to all ones.
+
+	  <dt>Length of Free-block #n: (&lt;length&gt; bytes)
+	  <dd>This value indicates the length of an unused block in
+	    the file.
+
+	  <dt>Offset of Free-block #n: (&lt;offset&gt; bytes)
+	  <dd>This value indicates the offset in the file of an
+	    unused block in the file.
+
+	  <dt>"High" Offset: (4-bytes)
+	  <dd>This offset is used as the upper bound on offsets
+	    contained within a page when the page has been split.
+
+	  <dt>Right-link Offset: (&lt;offset&gt; bytes)
+	  <dd>This value is used to indicate the offset of the next
+	    child to the right of the parent of this group
+	    page.  When there is no node to the right, this value is
+	    all zeros.
+	</dl>
+    </dl>
+
+    <p>The algorithms for searching and inserting objects in the
+      B-tree pages are described fully in the Lehman and Yao paper,
+      which should be read to provide a full description of the
+      B-tree's usage.
+-->
+
+
+<br><br>
+<br><br>
+
+
+    <h2><a name="DataObject">Disk Format: Level 2 - Data Objects </a></h2>
+
+    <p>Data objects contain the real information in the file.  These
+      objects compose the scientific data and other information which
+      are generally thought of as "data" by the end-user.  All the
+      other information in the file is provided as a framework for
+      these data objects.
+
+    <p>A data object is composed of header information and data
+      information.  The header information contains the information
+      needed to interpret the data information for the data object as
+      well as additional "meta-data" or pointers to additional
+      "meta-data" used to describe or annotate each data object.
+
+    <h3><a name="ObjectHeader">
+	Disk Format: Level 2a - Data Object Headers</a></h3>
+
+    <p>The header information of an object is designed to encompass
+      all the information about an object which would be desired to be
+      known, except for the data itself.  This information includes
+      the dimensionality, number-type, information about how the data
+      is stored on disk (in external files, compressed, broken up in
+      blocks, etc.), as well as other information used by the library
+      to speed up access to the data objects or maintain a file's
+      integrity.  The header of each object is not necessarily located
+      immediately prior to the object's data in the file and in fact
+      may be located in any position in the file.
+
+    <p>
+    <center>
+      <table border cellpadding=4 width="80%">
+	<caption align=top>
+	  <B>Object Headers</B>
+	</caption>
+
+	<tr align=center>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=1 width="25%">Version # of Object Header</td>
+	  <td colspan=1 width="25%">Reserved</td>
+	  <td colspan=2 width="50%">Number of Header Messages</td>
+	</tr>
+	<tr align=center>
+	  <td colspan=4>Object Reference Count</td>
+	</tr>
+	<tr align=center>
+	  <td colspan=4><br>Total Object Header Size<br><br></td>
+	</tr>
+	<tr align=center>
+	  <td colspan=2>Header Message Type #1</td>
+	  <td colspan=2>Size of Header Message Data #1</td>
+	</tr>
+	<tr align=center>
+	  <td>Flags</td>
+	  <td colspan=3>Reserved</td>
+	</tr>
+	<tr align=center>
+	  <td colspan=4><br>Header Message Data #1<br><br></td>
+	</tr>
+	<tr align=center>
+	  <td colspan=4>.<br>.<br>.<br></td>
+	</tr>
+	<tr align=center>
+	  <td colspan=2>Header Message Type #n</td>
+	  <td colspan=2>Size of Header Message Data #n</td>
+	</tr>
+	<tr align=center>
+	  <td>Flags</td>
+	  <td colspan=3>Reserved</td>
+	</tr>
+	<tr align=center>
+	  <td colspan=4><br>Header Message Data #n<br><br></td>
+	</tr>
+      </table>
+    </center>
+
+    <p>
+    <center>
+      <table align=center width="80%">
+	<tr>
+	  <th width="30%">Field Name</th>
+	  <th width="70%">Description</th>
+	</tr>
+
+	<tr valign=top>
+	  <td>Version number of the object header</td>
+	  <td>This value is used to determine the format of the
+	    information in the object header.  When the format of the
+	    information in the object header is changed, the version number
+	    is incremented and can be used to determine how the
+	    information in the object header is formatted.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Reserved</td>
+	  <td>Always set to zero.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Number of header messages</td>
+	  <td>This value determines the number of messages listed in
+	    this object header.  This provides a fast way for software
+	    to prepare storage for the messages in the header.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Object Reference Count</td>
+	  <td>This value specifies the number of references to this
+	    object within the current file.  References to the
+	    data object from external files are not tracked.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Total Object Header Size</td>
+	  <td>This value specifies the total number of bytes of header
+	    message data following this length field for the current
+	    message as well as any continuation data located elsewhere
+	    in the file.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Header Message Type</td>
+	  <td>The header message type specifies the type of
+	    information included in the header message data following
+	    the type along with a small amount of other information.
+	    Bit 15 of the message type is set if the message is
+	    constant (constant messages cannot be changed since they
+	    may be cached in group entries throughout the
+	    file).  The header message types for the pre-defined
+	    header messages will be included in further discussion
+	    below.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Size of Header Message Data</td>
+	  <td>This value specifies the number of bytes of header
+	    message data following the header message type and length
+	    information for the current message. The size includes
+	    padding bytes to make the message a multiple of eight
+	    bytes.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Flags</td>
+	  <td>This is a bit field with the following definition:
+	    <dl>
+	      <dt><code>0</code>
+	      <dd>If set, the message data is constant.  This is used
+		for messages like the datatype message of a dataset.
+	      <dt><code>1</code>
+	      <dd>If set, the message is stored in the global heap and
+		the Header Message Data field contains a Shared Object
+		message and the Size of Header Message Data field
+		contains the size of that Shared Object message.
+	      <dt><code>2-7</code>
+	      <dd>Reserved
+	    </dl>
+	  </td>
+
+	<tr valign=top>
+	  <td>Header Message Data</td>
+	  <td>The format and length of this field is determined by the
+	    header message type and size respectively.  Some header
+	    message types do not require any data and this information
+	    can be eliminated by setting the length of the message to
+	    zero. The data is padded with enough zeros to make the
+	    size a multiple of eight.</td>
+	</tr>
+      </table>
+    </center>
+
+    <p>The header message types and the message data associated with
+      them compose the critical "meta-data" about each object.  Some
+      header messages are required for each object while others are
+      optional.  Some optional header messages may also be repeated
+      several times in the header itself, the requirements and number
+      of times allowed in the header will be noted in each header
+      message description below.
+
+    <P>The following is a list of currently defined header messages:
+
+    <hr>
+    <h4><a name="NILMessage">Name: NIL</a></h4>
+    <b>Type: </b>0x0000<br>
+    <b>Length:</b> varies<br>
+    <b>Status:</b> Optional, may be repeated.<br>
+    <b>Purpose and Description:</b> The NIL message is used to
+    indicate a message
+    which is to be ignored when reading the header messages for a data object.
+    [Probably one which has been deleted for some reason.]<br>
+    <b>Format of Data:</b> Unspecified.<br>
+
+<!-- Delete examples throughout doc
+    <b>Examples:</b> None.
+-->
+
+
+    <hr>
+    <h4><a name="SimpleDataSpace">Name: Simple Dataspace</a></h4>
+
+    <b>Type: </b>0x0001<br>
+    <b>Length:</b> Varies according to the number of dimensions,
+      as described in the following table<br>
+    <b>Status:</b> The <em>Simple Dataspace</em> message is required
+     and may not be repeated.  This message is currently used with
+     datasets and named dataspaces.<br>
+
+    <p>The <em>Simple Dataspace</em> message describes the number
+      of dimensions and size of each dimension that the data object
+      has.  This message is only used for datasets which have a
+      simple, rectilinear grid layout; datasets requiring a more
+      complex layout (irregularly structured or unstructured grids, etc.)
+      must use the <em>Complex Dataspace</em> message for expressing
+      the space the dataset inhabits.
+      <i>(Note: The <em>Complex Dataspace</em> functionality is
+      not yet implemented (as of HDF5 Release 1.2).  It is not described
+      in this document.)</i>
+
+    <p>
+    <center>
+      <table border cellpadding=4 width="80%">
+	<caption align=top>
+	  <b>Simple Dataspace Message</b>
+	</caption>
+
+	<tr align=center>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr align=center>
+	  <td>Version</td>
+	  <td>Dimensionality</td>
+	  <td>Flags</td>
+	  <td>Reserved</td>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4>Reserved</td>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4>Dimension Size #1 (&lt;size&gt; bytes)</td>
+	<tr align=center>
+	  <td colspan=4>.<br>.<br>.<br></td>
+	<tr align=center>
+	  <td colspan=4>Dimension Size #n (&lt;size&gt; bytes)</td>
+	<tr align=center>
+	  <td colspan=4>Dimension Maximum #1 (&lt;size&gt; bytes)</td>
+	<tr align=center>
+	  <td colspan=4>.<br>.<br>.<br></td>
+	<tr align=center>
+	  <td colspan=4>Dimension Maximum #n (&lt;size&gt; bytes)</td>
+	<tr align=center>
+	  <td colspan=4>Permutation Index #1</td>
+	<tr align=center>
+	  <td colspan=4>.<br>.<br>.<br></td>
+	<tr align=center>
+	  <td colspan=4>Permutation Index #n</td>
+      </table>
+    </center>
+
+    <p>
+    <center>
+      <table align=center width="80%">
+	<tr>
+	  <th width="30%">Field Name</th>
+	  <th width="70%">Description</th>
+	</tr>
+
+	<tr valign=top>
+	  <td>Version </td>
+	  <td>This value is used to determine the format of the
+	    Simple Dataspace Message.  When the format of the
+	    information in the message is changed, the version number
+	    is incremented and can be used to determine how the
+	    information in the object header is formatted.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Dimensionality</td>
+	  <td>This value is the number of dimensions that the data
+	    object has.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Flags</td>
+	  <td>This field is used to store flags to indicate the
+	    presence of parts of this message.  Bit 0 (the least
+	    significant bit) is used to indicate that maximum
+	    dimensions are present.  Bit 1 is used to indicate that
+	    permutation indices are present for each dimension.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Dimension Size #n (&lt;size&gt; bytes)</td>
+	  <td>This value is the current size of the dimension of the
+	    data as stored in the file.  The first dimension stored in
+	    the list of dimensions is the slowest changing dimension
+	    and the last dimension stored is the fastest changing
+	    dimension.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Dimension Maximum #n (&lt;size&gt; bytes)</td>
+	  <td>This value is the maximum size of the dimension of the
+	    data as stored in the file.  This value may be the special
+	    value &lt;UNLIMITED&gt; (all bits set) which indicates
+	    that the data may expand along this dimension
+	    indefinitely.  If these values are not stored, the maximum
+	    value of each dimension is assumed to be the same as the
+	    current size value.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Permutation Index #n (4 bytes)</td>
+	  <td>This value is the index permutation used to map
+	    each dimension from the canonical representation to an
+	    alternate axis for each dimension.  If these values are
+	    not stored, the first dimension stored in the list of
+	    dimensions is the slowest changing dimension and the last
+	    dimension stored is the fastest changing dimension.</td>
+	</tr>
+      </table>
+    </center>
+
+<!-- Delete examples throughout doc
+    <h4>Examples</h4>
+    <dl>
+      <dt> Example #1
+      <dd>A sample 640 horizontally by 480 vertically raster image
+	dimension header.  The number of dimensions would be set to 2
+	and the first dimension's size and maximum would both be set
+	to 480.  The second dimension's size and maximum would both be
+	set to 640
+.
+      <dt>Example #2
+      <dd>A sample 4 dimensional scientific dataset which is composed
+	of 30x24x3 slabs of data being written out in an unlimited
+	series every several minutes as timestep data (currently there
+	are five slabs).  The number of dimensions is 4.  The first
+	dimension size is 5 and its maximum is &lt;UNLIMITED&gt;. The
+	second through fourth dimension's size and maximum value are
+	set to 3, 24, and 30 respectively.
+
+      <dt>Example #3
+      <dd>A sample unlimited length text string, currently of length
+	83. The number of dimensions is 1, the size of the first
+	dimension is 83 and the maximum of the first dimension is set
+	to &lt;UNLIMITED&gt;, allowing further text data to be
+	appended to the string or possibly the string to be replaced
+	with another string of a different size.  (This could also be
+	stored as a scalar dataset with number-type set to "string")
+    </dl>
+-->
+
+<!-- DELETE ENTIRE DATASPACE SECTION -->
+<!--
+    <hr>
+    <h4><a name="DataSpaceMessage">Name: Complex Dataspace (Fiber Bundle?)</a></h4>
+    <b>Type: </b>0x0002<br>
+    <b>Length:</b> varies<br>
+
+    <b>Status:</b> One of the <em>Simple Dataspace</em> or
+    <em>Complex Dataspace</em> messages is required (but not both) and may
+    not be repeated.<br> <b>Purpose and Description:</b> The
+    <em>Dataspace</em> message describes space that the dataset is
+    mapped onto in a more comprehensive way than the <em>Simple
+    Dimensionality</em> message is capable of handling.  The
+    dataspace of a dataset encompasses the type of coordinate system
+    used to locate the dataset's elements as well as the structure and
+    regularity of the coordinate system.  The dataspace also
+    describes the number of dimensions which the dataset inhabits as
+    well as a possible higher dimensional space in which the dataset
+    is located within.
+
+    <br>
+    <b>Format of Data:</b>
+
+    <center>
+      <table border cellpadding=4 width="80%">
+	<caption align=bottom>
+	  <B>HDF5 Dataspace Message Layout</B>
+	</caption>
+
+	<tr align=center>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+
+	<tr align=center>
+	  <td colspan=4>Mesh Type</td>
+	<tr align=center>
+	  <td colspan=4>Logical Dimensionality</td>
+      </table>
+    </center>
+
+    <p>
+    <dl>
+      <dt>The elements of the dimensionality message are described below:
+      <dd>
+	<dl>
+	  <dt>Mesh Type: (unsigned 32-bit integer)
+	  <dd>This value indicates whether the grid is
+	    polar/spherical/cartesion,
+	    structured/unstructured and regular/irregular. <br>
+	    The mesh type value is broken up as follows: <br>
+
+	    <P>
+	    <center>
+	      <table border cellpadding=4 width="80%">
+		<caption align=bottom>
+		  <B>HDF5 Mesh-type Layout</B>
+		</caption>
+
+		<tr align=center>
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+
+		<tr align=center>
+		  <td colspan=1>Mesh Embedding</td>
+		  <td colspan=1>Coordinate System</td>
+		  <td colspan=1>Structure</td>
+		  <td colspan=1>Regularity</td>
+	      </table>
+	    </center>
+	    The following are the definitions of mesh-type bytes:
+	    <dl>
+	      <dt>Mesh Embedding
+	      <dd>This value indicates whether the dataset dataspace
+		is located within
+		another dataspace or not:
+		<dl> <dl>
+		    <dt>&lt;STANDALONE&gt;
+		    <dd>The dataset mesh is self-contained and is not
+		      embedded in another mesh.
+		    <dt>&lt;EMBEDDED&gt;
+		    <dd>The dataset's dataspace is located within
+		      another dataspace, as
+		      described in information below.
+		  </dl> </dl>
+	      <dt>Coordinate System
+	      <dd>This value defines the type of coordinate system
+		used for the mesh:
+		<dl> <dl>
+		    <dt>&lt;POLAR&gt;
+		    <dd>The last two dimensions are in polar
+		      coordinates, higher dimensions are
+		      cartesian.
+		    <dt>&lt;SPHERICAL&gt;
+		    <dd>The last three dimensions are in spherical
+		      coordinates, higher dimensions
+		      are cartesian.
+		    <dt>&lt;CARTESIAN&gt;
+		    <dd>All dimensions are in cartesian coordinates.
+		  </dl> </dl>
+	      <dt>Structure
+	      <dd>This value defines the locations of the grid-points
+		on the axes:
+		<dl> <dl>
+		    <dt>&lt;STRUCTURED&gt;
+		    <dd>All grid-points are on integral, sequential
+		      locations, starting from 0.
+		    <dt>&lt;UNSTRUCTURED&gt;
+		    <dd>Grid-points locations in each dimension are
+		      explicitly defined and
+		      may be of any numeric datatype.
+		  </dl> </dl>
+	      <dt>Regularity
+	      <dd>This value defines the locations of the dataset
+		points on the grid:
+		<dl> <dl>
+		    <dt>&lt;REGULAR&gt;
+		    <dd>All dataset elements are located at the
+		      grid-points defined.
+		    <dt>&lt;IRREGULAR&gt;
+		    <dd>Each dataset element has a particular
+		      grid-location defined.
+		  </dl> </dl>
+	    </dl>
+	    <p>The following grid combinations are currently allowed:
+	    <dl> <dl>
+		<dt>&lt;POLAR-STRUCTURED-REGULAR&gt;
+		<dt>&lt;SPHERICAL-STRUCTURED-REGULAR&gt;
+		<dt>&lt;CARTESIAN-STRUCTURED-REGULAR&gt;
+		<dt>&lt;POLAR-UNSTRUCTURED-REGULAR&gt;
+		<dt>&lt;SPHERICAL-UNSTRUCTURED-REGULAR&gt;
+		<dt>&lt;CARTESIAN-UNSTRUCTURED-REGULAR&gt;
+		<dt>&lt;CARTESIAN-UNSTRUCTURED-IRREGULAR&gt;
+	      </dl> </dl>
+	    All of the above grid types can be embedded within another
+	    dataspace.
+	    <br> <br>
+	  <dt>Logical Dimensionality: (unsigned 32-bit integer)
+	  <dd>This value is the number of dimensions that the dataset occupies.
+
+	    <P>
+	    <center>
+	      <table border cellpadding=4 width="80%">
+		<caption align=bottom>
+		  <B>HDF5 Dataspace Embedded Dimensionality Information</B>
+		</caption>
+
+		<tr align=center>
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+
+		<tr align=center>
+		  <td colspan=4>Embedded Dimensionality</td>
+		<tr align=center>
+		  <td colspan=4>Embedded Dimension Size #1</td>
+		<tr align=center>
+		  <td colspan=4>.<br>.<br>.<br></td>
+		<tr align=center>
+		  <td colspan=4>Embedded Dimension Size #n</td>
+		<tr align=center>
+		  <td colspan=4>Embedded Origin Location #1</td>
+		<tr align=center>
+		  <td colspan=4>.<br>.<br>.<br></td>
+		<tr align=center>
+		  <td colspan=4>Embedded Origin Location #n</td>
+	      </table>
+	    </center>
+
+	  <dt>Embedded Dimensionality: (unsigned 32-bit integer)
+	  <dd>This value is the number of dimensions of the space the
+	    dataset is located
+	    within.  i.e. a planar dataset located within a 3-D space,
+	    or a 3-D dataset
+	    which is a subset of another 3-D space, etc.
+	  <dt>Embedded Dimension Size: (unsigned 32-bit integer)
+	  <dd>These values are the sizes of the dimensions of the
+	    embedded dataspace
+	    that the dataset is located within.
+	  <dt>Embedded Origin Location: (unsigned 32-bit integer)
+	  <dd>These values comprise the location of the dataset's
+	    origin within the embedded dataspace.
+	</dl>
+    </dl>
+    [Comment: need some way to handle different orientations of the
+    dataset dataspace
+    within the embedded dataspace]<br>
+
+    <P>
+    <center>
+      <table border cellpadding=4 width="80%">
+	<caption align=bottom>
+	  <B>HDF5 Dataspace Structured/Regular Grid Information</B>
+	</caption>
+
+	<tr align=center>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+
+	<tr align=center>
+	  <td colspan=4>Logical Dimension Size #1</td>
+	<tr align=center>
+	  <td colspan=4>Logical Dimension Maximum #1</td>
+	<tr align=center>
+	  <td colspan=4>.<br>.<br>.<br></td>
+	<tr align=center>
+	  <td colspan=4>Logical Dimension Size #n</td>
+	<tr align=center>
+	  <td colspan=4>Logical Dimension Maximum #n</td>
+      </table>
+    </center>
+
+    <p>
+    <dl>
+      <dt>The elements of the dimensionality message are described below:
+      <dd>
+	<dl>
+	  <dt>Logical Dimension Size #n: (unsigned 32-bit integer)
+	  <dd>This value is the current size of the dimension of the
+	    data as stored in
+	    the file.  The first dimension stored in the list of
+	    dimensions is the slowest
+	    changing dimension and the last dimension stored is the
+	    fastest changing
+	    dimension.
+	  <dt>Logical Dimension Maximum #n: (unsigned 32-bit integer)
+	  <dd>This value is the maximum size of the dimension of the
+	    data as stored in
+	    the file.  This value may be the special value
+	    &lt;UNLIMITED&gt; which
+	    indicates that the data may expand along this dimension
+	    indefinitely.
+	</dl>
+    </dl>
+    <P>
+    <center>
+      <table border cellpadding=4 width="80%">
+	<caption align=bottom>
+	  <B>HDF5 Dataspace Structured/Irregular Grid Information</B>
+	</caption>
+
+	<tr align=center>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+
+	<tr align=center>
+	  <td colspan=4># of Grid Points in Dimension #1</td>
+	<tr align=center>
+	  <td colspan=4>.<br>.<br>.<br></td>
+	<tr align=center>
+	  <td colspan=4># of Grid Points in Dimension #n</td>
+	<tr align=center>
+	  <td colspan=4>Datatype of Grid Point Locations</td>
+	<tr align=center>
+	  <td colspan=4>Location of Grid Points in Dimension #1</td>
+	<tr align=center>
+	  <td colspan=4>.<br>.<br>.<br></td>
+	<tr align=center>
+	  <td colspan=4>Location of Grid Points in Dimension #n</td>
+      </table>
+    </center>
+
+    <P>
+    <center>
+      <table border cellpadding=4 width="80%">
+	<caption align=bottom>
+	  <B>HDF5 Dataspace Unstructured Grid Information</B>
+	</caption>
+
+	<tr align=center>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+
+	<tr align=center>
+	  <td colspan=4># of Grid Points</td>
+	<tr align=center>
+	  <td colspan=4>Datatype of Grid Point Locations</td>
+	<tr align=center>
+	  <td colspan=4>Grid Point Locations<br>.<br>.<br></td>
+      </table>
+    </center>
+
+    <h4><a name="DataSpaceExample">Examples:</a></h4>
+    Need some good examples, this is complex!
+-->
+
+
+    <hr>
+    <h4><a name="DataTypeMessage">Name: Datatype</a></h4>
+
+    <b>Type:</b> 0x0003<br>
+    <b>Length:</b> variable<br>
+    <b>Status:</b> One required per dataset or named datatype<br>
+
+    <p>The datatype message defines the datatype for each data point
+      of a dataset.  A datatype can describe an atomic type like a
+      fixed- or floating-point type or a compound type like a C
+      struct.  A datatype does not, however, describe how data points
+      are combined to produce a dataset. Datatypes are stored on disk
+      as a datatype message, which is a list of datatype classes and
+      their associated properties.
+
+    <p>
+    <center>
+      <table border cellpadding=4 width="80%">
+	<caption align=top>
+	  <b>Datatype Message</b>
+	</caption>
+
+	<tr align=center>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr align=center>
+	  <td>Type Class and Version</td>
+	  <td colspan=3>Class Bit Field</td>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4>Size in Bytes (4 bytes)</td>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4><br><br>Properties<br><br><br></td>
+	</tr>
+      </table>
+    </center>
+
+    <p>The Class Bit Field and Properties fields vary depending
+      on the Type Class, which is the low-order four bits of the Type
+      Class and Version field (the high-order four bits are the
+      version, which should be set to the value one).  The type class
+      is one of 0 (fixed-point number), 1 (floating-point number),
+      2 (date and time), 3 (text string), 4 (bit field), 5 (opaque),
+      6 (compound), 7 (reference), 8 (enumeration), or 9 (variable-length).
+      The Class Bit Field is zero and the size of the
+      Properties field is zero except for the cases noted here.
+
+    <p>
+    <center>
+      <table border cellpadding=4 width="80%">
+	<caption align=top>
+	  <b>Bit Field for Fixed-point Numbers (Class 0)</b>
+	</caption>
+
+	<tr align=center>
+	  <th width="10%">Bits</th>
+	  <th width="90%">Meaning</th>
+	</tr>
+
+	<tr valign=top>
+	  <td>0</td>
+	  <td><b>Byte Order.</b> If zero, byte order is little-endian;
+	    otherwise, byte order is big endian.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>1, 2</td>
+	  <td><b>Padding type.</b>  Bit 1 is the lo_pad type and bit 2
+	    is the hi_pad type.  If a datum has unused bits at either
+	    end, then the lo_pad or hi_pad bit is copied to those
+	    locations.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>3</td>
+	  <td><b>Signed.</b> If this bit is set then the fixed-point
+	    number is in 2's complement form.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>4-23</td>
+	  <td>Reserved (zero).</td>
+	</tr>
+      </table>
+    </center>
+
+    <p>
+    <center>
+      <table border cellpadding=4 width="80%">
+	<caption align=top>
+	  <b>Properties for Fixed-point Numbers (Class 0)</b>
+	</caption>
+
+	<tr align=center>
+	  <th width="25%">Byte</th>
+	  <th width="25%">Byte</th>
+	  <th width="25%">Byte</th>
+	  <th width="25%">Byte</th>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=2>Bit Offset</td>
+	  <td colspan=2>Bit Precision</td>
+	</tr>
+      </table>
+    </center>
+
+    <p>
+    <center>
+      <table border cellpadding=4 width="80%">
+	<caption align=top>
+	  <b>Bit Field for Floating-point Numbers (Class 1)</b>
+	</caption>
+
+	<tr align=center>
+	  <th width="10%">Bits</th>
+	  <th width="90%">Meaning</th>
+	</tr>
+
+	<tr valign=top>
+	  <td>0</td>
+	  <td><b>Byte Order.</b> If zero, byte order is little-endian;
+	    otherwise, byte order is big endian.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>1, 2, 3</td>
+	  <td><b>Padding type.</b>  Bit 1 is the low bits pad type, bit 2
+	    is the high bits pad type, and bit 3 is the internal bits
+	    pad type.  If a datum has unused bits at either or between
+	    the sign bit, exponent, or mantissa, then the value of bit
+	    1, 2, or 3 is copied to those locations.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>4-5</td>
+	  <td><b>Normalization.</b> The value can be 0 if there is no
+	    normalization, 1 if the most significant bit of the
+	    mantissa is always set (except for 0.0), and 2 if the most
+	    significant bit of the mantissa is not stored but is
+	    implied to be set. The value 3 is reserved and will not
+	    appear in this field.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>6-7</td>
+	  <td>Reserved (zero).</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>8-15</td>
+	  <td><b>Sign.</b> This is the bit position of the sign
+	    bit.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>16-23</td>
+	  <td>Reserved (zero).</td>
+	</tr>
+
+      </table>
+    </center>
+
+    <p>
+    <center>
+      <table border cellpadding=4 width="80%">
+	<caption align=top>
+	  <b>Properties for Floating-point Numbers (Class 1)</b>
+	</caption>
+
+	<tr align=center>
+	  <th width="25%">Byte</th>
+	  <th width="25%">Byte</th>
+	  <th width="25%">Byte</th>
+	  <th width="25%">Byte</th>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=2>Bit Offset</td>
+	  <td colspan=2>Bit Precision</td>
+	</tr>
+
+	<tr align=center>
+	  <td>Exponent Location</td>
+	  <td>Exponent Size in Bits</td>
+	  <td>Mantissa Location</td>
+	  <td>Mantissa Size in Bits</td>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4>Exponent Bias</td>
+	</tr>
+      </table>
+    </center>
+
+   <p>
+    <center>
+      <table border cellpadding=4 width="80%">
+	<caption align=top>
+	  <b>Bit Field for Strings (Class 3)</b>
+	</caption>
+
+	<tr align=center>
+	  <th width="10%">Bits</th>
+	  <th width="90%">Meaning</th>
+	</tr>
+
+	<tr valign=top>
+	  <td>0-3</td>
+	  <td><b>Padding type.</b>  This four-bit value determines the
+	    type of padding to use for the string.  The values are:
+
+	    <dl>
+	      <dt><code>0</code> Null terminate.
+	      <dd>A zero byte marks the end of the string and is
+		guaranteed to be present after converting a long
+		string to a short string.  When converting a short
+		string to a long string the value is padded with
+		additional null characters as necessary.
+
+		<br><br>
+	      <dt><code>1</code> Null pad.
+	      <dd>Null characters are added to the end of the value
+		during conversions from short values to long values
+		but conversion in the opposite direction simply
+		truncates the value.
+
+		<br><br>
+	      <dt><code>2</code> Space pad.
+	      <dd>Space characters are added to the end of the value
+		during conversions from short values to long values
+		but conversion in the opposite direction simply
+		truncates the value.  This is the Fortran
+		representation of the string.
+
+		<br><br>
+	      <dt><code>3-15</code> Reserved.
+	      <dd>These values are reserved for future use.
+	    </dl>
+	</tr>
+
+	<tr valign=top>
+	  <td>4-7</td>
+	  <td><b>Character Set.</b>  The character set to use for
+	    encoding the string.  The only character set supported is
+	    the 8-bit ASCII (zero) so no translations have been defined
+	    yet.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>8-23</td>
+	  <td>Reserved (zero).</td>
+	</tr>
+      </table>
+    </center>
+
+    <p>
+    <center>
+      <table border cellpadding=4 width="80%">
+	<caption align=top>
+	  <b>Bit Field for Bitfield Types (Class 4)</b>
+	</caption>
+
+	<tr align=center>
+	  <th width="10%">Bits</th>
+	  <th width="90%">Meaning</th>
+	</tr>
+
+	<tr valign=top>
+	  <td>0</td>
+	  <td><b>Byte Order.</b> If zero, byte order is little-endian;
+	    otherwise, byte order is big endian.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>1, 2</td>
+	  <td><b>Padding type.</b>  Bit 1 is the lo_pad type and bit 2
+	    is the hi_pad type.  If a datum has unused bits at either
+	    end, then the lo_pad or hi_pad bit is copied to those
+	    locations.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>3-23</td>
+	  <td>Reserved (zero).</td>
+	</tr>
+      </table>
+    </center>
+
+    <p>
+    <center>
+      <table border cellpadding=4 width="80%">
+	<caption align=top>
+	  <b>Properties for Bitfield Types (Class 4)</b>
+	</caption>
+
+	<tr align=center>
+	  <th width="25%">Byte</th>
+	  <th width="25%">Byte</th>
+	  <th width="25%">Byte</th>
+	  <th width="25%">Byte</th>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=2>Bit Offset</td>
+	  <td colspan=2>Bit Precision</td>
+	</tr>
+      </table>
+    </center>
+
+    <p>
+    <center>
+      <table border cellpadding=4 width="80%">
+	<caption align=top>
+	  <b>Bit Field for Opaque Types (Class 5)</b>
+	</caption>
+
+	<tr align=center>
+	  <th width="10%">Bits</th>
+	  <th width="90%">Meaning</th>
+	</tr>
+
+	<tr valign=top>
+	  <td>0-23</td>
+	  <td>Reserved (zero).</td>
+	</tr>
+      </table>
+    </center>
+
+    <p>
+    <center>
+      <table border cellpadding=4 width="80%">
+	<caption align=top>
+	  <b>Properties for Opaque Types (Class 5)</b>
+	</caption>
+
+	<tr align=center>
+	  <th width="25%">Byte</th>
+	  <th width="25%">Byte</th>
+	  <th width="25%">Byte</th>
+	  <th width="25%">Byte</th>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4><br>Null-terminated ASCII Tag<br>
+	    (multiple of 8 bytes)<br><br></td>
+	</tr>
+      </table>
+    </center>
+
+    <p>
+    <center>
+      <table border cellpadding=4 width="80%">
+	<caption align=top>
+	  <b>Bit Field for Compound Types (Class 6)</b>
+	</caption>
+
+	<tr align=center>
+	  <th width="10%">Bits</th>
+	  <th width="90%">Meaning</th>
+	</tr>
+
+	<tr valign=top>
+	  <td>0-15</td>
+	  <td><b>Number of Members.</b> This field contains the number
+	    of members defined for the compound datatype.  The member
+	    definitions are listed in the Properties field of the data
+	    type message.
+	</tr>
+
+	<tr valign=top>
+	  <td>15-23</td>
+	  <td>Reserved (zero).</td>
+	</tr>
+      </table>
+    </center>
+
+    <p>The Properties field of a compound datatype is a list of the
+      member definitions of the compound datatype.  The member
+      definitions appear one after another with no intervening bytes.
+      The member types are described with a recursive datatype
+      message.
+
+    <p>
+    <center>
+      <table border cellpadding=4 width="80%">
+	<caption align=top>
+	  <b>Properties for Compound Types (Class 6)</b>
+	</caption>
+
+	<tr align=center>
+	  <th width="25%">Byte</th>
+	  <th width="25%">Byte</th>
+	  <th width="25%">Byte</th>
+	  <th width="25%">Byte</th>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4><br><br>Name (null terminated, multiple of
+	    eight bytes)<br><br><br></td>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4>Byte Offset of Member in Compound Instance</td>
+	</tr>
+
+	<tr align=center>
+	  <td>Dimensionality</td>
+	  <td colspan=3>reserved</td>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4>Dimension Permutation</td>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4>Reserved</td>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4>Size of Dimension 0 (required)</td>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4>Size of Dimension 1 (required)</td>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4>Size of Dimension 2 (required)</td>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4>Size of Dimension 3 (required)</td>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4><br><br>Member Type Message<br><br><br></td>
+	</tr>
+
+      </table>
+    </center>
+
+   <p>
+    <center>
+      <table border cellpadding=4 width="80%">
+	<caption align=top>
+	  <b>Bit Field for Enumeration Types (Class 8)</b>
+	</caption>
+
+	<tr align=center>
+	  <th width="10%">Bits</th>
+	  <th width="90%">Meaning</th>
+	</tr>
+
+	<tr valign=top>
+	  <td>0-15</td>
+	  <td><b>Number of Members.</b> The number of name/value
+	    pairs defined for the enumeration type.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>16-23</td>
+	  <td>Reserved (zero).</td>
+	</tr>
+      </table>
+    </center>
+
+    <p>
+    <center>
+      <table border cellpadding=4 width="80%">
+	<caption align=top>
+	  <b>Properties for Enumeration Types (Class 8)</b>
+	</caption>
+
+	<tr align=center>
+	  <th width="25%">Byte</th>
+	  <th width="25%">Byte</th>
+	  <th width="25%">Byte</th>
+	  <th width="25%">Byte</th>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4><br>Parent Type<br><br></td>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4><br>Names<br><br></td>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4><br>Values<br><br></td>
+        </tr>
+
+      </table>
+    </center>
+
+    <center>
+      <table border=0 cellpadding=4 width="80%">
+	<tr align=left valign=top>
+          <td valign=top width=20%>Parent Type:</td>
+	  <td valign=top>Each enumeration type is based on some parent type,
+	    usually an integer. The information for that parent type is
+	    described recursively by this field.</td>
+	</tr><tr align=left valign=top>
+          <td valign=top>Names:</td>
+	  <td valign=top>The name for each name/value pair. Each name is
+	    stored as a null terminated ASCII string in a multiple of
+	    eight bytes. The names are in no particular order.</td>
+	</tr><tr align=left valign=top>
+          <td valign=top>Values:</td>
+	  <td valign=top>The list of values in the same order as the names.
+	    The values are packed (no inter-value padding) and the
+	    size of each value is determined by the parent type.</td>
+        </tr>
+      </table>
+    </center>
+
+
+   <p>
+    <center>
+      <table border cellpadding=4 width="80%">
+	<caption align=top>
+	  <b>Bit Field for Variable-length Types (Class 9)</b>
+	</caption>
+
+	<tr align=center>
+	  <th width="10%">Bits</th>
+	  <th width="90%">Meaning</th>
+	</tr>
+
+	<tr valign=top>
+	  <td>0-3</td>
+	  <td><dl><dt><b>Type</b></dt>
+	    <dt>0 Variable-length sequence</dt>
+              <dd>This variable-length datatype can be of any sequence
+              of data.  Variable-length sequences do not have padding
+              or character set information.</dd>
+            <dt>1 Variable-length string</dt>
+              <dd>This variable-length datatype is composed of a series of
+              characters.  Variable-length strings have padding and
+              character set information.</dd></dl>
+          </td>
+	</tr>
+
+	<tr valign=top>
+	  <td>4-7</td>
+	  <td><dl><dt><b>Padding type</b> (variable-length string only)</dt>
+              <dd>This four-bit value determines the type of padding
+              used for variable-length strings.  The values are the same
+              as for the string padding type, as follows:</dd>
+	    <dt>0 Null terminate</dt>
+              <dd>A zero byte marks the end of a string and is guaranteed
+              to be present after converting a long string to a short
+              string.  When converting a short string to a long string,
+              the value is padded with additional null characters
+              as necessary.
+            <dt>1 Null pad</dt>
+              <dd>Null characters are added to the end of the value
+              during conversion from a short string to a longer string.
+              Conversion from a long string to a shorter string
+              simply truncates the value.</dd>
+            <dt>2 Space pad</dt>
+              <dd>Space characters are added to the end of the value
+              during conversion from a short string to a longer string.
+              Conversion from a long string to a shorter string simply
+              truncates the value.
+              This is the Fortran representation of the string.
+              </dd>
+            <dt>3-15 Reserved</dt>
+              <dd>These values are reserved for future use.</dd></dl>
+          </td>
+	</tr>
+
+	<tr valign=top>
+	  <td>8-11</td>
+	  <td><dl><dt><b>Character set</b> (variable-length string only)</dt>
+              <dd>This four-bit value specifies the character set
+              to be used for encoding the string.</dd>
+	    <dt>0 8-bit ASCII</dt>
+              <dd>As of this writing (July 2002, Release 1.4.4),
+              8-bit ASCII is the only character set supported.
+              Therefore, no translations have been defined.</dd></dl>
+          </td>
+	</tr>
+
+	<tr valign=top>
+	  <td>12-23</td>
+	  <td>Reserved (zero).</td>
+	</tr>
+      </table>
+    </center>
+
+    <p>
+    <center>
+      <table border cellpadding=4 width="80%">
+        <caption align=top>
+          <b>Properties for Variable-length Types (Class 9)</b>
+        </caption>
+
+        <tr align=center>
+          <th width="25%">Byte</th>
+          <th width="25%">Byte</th>
+          <th width="25%">Byte</th>
+          <th width="25%">Byte</th>
+        </tr>
+
+        <tr align=center>
+          <td colspan=4><br>Parent Type<br><br></td>
+        </tr>
+
+      </table>
+    </center>
+
+    <center>
+      <table border=0 cellpadding=4 width="80%">
+        <tr align=left valign=top>
+          <td valign=top width=20%>Parent Type:</td>
+          <td valign=top>Each variable-length type is based on
+            some parent type.  The information for that parent type is
+            described recursively by this field.</td>
+        </tr>
+      </table>
+    </center>
+
+
+
+   <p>
+
+<!--
+    <p>Datatype examples are <a href="Datatypes.html">here</a>.
+-->
+
+
+    <hr>
+    <h4><a name="FillValueMessage">Name: Data Storage - Fill Value</a></h4>
+    <b>Type:</b> 0x0004<br>
+    <b>Length:</b> varies<br>
+    <b>Status:</b> Optional, may not be repeated.<br>
+
+    <p>The fill value message stores a single data point value which
+      is returned to the application when an uninitialized data point
+      is read from the dataset.  The fill value is interpreted with
+      the same datatype as the dataset.  If no fill value message is
+      present then a fill value of all zero is assumed.
+
+    <p>
+    <center>
+      <table border cellpadding=4 width="80%">
+	<caption align=top>
+	  <b>Fill Value Message</b>
+	</caption>
+
+	<tr align=center>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4>Size (4 bytes)</td>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4><br>Fill Value<br><br></td>
+	</tr>
+      </table>
+    </center>
+
+    <p>
+    <center>
+      <table align=center width="80%">
+	<tr>
+	  <th width="30%">Field Name</th>
+	  <th width="70%">Description</th>
+	</tr>
+
+	<tr valign=top>
+	  <td>Size (4 bytes)</td>
+	  <td>This is the size of the Fill Value field in bytes.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Fill Value</td>
+	  <td>The fill value.  The bytes of the fill value are
+	    interpreted using the same datatype as for the dataset.</td>
+	</tr>
+      </table>
+    </center>
+
+    <hr>
+    <h4><a name="ReservedMessage_0005">Name: Reserved - Not Assigned Yet</a></h4>
+    <b>Type:</b> 0x0005<br>
+    <b>Length:</b> N/A<br>
+    <b>Status:</b> N/A<br>
+
+
+
+    <hr>
+    <h4><a name="CompactDataStorageMessage">Name: Data Storage - Compact</a></h4>
+
+    <b>Type:</b> 0x0006<br>
+    <b>Length:</b> varies<br>
+    <b>Status:</b> Optional, may not be repeated.<br>
+
+    <p>This message indicates that the data for the data object is
+      stored within the current HDF file by including the actual
+      data as the header data for this message.  The data is
+      stored internally in
+      the <em>normal format</em>, i.e. in one chunk, uncompressed, etc.
+
+    <P>Note that one and only one of the <em>Data Storage</em> headers can be
+      stored for each data object.
+
+    <P><b>Format of Data:</b>  The message data is actually composed
+      of dataset data, so the format will be determined by the dataset
+      format.
+
+<!-- Delete examples throughout doc
+    <h4><a name="CompactDataStorageExample">Examples:</a></h4>
+    [very straightforward]
+-->
+
+    <hr>
+    <h4><a name="ExternalFileListMessage">Name: Data Storage -
+	External Data Files</a></h4>
+    <b>Type:</b> 0x0007<BR>
+    <b>Length:</b> varies<BR>
+    <b>Status:</b> Optional, may not be repeated.<BR>
+
+    <p><b>Purpose and Description:</b> The external object message
+      indicates that the data for an object is stored outside the HDF5
+      file.  The filename of the object is stored as a Universal
+      Resource Location (URL) of the actual filename containing the
+      data. An external file list record also contains the byte offset
+      of the start of the data within the file and the amount of space
+      reserved in the file for that data.
+
+    <p>
+    <center>
+      <table border cellpadding=4 width="80%">
+	<caption align=top>
+	  <b>External File List Message</b>
+	</caption>
+
+	<tr align=center>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr align=center>
+	  <td>Version</td>
+	  <td colspan=3>Reserved</td>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=2>Allocated Slots</td>
+	  <td colspan=2>Used Slots</td>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4><br>Heap Address<br><br></td>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4><br>Slot Definitions...<br><br></td>
+	</tr>
+      </table>
+    </center>
+
+    <p>
+    <center>
+      <table align=center width="80%">
+	<tr>
+	  <th width="30%">Field Name</th>
+	  <th width="70%">Description</th>
+	</tr>
+
+	<tr valign=top>
+	  <td>Version </td>
+	  <td>This value is used to determine the format of the
+	    External File List Message.  When the format of the
+	    information in the message is changed, the version number
+	    is incremented and can be used to determine how the
+	    information in the object header is formatted.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Reserved</td>
+	  <td>This field is reserved for future use.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Allocated Slots</td>
+	  <td>The total number of slots allocated in the message.  Its
+	    value must be at least as large as the value contained in
+	    the Used Slots field.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Used Slots</td>
+	  <td>The number of initial slots which contain valid
+	    information.  The remaining slots are zero filled.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Heap Address</td>
+	  <td>This is the address of a local name heap which contains
+	    the names for the external files. The name at offset zero
+	    in the heap is always the empty string.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Slot Definitions</td>
+	  <td>The slot definitions are stored in order according to
+	    the array addresses they represent. If more slots have
+	    been allocated than what has been used then the defined
+	    slots are all at the beginning of the list.</td>
+	</tr>
+      </table>
+    </center>
+
+    <p>
+    <center>
+      <table border cellpadding=4 width="80%">
+	<caption align=top>
+	  <b>External File List Slot</b>
+	</caption>
+
+	<tr align=center>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4><br>Name Offset (&lt;size&gt; bytes)<br><br></td>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4><br>File Offset (&lt;size&gt; bytes)<br><br></td>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4><br>Size<br><br></td>
+	</tr>
+      </table>
+    </center>
+
+    <p>
+    <center>
+      <table align=center width="80%">
+	<tr>
+	  <th width="30%">Field Name</th>
+	  <th width="70%">Description</th>
+	</tr>
+
+	<tr valign=top>
+	  <td>Name Offset (&lt;size&gt; bytes)</td>
+	  <td>The byte offset within the local name heap for the name
+	    of the file.  File names are stored as a URL which has a
+	    protocol name, a host name, a port number, and a file
+	    name:
+	    <code><em>protocol</em>:<em>port</em>//<em>host</em>/<em>file</em></code>.
+	    If the protocol is omitted then "file:" is assumed.  If
+	    the port number is omitted then a default port for that
+	    protocol is used.  If both the protocol and the port
+	    number are omitted then the colon can also be omitted. If
+	    the double slash and host name are omitted then
+	    "localhost" is assumed.  The file name is the only
+	    mandatory part, and if the leading slash is missing then
+	    it is relative to the application's current working
+	    directory (the use of relative names is not
+	    recommended).</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>File Offset (&lt;size&gt; bytes)</td>
+	  <td>This is the byte offset to the start of the data in the
+	    specified file. For files that contain data for a single
+	    dataset this will usually be zero.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Size</td>
+	  <td>This is the total number of bytes reserved in the
+	    specified file for raw data storage.  For a file that
+	    contains exactly one complete dataset which is not
+	    extendable, the size will usually be the exact size of the
+	    dataset.  However, by making the size larger one allows
+	    HDF5 to extend the dataset. The size can be set to a value
+	    larger than the entire file since HDF5 will read zeros
+	    past the end of the file without failing.</td>
+	</tr>
+      </table>
+    </center>
+
+
+    <hr>
+    <h4><a name="LayoutMessage">Name: Data Storage - Layout</a></h4>
+
+    <b>Type:</b> 0x0008<BR>
+    <b>Length:</b> varies<BR>
+    <b>Status:</b> Required for datasets, may not be repeated.
+
+    <p><b>Purpose and Description:</b> Data layout describes how the
+      elements of a multi-dimensional array are arranged in the linear
+      address space of the file. Two types of data layout are
+      supported:
+
+    <ol>
+      <li>The array can be stored in one contiguous area of the file.
+	The layout requires that the size of the array be constant and
+	does not permit chunking, compression, checksums, encryption,
+	etc.  The message stores the total size of the array and the
+	offset of an element from the beginning of the storage area is
+	computed as in C.
+
+      <li>The array domain can be regularly decomposed into chunks and
+	each chunk is allocated separately.  This layout supports
+	arbitrary element traversals, compression, encryption, and
+	checksums, and the chunks can be distributed across external
+	raw data files (these features are described in other
+	messages).  The message stores the size of a chunk instead of
+	the size of the entire array; the size of the entire array can
+	be calculated by traversing the B-tree that stores the chunk
+	addresses.
+    </ol>
+
+    <p>
+    <center>
+      <table border cellpadding=4 width="80%">
+	<caption align=top>
+	  <B>Data Layout Message</B>
+	</caption>
+
+	<tr align=center>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr align=center>
+	  <td>Version</td>
+	  <td>Dimensionality</td>
+	  <td>Layout Class</td>
+	  <td>Reserved</td>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4>Reserved</td>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4><br>Address<br><br></td>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4>Dimension 0 (4-bytes)</td>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4>Dimension 1 (4-bytes)</td>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4>...</td>
+	</tr>
+      </table>
+    </center>
+
+    <p>
+    <center>
+      <table align=center width="80%">
+	<tr>
+	  <th width="30%">Field Name</th>
+	  <th width="70%">Description</th>
+	</tr>
+
+	<tr valign=top>
+	  <td>Version</td>
+	  <td>A version number for the layout message. This
+	    documentation describes version one.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Dimensionality</td>
+	  <td>An array has a fixed dimensionality.  This field
+	    specifies the number of dimension size fields later in the
+	    message.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Layout Class</td>
+	  <td>The layout class specifies how the other fields of the
+	    layout message are to be interpreted.  A value of one
+	    indicates contiguous storage while a value of two
+	    indicates chunked storage.  Other values will be defined
+	    in the future.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Address</td>
+	  <td>For contiguous storage, this is the address of the first
+	    byte of storage.  For chunked storage this is the address
+	    of the B-tree that is used to look up the addresses of the
+	    chunks.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Dimensions</td>
+	  <td>For contiguous storage the dimensions define the entire
+	    size of the array while for chunked storage they define
+	    the size of a single chunk.</td>
+	</tr>
+      </table>
+    </center>
+
+
+    <hr>
+    <h4><a name="ReservedMessage_0009">Name: Reserved - Not Assigned Yet</a></h4>
+    <b>Type:</b> 0x0009<BR>
+    <b>Length:</b> N/A<BR>
+    <b>Status:</b> N/A<BR>
+    <b>Purpose and Description:</b> N/A<BR>
+    <b>Format of Data:</b> N/A
+
+    <hr>
+    <h4><a name="ReservedMessage_000A">Name: Reserved - Not Assigned Yet</a></h4>
+    <b>Type:</b> 0x000A<BR>
+    <b>Length:</b> N/A<BR>
+    <b>Status:</b> N/A<BR>
+    <b>Purpose and Description:</b> N/A<BR>
+    <b>Format of Data:</b> N/A
+
+    <hr>
+    <h4><a name="FilterMessage">Name: Data Storage - Filter Pipeline</a></h4>
+    <b>Type:</b> 0x000B<BR>
+    <b>Length:</b> varies<BR>
+    <b>Status:</b> Optional, may not be repeated.
+
+    <p><b>Purpose and Description:</b> This message describes the
+      filter pipeline which should be applied to the data stream by
+      providing filter identification numbers, flags, a name, an
+      client data.
+
+    <p>
+    <center>
+      <table border align=center cellpadding=4 width="80%">
+	<caption align=top>
+	  <b>Filter Pipeline Message</b>
+	</caption>
+
+	<tr align=center>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr align=center>
+	  <td>Version</td>
+	  <td>Number of Filters</td>
+	  <td colspan=2>Reserved</td>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4>Reserved</td>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4><br>Filter List<br><br></td>
+	</tr>
+      </table>
+    </center>
+
+    <p>
+    <center>
+      <table align=center width="80%">
+	<tr>
+	  <th width="30%">Field Name</th>
+	  <th width="70%">Description</th>
+	</tr>
+
+	<tr valign=top>
+	  <td>Version</td>
+	  <td>The version number for this message.  This document
+	    describes version one.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Number of Filters</td>
+	  <td>The total number of filters described by this
+	    message. The maximum possible number of filters in a
+	    message is 32.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Filter List</td>
+	  <td>A description of each filter.  A filter description
+	    appears in the next table.</td>
+	</tr>
+      </table>
+    </center>
+
+    <p>
+    <center>
+      <table border align=center cellpadding=4 width="80%">
+	<caption align=top>
+	  <b>Filter Pipeline Message</b>
+	</caption>
+
+	<tr align=center>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=2>Filter Identification</td>
+	  <td colspan=2>Name Length</td>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=2>Flags</td>
+	  <td colspan=2>Client Data Number of Values</td>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4><br>Name<br><br></td>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4><br>Client Data<br><br></td>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4>Padding</td>
+	</tr>
+      </table>
+    </center>
+
+    <p>
+    <center>
+      <table align=center width="80%">
+	<tr>
+	  <th width="30%">Field Name</th>
+	  <th width="70%">Description</th>
+	</tr>
+
+	<tr valign=top>
+	  <td>Filter Identification</td>
+	  <td>This is a unique (except in the case of testing)
+	    identifier for the filter.  Values from zero through 255
+	    are reserved for filters defined by the NCSA HDF5
+	    library. Values 256 through 511 have been set aside for
+	    use when developing/testing new filters.  The remaining
+	    values are allocated to specific filters by contacting the
+	    <a href="mailto:hdf5dev@ncsa.uiuc.edu">HDF5 Development
+	    Team</a>.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Name Length</td>
+	  <td>Each filter has an optional null-terminated ASCII name
+	    and this field holds the length of the name including the
+	    null termination padded with nulls to be a multiple of
+	    eight. If the filter has no name then a value of zero is
+	    stored in this field.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Flags</td>
+	  <td>The flags indicate certain properties for a filter.  The
+	    bit values defined so far are:
+
+	    <dl>
+	      <dt><code>bit 1</code>
+	      <dd>If set then the filter is an optional filter.
+		During output, if an optional filter fails it will be
+		silently removed from the pipeline.
+	    </dl>
+	</tr>
+
+	<tr valign=top>
+	  <td>Client Data Number of Values</td>
+	  <td>Each filter can store a few integer values to control
+	    how the filter operates.  The number of entries in the
+	    Client Data array is stored in this field.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Name</td>
+	  <td>If the Name Length field is non-zero then it will
+	    contain the size of this field, a multiple of eight.  This
+	    field contains a null-terminated, ASCII character
+	    string to serve as a comment/name for the filter.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Client Data</td>
+	  <td>This is an array of four-byte integers which will be
+	    passed to the filter function.  The Client Data Number of
+	    Values determines the number of elements in the
+	    array.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Padding</td>
+	  <td>Four bytes of zeros are added to the message at this
+	    point if the Client Data Number of Values field contains
+	    an odd number.</td>
+	</tr>
+      </table>
+    </center>
+
+    <hr>
+    <h4><a name="AttributeMessage">Name: Attribute</a></h4>
+    <b>Type:</b> 0x000C<BR>
+    <b>Length:</b> varies<BR>
+    <b>Status:</b> Optional, may be repeated.<BR>
+
+    <p><b>Purpose and Description:</b>  The <em>Attribute</em>
+      message is used to list objects in the HDF file which are used
+      as attributes, or "meta-data" about the current object.  An
+      attribute is a small dataset; it has a name, a datatype, a data
+      space, and raw data.  Since attributes are stored in the object
+      header they must be relatively small (<64kb) and can be
+      associated with any type of object which has an object header
+      (groups, datasets, named types and spaces, etc.).
+
+    <p>
+    <center>
+      <table border align=center cellpadding=4 width="80%">
+	<caption align=top>
+	  <b>Attribute Message</b>
+	</caption>
+
+	<tr align=center>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr align=center>
+	  <td>Version</td>
+	  <td>Reserved</td>
+	  <td colspan=2>Name Size</td>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=2>Type Size</td>
+	  <td colspan=2>Space Size</td>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4><br>Name<br><br></td>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4><br>Type<br><br></td>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4><br>Space<br><br></td>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4><br>Data<br><br></td>
+	</tr>
+      </table>
+    </center>
+
+    <p>
+    <center>
+      <table align=center width="80%">
+	<tr>
+	  <th width="30%">Field Name</th>
+	  <th width="70%">Description</th>
+	</tr>
+
+	<tr valign=top>
+	  <td>Version</td>
+	  <td>Version number for the message.  This document describes
+	    version 1 of attribute messages.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Reserved</td>
+	  <td>This field is reserved for later use and is set to
+	    zero.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Name Size</td>
+	  <td>The length of the attribute name in bytes including the
+	    null terminator.  Note that the Name field below may
+	    contain additional padding not represented by this
+	    field.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Type Size</td>
+	  <td>The length of the datatype description in the Type
+	    field below.  Note that the Type field may contain
+	    additional padding not represented by this field.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Space Size</td>
+	  <td>The length of the dataspace description in the Space
+	    field below.  Note that the Space field may contain
+	    additional padding not represented by this field.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Name</td>
+	  <td>The null-terminated attribute name.  This field is
+	    padded with additional null characters to make it a
+	    multiple of eight bytes.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Type</td>
+	  <td>The datatype description follows the same format as
+	    described for the datatype object header message.  This
+	    field is padded with additional zero bytes to make it a
+	    multiple of eight bytes.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Space</td>
+	  <td>The dataspace description follows the same format as
+	    described for the dataspace object header message.  This
+	    field is padded with additional zero bytes to make it a
+	    multiple of eight bytes.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Data</td>
+	  <td>The raw data for the attribute.  The size is determined
+	    from the datatype and dataspace descriptions.  This
+	    field is <em>not</em> padded with additional zero
+	    bytes.</td>
+	</tr>
+      </table>
+    </center>
+
+    <hr>
+    <h4><a name="NameMessage">Name: Object Name</a></h4>
+
+    <p><b>Type:</b> 0x000D<br>
+      <b>Length:</b> varies<br>
+      <b>Status:</b> Optional, may not be repeated.
+
+    <p><b>Purpose and Description:</b> The object name or comment is
+      designed to be a short description of an object.  An object name
+      is a sequence of non-zero (<code>\0</code>) ASCII characters with no other
+      formatting included by the library.
+
+    <p>
+    <center>
+      <table border align=center cellpadding=4 width="80%">
+	<caption align=top>
+	  <b>Name Message</b>
+	</caption>
+
+	<tr align=center>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4><br>Name<br><br></td>
+	</tr>
+      </table>
+    </center>
+
+    <p>
+    <center>
+      <table align=center width="80%">
+	<tr>
+	  <th width="30%">Field Name</th>
+	  <th width="70%">Description</th>
+	</tr>
+
+	<tr valign=top>
+	  <td>Name</td>
+	  <td>A null terminated ASCII character string.</td>
+	</tr>
+      </table>
+    </center>
+
+    <hr>
+    <h4><a name="ModifiedMessage">Name: Object Modification Date &amp; Time</a></h4>
+
+    <p><b>Type:</b> 0x000E<br>
+      <b>Length:</b> fixed<br>
+      <b>Status:</b> Optional, may not be repeated.
+
+    <p><b>Purpose and Description:</b>  The object modification date
+      and time is a timestamp which indicates (using ISO-8601 date and
+      time format) the last modification of an object.  The time is
+      updated when any object header message changes according to the
+      system clock where the change was posted.
+
+    <p>
+    <center>
+      <table border align=center cellpadding=4 width="80%">
+	<caption align=top>
+	  <b>Modification Time Message</b>
+	</caption>
+
+	<tr align=center>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4>Year</td>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=2>Month</td>
+	  <td colspan=2>Day of Month</td>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=2>Hour</td>
+	  <td colspan=2>Minute</td>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=2>Second</td>
+	  <td colspan=2>Reserved</td>
+	</tr>
+      </table>
+    </center>
+
+    <p>
+    <center>
+      <table align=center width="80%">
+	<tr>
+	  <th width="30%">Field Name</th>
+	  <th width="70%">Description</th>
+	</tr>
+
+	<tr valign=top>
+	  <td>Year</td>
+	  <td>The four-digit year as an ASCII string. For example,
+	    <code>1998</code>.  All fields of this message should be interpreted
+	    as coordinated universal time (UTC)</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Month</td>
+	  <td>The month number as a two digit ASCII string where
+	    January is <code>01</code> and December is <code>12</code>.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Day of Month</td>
+	  <td>The day number within the month as a two digit ASCII
+	    string. The first day of the month is <code>01</code>.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Hour</td>
+	  <td>The hour of the day as a two digit ASCII string where
+	    midnight is <code>00</code> and 11:00pm is <code>23</code>.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Minute</td>
+	  <td>The minute of the hour as a two digit ASCII string where
+	    the first minute of the hour is <code>00</code> and
+	    the last is <code>59</code>.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Second</td>
+	  <td>The second of the minute as a two digit ASCII string
+	    where the first second of the minute is <code>00</code>
+	    and the last is <code>59</code>.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Reserved</td>
+	  <td>This field is reserved and should always be zero.</td>
+	</tr>
+      </table>
+    </center>
+
+    <hr>
+    <h4><a name="SharedMessage">Name: Shared Object Message</a></h4>
+    <b>Type:</b> 0x000F<br>
+    <b>Length:</b> 4 Bytes<br>
+    <b>Status:</b> Optional, may be repeated.
+
+    <p>A constant message can be shared among several object headers
+      by writing that message in the global heap and having the object
+      headers all point to it.  The pointing is accomplished with a
+      Shared Object message which is understood directly by the object
+      header layer of the library. It is also possible to have a
+      message of one object header point to a message in some other
+      object header, but care must be exercised to prevent cycles.
+
+    <p>If a message is shared, then the message appears in the global
+      heap and its message ID appears in the Header Message Type
+      field of the object header.  Also, the Flags field in the object
+      header for that message will have bit two set (the
+      <code>H5O_FLAG_SHARED</code> bit).  The message body in the
+      object header will be that of a Shared Object message defined
+      here and not that of the pointed-to message.
+
+    <p>
+    <center>
+      <table border cellpadding=4 width="80%">
+	<caption align=top>
+	  <b>Shared Message Message</b>
+	</caption>
+
+	<tr align=center>
+	  <th width="25%">byte</td>
+	  <th width="25%">byte</td>
+	  <th width="25%">byte</td>
+	  <th width="25%">byte</td>
+	</tr>
+
+	<tr align=center>
+	  <td>Version</td>
+	  <td>Flags</td>
+	  <td colspan=2>Reserved</td>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4>Reserved</td>
+	</tr>
+
+	<tr align=center>
+	  <td colspan=4><br>Pointer<br><br></td>
+	</tr>
+      </table>
+    </center>
+
+    <p>
+    <center>
+      <table align=center width="80%">
+	<tr>
+	  <th width="30%">Field Name</th>
+	  <th width="70%">Description</th>
+	</tr>
+
+	<tr valign=top>
+	  <td>Version</td>
+	  <td>The version number for the message.  This document
+	    describes version one of shared messages.</td>
+	</tr>
+
+	<tr valign=top>
+	  <td>Flags</td>
+	  <td>The Shared Message message points to a message which is
+	    shared among multiple object headers.  The Flags field
+	    describes the type of sharing:
+
+	    <dl>
+	      <dt><code>Bit 0</code>
+	      <dd>If this bit is clear then the actual message is the
+		first message in some other object header; otherwise
+		the actual message is stored in the global heap.
+
+	      <dt><code>Bits 2-7</code>
+	      <dd>Reserved (always zero)
+	    </dl>
+	</tr>
+
+	<tr valign=top>
+	  <td>Pointer</td>
+	  <td>This field points to the actual message.  The format of
+	    the pointer depends on the value of the Flags field.  If
+	    the actual message is in the global heap then the pointer
+	    is the file address of the global heap collection that
+	    holds the message, and a four-byte index into that
+	    collection.  Otherwise the pointer is a group entry
+	    that points to some other object header.</td>
+	</tr>
+      </table>
+    </center>
+
+
+<hr>
+<h4><a name="ContinuationMessage">Name: Object Header Continuation</a></h4>
+<b>Type:</b> 0x0010<BR>
+<b>Length:</b> fixed<BR>
+<b>Status:</b> Optional, may be repeated.<BR>
+<b>Purpose and Description:</b>  The object header continuation is the location
+in the file of more header messages for the current data object.  This can be
+used when header blocks are large, or likely to change over time.<BR>
+<b>Format of Data:</b><p>
+    The object header continuation is formatted as follows (assuming a 4-byte
+length &amp; offset are being used in the current file):
+
+<P>
+<center>
+<table border cellpadding=4 width=60%>
+<caption align=bottom>
+<B>HDF5 Object Header Continuation Message Layout</B>
+</caption>
+
+<tr align=center>
+<th width=25%>byte</th>
+<th width=25%>byte</th>
+<th width=25%>byte</th>
+<th width=25%>byte</th>
+
+<tr align=center>
+<td colspan=4>Header Continuation Offset</td>
+<tr align=center>
+<td colspan=4>Header Continuation Length</td>
+</table>
+</center>
+
+<P>
+<dl>
+<dt>The elements of the Header Continuation Message are described below:
+<dd>
+<dl>
+<dt>Header Continuation Offset: (&lt;offset&gt; bytes)
+<dd>This value is the offset in bytes from the beginning of the file where the
+header continuation information is located.
+<dt>Header Continuation Length: (&lt;length&gt; bytes)
+<dd>This value is the length in bytes of the header continuation information in
+the file.
+</dl>
+</dl>
+
+<!-- Delete examples throughout doc
+<h4><a name="ContinuationExample">Examples:</a></h4>
+    [straightforward]
+-->
+
+<hr>
+<h4><a name="SymbolTableMessage">Name: Group Message</a></h4>
+<b>Type:</b> 0x0011<BR>
+<b>Length:</b> fixed<BR>
+<b>Status:</b> Required for groups, may not be repeated.<BR>
+<b>Purpose and Description:</b> Each group has a B-tree and a
+name heap which are pointed to by this message.<BR>
+<b>Format of data:</b>
+<p>The group message is formatted as follows:
+
+<p>
+<center>
+<table border cellpadding=4 width="80%">
+<caption align=bottom>
+<b>HDF5 Object Header Group Message Layout</b>
+</caption>
+
+<tr align=center>
+<th width="25%">byte</th>
+<th width="25%">byte</th>
+<th width="25%">byte</th>
+<th width="25%">byte</th>
+
+<tr align=center>
+<td colspan=4>B-tree Address</td>
+
+<tr align=center>
+<td colspan=4>Heap Address</td>
+</table>
+</center>
+
+<P>
+<dl>
+<dt>The elements of the Group Message are described below:
+<dd>
+<dl>
+<dt>B-tree Address (&lt;offset&gt; bytes)
+<dd>This value is the offset in bytes from the beginning of the file
+where the B-tree is located.
+<dt>Heap Address (&lt;offset&gt; bytes)
+<dd>This value is the offset in bytes from the beginning of the file
+where the group name heap is located.
+</dl>
+</dl>
+
+<h3><a name="SharedObjectHeader">Disk Format: Level 2b - Shared Data Object Headers</a></h3>
+<P>In order to share header messages between several dataset objects, object
+header messages may be placed into the global heap.  Since these
+messages require additional information beyond the basic object header message
+information, the format of the shared message is detailed below.
+
+<BR> <BR>
+<center>
+<table border cellpadding=4 width=60%>
+<caption align=bottom>
+<B>HDF5 Shared Object Header Message</B>
+</caption>
+
+<tr align=center>
+<th width=25%>byte</th>
+<th width=25%>byte</th>
+<th width=25%>byte</th>
+<th width=25%>byte</th>
+
+<tr align=center>
+<td colspan=4>Reference Count of Shared Header Message</td>
+<tr align=center>
+<td colspan=4><br> Shared Object Header Message<br> <br></td>
+</table>
+</center>
+
+<p>
+<dl>
+<dt> The elements of the shared object header message are described below:
+<dd>
+<dl>
+<dt>Reference Count of Shared Header Message: (32-bit unsigned integer)
+<dd>This value is used to keep a count of the number of dataset objects which
+refer to this message from their dataset headers.  When this count reaches zero,
+the shared message header may be removed from the global heap.
+<dt>Shared Object Header Message: (various lengths)
+<dd>The data stored for the shared object header message is formatted in the
+same way as the private object header messages described in the object header
+description earlier in this document and begins with the header message Type.
+</dl>
+</dl>
+
+
+<h3><a name="DataStorage">Disk Format: Level 2c - Data Object Data Storage</a></h3>
+<P>The data for an object is stored separately from the header
+information in the file and may not actually be located in the HDF5 file
+itself if the header indicates that the data is stored externally.  The
+information for each record in the object is stored according to the
+dimensionality of the object (indicated in the dimensionality header message).
+Multi-dimensional data is stored in C order [same as current scheme], i.e. the
+"last" dimension changes fastest.
+<P>Data whose elements are composed of simple number-types are stored in
+native-endian IEEE format, unless they are specifically defined as being stored
+in a different machine format with the architecture-type information from the
+number-type header message.  This means that each architecture will need to
+[potentially] byte-swap data values into the internal representation for that
+particular machine.
+<P> Data with a "variable" sized number-type is stored in a data heap
+internal to the HDF5 file.  Global heap identifiers are stored in the
+data object storage.
+<P>Data whose elements are composed of pointer number-types are stored in several
+different ways depending on the particular pointer type involved. Simple
+pointers are just stored as the dataset offset of the object being pointed to with the
+size of the pointer being the same number of bytes as offsets in the file.
+Partial-object pointers are stored as a heap-ID which points to the following
+information within the file-heap: an offset of the object pointed to, number-type
+information (same format as header message), dimensionality information (same
+format as header message), sub-set start and end information (i.e. a coordinate
+location for each), and field start and end names (i.e.  a [pointer to the]
+string indicating the first field included and a [pointer to the] string name
+for the last field).
+
+<P>Data of a compound datatype is stored as a contiguous stream of the items
+in the structure, with each item formatted according to its datatype.
+
+</body>
+</html>
diff --git a/doxygen/examples/H5.format.1.1.html b/doxygen/examples/H5.format.1.1.html
new file mode 100644
index 0000000..9d03a76
--- /dev/null
+++ b/doxygen/examples/H5.format.1.1.html
@@ -0,0 +1,6439 @@
+<html>
+  <head>
+    <title>
+      HDF5 File Format Specification Version 1.1
+    </title>
+
+<STYLE TYPE="text/css">
+
+P { text-indent: 2em}
+P.item { margin-left: 2em; text-indent: -2em}
+P.item2 { margin-left: 2em; text-indent: 2em}
+
+TABLE.format { border:solid; border-collapse:collapse; caption-side:top; text-align:center; width:80%;}
+TABLE.format TH { border:ridge; padding:4px; width:25%;}
+TABLE.format TD { border:ridge; padding:4px; }
+TABLE.format CAPTION { font-weight:bold; font-size:larger;}
+
+TABLE.note {border:none; text-align:right; width:80%;}
+
+TABLE.desc { border:solid; border-collapse:collapse; caption-size:top; text-align:left; width:80%;}
+TABLE.desc TR { vertical-align:top;}
+TABLE.desc TH { border-style:ridge; font-size:larger; padding:4px; text-decoration:underline;}
+TABLE.desc TD { border-style:ridge; padding:4px; }
+TABLE.desc CAPTION { font-weight:bold; font-size:larger;}
+
+TABLE.list { border:none; }
+TABLE.list TR { vertical-align:top;}
+TABLE.list TH { border:none; text-decoration:underline;}
+TABLE.list TD { border:none; }
+
+</STYLE>
+</head>
+  <body>
+
+    <center>
+    <table border=0 width=90%>
+    <tr>
+    <td valign=top>
+    <ol type="I">
+      <li><a href="#Intro">Introduction</a>
+      <li><a href="#FileMetaData">Disk Format Level 0 - File Metadata</a>
+        <font size=-2>
+	<ol type="A">
+	  <li><a href="#SuperBlock">Disk Format Level 0A - File Signature and Super Block</a>
+	  <li><a href="#DriverInfo">Disk Format Level 0B - File Driver Info</a>
+	</ol>
+        </font>
+      <li><a href="#FileInfra">Disk Format Level 1 - File Infrastructure</a>
+        <font size=-2>
+	<ol type="A">
+	  <li><a href="#Btrees">Disk Format Level 1A - B-link Trees and B-tree Nodes</a>
+	  <li><a href="#SymbolTable">Disk Format Level 1B - Group</a>
+	  <li><a href="#SymbolTableEntry">Disk Format Level 1C - Group Entry</a>
+	  <li><a href="#LocalHeap">Disk Format Level 1D - Local Heaps</a>
+	  <li><a href="#GlobalHeap">Disk Format Level 1E - Global Heap</a>
+	  <li><a href="#FreeSpaceIndex">Disk Format Level 1F - Free-space Index</a>
+	</ol>
+        </font>
+      <li><a href="#DataObject">Disk Format Level 2 - Data Objects</a>
+        <font size=-2>
+	<ol type="A">
+	  <li><a href="#ObjectHeader">Disk Format Level 2a - Data Object Headers</a>
+	    <ol type="1">
+	      <li><a href="#NILMessage">Name: NIL</a>                                                       <!-- 0x0000 -->
+	      <li><a href="#SimpleDataSpace">Name: Simple Dataspace</a>                                     <!-- 0x0001 -->
+<!--          <li><a href="#DataSpaceMessage">Name: Complex Dataspace</a>  -->                              <!-- 0x0002 -->
+	      <li><a href="#ReservedMessage_0002">Name: Reserved - not assigned yet</a>                     <!-- 0x0002 -->
+	      <li><a href="#DataTypeMessage">Name: Datatype</a>                                             <!-- 0x0003 -->
+	      <li><a href="#OldFillValueMessage">Name: Data Storage - Fill Value (Old)</a>                  <!-- 0x0004 -->
+	      <li><a href="#FillValueMessage">Name: Data Storage - Fill Value</a>                           <!-- 0x0005 -->
+	    </ol>
+        </ol>
+        </font>
+    </ol>
+    </td><td>&nbsp;&nbsp;</td><td valign=top>
+    <ol type="I" start="4">
+
+      <li><a href="#DataObject">Disk Format Level 2 - Data Objects</a>
+        <font size=-2><i>(Continued)</i>
+	<ol type=A>
+	  <li><a href="#ObjectHeader">Disk Format Level 2a - Data Object Headers</a><i>(Continued)</i>
+	    <ol type="1" start="7">
+<!--          <li><a href="#CompactDataStorageMessage">Name: Data Storage - Compact</a>  -->                <!-- 0x0006 -->
+	      <li><a href="#ReservedMessage_0006">Name: Reserved - not assigned yet</a>                     <!-- 0x0006 -->
+	      <li><a href="#ExternalFileListMessage">Name: Data Storage - External Data Files</a>           <!-- 0x0007 -->
+	      <li><a href="#LayoutMessage">Name: Data Storage - Layout</a>                                  <!-- 0x0008 -->
+	      <li><a href="#ReservedMessage_0009">Name: Reserved - not assigned yet</a>                     <!-- 0x0009 -->
+	      <li><a href="#ReservedMessage_000A">Name: Reserved - not assigned yet</a>                     <!-- 0x000a -->
+	      <li><a href="#FilterMessage">Name: Data Storage - Filter Pipeline</a>                	    <!-- 0x000b -->
+	      <li><a href="#AttributeMessage">Name: Attribute</a>                                           <!-- 0x000c -->
+	      <li><a href="#CommentMessage">Name: Object Comment</a>                                              <!-- 0x000d -->
+	      <li><a href="#OldModifiedMessage">Name: Object Modification Date and Time (Old)</a>           <!-- 0x000e -->
+              <li><a href="#SharedMessage">Name: Shared Object Message</a>                                  <!-- 0x000f -->
+	      <li><a href="#ContinuationMessage">Name: Object Header Continuation</a>                       <!-- 0x0010 -->
+	      <li><a href="#SymbolTableMessage">Name: Group Message</a>                                     <!-- 0x0011 -->
+	      <li><a href="#ModifiedMessage">Name: Object Modification Date and Time</a>                    <!-- 0x0012 -->
+	    </ol>
+	  <li><a href="#DataStorage">Disk Format: Level 2b - Data Object Data Storage</a>
+	</ol>
+        </font>
+      <LI><A href="#Appendix">Appendix</A>
+    </ol>
+</td></tr>
+</table>
+</center>
+
+    <BR>
+    <HR>
+
+
+    <h2>Introduction</h2>
+
+    <table align=right width=100>
+    <tr><td>&nbsp;</td><td align=center>
+        <hr>
+        <img src="FF-IH_FileGroup.gif" alt="HDF5 Groups" hspace=15 vspace=15>
+    </td><td>&nbsp;</td></tr>
+    <tr><td>&nbsp;</td><td align=center>
+        <strong>Figure 1:</strong> Relationships among the HDF5 root group, other groups, and objects
+        <hr>
+    </td><td>&nbsp;</td></tr>
+
+    <tr><td>&nbsp;</td><td align=center>
+        <img src="FF-IH_FileObject.gif" alt="HDF5 Objects" hspace=15 vspace=15>
+    </td><td>&nbsp;</td></tr>
+    <tr><td>&nbsp;</td><td align=center>
+        <strong>Figure 2:</strong> HDF5 objects -- datasets, datatypes, or dataspaces
+        <hr>
+    </td><td>&nbsp;</td></tr>
+    </table>
+
+
+    <P>The format of an HDF5 file on disk encompasses several
+      key ideas of the HDF4 and AIO file formats as well as
+      addressing some shortcomings therein.  The new format is
+      more self-describing than the HDF4 format and is more
+      uniformly applied to data objects in the file.
+
+    <P>An HDF5 file appears to the user as a directed graph.
+      The nodes of this graph are the higher-level HDF5 objects
+      that are exposed by the HDF5 APIs:
+
+      <ul>
+         <li>Groups
+         <li>Datasets
+         <li>Named datatypes
+      </ul>
+
+    <P>At the lowest level, as information is actually written to the disk,
+       an HDF5 file is made up of the following objects:
+      <ul>
+         <li>A super block
+         <li>B-tree nodes (containing either symbol nodes or raw data chunks)
+         <li>Object headers
+         <li>A global heap
+         <li>Local heaps
+         <li>Free space
+      </ul>
+
+    <P>The HDF5 library uses these low-level objects to represent the
+      higher-level objects that are then presented to the user or
+      to applications through the APIs.
+      For instance, a group is an object header that contains a message that
+      points to a local heap and to a B-tree which points to symbol nodes.
+      A dataset is an object header that contains messages that describe
+      datatype, space, layout, filters, external files, fill value, etc
+      with the layout message pointing to either a raw data chunk or to a
+      B-tree that points to raw data chunks.
+
+
+    <h3>This Document</h3>
+
+    <p>This document describes the lower-level data objects;
+      the higher-level objects and their properties are described
+      in the <a href="H5.user.html"><cite>HDF5 User Guide</cite></a>.
+
+    <P>Three levels of information comprise the file format.
+      Level 0 contains basic information for identifying and
+      defining information about the file.  Level 1 information contains
+      the information about the pieces of a file shared by many objects
+      in the file (such as a B-trees and heaps).  Level 2 is the rest
+      of the file and contains all of the data objects, with each object
+      partitioned into header information, also known as
+      <em>metadata</em>, and data.
+
+    <p>The sizes of various fields in the following layout tables are
+      determined by looking at the number of columns the field spans
+      in the table.  There are three exceptions: (1) The size may be
+      overridden by specifying a size in parentheses, (2) the size of
+      addresses is determined by the <em>Size of Offsets</em> field
+      in the super block and is indicated in this document with a
+      superscripted 'O', and (3) the size of length fields is determined
+      by the <em>Size of Lengths</em> field in the super block and is
+      indicated in this document with a superscripted 'L'.
+
+    <P>Values for all fields in this document should be treated as unsigned
+      integers, unless otherwise noted in the description of a field.
+      Additionally, all metadata fields are stored in little-endian byte
+      order.
+    </P>
+
+    <BR>
+    <HR>
+
+    <h2><a name="FileMetaData">
+	Disk Format: Level 0 - File Metadata</a></h2>
+
+    <H3><A name="SuperBlock">
+	Disk Format: Level 0A - File Signature and Super Block</A></H3>
+
+    <P>The super block may begin at certain predefined offsets within
+      the HDF5 file, allowing a block of unspecified content for
+      users to place additional information at the beginning (and
+      end) of the HDF5 file without limiting the HDF5 library's
+      ability to manage the objects within the file itself.  This
+      feature was designed to accommodate wrapping an HDF5 file in
+      another file format or adding descriptive information to the
+      file without requiring the modification of the actual file's
+      information.  The super block is located by searching for the
+      HDF5 file signature at byte offset 0, byte offset 512 and at
+      successive locations in the file, each a multiple of two of
+      the previous location, i.e.  0, 512, 1024, 2048, etc.
+
+    <P>The super block is composed of a file signature, followed by
+      super block and group version numbers, information
+      about the sizes of offset and length values used to describe
+      items within the file, the size of each group page,
+      and a group entry for the root object in the file.
+
+    <br>
+    <div align=center>
+      <table class=format>
+	<caption>
+	  HDF5 Super Block Layout
+	</caption>
+
+	<tr>
+	  <th>byte</th>
+	  <th>byte</th>
+	  <th>byte</th>
+	  <th>byte</th>
+	</tr>
+
+	<tr>
+	  <td colspan=4><br>HDF5 File Signature (8 bytes)<br><br></td>
+	</tr>
+
+	<tr>
+	  <td>Version # of Super Block</td>
+	  <td>Version # of Global Free-space Storage</td>
+	  <td>Version # of Root Group Symbol Table Entry</td>
+	  <td>Reserved (zero)</td>
+	</tr>
+
+	<tr>
+	  <td>Version # of Shared Header Message Format</td>
+	  <td>Size of Offsets</td>
+	  <td>Size of Lengths</td>
+	  <td>Reserved (zero)</td>
+	</tr>
+
+	<tr>
+	  <td colspan=2>Group Leaf Node K</td>
+	  <td colspan=2>Group Internal Node K</td>
+	</tr>
+
+	<tr>
+	  <td colspan=4>File Consistency Flags</td>
+	</tr>
+
+	<tr>
+	  <td colspan=2 style="border:dotted;">Indexed Storage Internal Node K<sup>1</sup></td>
+	  <td colspan=2 style="border:dotted;">Reserved (zero)<sup>1</sup></td>
+	</tr>
+
+	<tr>
+	  <td colspan=4>Base Address<sup>O</sup></td>
+	</tr>
+
+	<tr>
+	  <td colspan=4>Address of Global Free-space Heap<sup>O</sup></td>
+	</tr>
+
+	<tr>
+	  <td colspan=4>End of File Address<sup>O</sup></td>
+	</tr>
+
+	<tr>
+	  <td colspan=4>Driver Information Block Address<sup>O</sup></td>
+	</tr>
+
+	<tr>
+	  <td colspan=4>Root Group Symbol Table Entry</td>
+	</tr>
+      </table>
+
+      <table class=note>
+        <tr><td>
+            (Items marked with an 'O' the above table are
+            <br>
+            of the size specified in "Size of Offsets.")
+        </td></tr>
+        <tr><td>
+            (Items marked with an '1' the above table are
+            <br>
+            new in version 1 of the superblock)
+        </td></tr>
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=desc>
+	<tr>
+          <th width="30%">Field Name</th>
+          <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td>HDF5 File Signature</td>
+	  <td>
+            <P>This field contains a constant value and can be used to
+	    quickly identify a file as being an HDF5 file.  The
+	    constant value is designed to allow easy identification of
+	    an HDF5 file and to allow certain types of data corruption
+	    to be detected.  The file signature of an HDF5 file always
+	    contains the following values:
+            </P>
+
+            <center>
+	      <table border align=center cellpadding=4>
+		<tr align=center>
+		  <td align=right>Decimal:</td>
+                  <td width="8%">137</td>
+		  <td width="8%">72</td>
+		  <td width="8%">68</td>
+		  <td width="8%">70</td>
+		  <td width="8%">13</td>
+		  <td width="8%">10</td>
+		  <td width="8%">26</td>
+		  <td width="8%">10</td>
+		</tr>
+
+		<tr align=center>
+		  <td align=right>Hexadecimal:</td>
+		  <td>89</td>
+		  <td>48</td>
+		  <td>44</td>
+		  <td>46</td>
+		  <td>0d</td>
+		  <td>0a</td>
+		  <td>1a</td>
+		  <td>0a</td>
+		</tr>
+
+		<tr align=center>
+		  <td align=right>ASCII C Notation:</td>
+		  <td>\211</td>
+		  <td>H</td>
+		  <td>D</td>
+		  <td>F</td>
+		  <td>\r</td>
+		  <td>\n</td>
+		  <td>\032</td>
+		  <td>\n</td>
+		</tr>
+	      </table>
+	    </center>
+	    <br>
+
+	    <P>This signature both identifies the file as an HDF5 file
+	    and provides for immediate detection of common
+	    file-transfer problems. The first two bytes distinguish
+	    HDF5 files on systems that expect the first two bytes to
+	    identify the file type uniquely. The first byte is
+	    chosen as a non-ASCII value to reduce the probability
+	    that a text file may be misrecognized as an HDF5 file;
+	    also, it catches bad file transfers that clear bit
+	    7. Bytes two through four name the format. The CR-LF
+	    sequence catches bad file transfers that alter newline
+	    sequences. The control-Z character stops file display
+	    under MS-DOS. The final line feed checks for the inverse
+	    of the CR-LF translation problem.  (This is a direct
+	    descendent of the <A href="http://www.libpng.org/pub/png/spec/PNG-Rationale.html#R.PNG-file-signature">PNG</A> file
+            signature.)
+            </P>
+
+            <P><EM>This field is present in version 0+ of the superblock.</EM>
+            </P>
+            </td>
+	</tr>
+
+	<tr>
+	  <td>Version Number of the Super Block</td>
+	  <td>
+            <P>This value is used to determine the format of the
+	    information in the super block.  When the format of the
+	    information in the super block is changed, the version number
+	    is incremented to the next integer and can be used to
+	    determine how the information in the super block is
+	    formatted.
+            </P>
+
+            <P>Values of 0 and 1 are defined for this field.
+            </P>
+
+            <P><EM>This field is present in version 0+ of the superblock.</EM>
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Version Number of the File Free-space Information</td>
+	  <td>
+            <P>This value is used to determine the format of the
+	    information in the File Free-space Information.
+            </P>
+            <P>The only value currently valid in this field is '0', which
+            indicates that the free space index is formatted as described
+            <A href="#FreeSpaceIndex">below</A>.
+            </P>
+
+            <P><EM>This field is present in version 0+ of the superblock.</EM>
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Version Number of the Root Group Symbol Table Entry</td>
+	  <td>
+            <P>This value is used to determine the format of the
+	    information in the Root Group Symbol Table Entry.  When the
+            format of the information in that field is changed, the
+	    version number is incremented to the next integer and can be
+	    used to determine how the information in the field
+	    is formatted.
+            </P>
+            <P>The only value currently valid in this field is '0', which
+            indicates that the root group symbol table entry is formatted as
+            described <A href="#SymbolTableEntry">below</A>.
+            </P>
+
+            <P><EM>This field is present in version 0+ of the superblock.</EM>
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Version Number of the Shared Header Message Format</td>
+	  <td>
+            <P>This value is used to determine the format of the
+	    information in a shared object header message. Since the format
+	    of the shared header messages differs from the other private
+	    header messages, a version number is used to identify changes
+	    in the format.
+            </P>
+            <P>The only value currently valid in this field is '0', which
+            indicates that shared header messages are formatted as
+            described <A href="#SharedMessage">below</A>.
+            </P>
+
+            <P><EM>This field is present in version 0+ of the superblock.</EM>
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Size of Offsets</td>
+	  <td>
+            <P>This value contains the number of bytes used to store
+	    addresses in the file.  The values for the addresses of
+	    objects in the file are offsets relative to a base address,
+	    usually the address of the super block signature.  This
+	    allows a wrapper to be added after the file is created
+	    without invalidating the internal offset locations.
+            </P>
+
+            <P><EM>This field is present in version 0+ of the superblock.</EM>
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Size of Lengths</td>
+	  <td>
+            <P>This value contains the number of bytes used to store
+	    the size of an object.
+            </P>
+
+            <P><EM>This field is present in version 0+ of the superblock.</EM>
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Group Leaf Node K</td>
+	  <td>
+            <P>Each leaf node of a group B-tree will have at
+	    least this many entries but not more than twice this
+	    many.  If a group has a single leaf node then it
+	    may have fewer entries.
+            </P>
+            <P>This value must be greater than zero.
+            </P>
+            <P>See the <A href="#Btrees">description</A> of B-trees below.
+            </P>
+
+            <P><EM>This field is present in version 0+ of the superblock.</EM>
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Group Internal Node K</td>
+	  <td>
+            <P>Each internal node of a group B-tree will have at
+	    least this many entries but not more than twice this
+	    many.  If the group has only one internal
+	    node then it might have fewer entries.
+            </P>
+            <P>This value must be greater than zero.
+            </P>
+            <P>See the <A href="#Btrees">description</A> of B-trees below.
+            </P>
+
+            <P><EM>This field is present in version 0+ of the superblock.</EM>
+            </P>
+          </td>
+	</tr>
+
+        <tr>
+          <td>File Consistency Flags</td>
+          <td>
+            <P>This value contains flags to indicate information
+            about the consistency of the information contained
+            within the file.  Currently, the following bit flags are
+            defined:
+            <ul>
+            <li>Bit 0 set indicates that the file is opened for
+            write-access.
+            <li>Bit 1 set indicates that the file has
+            been verified for consistency and is guaranteed to be
+            consistent with the format defined in this document.
+            <li>Bits 2-31 are reserved for future use.
+            </ul>
+            Bit 0 should be
+            set as the first action when a file is opened for write
+            access and should be cleared only as the final action
+            when closing a file.  Bit 1 should be cleared during
+            normal access to a file and only set after the file's
+            consistency is guaranteed by the library or a
+            consistency utility.
+            </P>
+
+            <P><EM>This field is present in version 0+ of the superblock.</EM>
+            </P>
+          </td>
+        </tr>
+
+	<tr>
+	  <td>Indexed Storage Internal Node K</td>
+	  <td>
+            <P>Each internal node of a indexed storage B-tree will have at
+	    least this many entries but not more than twice this
+	    many.  If the group has only one internal
+	    node then it might have fewer entries.
+            </P>
+            <P>This value must be greater than zero.
+            </P>
+            <P>See the <A href="#Btrees">description</A> of B-trees below.
+            </P>
+
+            <P><EM>This field is present in version 1+ of the superblock.</EM>
+            </P>
+          </td>
+	</tr>
+
+        <tr>
+          <td>Base Address</td>
+          <td>
+            <P>This is the absolute file address of the first byte of
+            the HDF5 data within the file.  The library currently
+            constrains this value to be the absolute file address
+            of the super block itself when creating new files;
+            future versions of the library may provide greater
+            flexibility.  When opening an existing file and this address does
+            not match the offset of the superblock, the library assumes
+            that the entire contents of the HDF5 file have been adjusted in
+            the file and adjusts the base address and end of file address to
+            reflect their new positions in the file.  Unless otherwise noted,
+            all other file addresses are relative to this base
+            address.
+            </P>
+
+            <P><EM>This field is present in version 0+ of the superblock.</EM>
+            </P>
+          </td>
+        </tr>
+
+        <tr>
+          <td>Address of Global Free-space Index</td>
+          <td>
+            <P>Free-space management is not yet defined in the HDF5
+            file format and is not handled by the library.
+            Currently this field always contains the
+            <A href="#UndefinedAddress">undefined address</A>.
+            </P>
+
+            <P><EM>This field is present in version 0+ of the superblock.</EM>
+            </P>
+          </td>
+        </tr>
+
+        <tr>
+          <td>End of File Address</td>
+          <td>
+            <P>This is the absolute file address of the first byte past
+            the end of all HDF5 data.  It is used to determine whether a
+            file has been accidentally truncated and as an address where
+            file data allocation can occur if space from the free list is
+            not used.
+            </P>
+
+            <P><EM>This field is present in version 0+ of the superblock.</EM>
+            </P>
+          </td>
+        </tr>
+
+        <tr>
+          <td>Driver Information Block Address</td>
+          <td>
+            <P>This is the relative file address of the file driver
+            information block which contains driver-specific
+            information needed to reopen the file. If there is no
+            driver information block then this entry should be the
+            <A href="#UndefinedAddress">undefined address</A>.
+            </P>
+
+            <P><EM>This field is present in version 0+ of the superblock.</EM>
+            </P>
+          </td>
+        </tr>
+
+        <tr>
+          <td>Root Group Symbol Table Entry</td>
+          <td>
+            <P>This is the <A href="#SymbolTableEntry">symbol table entry</A>
+            of the root group, which serves as the entry point into
+            the group graph for the file.
+            </P>
+
+            <P><EM>This field is present in version 0+ of the superblock.</EM>
+            </P>
+          </td>
+        </tr>
+      </table>
+    </div>
+
+    <H3><A name="DriverInfo">
+	Disk Format: Level 0B - File Driver Info</A></H3>
+
+    <p>The <em>file driver information block</em> is an optional region of the
+      file which contains information needed by the file driver in
+      order to reopen a file.  The format of the file driver information
+      block is:
+
+    <br>
+    <div align=center>
+      <table class=format>
+        <caption>
+          Driver Information Block
+        </caption>
+
+        <tr>
+          <th>byte</th>
+          <th>byte</th>
+          <th>byte</th>
+          <th>byte</th>
+	</tr>
+
+        <tr>
+          <td>Version</td>
+          <td colspan=3>Reserved (zero)</td>
+        </tr>
+
+        <tr>
+          <td colspan=4>Driver Information Size (4 bytes)</td>
+        </tr>
+
+        <tr>
+          <td colspan=4><br>Driver Identification (8 bytes)<br><br></td>
+        </tr>
+
+        <tr>
+          <td colspan=4><br><br>Driver Information (<em>n</em> bytes)<br><br><br></td>
+        </tr>
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=desc>
+	<tr>
+          <th width="30%">Field Name</th>
+          <th>Description</th>
+        </tr>
+
+        <tr>
+          <td>Version</td>
+          <td>
+            <P>The version number of the driver information block. The
+            file format documented here is version zero.
+            </P>
+          </td>
+        </tr>
+
+        <tr>
+          <td>Driver Information Size</td>
+          <td>
+            <P>The size in bytes of the Driver Information part of this
+            structure.
+            </P>
+          </td>
+        </tr>
+
+        <tr>
+          <td>Driver Identification</td>
+          <td>
+            <P>This is an eight-byte ASCII string without null
+            termination which identifies the driver and version number
+            of the Driver Information block. The predefined drivers
+            supplied with the HDF5 library are identified by the
+            letters <code>NCSA</code> followed by the first four characters of
+            the driver name. If the Driver Information block is not
+            the original version then the last letter(s) of the
+            identification will be replaced by a version number in
+            ASCII.
+            </P>
+            <P>
+            For example, the various versions of the <em>multi driver</em>
+            will be identified by <code>NCSAmult</code>.
+            (<code>NCSAmult</code> is simply <code>NCSAmulti</code> truncated
+            to eight characters.  Subsequent identifiers will be created by
+            substituting sequential numerical values for the final character,
+            starting with zero.) <em>multi driver</em> is the only default driver that
+            is encoded in this field.
+            </P>
+            <P>
+            Identification for user-defined drivers
+            is eight-byte long and arbitrary but should be unique and avoid
+            the four character prefix "NCSA".
+            </P>
+          </td>
+        </tr>
+
+        <tr valign=top>
+          <td>Driver Information</td>
+          <td>Driver information is encoded/decoded in a format defined by the
+            file driver. <em>multi driver</em> is the only default driver that has driver
+            information stored in this field.  Its format is explained in the
+            following block.</td>
+        </tr>
+      </table>
+    </div>
+
+    <BR>
+    <P><em>Multi driver</em> has the following format:</P>
+
+    <div align=center>
+      <table class=format>
+	<caption>
+	  Multi Driver Message
+	</caption>
+
+	<tr>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+	  <td>Member Mapping</td>
+	  <td>Member Mapping</td>
+	  <td>Member Mapping</td>
+	  <td>Member Mapping</td>
+	</tr>
+
+	<tr>
+	  <td>Member Mapping</td>
+	  <td>Member Mapping</td>
+	  <td>Reserved</td>
+	  <td>Reserved</td>
+	</tr>
+
+	<tr>
+	  <td colspan=4><br>Address of Member File 1<br><br></td>
+	</tr>
+
+	<tr>
+	  <td colspan=4><br>End of Address for Member File 1<br><br></td>
+	</tr>
+
+	<tr>
+	  <td colspan=4><br>Address of Member File 2<br><br></td>
+	</tr>
+
+	<tr>
+	  <td colspan=4><br>End of Address for Member File 2<br><br></td>
+	</tr>
+
+	<tr>
+	  <td colspan=4><br>... ...<br><br></td>
+	</tr>
+
+	<tr>
+	  <td colspan=4><br>Name of Member File 1<br><br></td>
+	</tr>
+
+	<tr>
+	  <td colspan=4><br>Name of Member File 2<br><br></td>
+	</tr>
+
+	<tr>
+	  <td colspan=4><br>... ...<br><br></td>
+	</tr>
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=desc>
+	<tr>
+	  <th width="30%">Field Name</th>
+	  <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td>Member Mapping</td>
+	  <td><P><em>Multi driver</em> enables different types of HDF5 data and
+            metadata to be written to separate files. These files are viewed by the
+            library as a single virtual HDF5 file with a single file address.
+            It allows maximal 6 files to be created.
+	    In sequence, these <em>Member Mapping</em> fields are for super block,
+            B-tree, raw data, global heap, local heap,
+	    and object header.  More than one type of data can be written to the
+            same file.</P>
+	    <P>These <em>Member Mapping</em> fields are integer values from 1 to 6
+            indicating how the data can be mapped to or merged with another type of
+            data.
+	        <table class=list>
+                    <tr>
+                    <th width="30%">Member Mapping</th>
+                    <th align=left>Description</th>
+                    </tr>
+                    <tr>
+                        <td align=center>1</td>
+                        <td>The super block data.</td>
+                    </tr>
+                    <tr>
+                        <td align=center>2</td>
+                        <td>The B-tree data.</td>
+                    </tr>
+                    <tr>
+                        <td align=center>3</td>
+                        <td>The raw data.</td>
+                    </tr>
+                    <tr>
+                        <td align=center>4</td>
+                        <td>The global heap data.</td>
+                    </tr>
+                    <tr>
+                        <td align=center>5</td>
+                        <td>The local heap data.</td>
+                    </tr>
+                    <tr>
+                        <td align=center>6</td>
+                        <td>The object header data.</td>
+                    </tr>
+                </table></P>
+            For example, if the third field has the value 3 and all the rest have the
+            value 1, it means there are two files, one for raw data, one for super block,
+            B-tree, global heap, local heap, and object header.
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Reserved</td>
+	  <td><P>These fields are reserved and should always be zero.</P></td>
+	</tr>
+
+	<tr>
+	  <td>Address of Member File</td>
+	  <td><P>Specifies the virtual address. A normally eight-byte integer with
+            the value from <em>0</em> (zero) to maximal value,
+	    at which the member file starts.</P></td>
+	</tr>
+
+	<tr>
+	  <td>End of Address for Member File</td>
+	  <td><P>The end of allocated address for the member file. A normally eight-byte
+            integer value.</P></td>
+	</tr>
+
+	<tr>
+	  <td>Name of Member File</td>
+	  <td><P>The null-terminated name of member file.  Its length should be multiples of
+	    8 bytes.  Additional bytes will be padded with <em>NULL</em>s. The default naming
+            convention is <em>%%s-X.h5</em>, where <em>X</em> is one of the letters
+            <em>s</em> (for super block), <em>b</em> (for B-tree), <em>r</em> (for raw data),
+            <em>g</em> (for global heap), <em>l</em> (for local heap), and <em>o</em> (for
+            object header). The name for the whole HDF5 file will substitute the <em>%s</em>
+            in the string.
+          </P>
+          </td>
+	</tr>
+      </table>
+    </div>
+
+    <BR>
+    <HR>
+
+    <h2><a name="FileInfra">
+        Disk Format: Level 1 - File Infrastructure</a></h2>
+    <h3><a name="Btrees">Disk Format: Level 1A - B-link Trees and B-tree Nodes</a></h3>
+
+    <p>B-link trees allow flexible storage for objects which tend to grow
+      in ways that cause the object to be stored discontiguously.  B-trees
+      are described in various algorithms books including "Introduction to
+      Algorithms" by Thomas H. Cormen, Charles E. Leiserson, and Ronald
+      L. Rivest.  The B-link tree, in which the sibling nodes at a
+      particular level in the tree are stored in a doubly-linked list,
+      is described in the "Efficient Locking for Concurrent Operations
+      on B-trees" paper by Phillip Lehman and S. Bing Yao as published
+      in the <cite>ACM Transactions on Database Systems</cite>, Vol. 6,
+      No. 4, December 1981.
+
+    <p>The B-link trees implemented by the file format contain one more
+      key than the number of children.  In other words, each child
+      pointer out of a B-tree node has a left key and a right key.
+      The pointers out of internal nodes point to sub-trees while
+      the pointers out of leaf nodes point to symbol nodes and
+      raw data chunks.
+      Aside from that difference, internal nodes and leaf nodes
+      are identical.
+
+    <br>
+    <div align=center>
+      <table class=format>
+        <caption>
+          B-tree Nodes
+        </caption>
+
+        <tr>
+          <th>byte</th>
+          <th>byte</th>
+          <th>byte</th>
+          <th>byte</th>
+
+        <tr>
+          <td colspan=4>Signature</td>
+
+        <tr>
+          <td>Node Type</td>
+          <td>Node Level</td>
+          <td colspan=2>Entries Used</td>
+
+        <tr>
+          <td colspan=4>Address of Left Sibling<sup>O</sup></td>
+
+        <tr>
+          <td colspan=4>Address of Right Sibling<sup>O</sup></td>
+
+        <tr>
+          <td colspan=4>Key 0 (variable size)</td>
+
+        <tr>
+          <td colspan=4>Address of Child 0<sup>O</sup></td>
+
+        <tr>
+          <td colspan=4>Key 1 (variable size)</td>
+
+        <tr>
+          <td colspan=4>Address of Child 1<sup>O</sup></td>
+
+        <tr>
+          <td colspan=4>...</td>
+
+        <tr>
+          <td colspan=4>Key 2<em>K</em> (variable size)</td>
+
+        <tr>
+          <td colspan=4>Address of Child 2<em>K</em><sup>O</sup></td>
+
+        <tr>
+          <td colspan=4>Key 2<em>K</em>+1 (variable size)</td>
+      </table>
+
+      <table class=note>
+        <tr><td>
+            (Items marked with an 'O' the above table are
+            <br>
+            of the size specified in "Size of Offsets.")
+        </td></tr>
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=desc>
+	<tr>
+          <th width="30%">Field Name</th>
+          <th>Description</th>
+        </tr>
+
+        <tr>
+          <td>Signature</td>
+          <td>
+            <P>The ASCII character string "<code>TREE</code>" is
+            used to indicate the
+            beginning of a B-link tree node.  This gives file
+            consistency checking utilities a better chance of
+            reconstructing a damaged file.
+            </P>
+          </td>
+        </tr>
+
+        <tr>
+          <td>Node Type</td>
+          <td>
+            <P>Each B-link tree points to a particular type of data.
+            This field indicates the type of data as well as
+            implying the maximum degree <em>K</em> of the tree and
+            the size of each Key field.
+            </P>
+
+            <table class=list>
+                <tr>
+                <th width="30%">Node Type</th>
+                <th align=left>Description</th>
+                </tr>
+                <tr>
+                    <td align=center>0</td>
+                    <td>This tree points to group nodes.</td>
+                </tr>
+                <tr>
+                    <td align=center>1</td>
+                    <td>This tree points to raw data chunk nodes.</td>
+                </tr>
+            </table>
+          </td>
+        </tr>
+
+        <tr>
+          <td>Node Level</td>
+          <td>
+            <P>The node level indicates the level at which this node
+            appears in the tree (leaf nodes are at level zero).  Not
+            only does the level indicate whether child pointers
+            point to sub-trees or to data, but it can also be used
+            to help file consistency checking utilities reconstruct
+            damaged trees.
+            </P>
+          </td>
+        </tr>
+
+        <tr valign=top>
+          <td>Entries Used</td>
+          <td>
+            <P>This determines the number of children to which this
+            node points.  All nodes of a particular type of tree
+            have the same maximum degree, but most nodes will point
+            to less than that number of children.  The valid child
+            pointers and keys appear at the beginning of the node
+            and the unused pointers and keys appear at the end of
+            the node.  The unused pointers and keys have undefined
+            values.
+            </P>
+          </td>
+        </tr>
+
+        <tr valign=top>
+          <td>Address of Left Sibling</td>
+          <td>
+            <P>This is the relative file address of the left sibling of
+            the current node.  If the current
+            node is the left-most node at this level then this field
+            is the <A href="#UndefinedAddress">undefined address</A>.
+            </P>
+          </td>
+        </tr>
+
+        <tr valign=top>
+          <td>Address of Right Sibling</td>
+          <td>
+            <P>This is the relative file address of the right sibling of
+            the current node.  If the current
+            node is the right-most node at this level then this
+            field is the <A href="#UndefinedAddress">undefined address</A>.
+            </P>
+          </td>
+        </tr>
+
+        <tr valign=top>
+          <td>Keys and Child Pointers</td>
+          <td>
+            <P>Each tree has 2<em>K</em>+1 keys with 2<em>K</em>
+            child pointers interleaved between the keys.  The number
+            of keys and child pointers actually containing valid
+            values is determined by the node's <em>Entries Used</em> field.
+            If that field is <em>N</em> then the B-link tree contains
+            <em>N</em> child pointers and <em>N</em>+1 keys.
+            </P>
+          </td>
+        </tr>
+
+        <tr valign=top>
+          <td>Key</td>
+          <td>
+            <P>The format and size of the key values is determined by
+            the type of data to which this tree points.  The keys are
+            ordered and are boundaries for the contents of the child
+            pointer; that is, the key values represented by child
+            <em>N</em> fall between Key <em>N</em> and Key
+            <em>N</em>+1. Whether the interval is open or closed on
+            each end is determined by the type of data to which the
+            tree points.
+            </P>
+
+            <P>
+            The format of the key depends on the node type.
+            For nodes of node type 0 (group nodes), the key is formatted as
+            follows:
+            <center>
+            <table class=list>
+            <tr>
+              <td width=30%>A single field of <i>Size of Lengths</i>
+                bytes:</td>
+              <td>Indicates the byte offset into the local heap
+                for the first object name in the subtree which
+                that key describes.
+              </td>
+            </tr>
+            </table>
+            </center>
+            </P>
+
+            <P>
+            For nodes of node type 1 (chunked raw data nodes), the key is
+            formatted as follows:
+            <center>
+            <table class=list>
+            <tr>
+              <td width=30%>Bytes 1-4:</td>
+              <td>Size of chunk in bytes.</td>
+            </tr>
+            <tr>
+              <td>Bytes 4-8:</td>
+              <td>Filter mask, a 32-bit bitfield indicating which
+                filters have been skipped for this chunk.  Each filter
+                has an index number in the pipeline (starting at 0, with
+                the first filter to apply) and if that filter is skipped,
+                the bit corresponding to it's index is set.</td>
+            </tr>
+            <tr>
+              <td><em>N</em> 64-bit fields:</td>
+              <td>A 64-bit index indicating the offset of the
+                chunk within the dataset where <i>N</i> is the number
+                of dimensions of the dataset.  For example, if
+                a chunk in a 3-dimensional dataset begins at the
+                position <code>[5,5,5]</code>, there will be three
+                such 64-bit indices, each with the value of
+                <code>5</code>.</td>
+            </tr>
+            </table>
+            </center>
+            </P>
+          </td>
+        </tr>
+
+        <tr valign=top>
+          <td>Child Pointer</td>
+          <td>
+            <P>The tree node contains file addresses of subtrees or
+            data depending on the node level.  Nodes at Level 0 point
+            to data addresses, either raw data chunk or group nodes.
+            Nodes at non-zero levels point to other nodes of the
+            same B-tree.
+            </P>
+            <P>For raw data chunk nodes, the child pointer is the address
+            of a single raw data chunk.  For group nodes, the child pointer
+            points to a <A href="#SymbolTable">symbol table</A>, which contains
+            information for multiple symbol table entries.
+            </P>
+          </td>
+        </tr>
+      </table>
+    </div>
+
+    <p>
+     Conceptually, each B-tree node looks like this:
+     <center>
+     <table>
+       <tr valign=top align=center>
+         <td>key[0]</td><td>&nbsp;</td>
+         <td>child[0]</td><td>&nbsp;</td>
+         <td>key[1]</td><td>&nbsp;</td>
+         <td>child[1]</td><td>&nbsp;</td>
+         <td>key[2]</td><td>&nbsp;</td>
+         <td>...</td><td>&nbsp;</td>
+         <td>...</td><td>&nbsp;</td>
+         <td>key[<i>N</i>-1]</td><td>&nbsp;</td>
+         <td>child[<i>N</i>-1]</td><td>&nbsp;</td>
+         <td>key[<i>N</i>]</td>
+       </tr>
+     </table>
+     </center>
+     <br>
+
+     where child[<i>i</i>] is a pointer to a sub-tree (at a level
+     above Level 0) or to data (at Level 0).
+     Each key[<i>i</i>] describes an <i>item</i> stored by the B-tree
+     (a chunk or an object of a group node).  The range of values
+     represented by child[<i>i</i>] is indicated by key[<i>i</i>]
+     and key[<i>i</i>+1].
+
+
+    <p>The following question must next be answered:
+     "Is the value described by key[<i>i</i>] contained in
+     child[<i>i</i>-1] or in child[<i>i</i>]?"
+     The answer depends on the type of tree.
+     In trees for groups (node type 0) the object described by
+     key[<i>i</i>] is the greatest object contained in
+     child[<i>i</i>-1] while in chunk trees (node type 1) the
+     chunk described by key[<i>i</i>] is the least chunk in
+     child[<i>i</i>].
+
+    <p>That means that key[0] for group trees is sometimes unused;
+     it points to offset zero in the heap, which is always the
+     empty string and compares as "less-than" any valid object name.
+
+    <p>And key[<i>N</i>] for chunk trees is sometimes unused;
+     it contains a chunk offset which compares as "greater-than"
+     any other chunk offset and has a chunk byte size of zero
+     to indicate that it is not actually allocated.
+
+
+    <h3><a name="SymbolTable">Disk Format: Level 1B - Group and Symbol Nodes</a></h3>
+
+    <p>A group is an object internal to the file that allows
+      arbitrary nesting of objects within the file (including other groups).
+      A group maps a set of names in the group to a set of relative
+      file addresses where objects with those names are located in
+      the file.  Certain metadata for an object to which the group points
+      can be cached in the group's symbol table in addition to the
+      object's header.
+
+    <p>An HDF5 object name space can be stored hierarchically by
+      partitioning the name into components and storing each
+      component in a group.  The group entry for a
+      non-ultimate component points to the group containing
+      the next component.  The group entry for the last
+      component points to the object being named.
+
+    <p>A group is a collection of group nodes pointed
+      to by a B-link tree.  Each group node contains entries
+      for one or more symbols.  If an attempt is made to add a
+      symbol to an already full group node containing
+      2<em>K</em> entries, then the node is split and one node
+      contains <em>K</em> symbols and the other contains
+      <em>K</em>+1 symbols.
+
+    <br>
+    <div align=center>
+      <table class=format>
+        <caption>
+          Group Node (A Leaf of a B-tree)
+        </caption>
+
+        <tr>
+          <th>byte</th>
+          <th>byte</th>
+          <th>byte</th>
+          <th>byte</th>
+
+        <tr>
+          <td colspan=4>Signature</td>
+
+        <tr>
+          <td>Version Number</td>
+          <td>Reserved (0)</td>
+          <td colspan=2>Number of Symbols</td>
+
+        <tr>
+          <td colspan=4><br><br>Group Entries<br><br><br></td>
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=desc>
+	<tr>
+          <th width="30%">Field Name</th>
+          <th>Description</th>
+        </tr>
+
+        <tr>
+          <td>Signature</td>
+          <td>
+            <P>The ASCII character string "<code>SNOD</code>" is
+            used to indicate the
+            beginning of a group node.  This gives file
+            consistency checking utilities a better chance of
+            reconstructing a damaged file.
+            </P>
+          </td>
+        </tr>
+
+        <tr>
+          <td>Version Number</td>
+          <td>
+            <P>The version number for the group node.  This
+            document describes version 1. (There is no version '0'
+            of the group node)
+            </P>
+          </td>
+        </tr>
+
+        <tr>
+          <td>Number of Symbols</td>
+          <td>
+            <P>Although all group nodes have the same length,
+            most contain fewer than the maximum possible number of
+            symbol entries.  This field indicates how many entries
+            contain valid data.  The valid entries are packed at the
+            beginning of the group node while the remaining
+            entries contain undefined values.
+            </P>
+          </td>
+        </tr>
+
+        <tr>
+          <td>Group Entries</td>
+          <td>
+            <P>Each symbol has an entry in the group node.
+            The format of the entry is described below.
+            There are 2<EM>K</EM> entries in each group node, where
+            <EM>K</EM> is the "Group Leaf Node K" value from the
+            <A href="#SuperBlock">super block</A>.
+            </P>
+          </td>
+        </tr>
+      </table>
+    </div>
+
+    <h3><a name="SymbolTableEntry">
+        Disk Format: Level 1C - Group Entry </a></h3>
+
+    <p>Each group entry in a group node is designed
+      to allow for very fast browsing of stored objects.
+      Toward that design goal, the group entries
+      include space for caching certain constant metadata from the
+      object header.
+
+    <br>
+    <div align=center>
+      <table class=format>
+        <caption>
+          Group Entry
+        </caption>
+
+        <tr>
+          <th>byte</th>
+          <th>byte</th>
+          <th>byte</th>
+          <th>byte</th>
+        </tr>
+
+        <tr>
+          <td colspan=4>Name Offset<sup>O</sup></td>
+        </tr>
+
+        <tr>
+          <td colspan=4>Object Header Address<sup>O</sup></td>
+        </tr>
+
+        <tr>
+          <td colspan=4>Cache Type</td>
+        </tr>
+
+        <tr>
+          <td colspan=4>Reserved</td>
+        </tr>
+
+        <tr>
+          <td colspan=4><br><br>Scratch-pad Space (16 bytes)<br><br><br></td>
+        </tr>
+      </table>
+
+      <table class=note>
+        <tr><td>
+            (Items marked with an 'O' the above table are
+            <br>
+            of the size specified in "Size of Offsets.")
+        </td></tr>
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=desc>
+	<tr>
+          <th width="30%">Field Name</th>
+          <th>Description</th>
+        </tr>
+
+        <tr>
+          <td>Name Offset</td>
+          <td>
+            <P>This is the byte offset into the group local
+            heap for the name of the object. The name is null
+            terminated.
+            </P>
+          </td>
+        </tr>
+
+        <tr>
+          <td>Object Header Address</td>
+          <td>
+            <P>Every object has an object header which serves as a
+            permanent location for the object's metadata.  In addition
+            to appearing in the object header, some metadata can be
+            cached in the scratch-pad space.
+            </P>
+          </td>
+        </tr>
+
+        <tr>
+          <td>Cache Type</td>
+          <td>
+            <P>The cache type is determined from the object header.
+            It also determines the format for the scratch-pad space:
+            <br>
+            <table class=list>
+                <tr align=left>
+                    <th>Type:</th>
+                    <th>Description:</th>
+                </tr>
+                <tr>
+                    <td width="10%" align=center>0</td>
+                    <td>No data is cached by the group entry.  This
+                        is guaranteed to be the case when an object header
+                        has a link count greater than one.
+                    </td>
+                </tr>
+                <tr>
+                    <td align=center>1</td>
+                    <td>Object header metadata is cached in the group
+                        entry.  This implies that the group
+                        entry refers to another group.
+                    </td>
+                </tr>
+                <tr>
+                    <td align=center>2</td>
+                    <td>The entry is a symbolic link.  The first four bytes
+                        of the scratch-pad space are the offset into the local
+                        heap for the link value.  The object header address
+                        will be undefined.
+                    </td>
+                </tr>
+                <tr>
+                    <td align=center><em>N</em></td>
+                    <td>Other cache values can be defined later and
+                        libraries that do not understand the new values will
+                        still work properly.
+                    </td>
+                </tr>
+            </table>
+            </P>
+          </td>
+        </tr>
+
+        <tr>
+          <td>Reserved</td>
+          <td>
+            <P>These four bytes are present so that the scratch-pad
+            space is aligned on an eight-byte boundary.  They are
+            always set to zero.
+            </P>
+          </td>
+        </tr>
+
+        <tr>
+          <td>Scratch-pad Space</td>
+          <td>
+            <P>This space is used for different purposes, depending
+            on the value of the Cache Type field. Any metadata
+            about a dataset object represented in the scratch-pad
+            space is duplicated in the object header for that
+            dataset.  This metadata can include the datatype
+            and the size of the dataspace for a dataset whose datatype
+            is atomic and whose dataspace is fixed and less than
+            four dimensions.
+            </P>
+            <P>
+            Furthermore, no data is cached in the group
+            entry scratch-pad space if the object header for
+            the group entry has a link count greater than
+            one.
+            </P>
+          </td>
+        </tr>
+      </table>
+    </div>
+
+    <h4>Format of the Scratch-pad Space</h4>
+
+    <p>The group entry scratch-pad space is formatted
+      according to the value in the Cache Type field.
+
+    <p>If the Cache Type field contains the value zero
+      <code>(0)</code> then no information is
+      stored in the scratch-pad space.
+
+    <p>If the Cache Type field contains the value one
+      <code>(1)</code>, then the scratch-pad space
+      contains cached metadata for another object header
+      in the following format:
+
+    <br>
+    <div align=center>
+      <table class=format>
+        <caption>
+          Object Header Scratch-pad Format
+        </caption>
+
+        <tr>
+          <th>byte</th>
+          <th>byte</th>
+          <th>byte</th>
+          <th>byte</th>
+
+        <tr>
+          <td colspan=4>Address of B-tree<sup>O</sup></td>
+
+        <tr>
+          <td colspan=4>Address of Name Heap<sup>O</sup></td>
+      </table>
+
+      <table class=note>
+        <tr><td>
+            (Items marked with an 'O' the above table are
+            <br>
+            of the size specified in "Size of Offsets.")
+        </td></tr>
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=desc>
+	<tr>
+          <th width="30%">Field Name</th>
+          <th>Description</th>
+        </tr>
+
+        <tr>
+          <td>Address of B-tree</td>
+          <td>
+            <P>This is the file address for the root of the
+            group's B-tree.
+            </P>
+          </td>
+        </tr>
+
+        <tr>
+          <td>Address of Name Heap</td>
+          <td>
+            <P>This is the file address for the group's local
+            heap, in which are stored the group's symbol names.
+            </P>
+          </td>
+        </tr>
+      </table>
+    </div>
+
+
+    <P>If the Cache Type field contains the value two
+      <code>(2)</code>, then the scratch-pad space
+      contains cached metadata for another symbolic link
+      in the following format:
+
+    <br>
+    <div align=center>
+      <table class=format>
+        <caption>
+          Symbolic Link Scratch-pad Format
+        </caption>
+
+        <tr>
+          <th>byte</th>
+          <th>byte</th>
+          <th>byte</th>
+          <th>byte</th>
+        </tr>
+
+        <tr>
+          <td colspan=4>Offset to Link Value</td>
+        </tr>
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=desc>
+	<tr>
+          <th width="30%">Field Name</th>
+          <th>Description</th>
+        </tr>
+
+        <tr>
+          <td>Offset to Link Value</td>
+          <td>
+            <P>The value of a symbolic link (that is, the name of the
+            thing to which it points) is stored in the local heap.
+            This field is the 4-byte offset into the local heap for
+            the start of the link value, which is null terminated.
+            </P>
+          </td>
+        </tr>
+      </table>
+    </div>
+
+    <h3><a name="LocalHeap">Disk Format: Level 1D - Local Heaps</a></h3>
+
+    <P>A heap is a collection of small heap objects.  Objects can be
+      inserted and removed from the heap at any time.
+      The address of a heap does not change once the heap is created.
+      References to objects are stored in the group table;
+      the names of those objects are stored in the local heap.
+    </P>
+
+    <br>
+    <div align=center>
+      <table class=format>
+        <caption>
+          Local Heap
+        </caption>
+
+        <tr>
+          <th>byte</th>
+          <th>byte</th>
+          <th>byte</th>
+          <th>byte</th>
+        </tr>
+
+        <tr>
+          <td colspan=4>Signature</td>
+        </tr>
+
+        <tr>
+          <td>Version</td>
+          <td colspan=3>Reserved (zero)</td>
+        </tr>
+
+        <tr>
+          <td colspan=4>Data Segment Size<sup>L</sup></td>
+        </tr>
+
+        <tr>
+          <td colspan=4>Offset to Head of Free-list<sup>L</sup></td>
+        </tr>
+
+        <tr>
+          <td colspan=4>Address of Data Segment<sup>O</sup></td>
+        </tr>
+      </table>
+
+      <table class=note>
+        <tr><td>
+            (Items marked with an 'L' the above table are
+            <br>
+            of the size specified in "Size of Lengths.")
+        </td></tr>
+        <tr><td>
+            (Items marked with an 'O' the above table are
+            <br>
+            of the size specified in "Size of Offsets.")
+        </td></tr>
+      </table>
+    </div>
+
+    <p>
+    <center>
+      <table class=desc>
+	<tr>
+          <th width="30%">Field Name</th>
+          <th>Description</th>
+        </tr>
+
+        <tr>
+          <td>Signature</td>
+          <td>
+            <P>The ASCII character string "<code>HEAP</code>"
+            is used to indicate the
+            beginning of a heap.  This gives file consistency
+            checking utilities a better chance of reconstructing a
+            damaged file.
+            </P>
+          </td>
+        </tr>
+
+        <tr>
+          <td>Version</td>
+          <td>
+            <P>Each local heap has its own version number so that new
+            heaps can be added to old files.  This document
+            describes version zero (0) of the local heap.
+            </P>
+          </td>
+        </tr>
+
+        <tr>
+          <td>Data Segment Size</td>
+          <td>
+            <P>The total amount of disk memory allocated for the heap
+            data.  This may be larger than the amount of space
+            required by the objects stored in the heap.  The extra
+            unused space in the heap holds a linked list of free blocks.
+            </P>
+          </td>
+        </tr>
+
+        <tr>
+          <td>Offset to Head of Free-list</td>
+          <td>
+            <P>This is the offset within the heap data segment of the
+            first free block (or the
+            <A href="#UndefinedAddress">undefined address</A> if there is no
+            free block).  The free block contains "Size of Lengths" bytes that
+            are the offset of the next free block (or the
+            value '1' if this is the
+            last free block) followed by "Size of Lengths" bytes that store
+            the size of this free block.  The size of the free block includes
+            the space used to store the offset of the next free block and
+            the of the current block, making the minimum size of a free block
+            2 * "Size of Lengths".
+            </P>
+          </td>
+        </tr>
+
+        <tr>
+          <td>Address of Data Segment</td>
+          <td>
+            <P>The data segment originally starts immediately after
+            the heap header, but if the data segment must grow as a
+            result of adding more objects, then the data segment may
+            be relocated, in its entirety, to another part of the
+            file.
+            </P>
+          </td>
+        </tr>
+      </table>
+    </center>
+
+    <p>Objects within the heap should be aligned on an 8-byte boundary.
+
+    <h3><a name="GlobalHeap">Disk Format: Level 1E - Global Heap</a></h3>
+
+    <P>Each HDF5 file has a global heap which stores various types of
+      information which is typically shared between datasets.  The
+      global heap was designed to satisfy these goals:
+
+    <ol type="A">
+      <li>Repeated access to a heap object must be efficient without
+        resulting in repeated file I/O requests. Since global heap
+        objects will typically be shared among several datasets, it is
+        probable that the object will be accessed repeatedly.
+      <li>Collections of related global heap objects should result in
+        fewer and larger I/O requests.  For instance, a dataset of
+        object references will have a global heap object for each
+        reference.  Reading the entire set of object references
+        should result in a few large I/O requests instead of one small
+        I/O request for each reference.
+      <li>It should be possible to remove objects from the global heap
+        and the resulting file hole should be eligible to be reclaimed
+        for other uses.
+    </ol>
+    </P>
+
+    <P>The implementation of the heap makes use of the memory
+      management already available at the file level and combines that
+      with a new top-level object called a <em>collection</em> to
+      achieve Goal B. The global heap is the set of all collections.
+      Each global heap object belongs to exactly one collection and
+      each collection contains one or more global heap objects. For
+      the purposes of disk I/O and caching, a collection is treated as
+      an atomic object.
+    </P>
+
+    <P>The HDF5 library creates global heap collections as needed, so there may
+        be multiple collections throughout the file. The set of all of them is
+        abstractly called the "global heap", although they don't actually link
+        to each other, and there is no global place in the file where you can
+        discover all of the collections.  The collections are found simply by
+        finding a reference to one through another object in the file (eg.
+        variable-length datatype elements, etc).
+    </P>
+
+    <br>
+    <div align=center>
+      <table class=format>
+        <caption>
+          A Global Heap Collection
+        </caption>
+
+        <tr>
+          <th>byte</th>
+          <th>byte</th>
+          <th>byte</th>
+          <th>byte</th>
+        </tr>
+
+        <tr>
+          <td colspan=4>Signature</td>
+        </tr>
+
+        <tr>
+          <td>Version</td>
+          <td colspan=3>Reserved (zero)</td>
+        </tr>
+
+        <tr>
+          <td colspan=4>Collection Size<sup>L</sup></td>
+        </tr>
+
+        <tr>
+          <td colspan=4><br>Global Heap Object 1<br><br></td>
+        </tr>
+
+        <tr>
+          <td colspan=4><br>Global Heap Object 2<br><br></td>
+        </tr>
+
+        <tr>
+          <td colspan=4><br>...<br><br></td>
+        </tr>
+
+        <tr>
+          <td colspan=4><br>Global Heap Object <em>N</em><br><br></td>
+        </tr>
+
+        <tr>
+          <td colspan=4><br>Global Heap Object 0 (free space)<br><br></td>
+        </tr>
+      </table>
+
+      <table class=note>
+        <tr><td>
+            (Items marked with an 'L' the above table are
+            <br>
+            of the size specified in "Size of Lengths.")
+        </td></tr>
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=desc>
+	<tr>
+          <th width="30%">Field Name</th>
+          <th>Description</th>
+        </tr>
+
+        <tr>
+          <td>Signature</td>
+          <td>
+            <P>The ASCII character string "<code>GCOL</code>"
+            is used to indicate the
+            beginning of a collection.  This gives file consistency
+            checking utilities a better chance of reconstructing a
+            damaged file.
+            </P>
+          </td>
+        </tr>
+
+        <tr>
+          <td>Version</td>
+          <td>
+            <P>Each collection has its own version number so that new
+            collections can be added to old files.  This document
+            describes version one (1) of the collections (there is no
+            version zero (0)).
+            </P>
+          </td>
+        </tr>
+
+        <tr>
+          <td>Collection Size</td>
+          <td>
+            <P>This is the size in bytes of the entire collection
+            including this field.  The default (and minimum)
+            collection size is 4096 bytes which is a typical file
+            system block size.  This allows for 127 16-byte heap
+            objects plus their overhead (the collection header of 16 bytes
+            and the 16 bytes of information about each heap object).
+            </P>
+          </td>
+        </tr>
+
+        <tr>
+          <td>Global Heap Object 1 through <em>N</em></td>
+          <td>
+            <P>The objects are stored in any order with no
+            intervening unused space.
+            </P>
+          </td>
+        </tr>
+
+        <tr>
+          <td>Global Heap Object 0</td>
+          <td>
+            <P>Global Heap Object 0 (zero), when present, represents the free
+            space in the collection.  Free space always appears at the end of
+            the collection.  If the free space is too small to store the header
+            for Object 0 (described below) then the header is implied and the
+            collection contains no free space.
+            </P>
+          </td>
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=format>
+        <caption>
+          Global Heap Object
+        </caption>
+
+        <tr>
+          <th>byte</th>
+          <th>byte</th>
+          <th>byte</th>
+          <th>byte</th>
+        </tr>
+
+        <tr>
+          <td colspan=2>Heap Object ID</td>
+          <td colspan=2>Reference Count</td>
+        </tr>
+
+        <tr>
+          <td colspan=4>Reserved</td>
+        </tr>
+
+        <tr>
+          <td colspan=4>Object Size<sup>L</sup></td>
+        </tr>
+
+        <tr>
+          <td colspan=4><br>Object Data<br><br></td>
+        </tr>
+      </table>
+
+      <table class=note>
+        <tr><td>
+            (Items marked with an 'L' the above table are
+            <br>
+            of the size specified in "Size of Lengths.")
+        </td></tr>
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=desc>
+	<tr>
+          <th width="30%">Field Name</th>
+          <th>Description</th>
+        </tr>
+
+        <tr>
+          <td>Heap Object ID</td>
+          <td>
+            <P>Each object has a unique identification number within a
+            collection.  The identification numbers are chosen so that
+            new objects have the smallest value possible with the
+            exception that the identifier <code>0</code> always refers to the
+            object which represents all free space within the
+            collection.
+            </P>
+          </td>
+        </tr>
+
+        <tr>
+          <td>Reference Count</td>
+          <td>
+            <P>All heap objects have a reference count field.  An
+            object which is referenced from some other part of the
+            file will have a positive reference count. The reference
+            count for Object 0 is always zero.
+            </P>
+          </td>
+        </tr>
+
+        <tr>
+          <td>Reserved</td>
+          <td>
+            <P>Zero padding to align next field on an 8-byte boundary.
+            </P>
+          </td>
+        </tr>
+
+        <tr>
+          <td>Object Size</td>
+          <td>
+            <P>This is the size of the object data stored for the object.
+            The actual storage space allocated for the object data is rounded
+            up to a multiple of eight.
+            </P>
+          </td>
+        </tr>
+
+        <tr>
+          <td>Object Data</td>
+          <td>
+            <P>The object data is treated as a one-dimensional array
+            of bytes to be interpreted by the caller.
+            </P>
+          </td>
+        </tr>
+      </table>
+    </div>
+
+    <h3><a name="FreeSpaceIndex">Disk Format: Level 1F - Free-space Index</a></h3>
+
+    <p>The free-space index is a collection of blocks of data,
+      dispersed throughout the file, which are currently not used by
+      any file objects.
+
+    <p>The super block contains a pointer to root of the free-space description;
+      that pointer is currently required to be the
+      <A href="#UndefinedAddress">undefined address</A>.
+
+    <p>The format of the free-space index is not defined at this time.
+
+<!--
+    <p>The Free-space Index is a collection of blocks of data,
+      dispersed throughout the file, which are currently not used by
+      any file objects.  The blocks of data are indexed by a B-tree of
+      their length within the file.
+
+
+    <p>Each B-tree page is composed of the following entries and
+      B-tree management information, organized as follows:
+
+    <p>
+    <center>
+      <table border cellpadding=4 width="80%">
+        <caption align=bottom>
+          <B>HDF5 Free-space Heap Page</B>
+        </caption>
+
+        <tr align=center>
+          <th width="25%">byte</th>
+          <th width="25%">byte</th>
+          <th width="25%">byte</th>
+          <th width="25%">byte</th>
+
+        <tr align=center>
+          <td colspan=4>Signature</td>
+        <tr align=center>
+          <td colspan=4>B-tree Left-link Offset</td>
+        <tr align=center>
+          <td colspan=4><br>Length of Free-block #1<br> <br></td>
+        <tr align=center>
+          <td colspan=4><br>Offset of Free-block #1<br> <br></td>
+        <tr align=center>
+          <td colspan=4>.<br>.<br>.<br></td>
+        <tr align=center>
+          <td colspan=4><br>Length of Free-block #n<br> <br></td>
+        <tr align=center>
+          <td colspan=4><br>Offset of Free-block #n<br> <br></td>
+        <tr align=center>
+          <td colspan=4>"High" Offset</td>
+        <tr align=center>
+          <td colspan=4>Right-link Offset</td>
+      </table>
+    </center>
+
+    <p>
+    <dl>
+      <dt> The elements of the free-space heap page are described below:
+      <dd>
+        <dl>
+          <dt>Signature: (4 bytes)
+          <dd>The ASCII character string <code>FREE</code>
+            is used to indicate the
+            beginning of a free-space heap B-tree page.  This gives
+            file consistency checking utilities a better chance of
+            reconstructing a damaged file.
+
+          <dt>B-tree Left-link Offset: (&lt;offset&gt; bytes)
+          <dd>This value is used to indicate the offset of all offsets
+            in the B-link-tree which are smaller than the value of the
+            offset in entry #1.  This value is also used to indicate a
+            leaf node in the B-link-tree by being set to all ones.
+
+          <dt>Length of Free-block #n: (&lt;length&gt; bytes)
+          <dd>This value indicates the length of an unused block in
+            the file.
+
+          <dt>Offset of Free-block #n: (&lt;offset&gt; bytes)
+          <dd>This value indicates the offset in the file of an
+            unused block in the file.
+
+          <dt>"High" Offset: (4-bytes)
+          <dd>This offset is used as the upper bound on offsets
+            contained within a page when the page has been split.
+
+          <dt>Right-link Offset: (&lt;offset&gt; bytes)
+          <dd>This value is used to indicate the offset of the next
+            child to the right of the parent of this group
+            page.  When there is no node to the right, this value is
+            all zeros.
+        </dl>
+    </dl>
+
+    <p>The algorithms for searching and inserting objects in the
+      B-tree pages are described fully in the Lehman and Yao paper,
+      which should be read to provide a full description of the
+      B-tree's usage.
+-->
+
+    <BR>
+    <HR>
+
+    <h2><a name="DataObject">Disk Format: Level 2 - Data Objects </a></h2>
+
+    <P>Data objects contain the real information in the file.  These
+      objects compose the scientific data and other information which
+      are generally thought of as "data" by the end-user.  All the
+      other information in the file is provided as a framework for
+      these data objects.
+    </P>
+
+    <P>A data object is composed of header information and data
+      information.  The header information contains the information
+      needed to interpret the data information for the data object as
+      well as additional "metadata" or pointers to additional
+      "metadata" used to describe or annotate each data object.
+    </P>
+
+    <h3><a name="ObjectHeader">
+	Disk Format: Level 2A - Data Object Headers</a></h3>
+
+    <P>The header information of an object is designed to encompass
+      all the information about an object, except for the data itself.
+      This information includes
+      the dataspace, datatype, information about how the data
+      is stored on disk (in external files, compressed, broken up in
+      blocks, etc.), as well as other information used by the library
+      to speed up access to the data objects or maintain a file's
+      integrity.  Information stored by user applications as attributes
+      is also stored in the object's header.  The header of each object is
+      not necessarily located immediately prior to the object's data in the
+      file and in fact may be located in any position in the file.  The order
+      of the messages in an object header is not significant.
+    </P>
+
+    <P>Header messages are aligned on 8-byte boundaries.
+    </P>
+
+    <br>
+    <div align=center>
+      <table class=format>
+	<caption>
+	  Object Headers
+	</caption>
+
+	<tr>
+	  <th>byte</th>
+	  <th>byte</th>
+	  <th>byte</th>
+	  <th>byte</th>
+	</tr>
+
+	<tr>
+	  <td>Version</td>
+	  <td>Reserved (zero)</td>
+	  <td colspan=2>Number of Header Messages</td>
+	</tr>
+
+	<tr>
+	  <td colspan=4>Object Reference Count</td>
+	</tr>
+
+	<tr>
+	  <td colspan=4>Object Header Size</td>
+	</tr>
+
+	<tr>
+	  <td colspan=2>Header Message Type #1</td>
+	  <td colspan=2>Size of Header Message Data #1</td>
+	</tr>
+
+	<tr>
+	  <td>Header Message #1 Flags</td>
+	  <td colspan=3>Reserved (zero)</td>
+	</tr>
+
+	<tr>
+	  <td colspan=4><br>Header Message Data #1<br><br></td>
+	</tr>
+
+	<tr>
+	  <td colspan=4>.<br>.<br>.<br></td>
+	</tr>
+
+	<tr>
+	  <td colspan=2>Header Message Type #n</td>
+	  <td colspan=2>Size of Header Message Data #n</td>
+	</tr>
+
+	<tr>
+	  <td>Header Message #n Flags</td>
+	  <td colspan=3>Reserved (zero)</td>
+	</tr>
+
+	<tr>
+	  <td colspan=4><br>Header Message Data #n<br><br></td>
+	</tr>
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=desc>
+	<tr>
+          <th width="30%">Field Name</th>
+          <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td>Version</td>
+	  <td>
+            <P>This value is used to determine the format of the
+	    information in the object header.  When the format of the
+	    information in the object header is changed, the version number
+	    is incremented and can be used to determine how the
+	    information in the object header is formatted.  This
+            document describes version one (1) (there was no version
+            zero (0)).
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Number of Header Messages</td>
+	  <td>
+            <P>This value determines the number of messages listed in
+	    object headers for this object.  This value includes the messages
+            in continuation messages for this object.
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Object Reference Count</td>
+	  <td>
+            <P>This value specifies the number of "hard links" to this object
+            within the current file.  References to the object from external
+            files, "soft links" in this file and object references in this
+            file are not tracked.
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Object Header Size</td>
+	  <td>
+            <P>This value specifies the number of bytes of header message data
+            following this length field that contain object header messages
+            for this object header.  This value does not include the size of
+            object header continuation blocks for this object elsewhere in the
+            file.
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Header Message Type</td>
+	  <td>
+            <P>This value specifies the type of information included in the
+            following header message data.  The header message types for the
+            pre-defined header messages are included in sections below.
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Size of Header Message Data</td>
+	  <td>
+            <P>This value specifies the number of bytes of header
+	    message data following the header message type and length
+	    information for the current message. The size includes
+	    padding bytes to make the message a multiple of eight
+	    bytes.
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Header Message Flags</td>
+	  <td>
+            <P>This is a bit field with the following definition:
+            <table class=list>
+                <tr>
+                  <th width="30%">Bit</th>
+                  <th align=left>Description</th>
+                </tr>
+
+                <tr>
+                  <td align=center><code>0</code></td>
+                  <td>If set, the message data is constant.  This is used
+                    for messages like the datatype message of a dataset.
+                  </td>
+                </tr>
+                <tr>
+                  <td align=center><code>1</code></td>
+                  <td>If set, the message is stored in the global heap.
+                    The Header Message Data field contains a Shared Object
+                    message and the Size of Header Message Data field
+                    contains the size of that Shared Object message.
+                  </td>
+                </tr>
+                <tr>
+                  <td align=center><code>2-7</code></td>
+                  <td>Reserved</td>
+                </tr>
+	    </table>
+            </P>
+          </td>
+        </tr>
+
+	<tr>
+	  <td>Header Message Data</td>
+	  <td>
+            <P>The format and length of this field is determined by the
+	    header message type and size respectively.  Some header
+	    message types do not require any data and this information
+	    can be eliminated by setting the length of the message to
+	    zero. The data is padded with enough zeros to make the
+	    size a multiple of eight.
+            </P>
+          </td>
+	</tr>
+      </table>
+    </div>
+
+    <P>The header message types and the message data associated with
+      them compose the critical "metadata" about each object.  Some
+      header messages are required for each object while others are
+      optional.  Some optional header messages may also be repeated
+      several times in the header itself, the requirements and number
+      of times allowed in the header will be noted in each header
+      message description below.
+    </P>
+
+    <P>The following is a list of currently defined header messages:
+    </P>
+
+    <hr>
+    <h4><a name="NILMessage">Name: NIL</a></h4>
+
+    <P class=item><B>Header Message Type: </B>0x0000
+    </P>
+    <P class=item><B>Length:</B> varies
+    </P>
+    <P class=item><B>Status:</B> Optional, may be repeated.
+    </P>
+    <P class=item><B>Purpose and Description:</B> The NIL message is used to indicate a
+        message which is to be ignored when reading the header messages for a
+        data object.  [Possibly one which has been deleted for some reason.]
+    </P>
+    <P class=item><B>Format of Data:</B> Unspecified.
+    </P>
+
+    <hr>
+    <h4><a name="SimpleDataSpace">Name: Simple Dataspace</a></h4>
+
+    <P class=item><B>Header Message Type: </B>0x0001
+    </P>
+    <P class=item><B>Length:</B> Varies according to the number of dimensions,
+      as described in the following table.
+    </P>
+    <P class=item><B>Status:</B> Required for dataset objects, may not be
+        repeated.
+    </P>
+    <P class=item><B>Description:</B> The simple dataspace message describes the
+        number of dimensions (i.e. "rank") and size of each dimension that the
+        data object has.  This message is only used for datasets which have a
+        simple, rectilinear grid layout; datasets requiring a more complex
+        layout (irregularly structured or unstructured grids, etc.) must use
+        the <em>Complex Dataspace</em> message for expressing the space the
+        dataset inhabits.  <i>(Note: The <em>Complex Dataspace</em>
+        functionality is not yet implemented and it is not described in this
+        document.)</i>
+    </P>
+
+    <P class=item><B>Format of Data:</B>
+    <br>
+    <div align=center>
+      <table class=format>
+	<caption>
+	  Simple Dataspace Message
+	</caption>
+
+	<tr>
+	  <th>byte</th>
+	  <th>byte</th>
+	  <th>byte</th>
+	  <th>byte</th>
+	</tr>
+
+	<tr>
+	  <td>Version</td>
+	  <td>Dimensionality</td>
+	  <td>Flags</td>
+	  <td>Reserved</td>
+	</tr>
+
+	<tr>
+	  <td colspan=4>Reserved</td>
+	</tr>
+
+	<tr>
+	  <td colspan=4>Dimension #1 Size<sup>L</sup></td>
+	<tr>
+	  <td colspan=4>.<br>.<br>.<br></td>
+	<tr>
+	  <td colspan=4>Dimension #n Size<sup>L</sup></td>
+	<tr>
+	  <td colspan=4>Dimension #1 Maximum Size<sup>L</sup></td>
+	<tr>
+	  <td colspan=4>.<br>.<br>.<br></td>
+	<tr>
+	  <td colspan=4>Dimension #n Maximum Size<sup>L</sup></td>
+	<tr>
+	  <td colspan=4>Permutation Index #1<sup>L</sup></td>
+	<tr>
+	  <td colspan=4>.<br>.<br>.<br></td>
+	<tr>
+	  <td colspan=4>Permutation Index #n<sup>L</sup></td>
+      </table>
+
+      <table class=note>
+        <tr><td>
+            (Items marked with an 'L' the above table are
+            <br>
+            of the size specified in "Size of Lengths.")
+        </td></tr>
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=desc>
+	<tr>
+          <th width="30%">Field Name</th>
+          <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td>Version</td>
+	  <td>
+            <P>This value is used to determine the format of the
+	    Simple Dataspace Message.  When the format of the
+	    information in the message is changed, the version number
+	    is incremented and can be used to determine how the
+	    information in the object header is formatted.  This
+            document describes version one (1) (there was no version
+            zero (0)).
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Dimensionality</td>
+	  <td>
+            <P>This value is the number of dimensions that the data
+	    object has.
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Flags</td>
+	  <td>
+            <P>This field is used to store flags to indicate the
+	    presence of parts of this message.  Bit 0 (the least
+	    significant bit) is used to indicate that maximum
+	    dimensions are present.  Bit 1 is used to indicate that
+	    permutation indices are present.
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Dimension #n Size</td>
+	  <td>
+            <P>This value is the current size of the dimension of the
+	    data as stored in the file.  The first dimension stored in
+	    the list of dimensions is the slowest changing dimension
+	    and the last dimension stored is the fastest changing
+	    dimension.
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Dimension #n Maximum Size</td>
+	  <td>
+            <P>This value is the maximum size of the dimension of the
+	    data as stored in the file.  This value may be the special
+            "<A href="#UnlimitedDim">unlimited</A>" size which indicates
+	    that the data may expand along this dimension indefinitely.
+            If these values are not stored, the maximum size of each
+            dimension is assumed to be the dimension's current size.
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Permutation Index #n</td>
+	  <td>
+            <P>This value is the index permutation used to map
+	    each dimension from the canonical representation to an
+	    alternate axis for each dimension.  If these values are
+	    not stored, the first dimension stored in the list of
+	    dimensions is the slowest changing dimension and the last
+	    dimension stored is the fastest changing dimension.
+            </P>
+          </td>
+	</tr>
+      </table>
+    </div>
+
+    </P>
+
+<!--
+    <hr>
+    <h4><a name="DataSpaceMessage">Name: Complex Dataspace (Fiber Bundle?)</a></h4>
+    <b>Header Message Type: </b>0x0002<br>
+    <b>Length:</b> varies<br>
+
+    <b>Status:</b> One of the <em>Simple Dataspace</em> or
+    <em>Complex Dataspace</em> messages is required (but not both) and may
+    not be repeated.<br> <b>Purpose and Description:</b> The
+    <em>Dataspace</em> message describes space that the dataset is
+    mapped onto in a more comprehensive way than the <em>Simple
+    Dimensionality</em> message is capable of handling.  The
+    dataspace of a dataset encompasses the type of coordinate system
+    used to locate the dataset's elements as well as the structure and
+    regularity of the coordinate system.  The dataspace also
+    describes the number of dimensions which the dataset inhabits as
+    well as a possible higher dimensional space in which the dataset
+    is located within.
+
+    <br>
+    <b>Format of Data:</b>
+
+    <center>
+      <table border cellpadding=4 width="80%">
+	<caption align=bottom>
+	  <B>HDF5 Dataspace Message Layout</B>
+	</caption>
+
+	<tr align=center>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+
+	<tr align=center>
+	  <td colspan=4>Mesh Type</td>
+	<tr align=center>
+	  <td colspan=4>Logical Dimensionality</td>
+      </table>
+    </center>
+
+    <p>
+    <dl>
+      <dt>The elements of the dimensionality message are described below:
+      <dd>
+	<dl>
+	  <dt>Mesh Type: (unsigned 32-bit integer)
+	  <dd>This value indicates whether the grid is
+	    polar/spherical/cartesion,
+	    structured/unstructured and regular/irregular. <br>
+	    The mesh type value is broken up as follows: <br>
+
+	    <P>
+	    <center>
+	      <table border cellpadding=4 width="80%">
+		<caption align=bottom>
+		  <B>HDF5 Mesh-type Layout</B>
+		</caption>
+
+		<tr align=center>
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+
+		<tr align=center>
+		  <td colspan=1>Mesh Embedding</td>
+		  <td colspan=1>Coordinate System</td>
+		  <td colspan=1>Structure</td>
+		  <td colspan=1>Regularity</td>
+	      </table>
+	    </center>
+	    The following are the definitions of mesh-type bytes:
+	    <dl>
+	      <dt>Mesh Embedding
+	      <dd>This value indicates whether the dataset dataspace
+		is located within
+		another dataspace or not:
+		<dl> <dl>
+		    <dt>&lt;STANDALONE&gt;
+		    <dd>The dataset mesh is self-contained and is not
+		      embedded in another mesh.
+		    <dt>&lt;EMBEDDED&gt;
+		    <dd>The dataset's dataspace is located within
+		      another dataspace, as
+		      described in information below.
+		  </dl> </dl>
+	      <dt>Coordinate System
+	      <dd>This value defines the type of coordinate system
+		used for the mesh:
+		<dl> <dl>
+		    <dt>&lt;POLAR&gt;
+		    <dd>The last two dimensions are in polar
+		      coordinates, higher dimensions are
+		      cartesian.
+		    <dt>&lt;SPHERICAL&gt;
+		    <dd>The last three dimensions are in spherical
+		      coordinates, higher dimensions
+		      are cartesian.
+		    <dt>&lt;CARTESIAN&gt;
+		    <dd>All dimensions are in cartesian coordinates.
+		  </dl> </dl>
+	      <dt>Structure
+	      <dd>This value defines the locations of the grid-points
+		on the axes:
+		<dl> <dl>
+		    <dt>&lt;STRUCTURED&gt;
+		    <dd>All grid-points are on integral, sequential
+		      locations, starting from 0.
+		    <dt>&lt;UNSTRUCTURED&gt;
+		    <dd>Grid-points locations in each dimension are
+		      explicitly defined and
+		      may be of any numeric datatype.
+		  </dl> </dl>
+	      <dt>Regularity
+	      <dd>This value defines the locations of the dataset
+		points on the grid:
+		<dl> <dl>
+		    <dt>&lt;REGULAR&gt;
+		    <dd>All dataset elements are located at the
+		      grid-points defined.
+		    <dt>&lt;IRREGULAR&gt;
+		    <dd>Each dataset element has a particular
+		      grid-location defined.
+		  </dl> </dl>
+	    </dl>
+	    <p>The following grid combinations are currently allowed:
+	    <dl> <dl>
+		<dt>&lt;POLAR-STRUCTURED-REGULAR&gt;
+		<dt>&lt;SPHERICAL-STRUCTURED-REGULAR&gt;
+		<dt>&lt;CARTESIAN-STRUCTURED-REGULAR&gt;
+		<dt>&lt;POLAR-UNSTRUCTURED-REGULAR&gt;
+		<dt>&lt;SPHERICAL-UNSTRUCTURED-REGULAR&gt;
+		<dt>&lt;CARTESIAN-UNSTRUCTURED-REGULAR&gt;
+		<dt>&lt;CARTESIAN-UNSTRUCTURED-IRREGULAR&gt;
+	      </dl> </dl>
+	    All of the above grid types can be embedded within another
+	    dataspace.
+	    <br> <br>
+	  <dt>Logical Dimensionality: (unsigned 32-bit integer)
+	  <dd>This value is the number of dimensions that the dataset occupies.
+
+	    <P>
+	    <center>
+	      <table border cellpadding=4 width="80%">
+		<caption align=bottom>
+		  <B>HDF5 Dataspace Embedded Dimensionality Information</B>
+		</caption>
+
+		<tr align=center>
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+		  <th width="25%">byte</th>
+
+		<tr align=center>
+		  <td colspan=4>Embedded Dimensionality</td>
+		<tr align=center>
+		  <td colspan=4>Embedded Dimension Size #1</td>
+		<tr align=center>
+		  <td colspan=4>.<br>.<br>.<br></td>
+		<tr align=center>
+		  <td colspan=4>Embedded Dimension Size #n</td>
+		<tr align=center>
+		  <td colspan=4>Embedded Origin Location #1</td>
+		<tr align=center>
+		  <td colspan=4>.<br>.<br>.<br></td>
+		<tr align=center>
+		  <td colspan=4>Embedded Origin Location #n</td>
+	      </table>
+	    </center>
+
+	  <dt>Embedded Dimensionality: (unsigned 32-bit integer)
+	  <dd>This value is the number of dimensions of the space the
+	    dataset is located
+	    within.  i.e. a planar dataset located within a 3-D space,
+	    or a 3-D dataset
+	    which is a subset of another 3-D space, etc.
+	  <dt>Embedded Dimension Size: (unsigned 32-bit integer)
+	  <dd>These values are the sizes of the dimensions of the
+	    embedded dataspace
+	    that the dataset is located within.
+	  <dt>Embedded Origin Location: (unsigned 32-bit integer)
+	  <dd>These values comprise the location of the dataset's
+	    origin within the embedded dataspace.
+	</dl>
+    </dl>
+    [Comment: need some way to handle different orientations of the
+    dataset dataspace
+    within the embedded dataspace]<br>
+
+    <P>
+    <center>
+      <table border cellpadding=4 width="80%">
+	<caption align=bottom>
+	  <B>HDF5 Dataspace Structured/Regular Grid Information</B>
+	</caption>
+
+	<tr align=center>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+
+	<tr align=center>
+	  <td colspan=4>Logical Dimension Size #1</td>
+	<tr align=center>
+	  <td colspan=4>Logical Dimension Maximum #1</td>
+	<tr align=center>
+	  <td colspan=4>.<br>.<br>.<br></td>
+	<tr align=center>
+	  <td colspan=4>Logical Dimension Size #n</td>
+	<tr align=center>
+	  <td colspan=4>Logical Dimension Maximum #n</td>
+      </table>
+    </center>
+
+    <p>
+    <dl>
+      <dt>The elements of the dimensionality message are described below:
+      <dd>
+	<dl>
+	  <dt>Logical Dimension Size #n: (unsigned 32-bit integer)
+	  <dd>This value is the current size of the dimension of the
+	    data as stored in
+	    the file.  The first dimension stored in the list of
+	    dimensions is the slowest
+	    changing dimension and the last dimension stored is the
+	    fastest changing
+	    dimension.
+	  <dt>Logical Dimension Maximum #n: (unsigned 32-bit integer)
+	  <dd>This value is the maximum size of the dimension of the
+	    data as stored in
+	    the file.  This value may be the special value
+	    &lt;UNLIMITED&gt; which
+	    indicates that the data may expand along this dimension
+	    indefinitely.
+	</dl>
+    </dl>
+    <P>
+    <center>
+      <table border cellpadding=4 width="80%">
+	<caption align=bottom>
+	  <B>HDF5 Dataspace Structured/Irregular Grid Information</B>
+	</caption>
+
+	<tr align=center>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+
+	<tr align=center>
+	  <td colspan=4># of Grid Points in Dimension #1</td>
+	<tr align=center>
+	  <td colspan=4>.<br>.<br>.<br></td>
+	<tr align=center>
+	  <td colspan=4># of Grid Points in Dimension #n</td>
+	<tr align=center>
+	  <td colspan=4>Datatype of Grid Point Locations</td>
+	<tr align=center>
+	  <td colspan=4>Location of Grid Points in Dimension #1</td>
+	<tr align=center>
+	  <td colspan=4>.<br>.<br>.<br></td>
+	<tr align=center>
+	  <td colspan=4>Location of Grid Points in Dimension #n</td>
+      </table>
+    </center>
+
+    <P>
+    <center>
+      <table border cellpadding=4 width="80%">
+	<caption align=bottom>
+	  <B>HDF5 Dataspace Unstructured Grid Information</B>
+	</caption>
+
+	<tr align=center>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+
+	<tr align=center>
+	  <td colspan=4># of Grid Points</td>
+	<tr align=center>
+	  <td colspan=4>Datatype of Grid Point Locations</td>
+	<tr align=center>
+	  <td colspan=4>Grid Point Locations<br>.<br>.<br></td>
+      </table>
+    </center>
+-->
+
+    <hr>
+    <h4><a name="ReservedMessage_0002">Name: Reserved - Not Assigned Yet</a></h4>
+    <b>Header Message Type:</b> 0x0002<BR>
+    <b>Length:</b> N/A<BR>
+    <b>Status:</b> N/A<BR>
+    <b>Format of Data:</b> N/A<BR>
+
+    <p><b>Purpose and Description:</b> This message type was skipped during
+      the initial specification of the file format and may be used in a
+      future expansion to the format.
+
+
+    <hr>
+    <h4><a name="DataTypeMessage">Name: Datatype</a></h4>
+
+    <P class=item><B>Header Message Type:</B> 0x0003
+    </P>
+    <P class=item><B>Length:</B> variable
+    </P>
+    <P class=item><B>Status:</B> Required for dataset or named datatype objects,
+        may not be repeated.
+    </P>
+
+    <P class=item><B>Description:</B> The datatype message defines the datatype
+        for each element of a dataset.  A datatype can describe an atomic type
+        like a fixed- or floating-point type or a compound type like a C
+        struct.
+        Datatypes messages are stored
+        as a list of datatype classes and
+        their associated properties.
+    </P>
+
+    <P class=item2>Datatype messages that are part of a dataset object,
+        do not describe how elements are related to one another, the dataspace
+        message is used for that purpose.  Datatype messages that are part of
+        a named datatype message describe an "abstract" datatype that can be
+        used by other objects in the file.
+    </P>
+
+    <P class=item><B>Format of Data:</B>
+    <br>
+    <div align=center>
+      <table class=format>
+	<caption>
+	  Datatype Message
+	</caption>
+
+	<tr>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+	  <td>Class and Version</td>
+	  <td>Class Bit Field, Bits 0-7</td>
+	  <td>Class Bit Field, Bits 8-15</td>
+	  <td>Class Bit Field, Bits 16-23</td>
+	</tr>
+
+	<tr>
+	  <td colspan=4>Size</td>
+	</tr>
+
+	<tr>
+	  <td colspan=4><br><br>Properties<br><br><br></td>
+	</tr>
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=desc>
+	<tr>
+          <th width="30%">Field Name</th>
+          <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td>Class and Version</td>
+	  <td>
+            <P>The version of the datatype message and the datatype's class
+                information are packed together in this field.  The version
+                number is packed in the top 4 bits of the field and the class
+                is contained in the bottom 4 bits.
+            </P>
+            <P>The version number information is used for changes in the
+                format of the datatype message and is described here:
+                <table class=list>
+                    <tr>
+                      <th width="30%">Version</th>
+                      <th align=left>Description</th>
+                    </tr>
+
+                    <tr>
+                      <td align=center><code>0</code></td>
+                      <td>Never used
+                      </td>
+                    </tr>
+                    <tr>
+                      <td align=center><code>1</code></td>
+                      <td>Used by early versions of the library to encode
+                            compound datatypes with explicit array fields.
+                            See the compound datatype description below for
+                            further details.
+                      </td>
+                    </tr>
+                    <tr>
+                      <td align=center><code>2</code></td>
+                      <td>The current version used by the library.
+                      </td>
+                    </tr>
+                </table>
+            </P>
+            <P>The class of the datatype determines the format for the class
+                bit field and properties portion of the datatype message, which
+                are described below.  The
+                following classes are currently defined:
+                <table width=100% class=list>
+                    <tr>
+                      <th width="30%">Value</th>
+                      <th align=left>Description</th>
+                    </tr>
+
+                    <tr>
+                      <td align=center><code>0</code></td>
+                      <td>Fixed-Point</td>
+                    </tr>
+
+                    <tr>
+                      <td align=center><code>1</code></td>
+                      <td>Floating-Point</td>
+                    </tr>
+
+                    <tr>
+                      <td align=center><code>2</code></td>
+                      <td>Time</td>
+                    </tr>
+
+                    <tr>
+                      <td align=center><code>3</code></td>
+                      <td>String</td>
+                    </tr>
+
+                    <tr>
+                      <td align=center><code>4</code></td>
+                      <td>Bitfield</td>
+                    </tr>
+
+                    <tr>
+                      <td align=center><code>5</code></td>
+                      <td>Opaque</td>
+                    </tr>
+
+                    <tr>
+                      <td align=center><code>6</code></td>
+                      <td>Compound</td>
+                    </tr>
+
+                    <tr>
+                      <td align=center><code>7</code></td>
+                      <td>Reference</td>
+                    </tr>
+
+                    <tr>
+                      <td align=center><code>8</code></td>
+                      <td>Enumerated</td>
+                    </tr>
+
+                    <tr>
+                      <td align=center><code>9</code></td>
+                      <td>Variable-Length</td>
+                    </tr>
+
+                    <tr>
+                      <td align=center><code>10</code></td>
+                      <td>Array</td>
+                    </tr>
+                </table>
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Class Bit Fields</td>
+	  <td>
+            <P>The information in these bit fields is specific to each datatype
+                class and is described below.  All bits not defined for a
+                datatype class are set to zero.
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Size</td>
+	  <td>
+            <P>The size of the datatype in bytes.
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Properties</td>
+	  <td>
+            <P>This variable-sized field encodes information specific to each
+                datatype class and is described below.  If there is no
+                property information specified for a datatype class, the size
+                of this field is zero.
+            </P>
+          </td>
+	</tr>
+
+      </table>
+    </div>
+    </P>
+
+    <P>Class specific information for Fixed-Point Numbers (Class 0):
+
+    <br>
+    <div align=center>
+      <table class=desc>
+	<caption>
+	  Bit Field Description
+	</caption>
+
+	<tr>
+	  <th width="10%">Bits</th>
+	  <th>Meaning</th>
+	</tr>
+
+	<tr>
+	  <td>0</td>
+	  <td><b>Byte Order.</b> If zero, byte order is little-endian;
+	    otherwise, byte order is big endian.</td>
+	</tr>
+
+	<tr>
+	  <td>1, 2</td>
+	  <td><b>Padding type.</b>  Bit 1 is the lo_pad type and bit 2
+	    is the hi_pad type.  If a datum has unused bits at either
+	    end, then the lo_pad or hi_pad bit is copied to those
+	    locations.</td>
+	</tr>
+
+	<tr>
+	  <td>3</td>
+	  <td><b>Signed.</b> If this bit is set then the fixed-point
+	    number is in 2's complement form.</td>
+	</tr>
+
+	<tr>
+	  <td>4-23</td>
+	  <td>Reserved (zero).</td>
+	</tr>
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=format>
+	<caption>
+	  Property Descriptions
+	</caption>
+
+	<tr>
+	  <th width="25%">Byte</th>
+	  <th width="25%">Byte</th>
+	  <th width="25%">Byte</th>
+	  <th width="25%">Byte</th>
+	</tr>
+
+	<tr>
+	  <td colspan=2>Bit Offset</td>
+	  <td colspan=2>Bit Precision</td>
+	</tr>
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=desc>
+	<tr>
+          <th width="30%">Field Name</th>
+          <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td>Bit Offset</td>
+	  <td>
+            <P>The bit offset of the first significant bit of the fixed-point
+                value within the datatype.  The bit offset specifies the number
+                of bits "to the right of" the value.
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Bit Precision</td>
+	  <td>
+            <P>The number of bits of precision of the fixed-point value
+                within the datatype.
+            </P>
+          </td>
+	</tr>
+
+      </table>
+    </div>
+    </P>
+
+    <P>Class specific information for Floating-Point Numbers (Class 1):
+
+    <br>
+    <div align=center>
+      <table class=desc>
+	<caption>
+	  Bit Field Description
+	</caption>
+
+	<tr>
+	  <th width="10%">Bits</th>
+	  <th>Meaning</th>
+	</tr>
+
+	<tr>
+	  <td>0</td>
+	  <td><b>Byte Order.</b> If zero, byte order is little-endian;
+	    otherwise, byte order is big endian.</td>
+	</tr>
+
+	<tr>
+	  <td>1, 2, 3</td>
+	  <td><b>Padding type.</b>  Bit 1 is the low bits pad type, bit 2
+	    is the high bits pad type, and bit 3 is the internal bits
+	    pad type.  If a datum has unused bits at either end or between
+	    the sign bit, exponent, or mantissa, then the value of bit
+	    1, 2, or 3 is copied to those locations.</td>
+	</tr>
+
+	<tr>
+	  <td>4-5</td>
+	  <td><b>Normalization.</b> The value can be 0 if there is no
+	    normalization, 1 if the most significant bit of the
+	    mantissa is always set (except for 0.0), and 2 if the most
+	    significant bit of the mantissa is not stored but is
+	    implied to be set. The value 3 is reserved and will not
+	    appear in this field.</td>
+	</tr>
+
+	<tr>
+	  <td>6-7</td>
+	  <td>Reserved (zero).</td>
+	</tr>
+
+	<tr>
+	  <td>8-15</td>
+	  <td><b>Sign Location.</b> This is the bit position of the sign
+	    bit.  Bits are numbered with the least significant bit zero.</td>
+	</tr>
+
+	<tr>
+	  <td>16-23</td>
+	  <td>Reserved (zero).</td>
+	</tr>
+
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=format>
+	<caption>
+	  Property Descriptions
+	</caption>
+
+	<tr>
+	  <th width="25%">Byte</th>
+	  <th width="25%">Byte</th>
+	  <th width="25%">Byte</th>
+	  <th width="25%">Byte</th>
+	</tr>
+
+	<tr>
+	  <td colspan=2>Bit Offset</td>
+	  <td colspan=2>Bit Precision</td>
+	</tr>
+
+	<tr>
+	  <td>Exponent Location</td>
+	  <td>Exponent Size</td>
+	  <td>Mantissa Location</td>
+	  <td>Mantissa Size</td>
+	</tr>
+
+	<tr>
+	  <td colspan=4>Exponent Bias</td>
+	</tr>
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=desc>
+	<tr>
+          <th width="30%">Field Name</th>
+          <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td>Bit Offset</td>
+	  <td>
+            <P>The bit offset of the first significant bit of the floating-point
+                value within the datatype.  The bit offset specifies the number
+                of bits "to the right of" the value.
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Bit Precision</td>
+	  <td>
+            <P>The number of bits of precision of the floating-point value
+                within the datatype.
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Exponent Location</td>
+	  <td>
+            <P>The bit position of the exponent field.  Bits are numbered with
+                the least significant bit number zero.
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Exponent Size</td>
+	  <td>
+            <P>The size of the exponent field in bits.
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Mantissa Location</td>
+	  <td>
+            <P>The bit position of the mantissa field.  Bits are numbered with
+                the least significant bit number zero.
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Mantissa Size</td>
+	  <td>
+            <P>The size of the mantissa field in bits.
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Exponent Bias</td>
+	  <td>
+            <P>The bias of the exponent field.
+            </P>
+          </td>
+	</tr>
+
+      </table>
+    </div>
+    </P>
+
+    <P>Class specific information for Time (Class 2):
+
+    <br>
+    <div align=center>
+      <table class=desc>
+	<caption>
+	  Bit Field Description
+	</caption>
+
+	<tr>
+	  <th width="10%">Bits</th>
+	  <th>Meaning</th>
+	</tr>
+
+	<tr>
+	  <td>0</td>
+	  <td><b>Byte Order.</b> If zero, byte order is little-endian;
+	    otherwise, byte order is big endian.</td>
+	</tr>
+
+	<tr>
+	  <td>1-23</td>
+	  <td>Reserved (zero).</td>
+	</tr>
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=format>
+	<caption>
+	  Property Descriptions
+	</caption>
+
+	<tr>
+	  <th width="25%">Byte</th>
+	  <th width="25%">Byte</th>
+	</tr>
+
+	<tr>
+	  <td colspan=2>Bit Precision</td>
+	</tr>
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=desc>
+	<tr>
+          <th width="30%">Field Name</th>
+          <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td>Bit Precision</td>
+	  <td>
+            <P>The number of bits of precision of the time value.
+            </P>
+          </td>
+	</tr>
+
+      </table>
+    </div>
+    </P>
+
+    <P>Class specific information for Strings (Class 3):
+
+    <br>
+    <div align=center>
+      <table class=desc>
+	<caption>
+	  Bit Field Description
+	</caption>
+
+	<tr>
+	  <th width="10%">Bits</th>
+	  <th>Meaning</th>
+	</tr>
+
+	<tr>
+	  <td>0-3</td>
+	  <td><b>Padding type.</b>  This four-bit value determines the
+	    type of padding to use for the string.  The values are:
+
+            <table width=100% class=list>
+                <tr>
+                  <th width="30%">Value</th>
+                  <th align=left>Description</th>
+                </tr>
+
+                <tr>
+                  <td align=center><code>0</code></td>
+                  <td>Null Terminate: A zero byte marks the end of the
+                    string and is guaranteed to be present after
+                    converting a long string to a short string.  When
+                    converting a short string to a long string the value is
+                    padded with additional null characters as necessary.
+                  </td>
+                </tr>
+
+                <tr>
+                  <td align=center><code>1</code></td>
+                  <td>Null Pad: Null characters are added to the end of
+                    the value during conversions from short values to long
+                    values but conversion in the opposite direction simply
+                    truncates the value.
+                  </td>
+                </tr>
+
+                <tr>
+                  <td align=center><code>2</code></td>
+                  <td>Space Pad: Space characters are added to the end of
+                    the value during conversions from short values to long
+                    values but conversion in the opposite direction simply
+                    truncates the value.  This is the Fortran
+                    representation of the string.
+                  </td>
+                </tr>
+
+                <tr>
+                  <td align=center><code>3-15</code></td>
+                  <td>Reserved
+                  </td>
+                </tr>
+            </table>
+	</tr>
+
+	<tr>
+	  <td>4-7</td>
+	  <td><b>Character Set.</b>  The character set to use for
+	    encoding the string.  The only character set supported is
+	    the 8-bit ASCII (zero) so no translations have been defined
+	    yet.</td>
+	</tr>
+
+	<tr>
+	  <td>8-23</td>
+	  <td>Reserved (zero).</td>
+	</tr>
+      </table>
+    </div>
+
+    <P>There are no properties defined for the string class.
+    </P>
+    </P>
+
+    <P>Class specific information for Bitfields (Class 4):
+
+    <br>
+    <div align=center>
+      <table class=desc>
+	<caption>
+	  Bit Field Description
+	</caption>
+
+	<tr>
+	  <th width="10%">Bits</th>
+	  <th>Meaning</th>
+	</tr>
+
+	<tr>
+	  <td>0</td>
+	  <td><b>Byte Order.</b> If zero, byte order is little-endian;
+	    otherwise, byte order is big endian.</td>
+	</tr>
+
+	<tr>
+	  <td>1, 2</td>
+	  <td><b>Padding type.</b>  Bit 1 is the lo_pad type and bit 2
+	    is the hi_pad type.  If a datum has unused bits at either
+	    end, then the lo_pad or hi_pad bit is copied to those
+	    locations.</td>
+	</tr>
+
+	<tr>
+	  <td>3-23</td>
+	  <td>Reserved (zero).</td>
+	</tr>
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=format>
+	<caption>
+	  Property Description
+	</caption>
+
+	<tr>
+	  <th width="25%">Byte</th>
+	  <th width="25%">Byte</th>
+	  <th width="25%">Byte</th>
+	  <th width="25%">Byte</th>
+	</tr>
+
+	<tr>
+	  <td colspan=2>Bit Offset</td>
+	  <td colspan=2>Bit Precision</td>
+	</tr>
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=desc>
+	<tr>
+          <th width="30%">Field Name</th>
+          <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td>Bit Offset</td>
+	  <td>
+            <P>The bit offset of the first significant bit of the bitfield
+                within the datatype.  The bit offset specifies the number
+                of bits "to the right of" the value.
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Bit Precision</td>
+	  <td>
+            <P>The number of bits of precision of the bitfield
+                within the datatype.
+            </P>
+          </td>
+	</tr>
+      </table>
+    </div>
+    </P>
+
+    <P>Class specific information for Opaque (Class 5):
+
+    <br>
+    <div align=center>
+      <table class=desc>
+	<caption>
+	  Bit Field Description
+	</caption>
+
+	<tr>
+	  <th width="10%">Bits</th>
+	  <th>Meaning</th>
+	</tr>
+
+	<tr>
+	  <td>0-7</td>
+	  <td>Length of ASCII tag in bytes.</td>
+	</tr>
+
+	<tr>
+	  <td>8-23</td>
+	  <td>Reserved (zero).</td>
+	</tr>
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=format>
+	<caption>
+	  Property Description
+	</caption>
+
+	<tr>
+	  <th width="25%">Byte</th>
+	  <th width="25%">Byte</th>
+	  <th width="25%">Byte</th>
+	  <th width="25%">Byte</th>
+	</tr>
+
+	<tr>
+	  <td colspan=4><br>ASCII Tag<br>
+	    <br></td>
+	</tr>
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=desc>
+	<tr>
+          <th width="30%">Field Name</th>
+          <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td>ASCII Tag</td>
+	  <td>
+            <P>This NUL-terminated string provides a description for the
+                opaque type.  It is NUL-padded to a multiple of 8 bytes.
+            </P>
+          </td>
+	</tr>
+      </table>
+    </div>
+    </P>
+
+    <P>Class specific information for Compound (Class 6):
+
+    <br>
+    <div align=center>
+      <table class=desc>
+	<caption>
+	  Bit Field Description
+	</caption>
+
+	<tr>
+	  <th width="10%">Bits</th>
+	  <th>Meaning</th>
+	</tr>
+
+	<tr>
+	  <td>0-15</td>
+	  <td><b>Number of Members.</b> This field contains the number
+	    of members defined for the compound datatype.  The member
+	    definitions are listed in the Properties field of the data
+	    type message.
+	</tr>
+
+	<tr>
+	  <td>15-23</td>
+	  <td>Reserved (zero).</td>
+	</tr>
+      </table>
+    </div>
+    </P>
+
+    <P>The Properties field of a compound datatype is a list of the
+      member definitions of the compound datatype.  The member
+      definitions appear one after another with no intervening bytes.
+      The member types are described with a recursive datatype
+      message.
+
+    <P>Note that the property descriptions are different for different
+      versions of the datatype version.  Additionally note that the version
+      0 properties are deprecated and have been replaced with the version
+      1 properties in versions of the HDF5 library from the 1.4 release
+      onward.
+
+    <br>
+    <div align=center>
+      <table class=format>
+	<caption>
+	  Properties Description for Datatype Version 1
+	</caption>
+
+	<tr>
+	  <th width="25%">Byte</th>
+	  <th width="25%">Byte</th>
+	  <th width="25%">Byte</th>
+	  <th width="25%">Byte</th>
+	</tr>
+
+	<tr>
+	  <td colspan=4><br>Name<br><br></td>
+	</tr>
+
+	<tr>
+	  <td colspan=4>Byte Offset of Member</td>
+	</tr>
+
+	<tr>
+	  <td>Dimensionality</td>
+	  <td colspan=3>Reserved (zero)</td>
+	</tr>
+
+	<tr>
+	  <td colspan=4>Dimension Permutation</td>
+	</tr>
+
+	<tr>
+	  <td colspan=4>Reserved (zero)</td>
+	</tr>
+
+	<tr>
+	  <td colspan=4>Dimension #1 Size (required)</td>
+	</tr>
+
+	<tr>
+	  <td colspan=4>Dimension #2 Size (required)</td>
+	</tr>
+
+	<tr>
+	  <td colspan=4>Dimension #3 Size (required)</td>
+	</tr>
+
+	<tr>
+	  <td colspan=4>Dimension #4 Size (required)</td>
+	</tr>
+
+	<tr>
+	  <td colspan=4><br>Member Type Message<br><br></td>
+	</tr>
+
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=desc>
+	<tr>
+          <th width="30%">Field Name</th>
+          <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td>Name</td>
+	  <td>
+            <P>This NUL-terminated string provides a description for the
+                opaque type.  It is NUL-padded to a multiple of 8 bytes.
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Byte Offset of Member</td>
+	  <td>
+            <P>This is the byte offset of the member within the datatype.
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Dimensionality</td>
+	  <td>
+            <P>If set to zero, this field indicates a scalar member.  If set
+                to a value greater than zero, this field indicates that the
+                member is an array of values.  For array members, the size of
+                the array is indicated by the 'Size of Dimension n' field in
+                this message.
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Dimension Permutation</td>
+	  <td>
+            <P>This field was intended to allow an array field to have
+                it's dimensions permuted, but this was never implemented.
+                This field should always be set to zero.
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Dimension #n Size</td>
+	  <td>
+            <P>This field is the size of a dimension of the array field as
+            stored in the file.  The first dimension stored in the list of
+            dimensions is the slowest changing dimension and the last
+            dimension stored is the fastest changing dimension.
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Member Type Message</td>
+	  <td>
+            <P>This field is a datatype message describing the datatype of
+            the member.
+            </P>
+          </td>
+	</tr>
+
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=format>
+	<caption>
+	  Properties Description for Datatype Version 2
+	</caption>
+
+	<tr>
+	  <th width="25%">Byte</th>
+	  <th width="25%">Byte</th>
+	  <th width="25%">Byte</th>
+	  <th width="25%">Byte</th>
+	</tr>
+
+	<tr>
+	  <td colspan=4><br>Name<br><br></td>
+	</tr>
+
+	<tr>
+	  <td colspan=4>Byte Offset of Member</td>
+	</tr>
+
+	<tr>
+	  <td colspan=4><br>Member Type Message<br><br></td>
+	</tr>
+
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=desc>
+	<tr>
+          <th width="30%">Field Name</th>
+          <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td>Name</td>
+	  <td>
+            <P>This NUL-terminated string provides a description for the
+                opaque type.  It is NUL-padded to a multiple of 8 bytes.
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Byte Offset of Member</td>
+	  <td>
+            <P>This is the byte offset of the member within the datatype.
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Member Type Message</td>
+	  <td>
+            <P>This field is a datatype message describing the datatype of
+            the member.
+            </P>
+          </td>
+	</tr>
+
+      </table>
+    </div>
+    </P>
+
+    <P>Class specific information for Reference (Class 7):
+
+    <br>
+    <div align=center>
+      <table class=desc>
+	<caption>
+	  Bit Field Description
+	</caption>
+
+	<tr>
+	  <th width="10%">Bits</th>
+	  <th>Meaning</th>
+	</tr>
+
+	<tr>
+	  <td>0-3</td>
+	  <td><b>Type.</b> This four-bit value contains the type of reference
+            described.  The values defined are:
+
+            <table width=100% class=list>
+                <tr>
+                  <th width="30%">Value</th>
+                  <th align=left>Description</th>
+                </tr>
+
+                <tr>
+                  <td align=center><code>0</code></td>
+                  <td>Object Reference: A reference to another object in this
+                    HDF5 file.
+                  </td>
+                </tr>
+
+                <tr>
+                  <td align=center><code>1</code></td>
+                  <td>Dataset Region Reference: A reference to a region within
+                    a dataset in this HDF5 file.
+                  </td>
+                </tr>
+
+                <tr>
+                  <td align=center><code>2</code></td>
+                  <td>Internal Reference: A reference to a region within the
+                    current dataset.  (Not currently implemented)
+                  </td>
+                </tr>
+
+                <tr>
+                  <td align=center><code>3-15</code></td>
+                  <td>Reserved
+                  </td>
+                </tr>
+            </table>
+
+            </td>
+	</tr>
+
+	<tr>
+	  <td>15-23</td>
+	  <td>Reserved (zero).</td>
+	</tr>
+      </table>
+    </div>
+
+    <P>There are no properties defined for the reference class.
+    </P>
+    </P>
+
+    <P>Class specific information for Enumeration (Class 8):
+
+    <br>
+    <div align=center>
+      <table class=desc>
+	<caption>
+	  Bit Field Description
+	</caption>
+
+	<tr>
+	  <th width="10%">Bits</th>
+	  <th>Meaning</th>
+	</tr>
+
+	<tr>
+	  <td>0-15</td>
+	  <td><b>Number of Members.</b> The number of name/value
+	    pairs defined for the enumeration type.</td>
+	</tr>
+
+	<tr>
+	  <td>16-23</td>
+	  <td>Reserved (zero).</td>
+	</tr>
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=format>
+	<caption>
+	  Property Description
+	</caption>
+
+	<tr>
+	  <th width="25%">Byte</th>
+	  <th width="25%">Byte</th>
+	  <th width="25%">Byte</th>
+	  <th width="25%">Byte</th>
+	</tr>
+
+	<tr>
+	  <td colspan=4><br>Base Type<br><br></td>
+	</tr>
+
+	<tr>
+	  <td colspan=4><br>Names<br><br></td>
+	</tr>
+
+	<tr>
+	  <td colspan=4><br>Values<br><br></td>
+        </tr>
+
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=desc>
+	<tr>
+          <th width="30%">Field Name</th>
+          <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td>Base Type</td>
+	  <td>
+            <P>Each enumeration type is based on some parent type, usually an
+                integer. The information for that parent type is described
+                recursively by this field.
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Names</td>
+	  <td>
+            <P>The name for each name/value pair. Each name is stored as a null
+                terminated ASCII string in a multiple of eight bytes. The names
+                are in no particular order.
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Values</td>
+	  <td>
+            <P>The list of values in the same order as the names.  The values
+                are packed (no inter-value padding) and the size of each value
+                is determined by the parent type.
+            </P>
+          </td>
+	</tr>
+
+      </table>
+    </div>
+    </P>
+
+
+    <P>Class specific information for Variable-Length (Class 9):
+
+    <br>
+    <div align=center>
+      <table class=desc>
+	<caption>
+	  Bit Field Description
+	</caption>
+
+	<tr>
+	  <th width="10%">Bits</th>
+	  <th>Meaning</th>
+	</tr>
+
+	<tr>
+	  <td>0-3</td>
+	  <td><b>Type.</b> This four-bit value contains the type of
+            variable-length datatype described.  The values defined are:
+
+            <table width=100% class=list>
+                <tr>
+                  <th width="30%">Value</th>
+                  <th align=left>Description</th>
+                </tr>
+
+                <tr>
+                  <td align=center><code>0</code></td>
+                  <td>Sequence: A variable-length sequence of any sequence of
+                    data.  Variable-length sequences do not have padding or
+                    character set information.
+                  </td>
+                </tr>
+
+                <tr>
+                  <td align=center><code>1</code></td>
+                  <td>String: A variable-length sequence of characters.
+                    Variable-length strings have padding and character set
+                    information.
+                  </td>
+                </tr>
+
+                <tr>
+                  <td align=center><code>2-15</code></td>
+                  <td>Reserved
+                  </td>
+                </tr>
+            </table>
+
+            </td>
+	</tr>
+
+	<tr>
+	  <td>4-7</td>
+	  <td><b>Padding type.</b> (variable-length string only)
+                  This four-bit value determines the type of padding
+                  used for variable-length strings.  The values are the same
+                  as for the string padding type, as follows:
+            <table width=100% class=list>
+                <tr>
+                  <th width="30%">Value</th>
+                  <th align=left>Description</th>
+                </tr>
+
+                <tr>
+                  <td align=center><code>0</code></td>
+                  <td>Null terminate: A zero byte marks the end of a string
+                    and is guaranteed to be present after converting a long
+                    string to a short string.  When converting a short string
+                    to a long string, the value is padded with additional null
+                    characters as necessary.
+                  </td>
+                </tr>
+
+                <tr>
+                  <td align=center><code>1</code></td>
+                  <td>Null pad: Null characters are added to the end of the
+                    value during conversion from a short string to a longer
+                    string.  Conversion from a long string to a shorter string
+                    simply truncates the value.
+                  </td>
+                </tr>
+
+                <tr>
+                  <td align=center><code>2</code></td>
+                  <td>Space pad: Space characters are added to the end of the
+                    value during conversion from a short string to a longer
+                    string.  Conversion from a long string to a shorter string
+                    simply truncates the value.  This is the Fortran
+                    representation of the string.
+                  </td>
+                </tr>
+
+                <tr>
+                  <td align=center><code>3-15</code></td>
+                  <td>Reserved
+                  </td>
+                </tr>
+            </table>
+
+            This value is set to zero for variable-length sequences.
+
+          </td>
+	</tr>
+
+	<tr>
+	  <td>8-11</td>
+	  <td><b>Character Set.</b> (variable-length string only)
+                  This four-bit value specifies the character set
+                  to be used for encoding the string:
+            <table width=100% class=list>
+                <tr>
+                  <th width="30%">Value</th>
+                  <th align=left>Description</th>
+                </tr>
+
+                <tr>
+                  <td align=center><code>0</code></td>
+                  <td>ASCII: As of this writing (July 2003, Release 1.6.0),
+                    8-bit ASCII is the only character set supported.  Therefore,
+                    no translations have been defined.
+                  </td>
+                </tr>
+
+                <tr>
+                  <td align=center><code>1-15</code></td>
+                  <td>Reserved
+                  </td>
+                </tr>
+            </table>
+
+            This value is set to zero for variable-length sequences.
+
+          </td>
+	</tr>
+
+	<tr>
+	  <td>12-23</td>
+	  <td>Reserved (zero).</td>
+	</tr>
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=format>
+        <caption>
+          Property Description
+        </caption>
+
+        <tr>
+          <th width="25%">Byte</th>
+          <th width="25%">Byte</th>
+          <th width="25%">Byte</th>
+          <th width="25%">Byte</th>
+        </tr>
+
+        <tr>
+          <td colspan=4><br>Base Type<br><br></td>
+        </tr>
+
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=desc>
+	<tr>
+          <th width="30%">Field Name</th>
+          <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td>Base Type</td>
+	  <td>
+            <P>Each variable-length type is based on some parent type.  The
+                information for that parent type is described recursively by
+                this field.
+            </P>
+          </td>
+	</tr>
+
+      </table>
+    </div>
+    </P>
+
+    <P>Class specific information for Array (Class 10):
+
+    <P>There are no bit fields defined for the array class.
+    </P>
+
+    <P>Note that the dimension information defined in the property for this
+      datatype class is independent of dataspace information for a dataset.
+      The dimension information here describes the dimensionality of the
+      information within a data element (or a component of an element, if the
+      array datatype is nested within another datatype) and the dataspace for a
+      dataset describes the location of the elements in a dataset.
+    </P>
+
+    <br>
+    <div align=center>
+      <table class=format>
+        <caption>
+          Property Description
+        </caption>
+
+        <tr>
+          <th width="25%">Byte</th>
+          <th width="25%">Byte</th>
+          <th width="25%">Byte</th>
+          <th width="25%">Byte</th>
+        </tr>
+
+	<tr>
+	  <td>Dimensionality</td>
+	  <td colspan=3>Reserved (zero)</td>
+	</tr>
+
+	<tr>
+	  <td colspan=4>Dimension #1 Size</td>
+	</tr>
+	<tr>
+	  <td colspan=4>.<br>.<br>.<br></td>
+	</tr>
+	<tr>
+	  <td colspan=4>Dimension #n Size</td>
+	</tr>
+
+	<tr>
+	  <td colspan=4>Permutation Index #1</td>
+	</tr>
+	<tr>
+	  <td colspan=4>.<br>.<br>.<br></td>
+	</tr>
+	<tr>
+	  <td colspan=4>Permutation Index #n</td>
+	</tr>
+
+        <tr>
+          <td colspan=4><br>Base Type<br><br></td>
+        </tr>
+
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=desc>
+	<tr>
+          <th width="30%">Field Name</th>
+          <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td>Dimensionality</td>
+	  <td>
+            <P>This value is the number of dimensions that the array has.
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Dimension #n Size</td>
+	  <td>
+            <P>This value is the size of the dimension of the array
+	    as stored in the file.  The first dimension stored in
+	    the list of dimensions is the slowest changing dimension
+	    and the last dimension stored is the fastest changing
+	    dimension.
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Permutation Index #n</td>
+	  <td>
+            <P>This value is the index permutation used to map
+	    each dimension from the canonical representation to an
+	    alternate axis for each dimension.  Currently, dimension
+            permutations are not supported and these indices should be set
+            to the index position minus one (i.e. the first dimension should
+            be set to 0, the second dimension should be set to 1, etc.)
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Base Type</td>
+	  <td>
+            <P>Each array type is based on some parent type.  The
+                information for that parent type is described recursively by
+                this field.
+            </P>
+          </td>
+	</tr>
+
+      </table>
+    </div>
+
+    </P>
+
+    <hr>
+    <h4><a name="OldFillValueMessage">Name: Data Storage - Fill Value (Old)</a></h4>
+
+    <P class=item><B>Header Message Type:</B> 0x0004
+    </P>
+    <P class=item><B>Length:</B> varies
+    </P>
+    <P class=item><B>Status:</B> Optional, may not be repeated.
+    </P>
+
+    <P class=item><B>Description:</B> The fill value message stores a single
+        data value which is returned to the application when an uninitialized
+        data element is read from a dataset.  The fill value is interpreted
+        with the same datatype as the dataset.  If no fill value message is
+        present then a fill value of all zero bytes is assumed.
+    </P>
+
+    <P class=item2>This fill value message is deprecated in favor of the "new"
+        fill value message (Message Type 0x0005) and is only written to the
+        file for forward compatibility with versions of the HDF5 library before
+        the 1.6.0 version.  Additionally, it only appears for datasets with a
+        user defined fill value (as opposed to the library default fill value
+        or an explicitly set "undefined" fill value).
+    </P>
+
+    <P class=item><B>Format of Data:</B>
+    <br>
+    <div align=center>
+      <table class=format>
+	<caption>
+	  Fill Value Message (Old)
+	</caption>
+
+	<tr>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+	  <td colspan=4>Size</td>
+	</tr>
+
+	<tr>
+	  <td colspan=4><br>Fill Value<br><br></td>
+	</tr>
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=desc>
+	<tr>
+          <th width="30%">Field Name</th>
+          <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td>Size</td>
+	  <td>
+            <P>This is the size of the Fill Value field in bytes.
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Fill Value</td>
+	  <td>
+            <P>The fill value.  The bytes of the fill value are interpreted
+                using the same datatype as for the dataset.
+            </P>
+          </td>
+	</tr>
+      </table>
+    </div>
+    </P>
+
+    <hr>
+    <h4><a name="FillValueMessage">Name: Data Storage - Fill Value </a></h4>
+
+    <P class=item><B>Header Message Type:</B> 0x0005
+    </P>
+    <P class=item><B>Length:</B> varies
+    </P>
+    <P class=item><B>Status:</B> Required for dataset objects, may not be repeated.
+    </P>
+
+    <P class=item><B>Description:</B> The fill value message stores a single
+        data value which is returned to the application when an uninitialized
+        data element is read from a dataset.  The fill value is interpreted
+        with the same datatype as the dataset.
+    </P>
+
+    <P class=item><B>Format of Data:</B>
+    <br>
+    <div align=center>
+      <table class=format>
+	<caption>
+	  Fill Value Message
+	</caption>
+
+	<tr>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+	  <td>Version</td>
+	  <td>Space Allocation Time</td>
+	  <td>Fill Value Write Time</td>
+	  <td>Fill Value Defined</td>
+	</tr>
+
+	<tr>
+	  <td colspan=4>Size</td>
+	</tr>
+
+	<tr>
+	  <td colspan=4><br>Fill Value<br><br></td>
+	</tr>
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=desc>
+	<tr>
+          <th width="30%">Field Name</th>
+          <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td>Version</td>
+	  <td>
+            <P>The version number information is used for changes in the
+                format of the fill value message and is described here:
+                <table class=list>
+                    <tr>
+                      <th width="30%">Version</th>
+                      <th align=left>Description</th>
+                    </tr>
+
+                    <tr>
+                      <td align=center><code>0</code></td>
+                      <td>Never used
+                      </td>
+                    </tr>
+                    <tr>
+                      <td align=center><code>1</code></td>
+                      <td>Used by version 1.6.x of the library to encode
+                            fill values.  In this version, the Size field is
+                            always present.
+                      </td>
+                    </tr>
+                    <tr>
+                      <td align=center><code>2</code></td>
+                      <td>The current version used by the library (version
+                        1.7.3 or later).  In this version, the Size and
+                        Fill Value fields are
+                        only present if the Fill Value Defined field is set
+                        to 1.
+                      </td>
+                    </tr>
+                </table>
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Space Allocation Time</td>
+	  <td>
+            <P>When the storage space for the dataset's raw data will be
+                allocated.  The allowed values are:
+                <table class=list>
+                    <tr>
+                      <th width="30%">Value</th>
+                      <th align=left>Description</th>
+                    </tr>
+
+                    <tr>
+                      <td align=center><code>1</code></td>
+                      <td>Early allocation.  Storage space for the entire dataset
+                        should be allocated in the file when the dataset is
+                        created.
+                      </td>
+                    </tr>
+                    <tr>
+                      <td align=center><code>2</code></td>
+                      <td>Late allocation.  Storage space for the entire dataset
+                        should not be allocated until the dataset is written
+                        to.
+                      </td>
+                    </tr>
+                    <tr>
+                      <td align=center><code>3</code></td>
+                      <td>Incremental allocation.  Storage space for the
+                        dataset should not be allocated until the portion
+                        of the dataset is written to.  This is currently
+                        used in conjunction with chunked data storage for
+                        datasets.
+                      </td>
+                    </tr>
+                </table>
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Fill Value Write Time</td>
+	  <td>
+            <P>At the time that storage space for the dataset's raw data is
+                allocated, this value indicates whether the fill value should
+                be written to the raw data storage elements.  The allowed values
+                are:
+                <table class=list>
+                    <tr>
+                      <th width="30%">Value</th>
+                      <th align=left>Description</th>
+                    </tr>
+
+                    <tr>
+                      <td align=center><code>0</code></td>
+                      <td>On allocation.  The fill value is always written to
+                        the raw data storage when the storage space is allocated.
+                      </td>
+                    </tr>
+                    <tr>
+                      <td align=center><code>1</code></td>
+                      <td>Never.  The fill value should never be written to
+                        the raw data storage.
+                      </td>
+                    </tr>
+                    <tr>
+                      <td align=center><code>2</code></td>
+                      <td>Fill value written if set by user.  The fill value
+                        will be written to the raw data storage when the storage
+                        space is allocated only if the user explicitly set
+                        the fill value.  If the fill value is the library
+                        default or is undefined, it will not be written to
+                        the raw data storage.
+                      </td>
+                    </tr>
+                </table>
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Fill Value Defined</td>
+	  <td>
+            <P>This value indicates if a fill value is defined for this
+                dataset.  If this value is 0, the fill value is undefined.
+                If this value is 1, a fill value is defined for this dataset.
+                For version 2 or later of the fill value message, this value
+                controls the presence of the Size field.
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Size</td>
+	  <td>
+            <P>This is the size of the Fill Value field in bytes.  This field
+                is not present if the Version field is >1 and the Fill Value
+                Defined field is set to 0.
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Fill Value</td>
+	  <td>
+            <P>The fill value.  The bytes of the fill value are interpreted
+                using the same datatype as for the dataset.  This field is
+                not present if the Version field is >1 and the Fill Value
+                Defined field is set to 0.
+            </P>
+          </td>
+	</tr>
+      </table>
+    </div>
+    </P>
+
+<!--
+    <hr>
+    <h4><a name="CompactDataStorageMessage">Name: Data Storage - Compact</a></h4>
+
+    <b>Header Message Type:</b> 0x0006<br>
+    <b>Length:</b> varies<br>
+    <b>Status:</b> Optional, may not be repeated.<br>
+
+    <p>This message indicates that the data for the data object is
+      stored within the current HDF file by including the actual
+      data as the header data for this message.  The data is
+      stored internally in
+      the <em>normal format</em>, i.e. in one chunk, uncompressed, etc.
+
+    <P>Note that one and only one of the <em>Data Storage</em> headers can be
+      stored for each data object.
+
+    <P><b>Format of Data:</b>  The message data is actually composed
+      of dataset data, so the format will be determined by the dataset
+      format.
+-->
+
+    <hr>
+    <h4><a name="ReservedMessage_0006">Name: Reserved - Not Assigned Yet</a></h4>
+    <P class=item><B>Header Message Type:</B> 0x0006</P>
+    <P class=item><B>Length:</B> N/A</P>
+    <P class=item><B>Status:</B> N/A</P>
+    <P class=item><B>Format of Data:</B> N/A</P>
+
+    <P class=item><B>Purpose and Description:</B> This message type was skipped during
+      the initial specification of the file format and may be used in a
+      future expansion to the format.</P>
+
+    <hr>
+    <h4><a name="ExternalFileListMessage">Name: Data Storage -
+	External Data Files</a></h4>
+    <P class=item><B>Header Message Type:</B> 0x0007 </P>
+    <P class=item><B>Length:</B> varies</P>
+    <P class=item><B>Status:</B> Optional, may not be repeated.</P>
+
+    <P class=item><B>Purpose and Description:</B> The external object message
+      indicates that the data for an object is stored outside the HDF5
+      file.  The filename of the object is stored as a Universal
+      Resource Location (URL) of the actual filename containing the
+      data. An external file list record also contains the byte offset
+      of the start of the data within the file and the amount of space
+      reserved in the file for that data.</P>
+
+    <P class=item><B>Format of Data:</B>
+    <br>
+    <div align=center>
+      <table class=format>
+	<caption>
+	  External File List Message
+	</caption>
+
+	<tr>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+	  <td>Version</td>
+	  <td colspan=3>Reserved</td>
+	</tr>
+
+	<tr>
+	  <td colspan=2>Allocated Slots</td>
+	  <td colspan=2>Used Slots</td>
+	</tr>
+
+	<tr>
+	  <td colspan=4><br>Heap Address<br><br></td>
+	</tr>
+
+	<tr>
+	  <td colspan=4><br>Slot Definitions...<br><br></td>
+	</tr>
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+	<table class=desc>
+	  <tr>
+	    <th width="30%">Field Name</th>
+	    <th>Description</th>
+	  </tr>
+
+	  <tr>
+	    <td>Version</td>
+	    <td>
+	      <P>The version number information is used for changes in the format of External File
+ 		 List Message and is described here:
+		 <table class=list>
+		     <tr>
+			<th width="30%">Version</th>
+			<th align=left>Description</th>
+		     </tr>
+		     <tr>
+			<td align=center><code>0</code></td>
+			<td>Never used.
+		     </tr>
+		     <tr>
+			<td align=center><code>1</code></td>
+			<td>The current version used by the library.
+		     </tr>
+		  </table>
+	      </P>
+	    </td>
+	  </tr>
+
+	  <tr>
+	    <td>Reserved</td>
+	    <td>
+	      <P>This field is reserved for future use.</P>
+	    </td>
+	  </tr>
+
+	  <tr>
+	    <td>Allocated Slots</td>
+	    <td>
+	      <P>The total number of slots allocated in the message.  Its value must be at least as
+		 large as the value contained in the Used Slots field. (The current library simply
+		 uses the number of Used Slots for this message)</P>
+	    </td>
+	  </tr>
+
+	  <tr>
+	    <td>Used Slots</td>
+	    <td>
+	      <P>The number of initial slots which contains valid information.</P>
+	    </td>
+	  </tr>
+
+	  <tr>
+	    <td>Heap Address</td>
+	    <td>
+	      <P>This is the address of a local heap which contains the names for the external
+		 files (The local heap information can be found in Disk Format Level 1D in this
+		 document).  The name at offset zero in the heap is always the empty string.</P>
+	    </td>
+	  </tr>
+
+	  <tr>
+	    <td>Slot Definitions</td>
+	    <td>
+	      <P>The slot definitions are stored in order according to the array addresses they
+		 represent.</P>
+	    </td>
+	  </tr>
+
+	</table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=format>
+	<caption>
+	  External File List Slot
+	</caption>
+
+	<tr>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+	  <td colspan=4><br>Name Offset(&lt;size&gt; bytes)<br><br></td>
+	</tr>
+
+	<tr>
+	  <td colspan=4><br>File Offset(&lt;size&gt; bytes)<br><br></td>
+	</tr>
+
+	<tr>
+	  <td colspan=4><br>Size<br><br></td>
+	</tr>
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+	<table class=desc>
+	  <tr>
+	    <th width="30%">Field Name</th>
+	    <th>Description</th>
+	  </tr>
+
+	  <tr>
+	    <td>Name Offset(&lt;size&gt; bytes)</td>
+	    <td>
+		<P>The byte offset within the local name heap for the name
+	    	of the file.  File names are stored as a URL which has a
+	    	protocol name, a host name, a port number, and a file
+	    	name:
+		<code><em>protocol</em>:<em>port</em>//<em>host</em>/<em>file</em></code>.
+		If the protocol is omitted then "file:" is assumed.  If
+		the port number is omitted then a default port for that
+		protocol is used.  If both the protocol and the port
+		number are omitted then the colon can also be omitted. If
+		the double slash and host name are omitted then
+		"localhost" is assumed.  The file name is the only
+		mandatory part, and if the leading slash is missing then
+		it is relative to the application's current working
+		directory (the use of relative names is not
+		recommended).</P>
+	    </td>
+	  </tr>
+
+	  <tr>
+	    <td>File Offset(&lt;size&gt; bytes)</td>
+	    <td>
+	  	<P>This is the byte offset to the start of the data in the
+	        specified file. For files that contain data for a single
+	        dataset this will usually be zero.</P>
+	    </td>
+	  </tr>
+
+	  <tr>
+	    <td>Size</td>
+	    <td>
+		<P>This is the total number of bytes reserved in the
+		specified file for raw data storage.  For a file that
+		contains exactly one complete dataset which is not
+		extendable, the size will usually be the exact size of the
+		dataset.  However, by making the size larger one allows
+		HDF5 to extend the dataset. The size can be set to a value
+		larger than the entire file since HDF5 will read zeros
+		past the end of the file without failing.</P>
+	    </td>
+	  </tr>
+	</table>
+    </div>
+
+
+    <hr>
+    <h4><a name="LayoutMessage">Name: Data Storage - Layout</a></h4>
+
+    <P class=item><B>Header Message Type:</B> 0x0008</P>
+    <P class=item><B>Length:</B> varies</P>
+    <P class=item><B>Status:</B> Required for datasets, may not be repeated.</P>
+
+    <P class=item><B>Purpose and Description:</B> Data layout describes how the
+      elements of a multi-dimensional array are arranged in the linear
+      address space of the file. Three types of data layout are
+      supported:
+
+    <ol>
+      <li>Contiguous: The array can be stored in one contiguous area of the file.
+	The layout requires that the size of the array be constant and
+	does not permit chunking, compression, checksums, encryption,
+	etc.  The message stores the total size of the array and the
+	offset of an element from the beginning of the storage area is
+	computed as in C.
+
+      <li>Chunked: The array domain can be regularly decomposed into chunks and
+	each chunk is allocated separately.  This layout supports
+	arbitrary element traversals, compression, encryption, and
+	checksums, and the chunks can be distributed across external
+	raw data files (these features are described in other
+	messages).  The message stores the size of a chunk instead of
+	the size of the entire array; the size of the entire array can
+	be calculated by traversing the B-tree that stores the chunk
+	addresses.
+
+      <li>Compact: The array can be stored in one contiguous block, as part of
+        this object header message (this is called "compact" storage below).
+    </ol>
+
+    <P class=item><B>Format of Data:</B>
+    <br>
+    <div align=center>
+      <table class=format>
+	<caption>
+	  Data Layout Message (Versions 1 and 2)
+	</caption>
+
+	<tr>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+	  <td>Version</td>
+	  <td>Dimensionality</td>
+	  <td>Layout Class</td>
+	  <td>Reserved</td>
+	</tr>
+
+	<tr>
+	  <td colspan=4>Reserved</td>
+	</tr>
+
+	<tr>
+	  <td colspan=4><br>Address<br><br></td>
+	</tr>
+
+	<tr>
+	  <td colspan=4>Dimension 0 (4-bytes)</td>
+	</tr>
+
+	<tr>
+	  <td colspan=4>Dimension 1 (4-bytes)</td>
+	</tr>
+
+	<tr>
+	  <td colspan=4>...</td>
+	</tr>
+
+	<tr>
+	  <td colspan=4>Dataset Element Size <em>(optional)</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan=4>Compact Data Size (4-bytes)</td>
+	</tr>
+
+	<tr>
+	  <td colspan=4><br>Compact Data...<br><br></td>
+	</tr>
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=desc>
+	<tr>
+	  <th width="30%">Field Name</th>
+	  <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td>Version</td>
+	  <td>
+	    <P>The version number information is used for changes in the format of the data
+	    layout message and is described here:</P>
+	      <table class=list>
+		<tr>
+		  <th width="30%">Version</th>
+		  <th align=left>Description</th>
+		</tr>
+
+		<tr>
+		  <td align=center><code>0</code></td>
+		  <td>Never used.</td>
+		</tr>
+
+		<tr>
+		  <td align=center><code>1</code></td>
+		  <td>Used by version 1.4 and before of the library to encode layout information.
+		      Data space is always allocated when the data set is created.</td>
+		</tr>
+
+		<tr>
+		  <td align=center><code>2</code></td>
+		  <td>Used by version 1.6.x of the library to encode layout information.
+		      Data space is allocated only when it is necessary.</td>
+		</tr>
+	      </table>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td>Dimensionality</td>
+	  <td><P>An array has a fixed dimensionality.  This field
+	    specifies the number of dimension size fields later in the
+	    message.</P></td>
+	</tr>
+
+	<tr>
+	  <td>Layout Class</td>
+	  <td><P>The layout class specifies how the other fields of the
+	    layout message are to be interpreted.  A value of one
+	    indicates contiguous storage, a value of two indicates chunked storage,
+	    while a value of zero indicates compact storage.  Other values will be defined
+	    in the future.</P></td>
+	</tr>
+
+	<tr>
+	  <td>Address</td>
+	  <td><P>For contiguous storage, this is the address of the first
+	    byte of storage.  For chunked storage this is the address
+	    of the B-tree that is used to look up the addresses of the
+	    chunks.  This field is not present for compact storage.
+            If the version for this message is set to 2, the address
+            may have the "undefined address" value, to indicate that
+            storage has not yet been allocated for this array.</P></td>
+	</tr>
+
+	<tr>
+	  <td>Dimensions</td>
+	  <td><P>For contiguous and compact storage the dimensions define
+            the entire size of the array while for chunked storage they define
+            the size of a single chunk.  In all cases, they are in units of
+            array elements (not bytes).  The first dimension stored in the list
+            of dimensions is the slowest changing dimension and the last
+            dimension stored is the fastest changing dimension.
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Dataset Element Size</td>
+	  <td><P>The size of a dataset element, in bytes.  This field is only
+            present for chunked storage.
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Compact Data Size</td>
+	  <td><P>This field is only present for compact data storage.
+            It contains the size of the raw data for the dataset array.</P></td>
+
+	<tr>
+	  <td>Compact Data</td>
+	  <td><P>This field is only present for compact data storage.
+            It contains the raw data for the dataset array.</P></td>
+	</tr>
+      </table>
+    </div>
+
+    <br>
+    <P>Version 3 of this message re-structured the format into specific
+        properties that are required for each layout class.
+
+    <br>
+    <div align=center>
+      <table class=format>
+	<caption>
+	  <B>Data Layout Message (Version 3)</B>
+	</caption>
+
+	<tr>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+	  <td>Version</td>
+	  <td>Layout Class</td>
+	  <td colspan=2 bgcolor=#DDDDDD>&nbsp;</td>
+	</tr>
+
+	<tr>
+	  <td colspan=4><br>Properties<br><br></td>
+	</tr>
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=desc>
+	<tr>
+	  <th width="30%">Field Name</th>
+	  <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td>Version</td>
+	  <td>
+	    <P>The version number information is used for changes in the format of layout message
+	       and is described here:</P>
+	      <table class=list>
+		<tr>
+		  <th width="30%">Version</th>
+		  <th align=left>Description</th>
+		</tr>
+
+		<tr>
+		  <td align=center><code>3</code></td>
+		  <td>Used by the version 1.6.3 and later of the library to store properties
+		      for each layout class.</td>
+		</tr>
+	      </table>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td>Layout Class</td>
+	  <td><P>The layout class specifies how the other fields of the layout message are to be
+	      interpreted.  A value of one indicates contiguous storage, a value of two
+	      indicates chunked storage, while a value of zero indicates compact storage.</P></td>
+	</tr>
+
+	<tr>
+	  <td>Properties</td>
+	  <td><P>This variable-sized field encodes information specific to each
+            layout class and is described below.  If there is no property
+            information specified for a layout class, the size of this field
+            is zero bytes.</P></td>
+	</tr>
+      </table>
+    </div>
+
+    <br>
+    <P>Class-specific information for compact layout (Class 0):  (Note: The dimensionality information
+       is in the Dataspace message)
+
+    <br>
+    <div align=center>
+      <table class=format>
+	<caption>
+	  Property Descriptions
+	</caption>
+
+	<tr>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+	  <td colspan=2>Size</td>
+	  <td colspan=2 bgcolor=#DDDDDD>&nbsp;</td>
+	</tr>
+
+	<tr>
+	  <td colspan=4><br>Raw Data...<br><br></td>
+	</tr>
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=desc>
+	<tr>
+          <th width="30%">Field Name</th>
+          <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td>Size</td>
+	  <td><P>This field contains the size of the raw data for the dataset array.</P></td>
+	</tr>
+
+	<tr>
+	  <td>Raw Data</td>
+	  <td><P>This field contains the raw data for the dataset array.</P></td>
+	</tr>
+      </table>
+    </div>
+
+    <br>
+    <P>Class-specific information for contiguous layout (Class 1):  (Note: The dimensionality information
+       is in the Dataspace message)
+
+    <br>
+    <div align=center>
+      <table class=format>
+	<caption>
+	  Property Descriptions
+	</caption>
+
+	<tr>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+	  <td colspan=4><br>Address<br><br></td>
+	</tr>
+
+	<tr>
+	  <td colspan=4><br>Size<br><br></td>
+	</tr>
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=desc>
+	<tr>
+          <th width="30%">Field Name</th>
+          <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td>Address</td>
+	  <td><P>This is the address of the first byte of raw data storage.
+            The address may have the "undefined address" value, to indicate
+            that storage has not yet been allocated for this array.</P></td>
+	</tr>
+
+	<tr>
+	  <td>Size</td>
+	  <td><P>This field contains the size allocated to store the raw data.</P></td>
+	</tr>
+      </table>
+    </div>
+
+    <br>
+    <P>Class-specific information for chunked layout (Class 2):
+
+    <br>
+    <div align=center>
+      <table class=format>
+	<caption>
+	  Property Descriptions
+	</caption>
+
+	<tr>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+	  <td>Dimensionality</td>
+	  <td colspan=3 bgcolor=#DDDDDD>&nbsp;</td>
+	</tr>
+
+	<tr>
+	  <td colspan=4><br>Address<br><br></td>
+	</tr>
+
+	<tr>
+	  <td colspan=4>Dimension 0 (4-bytes)</td>
+	</tr>
+
+	<tr>
+	  <td colspan=4>Dimension 1 (4-bytes)</td>
+	</tr>
+
+	<tr>
+	  <td colspan=4>...</td>
+	</tr>
+
+	<tr>
+	  <td colspan=4>Dataset Element Size</td>
+	</tr>
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=desc>
+	<tr>
+          <th width="30%">Field Name</th>
+          <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td>Dimensionality</td>
+	  <td><P>A chunk has a fixed dimensionality.  This field specifies
+	    the number of dimension size fields later in the message.</P></td>
+	</tr>
+
+	<tr>
+	  <td>Address</td>
+	  <td><P>This is the address of the B-tree that is used to look up the addresses of the
+	    chunks.  The address may have the "undefined address" value, to indicate that
+            storage has not yet been allocated for this array.</P></td>
+	</tr>
+
+	<tr>
+	  <td>Dimensions</td>
+	  <td><P>These values define the dimension size of a single chunk, in
+            units of array elements (not bytes).  The first dimension stored in
+            the list of dimensions is the slowest changing dimension and the
+            last dimension stored is the fastest changing dimension.
+            </P>
+          </td>
+	</tr>
+
+	<tr>
+	  <td>Dataset Element Size</td>
+	  <td><P>The size of a dataset element, in bytes.
+            </P>
+          </td>
+	</tr>
+      </table>
+    </div>
+
+    <hr>
+    <h4><a name="ReservedMessage_0009">Name: Reserved - Not Assigned Yet</a></h4>
+    <P class=item><B>Header Message Type:</B> 0x0009</P>
+    <P class=item><B>Length:</B> N/A</P>
+    <P class=item><B>Status:</B> N/A</P>
+    <P class=item><B>Format of Data:</B> N/A</P>
+
+    <P class=item><B>Purpose and Description:</B> This message type was skipped during the initial
+	specification of the file format and may be used in a future expansion to the format.
+
+    <hr>
+    <h4><a name="ReservedMessage_000A">Name: Reserved - Not Assigned Yet</a></h4>
+    <P class=item><B>Header Message Type:</B> 0x0009</P>
+    <P class=item><B>Length:</B> N/A</P>
+    <P class=item><B>Status:</B> N/A</P>
+    <P class=item><B>Format of Data:</B> N/A</P>
+
+    <P class=item><B>Purpose and Description:</B> This message type was skipped during the initial
+	specification of the file format and may be used in a future expansion to the format.
+
+    <hr>
+    <h4><a name="FilterMessage">Name: Data Storage - Filter Pipeline</a></h4>
+    <P class=item><B>Header Message Type:</B> 0x000B</P>
+    <P class=item><B>Length:</B> varies</P>
+    <P class=item><B>Status:</B> Optional, may not be repeated.</P>
+
+    <P class=item><B>Description:</B> This message describes the
+      filter pipeline which should be applied to the data stream by
+      providing filter identification numbers, flags, a name, and
+      client data.</P>
+
+    <P class=item><B>Format of Data:</B>
+    <br>
+    <div align=center>
+      <table class=format>
+	<caption>
+	  Filter Pipeline Message
+	</caption>
+
+	<tr>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+	  <td>Version</td>
+	  <td>Number of Filters</td>
+	  <td colspan=2>Reserved</td>
+	</tr>
+
+	<tr>
+	  <td colspan=4>Reserved</td>
+	</tr>
+
+	<tr>
+	  <td colspan=4><br>Filter List<br><br></td>
+	</tr>
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=desc>
+	<tr>
+          <th width="30%">Field Name</th>
+          <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td>Version</td>
+	  <td><P>The version number for this message.  This document
+	    describes version 1.</P></td>
+	</tr>
+
+	<tr>
+	  <td>Number of Filters</td>
+	  <td><P>The total number of filters described by this
+	    message. The maximum possible number of filters in a
+	    message is 32.</P></td>
+	</tr>
+
+	<tr>
+	  <td>Filter List</td>
+	  <td><P>A description of each filter.  A filter description
+	    appears in the next table.</P></td>
+	</tr>
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=format>
+	<caption>
+	  Filter Description
+	</caption>
+
+	<tr>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+	  <td colspan=2>Filter Identification</td>
+	  <td colspan=2>Name Length</td>
+	</tr>
+
+	<tr>
+	  <td colspan=2>Flags</td>
+	  <td colspan=2>Number of Values for Client Data</td>
+	</tr>
+
+	<tr>
+	  <td colspan=4><br>Name<br><br></td>
+	</tr>
+
+	<tr>
+	  <td colspan=4><br>Client Data<br><br></td>
+	</tr>
+
+	<tr>
+	  <td colspan=4>Padding</td>
+	</tr>
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=desc>
+	<tr>
+          <th width="30%">Field Name</th>
+          <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td>Filter Identification</td>
+	  <td>
+            <p>
+            This value, often referred to as a filter identifier,
+            is designed to be a unique identifier for the filter.
+            Values from zero through 32,767 are reserved for filters
+            supported by The HDF Group in the HDF5 library and for
+            filters requested and supported by third parties.
+            Filters supported by The HDF Group are documented immediately
+            below.  Information on 3rd-party filters can be found at
+            <a href="/services/contributions.html#filters">
+            <code>https://support.hdfgroup.org/services/contributions.html#filters</code></a>.
+            <a href="#Footnote1Change"><sup><small>1</small></sup></a>
+            <p>
+            To request a filter identifier, please contact
+            The HDF Group&rsquo;s Help Desk at
+            <img src="Graphics/help.png" valign="center" height=14>.
+            You will be asked to provide the following information:
+            <ol>
+              <li>Contact information for the developer requesting the
+                  new identifier
+              <li>A short description of the new filter
+              <li>Links to any relevant information, including licensing
+                  information
+            </ol>
+            <p>
+            Values from 32768 to 65535 are reserved for non-distributed uses
+            (for example, internal company usage) or for application usage
+            when testing a feature. The HDF Group does not track or document
+            the use of the filters with identifiers from this range.
+
+            <p>
+            The filters currently in library version 1.6.5 are
+	    listed below:
+	    <table class=list>
+	      <tr>
+		<th width="30%">Identification</th>
+		<th align=left>Name</th>
+		<th align=left>Description</th>
+	      </tr>
+
+	      <tr>
+		<td align=center><code>1</code></td>
+		<td>deflate</td>
+		<td>GZIP deflate compression</td>
+	      </tr>
+
+	      <tr>
+		<td align=center><code>2</code></td>
+		<td>shuffle</td>
+		<td>Data element shuffling</td>
+	      </tr>
+
+	      <tr>
+		<td align=center><code>3</code></td>
+		<td>fletcher32</td>
+		<td>Fletcher32 checksum</td>
+	      </tr>
+
+	      <tr>
+		<td align=center><code>4</code></td>
+		<td>szip</td>
+		<td>SZIP compression</td>
+	      </tr>
+	    </table>
+	  </P></td>
+	</tr>
+
+	<tr>
+	  <td>Name Length</td>
+	  <td><P>Each filter has an optional null-terminated ASCII name
+	    and this field holds the length of the name including the
+	    null termination padded with nulls to be a multiple of
+	    eight. If the filter has no name then a value of zero is
+	    stored in this field.</P></td>
+	</tr>
+
+	<tr>
+	  <td>Flags</td>
+	  <td><P>The flags indicate certain properties for a filter.  The
+	    bit values defined so far are:</P>
+	    <table class=list>
+	      <tr>
+		<th width="30%">Value</th>
+		<th align=left>Description</th>
+	      </tr>
+
+	      <tr>
+		<td align=center><code>bit 1</code></td>
+	        <td>If set then the filter is an optional filter.
+		During output, if an optional filter fails it will be
+		silently removed from the pipeline.</td>
+	      </tr>
+	    </table>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td>Client Data Number of Values</td>
+	  <td><P>Each filter can store a few integer values to control
+	    how the filter operates.  The number of entries in the
+	    Client Data array is stored in this field.</P></td>
+	</tr>
+
+	<tr>
+	  <td>Name</td>
+	  <td><P>If the Name Length field is non-zero then it will
+	    contain the size of this field, a multiple of eight.  This
+	    field contains a null-terminated, ASCII character
+	    string to serve as a comment/name for the filter.</P></td>
+	</tr>
+
+	<tr>
+	  <td>Client Data</td>
+	  <td><P>This is an array of four-byte integers which will be
+	    passed to the filter function.  The Client Data Number of
+	    Values determines the number of elements in the array.</P></td>
+	</tr>
+
+	<tr>
+	  <td>Padding</td>
+	  <td><P>Four bytes of zeros are added to the message at this
+	    point if the Client Data Number of Values field contains
+	    an odd number.</P></td>
+	</tr>
+      </table>
+    </div>
+    <p>
+    <hr align="left" width="50">
+    <a name="Footnote1Change"><sup>1</sup></a>If you are reading
+    an earlier version of this document, this link may have changed.
+    If the link does not work, use the latest version of this document
+    on <a href="https://support.hdfgroup.org">The HDF Group</a>&rsquo;s website,
+    <a href="/HDF5/doc/H5.format.html">
+    <code>https://support.hdfgroup.org/HDF5/doc/H5.format.html</code></a>;
+    the link there will always be correct.
+    <small><a href="#FilterMessage">(Return)</a>
+    </P>
+
+    <hr>
+    <h4><a name="AttributeMessage">Name: Attribute</a></h4>
+    <P class=item><B>Header Message Type:</B> 0x000C
+    <P class=item><B>Length:</B> varies
+    <P class=item><B>Status:</B> Optional, may be repeated.
+
+    <P class=item><B>Description:</B>  The <em>Attribute</em>
+      message is used to list objects in the HDF file which are used
+      as attributes, or "metadata" about the current object.  An
+      attribute is a small dataset; it has a name, a datatype, a data
+      space, and raw data.  Since attributes are stored in the object
+      header they must be relatively small (<64KB) and can be
+      associated with any type of object which has an object header
+      (groups, datasets, named types and spaces, etc.).
+
+    <P class=item2>Note: Attributes on an object must have unique names.  (The HDF5 library
+      currently enforces this by causing the creation of an attribute with
+      a duplicate name to fail).  Attributes on different objects may have the
+      same name, however.
+
+    <P class=item><B>Format of Data:</B>
+    <br>
+    <div align=center>
+      <table class=format>
+	<caption>
+	  Attribute Message (Version 1)
+	</caption>
+
+	<tr>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+	  <td>Version</td>
+	  <td>Reserved</td>
+	  <td colspan=2>Name Size</td>
+	</tr>
+
+	<tr>
+	  <td colspan=2>Datatype Size</td>
+	  <td colspan=2>Dataspace Size</td>
+	</tr>
+
+	<tr>
+	  <td colspan=4><br>Name<br><br></td>
+	</tr>
+
+	<tr>
+	  <td colspan=4><br>Datatype<br><br></td>
+	</tr>
+
+	<tr>
+	  <td colspan=4><br>Dataspace<br><br></td>
+	</tr>
+
+	<tr>
+	  <td colspan=4><br>Data<br><br></td>
+	</tr>
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=desc>
+	<tr>
+          <th width="30%">Field Name</th>
+          <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td>Version</td>
+	  <td><P>The version number information is used for changes in the format of the
+	    attribute message and is described here:</P>
+	    <table class=list>
+	      <tr>
+		<th width="30%">Version</th>
+		<th align=left>Description</th>
+	      </tr>
+
+	      <tr>
+		<td align=center><code>0</code></td>
+		<td>Never used.</td>
+	      </tr>
+
+	      <tr>
+		<td align=center><code>1</code></td>
+		<td>Used by the library before version 1.6 to encode attribute message.
+		    This version does not support shared data type.</td>
+	      </tr>
+	    </table>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td>Reserved</td>
+	  <td><P>This field is reserved for later use and is set to
+	    zero.</P></td>
+	</tr>
+
+	<tr>
+	  <td>Name Size</td>
+	  <td><P>The length of the attribute name in bytes including the
+	    null terminator.  Note that the Name field below may
+	    contain additional padding not represented by this
+	    field.</P></td>
+	</tr>
+
+	<tr>
+	  <td>Datatype Size</td>
+	  <td><P>The length of the datatype description in the Datatype
+	    field below.  Note that the Datatype field may contain
+	    additional padding not represented by this field.</P></td>
+	</tr>
+
+	<tr>
+	  <td>Dataspace Size</td>
+	  <td><P>The length of the dataspace description in the Dataspace
+	    field below.  Note that the Dataspace field may contain
+	    additional padding not represented by this field.</P></td>
+	</tr>
+
+	<tr>
+	  <td>Name</td>
+	  <td><P>The null-terminated attribute name.  This field is
+	    padded with additional null characters to make it a
+	    multiple of eight bytes.</P></td>
+	</tr>
+
+	<tr>
+	  <td>Datatype</td>
+	  <td><P>The datatype description follows the same format as
+	    described for the datatype object header message.  This
+	    field is padded with additional zero bytes to make it a
+	    multiple of eight bytes.</P></td>
+	</tr>
+
+	<tr>
+	  <td>Dataspace</td>
+	  <td><P>The dataspace description follows the same format as
+	    described for the dataspace object header message.  This
+	    field is padded with additional zero bytes to make it a
+	    multiple of eight bytes.</P></td>
+	</tr>
+
+	<tr>
+	  <td>Data</td>
+	  <td><P>The raw data for the attribute.  The size is determined
+	    from the datatype and dataspace descriptions.  This
+	    field is <em>not</em> padded with additional bytes.</P></td>
+	</tr>
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=format>
+	<caption>
+	  Attribute Message (Version 2)
+	</caption>
+
+	<tr align=center>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+	  <td>Version</td>
+	  <td>Flag</td>
+	  <td colspan=2>Name Size</td>
+	</tr>
+
+	<tr>
+	  <td colspan=2>Type Size</td>
+	  <td colspan=2>Space Size</td>
+	</tr>
+
+	<tr>
+	  <td colspan=4><br>Name<br><br></td>
+	</tr>
+
+	<tr>
+	  <td colspan=4><br>Type<br><br></td>
+	</tr>
+
+	<tr>
+	  <td colspan=4><br>Space<br><br></td>
+	</tr>
+
+	<tr>
+	  <td colspan=4><br>Data<br><br></td>
+	</tr>
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=desc>
+	<tr>
+          <th width="30%">Field Name</th>
+          <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td>Version</td>
+	  <td><P>The version number information is used for changes in the format of the
+	    attribute message and is described here:</P>
+	    <table class=list width="90%">
+	      <tr>
+		<th width="30%">Version</th>
+		<th align=left>Description</th>
+	      </tr>
+
+	      <tr>
+		<td align=center><code>2</code></td>
+		<td>Used by the library of version 1.6.x and after to encode attribute message.
+		    This version supports shared data type.  The fields of name, type, and space
+		    are not padded with additional bytes of zero.</td>
+	      </tr>
+	    </table>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td>Flag</td>
+	  <td><P>This field indicates whether the data type of this attribute is shared:</P>
+	    <table class=list width="90%">
+	      <tr>
+		<th width="30%">Value</th>
+		<th align=left>Description</th>
+	      </tr>
+
+	      <tr>
+		<td align=center><code>0</code></td>
+		<td>Datatype is <em>not</em> shared.</td>
+	      </tr>
+
+	      <tr>
+		<td align=center><code>1</code></td>
+		<td>Datatype is shared.</td>
+	      </tr>
+	    </table>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td>Name Size</td>
+	  <td><P>The length of the attribute name in bytes including the
+	    null terminator.</P></td>
+	</tr>
+
+	<tr>
+	  <td>Datatype Size</td>
+	  <td><P>The length of the datatype description in the Datatype
+	    field below.</P></td>
+	</tr>
+
+	<tr>
+	  <td>Dataspace Size</td>
+	  <td><P>The length of the dataspace description in the Dataspace
+	    field below.</P></td>
+	</tr>
+
+	<tr>
+	  <td>Name</td>
+	  <td><P>The null-terminated attribute name.  This field is <em>not</em>
+	    padded with additional bytes.</P></td>
+	</tr>
+
+	<tr>
+	  <td>Datatype</td>
+	  <td><P>The datatype description follows the same format as
+	    described for the datatype object header message.  This
+	    field is <em>not</em> padded with additional bytes.</P></td>
+	</tr>
+
+	<tr>
+	  <td>Dataspace</td>
+	  <td><P>The dataspace description follows the same format as
+	    described for the dataspace object header message.  This
+	    field is <em>not</em> padded with additional bytes.</P></td>
+	</tr>
+
+	<tr>
+	  <td>Data</td>
+	  <td><P>The raw data for the attribute.  The size is determined
+	    from the datatype and dataspace descriptions.  This
+	    field is <em>not</em> padded with additional zero
+	    bytes.</P></td>
+	</tr>
+      </table>
+    </div>
+
+    <hr>
+    <h4><a name="CommentMessage">Name: Object Comment</a></h4>
+
+    <P class=item><B>Header Message Type:</B> 0x000D</P>
+    <P class=item><B>Length:</B> varies</P>
+    <P class=item><B>Status:</B> Optional, may not be repeated.</P>
+
+    <P class=item><B>Description:</B> The object comment is
+      designed to be a short description of an object.  An object comment
+      is a sequence of non-zero (<code>\0</code>) ASCII characters with no other
+      formatting included by the library.</P>
+
+    <P class=item><B>Format of Data:</B>
+    <br>
+    <div align=center>
+      <table class=format>
+	<caption>
+	  Name Message
+	</caption>
+
+	<tr>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+	  <td colspan=4><br>Comment<br><br></td>
+	</tr>
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=desc>
+	<tr>
+          <th width="30%">Field Name</th>
+          <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td>Name</td>
+	  <td>A null terminated ASCII character string.</td>
+	</tr>
+      </table>
+    </div>
+
+    <hr>
+    <h4><a name="OldModifiedMessage">Name: Object Modification Date &amp; Time (Old)</a></h4>
+
+    <P class=item><B>Header Message Type:</B> 0x000E</P>
+    <P class=item><B>Length:</B> fixed</P>
+    <P class=item><B>Status:</B> Optional, may not be repeated.</P>
+
+    <P class=item><B>Description:</B>  The object modification date
+      and time is a timestamp which indicates (using ISO-8601 date and
+      time format) the last modification of an object.  The time is
+      updated when any object header message changes according to the
+      system clock where the change was posted.
+
+      <br><br>This modification time message is deprecated in favor of the "new"
+      modification time message (Message Type 0x0012) and is no longer written
+      to the file in versions of the HDF5 library after the 1.6.0 version.
+    </P>
+
+    <P class=item><B>Format of Data:</B>
+    <br>
+    <div align=center>
+      <table class=format>
+	<caption>
+	  Modification Time Message
+	</caption>
+
+	<tr>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+	  <td colspan=4>Year</td>
+	</tr>
+
+	<tr>
+	  <td colspan=2>Month</td>
+	  <td colspan=2>Day of Month</td>
+	</tr>
+
+	<tr>
+	  <td colspan=2>Hour</td>
+	  <td colspan=2>Minute</td>
+	</tr>
+
+	<tr>
+	  <td colspan=2>Second</td>
+	  <td colspan=2>Reserved</td>
+	</tr>
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=desc>
+	<tr>
+          <th width="30%">Field Name</th>
+          <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td>Year</td>
+	  <td><P>The four-digit year as an ASCII string. For example,
+	    <code>1998</code>.  All fields of this message should be interpreted
+	    as coordinated universal time (UTC)</P></td>
+	</tr>
+
+	<tr>
+	  <td>Month</td>
+	  <td><P>The month number as a two digit ASCII string where
+	    January is <code>01</code> and December is <code>12</code>.</P></td>
+	</tr>
+
+	<tr>
+	  <td>Day of Month</td>
+	  <td><P>The day number within the month as a two digit ASCII
+	    string. The first day of the month is <code>01</code>.</P></td>
+	</tr>
+
+	<tr>
+	  <td>Hour</td>
+	  <td><P>The hour of the day as a two digit ASCII string where
+	    midnight is <code>00</code> and 11:00pm is <code>23</code>.</P></td>
+	</tr>
+
+	<tr>
+	  <td>Minute</td>
+	  <td><P>The minute of the hour as a two digit ASCII string where
+	    the first minute of the hour is <code>00</code> and
+	    the last is <code>59</code>.</P></td>
+	</tr>
+
+	<tr>
+	  <td>Second</td>
+	  <td><P>The second of the minute as a two digit ASCII string
+	    where the first second of the minute is <code>00</code>
+	    and the last is <code>59</code>.</P></td>
+	</tr>
+
+	<tr>
+	  <td>Reserved</td>
+	  <td><P>This field is reserved and should always be zero.</P></td>
+	</tr>
+      </table>
+    </div>
+
+    <hr>
+    <h4><a name="SharedMessage">Name: Shared Object Message</a></h4>
+    <P class=item><B>Header Message Type:</B> 0x000F</P>
+    <P class=item><B>Length:</B> Fixed</P>
+    <P class=item><B>Status:</B> Optional, may be repeated.</P>
+
+    <P class=item><B>Description:</B>  A constant message can be shared among
+      several object headers.  A <em>Shared Object</em> Message contains the address of
+      the object message to be shared.  Care must be exercised to prevent cycles when a
+      message of one object header points to a message in some other object header.
+      Starting from Version 2 of the Shared Object Message, the <em>Flags</em>
+      field becomes unused.
+    </P>
+
+    <P class=item><B>Format of Data:</B>
+    <br>
+    <div align=center>
+      <table class=format>
+	<caption>
+	  Shared Object Message (Version 1)
+	</caption>
+
+	<tr>
+	  <th width="25%">byte</td>
+	  <th width="25%">byte</td>
+	  <th width="25%">byte</td>
+	  <th width="25%">byte</td>
+	</tr>
+
+	<tr>
+	  <td>Version</td>
+	  <td>Flags</td>
+	  <td colspan=2>Reserved</td>
+	</tr>
+
+	<tr>
+	  <td colspan=4>Reserved</td>
+	</tr>
+
+	<tr>
+	  <td colspan=4><br>Pointer<br><br></td>
+	</tr>
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=desc>
+	<tr>
+          <th width="30%">Field Name</th>
+          <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td>Version</td>
+	  <td><P>The version number is used when there are changes in the format
+            of a shared object message and is described here:</P>
+	    <table class=list>
+	      <tr>
+		<th width="30%">Version</th>
+		<th align=left>Description</th>
+	      </tr>
+
+	      <tr>
+		<td align=center><code>0</code></td>
+		<td>Never used.</td>
+	      </tr>
+
+	      <tr>
+		<td align=center><code>1</code></td>
+		<td>Used by the library before version 1.6.1.  In this version,
+		  the Flags field is used to indicate whether the actual message is
+		  stored in the global heap (never implemented).  The Pointer field
+		  either contains the the header message address in the global heap
+		  (never implemented) or the address of the shared object header.</td>
+	      </tr>
+	    </table>
+	</tr>
+
+	<tr>
+	  <td>Flags</td>
+	  <td><P>The Shared Message message points to a message which is
+	    shared among multiple object headers.  The Flags field
+	    describes the type of sharing:</P>
+	    <table class=list>
+	      <tr>
+		<th width="30%">Bit</th>
+		<th align=left>Description</th>
+	      </tr>
+
+	      <tr>
+		<td align=center><code>0</code></td>
+		<td>If this bit is clear then the actual message is the
+                  first message in some other object header; otherwise
+                  the actual message is stored in the global heap (never
+		  implemented).</td>
+	      </tr>
+
+	      <tr>
+		<td align=center><code>2-7</code></td>
+		<td>Reserved (always zero)</td>
+	      </tr>
+	    </table>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td>Pointer</td>
+	  <td><P>The address of the object header
+            containing the message to be shared.</P></td>
+	</tr>
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=format>
+	<caption>
+	  Shared Object Message (Version 2)
+	</caption>
+
+	<tr>
+	  <th width="25%">byte</td>
+	  <th width="25%">byte</td>
+	  <th width="25%">byte</td>
+	  <th width="25%">byte</td>
+	</tr>
+
+	<tr>
+	  <td>Version</td>
+	  <td>Flags</td>
+	  <td colspan=2 bgcolor=#DDDDDD>&nbsp;</td>
+	</tr>
+
+	<tr>
+	  <td colspan=4><br>Pointer<br><br></td>
+	</tr>
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=desc>
+	<tr>
+          <th width="30%">Field Name</th>
+          <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td>Version</td>
+	  <td><P>The version number is used when there are changes in the format
+            of a shared object message and is described here:</P>
+	    <table class=list>
+	      <tr>
+		<th width="30%">Version</th>
+		<th align=left>Description</th>
+	      </tr>
+
+	      <tr>
+		<td align=center><code>2</code></td>
+		<td>Used by the library of version 1.6.1 and after.  In this version,
+		  The Flags field is not used and the Pointer field contains the address
+		  of the object header containing the message to be shared. </td>
+	      </tr>
+	    </table>
+	</tr>
+
+	<tr>
+	  <td>Flags</td>
+	  <td><P>Unused.</P></td>
+	</tr>
+
+	<tr>
+	  <td>Pointer</td>
+	  <td><P>The address of the object header
+            containing the message to be shared.</P></td>
+	</tr>
+      </table>
+    </div>
+
+
+    <hr>
+    <h4><a name="ContinuationMessage">Name: Object Header Continuation</a></h4>
+    <P class=item><B>Header Message Type:</B> 0x0010</P>
+    <P class=item><B>Length:</B> fixed</P>
+    <P class=item><B>Status:</B> Optional, may be repeated.</P>
+    <P class=item><B>Description:</B>  The object header continuation is the location
+        in the file of more header messages for the current data object.  This can be
+        used when header blocks become too large or are likely to change over time.</P>
+
+    <P class=item><B>Format of Data:</B>
+    <br>
+    <div align=center>
+      <table class=format>
+        <caption>
+          Object Header Continuation Message
+        </caption>
+
+        <tr>
+          <th width=25%>byte</th>
+          <th width=25%>byte</th>
+          <th width=25%>byte</th>
+          <th width=25%>byte</th>
+        </tr>
+
+        <tr>
+          <td colspan=4><br>Offset<br><br></td>
+        </tr>
+
+        <tr>
+          <td colspan=4><br>Length<br><br></td>
+        </tr>
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=desc>
+        <tr>
+          <th width=30%>Field Name</th>
+          <th>Description</th>
+        </tr>
+
+        <tr>
+          <td>Offset</td>
+          <td><P>This value is the offset in bytes from the beginning of the file where the
+              header continuation information is located.</P></td>
+        </tr>
+
+        <tr>
+          <td>Length</td>
+          <td><P>This value is the length in bytes of the header continuation information in
+              the file.</P></td>
+        </tr>
+      </table>
+    </div>
+
+    <hr>
+    <h4><a name="SymbolTableMessage">Name: Group Message</a></h4>
+    <P class=item><B>Header Message Type:</B> 0x0011</P>
+    <P class=item><B>Length:</B> fixed</P>
+    <P class=item><B>Status:</B> Required for groups, may not be repeated.</P>
+    <P class=item><B>Description:</B> Each group has a B-tree and a
+        name heap which are pointed to by this message.</P>
+    <P class=item><B>Format of data:</B>
+
+    <br>
+    <div align=center>
+      <table class=format>
+        <caption>
+          <B>Group Message</B>
+        </caption>
+
+        <tr>
+          <th width="25%">byte</th>
+          <th width="25%">byte</th>
+          <th width="25%">byte</th>
+          <th width="25%">byte</th>
+        </tr>
+
+        <tr>
+          <td colspan=4><br>B-tree Address<br><br></td>
+        </tr>
+
+        <tr>
+          <td colspan=4><br>Heap Address<br><br></td>
+        </tr>
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=desc>
+        <tr>
+          <th width=30%>Field Name</th>
+          <th>Description</th>
+        </tr>
+
+        <tr>
+          <td>B-tree Address</td>
+          <td><P>This value is the offset in bytes from the beginning of the file
+            where the B-tree is located.</P></td>
+        </tr>
+
+        <tr>
+          <td>Heap Address</td>
+          <td><P>This value is the offset in bytes from the beginning of the file
+            where the group name heap is located.</P></td>
+        </tr>
+      </table>
+    </div>
+
+    <hr>
+    <h4><a name="ModifiedMessage">Name: Object Modification Date &amp; Time</a></h4>
+
+    <P class=item><B>Header Message Type:</B> 0x0012 </P>
+    <P class=item><B>Length:</B> Fixed </P>
+    <P class=item><B>Status:</B> Optional, may not be repeated. </P>
+
+    <P class=item><B>Description:</B> The object modification date
+      and time is a timestamp which indicates the last modification of an object.
+      The time is updated when any object header message changes according to the
+      system clock where the change was posted.
+    </P>
+
+    <P class=item><B>Format of Data:</B>
+    <div align=center>
+      <table class=format>
+	<caption>
+	  Modification Time Message
+	</caption>
+
+	<tr>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+	  <td>Version</td>
+	  <td colspan=3>Reserved</td>
+	</tr>
+
+	<tr>
+	  <td colspan=4>Seconds After Epoch</td>
+	</tr>
+      </table>
+    </div>
+
+    <br>
+    <div align=center>
+      <table class=desc>
+	<tr>
+          <th width="30%">Field Name</th>
+          <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td>Version</td>
+	  <td><P>The version number is used for changes in the format of Object Modification Time
+	      and is described here:</P>
+	     <table class=list>
+		<tr>
+		  <th width="30%">Version</th>
+		  <th align=left>Description</th>
+		</tr>
+
+		<tr>
+		  <td align=center><code>0</code></td>
+		  <td>Never used.</td>
+		</tr>
+
+		<tr>
+		  <td align=center><code>1</code></td>
+		  <td>Used by Version 1.6.1 and after of the library to encode time.  In
+		    this version, the time is the seconds after Epoch.</td>
+		</tr>
+	      </table>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td>Reserved</td>
+	  <td><P>This field is reserved and should always be zero.</P></td>
+	</tr>
+
+	<tr>
+	  <td>Seconds After Epoch</td>
+	  <td><P>The number of seconds since 0 hours, 0 minutes, 0 seconds,
+	    January 1, 1970, Coordinated Universal Time.</P></td>
+	</tr>
+      </table>
+    </div>
+
+<hr>
+<h3><a name="DataStorage">Disk Format: Level 2b - Data Object Data Storage</a></h3>
+<P>The data for an object is stored separately from the header
+information in the file and may not actually be located in the HDF5 file
+itself if the header indicates that the data is stored externally.  The
+information for each record in the object is stored according to the
+dimensionality of the object (indicated in the dimensionality header message).
+Multi-dimensional data is stored in C order [same as current scheme], i.e. the
+"last" dimension changes fastest.
+<P>Data whose elements are composed of simple number-types are stored in
+native-endian IEEE format, unless they are specifically defined as being stored
+in a different machine format with the architecture-type information from the
+number-type header message.  This means that each architecture will need to
+[potentially] byte-swap data values into the internal representation for that
+particular machine.
+<P> Data with a variable-length datatype is stored in the global heap
+of the HDF5 file.  Global heap identifiers are stored in the
+data object storage.
+<P>Data whose elements are composed of pointer number-types are stored in several
+different ways depending on the particular pointer type involved. Simple
+pointers are just stored as the dataset offset of the object being pointed to with the
+size of the pointer being the same number of bytes as offsets in the file.
+Dataset region references are stored as a heap-ID which points to the following
+information within the file-heap: an offset of the object pointed to, number-type
+information (same format as header message), dimensionality information (same
+format as header message), sub-set start and end information (i.e. a coordinate
+location for each), and field start and end names (i.e.  a [pointer to the]
+string indicating the first field included and a [pointer to the] string name
+for the last field).
+
+<P>Data of a compound datatype is stored as a contiguous stream of the items
+in the structure, with each item formatted according to its datatype.</p>
+
+<hr>
+<h3><a name="Appendix">Appendix</a></h3>
+<P>Definitions of various terms used in this document.
+</P>
+<P>The <A name="UndefinedAddress">"undefined address"</A> for a file is a
+file address with all bits set, i.e. <code>0xffff...ff</code>.
+<P>The <A name="UnlimitedDim">"unlimited size"</A> for a size is a
+value with all bits set, i.e. <code>0xffff...ff</code>.
+
+</body>
+</html>
diff --git a/doxygen/examples/H5.format.2.0.html b/doxygen/examples/H5.format.2.0.html
new file mode 100644
index 0000000..d2979e1
--- /dev/null
+++ b/doxygen/examples/H5.format.2.0.html
@@ -0,0 +1,15252 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+<title>HDF5 File Format Specification Version 2.0</title>
+
+<style type="text/css">
+h1 {
+    display: block;
+    margin-top: 24px;
+    margin-bottom: 24px;
+    margin-left: 0px;
+    margin-right: 0px;
+    text-indent: 0px;
+}
+
+h2 {
+    display: block;
+    margin-top: 8x;
+    margin-bottom: 8px;
+    margin-left: 0px;
+    margin-right: 0px;
+    text-indent: 0px;
+}
+
+<!--
+A horizontal rule ( <hr />) should be placed on the line above
+each h2 tag. The h2 tags are used on the main sections along with
+the hr tags. -->h3 {
+    display: block;
+    margin-top: 8px;
+    margin-bottom: 8px;
+    margin-left: 0px;
+    margin-right: 0px;
+    text-indent: 0px;
+}
+
+h4 {
+    display: block;
+    margin-top: 8px;
+    margin-bottom: 8px;
+    margin-left: 0px;
+    margin-right: 0px;
+    text-indent: 0px;
+}
+
+p {
+    display: block;
+    margin-top: 8px;
+    margin-bottom: 8px;
+    margin-left: 0px;
+    margin-right: 0px;
+    text-indent: 0px;
+}
+
+<!--
+p.item {
+    margin-left: 2em;
+    text-indent: -2em
+}
+
+-->
+<!--
+p.item2 {
+    margin-left: 2em;
+    text-indent: 2em
+}
+
+-->
+table.format {
+    border: solid;
+    border-collapse: collapse;
+    caption-side: top;
+    text-align: center;
+    width: 80%;
+}
+
+table.format th {
+    border: ridge;
+    padding: 4px;
+    width: 25%;
+}
+
+table.format td {
+    border: ridge;
+    padding: 4px;
+}
+
+table.format caption {
+    font-weight: bold;
+    font-size: larger;
+}
+
+table.note {
+    border: none;
+    text-align: right;
+    width: 80%;
+}
+
+table.desc {
+    border: solid;
+    border-collapse: collapse;
+    caption-size: top;
+    text-align: left;
+    width: 80%;
+}
+
+table.desc tr {
+    vertical-align: top;
+}
+
+table.desc th {
+    border-style: ridge;
+    font-size: larger;
+    padding: 4px; <!--
+    text-decoration: underline;
+    -->
+}
+
+table.desc td {
+    border-style: ridge; <!--
+    padding: 4px; -->
+    vertical-align: text-top;
+}
+
+table.desc caption {
+    font-weight: bold;
+    font-size: larger;
+}
+
+table.list {
+    border: none;
+    width: 100%
+}
+
+table.list tr {
+    vertical-align: text-top;
+}
+
+table.list th {
+    border: none;
+    text-decoration: underline;
+    vertical-align: text-top;
+}
+
+table.list td {
+    border: none;
+    vertical-align: text-top;
+}
+
+table.msgdesc {
+    border: none;
+    text-align: left;
+    width: 80%
+}
+
+table.msgdesc tr {
+    vertical-align: text-top;
+    border-spacing: 0;
+    padding: 0;
+}
+
+table.msgdesc th {
+    border: none;
+    text-decoration: underline;
+    vertical-align: text-top;
+}
+
+table.msgdesc td {
+    border: none;
+    vertical-align: text-top;
+}
+
+table.list80 {
+    border: none;
+    width: 80%
+}
+
+table.list80 tr {
+    vertical-align: text-top;
+}
+
+table.list80 th {
+    border: none;
+    text-decoration: underline;
+    vertical-align: text-top;
+}
+
+table.list80 td {
+    border: none;
+    vertical-align: text-top;
+}
+
+table.glossary {
+    border: none;
+    text-align: left;
+    width: 80%
+}
+
+table.glossary tr {
+    vertical-align: text-top;
+    border-spacing: 0;
+    padding: 0;
+}
+
+table.glossary th {
+    border: none;
+    text-align: left;
+    text-decoration: underline;
+    vertical-align: text-top;
+}
+
+table.glossary td {
+    border: none;
+    text-align: left;
+    vertical-align: text-top;
+}
+
+div {
+    page-break-inside: avoid;
+    page-break-after: auto
+}
+</style>
+
+<center>
+    <table border="0" width="90%">
+        <tr>
+            <td valign="top">
+                <ol type="I">
+                    <li><a href="#Intro">Introduction</a></li>
+                    <font size="-1">
+                        <ol type="A">
+                            <li><a href="#ThisDocument">This Document</a></li>
+                            <li><a href="#ChangesForHdf5_1_10">Changes for HDF5 1.10</a></li>
+                        </ol>
+                    </font>
+
+                    <li><a href="#FileMetaData">Disk Format: Level 0 - File
+                            Metadata</a></li>
+                    <font size="-1">
+                        <ol type="A">
+                            <li><a href="#Superblock">Disk Format: Level 0A - Format
+                                    Signature and Superblock</a></li>
+                            <li><a href="#DriverInfo">Disk Format: Level 0B - File
+                                    Driver Info</a></li>
+                            <li><a href="#SuperblockExt">Disk Format: Level 0C -
+                                    Superblock Extension</a></li>
+                        </ol>
+                    </font>
+                    <li><a href="#FileInfra">Disk Format: Level 1 - File
+                            Infrastructure</a></li>
+                    <font size="-1">
+                        <ol type="A">
+                            <li><a href="#Btrees">Disk Format: Level 1A - B-trees
+                                    and B-tree Nodes</a></li>
+                            <ol type="1">
+                                <li><a href="#V1Btrees">Disk Format: Level 1A1 -
+                                        Version 1 B-trees (B-link Trees)</a></li>
+                                <li><a href="#V2Btrees">Disk Format: Level 1A2 -
+                                        Version 2 B-trees</a></li>
+                            </ol>
+                            <li><a href="#SymbolTable">Disk Format: Level 1B - Group
+                                    Symbol Table Nodes</a></li>
+                            <li><a href="#SymbolTableEntry">Disk Format: Level 1C -
+                                    Symbol Table Entry</a></li>
+                            <li><a href="#LocalHeap">Disk Format: Level 1D - Local
+                                    Heaps</a></li>
+                            <li><a href="#GlobalHeap">Disk Format: Level 1E - Global
+                                    Heap</a></li>
+                            <li><a href="#FractalHeap">Disk Format: Level 1F -
+                                    Fractal Heap</a></li>
+                            <li><a href="#FreeSpaceManager">Disk Format: Level 1G -
+                                    Free-space Manager</a></li>
+                            <li><a href="#SOHMTable">Disk Format: Level 1H - Shared
+                                    Object Header Message Table</a></li>
+                        </ol>
+                    </font>
+                    <li><a href="#DataObject">Disk Format: Level 2 - Data
+                            Objects</a></li>
+                    <font size="-1">
+                        <ol type="A">
+                            <li><a href="#ObjectHeader">Disk Format: Level 2A - Data
+                                    Object Headers</a></li>
+                            <ol type="1">
+                                <li><a href="#ObjectHeaderPrefix">Disk Format: Level
+                                        2A1 - Data Object Header Prefix</a></li>
+                                <ol type="a">
+                                    <li><a href="#V1ObjectHeaderPrefix">Version 1 Data
+                                            Object Header Prefix</a></li>
+                                    <li><a href="#V2ObjectHeaderPrefix">Version 2 Data
+                                            Object Header Prefix</a></li>
+                                </ol>
+                                <li><a href="#ObjectHeaderMessages">Disk Format: Level
+                                        2A2 - Data Object Header Messages</a></li>
+                                <ol type="a">
+                                    <li><a href="#NILMessage">The NIL Message</a></li>
+                                    <!-- 0x0000 -->
+                                    <li><a href="#DataspaceMessage">The Dataspace Message</a></li>
+                                    <!-- 0x0001 -->
+                                    <li><a href="#LinkInfoMessage">The Link Info Message</a></li>
+                                    <!-- 0x0002 -->
+                                </ol>
+                            </ol>
+                        </ol>
+                    </font>
+                </ol>
+            </td>
+
+            <td>&nbsp;</td>
+
+            <td valign="top">
+                <ol type="I" start="4">
+                    <li><a href="#DataObject">Disk Format: Level 2 - Data
+                            Objects</a><font size="-1"><i> (Continued)</i></font></li>
+                    <ol type="A">
+                        <li><a href="#ObjectHeader">Disk Format: Level 2A - Data
+                                Object Headers</a><i> (Continued)</i></li>
+                        <ol type="1" start="2">
+                            <li><a href="#ObjectHeaderMessages">Disk Format: Level
+                                    2A2 - Data Object Header Messages</a><i> (Continued)</i></li>
+                            <ol type="a" start="4">
+                                <li><a href="#DatatypeMessage">The Datatype Message</a></li>
+                                <!-- 0x0003 -->
+                                <li><a href="#OldFillValueMessage">The Data Storage -
+                                        Fill Value (Old) Message</a></li>
+                                <!-- 0x0004 -->
+                                <li><a href="#FillValueMessage">The Data Storage - Fill
+                                        Value Message</a></li>
+                                <!-- 0x0005 -->
+                                <li><a href="#LinkMessage">The Link Message</a></li>
+                                <!-- 0x0006 -->
+                                <li><a href="#ExternalFileListMessage">The Data Storage
+                                        - External Data Files Message</a></li>
+                                <!-- 0x0007 -->
+                                <li><a href="#LayoutMessage">The Data Storage - Layout
+                                        Message</a></li>
+                                <!-- 0x0008 -->
+                                <li><a href="#BogusMessage">The Bogus Message</a></li>
+                                <!-- 0x0009 -->
+                                <li><a href="#GroupInfoMessage">The Group Info Message</a></li>
+                                <!-- 0x000a -->
+                                <li><a href="#FilterMessage">The Data Storage - Filter
+                                        Pipeline Message</a></li>
+                                <!-- 0x000b -->
+                                <li><a href="#AttributeMessage">The Attribute Message</a></li>
+                                <!-- 0x000c -->
+                                <li><a href="#CommentMessage">The Object Comment
+                                        Message</a></li>
+                                <!-- 0x000d -->
+                                <li><a href="#OldModificationTimeMessage">The Object
+                                        Modification Time (Old) Message</a></li>
+                                <!-- 0x000e -->
+                                <li><a href="#SOHMTableMessage">The Shared Message
+                                        Table Message</a></li>
+                                <!-- 0x000f -->
+                                <li><a href="#ContinuationMessage">The Object Header
+                                        Continuation Message</a></li>
+                                <!-- 0x0010 -->
+                                <li><a href="#SymbolTableMessage">The Symbol Table
+                                        Message</a></li>
+                                <!-- 0x0011 -->
+                                <li><a href="#ModificationTimeMessage">The Object
+                                        Modification Time Message</a></li>
+                                <!-- 0x0012 -->
+                                <li><a href="#BtreeKValuesMessage">The B-tree
+                                        &lsquo;K&rsquo; Values Message</a></li>
+                                <!-- 0x0013 -->
+                                <li><a href="#DrvInfoMessage">The Driver Info Message</a></li>
+                                <!-- 0x0014 -->
+                                <li><a href="#AinfoMessage">The Attribute Info Message</a></li>
+                                <!-- 0x0015 -->
+                                <li><a href="#RefCountMessage">The Object Reference
+                                        Count Message</a></li>
+                                <!-- 0x0016 -->
+                                <li><a href="#FsinfoMessage">The File Space Info
+                                        Message</a></li>
+                                <!-- 0x0018 -->
+                            </ol>
+                        </ol>
+                        <li><a href="#DataStorage">Disk Format: Level 2B - Data
+                                Object Data Storage</a></li>
+                    </ol>
+                    <font></font>
+                    <li><a href="#AppendixA">Appendix A: Definitions</a></li>
+                    <li><a href="#AppendixB">Appendix B: File Memory
+                            Allocation Types</a></li>
+                </ol>
+            </td>
+        </tr>
+    </table>
+</center>
+
+
+
+<br />
+<br />
+<hr />
+<a name="Intro"><h2>I. Introduction</h2></a>
+
+<table align="right" width="100">
+    <tr>
+        <td>&nbsp;</td>
+        <td align="center">
+            <hr /> <img src="FF-IH_FileGroup.gif" alt="HDF5 Groups" hspace="15"
+            vspace="15">
+        </td>
+        <td>&nbsp;</td>
+    </tr>
+    <tr>
+        <td>&nbsp;</td>
+        <td align="center"><strong>Figure 1:</strong> Relationships among
+            the HDF5 root group, other groups, and objects
+            <hr /></td>
+        <td>&nbsp;</td>
+    </tr>
+
+    <tr>
+        <td>&nbsp;</td>
+        <td align="center"><img src="FF-IH_FileObject.gif"
+            alt="HDF5 Objects" hspace="15" vspace="15"></td>
+        <td>&nbsp;</td>
+    </tr>
+    <tr>
+        <td>&nbsp;</td>
+        <td align="center"><strong>Figure 2:</strong> HDF5 objects --
+            datasets, datatypes, or dataspaces
+            <hr /></td>
+        <td>&nbsp;</td>
+    </tr>
+</table>
+
+
+<p>The format of an HDF5 file on disk encompasses several key ideas
+    of the HDF4 and AIO file formats as well as addressing some
+    shortcomings therein. The new format is more self-describing than the
+    HDF4 format and is more uniformly applied to data objects in the file.</p>
+
+<p>An HDF5 file appears to the user as a directed graph. The nodes
+    of this graph are the higher-level HDF5 objects that are exposed by the
+    HDF5 APIs:</p>
+
+<ul>
+    <li>Groups</li>
+    <li>Datasets</li>
+    <li>Committed (formerly Named) datatypes</li>
+</ul>
+
+<p>At the lowest level, as information is actually written to the
+    disk, an HDF5 file is made up of the following objects:</p>
+<ul>
+    <li>A superblock</li>
+    <li>B-tree nodes</li>
+    <li>Heap blocks</li>
+    <li>Object headers</li>
+    <li>Object data</li>
+    <li>Free space</li>
+</ul>
+
+<p>The HDF5 Library uses these low-level objects to represent the
+    higher-level objects that are then presented to the user or to
+    applications through the APIs. For instance, a group is an object
+    header that contains a message that points to a local heap (for storing
+    the links to objects in the group) and to a B-tree (which indexes the
+    links). A dataset is an object header that contains messages that
+    describe datatype, dataspace, layout, filters, external files, fill
+    value, and other elements with the layout message pointing to either a
+    raw data chunk or to a B-tree that points to raw data chunks.</p>
+
+
+<br />
+<a name="ThisDocument"><h3>I.A. This Document</h3></a>
+
+<p>
+    This document describes the lower-level data objects; the higher-level
+    objects and their properties are described in the <a
+        href="UG/HDF5_User_Guide-Responsive HTML5/index.html"><cite>HDF5
+            User Guide</cite></a>.
+</p>
+
+<p>
+    Three levels of information comprise the file format. Level 0 contains
+    basic information for identifying and defining information about the
+    file. Level 1 information contains the information about the pieces of
+    a file shared by many objects in the file (such as a B-trees and
+    heaps). Level 2 is the rest of the file and contains all of the data
+    objects, with each object partitioned into header information, also
+    known as <em>metadata</em>, and data.
+</p>
+
+<p>
+    The sizes of various fields in the following layout tables are
+    determined by looking at the number of columns the field spans in the
+    table. There are three exceptions: (1) The size may be overridden by
+    specifying a size in parentheses, (2) the size of addresses is
+    determined by the <em>Size of Offsets</em> field in the superblock and
+    is indicated in this document with a superscripted &lsquo;O&rsquo;, and
+    (3) the size of length fields is determined by the <em>Size of
+        Lengths</em> field in the superblock and is indicated in this document with
+    a superscripted &lsquo;L&rsquo;.
+</p>
+
+<p>Values for all fields in this document should be treated as
+    unsigned integers, unless otherwise noted in the description of a
+    field. Additionally, all metadata fields are stored in little-endian
+    byte order.</p>
+
+<p>
+    All checksums used in the format are computed with the <a
+        href="http://www.burtleburtle.net/bob/hash/doobs.html">Jenkins&rsquo;
+        lookup3</a> algorithm.
+</p>
+
+<p>Whenever a bit flag or field is mentioned for an entry, bits are
+    numbered from the lowest bit position in the entry.</p>
+
+<p>Various tables in this document aligned with &ldquo;This space
+    inserted only to align table nicely&rdquo;. These entries in the table
+    are just to make the table presentation nicer and do not represent any
+    values or padding in the file.</p>
+
+
+<br />
+<a name="ChangesForHdf5_1_10"><h3>I.B. Changes for HDF5 1.10</h3></a>
+
+<p>As of October 2015, changes in the file format for HDF5 1.10 have
+    not yet been finalized.</p>
+
+
+
+<br />
+<br />
+<hr />
+<h2>
+    <a name="FileMetaData"> II. Disk Format: Level 0 - File Metadata</a>
+</h2>
+
+<br />
+<h3>
+    <a name="Superblock"> II.A. Disk Format: Level 0A - Format
+        Signature and Superblock</a>
+</h3>
+
+<p>The superblock may begin at certain predefined offsets within the
+    HDF5 file, allowing a block of unspecified content for users to place
+    additional information at the beginning (and end) of the HDF5 file
+    without limiting the HDF5 Library&rsquo;s ability to manage the objects
+    within the file itself. This feature was designed to accommodate
+    wrapping an HDF5 file in another file format or adding descriptive
+    information to an HDF5 file without requiring the modification of the
+    actual file&rsquo;s information. The superblock is located by searching
+    for the HDF5 format signature at byte offset 0, byte offset 512, and at
+    successive locations in the file, each a multiple of two of the
+    previous location; in other words, at these byte offsets: 0, 512, 1024,
+    2048, and so on.</p>
+
+<p>The superblock is composed of the format signature, followed by a
+    superblock version number and information that is specific to each
+    version of the superblock. Currently, there are three versions of the
+    superblock format. Version 0 is the default format, while version 1 is
+    basically the same as version 0 with additional information when a
+    non-default B-tree &lsquo;K&rsquo; value is stored. Version 2 is the
+    latest format, with some fields eliminated or compressed and with
+    superblock extension and checksum support.</p>
+
+<p>Version 0 and 1 of the superblock are described below:</p>
+
+
+<div align="center">
+    <table class="format">
+        <caption>Superblock (Versions 0 and 1)</caption>
+
+        <tr>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Format Signature (8 bytes)<br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td>Version # of Superblock</td>
+            <td>Version # of File&rsquo;s Free Space Storage</td>
+            <td>Version # of Root Group Symbol Table Entry</td>
+            <td>Reserved (zero)</td>
+        </tr>
+
+        <tr>
+            <td>Version # of Shared Header Message Format</td>
+            <td>Size of Offsets</td>
+            <td>Size of Lengths</td>
+            <td>Reserved (zero)</td>
+        </tr>
+
+        <tr>
+            <td colspan="2">Group Leaf Node K</td>
+            <td colspan="2">Group Internal Node K</td>
+        </tr>
+
+        <tr>
+            <td colspan="4">File Consistency Flags</td>
+        </tr>
+
+        <tr>
+            <td colspan="2" style="border: dotted;">Indexed Storage Internal
+                Node K<sup>1</sup>
+            </td>
+            <td colspan="2" style="border: dotted;">Reserved (zero)<sup>1</sup></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Base Address<sup>O</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Address of File Free space Info<sup>O</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />End of File Address<sup>O</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Driver Information Block Address<sup>O</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Root Group Symbol Table Entry</td>
+        </tr>
+    </table>
+
+    <table class="note">
+        <tr>
+            <td width="60%">&nbsp;</td>
+            <td width="40%">(Items marked with an &lsquo;O&rsquo; in the
+                above table are of the size specified in &ldquo;Size of
+                Offsets.&rdquo;)</td>
+        </tr>
+        <tr>
+            <td>&nbsp;</td>
+            <td>(Items marked with a &lsquo;1&rsquo; in the above table are
+                new in version 1 of the superblock)</td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Format Signature</p></td>
+            <td><p>This field contains a constant value and can be used
+                    to quickly identify a file as being an HDF5 file. The constant
+                    value is designed to allow easy identification of an HDF5 file and
+                    to allow certain types of data corruption to be detected. The file
+                    signature of an HDF5 file always contains the following values:</p>
+                <center>
+                    <table border align="center" cellpadding="4">
+                        <tr align="center">
+                            <td align="right">Decimal:</td>
+                            <td width="8%">137</td>
+                            <td width="8%">72</td>
+                            <td width="8%">68</td>
+                            <td width="8%">70</td>
+                            <td width="8%">13</td>
+                            <td width="8%">10</td>
+                            <td width="8%">26</td>
+                            <td width="8%">10</td>
+                        </tr>
+
+                        <tr align="center">
+                            <td align="right">Hexadecimal:</td>
+                            <td>89</td>
+                            <td>48</td>
+                            <td>44</td>
+                            <td>46</td>
+                            <td>0d</td>
+                            <td>0a</td>
+                            <td>1a</td>
+                            <td>0a</td>
+                        </tr>
+
+                        <tr align="center">
+                            <td align="right">ASCII C Notation:</td>
+                            <td>\211</td>
+                            <td>H</td>
+                            <td>D</td>
+                            <td>F</td>
+                            <td>\r</td>
+                            <td>\n</td>
+                            <td>\032</td>
+                            <td>\n</td>
+                        </tr>
+                    </table>
+                </center>
+                <p>
+                    This signature both identifies the file as an HDF5 file and
+                    provides for immediate detection of common file-transfer problems.
+                    The first two bytes distinguish HDF5 files on systems that expect
+                    the first two bytes to identify the file type uniquely. The first
+                    byte is chosen as a non-ASCII value to reduce the probability that
+                    a text file may be misrecognized as an HDF5 file; also, it catches
+                    bad file transfers that clear bit 7. Bytes two through four name
+                    the format. The CR-LF sequence catches bad file transfers that
+                    alter newline sequences. The control-Z character stops file display
+                    under MS-DOS. The final line feed checks for the inverse of the
+                    CR-LF translation problem. (This is a direct descendent of the <a
+                        href="http://www.libpng.org/pub/png/spec/iso/index-object.html#5PNG-file-signature">PNG</a>
+                    file signature.)
+                </p>
+                <p>
+                    <em>This field is present in version 0+ of the superblock.</em>
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>Version Number of the Superblock</p></td>
+            <td><p>This value is used to determine the format of the
+                    information in the superblock. When the format of the information
+                    in the superblock is changed, the version number is incremented to
+                    the next integer and can be used to determine how the information
+                    in the superblock is formatted.</p>
+
+                <p>Values of 0, 1 and 2 are defined for this field. (The format
+                    of version 2 is described below, not here)</p>
+
+                <p>
+                    <em>This field is present in version 0+ of the superblock.</em>
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>Version Number of the File&rsquo;s Free Space
+                    Information</p></td>
+            <td>
+                <p>This value is used to determine the format of the
+                    file&rsquo;s free space information.</p>
+                <p>
+                    The only value currently valid in this field is &lsquo;0&rsquo;,
+                    which indicates that the file&rsquo;s free space is as described <a
+                        href="#FreeSpaceManager">below</a>.
+                </p>
+
+                <p>
+                    <em>This field is present in version 0 and 1 of the
+                        superblock.</em>
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Version Number of the Root Group Symbol Table Entry</p></td>
+            <td><p>This value is used to determine the format of the
+                    information in the Root Group Symbol Table Entry. When the format
+                    of the information in that field is changed, the version number is
+                    incremented to the next integer and can be used to determine how
+                    the information in the field is formatted.</p>
+                <p>
+                    The only value currently valid in this field is &lsquo;0&rsquo;,
+                    which indicates that the root group symbol table entry is formatted
+                    as described <a href="#SymbolTableEntry">below</a>.
+                </p>
+                <p>
+                    <em>This field is present in version 0 and 1 of the
+                        superblock.</em>
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>Version Number of the Shared Header Message Format</p></td>
+            <td><p>This value is used to determine the format of the
+                    information in a shared object header message. Since the format of
+                    the shared header messages differs from the other private header
+                    messages, a version number is used to identify changes in the
+                    format.</p>
+                <p>
+                    The only value currently valid in this field is &lsquo;0&rsquo;,
+                    which indicates that shared header messages are formatted as
+                    described <a href="#ObjectHeaderMessages">below</a>.
+                </p>
+
+                <p>
+                    <em>This field is present in version 0 and 1 of the
+                        superblock.</em>
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>Size of Offsets</p></td>
+            <td><p>This value contains the number of bytes used to store
+                    addresses in the file. The values for the addresses of objects in
+                    the file are offsets relative to a base address, usually the
+                    address of the superblock signature. This allows a wrapper to be
+                    added after the file is created without invalidating the internal
+                    offset locations.</p>
+
+                <p>
+                    <em>This field is present in version 0+ of the superblock.</em>
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>Size of Lengths</p></td>
+            <td><p>This value contains the number of bytes used to store
+                    the size of an object.</p>
+                <p>
+                    <em>This field is present in version 0+ of the superblock.</em>
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>Group Leaf Node K</p></td>
+            <td>
+                <p>Each leaf node of a group B-tree will have at least this many
+                    entries but not more than twice this many. If a group has a single
+                    leaf node then it may have fewer entries.</p>
+                <p>This value must be greater than zero.</p>
+                <p>
+                    See the <a href="#Btrees">description</a> of B-trees below.
+                </p>
+
+                <p>
+                    <em>This field is present in version 0 and 1 of the
+                        superblock.</em>
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Group Internal Node K</p></td>
+            <td>
+                <p>Each internal node of a group B-tree will have at least this
+                    many entries but not more than twice this many. If the group has
+                    only one internal node then it might have fewer entries.</p>
+                <p>This value must be greater than zero.</p>
+                <p>
+                    See the <a href="#Btrees">description</a> of B-trees below.
+                </p>
+
+                <p>
+                    <em>This field is present in version 0 and 1 of the
+                        superblock.</em>
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>File Consistency Flags</p></td>
+            <td>
+                <p>This value contains flags to indicate information about the
+                    consistency of the information contained within the file.
+                    Currently, the following bit flags are defined:</p>
+                <ul>
+                    <li>Bit 0 set indicates that the file is opened for
+                        write-access.</li>
+                    <li>Bit 1 set indicates that the file has been verified for
+                        consistency and is guaranteed to be consistent with the format
+                        defined in this document.</li>
+                    <li>Bits 2-31 are reserved for future use.</li>
+                </ul> Bit 0 should be set as the first action when a file is opened for
+                write access and should be cleared only as the final action when
+                closing a file. Bit 1 should be cleared during normal access to a
+                file and only set after the file&rsquo;s consistency is guaranteed
+                by the library or a consistency utility.
+                <p></p>
+
+                <p>
+                    <em>This field is present in version 0+ of the superblock.</em>
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Indexed Storage Internal Node K</p></td>
+            <td>
+                <p>Each internal node of an indexed storage B-tree will have at
+                    least this many entries but not more than twice this many. If the
+                    index storage B-tree has only one internal node then it might have
+                    fewer entries.</p>
+                <p>This value must be greater than zero.</p>
+                <p>
+                    See the <a href="#Btrees">description</a> of B-trees below.
+                </p>
+
+                <p>
+                    <em>This field is present in version 1 of the superblock.</em>
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Base Address</p></td>
+            <td>
+                <p>This is the absolute file address of the first byte of the
+                    HDF5 data within the file. The library currently constrains this
+                    value to be the absolute file address of the superblock itself when
+                    creating new files; future versions of the library may provide
+                    greater flexibility. When opening an existing file and this address
+                    does not match the offset of the superblock, the library assumes
+                    that the entire contents of the HDF5 file have been adjusted in the
+                    file and adjusts the base address and end of file address to
+                    reflect their new positions in the file. Unless otherwise noted,
+                    all other file addresses are relative to this base address.</p>
+
+                <p>
+                    <em>This field is present in version 0+ of the superblock.</em>
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Address of Global Free-space Index</p></td>
+            <td>
+                <p>
+                    The file&rsquo;s free space is not persistent for version 0 and 1
+                    of the superblock. Currently this field always contains the <a
+                        href="#UndefinedAddress">undefined address</a>.
+                </p>
+
+                <p>
+                    <em>This field is present in version 0 and 1 of the
+                        superblock.</em>
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>End of File Address</p></td>
+            <td>
+                <p>This is the absolute file address of the first byte past the
+                    end of all HDF5 data. It is used to determine whether a file has
+                    been accidentally truncated and as an address where file data
+                    allocation can occur if space from the free list is not used.</p>
+
+                <p>
+                    <em>This field is present in version 0+ of the superblock.</em>
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Driver Information Block Address</p></td>
+            <td>
+                <p>
+                    This is the relative file address of the file driver information
+                    block which contains driver-specific information needed to reopen
+                    the file. If there is no driver information block then this entry
+                    should be the <a href="#UndefinedAddress">undefined address</a>.
+                </p>
+
+                <p>
+                    <em>This field is present in version 0 and 1 of the
+                        superblock.</em>
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Root Group Symbol Table Entry</p></td>
+            <td>
+                <p>
+                    This is the <a href="#SymbolTableEntry">symbol table entry</a> of
+                    the root group, which serves as the entry point into the group
+                    graph for the file.
+                </p>
+
+                <p>
+                    <em>This field is present in version 0 and 1 of the
+                        superblock.</em>
+                </p>
+            </td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<p>Version 2 of the superblock is described below:</p>
+
+<div align="center">
+    <table class="format">
+        <caption>Superblock (Version 2)</caption>
+
+        <tr>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Format Signature (8 bytes)<br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td>Version # of Superblock</td>
+            <td>Size of Offsets</td>
+            <td>Size of Lengths</td>
+            <td>File Consistency Flags</td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Base Address<sup>O</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Superblock Extension Address<sup>O</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />End of File Address<sup>O</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Root Group Object Header Address<sup>O</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Superblock Checksum</td>
+        </tr>
+    </table>
+
+    <table class="note">
+        <tr>
+            <td width="60%">&nbsp;</td>
+            <td width="40%">(Items marked with an &lsquo;O&rsquo; in the
+                above table are of the size specified in &ldquo;Size of
+                Offsets.&rdquo;)</td>
+        </tr>
+    </table>
+
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Format Signature</p></td>
+            <td>
+                <p>This field is the same as described for versions 0 and 1 of
+                    the superblock.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Version Number of the Superblock</p></td>
+            <td>
+                <p>This field has a value of 2 and has the same meaning as for
+                    versions 0 and 1.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Size of Offsets</p></td>
+            <td>
+                <p>This field is the same as described for versions 0 and 1 of
+                    the superblock.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Size of Lengths</p></td>
+            <td>
+                <p>This field is the same as described for versions 0 and 1 of
+                    the superblock.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>File Consistency Flags</p></td>
+            <td>
+                <p>This field is the same as described for versions 0 and 1
+                    except that it is smaller (the number of reserved bits has been
+                    reduced from 30 to 6).</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Base Address</p></td>
+            <td>
+                <p>This field is the same as described for versions 0 and 1 of
+                    the superblock.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Superblock Extension Address</p></td>
+            <td>
+                <p>
+                    The field is the address of the object header for the <a
+                        href="#SuperblockExt">superblock extension</a>. If there is no
+                    extension then this entry should be the <a href="#UndefinedAddress">undefined
+                        address</a>.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>End of File Address</p></td>
+            <td>
+                <p>This field is the same as described for versions 0 and 1 of
+                    the superblock.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Root Group Object Header Address</p></td>
+            <td>
+                <p>
+                    This is the address of the <a href="#DataObject">root group
+                        object header</a>, which serves as the entry point into the group
+                    graph for the file.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Superblock Checksum</p></td>
+            <td>
+                <p>The checksum for the superblock.</p>
+            </td>
+        </tr>
+
+    </table>
+</div>
+
+<br />
+<h3>
+    <a name="DriverInfo"> II.B. Disk Format: Level 0B - File Driver
+        Info</a>
+</h3>
+
+<p>
+    The <b>driver information block</b> is an optional region of the file
+    which contains information needed by the file driver to reopen a file.
+    The format is described below:
+</p>
+
+
+<div align="center">
+    <table class="format">
+        <caption>Driver Information Block</caption>
+
+        <tr>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+        </tr>
+
+        <tr>
+            <td>Version</td>
+            <td colspan="3">Reserved</td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Driver Information Size</td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Driver Identification (8 bytes)<br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />
+            <br />Driver Information (<em>variable size</em>)<br />
+            <br />
+            <br /></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Version</p></td>
+            <td>
+                <p>The version number of the Driver Information Block. This
+                    document describes version 0.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Driver Information Size</p></td>
+            <td>
+                <p>
+                    The size in bytes of the <em>Driver Information</em> field.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Driver Identification</p></td>
+            <td>
+                <p>
+                    This is an eight-byte ASCII string without null termination which
+                    identifies the driver and/or version number of the Driver
+                    Information Block. The predefined driver encoded in this field by
+                    the HDF5 Library is identified by the letters
+                    <code>NCSA</code>
+                    followed by the first four characters of the driver name. If the
+                    Driver Information block is not the original version then the last
+                    letter(s) of the identification will be replaced by a version
+                    number in ASCII, starting with 0.
+                </p>
+                <p>Identification for user-defined drivers is also eight-byte
+                    long. It can be arbitrary but should be unique to avoid the four
+                    character prefix &ldquo;NCSA&rdquo;.</p>
+            </td>
+        </tr>
+
+        <tr valign="top">
+            <td><p>Driver Information</p></td>
+            <td>Driver information is stored in a format defined by the file
+                driver (see description below).</td>
+        </tr>
+    </table>
+</div>
+
+<br /> The two drivers encoded in the
+<em>Driver Identification</em> field are as follows:
+<ul>
+    <li>Multi driver:
+        <p>The identifier for this driver is &ldquo;NCSAmulti&rdquo;. This
+            driver provides a mechanism for segregating raw data and different
+            types of metadata into multiple files. These files are viewed by the
+            library as a single virtual HDF5 file with a single file address. A
+            maximum of 6 files will be created for the following data:
+            superblock, B-tree, raw data, global heap, local heap, and object
+            header. More than one type of data can be written to the same file.</p>
+    </li>
+    <li>Family driver
+        <p>The identifier for this driver is &ldquo;NCSAfami&rdquo; and is
+            encoded in this field for library version 1.8 and after. This driver
+            is designed for systems that do not support files larger than 2
+            gigabytes by splitting the HDF5 file address space across several
+            smaller files. It does nothing to segregate metadata and raw data;
+            they are mixed in the address space just as they would be in a single
+            contiguous file.</p>
+    </li>
+</ul>
+<p>
+    The format of the <em>Driver Information</em> field for the above two
+    drivers are described below:
+</p>
+
+<div align="center">
+    <table class="format">
+        <caption>Multi Driver Information</caption>
+
+        <tr>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+        </tr>
+
+        <tr>
+            <td>Member Mapping</td>
+            <td>Member Mapping</td>
+            <td>Member Mapping</td>
+            <td>Member Mapping</td>
+        </tr>
+
+        <tr>
+            <td>Member Mapping</td>
+            <td>Member Mapping</td>
+            <td>Reserved</td>
+            <td>Reserved</td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Address of Member File 1<br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />End of Address for Member File 1<br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Address of Member File 2<br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />End of Address for Member File 2<br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />... ...<br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Address of Member File N<br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />End of Address for Member File N<br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Name of Member File 1 <em>(variable
+                    size)</em><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Name of Member File 2 <em>(variable
+                    size)</em><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />... ...<br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Name of Member File N <em>(variable
+                    size)</em><br />
+            <br /></td>
+        </tr>
+
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Member Mapping</p></td>
+            <td><p>These fields are integer values from 1 to 6
+                    indicating how the data can be mapped to or merged with another
+                    type of data.</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Member Mapping</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+                    <tr>
+                        <td align="center">1</td>
+                        <td>The superblock data.</td>
+                    </tr>
+                    <tr>
+                        <td align="center">2</td>
+                        <td>The B-tree data.</td>
+                    </tr>
+                    <tr>
+                        <td align="center">3</td>
+                        <td>The raw data.</td>
+                    </tr>
+                    <tr>
+                        <td align="center">4</td>
+                        <td>The global heap data.</td>
+                    </tr>
+                    <tr>
+                        <td align="center">5</td>
+                        <td>The local heap data.</td>
+                    </tr>
+                    <tr>
+                        <td align="center">6</td>
+                        <td>The object header data.</td>
+                    </tr>
+                </table>
+                <p></p>
+                <p>For example, if the third field has the value 3 and all the
+                    rest have the value 1, it means there are two files: one for raw
+                    data, and one for superblock, B-tree, global heap, local heap, and
+                    object header.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>Reserved</p></td>
+            <td><p>These fields are reserved and should always be zero.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>Address of Member File N</p></td>
+            <td><p>This field Specifies the virtual address at which the
+                    member file starts.</p>
+                <p>N is the number of member files.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>End of Address for Member File N</p></td>
+            <td><p>This field is the end of the allocated address for
+                    the member file.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>Name of Member File N</p></td>
+            <td><p>
+                    This field is the null-terminated name of the member file and its
+                    length should be multiples of 8 bytes. Additional bytes will be
+                    padded with <em>NULL</em>s. The default naming convention is <em>%s-X.h5</em>,
+                    where <em>X</em> is one of the letters <em>s</em> (for superblock),
+                    <em>b</em> (for B-tree), <em>r</em> (for raw data), <em>g</em> (for
+                    global heap), <em>l</em> (for local heap), and <em>o</em> (for
+                    object header). The name of the whole HDF5 file will substitute the
+                    <em>%s</em> in the string.
+                </p></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="format">
+        <caption>Family Driver Information</caption>
+
+        <tr>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="8"><br />Size of Member File<br />
+            <br /></td>
+        </tr>
+
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Size of Member File</p></td>
+            <td><p>This field is the size of the member file in the
+                    family of files.</p></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<h3>
+    <a name="SuperblockExt"> II.C. Disk Format: Level 0C - Superblock
+        Extension</a>
+</h3>
+
+<p>
+    The <em>superblock extension</em> is used to store superblock metadata
+    which is either optional, or added after the version of the superblock
+    was defined. Superblock extensions may only exist when version 2+ of
+    superblock is used. A superblock extension is an object header which
+    may hold the following messages:
+</p>
+<ul>
+    <li><a href="#SOHMTableMessage">Shared Message Table message</a>
+        containing information to locate the master table of shared object
+        header message indices.</li>
+    <li><a href="#BtreeKValuesMessage">B-tree &lsquo;K&rsquo;
+            Values message</a> containing non-default B-tree &lsquo;K&rsquo; values.</li>
+    <li><a href="#DrvInfoMessage">Driver Info message</a> containing
+        information needed by the file driver in order to reopen a file. See
+        also the <a href="#DriverInfo">&ldquo;Disk Format: Level 0B - File
+            Driver Info&rdquo;</a> section above.</li>
+    <li><a href="#FsinfoMessage">File Space Info message</a>
+        containing information about file space handling in the file.</li>
+</ul>
+
+
+
+<br />
+<br />
+<hr />
+<h2>
+    <a name="FileInfra"> III. Disk Format: Level 1 - File
+        Infrastructure</a>
+</h2>
+
+<br />
+<h3>
+    <a name="Btrees"> III.A. Disk Format: Level 1A - B-trees and B-tree
+        Nodes</a>
+</h3>
+
+<p>B-trees allow flexible storage for objects which tend to grow in
+    ways that cause the object to be stored discontiguously. B-trees are
+    described in various algorithms books including &ldquo;Introduction to
+    Algorithms&rdquo; by Thomas H. Cormen, Charles E. Leiserson, and Ronald
+    L. Rivest. B-trees are used in several places in the HDF5 file format,
+    when an index is needed for another data structure.</p>
+
+<p>The version 1 B-tree structure described below is the original
+    index structure, but are limited by some bugs in our implementation
+    (mainly in how they handle deleting records). The version 1 B-trees are
+    being phased out in favor of the version 2 B-trees described below,
+    although both types of structures may be found in the same file,
+    depending on application settings when creating the file.</p>
+
+<br />
+<h4>
+    <a name="V1Btrees"> III.A.1. Disk Format: Level 1A1 - Version 1
+        B-trees (B-link Trees)</a>
+</h4>
+
+<p>
+    Version 1 B-trees in HDF5 files an implementation of the B-link tree,
+    in which the sibling nodes at a particular level in the tree are stored
+    in a doubly-linked list, is described in the &ldquo;Efficient Locking
+    for Concurrent Operations on B-trees&rdquo; paper by Phillip Lehman and
+    S. Bing Yao as published in the <cite>ACM Transactions on
+        Database Systems</cite>, Vol. 6, No. 4, December 1981.
+</p>
+
+<p>The B-link trees implemented by the file format contain one more
+    key than the number of children. In other words, each child pointer out
+    of a B-tree node has a left key and a right key. The pointers out of
+    internal nodes point to sub-trees while the pointers out of leaf nodes
+    point to symbol nodes and raw data chunks. Aside from that difference,
+    internal nodes and leaf nodes are identical.</p>
+
+<div align="center">
+    <table class="format">
+        <caption>B-link Tree Nodes</caption>
+
+        <tr>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="4">Signature</td>
+        </tr>
+
+        <tr>
+            <td>Node Type</td>
+            <td>Node Level</td>
+            <td colspan="2">Entries Used</td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Address of Left Sibling<sup>O</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Address of Right Sibling<sup>O</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Key 0 (variable size)</td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Address of Child 0<sup>O</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Key 1 (variable size)</td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Address of Child 1<sup>O</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">...</td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Key 2<em>K</em> (variable size)
+            </td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Address of Child 2<em>K</em><sup>O</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Key 2<em>K</em>+1 (variable size)
+            </td>
+        </tr>
+    </table>
+
+    <table class="note">
+        <tr>
+            <td width="60%">&nbsp;</td>
+            <td width="40%">(Items marked with an &lsquo;O&rsquo; in the
+                above table are of the size specified in &ldquo;Size of
+                Offsets&rdquo; field in the superblock.)</td>
+        </tr>
+    </table>
+
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Signature</p></td>
+            <td>
+                <p>
+                    The ASCII character string &ldquo;
+                    <code>TREE</code>
+                    &rdquo; is used to indicate the beginning of a B-link tree node.
+                    This gives file consistency checking utilities a better chance of
+                    reconstructing a damaged file.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Node Type</p></td>
+            <td>
+                <p>
+                    Each B-link tree points to a particular type of data. This field
+                    indicates the type of data as well as implying the maximum degree <em>K</em>
+                    of the tree and the size of each Key field.
+
+
+                </p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Node Type</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+                    <tr>
+                        <td align="center">0</td>
+                        <td>This tree points to group nodes.</td>
+                    </tr>
+                    <tr>
+                        <td align="center">1</td>
+                        <td>This tree points to raw data chunk nodes.</td>
+                    </tr>
+                </table>
+                <p></p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Node Level</p></td>
+            <td>
+                <p>The node level indicates the level at which this node appears
+                    in the tree (leaf nodes are at level zero). Not only does the level
+                    indicate whether child pointers point to sub-trees or to data, but
+                    it can also be used to help file consistency checking utilities
+                    reconstruct damaged trees.</p>
+            </td>
+        </tr>
+
+        <tr valign="top">
+            <td><p>Entries Used</p></td>
+            <td>
+                <p>This determines the number of children to which this node
+                    points. All nodes of a particular type of tree have the same
+                    maximum degree, but most nodes will point to less than that number
+                    of children. The valid child pointers and keys appear at the
+                    beginning of the node and the unused pointers and keys appear at
+                    the end of the node. The unused pointers and keys have undefined
+                    values.</p>
+            </td>
+        </tr>
+
+        <tr valign="top">
+            <td><p>Address of Left Sibling</p></td>
+            <td>
+                <p>
+                    This is the relative file address of the left sibling of the
+                    current node. If the current node is the left-most node at this
+                    level then this field is the <a href="#UndefinedAddress">undefined
+                        address</a>.
+                </p>
+            </td>
+        </tr>
+
+        <tr valign="top">
+            <td><p>Address of Right Sibling</p></td>
+            <td>
+                <p>
+                    This is the relative file address of the right sibling of the
+                    current node. If the current node is the right-most node at this
+                    level then this field is the <a href="#UndefinedAddress">undefined
+                        address</a>.
+                </p>
+            </td>
+        </tr>
+
+        <tr valign="top">
+            <td><p>Keys and Child Pointers</p></td>
+            <td>
+                <p>
+                    Each tree has 2<em>K</em>+1 keys with 2<em>K</em> child pointers
+                    interleaved between the keys. The number of keys and child pointers
+                    actually containing valid values is determined by the node&rsquo;s
+                    <em>Entries Used</em> field. If that field is <em>N</em> then the
+                    B-link tree contains <em>N</em> child pointers and <em>N</em>+1
+                    keys.
+                </p>
+            </td>
+        </tr>
+
+        <tr valign="top">
+            <td><p>Key</p></td>
+            <td>
+                <p>
+                    The format and size of the key values is determined by the type of
+                    data to which this tree points. The keys are ordered and are
+                    boundaries for the contents of the child pointer; that is, the key
+                    values represented by child <em>N</em> fall between Key <em>N</em>
+                    and Key <em>N</em>+1. Whether the interval is open or closed on
+                    each end is determined by the type of data to which the tree
+                    points.
+                </p>
+
+                <p>The format of the key depends on the node type. For nodes of
+                    node type 0 (group nodes), the key is formatted as follows:</p>
+                <table class="list">
+                    <tr>
+                        <td width="20%">A single field of <i>Size of Lengths</i>
+                            bytes:
+                        </td>
+                        <td width="80%">Indicates the byte offset into the local heap
+                            for the first object name in the subtree which that key
+                            describes.</td>
+                    </tr>
+                </table>
+                <p></p>
+
+
+                <p>For nodes of node type 1 (chunked raw data nodes), the key is
+                    formatted as follows:</p>
+                <table class="list">
+                    <tr>
+                        <td width="20%">Bytes 1-4:</td>
+                        <td width="80%">Size of chunk in bytes.</td>
+                    </tr>
+                    <tr>
+                        <td>Bytes 4-8:</td>
+                        <td>Filter mask, a 32-bit bit field indicating which filters
+                            have been skipped for this chunk. Each filter has an index number
+                            in the pipeline (starting at 0, with the first filter to apply)
+                            and if that filter is skipped, the bit corresponding to its index
+                            is set.</td>
+                    </tr>
+                    <tr>
+                        <td>(<em>D + 1</em>) 64-bit fields:
+                        </td>
+                        <td>The offset of the chunk within the dataset where <i>D</i>
+                            is the number of dimensions of the dataset, and the last value is
+                            the offset within the dataset&rsquo;s datatype and should always
+                            be zero. For example, if a chunk in a 3-dimensional dataset
+                            begins at the position <code>[5,5,5]</code>, there will be three
+                            such 64-bit values, each with the value of <code>5</code>,
+                            followed by a <code>0</code> value.
+                        </td>
+                    </tr>
+                </table>
+                <p></p>
+
+            </td>
+        </tr>
+
+        <tr valign="top">
+            <td><p>Child Pointer</p></td>
+            <td>
+                <p>The tree node contains file addresses of subtrees or data
+                    depending on the node level. Nodes at Level 0 point to data
+                    addresses, either raw data chunks or group nodes. Nodes at non-zero
+                    levels point to other nodes of the same B-tree.</p>
+                <p>
+                    For raw data chunk nodes, the child pointer is the address of a
+                    single raw data chunk. For group nodes, the child pointer points to
+                    a <a href="#SymbolTable">symbol table</a>, which contains
+                    information for multiple symbol table entries.
+                </p>
+            </td>
+        </tr>
+    </table>
+</div>
+
+<p>Conceptually, each B-tree node looks like this:</p>
+<center>
+    <table>
+        <tr valign="top" align="center">
+            <td>key[0]</td>
+            <td>&nbsp;</td>
+            <td>child[0]</td>
+            <td>&nbsp;</td>
+            <td>key[1]</td>
+            <td>&nbsp;</td>
+            <td>child[1]</td>
+            <td>&nbsp;</td>
+            <td>key[2]</td>
+            <td>&nbsp;</td>
+            <td>...</td>
+            <td>&nbsp;</td>
+            <td>...</td>
+            <td>&nbsp;</td>
+            <td>key[<i>N</i>-1]
+            </td>
+            <td>&nbsp;</td>
+            <td>child[<i>N</i>-1]
+            </td>
+            <td>&nbsp;</td>
+            <td>key[<i>N</i>]
+            </td>
+        </tr>
+    </table>
+</center>
+<br /> where child[
+<i>i</i>] is a pointer to a sub-tree (at a level above Level 0) or to
+data (at Level 0). Each key[
+<i>i</i>] describes an
+<i>item</i> stored by the B-tree (a chunk or an object of a group node).
+The range of values represented by child[
+<i>i</i>] is indicated by key[
+<i>i</i>] and key[
+<i>i</i>+1].
+
+
+<p>
+    The following question must next be answered: &ldquo;Is the value
+    described by key[<i>i</i>] contained in child[<i>i</i>-1] or in child[<i>i</i>]?&rdquo;
+    The answer depends on the type of tree. In trees for groups (node type
+    0) the object described by key[<i>i</i>] is the greatest object
+    contained in child[<i>i</i>-1] while in chunk trees (node type 1) the
+    chunk described by key[<i>i</i>] is the least chunk in child[<i>i</i>].
+</p>
+
+<p>That means that key[0] for group trees is sometimes unused; it
+    points to offset zero in the heap, which is always the empty string and
+    compares as &ldquo;less-than&rdquo; any valid object name.</p>
+
+<p>
+    And key[<i>N</i>] for chunk trees is sometimes unused; it contains a
+    chunk offset which compares as &ldquo;greater-than&rdquo; any other
+    chunk offset and has a chunk byte size of zero to indicate that it is
+    not actually allocated.
+</p>
+
+<br />
+<h4>
+    <a name="V2Btrees"> III.A.2. Disk Format: Level 1A2 - Version 2
+        B-trees</a>
+</h4>
+
+<p>
+    Version 2 B-trees are &ldquo;traditional&rdquo; B-trees, with one major
+    difference. Instead of just using a simple pointer (or address in the
+    file) to a child of an internal node, the pointer to the child node
+    contains two additional pieces of information: the number of records in
+    the child node itself, and the total number of records in the child
+    node and all its descendants. Storing this additional information
+    allows fast array-like indexing to locate the n<sup>th</sup> record in
+    the B-tree.
+</p>
+
+<p>
+    The entry into a version 2 B-tree is a header which contains global
+    information about the structure of the B-tree. The <em>root node
+        address</em> field in the header points to the B-tree root node, which is
+    either an internal or leaf node, depending on the value in the
+    header&rsquo;s <em>depth</em> field. An internal node consists of
+    records plus pointers to further leaf or internal nodes in the tree. A
+    leaf node consists of solely of records. The format of the records
+    depends on the B-tree type (stored in the header).
+</p>
+
+<div align="center">
+    <table class="format">
+        <caption>Version 2 B-tree Header</caption>
+
+        <tr>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+
+        </tr>
+        <tr>
+            <td colspan="4">Signature</td>
+        </tr>
+        <tr>
+            <td>Version</td>
+            <td>Type</td>
+            <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+        <tr>
+            <td colspan="4">Node Size</td>
+        </tr>
+        <tr>
+            <td colspan="2">Record Size</td>
+            <td colspan="2">Depth</td>
+        </tr>
+        <tr>
+            <td>Split Percent</td>
+            <td>Merge Percent</td>
+            <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+        <tr>
+            <td colspan="4"><br />Root Node Address<sup>O</sup><br />
+            <br /></td>
+        </tr>
+        <tr>
+            <td colspan="2">Number of Records in Root Node</td>
+            <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+        <tr>
+            <td colspan="4"><br />Total Number of Records in B-tree<sup>L</sup><br />
+            <br /></td>
+        </tr>
+        <tr>
+            <td colspan="4">Checksum</td>
+        </tr>
+    </table>
+
+    <table class="note">
+        <tr>
+            <td width="60%">&nbsp;</td>
+            <td width="40%">(Items marked with an &lsquo;O&rsquo; in the
+                above table are of the size specified in &ldquo;Size of
+                Offsets&rdquo; field in the superblock.)</td>
+        </tr>
+        <tr>
+            <td>&nbsp;</td>
+            <td>(Items marked with an &lsquo;L&rsquo; in the above table are
+                of the size specified in &ldquo;Size of Lengths&rdquo; field in the
+                superblock.)</td>
+        </tr>
+    </table>
+
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Signature</p></td>
+            <td>
+                <p>
+                    The ASCII character string &ldquo;
+                    <code>BTHD</code>
+                    &rdquo; is used to indicate the header of a version 2 B-link tree
+                    node.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Version</p></td>
+            <td>
+                <p>The version number for this B-tree header. This document
+                    describes version 0.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Type</p></td>
+            <td>
+                <p>This field indicates the type of B-tree:</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Value</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+                    <tr>
+                        <td align="center">0</td>
+                        <td>A &ldquo;testing&rdquo; B-tree, this value should <em>not</em>
+                            be used for storing records in actual HDF5 files.
+                        </td>
+                    </tr>
+                    <tr>
+                        <td align="center">1</td>
+                        <td>This B-tree is used for indexing indirectly accessed,
+                            non-filtered &lsquo;huge&rsquo; fractal heap objects.</td>
+                    </tr>
+                    <tr>
+                        <td align="center">2</td>
+                        <td>This B-tree is used for indexing indirectly accessed,
+                            filtered &lsquo;huge&rsquo; fractal heap objects.</td>
+                    </tr>
+                    <tr>
+                        <td align="center">3</td>
+                        <td>This B-tree is used for indexing directly accessed,
+                            non-filtered &lsquo;huge&rsquo; fractal heap objects.</td>
+                    </tr>
+                    <tr>
+                        <td align="center">4</td>
+                        <td>This B-tree is used for indexing directly accessed,
+                            filtered &lsquo;huge&rsquo; fractal heap objects.</td>
+                    </tr>
+                    <tr>
+                        <td align="center">5</td>
+                        <td>This B-tree is used for indexing the &lsquo;name&rsquo;
+                            field for links in indexed groups.</td>
+                    </tr>
+                    <tr>
+                        <td align="center">6</td>
+                        <td>This B-tree is used for indexing the &lsquo;creation
+                            order&rsquo; field for links in indexed groups.</td>
+                    </tr>
+                    <tr>
+                        <td align="center">7</td>
+                        <td>This B-tree is used for indexing shared object header
+                            messages.</td>
+                    </tr>
+                    <tr>
+                        <td align="center">8</td>
+                        <td>This B-tree is used for indexing the &lsquo;name&rsquo;
+                            field for indexed attributes.</td>
+                    </tr>
+                    <tr>
+                        <td align="center">9</td>
+                        <td>This B-tree is used for indexing the &lsquo;creation
+                            order&rsquo; field for indexed attributes.</td>
+                    </tr>
+                </table>
+                <p></p>
+                <p>The format of records for each type is described below.</p>
+            </td>
+        </tr>
+
+        <tr valign="top">
+            <td><p>Node Size</p></td>
+            <td>
+                <p>This is the size in bytes of all B-tree nodes.</p>
+            </td>
+        </tr>
+
+        <tr valign="top">
+            <td><p>Record Size</p></td>
+            <td>
+                <p>This field is the size in bytes of the B-tree record.</p>
+            </td>
+        </tr>
+
+        <tr valign="top">
+            <td><p>Depth</p></td>
+            <td>
+                <p>This is the depth of the B-tree.</p>
+            </td>
+        </tr>
+
+        <tr valign="top">
+            <td><p>Split Percent</p></td>
+            <td>
+                <p>The percent full that a node needs to increase above before
+                    it is split.</p>
+            </td>
+        </tr>
+
+        <tr valign="top">
+            <td><p>Merge Percent</p></td>
+            <td>
+                <p>The percent full that a node needs to be decrease below
+                    before it is split.</p>
+            </td>
+        </tr>
+
+        <tr valign="top">
+            <td><p>Root Node Address</p></td>
+            <td>
+                <p>
+                    This is the address of the root B-tree node. A B-tree with no
+                    records will have the <a href="#UndefinedAddress">undefined
+                        address</a> in this field.
+                </p>
+            </td>
+        </tr>
+
+        <tr valign="top">
+            <td><p>Number of Records in Root Node</p></td>
+            <td>
+                <p>This is the number of records in the root node.</p>
+            </td>
+        </tr>
+
+        <tr valign="top">
+            <td><p>Total Number of Records in B-tree</p></td>
+            <td>
+                <p>This is the total number of records in the entire B-tree.</p>
+            </td>
+        </tr>
+
+        <tr valign="top">
+            <td><p>Checksum</p></td>
+            <td>
+                <p>This is the checksum for the B-tree header.</p>
+            </td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<br />
+<div align="center">
+    <table class="format">
+        <caption>Version 2 B-tree Internal Node</caption>
+
+        <tr>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="4">Signature</td>
+        </tr>
+        <tr>
+            <td>Version</td>
+            <td>Type</td>
+            <td colspan="2">Records 0, 1, 2...N-1 <em>(variable size)</em></td>
+        </tr>
+        <tr>
+            <td colspan="4"><br />Child Node Pointer 0<sup>O</sup><br />
+            <br /></td>
+        </tr>
+        <tr>
+            <td colspan="4"><br />Number of Records N<sub>0</sub> for Child
+                Node 0 <em>(variable size)</em></td>
+        </tr>
+        <tr>
+            <td colspan="4"><br />Total Number of Records for Child Node 0
+                <em>(optional, variable size)</em></td>
+        </tr>
+        <tr>
+            <td colspan="4"><br />Child Node Pointer 1<sup>O</sup><br />
+            <br /></td>
+        </tr>
+        <td colspan="4"><br />Number of Records N<sub>1</sub> for Child
+            Node 1 <em>(variable size)</em></td>
+        <tr></tr>
+        <tr>
+            <td colspan="4"><br />Total Number of Records for Child Node 1
+                <em>(optional, variable size)</em></td>
+        </tr>
+        <tr>
+            <td colspan="4">...</td>
+        </tr>
+        <tr>
+            <td colspan="4"><br />Child Node Pointer N<sup>O</sup><br />
+            <br /></td>
+        </tr>
+        <tr>
+            <td colspan="4"><br />Number of Records N<sub>n</sub> for Child
+                Node N <em>(variable size)</em></td>
+        </tr>
+        <tr>
+            <td colspan="4"><br />Total Number of Records for Child Node N
+                <em>(optional, variable size)</em></td>
+        </tr>
+        <tr>
+            <td colspan="4">Checksum</td>
+        </tr>
+    </table>
+
+    <table class="note">
+        <tr>
+            <td width="60%">&nbsp;</td>
+            <td width="40%">(Items marked with an &lsquo;O&rsquo; in the
+                above table are of the size specified in &ldquo;Size of
+                Offsets&rdquo; field in the superblock.)</td>
+        </tr>
+    </table>
+</div>
+
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Signature</p></td>
+            <td>
+                <p>
+                    The ASCII character string &ldquo;
+                    <code>BTIN</code>
+                    &rdquo; is used to indicate the internal node of a B-link tree.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Version</p></td>
+            <td>
+                <p>The version number for this B-tree internal node. This
+                    document describes version 0.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Type</p></td>
+            <td>
+                <p>This field is the type of the B-tree node. It should always
+                    be the same as the B-tree type in the header.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Records</p></td>
+            <td>
+                <p>The size of this field is determined by the number of records
+                    for this node and the record size (from the header). The format of
+                    records depends on the type of B-tree.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Child Node Pointer</p></td>
+            <td>
+                <p>This field is the address of the child node pointed to by the
+                    internal node.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Number of Records in Child Node</p></td>
+            <td>
+                <p>
+                    This is the number of records in the child node pointed to by the
+                    corresponding <em>Node Pointer</em>.
+                </p>
+                <p>The number of bytes used to store this field is determined by
+                    the maximum possible number of records able to be stored in the
+                    child node.</p>
+                <p>The maximum number of records in a child node is computed in
+                    the following way:</p>
+                <ul>
+                    <li>Subtract the fixed size overhead for the child node (for
+                        example, its signature, version, checksum, and so on and <em>one</em>
+                        pointer triplet of information for the child node (because there
+                        is one more pointer triplet than records in each internal node))
+                        from the size of nodes for the B-tree.
+                    </li>
+                    <li>Divide that result by the size of a record plus the
+                        pointer triplet of information stored to reach each child node
+                        from this node.</li>
+                </ul>
+
+                <p></p>
+                <p>Note that leaf nodes do not encode any child pointer
+                    triplets, so the maximum number of records in a leaf node is just
+                    the node size minus the leaf node overhead, divided by the record
+                    size.</p>
+                <p>
+                    Also note that the first level of internal nodes above the leaf
+                    nodes do not encode the <em>Total Number of Records in Child
+                        Node</em> value in the child pointer triplets (since it is the same as
+                    the <em>Number of Records in Child Node</em>), so the maximum
+                    number of records in these nodes is computed with the equation
+                    above, but using (<em>Child Pointer</em>, <em>Number of
+                        Records in Child Node</em>) pairs instead of triplets.
+                </p>
+                <p>The number of bytes used to encode this field is the least
+                    number of bytes required to encode the maximum number of records in
+                    a child node value for the child nodes below this level in the
+                    B-tree.</p>
+                <p>For example, if the maximum number of child records is 123,
+                    one byte will be used to encode these values in this node; if the
+                    maximum number of child records is 20000, two bytes will be used to
+                    encode these values in this node; and so on. The maximum number of
+                    bytes used to encode these values is 8 (in other words, an unsigned
+                    64-bit integer).</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Total Number of Records in Child Node</p></td>
+            <td>
+                <p>
+                    This is the total number of records for the node pointed to by the
+                    corresponding <em>Node Pointer</em> and all its children. This
+                    field exists only in nodes whose depth in the B-tree node is
+                    greater than 1 (in other words, the &ldquo;twig&rdquo; internal
+                    nodes, just above leaf nodes, do not store this field in their
+                    child node pointers).
+                </p>
+                <p>The number of bytes used to store this field is determined by
+                    the maximum possible number of records able to be stored in the
+                    child node and its descendants.</p>
+                <p>The maximum possible number of records able to be stored in a
+                    child node and its descendants is computed iteratively, in the
+                    following way: The maximum number of records in a leaf node is
+                    computed, then that value is used to compute the maximum possible
+                    number of records in the first level of internal nodes above the
+                    leaf nodes. Multiplying these two values together determines the
+                    maximum possible number of records in child node pointers for the
+                    level of nodes two levels above leaf nodes. This process is
+                    continued up to any level in the B-tree.</p>
+                <p>
+                    The number of bytes used to encode this value is computed in the
+                    same way as for the <em>Number of Records in Child Node</em> field.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Checksum</p></td>
+            <td>
+                <p>This is the checksum for this node.</p>
+            </td>
+        </tr>
+
+    </table>
+</div>
+
+<br />
+<br />
+<div align="center">
+    <table class="format">
+        <caption>Version 2 B-tree Leaf Node</caption>
+
+        <tr>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="4">Signature</td>
+        </tr>
+        <tr>
+            <td>Version</td>
+            <td>Type</td>
+            <td colspan="2">Record 0, 1, 2...N-1 <em>(variable size)</em></td>
+        </tr>
+        <tr>
+            <td colspan="4">Checksum</td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Signature</p></td>
+            <td>
+                <p>
+                    The ASCII character string &ldquo;
+                    <code>BTLF</code>
+                    &ldquo; is used to indicate the leaf node of a version 2 B-link
+                    tree.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Version</p></td>
+            <td>
+                <p>The version number for this B-tree leaf node. This document
+                    describes version 0.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Type</p></td>
+            <td>
+                <p>This field is the type of the B-tree node. It should always
+                    be the same as the B-tree type in the header.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Records</p></td>
+            <td>
+                <p>The size of this field is determined by the number of records
+                    for this node and the record size (from the header). The format of
+                    records depends on the type of B-tree.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Checksum</p></td>
+            <td>
+                <p>This is the checksum for this node.</p>
+            </td>
+        </tr>
+
+    </table>
+</div>
+
+<br />
+<p>The record layout for each stored (in other words, non-testing)
+    B-tree type is as follows:</p>
+
+<div align="center">
+    <table class="format">
+        <caption>Version 2 B-tree, Type 1 Record Layout - Indirectly
+            Accessed, Non-Filtered, &lsquo;Huge&rsquo; Fractal Heap Objects</caption>
+
+        <tr>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Huge Object Address<sup>O</sup><br />
+            <br /></td>
+        </tr>
+        <tr>
+            <td colspan="4"><br />Huge Object Length<sup>L</sup><br />
+            <br /></td>
+        </tr>
+        <tr>
+            <td colspan="4"><br />Huge Object ID<sup>L</sup><br />
+            <br /></td>
+        </tr>
+    </table>
+
+    <table class="note">
+        <tr>
+            <td width="60%">&nbsp;</td>
+            <td width="40%">(Items marked with an &lsquo;O&rsquo; in the
+                above table are of the size specified in &ldquo;Size of
+                Offsets&rdquo; field in the superblock.)</td>
+        </tr>
+        <tr>
+            <td>&nbsp;</td>
+            <td>(Items marked with an &lsquo;L&rsquo; in the above table are
+                of the size specified in &ldquo;Size of Lengths&rdquo; field in the
+                superblock.)</td>
+        </tr>
+    </table>
+
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Huge Object Address</p></td>
+            <td>
+                <p>The address of the huge object in the file.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Huge Object Length</p></td>
+            <td>
+                <p>The length of the huge object in the file.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Huge Object ID</p></td>
+            <td>
+                <p>The heap ID for the huge object.</p>
+            </td>
+        </tr>
+
+    </table>
+</div>
+
+<br />
+<br />
+<div align="center">
+    <table class="format">
+        <caption>Version 2 B-tree, Type 2 Record Layout - Indirectly
+            Accessed, Filtered, &lsquo;Huge&rsquo; Fractal Heap Objects</caption>
+
+        <tr>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Filtered Huge Object Address<sup>O</sup><br />
+            <br /></td>
+        </tr>
+        <tr>
+            <td colspan="4"><br />Filtered Huge Object Length<sup>L</sup><br />
+            <br /></td>
+        </tr>
+        <tr>
+            <td colspan="4">Filter Mask</td>
+        </tr>
+        <tr>
+            <td colspan="4"><br />Filtered Huge Object Memory Size<sup>L</sup><br />
+            <br /></td>
+        </tr>
+        <tr>
+            <td colspan="4"><br />Huge Object ID<sup>L</sup><br />
+            <br /></td>
+        </tr>
+    </table>
+
+    <table class="note">
+        <tr>
+            <td width="60%">&nbsp;</td>
+            <td width="40%">(Items marked with an &lsquo;O&rsquo; in the
+                above table are of the size specified in &ldquo;Size of
+                Offsets&rdquo; field in the superblock.)</td>
+        </tr>
+        <tr>
+            <td>&nbsp;</td>
+            <td>(Items marked with an &lsquo;L&rsquo; in the above table are
+                of the size specified in &ldquo;Size of Lengths&rdquo; field in the
+                superblock.)</td>
+        </tr>
+    </table>
+
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Filtered Huge Object Address</p></td>
+            <td>
+                <p>The address of the filtered huge object in the file.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Filtered Huge Object Length</p></td>
+            <td>
+                <p>The length of the filtered huge object in the file.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Filter Mask</p></td>
+            <td>
+                <p>A 32-bit bit field indicating which filters have been skipped
+                    for this chunk. Each filter has an index number in the pipeline
+                    (starting at 0, with the first filter to apply) and if that filter
+                    is skipped, the bit corresponding to its index is set.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Filtered Huge Object Memory Size</p></td>
+            <td>
+                <p>The size of the de-filtered huge object in memory.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Huge Object ID</p></td>
+            <td>
+                <p>The heap ID for the huge object.</p>
+            </td>
+        </tr>
+
+    </table>
+</div>
+
+<br />
+<br />
+<div align="center">
+    <table class="format">
+        <caption>Version 2 B-tree, Type 3 Record Layout - Directly
+            Accessed, Non-Filtered, &lsquo;Huge&rsquo; Fractal Heap Objects</caption>
+
+        <tr>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Huge Object Address<sup>O</sup><br />
+            <br /></td>
+        </tr>
+        <tr>
+            <td colspan="4"><br />Huge Object Length<sup>L</sup><br />
+            <br /></td>
+        </tr>
+    </table>
+
+    <table class="note">
+        <tr>
+            <td width="60%">&nbsp;</td>
+            <td width="40%">(Items marked with an &lsquo;O&rsquo; in the
+                above table are of the size specified in &ldquo;Size of
+                Offsets&rdquo; field in the superblock.)</td>
+        </tr>
+        <tr>
+            <td>&nbsp;</td>
+            <td>(Items marked with an &lsquo;L&rsquo; in the above table are
+                of the size specified in &ldquo;Size of Lengths&rdquo; field in the
+                superblock.)</td>
+        </tr>
+    </table>
+
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Huge Object Address</p></td>
+            <td>
+                <p>The address of the huge object in the file.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Huge Object Length</p></td>
+            <td>
+                <p>The length of the huge object in the file.</p>
+            </td>
+        </tr>
+
+    </table>
+</div>
+
+<br />
+<br />
+<div align="center">
+    <table class="format">
+        <caption>Version 2 B-tree, Type 4 Record Layout - Directly
+            Accessed, Filtered, &lsquo;Huge&rsquo; Fractal Heap Objects</caption>
+
+        <tr>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Filtered Huge Object Address<sup>O</sup><br />
+            <br /></td>
+        </tr>
+        <tr>
+            <td colspan="4"><br />Filtered Huge Object Length<sup>L</sup><br />
+            <br /></td>
+        </tr>
+        <tr>
+            <td colspan="4">Filter Mask</td>
+        </tr>
+        <tr>
+            <td colspan="4"><br />Filtered Huge Object Memory Size<sup>L</sup><br />
+            <br /></td>
+        </tr>
+    </table>
+
+    <table class="note">
+        <tr>
+            <td width="60%">&nbsp;</td>
+            <td width="40%">(Items marked with an &lsquo;O&rsquo; in the
+                above table are of the size specified in &ldquo;Size of
+                Offsets&rdquo; field in the superblock.)</td>
+        </tr>
+        <tr>
+            <td>&nbsp;</td>
+            <td>(Items marked with an &lsquo;L&rsquo; in the above table are
+                of the size specified in &ldquo;Size of Lengths&rdquo; field in the
+                superblock.)</td>
+        </tr>
+    </table>
+
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Filtered Huge Object Address</p></td>
+            <td>
+                <p>The address of the filtered huge object in the file.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Filtered Huge Object Length</p></td>
+            <td>
+                <p>The length of the filtered huge object in the file.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Filter Mask</p></td>
+            <td>
+                <p>A 32-bit bit field indicating which filters have been skipped
+                    for this chunk. Each filter has an index number in the pipeline
+                    (starting at 0, with the first filter to apply) and if that filter
+                    is skipped, the bit corresponding to its index is set.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Filtered Huge Object Memory Size</p></td>
+            <td>
+                <p>The size of the de-filtered huge object in memory.</p>
+            </td>
+        </tr>
+
+    </table>
+</div>
+
+<br />
+<br />
+<div align="center">
+    <table class="format">
+        <caption>Version 2 B-tree, Type 5 Record Layout - Link Name
+            for Indexed Group</caption>
+
+        <tr>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="4">Hash of Name</td>
+        </tr>
+        <tr>
+            <td colspan="4">ID <em>(bytes 1-4)</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="3">ID <em>(bytes 5-7)</em></td>
+        </tr>
+
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Hash</p></td>
+            <td>
+                <p>This field is hash value of the name for the link. The hash
+                    value is the Jenkins&rsquo; lookup3 checksum algorithm applied to
+                    the link&rsquo;s name.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>ID</p></td>
+            <td>
+                <p>This is a 7-byte sequence of bytes and is the heap ID for the
+                    link record in the group&rsquo;s fractal heap.</p>
+            </td>
+        </tr>
+
+    </table>
+</div>
+
+<br />
+<br />
+<div align="center">
+    <table class="format">
+        <caption>Version 2 B-tree, Type 6 Record Layout - Creation
+            Order for Indexed Group</caption>
+
+        <tr>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Creation Order <em>(8 bytes)</em><br />
+            <br /></td>
+        </tr>
+        <tr>
+            <td colspan="4">ID <em>(bytes 1-4)</em></td>
+        </tr>
+        <tr>
+            <td colspan="3">ID <em>(bytes 5-7)</em></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Creation Order</p></td>
+            <td>
+                <p>This field is the creation order value for the link.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>ID</p></td>
+            <td>
+                <p>This is a 7-byte sequence of bytes and is the heap ID for the
+                    link record in the group&rsquo;s fractal heap.</p>
+            </td>
+        </tr>
+
+    </table>
+</div>
+
+<br />
+<br />
+<div align="center">
+    <table class="format">
+        <caption>Version 2 B-tree, Type 7 Record Layout - Shared
+            Object Header Messages (Sub-Type 0 - Message in Heap)</caption>
+
+        <tr>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+        </tr>
+
+        <tr>
+            <td colspan>Message Location</td>
+            <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+        <tr>
+            <td colspan="4">Hash</td>
+        </tr>
+        <tr>
+            <td colspan="4">Reference Count</td>
+        </tr>
+        <tr>
+            <td colspan="4"><br />Heap ID <em>(8 bytes)</em><br />
+            <br /></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Message Location</p></td>
+            <td>
+                <p>This field Indicates the location where the message is
+                    stored:</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Value</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+                    <tr>
+                        <td align="center">0</td>
+                        <td>Shared message is stored in shared message index heap.</td>
+                    </tr>
+                    <tr>
+                        <td align="center">1</td>
+                        <td>Shared message is stored in object header.</td>
+                    </tr>
+                </table>
+                <p></p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Hash</p></td>
+            <td>
+                <p>This field is hash value of the shared message. The hash
+                    value is the Jenkins&rsquo; lookup3 checksum algorithm applied to
+                    the shared message.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Reference Count</p></td>
+            <td>
+                <p>The number of objects which reference this message.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Heap ID</p></td>
+            <td>
+                <p>This is an 8-byte sequence of bytes and is the heap ID for
+                    the shared message in the shared message index&rsquo;s fractal
+                    heap.</p>
+            </td>
+        </tr>
+
+    </table>
+</div>
+
+<br />
+<br />
+<div align="center">
+    <table class="format">
+        <caption>Version 2 B-tree, Type 7 Record Layout - Shared
+            Object Header Messages (Sub-Type 1 - Message in Object Header)</caption>
+
+        <tr>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+        </tr>
+
+        <tr>
+            <td colspan>Message Location</td>
+            <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+        <tr>
+            <td colspan="4">Hash</td>
+        </tr>
+        <tr>
+            <td>Reserved (zero)</td>
+            <td>Message Type</td>
+            <td colspan="2">Object Header Index</td>
+        </tr>
+        <tr>
+            <td colspan="4"><br />Object Header Address<sup>O</sup><br />
+            <br /></td>
+        </tr>
+    </table>
+
+    <table class="note">
+        <tr>
+            <td width="60%">&nbsp;</td>
+            <td width="40%">(Items marked with an &lsquo;O&rsquo; in the
+                above table are of the size specified in &ldquo;Size of
+                Offsets&rdquo; field in the superblock.)</td>
+        </tr>
+    </table>
+
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Message Location</p></td>
+            <td>
+                <p>This field Indicates the location where the message is
+                    stored:</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Value</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+                    <tr>
+                        <td align="center">0</td>
+                        <td>Shared message is stored in shared message index heap.</td>
+                    </tr>
+                    <tr>
+                        <td align="center">1</td>
+                        <td>Shared message is stored in object header.</td>
+                    </tr>
+                </table>
+                <p></p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Hash</p></td>
+            <td>
+                <p>This field is hash value of the shared message. The hash
+                    value is the Jenkins&rsquo; lookup3 checksum algorithm applied to
+                    the shared message.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Message Type</p></td>
+            <td>
+                <p>The object header message type of the shared message.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Object Header Index</p></td>
+            <td>
+                <p>
+                    This field indicates that the shared message is the n<sup>th</sup>
+                    message of its type in the specified object header.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Object Header Address</p></td>
+            <td>
+                <p>The address of the object header containing the shared
+                    message.</p>
+            </td>
+        </tr>
+
+    </table>
+</div>
+
+<br />
+<br />
+<div align="center">
+    <table class="format">
+        <caption>Version 2 B-tree, Type 8 Record Layout - Attribute
+            Name for Indexed Attributes</caption>
+
+        <tr>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Heap ID <em>(8 bytes)</em><br />
+            <br /></td>
+        </tr>
+        <tr>
+            <td colspan>Message Flags</td>
+            <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+        <tr>
+            <td colspan="4">Creation Order</td>
+        </tr>
+        <tr>
+            <td colspan="4">Hash of Name</td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Heap ID</p></td>
+            <td>
+                <p>This is an 8-byte sequence of bytes and is the heap ID for
+                    the attribute in the object&rsquo;s attribute fractal heap.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Message Flags</p></td>
+            <td><p>The object header message flags for the attribute
+                    message.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>Creation Order</p></td>
+            <td>
+                <p>This field is the creation order value for the attribute.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Hash</p></td>
+            <td>
+                <p>This field is hash value of the name for the attribute. The
+                    hash value is the Jenkins&rsquo; lookup3 checksum algorithm applied
+                    to the attribute&rsquo;s name.</p>
+            </td>
+        </tr>
+
+    </table>
+</div>
+
+<br />
+<br />
+<div align="center">
+    <table class="format">
+        <caption>Version 2 B-tree, Type 9 Record Layout- Creation
+            Order for Indexed Attributes</caption>
+
+        <tr>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Heap ID <em>(8 bytes)</em><br />
+            <br /></td>
+        </tr>
+        <tr>
+            <td colspan>Message Flags</td>
+            <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+        <tr>
+            <td colspan="4">Creation Order</td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Heap ID</p></td>
+            <td>
+                <p>This is an 8-byte sequence of bytes and is the heap ID for
+                    the attribute in the object&rsquo;s attribute fractal heap.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Message Flags</p></td>
+            <td>
+                <p>The object header message flags for the attribute message.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Creation Order</p></td>
+            <td>
+                <p>This field is the creation order value for the attribute.</p>
+            </td>
+        </tr>
+
+    </table>
+</div>
+
+
+<br />
+<h3>
+    <a name="SymbolTable"> III.B. Disk Format: Level 1B - Group Symbol
+        Table Nodes</a>
+</h3>
+
+<p>A group is an object internal to the file that allows arbitrary
+    nesting of objects within the file (including other groups). A group
+    maps a set of link names in the group to a set of relative file
+    addresses of objects in the file. Certain metadata for an object to
+    which the group points can be cached in the group&rsquo;s symbol table
+    entry in addition to being in the object&rsquo;s header.</p>
+
+<p>An HDF5 object name space can be stored hierarchically by
+    partitioning the name into components and storing each component as a
+    link in a group. The link for a non-ultimate component points to the
+    group containing the next component. The link for the last component
+    points to the object being named.</p>
+
+<p>
+    One implementation of a group is a collection of symbol table nodes
+    indexed by a B-link tree. Each symbol table node contains entries for
+    one or more links. If an attempt is made to add a link to an already
+    full symbol table node containing 2<em>K</em> entries, then the node is
+    split and one node contains <em>K</em> symbols and the other contains <em>K</em>+1
+    symbols.
+</p>
+
+<div align="center">
+    <table class="format">
+        <caption>Symbol Table Node (A Leaf of a B-link tree)</caption>
+
+        <tr>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="4">Signature</td>
+        </tr>
+
+        <tr>
+            <td>Version Number</td>
+            <td>Reserved (zero)</td>
+            <td colspan="2">Number of Symbols</td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />
+            <br />Group Entries<br />
+            <br />
+            <br /></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Signature</p></td>
+            <td>
+                <p>
+                    The ASCII character string &ldquo;
+                    <code>SNOD</code>
+                    &rdquo; is used to indicate the beginning of a symbol table node.
+                    This gives file consistency checking utilities a better chance of
+                    reconstructing a damaged file.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Version Number</p></td>
+            <td>
+                <p>The version number for the symbol table node. This document
+                    describes version 1. (There is no version &lsquo;0&rsquo; of the
+                    symbol table node)</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Number of Entries</p></td>
+            <td>
+                <p>Although all symbol table nodes have the same length, most
+                    contain fewer than the maximum possible number of link entries.
+                    This field indicates how many entries contain valid data. The valid
+                    entries are packed at the beginning of the symbol table node while
+                    the remaining entries contain undefined values.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Symbol Table Entries</p></td>
+            <td>
+                <p>
+                    Each link has an entry in the symbol table node. The format of the
+                    entry is described below. There are 2<em>K</em> entries in each
+                    group node, where <em>K</em> is the &ldquo;Group Leaf Node K&rdquo;
+                    value from the <a href="#Superblock">superblock</a>.
+                </p>
+            </td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<h3>
+    <a name="SymbolTableEntry"> III.C. Disk Format: Level 1C - Symbol
+        Table Entry </a>
+</h3>
+
+<p>Each symbol table entry in a symbol table node is designed to
+    allow for very fast browsing of stored objects. Toward that design
+    goal, the symbol table entries include space for caching certain
+    constant metadata from the object header.</p>
+
+<div align="center">
+    <table class="format">
+        <caption>Symbol Table Entry</caption>
+
+        <tr>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Link Name Offset<sup>O</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Object Header Address<sup>O</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Cache Type</td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Reserved (zero)</td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />
+            <br />Scratch-pad Space (16 bytes)<br />
+            <br />
+            <br /></td>
+        </tr>
+    </table>
+
+    <table class="note">
+        <tr>
+            <td width="60%">&nbsp;</td>
+            <td width="40%">(Items marked with an &lsquo;O&rsquo; in the
+                above table are of the size specified in &ldquo;Size of
+                Offsets&rdquo; field in the superblock.)</td>
+        </tr>
+    </table>
+
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Link Name Offset</p></td>
+            <td>
+                <p>This is the byte offset into the group&rsquo;s local heap for
+                    the name of the link. The name is null terminated.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Object Header Address</p></td>
+            <td>
+                <p>Every object has an object header which serves as a permanent
+                    location for the object&rsquo;s metadata. In addition to appearing
+                    in the object header, some of the object&rsquo;s metadata can be
+                    cached in the scratch-pad space.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Cache Type</p></td>
+            <td>
+                <p>The cache type is determined from the object header. It also
+                    determines the format for the scratch-pad space:</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Type</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+                    <tr>
+                        <td align="center">0</td>
+                        <td>No data is cached by the group entry. This is guaranteed
+                            to be the case when an object header has a link count greater
+                            than one.</td>
+                    </tr>
+                    <tr>
+                        <td align="center">1</td>
+                        <td>Group object header metadata is cached in the scratch-pad
+                            space. This implies that the symbol table entry refers to another
+                            group.</td>
+                    </tr>
+                    <tr>
+                        <td align="center">2</td>
+                        <td>The entry is a symbolic link. The first four bytes of the
+                            scratch-pad space are the offset into the local heap for the link
+                            value. The object header address will be undefined.</td>
+                    </tr>
+                </table>
+                <p></p>
+
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Reserved</p></td>
+            <td>
+                <p>These four bytes are present so that the scratch-pad space is
+                    aligned on an eight-byte boundary. They are always set to zero.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Scratch-pad Space</p></td>
+            <td>
+                <p>This space is used for different purposes, depending on the
+                    value of the Cache Type field. Any metadata about an object
+                    represented in the scratch-pad space is duplicated in the object
+                    header for that object.</p>
+                <p>Furthermore, no data is cached in the group entry scratch-pad
+                    space if the object header for the object has a link count greater
+                    than one.</p>
+            </td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<h4>Format of the Scratch-pad Space</h4>
+
+<p>The symbol table entry scratch-pad space is formatted according
+    to the value in the Cache Type field.</p>
+
+<p>
+    If the Cache Type field contains the value zero
+    <code>(0)</code>
+    then no information is stored in the scratch-pad space.
+</p>
+
+<p>
+    If the Cache Type field contains the value one
+    <code>(1)</code>
+    , then the scratch-pad space contains cached metadata for another
+    object header in the following format:
+</p>
+
+<div align="center">
+    <table class="format">
+        <caption>Object Header Scratch-pad Format</caption>
+
+        <tr>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Address of B-tree<sup>O</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Address of Name Heap<sup>O</sup><br />
+            <br /></td>
+        </tr>
+    </table>
+
+    <table class="note">
+        <tr>
+            <td width="60%">&nbsp;</td>
+            <td width="40%">(Items marked with an &lsquo;O&rsquo; in the
+                above table are of the size specified in &ldquo;Size of
+                Offsets&rdquo; field in the superblock.)</td>
+        </tr>
+    </table>
+
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Address of B-tree</p></td>
+            <td>
+                <p>This is the file address for the root of the group&rsquo;s
+                    B-tree.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Address of Name Heap</p></td>
+            <td>
+                <p>This is the file address for the group&rsquo;s local heap, in
+                    which are stored the group&rsquo;s symbol names.</p>
+            </td>
+        </tr>
+    </table>
+</div>
+
+
+<br />
+<p>
+    If the Cache Type field contains the value two
+    <code>(2)</code>
+    , then the scratch-pad space contains cached metadata for a symbolic
+    link in the following format:
+</p>
+
+<div align="center">
+    <table class="format">
+        <caption>Symbolic Link Scratch-pad Format</caption>
+
+        <tr>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="4">Offset to Link Value</td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Offset to Link Value</p></td>
+            <td>
+                <p>The value of a symbolic link (that is, the name of the thing
+                    to which it points) is stored in the local heap. This field is the
+                    4-byte offset into the local heap for the start of the link value,
+                    which is null terminated.</p>
+            </td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<h3>
+    <a name="LocalHeap"> III.D. Disk Format: Level 1D - Local Heaps</a>
+</h3>
+
+<p>A local heap is a collection of small pieces of data that are
+    particular to a single object in the HDF5 file. Objects can be inserted
+    and removed from the heap at any time. The address of a heap does not
+    change once the heap is created. For example, a group stores addresses
+    of objects in symbol table nodes with the names of links stored in the
+    group&rsquo;s local heap.</p>
+
+<div align="center">
+    <table class="format">
+        <caption>Local Heap</caption>
+
+        <tr>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="4">Signature</td>
+        </tr>
+
+        <tr>
+            <td>Version</td>
+            <td colspan="3">Reserved (zero)</td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Data Segment Size<sup>L</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Offset to Head of Free-list<sup>L</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Address of Data Segment<sup>O</sup><br />
+            <br /></td>
+        </tr>
+    </table>
+
+    <table class="note">
+        <tr>
+            <td width="60%">&nbsp;</td>
+            <td width="40%">(Items marked with an &lsquo;O&rsquo; in the
+                above table are of the size specified in &ldquo;Size of
+                Offsets&rdquo; field in the superblock.)</td>
+        </tr>
+        <tr>
+            <td>&nbsp;</td>
+            <td>(Items marked with an &lsquo;L&rsquo; in the above table are
+                of the size specified in &ldquo;Size of Lengths&rdquo; field in the
+                superblock.)</td>
+        </tr>
+    </table>
+
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Signature</p></td>
+            <td>
+                <p>
+                    The ASCII character string &ldquo;
+                    <code>HEAP</code>
+                    &rdquo; is used to indicate the beginning of a heap. This gives
+                    file consistency checking utilities a better chance of
+                    reconstructing a damaged file.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Version</p></td>
+            <td>
+                <p>Each local heap has its own version number so that new heaps
+                    can be added to old files. This document describes version zero (0)
+                    of the local heap.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Data Segment Size</p></td>
+            <td>
+                <p>The total amount of disk memory allocated for the heap data.
+                    This may be larger than the amount of space required by the objects
+                    stored in the heap. The extra unused space in the heap holds a
+                    linked list of free blocks.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Offset to Head of Free-list</p></td>
+            <td>
+                <p>
+                    This is the offset within the heap data segment of the first free
+                    block (or the <a href="#UndefinedAddress">undefined address</a> if
+                    there is no free block). The free block contains &ldquo;Size of
+                    Lengths&rdquo; bytes that are the offset of the next free block (or
+                    the value &lsquo;1&rsquo; if this is the last free block) followed
+                    by &ldquo;Size of Lengths&rdquo; bytes that store the size of this
+                    free block. The size of the free block includes the space used to
+                    store the offset of the next free block and the size of the current
+                    block, making the minimum size of a free block 2 * &ldquo;Size of
+                    Lengths&rdquo;.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Address of Data Segment</p></td>
+            <td>
+                <p>The data segment originally starts immediately after the heap
+                    header, but if the data segment must grow as a result of adding
+                    more objects, then the data segment may be relocated, in its
+                    entirety, to another part of the file.</p>
+            </td>
+        </tr>
+    </table>
+</div>
+
+<p>Objects within a local heap should be aligned on an 8-byte
+    boundary.</p>
+
+<br />
+<h3>
+    <a name="GlobalHeap"> III.E. Disk Format: Level 1E - Global Heap</a>
+</h3>
+
+<p>Each HDF5 file has a global heap which stores various types of
+    information which is typically shared between datasets. The global heap
+    was designed to satisfy these goals:</p>
+
+<ol type="A">
+    <li>Repeated access to a heap object must be efficient without
+        resulting in repeated file I/O requests. Since global heap objects
+        will typically be shared among several datasets, it is probable that
+        the object will be accessed repeatedly.</li>
+    <li>Collections of related global heap objects should result in
+        fewer and larger I/O requests. For instance, a dataset of object
+        references will have a global heap object for each reference. Reading
+        the entire set of object references should result in a few large I/O
+        requests instead of one small I/O request for each reference.</li>
+    <li>It should be possible to remove objects from the global heap
+        and the resulting file hole should be eligible to be reclaimed for
+        other uses.</li>
+</ol>
+
+
+<p>
+    The implementation of the heap makes use of the memory management
+    already available at the file level and combines that with a new object
+    called a <em>collection</em> to achieve goal B. The global heap is the
+    set of all collections. Each global heap object belongs to exactly one
+    collection and each collection contains one or more global heap
+    objects. For the purposes of disk I/O and caching, a collection is
+    treated as an atomic object, addressing goal A.
+</p>
+
+<p>When a global heap object is deleted from a collection (which
+    occurs when its reference count falls to zero), objects located after
+    the deleted object in the collection are packed down toward the
+    beginning of the collection and the collection&rsquo;s global heap
+    object 0 is created (if possible) or its size is increased to account
+    for the recently freed space. There are no gaps between objects in each
+    collection, with the possible exception of the final space in the
+    collection, if it is not large enough to hold the header for the
+    collection&rsquo;s global heap object 0. These features address goal C.
+</p>
+
+<p>The HDF5 Library creates global heap collections as needed, so
+    there may be multiple collections throughout the file. The set of all
+    of them is abstractly called the &ldquo;global heap&rdquo;, although
+    they do not actually link to each other, and there is no global place
+    in the file where you can discover all of the collections. The
+    collections are found simply by finding a reference to one through
+    another object in the file. For example, data of variable-length
+    datatype elements is stored in the global heap and is accessed via a
+    global heap ID. The format for global heap IDs is described at the end
+    of this section.</p>
+
+<div align="center">
+    <table class="format">
+        <caption>A Global Heap Collection</caption>
+
+        <tr>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="4">Signature</td>
+        </tr>
+
+        <tr>
+            <td>Version</td>
+            <td colspan="3">Reserved (zero)</td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Collection Size<sup>L</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Global Heap Object 1<br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Global Heap Object 2<br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />...<br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Global Heap Object <em>N</em><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Global Heap Object 0 (free space)<br />
+            <br /></td>
+        </tr>
+    </table>
+
+    <table class="note">
+        <tr>
+            <td width="60%">&nbsp;</td>
+            <td width="40%">(Items marked with an &lsquo;L&rsquo; in the
+                above table are of the size specified in &ldquo;Size of
+                Lengths&rdquo; field in the superblock.)</td>
+        </tr>
+    </table>
+
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Signature</p></td>
+            <td>
+                <p>
+                    The ASCII character string &ldquo;
+                    <code>GCOL</code>
+                    &rdquo; is used to indicate the beginning of a collection. This
+                    gives file consistency checking utilities a better chance of
+                    reconstructing a damaged file.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Version</p></td>
+            <td>
+                <p>Each collection has its own version number so that new
+                    collections can be added to old files. This document describes
+                    version one (1) of the collections (there is no version zero (0)).
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Collection Size</p></td>
+            <td>
+                <p>This is the size in bytes of the entire collection including
+                    this field. The default (and minimum) collection size is 4096 bytes
+                    which is a typical file system block size. This allows for 127
+                    16-byte heap objects plus their overhead (the collection header of
+                    16 bytes and the 16 bytes of information about each heap object).</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>
+                    Global Heap Object 1 through <em>N</em>
+                </p></td>
+            <td>
+                <p>The objects are stored in any order with no intervening
+                    unused space.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Global Heap Object 0</p></td>
+            <td>
+                <p>Global Heap Object 0 (zero), when present, represents the
+                    free space in the collection. Free space always appears at the end
+                    of the collection. If the free space is too small to store the
+                    header for Object 0 (described below) then the header is implied
+                    and the collection contains no free space.</p>
+            </td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<br />
+<div align="center">
+    <table class="format">
+        <caption>Global Heap Object</caption>
+
+        <tr>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="2">Heap Object Index</td>
+            <td colspan="2">Reference Count</td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Reserved (zero)</td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Object Size<sup>L</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Object Data<br />
+            <br /></td>
+        </tr>
+    </table>
+
+    <table class="note">
+        <tr>
+            <td width="60%">&nbsp;</td>
+            <td width="40%">(Items marked with an &lsquo;L&rsquo; in the
+                above table are of the size specified in &ldquo;Size of
+                Lengths&rdquo; field in the superblock.)</td>
+        </tr>
+    </table>
+
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Heap Object Index</p></td>
+            <td>
+                <p>
+                    Each object has a unique identification number within a collection.
+                    The identification numbers are chosen so that new objects have the
+                    smallest value possible with the exception that the identifier
+                    <code>0</code>
+                    always refers to the object which represents all free space within
+                    the collection.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Reference Count</p></td>
+            <td>
+                <p>All heap objects have a reference count field. An object
+                    which is referenced from some other part of the file will have a
+                    positive reference count. The reference count for Object 0 is
+                    always zero.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Reserved</p></td>
+            <td>
+                <p>Zero padding to align next field on an 8-byte boundary.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Object Size</p></td>
+            <td>
+                <p>This is the size of the object data stored for the object.
+                    The actual storage space allocated for the object data is rounded
+                    up to a multiple of eight.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Object Data</p></td>
+            <td>
+                <p>The object data is treated as a one-dimensional array of
+                    bytes to be interpreted by the caller.</p>
+            </td>
+        </tr>
+    </table>
+
+</div>
+
+<br />
+<p>The format for the ID used to locate an object in the global heap
+    is described here:</p>
+
+<div align="center">
+    <table class="format">
+        <caption>Global Heap ID</caption>
+
+        <tr>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Collection Address<sup>O</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Object Index</td>
+        </tr>
+    </table>
+
+    <table class="note">
+        <tr>
+            <td width="60%">&nbsp;</td>
+            <td width="40%">(Items marked with an &lsquo;O&rsquo; in the
+                above table are of the size specified in &ldquo;Size of
+                Offsets&rdquo; field in the superblock.)</td>
+        </tr>
+    </table>
+
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Collection Address</p></td>
+            <td>
+                <p>This field is the address of the global heap collection where
+                    the data object is stored.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>ID</p></td>
+            <td>
+                <p>This field is the index of the data object within the global
+                    heap collection.</p>
+            </td>
+        </tr>
+
+    </table>
+</div>
+
+
+<br />
+<h3>
+    <a name="FractalHeap"> III.F. Disk Format: Level 1F - Fractal Heap</a>
+</h3>
+
+<p>
+    Each fractal heap consists of a header and zero or more direct and
+    indirect blocks (described below). The header contains general
+    information as well as initialization parameters for the doubling
+    table. The <em>Root Block Address</em> in the header points to the
+    first direct or indirect block in the heap.
+</p>
+
+<p>
+    Fractal heaps are based on a data structure called a <em>doubling
+        table</em>. A doubling table provides a mechanism for quickly extending an
+    array-like data structure that minimizes the number of empty blocks in
+    the heap, while retaining very fast lookup of any element within the
+    array. More information on fractal heaps and doubling tables can be
+    found in the RFC &ldquo;<a
+        href="Supplements/FractalHeap/PrivateHeap.pdf">Private Heaps in
+        HDF5</a>.&rdquo;
+</p>
+
+<p>The fractal heap implements the doubling table structure with
+    indirect and direct blocks. Indirect blocks in the heap do not actually
+    contain data for objects in the heap, their &ldquo;size&rdquo; is
+    abstract - they represent the indexing structure for locating the
+    direct blocks in the doubling table. Direct blocks contain the actual
+    data for objects stored in the heap.</p>
+
+<p>
+    All indirect blocks have a constant number of block entries in each
+    row, called the <em>width</em> of the doubling table (stored in the
+    heap header). The number of rows for each indirect block in the heap is
+    determined by the size of the block that the indirect block represents
+    in the doubling table (calculation of this is shown below) and is
+    constant, except for the &ldquo;root&rdquo; indirect block, which
+    expands and shrinks its number of rows as needed.
+</p>
+
+<p>
+    Blocks in the first <em>two</em> rows of an indirect block are <em>Starting
+        Block Size</em> number of bytes in size, and the blocks in each subsequent
+    row are twice the size of the blocks in the previous row. In other
+    words, blocks in the third row are twice the <em>Starting Block
+        Size</em>, blocks in the fourth row are four times the <em>Starting
+        Block Size</em>, and so on. Entries for blocks up to the <em>Maximum
+        Direct Block Size</em> point to direct blocks, and entries for blocks
+    greater than that size point to further indirect blocks (which have
+    their own entries for direct and indirect blocks).
+</p>
+
+<p>
+    The number of rows of blocks, <em>nrows</em>, in an indirect block of
+    size <em>iblock_size</em> is given by the following expression: <br />
+    <br /> <em>nrows</em> = (log<sub>2</sub>(<em>iblock_size</em>) - log<sub>2</sub>(<em>&lt;Starting
+        Block Size&gt;</em> * <em>&lt;Width&gt;</em>)) + 1
+</p>
+
+<p>
+    The maximum number of rows of direct blocks, <em>max_dblock_rows</em>,
+    in any indirect block of a fractal heap is given by the following
+    expression: <br /> <br /> <em>max_dblock_rows</em> = (log<sub>2</sub>(<em>&lt;Max.
+        Direct Block Size&gt;</em>) - log<sub>2</sub>(<em>&lt;Starting Block
+        Size&gt;</em>)) + 2
+</p>
+
+<p>
+    Using the computed values for <em>nrows</em> and <em>max_dblock_rows</em>,
+    along with the <em>Width</em> of the doubling table, the number of
+    direct and indirect block entries (<em>K</em> and <em>N</em> in the
+    indirect block description, below) in an indirect block can be
+    computed: <br /> <br /> <em>K</em> = MIN(<em>nrows</em>, <em>max_dblock_rows</em>)
+    * <em>Width</em> <br /> <br /> If <em>nrows</em> is less than or
+    equal to <em>max_dblock_rows</em>, <em>N</em> is 0. Otherwise, <em>N</em>
+    is simply computed: <br /> <br /> <em>N</em> = <em>K</em> - (<em>max_dblock_rows</em>
+    * <em>Width</em>)
+</p>
+
+<p>The size indirect blocks on disk is determined by the number of
+    rows in the indirect block (computed above). The size of direct blocks
+    on disk is exactly the size of the block in the doubling table.</p>
+
+<div align="center">
+    <table class="format">
+        <caption>Fractal Heap Header</caption>
+
+        <tr>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="4">Signature</td>
+        </tr>
+
+        <tr>
+            <td>Version</td>
+            <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="2">Heap ID Length</td>
+            <td colspan="2">I/O Filters&rsquo; Encoded Length</td>
+        </tr>
+
+        <tr>
+            <td>Flags</td>
+            <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Maximum Size of Managed Objects</td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Next Huge Object ID<sup>L</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />v2 B-tree Address of Huge Objects<sup>O</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Amount of Free Space in Managed Blocks<sup>L</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Address of Managed Block Free Space
+                Manager<sup>O</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Amount of Managed Space in Heap<sup>L</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Amount of Allocated Managed Space in Heap<sup>L</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Offset of Direct Block Allocation
+                Iterator in Managed Space<sup>L</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Number of Managed Objects in Heap<sup>L</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Size of Huge Objects in Heap<sup>L</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Number of Huge Objects in Heap<sup>L</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Size of Tiny Objects in Heap<sup>L</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Number of Tiny Objects in Heap<sup>L</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="2">Table Width</td>
+            <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Starting Block Size<sup>L</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Maximum Direct Block Size<sup>L</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="2">Maximum Heap Size</td>
+            <td colspan="2">Starting # of Rows in Root Indirect Block</td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Address of Root Block<sup>O</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="2">Current # of Rows in Root Indirect Block</td>
+            <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Size of Filtered Root Direct Block <em>(optional)</em><sup>L</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">I/O Filter Mask<em> (optional)</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">I/O Filter Information<em> (optional,
+                    variable size)</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Checksum</td>
+        </tr>
+
+    </table>
+
+    <table class="note">
+        <tr>
+            <td width="60%">&nbsp;</td>
+            <td width="40%">(Items marked with an &lsquo;O&rsquo; in the
+                above table are of the size specified in &ldquo;Size of
+                Offsets&rdquo; field in the superblock.)</td>
+        </tr>
+        <tr>
+            <td>&nbsp;</td>
+            <td>(Items marked with an &lsquo;L&rsquo; in the above table are
+                of the size specified in &ldquo;Size of Lengths&rdquo; field in the
+                superblock.)</td>
+        </tr>
+    </table>
+
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="40%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Signature</p></td>
+            <td>
+                <p>
+                    The ASCII character string &ldquo;
+                    <code>FRHP</code>
+                    &rdquo; is used to indicate the beginning of a fractal heap header.
+                    This gives file consistency checking utilities a better chance of
+                    reconstructing a damaged file.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Version</p></td>
+            <td>
+                <p>This document describes version 0.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Heap ID Length</p></td>
+            <td>
+                <p>This is the length in bytes of heap object IDs for this heap.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>I/O Filters&rsquo; Encoded Length</p></td>
+            <td>
+                <p>
+                    This is the size in bytes of the encoded <em>I/O Filter
+                        Information</em>.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Flags</p></td>
+            <td>
+                <p>This field is the heap status flag and is a bit field
+                    indicating additional information about the fractal heap.</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Bit(s)</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>0</code></td>
+                        <td>If set, the ID value to use for huge object has wrapped
+                            around. If the value for the <em>Next Huge Object ID</em> has
+                            wrapped around, each new huge object inserted into the heap will
+                            require a search for an ID value.
+                        </td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>1</code></td>
+                        <td>If set, the direct blocks in the heap are checksummed.</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>2-7</code></td>
+                        <td>Reserved</td>
+                    </tr>
+                </table>
+                <p></p>
+
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Maximum Size of Managed Objects</p></td>
+            <td>
+                <p>This is the maximum size of managed objects allowed in the
+                    heap. Objects greater than this this are &lsquo;huge&rsquo; objects
+                    and will be stored in the file directly, rather than in a direct
+                    block for the heap.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Next Huge Object ID</p></td>
+            <td>
+                <p>This is the next ID value to use for a huge object in the
+                    heap.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>v2 B-tree Address of Huge Objects</p></td>
+            <td>
+                <p>
+                    This is the address of the <a href="#V2Btrees">v2 B-tree</a> used
+                    to track huge objects in the heap. The type of records stored in
+                    the <em>v2 B-tree</em> will be determined by whether the address &
+                    length of a huge object can fit into a heap ID (if yes, it is a
+                    &ldquo;directly&rdquo; accessed huge object) and whether there is a
+                    filter used on objects in the heap.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Amount of Free Space in Managed Blocks</p></td>
+            <td>
+                <p>This is the total amount of free space in managed direct
+                    blocks (in bytes).</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Address of Managed Block Free Space Manager</p></td>
+            <td>
+                <p>
+                    This is the address of the <em><a href="#FreeSpaceManager">Free-space
+                            Manager</a></em> for managed blocks.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Amount of Managed Space in Heap</p></td>
+            <td>
+                <p>This is the total amount of managed space in the heap (in
+                    bytes), essentially the upper bound of the heap&rsquo;s linear
+                    address space.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Amount of Allocated Managed Space in Heap</p></td>
+            <td>
+                <p>
+                    This is the total amount of managed space (in bytes) actually
+                    allocated in the heap. This can be less than the <em>Amount of
+                        Managed Space in Heap</em> field, if some direct blocks in the
+                    heap&rsquo;s linear address space are not allocated.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Offset of Direct Block Allocation Iterator in Managed
+                    Space</p></td>
+            <td>
+                <p>
+                    This is the linear heap offset where the next direct block should
+                    be allocated at (in bytes). This may be less than the <em>Amount
+                        of Managed Space in Heap</em> value because the heap&rsquo;s address
+                    space is increased by a &ldquo;row&rdquo; of direct blocks at a
+                    time, rather than by single direct block increments.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Number of Managed Objects in Heap</p></td>
+            <td>
+                <p>This is the number of managed objects in the heap.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Size of Huge Objects in Heap</p></td>
+            <td>
+                <p>This is the total size of huge objects in the heap (in
+                    bytes).</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Number of Huge Objects in Heap</p></td>
+            <td>
+                <p>This is the number of huge objects in the heap.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Size of Tiny Objects in Heap</p></td>
+            <td>
+                <p>This is the total size of tiny objects that are packed in
+                    heap IDs (in bytes).</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Number of Tiny Objects in Heap</p></td>
+            <td>
+                <p>This is the number of tiny objects that are packed in heap
+                    IDs.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Table Width</p></td>
+            <td>
+                <p>This is the number of columns in the doubling table for
+                    managed blocks. This value must be a power of two.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Starting Block Size</p></td>
+            <td>
+                <p>This is the starting block size to use in the doubling table
+                    for managed blocks (in bytes). This value must be a power of two.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Maximum Direct Block Size</p></td>
+            <td>
+                <p>This is the maximum size allowed for a managed direct block.
+                    Objects inserted into the heap that are larger than this value
+                    (less the # of bytes of direct block prefix/suffix) are stored as
+                    &lsquo;huge&rsquo; objects. This value must be a power of two.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Maximum Heap Size</p></td>
+            <td>
+                <p>This is the maximum size of the heap&rsquo;s linear address
+                    space for managed objects (in bytes). The value stored is the log2
+                    of the actual value, that is: the # of bits of the address space.
+                    &lsquo;Huge&rsquo; and &lsquo;tiny&rsquo; objects are not counted
+                    in this value, since they do not store objects in the linear
+                    address space of the heap.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Starting # of Rows in Root Indirect Block</p></td>
+            <td>
+                <p>
+                    This is the starting number of rows for the root indirect block. A
+                    value of 0 indicates that the root indirect block will have the
+                    maximum number of rows needed to address the heap&rsquo;s <em>Maximum
+                        Heap Size</em>.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Address of Root Block</p></td>
+            <td>
+                <p>
+                    This is the address of the root block for the heap. It can be the <a
+                        href="#UndefinedAddress">undefined address</a> if there is no data
+                    in the heap. It either points to a direct block (if the <em>Current
+                        # of Rows in the Root Indirect Block</em> value is 0), or an indirect
+                    block.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Current # of Rows in Root Indirect Block</p></td>
+            <td>
+                <p>
+                    This is the current number of rows in the root indirect block. A
+                    value of 0 indicates that <em>Address of Root Block</em> points to
+                    direct block instead of indirect block.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Size of Filtered Root Direct Block</p></td>
+            <td>
+                <p>
+                    This is the size of the root direct block, if filters are applied
+                    to heap objects (in bytes). This field is only stored in the header
+                    if the <em>I/O Filters&rsquo; Encoded Length</em> is greater than
+                    0.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>I/O Filter Mask</p></td>
+            <td>
+                <p>
+                    This is the filter mask for the root direct block, if filters are
+                    applied to heap objects. This mask has the same format as that used
+                    for the filter mask in chunked raw data records in a <a
+                        href="#V1Btrees">v1 B-tree</a>. This field is only stored in the
+                    header if the <em>I/O Filters&rsquo; Encoded Length</em> is greater
+                    than 0.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>I/O Filter Information</p></td>
+            <td>
+                <p>
+                    This is the I/O filter information encoding direct blocks and huge
+                    objects, if filters are applied to heap objects. This field is
+                    encoded as a <a href="#FilterMessage">Filter Pipeline</a> message.
+                    The size of this field is determined by <em>I/O Filters&rsquo;
+                        Encoded Length</em>.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Checksum</p></td>
+            <td>
+                <p>This is the checksum for the header.</p>
+            </td>
+        </tr>
+
+    </table>
+</div>
+
+<br />
+<br />
+<div align="center">
+    <table class="format">
+        <caption>Fractal Heap Direct Block</caption>
+
+        <tr>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="4">Signature</td>
+        </tr>
+
+        <tr>
+            <td>Version</td>
+            <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Heap Header Address<sup>O</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Block Offset <em>(variable size)</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Checksum <em>(optional)</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Object Data <em>(variable size)</em><br />
+            <br /></td>
+        </tr>
+
+    </table>
+
+    <table class="note">
+        <tr>
+            <td width="60%">&nbsp;</td>
+            <td width="40%">(Items marked with an &lsquo;O&rsquo; in the
+                above table are of the size specified in &ldquo;Size of
+                Offsets&rdquo; field in the superblock.)</td>
+        </tr>
+    </table>
+
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Signature</p></td>
+            <td>
+                <p>
+                    The ASCII character string &ldquo;
+                    <code>FHDB</code>
+                    &rdquo; is used to indicate the beginning of a fractal heap direct
+                    block. This gives file consistency checking utilities a better
+                    chance of reconstructing a damaged file.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Version</p></td>
+            <td>
+                <p>This document describes version 0.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Heap Header Address</p></td>
+            <td>
+                <p>This is the address for the fractal heap header that this
+                    block belongs to. This field is principally used for file integrity
+                    checking.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Block Offset</p></td>
+            <td>
+                <p>
+                    This is the offset of the block within the fractal heap&rsquo;s
+                    address space (in bytes). The number of bytes used to encode this
+                    field is the <em>Maximum Heap Size</em> (in the heap&rsquo;s
+                    header) divided by 8 and rounded up to the next highest integer,
+                    for values that are not a multiple of 8. This value is principally
+                    used for file integrity checking.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Checksum</p></td>
+            <td>
+                <p>This is the checksum for the direct block.</p>
+                <p>
+                    This field is only present if bit 1 of <em>Flags</em> in the
+                    heap&rsquo;s header is set.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Object Data</p></td>
+            <td>
+                <p>
+                    This section of the direct block stores the actual data for objects
+                    in the heap. The size of this section is determined by the direct
+                    block&rsquo;s size minus the size of the other fields stored in the
+                    direct block (for example, the <em>Signature</em>, <em>Version</em>,
+                    and others including the <em>Checksum</em> if it is present).
+                </p>
+            </td>
+        </tr>
+
+    </table>
+</div>
+
+<br />
+<br />
+<div align="center">
+    <table class="format">
+        <caption>Fractal Heap Indirect Block</caption>
+
+        <tr>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="4">Signature</td>
+        </tr>
+
+        <tr>
+            <td>Version</td>
+            <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Heap Header Address<sup>O</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Block Offset <em>(variable size)</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Child Direct Block #0 Address<sup>O</sup><br />
+            <br /></td>
+        </tr>
+        <tr>
+            <td colspan="4"><br />Size of Filtered Direct Block #0 <em>(optional)</em>
+                <sup>L</sup><br />
+            <br /></td>
+        </tr>
+        <tr>
+            <td colspan="4">Filter Mask for Direct Block #0 <em>(optional)</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Child Direct Block #1 Address<sup>O</sup><br />
+            <br /></td>
+        </tr>
+        <tr>
+            <td colspan="4"><br />Size of Filtered Direct Block #1 <em>(optional)</em><sup>L</sup><br />
+            <br /></td>
+        </tr>
+        <tr>
+            <td colspan="4">Filter Mask for Direct Block #1 <em>(optional)</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">...</td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Child Direct Block #K-1 Address<sup>O</sup><br />
+            <br /></td>
+        </tr>
+        <tr>
+            <td colspan="4"><br />Size of Filtered Direct Block #K-1 <em>(optional)</em><sup>L</sup><br />
+            <br /></td>
+        </tr>
+        <tr>
+            <td colspan="4">Filter Mask for Direct Block #K-1 <em>(optional)</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Child Indirect Block #0 Address<sup>O</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Child Indirect Block #1 Address<sup>O</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">...</td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Child Indirect Block #N-1 Address<sup>O</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Checksum</td>
+        </tr>
+    </table>
+
+    <table class="note">
+        <tr>
+            <td width="60%">&nbsp;</td>
+            <td width="40%">(Items marked with an &lsquo;O&rsquo; in the
+                above table are of the size specified in &ldquo;Size of
+                Offsets&rdquo; field in the superblock.)</td>
+        </tr>
+        <tr>
+            <td>&nbsp;</td>
+            <td>(Items marked with an &lsquo;L&rsquo; in the above table are
+                of the size specified in &ldquo;Size of Lengths&rdquo; field in the
+                superblock.)</td>
+        </tr>
+    </table>
+
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Signature</p></td>
+            <td>
+                <p>
+                    The ASCII character string &ldquo;
+                    <code>FHIB</code>
+                    &rdquo; is used to indicate the beginning of a fractal heap
+                    indirect block. This gives file consistency checking utilities a
+                    better chance of reconstructing a damaged file.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Version</p></td>
+            <td>
+                <p>This document describes version 0.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Heap Header Address</p></td>
+            <td>
+                <p>This is the address for the fractal heap header that this
+                    block belongs to. This field is principally used for file integrity
+                    checking.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Block Offset</p></td>
+            <td>
+                <p>
+                    This is the offset of the block within the fractal heap&rsquo;s
+                    address space (in bytes). The number of bytes used to encode this
+                    field is the <em>Maximum Heap Size</em> (in the heap&rsquo;s
+                    header) divided by 8 and rounded up to the next highest integer,
+                    for values that are not a multiple of 8. This value is principally
+                    used for file integrity checking.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Child Direct Block #K Address</p></td>
+            <td>
+                <p>This field is the address of the child direct block. The size
+                    of the [uncompressed] direct block can be computed by its offset in
+                    the heap&rsquo;s linear address space.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Size of Filtered Direct Block #K</p></td>
+            <td>
+                <p>This is the size of the child direct block after passing
+                    through the I/O filters defined for this heap (in bytes). If no I/O
+                    filters are present for this heap, this field is not present.</p>
+            </td>
+        </tr>
+        <tr>
+            <td><p>Filter Mask for Direct Block #K</p></td>
+            <td>
+                <p>
+                    This is the I/O filter mask for the filtered direct block. This
+                    mask has the same format as that used for the filter mask in
+                    chunked raw data records in a <a href="#V1Btrees">v1 B-tree</a>. If
+                    no I/O filters are present for this heap, this field is not
+                    present.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Child Indirect Block #N Address</p></td>
+            <td>
+                <p>This field is the address of the child indirect block. The
+                    size of the indirect block can be computed by its offset in the
+                    heap&rsquo;s linear address space.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Checksum</p></td>
+            <td>
+                <p>This is the checksum for the indirect block.</p>
+            </td>
+        </tr>
+
+    </table>
+
+</div>
+
+<br />
+<p>An object in the fractal heap is identified by means of a fractal
+    heap ID, which encodes information to locate the object in the heap.
+    Currently, the fractal heap stores an object in one of three ways,
+    depending on the object&rsquo;s size:</p>
+
+<div align="center">
+    <table class="list80">
+        <tr>
+            <th width="20%">Type</th>
+            <th width="80%" align="left">Description</th>
+        </tr>
+
+        <tr>
+            <td align="center">Tiny</td>
+            <td>
+                <p>When an object is small enough to be encoded in the heap ID,
+                    the object&rsquo;s data is embedded in the fractal heap ID itself.
+                    There are 2 sub-types for this type of object: normal and extended.
+                    The sub-type for tiny heap IDs depends on whether the heap ID is
+                    large enough to store objects greater than 16 bytes or not. If the
+                    heap ID length is 18 bytes or smaller, the &lsquo;normal&rsquo;
+                    tiny heap ID form is used. If the heap ID length is greater than 18
+                    bytes in length, the &ldquo;extended&rdquo; form is used. See
+                    format description below for both sub-types.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td align="center">Huge</td>
+            <td>
+                <p>
+                    When the size of an object is larger than <em>Maximum Size of
+                        Managed Objects</em> in the <em>Fractal Heap Header</em>, the
+                    object&rsquo;s data is stored on its own in the file and the object
+                    is tracked/indexed via a version 2 B-tree. All huge objects for a
+                    particular fractal heap use the same v2 B-tree. All huge objects
+                    for a particular fractal heap use the same format for their huge
+                    object IDs.
+                </p>
+
+                <p>Depending on whether the IDs for a heap are large enough to
+                    hold the object&rsquo;s retrieval information and whether I/O
+                    pipeline filters are applied to the heap&rsquo;s objects, 4
+                    sub-types are derived for huge object IDs for this heap:</p>
+
+                <div align="center">
+                    <table class="list">
+                        <tr>
+                            <th align="left" width="35%">Sub-type</th>
+                            <th align="left">Description</th>
+                        </tr>
+
+                        <tr>
+                            <td align="left">Directly accessed, non-filtered</td>
+                            <td>
+                                <p>The object&rsquo;s address and length are embedded in the
+                                    fractal heap ID itself and the object is directly accessed from
+                                    them. This allows the object to be accessed without resorting
+                                    to the B-tree.</p>
+                            </td>
+                        </tr>
+
+                        <tr>
+                            <td align="left">Directly accessed, filtered</td>
+                            <td>
+                                <p>The filtered object&rsquo;s address, length, filter mask
+                                    and de-filtered size are embedded in the fractal heap ID itself
+                                    and the object is accessed directly with them. This allows the
+                                    object to be accessed without resorting to the B-tree.</p>
+                            </td>
+                        </tr>
+
+                        <tr>
+                            <td align="left">Indirectly accessed, non-filtered</td>
+                            <td>
+                                <p>The object is located by using a B-tree key embedded in
+                                    the fractal heap ID to retrieve the address and length from the
+                                    version 2 B-tree for huge objects. Then, the address and length
+                                    are used to access the object.</p>
+                            </td>
+                        </tr>
+
+                        <tr>
+                            <td align="left">Indirectly accessed, filtered</td>
+                            <td>
+                                <p>The object is located by using a B-tree key embedded in
+                                    the fractal heap ID to retrieve the filtered object&rsquo;s
+                                    address, length, filter mask and de-filtered size from the
+                                    version 2 B-tree for huge objects. Then, this information is
+                                    used to access the object.</p>
+                            </td>
+                        </tr>
+                    </table>
+                </div>
+
+            </td>
+        </tr>
+
+        <tr>
+            <td align="center">Managed</td>
+            <td>
+                <p>When the size of an object does not meet the above two
+                    conditions, the object is stored and managed via the direct and
+                    indirect blocks based on the doubling table.</p>
+            </td>
+        </tr>
+    </table>
+</div>
+
+
+<p>The specific format for each type of heap ID is described below:
+</p>
+
+<div align="center">
+    <table class="format">
+        <caption>Fractal Heap ID for Tiny Objects (sub-type 1 -
+            &lsquo;Normal&rsquo;)</caption>
+
+        <tr>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+        </tr>
+
+        <tr>
+            <td>Version, Type & Length</td>
+            <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Data <em>(variable size)</em></td>
+        </tr>
+
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Version, Type & Length</p></td>
+            <td>
+                <p>This is a bit field with the following definition:</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Bit</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>6-7</code></td>
+                        <td>The current version of ID format. This document describes
+                            version 0.</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>4-5</code></td>
+                        <td>The ID type. Tiny objects have a value of <code>2</code>.
+                        </td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>0-3</code></td>
+                        <td>The length of the tiny object. The value stored is one
+                            less than the actual length (since zero-length objects are not
+                            allowed to be stored in the heap). For example, an object of
+                            actual length 1 has an encoded length of 0, an object of actual
+                            length 2 has an encoded length of 1, and so on.</td>
+                    </tr>
+                </table>
+                <p></p>
+
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Data</p></td>
+            <td>
+                <p>This is the data for the object.</p>
+            </td>
+        </tr>
+
+    </table>
+</div>
+
+<br />
+<br />
+<div align="center">
+    <table class="format">
+        <caption>Fractal Heap ID for Tiny Objects (sub-type 2 -
+            &lsquo;Extended&rsquo;)</caption>
+
+        <tr>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+        </tr>
+
+        <tr>
+            <td>Version, Type & Length</td>
+            <td>Extended Length</td>
+            <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Data <em>(variable size)</em></td>
+        </tr>
+
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Version, Type & Length</p></td>
+            <td>
+                <p>This is a bit field with the following definition:</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Bit</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>6-7</code></td>
+                        <td>The current version of ID format. This document describes
+                            version 0.</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>4-5</code></td>
+                        <td>The ID type. Tiny objects have a value of <code>2</code>.
+                        </td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>0-3</code></td>
+                        <td>These 4 bits, together with the next byte, form an
+                            unsigned 12-bit integer for holding the length of the object.
+                            These 4-bits are bits 8-11 of the 12-bit integer. See description
+                            for the <em>Extended Length</em> field below.
+                        </td>
+                    </tr>
+                </table>
+                <p></p>
+
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Extended Length</p></td>
+            <td>
+                <p>This byte, together with the 4 bits in the previous byte,
+                    forms an unsigned 12-bit integer for holding the length of the tiny
+                    object. These 8 bits are bits 0-7 of the 12-bit integer formed. The
+                    value stored is one less than the actual length (since zero-length
+                    objects are not allowed to be stored in the heap). For example, an
+                    object of actual length 1 has an encoded length of 0, an object of
+                    actual length 2 has an encoded length of 1, and so on.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Data</p></td>
+            <td>
+                <p>This is the data for the object.</p>
+            </td>
+        </tr>
+
+    </table>
+</div>
+
+
+<br />
+<br />
+<div align="center">
+    <table class="format">
+        <caption>Fractal Heap ID for Huge Objects (sub-type 1 & 2):
+            indirectly accessed, non-filtered/filtered</caption>
+
+        <tr>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+        </tr>
+
+        <tr>
+            <td>Version & Type</td>
+            <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />v2 B-tree Key<sup>L</sup><em>
+                    (variable size)</em><br />
+            <br /></td>
+        </tr>
+
+    </table>
+
+    <table class="note">
+        <tr>
+            <td width="60%">&nbsp;</td>
+            <td width="40%">(Items marked with an &lsquo;L&rsquo; in the
+                above table are of the size specified in &ldquo;Size of
+                Lengths&rdquo; field in the superblock.)</td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Version & Type</p></td>
+            <td>
+                <p>This is a bit field with the following definition:</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Bit</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>6-7</code></td>
+                        <td>The current version of ID format. This document describes
+                            version 0.</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>4-5</code></td>
+                        <td>The ID type. Huge objects have a value of <code>1</code>.
+                        </td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>0-3</code></td>
+                        <td>Reserved.</td>
+                    </tr>
+                </table>
+                <p></p>
+
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>v2 B-tree Key</p></td>
+            <td><p>
+                    This field is the B-tree key for retrieving the information from
+                    the version 2 B-tree for huge objects needed to access the object.
+                    See the description of <a href="#V2Btrees">v2 B-tree</a> records
+                    sub-type 1 & 2 for a description of the fields. New key values are
+                    derived from <em>Next Huge Object ID</em> in the <em>Fractal
+                        Heap Header</em>.
+                </p></td>
+        </tr>
+
+    </table>
+</div>
+
+<br />
+<br />
+<div align="center">
+    <table class="format">
+        <caption>Fractal Heap ID for Huge Objects (sub-type 3):
+            directly accessed, non-filtered</caption>
+
+        <tr>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+        </tr>
+
+        <tr>
+            <td>Version & Type</td>
+            <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Address <sup>O</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Length <sup>L</sup><br />
+            <br /></td>
+        </tr>
+
+    </table>
+
+    <table class="note">
+        <tr>
+            <td width="60%">&nbsp;</td>
+            <td width="40%">(Items marked with an &lsquo;O&rsquo; in the
+                above table are of the size specified in &ldquo;Size of
+                Offsets&rdquo; field in the superblock.)</td>
+        </tr>
+        <tr>
+            <td>&nbsp;</td>
+            <td>(Items marked with an &lsquo;L&rsquo; in the above table are
+                of the size specified in &ldquo;Size of Lengths&rdquo; field in the
+                superblock.)</td>
+        </tr>
+    </table>
+
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Version & Type</p></td>
+            <td>
+                <p>This is a bit field with the following definition:</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Bit</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>6-7</code></td>
+                        <td>The current version of ID format. This document describes
+                            version 0.</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>4-5</code></td>
+                        <td>The ID type. Huge objects have a value of <code>1</code>.
+                        </td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>0-3</code></td>
+                        <td>Reserved.</td>
+                    </tr>
+                </table>
+                <p></p>
+
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Address</p></td>
+            <td><p>This field is the address of the object in the file.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Length</p></td>
+            <td><p>This field is the length of the object in the file.</p></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<br />
+<div align="center">
+    <table class="format">
+        <caption>Fractal Heap ID for Huge Objects (sub-type 4):
+            directly accessed, filtered</caption>
+
+        <tr>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+        </tr>
+
+        <tr>
+            <td>Version & Type</td>
+            <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Address <sup>O</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Length <sup>L</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Filter Mask</td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />De-filtered Size <sup>L</sup><br />
+            <br /></td>
+        </tr>
+
+    </table>
+
+    <table class="note">
+        <tr>
+            <td width="60%">&nbsp;</td>
+            <td width="40%">(Items marked with an &lsquo;O&rsquo; in the
+                above table are of the size specified in &ldquo;Size of
+                Offsets&rdquo; field in the superblock.)</td>
+        </tr>
+        <tr>
+            <td>&nbsp;</td>
+            <td>(Items marked with an &lsquo;L&rsquo; in the above table are
+                of the size specified in &ldquo;Size of Lengths&rdquo; field in the
+                superblock.)</td>
+        </tr>
+    </table>
+
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Version & Type</p></td>
+            <td>
+                <p>This is a bit field with the following definition:</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Bit</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>6-7</code></td>
+                        <td>The current version of ID format. This document describes
+                            version 0.</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>4-5</code></td>
+                        <td>The ID type. Huge objects have a value of <code>1</code>.
+                        </td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>0-3</code></td>
+                        <td>Reserved.</td>
+                    </tr>
+                </table>
+                <p></p>
+
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Address</p></td>
+            <td><p>This field is the address of the filtered object in
+                    the file.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>Length</p></td>
+            <td><p>This field is the length of the filtered object in
+                    the file.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>Filter Mask</p></td>
+            <td><p>This field is the I/O pipeline filter mask for the
+                    filtered object in the file.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>Filtered Size</p></td>
+            <td><p>This field is the size of the de-filtered object in
+                    the file.</p></td>
+        </tr>
+
+    </table>
+</div>
+
+<br />
+<br />
+<div align="center">
+    <table class="format">
+        <caption>Fractal Heap ID for Managed Objects</caption>
+
+        <tr>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+        </tr>
+
+        <tr>
+            <td>Version & Type</td>
+            <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+        <tr>
+            <td colspan="4">Offset <em>(variable size)</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Length <em>(variable size)</em></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Version & Type</p></td>
+            <td><p>This is a bit field with the following definition:</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Bit</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>6-7</code></td>
+                        <td>The current version of ID format. This document describes
+                            version 0.</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>4-5</code></td>
+                        <td>The ID type. Managed objects have a value of <code>0</code>.
+                        </td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>0-3</code></td>
+                        <td>Reserved.</td>
+                    </tr>
+                </table>
+                <p></p></td>
+        </tr>
+
+        <tr>
+            <td><p>Offset</p></td>
+            <td><p>
+                    This field is the offset of the object in the heap. This
+                    field&rsquo;s size is the minimum number of bytes necessary to
+                    encode the <em>Maximum Heap Size</em> value (from the <em>Fractal
+                        Heap Header</em>). For example, if the value of the <em>Maximum
+                        Heap Size</em> is less than 256 bytes, this field is 1 byte in length,
+                    a <em>Maximum Heap Size</em> of 256-65535 bytes uses a 2 byte
+                    length, and so on.
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>Length</p></td>
+            <td><p>
+                    This field is the length of the object in the heap. It is
+                    determined by taking the minimum value of <em>Maximum Direct
+                        Block Size</em> and <em>Maximum Size of Managed Objects</em> in the <em>Fractal
+                        Heap Header</em>. Again, the minimum number of bytes needed to encode
+                    that value is used for the size of this field.
+                </p></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<h3>
+    <a name="FreeSpaceManager"> III.G. Disk Format: Level 1G -
+        Free-space Manager</a>
+</h3>
+
+<p>Free-space managers are used to describe space within a heap or
+    the entire HDF5 file that is not currently used for that heap or file.
+</p>
+
+<p>
+    The <em>free-space manager header</em> contains metadata information
+    about the space being tracked, along with the address of the list of <em>free
+        space sections</em> which actually describes the free space. The header
+    records information about free-space sections being tracked, creation
+    parameters for handling free-space sections of a client, and section
+    information used to locate the collection of free-space sections.
+</p>
+
+<p>
+    The <em>free-space section list</em> stores a collection of free-space
+    sections that is specific to each <em>client</em> of the free-space
+    manager. For example, the fractal heap is a client of the free space
+    manager and uses it to track unused space within the heap. There are 4
+    types of section records for the fractal heap, each of which has its
+    own format, listed below.
+</p>
+
+<div align="center">
+    <table class="format">
+        <caption>Free-space Manager Header</caption>
+
+        <tr>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="4">Signature</td>
+        </tr>
+
+        <tr>
+            <td>Version</td>
+            <td>Client ID</td>
+            <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Total Space Tracked<sup>L</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Total Number of Sections<sup>L</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Number of Serialized Sections<sup>L</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Number of Un-Serialized Sections<sup>L</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="2">Number of Section Classes</td>
+            <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="2">Shrink Percent</td>
+            <td colspan="2">Expand Percent</td>
+        </tr>
+
+        <tr>
+            <td colspan="2">Size of Address Space</td>
+            <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Maximum Section Size <sup>L</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Address of Serialized Section List<sup>O</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Size of Serialized Section List Used<sup>L</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Allocated Size of Serialized Section List<sup>L</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Checksum</td>
+        </tr>
+    </table>
+
+    <table class="note">
+        <tr>
+            <td width="60%">&nbsp;</td>
+            <td width="40%">(Items marked with an &lsquo;O&rsquo; in the
+                above table are of the size specified in &ldquo;Size of
+                Offsets&rdquo; field in the superblock.)</td>
+        </tr>
+        <tr>
+            <td>&nbsp;</td>
+            <td>(Items marked with an &lsquo;L&rsquo; in the above table are
+                of the size specified in &ldquo;Size of Lengths&rdquo; field in the
+                superblock.)</td>
+        </tr>
+    </table>
+
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="35%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Signature</p></td>
+            <td>
+                <p>
+                    The ASCII character string &ldquo;
+                    <code>FSHD</code>
+                    &rdquo; is used to indicate the beginning of the Free-space Manager
+                    Header. This gives file consistency checking utilities a better
+                    chance of reconstructing a damaged file.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Version</p></td>
+            <td>
+                <p>This is the version number for the Free-space Manager Header
+                    and this document describes version 0.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Client ID</p></td>
+            <td>
+                <p>This is the client ID for identifying the user of this
+                    free-space manager:</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">ID</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>0</code></td>
+                        <td>Fractal heap</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>1</code></td>
+                        <td>File</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>2+</code></td>
+                        <td>Reserved.</td>
+                    </tr>
+                </table>
+                <p></p>
+
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Total Space Tracked</p></td>
+            <td>
+                <p>This is the total amount of free space being tracked, in
+                    bytes.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Total Number of Sections</p></td>
+            <td>
+                <p>This is the total number of free-space sections being
+                    tracked.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Number of Serialized Sections</p></td>
+            <td>
+                <p>This is the number of serialized free-space sections being
+                    tracked.</p>
+            </td>
+        </tr>
+        <tr>
+            <td><p>Number of Un-Serialized Sections</p></td>
+            <td>
+                <p>This is the number of un-serialized free-space sections being
+                    managed. Un-serialized sections are created by the free-space
+                    client when the list of sections is read in.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Number of Section Classes</p></td>
+            <td>
+                <p>This is the number of section classes handled by this free
+                    space manager for the free-space client.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Shrink Percent</p></td>
+            <td>
+                <p>This is the percent of current size to shrink the allocated
+                    serialized free-space section list.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Expand Percent</p></td>
+            <td>
+                <p>This is the percent of current size to expand the allocated
+                    serialized free-space section list.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Size of Address Space</p></td>
+            <td>
+                <p>
+                    This is the size of the address space that free-space sections are
+                    within. This is stored as the log<sub>2</sub> of the actual value
+                    (in other words, the number of bits required to store values within
+                    that address space).
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Maximum Section Size</p></td>
+            <td>
+                <p>This is the maximum size of a section to be tracked.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Address of Serialized Section List</p></td>
+            <td>
+                <p>This is the address where the serialized free-space section
+                    list is stored.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Size of Serialized Section List Used</p></td>
+            <td>
+                <p>
+                    This is the size of the serialized free-space section list used (in
+                    bytes). This value must be less than or equal to the <em>allocated
+                        size of serialized section list</em>, below.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Allocated Size of Serialized Section List</p></td>
+            <td>
+                <p>This is the size of serialized free-space section list
+                    actually allocated (in bytes).</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Checksum</p></td>
+            <td>
+                <p>This is the checksum for the free-space manager header.</p>
+            </td>
+        </tr>
+
+    </table>
+</div>
+
+<br />
+<p>
+    The free-space sections being managed are stored in a <em>free-space
+        section list</em>, described below. The sections in the free-space section
+    list are stored in the following way: a count of the number of sections
+    describing a particular size of free space and the size of the
+    free-space described (in bytes), followed by a list of section
+    description records; then another section count and size, followed by
+    the list of section descriptions for that size; and so on.
+</p>
+
+
+<div align="center">
+    <table class="format">
+        <caption>Free-space Section List</caption>
+
+        <tr>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="4">Signature</td>
+        </tr>
+
+        <tr>
+            <td>Version</td>
+            <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Free-space Manager Header Address<sup>O</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Number of Section Records in Set #0 <em>(variable
+                    size)</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Size of Free-space Section Described in Record
+                Set #0 <em>(variable size)</em>
+            </td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Record Set #0 Section Record #0 Offset<em>(variable
+                    size)</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="1">Record Set #0 Section Record #0 Type</td>
+            <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Record Set #0 Section Record #0 Data <em>(variable
+                    size)</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">...</td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Record Set #0 Section Record #K-1 Offset<em>(variable
+                    size)</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="1">Record Set #0 Section Record #K-1 Type</td>
+            <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Record Set #0 Section Record #K-1 Data <em>(variable
+                    size)</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Number of Section Records in Set #1 <em>(variable
+                    size)</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Size of Free-space Section Described in Record
+                Set #1 <em>(variable size)</em>
+            </td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Record Set #1 Section Record #0 Offset<em>(variable
+                    size)</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="1">Record Set #1 Section Record #0 Type</td>
+            <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Record Set #1 Section Record #0 Data <em>(variable
+                    size)</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">...</td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Record Set #1 Section Record #K-1 Offset<em>(variable
+                    size)</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="1">Record Set #1 Section Record #K-1 Type</td>
+            <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Record Set #1 Section Record #K-1 Data <em>(variable
+                    size)</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><strong>...</strong></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><strong>...</strong></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Number of Section Records in Set #N-1 <em>(variable
+                    size)</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Size of Free-space Section Described in Record
+                Set #N-1 <em>(variable size)</em>
+            </td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Record Set #N-1 Section Record #0 Offset<em>(variable
+                    size)</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="1">Record Set #N-1 Section Record #0 Type</td>
+            <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Record Set #N-1 Section Record #0 Data <em>(variable
+                    size)</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">...</td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Record Set #N-1 Section Record #K-1 Offset<em>(variable
+                    size)</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="1">Record Set #N-1 Section Record #K-1 Type</td>
+            <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Record Set #N-1 Section Record #K-1 Data <em>(variable
+                    size)</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Checksum</td>
+        </tr>
+    </table>
+
+    <table class="note">
+        <tr>
+            <td width="60%">&nbsp;</td>
+            <td width="40%">(Items marked with an &lsquo;O&rsquo; in the
+                above table are of the size specified in &ldquo;Size of
+                Offsets&rdquo; field in the superblock.)</td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="35%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Signature</p></td>
+            <td>
+                <p>
+                    The ASCII character string &ldquo;
+                    <code>FSSE</code>
+                    &rdquo; is used to indicate the beginning of the Free-space Section
+                    Information. This gives file consistency checking utilities a
+                    better chance of reconstructing a damaged file.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Version</p></td>
+            <td>
+                <p>This is the version number for the Free-space Section List
+                    and this document describes version 0.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Free-space Manager Header Address</p></td>
+            <td>
+                <p>
+                    This is the address of the <em>Free-space Manager Header</em>. This
+                    field is principally used for file integrity checking.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Number of Section Records for Set #N</p></td>
+            <td>
+                <p>
+                    This is the number of free-space section records for set #N. The
+                    length of this field is the minimum number of bytes needed to store
+                    the <em>number of serialized sections</em> (from the <em>free-space
+                        manager header</em>).
+                </p>
+
+                <p>
+                    The number of sets of free-space section records is determined by
+                    the <em>size of serialized section list</em> in the <em>free-space
+                        manager header</em>.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Section Size for Record Set #N</p></td>
+            <td>
+                <p>
+                    This is the size (in bytes) of the free-space section described for
+                    <em>all</em> the section records in set #N.
+                </p>
+
+                <p>
+                    The length of this field is the minimum number of bytes needed to
+                    store the <em>maximum section size</em> (from the <em>free-space
+                        manager header</em>).
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Record Set #N Section #K Offset</p></td>
+            <td>
+                <p>This is the offset (in bytes) of the free-space section
+                    within the client for the free-space manager.</p>
+
+                <p>
+                    The length of this field is the minimum number of bytes needed to
+                    store the <em>size of address space</em> (from the <em>free-space
+                        manager header</em>).
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Record Set #N Section #K Type</p></td>
+            <td>
+                <p>
+                    This is the type of the section record, used to decode the <em>record
+                        set #N section #K data</em> information. The defined record type for <em>file</em>
+                    client is:
+
+                </p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Type</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>0</code></td>
+                        <td>File&rsquo;s section (a range of actual bytes in file)</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>1+</code></td>
+                        <td>Reserved.</td>
+                    </tr>
+                </table>
+                <p></p>
+
+                <p>
+                    The defined record types for a <em>fractal heap</em> client are:
+
+                </p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Type</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>0</code></td>
+                        <td>Fractal heap &ldquo;single&rdquo; section</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>1</code></td>
+                        <td>Fractal heap &ldquo;first row&rdquo; section</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>2</code></td>
+                        <td>Fractal heap &ldquo;normal row&rdquo; section</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>3</code></td>
+                        <td>Fractal heap &ldquo;indirect&rdquo; section</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>4+</code></td>
+                        <td>Reserved.</td>
+                    </tr>
+                </table>
+                <p></p>
+
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Record Set #N Section #K Data</p></td>
+            <td>
+                <p>This is the section-type specific information for each record
+                    in the record set, described below.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Checksum</p></td>
+            <td>
+                <p>
+                    This is the checksum for the <em>Free-space Section List</em>.
+                </p>
+            </td>
+        </tr>
+
+    </table>
+</div>
+
+<br />
+<p>The section-type specific data for each free-space section record
+    is described below:</p>
+
+<div align="center">
+    <table class="format">
+        <caption>File&rsquo;s Section Data Record</caption>
+
+        <tr>
+            <td colspan="4"><em>No additional record data stored</em></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<br />
+<div align="center">
+    <table class="format">
+        <caption>Fractal Heap &ldquo;Single&rdquo; Section Data
+            Record</caption>
+
+        <tr>
+            <td colspan="4"><em>No additional record data stored</em></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<br />
+<div align="center">
+    <table class="format">
+        <caption>Fractal Heap &ldquo;First Row&rdquo; Section Data
+            Record</caption>
+
+        <tr>
+            <td colspan="4"><em>Same format as &ldquo;indirect&rdquo;
+                    section data</em></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<br />
+<div align="center">
+    <table class="format">
+        <caption>Fractal Heap &ldquo;Normal Row&rdquo; Section Data
+            Record</caption>
+
+        <tr>
+            <td colspan="4"><em>No additional record data stored</em></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<br />
+<div align="center">
+    <table class="format">
+        <caption>Fractal Heap &ldquo;Indirect&rdquo; Section Data
+            Record</caption>
+
+        <tr>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="4">Fractal Heap Indirect Block Offset <em>(variable
+                    size)</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="2">Block Start Row</td>
+            <td colspan="2">Block Start Column</td>
+        </tr>
+
+        <tr>
+            <td colspan="2">Number of Blocks</td>
+            <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Fractal Heap Block Offset</p></td>
+            <td>
+                <p>The offset of the indirect block in the fractal heap&rsquo;s
+                    address space containing the empty blocks.</p>
+                <p>
+                    The number of bytes used to encode this field is the minimum number
+                    of bytes needed to encode values for the <em>Maximum Heap Size</em>
+                    (in the fractal heap&rsquo;s header).
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Block Start Row</p></td>
+            <td>
+                <p>This is the row that the empty blocks start in.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Block Start Column</p></td>
+            <td>
+                <p>This is the column that the empty blocks start in.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Number of Blocks</p></td>
+            <td>
+                <p>This is the number of empty blocks covered by the section.</p>
+            </td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<h3>
+    <a name="SOHMTable"> III.H. Disk Format: Level 1H - Shared Object
+        Header Message Table</a>
+</h3>
+
+<p>
+    The <em>shared object header message table</em> is used to locate
+    object header messages that are shared between two or more object
+    headers in the file. Shared object header messages are stored and
+    indexed in the file in one of two ways: indexed sequentially in a <em>shared
+        header message list</em> or indexed with a v2 B-tree. The shared messages
+    themselves are either stored in a fractal heap (when two or more
+    objects share the message), or remain in an object&rsquo;s header (when
+    only one object uses the message currently, but the message can be
+    shared in the future).
+</p>
+
+<p>
+    The <em>shared object header message table</em> contains a list of
+    shared message index headers. Each index header records information
+    about the version of the index format, the index storage type, flags
+    for the message types indexed, the number of messages in the index, the
+    address where the index resides, and the fractal heap address if shared
+    messages are stored there.
+</p>
+
+<p>
+    Each index can be either a list or a v2 B-tree and may transition
+    between those two forms as the number of messages in the index varies.
+    Each shared message record contains information used to locate the
+    shared message from either a fractal heap or an object header. The
+    types of messages that can be shared are: <em>Dataspace, Datatype,
+        Fill Value, Filter Pipeline and Attribute</em>.
+</p>
+
+<p>
+    The <em>shared object header message table</em> is pointed to from a <a
+        href="#SOHMTableMessage">shared message table</a> message in the
+    superblock extension for a file. This message stores the version of the
+    table format, along with the number of index headers in the table.
+</p>
+
+<div align="center">
+    <table class="format">
+        <caption>Shared Object Header Message Table</caption>
+
+        <tr>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="4">Signature</td>
+        </tr>
+
+        <tr>
+            <td>Version for index #0</td>
+            <td>Index Type for index #0</td>
+            <td colspan="2">Message Type Flags for index #0</td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Minimum Message Size for index #0</td>
+        </tr>
+
+        <tr>
+            <td colspan="2">List Cutoff for index #0</td>
+            <td colspan="2">v2 B-tree Cutoff for index #0</td>
+        </tr>
+
+        <tr>
+            <td colspan="2">Number of Messages for index #0</td>
+            <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Index Address<sup>O</sup> for index #0<br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Fractal Heap Address<sup>O</sup> for
+                index #0<br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">...</td>
+        </tr>
+
+        <tr>
+            <td colspan="4">...</td>
+        </tr>
+
+        <tr>
+            <td>Version for index #N-1</td>
+            <td>Index Type for index #N-1</td>
+            <td colspan="2">Message Type Flags for index #N-1</td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Minimum Message Size for index #N-1</td>
+        </tr>
+
+        <tr>
+            <td colspan="2">List Cutoff for index #N-1</td>
+            <td colspan="2">v2 B-tree Cutoff for index #N-1</td>
+        </tr>
+
+        <tr>
+            <td colspan="2">Number of Messages for index #N-1</td>
+            <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Index Address<sup>O</sup> for index #N-1<br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Fractal Heap Address<sup>O</sup> for
+                index #N-1<br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Checksum</td>
+        </tr>
+    </table>
+
+    <table class="note">
+        <tr>
+            <td width="60%">&nbsp;</td>
+            <td width="40%">(Items marked with an &lsquo;O&rsquo; in the
+                above table are of the size specified in &ldquo;Size of
+                Offsets&rdquo; field in the superblock.)</td>
+        </tr>
+    </table>
+
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="35%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Signature</p></td>
+            <td>
+                <p>
+                    The ASCII character string &ldquo;
+                    <code>SMTB</code>
+                    &rdquo; is used to indicate the beginning of the Shared Object
+                    Header Message table. This gives file consistency checking
+                    utilities a better chance of reconstructing a damaged file.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Version for index #N</p></td>
+            <td>
+                <p>This is the version number for the list of shared object
+                    header message indexes and this document describes version 0.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Index Type for index #N</p></td>
+            <td>
+                <p>The type of index can be an unsorted list or a v2 B-tree.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Message Type Flags for index #N</p></td>
+            <td>
+                <p>This field indicates the type of messages tracked in the
+                    index, as follows:</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Bits</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>0</code></td>
+                        <td>If set, the index tracks <em>Dataspace Messages</em>.
+                        </td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>1</code></td>
+                        <td>If set, the message tracks <em>Datatype Messages</em>.
+                        </td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>2</code></td>
+                        <td>If set, the message tracks <em>Fill Value Messages</em>.
+                        </td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>3</code></td>
+                        <td>If set, the message tracks <em>Filter Pipeline
+                                Messages</em>.
+                        </td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>4</code></td>
+                        <td>If set, the message tracks <em>Attribute Messages</em>.
+                        </td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>5-15</code></td>
+                        <td>Reserved (zero).</td>
+                    </tr>
+                </table>
+                <p></p>
+
+
+                <p>An index can track more than one type of message, but each
+                    type of message can only by in one index.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Minimum Message Size for index #N</p></td>
+            <td>
+                <p>This is the message size sharing threshold for the index. If
+                    the encoded size of the message is less than this value, the
+                    message is not shared.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>List Cutoff for index #N</p></td>
+            <td>
+                <p>This is the cutoff value for the indexing of messages to
+                    switch from a list to a v2 B-tree. If the number of messages is
+                    greater than this value, the index should be a v2 B-tree.</p>
+            </td>
+        </tr>
+        <tr>
+            <td><p>v2 B-tree Cutoff for index #N</p></td>
+            <td>
+                <p>This is the cutoff value for the indexing of messages to
+                    switch from a v2 B-tree back to a list. If the number of messages
+                    is less than this value, the index should be a list.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Number of Messages for index #N</p></td>
+            <td>
+                <p>The number of shared messages being tracked for the index.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Index Address for index #N</p></td>
+            <td>
+                <p>This field is the address of the list or v2 B-tree where the
+                    index nodes reside.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Fractal Heap Address for index #N</p></td>
+            <td>
+                <p>This field is the address of the fractal heap if shared
+                    messages are stored there.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Checksum</p></td>
+            <td>
+                <p>This is the checksum for the table.</p>
+            </td>
+        </tr>
+
+    </table>
+</div>
+
+<br />
+<p>
+    Shared messages are indexed either with a <em>shared message
+        record list</em>, described below, or using a v2 B-tree (using record type
+    7). The number of records in the <em>shared message record list</em> is
+    determined in the index&rsquo;s entry in the <em>shared object
+        header message table</em>.
+</p>
+
+<div align="center">
+    <table class="format">
+        <caption>Shared Message Record List</caption>
+
+        <tr>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="4">Signature</td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Shared Message Record #0</td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Shared Message Record #1</td>
+        </tr>
+
+        <tr>
+            <td colspan="4">...</td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Shared Message Record #N-1</td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Checksum</td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Signature</p></td>
+            <td>
+                <p>
+                    The ASCII character string &ldquo;
+                    <code>SMLI</code>
+                    &rdquo; is used to indicate the beginning of a list of index nodes.
+                    This gives file consistency checking utilities a better chance of
+                    reconstructing a damaged file.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Shared Message Record #N</p></td>
+            <td>
+                <p>
+                    The record for locating the shared message, either in the fractal
+                    heap for the index, or an object header (see format for <em>index
+                        nodes</em> below).
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Checksum</p></td>
+            <td>
+                <p>This is the checksum for the list.</p>
+            </td>
+        </tr>
+
+    </table>
+</div>
+
+<br />
+<p>The record for each shared message in an index is stored in one
+    of the following forms:</p>
+
+<div align="center">
+    <table class="format">
+        <caption>Shared Message Record, for messages stored in a
+            fractal heap</caption>
+
+        <tr>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+        </tr>
+
+        <tr>
+            <td>Message Location</td>
+            <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Hash Value</td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Reference Count</td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Fractal Heap ID<br />
+            <br /></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Message Location</p></td>
+            <td>
+                <p>This has a value of 0 indicating that the message is stored
+                    in the heap.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Hash Value</p></td>
+            <td>
+                <p>This is the hash value for the message.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Reference Count</p></td>
+            <td>
+                <p>This is the number of times the message is used in the file.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Fractal Heap ID</p></td>
+            <td>
+                <p>This is an 8-byte fractal heap ID for the message as stored
+                    in the fractal heap for the index.</p>
+            </td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<br />
+<div align="center">
+    <table class="format">
+        <caption>Shared Message Record, for messages stored in an
+            object header</caption>
+
+        <tr>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+        </tr>
+
+        <tr>
+            <td>Message Location</td>
+            <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Hash Value</td>
+        </tr>
+
+        <tr>
+            <td>Reserved</td>
+            <td>Message Type</td>
+            <td colspan="2">Creation Index</td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Object Header Address<sup>O</sup><br />
+            <br /></td>
+        </tr>
+    </table>
+
+    <table class="note">
+        <tr>
+            <td width="60%">&nbsp;</td>
+            <td width="40%">(Items marked with an &lsquo;O&rsquo; in the
+                above table are of the size specified in &ldquo;Size of
+                Offsets&rdquo; field in the superblock.)</td>
+        </tr>
+    </table>
+
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Message Location</p></td>
+            <td>
+                <p>This has a value of 1 indicating that the message is stored
+                    in an object header.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Hash Value</p></td>
+            <td>
+                <p>This is the hash value for the message.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Message Type</p></td>
+            <td>
+                <p>This is the message type in the object header.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Creation Index</p></td>
+            <td>
+                <p>This is the creation index of the message within the object
+                    header.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Object Header Address</p></td>
+            <td>
+                <p>This is the address of the object header where the message is
+                    located.</p>
+            </td>
+        </tr>
+    </table>
+</div>
+
+
+
+<br />
+<br />
+<hr />
+<h2>
+    <a name="DataObject"> IV. Disk Format: Level 2 - Data Objects </a>
+</h2>
+
+<p>Data objects contain the &ldquo;real&rdquo; user-visible
+    information in the file. These objects compose the scientific data and
+    other information which are generally thought of as &ldquo;data&rdquo;
+    by the end-user. All the other information in the file is provided as a
+    framework for storing and accessing these data objects.</p>
+
+<p>A data object is composed of header and data information. The
+    header information contains the information needed to interpret the
+    data information for the object as well as additional
+    &ldquo;metadata&rdquo; or pointers to additional &ldquo;metadata&rdquo;
+    used to describe or annotate each object.</p>
+
+<br />
+<h3>
+    <a name="ObjectHeader"> IV.A. Disk Format: Level 2A - Data Object
+        Headers</a>
+</h3>
+
+<p>The header information of an object is designed to encompass all
+    of the information about an object, except for the data itself. This
+    information includes the dataspace, the datatype, information about how
+    the data is stored on disk (in external files, compressed, broken up in
+    blocks, and so on), as well as other information used by the library to
+    speed up access to the data objects or maintain a file&rsquo;s
+    integrity. Information stored by user applications as attributes is
+    also stored in the object&rsquo;s header. The header of each object is
+    not necessarily located immediately prior to the object&rsquo;s data in
+    the file and in fact may be located in any position in the file. The
+    order of the messages in an object header is not significant.</p>
+
+<p>Object headers are composed of a prefix and a set of messages.
+    The prefix contains the information needed to interpret the messages
+    and a small amount of metadata about the object, and the messages
+    contain the majority of the metadata about the object.</p>
+
+<br />
+<h3>
+    <a name="ObjectHeaderPrefix"> IV.A.1. Disk Format: Level 2A1 - Data
+        Object Header Prefix</a>
+</h3>
+
+<br />
+<h4>
+    <a name="V1ObjectHeaderPrefix"> IV.A.1.a. Version 1 Data Object
+        Header Prefix</a>
+</h4>
+
+<p>Header messages are aligned on 8-byte boundaries for version 1
+    object headers.</p>
+
+<div align="center">
+    <table class="format">
+        <caption>Version 1 Object Header</caption>
+
+        <tr>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+        </tr>
+
+        <tr>
+            <td>Version</td>
+            <td>Reserved (zero)</td>
+            <td colspan="2">Total Number of Header Messages</td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Object Reference Count</td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Object Header Size</td>
+        </tr>
+
+        <tr>
+            <td colspan="2">Header Message Type #1</td>
+            <td colspan="2">Size of Header Message Data #1</td>
+        </tr>
+
+        <tr>
+            <td>Header Message #1 Flags</td>
+            <td colspan="3">Reserved (zero)</td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Header Message Data #1<br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">.<br />.<br />.<br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="2">Header Message Type #n</td>
+            <td colspan="2">Size of Header Message Data #n</td>
+        </tr>
+
+        <tr>
+            <td>Header Message #n Flags</td>
+            <td colspan="3">Reserved (zero)</td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Header Message Data #n<br />
+            <br /></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Version</p></td>
+            <td>
+                <p>This value is used to determine the format of the information
+                    in the object header. When the format of the object header is
+                    changed, the version number is incremented and can be used to
+                    determine how the information in the object header is formatted.
+                    This is version one (1) (there was no version zero (0)) of the
+                    object header.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Total Number of Header Messages</p></td>
+            <td>
+                <p>This value determines the total number of messages listed in
+                    object headers for this object. This value includes the messages in
+                    continuation messages for this object.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Object Reference Count</p></td>
+            <td>
+                <p>This value specifies the number of &ldquo;hard links&rdquo;
+                    to this object within the current file. References to the object
+                    from external files, &ldquo;soft links&rdquo; in this file and
+                    object references in this file are not tracked.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Object Header Size</p></td>
+            <td>
+                <p>This value specifies the number of bytes of header message
+                    data following this length field that contain object header
+                    messages for this object header. This value does not include the
+                    size of object header continuation blocks for this object elsewhere
+                    in the file.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Header Message #n Type</p></td>
+            <td>
+                <p>This value specifies the type of information included in the
+                    following header message data. The message types for header
+                    messages are defined in sections below.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Size of Header Message #n Data</p></td>
+            <td>
+                <p>This value specifies the number of bytes of header message
+                    data following the header message type and length information for
+                    the current message. The size includes padding bytes to make the
+                    message a multiple of eight bytes.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Header Message #n Flags</p></td>
+            <td>
+                <p>This is a bit field with the following definition:</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Bit</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>0</code></td>
+                        <td>If set, the message data is constant. This is used for
+                            messages like the datatype message of a dataset.</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>1</code></td>
+                        <td>If set, the message is <em>shared</em> and stored in
+                            another location than the object header. The Header Message Data
+                            field contains a Shared Message (described in the <a
+                            href="#ObjectHeaderMessages">Data Object Header Messages</a>
+                            section below) and the Size of Header Message Data field contains
+                            the size of that Shared Message.
+                        </td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>2</code></td>
+                        <td>If set, the message should not be shared.</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>3</code></td>
+                        <td>If set, the HDF5 decoder should fail to open this object
+                            if it does not understand the message&rsquo;s type and the file
+                            is open with permissions allowing write access to the file.
+                            (Normally, unknown messages can just be ignored by HDF5 decoders)
+                        </td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>4</code></td>
+                        <td>If set, the HDF5 decoder should set bit 5 of this
+                            message&rsquo;s flags (in other words, this bit field) if it does
+                            not understand the message&rsquo;s type and the object is
+                            modified in any way. (Normally, unknown messages can just be
+                            ignored by HDF5 decoders)</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>5</code></td>
+                        <td>If set, this object was modified by software that did not
+                            understand this message. (Normally, unknown messages should just
+                            be ignored by HDF5 decoders) (Can be used to invalidate an index
+                            or a similar feature)</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>6</code></td>
+                        <td>If set, this message is shareable.</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>7</code></td>
+                        <td>If set, the HDF5 decoder should always fail to open this
+                            object if it does not understand the message&rsquo;s type
+                            (whether it is open for read-only or read-write access).
+                            (Normally, unknown messages can just be ignored by HDF5 decoders)
+                        </td>
+                    </tr>
+                </table>
+                <p></p>
+
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Header Message #n Data</p></td>
+            <td>
+                <p>The format and length of this field is determined by the
+                    header message type and size respectively. Some header message
+                    types do not require any data and this information can be
+                    eliminated by setting the length of the message to zero. The data
+                    is padded with enough zeroes to make the size a multiple of eight.
+                </p>
+            </td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<h4>
+    <a name="V2ObjectHeaderPrefix"> IV.A.1.b. Version 2 Data Object
+        Header Prefix</a>
+</h4>
+
+<p>Note that the &ldquo;total number of messages&rdquo; field has
+    been dropped from the data object header prefix in this version. The
+    number of messages in the data object header is just determined by the
+    messages encountered in all the object header blocks.</p>
+
+<p>
+    Note also that the fields and messages in this version of data object
+    headers have <em>no</em> alignment or padding bytes inserted - they are
+    stored packed together.
+</p>
+
+<div align="center">
+    <table class="format">
+        <caption>Version 2 Object Header</caption>
+
+        <tr>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="4">Signature</td>
+        </tr>
+        <tr>
+            <td>Version</td>
+            <td>Flags</td>
+            <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Access time <em>(optional)</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Modification Time <em>(optional)</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Change Time <em>(optional)</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Birth Time <em>(optional)</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="2">Maximum # of compact attributes <em>(optional)</em></td>
+            <td colspan="2">Minimum # of dense attributes <em>(optional)</em></td>
+        </tr>
+
+        <tr>
+            <td>Size of Chunk #0 <em>(variable size)</em></td>
+            <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+
+        <tr>
+            <td>Header Message Type #1</td>
+            <td colspan="2">Size of Header Message Data #1</td>
+            <td>Header Message #1 Flags</td>
+        </tr>
+
+        <tr>
+            <td colspan="2">Header Message #1 Creation Order <em>(optional)</em></td>
+            <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Header Message Data #1<br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">.<br />.<br />.<br /></td>
+        </tr>
+
+        <tr>
+            <td>Header Message Type #n</td>
+            <td colspan="2">Size of Header Message Data #n</td>
+            <td>Header Message #n Flags</td>
+        </tr>
+
+        <tr>
+            <td colspan="2">Header Message #n Creation Order <em>(optional)</em></td>
+            <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Header Message Data #n<br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Gap <em>(optional, variable size)</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Checksum</td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Signature</p></td>
+            <td>
+                <p>
+                    The ASCII character string &ldquo;
+                    <code>OHDR</code>
+                    &rdquo; is used to indicate the beginning of an object header. This
+                    gives file consistency checking utilities a better chance of
+                    reconstructing a damaged file.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Version</p></td>
+            <td>
+                <p>This field has a value of 2 indicating version 2 of the
+                    object header.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Flags</p></td>
+            <td>
+                <p>This field is a bit field indicating additional information
+                    about the object header.</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Bit(s)</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>0-1</code></td>
+                        <td>This two bit field determines the size of the <em>Size
+                                of Chunk #0</em> field. The values are:
+                            <table class="list">
+                                <tr>
+                                    <th width="20%" align="center">Value</th>
+                                    <th width="80%" align="left">Description</th>
+                                </tr>
+
+                                <tr>
+                                    <td align="center"><code>0</code></td>
+                                    <td>The <em>Size of Chunk #0</em> field is 1 byte.
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td align="center"><code>1</code></td>
+                                    <td>The <em>Size of Chunk #0</em> field is 2 bytes.
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td align="center"><code>2</code></td>
+                                    <td>The <em>Size of Chunk #0</em> field is 4 bytes.
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td align="center"><code>3</code></td>
+                                    <td>The <em>Size of Chunk #0</em> field is 8 bytes.
+                                    </td>
+                                </tr>
+                            </table>
+                            <p></p>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>2</code></td>
+                        <td>If set, attribute creation order is tracked.</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>3</code></td>
+                        <td>If set, attribute creation order is indexed.</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>4</code></td>
+                        <td>If set, non-default attribute storage phase change values
+                            are stored.</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>5</code></td>
+                        <td>If set, access, modification, change and birth times are
+                            stored.</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>6-7</code></td>
+                        <td>Reserved</td>
+                    </tr>
+                </table>
+                <p></p>
+
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Access Time</p></td>
+            <td>
+                <p>This 32-bit value represents the number of seconds after the
+                    UNIX epoch when the object&rsquo;s raw data was last accessed (in
+                    other words, read or written).</p>
+                <p>
+                    This field is present if bit 5 of <em>flags</em> is set.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Modification Time</p></td>
+            <td>
+                <p>This 32-bit value represents the number of seconds after the
+                    UNIX epoch when the object&rsquo;s raw data was last modified (in
+                    other words, written).</p>
+                <p>
+                    This field is present if bit 5 of <em>flags</em> is set.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Change Time</p></td>
+            <td>
+                <p>This 32-bit value represents the number of seconds after the
+                    UNIX epoch when the object&rsquo;s metadata was last changed.</p>
+                <p>
+                    This field is present if bit 5 of <em>flags</em> is set.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Birth Time</p></td>
+            <td>
+                <p>This 32-bit value represents the number of seconds after the
+                    UNIX epoch when the object was created.</p>
+                <p>
+                    This field is present if bit 5 of <em>flags</em> is set.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Maximum # of compact attributes</p></td>
+            <td>
+                <p>This is the maximum number of attributes to store in the
+                    compact format before switching to the indexed format.</p>
+                <p>
+                    This field is present if bit 4 of <em>flags</em> is set.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Minimum # of dense attributes</p></td>
+            <td>
+                <p>This is the minimum number of attributes to store in the
+                    indexed format before switching to the compact format.</p>
+                <p>
+                    This field is present if bit 4 of <em>flags</em> is set.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Size of Chunk #0</p></td>
+            <td>
+                <p>This unsigned value specifies the number of bytes of header
+                    message data following this field that contain object header
+                    information.</p>
+                <p>This value does not include the size of object header
+                    continuation blocks for this object elsewhere in the file.</p>
+                <p>
+                    The length of this field varies depending on bits 0 and 1 of the <em>flags</em>
+                    field.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Header Message #n Type</p></td>
+            <td>
+                <p>Same format as version 1 of the object header, described
+                    above.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Size of Header Message #n Data</p></td>
+            <td>
+                <p>
+                    This value specifies the number of bytes of header message data
+                    following the header message type and length information for the
+                    current message. The size of messages in this version does <em>not</em>
+                    include any padding bytes.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Header Message #n Flags</p></td>
+            <td>
+                <p>Same format as version 1 of the object header, described
+                    above.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Header Message #n Creation Order</p></td>
+            <td>
+                <p>This field stores the order that a message of a given type
+                    was created in.</p>
+                <p>
+                    This field is present if bit 2 of <em>flags</em> is set.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Header Message #n Data</p></td>
+            <td>
+                <p>Same format as version 1 of the object header, described
+                    above.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Gap</p></td>
+            <td>
+                <p>A gap in an object header chunk is inferred by the end of the
+                    messages for the chunk before the beginning of the chunk&rsquo;s
+                    checksum. Gaps are always smaller than the size of an object header
+                    message prefix (message type + message size + message flags).</p>
+                <p>Gaps are formed when a message (typically an attribute
+                    message) in an earlier chunk is deleted and a message from a later
+                    chunk that does not quite fit into the free space is moved into the
+                    earlier chunk.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Checksum</p></td>
+            <td>
+                <p>This is the checksum for the object header chunk.</p>
+            </td>
+        </tr>
+    </table>
+</div>
+
+<p>The header message types and the message data associated with
+    them compose the critical &ldquo;metadata&rdquo; about each object.
+    Some header messages are required for each object while others are
+    optional. Some optional header messages may also be repeated several
+    times in the header itself, the requirements and number of times
+    allowed in the header will be noted in each header message description
+    below.</p>
+
+
+<br />
+<h3>
+    <a name="ObjectHeaderMessages"> IV.A.2. Disk Format: Level 2A2 -
+        Data Object Header Messages</a>
+</h3>
+
+<p>Data object header messages are small pieces of metadata that are
+    stored in the data object header for each object in an HDF5 file. Data
+    object header messages provide the metadata required to describe an
+    object and its contents, as well as optional pieces of metadata that
+    annotate the meaning or purpose of the object.</p>
+
+<p>
+    Data object header messages are either stored directly in the data
+    object header for the object or are shared between multiple objects in
+    the file. When a message is shared, a flag in the <em>Message
+        Flags</em> indicates that the actual <em>Message Data</em> portion of that
+    message is stored in another location (such as another data object
+    header, or a heap in the file) and the <em>Message Data</em> field
+    contains the information needed to locate the actual information for
+    the message.
+</p>
+
+<p>The format of shared message data is described here:</p>
+
+<div align="center">
+    <table class="format">
+        <caption>Shared Message (Version 1)</caption>
+
+        <tr>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+        </tr>
+
+        <tr>
+            <td>Version</td>
+            <td>Type</td>
+            <td colspan="2">Reserved (zero)</td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Reserved (zero)</td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Address<sup>O</sup><br />
+            <br /></td>
+        </tr>
+    </table>
+
+    <table class="note">
+        <tr>
+            <td width="60%">&nbsp;</td>
+            <td width="40%">(Items marked with an &lsquo;O&rsquo; in the
+                above table are of the size specified in &ldquo;Size of
+                Offsets&rdquo; field in the superblock.)</td>
+        </tr>
+    </table>
+
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Version</p></td>
+            <td><p>The version number is used when there are changes in
+                    the format of a shared object message and is described here:</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Version</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>0</code></td>
+                        <td>Never used.</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>1</code></td>
+                        <td>Used by the library before version 1.6.1.</td>
+                    </tr>
+                </table>
+                <p></p></td>
+        </tr>
+
+        <tr>
+            <td><p>Type</p></td>
+            <td><p>The type of shared message location:</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Value</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>0</code></td>
+                        <td>Message stored in another object&rsquo;s header (a <em>committed</em>
+                            message).
+                        </td>
+                    </tr>
+                </table>
+                <p></p></td>
+        </tr>
+
+        <tr>
+            <td><p>Address</p></td>
+            <td><p>The address of the object header containing the
+                    message to be shared.</p></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<br />
+<div align="center">
+    <table class="format">
+        <caption>Shared Message (Version 2)</caption>
+
+        <tr>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+        </tr>
+
+        <tr>
+            <td>Version</td>
+            <td>Type</td>
+            <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Address<sup>O</sup><br />
+            <br /></td>
+        </tr>
+    </table>
+
+    <table class="note">
+        <tr>
+            <td width="60%">&nbsp;</td>
+            <td width="40%">(Items marked with an &lsquo;O&rsquo; in the
+                above table are of the size specified in &ldquo;Size of
+                Offsets&rdquo; field in the superblock.)</td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Version</p></td>
+            <td><p>The version number is used when there are changes in
+                    the format of a shared object message and is described here:</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Version</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>2</code></td>
+                        <td>Used by the library of version 1.6.1 and after.</td>
+                    </tr>
+                </table>
+                <p></p></td>
+        </tr>
+
+        <tr>
+            <td><p>Type</p></td>
+            <td><p>The type of shared message location:</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Value</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>0</code></td>
+                        <td>Message stored in another object&rsquo;s header (a <em>committed</em>
+                            message).
+                        </td>
+                    </tr>
+                </table>
+                <p></p></td>
+        </tr>
+
+        <tr>
+            <td><p>Address</p></td>
+            <td><p>The address of the object header containing the
+                    message to be shared.</p></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<br />
+<div align="center">
+    <table class="format">
+        <caption>Shared Message (Version 3)</caption>
+
+        <tr>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+        </tr>
+
+        <tr>
+            <td>Version</td>
+            <td>Type</td>
+            <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Location <em>(variable size)</em></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Version</p></td>
+            <td><p>The version number indicates changes in the format of
+                    shared object message and is described here:</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Version</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>3</code></td>
+                        <td>Used by the library of version 1.8 and after. In this
+                            version, the <em>Type</em> field can indicate that the message is
+                            stored in the fractal heap.
+                        </td>
+                    </tr>
+                </table>
+                <p></p></td>
+        </tr>
+
+        <tr>
+            <td><p>Type</p></td>
+            <td><p>The type of shared message location:</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Value</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>0</code></td>
+                        <td>Message is not shared and is not shareable.</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>1</code></td>
+                        <td>Message stored in file&rsquo;s <em>shared object
+                                header message</em> heap (a <em>shared</em> message).
+                        </td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>2</code></td>
+                        <td>Message stored in another object&rsquo;s header (a <em>committed</em>
+                            message).
+                        </td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>3</code></td>
+                        <td>Message stored is not shared, but is shareable.</td>
+                    </tr>
+
+                </table>
+                <p></p></td>
+        </tr>
+
+        <tr>
+            <td><p>Location</p></td>
+            <td><p>
+                    This field contains either a <em>Size of Offsets</em>-bytes address
+                    of the object header containing the message to be shared, or an
+                    8-byte fractal heap ID for the message in the file&rsquo;s <em>shared
+                        object header message</em> heap.
+                </p></td>
+        </tr>
+    </table>
+</div>
+
+
+<p>The following is a list of currently defined header messages:</p>
+
+<br />
+<h4>
+    <a name="NILMessage">IV.A.2.a. The NIL Message</a>
+</h4>
+
+<!-- start msgdesc table -->
+<center>
+    <table class="msgdesc">
+        <tr>
+            <td colspan="2"><b>Header Message Name:</b> NIL</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Header Message Type:</b> 0x0000</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Length:</b> Varies</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Status:</b> Optional; may be repeated.</td>
+        </tr>
+        <tr>
+            <td><b>Description:</b></td>
+            <td>The NIL message is used to indicate a message which is to be
+                ignored when reading the header messages for a data object.
+                [Possibly one which has been deleted for some reason.]</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Format of Data:</b> Unspecified</td>
+        </tr>
+    </table>
+</center>
+<!-- end msgdesc table -->
+
+
+<br />
+<h4>
+    <a name="DataspaceMessage">IV.A.2.b. The Dataspace Message</a>
+</h4>
+
+<!-- start msgdesc table -->
+<center>
+    <table class="msgdesc">
+        <tr>
+            <td colspan="2"><b>Header Message Name:</b> Dataspace</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Header Message Type:</b> 0x0001</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Length:</b> Varies according to the number of
+                dimensions, as described in the following table.</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Status:</b> Required for dataset objects; may
+                not be repeated.</td>
+        </tr>
+        <tr>
+            <td><b>Description:</b></td>
+            <td>The dataspace message describes the number of dimensions (in
+                other words, &ldquo;rank&rdquo;) and size of each dimension that the
+                data object has. This message is only used for datasets which have a
+                simple, rectilinear, array-like layout; datasets requiring a more
+                complex layout are not yet supported.</td>
+        </tr>
+
+        <tr>
+            <td colspan="2"><b>Format of Data:</b> See the tables below.</td>
+        </tr>
+    </table>
+</center>
+<!-- end msgdesc table -->
+
+<div align="center">
+    <table class="format">
+        <caption>Dataspace Message - Version 1</caption>
+
+        <tr>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+        </tr>
+
+        <tr>
+            <td>Version</td>
+            <td>Dimensionality</td>
+            <td>Flags</td>
+            <td>Reserved</td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Reserved</td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Dimension #1 Size<sup>L</sup><br />
+            <br /></td>
+        </tr>
+        <tr>
+            <td colspan="4">.<br />.<br />.<br /></td>
+        </tr>
+        <tr>
+            <td colspan="4"><br />Dimension #n Size<sup>L</sup><br />
+            <br /></td>
+        </tr>
+        <tr>
+            <td colspan="4"><br />Dimension #1 Maximum Size<sup>L</sup> <em>(optional)</em><br />
+            <br /></td>
+        </tr>
+        <tr>
+            <td colspan="4">.<br />.<br />.<br /></td>
+        </tr>
+        <tr>
+            <td colspan="4"><br />Dimension #n Maximum Size<sup>L</sup> <em>(optional)</em><br />
+            <br /></td>
+        </tr>
+        <tr>
+            <td colspan="4"><br />Permutation Index #1<sup>L</sup> <em>(optional)</em><br />
+            <br /></td>
+        </tr>
+        <tr>
+            <td colspan="4">.<br />.<br />.<br /></td>
+        </tr>
+        <tr>
+            <td colspan="4"><br />Permutation Index #n<sup>L</sup> <em>(optional)</em><br />
+            <br /></td>
+        </tr>
+    </table>
+
+    <table class="note">
+        <tr>
+            <td width="60%">&nbsp;</td>
+            <td width="40%">(Items marked with an &lsquo;L&rsquo; in the
+                above table are of the size specified in &ldquo;Size of
+                Lengths&rdquo; field in the superblock.)</td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Version</p></td>
+            <td>
+                <p>This value is used to determine the format of the Dataspace
+                    Message. When the format of the information in the message is
+                    changed, the version number is incremented and can be used to
+                    determine how the information in the object header is formatted.
+                    This document describes version one (1) (there was no version zero
+                    (0)).</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Dimensionality</p></td>
+            <td>
+                <p>This value is the number of dimensions that the data object
+                    has.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Flags</p></td>
+            <td>
+                <p>This field is used to store flags to indicate the presence of
+                    parts of this message. Bit 0 (the least significant bit) is used to
+                    indicate that maximum dimensions are present. Bit 1 is used to
+                    indicate that permutation indices are present.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Dimension #n Size</p></td>
+            <td>
+                <p>This value is the current size of the dimension of the data
+                    as stored in the file. The first dimension stored in the list of
+                    dimensions is the slowest changing dimension and the last dimension
+                    stored is the fastest changing dimension.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Dimension #n Maximum Size</p></td>
+            <td>
+                <p>
+                    This value is the maximum size of the dimension of the data as
+                    stored in the file. This value may be the special &ldquo;<a
+                        href="#UnlimitedDim">unlimited</a>&rdquo; size which indicates
+                    that the data may expand along this dimension indefinitely. If
+                    these values are not stored, the maximum size of each dimension is
+                    assumed to be the dimension&rsquo;s current size.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Permutation Index #n</p></td>
+            <td>
+                <p>This value is the index permutation used to map each
+                    dimension from the canonical representation to an alternate axis
+                    for each dimension. If these values are not stored, the first
+                    dimension stored in the list of dimensions is the slowest changing
+                    dimension and the last dimension stored is the fastest changing
+                    dimension.</p>
+            </td>
+        </tr>
+    </table>
+</div>
+
+
+
+<br />
+<p>Version 2 of the dataspace message dropped the optional
+    permutation index value support, as it was never implemented in the
+    HDF5 Library:</p>
+
+<div align="center">
+    <table class="format">
+        <caption>Dataspace Message - Version 2</caption>
+
+        <tr>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+        </tr>
+
+        <tr>
+            <td>Version</td>
+            <td>Dimensionality</td>
+            <td>Flags</td>
+            <td>Type</td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Dimension #1 Size<sup>L</sup><br />
+            <br /></td>
+        </tr>
+        <tr>
+            <td colspan="4">.<br />.<br />.<br /></td>
+        </tr>
+        <tr>
+            <td colspan="4"><br />Dimension #n Size<sup>L</sup><br />
+            <br /></td>
+        </tr>
+        <tr>
+            <td colspan="4"><br />Dimension #1 Maximum Size<sup>L</sup> <em>(optional)</em><br />
+            <br /></td>
+        </tr>
+        <tr>
+            <td colspan="4">.<br />.<br />.<br /></td>
+        </tr>
+        <tr>
+            <td colspan="4"><br />Dimension #n Maximum Size<sup>L</sup> <em>(optional)</em><br />
+            <br /></td>
+        </tr>
+    </table>
+
+    <table class="note">
+        <tr>
+            <td width="60%">&nbsp;</td>
+            <td width="40%">(Items marked with an &lsquo;L&rsquo; in the
+                above table are of the size specified in &ldquo;Size of
+                Lengths&rdquo; field in the superblock.)</td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Version</p></td>
+            <td>
+                <p>This value is used to determine the format of the Dataspace
+                    Message. This field should be &lsquo;2&rsquo; for version 2 format
+                    messages.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Dimensionality</p></td>
+            <td>
+                <p>This value is the number of dimensions that the data object
+                    has.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Flags</p></td>
+            <td>
+                <p>This field is used to store flags to indicate the presence of
+                    parts of this message. Bit 0 (the least significant bit) is used to
+                    indicate that maximum dimensions are present.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Type</p></td>
+            <td>
+                <p>This field indicates the type of the dataspace:</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Value</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>0</code></td>
+                        <td>A <em>scalar</em> dataspace; in other words, a dataspace
+                            with a single, dimensionless element.
+                        </td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>1</code></td>
+                        <td>A <em>simple</em> dataspace; in other words, a dataspace
+                            with a rank > 0 and an appropriate # of dimensions.
+                        </td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>2</code></td>
+                        <td>A <em>null</em> dataspace; in other words, a dataspace
+                            with no elements.
+                        </td>
+                    </tr>
+                </table>
+                <p></p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Dimension #n Size</p></td>
+            <td>
+                <p>This value is the current size of the dimension of the data
+                    as stored in the file. The first dimension stored in the list of
+                    dimensions is the slowest changing dimension and the last dimension
+                    stored is the fastest changing dimension.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Dimension #n Maximum Size</p></td>
+            <td>
+                <p>
+                    This value is the maximum size of the dimension of the data as
+                    stored in the file. This value may be the special &ldquo;<a
+                        href="#UnlimitedDim">unlimited</a>&rdquo; size which indicates
+                    that the data may expand along this dimension indefinitely. If
+                    these values are not stored, the maximum size of each dimension is
+                    assumed to be the dimension&rsquo;s current size.
+                </p>
+            </td>
+        </tr>
+
+    </table>
+</div>
+
+
+
+<!--
+<br />
+<h4><a name="DataSpaceMessage">Header Message Name: Complex Dataspace (Fiber Bundle?)</a></h4>
+
+    <!-- start msgdesc table --
+    <center>
+    <table class="msgdesc">
+    <p><b>Header Message Name: ???????</b></td></tr>
+    <b>Header Message Type: </b>0x0002<br />
+    <b>Length:</b> Varies</td></tr>
+
+    <b>Status:</b> One of the <em>Simple Dataspace</em> or
+    <em>Complex Dataspace</em> messages is required (but not both) and may
+    not be repeated.<br /> <b>Description:</b> The
+    <em>Dataspace</em> message describes space that the dataset is
+    mapped onto in a more comprehensive way than the <em>Simple
+    Dimensionality</em> message is capable of handling.  The
+    dataspace of a dataset encompasses the type of coordinate system
+    used to locate the dataset&rsquo;s elements as well as the structure and
+    regularity of the coordinate system.  The dataspace also
+    describes the number of dimensions which the dataset inhabits as
+    well as a possible higher dimensional space in which the dataset
+    is located within.
+
+    <br />
+    <p><b>Format of Data:</b></p>
+
+    <center>
+      <table border cellpadding="4" width="80%">
+    <caption align="bottom">
+      <b>HDF5 Dataspace Message Layout</b>
+    </caption>
+
+    <tr align="center">
+      <th width="25%">byte</th>
+      <th width="25%">byte</th>
+      <th width="25%">byte</th>
+      <th width="25%">byte</th>
+      </tr>
+
+    <tr align="center">
+      <td colspan="4">Mesh Type</td>
+      </tr>
+    <tr align="center">
+      <td colspan="4">Logical Dimensionality</td>
+      </tr>
+      </table>
+    </center>
+
+    <br />
+    <dl>
+      <dt>The elements of the dimensionality message are described below:
+      <dd>
+    <dl>
+      <dt>Mesh Type: (unsigned 32-bit integer)
+      <dd>This value indicates whether the grid is
+        polar/spherical/cartesion,
+        structured/unstructured and regular/irregular. <br />
+        The mesh type value is broken up as follows: <br />
+
+        <br />
+        <center>
+          <table border cellpadding="4" width="80%">
+        <caption align="bottom">
+          <b>HDF5 Mesh-type Layout</b>
+        </caption>
+
+        <tr align="center">
+          <th width="25%">byte</th>
+          <th width="25%">byte</th>
+          <th width="25%">byte</th>
+          <th width="25%">byte</th>
+        </tr>
+
+        <tr align="center">
+          <td colspan="1">Mesh Embedding</td>
+          <td colspan="1">Coordinate System</td>
+          <td colspan="1">Structure</td>
+          <td colspan="1">Regularity</td>
+        </tr>
+          </table>
+        </center>
+        The following are the definitions of mesh-type bytes:
+        <dl>
+          <dt>Mesh Embedding
+          <dd>This value indicates whether the dataset dataspace
+        is located within
+        another dataspace or not:
+        <dl> <dl>
+            <dt>&lt;STANDALONE&gt;
+            <dd>The dataset mesh is self-contained and is not
+              embedded in another mesh.
+            <dt>&lt;EMBEDDED&gt;
+            <dd>The dataset&rsquo;s dataspace is located within
+              another dataspace, as
+              described in information below.
+          </dl> </dl>
+          <dt>Coordinate System
+          <dd>This value defines the type of coordinate system
+        used for the mesh:
+        <dl> <dl>
+            <dt>&lt;POLAR&gt;
+            <dd>The last two dimensions are in polar
+              coordinates, higher dimensions are
+              cartesian.
+            <dt>&lt;SPHERICAL&gt;
+            <dd>The last three dimensions are in spherical
+              coordinates, higher dimensions
+              are cartesian.
+            <dt>&lt;CARTESIAN&gt;
+            <dd>All dimensions are in cartesian coordinates.
+          </dl> </dl>
+          <dt>Structure
+          <dd>This value defines the locations of the grid-points
+        on the axes:
+        <dl> <dl>
+            <dt>&lt;STRUCTURED&gt;
+            <dd>All grid-points are on integral, sequential
+              locations, starting from 0.
+            <dt>&lt;UNSTRUCTURED&gt;
+            <dd>Grid-points locations in each dimension are
+              explicitly defined and
+              may be of any numeric datatype.
+          </dl> </dl>
+          <dt>Regularity
+          <dd>This value defines the locations of the dataset
+        points on the grid:
+        <dl> <dl>
+            <dt>&lt;REGULAR&gt;
+            <dd>All dataset elements are located at the
+              grid-points defined.
+            <dt>&lt;IRREGULAR&gt;
+            <dd>Each dataset element has a particular
+              grid-location defined.
+          </dl> </dl>
+        </dl>
+        <p>The following grid combinations are currently allowed:</p>
+        <dl> <dl>
+        <dt>&lt;POLAR-STRUCTURED-REGULAR&gt;
+        <dt>&lt;SPHERICAL-STRUCTURED-REGULAR&gt;
+        <dt>&lt;CARTESIAN-STRUCTURED-REGULAR&gt;
+        <dt>&lt;POLAR-UNSTRUCTURED-REGULAR&gt;
+        <dt>&lt;SPHERICAL-UNSTRUCTURED-REGULAR&gt;
+        <dt>&lt;CARTESIAN-UNSTRUCTURED-REGULAR&gt;
+        <dt>&lt;CARTESIAN-UNSTRUCTURED-IRREGULAR&gt;
+          </dl> </dl>
+        All of the above grid types can be embedded within another
+        dataspace.
+        <br /> <br />
+      <dt>Logical Dimensionality: (unsigned 32-bit integer)
+      <dd>This value is the number of dimensions that the dataset occupies.
+
+        <br />
+        <center>
+          <table border cellpadding="4" width="80%">
+        <caption align="bottom">
+          <b>HDF5 Dataspace Embedded Dimensionality Information</b>
+        </caption>
+
+        <tr align="center">
+          <th width="25%">byte</th>
+          <th width="25%">byte</th>
+          <th width="25%">byte</th>
+          <th width="25%">byte</th>
+        </tr>
+
+        <tr align="center">
+          <td colspan="4">Embedded Dimensionality</td>
+        </tr>
+        <tr align="center">
+          <td colspan="4">Embedded Dimension Size #1</td>
+        </tr>
+        <tr align="center">
+          <td colspan="4">.<br />.<br />.<br /></td>
+        </tr>
+        <tr align="center">
+          <td colspan="4">Embedded Dimension Size #n</td>
+        </tr>
+        <tr align="center">
+          <td colspan="4">Embedded Origin Location #1</td>
+        </tr>
+        <tr align="center">
+          <td colspan="4">.<br />.<br />.<br /></td>
+        </tr>
+        <tr align="center">
+          <td colspan="4">Embedded Origin Location #n</td>
+        </tr>
+          </table>
+        </center>
+
+      <dt>Embedded Dimensionality: (unsigned 32-bit integer)
+      <dd>This value is the number of dimensions of the space the
+        dataset is located within: in other words, a planar dataset
+        located within a 3-D space, a 3-D dataset
+        which is a subset of another 3-D space, and so on.
+      <dt>Embedded Dimension Size: (unsigned 32-bit integer)
+      <dd>These values are the sizes of the dimensions of the
+        embedded dataspace
+        that the dataset is located within.
+      <dt>Embedded Origin Location: (unsigned 32-bit integer)
+      <dd>These values comprise the location of the dataset&rsquo;s
+        origin within the embedded dataspace.
+    </dl>
+    </dl>
+    [Comment: need some way to handle different orientations of the
+    dataset dataspace
+    within the embedded dataspace]<br />
+
+    <br />
+    <center>
+      <table border cellpadding="4" width="80%">
+    <caption align="bottom">
+      <b>HDF5 Dataspace Structured/Regular Grid Information</b>
+    </caption>
+
+    <tr align="center">
+      <th width="25%">byte</th>
+      <th width="25%">byte</th>
+      <th width="25%">byte</th>
+      <th width="25%">byte</th>
+    </tr>
+
+    <tr align="center">
+      <td colspan="4">Logical Dimension Size #1</td>
+    </tr>
+    <tr align="center">
+      <td colspan="4">Logical Dimension Maximum #1</td>
+    </tr>
+    <tr align="center">
+      <td colspan="4">.<br />.<br />.<br /></td>
+    </tr>
+    <tr align="center">
+      <td colspan="4">Logical Dimension Size #n</td>
+    </tr>
+    <tr align="center">
+      <td colspan="4">Logical Dimension Maximum #n</td>
+    </tr>
+      </table>
+    </center>
+
+    <br />
+    <dl>
+      <dt>The elements of the dimensionality message are described below:
+      <dd>
+    <dl>
+      <dt>Logical Dimension Size #n: (unsigned 32-bit integer)
+      <dd>This value is the current size of the dimension of the
+        data as stored in
+        the file.  The first dimension stored in the list of
+        dimensions is the slowest
+        changing dimension and the last dimension stored is the
+        fastest changing
+        dimension.
+      <dt>Logical Dimension Maximum #n: (unsigned 32-bit integer)
+      <dd>This value is the maximum size of the dimension of the
+        data as stored in
+        the file.  This value may be the special value
+        &lt;UNLIMITED&gt; which
+        indicates that the data may expand along this dimension
+        indefinitely.
+    </dl>
+    </dl>
+    <br />
+    <center>
+      <table border cellpadding="4" width="80%">
+    <caption align="bottom">
+      <b>HDF5 Dataspace Structured/Irregular Grid Information</b>
+    </caption>
+
+    <tr align="center">
+      <th width="25%">byte</th>
+      <th width="25%">byte</th>
+      <th width="25%">byte</th>
+      <th width="25%">byte</th>
+    </tr>
+
+    <tr align="center">
+      <td colspan="4"># of Grid Points in Dimension #1</td>
+    </tr>
+    <tr align="center">
+      <td colspan="4">.<br />.<br />.<br /></td>
+    </tr>
+    <tr align="center">
+      <td colspan="4"># of Grid Points in Dimension #n</td>
+    </tr>
+    <tr align="center">
+      <td colspan="4">Datatype of Grid Point Locations</td>
+    </tr>
+    <tr align="center">
+      <td colspan="4">Location of Grid Points in Dimension #1</td>
+    </tr>
+    <tr align="center">
+      <td colspan="4">.<br />.<br />.<br /></td>
+    </tr>
+    <tr align="center">
+      <td colspan="4">Location of Grid Points in Dimension #n</td>
+    </tr>
+      </table>
+    </center>
+
+    <br />
+    <center>
+      <table border cellpadding="4" width="80%">
+    <caption align="bottom">
+      <b>HDF5 Dataspace Unstructured Grid Information</b>
+    </caption>
+
+    <tr align="center">
+      <th width="25%">byte</th>
+      <th width="25%">byte</th>
+      <th width="25%">byte</th>
+      <th width="25%">byte</th>
+    </tr>
+
+    <tr align="center">
+      <td colspan="4"># of Grid Points</td>
+    </tr>
+    <tr align="center">
+      <td colspan="4">Datatype of Grid Point Locations</td>
+    </tr>
+    <tr align="center">
+      <td colspan="4">Grid Point Locations<br />.<br />.<br /></td>
+    </tr>
+      </table>
+    </center>
+-->
+
+<br />
+<h4>
+    <a name="LinkInfoMessage">IV.A.2.c. The Link Info Message</a>
+</h4>
+
+<!-- start msgdesc table -->
+<center>
+    <table class="msgdesc">
+        <tr>
+            <td colspan="2"><b>Header Message Name:</b> Link Info</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Header Message Type:</b> 0x002</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Length:</b> Varies</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Status:</b> Optional; may not be repeated.</td>
+        </tr>
+        <tr>
+            <td><b>Description:</b></td>
+            <td>The link info message tracks variable information about the
+                current state of the links for a &ldquo;new style&rdquo;
+                group&rsquo;s behavior. Variable information will be stored in this
+                message and constant information will be stored in the <a
+                href="#GroupInfoMessage">Group Info</a> message.
+            </td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Format of Data:</b> See the tables below.</td>
+        </tr>
+    </table>
+</center>
+<!-- end msgdesc table -->
+
+<div align="center">
+    <table class="format">
+        <caption>Link Info</caption>
+
+        <tr>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+        </tr>
+
+        <tr>
+            <td>Version</td>
+            <td>Flags</td>
+            <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Maximum Creation Index <em>(8 bytes,
+                    optional)</em><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Fractal Heap Address<sup>O</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Address of v2 B-tree for Name Index<sup>O</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Address of v2 B-tree for Creation Order
+                Index<sup>O</sup> <em>(optional)</em><br />
+            <br /></td>
+        </tr>
+
+    </table>
+
+    <table class="note">
+        <tr>
+            <td width="60%">&nbsp;</td>
+            <td width="40%">(Items marked with an &lsquo;O&rsquo; in the
+                above table are of the size specified in &ldquo;Size of
+                Offsets&rdquo; field in the superblock.)</td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Version</p></td>
+            <td>
+                <p>The version number for this message. This document describes
+                    version 0.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Flags</p></td>
+            <td><p>This field determines various optional aspects of the
+                    link info message:</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Bit</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>0</code></td>
+                        <td>If set, creation order for the links is tracked.</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>1</code></td>
+                        <td>If set, creation order for the links is indexed.</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>2-7</code></td>
+                        <td>Reserved</td>
+                    </tr>
+                </table>
+                <p></p></td>
+        </tr>
+
+        <tr>
+            <td><p>Maximum Creation Index</p></td>
+            <td><p>This 64-bit value is the maximum creation order index
+                    value stored for a link in this group.</p>
+                <p>
+                    This field is present if bit 0 of <em>flags</em> is set.
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>Fractal Heap Address</p></td>
+            <td>
+                <p>
+                    This is the address of the fractal heap to store dense links. Each
+                    link stored in the fractal heap is stored as a <a
+                        href="#LinkMessage">Link Message</a>.
+                </p>
+                <p>
+                    If there are no links in the group, or the group&rsquo;s links are
+                    stored &ldquo;compactly&rdquo; (as object header messages), this
+                    value will be the <a href="#UndefinedAddress">undefined address</a>.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Address of v2 B-tree for Name Index</p></td>
+            <td><p>This is the address of the version 2 B-tree to index
+                    names of links.</p>
+                <p>
+                    If there are no links in the group, or the group&rsquo;s links are
+                    stored &ldquo;compactly&rdquo; (as object header messages), this
+                    value will be the <a href="#UndefinedAddress">undefined address</a>.
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>Address of v2 B-tree for Creation Order Index</p></td>
+            <td><p>This is the address of the version 2 B-tree to index
+                    creation order of links.</p>
+                <p>
+                    If there are no links in the group, or the group&rsquo;s links are
+                    stored &ldquo;compactly&rdquo; (as object header messages), this
+                    value will be the <a href="#UndefinedAddress">undefined address</a>.
+                </p>
+                <p>
+                    This field exists if bit 1 of <em>flags</em> is set.
+                </p></td>
+        </tr>
+
+    </table>
+</div>
+
+
+<br />
+<h4>
+    <a name="DatatypeMessage">IV.A.2.d. The Datatype Message</a>
+</h4>
+
+<!-- start msgdesc table -->
+<center>
+    <table class="msgdesc">
+        <tr>
+            <td colspan="2"><b>Header Message Name:</b> Datatype</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Header Message Type:</b> 0x0003</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Length:</b> Variable</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Status:</b> Required for dataset or committed
+                datatype (formerly named datatype) objects; may not be repeated.</td>
+        </tr>
+        <tr>
+            <td><b>Description:</b></td>
+            <td><p>The datatype message defines the datatype for each
+                    element of a dataset or a common datatype for sharing between
+                    multiple datasets. A datatype can describe an atomic type like a
+                    fixed- or floating-point type or more complex types like a C struct
+                    (compound datatype), array (array datatype) or C++ vector
+                    (variable-length datatype).</p>
+                <p>Datatype messages that are part of a dataset object do not
+                    describe how elements are related to one another; the dataspace
+                    message is used for that purpose. Datatype messages that are part
+                    of a committed datatype (formerly named datatype) message describe
+                    a common datatype that can be shared by multiple datasets in the
+                    file.</p></td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Format of Data:</b> See the tables below.</td>
+        </tr>
+    </table>
+</center>
+<!-- end msgdesc table -->
+
+<div align="center">
+    <table class="format">
+        <caption>Datatype Message</caption>
+
+        <tr>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+        </tr>
+
+        <tr>
+            <td>Class and Version</td>
+            <td>Class Bit Field, Bits 0-7</td>
+            <td>Class Bit Field, Bits 8-15</td>
+            <td>Class Bit Field, Bits 16-23</td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Size</td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />
+            <br />Properties<br />
+            <br />
+            <br /></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Class and Version</p></td>
+            <td>
+                <p>The version of the datatype message and the datatype&rsquo;s
+                    class information are packed together in this field. The version
+                    number is packed in the top 4 bits of the field and the class is
+                    contained in the bottom 4 bits.</p>
+                <p>The version number information is used for changes in the
+                    format of the datatype message and is described here:</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Version</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>0</code></td>
+                        <td>Never used</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>1</code></td>
+                        <td>Used by early versions of the library to encode compound
+                            datatypes with explicit array fields. See the compound datatype
+                            description below for further details.</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>2</code></td>
+                        <td>Used when an array datatype needs to be encoded.</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>3</code></td>
+                        <td>Used when a VAX byte-ordered type needs to be encoded.
+                            Packs various other datatype classes more efficiently also.</td>
+                    </tr>
+                </table>
+                <p></p>
+
+                <p>The class of the datatype determines the format for the class
+                    bit field and properties portion of the datatype message, which are
+                    described below. The following classes are currently defined:</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Value</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>0</code></td>
+                        <td>Fixed-Point</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>1</code></td>
+                        <td>Floating-Point</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>2</code></td>
+                        <td>Time</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>3</code></td>
+                        <td>String</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>4</code></td>
+                        <td>Bit field</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>5</code></td>
+                        <td>Opaque</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>6</code></td>
+                        <td>Compound</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>7</code></td>
+                        <td>Reference</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>8</code></td>
+                        <td>Enumerated</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>9</code></td>
+                        <td>Variable-Length</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>10</code></td>
+                        <td>Array</td>
+                    </tr>
+                </table>
+                <p></p>
+
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Class Bit Fields</p></td>
+            <td>
+                <p>The information in these bit fields is specific to each
+                    datatype class and is described below. All bits not defined for a
+                    datatype class are set to zero.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Size</p></td>
+            <td>
+                <p>The size of a datatype element in bytes.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Properties</p></td>
+            <td>
+                <p>This variable-sized sequence of bytes encodes information
+                    specific to each datatype class and is described for each class
+                    below. If there is no property information specified for a datatype
+                    class, the size of this field is zero bytes.</p>
+            </td>
+        </tr>
+
+    </table>
+</div>
+
+
+<br />
+<p>Class specific information for Fixed-Point Numbers (Class 0):</p>
+
+<div align="center">
+    <table class="desc">
+        <caption>Fixed-point Bit Field Description</caption>
+
+        <tr>
+            <th width="10%">Bits</th>
+            <th>Meaning</th>
+        </tr>
+
+        <tr>
+            <td><p>0</p></td>
+            <td><p>
+                    <b>Byte Order.</b> If zero, byte order is little-endian; otherwise,
+                    byte order is big endian.
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>1, 2</p></td>
+            <td><p>
+                    <b>Padding type.</b> Bit 1 is the lo_pad bit and bit 2 is the
+                    hi_pad bit. If a datum has unused bits at either end, then the
+                    lo_pad or hi_pad bit is copied to those locations.
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>3</p></td>
+            <td><p>
+                    <b>Signed.</b> If this bit is set then the fixed-point number is in
+                    2&rsquo;s complement form.
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>4-23</p></td>
+            <td><p>Reserved (zero).</p></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="format">
+        <caption>Fixed-Point Property Description</caption>
+
+        <tr>
+            <th width="25%">Byte</th>
+            <th width="25%">Byte</th>
+            <th width="25%">Byte</th>
+            <th width="25%">Byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="2">Bit Offset</td>
+            <td colspan="2">Bit Precision</td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Bit Offset</p></td>
+            <td>
+                <p>The bit offset of the first significant bit of the
+                    fixed-point value within the datatype. The bit offset specifies the
+                    number of bits &ldquo;to the right of&rdquo; the value (which are
+                    set to the lo_pad bit value).</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Bit Precision</p></td>
+            <td>
+                <p>The number of bits of precision of the fixed-point value
+                    within the datatype. This value, combined with the datatype
+                    element&rsquo;s size and the Bit Offset field specifies the number
+                    of bits &ldquo;to the left of&rdquo; the value (which are set to
+                    the hi_pad bit value).</p>
+            </td>
+        </tr>
+
+    </table>
+</div>
+
+
+<br />
+<p>Class specific information for Floating-Point Numbers (Class 1):</p>
+
+<div align="center">
+    <table class="desc">
+        <caption>Floating-Point Bit Field Description</caption>
+
+        <tr>
+            <th width="10%">Bits</th>
+            <th>Meaning</th>
+        </tr>
+
+        <tr>
+            <td><p>0, 6</p></td>
+            <td><p>
+                    <b>Byte Order.</b> These two non-contiguous bits specify the
+                    &ldquo;endianness&rdquo; of the bytes in the datatype element.
+                </p>
+                <table class="list">
+                    <tr>
+                        <th width="10%" align="center">Bit 6</th>
+                        <th width="10%" align="center">Bit 0</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>0</code></td>
+                        <td align="center"><code>0</code></td>
+                        <td>Byte order is little-endian</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>0</code></td>
+                        <td align="center"><code>1</code></td>
+                        <td>Byte order is big-endian</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>1</code></td>
+                        <td align="center"><code>0</code></td>
+                        <td>Reserved</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>1</code></td>
+                        <td align="center"><code>1</code></td>
+                        <td>Byte order is VAX-endian</td>
+                    </tr>
+                </table>
+                <p></p></td>
+        </tr>
+
+        <tr>
+            <td><p>1, 2, 3</p></td>
+            <td><p>
+                    <b>Padding type.</b> Bit 1 is the low bits pad type, bit 2 is the
+                    high bits pad type, and bit 3 is the internal bits pad type. If a
+                    datum has unused bits at either end or between the sign bit,
+                    exponent, or mantissa, then the value of bit 1, 2, or 3 is copied
+                    to those locations.
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>4-5</p></td>
+            <td><p>
+                    <b>Mantissa Normalization.</b> This 2-bit bit field specifies how
+                    the most significant bit of the mantissa is managed.
+                </p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Value</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>0</code></td>
+                        <td>No normalization</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>1</code></td>
+                        <td>The most significant bit of the mantissa is always set
+                            (except for 0.0).</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>2</code></td>
+                        <td>The most significant bit of the mantissa is not stored,
+                            but is implied to be set.</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>3</code></td>
+                        <td>Reserved.</td>
+                    </tr>
+                </table>
+                <p></p></td>
+        </tr>
+
+        <tr>
+            <td><p>7</p></td>
+            <td><p>Reserved (zero).</p></td>
+        </tr>
+
+        <tr>
+            <td><p>8-15</p></td>
+            <td><p>
+                    <b>Sign Location.</b> This is the bit position of the sign bit.
+                    Bits are numbered with the least significant bit zero.
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>16-23</p></td>
+            <td><p>Reserved (zero).</p></td>
+        </tr>
+
+    </table>
+</div>
+
+<br />
+<br />
+<div align="center">
+    <table class="format">
+        <caption>Floating-Point Property Description</caption>
+
+        <tr>
+            <th width="25%">Byte</th>
+            <th width="25%">Byte</th>
+            <th width="25%">Byte</th>
+            <th width="25%">Byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="2">Bit Offset</td>
+            <td colspan="2">Bit Precision</td>
+        </tr>
+
+        <tr>
+            <td>Exponent Location</td>
+            <td>Exponent Size</td>
+            <td>Mantissa Location</td>
+            <td>Mantissa Size</td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Exponent Bias</td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Bit Offset</p></td>
+            <td>
+                <p>The bit offset of the first significant bit of the
+                    floating-point value within the datatype. The bit offset specifies
+                    the number of bits &ldquo;to the right of&rdquo; the value.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Bit Precision</p></td>
+            <td>
+                <p>The number of bits of precision of the floating-point value
+                    within the datatype.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Exponent Location</p></td>
+            <td>
+                <p>The bit position of the exponent field. Bits are numbered
+                    with the least significant bit number zero.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Exponent Size</p></td>
+            <td>
+                <p>The size of the exponent field in bits.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Mantissa Location</p></td>
+            <td>
+                <p>The bit position of the mantissa field. Bits are numbered
+                    with the least significant bit number zero.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Mantissa Size</p></td>
+            <td>
+                <p>The size of the mantissa field in bits.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Exponent Bias</p></td>
+            <td>
+                <p>The bias of the exponent field.</p>
+            </td>
+        </tr>
+
+    </table>
+</div>
+
+
+<br />
+<p>Class specific information for Time (Class 2):</p>
+
+
+<div align="center">
+    <table class="desc">
+        <caption>Time Bit Field Description</caption>
+
+        <tr>
+            <th width="10%">Bits</th>
+            <th>Meaning</th>
+        </tr>
+
+        <tr>
+            <td><p>0</p></td>
+            <td><p>
+                    <b>Byte Order.</b> If zero, byte order is little-endian; otherwise,
+                    byte order is big endian.
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>1-23</p></td>
+            <td><p>Reserved (zero).</p></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="format">
+        <caption>Time Property Description</caption>
+
+        <tr>
+            <th width="25%">Byte</th>
+            <th width="25%">Byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="2">Bit Precision</td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Bit Precision</p></td>
+            <td>
+                <p>The number of bits of precision of the time value.</p>
+            </td>
+        </tr>
+
+    </table>
+</div>
+
+
+<br />
+<p>Class specific information for Strings (Class 3):</p>
+
+
+<div align="center">
+    <table class="desc">
+        <caption>String Bit Field Description</caption>
+
+        <tr>
+            <th width="10%">Bits</th>
+            <th>Meaning</th>
+        </tr>
+
+        <tr>
+            <td><p>0-3</p></td>
+            <td><p>
+                    <b>Padding type.</b> This four-bit value determines the type of
+                    padding to use for the string. The values are:
+
+                </p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Value</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>0</code></td>
+                        <td>Null Terminate: A zero byte marks the end of the string
+                            and is guaranteed to be present after converting a long string to
+                            a short string. When converting a short string to a long string
+                            the value is padded with additional null characters as necessary.
+                        </td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>1</code></td>
+                        <td>Null Pad: Null characters are added to the end of the
+                            value during conversions from short values to long values but
+                            conversion in the opposite direction simply truncates the value.
+                        </td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>2</code></td>
+                        <td>Space Pad: Space characters are added to the end of the
+                            value during conversions from short values to long values but
+                            conversion in the opposite direction simply truncates the value.
+                            This is the Fortran representation of the string.</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>3-15</code></td>
+                        <td>Reserved</td>
+                    </tr>
+                </table>
+                <p></p></td>
+        </tr>
+
+        <tr>
+            <td><p>4-7</p></td>
+            <td><p>
+                    <b>Character Set.</b> The character set used to encode the string.
+                </p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Value</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>0</code></td>
+                        <td>ASCII character set encoding</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>1</code></td>
+                        <td>UTF-8 character set encoding</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>2-15</code></td>
+                        <td>Reserved</td>
+                    </tr>
+                </table>
+                <p></p></td>
+        </tr>
+
+        <tr>
+            <td><p>8-23</p></td>
+            <td><p>Reserved (zero).</p></td>
+        </tr>
+    </table>
+</div>
+
+<p>There are no properties defined for the string class.</p>
+
+
+<p>Class specific information for bit fields (Class 4):</p>
+
+<div align="center">
+    <table class="desc">
+        <caption>Bitfield Bit Field Description</caption>
+
+        <tr>
+            <th width="10%">Bits</th>
+            <th>Meaning</th>
+        </tr>
+
+        <tr>
+            <td><p>0</p></td>
+            <td><p>
+                    <b>Byte Order.</b> If zero, byte order is little-endian; otherwise,
+                    byte order is big endian.
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>1, 2</p></td>
+            <td><p>
+                    <b>Padding type.</b> Bit 1 is the lo_pad type and bit 2 is the
+                    hi_pad type. If a datum has unused bits at either end, then the
+                    lo_pad or hi_pad bit is copied to those locations.
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>3-23</p></td>
+            <td><p>Reserved (zero).</p></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="format">
+        <caption>Bit Field Property Description</caption>
+
+        <tr>
+            <th width="25%">Byte</th>
+            <th width="25%">Byte</th>
+            <th width="25%">Byte</th>
+            <th width="25%">Byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="2">Bit Offset</td>
+            <td colspan="2">Bit Precision</td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Bit Offset</p></td>
+            <td>
+                <p>The bit offset of the first significant bit of the bit field
+                    within the datatype. The bit offset specifies the number of bits
+                    &ldquo;to the right of&rdquo; the value.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Bit Precision</p></td>
+            <td>
+                <p>The number of bits of precision of the bit field within the
+                    datatype.</p>
+            </td>
+        </tr>
+    </table>
+</div>
+
+
+<br />
+<p>Class specific information for Opaque (Class 5):</p>
+
+<div align="center">
+    <table class="desc">
+        <caption>Opaque Bit Field Description</caption>
+
+        <tr>
+            <th width="10%">Bits</th>
+            <th>Meaning</th>
+        </tr>
+
+        <tr>
+            <td><p>0-7</p></td>
+            <td><p>Length of ASCII tag in bytes.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>8-23</p></td>
+            <td><p>Reserved (zero).</p></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="format">
+        <caption>Opaque Property Description</caption>
+
+        <tr>
+            <th width="25%">Byte</th>
+            <th width="25%">Byte</th>
+            <th width="25%">Byte</th>
+            <th width="25%">Byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />ASCII Tag<br /> <br /></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>ASCII Tag</p></td>
+            <td>
+                <p>This NUL-terminated string provides a description for the
+                    opaque type. It is NUL-padded to a multiple of 8 bytes.</p>
+            </td>
+        </tr>
+    </table>
+</div>
+
+
+<br />
+<p>Class specific information for Compound (Class 6):</p>
+
+<div align="center">
+    <table class="desc">
+        <caption>Compound Bit Field Description</caption>
+
+        <tr>
+            <th width="10%">Bits</th>
+            <th>Meaning</th>
+        </tr>
+
+        <tr>
+            <td><p>0-15</p></td>
+            <td><p>
+                    <b>Number of Members.</b> This field contains the number of members
+                    defined for the compound datatype. The member definitions are
+                    listed in the Properties field of the data type message.
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>16-23</p></td>
+            <td><p>Reserved (zero).</p></td>
+        </tr>
+    </table>
+</div>
+
+
+<p>The Properties field of a compound datatype is a list of the
+    member definitions of the compound datatype. The member definitions
+    appear one after another with no intervening bytes. The member types
+    are described with a (recursively) encoded datatype message.</p>
+
+<p>Note that the property descriptions are different for different
+    versions of the datatype version. Additionally note that the version 0
+    datatype encoding is deprecated and has been replaced with later
+    encodings in versions of the HDF5 Library from the 1.4 release onward.</p>
+
+
+<div align="center">
+    <table class="format">
+        <caption>Compound Properties Description for Datatype
+            Version 1</caption>
+
+        <tr>
+            <th width="25%">Byte</th>
+            <th width="25%">Byte</th>
+            <th width="25%">Byte</th>
+            <th width="25%">Byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Name<br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Byte Offset of Member</td>
+        </tr>
+
+        <tr>
+            <td>Dimensionality</td>
+            <td colspan="3">Reserved (zero)</td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Dimension Permutation</td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Reserved (zero)</td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Dimension #1 Size (required)</td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Dimension #2 Size (required)</td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Dimension #3 Size (required)</td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Dimension #4 Size (required)</td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Member Type Message<br />
+            <br /></td>
+        </tr>
+
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Name</p></td>
+            <td>
+                <p>This NUL-terminated string provides a description for the
+                    opaque type. It is NUL-padded to a multiple of 8 bytes.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Byte Offset of Member</p></td>
+            <td>
+                <p>This is the byte offset of the member within the datatype.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Dimensionality</p></td>
+            <td>
+                <p>If set to zero, this field indicates a scalar member. If set
+                    to a value greater than zero, this field indicates that the member
+                    is an array of values. For array members, the size of the array is
+                    indicated by the &lsquo;Size of Dimension n&rsquo; field in this
+                    message.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Dimension Permutation</p></td>
+            <td>
+                <p>This field was intended to allow an array field to have its
+                    dimensions permuted, but this was never implemented. This field
+                    should always be set to zero.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Dimension #n Size</p></td>
+            <td>
+                <p>This field is the size of a dimension of the array field as
+                    stored in the file. The first dimension stored in the list of
+                    dimensions is the slowest changing dimension and the last dimension
+                    stored is the fastest changing dimension.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Member Type Message</p></td>
+            <td>
+                <p>This field is a datatype message describing the datatype of
+                    the member.</p>
+            </td>
+        </tr>
+
+    </table>
+</div>
+
+<br />
+<br />
+<div align="center">
+    <table class="format">
+        <caption>Compound Properties Description for Datatype
+            Version 2</caption>
+
+        <tr>
+            <th width="25%">Byte</th>
+            <th width="25%">Byte</th>
+            <th width="25%">Byte</th>
+            <th width="25%">Byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Name<br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Byte Offset of Member</td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Member Type Message<br />
+            <br /></td>
+        </tr>
+
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Name</p></td>
+            <td>
+                <p>This NUL-terminated string provides a description for the
+                    opaque type. It is NUL-padded to a multiple of 8 bytes.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Byte Offset of Member</p></td>
+            <td>
+                <p>This is the byte offset of the member within the datatype.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Member Type Message</p></td>
+            <td>
+                <p>This field is a datatype message describing the datatype of
+                    the member.</p>
+            </td>
+        </tr>
+
+    </table>
+</div>
+
+
+<br />
+<br />
+<div align="center">
+    <table class="format">
+        <caption>Compound Properties Description for Datatype
+            Version 3</caption>
+
+        <tr>
+            <th width="25%">Byte</th>
+            <th width="25%">Byte</th>
+            <th width="25%">Byte</th>
+            <th width="25%">Byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Name<br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Byte Offset of Member <em>(variable size)</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Member Type Message<br />
+            <br /></td>
+        </tr>
+
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Name</p></td>
+            <td><p>
+                    This NUL-terminated string provides a description for the opaque
+                    type. It is <em>not</em> NUL-padded to a multiple of 8 bytes.
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>Byte Offset of Member</p></td>
+            <td><p>This is the byte offset of the member within the
+                    datatype. The field size is the minimum number of bytes necessary,
+                    based on the size of the datatype element. For example, a datatype
+                    element size of less than 256 bytes uses a 1 byte length, a
+                    datatype element size of 256-65535 bytes uses a 2 byte length, and
+                    so on.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>Member Type Message</p></td>
+            <td><p>This field is a datatype message describing the
+                    datatype of the member.</p></td>
+        </tr>
+
+    </table>
+</div>
+
+
+<br />
+<p>Class specific information for Reference (Class 7):</p>
+
+<div align="center">
+    <table class="desc">
+        <caption>Reference Bit Field Description</caption>
+
+        <tr>
+            <th width="10%">Bits</th>
+            <th>Meaning</th>
+        </tr>
+
+        <tr>
+            <td><p>0-3</p></td>
+            <td><p>
+                    <b>Type.</b> This four-bit value contains the type of reference
+                    described. The values defined are:
+
+                </p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Value</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>0</code></td>
+                        <td>Object Reference: A reference to another object in this
+                            HDF5 file.</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>1</code></td>
+                        <td>Dataset Region Reference: A reference to a region within
+                            a dataset in this HDF5 file.</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>2-15</code></td>
+                        <td>Reserved</td>
+                    </tr>
+                </table>
+                <p></p></td>
+        </tr>
+
+        <tr>
+            <td><p>4-23</p></td>
+            <td><p>Reserved (zero).</p></td>
+        </tr>
+    </table>
+</div>
+
+<p>There are no properties defined for the reference class.</p>
+
+
+<br />
+<p>Class specific information for Enumeration (Class 8):</p>
+
+<div align="center">
+    <table class="desc">
+        <caption>Enumeration Bit Field Description</caption>
+
+        <tr>
+            <th width="10%">Bits</th>
+            <th>Meaning</th>
+        </tr>
+
+        <tr>
+            <td><p>0-15</p></td>
+            <td><p>
+                    <b>Number of Members.</b> The number of name/value pairs defined
+                    for the enumeration type.
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>16-23</p></td>
+            <td><p>Reserved (zero).</p></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<br />
+<div align="center">
+    <table class="format">
+        <caption>Enumeration Property Description for Datatype
+            Versions 1 & 2</caption>
+
+        <tr>
+            <th width="25%">Byte</th>
+            <th width="25%">Byte</th>
+            <th width="25%">Byte</th>
+            <th width="25%">Byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Base Type<br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Names<br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Values<br />
+            <br /></td>
+        </tr>
+
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Base Type</p></td>
+            <td>
+                <p>Each enumeration type is based on some parent type, usually
+                    an integer. The information for that parent type is described
+                    recursively by this field.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Names</p></td>
+            <td>
+                <p>The name for each name/value pair. Each name is stored as a
+                    null terminated ASCII string in a multiple of eight bytes. The
+                    names are in no particular order.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Values</p></td>
+            <td>
+                <p>The list of values in the same order as the names. The values
+                    are packed (no inter-value padding) and the size of each value is
+                    determined by the parent type.</p>
+            </td>
+        </tr>
+
+    </table>
+</div>
+
+<br />
+<br />
+<div align="center">
+    <table class="format">
+        <caption>Enumeration Property Description for Datatype
+            Version 3</caption>
+
+        <tr>
+            <th width="25%">Byte</th>
+            <th width="25%">Byte</th>
+            <th width="25%">Byte</th>
+            <th width="25%">Byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Base Type<br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Names<br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Values<br />
+            <br /></td>
+        </tr>
+
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Base Type</p></td>
+            <td>
+                <p>Each enumeration type is based on some parent type, usually
+                    an integer. The information for that parent type is described
+                    recursively by this field.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Names</p></td>
+            <td>
+                <p>
+                    The name for each name/value pair. Each name is stored as a null
+                    terminated ASCII string, <em>not</em> padded to a multiple of eight
+                    bytes. The names are in no particular order.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Values</p></td>
+            <td>
+                <p>The list of values in the same order as the names. The values
+                    are packed (no inter-value padding) and the size of each value is
+                    determined by the parent type.</p>
+            </td>
+        </tr>
+
+    </table>
+</div>
+
+
+
+<br />
+<p>Class specific information for Variable-Length (Class 9):</p>
+
+<div align="center">
+    <table class="desc">
+        <caption>Variable-Length Bit Field Description</caption>
+
+        <tr>
+            <th width="10%">Bits</th>
+            <th>Meaning</th>
+        </tr>
+
+        <tr>
+            <td><p>0-3</p></td>
+            <td><p>
+                    <b>Type.</b> This four-bit value contains the type of
+                    variable-length datatype described. The values defined are:
+
+                </p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Value</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>0</code></td>
+                        <td>Sequence: A variable-length sequence of any datatype.
+                            Variable-length sequences do not have padding or character set
+                            information.</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>1</code></td>
+                        <td>String: A variable-length sequence of characters.
+                            Variable-length strings have padding and character set
+                            information.</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>2-15</code></td>
+                        <td>Reserved</td>
+                    </tr>
+                </table>
+                <p></p></td>
+        </tr>
+
+        <tr>
+            <td><p>4-7</p></td>
+            <td><p>
+                    <b>Padding type.</b> (variable-length string only) This four-bit
+                    value determines the type of padding used for variable-length
+                    strings. The values are the same as for the string padding type, as
+                    follows:
+                </p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Value</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>0</code></td>
+                        <td>Null terminate: A zero byte marks the end of a string and
+                            is guaranteed to be present after converting a long string to a
+                            short string. When converting a short string to a long string,
+                            the value is padded with additional null characters as necessary.
+                        </td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>1</code></td>
+                        <td>Null pad: Null characters are added to the end of the
+                            value during conversion from a short string to a longer string.
+                            Conversion from a long string to a shorter string simply
+                            truncates the value.</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>2</code></td>
+                        <td>Space pad: Space characters are added to the end of the
+                            value during conversion from a short string to a longer string.
+                            Conversion from a long string to a shorter string simply
+                            truncates the value. This is the Fortran representation of the
+                            string.</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>3-15</code></td>
+                        <td>Reserved</td>
+                    </tr>
+                </table>
+                <p></p>
+
+                <p>This value is set to zero for variable-length sequences.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>8-11</p></td>
+            <td><p>
+                    <b>Character Set.</b> (variable-length string only) This four-bit
+                    value specifies the character set to be used for encoding the
+                    string:
+                </p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Value</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>0</code></td>
+                        <td>ASCII character set encoding</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>1</code></td>
+                        <td>UTF-8 character set encoding</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>2-15</code></td>
+                        <td>Reserved</td>
+                    </tr>
+                </table>
+                <p></p>
+
+                <p>This value is set to zero for variable-length sequences.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>12-23</p></td>
+            <td><p>Reserved (zero).</p></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<br />
+<div align="center">
+    <table class="format">
+        <caption>Variable-Length Property Description</caption>
+
+        <tr>
+            <th width="25%">Byte</th>
+            <th width="25%">Byte</th>
+            <th width="25%">Byte</th>
+            <th width="25%">Byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Base Type<br />
+            <br /></td>
+        </tr>
+
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="10%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Base Type</p></td>
+            <td>
+                <p>Each variable-length type is based on some parent type. The
+                    information for that parent type is described recursively by this
+                    field.</p>
+            </td>
+        </tr>
+
+    </table>
+</div>
+
+
+<br />
+<p>Class specific information for Array (Class 10):</p>
+
+<p>There are no bit fields defined for the array class.</p>
+
+<p>Note that the dimension information defined in the property for
+    this datatype class is independent of dataspace information for a
+    dataset. The dimension information here describes the dimensionality of
+    the information within a data element (or a component of an element, if
+    the array datatype is nested within another datatype) and the dataspace
+    for a dataset describes the size and locations of the elements in a
+    dataset.</p>
+
+
+<div align="center">
+    <table class="format">
+        <caption>Array Property Description for Datatype Version 2</caption>
+
+        <tr>
+            <th width="25%">Byte</th>
+            <th width="25%">Byte</th>
+            <th width="25%">Byte</th>
+            <th width="25%">Byte</th>
+        </tr>
+
+        <tr>
+            <td>Dimensionality</td>
+            <td colspan="3">Reserved (zero)</td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Dimension #1 Size</td>
+        </tr>
+        <tr>
+            <td colspan="4">.<br />.<br />.<br /></td>
+        </tr>
+        <tr>
+            <td colspan="4">Dimension #n Size</td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Permutation Index #1</td>
+        </tr>
+        <tr>
+            <td colspan="4">.<br />.<br />.<br /></td>
+        </tr>
+        <tr>
+            <td colspan="4">Permutation Index #n</td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Base Type<br />
+            <br /></td>
+        </tr>
+
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Dimensionality</p></td>
+            <td>
+                <p>This value is the number of dimensions that the array has.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Dimension #n Size</p></td>
+            <td>
+                <p>This value is the size of the dimension of the array as
+                    stored in the file. The first dimension stored in the list of
+                    dimensions is the slowest changing dimension and the last dimension
+                    stored is the fastest changing dimension.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Permutation Index #n</p></td>
+            <td>
+                <p>This value is the index permutation used to map each
+                    dimension from the canonical representation to an alternate axis
+                    for each dimension. Currently, dimension permutations are not
+                    supported, and these indices should be set to the index position
+                    minus one. In other words, the first dimension should be set to 0,
+                    the second dimension should be set to 1, and so on.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Base Type</p></td>
+            <td>
+                <p>Each array type is based on some parent type. The information
+                    for that parent type is described recursively by this field.</p>
+            </td>
+        </tr>
+
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="format">
+        <caption>Array Property Description for Datatype Version 3</caption>
+
+        <tr>
+            <th width="25%">Byte</th>
+            <th width="25%">Byte</th>
+            <th width="25%">Byte</th>
+            <th width="25%">Byte</th>
+        </tr>
+
+        <tr>
+            <td>Dimensionality</td>
+            <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Dimension #1 Size</td>
+        </tr>
+        <tr>
+            <td colspan="4">.<br />.<br />.<br /></td>
+        </tr>
+        <tr>
+            <td colspan="4">Dimension #n Size</td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Base Type<br />
+            <br /></td>
+        </tr>
+
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Dimensionality</p></td>
+            <td>
+                <p>This value is the number of dimensions that the array has.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Dimension #n Size</p></td>
+            <td>
+                <p>This value is the size of the dimension of the array as
+                    stored in the file. The first dimension stored in the list of
+                    dimensions is the slowest changing dimension and the last dimension
+                    stored is the fastest changing dimension.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Base Type</p></td>
+            <td>
+                <p>Each array type is based on some parent type. The information
+                    for that parent type is described recursively by this field.</p>
+            </td>
+        </tr>
+
+    </table>
+</div>
+
+
+
+<br />
+<h4>
+    <a name="OldFillValueMessage">IV.A.2.e. The Data Storage - Fill
+        Value (Old) Message</a>
+</h4>
+
+<!-- start msgdesc table -->
+<center>
+    <table class="msgdesc">
+        <tr>
+            <td colspan="2"><b>Header Message Name:</b> Fill Value (old)</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Header Message Type:</b> 0x0004</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Length:</b> Varies</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Status:</b> Optional; may not be repeated.</td>
+        </tr>
+        <tr>
+            <td><b>Description:</b></td>
+            <td><p>The fill value message stores a single data value
+                    which is returned to the application when an uninitialized data
+                    element is read from a dataset. The fill value is interpreted with
+                    the same datatype as the dataset. If no fill value message is
+                    present then a fill value of all zero bytes is assumed.</p>
+                <p>This fill value message is deprecated in favor of the
+                    &ldquo;new&rdquo; fill value message (Message Type 0x0005) and is
+                    only written to the file for forward compatibility with versions of
+                    the HDF5 Library before the 1.6.0 version. Additionally, it only
+                    appears for datasets with a user-defined fill value (as opposed to
+                    the library default fill value or an explicitly set
+                    &ldquo;undefined&rdquo; fill value).</p></td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Format of Data:</b> See the tables below.</td>
+        </tr>
+    </table>
+</center>
+<!-- end msgdesc table -->
+
+<div align="center">
+    <table class="format">
+        <caption>Fill Value Message (Old)</caption>
+
+        <tr>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="4">Size</td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Fill Value <em>(optional, variable
+                    size)</em><br />
+            <br /></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Size</p></td>
+            <td>
+                <p>This is the size of the Fill Value field in bytes.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Fill Value</p></td>
+            <td>
+                <p>The fill value. The bytes of the fill value are interpreted
+                    using the same datatype as for the dataset.</p>
+            </td>
+        </tr>
+    </table>
+</div>
+
+
+<br />
+<h4>
+    <a name="FillValueMessage">IV.A.2.f. The Data Storage - Fill Value
+        Message</a>
+</h4>
+
+<!-- start msgdesc table -->
+<center>
+    <table class="msgdesc">
+        <tr>
+            <td colspan="2"><b>Header Message Name:</b> Fill Value</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Header Message Type:</b> 0x0005</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Length:</b> Varies</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Status:</b> Required for dataset objects; may
+                not be repeated.</td>
+        </tr>
+        <tr>
+            <td><b>Description:</b></td>
+            <td>The fill value message stores a single data value which is
+                returned to the application when an uninitialized data element is
+                read from a dataset. The fill value is interpreted with the same
+                datatype as the dataset.</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Format of Data:</b> See the tables below.</td>
+        </tr>
+    </table>
+</center>
+<!-- end msgdesc table -->
+
+<div align="center">
+    <table class="format">
+        <caption>Fill Value Message - Versions 1 & 2</caption>
+
+        <tr>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+        </tr>
+
+        <tr>
+            <td>Version</td>
+            <td>Space Allocation Time</td>
+            <td>Fill Value Write Time</td>
+            <td>Fill Value Defined</td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Size <em>(optional)</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Fill Value <em>(optional, variable
+                    size)</em><br />
+            <br /></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Version</p></td>
+            <td>
+                <p>The version number information is used for changes in the
+                    format of the fill value message and is described here:</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Version</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>0</code></td>
+                        <td>Never used</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>1</code></td>
+                        <td>Initial version of this message.</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>2</code></td>
+                        <td>In this version, the Size and Fill Value fields are only
+                            present if the Fill Value Defined field is set to 1.</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>3</code></td>
+                        <td>This version packs the other fields in the message more
+                            efficiently than version 2.</td>
+                    </tr>
+                </table>
+                <p></p>
+                <p></p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Space Allocation Time</p></td>
+            <td>
+                <p>When the storage space for the dataset&rsquo;s raw data will
+                    be allocated. The allowed values are:</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Value</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>0</code></td>
+                        <td>Not used.</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>1</code></td>
+                        <td>Early allocation. Storage space for the entire dataset
+                            should be allocated in the file when the dataset is created.</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>2</code></td>
+                        <td>Late allocation. Storage space for the entire dataset
+                            should not be allocated until the dataset is written to.</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>3</code></td>
+                        <td>Incremental allocation. Storage space for the dataset
+                            should not be allocated until the portion of the dataset is
+                            written to. This is currently used in conjunction with chunked
+                            data storage for datasets.</td>
+                    </tr>
+                </table>
+                <p></p>
+
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Fill Value Write Time</p></td>
+            <td>
+                <p>At the time that storage space for the dataset&rsquo;s raw
+                    data is allocated, this value indicates whether the fill value
+                    should be written to the raw data storage elements. The allowed
+                    values are:</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Value</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>0</code></td>
+                        <td>On allocation. The fill value is always written to the
+                            raw data storage when the storage space is allocated.</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>1</code></td>
+                        <td>Never. The fill value should never be written to the raw
+                            data storage.</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>2</code></td>
+                        <td>Fill value written if set by user. The fill value will be
+                            written to the raw data storage when the storage space is
+                            allocated only if the user explicitly set the fill value. If the
+                            fill value is the library default or is undefined, it will not be
+                            written to the raw data storage.</td>
+                    </tr>
+                </table>
+                <p></p>
+
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Fill Value Defined</p></td>
+            <td>
+                <p>This value indicates if a fill value is defined for this
+                    dataset. If this value is 0, the fill value is undefined. If this
+                    value is 1, a fill value is defined for this dataset. For version 2
+                    or later of the fill value message, this value controls the
+                    presence of the Size and Fill Value fields.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Size</p></td>
+            <td>
+                <p>This is the size of the Fill Value field in bytes. This field
+                    is not present if the Version field is greater than 1, and the Fill
+                    Value Defined field is set to 0.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Fill Value</p></td>
+            <td>
+                <p>The fill value. The bytes of the fill value are interpreted
+                    using the same datatype as for the dataset. This field is not
+                    present if the Version field is greater than 1, and the Fill Value
+                    Defined field is set to 0.</p>
+            </td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="format">
+        <caption>Fill Value Message - Version 3</caption>
+
+        <tr>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+        </tr>
+
+        <tr>
+            <td>Version</td>
+            <td>Flags</td>
+            <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Size <em>(optional)</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Fill Value <em>(optional, variable
+                    size)</em><br />
+            <br /></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Version</p></td>
+            <td>
+                <p>The version number information is used for changes in the
+                    format of the fill value message and is described here:</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Version</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>0</code></td>
+                        <td>Never used</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>1</code></td>
+                        <td>Initial version of this message.</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>2</code></td>
+                        <td>In this version, the Size and Fill Value fields are only
+                            present if the Fill Value Defined field is set to 1.</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>3</code></td>
+                        <td>This version packs the other fields in the message more
+                            efficiently than version 2.</td>
+                    </tr>
+                </table>
+                <p></p>
+
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Flags</p></td>
+            <td>
+                <p>When the storage space for the dataset&rsquo;s raw data will
+                    be allocated. The allowed values are:</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Bits</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>0-1</code></td>
+                        <td>Space Allocation Time, with the same values as versions 1
+                            and 2 of the message.</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>2-3</code></td>
+                        <td>Fill Value Write Time, with the same values as versions 1
+                            and 2 of the message.</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>4</code></td>
+                        <td>Fill Value Undefined, indicating that the fill value has
+                            been marked as &ldquo;undefined&rdquo; for this dataset. Bits 4
+                            and 5 cannot both be set.</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>5</code></td>
+                        <td>Fill Value Defined, with the same values as versions 1
+                            and 2 of the message. Bits 4 and 5 cannot both be set.</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>6-7</code></td>
+                        <td>Reserved (zero).</td>
+                    </tr>
+                </table>
+                <p></p>
+
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Size</p></td>
+            <td>
+                <p>This is the size of the Fill Value field in bytes. This field
+                    is not present if the Version field is greater than 1, and the Fill
+                    Value Defined flag is set to 0.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Fill Value</p></td>
+            <td>
+                <p>The fill value. The bytes of the fill value are interpreted
+                    using the same datatype as for the dataset. This field is not
+                    present if the Version field is greater than 1, and the Fill Value
+                    Defined flag is set to 0.</p>
+            </td>
+        </tr>
+    </table>
+</div>
+
+
+<br />
+<h4>
+    <a name="LinkMessage">IV.A.2.g. The Link Message</a>
+</h4>
+
+<!-- start msgdesc table -->
+<center>
+    <table class="msgdesc">
+        <tr>
+            <td colspan="2"><b>Header Message Name:</b> Link</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Header Message Type:</b> 0x0006</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Length:</b> Varies</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Status:</b> Optional; may be repeated.</td>
+        </tr>
+        <tr>
+            <td><b>Description:</b></td>
+            <td><p>This message encodes the information for a link in a
+                    group&rsquo;s object header, when the group is storing its links
+                    &ldquo;compactly&rdquo;, or in the group&rsquo;s fractal heap, when
+                    the group is storing its links &ldquo;densely&rdquo;.</p>
+                <p>
+                    A group is storing its links compactly when the fractal heap
+                    address in the <em><a href="#LinkInfoMessage">Link Info
+                            Message</a></em> is set to the &ldquo;undefined address&rdquo; value.
+                </p></td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Format of Data:</b> See the tables below.</td>
+        </tr>
+    </table>
+</center>
+<!-- end msgdesc table -->
+
+<div align="center">
+    <table class="format">
+        <caption>Link Message</caption>
+
+        <tr>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+        </tr>
+
+        <tr>
+            <td>Version</td>
+            <td>Flags</td>
+            <td>Link type <em>(optional)</em></td>
+            <td bgcolor="#DDDDDD"><em>This space inserted only to align
+                    table nicely</em></td>
+        </tr>
+        <tr>
+            <td colspan="4"><br />Creation Order <em>(8 bytes,
+                    optional)</em><br />
+            <br /></td>
+        </tr>
+        <tr>
+            <td>Link Name Character Set <em>(optional)</em></td>
+            <td>Length of Link Name (variable size)</td>
+            <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+        <tr>
+            <td colspan="4">Link Name (variable size)</td>
+        </tr>
+        <tr>
+            <td colspan="4"><br />Link Information (variable size)<br />
+            <br /></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Version</p></td>
+            <td><p>The version number for this message. This document
+                    describes version 1.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>Flags</p></td>
+            <td><p>This field contains information about the link and
+                    controls the presence of other fields below.</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Bits</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>0-1</code></td>
+                        <td>Determines the size of the <em>Length of Link Name</em>
+                            field.
+                            <table class="list">
+                                <tr>
+                                    <th width="20%" align="center">Value</th>
+                                    <th width="80%" align="left">Description</th>
+                                </tr>
+
+                                <tr>
+                                    <td align="center"><code>0</code></td>
+                                    <td>The size of the <em>Length of Link Name</em> field is
+                                        1 byte.
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td align="center"><code>1</code></td>
+                                    <td>The size of the <em>Length of Link Name</em> field is
+                                        2 bytes.
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td align="center"><code>2</code></td>
+                                    <td>The size of the <em>Length of Link Name</em> field is
+                                        4 bytes.
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td align="center"><code>3</code></td>
+                                    <td>The size of the <em>Length of Link Name</em> field is
+                                        8 bytes.
+                                    </td>
+                                </tr>
+                            </table>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>2</code></td>
+                        <td>Creation Order Field Present: if set, the <em>Creation
+                                Order</em> field is present. If not set, creation order information
+                            is not stored for links in this group.
+                        </td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>3</code></td>
+                        <td>Link Type Field Present: if set, the link is not a hard
+                            link and the <em>Link Type</em> field is present. If not set, the
+                            link is a hard link.
+                        </td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>4</code></td>
+                        <td>Link Name Character Set Field Present: if set, the link
+                            name is not represented with the ASCII character set and the <em>Link
+                                Name Character Set</em> field is present. If not set, the link name
+                            is represented with the ASCII character set.
+                        </td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>5-7</code></td>
+                        <td>Reserved (zero).</td>
+                    </tr>
+                </table>
+                <p></p></td>
+        </tr>
+
+        <tr>
+            <td><p>Link type</p></td>
+            <td><p>This is the link class type and can be one of the
+                    following values:</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Value</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>0</code></td>
+                        <td>A hard link (should never be stored in the file)</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>1</code></td>
+                        <td>A soft link.</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>2-63</code></td>
+                        <td>Reserved for future HDF5 internal use.</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>64</code></td>
+                        <td>An external link.</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>65-255</code></td>
+                        <td>Reserved, but available for user-defined link types.</td>
+                    </tr>
+                </table>
+                <p></p>
+
+                <p>
+                    This field is present if bit 3 of <em>Flags</em> is set.
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>Creation Order</p></td>
+            <td><p>This 64-bit value is an index of the link&rsquo;s
+                    creation time within the group. Values start at 0 when the group is
+                    created an increment by one for each link added to the group.
+                    Removing a link from a group does not change existing links&rsquo;
+                    creation order field.</p>
+                <p>
+                    This field is present if bit 2 of <em>Flags</em> is set.
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>Link Name Character Set</p></td>
+            <td><p>This is the character set for encoding the
+                    link&rsquo;s name:</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Value</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>0</code></td>
+                        <td>ASCII character set encoding (this should never be stored
+                            in the file)</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>1</code></td>
+                        <td>UTF-8 character set encoding</td>
+                    </tr>
+                </table>
+                <p></p>
+
+                <p>
+                    This field is present if bit 4 of <em>Flags</em> is set.
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>Length of link name</p></td>
+            <td><p>
+                    This is the length of the link&rsquo;s name. The size of this field
+                    depends on bits 0 and 1 of <em>Flags</em>.
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>Link name</p></td>
+            <td><p>This is the name of the link, non-NULL terminated.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>Link information</p></td>
+            <td><p>
+                    The format of this field depends on the <em>link type</em>.
+                </p>
+                <p>
+                    For <b>hard</b> links, the field is formatted as follows:
+
+                </p>
+                <table class="list">
+                    <tr>
+                        <td width="20%"><i>Size of Offsets</i> bytes:</td>
+                        <td width="80%">The address of the object header for the
+                            object that the link points to.</td>
+                    </tr>
+                </table>
+                <p></p>
+
+                <p>
+                    For <b>soft</b> links, the field is formatted as follows:
+
+                </p>
+                <table class="list">
+                    <tr>
+                        <td width="20%">Bytes 1-2:</td>
+                        <td width="80%">Length of soft link value.</td>
+                    </tr>
+                    <tr>
+                        <td><em>Length of soft link value</em> bytes:</td>
+                        <td>A non-NULL-terminated string storing the value of the
+                            soft link.</td>
+                    </tr>
+                </table>
+                <p></p>
+
+                <p>
+                    For <b>external</b> links, the field is formatted as follows:
+
+                </p>
+                <table class="list">
+                    <tr>
+                        <td width="20%">Bytes 1-2:</td>
+                        <td width="80%">Length of external link value.</td>
+                    </tr>
+                    <tr>
+                        <td><em>Length of external link value</em> bytes:</td>
+                        <td>The first byte contains the version number in the upper 4
+                            bits and flags in the lower 4 bits for the external link. Both
+                            version and flags are defined to be zero in this document. The
+                            remaining bytes consist of two NULL-terminated strings, with no
+                            padding between them. The first string is the name of the HDF5
+                            file containing the object linked to and the second string is the
+                            full path to the object linked to, within the HDF5 file&rsquo;s
+                            group hierarchy.</td>
+                    </tr>
+                </table>
+                <p></p>
+
+                <p>
+                    For <b>user-defined</b> links, the field is formatted as follows:
+
+                </p>
+                <table class="list">
+                    <tr>
+                        <td width="20%">Bytes 1-2:</td>
+                        <td width="80%">Length of user-defined data.</td>
+                    </tr>
+                    <tr>
+                        <td><em>Length of user-defined link value</em> bytes:</td>
+                        <td>The data supplied for the user-defined link type.</td>
+                    </tr>
+                </table>
+                <p></p></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<h4>
+    <a name="ExternalFileListMessage">IV.A.2.h. The Data Storage -
+        External Data Files Message</a>
+</h4>
+
+<!-- start msgdesc table -->
+<center>
+    <table class="msgdesc">
+        <tr>
+            <td colspan="2"><b>Header Message Name:</b> External Data Files</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Header Message Type:</b> 0x0007</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Length:</b> Varies</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Status:</b> Optional; may not be repeated.</td>
+        </tr>
+        <tr>
+            <td><b>Description:</b></td>
+            <td>The external data storage message indicates that the data
+                for an object is stored outside the HDF5 file. The filename of the
+                object is stored as a Universal Resource Location (URL) of the
+                actual filename containing the data. An external file list record
+                also contains the byte offset of the start of the data within the
+                file and the amount of space reserved in the file for that data.</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Format of Data:</b> See the tables below.</td>
+        </tr>
+    </table>
+</center>
+<!-- end msgdesc table -->
+
+<div align="center">
+    <table class="format">
+        <caption>External File List Message</caption>
+
+        <tr>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+        </tr>
+
+        <tr>
+            <td>Version</td>
+            <td colspan="3">Reserved (zero)</td>
+        </tr>
+
+        <tr>
+            <td colspan="2">Allocated Slots</td>
+            <td colspan="2">Used Slots</td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Heap Address<sup>O</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Slot Definitions...<br />
+            <br /></td>
+        </tr>
+    </table>
+
+    <table class="note">
+        <tr>
+            <td width="60%">&nbsp;</td>
+            <td width="40%">(Items marked with an &lsquo;O&rsquo; in the
+                above table are of the size specified in &ldquo;Size of
+                Offsets&rdquo; field in the superblock.)</td>
+        </tr>
+    </table>
+
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Version</p></td>
+            <td>
+                <p>The version number information is used for changes in the
+                    format of External Data Storage Message and is described here:</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Version</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>0</code></td>
+                        <td>Never used.</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>1</code></td>
+                        <td>The current version used by the library.</td>
+                    </tr>
+                </table>
+                <p></p>
+
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Allocated Slots</p></td>
+            <td>
+                <p>The total number of slots allocated in the message. Its value
+                    must be at least as large as the value contained in the Used Slots
+                    field. (The current library simply uses the number of Used Slots
+                    for this message)</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Used Slots</p></td>
+            <td>
+                <p>The number of initial slots which contains valid information.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Heap Address</p></td>
+            <td>
+                <p>This is the address of a local heap which contains the names
+                    for the external files (The local heap information can be found in
+                    Disk Format Level 1D in this document). The name at offset zero in
+                    the heap is always the empty string.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Slot Definitions</p></td>
+            <td>
+                <p>The slot definitions are stored in order according to the
+                    array addresses they represent.</p>
+            </td>
+        </tr>
+
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="format">
+        <caption>External File List Slot</caption>
+
+        <tr>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Name Offset in Local Heap<sup>L</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Offset in External Data File<sup>L</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Data Size in External File<sup>L</sup><br />
+            <br /></td>
+        </tr>
+    </table>
+
+    <table class="note">
+        <tr>
+            <td width="60%">&nbsp;</td>
+            <td width="40%">(Items marked with an &lsquo;L&rsquo; in the
+                above table are of the size specified in &ldquo;Size of
+                Lengths&rdquo; field in the superblock.)</td>
+        </tr>
+    </table>
+
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Name Offset in Local Heap</p></td>
+            <td>
+                <p>
+                    The byte offset within the local name heap for the name of the
+                    file. File names are stored as a URL which has a protocol name, a
+                    host name, a port number, and a file name:
+                    <code>
+                        <em>protocol</em>:<em>port</em>//<em>host</em>/<em>file</em>
+                    </code>
+                    . If the protocol is omitted then &ldquo;file:&rdquo; is assumed.
+                    If the port number is omitted then a default port for that protocol
+                    is used. If both the protocol and the port number are omitted then
+                    the colon can also be omitted. If the double slash and host name
+                    are omitted then &ldquo;localhost&rdquo; is assumed. The file name
+                    is the only mandatory part, and if the leading slash is missing
+                    then it is relative to the application&rsquo;s current working
+                    directory (the use of relative names is not recommended).
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Offset in External Data File</p></td>
+            <td>
+                <p>This is the byte offset to the start of the data in the
+                    specified file. For files that contain data for a single dataset
+                    this will usually be zero.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Data Size in External File</p></td>
+            <td>
+                <p>This is the total number of bytes reserved in the specified
+                    file for raw data storage. For a file that contains exactly one
+                    complete dataset which is not extendable, the size will usually be
+                    the exact size of the dataset. However, by making the size larger
+                    one allows HDF5 to extend the dataset. The size can be set to a
+                    value larger than the entire file since HDF5 will read zeroes past
+                    the end of the file without failing.</p>
+            </td>
+        </tr>
+    </table>
+</div>
+
+
+<br />
+<h4>
+    <a name="LayoutMessage">IV.A.2.i. The Data Storage - Layout Message</a>
+</h4>
+
+<!-- start msgdesc table -->
+<center>
+    <table class="msgdesc">
+        <tr>
+            <td colspan="2"><b>Header Message Name:</b> Data Storage -
+                Layout</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Header Message Type:</b> 0x0008</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Length:</b> Varies</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Status:</b> Required for datasets; may not be
+                repeated.</td>
+        </tr>
+        <tr>
+            <td><b>Description:</b></td>
+            <td>Data layout describes how the elements of a
+                multi-dimensional array are stored in the HDF5 file. Three types of
+                data layout are supported:
+                <ol>
+                    <li>Contiguous: The array is stored in one contiguous area of
+                        the file. This layout requires that the size of the array be
+                        constant: data manipulations such as chunking, compression,
+                        checksums, or encryption are not permitted. The message stores the
+                        total storage size of the array. The offset of an element from the
+                        beginning of the storage area is computed as in a C array.</li>
+                    <li>Chunked: The array domain is regularly decomposed into
+                        chunks, and each chunk is allocated and stored separately. This
+                        layout supports arbitrary element traversals, compression,
+                        encryption, and checksums. (these features are described in other
+                        messages). The message stores the size of a chunk instead of the
+                        size of the entire array; the storage size of the entire array can
+                        be calculated by traversing the B-tree that stores the chunk
+                        addresses.</li>
+                    <li>Compact: The array is stored in one contiguous block, as
+                        part of this object header message.</li>
+                </ol>
+            </td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Format of Data:</b> See the tables below.</td>
+        </tr>
+    </table>
+</center>
+<!-- end msgdesc table -->
+
+<div align="center">
+    <table class="format">
+        <caption>Data Layout Message (Versions 1 and 2)</caption>
+
+        <tr>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+        </tr>
+
+        <tr>
+            <td>Version</td>
+            <td>Dimensionality</td>
+            <td>Layout Class</td>
+            <td>Reserved <em>(zero)</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Reserved <em>(zero)</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Data Address<sup>O</sup> <em>(optional)</em><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Dimension 0 Size</td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Dimension 1 Size</td>
+        </tr>
+
+        <tr>
+            <td colspan="4">...</td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Dimension #n Size</td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Dataset Element Size <em>(optional)</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Compact Data Size <em>(optional)</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Compact Data... <em>(variable size,
+                    optional)</em><br />
+            <br /></td>
+        </tr>
+    </table>
+
+    <table class="note">
+        <tr>
+            <td width="60%">&nbsp;</td>
+            <td width="40%">(Items marked with an &lsquo;O&rsquo; in the
+                above table are of the size specified in &ldquo;Size of
+                Offsets&rdquo; field in the superblock.)</td>
+        </tr>
+    </table>
+
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Version</p></td>
+            <td>
+                <p>The version number information is used for changes in the
+                    format of the data layout message and is described here:</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Version</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>0</code></td>
+                        <td>Never used.</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>1</code></td>
+                        <td>Used by version 1.4 and before of the library to encode
+                            layout information. Data space is always allocated when the data
+                            set is created.</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>2</code></td>
+                        <td>Used by version 1.6.x of the library to encode layout
+                            information. Data space is allocated only when it is necessary.</td>
+                    </tr>
+                </table>
+                <p></p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Dimensionality</p></td>
+            <td><p>An array has a fixed dimensionality. This field
+                    specifies the number of dimension size fields later in the message.
+                    The value stored for chunked storage is 1 greater than the number
+                    of dimensions in the dataset&rsquo;s dataspace. For example, 2 is
+                    stored for a 1 dimensional dataset.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>Layout Class</p></td>
+            <td><p>The layout class specifies the type of storage for
+                    the data and how the other fields of the layout message are to be
+                    interpreted.</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Value</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>0</code></td>
+                        <td>Compact Storage</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>1</code></td>
+                        <td>Contiguous Storage</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>2</code></td>
+                        <td>Chunked Storage</td>
+                    </tr>
+                </table>
+                <p></p></td>
+        </tr>
+
+        <tr>
+            <td><p>Data Address</p></td>
+            <td><p>For contiguous storage, this is the address of the
+                    raw data in the file. For chunked storage this is the address of
+                    the v1 B-tree that is used to look up the addresses of the chunks.
+                    This field is not present for compact storage. If the version for
+                    this message is greater than 1, the address may have the
+                    &ldquo;undefined address&rdquo; value, to indicate that storage has
+                    not yet been allocated for this array.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>Dimension #n Size</p></td>
+            <td><p>For contiguous and compact storage the dimensions
+                    define the entire size of the array while for chunked storage they
+                    define the size of a single chunk. In all cases, they are in units
+                    of array elements (not bytes). The first dimension stored in the
+                    list of dimensions is the slowest changing dimension and the last
+                    dimension stored is the fastest changing dimension.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>Dataset Element Size</p></td>
+            <td><p>The size of a dataset element, in bytes. This field
+                    is only present for chunked storage.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>Compact Data Size</p></td>
+            <td><p>This field is only present for compact data storage.
+                    It contains the size of the raw data for the dataset array, in
+                    bytes.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>Compact Data</p></td>
+            <td><p>This field is only present for compact data storage.
+                    It contains the raw data for the dataset array.</p></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<p>Version 3 of this message re-structured the format into specific
+    properties that are required for each layout class.</p>
+
+
+<div align="center">
+    <table class="format">
+        <caption>
+            <b>Data Layout Message (Version 3)</b>
+        </caption>
+
+        <tr>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+        </tr>
+
+        <tr>
+            <td>Version</td>
+            <td>Layout Class</td>
+            <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Properties <em>(variable size)</em><br />
+            <br /></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Version</p></td>
+            <td>
+                <p>The version number information is used for changes in the
+                    format of layout message and is described here:</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Version</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>3</code></td>
+                        <td>Used by the version 1.6.3 and later of the library to
+                            store properties for each layout class.</td>
+                    </tr>
+                </table>
+                <p></p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Layout Class</p></td>
+            <td><p>The layout class specifies the type of storage for
+                    the data and how the other fields of the layout message are to be
+                    interpreted.</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Value</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>0</code></td>
+                        <td>Compact Storage</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>1</code></td>
+                        <td>Contiguous Storage</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>2</code></td>
+                        <td>Chunked Storage</td>
+                    </tr>
+                </table>
+                <p></p></td>
+        </tr>
+
+        <tr>
+            <td><p>Properties</p></td>
+            <td><p>This variable-sized field encodes information
+                    specific to each layout class and is described below. If there is
+                    no property information specified for a layout class, the size of
+                    this field is zero bytes.</p></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<p>Class-specific information for compact layout (Class 0): (Note:
+    The dimensionality information is in the Dataspace message)</p>
+
+
+<div align="center">
+    <table class="format">
+        <caption>Compact Storage Property Description</caption>
+
+        <tr>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="2">Size</td>
+            <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Raw Data... <em>(variable size)</em><br />
+            <br /></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Size</p></td>
+            <td><p>This field contains the size of the raw data for the
+                    dataset array, in bytes.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>Raw Data</p></td>
+            <td><p>This field contains the raw data for the dataset
+                    array.</p></td>
+        </tr>
+    </table>
+</div>
+
+
+<br />
+<p>Class-specific information for contiguous layout (Class 1):
+    (Note: The dimensionality information is in the Dataspace message)</p>
+
+
+<div align="center">
+    <table class="format">
+        <caption>Contiguous Storage Property Description</caption>
+
+        <tr>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Address<sup>O</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Size<sup>L</sup><br />
+            <br /></td>
+        </tr>
+    </table>
+
+    <table class="note">
+        <tr>
+            <td width="60%">&nbsp;</td>
+            <td width="40%">(Items marked with an &lsquo;O&rsquo; in the
+                above table are of the size specified in &ldquo;Size of
+                Offsets&rdquo; field in the superblock.)</td>
+        </tr>
+        <tr>
+            <td>&nbsp;</td>
+            <td>(Items marked with an &lsquo;L&rsquo; in the above table are
+                of the size specified in &ldquo;Size of Lengths&rdquo; field in the
+                superblock.)</td>
+        </tr>
+    </table>
+
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Address</p></td>
+            <td><p>This is the address of the raw data in the file. The
+                    address may have the &ldquo;undefined address&rdquo; value, to
+                    indicate that storage has not yet been allocated for this array.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>Size</p></td>
+            <td><p>This field contains the size allocated to store the
+                    raw data, in bytes.</p></td>
+        </tr>
+    </table>
+</div>
+
+
+<br />
+<p>Class-specific information for chunked layout (Class 2):</p>
+
+
+<div align="center">
+    <table class="format">
+        <caption>Chunked Storage Property Description</caption>
+
+        <tr>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+        </tr>
+
+        <tr>
+            <td>Dimensionality</td>
+            <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Address<sup>O</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Dimension 0 Size</td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Dimension 1 Size</td>
+        </tr>
+
+        <tr>
+            <td colspan="4">...</td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Dimension #n Size</td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Dataset Element Size</td>
+        </tr>
+    </table>
+
+    <table class="note">
+        <tr>
+            <td width="60%">&nbsp;</td>
+            <td width="40%">(Items marked with an &lsquo;O&rsquo; in the
+                above table are of the size specified in &ldquo;Size of
+                Offsets&rdquo; field in the superblock.)</td>
+        </tr>
+    </table>
+
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Dimensionality</p></td>
+            <td><p>A chunk has a fixed dimensionality. This field
+                    specifies the number of dimension size fields later in the message.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>Address</p></td>
+            <td><p>This is the address of the v1 B-tree that is used to
+                    look up the addresses of the chunks that actually store portions of
+                    the array data. The address may have the &ldquo;undefined
+                    address&rdquo; value, to indicate that storage has not yet been
+                    allocated for this array.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>Dimension #n Size</p></td>
+            <td><p>These values define the dimension size of a single
+                    chunk, in units of array elements (not bytes). The first dimension
+                    stored in the list of dimensions is the slowest changing dimension
+                    and the last dimension stored is the fastest changing dimension.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>Dataset Element Size</p></td>
+            <td><p>The size of a dataset element, in bytes.</p></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<h4>
+    <a name="BogusMessage">IV.A.2.j. The Bogus Message</a>
+</h4>
+
+<!-- start msgdesc table -->
+<center>
+    <table class="msgdesc">
+        <tr>
+            <td colspan="2"><b>Header Message Name:</b> Bogus</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Header Message Type:</b> 0x0009</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Length:</b> 4 bytes</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Status:</b> For testing only; should never be
+                stored in a valid file.</td>
+        </tr>
+        <tr>
+            <td><b>Description:</b></td>
+            <td>This message is used for testing the HDF5 Library&rsquo;s
+                response to an &ldquo;unknown&rdquo; message type and should never
+                be encountered in a valid HDF5 file.</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Format of Data:</b> See the tables below.</td>
+        </tr>
+    </table>
+</center>
+<!-- end msgdesc table -->
+
+<div align="center">
+    <table class="format">
+        <caption>Bogus Message</caption>
+
+        <tr>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="4">Bogus Value</td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Bogus Value</p></td>
+            <td>
+                <p>
+                    This value should always be:
+                    <code>0xdeadbeef</code>
+                    .
+                </p>
+            </td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<h4>
+    <a name="GroupInfoMessage">IV.A.2.k. The Group Info Message </a>
+</h4>
+
+<!-- start msgdesc table -->
+<center>
+    <table class="msgdesc">
+        <tr>
+            <td colspan="2"><b>Header Message Name:</b> Group Info</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Header Message Type:</b> 0x000A</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Length:</b> Varies</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Status:</b> Optional; may not be repeated.</td>
+        </tr>
+        <tr>
+            <td><b>Description:</b></td>
+            <td><p>
+                    This message stores information for the constants defining a
+                    &ldquo;new style&rdquo; group&rsquo;s behavior. Constant
+                    information will be stored in this message and variable information
+                    will be stored in the <a href="#LinkInfoMessage">Link Info</a>
+                    message.
+                </p>
+                <p>Note: the &ldquo;estimated entry&rdquo; information below is
+                    used when determining the size of the object header for the group
+                    when it is created.</p></td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Format of Data:</b> See the tables below.</td>
+        </tr>
+    </table>
+</center>
+<!-- end msgdesc table -->
+
+<div align="center">
+    <table class="format">
+        <caption>Group Info Message</caption>
+
+        <tr>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+        </tr>
+
+        <tr>
+            <td>Version</td>
+            <td>Flags</td>
+            <td colspan="2">Link Phase Change: Maximum Compact Value <em>(optional)</em></td>
+        </tr>
+        <tr>
+            <td colspan="2">Link Phase Change: Minimum Dense Value <em>(optional)</em></td>
+            <td colspan="2">Estimated Number of Entries <em>(optional)</em></td>
+        </tr>
+        <tr>
+            <td colspan="2">Estimated Link Name Length of Entries <em>(optional)</em></td>
+            <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Version</p></td>
+            <td><p>The version number for this message. This document
+                    describes version 0.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>Flags</p></td>
+            <td><p>This is the group information flag with the following
+                    definition:</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Bit</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>0</code></td>
+                        <td>If set, link phase change values are stored.</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>1</code></td>
+                        <td>If set, the estimated entry information is non-default
+                            and is stored.</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>2-7</code></td>
+                        <td>Reserved</td>
+                    </tr>
+                </table>
+                <p></p></td>
+        </tr>
+
+        <tr>
+            <td><p>Link Phase Change: Maximum Compact Value</p></td>
+            <td><p>The is the maximum number of links to store
+                    &ldquo;compactly&rdquo; (in the group&rsquo;s object header).</p>
+                <p>
+                    This field is present if bit 0 of <em>Flags</em> is set.
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>Link Phase Change: Minimum Dense Value</p></td>
+            <td><p>
+                    This is the minimum number of links to store &ldquo;densely&rdquo;
+                    (in the group&rsquo;s fractal heap). The fractal heap&rsquo;s
+                    address is located in the <a href="#LinkInfoMessage">Link Info</a>
+                    message.
+                </p>
+                <p>
+                    This field is present if bit 0 of <em>Flags</em> is set.
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>Estimated Number of Entries</p></td>
+            <td><p>This is the estimated number of entries in groups.</p>
+                <p>
+                    If this field is not present, the default value of
+                    <code>4</code>
+                    will be used for the estimated number of group entries.
+                </p>
+                <p>
+                    This field is present if bit 1 of <em>Flags</em> is set.
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>Estimated Link Name Length of Entries</p></td>
+            <td><p>This is the estimated length of entry name.</p>
+                <p>
+                    If this field is not present, the default value of
+                    <code>8</code>
+                    will be used for the estimated link name length of group entries.
+                </p>
+                <p>
+                    This field is present if bit 1 of <em>Flags</em> is set.
+                </p></td>
+        </tr>
+
+    </table>
+</div>
+<p></p>
+
+<br />
+<h4>
+    <a name="FilterMessage">IV.A.2.l. The Data Storage - Filter
+        Pipeline Message</a>
+</h4>
+
+<!-- start msgdesc table -->
+<center>
+    <table class="msgdesc">
+        <tr>
+            <td colspan="2"><b>Header Message Name:</b> Data Storage -
+                Filter Pipeline</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Header Message Type:</b> 0x000B</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Length:</b> Varies</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Status:</b> Optional; may not be repeated.</td>
+        </tr>
+        <tr>
+            <td><b>Description:</b></td>
+            <td><p>This message describes the filter pipeline which
+                    should be applied to the data stream by providing filter
+                    identification numbers, flags, a name, and client data.</p>
+                <p>This message may be present in the object headers of both
+                    dataset and group objects. For datasets, it specifies the filters
+                    to apply to raw data. For groups, it specifies the filters to apply
+                    to the group&rsquo;s fractal heap. Currently, only datasets using
+                    chunked data storage use the filter pipeline on their raw data.</p></td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Format of Data:</b> See the tables below.</td>
+        </tr>
+    </table>
+</center>
+<!-- end msgdesc table -->
+
+<div align="center">
+    <table class="format">
+        <caption>Filter Pipeline Message - Version 1</caption>
+
+        <tr>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+        </tr>
+
+        <tr>
+            <td>Version</td>
+            <td>Number of Filters</td>
+            <td colspan="2">Reserved (zero)</td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Reserved (zero)</td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Filter Description List <em>(variable
+                    size)</em><br />
+            <br /></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Version</p></td>
+            <td><p>The version number for this message. This table
+                    describes version 1.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>Number of Filters</p></td>
+            <td><p>The total number of filters described in this
+                    message. The maximum possible number of filters in a message is 32.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>Filter Description List</p></td>
+            <td><p>A description of each filter. A filter description
+                    appears in the next table.</p></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="format">
+        <caption>Filter Description</caption>
+
+        <tr>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="2">Filter Identification Value</td>
+            <td colspan="2">Name Length</td>
+        </tr>
+
+        <tr>
+            <td colspan="2">Flags</td>
+            <td colspan="2">Number Client Data Values</td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Name <em>(variable size, optional)</em><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Client Data <em>(variable size,
+                    optional)</em><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Padding <em>(variable size, optional)</em></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Filter Identification Value</p></td>
+            <td>
+                <p>
+                    This value, often referred to as a filter identifier, is designed
+                    to be a unique identifier for the filter. Values from zero through
+                    32,767 are reserved for filters supported by The HDF Group in the
+                    HDF5 Library and for filters requested and supported by third
+                    parties. Filters supported by The HDF Group are documented
+                    immediately below. Information on 3rd-party filters can be found at
+                    The HDF Group&rsquo;s <a
+                        href="http://www.hdfgroup.org/services/contributions.html">
+                        Contributions</a> page.
+                </p>
+
+                <p>
+                    To request a filter identifier, please contact The HDF
+                    Group&rsquo;s Help Desk at <img src="Graphics/help.png"
+                        valign="middle" height="14" alt="The HDF Group Help Desk">.
+                    You will be asked to provide the following information:
+                </p>
+                <ol>
+                    <li>Contact information for the developer requesting the new
+                        identifier</li>
+                    <li>A short description of the new filter</li>
+                    <li>Links to any relevant information, including licensing
+                        information</li>
+                </ol>
+                <p>Values from 32768 to 65535 are reserved for non-distributed
+                    uses (for example, internal company usage) or for application usage
+                    when testing a feature. The HDF Group does not track or document
+                    the use of the filters with identifiers from this range.</p>
+
+                <p>The filters currently in library version 1.8.0 are listed
+                    below:</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Identification</th>
+                        <th width="15%" align="left">Name</th>
+                        <th width="65%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>0</code></td>
+                        <td>N/A</td>
+                        <td>Reserved</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>1</code></td>
+                        <td>deflate</td>
+                        <td>GZIP deflate compression</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>2</code></td>
+                        <td>shuffle</td>
+                        <td>Data element shuffling</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>3</code></td>
+                        <td>fletcher32</td>
+                        <td>Fletcher32 checksum</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>4</code></td>
+                        <td>szip</td>
+                        <td>SZIP compression</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>5</code></td>
+                        <td>nbit</td>
+                        <td>N-bit packing</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>6</code></td>
+                        <td>scaleoffset</td>
+                        <td>Scale and offset encoded values</td>
+                    </tr>
+                </table>
+                <p></p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Name Length</p></td>
+            <td><p>Each filter has an optional null-terminated ASCII
+                    name and this field holds the length of the name including the null
+                    termination padded with nulls to be a multiple of eight. If the
+                    filter has no name then a value of zero is stored in this field.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>Flags</p></td>
+            <td><p>The flags indicate certain properties for a filter.
+                    The bit values defined so far are:</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Bit</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>0</code></td>
+                        <td>If set then the filter is an optional filter. During
+                            output, if an optional filter fails it will be silently skipped
+                            in the pipeline.</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>1-15</code></td>
+                        <td>Reserved (zero)</td>
+                    </tr>
+                </table>
+                <p></p></td>
+        </tr>
+
+        <tr>
+            <td><p>Number of Client Data Values</p></td>
+            <td><p>
+                    Each filter can store integer values to control how the filter
+                    operates. The number of entries in the <em>Client Data</em> array
+                    is stored in this field.
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>Name</p></td>
+            <td><p>
+                    If the <em>Name Length</em> field is non-zero then it will contain
+                    the size of this field, padded to a multiple of eight. This field
+                    contains a null-terminated, ASCII character string to serve as a
+                    comment/name for the filter.
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>Client Data</p></td>
+            <td><p>
+                    This is an array of four-byte integers which will be passed to the
+                    filter function. The <em>Client Data Number</em> of Values
+                    determines the number of elements in the array.
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>Padding</p></td>
+            <td><p>Four bytes of zeroes are added to the message at this
+                    point if the Client Data Number of Values field contains an odd
+                    number.</p></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="format">
+        <caption>Filter Pipeline Message - Version 2</caption>
+
+        <tr>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+        </tr>
+
+        <tr>
+            <td>Version</td>
+            <td>Number of Filters</td>
+            <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Filter Description List <em>(variable
+                    size)</em><br />
+            <br /></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Version</p></td>
+            <td><p>The version number for this message. This table
+                    describes version 2.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>Number of Filters</p></td>
+            <td><p>The total number of filters described in this
+                    message. The maximum possible number of filters in a message is 32.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>Filter Description List</p></td>
+            <td><p>A description of each filter. A filter description
+                    appears in the next table.</p></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="format">
+        <caption>Filter Description</caption>
+
+        <tr>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="2">Filter Identification Value</td>
+            <td colspan="2">Name Length <em>(optional)</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="2">Flags</td>
+            <td colspan="2">Number Client Data Values</td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Name <em>(variable size, optional)</em><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Client Data <em>(variable size,
+                    optional)</em><br />
+            <br /></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Filter Identification Value</p></td>
+            <td>
+                <p>
+                    This value, often referred to as a filter identifier, is designed
+                    to be a unique identifier for the filter. Values from zero through
+                    32,767 are reserved for filters supported by The HDF Group in the
+                    HDF5 Library and for filters requested and supported by third
+                    parties. Filters supported by The HDF Group are documented
+                    immediately below. Information on 3rd-party filters can be found at
+                    The HDF Group&rsquo;s <a
+                        href="http://www.hdfgroup.org/services/contributions.html">
+                        Contributions</a> page.
+                </p>
+
+                <p>
+                    To request a filter identifier, please contact The HDF
+                    Group&rsquo;s Help Desk at <img src="Graphics/help.png"
+                        valign="middle" height="14" alt="The HDF Group Help Desk">.
+                    You will be asked to provide the following information:
+                </p>
+                <ol>
+                    <li>Contact information for the developer requesting the new
+                        identifier</li>
+                    <li>A short description of the new filter</li>
+                    <li>Links to any relevant information, including licensing
+                        information</li>
+                </ol>
+                <p>Values from 32768 to 65535 are reserved for non-distributed
+                    uses (for example, internal company usage) or for application usage
+                    when testing a feature. The HDF Group does not track or document
+                    the use of the filters with identifiers from this range.</p>
+
+                <p>The filters currently in library version 1.8.0 are listed
+                    below:</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Identification</th>
+                        <th width="15%" align="left">Name</th>
+                        <th width="65%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>0</code></td>
+                        <td>N/A</td>
+                        <td>Reserved</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>1</code></td>
+                        <td>deflate</td>
+                        <td>GZIP deflate compression</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>2</code></td>
+                        <td>shuffle</td>
+                        <td>Data element shuffling</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>3</code></td>
+                        <td>fletcher32</td>
+                        <td>Fletcher32 checksum</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>4</code></td>
+                        <td>szip</td>
+                        <td>SZIP compression</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>5</code></td>
+                        <td>nbit</td>
+                        <td>N-bit packing</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>6</code></td>
+                        <td>scaleoffset</td>
+                        <td>Scale and offset encoded values</td>
+                    </tr>
+                </table>
+                <p></p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Name Length</p></td>
+            <td><p>Each filter has an optional null-terminated ASCII
+                    name and this field holds the length of the name including the null
+                    termination padded with nulls to be a multiple of eight. If the
+                    filter has no name then a value of zero is stored in this field.</p>
+                <p>
+                    Filters with IDs less than 256 (in other words, filters that are
+                    defined in this format documentation) do not store the <em>Name
+                        Length</em> or <em>Name</em> fields.
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>Flags</p></td>
+            <td><p>The flags indicate certain properties for a filter.
+                    The bit values defined so far are:</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Bit</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>0</code></td>
+                        <td>If set then the filter is an optional filter. During
+                            output, if an optional filter fails it will be silently skipped
+                            in the pipeline.</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>1-15</code></td>
+                        <td>Reserved (zero)</td>
+                    </tr>
+                </table>
+                <p></p></td>
+        </tr>
+
+        <tr>
+            <td><p>Number of Client Data Values</p></td>
+            <td><p>
+                    Each filter can store integer values to control how the filter
+                    operates. The number of entries in the <em>Client Data</em> array
+                    is stored in this field.
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>Name</p></td>
+            <td><p>
+                    If the <em>Name Length</em> field is non-zero then it will contain
+                    the size of this field, <em>not</em> padded to a multiple of eight.
+                    This field contains a <em>non-</em>null-terminated, ASCII character
+                    string to serve as a comment/name for the filter.
+                </p>
+                <p>
+                    Filters that are defined in this format documentation such as
+                    deflate and shuffle do not store the <em>Name Length</em> or <em>Name</em>
+                    fields.
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>Client Data</p></td>
+            <td><p>
+                    This is an array of four-byte integers which will be passed to the
+                    filter function. The Client Data Number of Values<em></em>
+                    determines the number of elements in the array.
+                </p></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<h4>
+    <a name="AttributeMessage">IV.A.2.m. The Attribute Message</a>
+</h4>
+
+<!-- start msgdesc table -->
+<center>
+    <table class="msgdesc">
+        <tr>
+            <td colspan="2"><b>Header Message Name:</b> Attribute</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Header Message Type:</b> 0x000C</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Length:</b> Varies</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Status:</b> Optional; may be repeated.</td>
+        </tr>
+        <tr>
+            <td><b>Description:</b></td>
+            <td><p>
+                    The <em>Attribute</em> message is used to store objects in the HDF5
+                    file which are used as attributes, or &ldquo;metadata&rdquo; about
+                    the current object. An attribute is a small dataset; it has a name,
+                    a datatype, a dataspace, and raw data. Since attributes are stored
+                    in the object header, they should be relatively small (in other
+                    words, less than 64KB). They can be associated with any type of
+                    object which has an object header (groups, datasets, or committed
+                    (named) datatypes).
+                </p>
+                <p>
+                    In 1.8.x versions of the library, attributes can be larger than
+                    64KB. See the <a
+                        href="UG/HDF5_Users_Guide-Responsive%20HTML5/index.html#t=HDF5_User_Guide%2FAttributes%2FHDF5_Attributes.htm%3Frhtocid%3Dtoc8.2_1%23TOC_8_5_Special_Issuesbc-13">
+                        &ldquo;Special Issues&rdquo;</a> section of the Attributes chapter in
+                    the <cite>HDF5 User Guide</cite> for more information.
+                </p>
+                <p>Note: Attributes on an object must have unique names: the
+                    HDF5 Library currently enforces this by causing the creation of an
+                    attribute with a duplicate name to fail. Attributes on different
+                    objects may have the same name, however.</p></td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Format of Data:</b> See the tables below.</td>
+        </tr>
+    </table>
+</center>
+<!-- end msgdesc table -->
+
+<div align="center">
+    <table class="format">
+        <caption>Attribute Message (Version 1)</caption>
+
+        <tr>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+        </tr>
+
+        <tr>
+            <td>Version</td>
+            <td>Reserved (zero)</td>
+            <td colspan="2">Name Size</td>
+        </tr>
+
+        <tr>
+            <td colspan="2">Datatype Size</td>
+            <td colspan="2">Dataspace Size</td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Name <em>(variable size)</em><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Datatype <em>(variable size)</em><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Dataspace <em>(variable size)</em><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Data <em>(variable size)</em><br />
+            <br /></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Version</p></td>
+            <td><p>The version number information is used for changes in
+                    the format of the attribute message and is described here:</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Version</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>0</code></td>
+                        <td>Never used.</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>1</code></td>
+                        <td>Used by the library before version 1.6 to encode
+                            attribute message. This version does not support shared
+                            datatypes.</td>
+                    </tr>
+                </table>
+                <p></p></td>
+        </tr>
+
+        <tr>
+            <td><p>Name Size</p></td>
+            <td><p>
+                    The length of the attribute name in bytes including the null
+                    terminator. Note that the <em>Name</em> field below may contain
+                    additional padding not represented by this field.
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>Datatype Size</p></td>
+            <td><p>
+                    The length of the datatype description in the <em>Datatype</em>
+                    field below. Note that the <em>Datatype</em> field may contain
+                    additional padding not represented by this field.
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>Dataspace Size</p></td>
+            <td><p>
+                    The length of the dataspace description in the <em>Dataspace</em>
+                    field below. Note that the <em>Dataspace</em> field may contain
+                    additional padding not represented by this field.
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>Name</p></td>
+            <td><p>The null-terminated attribute name. This field is
+                    padded with additional null characters to make it a multiple of
+                    eight bytes.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>Datatype</p></td>
+            <td><p>The datatype description follows the same format as
+                    described for the datatype object header message. This field is
+                    padded with additional zero bytes to make it a multiple of eight
+                    bytes.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>Dataspace</p></td>
+            <td><p>The dataspace description follows the same format as
+                    described for the dataspace object header message. This field is
+                    padded with additional zero bytes to make it a multiple of eight
+                    bytes.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>Data</p></td>
+            <td><p>
+                    The raw data for the attribute. The size is determined from the
+                    datatype and dataspace descriptions. This field is <em>not</em>
+                    padded with additional bytes.
+                </p></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="format">
+        <caption>Attribute Message (Version 2)</caption>
+
+        <tr align="center">
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+        </tr>
+
+        <tr>
+            <td>Version</td>
+            <td>Flags</td>
+            <td colspan="2">Name Size</td>
+        </tr>
+
+        <tr>
+            <td colspan="2">Datatype Size</td>
+            <td colspan="2">Dataspace Size</td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Name <em>(variable size)</em><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Datatype <em>(variable size)</em><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Dataspace <em>(variable size)</em><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Data <em>(variable size)</em><br />
+            <br /></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Version</p></td>
+            <td><p>The version number information is used for changes in
+                    the format of the attribute message and is described here:</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Version</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>2</code></td>
+                        <td>Used by the library of version 1.6.x and after to encode
+                            attribute messages. This version supports shared datatypes. The
+                            fields of name, datatype, and dataspace are not padded with
+                            additional bytes of zero.</td>
+                    </tr>
+                </table>
+                <p></p></td>
+        </tr>
+
+        <tr>
+            <td><p>Flags</p></td>
+            <td><p>This bit field contains extra information about
+                    interpreting the attribute message:</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Bit</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>0</code></td>
+                        <td>If set, datatype is shared.</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>1</code></td>
+                        <td>If set, dataspace is shared.</td>
+                    </tr>
+                </table>
+                <p></p></td>
+        </tr>
+
+        <tr>
+            <td><p>Name Size</p></td>
+            <td><p>The length of the attribute name in bytes including
+                    the null terminator.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>Datatype Size</p></td>
+            <td><p>
+                    The length of the datatype description in the <em>Datatype</em>
+                    field below.
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>Dataspace Size</p></td>
+            <td><p>
+                    The length of the dataspace description in the <em>Dataspace</em>
+                    field below.
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>Name</p></td>
+            <td><p>
+                    The null-terminated attribute name. This field is <em>not</em>
+                    padded with additional bytes.
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>Datatype</p></td>
+            <td><p>The datatype description follows the same format as
+                    described for the datatype object header message.</p>
+                <p>
+                    If the <em>Flag</em> field indicates this attribute&rsquo;s
+                    datatype is shared, this field will contain a &ldquo;shared
+                    message&rdquo; encoding instead of the datatype encoding.
+                </p>
+                <p>
+                    This field is <em>not</em> padded with additional bytes.
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>Dataspace</p></td>
+            <td><p>The dataspace description follows the same format as
+                    described for the dataspace object header message.</p>
+                <p>
+                    If the <em>Flag</em> field indicates this attribute&rsquo;s
+                    dataspace is shared, this field will contain a &ldquo;shared
+                    message&rdquo; encoding instead of the dataspace encoding.
+                </p>
+                <p>
+                    This field is <em>not</em> padded with additional bytes.
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>Data</p></td>
+            <td><p>The raw data for the attribute. The size is
+                    determined from the datatype and dataspace descriptions.</p>
+                <p>
+                    This field is <em>not</em> padded with additional zero bytes.
+                </p></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="format">
+        <caption>Attribute Message (Version 3)</caption>
+
+        <tr align="center">
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+        </tr>
+
+        <tr>
+            <td>Version</td>
+            <td>Flags</td>
+            <td colspan="2">Name Size</td>
+        </tr>
+
+        <tr>
+            <td colspan="2">Datatype Size</td>
+            <td colspan="2">Dataspace Size</td>
+        </tr>
+
+        <tr>
+            <td>Name Character Set Encoding</td>
+            <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Name <em>(variable size)</em><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Datatype <em>(variable size)</em><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Dataspace <em>(variable size)</em><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Data <em>(variable size)</em><br />
+            <br /></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Version</p></td>
+            <td><p>The version number information is used for changes in
+                    the format of the attribute message and is described here:</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Version</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>3</code></td>
+                        <td>Used by the library of version 1.8.x and after to encode
+                            attribute messages. This version supports attributes with
+                            non-ASCII names.</td>
+                    </tr>
+                </table>
+                <p></p></td>
+        </tr>
+
+        <tr>
+            <td><p>Flags</p></td>
+            <td><p>This bit field contains extra information about
+                    interpreting the attribute message:</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Bit</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>0</code></td>
+                        <td>If set, datatype is shared.</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>1</code></td>
+                        <td>If set, dataspace is shared.</td>
+                    </tr>
+                </table>
+                <p></p></td>
+        </tr>
+
+        <tr>
+            <td><p>Name Size</p></td>
+            <td><p>The length of the attribute name in bytes including
+                    the null terminator.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>Datatype Size</p></td>
+            <td><p>
+                    The length of the datatype description in the <em>Datatype</em>
+                    field below.
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>Dataspace Size</p></td>
+            <td><p>
+                    The length of the dataspace description in the <em>Dataspace</em>
+                    field below.
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>Name Character Set Encoding</p></td>
+            <td><p>The character set encoding for the attribute&rsquo;s
+                    name:</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Value</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>0</code></td>
+                        <td>ASCII character set encoding</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>1</code></td>
+                        <td>UTF-8 character set encoding</td>
+                    </tr>
+                </table>
+                <p></p></td>
+        </tr>
+
+        <tr>
+            <td><p>Name</p></td>
+            <td><p>
+                    The null-terminated attribute name. This field is <em>not</em>
+                    padded with additional bytes.
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>Datatype</p></td>
+            <td><p>The datatype description follows the same format as
+                    described for the datatype object header message.</p>
+                <p>
+                    If the <em>Flag</em> field indicates this attribute&rsquo;s
+                    datatype is shared, this field will contain a &ldquo;shared
+                    message&rdquo; encoding instead of the datatype encoding.
+                </p>
+                <p>
+                    This field is <em>not</em> padded with additional bytes.
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>Dataspace</p></td>
+            <td><p>The dataspace description follows the same format as
+                    described for the dataspace object header message.</p>
+                <p>
+                    If the <em>Flag</em> field indicates this attribute&rsquo;s
+                    dataspace is shared, this field will contain a &ldquo;shared
+                    message&rdquo; encoding instead of the dataspace encoding.
+                </p>
+                <p>
+                    This field is <em>not</em> padded with additional bytes.
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>Data</p></td>
+            <td><p>The raw data for the attribute. The size is
+                    determined from the datatype and dataspace descriptions.</p>
+                <p>
+                    This field is <em>not</em> padded with additional zero bytes.
+                </p></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<h4>
+    <a name="CommentMessage">IV.A.2.n. The Object Comment Message</a>
+</h4>
+
+<!-- start msgdesc table -->
+<center>
+    <table class="msgdesc">
+        <tr>
+            <td colspan="2"><b>Header Message Name:</b> Object Comment</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Header Message Type:</b> 0x000D</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Length:</b> Varies</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Status:</b> Optional; may not be repeated.</td>
+        </tr>
+        <tr>
+            <td><b>Description:</b></td>
+            <td>The object comment is designed to be a short description of
+                an object. An object comment is a sequence of non-zero (<code>\0</code>)
+                ASCII characters with no other formatting included by the library.
+            </td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Format of Data:</b> See the tables below.</td>
+        </tr>
+    </table>
+</center>
+<!-- end msgdesc table -->
+
+<div align="center">
+    <table class="format">
+        <caption>Name Message</caption>
+
+        <tr>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Comment <em>(variable size)</em><br />
+            <br /></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Name</p></td>
+            <td><p>A null terminated ASCII character string.</p></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<h4>
+    <a name="OldModificationTimeMessage">IV.A.2.o. The Object
+        Modification Time (Old) Message</a>
+</h4>
+
+<!-- start msgdesc table -->
+<center>
+    <table class="msgdesc">
+        <tr>
+            <td colspan="2"><b>Header Message Name:</b> Object Modification
+                Time (Old)</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Header Message Type:</b> 0x000E</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Length:</b> Fixed</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Status:</b> Optional; may not be repeated.</td>
+        </tr>
+        <tr>
+            <td><b>Description:</b></td>
+            <td><p>The object modification date and time is a timestamp
+                    which indicates (using ISO-8601 date and time format) the last
+                    modification of an object. The time is updated when any object
+                    header message changes according to the system clock where the
+                    change was posted. All fields of this message should be interpreted
+                    as coordinated universal time (UTC).</p>
+                <p>
+                    This modification time message is deprecated in favor of the
+                    &ldquo;new&rdquo; <a href="#ModificationTimeMessage">Object
+                        Modification Time</a> message and is no longer written to the file in
+                    versions of the HDF5 Library after the 1.6.0 version.
+                </p></td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Format of Data:</b> See the tables below.</td>
+        </tr>
+    </table>
+</center>
+<!-- end msgdesc table -->
+
+<div align="center">
+    <table class="format">
+        <caption>Modification Time Message</caption>
+
+        <tr>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="4">Year</td>
+        </tr>
+
+        <tr>
+            <td colspan="2">Month</td>
+            <td colspan="2">Day of Month</td>
+        </tr>
+
+        <tr>
+            <td colspan="2">Hour</td>
+            <td colspan="2">Minute</td>
+        </tr>
+
+        <tr>
+            <td colspan="2">Second</td>
+            <td colspan="2">Reserved</td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Year</p></td>
+            <td><p>
+                    The four-digit year as an ASCII string. For example,
+                    <code>1998</code>
+                    .
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>Month</p></td>
+            <td><p>
+                    The month number as a two digit ASCII string where January is
+                    <code>01</code>
+                    and December is
+                    <code>12</code>
+                    .
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>Day of Month</p></td>
+            <td><p>
+                    The day number within the month as a two digit ASCII string. The
+                    first day of the month is
+                    <code>01</code>
+                    .
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>Hour</p></td>
+            <td><p>
+                    The hour of the day as a two digit ASCII string where midnight is
+                    <code>00</code>
+                    and 11:00pm is
+                    <code>23</code>
+                    .
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>Minute</p></td>
+            <td><p>
+                    The minute of the hour as a two digit ASCII string where the first
+                    minute of the hour is
+                    <code>00</code>
+                    and the last is
+                    <code>59</code>
+                    .
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>Second</p></td>
+            <td><p>
+                    The second of the minute as a two digit ASCII string where the
+                    first second of the minute is
+                    <code>00</code>
+                    and the last is
+                    <code>59</code>
+                    .
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>Reserved</p></td>
+            <td><p>This field is reserved and should always be zero.</p></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<h4>
+    <a name="SOHMTableMessage">IV.A.2.p. The Shared Message Table
+        Message</a>
+</h4>
+
+<!-- start msgdesc table -->
+<center>
+    <table class="msgdesc">
+        <tr>
+            <td colspan="2"><b>Header Message Name:</b> Shared Message Table</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Header Message Type:</b> 0x000F</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Length:</b> Fixed</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Status:</b> Optional; may not be repeated.</td>
+        </tr>
+        <tr>
+            <td><b>Description:</b></td>
+            <td>This message is used to locate the table of shared object
+                header message (SOHM) indexes. Each index consists of information to
+                find the shared messages from either the heap or object header. This
+                message is <em>only</em> found in the superblock extension.
+            </td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Format of Data:</b> See the tables below.</td>
+        </tr>
+    </table>
+</center>
+<!-- end msgdesc table -->
+
+<div align="center">
+    <table class="format">
+        <caption>Shared Message Table Message</caption>
+
+        <tr>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+        </tr>
+
+        <tr>
+            <td>Version</td>
+            <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Shared Object Header Message Table
+                Address<sup>O</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td>Number of Indices</td>
+            <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+
+    </table>
+
+    <table class="note">
+        <tr>
+            <td width="60%">&nbsp;</td>
+            <td width="40%">(Items marked with an &lsquo;O&rsquo; in the
+                above table are of the size specified in &ldquo;Size of
+                Offsets&rdquo; field in the superblock.)</td>
+        </tr>
+    </table>
+
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Version</p></td>
+            <td><p>The version number for this message. This document
+                    describes version 0.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>Shared Object Header Message Table Address</p></td>
+            <td><p>This field is the address of the master table for
+                    shared object header message indexes.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>Number of Indices</p></td>
+            <td><p>This field is the number of indices in the master
+                    table.</p></td>
+        </tr>
+
+    </table>
+</div>
+
+<br />
+<h4>
+    <a name="ContinuationMessage">IV.A.2.q. The Object Header
+        Continuation Message</a>
+</h4>
+
+<!-- start msgdesc table -->
+<center>
+    <table class="msgdesc">
+        <tr>
+            <td colspan="2"><b>Header Message Name:</b> Object Header
+                Continuation</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Header Message Type:</b> 0x0010</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Length:</b> Fixed</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Status:</b> Optional; may be repeated.</td>
+        </tr>
+        <tr>
+            <td><b>Description:</b></td>
+            <td>The object header continuation is the location in the file
+                of a block containing more header messages for the current data
+                object. This can be used when header blocks become too large or are
+                likely to change over time.</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Format of Data:</b> See the tables below.</td>
+        </tr>
+    </table>
+</center>
+<!-- end msgdesc table -->
+
+<div align="center">
+    <table class="format">
+        <caption>Object Header Continuation Message</caption>
+
+        <tr>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Offset<sup>O</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Length<sup>L</sup><br />
+            <br /></td>
+        </tr>
+    </table>
+
+    <table class="note">
+        <tr>
+            <td width="60%">&nbsp;</td>
+            <td width="40%">(Items marked with an &lsquo;O&rsquo; in the
+                above table are of the size specified in &ldquo;Size of
+                Offsets&rdquo; field in the superblock.)</td>
+        </tr>
+        <tr>
+            <td>&nbsp;</td>
+            <td>(Items marked with an &lsquo;L&rsquo; in the above table are
+                of the size specified in &ldquo;Size of Lengths&rdquo; field in the
+                superblock.)</td>
+        </tr>
+    </table>
+
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Offset</p></td>
+            <td><p>This value is the address in the file where the
+                    header continuation block is located.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>Length</p></td>
+            <td><p>This value is the length in bytes of the header
+                    continuation block in the file.</p></td>
+        </tr>
+    </table>
+</div>
+<br />
+
+<p>The format of the header continuation block that this message
+    points to depends on the version of the object header that the message
+    is contained within.</p>
+
+<p>
+    Continuation blocks for version 1 object headers have no special
+    formatting information; they are merely a list of object header message
+    info sequences (type, size, flags, reserved bytes and data for each
+    message sequence). See the description of <a
+        href="#V1ObjectHeaderPrefix">Version 1 Data Object Header Prefix.</a>
+</p>
+
+<p>
+    Continuation blocks for version 2 object headers <em>do</em> have
+    special formatting information as described here (see also the
+    description of <a href="#V2ObjectHeaderPrefix">Version 2 Data
+        Object Header Prefix.</a>):
+</p>
+<div align="center">
+    <table class="format">
+        <caption>Version 2 Object Header Continuation Block</caption>
+
+        <tr>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+            <th>byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="4">Signature</td>
+        </tr>
+        <tr>
+            <td>Header Message Type #1</td>
+            <td colspan="2">Size of Header Message Data #1</td>
+            <td>Header Message #1 Flags</td>
+        </tr>
+
+        <tr>
+            <td colspan="2">Header Message #1 Creation Order <em>(optional)</em></td>
+            <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Header Message Data #1<br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">.<br />.<br />.<br /></td>
+        </tr>
+
+        <tr>
+            <td>Header Message Type #n</td>
+            <td colspan="2">Size of Header Message Data #n</td>
+            <td>Header Message #n Flags</td>
+        </tr>
+
+        <tr>
+            <td colspan="2">Header Message #n Creation Order <em>(optional)</em></td>
+            <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Header Message Data #n<br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Gap <em>(optional, variable size)</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Checksum</td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Signature</p></td>
+            <td>
+                <p>
+                    The ASCII character string &ldquo;
+                    <code>OCHK</code>
+                    &rdquo; is used to indicate the beginning of an object header
+                    continuation block. This gives file consistency checking utilities
+                    a better chance of reconstructing a damaged file.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Header Message #n Type</p></td>
+            <td>
+                <p>Same format as version 1 of the object header, described
+                    above.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Size of Header Message #n Data</p></td>
+            <td>
+                <p>Same format as version 1 of the object header, described
+                    above.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Header Message #n Flags</p></td>
+            <td>
+                <p>Same format as version 1 of the object header, described
+                    above.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Header Message #n Creation Order</p></td>
+            <td>
+                <p>This field stores the order that a message of a given type
+                    was created in.</p>
+                <p>
+                    This field is present if bit 2 of <em>flags</em> is set.
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Header Message #n Data</p></td>
+            <td>
+                <p>Same format as version 1 of the object header, described
+                    above.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Gap</p></td>
+            <td>
+                <p>A gap in an object header chunk is inferred by the end of the
+                    messages for the chunk before the beginning of the chunk&rsquo;s
+                    checksum. Gaps are always smaller than the size of an object header
+                    message prefix (message type + message size + message flags).</p>
+                <p>Gaps are formed when a message (typically an attribute
+                    message) in an earlier chunk is deleted and a message from a later
+                    chunk that does not quite fit into the free space is moved into the
+                    earlier chunk.</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td><p>Checksum</p></td>
+            <td>
+                <p>This is the checksum for the object header chunk.</p>
+            </td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<h4>
+    <a name="SymbolTableMessage">IV.A.2.r. The Symbol Table Message</a>
+</h4>
+
+<!-- start msgdesc table -->
+<center>
+    <table class="msgdesc">
+        <tr>
+            <td colspan="2"><b>Header Message Name:</b> Symbol Table Message</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Header Message Type:</b> 0x0011</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Length:</b> Fixed</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Status:</b> Required for &ldquo;old
+                style&rdquo; groups; may not be repeated.</td>
+        </tr>
+        <tr>
+            <td><b>Description:</b></td>
+            <td>Each &ldquo;old style&rdquo; group has a v1 B-tree and a
+                local heap for storing symbol table entries, which are located with
+                this message.</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Format of data:</b> See the tables below.</td>
+        </tr>
+    </table>
+</center>
+<!-- end msgdesc table -->
+
+<div align="center">
+    <table class="format">
+        <caption>
+            <b>Symbol Table Message</b>
+        </caption>
+
+        <tr>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />v1 B-tree Address<sup>O</sup><br />
+            <br /></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />Local Heap Address<sup>O</sup><br />
+            <br /></td>
+        </tr>
+    </table>
+
+    <table class="note">
+        <tr>
+            <td width="60%">&nbsp;</td>
+            <td width="40%">(Items marked with an &lsquo;O&rsquo; in the
+                above table are of the size specified in &ldquo;Size of
+                Offsets&rdquo; field in the superblock.)</td>
+        </tr>
+    </table>
+
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>v1 B-tree Address</p></td>
+            <td><p>This value is the address of the v1 B-tree containing
+                    the symbol table entries for the group.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>Local Heap Address</p></td>
+            <td><p>This value is the address of the local heap
+                    containing the link names for the symbol table entries for the
+                    group.</p></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<h4>
+    <a name="ModificationTimeMessage">IV.A.2.s. The Object Modification
+        Time Message</a>
+</h4>
+
+<!-- start msgdesc table -->
+<center>
+    <table class="msgdesc">
+        <tr>
+            <td colspan="2"><b>Header Message Name:</b> Object Modification
+                Time</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Header Message Type:</b> 0x0012</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Length:</b> Fixed</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Status:</b> Optional; may not be repeated.</td>
+        </tr>
+        <tr>
+            <td><b>Description:</b></td>
+            <td>The object modification time is a timestamp which indicates
+                the time of the last modification of an object. The time is updated
+                when any object header message changes according to the system clock
+                where the change was posted.</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Format of Data:</b> See the tables below.</td>
+        </tr>
+    </table>
+</center>
+<!-- end msgdesc table -->
+
+<div align="center">
+    <table class="format">
+        <caption>Modification Time Message</caption>
+
+        <tr>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+        </tr>
+
+        <tr>
+            <td>Version</td>
+            <td colspan="3">Reserved (zero)</td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Seconds After UNIX Epoch</td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Version</p></td>
+            <td><p>The version number is used for changes in the format
+                    of Object Modification Time and is described here:</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Version</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>0</code></td>
+                        <td>Never used.</td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>1</code></td>
+                        <td>Used by Version 1.6.1 and after of the library to encode
+                            time. In this version, the time is the seconds after Epoch.</td>
+                    </tr>
+                </table>
+                <p></p></td>
+        </tr>
+
+        <tr>
+            <td><p>Seconds After UNIX Epoch</p></td>
+            <td><p>A 32-bit unsigned integer value that stores the
+                    number of seconds since 0 hours, 0 minutes, 0 seconds, January 1,
+                    1970, Coordinated Universal Time.</p></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<h4>
+    <a name="BtreeKValuesMessage">IV.A.2.t. The B-tree &lsquo;K&rsquo;
+        Values Message</a>
+</h4>
+
+<!-- start msgdesc table -->
+<center>
+    <table class="msgdesc">
+        <tr>
+            <td colspan="2"><b>Header Message Name:</b> B-tree
+                &lsquo;K&rsquo; Values</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Header Message Type:</b> 0x0013</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Length:</b> Fixed</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Status:</b> Optional; may not be repeated.</td>
+        </tr>
+        <tr>
+            <td><b>Description:</b></td>
+            <td>This message retrieves non-default &lsquo;K&rsquo; values
+                for internal and leaf nodes of a group or indexed storage v1
+                B-trees. This message is <em>only</em> found in the superblock
+                extension.
+            </td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Format of Data:</b> See the tables below.</td>
+        </tr>
+    </table>
+</center>
+<!-- end msgdesc table -->
+
+<div align="center">
+    <table class="format">
+        <caption>B-tree &lsquo;K&rsquo; Values Message</caption>
+
+        <tr>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+        </tr>
+
+        <tr>
+            <td>Version</td>
+            <td colspan="2">Indexed Storage Internal Node K</td>
+            <td bgcolor="#DDDDDD"><em>This space inserted only to align
+                    table nicely</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="2">Group Internal Node K</td>
+            <td colspan="2">Group Leaf Node K</td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Version</p></td>
+            <td><p>The version number for this message. This document
+                    describes version 0.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>Indexed Storage Internal Node K</p></td>
+            <td><p>This is the node &lsquo;K&rsquo; value for each
+                    internal node of an indexed storage v1 B-tree. See the description
+                    of this field in version 0 and 1 of the superblock as well the
+                    section on v1 B-trees.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>Group Internal Node K</p></td>
+            <td><p>This is the node &lsquo;K&rsquo; value for each
+                    internal node of a group v1 B-tree. See the description of this
+                    field in version 0 and 1 of the superblock as well as the section
+                    on v1 B-trees.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>Group Leaf Node K</p></td>
+            <td><p>This is the node &lsquo;K&rsquo; value for each leaf
+                    node of a group v1 B-tree. See the description of this field in
+                    version 0 and 1 of the superblock as well as the section on v1
+                    B-trees.</p></td>
+        </tr>
+
+    </table>
+</div>
+
+<br />
+<h4>
+    <a name="DrvInfoMessage">IV.A.2.u. The Driver Info Message</a>
+</h4>
+
+<!-- start msgdesc table -->
+<center>
+    <table class="msgdesc">
+        <tr>
+            <td colspan="2"><b>Header Message Name:</b> Driver Info</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Header Message Type:</b> 0x0014</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Length:</b> Varies</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Status:</b> Optional; may not be repeated.</td>
+        </tr>
+
+        <tr>
+            <td><b>Description:</b></td>
+            <td>This message contains information needed by the file driver
+                to reopen a file. This message is <em>only</em> found in the
+                superblock extension: see the <a href="#SuperblockExt">
+                    &ldquo;Disk Format: Level 0C - Superblock Extension&rdquo;</a> section
+                for more information. For more information on the fields in the
+                driver info message, see the <a href="#DriverInfo"> &ldquo;Disk
+                    Format : Level 0B - File Driver Info&rdquo;</a> section; those who use
+                the multi and family file drivers will find this section
+                particularly helpful.
+            </td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Format of Data:</b> See the tables below.</td>
+        </tr>
+    </table>
+</center>
+<!-- end msgdesc table -->
+
+<div align="center">
+    <table class="format">
+        <caption>Driver Info Message</caption>
+
+        <tr>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+        </tr>
+
+        <tr>
+            <td>Version</td>
+            <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+        <tr>
+            <td colspan="4"><br />Driver Identification</td>
+        </tr>
+
+        <tr>
+            <td colspan="2">Driver Information Size</td>
+            <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4"><br />
+            <br />Driver Information <em>(variable size)</em><br />
+            <br />
+            <br /></td>
+        </tr>
+
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Version</p></td>
+            <td><p>The version number for this message. This document
+                    describes version 0.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>Driver Identification</p></td>
+            <td><p>This is an eight-byte ASCII string without null
+                    termination which identifies the driver.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>Driver Information Size</p></td>
+            <td><p>
+                    The size in bytes of the <em>Driver Information</em> field of this
+                    message.
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>Driver Information</p></td>
+            <td><p>Driver information is stored in a format defined by
+                    the file driver.</p></td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<h4>
+    <a name="AinfoMessage">IV.A.2.v. The Attribute Info Message</a>
+</h4>
+
+<!-- start msgdesc table -->
+<center>
+    <table class="msgdesc">
+        <tr>
+            <td colspan="2"><b>Header Message Name:</b> Attribute Info</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Header Message Type:</b> 0x0015</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Length:</b> Varies</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Status:</b> Optional; may not be repeated.</td>
+        </tr>
+        <tr>
+            <td><b>Description:</b></td>
+            <td>This message stores information about the attributes on an
+                object, such as the maximum creation index for the attributes
+                created and the location of the attribute storage when the
+                attributes are stored &ldquo;densely&rdquo;.</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Format of Data:</b> See the tables below.</td>
+        </tr>
+    </table>
+</center>
+<!-- end msgdesc table -->
+
+<div align="center">
+    <table class="format">
+        <caption>Attribute Info Message</caption>
+
+        <tr>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+        </tr>
+
+        <tr>
+            <td>Version</td>
+            <td>Flags</td>
+            <td colspan="2">Maximum Creation Index <em>(optional)</em></td>
+        </tr>
+        <tr>
+            <td colspan="4"><br />Fractal Heap Address<sup>O</sup><br />
+            <br /></td>
+        </tr>
+        <tr>
+            <td colspan="4"><br />Attribute Name v2 B-tree Address<sup>O</sup><br />
+            <br /></td>
+        </tr>
+        <tr>
+            <td colspan="4"><br />Attribute Creation Order v2 B-tree
+                Address<sup>O</sup> <em>(optional)</em><br />
+            <br /></td>
+        </tr>
+
+    </table>
+
+    <table class="note">
+        <tr>
+            <td width="60%">&nbsp;</td>
+            <td width="40%">(Items marked with an &lsquo;O&rsquo; in the
+                above table are of the size specified in &ldquo;Size of
+                Offsets&rdquo; field in the superblock.)</td>
+        </tr>
+    </table>
+
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Version</p></td>
+            <td><p>The version number for this message. This document
+                    describes version 0.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>Flags</p></td>
+            <td><p>This is the attribute index information flag with the
+                    following definition:</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Bit</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>0</code></td>
+                        <td>If set, creation order for attributes is tracked.</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>1</code></td>
+                        <td>If set, creation order for attributes is indexed.</td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>2-7</code></td>
+                        <td>Reserved</td>
+                    </tr>
+                </table>
+                <p></p></td>
+        </tr>
+
+        <tr>
+            <td><p>Maximum Creation Index</p></td>
+            <td><p>The is the maximum creation order index value for the
+                    attributes on the object.</p>
+                <p>
+                    This field is present if bit 0 of <em>Flags</em> is set.
+                </p></td>
+        </tr>
+
+        <tr>
+            <td><p>Fractal Heap Address</p></td>
+            <td><p>This is the address of the fractal heap to store
+                    dense attributes.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>Attribute Name v2 B-tree Address</p></td>
+            <td><p>This is the address of the version 2 B-tree to index
+                    the names of densely stored attributes.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>Attribute Creation Order v2 B-tree Address</p></td>
+            <td><p>This is the address of the version 2 B-tree to index
+                    the creation order of densely stored attributes.</p>
+                <p>
+                    This field is present if bit 1 of <em>Flags</em> is set.
+                </p></td>
+        </tr>
+
+    </table>
+</div>
+
+<br />
+<h4>
+    <a name="RefCountMessage">IV.A.2.w. The Object Reference Count
+        Message</a>
+</h4>
+
+<!-- start msgdesc table -->
+<center>
+    <table class="msgdesc">
+        <tr>
+            <td colspan="2"><b>Header Message Name:</b> Object Reference
+                Count</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Header Message Type:</b> 0x0016</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Length:</b> Fixed</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Status:</b> Optional; may not be repeated.</td>
+        </tr>
+        <tr>
+            <td><b>Description:</b></td>
+            <td>This message stores the number of hard links (in groups or
+                objects) pointing to an object: in other words, its <em>reference
+                    count</em>.
+            </td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Format of Data:</b> See the tables below.</td>
+        </tr>
+    </table>
+</center>
+<!-- end msgdesc table -->
+
+<div align="center">
+    <table class="format">
+        <caption>Object Reference Count</caption>
+
+        <tr>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+        </tr>
+
+        <tr>
+            <td>Version</td>
+            <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted
+                    only to align table nicely</em></td>
+        </tr>
+
+        <tr>
+            <td colspan="4">Reference count</td>
+        </tr>
+    </table>
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Version</p></td>
+            <td><p>The version number for this message. This document
+                    describes version 0.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>Reference Count</p></td>
+            <td><p>The unsigned 32-bit integer is the reference count
+                    for the object. This message is only present in &ldquo;version
+                    2&rdquo; (or later) object headers, and if not present those object
+                    header versions, the reference count for the object is assumed to
+                    be 1.</p></td>
+        </tr>
+
+    </table>
+</div>
+
+<br />
+<h4>
+    <a name="FsinfoMessage">IV.A.2.x. The File Space Info Message</a>
+</h4>
+
+<!-- start msgdesc table -->
+<center>
+    <table class="msgdesc">
+        <tr>
+            <td colspan="2"><b>Header Message Name:</b> File Space Info</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Header Message Type:</b> 0x0018</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Length:</b> Fixed</td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Status:</b> Optional; may not be repeated.</td>
+        </tr>
+        <tr>
+            <td><b>Description:</b></td>
+            <td>This message stores the file space management strategy (see
+                description below) that the library uses in handling file space
+                request for the file. It also contains the free-space section
+                threshold used by the library&rsquo;s free-space managers for the
+                file. If the strategy is 1, this message also contains the addresses
+                of the file&rsquo;s free-space managers which track free space for
+                each type of file space allocation. There are six basic types of
+                file space allocation: superblock, B-tree, raw data, global heap,
+                local heap, and object header. See the description of <a
+                href="#FreeSpaceManager">Free-space Manager</a> as well the
+                description of allocation types in <a href="#AppendixB">Appendix
+                    B</a>.
+            </td>
+        </tr>
+        <tr>
+            <td colspan="2"><b>Format of Data:</b> See the tables below.</td>
+        </tr>
+    </table>
+</center>
+<!-- end msgdesc table -->
+
+<div align="center">
+    <table class="format">
+        <caption>File Space Info</caption>
+
+        <tr>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+            <th width="25%">byte</th>
+        </tr>
+
+        <tr>
+            <td>Version</td>
+            <td>Strategy</td>
+            <td colspan="2">Threshold<sup>L</sup></td>
+        </tr>
+        <tr>
+            <td colspan="4">Super-block Free-space Manager Address<sup>O</sup></td>
+        </tr>
+        <tr>
+            <td colspan="4">B-tree Free-space Manager Address<sup>O</sup></td>
+        </tr>
+        <tr>
+            <td colspan="4">Raw Data Free-space Manager Address<sup>O</sup></td>
+        </tr>
+        <tr>
+            <td colspan="4">Global Heap Free-space Manager Address<sup>O</sup></td>
+        </tr>
+        <tr>
+            <td colspan="4">Local Heap Free-space Manager Address<sup>O</sup></td>
+        </tr>
+        <tr>
+            <td colspan="4">Object Header Free-space Manager Address<sup>O</sup></td>
+        </tr>
+    </table>
+
+    <table class="note">
+        <tr>
+            <td width="60%">&nbsp;</td>
+            <td width="40%">(Items marked with an &lsquo;O&rsquo; in the
+                above table are of the size specified in &ldquo;Size of
+                Offsets&rdquo; field in the superblock.)</td>
+        </tr>
+        <tr>
+            <td>&nbsp;</td>
+            <td>(Items marked with an &lsquo;L&rsquo; in the above table are
+                of the size specified in &ldquo;Size of Lengths&rdquo; field in the
+                superblock.)</td>
+        </tr>
+    </table>
+
+</div>
+
+<br />
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td><p>Version</p></td>
+            <td><p>This is the version number of this message. This
+                    document describes version 0.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>Strategy</p></td>
+            <td><p>This is the file space management strategy for the
+                    file. There are four types of strategies:</p>
+                <table class="list">
+                    <tr>
+                        <th width="20%" align="center">Value</th>
+                        <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>1</code></td>
+                        <td>With this strategy, the HDF5 Library&rsquo;s free-space
+                            managers track the free space that results from the manipulation
+                            of HDF5 objects in the HDF5 file. The free space information is
+                            saved when the file is closed, and reloaded when the file is
+                            reopened. <br /> When space is needed for file metadata or raw
+                            data, the HDF5 Library first requests space from the
+                            library&rsquo;s free-space managers. If the request is not
+                            satisfied, the library requests space from the aggregators. If
+                            the request is still not satisfied, the library requests space
+                            from the virtual file driver. That is, the library will use all
+                            of the mechanisms for allocating space.
+                        </td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>2</code></td>
+                        <td>This is the HDF5 Library&rsquo;s default file space
+                            management strategy. With this strategy, the library&rsquo;s
+                            free-space managers track the free space that results from the
+                            manipulation of HDF5 objects in the HDF5 file. The free space
+                            information is NOT saved when the file is closed and the free
+                            space that exists upon file closing becomes unaccounted space in
+                            the file. <br /> As with strategy #1, the library will try all
+                            of the mechanisms for allocating space. When space is needed for
+                            file metadata or raw data, the library first requests space from
+                            the free-space managers. If the request is not satisfied, the
+                            library requests space from the aggregators. If the request is
+                            still not satisfied, the library requests space from the virtual
+                            file driver.
+                        </td>
+                    </tr>
+
+                    <tr>
+                        <td align="center"><code>3</code></td>
+                        <td>With this strategy, the HDF5 Library does not track free
+                            space that results from the manipulation of HDF5 objects in the
+                            HDF5 file and the free space becomes unaccounted space in the
+                            file. <br /> When space is needed for file metadata or raw data,
+                            the library first requests space from the aggregators. If the
+                            request is not satisfied, the library requests space from the
+                            virtual file driver.
+                        </td>
+                    </tr>
+                    <tr>
+                        <td align="center"><code>4</code></td>
+                        <td>With this strategy, the HDF5 Library does not track free
+                            space that results from the manipulation of HDF5 objects in the
+                            HDF5 file and the free space becomes unaccounted space in the
+                            file. <br /> When space is needed for file metadata or raw data,
+                            the library requests space from the virtual file driver.
+                        </td>
+                    </tr>
+                </table>
+                <p></p></td>
+        </tr>
+
+        <tr>
+            <td><p>Threshold</p></td>
+            <td><p>
+                    This is the free-space section threshold. The library&rsquo;s
+                    free-space managers will track only free-space sections with size
+                    greater than or equal to <em>threshold</em>. The default is to
+                    track free-space sections of all sizes.
+                </p></td>
+        </tr>
+        <tr>
+            <td><p>Superblock Free-space Manager Address</p></td>
+            <td><p>This is the address of the free-space manager for
+                    H5FD_MEM_SUPER allocation type.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>B-tree Free-space Manager Address</p></td>
+            <td><p>This is the address of the free-space manager for
+                    H5FD_MEM_BTREE allocation type.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>Raw Data Free-space Manager Address</p></td>
+            <td><p>This is the address of the free-space manager for
+                    H5FD_MEM_DRAW allocation type.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>Global Heap Free-space Manager Address</p></td>
+            <td><p>This is the address of the free-space manager for
+                    H5FD_MEM_GHEAP allocation type.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>Local Heap Free-space Manager Address</p></td>
+            <td><p>This is the address of the free-space manager for
+                    H5FD_MEM_LHEAP allocation type.</p></td>
+        </tr>
+
+        <tr>
+            <td><p>Object Header Free-space Manager Address</p></td>
+            <td><p>This is the address of the free-space manager for
+                    H5FD_MEM_OHDR allocation type.</p></td>
+        </tr>
+    </table>
+</div>
+<br />
+
+
+<br />
+<h3>
+    <a name="DataStorage"> IV.B. Disk Format: Level 2B - Data Object
+        Data Storage</a>
+</h3>
+
+<p>The data for an object is stored separately from its header
+    information in the file and may not actually be located in the HDF5
+    file itself if the header indicates that the data is stored externally.
+    The information for each record in the object is stored according to
+    the dimensionality of the object (indicated in the dataspace header
+    message). Multi-dimensional array data is stored in C order; in other
+    words, the &ldquo;last&rdquo; dimension changes fastest.</p>
+
+<p>Data whose elements are composed of atomic datatypes are stored
+    in IEEE format, unless they are specifically defined as being stored in
+    a different machine format with the architecture-type information from
+    the datatype header message. This means that each architecture will
+    need to [potentially] byte-swap data values into the internal
+    representation for that particular machine.</p>
+
+<p>Data with a variable-length datatype is stored in the global heap
+    of the HDF5 file. Global heap identifiers are stored in the data object
+    storage.</p>
+
+<p>Data whose elements are composed of reference datatypes are
+    stored in several different ways depending on the particular reference
+    type involved. Object pointers are just stored as the offset of the
+    object header being pointed to with the size of the pointer being the
+    same number of bytes as offsets in the file.</p>
+
+<p>Dataset region references are stored as a heap-ID which points to
+    the following information within the file-heap: an offset of the object
+    pointed to, number-type information (same format as header message),
+    dimensionality information (same format as header message), sub-set
+    start and end information (in other words, a coordinate location for
+    each), and field start and end names (in other words, a [pointer to
+    the] string indicating the first field included and a [pointer to the]
+    string name for the last field).</p>
+
+<p>Data of a compound datatype is stored as a contiguous stream of
+    the items in the structure, with each item formatted according to its
+    datatype.</p>
+
+
+
+<br />
+<br />
+<hr />
+<h2>
+    <a name="AppendixA"> V. Appendix A: Definitions</a>
+</h2>
+
+<p>Definitions of various terms used in this document are included
+    in this section.</p>
+
+<div align="center">
+    <table class="glossary">
+        <tr>
+            <th width="20%">Term</th>
+            <th>Definition</th>
+        </tr>
+
+        <tr>
+            <td>Undefined Address</td>
+            <td>The <a name="UndefinedAddress">undefined address</a> for a
+                file is a file address with all bits set: in other words, <code>0xffff...ff</code>.
+            </td>
+        </tr>
+
+        <tr>
+            <td>Unlimited Size</td>
+            <td>The <a name="UnlimitedDim">unlimited size</a> for a size is
+                a value with all bits set: in other words, <code>0xffff...ff</code>.
+            </td>
+        </tr>
+
+    </table>
+</div>
+
+
+
+<br />
+<br />
+<hr />
+<h2>
+    <a name="AppendixB"> VI. Appendix B: File Memory Allocation Types</a>
+</h2>
+
+<p>There are six basic types of file memory allocation as follows:</p>
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Basic Allocation Type</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td>H5FD_MEM_SUPER</td>
+            <td>File memory allocated for <em>Superblock.</em></td>
+        </tr>
+
+        <tr>
+            <td>H5FD_MEM_BTREE</td>
+            <td>File memory allocated for <em>B-tree.</em></td>
+        </tr>
+
+        <tr>
+            <td>H5FD_MEM_DRAW</td>
+            <td>File memory allocated for raw data.</td>
+        </tr>
+
+        <tr>
+            <td>H5FD_MEM_GHEAP</td>
+            <td>File memory allocated for <em>Global Heap.</em></td>
+        </tr>
+
+        <tr>
+            <td>H5FD_MEM_LHEAP</td>
+            <td>File memory allocated for <em>Local Heap.</em></td>
+        </tr>
+
+        <tr>
+            <td>H5FD_MEM_OHDR</td>
+            <td>File memory allocated for <em>Object Header.</em></td>
+        </tr>
+    </table>
+</div>
+
+<p>There are other file memory allocation types that are mapped to
+    the above six basic allocation types because they are similar in
+    nature. The mapping is listed in the following table:</p>
+
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Basic Allocation Type</th>
+            <th>Mapping of Allocation Types to Basic Allocation Types</th>
+        </tr>
+
+        <tr>
+            <td>H5FD_MEM_SUPER</td>
+            <td><em>none</em></td>
+        </tr>
+
+        <tr>
+            <td>H5FD_MEM_BTREE</td>
+            <td>H5FD_MEM_SOHM_INDEX</td>
+        </tr>
+
+        <tr>
+            <td>H5FD_MEM_DRAW</td>
+            <td>H5FD_MEM_FHEAP_HUGE_OBJ</td>
+        </tr>
+
+        <tr>
+            <td>H5FD_MEM_GHEAP</td>
+            <td><em>none</em></td>
+        </tr>
+
+        <tr>
+            <td>H5FD_MEM_LHEAP</td>
+            <td>H5FD_MEM_FHEAP_DBLOCK, H5FD_MEM_FSPACE_SINFO</td>
+        </tr>
+
+        <tr>
+            <td>H5FD_MEM_OHDR</td>
+            <td>H5FD_MEM_FHEAP_HDR, H5FD_MEM_FHEAP_IBLOCK,
+                H5FD_MEM_FSPACE_HDR, H5FD_MEM_SOHM_TABLE</td>
+        </tr>
+    </table>
+</div>
+
+<p>Allocation types that are mapped to basic allocation types are
+    described below:</p>
+
+<div align="center">
+    <table class="desc">
+        <tr>
+            <th width="30%">Allocation Type</th>
+            <th>Description</th>
+        </tr>
+
+        <tr>
+            <td>H5FD_MEM_FHEAP_HDR</td>
+            <td>File memory allocated for <em>Fractal Heap Header.</em></td>
+        </tr>
+
+        <tr>
+            <td>H5FD_MEM_FHEAP_DBLOCK</td>
+            <td>File memory allocated for <em>Fractal Heap Direct
+                    Blocks.</em></td>
+        </tr>
+
+        <tr>
+            <td>H5FD_MEM_FHEAP_IBLOCK</td>
+            <td>File memory allocated for <em>Fractal Heap Indirect
+                    Blocks.</em></td>
+        </tr>
+
+        <tr>
+            <td>H5FD_MEM_FHEAP_HUGE_OBJ</td>
+            <td>File memory allocated for huge objects in the fractal heap.</td>
+        </tr>
+
+        <tr>
+            <td>H5FD_MEM_FSPACE_HDR</td>
+            <td>File memory allocated for <em>Free-space Manager
+                    Header.</em></td>
+        </tr>
+
+        <tr>
+            <td>H5FD_MEM_FSPACE_SINFO</td>
+            <td>File memory allocated for <em>Free-space Section List</em>
+                of the free-space manager.
+            </td>
+        </tr>
+        <tr>
+            <td>H5FD_MEM_SOHM_TABLE</td>
+            <td>File memory allocated for <em>Shared Object Header
+                    Message Table.</em></td>
+        </tr>
+        <tr>
+            <td>H5FD_MEM_SOHM_INDEX</td>
+            <td>File memory allocated for <em>Shared Message Record
+                    List.</em></td>
+        </tr>
+    </table>
+</div>
+</head>
+<body></body>
+</html>
diff --git a/doxygen/examples/H5.format.html b/doxygen/examples/H5.format.html
new file mode 100644
index 0000000..c52e8ea
--- /dev/null
+++ b/doxygen/examples/H5.format.html
@@ -0,0 +1,20397 @@
+<html>
+  <head>
+    <title>
+      HDF5 File Format Specification Version 3.0
+    </title>
+
+    <style>
+      h1 {    display: block;
+              margin-top: 24px;
+              margin-bottom: 24px;
+              margin-left: 0px;
+              margin-right: 0px;
+              text-indent: 0px;
+              font-size: 300%;
+         }
+
+      h2 {    display: block;
+              margin-top: 60px;
+              margin-bottom: 8px;
+              margin-left: 0px;
+              margin-right: 0px;
+              text-indent: 0px;
+              border-style: solid;
+              border-top-style: medium;
+              border-top-color: #A9A9A9;
+              border-bottom: none;
+              border-left: none;
+              border-right: none;
+              font-size: 250%;
+         }
+
+      h3 {    display: block;
+              margin-top: 40px;
+              margin-bottom: 8px;
+              margin-left: 0px;
+              margin-right: 0px;
+              text-indent: 0px;
+              font-size: 200%;
+         }
+
+      h4 {    display: block;
+              margin-top: 32px;
+              margin-bottom: 8px;
+              margin-left: 0px;
+              margin-right: 0px;
+              text-indent: 0px;
+              font-size: 150%;
+         }
+
+      p { display: block;
+          margin-top: 8px;
+          margin-bottom: 8px;
+          margin-left: 0px;
+          margin-right: 0px;
+          text-indent: 0px;
+          font-size: 100%;
+        }
+      <!--
+      p.item {    margin-left: 2em;
+                  text-indent: -2em
+             } -->
+               <!-- p.item2 { margin-left: 2em; text-indent: 2em} -->
+
+                                                                  table.format {  border:solid;
+                                                                                  border-collapse:collapse;
+                                                                                  caption-side:top;
+                                                                                  text-align:center;
+                                                                                  width:80%;
+                                                                               }
+      table.format th {   border:ridge;
+                          padding:4px;
+                          width:25%;
+                      }
+      table.format td {   border:ridge;
+                          padding:4px;
+                      }
+      table.format caption {  font-weight:bold;
+                              font-size:larger;
+                           }
+
+      table.note {border:none;
+                  text-align:right;
+                  width:80%;
+                 }
+
+      table.desc {    border:solid;
+                      border-collapse:collapse;
+                      caption-size:top;
+                      text-align:left;
+                      width:80%;
+                 }
+      table.desc tr { vertical-align:top;
+                    }
+      table.desc th { border-style:ridge;
+                      font-size:larger;
+                      padding:4px;
+                      <!-- text-decoration:underline; -->
+                    }
+      table.desc td { border-style:ridge;
+                      <!-- padding: 4px; -->
+                                         vertical-align:text-top;
+                    }
+      table.desc caption {    font-weight:bold;
+                              font-size:larger;
+                         }
+
+      table.list {    border:none;
+                      width:100%
+                 }
+      table.list tr { vertical-align:text-top;
+                    }
+      table.list th { border:none;
+                      text-decoration:underline;
+                      vertical-align:text-top;
+                    }
+      table.list td { border:none;
+                      vertical-align:text-top;
+                    }
+
+      table.msgdesc    {  border:none;
+                          text-align:left;
+                          width: 80%
+                       }
+      table.msgdesc tr {  vertical-align:text-top;
+                          border-spacing:0;
+                          padding:0; }
+      table.msgdesc th {  border:none;
+                          text-decoration:underline;
+                          vertical-align:text-top; }
+      table.msgdesc td {  border:none;
+                          vertical-align:text-top;
+                       }
+
+      table.list80 {  border:none;
+                      width:80%
+                   }
+      table.list80 tr {   vertical-align:text-top;
+                      }
+      table.list80 th {   border:none;
+                          text-decoration:underline;
+                          vertical-align:text-top;
+                      }
+      table.list80 td {   border:none;
+                          vertical-align:text-top;
+                      }
+
+      table.glossary    { border:none;
+                          text-align:left;
+                          width: 80%
+                        }
+      table.glossary tr { vertical-align:text-top;
+                          border-spacing:0;
+                          padding:0; }
+      table.glossary th { border:none;
+                          text-align:left;
+                          text-decoration:underline;
+                          vertical-align:text-top; }
+      table.glossary td { border:none;
+                          text-align:left;
+                          vertical-align:text-top;
+                        }
+
+      div {   page-break-inside:avoid;
+              page-break-after:auto
+          }
+
+    </style>
+
+    <!-- #BeginLibraryItem "/ed_libs/styles_Format.lbi" -->
+    <!--
+        * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+        * Copyright by The HDF Group.                                               *
+        * All rights reserved.                                                      *
+        *                                                                           *
+        * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+        * terms governing use, modification, and redistribution, is contained in    *
+        * the COPYING file, which can be found at the root of the source code       *
+        * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+        * If you do not have access to either file, you may request a copy from     *
+        * help@hdfgroup.org.                                                        *
+        * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+      -->
+    <!-- #EndLibraryItem --><!-- #BeginLibraryItem "/ed_libs/NavBar_ADevG.lbi" -->
+  </head>
+  <body>
+    <!-- #EndLibraryItem -->
+
+    <center>
+      <table border="0" width="90%">
+        <tr>
+          <td valign="top">
+            <ol type="I">
+              <li><a href="#Intro">Introduction</a></li>
+              <font size="-1">
+                <ol type="A">
+                  <li><a href="#ThisDocument">This Document</a></li>
+                  <li><a href="#ChangesForHdf5_1_12">Changes for HDF5 1.12</a></li>
+                  <li><a href="#ChangesForHdf5_1_10">Changes for HDF5 1.10</a></li>
+                </ol>
+              </font>
+
+              <li><a href="#FileMetaData">Disk Format: Level 0 - File Metadata</a></li>
+              <font size="-1">
+	            <ol type="A">
+	              <li><a href="#Superblock">Disk Format: Level 0A - Format Signature
+                      and Superblock</a></li>
+	              <li><a href="#DriverInfo">Disk Format: Level 0B - File Driver
+                      Info</a></li>
+	              <li><a href="#SuperblockExt">Disk Format: Level 0C - Superblock
+                      Extension</a></li>
+	            </ol>
+              </font>
+              <li><a href="#FileInfra">Disk Format: Level 1 - File Infrastructure</a></li>
+              <font size="-1">
+	            <ol type="A">
+	              <li><a href="#Btrees">Disk Format: Level 1A - B-trees and B-tree
+                      Nodes</a>
+	                <ol type="1">
+                      <li><a href="#V1Btrees">Disk Format: Level 1A1 - Version 1
+                          B-trees</a></li>
+                      <li><a href="#V2Btrees">Disk Format: Level 1A2 - Version 2
+                          B-trees</a></li>
+                    </ol>
+                  </li>
+	              <li><a href="#SymbolTable">Disk Format: Level 1B - Group Symbol
+                      Table Nodes</a></li>
+	              <li><a href="#SymbolTableEntry">Disk Format: Level 1C - Symbol
+                      Table Entry</a></li>
+	              <li><a href="#LocalHeap">Disk Format: Level 1D - Local Heaps</a></li>
+	              <li><a href="#GlobalHeap">Disk Format: Level 1E - Global Heap</a></li>
+                  <li><a href="#GlobalHeapVDS">Disk Format: Level 1F - Global Heap
+                      Block for Virtual Datasets</a></li>
+	              <li><a href="#FractalHeap">Disk Format: Level 1G - Fractal Heap</a></li>
+	              <li><a href="#FreeSpaceManager">Disk Format: Level 1H - Free-space
+                      Manager</a></li>
+	              <li><a href="#SOHMTable">Disk Format: Level 1I - Shared Object
+                      Header Message Table</a></li>
+	            </ol>
+              </font>
+              <li><a href="#DataObject">Disk Format: Level 2 - Data Objects</a></li>
+              <font size="-1">
+	            <ol type="A">
+	              <li><a href="#ObjectHeader">Disk Format: Level 2A - Data Object Headers</a></li>
+                  <ol type="1">
+                    <li><a href="#ObjectHeaderPrefix">Disk Format: Level 2A1 -
+                        Data Object Header Prefix</a>
+                      <ol type="a">
+                        <li><a href="#V1ObjectHeaderPrefix">Version 1 Data
+                            Object Header Prefix</a></li>
+                        <li><a href="#V2ObjectHeaderPrefix">Version 2 Data
+                            Object Header Prefix</a></li>
+                      </ol>
+                    </li>
+                    <li><a href="#ObjectHeaderMessages">Disk Format: Level 2A2 -
+                        Data Object Header Messages</a></li>
+                    <ol type="a">
+                      <li><a href="#NILMessage">The NIL Message</a></li>                                                       <!-- 0x0000 -->
+                      <li><a href="#DataspaceMessage">The Dataspace Message</a></li>                                           <!-- 0x0001 -->
+                      <li><a href="#LinkInfoMessage">The Link Info Message</a></li>                                     	  <!-- 0x0002 -->
+                      <li><a href="#DatatypeMessage">The Datatype Message</a></li>                                             <!-- 0x0003 -->
+                      <li><a href="#OldFillValueMessage">The Data Storage -
+                          Fill Value (Old) Message</a></li>        <!-- 0x0004 -->
+                    </ol>
+                  </ol>
+                </ol>
+              </font>
+            </ol>
+          </td>
+
+          <td>&nbsp;</td>
+
+          <td valign="top">
+            <ol type="I" start="4">
+              <li><a href="#DataObject">Disk Format: Level 2 - Data
+                  Objects</a><font size="-1"><i> (Continued)</i></li>
+	          <ol type="A">
+	            <li><a href="#ObjectHeader">Disk Format: Level 2A - Data Object
+                    Headers</a><i> (Continued)</i>
+	              <ol type="1" start="2">
+                    <li><a href="#ObjectHeaderMessages">Disk Format: Level 2A2 -
+                        Data Object Header Messages</a><i> (Continued)</i></li>
+                    <ol type="a" start="6">
+                      <li><a href="#FillValueMessage">The Data Storage -
+                          Fill Value Message</a></li>              <!-- 0x0005 -->
+                      <li><a href="#LinkMessage">The Link Message</a></li>                                             <!-- 0x0006 -->
+                      <li><a href="#ExternalFileListMessage">The Data Storage -
+                          External Data Files Message</a></li>     <!-- 0x0007 -->
+                      <li><a href="#LayoutMessage">The Data Layout Message</a></li>                                  <!-- 0x0008 -->
+                      <li><a href="#BogusMessage">The Bogus Message</a></li>                                                   <!-- 0x0009 -->
+                      <li><a href="#GroupInfoMessage">The Group Info
+                          Message</a></li>                         <!-- 0x000a -->
+                      <li><a href="#FilterMessage">The Data Storage -
+                          Filter Pipeline Message</a></li>         <!-- 0x000b -->
+                      <li><a href="#AttributeMessage">The Attribute
+                          Message</a></li>                         <!-- 0x000c -->
+                      <li><a href="#CommentMessage">The Object Comment
+                          Message</a></li>                         <!-- 0x000d -->
+                      <li><a href="#OldModificationTimeMessage">The Object
+                          Modification Time (Old) Message</a></li> <!-- 0x000e -->
+                      <li><a href="#SOHMTableMessage">The Shared Message
+                          Table Message</a></li>                   <!-- 0x000f -->
+                      <li><a href="#ContinuationMessage">The Object Header
+                          Continuation Message</a></li>            <!-- 0x0010 -->
+                      <li><a href="#SymbolTableMessage">The Symbol
+                          Table Message</a></li>                   <!-- 0x0011 -->
+                      <li><a href="#ModificationTimeMessage">The Object
+                          Modification Time Message</a></li>       <!-- 0x0012 -->
+                      <li><a href="#BtreeKValuesMessage">The B-tree
+                          &lsquo;K&rsquo; Values Message</a></li>  <!-- 0x0013 -->
+                      <li><a href="#DrvInfoMessage">The Driver Info
+                          Message</a></li>                         <!-- 0x0014 -->
+                      <li><a href="#AinfoMessage">The Attribute Info
+                          Message</a></li>                         <!-- 0x0015 -->
+                      <li><a href="#RefCountMessage">The Object Reference
+                          Count Message</a></li>                   <!-- 0x0016 -->
+                      <li><a href="#FsinfoMessage">The File Space Info
+                          Message</a></li>                         <!-- 0x0017 -->
+                    </ol>
+	              </ol>
+                </li>
+	            <li><a href="#DataStorage">Disk Format: Level 2B - Data Object Data Storage</a></li>
+	          </ol>
+              </font>
+              <li><a href="#AppendixA">Appendix A: Definitions</a></li>
+              <li><a href="#AppendixB">Appendix B: File Space Allocation
+                  Types</a></li>
+              <li><a href="#AppendixC">
+                  Appendix C: Types of Indexes for Dataset Chunks</a></li>
+              <font size="-1">
+	            <ol type="A">
+	              <li><a href="#SingleChunk">The Single Chunk Index</a></li>
+	              <li><a href="#Implicit">The Implicit Index</a></li>
+	              <li><a href="#FixedArray">The Fixed Array Index</a></li>
+	              <li><a href="#ExtensibleArray">The Extensible Array Index</a></li>
+	              <li><a href="#AppendV2Btrees">The Version 2 B-trees Index</a></li>
+	            </ol>
+              </font>
+              <li><a href="#AppendixD">
+                  Appendix D: Encoding for Dataspace and Reference</a></li>
+              <font size="-1">
+	            <ol type="A">
+	              <li><a href="#DataspaceEncode">Dataspace Encoding</a></li>
+	              <li><a href="#ReferenceEncodeRV">Reference Encoding (Revised)</a></li>
+	              <li><a href="#ReferenceEncodeDP">Reference Encoding (Backward Compatibility)</a></li>
+	            </ol>
+              </font>
+            </ol>
+        </td></tr>
+      </table>
+    </center>
+
+
+    <a name="Intro"><h2>I. Introduction</h2></a>
+
+    <table align="right" width="100">
+      <tr><td>&nbsp;</td><td align="center">
+          <hr />
+          <img src="FF-IH_FileGroup.gif" alt="HDF5 Groups" hspace="15" vspace="15">
+        </td><td>&nbsp;</td></tr>
+      <tr><td>&nbsp;</td><td align="center">
+          <strong>Figure 1:</strong> Relationships among the HDF5 root group, other groups, and objects
+          <hr />
+        </td><td>&nbsp;</td></tr>
+
+      <tr><td>&nbsp;</td><td align="center">
+          <img src="FF-IH_FileObject.gif" alt="HDF5 Objects" hspace="15" vspace="15">
+        </td><td>&nbsp;</td></tr>
+      <tr><td>&nbsp;</td><td align="center">
+          <strong>Figure 2:</strong> HDF5 objects -- datasets, datatypes, or dataspaces
+          <hr />
+        </td><td>&nbsp;</td></tr>
+    </table>
+
+
+    <p>The format of an HDF5 file on disk encompasses several
+      key ideas of the HDF4 and AIO file formats as well as
+      addressing some shortcomings therein.  The new format is
+      more self-describing than the HDF4 format and is more
+      uniformly applied to data objects in the file.</p>
+
+    <p>An HDF5 file appears to the user as a directed graph.
+      The nodes of this graph are the higher-level HDF5 objects
+      that are exposed by the HDF5 APIs:</p>
+
+    <ul>
+      <li>Groups</li>
+      <li>Datasets</li>
+      <li>Committed (formerly Named) datatypes</li>
+    </ul>
+
+    <p>At the lowest level, as information is actually written to the disk,
+      an HDF5 file is made up of the following objects:</p>
+    <ul>
+      <li>A superblock</li>
+      <li>B-tree nodes</li>
+      <li>Heap blocks</li>
+      <li>Object headers</li>
+      <li>Object data</li>
+      <li>Free space</li>
+    </ul>
+
+    <p>The HDF5 Library uses these low-level objects to represent the
+      higher-level objects that are then presented to the user or
+      to applications through the APIs. For instance, a group is an
+      object header that contains a message that points to a local
+      heap (for storing the links to objects in the group) and to a
+      B-tree (which indexes the links). A dataset is an object header
+      that contains messages that describe the datatype, dataspace,
+      layout, filters, external files, fill value, and other elements
+      with the layout message pointing to either a raw data chunk or
+      to a B-tree that points to raw data chunks.</p>
+
+
+    <a name="ThisDocument"><h3>I.A. This Document</h3></a>
+
+    <p>This document describes the lower-level data objects;
+      the higher-level objects and their properties are described
+      in the <a href="UG/HDF5_User_Guide-Responsive HTML5/index.html"><cite>HDF5 User Guide</cite></a>.</p>
+
+    <p>Three levels of information comprise the file format.
+      Level 0 contains basic information for identifying and
+      defining information about the file.  Level 1 information contains
+      the information about the pieces of a file shared by many objects
+      in the file (such as B-trees and heaps).  Level 2 is the rest
+      of the file and contains all of the data objects with each object
+      partitioned into header information, also known as
+      <em>metadata</em>, and data.</p>
+
+    <p>The various components of the lower-level data objects are
+      described in pairs of tables. The first table shows the format
+      layout, and the second table describes the fields. The titles
+      of format layout tables begin with &ldquo;Layout&rdquo;. The
+      titles of the tables where the fields are described begin with
+      &ldquo;Fields&rdquo;. For example, the table that describes the
+      format of the <a href="#V2Btrees">version 2 B-tree header</a> has
+      a title of &ldquo;Layout: Version 2 B-tree Header&rdquo;, and the
+      fields in the version 2 B-tree header are described in the table
+      titled &ldquo;Fields: Version 2 B-tree Header&rdquo;.
+
+    <p>The sizes of various fields in the following layout tables are
+      determined by looking at the number of columns the field spans
+      in the table.  There are exceptions: </p>
+    <ul>
+      <li> The size may be overridden by specifying a size in
+        parentheses</li>
+      <li> The size of addresses is determined by the
+        <em><a href="#SizeOfOffsetsV0">Size of Offsets</a></em> field
+        in the superblock and is indicated in this document with a
+        superscripted &lsquo;O&rsquo;</li>
+      <li> The size of length fields is determined by the
+        <em><a href="#SizeOfLengthsV0">Size of Lengths</a></em> field in
+        the superblock and is indicated in this document with a
+        superscripted &lsquo;L&rsquo;</li>
+    </ul>
+
+    <p>Values for all fields in this document should be treated as unsigned
+      integers, unless otherwise noted in the description of a field.
+      Additionally, all metadata fields are stored in little-endian byte
+      order.
+    </p>
+
+    <p>All checksums used in the format are computed with the
+      <a href="http://www.burtleburtle.net/bob/hash/doobs.html">Jenkins&rsquo;
+        lookup3</a> algorithm.
+    </p>
+
+    <p>Whenever a bit flag or field is mentioned for an entry, bits are
+      numbered from the lowest bit position in the entry.
+    </p>
+
+    <p>Various format tables in this document have cells with
+      &ldquo;This space inserted only to align table nicely&rdquo;. These
+      entries in the table are just to make the table presentation nicer
+      and do not represent any values or padding in the file.
+    </p>
+
+    <a name="ChangesForHdf5_1_12">
+      <h3>I.B. Changes for HDF5 1.12</h3></a>
+    <p>The following sections have been
+      changed or added for the 1.12 release:</p>
+    <ul>
+      <li>Under <a href="#DatatypeMessage">&ldquo;The Datatype Message&rdquo;</a>,
+        in the Description for &ldquo;Fields:Datatype Message&rdquo;,
+        version 4 was added and Reference class (7) of the datatype was updated to describe version 4.</li>
+      <li><a href="#AppendixD">
+          &ldquo;Appendix D: Encoding for Dataspace and Reference&rdquo;</a>
+        was added. </li>
+    </ul>
+
+
+    <a name="ChangesForHdf5_1_10">
+      <h3>I.C. Changes for HDF5 1.10</h3></a>
+
+    <p>The following sections have been
+      changed or added for the 1.10 release:</p>
+    <ul>
+      <li>In the <a href="#Superblock">
+          &ldquo;Disk Format: Level 0A - Format Signature and
+          Superblock&rdquo;</a> section, version 3 of the superblock was
+        added. </li>
+      <li>In the <a href="#SuperblockExt">
+          &ldquo;Disk Format: Level 0C - Superblock Extension&rdquo;</a>
+        section, a link to the Data Storage message was added. </li>
+      <li>In the <a href="#V2Btrees">
+          &ldquo;Disk Format: Level 1A2 - Version 2 B-trees&rdquo;</a>
+        section, additional B-tree types were added. Tables that
+        describe the <a href="#V2BtreesType10">type 10</a> and
+        <a href="#V2BtreesType11">11</a> record layouts were added at
+        the end of the section.</li>
+      <li>The <a href="#GlobalHeapVDS">&ldquo;Disk Format: Level 1F -
+          Global Heap Block for Virtual Datasets&rdquo;</a> was added.
+      </li>
+      <li><a href="#LayoutMessage">
+          &ldquo;The Data Layout Message&rdquo;</a> section was changed.
+        The name was changed, and <a href="#DataLayoutV4">version 4</a>
+        of the data layout message was added for the virtual type.</li>
+      <li>The <a href="#FsinfoMessage">
+          &ldquo;The File Space Info Message&rdquo;</a> header message
+        type was added.</li>
+      <li><a href="#AppendixC">
+          &ldquo;Appendix C: Types of Indexes for Dataset Chunks&rdquo;</a>
+        was added. Five indexing types were added.</li>
+    </ul>
+
+
+
+    <h2><a name="FileMetaData">
+        II. Disk Format: Level 0 - File Metadata</a></h2>
+
+
+
+    <h3><a name="Superblock">
+        II.A. Disk Format: Level 0A - Format Signature and Superblock</a></h3>
+
+    <p>The superblock may begin at certain predefined offsets within
+      the HDF5 file, allowing a block of unspecified content for
+      users to place additional information at the beginning (and
+      end) of the HDF5 file without limiting the HDF5 Library&rsquo;s
+      ability to manage the objects within the file itself.  This
+      feature was designed to accommodate wrapping an HDF5 file in
+      another file format or adding descriptive information to an HDF5
+      file without requiring the modification of the actual file&rsquo;s
+      information.  The superblock is located by searching for the
+      HDF5 format signature at byte offset 0, byte offset 512, and at
+      successive locations in the file, each a multiple of two of
+      the previous location; in other words, at these byte offsets:
+      0, 512, 1024, 2048, and so on.</p>
+
+    <p>The superblock is composed of the format signature, followed by a
+      superblock version number and information that is specific to each
+      version of the superblock.
+
+    <p>Currently, there are four versions of the superblock format:
+      <ul>
+        <li>Version 0 is the default format.</li>
+        <li>Version 1 is the same as version 0 but with the
+          &ldquo;<em>Indexed Storage Internal Node K</em>&rdquo; field
+          for storing non-default B-tree &lsquo;K&rsquo; value.</li>
+        <li>Version 2 has some fields eliminated and compressed from
+          superblock format versions 0 and 1. It has added checksum support
+          and superblock extension to store additional superblock
+          metadata.</li>
+        <li>Version 3 is the same as version 2 except that the field
+          &ldquo;<em>File Consistency Flags</em>&rdquo; is used for file
+          locking. This format version will enable support for the latest
+          version.</li>
+      </ul>
+
+    <p>Versions 0 and 1 of the superblock are described below:</p>
+
+
+    <div align="center">
+      <table class="format">
+        <caption>
+          Layout: Superblock (Versions 0 and 1)
+        </caption>
+
+	    <tr>
+	      <th>byte</th>
+	      <th>byte</th>
+	      <th>byte</th>
+	      <th>byte</th>
+	    </tr>
+
+	    <tr>
+	      <td colspan="4"><br />Format Signature
+            <em>(8 bytes)</em><br /><br /></td>
+	    </tr>
+
+	    <tr>
+	      <td>Version # of Superblock</td>
+	      <td>Version # of File&rsquo;s Free Space Storage</td>
+	      <td>Version # of Root Group Symbol Table Entry</td>
+	      <td>Reserved <em>(zero)</em></td>
+	    </tr>
+
+	    <tr>
+	      <td>Version Number of Shared Header Message Format</td>
+	      <td>Size of Offsets</td>
+	      <td>Size of Lengths</td>
+	      <td>Reserved <em>(zero)</em></td>
+	    </tr>
+
+	    <tr>
+	      <td colspan="2">Group Leaf Node K</td>
+	      <td colspan="2">Group Internal Node K</td>
+	    </tr>
+
+	    <tr>
+	      <td colspan="4">File Consistency Flags</td>
+	    </tr>
+
+	    <tr>
+	      <td colspan="2" style="border:dotted;">Indexed Storage Internal Node K<sup>1</sup></td>
+	      <td colspan="2" style="border:dotted;">Reserved
+            <em>(zero)</em><sup>1</sup></td>
+	    </tr>
+
+	    <tr>
+	      <td colspan="4"><br />Base Address<sup>O</sup><br /><br /></td>
+	    </tr>
+
+	    <tr>
+	      <td colspan="4"><br />Address of File Free space Info<sup>O</sup><br /><br /></td>
+	    </tr>
+
+	    <tr>
+	      <td colspan="4"><br />End of File Address<sup>O</sup><br /><br /></td>
+	    </tr>
+
+	    <tr>
+	      <td colspan="4"><br />Driver Information Block Address<sup>O</sup><br /><br /></td>
+	    </tr>
+
+	    <tr>
+	      <td colspan="4">Root Group Symbol Table Entry</td>
+	    </tr>
+      </table>
+
+      <table class="note">
+        <tr>
+          <td width="60%">&nbsp;</td>
+          <td width="40%">
+            (Items marked with a &lsquo;1&rsquo; in the above table are
+            new in version 1 of the superblock.)
+        </td></tr>
+        <tr>
+          <td>&nbsp;</td>
+          <td>
+            (Items marked with an &lsquo;O&rsquo; in the above table are
+            of the size specified in the <a href="#SizeOfOffsetsV0">Size
+              of Offsets</a> field in the superblock.)
+        </td></tr>
+      </table>
+    </div>
+
+    <br />
+    <div align="center">
+      <table class="desc">
+        <caption>
+          Fields: Superblock (Versions 0 and 1)
+        </caption>
+	    <tr>
+          <th width="30%">Field Name</th>
+          <th>Description</th>
+	    </tr>
+
+	    <tr>
+	      <td><p>Format Signature</p></td>
+	      <td><p>This field contains a constant value and can be used to
+	          quickly identify a file as being an HDF5 file. The
+	          constant value is designed to allow easy identification of
+	          an HDF5 file and to allow certain types of data corruption
+	          to be detected.  The file signature of an HDF5 file always
+	          contains the following values:</p>
+            <center>
+              <table border align="center" cellpadding="4">
+		        <tr align="center">
+		          <td align="right">Decimal:</td>
+                  <td width="8%">137</td>
+		          <td width="8%">72</td>
+		          <td width="8%">68</td>
+		          <td width="8%">70</td>
+		          <td width="8%">13</td>
+		          <td width="8%">10</td>
+		          <td width="8%">26</td>
+		          <td width="8%">10</td>
+		        </tr>
+
+		        <tr align="center">
+		          <td align="right">Hexadecimal:</td>
+		          <td>89</td>
+		          <td>48</td>
+		          <td>44</td>
+		          <td>46</td>
+		          <td>0d</td>
+		          <td>0a</td>
+		          <td>1a</td>
+		          <td>0a</td>
+		        </tr>
+
+		        <tr align="center">
+		          <td align="right">ASCII C Notation:</td>
+		          <td>\211</td>
+		          <td>H</td>
+		          <td>D</td>
+		          <td>F</td>
+		          <td>\r</td>
+		          <td>\n</td>
+		          <td>\032</td>
+		          <td>\n</td>
+		        </tr>
+	          </table>
+	        </center>
+            <p>This signature both identifies the file as an HDF5 file
+	          and provides for immediate detection of common
+	          file-transfer problems. The first two bytes distinguish
+	          HDF5 files on systems that expect the first two bytes to
+	          identify the file type uniquely. The first byte is
+	          chosen as a non-ASCII value to reduce the probability
+	          that a text file may be misrecognized as an HDF5 file;
+	          also, it catches bad file transfers that clear bit
+	          7. Bytes two through four name the format. The CR-LF
+	          sequence catches bad file transfers that alter newline
+	          sequences. The control-Z character stops file display
+	          under MS-DOS. The final line feed checks for the inverse
+	          of the CR-LF translation problem.  (This is a direct
+	          descendent of the
+              <a href="http://www.libpng.org/pub/png/spec/iso/index-object.html#5PNG-file-signature">PNG</a> file
+              signature.)</p>
+            <p><em>This field is present in version 0+ of the superblock.</em>
+          </p></td>
+        </tr>
+
+	    <tr>
+	      <td><p>Version Number of the Superblock</p></td>
+	      <td><p>This value is used to determine the format of the
+	          information in the superblock.  When the format of the
+	          information in the superblock is changed, the version number
+	          is incremented to the next integer and can be used to
+	          determine how the information in the superblock is
+	          formatted.</p>
+
+            <p>Values of 0, 1 and 2 are defined for this field (the
+              format of version 2 is described below, not here).
+            </p>
+
+            <p><em>This field is present in version 0+ of the superblock.</em>
+            </p>
+          </td>
+	    </tr>
+
+	    <tr>
+	      <td><p>Version Number of the File&rsquo;s Free Space
+              Information</p></td>
+	      <td>
+            <p>This value is used to determine the format of the
+	          file&rsquo;s free space information.
+            </p>
+            <p>The only value currently valid in this field is &lsquo;0&rsquo;, which
+              indicates that the file&rsquo;s free space is as described
+              <a href="#FreeSpaceManager">below</a>.
+            </p>
+
+            <p><em>This field is present in versions 0 and 1 of the
+                superblock.</em>
+            </p>
+          </td>
+	    </tr>
+
+	    <tr>
+	      <td><p>Version Number of the Root Group Symbol Table
+              Entry</p></td>
+	      <td><p>This value is used to determine the format of the
+	          information in the Root Group Symbol Table Entry.  When the
+              format of the information in that field is changed, the
+	          version number is incremented to the next integer and can be
+	          used to determine how the information in the field
+	          is formatted.</p>
+            <p>The only value currently valid in this field is &lsquo;0&rsquo;,
+              which indicates that the root group symbol table entry is
+              formatted as described <a href="#SymbolTableEntry">below</a>.</p>
+            <p><em>This field is present in version 0 and 1 of the
+                superblock.</em></p>
+          </td>
+	    </tr>
+
+	    <tr>
+	      <td><p>Version Number of the Shared Header Message Format</p></td>
+	      <td><p>This value is used to determine the format of the
+	          information in a shared object header message. Since the format
+	          of the shared header messages differs from the other private
+	          header messages, a version number is used to identify changes
+	          in the format.
+            </p>
+            <p>The only value currently valid in this field is &lsquo;0&rsquo;, which
+              indicates that shared header messages are formatted as
+              described <a href="#ObjectHeaderMessages">below</a>.
+            </p>
+
+            <p><em>This field is present in version 0 and 1 of the superblock.</em>
+            </p>
+          </td>
+	    </tr>
+
+	    <tr>
+	      <td><p><a name="SizeOfOffsetsV0">Size of Offsets</a></p></td>
+	      <td><p>This value contains the number of bytes used to store
+	          addresses in the file.  The values for the addresses of
+	          objects in the file are offsets relative to a base address,
+	          usually the address of the superblock signature.  This
+	          allows a wrapper to be added after the file is created
+	          without invalidating the internal offset locations.
+            </p>
+
+            <p><em>This field is present in version 0+ of the superblock.</em>
+            </p>
+          </td>
+	    </tr>
+
+	    <tr>
+	      <td><p><a name="SizeOfLengthsV0">Size of Lengths</a></p></td>
+	      <td><p>This value contains the number of bytes used to store
+	          the size of an object.
+            </p>
+            <p><em>This field is present in version 0+ of the superblock.</em>
+            </p>
+          </td>
+	    </tr>
+
+	    <tr>
+	      <td><p>Group Leaf Node K</p></td>
+	      <td>
+            <p>Each leaf node of a group B-tree will have at
+	          least this many entries but not more than twice this
+	          many.  If a group has a single leaf node then it
+	          may have fewer entries.
+            </p>
+            <p>This value must be greater than zero.
+            </p>
+            <p>See the <a href="#Btrees">description</a> of B-trees below.
+            </p>
+
+            <p><em>This field is present in version 0 and 1 of the superblock.</em>
+            </p>
+          </td>
+	    </tr>
+
+	    <tr>
+	      <td><p>Group Internal Node K</p></td>
+	      <td>
+            <p>Each internal node of a group B-tree will have at
+	          least this many entries but not more than twice this
+	          many.  If the group has only one internal
+	          node then it might have fewer entries.
+            </p>
+            <p>This value must be greater than zero.
+            </p>
+            <p>See the <a href="#Btrees">description</a> of B-trees below.
+            </p>
+
+            <p><em>This field is present in version 0 and 1 of the superblock.</em>
+            </p>
+          </td>
+	    </tr>
+
+        <tr>
+          <td><p>File Consistency Flags</p></td>
+          <td>
+            <p>This field is unused and should be ignored.
+            </p>
+            <p><em>This field is present in version 0+ of the superblock.</em>
+            </p>
+          </td>
+        </tr>
+
+	    <tr>
+	      <td><p>Indexed Storage Internal Node K</p></td>
+	      <td>
+            <p>Each internal node of an indexed storage B-tree will have at
+	          least this many entries but not more than twice this
+	          many.  If the index storage B-tree has only one internal
+	          node then it might have fewer entries.
+            </p>
+            <p>This value must be greater than zero.
+            </p>
+            <p>See the <a href="#Btrees">description</a> of B-trees below.
+            </p>
+
+            <p><em>This field is present in version 1 of the superblock.</em>
+            </p>
+          </td>
+	    </tr>
+
+        <tr>
+          <td><p>Base Address</p></td>
+          <td>
+            <p>This is the absolute file address of the first byte of
+              the HDF5 data within the file.  The library currently
+              constrains this value to be the absolute file address
+              of the superblock itself when creating new files;
+              future versions of the library may provide greater
+              flexibility.  When opening an existing file and this address does
+              not match the offset of the superblock, the library assumes
+              that the entire contents of the HDF5 file have been adjusted in
+              the file and adjusts the base address and end of file address to
+              reflect their new positions in the file.  Unless otherwise noted,
+              all other file addresses are relative to this base
+              address.
+            </p>
+
+            <p><em>This field is present in version 0+ of the superblock.</em>
+            </p>
+          </td>
+        </tr>
+
+        <tr>
+          <td><p>Address of Global Free-space Index</p></td>
+          <td>
+            <p>The file&rsquo;s free space is not persistent for version 0 and 1 of
+	          the superblock.
+              Currently this field always contains the
+              <a href="#UndefinedAddress">undefined address</a>.
+            </p>
+
+            <p><em>This field is present in version 0 and 1 of the superblock.</em>
+            </p>
+          </td>
+        </tr>
+
+        <tr>
+          <td><p>End of File Address</p></td>
+          <td>
+            <p>This is the absolute file address of the first byte past
+              the end of all HDF5 data.  It is used to determine whether a
+              file has been accidentally truncated and as an address where
+              file data allocation can occur if space from the free list is
+              not used.
+            </p>
+
+            <p><em>This field is present in version 0+ of the superblock.</em>
+            </p>
+          </td>
+        </tr>
+
+        <tr>
+          <td><p>Driver Information Block Address</p></td>
+          <td>
+            <p>This is the relative file address of the file driver
+              information block which contains driver-specific
+              information needed to reopen the file. If there is no
+              driver information block then this entry should be the
+              <a href="#UndefinedAddress">undefined address</a>.
+            </p>
+
+            <p><em>This field is present in version 0 and 1 of the superblock.</em>
+            </p>
+          </td>
+        </tr>
+
+        <tr>
+          <td><p>Root Group Symbol Table Entry</p></td>
+          <td>
+            <p>This is the <a href="#SymbolTableEntry">symbol table entry</a>
+              of the root group, which serves as the entry point into
+              the group graph for the file.
+            </p>
+
+            <p><em>This field is present in version 0 and 1 of the superblock.</em>
+            </p>
+          </td>
+        </tr>
+      </table>
+    </div>
+
+    <br />
+    <br />
+    <br />
+    <p>Versions 2 and 3 of the superblock are described below:</p>
+
+    <div align="center">
+      <table class="format">
+        <caption>
+          Layout: Superblock (Versions 2 and 3)
+        </caption>
+
+	    <tr>
+	      <th>byte</th>
+	      <th>byte</th>
+	      <th>byte</th>
+	      <th>byte</th>
+	    </tr>
+
+	    <tr>
+	      <td colspan="4"><br />Format Signature
+            <em>(8 bytes)</em><br /><br /></td>
+	    </tr>
+
+	    <tr>
+	      <td>Version # of Superblock</td>
+	      <td>Size of Offsets</td>
+	      <td>Size of Lengths</td>
+	      <td>File Consistency Flags</td>
+	    </tr>
+
+	    <tr>
+	      <td colspan="4"><br />Base Address<sup>O</sup><br /><br /></td>
+	    </tr>
+
+	    <tr>
+	      <td colspan="4"><br />Superblock Extension Address<sup>O</sup><br /><br /></td>
+	    </tr>
+
+	    <tr>
+	      <td colspan="4"><br />End of File Address<sup>O</sup><br /><br /></td>
+	    </tr>
+
+	    <tr>
+	      <td colspan="4"><br />Root Group Object Header Address<sup>O</sup><br /><br /></td>
+	    </tr>
+
+	    <tr>
+	      <td colspan="4">Superblock Checksum</td>
+	    </tr>
+      </table>
+
+      <table class="note">
+        <tr>
+          <td width="60%">&nbsp;</td>
+          <td width="40%">
+            (Items marked with an &lsquo;O&rsquo; in the above table are
+            of the size specified in the <a href="#SizeOfOffsetsV0">Size
+              of Offsets</a> field in the superblock.)
+        </td></tr>
+      </table>
+
+    </div>
+
+    <br />
+    <div align="center">
+      <table class="desc">
+        <caption>
+          Fields: Superblock (Versions 2 and 3)
+        </caption>
+	    <tr>
+          <th width="30%">Field Name</th>
+          <th>Description</th>
+	    </tr>
+
+	    <tr>
+	      <td><p>Format Signature</p></td>
+	      <td>
+            <p>This field is the same as described for versions 0 and 1 of the
+              superblock.
+          </p></td>
+	    </tr>
+
+	    <tr>
+	      <td><p>Version Number of the Superblock</p></td>
+	      <td>
+            <p>This field has a value of 2 and has the same meaning as for
+              versions 0 and 1.
+            </p>
+          </td>
+	    </tr>
+
+	    <tr>
+	      <td><p>Size of Offsets</p></td>
+	      <td>
+            <p>This field is the same as described for
+              <a href="#SizeOfOffsetsV0">versions 0 and 1</a> of the
+              superblock.
+            </p>
+          </td>
+	    </tr>
+
+	    <tr>
+	      <td><p>Size of Lengths</p></td>
+	      <td>
+            <p>This field is the same as described for
+              <a href="#SizeOfLengthsV0">versions 0 and 1</a> of the
+              superblock.
+            </p>
+          </td>
+	    </tr>
+
+        <tr>
+          <td><p>File Consistency Flags</p></td>
+
+          <td>
+            <p>For superblock version
+              2: This field is unused and should be ignored.</p>
+            <p>For superblock version
+              3: This value contains flags to ensure file consistency for
+              file locking. Currently, the following bit flags are defined:
+              <ul>
+                <li>Bit 0 if set indicates that the file has been opened for
+                  write access.</li>
+                <li>Bit 1 is reserved for future use.</li>
+                <li>Bit 2 if set indicates that the file has been opened for
+                  single-writer/multiple-reader (SWMR) write access.</li>
+                <li>Bits 3-7 are reserved for future use.</li>
+              </ul>
+	        <p>
+              Bit 0 should be set as the first action when a file has been
+              opened for write access. Bit 2 should be set when a file
+              has been opened for SWMR write access. These two bits should
+              be cleared only as the final action when closing a file.
+            </p>
+            <p><em>This field is present in version 0+ of the superblock.</em>
+            </p>
+            <p><em>The size of this
+                field has been reduced from 4 bytes in superblock format
+                versions 0 and 1 to 1 byte.</em>
+            </p>
+          </td>
+
+        </tr>
+
+        <tr>
+          <td><p>Base Address</p></td>
+          <td>
+            <p>This field is the same as described for versions 0 and
+              1 of the superblock.
+            </p>
+          </td>
+        </tr>
+
+        <tr>
+          <td><p>Superblock Extension Address</p></td>
+          <td>
+            <p>The field is the address of the object header for the
+              <a href="#SuperblockExt">superblock extension</a>.
+		      If there is no extension then this entry should be the
+		      <a href="#UndefinedAddress">undefined address</a>.
+            </p>
+          </td>
+        </tr>
+
+        <tr>
+          <td><p>End of File Address</p></td>
+          <td>
+            <p>This field is the same as described for versions 0 and 1 of the
+              superblock.
+            </p>
+          </td>
+        </tr>
+
+        <tr>
+          <td><p>Root Group Object Header Address</p></td>
+          <td>
+            <p>This is the address of
+		      the <a href="#DataObject">root group object header</a>,
+		      which serves as the entry point into the group graph for the file.
+            </p>
+          </td>
+        </tr>
+
+        <tr>
+          <td><p>Superblock Checksum</p></td>
+          <td>
+            <p>The checksum for the superblock.
+            </p>
+          </td>
+        </tr>
+
+      </table>
+    </div>
+
+    <br />
+
+    <h3><a name="DriverInfo">
+        II.B. Disk Format: Level 0B - File Driver Info</a></h3>
+
+    <p>The <b>driver information block</b> is an optional region of the
+      file which contains information needed by the file driver
+      to reopen a file.  The format is described below:</p>
+
+
+    <div align="center">
+      <table class="format">
+        <caption>
+          Layout: Driver Information Block
+        </caption>
+
+        <tr>
+          <th>byte</th>
+          <th>byte</th>
+          <th>byte</th>
+          <th>byte</th>
+	    </tr>
+
+        <tr>
+          <td>Version</td>
+          <td colspan="3">Reserved</td>
+        </tr>
+
+        <tr>
+          <td colspan="4">Driver Information Size</td>
+        </tr>
+
+        <tr>
+          <td colspan="4"><br />Driver Identification
+            <em>(8 bytes)</em><br /><br /></td>
+        </tr>
+
+        <tr>
+          <td colspan="4"><br /><br />Driver Information
+            <em>(variable size)</em><br /><br /><br /></td>
+        </tr>
+      </table>
+    </div>
+
+    <br />
+    <div align="center">
+      <table class="desc">
+        <caption>
+          Fields: Driver Information Block
+        </caption>
+	    <tr>
+          <th width="30%">Field Name</th>
+          <th>Description</th>
+        </tr>
+
+        <tr>
+          <td><p>Version</p></td>
+          <td>
+            <p>The version number of the Driver Information Block.
+	          This document describes version 0.
+            </p>
+          </td>
+        </tr>
+
+        <tr>
+          <td><p>Driver Information Size</p></td>
+          <td>
+            <p>The size in bytes of the <em>Driver Information</em> field.
+            </p>
+          </td>
+        </tr>
+
+        <tr>
+          <td><p>Driver Identification</p></td>
+          <td>
+            <p>This is an eight-byte ASCII string without null
+              termination which identifies the driver and/or version number
+              of the Driver Information Block. The predefined driver encoded
+              in this field by the HDF5 Library is identified by the
+              letters <code>NCSA</code> followed by the first four characters of
+              the driver name. If the Driver Information block is not
+              the original version then the last letter(s) of the
+              identification will be replaced by a version number in
+              ASCII, starting with 0.
+            </p>
+            <p>
+              Identification for user-defined drivers is also eight-byte long.
+	          It can be arbitrary but should be unique to avoid
+              the four character prefix &ldquo;NCSA&rdquo;.
+            </p>
+          </td>
+        </tr>
+
+        <tr valign="top">
+          <td><p>Driver Information</p></td>
+          <td>Driver information is stored in a format defined by the
+            file driver (see description below).</td>
+        </tr>
+      </table>
+    </div>
+
+    <br />
+    <p>The two drivers encoded in the <em>Driver Identification</em>
+      field are as follows:</p>
+    <ul>
+      <li>
+        Multi driver:
+        <p>
+          The identifier for this driver is &ldquo;NCSAmulti&rdquo;.
+          This driver provides a mechanism for segregating raw data and different types of metadata
+          into multiple files.
+          These files are viewed by the library as a single virtual HDF5 file with a single file address.
+          A maximum of 6 files will be created for the following data:
+          superblock, B-tree, raw data, global heap, local heap, and object header.
+          More than one type of data can be written to the same file.
+      </p></li>
+      <li>
+        Family driver
+        <p>
+          The identifier for this driver is &ldquo;NCSAfami&rdquo; and is encoded in this field for library version 1.8 and after.
+          This driver is designed for systems that do not support files larger than 2 gigabytes
+          by splitting the HDF5 file address space across several smaller files.
+          It does nothing to segregate metadata and raw data;
+          they are mixed in the address space just as they would be in a single contiguous file.
+      </p></li>
+    </ul>
+    <p>The format of the <em>Driver Information</em> field for the
+      above two drivers are described below:</p>
+
+    <div align="center">
+      <table class="format">
+        <caption>
+          Layout: Multi Driver Information
+        </caption>
+
+	    <tr>
+	      <th width="25%">byte</th>
+	      <th width="25%">byte</th>
+	      <th width="25%">byte</th>
+	      <th width="25%">byte</th>
+	    </tr>
+
+	    <tr>
+	      <td>Member Mapping</td>
+	      <td>Member Mapping</td>
+	      <td>Member Mapping</td>
+	      <td>Member Mapping</td>
+	    </tr>
+
+	    <tr>
+	      <td>Member Mapping</td>
+	      <td>Member Mapping</td>
+	      <td>Reserved</td>
+	      <td>Reserved</td>
+	    </tr>
+
+	    <tr>
+	      <td colspan="4"><br />Address of Member File 1<br /><br /></td>
+	    </tr>
+
+	    <tr>
+	      <td colspan="4"><br />End of Address for Member File 1<br /><br /></td>
+	    </tr>
+
+	    <tr>
+	      <td colspan="4"><br />Address of Member File 2<br /><br /></td>
+	    </tr>
+
+	    <tr>
+	      <td colspan="4"><br />End of Address for Member File 2<br /><br /></td>
+	    </tr>
+
+	    <tr>
+	      <td colspan="4"><br />... ...<br /><br /></td>
+	    </tr>
+
+	    <tr>
+	      <td colspan="4"><br />Address of Member File N<br /><br /></td>
+	    </tr>
+
+	    <tr>
+	      <td colspan="4"><br />End of Address for Member File N<br /><br /></td>
+	    </tr>
+
+	    <tr>
+	      <td colspan="4"><br />Name of Member File 1
+            <em>(variable size)</em><br /><br /></td>
+	    </tr>
+
+	    <tr>
+	      <td colspan="4"><br />Name of Member File 2
+            <em>(variable size)</em><br /><br /></td>
+	    </tr>
+
+	    <tr>
+	      <td colspan="4"><br />... ...<br /><br /></td>
+	    </tr>
+
+	    <tr>
+	      <td colspan="4"><br />Name of Member File N
+            <em>(variable size)</em><br /><br /></td>
+	    </tr>
+
+      </table>
+    </div>
+
+    <br />
+    <div align="center">
+      <table class="desc">
+        <caption>
+          Fields: Multi Driver Information
+        </caption>
+	    <tr>
+	      <th width="30%">Field Name</th>
+	      <th>Description</th>
+	    </tr>
+
+	    <tr>
+	      <td><p>Member Mapping</p></td>
+	      <td><p>These fields are integer values from 1 to 6
+              indicating how the data can be mapped to or merged with another type of
+              data.
+	          <table class="list">
+                <tr>
+                  <th width="20%" align="center">Member Mapping</th>
+                  <th width="80%" align="left">Description</th>
+                </tr>
+                <tr>
+                  <td align="center">1</td>
+                  <td>The superblock data.</td>
+                </tr>
+                <tr>
+                  <td align="center">2</td>
+                  <td>The B-tree data.</td>
+                </tr>
+                <tr>
+                  <td align="center">3</td>
+                  <td>The raw data.</td>
+                </tr>
+                <tr>
+                  <td align="center">4</td>
+                  <td>The global heap data.</td>
+                </tr>
+                <tr>
+                  <td align="center">5</td>
+                  <td>The local heap data.</td>
+                </tr>
+                <tr>
+                  <td align="center">6</td>
+                  <td>The object header data.</td>
+                </tr>
+            </table></p>
+            <p>For example, if the third field has the value 3 and all the rest have the
+              value 1, it means there are two files: one for raw data, and one for superblock,
+              B-tree, global heap, local heap, and object header.</p>
+          </td>
+	    </tr>
+
+	    <tr>
+	      <td><p>Reserved</p></td>
+	      <td><p>These fields are reserved and should always be zero.</p></td>
+	    </tr>
+
+	    <tr>
+	      <td><p>Address of Member File N</p></td>
+	      <td><p>This field Specifies the virtual address at which the member file starts.</p>
+	        <p>N is the number of member files.</p>
+	      </td>
+	    </tr>
+
+	    <tr>
+	      <td><p>End of Address for Member File N</p></td>
+	      <td><p>This field is the end of the allocated address for the member file.
+          </p></td>
+	    </tr>
+
+	    <tr>
+	      <td><p>Name of Member File N</p></td>
+	      <td><p>This field is the null-terminated name of the member file and
+		      its length should be multiples of 8 bytes.
+		      Additional bytes will be padded with <em>NULL</em>s. The default naming
+		      convention is <em>%s-X.h5</em>, where <em>X</em> is one of the letters
+              <em>s</em> (for superblock), <em>b</em> (for B-tree), <em>r</em> (for raw data),
+              <em>g</em> (for global heap), <em>l</em> (for local heap), and <em>o</em> (for
+              object header). The name of the whole HDF5 file will substitute the <em>%s</em>
+              in the string.
+            </p>
+          </td>
+	    </tr>
+      </table>
+    </div>
+
+    <br />
+    <br />
+    <br />
+    <div align="center">
+      <table class="format">
+        <caption>
+          Layout: Family Driver Information
+        </caption>
+
+	    <tr>
+	      <th width="25%">byte</th>
+	      <th width="25%">byte</th>
+	      <th width="25%">byte</th>
+	      <th width="25%">byte</th>
+	    </tr>
+
+	    <tr>
+	      <td colspan="8"><br />Size of Member File<br /><br /></td>
+	    </tr>
+
+      </table>
+    </div>
+
+    <br />
+    <div align="center">
+      <table class="desc">
+        <caption>
+          Fields: Family Driver Information
+        </caption>
+	    <tr>
+	      <th width="30%">Field Name</th>
+	      <th>Description</th>
+	    </tr>
+
+	    <tr>
+	      <td><p>Size of Member File</p></td>
+	      <td><p>This field is the size of the member file in the family of files.</p></td>
+	    </tr>
+      </table>
+    </div>
+
+    <h3><a name="SuperblockExt">
+        II.C. Disk Format: Level 0C - Superblock Extension</a></h3>
+
+    <p>The <em>superblock extension</em> is used to store superblock metadata
+      which is either optional, or added after the version of the superblock
+      was defined. Superblock extensions may only exist when version 2
+      or later of the superblock is used. A superblock extension is an object
+      header which may hold the following messages:</p>
+	<ul>
+	  <li>
+	    <a href="#SOHMTableMessage">Shared Message Table message</a> containing
+        information to locate the master table of shared object header message
+        indices.</li>
+	  <li>
+	    <a href="#BtreeKValuesMessage">B-tree &lsquo;K&rsquo; Values message</a> containing
+        non-default B-tree &lsquo;K&rsquo; values.</li>
+	  <li>
+	    <a href="#DrvInfoMessage">Driver Info message</a> containing information
+        needed by the file driver in order to reopen a file.
+        See also the
+        <a href="#DriverInfo">&ldquo;Disk Format: Level 0B - File Driver
+          Info&rdquo;</a> section above.</li>
+	  <li>
+	    <a href="#FsinfoMessage">File Space Info message</a> containing
+	    information about file space handling in the file.</li>
+	</ul>
+
+
+
+    <h2><a name="FileInfra">
+        III. Disk Format: Level 1 - File Infrastructure</a></h2>
+
+    <h3><a name="Btrees">
+        III.A. Disk Format: Level 1A - B-trees and B-tree Nodes</a></h3>
+
+    <p>B-trees allow flexible storage for objects which tend to grow
+      in ways that cause the object to be stored discontiguously.  B-trees
+      are described in various algorithms books including &ldquo;Introduction to
+      Algorithms&rdquo; by Thomas H. Cormen, Charles E. Leiserson, and Ronald
+      L. Rivest.  B-trees are used in several places in the HDF5 file format,
+      when an index is needed for another data structure.</p>
+
+    <p>The version 1 B-tree structure described below is the original
+      index structure. The version 1 B-trees are being phased out in
+      favor of the version 2 B-trees described below. Note that both
+      types of structures may be found in the same file depending on
+      the application settings when creating the file.</p>
+
+    <h4><a name="V1Btrees">
+        III.A.1. Disk Format: Level 1A1 - Version 1 B-trees</a></h4>
+
+    <p>Version 1 B-trees in HDF5 files are an implementation of the
+      B-link tree. The sibling nodes at a particular level in
+      the tree are stored in a doubly-linked list. See the
+      &ldquo;Efficient Locking for Concurrent Operations on B-trees&rdquo;
+      paper by Phillip Lehman and S. Bing Yao as published in the
+      <cite>ACM Transactions on Database Systems</cite>, Vol. 6, No. 4,
+      December 1981.</p>
+
+    <p>The B-trees implemented by the file format contain one more
+      key than the number of children. In other words, each child
+      pointer out of a B-tree node has a left key and a right key.
+      The pointers out of internal nodes point to sub-trees while
+      the pointers out of leaf nodes point to symbol nodes and
+      raw data chunks.
+      Aside from that difference, internal nodes and leaf nodes
+      are identical.</p>
+
+    <div align="center">
+      <table class="format">
+        <caption>
+          Layout: B-tree Nodes
+        </caption>
+
+        <tr>
+          <th>byte</th>
+          <th>byte</th>
+          <th>byte</th>
+          <th>byte</th>
+        </tr>
+
+        <tr>
+          <td colspan="4">Signature</td>
+        </tr>
+
+        <tr>
+          <td>Node Type</td>
+          <td>Node Level</td>
+          <td colspan="2">Entries Used</td>
+        </tr>
+
+        <tr>
+          <td colspan="4"><br />Address of Left Sibling<sup>O</sup><br /><br /></td>
+        </tr>
+
+        <tr>
+          <td colspan="4"><br />Address of Right Sibling<sup>O</sup><br /><br /></td>
+        </tr>
+
+        <tr>
+          <td colspan="4">Key 1 <em>(variable size)</em></td>
+        </tr>
+
+        <tr>
+          <td colspan="4"><br />Address of Child 1<sup>O</sup><br /><br /></td>
+        </tr>
+
+        <tr>
+          <td colspan="4">Key 2 <em>(variable size)</em></td>
+        </tr>
+
+        <tr>
+          <td colspan="4"><br />Address of Child 2<sup>O</sup><br /><br /></td>
+        </tr>
+
+        <tr>
+          <td colspan="4">...</td>
+        </tr>
+
+        <tr>
+          <td colspan="4">Key 2<em>K</em> <em>(variable size)</em></td>
+        </tr>
+
+        <tr>
+          <td colspan="4"><br />Address of Child 2<em>K</em><sup>O</sup><br /><br /></td>
+        </tr>
+
+        <tr>
+          <td colspan="4">Key 2<em>K</em>+1
+            <em>(variable size)</em></td>
+        </tr>
+      </table>
+
+      <table class="note">
+        <tr>
+          <td width="60%">&nbsp;</td>
+          <td width="40%">
+            (Items marked with an &lsquo;O&rsquo; in the above table are
+            of the size specified in the <a href="#SizeOfOffsetsV0">Size
+              of Offsets</a> field in the superblock.)
+        </td></tr>
+      </table>
+
+    </div>
+
+    <br />
+    <div align="center">
+      <table class="desc">
+        <caption>
+          Fields: B-tree Nodes
+        </caption>
+	    <tr>
+          <th width="30%">Field Name</th>
+          <th>Description</th>
+        </tr>
+
+        <tr>
+          <td><p>Signature</p></td>
+          <td>
+            <p>The ASCII character string &ldquo;<code>TREE</code>&rdquo;
+              is used to indicate the beginning of a B-tree node. This
+              gives file consistency checking utilities a better chance
+              of reconstructing a damaged file.
+            </p>
+          </td>
+        </tr>
+
+        <tr>
+          <td><p>Node Type</p></td>
+          <td>
+            <p>Each B-tree points to a particular type of data.
+              This field indicates the type of data as well as
+              implying the maximum degree <em>K</em> of the tree and
+              the size of each Key field.
+
+
+              <table class="list">
+                <tr>
+                  <th width="20%" align="center">Node Type</th>
+                  <th width="80%" align="left">Description</th>
+                </tr>
+                <tr>
+                  <td align="center">0</td>
+                  <td>This tree points to group nodes.</td>
+                </tr>
+                <tr>
+                  <td align="center">1</td>
+                  <td>This tree points to raw data chunk nodes.</td>
+                </tr>
+            </table></p>
+          </td>
+        </tr>
+
+        <tr>
+          <td><p>Node Level</p></td>
+          <td>
+            <p>The node level indicates the level at which this node
+              appears in the tree (leaf nodes are at level zero).  Not
+              only does the level indicate whether child pointers
+              point to sub-trees or to data, but it can also be used
+              to help file consistency checking utilities reconstruct
+              damaged trees.
+            </p>
+          </td>
+        </tr>
+
+        <tr valign="top">
+          <td><p>Entries Used</p></td>
+          <td>
+            <p>This determines the number of children to which this
+              node points.  All nodes of a particular type of tree
+              have the same maximum degree, but most nodes will point
+              to less than that number of children.  The valid child
+              pointers and keys appear at the beginning of the node
+              and the unused pointers and keys appear at the end of
+              the node.  The unused pointers and keys have undefined
+              values.
+            </p>
+          </td>
+        </tr>
+
+        <tr valign="top">
+          <td><p>Address of Left Sibling</p></td>
+          <td>
+            <p>This is the relative file address of the left sibling of
+              the current node.  If the current
+              node is the left-most node at this level then this field
+              is the <a href="#UndefinedAddress">undefined address</a>.
+            </p>
+          </td>
+        </tr>
+
+        <tr valign="top">
+          <td><p>Address of Right Sibling</p></td>
+          <td>
+            <p>This is the relative file address of the right sibling of
+              the current node.  If the current
+              node is the right-most node at this level then this
+              field is the <a href="#UndefinedAddress">undefined address</a>.
+            </p>
+          </td>
+        </tr>
+
+        <tr valign="top">
+          <td><p>Keys and Child Pointers</p></td>
+          <td>
+            <p>Each tree has 2<em>K</em>+1 keys with 2<em>K</em>
+              child pointers interleaved between the keys. The number
+              of keys and child pointers actually containing valid
+              values is determined by the node&rsquo;s <em>Entries
+                Used</em> field. If that field is <em>N</em>, then the
+              B-tree contains <em>N</em> child pointers and
+              <em>N</em>+1 keys.
+            </p>
+          </td>
+        </tr>
+
+        <tr valign="top">
+          <td><p>Key</p></td>
+          <td>
+            <p>The format and size of the key values is determined by
+              the type of data to which this tree points.  The keys are
+              ordered and are boundaries for the contents of the child
+              pointer; that is, the key values represented by child
+              <em>N</em> fall between Key <em>N</em> and Key
+              <em>N</em>+1. Whether the interval is open or closed on
+              each end is determined by the type of data to which the
+              tree points.
+            </p>
+
+            <p>
+              The format of the key depends on the node type.
+              For nodes of node type 0 (group nodes), the key is formatted as
+              follows:
+
+              <table class="list">
+                <tr>
+                  <td width="20%">A single field of
+                    <i><a href="#SizeOfLengthsV0">Size of Lengths</a></i>
+                    bytes:</td>
+                  <td width="80%">Indicates the byte offset into the local heap
+                    for the first object name in the subtree which
+                    that key describes.
+                  </td>
+                </tr>
+              </table>
+            </p>
+
+
+            <p>
+              For nodes of node type 1 (chunked raw data nodes), the key is
+              formatted as follows:
+
+              <table class="list">
+                <tr>
+                  <td width="20%">Bytes 1-4:</td>
+                  <td width="80%">Size of chunk in bytes.</td>
+                </tr>
+                <tr>
+                  <td>Bytes 4-8:</td>
+                  <td>Filter mask, a 32-bit bit field indicating which
+                    filters have been skipped for this chunk.  Each filter
+                    has an index number in the pipeline (starting at 0, with
+                    the first filter to apply) and if that filter is skipped,
+                    the bit corresponding to its index is set.</td>
+                </tr>
+                <tr>
+                  <td>(<em>D + 1</em>) 64-bit fields:</td>
+                  <td>The offset of the
+                    chunk within the dataset where <i>D</i> is the number
+                    of dimensions of the dataset, and the last value is the
+                    offset within the dataset&rsquo;s datatype and should
+                    always be zero. For example, if
+                    a chunk in a 3-dimensional dataset begins at the
+                    position <code>[5,5,5]</code>, there will be three
+                    such 64-bit values, each with the value of
+                    <code>5</code>, followed by a <code>0</code> value.</td>
+                </tr>
+              </table>
+            </p>
+
+          </td>
+        </tr>
+
+        <tr valign="top">
+          <td><p>Child Pointer</p></td>
+          <td>
+            <p>The tree node contains file addresses of subtrees or
+              data depending on the node level.  Nodes at Level 0 point
+              to data addresses, either raw data chunks or group nodes.
+              Nodes at non-zero levels point to other nodes of the
+              same B-tree.
+            </p>
+            <p>For raw data chunk nodes, the child pointer is the address
+              of a single raw data chunk.  For group nodes, the child pointer
+              points to a <a href="#SymbolTable">symbol table</a>, which contains
+              information for multiple symbol table entries.
+            </p>
+          </td>
+        </tr>
+      </table>
+    </div>
+
+    <p>
+      Conceptually, each B-tree node looks like this:</p>
+    <center>
+      <table>
+        <tr valign="top" align="center">
+          <td>key[0]</td><td>&nbsp;</td>
+          <td>child[0]</td><td>&nbsp;</td>
+          <td>key[1]</td><td>&nbsp;</td>
+          <td>child[1]</td><td>&nbsp;</td>
+          <td>key[2]</td><td>&nbsp;</td>
+          <td>...</td><td>&nbsp;</td>
+          <td>...</td><td>&nbsp;</td>
+          <td>key[<i>N</i>-1]</td><td>&nbsp;</td>
+          <td>child[<i>N</i>-1]</td><td>&nbsp;</td>
+          <td>key[<i>N</i>]</td>
+        </tr>
+      </table>
+    </center>
+    <br />
+
+    where child[<i>i</i>] is a pointer to a sub-tree (at a level
+    above Level 0) or to data (at Level 0).
+    Each key[<i>i</i>] describes an <i>item</i> stored by the B-tree
+    (a chunk or an object of a group node).  The range of values
+    represented by child[<i>i</i>] is indicated by key[<i>i</i>]
+    and key[<i>i</i>+1].
+
+
+    <p>The following question must next be answered:
+      &ldquo;Is the value described by key[<i>i</i>] contained in
+      child[<i>i</i>-1] or in child[<i>i</i>]?&rdquo;
+      The answer depends on the type of tree.
+      In trees for groups (node type 0), the object described by
+      key[<i>i</i>] is the greatest object contained in
+      child[<i>i</i>-1] while in chunk trees (node type 1) the
+      chunk described by key[<i>i</i>] is the least chunk in
+      child[<i>i</i>].</p>
+
+    <p>That means that key[0] for group trees is sometimes unused;
+      it points to offset zero in the heap, which is always the
+      empty string and compares as &ldquo;less-than&rdquo; any valid
+      object name.</p>
+
+    <p>And key[<i>N</i>] for chunk trees is sometimes unused;
+      it contains a chunk offset which compares as &ldquo;greater-than&rdquo;
+      any other chunk offset and has a chunk byte size of zero
+      to indicate that it is not actually allocated.</p>
+
+    <h4><a name="V2Btrees">
+        III.A.2. Disk Format: Level 1A2 - Version 2 B-trees</a></h4>
+
+    <p>Version 2 (v2) B-trees are &ldquo;traditional&rdquo; B-trees
+      with one major difference. Instead of just using a simple pointer
+      (or address in the file) to a child of an internal node, the pointer
+      to the child node contains two additional pieces of information:
+      the number of records in the child node itself, and the total number
+      of records in the child node and all its descendants. Storing this
+      additional information allows fast array-like indexing to locate
+      the n<sup>th</sup> record in the B-tree.</p>
+
+    <p>The entry into a version 2 B-tree is a header which contains global
+      information about the structure of the B-tree.  The <em>root node
+        address</em>
+      field in the header points to the B-tree root node, which is either an
+      internal or leaf node, depending on the value in the header&rsquo;s
+      <em>depth</em> field.  An internal node consists of records plus
+      pointers to further leaf or internal nodes in the tree.  A leaf node
+      consists of solely of records.  The format of the records depends on
+      the B-tree type (stored in the header).</p>
+
+    <div align="center">
+      <table class="format">
+        <caption>
+          Layout: Version 2 B-tree Header
+        </caption>
+
+        <tr>
+          <th>byte</th>
+          <th>byte</th>
+          <th>byte</th>
+          <th>byte</th>
+
+        <tr>
+          <td colspan="4">Signature</td>
+        </tr>
+        <tr>
+          <td>Version</td>
+          <td>Type</td>
+          <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+	    </tr>
+	    <tr>
+          <td colspan="4">Node Size</td>
+	    </tr>
+	    <tr>
+          <td colspan="2">Record Size</td>
+          <td colspan="2">Depth</td>
+	    </tr>
+	    <tr>
+          <td>Split Percent</td>
+          <td>Merge Percent</td>
+          <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+	    </tr>
+	    <tr>
+          <td colspan="4"><br />Root Node Address<sup>O</sup><br /><br /></td>
+	    </tr>
+	    <tr>
+          <td colspan="2">Number of Records in Root Node</td>
+          <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+	    </tr>
+	    <tr>
+          <td colspan="4"><br />Total Number of Records in B-tree<sup>L</sup><br /><br /></td>
+	    </tr>
+	    <tr>
+          <td colspan="4">Checksum</td>
+	    </tr>
+      </table>
+
+      <table class="note">
+        <tr>
+          <td width="60%">&nbsp;</td>
+          <td width="40%">
+            (Items marked with an &lsquo;O&rsquo; in the above table are
+            of the size specified in the <a href="#SizeOfOffsetsV0">Size
+              of Offsets</a> field in the superblock.)
+        </td></tr>
+        <tr>
+          <td>&nbsp;</td>
+          <td>
+            (Items marked with an &lsquo;L&rsquo; in the above table are
+            of the size specified in the <a href="#SizeOfLengthsV0">Size
+              of Lengths</a> field in the superblock.)
+        </td></tr>
+      </table>
+
+    </div>
+
+    <br />
+    <div align="center">
+      <table class="desc">
+        <caption>
+          Fields: Version 2 B-tree Header
+        </caption>
+
+        <tr>
+          <th width="30%">Field Name</th>
+          <th>Description</th>
+        </tr>
+
+        <tr>
+          <td><p>Signature</p></td>
+          <td>
+            <p>The ASCII character string &ldquo;<code>BTHD</code>&rdquo;
+              is used to indicate the header of a version 2 (v2) B-tree
+              node.
+            </p>
+          </td>
+        </tr>
+
+        <tr>
+          <td><p>Version</p></td>
+          <td>
+            <p>The version number for this B-tree header.  This document
+              describes version 0.
+            </p>
+          </td>
+        </tr>
+
+        <tr>
+          <td><p>Type</p></td>
+          <td>
+            <p>This field indicates the type of B-tree:
+              <table class="list">
+                <tr>
+                  <th width="20%" align="center">Value</th>
+                  <th width="80%" align="left">Description</th>
+                </tr>
+                <tr>
+                  <td align="center">0</td>
+                  <td>This B-tree is used for testing only. This
+                    value should <em>not</em> be used for storing
+                    records in actual HDF5 files.
+                  </td>
+                </tr>
+                <tr>
+                  <td align="center">1</td>
+                  <td>This B-tree is used for indexing indirectly accessed,
+                    non-filtered &lsquo;huge&rsquo; fractal heap objects.
+                  </td>
+                </tr>
+                <tr>
+                  <td align="center">2</td>
+                  <td>This B-tree is used for indexing indirectly accessed,
+                    filtered &lsquo;huge&rsquo; fractal heap objects.
+                  </td>
+                </tr>
+                <tr>
+                  <td align="center">3</td>
+                  <td>This B-tree is used for indexing directly accessed,
+                    non-filtered &lsquo;huge&rsquo; fractal heap objects.
+                  </td>
+                </tr>
+                <tr>
+                  <td align="center">4</td>
+                  <td>This B-tree is used for indexing directly accessed,
+                    filtered &lsquo;huge&rsquo; fractal heap objects.
+                  </td>
+                </tr>
+                <tr>
+                  <td align="center">5</td>
+                  <td>This B-tree is used for indexing the &lsquo;name&rsquo; field for
+                    links in indexed groups.
+                  </td>
+                </tr>
+                <tr>
+                  <td align="center">6</td>
+                  <td>This B-tree is used for indexing the &lsquo;creation order&rsquo;
+                    field for links in indexed groups.
+                  </td>
+                </tr>
+                <tr>
+                  <td align="center">7</td>
+                  <td>This B-tree is used for indexing shared object header
+                    messages.
+                  </td>
+                </tr>
+                <tr>
+                  <td align="center">8</td>
+                  <td>This B-tree is used for indexing the &lsquo;name&rsquo; field for
+                    indexed attributes.
+                  </td>
+                </tr>
+                <tr>
+                  <td align="center">9</td>
+                  <td>This B-tree is used for indexing the &lsquo;creation order&rsquo;
+                    field for indexed attributes.
+                  </td>
+                </tr>
+
+                <tr>
+                  <td align="center">10</td>
+                  <td>This B-tree is used for indexing chunks of
+                    datasets with no filters and with more than one
+                    dimension of unlimited extent.
+                  </td>
+                </tr>
+
+                <tr>
+                  <td align="center">11</td>
+                  <td>This B-tree is used for indexing chunks of
+                    datasets with filters and more than one dimension
+                    of unlimited extent.
+                  </td>
+                </tr>
+            </table></p>
+            <p>The format of records for each type is described below.</p>
+          </td>
+        </tr>
+
+        <tr valign="top">
+          <td><p>Node Size</p></td>
+          <td>
+            <p>This is the size in bytes of all B-tree nodes.
+            </p>
+          </td>
+        </tr>
+
+        <tr valign="top">
+          <td><p>Record Size</p></td>
+          <td>
+            <p>This field is the size in bytes of the B-tree record.
+            </p>
+          </td>
+        </tr>
+
+        <tr valign="top">
+          <td><p>Depth</p></td>
+          <td>
+            <p>This is the depth of the B-tree.
+            </p>
+          </td>
+        </tr>
+
+        <tr valign="top">
+          <td><p>Split Percent</p></td>
+          <td>
+            <p>The percent full that a node needs to increase above before it
+              is split.
+            </p>
+          </td>
+        </tr>
+
+        <tr valign="top">
+          <td><p>Merge Percent</p></td>
+          <td>
+            <p>The percent full that a node needs to be decrease below before it
+              is split.
+            </p>
+          </td>
+        </tr>
+
+        <tr valign="top">
+          <td><p>Root Node Address</p></td>
+          <td>
+            <p>This is the address of the root B-tree node.  A B-tree with
+              no records will have the <a href="#UndefinedAddress">undefined
+                address</a> in this field.
+            </p>
+          </td>
+        </tr>
+
+        <tr valign="top">
+          <td><p>Number of Records in Root Node</p></td>
+          <td>
+            <p>This is the number of records in the root node.
+            </p>
+          </td>
+        </tr>
+
+        <tr valign="top">
+          <td><p>Total Number of Records in B-tree</p></td>
+          <td>
+            <p>This is the total number of records in the entire B-tree.
+            </p>
+          </td>
+        </tr>
+
+        <tr valign="top">
+          <td><p>Checksum</p></td>
+          <td>
+            <p>This is the checksum for the B-tree header.
+            </p>
+          </td>
+        </tr>
+      </table>
+    </div>
+
+    <br />
+    <br />
+    <br />
+    <div align="center">
+      <table class="format">
+        <caption>
+          Layout: Version 2 B-tree Internal Node
+        </caption>
+
+        <tr>
+          <th>byte</th>
+          <th>byte</th>
+          <th>byte</th>
+          <th>byte</th>
+        </tr>
+
+        <tr>
+          <td colspan="4">Signature</td>
+        </tr>
+        <tr>
+          <td>Version</td>
+          <td>Type</td>
+          <td colspan="2">Records 0, 1, 2...N-1 <em>(variable size)</em></td>
+        </tr>
+	    <tr>
+	      <td colspan="4"><br />Child Node Pointer 0<sup>O</sup><br /><br /></td>
+	    </tr>
+        <tr>
+	      <td colspan="4"><br />Number of Records N<sub>0</sub> for Child
+            Node 0 <em>(variable size)</em></td>
+	    </tr>
+	    <tr>
+	      <td colspan="4"><br />Total Number of Records for Child Node 0
+            <em>(optional, variable size)</em></td>
+	    </tr>
+	    <tr>
+	      <td colspan="4"><br />Child Node Pointer 1<sup>O</sup><br /><br /></td>
+	    </tr>
+	    <td colspan="4"><br />Number of Records N<sub>1</sub> for
+          Child Node 1 <em>(variable size)</em></td>
+</tr>
+<tr>
+  <td colspan="4"><br />Total Number of Records for Child Node 1
+    <em>(optional, variable size)</em></td>
+</tr>
+<tr>
+  <td colspan="4">...</td>
+</tr>
+<tr>
+  <td colspan="4"><br />Child Node Pointer N<sup>O</sup><br /><br /></td>
+</tr>
+<tr>
+  <td colspan="4"><br />Number of Records N<sub>n</sub> for
+    Child Node N <em>(variable size)</em></td>
+</tr>
+<tr>
+  <td colspan="4"><br />Total Number of Records for Child Node N
+    <em>(optional, variable size)</em></td>
+</tr>
+<tr>
+  <td colspan="4">Checksum</td>
+</tr>
+</table>
+
+<table class="note">
+  <tr>
+    <td width="60%">&nbsp;</td>
+    <td width="40%">
+      (Items marked with an &lsquo;O&rsquo; in the above table are
+      of the size specified in the <a href="#SizeOfOffsetsV0">Size
+        of Offsets</a> field in the superblock.)
+  </td></tr>
+</table>
+</div>
+
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Version 2 B-tree Internal Node
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+    </tr>
+
+    <tr>
+      <td><p>Signature</p></td>
+      <td>
+        <p>The ASCII character string &ldquo;<code>BTIN</code>&rdquo; is
+          used to indicate the internal node of a B-tree.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Version</p></td>
+      <td>
+        <p>The version number for this B-tree internal node.
+	      This document describes version 0.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Type</p></td>
+      <td>
+        <p>This field is the type of the B-tree node.  It should always
+          be the same as the B-tree type in the header.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Records</p></td>
+      <td>
+        <p>The size of this field is determined by the number of records
+	      for this node and the record size (from the header).  The format
+          of records depends on the type of B-tree.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Child Node Pointer</p></td>
+      <td>
+        <p>This field is the address of the child node pointed to by the
+          internal node.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Number of Records in Child Node</p></td>
+      <td>
+        <p>This is the number of records in the child node pointed to by
+          the corresponding <em>Node Pointer</em>.
+        </p>
+        <p>The number of bytes used to store this field is determined by
+          the maximum possible number of records able to be stored in the
+          child node.
+        </p>
+        <p>
+          The maximum number of records in a child node is computed
+          in the following way:
+
+          <ul>
+            <li>Subtract the fixed size overhead for
+              the child node (for example, its signature, version,
+              checksum, and so on and <em>one</em> pointer triplet
+              of information for the child node (because there is one
+              more pointer triplet than records in each internal node))
+              from the size of nodes for the B-tree. </li>
+            <li>Divide that result by the size of a record plus the
+              pointer triplet of information stored to reach each
+              child node from this node.</li>
+          </ul>
+
+        </p>
+        <p>
+          Note that leaf nodes do not encode any
+          child pointer triplets, so the maximum number of records in a
+          leaf node is just the node size minus the leaf node overhead,
+          divided by the record size.
+        </p>
+        <p>
+          Also note that the first level of internal nodes above the
+          leaf nodes do not encode the <em>Total Number of Records in Child
+            Node</em> value in the child pointer triplets (since it is the
+          same as the <em>Number of Records in Child Node</em>), so the
+          maximum number of records in these nodes is computed with the
+          equation above, but using (<em>Child Pointer</em>, <em>Number of
+            Records in Child Node</em>) pairs instead of triplets.
+        </p>
+        <p>
+          The number of
+          bytes used to encode this field is the least number of bytes
+          required to encode the maximum number of records in a child
+          node value for the child nodes below this level
+          in the B-tree.
+        </p>
+        <p>
+          For example, if the maximum number of child records is
+          123, one byte will be used to encode these values in this
+          node; if the maximum number of child records is
+          20000, two bytes will be used to encode these values in this
+          node; and so on. The maximum number of bytes used to
+          encode these values is 8 (in other words, an unsigned
+          64-bit integer).
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Total Number of Records in Child Node</p></td>
+      <td>
+        <p>This is the total number of records for the node pointed to by
+          the corresponding <em>Node Pointer</em> and all its children.
+          This field exists only in nodes whose depth in the B-tree node
+          is greater than 1 (in other words, the &ldquo;twig&rdquo;
+          internal nodes, just above leaf nodes, do not store this
+          field in their child node pointers).
+        </p>
+        <p>The number of bytes used to store this field is determined by
+          the maximum possible number of records able to be stored in the
+          child node and its descendants.
+        </p>
+        <p>
+          The maximum possible number of records able to be stored in a
+          child node and its descendants is computed iteratively, in the
+          following way:  The maximum number of records in a leaf node
+          is computed, then that value is used to compute the maximum
+          possible number of records in the first level of internal nodes
+          above the leaf nodes.  Multiplying these two values together
+          determines the maximum possible number of records in child node
+          pointers for the level of nodes two levels above leaf nodes.
+          This process is continued up to any level in the B-tree.
+        </p>
+        <p>
+          The number of bytes used to encode this value is computed in
+          the same way as for the <em>Number of Records in Child Node</em>
+          field.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Checksum</p></td>
+      <td>
+        <p>This is the checksum for this node.
+        </p>
+      </td>
+    </tr>
+
+  </table>
+</div>
+
+<br />
+<br />
+<br />
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Version 2 B-tree Leaf Node
+    </caption>
+
+    <tr>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+    </tr>
+
+    <tr>
+      <td colspan="4">Signature</td>
+    </tr>
+    <tr>
+      <td>Version</td>
+      <td>Type</td>
+      <td colspan="2">Record 0, 1, 2...N-1 <em>(variable size)</em></td>
+	</tr>
+	<tr>
+	  <td colspan="4">Checksum</td>
+    </tr>
+  </table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Version 2 B-tree Leaf Node
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+    </tr>
+
+    <tr>
+      <td><p>Signature</p></td>
+      <td>
+        <p>The ASCII character string &ldquo;<code>BTLF</code>&ldquo;
+          is used to indicate the leaf node of a version 2 (v2) B-tree.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Version</p></td>
+      <td>
+        <p>The version number for this B-tree leaf node.
+	      This document describes version 0.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Type</p></td>
+      <td>
+        <p>This field is the type of the B-tree node.  It should always
+          be the same as the B-tree type in the header.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Records</p></td>
+      <td>
+        <p>The size of this field is determined by the number of records
+	      for this node and the record size (from the header).  The format
+          of records depends on the type of B-tree.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Checksum</p></td>
+      <td>
+        <p>This is the checksum for this node.
+        </p>
+      </td>
+    </tr>
+
+  </table>
+</div>
+
+<br />
+<br />
+<br />
+<p>The record layout for each stored (in other words, non-testing)
+  B-tree type is as follows:</p>
+
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Version 2 B-tree, Type 1 Record Layout - Indirectly
+      Accessed, Non-filtered, &lsquo;Huge&rsquo; Fractal Heap Objects
+    </caption>
+
+    <tr>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+	</tr>
+
+    <tr>
+      <td colspan="4"><br />Huge Object Address<sup>O</sup><br /><br /></td>
+    </tr>
+    <tr>
+      <td colspan="4"><br />Huge Object Length<sup>L</sup><br /><br /></td>
+    </tr>
+    <tr>
+      <td colspan="4"><br />Huge Object ID<sup>L</sup><br /><br /></td>
+    </tr>
+  </table>
+
+  <table class="note">
+    <tr>
+      <td width="60%">&nbsp;</td>
+      <td width="40%">
+        (Items marked with an &lsquo;O&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfOffsetsV0">Size
+          of Offsets</a> field in the superblock.)
+    </td></tr>
+    <tr>
+      <td>&nbsp;</td>
+      <td>
+        (Items marked with an &lsquo;L&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfLengthsV0">Size
+          of Lengths</a> field in the superblock.)
+    </td></tr>
+  </table>
+
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Version 2 B-tree, Type 1 Record Layout - Indirectly
+      Accessed, Non-filtered, &lsquo;Huge&rsquo; Fractal Heap Objects
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+    </tr>
+
+    <tr>
+      <td><p>Huge Object Address</p></td>
+      <td>
+        <p>The address of the huge object in the file.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Huge Object Length</p></td>
+      <td>
+        <p>The length of the huge object in the file.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Huge Object ID</p></td>
+      <td>
+        <p>The heap ID for the huge object.
+        </p>
+      </td>
+    </tr>
+
+  </table>
+</div>
+
+<br />
+<br />
+<br />
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Version 2 B-tree, Type 2 Record Layout - Indirectly
+      Accessed, Filtered, &lsquo;Huge&rsquo; Fractal Heap Objects
+    </caption>
+
+    <tr>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Filtered Huge Object Address<sup>O</sup><br /><br /></td>
+    </tr>
+    <tr>
+      <td colspan="4"><br />Filtered Huge Object Length<sup>L</sup><br /><br /></td>
+    </tr>
+    <tr>
+      <td colspan="4">Filter Mask</td>
+    </tr>
+    <tr>
+      <td colspan="4"><br />Filtered Huge Object Memory Size<sup>L</sup><br /><br /></td>
+    </tr>
+    <tr>
+      <td colspan="4"><br />Huge Object ID<sup>L</sup><br /><br /></td>
+    </tr>
+  </table>
+
+  <table class="note">
+    <tr>
+      <td width="60%">&nbsp;</td>
+      <td width="40%">
+        (Items marked with an &lsquo;O&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfOffsetsV0">Size
+          of Offsets</a> field in the superblock.)
+    </td></tr>
+    <tr>
+      <td>&nbsp;</td>
+      <td>
+        (Items marked with an &lsquo;L&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfLengthsV0">Size
+          of Lengths</a> field in the superblock.)
+    </td></tr>
+  </table>
+
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Version 2 B-tree, Type 2 Record Layout - Indirectly
+      Accessed, Filtered, &lsquo;Huge&rsquo; Fractal Heap Objects
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+    </tr>
+
+    <tr>
+      <td><p>Filtered Huge Object Address</p></td>
+      <td>
+        <p>The address of the filtered huge object in the file.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Filtered Huge Object Length</p></td>
+      <td>
+        <p>The length of the filtered huge object in the file.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Filter Mask</p></td>
+      <td>
+        <p>A 32-bit bit field indicating which filters have been skipped for
+          this chunk.  Each filter has an index number in the pipeline
+          (starting at 0, with the first filter to apply) and if that
+          filter is skipped, the bit corresponding to its index is set.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Filtered Huge Object Memory Size</p></td>
+      <td>
+        <p>The size of the de-filtered huge object in memory.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Huge Object ID</p></td>
+      <td>
+        <p>The heap ID for the huge object.
+        </p>
+      </td>
+    </tr>
+
+  </table>
+</div>
+
+<br />
+<br />
+<br />
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Version 2 B-tree, Type 3 Record Layout - Directly
+      Accessed, Non-filtered, &lsquo;Huge&rsquo; Fractal Heap Objects
+    </caption>
+
+    <tr>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+	</tr>
+
+    <tr>
+      <td colspan="4"><br />Huge Object Address<sup>O</sup><br /><br /></td>
+    </tr>
+    <tr>
+      <td colspan="4"><br />Huge Object Length<sup>L</sup><br /><br /></td>
+    </tr>
+  </table>
+
+  <table class="note">
+    <tr>
+      <td width="60%">&nbsp;</td>
+      <td width="40%">
+        (Items marked with an &lsquo;O&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfOffsetsV0">Size
+          of Offsets</a> field in the superblock.)
+    </td></tr>
+    <tr>
+      <td>&nbsp;</td>
+      <td>
+        (Items marked with an &lsquo;L&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfLengthsV0">Size
+          of Lengths</a> field in the superblock.)
+    </td></tr>
+  </table>
+
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Version 2 B-tree, Type 3 Record Layout - Directly
+      Accessed, Non-filtered, &lsquo;Huge&rsquo; Fractal Heap Objects
+    </caption>
+    <tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+    </tr>
+
+    <tr>
+      <td><p>Huge Object Address</p></td>
+      <td>
+        <p>The address of the huge object in the file.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Huge Object Length</p></td>
+      <td>
+        <p>The length of the huge object in the file.
+        </p>
+      </td>
+    </tr>
+
+  </table>
+</div>
+
+<br />
+<br />
+<br />
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Version 2 B-tree, Type 4 Record Layout - Directly
+      Accessed, Filtered, &lsquo;Huge&rsquo; Fractal Heap Objects
+    </caption>
+
+    <tr>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Filtered Huge Object Address<sup>O</sup><br /><br /></td>
+    </tr>
+    <tr>
+      <td colspan="4"><br />Filtered Huge Object Length<sup>L</sup><br /><br /></td>
+    </tr>
+    <tr>
+      <td colspan="4">Filter Mask</td>
+    </tr>
+    <tr>
+      <td colspan="4"><br />Filtered Huge Object Memory Size<sup>L</sup><br /><br /></td>
+    </tr>
+  </table>
+
+  <table class="note">
+    <tr>
+      <td width="60%">&nbsp;</td>
+      <td width="40%">
+        (Items marked with an &lsquo;O&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfOffsetsV0">Size
+          of Offsets</a> field in the superblock.)
+    </td></tr>
+    <tr>
+      <td>&nbsp;</td>
+      <td>
+        (Items marked with an &lsquo;L&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfLengthsV0">Size
+          of Lengths</a> field in the superblock.)
+    </td></tr>
+  </table>
+
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Version 2 B-tree, Type 4 Record Layout - Directly
+      Accessed, Filtered, &lsquo;Huge&rsquo; Fractal Heap Objects
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+    </tr>
+
+    <tr>
+      <td><p>Filtered Huge Object Address</p></td>
+      <td>
+        <p>The address of the filtered huge object in the file.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Filtered Huge Object Length</p></td>
+      <td>
+        <p>The length of the filtered huge object in the file.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Filter Mask</p></td>
+      <td>
+        <p>A 32-bit bit field indicating which filters have been skipped for
+          this chunk.  Each filter has an index number in the pipeline
+          (starting at 0, with the first filter to apply) and if that
+          filter is skipped, the bit corresponding to its index is set.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Filtered Huge Object Memory Size</p></td>
+      <td>
+        <p>The size of the de-filtered huge object in memory.
+        </p>
+      </td>
+    </tr>
+
+  </table>
+</div>
+
+<br />
+<br />
+<br />
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Version 2 B-tree, Type 5 Record Layout - Link Name
+      for Indexed Group
+    </caption>
+
+    <tr>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+	</tr>
+
+    <tr>
+      <td colspan="4">Hash of Name</td>
+    </tr>
+    <tr>
+      <td colspan="4">ID <em>(bytes 1-4)</em></td>
+	</tr>
+
+    <tr>
+      <td colspan="3">ID <em>(bytes 5-7)</em></td>
+	</tr>
+
+  </table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Version 2 B-tree, Type 5 Record Layout - Link Name
+      for Indexed Group
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+    </tr>
+
+    <tr>
+      <td><p>Hash</p></td>
+      <td>
+        <p>This field is hash value of the name for the link.  The hash
+          value is the Jenkins&rsquo; lookup3 checksum algorithm applied to
+          the link&rsquo;s name.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>ID</p></td>
+      <td>
+        <p>This is a 7-byte sequence of bytes and is the heap ID for the
+          link record in the group&rsquo;s fractal heap.</p>
+      </td>
+    </tr>
+
+  </table>
+</div>
+
+<br />
+<br />
+<br />
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Version 2 B-tree, Type 6 Record Layout - Creation
+      Order for Indexed Group
+    </caption>
+
+    <tr>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Creation Order
+        <em>(8 bytes)</em><br /><br /></td>
+    </tr>
+    <tr>
+      <td colspan="4">ID <em>(bytes 1-4)</em></td>
+    </tr>
+    <tr>
+      <td colspan="3">ID <em>(bytes 5-7)</em></td>
+    </tr>
+  </table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Version 2 B-tree, Type 6 Record Layout - Creation
+      Order for Indexed Group
+    </caption>
+    <tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+    </tr>
+
+    <tr>
+      <td><p>Creation Order</p></td>
+      <td>
+        <p>This field is the creation order value for the link.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>ID</p></td>
+      <td>
+        <p>This is a 7-byte sequence of bytes and is the heap ID for the
+          link record in the group&rsquo;s fractal heap.</p>
+      </td>
+    </tr>
+
+  </table>
+</div>
+
+<br />
+<br />
+<br />
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Version 2 B-tree, Type 7 Record Layout - Shared
+      Object Header Messages (Sub-type 0 - Message in Heap)
+    </caption>
+
+    <tr>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+    </tr>
+
+    <tr>
+      <td colspan>Message Location</td>
+      <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+    </tr>
+    <tr>
+      <td colspan="4">Hash</td>
+    </tr>
+    <tr>
+      <td colspan="4">Reference Count</td>
+    </tr>
+    <tr>
+      <td colspan="4"><br />Heap ID <em>(8 bytes)</em><br /><br /></td>
+    </tr>
+  </table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Version 2 B-tree, Type 7 Record Layout - Shared
+      Object Header Messages (Sub-type 0 - Message in Heap)
+    </caption>
+    <tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+    </tr>
+
+    <tr>
+      <td><p>Message Location</p></td>
+      <td>
+        <p>This field Indicates the location where the message is stored:
+          <table class="list">
+            <tr>
+              <th width="20%" align="center">Value</th>
+              <th width="80%" align="left">Description</th>
+            </tr>
+            <tr>
+              <td align="center">0</td>
+              <td>Shared message is stored in shared message index heap.
+              </td>
+            </tr>
+            <tr>
+              <td align="center">1</td>
+              <td>Shared message is stored in object header.
+              </td>
+            </tr>
+        </table></p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Hash</p></td>
+      <td>
+        <p>This field is hash value of the shared message.  The hash
+          value is the Jenkins&rsquo; lookup3 checksum algorithm applied to
+          the shared message.</p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Reference Count</p></td>
+      <td>
+        <p>The number of objects which reference this message.</p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Heap ID</p></td>
+      <td>
+        <p>This is an 8-byte sequence of bytes and is the heap ID for the
+          shared message in the shared message index&rsquo;s fractal heap.</p>
+      </td>
+    </tr>
+
+  </table>
+</div>
+
+<br />
+<br />
+<br />
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Version 2 B-tree, Type 7 Record Layout - Shared
+      Object Header Messages (Sub-type 1 - Message in Object Header)
+    </caption>
+
+    <tr>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+    </tr>
+
+    <tr>
+      <td colspan>Message Location</td>
+      <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+    </tr>
+    <tr>
+      <td colspan="4">Hash</td>
+    </tr>
+    <tr>
+      <td>Reserved (zero)</td>
+      <td>Message Type</td>
+      <td colspan="2">Object Header Index</td>
+    </tr>
+    <tr>
+      <td colspan="4"><br />Object Header Address<sup>O</sup><br /><br /></td>
+    </tr>
+  </table>
+
+  <table class="note">
+    <tr>
+      <td width="60%">&nbsp;</td>
+      <td width="40%">
+        (Items marked with an &lsquo;O&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfOffsetsV0">Size
+          of Offsets</a> field in the superblock.)
+    </td></tr>
+  </table>
+
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Version 2 B-tree, Type 7 Record Layout - Shared
+      Object Header Messages (Sub-type 1 - Message in Object Header)
+    </caption>
+    <tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+    </tr>
+
+    <tr>
+      <td><p>Message Location</p></td>
+      <td>
+        <p>This field Indicates the location where the message is stored:
+          <table class="list">
+            <tr>
+              <th width="20%" align="center">Value</th>
+              <th width="80%" align="left">Description</th>
+            </tr>
+            <tr>
+              <td align="center">0</td>
+              <td>Shared message is stored in shared message index heap.
+              </td>
+            </tr>
+            <tr>
+              <td align="center">1</td>
+              <td>Shared message is stored in object header.
+              </td>
+            </tr>
+        </table></p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Hash</p></td>
+      <td>
+        <p>This field is hash value of the shared message.  The hash
+          value is the Jenkins&rsquo; lookup3 checksum algorithm applied to
+          the shared message.</p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Message Type</p></td>
+      <td>
+        <p>The object header message type of the shared message.</p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Object Header Index</p></td>
+      <td>
+        <p>This field indicates that the shared message is the n<sup>th</sup> message
+          of its type in the specified object header.</p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Object Header Address</p></td>
+      <td>
+        <p>The address of the object header containing the shared message.</p>
+      </td>
+    </tr>
+
+  </table>
+</div>
+
+<br />
+<br />
+<br />
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Version 2 B-tree, Type 8 Record Layout - Attribute
+      Name for Indexed Attributes
+    </caption>
+
+    <tr>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Heap ID <em>(8 bytes)</em><br /><br /></td>
+    </tr>
+    <tr>
+      <td colspan>Message Flags</td>
+      <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+    </tr>
+    <tr>
+      <td colspan="4">Creation Order</td>
+    </tr>
+    <tr>
+      <td colspan="4">Hash of Name</td>
+    </tr>
+  </table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Version 2 B-tree, Type 8 Record Layout - Attribute
+      Name for Indexed Attributes
+    </caption>
+    <tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+    </tr>
+
+    <tr>
+      <td><p>Heap ID</p></td>
+      <td>
+        <p>This is an 8-byte sequence of bytes and is the heap ID for the
+          attribute in the object&rsquo;s attribute fractal heap.</p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Message Flags</p></td>
+      <td><p>The object header message flags for the attribute message.</p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Creation Order</p></td>
+      <td>
+        <p>This field is the creation order value for the attribute.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Hash</p></td>
+      <td>
+        <p>This field is hash value of the name for the attribute.  The hash
+          value is the Jenkins&rsquo; lookup3 checksum algorithm applied to
+          the attribute&rsquo;s name.
+        </p>
+      </td>
+    </tr>
+
+  </table>
+</div>
+
+<br />
+<br />
+<br />
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Version 2 B-tree, Type 9 Record Layout - Creation
+      Order for Indexed Attributes
+    </caption>
+
+    <tr>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Heap ID <em>(8 bytes)</em><br /><br /></td>
+    </tr>
+    <tr>
+      <td colspan>Message Flags</td>
+      <td colspan="3" bgcolor="#DDDDDD">
+        <em>This space inserted only to align table nicely</em></td>
+    </tr>
+    <tr>
+      <td colspan="4">Creation Order</td>
+    </tr>
+  </table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Version 2 B-tree, Type 9 Record Layout - Creation
+      Order for Indexed Attributes
+    </caption>
+    <tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+    </tr>
+
+    <tr>
+      <td><p>Heap ID</p></td>
+      <td>
+        <p>This is an 8-byte sequence of bytes and is the heap ID for the
+          attribute in the object&rsquo;s attribute fractal heap.</p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Message Flags</p></td>
+      <td>
+        <p>The object header message flags for the attribute message.</p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Creation Order</p></td>
+      <td>
+        <p>This field is the creation order value for the attribute.
+        </p>
+      </td>
+    </tr>
+
+  </table>
+</div>
+
+<br />
+<br />
+<br />
+<a name="V2BtType10"></a>
+  <div align="center">
+    <table class="format">
+      <caption>
+        <a name="V2BtreesType10"></a>
+          Layout: Version 2 B-tree, Type 10 Record Layout -
+          Non-filtered Dataset Chunks
+      </caption>
+
+      <tr>
+        <th>byte</th>
+        <th>byte</th>
+        <th>byte</th>
+        <th>byte</th>
+	  </tr>
+
+	  <tr>
+        <td colspan="4"><br />Address<sup>O</sup><br /><br /></td>
+	  </tr>
+
+	  <tr>
+        <td colspan="4"><br />Dimension 0 Scaled Offset
+          <em>(8 bytes)</em><br /><br /></td>
+	  </tr>
+
+	  <tr>
+        <td colspan="4"><br />Dimension 1 Scaled Offset
+          <em>(8 bytes)</em><br /><br /></td>
+	  </tr>
+
+	  <tr>
+        <td colspan="4"><br />...<br /><br /></td>
+	  </tr>
+
+	  <tr>
+        <td colspan="4"><br />Dimension #n Scaled Offset
+          <em>(8 bytes)</em><br /><br /></td>
+	  </tr>
+
+    </table>
+
+    <table class="note">
+      <tr>
+        <td width="60%">&nbsp;</td>
+        <td width="40%">
+          (Items marked with an &lsquo;O&rsquo; in the above table are
+          of the size specified in the <a href="#SizeOfOffsetsV0">Size
+            of Offsets</a> field in the superblock.)
+      </td></tr>
+    </table>
+
+  </div>
+
+  <br />
+  <div align="center">
+    <table class="desc">
+      <caption>
+        Fields: Version 2 B-tree, Type 10 Record Layout -
+        Non-filtered Dataset Chunks
+</caption>
+<tr>
+  <th width="30%">Field Name</th>
+  <th>Description</th>
+</tr>
+
+<tr>
+  <td><p>Address</p></td>
+  <td>
+    <p>This field is the address of the dataset chunk in the file.</p>
+  </td>
+</tr>
+
+<tr>
+  <td><p>Dimension #n Scaled Offset</p></td>
+  <td>
+    <p>This field is the scaled offset of the chunk within the
+      dataset. <em>n</em> is the number of dimensions for the
+      dataset. The first scaled offset stored in the list is for
+      the slowest changing dimension, and the last scaled offset
+      stored is for the fastest changing dimension. Scaled offset
+      is calculated by dividing the chunk dimension sizes into
+      the chunk offsets.</p>
+  </td>
+</tr>
+
+</table>
+</div>
+
+<br />
+<br />
+<br />
+<div align="center">
+  <table class="format">
+    <caption>
+      <a name="V2BtreesType11"></a>
+        Layout: Version 2 B-tree, Type 11 Record Layout - Filtered
+        Dataset Chunks
+    </caption>
+
+    <tr>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+	</tr>
+
+	<tr>
+      <td colspan="4"><br />Address<sup>O</sup><br /><br /></td>
+	</tr>
+
+	<tr>
+      <td colspan="4"><br />Chunk Size
+        <em>(variable size; at most 8 bytes)</em><br /><br /></td>
+	</tr>
+
+	<tr>
+      <td colspan="4">Filter Mask</td>
+	</tr>
+
+	<tr>
+      <td colspan="4"><br />Dimension 0 Scaled Offset
+        <em>(8 bytes)</em><br /><br /></td>
+	</tr>
+
+	<tr>
+      <td colspan="4"><br />Dimension 1 Scaled Offset
+        <em>(8 bytes)</em><br /><br /></td>
+	</tr>
+
+	<tr>
+      <td colspan="4"><br />...<br /><br /></td>
+	</tr>
+
+	<tr>
+      <td colspan="4"><br />Dimension #n Scaled Offset
+        <em>(8 bytes)</em><br /><br /></td>
+	</tr>
+
+  </table>
+
+  <table class="note">
+    <tr>
+      <td width="60%">&nbsp;</td>
+      <td width="40%">
+        (Items marked with an &lsquo;O&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfOffsetsV0">Size
+          of Offsets</a> field in the superblock.)
+    </td></tr>
+  </table>
+
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Version 2 B-tree, Type 11 Record Layout - Filtered
+      Dataset Chunks
+</caption>
+<tr>
+  <th width="30%">Field Name</th>
+  <th>Description</th>
+</tr>
+
+<tr>
+  <td><p>Address</p></td>
+  <td>
+    <p>This field is the address of the dataset chunk in the file.</p>
+  </td>
+</tr>
+
+<tr>
+  <td><p>Chunk Size</p></td>
+  <td>
+    <p>This field is the size of the dataset chunk in bytes.</p>
+  </td>
+</tr>
+
+<tr>
+  <td><p>Filter Mask</p></td>
+  <td>
+    <p>This field is the filter mask which indicates the filter
+	  to skip for the dataset chunk.  Each filter has an index
+	  number in the pipeline and if that filter is skipped,
+	  the bit corresponding to its index is set.</p>
+  </td>
+</tr>
+
+<tr>
+  <td><p>Dimension #n Scaled Offset</p></td>
+  <td>
+    <p>This field is the scaled offset of the chunk within
+      the dataset. <em>n</em> is the number of dimensions for
+      the dataset. The first scaled offset stored in the list
+      is for the slowest changing dimension, and the last scaled
+      offset stored is for the fastest changing dimension.</p>
+  </td>
+</tr>
+
+</table>
+</div>
+
+<h3><a name="SymbolTable">
+    III.B. Disk Format: Level 1B - Group Symbol Table Nodes</a></h3>
+
+<p>A group is an object internal to the file that allows
+  arbitrary nesting of objects within the file (including other
+  groups). A group maps a set of link names in the group to a set
+  of relative file addresses of objects in the file. Certain metadata
+  for an object to which the group points can be cached in the
+  group&rsquo;s symbol table entry in addition to being in the
+  object&rsquo;s header.</p>
+
+<p>An HDF5 object name space can be stored hierarchically by
+  partitioning the name into components and storing each
+  component as a link in a group.  The link for a
+  non-ultimate component points to the group containing
+  the next component.  The link for the last
+  component points to the object being named.</p>
+
+<p>One implementation of a  group is a collection of symbol table
+  nodes indexed by a B-tree. Each symbol table node contains entries
+  for one or more links. If an attempt is made to add a link to an
+  already full symbol table node containing 2<em>K</em> entries, then
+  the node is split and one node contains <em>K</em> symbols and the
+  other contains <em>K</em>+1 symbols.</p>
+
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Symbol Table Node (A Leaf of a B-tree)
+    </caption>
+
+    <tr>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+    </tr>
+
+    <tr>
+      <td colspan="4">Signature</td>
+    </tr>
+
+    <tr>
+      <td>Version Number</td>
+      <td>Reserved <em>(zero)</em></td>
+      <td colspan="2">Number of Symbols</td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br /><br />Group Entries<br /><br /><br /></td>
+    </tr>
+  </table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Symbol Table Node (A Leaf of a B-tree)
+    </caption>
+    <tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+    </tr>
+
+    <tr>
+      <td><p>Signature</p></td>
+      <td>
+        <p>The ASCII character string &ldquo;<code>SNOD</code>&rdquo; is
+          used to indicate the
+          beginning of a symbol table node.  This gives file
+          consistency checking utilities a better chance of
+          reconstructing a damaged file.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Version Number</p></td>
+      <td>
+        <p>The version number for the symbol table node.  This
+          document describes version 1. (There is no version &lsquo;0&rsquo;
+          of the symbol table node)
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Number of Entries</p></td>
+      <td>
+        <p>Although all symbol table nodes have the same length,
+          most contain fewer than the maximum possible number of
+          link entries.  This field indicates how many entries
+          contain valid data.  The valid entries are packed at the
+          beginning of the symbol table node while the remaining
+          entries contain undefined values.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Symbol Table Entries</p></td>
+      <td>
+        <p>Each link has an entry in the symbol table node.
+          The format of the entry is described below.
+          There are 2<em>K</em> entries in each group node, where
+          <em>K</em> is the &ldquo;Group Leaf Node K&rdquo; value from the
+          <a href="#Superblock">superblock</a>.
+        </p>
+      </td>
+    </tr>
+  </table>
+</div>
+
+<h3><a name="SymbolTableEntry">
+    III.C. Disk Format: Level 1C - Symbol Table Entry </a></h3>
+
+<p>Each symbol table entry in a symbol table node is designed
+  to allow for very fast browsing of stored objects.
+  Toward that design goal, the symbol table entries
+  include space for caching certain constant metadata from the
+  object header.</p>
+
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Symbol Table Entry
+    </caption>
+
+    <tr>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Link Name Offset<sup>O</sup><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Object Header Address<sup>O</sup><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4">Cache Type</td>
+    </tr>
+
+    <tr>
+      <td colspan="4">Reserved <em>(zero)</em></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br /><br />Scratch-pad Space
+        <em>(16 bytes)</em><br /><br /><br /></td>
+    </tr>
+  </table>
+
+  <table class="note">
+    <tr>
+      <td width="60%">&nbsp;</td>
+      <td width="40%">
+        (Items marked with an &lsquo;O&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfOffsetsV0">Size
+          of Offsets</a> field in the superblock.)
+    </td></tr>
+  </table>
+
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Symbol Table Entry
+    </caption>
+    <tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+    </tr>
+
+    <tr>
+      <td><p>Link Name Offset</p></td>
+      <td>
+        <p>This is the byte offset into the group&rsquo;s local
+          heap for the name of the link. The name is null
+          terminated.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Object Header Address</p></td>
+      <td>
+        <p>Every object has an object header which serves as a
+          permanent location for the object&rsquo;s metadata.  In addition
+          to appearing in the object header, some of the object&rsquo;s metadata
+          can be cached in the scratch-pad space.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Cache Type</p></td>
+      <td>
+        <p>The cache type is determined from the object header.
+          It also determines the format for the scratch-pad space:
+
+          <table class="list">
+            <tr>
+              <th width="20%" align="center">Type</th>
+              <th width="80%" align="left">Description</th>
+            </tr>
+            <tr>
+              <td align="center">0</td>
+              <td>No data is cached by the group entry.  This
+                is guaranteed to be the case when an object header
+                has a link count greater than one.
+              </td>
+            </tr>
+            <tr>
+              <td align="center">1</td>
+              <td>Group object header metadata is cached in the
+                scratch-pad space.  This implies that the symbol table
+                entry refers to another group.
+              </td>
+            </tr>
+            <tr>
+              <td align="center">2</td>
+              <td>The entry is a symbolic link.  The first four bytes
+                of the scratch-pad space are the offset into the local
+                heap for the link value.  The object header address
+                will be undefined.
+              </td>
+            </tr>
+        </table></p>
+
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Reserved</p></td>
+      <td>
+        <p>These four bytes are present so that the scratch-pad
+          space is aligned on an eight-byte boundary.  They are
+          always set to zero.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Scratch-pad Space</p></td>
+      <td>
+        <p>This space is used for different purposes, depending
+          on the value of the Cache Type field. Any metadata
+          about an object represented in the scratch-pad
+          space is duplicated in the object header for that
+          object.
+        </p>
+        <p>
+          Furthermore, no data is cached in the group
+          entry scratch-pad space if the object header for
+          the object has a link count greater than one.
+        </p>
+      </td>
+    </tr>
+  </table>
+</div>
+
+<h4>Format of the Scratch-pad Space</h4>
+
+<p>The symbol table entry scratch-pad space is formatted
+  according to the value in the Cache Type field.</p>
+
+<p>If the Cache Type field contains the value zero
+  <code>(0)</code> then no information is
+  stored in the scratch-pad space.</p>
+
+<p>If the Cache Type field contains the value one
+  <code>(1)</code>, then the scratch-pad space
+  contains cached metadata for another object header
+  in the following format:</p>
+
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Object Header Scratch-pad Format
+    </caption>
+
+    <tr>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Address of B-tree<sup>O</sup><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Address of Name Heap<sup>O</sup><br /><br /></td>
+    </tr>
+  </table>
+
+  <table class="note">
+    <tr>
+      <td width="60%">&nbsp;</td>
+      <td width="40%">
+        (Items marked with an &lsquo;O&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfOffsetsV0">Size
+          of Offsets</a> field in the superblock.)
+    </td></tr>
+  </table>
+
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Object Header Scratch-pad Format
+    </caption>
+    <tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+    </tr>
+
+    <tr>
+      <td><p>Address of B-tree</p></td>
+      <td>
+        <p>This is the file address for the root of the
+          group&rsquo;s B-tree.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Address of Name Heap</p></td>
+      <td>
+        <p>This is the file address for the group&rsquo;s local
+          heap, in which are stored the group&rsquo;s symbol names.
+        </p>
+      </td>
+    </tr>
+  </table>
+</div>
+
+
+<br />
+<br />
+<br />
+<p>If the Cache Type field contains the value two
+  <code>(2)</code>, then the scratch-pad space
+  contains cached metadata for a symbolic link
+  in the following format:</p>
+
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Symbolic Link Scratch-pad Format
+    </caption>
+
+    <tr>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+    </tr>
+
+    <tr>
+      <td colspan="4">Offset to Link Value</td>
+    </tr>
+  </table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Symbolic Link Scratch-pad Format
+    </caption>
+    <tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+    </tr>
+
+    <tr>
+      <td><p>Offset to Link Value</p></td>
+      <td>
+        <p>The value of a symbolic link (that is, the name of the
+          thing to which it points) is stored in the local heap.
+          This field is the 4-byte offset into the local heap for
+          the start of the link value, which is null terminated.
+        </p>
+      </td>
+    </tr>
+  </table>
+</div>
+
+<h3><a name="LocalHeap">
+    III.D. Disk Format: Level 1D - Local Heaps</a></h3>
+
+<p>A local heap is a collection of small pieces of data that are particular
+  to a single object in the HDF5 file.  Objects can be
+  inserted and removed from the heap at any time.
+  The address of a heap does not change once the heap is created.
+  For example, a group stores addresses of objects in symbol table nodes
+  with the names of links stored in the group&rsquo;s local heap.
+</p>
+
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Local Heap
+    </caption>
+
+    <tr>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+    </tr>
+
+    <tr>
+      <td colspan="4">Signature</td>
+    </tr>
+
+    <tr>
+      <td>Version</td>
+      <td colspan="3">Reserved <em>(zero)</em></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Data Segment Size<sup>L</sup><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Offset to Head of Free-list<sup>L</sup><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Address of Data Segment<sup>O</sup><br /><br /></td>
+    </tr>
+  </table>
+
+  <table class="note">
+    <tr>
+      <td width="60%">&nbsp;</td>
+      <td width="40%">
+        (Items marked with an &lsquo;L&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfLengthsV0">Size
+          of Lengths</a> field in the superblock.)
+    </td></tr>
+    <tr>
+      <td>&nbsp;</td>
+      <td>
+        (Items marked with an &lsquo;O&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfOffsetsV0">Size
+          of Offsets</a> field in the superblock.)
+    </td></tr>
+  </table>
+
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Local Heap
+    </caption>
+    <tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+    </tr>
+
+    <tr>
+      <td><p>Signature</p></td>
+      <td>
+        <p>The ASCII character string &ldquo;<code>HEAP</code>&rdquo;
+          is used to indicate the
+          beginning of a heap.  This gives file consistency
+          checking utilities a better chance of reconstructing a
+          damaged file.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Version</p></td>
+      <td>
+        <p>Each local heap has its own version number so that new
+          heaps can be added to old files.  This document
+          describes version zero (0) of the local heap.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Data Segment Size</p></td>
+      <td>
+        <p>The total amount of disk memory allocated for the heap
+          data.  This may be larger than the amount of space
+          required by the objects stored in the heap.  The extra
+          unused space in the heap holds a linked list of free blocks.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Offset to Head of Free-list</p></td>
+      <td>
+        <p>This is the offset within the heap data segment of the
+          first free block (or the
+          <a href="#UndefinedAddress">undefined address</a> if there is no
+          free block).  The free block contains
+          <a href="#SizeOfLengthsV0">Size of Lengths</a> bytes that
+          are the offset of the next free block (or the
+          value &lsquo;1&rsquo; if this is the
+          last free block) followed by Size of Lengths bytes that store
+          the size of this free block.  The size of the free block includes
+          the space used to store the offset of the next free block and
+          the size of the current block, making the minimum size of a free
+          block 2 * Size of Lengths.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Address of Data Segment</p></td>
+      <td>
+        <p>The data segment originally starts immediately after
+          the heap header, but if the data segment must grow as a
+          result of adding more objects, then the data segment may
+          be relocated, in its entirety, to another part of the
+          file.
+        </p>
+      </td>
+    </tr>
+  </table>
+</div>
+
+<p>Objects within a local heap should be aligned on an 8-byte boundary.</p>
+
+<h3><a name="GlobalHeap">
+    III.E. Disk Format: Level 1E - Global Heap</a></h3>
+
+<p>Each HDF5 file has a global heap which stores various types of
+  information which is typically shared between datasets.  The
+  global heap was designed to satisfy these goals:</p>
+
+<ol type="A">
+  <li>Repeated access to a heap object must be efficient without
+    resulting in repeated file I/O requests. Since global heap
+    objects will typically be shared among several datasets, it is
+    probable that the object will be accessed repeatedly.</li>
+  <li>Collections of related global heap objects should result in
+    fewer and larger I/O requests.  For instance, a dataset of
+    object references will have a global heap object for each
+    reference.  Reading the entire set of object references
+    should result in a few large I/O requests instead of one small
+    I/O request for each reference.</li>
+  <li>It should be possible to remove objects from the global heap
+    and the resulting file hole should be eligible to be reclaimed
+    for other uses.</li>
+</ol>
+
+
+<p>The implementation of the heap makes use of the memory management
+  already available at the file level and combines that with a new
+  object called a <em>collection</em> to achieve goal B. The global heap
+  is the set of all collections.  Each global heap object belongs to
+  exactly one collection, and each collection contains one or more global
+  heap objects. For the purposes of disk I/O and caching, a collection is
+  treated as an atomic object, addressing goal A.
+</p>
+
+<p>When a global heap object is deleted from a collection (which
+  occurs when its reference count falls to zero), objects located
+  after the deleted object in the collection are packed down toward
+  the beginning of the collection, and the collection&rsquo;s
+  global heap object 0 is created (if possible), or its size is
+  increased to account for the recently freed space. There are
+  no gaps between objects in each collection, with the possible
+  exception of the final space in the collection, if it is not
+  large enough to hold the header for the collection&rsquo;s
+  global heap object 0. These features address goal C.
+</p>
+
+<p>The HDF5 Library creates global heap collections as needed, so there may
+  be multiple collections throughout the file. The set of all of them is
+  abstractly called the &ldquo;global heap&rdquo;, although they do not actually link
+  to each other, and there is no global place in the file where you can
+  discover all of the collections.  The collections are found simply by
+  finding a reference to one through another object in the file.  For
+  example, data of variable-length datatype elements is stored in the
+  global heap and is accessed via a global heap ID.  The format for
+  global heap IDs is described at the end of this section.
+</p>
+
+<p>For more information on global heaps for virtual datasets, see
+  <a href="#GlobalHeapVDS">&ldquo;Disk Format: Level 1F - Global Heap
+    Block for Virtual Datasets.&rdquo;</a></p>
+<br />
+
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: A Global Heap Collection
+    </caption>
+
+    <tr>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+    </tr>
+
+    <tr>
+      <td colspan="4">Signature</td>
+    </tr>
+
+    <tr>
+      <td>Version</td>
+      <td colspan="3">Reserved (zero)</td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Collection Size<sup>L</sup><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Global Heap Object 1<br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Global Heap Object 2<br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />...<br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Global Heap Object <em>N</em><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Global Heap Object 0 (free space)<br /><br /></td>
+    </tr>
+  </table>
+
+  <table class="note">
+    <tr>
+      <td width="60%">&nbsp;</td>
+      <td width="40%">
+        (Items marked with an &lsquo;L&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfLengthsV0">Size
+          of Lengths</a> field in the superblock.)
+    </td></tr>
+  </table>
+
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: A Global Heap Collection
+    </caption>
+    <tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+    </tr>
+
+    <tr>
+      <td><p>Signature</p></td>
+      <td>
+        <p>The ASCII character string &ldquo;<code>GCOL</code>&rdquo;
+          is used to indicate the
+          beginning of a collection.  This gives file consistency
+          checking utilities a better chance of reconstructing a
+          damaged file.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Version</p></td>
+      <td>
+        <p>Each collection has its own version number so that new
+          collections can be added to old files.  This document
+          describes version one (1) of the collections (there is no
+          version zero (0)).
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Collection Size</p></td>
+      <td>
+        <p>This is the size in bytes of the entire collection
+          including this field.  The default (and minimum)
+          collection size is 4096 bytes which is a typical file
+          system block size.  This allows for 127 16-byte heap
+          objects plus their overhead (the collection header of 16 bytes
+          and the 16 bytes of information about each heap object).
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Global Heap Object 1 through <em>N</em></p></td>
+      <td>
+        <p>The objects are stored in any order with no
+          intervening unused space.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Global Heap Object 0</p></td>
+      <td>
+        <p>Global Heap Object 0 (zero), when present, represents the free
+          space in the collection.  Free space always appears at the end of
+          the collection.  If the free space is too small to store the header
+          for Object 0 (described below) then the header is implied and is not
+          written.
+        <p>
+          The field <em>Object Size</em> for Object 0 indicates the
+          amount of possible free space in the collection including the 16-byte
+          header size of Object 0.
+        </p>
+      </td>
+    </tr>
+  </table>
+</div>
+
+<br />
+<br />
+<br />
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Global Heap Object
+    </caption>
+
+    <tr>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+    </tr>
+
+    <tr>
+      <td colspan="2">Heap Object Index</td>
+      <td colspan="2">Reference Count</td>
+    </tr>
+
+    <tr>
+      <td colspan="4">Reserved (zero)</td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Object Size<sup>L</sup><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Object Data<br /><br /></td>
+    </tr>
+  </table>
+
+  <table class="note">
+    <tr>
+      <td width="60%">&nbsp;</td>
+      <td width="40%">
+        (Items marked with an &lsquo;L&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfLengthsV0">Size
+          of Lengths</a> field in the superblock.)
+    </td></tr>
+  </table>
+
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Global Heap Object
+    </caption>
+    <tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+    </tr>
+
+    <tr>
+      <td><p>Heap Object Index</p></td>
+      <td>
+        <p>Each object has a unique identification number within a
+          collection.  The identification numbers are chosen so that
+          new objects have the smallest value possible with the
+          exception that the identifier <code>0</code> always refers to the
+          object which represents all free space within the
+          collection.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Reference Count</p></td>
+      <td>
+        <p>All heap objects have a reference count field.  An
+          object which is referenced from some other part of the
+          file will have a positive reference count. The reference
+          count for Object 0 is always zero.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Reserved</p></td>
+      <td>
+        <p>Zero padding to align next field on an 8-byte boundary.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Object Size</p></td>
+      <td>
+        <p>This is the size of the object data stored for the object.
+          The actual storage space allocated for the object data is rounded
+          up to a multiple of eight.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Object Data</p></td>
+      <td>
+        <p>The object data is treated as a one-dimensional array
+          of bytes to be interpreted by the caller.
+        </p>
+      </td>
+    </tr>
+  </table>
+
+</div>
+
+<br />
+<br />
+<br />
+<p>
+  <a name="GlobalHeapID"></a>
+    The format for the ID used to locate an object in the global heap is
+    described here:</p>
+
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Global Heap ID
+    </caption>
+
+    <tr>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Collection Address<sup>O</sup><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4">Object Index</td>
+    </tr>
+  </table>
+
+  <table class="note">
+    <tr>
+      <td width="60%">&nbsp;</td>
+      <td width="40%">
+        (Items marked with an &lsquo;O&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfOffsetsV0">Size
+          of Offsets</a> field in the superblock.)
+    </td></tr>
+  </table>
+
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Global Heap ID
+    </caption>
+    <tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+    </tr>
+
+    <tr>
+      <td><p>Collection Address</p></td>
+      <td>
+        <p>This field is the address of the global heap collection
+		  where the data object is stored.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>ID</p></td>
+      <td>
+        <p>This field is the index of the data object within the
+		  global heap collection.
+        </p>
+      </td>
+    </tr>
+
+  </table>
+</div>
+
+
+
+<h3><a name="GlobalHeapVDS"> III.F. Disk Format: Level 1F - Global
+    Heap Block for Virtual Datasets</a></h3>
+
+<p>The layout for the global heap block used with virtual datasets is
+  described below. For more information on global heaps, see
+  <a href="#GlobalHeap"></a>&ldquo;Disk Format: Level 1E - Global Heap.&rdquo;</p>
+
+<br />
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Global Heap Block for Virtual Dataset
+    </caption>
+
+    <tr>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+    </tr>
+
+    <tr>
+      <td>Version</td>
+      <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted
+          only to align table nicely</em></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Num Entries<sup>L</sup><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Source Filename #1 <em>(variable size)</em><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Source Dataset #1 <em>(variable
+          size)</em><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Source Selection #1 <em>(variable
+          size)</em><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Virtual Selection #1 <em>(variable
+          size)</em><br /><br /></td>
+    </tr>
+
+	<tr>
+	  <td colspan="4">.<br />.<br />.<br /></td>
+	</tr>
+
+    <tr>
+      <td colspan="4"><br />Source Filename #n <em>(variable
+          size)</em><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Source Dataset #n <em>(variable
+          size)</em><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Source Selection #n <em>(variable
+          size)</em><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Virtual Selection #n <em>(variable
+          size)</em><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4">Checksum</td>
+    </tr>
+
+  </table>
+
+  <table class="note">
+    <tr>
+      <td width="60%">&nbsp;</td>
+      <td width="40%">
+        (Items marked with an &lsquo;L&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfLengthsV0">Size
+          of Lengths</a> field in the superblock.)
+    </td></tr>
+  </table>
+
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Global Heap Block for Virtual Dataset
+    </caption>
+	<tr>
+      <th width="40%">Field Name</th>
+      <th>Description</th>
+    </tr>
+
+    <tr>
+      <td><p>Version</p></td>
+      <td>
+        <p>The version number for the block; the value is 0.</p>
+      </td>
+    </tr>
+
+	<tr>
+      <td><p>Num Entries</p></td>
+      <td><p>The number of entries in the block.</p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Source Filename #n</p></td>
+	  <td>
+	    <p>The source file name where the source dataset is located.
+        </p>
+	  </td>
+    </tr>
+
+	<tr>
+	  <td><p>Source Dataset #n</p></td>
+	  <td><p>The source dataset name that is mapped to the
+          virtual dataset.</p></td>
+	</tr>
+
+	<tr>
+	  <td><p>Source Selection #n</p></td>
+	  <td>
+	    <p>The <a href="#DataspaceSEL">dataspace selection</a> in the
+          source dataset that is mapped to the virtual selection.
+	    </p>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td><p>Virtual Selection #n</p></td>
+	  <td>
+	    <p>This is the <a href="#DataspaceSEL">dataspace selection</a> in the virtual dataset that is
+		  mapped to the source selection.
+	    </p>
+	  </td>
+	</tr>
+
+    <tr>
+      <td><p>Checksum</p></td>
+      <td>
+        <p>This is the checksum for the block.</p>
+      </td>
+    </tr>
+
+  </table>
+</div>
+<br>
+
+<h3><a name="FractalHeap">
+    III.G. Disk Format: Level 1G - Fractal Heap</a></h3>
+
+<p>
+  Each fractal heap consists of a header and zero or more direct and
+  indirect blocks (described below).  The header contains general
+  information as well as
+  initialization parameters for the doubling table.  The <em>Address
+    of Root Block</em> field in the header points to the first direct or
+  indirect block in the heap.
+</p>
+
+<p>
+  Fractal heaps are based on a data structure called a <em>doubling
+    table</em>.  A doubling table provides a mechanism for quickly
+  extending an array-like data structure that minimizes the number of
+  empty blocks in the heap, while retaining very fast lookup of any
+  element within the array.  More information on fractal heaps and
+  doubling tables can be found in the RFC
+  &ldquo;<a href="Supplements/FractalHeap/PrivateHeap.pdf">Private
+    Heaps in HDF5</a>.&rdquo;
+</p>
+
+<p>
+  The fractal heap implements the doubling table structure with
+  indirect and direct blocks.
+  Indirect blocks in the heap do not actually contain data for
+  objects in the heap, their &ldquo;size&rdquo; is abstract -
+  they represent the indexing structure for locating the
+  direct blocks in the doubling table.
+  Direct blocks
+  contain the actual data for objects stored in the heap.
+</p>
+
+<p>
+  All indirect blocks have a constant number of block entries in each
+  row, called the <em>width</em> of the doubling table
+  (see <em>Table Width</em> field in the header).
+
+  The number
+  of rows for each indirect block in the heap is determined by the
+  size of the block that the indirect block represents in the
+  doubling table (calculation of this is shown below) and is
+  constant, except for the &ldquo;root&rdquo;
+  indirect block, which expands and shrinks its number of rows as
+  needed.
+</p>
+
+<p>
+  Blocks in the first <em>two</em> rows of an indirect block
+  are <em>Starting Block Size</em> number of bytes in size.
+  For example, if the row <em>width</em> of the doubling table is 4,
+  then the first eight block entries in the
+  indirect block are <em>Starting Block Size</em> number of bytes in size.
+  The blocks in each subsequent row are twice the size of
+  the blocks in the previous row. In other words, blocks in
+  the third row are twice the <em>Starting Block Size</em>,
+  blocks in the fourth row are four times the
+  <em>Starting Block Size</em>, and so on.  Entries for
+  blocks up to the <em>Maximum Direct Block Size</em> point to
+  direct blocks, and entries for blocks greater than that size
+  point to further indirect blocks (which have their own
+  entries for direct and indirect blocks).
+  <em>Starting Block Size</em> and
+  <em>Maximum Direct Block Size</em> are fields
+  stored in the header.
+</p>
+
+<p>
+  The number of rows of blocks, <em>nrows</em>, in an
+  indirect block is calculated by the following expression:
+  <br /> <br />
+  <em>nrows</em> = (log<sub>2</sub>(<em>block_size</em>) -
+  log<sub>2</sub>(<em>&lt;Starting Block Size&gt;</em>)) + 1
+</p>
+where <em>block_size</em> is the size of the block that the indirect block
+represents in the doubling table.
+For example, to represent a block with <em>block_size</em> equals to 1024,
+and <em>Starting Block Size</em> equals to 256,
+three rows are needed.
+<p>
+  The maximum number of rows of direct blocks, <em>max_dblock_rows</em>,
+  in any indirect block of a fractal heap is given by the
+  following expression:
+  <br /> <br />
+  <em>max_dblock_rows</em> =
+  (log<sub>2</sub>(<em>&lt;Maximum Direct Block Size&gt;</em>) -
+  log<sub>2</sub>(<em>&lt;Starting Block Size&gt;</em>)) + 2
+</p>
+<p>
+  Using the computed values for <em>nrows</em> and
+  <em>max_dblock_rows</em>, along with the <em>width</em> of the
+  doubling table, the number of direct and indirect block entries
+  (<em>K</em> and <em>N</em> in the indirect block description, below)
+  in an indirect block can be computed:
+  <br /> <br />
+  <em>K</em> = MIN(<em>nrows</em>, <em>max_dblock_rows</em>) *
+  <em>&lt;Table Width&gt;</em>
+
+  <br /> <br />
+  If <em>nrows</em> is less than or equal to <em>max_dblock_rows</em>,
+  <em>N</em> is 0.  Otherwise, <em>N</em> is simply computed:
+  <br /> <br />
+  <em>N</em> = <em>K</em> - (<em>max_dblock_rows</em> *
+  <em>&lt;Table Width&gt;</em>)
+</p>
+
+<p>
+  The size of indirect blocks on disk is determined by the number
+  of rows in the indirect block (computed above).  The size of direct
+  blocks on disk is exactly the size of the block in the doubling
+  table.
+</p>
+<br>
+
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Fractal Heap Header
+    </caption>
+
+    <tr>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+    </tr>
+
+    <tr>
+      <td colspan="4">Signature</td>
+    </tr>
+
+    <tr>
+      <td>Version</td>
+      <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+    </tr>
+
+    <tr>
+      <td colspan="2">Heap ID Length</td>
+      <td colspan="2">I/O Filters&rsquo; Encoded Length</td>
+    </tr>
+
+    <tr>
+      <td>Flags</td>
+      <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+    </tr>
+
+    <tr>
+      <td colspan="4">Maximum Size of Managed Objects</td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Next Huge Object ID<sup>L</sup><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />v2 B-tree Address of Huge Objects<sup>O</sup><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Amount of Free Space in Managed Blocks<sup>L</sup><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Address of Managed Block Free Space Manager<sup>O</sup><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Amount of Managed Space in Heap<sup>L</sup><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Amount of Allocated Managed Space in Heap<sup>L</sup><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Offset of Direct Block Allocation Iterator in Managed Space<sup>L</sup><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Number of Managed Objects in Heap<sup>L</sup><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Size of Huge Objects in Heap<sup>L</sup><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Number of Huge Objects in Heap<sup>L</sup><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Size of Tiny Objects in Heap<sup>L</sup><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Number of Tiny Objects in Heap<sup>L</sup><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="2">Table Width</td>
+      <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Starting Block Size<sup>L</sup><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Maximum Direct Block Size<sup>L</sup><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="2">Maximum Heap Size</td>
+      <td colspan="2">Starting # of Rows in Root Indirect Block</td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Address of Root Block<sup>O</sup><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="2">Current # of Rows in Root Indirect Block</td>
+      <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Size of Filtered Root Direct Block <em>(optional)</em><sup>L</sup><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4">I/O Filter Mask<em> (optional)</em></td>
+    </tr>
+
+    <tr>
+      <td colspan="4">I/O Filter Information<em> (optional, variable size)</em></td>
+    </tr>
+
+    <tr>
+      <td colspan="4">Checksum</td>
+    </tr>
+
+  </table>
+
+  <table class="note">
+    <tr>
+      <td width="60%">&nbsp;</td>
+      <td width="40%">
+        (Items marked with an &lsquo;L&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfLengthsV0">Size
+          of Lengths</a> field in the superblock.)
+    </td></tr>
+    <tr>
+      <td>&nbsp;</td>
+      <td>
+        (Items marked with an &lsquo;O&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfOffsetsV0">Size
+          of Offsets</a> field in the superblock.)
+    </td></tr>
+  </table>
+
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Fractal Heap Header
+    </caption>
+    <tr>
+      <th width="40%">Field Name</th>
+      <th>Description</th>
+    </tr>
+
+    <tr>
+      <td><p>Signature</p></td>
+      <td>
+        <p>The ASCII character string &ldquo;<code>FRHP</code>&rdquo;
+          is used to indicate the
+          beginning of a fractal heap header.  This gives file consistency
+          checking utilities a better chance of reconstructing a
+          damaged file.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Version</p></td>
+      <td>
+        <p>This document describes version 0.</p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Heap ID Length</p></td>
+      <td>
+        <p>This is the length in bytes of heap object IDs for this heap.</p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>I/O Filters&rsquo; Encoded Length</p></td>
+      <td>
+	    <p>This is the size in bytes of the encoded <em>I/O Filter Information</em>.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Flags</p></td>
+      <td>
+        <p>This field is the heap status flag and is a bit field
+          indicating additional information about the fractal heap.
+          <table class="list">
+            <tr>
+              <th width="20%" align="center">Bit(s)</th>
+              <th width="80%" align="left">Description</th>
+            </tr>
+
+            <tr>
+              <td align="center"><code>0</code></td>
+              <td>If set, the ID value to use for huge object has wrapped
+                around.  If the value for the <em>Next Huge Object ID</em>
+                has wrapped around, each new huge object inserted into the
+                heap will require a search for an ID value.
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>1</code></td>
+              <td>If set, the direct blocks in the heap are checksummed.
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>2-7</code></td>
+              <td>Reserved</td>
+            </tr>
+        </table></p>
+
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Maximum Size of Managed Objects</p></td>
+      <td>
+	    <p>This is the maximum size of managed objects allowed in the heap.
+          Objects greater than this this are &lsquo;huge&rsquo; objects and will be
+          stored in the file directly, rather than in a direct block for
+          the heap.
+	    </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Next Huge Object ID</p></td>
+      <td>
+	    <p>This is the next ID value to use for a huge object in the heap.
+	    </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>v2 B-tree Address of Huge Objects</p></td>
+      <td>
+	    <p>This is the address of the <a href="#V2Btrees">v2 B-tree</a>
+          used to track huge objects in the heap.  The type of records
+          stored in the <em>v2 B-tree</em> will
+          be determined by whether the address and length of a huge object
+          can fit into a heap ID (if yes, it is a &ldquo;directly&rdquo; accessed
+          huge object) and whether there is a filter used on objects
+          in the heap.
+	    </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Amount of Free Space in Managed Blocks</p></td>
+      <td>
+	    <p>This is the total amount of free space in managed direct blocks
+          (in bytes).
+	    </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Address of Managed Block Free Space Manager</p></td>
+      <td>
+	    <p>This is the address of the
+          <em><a href="#FreeSpaceManager">Free-space Manager</a></em> for
+          managed blocks.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Amount of Managed Space in Heap</p></td>
+	  <td>
+	    <p>This is the total amount of managed space in the heap (in bytes),
+          essentially the upper bound of the heap&rsquo;s linear address space.
+	    </p>
+      </td>
+    </tr>
+
+	<tr>
+      <td><p>Amount of Allocated Managed Space in Heap</p></td>
+	  <td>
+	    <p>This is the total amount of managed space (in bytes) actually
+          allocated in
+          the heap.  This can be less than the <em>Amount of Managed Space
+            in Heap</em> field, if some direct blocks in the heap&rsquo;s linear
+          address space are not allocated.
+	    </p>
+	  </td>
+	</tr>
+
+	<tr>
+      <td><p>Offset of Direct Block Allocation Iterator in Managed Space</p></td>
+	  <td>
+	    <p>This is the linear heap offset where the next direct
+          block should be allocated at (in bytes).  This may be less than
+          the <em>Amount of Managed Space in Heap</em> value because the
+          heap&rsquo;s address space is increased by a &ldquo;row&rdquo; of direct blocks
+          at a time, rather than by single direct block increments.
+	    </p>
+	  </td>
+	</tr>
+
+	<tr>
+      <td><p>Number of Managed Objects in Heap</p></td>
+	  <td>
+	    <p>This is the number of managed objects in the heap.
+	    </p>
+	  </td>
+	</tr>
+
+	<tr>
+      <td><p>Size of Huge Objects in Heap</p></td>
+	  <td>
+	    <p>This is the total size of huge objects in the heap (in bytes).
+	    </p>
+	  </td>
+	</tr>
+
+	<tr>
+      <td><p>Number of Huge Objects in Heap</p></td>
+	  <td>
+	    <p>This is the number of huge objects in the heap.
+	    </p>
+	  </td>
+	</tr>
+
+	<tr>
+      <td><p>Size of Tiny Objects in Heap</p></td>
+	  <td>
+	    <p>This is the total size of tiny objects that are packed in heap
+          IDs (in bytes).
+	    </p>
+	  </td>
+	</tr>
+
+	<tr>
+      <td><p>Number of Tiny Objects in Heap</p></td>
+	  <td>
+	    <p>This is the number of tiny objects that are packed in heap IDs.
+	    </p>
+	  </td>
+	</tr>
+
+	<tr>
+      <td><p>Table Width</p></td>
+	  <td>
+	    <p>This is the number of columns in the doubling table for managed
+          blocks.  This value must be a power of two.
+	    </p>
+	  </td>
+	</tr>
+
+	<tr>
+      <td><p>Starting Block Size</p></td>
+	  <td>
+	    <p>This is the starting block size to use in the doubling table for
+	      managed blocks (in bytes).  This value must be a power of two.
+	    </p>
+	  </td>
+	</tr>
+
+	<tr>
+      <td><p>Maximum Direct Block Size</p></td>
+	  <td>
+	    <p>This is the maximum size allowed for a managed direct block.
+          Objects inserted into the heap that are larger than this value
+          (less the number of bytes of direct block prefix/suffix)
+          are stored as &lsquo;huge&rsquo; objects.  This value must be a power of
+          two.
+	    </p>
+	  </td>
+	</tr>
+
+	<tr>
+      <td><p>Maximum Heap Size</p></td>
+	  <td>
+	    <p>This is the maximum size of the heap&rsquo;s linear address space for
+          managed objects (in bytes).  The value stored is the log2 of
+          the actual value, that is: the number of bits of the address space.
+          &lsquo;Huge&rsquo; and &lsquo;tiny&rsquo; objects are not counted in this value, since
+          they do not store objects in the linear address space of the
+          heap.
+	    </p>
+	  </td>
+	</tr>
+
+	<tr>
+      <td><p>Starting # of Rows in Root Indirect Block</p></td>
+	  <td>
+	    <p>This is the starting number of rows for the root indirect block.
+	      A value of 0 indicates that the root indirect block will have
+          the maximum number of rows needed to address the heap&rsquo;s <em>Maximum
+            Heap Size</em>.
+	    </p>
+	  </td>
+	</tr>
+
+	<tr>
+      <td><p>Address of Root Block</p></td>
+	  <td>
+	    <p>This is the address of the root block for the heap.  It can
+          be the <a href="#UndefinedAddress">undefined address</a> if
+          there is no data in the heap.  It either points to a direct
+          block (if the <em>Current # of Rows in the Root Indirect
+            Block</em> value is 0), or an indirect block.
+	    </p>
+	  </td>
+	</tr>
+
+	<tr>
+      <td><p>Current # of Rows in Root Indirect Block</p></td>
+	  <td>
+	    <p>This is the current number of rows in the root indirect block.
+		  A value of 0 indicates that <em>Address of Root Block</em>
+          points to direct block instead of indirect block.
+	    </p>
+	  </td>
+	</tr>
+
+	<tr>
+      <td><p>Size of Filtered Root Direct Block</p></td>
+	  <td>
+	    <p>This is the size of the root direct block, if filters are
+          applied to heap objects (in bytes).  This field is only
+          stored in the header if the <em>I/O Filters&rsquo; Encoded Length</em>
+          is greater than 0.
+	    </p>
+	  </td>
+	</tr>
+
+	<tr>
+      <td><p>I/O Filter Mask</p></td>
+	  <td>
+	    <p>This is the filter mask for the root direct block, if filters
+          are applied to heap objects.  This mask has the same format as
+          that used for the filter mask in chunked raw data records in a
+          <a href="#V1Btrees">v1 B-tree</a>.
+          This field is only
+          stored in the header if the <em>I/O Filters&rsquo; Encoded Length</em>
+          is greater than 0.
+	    </p>
+	  </td>
+	</tr>
+
+    <tr>
+      <td><p>I/O Filter Information</p></td>
+	  <td>
+	    <p>This is the I/O filter information encoding direct blocks and
+          huge objects, if filters are applied to heap objects.  This
+          field is encoded as a <a href="#FilterMessage">Filter Pipeline</a>
+          message.
+          The size of this field is determined by <em>I/O Filters&rsquo;
+            Encoded Length</em>.
+	    </p>
+	  </td>
+    </tr>
+
+    <tr>
+      <td><p>Checksum</p></td>
+      <td>
+        <p>This is the checksum for the header.</p>
+      </td>
+    </tr>
+
+  </table>
+</div>
+
+<br />
+<br />
+<br />
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Fractal Heap Direct Block
+    </caption>
+
+    <tr>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+    </tr>
+
+    <tr>
+      <td colspan="4">Signature</td>
+    </tr>
+
+    <tr>
+      <td>Version</td>
+      <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Heap Header Address<sup>O</sup><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4">Block Offset <em>(variable size)</em></td>
+    </tr>
+
+    <tr>
+      <td colspan="4">Checksum <em>(optional)</em></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Object Data <em>(variable size)</em><br /><br /></td>
+    </tr>
+
+  </table>
+
+  <table class="note">
+    <tr>
+      <td width="60%">&nbsp;</td>
+      <td width="40%">
+        (Items marked with an &lsquo;O&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfOffsetsV0">Size
+          of Offsets</a> field in the superblock.)
+    </td></tr>
+  </table>
+
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Fractal Heap Direct Block
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+    </tr>
+
+    <tr>
+      <td><p>Signature</p></td>
+      <td>
+        <p>The ASCII character string &ldquo;<code>FHDB</code>&rdquo;
+          is used to indicate the
+          beginning of a fractal heap direct block.  This gives file consistency
+          checking utilities a better chance of reconstructing a
+          damaged file.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Version</p></td>
+      <td>
+        <p>This document describes version 0.</p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Heap Header Address</p></td>
+      <td>
+        <p>This is the address for the fractal heap header that this
+          block belongs to.  This field is principally used for file
+          integrity checking.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Block Offset</p></td>
+      <td>
+        <p>This is the offset of the block within the fractal heap&rsquo;s
+          address space (in bytes).  The number of bytes used to encode
+          this field is the <em>Maximum Heap Size</em> (in the heap&rsquo;s
+          header) divided by 8 and rounded up to the next highest integer,
+          for values that are not a multiple of 8.  This value is
+          principally used for file integrity checking.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Checksum</p></td>
+      <td>
+        <p>This is the checksum for the direct block.</p>
+	    <p>This field is only present if bit 1 of <em>Flags</em> in the
+          heap&rsquo;s header is set.</p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Object Data</p></td>
+      <td>
+        <p>This section of the direct block stores the actual data for
+          objects in the heap.  The size of this section is determined by
+          the direct block&rsquo;s size minus the size of the other fields
+          stored in the direct block (for example, the <em>Signature</em>,
+          <em>Version</em>, and others including the <em>Checksum</em> if it is
+          present).
+        </p>
+      </td>
+    </tr>
+
+  </table>
+</div>
+
+<br />
+<br />
+<br />
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Fractal Heap Indirect Block
+    </caption>
+
+    <tr>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+    </tr>
+
+    <tr>
+      <td colspan="4">Signature</td>
+    </tr>
+
+    <tr>
+      <td>Version</td>
+      <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Heap Header Address<sup>O</sup><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4">Block Offset <em>(variable size)</em></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Child Direct Block #0 Address<sup>O</sup><br /><br /></td>
+	</tr>
+	<tr>
+	  <td colspan="4"><br />Size of Filtered Direct Block #0 <em>(optional)</em> <sup>L</sup><br /><br /></td>
+	</tr>
+	<tr>
+	  <td colspan="4">Filter Mask for Direct Block #0 <em>(optional)</em></td>
+	</tr>
+
+    <tr>
+      <td colspan="4"><br />Child Direct Block #1 Address<sup>O</sup><br /><br /></td>
+	</tr>
+	<tr>
+	  <td colspan="4"><br />Size of Filtered Direct Block #1 <em>(optional)</em><sup>L</sup><br /><br /></td>
+	</tr>
+	<tr>
+	  <td colspan="4">Filter Mask for Direct Block #1 <em>(optional)</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">...</td>
+	</tr>
+
+    <tr>
+      <td colspan="4"><br />Child Direct Block #K-1 Address<sup>O</sup><br /><br /></td>
+	</tr>
+	<tr>
+	  <td colspan="4"><br />Size of Filtered Direct Block #K-1 <em>(optional)</em><sup>L</sup><br /><br /></td>
+	</tr>
+	<tr>
+	  <td colspan="4">Filter Mask for Direct Block #K-1 <em>(optional)</em></td>
+	</tr>
+
+    <tr>
+      <td colspan="4"><br />Child Indirect Block #0 Address<sup>O</sup><br /><br /></td>
+	</tr>
+
+    <tr>
+      <td colspan="4"><br />Child Indirect Block #1 Address<sup>O</sup><br /><br /></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">...</td>
+	</tr>
+
+    <tr>
+      <td colspan="4"><br />Child Indirect Block #N-1 Address<sup>O</sup><br /><br /></td>
+	</tr>
+
+    <tr>
+	  <td colspan="4">Checksum</td>
+    </tr>
+  </table>
+
+  <table class="note">
+    <tr>
+      <td width="60%">&nbsp;</td>
+      <td width="40%">
+        (Items marked with an &lsquo;O&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfOffsetsV0">Size
+          of Offsets</a> field in the superblock.)
+    </td></tr>
+    <tr>
+      <td>&nbsp;</td>
+      <td>
+        (Items marked with an &lsquo;L&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfLengthsV0">Size
+          of Lengths</a> field in the superblock.)
+    </td></tr>
+  </table>
+
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Fractal Heap Indirect Block
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+    </tr>
+
+    <tr>
+      <td><p>Signature</p></td>
+      <td>
+        <p>The ASCII character string &ldquo;<code>FHIB</code>&rdquo; is used to
+          indicate the beginning of a fractal heap indirect block.  This
+          gives file consistency checking utilities a better chance of
+          reconstructing a damaged file.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Version</p></td>
+      <td>
+        <p>This document describes version 0.</p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Heap Header Address</p></td>
+      <td>
+        <p>This is the address for the fractal heap header that this
+          block belongs to.  This field is principally used for file
+          integrity checking.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Block Offset</p></td>
+      <td>
+        <p>This is the offset of the block within the fractal heap&rsquo;s
+          address space (in bytes).  The number of bytes used to encode
+          this field is the <em>Maximum Heap Size</em> (in the heap&rsquo;s
+          header) divided by 8 and rounded up to the next highest integer,
+          for values that are not a multiple of 8.  This value is
+          principally used for file integrity checking.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Child Direct Block #K Address</p></td>
+      <td>
+	    <p>This field is the address of the child direct block.
+          The size of the [uncompressed] direct block can be computed by
+          its offset in the heap&rsquo;s linear address space.
+        </p>
+      </td>
+    </tr>
+
+	<tr>
+	  <td><p>Size of Filtered Direct Block #K</p></td>
+	  <td>
+	    <p>This is the size of the child direct block after passing through
+          the I/O filters defined for this heap (in bytes).  If no I/O
+          filters are present for this heap, this field is not present.
+        </p>
+	  </td>
+	</tr>
+	<tr>
+	  <td><p>Filter Mask for Direct Block #K</p></td>
+	  <td>
+        <p>This is the I/O filter mask for the filtered direct block.
+          This mask has the same format as that used for the filter mask
+          in chunked raw data records in a <a href="#V1Btrees">v1 B-tree</a>.
+          If no I/O filters are present for this heap, this field is not
+          present.
+        </p>
+	  </td>
+    </tr>
+
+    <tr>
+      <td><p>Child Indirect Block #N Address</p></td>
+      <td>
+	    <p>This field is the address of the child indirect block.
+          The size of the indirect block can be computed by
+          its offset in the heap&rsquo;s linear address space.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Checksum</p></td>
+      <td>
+        <p>This is the checksum for the indirect block.</p>
+      </td>
+    </tr>
+
+  </table>
+
+</div>
+
+<br />
+<p>An object in the fractal heap is identified by means of a fractal heap ID,
+  which encodes information to locate the object in the heap.
+  Currently, the fractal heap stores an object in one of three ways,
+  depending on the object&rsquo;s size:</p>
+
+<div align="center">
+  <table class="list80">
+    <tr>
+      <th width="20%">Type</th>
+      <th width="80%" align="left">Description</th>
+    </tr>
+
+    <tr>
+      <td align="center">Tiny</td>
+      <td>
+        <p>When an object is small enough to be encoded in the
+          heap ID, the object&rsquo;s data is embedded in the fractal
+          heap ID itself.  There are two sub-types for this type of
+          object: normal and extended. The sub-type for tiny heap
+          IDs depends on whether the heap ID is large enough to
+          store objects greater than 16 bytes or not. If the
+          heap ID length is 18 bytes or smaller, the
+          &lsquo;normal&rsquo; tiny heap ID form is used. If the
+          heap ID length is greater than 18 bytes in length, the
+          &ldquo;extended&rdquo; form is used. See the format
+          description below for both sub-types.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td align="center">Huge</td>
+      <td>
+        <p>When the size of an object is larger than <em>Maximum Size of
+            Managed Objects</em> in the <em>Fractal Heap Header</em>, the
+          object&rsquo;s data is stored on its own in the file and the object
+          is tracked/indexed via a version 2 B-tree.  All huge objects
+          for a particular fractal heap use the same v2 B-tree.  All huge
+          objects for a particular fractal heap use the same format for
+          their huge object IDs.
+        </p>
+
+        <p>Depending on whether the IDs for a heap are large enough to hold
+          the object&rsquo;s retrieval information and whether I/O pipeline filters
+          are applied to the heap&rsquo;s objects, 4 sub-types are derived for
+          huge object IDs for this heap:</p>
+
+        <div align="center">
+          <table class="list">
+            <tr>
+              <th align="left" width="35%">Sub-type</th>
+              <th align="left">Description</th>
+            </tr>
+
+            <tr>
+              <td align="left">Directly accessed, non-filtered</td>
+              <td>
+                <p>The object&rsquo;s address and length are embedded in the
+                  fractal heap ID itself and the object is directly accessed
+                  from them.  This allows the object to be accessed without
+                  resorting to the B-tree.
+                </p>
+              </td>
+            </tr>
+
+            <tr>
+              <td align="left">Directly accessed, filtered</td>
+              <td>
+                <p>The filtered object&rsquo;s address, length, filter mask and
+                  de-filtered size are embedded in the fractal heap ID itself
+                  and the object is accessed directly with them.  This allows
+                  the object to be accessed without resorting to the B-tree.
+                </p>
+              </td>
+            </tr>
+
+            <tr>
+              <td align="left">Indirectly accessed, non-filtered</td>
+              <td>
+                <p>The object is located by using a B-tree key embedded in
+                  the fractal heap ID to retrieve the address and length from
+                  the version 2 B-tree for huge objects.  Then, the address
+                  and length are used to access the object.
+                </p>
+              </td>
+            </tr>
+
+            <tr>
+              <td align="left">Indirectly accessed, filtered</td>
+              <td>
+                <p>The object is located by using a B-tree key embedded in
+                  the fractal heap ID to retrieve the filtered object&rsquo;s
+                  address, length, filter mask and de-filtered size from the
+                  version 2 B-tree for huge objects.  Then, this information
+                  is used to access the object.
+                </p>
+              </td>
+            </tr>
+          </table>
+        </div>
+
+      </td>
+    </tr>
+
+    <tr>
+      <td align="center">Managed</td>
+      <td>
+        <p>When the size of an object does not meet the above two
+          conditions, the object is stored and managed via the direct and
+          indirect blocks based on the doubling table.
+        </p>
+      </td>
+    </tr>
+  </table>
+</div>
+
+
+<br />
+<p>The specific format for each type of heap ID is described below:
+</p>
+
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Fractal Heap ID for Tiny Objects (Sub-type 1 -
+      &lsquo;Normal&rsquo;)
+    </caption>
+
+    <tr>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+	</tr>
+
+    <tr>
+      <td>Version, Type, and Length</td>
+      <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Data <em>(variable size)</em></td>
+    </tr>
+
+  </table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Fractal Heap ID for Tiny Objects (Sub-type 1 -
+      &lsquo;Normal&rsquo;)
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+    </tr>
+
+    <tr>
+      <td><p>Version, Type, and Length</p></td>
+      <td>
+        <p>This is a bit field with the following definition:
+          <table class="list">
+            <tr>
+              <th width="20%" align="center">Bit</th>
+              <th width="80%" align="left">Description</th>
+            </tr>
+
+            <tr>
+              <td align="center"><code>6-7</code></td>
+              <td>The current version of ID format.  This document
+                describes version 0.
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>4-5</code></td>
+              <td>The ID type.  Tiny objects have a value of <code>2</code>.
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>0-3</code></td>
+              <td>The length of the tiny object. The value stored
+                is one less than the actual length (since zero-length
+                objects are not allowed to be stored in the heap).
+                For example, an object of actual length 1 has an
+                encoded length of 0, an object of actual length 2
+                has an encoded length of 1, and so on.
+              </td>
+            </tr>
+	    </table></p>
+
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Data</p></td>
+      <td>
+        <p>This is the data for the object.
+        </p>
+      </td>
+    </tr>
+
+  </table>
+</div>
+
+<br />
+<br />
+<br />
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Fractal Heap ID for Tiny Objects (Sub-type 2 -
+      &lsquo;Extended&rsquo;)
+    </caption>
+
+    <tr>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+	</tr>
+
+    <tr>
+      <td>Version, Type, and Length</td>
+      <td>Extended Length</td>
+      <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+    </tr>
+
+    <tr>
+      <td colspan="4">Data <em>(variable size)</em></td>
+    </tr>
+
+  </table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Fractal Heap ID for Tiny Objects (Sub-type 2 -
+      &lsquo;Extended&rsquo;)
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+    </tr>
+
+    <tr>
+      <td><p>Version, Type, and Length</p></td>
+      <td>
+        <p>This is a bit field with the following definition:
+          <table class="list">
+            <tr>
+              <th width="20%" align="center">Bit</th>
+              <th width="80%" align="left">Description</th>
+            </tr>
+
+            <tr>
+              <td align="center"><code>6-7</code></td>
+              <td>The current version of ID format.  This document
+                describes version 0.
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>4-5</code></td>
+              <td>The ID type.  Tiny objects have a value of <code>2</code>.
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>0-3</code></td>
+              <td>These 4 bits, together with the next byte, form an
+                unsigned 12-bit integer for holding the length of the
+                object.  These 4-bits are bits 8-11 of the 12-bit integer.
+                See description for the <em>Extended Length</em> field below.
+              </td>
+            </tr>
+	    </table></p>
+
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Extended Length</p></td>
+      <td>
+        <p>This byte, together with the 4 bits in the previous byte,
+          forms an unsigned 12-bit integer for holding the length of
+          the tiny object.  These 8 bits are bits 0-7 of the 12-bit
+          integer formed. The value stored is one less than the actual
+          length (since zero-length objects are not allowed to be
+          stored in the heap). For example, an object of actual length
+          1 has an encoded length of 0, an object of actual length
+          2 has an encoded length of 1, and so on.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Data</p></td>
+      <td>
+        <p>This is the data for the object.
+        </p>
+      </td>
+    </tr>
+
+  </table>
+</div>
+
+
+<br />
+<br />
+<br />
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Fractal Heap ID for Huge Objects (Sub-types 1 and 2):
+      Indirectly Accessed, Non-filtered/Filtered
+    </caption>
+
+    <tr>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+    </tr>
+
+    <tr>
+      <td>Version and Type</td>
+      <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted
+          only to align table nicely</em></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />v2 B-tree Key<sup>L</sup><em> (variable size)</em><br /><br /></td>
+    </tr>
+
+  </table>
+
+  <table class="note">
+    <tr>
+      <td width="60%">&nbsp;</td>
+      <td width="40%">
+        (Items marked with an &lsquo;L&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfLengthsV0">Size
+          of Lengths</a> field in the superblock.)
+    </td></tr>
+  </table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Fractal Heap ID for Huge Objects (Sub-types 1 and 2):
+      Indirectly Accessed, Non-filtered/Filtered
+    </caption>
+    <tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+    </tr>
+
+    <tr>
+      <td><p>Version and Type</p></td>
+      <td>
+        <p>This is a bit field with the following definition:
+          <table class="list">
+            <tr>
+              <th width="20%" align="center">Bit</th>
+              <th width="80%" align="left">Description</th>
+            </tr>
+
+            <tr>
+              <td align="center"><code>6-7</code></td>
+              <td>The current version of ID format.  This document
+                describes version 0.
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>4-5</code></td>
+              <td>The ID type.  Huge objects have a value of <code>1</code>.
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>0-3</code></td>
+              <td>Reserved.
+              </td>
+            </tr>
+        </table></p>
+
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>v2 B-tree Key</p></td>
+      <td><p>This field is the B-tree key for retrieving the information
+          from the version 2 B-tree for huge objects needed to access the
+          object.  See the description of <a href="#V2Btrees">v2 B-tree</a>
+          records sub-types 1 and 2 for a description of the fields.  New key
+          values are derived from <em>Next Huge Object ID</em> in the
+          <em>Fractal Heap Header</em>.</p>
+      </td>
+    </tr>
+
+  </table>
+</div>
+
+<br />
+<br />
+<br />
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Fractal Heap ID for Huge Objects (Sub-type 3):
+      Directly Accessed, Non-filtered
+    </caption>
+
+    <tr>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+    </tr>
+
+    <tr>
+      <td>Version and Type</td>
+      <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Address <sup>O</sup><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Length <sup>L</sup><br /><br /></td>
+    </tr>
+
+  </table>
+
+  <table class="note">
+    <tr>
+      <td width="60%">&nbsp;</td>
+      <td width="40%">
+        (Items marked with an &lsquo;O&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfOffsetsV0">Size
+          of Offsets</a> field in the superblock.)
+    </td></tr>
+    <tr>
+      <td>&nbsp;</td>
+      <td>
+        (Items marked with an &lsquo;L&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfLengthsV0">Size
+          of Lengths</a> field in the superblock.)
+    </td></tr>
+  </table>
+
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Fractal Heap ID for Huge Objects (Sub-type 3):
+      Directly Accessed, Non-filtered
+    </caption>
+    <tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+    </tr>
+
+    <tr>
+      <td><p>Version and Type</p></td>
+      <td>
+        <p>This is a bit field with the following definition:
+          <table class="list">
+            <tr>
+              <th width="20%" align="center">Bit</th>
+              <th width="80%" align="left">Description</th>
+            </tr>
+
+            <tr>
+              <td align="center"><code>6-7</code></td>
+              <td>The current version of ID format.  This document
+                describes version 0.
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>4-5</code></td>
+              <td>The ID type.  Huge objects have a value of <code>1</code>.
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>0-3</code></td>
+              <td>Reserved.
+              </td>
+            </tr>
+        </table></p>
+
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Address</p></td>
+      <td><p>This field is the address of the object in the file.</p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Length</p></td>
+      <td><p>This field is the length of the object in the file.</p>
+      </td>
+    </tr>
+  </table>
+</div>
+
+<br />
+<br />
+<br />
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Fractal Heap ID for Huge Objects (Sub-type 4):
+      Directly Accessed, Filtered
+    </caption>
+
+    <tr>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+    </tr>
+
+    <tr>
+      <td>Version and Type</td>
+      <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Address <sup>O</sup><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Length <sup>L</sup><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4">Filter Mask</td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />De-filtered Size <sup>L</sup><br /><br /></td>
+    </tr>
+
+  </table>
+
+  <table class="note">
+    <tr>
+      <td width="60%">&nbsp;</td>
+      <td width="40%">
+        (Items marked with an &lsquo;O&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfOffsetsV0">Size
+          of Offsets</a> field in the superblock.)
+    </td></tr>
+    <tr>
+      <td>&nbsp;</td>
+      <td>
+        (Items marked with an &lsquo;L&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfLengthsV0">Size
+          of Lengths</a> field in the superblock.)
+    </td></tr>
+  </table>
+
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Fractal Heap ID for Huge Objects (Sub-type 4):
+      Directly Accessed, Filtered
+    </caption>
+    <tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+    </tr>
+
+    <tr>
+      <td><p>Version and Type</p></td>
+      <td>
+        <p>This is a bit field with the following definition:
+          <table class="list">
+            <tr>
+              <th width="20%" align="center">Bit</th>
+              <th width="80%" align="left">Description</th>
+            </tr>
+
+            <tr>
+              <td align="center"><code>6-7</code></td>
+              <td>The current version of ID format.  This document
+                describes version 0.
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>4-5</code></td>
+              <td>The ID type.  Huge objects have a value of <code>1</code>.
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>0-3</code></td>
+              <td>Reserved.
+              </td>
+            </tr>
+        </table></p>
+
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Address</p></td>
+      <td><p>This field is the address of the filtered object in the file.</p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Length</p></td>
+	  <td><p>This field is the length of the filtered object in the file.</p>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td><p>Filter Mask</p></td>
+	  <td><p>This field is the I/O pipeline filter mask for the
+		  filtered object in the file.</p>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td><p>Filtered Size</p></td>
+	  <td><p>This field is the size of the de-filtered object in the file.</p>
+	  </td>
+	</tr>
+
+  </table>
+</div>
+
+<br />
+<br />
+<br />
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Fractal Heap ID for Managed Objects
+    </caption>
+
+    <tr>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+	</tr>
+
+    <tr>
+      <td>Version and Type</td>
+      <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+    </tr>
+    <tr>
+      <td colspan="4">Offset <em>(variable size)</em></td>
+    </tr>
+
+    <tr>
+      <td colspan="4">Length <em>(variable size)</em></td>
+    </tr>
+  </table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Fractal Heap ID for Managed Objects
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+    </tr>
+
+    <tr>
+      <td><p>Version and Type</p></td>
+      <td><p>This is a bit field with the following definition:
+          <table class="list">
+            <tr>
+              <th width="20%" align="center">Bit</th>
+              <th width="80%" align="left">Description</th>
+            </tr>
+
+            <tr>
+              <td align="center"><code>6-7</code></td>
+              <td>The current version of ID format.  This document
+                describes version 0.
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>4-5</code></td>
+              <td>The ID type.  Managed objects have a value of <code>0</code>.
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>0-3</code></td>
+              <td>Reserved.
+              </td>
+            </tr>
+        </table></p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Offset</p></td>
+      <td><p>This field is the offset of the object in the heap.
+          This field&rsquo;s size is the minimum number of bytes
+          necessary to encode the <em>Maximum Heap Size</em> value
+          (from the <em>Fractal Heap Header</em>). For example, if the
+          value of the <em>Maximum Heap Size</em> is less than 256 bytes,
+          this field is 1 byte in length, a <em>Maximum Heap Size</em>
+          of 256-65535 bytes uses a 2 byte length, and so on.</p></td>
+    </tr>
+
+    <tr>
+      <td><p>Length</p></td>
+      <td><p>This field is the length of the object in the heap. It
+          is determined by taking the minimum value of <em>Maximum
+            Direct Block Size</em> and <em>Maximum Size of Managed
+            Objects</em> in the <em>Fractal Heap Header</em>. Again,
+          the minimum number of bytes needed to encode that value is
+          used for the size of this field.</p></td>
+    </tr>
+  </table>
+</div>
+
+<h3><a name="FreeSpaceManager">
+    III.H. Disk Format: Level 1H - Free-space Manager</a></h3>
+
+<p>
+  Free-space managers are used to describe space within a heap or
+  the entire HDF5 file that is not currently used for that heap or
+  file.
+</p>
+
+<p>
+  The <em>free-space manager header</em> contains metadata information
+  about the space being tracked, along with the address of the list
+  of <em>free space sections</em> which actually describes the free
+  space. The header records information about free-space sections being
+  tracked, creation parameters for handling free-space sections of a
+  client, and section information used to locate the collection of
+  free-space sections.
+</p>
+
+<p>
+  The <em>free-space section list</em> stores a collection of
+  free-space sections that is specific to each <em>client</em> of the
+  free-space manager.
+
+  For example, the fractal heap is a client of the free space manager
+  and uses it to track unused space within the heap.  There are 4
+  types of section records for the fractal heap, each of which has
+  its own format, listed below.
+</p>
+
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Free-space Manager Header
+    </caption>
+
+    <tr>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+    </tr>
+
+    <tr>
+      <td colspan="4">Signature</td>
+    </tr>
+
+    <tr>
+      <td>Version</td>
+      <td>Client ID</td>
+      <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Total Space Tracked<sup>L</sup><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Total Number of Sections<sup>L</sup><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Number of Serialized Sections<sup>L</sup><br /><br /></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><br />Number of Un-Serialized Sections<sup>L</sup><br /><br /></td>
+	</tr>
+
+	<tr>
+	  <td colspan="2">Number of Section Classes</td>
+      <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+	</tr>
+
+    <tr>
+      <td colspan="2">Shrink Percent</td>
+      <td colspan="2">Expand Percent</td>
+    </tr>
+
+    <tr>
+      <td colspan="2">Size of Address Space</td>
+      <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+	</tr>
+
+    <tr>
+      <td colspan="4"><br />Maximum Section Size <sup>L</sup><br /><br /></td>
+	</tr>
+
+    <tr>
+      <td colspan="4"><br />Address of Serialized Section List<sup>O</sup><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Size of Serialized Section List Used<sup>L</sup><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Allocated Size of Serialized Section List<sup>L</sup><br /><br /></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">Checksum</td>
+	</tr>
+  </table>
+
+  <table class="note">
+    <tr>
+      <td width="60%">&nbsp;</td>
+      <td width="40%">
+        (Items marked with an &lsquo;L&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfLengthsV0">Size
+          of Lengths</a> field in the superblock.)
+    </td></tr>
+    <tr>
+      <td>&nbsp;</td>
+      <td>
+        (Items marked with an &lsquo;O&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfOffsetsV0">Size
+          of Offsets</a> field in the superblock.)
+    </td></tr>
+  </table>
+
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Free-space Manager Header
+    </caption>
+	<tr>
+      <th width="35%">Field Name</th>
+      <th>Description</th>
+    </tr>
+
+    <tr>
+      <td><p>Signature</p></td>
+      <td>
+        <p>The ASCII character string &ldquo;<code>FSHD</code>&rdquo;
+          is used to indicate the beginning of the Free-space Manager
+          Header. This gives file consistency checking utilities a
+          better chance of reconstructing a damaged file.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Version</p></td>
+      <td>
+        <p>This is the version number for the Free-space Manager Header
+		  and this document describes version 0.</p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Client ID</p></td>
+      <td>
+        <p>This is the client ID for identifying the user of this
+          free-space manager:
+
+          <table class="list">
+            <tr>
+              <th width="20%" align="center">ID</th>
+              <th width="80%" align="left">Description</th>
+            </tr>
+
+            <tr>
+              <td align="center"><code>0</code></td>
+              <td>Fractal heap
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>1</code></td>
+              <td>File
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>2+</code></td>
+              <td>Reserved.
+              </td>
+            </tr>
+        </table></p>
+
+      </td>
+    </tr>
+
+	<tr>
+      <td><p>Total Space Tracked</p></td>
+	  <td>
+        <p>This is the total amount of free space being tracked, in bytes.
+        </p>
+      </td>
+	</tr>
+
+    <tr>
+      <td><p>Total Number of Sections</p></td>
+      <td>
+	    <p>This is the total number of free-space sections being tracked.
+        </p>
+      </td>
+    </tr>
+
+	<tr>
+	  <td><p>Number of Serialized Sections</p></td>
+	  <td>
+	    <p>This is the number of serialized free-space sections being
+          tracked.
+        </p>
+	  </td>
+	</tr>
+	<tr>
+	  <td><p>Number of Un-Serialized Sections</p></td>
+	  <td>
+        <p>This is the number of un-serialized free-space sections being
+          managed.  Un-serialized sections are created by the free-space
+          client when the list of sections is read in.
+        </p>
+	  </td>
+    </tr>
+
+    <tr>
+      <td><p>Number of Section Classes</p></td>
+      <td>
+	    <p>This is the number of section classes handled by this free space
+          manager for the free-space client.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Shrink Percent</p></td>
+      <td>
+	    <p>This is the percent of current size to shrink the allocated
+          serialized free-space section list.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Expand Percent</p></td>
+      <td>
+	    <p>This is the percent of current size to expand the allocated
+          serialized free-space section list.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Size of Address Space</p></td>
+      <td>
+        <p>This is the size of the address space that free-space sections
+          are within.  This is stored as the log<sub>2</sub> of the
+          actual value (in other words, the number of bits required
+          to store values within that address space).
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Maximum Section Size</p></td>
+      <td>
+        <p>This is the maximum size of a section to be tracked.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Address of Serialized Section List</p></td>
+      <td>
+        <p>This is the address where the serialized free-space section
+          list is stored.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Size of Serialized Section List Used</p></td>
+      <td>
+        <p>This is the size of the serialized free-space section
+          list used (in bytes).  This value must be less than
+          or equal to the <em>allocated size of serialized section
+            list</em>, below.
+	    </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Allocated Size of Serialized Section List</p></td>
+      <td>
+        <p>This is the size of serialized free-space section list
+          actually allocated (in bytes).
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Checksum</p></td>
+      <td>
+        <p>This is the checksum for the free-space manager header.</p>
+      </td>
+    </tr>
+
+  </table>
+</div>
+
+<br />
+<p>The free-space sections being managed are stored in a
+  <em>free-space section list</em>, described below. The sections
+  in the free-space section list are stored in the following way:
+  a count of the number of sections describing a particular size of
+  free space and the size of the free-space described (in bytes),
+  followed by a list of section description records; then another
+  section count and size, followed by the list of section
+  descriptions for that size; and so on.</p>
+
+
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Free-space Section List
+    </caption>
+
+    <tr>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+    </tr>
+
+    <tr>
+      <td colspan="4">Signature</td>
+    </tr>
+
+    <tr>
+      <td>Version</td>
+      <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Free-space Manager Header Address<sup>O</sup><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4">Number of Section Records in Set #0 <em>(variable size)</em></td>
+    </tr>
+
+    <tr>
+      <td colspan="4">Size of Free-space Section Described in Record Set #0 <em>(variable size)</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">Record Set #0 Section Record #0 Offset<em>(variable size)</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan="1">Record Set #0 Section Record #0 Type</td>
+      <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">Record Set #0 Section Record #0 Data <em>(variable size)</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">...</td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">Record Set #0 Section Record #K-1 Offset<em>(variable size)</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan="1">Record Set #0 Section Record #K-1 Type</td>
+      <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">Record Set #0 Section Record #K-1 Data <em>(variable size)</em></td>
+	</tr>
+
+    <tr>
+      <td colspan="4">Number of Section Records in Set #1 <em>(variable size)</em></td>
+    </tr>
+
+    <tr>
+      <td colspan="4">Size of Free-space Section Described in Record Set #1 <em>(variable size)</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">Record Set #1 Section Record #0 Offset<em>(variable size)</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan="1">Record Set #1 Section Record #0 Type</td>
+      <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">Record Set #1 Section Record #0 Data <em>(variable size)</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">...</td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">Record Set #1 Section Record #K-1 Offset<em>(variable size)</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan="1">Record Set #1 Section Record #K-1 Type</td>
+      <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">Record Set #1 Section Record #K-1 Data <em>(variable size)</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><strong>...</strong></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><strong>...</strong></td>
+	</tr>
+
+    <tr>
+      <td colspan="4">Number of Section Records in Set #N-1 <em>(variable size)</em></td>
+    </tr>
+
+    <tr>
+      <td colspan="4">Size of Free-space Section Described in Record Set #N-1 <em>(variable size)</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">Record Set #N-1 Section Record #0 Offset<em>(variable size)</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan="1">Record Set #N-1 Section Record #0 Type</td>
+      <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">Record Set #N-1 Section Record #0 Data <em>(variable size)</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">...</td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">Record Set #N-1 Section Record #K-1 Offset<em>(variable size)</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan="1">Record Set #N-1 Section Record #K-1 Type</td>
+      <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">Record Set #N-1 Section Record #K-1 Data <em>(variable size)</td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">Checksum</td>
+	</tr>
+  </table>
+
+  <table class="note">
+    <tr>
+      <td width="60%">&nbsp;</td>
+      <td width="40%">
+        (Items marked with an &lsquo;O&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfOffsetsV0">Size
+          of Offsets</a> field in the superblock.)
+    </td></tr>
+  </table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Free-space Section List
+    </caption>
+	<tr>
+      <th width="35%">Field Name</th>
+      <th>Description</th>
+    </tr>
+
+    <tr>
+      <td><p>Signature</p></td>
+      <td>
+        <p>The ASCII character string &ldquo;<code>FSSE</code>&rdquo;
+          is used to indicate the beginning of the Free-space Section
+          Information. This gives file consistency checking utilities
+          a better chance of reconstructing a damaged file.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Version</p></td>
+      <td>
+        <p>This is the version number for the Free-space Section List
+		  and this document describes version 0.</p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Free-space Manager Header Address</p></td>
+      <td>
+        <p>This is the address of the <em>Free-space Manager Header</em>.
+          This field is principally used for file
+          integrity checking.
+        </p>
+      </td>
+    </tr>
+
+	<tr>
+      <td><p>Number of Section Records for Set #N</p></td>
+	  <td>
+        <p>This is the number of free-space section records for set #N.
+		  The length of this field is the minimum number of bytes needed
+          to store the <em>number of serialized sections</em> (from the
+          <em>free-space manager header</em>).
+        </p>
+
+        <p>
+          The number of sets of free-space section records is
+          determined by the <em>size of serialized section list</em> in
+          the <em>free-space manager header</em>.
+        </p>
+      </td>
+	</tr>
+
+    <tr>
+      <td><p>Section Size for Record Set #N</p></td>
+      <td>
+	    <p>This is the size (in bytes) of the free-space section described
+          for <em>all</em> the section records in set #N.
+        </p>
+
+        <p>
+		  The length of this field is the minimum number of bytes needed
+          to store the <em>maximum section size</em> (from the
+          <em>free-space manager header</em>).
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Record Set #N Section #K Offset</p></td>
+      <td>
+	    <p>This is the offset (in bytes) of the free-space section within
+          the client for the free-space manager.
+        </p>
+
+        <p>
+		  The length of this field is the minimum number of bytes needed
+          to store the <em>size of address space</em> (from the
+          <em>free-space manager header</em>).
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Record Set #N Section #K Type</p></td>
+      <td>
+	    <p>This is the type of the section record, used to decode the
+          <em>record set #N section #K data</em> information. The defined
+          record type for <em>file</em> client is:
+
+          <table class="list">
+            <tr>
+              <th width="20%" align="center">Type</th>
+              <th width="80%" align="left">Description</th>
+            </tr>
+
+            <tr>
+              <td align="center"><code>0</code></td>
+              <td>File&rsquo;s section (a range of actual bytes in file)
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>1+</code></td>
+              <td>Reserved.
+              </td>
+            </tr>
+        </table></p>
+
+	    <p>The defined record types for a <em>fractal heap</em> client are:
+
+          <table class="list">
+            <tr>
+              <th width="20%" align="center">Type</th>
+              <th width="80%" align="left">Description</th>
+            </tr>
+
+            <tr>
+              <td align="center"><code>0</code></td>
+              <td>Fractal heap &ldquo;single&rdquo; section
+              </td>
+            </tr>
+
+            <tr>
+              <td align="center"><code>1</code></td>
+              <td>Fractal heap &ldquo;first row&rdquo; section
+              </td>
+            </tr>
+
+            <tr>
+              <td align="center"><code>2</code></td>
+              <td>Fractal heap &ldquo;normal row&rdquo; section
+              </td>
+            </tr>
+
+            <tr>
+              <td align="center"><code>3</code></td>
+              <td>Fractal heap &ldquo;indirect&rdquo; section
+              </td>
+            </tr>
+
+            <tr>
+              <td align="center"><code>4+</code></td>
+              <td>Reserved.
+              </td>
+            </tr>
+        </table></p>
+
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Record Set #N Section #K Data</p></td>
+      <td>
+	    <p>This is the section-type specific information for each record
+          in the record set, described below.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Checksum</p></td>
+      <td>
+	    <p>This is the checksum for the <em>Free-space Section List</em>.
+        </p>
+      </td>
+    </tr>
+
+  </table>
+</div>
+
+<br />
+<p>
+  The section-type specific data for each free-space section record is
+  described below:
+</p>
+
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: File&rsquo;s Section Data Record
+    </caption>
+
+    <tr>
+      <td colspan="4"><em>No additional record data stored</em></td>
+    </tr>
+  </table>
+</div>
+
+<br />
+<br />
+<br />
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Fractal Heap &ldquo;Single&rdquo; Section Data Record
+    </caption>
+
+    <tr>
+      <td colspan="4"><em>No additional record data stored</em></td>
+    </tr>
+  </table>
+</div>
+
+<br />
+<br />
+<br />
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Fractal Heap &ldquo;First Row&rdquo; Section Data
+      Record
+    </caption>
+
+    <tr>
+      <td colspan="4"><em>Same format as &ldquo;indirect&rdquo;
+          section data</em></td>
+    </tr>
+  </table>
+</div>
+
+<br />
+<br />
+<br />
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Fractal Heap &ldquo;Normal Row&rdquo; Section Data
+      Record
+    </caption>
+
+    <tr>
+      <td colspan="4"><em>No additional record data stored</em></td>
+    </tr>
+  </table>
+</div>
+
+<br />
+<br />
+<br />
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Fractal Heap &ldquo;Indirect&rdquo; Section
+      Data Record
+    </caption>
+
+    <tr>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+    </tr>
+
+    <tr>
+      <td colspan="4">Fractal Heap Indirect Block Offset <em>(variable size)</em></td>
+    </tr>
+
+    <tr>
+      <td colspan="2">Block Start Row</td>
+      <td colspan="2">Block Start Column</td>
+    </tr>
+
+    <tr>
+      <td colspan="2">Number of Blocks</td>
+      <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+    </tr>
+  </table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Fractal Heap &ldquo;Indirect&rdquo; Section
+      Data Record
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+    </tr>
+
+    <tr>
+      <td><p>Fractal Heap Block Offset</p></td>
+      <td>
+        <p>The offset of the indirect block in the fractal heap&rsquo;s address
+          space containing the empty blocks.
+        </p>
+        <p>
+          The number of bytes used to encode this field is the minimum
+          number of bytes needed to encode values for the <em>Maximum
+            Heap Size</em> (in the fractal heap&rsquo;s header).
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Block Start Row</p></td>
+      <td>
+        <p>This is the row that the empty blocks start in.
+	    </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Block Start Column</p></td>
+      <td>
+        <p>This is the column that the empty blocks start in.
+	    </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Number of Blocks</p></td>
+      <td>
+        <p>This is the number of empty blocks covered by the section.
+	    </p>
+      </td>
+    </tr>
+  </table>
+</div>
+
+<h3><a name="SOHMTable">
+    III.I. Disk Format: Level 1I - Shared Object Header Message Table</a></h3>
+
+<p>
+  The <em>shared object header message table</em> is used to locate
+  object
+  header messages that are shared between two or more object headers
+  in the file.  Shared object header messages are stored and indexed
+  in the file in one of two ways: indexed sequentially in a
+  <em>shared header message list</em> or indexed with a v2 B-tree.
+  The shared messages themselves are either stored in a fractal
+  heap (when two or more objects share the message), or remain in an
+  object&rsquo;s header (when only one object uses the message currently,
+  but the message can be shared in the future).
+</p>
+
+<p>
+  The <em>shared object header message table</em>
+  contains a list of shared message index headers.  Each index header
+  records information about the version of the index format, the index
+  storage type, flags for the message types indexed, the number of
+  messages in the index, the address where the index resides,
+  and the fractal heap address if shared messages are stored there.
+</p>
+
+<p>
+  Each index can be either a list or a v2 B-tree and may transition
+  between those two forms as the number of messages in the index
+  varies.  Each shared message record contains information used to
+  locate the shared message from either a fractal heap or an object
+  header.  The types of messages that can be shared are: <em>Dataspace,
+    Datatype, Fill Value, Filter Pipeline and Attribute</em>.
+</p>
+
+<p>
+  The <em>shared object header message table</em> is pointed to
+  from a <a href="#SOHMTableMessage">shared message table</a> message
+  in the superblock extension for a file.  This message stores the
+  version of the table format, along with the number of index headers
+  in the table.
+</p>
+
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Shared Object Header Message Table
+    </caption>
+
+    <tr>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+    </tr>
+
+    <tr>
+      <td colspan="4">Signature</td>
+    </tr>
+
+    <tr>
+      <td>Version for index #0</td>
+      <td>Index Type for index #0</td>
+      <td colspan="2">Message Type Flags for index #0</td>
+    </tr>
+
+    <tr>
+      <td colspan="4">Minimum Message Size for index #0</td>
+    </tr>
+
+    <tr>
+      <td colspan="2">List Cutoff for index #0</td>
+      <td colspan="2">v2 B-tree Cutoff for index #0</td>
+    </tr>
+
+    <tr>
+      <td colspan="2">Number of Messages for index #0</td>
+      <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><br />Index Address<sup>O</sup> for index #0<br /><br /></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><br />Fractal Heap Address<sup>O</sup> for index #0<br /><br /></td>
+	</tr>
+
+    <tr>
+      <td colspan="4">...</td>
+	</tr>
+
+    <tr>
+      <td colspan="4">...</td>
+	</tr>
+
+    <tr>
+      <td>Version for index #N-1</td>
+      <td>Index Type for index #N-1</td>
+      <td colspan="2">Message Type Flags for index #N-1</td>
+    </tr>
+
+    <tr>
+      <td colspan="4">Minimum Message Size for index #N-1</td>
+    </tr>
+
+    <tr>
+      <td colspan="2">List Cutoff for index #N-1</td>
+      <td colspan="2">v2 B-tree Cutoff for index #N-1</td>
+    </tr>
+
+    <tr>
+      <td colspan="2">Number of Messages for index #N-1</td>
+      <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><br />Index Address<sup>O</sup> for index #N-1<br /><br /></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><br />Fractal Heap Address<sup>O</sup> for index #N-1<br /><br /></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">Checksum</td>
+	</tr>
+  </table>
+
+  <table class="note">
+    <tr>
+      <td width="60%">&nbsp;</td>
+      <td width="40%">
+        (Items marked with an &lsquo;O&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfOffsetsV0">Size
+          of Offsets</a> field in the superblock.)
+    </td></tr>
+  </table>
+
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Shared Object Header Message Table
+    </caption>
+	<tr>
+      <th width="35%">Field Name</th>
+      <th>Description</th>
+    </tr>
+
+    <tr>
+      <td><p>Signature</p></td>
+      <td>
+        <p>The ASCII character string &ldquo;<code>SMTB</code>&rdquo;
+          is used to indicate the beginning of the Shared Object
+          Header Message table. This gives file consistency checking
+          utilities a better chance of reconstructing a damaged file.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Version for index #N</p></td>
+      <td>
+        <p>This is the version number for the list of shared object header message
+		  indexes and this document describes version 0.</p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Index Type for index #N</p></td>
+      <td>
+        <p>The type of index can be an unsorted list or a v2 B-tree.
+        </p>
+      </td>
+    </tr>
+
+	<tr>
+      <td><p>Message Type Flags for index #N</p></td>
+	  <td>
+        <p>This field indicates the type of messages tracked in the index,
+          as follows:
+          <table class="list">
+            <tr>
+              <th width="20%" align="center">Bits</th>
+              <th width="80%" align="left">Description</th>
+            </tr>
+
+            <tr>
+              <td align="center"><code>0</code></td>
+              <td>If set, the index tracks <em>Dataspace Messages</em>.
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>1</code></td>
+              <td>If set, the message tracks <em>Datatype Messages</em>.
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>2</code></td>
+              <td>If set, the message tracks <em>Fill Value Messages</em>.
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>3</code></td>
+              <td>If set, the message tracks <em>Filter Pipeline Messages</em>.
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>4</code></td>
+              <td>If set, the message tracks <em>Attribute Messages</em>.
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>5-15</code></td>
+              <td>Reserved (zero).
+              </td>
+            </tr>
+        </table></p>
+
+
+        <p>
+          An index can track more than one type of message, but each type
+          of message can only by in one index.
+        </p>
+      </td>
+	</tr>
+
+    <tr>
+      <td><p>Minimum Message Size for index #N</p></td>
+      <td>
+	    <p>This is the message size sharing threshold for the index.
+		  If the encoded size of the message is less than this value, the
+          message is not shared.
+        </p>
+      </td>
+    </tr>
+
+	<tr>
+	  <td><p>List Cutoff for index #N</p></td>
+	  <td>
+	    <p>This is the cutoff value for the indexing of messages to
+          switch from a list to a v2 B-tree.  If the number of messages
+          is greater than this value, the index should be a v2 B-tree.
+        </p>
+	  </td>
+	</tr>
+	<tr>
+	  <td><p>v2 B-tree Cutoff for index #N</p></td>
+	  <td>
+        <p>This is the cutoff value for the indexing of messages
+          to switch from a v2 B-tree back to a list. If the number
+          of messages is less than this value, the index should be
+          a list.
+        </p>
+	  </td>
+    </tr>
+
+    <tr>
+      <td><p>Number of Messages for index #N</p></td>
+      <td>
+	    <p>The number of shared messages being tracked for the index.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Index Address for index #N</p></td>
+      <td>
+	    <p>This field is the address of the list or v2 B-tree where the
+          index nodes reside.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Fractal Heap Address for index #N</p></td>
+      <td>
+	    <p>This field is the address of the fractal heap if shared messages
+          are stored there.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Checksum</p></td>
+      <td>
+        <p>This is the checksum for the table.</p>
+      </td>
+    </tr>
+
+  </table>
+</div>
+
+<br />
+<p>
+  Shared messages are indexed either with a <em>shared message record
+    list</em>, described below, or using a v2 B-tree (using record type 7).
+  The number of records in the <em>shared message record list</em> is
+  determined in the index&rsquo;s entry in the <em>shared object header message
+    table</em>.
+</p>
+
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Shared Message Record List
+    </caption>
+
+    <tr>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+    </tr>
+
+    <tr>
+      <td colspan="4">Signature</td>
+    </tr>
+
+    <tr>
+      <td colspan="4">Shared Message Record #0</td>
+    </tr>
+
+    <tr>
+      <td colspan="4">Shared Message Record #1</td>
+    </tr>
+
+    <tr>
+      <td colspan="4">...</td>
+    </tr>
+
+    <tr>
+      <td colspan="4">Shared Message Record #N-1</td>
+    </tr>
+
+    <tr>
+      <td colspan="4">Checksum</td>
+    </tr>
+  </table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Shared Message Record List
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+    </tr>
+
+    <tr>
+      <td><p>Signature</p></td>
+      <td>
+        <p>The ASCII character string &ldquo;<code>SMLI</code>&rdquo;
+          is used to indicate the beginning of a list of index nodes.
+          This gives file consistency checking utilities a better
+          chance of reconstructing a damaged file.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Shared Message Record #N</p></td>
+      <td>
+        <p>The record for locating the shared message, either in the
+          fractal heap for the index, or an object header (see format for
+          <em>index nodes</em> below).
+	    </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Checksum</p></td>
+      <td>
+        <p>This is the checksum for the list.
+        </p>
+      </td>
+    </tr>
+
+  </table>
+</div>
+
+<br />
+<p>
+  The record for each shared message in an index is stored in one
+  of the following forms:
+</p>
+
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Shared Message Record for Messages Stored in a
+      Fractal Heap
+    </caption>
+
+    <tr>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+    </tr>
+
+    <tr>
+      <td>Message Location</td>
+      <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+    </tr>
+
+    <tr>
+      <td colspan="4">Hash Value</td>
+    </tr>
+
+    <tr>
+      <td colspan="4">Reference Count</td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Fractal Heap ID<br /><br /></td>
+    </tr>
+  </table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Shared Message Record for Messages Stored in a
+      Fractal Heap
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+    </tr>
+
+    <tr>
+      <td><p>Message Location</p></td>
+      <td>
+        <p>This has a value of 0 indicating that the message is stored in
+          the heap.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Hash Value</p></td>
+      <td>
+        <p>This is the hash value for the message.
+	    </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Reference Count</p></td>
+      <td>
+        <p>This is the number of times the message is used in the file.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Fractal Heap ID</p></td>
+      <td>
+	    <p>This is an 8-byte fractal heap ID for the message as stored in
+          the fractal heap for the index.
+        </p>
+      </td>
+    </tr>
+  </table>
+</div>
+
+<br />
+<br />
+<br />
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Shared Message Record for Messages Stored in an
+      Object Header
+    </caption>
+
+    <tr>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+    </tr>
+
+    <tr>
+      <td>Message Location</td>
+      <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+    </tr>
+
+    <tr>
+      <td colspan="4">Hash Value</td>
+    </tr>
+
+    <tr>
+      <td>Reserved</td>
+      <td>Message Type</td>
+      <td colspan="2">Creation Index</td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Object Header Address<sup>O</sup><br /><br /></td>
+    </tr>
+  </table>
+
+  <table class="note">
+    <tr>
+      <td width="60%">&nbsp;</td>
+      <td width="40%">
+        (Items marked with an &lsquo;O&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfOffsetsV0">Size
+          of Offsets</a> field in the superblock.)
+    </td></tr>
+  </table>
+
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Shared Message Record for Messages Stored in an
+      Object Header
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+    </tr>
+
+    <tr>
+      <td><p>Message Location</p></td>
+      <td>
+        <p>This has a value of 1 indicating that the message is stored in
+          an object header.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Hash Value</p></td>
+      <td>
+        <p>This is the hash value for the message.
+	    </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Message Type</p></td>
+      <td>
+        <p>This is the message type in the object header.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Creation Index</p></td>
+      <td>
+	    <p>This is the creation index of the message within the object
+          header.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Object Header Address</p></td>
+      <td>
+	    <p>This is the address of the object header where the message is
+          located.
+        </p>
+      </td>
+    </tr>
+  </table>
+</div>
+
+<h2><a name="DataObject">
+    IV. Disk Format: Level 2 - Data Objects </a></h2>
+
+<p>Data objects contain the &ldquo;real&rdquo; user-visible information in the file.
+  These objects compose the scientific data and other information which
+  are generally thought of as &ldquo;data&rdquo; by the end-user.  All the
+  other information in the file is provided as a framework for
+  storing and accessing these data objects.
+</p>
+
+<p>A data object is composed of header and data
+  information.  The header information contains the information
+  needed to interpret the data information for the object as
+  well as additional &ldquo;metadata&rdquo; or pointers to additional
+  &ldquo;metadata&rdquo; used to describe or annotate each object.
+</p>
+
+<h3><a name="ObjectHeader">
+    IV.A. Disk Format: Level 2A - Data Object Headers</a></h3>
+
+<p>The header information of an object is designed to encompass
+  all of the information about an object, except for the data itself.
+  This information includes the dataspace, the datatype, information
+  about how the data is stored on disk (in external files, compressed,
+  broken up in blocks, and so on), as well as other information used
+  by the library to speed up access to the data objects or maintain
+  a file&rsquo;s integrity. Information stored by user applications
+  as attributes is also stored in the object&rsquo;s header. The header
+  of each object is not necessarily located immediately prior to the
+  object&rsquo;s data in the file and in fact may be located in any
+  position in the file. The order of the messages in an object header
+  is not significant.</p>
+
+<p>Object headers are composed of a prefix and a set of messages.  The
+  prefix contains the information needed to interpret the messages and
+  a small amount of metadata about the object, and the messages contain
+  the majority of the metadata about the object.
+</p>
+
+<h3><a name="ObjectHeaderPrefix">
+    IV.A.1. Disk Format: Level 2A1 - Data Object Header Prefix</a></h3>
+
+
+
+<h4><a name="V1ObjectHeaderPrefix">
+    IV.A.1.a. Version 1 Data Object Header Prefix</a></h4>
+
+<p>Header messages are aligned on 8-byte boundaries for version 1
+  object headers.
+</p>
+
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Version 1 Object Header
+    </caption>
+
+	<tr>
+	  <th>byte</th>
+	  <th>byte</th>
+	  <th>byte</th>
+	  <th>byte</th>
+	</tr>
+
+	<tr>
+	  <td>Version</td>
+	  <td>Reserved (zero)</td>
+	  <td colspan="2">Total Number of Header Messages</td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">Object Reference Count</td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">Object Header Size</td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">Reserved (zero)</td>
+	</tr>
+
+	<tr>
+	  <td colspan="2">Header Message Type #1</td>
+	  <td colspan="2">Size of Header Message Data #1</td>
+	</tr>
+
+	<tr>
+	  <td>Header Message #1 Flags</td>
+	  <td colspan="3">Reserved (zero)</td>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><br />Header Message Data #1<br /><br /></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">.<br />.<br />.<br /></td>
+	</tr>
+
+	<tr>
+	  <td colspan="2">Header Message Type #n</td>
+	  <td colspan="2">Size of Header Message Data #n</td>
+	</tr>
+
+	<tr>
+	  <td>Header Message #n Flags</td>
+	  <td colspan="3">Reserved (zero)</td>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><br />Header Message Data #n<br /><br /></td>
+	</tr>
+  </table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Version 1 Object Header
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td><p>Version</p></td>
+	  <td>
+        <p>This value is used to determine the format of the
+          information in the object header.  When the format of the
+          object header is changed, the version number
+          is incremented and can be used to determine how the
+          information in the object header is formatted.  This
+          is version one (1) (there was no version zero (0)) of the
+          object header.
+        </p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Total Number of Header Messages</p></td>
+	  <td>
+        <p>This value determines the total number of messages listed in
+          object headers for this object.  This value includes the messages
+          in continuation messages for this object.
+        </p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Object Reference Count</p></td>
+	  <td>
+        <p>This value specifies the number of &ldquo;hard links&rdquo; to this object
+          within the current file.  References to the object from external
+          files, &ldquo;soft links&rdquo; in this file and object references in this
+          file are not tracked.
+        </p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Object Header Size</p></td>
+	  <td>
+        <p>This value specifies the number of bytes of header message data
+          following this length field that contain object header messages
+          for this object header.  This value does not include the size of
+          object header continuation blocks for this object elsewhere in the
+          file.
+        </p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Header Message #n Type</p></td>
+	  <td>
+        <p>This value specifies the type of information included in the
+          following header message data.  The message types for
+          header messages are defined in sections below.
+        </p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Size of Header Message #n Data</p></td>
+	  <td>
+        <p>This value specifies the number of bytes of header
+          message data following the header message type and length
+          information for the current message. The size includes
+          padding bytes to make the message a multiple of eight
+          bytes.
+        </p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Header Message #n Flags</p></td>
+	  <td>
+        <p>This is a bit field with the following definition:
+          <table class="list">
+            <tr>
+              <th width="20%" align="center">Bit</th>
+              <th width="80%" align="left">Description</th>
+            </tr>
+
+            <tr>
+              <td align="center"><code>0</code></td>
+              <td>If set, the message data is constant.  This is used
+                for messages like the datatype message of a dataset.
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>1</code></td>
+              <td>If set, the message is <em>shared</em> and stored
+                in another location than the object header.  The Header
+                Message Data field contains a Shared Message
+                (described in the <a href="#ObjectHeaderMessages">Data Object Header Messages</a>
+                section below)
+                and the Size of Header Message Data field
+                contains the size of that Shared Message.
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>2</code></td>
+              <td>If set, the message should not be shared.
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>3</code></td>
+              <td>If set, the HDF5 decoder should fail to open this object
+                if it does not understand the message&rsquo;s type and the file
+                is open with permissions allowing write access to the file.
+                (Normally, unknown messages can just be ignored by HDF5
+                decoders)
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>4</code></td>
+              <td>If set, the HDF5 decoder should set bit 5 of this
+                message&rsquo;s flags (in other words, this bit field)
+                if it does not understand the message&rsquo;s type
+                and the object is modified in any way. (Normally,
+                unknown messages can just be ignored by HDF5
+                decoders)
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>5</code></td>
+              <td>If set, this object was modified by software that did not
+                understand this message.
+                (Normally, unknown messages should just be ignored by HDF5
+                decoders)  (Can be used to invalidate an index or a similar
+                feature)
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>6</code></td>
+              <td>If set, this message is shareable.
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>7</code></td>
+              <td>If set, the HDF5 decoder should always fail to open this
+                object if it does not understand the message&rsquo;s type (whether
+                it is open for read-only or read-write access).  (Normally,
+                unknown messages can just be ignored by HDF5 decoders)
+              </td>
+            </tr>
+	    </table></p>
+
+      </td>
+    </tr>
+
+	<tr>
+	  <td><p>Header Message #n Data</p></td>
+	  <td>
+        <p>The format and length of this field is determined by the
+          header message type and size respectively.  Some header
+          message types do not require any data and this information
+          can be eliminated by setting the length of the message to
+          zero. The data is padded with enough zeroes to make the
+          size a multiple of eight.
+        </p>
+      </td>
+	</tr>
+  </table>
+</div>
+
+<h4><a name="V2ObjectHeaderPrefix">
+    IV.A.1.b. Version 2 Data Object Header Prefix</a></h4>
+
+<p>Note that the &ldquo;total number of messages&rdquo; field has been dropped from
+  the data object header prefix in this version.  The number of messages
+  in the data object header is just determined by the messages encountered
+  in all the object header blocks.</p>
+
+<p>Note also that the fields and messages in this version of data object
+  headers have <em>no</em> alignment or padding bytes inserted - they are
+  stored packed together.</p>
+
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Version 2 Object Header
+    </caption>
+
+	<tr>
+	  <th>byte</th>
+	  <th>byte</th>
+	  <th>byte</th>
+	  <th>byte</th>
+	</tr>
+
+	<tr>
+	  <td colspan="4">Signature</td>
+	</tr>
+	<tr>
+	  <td>Version</td>
+	  <td>Flags</td>
+      <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">Access time <em>(optional)</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">Modification Time <em>(optional)</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">Change Time <em>(optional)</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">Birth Time <em>(optional)</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan="2">Maximum # of compact attributes <em>(optional)</em></td>
+	  <td colspan="2">Minimum # of dense attributes <em>(optional)</em></td>
+	</tr>
+
+	<tr>
+	  <td>Size of Chunk #0 <em>(variable size)</em></td>
+      <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+	</tr>
+
+	<tr>
+	  <td>Header Message Type #1</td>
+	  <td colspan="2">Size of Header Message Data #1</td>
+	  <td>Header Message #1 Flags</td>
+	</tr>
+
+	<tr>
+	  <td colspan="2">Header Message #1 Creation Order <em>(optional)</em></td>
+      <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><br />Header Message Data #1<br /><br /></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">.<br />.<br />.<br /></td>
+	</tr>
+
+	<tr>
+	  <td>Header Message Type #n</td>
+	  <td colspan="2">Size of Header Message Data #n</td>
+	  <td>Header Message #n Flags</td>
+	</tr>
+
+	<tr>
+	  <td colspan="2">Header Message #n Creation Order <em>(optional)</em></td>
+      <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><br />Header Message Data #n<br /><br /></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">Gap <em>(optional, variable size)</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">Checksum</td>
+	</tr>
+  </table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Version 2 Object Header
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td><p>Signature</p></td>
+	  <td>
+        <p>The ASCII character string &ldquo;<code>OHDR</code>&rdquo;
+          is used to indicate the beginning of an object header. This
+          gives file consistency checking utilities a better chance
+          of reconstructing a damaged file.
+	    </p>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td><p>Version</p></td>
+	  <td>
+        <p>This field has a value of 2 indicating version 2 of the object header.
+        </p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Flags</p></td>
+	  <td>
+        <p>This field is a bit field indicating additional information
+          about the object header.
+          <table class="list">
+            <tr>
+              <th width="20%" align="center">Bit(s)</th>
+              <th width="80%" align="left">Description</th>
+            </tr>
+
+            <tr>
+              <td align="center"><code>0-1</code></td>
+              <td>This two bit field determines the size of the
+                <em>Size of Chunk #0</em> field.  The values are:
+                <table class="list">
+                  <tr>
+                    <th width="20%" align="center">Value</th>
+                    <th width="80%" align="left">Description</th>
+                  </tr>
+
+                  <tr>
+                    <td align="center"><code>0</code></td>
+                    <td>The <em>Size of Chunk #0</em> field is 1 byte.
+                    </td>
+                  </tr>
+                  <tr>
+                    <td align="center"><code>1</code></td>
+                    <td>The <em>Size of Chunk #0</em> field is 2 bytes.
+                    </td>
+                  </tr>
+                  <tr>
+                    <td align="center"><code>2</code></td>
+                    <td>The <em>Size of Chunk #0</em> field is 4 bytes.
+                    </td>
+                  </tr>
+                  <tr>
+                    <td align="center"><code>3</code></td>
+                    <td>The <em>Size of Chunk #0</em> field is 8 bytes.
+                    </td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>2</code></td>
+              <td>If set, attribute creation order is tracked.</td>
+            </tr>
+            <tr>
+              <td align="center"><code>3</code></td>
+              <td>If set, attribute creation order is indexed.</td>
+            </tr>
+            <tr>
+              <td align="center"><code>4</code></td>
+              <td>If set, non-default attribute storage phase change
+                values are stored.</td>
+            </tr>
+            <tr>
+              <td align="center"><code>5</code></td>
+              <td>If set, access, modification, change and birth times
+                are stored.</td>
+            </tr>
+            <tr>
+              <td align="center"><code>6-7</code></td>
+              <td>Reserved</td>
+            </tr>
+	    </table></p>
+
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Access Time</p></td>
+	  <td>
+        <p>This 32-bit value represents the number of seconds after the
+          UNIX epoch when the object&rsquo;s raw data was last accessed
+          (in other  words, read or written).
+        </p>
+	    <p>This field is present if bit 5 of <em>flags</em> is set.
+        </p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Modification Time</p></td>
+	  <td>
+        <p>This 32-bit value represents the number of seconds after
+          the UNIX epoch when the object&rsquo;s raw data was last
+          modified (in other words, written).
+        </p>
+	    <p>This field is present if bit 5 of <em>flags</em> is set.
+        </p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Change Time</p></td>
+	  <td>
+        <p>This 32-bit value represents the number of seconds after the
+          UNIX epoch when the object&rsquo;s metadata was last changed.
+        </p>
+	    <p>This field is present if bit 5 of <em>flags</em> is set.
+        </p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Birth Time</p></td>
+	  <td>
+        <p>This 32-bit value represents the number of seconds after the
+          UNIX epoch when the object was created.
+        </p>
+	    <p>This field is present if bit 5 of <em>flags</em> is set.
+        </p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Maximum # of compact attributes</p></td>
+	  <td>
+        <p>This is the maximum number of attributes to store in the compact
+          format before switching to the indexed format.
+        </p>
+	    <p>This field is present if bit 4 of <em>flags</em> is set.
+        </p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Minimum # of dense attributes</p></td>
+	  <td>
+        <p>This is the minimum number of attributes to store in the indexed
+          format before switching to the compact format.
+        </p>
+	    <p>This field is present if bit 4 of <em>flags</em> is set.
+        </p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Size of Chunk #0</p></td>
+	  <td>
+        <p>
+          This unsigned value specifies the number of bytes of header
+          message data following this field that contain object header
+          information.
+        </p>
+        <p>
+          This value does not include the size of object header
+          continuation blocks for this object elsewhere in the file.
+        </p>
+        <p>
+	      The length of this field varies depending on bits 0 and 1 of
+	      the <em>flags</em> field.
+        </p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Header Message #n Type</p></td>
+	  <td>
+        <p>Same format as version 1 of the object header, described above.
+        </p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Size of Header Message #n Data</p></td>
+	  <td>
+        <p>This value specifies the number of bytes of header
+          message data following the header message type and length
+          information for the current message. The size of messages
+          in this version does <em>not</em> include any padding bytes.
+        </p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Header Message #n Flags</p></td>
+	  <td>
+        <p>Same format as version 1 of the object header, described above.
+        </p>
+      </td>
+    </tr>
+
+	<tr>
+	  <td><p>Header Message #n Creation Order</p></td>
+	  <td>
+        <p>This field stores the order that a message of a given type
+          was created in.
+        </p>
+	    <p>This field is present if bit 2 of <em>flags</em> is set.
+        </p>
+      </td>
+    </tr>
+
+	<tr>
+	  <td><p>Header Message #n Data</p></td>
+	  <td>
+        <p>Same format as version 1 of the object header, described above.
+        </p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Gap</p></td>
+	  <td>
+        <p>A gap in an object header chunk is inferred by the end of the
+          messages for the chunk before the beginning of the chunk&rsquo;s
+          checksum.  Gaps are always smaller than the size of an
+          object header message prefix (message type + message size +
+          message flags).
+        </p>
+        <p>Gaps are formed when a message (typically an attribute message)
+          in an earlier chunk is deleted and a message from a later
+          chunk that does not quite fit into the free space is moved
+          into the earlier chunk.
+        </p>
+      </td>
+	</tr>
+
+    <tr>
+      <td><p>Checksum</p></td>
+      <td>
+        <p>This is the checksum for the object header chunk.
+        </p>
+      </td>
+    </tr>
+  </table>
+</div>
+
+<p>The header message types and the message data associated with
+  them compose the critical &ldquo;metadata&rdquo; about each object.  Some
+  header messages are required for each object while others are
+  optional.  Some optional header messages may also be repeated
+  several times in the header itself, the requirements and number
+  of times allowed in the header will be noted in each header
+  message description below.
+</p>
+
+
+<h3><a name="ObjectHeaderMessages">
+    IV.A.2. Disk Format: Level 2A2 - Data Object Header Messages</a></h3>
+
+<p>Data object header messages are small pieces of metadata that are
+  stored in the data object header for each object in an HDF5 file.
+  Data object header messages provide the metadata required to describe
+  an object and its contents, as well as optional pieces of metadata
+  that annotate the meaning or purpose of the object.
+</p>
+
+<p>Data object header messages are either stored directly in the data
+  object header for the object or are shared between multiple objects
+  in the file.  When a message is shared, a flag in the <em>Message Flags</em>
+  indicates that the actual <em>Message Data</em>
+  portion of that message is stored in another location (such as another
+  data object header, or a heap in the file) and the <em>Message Data</em>
+  field contains the information needed to locate the actual information
+  for the message.
+</p>
+
+<p>
+  The format of shared message data is described here:</p>
+
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Shared Message (Version 1)
+    </caption>
+
+	<tr>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+	  <td>Version</td>
+	  <td>Type</td>
+	  <td colspan="2">Reserved (zero)</td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">Reserved (zero)</td>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><br />Address<sup>O</sup><br /><br /></td>
+	</tr>
+  </table>
+
+  <table class="note">
+    <tr>
+      <td width="60%">&nbsp;</td>
+      <td width="40%">
+        (Items marked with an &lsquo;O&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfOffsetsV0">Size
+          of Offsets</a> field in the superblock.)
+    </td></tr>
+  </table>
+
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Shared Message (Version 1)
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td><p>Version</p></td>
+	  <td><p>The version number is used when there are changes in the format
+          of a shared object message and is described here:
+	      <table class="list">
+	        <tr>
+		      <th width="20%" align="center">Version</th>
+		      <th width="80%" align="left">Description</th>
+	        </tr>
+
+	        <tr>
+		      <td align="center"><code>0</code></td>
+		      <td>Never used.</td>
+	        </tr>
+
+	        <tr>
+		      <td align="center"><code>1</code></td>
+		      <td>Used by the library before version 1.6.1.
+              </td>
+	        </tr>
+	    </table></p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Type</p></td>
+	  <td><p>The type of shared message location:
+	      <table class="list">
+	        <tr>
+		      <th width="20%" align="center">Value</th>
+		      <th width="80%" align="left">Description</th>
+	        </tr>
+
+	        <tr>
+		      <td align="center"><code>0</code></td>
+		      <td>Message stored in another object&rsquo;s header (a <em>committed</em>
+                message).
+              </td>
+	        </tr>
+	    </table></p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Address</p></td>
+	  <td><p>The address of the object header
+          containing the message to be shared.</p>
+      </td>
+	</tr>
+  </table>
+</div>
+
+<br />
+<br />
+<br />
+<div align="center">
+  <table class="format">
+
+    <caption>
+      Layout: Shared Message (Version 2)
+    </caption>
+
+	<tr>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+	  <td>Version</td>
+	  <td>Type</td>
+      <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><br />Address<sup>O</sup><br /><br /></td>
+	</tr>
+  </table>
+
+  <table class="note">
+    <tr>
+      <td width="60%">&nbsp;</td>
+      <td width="40%">
+        (Items marked with an &lsquo;O&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfOffsetsV0">Size
+          of Offsets</a> field in the superblock.)
+    </td></tr>
+  </table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Shared Message (Version 2)
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td><p>Version</p></td>
+	  <td><p>The version number is used when there are changes in the format
+          of a shared object message and is described here:
+	      <table class="list">
+	        <tr>
+		      <th width="20%" align="center">Version</th>
+		      <th width="80%" align="left">Description</th>
+	        </tr>
+
+	        <tr>
+		      <td align="center"><code>2</code></td>
+		      <td>Used by the library of version 1.6.1 and after.
+              </td>
+	        </tr>
+	    </table></p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Type</p></td>
+	  <td><p>The type of shared message location:
+	      <table class="list">
+	        <tr>
+		      <th width="20%" align="center">Value</th>
+		      <th width="80%" align="left">Description</th>
+	        </tr>
+
+	        <tr>
+		      <td align="center"><code>0</code></td>
+		      <td>Message stored in another object&rsquo;s header (a <em>committed</em>
+                message).
+              </td>
+	        </tr>
+	    </table></p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Address</p></td>
+	  <td><p>The address of the object header
+          containing the message to be shared.</p></td>
+	</tr>
+  </table>
+</div>
+
+<br />
+<br />
+<br />
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Shared Message (Version 3)
+    </caption>
+
+	<tr>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+	  <td>Version</td>
+	  <td>Type</td>
+      <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">Location <em>(variable size)</em></td>
+	</tr>
+  </table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Shared Message (Version 3)
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td><p>Version</p></td>
+	  <td><p>The version number indicates changes in the format of shared
+	      object message and is described here:
+	      <table class="list">
+	        <tr>
+		      <th width="20%" align="center">Version</th>
+		      <th width="80%" align="left">Description</th>
+	        </tr>
+
+	        <tr>
+		      <td align="center"><code>3</code></td>
+		      <td>Used by the library of version 1.8 and after.  In this
+                version, the <em>Type</em> field can indicate that
+                the message is stored in the fractal heap.
+              </td>
+	        </tr>
+	    </table></p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Type</p></td>
+	  <td><p>The type of shared message location:
+	      <table class="list">
+	        <tr>
+		      <th width="20%" align="center">Value</th>
+		      <th width="80%" align="left">Description</th>
+	        </tr>
+
+	        <tr>
+		      <td align="center"><code>0</code></td>
+		      <td>Message is not shared and is not shareable.
+              </td>
+	        </tr>
+
+	        <tr>
+		      <td align="center"><code>1</code></td>
+		      <td>Message stored in file&rsquo;s <em>shared object header message</em>
+                heap (a <em>shared</em> message).
+              </td>
+	        </tr>
+
+	        <tr>
+		      <td align="center"><code>2</code></td>
+		      <td>Message stored in another object&rsquo;s header (a <em>committed</em>
+                message).
+              </td>
+	        </tr>
+
+	        <tr>
+		      <td align="center"><code>3</code></td>
+		      <td>Message stored is not shared, but is shareable.
+              </td>
+	        </tr>
+
+	    </table></p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Location</p></td>
+	  <td><p>This field contains either a <a href="#SizeOfOffsetsV0">
+            <em>Size of Offsets</em></a>-bytes address of the object header
+          containing the message to be shared, or an 8-byte fractal heap
+          ID for the message in the file&rsquo;s <em>shared object header
+            message</em> heap.
+	    </p>
+      </td>
+	</tr>
+  </table>
+</div>
+
+
+<p>The following is a list of currently defined header messages:
+</p>
+
+<h4><a name="NILMessage">IV.A.2.a. The NIL Message</a></h4>
+
+<!-- start msgdesc table -->
+<center>
+  <table class="msgdesc">
+    <tr><td colspan="2"><b>Header Message Name:</b> NIL</td></tr>
+    <tr><td colspan="2"><b>Header Message Type:</b> 0x0000</td></tr>
+    <tr><td colspan="2"><b>Length:</b> Varies</td></tr>
+    <tr><td colspan="2"><b>Status:</b> Optional; may be repeated.</td></tr>
+    <tr><td><b>Description:</b></td>
+      <td>The NIL message is used to indicate a message which is to be
+        ignored when reading the header messages for a data object.
+        [Possibly one which has been deleted for some reason.]
+    </td></tr>
+    <tr><td colspan="2"><b>Format of Data:</b> Unspecified</td></tr>
+</table></center>
+<!-- end msgdesc table -->
+
+
+<h4><a name="DataspaceMessage">IV.A.2.b. The Dataspace Message</a></h4>
+
+<!-- start msgdesc table -->
+<center>
+  <table class="msgdesc">
+    <tr><td colspan="2"><b>Header Message Name:</b> Dataspace</td></tr>
+    <tr><td colspan="2"><b>Header Message Type:</b> 0x0001</td></tr>
+    <tr><td colspan="2"><b>Length:</b> Varies according to the number of
+        dimensions, as described in the following table.</td></tr>
+    <tr><td colspan="2"><b>Status:</b> Required for dataset objects;
+        may not be repeated.</td></tr>
+    <tr><td><b>Description:</b></td>
+      <td>The dataspace message describes the number of dimensions (in
+        other words, &ldquo;rank&rdquo;) and size of each dimension that
+        the data object has. This message is only used for datasets which
+        have a simple, rectilinear, array-like layout; datasets requiring
+        a more complex layout are not yet supported.
+      </td>
+    </tr>
+
+    <tr><td colspan="2"><b>Format of Data:</b> See the tables
+        below.</td></tr>
+</table></center>
+<!-- end msgdesc table -->
+
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Dataspace Message - Version 1
+    </caption>
+
+	<tr>
+	  <th>byte</th>
+	  <th>byte</th>
+	  <th>byte</th>
+	  <th>byte</th>
+	</tr>
+
+	<tr>
+	  <td>Version</td>
+	  <td>Dimensionality</td>
+	  <td>Flags</td>
+	  <td>Reserved</td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">Reserved</td>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><br />Dimension #1 Size<sup>L</sup><br /><br /></td>
+    </tr>
+	<tr>
+	  <td colspan="4">.<br />.<br />.<br /></td>
+	</tr>
+	<tr>
+	  <td colspan="4"><br />Dimension #n Size<sup>L</sup><br /><br /></td>
+	</tr>
+	<tr>
+	  <td colspan="4"><br />Dimension #1 Maximum Size<sup>L</sup> <em>(optional)</em><br /><br /></td>
+	</tr>
+	<tr>
+	  <td colspan="4">.<br />.<br />.<br /></td>
+	</tr>
+	<tr>
+	  <td colspan="4"><br />Dimension #n Maximum Size<sup>L</sup> <em>(optional)</em><br /><br /></td>
+	</tr>
+	<tr>
+	  <td colspan="4"><br />Permutation Index #1<sup>L</sup> <em>(optional)</em><br /><br /></td>
+	</tr>
+	<tr>
+	  <td colspan="4">.<br />.<br />.<br /></td>
+	</tr>
+	<tr>
+	  <td colspan="4"><br />Permutation Index #n<sup>L</sup> <em>(optional)</em><br /><br /></td>
+    </tr>
+  </table>
+
+  <table class="note">
+    <tr>
+      <td width="60%">&nbsp;</td>
+      <td width="40%">
+        (Items marked with an &lsquo;L&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfLengthsV0">Size
+          of Lengths</a> field in the superblock.)
+    </td></tr>
+  </table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Dataspace Message - Version 1
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td><p>Version</p></td>
+	  <td>
+        <p>This value is used to determine the format of the
+	      Dataspace Message.  When the format of the
+	      information in the message is changed, the version number
+	      is incremented and can be used to determine how the
+	      information in the object header is formatted.  This
+          document describes version one (1) (there was no version
+          zero (0)).
+        </p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Dimensionality</p></td>
+	  <td>
+        <p>This value is the number of dimensions that the data
+	      object has.
+        </p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Flags</p></td>
+	  <td>
+        <p>This field is used to store flags to indicate the
+	      presence of parts of this message.  Bit 0 (the least
+	      significant bit) is used to indicate that maximum
+	      dimensions are present.  Bit 1 is used to indicate that
+	      permutation indices are present.
+        </p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Dimension #n Size</p></td>
+	  <td>
+        <p>This value is the current size of the dimension of the
+	      data as stored in the file.  The first dimension stored in
+	      the list of dimensions is the slowest changing dimension
+	      and the last dimension stored is the fastest changing
+	      dimension.
+        </p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Dimension #n Maximum Size</p></td>
+	  <td>
+        <p>This value is the maximum size of the dimension of the
+	      data as stored in the file.  This value may be the special
+          &ldquo;<a href="#UnlimitedDim">unlimited</a>&rdquo; size which indicates
+	      that the data may expand along this dimension indefinitely.
+          If these values are not stored, the maximum size of each
+          dimension is assumed to be the dimension&rsquo;s current size.
+        </p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Permutation Index #n</p></td>
+	  <td>
+        <p>This value is the index permutation used to map
+	      each dimension from the canonical representation to an
+	      alternate axis for each dimension.  If these values are
+	      not stored, the first dimension stored in the list of
+	      dimensions is the slowest changing dimension and the last
+	      dimension stored is the fastest changing dimension.
+        </p>
+      </td>
+	</tr>
+  </table>
+</div>
+
+
+
+<br />
+<p>Version 2 of the dataspace message dropped the optional
+  permutation index value support, as it was never implemented in the
+  HDF5 Library:</p>
+
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Dataspace Message - Version 2
+    </caption>
+
+	<tr>
+	  <th>byte</th>
+	  <th>byte</th>
+	  <th>byte</th>
+	  <th>byte</th>
+	</tr>
+
+	<tr>
+	  <td>Version</td>
+	  <td>Dimensionality</td>
+	  <td>Flags</td>
+	  <td>Type</td>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><br />Dimension #1 Size<sup>L</sup><br /><br /></td>
+    </tr>
+	<tr>
+	  <td colspan="4">.<br />.<br />.<br /></td>
+    </tr>
+	<tr>
+	  <td colspan="4"><br />Dimension #n Size<sup>L</sup><br /><br /></td>
+    </tr>
+	<tr>
+	  <td colspan="4"><br />Dimension #1 Maximum Size<sup>L</sup> <em>(optional)</em><br /><br /></td>
+    </tr>
+	<tr>
+	  <td colspan="4">.<br />.<br />.<br /></td>
+    </tr>
+	<tr>
+	  <td colspan="4"><br />Dimension #n Maximum Size<sup>L</sup> <em>(optional)</em><br /><br /></td>
+    </tr>
+  </table>
+
+  <table class="note">
+    <tr>
+      <td width="60%">&nbsp;</td>
+      <td width="40%">
+        (Items marked with an &lsquo;L&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfLengthsV0">Size
+          of Lengths</a> field in the superblock.)
+    </td></tr>
+  </table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Dataspace Message - Version 2
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td><p>Version</p></td>
+	  <td>
+        <p>This value is used to determine the format of the
+          Dataspace Message.  This field should be &lsquo;2&rsquo; for version 2
+          format messages.
+        </p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Dimensionality</p></td>
+	  <td>
+        <p>This value is the number of dimensions that the data object has.
+        </p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Flags</p></td>
+	  <td>
+        <p>This field is used to store flags to indicate the
+          presence of parts of this message.  Bit 0 (the least
+          significant bit) is used to indicate that maximum
+          dimensions are present.
+        </p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Type</p></td>
+	  <td>
+        <p>This field indicates the type of the dataspace:
+          <table class="list">
+            <tr>
+              <th width="20%" align="center">Value</th>
+              <th width="80%" align="left">Description</th>
+            </tr>
+
+            <tr>
+              <td align="center"><code>0</code></td>
+              <td>A <em>scalar</em> dataspace; in other words,
+                a dataspace with a single, dimensionless element.
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>1</code></td>
+              <td>A <em>simple</em> dataspace; in other words,
+                a dataspace with a rank greater than 0 and an
+                appropriate number of dimensions.
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>2</code></td>
+              <td>A <em>null</em> dataspace; in other words,
+                a dataspace with no elements.
+              </td>
+            </tr>
+        </table></p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Dimension #n Size</p></td>
+	  <td>
+        <p>This value is the current size of the dimension of the
+          data as stored in the file.  The first dimension stored in
+          the list of dimensions is the slowest changing dimension
+          and the last dimension stored is the fastest changing
+          dimension.
+        </p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Dimension #n Maximum Size</p></td>
+	  <td>
+        <p>This value is the maximum size of the dimension of the
+          data as stored in the file.  This value may be the special
+          &ldquo;<a href="#UnlimitedDim">unlimited</a>&rdquo; size which indicates
+          that the data may expand along this dimension indefinitely.
+          If these values are not stored, the maximum size of each
+          dimension is assumed to be the dimension&rsquo;s current size.
+        </p>
+      </td>
+	</tr>
+
+  </table>
+</div>
+
+
+
+<!--
+    <h4><a name="DataSpaceMessage">Header Message Name: Complex Dataspace (Fiber Bundle?)</a></h4>
+
+    <!-- start msgdesc table --
+         <center>
+           <table class="msgdesc">
+             <p><b>Header Message Name: ???????</b></td></tr>
+<b>Header Message Type: </b>0x0002<br />
+<b>Length:</b> Varies</td></tr>
+
+<b>Status:</b> One of the <em>Simple Dataspace</em> or
+<em>Complex Dataspace</em> messages is required (but not both) and may
+not be repeated.<br /> <b>Description:</b> The
+<em>Dataspace</em> message describes space that the dataset is
+mapped onto in a more comprehensive way than the <em>Simple
+  Dimensionality</em> message is capable of handling.  The
+dataspace of a dataset encompasses the type of coordinate system
+used to locate the dataset&rsquo;s elements as well as the structure and
+regularity of the coordinate system.  The dataspace also
+describes the number of dimensions which the dataset inhabits as
+well as a possible higher dimensional space in which the dataset
+is located within.
+
+<br />
+<p><b>Format of Data:</b></p>
+
+<center>
+  <table border cellpadding="4" width="80%">
+	<caption align="bottom">
+	  <b>HDF5 Dataspace Message Layout</b>
+    </caption>
+
+	<tr align="center">
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+    </tr>
+
+	<tr align="center">
+	  <td colspan="4">Mesh Type</td>
+    </tr>
+	<tr align="center">
+	  <td colspan="4">Logical Dimensionality</td>
+    </tr>
+  </table>
+</center>
+
+<br />
+<dl>
+  <dt>The elements of the dimensionality message are described below:
+    <dd>
+	  <dl>
+	    <dt>Mesh Type: (unsigned 32-bit integer)
+	      <dd>This value indicates whether the grid is
+	        polar/spherical/cartesion,
+	        structured/unstructured and regular/irregular. <br />
+	        The mesh type value is broken up as follows: <br />
+
+	        <br />
+	        <center>
+	          <table border cellpadding="4" width="80%">
+		        <caption align="bottom">
+		          <b>HDF5 Mesh-type Layout</b>
+	            </caption>
+
+		        <tr align="center">
+		          <th width="25%">byte</th>
+		          <th width="25%">byte</th>
+		          <th width="25%">byte</th>
+		          <th width="25%">byte</th>
+                </tr>
+
+		        <tr align="center">
+		          <td colspan="1">Mesh Embedding</td>
+		          <td colspan="1">Coordinate System</td>
+		          <td colspan="1">Structure</td>
+		          <td colspan="1">Regularity</td>
+                </tr>
+	          </table>
+	        </center>
+	        The following are the definitions of mesh-type bytes:
+	        <dl>
+	          <dt>Mesh Embedding
+	            <dd>This value indicates whether the dataset dataspace
+		          is located within
+		          another dataspace or not:
+		          <dl> <dl>
+		              <dt>&lt;STANDALONE&gt;
+		                <dd>The dataset mesh is self-contained and is not
+		                  embedded in another mesh.
+		                  <dt>&lt;EMBEDDED&gt;
+		                    <dd>The dataset&rsquo;s dataspace is located within
+		                      another dataspace, as
+		                      described in information below.
+		          </dl> </dl>
+	              <dt>Coordinate System
+	                <dd>This value defines the type of coordinate system
+		              used for the mesh:
+		              <dl> <dl>
+		                  <dt>&lt;POLAR&gt;
+		                    <dd>The last two dimensions are in polar
+		                      coordinates, higher dimensions are
+		                      cartesian.
+		                      <dt>&lt;SPHERICAL&gt;
+		                        <dd>The last three dimensions are in spherical
+		                          coordinates, higher dimensions
+		                          are cartesian.
+		                          <dt>&lt;CARTESIAN&gt;
+		                            <dd>All dimensions are in cartesian coordinates.
+		              </dl> </dl>
+	                  <dt>Structure
+	                    <dd>This value defines the locations of the grid-points
+		                  on the axes:
+		                  <dl> <dl>
+		                      <dt>&lt;STRUCTURED&gt;
+		                        <dd>All grid-points are on integral, sequential
+		                          locations, starting from 0.
+		                          <dt>&lt;UNSTRUCTURED&gt;
+		                            <dd>Grid-points locations in each dimension are
+		                              explicitly defined and
+		                              may be of any numeric datatype.
+		                  </dl> </dl>
+	                      <dt>Regularity
+	                        <dd>This value defines the locations of the dataset
+		                      points on the grid:
+		                      <dl> <dl>
+		                          <dt>&lt;REGULAR&gt;
+		                            <dd>All dataset elements are located at the
+		                              grid-points defined.
+		                              <dt>&lt;IRREGULAR&gt;
+		                                <dd>Each dataset element has a particular
+		                                  grid-location defined.
+		                      </dl> </dl>
+	        </dl>
+	        <p>The following grid combinations are currently allowed:</p>
+	        <dl> <dl>
+		        <dt>&lt;POLAR-STRUCTURED-REGULAR&gt;
+		        <dt>&lt;SPHERICAL-STRUCTURED-REGULAR&gt;
+		        <dt>&lt;CARTESIAN-STRUCTURED-REGULAR&gt;
+		        <dt>&lt;POLAR-UNSTRUCTURED-REGULAR&gt;
+		        <dt>&lt;SPHERICAL-UNSTRUCTURED-REGULAR&gt;
+		        <dt>&lt;CARTESIAN-UNSTRUCTURED-REGULAR&gt;
+		        <dt>&lt;CARTESIAN-UNSTRUCTURED-IRREGULAR&gt;
+	        </dl> </dl>
+	        All of the above grid types can be embedded within another
+	        dataspace.
+	        <br /> <br />
+	        <dt>Logical Dimensionality: (unsigned 32-bit integer)
+	          <dd>This value is the number of dimensions that the dataset occupies.
+
+	            <br />
+	            <center>
+	              <table border cellpadding="4" width="80%">
+		            <caption align="bottom">
+		              <b>HDF5 Dataspace Embedded Dimensionality Information</b>
+	                </caption>
+
+		            <tr align="center">
+		              <th width="25%">byte</th>
+		              <th width="25%">byte</th>
+		              <th width="25%">byte</th>
+		              <th width="25%">byte</th>
+                    </tr>
+
+		            <tr align="center">
+		              <td colspan="4">Embedded Dimensionality</td>
+                    </tr>
+		            <tr align="center">
+		              <td colspan="4">Embedded Dimension Size #1</td>
+                    </tr>
+		            <tr align="center">
+		              <td colspan="4">.<br />.<br />.<br /></td>
+                    </tr>
+		            <tr align="center">
+		              <td colspan="4">Embedded Dimension Size #n</td>
+                    </tr>
+		            <tr align="center">
+		              <td colspan="4">Embedded Origin Location #1</td>
+                    </tr>
+		            <tr align="center">
+		              <td colspan="4">.<br />.<br />.<br /></td>
+                    </tr>
+		            <tr align="center">
+		              <td colspan="4">Embedded Origin Location #n</td>
+                    </tr>
+	              </table>
+	            </center>
+
+	            <dt>Embedded Dimensionality: (unsigned 32-bit integer)
+	              <dd>This value is the number of dimensions of the space the
+	                dataset is located within: in other words, a planar dataset
+                    located within a 3-D space, a 3-D dataset
+	                which is a subset of another 3-D space, and so on.
+	                <dt>Embedded Dimension Size: (unsigned 32-bit integer)
+	                  <dd>These values are the sizes of the dimensions of the
+	                    embedded dataspace
+	                    that the dataset is located within.
+	                    <dt>Embedded Origin Location: (unsigned 32-bit integer)
+	                      <dd>These values comprise the location of the dataset&rsquo;s
+	                        origin within the embedded dataspace.
+	  </dl>
+</dl>
+[Comment: need some way to handle different orientations of the
+dataset dataspace
+within the embedded dataspace]<br />
+
+<br />
+<center>
+  <table border cellpadding="4" width="80%">
+	<caption align="bottom">
+	  <b>HDF5 Dataspace Structured/Regular Grid Information</b>
+    </caption>
+
+	<tr align="center">
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+    </tr>
+
+	<tr align="center">
+	  <td colspan="4">Logical Dimension Size #1</td>
+    </tr>
+	<tr align="center">
+	  <td colspan="4">Logical Dimension Maximum #1</td>
+    </tr>
+	<tr align="center">
+	  <td colspan="4">.<br />.<br />.<br /></td>
+    </tr>
+	<tr align="center">
+	  <td colspan="4">Logical Dimension Size #n</td>
+    </tr>
+	<tr align="center">
+	  <td colspan="4">Logical Dimension Maximum #n</td>
+    </tr>
+  </table>
+</center>
+
+<br />
+<dl>
+  <dt>The elements of the dimensionality message are described below:
+    <dd>
+	  <dl>
+	    <dt>Logical Dimension Size #n: (unsigned 32-bit integer)
+	      <dd>This value is the current size of the dimension of the
+	        data as stored in
+	        the file.  The first dimension stored in the list of
+	        dimensions is the slowest
+	        changing dimension and the last dimension stored is the
+	        fastest changing
+	        dimension.
+	        <dt>Logical Dimension Maximum #n: (unsigned 32-bit integer)
+	          <dd>This value is the maximum size of the dimension of the
+	            data as stored in
+	            the file.  This value may be the special value
+	            &lt;UNLIMITED&gt; which
+	            indicates that the data may expand along this dimension
+	            indefinitely.
+	  </dl>
+</dl>
+<br />
+<center>
+  <table border cellpadding="4" width="80%">
+	<caption align="bottom">
+	  <b>HDF5 Dataspace Structured/Irregular Grid Information</b>
+    </caption>
+
+	<tr align="center">
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+    </tr>
+
+	<tr align="center">
+	  <td colspan="4"># of Grid Points in Dimension #1</td>
+    </tr>
+	<tr align="center">
+	  <td colspan="4">.<br />.<br />.<br /></td>
+    </tr>
+	<tr align="center">
+	  <td colspan="4"># of Grid Points in Dimension #n</td>
+    </tr>
+	<tr align="center">
+	  <td colspan="4">Datatype of Grid Point Locations</td>
+    </tr>
+	<tr align="center">
+	  <td colspan="4">Location of Grid Points in Dimension #1</td>
+    </tr>
+	<tr align="center">
+	  <td colspan="4">.<br />.<br />.<br /></td>
+    </tr>
+	<tr align="center">
+	  <td colspan="4">Location of Grid Points in Dimension #n</td>
+    </tr>
+  </table>
+</center>
+
+<br />
+<center>
+  <table border cellpadding="4" width="80%">
+	<caption align="bottom">
+	  <b>HDF5 Dataspace Unstructured Grid Information</b>
+    </caption>
+
+	<tr align="center">
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+    </tr>
+
+	<tr align="center">
+	  <td colspan="4"># of Grid Points</td>
+    </tr>
+	<tr align="center">
+	  <td colspan="4">Datatype of Grid Point Locations</td>
+    </tr>
+	<tr align="center">
+	  <td colspan="4">Grid Point Locations<br />.<br />.<br /></td>
+    </tr>
+  </table>
+</center>
+-->
+
+<h4><a name="LinkInfoMessage">IV.A.2.c. The Link Info Message</a></h4>
+
+<!-- start msgdesc table -->
+<center>
+  <table class="msgdesc">
+    <tr><td colspan="2"><b>Header Message Name:</b> Link Info</td></tr>
+    <tr><td colspan="2"><b>Header Message Type:</b> 0x002 </td></tr>
+    <tr><td colspan="2"><b>Length:</b> Varies </td></tr>
+    <tr><td colspan="2"><b>Status:</b> Optional; may not be
+        repeated. </td></tr>
+    <tr><td><b>Description:</b></td>
+      <td>The link info message tracks variable information about the
+        current state of the links for a &ldquo;new style&rdquo;
+        group&rsquo;s behavior. Variable information will be stored in
+        this message and constant information will be stored in the
+        <a href="#GroupInfoMessage">Group Info</a> message.
+    </td></tr>
+    <tr><td colspan="2"><b>Format of Data:</b> See the tables
+        below.</td></tr>
+</table></center>
+<!-- end msgdesc table -->
+
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Link Info
+    </caption>
+
+	<tr>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+	  <td>Version</td>
+	  <td>Flags</td>
+      <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><br />Maximum Creation Index <em>(8 bytes, optional)</em><br /><br /></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><br />Fractal Heap Address<sup>O</sup><br /><br /></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><br />Address of v2 B-tree for Name Index<sup>O</sup><br /><br /></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><br />Address of v2 B-tree for Creation Order Index<sup>O</sup> <em>(optional)</em><br /><br /></td>
+	</tr>
+
+  </table>
+
+  <table class="note">
+    <tr>
+      <td width="60%">&nbsp;</td>
+      <td width="40%">
+        (Items marked with an &lsquo;O&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfOffsetsV0">Size
+          of Offsets</a> field in the superblock.)
+    </td></tr>
+  </table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Link Info
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td><p>Version</p></td>
+	  <td>
+        <p>The version number for this message. This document describes
+          version 0.</p>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td><p>Flags</p></td>
+	  <td><p>This field determines various optional aspects of the link
+          info message:
+
+          <table class="list">
+            <tr>
+              <th width="20%" align="center">Bit</th>
+              <th width="80%" align="left">Description</th>
+            </tr>
+
+            <tr>
+              <td align="center"><code>0</code></td>
+              <td>If set, creation order for the links is tracked.
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>1</code></td>
+              <td>If set, creation order for the links is indexed.
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>2-7</code></td>
+              <td>Reserved</td>
+            </tr>
+	    </table></p>
+
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Maximum Creation Index</p></td>
+	  <td><p>This 64-bit value is the maximum creation order index value
+          stored for a link in this group.</p>
+	    <p>This field is present if bit 0 of <em>flags</em> is set.</p>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td><p>Fractal Heap Address</p></td>
+	  <td>
+        <p>
+          This is the address of the fractal heap to store dense links.
+          Each link stored in the fractal heap is stored as a
+          <a href="#LinkMessage">Link Message</a>.
+        </p>
+        <p>
+          If there are no links in the group, or the group&rsquo;s links
+          are stored &ldquo;compactly&rdquo; (as object header messages), this
+          value will be the <a href="#UndefinedAddress">undefined
+            address</a>.
+        </p>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td><p>Address of v2 B-tree for Name Index</p></td>
+	  <td><p>This is the address of the version 2 B-tree to index names of links.</p>
+        <p>If there are no links in the group, or the group&rsquo;s links
+          are stored &ldquo;compactly&rdquo; (as object header messages), this
+          value will be the <a href="#UndefinedAddress">undefined
+            address</a>.
+        </p>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td><p>Address of v2 B-tree for Creation Order Index</p></td>
+	  <td><p>This is the address of the version 2 B-tree to index creation order of links.</p>
+        <p>If there are no links in the group, or the group&rsquo;s links
+          are stored &ldquo;compactly&rdquo; (as object header messages), this
+          value will be the <a href="#UndefinedAddress">undefined
+            address</a>.
+        </p>
+	    <p>This field exists if bit 1 of <em>flags</em> is set.</p>
+	  </td>
+	</tr>
+
+  </table>
+</div>
+
+
+<h4><a name="DatatypeMessage">IV.A.2.d. The Datatype Message</a></h4>
+
+<!-- start msgdesc table -->
+<center>
+  <table class="msgdesc">
+    <tr><td colspan="2"><b>Header Message Name:</b> Datatype</td></tr>
+    <tr><td colspan="2"><b>Header Message Type:</b> 0x0003
+    </td></tr>
+    <tr><td colspan="2"><b>Length:</b> Variable</td></tr>
+    <tr><td colspan="2"><b>Status:</b> Required for dataset or committed
+        datatype (formerly named datatype) objects; may not be repeated.
+    </td></tr>
+    <tr><td><b>Description:</b></td>
+      <td><p>The datatype message defines the datatype for each element
+          of a dataset or a common datatype for sharing between multiple
+          datasets.  A datatype can describe an atomic type like a fixed-
+          or floating-point type or more complex types like a C struct
+          (compound datatype), array (array datatype), or C++ vector
+          (variable-length datatype).</p>
+        <p>Datatype messages that are part of a dataset object do not
+          describe how elements are related to one another; the dataspace
+          message is used for that purpose. Datatype messages that are part of
+          a committed datatype (formerly named datatype) message describe
+          a common datatype that can be shared by multiple datasets in the
+          file.</p>
+    </td></tr>
+    <tr><td colspan="2"><b>Format of Data:</b> See the tables
+        below.</td></tr>
+</table></center>
+<!-- end msgdesc table -->
+
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Datatype Message
+    </caption>
+
+	<tr>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+	  <td>Class and Version</td>
+	  <td>Class Bit Field, Bits 0-7</td>
+	  <td>Class Bit Field, Bits 8-15</td>
+	  <td>Class Bit Field, Bits 16-23</td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">Size</td>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><br /><br />Properties<br /><br /><br /></td>
+	</tr>
+  </table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Datatype Message
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td><p>Class and Version</p></td>
+	  <td>
+        <p>The version of the datatype message and the datatype&rsquo;s class
+          information are packed together in this field.  The version
+          number is packed in the top 4 bits of the field and the class
+          is contained in the bottom 4 bits.
+        </p>
+        <p>The version number information is used for changes in the
+          format of the datatype message and is described here:
+          <table class="list">
+            <tr>
+              <th width="20%" align="center">Version</th>
+              <th width="80%" align="left">Description</th>
+            </tr>
+
+            <tr>
+              <td align="center"><code>0</code></td>
+              <td>Never used
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>1</code></td>
+              <td>Used by early versions of the library to encode
+                compound datatypes with explicit array fields.
+                See the compound datatype description below for
+                further details.
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>2</code></td>
+              <td>Used when an array datatype needs to be encoded.
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>3</code></td>
+              <td>Used when a VAX byte-ordered type needs to be
+                encoded.  Packs various other datatype classes more
+                efficiently also.
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>4</code></td>
+              <td>Used to encode the revised reference datatype.
+              </td>
+            </tr>
+        </table></p>
+
+        <p>The class of the datatype determines the format for the class
+          bit field and properties portion of the datatype message, which
+          are described below.  The
+          following classes are currently defined:
+
+          <table class="list">
+            <tr>
+              <th width="20%" align="center">Value</th>
+              <th width="80%" align="left">Description</th>
+            </tr>
+
+            <tr>
+              <td align="center"><code>0</code></td>
+              <td><a href="#ClassFixedPoint">Fixed-Point</a></td>
+            </tr>
+
+            <tr>
+              <td align="center"><code>1</code></td>
+              <td><a href="#ClassFloatingPoint">Floating-Point</a></td>
+            </tr>
+
+            <tr>
+              <td align="center"><code>2</code></td>
+              <td> <a href="#ClassTime">Time</a></td>
+            </tr>
+
+            <tr>
+              <td align="center"><code>3</code></td>
+              <td><a href="#ClassString">String</a></td>
+            </tr>
+
+            <tr>
+              <td align="center"><code>4</code></td>
+              <td><a href="#ClassBitField">Bit field</a></td>
+            </tr>
+
+            <tr>
+              <td align="center"><code>5</code></td>
+              <td><a href="#ClassOpaque">Opaque</a></td>
+            </tr>
+
+            <tr>
+              <td align="center"><code>6</code></td>
+              <td><a href="#ClassCompound">Compound</a></td>
+            </tr>
+
+            <tr>
+              <td align="center"><code>7</code></td>
+              <td><a href="#ClassReference">Reference</a></td>
+            </tr>
+
+            <tr>
+              <td align="center"><code>8</code></td>
+              <td><a href="#ClassEnum">Enumerated</a></td>
+            </tr>
+
+            <tr>
+              <td align="center"><code>9</code></td>
+              <td><a href="#ClassVarLen">Variable-Length</a></td>
+            </tr>
+
+            <tr>
+              <td align="center"><code>10</code></td>
+              <td><a href="#ClassArray">Array</a></td>
+            </tr>
+        </table></p>
+
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Class Bit Fields</p></td>
+	  <td>
+        <p>The information in these bit fields is specific to each datatype
+          class and is described below.  All bits not defined for a
+          datatype class are set to zero.
+        </p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Size</p></td>
+	  <td>
+        <p>The size of a datatype element in bytes.
+        </p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Properties</p></td>
+	  <td>
+        <p>This variable-sized sequence of bytes encodes information
+          specific to each datatype class and is described for each class
+          below.  If there is no property information specified for a
+          datatype class, the size of this field is zero bytes.
+        </p>
+      </td>
+	</tr>
+
+  </table>
+</div>
+
+
+<br />
+<br />
+<a name="ClassFixedPoint"></a>
+  <p>Class specific information for the Fixed-point Numbers class
+    (Class 0):</p>
+
+  <div align="center">
+    <table class="desc">
+      <caption>
+        Bits: Fixed-point Bit Field Description
+      </caption>
+
+	  <tr>
+	    <th width="10%">Bits</th>
+	    <th>Meaning</th>
+	  </tr>
+
+	  <tr>
+	    <td><p>0</p></td>
+	    <td><p><b>Byte Order.</b> If zero, byte order is little-endian;
+	        otherwise, byte order is big endian.</p></td>
+	  </tr>
+
+	  <tr>
+	    <td><p>1, 2</p></td>
+	    <td><p><b>Padding type.</b>  Bit 1 is the lo_pad bit and bit 2
+	        is the hi_pad bit.  If a datum has unused bits at either
+	        end, then the lo_pad or hi_pad bit is copied to those
+	        locations.</p></td>
+	  </tr>
+
+	  <tr>
+	    <td><p>3</p></td>
+	    <td><p><b>Signed.</b> If this bit is set then the fixed-point
+	        number is in 2&rsquo;s complement form.</p></td>
+	  </tr>
+
+	  <tr>
+	    <td><p>4-23</p></td>
+	    <td><p>Reserved (zero).</p></td>
+	  </tr>
+    </table>
+  </div>
+
+  <br />
+  <div align="center">
+    <table class="format">
+      <caption>
+        Layout: Fixed-point Property Description
+      </caption>
+
+	  <tr>
+	    <th width="25%">Byte</th>
+	    <th width="25%">Byte</th>
+	    <th width="25%">Byte</th>
+	    <th width="25%">Byte</th>
+	  </tr>
+
+	  <tr>
+	    <td colspan="2">Bit Offset</td>
+	    <td colspan="2">Bit Precision</td>
+	  </tr>
+    </table>
+  </div>
+
+  <br />
+  <div align="center">
+    <table class="desc">
+      <caption>
+        Fields: Fixed-point Property Description
+      </caption>
+	  <tr>
+        <th width="30%">Field Name</th>
+        <th>Description</th>
+	  </tr>
+
+	  <tr>
+	    <td><p>Bit Offset</p></td>
+	    <td>
+          <p>The bit offset of the first significant bit of the fixed-point
+            value within the datatype.  The bit offset specifies the number
+            of bits &ldquo;to the right of&rdquo; the value (which are set to the
+            lo_pad bit value).
+          </p>
+        </td>
+	  </tr>
+
+	  <tr>
+	    <td><p>Bit Precision</p></td>
+	    <td>
+          <p>The number of bits of precision of the fixed-point value
+            within the datatype.  This value, combined with the datatype
+            element&rsquo;s size and the Bit Offset field specifies the number
+            of bits &ldquo;to the left of&rdquo; the value (which are set to the
+            hi_pad bit value).
+          </p>
+        </td>
+	  </tr>
+
+    </table>
+  </div>
+
+
+  <br />
+  <br />
+  <a name="ClassFloatingPoint"></a>
+    <p>Class specific information for the Floating-point Numbers class
+      (Class 1):</p>
+
+    <div align="center">
+      <table class="desc">
+        <caption>
+          Bits: Floating-point Bit Field Description
+        </caption>
+
+	    <tr>
+	      <th width="10%">Bits</th>
+	      <th>Meaning</th>
+	    </tr>
+
+	    <tr>
+	      <td><p>0, 6</p></td>
+	      <td><p><b>Byte Order.</b> These two non-contiguous bits specify the
+              &ldquo;endianness&rdquo; of the bytes in the datatype element.
+              <table class="list">
+                <tr>
+                  <th width="10%" align="center">Bit 6</th>
+                  <th width="10%" align="center">Bit 0</th>
+                  <th width="80%" align="left">Description</th>
+                </tr>
+
+                <tr>
+                  <td align="center"><code>0</code></td>
+                  <td align="center"><code>0</code></td>
+                  <td>Byte order is little-endian
+                  </td>
+                </tr>
+                <tr>
+                  <td align="center"><code>0</code></td>
+                  <td align="center"><code>1</code></td>
+                  <td>Byte order is big-endian
+                  </td>
+                </tr>
+                <tr>
+                  <td align="center"><code>1</code></td>
+                  <td align="center"><code>0</code></td>
+                  <td>Reserved
+                  </td>
+                </tr>
+                <tr>
+                  <td align="center"><code>1</code></td>
+                  <td align="center"><code>1</code></td>
+                  <td>Byte order is VAX-endian
+                  </td>
+                </tr>
+            </table></p>
+          </td>
+	    </tr>
+
+	    <tr>
+	      <td><p>1, 2, 3</p></td>
+	      <td><p><b>Padding type.</b>  Bit 1 is the low bits pad type, bit 2
+	          is the high bits pad type, and bit 3 is the internal bits
+	          pad type.  If a datum has unused bits at either end or between
+	          the sign bit, exponent, or mantissa, then the value of bit
+	          1, 2, or 3 is copied to those locations.</p></td>
+	    </tr>
+
+	    <tr>
+	      <td><p>4-5</p></td>
+	      <td><p><b>Mantissa Normalization.</b> This 2-bit bit field specifies
+              how the most significant bit of the mantissa is managed.
+              <table class="list">
+                <tr>
+                  <th width="20%" align="center">Value</th>
+                  <th width="80%" align="left">Description</th>
+                </tr>
+
+                <tr>
+                  <td align="center"><code>0</code></td>
+                  <td>No normalization
+                  </td>
+                </tr>
+                <tr>
+                  <td align="center"><code>1</code></td>
+                  <td>The most significant bit of the mantissa is always set
+                    (except for 0.0).
+                  </td>
+                </tr>
+                <tr>
+                  <td align="center"><code>2</code></td>
+                  <td>The most significant bit of the mantissa is not stored,
+                    but is implied to be set.
+                  </td>
+                </tr>
+                <tr>
+                  <td align="center"><code>3</code></td>
+                  <td>Reserved.
+                  </td>
+                </tr>
+            </table></p>
+          </td>
+	    </tr>
+
+	    <tr>
+	      <td><p>7</p></td>
+	      <td><p>Reserved (zero).</p></td>
+	    </tr>
+
+	    <tr>
+	      <td><p>8-15</p></td>
+	      <td><p><b>Sign Location.</b> This is the bit position of the sign
+	          bit.  Bits are numbered with the least significant bit zero.</p></td>
+	    </tr>
+
+	    <tr>
+	      <td><p>16-23</p></td>
+	      <td><p>Reserved (zero).</p></td>
+	    </tr>
+
+      </table>
+    </div>
+
+    <br />
+    <div align="center">
+      <table class="format">
+        <caption>
+          Layout: Floating-point Property Description
+        </caption>
+
+	    <tr>
+	      <th width="25%">Byte</th>
+	      <th width="25%">Byte</th>
+	      <th width="25%">Byte</th>
+	      <th width="25%">Byte</th>
+	    </tr>
+
+	    <tr>
+	      <td colspan="2">Bit Offset</td>
+	      <td colspan="2">Bit Precision</td>
+	    </tr>
+
+	    <tr>
+	      <td>Exponent Location</td>
+	      <td>Exponent Size</td>
+	      <td>Mantissa Location</td>
+	      <td>Mantissa Size</td>
+	    </tr>
+
+	    <tr>
+	      <td colspan="4">Exponent Bias</td>
+	    </tr>
+      </table>
+    </div>
+
+    <br />
+    <div align="center">
+      <table class="desc">
+        <caption>
+          Fields: Floating-point Property Description
+        </caption>
+	    <tr>
+          <th width="30%">Field Name</th>
+          <th>Description</th>
+	    </tr>
+
+	    <tr>
+	      <td><p>Bit Offset</p></td>
+	      <td>
+            <p>The bit offset of the first significant bit of the floating-point
+              value within the datatype.  The bit offset specifies the number
+              of bits &ldquo;to the right of&rdquo; the value.
+            </p>
+          </td>
+	    </tr>
+
+	    <tr>
+	      <td><p>Bit Precision</p></td>
+	      <td>
+            <p>The number of bits of precision of the floating-point value
+              within the datatype.
+            </p>
+          </td>
+	    </tr>
+
+	    <tr>
+	      <td><p>Exponent Location</p></td>
+	      <td>
+            <p>The bit position of the exponent field.  Bits are numbered with
+              the least significant bit number zero.
+            </p>
+          </td>
+	    </tr>
+
+	    <tr>
+	      <td><p>Exponent Size</p></td>
+	      <td>
+            <p>The size of the exponent field in bits.
+            </p>
+          </td>
+	    </tr>
+
+	    <tr>
+	      <td><p>Mantissa Location</p></td>
+	      <td>
+            <p>The bit position of the mantissa field.  Bits are numbered with
+              the least significant bit number zero.
+            </p>
+          </td>
+	    </tr>
+
+	    <tr>
+	      <td><p>Mantissa Size</p></td>
+	      <td>
+            <p>The size of the mantissa field in bits.
+            </p>
+          </td>
+	    </tr>
+
+	    <tr>
+	      <td><p>Exponent Bias</p></td>
+	      <td>
+            <p>The bias of the exponent field.
+            </p>
+          </td>
+	    </tr>
+
+      </table>
+    </div>
+
+
+    <br />
+    <br />
+    <a name="ClassTime"></a>
+      <p>Class specific information for the Time class (Class 2):</p>
+
+
+      <div align="center">
+        <table class="desc">
+          <caption>
+            Bits: Time Bit Field Description
+          </caption>
+
+	      <tr>
+	        <th width="10%">Bits</th>
+	        <th>Meaning</th>
+	      </tr>
+
+	      <tr>
+	        <td><p>0</p></td>
+	        <td><p><b>Byte Order.</b> If zero, byte order is little-endian;
+	            otherwise, byte order is big endian.</p></td>
+	      </tr>
+
+	      <tr>
+	        <td><p>1-23</p></td>
+	        <td><p>Reserved (zero).</p></td>
+	      </tr>
+        </table>
+      </div>
+
+      <br />
+      <div align="center">
+        <table class="format">
+          <caption>
+            Layout: Time Property Description
+          </caption>
+
+	      <tr>
+	        <th width="25%">Byte</th>
+	        <th width="25%">Byte</th>
+	      </tr>
+
+	      <tr>
+	        <td colspan="2">Bit Precision</td>
+	      </tr>
+        </table>
+      </div>
+
+      <br />
+      <div align="center">
+        <table class="desc">
+          <caption>
+            Fields: Time Property Description
+          </caption>
+	      <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+	      </tr>
+
+	      <tr>
+	        <td><p>Bit Precision</p></td>
+	        <td>
+              <p>The number of bits of precision of the time value.
+              </p>
+            </td>
+	      </tr>
+
+        </table>
+      </div>
+
+
+      <br />
+      <a name="ClassString"></a>
+        <p>Class specific information for the Strings class (Class 3):</p>
+
+
+        <div align="center">
+          <table class="desc">
+            <caption>
+              Bits: String Bit Field Description
+            </caption>
+
+	        <tr>
+	          <th width="10%">Bits</th>
+	          <th>Meaning</th>
+	        </tr>
+
+	        <tr>
+	          <td><p>0-3</p></td>
+	          <td><p><b>Padding type.</b>  This four-bit value determines the
+	              type of padding to use for the string.  The values are:
+
+                  <table class="list">
+                    <tr>
+                      <th width="20%" align="center">Value</th>
+                      <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                      <td align="center"><code>0</code></td>
+                      <td>Null Terminate: A zero byte marks the end of the
+                        string and is guaranteed to be present after
+                        converting a long string to a short string.  When
+                        converting a short string to a long string the value is
+                        padded with additional null characters as necessary.
+                      </td>
+                    </tr>
+
+                    <tr>
+                      <td align="center"><code>1</code></td>
+                      <td>Null Pad: Null characters are added to the end of
+                        the value during conversions from short values to long
+                        values but conversion in the opposite direction simply
+                        truncates the value.
+                      </td>
+                    </tr>
+
+                    <tr>
+                      <td align="center"><code>2</code></td>
+                      <td>Space Pad: Space characters are added to the end of
+                        the value during conversions from short values to long
+                        values but conversion in the opposite direction simply
+                        truncates the value.  This is the Fortran
+                        representation of the string.
+                      </td>
+                    </tr>
+
+                    <tr>
+                      <td align="center"><code>3-15</code></td>
+                      <td>Reserved
+                      </td>
+                    </tr>
+                </table></p>
+              </td>
+	        </tr>
+
+	        <tr>
+	          <td><p>4-7</p></td>
+	          <td><p><b>Character Set.</b>  The character set used to
+	              encode the string.
+                  <table class="list">
+                    <tr>
+                      <th width="20%" align="center">Value</th>
+                      <th width="80%" align="left">Description</th>
+                    </tr>
+
+                    <tr>
+                      <td align="center"><code>0</code></td>
+                      <td>ASCII character set encoding
+                      </td>
+                    </tr>
+
+                    <tr>
+                      <td align="center"><code>1</code></td>
+                      <td>UTF-8 character set encoding
+                      </td>
+                    </tr>
+
+                    <tr>
+                      <td align="center"><code>2-15</code></td>
+                      <td>Reserved
+                      </td>
+                    </tr>
+                </table></p>
+              </td>
+	        </tr>
+
+	        <tr>
+	          <td><p>8-23</p></td>
+	          <td><p>Reserved (zero).</p></td>
+	        </tr>
+          </table>
+        </div>
+
+        <p>There are no properties defined for the string class.
+        </p>
+
+        <br />
+        <br />
+        <a name="ClassBitField"></a>
+          <p>Class specific information for the Bit Fields class (Class 4):</p>
+
+          <div align="center">
+            <table class="desc">
+              <caption>
+                Bits: Bitfield Bit Field Description
+              </caption>
+
+	          <tr>
+	            <th width="10%">Bits</th>
+	            <th>Meaning</th>
+	          </tr>
+
+	          <tr>
+	            <td><p>0</p></td>
+	            <td><p><b>Byte Order.</b> If zero, byte order is little-endian;
+	                otherwise, byte order is big endian.</p></td>
+	          </tr>
+
+	          <tr>
+	            <td><p>1, 2</p></td>
+	            <td><p><b>Padding type.</b>  Bit 1 is the lo_pad type and bit 2
+	                is the hi_pad type.  If a datum has unused bits at either
+	                end, then the lo_pad or hi_pad bit is copied to those
+	                locations.</p></td>
+	          </tr>
+
+	          <tr>
+	            <td><p>3-23</p></td>
+	            <td><p>Reserved (zero).</p></td>
+	          </tr>
+            </table>
+          </div>
+
+          <br />
+          <div align="center">
+            <table class="format">
+              <caption>
+                Layout: Bit Field Property Description
+              </caption>
+
+	          <tr>
+	            <th width="25%">Byte</th>
+	            <th width="25%">Byte</th>
+	            <th width="25%">Byte</th>
+	            <th width="25%">Byte</th>
+	          </tr>
+
+	          <tr>
+	            <td colspan="2">Bit Offset</td>
+	            <td colspan="2">Bit Precision</td>
+	          </tr>
+            </table>
+          </div>
+
+          <br />
+          <div align="center">
+            <table class="desc">
+              <caption>
+                Fields: Bit Field Property Description
+              </caption>
+	          <tr>
+                <th width="30%">Field Name</th>
+                <th>Description</th>
+	          </tr>
+
+	          <tr>
+	            <td><p>Bit Offset</p></td>
+	            <td>
+                  <p>The bit offset of the first significant bit of the bit field
+                    within the datatype.  The bit offset specifies the number
+                    of bits &ldquo;to the right of&rdquo; the value.
+                  </p>
+                </td>
+	          </tr>
+
+	          <tr>
+	            <td><p>Bit Precision</p></td>
+	            <td>
+                  <p>The number of bits of precision of the bit field
+                    within the datatype.
+                  </p>
+                </td>
+	          </tr>
+            </table>
+          </div>
+
+
+          <br />
+          <br />
+          <a name="ClassOpaque"></a>
+            <p>Class specific information for the Opaque class (Class 5):</p>
+
+            <div align="center">
+              <table class="desc">
+                <caption>
+                  Bits: Opaque Bit Field Description
+                </caption>
+
+	            <tr>
+	              <th width="10%">Bits</th>
+	              <th>Meaning</th>
+	            </tr>
+
+	            <tr>
+	              <td><p>0-7</p></td>
+	              <td><p>Length of ASCII tag in bytes.</p></td>
+	            </tr>
+
+	            <tr>
+	              <td><p>8-23</p></td>
+	              <td><p>Reserved (zero).</p></td>
+	            </tr>
+              </table>
+            </div>
+
+            <br />
+            <div align="center">
+              <table class="format">
+                <caption>
+                  Layout: Opaque Property Description
+                </caption>
+
+	            <tr>
+	              <th width="25%">Byte</th>
+	              <th width="25%">Byte</th>
+	              <th width="25%">Byte</th>
+	              <th width="25%">Byte</th>
+	            </tr>
+
+	            <tr>
+	              <td colspan="4"><br />ASCII Tag<br />
+	                <br /></td>
+	            </tr>
+              </table>
+            </div>
+
+            <br />
+            <div align="center">
+              <table class="desc">
+                <caption>
+                  Fields: Opaque Property Description
+                </caption>
+	            <tr>
+                  <th width="30%">Field Name</th>
+                  <th>Description</th>
+	            </tr>
+
+	            <tr>
+	              <td><p>ASCII Tag</p></td>
+	              <td>
+                    <p>This NUL-terminated string provides a description for the
+                      opaque type.  It is NUL-padded to a multiple of 8 bytes.
+                    </p>
+                  </td>
+	            </tr>
+              </table>
+            </div>
+
+
+            <br />
+            <br />
+            <a name="ClassCompound"></a>
+              <p>Class specific information for the Compound class (Class 6):</p>
+
+              <div align="center">
+                <table class="desc">
+                  <caption>
+                    Bits: Compound Bit Field Description
+                  </caption>
+
+	              <tr>
+	                <th width="10%">Bits</th>
+	                <th>Meaning</th>
+	              </tr>
+
+	              <tr>
+	                <td><p>0-15</p></td>
+	                <td><p><b>Number of Members.</b> This field contains the number
+	                    of members defined for the compound datatype.  The member
+	                    definitions are listed in the Properties field of the data
+	                    type message.</p></td>
+	              </tr>
+
+	              <tr>
+	                <td><p>16-23</p></td>
+	                <td><p>Reserved (zero).</p></td>
+	              </tr>
+                </table>
+              </div>
+
+
+              <p>The Properties field of a compound datatype is a list of the
+                member definitions of the compound datatype.  The member
+                definitions appear one after another with no intervening bytes.
+                The member types are described with a (recursively) encoded datatype
+                message.</p>
+
+              <p>Note that the property descriptions are different for different
+                versions of the datatype version.  Additionally note that the version
+                0 datatype encoding is deprecated and has been replaced with later
+                encodings in versions of the HDF5 Library from the 1.4 release
+                onward.</p>
+
+
+              <div align="center">
+                <table class="format">
+                  <caption>
+                    Layout: Compound Properties Description for Datatype Version 1
+                  </caption>
+
+	              <tr>
+	                <th width="25%">Byte</th>
+	                <th width="25%">Byte</th>
+	                <th width="25%">Byte</th>
+	                <th width="25%">Byte</th>
+	              </tr>
+
+	              <tr>
+	                <td colspan="4"><br />Name<br /><br /></td>
+	              </tr>
+
+	              <tr>
+	                <td colspan="4">Byte Offset of Member</td>
+	              </tr>
+
+	              <tr>
+	                <td>Dimensionality</td>
+	                <td colspan="3">Reserved (zero)</td>
+	              </tr>
+
+	              <tr>
+	                <td colspan="4">Dimension Permutation</td>
+	              </tr>
+
+	              <tr>
+	                <td colspan="4">Reserved (zero)</td>
+	              </tr>
+
+	              <tr>
+	                <td colspan="4">Dimension #1 Size (required)</td>
+	              </tr>
+
+	              <tr>
+	                <td colspan="4">Dimension #2 Size (required)</td>
+	              </tr>
+
+	              <tr>
+	                <td colspan="4">Dimension #3 Size (required)</td>
+	              </tr>
+
+	              <tr>
+	                <td colspan="4">Dimension #4 Size (required)</td>
+	              </tr>
+
+	              <tr>
+	                <td colspan="4"><br />Member Type Message<br /><br /></td>
+	              </tr>
+
+                </table>
+              </div>
+
+              <br />
+              <div align="center">
+                <table class="desc">
+                  <caption>
+                    Fields: Compound Properties Description for Datatype Version 1
+                  </caption>
+	              <tr>
+                    <th width="30%">Field Name</th>
+                    <th>Description</th>
+	              </tr>
+
+	              <tr>
+	                <td><p>Name</p></td>
+	                <td>
+                      <p>This NUL-terminated string provides a description for the
+                        opaque type.  It is NUL-padded to a multiple of 8 bytes.
+                      </p>
+                    </td>
+	              </tr>
+
+	              <tr>
+	                <td><p>Byte Offset of Member</p></td>
+	                <td>
+                      <p>This is the byte offset of the member within the datatype.
+                      </p>
+                    </td>
+	              </tr>
+
+	              <tr>
+	                <td><p>Dimensionality</p></td>
+	                <td>
+                      <p>If set to zero, this field indicates a scalar member.  If set
+                        to a value greater than zero, this field indicates that the
+                        member is an array of values.  For array members, the size of
+                        the array is indicated by the &lsquo;Size of Dimension n&rsquo; field in
+                        this message.
+                      </p>
+                    </td>
+	              </tr>
+
+	              <tr>
+	                <td><p>Dimension Permutation</p></td>
+	                <td>
+                      <p>This field was intended to allow an array field to have
+                        its dimensions permuted, but this was never implemented.
+                        This field should always be set to zero.
+                      </p>
+                    </td>
+	              </tr>
+
+	              <tr>
+	                <td><p>Dimension #n Size</p></td>
+	                <td>
+                      <p>This field is the size of a dimension of the array field as
+                        stored in the file.  The first dimension stored in the list of
+                        dimensions is the slowest changing dimension and the last
+                        dimension stored is the fastest changing dimension.
+                      </p>
+                    </td>
+	              </tr>
+
+	              <tr>
+	                <td><p>Member Type Message</p></td>
+	                <td>
+                      <p>This field is a datatype message describing the datatype of
+                        the member.
+                      </p>
+                    </td>
+	              </tr>
+
+                </table>
+              </div>
+
+              <br />
+              <br />
+              <br />
+              <div align="center">
+                <table class="format">
+                  <caption>
+                    Layout: Compound Properties Description for Datatype Version 2
+                  </caption>
+
+	              <tr>
+	                <th width="25%">Byte</th>
+	                <th width="25%">Byte</th>
+	                <th width="25%">Byte</th>
+	                <th width="25%">Byte</th>
+	              </tr>
+
+	              <tr>
+	                <td colspan="4"><br />Name<br /><br /></td>
+	              </tr>
+
+	              <tr>
+	                <td colspan="4">Byte Offset of Member</td>
+	              </tr>
+
+	              <tr>
+	                <td colspan="4"><br />Member Type Message<br /><br /></td>
+	              </tr>
+
+                </table>
+              </div>
+
+              <br />
+              <div align="center">
+                <table class="desc">
+                  <caption>
+                    Fields: Compound Properties Description for Datatype Version 2
+                  </caption>
+	              <tr>
+                    <th width="30%">Field Name</th>
+                    <th>Description</th>
+	              </tr>
+
+	              <tr>
+	                <td><p>Name</p></td>
+	                <td>
+                      <p>This NUL-terminated string provides a description for the
+                        opaque type.  It is NUL-padded to a multiple of 8 bytes.
+                      </p>
+                    </td>
+	              </tr>
+
+	              <tr>
+	                <td><p>Byte Offset of Member</p></td>
+	                <td>
+                      <p>This is the byte offset of the member within the datatype.
+                      </p>
+                    </td>
+	              </tr>
+
+	              <tr>
+	                <td><p>Member Type Message</p></td>
+	                <td>
+                      <p>This field is a datatype message describing the datatype of
+                        the member.
+                      </p>
+                    </td>
+	              </tr>
+
+                </table>
+              </div>
+
+
+              <br />
+              <br />
+              <br />
+              <div align="center">
+                <table class="format">
+                  <caption>
+                    Layout: Compound Properties Description for Datatype Version 3
+                  </caption>
+
+	              <tr>
+	                <th width="25%">Byte</th>
+	                <th width="25%">Byte</th>
+	                <th width="25%">Byte</th>
+	                <th width="25%">Byte</th>
+	              </tr>
+
+	              <tr>
+	                <td colspan="4"><br />Name<br /><br /></td>
+	              </tr>
+
+	              <tr>
+	                <td colspan="4">Byte Offset of Member <em>(variable size)</em></td>
+	              </tr>
+
+	              <tr>
+	                <td colspan="4"><br />Member Type Message<br /><br /></td>
+	              </tr>
+
+                </table>
+              </div>
+
+              <br />
+              <div align="center">
+                <table class="desc">
+                  <caption>
+                    Fields: Compound Properties Description for Datatype Version 3
+                  </caption>
+	              <tr>
+                    <th width="30%">Field Name</th>
+                    <th>Description</th>
+	              </tr>
+
+	              <tr>
+	                <td><p>Name</p></td>
+	                <td><p>This NUL-terminated string provides a description for the
+                        opaque type. It is <em>not</em> NUL-padded to a multiple of 8
+                        bytes.</p></td>
+	              </tr>
+
+	              <tr>
+                    <td><p>Byte Offset of Member</p></td>
+                    <td><p>This is the byte offset of the member within the datatype.
+                        The field size is the minimum number of bytes necessary,
+                        based on the size of the datatype element. For example, a
+                        datatype element size of less than 256 bytes uses a 1 byte
+                        length, a datatype element size of 256-65535 bytes uses a
+                        2 byte length, and so on.</p></td>
+	              </tr>
+
+	              <tr>
+	                <td><p>Member Type Message</p></td>
+	                <td><p>This field is a datatype message describing the datatype of
+                        the member.</p></td>
+	              </tr>
+
+                </table>
+              </div>
+
+
+              <br />
+              <br />
+              <a name="ClassReference"></a>
+                <p>Class specific information for the Reference class (Class 7):</p>
+
+                <div align="center">
+                  <table class="desc">
+                    <caption>
+                      Bits: Reference Bit Field Description for Datatype Version &lt; 4
+                    </caption>
+
+	                <tr>
+	                  <th width="10%">Bits</th>
+	                  <th>Meaning</th>
+	                </tr>
+
+	                <tr>
+	                  <td><p>0-3</p></td>
+	                  <td><p><b>Type.</b> This four-bit value contains the reference types which are supported for
+                          backward compatibility.  The values defined are:
+
+                          <table class="list">
+                            <tr>
+                              <th width="20%" align="center">Value</th>
+                              <th width="80%" align="left">Description</th>
+                            </tr>
+
+                            <tr>
+                              <td align="center"><code>0</code></td>
+                              <td>Object Reference (H5R_OBJECT1): A reference to another object in this
+                                HDF5 file.
+                              </td>
+                            </tr>
+
+                            <tr>
+                              <td align="center"><code>1</code></td>
+                              <td>Dataset Region Reference (H5R_DATASET_REGION1): A reference to a region within
+                                a dataset in this HDF5 file.
+                              </td>
+                            </tr>
+
+                            <tr>
+                              <td align="center"><code>2-15</code></td>
+                              <td>Reserved
+                              </td>
+                            </tr>
+                        </table></p>
+
+                      </td>
+	                </tr>
+
+	                <tr>
+	                  <td><p>4-23</p></td>
+	                  <td><p>Reserved (zero).</p></td>
+	                </tr>
+                  </table>
+                </div>
+
+                <br />
+                <div align="center">
+                  <table class="desc">
+                    <caption>
+                      Bits: Reference Bit Field Description for Datatype Version 4
+                    </caption>
+
+	                <tr>
+	                  <th width="10%">Bits</th>
+	                  <th>Meaning</th>
+	                </tr>
+
+	                <tr>
+	                  <td><p>0-3</p></td>
+	                  <td><p><b>Type.</b> This four-bit value contains the revised reference types.
+                          The values defined are:
+
+                          <table class="list">
+                            <tr>
+                              <th width="20%" align="center">Value</th>
+                              <th width="80%" align="left">Description</th>
+                            </tr>
+
+                            <tr>
+                              <td align="center"><code>2</code></td>
+                              <td>Object Reference (H5R_OBJECT2): A reference to another object
+                                in this file or an external file.
+                              </td>
+                            </tr>
+
+                            <tr>
+                              <td align="center"><code>3</code></td>
+                              <td>Dataset Region Reference (H5R_DATASET_REGION2): A reference to a region within
+                                a dataset in this file or an external file.
+                              </td>
+                            </tr>
+
+                            <tr>
+                              <td align="center"><code>4</code></td>
+                              <td>Attribute Reference (H5R_ATTR): A reference to an attribute attached to an
+                                object in this file or an external file.
+                              </td>
+                            </tr>
+
+                            <tr>
+                              <td align="center"><code>5-15</code></td>
+                              <td>Reserved
+                              </td>
+                            </tr>
+                        </table></p>
+
+                      </td>
+	                </tr>
+
+	                <tr>
+	                  <td><p>4-7</p></td>
+	                  <td><p><b>Version.</b> This four-bit value contains the version for encoding
+                          the revised reference types.  The values defined are:
+                          <table class="list">
+                            <tr>
+                              <th width="20%" align="center">Value</th>
+                              <th width="80%" align="left">Description</th>
+                            </tr>
+
+                            <tr>
+                              <td align="center"><code>0</code></td>
+                              <td>Unused
+                              </td>
+                            </tr>
+
+                            <tr>
+                              <td align="center"><code>1</code></td>
+                              <td>The version for encoding the revised reference types: Object Reference (2),
+                                Dataset Region Reference (3) and Attribute Reference (4).
+                              </td>
+                            </tr>
+
+                            <tr>
+                              <td align="center"><code>2-15</code></td>
+                              <td>Reserved
+                              </td>
+                            </tr>
+
+                        </table></p>
+
+                      </td>
+	                </tr>
+
+	                <tr>
+	                  <td><p>8-23</p></td>
+	                  <td><p>Reserved (zero).</p></td>
+	                </tr>
+                  </table>
+                </div>
+
+                <p>There are no properties defined for the reference class.
+                </p>
+
+
+                <br />
+                <br />
+                <a name="ClassEnum"></a>
+                  <p>Class specific information for the Enumeration class (Class 8):</p>
+
+                  <div align="center">
+                    <table class="desc">
+                      <caption>
+                        Bits: Enumeration Bit Field Description
+                      </caption>
+
+	                  <tr>
+	                    <th width="10%">Bits</th>
+	                    <th>Meaning</th>
+	                  </tr>
+
+	                  <tr>
+	                    <td><p>0-15</p></td>
+	                    <td><p><b>Number of Members.</b> The number of name/value
+	                        pairs defined for the enumeration type.</p></td>
+	                  </tr>
+
+	                  <tr>
+	                    <td><p>16-23</p></td>
+	                    <td><p>Reserved (zero).</p></td>
+	                  </tr>
+                    </table>
+                  </div>
+
+                  <br />
+                  <br />
+                  <div align="center">
+                    <table class="format">
+                      <caption>
+                        Layout: Enumeration Property Description for Datatype Versions
+                        1 and 2
+                      </caption>
+
+	                  <tr>
+	                    <th width="25%">Byte</th>
+	                    <th width="25%">Byte</th>
+	                    <th width="25%">Byte</th>
+	                    <th width="25%">Byte</th>
+	                  </tr>
+
+	                  <tr>
+	                    <td colspan="4"><br />Base Type<br /><br /></td>
+	                  </tr>
+
+	                  <tr>
+	                    <td colspan="4"><br />Names<br /><br /></td>
+	                  </tr>
+
+	                  <tr>
+	                    <td colspan="4"><br />Values<br /><br /></td>
+                      </tr>
+
+                    </table>
+                  </div>
+
+                  <br />
+                  <div align="center">
+                    <table class="desc">
+                      <caption>
+                        Fields: Enumeration Property Description for Datatype Versions
+                        1 and 2
+                      </caption>
+	                  <tr>
+                        <th width="30%">Field Name</th>
+                        <th>Description</th>
+	                  </tr>
+
+	                  <tr>
+	                    <td><p>Base Type</p></td>
+	                    <td>
+                          <p>Each enumeration type is based on some parent type, usually an
+                            integer. The information for that parent type is described
+                            recursively by this field.
+                          </p>
+                        </td>
+	                  </tr>
+
+	                  <tr>
+	                    <td><p>Names</p></td>
+	                    <td>
+                          <p>The name for each name/value pair. Each name is stored as a null
+                            terminated ASCII string in a multiple of eight bytes. The names
+                            are in no particular order.
+                          </p>
+                        </td>
+	                  </tr>
+
+	                  <tr>
+	                    <td><p>Values</p></td>
+	                    <td>
+                          <p>The list of values in the same order as the names.  The values
+                            are packed (no inter-value padding) and the size of each value
+                            is determined by the parent type.
+                          </p>
+                        </td>
+	                  </tr>
+
+                    </table>
+                  </div>
+
+                  <br />
+                  <br />
+                  <br />
+                  <div align="center">
+                    <table class="format">
+                      <caption>
+                        Layout: Enumeration Property Description for Datatype Version 3
+                      </caption>
+
+	                  <tr>
+	                    <th width="25%">Byte</th>
+	                    <th width="25%">Byte</th>
+	                    <th width="25%">Byte</th>
+	                    <th width="25%">Byte</th>
+	                  </tr>
+
+	                  <tr>
+	                    <td colspan="4"><br />Base Type<br /><br /></td>
+	                  </tr>
+
+	                  <tr>
+	                    <td colspan="4"><br />Names<br /><br /></td>
+	                  </tr>
+
+	                  <tr>
+	                    <td colspan="4"><br />Values<br /><br /></td>
+                      </tr>
+
+                    </table>
+                  </div>
+
+                  <br />
+                  <div align="center">
+                    <table class="desc">
+                      <caption>
+                        Fields: Enumeration Property Description for Datatype Version 3
+                      </caption>
+	                  <tr>
+                        <th width="30%">Field Name</th>
+                        <th>Description</th>
+	                  </tr>
+
+	                  <tr>
+	                    <td><p>Base Type</p></td>
+	                    <td>
+                          <p>Each enumeration type is based on some parent type, usually an
+                            integer. The information for that parent type is described
+                            recursively by this field.
+                          </p>
+                        </td>
+	                  </tr>
+
+	                  <tr>
+	                    <td><p>Names</p></td>
+	                    <td>
+                          <p>The name for each name/value pair. Each name is stored as a null
+                            terminated ASCII string, <em>not</em> padded to a multiple of
+                            eight bytes. The names are in no particular order.
+                          </p>
+                        </td>
+	                  </tr>
+
+	                  <tr>
+	                    <td><p>Values</p></td>
+	                    <td>
+                          <p>The list of values in the same order as the names.  The values
+                            are packed (no inter-value padding) and the size of each value
+                            is determined by the parent type.
+                          </p>
+                        </td>
+	                  </tr>
+
+                    </table>
+                  </div>
+
+
+
+                  <br />
+                  <a name="ClassVarLen"></a>
+                    <p>Class specific information for the Variable-length class (Class 9):</p>
+
+                    <div align="center">
+                      <table class="desc">
+                        <caption>
+                          Bits: Variable-length Bit Field Description
+                        </caption>
+
+	                    <tr>
+	                      <th width="10%">Bits</th>
+	                      <th>Meaning</th>
+	                    </tr>
+
+	                    <tr>
+	                      <td><p>0-3</p></td>
+	                      <td><p><b>Type.</b> This four-bit value contains the type of
+                              variable-length datatype described.  The values defined are:
+
+                              <table class="list">
+                                <tr>
+                                  <th width="20%" align="center">Value</th>
+                                  <th width="80%" align="left">Description</th>
+                                </tr>
+
+                                <tr>
+                                  <td align="center"><code>0</code></td>
+                                  <td>Sequence: A variable-length sequence of any datatype.
+                                    Variable-length sequences do not have padding or
+                                    character set information.
+                                  </td>
+                                </tr>
+
+                                <tr>
+                                  <td align="center"><code>1</code></td>
+                                  <td>String: A variable-length sequence of characters.
+                                    Variable-length strings have padding and character set
+                                    information.
+                                  </td>
+                                </tr>
+
+                                <tr>
+                                  <td align="center"><code>2-15</code></td>
+                                  <td>Reserved
+                                  </td>
+                                </tr>
+                            </table></p>
+
+                          </td>
+	                    </tr>
+
+	                    <tr>
+	                      <td><p>4-7</p></td>
+	                      <td><p><b>Padding type.</b> (variable-length string only)
+                              This four-bit value determines the type of padding
+                              used for variable-length strings.  The values are the same
+                              as for the string padding type, as follows:
+                              <table class="list">
+                                <tr>
+                                  <th width="20%" align="center">Value</th>
+                                  <th width="80%" align="left">Description</th>
+                                </tr>
+
+                                <tr>
+                                  <td align="center"><code>0</code></td>
+                                  <td>Null terminate: A zero byte marks the end of a string
+                                    and is guaranteed to be present after converting a long
+                                    string to a short string.  When converting a short string
+                                    to a long string, the value is padded with additional null
+                                    characters as necessary.
+                                  </td>
+                                </tr>
+
+                                <tr>
+                                  <td align="center"><code>1</code></td>
+                                  <td>Null pad: Null characters are added to the end of the
+                                    value during conversion from a short string to a longer
+                                    string.  Conversion from a long string to a shorter string
+                                    simply truncates the value.
+                                  </td>
+                                </tr>
+
+                                <tr>
+                                  <td align="center"><code>2</code></td>
+                                  <td>Space pad: Space characters are added to the end of the
+                                    value during conversion from a short string to a longer
+                                    string.  Conversion from a long string to a shorter string
+                                    simply truncates the value.  This is the Fortran
+                                    representation of the string.
+                                  </td>
+                                </tr>
+
+                                <tr>
+                                  <td align="center"><code>3-15</code></td>
+                                  <td>Reserved
+                                  </td>
+                                </tr>
+                            </table></p>
+
+                            <p>This value is set to zero for variable-length sequences.</p>
+
+                          </td>
+	                    </tr>
+
+	                    <tr>
+	                      <td><p>8-11</p></td>
+	                      <td><p><b>Character Set.</b> (variable-length string only)
+                              This four-bit value specifies the character set
+                              to be used for encoding the string:
+                              <table class="list">
+                                <tr>
+                                  <th width="20%" align="center">Value</th>
+                                  <th width="80%" align="left">Description</th>
+                                </tr>
+
+                                <tr>
+                                  <td align="center"><code>0</code></td>
+                                  <td>ASCII character set encoding
+                                  </td>
+                                </tr>
+
+                                <tr>
+                                  <td align="center"><code>1</code></td>
+                                  <td>UTF-8 character set encoding
+                                  </td>
+                                </tr>
+
+                                <tr>
+                                  <td align="center"><code>2-15</code></td>
+                                  <td>Reserved
+                                  </td>
+                                </tr>
+                            </table></p>
+
+                            <p>This value is set to zero for variable-length sequences.</p>
+
+                          </td>
+	                    </tr>
+
+	                    <tr>
+	                      <td><p>12-23</p></td>
+	                      <td><p>Reserved (zero).</p></td>
+	                    </tr>
+                      </table>
+                    </div>
+
+                    <br />
+                    <div align="center">
+                      <table class="format">
+                        <caption>
+                          Layout: Variable-length Property Description
+                        </caption>
+
+                        <tr>
+                          <th width="25%">Byte</th>
+                          <th width="25%">Byte</th>
+                          <th width="25%">Byte</th>
+                          <th width="25%">Byte</th>
+                        </tr>
+
+                        <tr>
+                          <td colspan="4"><br />Base Type<br /><br /></td>
+                        </tr>
+
+                      </table>
+                    </div>
+
+                    <br />
+                    <div align="center">
+                      <table class="desc">
+                        <caption>
+                          Fields: Variable-length Property Description
+                        </caption>
+	                    <tr>
+                          <th width="10%">Field Name</th>
+                          <th>Description</th>
+	                    </tr>
+
+	                    <tr>
+	                      <td><p>Base Type</p></td>
+	                      <td>
+                            <p>Each variable-length type is based on some parent type.  The
+                              information for that parent type is described recursively by
+                              this field.
+                            </p>
+                          </td>
+	                    </tr>
+
+                      </table>
+                    </div>
+
+
+                    <br />
+                    <br />
+                    <a name="ClassArray"></a>
+                      <p>Class specific information for the Array class (Class 10):</p>
+
+                      <p>There are no bit fields defined for the array class.
+                      </p>
+
+                      <p>Note that the dimension information defined in the property for this
+                        datatype class is independent of dataspace information for a dataset.
+                        The dimension information here describes the dimensionality of the
+                        information within a data element (or a component of an element, if the
+                        array datatype is nested within another datatype) and the dataspace for a
+                        dataset describes the size and locations of the elements in a dataset.
+                      </p>
+
+
+                      <div align="center">
+                        <table class="format">
+                          <caption>
+                            Layout: Array Property Description for Datatype Version 2
+                          </caption>
+
+                          <tr>
+                            <th width="25%">Byte</th>
+                            <th width="25%">Byte</th>
+                            <th width="25%">Byte</th>
+                            <th width="25%">Byte</th>
+                          </tr>
+
+	                      <tr>
+	                        <td>Dimensionality</td>
+	                        <td colspan="3">Reserved (zero)</td>
+	                      </tr>
+
+	                      <tr>
+	                        <td colspan="4">Dimension #1 Size</td>
+	                      </tr>
+	                      <tr>
+	                        <td colspan="4">.<br />.<br />.<br /></td>
+	                      </tr>
+	                      <tr>
+	                        <td colspan="4">Dimension #n Size</td>
+	                      </tr>
+
+	                      <tr>
+	                        <td colspan="4">Permutation Index #1</td>
+	                      </tr>
+	                      <tr>
+	                        <td colspan="4">.<br />.<br />.<br /></td>
+	                      </tr>
+	                      <tr>
+	                        <td colspan="4">Permutation Index #n</td>
+	                      </tr>
+
+                          <tr>
+                            <td colspan="4"><br />Base Type<br /><br /></td>
+                          </tr>
+
+                        </table>
+                      </div>
+
+                      <br />
+                      <div align="center">
+                        <table class="desc">
+                          <caption>
+                            Fields: Array Property Description for Datatype Version 2
+                          </caption>
+	                      <tr>
+                            <th width="30%">Field Name</th>
+                            <th>Description</th>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Dimensionality</p></td>
+	                        <td>
+                              <p>This value is the number of dimensions that the array has.
+                              </p>
+                            </td>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Dimension #n Size</p></td>
+	                        <td>
+                              <p>This value is the size of the dimension of the array
+	                            as stored in the file.  The first dimension stored in
+	                            the list of dimensions is the slowest changing dimension
+	                            and the last dimension stored is the fastest changing
+	                            dimension.
+                              </p>
+                            </td>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Permutation Index #n</p></td>
+	                        <td>
+                              <p>This value is the index permutation used to map
+                                each dimension from the canonical representation to an
+                                alternate axis for each dimension. Currently, dimension
+                                permutations are not supported, and these indices should
+                                be set to the index position minus one. In other words,
+                                the first dimension should be set to 0, the second dimension
+                                should be set to 1, and so on.
+                              </p>
+                            </td>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Base Type</p></td>
+	                        <td>
+                              <p>Each array type is based on some parent type.  The
+                                information for that parent type is described recursively by
+                                this field.
+                              </p>
+                            </td>
+	                      </tr>
+
+                        </table>
+                      </div>
+
+                      <br />
+                      <br />
+                      <br />
+                      <div align="center">
+                        <table class="format">
+                          <caption>
+                            Layout: Array Property Description for Datatype Version 3
+                          </caption>
+
+                          <tr>
+                            <th width="25%">Byte</th>
+                            <th width="25%">Byte</th>
+                            <th width="25%">Byte</th>
+                            <th width="25%">Byte</th>
+                          </tr>
+
+	                      <tr>
+	                        <td>Dimensionality</td>
+                            <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+	                      </tr>
+
+	                      <tr>
+	                        <td colspan="4">Dimension #1 Size</td>
+	                      </tr>
+	                      <tr>
+	                        <td colspan="4">.<br />.<br />.<br /></td>
+	                      </tr>
+	                      <tr>
+	                        <td colspan="4">Dimension #n Size</td>
+	                      </tr>
+
+                          <tr>
+                            <td colspan="4"><br />Base Type<br /><br /></td>
+                          </tr>
+
+                        </table>
+                      </div>
+
+                      <br />
+                      <div align="center">
+                        <table class="desc">
+                          <caption>
+                            Fields: Array Property Description for Datatype Version 3
+                          </caption>
+	                      <tr>
+                            <th width="30%">Field Name</th>
+                            <th>Description</th>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Dimensionality</p></td>
+	                        <td>
+                              <p>This value is the number of dimensions that the array has.
+                              </p>
+                            </td>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Dimension #n Size</p></td>
+	                        <td>
+                              <p>This value is the size of the dimension of the array
+	                            as stored in the file.  The first dimension stored in
+	                            the list of dimensions is the slowest changing dimension
+	                            and the last dimension stored is the fastest changing
+	                            dimension.
+                              </p>
+                            </td>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Base Type</p></td>
+	                        <td>
+                              <p>Each array type is based on some parent type.  The
+                                information for that parent type is described recursively by
+                                this field.
+                              </p>
+                            </td>
+	                      </tr>
+
+                        </table>
+                      </div>
+
+
+
+                      <h4><a name="OldFillValueMessage">IV.A.2.e. The Data Storage -
+                          Fill Value (Old) Message</a></h4>
+
+                      <!-- start msgdesc table -->
+                      <center>
+                        <table class="msgdesc">
+                          <tr><td colspan="2"><b>Header Message Name:</b> Fill Value
+                              (old)</td></tr>
+                          <tr><td colspan="2"><b>Header Message Type:</b> 0x0004</td></tr>
+                          <tr><td colspan="2"><b>Length:</b> Varies</td></tr>
+                          <tr><td colspan="2"><b>Status:</b> Optional; may not be
+                              repeated.</td></tr>
+                          <tr><td><b>Description:</b></td>
+                            <td><p>The fill value message stores a single data value which
+                                is returned to the application when an uninitialized data element
+                                is read from a dataset. The fill value is interpreted with the
+                                same datatype as the dataset. If no fill value message is present
+                                then a fill value of all zero bytes is assumed.</p>
+                              <p>This fill value message is deprecated in favor of the
+                                &ldquo;new&rdquo; fill value message (Message Type 0x0005) and
+                                is only written to the file for forward compatibility with
+                                versions of the HDF5 Library before the 1.6.0 version.
+                                Additionally, it only appears for datasets with a user-defined
+                                fill value (as opposed to the library default fill value or an
+                                explicitly set &ldquo;undefined&rdquo; fill value).</p>
+                          </td></tr>
+                          <tr><td colspan="2"><b>Format of Data:</b> See the tables
+                              below.</td></tr>
+                      </table></center>
+                      <!-- end msgdesc table -->
+
+                      <div align="center">
+                        <table class="format">
+                          <caption>
+                            Layout: Fill Value Message (Old)
+                          </caption>
+
+	                      <tr>
+	                        <th width="25%">byte</th>
+	                        <th width="25%">byte</th>
+	                        <th width="25%">byte</th>
+	                        <th width="25%">byte</th>
+	                      </tr>
+
+	                      <tr>
+	                        <td colspan="4">Size</td>
+	                      </tr>
+
+	                      <tr>
+	                        <td colspan="4"><br />Fill Value <em>(optional, variable size)</em><br /><br /></td>
+	                      </tr>
+                        </table>
+                      </div>
+
+                      <br />
+                      <div align="center">
+                        <table class="desc">
+                          <caption>
+                            Fields: Fill Value Message (Old)
+                          </caption>
+	                      <tr>
+                            <th width="30%">Field Name</th>
+                            <th>Description</th>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Size</p></td>
+	                        <td>
+                              <p>This is the size of the Fill Value field in bytes.
+                              </p>
+                            </td>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Fill Value</p></td>
+	                        <td>
+                              <p>The fill value.  The bytes of the fill value are interpreted
+                                using the same datatype as for the dataset.
+                              </p>
+                            </td>
+	                      </tr>
+                        </table>
+                      </div>
+
+
+                      <h4><a name="FillValueMessage">IV.A.2.f. The Data Storage -
+                          Fill Value Message</a></h4>
+
+                      <!-- start msgdesc table -->
+                      <center>
+                        <table class="msgdesc">
+                          <tr><td colspan="2"><b>Header Message Name:</b> Fill
+                              Value</td></tr>
+                          <tr><td colspan="2"><b>Header Message Type:</b> 0x0005</td></tr>
+                          <tr><td colspan="2"><b>Length:</b> Varies</td></tr>
+                          <tr><td colspan="2"><b>Status:</b> Required for dataset objects;
+                              may not be repeated.</td></tr>
+                          <tr><td><b>Description:</b></td>
+                            <td>The fill value message stores a single data value which is
+                              returned to the application when an uninitialized data element
+                              is read from a dataset. The fill value is interpreted with the
+                              same datatype as the dataset.</td></tr>
+                          <tr><td colspan="2"><b>Format of Data:</b> See the tables
+                              below.</td></tr>
+                      </table></center>
+                      <!-- end msgdesc table -->
+
+                      <div align="center">
+                        <table class="format">
+                          <caption>
+                            Layout: Fill Value Message - Versions 1 and 2
+                          </caption>
+
+	                      <tr>
+	                        <th width="25%">byte</th>
+	                        <th width="25%">byte</th>
+	                        <th width="25%">byte</th>
+	                        <th width="25%">byte</th>
+	                      </tr>
+
+	                      <tr>
+	                        <td>Version</td>
+	                        <td>Space Allocation Time</td>
+	                        <td>Fill Value Write Time</td>
+	                        <td>Fill Value Defined</td>
+	                      </tr>
+
+	                      <tr>
+	                        <td colspan="4">Size <em>(optional)</em></td>
+	                      </tr>
+
+	                      <tr>
+	                        <td colspan="4"><br />Fill Value <em>(optional, variable size)</em><br /><br /></td>
+	                      </tr>
+                        </table>
+                      </div>
+
+                      <br />
+                      <div align="center">
+                        <table class="desc">
+                          <caption>
+                            Fields: Fill Value Message - Versions 1 and 2
+                          </caption>
+	                      <tr>
+                            <th width="30%">Field Name</th>
+                            <th>Description</th>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Version</p></td>
+	                        <td>
+                              <p>The version number information is used for changes in the
+                                format of the fill value message and is described here:
+                                <table class="list">
+                                  <tr>
+                                    <th width="20%" align="center">Version</th>
+                                    <th width="80%" align="left">Description</th>
+                                  </tr>
+
+                                  <tr>
+                                    <td align="center"><code>0</code></td>
+                                    <td>Never used
+                                    </td>
+                                  </tr>
+                                  <tr>
+                                    <td align="center"><code>1</code></td>
+                                    <td>Initial version of this message.
+                                    </td>
+                                  </tr>
+                                  <tr>
+                                    <td align="center"><code>2</code></td>
+                                    <td>In this version, the Size and Fill Value fields are
+                                      only present if the Fill Value Defined field is set
+                                      to 1.
+                                    </td>
+                                  </tr>
+                                  <tr>
+                                    <td align="center"><code>3</code></td>
+                                    <td>This version packs the other fields in the message
+                                      more efficiently than version 2.
+                                    </td>
+                                  </tr>
+                              </table></p>
+
+                            </td>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Space Allocation Time</p></td>
+	                        <td>
+                              <p>When the storage space for the dataset&rsquo;s raw data will be
+                                allocated.  The allowed values are:
+                                <table class="list">
+                                  <tr>
+                                    <th width="20%" align="center">Value</th>
+                                    <th width="80%" align="left">Description</th>
+                                  </tr>
+
+                                  <tr>
+                                    <td align="center"><code>0</code></td>
+                                    <td>Not used.
+                                    </td>
+                                  </tr>
+                                  <tr>
+                                    <td align="center"><code>1</code></td>
+                                    <td>Early allocation.  Storage space for the entire dataset
+                                      should be allocated in the file when the dataset is
+                                      created.
+                                    </td>
+                                  </tr>
+                                  <tr>
+                                    <td align="center"><code>2</code></td>
+                                    <td>Late allocation.  Storage space for the entire dataset
+                                      should not be allocated until the dataset is written
+                                      to.
+                                    </td>
+                                  </tr>
+                                  <tr>
+                                    <td align="center"><code>3</code></td>
+                                    <td>Incremental allocation.  Storage space for the
+                                      dataset should not be allocated until the portion
+                                      of the dataset is written to.  This is currently
+                                      used in conjunction with chunked data storage for
+                                      datasets.
+                                    </td>
+                                  </tr>
+                              </table></p>
+
+                            </td>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Fill Value Write Time</p></td>
+	                        <td>
+                              <p>At the time that storage space for the dataset&rsquo;s raw data is
+                                allocated, this value indicates whether the fill value should
+                                be written to the raw data storage elements.  The allowed values
+                                are:
+                                <table class="list">
+                                  <tr>
+                                    <th width="20%" align="center">Value</th>
+                                    <th width="80%" align="left">Description</th>
+                                  </tr>
+
+                                  <tr>
+                                    <td align="center"><code>0</code></td>
+                                    <td>On allocation.  The fill value is always written to
+                                      the raw data storage when the storage space is allocated.
+                                    </td>
+                                  </tr>
+                                  <tr>
+                                    <td align="center"><code>1</code></td>
+                                    <td>Never.  The fill value should never be written to
+                                      the raw data storage.
+                                    </td>
+                                  </tr>
+                                  <tr>
+                                    <td align="center"><code>2</code></td>
+                                    <td>Fill value written if set by user.  The fill value
+                                      will be written to the raw data storage when the storage
+                                      space is allocated only if the user explicitly set
+                                      the fill value.  If the fill value is the library
+                                      default or is undefined, it will not be written to
+                                      the raw data storage.
+                                    </td>
+                                  </tr>
+                              </table></p>
+
+                            </td>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Fill Value Defined</p></td>
+	                        <td>
+                              <p>This value indicates if a fill value is defined for this
+                                dataset.  If this value is 0, the fill value is undefined.
+                                If this value is 1, a fill value is defined for this dataset.
+                                For version 2 or later of the fill value message, this value
+                                controls the presence of the Size and Fill Value fields.
+                              </p>
+                            </td>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Size</p></td>
+	                        <td>
+                              <p>This is the size of the Fill Value field in bytes.  This field
+                                is not present if the Version field is greater than 1,
+                                and the Fill Value Defined field is set to 0.
+                              </p>
+                            </td>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Fill Value</p></td>
+	                        <td>
+                              <p>The fill value.  The bytes of the fill value are interpreted
+                                using the same datatype as for the dataset.  This field is
+                                not present if the Version field is greater than 1,
+                                and the Fill Value Defined field is set to 0.
+                              </p>
+                            </td>
+	                      </tr>
+                        </table>
+                      </div>
+
+                      <br />
+                      <br />
+                      <br />
+                      <div align="center">
+                        <table class="format">
+                          <caption>
+                            Layout: Fill Value Message - Version 3
+                          </caption>
+
+	                      <tr>
+	                        <th width="25%">byte</th>
+	                        <th width="25%">byte</th>
+	                        <th width="25%">byte</th>
+	                        <th width="25%">byte</th>
+	                      </tr>
+
+	                      <tr>
+	                        <td>Version</td>
+	                        <td>Flags</td>
+                            <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+	                      </tr>
+
+	                      <tr>
+	                        <td colspan="4">Size <em>(optional)</em></td>
+	                      </tr>
+
+	                      <tr>
+	                        <td colspan="4"><br />Fill Value <em>(optional, variable size)</em><br /><br /></td>
+	                      </tr>
+                        </table>
+                      </div>
+
+                      <br />
+                      <div align="center">
+                        <table class="desc">
+                          <caption>
+                            Fields: Fill Value Message - Version 3
+                          </caption>
+	                      <tr>
+                            <th width="30%">Field Name</th>
+                            <th>Description</th>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Version</p></td>
+	                        <td>
+                              <p>The version number information is used for changes in the
+                                format of the fill value message and is described here:
+                                <table class="list">
+                                  <tr>
+                                    <th width="20%" align="center">Version</th>
+                                    <th width="80%" align="left">Description</th>
+                                  </tr>
+
+                                  <tr>
+                                    <td align="center"><code>0</code></td>
+                                    <td>Never used
+                                    </td>
+                                  </tr>
+                                  <tr>
+                                    <td align="center"><code>1</code></td>
+                                    <td>Initial version of this message.
+                                    </td>
+                                  </tr>
+                                  <tr>
+                                    <td align="center"><code>2</code></td>
+                                    <td>In this version, the Size and Fill Value fields are
+                                      only present if the Fill Value Defined field is set
+                                      to 1.
+                                    </td>
+                                  </tr>
+                                  <tr>
+                                    <td align="center"><code>3</code></td>
+                                    <td>This version packs the other fields in the message
+                                      more efficiently than version 2.
+                                    </td>
+                                  </tr>
+                              </table></p>
+
+                            </td>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Flags</p></td>
+	                        <td>
+                              <p>When the storage space for the dataset&rsquo;s raw data will be
+                                allocated.  The allowed values are:
+                                <table class="list">
+                                  <tr>
+                                    <th width="20%" align="center">Bits</th>
+                                    <th width="80%" align="left">Description</th>
+                                  </tr>
+
+                                  <tr>
+                                    <td align="center"><code>0-1</code></td>
+                                    <td>Space Allocation Time, with the same
+                                      values as versions 1 and 2 of the message.
+                                    </td>
+                                  </tr>
+                                  <tr>
+                                    <td align="center"><code>2-3</code></td>
+                                    <td>Fill Value Write Time, with the same
+                                      values as versions 1 and 2 of the message.
+                                    </td>
+                                  </tr>
+                                  <tr>
+                                    <td align="center"><code>4</code></td>
+                                    <td>Fill Value Undefined, indicating that the fill
+                                      value has been marked as &ldquo;undefined&rdquo; for this dataset.
+                                      Bits 4 and 5 cannot both be set.
+                                    </td>
+                                  </tr>
+                                  <tr>
+                                    <td align="center"><code>5</code></td>
+                                    <td>Fill Value Defined, with the same values as
+                                      versions 1 and 2 of the message.
+                                      Bits 4 and 5 cannot both be set.
+                                    </td>
+                                  </tr>
+                                  <tr>
+                                    <td align="center"><code>6-7</code></td>
+                                    <td>Reserved (zero).
+                                    </td>
+                                  </tr>
+                              </table></p>
+
+                            </td>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Size</p></td>
+	                        <td>
+                              <p>This is the size of the Fill Value field in bytes.  This field
+                                is not present if the Version field is greater than 1,
+                                and the Fill Value Defined flag is set to 0.
+                              </p>
+                            </td>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Fill Value</p></td>
+	                        <td>
+                              <p>The fill value.  The bytes of the fill value are interpreted
+                                using the same datatype as for the dataset.  This field is
+                                not present if the Version field is greater than 1,
+                                and the Fill Value Defined flag is set to 0.
+                              </p>
+                            </td>
+	                      </tr>
+                        </table>
+                      </div>
+
+
+                      <h4><a name="LinkMessage">IV.A.2.g. The Link Message</a></h4>
+
+                      <!-- start msgdesc table -->
+                      <center>
+                        <table class="msgdesc">
+                          <tr><td colspan="2"><b>Header Message Name:</b> Link</td></tr>
+                          <tr><td colspan="2"><b>Header Message Type:</b> 0x0006</td></tr>
+                          <tr><td colspan="2"><b>Length:</b> Varies </td></tr>
+                          <tr><td colspan="2"><b>Status:</b> Optional; may be
+                              repeated. </td></tr>
+                          <tr><td><b>Description:</b></td>
+                            <td><p>This message encodes the information for a link in a
+                                group&rsquo;s object header, when the group is storing its links
+                                &ldquo;compactly&rdquo;, or in the group&rsquo;s fractal heap,
+                                when the group is storing its links &ldquo;densely&rdquo;.</p>
+                              <p>A group is storing its links compactly when the fractal heap
+                                address in the <em><a href="#LinkInfoMessage">Link Info
+                                    Message</a></em> is set to the &ldquo;undefined address&rdquo;
+                                value.</p></td></tr>
+                          <tr><td colspan="2"><b>Format of Data:</b> See the tables
+                              below.</td></tr>
+                      </table></center>
+                      <!-- end msgdesc table -->
+
+                      <div align="center">
+                        <table class="format">
+                          <caption>
+                            Layout: Link Message
+                          </caption>
+
+	                      <tr>
+	                        <th width="25%">byte</th>
+	                        <th width="25%">byte</th>
+	                        <th width="25%">byte</th>
+	                        <th width="25%">byte</th>
+	                      </tr>
+
+	                      <tr>
+	                        <td>Version</td>
+	                        <td>Flags</td>
+	                        <td>Link type <em>(optional)</em></td>
+                            <td bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+	                      </tr>
+	                      <tr>
+	                        <td colspan="4"><br />Creation Order <em>(8 bytes, optional)</em><br /><br /></td>
+	                      </tr>
+	                      <tr>
+	                        <td>Link Name Character Set <em>(optional)</em></td>
+	                        <td>Length of Link Name (variable size)</td>
+                            <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+	                      </tr>
+	                      <tr>
+	                        <td colspan="4">Link Name (variable size)</td>
+	                      </tr>
+	                      <tr>
+	                        <td colspan="4"><br />Link Information (variable size)<br /><br /></td>
+	                      </tr>
+                        </table>
+                      </div>
+
+                      <br />
+                      <div align="center">
+                        <table class="desc">
+                          <caption>
+                            Fields: Link Message
+                          </caption>
+	                      <tr>
+                            <th width="30%">Field Name</th>
+                            <th>Description</th>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Version</p></td>
+	                        <td><p>The version number for this message. This document describes version 1.</p>
+	                        </td>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Flags</p></td>
+	                        <td><p>This field contains information about the link and controls
+                                the presence of other fields below.
+                                <table class="list">
+                                  <tr>
+                                    <th width="20%" align="center">Bits</th>
+                                    <th width="80%" align="left">Description</th>
+                                  </tr>
+
+                                  <tr>
+                                    <td align="center"><code>0-1</code></td>
+                                    <td>Determines the size of the <em>Length of Link Name</em>
+                                      field.
+                                      <table class="list">
+                                        <tr>
+                                          <th width="20%" align="center">Value</th>
+                                          <th width="80%" align="left">Description</th>
+                                        </tr>
+
+                                        <tr>
+                                          <td align="center"><code>0</code></td>
+                                          <td>The size of the <em>Length of Link Name</em>
+                                            field is 1 byte.
+                                          </td>
+                                        </tr>
+                                        <tr>
+                                          <td align="center"><code>1</code></td>
+                                          <td>The size of the <em>Length of Link Name</em>
+                                            field is 2 bytes.
+                                          </td>
+                                        </tr>
+                                        <tr>
+                                          <td align="center"><code>2</code></td>
+                                          <td>The size of the <em>Length of Link Name</em>
+                                            field is 4 bytes.
+                                          </td>
+                                        </tr>
+                                        <tr>
+                                          <td align="center"><code>3</code></td>
+                                          <td>The size of the <em>Length of Link Name</em>
+                                            field is 8 bytes.
+                                          </td>
+                                        </tr>
+                                      </table>
+                                    </td>
+                                  </tr>
+                                  <tr>
+                                    <td align="center"><code>2</code></td>
+                                    <td>Creation Order Field Present: if set, the <em>Creation
+                                        Order</em> field is present.  If not set, creation order
+                                      information is not stored for links in this group.
+                                    </td>
+                                  </tr>
+                                  <tr>
+                                    <td align="center"><code>3</code></td>
+                                    <td>Link Type Field Present: if set, the link is not
+                                      a hard link and the <em>Link Type</em> field is present.
+                                      If not set, the link is a hard link.
+                                    </td>
+                                  </tr>
+                                  <tr>
+                                    <td align="center"><code>4</code></td>
+                                    <td>Link Name Character Set Field Present: if set, the
+                                      link name is not represented with the ASCII character
+                                      set and the <em>Link Name Character Set</em> field is
+                                      present.  If not set, the link name is represented with
+                                      the ASCII character set.
+                                    </td>
+                                  </tr>
+                                  <tr>
+                                    <td align="center"><code>5-7</code></td>
+                                    <td>Reserved (zero).
+                                    </td>
+                                  </tr>
+                              </table></p>
+
+                            </td>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Link type</p></td>
+	                        <td><p>This is the link class type and can be one of the following
+                                values:
+                                <table class="list">
+                                  <tr>
+                                    <th width="20%" align="center">Value</th>
+                                    <th width="80%" align="left">Description</th>
+                                  </tr>
+
+                                  <tr>
+                                    <td align="center"><code>0</code></td>
+                                    <td>A hard link (should never be stored in the file)
+                                    </td>
+                                  </tr>
+                                  <tr>
+                                    <td align="center"><code>1</code></td>
+                                    <td>A soft link.
+                                    </td>
+                                  </tr>
+                                  <tr>
+                                    <td align="center"><code>2-63</code></td>
+                                    <td>Reserved for future HDF5 internal use.
+                                    </td>
+                                  </tr>
+                                  <tr>
+                                    <td align="center"><code>64</code></td>
+                                    <td>An external link.
+                                    </td>
+                                  </tr>
+                                  <tr>
+                                    <td align="center"><code>65-255</code></td>
+                                    <td>Reserved, but available for user-defined link types.
+                                    </td>
+                                  </tr>
+                              </table></p>
+
+	                          <p>This field is present if bit 3 of <em>Flags</em> is set.</p>
+	                        </td>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Creation Order</p></td>
+	                        <td><p>This 64-bit value is an index of the link&rsquo;s creation time within
+                                the group.  Values start at 0 when the group is created an increment
+                                by one for each link added to the group.  Removing a link from a
+                                group does not change existing links&rsquo; creation order field.
+                              </p>
+	                          <p>This field is present if bit 2 of <em>Flags</em> is set.</p>
+	                        </td>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Link Name Character Set</p></td>
+	                        <td><p>This is the character set for encoding the link&rsquo;s name:
+                                <table class="list">
+                                  <tr>
+                                    <th width="20%" align="center">Value</th>
+                                    <th width="80%" align="left">Description</th>
+                                  </tr>
+
+                                  <tr>
+                                    <td align="center"><code>0</code></td>
+                                    <td>ASCII character set encoding (this should never be stored
+                                      in the file)
+                                    </td>
+                                  </tr>
+
+                                  <tr>
+                                    <td align="center"><code>1</code></td>
+                                    <td>UTF-8 character set encoding
+                                    </td>
+                                  </tr>
+                              </table></p>
+
+	                          <p>This field is present if bit 4 of <em>Flags</em> is set.</p>
+	                        </td>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Length of link name</p></td>
+	                        <td><p>This is the length of the link&rsquo;s name.  The size of this field
+	                            depends on bits 0 and 1 of <em>Flags</em>.</p>
+	                        </td>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Link name</p></td>
+	                        <td><p>This is the name of the link, non-NULL terminated.</p>
+	                        </td>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Link information</p></td>
+	                        <td><p>The format of this field depends on the <em>link type</em>.</p>
+                              <p>For <b>hard</b> links, the field is formatted as follows:
+
+                                <table class="list">
+                                  <tr>
+                                    <td width="20%"><i><a href="#SizeOfOffsetsV0">
+                                          Size of Offsets</a></i> bytes:</td>
+                                    <td width="80%">The address of the object header for the object that the
+                                      link points to.
+                                    </td>
+                                  </tr>
+                                </table>
+                              </p>
+
+                              <p>
+                                For <b>soft</b> links, the field is formatted as follows:
+
+                                <table class="list">
+                                  <tr>
+                                    <td width="20%">Bytes 1-2:</td>
+                                    <td width="80%">Length of soft link value.</td>
+                                  </tr>
+                                  <tr>
+                                    <td><em>Length of soft link value</em> bytes:</td>
+                                    <td>A non-NULL-terminated string storing the value of the
+                                      soft link.
+                                    </td>
+                                  </tr>
+                                </table>
+                              </p>
+
+                              <p>
+                                For <b>external</b> links, the field is formatted as follows:
+
+                                <table class="list">
+                                  <tr>
+                                    <td width="20%">Bytes 1-2:</td>
+                                    <td width="80%">Length of external link value.</td>
+                                  </tr>
+                                  <tr>
+                                    <td><em>Length of external link value</em> bytes:</td>
+                                    <td>The first byte contains the version number in the
+                                      upper 4 bits and flags in the lower 4 bits for the external
+                                      link. Both version and flags are defined to be zero in
+                                      this document. The remaining bytes consist of two
+                                      NULL-terminated strings, with no padding between them.
+                                      The first string is the name of the HDF5 file containing
+                                      the object linked to and the second string is the full path
+                                      to the object linked to, within the HDF5 file&rsquo;s
+                                      group hierarchy.
+                                    </td>
+                                  </tr>
+                                </table>
+                              </p>
+
+                              <p>
+                                For <b>user-defined</b> links, the field is formatted as follows:
+
+                                <table class="list">
+                                  <tr>
+                                    <td width="20%">Bytes 1-2:</td>
+                                    <td width="80%">Length of user-defined data.</td>
+                                  </tr>
+                                  <tr>
+                                    <td><em>Length of user-defined link value</em> bytes:</td>
+                                    <td>The data supplied for the user-defined link type.</td>
+                                  </tr>
+                                </table>
+                              </p>
+
+                            </td>
+                          </tr>
+                        </table>
+                      </div>
+
+                      <h4><a name="ExternalFileListMessage">IV.A.2.h. The Data Storage -
+                          External Data Files Message</a></h4>
+
+                      <!-- start msgdesc table -->
+                      <center>
+                        <table class="msgdesc">
+                          <tr><td colspan="2"><b>Header Message Name:</b> External
+                              Data Files</td></tr>
+                          <tr><td colspan="2"><b>Header Message Type:</b> 0x0007</td></tr>
+                          <tr><td colspan="2"><b>Length:</b> Varies</td></tr>
+                          <tr><td colspan="2"><b>Status:</b> Optional; may not be
+                              repeated.</td></tr>
+                          <tr><td><b>Description:</b></td>
+                            <td>The external data storage message indicates that the data
+                              for an object is stored outside the HDF5 file. The filename of
+                              the object is stored as a Universal Resource Location (URL) of
+                              the actual filename containing the data. An external file list
+                              record also contains the byte offset of the start of the data
+                              within the file and the amount of space reserved in the file
+                              for that data.</td></tr>
+                          <tr><td colspan="2"><b>Format of Data:</b> See the tables
+                              below.</td></tr>
+                      </table></center>
+                      <!-- end msgdesc table -->
+
+                      <div align="center">
+                        <table class="format">
+                          <caption>
+                            Layout: External File List Message
+                          </caption>
+
+	                      <tr>
+	                        <th width="25%">byte</th>
+	                        <th width="25%">byte</th>
+	                        <th width="25%">byte</th>
+	                        <th width="25%">byte</th>
+	                      </tr>
+
+	                      <tr>
+	                        <td>Version</td>
+	                        <td colspan="3">Reserved (zero)</td>
+	                      </tr>
+
+	                      <tr>
+	                        <td colspan="2">Allocated Slots</td>
+	                        <td colspan="2">Used Slots</td>
+	                      </tr>
+
+	                      <tr>
+	                        <td colspan="4"><br />Heap Address<sup>O</sup><br /><br /></td>
+	                      </tr>
+
+	                      <tr>
+	                        <td colspan="4"><br />Slot Definitions...<br /><br /></td>
+	                      </tr>
+                        </table>
+
+                        <table class="note">
+                          <tr>
+                            <td width="60%">&nbsp;</td>
+                            <td width="40%">
+                              (Items marked with an &lsquo;O&rsquo; in the above table are
+                              of the size specified in the <a href="#SizeOfOffsetsV0">Size
+                                of Offsets</a> field in the superblock.)
+                          </td></tr>
+                        </table>
+
+                      </div>
+
+                      <br />
+                      <div align="center">
+	                    <table class="desc">
+                          <caption>
+                            Fields: External File List Message
+                          </caption>
+	                      <tr>
+	                        <th width="30%">Field Name</th>
+	                        <th>Description</th>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Version</p></td>
+	                        <td>
+	                          <p>The version number information is used for changes in the format of
+                                External Data Storage Message and is described here:
+		                        <table class="list">
+		                          <tr>
+			                        <th width="20%" align="center">Version</th>
+			                        <th width="80%" align="left">Description</th>
+		                          </tr>
+		                          <tr>
+			                        <td align="center"><code>0</code></td>
+			                        <td>Never used.</td>
+		                          </tr>
+		                          <tr>
+			                        <td align="center"><code>1</code></td>
+			                        <td>The current version used by the library.</td>
+		                          </tr>
+		                      </table></p>
+
+	                        </td>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Allocated Slots</p></td>
+	                        <td>
+	                          <p>The total number of slots allocated in the message.  Its value must be at least as
+		                        large as the value contained in the Used Slots field. (The current library simply
+		                        uses the number of Used Slots for this message)</p>
+	                        </td>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Used Slots</p></td>
+	                        <td>
+	                          <p>The number of initial slots which contains valid information.</p>
+	                        </td>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Heap Address</p></td>
+	                        <td>
+	                          <p>This is the address of a local heap which contains the names for the external
+		                        files (The local heap information can be found in Disk Format Level 1D in this
+		                        document).  The name at offset zero in the heap is always the empty string.</p>
+	                        </td>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Slot Definitions</p></td>
+	                        <td>
+	                          <p>The slot definitions are stored in order according to the array addresses they
+		                        represent.</p>
+	                        </td>
+	                      </tr>
+
+	                    </table>
+                      </div>
+
+                      <br />
+                      <br />
+                      <br />
+                      <div align="center">
+                        <table class="format">
+                          <caption>
+                            Layout: External File List Slot
+                          </caption>
+
+	                      <tr>
+	                        <th width="25%">byte</th>
+	                        <th width="25%">byte</th>
+	                        <th width="25%">byte</th>
+	                        <th width="25%">byte</th>
+	                      </tr>
+
+	                      <tr>
+	                        <td colspan="4"><br />Name Offset in Local Heap<sup>L</sup><br /><br /></td>
+	                      </tr>
+
+	                      <tr>
+	                        <td colspan="4"><br />Offset in External Data File<sup>L</sup><br /><br /></td>
+	                      </tr>
+
+	                      <tr>
+	                        <td colspan="4"><br />Data Size in External File<sup>L</sup><br /><br /></td>
+	                      </tr>
+                        </table>
+
+                        <table class="note">
+                          <tr>
+                            <td width="60%">&nbsp;</td>
+                            <td width="40%">
+                              (Items marked with an &lsquo;L&rsquo; in the above table are
+                              of the size specified in the <a href="#SizeOfLengthsV0">Size
+                                of Lengths</a> field in the superblock.)
+                          </td></tr>
+                        </table>
+
+                      </div>
+
+                      <br />
+                      <div align="center">
+	                    <table class="desc">
+                          <caption>
+                            Fields: External File List Slot
+                          </caption>
+	                      <tr>
+	                        <th width="30%">Field Name</th>
+	                        <th>Description</th>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Name Offset in Local Heap</p></td>
+	                        <td>
+		                      <p>The byte offset within the local name heap for the name
+	    	                    of the file.  File names are stored as a URL which has a
+	    	                    protocol name, a host name, a port number, and a file
+	    	                    name:
+		                        <code><em>protocol</em>:<em>port</em>//<em>host</em>/<em>file</em></code>.
+		                        If the protocol is omitted then &ldquo;file:&rdquo; is assumed.  If
+		                        the port number is omitted then a default port for that
+		                        protocol is used.  If both the protocol and the port
+		                        number are omitted then the colon can also be omitted. If
+		                        the double slash and host name are omitted then
+		                        &ldquo;localhost&rdquo; is assumed.  The file name is the only
+		                        mandatory part, and if the leading slash is missing then
+		                        it is relative to the application&rsquo;s current working
+		                        directory (the use of relative names is not
+		                        recommended).
+                              </p>
+	                        </td>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Offset in External Data File</p></td>
+	                        <td>
+	  	                      <p>This is the byte offset to the start of the data in the
+	                            specified file. For files that contain data for a single
+	                            dataset this will usually be zero.</p>
+	                        </td>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Data Size in External File</p></td>
+	                        <td>
+		                      <p>This is the total number of bytes reserved in the
+		                        specified file for raw data storage.  For a file that
+		                        contains exactly one complete dataset which is not
+		                        extendable, the size will usually be the exact size of the
+		                        dataset.  However, by making the size larger one allows
+		                        HDF5 to extend the dataset. The size can be set to a value
+		                        larger than the entire file since HDF5 will read zeroes
+		                        past the end of the file without failing.</p>
+	                        </td>
+	                      </tr>
+	                    </table>
+                      </div>
+
+
+                      <h4><a name="LayoutMessage">IV.A.2.i. The Data Layout Message</a></h4>
+
+                      <!-- start msgdesc table -->
+                      <center>
+                        <table class="msgdesc">
+                          <tr><td colspan="2"><b>Header Message Name:</b> Data Layout</td></tr>
+                          <tr><td colspan="2"><b>Header Message Type:</b> 0x0008</td></tr>
+                          <tr><td colspan="2"><b>Length:</b> Varies</td></tr>
+                          <tr><td colspan="2"><b>Status:</b> Required for datasets; may not
+                              be repeated.</td></tr>
+                          <tr><td><b>Description:</b></td>
+                            <td>The Data Layout message
+                              describes how the elements of a multi-dimensional array are stored
+                              in the HDF5 file. Four types of data layout are supported:
+                              <ol>
+                                <li>Contiguous: The array is stored in one contiguous area of
+                                  the file. This layout requires that the size of the array be
+                                  constant: data manipulations such as chunking, compression,
+                                  checksums, or encryption are not permitted. The message stores
+                                  the total storage size of the array. The offset of an element
+                                  from the beginning of the storage area is computed as in a C
+                                  array.</li>
+                                <li>Chunked: The array domain is regularly decomposed into
+                                  chunks, and each chunk is allocated and stored separately. This
+                                  layout supports arbitrary element traversals, compression,
+                                  encryption, and checksums (these features are described
+                                  in other messages). The message stores the size of a chunk
+                                  instead of the size of the entire array; the storage size of
+                                  the entire array can be calculated by traversing the chunk index
+                                  that stores the chunk addresses.</li>
+                                <li>Compact: The array is stored in one contiguous block as
+                                  part of this object header message.</li>
+                                <li>Virtual: This is only supported for version 4 of the Data
+                                  Layout message. The message stores information that is used to
+                                  locate the global heap collection containing the Virtual Dataset
+                                  (VDS) mapping information. The mapping associates the VDS to
+                                  the source dataset elements that are stored across a collection
+                                  of HDF5 files.</li>
+                          </ol></td></tr>
+                          <tr><td colspan="2"><b>Format of Data:</b> See the tables
+                              below.</td></tr>
+                      </table></center>
+                      <!-- end msgdesc table -->
+
+                      <div align="center">
+                        <table class="format">
+                          <caption>
+                            Layout: Data Layout Message (Versions 1 and 2)
+                          </caption>
+
+	                      <tr>
+	                        <th width="25%">byte</th>
+	                        <th width="25%">byte</th>
+	                        <th width="25%">byte</th>
+	                        <th width="25%">byte</th>
+	                      </tr>
+
+	                      <tr>
+	                        <td>Version</td>
+	                        <td>Dimensionality</td>
+	                        <td>Layout Class</td>
+	                        <td>Reserved <em>(zero)</em></td>
+	                      </tr>
+
+	                      <tr>
+	                        <td colspan="4">Reserved <em>(zero)</em></td>
+	                      </tr>
+
+	                      <tr>
+	                        <td colspan="4"><br />Data Address<sup>O</sup> <em>(optional)</em><br /><br /></td>
+	                      </tr>
+
+	                      <tr>
+	                        <td colspan="4">Dimension 1 Size</td>
+	                      </tr>
+
+	                      <tr>
+	                        <td colspan="4">Dimension 2 Size</td>
+	                      </tr>
+
+	                      <tr>
+	                        <td colspan="4">...</td>
+	                      </tr>
+
+	                      <tr>
+	                        <td colspan="4">Dimension #n Size</td>
+	                      </tr>
+
+	                      <tr>
+	                        <td colspan="4">Dataset Element Size <em>(optional)</em></td>
+	                      </tr>
+
+	                      <tr>
+	                        <td colspan="4">Compact Data Size <em>(optional)</em></td>
+	                      </tr>
+
+	                      <tr>
+	                        <td colspan="4"><br />Compact Data... <em>(variable size, optional)</em><br /><br /></td>
+	                      </tr>
+                        </table>
+
+                        <table class="note">
+                          <tr>
+                            <td width="60%">&nbsp;</td>
+                            <td width="40%">
+                              (Items marked with an &lsquo;O&rsquo; in the above table are
+                              of the size specified in the <a href="#SizeOfOffsetsV0">Size
+                                of Offsets</a> field in the superblock.)
+                          </td></tr>
+                        </table>
+
+                      </div>
+
+                      <br />
+                      <div align="center">
+                        <table class="desc">
+                          <caption>
+                            Fields: Data Layout Message (Versions 1 and 2)
+                          </caption>
+	                      <tr>
+	                        <th width="30%">Field Name</th>
+	                        <th>Description</th>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Version</p></td>
+	                        <td>
+	                          <p>The version number information is used for changes in the format of the data
+	                            layout message and is described here:
+	                            <table class="list">
+		                          <tr>
+		                            <th width="20%" align="center">Version</th>
+		                            <th width="80%" align="left">Description</th>
+		                          </tr>
+
+		                          <tr>
+		                            <td align="center"><code>0</code></td>
+		                            <td>Never used.</td>
+		                          </tr>
+
+		                          <tr>
+		                            <td align="center"><code>1</code></td>
+		                            <td>Used by version 1.4 and before of the library to encode layout information.
+		                              Data space is always allocated when the data set is created.</td>
+		                          </tr>
+
+		                          <tr>
+		                            <td align="center"><code>2</code></td>
+		                            <td>Used by version 1.6.[0,1,2] of the library to encode layout information.
+		                              Data space is allocated only when it is necessary.</td>
+		                          </tr>
+	                          </table></p>
+	                        </td>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Dimensionality</p></td>
+	                        <td><p>An array has a fixed dimensionality.  This field
+	                            specifies the number of dimension size fields later in the
+	                            message. The value stored for chunked storage is 1 greater than
+                                the number of dimensions in the dataset&rsquo;s dataspace.
+                                For example, 2 is stored for a 1 dimensional dataset.
+                              </p>
+                            </td>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Layout Class</p></td>
+	                        <td><p>The layout class specifies the type of storage for the data
+                                and how the other fields of the layout message are to be
+                                interpreted.
+
+	                            <table class="list">
+		                          <tr>
+		                            <th width="20%" align="center">Value</th>
+		                            <th width="80%" align="left">Description</th>
+		                          </tr>
+
+		                          <tr>
+		                            <td align="center"><code>0</code></td>
+		                            <td>Compact Storage
+                                    </td>
+		                          </tr>
+
+		                          <tr>
+		                            <td align="center"><code>1</code></td>
+		                            <td>Contiguous Storage
+                                    </td>
+		                          </tr>
+
+		                          <tr>
+		                            <td align="center"><code>2</code></td>
+		                            <td>Chunked Storage
+                                    </td>
+		                          </tr>
+	                            </table>
+                              </p>
+                            </td>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Data Address</p></td>
+	                        <td><p>For contiguous storage, this is the address of the raw
+	                            data in the file.  For chunked storage this is the address
+	                            of the <a href="#V1Btrees">v1 B-tree</a> that is used to look up the addresses of the
+	                            chunks.  This field is not present for compact storage.
+                                If the version for this message is greater than 1, the address
+                                may have the &ldquo;undefined address&rdquo; value, to indicate that
+                                storage has not yet been allocated for this array.</p>
+                            </td>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Dimension #n Size</p></td>
+	                        <td><p>For contiguous and compact storage the dimensions define
+                                the entire size of the array while for chunked storage they define
+                                the size of a single chunk.  In all cases, they are in units of
+                                array elements (not bytes).  The first dimension stored in the list
+                                of dimensions is the slowest changing dimension and the last
+                                dimension stored is the fastest changing dimension.
+                              </p>
+                            </td>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Dataset Element Size</p></td>
+	                        <td><p>The size of a dataset element, in bytes.  This field is only
+                                present for chunked storage.
+                              </p>
+                            </td>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Compact Data Size</p></td>
+	                        <td><p>This field is only present for compact data storage.
+                                It contains the size of the raw data for the dataset array, in
+                                bytes.</p>
+                            </td>
+                          </tr>
+
+	                      <tr>
+	                        <td><p>Compact Data</p></td>
+	                        <td><p>This field is only present for compact data storage.
+                                It contains the raw data for the dataset array.</p>
+                            </td>
+	                      </tr>
+                        </table>
+                      </div>
+
+                      <br />
+                      <p>Version 3 of this message re-structured the format into specific
+                        properties that are required for each layout class.</p>
+
+
+                      <div align="center">
+                        <table class="format">
+                          <caption>
+                            Layout: Data Layout Message (Version 3)
+                          </caption>
+
+	                      <tr>
+	                        <th width="25%">byte</th>
+	                        <th width="25%">byte</th>
+	                        <th width="25%">byte</th>
+	                        <th width="25%">byte</th>
+	                      </tr>
+
+	                      <tr>
+	                        <td>Version</td>
+	                        <td>Layout Class</td>
+                            <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+	                      </tr>
+
+	                      <tr>
+	                        <td colspan="4"><br />Properties <em>(variable size)</em><br /><br /></td>
+	                      </tr>
+                        </table>
+                      </div>
+
+                      <br />
+                      <div align="center">
+                        <table class="desc">
+                          <caption>
+                            Fields: Data Layout Message (Version 3)
+                          </caption>
+	                      <tr>
+	                        <th width="30%">Field Name</th>
+	                        <th>Description</th>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Version</p></td>
+	                        <td>
+	                          <p>The version number information is used for changes in the format of layout message
+	                            and is described here:
+	                            <table class="list">
+		                          <tr>
+		                            <th width="20%" align="center">Version</th>
+		                            <th width="80%" align="left">Description</th>
+		                          </tr>
+
+		                          <tr>
+		                            <td align="center"><code>3</code></td>
+		                            <td>Used by the version 1.6.3 and later of the library to store properties
+		                              for each layout class.</td>
+		                          </tr>
+	                          </table></p>
+	                        </td>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Layout Class</p></td>
+	                        <td><p>The layout class specifies the type of storage for the data
+                                and how the other fields of the layout message are to be
+                                interpreted.
+	                            <table class="list">
+		                          <tr>
+		                            <th width="20%" align="center">Value</th>
+		                            <th width="80%" align="left">Description</th>
+		                          </tr>
+
+		                          <tr>
+		                            <td align="center"><code>0</code></td>
+		                            <td>Compact Storage
+                                    </td>
+		                          </tr>
+
+		                          <tr>
+		                            <td align="center"><code>1</code></td>
+		                            <td>Contiguous Storage
+                                    </td>
+		                          </tr>
+
+		                          <tr>
+		                            <td align="center"><code>2</code></td>
+		                            <td>Chunked Storage
+                                    </td>
+		                          </tr>
+	                            </table>
+                              </p>
+                            </td>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Properties</p></td>
+	                        <td><p>This variable-sized field encodes information specific to each
+                                layout class and is described below.  If there is no property
+                                information specified for a layout class, the size of this field
+                                is zero bytes.</p></td>
+	                      </tr>
+                        </table>
+                      </div>
+
+                      <br />
+                      <a name="CompactStorage"></a>
+                      <p>Class-specific information for compact storage (layout class 0):  (Note: The dimensionality information
+                        is in the Dataspace message)</p>
+
+
+                      <div align="center">
+                        <table class="format">
+                          <caption>
+                            Layout: Compact Storage Property Description
+                          </caption>
+
+	                      <tr>
+	                        <th width="25%">byte</th>
+	                        <th width="25%">byte</th>
+	                        <th width="25%">byte</th>
+	                        <th width="25%">byte</th>
+	                      </tr>
+
+	                      <tr>
+	                        <td colspan="2">Size</td>
+                            <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+	                      </tr>
+
+	                      <tr>
+	                        <td colspan="4"><br />Raw Data... <em>(variable size)</em><br /><br /></td>
+	                      </tr>
+                        </table>
+                      </div>
+
+                      <br />
+                      <div align="center">
+                        <table class="desc">
+                          <caption>
+                            Fields: Compact Storage Property Description
+                          </caption>
+	                      <tr>
+                            <th width="30%">Field Name</th>
+                            <th>Description</th>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Size</p></td>
+	                        <td><p>This field contains the size of the raw data for the dataset
+                                array, in bytes.
+                              </p>
+                            </td>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Raw Data</p></td>
+	                        <td><p>This field contains the raw data for the dataset array.</p></td>
+	                      </tr>
+                        </table>
+                      </div>
+
+
+                      <br />
+                      <a name="ContiguousStorage"></a>
+                      <p>Class-specific information for contiguous storage (layout class 1):
+                        (Note: The dimensionality information is in the Dataspace message)</p>
+
+
+                      <div align="center">
+                        <table class="format">
+                          <caption>
+                            Layout: Contiguous Storage Property Description
+                          </caption>
+
+	                      <tr>
+	                        <th width="25%">byte</th>
+	                        <th width="25%">byte</th>
+	                        <th width="25%">byte</th>
+	                        <th width="25%">byte</th>
+	                      </tr>
+
+	                      <tr>
+	                        <td colspan="4"><br />Address<sup>O</sup><br /><br /></td>
+	                      </tr>
+
+	                      <tr>
+	                        <td colspan="4"><br />Size<sup>L</sup><br /><br /></td>
+	                      </tr>
+                        </table>
+
+                        <table class="note">
+                          <tr>
+                            <td width="60%">&nbsp;</td>
+                            <td width="40%">
+                              (Items marked with an &lsquo;O&rsquo; in the above table are
+                              of the size specified in the <a href="#SizeOfOffsetsV0">Size
+                                of Offsets</a> field in the superblock.)
+                          </td></tr>
+                          <tr>
+                            <td>&nbsp;</td>
+                            <td>
+                              (Items marked with an &lsquo;L&rsquo; in the above table are
+                              of the size specified in the <a href="#SizeOfLengthsV0">Size
+                                of Lengths</a> field in the superblock.)
+                          </td></tr>
+                        </table>
+                      </div>
+
+                      <br />
+                      <div align="center">
+                        <table class="desc">
+                          <caption>
+                            Fields: Contiguous Storage Property Description
+                          </caption>
+	                      <tr>
+                            <th width="30%">Field Name</th>
+                            <th>Description</th>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Address</p></td>
+	                        <td><p>This is the address of the raw data in the file.
+                                The address may have the &ldquo;undefined address&rdquo; value, to indicate
+                                that storage has not yet been allocated for this array.</p></td>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Size</p></td>
+	                        <td><p>This field contains the size allocated to store the raw data,
+                                in bytes.
+                              </p>
+                            </td>
+	                      </tr>
+                        </table>
+                      </div>
+
+
+                      <br />
+                      <p>Class-specific information for chunked storage (layout class 2):</p>
+
+
+                      <div align="center">
+                        <table class="format">
+                          <caption>
+                            Layout: Chunked Storage Property Description
+                          </caption>
+
+	                      <tr>
+	                        <th width="25%">byte</th>
+	                        <th width="25%">byte</th>
+	                        <th width="25%">byte</th>
+	                        <th width="25%">byte</th>
+	                      </tr>
+
+	                      <tr>
+	                        <td>Dimensionality</td>
+                            <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+	                      </tr>
+
+	                      <tr>
+	                        <td colspan="4"><br />Address<sup>O</sup><br /><br /></td>
+	                      </tr>
+
+	                      <tr>
+	                        <td colspan="4">Dimension 0 Size</td>
+	                      </tr>
+
+	                      <tr>
+	                        <td colspan="4">Dimension 1 Size</td>
+	                      </tr>
+
+	                      <tr>
+	                        <td colspan="4">...</td>
+	                      </tr>
+
+	                      <tr>
+	                        <td colspan="4">Dimension #n Size</td>
+	                      </tr>
+
+	                      <tr>
+	                        <td colspan="4">Dataset Element Size</td>
+	                      </tr>
+                        </table>
+
+                        <table class="note">
+                          <tr>
+                            <td width="60%">&nbsp;</td>
+                            <td width="40%">
+                              (Items marked with an &lsquo;O&rsquo; in the above table are
+                              of the size specified in the <a href="#SizeOfOffsetsV0">Size
+                                of Offsets</a> field in the superblock.)
+                          </td></tr>
+                        </table>
+
+                      </div>
+
+                      <br />
+                      <div align="center">
+                        <table class="desc">
+                          <caption>
+                            Fields: Chunked Storage Property Description
+                          </caption>
+	                      <tr>
+                            <th width="30%">Field Name</th>
+                            <th>Description</th>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Dimensionality</p></td>
+	                        <td><p>A chunk has a fixed dimensionality.  This field specifies
+	                            the number of dimension size fields later in the message.</p></td>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Address</p></td>
+	                        <td><p>This is the address of the <a href="#V1Btrees">v1 B-tree</a>
+	                            that is used to look up the
+                                addresses of the chunks that actually store portions of the array
+                                data.  The address may have the &ldquo;undefined address&rdquo; value, to
+                                indicate that storage has not yet been allocated for this array.</p></td>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Dimension #n Size</p></td>
+	                        <td><p>These values define the dimension size of a single chunk, in
+                                units of array elements (not bytes).  The first dimension stored in
+                                the list of dimensions is the slowest changing dimension and the
+                                last dimension stored is the fastest changing dimension.
+                              </p>
+                            </td>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Dataset Element Size</p></td>
+	                        <td><p>The size of a dataset element, in bytes.
+                              </p>
+                            </td>
+	                      </tr>
+                        </table>
+                      </div>
+
+
+                      <br />
+
+                      <p><a name="DataLayoutV4">
+                          Version 4</a> of this message is similar to version 3 but has
+                        additional information for the virtual layout class as well as
+                        indexing information for the chunked layout class.</p>
+
+                      <div align="center">
+                        <table class="format">
+                          <caption>
+                            Layout: Data Layout Message (Version 4)
+                          </caption>
+
+	                      <tr>
+	                        <th width="25%">byte</th>
+	                        <th width="25%">byte</th>
+	                        <th width="25%">byte</th>
+	                        <th width="25%">byte</th>
+	                      </tr>
+
+	                      <tr>
+	                        <td>Version</td>
+	                        <td>Layout Class</td>
+                            <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted
+                                only to align table nicely</em></td>
+	                      </tr>
+
+	                      <tr>
+	                        <td colspan="4"><br />Properties <em>(variable size)</em><br /><br /></td>
+	                      </tr>
+                        </table>
+                      </div>
+
+                      <br />
+                      <div align="center">
+                        <table class="desc">
+                          <caption>
+                            Fields: Data Layout Message (Version 4)
+                          </caption>
+	                      <tr>
+	                        <th width="30%">Field Name</th>
+	                        <th>Description</th>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Version</p></td>
+	                        <td>
+	                          <p>The value for this field is 4 and is used by version 1.10.0
+                                and later of the library to store properties for each layout
+                                class and indexing information for the chunked layout.
+	                          </p>
+	                        </td>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Layout Class</p></td>
+	                        <td><p>The layout class specifies the type of storage for the data
+                                and how the other fields of the layout message are to be
+                                interpreted.
+	                            <table class="list">
+                                  <tr>
+                                    <th width="20%" align="center">Value</th>
+                                    <th width="80%" align="left">Description</th>
+                                  </tr>
+
+                                  <tr>
+                                    <td align="center"><code>0</code></td>
+                                    <td>Compact Storage
+                                    </td>
+                                  </tr>
+
+                                  <tr>
+                                    <td align="center"><code>1</code></td>
+                                    <td>Contiguous Storage
+                                    </td>
+                                  </tr>
+
+                                  <tr>
+                                    <td align="center"><code>2</code></td>
+                                    <td>Chunked Storage
+                                    </td>
+                                  </tr>
+                                  <tr>
+                                    <td align="center"><code>3</code></td>
+                                    <td>Virtual Storage
+                                    </td>
+                                  </tr>
+                                </table>
+                              </p>
+                            </td>
+	                      </tr>
+
+	                      <tr>
+	                        <td><p>Properties</p></td>
+	                        <td><p>This variable-sized field encodes information specific to a
+                                layout class as follows:
+	                            <table class="list">
+                                  <tr>
+                                    <th align="left" width="20%">Layout Class</th>
+                                    <th align="left" width="80%">Description</th>
+                                  </tr>
+
+                                  <tr>
+                                    <td align="left">Compact Storage</td>
+                                    <td>See <a href="#CompactStorage">Compact Storage
+                                        Property Description</i></a> for the version 3
+Data Layout message.
+</td>
+</tr>
+
+<tr>
+  <td align="left">Contiguous Storage</td>
+  <td>See <a href="#ContiguousStorage">Contiguous Storage
+      Property Description</i></a> for the version 3
+Data Layout message.
+</td>
+</tr>
+
+<tr>
+  <td align="left">Chunked Storage</td>
+  <td>See <a href="#ChunkedStorage">Chunked Storage
+      Property Description</i></a> below.
+</td>
+</tr>
+
+<tr>
+  <td align="left">Virtual Storage</td>
+  <td>See <a href="#VirtualStorage">Virtual Storage
+      Property Description</i></a> below.
+</td>
+</tr>
+</table>
+
+</p></td>
+</tr>
+</table>
+</div>
+
+<br />
+<a name="ChunkedStorage"></a>
+<p>Class-specific information for chunked storage (layout
+  class 2):</p>
+
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Chunked Storage Property Description
+    </caption>
+
+	<tr>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+	  <td>Flags</td>
+	  <td>Dimensionality</td>
+	  <td>Dimension Size Encoded Length</td>
+      <td colspan="1" bgcolor="#DDDDDD"><em>This space inserted to align table nicely</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">Dimension 0 Size <em>(variable size)</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">Dimension 1 Size <em>(variable size)</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">...</td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">Dimension #n Size <em>(variable size)</em></td>
+	</tr>
+
+	<tr>
+	  <td>Chunk Indexing Type</td>
+      <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">Indexing Type Information <em>(variable size)</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><br />Address<sup>O</sup><br /><br /></td>
+	</tr>
+  </table>
+
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Chunked Storage Property Description
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td><p>Flags</p></td>
+	  <td><p>This is the chunked layout feature flag:</p>
+
+	    <table class="list">
+		  <tr>
+		    <th width="55%" align="left">Value</th>
+		    <th width="45%" align="left">Description</th>
+		  </tr>
+
+		  <tr>
+		    <td align="left"><code>DONT_FILTER_PARTIAL_BOUND_CHUNKS (bit 0)</code></td>
+		    <td>Do not apply filter to a partial edge chunk.
+
+            </td>
+		  </tr>
+
+		  <tr>
+		    <td align="left"><code>SINGLE_INDEX_WITH_FILTER (bit 1)</code></td>
+		    <td>A filtered chunk for <i>Single Chunk</i> indexing.
+            </td>
+		  </tr>
+
+	    </table>
+
+	  </td>
+
+	</tr>
+
+	<tr>
+	  <td><p>Dimensionality</p></td>
+	  <td><p>A chunk has fixed dimension.  This field specifies
+	      the number of <em>Dimension Size</em> fields later in the message.</p></td>
+	</tr>
+
+	<tr>
+	  <td><p>Dimension Size Encoded Length</p></td>
+	  <td>
+	    <p>This is the size in bytes used to encode <em>Dimension Size</em>.
+        </p>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td><p>Dimension #n Size</p></td>
+	  <td><p>These values define the dimension size of a single chunk, in
+          units of array elements (not bytes).  The first dimension stored in
+          the list of dimensions is the slowest changing dimension and the
+          last dimension stored is the fastest changing dimension.
+        </p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Chunk Indexing Type</p></td>
+	  <td><p>There are five indexing types used to look up addresses
+          of the chunks. For more information on each type, see
+          <a href="#AppendixC">&ldquo;Appendix C: Types of Indexes for
+            Dataset Chunks.&rdquo;</a>
+	      <table class="list">
+		    <tr>
+		      <th width="20%" align="center">Value</th>
+		      <th width="80%" align="left">Description</th>
+		    </tr>
+
+		    <tr>
+		      <td align="center"><code>1</code></td>
+		      <td><a href="#SingleChunk"><i>Single Chunk</i></a> indexing type.
+              </td>
+		    </tr>
+
+		    <tr>
+		      <td align="center"><code>2</code></td>
+		      <td><a href="#Implicit"><i>Implicit</i></a> indexing type.
+              </td>
+		    </tr>
+
+		    <tr>
+		      <td align="center"><code>3</code></td>
+		      <td><a href="#FixedArray"><i>Fixed Array</i></a> indexing type.
+              </td>
+		    </tr>
+
+		    <tr>
+		      <td align="center"><code>4</code></td>
+		      <td><a href="#ExtensibleArray"><i>Extensible Array</i></a> indexing type.
+              </td>
+		    </tr>
+
+		    <tr>
+		      <td align="center"><code>5</code></td>
+		      <td><a href="#V2Btrees"><i>Version 2 B-tree</i></a> indexing type.
+              </td>
+		    </tr>
+
+	      </table>
+        </p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Indexing Type Information</p></td>
+	  <td><p>This variable-sized field encodes information specific to
+          an indexing type. More information on what is encoded with
+          each type can be found below this table.
+          <ul>
+            <li>See <a href="#IndexInfoSingle"><i>Single Chunk</i></a> below.</li>
+            <li>See <a href="#IndexInfoImplicit"><i>Implicit</i></a> below.</li>
+            <li>See <a href="#IndexInfoFixed"><i>Fixed Array</i></a> below.</li>
+            <li>See <a href="#IndexInfoExtensible"><i>Extensible Array</i></a> below.</li>
+            <li>See <a href="#IndexInfoV2Btrees"><i>Version 2 B-tree</i></a> below.</li>
+          </ul>
+        </p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Address</p></td>
+	  <td><p>This is the address specific to an indexing type.
+		  The address may be undefined if the chunk or index storage is not allocated yet.
+	      <table class="list">
+		    <tr>
+		      <th width="40%" align="left">Value</th>
+		      <th width="60%" align="left">Description</th>
+		    </tr>
+
+		    <tr>
+		      <td align="left"><i>Single Chunk index</i></td>
+		      <td align="left">Address of the single chunk.</td>
+      </td>
+	</tr>
+
+	<tr>
+	  <td align="left"><i>Implicit index</i></td>
+	  <td align="left">Address of the array of dataset chunks.</td>
+</td>
+</tr>
+
+<tr>
+  <td align="left"><i>Fixed Array index</i></td>
+  <td align="left">Address of the index.</td>
+</tr>
+
+<tr>
+  <td align="left"><i>Extensible Array index</i></td>
+  <td align="left">Address of the index.</td>
+</td>
+</tr>
+
+<tr>
+  <td align="left"><i>Version 2 B-tree index</i></td>
+  <td align="left">Address of the index.</td>
+</td>
+</tr>
+
+</table>
+
+</p>
+</td>
+</tr>
+
+</table>
+</div>
+
+<br />
+
+<ol>
+  <li>
+    <a name="IndexInfoSingle"></a>
+      Index-specific information for <i>Single Chunk</i>:
+  </li>
+
+  <p>The following information exists only when the chunk is filtered.
+    In other words, when <code>DONT_FILTER_PARTIAL_BOUND_CHUNKS</code>
+    (bit 0) is enabled in the field <em>flags</em>.</p>
+
+  <div align="center">
+    <table class="format">
+      <caption>
+        Layout: Single Chunk Indexing Information
+      </caption>
+
+	  <tr>
+	    <th width="25%">byte</th>
+	    <th width="25%">byte</th>
+	    <th width="25%">byte</th>
+	    <th width="25%">byte</th>
+	  </tr>
+
+	  <tr>
+	    <td colspan="4"><br />Size of filtered chunk<sup>L</sup><br /><br /></td>
+	  </tr>
+
+	  <tr>
+	    <td colspan="4">Filters for chunk</td>
+	  </tr>
+
+    </table>
+
+    <table class="note">
+      <tr>
+        <td width="55%">&nbsp;</td>
+        <td width="45%"> <!-- width is slightly different: these
+                              tables are part of an ordered list; see <ol> tags. -->
+            (Items marked with an &lsquo;L&rsquo; in the above table are
+            of the size specified in the <a href="#SizeOfLengthsV0">Size
+              of Lengths</a> field in the superblock.)
+      </td></tr>
+    </table>
+  </div>
+
+  <br />
+  <div align="center">
+    <table class="desc">
+      <caption>
+        Fields: Single Chunk Indexing Information
+      </caption>
+	  <tr>
+        <th width="30%">Field Name</th>
+        <th>Description</th>
+	  </tr>
+
+	  <tr>
+	    <td><p>Size of filtered chunk</p></td>
+	    <td><p>This field is the size of a filtered chunk.</p></td>
+	  </tr>
+
+	  <tr>
+	    <td><p>Filters for chunk</p></td>
+	    <td><p>This field contains filters for the chunk.</p></td>
+	  </tr>
+    </table>
+  </div>
+</p>
+
+<br />
+
+<li>
+  <a name="IndexInfoImplicit"></a>
+    Index-specific information for <i>Implicit</i>:
+</li>
+
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Implicit Indexing Information
+    </caption>
+
+	<tr>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+      <td colspan="4" bgcolor="#DDDDDD">
+        <em>No specific indexing information</em></td>
+	</tr>
+
+  </table>
+</div>
+
+<br />
+<li>
+  <a name="IndexInfoFixed"></a>
+    Index-specific information for <i>Fixed Array</i>:
+</li>
+
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Fixed Array Indexing Information
+    </caption>
+
+	<tr>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+	  <td colspan="1">Page Bits</td>
+      <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+	</tr>
+
+  </table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Fixed Array Indexing Information
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td><p>Page Bits</p></td>
+	  <td><p>This field contains the number of bits needed to store the
+	      maximum number of elements in a data block page.</p></td>
+	</tr>
+
+  </table>
+</div>
+</p>
+
+<br />
+<li>
+  <a name="IndexInfoExtensible"></a>
+    Index-specific information for <i>Extensible Array</i>:
+</li>
+
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Extensible Array Indexing Information
+    </caption>
+
+	<tr>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+	  <td>Max Bits</td>
+	  <td>Index Elements</td>
+	  <td>Min Pointers</td>
+	  <td>Min Elements</td>
+	</tr>
+
+	<td colspan="2">Page Bits</td>
+    <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+</tr>
+
+</table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Extensible Array Indexing Information
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td><p>Max Bits</p></td>
+	  <td><p>This field contains the number of bits needed to store the maximum number of elements
+          in the array.
+        </p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Index Elements</p></td>
+	  <td><p>This field contains the number of elements to store in the
+          index block.
+        </p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Min Pointers</p></td>
+	  <td><p>This field contains the minimum number of data block pointers
+          for a superblock.
+        </p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Min Elements</p></td>
+	  <td><p>This field contains the minimum number of elements per data block.
+        </p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Page Bits</p></td>
+	  <td><p>This field contains the number of bits needed to store the
+	      maximum number of elements in a data block page.
+        </p>
+      </td>
+	</tr>
+
+  </table>
+</div>
+</p>
+<br />
+
+<li>
+  <a name="IndexInfoV2Btrees"></a>
+    Index-specific information for <i>Version 2 B-tree</i>:
+</li>
+
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Version 2 B-tree Indexing Information
+    </caption>
+
+	<tr>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+	  <td colspan="4">Node Size</td>
+	</tr>
+
+	<tr>
+	  <td>Split Percent</td>
+	  <td>Merge Percent</td>
+      <td colspan="2" bgcolor="#DDDDDD">
+        <em>This space inserted only to align table nicely</em></td>
+	</tr>
+  </table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Version 2 B-tree Indexing Information
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td><p>Node Size</p></td>
+	  <td><p>This field is the size in bytes of a B-tree node.
+        </p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Split Percent</p></td>
+	  <td><p>This field is the percentage full of a B-tree node at which to split the node.</p></td>
+	</tr>
+
+	<tr>
+	  <td><p>Merge Percent</p></td>
+	  <td><p>This field is the percentage full of a B-tree node at which to merge the node.</p></td>
+	</tr>
+  </table>
+</div>
+</ol>
+
+
+
+<br />
+<a name="VirtualStorage"></a>
+<p>
+  Class-specific information for virtual storage (layout class 3):</p>
+
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Virtual Storage Property Description
+    </caption>
+
+	<tr>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><br />Address<sup>O</sup><br /><br /></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">Index</td>
+	</tr>
+
+  </table>
+
+  <table class="note">
+    <tr>
+      <td width="60%">&nbsp;</td>
+      <td width="40%">
+        (Items marked with an &lsquo;O&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfOffsetsV0">Size
+          of Offsets</a> field in the superblock.)
+    </td></tr>
+  </table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Virtual Storage Property Description
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td><p>Address</p></td>
+	  <td><p>This is the address of the global heap collection where
+          the VDS mapping entries are stored.
+	      See <a href="#GlobalHeapVDS">&ldquo;Disk Format: Level 1F -
+            Global Heap Block for Virtual Datasets.&rdquo;</a>
+	  </p></td>
+	</tr>
+
+	<tr>
+	  <td><p>Index</p></td>
+	  <td><p>This is the index of the data object within the global heap collection.
+        </p>
+      </td>
+	</tr>
+  </table>
+</div>
+
+<h4><a name="BogusMessage">IV.A.2.j. The Bogus Message</a></h4>
+
+<!-- start msgdesc table -->
+<center>
+  <table class="msgdesc">
+    <tr><td colspan="2"><b>Header Message Name:</b> Bogus</td></tr>
+    <tr><td colspan="2"><b>Header Message Type:</b> 0x0009</td></tr>
+    <tr><td colspan="2"><b>Length:</b> 4 bytes</td></tr>
+    <tr><td colspan="2"><b>Status:</b> For testing only; should never
+        be stored in a valid file.</td></tr>
+    <tr><td><b>Description:</b></td>
+      <td>This message is used for testing the HDF5 Library&rsquo;s
+        response to an &ldquo;unknown&rdquo; message type and should
+        never be encountered in a valid HDF5 file.</td></tr>
+    <tr><td colspan="2"><b>Format of Data:</b> See the tables
+        below.</td></tr>
+</table></center>
+<!-- end msgdesc table -->
+
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Bogus Message
+    </caption>
+
+	<tr>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+	  <td colspan="4">Bogus Value</td>
+	</tr>
+  </table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Bogus Message
+    </caption>
+	<tr>
+	  <th width="30%">Field Name</th>
+	  <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td><p>Bogus Value</p></td>
+	  <td>
+	    <p>This value should always be: <code>0xdeadbeef</code>.</p>
+	  </td>
+	</tr>
+  </table>
+</div>
+
+<h4><a name="GroupInfoMessage">IV.A.2.k. The Group Info Message
+</a></h4>
+
+<!-- start msgdesc table -->
+<center>
+  <table class="msgdesc">
+    <tr><td colspan="2"><b>Header Message Name:</b> Group Info</td></tr>
+    <tr><td colspan="2"><b>Header Message Type:</b> 0x000A</td></tr>
+    <tr><td colspan="2"><b>Length:</b> Varies</td></tr>
+    <tr><td colspan="2"><b>Status:</b> Optional; may not be
+        repeated.</td></tr>
+    <tr><td><b>Description:</b></td>
+      <td><p>This message stores information for the constants defining
+          a &ldquo;new style&rdquo; group&rsquo;s behavior. Constant
+          information will be stored in this message and variable
+          information will be stored in the
+          <a href="#LinkInfoMessage">Link Info</a> message.</p>
+        <p>Note: the &ldquo;estimated entry&rdquo; information below is
+          used when determining the size of the object header for the
+          group when it is created.</p></td></tr>
+    <tr><td colspan="2"><b>Format of Data:</b> See the tables
+        below.</td></tr>
+</table></center>
+<!-- end msgdesc table -->
+
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Group Info Message
+    </caption>
+
+	<tr>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+	  <td>Version</td>
+	  <td>Flags</td>
+	  <td colspan="2">Link Phase Change: Maximum Compact Value <em>(optional)</em></td>
+	</tr>
+	<tr>
+	  <td colspan="2">Link Phase Change: Minimum Dense Value <em>(optional)</em></td>
+	  <td colspan="2">Estimated Number of Entries <em>(optional)</em></td>
+	</tr>
+	<tr>
+	  <td colspan="2">Estimated Link Name Length of Entries <em>(optional)</em></td>
+      <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+	</tr>
+
+  </table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Group Info Message
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td><p>Version</p></td>
+	  <td><p>The version number for this message. This document describes version 0.</p>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td><p>Flags</p></td>
+	  <td><p>This is the group information flag with the following definition:
+
+          <table class="list">
+            <tr>
+              <th width="20%" align="center">Bit</th>
+              <th width="80%" align="left">Description</th>
+            </tr>
+
+            <tr>
+              <td align="center"><code>0</code></td>
+              <td>If set, link phase change values are stored.
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>1</code></td>
+              <td>If set, the estimated entry information is non-default
+                and is stored.
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>2-7</code></td>
+              <td>Reserved</td>
+            </tr>
+	    </table></p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Link Phase Change: Maximum Compact Value</p></td>
+	  <td><p>The is the maximum number of links to store &ldquo;compactly&rdquo; (in
+          the group&rsquo;s object header).</p>
+	    <p>This field is present if bit 0 of <em>Flags</em> is set.</p>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td><p>Link Phase Change: Minimum Dense Value</p></td>
+	  <td><p>This is the minimum number of links to store &ldquo;densely&rdquo; (in
+          the group&rsquo;s fractal heap).  The fractal heap&rsquo;s address is
+          located in the <a href="#LinkInfoMessage">Link Info</a>
+          message.</p>
+	    <p>This field is present if bit 0 of <em>Flags</em> is set.</p>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td><p>Estimated Number of Entries</p></td>
+	  <td><p>This is the estimated number of entries in groups.</p>
+	    <p>If this field is not present, the default value of <code>4</code>
+          will be used for the estimated number of group entries.</p>
+	    <p>This field is present if bit 1 of <em>Flags</em> is set.</p>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td><p>Estimated Link Name Length of Entries</p></td>
+	  <td><p>This is the estimated length of entry name.</p>
+	    <p>If this field is not present, the default value of <code>8</code>
+          will be used for the estimated link name length of group entries.</p>
+	    <p>This field is present if bit 1 of <em>Flags</em> is set.</p>
+	  </td>
+	</tr>
+
+  </table>
+</div>
+<!--    </p> -->
+
+<h4><a name="FilterMessage">IV.A.2.l. The Data Storage - Filter
+    Pipeline Message</a></h4>
+
+<!-- start msgdesc table -->
+<center>
+  <table class="msgdesc">
+    <tr><td colspan="2"><b>Header Message Name:</b>
+        Data Storage - Filter Pipeline</td></tr>
+    <tr><td colspan="2"><b>Header Message Type:</b> 0x000B</td></tr>
+    <tr><td colspan="2"><b>Length:</b> Varies</td></tr>
+    <tr><td colspan="2"><b>Status:</b> Optional; may not be
+        repeated.</td></tr>
+    <tr><td><b>Description:</b></td>
+      <td><p>This message describes the filter pipeline which should
+          be applied to the data stream by providing filter identification
+          numbers, flags, a name, and client data.</p>
+        <p>This message may be present in the object headers of both
+          dataset and group objects. For datasets, it specifies the
+          filters to apply to raw data. For groups, it specifies the
+          filters to apply to the group&rsquo;s fractal heap. Currently,
+          only datasets using chunked data storage use the filter
+          pipeline on their raw data.</p></td></tr>
+    <tr><td colspan="2"><b>Format of Data:</b> See the tables
+        below.</td></tr>
+</table></center>
+<!-- end msgdesc table -->
+
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Filter Pipeline Message - Version 1
+    </caption>
+
+	<tr>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+	  <td>Version</td>
+	  <td>Number of Filters</td>
+	  <td colspan="2">Reserved (zero)</td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">Reserved (zero)</td>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><br />Filter Description List <em>(variable size)</em><br /><br /></td>
+	</tr>
+  </table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Filter Pipeline Message - Version 1
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td><p>Version</p></td>
+	  <td><p>The version number for this message.  This table
+	      describes version 1.</p></td>
+	</tr>
+
+	<tr>
+	  <td><p>Number of Filters</p></td>
+	  <td><p>The total number of filters described in this
+	      message. The maximum possible number of filters in a
+	      message is 32.</p></td>
+	</tr>
+
+	<tr>
+	  <td><p>Filter Description List</p></td>
+	  <td><p>A description of each filter.  A filter description
+	      appears in the next table.</p></td>
+	</tr>
+  </table>
+</div>
+
+<br />
+<br />
+<br />
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Filter Description - Version 1
+    </caption>
+
+	<tr>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+	  <td colspan="2">Filter Identification Value</td>
+	  <td colspan="2">Name Length</td>
+	</tr>
+
+	<tr>
+	  <td colspan="2">Flags</td>
+	  <td colspan="2">Number Client Data Values</td>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><br />Name <em>(variable size, optional)</em><br /><br /></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><br />Client Data <em>(variable size, optional)</em><br /><br /></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">Padding <em>(variable size, optional)</em></td>
+	</tr>
+  </table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Filter Description - Version 1
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td><p>Filter Identification Value</p></td>
+	  <td>
+        <p>
+          This value, often referred to as a filter identifier,
+          is designed to be a unique identifier for the filter.
+          Values from zero through 32,767 are reserved for filters
+          supported by The HDF Group in the HDF5 Library and for
+          filters requested and supported by third parties.
+          Filters supported by The HDF Group are documented immediately
+          below.  Information on 3rd-party filters can be found at
+          The HDF Group&rsquo;s
+          <a href="http://www.hdfgroup.org/services/contributions.html">
+            Contributions</a> page.</p>
+
+        <p>
+          To request a filter identifier, please contact
+          The HDF Group&rsquo;s Help Desk at
+          <img src="Graphics/help.png" valign="middle" height="14"
+               alt="The HDF Group Help Desk">.
+          You will be asked to provide the following information:</p>
+        <ol>
+          <li>Contact information for the developer requesting the
+            new identifier</li>
+          <li>A short description of the new filter</li>
+          <li>Links to any relevant information, including licensing
+            information</li>
+        </ol>
+        <p>
+          Values from 32768 to 65535 are reserved for non-distributed uses
+          (for example, internal company usage) or for application usage
+          when testing a feature. The HDF Group does not track or document
+          the use of the filters with identifiers from this range.</p>
+
+        <p>
+          The filters currently in library version 1.8.0 are
+	      listed below:
+
+	      <table class="list">
+	        <tr>
+		      <th width="20%" align="center">Identification</th>
+		      <th width="15%" align="left">Name</th>
+		      <th width="65%" align="left">Description</th>
+	        </tr>
+
+	        <tr>
+		      <td align="center"><code>0</code></td>
+		      <td>N/A</td>
+		      <td>Reserved</td>
+	        </tr>
+
+	        <tr>
+		      <td align="center"><code>1</code></td>
+		      <td>deflate</td>
+		      <td>GZIP deflate compression</td>
+	        </tr>
+
+	        <tr>
+		      <td align="center"><code>2</code></td>
+		      <td>shuffle</td>
+		      <td>Data element shuffling</td>
+	        </tr>
+
+	        <tr>
+		      <td align="center"><code>3</code></td>
+		      <td>fletcher32</td>
+		      <td>Fletcher32 checksum</td>
+	        </tr>
+
+	        <tr>
+		      <td align="center"><code>4</code></td>
+		      <td>szip</td>
+		      <td>SZIP compression</td>
+	        </tr>
+
+	        <tr>
+		      <td align="center"><code>5</code></td>
+		      <td>nbit</td>
+		      <td>N-bit packing</td>
+	        </tr>
+
+	        <tr>
+		      <td align="center"><code>6</code></td>
+		      <td>scaleoffset</td>
+		      <td>Scale and offset encoded values</td>
+	        </tr>
+	      </table>
+      </p></td>
+	</tr>
+
+	<tr>
+	  <td><p>Name Length</p></td>
+	  <td><p>Each filter has an optional null-terminated ASCII name
+	      and this field holds the length of the name including the
+	      null termination padded with nulls to be a multiple of
+	      eight. If the filter has no name then a value of zero is
+	      stored in this field.</p></td>
+	</tr>
+
+	<tr>
+	  <td><p>Flags</p></td>
+	  <td><p>The flags indicate certain properties for a filter.  The
+	      bit values defined so far are:
+	      <table class="list">
+	        <tr>
+		      <th width="20%" align="center">Bit</th>
+		      <th width="80%" align="left">Description</th>
+	        </tr>
+
+	        <tr>
+		      <td align="center"><code>0</code></td>
+	          <td>If set then the filter is an optional filter.
+		        During output, if an optional filter fails it will be
+		        silently skipped in the pipeline.</td>
+	        </tr>
+
+	        <tr>
+		      <td align="center"><code>1-15</code></td>
+	          <td>Reserved (zero)</td>
+	        </tr>
+	    </table></p>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td><p>Number of Client Data Values</p></td>
+	  <td><p>Each filter can store integer values to control
+	      how the filter operates.  The number of entries in the
+	      <em>Client Data</em> array is stored in this field.</p></td>
+	</tr>
+
+	<tr>
+	  <td><p>Name</p></td>
+	  <td><p>If the <em>Name Length</em> field is non-zero then it will
+          contain the size of this field, padded to a multiple of eight. This
+          field contains a null-terminated, ASCII character string to serve
+          as a comment/name for the filter.</p></td>
+	</tr>
+
+	<tr>
+	  <td><p>Client Data</p></td>
+	  <td><p>This is an array of four-byte integers which will be
+	      passed to the filter function.  The <em>Client Data Number</em> of
+	      Values determines the number of elements in the array.</p></td>
+	</tr>
+
+	<tr>
+	  <td><p>Padding</p></td>
+	  <td><p>Four bytes of zeroes are added to the message at this
+	      point if the Client Data Number of Values field contains
+	      an odd number.</p></td>
+	</tr>
+  </table>
+</div>
+
+<br />
+<br />
+<br />
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Filter Pipeline Message - Version 2
+    </caption>
+
+	<tr>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+	  <td>Version</td>
+	  <td>Number of Filters</td>
+      <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><br />Filter Description List <em>(variable size)</em><br /><br /></td>
+	</tr>
+  </table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Filter Pipeline Message - Version 2
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td><p>Version</p></td>
+	  <td><p>The version number for this message.  This table
+	      describes version 2.</p></td>
+	</tr>
+
+	<tr>
+	  <td><p>Number of Filters</p></td>
+	  <td><p>The total number of filters described in this
+	      message. The maximum possible number of filters in a
+	      message is 32.</p></td>
+	</tr>
+
+	<tr>
+	  <td><p>Filter Description List</p></td>
+	  <td><p>A description of each filter.  A filter description
+	      appears in the next table.</p></td>
+	</tr>
+  </table>
+</div>
+
+<br />
+<br />
+<br />
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Filter Description - Version 2
+    </caption>
+
+	<tr>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+	  <td colspan="2">Filter Identification Value</td>
+	  <td colspan="2">Name Length <em>(optional)</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan="2">Flags</td>
+	  <td colspan="2">Number Client Data Values</td>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><br />Name <em>(variable size, optional)</em><br /><br /></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><br />Client Data <em>(variable size, optional)</em><br /><br /></td>
+	</tr>
+  </table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Filter Description - Version 2
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td><p>Filter Identification Value</p></td>
+	  <td>
+        <p>
+          This value, often referred to as a filter identifier,
+          is designed to be a unique identifier for the filter.
+          Values from zero through 32,767 are reserved for filters
+          supported by The HDF Group in the HDF5 Library and for
+          filters requested and supported by third parties.
+          Filters supported by The HDF Group are documented immediately
+          below.  Information on 3rd-party filters can be found at
+          The HDF Group&rsquo;s
+          <a href="http://www.hdfgroup.org/services/contributions.html">
+            Contributions</a> page.</p>
+
+        <p>
+          To request a filter identifier, please contact
+          The HDF Group&rsquo;s Help Desk at
+          <img src="Graphics/help.png" valign="middle" height="14"
+               alt="The HDF Group Help Desk">.
+          You will be asked to provide the following information:</p>
+        <ol>
+          <li>Contact information for the developer requesting the
+            new identifier</li>
+          <li>A short description of the new filter</li>
+          <li>Links to any relevant information, including licensing
+            information</li>
+        </ol>
+        <p>
+          Values from 32768 to 65535 are reserved for non-distributed uses
+          (for example, internal company usage) or for application usage
+          when testing a feature. The HDF Group does not track or document
+          the use of the filters with identifiers from this range.</p>
+
+        <p>
+          The filters currently in library version 1.8.0 are
+	      listed below:
+
+	      <table class="list">
+	        <tr>
+		      <th width="20%" align="center">Identification</th>
+		      <th width="15%" align="left">Name</th>
+		      <th width="65%" align="left">Description</th>
+	        </tr>
+
+	        <tr>
+		      <td align="center"><code>0</code></td>
+		      <td>N/A</td>
+		      <td>Reserved</td>
+	        </tr>
+
+	        <tr>
+		      <td align="center"><code>1</code></td>
+		      <td>deflate</td>
+		      <td>GZIP deflate compression</td>
+	        </tr>
+
+	        <tr>
+		      <td align="center"><code>2</code></td>
+		      <td>shuffle</td>
+		      <td>Data element shuffling</td>
+	        </tr>
+
+	        <tr>
+		      <td align="center"><code>3</code></td>
+		      <td>fletcher32</td>
+		      <td>Fletcher32 checksum</td>
+	        </tr>
+
+	        <tr>
+		      <td align="center"><code>4</code></td>
+		      <td>szip</td>
+		      <td>SZIP compression</td>
+	        </tr>
+
+	        <tr>
+		      <td align="center"><code>5</code></td>
+		      <td>nbit</td>
+		      <td>N-bit packing</td>
+	        </tr>
+
+	        <tr>
+		      <td align="center"><code>6</code></td>
+		      <td>scaleoffset</td>
+		      <td>Scale and offset encoded values</td>
+	        </tr>
+	      </table>
+	  </p></td>
+	</tr>
+
+	<tr>
+	  <td><p>Name Length</p></td>
+	  <td><p>Each filter has an optional null-terminated ASCII name
+	      and this field holds the length of the name including the
+	      null termination padded with nulls to be a multiple of
+	      eight. If the filter has no name then a value of zero is
+	      stored in this field.</p>
+        <p>Filters with IDs less than 256 (in other words, filters
+          that are defined in this format documentation) do not store
+          the <em>Name Length</em> or <em>Name</em> fields.
+        </p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Flags</p></td>
+	  <td><p>The flags indicate certain properties for a filter.  The
+	      bit values defined so far are:
+	      <table class="list">
+	        <tr>
+		      <th width="20%" align="center">Bit</th>
+		      <th width="80%" align="left">Description</th>
+	        </tr>
+
+	        <tr>
+		      <td align="center"><code>0</code></td>
+	          <td>If set then the filter is an optional filter.
+		        During output, if an optional filter fails it will be
+		        silently skipped in the pipeline.</td>
+	        </tr>
+
+	        <tr>
+		      <td align="center"><code>1-15</code></td>
+	          <td>Reserved (zero)</td>
+	        </tr>
+	    </table></p>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td><p>Number of Client Data Values</p></td>
+	  <td><p>Each filter can store integer values to control
+	      how the filter operates.  The number of entries in the
+	      <em>Client Data</em> array is stored in this field.</p></td>
+	</tr>
+
+	<tr>
+	  <td><p>Name</p></td>
+	  <td><p>If the <em>Name Length</em> field is non-zero, then it will
+          contain the size of this field, <em>not</em> padded to a multiple
+          of eight. This field contains a <em>non-</em>null-terminated,
+          ASCII character string to serve as a comment/name for the filter.
+        </p>
+        <p>Filters that are defined in this format documentation
+          such as deflate and shuffle do not store the <em>Name
+            Length</em> or <em>Name</em> fields.
+        </p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Client Data</p></td>
+	  <td><p>This is an array of four-byte integers which will be
+	      passed to the filter function.  The Client Data Number of
+	      Values</em> determines the number of elements in the array.</p>
+</td>
+</tr>
+</table>
+</div>
+
+<h4><a name="AttributeMessage">IV.A.2.m. The Attribute Message</a></h4>
+
+<!-- start msgdesc table -->
+<center>
+  <table class="msgdesc">
+    <tr><td colspan="2"><b>Header Message Name:</b> Attribute</td></tr>
+    <tr><td colspan="2"><b>Header Message Type:</b> 0x000C</td></tr>
+    <tr><td colspan="2"><b>Length:</b> Varies</td></tr>
+    <tr><td colspan="2"><b>Status:</b> Optional; may be
+        repeated.</td></tr>
+    <tr><td><b>Description:</b></td>
+      <td><p>The <em>Attribute</em> message is used to store objects
+          in the HDF5 file which are used as attributes, or
+          &ldquo;metadata&rdquo; about the current object. An attribute
+          is a small dataset; it has a name, a datatype, a dataspace, and
+          raw data. Since attributes are stored in the object header, they
+          should be relatively small (in other words, less than 64KB).
+          They can be associated with any type of object which has an
+          object header (groups, datasets, or committed (named)
+          datatypes).</p>
+        <p>In 1.8.x versions of the library, attributes can be larger
+          than 64KB. See the
+          <a href="UG/HDF5_Users_Guide-Responsive%20HTML5/index.html#t=HDF5_Users_Guide%2FAttributes%2FHDF5_Attributes.htm%3Frhtocid%3Dtoc8.2_1%23TOC_8_5_Special_Issuesbc-13">
+            &ldquo;Special Issues&rdquo;</a> section of the Attributes chapter
+          in the <cite>HDF5 User&rsquo;s Guide</cite> for more information.</p>
+        <p>Note: Attributes on an object must have unique names:
+          the HDF5 Library currently enforces this by causing the
+          creation of an attribute with a duplicate name to fail.
+          Attributes on different objects may have the same name,
+          however.</p></td></tr>
+    <tr><td colspan="2"><b>Format of Data:</b> See the tables
+        below.</td></tr>
+</table></center>
+<!-- end msgdesc table -->
+
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Attribute Message (Version 1)
+    </caption>
+
+	<tr>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+	  <td>Version</td>
+	  <td>Reserved (zero)</td>
+	  <td colspan="2">Name Size</td>
+	</tr>
+
+	<tr>
+	  <td colspan="2">Datatype Size</td>
+	  <td colspan="2">Dataspace Size</td>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><br />Name <em>(variable size)</em><br /><br /></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><br />Datatype <em>(variable size)</em><br /><br /></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><br />Dataspace <em>(variable size)</em><br /><br /></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><br />Data <em>(variable size)</em><br /><br /></td>
+	</tr>
+  </table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Attribute Message (Version 1)
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td><p>Version</p></td>
+	  <td><p>The version number information is used for changes in the format of the
+	      attribute message and is described here:
+	      <table class="list">
+	        <tr>
+		      <th width="20%" align="center">Version</th>
+		      <th width="80%" align="left">Description</th>
+	        </tr>
+
+	        <tr>
+		      <td align="center"><code>0</code></td>
+		      <td>Never used.</td>
+	        </tr>
+
+	        <tr>
+		      <td align="center"><code>1</code></td>
+		      <td>Used by the library before version 1.6 to encode attribute message.
+		        This version does not support shared datatypes.</td>
+	        </tr>
+	    </table></p>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td><p>Name Size</p></td>
+	  <td><p>The length of the attribute name in bytes including the
+	      null terminator.  Note that the <em>Name</em> field below may
+	      contain additional padding not represented by this
+	      field.</p></td>
+	</tr>
+
+	<tr>
+	  <td><p>Datatype Size</p></td>
+	  <td><p>The length of the datatype description in the <em>Datatype</em>
+	      field below.  Note that the <em>Datatype</em> field may contain
+	      additional padding not represented by this field.</p></td>
+	</tr>
+
+	<tr>
+	  <td><p>Dataspace Size</p></td>
+	  <td><p>The length of the dataspace description in the <em>Dataspace</em>
+	      field below.  Note that the <em>Dataspace</em> field may contain
+	      additional padding not represented by this field.</p></td>
+	</tr>
+
+	<tr>
+	  <td><p>Name</p></td>
+	  <td><p>The null-terminated attribute name.  This field is
+	      padded with additional null characters to make it a
+	      multiple of eight bytes.</p></td>
+	</tr>
+
+	<tr>
+	  <td><p>Datatype</p></td>
+	  <td><p>The datatype description follows the same format as
+	      described for the datatype object header message.  This
+	      field is padded with additional zero bytes to make it a
+	      multiple of eight bytes.</p></td>
+	</tr>
+
+	<tr>
+	  <td><p>Dataspace</p></td>
+	  <td><p>The dataspace description follows the same format as
+	      described for the dataspace object header message.  This
+	      field is padded with additional zero bytes to make it a
+	      multiple of eight bytes.</p></td>
+	</tr>
+
+	<tr>
+	  <td><p>Data</p></td>
+	  <td><p>The raw data for the attribute.  The size is determined
+	      from the datatype and dataspace descriptions.  This
+	      field is <em>not</em> padded with additional bytes.</p></td>
+	</tr>
+  </table>
+</div>
+
+<br />
+<br />
+<br />
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Attribute Message (Version 2)
+    </caption>
+
+	<tr align="center">
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+	  <td>Version</td>
+	  <td>Flags</td>
+	  <td colspan="2">Name Size</td>
+	</tr>
+
+	<tr>
+	  <td colspan="2">Datatype Size</td>
+	  <td colspan="2">Dataspace Size</td>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><br />Name <em>(variable size)</em><br /><br /></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><br />Datatype <em>(variable size)</em><br /><br /></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><br />Dataspace <em>(variable size)</em><br /><br /></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><br />Data <em>(variable size)</em><br /><br /></td>
+	</tr>
+  </table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Attribute Message (Version 2)
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td><p>Version</p></td>
+	  <td><p>The version number information is used for changes in the
+          format of the attribute message and is described here:
+          <table class="list">
+            <tr>
+              <th width="20%" align="center">Version</th>
+              <th width="80%" align="left">Description</th>
+            </tr>
+
+            <tr>
+              <td align="center"><code>2</code></td>
+              <td>Used by the library of version 1.6.x and after to encode
+                attribute messages.
+                This version supports shared datatypes.  The fields of
+                name, datatype, and dataspace are not padded with
+                additional bytes of zero.
+              </td>
+            </tr>
+        </table></p>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td><p>Flags</p></td>
+	  <td><p>This bit field contains extra information about
+          interpreting the attribute message:
+
+	      <table class="list">
+	        <tr>
+		      <th width="20%" align="center">Bit</th>
+		      <th width="80%" align="left">Description</th>
+	        </tr>
+
+	        <tr>
+		      <td align="center"><code>0</code></td>
+		      <td>If set, datatype is shared.</td>
+	        </tr>
+
+	        <tr>
+		      <td align="center"><code>1</code></td>
+		      <td>If set, dataspace is shared.</td>
+	        </tr>
+	    </table></p>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td><p>Name Size</p></td>
+	  <td><p>The length of the attribute name in bytes including the
+	      null terminator.</p></td>
+	</tr>
+
+	<tr>
+	  <td><p>Datatype Size</p></td>
+	  <td><p>The length of the datatype description in the <em>Datatype</em>
+	      field below.</p></td>
+	</tr>
+
+	<tr>
+	  <td><p>Dataspace Size</p></td>
+	  <td><p>The length of the dataspace description in the <em>Dataspace</em>
+	      field below.</p></td>
+	</tr>
+
+	<tr>
+	  <td><p>Name</p></td>
+	  <td><p>The null-terminated attribute name.  This field is <em>not</em>
+	      padded with additional bytes.</p></td>
+	</tr>
+
+	<tr>
+	  <td><p>Datatype</p></td>
+	  <td><p>The datatype description follows the same format as
+          described for the datatype object header message.
+        </p>
+        <p>If the
+          <em>Flag</em> field indicates this attribute&rsquo;s datatype is
+          shared, this field will contain a &ldquo;shared message&rdquo; encoding
+          instead of the datatype encoding.
+        </p>
+        <p>This field is <em>not</em> padded with additional bytes.
+        </p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Dataspace</p></td>
+	  <td><p>The dataspace description follows the same format as
+          described for the dataspace object header message.
+        </p>
+        <p>If the
+          <em>Flag</em> field indicates this attribute&rsquo;s dataspace is
+          shared, this field will contain a &ldquo;shared message&rdquo; encoding
+          instead of the dataspace encoding.
+        </p>
+        <p>This field is <em>not</em> padded with additional bytes.</p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Data</p></td>
+	  <td><p>The raw data for the attribute.  The size is determined
+          from the datatype and dataspace descriptions.
+        </p>
+        <p>This field is <em>not</em> padded with additional zero bytes.
+        </p>
+      </td>
+	</tr>
+  </table>
+</div>
+
+<br />
+<br />
+<br />
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Attribute Message (Version 3)
+    </caption>
+
+	<tr align="center">
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+	  <td>Version</td>
+	  <td>Flags</td>
+	  <td colspan="2">Name Size</td>
+	</tr>
+
+	<tr>
+	  <td colspan="2">Datatype Size</td>
+	  <td colspan="2">Dataspace Size</td>
+	</tr>
+
+	<tr>
+	  <td>Name Character Set Encoding</td>
+      <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><br />Name <em>(variable size)</em><br /><br /></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><br />Datatype <em>(variable size)</em><br /><br /></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><br />Dataspace <em>(variable size)</em><br /><br /></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><br />Data <em>(variable size)</em><br /><br /></td>
+	</tr>
+  </table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Attribute Message (Version 3)
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td><p>Version</p></td>
+	  <td><p>The version number information is used for changes in the
+          format of the attribute message and is described here:
+          <table class="list">
+            <tr>
+              <th width="20%" align="center">Version</th>
+              <th width="80%" align="left">Description</th>
+            </tr>
+
+            <tr>
+              <td align="center"><code>3</code></td>
+              <td>Used by the library of version 1.8.x and after to
+                encode attribute messages.
+                This version supports attributes with non-ASCII names.
+              </td>
+            </tr>
+        </table></p>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td><p>Flags</p></td>
+	  <td><p>This bit field contains extra information about
+          interpreting the attribute message:
+
+	      <table class="list">
+	        <tr>
+		      <th width="20%" align="center">Bit</th>
+		      <th width="80%" align="left">Description</th>
+	        </tr>
+
+	        <tr>
+		      <td align="center"><code>0</code></td>
+		      <td>If set, datatype is shared.</td>
+	        </tr>
+
+	        <tr>
+		      <td align="center"><code>1</code></td>
+		      <td>If set, dataspace is shared.</td>
+	        </tr>
+	    </table></p>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td><p>Name Size</p></td>
+	  <td><p>The length of the attribute name in bytes including the
+	      null terminator.</p></td>
+	</tr>
+
+	<tr>
+	  <td><p>Datatype Size</p></td>
+	  <td><p>The length of the datatype description in the <em>Datatype</em>
+	      field below.</p></td>
+	</tr>
+
+	<tr>
+	  <td><p>Dataspace Size</p></td>
+	  <td><p>The length of the dataspace description in the <em>Dataspace</em>
+	      field below.</p></td>
+	</tr>
+
+	<tr>
+	  <td><p>Name Character Set Encoding</p></td>
+	  <td><p>The character set encoding for the attribute&rsquo;s name:
+          <table class="list">
+            <tr>
+              <th width="20%" align="center">Value</th>
+              <th width="80%" align="left">Description</th>
+            </tr>
+
+            <tr>
+              <td align="center"><code>0</code></td>
+              <td>ASCII character set encoding
+              </td>
+            </tr>
+
+            <tr>
+              <td align="center"><code>1</code></td>
+              <td>UTF-8 character set encoding
+              </td>
+            </tr>
+          </table>
+        </p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Name</p></td>
+	  <td><p>The null-terminated attribute name.  This field is <em>not</em>
+	      padded with additional bytes.</p></td>
+	</tr>
+
+	<tr>
+	  <td><p>Datatype</p></td>
+	  <td><p>The datatype description follows the same format as
+          described for the datatype object header message.
+        </p>
+        <p>If the
+          <em>Flag</em> field indicates this attribute&rsquo;s datatype is
+          shared, this field will contain a &ldquo;shared message&rdquo; encoding
+          instead of the datatype encoding.
+        </p>
+        <p>This field is <em>not</em> padded with additional bytes.
+        </p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Dataspace</p></td>
+	  <td><p>The dataspace description follows the same format as
+          described for the dataspace object header message.
+        </p>
+        <p>If the
+          <em>Flag</em> field indicates this attribute&rsquo;s dataspace is
+          shared, this field will contain a &ldquo;shared message&rdquo; encoding
+          instead of the dataspace encoding.
+        </p>
+        <p>This field is <em>not</em> padded with additional bytes.</p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Data</p></td>
+	  <td><p>The raw data for the attribute.  The size is determined
+          from the datatype and dataspace descriptions.
+        </p>
+        <p>This field is <em>not</em> padded with additional zero bytes.
+        </p>
+      </td>
+	</tr>
+  </table>
+</div>
+
+<h4><a name="CommentMessage">IV.A.2.n. The Object Comment
+    Message</a></h4>
+
+<!-- start msgdesc table -->
+<center>
+  <table class="msgdesc">
+    <tr><td colspan="2"><b>Header Message Name:</b> Object
+        Comment</td></tr>
+    <tr><td colspan="2"><b>Header Message Type:</b> 0x000D</td></tr>
+    <tr><td colspan="2"><b>Length:</b> Varies</td></tr>
+    <tr><td colspan="2"><b>Status:</b> Optional; may not be
+        repeated.</td></tr>
+    <tr><td><b>Description:</b></td>
+      <td>The object comment is designed to be a short description of
+        an object. An object comment is a sequence of non-zero
+        (<code>\0</code>) ASCII characters with no other formatting
+        included by the library.</td></tr>
+    <tr><td colspan="2"><b>Format of Data:</b> See the tables
+        below.</td></tr>
+</table></center>
+<!-- end msgdesc table -->
+
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Object Comment Message
+    </caption>
+
+	<tr>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><br />Comment <em>(variable size)</em><br /><br /></td>
+	</tr>
+  </table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Object Comment Message
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td><p>Name</p></td>
+	  <td><p>A null terminated ASCII character string.</p></td>
+	</tr>
+  </table>
+</div>
+
+<h4><a name="OldModificationTimeMessage">IV.A.2.o. The Object
+    Modification Time (Old) Message</a></h4>
+
+<!-- start msgdesc table -->
+<center>
+  <table class="msgdesc">
+    <tr><td colspan="2"><b>Header Message Name:</b> Object
+        Modification Time (Old)</td></tr>
+    <tr><td colspan="2"><b>Header Message Type:</b> 0x000E</td></tr>
+    <tr><td colspan="2"><b>Length:</b> Fixed</td></tr>
+    <tr><td colspan="2"><b>Status:</b> Optional; may not be
+        repeated.</td></tr>
+    <tr><td><b>Description:</b></td>
+      <td><p>The object modification date and time is a timestamp
+          which indicates (using ISO-8601 date and time format) the last
+          modification of an object. The time is updated when any object
+          header message changes according to the system clock where the
+          change was posted. All fields of this message should be
+          interpreted as coordinated universal time (UTC).</p>
+        <p>This modification time message is deprecated in favor of
+          the &ldquo;new&rdquo; <a href="#ModificationTimeMessage">Object
+            Modification Time</a> message and is no longer written to the
+          file in versions of the HDF5 Library after the 1.6.0
+          version.</p></td></tr>
+    <tr><td colspan="2"><b>Format of Data:</b> See the tables
+        below.</td></tr>
+</table></center>
+<!-- end msgdesc table -->
+
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Modification Time Message (Old)
+    </caption>
+
+	<tr>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+	  <td colspan="4">Year</td>
+	</tr>
+
+	<tr>
+	  <td colspan="2">Month</td>
+	  <td colspan="2">Day of Month</td>
+	</tr>
+
+	<tr>
+	  <td colspan="2">Hour</td>
+	  <td colspan="2">Minute</td>
+	</tr>
+
+	<tr>
+	  <td colspan="2">Second</td>
+	  <td colspan="2">Reserved</td>
+	</tr>
+  </table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Modification Time Message (Old)
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td><p>Year</p></td>
+	  <td><p>The four-digit year as an ASCII string. For example,
+	      <code>1998</code>.
+      </p></td>
+	</tr>
+
+	<tr>
+	  <td><p>Month</p></td>
+	  <td><p>The month number as a two digit ASCII string where
+	      January is <code>01</code> and December is <code>12</code>.</p></td>
+	</tr>
+
+	<tr>
+	  <td><p>Day of Month</p></td>
+	  <td><p>The day number within the month as a two digit ASCII
+	      string. The first day of the month is <code>01</code>.</p></td>
+	</tr>
+
+	<tr>
+	  <td><p>Hour</p></td>
+	  <td><p>The hour of the day as a two digit ASCII string where
+	      midnight is <code>00</code> and 11:00pm is <code>23</code>.</p></td>
+	</tr>
+
+	<tr>
+	  <td><p>Minute</p></td>
+	  <td><p>The minute of the hour as a two digit ASCII string where
+	      the first minute of the hour is <code>00</code> and
+	      the last is <code>59</code>.</p></td>
+	</tr>
+
+	<tr>
+	  <td><p>Second</p></td>
+	  <td><p>The second of the minute as a two digit ASCII string
+	      where the first second of the minute is <code>00</code>
+	      and the last is <code>59</code>.</p></td>
+	</tr>
+
+	<tr>
+	  <td><p>Reserved</p></td>
+	  <td><p>This field is reserved and should always be zero.</p></td>
+	</tr>
+  </table>
+</div>
+
+<h4><a name="SOHMTableMessage">IV.A.2.p. The Shared Message Table
+    Message</a></h4>
+
+<!-- start msgdesc table -->
+<center>
+  <table class="msgdesc">
+    <tr><td colspan="2"><b>Header Message Name:</b> Shared Message
+        Table</td></tr>
+    <tr><td colspan="2"><b>Header Message Type:</b> 0x000F</td></tr>
+    <tr><td colspan="2"><b>Length:</b> Fixed</td></tr>
+    <tr><td colspan="2"><b>Status:</b> Optional; may not be
+        repeated.</td></tr>
+    <tr><td><b>Description:</b></td>
+      <td>This message is used to locate the table of shared object
+        header message (SOHM) indexes. Each index consists of information
+        to find the shared messages from either the heap or object header.
+        This message is <em>only</em> found in the superblock
+        extension.</td></tr>
+    <tr><td colspan="2"><b>Format of Data:</b> See the tables
+        below.</td></tr>
+</table></center>
+<!-- end msgdesc table -->
+
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Shared Message Table Message
+    </caption>
+
+	<tr>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+	  <td>Version</td>
+      <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><br />Shared Object Header Message Table Address<sup>O</sup><br /><br /></td>
+	</tr>
+
+	<tr>
+	  <td>Number of Indices</td>
+      <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+	</tr>
+
+  </table>
+
+  <table class="note">
+    <tr>
+    <tr>
+      <td width="60%">&nbsp;</td>
+      <td width="40%">
+        (Items marked with an &lsquo;O&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfOffsetsV0">Size
+          of Offsets</a> field in the superblock.)
+    </td></tr>
+  </table>
+
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Shared Message Table Message
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td><p>Version</p></td>
+	  <td><p>The version number for this message.  This document describes version 0.</p></td>
+	</tr>
+
+	<tr>
+	  <td><p>Shared Object Header Message Table Address</p></td>
+	  <td><p>This field is the address of the master table for shared
+          object header message indexes.</p>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td><p>Number of Indices</p></td>
+	  <td><p>This field is the number of indices in the master table.
+      </p></td>
+	</tr>
+
+  </table>
+</div>
+
+<h4><a name="ContinuationMessage">IV.A.2.q. The Object Header
+    Continuation Message</a></h4>
+
+<!-- start msgdesc table -->
+<center>
+  <table class="msgdesc">
+    <tr><td colspan="2"><b>Header Message Name:</b> Object Header
+        Continuation</td></tr>
+    <tr><td colspan="2"><b>Header Message Type:</b> 0x0010</td></tr>
+    <tr><td colspan="2"><b>Length:</b> Fixed</td></tr>
+    <tr><td colspan="2"><b>Status:</b> Optional; may be
+        repeated.</td></tr>
+    <tr><td><b>Description:</b></td>
+      <td>The object header continuation is the location in the file
+        of a block containing more header messages for the current data
+        object. This can be used when header blocks become too large or
+        are likely to change over time.</td></tr>
+    <tr><td colspan="2"><b>Format of Data:</b> See the tables
+        below.</td></tr>
+</table></center>
+<!-- end msgdesc table -->
+
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Object Header Continuation Message
+    </caption>
+
+    <tr>
+      <th width="25%">byte</th>
+      <th width="25%">byte</th>
+      <th width="25%">byte</th>
+      <th width="25%">byte</th>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Offset<sup>O</sup><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Length<sup>L</sup><br /><br /></td>
+    </tr>
+  </table>
+
+  <table class="note">
+    <tr>
+      <td width="60%">&nbsp;</td>
+      <td width="40%">
+        (Items marked with an &lsquo;O&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfOffsetsV0">Size
+          of Offsets</a> field in the superblock.)
+    </td></tr>
+    <tr>
+      <td>&nbsp;</td>
+      <td>
+        (Items marked with an &lsquo;L&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfLengthsV0">Size
+          of Lengths</a> field in the superblock.)
+    </td></tr>
+  </table>
+
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Object Header Continuation Message
+    </caption>
+    <tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+    </tr>
+
+    <tr>
+      <td><p>Offset</p></td>
+      <td><p>This value is the address in the file where the
+          header continuation block is located.</p></td>
+    </tr>
+
+    <tr>
+      <td><p>Length</p></td>
+      <td><p>This value is the length in bytes of the header continuation
+          block in the file.</p></td>
+    </tr>
+  </table>
+</div>
+<br />
+
+<p>The format of the header continuation block that this message points
+  to depends on the version of the object header that the message is
+  contained within.
+</p>
+
+<p>
+  Continuation blocks for version 1 object headers have no special
+  formatting information; they are merely a list of object header
+  message info sequences (type, size, flags, reserved bytes and data
+  for each message sequence).  See the description
+  of <a href="#V1ObjectHeaderPrefix">Version 1 Data Object Header Prefix.</a>
+</p>
+
+<p>Continuation blocks for version 2 object headers <em>do</em> have
+  special formatting information as described here
+  (see also the description of
+  <a href="#V2ObjectHeaderPrefix">Version 2 Data Object Header Prefix.</a>):
+</p>
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Version 2 Object Header Continuation Block
+    </caption>
+
+	<tr>
+	  <th>byte</th>
+	  <th>byte</th>
+	  <th>byte</th>
+	  <th>byte</th>
+	</tr>
+
+	<tr>
+	  <td colspan="4">Signature</td>
+	</tr>
+	<tr>
+	  <td>Header Message Type #1</td>
+	  <td colspan="2">Size of Header Message Data #1</td>
+	  <td>Header Message #1 Flags</td>
+	</tr>
+
+	<tr>
+	  <td colspan="2">Header Message #1 Creation Order <em>(optional)</em></td>
+      <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><br />Header Message Data #1<br /><br /></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">.<br />.<br />.<br /></td>
+	</tr>
+
+	<tr>
+	  <td>Header Message Type #n</td>
+	  <td colspan="2">Size of Header Message Data #n</td>
+	  <td>Header Message #n Flags</td>
+	</tr>
+
+	<tr>
+	  <td colspan="2">Header Message #n Creation Order <em>(optional)</em></td>
+      <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><br />Header Message Data #n<br /><br /></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">Gap <em>(optional, variable size)</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">Checksum</td>
+	</tr>
+  </table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Version 2 Object Header Continuation Block
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td><p>Signature</p></td>
+	  <td>
+        <p>The ASCII character string &ldquo;<code>OCHK</code>&rdquo;
+          is used to indicate the beginning of an object header
+          continuation block. This gives file consistency checking
+          utilities a better chance of reconstructing a damaged file.
+        </p>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td><p>Header Message #n Type</p></td>
+	  <td>
+        <p>Same format as version 1 of the object header, described above.
+      </p></td>
+	</tr>
+
+	<tr>
+	  <td><p>Size of Header Message #n Data</p></td>
+	  <td>
+        <p>Same format as version 1 of the object header, described above.
+      </p></td>
+	</tr>
+
+	<tr>
+	  <td><p>Header Message #n Flags</p></td>
+	  <td>
+        <p>Same format as version 1 of the object header, described above.
+      </p></td>
+    </tr>
+
+	<tr>
+	  <td><p>Header Message #n Creation Order</p></td>
+	  <td>
+        <p>This field stores the order that a message of a given type
+          was created in.</p>
+	    <p>This field is present if bit 2 of <em>flags</em> is set.</p>
+      </td>
+    </tr>
+
+	<tr>
+	  <td><p>Header Message #n Data</p></td>
+	  <td>
+        <p>Same format as version 1 of the object header, described above.
+      </p></td>
+	</tr>
+
+	<tr>
+	  <td><p>Gap</p></td>
+	  <td>
+        <p>A gap in an object header chunk is inferred by the end of the
+          messages for the chunk before the beginning of the chunk&rsquo;s
+          checksum.  Gaps are always smaller than the size of an
+          object header message prefix (message type + message size +
+          message flags).</p>
+        <p>Gaps are formed when a message (typically an attribute message)
+          in an earlier chunk is deleted and a message from a later
+          chunk that does not quite fit into the free space is moved
+          into the earlier chunk.</p>
+      </td>
+	</tr>
+
+    <tr>
+      <td><p>Checksum</p></td>
+      <td>
+        <p>This is the checksum for the object header chunk.
+        </p>
+      </td>
+    </tr>
+  </table>
+</div>
+
+<h4><a name="SymbolTableMessage">IV.A.2.r. The Symbol Table
+    Message</a></h4>
+
+<!-- start msgdesc table -->
+<center>
+  <table class="msgdesc">
+    <tr><td colspan="2"><b>Header Message Name:</b> Symbol Table
+        Message</td></tr>
+    <tr><td colspan="2"><b>Header Message Type:</b> 0x0011</td></tr>
+    <tr><td colspan="2"><b>Length:</b> Fixed</td></tr>
+    <tr><td colspan="2"><b>Status:</b> Required for
+        &ldquo;old style&rdquo; groups; may not be repeated.</td></tr>
+    <tr><td><b>Description:</b></td>
+      <td>Each &ldquo;old style&rdquo; group has a v1 B-tree and a
+        local heap for storing symbol table entries, which are located
+        with this message.</td></tr>
+    <tr><td colspan="2"><b>Format of data:</b> See the tables
+        below.</td></tr>
+</table></center>
+<!-- end msgdesc table -->
+
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Symbol Table Message
+    </caption>
+
+    <tr>
+      <th width="25%">byte</th>
+      <th width="25%">byte</th>
+      <th width="25%">byte</th>
+      <th width="25%">byte</th>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />v1 B-tree Address<sup>O</sup><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Local Heap Address<sup>O</sup><br /><br /></td>
+    </tr>
+  </table>
+
+  <table class="note">
+    <tr>
+    <tr>
+      <td width="60%">&nbsp;</td>
+      <td width="40%">
+        (Items marked with an &lsquo;O&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfOffsetsV0">Size
+          of Offsets</a> field in the superblock.)
+    </td></tr>
+  </table>
+
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Symbol Table Message
+    </caption>
+    <tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+    </tr>
+
+    <tr>
+      <td><p>v1 B-tree Address</p></td>
+      <td><p>This value is the address of the v1 B-tree containing the
+          symbol table entries for the group.</p></td>
+    </tr>
+
+    <tr>
+      <td><p>Local Heap Address</p></td>
+      <td><p>This value is the address of the local heap containing
+          the link names for the symbol table entries for the group.</p></td>
+    </tr>
+  </table>
+</div>
+
+<h4><a name="ModificationTimeMessage">IV.A.2.s. The Object
+    Modification Time Message</a></h4>
+
+<!-- start msgdesc table -->
+<center>
+  <table class="msgdesc">
+    <tr><td colspan="2"><b>Header Message Name:</b> Object
+        Modification Time</td></tr>
+    <tr><td colspan="2"><b>Header Message Type:</b> 0x0012</td></tr>
+    <tr><td colspan="2"><b>Length:</b> Fixed</td></tr>
+    <tr><td colspan="2"><b>Status:</b> Optional; may not be
+        repeated.</td></tr>
+    <tr><td><b>Description:</b></td>
+      <td>The object modification time is a timestamp which indicates
+        the time of the last modification of an object. The time is
+        updated when any object header message changes according to
+        the system clock where the change was posted.</td></tr>
+    <tr><td colspan="2"><b>Format of Data:</b> See the tables
+        below.</td></tr>
+</table></center>
+<!-- end msgdesc table -->
+
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Modification Time Message
+    </caption>
+
+	<tr>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+	  <td>Version</td>
+	  <td colspan="3">Reserved <em>(zero)</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">Seconds After UNIX Epoch</td>
+	</tr>
+  </table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Modification Time Message
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td><p>Version</p></td>
+	  <td><p>The version number is used for changes in the format of Object Modification Time
+	      and is described here:
+	      <table class="list">
+		    <tr>
+		      <th width="20%" align="center">Version</th>
+		      <th width="80%" align="left">Description</th>
+		    </tr>
+
+		    <tr>
+		      <td align="center"><code>0</code></td>
+		      <td>Never used.</td>
+		    </tr>
+
+		    <tr>
+		      <td align="center"><code>1</code></td>
+		      <td>Used by Version 1.6.1 and after of the library to encode time.  In
+		        this version, the time is the seconds after Epoch.</td>
+		    </tr>
+	    </table></p>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td><p>Seconds After UNIX Epoch</p></td>
+	  <td><p>A 32-bit unsigned integer value that stores the number of
+          seconds since 0 hours, 0 minutes, 0 seconds, January 1, 1970,
+          Coordinated Universal Time.</p></td>
+	</tr>
+  </table>
+</div>
+
+<h4><a name="BtreeKValuesMessage">IV.A.2.t. The B-tree
+    &lsquo;K&rsquo; Values Message</a></h4>
+
+<!-- start msgdesc table -->
+<center>
+  <table class="msgdesc">
+    <tr><td colspan="2"><b>Header Message Name:</b> B-tree
+        &lsquo;K&rsquo; Values</td></tr>
+    <tr><td colspan="2"><b>Header Message Type:</b> 0x0013</td></tr>
+    <tr><td colspan="2"><b>Length:</b> Fixed</td></tr>
+    <tr><td colspan="2"><b>Status:</b> Optional; may not be
+        repeated.</td></tr>
+    <tr><td><b>Description:</b></td>
+      <td>This message retrieves non-default &lsquo;K&rsquo; values
+        for internal and leaf nodes of a group or indexed storage v1
+        B-trees. This message is <em>only</em> found in the superblock
+        extension.</td></tr>
+    <tr><td colspan="2"><b>Format of Data:</b> See the tables
+        below.</td></tr>
+</table></center>
+<!-- end msgdesc table -->
+
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: B-tree &lsquo;K&rsquo; Values Message
+    </caption>
+
+	<tr>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+	  <td>Version</td>
+	  <td colspan="2">Indexed Storage Internal Node K</td>
+      <td bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan="2">Group Internal Node K</td>
+	  <td colspan="2">Group Leaf Node K</td>
+	</tr>
+  </table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: B-tree &lsquo;K&rsquo; Values Message
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td><p>Version</p></td>
+	  <td><p>The version number for this message. This document describes
+          version 0.</p>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td><p>Indexed Storage Internal Node K</p></td>
+	  <td><p>This is the node &lsquo;K&rsquo; value for each internal node of an
+          indexed storage v1 B-tree.  See the description of this field
+          in version 0 and 1 of the superblock as well the section on
+          v1 B-trees.
+	    </p>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td><p>Group Internal Node K</p></td>
+	  <td><p>This is the node &lsquo;K&rsquo; value for each internal node of a group
+          v1 B-tree.  See the description of this field in version 0 and
+          1 of the superblock as well as the section on v1 B-trees.
+	    </p>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td><p>Group Leaf Node K</p></td>
+	  <td><p>This is the node &lsquo;K&rsquo; value for each leaf node of a group v1
+          B-tree.  See the description of this field in version 0 and 1
+          of the superblock as well as the section on v1 B-trees.
+	    </p>
+	  </td>
+	</tr>
+
+  </table>
+</div>
+
+<h4><a name="DrvInfoMessage">IV.A.2.u. The Driver Info
+    Message</a></h4>
+
+<!-- start msgdesc table -->
+<center>
+  <table class="msgdesc">
+    <tr><td colspan="2"><b>Header Message Name:</b> Driver
+        Info</td></tr>
+    <tr><td colspan="2"><b>Header Message Type:</b> 0x0014</td></tr>
+    <tr><td colspan="2"><b>Length:</b> Varies</td></tr>
+    <tr><td colspan="2"><b>Status:</b> Optional; may not be
+        repeated.</td></tr>
+
+    <tr><td>
+        <b>Description:</b></td>
+      <td>This message contains information needed by the file driver
+        to reopen a file. This message is <em>only</em> found in the
+        superblock extension: see the <a href="#SuperblockExt">
+          &ldquo;Disk Format: Level 0C - Superblock Extension&rdquo;</a>
+        section for more information. For more information on the fields
+        in the driver info message, see the <a href="#DriverInfo">
+          &ldquo;Disk Format: Level 0B - File Driver Info&rdquo;</a>
+        section; those who use the multi and family file drivers will
+        find this section particularly helpful.</td></tr>
+    <tr><td colspan="2"><b>Format of Data:</b> See the tables
+        below.</td></tr>
+</table></center>
+<!-- end msgdesc table -->
+
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Driver Info Message
+    </caption>
+
+	<tr>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+	  <td>Version</td>
+      <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+	</tr>
+	<tr>
+	  <td colspan="4"><br />Driver Identification</td>
+	</tr>
+
+	<tr>
+	  <td colspan="2">Driver Information Size</td>
+      <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><br /><br />Driver Information <em>(variable size)</em><br /><br /><br /></td>
+	</tr>
+
+  </table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Driver Info Message
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td><p>Version</p></td>
+	  <td><p>The version number for this message. This document describes
+          version 0.</p>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td><p>Driver Identification</p></td>
+	  <td><p>This is an eight-byte ASCII string without null termination which
+          identifies the driver.
+	    </p>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td><p>Driver Information Size</p></td>
+	  <td><p>The size in bytes of the <em>Driver Information</em> field of this
+          message.</p>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td><p>Driver Information</p></td>
+	  <td><p>Driver information is stored in a format defined by the file driver.</p>
+	  </td>
+	</tr>
+  </table>
+</div>
+
+<h4><a name="AinfoMessage">IV.A.2.v. The Attribute Info
+    Message</a></h4>
+
+<!-- start msgdesc table -->
+<center>
+  <table class="msgdesc">
+    <tr><td colspan="2"><b>Header Message Name:</b> Attribute
+        Info</td></tr>
+    <tr><td colspan="2"><b>Header Message Type:</b> 0x0015</td></tr>
+    <tr><td colspan="2"><b>Length:</b> Varies</td></tr>
+    <tr><td colspan="2"><b>Status:</b> Optional; may not be
+        repeated.</td></tr>
+    <tr><td><b>Description:</b></td>
+      <td>This message stores information about the attributes on an
+        object, such as the maximum creation index for the attributes
+        created and the location of the attribute storage when the
+        attributes are stored &ldquo;densely&rdquo;.</td></tr>
+    <tr><td colspan="2"><b>Format of Data:</b> See the tables
+        below.</td></tr>
+</table></center>
+<!-- end msgdesc table -->
+
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Attribute Info Message
+    </caption>
+
+	<tr>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+	  <td>Version</td>
+	  <td>Flags</td>
+	  <td colspan="2">Maximum Creation Index <em>(optional)</em></td>
+	</tr>
+	<tr>
+	  <td colspan="4"><br />Fractal Heap Address<sup>O</sup><br /><br /></td>
+	</tr>
+	<tr>
+	  <td colspan="4"><br />Attribute Name v2 B-tree Address<sup>O</sup><br /><br /></td>
+	</tr>
+	<tr>
+	  <td colspan="4"><br />Attribute Creation Order v2 B-tree Address<sup>O</sup> <em>(optional)</em><br /><br /></td>
+	</tr>
+
+  </table>
+
+  <table class="note">
+    <tr>
+      <td width="60%">&nbsp;</td>
+      <td width="40%">
+        (Items marked with an &lsquo;O&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfOffsetsV0">Size
+          of Offsets</a> field in the superblock.)
+    </td></tr>
+  </table>
+
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Attribute Info Message
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td><p>Version</p></td>
+	  <td><p>The version number for this message. This document describes
+          version 0.</p>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td><p>Flags</p></td>
+	  <td><p>This is the attribute index information flag with the
+          following definition:
+
+          <table class="list">
+            <tr>
+              <th width="20%" align="center">Bit</th>
+              <th width="80%" align="left">Description</th>
+            </tr>
+
+            <tr>
+              <td align="center"><code>0</code></td>
+              <td>If set, creation order for attributes is tracked.
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>1</code></td>
+              <td>If set, creation order for attributes is indexed.
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>2-7</code></td>
+              <td>Reserved</td>
+            </tr>
+	    </table></p>
+
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Maximum Creation Index</p></td>
+	  <td><p>The is the maximum creation order index value for the
+          attributes on the object.</p>
+	    <p>This field is present if bit 0 of <em>Flags</em> is set.</p>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td><p>Fractal Heap Address</p></td>
+	  <td><p>This is the address of the fractal heap to store dense
+          attributes.
+          Each attribute stored in the fractal heap is described by
+          the <a href="#AttributeMessage">Attribute Message.</a>
+        </p>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td><p>Attribute Name v2 B-tree Address</p></td>
+	  <td><p>This is the address of the version 2 B-tree to index the
+          names of densely stored attributes.</p>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td><p>Attribute Creation Order v2 B-tree Address</p></td>
+	  <td><p>This is the address of the version 2 B-tree to index the
+          creation order of densely stored attributes.</p>
+	    <p>This field is present if bit 1 of <em>Flags</em> is set.</p>
+	  </td>
+	</tr>
+
+  </table>
+</div>
+
+<h4><a name="RefCountMessage">IV.A.2.w. The Object Reference
+    Count Message</a></h4>
+
+<!-- start msgdesc table -->
+<center>
+  <table class="msgdesc">
+    <tr><td colspan="2"><b>Header Message Name:</b> Object Reference
+        Count</td></tr>
+    <tr><td colspan="2"><b>Header Message Type:</b> 0x0016</td></tr>
+    <tr><td colspan="2"><b>Length:</b> Fixed</td></tr>
+    <tr><td colspan="2"><b>Status:</b> Optional; may not be
+        repeated.</td></tr>
+    <tr><td><b>Description:</b></td>
+      <td>This message stores the number of hard links (in groups or
+        objects) pointing to an object: in other words, its
+        <em>reference count</em>.</td></tr>
+    <tr><td colspan="2"><b>Format of Data:</b> See the tables
+        below.</td></tr>
+</table></center>
+<!-- end msgdesc table -->
+
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Object Reference Count
+    </caption>
+
+	<tr>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+	  <td>Version</td>
+      <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">Reference count</td>
+	</tr>
+  </table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Object Reference Count
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td><p>Version</p></td>
+	  <td><p>The version number for this message. This document describes
+          version 0.</p>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td><p>Reference Count</p></td>
+	  <td><p>The unsigned 32-bit integer is the reference count for the
+          object. This message is only present in &ldquo;version 2&rdquo;
+          (or later) object headers, and if not present those object
+          header versions, the reference count for the object is assumed
+          to be 1.</p>
+	  </td>
+	</tr>
+
+  </table>
+</div>
+
+<br />
+
+<h4><a name="FsinfoMessage">IV.A.2.x. The File Space Info
+    Message</a></h4>
+
+<center>
+  <table class="msgdesc">
+    <tr><td colspan="2"><b>Header Message Name:</b> File Space
+        Info</td></tr>
+    <tr><td colspan="2"><b>Header Message Type:</b> 0x0017</td></tr>
+    <tr><td colspan="2"><b>Length:</b> Fixed</td></tr>
+    <tr><td colspan="2"><b>Status:</b> Optional; may not be
+        repeated.</td></tr>
+    <tr><td>
+        <b>Description:</b></td>
+      <td>This message stores the file space management information
+        that the library uses in handling file space
+        requests for the file. Version 0 of the message is used for release 1.10.0 only.
+        Version 1 of the message is used for release 1.10.1+.
+        There is no File Space Info message before release 1.10 as the library does
+        not track file space across multiple file opens.
+        <p>
+          Note that version 0 is deprecated starting release 1.10.1.
+          That means when the 1.10.1+ library opens an HDF5 file with a version 0 message,
+          the library will decode and map the message to version 1.
+          On file close, it will encode the message as a version 1 message.
+        <p>
+          The library uses the following three mechanisms to manage file space in an HDF5 file:
+          <ul>
+            <li> Free-space managers
+              <br> They track free-space sections of various sizes in the file that are not currently
+              allocated.  Each free-space manager corresponds to a file space type.
+              There are two main groups of file space types: metadata and raw data.
+              Metadata is further divided into five types: superblock, B-tree, global heap,
+              local heap, and object header.
+              See the description of <a href="#FreeSpaceManager">Free-space
+                Manager</a> as well the description of file space allocation types in
+              <a href="#AppendixB">Appendix B</a>
+            </li>
+            <li> Aggregators
+              <br> The library manages two aggregators, one for metadata and one for raw data.
+              Aggregator is a contiguous block of free-space in the file.
+              The size of each aggregator is tunable via public routines
+              <code>H5Pset_meta_block_size</code> and <code>H5Pset_small_data_block_size</code> respectively.
+            </li>
+            <li> Virtual file drivers
+              <br> The library's virtual file driver interface dispatches requests for additional
+              space to the allocation routine of the file driver associated with the file.
+              For example, if the sec2 file driver is being used, its allocation routine will
+              increase the size of the file to service the requests.
+            </li>
+          </ul>
+        <p>
+          For release 1.10.0, the library derives the following four file space strategies
+          based on the mechanisms:
+          <ul>
+            <li>H5F_FILE_SPACE_ALL
+              <ul>
+                <li>Mechanisms used: free-space managers, aggregators, and virtual file drivers</li>
+                <li>Does not persist free-space across file opens</li>
+                <li>This strategy is the library default</li>
+              </ul>
+            </li>
+            <li>H5F_FILE_SPACE_ALL_PERSIST</li>
+            <ul>
+              <li>Mechanisms used: free-space managers, aggregators, and virtual file drivers</li>
+              <li>Persist free-space across file opens</li>
+            </ul>
+            <li>H5F_FILE_SPACE_AGGR_VFD</li>
+            <ul>
+              <li>Mechanisms used: aggregators and virtual file drivers</li>
+              <li>Does not persist free-space across file opens</li>
+            </ul>
+            <li>H5F_FILE_SPACE_VFD</li>
+            <ul>
+              <li>Mechanisms used: virtual file drivers</li>
+              <li>Does not persist free-space across file opens</li>
+            </ul>
+          </ul>
+          For release 1.10.1+, the free-space manager mechanism is modified to handle paged aggregation
+          which aggregates small metadata and raw data allocations into constant-sized well-aligned pages
+          to allow efficient I/O accesses.
+          With the support of this feature, the library derives the following four file space strategies:
+          <ul>
+            <li>H5F_FSPACE_STRATEGY_FSM_AGGR </li>
+            <ul>
+              <li>Mechanisms used: free-space managers, aggregators, and virtual file drivers</li>
+              <li>This strategy is the library default</li>
+            </ul>
+            <li>H5F_FSPACE_STRATEGY_PAGE</li>
+            <ul>
+              <li>Mechanisms used: free-space managers with embedded paged aggregation and virtual file drivers</li>
+            </ul>
+            <li>H5F_FSPACE_STRATEGY_AGGR</li>
+            <ul>
+              <li>Mechanisms used: aggregators and virtual file drivers</li>
+            </ul>
+            <li>H5F_FSPACE_STRATEGY_NONE</li>
+            <ul>
+              <li>Mechanisms used: virtual file drivers</li>
+            </ul>
+          </ul>
+          The default is not persisting free-space across file opens for the above four strategies.
+          User can use the public routine <code>H5Pset_file_space_strategy</code> to request
+          persisting free-space.
+    </td></tr>
+    <p>
+      <tr><td colspan="2"><b>Format of Data:</b> See the tables
+          below.</td></tr>
+</table></center>
+<p>
+  <div align="center">
+    <table class="format">
+      <caption>
+        Layout: File Space Info - Version 0
+      </caption>
+
+	  <tr>
+	    <th width="25%">byte</th>
+	    <th width="25%">byte</th>
+	    <th width="25%">byte</th>
+	    <th width="25%">byte</th>
+	  </tr>
+
+	  <tr>
+	    <td>Version</td>
+	    <td>Strategy</td>
+        <td colspan="2">Threshold<sup>L</sup></td>
+	  </tr>
+	  <tr>
+	    <td colspan="4"><br />Free-space manager address<sup>O</sup> for H5FD_MEM_SUPER<br /><br /></td>
+	  </tr>
+	  <tr>
+	    <td colspan="4"><br />Free-space manager address<sup>0</sup> for H5FD_MEM_BTREE<br /><br /></td>
+	  </tr>
+	  <tr>
+	    <td colspan="4"><br />Free-space manager address<sup>0</sup> for H5FD_MEM_DRAW<br /><br /></td>
+	  </tr>
+	  <tr>
+	    <td colspan="4"><br />Free-space manager address<sup>0</sup> for H5FD_MEM_GHEAP<br /><br /></td>
+	  </tr>
+	  <tr>
+	    <td colspan="4"><br />Free-space manager address<sup>0</sup> for H5FD_MEM_LHEAP<br /><br /></td>
+	  </tr>
+	  <tr>
+	    <td colspan="4"><br />Free-space manager address<sup>0</sup> for H5FD_MEM_OHDR<br /><br /></td>
+	  </tr>
+    </table>
+
+    <table class="note">
+      <tr>
+        <td width="60%">&nbsp;</td>
+        <td width="40%">
+          (Items marked with an &lsquo;O&rsquo; in the above table are
+          of the size specified in the <a href="#SizeOfOffsetsV0">Size
+            of Offsets</a> field in the superblock.)
+      </td></tr>
+      <tr>
+        <td>&nbsp;</td>
+        <td>
+          (Items marked with an &lsquo;L&rsquo; in the above table are
+          of the size specified in the <a href="#SizeOfLengthsV0">Size
+            of Lengths</a> field in the superblock.)
+      </td></tr>
+    </table>
+
+  </div>
+
+  <br />
+  <div align="center">
+    <table class="desc">
+      <caption>
+        Fields: File Space Info
+      </caption>
+	  <tr>
+        <th width="30%">Field Name</th>
+        <th>Description</th>
+	  </tr>
+
+	  <tr>
+	    <td><p>Version</p></td>
+	    <td><p>This is version 0 of this message.</p>
+	    </td>
+	  </tr>
+
+	  <tr>
+	    <td><p>Strategy</p></td>
+	    <td><p>This is the file space strategy used to manage file space.
+		    There are four types:
+            <table class="list">
+              <tr>
+                <th width="20%" align="center">Value</th>
+                <th width="80%" align="left">Description</th>
+              </tr>
+
+              <tr>
+                <td align="center"><code>1</code></td>
+                <td>H5F_FILE_SPACE_ALL_PERSIST</td>
+              </tr>
+
+              <tr>
+                <td align="center"><code>2</code></td>
+                <td>H5F_FILE_SPACE_ALL</td>
+              </tr>
+
+              <tr>
+                <td align="center"><code>3</code></td>
+                <td>H5F_FILE_SPACE_AGGR_VFD</td>
+              </tr>
+              <tr>
+                <td align="center"><code>4</code></td>
+                <td>H5F_FILE_SPACE_VFD</td>
+              </tr>
+          </table></p>
+	    </td>
+	  </tr>
+
+	  <tr>
+	    <td><p>Threshold</p></td>
+	    <td><p>This is the smallest free-space section size that the
+	        free-space manager will track.
+	    </td>
+	  </tr>
+	  <tr>
+	    <td><p>Free-space manager addresses</p></td>
+	    <td><p>These are the six free-space manager addresses for the
+            six file space allocation types:
+            <ul>
+              <li>H5FD_MEM_SUPER</li>
+              <li>H5FD_MEM_BTREE</li>
+              <li>H5FD_MEM_DRAW</li>
+              <li>H5FD_MEM_GHEAP</li>
+              <li>H5FD_MEM_LHEAP</li>
+              <li>H5FD_MEM_OHDR</li>
+            </ul>
+            Note that these six fields exist only if the value for the field
+            &ldquo;<em>Strategy</em>&rdquo; is H5F_FILE_SPACE_ALL_PERSIST.
+          </p>
+	    </td>
+	  </tr>
+
+    </table>
+  </div>
+  <br />
+
+  <div align="center">
+    <table class="format">
+      <caption>
+        Layout: File Space Info - Version 1
+      </caption>
+
+	  <tr>
+	    <th width="25%">byte</th>
+	    <th width="25%">byte</th>
+	    <th width="25%">byte</th>
+	    <th width="25%">byte</th>
+	  </tr>
+
+	  <tr>
+	    <td>Version</td>
+	    <td>Strategy</td>
+        <td>Persisting free-space</td>
+        <td colspan="1" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+	  </tr>
+
+	  <tr>
+        <td colspan="4">Free-space Section Threshold<sup>L</sup></td>
+	  </tr>
+
+      <tr>
+        <td colspan="4">File Space Page Size</td>
+      </tr>
+
+      <tr>
+        <td colspan="2">Page-end Metadata threshold</td>
+        <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em></td>
+      </tr>
+
+      <tr>
+        <td colspan="4"><br />EOA<sup>0</sup><br /><br /></td>
+      </tr>
+
+	  <tr>
+	    <td colspan="4"><br />Address<sup>O</sup> of small-sized free-space manager for H5FD_MEM_SUPER<br /><br /></td>
+	  </tr>
+	  <tr>
+	    <td colspan="4"><br />Address<sup>O</sup> of small-sized free-space manager for H5FD_MEM_BTREE<br /><br /></td>
+	  </tr>
+	  <tr>
+	    <td colspan="4"><br />Address<sup>O</sup> of small-sized free-space manager for H5FM_MEM_DRAW<br /><br /></td>
+	  </tr>
+	  <tr>
+	    <td colspan="4"><br />Address<sup>O</sup> of small-sized free-space manager for H5FD_MEM_GHEAP<br /><br /></td>
+	  </tr>
+	  <tr>
+	    <td colspan="4"><br />Address<sup>O</sup> of small-sized free-space manager for H5FD_MEM_LHEAP<br /><br /></td>
+	  </tr>
+	  <tr>
+	    <td colspan="4"><br />Address<sup>O</sup> of small-sized free-space manager for H5FD_MEM_OHDR<br /><br /></td>
+	  </tr>
+	  <tr>
+	    <td colspan="4"><br />Address<sup>O</sup> of large-sized free-space manager for H5FD_MEM_SUPER<br /><br /></td>
+	  </tr>
+	  <tr>
+	    <td colspan="4"><br />Address<sup>O</sup> of large-sized free-space manager for H5FD_MEM_BTREE<br /><br /></td>
+	  </tr>
+	  <tr>
+	    <td colspan="4"><br />Address<sup>O</sup> of large-sized free-space manager for H5FM_MEM_DRAW<br /><br /></td>
+	  </tr>
+	  <tr>
+	    <td colspan="4"><br />Address<sup>O</sup> of large-sized free-space manager for H5FD_MEM_GHEAP<br /><br /></td>
+	  </tr>
+	  <tr>
+	    <td colspan="4"><br />Address<sup>O</sup> of large-sized free-space manager for H5FD_MEM_LHEAP<br /><br /></td>
+	  </tr>
+	  <tr>
+	    <td colspan="4"><br />Address<sup>O</sup> of large-sized free-space manager for H5FD_MEM_OHDR<br /><br /></td>
+	  </tr>
+    </table>
+
+    <table class="note">
+      <tr>
+        <td width="60%">&nbsp;</td>
+        <td width="40%">
+          (Items marked with an &lsquo;O&rsquo; in the above table are
+          of the size specified in the <a href="#SizeOfOffsetsV0">Size
+            of Offsets</a> field in the superblock.)
+      </td></tr>
+      <tr>
+        <td>&nbsp;</td>
+        <td>
+          (Items marked with an &lsquo;L&rsquo; in the above table are
+          of the size specified in the <a href="#SizeOfLengthsV0">Size
+            of Lengths</a> field in the superblock.)
+      </td></tr>
+    </table>
+
+  </div>
+
+  <br />
+  <div align="center">
+    <table class="desc">
+      <caption>
+        Fields: File Space Info
+      </caption>
+	  <tr>
+        <th width="30%">Field Name</th>
+        <th>Description</th>
+	  </tr>
+
+	  <tr>
+	    <td><p>Version</p></td>
+	    <td><p>This is version 1 of this message.</p>
+	    </td>
+	  </tr>
+
+	  <tr>
+	    <td><p>Strategy</p></td>
+	    <td><p>This is the file space strategy used to manage file space.
+		    There are four types:
+            <table class="list">
+              <tr>
+                <th width="20%" align="center">Value</th>
+                <th width="80%" align="left">Description</th>
+              </tr>
+
+              <tr>
+                <td align="center"><code>0</code></td>
+                <td>H5F_FSPACE_STRATEGY_FSM_AGGR</td>
+              </tr>
+
+              <tr>
+                <td align="center"><code>1</code></td>
+                <td>H5F_FSPACE_STRATEGY_PAGE</td>
+              </tr>
+
+              <tr>
+                <td align="center"><code>2</code></td>
+                <td>H5F_FSPACE_STRATEGY_AGGR</td>
+              </tr>
+              <tr>
+                <td align="center"><code>3</code></td>
+                <td>H5F_FSPACE_STRATEGY_NONE</td>
+              </tr>
+          </table></p>
+	    </td>
+	  </tr>
+
+	  <tr>
+	    <td><p>Persisting free-space</p></td>
+	    <td><p>True or false in persisting free-space.
+	    </td>
+	  </tr>
+
+	  <tr>
+	    <td><p>Free-space Section Threshold</p></td>
+	    <td><p>This is the smallest free-space section size that the
+	        free-space manager will track.
+	    </td>
+	  </tr>
+
+	  <tr>
+	    <td><p>File space page size</p></td>
+	    <td><p>This is the file space page size, which is used when the paged aggregation feature
+	        is enabled.
+	    </td>
+	  </tr>
+
+	  <tr>
+	    <td><p>Page-end metadata threshold</p></td>
+	    <td><p>This is the smallest free-space section size at the end of a page that
+            the free-space manager will track.  This is used when the paged aggregation feature
+	        is enabled.
+	    </td>
+	  </tr>
+
+	  <tr>
+	    <td><p>EOA</p></td>
+	    <td><p>The EOA before the allocation of free-space manager header and section info for the
+            self-referential free-space managers when persisting free-space.
+            <br>
+            Note that self-referential free-space managers are managers that involve file space
+            allocation for the managers' free-space header and section info.
+	    </td>
+	  </tr>
+
+	  <tr>
+	    <td><p>Addresses of small-sized free-space managers</p></td>
+	    <td><p>These are the addresses of the six small-sized free-space managers for
+            the six file space allocation types:
+          </p>
+          <ul>
+            <li>H5FD_MEM_SUPER</li>
+            <li>H5FD_MEM_BTREE</li>
+            <li>H5FD_MEM_DRAW</li>
+            <li>H5FD_MEM_GHEAP</li>
+            <li>H5FD_MEM_LHEAP</li>
+            <li>H5FD_MEM_OHDR</li>
+          </ul>
+          Note that these six fields exist only if the value for the field
+          &ldquo;<em>Persisting free-space</em>&rdquo; is true.
+</ul>
+</td>
+</tr>
+
+<tr>
+  <td><p>Addresses of large-sized free-space managers</p></td>
+  <td><p>These are the addresses of the six large-sized free-space managers for
+      the six file space allocation types:
+    </p>
+    <ul>
+      <li>H5FD_MEM_SUPER</li>
+      <li>H5FD_MEM_BTREE</li>
+      <li>H5FD_MEM_DRAW</li>
+      <li>H5FD_MEM_GHEAP</li>
+      <li>H5FD_MEM_LHEAP</li>
+      <li>H5FD_MEM_OHDR</li>
+    </ul>
+    Note that these six fields exist only if the value for the field
+    &ldquo;<em>Persisting free-space</em>&rdquo; is true.
+</ul>
+</td>
+</tr>
+
+</table>
+</div>
+
+<h3><a name="DataStorage">
+    IV.B. Disk Format: Level 2B - Data Object Data Storage</a></h3>
+
+<p>The data for an object is stored separately from its header
+  information in the file and may not actually be located in the HDF5 file
+  itself if the header indicates that the data is stored externally.  The
+  information for each record in the object is stored according to the
+  dimensionality of the object (indicated in the dataspace header message).
+  Multi-dimensional array data is stored in C order; in other words, the
+  &ldquo;last&rdquo; dimension changes fastest.</p>
+
+<p>Data whose elements are composed of atomic datatypes are stored in IEEE
+  format, unless they are specifically defined as being stored in a different
+  machine format with the architecture-type information from the datatype
+  header message.  This means that each architecture will need to [potentially]
+  byte-swap data values into the internal representation for that particular
+  machine.</p>
+
+<p> Data with a variable-length datatype is stored in the global heap
+  of the HDF5 file.  Global heap identifiers are stored in the
+  data object storage.</p>
+
+<p>Data whose elements are composed of reference datatypes are stored in
+  several different ways depending on the particular reference type involved.
+  Object pointers are just stored as the offset of the object header being
+  pointed to with the size of the pointer being the same number of bytes as
+  offsets in the file.</p>
+
+<p>Dataset region references are stored as a heap-ID which points to
+  the following information within the file-heap: an offset of the object
+  pointed to, number-type information (same format as header message),
+  dimensionality information (same format as header message), sub-set start
+  and end information (in other words, a coordinate location for each),
+  and field start and end names (in other words, a [pointer to the] string
+  indicating the first field included and a [pointer to the] string name
+  for the last field).  </p>
+
+<p>Data of a compound datatype is stored as a contiguous stream of the items
+  in the structure, with each item formatted according to its datatype.
+<p>
+  Description of datatypes for variable-length, references and compound classes can be found
+  in <a href="#DatatypeMessage">Datatype Message</a>.
+<p>
+  Information about global heap and heap ID can be found in <a href="#GlobalHeap">Global Heap</a>.
+<p>
+  For reference datatype,
+  see also the encoding description for <a href="#ReferenceEncodeRV">Reference Encoding (Revised) </a> and
+  <a href="#ReferenceEncodeDP">Reference Encoding (Backward Compatibility)</a> in Appendix D.
+</p>
+
+<h2><a name="AppendixA">
+    V. Appendix A: Definitions</a></h2>
+
+<p>Definitions of various terms used in this document are included in
+  this section.</p>
+
+<div align="center">
+  <table class="glossary">
+    <tr>
+      <th width="20%">Term</th>
+      <th>Definition</th>
+    </tr>
+
+    <tr>
+      <td>Undefined Address</td>
+      <td>The <a name="UndefinedAddress">undefined
+          address</a> for a file is a file address with all bits
+        set: in other words, <code>0xffff...ff</code>.</td>
+	</tr>
+
+	<tr>
+	  <td>Unlimited Size</td>
+	  <td>The <a name="UnlimitedDim">unlimited size</a>
+        for a size is a value with all bits set: in other words,
+        <code>0xffff...ff</code>.</td>
+	</tr>
+
+  </table>
+</div>
+
+
+<h2><a name="AppendixB">
+    VI. Appendix B: File Space Allocation Types</a></h2>
+
+<p>There are six basic types of file space allocation as follows:
+</p>
+<div align="center">
+  <table class="desc">
+	<tr>
+      <th width="30%">Basic Allocation Type</th>
+      <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td>H5FD_MEM_SUPER</td>
+	  <td>File space allocated for <em>Superblock.</em></td>
+	</tr>
+
+	<tr>
+	  <td>H5FD_MEM_BTREE</td>
+	  <td>File space allocated for <em>B-tree.</em></td>
+	</tr>
+
+	<tr>
+	  <td>H5FD_MEM_DRAW</td>
+	  <td>File space allocated for <em>raw data</em>.</td>
+	</tr>
+
+	<tr>
+	  <td>H5FD_MEM_GHEAP</td>
+	  <td>File space allocated for <em>Global Heap.</em></td>
+	</tr>
+
+	<tr>
+	  <td>H5FD_MEM_LHEAP</td>
+	  <td>File space allocated for <em>Local Heap.</em></td>
+	</tr>
+
+	<tr>
+	  <td>H5FD_MEM_OHDR</td>
+	  <td>File space allocated for <em>Object Header.</em></td>
+	</tr>
+  </table>
+</div>
+
+<br />
+<p>There are other file space allocation types that are mapped to the
+  above six basic types because they are similar in nature.
+  The mapping and the corresponding description are listed in the following two tables:
+</p>
+
+<div align="center">
+  <table class="desc">
+	<tr>
+      <th width="30%">Basic Allocation Type</th>
+      <th>Mapping of Allocation Types to Basic Allocation Types</th>
+	</tr>
+
+	<tr>
+	  <td>H5FD_MEM_SUPER</td>
+	  <td><em>none</em></td>
+	</tr>
+
+	<tr>
+	  <td>H5FD_MEM_BTREE</td>
+	  <td>H5FD_MEM_SOHM_INDEX</td>
+	</tr>
+
+	<tr>
+	  <td>H5FD_MEM_DRAW</td>
+	  <td>H5FD_MEM_FHEAP_HUGE_OBJ</td>
+	</tr>
+
+	<tr>
+	  <td>H5FD_MEM_GHEAP</td>
+	  <td><em>none</em></td>
+	</tr>
+
+	<tr>
+	  <td>H5FD_MEM_LHEAP</td>
+	  <td>H5FD_MEM_FHEAP_DBLOCK, H5FD_MEM_FSPACE_SINFO</td>
+	</tr>
+
+	<tr>
+	  <td>H5FD_MEM_OHDR</td>
+	  <td>H5FD_MEM_FHEAP_HDR, H5FD_MEM_FHEAP_IBLOCK, H5FD_MEM_FSPACE_HDR, H5FD_MEM_SOHM_TABLE</td>
+	</tr>
+  </table>
+</div>
+
+<br />
+</p>
+
+<div align="center">
+  <table class="desc">
+	<tr>
+      <th width="30%">Allocation Type</th>
+      <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td>H5FD_MEM_FHEAP_HDR</td>
+	  <td>File space allocated for <em>Fractal Heap Header.</em></td>
+	</tr>
+
+	<tr>
+	  <td>H5FD_MEM_FHEAP_DBLOCK</td>
+	  <td>File space allocated for <em>Fractal Heap Direct Blocks.</em></td>
+	</tr>
+
+	<tr>
+	  <td>H5FD_MEM_FHEAP_IBLOCK</td>
+	  <td>File space allocated for <em>Fractal Heap Indirect Blocks.</em></td>
+	</tr>
+
+	<tr>
+	  <td>H5FD_MEM_FHEAP_HUGE_OBJ</td>
+	  <td>File space allocated for huge objects in the fractal heap.</td>
+	</tr>
+
+	<tr>
+	  <td>H5FD_MEM_FSPACE_HDR</td>
+	  <td>File space allocated for <em>Free-space Manager Header.</em></td>
+	</tr>
+
+	<tr>
+	  <td>H5FD_MEM_FSPACE_SINFO</td>
+	  <td>File space allocated for <em>Free-space Section List</em> of the free-space manager.</td>
+	</tr>
+	<tr>
+	  <td>H5FD_MEM_SOHM_TABLE</td>
+	  <td>File space allocated for <em>Shared Object Header Message Table.</em></td>
+	</tr>
+	<tr>
+	  <td>H5FD_MEM_SOHM_INDEX</td>
+	  <td>File space allocated for <em>Shared Message Record List.</em></td>
+	</tr>
+  </table>
+</div>
+
+<h2><a name="AppendixC"> VII. Appendix C:
+    Types of Indexes for Dataset Chunks</a></h2>
+
+<p>For an HDF5 file without the latest format enabled, the library
+  uses the <a href="#V1Btrees">Version 1 B-tree</a> to index dataset
+  chunks.</p>
+
+<p>For an HDF5 file with the latest format enabled, the library uses
+  one of the following five indexing types depending on a chunked
+  dataset&rsquo;s dimension specification and the way it is extended.
+</p>
+
+<a name="SingleChunk">
+  <h3>VII.A. The Single Chunk Index</h3></a>
+
+<p>The <i>Single Chunk</i> index can be used when the dataset fulfills
+  the following condition:</p>
+
+<ul>
+  <li>the current, maximum, and chunk dimension sizes are all the same</li>
+</ul>
+
+<p>The dataset has only one chunk, and the address of the single
+  chunk is stored in the version 4 <i>Data Layout</i> message.
+  See the <a href="#ChunkedStorage">Chunked Storage Property
+    Description</i></a> layout and field description tables.</p>
+
+<a name="Implicit">
+  <h3>VII.B. The Implicit Index</h3></a>
+
+<p>The <i>Implicit</i> index can be used when the dataset fulfills
+  the following conditions:</p>
+
+<ul>
+  <li>fixed maximum dimension sizes</li>
+  <li>no filter applied to the dataset</li>
+  <li>the timing for the space allocation of the dataset chunks is
+    <code>H5P_ALLOC_TIME_EARLY</code></li>
+</ul>
+
+<p>Since the dataset&rsquo;s dimension sizes are known and storage space
+  is to be allocated early, an array of dataset chunks are allocated
+  based on the maximum dimension sizes when the dataset is created.
+  The base address of the array is stored in the version 4
+  <i>Data Layout</i> message. See the
+  <a href="#ChunkedStorage">Chunked Storage Property
+    Description</i></a> layout and field description tables.
+</p>
+
+<p>When accessing a dataset chunk with a specified offset, the
+  address of the chunk in the array is computed as below:</p>
+
+<dir><p><code>base address + (size of a chunk in bytes * chunk index
+      associated with the offset)</code></p></dir>
+
+<p>A chunk index starts at 0 and increases according to the
+  fastest changing dimension, then the next fastest, and so on.
+  <a name="ChunkIndex"></a>
+  The chunk index for a dataset chunk offset is computed as below:
+  <ol>
+    <li>Calculate the scaled offset for each dimension in
+      <code>scaled_offset</code>:
+      <br />
+	  <pre>
+        scaled_offset = chunk_offset/chunk_dims
+    </pre></li>
+    <li>Calculate the # of chunks for each dimension in
+      <code>nchunks</code>:
+      <br />
+	  <pre>
+        nchunks = (curr_dims + chunk_dims - 1)/chunk_dims
+    </pre></li>
+
+    <li>Calculate the down chunks for each dimension in
+      <code>down_chunks</code>:
+      <br />
+      <pre>
+        /* n is the # of dimensions */
+        for(i = (int)(n-1), acc = 1; i >= 0; i--) {
+        down_chunks[i] = acc;
+        acc *= nchunks[i];
+        }
+      </pre>
+    </li>
+
+    <li>Calculate the chunk index in <code>chunk_index</code>:
+      <br />
+      <pre>
+        /* n is the # of dimensions */
+        for(u = 0, chunk_index = 0; u < n; u++)
+                                        chunk_index += down_chunks[u] * scaled_offset[u];
+                                        </pre>
+    </li>
+  </ol>
+<p>
+  For example, for a 2-dimensional dataset with
+  <code>curr_dims[4,5]</code> and <code>chunk_dims[3,2]</code>,
+  there will be a total of 6 chunks, with 3 chunks in the fastest
+  changing dimension and 2 chunks in the slowest changing dimension.
+  See the figure below.
+  The chunk index for the chunk offset <code>[3,4]</code>
+  is computed as below:
+  <ol>
+    <code>
+      <li>scaled_offset[0] = 1, scaled_offset[1] = 2</li>
+      <li>nchunks[0] = 2, nchunks[1] = 3</li>
+      <li>down_chunks[0] = 3, down_chunks[1] = 1</li>
+      <li>chunk_index = 5</li>
+    </code>
+  </ol>
+
+
+  <table align="center" width="400" border="0">
+    <tr valign="center" align="center">
+      <td>
+        <hr size="2"/>
+        <img height="250" src="FileFormatSpecChunkDiagram.jpg"
+             alt="Chunk Diagram"></td>
+    </tr>
+    <tr valign="top" align="center">
+      <td>
+        <hr size="1" />
+        <b>Figure 3. Implicit index chunk diagram </b>
+        <hr size="2"/></td>
+    </tr>
+  </table>
+
+
+
+
+
+  <a name="FixedArray">
+    <h3>VII.C. The Fixed Array Index</h3></a>
+
+<p>The <i>Fixed Array</i> index can be used when the dataset fulfills
+  the following condition:</p>
+<ul>
+  <li>fixed maximum dimension sizes</li>
+</ul>
+
+<p>Since the maximum number of chunks is known, an array of
+  in-file-on-disk addresses based on the maximum number of chunks is
+  allocated when data is written to the dataset. To access a dataset
+  chunk with a specified offset, the
+  <a href="#ChunkIndex">chunk index</i></a> associated with the offset
+is calculated. The index is mapped into the array to locate the
+disk address for the chunk.</p>
+
+<p>The Fixed Array (FA) index structure provides space and speed
+  improvements in locating chunks over index structures that handle
+  more dynamic data accesses like a
+  <a href="#AppendV2Btrees">Version 2 B-tree</a> index.
+  The entry into the Fixed Array is the Fixed Array header which
+  contains metadata about the entries stored in the array. The
+  header contains a pointer to a data block which stores the array
+  of entries that describe the dataset chunks. For greater efficiency,
+  the array will be divided into multiple pages if the number of
+  entries exceeds a threshold value. The space for the data block
+  and possibly data block pages are allocated as a single contiguous
+  block of space.</p>
+
+<p>The content of the data block depends on whether paging is
+  activated or not. When paging is not used, elements that describe
+  the chunks are stored in the data block. If paging is turned on,
+  the data block contains a bitmap indicating which pages are
+  initialized. Then subsequent data block pages will contain the
+  entries that describe the chunks.</p>
+
+<p>An entry describes either a filtered or non-filtered dataset
+  chunk.  The formats for both element types are described below.
+</p>
+<br />
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Fixed Array Header
+    </caption>
+
+    <tr>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+    </tr>
+
+    <tr>
+      <td colspan="4">Signature</td>
+    </tr>
+
+    <tr>
+      <td>Version</td>
+      <td>Client ID</td>
+      <td>Entry Size</td>
+      <td>Page Bits</td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Max Num
+        Entries<sup>L</sup><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Data Block
+        Address<sup>O</sup><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4">Checksum</td>
+    </tr>
+
+  </table>
+
+  <table class="note">
+    <tr>
+      <td width="60%">&nbsp;</td>
+      <td width="40%">
+        (Items marked with an &lsquo;L&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfLengthsV0">Size
+          of Lengths</a> field in the superblock.)
+    </td></tr>
+    <tr>
+      <td>&nbsp;</td>
+      <td>
+        (Items marked with an &lsquo;O&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfOffsetsV0">Size
+          of Offsets</a> field in the superblock.)
+    </td></tr>
+  </table>
+
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Fixed Array Header
+    </caption>
+	<tr>
+      <th width="40%">Field Name</th>
+      <th>Description</th>
+    </tr>
+
+    <tr>
+      <td><p>Signature</p></td>
+      <td>
+        <p>The ASCII character string &ldquo;<code>FAHD</code>&rdquo;
+          is used to indicate the beginning of a Fixed Array header.
+          This gives file consistency checking utilities a better
+          chance of reconstructing a damaged file.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Version</p></td>
+      <td>
+        <p>This document describes version 0.</p>
+      </td>
+    </tr>
+
+	<tr>
+      <td><p>Client ID</p></td>
+      <td>
+        <p>The ID for identifying the client of the
+          Fixed Array:
+
+          <table class="list">
+            <tr>
+              <th width="20%" align="center">ID</th>
+              <th width="80%" align="left">Description</th>
+            </tr>
+
+            <tr>
+              <td align="center"><code>0</code></td>
+              <td>Non-filtered dataset chunks
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>1</code></td>
+              <td>Filtered dataset chunks
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>2+</code></td>
+              <td>Reserved
+              </td>
+            </tr>
+          </table>
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Entry Size</p></td>
+	  <td>
+	    <p>The size in bytes of an entry in the Fixed Array.
+        </p>
+	  </td>
+    </tr>
+
+	<tr>
+	  <td><p>Page Bits</p></td>
+	  <td>
+        <p>The number of bits needed to store the maximum
+          number of entries in a
+          <a href="#FADataBlockPage">data block page.</a></p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Max Num Entries</p></td>
+	  <td>
+	    <p>The maximum number of entries in the Fixed
+          Array.</p>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td><p>Data Block Address</p></td>
+	  <td>
+	    <p>The address of the data block in the Fixed Array.
+	    </p>
+	  </td>
+
+    <tr>
+      <td><p>Checksum</p></td>
+      <td>
+        <p>The checksum for the header.</p>
+      </td>
+    </tr>
+
+  </table>
+</div>
+
+<br />
+<br />
+<br />
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Fixed Array Data Block
+    </caption>
+
+    <tr>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+    </tr>
+
+    <tr>
+      <td colspan="4">Signature</td>
+    </tr>
+
+    <tr>
+      <td>Version</td>
+      <td>Client ID</td>
+      <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted
+          only to align table nicely</em></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Header Address<sup>O</sup><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Page Bitmap <em>(variable size and
+          optional)</em><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Elements <em>(variable size and
+          optional)</em><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4">Checksum</td>
+    </tr>
+
+  </table>
+
+  <table class="note">
+    <tr>
+      <td width="60%">&nbsp;</td>
+      <td width="40%">
+        (Items marked with an &lsquo;O&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfOffsetsV0">Size
+          of Offsets</a> field in the superblock.)
+    </td></tr>
+  </table>
+
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Fixed Array Data Block
+    </caption>
+	<tr>
+      <th width="40%">Field Name</th>
+      <th>Description</th>
+    </tr>
+
+    <tr>
+      <td><p>Signature</p></td>
+      <td>
+        <p>The ASCII character string &ldquo;<code>FADB</code>&rdquo;
+          is used to indicate the beginning of a Fixed Array data
+          block. This gives file consistency checking utilities a
+          better chance of reconstructing a damaged file.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Version</p></td>
+      <td>
+        <p>This document describes version 0.</p>
+      </td>
+    </tr>
+
+	<tr>
+      <td><p>Client ID</p></td>
+      <td>
+        <p>The ID for identifying the client of the
+          Fixed Array:
+
+          <table class="list">
+            <tr>
+              <th width="20%" align="center">ID</th>
+              <th width="80%" align="left">Description</th>
+            </tr>
+
+            <tr>
+              <td align="center"><code>0</code></td>
+              <td>Non-filtered dataset chunks
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>1</code></td>
+              <td>Filtered dataset chunks
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>2+</code></td>
+              <td>Reserved.
+              </td>
+            </tr>
+          </table>
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Header Address</p></td>
+	  <td>
+	    <p>The address of the Fixed Array header. Principally used
+          for file integrity checking.
+        </p>
+	  </td>
+    </tr>
+
+	<tr>
+	  <td><p>Page Bitmap</p></td>
+	  <td><p>A bitmap indicating which data block pages are initialized.</p>
+	    <p>Exists only if the data block is paged.</p></td>
+	</tr>
+
+	<tr>
+	  <td><p>Elements</p></td>
+	  <td>
+	    <p>Contains the elements stored in the data block
+          and exists only if the data block is not paged.
+	      There are two element types:
+          <table class="list">
+            <tr>
+              <th width="20%" align="center">ID</th>
+              <th width="80%" align="left">Description</th>
+            </tr>
+
+            <tr>
+              <td align="center"><code>0</code></td>
+              <td><a href="#FaNonFilterChunk">Non-filtered
+                  dataset chunks</i></a>
+</td>
+</tr>
+<tr>
+  <td align="center"><code>1</code></td>
+  <td><a href="#FaFilterChunk">Filtered dataset
+      chunks</i></a>
+</td>
+</tr>
+</table>
+</p>
+</td>
+</tr>
+
+<tr>
+  <td><p>Checksum</p></td>
+  <td>
+    <p>The checksum for the Fixed Array data block.</p>
+  </td>
+</tr>
+
+</table>
+</div>
+
+<br />
+<br />
+<br />
+<div align="center">
+  <table class="format">
+    <caption><a name="FADataBlockPage">
+        Layout: Fixed Array Data Block Page</a>
+    </caption>
+
+    <tr>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Elements <em>(variable
+          size)</em><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4">Checksum</td>
+    </tr>
+
+  </table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Fixed Array Data Block Page
+    </caption>
+	<tr>
+      <th width="40%">Field Name</th>
+      <th>Description</th>
+    </tr>
+
+	<tr>
+	  <td><p>Elements</p></td>
+	  <td>
+	    <p>Contains the elements stored in the data block page.
+	      There are two element types:
+          <table class="list">
+            <tr>
+              <th width="20%" align="center">ID</th>
+              <th width="80%" align="left">Description</th>
+            </tr>
+
+            <tr>
+              <td align="center"><code>0</code></td>
+              <td><a href="#FaNonFilterChunk">Non-filtered dataset chunks</i></a>
+</td>
+</tr>
+<tr>
+  <td align="center"><code>1</code></td>
+  <td><a href="#FaFilterChunk">Filtered dataset chunks</i></a>
+</td>
+</tr>
+</table>
+</p>
+</td>
+</tr>
+
+<tr>
+  <td><p>Checksum</p></td>
+  <td>
+    <p>The checksum for a Fixed Array data block page.</p>
+  </td>
+</tr>
+
+</table>
+</div>
+
+<br />
+<br />
+<br />
+<a name="FaNonFilterChunk"></a>
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Data Block Element for Non-filtered Dataset Chunk
+    </caption>
+
+	<tr>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><br />Address<sup>O</sup><br /><br /></td>
+	</tr>
+
+  </table>
+
+  <table class="note">
+    <tr>
+      <td width="60%">&nbsp;</td>
+      <td width="40%">
+        (Items marked with an &lsquo;O&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfOffsetsV0">Size
+          of Offsets</a> field in the superblock.)
+    </td></tr>
+  </table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Data Block Element for Non-filtered Dataset Chunk
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td><p>Address</p></td>
+	  <td><p>The address of the dataset chunk in the file.
+        </p>
+      </td>
+	</tr>
+
+  </table>
+</div>
+<!--    </p> -->
+
+<br />
+<br />
+<br />
+<a name="FaFilterChunk"></a>
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Data Block Element for Filtered Dataset Chunk
+    </caption>
+
+	<tr>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><br />Address<sup>O</sup><br /><br /></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><br />Chunk Size <em>(variable size; at most
+          8 bytes)</em><br /><br /></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">Filter Mask</td>
+	</tr>
+
+  </table>
+
+  <table class="note">
+    <tr>
+      <td width="60%">&nbsp;</td>
+      <td width="40%">
+        (Items marked with an &lsquo;O&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfOffsetsV0">Size
+          of Offsets</a> field in the superblock.)
+    </td></tr>
+  </table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Data Block Element for Filtered Dataset Chunk
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td><p>Address</p></td>
+	  <td><p>The address of the dataset chunk in the file.
+        </p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Chunk Size</p></td>
+	  <td><p>The size of the dataset chunk in bytes.
+        </p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Filter Mask</p></td>
+	  <td><p>Indicates the filter to skip for the dataset chunk. Each
+          filter has an index number in the pipeline; if that filter is
+          skipped, the bit corresponding to its index is set.
+        </p>
+      </td>
+	</tr>
+
+  </table>
+</div>
+
+<a name="ExtensibleArray">
+  <h3>VII.D. The Extensible Array Index</h3></a>
+
+<p>The <i>Extensible Array</i> index can be used when the dataset
+  fulfills the following condition:</p>
+
+<ul>
+  <li>only one dimension of unlimited extent</li>
+</ul>
+
+<p>The Extensible Array (EA) is a data structure that is used as a
+  chunk index in datasets where the dataspace has a single
+  unlimited dimension. In other words, one dimension is set to
+  <code>H5S_UNLIMITED</code>, and the other dimensions are any number
+  of fixed-size dimensions. The idea behind the extensible array is
+  that a particular data object can be located via a lightweight
+  indexing structure of fixed depth for a given address space. This
+  indexing structure requires only a few (2-3) file operations per
+  element lookup and gives good cache performance. Unlike the B-tree
+  structure, the extensible array is optimized for appends. Where a
+  B-tree would always add at the rightmost node under these
+  circumstances, either creating a deep tree (version 1) or requiring
+  expensive rebalances to correct (version 2), the extensible array
+  has already mapped out a pre-balanced internal structure. This
+  optimized internal structure is instantiated as needed when chunk
+  records are inserted into the structure.</p>
+
+
+
+<!--
+
+     <p>A description of the rationale that leads to the present
+       implementation of the extensible array can be found at
+       <a href="https://svn.hdfgroup.org/hdf5doc/trunk/projects/1_10_alpha/ReviseChunks/skip_lists">
+         https://svn.hdfgroup.org/hdf5doc/trunk/projects/1_10_alpha/ReviseChunks/skip_lists</a>.
+     </p>
+
+<p>The current implementation differs from the data structure
+  described in that reference in some ways, but the basic idea is the
+  same.</p>
+
+-->
+
+
+
+<p>An Extensible Array consists of a header, an index block,
+  secondary blocks, data blocks, and (optional) data block pages. The
+  general scheme is that the index block is used to reference a
+  secondary block, which is, in turn, used to reference the data block
+  page where the chunk information is stored. The data blocks will
+  be paged for efficiency when their size passes a threshold value.
+  These pages are laid out contiguously on the disk after the data
+  block, are initialized as needed, and are tracked via bitmaps
+  stored in the secondary block. The number of secondary and data
+  blocks/pages in a chunk index varies as they are allocated as
+  needed and the first few are (conceptually) stored in parent
+  elements as an optimization.</p>
+
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Extensible Array Header
+    </caption>
+
+    <tr>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+    </tr>
+
+    <tr>
+      <td colspan="4">Signature</td>
+    </tr>
+
+    <tr>
+      <td>Version</td>
+      <td>Client ID</td>
+      <td>Element Size</td>
+      <td>Max Nelmts Bits</td>
+	</tr>
+
+	<tr>
+      <td>Index Blk Elmts</td>
+      <td>Data Blk Min Elmts</td>
+      <td>Secondary Blk Min Data Ptrs</td>
+      <td>Max Data Blk Page Nelmts Bits</td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Num Secondary Blks<sup>L</sup><br /><br /></td>
+    </tr>
+    <tr>
+      <td colspan="4"><br />Secondary Blk Size<sup>L</sup><br /><br /></td>
+    </tr>
+    <tr>
+      <td colspan="4"><br />Num Data Blks<sup>L</sup><br /><br /></td>
+    </tr>
+    <tr>
+      <td colspan="4"><br />Data Blk Size<sup>L</sup><br /><br /></td>
+    </tr>
+    <tr>
+      <td colspan="4"><br />Max Index Set<sup>L</sup><br /><br /></td>
+    </tr>
+    <tr>
+      <td colspan="4"><br />Num Elements<sup>L</sup><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Index Block Address<sup>O</sup><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4">Checksum</td>
+    </tr>
+
+  </table>
+
+  <table class="note">
+    <tr>
+      <td width="60%">&nbsp;</td>
+      <td width="40%">
+        (Items marked with an &lsquo;L&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfLengthsV0">Size
+          of Lengths</a> field in the superblock.)
+    </td></tr>
+    <tr>
+      <td>&nbsp;</td>
+      <td>
+        (Items marked with an &lsquo;O&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfOffsetsV0">Size
+          of Offsets</a> field in the superblock.)
+    </td></tr>
+  </table>
+
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Extensible Array Header
+    </caption>
+	<tr>
+      <th width="40%">Field Name</th>
+      <th>Description</th>
+    </tr>
+
+    <tr>
+      <td><p>Signature</p></td>
+      <td>
+        <p>The ASCII character string &ldquo;<code>EAHD</code>&rdquo;
+          is used to indicate the beginning of an Extensible Array
+          header. This gives file consistency checking utilities a
+          better chance of reconstructing a damaged file.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Version</p></td>
+      <td>
+        <p>This document describes version 0.</p>
+      </td>
+    </tr>
+
+	<tr>
+      <td><p>Client ID</p></td>
+      <td>
+        <p>The ID for identifying the client of the
+          Fixed Array:
+
+          <table class="list">
+            <tr>
+              <th width="20%" align="center">ID</th>
+              <th width="80%" align="left">Description</th>
+            </tr>
+
+            <tr>
+              <td align="center"><code>0</code></td>
+              <td>Non-filtered dataset chunks
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>1</code></td>
+              <td>Filtered dataset chunks
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>2+</code></td>
+              <td>Reserved.
+              </td>
+            </tr>
+          </table>
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Element Size</p></td>
+	  <td>
+	    <p>The size in bytes of an element in the Extensible Array.
+        </p>
+	  </td>
+    </tr>
+
+	<tr>
+	  <td><p>Max Nelmts Bits</p></td>
+	  <td>
+        <p>The number of bits needed to store the
+          maximum number of elements in the Extensible Array.</p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Index Blk Elmts</p></td>
+	  <td>
+	    <p>The number of elements to store in the index block.
+	    </p>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td><p>Data Blk Min Elmts</p></td>
+	  <td>
+	    <p>The minimum number of elements per data block.
+	    </p>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td><p>Secondary Blk Min Data Ptrs</p></td>
+	  <td>
+	    <p>The minimum number of data block pointers for a
+	      secondary block.
+	    </p>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td><p>Max Dblk Page Nelmts Bits</p></td>
+	  <td>
+	    <p>The number of bits needed to store the maximum number
+	      of elements in a data block page.
+	    </p>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td><p>Num Secondary Blks</p></td>
+	  <td>
+	    <p>The number of secondary blocks created.
+	    </p>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td><p>Secondary Blk Size</p></td>
+	  <td>
+	    <p>The size of the secondary blocks created.
+	    </p>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td><p>Num Data Blks</p></td>
+	  <td>
+	    <p>The number of data blocks created.
+	    </p>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td><p>Data Blk Size</p></td>
+	  <td>
+	    <p>The size of the data blocks created.
+	    </p>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td><p>Max Index Set</p></td>
+	  <td>
+	    <p>The maximum index set.
+	    </p>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td><p>Num Elmts</p></td>
+	  <td>
+	    <p>The number of elements realized.
+	    </p>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td><p>Index Block Address</p></td>
+	  <td>
+	    <p>The address of the index block.
+	    </p>
+	  </td>
+	</tr>
+
+    <tr>
+      <td><p>Checksum</p></td>
+      <td>
+        <p>The checksum for the header.</p>
+      </td>
+    </tr>
+
+  </table>
+</div>
+
+<br />
+<br />
+<br />
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Extensible Array Index Block
+    </caption>
+
+    <tr>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+    </tr>
+
+    <tr>
+      <td colspan="4">Signature</td>
+    </tr>
+
+    <tr>
+      <td>Version</td>
+      <td>Client ID</td>
+      <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted
+          only to align table nicely</em></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Header Address<sup>O</sup><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Elements <em>(variable size and
+          optional)</em><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Data Block Addresses <em>(variable
+          size and optional)</em><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Secondary Block Addresses <em>(variable
+          size and optional)</em><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4">Checksum</td>
+    </tr>
+
+  </table>
+
+  <table class="note">
+    <tr>
+      <td width="60%">&nbsp;</td>
+      <td width="40%">
+        (Items marked with an &lsquo;O&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfOffsetsV0">Size
+          of Offsets</a> field in the superblock.)
+    </td></tr>
+  </table>
+
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Extensible Array Index Block
+    </caption>
+	<tr>
+      <th width="40%">Field Name</th>
+      <th>Description</th>
+    </tr>
+
+    <tr>
+      <td><p>Signature</p></td>
+      <td>
+        <p>The ASCII character string &ldquo;<code>EAIB</code>&rdquo;
+          is used to indicate the beginning of an Extensible Array
+          Index Block. This gives file consistency checking utilities
+          a better chance of reconstructing a damaged file.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Version</p></td>
+      <td>
+        <p>This document describes version 0.</p>
+      </td>
+    </tr>
+
+	<tr>
+      <td><p>Client ID</p></td>
+      <td>
+        <p>The client ID for identifying the user of the
+          Extensible Array:
+
+          <table class="list">
+            <tr>
+              <th width="20%" align="center">ID</th>
+              <th width="80%" align="left">Description</th>
+            </tr>
+
+            <tr>
+              <td align="center"><code>0</code></td>
+              <td>Non-filtered dataset chunks
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>1</code></td>
+              <td>Filtered dataset chunks
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>2+</code></td>
+              <td>Reserved.
+              </td>
+            </tr>
+          </table>
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Header Address</p></td>
+	  <td>
+	    <p>The address of the Extensible Array header. Principally
+          used for file integrity checking.</p>
+	  </td>
+    </tr>
+
+	<tr>
+	  <td><p>Elements</p></td>
+	  <td>
+	    <p>Contains the elements that are stored directly in
+          the index block. An optimization to avoid unnecessary
+          secondary blocks.
+          <br />
+          <br />
+          There are two element types:
+          <table class="list">
+            <tr>
+              <th width="20%" align="center">ID</th>
+              <th width="80%" align="left">Description</th>
+            </tr>
+
+            <tr>
+              <td align="center"><code>0</code></td>
+              <td><a href="#EaNonFilterChunk">Non-filtered dataset chunks</i></a>
+</td>
+</tr>
+<tr>
+  <td align="center"><code>1</code></td>
+  <td><a href="#EaFilterChunk">Filtered dataset chunks</i></a>
+</td>
+</tr>
+</table>
+</p>
+</td>
+</tr>
+
+<tr>
+  <td><p>Data Block Addresses</p></td>
+  <td>
+    <p>Contains the addresses of the data blocks
+      that are stored directly in the Index Block. An
+      optimization to avoid unnecessary secondary blocks.</p>
+  </td>
+</tr>
+
+<tr>
+  <td><p>Secondary Block Addresses</p></td>
+  <td>
+    <p>Contains the addresses of the secondary
+      blocks.</p>
+  </td>
+</tr>
+
+<tr>
+  <td><p>Checksum</p></td>
+  <td>
+    <p>The checksum for the Extensible Array Index Block.</p>
+  </td>
+</tr>
+
+</table>
+</div>
+
+<br />
+<br />
+<br />
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Extensible Array Secondary Block
+    </caption>
+
+    <tr>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+    </tr>
+
+    <tr>
+      <td colspan="4">Signature</td>
+    </tr>
+
+    <tr>
+      <td>Version</td>
+      <td>Client ID</td>
+      <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted
+          only to align table nicely</em></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Header Address<sup>O</sup><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Block Offset <em>(variable
+          size)</em><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Page Bitmap <em>(variable size and
+          optional)</em><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Data Block Addresses <em>(variable
+          size and optional)</em><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4">Checksum</td>
+    </tr>
+
+  </table>
+
+  <table class="note">
+    <tr>
+      <td width="60%">&nbsp;</td>
+      <td width="40%">
+        (Items marked with an &lsquo;O&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfOffsetsV0">Size
+          of Offsets</a> field in the superblock.)
+    </td></tr>
+  </table>
+
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Extensible Array Secondary Block
+    </caption>
+	<tr>
+      <th width="40%">Field Name</th>
+      <th>Description</th>
+    </tr>
+
+    <tr>
+      <td><p>Signature</p></td>
+      <td>
+        <p>The ASCII character string &ldquo;<code>EASB</code>&rdquo;
+          is used to indicate the beginning of an Extensible Array
+          Secondary Block. This gives file consistency checking utilities
+          a better chance of reconstructing a damaged file.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Version</p></td>
+      <td>
+        <p>This document describes version 0.</p>
+      </td>
+    </tr>
+
+	<tr>
+      <td><p>Client ID</p></td>
+      <td>
+        <p>The ID for identifying the client of the
+          Extensible Array:
+
+          <table class="list">
+            <tr>
+              <th width="20%" align="center">ID</th>
+              <th width="80%" align="left">Description</th>
+            </tr>
+
+            <tr>
+              <td align="center"><code>0</code></td>
+              <td>Non-filtered dataset chunks
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>1</code></td>
+              <td>Filtered dataset chunks
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>2+</code></td>
+              <td>Reserved.
+              </td>
+            </tr>
+          </table>
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Header Address</p></td>
+	  <td>
+	    <p>The address of the Extensible Array header. Principally
+          used for file integrity checking.</p>
+	  </td>
+    </tr>
+
+    <tr>
+      <td><p>Block Offset</p></td>
+	  <td>
+	    <p>Stores the offset of the block in the array.
+        </p>
+	  </td>
+    </tr>
+
+	<tr>
+	  <td><p>Page Bitmap</p></td>
+	  <td>
+        <p>A bitmap indicating which
+          data block pages are initialized.
+	    <p>
+	      Exists only if the data block is paged.
+      </td>
+	</tr>
+
+    <tr>
+      <td><p>Data Block Addresses</p></td>
+      <td>
+        <p>Contains the addresses of the data blocks
+          referenced by this secondary block.</p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Checksum</p></td>
+      <td>
+        <p>The checksum for the Extensible Array
+          Secondary Block.</p>
+      </td>
+    </tr>
+
+  </table>
+</div>
+
+<br />
+<br />
+<br />
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Extensible Array Data Block
+    </caption>
+
+    <tr>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+    </tr>
+
+    <tr>
+      <td colspan="4">Signature</td>
+    </tr>
+
+    <tr>
+      <td>Version</td>
+      <td>Client ID</td>
+      <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted
+          only to align table nicely</em></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Header Address<sup>O</sup><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Block Offset <em>(variable
+          size)</em><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Elements <em>(variable size and
+          optional)</em><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4">Checksum</td>
+    </tr>
+
+  </table>
+
+  <table class="note">
+    <tr>
+      <td width="60%">&nbsp;</td>
+      <td width="40%">
+        (Items marked with an &lsquo;O&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfOffsetsV0">Size
+          of Offsets</a> field in the superblock.)
+    </td></tr>
+  </table>
+
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Extensible Array Data Block
+    </caption>
+	<tr>
+      <th width="40%">Field Name</th>
+      <th>Description</th>
+    </tr>
+
+    <tr>
+      <td><p>Signature</p></td>
+      <td>
+        <p>The ASCII character string &ldquo;<code>EADB</code>&rdquo;
+          is used to indicate the beginning of an Extensible Array
+          data block. This gives file consistency checking utilities
+          a better chance of reconstructing a damaged file.
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Version</p></td>
+      <td>
+        <p>This document describes version 0.</p>
+      </td>
+    </tr>
+
+	<tr>
+      <td><p>Client ID</p></td>
+      <td>
+        <p>The ID for identifying the client of the
+          Extensible Array:
+
+          <table class="list">
+            <tr>
+              <th width="20%" align="center">ID</th>
+              <th width="80%" align="left">Description</th>
+            </tr>
+
+            <tr>
+              <td align="center"><code>0</code></td>
+              <td>Non-filtered dataset chunks
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>1</code></td>
+              <td>Filtered dataset chunks
+              </td>
+            </tr>
+            <tr>
+              <td align="center"><code>2+</code></td>
+              <td>Reserved.
+              </td>
+            </tr>
+          </table>
+        </p>
+      </td>
+    </tr>
+
+    <tr>
+      <td><p>Header Address</p></td>
+	  <td>
+	    <p>The address of the Extensible Array header. Principally
+          used for file integrity checking.
+        </p>
+	  </td>
+    </tr>
+
+	<tr>
+	  <td><p>Block Offset</p></td>
+	  <td>
+        <p>The offset of the block in the array.
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Elements</p></td>
+	  <td>
+	    <p>Contains the elements stored in the data block and
+		  exists only if the data block is not paged.
+          <br />
+          <br />
+	      There are two element types:
+          <table class="list">
+            <tr>
+              <th width="20%" align="center">ID</th>
+              <th width="80%" align="left">Description</th>
+            </tr>
+
+            <tr>
+              <td align="center"><code>0</code></td>
+              <td><a href="#EaNonFilterChunk">Non-filtered dataset chunks</i></a>
+</td>
+</tr>
+<tr>
+  <td align="center"><code>1</code></td>
+  <td><a href="#EaFilterChunk">Filtered dataset chunks</i></a>
+</td>
+</tr>
+</table>
+</p>
+</td>
+</tr>
+
+<tr>
+  <td><p>Checksum</p></td>
+  <td>
+    <p>The checksum for the Extensible Array data block.</p>
+  </td>
+</tr>
+
+</table>
+</div>
+
+<br />
+<br />
+<br />
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Extensible Array Data Block Page
+    </caption>
+
+    <tr>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+      <th>byte</th>
+    </tr>
+
+    <tr>
+      <td colspan="4"><br />Elements <em>(variable
+          size)</em><br /><br /></td>
+    </tr>
+
+    <tr>
+      <td colspan="4">Checksum</td>
+    </tr>
+
+  </table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Extensible Array Data Block Page
+    </caption>
+	<tr>
+      <th width="40%">Field Name</th>
+      <th>Description</th>
+    </tr>
+
+	<tr>
+	  <td><p>Elements</p></td>
+	  <td>
+	    <p>Contains the elements stored in the data block
+          page.</p>
+        <p>
+	      There are two element types:
+          <table class="list">
+            <tr>
+              <th width="20%" align="center">ID</th>
+              <th width="80%" align="left">Description</th>
+            </tr>
+
+            <tr>
+              <td align="center"><code>0</code></td>
+              <td><a href="#EaNonFilterChunk">Non-filtered dataset chunks</i></a>
+</td>
+</tr>
+<tr>
+  <td align="center"><code>1</code></td>
+  <td><a href="#EaFilterChunk">Filtered dataset chunks</i></a>
+</td>
+</tr>
+</table>
+</p>
+</td>
+</tr>
+
+<tr>
+  <td><p>Checksum</p></td>
+  <td>
+    <p>The checksum for an Extensible Array data block
+      page.</p>
+  </td>
+</tr>
+
+</table>
+</div>
+
+<br />
+<br />
+<br />
+<a name="EaNonFilterChunk"></a>
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Data Block Element for Non-filtered Dataset Chunk
+    </caption>
+
+	<tr>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><br />Address<sup>O</sup><br /><br /></td>
+	</tr>
+
+  </table>
+
+  <table class="note">
+    <tr><td>
+        <tr>
+          <td width="60%">&nbsp;</td>
+          <td width="40%">
+            (Items marked with an &lsquo;O&rsquo; in the above table are
+            of the size specified in the <a href="#SizeOfOffsetsV0">Size
+              of Offsets</a> field in the superblock.)
+        </td></tr>
+  </table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Data Block Element for Non-filtered Dataset Chunk
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td><p>Address</p></td>
+	  <td><p>The address of the dataset chunk in the file.
+        </p>
+      </td>
+	</tr>
+
+  </table>
+</div>
+</p>
+
+<br />
+<br />
+<br />
+<a name="EaFilterChunk"></a>
+<div align="center">
+  <table class="format">
+    <caption>
+      Layout: Data Block Element for Filtered Dataset Chunk
+    </caption>
+
+	<tr>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	  <th width="25%">byte</th>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><br />Address<sup>O</sup><br /><br /></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4"><br />Chunk Size<em> (variable size; at
+          most 8 bytes)</em><br /><br /></td>
+	</tr>
+
+	<tr>
+	  <td colspan="4">Filter Mask</td>
+	</tr>
+
+  </table>
+
+  <table class="note">
+    <tr>
+      <td width="60%">&nbsp;</td>
+      <td width="40%">
+        (Items marked with an &lsquo;O&rsquo; in the above table are
+        of the size specified in the <a href="#SizeOfOffsetsV0">Size
+          of Offsets</a> field in the superblock.)
+    </td></tr>
+  </table>
+</div>
+
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Data Block Element for Filtered Dataset Chunk
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td><p>Address</p></td>
+	  <td><p>The address of the dataset chunk in the file.
+        </p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Chunk Size</p></td>
+	  <td><p>The size of the dataset chunk in bytes.
+        </p>
+      </td>
+	</tr>
+
+	<tr>
+	  <td><p>Filter Mask</p></td>
+	  <td><p>Indicates the filter to skip for the dataset chunk.
+          Each filter has an index number in the pipeline; if that
+          filter is skipped, the bit corresponding to its index is set.
+        </p>
+      </td>
+	</tr>
+
+  </table>
+</div>
+
+<a name="AppendV2Btrees">
+  <h3>VII.E. The Version 2 B-trees Index</h3></a>
+
+<p>The <i>Version 2 B-trees</i> index can be used when the dataset
+  fulfills the following condition:</p>
+
+<ul>
+  <li>more than one dimension of unlimited extent</li>
+</ul>
+
+<p>Version 2 B-trees can be used to index various objects in the
+  library. See <a href="#V2Btrees">&ldquo;Version 2 B-trees&rdquo;</a>
+  for more information. The B-tree types <a href="#V2BtType10">10</a>
+  and <a href="#V2BtreesType11">11</a> record layouts are for
+  indexing dataset chunks.</p>
+
+<h2><a name="AppendixD"> VIII. Appendix D:
+    Encoding for dataspace and reference</a></h2>
+
+<a name="DataspaceEncode">
+  <h3>VIII.A. Dataspace Encoding </h3></a>
+<i>H5Sencode</i> is a public routine that encodes a dataspace description into a buffer while
+<i>H5Sdecode</i> is the corresponding routine that decodes the description encoded in the buffer.
+<p>
+  See the reference manual description for these two public routines.
+
+  <br />
+  <br />
+  <br />
+  <div align="center">
+    <table class="format">
+      <caption>
+        Layout: Dataspace Description for H5Sencode/H5Sdecode
+      </caption>
+
+      <tr>
+        <th>byte</th>
+        <th>byte</th>
+        <th>byte</th>
+        <th>byte</th>
+      </tr>
+
+      <tr>
+        <td>Dataspace ID</td>
+        <td>Encode Version</td>
+        <td>Size of Size</td>
+        <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted
+            only to align table nicely</em></td>
+      </tr>
+
+      <tr>
+        <td colspan="4"><br />Size of Extent
+          <br /><br /></td>
+      </tr>
+
+      <tr>
+        <td colspan="4"><br /><br />Dataspace Message
+          <em>(variable size)</em>
+          <br /><br /></td>
+      </tr>
+
+      <tr>
+        <td colspan="4"><br /><br />Dataspace Selection
+          <em>(variable size)</em>
+          <br /><br /></td>
+      </tr>
+
+    </table>
+
+  </div>
+
+  <br />
+  <br />
+  <div align="center">
+    <table class="desc">
+      <caption>
+        Fields: Dataspace Description for H5Sencode/H5Sdecode
+      </caption>
+	  <tr>
+        <th width="40%">Field Name</th>
+        <th>Description</th>
+      </tr>
+
+      <tr>
+        <td><p>Dataspace ID</p></td>
+        <td>
+          <p>The datspace message ID which is 1.</p>
+        </td>
+      </tr>
+
+	  <tr>
+        <td><p>Encode Version</p></td>
+        <td>
+          <p>H5S_ENCODE_VERSION which is 0.
+          </p>
+        </td>
+      </tr>
+
+      <tr>
+        <td><p>Size of Size</p></td>
+	    <td>
+	      <p>The number of bytes used to store the size of an object.
+          </p>
+	    </td>
+      </tr>
+
+      <tr>
+        <td><p>Size of Extent</p></td>
+	    <td>
+	      <p>Size of the dataspace message.
+          </p>
+	    </td>
+      </tr>
+
+      <tr>
+        <td><p>Dataspace Message</p></td>
+	    <td>
+	      <p>The dataspace message information.  See
+            <a href="#DataspaceMessage">Dataspace Message.</a></p>
+</p>
+</td>
+</tr>
+
+<tr>
+  <td><p>Dataspace Selection</p></td>
+  <td>
+    <p>The dataspace selection information.  See
+      <a href="#DataspaceSEL">Dataspace Selection.</a></p>
+  </td>
+</tr>
+
+</table>
+</div>
+
+
+<br />
+<br />
+<br />
+<a name="DataspaceSEL"></a>
+  <div align="center">
+    <table class="format">
+	  <caption>
+	    Layout: Dataspace Selection
+	  </caption>
+
+	  <tr>
+	    <th width="25%">byte</th>
+	    <th width="25%">byte</th>
+	    <th width="25%">byte</th>
+	    <th width="25%">byte</th>
+	  </tr>
+
+	  <tr>
+	    <td colspan="4">Selection Type</td>
+	  </tr>
+	  <tr>
+        <td colspan="4"><br />Selection Info (<em>variable
+            size</em>)<br /><br /></td>
+      </tr>
+
+    </table>
+  </div>
+
+  <br />
+  <br />
+  <div align="center">
+    <table class="desc">
+	  <caption>
+	    Fields: Dataspace Selection
+	  </caption>
+	  <tr>
+        <th width="30%">Field Name</th>
+        <th>Description</th>
+	  </tr>
+
+	  <tr>
+	    <td><p>Selection Type</p></td>
+	    <td>
+	      <p>There are 4 types of selection:
+	        <table class="list">
+		      <tr>
+		        <th width="20%" align="center">Value</th>
+		        <th width="80%" align="left">Description</th>
+		      </tr>
+
+		      <tr>
+		        <td align="center"><code>0</code></td>
+		        <td>H5S_SEL_NONE: Nothing selected
+                </td>
+		      </tr>
+
+		      <tr>
+		        <td align="center"><code>1</code></td>
+		        <td>H5S_SEL_POINTS: Sequence of points selected
+                </td>
+		      </tr>
+
+		      <tr>
+		        <td align="center"><code>2</code></td>
+		        <td>H5S_SEL_HYPER: Hyperslab selected
+                </td>
+		      </tr>
+
+		      <tr>
+		        <td align="center"><code>3</code></td>
+		        <td>H5S_SEL_ALL: Entire extent selected
+                </td>
+		      </tr>
+	        </table>
+        </td>
+
+	  </tr>
+
+	  <tr>
+	    <td><p>Selection Info</p></td>
+	    <td>
+	      <p>There are 4 types of selection info:
+	        <table class="list">
+		      <tr>
+		        <th width="20%" align="center">Value</th>
+		        <th width="80%" align="left">Description</th>
+		      </tr>
+		      <tr>
+		        <td align="center"><code>0</code></td>
+		        <td>Selection info for <a href="#SelNONE">H5S_SEL_NONE</a>
+                </td>
+		      </tr>
+
+		      <tr>
+		        <td align="center"><code>1</code></td>
+		        <td>Selection info for <a href="#SelPOINTS">H5S_SEL_POINTS</a>
+                </td>
+		      </tr>
+
+		      <tr>
+		        <td align="center"><code>2</code></td>
+		        <td>Selection info for <a href="#SelHYPER">H5S_SEL_HYPER</a>
+                </td>
+		      </tr>
+
+		      <tr>
+		        <td align="center"><code>3</code></td>
+		        <td>Selection for <a href="#SelALL">H5S_SEL_ALL</a>
+                </td>
+		      </tr>
+	        </table>
+        </td>
+
+	  </tr>
+    </table>
+  </div>
+
+
+  <br />
+  <br />
+  <br />
+<a name="SelNONE"/></a>
+    <div align="center">
+      <table class="format">
+	    <caption>
+	      Layout: Selection Info for H5S_SEL_NONE
+	    </caption>
+
+	    <tr>
+	      <th width="25%">byte</th>
+	      <th width="25%">byte</th>
+	      <th width="25%">byte</th>
+	      <th width="25%">byte</th>
+	    </tr>
+
+	    <tr>
+	      <td colspan="4">Version</td>
+	    </tr>
+	    <tr>
+	      <td colspan="4"><br />Reserved <em>(zero, 8 bytes)</em><br /><br /></td>
+	    </tr>
+
+      </table>
+    </div>
+
+    <br />
+    <br />
+    <div align="center">
+      <table class="desc">
+	    <caption>
+          Fields: Selection Info for H5S_SEL_NONE
+	    </caption>
+	    <tr>
+          <th width="30%">Field Name</th>
+          <th>Description</th>
+	    </tr>
+
+	    <tr>
+	      <td><p>Version</p></td>
+	      <td><p>The version number for the H5S_SEL_NONE Selection Info.
+              The value is 1.</p></td>
+	    </tr>
+      </table>
+    </div>
+
+
+    <br />
+    <br />
+    <br />
+    <a name="SelPOINTS"></a>
+      <div align="center">
+        <table class="format">
+	      <caption>
+	        Layout: Selection Info for H5S_SEL_POINTS
+	      </caption>
+
+	      <tr>
+	        <th width="25%">byte</th>
+	        <th width="25%">byte</th>
+	        <th width="25%">byte</th>
+	        <th width="25%">byte</th>
+	      </tr>
+
+	      <tr>
+	        <td colspan="4">Version</td>
+	      </tr>
+	      <tr>
+            <td colspan="4"><br /><br />Points Selection Info <em>(variable size)</em>
+              <br /><br /><br /></td>
+	      </tr>
+
+        </table>
+      </div>
+
+      <br />
+      <br />
+      <div align="center">
+        <table class="desc">
+	      <caption>
+	        Fields: Selection Info for H5S_SEL_POINTS
+	      </caption>
+	      <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+	      </tr>
+
+	      <tr>
+	        <td><p>Version</p></td>
+	        <td><p>The version number for the H5S_SEL_POINTS Selection Info.
+                The value is either 1 or 2.</p></td>
+	      </tr>
+
+	      <tr>
+	        <td><p>Points Selection Info</p></td>
+	        <td><p>Depending on <em>version</em>:
+	            <table class="list">
+		          <tr>
+		            <th width="20%" align="center">Version</th>
+		            <th width="80%" align="left">Description</th>
+		          </tr>
+
+		          <tr>
+		            <td align="center"><code>1</code></td>
+		            <td>See <a href="#SelPOINTSV1">Version 1 Points Selection Info</a>
+                    </td>
+		          </tr>
+
+		          <tr>
+		            <td align="center"><code>2</code></td>
+		            <td>See <a href="#SelPOINTSV2">Version 2 Points Selection Info</a>
+                    </td>
+		          </tr>
+
+	            </table>
+	        </td>
+	      </tr>
+
+        </table>
+      </div>
+
+      <br />
+      <br />
+      <br />
+      <a name="SelPOINTSV1"></a>
+        <div align="center">
+          <table class="format">
+	        <caption>
+	          Layout: Version 1 Points Selection Info
+	        </caption>
+
+	        <tr>
+	          <th width="25%">byte</th>
+	          <th width="25%">byte</th>
+	          <th width="25%">byte</th>
+	          <th width="25%">byte</th>
+	        </tr>
+
+	        <tr>
+              <td colspan="4">Reserved <em>(zero)</em></td>
+	        </tr>
+
+	        <tr>
+	          <td colspan="4">Length</td>
+	        </tr>
+	        <tr>
+	          <td colspan="4">Rank</td>
+	        </tr>
+	        <tr>
+	          <td colspan="4">Num Points</td>
+	        </tr>
+	        <tr>
+	          <td colspan="4">Point #1: coordinate #1</td>
+	        </tr>
+	        <tr>
+	          <td colspan="4">.<br />.<br />.<br /></td>
+	        </tr>
+	        <tr>
+	          <td colspan="4">Point #1: coordinate #u</td>
+	        </tr>
+	        <tr>
+	          <td colspan="4">.<br />.<br />.<br /></td>
+	        </tr>
+	        <tr>
+	          <td colspan="4">Point #n: coordinate #1</td>
+	        </tr>
+	        <tr>
+	          <td colspan="4">.<br />.<br />.<br /></td>
+	        </tr>
+	        <tr>
+	          <td colspan="4">Point #n: coordinate #u</td>
+	        </tr>
+
+          </table>
+        </div>
+
+        <br />
+        <br />
+        <div align="center">
+          <table class="desc">
+	        <caption>
+	          Fields: Version 1 Points Selection Info
+	        </caption>
+	        <tr>
+              <th width="30%">Field Name</th>
+              <th>Description</th>
+	        </tr>
+
+	        <tr>
+	          <td><p>Length</p></td>
+	          <td><p>The size in bytes from <em>Length</em> to the end of the
+                  selection info.</td>
+	        </tr>
+
+	        <tr>
+	          <td><p>Rank</p></td>
+	          <td><p>The number of dimensions.</p></td>
+	        </tr>
+	        <tr>
+	          <td><p>Num Points</p></td>
+	          <td><p>The number of points in the selection.</p></td>
+	        </tr>
+	        <tr>
+	          <td><p>Point #n: coordinate #u</p></td>
+	          <td><p>The array of points in the selection.
+                <p>The points selected are #1 to #n where n is <em>Num Points</em>.
+                <p>The list of coordinates for each point are #1 to #u where u is
+                  <em>Rank</em>.</p></td>
+	        </tr>
+          </table>
+        </div>
+
+
+        <br />
+        <br />
+        <br />
+        <a name="SelPOINTSV2"></a>
+          <div align="center">
+            <table class="format">
+	          <caption>
+	            Layout: Version 2 Points Selection Info
+	          </caption>
+
+	          <tr>
+	            <th width="25%">byte</th>
+	            <th width="25%">byte</th>
+	            <th width="25%">byte</th>
+	            <th width="25%">byte</th>
+	          </tr>
+
+	          <tr>
+                <td colspan="1">Encode Size</td>
+                <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted only to align table nicely</em>
+                </td>
+	          </tr>
+
+	          <tr>
+	            <td colspan="4">Rank</td>
+	          </tr>
+	          <tr>
+	            <td colspan="4">Num Points<p>(2, 4 or 8 bytes)<br /></td>
+	          </tr>
+              <tr>
+                <td colspan="4">Point #1: coordinate #1<p>(2, 4 or 8 bytes)<br /></td>
+              </tr>
+              <tr>
+                <td colspan="4">.<br />.<br />.<br /></td>
+              </tr>
+              <tr>
+                <td colspan="4">Point #1: coordinate #u<p>(2, 4 or 8 bytes)<br /></td>
+              </tr>
+              <tr>
+                <td colspan="4">.<br />.<br />.<br /></td>
+              </tr>
+              <tr>
+                <td colspan="4">Point #n: coordinate #1 <p>(2, 4 or 8 bytes)<br /></td>
+              </tr>
+              <tr>
+                <td colspan="4">.<br />.<br />.<br /></td>
+              </tr>
+              <tr>
+                <td colspan="4">Point #n: coordinate #u<p>(2, 4 or 8 bytes)<br /></td>
+              </tr>
+
+            </table>
+          </div>
+
+          <br />
+          <br />
+          <div align="center">
+            <table class="desc">
+	          <caption>
+	            Fields: Version 2 Points Selection Info
+	          </caption>
+	          <tr>
+                <th width="30%">Field Name</th>
+                <th>Description</th>
+	          </tr>
+
+	          <tr>
+	            <td><p>Encode Size</td>
+	            <td><p>The size for encoding the points selection info which can be 2, 4 or 8 bytes.
+                </td>
+	          </tr>
+
+	          <tr>
+	            <td><p>Rank</p></td>
+	            <td><p>The number of dimensions.</p></td>
+	          </tr>
+	          <tr>
+	            <td><p>Num Points</p></td>
+	            <td><p>The number of points in the selection.
+                  <p>The field <em>Encode Size</em> indicates the size of this field</p></td>
+	          </tr>
+	          <tr>
+	            <td><p>Point #n: coordinate #u</p></td>
+	            <td><p>The array of points in the selection.
+                  <p>The points selected are #1 to #n where n is <em>Num Points</em>.
+                  <p>The list of coordinates for each point are #1 to #u where u is
+                    <em>Rank</em>.
+                  <p>The field <em>Encode Size</em> indicates the size of this field</p></td>
+	          </tr>
+            </table>
+          </div>
+
+
+          <br />
+          <br />
+          <br />
+          <a name="SelHYPER"></a>
+            <div align="center">
+              <table class="format">
+	            <caption>
+	              Layout: Selection Info for H5S_SEL_HYPER
+	            </caption>
+
+	            <tr>
+	              <th width="25%">byte</th>
+	              <th width="25%">byte</th>
+	              <th width="25%">byte</th>
+	              <th width="25%">byte</th>
+	            </tr>
+
+	            <tr>
+	              <td colspan="4">Version</td>
+	            </tr>
+	            <tr>
+                  <td colspan="4"><br />Hyperslab Selection Info
+                    (<em>variable size</em>)<br /><br /></td>
+                </tr>
+
+              </table>
+            </div>
+
+            <br />
+            <br />
+            <div align="center">
+              <table class="desc">
+	            <caption>
+	              Fields: Selection Info for H5S_SEL_HYPER
+	            </caption>
+	            <tr>
+                  <th width="30%">Field Name</th>
+                  <th>Description</th>
+	            </tr>
+
+	            <tr>
+	              <td><p>Version</p></td>
+	              <td><p>The version number for the H5S_SEL_HYPER selection info.
+	                  The value is 1, 2 or 3.</p></td>
+	            </tr>
+
+	            <tr>
+	              <td><p>Hyperslab Selection Info</p></td>
+	              <td><p>Depending on <em>version</em>:
+	                  <table class="list">
+		                <tr>
+		                  <th width="20%" align="center">Version</th>
+		                  <th width="80%" align="left">Description</th>
+		                </tr>
+
+		                <tr>
+		                  <td align="center"><code>1</code></td>
+		                  <td>See <a href="#SelHYPERV1">Version 1 Hyperslab Selection Info</a>.
+                          </td>
+		                </tr>
+
+		                <tr>
+		                  <td align="center"><code>2</code></td>
+		                  <td>See <a href="#SelHYPERV2">Version 2 Hyperslab Selection Info</a>
+                          </td>
+		                </tr>
+
+		                <tr>
+		                  <td align="center"><code>3</code></td>
+		                  <td>See <a href="#SelHYPERV3">Version 3 Hyperslab Selection Info</a>
+                          </td>
+		                </tr>
+	                  </table>
+	              </td>
+	            </tr>
+
+              </table>
+            </div>
+
+            <br />
+            <br />
+            <br />
+            <a name="SelHYPERV1"></a>
+              <div align="center">
+                <table class="format">
+	              <caption>
+	                Layout: Version 1 Hyperslab Selection Info
+	              </caption>
+
+	              <tr>
+	                <th width="25%">byte</th>
+	                <th width="25%">byte</th>
+	                <th width="25%">byte</th>
+	                <th width="25%">byte</th>
+	              </tr>
+
+	              <tr>
+                    <td colspan="4">Reserved</td>
+	              </tr>
+	              <tr>
+	                <td colspan="4">Length</td>
+	              </tr>
+	              <tr>
+	                <td colspan="4">Rank</td>
+	              </tr>
+	              <tr>
+	                <td colspan="4">Num Blocks</td>
+	              </tr>
+	              <tr>
+	                <td colspan="4">Starting Offset #1 for Block #1</td>
+                  </tr>
+	              <tr>
+	                <td colspan="4">.<br />.<br />.<br /></td>
+	              </tr>
+	              <tr>
+	                <td colspan="4">Starting Offset #n for Block #1</td>
+                  </tr>
+
+	              <tr>
+	                <td colspan="4">Ending Offset #1 for Block #1</td>
+                  </tr>
+	              <tr>
+	                <td colspan="4">.<br />.<br />.<br /></td>
+	              </tr>
+	              <tr>
+	                <td colspan="4">Ending Offset #n for Block #1</td>
+                  </tr>
+
+	              <tr>
+	                <td colspan="4">.<br />.<br />.<br /></td>
+	              </tr>
+	              <tr>
+	                <td colspan="4">.<br />.<br />.<br /></td>
+	              </tr>
+	              <tr>
+	                <td colspan="4">.<br />.<br />.<br /></td>
+	              </tr>
+
+	              <tr>
+	                <td colspan="4">Starting Offset #1 for Block #u</td>
+                  </tr>
+	              <tr>
+	                <td colspan="4">.<br />.<br />.<br /></td>
+	              </tr>
+	              <tr>
+	                <td colspan="4">Starting Offset #n for Block #u</td>
+                  </tr>
+
+	              <tr>
+	                <td colspan="4">Ending Offset #1 for Block #u</em></td>
+</tr>
+<tr>
+  <td colspan="4">.<br />.<br />.<br /></td>
+</tr>
+<tr>
+  <td colspan="4">Ending Offset #n for Block #u</td>
+</tr>
+
+</table>
+</div>
+
+<br />
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Version 1 Hyperslab Selection Info
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td><p>Length</p></td>
+	  <td><p>The size in bytes from the field <em>Rank</em> to the
+          end of the Selection Info.</td>
+	</tr>
+
+	<tr>
+	  <td><p>Rank</p></td>
+	  <td><p>The number of dimensions in the dataspace.</p></td>
+	</tr>
+
+	<tr>
+	  <td><p>Num Blocks</p></td>
+	  <td><p>The number of blocks in the selection.</p></td>
+	</tr>
+
+    <tr>
+      <td><p>Starting Offset #n for Block #u</p></td>
+      <td><p>The offset #n of the starting element in block #u.
+        <p>#n is from 1 to <em>Rank</em>.
+        <p>#u is from 1 to <em>Num Blocks</em> moving from the fastest
+          changing dimension to the slowest changing dimension.
+      </p></td>
+    </tr>
+
+    <tr>
+      <td><p>Ending Offset #n for Block #u</p></td>
+      <td><p>The offset #n of the ending element in block #u.
+        <p>#n is from 1 to <em>Rank</em>.
+        <p>#u is from 1 to <em>Num Blocks</em> moving from the fastest
+          changing dimension to the slowest changing dimension.
+      </p></td>
+    </tr>
+
+  </table>
+</div>
+
+<br />
+<br />
+<br />
+<a name="SelHYPERV2"></a>
+  <div align="center">
+    <table class="format">
+	  <caption>
+	    Layout: Version 2 Hyperslab Selection Info
+	  </caption>
+
+	  <tr>
+	    <th width="25%">byte</th>
+	    <th width="25%">byte</th>
+	    <th width="25%">byte</th>
+	    <th width="25%">byte</th>
+	  </tr>
+
+	  <tr>
+	    <td>Flags</td>
+        <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted
+            only to align table nicely</em></td>
+	  </tr>
+	  <tr>
+	    <td colspan="4">Length</td>
+	  </tr>
+	  <tr>
+	    <td colspan="4">Rank</td>
+	  </tr>
+	  <tr>
+	    <td colspan="4">Start #1 <em>(8 bytes)</em><p></td>
+      </tr>
+	  <tr>
+	    <td colspan="4">Stride #1 <em>(8 bytes)</em><p></td>
+      </tr>
+	  <tr>
+	    <td colspan="4">Count #1 <em>(8 bytes)</em><p></td>
+      </tr>
+	  <tr>
+	    <td colspan="4">Block #1 <em>(8 bytes)</em><p></td>
+      </tr>
+	  <tr>
+	    <td colspan="4">.<br />.<br />.<br /></td>
+	  </tr>
+	  <tr>
+	    <td colspan="4">Start #n <em>(8 bytes)</em><p></td>
+      </tr>
+
+	  <tr>
+	    <td colspan="4">Stride #n <em>(8 bytes)</em><p></td>
+      </tr>
+	  <tr>
+	    <td colspan="4">Count #n <em>(8 bytes)</em><p></td>
+      </tr>
+	  <tr>
+	    <td colspan="4">Block #n <em>(8 bytes)</em><p></td>
+      </tr>
+
+    </table>
+  </div>
+
+  <br />
+  <br />
+  <div align="center">
+    <table class="desc">
+      <caption>
+	    Fields: Version 2 Hyperslab Selection Info
+      </caption>
+	  <tr>
+        <th width="30%">Field Name</th>
+        <th>Description</th>
+	  </tr>
+
+	  <tr>
+	    <td><p>Flags</p></td>
+	    <td><p>This is a bit field with the following definition.
+            Currently, this is always set to 0x1.
+          <p>
+            <table class="list">
+              <tr>
+                <th width="20%" align="center">Bit</th>
+                <th width="80%" align="left">Description</th>
+              </tr>
+              <tr>
+                <td align="center"><code>0</code></td>
+                <td>If set, it is a regular hyperslab, otherwise, irregular.
+                </td>
+              </tr>
+
+            </table>
+        </td>
+
+	  </tr>
+
+	  <tr>
+	    <td><p>Length</p></td>
+	    <td><p>The size in bytes from the field <em>Rank</em> to the
+            end of the Selection Info.</td>
+	  </tr>
+
+	  <tr>
+	    <td><p>Rank</p></td>
+	    <td><p>The number of dimensions in the dataspace.</td>
+	  </tr>
+
+      <tr>
+        <td><p>Start #n</p></td>
+        <td><p>The offset of the starting element in the block.
+          <p>#n is from 1 to <em>Rank</em>.
+        </p></td>
+      </tr>
+
+      <tr>
+        <td><p>Stride #n</p></td>
+        <td><p>The number of elements to move in each dimension.
+          <p>#n is from 1 to <em>Rank</em>.
+        </p></td>
+      </tr>
+
+      <tr>
+        <td><p>Count #n</p></td>
+        <td><p>The number of blocks to select in each dimension.
+          <p>#n is from 1 to <em>Rank</em>.
+        </p></td>
+      </tr>
+
+      <tr>
+        <td><p>Block #n</p></td>
+        <td><p>The size (in elements) of each block in each dimension.
+          <p>#n is from 1 to <em>Rank</em>.
+        </p></td>
+      </tr>
+    </table>
+  </div>
+
+
+
+
+  <br />
+  <br />
+  <br />
+  <a name="SelHYPERV3"></a>
+    <div align="center">
+      <table class="format">
+	    <caption>
+	      Layout: Version 3 Hyperslab Selection Info
+	    </caption>
+
+	    <tr>
+	      <th width="25%">byte</th>
+	      <th width="25%">byte</th>
+	      <th width="25%">byte</th>
+	      <th width="25%">byte</th>
+	    </tr>
+
+	    <tr>
+	      <td>Flags</td>
+	      <td>Encode Size</td>
+          <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted
+              only to align table nicely</em></td>
+	    </tr>
+	    <tr>
+	      <td colspan="4">Rank</td>
+	    </tr>
+	    <tr>
+	      <td colspan="4"><br />Regular/Irregular Hyperslab Selection Info
+            <p><em>(variable size)</em><br /><br/></td>
+	    </tr>
+
+      </table>
+    </div>
+
+    <br />
+    <br />
+    <div align="center">
+      <table class="desc">
+        <caption>
+	      Fields: Version 3 Hyperslab Selection Info
+        </caption>
+	    <tr>
+          <th width="30%">Field Name</th>
+          <th>Description</th>
+	    </tr>
+
+	    <tr>
+	      <td><p>Flags</p></td>
+	      <td><p>This is a bit field with the following definition:
+            <p>
+              <table class="list">
+                <tr>
+                  <th width="20%" align="center">Bit</th>
+                  <th width="80%" align="left">Description</th>
+                </tr>
+                <tr>
+                  <td align="center"><code>0</code></td>
+                  <td>If set, it is a regular hyperslab, otherwise, irregular.
+                  </td>
+                </tr>
+
+              </table>
+          </td>
+	    </tr>
+
+	    <tr>
+	      <td><p>Encode Size</p></td>
+	      <td><p>The size for encoding hyperslab selection info, which can 2, 4 or 8 bytes.</td>
+	    </tr>
+
+	    <tr>
+	      <td><p>Rank</p></td>
+	      <td><p>The number of dimensions in the dataspace.</td>
+	    </tr>
+
+	    <tr>
+	      <td><p>Regular/Irregular Hyperslab Selection Info</p></td>
+	      <td><p>This is the selection info for version 3 hyperslab which can be regular or irregular.
+            <p>If bit 0 of the field <em>Flags</em> is set,
+              See <a href="#SelHYPERV3REG">Version 3 Regular Hyperslab Selection Info</a>
+            <p>Otherwise, see <a href="#SelHYPERV3IRREG">Version 3 Irregular Hyperslab Selection Info</a>
+          </td>
+
+	    </tr>
+
+      </table>
+    </div>
+
+
+    <br />
+    <br />
+    <br />
+    <a name="SelHYPERV3REG"></a>
+      <div align="center">
+        <table class="format">
+	      <caption>
+	        Layout: Version 3 Regular Hyperslab Selection Info
+	      </caption>
+
+	      <tr>
+	        <th width="25%">byte</th>
+	        <th width="25%">byte</th>
+	        <th width="25%">byte</th>
+	        <th width="25%">byte</th>
+	      </tr>
+
+	      <tr>
+	        <td colspan="4">Start #1 <p><em>(2, 4 or 8 bytes)</em><p></td>
+          </tr>
+	      <tr>
+	        <td colspan="4">Stride #1 <p><em>(2, 4 or 8 bytes)</em><p></td>
+          </tr>
+	      <tr>
+	        <td colspan="4">Count #1 <p><em>(2, 4 or 8 bytes)</em><p></td>
+          </tr>
+	      <tr>
+	        <td colspan="4">Block #1 <p><em>(2, 4 or 8 bytes)</em><p></td>
+          </tr>
+	      <tr>
+	        <td colspan="4">.<br />.<br />.<br /></td>
+	      </tr>
+	      <tr>
+	        <td colspan="4">Start #n <p><em>(2, 4 or 8 bytes)</em><p></td>
+          </tr>
+
+	      <tr>
+	        <td colspan="4">Stride #n <p><em>(2, 4 or 8 bytes)</em><p></td>
+          </tr>
+	      <tr>
+	        <td colspan="4">Count #n <p><em>(2, 4 or 8 bytes)</em><p></td>
+          </tr>
+	      <tr>
+	        <td colspan="4">Block #n <p><em>(2, 4 or 8 bytes)</em><p></td>
+          </tr>
+
+        </table>
+      </div>
+
+      <br />
+      <br />
+      <div align="center">
+        <table class="desc">
+          <caption>
+	        Fields: Version 3 Regular Hyperslab Selection Info
+          </caption>
+	      <tr>
+            <th width="30%">Field Name</th>
+            <th>Description</th>
+	      </tr>
+
+          <tr>
+            <td><p>Start #n</p></td>
+            <td><p>The offset of the starting element in the block.
+              <p>#n is from 1 to <em>Rank</em>.
+              <p>The field <em>Encode Size</em> indicates the size of this field.
+            </p></td>
+          </tr>
+
+          <tr>
+            <td><p>Stride #n</p></td>
+            <td><p>The number of elements to move in each dimension.
+              <p>#n is from 1 to <em>Rank</em>.
+              <p>The field <em>Encode Size</em> indicates the size of this field.
+            </p></td>
+          </tr>
+
+          <tr>
+            <td><p>Count #n</p></td>
+            <td><p>The number of blocks to select in each dimension.
+              <p>#n is from 1 to <em>Rank</em>.
+              <p>The field <em>Encode Size</em> indicates the size of this field.
+            </p></td>
+          </tr>
+
+          <tr>
+            <td><p>Block #n</p></td>
+            <td><p>The size (in elements) of each block in each dimension.
+              <p>#n is from 1 to <em>Rank</em>.
+              <p>The field <em>Encode Size</em> indicates the size of this field.
+            </p></td>
+          </tr>
+        </table>
+      </div>
+
+      <br />
+      <br />
+      <br />
+      <a name="SelHYPERV3IRREG"></a>
+        <div align="center">
+          <table class="format">
+	        <caption>
+	          Layout: Version 3 Irregular Hyperslab Selection Info
+	        </caption>
+
+	        <tr>
+	          <th width="25%">byte</th>
+	          <th width="25%">byte</th>
+	          <th width="25%">byte</th>
+	          <th width="25%">byte</th>
+	        </tr>
+
+	        <tr>
+	          <td colspan="4">Num Blocks<p><em>(2, 4 or 8 bytes)</em><p></td>
+	        </tr>
+	        <tr>
+	          <td colspan="4">Starting Offset #1 for Block #1<p><em>(2, 4 or 8 bytes)</em><p></td>
+            </tr>
+	        <tr>
+	          <td colspan="4">.<br />.<br />.<br /></td>
+	        </tr>
+	        <tr>
+	          <td colspan="4">Starting Offset #n for Block #1<p><em>(2, 4 or 8 bytes)</em><p></td>
+            </tr>
+
+	        <tr>
+	          <td colspan="4">Ending Offset #1 for Block #1<p><em>(2, 4 or 8 bytes)</em><p></td>
+            </tr>
+	        <tr>
+	          <td colspan="4">.<br />.<br />.<br /></td>
+	        </tr>
+	        <tr>
+	          <td colspan="4">Ending Offset #n for Block #1<p><em>(2, 4 or 8 bytes)</em><p></td>
+            </tr>
+
+	        <tr>
+	          <td colspan="4">.<br />.<br />.<br /></td>
+	        </tr>
+	        <tr>
+	          <td colspan="4">.<br />.<br />.<br /></td>
+	        </tr>
+	        <tr>
+	          <td colspan="4">.<br />.<br />.<br /></td>
+	        </tr>
+
+	        <tr>
+	          <td colspan="4">Starting Offset #1 for Block #u<p><em>(2, 4 or 8 bytes)</em><p></td>
+            </tr>
+	        <tr>
+	          <td colspan="4">.<br />.<br />.<br /></td>
+	        </tr>
+	        <tr>
+	          <td colspan="4">Starting Offset #n for Block #u<p><em>(2, 4 or 8 bytes)</em><p></td>
+            </tr>
+
+	        <tr>
+	          <td colspan="4">Ending Offset #1 for Block #u<p><em>(2, 4 or 8 bytes)</em><p></td>
+            </tr>
+	        <tr>
+	          <td colspan="4">.<br />.<br />.<br /></td>
+	        </tr>
+	        <tr>
+	          <td colspan="4">Ending Offset #n for Block #u<p><em>(2, 4 or 8 bytes)</em><p></td>
+            </tr>
+
+          </table>
+        </div>
+
+        <br />
+        <br />
+        <div align="center">
+          <table class="desc">
+            <caption>
+              Fields: Version 3 Irregular Hyperslab Selection Info
+            </caption>
+
+	        <tr>
+	          <td><p>Num Blocks</p></td>
+	          <td><p>The number of blocks in the selection.
+                <p>The field <em>Encode Size</em> indicates the size of this field</p></td>
+	        </tr>
+
+            <tr>
+              <td><p>Starting Offset #n for Block #u</p></td>
+              <td><p>The offset #n of the starting element in block #u.
+                <p>#n is from 1 to <em>Rank</em>.
+                <p>#u is from 1 to <em>Num Blocks</em> moving from the fastest
+                  changing dimension to the slowest changing dimension.
+                <p>The field <em>Encode Size</em> indicates the size of this field
+              </p></td>
+            </tr>
+
+            <tr>
+              <td><p>Ending Offset #n for Block #u</p></td>
+              <td><p>The offset #n of the ending element in block #u.
+                <p>#n is from 1 to <em>Rank</em>.
+                <p>#u is from 1 to <em>Num Blocks</em> moving from the fastest
+                  changing dimension to the slowest changing dimension.
+                <p>The field <em>Encode Size</em> indicates the size of this field
+              </p></td>
+            </tr>
+
+          </table>
+        </div>
+
+
+        <br />
+        <br />
+        <br />
+        <a name="SelALL"></a>
+          <div align="center">
+            <table class="format">
+	          <caption>
+	            Layout: Selection Info for H5S_SEL_ALL
+	          </caption>
+
+	          <tr>
+	            <th width="25%">byte</th>
+	            <th width="25%">byte</th>
+	            <th width="25%">byte</th>
+	            <th width="25%">byte</th>
+	          </tr>
+
+	          <tr>
+	            <td colspan="4">Version</td>
+	          </tr>
+	          <tr>
+	            <td colspan="4"><br />Reserved <em>(zero,
+                    8 bytes)</em><br /><br /></td>
+	          </tr>
+
+            </table>
+          </div>
+
+          <br />
+          <br />
+          <div align="center">
+            <table class="desc">
+              <caption>
+                Fields: Selection Info for H5S_SEL_ALL
+              </caption>
+              <tr>
+                <th width="30%">Field Name</th>
+                <th>Description</th>
+              </tr>
+
+              <tr>
+                <td><p>Version</p></td>
+                <td><p>The version number for the H5S_SEL_ALL Selection Info;
+                    the value is 1.</p></td>
+              </tr>
+            </table>
+          </div>
+
+          <a name="ReferenceEncodeRV">
+            <h3>VIII.B. Reference Encoding (Revised)</h3></a>
+          <p>
+            <br />
+            For the following reference type,
+            the Reference Header and Reference Block are stored together as the dataset's raw data:
+            <ul>
+              <li>Object Reference (H5R_OBJECT2) (without reference to an external file)</li>
+            </ul>
+          <p>
+            For the following reference types,
+            the Reference Header plus the <a href="#GlobalHeapID">Global Heap ID</a> are stored
+            as the dataset's raw data in the file.
+            The global heap ID is used to locate the Reference Block stored in the global heap:
+            <ul>
+              <li>Object Reference (H5R_OBJECT2) (with reference to an external file)</li>
+              <li>Dataset Region Reference (H5R_DATASET_REGION2) (with/without reference to an external file)</li>
+              <li>Attribute Reference (H5R_ATTR) (with/without reference to an external file)</li>
+            </ul>
+            <br />
+            <br />
+
+            <div align="center">
+              <table class="format">
+                <caption>
+                  Layout: Reference Header
+                </caption>
+
+	            <tr>
+	              <th width="25%">byte</th>
+	              <th width="25%">byte</th>
+	              <th width="25%">byte</th>
+	              <th width="25%">byte</th>
+	            </tr>
+
+	            <tr>
+	              <td>Reference Type</td>
+	              <td>Flags</td>
+                  <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted
+                      only to align table nicely</em></td>
+	            </tr>
+
+              </table>
+
+            </div>
+
+            <br />
+            <br />
+            <div align="center">
+              <table class="desc">
+                <caption>
+                  Fields: Reference Header
+                </caption>
+	            <tr>
+                  <th width="30%">Field Name</th>
+                  <th>Description</th>
+	            </tr>
+
+	            <tr>
+	              <td><p>Reference Type</p></td>
+	              <td>
+                    <p>There are 3 types of references:
+                      <table class="list">
+                        <tr>
+                          <th width="20%" align="center">Value</th>
+                          <th width="80%" align="left">Description</th>
+                        </tr>
+
+                        <tr>
+                          <td align="center"><code>2</code></td>
+                          <td>H5R_OBJECT2: Object Reference
+                          </td>
+                        </tr>
+
+                        <tr>
+                          <td align="center"><code>3</code></td>
+                          <td>H5R_DATASET_REGION2: Dataset Region Reference
+                          </td>
+                        </tr>
+
+                        <tr>
+                          <td align="center"><code>4</code></td>
+                          <td>H5R_ATTR: Attribute Reference
+                          </td>
+                        </tr>
+
+                      </table>
+
+	              </td>
+	            </tr>
+
+	            <tr>
+	              <td><p>Flags</p></td>
+	              <td><p>This field describes the reference:
+                      <table class="list">
+                        <tr>
+                          <th width="20%" align="center">Bit</th>
+                          <th width="80%" align="left">Description</th>
+                        </tr>
+
+                        <tr>
+                          <td align="center"><code>0</code></td>
+                          <td>If set, the reference is to an external file.
+                          </td>
+                        </tr>
+                        <tr>
+                          <td align="center"><code>1-7</code></td>
+                          <td>Reserved</td>
+                        </tr>
+	                </table></p>
+
+                  </td>
+	            </tr>
+
+              </table>
+            </div>
+
+            <br />
+            <br />
+            <br />
+
+            <div align="center">
+              <table class="format">
+                <caption>
+                  Layout: Reference Block
+                </caption>
+
+	            <tr>
+	              <th width="25%">byte</th>
+	              <th width="25%">byte</th>
+	              <th width="25%">byte</th>
+	              <th width="25%">byte</th>
+	            </tr>
+
+	            <tr>
+	              <td>Token Size</td>
+                  <td colspan="3" bgcolor="#DDDDDD"><em>This space inserted
+                      only to align table nicely</em></td>
+	            </tr>
+	            <tr>
+                  <td colspan=4><br /><br />Token
+                    <em>(variable size)</em><br /> <br /><br /></td>
+	            </tr>
+                <tr>
+	              <td colspan=2>Length of External File Name</td>
+                  <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted
+                      only to align table nicely</em></td>
+                </tr>
+                <tr>
+	              <td colspan=4><br /><br />External File Name
+                    <em>(variable size)</em><br /><br /><br /></td>
+	            </tr>
+	            <tr>
+	              <td colspan=4>Size of Dataspace Selection</td>
+	            </tr>
+	            <tr>
+	              <td colspan=4>Rank of Dataspace Selection</td>
+	            </tr>
+	            <tr>
+	              <td colspan=4><br /><br />Dataspace Selection Information
+                    <em>(variable size)</em><br /><br /> <br /></td>
+</td>
+</tr>
+<tr>
+  <td colspan=2>Length of Attribute Name </td>
+  <td colspan="2" bgcolor="#DDDDDD"><em>This space inserted
+      only to align table nicely</em></td>
+</tr>
+<tr>
+  <td colspan=4><br /><br />Attribute Name
+    <em>(variable size)</em><br /><br /><br /></td>
+</tr>
+
+</table>
+
+</div>
+
+<br />
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Reference Block
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td><p>Token size</p></td>
+	  <td><p>This is the size of the token for the object.
+	  </td>
+	</tr>
+
+	<tr>
+	  <td><p>Token</p></td>
+	  <td>
+        <p>
+          This is the token for the object.
+        </p>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td><p>Length of External File Name</p></td>
+	  <td><p>This is the length for the external file name.
+        <p>This field exists if bit 0 of <em>flags</em> is set.</p>
+        </p>
+	  </td>
+	</tr>
+
+	<tr>
+	  <td><p>External File Name</p></td>
+	  <td><p>This is the name of the external file being referenced.</p>
+</p>
+<p>This field exists if bit 0 of <em>flags</em> is set.</p>
+</td>
+</tr>
+
+<tr>
+  <td><p>Dataspace Selection Information</p></td>
+  <td><p>See <a href="#DataspaceSEL">Dataspace Selection.</a></p>
+</p>
+<p>This field exists if the <em>Reference Type</em> is H5R_DATASET_REGION2.</p>
+</td>
+</tr>
+
+<tr>
+  <td><p>Length of Attribute Name</p></td>
+  <td><p>This is the length of the attribute name.
+	<p>This field exists if the <em>Reference Type</em> is H5R_ATTRIBUTE.</p>
+  </td>
+</tr>
+
+<tr>
+  <td><p>Attribute Name</p></td>
+  <td><p>This is the name of the attribute being referenced.
+	<p>This field exists if the <em>Reference Type</em> is H5R_ATTRIBUTE.</p>
+  </td>
+</tr>
+
+</table>
+</div>
+
+<br />
+<br />
+<br />
+
+
+<a name="ReferenceEncodeDP">
+  <h3>VIII.C. Reference Encoding (Backward Compatibility)</h3></a>
+<p>
+  <br />
+  The two references described below are maintained to preserve compatibility with previous versions of the library.
+<p>
+  For the following reference type,
+  the reference encoding is stored as the dataset's raw data in the file:
+  <ul>
+    <li>Object Reference (H5R_OBJECT1)</li>
+  </ul>
+<p>
+  For the following reference type,
+  the <a href="#GlobalHeapID">Global Heap ID</a> is stored as the dataset's raw data in the file.
+  The global heap ID is used to locate the reference encoding
+  stored in the global heap:
+  <ul>
+    <li>Dataset Region Reference (H5R_DATASET_REGION1)</li>
+  </ul>
+
+  <br />
+  <br />
+  <div align="center">
+    <table class="format">
+      <caption>
+        Layout: Reference for H5R_OBJECT1
+      </caption>
+
+	  <tr>
+	    <th width="25%">byte</th>
+	    <th width="25%">byte</th>
+	    <th width="25%">byte</th>
+	    <th width="25%">byte</th>
+	  </tr>
+
+      <tr>
+        <td colspan="4"><br />Object Address<sup>O</sup><br /><br /></td>
+      </tr>
+
+    </table>
+
+    <table class="note">
+      <tr>
+        <td width="60%">&nbsp;</td>
+        <td width="40%">
+          (Items marked with an &lsquo;O&rsquo; in the above table are
+          of the size specified in the <a href="#SizeOfOffsetsV0">Size
+            of Offsets</a> field in the superblock.)
+      </td></tr>
+    </table>
+
+  </div>
+
+  <br />
+  <br />
+  <div align="center">
+    <table class="desc">
+      <caption>
+        Fields: Reference for H5R_OBJECT1
+      </caption>
+	  <tr>
+        <th width="30%">Field Name</th>
+        <th>Description</th>
+	  </tr>
+
+	  <tr>
+	    <td><p>Object Address</p></td>
+	    <td>
+          <p>Address of the object being referenced
+	    </td>
+	  </tr>
+
+    </table>
+  </div>
+
+  <br />
+  <br />
+  <br />
+
+  <div align="center">
+    <table class="format">
+      <caption>
+        Layout: Reference for H5R_DATASET_REGION1
+      </caption>
+
+	  <tr>
+	    <th width="25%">byte</th>
+	    <th width="25%">byte</th>
+	    <th width="25%">byte</th>
+	    <th width="25%">byte</th>
+	  </tr>
+
+      <tr>
+        <td colspan="4"><br />Object Address<sup>O</sup><br /><br /></td>
+      </tr>
+	  <tr>
+	    <td colspan=4><br /><br />Dataspace Selection Information
+          <em>(variable size)</em><br /><br /> <br /></td>
+</td>
+</tr>
+
+</table>
+
+<table class="note">
+  <tr>
+    <td width="60%">&nbsp;</td>
+    <td width="40%">
+      (Items marked with an &lsquo;O&rsquo; in the above table are
+      of the size specified in the <a href="#SizeOfOffsetsV0">Size
+        of Offsets</a> field in the superblock.)
+  </td></tr>
+</table>
+
+</div>
+
+<br />
+<br />
+<div align="center">
+  <table class="desc">
+    <caption>
+      Fields: Reference for H5R_DATASET_REGION1
+    </caption>
+	<tr>
+      <th width="30%">Field Name</th>
+      <th>Description</th>
+	</tr>
+
+	<tr>
+	  <td><p>Object Address</p></td>
+	  <td><p>This is the address of the object being referenced.
+	  </td>
+	</tr>
+
+	<tr>
+	  <td><p>Dataspace Selection Information</p></td>
+	  <td><p>This is the dataspace selection for the object being referenced.
+          See <a href="#DataspaceSEL">Dataspace Selection.</a></p>
+</p>
+</td>
+</tr>
+
+</table>
+</div>
+
+<br />
+<br />
+<br />
+
+
+</body>
+</html>
diff --git a/doxygen/examples/H5A_examples.c b/doxygen/examples/H5A_examples.c
new file mode 100644
index 0000000..f332efa
--- /dev/null
+++ b/doxygen/examples/H5A_examples.c
@@ -0,0 +1,145 @@
+/* -*- c-file-style: "stroustrup" -*- */
+
+#include "hdf5.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+int
+main(void)
+{
+    int ret_val = EXIT_SUCCESS;
+
+    //! <!-- [create] -->
+    {
+        __label__ fail_acpl, fail_attr, fail_file;
+        hid_t file, acpl, fspace, attr;
+
+        unsigned mode        = H5F_ACC_TRUNC;
+        char     file_name[] = "f1.h5";
+        // attribute names can be arbitrary Unicode strings
+        char attr_name[] = "Χαρακτηριστικό";
+
+        if ((file = H5Fcreate(file_name, mode, H5P_DEFAULT, H5P_DEFAULT)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_file;
+        }
+        if ((acpl = H5Pcreate(H5P_ATTRIBUTE_CREATE)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_acpl;
+        }
+        // use UTF-8 encoding for the attribute name
+        if (H5Pset_char_encoding(acpl, H5T_CSET_UTF8) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_fspace;
+        }
+        // create a scalar (singleton) attribute
+        if ((fspace = H5Screate(H5S_SCALAR)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_fspace;
+        }
+        // create an attribute on the root group
+        if ((attr = H5Acreate2(file, attr_name, H5T_STD_I32LE, fspace, acpl, H5P_DEFAULT)) ==
+            H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_attr;
+        }
+
+        H5Aclose(attr);
+fail_attr:
+        H5Sclose(fspace);
+fail_fspace:
+        H5Pclose(acpl);
+fail_acpl:
+        H5Fclose(file);
+fail_file:;
+    }
+    //! <!-- [create] -->
+
+    //! <!-- [read] -->
+    {
+        __label__ fail_attr, fail_file;
+        hid_t file, attr;
+
+        unsigned mode        = H5F_ACC_RDONLY;
+        char     file_name[] = "f1.h5";
+        char     attr_name[] = "Χαρακτηριστικό";
+        int      value;
+
+        if ((file = H5Fopen(file_name, mode, H5P_DEFAULT)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_file;
+        }
+        if ((attr = H5Aopen(file, attr_name, H5P_DEFAULT)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_attr;
+        }
+        // read the attribute value
+        if (H5Aread(attr, H5T_NATIVE_INT, &value) < 0)
+            ret_val = EXIT_FAILURE;
+
+        // do something w/ the attribute value
+
+        H5Aclose(attr);
+fail_attr:
+        H5Fclose(file);
+fail_file:;
+    }
+    //! <!-- [read] -->
+
+    //! <!-- [update] -->
+    {
+        __label__ fail_attr, fail_file;
+        hid_t file, attr;
+
+        unsigned mode        = H5F_ACC_RDWR;
+        char     file_name[] = "f1.h5";
+        char     attr_name[] = "Χαρακτηριστικό";
+        int      value       = 1234;
+
+        if ((file = H5Fopen(file_name, mode, H5P_DEFAULT)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_file;
+        }
+        if ((attr = H5Aopen(file, attr_name, H5P_DEFAULT)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_attr;
+        }
+        // update the attribute value
+        if (H5Awrite(attr, H5T_NATIVE_INT, &value) < 0)
+            ret_val = EXIT_FAILURE;
+
+        H5Aclose(attr);
+fail_attr:
+        H5Fclose(file);
+fail_file:;
+    }
+    //! <!-- [update] -->
+
+    //! <!-- [delete] -->
+    {
+        __label__ fail_attr, fail_file;
+        hid_t file;
+
+        unsigned mode        = H5F_ACC_RDWR;
+        char     file_name[] = "f1.h5";
+        char     attr_name[] = "Χαρακτηριστικό";
+
+        if ((file = H5Fopen(file_name, mode, H5P_DEFAULT)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_file;
+        }
+        // delete the attribute
+        if (H5Adelete(file, attr_name) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_attr;
+        }
+
+fail_attr:
+        H5Fclose(file);
+fail_file:;
+    }
+    //! <!-- [delete] -->
+
+    return ret_val;
+}
diff --git a/doxygen/examples/H5DO_examples.c b/doxygen/examples/H5DO_examples.c
new file mode 100644
index 0000000..7f4096e
--- /dev/null
+++ b/doxygen/examples/H5DO_examples.c
@@ -0,0 +1,220 @@
+/* -*- c-file-style: "stroustrup" -*- */
+
+//! <!-- [H5DOwrite] -->
+
+#include <zlib.h>
+#include <math.h>
+#define DEFLATE_SIZE_ADJUST(s) (ceil(((double)(s)) * 1.001) + 12)
+                :
+                :
+size_t       buf_size = CHUNK_NX*CHUNK_NY*sizeof(int);
+                const Bytef *z_src = (const Bytef *)(direct_buf);
+                Bytef       *z_dst; /* Destination buffer            */
+                uLongf       z_dst_nbytes = (uLongf)DEFLATE_SIZE_ADJUST(buf_size);
+                uLong        z_src_nbytes = (uLong)buf_size;
+                int          aggression   = 9; /* Compression aggression setting */
+                uint32_t     filter_mask  = 0;
+                size_t       buf_size     = CHUNK_NX * CHUNK_NY * sizeof(int);
+
+                /* Create the data space */
+                if ((dataspace = H5Screate_simple(RANK, dims, maxdims)) < 0)
+                    goto error;
+
+                /* Create a new file */
+                if ((file = H5Fcreate(FILE_NAME5, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+                    goto error;
+
+                /* Modify dataset creation properties, i.e. enable chunking and compression */
+                if ((cparms = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+                    goto error;
+
+                if ((status = H5Pset_chunk(cparms, RANK, chunk_dims)) < 0)
+                    goto error;
+
+                if ((status = H5Pset_deflate(cparms, aggression)) < 0)
+                    goto error;
+
+                /* Create a new dataset within the file using cparms creation properties */
+                if ((dset_id = H5Dcreate2(file, DATASETNAME, H5T_NATIVE_INT, dataspace, H5P_DEFAULT, cparms,
+                                          H5P_DEFAULT)) < 0)
+                    goto error;
+
+                /* Initialize data for one chunk */
+                for (i = n = 0; i < CHUNK_NX; i++)
+                    for (j = 0; j < CHUNK_NY; j++)
+                        direct_buf[i][j] = n++;
+
+                /* Allocate output (compressed) buffer */
+                outbuf = malloc(z_dst_nbytes);
+                z_dst  = (Bytef *)outbuf;
+
+                /* Perform compression from the source to the destination buffer */
+                ret = compress2(z_dst, &z_dst_nbytes, z_src, z_src_nbytes, aggression);
+
+                /* Check for various zlib errors */
+                if (Z_BUF_ERROR == ret) {
+                    fprintf(stderr, "overflow");
+                    goto error;
+                }
+                else if (Z_MEM_ERROR == ret) {
+                    fprintf(stderr, "deflate memory error");
+                    goto error;
+                }
+                else if (Z_OK != ret) {
+                    fprintf(stderr, "other deflate error");
+                    goto error;
+                }
+
+                /* Write the compressed chunk data repeatedly to cover all the
+                 *  * chunks in the dataset, using the direct write function.     */
+                for (i = 0; i < NX / CHUNK_NX; i++) {
+                    for (j = 0; j < NY / CHUNK_NY; j++) {
+                        status =
+                            H5DOwrite_chunk(dset_id, H5P_DEFAULT, filter_mask, offset, z_dst_nbytes, outbuf);
+                        offset[1] += CHUNK_NY;
+                    }
+                    offset[0] += CHUNK_NX;
+                    offset[1] = 0;
+                }
+
+                /* Overwrite the first chunk with uncompressed data.  Set the filter mask to
+                 *  * indicate the compression filter is skipped */
+                filter_mask = 0x00000001;
+                offset[0] = offset[1] = 0;
+                if (H5DOwrite_chunk(dset_id, H5P_DEFAULT, filter_mask, offset, buf_size, direct_buf) < 0)
+                    goto error;
+
+                /* Read the entire dataset back for data verification converting ints to longs */
+                if (H5Dread(dataset, H5T_NATIVE_LONG, H5S_ALL, H5S_ALL, H5P_DEFAULT, outbuf_long) < 0)
+                    goto error;
+
+                /* Data verification here */
+            :
+            :
+
+            //! <!-- [H5DOwrite] -->
+
+            //! <!-- [H5DOread] -->
+
+#include <zlib.h>
+#include <math.h>
+#define DEFLATE_SIZE_ADJUST(s) (ceil(((double)(s)) * 1.001) + 12)
+                :
+                :
+size_t       buf_size = CHUNK_NX*CHUNK_NY*sizeof(int);
+            const Bytef *z_src = (const Bytef *)(direct_buf);
+            Bytef       *z_dst; /* Destination buffer            */
+            uLongf       z_dst_nbytes = (uLongf)DEFLATE_SIZE_ADJUST(buf_size);
+            uLong        z_src_nbytes = (uLong)buf_size;
+            int          aggression   = 9; /* Compression aggression setting */
+            uint32_t     filter_mask  = 0;
+            size_t       buf_size     = CHUNK_NX * CHUNK_NY * sizeof(int);
+            /* For H5DOread_chunk() */
+            void        *readbuf = NULL;                   /* Buffer for reading data */
+            const Bytef *pt_readbuf;                       /* Point to the buffer for data read */
+            hsize_t      read_chunk_nbytes;                /* Size of chunk on disk */
+            int          read_dst_buf[CHUNK_NX][CHUNK_NY]; /* Buffer to hold un-compressed data */
+
+            /* Create the data space */
+            if ((dataspace = H5Screate_simple(RANK, dims, maxdims)) < 0)
+                goto error;
+
+            /* Create a new file */
+            if ((file = H5Fcreate(FILE_NAME5, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+                goto error;
+
+            /* Modify dataset creation properties, i.e. enable chunking and compression */
+            if ((cparms = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+                goto error;
+
+            if ((status = H5Pset_chunk(cparms, RANK, chunk_dims)) < 0)
+                goto error;
+
+            if ((status = H5Pset_deflate(cparms, aggression)) < 0)
+                goto error;
+
+            /* Create a new dataset within the file using cparms creation properties */
+            if ((dset_id = H5Dcreate2(file, DATASETNAME, H5T_NATIVE_INT, dataspace, H5P_DEFAULT, cparms,
+                                      H5P_DEFAULT)) < 0)
+                goto error;
+
+            /* Initialize data for one chunk */
+            for (i = n = 0; i < CHUNK_NX; i++)
+                for (j = 0; j < CHUNK_NY; j++)
+                    direct_buf[i][j] = n++;
+
+            /* Allocate output (compressed) buffer */
+            outbuf = malloc(z_dst_nbytes);
+            z_dst  = (Bytef *)outbuf;
+
+            /* Perform compression from the source to the destination buffer */
+            ret = compress2(z_dst, &z_dst_nbytes, z_src, z_src_nbytes, aggression);
+
+            /* Check for various zlib errors */
+            if (Z_BUF_ERROR == ret) {
+                fprintf(stderr, "overflow");
+                goto error;
+            }
+            else if (Z_MEM_ERROR == ret) {
+                fprintf(stderr, "deflate memory error");
+                goto error;
+            }
+            else if (Z_OK != ret) {
+                fprintf(stderr, "other deflate error");
+                goto error;
+            }
+
+            /* Write the compressed chunk data repeatedly to cover all the
+             *  * chunks in the dataset, using the direct write function.     */
+            for (i = 0; i < NX / CHUNK_NX; i++) {
+                for (j = 0; j < NY / CHUNK_NY; j++) {
+                    status = H5DOwrite_chunk(dset_id, H5P_DEFAULT, filter_mask, offset, z_dst_nbytes, outbuf);
+                    offset[1] += CHUNK_NY;
+                }
+                offset[0] += CHUNK_NX;
+                offset[1] = 0;
+            }
+
+            if (H5Fflush(dataset, H5F_SCOPE_LOCAL) < 0)
+                goto error;
+
+            if (H5Dclose(dataset) < 0)
+                goto error;
+
+            if ((dataset = H5Dopen2(file, DATASETNAME1, H5P_DEFAULT)) < 0)
+                goto error;
+
+            offset[0] = CHUNK_NX;
+            offset[1] = CHUNK_NY;
+
+            /* Get the size of the compressed chunk */
+            ret = H5Dget_chunk_storage_size(dataset, offset, &read_chunk_nbytes);
+
+            readbuf    = HDmalloc(read_chunk_nbytes);
+            pt_readbuf = (const Bytef *)readbuf;
+
+            /* Use H5DOread_chunk() to read the chunk back */
+            if ((status = H5DOread_chunk(dataset, H5P_DEFAULT, offset, &read_filter_mask, readbuf)) < 0)
+                goto error;
+
+            ret =
+                uncompress((Bytef *)read_dst_buf, (uLongf *)&buf_size, pt_readbuf, (uLong)read_chunk_nbytes);
+
+            /* Check for various zlib errors */
+            if (Z_BUF_ERROR == ret) {
+                fprintf(stderr, "error: not enough room in output buffer");
+                goto error;
+            }
+            else if (Z_MEM_ERROR == ret) {
+                fprintf(stderr, "error: not enough memory");
+                goto error;
+            }
+            else if (Z_OK != ret) {
+                fprintf(stderr, "error: corrupted input data");
+                goto error;
+            }
+
+            /* Data verification here */
+            :
+            :
+//! <!-- [H5DOread] -->
diff --git a/doxygen/examples/H5D_examples.c b/doxygen/examples/H5D_examples.c
new file mode 100644
index 0000000..7af3cc4
--- /dev/null
+++ b/doxygen/examples/H5D_examples.c
@@ -0,0 +1,252 @@
+/* -*- c-file-style: "stroustrup" -*- */
+
+#include "hdf5.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+//! <!-- [H5Dchunk_iter_cb] -->
+int
+chunk_cb(const hsize_t *offset, uint32_t filter_mask, haddr_t addr, uint32_t nbytes, void *op_data)
+{
+    // only print the allocated chunk size only
+    printf("%d\n", nbytes);
+    return EXIT_SUCCESS;
+}
+//! <!-- [H5Dchunk_iter_cb] -->
+
+//! <!-- [H5Ovisit_cb] -->
+herr_t
+H5Ovisit_cb(hid_t obj, const char *name, const H5O_info2_t *info, void *op_data)
+{
+    herr_t retval    = 0;
+    char  *base_path = (char *)op_data;
+
+    if (info->type == H5O_TYPE_DATASET) // current object is a dataset
+    {
+        hid_t dset, dcpl;
+        if ((dset = H5Dopen(obj, name, H5P_DEFAULT)) == H5I_INVALID_HID) {
+            retval = -1;
+            goto func_leave;
+        }
+        if ((dcpl = H5Dget_create_plist(dset)) == H5I_INVALID_HID) {
+            retval = -1;
+            goto fail_dcpl;
+        }
+        if (H5Pget_layout(dcpl) == H5D_CHUNKED) // dataset is chunked
+        {
+            __label__ fail_dtype, fail_dspace, fail_shape;
+            hid_t   dspace, dtype;
+            size_t  size, i;
+            int     rank;
+            hsize_t cdims[H5S_MAX_RANK];
+
+            // get resources
+            if ((dtype = H5Dget_type(dset)) < 0) {
+                retval = -1;
+                goto fail_dtype;
+            }
+            if ((dspace = H5Dget_space(dset)) < 0) {
+                retval = -1;
+                goto fail_dspace;
+            }
+            // get the shape
+            if ((size = H5Tget_size(dtype)) == 0 || (rank = H5Sget_simple_extent_ndims(dspace)) < 0 ||
+                H5Pget_chunk(dcpl, H5S_MAX_RANK, cdims) < 0) {
+                retval = -1;
+                goto fail_shape;
+            }
+            // calculate the nominal chunk size
+            size = 1;
+            for (i = 0; i < (size_t)rank; ++i)
+                size *= cdims[i];
+            // print dataset info
+            printf("%s%s : nominal chunk size %lu [B] \n", base_path, name, size);
+            // get the allocated chunk sizes
+            if (H5Dchunk_iter(dset, H5P_DEFAULT, &chunk_cb, NULL) < 0) {
+                retval = -1;
+                goto fail_fig;
+            }
+
+fail_shape:
+            H5Sclose(dspace);
+fail_dspace:
+            H5Tclose(dtype);
+fail_dtype:;
+        }
+
+        H5Pclose(dcpl);
+fail_dcpl:
+        H5Dclose(dset);
+    }
+
+func_leave:
+    return retval;
+}
+//! <!-- [H5Ovisit_cb] -->
+
+int
+main(void)
+{
+    int ret_val = EXIT_SUCCESS;
+
+    //! <!-- [create] -->
+    {
+        __label__ fail_lcpl, fail_dset, fail_file;
+        hid_t file, lcpl, fspace, dset;
+
+        unsigned mode        = H5F_ACC_TRUNC;
+        char     file_name[] = "d1.h5";
+        // link names can be arbitrary Unicode strings
+        char dset_name[] = "σύνολο/δεδομένων";
+
+        if ((file = H5Fcreate(file_name, mode, H5P_DEFAULT, H5P_DEFAULT)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_file;
+        }
+        if ((lcpl = H5Pcreate(H5P_LINK_CREATE)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_lcpl;
+        }
+        // use UTF-8 encoding for link names
+        if (H5Pset_char_encoding(lcpl, H5T_CSET_UTF8) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_fspace;
+        }
+        // create intermediate groups as needed
+        if (H5Pset_create_intermediate_group(lcpl, 1) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_fspace;
+        }
+        // create a 1D dataspace
+        if ((fspace = H5Screate_simple(1, (hsize_t[]){10}, NULL)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_fspace;
+        }
+        // create a 32-bit integer dataset
+        if ((dset = H5Dcreate2(file, dset_name, H5T_STD_I32LE, fspace, lcpl, H5P_DEFAULT, H5P_DEFAULT)) ==
+            H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_dset;
+        }
+
+        H5Dclose(dset);
+fail_dset:
+        H5Sclose(fspace);
+fail_fspace:
+        H5Pclose(lcpl);
+fail_lcpl:
+        H5Fclose(file);
+fail_file:;
+    }
+    //! <!-- [create] -->
+
+    //! <!-- [read] -->
+    {
+        __label__ fail_dset, fail_file;
+        hid_t file, dset;
+
+        unsigned mode        = H5F_ACC_RDONLY;
+        char     file_name[] = "d1.h5";
+        // assume a priori knowledge of dataset name and size
+        char dset_name[] = "σύνολο/δεδομένων";
+        int  elts[10];
+
+        if ((file = H5Fopen(file_name, mode, H5P_DEFAULT)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_file;
+        }
+        if ((dset = H5Dopen2(file, dset_name, H5P_DEFAULT)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_dset;
+        }
+        // read all dataset elements
+        if (H5Dread(dset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, elts) < 0)
+            ret_val = EXIT_FAILURE;
+
+        // do something w/ the dataset elements
+
+        H5Dclose(dset);
+fail_dset:
+        H5Fclose(file);
+fail_file:;
+    }
+    //! <!-- [read] -->
+
+    //! <!-- [update] -->
+    {
+        __label__ fail_update, fail_fspace, fail_dset, fail_file;
+        hid_t file, dset, fspace;
+
+        unsigned mode           = H5F_ACC_RDWR;
+        char     file_name[]    = "d1.h5";
+        char     dset_name[]    = "σύνολο/δεδομένων";
+        int      new_elts[6][2] = {{-1, 1}, {-2, 2}, {-3, 3}, {-4, 4}, {-5, 5}, {-6, 6}};
+
+        if ((file = H5Fopen(file_name, mode, H5P_DEFAULT)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_file;
+        }
+        if ((dset = H5Dopen2(file, dset_name, H5P_DEFAULT)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_dset;
+        }
+        // get the dataset's dataspace
+        if ((fspace = H5Dget_space(dset)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_fspace;
+        }
+        // select the first 5 elements in odd positions
+        if (H5Sselect_hyperslab(fspace, H5S_SELECT_SET, (hsize_t[]){1}, (hsize_t[]){2}, (hsize_t[]){5},
+                                NULL) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_update;
+        }
+
+        // (implicitly) select and write the first 5 elements of the second column of NEW_ELTS
+        if (H5Dwrite(dset, H5T_NATIVE_INT, H5S_ALL, fspace, H5P_DEFAULT, new_elts) < 0)
+            ret_val = EXIT_FAILURE;
+
+fail_update:
+        H5Sclose(fspace);
+fail_fspace:
+        H5Dclose(dset);
+fail_dset:
+        H5Fclose(file);
+fail_file:;
+    }
+    //! <!-- [update] -->
+
+    //! <!-- [delete] -->
+    {
+        __label__ fail_delete, fail_file;
+        hid_t file;
+
+        unsigned mode         = H5F_ACC_RDWR;
+        char     file_name[]  = "d1.h5";
+        char     group_name[] = "σύνολο";
+        char     dset_name[]  = "σύνολο/δεδομένων";
+
+        if ((file = H5Fopen(file_name, mode, H5P_DEFAULT)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_file;
+        }
+        // delete (unlink) the dataset
+        if (H5Ldelete(file, dset_name, H5P_DEFAULT) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_delete;
+        }
+        // the previous call deletes (unlinks) only the dataset
+        if (H5Ldelete(file, group_name, H5P_DEFAULT) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_delete;
+        }
+
+fail_delete:
+        H5Fclose(file);
+fail_file:;
+    }
+    //! <!-- [delete] -->
+
+    return ret_val;
+}
diff --git a/doxygen/examples/H5E_examples.c b/doxygen/examples/H5E_examples.c
new file mode 100644
index 0000000..deea838
--- /dev/null
+++ b/doxygen/examples/H5E_examples.c
@@ -0,0 +1,97 @@
+/* -*- c-file-style: "stroustrup" -*- */
+
+#include "hdf5.h"
+
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int
+main(void)
+{
+    int ret_val = EXIT_SUCCESS;
+
+    //! <!-- [create] -->
+    {
+        __label__ fail_push, fail_minor, fail_major, fail_class;
+        hid_t cls, major, minor;
+
+        // register a new error class for this "application"
+        if ((cls = H5Eregister_class("Custom error class", "H5E_examples", "0.1")) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_class;
+        }
+
+        // create custom major and minor error codes
+        if ((major = H5Ecreate_msg(cls, H5E_MAJOR, "Okay, Houston, we've had a problem here")) ==
+            H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_major;
+        }
+        if ((minor = H5Ecreate_msg(cls, H5E_MINOR, "Oops!")) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_minor;
+        }
+
+        // push a custom error message onto the default stack
+        if (H5Epush2(H5E_DEFAULT, __FILE__, __FUNCTION__, __LINE__, cls, major, minor, "Hello, Error!\n") <
+            0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_push;
+        }
+
+        // print the default error stack
+        if (H5Eprint(H5E_DEFAULT, stderr) < 0) {
+            ret_val = EXIT_FAILURE;
+        }
+
+fail_push:
+        H5Eclose_msg(minor);
+fail_minor:
+        H5Eclose_msg(major);
+fail_major:
+        H5Eunregister_class(cls);
+fail_class:;
+    }
+    //! <!-- [create] -->
+
+    //! <!-- [read] -->
+    {
+        __label__ fail_count;
+
+        // check the number of error messages on the default stack
+        // and print what's there
+        ssize_t count = H5Eget_num(H5E_DEFAULT);
+        if (count < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_count;
+        }
+        else if (H5Eprint(H5E_DEFAULT, stderr) < 0) {
+            ret_val = EXIT_FAILURE;
+        }
+
+fail_count:;
+    }
+    //! <!-- [read] -->
+
+    //! <!-- [update] -->
+    {
+        // pop 10 error messages off the default error stack
+        // popping off non-existent messages is OK, but might be confusing
+        if (H5Epop(H5E_DEFAULT, 10) < 0)
+            ret_val = EXIT_FAILURE;
+    }
+    //! <!-- [update] -->
+
+    //! <!-- [delete] -->
+    {
+        // clear the default error stack (for the current thread)
+        if (H5Eclear2(H5E_DEFAULT) < 0)
+            ret_val = EXIT_FAILURE;
+    }
+    //! <!-- [delete] -->
+
+    assert(ret_val == EXIT_SUCCESS);
+
+    return ret_val;
+}
diff --git a/doxygen/examples/H5F_examples.c b/doxygen/examples/H5F_examples.c
new file mode 100644
index 0000000..4e89fde
--- /dev/null
+++ b/doxygen/examples/H5F_examples.c
@@ -0,0 +1,228 @@
+/* -*- c-file-style: "stroustrup" -*- */
+
+#include "hdf5.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+int
+main(void)
+{
+    int ret_val = EXIT_SUCCESS;
+
+    //! <!-- [create] -->
+    {
+        __label__ fail_fapl, fail_fcpl, fail_file;
+        hid_t fcpl, fapl, file;
+
+        if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_fcpl;
+        }
+        else {
+            // adjust the file creation properties
+        }
+
+        if ((fapl = H5Pcreate(H5P_FILE_ACCESS)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_fapl;
+        }
+        else {
+            // adjust the file access properties
+        }
+
+        unsigned mode   = H5F_ACC_EXCL;
+        char     name[] = "f1.h5";
+
+        if ((file = H5Fcreate(name, mode, fcpl, fapl)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_file;
+        }
+
+        // do something useful with FILE
+
+        H5Fclose(file);
+fail_file:
+        H5Pclose(fapl);
+fail_fapl:
+        H5Pclose(fcpl);
+fail_fcpl:;
+    }
+    //! <!-- [create] -->
+
+    //! <!-- [read] -->
+    {
+        __label__ fail_fapl, fail_file;
+        hid_t   fapl, file;
+        hsize_t size;
+
+        if ((fapl = H5Pcreate(H5P_FILE_ACCESS)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_fapl;
+        }
+        else {
+            // adjust the file access properties
+        }
+
+        unsigned mode   = H5F_ACC_RDONLY;
+        char     name[] = "f1.h5";
+
+        if ((file = H5Fopen(name, mode, fapl)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_file;
+        }
+
+        if (H5Fget_filesize(file, &size) < 0) {
+            ret_val = EXIT_FAILURE;
+        }
+
+        printf("File size: %llu bytes\n", size);
+
+        H5Fclose(file);
+fail_file:
+        H5Pclose(fapl);
+fail_fapl:;
+    }
+    //! <!-- [read] -->
+
+    //! <!-- [update] -->
+    {
+        __label__ fail_file;
+        hid_t file;
+
+        unsigned mode   = H5F_ACC_RDWR;
+        char     name[] = "f1.h5";
+
+        if ((file = H5Fopen(name, mode, H5P_DEFAULT)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_file;
+        }
+
+        // create a cycle by hard linking the root group in the root group
+        if (H5Lcreate_hard(file, ".", file, "loopback", H5P_DEFAULT, H5P_DEFAULT) < 0) {
+            ret_val = EXIT_FAILURE;
+        }
+
+        H5Fclose(file);
+fail_file:;
+    }
+    //! <!-- [update] -->
+
+    //! <!-- [minimal] -->
+    {
+        unsigned mode   = H5F_ACC_TRUNC;
+        char     name[] = "f11.h5";
+
+        hid_t file = H5Fcreate(name, mode, H5P_DEFAULT, H5P_DEFAULT);
+        if (file != H5I_INVALID_HID)
+            H5Fclose(file);
+        else
+            ret_val = EXIT_FAILURE;
+    }
+    //! <!-- [minimal] -->
+
+    //! <!-- [open] -->
+    {
+        unsigned mode   = H5F_ACC_RDONLY;
+        char     name[] = "f11.h5";
+
+        hid_t file = H5Fopen(name, mode, H5P_DEFAULT);
+        if (file != H5I_INVALID_HID)
+            H5Fclose(file);
+        else
+            ret_val = EXIT_FAILURE;
+    }
+    //! <!-- [open] -->
+
+    //! <!-- [flush] -->
+    {
+        unsigned mode   = H5F_ACC_RDWR;
+        char     name[] = "f11.h5";
+
+        hid_t file = H5Fopen(name, mode, H5P_DEFAULT);
+        if (file != H5I_INVALID_HID) {
+            int step;
+            for (step = 0; step < 1000; ++step) {
+
+                // do important work & flush every 20 steps
+
+                if (step % 20 == 0) {
+                    if (H5Fflush(file, H5F_SCOPE_LOCAL) < 0) {
+                        perror("H5Fflush failed.");
+                        ret_val = EXIT_FAILURE;
+                        break;
+                    }
+                }
+            }
+
+            if (H5Fclose(file) < 0)
+                perror("H5Fclose failed.");
+        }
+        else
+            ret_val = EXIT_FAILURE;
+    }
+    //! <!-- [flush] -->
+
+    //! <!-- [libver_bounds] -->
+    {
+        unsigned mode   = H5F_ACC_RDWR;
+        char     name[] = "f11.h5";
+
+        hid_t file = H5Fopen(name, mode, H5P_DEFAULT);
+        if (file != H5I_INVALID_HID) {
+            if (H5Fset_libver_bounds(file, H5F_LIBVER_EARLIEST, H5F_LIBVER_V18) >= 0) {
+
+                // object creation will not exceed HDF5 version 1.8.x
+            }
+            else
+                perror("H5Fset_libver_bounds failed.");
+
+            if (H5Fclose(file) < 0)
+                perror("H5Fclose failed.");
+        }
+        else
+            ret_val = EXIT_FAILURE;
+    }
+    //! <!-- [libver_bounds] -->
+
+    //! <!-- [mount] -->
+    {
+        hid_t file = H5Fopen("f11.h5", H5F_ACC_RDWR, H5P_DEFAULT);
+        if (file != H5I_INVALID_HID) {
+            hid_t group, child;
+            if ((group = H5Gcreate1(file, "mount_point", H5P_DEFAULT)) != H5I_INVALID_HID) {
+                if ((child = H5Fopen("f1.h5", H5F_ACC_RDONLY, H5P_DEFAULT)) != H5I_INVALID_HID) {
+                    if (H5Fmount(group, ".", child, H5P_DEFAULT) >= 0) {
+
+                        // do something useful w/ the mounted file
+                    }
+                    else {
+                        ret_val = EXIT_FAILURE;
+                        perror("H5Fmount failed.");
+                    }
+                    H5Fclose(child);
+                }
+                H5Gclose(group);
+            }
+            H5Fclose(file);
+        }
+        else
+            ret_val = EXIT_FAILURE;
+    }
+    //! <!-- [mount] -->
+
+    //! <!-- [delete] -->
+    {
+#if H5_VERSION_GE(1, 12, 0)
+
+        // this function is only available in HDF5 1.12.x
+        if (H5Fdelete("f1.h5", H5P_DEFAULT) < 0) {
+            ret_val = EXIT_FAILURE;
+        }
+
+#endif
+    }
+    //! <!-- [delete] -->
+
+    return ret_val;
+}
diff --git a/doxygen/examples/H5Fclose.c b/doxygen/examples/H5Fclose.c
new file mode 100644
index 0000000..525bad3
--- /dev/null
+++ b/doxygen/examples/H5Fclose.c
@@ -0,0 +1,13 @@
+#include "hdf5.h"
+
+int
+main()
+{
+    hid_t file;
+    if ((file = H5Fcreate("foo.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        return -1;
+    /* Do something good with this file. */
+    if (H5Fclose(file) < 0)
+        return -2;
+    return 0;
+}
diff --git a/doxygen/examples/H5Fcreate.c b/doxygen/examples/H5Fcreate.c
new file mode 100644
index 0000000..525bad3
--- /dev/null
+++ b/doxygen/examples/H5Fcreate.c
@@ -0,0 +1,13 @@
+#include "hdf5.h"
+
+int
+main()
+{
+    hid_t file;
+    if ((file = H5Fcreate("foo.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        return -1;
+    /* Do something good with this file. */
+    if (H5Fclose(file) < 0)
+        return -2;
+    return 0;
+}
diff --git a/doxygen/examples/H5G_examples.c b/doxygen/examples/H5G_examples.c
new file mode 100644
index 0000000..3109efb
--- /dev/null
+++ b/doxygen/examples/H5G_examples.c
@@ -0,0 +1,186 @@
+/* -*- c-file-style: "stroustrup" -*- */
+
+#include "hdf5.h"
+
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int
+main(void)
+{
+    int ret_val = EXIT_SUCCESS;
+
+    //! <!-- [create] -->
+    {
+        __label__ fail_group, fail_prop, fail_lcpl, fail_file;
+        hid_t file, lcpl, group;
+        char  fname[] = "g1.h5";
+        char  path[]  = "/αυτή/είναι/μια/νέα/ομάδα";
+
+        if ((file = H5Fcreate(fname, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_file;
+        }
+
+        if ((lcpl = H5Pcreate(H5P_LINK_CREATE)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_lcpl;
+        }
+        // ensure that intermediate groups are created automatically
+        if (H5Pset_create_intermediate_group(lcpl, 1) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_prop;
+        }
+        // use UTF-8 encoding for link names
+        if (H5Pset_char_encoding(lcpl, H5T_CSET_UTF8) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_prop;
+        }
+        // create five groups
+        if ((group = H5Gcreate(file, path, lcpl, H5P_DEFAULT, H5P_DEFAULT)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_group;
+        }
+
+        H5Gclose(group);
+fail_group:
+fail_prop:
+        H5Pclose(lcpl);
+fail_lcpl:
+        H5Fclose(file);
+fail_file:;
+    }
+    //! <!-- [create] -->
+
+    //! <!-- [read] -->
+    {
+        __label__ fail_file;
+        char       fname[] = "g1.h5";
+        char       path[]  = "/αυτή/είναι";
+        hid_t      file;
+        H5G_info_t info;
+
+        if ((file = H5Fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_file;
+        }
+        // open one of the intermediate groups
+        if (H5Gget_info_by_name(file, path, &info, H5P_DEFAULT) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_info;
+        }
+
+        printf("Link count: %llu\n", info.nlinks);
+        switch (info.storage_type) {
+            case H5G_STORAGE_TYPE_COMPACT:
+                printf("Compact storage\n");
+                break;
+            case H5G_STORAGE_TYPE_DENSE:
+                printf("Compact storage\n");
+                break;
+            case H5G_STORAGE_TYPE_SYMBOL_TABLE:
+                printf("Symbol table\n");
+                break;
+            default:
+                printf("UFO\n");
+                break;
+        }
+
+fail_info:
+        H5Fclose(file);
+fail_file:;
+    }
+    //! <!-- [read] -->
+
+    //! <!-- [update] -->
+    {
+        __label__ fail_group, fail_prop, fail_lcpl, fail_file;
+        hid_t file, lcpl, group;
+        char  fname[] = "g1.h5";
+        char  path[]  = "/αυτή/είναι/μια/άλλη/νέα/ομάδα";
+
+        if ((file = H5Fopen(fname, H5F_ACC_RDWR, H5P_DEFAULT)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_file;
+        }
+
+        if ((lcpl = H5Pcreate(H5P_LINK_CREATE)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_lcpl;
+        }
+        // ensure that intermediate groups are created automatically
+        if (H5Pset_create_intermediate_group(lcpl, 1) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_prop;
+        }
+        // use UTF-8 encoding for link names
+        if (H5Pset_char_encoding(lcpl, H5T_CSET_UTF8) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_prop;
+        }
+        // create an anonymous group
+        if ((group = H5Gcreate_anon(file, H5P_DEFAULT, H5P_DEFAULT)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_group;
+        }
+        // link the new group to existing the group at "/αυτή/είναι/μια"
+        if (H5Lcreate_hard(group, ".", file, path, lcpl, H5P_DEFAULT) < 0) {
+            ret_val = EXIT_FAILURE;
+        }
+
+        H5Gclose(group);
+fail_group:
+fail_prop:
+        H5Pclose(lcpl);
+fail_lcpl:
+        H5Fclose(file);
+fail_file:;
+    }
+    //! <!-- [update] -->
+
+    //! <!-- [delete] -->
+    {
+        __label__ fail_info, fail_object, fail_file;
+        hid_t      file, obj;
+        char       fname[]       = "g1.h5";
+        char       path[]        = "/αυτή/είναι/μια/άλλη/νέα/ομάδα";
+        char       delete_path[] = "/αυτή/είναι/μια";
+        H5O_info_t info;
+
+        if ((file = H5Fopen(fname, H5F_ACC_RDWR, H5P_DEFAULT)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_file;
+        }
+
+        // open a "leaf" group as object
+        if ((obj = H5Oopen(file, path, H5P_DEFAULT)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_object;
+        }
+        // delete the link to an intermediate group on the path to the leaf
+        if (H5Ldelete(file, delete_path, H5P_DEFAULT) < 0) {
+            ret_val = EXIT_FAILURE;
+        }
+        // link deletion will propagate along hard links along all paths
+        // reachable from the intermediate group and cause reference counts to
+        // be decremented, freeing the objects if the count reaches 0
+        if (H5Oget_info(obj, &info, H5O_INFO_BASIC) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_info;
+        }
+
+        printf("Leaf reference count: %d\n", info.rc);
+
+fail_info:
+        H5Oclose(obj);
+fail_object:
+        H5Fclose(file);
+fail_file:;
+    }
+    //! <!-- [delete] -->
+
+    assert(ret_val == EXIT_SUCCESS);
+
+    return ret_val;
+}
diff --git a/doxygen/examples/H5I_examples.c b/doxygen/examples/H5I_examples.c
new file mode 100644
index 0000000..657e1b5
--- /dev/null
+++ b/doxygen/examples/H5I_examples.c
@@ -0,0 +1,242 @@
+/* -*- c-file-style: "stroustrup" -*- */
+
+#include "hdf5.h"
+
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int
+main(void)
+{
+    int ret_val = EXIT_SUCCESS;
+
+    //! <!-- [create] -->
+    {
+        __label__ fail_dcpl;
+        hid_t dcpl;
+
+        // create an ID of a pre-defined ID type
+        if ((dcpl = H5Pcreate(H5P_DATASET_XFER)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_dcpl;
+        }
+
+        // we can reliably predict the ID type
+        assert(H5Iget_type(dcpl) == H5I_GENPROP_LST);
+        printf("%d\n", H5Iget_type(dcpl));
+
+        H5Pclose(dcpl);
+fail_dcpl:;
+    }
+    //! <!-- [create] -->
+
+    //! <!-- [read] -->
+    {
+        __label__ fail_dcpl;
+        hid_t dcpl;
+
+        // create an ID of a pre-defined ID type
+        if ((dcpl = H5Pcreate(H5P_DATASET_XFER)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_dcpl;
+        }
+
+        // this better be valid
+        assert(H5Iis_valid(dcpl) > 0);
+
+        // this ID is NOT associated with any HDF5 file;
+        // see the error message
+        assert(H5Iget_file_id(dcpl) == H5I_INVALID_HID);
+
+        H5Pclose(dcpl);
+fail_dcpl:;
+    }
+    //! <!-- [read] -->
+
+    //! <!-- [update] -->
+    {
+        __label__ fail_rc, fail_dcpl;
+        hid_t dcpl;
+        int   rc;
+
+        // create an ID of a pre-defined ID type
+        if ((dcpl = H5Pcreate(H5P_DATASET_XFER)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_dcpl;
+        }
+
+        // retrieve the IDs reference count
+        if ((rc = H5Iget_ref(dcpl)) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_rc;
+        }
+        printf("Reference count: %d\n", rc);
+
+        // bump its reference count (by 1)
+        if ((rc = H5Iinc_ref(dcpl)) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_rc;
+        }
+        printf("Reference count: %d\n", rc);
+
+fail_rc:
+        H5Pclose(dcpl);
+fail_dcpl:;
+    }
+    //! <!-- [update] -->
+
+    //! <!-- [delete] -->
+    {
+        __label__ fail_rc, fail_dcpl;
+        hid_t dcpl;
+        int   rc;
+
+        // create an ID of a pre-defined ID type
+        if ((dcpl = H5Pcreate(H5P_DATASET_XFER)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_dcpl;
+        }
+
+        // decrease its reference count (from 1) to 0
+        if ((rc = H5Idec_ref(dcpl)) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_rc;
+        }
+        printf("Reference count: %d\n", rc);
+
+        // at this point, the ID is no longer valid
+        assert(H5Iis_valid(dcpl) == 0);
+
+        // dropping the ref. count to 0 has the side-effect of closing
+        // the associated item, and calling H5Pclose would create an error
+        goto fail_dcpl;
+
+fail_rc:
+        H5Pclose(dcpl);
+fail_dcpl:;
+    }
+    //! <!-- [delete] -->
+
+    //! <!-- [create_ud] -->
+    herr_t free_func(void *obj)
+    {
+        printf("Calling free_func...\n");
+        H5free_memory(obj);
+        return 0;
+    }
+
+    {
+        __label__ fail_id, fail_obj, fail_register;
+        H5I_type_t type;
+        int       *obj;
+        hid_t      obj_id;
+
+        // register a new ID type
+        if ((type = H5Iregister_type(128, 1024, &free_func)) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_register;
+        }
+        printf("New identifier type ID: %d\n", type);
+
+        // create a new object
+        if ((obj = H5allocate_memory(10 * sizeof(int), 0)) == NULL) {
+            ret_val = EXIT_FAILURE;
+            goto fail_obj;
+        }
+
+        // obtain an ID for the new object
+        if ((obj_id = H5Iregister(type, obj)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_id;
+        }
+        printf("New object identifier: %ld\n", obj_id);
+
+fail_id:
+        H5Iclear_type(type, 1);
+fail_obj:
+        H5Idestroy_type(type);
+fail_register:;
+    }
+    //! <!-- [create_ud] -->
+
+    //! <!-- [read_ud] -->
+    {
+        __label__ fail_query, fail_register;
+        H5I_type_t type;
+        hsize_t    count;
+
+        // register a new ID type
+        if ((type = H5Iregister_type(128, 1024, NULL)) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_register;
+        }
+        printf("New FOO identifier type ID: %d\n", type);
+
+        // return the number of identifiers of TYPE currently in use
+        if (H5Inmembers(type, &count) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_query;
+        }
+        printf("%llu FOO identifiers in use\n", count);
+
+fail_query:
+        H5Idestroy_type(type);
+fail_register:;
+    }
+    //! <!-- [read_ud] -->
+
+    //! <!-- [update_ud] -->
+    {
+        __label__ fail_id, fail_register;
+        H5I_type_t type;
+        int        obj = 42;
+        hid_t      obj_id;
+
+        // register a new ID type
+        if ((type = H5Iregister_type(128, 1024, NULL)) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_register;
+        }
+        printf("New identifier type ID: %d\n", type);
+
+        // obtain an ID for the new object
+        if ((obj_id = H5Iregister(type, &obj)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_id;
+        }
+        printf("New object identifier: %ld\n", obj_id);
+
+        // bump the reference count
+        assert(H5Iinc_ref(obj_id) == 2);
+
+        // force the deletion of all IDs regardless of reference count
+        H5Iclear_type(type, 1);
+fail_id:
+        H5Idestroy_type(type);
+fail_register:;
+    }
+    //! <!-- [update_ud] -->
+
+    //! <!-- [delete_ud] -->
+    {
+        __label__ fail_register;
+        H5I_type_t type;
+
+        // register a new ID type
+        if ((type = H5Iregister_type(128, 1024, NULL)) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_register;
+        }
+        printf("New identifier type ID: %d\n", type);
+
+        // decrementing the identifier type's ref. count to 0 triggers
+        // the type to be destroyed
+        assert(H5Idec_type_ref(type) == 0);
+
+fail_register:;
+    }
+    //! <!-- [delete_ud] -->
+
+    return ret_val;
+}
diff --git a/doxygen/examples/H5LDget_dset_elmts.c b/doxygen/examples/H5LDget_dset_elmts.c
new file mode 100644
index 0000000..e23299a
--- /dev/null
+++ b/doxygen/examples/H5LDget_dset_elmts.c
@@ -0,0 +1,143 @@
+/* -*- c-file-style: "stroustrup" -*- */
+
+//! <!-- [first_declare] -->
+
+DATASET "DSET1" {DATATYPE H5T_STD_I32LE DATASPACE SIMPLE{(4, 13) / (60, 100)} : : }
+
+//! <!-- [first_declare] -->
+
+//! <!-- [first_reading] -->
+
+/* open the HDF5 file */
+fid = H5Fopen(FILE, H5F_ACC_RDWR, H5P_DEFAULT);
+
+/* open the dataset */
+did = H5Dopen2(fid, "DSET1", H5P_DEFAULT);
+        :
+        :
+    /* define hsize_t dims[2]; */
+    /* define hsize_t new_dims[2]; */
+    /* get the dataset's current dimension sizes */
+    H5LDget_dset_dims(did, dims);
+
+        /* extend the dataset by 2 */
+        new_dims[0] = dims[0] + 2;
+        new_dims[1] = dims[1] + 2;
+        H5Dset_extent(did, new_dims)
+
+            /* write data to the extended dataset */
+            : :
+            /* get the size of the dataset's data type */
+            type_size = H5LDget_dset_type_size(did, NULL);
+        :
+        :
+    /* allocate buffer for storing selected data elements from the dataset */
+    /* calculate # of selected elements from dims & new_dims */
+    /* buffer size = type_size * number of selected elements */
+        :
+        :
+    /* read the selected elements from the dataset into buf */
+    H5LDget_dset_elmts(did, dims, new_dims, NULL, buf);
+        :
+        :
+    H5Dclose(did);
+        H5Fclose(fid);
+
+        //! <!-- [first_reading] -->
+
+        //! <!-- [first_output] -->
+
+    data for elements (0, 13), (0, 14) 
+    data for elements (1, 13), (1, 14) 
+    data for elements (2, 13), (2, 14) 
+    data for elements (3, 13), (3, 14)
+    data for elements (4, 0), (4, 1), (4, 2)......................(4, 13), (4, 14)
+    data for elements (5, 0), (5, 1), (5, 2)......................(5, 13), (5, 14)
+
+//! <!-- [first_output] -->
+
+
+//! <!-- [second_declare] -->
+
+    DATASET "DSET2" {
+    DATATYPE  H5T_COMPOUND {
+        H5T_STD_I32LE "a";
+    H5T_STD_I32LE "b";
+    H5T_ARRAY
+    {
+        [4] H5T_STD_I32LE
+    }
+    "c";
+    H5T_STD_I32LE "d";
+    H5T_STD_I32LE "e";
+    H5T_COMPOUND
+    {
+        H5T_STD_I32LE "a";
+        H5T_STD_I32LE "b";
+        H5T_ARRAY
+        {
+            [4] H5T_STD_I32LE
+        }
+        "c";
+        H5T_STD_I32LE "d";
+        H5T_STD_I32LE "e";
+    }
+    "s2";
+    }
+    DATASPACE SIMPLE
+    {
+        (5) / (5)
+    }
+    ::
+    }
+
+    //! <!-- [second_declare] -->
+
+    //! <!-- [second_reading] -->
+
+    /* open the HDF5 file */
+    fid = H5Fopen(FILE, H5F_ACC_RDWR, H5P_DEFAULT);
+
+    /* open the dataset */
+    did = H5Dopen2(fid, "DSET2", H5P_DEFAULT);
+
+    /* define hsize_t dims[1]; */
+    /* define hsize_t new_dims[1]; */
+        :
+        :
+    /* get the dataset's current dimension size */
+    H5LDget_dset_dims(did, dims);
+
+        /* extend the dataset by 2 */
+        new_dims[0] = dims[0] + 2;
+        H5Dset_extent(did, new_dims);
+        :
+        :
+    /* write data to the extended part of the dataset */
+        :
+        :
+    /* #define fields "d,s2.c" */
+    /* get the size of the dataset's data type for the selected fields */
+    type_size = H5LDget_dset_type_size(did, fields);
+        :
+        :
+    /* allocate buffer for storing selected data elements from the dataset */
+    /* calculate # of selected elements from dims & new_dims */
+    /* buffer size = type_size * number of selected elements */
+        :        
+        :
+    /* read the selected elements from the dataset into buf */
+    H5LD_get_dset_elmts(did, dims, new_dims, fields, buf);
+        :
+        :
+    H5Dclose(did);
+        H5Fclose(fid);
+
+        //! <!-- [second_reading] -->
+
+        //! <!-- [second_output] -->
+
+    Data for element (5): integer value for "d", 4 integer values for array "s2.c"
+    Data for element (6): integer value for "d", 4 integer values for array "s2.c"
+
+//! <!-- [second_output] -->
diff --git a/doxygen/examples/H5LT_examples.c b/doxygen/examples/H5LT_examples.c
new file mode 100644
index 0000000..5ed4c29
--- /dev/null
+++ b/doxygen/examples/H5LT_examples.c
@@ -0,0 +1,27 @@
+/* -*- c-file-style: "stroustrup" -*- */
+
+//! <!-- [get_attribute_info] -->
+
+H5T_class_t type_class;
+size_t      type_size;
+hsize_t     dims[0];
+... status = H5LTget_attribute_info(file_id, "/", STRNAME, dims, &type_class, &type_size);
+if (type_class == H5T_STRING) {
+    printf("Attribute is a string.\n");
+    printf("String size: %i\n", type_size);
+
+    //! <!-- [get_attribute_info] -->
+
+    //! <!-- [enum] -->
+
+    “H5T_ENUM
+    {
+        H5T_NATIVE_INT;
+        “Bob” 0;
+        “Elena” 1;
+        “Quincey” 2;
+        “Frank” 3;
+    }
+    ”
+
+//! <!-- [enum] -->
diff --git a/doxygen/examples/H5L_examples.c b/doxygen/examples/H5L_examples.c
new file mode 100644
index 0000000..63f54fe
--- /dev/null
+++ b/doxygen/examples/H5L_examples.c
@@ -0,0 +1,156 @@
+/* -*- c-file-style: "stroustrup" -*- */
+
+#include "hdf5.h"
+
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+//! <!-- [iter_cb] -->
+herr_t
+iter_cb(hid_t group, const char *name, const H5L_info_t *info, void *op_data)
+{
+    printf("Link \"%s\" is a", name);
+    switch (info->type) {
+        case H5L_TYPE_HARD:
+            printf(" hard link.\n");
+            break;
+        case H5L_TYPE_SOFT:
+            printf(" soft link.\n");
+            break;
+        case H5L_TYPE_EXTERNAL:
+            printf("n external link.\n");
+            break;
+        default:
+            printf(" UFO link.\n");
+            break;
+    }
+
+    return 0;
+}
+//! <!-- [iter_cb] -->
+
+int
+main(void)
+{
+    int ret_val = EXIT_SUCCESS;
+
+    //! <!-- [create] -->
+    {
+        __label__ fail_link, fail_prop, fail_lcpl, fail_create;
+
+        hid_t file, lcpl;
+
+        if ((file = H5Fcreate("l1.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_create;
+        }
+
+        // make link creation easier by auto-creating intermediate
+        // groups and UTF-8 encoding of link names
+        if ((lcpl = H5Pcreate(H5P_LINK_CREATE)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_lcpl;
+        }
+        if (H5Pset_create_intermediate_group(lcpl, 1) < 0 || H5Pset_char_encoding(lcpl, H5T_CSET_UTF8) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_prop;
+        }
+
+        // create a loop by hard linking the root group
+        if (H5Lcreate_hard(file, ".", file, "√", lcpl, H5P_DEFAULT) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_link;
+        }
+        // create a soft link to nowhere
+        if (H5Lcreate_soft("e1 62 80 87 04 09 43 ba 02 d3", file, "/path/to/nowhere", lcpl, H5P_DEFAULT) <
+            0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_link;
+        }
+        // create an external link to nowhere in a non-existent file
+        if (H5Lcreate_external("non-existent-file.h5", "???", file, "external", lcpl, H5P_DEFAULT) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_link;
+        }
+
+fail_link:
+fail_prop:
+        H5Pclose(lcpl);
+fail_lcpl:
+        H5Fclose(file);
+fail_create:;
+    }
+    //! <!-- [create] -->
+
+    //! <!-- [read] -->
+    {
+        __label__ fail_iterate, fail_read;
+        hid_t   file;
+        hsize_t idx = 0;
+
+        if ((file = H5Fopen("l1.h5", H5F_ACC_RDONLY, H5P_DEFAULT)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_read;
+        }
+
+        if (H5Literate(file, H5_INDEX_NAME, H5_ITER_NATIVE, &idx, iter_cb, NULL) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_iterate;
+        }
+
+fail_iterate:
+        H5Fclose(file);
+fail_read:;
+    }
+    //! <!-- [read] -->
+
+    //! <!-- [update] -->
+    {
+        __label__ fail_move, fail_update;
+        hid_t file;
+
+        if ((file = H5Fopen("l1.h5", H5F_ACC_RDWR, H5P_DEFAULT)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_update;
+        }
+
+        // move the "√" link to the group at "/path/to"
+        // the cycle remains!
+        if (H5Lmove(file, "√", file, "path/to/√", H5P_DEFAULT, H5P_DEFAULT) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_move;
+        }
+
+fail_move:
+        H5Fclose(file);
+fail_update:;
+    }
+    //! <!-- [update] -->
+
+    //! <!-- [delete] -->
+    {
+        __label__ fail_delete, fail_file;
+        hid_t file;
+
+        if ((file = H5Fopen("l1.h5", H5F_ACC_RDWR, H5P_DEFAULT)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_file;
+        }
+
+        // delete the "external" link
+        if (H5Ldelete(file, "external", H5P_DEFAULT) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_delete;
+        }
+
+fail_delete:
+        H5Fclose(file);
+fail_file:;
+    }
+    //! <!-- [delete] -->
+
+    assert(ret_val == EXIT_SUCCESS);
+
+    return ret_val;
+}
diff --git a/doxygen/examples/H5O_examples.c b/doxygen/examples/H5O_examples.c
new file mode 100644
index 0000000..296acd1
--- /dev/null
+++ b/doxygen/examples/H5O_examples.c
@@ -0,0 +1,193 @@
+/* -*- c-file-style: "stroustrup" -*- */
+
+#include "hdf5.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#define H5P_DEFAULTx2 H5P_DEFAULT, H5P_DEFAULT
+
+int
+main(void)
+{
+    int ret_val = EXIT_SUCCESS;
+
+    //! <!-- [create] -->
+    {
+        __label__ fail_file;
+        hid_t file, group;
+        char  src_path[] = "/a/few/groups";
+
+        if ((file = H5Fcreate("o1.h5", H5F_ACC_TRUNC, H5P_DEFAULTx2)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_file;
+        }
+
+        // create a few groups
+        {
+            __label__ fail_group, fail_lcpl;
+            hid_t lcpl;
+            if ((lcpl = H5Pcreate(H5P_LINK_CREATE)) == H5I_INVALID_HID) {
+                ret_val = EXIT_FAILURE;
+                goto fail_lcpl;
+            }
+            if (H5Pset_create_intermediate_group(lcpl, 1) < 0) {
+                ret_val = EXIT_FAILURE;
+                goto fail_group;
+            }
+            if ((group = H5Gcreate(file, src_path, lcpl, H5P_DEFAULTx2)) == H5I_INVALID_HID) {
+                ret_val = EXIT_FAILURE;
+                goto fail_group;
+            }
+
+            H5Gclose(group);
+fail_group:
+            H5Pclose(lcpl);
+fail_lcpl:;
+        }
+
+        // create a copy
+        if (H5Ocopy(file, ".", file, "copy of", H5P_DEFAULTx2) < 0) {
+            ret_val = EXIT_FAILURE;
+        }
+
+        H5Fclose(file);
+fail_file:;
+    }
+    //! <!-- [create] -->
+
+    //! <!-- [read] -->
+    {
+        __label__ fail_info, fail_file;
+        hid_t       file;
+        char        path[] = "/a/few/groups";
+        H5O_info2_t info;
+
+        if ((file = H5Fopen("o1.h5", H5F_ACC_RDONLY, H5P_DEFAULT)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_file;
+        }
+
+        // retrieve information about the object
+        if (H5Oget_info_by_name(file, path, &info, H5O_INFO_BASIC | H5O_INFO_NUM_ATTRS, H5P_DEFAULT) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_info;
+        }
+
+        // determine the object type
+        switch (info.type) {
+            case H5O_TYPE_GROUP:
+                printf("HDF5 group\n");
+                break;
+            case H5O_TYPE_DATASET:
+                printf("HDF5 dataset\n");
+                break;
+            case H5O_TYPE_NAMED_DATATYPE:
+                printf("HDF5 datatype\n");
+                break;
+            default:
+                printf("UFO?\n");
+                break;
+        }
+        // print basic information
+        printf("Reference count: %u\n", info.rc);
+        printf("Attribute count: %lld\n", info.num_attrs);
+
+fail_info:
+        H5Fclose(file);
+fail_file:;
+    }
+    //! <!-- [read] -->
+
+    //! <!-- [update] -->
+    {
+        __label__ fail_obj, fail_incr, fail_file;
+        hid_t       file, obj;
+        char        path[] = "/a/few/groups";
+        H5O_info2_t info;
+
+        if ((file = H5Fopen("o1.h5", H5F_ACC_RDWR, H5P_DEFAULT)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_file;
+        }
+
+        // open an object by path name
+        if ((obj = H5Oopen(file, path, H5P_DEFAULT)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_obj;
+        }
+
+        // bump its reference count (by 1)
+        if (H5Oincr_refcount(obj) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_incr;
+        }
+
+        // confirm the new reference count
+        if (H5Oget_info(obj, &info, H5O_INFO_BASIC) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_incr;
+        }
+        printf("Reference count: %u\n", info.rc);
+
+fail_incr:
+        H5Oclose(obj);
+fail_obj:
+        H5Fclose(file);
+fail_file:;
+    }
+    //! <!-- [update] -->
+
+    //! <!-- [delete] -->
+    {
+        __label__ fail_obj, fail_delete, fail_file;
+        hid_t       file, obj;
+        char        path[] = "/a/few/groups";
+        H5O_info2_t info;
+
+        if ((file = H5Fopen("o1.h5", H5F_ACC_RDWR, H5P_DEFAULT)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_file;
+        }
+
+        // open an object by path name
+        if ((obj = H5Oopen(file, path, H5P_DEFAULT)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_obj;
+        }
+
+        // render it inaccessible from the root group by deleting the one and
+        // only link to it; this drops the reference count by 1
+        if (H5Ldelete(file, path, H5P_DEFAULT) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_delete;
+        }
+
+        // confirm the new reference count
+        if (H5Oget_info(obj, &info, H5O_INFO_BASIC) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_delete;
+        }
+        printf("Reference count: %u\n", info.rc);
+
+        // if we close the file at this point, we'd be creating a tombstone,
+        // an object that cannot be reached and that cannot be reclaimed by the
+        // freespace manager; decrement the reference count to zero to prevent that
+        if (H5Idec_ref(obj) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_delete;
+        }
+        else
+            // attempting to close the object would be like a double H5Oclose and fail
+            goto fail_obj;
+
+fail_delete:
+        H5Oclose(obj);
+fail_obj:
+        H5Fclose(file);
+fail_file:;
+    }
+    //! <!-- [delete] -->
+
+    return ret_val;
+}
diff --git a/doxygen/examples/H5PL_examples.c b/doxygen/examples/H5PL_examples.c
new file mode 100644
index 0000000..d012d1b
--- /dev/null
+++ b/doxygen/examples/H5PL_examples.c
@@ -0,0 +1,97 @@
+/* -*- c-file-style: "stroustrup" -*- */
+
+#include "hdf5.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+int
+main(void)
+{
+    int ret_val = EXIT_SUCCESS;
+
+    //! <!-- [create] -->
+    {
+        __label__ fail_set;
+        // enable ONLY filter plugins
+        if (H5PLset_loading_state(H5PL_FILTER_PLUGIN) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_set;
+        }
+
+        // ensure that "/tmp" is at the front of the search path list
+        if (H5PLprepend("/tmp") < 0) {
+            ret_val = EXIT_FAILURE;
+        }
+
+fail_set:;
+    }
+    //! <!-- [create] -->
+
+    //! <!-- [read] -->
+    {
+        __label__ fail_read;
+        unsigned size, mask;
+        char     buf[255];
+
+        // retrieve the number of entries in the plugin path list
+        if (H5PLsize(&size) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_read;
+        }
+        printf("Number of stored plugin paths: %d\n", size);
+
+        // check the plugin state mask
+        if (H5PLget_loading_state(&mask) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_read;
+        }
+        printf("Filter plugins %s be loaded.\n", (mask & H5PL_FILTER_PLUGIN) == 1 ? "can" : "can't");
+        printf("VOL plugins %s be loaded.\n", (mask & H5PL_VOL_PLUGIN) == 2 ? "can" : "can't");
+
+        // print the paths in the plugin path list
+        for (unsigned i = 0; i < size; ++i) {
+            if (H5PLget(i, buf, 255) < 0) {
+                ret_val = EXIT_FAILURE;
+                break;
+            }
+            printf("%s\n", buf);
+        }
+
+fail_read:;
+    }
+    //! <!-- [read] -->
+
+    //! <!-- [update] -->
+    {
+        // replace "/tmp" with something more sensible
+        if (H5PLreplace("/foo/bar", 0) < 0) {
+            ret_val = EXIT_FAILURE;
+        }
+    }
+    //! <!-- [update] -->
+
+    //! <!-- [delete] -->
+    {
+        __label__ fail_delete;
+        unsigned size;
+
+        if (H5PLsize(&size) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_delete;
+        }
+
+        // clean out the list of plugin paths
+        for (int i = size - 1; i >= 0; --i) {
+            if (H5PLremove(i) < 0) {
+                ret_val = EXIT_FAILURE;
+                break;
+            }
+        }
+
+fail_delete:;
+    }
+    //! <!-- [delete] -->
+
+    return ret_val;
+}
diff --git a/doxygen/examples/H5P_examples.c b/doxygen/examples/H5P_examples.c
new file mode 100644
index 0000000..cdfc03b
--- /dev/null
+++ b/doxygen/examples/H5P_examples.c
@@ -0,0 +1,227 @@
+/* -*- c-file-style: "stroustrup" -*- */
+
+#include "hdf5.h"
+
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int
+main(void)
+{
+    int ret_val = EXIT_SUCCESS;
+
+    //! <!-- [create] -->
+    {
+        __label__ fail_dcpl;
+        hid_t dcpl;
+
+        // every property list is created as an instance of a suitable
+        // property list class
+        if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_dcpl;
+        }
+
+        // ...
+
+        H5Pclose(dcpl);
+fail_dcpl:;
+    }
+    //! <!-- [create] -->
+
+    //! <!-- [read] -->
+    {
+        __label__ fail_dcpl, fail_plist_cls_id;
+        hid_t dcpl, plist_cls_id;
+
+        if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_dcpl;
+        }
+        // to perform introspection on any kind of property list,
+        // we need to determine its property list class by obtaining a handle
+        if ((plist_cls_id = H5Pget_class(dcpl)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_plist_cls_id;
+        }
+        // Compare the handle to the handles of built-in or user-defined
+        // property list classes
+        assert(H5Pequal(plist_cls_id, H5P_DATASET_CREATE) > 0);
+
+fail_plist_cls_id:
+        H5Pclose(dcpl);
+fail_dcpl:;
+    }
+    //! <!-- [read] -->
+
+    //! <!-- [update] -->
+    {
+        __label__ fail_dcpl, fail_prop;
+        hid_t dcpl;
+
+        if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_dcpl;
+        }
+
+        // a property list is updated by adding (or removing) properties
+        if (H5Pset_fill_time(dcpl, H5D_FILL_TIME_NEVER) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_prop;
+        }
+
+fail_prop:
+        H5Pclose(dcpl);
+fail_dcpl:;
+    }
+    //! <!-- [update] -->
+
+    //! <!-- [delete] -->
+    {
+        __label__ fail_dcpl;
+        hid_t dcpl;
+
+        if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_dcpl;
+        }
+
+        // a property list is "deleted" by closing it
+        H5Pclose(dcpl);
+fail_dcpl:;
+    }
+    //! <!-- [delete] -->
+
+    //! <!-- [create_class] -->
+    {
+        __label__ fail_cls, fail_prop;
+        hid_t  plist_cls, plist;
+        int    izero = 0;
+        double dzero = 0.0;
+
+        // create a new property list class
+        if ((plist_cls = H5Pcreate_class(H5P_ROOT, "int & double", NULL, NULL, NULL, NULL, NULL, NULL)) ==
+            H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_cls;
+        }
+        // add a permanent integer property
+        if (H5Pregister2(plist_cls, "int", sizeof(int), &izero, NULL, NULL, NULL, NULL, NULL, NULL, NULL) <
+            0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_prop;
+        }
+        // add a permanent double property
+        if (H5Pregister2(plist_cls, "double", sizeof(double), &dzero, NULL, NULL, NULL, NULL, NULL, NULL,
+                         NULL) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_prop;
+        }
+        // create an instance of this user-defined property list class
+        if ((plist = H5Pcreate(plist_cls)) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_prop;
+        }
+
+        // ...
+
+        H5Pclose(plist);
+fail_prop:
+        H5Pclose_class(plist_cls);
+fail_cls:;
+    }
+    //! <!-- [create_class] -->
+
+    //! <!-- [read_class] -->
+    {
+        __label__ fail_cls, fail_prop, fail_plist;
+        hid_t  plist_cls, plist;
+        size_t nprops;
+
+        if ((plist_cls = H5Pcreate_class(H5P_ROOT, "ud_plist", NULL, NULL, NULL, NULL, NULL, NULL)) ==
+            H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_cls;
+        }
+        if ((plist = H5Pcreate(plist_cls)) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_prop;
+        }
+        if (H5Pinsert2(plist, "temp", 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_plist;
+        }
+        // count the registered properties of this class
+        if (H5Pget_nprops(plist_cls, &nprops) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_plist;
+        }
+        // this will be 0 as there are no registered properties
+        printf("Property list class has %lu registered properties.\n", nprops);
+
+        // count the properties in this property list
+        if (H5Pget_nprops(plist, &nprops) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_plist;
+        }
+        // will be 1 as there is one temporary property
+        printf("Property list has %lu property.\n", nprops);
+
+fail_plist:
+        H5Pclose(plist);
+fail_prop:
+        H5Pclose_class(plist_cls);
+fail_cls:;
+    }
+    //! <!-- [read_class] -->
+
+    //! <!-- [update_class] -->
+    {
+        __label__ fail_cls, fail_prop, fail_plist;
+        hid_t plist_cls, plist;
+
+        if ((plist_cls = H5Pcreate_class(H5P_ROOT, "ud_plist", NULL, NULL, NULL, NULL, NULL, NULL)) ==
+            H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_cls;
+        }
+        // create an instance of this user-defined property list class
+        if ((plist = H5Pcreate(plist_cls)) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_prop;
+        }
+        // insert a temporary property
+        if (H5Pinsert2(plist, "temp", 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_plist;
+        }
+
+fail_plist:
+        H5Pclose(plist);
+fail_prop:
+        H5Pclose_class(plist_cls);
+fail_cls:;
+    }
+    //! <!-- [update_class] -->
+
+    //! <!-- [delete_class] -->
+    {
+        __label__ fail_cls;
+        hid_t plist_cls;
+
+        if ((plist_cls = H5Pcreate_class(H5P_ROOT, "int & double", NULL, NULL, NULL, NULL, NULL, NULL)) ==
+            H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_cls;
+        }
+        // ...
+
+        // a user defined property list class is destroyed by closing the handle
+        H5Pclose_class(plist_cls);
+fail_cls:;
+    }
+    //! <!-- [delete_class] -->
+
+    return ret_val;
+}
diff --git a/doxygen/examples/H5Pget_metadata_read_attempts.1.c b/doxygen/examples/H5Pget_metadata_read_attempts.1.c
new file mode 100644
index 0000000..da325c0
--- /dev/null
+++ b/doxygen/examples/H5Pget_metadata_read_attempts.1.c
@@ -0,0 +1,22 @@
+/* Get a copy of file access property list */
+fapl = H5Pcreate(H5P_FILE_ACCESS);
+
+/* Retrieve the # of read attempts from the file access property list */
+H5Pget_metadata_read_attempts(fapl, &attempts);
+
+/*
+ *  The value returned in "attempts" will be 1 (default for non-SWMR access).
+ */
+
+/* Set the # of read attempts to 20 */
+H5Pset_metadata_read_attempts(fapl, 20);
+
+/* Retrieve the # of read attempts from the file access property list */
+H5Pget_metadata_read_attempts(fapl, &attempts);
+
+/*
+ *  The value returned in "attempts" will be 20 as set.
+ */
+
+/* Close the property list */
+H5Pclose(fapl);
diff --git a/doxygen/examples/H5Pget_metadata_read_attempts.2.c b/doxygen/examples/H5Pget_metadata_read_attempts.2.c
new file mode 100644
index 0000000..2cd12db
--- /dev/null
+++ b/doxygen/examples/H5Pget_metadata_read_attempts.2.c
@@ -0,0 +1,44 @@
+/* Open the file with SWMR access and default file access property list */
+fid = H5Fopen(FILE, (H5F_ACC_RDONLY | H5F_ACC_SWMR_READ), H5P_DEFAULT);
+
+/* Get the file's file access roperty list */
+file_fapl = H5Fget_access_plist(fid);
+
+/* Retrieve the # of read attempts from the file's file access property list */
+H5Pget_metadata_read_attempts(file_fapl, &attempts);
+
+/*
+ *  The value returned in "attempts" will be 100 (default for SWMR access).
+ */
+
+/* Close the property list */
+H5Pclose(file_fapl);
+
+/* Close the file */
+H5Fclose(fid);
+
+/* Create a copy of file access property list */
+fapl = H5Pcreate(H5P_FILE_ACCESS);
+
+/* Set the # of read attempts */
+H5Pset_metadata_read_attempts(fapl, 20);
+
+/* Open the file with SWMR access and the non-default file access property list */
+fid = H5Fopen(FILE, (H5F_ACC_RDONLY | H5F_ACC_SWMR_READ), fapl);
+
+/* Get the file's file access roperty list */
+file_fapl = H5Fget_access_plist(fid);
+
+/* Retrieve the # of read attempts from the file's file access property list */
+H5Pget_metadata_read_attempts(file_fapl, &attempts);
+
+/*
+ *  The value returned in "attempts" will be 20.
+ */
+
+/* Close the property lists */
+H5Pclose(file_fapl);
+H5Pclose(fapl);
+
+/* Close the file */
+H5Fclose(fid);
diff --git a/doxygen/examples/H5Pget_metadata_read_attempts.3.c b/doxygen/examples/H5Pget_metadata_read_attempts.3.c
new file mode 100644
index 0000000..4b5ea3a
--- /dev/null
+++ b/doxygen/examples/H5Pget_metadata_read_attempts.3.c
@@ -0,0 +1,44 @@
+/* Open the file with non-SWMR access and default file access property list */
+fid = H5Fopen(FILE, H5F_ACC_RDONLY, H5P_DEFAULT);
+
+/* Get the file's file access roperty list */
+file_fapl = H5Fget_access_plist(fid);
+
+/* Retrieve the # of read attempts from the file's file access property list */
+H5Pget_metadata_read_attempts(file_fapl, &attempts);
+
+/*
+ *  The value returned in "attempts" will be 1 (default for non-SWMR access).
+ */
+
+/* Close the property list */
+H5Pclose(file_fapl);
+
+/* Close the file */
+H5Fclose(fid);
+
+/* Create a copy of file access property list */
+fapl = H5Pcreate(H5P_FILE_ACCESS);
+
+/* Set the # of read attempts */
+H5Pset_metadata_read_attempts(fapl, 20);
+
+/* Open the file with non-SWMR access and the non-default file access property list */
+fid = H5Fopen(FILE, H5F_ACC_RDONLY, fapl);
+
+/* Get the file's file access roperty list */
+file_fapl = H5Fget_access_plist(fid);
+
+/* Retrieve the # of read attempts from the file's file access property list */
+H5Pget_metadata_read_attempts(file_fapl, &attempts);
+
+/*
+ *  The value returned in "attempts" will be 1 (default for non-SWMR access).
+ */
+
+/* Close the property lists */
+H5Pclose(file_fapl);
+H5Pclose(fapl);
+
+/* Close the file */
+H5Fclose(fid);
diff --git a/doxygen/examples/H5Pget_object_flush_cb.c b/doxygen/examples/H5Pget_object_flush_cb.c
new file mode 100644
index 0000000..b3854f0
--- /dev/null
+++ b/doxygen/examples/H5Pget_object_flush_cb.c
@@ -0,0 +1,41 @@
+hid_t               fapl_id;
+unsigned            counter;
+H5F_object_flush_t *ret_cb;
+unsigned           *ret_counter;
+
+/* Create a copy of the file access property list */
+fapl_id = H5Pcreate(H5P_FILE_ACCESS);
+
+/* Set up the object flush property values */
+/* flush_cb: callback function to invoke when an object flushes (see below) */
+/* counter: user data to pass along to the callback function */
+H5Pset_object_flush_cb(fapl_id, flush_cb, &counter);
+
+/* Open the file */
+file_id = H5Fopen(FILE, H5F_ACC_RDWR, H5P_DEFAULT);
+
+/* Get the file access property list for the file */
+fapl = H5Fget_access_plist(file_id);
+
+/* Retrieve the object flush property values for the file */
+H5Pget_object_flush_cb(fapl, &ret_cb, &ret_counter);
+/* ret_cb will point to flush_cb() */
+/* ret_counter will point to counter */
+
+/*
+.
+.
+.
+.
+.
+.
+*/
+
+/* The callback function for the object flush property */
+static herr_t
+flush_cb(hid_t obj_id, void *_udata)
+{
+    unsigned *flush_ct = (unsigned *)_udata;
+    ++(*flush_ct);
+    return 0;
+}
diff --git a/doxygen/examples/H5Pset_metadata_read_attempts.c b/doxygen/examples/H5Pset_metadata_read_attempts.c
new file mode 100644
index 0000000..7c2f65d
--- /dev/null
+++ b/doxygen/examples/H5Pset_metadata_read_attempts.c
@@ -0,0 +1,59 @@
+//! [SWMR Access]
+/* Create a copy of file access property list */
+fapl = H5Pcreate(H5P_FILE_ACCESS);
+
+/* Set the # of read attempts */
+H5Pset_metadata_read_attempts(fapl, 20);
+
+/* Open the file with SWMR access and the non-default file access property list */
+fid = H5Fopen(FILE, (H5F_ACC_RDONLY | H5F_ACC_SWMR_READ), fapl);
+
+/* Get the file's file access roperty list */
+file_fapl = H5Fget_access_plist(fid);
+
+/* Retrieve the # of read attempts from the file's file access property list */
+H5Pget_metadata_read_attempts(file_fapl, &attempts);
+
+/*
+ * The value returned in "attempts" will be 20.
+ * The library will use 20 as the number of read attempts
+ * when reading checksummed metadata in the file
+ */
+
+/* Close the property list */
+H5Pclose(fapl);
+H5Pclose(file_fapl);
+
+/* Close the file */
+H5Fclose(fid);
+//! [SWMR Access]
+
+//! [non-SWMR Access]
+/* Create a copy of file access property list */
+fapl = H5Pcreate(H5P_FILE_ACCESS);
+
+/* Set the # of read attempts */
+H5Pset_metadata_read_attempts(fapl, 20);
+
+/* Open the file with SWMR access and the non-default file access property list */
+fid = H5Fopen(FILE, H5F_ACC_RDONLY, fapl);
+
+/* Get the file's file access roperty list */
+file_fapl = H5Fget_access_plist(fid);
+
+/* Retrieve the # of read attempts from the file's file access property list */
+H5Pget_metadata_read_attempts(file_fapl, &attempts);
+
+/*
+ * The value returned in "attempts" will be 1 (default for non-SWMR access).
+ * The library will use 1 as the number of read attempts
+ * when reading checksummed metadata in the file
+ */
+
+/* Close the property lists */
+H5Pclose(fapl);
+H5Pclose(file_fapl);
+
+/* Close the file */
+H5Fclose(fid);
+//! [non-SWMR Access]
diff --git a/doxygen/examples/H5Pset_object_flush_cb.c b/doxygen/examples/H5Pset_object_flush_cb.c
new file mode 100644
index 0000000..1dfa90d
--- /dev/null
+++ b/doxygen/examples/H5Pset_object_flush_cb.c
@@ -0,0 +1,41 @@
+hid_t    file_id, fapl_id;
+hid_t    dataset_id, dapl_id;
+unsigned counter;
+
+/* Create a copy of the file access property list */
+fapl_id = H5Pcreate(H5P_FILE_ACCESS);
+
+/* Set up the object flush property values */
+/* flush_cb: callback function to invoke when an object flushes (see below) */
+/* counter: user data to pass along to the callback function */
+H5Pset_object_flush_cb(fapl_id, flush_cb, &counter);
+
+/* Open the file */
+file_id = H5Fopen(FILE, H5F_ACC_RDWR, H5P_DEFAULT);
+
+/* Create a group */
+gid = H5Gcreate2(fid, “group”, H5P_DEFAULT, H5P_DEFAULT_H5P_DEFAULT);
+
+/* Open a dataset */
+dataset_id = H5Dopen2(file_id, DATASET, H5P_DEFAULT);
+
+/* The flush will invoke flush_cb() with counter */
+H5Dflush(dataset_id);
+/* counter will be equal to 1 */
+
+/* ... */
+
+/* The flush will invoke flush_cb() with counter */
+H5Gflush(gid);
+/* counter will be equal to 2 */
+
+/* ... */
+
+/* The callback function for object flush property */
+static herr_t
+flush_cb(hid_t obj_id, void *_udata)
+{
+    unsigned *flush_ct = (unsigned *)_udata;
+    ++(*flush_ct);
+    return 0;
+}
diff --git a/doxygen/examples/H5R_examples.c b/doxygen/examples/H5R_examples.c
new file mode 100644
index 0000000..b40b992
--- /dev/null
+++ b/doxygen/examples/H5R_examples.c
@@ -0,0 +1,171 @@
+/* -*- c-file-style: "stroustrup" -*- */
+
+#include "hdf5.h"
+
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int
+main(void)
+{
+    int ret_val = EXIT_SUCCESS;
+
+    //! <!-- [create] -->
+    {
+        __label__ fail_file, fail_fspace, fail_dset, fail_sel, fail_aspace, fail_attr, fail_awrite;
+        hid_t     file, fspace, dset, aspace, attr;
+        H5R_ref_t ref;
+
+        if ((file = H5Fcreate("reference.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_file;
+        }
+        // create a region reference which selects all elements of the dataset at "/data"
+        if ((fspace = H5Screate_simple(2, (hsize_t[]){10, 20}, NULL)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_fspace;
+        }
+        if ((dset = H5Dcreate(file, "data", H5T_STD_I32LE, fspace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) ==
+            H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_dset;
+        }
+        if (H5Sselect_all(fspace) < 0 || H5Rcreate_region(file, "data", fspace, H5P_DEFAULT, &ref) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_sel;
+        }
+        // store the region reference in a scalar attribute of the root group called "region"
+        if ((aspace = H5Screate(H5S_SCALAR)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_aspace;
+        }
+        if ((attr = H5Acreate(file, "region", H5T_STD_REF, aspace, H5P_DEFAULT, H5P_DEFAULT)) ==
+            H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_attr;
+        }
+        if (H5Awrite(attr, H5T_STD_REF, &ref) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_awrite;
+        }
+
+fail_awrite:
+        H5Aclose(attr);
+fail_attr:
+        H5Sclose(aspace);
+fail_aspace:
+        H5Rdestroy(&ref);
+fail_sel:
+        H5Dclose(dset);
+fail_dset:
+        H5Sclose(fspace);
+fail_fspace:
+        H5Fclose(file);
+fail_file:;
+    }
+    //! <!-- [create] -->
+
+    //! <!-- [read] -->
+    {
+        __label__ fail_file, fail_attr, fail_aread;
+        hid_t     file, attr;
+        H5R_ref_t ref;
+
+        if ((file = H5Fopen("reference.h5", H5F_ACC_RDONLY, H5P_DEFAULT)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_file;
+        }
+
+        // read the dataset region reference from the attribute
+        if ((attr = H5Aopen(file, "region", H5P_DEFAULT)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_attr;
+        }
+        if (H5Aread(attr, H5T_STD_REF, &ref) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_aread;
+        }
+        assert(H5Rget_type(&ref) == H5R_DATASET_REGION2);
+
+        // get an HDF5 path name for the dataset of the region reference
+        {
+            char buf[255];
+            if (H5Rget_obj_name(&ref, H5P_DEFAULT, buf, 255) < 0) {
+                ret_val = EXIT_FAILURE;
+            }
+            printf("Object name: \"%s\"\n", buf);
+        }
+
+        H5Rdestroy(&ref);
+fail_aread:
+        H5Aclose(attr);
+fail_attr:
+        H5Fclose(file);
+fail_file:;
+    }
+    //! <!-- [read] -->
+
+    //! <!-- [update] -->
+    {
+        __label__ fail_file, fail_attr, fail_ref;
+        hid_t     file, attr;
+        H5R_ref_t ref;
+
+        if ((file = H5Fopen("reference.h5", H5F_ACC_RDWR, H5P_DEFAULT)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_file;
+        }
+
+        // H5T_STD_REF is a generic reference type
+        // we can "update" the attribute value to refer to the attribute itself
+        if ((attr = H5Aopen(file, "region", H5P_DEFAULT)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_attr;
+        }
+        if (H5Rcreate_attr(file, "data", "region", H5P_DEFAULT, &ref) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_ref;
+        }
+
+        assert(H5Rget_type(&ref) == H5R_ATTR);
+
+        if (H5Awrite(attr, H5T_STD_REF, &ref) < 0) {
+            ret_val = EXIT_FAILURE;
+        }
+
+        H5Rdestroy(&ref);
+fail_ref:
+        H5Aclose(attr);
+fail_attr:
+        H5Fclose(file);
+fail_file:;
+    }
+    //! <!-- [update] -->
+
+    //! <!-- [delete] -->
+    {
+        __label__ fail_file, fail_ref;
+        hid_t     file;
+        H5R_ref_t ref;
+
+        // create an HDF5 object reference to the root group
+        if ((file = H5Fopen("reference.h5", H5F_ACC_RDONLY, H5P_DEFAULT)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_file;
+        }
+        if (H5Rcreate_object(file, ".", H5P_DEFAULT, &ref) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_ref;
+        }
+
+        // H5Rdestroy() releases all resources associated with an HDF5 reference
+        H5Rdestroy(&ref);
+fail_ref:
+        H5Fclose(file);
+fail_file:;
+    }
+    //! <!-- [delete] -->
+
+    return ret_val;
+}
diff --git a/doxygen/examples/H5S_examples.c b/doxygen/examples/H5S_examples.c
new file mode 100644
index 0000000..c542ec0
--- /dev/null
+++ b/doxygen/examples/H5S_examples.c
@@ -0,0 +1,132 @@
+/* -*- c-file-style: "stroustrup" -*- */
+
+#include "hdf5.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+int
+main(void)
+{
+    int ret_val = EXIT_SUCCESS;
+
+    //! <!-- [create] -->
+    {
+        __label__ fail_dspace;
+        hid_t dspace;
+
+        // create a 2D chess board shape (8x8)
+        if ((dspace = H5Screate_simple(2, (hsize_t[]){8, 8}, NULL)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_dspace;
+        }
+
+        H5Sclose(dspace);
+fail_dspace:;
+    }
+    //! <!-- [create] -->
+
+    //! <!-- [read] -->
+    {
+        __label__ fail_dspace;
+        hid_t dspace;
+
+        if ((dspace = H5Screate(H5S_NULL)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_dspace;
+        }
+
+        // make changes to the selection on DSPACE
+        // ...
+        // parse the resulting selection
+
+        switch (H5Sget_select_type(dspace)) {
+            case H5S_SEL_HYPERSLABS:
+                // we are dealing with a hyperslab selection
+                // determine the regularity and block structure
+                break;
+            case H5S_SEL_POINTS:
+                // we are dealing with a point selection
+                // for example, retrieve the point list
+                break;
+            case H5S_SEL_ALL:
+                // all dataset elements are selected
+                break;
+            case H5S_SEL_NONE:
+                // the selection is empty
+                break;
+            default:
+                ret_val = EXIT_FAILURE;
+                break;
+        }
+
+        if (dspace != H5S_ALL)
+            H5Sclose(dspace);
+
+fail_dspace:;
+    }
+    //! <!-- [read] -->
+
+    //! <!-- [update] -->
+    {
+        __label__ fail_select, fail_dspace;
+        hid_t dspace;
+
+        // create a 2D chess board shape (8x8)
+        if ((dspace = H5Screate_simple(2, (hsize_t[]){8, 8}, NULL)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_dspace;
+        }
+        // select all black fields: do this w/ a hyperslab union in two steps
+
+        // select the black fields on even rows
+        if (H5Sselect_hyperslab(dspace, H5S_SELECT_SET, (hsize_t[]){0, 0}, (hsize_t[]){2, 2},
+                                (hsize_t[]){4, 4}, NULL) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_select;
+        }
+        // select the black fields on odd rows
+        // notice the H5S_SELECT_OR operator
+        if (H5Sselect_hyperslab(dspace, H5S_SELECT_OR, (hsize_t[]){1, 1}, (hsize_t[]){2, 2},
+                                (hsize_t[]){4, 4}, NULL) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_select;
+        }
+
+        // should be 32
+        printf("%lld elements selected.\n", H5Sget_select_npoints(dspace));
+
+fail_select:
+        H5Sclose(dspace);
+fail_dspace:;
+    }
+    //! <!-- [update] -->
+
+    //! <!-- [delete] -->
+    {
+        __label__ fail_select, fail_dspace;
+        hid_t dspace;
+
+        if ((dspace = H5Screate(H5S_NULL)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_dspace;
+        }
+
+        // make changes to and work with the selection on DSPACE
+        // ...
+        // finally, clear the selection
+
+        if (H5Sselect_none(dspace) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_select;
+        }
+
+fail_select:
+        if (dspace != H5S_ALL)
+            H5Sclose(dspace);
+fail_dspace:;
+    }
+    //! <!-- [delete] -->
+
+    return ret_val;
+}
diff --git a/doxygen/examples/H5TBAget_fill.c b/doxygen/examples/H5TBAget_fill.c
new file mode 100644
index 0000000..15eae8b
--- /dev/null
+++ b/doxygen/examples/H5TBAget_fill.c
@@ -0,0 +1,43 @@
+unsigned char tmp_fill_buf[40];
+...
+
+    file_id = H5Fopen(FILENAME, H5F_ACC_RDWR, H5P_DEFAULT);
+dataset_id  = H5Dopen(file_id, TABLE_NAME, H5P_DEFAULT);
+datatype_id = H5Dget_type(dataset_id);
+
+status = H5TBget_table_info(file_id, TABLE_NAME, &nfields, &nrecords);
+
+hasfill = H5TBAget_fill(file_id, TABLE_NAME, dataset_id, tmp_fill_buf);
+
+for (i = 0; i < nfields; i++) {
+    member_type_id     = H5Tget_member_type(datatype_id, (unsigned)i);
+    native_mem_type_id = H5Tget_native_type(member_type_id, H5T_DIR_ASCEND);
+    member_offset      = H5Tget_member_offset(datatype_id, (unsigned)i);
+    printf("member_offset: %i\n", member_offset);
+    memb_class = H5Tget_class(member_type_id);
+    switch (memb_class) {
+        case H5T_INTEGER:
+            /* convert unsigned char array to integer */
+            break;
+        case H5T_FLOAT:
+            /* convert unsigned char array to double or float */
+
+            if (H5Tequal(native_mem_type_id, H5T_NATIVE_DOUBLE)) {
+            }
+            else if (H5Tequal(native_mem_type_id, H5T_NATIVE_FLOAT)) {
+                f.i = tmp_fill_buf[member_offset] | (tmp_fill_buf[member_offset + 1] << 8) |
+                      (tmp_fill_buf[member_offset + 2] << 16) | (tmp_fill_buf[member_offset + 3] << 24);
+                printf("Field %i  Fill Value:  %lf\n", i, f.f);
+            }
+            break;
+
+        case H5T_STRING:
+            /* convert unsigned char array to string */
+            strsize = H5Tget_size(member_type_id);
+
+            printf("Field %i  Fill Value: ", i);
+            for (j = 0; j < strsize; j++)
+                printf("%c", tmp_fill_buf[member_offset + j]);
+            printf("\n");
+            break;
+    }
diff --git a/doxygen/examples/H5T_examples.c b/doxygen/examples/H5T_examples.c
new file mode 100644
index 0000000..7cfa7d4
--- /dev/null
+++ b/doxygen/examples/H5T_examples.c
@@ -0,0 +1,136 @@
+/* -*- c-file-style: "stroustrup" -*- */
+
+#include "hdf5.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+int
+main(void)
+{
+    int ret_val = EXIT_SUCCESS;
+
+    //! <!-- [create] -->
+    {
+        __label__ fail_insert, fail_dtype, fail_file;
+        hid_t file, dtype;
+
+        if ((file = H5Fcreate("t1.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_file;
+        }
+        // create a compound datatype with room for real and imaginary parts
+        if ((dtype = H5Tcreate(H5T_COMPOUND, 2 * sizeof(double))) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_dtype;
+        }
+        // add the real part now and the imaginary part later
+        if (H5Tinsert(dtype, "re", 0, H5T_IEEE_F64LE) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_insert;
+        }
+        // commit the datatype definition to the file
+        if (H5Tcommit(file, "pre-complex", dtype, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) {
+            ret_val = EXIT_FAILURE;
+        }
+
+fail_insert:
+        H5Tclose(dtype);
+fail_dtype:
+        H5Fclose(file);
+fail_file:;
+    }
+    //! <!-- [create] -->
+
+    //! <!-- [read] -->
+    {
+        __label__ fail_dtype, fail_file;
+        hid_t file, dtype;
+
+        if ((file = H5Fopen("t1.h5", H5F_ACC_RDONLY, H5P_DEFAULT)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_file;
+        }
+        // open the datatype object stored in the file
+        if ((dtype = H5Topen(file, "pre-complex", H5P_DEFAULT)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_dtype;
+        }
+
+        switch (H5Tget_class(dtype)) { // this time we are only interested in compounds
+            case H5T_COMPOUND:
+                printf("Record size: %lu bytes\n", H5Tget_size(dtype));
+                printf("Record has %d field(s).\n", H5Tget_nmembers(dtype));
+                break;
+            default:
+                break;
+        }
+
+        H5Tclose(dtype);
+fail_dtype:
+        H5Fclose(file);
+fail_file:;
+    }
+    //! <!-- [read] -->
+
+    //! <!-- [update] -->
+    {
+        __label__ fail_insert, fail_clone, fail_dtype, fail_file;
+        hid_t file, dtype, clone;
+
+        if ((file = H5Fopen("t1.h5", H5F_ACC_RDWR, H5P_DEFAULT)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_file;
+        }
+        // open the datatype object stored in the file
+        if ((dtype = H5Topen(file, "pre-complex", H5P_DEFAULT)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_dtype;
+        }
+        // the original datatype object is immutable and we need to clone it
+        if ((clone = H5Tcopy(dtype)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_clone;
+        }
+        // remember that the original has enough room for real and imaginary parts
+        // add the imaginary part
+        if (H5Tinsert(clone, "im", sizeof(double), H5T_IEEE_F64LE) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_insert;
+        }
+        // commit the "updated" datatype definition to the file
+        if (H5Tcommit(file, "complex", clone, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) {
+            ret_val = EXIT_FAILURE;
+        }
+
+fail_insert:
+        H5Tclose(clone);
+fail_clone:
+        H5Tclose(dtype);
+fail_dtype:
+        H5Fclose(file);
+fail_file:;
+    }
+    //! <!-- [update] -->
+
+    //! <!-- [delete] -->
+    {
+        __label__ fail_file;
+        hid_t file;
+
+        if ((file = H5Fopen("t1.h5", H5F_ACC_RDWR, H5P_DEFAULT)) == H5I_INVALID_HID) {
+            ret_val = EXIT_FAILURE;
+            goto fail_file;
+        }
+        // delete the "pre-complex" datatype by unlinking
+        if (H5Ldelete(file, "pre-complex", H5P_DEFAULT) < 0) {
+            ret_val = EXIT_FAILURE;
+        }
+
+        H5Fclose(file);
+fail_file:;
+    }
+    //! <!-- [delete] -->
+
+    return ret_val;
+}
diff --git a/doxygen/examples/H5Z_examples.c b/doxygen/examples/H5Z_examples.c
new file mode 100644
index 0000000..28a1ea2
--- /dev/null
+++ b/doxygen/examples/H5Z_examples.c
@@ -0,0 +1,108 @@
+/* -*- c-file-style: "stroustrup" -*- */
+
+#include "hdf5.h"
+
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+//! <!-- [filter] -->
+size_t
+filter(unsigned int flags, size_t cd_nelmts, const unsigned int cd_values[], size_t nbytes, size_t *buf_size,
+       void **buf)
+{
+    buf_size = 0;
+
+    if (flags & H5Z_FLAG_REVERSE) {
+        // read data, e.g., decompress data
+        // ...
+    }
+    else {
+        // write data, e.g., compress data
+        // ...
+    }
+
+    return nbytes;
+}
+//! <!-- [filter] -->
+
+int
+main(void)
+{
+    int ret_val = EXIT_SUCCESS;
+
+    //! <!-- [create] -->
+    {
+        __label__ fail_register;
+        H5Z_class_t cls;
+        cls.version         = H5Z_CLASS_T_VERS;
+        cls.id              = 256;
+        cls.encoder_present = 1;
+        cls.decoder_present = 1;
+        cls.name            = "Identity filter";
+        cls.can_apply       = NULL;
+        cls.set_local       = NULL;
+        cls.filter          = &filter;
+
+        // register the filter
+        if (H5Zregister(&cls) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_register;
+        }
+
+        // do something with filter
+        // ...
+
+        // unregister the filter if no longer required
+        // ...
+
+fail_register:;
+    }
+    //! <!-- [create] -->
+
+    //! <!-- [read] -->
+    {
+        __label__ fail_avail;
+
+        H5Z_filter_t flt   = H5Z_FILTER_DEFLATE;
+        unsigned     flags = 0;
+
+        // check if the deflate filter is available
+        if (H5Zfilter_avail(flt) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_avail;
+        }
+        // retrieve the deflate filter info
+        if (H5Zget_filter_info(flt, &flags) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_avail;
+        }
+
+        // check if the deflate encoder or decoder is enabled
+        if (H5Z_FILTER_CONFIG_ENCODE_ENABLED & flags)
+            printf("Deflate encoder enabled.\n");
+        if (H5Z_FILTER_CONFIG_DECODE_ENABLED & flags)
+            printf("Deflate decoder enabled.\n");
+
+fail_avail:;
+    }
+    //! <!-- [read] -->
+
+    //! <!-- [update] -->
+    {
+        // N/A
+    } //! <!-- [update] -->
+
+    //! <!-- [delete] -->
+    {
+        // unregister the identity filter
+        if (H5Zunregister(256) < 0) {
+            ret_val = EXIT_FAILURE;
+        }
+    }
+    //! <!-- [delete] -->
+
+    assert(ret_val == EXIT_SUCCESS);
+
+    return ret_val;
+}
diff --git a/doxygen/examples/H5_examples.c b/doxygen/examples/H5_examples.c
new file mode 100644
index 0000000..ef52ed0
--- /dev/null
+++ b/doxygen/examples/H5_examples.c
@@ -0,0 +1,85 @@
+/* -*- c-file-style: "stroustrup" -*- */
+
+#include "hdf5.h"
+
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+//! <!-- [closing_shop] -->
+void
+closing_shop(void *ctx)
+{
+    printf("GoodBye, Cruel World!\n");
+}
+//! <!-- [closing_shop] -->
+
+int
+main(void)
+{
+    int ret_val = EXIT_SUCCESS;
+
+    //! <!-- [create] -->
+    {
+        // an HDF5 library instance is automatically initialized as
+        // part of the first HDF5 API call, but there's no harm in
+        // calling H5open().
+        if (H5open() < 0) {
+            ret_val = EXIT_FAILURE;
+        }
+    }
+    //! <!-- [create] -->
+
+    //! <!-- [read] -->
+    {
+        __label__ fail_read;
+        unsigned majnum, minnum, relnum;
+        hbool_t  flag;
+
+        // retrieve the library version
+        if (H5get_libversion(&majnum, &minnum, &relnum) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_read;
+        }
+        // is this a thread-safe library build?
+        if (H5is_library_threadsafe(&flag) < 0) {
+            ret_val = EXIT_FAILURE;
+            goto fail_read;
+        }
+
+        printf("Welcome to HDF5 %d.%d.%d\n", majnum, minnum, relnum);
+        printf("Thread-safety %s\n", (flag > 0) ? "enabled" : "disabled");
+
+fail_read:;
+    }
+    //! <!-- [read] -->
+
+    //! <!-- [update] -->
+    {
+        // update the library instance free list limits
+        if (H5set_free_list_limits(512 * 1024, 32 * 1024, 2048 * 1024, 128 * 1024, 8192 * 1024, 512 * 1024) <
+            0) {
+            ret_val = EXIT_FAILURE;
+        }
+    }
+    //! <!-- [update] -->
+
+    //! <!-- [delete] -->
+    {
+#if H5_VERSION_GE(1, 13, 0)
+        // install a finalization routine
+        if (H5atclose(&closing_shop, NULL) < 0) {
+            ret_val = EXIT_FAILURE;
+        }
+#endif
+        // close shop
+        if (H5close() < 0) {
+            ret_val = EXIT_FAILURE;
+        }
+    }
+    //! <!-- [delete] -->
+
+    assert(ret_val == EXIT_SUCCESS);
+
+    return ret_val;
+}
diff --git a/doxygen/examples/IOFlow.html b/doxygen/examples/IOFlow.html
new file mode 100644
index 0000000..6b2c27e
--- /dev/null
+++ b/doxygen/examples/IOFlow.html
@@ -0,0 +1,137 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!-- saved from url=(0064)https://gamma.hdfgroup.org/papers/HISS/030821.IOFlow/IOFlow.html -->
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>HDF5 Raw I/O Flow Notes</title>
+
+  <meta name="author" content="Quincey Koziol">
+</head>
+
+<body text="#000000" bgcolor="#FFFFFF">
+
+<style type="text/css">
+OL.loweralpha { list-style-type: lower-alpha }
+OL.upperroman { list-style-type: upper-roman }
+</style>
+
+<center><h1>HDF5 Raw I/O Flow Notes</h1></center>
+<center><h3>Quincey Koziol<br>
+            koziol@ncsa.uiuc.edu<br>
+            August 20, 2003
+</h3></center>
+
+<ol class="upperroman">
+
+<li><h3><u>Document's Audience:</u></h3>
+
+<ul>
+    <li>Current H5 library designers and knowledgable external developers.</li>
+</ul>
+
+</li><li><h3><u>Background Reading:</u></h3>
+
+</li><li><h3><u>Introduction:</u></h3>
+
+<dl>
+    <dt><strong>What is this document about?</strong></dt>
+        <dd>This document attempts to supplement the flow charts describing
+            the flow of control for raw data I/O in the library.
+        </dd> <br>
+</dl>
+
+</li><li><h3><u>Figures:</u></h3>
+<p>The following figures provide the main information:</p>
+    <table>
+      <tr><td><img src="IOFlow.gif" alt="High-Level View of Writing Raw Data" style="height:50%;"></td></tr>
+      <tr><td><img src="IOFlow2.gif" alt="Perform Serial or Parallel I/O" style="height:50%;"></td></tr>
+      <tr><td><img src="IOFlow3.gif" alt="Gather/Convert/Scatter" style="height:50%;"></td></tr>
+    </table>
+
+</li><li><h3><u>Notes From Accompanying Figures:</u></h3>
+
+<p>This section provides notes to augment the information in the accompanying
+    figures.
+</p>
+
+<ol>
+    <li><b>Validate Parameters</b> - Resolve any H5S_ALL parameters
+        for dataspace selections to actual dataspaces, allocate
+        conversion buffers, etc.
+    </li>
+
+    <li><b>Space Allocated in File?</b> - Space may not have been allocated
+        in the file to store the dataset data, if "late allocation" was chosen
+        for the allocation time when the dataset was created.
+    </li>
+
+    <li><b>Allocate &amp; Fill Space</b> - These operations allocate both contiguous
+        and chunked dataset's space in the file.  The chunked dataset space
+        allocation iterates through all the chunks in the file and allocates
+        both the B-tree information and the raw data in the file.  Because of
+        the way filters work, fill-values are written out for chunked datasets
+        as they are allocated, instead of as a separate step.
+        In parallel
+        I/O, the chunked dataset allocation can potentially be time-consuming,
+        since all the raw data in the dataset is allocated from one process.
+    </li>
+
+    <li><b>Datatype Conversion Needed?</b> - This currently is the deciding
+        factor between doing "direct I/O" (in serial or parallel) and needing
+        to perform gather/convert/scatter operations.  I believe that MPI
+        is capable of performing a limited range of type conversions and if so,
+        we should add support to detect when they can be used.  This will
+        allow more I/O operations to be performed collectively.
+    </li>
+
+    <li><b>Collective I/O Requested/Allowed?</b> - A user has to both request
+        that collective I/O occur and also their I/O operation must meet the
+        requirements that the library sets for supporting collective parallel
+        I/O:
+        <ul>
+            <li>The dataspace must be scalar or simple (which is a no-op really,
+                since we don't support "complex" dataspaces in the library
+                currently).
+            </li>
+            <li>The selection must be regular.  "all" selections
+                and hyperslab selections that were
+                made with only one call to H5Sselect_hyperslab() (i.e. not a
+                hyperslab selection that has been aggregated over multiple
+                selection calls) are regular.  Supporting point and
+                irregular hyperslab selections are on the "to do" list.
+            </li>
+            <li>The dataset must be stored contiguously on disk (as shown in the
+                figure also).  Supporting chunked dataset storage is also
+                on the "to do" list.
+            </li>
+        </ul>
+    </li>
+
+    <li><b>Build "chunk map"</b> - This step still has some scalability issues
+        as it creates a data structure that is proportional to the number of
+        chunks which will be written to, which could potentially be very large.
+        Building the "chunk map" information incrementally is on the "to do"
+        list also.
+    </li>
+
+    <li><b>Perform Chunked I/O</b> - As the figure shows, there is no support
+        for collective parallel I/O on chunked datasets currently.  As noted
+        earlier, this is on the "to do" list.
+    </li>
+
+    <li><b>Perform "Direct" Serial I/O</b> - "Direct" serial I/O writes data
+        from the application's buffer, without any intervening buffer or memory
+        copies.  For maximum efficiency and performance, the elements in the
+        selections should be adjoining.
+    </li>
+
+    <li><b>Perform Collective Parallel I/O</b> - This step also writes data
+        directly from an application buffer, but additionally uses collective
+        MPI I/O operations to combine the data from each process in the parallel
+        application in an efficient manner.
+    </li>
+</ol>
+
+</li></ol>
+
+
+
+</body></html>
diff --git a/doxygen/examples/ImageSpec.html b/doxygen/examples/ImageSpec.html
new file mode 100644
index 0000000..1b700ff
--- /dev/null
+++ b/doxygen/examples/ImageSpec.html
@@ -0,0 +1,1203 @@
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<html>
+<head>
+   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+   <meta name="GENERATOR" content="Mozilla/4.72 [en] (WinNT; U) [Netscape]">
+   <title>Image Specification</title>
+
+The HDF5 specification defines the standard objects and storage for the
+standard HDF5 objects. (For information about the HDF5 library, model and
+specification, see the HDF documentation.)&nbsp; This document is an additional
+specification do define a standard profile for how to store image data
+in HDF5. Image data in HDF5 is stored as HDF5 datasets with standard attributes
+to define the properties of the image.
+<p>This specification is primarily concerned with two dimensional raster
+data similar to HDF4 Raster Images.&nbsp; Specifications for storing other
+types of imagery will be covered in other documents.
+<p>This specification defines:
+<ul>
+<li>
+Standard storage and attributes for an Image dataset (<a href="#Sect1">Section
+1</a>)</li>
+
+<li>
+Standard storage and attributes for Palettes (<a href="#sect2">Section
+2</a>)</li>
+
+<li>
+Standard for associating Palettes with Images. (<a href="#Sect3">Section
+3</a>)</li>
+</ul>
+
+<h2>
+<a NAME="Sect1"></a>1. HDF5 Image Specification</h2>
+
+<h3>
+1.1 Overview</h3>
+Image data is stored as an HDF5 dataset with values of HDF5 class Integer
+or Float.&nbsp; A common example would be a two dimensional dataset, with
+elements of class Integer, e.g., a two dimensional array of unsigned 8
+bit integers.&nbsp; However, this specification does not limit the dimensions
+or number type that may be used for an Image.
+<p>The dataset for an image is distinguished from other datasets by giving
+it an attribute "CLASS=IMAGE".&nbsp; In addition, the Image dataset may
+have an optional attribute "PALETTE" that is an array of object references
+for zero or more palettes. The Image dataset may have additional attributes
+to describe the image data, as defined in <a href="#Sect1.2">Section 1.2</a>.
+<p>A Palette is an HDF5 dataset which contains color map information.&nbsp;
+A Pallet dataset has an attribute "CLASS=PALETTE" and other attributes
+indicating the type and size of the palette, as defined in <a href="#sect2">Section
+2.1</a>.&nbsp; A Palette is an independent object, which can be shared
+among several Image datasets.
+<h3>
+<a NAME="Sect1.2"></a>1.2&nbsp; Image Attributes</h3>
+The attributes for the Image are scalars unless otherwise noted.&nbsp;
+The length of String valued attributes should be at least the number of
+characters. Optionally, String valued attributes may be stored in a String
+longer than the minimum, in which case it must be zero terminated or null
+padded.&nbsp; "Required" attributes must always be used. "Optional" attributes
+must be used when required.
+<br>&nbsp;
+<h4>
+Attributes</h4>
+
+<dl>
+<dt>
+Attribute name="<b>CLASS</b>" (Required)</dt>
+
+<dd>
+This attribute is type H5T_C_S1, with size 5.</dd>
+
+<dd>
+For all Images, the value of this attribute is "IMAGE".</dd>
+
+<dd>
+</dd>
+
+<dd>
+This attribute identifies this data set as intended to be interpreted as
+an image that conforms to the specifications on this page.</dd>
+</dl>
+
+<dt>
+Attribute name="<b>PALETTE</b>"</dt>
+
+<dl>
+<dd>
+A Image dataset within an HDF5 file may optionally specify an array of
+palettes to be viewed with. The dataset will have an attribute field called
+"<b>PALETTE</b>" which contains a one-dimensional array of object reference
+pointers (HDF5 datatype H5T_STD_REF_OBJ) which refer to palettes in the
+file. The palette datasets must conform to the Palette specification in
+<a href="#sect2">section
+2 below</a>. The first palette in this array will be the default palette
+that the data may be viewed with.</dd>
+</dl>
+
+<dl>
+<dt>
+</dt>
+
+<dt>
+Attribute name="<b>IMAGE_SUBCLASS</b>"</dt>
+
+<dd>
+If present, the value of this attribute indicates the type of Palette that
+should be used with the Image.&nbsp; This attribute is a scalar of type
+H5T_C_S1, with size according to the string plus one.&nbsp; The values
+are:</dd>
+
+<dl>
+<dt>
+"IMAGE_GRAYSCALE" (length 15)</dt>
+
+<dd>
+A grayscale image</dd>
+
+<dt>
+"IMAGE_BITMAP" (length 12)</dt>
+
+<dd>
+A bit map image</dd>
+
+<dt>
+"IMAGE_TRUECOLOR" (length 15)</dt>
+
+<dd>
+A truecolor image</dd>
+
+<dt>
+"IMAGE_INDEXED" (length 13)</dt>
+
+<dd>
+An indexed image</dd>
+
+<dd>
+</dd>
+</dl>
+
+<dt>
+Attribute name="<b>INTERLACE_MODE</b>"</dt>
+
+<dd>
+For images with more than one component for each pixel, this optional attribute
+specifies the layout of the data. The values are type H5T_C_S1 of length
+15. See <a href="#Section1.3">section 1.3</a> for information about the
+storage layout for data.</dd>
+
+<dd>
+"INTERLACE_PIXEL" (default): the component value for a pixel are contiguous.</dd>
+
+<dd>
+"INTERLACE_PLANE": each component is stored as a plane.</dd>
+
+<dt>
+</dt>
+
+<dt>
+Attribute name="<b>DISPLAY_ORIGIN</b>"</dt>
+
+<dd>
+This optional attribute indicates the intended orientation of the data
+on a two-dimensional raster display.&nbsp; The value indicates which corner
+the pixel at (0, 0) should be viewed.&nbsp; The values are type H5T_C_S1
+of length 2. If DISPLAY_ORIGIN is not set, the orientation is undefined.</dd>
+
+<dd>
+"UL": (0,0) is at the upper left.</dd>
+
+<dd>
+"LL": (0,0) is at the lower left.</dd>
+
+<dd>
+"UR": (0,0) is at the upper right.</dd>
+
+<dd>
+"LR": (0,0) is at the lower right.</dd>
+</dl>
+
+<dt>
+Attribute name="<b>IMAGE_WHITE_IS_ZERO</b>"</dt>
+
+<dl>
+<dd>
+This attribute is of type H5T_NATIVE_UCHAR.&nbsp; 0 = false, 1 = true .&nbsp;
+This is used for images with IMAGE_SUBCLASS="IMAGE_GRAYSCALE" or "IMAGE_BITMAP".</dd>
+</dl>
+
+<dl>
+<dt>
+Attribute name="<b>IMAGE_MINMAXRANGE</b>"</dt>
+
+<dd>
+If present, this attribute is an array of two numbers, of the same HDF5
+datatype as the data.&nbsp; The first element is the minimum value of the
+data, and the second is the maximum.&nbsp; This is used for images with
+IMAGE_SUBCLASS="IMAGE_GRAYSCALE", "IMAGE_BITMAP" or "IMAGE_INDEXED".</dd>
+</dl>
+
+<dt>
+Attribute name="<b>IMAGE_BACKGROUNDINDEX</b>"</dt>
+
+<dl>
+<dd>
+If set, this attribute indicates the index value that should be interpreted
+as the "background color".&nbsp; This attribute is HDF5 type H5T_NATIVE_UINT.</dd>
+</dl>
+
+<dt>
+Attribute name="<b>IMAGE_TRANSPARENCY</b>"</dt>
+
+<dl>
+<dd>
+If set, this attribute indicates the index value that should be interpreted
+as the "transparent color".&nbsp; This attribute is HDF5 type H5T_NATIVE_UINT.&nbsp;
+This attribute may not be used for IMAGE_SUBCLASS="IMAGE_TRUE_COLOR".</dd>
+</dl>
+
+<dt>
+Attribute name="<b>IMAGE_ASPECTRATIO</b>"</dt>
+
+<dl>
+<dd>
+If set, this attribute indicates the aspect ratio.</dd>
+</dl>
+
+<dt>
+Attribute name="<b>IMAGE_COLORMODEL</b>"</dt>
+
+<dl>
+<dd>
+If set, this attribute indicates the color model of Palette that should
+be used with the Image.&nbsp; This attribute is of type H5T_C_S1, with
+size 3, 4, or 5.&nbsp; The value is one of the color models described in
+the Palette specification in <a href="#sect2.2">section 2.2 below</a>.&nbsp;
+This attribute may be used only for IMAGE_SUBCLASS="IMAGE_TRUECOLOR" or
+"IMAGE_INDEXED".</dd>
+</dl>
+
+<dt>
+Attribute name="<b>IMAGE_GAMMACORRECTION</b>"</dt>
+
+<dl>
+<dd>
+If set, this attribute gives the Gamma correction.&nbsp; The attribute
+is type H5T_NATIVE_FLOAT.&nbsp; This attribute may be used only for IMAGE_SUBCLASS="IMAGE_TRUECOLOR"
+or "IMAGE_INDEXED".</dd>
+</dl>
+Attribute name="<b>IMAGE_VERSION</b>" (Required)
+<dl>
+<dd>
+This attribute is of type H5T_C_S1, with size corresponding to the length
+of the version string.&nbsp; This attribute identifies the version number
+of this specification to which it conforms.&nbsp; The current version number
+is "1.2".</dd>
+
+<br>&nbsp;
+<p>&nbsp;
+<br>&nbsp;
+<br>&nbsp;
+<center><table BORDER=2 BGCOLOR="#FFFFFF" >
+<caption><b>Table 1. Attributes of an Image Dataset</b></caption>
+
+<tr>
+<td><b>Attribute Name</b></td>
+
+<td><b>(R = Required</b>
+<br><b>O= Optional)</b></td>
+
+<td><b>Type</b></td>
+
+<td><b>String Size</b></td>
+
+<td><b>Value</b></td>
+</tr>
+
+<tr>
+<td>CLASS</td>
+
+<td>R</td>
+
+<td>String</td>
+
+<td>5</td>
+
+<td>"IMAGE"</td>
+</tr>
+
+<tr>
+<td>PALETTE</td>
+
+<td>O</td>
+
+<td>Array Object References</td>
+
+<td></td>
+
+<td>&lt;references to Palette datasets><sup>1</sup></td>
+</tr>
+
+<tr>
+<td>IMAGE_SUBCLASS</td>
+
+<td>O<sup>2</sup></td>
+
+<td>String</td>
+
+<td>15,&nbsp;
+<br>12,&nbsp;
+<br>15,
+<br>13</td>
+
+<td>
+<dt>
+"IMAGE_GRAYSCALE",</dt>
+
+<dt>
+"IMAGE_BITMAP",</dt>
+
+<dt>
+"IMAGE_TRUECOLOR",</dt>
+
+<dt>
+"IMAGE_INDEXED"</dt>
+</td>
+</tr>
+
+<tr>
+<td>INTERLACE_MODE</td>
+
+<td>O<sup>3,6</sup></td>
+
+<td>String</td>
+
+<td>15</td>
+
+<td>The layout of components if more than one component per pixel.</td>
+</tr>
+
+<tr>
+<td>DISPLAY_ORIGIN</td>
+
+<td>O</td>
+
+<td>String</td>
+
+<td>2</td>
+
+<td>If set, indicates the intended location of the pixel (0,0).</td>
+</tr>
+
+<tr>
+<td>IMAGE_WHITE_IS_ZERO</td>
+
+<td>O<sup>3,4</sup></td>
+
+<td>Unsigned Integer</td>
+
+<td></td>
+
+<td>0 = false, 1 = true</td>
+</tr>
+
+<tr>
+<td>IMAGE_MINMAXRANGE</td>
+
+<td>O<sup>3,5</sup></td>
+
+<td>Array [2] &lt;same datatype as data values></td>
+
+<td></td>
+
+<td>The (&lt;minimum>, &lt;maximum>) value of the data.</td>
+</tr>
+
+<tr>
+<td>IMAGE_BACKGROUNDINDEX</td>
+
+<td>O<sup>3</sup></td>
+
+<td>Unsigned Integer</td>
+
+<td></td>
+
+<td>The index of the background color.</td>
+</tr>
+
+<tr>
+<td>IMAGE_TRANSPARENCY</td>
+
+<td>O<sup>3,5</sup></td>
+
+<td>Unsigned Integer</td>
+
+<td></td>
+
+<td>The index of the transparent color.</td>
+</tr>
+
+<tr>
+<td>IMAGE_ASPECTRATIO</td>
+
+<td>O<sup>3,4</sup></td>
+
+<td>Unsigned Integer</td>
+
+<td></td>
+
+<td>The aspect ratio.</td>
+</tr>
+
+<tr>
+<td>IMAGE_COLORMODEL</td>
+
+<td>O<sup>3,6</sup></td>
+
+<td>String</td>
+
+<td>3, 4, or 5</td>
+
+<td>The color model, as defined below in the Palette specification for
+attribute <b>PAL_COLORMODEL</b>.</td>
+</tr>
+
+<tr>
+<td>IMAGE_GAMMACORRECTION</td>
+
+<td>O<sup>3,6</sup></td>
+
+<td>Float</td>
+
+<td></td>
+
+<td>The gamma correction.</td>
+</tr>
+
+<tr>
+<td>IMAGE_VERSION</td>
+
+<td>R</td>
+
+<td>String</td>
+
+<td>3</td>
+
+<td>"1.2"</td>
+</tr>
+</table></center>
+
+<dl><font size=-1>1.&nbsp; The first element of the array is the default
+Palette.</font>
+<br><font size=-1>2.&nbsp; This attribute is <b>required</b> for images
+that use one of the standard color map types listed.</font>
+<br><font size=-1>3. This attribute is <b>required</b> if set for the source
+image, in the case that the image is translated from another file into
+HDF5.</font>
+<br><font size=-1>4.&nbsp; This applies to:&nbsp; IMAGE_SUBCLASS="IMAGE_GRAYSCALE"
+or "IMAGE_BITMAP".</font>
+<br><font size=-1>5.&nbsp; This applies to:&nbsp; IMAGE_SUBCLASS="IMAGE_GRAYSCALE",
+"IMAGE_BITMAP", or "IMAGE_INDEXED".</font>
+<br><font size=-1>6.&nbsp; This applies to: IMAGE_SUBCLASS="IMAGE_TRUECOLOR",
+or "IMAGE_INDEXED".</font></dl>
+</dl>
+Table 2 summarizes the standard attributes for an Image datasets using
+the common sub-classes. R means that the attribute listed on the leftmost
+column is Required for the image subclass on the first row, O means that
+the attribute is Optional for that subclass and N that the attribute cannot
+be applied to that subclass. The two first rows show the only required
+attributes
+for all subclasses.
+<br>&nbsp;
+<table BORDER WIDTH="100%" >
+<caption><b>Table 2a. Applicability of Attributes to IMAGE sub-classes</b></caption>
+
+<tr>
+<td WIDTH="20%"><b>IMAGE_SUBCLASS</b><sup>1</sup></td>
+
+<td WIDTH="20%"><b>IMAGE_GRAYSCALE</b></td>
+
+<td WIDTH="20%"><b>IMAGE_BITMAP</b></td>
+</tr>
+
+<tr>
+<td WIDTH="20%">CLASS</td>
+
+<td WIDTH="20%">R</td>
+
+<td WIDTH="20%">R</td>
+</tr>
+
+<tr>
+<td WIDTH="20%">IMAGE_VERSION</td>
+
+<td WIDTH="20%">R</td>
+
+<td WIDTH="20%">R</td>
+</tr>
+
+<tr>
+<td>INTERLACE_MODE</td>
+
+<td>N</td>
+
+<td>N</td>
+</tr>
+
+<tr>
+<td WIDTH="20%">IMAGE_WHITE_IS_ZERO</td>
+
+<td WIDTH="20%">R</td>
+
+<td WIDTH="20%">R</td>
+</tr>
+
+<tr>
+<td WIDTH="20%">IMAGE_MINMAXRANGE</td>
+
+<td WIDTH="20%">O</td>
+
+<td WIDTH="20%">O</td>
+</tr>
+
+<tr>
+<td WIDTH="20%">IMAGE_BACKGROUNDINDEX</td>
+
+<td WIDTH="20%">O</td>
+
+<td WIDTH="20%">O</td>
+</tr>
+
+<tr>
+<td WIDTH="20%">IMAGE_TRANSPARENCY</td>
+
+<td WIDTH="20%">O</td>
+
+<td WIDTH="20%">O</td>
+</tr>
+
+<tr>
+<td WIDTH="20%">IMAGE_ASPECTRATIO</td>
+
+<td WIDTH="20%">O</td>
+
+<td WIDTH="20%">O</td>
+</tr>
+
+<tr>
+<td WIDTH="20%">IMAGE_COLORMODEL</td>
+
+<td WIDTH="20%">N</td>
+
+<td WIDTH="20%">N</td>
+</tr>
+
+<tr>
+<td WIDTH="20%">IMAGE_GAMMACORRECTION</td>
+
+<td WIDTH="20%">N</td>
+
+<td WIDTH="20%">N</td>
+</tr>
+
+<tr>
+<td WIDTH="20%">PALETTE</td>
+
+<td WIDTH="20%">O</td>
+
+<td WIDTH="20%">O</td>
+</tr>
+
+<tr>
+<td>DISPLAY_ORIGIN</td>
+
+<td>O</td>
+
+<td>O</td>
+</tr>
+</table>
+
+<blockquote>&nbsp;</blockquote>
+
+<table BORDER WIDTH="100%" >
+<caption><b>Table 2b. Applicability of Attributes to IMAGE sub-classes</b></caption>
+
+<tr>
+<td WIDTH="20%"><b>IMAGE_SUBCLASS</b></td>
+
+<td WIDTH="20%"><b>IMAGE_TRUECOLOR</b></td>
+
+<td><b>IMAGE_INDEXED</b></td>
+</tr>
+
+<tr>
+<td WIDTH="20%">CLASS</td>
+
+<td WIDTH="20%">R</td>
+
+<td>R</td>
+</tr>
+
+<tr>
+<td WIDTH="20%">IMAGE_VERSION</td>
+
+<td WIDTH="20%">R</td>
+
+<td>R</td>
+</tr>
+
+<tr>
+<td>INTERLACE_MODE</td>
+
+<td>R</td>
+
+<td>N</td>
+</tr>
+
+<tr>
+<td WIDTH="20%">IMAGE_WHITE_IS_ZERO</td>
+
+<td WIDTH="20%">N</td>
+
+<td>N</td>
+</tr>
+
+<tr>
+<td WIDTH="20%">IMAGE_MINMAXRANGE</td>
+
+<td WIDTH="20%">N</td>
+
+<td>O</td>
+</tr>
+
+<tr>
+<td WIDTH="20%">IMAGE_BACKGROUNDINDEX</td>
+
+<td WIDTH="20%">N</td>
+
+<td>O</td>
+</tr>
+
+<tr>
+<td WIDTH="20%">IMAGE_TRANSPARENCY</td>
+
+<td WIDTH="20%">N</td>
+
+<td>O</td>
+</tr>
+
+<tr>
+<td WIDTH="20%">IMAGE_ASPECTRATIO</td>
+
+<td WIDTH="20%">O</td>
+
+<td>O</td>
+</tr>
+
+<tr>
+<td WIDTH="20%">IMAGE_COLORMODEL</td>
+
+<td WIDTH="20%">O</td>
+
+<td>O</td>
+</tr>
+
+<tr>
+<td WIDTH="20%">IMAGE_GAMMACORRECTION</td>
+
+<td WIDTH="20%">O</td>
+
+<td>O</td>
+</tr>
+
+<tr>
+<td WIDTH="20%">PALETTE</td>
+
+<td WIDTH="20%">O</td>
+
+<td>O</td>
+</tr>
+
+<tr>
+<td>DISPLAY_ORIGIN</td>
+
+<td>O</td>
+
+<td>O</td>
+</tr>
+</table>
+
+<h3>
+<a NAME="Section1.3"></a>1.3 Storage Layout and Properties for Images</h3>
+In the case of an image with more than one component per pixel (e.g., Red,
+Green, and Blue), the data may be arranged in one of two ways.&nbsp; Following
+HDF4 terminology, the data may be interlaced by pixel or by plane, which
+should be indicated by the INTERLACE_MODE&nbsp; attribute.&nbsp; In both
+cases, the dataset will have a dataspace with three dimensions, height,
+width, and components.&nbsp; The interlace modes specify different orders
+for the dimensions.
+<br>&nbsp;
+<table BORDER COLS=2 WIDTH="100%" >
+<caption><b>Table 3. Storage of multiple component image data.</b></caption>
+
+<tr>
+<td><b>Interlace Mode</b></td>
+
+<td><b>Dimensions in the Dataspace</b></td>
+</tr>
+
+<tr>
+<td>INTERLACE_PIXEL</td>
+
+<td>[height][width][pixel components]</td>
+</tr>
+
+<tr>
+<td>INTERLACE_PLANE</td>
+
+<td>[pixel components][height][width]</td>
+</tr>
+</table>
+
+<p>For example, consider a 5 (rows) by 10 (column) image, with Red, Green,
+and Blue components.&nbsp; Each component is an unsigned byte. In HDF5,
+the datatype would be declared as an unsigned 8 bit integer.&nbsp; For
+pixel interlace, the dataspace would be a three dimensional array, with
+dimensions: [10][5][3].&nbsp; For plane interleave, the dataspace would
+be three dimensions: [3][10][5].
+<p>In the case of images with only one component, the dataspace may be
+either a two dimensional array, or a three dimensional array with the third
+dimension of size 1.&nbsp; For example, a 5 by 10 image with 8 bit color
+indexes would be an HDF5 dataset with type unsigned 8 bit integer.&nbsp;
+The dataspace could be either a two dimensional array, with dimensions
+[10][5], or three dimensions, with dimensions either [10][5][1] or [1][10][5].
+<p>Image datasets may be stored with any chunking or compression properties
+supported by HDF5.
+<p><b>A note concerning compatibility with HDF5 GR interface: </b>An Image
+dataset is stored as an HDF5 dataset.&nbsp; It is important to note that
+the order of the dimensions is the same as for any other HDF5 dataset.&nbsp;
+For a two dimensional image that is to be stored as a series of horizontal
+scan lines, with the scan lines contiguous (i.e., the fastest changing
+dimension is 'width'), the image will have a dataspace with <i>dim[0] =
+height</i> and <i>dim[1]</i> = <i>width</i>.&nbsp; This is completely consistent
+with all other HDF5 datasets.
+<p>Users familiar with HDF4 should be cautioned that <i>this is not the
+same as HDF4</i>, and specifically is not consistent with what the HDF4
+GR interface does.
+<br>&nbsp;
+<h2>
+<a NAME="sect2"></a>2.&nbsp; HDF5 Palette Specification</h2>
+
+<h3>
+2.1 Overview</h3>
+A palette is the means by which color is applied to an image and is also
+referred to as a color lookup table. It is a table in which every row contains
+the numerical representation of a particular color. In the example of an
+8 bit standard RGB color model palette, this numerical representation of
+a color is presented as a triplet specifying the intensity of red, green,
+and blue components that make up each color.
+<center>
+<p><img SRC="Palettes.fm.anc.gif" ></center>
+
+<p>In this example, the color component numeric type is an 8 bit unsigned
+integer. While this is most common and recommended for general use, other
+component color numeric datatypes, such as a 16 bit unsigned integer ,
+may be used. This type is specified as the type attribute of the palette
+dataset. (see H5Tget_type(), H5Tset_type())
+<p>The minimum and maximum values of the component color numeric are specified
+as attribute of the palette dataset. See below (attribute PAL_MINMAXNUMERIC).
+If these attributes do not exist, it is assumed that the range of values
+will fill the space of the color numeric type. i.e. with an 8 bit unsigned
+integer, the valid range would be 0 to 255 for each color component.
+<p>The HDF5 palette specification additionally allows for color models
+beyond RGB. YUV, HSV, CMY, CMYK, YCbCr color models are supported, and
+may be specified as a color model attribute of the palette dataset. <i>(see
+"Palette Attributes" for details)</i>.
+<p>In HDF 4 and earlier, palettes were limited to 256 colors. The HDF5
+palette specification allows for palettes of varying length. The length
+is specified as the number of rows of the palette dataset.
+<br>&nbsp;
+<br>&nbsp;
+<table BORDER COLS=1 WIDTH="100%" BGCOLOR="#666666" >
+<tr>
+<td><font color="#FFFFFF">Important Note: The specification of the Indexed
+Palette will change substantially in the next version.&nbsp; The Palette
+described here is <i>denigrated</i> and is not supported.</font></td>
+</tr>
+</table>
+
+<br>&nbsp;
+<table BORDER COLS=1 WIDTH="100%" BGCOLOR="#CCCCCC" >
+<tr>
+<td><i>Denigrated</i>
+<p>In a standard palette, the color entries are indexed directly. HDF5
+supports the notion of a range index table. Such a table defines an ascending
+ordered list of ranges that map dataset values to the palette. If a range
+index table exists for the palette, the PAL_TYPE attribute will be set
+to "RANGEINDEX", and the PAL_RANGEINDEX attribute will contain an object
+reference to a range index table array. If not, the PAL_TYPE attribute
+either does not exist, or will be set to "STANDARD".
+<p>The range index table array consists of a one dimensional array with
+the same length as the palette dataset - 1. Ideally, the range index would
+be of the same type as the dataset it refers to, however this is not a
+requirement.
+<p><b>Example 2: A range index array of type floating point</b>
+<center>
+<p><img SRC="PaletteExample1.gif" ></center>
+
+<p>The range index array attribute defines the "<i>to</i>" of the range.
+Notice that the range index array attribute is one less entry in size than
+the palette. The first entry of 0.1259, specifies that all values below
+and up to 0.1259 inclusive, will map to the first palette entry. The second
+entry signifies that all values greater than 0.1259 up to 0.3278 inclusive,
+will map to the second palette entry, etc. All value greater than the last
+range index array attribute (100000) map to the last entry in the palette.</td>
+</tr>
+</table>
+
+<h3>
+<a NAME="sect2.2"></a>2.2. Palette Attributes</h3>
+A palette exists in an HDF file as an independent data set with accompanying
+attributes.&nbsp; The Palette attributes are scalars except where noted
+otherwise.&nbsp; String values should have size the length of the string
+value plus one.&nbsp; "Required" attributes must be used.&nbsp; "Optional"
+attributes must be used when required.
+<p>These attributes are defined as follows:
+<dl>
+<dt>
+Attribute name="<b>CLASS</b>" (Required)</dt>
+
+<dd>
+This attribute is of type H5T_C_S1, with size 7.</dd>
+
+<dd>
+For all palettes, the value of this attribute is "PALETTE". This attribute
+identifies this palette data set as a palette that conforms to the specifications
+on this page.</dd>
+
+<dt>
+Attribute name="<b>PAL_COLORMODEL</b>" (Required)</dt>
+
+<dd>
+This attribute is of type H5T_C_S1, with size 3, 4, or 5.</dd>
+
+<dd>
+Possible values for this are "RGB", "YUV", "CMY", "CMYK", "YCbCr", "HSV".</dd>
+
+<dd>
+This defines the color model that the entries in the palette data set represent.</dd>
+
+<dl>
+<dt>
+"RGB"</dt>
+
+<dd>
+Each color index contains a triplet where the the first value defines the
+red component, second defines the green component, and the third the blue
+component.</dd>
+
+<dt>
+"CMY"</dt>
+
+<dd>
+Each color index contains a triplet where the the first value defines the
+cyan component, second defines the magenta component, and the third the
+yellow component.</dd>
+
+<dt>
+"CMYK"</dt>
+
+<dd>
+Each color index contains a quadruplet where the the first value defines
+the cyan component, second defines the magenta component, the third the
+yellow component, and the forth the black component.</dd>
+
+<dt>
+"YCbCr"</dt>
+
+<dd>
+Class Y encoding model. Each color index contains a triplet where the the
+first value defines the luminance, second defines the Cb Chromonance, and
+the third the Cr Chromonance.</dd>
+
+<dt>
+"YUV"</dt>
+
+<dd>
+Composite encoding color model. Each color index contains a triplet where
+the the first value defines the luminance component, second defines the
+chromonance component, and the third the value component.</dd>
+
+<dt>
+"HSV"</dt>
+
+<dd>
+Each color index contains a triplet where the the first value defines the
+hue component, second defines the saturation component, and the third the
+value component. The hue component defines the hue spectrum with a low
+value representing magenta/red progressing to a high value which would
+represent blue/magenta, passing through yellow, green, cyan. A low value
+for the saturation component means less color saturation than a high value.
+A low value for <i>value</i> will be darker than a high value.</dd>
+
+<dd>
+</dd>
+</dl>
+
+<dt>
+Attribute name="<b>PAL_TYPE</b>" (Required)</dt>
+
+<dd>
+This attribute is of type H5T_C_S1, with size 9 or 10.</dd>
+
+<dd>
+The current supported values for this attribute are : "STANDARD8" or "RANGEINDEX"</dd>
+
+<dd>
+A PAL_TYPE of "STANDARD8" defines a palette dataset such that the first
+entry defines index 0, the second entry defines index 1, etc. up until
+the length of the palette - 1. This assumes an image dataset with direct
+indexes into the palette.</dd>
+</dl>
+
+<dl>&nbsp;
+<table BORDER COLS=1 WIDTH="100%" BGCOLOR="#CCCCCC" >
+<tr>
+<td><i>Denigrated</i>
+<p>If the PAL_TYPE is set to "RANGEINDEX", there will be an additional
+attribute with a name of "<b>PAL_RANGEINDEX</b>",&nbsp; (See example 2
+for more details)</td>
+</tr>
+</table>
+
+<table BORDER COLS=1 WIDTH="100%" BGCOLOR="#CCCCCC" >
+<tr>
+<td>
+<dt>
+Attribute name="<b>PAL_RANGEINDEX</b>"&nbsp;&nbsp; <i>(Denigrated)</i></dt>
+
+<dl>
+<dd>
+The <b>PAL_RANGEINDEX</b> attribute contains an HDF object reference (HDF5
+datatype H5T_STD_REF_OBJ) pointer which specifies a range index array in
+the file to be used for color lookups for the palette.&nbsp; (Only for
+PAL_TYPE="RANGEINDEX")</dd>
+</dl>
+</td>
+</tr>
+</table>
+
+<dt>
+Attribute name="<b>PAL_MINMAXNUMERIC</b>"</dt>
+
+<dl>
+<dt>
+If present, this attribute is an array of two numbers, of the same HDF5
+datatype as the palette elements or color numerics.</dt>
+
+<br>They specify the minimum and maximum values of the color numeric components.
+For example, if the palette was an RGB of type Float, the color numeric
+range for Red, Green, and Blue could be set to be between 0.0 and 1.0.
+The intensity of the color guns would then be scaled accordingly to be
+between this minimum and maximum attribute.</dl>
+Attribute name="<b>PAL_VERSION</b>"&nbsp; (Required)
+<dl>This attribute is of type H5T_C_S1, with size corresponding to the
+length of the version string.&nbsp; This attribute identifies the version
+number of this specification to which it conforms.&nbsp; The current version
+is "1.2".</dl>
+
+<center><table BORDER=2 BGCOLOR="#FFFFFF" >
+<caption><b>Table 4. Attributes of a Palette Dataset</b></caption>
+
+<tr>
+<td><b>Attribute Name</b></td>
+
+<td><b>(R = Required,</b>
+<br><b>O = Optional)</b></td>
+
+<td><b>Type</b></td>
+
+<td><b>String Size</b></td>
+
+<td><b>Value</b></td>
+</tr>
+
+<tr>
+<td>CLASS</td>
+
+<td>R</td>
+
+<td>String</td>
+
+<td>
+<center>7</center>
+</td>
+
+<td>"PALETTE"</td>
+</tr>
+
+<tr>
+<td>PAL_COLORMODEL</td>
+
+<td>R</td>
+
+<td>String</td>
+
+<td>
+<center>3, 4, or 5</center>
+</td>
+
+<td>Color Model:&nbsp; "RGB", YUV", "CMY", "CMYK", "YCbCr", or "HSV"</td>
+</tr>
+
+<tr>
+<td>PAL_TYPE</td>
+
+<td>R</td>
+
+<td>String</td>
+
+<td>
+<center>9</center>
+
+<p><br>
+<table BORDER COLS=1 WIDTH="100%" BGCOLOR="#CCCCCC" >
+<tr>
+<td>or 10</td>
+</tr>
+</table>
+</td>
+
+<td>"STANDARD8"&nbsp;
+<table BORDER COLS=1 WIDTH="100%" BGCOLOR="#CCCCCC" >
+<tr>
+<td>or "RANGEINDEX" <i>(Denigrated)</i></td>
+</tr>
+</table>
+</td>
+</tr>
+
+<tr>
+<td>
+<table BORDER COLS=1 WIDTH="100%" BGCOLOR="#CCCCCC" >
+<tr>
+<td><i>Denigrated</i>
+<br>RANGE_INDEX</td>
+</tr>
+</table>
+</td>
+
+<td></td>
+
+<td>
+<table BORDER COLS=1 WIDTH="100%" BGCOLOR="#CCCCCC" >
+<tr>
+<td>Object Reference&nbsp;</td>
+</tr>
+</table>
+</td>
+
+<td></td>
+
+<td>
+<table BORDER COLS=1 WIDTH="100%" BGCOLOR="#CCCCCC" >
+<tr>
+<td>&lt;Object Reference to Dataset of range index values></td>
+</tr>
+</table>
+</td>
+</tr>
+
+<tr>
+<td>PAL_MINMAXNUMERIC</td>
+
+<td>O</td>
+
+<td>Array[2] of &lt;same datatype as palette></td>
+
+<td></td>
+
+<td>The first value is the &lt;Minimum value for color values>, the second
+value is &lt;Maximum value for color values><sup>2</sup></td>
+</tr>
+
+<tr>
+<td>PAL_VERSION</td>
+
+<td>R</td>
+
+<td>String</td>
+
+<td>4</td>
+
+<td>"1.2"</td>
+</tr>
+</table></center>
+
+<dl>&nbsp;
+<table BORDER COLS=1 WIDTH="100%" BGCOLOR="#CCCCCC" >
+<tr>
+<td><font size=-1>1.&nbsp; The RANGE_INDEX attribute is required if the
+PAL_TYPE is "RANGEINDEX".&nbsp; Otherwise, the RANGE_INDEX attribute should
+be omitted. (Range index is denigrated.)</font></td>
+</tr>
+</table>
+<font size=-1>2.&nbsp; The minimum and maximum are optional.&nbsp; If not
+set, the range is assumed to the maximum range of the number type.&nbsp;
+If one of these attributes is set, then both should be set.&nbsp; The value
+of the minimum must be less than or equal to the value of the maximum.</font></dl>
+</dl>
+Table 5 summarized the uses of the standard attributes for a palette dataset.
+R means that the attribute listed on the leftmost column is Required for
+the palette type on the first row, O means that the attribute is Optional
+for that type and N that the attribute cannot be applied to that type.
+The four first rows show the attributes that are always required&nbsp;
+for the two palette types.
+<br>&nbsp;
+<br>&nbsp;
+<table BORDER WIDTH="100%" >
+<caption><b>Table 5. Applicability of Attributes</b></caption>
+
+<tr>
+<td WIDTH="33%"><b>PAL_TYPE</b></td>
+
+<td WIDTH="33%"><b>STANDARD8</b></td>
+
+<td WIDTH="34%"><b>RANGEINDEX</b></td>
+</tr>
+
+<tr>
+<td WIDTH="33%">CLASS</td>
+
+<td WIDTH="33%">R</td>
+
+<td WIDTH="34%">R</td>
+</tr>
+
+<tr>
+<td WIDTH="33%">PAL_VERSION</td>
+
+<td WIDTH="33%">R</td>
+
+<td WIDTH="34%">R</td>
+</tr>
+
+<tr>
+<td WIDTH="33%">PAL_COLORMODEL</td>
+
+<td WIDTH="33%">R</td>
+
+<td WIDTH="34%">R</td>
+</tr>
+
+<tr>
+<td WIDTH="33%">RANGE_INDEX</td>
+
+<td WIDTH="33%">N</td>
+
+<td WIDTH="34%">R</td>
+</tr>
+
+<tr>
+<td WIDTH="33%">PAL_MINMAXNUMERIC</td>
+
+<td WIDTH="33%">O</td>
+
+<td WIDTH="34%">O</td>
+</tr>
+</table>
+
+<h3>
+2.3. Storage Layout for Palettes</h3>
+The values of the Palette are stored as a dataset.&nbsp; The datatype can
+be any HDF 5 atomic numeric type.&nbsp; The dataset will have dimensions
+(<tt>nentries</tt>&nbsp; by&nbsp; <tt>ncomponents</tt>), where '<tt>nentries</tt>'
+is the number of colors (usually 256) and '<tt>ncomponents'</tt> is the
+number of values per color (3 for <b>RGB</b>, 4 for <b>CMYK</b>, etc.)
+<br>&nbsp;
+<h2>
+<a NAME="Sect3"></a>3.&nbsp; Consistency and Correlation of Image and Palette
+Attributes</h2>
+The objects in this specification are an extension to the base HDF5 specification
+and library.&nbsp; They are accessible with the standard HDF5 library,
+but the semantics of the objects are not enforced by the base library.&nbsp;
+For example, it is perfectly possible to add an attribute called <b>IMAGE</b>
+to <i>any</i> dataset, or to include an object reference to <i>any</i>
+HDF5 dataset in a <b>PALETTE</b> attribute.&nbsp; This would be a valid
+HDF5 file, but not conformant to this specification.&nbsp; The rules defined
+in this specification must be implemented with appropriate software, and
+applications must use conforming software to assure correctness.
+<p>The Image and Palette specifications include several redundant standard
+attributes, such as the <b>IMAGE_COLORMODEL</b> and the <b>PAL_COLORMODEL</b>.&nbsp;
+These attributes are informative not normative, in that it is acceptable
+to attach a Palette to an Image dataset even if their attributes do not
+match.&nbsp; Software is not required to enforce consistency, and files
+may contain mismatched associations of Images and Palettes.&nbsp; In all
+cases, it is up to applications to determine what kinds of images and color
+models can be supported.
+<p>For example, an Image that was created from a file with an "RGB" may
+have a "YUV" Palette in its <b>PALETTE</b> attribute array.&nbsp; This
+would be a legal HDF5 file and also conforms to this specification, although
+it may or may not be correct for a given application.</p>
+
+</body>
+</html>
diff --git a/doxygen/examples/PaletteExample1.gif b/doxygen/examples/PaletteExample1.gif
new file mode 100644
index 0000000..8694d9d
--- /dev/null
+++ b/doxygen/examples/PaletteExample1.gif
diff --git a/doxygen/examples/Palettes.fm.anc.gif b/doxygen/examples/Palettes.fm.anc.gif
new file mode 100644
index 0000000..d344c03
--- /dev/null
+++ b/doxygen/examples/Palettes.fm.anc.gif
diff --git a/doxygen/examples/TableSpec.html b/doxygen/examples/TableSpec.html
new file mode 100644
index 0000000..474176e
--- /dev/null
+++ b/doxygen/examples/TableSpec.html
@@ -0,0 +1,193 @@
+<html>
+<head>
+   <title>HDF5 Table Specification</title>
+</head>
+
+The HDF5 specification defines the standard objects and storage for the
+standard HDF5 objects. (For information about the HDF5 library, model and
+specification, see the HDF documentation.)&nbsp; This document is an additional
+specification do define a standard profile for how to store tables in HDF5.
+Table data in HDF5 is stored as HDF5 datasets with standard attributes to define
+the properties of the tables.
+
+<h2>
+1. Overview</h2>
+A generic table is a sequence of records, each record has a name and a type.
+Table data is stored as an HDF5 one dimensional compound dataset.&nbsp; A table
+is defined as a collection of records whose values are stored in fixed-length
+fields. All records have the same structure and all values in each field have
+the same data type.
+<p>The dataset for a table is distinguished from other datasets by giving
+it an attribute &quot;CLASS=TABLE&quot;.&nbsp;&nbsp;
+Optional attributes allow the storage of a title for the Table and for
+each column, and a fill value for each column.
+<h2>
+2.&nbsp; Table Attributes</h2>
+The attributes for the Table are strings.&nbsp;They are written with the <a href="RM_H5LT.html#H5LTset_attribute_string"><code>H5LTset_attribute_string</code></a>
+Lite API function.&nbsp; "Required" attributes must always be used. "Optional" attributes
+must be used when required.
+<br>&nbsp;
+<h4>
+Attributes</h4>
+
+<dl>
+<dt>
+Attribute name="<b>CLASS</b>" (Required)</dt>
+
+<dd>
+This attribute is type H5T_C_S1, with size 5.</dd>
+
+<dd>
+For all Tables, the value of this attribute is &quot;TABLE&quot;.</dd>
+
+<dd>
+This attribute identifies this data set as intended to be interpreted as Table that conforms to the specifications on this page.</dd>
+</dl>
+
+<dl>
+Attribute name="<b>VERSION</b>" (Required)
+
+<dd>
+This attribute is of type H5T_C_S1, with size corresponding to the length
+of the version string.&nbsp; This attribute identifies the version number
+of this specification to which it conforms.&nbsp; The current version number
+is &quot;0.2&quot;.</dd>
+
+</dl>
+
+<dl>
+<dt>
+Attribute name="<b>TITLE</b>" (Optional)</dt>
+
+<dd>
+The <b>TITLE</b> is an optional String that is to be used as the
+informative title of the whole table.
+The <b>TITLE</b> is set with the parameter <code> table_title</code> of the function
+<a href="RM_H5TB.html#H5TBmake_table"> <code> H5TBmake_table</code></a>.&nbsp;</dd>
+</dl>
+
+<dl>
+<dt>
+Attribute name="<b>FIELD_(n)_NAME</b>" (Required)</dt>
+
+<dd>
+The <b>FIELD_(n)_NAME</b> is an optional String that is to be used as the
+informative title of column <b>n</b> of the table.
+For each of the fields the word FIELD_ is concatenated with
+      the zero based field (n) index together with the name of the field.</dd>
+
+</dl>
+<dl>
+<dt>
+Attribute name="<b>FIELD_(n)_FILL</b>" (Optional)</dt>
+
+<dd>
+The <b>FIELD_(n)_FILL</b> is an optional String that is the fill value for
+column <b>n</b> of the table.
+For each of the fields the word FIELD_ is concatenated with
+      the zero based field (n) index together with the fill value, if present.
+This value is written only when a fill value is defined for the table.</dd>
+
+</dl>
+
+<dl>
+
+<br>&nbsp;
+<center><table BORDER=2 BGCOLOR="#FFFFFF" >
+<caption><b>Table 1. Attributes of an Image Dataset</b></caption>
+
+<tr>
+<td><b>Attribute Name</b></td>
+
+<td><b>(R = Required</b>
+<br><b>O= Optional)</b></td>
+
+<td><b>Type</b></td>
+
+<td><b>String Size</b></td>
+
+<td><b>Value</b></td>
+</tr>
+
+<tr>
+<td>CLASS</td>
+
+<td>R</td>
+
+<td>String</td>
+
+<td>5</td>
+
+<td>&quot;TABLE&quot;</td>
+</tr>
+
+<tr>
+<td>VERSION</td>
+
+<td>R</td>
+
+<td>String</td>
+
+<td>3</td>
+
+<td>&quot;0.2&quot;</td>
+</tr>
+
+<tr>
+<td>TITLE</td>
+
+<td>O</td>
+
+<td>String</td>
+
+<td>&nbsp;</td>
+
+<td>
+
+<tr>
+<td>FIELD_(n)_NAME</td>
+
+<td>R</td>
+
+<td>String</td>
+
+<td>&nbsp;</td>
+
+<td>
+&nbsp;
+
+<tr>
+<td>FIELD_(n)_FILL</td>
+
+<td>O*</td>
+
+<td>String</td>
+
+<td>&nbsp;</td>
+
+<td>
+&nbsp;
+</table>
+</center>
+
+  </dl>
+<p>
+<center>
+&nbsp;
+</center>
+<i>* </i>The attribute FIELD_(n)_FILL is written to the table if a fill value is
+specified on the creation of the Table. Otherwise, it is not.<p>The following
+section of code shows the calls necessary to the creation of a table.
+
+<p><code>/* Create a new HDF5 file using default properties. */<br>
+ file_id = H5Fcreate( &quot;my_table.h5&quot;, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );</code> </p>
+
+<p><code>/* Call the make table function */<br>
+</code> <code>H5TBmake_table( "Table Title", file_id, "Table1", NFIELDS, NRECORDS, dst_size,&nbsp;<br>
+                       field_names, dst_offset, field_type,&nbsp;<br>
+                       chunk_size, fill_data, compress, p_data  )&nbsp;</code> </p>
+
+<p><code> /* Close the file. */<br>
+ status = H5Fclose( file_id );</code> </p>
+
+</body>
diff --git a/doxygen/examples/ThreadSafeLibrary.html b/doxygen/examples/ThreadSafeLibrary.html
new file mode 100644
index 0000000..5824dc6
--- /dev/null
+++ b/doxygen/examples/ThreadSafeLibrary.html
@@ -0,0 +1,787 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
+		"http://www.w3.org/TR/REC-html40/loose.dtd">
+<html lang="en-US">
+<head>
+  <title>Thread Safe Library</title>
+</head>
+
+<h1>1. Library header files and conditional compilation</h1>
+
+<p>
+The following code is placed at the beginning of H5private.h:
+</p>
+
+<blockquote>
+  <pre>
+  #ifdef H5_HAVE_THREADSAFE
+  #include &lt;pthread.h&gt;
+  #endif
+  </pre>
+</blockquote>
+
+<p>
+<code>H5_HAVE_THREADSAFE</code> is defined when the HDF5 library is
+compiled with the --enable-threadsafe configuration option. In general,
+code for the non-threadsafe version of HDF5 library are placed within
+the <code>#else</code> part of the conditional compilation. The exception
+to this rule are the changes to the <code>FUNC_ENTER</code> (in
+H5private.h), <code>HRETURN</code> and <code>HRETURN_ERROR</code> (in
+H5Eprivate.h) macros (see section 3.2).
+</p>
+
+
+<h1>2. Global variables/structures</h1>
+
+<h2>2.1 Global library initialization variable</h2>
+
+<p>
+In the threadsafe implementation, the global library initialization
+variable <code>H5_libinit_g</code> is changed to a global structure
+consisting of the variable with its associated lock (locks are explained
+in section 4.1):
+</p>
+
+<blockquote>
+  <pre>
+    hbool_t  H5_libinit_g = FALSE;
+  </pre>
+</blockquote>
+
+<p>
+becomes
+</p>
+
+<blockquote>
+  <pre>
+    H5_api_t H5_g;
+  </pre>
+</blockquote>
+
+<p>
+where <code>H5_api_t</code> is
+</p>
+
+<blockquote>
+  <pre>
+    typedef struct H5_api_struct {
+      H5_mutex_t init_lock;           /* API entrance mutex */
+      hbool_t H5_libinit_g;
+    } H5_api_t;
+  </pre>
+</blockquote>
+
+<p>
+All former references to <code>H5_libinit_g</code> in the library are now
+made using the macro <code>H5_INIT_GLOBAL</code>. If the threadsafe
+library is to be used, the macro is set to <code>H5_g.H5_libinit_g</code>
+instead.
+</p>
+
+<h2>2.2 Global serialization variable</h2>
+
+<p>
+A new global boolean variable <code>H5_allow_concurrent_g</code> is used
+to determine if multiple threads are allowed to an API call
+simultaneously. This is set to <code>FALSE</code>.
+</p>
+
+<p>
+All APIs that are allowed to do so have their own local variable that
+shadows the global variable and is set to <code>TRUE</code>. In phase 1,
+no such APIs exist.
+</p>
+
+<p>
+It is defined in <code>H5.c</code> as follows:
+</p>
+
+<blockquote>
+  <pre>
+    hbool_t H5_allow_concurrent_g = FALSE;
+  </pre>
+</blockquote>
+
+<h2>2.3 Global thread initialization variable</h2>
+
+<p>
+The global variable <code>H5_first_init_g</code> of type
+<code>pthread_once_t</code> is used to allow only the first thread in the
+application process to call an initialization function using
+<code>pthread_once</code>. All subsequent calls to
+<code>pthread_once</code> by any thread are disregarded.
+</p>
+
+<p>
+The call sets up the mutex in the global structure <code>H5_g</code> (see
+section 3.1) via an initialization function
+<code>H5_first_thread_init</code>. The first thread initialization
+function is described in section 4.2.
+</p>
+
+<p>
+<code>H5_first_init_g</code> is defined in <code>H5.c</code> as follows:
+</p>
+
+<blockquote>
+  <pre>
+    pthread_once_t H5_first_init_g = PTHREAD_ONCE_INIT;
+  </pre>
+</blockquote>
+
+<h2>2.4 Global key for per-thread error stacks</h2>
+
+<p>
+A global pthread-managed key <code>H5_errstk_key_g</code> is used to
+allow pthreads to maintain a separate error stack (of type
+<code>H5E_t</code>) for each thread. This is defined in <code>H5.c</code>
+as:
+</p>
+
+<blockquote>
+  <pre>
+    pthread_key_t H5_errstk_key_g;
+  </pre>
+</blockquote>
+
+<p>
+Error stack management is described in section 4.3.
+</p>
+
+<h2>2.5 Global structure and key for thread cancellation prevention</h2>
+
+<p>
+We need to preserve the thread cancellation status of each thread
+individually by using a key <code>H5_cancel_key_g</code>. The status is
+preserved using a structure (of type <code>H5_cancel_t</code>) which
+maintains the cancellability state of the thread before it entered the
+library and a count (which works very much like the recursive lock
+counter) which keeps track of the number of API calls the thread makes
+within the library.
+</p>
+
+<p>
+The structure is defined in <code>H5private.h</code> as:
+</p>
+
+<blockquote>
+  <pre>
+    /* cancellability structure */
+    typedef struct H5_cancel_struct {
+      int previous_state;
+      unsigned int cancel_count;
+    } H5_cancel_t;
+  </pre>
+</blockquote>
+
+<p>
+Thread cancellation is described in section 4.4.
+</p>
+
+
+<h1>3. Changes to Macro expansions</h1>
+
+<h2>3.1 Changes to FUNC_ENTER</h2>
+
+<p>
+The <code>FUNC_ENTER</code> macro is now extended to include macro calls
+to initialize first threads, disable cancellability and wraps a lock
+operation around the checking of the global initialization flag. It
+should be noted that the cancellability should be disabled before
+acquiring the lock on the library. Doing so otherwise would allow the
+possibility that the thread be cancelled just after it has acquired the
+lock on the library and in that scenario, if the cleanup routines are not
+properly set, the library would be permanently locked out.
+</p>
+
+<p>
+The additional macro code and new macro definitions can be found in
+Appendix E.1 to E.5. The changes are made in <code>H5private.h</code>.
+</p>
+
+<h2>3.2 Changes to HRETURN and HRETURN_ERROR</h2>
+
+<p>
+The <code>HRETURN</code> and <code>HRETURN_ERROR</code> macros are the
+counterparts to the <code>FUNC_ENTER</code> macro described in section
+3.1. <code>FUNC_LEAVE</code> makes a macro call to <code>HRETURN</code>,
+so it is also covered here.
+</p>
+
+<p>
+The basic changes to these two macros involve adding macro calls to call
+an unlock operation and re-enable cancellability if necessary.  It should
+be noted that the cancellability should be re-enabled only after the
+thread has released the lock to the library. The consequence of doing
+otherwise would be similar to that described in section 3.1.
+</p>
+
+<p>
+The additional macro code and new macro definitions can be found in
+Appendix E.9 to E.9. The changes are made in <code>H5Eprivate.h</code>.
+</p>
+
+<h1>4. Implementation of threadsafe functionality</h1>
+
+<h2>4.1 Recursive Locks</h2>
+
+<p>
+A recursive mutex lock m allows a thread t1 to successfully lock m more
+than once without blocking t1. Another thread t2 will block if t2 tries
+to lock m while t1 holds the lock to m. If t1 makes k lock calls on m,
+then it also needs to make k unlock calls on m before it releases the
+lock.
+</p>
+
+<p>
+Our implementation of recursive locks is built on top of a pthread mutex
+lock (which is not recursive). It makes use of a pthread condition
+variable to have unsuccessful threads wait on the mutex.  Waiting threads
+are awaken by a signal from the final unlock call made by the thread
+holding the lock.
+</p>
+
+<p>
+Recursive locks are defined to be the following type
+(<code>H5private.h</code>):
+</p>
+
+<blockquote>
+  <pre>
+    typedef struct H5_mutex_struct {
+      pthread_t owner_thread;         /* current lock owner */
+      pthread_mutex_t atomic_lock;    /* lock for atomicity of new mechanism */
+      pthread_cond_t cond_var;        /* condition variable */
+      unsigned int lock_count;
+    } H5_mutex_t;
+  </pre>
+</blockquote>
+
+<p>
+Detailed implementation code can be found in Appendix A. The
+implementation changes are made in <code>H5TS.c</code>.
+</p>
+
+<h2>4.2 First thread initialization</h2>
+
+<p>
+Because the mutex lock associated with a recursive lock cannot be
+statically initialized, a mechanism is required to initialize the
+recursive lock associated with <code>H5_g</code> so that it can be used
+for the first time.
+</p>
+
+<p>
+The pthreads library allows this through the pthread_once call which as
+described in section 3.3 allows only the first thread accessing the
+library in an application to initialize <code>H5_g</code>.
+</p>
+
+<p>
+In addition to initializing <code>H5_g</code>, it also initializes the
+key (see section 3.4) for use with per-thread error stacks (see section
+4.3).
+</p>
+
+<p>
+The first thread initialization mechanism is implemented as the function
+call <code>H5_first_thread_init()</code> in <code>H5TS.c</code>. This is
+described in appendix B.
+</p>
+
+<h2>4.3 Per-thread error stack management</h2>
+
+<p>
+Pthreads allows individual threads to access dynamic and persistent
+per-thread data through the use of keys. Each key is associated with
+a table that maps threads to data items. Keys can be initialized by
+<code>pthread_key_create()</code> in pthreads (see sections 3.4 and 4.2).
+Per-thread data items are accessed using a key through the
+<code>pthread_getspecific()</code> and <code>pthread_setspecific()</code>
+calls to read and write to the association table respectively.
+</p>
+
+<p>
+Per-thread error stacks are accessed through the key
+<code>H5_errstk_key_g</code> which is initialized by the first thread
+initialization call (see section 4.2).
+</p>
+
+<p>
+In the non-threadsafe version of the library, there is a global stack
+variable <code>H5E_stack_g[1]</code> which is no longer defined in the
+threadsafe version. At the same time, the macro call to gain access to
+the error stack <code>H5E_get_my_stack</code> is changed from:
+</p>
+
+<blockquote>
+  <pre>
+    #define H5E_get_my_stack() (H5E_stack_g+0)
+  </pre>
+</blockquote>
+
+<p>
+to:
+</p>
+
+<blockquote>
+  <pre>
+    #define H5E_get_my_stack() H5E_get_stack()
+  </pre>
+</blockquote>
+
+<p>
+where <code>H5E_get_stack()</code> is a surrogate function that does the
+following operations:
+</p>
+
+<ol>
+  <li>if a thread is attempting to get an error stack for the first
+			time, the error stack is dynamically allocated for the thread and
+			associated with <code>H5_errstk_key_g</code> using
+			<code>pthread_setspecific()</code>. The way we detect if it is the
+			first time is through <code>pthread_getspecific()</code> which
+			returns <code>NULL</code> if no previous value is associated with
+			the thread using the key.</li>
+
+  <li>if <code>pthread_getspecific()</code> returns a non-null value,
+			then that is the pointer to the error stack associated with the
+			thread and the stack can be used as usual.</li>
+</ol>
+
+<p>
+A final change to the error reporting routines is as follows; the current
+implementation reports errors to always be detected at thread 0. In the
+threadsafe implementation, this is changed to report the number returned
+by a call to <code>pthread_self()</code>.
+</p>
+
+<p>
+The change in code (reflected in <code>H5Eprint</code> of file
+<code>H5E.c</code>) is as follows:
+</p>
+
+<blockquote>
+	<pre>
+    #ifdef H5_HAVE_THREADSAFE
+      fprintf (stream, "HDF5-DIAG: Error detected in thread %d."
+               ,pthread_self());
+    #else
+      fprintf (stream, "HDF5-DIAG: Error detected in thread 0.");
+    #endif
+  </pre>
+</blockquote>
+
+<p>
+Code for <code>H5E_get_stack()</code> can be found in Appendix C. All the
+above changes were made in <code>H5E.c</code>.
+</p>
+
+<h2>4.4 Thread Cancellation safety</h2>
+
+<p>
+To prevent thread cancellations from killing a thread while it is in the
+library, we maintain per-thread information about the cancellability
+status of the thread before it entered the library so that we can restore
+that same status when the thread leaves the library.
+</p>
+
+<p>
+By <i>enter</i> and <i>leave</i> the library, we mean the points when a
+thread makes an API call from a user application and the time that API
+call returns. Other API or callback function calls made from within that
+API call are considered <i>within</i> the library.
+</p>
+
+<p>
+Because other API calls may be made from within the first API call, we
+need to maintain a counter to determine which was the first and
+correspondingly the last return.
+</p>
+
+<p>
+When a thread makes an API call, the macro <code>H5_API_SET_CANCEL</code>
+calls the worker function <code>H5_cancel_count_inc()</code> which does
+the following:
+</p>
+
+<ol>
+  <li>if this is the first time the thread has entered the library,
+      a new cancellability structure needs to be assigned to it.</li>
+  <li>if the thread is already within the library when the API call is
+			made, then cancel_count is simply incremented. Otherwise, we set
+			the cancellability state to <code>PTHREAD_CANCEL_DISABLE</code>
+			while storing the previous state into the cancellability structure.
+			<code>cancel_count</code> is also incremented in this case.</li>
+</ol>
+
+<p>
+When a thread leaves an API call, the macro
+<code>H5_API_UNSET_CANCEL</code> calls the worker function
+<code>H5_cancel_count_dec()</code> which does the following:
+</p>
+
+<ol>
+  <li>if <code>cancel_count</code> is greater than 1, indicating that the
+			thread is not yet about to leave the library, then
+			<code>cancel_count</code> is simply decremented.</li>
+  <li>otherwise, we reset the cancellability state back to its original
+			state before it entered the library and decrement the count (back
+			to zero).</li>
+</ol>
+
+<p>
+<code>H5_cancel_count_inc</code> and <code>H5_cancel_count_dec</code> are
+described in Appendix D and may be found in <code>H5TS.c</code>.
+</p>
+
+<h1>5. Test programs</h1>
+
+<p>
+Except where stated, all tests involve 16 simultaneous threads that make
+use of HDF5 API calls without any explicit synchronization typically
+required in a non-threadsafe environment.
+</p>
+
+<h2>5.1 Data set create and write</h2>
+
+<p>
+The test program sets up 16 threads to simultaneously create 16
+different datasets named from <i>zero</i> to <i>fifteen</i> for a single
+file and then writing an integer value into that dataset equal to the
+dataset's named value.
+</p>
+
+<p>
+The main thread would join with all 16 threads and attempt to match the
+resulting HDF5 file with expected results - that each dataset contains
+the correct value (0 for <i>zero</i>, 1 for <i>one</i> etc ...) and all
+datasets were correctly created.
+</p>
+
+<p>
+The test is implemented in the file <code>ttsafe_dcreate.c</code>.
+</p>
+
+<h2>5.2 Test on error stack</h2>
+
+<p>
+The error stack test is one in which 16 threads simultaneously try to
+create datasets with the same name. The result, when properly serialized,
+should be equivalent to 16 attempts to create the dataset with the same
+name.
+</p>
+
+<p>
+The error stack implementation runs correctly if it reports 15 instances
+of the dataset name conflict error and finally generates a correct HDF5
+containing that single dataset. Each thread should report its own stack
+of errors with a thread number associated with it.
+</p>
+
+<p>
+The test is implemented in the file <code>ttsafe_error.c</code>.
+</p>
+
+<h2>5.3 Test on cancellation safety</h2>
+
+<p>
+The main idea in thread cancellation safety is as follows; a child thread
+is spawned to create and write to a dataset. Following that, it makes a
+<code>H5Diterate</code> call on that dataset which activates a callback
+function.
+</p>
+
+<p>
+A deliberate barrier is invoked at the callback function which waits for
+both the main and child thread to arrive at that point. After that
+happens, the main thread proceeds to make a thread cancel call on the
+child thread while the latter sleeps for 3 seconds before proceeding to
+write a new value to the dataset.
+</p>
+
+<p>
+After the iterate call, the child thread logically proceeds to wait
+another 3 seconds before writing another newer value to the dataset.
+</p>
+
+<p>
+The test is correct if the main thread manages to read the second value
+at the end of the test. This means that cancellation did not take place
+until the end of the iteration call despite of the 3 second wait within
+the iteration callback and the extra dataset write operation.
+Furthermore, the cancellation should occur before the child can proceed
+to write the last value into the dataset.
+</p>
+
+<h2>5.4 Test on attribute creation</h2>
+
+<p>
+A main thread makes 16 threaded calls to <code>H5Acreate</code> with a
+generated name for each attribute. Sixteen attributes should be created
+for the single dataset in random (chronological) order and receive values
+depending on its generated attribute name (e.g. <i>attrib010</i> would
+receive the value 10).
+</p>
+
+<p>
+After joining with all child threads, the main thread proceeds to read
+each attribute by generated name to see if the value tallies. Failure is
+detected if the attribute name does not exist (meaning they were never
+created) or if the wrong values were read back.
+</p>
+
+<h1>A. Recursive Lock implementation code</h1>
+
+<blockquote>
+  <pre>
+  void H5_mutex_init(H5_mutex_t *H5_mutex)
+  {
+    H5_mutex-&gt;owner_thread = NULL;
+    pthread_mutex_init(&amp;H5_mutex-&gt;atomic_lock, NULL);
+    pthread_cond_init(&amp;H5_mutex-&gt;cond_var, NULL);
+    H5_mutex-&gt;lock_count = 0;
+  }
+
+  void H5_mutex_lock(H5_mutex_t *H5_mutex)
+  {
+    pthread_mutex_lock(&amp;H5_mutex-&gt;atomic_lock);
+
+    if (pthread_equal(pthread_self(), H5_mutex-&gt;owner_thread)) {
+    	/* already owned by self - increment count */
+    	H5_mutex-&gt;lock_count++;
+    } else {
+    	if (H5_mutex-&gt;owner_thread == NULL) {
+    		/* no one else has locked it - set owner and grab lock */
+    		H5_mutex-&gt;owner_thread = pthread_self();
+    		H5_mutex-&gt;lock_count = 1;
+    	} else {
+    		/* if already locked by someone else */
+    		while (1) {
+    			pthread_cond_wait(&amp;H5_mutex-&gt;cond_var, &amp;H5_mutex-&gt;atomic_lock);
+
+    			if (H5_mutex-&gt;owner_thread == NULL) {
+    				H5_mutex-&gt;owner_thread = pthread_self();
+    				H5_mutex-&gt;lock_count = 1;
+    				break;
+    			} /* else do nothing and loop back to wait on condition*/
+    		}
+    	}
+    }
+
+    pthread_mutex_unlock(&amp;H5_mutex-&gt;atomic_lock);
+  }
+
+  void H5_mutex_unlock(H5_mutex_t *H5_mutex)
+  {
+    pthread_mutex_lock(&amp;H5_mutex-&gt;atomic_lock);
+    H5_mutex-&gt;lock_count--;
+
+    if (H5_mutex-&gt;lock_count == 0) {
+    	H5_mutex-&gt;owner_thread = NULL;
+    	pthread_cond_signal(&amp;H5_mutex-&gt;cond_var);
+    }
+    pthread_mutex_unlock(&amp;H5_mutex-&gt;atomic_lock);
+  }
+  </pre>
+</blockquote>
+
+<h1>B. First thread initialization</h1>
+
+<blockquote>
+  <pre>
+  void H5_first_thread_init(void)
+  {
+    /* initialize global API mutex lock                      */
+    H5_g.H5_libinit_g = FALSE;
+    H5_g.init_lock.owner_thread = NULL;
+    pthread_mutex_init(&amp;H5_g.init_lock.atomic_lock, NULL);
+    pthread_cond_init(&amp;H5_g.init_lock.cond_var, NULL);
+    H5_g.init_lock.lock_count = 0;
+
+    /* initialize key for thread-specific error stacks       */
+    pthread_key_create(&amp;H5_errstk_key_g, NULL);
+
+    /* initialize key for thread cancellability mechanism    */
+    pthread_key_create(&amp;H5_cancel_key_g, NULL);
+  }
+  </pre>
+</blockquote>
+
+
+<h1>C. Per-thread error stack acquisition</h1>
+
+<blockquote>
+  <pre>
+  H5E_t *H5E_get_stack(void)
+  {
+    H5E_t *estack;
+
+    if (estack = pthread_getspecific(H5_errstk_key_g)) {
+    	return estack;
+    } else {
+    	/* no associated value with current thread - create one */
+    	estack = (H5E_t *)malloc(sizeof(H5E_t));
+    	pthread_setspecific(H5_errstk_key_g, (void *)estack);
+    	return estack;
+    }
+  }
+  </pre>
+</blockquote>
+
+<h1>D. Thread cancellation mechanisms</h1>
+
+<blockquote>
+  <pre>
+  void H5_cancel_count_inc(void)
+  {
+    H5_cancel_t *cancel_counter;
+
+    if (cancel_counter = pthread_getspecific(H5_cancel_key_g)) {
+      /* do nothing here */
+    } else {
+      /*
+       * first time thread calls library - create new counter and
+       * associate with key
+       */
+      cancel_counter = (H5_cancel_t *)malloc(sizeof(H5_cancel_t));
+      cancel_counter-&gt;cancel_count = 0;
+      pthread_setspecific(H5_cancel_key_g, (void *)cancel_counter);
+    }
+
+    if (cancel_counter-&gt;cancel_count == 0) {
+      /* thread entering library */
+      pthread_setcancelstate(PTHREAD_CANCEL_DISABLE,
+                             &amp;(cancel_counter-&gt;previous_state));
+    }
+
+    cancel_counter-&gt;cancel_count++;
+  }
+
+  void H5_cancel_count_dec(void)
+  {
+    H5_cancel_t *cancel_counter = pthread_getspecific(H5_cancel_key_g);
+
+    if (cancel_counter-&gt;cancel_count == 1)
+      pthread_setcancelstate(cancel_counter-&gt;previous_state, NULL);
+
+    cancel_counter-&gt;cancel_count--;
+  }
+  </pre>
+</blockquote>
+
+<h1>E. Macro expansion codes</h1>
+
+<h2>E.1 <code>FUNC_ENTER</code></h2>
+
+<blockquote>
+  <pre>
+  /* Initialize the library */                                \
+  H5_FIRST_THREAD_INIT                                        \
+  H5_API_UNSET_CANCEL                                         \
+  H5_API_LOCK_BEGIN                                           \
+    if (!(H5_INIT_GLOBAL)) {                                  \
+      H5_INIT_GLOBAL = TRUE;                                  \
+        if (H5_init_library() &lt; 0) {                          \
+          HRETURN_ERROR (H5E_FUNC, H5E_CANTINIT, err,         \
+                        "library initialization failed");     \
+        }                                                     \
+    }                                                         \
+    H5_API_LOCK_END                                           \
+             :
+             :
+             :
+  </pre>
+</blockquote>
+
+<h2>E.2 <code>H5_FIRST_THREAD_INIT</code></h2>
+
+<blockquote>
+  <pre>
+  /* Macro for first thread initialization */
+  #define H5_FIRST_THREAD_INIT                                \
+    pthread_once(&amp;H5_first_init_g, H5_first_thread_init);
+  </pre>
+</blockquote>
+
+
+<h2>E.3 <code>H5_API_UNSET_CANCEL</code></h2>
+
+<blockquote>
+  <pre>
+  #define H5_API_UNSET_CANCEL                                 \
+    if (H5_IS_API(__func__)) {                                \
+      H5_cancel_count_inc();                                  \
+    }
+  </pre>
+</blockquote>
+
+
+<h2>E.4 <code>H5_API_LOCK_BEGIN</code></h2>
+
+<blockquote>
+  <pre>
+  #define H5_API_LOCK_BEGIN                                   \
+     if (H5_IS_API(__func__)) {                               \
+       H5_mutex_lock(&amp;H5_g.init_lock);
+  </pre>
+</blockquote>
+
+
+<h2>E.5 <code>H5_API_LOCK_END</code></h2>
+
+<blockquote>
+  <pre>
+  #define H5_API_LOCK_END }
+  </pre>
+</blockquote>
+
+
+<h2>E.6 <code>HRETURN</code> and <code>HRETURN_ERROR</code></h2>
+
+<blockquote>
+  <pre>
+            :
+            :
+    H5_API_UNLOCK_BEGIN                                       \
+    H5_API_UNLOCK_END                                         \
+    H5_API_SET_CANCEL                                         \
+    return ret_val;                                           \
+  }
+  </pre>
+</blockquote>
+
+<h2>E.7 <code>H5_API_UNLOCK_BEGIN</code></h2>
+
+<blockquote>
+  <pre>
+  #define H5_API_UNLOCK_BEGIN                                 \
+    if (H5_IS_API(__func__)) {                                \
+      H5_mutex_unlock(&amp;H5_g.init_lock);
+  </pre>
+</blockquote>
+
+<h2>E.8 <code>H5_API_UNLOCK_END</code></h2>
+
+<blockquote>
+  <pre>
+  #define H5_API_UNLOCK_END }
+  </pre>
+</blockquote>
+
+
+<h2>E.9 <code>H5_API_SET_CANCEL</code></h2>
+
+<blockquote>
+  <pre>
+  #define H5_API_SET_CANCEL                                   \
+    if (H5_IS_API(__func__)) {                                \
+      H5_cancel_count_dec();                                  \
+    }
+  </pre>
+</blockquote>
+
+<h2>By Chee Wai Lee</h2>
+<h4>By Bill Wendling</h4>
+
+</body>
+</html>
diff --git a/doxygen/examples/VFL.html b/doxygen/examples/VFL.html
new file mode 100644
index 0000000..78d1632
--- /dev/null
+++ b/doxygen/examples/VFL.html
@@ -0,0 +1,1598 @@
+<HTML>
+<HEAD>
+<!-- This HTML file has been created by texi2html 1.51
+     from VFL.texi on 18 November 1999 -->
+
+<TITLE>HDF5 Virtual File Layer</TITLE>
+</HEAD>
+
+
+<!--
+  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+  * Copyright by The HDF Group.                                               *
+  * All rights reserved.                                                      *
+  *                                                                           *
+  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+  * terms governing use, modification, and redistribution, is contained in    *
+  * the COPYING file, which can be found at the root of the source code       *
+  * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+  * If you do not have access to either file, you may request a copy from     *
+  * help@hdfgroup.org.                                                        *
+  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ -->
+
+
+<BODY>
+
+<strong>Revision History</strong>
+<p>Initial document, 18 November 1999.</p>
+
+<p>Updated on 10/24/00, Quincey Koziol</p>
+
+<p>Added the section &ldquo;Programming Note for C++ Developers Using C
+Functions,&rdquo; 08/23/2012, Mark Evans
+
+
+
+<P>
+<P><HR><P>
+<H1>Table of Contents</H1>
+<UL>
+<LI><A NAME="TOC1" HREF="#SEC1">Introduction</A>
+<LI><A NAME="TOC2" HREF="#SEC2">Using a File Driver</A>
+<UL>
+<LI><A NAME="TOC3" HREF="#SEC3">Driver Header Files</A>
+<LI><A NAME="TOC4" HREF="#SEC4">Creating and Opening Files</A>
+<LI><A NAME="TOC5" HREF="#SEC5">Performing I/O</A>
+<LI><A NAME="TOC6" HREF="#SEC6">File Driver Interchangeability</A>
+</UL>
+<LI><A NAME="TOC7" HREF="#SEC7">Implementation of a Driver</A>
+<UL>
+<LI><A NAME="TOC8" HREF="#SEC8">Mode Functions</A>
+<LI><A NAME="TOC9" HREF="#SEC9">File Functions</A>
+<UL>
+<LI><A NAME="TOC10" HREF="#SEC10">Opening Files</A>
+<LI><A NAME="TOC11" HREF="#SEC11">Closing Files</A>
+<LI><A NAME="TOC12" HREF="#SEC12">File Keys</A>
+<LI><A NAME="TOC13" HREF="#SEC13">Saving Modes Across Opens</A>
+</UL>
+<LI><A NAME="TOC14" HREF="#SEC14">Address Space Functions</A>
+<UL>
+<LI><A NAME="TOC15" HREF="#SEC15">Userblock and Superblock</A>
+<LI><A NAME="TOC16" HREF="#SEC16">Allocation of Format Regions</A>
+<LI><A NAME="TOC17" HREF="#SEC17">Freeing Format Regions</A>
+<LI><A NAME="TOC18" HREF="#SEC18">Querying Address Range</A>
+</UL>
+<LI><A NAME="TOC19" HREF="#SEC19">Data Functions</A>
+<UL>
+<LI><A NAME="TOC20" HREF="#SEC20">Contiguous I/O Functions</A>
+<LI><A NAME="TOC21" HREF="#SEC21">Flushing Cached Data</A>
+</UL>
+<LI><A NAME="TOC22" HREF="#SEC22">Optimization Functions</A>
+<LI><A NAME="TOC23" HREF="#SEC23">Registration of a Driver</A>
+    <ul>
+    <li><a name="TOCProgNote" href="#SECProgNote">
+    Programming Note for C++ Developers Using C Functions</a>
+    </li>
+    </ul>
+<LI><A NAME="TOC24" HREF="#SEC24">Querying Driver Information</A>
+</UL>
+<LI><A NAME="TOC25" HREF="#SEC25">Miscellaneous</A>
+</UL>
+<P><HR><P>
+
+
+<H1><A NAME="SEC1" HREF="#TOC1">Introduction</A></H1>
+
+<P>
+The HDF5 file format describes how HDF5 data structures and dataset raw
+data are mapped to a linear <STRONG>format address space</STRONG> and the HDF5
+library implements that bidirectional mapping in terms of an
+API. However, the HDF5 format specifications do <EM>not</EM> indicate how
+the format address space is mapped onto storage and HDF (version 5 and
+earlier) simply mapped the format address space directly onto a single
+file by convention.
+
+</P>
+<P>
+Since early versions of HDF5 it became apparent that users want the ability to
+map the format address space onto different types of storage (a single file,
+multiple files, local memory, global memory, network distributed global
+memory, a network protocol, <I>etc</I>.) with various types of maps. For
+instance, some users want to be able to handle very large format address
+spaces on operating systems that support only 2GB files by partitioning the
+format address space into equal-sized parts each served by a separate
+file. Other users want the same multi-file storage capability but want to
+partition the address space according to purpose (raw data in one file, object
+headers in another, global heap in a third, <I>etc.</I>) in order to improve I/O
+speeds.
+
+</P>
+<P>
+In fact, the number of storage variations is probably larger than the
+number of methods that the HDF5 team is capable of implementing and
+supporting. Therefore, a <STRONG>Virtual File Layer</STRONG> API is being
+implemented which will allow application teams or departments to design
+and implement their own mapping between the HDF5 format address space
+and storage, with each mapping being a separate <STRONG>file driver</STRONG>
+(possibly written in terms of other file drivers). The HDF5 team will
+provide a small set of useful file drivers which will also serve as
+examples for those who which to write their own:
+
+</P>
+<DL COMPACT>
+
+<DT><CODE>H5FD_SEC2</CODE>
+<DD>
+This is the default driver which uses Posix file-system functions like
+<CODE>read</CODE> and <CODE>write</CODE> to perform I/O to a single file. All I/O
+requests are unbuffered although the driver does optimize file seeking
+operations to some extent.
+
+<DT><CODE>H5FD_STDIO</CODE>
+<DD>
+This driver uses functions from <TT>`stdio.h'</TT> to perform buffered I/O
+to a single file.
+
+<DT><CODE>H5FD_CORE</CODE>
+<DD>
+This driver performs I/O directly to memory and can be used to create small
+temporary files that never exist on permanent storage. This type of storage is
+generally very fast since the I/O consists only of memory-to-memory copy
+operations.
+
+<DT><CODE>H5FD_MPIIO</CODE>
+<DD>
+This is the driver of choice for accessing files in parallel using MPI and
+MPI-IO.  It is only predefined if the library is compiled with parallel I/O
+support.
+
+<DT><CODE>H5FD_FAMILY</CODE>
+<DD>
+Large format address spaces are partitioned into more manageable pieces and
+sent to separate storage locations using an underlying driver of the user's
+choice.  The <CODE>h5repart</CODE> tool can be used to change the sizes of the
+family members when stored as files or to convert a family of files to a
+single file or vice versa.
+
+<DT><CODE>H5FD_SPLIT</CODE>
+<DD>
+The format address space is split into meta data and raw data and each is
+mapped onto separate storage using underlying drivers of the user's
+choice. The meta data storage can be read by itself (for limited
+functionality) or both files can be accessed together.
+</DL>
+
+
+
+<H1><A NAME="SEC2" HREF="#TOC2">Using a File Driver</A></H1>
+
+<P>
+Most application writers will use a driver defined by the HDF5 library or
+contributed by another programming team. This chapter describes how existing
+drivers are used.
+
+</P>
+
+
+
+<H2><A NAME="SEC3" HREF="#TOC3">Driver Header Files</A></H2>
+
+<P>
+Each file driver is defined in its own public header file which should
+be included by any application which plans to use that driver. The
+predefined drivers are in header files whose names begin with
+<SAMP>`H5FD'</SAMP> followed by the driver name and <SAMP>`.h'</SAMP>. The <TT>`hdf5.h'</TT>
+header file includes all the predefined driver header files.
+
+</P>
+<P>
+Once the appropriate header file is included a symbol of the form
+<SAMP>`H5FD_'</SAMP> followed by the upper-case driver name will be the driver
+identification number.<A NAME="DOCF1" HREF="#FOOT1">(1)</A>  However, the
+value may change if the library is closed (<I>e.g.</I>, by calling
+<CODE>H5close</CODE>) and the symbol is referenced again.
+
+</P>
+
+
+<H2><A NAME="SEC4" HREF="#TOC4">Creating and Opening Files</A></H2>
+
+<P>
+In order to create or open a file one must define the method by which the
+storage is accessed<A NAME="DOCF2" HREF="#FOOT2">(2)</A> and does so by creating a file access property list<A NAME="DOCF3" HREF="#FOOT3">(3)</A> which is passed to the <CODE>H5Fcreate</CODE> or
+<CODE>H5Fopen</CODE> function.  A default file access property list is created by
+calling <CODE>H5Pcreate</CODE> and then the file driver information is inserted by
+calling a driver initialization function such as <CODE>H5Pset_fapl_family</CODE>:
+
+</P>
+
+<PRE>
+hid_t fapl = H5Pcreate(H5P_FILE_ACCESS);
+size_t member_size = 100*1024*1024; /*100MB*/
+H5Pset_fapl_family(fapl, member_size, H5P_DEFAULT);
+hid_t file = H5Fcreate("foo%05d.h5", H5F_ACC_TRUNC, H5P_DEFAULT, fapl);
+H5Pclose(fapl);
+</PRE>
+
+<P>
+Each file driver will have its own initialization function
+whose name is <CODE>H5Pset_fapl_</CODE> followed by the driver name and which
+takes a file access property list as the first argument followed by
+additional driver-dependent arguments.
+
+</P>
+<P>
+An alternative to using the driver initialization function is to set the
+driver directly using the <CODE>H5Pset_driver</CODE> function.<A NAME="DOCF4" HREF="#FOOT4">(4)</A> Its second argument is the file driver identifier, which may
+have a different numeric value from run to run depending on the order in which
+the file drivers are registered with the library. The third argument
+encapsulates the additional arguments of the driver initialization
+function. This method only works if the file driver writer has made the
+driver-specific property list structure a public datatype, which is
+often not the case.
+
+</P>
+
+<PRE>
+hid_t fapl = H5Pcreate(H5P_FILE_ACCESS);
+static H5FD_family_fapl_t fa = {100*1024*1024, H5P_DEFAULT};
+H5Pset_driver(fapl, H5FD_FAMILY, &#38;fa);
+hid_t file = H5Fcreate("foo.h5", H5F_ACC_TRUNC, H5P_DEFAULT, fapl);
+H5Pclose(fapl);
+</PRE>
+
+<P>
+It is also possible to query the file driver information from a file access
+property list by calling <CODE>H5Pget_driver</CODE> to determine the driver and then
+calling a driver-defined query function to obtain the driver information:
+
+</P>
+
+<PRE>
+hid_t driver = H5Pget_driver(fapl);
+if (H5FD_SEC2==driver) {
+    /*nothing further to get*/
+} else if (H5FD_FAMILY==driver) {
+    hid_t member_fapl;
+    haddr_t member_size;
+    H5Pget_fapl_family(fapl, &#38;member_size, &#38;member_fapl);
+} else if (....) {
+    ....
+}
+</PRE>
+
+
+
+<H2><A NAME="SEC5" HREF="#TOC5">Performing I/O</A></H2>
+
+<P>
+The <CODE>H5Dread</CODE> and <CODE>H5Dwrite</CODE> functions transfer data between
+application memory and the file. They both take an optional data transfer
+property list which has some general driver-independent properties and
+optional driver-defined properties. An application will typically perform I/O
+in one of three styles via the <CODE>H5Dread</CODE> or <CODE>H5Dwrite</CODE> function:
+
+</P>
+<P>
+Like file access properties in the previous section, data transfer properties
+can be set using a driver initialization function or a general purpose
+function. For example, to set the MPI-IO driver to use independent access for
+I/O operations one would say:
+
+</P>
+
+<PRE>
+hid_t dxpl = H5Pcreate(H5P_DATA_XFER);
+H5Pset_dxpl_mpio(dxpl, H5FD_MPIO_INDEPENDENT);
+H5Dread(dataset, type, mspace, fspace, buffer, dxpl);
+H5Pclose(dxpl);
+</PRE>
+
+<P>
+The alternative is to initialize a driver defined C <CODE>struct</CODE> and pass it
+to the <CODE>H5Pset_driver</CODE> function:
+
+</P>
+
+<PRE>
+hid_t dxpl = H5Pcreate(H5P_DATA_XFER);
+static H5FD_mpio_dxpl_t dx = {H5FD_MPIO_INDEPENDENT};
+H5Pset_driver(dxpl, H5FD_MPIO, &#38;dx);
+H5Dread(dataset, type, mspace, fspace, buffer, dxpl);
+</PRE>
+
+<P>
+The transfer property list can be queried in a manner similar to the file
+access property list: the driver provides a function (or functions) to return
+various information about the transfer property list:
+
+</P>
+
+<PRE>
+hid_t driver = H5Pget_driver(dxpl);
+if (H5FD_MPIO==driver) {
+    H5FD_mpio_xfer_t xfer_mode;
+    H5Pget_dxpl_mpio(dxpl, &#38;xfer_mode);
+} else {
+    ....
+}
+</PRE>
+
+
+
+<H2><A NAME="SEC6" HREF="#TOC6">File Driver Interchangeability</A></H2>
+
+<P>
+The HDF5 specifications describe two things: the mapping of data onto a linear
+<STRONG>format address space</STRONG> and the C API which performs the mapping.
+However, the mapping of the format address space onto storage intentionally
+falls outside the scope of the HDF5 specs. This is a direct result of the fact
+that it is not generally possible to store information about how to access
+storage inside the storage itself. For instance, given only the file name
+<TT>`/arborea/1225/work/f%03d'</TT> the HDF5 library is unable to tell whether the
+name refers to a file on the local file system, a family of files on the local
+file system, a file on host <SAMP>`arborea'</SAMP> port 1225, a family of files on a
+remote system, <I>etc</I>.
+
+</P>
+<P>
+Two ways which library could figure out where the storage is located are:
+storage access information can be provided by the user, or the library can try
+all known file access methods. This implementation uses the former method.
+
+</P>
+<P>
+In general, if a file was created with one driver then it isn't possible to
+open it with another driver. There are of course exceptions: a file created
+with MPIO could probably be opened with the sec2 driver, any file created
+by the sec2 driver could be opened as a family of files with one member,
+<I>etc</I>.  In fact, sometimes a file must not only be opened with the same
+driver but also with the same driver properties. The predefined drivers are
+written in such a way that specifying the correct driver is sufficient for
+opening a file.
+
+</P>
+
+
+<H1><A NAME="SEC7" HREF="#TOC7">Implementation of a Driver</A></H1>
+
+<P>
+A driver is simply a collection of functions and data structures which are
+registered with the HDF5 library at runtime. The functions fall into these
+categories:
+
+</P>
+
+<UL>
+<LI>Functions which operate on modes
+
+<LI>Functions which operate on files
+
+<LI>Functions which operate on the address space
+
+<LI>Functions which operate on data
+
+<LI>Functions for driver initialization
+
+<LI>Optimization functions
+
+</UL>
+
+
+
+<H2><A NAME="SEC8" HREF="#TOC8">Mode Functions</A></H2>
+
+<P>
+Some drivers need information about file access and data transfers which are
+very specific to the driver. The information is usually implemented as a pair
+of pointers to C structs which are allocated and initialized as part of an
+HDF5 property list and passed down to various driver functions. There are two
+classes of settings: file access modes that describe how to access the file
+through the driver, and data transfer modes which are settings that control
+I/O operations.  Each file opened by a particular driver may have a different
+access mode; each dataset I/O request for a particular file may have a
+different data transfer mode.
+
+</P>
+<P>
+Since each driver has its own particular requirements for various settings,
+each driver is responsible for defining the mode structures that it
+needs. Higher layers of the library treat the structures as opaque but must be
+able to copy and free them. Thus, the driver provides either the size of the
+structure or a pair of function pointers for each of the mode types.
+
+</P>
+<P>
+<STRONG>Example:</STRONG> The family driver needs to know how the format address
+space is partitioned and the file access property list to use for the
+family members.
+
+</P>
+
+<PRE>
+/* Driver-specific file access properties */
+typedef struct H5FD_family_fapl_t {
+    hsize_t     memb_size;      /*size of each member                   */
+    hid_t       memb_fapl_id;   /*file access property list of each memb*/
+} H5FD_family_fapl_t;
+
+/* Driver specific data transfer properties */
+typedef struct H5FD_family_dxpl_t {
+    hid_t       memb_dxpl_id;   /*data xfer property list of each memb  */
+} H5FD_family_dxpl_t;
+</PRE>
+
+<P>
+In order to copy or free one of these structures the member file access
+or data transfer properties must also be copied or freed. This is done
+by providing a copy and close function for each structure:
+
+</P>
+<P>
+<STRONG>Example:</STRONG> The file access property list copy and close functions
+for the family driver:
+
+</P>
+
+<PRE>
+static void *
+H5FD_family_fapl_copy(const void *_old_fa)
+{
+    const H5FD_family_fapl_t *old_fa = (const H5FD_family_fapl_t*)_old_fa;
+    H5FD_family_fapl_t *new_fa = malloc(sizeof(H5FD_family_fapl_t));
+    assert(new_fa);
+
+    memcpy(new_fa, old_fa, sizeof(H5FD_family_fapl_t));
+    new_fa-&#62;memb_fapl_id = H5Pcopy(old_fa-&#62;memb_fapl_id);
+    return new_fa;
+}
+
+static herr_t
+H5FD_family_fapl_free(void *_fa)
+{
+    H5FD_family_fapl_t  *fa = (H5FD_family_fapl_t*)_fa;
+    H5Pclose(fa-&#62;memb_fapl_id);
+    free(fa);
+    return 0;
+}
+</PRE>
+
+<P>
+Generally when a file is created or opened the file access properties
+for the driver are copied into the file pointer which is returned and
+they may be modified from their original value (for instance, the file
+family driver modifies the member size property when opening an existing
+family). In order to support the <CODE>H5Fget_access_plist</CODE> function the
+driver must provide a <CODE>fapl_get</CODE> callback which creates a copy of
+the driver-specific properties based on a particular file.
+
+</P>
+<P>
+<STRONG>Example:</STRONG> The file family driver copies the member size file
+access property list into the return value:
+
+</P>
+
+<PRE>
+static void *
+H5FD_family_fapl_get(H5FD_t *_file)
+{
+    H5FD_family_t	*file = (H5FD_family_t*)_file;
+    H5FD_family_fapl_t	*fa = calloc(1, sizeof(H5FD_family_fapl_t*));
+
+    fa-&#62;memb_size = file-&#62;memb_size;
+    fa-&#62;memb_fapl_id = H5Pcopy(file-&#62;memb_fapl_id);
+    return fa;
+}
+</PRE>
+
+
+
+<H2><A NAME="SEC9" HREF="#TOC9">File Functions</A></H2>
+
+<P>
+The higher layers of the library expect files to have a name and allow the
+file to be accessed in various modes. The driver must be able to create a new
+file, replace an existing file, or open an existing file. Opening or creating
+a file should return a handle, a pointer to a specialization of the
+<CODE>H5FD_t</CODE> struct, which allows read-only or read-write access and which
+will be passed to the other driver functions as they are
+called.<A NAME="DOCF5" HREF="#FOOT5">(5)</A>
+
+</P>
+
+<PRE>
+typedef struct {
+    /* Public fields */
+    H5FD_class_t *cls; /*class data defined below*/
+
+    /* Private fields -- driver-defined */
+
+} H5FD_t;
+</PRE>
+
+<P>
+<STRONG>Example:</STRONG> The family driver requires handles to the underlying
+storage, the size of the members for this particular file (which might be
+different than the member size specified in the file access property list if
+an existing file family is being opened), the name used to open the file in
+case additional members must be created, and the flags to use for creating
+those additional members. The <CODE>eoa</CODE> member caches the size of the format
+address space so the family members don't have to be queried in order to find
+it.
+
+</P>
+
+<PRE>
+/* The description of a file belonging to this driver. */
+typedef struct H5FD_family_t {
+    H5FD_t      pub;            /*public stuff, must be first           */
+    hid_t       memb_fapl_id;   /*file access property list for members */
+    hsize_t     memb_size;      /*maximum size of each member file      */
+    int         nmembs;         /*number of family members              */
+    int         amembs;         /*number of member slots allocated      */
+    H5FD_t      **memb;         /*dynamic array of member pointers      */
+    haddr_t     eoa;            /*end of allocated addresses            */
+    char        *name;          /*name generator printf format          */
+    unsigned    flags;          /*flags for opening additional members  */
+} H5FD_family_t;
+</PRE>
+
+<P>
+<STRONG>Example:</STRONG> The sec2 driver needs to keep track of the underlying Unix
+file descriptor and also the end of format address space and current Unix file
+size. It also keeps track of the current file position and last operation
+(read, write, or unknown) in order to optimize calls to <CODE>lseek</CODE>.  The
+<CODE>device</CODE> and <CODE>inode</CODE> fields are defined on Unix in order to uniquely
+identify the file and will be discussed below.
+
+</P>
+
+<PRE>
+typedef struct H5FD_sec2_t {
+    H5FD_t      pub;                    /*public stuff, must be first   */
+    int         fd;                     /*the unix file                 */
+    haddr_t     eoa;                    /*end of allocated region       */
+    haddr_t     eof;                    /*end of file; current file size*/
+    haddr_t     pos;                    /*current file I/O position     */
+    int         op;                     /*last operation                */
+    dev_t       device;                 /*file device number            */
+    ino_t       inode;                  /*file i-node number            */
+} H5FD_sec2_t;
+</PRE>
+
+
+
+<H3><A NAME="SEC10" HREF="#TOC10">Opening Files</A></H3>
+
+<P>
+All drivers must define a function for opening/creating a file. This
+function should have a prototype which is:
+
+</P>
+<P>
+<DL>
+<DT><U>Function:</U> static H5FD_t * <B>open</B> <I>(const char *<VAR>name</VAR>, unsigned <VAR>flags</VAR>, hid_t <VAR>fapl</VAR>, haddr_t <VAR>maxaddr</VAR>)</I>
+<DD><A NAME="IDX1"></A>
+
+</P>
+<P>
+The file name <VAR>name</VAR> and file access property list <VAR>fapl</VAR> are
+the same as were specified in the <CODE>H5Fcreate</CODE> or <CODE>H5Fopen</CODE>
+call. The <VAR>flags</VAR> are the same as in those calls also except the
+flag <CODE>H5F_ACC_CREATE</CODE> is also present if the call was to
+<CODE>H5Fcreate</CODE> and they are documented in the <TT>`H5Fpublic.h'</TT>
+file. The <VAR>maxaddr</VAR> argument is the maximum format address that the
+driver should be prepared to handle (the minimum address is always
+zero).
+</DL>
+
+</P>
+<P>
+<STRONG>Example:</STRONG> The sec2 driver opens a Unix file with the requested name
+and saves information which uniquely identifies the file (the Unix device
+number and inode).
+
+</P>
+
+<PRE>
+static H5FD_t *
+H5FD_sec2_open(const char *name, unsigned flags, hid_t fapl_id/*unused*/,
+               haddr_t maxaddr)
+{
+    unsigned    o_flags;
+    int         fd;
+    struct stat sb;
+    H5FD_sec2_t *file=NULL;
+
+    /* Check arguments */
+    if (!name || !*name) return NULL;
+    if (0==maxaddr || HADDR_UNDEF==maxaddr) return NULL;
+    if (ADDR_OVERFLOW(maxaddr)) return NULL;
+
+    /* Build the open flags */
+    o_flags = (H5F_ACC_RDWR &#38; flags) ? O_RDWR : O_RDONLY;
+    if (H5F_ACC_TRUNC &#38; flags) o_flags |= O_TRUNC;
+    if (H5F_ACC_CREAT &#38; flags) o_flags |= O_CREAT;
+    if (H5F_ACC_EXCL &#38; flags) o_flags |= O_EXCL;
+
+    /* Open the file */
+    if ((fd=open(name, o_flags, 0666))&#60;0) return NULL;
+    if (fstat(fd, &#38;sb)&#60;0) {
+        close(fd);
+        return NULL;
+    }
+
+    /* Create the new file struct */
+    file = calloc(1, sizeof(H5FD_sec2_t));
+    file-&#62;fd = fd;
+    file-&#62;eof = sb.st_size;
+    file-&#62;pos = HADDR_UNDEF;
+    file-&#62;op = OP_UNKNOWN;
+    file-&#62;device = sb.st_dev;
+    file-&#62;inode = sb.st_ino;
+
+    return (H5FD_t*)file;
+}
+</PRE>
+
+
+
+<H3><A NAME="SEC11" HREF="#TOC11">Closing Files</A></H3>
+
+<P>
+Closing a file simply means that all cached data should be flushed to the next
+lower layer, the file should be closed at the next lower layer, and all
+file-related data structures should be freed. All information needed by the
+close function is already present in the file handle.
+
+</P>
+<P>
+<DL>
+<DT><U>Function:</U> static herr_t <B>close</B> <I>(H5FD_t *<VAR>file</VAR>)</I>
+<DD><A NAME="IDX2"></A>
+
+</P>
+<P>
+The <VAR>file</VAR> argument is the handle which was returned by the <CODE>open</CODE>
+function, and the <CODE>close</CODE> should free only memory associated with the
+driver-specific part of the handle (the public parts will have already been released by HDF5's virtual file layer).
+</DL>
+
+</P>
+<P>
+<STRONG>Example:</STRONG> The sec2 driver just closes the underlying Unix file,
+making sure that the actual file size is the same as that known to the
+library by writing a zero to the last file position it hasn't been
+written by some previous operation (which happens in the same code which
+flushes the file contents and is shown below).
+
+</P>
+
+<PRE>
+static herr_t
+H5FD_sec2_close(H5FD_t *_file)
+{
+    H5FD_sec2_t *file = (H5FD_sec2_t*)_file;
+
+    if (H5FD_sec2_flush(_file)&#60;0) return -1;
+    if (close(file-&#62;fd)&#60;0) return -1;
+    free(file);
+    return 0;
+}
+</PRE>
+
+
+
+<H3><A NAME="SEC12" HREF="#TOC12">File Keys</A></H3>
+
+<P>
+Occasionally an application will attempt to open a single file more than one
+time in order to obtain multiple handles to the file. HDF5 allows the files to
+share information<A NAME="DOCF6" HREF="#FOOT6">(6)</A> but in order to
+accomplish this HDF5 must be able to tell when two names refer to the same
+file. It does this by associating a driver-defined key with each file opened
+by a driver and comparing the key for an open request with the keys for all
+other files currently open by the same driver.
+
+</P>
+<P>
+<DL>
+<DT><U>Function:</U> const int <B>cmp</B> <I>(const H5FD_t *<VAR>f1</VAR>, const H5FD_t *<VAR>f2</VAR>)</I>
+<DD><A NAME="IDX3"></A>
+
+</P>
+<P>
+The driver may provide a function which compares two files <VAR>f1</VAR> and
+<VAR>f2</VAR> belonging to the same driver and returns a negative, positive, or
+zero value <I>a la</I> the <CODE>strcmp</CODE> function.<A NAME="DOCF7" HREF="#FOOT7">(7)</A> If this
+function is not provided then HDF5 assumes that all calls to the <CODE>open</CODE>
+callback return unique files regardless of the arguments and it is up to the
+application to avoid doing this if that assumption is incorrect.
+</DL>
+
+</P>
+<P>
+Each time a file is opened the library calls the <CODE>cmp</CODE> function to
+compare that file with all other files currently open by the same driver and
+if one of them matches (at most one can match) then the file which was just
+opened is closed and the previously opened file is used instead.
+
+</P>
+<P>
+Opening a file twice with incompatible flags will result in failure. For
+instance, opening a file with the truncate flag is a two step process which
+first opens the file without truncation so keys can be compared, and if no
+matching file is found already open then the file is closed and immediately
+reopened with the truncation flag set (if a matching file is already open then
+the truncating open will fail).
+
+</P>
+<P>
+<STRONG>Example:</STRONG> The sec2 driver uses the Unix device and i-node as the
+key. They were initialized when the file was opened.
+
+</P>
+
+<PRE>
+static int
+H5FD_sec2_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
+{
+    const H5FD_sec2_t   *f1 = (const H5FD_sec2_t*)_f1;
+    const H5FD_sec2_t   *f2 = (const H5FD_sec2_t*)_f2;
+
+    if (f1-&#62;device &#60; f2-&#62;device) return -1;
+    if (f1-&#62;device &#62; f2-&#62;device) return 1;
+
+    if (f1-&#62;inode &#60; f2-&#62;inode) return -1;
+    if (f1-&#62;inode &#62; f2-&#62;inode) return 1;
+
+    return 0;
+}
+</PRE>
+
+
+
+<H3><A NAME="SEC13" HREF="#TOC13">Saving Modes Across Opens</A></H3>
+
+<P>
+Some drivers may also need to store certain information in the file superblock
+in order to be able to reliably open the file at a later date. This is done by
+three functions: one to determine how much space will be necessary to store
+the information in the superblock, one to encode the information, and one to
+decode the information. These functions are optional, but if any one is
+defined then the other two must also be defined.
+
+</P>
+<P>
+<DL>
+<DT><U>Function:</U> static hsize_t <B>sb_size</B> <I>(H5FD_t *<VAR>file</VAR>)</I>
+<DD><A NAME="IDX4"></A>
+<DT><U>Function:</U> static herr_t <B>sb_encode</B> <I>(H5FD_t *<VAR>file</VAR>, char *<VAR>name</VAR>, unsigned char *<VAR>buf</VAR>)</I>
+<DD><A NAME="IDX5"></A>
+<DT><U>Function:</U> static herr_t <B>sb_decode</B> <I>(H5FD_t *<VAR>file</VAR>, const char *<VAR>name</VAR>, const unsigned char *<VAR>buf</VAR>)</I>
+<DD><A NAME="IDX6"></A>
+
+</P>
+<P>
+The <CODE>sb_size</CODE> function returns the number of bytes necessary to encode
+information needed later if the file is reopened. The <CODE>sb_encode</CODE>
+function encodes information from  the file into buffer <VAR>buf</VAR>
+allocated by the caller. It also writes an 8-character (plus null
+termination) into the <CODE>name</CODE> argument, which should be a unique
+identification for the driver. The <CODE>sb_decode</CODE> function looks at
+the <VAR>name</VAR>
+
+</P>
+<P>
+ decodes
+data from the buffer <VAR>buf</VAR> and updates the <VAR>file</VAR> argument with the new information,
+advancing <VAR>*p</VAR> in the process.
+</DL>
+
+</P>
+<P>
+The part of this which is somewhat tricky is that the file must be readable
+before the superblock information is decoded. File access modes fall outside
+the scope of the HDF5 file format, but they are placed inside the boot block
+for convenience.<A NAME="DOCF8" HREF="#FOOT8">(8)</A>
+
+</P>
+<P>
+<STRONG>Example:</STRONG> <EM>To be written later.</EM>
+
+</P>
+
+
+<H2><A NAME="SEC14" HREF="#TOC14">Address Space Functions</A></H2>
+
+<P>
+HDF5 does not assume that a file is a linear address space of bytes. Instead,
+the library will call functions to allocate and free portions of the HDF5
+format address space, which in turn map onto functions in the file driver to
+allocate and free portions of file address space. The library tells the file
+driver how much format address space it wants to allocate and the driver
+decides what format address to use and how that format address is mapped onto
+the file address space.  Usually the format address is chosen so that the file
+address can be calculated in constant time for data I/O operations (which are
+always specified by format addresses).
+
+</P>
+
+
+
+<H3><A NAME="SEC15" HREF="#TOC15">Userblock and Superblock</A></H3>
+
+<P>
+The HDF5 format allows an optional userblock to appear before the actual HDF5
+data in such a way that if the userblock is <STRONG>sucked out</STRONG> of the file and
+everything remaining is shifted downward in the file address space, then the
+file is still a valid HDF5 file.  The userblock size can be zero or any
+multiple of two greater than or equal to 512 and the file superblock begins
+immediately after the userblock.
+
+</P>
+<P>
+HDF5 allocates space for the userblock and superblock by calling an
+allocation function defined below, which must return a chunk of memory at
+format address zero on the first call.
+
+</P>
+
+
+<H3><A NAME="SEC16" HREF="#TOC16">Allocation of Format Regions</A></H3>
+
+<P>
+The library makes many types of allocation requests:
+
+</P>
+<DL COMPACT>
+
+<DT><CODE>H5FD_MEM_SUPER</CODE>
+<DD>
+An allocation request for the userblock and/or superblock.
+<DT><CODE>H5FD_MEM_BTREE</CODE>
+<DD>
+An allocation request for a node of a B-tree.
+<DT><CODE>H5FD_MEM_DRAW</CODE>
+<DD>
+An allocation request for the raw data of a dataset.
+<DT><CODE>H5FD_MEM_META</CODE>
+<DD>
+An allocation request for the raw data of a dataset which
+the user has indicated will be relatively small.
+<DT><CODE>H5FD_MEM_GROUP</CODE>
+<DD>
+An allocation request for a group leaf node (internal nodes of the group tree
+are allocated as H5MF_BTREE).
+<DT><CODE>H5FD_MEM_GHEAP</CODE>
+<DD>
+An allocation request for a global heap collection. Global heaps are used to
+store certain types of references such as dataset region references.  The set
+of all global heap collections can become quite large.
+<DT><CODE>H5FD_MEM_LHEAP</CODE>
+<DD>
+An allocation request for a local heap. Local heaps are used to store the
+names which are members of a group. The combined size of all local heaps is a
+function of the number of object names in the file.
+<DT><CODE>H5FD_MEM_OHDR</CODE>
+<DD>
+An allocation request for (part of) an object header. Object headers are
+relatively small and include meta information about objects (like the data
+space and type of a dataset) and attributes.
+</DL>
+
+<P>
+When a chunk of memory is freed the library adds it to a free list and
+allocation requests are satisfied from the free list before requesting memory
+from the file driver. Each type of allocation request enumerated above has its
+own free list, but the file driver can specify that certain object types can
+share a free list. It does so by providing an array which maps a request type
+to a free list. If any value of the map is <CODE>H5MF_DEFAULT</CODE> (zero) then the
+object's own free list is used. The special value <CODE>H5MF_NOLIST</CODE> indicates
+that the library should not attempt to maintain a free list for that
+particular object type, instead calling the file driver each time an object of
+that type is freed.
+
+</P>
+<P>
+Mappings predefined in the <TT>`H5FDpublic.h'</TT> file are:
+<DL COMPACT>
+
+<DT><CODE>H5FD_FLMAP_SINGLE</CODE>
+<DD>
+All memory usage types are mapped to a single free list.
+<DT><CODE>H5FD_FLMAP_DICHOTOMY</CODE>
+<DD>
+Memory usage is segregated into meta data and raw data for the purposes of
+memory management.
+<DT><CODE>H5FD_FLMAP_DEFAULT</CODE>
+<DD>
+Each memory usage type has its own free list.
+</DL>
+
+<P>
+<STRONG>Example:</STRONG> To make a map that manages object headers on one free list
+and everything else on another free list one might initialize the map with the
+following code: (the use of <CODE>H5FD_MEM_SUPER</CODE> is arbitrary)
+
+</P>
+
+<PRE>
+H5FD_mem_t mt, map[H5FD_MEM_NTYPES];
+
+for (mt=0; mt&#60;H5FD_MEM_NTYPES; mt++) {
+    map[mt] = (H5FD_MEM_OHDR==mt) ? mt : H5FD_MEM_SUPER;
+}
+</PRE>
+
+<P>
+If an allocation request cannot be satisfied from the free list then one of
+two things happen. If the driver defines an allocation callback then it is
+used to allocate space; otherwise new memory is allocated from the end of the
+format address space by incrementing the end-of-address marker.
+
+</P>
+<P>
+<DL>
+<DT><U>Function:</U> static haddr_t <B>alloc</B> <I>(H5FD_t *<VAR>file</VAR>, H5MF_type_t <VAR>type</VAR>, hsize_t <VAR>size</VAR>)</I>
+<DD><A NAME="IDX7"></A>
+
+</P>
+<P>
+The <VAR>file</VAR> argument is the file from which space is to be allocated,
+<VAR>type</VAR> is the type of memory being requested (from the list above) without
+being mapped according to the freelist map and <VAR>size</VAR> is the number of
+bytes being requested.  The library is allowed to allocate large chunks of
+storage and manage them in a layer above the file driver (although the current
+library doesn't do that).  The allocation function should return a format
+address for the first byte allocated.  The allocated region extends from that
+address for <VAR>size</VAR> bytes.  If the request cannot be honored then the
+undefined address value is returned (<CODE>HADDR_UNDEF</CODE>). The first call to
+this function for a file which has never had memory allocated <EM>must</EM>
+return a format address of zero or <CODE>HADDR_UNDEF</CODE> since this is how the
+library allocates space for the userblock and/or superblock.
+</DL>
+
+</P>
+
+<P>
+<STRONG>Example:</STRONG> <EM>To be written later.</EM>
+
+</P>
+
+
+<H3><A NAME="SEC17" HREF="#TOC17">Freeing Format Regions</A></H3>
+
+<P>
+When the library is finished using a certain region of the format address
+space it will return the space to the free list according to the type of
+memory being freed and the free list map described above. If the free list has
+been disabled for a particular memory usage type (according to the free list
+map) and the driver defines a <CODE>free</CODE> callback then it will be
+invoked. The <CODE>free</CODE> callback is also invoked for all entries on the free
+list when the file is closed.
+
+</P>
+<P>
+<DL>
+<DT><U>Function:</U> static herr_t <B>free</B> <I>(H5FD_t *<VAR>file</VAR>, H5MF_type_t <VAR>type</VAR>, haddr_t <VAR>addr</VAR>, hsize_t <VAR>size</VAR>)</I>
+<DD><A NAME="IDX8"></A>
+
+</P>
+<P>
+The <VAR>file</VAR> argument is the file for which space is being freed; <VAR>type</VAR>
+is the type of object being freed (from the list above) without being mapped
+according to the freelist map; <VAR>addr</VAR> is the first format address to free;
+and <VAR>size</VAR> is the size in bytes of the region being freed.  The region
+being freed may refer to just part of the region originally allocated and/or
+may cross allocation boundaries provided all regions being freed have the same
+usage type. However, the library will never attempt to free regions which have
+already been freed or which have never been allocated.
+</DL>
+
+</P>
+<P>
+A driver may choose to not define the <CODE>free</CODE> function, in which case
+format addresses will be leaked. This isn't normally a huge problem since the
+library contains a simple free list of its own and freeing parts of the format
+address space is not a common occurrence.
+
+</P>
+<P>
+<STRONG>Example:</STRONG> <EM>To be written later.</EM>
+
+</P>
+
+
+<H3><A NAME="SEC18" HREF="#TOC18">Querying Address Range</A></H3>
+
+<P>
+Each file driver must have some mechanism for setting and querying the end of
+address, or <STRONG>EOA</STRONG>, marker. The EOA marker is the first format address
+after the last format address ever allocated. If the last part of the
+allocated address range is freed then the driver may optionally decrease the
+eoa marker.
+
+</P>
+<P>
+<DL>
+<DT><U>Function:</U> static haddr_t <B>get_eoa</B> <I>(H5FD_t *<VAR>file</VAR>)</I>
+<DD><A NAME="IDX9"></A>
+
+</P>
+<P>
+This function returns the current value of the EOA marker for the specified
+file.
+</DL>
+
+</P>
+<P>
+<STRONG>Example:</STRONG> The sec2 driver just returns the current eoa marker value
+which is cached in the file structure:
+
+</P>
+
+<PRE>
+static haddr_t
+H5FD_sec2_get_eoa(H5FD_t *_file)
+{
+    H5FD_sec2_t *file = (H5FD_sec2_t*)_file;
+    return file-&#62;eoa;
+}
+</PRE>
+
+<P>
+The eoa marker is initially zero when a file is opened and the library may set
+it to some other value shortly after the file is opened (after the superblock
+is read and the saved eoa marker is determined) or when allocating additional
+memory in the absence of an <CODE>alloc</CODE> callback (described above).
+
+</P>
+<P>
+<STRONG>Example:</STRONG> The sec2 driver simply caches the eoa marker in the file
+structure and does not extend the underlying Unix file. When the file is
+flushed or closed then the Unix file size is extended to match the eoa marker.
+
+</P>
+
+<PRE>
+static herr_t
+H5FD_sec2_set_eoa(H5FD_t *_file, haddr_t addr)
+{
+    H5FD_sec2_t *file = (H5FD_sec2_t*)_file;
+    file-&#62;eoa = addr;
+    return 0;
+}
+</PRE>
+
+
+
+<H2><A NAME="SEC19" HREF="#TOC19">Data Functions</A></H2>
+
+<P>
+These functions operate on data, transferring a region of the format address
+space between memory and files.
+
+</P>
+
+
+
+<H3><A NAME="SEC20" HREF="#TOC20">Contiguous I/O Functions</A></H3>
+
+<P>
+A driver must specify two functions to transfer data from the library to the
+file and vice versa.
+
+</P>
+<P>
+<DL>
+<DT><U>Function:</U> static herr_t <B>read</B> <I>(H5FD_t *<VAR>file</VAR>, H5FD_mem_t <VAR>type</VAR>, hid_t <VAR>dxpl</VAR>, haddr_t <VAR>addr</VAR>, hsize_t <VAR>size</VAR>, void *<VAR>buf</VAR>)</I>
+<DD><A NAME="IDX10"></A>
+<DT><U>Function:</U> static herr_t <B>write</B> <I>(H5FD_t *<VAR>file</VAR>, H5FD_mem_t <VAR>type</VAR>, hid_t <VAR>dxpl</VAR>, haddr_t <VAR>addr</VAR>, hsize_t <VAR>size</VAR>, const void *<VAR>buf</VAR>)</I>
+<DD><A NAME="IDX11"></A>
+
+</P>
+<P>
+The <CODE>read</CODE> function reads data from file <VAR>file</VAR> beginning at address
+<VAR>addr</VAR> and continuing for <VAR>size</VAR> bytes into the buffer <VAR>buf</VAR>
+supplied by the caller. The <CODE>write</CODE> function transfers data in the
+opposite direction. Both functions take a data transfer property list
+<VAR>dxpl</VAR> which indicates the fine points of how the data is to be
+transferred and which comes directly from the <CODE>H5Dread</CODE> or
+<CODE>H5Dwrite</CODE> function.  Both functions receive <VAR>type</VAR> of
+data being written, which may allow a driver to tune it's behavior for
+different kinds of data.
+</DL>
+
+</P>
+<P>
+Both functions should return a negative value if they fail to transfer the
+requested data, or non-negative if they succeed.  The library will never
+attempt to read from unallocated regions of the format address space.
+
+</P>
+<P>
+<STRONG>Example:</STRONG> The sec2 driver just makes system calls. It tries not to
+call <CODE>lseek</CODE> if the current operation is the same as the previous
+operation and the file position is correct.  It also fills the output buffer
+with zeros when reading between the current EOF and EOA markers and restarts
+system calls which were interrupted.
+
+</P>
+
+<PRE>
+static herr_t
+H5FD_sec2_read(H5FD_t *_file, H5FD_mem_t type/*unused*/, hid_t dxpl_id/*unused*/,
+        haddr_t addr, hsize_t size, void *buf/*out*/)
+{
+    H5FD_sec2_t         *file = (H5FD_sec2_t*)_file;
+    ssize_t             nbytes;
+
+    assert(file &#38;&#38; file-&#62;pub.cls);
+    assert(buf);
+
+    /* Check for overflow conditions */
+    if (REGION_OVERFLOW(addr, size)) return -1;
+    if (addr+size&#62;file-&#62;eoa) return -1;
+
+    /* Seek to the correct location */
+    if ((addr!=file-&#62;pos || OP_READ!=file-&#62;op) &#38;&#38;
+        file_seek(file-&#62;fd, (file_offset_t)addr, SEEK_SET)&#60;0) {
+        file-&#62;pos = HADDR_UNDEF;
+        file-&#62;op = OP_UNKNOWN;
+        return -1;
+    }
+
+    /*
+     * Read data, being careful of interrupted system calls, partial results,
+     * and the end of the file.
+     */
+    while (size&#62;0) {
+        do nbytes = read(file-&#62;fd, buf, size);
+        while (-1==nbytes &#38;&#38; EINTR==errno);
+        if (-1==nbytes) {
+            /* error */
+            file-&#62;pos = HADDR_UNDEF;
+            file-&#62;op = OP_UNKNOWN;
+            return -1;
+        }
+        if (0==nbytes) {
+            /* end of file but not end of format address space */
+            memset(buf, 0, size);
+            size = 0;
+        }
+        assert(nbytes&#62;=0);
+        assert((hsize_t)nbytes&#60;=size);
+        size -= (hsize_t)nbytes;
+        addr += (haddr_t)nbytes;
+        buf = (char*)buf + nbytes;
+    }
+
+    /* Update current position */
+    file-&#62;pos = addr;
+    file-&#62;op = OP_READ;
+    return 0;
+}
+</PRE>
+
+<P>
+<STRONG>Example:</STRONG> The sec2 <CODE>write</CODE> callback is similar except it updates
+the file EOF marker when extending the file.
+
+</P>
+
+
+<H3><A NAME="SEC21" HREF="#TOC21">Flushing Cached Data</A></H3>
+
+<P>
+Some drivers may desire to cache data in memory in order to make larger I/O
+requests to the underlying file and thus improving bandwidth. Such drivers
+should register a cache flushing function so that the library can insure that
+data has been flushed out of the drivers in response to the application
+calling <CODE>H5Fflush</CODE>.
+
+</P>
+<P>
+<DL>
+<DT><U>Function:</U> static herr_t <B>flush</B> <I>(H5FD_t *<VAR>file</VAR>)</I>
+<DD><A NAME="IDX12"></A>
+
+</P>
+<P>
+Flush all data for file <VAR>file</VAR> to storage.
+</DL>
+
+</P>
+<P>
+<STRONG>Example:</STRONG> The sec2 driver doesn't cache any data but it also doesn't
+extend the Unix file as aggressively as it should. Therefore, when finalizing a
+file it should write a zero to the last byte of the allocated region so that
+when reopening the file later the EOF marker will be at least as large as the
+EOA marker saved in the superblock (otherwise HDF5 will refuse to open the
+file, claiming that the data appears to be truncated).
+
+</P>
+
+<PRE>
+static herr_t
+H5FD_sec2_flush(H5FD_t *_file)
+{
+    H5FD_sec2_t *file = (H5FD_sec2_t*)_file;
+
+    if (file-&#62;eoa&#62;file-&#62;eof) {
+        if (-1==file_seek(file-&#62;fd, file-&#62;eoa-1, SEEK_SET)) return -1;
+        if (write(file-&#62;fd, "", 1)!=1) return -1;
+        file-&#62;eof = file-&#62;eoa;
+        file-&#62;pos = file-&#62;eoa;
+        file-&#62;op = OP_WRITE;
+    }
+
+    return 0;
+}
+</PRE>
+
+
+
+<H2><A NAME="SEC22" HREF="#TOC22">Optimization Functions</A></H2>
+
+<P>
+The library is capable of performing several generic optimizations on I/O, but
+these types of optimizations may not be appropriate for a given VFL driver.
+</P>
+
+<P>
+Each driver may provide a query function to allow the library to query whether
+to enable these optimizations.  If a driver lacks a query function, the library
+will disable all types of optimizations which can be queried.
+</P>
+
+<P>
+<DL>
+<DT><U>Function:</U> static herr_t <B>query</B> <I>(const H5FD_t *<VAR>file</VAR>, unsigned long *<VAR>flags</VAR>)</I>
+<DD><A NAME="IDX17"></A>
+</P>
+<P>
+This function is called by the library to query which optimizations to enable
+for I/O to this driver.  These are the flags which are currently defined:
+
+<UL>
+<DL>
+<DT>H5FD_FEAT_AGGREGATE_METADATA    (0x00000001)
+<DD>Defining the H5FD_FEAT_AGGREGATE_METADATA for a VFL driver means that
+the library will attempt to allocate a larger block for metadata and
+then sub-allocate each metadata request from that larger block.
+<DT>H5FD_FEAT_ACCUMULATE_METADATA   (0x00000002)
+<DD>Defining the H5FD_FEAT_ACCUMULATE_METADATA for a VFL driver means that
+the library will attempt to cache metadata as it is written to the file
+and build up a larger block of metadata to eventually pass to the VFL
+'write' routine.
+<DT>H5FD_FEAT_DATA_SIEVE            (0x00000004)
+<DD>Defining the H5FD_FEAT_DATA_SIEVE for a VFL driver means that
+the library will attempt to cache raw data as it is read from/written to
+a file in a "data sieve" buffer.  See Rajeev Thakur's papers:
+    <UL>
+    <DL>
+    <DT>http://www.mcs.anl.gov/~thakur/papers/romio-coll.ps.gz
+    <DT>http://www.mcs.anl.gov/~thakur/papers/mpio-high-perf.ps.gz
+    </DL>
+    </UL>
+</DL>
+</UL>
+</P>
+
+</DL>
+</P>
+
+<H2><A NAME="SEC23" HREF="#TOC23">Registration of a Driver</A></H2>
+
+<P>
+Before a driver can be used the HDF5 library needs to be told of its
+existence.  This is done by registering the driver, which results in a driver
+identification number. Instead of passing many arguments to the registration
+function, the driver information is entered into a structure and the address
+of the structure is passed to the registration function where it is
+copied. This allows the HDF5 API to be extended while providing backward
+compatibility at the source level.
+
+</P>
+<P>
+<DL>
+<DT><U>Function:</U> hid_t <B>H5FDregister</B> <I>(H5FD_class_t *<VAR>cls</VAR>)</I>
+<DD><A NAME="IDX13"></A>
+
+</P>
+<P>
+The driver described by struct <VAR>cls</VAR> is registered with the library and an
+ID number for the driver is returned.
+</DL>
+
+</P>
+<P>
+The <CODE>H5FD_class_t</CODE> type is a struct with the following fields:
+
+</P>
+<DL COMPACT>
+
+<DT><CODE>const char *name</CODE>
+<DD>
+A pointer to a constant, null-terminated driver name to be used for debugging
+purposes.
+<DT><CODE>size_t fapl_size</CODE>
+<DD>
+The size in bytes of the file access mode structure or zero if the driver
+supplies a copy function or doesn't define the structure.
+<DT><CODE>void *(*fapl_copy)(const void *fapl)</CODE>
+<DD>
+An optional function which copies a driver-defined file access mode structure.
+This field takes precedence over <CODE>fm_size</CODE> when both are defined.
+<DT><CODE>void (*fapl_free)(void *fapl)</CODE>
+<DD>
+An optional function to free the driver-defined file access mode structure. If
+null, then the library calls the C <CODE>free</CODE> function to free the
+structure.
+<DT><CODE>size_t dxpl_size</CODE>
+<DD>
+The size in bytes of the data transfer mode structure or zero if the driver
+supplies a copy function or doesn't define the structure.
+<DT><CODE>void *(*dxpl_copy)(const void *dxpl)</CODE>
+<DD>
+An optional function which copies a driver-defined data transfer mode
+structure.  This field takes precedence over <CODE>xm_size</CODE> when both are
+defined.
+<DT><CODE>void (*dxpl_free)(void *dxpl)</CODE>
+<DD>
+An optional function to free the driver-defined data transfer mode
+structure. If null, then the library calls the C <CODE>free</CODE> function to
+free the structure.
+<DT><CODE>H5FD_t *(*open)(const char *name, unsigned flags, hid_t fapl, haddr_t maxaddr)</CODE>
+<DD>
+The function which opens or creates a new file.
+<DT><CODE>herr_t (*close)(H5FD_t *file)</CODE>
+<DD>
+The function which ends access to a file.
+<DT><CODE>int (*cmp)(const H5FD_t *f1, const H5FD_t *f2)</CODE>
+<DD>
+An optional function to determine whether two open files have the same key. If
+this function is not present then the library assumes that two files will
+never be the same.
+<DT><CODE>int (*query)(const H5FD_t *f, unsigned long *flags)</CODE>
+<DD>
+An optional function to determine which library optimizations a driver can
+support.
+<DT><CODE>haddr_t (*alloc)(H5FD_t *file, H5FD_mem_t type, hsize_t size)</CODE>
+<DD>
+An optional function to allocate space in the file.
+<DT><CODE>herr_t (*free)(H5FD_t *file, H5FD_mem_t type, haddr_t addr, hsize_t size)</CODE>
+<DD>
+An optional function to free space in the file.
+<DT><CODE>haddr_t (*get_eoa)(H5FD_t *file)</CODE>
+<DD>
+A function to query how much of the format address space has been allocated.
+<DT><CODE>herr_t (*set_eoa)(H5FD_t *file, haddr_t)</CODE>
+<DD>
+A function to set the end of address space.
+<DT><CODE>haddr_t (*get_eof)(H5FD_t *file)</CODE>
+<DD>
+A function to return the current end-of-file marker value.
+<DT><CODE>herr_t (*read)(H5FD_t *file, H5FD_mem_t type, hid_t dxpl, haddr_t addr, hsize_t size, void *buffer)</CODE>
+<DD>
+A function to read data from a file.
+<DT><CODE>herr_t (*write)(H5FD_t *file, H5FD_mem_t type, hid_t dxpl, haddr_t addr, hsize_t size, const void *buffer)</CODE>
+<DD>
+A function to write data to a file.
+<DT><CODE>herr_t (*flush)(H5FD_t *file)</CODE>
+<DD>
+A function which flushes cached data to the file.
+<DT><CODE>H5FD_mem_t fl_map[H5FD_MEM_NTYPES]</CODE>
+<DD>
+An array which maps a file allocation request type to a free list.
+</DL>
+
+<P>
+<STRONG>Example:</STRONG> The sec2 driver would be registered as:
+
+</P>
+
+<PRE>
+static const H5FD_class_t H5FD_sec2_g = {
+    "sec2",                                     /*name                  */
+    MAXADDR,                                    /*maxaddr               */
+    NULL,                                       /*sb_size               */
+    NULL,                                       /*sb_encode             */
+    NULL,                                       /*sb_decode             */
+    0,                                          /*fapl_size             */
+    NULL,                                       /*fapl_get              */
+    NULL,                                       /*fapl_copy             */
+    NULL,                                       /*fapl_free             */
+    0,                                          /*dxpl_size             */
+    NULL,                                       /*dxpl_copy             */
+    NULL,                                       /*dxpl_free             */
+    H5FD_sec2_open,                             /*open                  */
+    H5FD_sec2_close,                            /*close                 */
+    H5FD_sec2_cmp,                              /*cmp                   */
+    H5FD_sec2_query,                            /*query                 */
+    NULL,                                       /*alloc                 */
+    NULL,                                       /*free                  */
+    H5FD_sec2_get_eoa,                          /*get_eoa               */
+    H5FD_sec2_set_eoa,                          /*set_eoa               */
+    H5FD_sec2_get_eof,                          /*get_eof               */
+    H5FD_sec2_read,                             /*read                  */
+    H5FD_sec2_write,                            /*write                 */
+    H5FD_sec2_flush,                            /*flush                 */
+    H5FD_FLMAP_SINGLE,                          /*fl_map                */
+};
+
+hid_t
+H5FD_sec2_init(void)
+{
+    if (!H5FD_SEC2_g) {
+        H5FD_SEC2_g = H5FDregister(&#38;H5FD_sec2_g);
+    }
+    return H5FD_SEC2_g;
+}
+</PRE>
+
+<P>
+A driver can be removed from the library by unregistering it
+
+</P>
+<P>
+<DL>
+<DT><U>Function:</U> herr_t <B>H5Dunregister</B> <I>(hid_t <VAR>driver</VAR>)</I>
+<DD><A NAME="IDX14"></A>
+Where <VAR>driver</VAR> is the ID number returned when the driver was registered.
+</DL>
+
+</P>
+<P>
+Unregistering a driver makes it unusable for creating new file access or data
+transfer property lists but doesn't affect any property lists or files that
+already use that driver.
+
+</P>
+
+
+
+
+<H3><A NAME="SECProgNote" HREF="#TOCProgNote">Programming Note
+for C++ Developers Using C Functions</A></H3>
+
+<p>If a C routine that takes a function pointer as an argument is
+called from within C++ code, the C routine should be returned from
+normally. </p>
+
+<p>Examples of this kind of routine include callbacks such as
+<code>H5Pset_elink_cb</code> and <code>H5Pset_type_conv_cb</code>
+and functions such as <code>H5Tconvert</code> and
+<code>H5Ewalk2</code>.</p>
+
+<p>Exiting the routine in its normal fashion allows the HDF5 C
+Library to clean up its work properly. In other words, if the C++
+application jumps out of the routine back to the C++
+&ldquo;catch&rdquo; statement, the library is not given the
+opportunity to close any temporary data structures that were set
+up when the routine was called. The C++ application should save
+some state as the routine is started so that any problem that
+occurs might be diagnosed.</p>
+
+
+
+
+
+
+
+<H2><A NAME="SEC24" HREF="#TOC24">Querying Driver Information</A></H2>
+
+<P>
+<DL>
+<DT><U>Function:</U> void * <B>H5Pget_driver_data</B> <I>(hid_t <VAR>fapl</VAR>)</I>
+<DD><A NAME="IDX15"></A>
+<DT><U>Function:</U> void * <B>H5Pget_driver_data</B> <I>(hid_t <VAR>fxpl</VAR>)</I>
+<DD><A NAME="IDX16"></A>
+
+</P>
+<P>
+This function is intended to be used by driver functions, not applications.
+It returns a pointer directly into the file access property list
+<CODE><VAR>fapl</VAR></CODE> which is a copy of the driver's file access mode originally
+provided to the <CODE>H5Pset_driver</CODE> function. If its argument is a data
+transfer property list <CODE>fxpl</CODE> then it returns a pointer to the
+driver-specific data transfer information instead.
+</DL>
+
+</P>
+
+
+
+<H1><A NAME="SEC25" HREF="#TOC25">Miscellaneous</A></H1>
+
+<P>
+The various private <CODE>H5F_low_*</CODE> functions will be replaced by public
+<CODE>H5FD*</CODE> functions so they can be called from drivers.
+
+</P>
+<P>
+All private functions <CODE>H5F_addr_*</CODE> which operate on addresses will be
+renamed as public functions by removing the first underscore so they can be
+called by drivers.
+
+</P>
+<P>
+The <CODE>haddr_t</CODE> address data type will be passed by value throughout the
+library. The original intent was that this type would eventually be a union of
+file address types for the various drivers and may become quite large, but
+that was back when drivers were part of HDF5. It will become an alias for an
+unsigned integer type (32 or 64 bits depending on how the library was
+configured).
+
+</P>
+<P>
+The various <CODE>H5F*.c</CODE> driver files will be renamed <CODE>H5FD*.c</CODE> and each
+will have a corresponding header file. All driver functions except the
+initializer and API will be declared static.
+
+</P>
+<P>
+This documentation didn't cover optimization functions which would be useful
+to drivers like MPI-IO. Some drivers may be able to perform data pipeline
+operations more efficiently than HDF5 and need to be given a chance to
+override those parts of the pipeline. The pipeline would be designed to call
+various H5FD optimization functions at various points which return one of
+three values: the operation is not implemented by the driver, the operation is
+implemented but failed in a non-recoverable manner, the operation is
+implemented and succeeded.
+
+</P>
+<P>
+Various parts of HDF5 check the only the top-level file driver and do
+something special if it is the MPI-IO driver. However, we might want to be
+able to put the MPI-IO driver under other drivers such as the raw part of a
+split driver or under a debug driver whose sole purpose is to accumulate
+statistics as it passes all requests through to the MPI-IO driver. Therefore
+we will probably need a function which takes a format address and or object
+type and returns the driver which would have been used at the lowest level to
+process the request.
+
+</P>
+
+<P><HR><P>
+<H1>Footnotes</H1>
+<H3><A NAME="FOOT1" HREF="#DOCF1">(1)</A></H3>
+<P>The driver name is by convention and might
+not apply to drivers which are not distributed with HDF5.
+<H3><A NAME="FOOT2" HREF="#DOCF2">(2)</A></H3>
+<P>The access method also indicates how to translate
+the storage name to a storage server such as a file, network protocol, or
+memory.
+<H3><A NAME="FOOT3" HREF="#DOCF3">(3)</A></H3>
+<P>The term
+"<EM>file</EM> access property list" is a misnomer since storage isn't
+required to be a file.
+<H3><A NAME="FOOT4" HREF="#DOCF4">(4)</A></H3>
+<P>This
+function is overloaded to operate on data transfer property lists also, as
+described below.
+<H3><A NAME="FOOT5" HREF="#DOCF5">(5)</A></H3>
+<P>Read-only access is only appropriate when opening an existing
+file.
+<H3><A NAME="FOOT6" HREF="#DOCF6">(6)</A></H3>
+<P>For instance, writing data to one handle will cause
+the data to be immediately visible on the other handle.
+<H3><A NAME="FOOT7" HREF="#DOCF7">(7)</A></H3>
+<P>The ordering is
+arbitrary as long as it's consistent within a particular file driver.
+<H3><A NAME="FOOT8" HREF="#DOCF8">(8)</A></H3>
+<P>File access modes do not describe data, but rather
+describe how the HDF5 format address space is mapped to the underlying
+file(s). Thus, in general the mapping must be known before the file superblock
+can be read. However, the user usually knows enough about the mapping for the
+superblock to be readable and once the superblock is read the library can fill
+in the missing parts of the mapping.
+<P><HR><P>
+
+<?php include("../ed_libs/Footer2.htm"); ?>
+
+</BODY>
+</HTML>
diff --git a/doxygen/examples/hello_hdf5.c b/doxygen/examples/hello_hdf5.c
new file mode 100644
index 0000000..a37d39f
--- /dev/null
+++ b/doxygen/examples/hello_hdf5.c
@@ -0,0 +1,13 @@
+#include "hdf5.h"
+
+int
+main()
+{
+    herr_t   retval;
+    unsigned majnum, minnum, relnum;
+
+    if ((retval = H5get_libversion(&majnum, &minnum, &relnum)) >= 0) {
+        printf("Hello, HDF5 %d.%d.%d!\n", majnum, minnum, relnum);
+    }
+    return retval;
+}
diff --git a/doxygen/examples/menus/core_menu.md b/doxygen/examples/menus/core_menu.md
new file mode 100644
index 0000000..3fd7d11
--- /dev/null
+++ b/doxygen/examples/menus/core_menu.md
@@ -0,0 +1,69 @@
+<b>Core Library</b>
+
+- @ref H5A "Attributes (H5A)"
+<br />
+HDF5 attribute is a small metadata object describing the nature and/or intended usage of a primary data object.
+
+- @ref H5D "Datasets (H5D)"
+<br />
+Manage HDF5 datasets, including the transfer of data between memory and disk and the description of dataset properties.
+
+- @ref H5S "Dataspaces (H5S)"
+<br />
+HDF5 dataspaces describe the shape of datasets in memory or in HDF5 files.
+
+- @ref H5T "Datatypes (H5T)"
+<br />
+HDF5 datatypes describe the element type of HDF5 datasets and attributes.
+
+- @ref H5E "Error Handling (H5E)"
+<br />
+HDF5 library error reporting.
+
+- @ref H5ES "Event Set (H5ES)"
+<br />
+HDF5 event set life cycle used with HDF5 VOL connectors that enable the asynchronous feature in HDF5.
+
+- @ref H5F "Files (H5F)"
+<br />
+Manage HDF5 files.
+
+- @ref H5Z "Filters (H5Z)"
+<br />
+Manage HDF5 user-defined filters
+
+- @ref H5G "Groups (H5G)"
+<br />
+Manage HDF5 groups.
+
+- @ref H5I "Identifiers (H5I)"
+<br />
+Manage identifiers defined by the HDF5 library.
+
+- @ref H5 "Library General (H5)"
+<br />
+Manage the life cycle of HDF5 library instances.
+
+- @ref H5L "Links (H5L)"
+<br />
+Manage HDF5 links and link types.
+
+- @ref H5O "Objects (H5O)"
+<br />
+Manage HDF5 objects (groups, datasets, datatype objects).
+
+- @ref H5P "Property Lists (H5P)"
+<br />
+HDF5 property lists are the main vehicle to configure the behavior of HDF5 API functions.
+
+- @ref H5PL "Dynamically-loaded Plugins (H5PL)"
+<br />
+Manage the loading behavior of HDF5 plugins.
+
+- @ref H5R "References (H5R)"
+<br />
+Manage HDF5 references (HDF5 objects, attributes, and selections on datasets a.k.a. dataset regions).
+
+- @ref H5VL "VOL Connector (H5VL)"
+<br />
+Manage HDF5 VOL connector plugins.
diff --git a/doxygen/examples/menus/fortran_menu.md b/doxygen/examples/menus/fortran_menu.md
new file mode 100644
index 0000000..8ef4ead
--- /dev/null
+++ b/doxygen/examples/menus/fortran_menu.md
@@ -0,0 +1,73 @@
+<b>Fortran Library</b>
+
+- @ref FH5A "Attributes (H5A)"
+<br />
+HDF5 attribute is a small metadata object describing the nature and/or intended usage of a primary data object.
+
+- @ref FH5D "Datasets (H5D)"
+<br />
+Manage HDF5 datasets, including the transfer of data between memory and disk and the description of dataset properties.
+
+- @ref FH5S "Dataspaces (H5S)"
+<br />
+HDF5 dataspaces describe the shape of datasets in memory or in HDF5 files.
+
+- @ref FH5T "Datatypes (H5T)"
+<br />
+HDF5 datatypes describe the element type of HDF5 datasets and attributes.
+
+- @ref FH5E "Error Handling (H5E)"
+<br />
+HDF5 library error reporting.
+
+- @ref FH5F "Files (H5F)"
+<br />
+Manage HDF5 files.
+
+- @ref FH5Z "Filters (H5Z)"
+<br />
+Manage HDF5 user-defined filters
+
+- @ref FH5G "Groups (H5G)"
+<br />
+Manage HDF5 groups.
+
+- @ref FH5I "Identifiers (H5I)"
+<br />
+Manage identifiers defined by the HDF5 library.
+
+- @ref FH5 "Library General (H5)"
+<br />
+Manage the life cycle of HDF5 library instances.
+
+- @ref FH5L "Links (H5L)"
+<br />
+Manage HDF5 links and link types.
+
+- @ref FH5O "Objects (H5O)"
+<br />
+Manage HDF5 objects (groups, datasets, datatype objects).
+
+- @ref FH5P "Property Lists (H5P)"
+<br />
+HDF5 property lists are the main vehicle to configure the behavior of HDF5 API functions.
+
+- @ref FH5R "References (H5R)"
+<br />
+Manage HDF5 references (HDF5 objects, attributes, and selections on datasets a.k.a. dataset regions).
+
+- @ref FH5LT "High Level Lite (H5LT)"
+<br />
+Functions to simplify creating and manipulating datasets, attributes and other features
+
+- @ref FH5IM "High Level Image (H5IM)"
+<br />
+Creating and manipulating HDF5 datasets intended to be interpreted as images
+
+- @ref FH5TB "High Level Table (H5TB)"
+<br />
+Creating and manipulating HDF5 datasets intended to be interpreted as tables
+
+- @ref FH5DS "High Level Dimension Scale (H5DS)"
+<br />
+Creating and manipulating HDF5 datasets that are associated with the dimension of another HDF5 dataset
diff --git a/doxygen/examples/menus/high_level_menu.md b/doxygen/examples/menus/high_level_menu.md
new file mode 100644
index 0000000..d209bf4
--- /dev/null
+++ b/doxygen/examples/menus/high_level_menu.md
@@ -0,0 +1,30 @@
+<b>High-level library</b>
+<br />
+The high-level HDF5 library includes several sets of convenience and standard-use APIs to 
+facilitate common HDF5 operations.
+
+- @ref H5LT
+<br />
+Functions to simplify creating and manipulating datasets, attributes and other features
+
+- @ref H5IM
+<br />
+Creating and manipulating HDF5 datasets intended to be interpreted as images
+
+- @ref H5TB
+<br />
+Creating and manipulating HDF5 datasets intended to be interpreted as tables
+
+- @ref H5PT
+<br />
+Creating and manipulating HDF5 datasets to support append- and read-only operations on table data
+
+- @ref H5DS
+<br />
+Creating and manipulating HDF5 datasets that are associated with the dimension of another HDF5 dataset
+
+- @ref H5DO
+<br />
+Bypassing default HDF5 behavior in order to optimize for specific use cases
+
+- @ref H5LR "Extensions (H5LR, H5LT)"
diff --git a/doxygen/examples/menus/java_menu.md b/doxygen/examples/menus/java_menu.md
new file mode 100644
index 0000000..1236838
--- /dev/null
+++ b/doxygen/examples/menus/java_menu.md
@@ -0,0 +1,84 @@
+<b>Java Library</b>
+ @ref HDF5LIB
+ 
+- @ref JH5
+<br />
+This package is the Java interface for the HDF5 library.
+ 
+- @ref JH5A
+<br />
+This package is the Java interface for the HDF5 library attribute APIs.
+ 
+- @ref JH5D
+<br />
+This package is the Java interface for the HDF5 library dataset APIs.
+ 
+- @ref JH5S
+<br />
+This package is the Java interface for the HDF5 library dataspace APIs.
+ 
+- @ref JH5T
+<br />
+This package is the Java interface for the HDF5 library datatype APIs.
+ 
+- @ref JH5E
+<br />
+This package is the Java interface for the HDF5 library error APIs.
+ 
+- @ref JH5F
+<br />
+This package is the Java interface for the HDF5 library file APIs.
+ 
+- @ref JH5Z
+<br />
+This package is the Java interface for the HDF5 library filter APIs.
+ 
+- @ref JH5G
+<br />
+This package is the Java interface for the HDF5 library group APIs.
+ 
+- @ref JH5I
+<br />
+This package is the Java interface for the HDF5 library identifier APIs.
+ 
+- @ref JH5L
+<br />
+This package is the Java interface for the HDF5 library links APIs.
+ 
+- @ref JH5O
+<br />
+This package is the Java interface for the HDF5 library object APIs.
+ 
+- @ref JH5P
+<br />
+This package is the Java interface for the HDF5 library property list APIs.
+ 
+- @ref JH5PL
+<br />
+This package is the Java interface for the HDF5 library plugin APIs.
+ 
+- @ref JH5R
+<br />
+This package is the Java interface for the HDF5 library reference APIs.
+
+- @ref JH5VL
+<br />
+This package is the Java interface for the HDF5 library VOL connector APIs.
+
+- @ref HDF5CONST
+<br />
+This class contains C constants and enumerated types of HDF5 library.
+
+- @ref HDFNATIVE
+<br />
+This class encapsulates native methods to deal with arrays of numbers,
+ * converting from numbers to bytes and bytes to numbers.
+
+- @ref HDFARRAY
+<br />
+This is a class for handling multidimensional arrays for HDF.
+
+- @ref ERRORS
+<br />
+The class HDF5Exception returns errors from the Java HDF5 Interface.
+ 
+\ No newline at end of file
diff --git a/doxygen/examples/tables/fileDriverLists.dox b/doxygen/examples/tables/fileDriverLists.dox
new file mode 100644
index 0000000..1aae3ce
--- /dev/null
+++ b/doxygen/examples/tables/fileDriverLists.dox
@@ -0,0 +1,139 @@
+/** File Driver List
+ *
+//! [file_driver_table]
+<table>
+<caption>I/O file drivers</caption>
+<tr>
+<th>File Driver</th>
+<th>Description</th>
+</tr>
+<tr>
+<td>#H5FD_CORE</td>
+<td>Store in memory (optional backing store to disk file).</td>
+</tr>
+<tr>
+<td>#H5FD_FAMILY</td>
+<td>Store in a set of files.</td>
+</tr>
+<tr>
+<td>#H5FD_LOG</td>
+<td>Store in logging file.</td>
+</tr>
+<tr>
+<td>#H5FD_MPIO</td>
+<td>Store using MPI/IO.</td>
+</tr>
+<tr>
+<td>#H5FD_MULTI</td>
+<td>Store in multiple files. There are several options to control layout.</td>
+</tr>
+<tr>
+<td>#H5FD_SEC2</td>
+<td>Serial I/O to file using Unix “section 2” functions.</td>
+</tr>
+<tr>
+<td>#H5FD_STDIO</td>
+<td>Serial I/O to file using Unix “stdio” functions.</td>
+</tr>
+</table>
+//! [file_driver_table]
+ *
+ *
+//! [supported_file_driver_table]
+<table>
+<caption id="table_file_drivers">Supported file drivers</caption>
+<tr>
+<th>Driver Name</th>
+<th>Driver Identifier</th>
+<th>Description</th>
+<th>Related API</th>
+</tr>
+<tr>
+<td>POSIX</td>
+<td>#H5FD_SEC2</td>
+<td>This driver uses POSIX file-system functions like read and write to perform I/O to a single,
+permanent file on local disk with no system buffering. This driver is POSIX-compliant and is
+the default file driver for all systems.</td>
+<td>#H5Pset_fapl_sec2</td>
+</tr>
+<tr>
+<td>Direct</td>
+<td>#H5FD_DIRECT</td>
+<td>This is the #H5FD_SEC2 driver except data is written to or read from the file
+synchronously without being cached by the system.</td>
+<td>#H5Pset_fapl_direct</td>
+</tr>
+<tr>
+<td>Log</td>
+<td>#H5FD_LOG</td>
+<td>This is the #H5FD_SEC2 driver with logging capabilities.</td>
+<td>#H5Pset_fapl_log</td>
+</tr>
+<tr>
+<td>Windows</td>
+<td>#H5FD_WINDOWS</td>
+<td>This driver was modified in HDF5-1.8.8 to be a wrapper of the POSIX driver,
+#H5FD_SEC2. This change should not affect user applications.</td>
+<td>#H5Pset_fapl_windows</td>
+</tr>
+<tr>
+<td>STDIO</td>
+<td>#H5FD_STDIO</td>
+<td>This driver uses functions from the standard C stdio.h to perform I/O
+to a single, permanent file on local disk with additional system buffering.</td>
+<td>#H5Pset_fapl_stdio</td>
+</tr>
+<tr>
+<td>Memory</td>
+<td>#H5FD_CORE</td>
+<td>With this driver, an application can work with a file in memory for faster reads and
+writes. File contents are kept in memory until the file is closed. At closing, the memory
+version of the file can be written back to disk or abandoned.</td>
+<td>#H5Pset_fapl_core</td>
+</tr>
+<tr>
+<td>Family</td>
+<td>#H5FD_FAMILY</td>
+<td>With this driver, the HDF5 file’s address space is partitioned into pieces and sent to
+separate storage files using an underlying driver of the user’s choice. This driver is for
+systems that do not support files larger than 2 gigabytes.</td>
+<td>#H5Pset_fapl_family</td>
+</tr>
+<tr>
+<td>Multi</td>
+<td>#H5FD_MULTI</td>
+<td>With this driver, data can be stored in multiple files according to the type of the data.
+I/O might work better if data is stored in separate files based on the type of data. The Split
+driver is a special case of this driver.</td>
+<td>#H5Pset_fapl_multi</td>
+</tr>
+<tr>
+<td>Split</td>
+<td>H5FD_SPLIT</td>
+<td>This file driver splits a file into two parts. One part stores metadata, and the other part
+stores raw data. This splitting a file into two parts is a limited case of the Multi driver.</td>
+<td>#H5Pset_fapl_split</td>
+</tr>
+<tr>
+<td>Parallel</td>
+<td>#H5FD_MPIO</td>
+<td>This is the standard HDF5 file driver for parallel file systems. This driver uses the MPI
+standard for both communication and file I/O.</td>
+<td>#H5Pset_fapl_mpio</td>
+</tr>
+<tr>
+<td>Parallel POSIX</td>
+<td>H5FD_MPIPOSIX</td>
+<td>This driver is no longer available</td>
+<td></td>
+</tr>
+<tr>
+<td>Stream</td>
+<td>H5FD_STREAM</td>
+<td>This driver is no longer available.</td>
+<td></td>
+</tr>
+</table>
+//! [supported_file_driver_table]
+ *
+ */
diff --git a/doxygen/examples/tables/predefinedDatatypes.dox b/doxygen/examples/tables/predefinedDatatypes.dox
new file mode 100644
index 0000000..2427d0c
--- /dev/null
+++ b/doxygen/examples/tables/predefinedDatatypes.dox
@@ -0,0 +1,629 @@
+/** Predefined Datatypes List
+ *
+//! [predefined_ieee_datatypes_table]
+<table>
+<caption>Predefined IEEE Floating Point Datatypes</caption>
+<tr>
+<th>Datatype</th>
+<th>Description</th>
+</tr>
+<tr>
+<td>#H5T_IEEE_F32BE</td>
+<td>32-bit big-endian IEEE floating point</td>
+</tr>
+<tr>
+<td>#H5T_IEEE_F32LE</td>
+<td>32-bit little-endian IEEE floating point</td>
+</tr>
+<tr>
+<td>#H5T_IEEE_F64BE</td>
+<td>64-bit big-endian IEEE floating point</td>
+</tr>
+<tr>
+<td>#H5T_IEEE_F64LE</td>
+<td>64-bit little-endian IEEE floating point</td>
+</tr>
+</table>
+//! [predefined_ieee_datatypes_table]
+ *
+ *
+//! [predefined_std_datatypes_table]
+<table>
+<caption>Predefined Standard Datatypes</caption>
+<tr>
+<th>Datatype</th>
+<th>Description</th>
+</tr>
+<tr>
+<td>#H5T_STD_I8BE</td>
+<td>8-bit big-endian signed integer (2's complement)</td>
+</tr>
+<tr>
+<td>#H5T_STD_I8LE</td>
+<td>8-bit little-endian signed integer (2's complement)</td>
+</tr>
+<tr>
+<td>#H5T_STD_I16BE</td>
+<td>16-bit big-endian signed integer (2's complement)</td>
+</tr>
+<tr>
+<td>#H5T_STD_I16LE</td>
+<td>16-bit little-endian signed integer (2's complement)</td>
+</tr>
+<tr>
+<td>#H5T_STD_I32BE</td>
+<td>32-bit big-endian signed integer (2's complement)</td>
+</tr>
+<tr>
+<td>#H5T_STD_I32LE</td>
+<td>32-bit little-endian signed integer (2's complement)</td>
+</tr>
+<tr>
+<td>#H5T_STD_I64BE</td>
+<td>64-bit big-endian signed integer (2's complement)</td>
+</tr>
+<tr>
+<td>#H5T_STD_I64LE</td>
+<td>64-bit little-endian signed integer (2's complement)</td>
+</tr>
+<tr>
+<td>#H5T_STD_U8BE</td>
+<td>8-bit big-endian unsigned integer</td>
+</tr>
+<tr>
+<td>#H5T_STD_U8LE</td>
+<td>8-bit little-endian unsigned integer</td>
+</tr>
+<tr>
+<td>#H5T_STD_U16BE</td>
+<td>16-bit big-endian unsigned integer</td>
+</tr>
+<tr>
+<td>#H5T_STD_U16LE</td>
+<td>16-bit little-endian unsigned integer</td>
+</tr>
+<tr>
+<td>#H5T_STD_U32BE</td>
+<td>32-bit big-endian unsigned integer</td>
+</tr>
+<tr>
+<td>#H5T_STD_U32LE</td>
+<td>32-bit little-endian unsigned integer</td>
+</tr>
+<tr>
+<td>#H5T_STD_U64BE</td>
+<td>64-bit big-endian unsigned integer</td>
+</tr>
+<tr>
+<td>#H5T_STD_U64LE</td>
+<td>64-bit little-endian unsigned integer</td>
+</tr>
+<tr>
+<td>#H5T_STD_B8BE</td>
+<td>8-bit big-endian bitfield</td>
+</tr>
+<tr>
+<td>#H5T_STD_B8LE</td>
+<td>8-bit little-endian bitfield</td>
+</tr>
+<tr>
+<td>#H5T_STD_B16BE</td>
+<td>16-bit big-endian bitfield</td>
+</tr>
+<tr>
+<td>#H5T_STD_B16LE</td>
+<td>16-bit little-endian bitfield</td>
+</tr>
+<tr>
+<td>#H5T_STD_B32BE</td>
+<td>32-bit big-endian bitfield</td>
+</tr>
+<tr>
+<td>#H5T_STD_B32LE</td>
+<td>32-bit little-endian bitfield</td>
+</tr>
+<tr>
+<td>#H5T_STD_B64BE</td>
+<td>64-bit big-endian bitfield</td>
+</tr>
+<tr>
+<td>#H5T_STD_B64LE</td>
+<td>64-bit little-endian bitfield</td>
+</tr>
+<tr>
+<td>#H5T_STD_REF_OBJ</td>
+<td>Object reference</td>
+</tr>
+<tr>
+<td>#H5T_STD_REF_DSETREG</td>
+<td>Dataset region reference</td>
+</tr>
+<tr>
+<td>#H5T_STD_REF</td>
+<td>Generic reference</td>
+</tr>
+</table>
+//! [predefined_std_datatypes_table]
+ *
+ *
+//! [predefined_unix_datatypes_table]
+<table>
+<caption>Predefined UNIX-specific Datatypes</caption>
+<tr>
+<th>Datatype</th>
+<th>Description</th>
+</tr>
+<tr>
+<td>#H5T_UNIX_D32BE</td>
+<td>32-bit big-endian</td>
+</tr>
+<tr>
+<td>#H5T_UNIX_D32LE</td>
+<td>32-bit little-endian</td>
+</tr>
+<tr>
+<td>#H5T_UNIX_D64BE</td>
+<td>64-bit big-endian</td>
+</tr>
+<tr>
+<td>#H5T_UNIX_D64LE</td>
+<td>64-bit little-endian</td>
+</tr>
+</table>
+//! [predefined_unix_datatypes_table]
+ *
+ *
+//! [predefined_string_datatypes_table]
+<table>
+<caption>Predefined String Datatypes</caption>
+<tr>
+<th>Datatype</th>
+<th>Description</th>
+</tr>
+<tr>
+<td>#H5T_C_S1</td>
+<td>String datatype in C (size defined in bytes rather than in bits)</td>
+</tr>
+</tr>
+<tr>
+<td>#H5T_FORTRAN_S1</td>
+<td>String datatype in Fortran (as defined for the HDF5 C library)</td>
+</tr>
+</table>
+//! [predefined_string_datatypes_table]
+ *
+ *
+//! [predefined_intel_datatypes_table]
+<table>
+<caption>Predefined Intel-specific Datatypes</caption>
+<tr>
+<th>Datatype</th>
+<th>Description</th>
+</tr>
+<tr>
+<td>#H5T_INTEL_I8</td>
+<td>8-bit little-endian signed integer (2's complement)</td>
+</tr>
+<tr>
+<td>#H5T_INTEL_I16</td>
+<td>16-bit little-endian signed integer (2's complement)</td>
+</tr>
+<tr>
+<td>#H5T_INTEL_I32</td>
+<td>32-bit little-endian signed integer (2's complement)</td>
+</tr>
+<tr>
+<td>#H5T_INTEL_I64</td>
+<td>64-bit little-endian signed integer (2's complement)</td>
+</tr>
+<tr>
+<td>#H5T_INTEL_U8</td>
+<td>8-bit little-endian unsigned integer</td>
+</tr>
+<tr>
+<td>#H5T_INTEL_U16</td>
+<td>16-bit little-endian unsigned integer</td>
+</tr>
+<tr>
+<td>#H5T_INTEL_U32</td>
+<td>32-bit little-endian unsigned integer</td>
+</tr>
+<tr>
+<td>#H5T_INTEL_U64</td>
+<td>64-bit little-endian unsigned integer</td>
+</tr>
+<tr>
+<td>#H5T_INTEL_B8</td>
+<td>8-bit little-endian bitfield</td>
+</tr>
+<tr>
+<td>#H5T_INTEL_B16</td>
+<td>16-bit little-endian bitfield</td>
+</tr>
+<tr>
+<td>#H5T_INTEL_B32</td>
+<td>32-bit little-endian bitfield</td>
+</tr>
+<tr>
+<td>#H5T_INTEL_B64</td>
+<td>64-bit little-endian bitfield</td>
+</tr>
+<tr>
+<td>#H5T_INTEL_F32</td>
+<td>32-bit little-endian IEEE floating point</td>
+</tr>
+<tr>
+<td>#H5T_INTEL_F64</td>
+<td>64-bit little-endian IEEE floating point</td>
+</tr>
+</table>
+//! [predefined_intel_datatypes_table]
+ *
+ *
+//! [predefined_dec_datatypes_table]
+<table>
+<caption>Predefined DEC Alpha-specific Datatypes</caption>
+<tr>
+<th>Datatype</th>
+<th>Description</th>
+</tr>
+<tr>
+<td>#H5T_ALPHA_I8</td>
+<td>8-bit little-endian signed integer (2's complement)</td>
+</tr>
+<tr>
+<td>#H5T_ALPHA_I16</td>
+<td>16-bit little-endian signed integer (2's complement)</td>
+</tr>
+<tr>
+<td>#H5T_ALPHA_I32</td>
+<td>32-bit little-endian signed integer (2's complement)</td>
+</tr>
+<tr>
+<td>#H5T_ALPHA_I64</td>
+<td>64-bit little-endian signed integer (2's complement)</td>
+</tr>
+<tr>
+<td>#H5T_ALPHA_U8</td>
+<td>8-bit little-endian unsigned integer</td>
+</tr>
+<tr>
+<td>#H5T_ALPHA_U16</td>
+<td>16-bit little-endian unsigned integer</td>
+</tr>
+<tr>
+<td>#H5T_ALPHA_U32</td>
+<td>32-bit little-endian unsigned integer</td>
+</tr>
+<tr>
+<td>#H5T_ALPHA_U64</td>
+<td>64-bit little-endian unsigned integer</td>
+</tr>
+<tr>
+<td>#H5T_ALPHA_B8</td>
+<td>8-bit little-endian bitfield</td>
+</tr>
+<tr>
+<td>#H5T_ALPHA_B16</td>
+<td>16-bit little-endian bitfield</td>
+</tr>
+<tr>
+<td>#H5T_ALPHA_B32</td>
+<td>32-bit little-endian bitfield</td>
+</tr>
+<tr>
+<td>#H5T_ALPHA_B64</td>
+<td>64-bit little-endian bitfield</td>
+</tr>
+<tr>
+<td>#H5T_ALPHA_F32</td>
+<td>32-bit little-endian IEEE floating point</td>
+</tr>
+<tr>
+<td>#H5T_ALPHA_F64</td>
+<td>64-bit little-endian IEEE floating point</td>
+</tr>
+</table>
+//! [predefined_dec_datatypes_table]
+ *
+ *
+//! [predefined_openvms_datatypes_table]
+<table>
+<caption>Predefined OpenVMS DEC Alpha-specific Datatypes</caption>
+<tr>
+<th>Datatype</th>
+<th>Description</th>
+</tr>
+<tr>
+<td>#H5T_VAX_F32</td>
+<td>32-bit floating point (Corresponds to F_Floating type)</td>
+</tr>
+<tr>
+<td>#H5T_VAX_F64</td>
+<td>64-bit floating point (Corresponds to G_Floating type)</td>
+</tr>
+</table>
+//! [predefined_openvms_datatypes_table]
+ *
+ *
+//! [predefined_mips_datatypes_table]
+<table>
+<caption>Predefined MIPS-specific Datatypes</caption>
+<tr>
+<th>Datatype</th>
+<th>Description</th>
+</tr>
+<tr>
+<td>#H5T_MIPS_I8</td>
+<td>8-bit big-endian signed integer (2's complement)</td>
+</tr>
+<tr>
+<td>#H5T_MIPS_I16</td>
+<td>16-bit big-endian signed integer (2's complement)</td>
+</tr>
+<tr>
+<td>#H5T_MIPS_I32</td>
+<td>32-bit big-endian signed integer (2's complement)</td>
+</tr>
+<tr>
+<td>#H5T_MIPS_I64</td>
+<td>64-bit big-endian signed integer (2's complement)</td>
+</tr>
+<tr>
+<td>#H5T_MIPS_U8</td>
+<td>8-bit big-endian unsigned integer</td>
+</tr>
+<tr>
+<td>#H5T_MIPS_U16</td>
+<td>16-bit big-endian unsigned integer</td>
+</tr>
+<tr>
+<td>#H5T_MIPS_U32</td>
+<td>32-bit big-endian unsigned integer</td>
+</tr>
+<tr>
+<td>#H5T_MIPS_U64</td>
+<td>64-bit big-endian unsigned integer</td>
+</tr>
+<tr>
+<td>#H5T_MIPS_B8</td>
+<td>8-bit big-endian bitfield</td>
+</tr>
+<tr>
+<td>#H5T_MIPS_B16</td>
+<td>16-bit big-endian bitfield</td>
+</tr>
+<tr>
+<td>#H5T_MIPS_B32</td>
+<td>32-bit big-endian bitfield</td>
+</tr>
+<tr>
+<td>#H5T_MIPS_B64</td>
+<td>64-bit big-endian bitfield</td>
+</tr>
+<tr>
+<td>#H5T_MIPS_F32</td>
+<td>32-bit big-endian IEEE floating point</td>
+</tr>
+<tr>
+<td>#H5T_MIPS_F64</td>
+<td>64-bit big-endian IEEE floating point</td>
+</tr>
+</table>
+//! [predefined_mips_datatypes_table]
+ *
+ *
+//! [predefined_native_datatypes_table]
+<table>
+<caption>Predefined Native Datatypes</caption>
+<tr>
+<th>Datatype</th>
+<th>Description</th>
+</tr>
+<tr>
+<td>#H5T_NATIVE_CHAR</td>
+<td>C-style char</td>
+</tr>
+<tr>
+<td>#H5T_NATIVE_SCHAR</td>
+<td>C-style signed char</td>
+</tr>
+<tr>
+<td>#H5T_NATIVE_UCHAR</td>
+<td>C-style unsigned signed char</td>
+</tr>
+<tr>
+<td>#H5T_NATIVE_SHORT</td>
+<td>C-style short</td>
+</tr>
+<tr>
+<td>#H5T_NATIVE_USHORT</td>
+<td>C-style unsigned short</td>
+</tr>
+<tr>
+<td>#H5T_NATIVE_INT</td>
+<td>C-style int</td>
+</tr>
+<tr>
+<td>#H5T_NATIVE_UINT</td>
+<td>C-style unsigned int</td>
+</tr>
+<tr>
+<td>#H5T_NATIVE_LONG</td>
+<td>C-style long</td>
+</tr>
+<tr>
+<td>#H5T_NATIVE_ULONG</td>
+<td>C-style unsigned long</td>
+</tr>
+<tr>
+<td>#H5T_NATIVE_LLONG</td>
+<td>C-style long long</td>
+</tr>
+<tr>
+<td>#H5T_NATIVE_ULLONG</td>
+<td>C-style unsigned long long</td>
+</tr>
+<tr>
+<td>#H5T_NATIVE_FLOAT</td>
+<td>C-style float</td>
+</tr>
+<tr>
+<td>#H5T_NATIVE_DOUBLE</td>
+<td>C-style double</td>
+</tr>
+<tr>
+<td>#H5T_NATIVE_LDOUBLE</td>
+<td>C-style long double</td>
+</tr>
+<tr>
+<td>#H5T_NATIVE_B8</td>
+<td>8-bit bitfield based on native types</td>
+</tr>
+<tr>
+<td>#H5T_NATIVE_B16</td>
+<td>16-bit bitfield based on native types</td>
+</tr>
+<tr>
+<td>#H5T_NATIVE_B32</td>
+<td>32-bit bitfield based on native types</td>
+</tr>
+<tr>
+<td>#H5T_NATIVE_B64</td>
+<td>64-bit bitfield based on native types</td>
+</tr>
+<tr>
+<td>#H5T_NATIVE_OPAQUE</td>
+<td>opaque unit based on native types</td>
+</tr>
+<tr>
+<td>#H5T_NATIVE_HADDR</td>
+<td>address type based on native types</td>
+</tr>
+<tr>
+<td>#H5T_NATIVE_HSIZE</td>
+<td>size type based on native types</td>
+</tr>
+<tr>
+<td>#H5T_NATIVE_HSSIZE</td>
+<td>signed size type based on native types</td>
+</tr>
+<tr>
+<td>#H5T_NATIVE_HERR</td>
+<td>error code type based on native types</td>
+</tr>
+<tr>
+<td>#H5T_NATIVE_HBOOL</td>
+<td>Boolean type based on native types</td>
+</tr>
+</table>
+//! [predefined_native_datatypes_table]
+ *
+ *
+//! [predefined_c9x_datatypes_table]
+<table>
+<caption>Predefined ANSI C9x-specific Native Integer Datatypes</caption>
+<tr>
+<th>Datatype</th>
+<th>Description</th>
+</tr>
+<tr>
+<td>#H5T_NATIVE_INT8</td>
+<td>8-bit signed integer (2's complement)</td>
+</tr>
+<tr>
+<td>#H5T_NATIVE_UINT8</td>
+<td>8-bit unsigned integer</td>
+</tr>
+<tr>
+<td>#H5T_NATIVE_INT_LEAST8</td>
+<td>8-bit signed integer (2's complement) with storage to use least amount of space</td>
+</tr>
+<tr>
+<td>#H5T_NATIVE_UINT_LEAST8</td>
+<td>8-bit unsigned integer with storage to use least amount of space</td>
+</tr>
+<tr>
+<td>#H5T_NATIVE_INT_FAST8</td>
+<td>8-bit signed integer (2's complement) with storage to maximize performance</td>
+</tr>
+<tr>
+<td>#H5T_NATIVE_UINT_FAST8</td>
+<td>8-bit unsigned integer with storage to maximize performance</td>
+</tr>
+<tr>
+<td>#H5T_NATIVE_INT16</td>
+<td>16-bit signed integer (2's complement)</td>
+</tr>
+<tr>
+<td>#H5T_NATIVE_UINT16</td>
+<td>16-bit unsigned integer</td>
+</tr>
+<tr>
+<td>#H5T_NATIVE_INT_LEAST16</td>
+<td>16-bit signed integer (2's complement) with storage to use least amount of space</td>
+</tr>
+<tr>
+<td>#H5T_NATIVE_UINT_LEAST16</td>
+<td>16-bit unsigned integer with storage to use least amount of space</td>
+</tr>
+<tr>
+<td>#H5T_NATIVE_INT_FAST16</td>
+<td>16-bit signed integer (2's complement) with storage to maximize performance</td>
+</tr>
+<tr>
+<td>#H5T_NATIVE_UINT_FAST16</td>
+<td>16-bit unsigned integer with storage to maximize performance</td>
+</tr>
+<tr>
+<td>#H5T_NATIVE_INT32</td>
+<td>32-bit signed integer (2's complement)</td>
+</tr>
+<tr>
+<td>#H5T_NATIVE_UINT32</td>
+<td>32-bit unsigned integer</td>
+</tr>
+<tr>
+<td>#H5T_NATIVE_INT_LEAST32</td>
+<td>32-bit signed integer (2's complement) with storage to use least amount of space</td>
+</tr>
+<tr>
+<td>#H5T_NATIVE_UINT_LEAST32</td>
+<td>32-bit unsigned integer with storage to use least amount of space</td>
+</tr>
+<tr>
+<td>#H5T_NATIVE_INT_FAST32</td>
+<td>32-bit signed integer (2's complement) with storage to maximize performance</td>
+</tr>
+<tr>
+<td>#H5T_NATIVE_UINT_FAST32</td>
+<td>32-bit unsigned integer with storage to maximize performance</td>
+</tr>
+<tr>
+<td>#H5T_NATIVE_INT64</td>
+<td>64-bit signed integer (2's complement)</td>
+</tr>
+<tr>
+<td>#H5T_NATIVE_UINT64</td>
+<td>64-bit unsigned integer</td>
+</tr>
+<tr>
+<td>#H5T_NATIVE_INT_LEAST64</td>
+<td>64-bit signed integer (2's complement) with storage to use least amount of space</td>
+</tr>
+<tr>
+<td>#H5T_NATIVE_UINT_LEAST64</td>
+<td>64-bit unsigned integer with storage to use least amount of space</td>
+</tr>
+<tr>
+<td>#H5T_NATIVE_INT_FAST64</td>
+<td>64-bit signed integer (2's complement) with storage to maximize performance</td>
+</tr>
+<tr>
+<td>#H5T_NATIVE_UINT_FAST64</td>
+<td>64-bit unsigned integer with storage to maximize performance</td>
+</tr>
+</table>
+//! [predefined_c9x_datatypes_table]
+ *
+ */
diff --git a/doxygen/examples/tables/propertyLists.dox b/doxygen/examples/tables/propertyLists.dox
new file mode 100644
index 0000000..498a820
--- /dev/null
+++ b/doxygen/examples/tables/propertyLists.dox
@@ -0,0 +1,810 @@
+/** Property List Tables
+ *
+//! [plcr_table]
+<table>
+<caption id="table_plcr_id" border="1" style="background-color:whitesmoke;">Property list class root functions (H5P)</caption>
+<tr>
+<th>Function</th>
+<th>Purpose</th>
+</tr>
+<tr>
+<td>#H5Pclose</td>
+<td>Terminates access to a property list.</td>
+</tr>
+<tr>
+<td>#H5Pcopy</td>
+<td>Copies an existing property list to create a new property list.</td>
+</tr>
+<tr>
+<td>#H5Pcreate</td>
+<td>Creates a new property list as an instance of a property list class.</td>
+</tr>
+<tr>
+<td>#H5Pencode/#H5Pdecode</td>
+<td>Encodes/ecodes property list into/from a binary object buffer.</td>
+</tr>
+<tr>
+<td>#H5Pget_class</td>
+<td>Returns the property list class identifier for a property list</td>
+</tr>
+</table>
+//! [plcr_table]
+ *
+//! [plcra_table]
+<table>
+<caption id="table_plcra_id" border="1" style="background-color:whitesmoke;">Property list class root (Advanced) functions (H5P)</caption>
+<tr>
+<th>Function</th>
+<th>Purpose</th>
+</tr>
+<tr>
+<td>#H5Pclose_class</td>
+<td>Closes an existing property list class.</td>
+</tr>
+<tr>
+<td>#H5Pcopy_prop</td>
+<td>Copies a property from one list or class to another.</td>
+</tr>
+<tr>
+<td>#H5Pcreate_class</td>
+<td>Creates a new property list class.</td>
+</tr>
+<tr>
+<td>#H5Pequal</td>
+<td>Compares two property lists or classes for equality.</td>
+</tr>
+<tr>
+<td>#H5Pexist</td>
+<td>Queries whether a property name exists in a property list or class.</td>
+</tr>
+<tr>
+<td>#H5Pget_class_name</td>
+<td>Retrieves the name of a class.</td>
+</tr>
+<tr>
+<td>#H5Pget_class_parent</td>
+<td>Retrieves the parent class of a property class.</td>
+</tr>
+<tr>
+<td>#H5Pget_nprops</td>
+<td>Queries the number of properties in a property list or class.</td>
+</tr>
+<tr>
+<td>#H5Pget_size</td>
+<td>Queries the size of a property value in bytes.</td>
+</tr>
+<tr>
+<td>#H5Pinsert</td>
+<td>Registers a temporary property with a property list.</td>
+</tr>
+<tr>
+<td>#H5Pisa_class</td>
+<td>Determines whether a property list is a member of a class.</td>
+</tr>
+<tr>
+<td>#H5Piterate</td>
+<td>Iterates over properties in a property class or list</td>
+</tr>
+<tr>
+<td>#H5Pregister/H5Punregister</td>
+<td>Registers/removes a permanent property with/from a property list class</td>
+</tr>
+<tr>
+<td>#H5Premove</td>
+<td>Removes a property from a property list.</td>
+</tr>
+<tr>
+<td>#H5Pset/#H5Pget</td>
+<td>Sets/queries a property list value</td>
+</tr>
+</table>
+//! [plcra_table]
+ *
+//! [fcpl_table]
+<table>
+<caption id="table_fcpl_id" border="1" style="background-color:whitesmoke;">File creation property list functions (H5P)</caption>
+<tr>
+<th>Function</th>
+<th>Purpose</th>
+</tr>
+<tr>
+<td>#H5Pset_userblock/#H5Pget_userblock</td>
+<td>Sets/retrieves size of userblock.</td>
+</tr>
+<tr>
+<td>#H5Pset_sizes/#H5Pget_sizes</td>
+<td>Sets/retrieves byte size of offsets and lengths used to address objects in HDF5 file.</td>
+</tr>
+<tr>
+<td>#H5Pset_sym_k/#H5Pget_sym_k</td>
+<td>Sets/retrieves size of parameters used to control symbol table nodes.</td>
+</tr>
+<tr>
+<td>#H5Pset_istore_k/#H5Pget_istore_k</td>
+<td>Sets/retrieves size of parameter used to control B-trees for indexing chunked datasets.</td>
+</tr>
+<tr>
+<td>#H5Pset_file_image</td>
+<td>Sets an initial file image in a memory buffer.</td>
+</tr>
+<tr>
+<td>#H5Pget_file_image</td>
+<td>Retrieves a copy of the file image designated as the initial content and structure of a file.</td>
+</tr>
+<tr>
+<td>#H5Pset_file_space_page_size/#H5Pget_file_space_page_size</td>
+<td>Sets or retrieves the file space page size used in paged aggregation and paged buffering.</td>
+</tr>
+<tr>
+<td>#H5Pset_file_space_strategy/#H5Pget_file_space_strategy</td>
+<td>Sets or retrieves the file space handling strategy, the persisting free-space and the free-space section size.</td>
+</tr>
+<tr>
+<td>#H5Pset_shared_mesg_nindexes/#H5Pget_shared_mesg_nindexes</td>
+<td>Sets or retrieves number of shared object header message indexes in file
+creation property list.</td>
+</tr>
+<tr>
+<td>#H5Pset_shared_mesg_index</td>
+<td>Configures the specified shared object header message index.</td>
+</tr>
+<tr>
+<td>#H5Pget_shared_mesg_index</td>
+<td>Retrieves the configuration settings for a shared message index.</td>
+</tr>
+<tr>
+<td>#H5Pset_shared_mesg_phase_change/#H5Pget_shared_mesg_phase_change</td>
+<td>Sets or retrieves shared object header message storage phase change thresholds.</td>
+</tr>
+<tr>
+<td>#H5Pget_version</td>
+<td></td>
+</tr>
+</table>
+//! [fcpl_table]
+ *
+//! [fapl_table]
+<table>
+<caption id="table_fapl_id" border="1" style="background-color:whitesmoke;">File access property list functions (H5P)</caption>
+<tr>
+<th>Function</th>
+<th>Purpose</th>
+</tr>
+<tr>
+<td>#H5Pset_alignment/#H5Pget_alignment</td>
+<td>Sets/retrieves alignment properties.</td>
+</tr>
+<tr>
+<td>#H5Pset_cache/#H5Pget_cache</td>
+<td>Sets/retrieves metadata cache and raw data chunk cache parameters.</td>
+</tr>
+<tr>
+<td>#H5Pset_elink_file_cache_size/#H5Pget_elink_file_cache_size</td>
+<td>Sets/retrieves the size of the external link open file cache from the specified
+file access property list.</td>
+</tr>
+<tr>
+<td>#H5Pset_gc_references/#H5Pget_gc_references</td>
+<td>Sets/retrieves garbage collecting references flag.</td>
+</tr>
+<tr>
+<td>#H5Pset_family_offset</td>
+<td>Sets offset property for low-level access to a file in a family of files.</td>
+</tr>
+<tr>
+<td>#H5Pget_family_offset</td>
+<td>Retrieves a data offset from the file access property list.</td>
+</tr>
+<tr>
+<td>#H5Pset_meta_block_size/#H5Pget_meta_block_size</td>
+<td>Sets the minimum metadata blocksize or retrieves the current metadata block size setting.</td>
+</tr>
+<tr>
+<td>#H5Pset_mdc_config</td>
+<td>Set the initial metadata cache configuration in the indicated File Access Property List
+to the supplied value.</td>
+</tr>
+<tr>
+<td>#H5Pget_mdc_config</td>
+<td>Get the current initial metadata cache config-uration from the indicated File Access
+Property List.</td>
+</tr>
+<tr>
+<td>#H5Pset_sieve_buf_size/#H5Pget_sieve_buf_size</td>
+<td>Sets/retrieves maximum size of data sieve buffer.</td>
+</tr>
+<tr>
+<td>#H5Pset_libver_bounds</td>
+<td>Sets bounds on library versions, and indirectly format versions, to be used
+when creating objects.</td>
+</tr>
+<tr>
+<td>#H5Pget_libver_bounds</td>
+<td>Retrieves library version bounds settings that indirectly control the format
+versions used when creating objects.</td>
+</tr>
+<tr>
+<td>#H5Pset_small_data_block_size</td>
+<td>Sets the size of a contiguous block reserved for small data.</td>
+</tr>
+<tr>
+<td>#H5Pget_small_data_block_size</td>
+<td>Retrieves the current small data block size setting.</td>
+</tr>
+</table>
+//! [fapl_table]
+ *
+//! [fd_pl_table]
+<table>
+<caption id="table_fd_pl_id" border="1" style="background-color:whitesmoke;">File driver property list functions (H5P)</caption>
+<tr>
+<th>Function</th>
+<th>Purpose</th>
+</tr>
+<tr>
+<td>#H5Pset_driver</td>
+<td>Sets a file driver.</td>
+</tr>
+<tr>
+<td>#H5Pget_driver</td>
+<td>Returns the identifier for the driver used to create a file.</td>
+</tr>
+<tr>
+<td>#H5Pget_driver_info</td>
+<td>Returns a pointer to file driver information.</td>
+</tr>
+<tr>
+<td>#H5Pset_fapl_core/#H5Pget_fapl_core</td>
+<td>Sets the driver for buffered memory files (in RAM) or retrieves information regarding
+the driver.</td>
+</tr>
+<tr>
+<td>#H5Pset_fapl_direct/#H5Pget_fapl_direct</td>
+<td>Sets up use of the direct I/O driver or retrieves the direct I/O driver settings.</td>
+</tr>
+<tr>
+<td>#H5Pset_fapl_family/#H5Pget_fapl_family</td>
+<td>Sets driver for file families, designed for systems that do not support files
+larger than 2 gigabytes, or retrieves information regarding driver.</td>
+</tr>
+<tr>
+<td>#H5Pset_fapl_log</td>
+<td>Sets logging driver.</td>
+</tr>
+<tr>
+<td>#H5Pset_fapl_mpio/#H5Pget_fapl_mpio</td>
+<td>Sets driver for files on parallel file systems (MPI I/O) or retrieves information
+regarding the driver.</td>
+</tr>
+<tr>
+<td>H5Pset_fapl_mpiposix/H5Pget_fapl_mpiposix</td>
+<td>No longer available.</td>
+</tr>
+<tr>
+<td>#H5Pset_fapl_multi/#H5Pget_fapl_multi</td>
+<td>Sets driver for multiple files, separating categories of metadata and raw data,
+or retrieves information regarding driver.</td>
+</tr>
+<tr>
+<td>#H5Pset_fapl_sec2</td>
+<td>Sets driver for unbuffered permanent files or retrieves information regarding driver.</td>
+</tr>
+<tr>
+<td>#H5Pset_fapl_split</td>
+<td>Sets driver for split files, a limited case of multiple files with one metadata file
+and one raw data file.</td>
+</tr>
+<tr>
+<td>#H5Pset_fapl_stdio</td>
+<td>Sets driver for buffered permanent files.</td>
+</tr>
+<tr>
+<td>#H5Pset_fapl_windows</td>
+<td>Sets the Windows I/O driver.</td>
+</tr>
+<tr>
+<td>#H5Pset_multi_type</td>
+<td>Specifies type of data to be accessed via the MULTI driver enabling more direct access.</td>
+</tr>
+<tr>
+<td>#H5Pget_multi_type</td>
+<td>Retrieves type of data property for MULTI driver.</td>
+</tr>
+</table>
+//! [fd_pl_table]
+ *
+//! [dcpl_table]
+<table>
+<caption id="table_dcpl_id" border="1" style="background-color:whitesmoke;">Dataset creation property list functions (H5P)</caption>
+<tr>
+<th>Function</th>
+<th>Purpose</th>
+</tr>
+<tr>
+<td>#H5Pset_layout</td>
+<td>Sets the type of storage used to store the raw data for a dataset.</td>
+</tr>
+<tr>
+<td>#H5Pget_layout</td>
+<td>Returns the layout of the raw data for a dataset.</td>
+</tr>
+<tr>
+<td>#H5Pset_chunk</td>
+<td>Sets the size of the chunks used to store a chunked layout dataset.</td>
+</tr>
+<tr>
+<td>#H5Pget_chunk</td>
+<td>Retrieves the size of chunks for the raw data of a chunked layout dataset.</td>
+</tr>
+<tr>
+<td>#H5Pset_deflate</td>
+<td>Sets compression method and compression level.</td>
+</tr>
+<tr>
+<td>#H5Pset_fill_value</td>
+<td>Sets the fill value for a dataset.</td>
+</tr>
+<tr>
+<td>#H5Pget_fill_value</td>
+<td>Retrieves a dataset fill value.</td>
+</tr>
+<tr>
+<td>#H5Pfill_value_defined</td>
+<td>Determines whether the fill value is defined.</td>
+</tr>
+<tr>
+<td>#H5Pset_fill_time</td>
+<td>Sets the time when fill values are written to a dataset.</td>
+</tr>
+<tr>
+<td>#H5Pget_fill_time</td>
+<td>Retrieves the time when fill value are written to a dataset.</td>
+</tr>
+<tr>
+<td>#H5Pset_alloc_time</td>
+<td>Sets the timing for storage space allocation.</td>
+</tr>
+<tr>
+<td>#H5Pget_alloc_time</td>
+<td>Retrieves the timing for storage space allocation.</td>
+</tr>
+<tr>
+<td>#H5Pset_filter</td>
+<td>Adds a filter to the filter pipeline.</td>
+</tr>
+<tr>
+<td>#H5Pall_filters_avail</td>
+<td>Verifies that all required filters are available.</td>
+</tr>
+<tr>
+<td>#H5Pget_nfilters</td>
+<td>Returns the number of filters in the pipeline.</td>
+</tr>
+<tr>
+<td>#H5Pget_filter</td>
+<td>Returns information about a filter in a pipeline.
+The C function is a macro: \see \ref api-compat-macros.</td>
+</tr>
+<tr>
+<td>#H5Pget_filter_by_id</td>
+<td>Returns information about the specified filter.
+The C function is a macro: \see \ref api-compat-macros.</td>
+</tr>
+<tr>
+<td>#H5Pmodify_filter</td>
+<td>Modifies a filter in the filter pipeline.</td>
+</tr>
+<tr>
+<td>#H5Premove_filter</td>
+<td>Deletes one or more filters in the filter pipeline.</td>
+</tr>
+<tr>
+<td>#H5Pset_fletcher32</td>
+<td>Sets up use of the Fletcher32 checksum filter.</td>
+</tr>
+<tr>
+<td>#H5Pset_nbit</td>
+<td>Sets up use of the n-bit filter.</td>
+</tr>
+<tr>
+<td>#H5Pset_scaleoffset</td>
+<td>Sets up use of the scale-offset filter.</td>
+</tr>
+<tr>
+<td>#H5Pset_shuffle</td>
+<td>Sets up use of the shuffle filter.</td>
+</tr>
+<tr>
+<td>#H5Pset_szip</td>
+<td>Sets up use of the Szip compression filter.</td>
+</tr>
+<tr>
+<td>#H5Pset_external</td>
+<td>Adds an external file to the list of external files.</td>
+</tr>
+<tr>
+<td>#H5Pget_external_count</td>
+<td>Returns the number of external files for a dataset.</td>
+</tr>
+<tr>
+<td>#H5Pget_external</td>
+<td>Returns information about an external file.</td>
+</tr>
+<tr>
+<td>#H5Pset_char_encoding</td>
+<td>Sets the character encoding used to encode a string. Use to set ASCII or UTF-8 character
+encoding for object names.</td>
+</tr>
+<tr>
+<td>#H5Pget_char_encoding</td>
+<td>Retrieves the character encoding used to create a string.</td>
+</tr>
+</table>
+//! [dcpl_table]
+ *
+//! [dapl_table]
+<table>
+<caption id="table_dapl_id" border="1" style="background-color:whitesmoke;">Dataset access property list functions (H5P)</caption>
+<tr>
+<th>Function</th>
+<th>Purpose</th>
+</tr>
+<tr>
+<td>#H5Pset_buffer</td>
+<td>Sets type conversion and background buffers.</td>
+</tr>
+<tr>
+<td>#H5Pget_buffer</td>
+<td>Reads buffer settings.</td>
+</tr>
+<tr>
+<td>#H5Pset_chunk_cache/#H5Pget_chunk_cache</td>
+<td>Sets/gets the raw data chunk cache parameters.</td>
+</tr>
+<tr>
+<td>#H5Pset_edc_check/#H5Pget_edc_check</td>
+<td>Sets/gets whether to enable error-detection when reading a dataset.</td>
+</tr>
+<tr>
+<td>#H5Pset_filter_callback</td>
+<td>Sets user-defined filter callback function.</td>
+</tr>
+<tr>
+<td>#H5Pset_data_transform/#H5Pget_data_transform</td>
+<td>Sets/gets a data transform expression.</td>
+</tr>
+<tr>
+<td>#H5Pset_type_conv_cb/#H5Pget_type_conv_cb</td>
+<td>Sets/gets user-defined datatype conversion callback function.</td>
+</tr>
+<tr>
+<td>#H5Pset_hyper_vector_size/#H5Pget_hyper_vector_size</td>
+<td>Sets/gets number of I/O vectors to be read/written in hyperslab I/O.</td>
+</tr>
+<tr>
+<td>#H5Pset_btree_ratios/#H5Pget_btree_ratios</td>
+<td>Sets/gets B-tree split ratios for a dataset transfer property list.</td>
+</tr>
+<tr>
+<td>#H5Pset_vlen_mem_manager/#H5Pget_vlen_mem_manager</td>
+<td>Sets/gets the memory manager for variable-length datatype allocation in #H5Dread and
+#H5Dvlen_reclaim.</td>
+</tr>
+<tr>
+<td>#H5Pset_dxpl_mpio/#H5Pget_dxpl_mpio</td>
+<td>Sets/gets data transfer mode.</td>
+</tr>
+<tr>
+<td>#H5Pset_dxpl_mpio_chunk_opt</td>
+<td>Sets a flag specifying linked-chunk I/O or multi-chunk I/O.</td>
+</tr>
+<tr>
+<td>#H5Pset_dxpl_mpio_chunk_opt_num</td>
+<td>Sets a numeric threshold for linked-chunk I/O.</td>
+</tr>
+<tr>
+<td>#H5Pset_dxpl_mpio_chunk_opt_ratio</td>
+<td>Sets a ratio threshold for collective I/O.</td>
+</tr>
+<tr>
+<td>#H5Pset_dxpl_mpio_collective_opt</td>
+<td>Sets a flag governing the use of independent versus collective I/O.</td>
+</tr>
+<tr>
+<td>#H5Pset_multi_type/#H5Pget_multi_type</td>
+<td>Sets/gets the type of data property for the MULTI driver.</td>
+</tr>
+<tr>
+<td>#H5Pset_small_data_block_size/#H5Pget_small_data_block_size</td>
+<td>Sets/gets the size of a contiguous block reserved for small data.</td>
+</tr>
+</table>
+//! [dapl_table]
+ *
+//! [dxpl_table]
+<table>
+<caption id="table_dxpl_id" border="1" style="background-color:whitesmoke;">Data transfer property list functions (H5P)</caption>
+<tr>
+<th>C Function</th>
+<th>Purpose</th>
+</tr>
+<tr>
+<td>#H5Pset_buffer</td>
+<td>Maximum size for the type conversion buffer and the background buffer. May also supply
+pointers to application-allocated buffers.</td>
+</tr>
+<tr>
+<td>#H5Pset_hyper_vector_size</td>
+<td>set the number of "I/O vectors" (offset and length pairs) which are to be
+accumulated in memory before being issued to the lower levels
+of the library for reading or writing the actual data.</td>
+</tr>
+<tr>
+<td>#H5Pset_btree_ratios</td>
+<td>Set the B-tree split ratios for a dataset transfer property list. The split ratios determine
+what percent of children go in the first node when a node splits.</td>
+</tr>
+</table>
+//! [dxpl_table]
+ *
+//! [gcpl_table]
+<table>
+<caption id="table_gcpl_id">Group creation property list functions (H5P)</caption>
+<tr>
+<th>Function</th>
+<th>Purpose</th>
+</tr>
+<tr>
+<td>#H5Pall_filters_avail</td>
+<td>Verifies that all required filters are available.</td>
+</tr>
+<tr>
+<td>#H5Pget_filter</td>
+<td>Returns information about a filter in a pipeline. The
+C function is a macro: \see \ref api-compat-macros.</td>
+</tr>
+<tr>
+<td>#H5Pget_filter_by_id</td>
+<td>Returns information about the specified filter. The
+C function is a macro: \see \ref api-compat-macros.</td>
+</tr>
+<tr>
+<td>#H5Pget_nfilters</td>
+<td>Returns the number of filters in the pipeline.</td>
+</tr>
+<tr>
+<td>#H5Pmodify_filter</td>
+<td>Modifies a filter in the filter pipeline.</td>
+</tr>
+<tr>
+<td>#H5Premove_filter</td>
+<td>Deletes one or more filters in the filter pipeline.</td>
+</tr>
+<tr>
+<td>#H5Pset_deflate</td>
+<td>Sets the deflate (GNU gzip) compression method and compression level.</td>
+</tr>
+<tr>
+<td>#H5Pset_filter</td>
+<td>Adds a filter to the filter pipeline.</td>
+</tr>
+<tr>
+<td>#H5Pset_fletcher32</td>
+<td>Sets up use of the Fletcher32 checksum filter.</td>
+</tr>
+<tr>
+<td>#H5Pset_link_phase_change</td>
+<td>Sets the parameters for conversion between compact and dense groups.</td>
+</tr>
+<tr>
+<td>#H5Pget_link_phase_change</td>
+<td>Queries the settings for conversion between compact and dense groups.</td>
+</tr>
+<tr>
+<td>#H5Pset_est_link_info</td>
+<td>Sets estimated number of links and length of link names in a group.</td>
+</tr>
+<tr>
+<td>#H5Pget_est_link_info</td>
+<td>Queries data required to estimate required local heap or object header size.</td>
+</tr>
+<tr>
+<td>#H5Pset_nlinks</td>
+<td>Sets maximum number of soft or user-defined link traversals.</td>
+</tr>
+<tr>
+<td>#H5Pget_nlinks</td>
+<td>Retrieves the maximum number of link traversals.</td>
+</tr>
+<tr>
+<td>#H5Pset_link_creation_order</td>
+<td>Sets creation order tracking and indexing for links in a group.</td>
+</tr>
+<tr>
+<td>#H5Pget_link_creation_order</td>
+<td>Queries whether link creation order is tracked and/or indexed in a group.</td>
+</tr>
+<tr>
+<td>#H5Pset_create_intermediate_group</td>
+<td>Specifies in the property list whether to create missing intermediate groups.</td>
+</tr>
+<tr>
+<td>#H5Pget_create_intermediate_group</td>
+<td>Determines whether the property is set to enable creating missing intermediate groups.</td>
+</tr>
+<tr>
+<td>#H5Pset_char_encoding</td>
+<td>Sets the character encoding used to encode a string. Use to set ASCII or UTF-8 character
+encoding for object names.</td>
+</tr>
+<tr>
+<td>#H5Pget_char_encoding</td>
+<td>Retrieves the character encoding used to create a string.</td>
+</tr>
+</table>
+//! [gcpl_table]
+ *
+//! [gapl_table]
+<table>
+<caption id="table_gapl_id" border="1" style="background-color:whitesmoke;">Group access property list functions (H5P)</caption>
+<tr>
+<th>Function</th>
+<th>Purpose</th>
+</tr>
+<tr>
+<td>#H5Pset_all_coll_metadata_ops/#H5Pget_all_coll_metadata_ops</td>
+<td>Sets/gets metadata I/O mode for read operations</td>
+</tr>
+</table>
+//! [gapl_table]
+ *
+//! [lapl_table]
+<table>
+<caption id="table_lapl_id" border="1" style="background-color:whitesmoke;">Link access property list functions (H5P)</caption>
+<tr>
+<th>Function</th>
+<th>Purpose</th>
+</tr>
+<tr>
+<td>#H5Pset_elink_cb/#H5Pget_elink_cb</td>
+<td>Sets/gets the external link traversal callback function.</td>
+</tr>
+<tr>
+<td>#H5Pset_elink_acc_flags/#H5Pget_elink_acc_flags</td>
+<td>Sets/gets the external link traversal file access flag.</td>
+</tr>
+<tr>
+<td>#H5Pset_elink_fapl/#H5Pget_elink_fapl</td>
+<td>Sets/gets a file access property list for use in accessing a file pointed to by an external link</td>
+</tr>
+<tr>
+<td>#H5Pset_elink_prefix/#H5Pget_elink_prefix</td>
+<td>Sets/gets prefix to be applied to external link paths.</td>
+</tr>
+<tr>
+<td>#H5Pset_nlinks/#H5Pget_nlinks</td>
+<td>Sets/gets maximum number of soft or user-defined link traversals.</td>
+</tr>
+</table>
+//! [lapl_table]
+ *
+//! [ocpl_table]
+<table>
+<caption id="table_ocpl_id" border="1" style="background-color:whitesmoke;">Object creation property list functions (H5P)</caption>
+<tr>
+<th>Function</th>
+<th>Purpose</th>
+</tr>
+<tr>
+<td>#H5Pset_attr_creation_order/#H5Pget_attr_creation_order</td>
+<td>Sets/gets tracking and indexing of attribute creation order.</td>
+</tr>
+<tr>
+<td>#H5Pset_attr_phase_change/#H5Pget_attr_phase_change</td>
+<td>Sets/gets attribute storage phase change thresholds</td>
+</tr>
+<tr>
+<td>#H5Pset_filter/#H5Pget_filter</td>
+<td>Adds/gets a filter to/from the filter pipeline.</td>
+</tr>
+<tr>
+<td>#H5Pget_filter_by_id</td>
+<td>Returns information about a filter in a pipeline.</td>
+</tr>
+<tr>
+<td>#H5Pget_nfilters</td>
+<td>Returns information about the specified filter.</td>
+</tr>
+<tr>
+<td>#H5Pset_obj_track_times/#H5Pget_obj_track_times</td>
+<td>Sets/gets the recording of times associated with an object.</td>
+</tr>
+<tr>
+<td>#H5Pmodify_filter</td>
+<td>Modifies a filter in the filter pipeline.</td>
+</tr>
+<tr>
+<td>#H5Premove_filter</td>
+<td>Delete one or more filters in the filter pipeline.</td>
+</tr>
+<tr>
+<td>#H5Pset_fletcher32</td>
+<td>Sets up use of the Fletcher32 checksum filter.</td>
+</tr>
+</table>
+//! [ocpl_table]
+ *
+//! [ocpypl_table]
+<table>
+<caption id="table_ocpypl_id" border="1" style="background-color:whitesmoke;">Object copy property list functions (H5P)</caption>
+<tr>
+<th>Function</th>
+<th>Purpose</th>
+</tr>
+<tr>
+<td>#H5Padd_merge_committed_dtype_path</td>
+<td>Adds a path to the list of paths that will be searched in the destination file for a matching committed datatype.</td>
+</tr>
+<tr>
+<td>#H5Pfree_merge_committed_dtype_paths</td>
+<td>Clears the list of paths stored in the object copy property list.</td>
+</tr>
+<tr>
+<td>#H5Pset_copy_object/#H5Pget_copy_object</td>
+<td>Sets/gets the properties to be used when an object is copied.</td>
+</tr>
+<tr>
+<td>#H5Pset_mcdt_search_cb/#H5Pget_mcdt_search_cb</td>
+<td>Sets/gets the callback function that H5Ocopy() will invoke before searching for a matching committed datatype.</td>
+</tr>
+</table>
+//! [ocpypl_table]
+ *
+//! [strcpl_table]
+<table>
+<caption id="table_strcpl_id" border="1" style="background-color:whitesmoke;">String creation property list functions (H5P)</caption>
+<tr>
+<th>Function</th>
+<th>Purpose</th>
+</tr>
+<tr>
+<td>#H5Pset_char_encoding/#H5Pget_char_encoding</td>
+<td>Sets/gets the character encoding used to encode link and attribute names.</td>
+</tr>
+<tr>
+<td>#H5Pset_create_intermediate_group/#H5Pget_create_intermediate_group</td>
+<td>Specifies/retrieves whether to create missing intermediate groups.</td>
+</tr>
+</table>
+//! [strcpl_table]
+ *
+//! [lcpl_table]
+<table>
+<caption id="table_lcpl_id" border="1" style="background-color:whitesmoke;">Link creation property list functions (H5P)</caption>
+<tr>
+<th>Function</th>
+<th>Purpose</th>
+</tr>
+<tr>
+<td>#H5Pset_create_intermediate_group/#H5Pget_create_intermediate_group</td>
+<td>Specifies/retrieves whether to create missing intermediate groups.</td>
+</tr>
+</table>
+//! [lcpl_table]
+ *
+//! [acpl_table]
+<table>
+<caption id="table_acpl_id" border="1" style="background-color:whitesmoke;">Attribute creation property list functions (H5P)</caption>
+<tr>
+<th>Function</th>
+<th>Purpose</th>
+</tr>
+<tr>
+<td>#H5Pset_char_encoding/#H5Pget_char_encoding</td>
+<td>Sets/gets the character encoding used to encode link and attribute names.</td>
+</tr>
+</table>
+//! [acpl_table]
+ *
+ */
+ 
+\ No newline at end of file
diff --git a/doxygen/examples/tables/volAPIs.dox b/doxygen/examples/tables/volAPIs.dox
new file mode 100644
index 0000000..6b9df9b
--- /dev/null
+++ b/doxygen/examples/tables/volAPIs.dox
@@ -0,0 +1,637 @@
+/** VOL API List
+ *
+//! [vol_native_table]
+<table>
+<caption>Alphabetical list of HDF5 API calls specific to the native VOL connector</caption>
+<tr>
+<th>API</th>
+<th>Description</th>
+</tr>
+<tr>
+<td>#H5Aget_num_attrs</td>
+<td>deprecated</td>
+</tr>
+<tr>
+<td>#H5Aiterate1</td>
+<td>deprecated</td>
+</tr>
+<tr>
+<td>#H5Dchunk_iter</td>
+<td></td>
+</tr>
+<tr>
+<td>H5Ddebug</td>
+<td>Internal API routines</td>
+</tr>
+<tr>
+<td>H5Dformat_convert</td>
+<td>Internal API routines</td>
+</tr>
+<tr>
+<td>H5Dget_chunk_index_type</td>
+<td>Internal API routines</td>
+</tr>
+<tr>
+<td>#H5Dget_chunk_info</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Dget_chunk_info_by_coord</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Dget_chunk_storage_size</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Dget_num_chunks</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Dget_offset</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Dread_chunk</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Dwrite_chunk</td>
+<td></td>
+</tr>
+<tr>
+<td>H5FD*</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Fclear_elink_file_cache</td>
+<td></td>
+</tr>
+<tr>
+<td>H5Fformat_convert</td>
+<td>Internal API routines</td>
+</tr>
+<tr>
+<td>#H5Fget_dset_no_attrs_hint</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Fget_eoa</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Fget_file_image</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Fget_filesize</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Fget_free_sections</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Fget_freespace</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Fget_info1</td>
+<td>deprecated</td>
+</tr>
+<tr>
+<td>#H5Fget_info2</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Fget_mdc_config</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Fget_mdc_hit_rate</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Fget_mdc_image_info</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Fget_mdc_logging_status</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Fget_mdc_size</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Fget_metadata_read_retry_info</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Fget_mpi_atomicity</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Fget_page_buffering_stats</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Fget_vfd_handle</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Fincrement_filesize</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Fis_hdf5</td>
+<td>deprecated</td>
+</tr>
+<tr>
+<td>#H5Freset_mdc_hit_rate_stats</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Freset_page_buffering_stats</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Fset_dset_no_attrs_hint</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Fset_latest_format</td>
+<td>deprecated</td>
+</tr>
+<tr>
+<td>#H5Fset_libver_bounds</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Fset_mdc_config</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Fset_mpi_atomicity</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Fstart_mdc_logging</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Fstart_swmr_write</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Fstop_mdc_logging</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Gget_comment</td>
+<td>deprecated</td>
+</tr>
+<tr>
+<td>#H5Giterate</td>
+<td>deprecated</td>
+</tr>
+<tr>
+<td>#H5Gget_info</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Gget_info_by_name</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Gget_info_by_idx</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Gget_objinfo</td>
+<td>deprecated</td>
+</tr>
+<tr>
+<td>#H5Gget_objname_by_idx</td>
+<td>deprecated</td>
+</tr>
+<tr>
+<td>#H5Gget_objtype_by_idx</td>
+<td>deprecated</td>
+</tr>
+<tr>
+<td>#H5Gset_comment</td>
+<td>deprecated</td>
+</tr>
+<tr>
+<td>#H5Lget_info1</td>
+<td>deprecated</td>
+</tr>
+<tr>
+<td>#H5Lget_info_by_idx1</td>
+<td>deprecated</td>
+</tr>
+<tr>
+<td>#H5Literate1</td>
+<td>deprecated</td>
+</tr>
+<tr>
+<td>#H5Literate_by_name1</td>
+<td>deprecated</td>
+</tr>
+<tr>
+<td>#H5Lvisit1</td>
+<td>deprecated</td>
+</tr>
+<tr>
+<td>#H5Lvisit_by_name1</td>
+<td>deprecated</td>
+</tr>
+<tr>
+<td>#H5Oare_mdc_flushes_disabled</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Odisable_mdc_flushes</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Oenable_mdc_flushes</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Oget_comment</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Oget_comment_by_name</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Oget_info_by_idx1</td>
+<td>deprecated</td>
+</tr>
+<tr>
+<td>#H5Oget_info_by_idx2</td>
+<td>deprecated</td>
+</tr>
+<tr>
+<td>#H5Oget_info_by_name1</td>
+<td>deprecated</td>
+</tr>
+<tr>
+<td>#H5Oget_info_by_name2</td>
+<td>deprecated</td>
+</tr>
+<tr>
+<td>#H5Oget_info1</td>
+<td>deprecated</td>
+</tr>
+<tr>
+<td>#H5Oget_info2</td>
+<td>deprecated</td>
+</tr>
+<tr>
+<td>#H5Oget_native_info</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Oget_native_info_by_idx</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Oget_native_info_by_name</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Oopen_by_addr</td>
+<td>deprecated</td>
+</tr>
+<tr>
+<td>#H5Oset_comment</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Oset_comment_by_name</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Ovisit1</td>
+<td>deprecated</td>
+</tr>
+<tr>
+<td>#H5Ovisit by name1</td>
+<td>deprecated</td>
+</tr>
+<tr>
+<td>#H5Ovisit2</td>
+<td>deprecated</td>
+</tr>
+<tr>
+<td>#H5Ovisit by name2</td>
+<td>deprecated</td>
+</tr>
+</table>
+//! [vol_native_table]
+ *
+ *
+//! [vol_independent_table]
+<table>
+<caption>Alphabetical list of VOL-independent HDF5 API calls</caption>
+<tr>
+<th>API</th>
+<th>Description</th>
+</tr>
+<tr>
+<td>H5*</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Dfill</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Dgather</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Diterate</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Dscatter</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Dvlen_reclaim</td>
+<td>deprecated</td>
+</tr>
+<tr>
+<td>#H5Dvlen_get_buf_size</td>
+<td></td>
+</tr>
+<tr>
+<td>H5E*</td>
+<td></td>
+</tr>
+<tr>
+<td>H5I*</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Lis_registered</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Lregister</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Lunpack_elink_val</td>
+<td></td>
+</tr>
+<tr>
+<td>#H5Lunregister</td>
+<td></td>
+</tr>
+<tr>
+<td>H5PL*</td>
+<td></td>
+</tr>
+<tr>
+<td>H5P*</td>
+<td></td>
+</tr>
+<tr>
+<td>H5S*</td>
+<td></td>
+</tr>
+<tr>
+<td>H5T*</td>
+<td>non-committed</td>
+</tr>
+<tr>
+<td>H5VL*</td>
+<td></td>
+</tr>
+<tr>
+<td>H5Z*</td>
+<td></td>
+</tr>
+</table>
+//! [vol_independent_table]
+ *
+ *
+//! [vol_optional_table]
+<table>
+<caption>List of Native VOL Optional Operation Values By Subclass</caption>
+<tr>
+<th>Subclass</th>
+<th>API Reference</th>
+<th>Definition</th>
+</tr>
+<tr>
+<th>H5VL_SUBCLS_ATTR</th>
+<td>#H5Aiterate (deprecated routine)</td>
+<td>#H5VL_NATIVE_ATTR_ITERATE_OLD</td>
+</tr>
+<tr>
+<th rowspan="11">H5VL_SUBCLS_DATASET</th>
+<td>H5Dformat_convert (internal)</td>
+<td>#H5VL_NATIVE_DATASET_FORMAT_CONVERT</td>
+</tr>
+<tr>
+<td>H5Dget_chunk_index_type (internal)</td>
+<td>#H5VL_NATIVE_DATASET_GET_CHUNK_INDEX_TYPE</td>
+</tr>
+<tr>
+<td>#H5Dget_chunk_storage_size</td>
+<td>#H5VL_NATIVE_DATASET_GET_CHUNK_STORAGE_SIZE</td>
+</tr>
+<tr>
+<td>#H5Dget_num_chunks</td>
+<td>#H5VL_NATIVE_DATASET_GET_NUM_CHUNKS</td>
+</tr>
+<tr>
+<td>#H5Dget_chunk_info</td>
+<td>#H5VL_NATIVE_DATASET_GET_CHUNK_INFO_BY_IDX</td>
+</tr>
+<tr>
+<td>#H5Dget_chunk_info_by_coord</td>
+<td>#H5VL_NATIVE_DATASET_GET_CHUNK_INFO_BY_COORD</td>
+</tr>
+<tr>
+<td>#H5Dread_chunk</td>
+<td>#H5VL_NATIVE_DATASET_CHUNK_READ</td>
+</tr>
+<tr>
+<td>#H5Dwrite_chunk</td>
+<td>#H5VL_NATIVE_DATASET_CHUNK_WRITE</td>
+</tr>
+<tr>
+<td>#H5Dvlen_get_buf_size</td>
+<td>#H5VL_NATIVE_DATASET_GET_VLEN_BUF_SIZE</td>
+</tr>
+<tr>
+<td>#H5Dget_offset</td>
+<td>#H5VL_NATIVE_DATASET_GET_OFFSET</td>
+</tr>
+<tr>
+<td>#H5Dget_offset</td>
+<td>#H5VL_NATIVE_DATASET_CHUNK_ITER</td>
+</tr>
+<tr>
+<th rowspan="29">H5VL_SUBCLS_FILE</th>
+<td>#H5Fclear_elink_file_cache</td>
+<td>#H5VL_NATIVE_FILE_CLEAR_ELINK_CACHE</td>
+</tr>
+<tr>
+<td>#H5Fget_file_image</td>
+<td>#H5VL_NATIVE_FILE_GET_FILE_IMAGE</td>
+</tr>
+<tr>
+<td>#H5Fget_free_sections</td>
+<td>#H5VL_NATIVE_FILE_GET_FREE_SECTIONS</td>
+</tr>
+<tr>
+<td>#H5Fget_freespace</td>
+<td>#H5VL_NATIVE_FILE_GET_FREE_SPACE</td>
+</tr>
+<tr>
+<td>#H5Fget_info1 / #H5Fget_info2</td>
+<td>#H5VL_NATIVE_FILE_GET_INFO</td>
+</tr>
+<tr>
+<td>#H5Fget_mdc_config</td>
+<td>#H5VL_NATIVE_FILE_GET_MDC_CONF</td>
+</tr>
+<tr>
+<td>#H5Fget_mdc_hit_rate</td>
+<td>#H5VL_NATIVE_FILE_GET_MDC_HR</td>
+</tr>
+<tr>
+<td>#H5Fget_mdc_size</td>
+<td>#H5VL_NATIVE_FILE_GET_MDC_SIZE</td>
+</tr>
+<tr>
+<td>#H5Fget_filesize</td>
+<td>#H5VL_NATIVE_FILE_GET_SIZE</td>
+</tr>
+<tr>
+<td>#H5Fget_vfd_handle</td>
+<td>#H5VL_NATIVE_FILE_GET_VFD_HANDLE</td>
+</tr>
+<tr>
+<td>#H5Freset_mdc_hit_rate_stats</td>
+<td>#H5VL_NATIVE_FILE_RESET_MDC_HIT_RATE</td>
+</tr>
+<tr>
+<td>#H5Fset_mdc_config</td>
+<td>#H5VL_NATIVE_FILE_SET_MDC_CONFIG</td>
+</tr>
+<tr>
+<td>#H5Fget_metadata_read_retry_info</td>
+<td>#H5VL_NATIVE_FILE_GET_METADATA_READ_RETRY_INFO</td>
+</tr>
+<tr>
+<td>#H5Fstart_swmr_write</td>
+<td>#H5VL_NATIVE_FILE_START_SWMR_WRITE</td>
+</tr>
+<tr>
+<td>#H5Fstart_mdc_logging</td>
+<td>#H5VL_NATIVE_FILE_START_MDC_LOGGING</td>
+</tr>
+<tr>
+<td>#H5Fstop_mdc_logging</td>
+<td>#H5VL_NATIVE_FILE_STOP_MDC_LOGGING</td>
+</tr>
+<tr>
+<td>#H5Fget_mdc_logging_status</td>
+<td>#H5VL_NATIVE_FILE_GET_MDC_LOGGING_STATUS</td>
+</tr>
+<tr>
+<td>H5Fformat_convert (internal)</td>
+<td>#H5VL_NATIVE_FILE_FORMAT_CONVERT</td>
+</tr>
+<tr>
+<td>#H5Freset_page_buffering_stats</td>
+<td>#H5VL_NATIVE_FILE_RESET_PAGE_BUFFERING_STATS</td>
+</tr>
+<tr>
+<td>#H5Fget_page_buffering_stats</td>
+<td>#H5VL_NATIVE_FILE_GET_PAGE_BUFFERING_STATS</td>
+</tr>
+<tr>
+<td>#H5Fget_mdc_image_info</td>
+<td>#H5VL_NATIVE_FILE_GET_MDC_IMAGE_INFO</td>
+</tr>
+<tr>
+<td>#H5Fget_eoa</td>
+<td>#H5VL_NATIVE_FILE_GET_EOA</td>
+</tr>
+<tr>
+<td>#H5Fincrement_filesize</td>
+<td>#H5VL_NATIVE_FILE_INCR_FILESIZE</td>
+</tr>
+<tr>
+<td>#H5Fset_latest_format/#H5Fset_libver_bounds</td>
+<td>#H5VL_NATIVE_FILE_SET_LIBVER_BOUNDS</td>
+</tr>
+<tr>
+<td>#H5Fget_dset_no_attrs_hint</td>
+<td>#H5VL_NATIVE_FILE_GET_MIN_DSET_OHDR_FLAG</td>
+</tr>
+<tr>
+<td>#H5Fset_dset_no_attrs_hint</td>
+<td>#H5VL_NATIVE_FILE_SET_MIN_DSET_OHDR_FLAG</td>
+</tr>
+<tr>
+<td>#H5Fget_mpi_atomicity</td>
+<td>#H5VL_NATIVE_FILE_GET_MPI_ATOMICITY</td>
+</tr>
+<tr>
+<td>#H5Fset_mpi_atomicity</td>
+<td>#H5VL_NATIVE_FILE_SET_MPI_ATOMICITY</td>
+</tr>
+<tr>
+<td>Adjust file after open, with wrapping context</td>
+<td>#H5VL_NATIVE_FILE_POST_OPEN</td>
+</tr>
+<tr>
+<th rowspan="2">H5VL_SUBCLS_GROUP</th>
+<td>#H5Giterate (deprecated routine)</td>
+<td>#H5VL_NATIVE_GROUP_ITERATE_OLD</td>
+</tr>
+<tr>
+<td>#H5Gget_objinfo (deprecated routine)</td>
+<td>#H5VL_NATIVE_GROUP_GET_OBJINFO</td>
+</tr>
+<tr>
+<th rowspan="6">H5VL_SUBCLS_OBJECT</th>
+<td>#H5Gget_comment, #H5Oget_comment, #H5Oget_comment_by_name</td>
+<td>#H5VL_NATIVE_OBJECT_GET_COMMENT</td>
+</tr>
+<tr>
+<td>#H5Gset_comment, #H5Oset_comment, #H5Oset_comment_by_name</td>
+<td>#H5VL_NATIVE_OBJECT_SET_COMMENT</td>
+</tr>
+<tr>
+<td>#H5Odisable_mdc_flushes</td>
+<td>#H5VL_NATIVE_OBJECT_DISABLE_MDC_FLUSHES</td>
+</tr>
+<tr>
+<td>#H5Oenable_mdc_flushes</td>
+<td>#H5VL_NATIVE_OBJECT_ENABLE_MDC_FLUSHES</td>
+</tr>
+<tr>
+<td>#H5Oare_mdc_flushes_disabled</td>
+<td>#H5VL_NATIVE_OBJECT_ARE_MDC_FLUSHES_DISABLED</td>
+</tr>
+<tr>
+<td>#H5Oget_native_info, #H5Oget_native_info_by_idx, #H5Oget_native_info_by_name</td>
+<td>#H5VL_NATIVE_OBJECT_GET_NATIVE_INFO/td>
+</tr>
+</table>
+//! [vol_optional_table]
+ *
+ */
diff --git a/doxygen/hdf5_footer.html b/doxygen/hdf5_footer.html
new file mode 100644
index 0000000..520f3f5
--- /dev/null
+++ b/doxygen/hdf5_footer.html
@@ -0,0 +1,21 @@
+<!-- start footer part -->
+<!--BEGIN GENERATE_TREEVIEW-->
+<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
+  <ul>
+    $navpath
+    <li class="footer">$generatedby
+    <a href="http://www.doxygen.org/index.html">
+    <img class="footer" src="$relpath^doxygen.png" alt="doxygen"/></a> $doxygenversion </li>
+  </ul>
+</div>
+<!--END GENERATE_TREEVIEW-->
+<!--BEGIN !GENERATE_TREEVIEW-->
+<hr class="footer"/><address class="footer"><small>
+$generatedby &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="$relpath^doxygen.png" alt="doxygen"/>
+</a> $doxygenversion
+</small></address>
+<!--END !GENERATE_TREEVIEW-->
+
+</body>
+</html>
diff --git a/doxygen/hdf5_header.html b/doxygen/hdf5_header.html
new file mode 100644
index 0000000..36a3265
--- /dev/null
+++ b/doxygen/hdf5_header.html
@@ -0,0 +1,61 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
+<meta name="generator" content="Doxygen $doxygenversion"/>
+<meta name="viewport" content="width=device-width, initial-scale=1"/>
+<!--BEGIN PROJECT_NAME--><title>$projectname: $title</title><!--END PROJECT_NAME-->
+<!--BEGIN !PROJECT_NAME--><title>$title</title><!--END !PROJECT_NAME-->
+<link href="$relpath^tabs.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="$relpath^jquery.js"></script>
+<script type="text/javascript" src="$relpath^dynsections.js"></script>
+$treeview
+$search
+$mathjax
+<link href="$relpath^$stylesheet" rel="stylesheet" type="text/css" />
+<link href="$relpath$hdf5doxy.css" rel="stylesheet" type="text/css">
+<!-- $extrastylesheet -->
+<script type="text/javascript" src="$relpath$hdf5_navtree_hacks.js"></script>
+
+</head>
+<body>
+
+<div style="background:#FFDDDD;font-size:120%;text-align:center;margin:0;padding:5px">Please, help us to better serve our user community by answering the following short survey:  <a href="https://www.hdfgroup.org/website-survey/">https://www.hdfgroup.org/website-survey/</a></div>
+
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
+
+<!--BEGIN TITLEAREA-->
+<div id="titlearea">
+<table cellspacing="0" cellpadding="0">
+ <tbody>
+ <tr style="height: 56px;">
+  <!--BEGIN PROJECT_LOGO-->
+  <td id="projectlogo"><img alt="Logo" src="$relpath^$projectlogo"/></td>
+  <!--END PROJECT_LOGO-->
+  <!--BEGIN PROJECT_NAME-->
+  <td id="projectalign" style="padding-left: 0.5em;">
+   <div id="projectname"><a href="https://www.hdfgroup.org">$projectname</a>
+   <!--BEGIN PROJECT_NUMBER-->&#160;<span id="projectnumber">$projectnumber</span><!--END PROJECT_NUMBER-->
+   </div>
+   <!--BEGIN PROJECT_BRIEF--><div id="projectbrief">$projectbrief</div><!--END PROJECT_BRIEF-->
+  </td>
+  <!--END PROJECT_NAME-->
+  <!--BEGIN !PROJECT_NAME-->
+   <!--BEGIN PROJECT_BRIEF-->
+    <td id="projectalign" style="padding-left: 0.5em;">
+    <div id="projectbrief">$projectbrief</div>
+    </td>
+   <!--END PROJECT_BRIEF-->
+  <!--END !PROJECT_NAME-->
+  <!--BEGIN DISABLE_INDEX-->
+   <!--BEGIN SEARCHENGINE-->
+   <td>$searchbox</td>
+   <!--END SEARCHENGINE-->
+  <!--END DISABLE_INDEX-->
+ </tr>
+ </tbody>
+</table>
+</div>
+<!--END TITLEAREA-->
+<!-- end header part -->
diff --git a/doxygen/hdf5_navtree_hacks.js b/doxygen/hdf5_navtree_hacks.js
new file mode 100644
index 0000000..dda8984
--- /dev/null
+++ b/doxygen/hdf5_navtree_hacks.js
@@ -0,0 +1,246 @@
+
+// generate a table of contents in the side-nav based on the h1/h2 tags of the current page.
+function generate_autotoc() {
+  var headers = $("h1, h2");
+  if(headers.length > 1) {
+    var toc = $("#side-nav").append('<div id="nav-toc" class="toc"><h3>Table of contents</h3></div>');
+    toc = $("#nav-toc");
+    var footer  = $("#nav-path");
+    var footerHeight = footer.height();
+    toc = toc.append('<ul></ul>');
+    toc = toc.find('ul');
+    var indices = new Array();
+    indices[0] = 0;
+    indices[1] = 0;
+
+    var h1counts = $("h1").length;
+    headers.each(function(i) {
+      var current = $(this);
+      var levelTag = current[0].tagName.charAt(1);
+      if(h1counts==0)
+        levelTag--;
+      var cur_id = current.attr("id");
+
+      indices[levelTag-1]+=1;
+      var prefix = indices[0];
+      if (levelTag >1) {
+        prefix+="."+indices[1];
+      }
+
+      // Uncomment to add number prefixes
+      // current.html(prefix + "   " + current.html());
+      for(var l = levelTag; l < 2; ++l){
+          indices[l] = 0;
+      }
+
+      if(cur_id == undefined) {
+        current.attr('id', 'title' + i);
+        current.addClass('anchor');
+        toc.append("<li class='level" + levelTag + "'><a id='link" + i + "' href='#title" +
+                    i + "' title='" + current.prop("tagName") + "'>" + current.text() + "</a></li>");
+      } else {
+        toc.append("<li class='level" + levelTag + "'><a id='" + cur_id + "' href='#title" +
+                    i + "' title='" + current.prop("tagName") + "'>" + current.text() + "</a></li>");
+      }
+    });
+    resizeHeight();
+  }
+}
+
+
+var global_navtree_object;
+
+// Overloaded to remove links to sections/subsections
+function getNode(o, po)
+{
+  po.childrenVisited = true;
+  var l = po.childrenData.length-1;
+  for (var i in po.childrenData) {
+    var nodeData = po.childrenData[i];
+    if((!nodeData[1]) ||  (nodeData[1].indexOf('#')==-1)) // <- we added this line
+      po.children[i] = newNode(o, po, nodeData[0], nodeData[1], nodeData[2], i==l);
+  }
+}
+
+// Overloaded to adjust the size of the navtree wrt the toc
+function resizeHeight()
+{
+  var header  = $("#top");
+  var sidenav = $("#side-nav");
+  var content = $("#doc-content");
+  var navtree = $("#nav-tree");
+  var footer  = $("#nav-path");
+  var toc     = $("#nav-toc");
+
+  var headerHeight = header.outerHeight();
+  var footerHeight = footer.outerHeight();
+  var tocHeight    = toc.height();
+  var windowHeight = $(window).height() - headerHeight - footerHeight;
+  content.css({height:windowHeight + "px"});
+  navtree.css({height:(windowHeight-tocHeight) + "px"});
+  sidenav.css({height:windowHeight + "px"});
+}
+
+// Overloaded to save the root node into global_navtree_object
+function initNavTree(toroot,relpath)
+{
+  var o = new Object();
+  global_navtree_object = o; // <- we added this line
+  o.toroot = toroot;
+  o.node = new Object();
+  o.node.li = document.getElementById("nav-tree-contents");
+  o.node.childrenData = NAVTREE;
+  o.node.children = new Array();
+  o.node.childrenUL = document.createElement("ul");
+  o.node.getChildrenUL = function() { return o.node.childrenUL; };
+  o.node.li.appendChild(o.node.childrenUL);
+  o.node.depth = 0;
+  o.node.relpath = relpath;
+  o.node.expanded = false;
+  o.node.isLast = true;
+  o.node.plus_img = document.createElement("img");
+  o.node.plus_img.src = relpath+"ftv2pnode.png";
+  o.node.plus_img.width = 16;
+  o.node.plus_img.height = 22;
+
+  if (localStorageSupported()) {
+    var navSync = $('#nav-sync');
+    if (cachedLink()) {
+      showSyncOff(navSync,relpath);
+      navSync.removeClass('sync');
+    } else {
+      showSyncOn(navSync,relpath);
+    }
+    navSync.click(function(){ toggleSyncButton(relpath); });
+  }
+
+  navTo(o,toroot,window.location.hash,relpath);
+
+  $(window).bind('hashchange', function(){
+     if (window.location.hash && window.location.hash.length>1){
+       var a;
+       if ($(location).attr('hash')){
+         var clslink=stripPath($(location).attr('pathname'))+':'+
+                               $(location).attr('hash').substring(1);
+         a=$('.item a[class$="'+clslink+'"]');
+       }
+       if (a==null || !$(a).parent().parent().hasClass('selected')){
+         $('.item').removeClass('selected');
+         $('.item').removeAttr('id');
+       }
+       var link=stripPath2($(location).attr('pathname'));
+       navTo(o,link,$(location).attr('hash'),relpath);
+     } else if (!animationInProgress) {
+       $('#doc-content').scrollTop(0);
+       $('.item').removeClass('selected');
+       $('.item').removeAttr('id');
+       navTo(o,toroot,window.location.hash,relpath);
+     }
+  })
+
+  $(window).on("load", showRoot);
+}
+
+// return false if the the node has no children at all, or has only section/subsection children
+function checkChildrenData(node) {
+  if (!(typeof(node.childrenData)==='string')) {
+    for (var i in node.childrenData) {
+      var url = node.childrenData[i][1];
+      if(url.indexOf("#")==-1)
+        return true;
+    }
+    return false;
+  }
+  return (node.childrenData);
+}
+
+// Modified to:
+// 1 - remove the root node
+// 2 - remove the section/subsection children
+function createIndent(o,domNode,node,level)
+{
+  var level=-2; // <- we replaced level=-1 by level=-2
+  var n = node;
+  while (n.parentNode) { level++; n=n.parentNode; }
+  if (checkChildrenData(node)) { // <- we modified this line to use checkChildrenData(node) instead of node.childrenData
+    var imgNode = document.createElement("span");
+    imgNode.className = 'arrow';
+    imgNode.style.paddingLeft=(16*level).toString()+'px';
+    imgNode.innerHTML=arrowRight;
+    node.plus_img = imgNode;
+    node.expandToggle = document.createElement("a");
+    node.expandToggle.href = "javascript:void(0)";
+    node.expandToggle.onclick = function() {
+      if (node.expanded) {
+        $(node.getChildrenUL()).slideUp("fast");
+        node.plus_img.innerHTML=arrowRight;
+        node.expanded = false;
+      } else {
+        expandNode(o, node, false, false);
+      }
+    }
+    node.expandToggle.appendChild(imgNode);
+    domNode.appendChild(node.expandToggle);
+  } else {
+    var span = document.createElement("span");
+    span.className = 'arrow';
+    span.style.width   = 16*(level+1)+'px';
+    span.innerHTML = '&#160;';
+    domNode.appendChild(span);
+  }
+}
+
+// Overloaded to automatically expand the selected node
+function selectAndHighlight(hash,n)
+{
+  var a;
+  if (hash) {
+    var link=stripPath($(location).attr('pathname'))+':'+hash.substring(1);
+    a=$('.item a[class$="'+link+'"]');
+  }
+  if (a && a.length) {
+    a.parent().parent().addClass('selected');
+    a.parent().parent().attr('id','selected');
+    highlightAnchor();
+  } else if (n) {
+    $(n.itemDiv).addClass('selected');
+    $(n.itemDiv).attr('id','selected');
+  }
+  if ($('#nav-tree-contents .item:first').hasClass('selected')) {
+    $('#nav-sync').css('top','30px');
+  } else {
+    $('#nav-sync').css('top','5px');
+  }
+  expandNode(global_navtree_object, n, true, true); // <- we added this line
+  showRoot();
+}
+
+
+$(document).ready(function() {
+
+  generate_autotoc();
+
+  (function (){ // wait until the first "selected" element has been created
+    try {
+
+      // this line will trigger an exception if there is no #selected element, i.e., before the tree structure is complete.
+      document.getElementById("selected").className = "item selected";
+
+      // ok, the default tree has been created, we can keep going...
+
+      // expand the "Chapters" node
+      if(window.location.href.indexOf('unsupported')==-1)
+        expandNode(global_navtree_object, global_navtree_object.node.children[0].children[2], true, true);
+      else
+        expandNode(global_navtree_object, global_navtree_object.node.children[0].children[1], true, true);
+
+      // Hide the root node "HDF5"
+      $(document.getElementsByClassName('index.html')[0]).parent().parent().css({display:"none"});
+
+    } catch (err) {
+      setTimeout(arguments.callee, 10);
+    }
+  })();
+
+  $(window).on("load", resizeHeight);
+});
diff --git a/doxygen/hdf5doxy.css b/doxygen/hdf5doxy.css
new file mode 100644
index 0000000..639843d
--- /dev/null
+++ b/doxygen/hdf5doxy.css
@@ -0,0 +1,259 @@
+
+/******** HDF5 specific CSS code ************/
+
+/**** Styles removing elements ****/
+
+/* remove the "modules|classes" link for module pages (they are already in the TOC) */
+div.summary {
+  display:none;
+}
+
+/* remove */
+div.contents hr {
+  display:none;
+}
+
+/**** ****/
+
+p, dl.warning, dl.attention, dl.note
+{
+  max-width:60em;
+  text-align:justify;
+}
+
+li {
+  max-width:55em;
+  text-align:justify;
+}
+
+img {
+  border: 0;
+}
+
+div.fragment {
+  display:table; /* this allows the element to be larger than its parent */
+  padding: 0pt;
+}
+pre.fragment {
+  border: 1px solid #cccccc;
+
+  margin: 2px 0px 2px 0px;
+  padding: 3px 5px 3px 5px;
+}
+
+/* Common style for all HDF5's tables */
+
+table.example, table.manual, table.manual-vl, table.manual-hl {
+    max-width:100%;
+    border-collapse: collapse;
+    border-style: solid;
+    border-width: 1px;
+    border-color: #cccccc;
+    font-size: 1em;
+
+    box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
+    -moz-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
+    -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
+}
+
+table.example th, table.manual th, table.manual-vl th, table.manual-hl th {
+  padding: 0.5em 0.5em 0.5em 0.5em;
+  text-align: left;
+  padding-right: 1em;
+  color: #555555;
+  background-color: #F4F4E5;
+
+  background-image: -webkit-gradient(linear,center top,center bottom,from(#FFFFFF), color-stop(0.3,#FFFFFF), color-stop(0.30,#FFFFFF), color-stop(0.98,#F4F4E5), to(#ECECDE));
+  background-image: -moz-linear-gradient(center top, #FFFFFF 0%, #FFFFFF 30%, #F4F4E5 98%, #ECECDE);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFF', endColorstr='#F4F4E5');
+}
+
+table.example td, table.manual td, table.manual-vl td, table.manual-hl td {
+  vertical-align:top;
+  border-width: 1px;
+  border-color: #cccccc;
+}
+
+/* header of headers */
+table th.meta {
+  text-align:center;
+  font-size: 1.2em;
+  background-color:#FFFFFF;
+}
+
+/* intermediate header */
+table th.inter {
+  text-align:left;
+  background-color:#FFFFFF;
+  background-image:none;
+  border-style:solid solid solid solid;
+  border-width: 1px;
+	border-color: #cccccc;
+}
+
+/** class for example / output tables **/
+
+table.example {
+}
+
+table.example th {
+}
+
+table.example td {
+  padding: 0.5em 0.5em 0.5em 0.5em;
+  vertical-align:top;
+}
+
+/* standard class for the manual */
+
+table.manual, table.manual-vl, table.manual-hl {
+    padding: 0.2em 0em 0.5em 0em;
+}
+
+table.manual th, table.manual-vl th, table.manual-hl th {
+  margin: 0em 0em 0.3em 0em;
+}
+
+table.manual td, table.manual-vl td, table.manual-hl td {
+  padding: 0.3em 0.5em 0.3em 0.5em;
+  vertical-align:top;
+  border-width: 1px;
+}
+
+table.manual td.alt, table.manual tr.alt, table.manual-vl td.alt, table.manual-vl tr.alt {
+  background-color: #F4F4E5;
+}
+
+table.manual-vl th, table.manual-vl td, table.manual-vl td.alt {
+  border-color: #cccccc;
+  border-width: 1px;
+  border-style: none solid none solid;
+}
+
+table.manual-vl th.inter {
+  border-style: solid solid solid solid;
+}
+
+table.manual-hl td {
+  border-color: #cccccc;
+  border-width: 1px;
+  border-style: solid none solid none;
+}
+
+table td.code {
+  font-family: monospace;
+}
+
+h2 {
+  margin-top:2em;
+  border-style: none none solid none;
+  border-width: 1px;
+  border-color: #cccccc;
+}
+
+/**** Table of content in the side-nav ****/
+
+
+div.toc {
+  margin:0;
+  padding: 0.3em 0 0 0;
+  width:100%;
+  float:none;
+  position:absolute;
+  bottom:0;
+  border-radius:0px;
+  border-style: solid none none none;
+  max-height:50%;
+  overflow-y: scroll;
+}
+
+div.toc h3 {
+  margin-left: 0.5em;
+  margin-bottom: 0.2em;
+}
+
+div.toc ul {
+  margin: 0.2em 0 0.4em 0.5em;
+}
+
+span.cpp11,span.cpp14,span.cpp17 {
+  color: #119911;
+  font-weight: bold;
+}
+
+.newin3x {
+  color: #a37c1a;
+  font-weight: bold;
+}
+
+div.warningbox {
+  max-width:60em;
+  border-style: solid solid solid solid;
+  border-color: red;
+  border-width: 3px;
+}
+
+/**** old HDF5's styles ****/
+
+
+table.tutorial_code td {
+  border-color: transparent; /* required for Firefox */
+  padding: 3pt 5pt 3pt 5pt;
+  vertical-align: top;
+}
+
+
+/* Whenever doxygen meets a '\n' or a '<BR/>', it will put
+ * the text containing the character into a <p class="starttd">.
+ * This little hack together with table.tutorial_code td.note
+ * aims at fixing this issue. */
+table.tutorial_code td.note p.starttd {
+  margin: 0px;
+  border: none;
+  padding: 0px;
+}
+
+div.eimainmenu {
+  text-align:     center;
+}
+
+/* center version number on main page */
+h3.version {
+  text-align:     center;
+}
+
+
+td.width20em p.endtd {
+  width:  20em;
+}
+
+/* needed for huge screens */
+.ui-resizable-e {
+  background-repeat: repeat-y;
+}
+
+/* Style external links -- nav-tree is different */
+
+#nav-tree .label a {
+  padding:2px 16px 2px 2px;
+}
+
+a {
+  outline: none;
+  text-decoration: none;
+  padding: 2px 1px 0;
+}
+
+a[href^="http"]::after,
+a[href^="https://"]::after
+{
+  content: "";
+  width: 11px;
+  height: 11px;
+  margin-left: 4px;
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='currentColor' viewBox='0 0 16 16'%3E%3Cpath fill-rule='evenodd' d='M8.636 3.5a.5.5 0 0 0-.5-.5H1.5A1.5 1.5 0 0 0 0 4.5v10A1.5 1.5 0 0 0 1.5 16h10a1.5 1.5 0 0 0 1.5-1.5V7.864a.5.5 0 0 0-1 0V14.5a.5.5 0 0 1-.5.5h-10a.5.5 0 0 1-.5-.5v-10a.5.5 0 0 1 .5-.5h6.636a.5.5 0 0 0 .5-.5z'/%3E%3Cpath fill-rule='evenodd' d='M16 .5a.5.5 0 0 0-.5-.5h-5a.5.5 0 0 0 0 1h3.793L6.146 9.146a.5.5 0 1 0 .708.708L15 1.707V5.5a.5.5 0 0 0 1 0v-5z'/%3E%3C/svg%3E");
+  background-position: center;
+  background-repeat: no-repeat;
+  background-size: contain;
+  display: inline-block;
+}
diff --git a/doxygen/hdf5doxy_layout.xml b/doxygen/hdf5doxy_layout.xml
new file mode 100644
index 0000000..77900a3
--- /dev/null
+++ b/doxygen/hdf5doxy_layout.xml
@@ -0,0 +1,186 @@
+<?xml version="1.0"?>
+<doxygenlayout version="1.0">
+  <!-- Navigation index tabs for HTML output -->
+  <navindex>
+    <tab type="user" url="index.html" title="Overview" />
+    <tab type="user" url="@ref GettingStarted" title="Getting started" />
+    <tab type="user" url="@ref UG" title="User Guide" />
+    <tab type="user" url="@ref RM" title="Reference Manual" />
+    <tab type="user" url="@ref GLS" title="Glossary" />
+    <tab type="user" url="https://portal.hdfgroup.org/display/HDF5/HDF5+Application+Developer%27s+Guide" title="Application Developer's Guide" />
+    <tab type="user" url="@ref SPEC" title="Specifications" />
+    <tab type="user" url="@ref Cookbook" title="Cookbook" />
+    <tab type="user" url="@ref TN" title="Technical Notes" />
+    <tab type="user" url="@ref VOL_Connector" title="HDF5 VOL Connector Author Guide" />
+    <tab type="user" url="https://portal.hdfgroup.org/display/HDF5/HDF5+VOL+User%27s+Guide" title="HDF5 VOL User's Guide" />
+    <tab type="user" url="@ref RFC" title="RFCs" />
+    <tab type="user" url="@ref FTS" title="Full-Text Search" />
+    <tab type="user" url="@ref About" title="About" />
+  </navindex>
+
+  <!-- Layout definition for a class page -->
+  <class>
+    <briefdescription visible="no"/>
+    <includes visible="$SHOW_INCLUDE_FILES"/>
+    <detaileddescription title=""/>
+    <inheritancegraph visible="$CLASS_GRAPH"/>
+    <collaborationgraph visible="$COLLABORATION_GRAPH"/>
+    <allmemberslink visible="yes"/>
+    <memberdecl>
+      <nestedclasses visible="yes" title=""/>
+      <publictypes title=""/>
+      <publicslots title=""/>
+      <signals title=""/>
+      <publicmethods title=""/>
+      <publicstaticmethods title=""/>
+      <publicattributes title=""/>
+      <publicstaticattributes title=""/>
+      <protectedtypes title=""/>
+      <protectedslots title=""/>
+      <protectedmethods title=""/>
+      <protectedstaticmethods title=""/>
+      <protectedattributes title=""/>
+      <protectedstaticattributes title=""/>
+      <packagetypes title=""/>
+      <packagemethods title=""/>
+      <packagestaticmethods title=""/>
+      <packageattributes title=""/>
+      <packagestaticattributes title=""/>
+      <properties title=""/>
+      <events title=""/>
+      <privatetypes title=""/>
+      <privateslots title=""/>
+      <privatemethods title=""/>
+      <privatestaticmethods title=""/>
+      <privateattributes title=""/>
+      <privatestaticattributes title=""/>
+      <friends title=""/>
+      <related title="" subtitle=""/>
+      <membergroups visible="yes"/>
+    </memberdecl>
+
+    <memberdef>
+      <inlineclasses title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <constructors title=""/>
+      <functions title=""/>
+      <related title=""/>
+      <variables title=""/>
+      <properties title=""/>
+      <events title=""/>
+    </memberdef>
+    <usedfiles visible="$SHOW_USED_FILES"/>
+    <authorsection visible="yes"/>
+  </class>
+
+  <!-- Layout definition for a namespace page -->
+  <namespace>
+    <briefdescription visible="yes"/>
+    <memberdecl>
+      <nestednamespaces visible="yes" title=""/>
+      <classes visible="yes" title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <functions title=""/>
+      <variables title=""/>
+      <membergroups visible="yes"/>
+    </memberdecl>
+    <detaileddescription title=""/>
+    <memberdef>
+      <inlineclasses title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <functions title=""/>
+      <variables title=""/>
+    </memberdef>
+    <authorsection visible="yes"/>
+  </namespace>
+
+  <!-- Layout definition for a file page -->
+  <file>
+    <briefdescription visible="yes"/>
+    <includes visible="$SHOW_INCLUDE_FILES"/>
+    <includegraph visible="$INCLUDE_GRAPH"/>
+    <includedbygraph visible="$INCLUDED_BY_GRAPH"/>
+    <sourcelink visible="yes"/>
+    <memberdecl>
+      <classes visible="yes" title=""/>
+      <namespaces visible="yes" title=""/>
+      <defines title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <functions title=""/>
+      <variables title=""/>
+      <membergroups visible="yes"/>
+    </memberdecl>
+    <detaileddescription title=""/>
+    <memberdef>
+      <inlineclasses title=""/>
+      <defines title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <functions title=""/>
+      <variables title=""/>
+    </memberdef>
+    <authorsection/>
+  </file>
+
+  <!-- Layout definition for a group page -->
+  <group>
+    <briefdescription visible="no"/>
+    <detaileddescription title=""/>
+    <groupgraph visible="$GROUP_GRAPHS"/>
+    <memberdecl>
+      <nestedgroups visible="yes" title=""/>
+      <dirs visible="yes" title=""/>
+      <files visible="yes" title=""/>
+      <namespaces visible="yes" title=""/>
+      <classes visible="yes" title=""/>
+      <defines title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <enumvalues title=""/>
+      <functions title=""/>
+      <variables title=""/>
+      <signals title=""/>
+      <publicslots title=""/>
+      <protectedslots title=""/>
+      <privateslots title=""/>
+      <events title=""/>
+      <properties title=""/>
+      <friends title=""/>
+      <membergroups visible="yes"/>
+    </memberdecl>
+
+    <memberdef>
+      <pagedocs/>
+      <inlineclasses title=""/>
+      <defines title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <enumvalues title=""/>
+      <functions title=""/>
+      <variables title=""/>
+      <signals title=""/>
+      <publicslots title=""/>
+      <protectedslots title=""/>
+      <privateslots title=""/>
+      <events title=""/>
+      <properties title=""/>
+      <friends title=""/>
+    </memberdef>
+    <authorsection visible="yes"/>
+  </group>
+
+  <!-- Layout definition for a directory page -->
+  <directory>
+    <briefdescription visible="yes"/>
+    <directorygraph visible="yes"/>
+    <memberdecl>
+      <dirs visible="yes"/>
+      <files visible="yes"/>
+    </memberdecl>
+    <detaileddescription title=""/>
+  </directory>
+</doxygenlayout>
diff --git a/doxygen/img/DataGroup.png b/doxygen/img/DataGroup.png
new file mode 100644
index 0000000..4edeba3
--- /dev/null
+++ b/doxygen/img/DataGroup.png
diff --git a/doxygen/img/Dmodel_fig1.gif b/doxygen/img/Dmodel_fig1.gif
new file mode 100644
index 0000000..ca8093c
--- /dev/null
+++ b/doxygen/img/Dmodel_fig1.gif
diff --git a/doxygen/img/Dmodel_fig10.gif b/doxygen/img/Dmodel_fig10.gif
new file mode 100644
index 0000000..c6a9916
--- /dev/null
+++ b/doxygen/img/Dmodel_fig10.gif
diff --git a/doxygen/img/Dmodel_fig11_b.gif b/doxygen/img/Dmodel_fig11_b.gif
new file mode 100644
index 0000000..19ea9fb
--- /dev/null
+++ b/doxygen/img/Dmodel_fig11_b.gif
diff --git a/doxygen/img/Dmodel_fig12_a.gif b/doxygen/img/Dmodel_fig12_a.gif
new file mode 100644
index 0000000..1f597df
--- /dev/null
+++ b/doxygen/img/Dmodel_fig12_a.gif
diff --git a/doxygen/img/Dmodel_fig12_b.gif b/doxygen/img/Dmodel_fig12_b.gif
new file mode 100644
index 0000000..f271082
--- /dev/null
+++ b/doxygen/img/Dmodel_fig12_b.gif
diff --git a/doxygen/img/Dmodel_fig14_a.gif b/doxygen/img/Dmodel_fig14_a.gif
new file mode 100644
index 0000000..45d6c6c
--- /dev/null
+++ b/doxygen/img/Dmodel_fig14_a.gif
diff --git a/doxygen/img/Dmodel_fig14_b.gif b/doxygen/img/Dmodel_fig14_b.gif
new file mode 100644
index 0000000..12a667d
--- /dev/null
+++ b/doxygen/img/Dmodel_fig14_b.gif
diff --git a/doxygen/img/Dmodel_fig14_c.gif b/doxygen/img/Dmodel_fig14_c.gif
new file mode 100644
index 0000000..0c06049
--- /dev/null
+++ b/doxygen/img/Dmodel_fig14_c.gif
diff --git a/doxygen/img/Dmodel_fig14_d.gif b/doxygen/img/Dmodel_fig14_d.gif
new file mode 100644
index 0000000..7cb8956
--- /dev/null
+++ b/doxygen/img/Dmodel_fig14_d.gif
diff --git a/doxygen/img/Dmodel_fig2.gif b/doxygen/img/Dmodel_fig2.gif
new file mode 100644
index 0000000..c2c9d04
--- /dev/null
+++ b/doxygen/img/Dmodel_fig2.gif
diff --git a/doxygen/img/Dmodel_fig3_a.gif b/doxygen/img/Dmodel_fig3_a.gif
new file mode 100644
index 0000000..9f00832
--- /dev/null
+++ b/doxygen/img/Dmodel_fig3_a.gif
diff --git a/doxygen/img/Dmodel_fig3_c.gif b/doxygen/img/Dmodel_fig3_c.gif
new file mode 100644
index 0000000..8529181
--- /dev/null
+++ b/doxygen/img/Dmodel_fig3_c.gif
diff --git a/doxygen/img/Dmodel_fig4_a.gif b/doxygen/img/Dmodel_fig4_a.gif
new file mode 100644
index 0000000..c7fdce1
--- /dev/null
+++ b/doxygen/img/Dmodel_fig4_a.gif
diff --git a/doxygen/img/Dmodel_fig4_b.gif b/doxygen/img/Dmodel_fig4_b.gif
new file mode 100644
index 0000000..34053d5
--- /dev/null
+++ b/doxygen/img/Dmodel_fig4_b.gif
diff --git a/doxygen/img/Dmodel_fig5.gif b/doxygen/img/Dmodel_fig5.gif
new file mode 100644
index 0000000..69e11f5
--- /dev/null
+++ b/doxygen/img/Dmodel_fig5.gif
diff --git a/doxygen/img/Dmodel_fig6.gif b/doxygen/img/Dmodel_fig6.gif
new file mode 100644
index 0000000..bf677c2
--- /dev/null
+++ b/doxygen/img/Dmodel_fig6.gif
diff --git a/doxygen/img/Dmodel_fig7_b.gif b/doxygen/img/Dmodel_fig7_b.gif
new file mode 100644
index 0000000..da27fa0
--- /dev/null
+++ b/doxygen/img/Dmodel_fig7_b.gif
diff --git a/doxygen/img/Dmodel_fig8.gif b/doxygen/img/Dmodel_fig8.gif
new file mode 100644
index 0000000..27305a8
--- /dev/null
+++ b/doxygen/img/Dmodel_fig8.gif
diff --git a/doxygen/img/Dmodel_fig9.gif b/doxygen/img/Dmodel_fig9.gif
new file mode 100644
index 0000000..31893bf
--- /dev/null
+++ b/doxygen/img/Dmodel_fig9.gif
diff --git a/doxygen/img/Dsets_NbitFloating1.gif b/doxygen/img/Dsets_NbitFloating1.gif
new file mode 100644
index 0000000..3d3ce19
--- /dev/null
+++ b/doxygen/img/Dsets_NbitFloating1.gif
diff --git a/doxygen/img/Dsets_NbitFloating2.gif b/doxygen/img/Dsets_NbitFloating2.gif
new file mode 100644
index 0000000..cdb5a90
--- /dev/null
+++ b/doxygen/img/Dsets_NbitFloating2.gif
diff --git a/doxygen/img/Dsets_NbitInteger1.gif b/doxygen/img/Dsets_NbitInteger1.gif
new file mode 100644
index 0000000..656fb8d
--- /dev/null
+++ b/doxygen/img/Dsets_NbitInteger1.gif
diff --git a/doxygen/img/Dsets_NbitInteger2.gif b/doxygen/img/Dsets_NbitInteger2.gif
new file mode 100644
index 0000000..e100ebe
--- /dev/null
+++ b/doxygen/img/Dsets_NbitInteger2.gif
diff --git a/doxygen/img/Dsets_fig1.gif b/doxygen/img/Dsets_fig1.gif
new file mode 100644
index 0000000..c8f3349
--- /dev/null
+++ b/doxygen/img/Dsets_fig1.gif
diff --git a/doxygen/img/Dsets_fig10.gif b/doxygen/img/Dsets_fig10.gif
new file mode 100644
index 0000000..4593cc1
--- /dev/null
+++ b/doxygen/img/Dsets_fig10.gif
diff --git a/doxygen/img/Dsets_fig11.gif b/doxygen/img/Dsets_fig11.gif
new file mode 100644
index 0000000..573701a
--- /dev/null
+++ b/doxygen/img/Dsets_fig11.gif
diff --git a/doxygen/img/Dsets_fig12.gif b/doxygen/img/Dsets_fig12.gif
new file mode 100644
index 0000000..d9ddd2b
--- /dev/null
+++ b/doxygen/img/Dsets_fig12.gif
diff --git a/doxygen/img/Dsets_fig2.gif b/doxygen/img/Dsets_fig2.gif
new file mode 100644
index 0000000..8ecc2c7
--- /dev/null
+++ b/doxygen/img/Dsets_fig2.gif
diff --git a/doxygen/img/Dsets_fig3.gif b/doxygen/img/Dsets_fig3.gif
new file mode 100644
index 0000000..642715e
--- /dev/null
+++ b/doxygen/img/Dsets_fig3.gif
diff --git a/doxygen/img/Dsets_fig4.gif b/doxygen/img/Dsets_fig4.gif
new file mode 100644
index 0000000..a24ccc9
--- /dev/null
+++ b/doxygen/img/Dsets_fig4.gif
diff --git a/doxygen/img/Dsets_fig5.gif b/doxygen/img/Dsets_fig5.gif
new file mode 100644
index 0000000..78c953e
--- /dev/null
+++ b/doxygen/img/Dsets_fig5.gif
diff --git a/doxygen/img/Dsets_fig6.gif b/doxygen/img/Dsets_fig6.gif
new file mode 100644
index 0000000..ea15564
--- /dev/null
+++ b/doxygen/img/Dsets_fig6.gif
diff --git a/doxygen/img/Dsets_fig7.gif b/doxygen/img/Dsets_fig7.gif
new file mode 100644
index 0000000..f7f6b9e
--- /dev/null
+++ b/doxygen/img/Dsets_fig7.gif
diff --git a/doxygen/img/Dsets_fig8.gif b/doxygen/img/Dsets_fig8.gif
new file mode 100644
index 0000000..91cb6aa
--- /dev/null
+++ b/doxygen/img/Dsets_fig8.gif
diff --git a/doxygen/img/Dsets_fig9.gif b/doxygen/img/Dsets_fig9.gif
new file mode 100644
index 0000000..802ca52
--- /dev/null
+++ b/doxygen/img/Dsets_fig9.gif
diff --git a/doxygen/img/Dspace_CvsF1.gif b/doxygen/img/Dspace_CvsF1.gif
new file mode 100644
index 0000000..716b9f1
--- /dev/null
+++ b/doxygen/img/Dspace_CvsF1.gif
diff --git a/doxygen/img/Dspace_CvsF2.gif b/doxygen/img/Dspace_CvsF2.gif
new file mode 100644
index 0000000..716b9f1
--- /dev/null
+++ b/doxygen/img/Dspace_CvsF2.gif
diff --git a/doxygen/img/Dspace_CvsF3.gif b/doxygen/img/Dspace_CvsF3.gif
new file mode 100644
index 0000000..59c31ff
--- /dev/null
+++ b/doxygen/img/Dspace_CvsF3.gif
diff --git a/doxygen/img/Dspace_CvsF4.gif b/doxygen/img/Dspace_CvsF4.gif
new file mode 100644
index 0000000..e97b006
--- /dev/null
+++ b/doxygen/img/Dspace_CvsF4.gif
diff --git a/doxygen/img/Dspace_combine.gif b/doxygen/img/Dspace_combine.gif
new file mode 100644
index 0000000..8da2397
--- /dev/null
+++ b/doxygen/img/Dspace_combine.gif
diff --git a/doxygen/img/Dspace_complex.gif b/doxygen/img/Dspace_complex.gif
new file mode 100644
index 0000000..53e92ee
--- /dev/null
+++ b/doxygen/img/Dspace_complex.gif
diff --git a/doxygen/img/Dspace_features.gif b/doxygen/img/Dspace_features.gif
new file mode 100644
index 0000000..d94b4e4
--- /dev/null
+++ b/doxygen/img/Dspace_features.gif
diff --git a/doxygen/img/Dspace_features_cmpd.gif b/doxygen/img/Dspace_features_cmpd.gif
new file mode 100644
index 0000000..f24ee99
--- /dev/null
+++ b/doxygen/img/Dspace_features_cmpd.gif
diff --git a/doxygen/img/Dspace_move.gif b/doxygen/img/Dspace_move.gif
new file mode 100644
index 0000000..5debd75
--- /dev/null
+++ b/doxygen/img/Dspace_move.gif
diff --git a/doxygen/img/Dspace_point.gif b/doxygen/img/Dspace_point.gif
new file mode 100644
index 0000000..92ad3a8
--- /dev/null
+++ b/doxygen/img/Dspace_point.gif
diff --git a/doxygen/img/Dspace_read.gif b/doxygen/img/Dspace_read.gif
new file mode 100644
index 0000000..28c67f4
--- /dev/null
+++ b/doxygen/img/Dspace_read.gif
diff --git a/doxygen/img/Dspace_select.gif b/doxygen/img/Dspace_select.gif
new file mode 100644
index 0000000..b9f4851
--- /dev/null
+++ b/doxygen/img/Dspace_select.gif
diff --git a/doxygen/img/Dspace_separate.gif b/doxygen/img/Dspace_separate.gif
new file mode 100644
index 0000000..ba4ba8c
--- /dev/null
+++ b/doxygen/img/Dspace_separate.gif
diff --git a/doxygen/img/Dspace_simple.gif b/doxygen/img/Dspace_simple.gif
new file mode 100644
index 0000000..ff3eca5
--- /dev/null
+++ b/doxygen/img/Dspace_simple.gif
diff --git a/doxygen/img/Dspace_subset.gif b/doxygen/img/Dspace_subset.gif
new file mode 100644
index 0000000..b353175
--- /dev/null
+++ b/doxygen/img/Dspace_subset.gif
diff --git a/doxygen/img/Dspace_three_datasets.gif b/doxygen/img/Dspace_three_datasets.gif
new file mode 100644
index 0000000..4af222f
--- /dev/null
+++ b/doxygen/img/Dspace_three_datasets.gif
diff --git a/doxygen/img/Dspace_transfer.gif b/doxygen/img/Dspace_transfer.gif
new file mode 100644
index 0000000..7de0231
--- /dev/null
+++ b/doxygen/img/Dspace_transfer.gif
diff --git a/doxygen/img/Dspace_write1to2.gif b/doxygen/img/Dspace_write1to2.gif
new file mode 100644
index 0000000..5735bc7
--- /dev/null
+++ b/doxygen/img/Dspace_write1to2.gif
diff --git a/doxygen/img/Dtypes_fig1.gif b/doxygen/img/Dtypes_fig1.gif
new file mode 100644
index 0000000..484f54f
--- /dev/null
+++ b/doxygen/img/Dtypes_fig1.gif
diff --git a/doxygen/img/Dtypes_fig10.gif b/doxygen/img/Dtypes_fig10.gif
new file mode 100644
index 0000000..60c8ba9
--- /dev/null
+++ b/doxygen/img/Dtypes_fig10.gif
diff --git a/doxygen/img/Dtypes_fig11.gif b/doxygen/img/Dtypes_fig11.gif
new file mode 100644
index 0000000..b5eda71
--- /dev/null
+++ b/doxygen/img/Dtypes_fig11.gif
diff --git a/doxygen/img/Dtypes_fig12.gif b/doxygen/img/Dtypes_fig12.gif
new file mode 100644
index 0000000..ee911b7
--- /dev/null
+++ b/doxygen/img/Dtypes_fig12.gif
diff --git a/doxygen/img/Dtypes_fig13a.gif b/doxygen/img/Dtypes_fig13a.gif
new file mode 100644
index 0000000..2f47b71
--- /dev/null
+++ b/doxygen/img/Dtypes_fig13a.gif
diff --git a/doxygen/img/Dtypes_fig13b.gif b/doxygen/img/Dtypes_fig13b.gif
new file mode 100644
index 0000000..fe3b5fb
--- /dev/null
+++ b/doxygen/img/Dtypes_fig13b.gif
diff --git a/doxygen/img/Dtypes_fig13c.gif b/doxygen/img/Dtypes_fig13c.gif
new file mode 100644
index 0000000..afd2834
--- /dev/null
+++ b/doxygen/img/Dtypes_fig13c.gif
diff --git a/doxygen/img/Dtypes_fig13d.gif b/doxygen/img/Dtypes_fig13d.gif
new file mode 100644
index 0000000..48805d8
--- /dev/null
+++ b/doxygen/img/Dtypes_fig13d.gif
diff --git a/doxygen/img/Dtypes_fig14.gif b/doxygen/img/Dtypes_fig14.gif
new file mode 100644
index 0000000..8f4d787
--- /dev/null
+++ b/doxygen/img/Dtypes_fig14.gif
diff --git a/doxygen/img/Dtypes_fig15.gif b/doxygen/img/Dtypes_fig15.gif
new file mode 100644
index 0000000..82a34d0
--- /dev/null
+++ b/doxygen/img/Dtypes_fig15.gif
diff --git a/doxygen/img/Dtypes_fig16.gif b/doxygen/img/Dtypes_fig16.gif
new file mode 100644
index 0000000..e83d379
--- /dev/null
+++ b/doxygen/img/Dtypes_fig16.gif
diff --git a/doxygen/img/Dtypes_fig16a.gif b/doxygen/img/Dtypes_fig16a.gif
new file mode 100644
index 0000000..7e68cc0
--- /dev/null
+++ b/doxygen/img/Dtypes_fig16a.gif
diff --git a/doxygen/img/Dtypes_fig16b.gif b/doxygen/img/Dtypes_fig16b.gif
new file mode 100644
index 0000000..b7919be
--- /dev/null
+++ b/doxygen/img/Dtypes_fig16b.gif
diff --git a/doxygen/img/Dtypes_fig16c.gif b/doxygen/img/Dtypes_fig16c.gif
new file mode 100644
index 0000000..cca285a
--- /dev/null
+++ b/doxygen/img/Dtypes_fig16c.gif
diff --git a/doxygen/img/Dtypes_fig16d.gif b/doxygen/img/Dtypes_fig16d.gif
new file mode 100644
index 0000000..8ca0fd7
--- /dev/null
+++ b/doxygen/img/Dtypes_fig16d.gif
diff --git a/doxygen/img/Dtypes_fig17a.gif b/doxygen/img/Dtypes_fig17a.gif
new file mode 100644
index 0000000..cdfaa29
--- /dev/null
+++ b/doxygen/img/Dtypes_fig17a.gif
diff --git a/doxygen/img/Dtypes_fig17b.gif b/doxygen/img/Dtypes_fig17b.gif
new file mode 100644
index 0000000..4a3ba33
--- /dev/null
+++ b/doxygen/img/Dtypes_fig17b.gif
diff --git a/doxygen/img/Dtypes_fig18.gif b/doxygen/img/Dtypes_fig18.gif
new file mode 100644
index 0000000..73c33e0
--- /dev/null
+++ b/doxygen/img/Dtypes_fig18.gif
diff --git a/doxygen/img/Dtypes_fig19.gif b/doxygen/img/Dtypes_fig19.gif
new file mode 100644
index 0000000..38ea6d4
--- /dev/null
+++ b/doxygen/img/Dtypes_fig19.gif
diff --git a/doxygen/img/Dtypes_fig2.gif b/doxygen/img/Dtypes_fig2.gif
new file mode 100644
index 0000000..52285a6
--- /dev/null
+++ b/doxygen/img/Dtypes_fig2.gif
diff --git a/doxygen/img/Dtypes_fig20a.gif b/doxygen/img/Dtypes_fig20a.gif
new file mode 100644
index 0000000..8406e77
--- /dev/null
+++ b/doxygen/img/Dtypes_fig20a.gif
diff --git a/doxygen/img/Dtypes_fig20b.gif b/doxygen/img/Dtypes_fig20b.gif
new file mode 100644
index 0000000..3f2331d
--- /dev/null
+++ b/doxygen/img/Dtypes_fig20b.gif
diff --git a/doxygen/img/Dtypes_fig20c.gif b/doxygen/img/Dtypes_fig20c.gif
new file mode 100644
index 0000000..5b60165
--- /dev/null
+++ b/doxygen/img/Dtypes_fig20c.gif
diff --git a/doxygen/img/Dtypes_fig20d.gif b/doxygen/img/Dtypes_fig20d.gif
new file mode 100644
index 0000000..fdcb59a
--- /dev/null
+++ b/doxygen/img/Dtypes_fig20d.gif
diff --git a/doxygen/img/Dtypes_fig21.gif b/doxygen/img/Dtypes_fig21.gif
new file mode 100644
index 0000000..6d30528
--- /dev/null
+++ b/doxygen/img/Dtypes_fig21.gif
diff --git a/doxygen/img/Dtypes_fig22.gif b/doxygen/img/Dtypes_fig22.gif
new file mode 100644
index 0000000..5e2ca99
--- /dev/null
+++ b/doxygen/img/Dtypes_fig22.gif
diff --git a/doxygen/img/Dtypes_fig23.gif b/doxygen/img/Dtypes_fig23.gif
new file mode 100644
index 0000000..f0c9882
--- /dev/null
+++ b/doxygen/img/Dtypes_fig23.gif
diff --git a/doxygen/img/Dtypes_fig24.gif b/doxygen/img/Dtypes_fig24.gif
new file mode 100644
index 0000000..a1c28f4
--- /dev/null
+++ b/doxygen/img/Dtypes_fig24.gif
diff --git a/doxygen/img/Dtypes_fig25a.gif b/doxygen/img/Dtypes_fig25a.gif
new file mode 100644
index 0000000..16d3bcc
--- /dev/null
+++ b/doxygen/img/Dtypes_fig25a.gif
diff --git a/doxygen/img/Dtypes_fig25c.gif b/doxygen/img/Dtypes_fig25c.gif
new file mode 100644
index 0000000..a625b74
--- /dev/null
+++ b/doxygen/img/Dtypes_fig25c.gif
diff --git a/doxygen/img/Dtypes_fig26.gif b/doxygen/img/Dtypes_fig26.gif
new file mode 100644
index 0000000..24b34fb
--- /dev/null
+++ b/doxygen/img/Dtypes_fig26.gif
diff --git a/doxygen/img/Dtypes_fig27.gif b/doxygen/img/Dtypes_fig27.gif
new file mode 100644
index 0000000..71f182a
--- /dev/null
+++ b/doxygen/img/Dtypes_fig27.gif
diff --git a/doxygen/img/Dtypes_fig28.gif b/doxygen/img/Dtypes_fig28.gif
new file mode 100644
index 0000000..56d8d1b
--- /dev/null
+++ b/doxygen/img/Dtypes_fig28.gif
diff --git a/doxygen/img/Dtypes_fig3.gif b/doxygen/img/Dtypes_fig3.gif
new file mode 100644
index 0000000..993d12e
--- /dev/null
+++ b/doxygen/img/Dtypes_fig3.gif
diff --git a/doxygen/img/Dtypes_fig4.gif b/doxygen/img/Dtypes_fig4.gif
new file mode 100644
index 0000000..67aedef
--- /dev/null
+++ b/doxygen/img/Dtypes_fig4.gif
diff --git a/doxygen/img/Dtypes_fig5.gif b/doxygen/img/Dtypes_fig5.gif
new file mode 100644
index 0000000..075417d
--- /dev/null
+++ b/doxygen/img/Dtypes_fig5.gif
diff --git a/doxygen/img/Dtypes_fig6.gif b/doxygen/img/Dtypes_fig6.gif
new file mode 100644
index 0000000..516ab95
--- /dev/null
+++ b/doxygen/img/Dtypes_fig6.gif
diff --git a/doxygen/img/Dtypes_fig7.gif b/doxygen/img/Dtypes_fig7.gif
new file mode 100644
index 0000000..c18e9dc
--- /dev/null
+++ b/doxygen/img/Dtypes_fig7.gif
diff --git a/doxygen/img/Dtypes_fig8.gif b/doxygen/img/Dtypes_fig8.gif
new file mode 100644
index 0000000..d75d998
--- /dev/null
+++ b/doxygen/img/Dtypes_fig8.gif
diff --git a/doxygen/img/Dtypes_fig9.gif b/doxygen/img/Dtypes_fig9.gif
new file mode 100644
index 0000000..873f0ab
--- /dev/null
+++ b/doxygen/img/Dtypes_fig9.gif
diff --git a/doxygen/img/FF-IH_FileGroup.gif b/doxygen/img/FF-IH_FileGroup.gif
new file mode 100644
index 0000000..b0d76f5
--- /dev/null
+++ b/doxygen/img/FF-IH_FileGroup.gif
diff --git a/doxygen/img/FF-IH_FileObject.gif b/doxygen/img/FF-IH_FileObject.gif
new file mode 100644
index 0000000..8eba623
--- /dev/null
+++ b/doxygen/img/FF-IH_FileObject.gif
diff --git a/doxygen/img/FileFormatSpecChunkDiagram.jpg b/doxygen/img/FileFormatSpecChunkDiagram.jpg
new file mode 100644
index 0000000..03fd90a
--- /dev/null
+++ b/doxygen/img/FileFormatSpecChunkDiagram.jpg
diff --git a/doxygen/img/Files_fig3.gif b/doxygen/img/Files_fig3.gif
new file mode 100644
index 0000000..6912f5c
--- /dev/null
+++ b/doxygen/img/Files_fig3.gif
diff --git a/doxygen/img/Files_fig4.gif b/doxygen/img/Files_fig4.gif
new file mode 100644
index 0000000..b4ff107
--- /dev/null
+++ b/doxygen/img/Files_fig4.gif
diff --git a/doxygen/img/Groups_fig1.gif b/doxygen/img/Groups_fig1.gif
new file mode 100644
index 0000000..193fff9
--- /dev/null
+++ b/doxygen/img/Groups_fig1.gif
diff --git a/doxygen/img/Groups_fig10_a.gif b/doxygen/img/Groups_fig10_a.gif
new file mode 100644
index 0000000..6595b34
--- /dev/null
+++ b/doxygen/img/Groups_fig10_a.gif
diff --git a/doxygen/img/Groups_fig10_b.gif b/doxygen/img/Groups_fig10_b.gif
new file mode 100644
index 0000000..9e7c234
--- /dev/null
+++ b/doxygen/img/Groups_fig10_b.gif
diff --git a/doxygen/img/Groups_fig10_c.gif b/doxygen/img/Groups_fig10_c.gif
new file mode 100644
index 0000000..20900ac
--- /dev/null
+++ b/doxygen/img/Groups_fig10_c.gif
diff --git a/doxygen/img/Groups_fig10_d.gif b/doxygen/img/Groups_fig10_d.gif
new file mode 100644
index 0000000..7251919
--- /dev/null
+++ b/doxygen/img/Groups_fig10_d.gif
diff --git a/doxygen/img/Groups_fig11_a.gif b/doxygen/img/Groups_fig11_a.gif
new file mode 100644
index 0000000..1d041d0
--- /dev/null
+++ b/doxygen/img/Groups_fig11_a.gif
diff --git a/doxygen/img/Groups_fig11_b.gif b/doxygen/img/Groups_fig11_b.gif
new file mode 100644
index 0000000..732109b
--- /dev/null
+++ b/doxygen/img/Groups_fig11_b.gif
diff --git a/doxygen/img/Groups_fig11_c.gif b/doxygen/img/Groups_fig11_c.gif
new file mode 100644
index 0000000..f1444eb
--- /dev/null
+++ b/doxygen/img/Groups_fig11_c.gif
diff --git a/doxygen/img/Groups_fig11_d.gif b/doxygen/img/Groups_fig11_d.gif
new file mode 100644
index 0000000..ee1b740
--- /dev/null
+++ b/doxygen/img/Groups_fig11_d.gif
diff --git a/doxygen/img/Groups_fig2.gif b/doxygen/img/Groups_fig2.gif
new file mode 100644
index 0000000..d14b0ff
--- /dev/null
+++ b/doxygen/img/Groups_fig2.gif
diff --git a/doxygen/img/Groups_fig3.gif b/doxygen/img/Groups_fig3.gif
new file mode 100644
index 0000000..aaa1fe7
--- /dev/null
+++ b/doxygen/img/Groups_fig3.gif
diff --git a/doxygen/img/Groups_fig4.gif b/doxygen/img/Groups_fig4.gif
new file mode 100644
index 0000000..a077bf3
--- /dev/null
+++ b/doxygen/img/Groups_fig4.gif
diff --git a/doxygen/img/Groups_fig5.gif b/doxygen/img/Groups_fig5.gif
new file mode 100644
index 0000000..55ddc3c
--- /dev/null
+++ b/doxygen/img/Groups_fig5.gif
diff --git a/doxygen/img/Groups_fig6.gif b/doxygen/img/Groups_fig6.gif
new file mode 100644
index 0000000..53a18d4
--- /dev/null
+++ b/doxygen/img/Groups_fig6.gif
diff --git a/doxygen/img/Groups_fig9_a.gif b/doxygen/img/Groups_fig9_a.gif
new file mode 100644
index 0000000..af0ab69
--- /dev/null
+++ b/doxygen/img/Groups_fig9_a.gif
diff --git a/doxygen/img/Groups_fig9_aa.gif b/doxygen/img/Groups_fig9_aa.gif
new file mode 100644
index 0000000..43ed356
--- /dev/null
+++ b/doxygen/img/Groups_fig9_aa.gif
diff --git a/doxygen/img/Groups_fig9_b.gif b/doxygen/img/Groups_fig9_b.gif
new file mode 100644
index 0000000..b07ec9c
--- /dev/null
+++ b/doxygen/img/Groups_fig9_b.gif
diff --git a/doxygen/img/Groups_fig9_bb.gif b/doxygen/img/Groups_fig9_bb.gif
new file mode 100644
index 0000000..e13f534
--- /dev/null
+++ b/doxygen/img/Groups_fig9_bb.gif
diff --git a/doxygen/img/HDF5.png b/doxygen/img/HDF5.png
new file mode 100644
index 0000000..0458fa8
--- /dev/null
+++ b/doxygen/img/HDF5.png
diff --git a/doxygen/img/HDFG-logo.png b/doxygen/img/HDFG-logo.png
new file mode 100644
index 0000000..38300ff
--- /dev/null
+++ b/doxygen/img/HDFG-logo.png
diff --git a/doxygen/img/IOFlow.gif b/doxygen/img/IOFlow.gif
new file mode 100644
index 0000000..3e79030
--- /dev/null
+++ b/doxygen/img/IOFlow.gif
diff --git a/doxygen/img/IOFlow2.gif b/doxygen/img/IOFlow2.gif
new file mode 100644
index 0000000..c75ca79
--- /dev/null
+++ b/doxygen/img/IOFlow2.gif
diff --git a/doxygen/img/IOFlow3.gif b/doxygen/img/IOFlow3.gif
new file mode 100644
index 0000000..316cd1e
--- /dev/null
+++ b/doxygen/img/IOFlow3.gif
diff --git a/doxygen/img/LBDsetSubRWProg.png b/doxygen/img/LBDsetSubRWProg.png
new file mode 100644
index 0000000..4627740
--- /dev/null
+++ b/doxygen/img/LBDsetSubRWProg.png
diff --git a/doxygen/img/PaletteExample1.gif b/doxygen/img/PaletteExample1.gif
new file mode 100644
index 0000000..8694d9d
--- /dev/null
+++ b/doxygen/img/PaletteExample1.gif
diff --git a/doxygen/img/Palettes.fm.anc.gif b/doxygen/img/Palettes.fm.anc.gif
new file mode 100644
index 0000000..d344c03
--- /dev/null
+++ b/doxygen/img/Palettes.fm.anc.gif
diff --git a/doxygen/img/Pmodel_fig2.gif b/doxygen/img/Pmodel_fig2.gif
new file mode 100644
index 0000000..8be15fb
--- /dev/null
+++ b/doxygen/img/Pmodel_fig2.gif
diff --git a/doxygen/img/Pmodel_fig3.gif b/doxygen/img/Pmodel_fig3.gif
new file mode 100644
index 0000000..211f2ab
--- /dev/null
+++ b/doxygen/img/Pmodel_fig3.gif
diff --git a/doxygen/img/Pmodel_fig5_a.gif b/doxygen/img/Pmodel_fig5_a.gif
new file mode 100644
index 0000000..6607b1c
--- /dev/null
+++ b/doxygen/img/Pmodel_fig5_a.gif
diff --git a/doxygen/img/Pmodel_fig5_b.gif b/doxygen/img/Pmodel_fig5_b.gif
new file mode 100644
index 0000000..548df28
--- /dev/null
+++ b/doxygen/img/Pmodel_fig5_b.gif
diff --git a/doxygen/img/Pmodel_fig5_c.gif b/doxygen/img/Pmodel_fig5_c.gif
new file mode 100644
index 0000000..459bc66
--- /dev/null
+++ b/doxygen/img/Pmodel_fig5_c.gif
diff --git a/doxygen/img/Pmodel_fig5_d.gif b/doxygen/img/Pmodel_fig5_d.gif
new file mode 100644
index 0000000..207350d
--- /dev/null
+++ b/doxygen/img/Pmodel_fig5_d.gif
diff --git a/doxygen/img/Pmodel_fig5_e.gif b/doxygen/img/Pmodel_fig5_e.gif
new file mode 100644
index 0000000..ee4f656
--- /dev/null
+++ b/doxygen/img/Pmodel_fig5_e.gif
diff --git a/doxygen/img/Pmodel_fig6.gif b/doxygen/img/Pmodel_fig6.gif
new file mode 100644
index 0000000..2dac825
--- /dev/null
+++ b/doxygen/img/Pmodel_fig6.gif
diff --git a/doxygen/img/PropListClassInheritance.gif b/doxygen/img/PropListClassInheritance.gif
new file mode 100644
index 0000000..c6f0309
--- /dev/null
+++ b/doxygen/img/PropListClassInheritance.gif
diff --git a/doxygen/img/PropListEcosystem.gif b/doxygen/img/PropListEcosystem.gif
new file mode 100644
index 0000000..cf77ba4
--- /dev/null
+++ b/doxygen/img/PropListEcosystem.gif
diff --git a/doxygen/img/Shared_Attribute.jpg b/doxygen/img/Shared_Attribute.jpg
new file mode 100644
index 0000000..058eeec
--- /dev/null
+++ b/doxygen/img/Shared_Attribute.jpg
diff --git a/doxygen/img/StormDataset.png b/doxygen/img/StormDataset.png
new file mode 100644
index 0000000..da44335
--- /dev/null
+++ b/doxygen/img/StormDataset.png
diff --git a/doxygen/img/UML_Attribute.jpg b/doxygen/img/UML_Attribute.jpg
new file mode 100644
index 0000000..5b3db7d
--- /dev/null
+++ b/doxygen/img/UML_Attribute.jpg
diff --git a/doxygen/img/UML_FileAndProps.gif b/doxygen/img/UML_FileAndProps.gif
new file mode 100644
index 0000000..1de96c6
--- /dev/null
+++ b/doxygen/img/UML_FileAndProps.gif
diff --git a/doxygen/img/VFL_Drivers.gif b/doxygen/img/VFL_Drivers.gif
new file mode 100644
index 0000000..4b626c6
--- /dev/null
+++ b/doxygen/img/VFL_Drivers.gif
diff --git a/doxygen/img/cmpnddtype.png b/doxygen/img/cmpnddtype.png
new file mode 100644
index 0000000..53b4afd
--- /dev/null
+++ b/doxygen/img/cmpnddtype.png
diff --git a/doxygen/img/crtatt.png b/doxygen/img/crtatt.png
new file mode 100644
index 0000000..93ac36c
--- /dev/null
+++ b/doxygen/img/crtatt.png
diff --git a/doxygen/img/crtdset.png b/doxygen/img/crtdset.png
new file mode 100644
index 0000000..9cc3085
--- /dev/null
+++ b/doxygen/img/crtdset.png
diff --git a/doxygen/img/crtf-pic.png b/doxygen/img/crtf-pic.png
new file mode 100644
index 0000000..f7c49b8
--- /dev/null
+++ b/doxygen/img/crtf-pic.png
diff --git a/doxygen/img/crtgrp.png b/doxygen/img/crtgrp.png
new file mode 100644
index 0000000..506bc68
--- /dev/null
+++ b/doxygen/img/crtgrp.png
diff --git a/doxygen/img/dataset.png b/doxygen/img/dataset.png
new file mode 100644
index 0000000..1524417
--- /dev/null
+++ b/doxygen/img/dataset.png
diff --git a/doxygen/img/datasetwdata.png b/doxygen/img/datasetwdata.png
new file mode 100644
index 0000000..5f03827
--- /dev/null
+++ b/doxygen/img/datasetwdata.png
diff --git a/doxygen/img/dataspace.png b/doxygen/img/dataspace.png
new file mode 100644
index 0000000..95e0b7d
--- /dev/null
+++ b/doxygen/img/dataspace.png
diff --git a/doxygen/img/dataspace1.png b/doxygen/img/dataspace1.png
new file mode 100644
index 0000000..f21a5f5
--- /dev/null
+++ b/doxygen/img/dataspace1.png
diff --git a/doxygen/img/datatype.png b/doxygen/img/datatype.png
new file mode 100644
index 0000000..6ea5732
--- /dev/null
+++ b/doxygen/img/datatype.png
diff --git a/doxygen/img/dtypes_fig25b.gif b/doxygen/img/dtypes_fig25b.gif
new file mode 100644
index 0000000..9dbc225
--- /dev/null
+++ b/doxygen/img/dtypes_fig25b.gif
diff --git a/doxygen/img/fileobj.png b/doxygen/img/fileobj.png
new file mode 100644
index 0000000..ae5212d
--- /dev/null
+++ b/doxygen/img/fileobj.png
diff --git a/doxygen/img/ftv2node.png b/doxygen/img/ftv2node.png
new file mode 100644
index 0000000..63c605b
--- /dev/null
+++ b/doxygen/img/ftv2node.png
diff --git a/doxygen/img/ftv2pnode.png b/doxygen/img/ftv2pnode.png
new file mode 100644
index 0000000..c6ee22f
--- /dev/null
+++ b/doxygen/img/ftv2pnode.png
diff --git a/doxygen/img/group.png b/doxygen/img/group.png
new file mode 100644
index 0000000..7fec7fc
--- /dev/null
+++ b/doxygen/img/group.png
diff --git a/doxygen/img/hdfview-anthrstrm-img.png b/doxygen/img/hdfview-anthrstrm-img.png
new file mode 100644
index 0000000..add4e48
--- /dev/null
+++ b/doxygen/img/hdfview-anthrstrm-img.png
diff --git a/doxygen/img/hdfview-anthrstrm-sprdsht.png b/doxygen/img/hdfview-anthrstrm-sprdsht.png
new file mode 100644
index 0000000..4584fd5
--- /dev/null
+++ b/doxygen/img/hdfview-anthrstrm-sprdsht.png
diff --git a/doxygen/img/hdfview-anthrstrm.png b/doxygen/img/hdfview-anthrstrm.png
new file mode 100644
index 0000000..afc2de3
--- /dev/null
+++ b/doxygen/img/hdfview-anthrstrm.png
diff --git a/doxygen/img/hdfview-imgicon.png b/doxygen/img/hdfview-imgicon.png
new file mode 100644
index 0000000..f189080
--- /dev/null
+++ b/doxygen/img/hdfview-imgicon.png
diff --git a/doxygen/img/hdfview-imgprop.png b/doxygen/img/hdfview-imgprop.png
new file mode 100644
index 0000000..717727b
--- /dev/null
+++ b/doxygen/img/hdfview-imgprop.png
diff --git a/doxygen/img/hdfview-imgsubset.png b/doxygen/img/hdfview-imgsubset.png
new file mode 100644
index 0000000..19cec57
--- /dev/null
+++ b/doxygen/img/hdfview-imgsubset.png
diff --git a/doxygen/img/hdfview-newcmpd.png b/doxygen/img/hdfview-newcmpd.png
new file mode 100644
index 0000000..b07b5f8
--- /dev/null
+++ b/doxygen/img/hdfview-newcmpd.png
diff --git a/doxygen/img/hdfview-newimgsubset.png b/doxygen/img/hdfview-newimgsubset.png
new file mode 100644
index 0000000..fd16b23
--- /dev/null
+++ b/doxygen/img/hdfview-newimgsubset.png
diff --git a/doxygen/img/hdfview-prop.png b/doxygen/img/hdfview-prop.png
new file mode 100644
index 0000000..16c0904
--- /dev/null
+++ b/doxygen/img/hdfview-prop.png
diff --git a/doxygen/img/hdfview-qf.png b/doxygen/img/hdfview-qf.png
new file mode 100644
index 0000000..edc371f
--- /dev/null
+++ b/doxygen/img/hdfview-qf.png
diff --git a/doxygen/img/hdfview-regref.png b/doxygen/img/hdfview-regref.png
new file mode 100644
index 0000000..7f2b02a
--- /dev/null
+++ b/doxygen/img/hdfview-regref.png
diff --git a/doxygen/img/hdfview-regref1.png b/doxygen/img/hdfview-regref1.png
new file mode 100644
index 0000000..f754931
--- /dev/null
+++ b/doxygen/img/hdfview-regref1.png
diff --git a/doxygen/img/hdfview-regref2.png b/doxygen/img/hdfview-regref2.png
new file mode 100644
index 0000000..5a73c01
--- /dev/null
+++ b/doxygen/img/hdfview-regref2.png
diff --git a/doxygen/img/hdfview-regrefval.png b/doxygen/img/hdfview-regrefval.png
new file mode 100644
index 0000000..e0a666b
--- /dev/null
+++ b/doxygen/img/hdfview-regrefval.png
diff --git a/doxygen/img/hdfview-table.png b/doxygen/img/hdfview-table.png
new file mode 100644
index 0000000..69301bc
--- /dev/null
+++ b/doxygen/img/hdfview-table.png
diff --git a/doxygen/img/hdfview-tree.png b/doxygen/img/hdfview-tree.png
new file mode 100644
index 0000000..8ba2621
--- /dev/null
+++ b/doxygen/img/hdfview-tree.png
diff --git a/doxygen/img/imgLBDsetCreate.gif b/doxygen/img/imgLBDsetCreate.gif
new file mode 100644
index 0000000..67585ef
--- /dev/null
+++ b/doxygen/img/imgLBDsetCreate.gif
diff --git a/doxygen/img/imgLBDsetSubRW11.png b/doxygen/img/imgLBDsetSubRW11.png
new file mode 100644
index 0000000..8b1df86
--- /dev/null
+++ b/doxygen/img/imgLBDsetSubRW11.png
diff --git a/doxygen/img/imgLBDsetSubRW12.png b/doxygen/img/imgLBDsetSubRW12.png
new file mode 100644
index 0000000..976966a
--- /dev/null
+++ b/doxygen/img/imgLBDsetSubRW12.png
diff --git a/doxygen/img/imgLBDsetSubRW31.png b/doxygen/img/imgLBDsetSubRW31.png
new file mode 100644
index 0000000..31d5098
--- /dev/null
+++ b/doxygen/img/imgLBDsetSubRW31.png
diff --git a/doxygen/img/imgLBDsetSubRW32.png b/doxygen/img/imgLBDsetSubRW32.png
new file mode 100644
index 0000000..f7d82fd
--- /dev/null
+++ b/doxygen/img/imgLBDsetSubRW32.png
diff --git a/doxygen/img/imgLBDsetSubRW33.png b/doxygen/img/imgLBDsetSubRW33.png
new file mode 100644
index 0000000..69a368b
--- /dev/null
+++ b/doxygen/img/imgLBDsetSubRW33.png
diff --git a/doxygen/img/imgLBFile.gif b/doxygen/img/imgLBFile.gif
new file mode 100644
index 0000000..b79c6d6
--- /dev/null
+++ b/doxygen/img/imgLBFile.gif
diff --git a/doxygen/img/imggrpcreate.gif b/doxygen/img/imggrpcreate.gif
new file mode 100644
index 0000000..ac1dcf9
--- /dev/null
+++ b/doxygen/img/imggrpcreate.gif
diff --git a/doxygen/img/imggrpdsets.gif b/doxygen/img/imggrpdsets.gif
new file mode 100644
index 0000000..3383dc6
--- /dev/null
+++ b/doxygen/img/imggrpdsets.gif
diff --git a/doxygen/img/imggrps.gif b/doxygen/img/imggrps.gif
new file mode 100644
index 0000000..d48dbab
--- /dev/null
+++ b/doxygen/img/imggrps.gif
diff --git a/doxygen/img/newgroupimage.png b/doxygen/img/newgroupimage.png
new file mode 100644
index 0000000..7bc4c90
--- /dev/null
+++ b/doxygen/img/newgroupimage.png
diff --git a/doxygen/img/noattrs.png b/doxygen/img/noattrs.png
new file mode 100644
index 0000000..13abcc5
--- /dev/null
+++ b/doxygen/img/noattrs.png
diff --git a/doxygen/img/properties.png b/doxygen/img/properties.png
new file mode 100644
index 0000000..083dc14
--- /dev/null
+++ b/doxygen/img/properties.png
diff --git a/doxygen/img/scarletletter.png b/doxygen/img/scarletletter.png
new file mode 100644
index 0000000..7c5d2e6
--- /dev/null
+++ b/doxygen/img/scarletletter.png
diff --git a/doxygen/img/showasimage.png b/doxygen/img/showasimage.png
new file mode 100644
index 0000000..8377292
--- /dev/null
+++ b/doxygen/img/showasimage.png
diff --git a/doxygen/img/storm.png b/doxygen/img/storm.png
new file mode 100644
index 0000000..769b037
--- /dev/null
+++ b/doxygen/img/storm.png
diff --git a/doxygen/img/tutr-lochk.png b/doxygen/img/tutr-lochk.png
new file mode 100644
index 0000000..297cd6d
--- /dev/null
+++ b/doxygen/img/tutr-lochk.png
diff --git a/doxygen/img/tutr-lochks.png b/doxygen/img/tutr-lochks.png
new file mode 100644
index 0000000..477fc1d
--- /dev/null
+++ b/doxygen/img/tutr-lochks.png
diff --git a/doxygen/img/tutr-locons.png b/doxygen/img/tutr-locons.png
new file mode 100644
index 0000000..bea5be4
--- /dev/null
+++ b/doxygen/img/tutr-locons.png
diff --git a/doxygen/img/vol_architecture.png b/doxygen/img/vol_architecture.png
new file mode 100755
index 0000000..10e5596
--- /dev/null
+++ b/doxygen/img/vol_architecture.png
diff --git a/examples/Attributes.txt b/examples/Attributes.txt
index 0f25f68..6cba42b 100644
--- a/examples/Attributes.txt
+++ b/examples/Attributes.txt
@@ -1,4 +1,4 @@
-Attribute Examples: 
+Attribute Examples:
 
 H5Acreate2 example: Show how to create an attribute for a dataset and a group
 ----------------
@@ -19,7 +19,7 @@ H5Acreate2 example: Show how to create an attribute for a dataset and a group
     rank=2;
     dimsf[0] = H5S_UNLIMITED;
     dimsf[1] = H5S_UNLIMITED;
-    dataspace = H5Screate_simple(rank, dimsf, NULL); 
+    dataspace = H5Screate_simple(rank, dimsf, NULL);
 
     /* Create a dataset */
     dataset = H5Dcreate2(file, "Dataset1", H5T_UINT8, dataspace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
@@ -122,7 +122,7 @@ H5Alink Example: Shows how to share an attribute between two datasets.
     /* Get the OID of the attribute */
     attr=H5Aopen(dataset1, "Foo", H5P_DEFAULT);
 
-    /* 
+    /*
      * Create an attribute in the second dataset to the attribute in dataset1,
      * changing the name of the attribute information in dataset2.
      */
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 1f33f04..10c6ede 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -1,10 +1,5 @@
-cmake_minimum_required (VERSION 3.1.0)
-PROJECT (HDF5_EXAMPLES)
-
-#-----------------------------------------------------------------------------
-# Apply Definitions to compiler in this directory and below
-#-----------------------------------------------------------------------------
-add_definitions (${HDF_EXTRA_C_FLAGS})
+cmake_minimum_required (VERSION 3.18)
+project (HDF5_EXAMPLES C)
 
 #-----------------------------------------------------------------------------
 # Define Sources
@@ -28,30 +23,79 @@ set (examples
     h5_select
     h5_attribute
     h5_mount
-    h5_reference
+    h5_ref_extern
+    h5_ref_compat
+    h5_reference_deprec
     h5_drivers
-    h5_ref2reg
+    h5_ref2reg_deprec
     h5_extlink
     h5_elink_unix2win
     h5_shared_mesg
+    h5_debug_trace
+    h5_vds
+    h5_vds-exc
+    h5_vds-exclim
+    h5_vds-eiger
+    h5_vds-simpleIO
+    h5_vds-percival
+    h5_vds-percival-unlim
+    h5_vds-percival-unlim-maxmin
 )
 
+if (H5_HAVE_PARALLEL)
+  set (parallel_examples
+    ph5example
+    ph5_filtered_writes
+    ph5_filtered_writes_no_sel
+  )
+
+  if (HDF5_ENABLE_SUBFILING_VFD)
+    list (APPEND parallel_examples ph5_subfiling)
+  endif ()
+endif ()
+
 foreach (example ${examples})
   add_executable (${example} ${HDF5_EXAMPLES_SOURCE_DIR}/${example}.c)
-  TARGET_NAMING (${example} ${LIB_TYPE})
-  TARGET_C_PROPERTIES (${example} ${LIB_TYPE} " " " ")
-  target_link_libraries (${example} ${HDF5_LIB_TARGET})
+  target_include_directories (${example} PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  if (NOT BUILD_SHARED_LIBS)
+    TARGET_C_PROPERTIES (${example} STATIC)
+    target_link_libraries (${example} PRIVATE ${HDF5_LIB_TARGET})
+  else ()
+    TARGET_C_PROPERTIES (${example} SHARED)
+    target_link_libraries (${example} PRIVATE ${HDF5_LIBSH_TARGET})
+  endif ()
   set_target_properties (${example} PROPERTIES FOLDER examples)
-endforeach (example ${examples})
+
+  #-----------------------------------------------------------------------------
+  # Add Target to clang-format
+  #-----------------------------------------------------------------------------
+  if (HDF5_ENABLE_FORMATTERS)
+    clang_format (HDF5_EXAMPLES_${example}_FORMAT ${example})
+  endif ()
+endforeach ()
 
 if (H5_HAVE_PARALLEL)
-  add_executable (ph5example ${HDF5_EXAMPLES_SOURCE_DIR}/ph5example.c)
-  TARGET_NAMING (ph5example ${LIB_TYPE})
-  TARGET_C_PROPERTIES (ph5example ${LIB_TYPE} " " " ")
-  target_link_libraries (ph5example ${HDF5_LIB_TARGET})
-  set_target_properties (ph5example PROPERTIES FOLDER examples)
-endif (H5_HAVE_PARALLEL)
-
-if (BUILD_TESTING)
+  foreach (parallel_example ${parallel_examples})
+    add_executable (${parallel_example} ${HDF5_EXAMPLES_SOURCE_DIR}/${parallel_example}.c)
+    target_include_directories (${parallel_example} PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+    if (NOT BUILD_SHARED_LIBS)
+      TARGET_C_PROPERTIES (${parallel_example} STATIC)
+      target_link_libraries (${parallel_example} PRIVATE ${HDF5_LIB_TARGET} MPI::MPI_C)
+    else ()
+      TARGET_C_PROPERTIES (${parallel_example} SHARED)
+      target_link_libraries (${parallel_example} PRIVATE ${HDF5_LIBSH_TARGET} MPI::MPI_C)
+    endif ()
+    set_target_properties (${parallel_example} PROPERTIES FOLDER examples)
+
+    #-----------------------------------------------------------------------------
+    # Add Target to clang-format
+    #-----------------------------------------------------------------------------
+    if (HDF5_ENABLE_FORMATTERS)
+      clang_format (HDF5_EXAMPLES_${parallel_example}_FORMAT ${parallel_example})
+    endif ()
+  endforeach ()
+endif ()
+
+if (BUILD_TESTING AND HDF5_TEST_EXAMPLES)
   include (CMakeTests.cmake)
-endif (BUILD_TESTING)
+endif ()
diff --git a/examples/CMakeTests.cmake b/examples/CMakeTests.cmake
index 5a756c8..e3552a2 100644
--- a/examples/CMakeTests.cmake
+++ b/examples/CMakeTests.cmake
@@ -1,66 +1,140 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
 
 ##############################################################################
 ##############################################################################
 ###           T E S T I N G                                                ###
 ##############################################################################
 ##############################################################################
-  file (MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/red ${PROJECT_BINARY_DIR}/blue ${PROJECT_BINARY_DIR}/u2w)
+file (MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/red ${PROJECT_BINARY_DIR}/blue ${PROJECT_BINARY_DIR}/u2w)
 
+set (test_ex_CLEANFILES
+    Attributes.h5
+    btrees_file.h5
+    cmprss.h5
+    default_file.h5
+    dset.h5
+    extend.h5
+    extlink_prefix_source.h5
+    extlink_source.h5
+    extlink_target.h5
+    group.h5
+    groups.h5
+    hard_link.h5
+    h5_subfiling_default_example.h5
+    h5_subfiling_custom_example.h5
+    mount1.h5
+    mount2.h5
+    one_index_file.h5
+    only_dspaces_and_attrs_file.h5
+    only_huge_mesgs_file.h5
+    REF_REG.h5
+    refere.h5
+    refer_deprec.h5
+    refer_extern1.h5
+    refer_extern2.h5
+    SDS.h5
+    SDScompound.h5
+    SDSextendible.h5
+    Select.h5
+    separate_indexes_file.h5
+    small_lists_file.h5
+    soft_link.h5
+    subset.h5
+    unix2win.h5
+    blue/prefix_target.h5
+    red/prefix_target.h5
+    u2w/u2w_target.h5
+    vds.h5
+    vds-exc.h5
+    vds-excalibur.h5
+    vds-exclim.h5
+    vds-percival.h5
+    vds-percival-unlim.h5
+    vds-percival-unlim-maxmin.h5
+    a.h5
+    b.h5
+    c.h5
+    d.h5
+    vds-simpleIO.h5
+    vds-eiger.h5
+)
+
+if (HDF5_TEST_SERIAL)
   # Remove any output file left over from previous test run
   add_test (
       NAME EXAMPLES-clear-objects
-      COMMAND    ${CMAKE_COMMAND}
-          -E remove 
-          Attributes.h5
-          btrees_file.h5
-          cmprss.h5
-          default_file.h5
-          dset.h5
-          extend.h5 
-          extlink_prefix_source.h5
-          extlink_source.h5
-          extlink_target.h5
-          group.h5
-          groups.h5
-          hard_link.h5
-          mount1.h5
-          mount2.h5
-          one_index_file.h5
-          only_dspaces_and_attrs_file.h5
-          only_huge_mesgs_file.h5
-          REF_REG.h5
-          refere.h5
-          SDS.h5
-          SDScompound.h5
-          SDSextendible.h5
-          Select.h5
-          separate_indexes_file.h5
-          small_lists_file.h5
-          soft_link.h5
-          subset.h5
-          unix2win.h5
-          blue/prefix_target.h5
-          red/prefix_target.h5
-          u2w/u2w_target.h5
+      COMMAND    ${CMAKE_COMMAND} -E remove ${test_ex_CLEANFILES}
+  )
+  set_tests_properties (EXAMPLES-clear-objects PROPERTIES
+      FIXTURES_SETUP clear_EXAMPLES
+      WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+  )
+  add_test (
+      NAME EXAMPLES-clean-objects
+      COMMAND    ${CMAKE_COMMAND} -E remove ${test_ex_CLEANFILES}
+  )
+  set_tests_properties (EXAMPLES-clean-objects PROPERTIES
+      FIXTURES_CLEANUP clear_EXAMPLES
+      WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
   )
-  if (NOT "${last_test}" STREQUAL "")
-    set_tests_properties (EXAMPLES-clear-objects PROPERTIES DEPENDS ${last_test})
-  endif (NOT "${last_test}" STREQUAL "")
-  set (last_test "EXAMPLES-clear-objects")
 
   foreach (example ${examples})
-    add_test (NAME EXAMPLES-${example} COMMAND $<TARGET_FILE:${example}>)
-    if (NOT "${last_test}" STREQUAL "")
+    if (HDF5_ENABLE_USING_MEMCHECKER)
+      add_test (NAME EXAMPLES-${example} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:${example}>)
+    else ()
+      add_test (NAME EXAMPLES-${example} COMMAND "${CMAKE_COMMAND}"
+          -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
+          -D "TEST_PROGRAM=$<TARGET_FILE:${example}>"
+          -D "TEST_ARGS:STRING="
+          -D "TEST_EXPECT=0"
+          -D "TEST_SKIP_COMPARE=TRUE"
+          -D "TEST_OUTPUT=${example}.txt"
+          -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+          -P "${HDF_RESOURCES_DIR}/runTest.cmake"
+      )
+    endif ()
+    set_tests_properties (EXAMPLES-${example} PROPERTIES FIXTURES_REQUIRED clear_EXAMPLES)
+    if (last_test)
       set_tests_properties (EXAMPLES-${example} PROPERTIES DEPENDS ${last_test})
-    endif (NOT "${last_test}" STREQUAL "")
+    endif ()
     set (last_test "EXAMPLES-${example}")
-  endforeach (example ${examples})
+  endforeach ()
+endif ()
 
 ### Windows pops up a modal permission dialog on this test
-  if (H5_HAVE_PARALLEL AND NOT WIN32)
-    add_test (NAME EXAMPLES-ph5example COMMAND $<TARGET_FILE:ph5example>)
-    if (NOT "${last_test}" STREQUAL "")
-      set_tests_properties (EXAMPLES-ph5example PROPERTIES DEPENDS ${last_test})
-    endif (NOT "${last_test}" STREQUAL "")
-    set (last_test "EXAMPLES-ph5example")
-  endif (H5_HAVE_PARALLEL AND NOT WIN32)
+if (H5_HAVE_PARALLEL AND HDF5_TEST_PARALLEL AND NOT WIN32)
+  # Ensure that 24 is a multiple of the number of processes.
+  # The number 24 corresponds to SPACE1_DIM1 and SPACE1_DIM2 defined in ph5example.c
+  math(EXPR NUMPROCS "24 / ((24 + ${MPIEXEC_MAX_NUMPROCS} - 1) / ${MPIEXEC_MAX_NUMPROCS})")
+
+  foreach (parallel_example ${parallel_examples})
+    if (HDF5_ENABLE_USING_MEMCHECKER)
+      add_test (NAME MPI_TEST_EXAMPLES-${parallel_example} COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:${parallel_example}> ${MPIEXEC_POSTFLAGS})
+    else ()
+      add_test (NAME MPI_TEST_EXAMPLES-${parallel_example} COMMAND "${CMAKE_COMMAND}"
+          -D "TEST_PROGRAM=${MPIEXEC_EXECUTABLE};${MPIEXEC_NUMPROC_FLAG};${NUMPROCS};${MPIEXEC_PREFLAGS};$<TARGET_FILE:${parallel_example}>;${MPIEXEC_POSTFLAGS}"
+          -D "TEST_ARGS:STRING="
+          -D "TEST_EXPECT=0"
+          -D "TEST_SKIP_COMPARE=TRUE"
+          -D "TEST_OUTPUT=${parallel_example}.out"
+          -D "TEST_REFERENCE:STRING=PHDF5 example finished with no errors"
+          -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+          -P "${HDF_RESOURCES_DIR}/grepTest.cmake"
+      )
+    endif ()
+    if (last_test)
+      set_tests_properties (MPI_TEST_EXAMPLES-${parallel_example} PROPERTIES DEPENDS ${last_test})
+    endif ()
+    set (last_test "MPI_TEST_EXAMPLES-${parallel_example}")
+  endforeach ()
+endif ()
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 5d0da93..a09042c 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,16 +1,13 @@
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 ##
 ## Makefile.am
 ## Run automake to generate a Makefile.in from this file.
@@ -22,7 +19,12 @@
 include $(top_srcdir)/config/commence.am
 
 if BUILD_PARALLEL_CONDITIONAL
-  EXAMPLE_PROG_PARA = ph5example
+  EXAMPLE_PROG_PARA = ph5example ph5_filtered_writes ph5_filtered_writes_no_sel
+
+if SUBFILING_VFD_CONDITIONAL
+  EXAMPLE_PROG_PARA += ph5_subfiling
+endif
+
 endif
 
 INSTALL_SCRIPT_FILES = run-c-ex.sh
@@ -34,21 +36,28 @@ INSTALL_TOP_FILES = README
 # it would try to compile them instead of using the h5cc script.
 # Use the boilerplate in config/examples.am instead.
 EXAMPLE_PROG = h5_write h5_read h5_extend_write h5_chunk_read h5_compound \
-           h5_crtgrpd h5_subset h5_cmprss h5_rdwt h5_crtgrpar h5_extend \
-           h5_crtatt h5_crtgrp h5_crtdat \
-           h5_group h5_select h5_attribute h5_mount h5_reference h5_drivers \
-           h5_ref2reg h5_extlink h5_elink_unix2win h5_shared_mesg
-TEST_SCRIPT=testh5cc.sh 
+            h5_crtgrpd h5_subset h5_cmprss h5_rdwt h5_crtgrpar h5_extend \
+            h5_crtatt h5_crtgrp h5_crtdat \
+            h5_group h5_select h5_attribute h5_mount h5_drivers \
+            h5_reference_deprec h5_ref_extern h5_ref_compat h5_ref2reg_deprec \
+            h5_extlink h5_elink_unix2win h5_shared_mesg h5_debug_trace \
+            h5_vds h5_vds-exc h5_vds-exclim h5_vds-eiger h5_vds-simpleIO \
+            h5_vds-percival h5_vds-percival-unlim h5_vds-percival-unlim-maxmin
+TEST_SCRIPT=testh5cc.sh
 TEST_EXAMPLES_SCRIPT=$(INSTALL_SCRIPT_FILES)
 
 # Install files
 # List all file that should be installed in examples directory
-INSTALL_FILES = h5_write.c h5_read.c h5_extend_write.c h5_chunk_read.c   \
-          h5_crtgrpd.c h5_subset.c h5_cmprss.c h5_rdwt.c h5_crtgrpar.c \
-          h5_extend.c h5_crtatt.c h5_crtgrp.c h5_crtdat.c \
-          h5_compound.c h5_group.c h5_select.c h5_attribute.c h5_mount.c \
-          h5_reference.c h5_drivers.c h5_extlink.c h5_elink_unix2win.c   \
-          h5_ref2reg.c h5_shared_mesg.c ph5example.c
+INSTALL_FILES = h5_write.c h5_read.c h5_extend_write.c h5_chunk_read.c h5_compound.c \
+            h5_crtgrpd.c h5_subset.c h5_cmprss.c h5_rdwt.c h5_crtgrpar.c h5_extend.c \
+            h5_crtatt.c h5_crtgrp.c h5_crtdat.c \
+            h5_group.c h5_select.c h5_attribute.c h5_mount.c h5_drivers.c \
+            h5_reference_deprec.c h5_ref_extern.c h5_ref_compat.c h5_ref2reg_deprec.c \
+            h5_extlink.c h5_elink_unix2win.c h5_shared_mesg.c h5_debug_trace.c \
+            ph5example.c ph5_filtered_writes.c ph5_filtered_writes_no_sel.c \
+            ph5_subfiling.c h5_vds.c h5_vds-exc.c h5_vds-exclim.c h5_vds-eiger.c \
+            h5_vds-simpleIO.c h5_vds-percival.c h5_vds-percival-unlim.c \
+            h5_vds-percival-unlim-maxmin.c
 
 
 
@@ -82,8 +91,8 @@ CHECK_CLEANFILES+=$(EXTLINK_DIRS)
 
 # Example directory
 # Note: no '/' after DESTDIR.  Explanation in commence.am
-EXAMPLEDIR=${DESTDIR}$(exec_prefix)/share/hdf5_examples/c
-EXAMPLETOPDIR=${DESTDIR}$(exec_prefix)/share/hdf5_examples
+EXAMPLEDIR=${DESTDIR}$(examplesdir)/c
+EXAMPLETOPDIR=${DESTDIR}$(examplesdir)
 
 # List dependencies for each program.  Normally, automake would take
 # care of this for us, but if we tell automake about the programs it
@@ -109,14 +118,27 @@ h5_read: $(srcdir)/h5_read.c
 h5_select: $(srcdir)/h5_select.c
 h5_attribute: $(srcdir)/h5_attribute.c
 h5_mount: $(srcdir)/h5_mount.c
-h5_reference: $(srcdir)/h5_reference.c
-h5_ref2reg: $(srcdir)/h5_ref2reg.c
+h5_ref_compat: $(srcdir)/h5_ref_compat.c
+h5_ref_extern: $(srcdir)/h5_ref_extern.c
+h5_reference_deprec: $(srcdir)/h5_reference_deprec.c
+h5_ref2reg_deprec: $(srcdir)/h5_ref2reg_deprec.c
 h5_drivers: $(srcdir)/h5_drivers.c
 ph5example: $(srcdir)/ph5example.c
+ph5_filtered_writes: $(srcdir)/ph5_filtered_writes.c
+ph5_filtered_writes_no_sel: $(srcdir)/ph5_filtered_writes_no_sel.c
+ph5_subfiling: $(srcdir)/ph5_subfiling.c
 h5_dtransform: $(srcdir)/h5_dtransform.c
 h5_extlink: $(srcdir)/h5_extlink.c $(EXTLINK_DIRS)
 h5_elink_unix2win: $(srcdir)/h5_elink_unix2win.c $(EXTLINK_DIRS)
 h5_shared_mesg: $(srcdir)/h5_shared_mesg.c
+h5_vds: $(srcdir)/h5_vds.c
+h5_vds-exc: $(srcdir)/h5_vds-exc.c
+h5_vds-exclim: $(srcdir)/h5_vds-exclim.c
+h5_vds-eiger: $(srcdir)/h5_vds-eiger.c
+h5_vds-simpleIO: $(srcdir)/h5_vds-simpleIO.c
+h5_vds-percival: $(srcdir)/h5_vds-percival.c
+h5_vds-percival-unlim: $(srcdir)/h5_vds-percival-unlim.c
+h5_vds-percival-unlim-maxmin: $(srcdir)/h5_vds-percival-unlim-maxmin.c
 
 if BUILD_SHARED_SZIP_CONDITIONAL
 LD_LIBRARY_PATH=$(LL_PATH)
diff --git a/examples/Makefile.in b/examples/Makefile.in
deleted file mode 100644
index f3d81dd..0000000
--- a/examples/Makefile.in
+++ /dev/null
@@ -1,1353 +0,0 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-#
-# HDF5 Library Examples Makefile(.in)
-#
-
-# We can't tell automake about example programs, because they need to be
-# built using h5cc (or h5fc, etc.) instead of the standard compilers.
-# This creates some extra work for us.
-VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-DIST_COMMON = $(top_srcdir)/config/commence.am \
-	$(top_srcdir)/config/examples.am \
-	$(top_srcdir)/config/conclude.am $(srcdir)/Makefile.in \
-	$(srcdir)/Makefile.am $(top_srcdir)/bin/mkinstalldirs \
-	$(srcdir)/run-c-ex.sh.in $(srcdir)/testh5cc.sh.in \
-	$(top_srcdir)/bin/test-driver README
-TESTS = $(TEST_SCRIPT)
-subdir = examples
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/aclocal_cxx.m4 \
-	$(top_srcdir)/m4/aclocal_fc.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/src/H5config.h
-CONFIG_CLEAN_FILES = run-c-ex.sh testh5cc.sh
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__tty_colors_dummy = \
-  mgn= red= grn= lgn= blu= brg= std=; \
-  am__color_tests=no
-am__tty_colors = { \
-  $(am__tty_colors_dummy); \
-  if test "X$(AM_COLOR_TESTS)" = Xno; then \
-    am__color_tests=no; \
-  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
-    am__color_tests=yes; \
-  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
-    am__color_tests=yes; \
-  fi; \
-  if test $$am__color_tests = yes; then \
-    red='[0;31m'; \
-    grn='[0;32m'; \
-    lgn='[1;32m'; \
-    blu='[1;34m'; \
-    mgn='[0;35m'; \
-    brg='[1m'; \
-    std='[m'; \
-  fi; \
-}
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__recheck_rx = ^[ 	]*:recheck:[ 	]*
-am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
-am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
-# A command that, given a newline-separated list of test names on the
-# standard input, print the name of the tests that are to be re-run
-# upon "make recheck".
-am__list_recheck_tests = $(AWK) '{ \
-  recheck = 1; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-        { \
-          if ((getline line2 < ($$0 ".log")) < 0) \
-	    recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
-        { \
-          recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
-        { \
-          break; \
-        } \
-    }; \
-  if (recheck) \
-    print $$0; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# A command that, given a newline-separated list of test names on the
-# standard input, create the global log from their .trs and .log files.
-am__create_global_log = $(AWK) ' \
-function fatal(msg) \
-{ \
-  print "fatal: making $@: " msg | "cat >&2"; \
-  exit 1; \
-} \
-function rst_section(header) \
-{ \
-  print header; \
-  len = length(header); \
-  for (i = 1; i <= len; i = i + 1) \
-    printf "="; \
-  printf "\n\n"; \
-} \
-{ \
-  copy_in_global_log = 1; \
-  global_test_result = "RUN"; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-         fatal("failed to read from " $$0 ".trs"); \
-      if (line ~ /$(am__global_test_result_rx)/) \
-        { \
-          sub("$(am__global_test_result_rx)", "", line); \
-          sub("[ 	]*$$", "", line); \
-          global_test_result = line; \
-        } \
-      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
-        copy_in_global_log = 0; \
-    }; \
-  if (copy_in_global_log) \
-    { \
-      rst_section(global_test_result ": " $$0); \
-      while ((rc = (getline line < ($$0 ".log"))) != 0) \
-      { \
-        if (rc < 0) \
-          fatal("failed to read from " $$0 ".log"); \
-        print line; \
-      }; \
-      printf "\n"; \
-    }; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# Restructured Text title.
-am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
-# Solaris 10 'make', and several other traditional 'make' implementations,
-# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
-# by disabling -e (using the XSI extension "set +e") if it's set.
-am__sh_e_setup = case $$- in *e*) set +e;; esac
-# Default flags passed to test drivers.
-am__common_driver_flags = \
-  --color-tests "$$am__color_tests" \
-  --enable-hard-errors "$$am__enable_hard_errors" \
-  --expect-failure "$$am__expect_failure"
-# To be inserted before the command running the test.  Creates the
-# directory for the log if needed.  Stores in $dir the directory
-# containing $f, in $tst the test, in $log the log.  Executes the
-# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
-# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
-# will run the test scripts (or their associated LOG_COMPILER, if
-# thy have one).
-am__check_pre = \
-$(am__sh_e_setup);					\
-$(am__vpath_adj_setup) $(am__vpath_adj)			\
-$(am__tty_colors);					\
-srcdir=$(srcdir); export srcdir;			\
-case "$@" in						\
-  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
-    *) am__odir=.;; 					\
-esac;							\
-test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
-  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
-if test -f "./$$f"; then dir=./;			\
-elif test -f "$$f"; then dir=;				\
-else dir="$(srcdir)/"; fi;				\
-tst=$$dir$$f; log='$@'; 				\
-if test -n '$(DISABLE_HARD_ERRORS)'; then		\
-  am__enable_hard_errors=no; 				\
-else							\
-  am__enable_hard_errors=yes; 				\
-fi; 							\
-case " $(XFAIL_TESTS) " in				\
-  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
-    am__expect_failure=yes;;				\
-  *)							\
-    am__expect_failure=no;;				\
-esac; 							\
-$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
-# A shell command to get the names of the tests scripts with any registered
-# extension removed (i.e., equivalently, the names of the test logs, with
-# the '.log' extension removed).  The result is saved in the shell variable
-# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
-# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
-# since that might cause problem with VPATH rewrites for suffix-less tests.
-# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
-am__set_TESTS_bases = \
-  bases='$(TEST_LOGS)'; \
-  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
-  bases=`echo $$bases`
-RECHECK_LOGS = $(TEST_LOGS)
-AM_RECURSIVE_TARGETS = check recheck
-TEST_SUITE_LOG = test-suite.log
-am__test_logs1 = $(TESTS:=.log)
-am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
-TEST_LOGS = $(am__test_logs2:.sh.log=.log)
-SH_LOG_DRIVER = $(SHELL) $(top_srcdir)/bin/test-driver
-SH_LOG_COMPILE = $(SH_LOG_COMPILER) $(AM_SH_LOG_FLAGS) $(SH_LOG_FLAGS)
-am__set_b = \
-  case '$@' in \
-    */*) \
-      case '$*' in \
-        */*) b='$*';; \
-          *) b=`echo '$@' | sed 's/\.log$$//'`; \
-       esac;; \
-    *) \
-      b='$*';; \
-  esac
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
-AMTAR = @AMTAR@
-
-# H5_CFLAGS holds flags that should be used when building hdf5,
-# but which should not be exported to h5cc for building other programs.
-# AM_CFLAGS is an automake construct which should be used by Makefiles 
-# instead of CFLAGS, as CFLAGS is reserved solely for the user to define.
-# This applies to FCFLAGS, CXXFLAGS, CPPFLAGS, and LDFLAGS as well.
-AM_CFLAGS = @AM_CFLAGS@ @H5_CFLAGS@
-AM_CPPFLAGS = @AM_CPPFLAGS@ @H5_CPPFLAGS@
-AM_CXXFLAGS = @AM_CXXFLAGS@ @H5_CXXFLAGS@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@
-AM_LDFLAGS = @AM_LDFLAGS@ @H5_LDFLAGS@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BYTESEX = @BYTESEX@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CC_VERSION = @CC_VERSION@
-CFLAGS = @CFLAGS@
-CLEARFILEBUF = @CLEARFILEBUF@
-CODESTACK = @CODESTACK@
-CONFIG_DATE = @CONFIG_DATE@
-CONFIG_MODE = @CONFIG_MODE@
-CONFIG_USER = @CONFIG_USER@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CXX_VERSION = @CXX_VERSION@
-CYGPATH_W = @CYGPATH_W@
-DEBUG_PKG = @DEBUG_PKG@
-DEFAULT_API_VERSION = @DEFAULT_API_VERSION@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
-DIRECT_VFD = @DIRECT_VFD@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-EXTERNAL_FILTERS = @EXTERNAL_FILTERS@
-
-# Make sure that these variables are exported to the Makefiles
-F9XMODEXT = @F9XMODEXT@
-F9XMODFLAG = @F9XMODFLAG@
-F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
-FC = @FC@
-FC2003 = @FC2003@
-FCFLAGS = @FCFLAGS@
-FCFLAGS_f90 = @FCFLAGS_f90@
-FCLIBS = @FCLIBS@
-FC_VERSION = @FC_VERSION@
-FGREP = @FGREP@
-FSEARCH_DIRS = @FSEARCH_DIRS@
-GREP = @GREP@
-H5_CFLAGS = @H5_CFLAGS@
-H5_CPPFLAGS = @H5_CPPFLAGS@
-H5_CXXFLAGS = @H5_CXXFLAGS@
-H5_CXX_SHARED = @H5_CXX_SHARED@
-H5_FCFLAGS = @H5_FCFLAGS@
-H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@
-H5_LDFLAGS = @H5_LDFLAGS@
-H5_LONE_COLON = @H5_LONE_COLON@
-H5_VERSION = @H5_VERSION@
-HADDR_T = @HADDR_T@
-HAVE_DMALLOC = @HAVE_DMALLOC@
-HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@
-HAVE_PTHREAD = @HAVE_PTHREAD@
-HDF5_HL = @HDF5_HL@
-HDF5_INTERFACES = @HDF5_INTERFACES@
-HDF_CXX = @HDF_CXX@
-HDF_FORTRAN = @HDF_FORTRAN@
-HDF_FORTRAN2003 = @HDF_FORTRAN2003@
-HID_T = @HID_T@
-HL = @HL@
-HL_FOR = @HL_FOR@
-HSIZE_T = @HSIZE_T@
-HSSIZE_T = @HSSIZE_T@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTRUMENT = @INSTRUMENT@
-INSTRUMENT_LIBRARY = @INSTRUMENT_LIBRARY@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LL_PATH = @LL_PATH@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_STATIC_EXEC = @LT_STATIC_EXEC@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MPE = @MPE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJECT_NAMELEN_DEFAULT_F = @OBJECT_NAMELEN_DEFAULT_F@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PARALLEL = @PARALLEL@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-RANLIB = @RANLIB@
-ROOT = @ROOT@
-RUNPARALLEL = @RUNPARALLEL@
-RUNSERIAL = @RUNSERIAL@
-R_INTEGER = @R_INTEGER@
-R_LARGE = @R_LARGE@
-SEARCH = @SEARCH@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SIZE_T = @SIZE_T@
-STATIC_EXEC = @STATIC_EXEC@
-STATIC_SHARED = @STATIC_SHARED@
-STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@
-STRIP = @STRIP@
-TESTPARALLEL = @TESTPARALLEL@
-THREADSAFE = @THREADSAFE@
-TIME = @TIME@
-TR = @TR@
-TRACE_API = @TRACE_API@
-UNAME_INFO = @UNAME_INFO@
-USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
-USE_FILTER_SZIP = @USE_FILTER_SZIP@
-USINGMEMCHECKER = @USINGMEMCHECKER@
-VERSION = @VERSION@
-WORDS_BIGENDIAN = @WORDS_BIGENDIAN@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_FC = @ac_ct_FC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-
-# Install directories that automake doesn't know about
-docdir = $(exec_prefix)/doc
-dvidir = @dvidir@
-enable_shared = @enable_shared@
-enable_static = @enable_static@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-
-# Shell commands used in Makefiles
-RM = rm -f
-CP = cp
-
-# Some machines need a command to run executables; this is that command
-# so that our tests will run.
-# We use RUNEXEC instead of RUNSERIAL directly because it may be that
-# some tests need to be run with a different command.  Older versions
-# of the makefiles used the command
-# $(LIBTOOL) --mode=execute
-# in some directories, for instance.
-RUNEXEC = $(RUNSERIAL)
-
-# Libraries to link to while building
-LIBHDF5 = $(top_builddir)/src/libhdf5.la
-LIBH5TEST = $(top_builddir)/test/libh5test.la
-LIBH5F = $(top_builddir)/fortran/src/libhdf5_fortran.la
-LIBH5FTEST = $(top_builddir)/fortran/test/libh5test_fortran.la
-LIBH5CPP = $(top_builddir)/c++/src/libhdf5_cpp.la
-LIBH5TOOLS = $(top_builddir)/tools/lib/libh5tools.la
-LIBH5_HL = $(top_builddir)/hl/src/libhdf5_hl.la
-LIBH5F_HL = $(top_builddir)/hl/fortran/src/libhdf5hl_fortran.la
-LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
-
-# Note that in svn revision 19400 the '/' after DESTDIR in H5* variables below  
-# has been removed. According to the official description of DESTDIR by Gnu at 
-# http://www.gnu.org/prep/standards/html_node/DESTDIR.html, DESTDIR is 
-# prepended to the normal and complete install path that it precedes for the 
-# purpose of installing in a temporary directory which is useful for building 
-# rpms and other packages.  The '/' after ${DESTDIR} will be followed by another 
-# '/' at the beginning of the normal install path.  When DESTDIR is empty the  
-# path then begins with '//', which is incorrect and causes problems at least for 
-# Cygwin.   
-
-# Scripts used to build examples
-# If only shared libraries have been installed, have h5cc build examples with
-# shared libraries instead of static libraries
-H5CC = ${DESTDIR}$(bindir)/h5cc
-H5CC_PP = ${DESTDIR}$(bindir)/h5pcc
-H5FC = ${DESTDIR}$(bindir)/h5fc
-H5FC_PP = ${DESTDIR}$(bindir)/h5pfc
-H5CPP = ${DESTDIR}$(bindir)/h5c++
-ACLOCAL_AMFLAGS = "-I m4"
-
-# The trace script; this is used on source files from the C library to
-# insert tracing macros.
-TRACE = perl $(top_srcdir)/bin/trace
-
-# .chkexe files are used to mark tests that have run successfully.
-# .chklog files are output from those tests.
-# *.clog and *.clog2 are from the MPE option.
-CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 $(EXTLINK_DIRS) \
-	*.h5
-@BUILD_PARALLEL_CONDITIONAL_TRUE@EXAMPLE_PROG_PARA = ph5example
-INSTALL_SCRIPT_FILES = run-c-ex.sh
-INSTALL_TOP_SCRIPT_FILES = run-all-ex.sh
-INSTALL_TOP_FILES = README
-
-# Example programs.
-# Don't tell automake about them, because if it knew they were programs,
-# it would try to compile them instead of using the h5cc script.
-# Use the boilerplate in config/examples.am instead.
-EXAMPLE_PROG = h5_write h5_read h5_extend_write h5_chunk_read h5_compound \
-           h5_crtgrpd h5_subset h5_cmprss h5_rdwt h5_crtgrpar h5_extend \
-           h5_crtatt h5_crtgrp h5_crtdat \
-           h5_group h5_select h5_attribute h5_mount h5_reference h5_drivers \
-           h5_ref2reg h5_extlink h5_elink_unix2win h5_shared_mesg
-
-TEST_SCRIPT = testh5cc.sh 
-TEST_EXAMPLES_SCRIPT = $(INSTALL_SCRIPT_FILES)
-
-# Install files
-# List all file that should be installed in examples directory
-INSTALL_FILES = h5_write.c h5_read.c h5_extend_write.c h5_chunk_read.c   \
-          h5_crtgrpd.c h5_subset.c h5_cmprss.c h5_rdwt.c h5_crtgrpar.c \
-          h5_extend.c h5_crtatt.c h5_crtgrp.c h5_crtdat.c \
-          h5_compound.c h5_group.c h5_select.c h5_attribute.c h5_mount.c \
-          h5_reference.c h5_drivers.c h5_extlink.c h5_elink_unix2win.c   \
-          h5_ref2reg.c h5_shared_mesg.c ph5example.c
-
-
-# The external link examples demonstrate how to use paths; they need
-# directories to be created to do this.
-EXTLINK_DIRS = red blue u2w
-
-# Example directory
-# Note: no '/' after DESTDIR.  Explanation in commence.am
-EXAMPLEDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples/c
-EXAMPLETOPDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples
-@BUILD_SHARED_SZIP_CONDITIONAL_TRUE@LD_LIBRARY_PATH = $(LL_PATH)
-
-# Assume that all tests in this directory are examples, and tell
-# conclude.am when to build them.
-EXTRA_PROG = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA)
-
-# We need to tell automake what to clean
-MOSTLYCLEANFILES = *.raw *.meta *.o
-CLEANFILES = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA)
-
-# Automake needs to be taught how to build lib, progs, and tests targets.
-# These will be filled in automatically for the most part (e.g.,
-# lib_LIBRARIES are built for lib target), but EXTRA_LIB, EXTRA_PROG, and
-# EXTRA_TEST variables are supplied to allow the user to force targets to
-# be built at certain times. 
-LIB = $(lib_LIBRARIES) $(lib_LTLIBRARIES) $(noinst_LIBRARIES)                 \
-      $(noinst_LTLIBRARIES) $(check_LIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LIB)
-
-PROGS = $(bin_PROGRAMS) $(bin_SCRIPTS) $(noinst_PROGRAMS) $(noinst_SCRIPTS)   \
-        $(EXTRA_PROG)
-
-chk_TESTS = $(check_PROGRAMS) $(check_SCRIPTS) $(EXTRA_TEST) 
-TEST_EXTENSIONS = .sh
-SH_LOG_COMPILER = $(SHELL)
-AM_SH_LOG_FLAGS = 
-TEST_PROG_CHKEXE = $(TEST_PROG:=.chkexe_)
-TEST_PROG_PARA_CHKEXE = $(TEST_PROG_PARA:=.chkexe_)
-TEST_SCRIPT_CHKSH = $(TEST_SCRIPT:=.chkexe_)
-TEST_SCRIPT_PARA_CHKSH = $(TEST_SCRIPT_PARA:=.chkexe_)
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .log .sh .sh$(EXEEXT) .trs
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/examples.am $(top_srcdir)/config/conclude.am $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign examples/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign examples/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-$(top_srcdir)/config/commence.am $(top_srcdir)/config/examples.am $(top_srcdir)/config/conclude.am:
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-run-c-ex.sh: $(top_builddir)/config.status $(srcdir)/run-c-ex.sh.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-testh5cc.sh: $(top_builddir)/config.status $(srcdir)/testh5cc.sh.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-# Recover from deleted '.trs' file; this should ensure that
-# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
-# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
-# to avoid problems with "make -n".
-.log.trs:
-	rm -f $< $@
-	$(MAKE) $(AM_MAKEFLAGS) $<
-
-# Leading 'am--fnord' is there to ensure the list of targets does not
-# expand to empty, as could happen e.g. with make check TESTS=''.
-am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
-am--force-recheck:
-	@:
-
-$(TEST_SUITE_LOG): $(TEST_LOGS)
-	@$(am__set_TESTS_bases); \
-	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
-	redo_bases=`for i in $$bases; do \
-	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
-	            done`; \
-	if test -n "$$redo_bases"; then \
-	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
-	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
-	  if $(am__make_dryrun); then :; else \
-	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
-	  fi; \
-	fi; \
-	if test -n "$$am__remaking_logs"; then \
-	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
-	       "recursion detected" >&2; \
-	else \
-	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
-	fi; \
-	if $(am__make_dryrun); then :; else \
-	  st=0;  \
-	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
-	  for i in $$redo_bases; do \
-	    test -f $$i.trs && test -r $$i.trs \
-	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
-	    test -f $$i.log && test -r $$i.log \
-	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
-	  done; \
-	  test $$st -eq 0 || exit 1; \
-	fi
-	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
-	ws='[ 	]'; \
-	results=`for b in $$bases; do echo $$b.trs; done`; \
-	test -n "$$results" || results=/dev/null; \
-	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
-	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
-	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
-	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
-	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
-	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
-	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
-	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
-	  success=true; \
-	else \
-	  success=false; \
-	fi; \
-	br='==================='; br=$$br$$br$$br$$br; \
-	result_count () \
-	{ \
-	    if test x"$$1" = x"--maybe-color"; then \
-	      maybe_colorize=yes; \
-	    elif test x"$$1" = x"--no-color"; then \
-	      maybe_colorize=no; \
-	    else \
-	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
-	    fi; \
-	    shift; \
-	    desc=$$1 count=$$2; \
-	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
-	      color_start=$$3 color_end=$$std; \
-	    else \
-	      color_start= color_end=; \
-	    fi; \
-	    echo "$${color_start}# $$desc $$count$${color_end}"; \
-	}; \
-	create_testsuite_report () \
-	{ \
-	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
-	  result_count $$1 "PASS: " $$pass  "$$grn"; \
-	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
-	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
-	  result_count $$1 "FAIL: " $$fail  "$$red"; \
-	  result_count $$1 "XPASS:" $$xpass "$$red"; \
-	  result_count $$1 "ERROR:" $$error "$$mgn"; \
-	}; \
-	{								\
-	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
-	    $(am__rst_title);						\
-	  create_testsuite_report --no-color;				\
-	  echo;								\
-	  echo ".. contents:: :depth: 2";				\
-	  echo;								\
-	  for b in $$bases; do echo $$b; done				\
-	    | $(am__create_global_log);					\
-	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
-	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
-	if $$success; then						\
-	  col="$$grn";							\
-	 else								\
-	  col="$$red";							\
-	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
-	fi;								\
-	echo "$${col}$$br$${std}"; 					\
-	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
-	echo "$${col}$$br$${std}"; 					\
-	create_testsuite_report --maybe-color;				\
-	echo "$$col$$br$$std";						\
-	if $$success; then :; else					\
-	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
-	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
-	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
-	  fi;								\
-	  echo "$$col$$br$$std";					\
-	fi;								\
-	$$success || exit 1
-recheck: all 
-	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-	@set +e; $(am__set_TESTS_bases); \
-	bases=`for i in $$bases; do echo $$i; done \
-	         | $(am__list_recheck_tests)` || exit 1; \
-	log_list=`for i in $$bases; do echo $$i.log; done`; \
-	log_list=`echo $$log_list`; \
-	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
-	        am__force_recheck=am--force-recheck \
-	        TEST_LOGS="$$log_list"; \
-	exit $$?
-.sh.log:
-	@p='$<'; \
-	$(am__set_b); \
-	$(am__check_pre) $(SH_LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_SH_LOG_DRIVER_FLAGS) $(SH_LOG_DRIVER_FLAGS) -- $(SH_LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-@am__EXEEXT_TRUE@.sh$(EXEEXT).log:
-@am__EXEEXT_TRUE@	@p='$<'; \
-@am__EXEEXT_TRUE@	$(am__set_b); \
-@am__EXEEXT_TRUE@	$(am__check_pre) $(SH_LOG_DRIVER) --test-name "$$f" \
-@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
-@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_SH_LOG_DRIVER_FLAGS) $(SH_LOG_DRIVER_FLAGS) -- $(SH_LOG_COMPILE) \
-@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
-check: check-am
-all-am: Makefile all-local
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
-	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
-	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
-	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-data-local
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am: installcheck-local
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool \
-	mostlyclean-local
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-local
-
-.MAKE: check-am install-am install-strip
-
-.PHONY: all all-am all-local check check-TESTS check-am clean \
-	clean-generic clean-libtool cscopelist-am ctags-am distclean \
-	distclean-generic distclean-libtool distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-data-local install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installcheck-local installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
-	pdf-am ps ps-am recheck tags-am uninstall uninstall-am \
-	uninstall-local
-
-
-# List all build rules defined by HDF5 Makefiles as "PHONY" targets here.
-# This tells the Makefiles that these targets are not files to be built but
-# commands that should be executed even if a file with the same name already
-# exists.
-.PHONY: build-check-clean build-check-p build-check-s build-lib build-progs \
-        build-tests check-clean check-install check-p check-s check-vfd \
-        install-doc lib progs tests uninstall-doc _exec_check-s _test help
-
-help:
-	@$(top_srcdir)/bin/makehelp
-
-# How to build examples, using installed version of h5cc
-@BUILD_PARALLEL_CONDITIONAL_TRUE@$(EXTRA_PROG): $(H5CC_PP)
-@BUILD_PARALLEL_CONDITIONAL_TRUE@	$(H5CC_PP) $(H5CCFLAGS) $(CFLAGS) -o $@ $(srcdir)/$@.c;
-@BUILD_PARALLEL_CONDITIONAL_FALSE@$(EXTRA_PROG): $(H5CC)
-@BUILD_PARALLEL_CONDITIONAL_FALSE@	$(H5CC) $(H5CCFLAGS) $(CFLAGS) -o $@ $(srcdir)/$@.c;
-
-# Some examples depend on files created by other examples.
-h5_read.chkexe_: h5_write.chkexe_
-h5_chunk_read.chkexe_: h5_extend_write.chkexe_
-h5_crtgrpd.chkexe_: h5_crtgrpar.chkexe_
-# h5_rdwt and h5_crtatt both modify the same file created by
-# h5_crtdat. Serialize them.
-h5_rdwt.chkexe_: h5_crtdat.chkexe_
-h5_crtatt.chkexe_: h5_rdwt.chkexe_
-
-$(EXTLINK_DIRS):
-	echo $(mkdir_p) $@
-	$(mkdir_p) $@
-
-# List dependencies for each program.  Normally, automake would take
-# care of this for us, but if we tell automake about the programs it
-# will try to build them with the normal C compiler, not h5cc.  This is
-# an inelegant way of solving the problem.
-# All programs share the same build rule and a dependency on the main hdf5
-# library above.
-h5_chunk_read: $(srcdir)/h5_chunk_read.c
-h5_compound: $(srcdir)/h5_compound.c
-h5_crtgrpd: $(srcdir)/h5_crtgrpd.c
-h5_subset: $(srcdir)/h5_subset.c
-h5_cmprss: $(srcdir)/h5_cmprss.c
-h5_rdwt: $(srcdir)/h5_rdwt.c
-h5_crtgrpar: $(srcdir)/h5_crtgrpar.c
-h5_extend: $(srcdir)/h5_extend.c
-h5_crtatt: $(srcdir)/h5_crtatt.c
-h5_crtgrp: $(srcdir)/h5_crtgrp.c
-h5_crtdat: $(srcdir)/h5_crtdat.c
-h5_extend_write: $(srcdir)/h5_extend_write.c
-h5_group: $(srcdir)/h5_group.c
-h5_write: $(srcdir)/h5_write.c
-h5_read: $(srcdir)/h5_read.c
-h5_select: $(srcdir)/h5_select.c
-h5_attribute: $(srcdir)/h5_attribute.c
-h5_mount: $(srcdir)/h5_mount.c
-h5_reference: $(srcdir)/h5_reference.c
-h5_ref2reg: $(srcdir)/h5_ref2reg.c
-h5_drivers: $(srcdir)/h5_drivers.c
-ph5example: $(srcdir)/ph5example.c
-h5_dtransform: $(srcdir)/h5_dtransform.c
-h5_extlink: $(srcdir)/h5_extlink.c $(EXTLINK_DIRS)
-h5_elink_unix2win: $(srcdir)/h5_elink_unix2win.c $(EXTLINK_DIRS)
-h5_shared_mesg: $(srcdir)/h5_shared_mesg.c
-
-# How to create EXAMPLEDIR if it doesn't already exist
-$(EXAMPLEDIR):
-	-$(top_srcdir)/bin/mkdirs $@
-$(EXAMPLETOPDIR):
-	-$(top_srcdir)/bin/mkdirs $@
-
-# Install and uninstall rules.  We install the source files, not the
-# example programs themselves.
-install-data-local:
-	@$(MAKE) $(AM_MAKEFLAGS) install-examples
-uninstall-local:
-	@$(MAKE) $(AM_MAKEFLAGS) uninstall-examples
-
-install-examples: $(EXAMPLEDIR) $(INSTALL_FILES) 
-	@for f in X $(INSTALL_FILES); do                                     \
-	  if test $$f != X; then                                             \
-	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);    \
-            chmod a-x $(EXAMPLEDIR)/$$f;                                     \
-	  fi;                                                                \
-	done
-	@for f in X $(INSTALL_SCRIPT_FILES); do                                   \
-	  if test $$f != X; then                                             \
-	    (set -x; $(INSTALL) $$f $(EXAMPLEDIR)/. || exit 1);\
-	  fi;                                                                \
-	done
-	@for f in X $(INSTALL_TOP_FILES); do                       \
-	  if test $$f != X; then                                             \
-	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1); \
-            chmod a-x $(EXAMPLETOPDIR)/$$f;\
-	  fi;                                                                \
-	done
-	@for f in X $(INSTALL_TOP_SCRIPT_FILES); do                       \
-	  if test $$f != X; then                                             \
-	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1); \
-	  fi;                                                                \
-	done
-
-uninstall-examples:
-	@if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then             \
-	  set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_FILES);                \
-	fi
-	@if test -n "$(INSTALL_SCRIPT_FILES)" -a -d $(EXAMPLEDIR); then           \
-	  set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_SCRIPT_FILES);              \
-	fi
-	@if test -n "$(INSTALL_TOP_FILES)" -a -d $(EXAMPLETOPDIR); then    \
-	  set -x; cd $(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_FILES);       \
-	fi
-	@if test -n "$(INSTALL_TOP_SCRIPT_FILES)" -a -d $(EXAMPLETOPDIR); then    \
-	  set -x; cd $(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_SCRIPT_FILES);       \
-	fi
-
-installcheck-local:
-	@if test "$(STATIC_SHARED)" = "static, shared"; then               \
-	  H5CCFLAGS="-shlib" $(MAKE) $(AM_MAKEFLAGS) check;                \
-	  $(MAKE) $(AM_MAKEFLAGS) clean;                                   \
-	  H5CCFLAGS="" $(MAKE) $(AM_MAKEFLAGS) check;                      \
-	elif test "$(STATIC_SHARED)" = "shared"; then                     \
-	  H5CCFLAGS="-shlib" $(MAKE) $(AM_MAKEFLAGS) check;                \
-	else                                                              \
-	  $(MAKE) $(AM_MAKEFLAGS) check;                                   \
-	fi 
-	@if test "$(INSTALL_FILES)" -a $(TEST_EXAMPLES_SCRIPT) -a -d $(EXAMPLEDIR); then \
-	    echo "============================";                                         \
-	    echo "Testing $(TEST_EXAMPLES_SCRIPT)";                                      \
-	    echo "============================";                                         \
-	    (cd $(EXAMPLEDIR);                                                           \
-	     /bin/sh ./$(TEST_EXAMPLES_SCRIPT);)                                                   \
-	fi
-
-# lib/progs/tests targets recurse into subdirectories. build-* targets
-# build files in this directory.
-build-lib: $(LIB)
-build-progs: $(LIB) $(PROGS)
-build-tests: $(LIB) $(PROGS) $(chk_TESTS)
-
-# General rule for recursive building targets.
-# BUILT_SOURCES contain targets that need to be built before anything else
-# in the directory (e.g., for Fortran type detection)
-lib progs tests check-s check-p :: $(BUILT_SOURCES)
-	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
-	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X && test $$d != .; then                           \
-	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
-	    fi;                                                               \
-	done
-
-# General rule for recursive cleaning targets.  Like the rule above,
-# but doesn't require building BUILT_SOURCES.
-check-clean ::
-	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
-	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X && test $$d != .; then                           \
-	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
-	    fi;                                                               \
-	done
-
-# Tell Automake to build tests when the user types `make all' (this is
-# not its default behavior).  Also build EXTRA_LIB and EXTRA_PROG since
-# Automake won't build them automatically, either.
-all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(chk_TESTS)
-
-# make install-doc doesn't do anything outside of doc directory, but
-# Makefiles should recognize it.
-# UPDATE: docs no longer reside in this build tree, so this target
-# is depreciated.
-install-doc uninstall-doc:
-	@echo "Nothing to be done."
-
-# clean up files generated by tests so they can be re-run.
-build-check-clean:
-	$(RM) -rf $(CHECK_CLEANFILES)
-
-# run check-clean whenever mostlyclean is run
-mostlyclean-local: build-check-clean
-
-# check-install is just a synonym for installcheck
-check-install: installcheck
-
-# Run each test in order, passing $(TEST_FLAGS) to the program.
-# Since tests are done in a shell loop, "make -i" does apply inside it.
-# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
-# The timestamps give a rough idea how much time the tests use.
-#
-# Note that targets in chk_TESTS (defined above) will be built when the user
-# types 'make tests' or 'make check', but only programs in TEST_PROG,
-# TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
-check-TESTS: test
-
-test _test:
-	@$(MAKE) build-check-s
-	@$(MAKE) build-check-p
-
-# Actual execution of check-s.
-build-check-s: $(LIB) $(PROGS) $(chk_TESTS)
-	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
-	   echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
-	fi
-	@$(MAKE) $(AM_MAKEFLAGS) _exec_check-s
-	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
-	    echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
-	fi
-
-_exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH)
-
-# The dummy.chkexe here prevents the target from being
-# empty if there are no tests in the current directory.
-# $${log} is the log file.
-# $${tname} is the name of test.
-$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
-	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \
-	   tname=$(@:.chkexe_=)$(EXEEXT);\
-	   log=$(@:.chkexe_=.chklog); \
-	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \
-	      echo "No need to test $${tname} again."; \
-	   else \
-	      echo "============================" > $${log}; \
-	      if test "X$(FORTRAN_API)" = "Xyes"; then \
-	         echo "Fortran API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "Fortran API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(CXX_API)" = "Xyes"; then \
-	         echo "C++ API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "C++ API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log};\
-	      else \
-	         echo "Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "$(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      fi; \
-	      echo "============================" >> $${log}; \
-	      srcdir="$(srcdir)" \
-	         $(TIME) $(RUNEXEC) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \
-	         && touch $(@:.chkexe_=.chkexe) || \
-	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	         (cat $${log} && false) || exit 1; \
-	      echo "" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
-	      echo "============================" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
-	      cat $${log}; \
-	   fi; \
-	fi
-
-# The dummysh.chkexe here prevents the target from being
-# empty if there are no tests in the current directory.
-# $${log} is the log file.
-# $${tname} is the name of test.
-$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
-	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummysh.chkexe_"; then \
-	   cmd=$(@:.chkexe_=);\
-	   tname=`basename $$cmd`;\
-	   chkname=`basename $(@:.chkexe_=.chkexe)`;\
-	   log=`basename $(@:.chkexe_=.chklog)`; \
-	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer $${chkname} $$cmd $(SCRIPT_DEPEND); then \
-	      echo "No need to test $${tname} again."; \
-	   else \
-	      echo "============================" > $${log}; \
-	      if test "X$(FORTRAN_API)" = "Xyes"; then \
-	         echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(CXX_API)" = "Xyes"; then \
-	         echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      else \
-	         echo "Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      fi; \
-	      echo "============================" >> $${log}; \
-	      RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
-	      srcdir="$(srcdir)" \
-	         $(TIME) $(SHELL) $$cmd $(TEST_FLAGS) >> $${log} 2>&1 \
-	         && touch $${chkname} || \
-	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	         (cat $${log} && false) || exit 1; \
-	      echo "" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
-	      echo "============================" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
-	      cat $${log}; \
-	   fi; \
-	   echo "============================"; \
-	fi
-
-# Actual execution of check-p.
-build-check-p: $(LIB) $(PROGS) $(chk_TESTS)
-	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
-	   echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
-	fi
-	@if test -n "$(TEST_PROG_PARA)"; then                                \
-	    echo "**** Hint ****";                                            \
-	    echo "Parallel test files reside in the current directory"        \
-	         "by default.";                                               \
-	    echo "Set HDF5_PARAPREFIX to use another directory. E.g.,";       \
-	    echo "    HDF5_PARAPREFIX=/PFS/user/me";                          \
-	    echo "    export HDF5_PARAPREFIX";                                \
-	    echo "    make check";                                            \
-	    echo "**** end of Hint ****";                                     \
-	fi
-	@for test in $(TEST_PROG_PARA) dummy; do                             \
-	   if test $$test != dummy; then                                      \
-	      $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ \
-	      RUNEXEC="$(RUNPARALLEL)" || exit 1; \
-	   fi;                                                                \
-	done
-	@for test in $(TEST_SCRIPT_PARA) dummy; do                           \
-	  if test $$test != dummy; then                                      \
-	    $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ || exit 1; \
-	  fi;                                                                 \
-	done
-	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
-	    echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
-	fi
-
-# Run test with different Virtual File Driver
-check-vfd: $(LIB) $(PROGS) $(chk_TESTS)
-	@for vfd in $(VFD_LIST) dummy; do                                     \
-	    if test $$vfd != dummy; then                                      \
-	        echo "============================";                          \
-	        echo "Testing Virtual File Driver $$vfd";                     \
-	        echo "============================";                          \
-	        $(MAKE) $(AM_MAKEFLAGS) check-clean || exit 1;                \
-	        HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check || exit 1;    \
-	    fi;                                                               \
-	done
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/examples/README b/examples/README
index 0550b15..e0a3364 100644
--- a/examples/README
+++ b/examples/README
@@ -2,7 +2,7 @@
 
 This directory contains example programs for the installed APIs and scripts to 
 compile and run them.  Examples in the c and hl/c subdirectories are always 
-installed, and those in fortan, hl/fortran, c++ and hl/c++ will be installed 
+installed, and those in fortran, hl/fortran, c++ and hl/c++ will be installed 
 when fortran or c++ are enabled.
 
 Running the run-all-ex.sh script in this directory will run the scripts and in 
diff --git a/examples/h5_attribute.c b/examples/h5_attribute.c
index 0ea0153..6d3523d 100644
--- a/examples/h5_attribute.c
+++ b/examples/h5_attribute.c
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
@@ -31,193 +28,195 @@
 
 #define H5FILE_NAME "Attributes.h5"
 
-#define RANK  1   /* Rank and size of the dataset  */
-#define SIZE  7
+#define RANK 1 /* Rank and size of the dataset  */
+#define SIZE 7
 
-#define ARANK  2   /* Rank and dimension sizes of the first dataset attribute */
+#define ARANK  2 /* Rank and dimension sizes of the first dataset attribute */
 #define ADIM1  2
 #define ADIM2  3
-#define ANAME  "Float attribute"      /* Name of the array attribute */
+#define ANAME  "Float attribute"     /* Name of the array attribute */
 #define ANAMES "Character attribute" /* Name of the string attribute */
 
 static herr_t attr_info(hid_t loc_id, const char *name, const H5A_info_t *ainfo, void *opdata);
-                                     /* Operator function */
+/* Operator function */
 
 int
-main (void)
+main(void)
 {
 
-   hid_t   file, dataset;       /* File and dataset identifiers */
-
-   hid_t   fid;                 /* Dataspace identifier */
-   hid_t   attr1, attr2, attr3; /* Attribute identifiers */
-   hid_t   attr;
-   hid_t   aid1, aid2, aid3;    /* Attribute dataspace identifiers */
-   hid_t   atype, atype_mem;    /* Attribute type */
-   H5T_class_t  type_class;
-
-   hsize_t fdim[] = {SIZE};
-   hsize_t adim[] = {ADIM1, ADIM2};  /* Dimensions of the first attribute  */
-
-   float matrix[ADIM1][ADIM2]; /* Attribute data */
-
-   herr_t  ret;                /* Return value */
-   H5O_info_t oinfo;           /* Object info */
-   unsigned i, j;              /* Counters */
-   char    string_out[80];     /* Buffer to read string attribute back */
-   int     point_out;          /* Buffer to read scalar attribute back */
-
-   /*
-    * Data initialization.
-    */
-   int vector[] = {1, 2, 3, 4, 5, 6, 7};  /* Dataset data */
-   int point = 1;                         /* Value of the scalar attribute */
-   char string[] = "ABCD";                /* Value of the string attribute */
-
-
-   for (i=0; i < ADIM1; i++) {            /* Values of the array attribute */
-       for (j=0; j < ADIM2; j++)
-       matrix[i][j] = -1.;
-   }
-
-   /*
-    * Create a file.
-    */
-   file = H5Fcreate(H5FILE_NAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-
-   /*
-    * Create the dataspace for the dataset in the file.
-    */
-   fid = H5Screate(H5S_SIMPLE);
-   ret = H5Sset_extent_simple(fid, RANK, fdim, NULL);
-
-   /*
-    * Create the dataset in the file.
-    */
-   dataset = H5Dcreate2(file, "Dataset", H5T_NATIVE_INT, fid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-
-   /*
-    * Write data to the dataset.
-    */
-   ret = H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL , H5S_ALL, H5P_DEFAULT, vector);
-
-   /*
-    * Create dataspace for the first attribute.
-    */
-   aid1 = H5Screate(H5S_SIMPLE);
-   ret  = H5Sset_extent_simple(aid1, ARANK, adim, NULL);
-
-   /*
-    * Create array attribute.
-    */
-   attr1 = H5Acreate2(dataset, ANAME, H5T_NATIVE_FLOAT, aid1, H5P_DEFAULT, H5P_DEFAULT);
-
-   /*
-    * Write array attribute.
-    */
-   ret = H5Awrite(attr1, H5T_NATIVE_FLOAT, matrix);
-
-   /*
-    * Create scalar attribute.
-    */
-   aid2  = H5Screate(H5S_SCALAR);
-   attr2 = H5Acreate2(dataset, "Integer attribute", H5T_NATIVE_INT, aid2,
-                     H5P_DEFAULT, H5P_DEFAULT);
-
-   /*
-    * Write scalar attribute.
-    */
-   ret = H5Awrite(attr2, H5T_NATIVE_INT, &point);
-
-   /*
-    * Create string attribute.
-    */
-   aid3  = H5Screate(H5S_SCALAR);
-   atype = H5Tcopy(H5T_C_S1);
-           H5Tset_size(atype, 5);
-           H5Tset_strpad(atype,H5T_STR_NULLTERM);
-   attr3 = H5Acreate2(dataset, ANAMES, atype, aid3, H5P_DEFAULT, H5P_DEFAULT);
-
-   /*
-    * Write string attribute.
-    */
-   ret = H5Awrite(attr3, atype, string);
-
-   /*
-    * Close attribute and file dataspaces, and datatype.
-    */
-   ret = H5Sclose(aid1);
-   ret = H5Sclose(aid2);
-   ret = H5Sclose(aid3);
-   ret = H5Sclose(fid);
-   ret = H5Tclose(atype);
-
-   /*
-    * Close the attributes.
-    */
-   ret = H5Aclose(attr1);
-   ret = H5Aclose(attr2);
-   ret = H5Aclose(attr3);
-
-   /*
-    * Close the dataset.
-    */
-   ret = H5Dclose(dataset);
-
-   /*
-    * Close the file.
-    */
-   ret = H5Fclose(file);
-
-   /*
-    * Reopen the file.
-    */
-   file = H5Fopen(H5FILE_NAME, H5F_ACC_RDONLY, H5P_DEFAULT);
-
-   /*
-    * Open the dataset.
-    */
-   dataset = H5Dopen2(file, "Dataset", H5P_DEFAULT);
-
-   /*
-    * Attach to the scalar attribute using attribute name, then read and
-    * display its value.
-    */
-   attr = H5Aopen(dataset, "Integer attribute", H5P_DEFAULT);
-   ret  = H5Aread(attr, H5T_NATIVE_INT, &point_out);
-   printf("The value of the attribute \"Integer attribute\" is %d \n", point_out);
-   ret =  H5Aclose(attr);
-
-   /*
-    * Find string attribute by iterating through all attributes
-    */
-   ret = H5Oget_info(dataset, &oinfo);
-   for(i = 0; i < (unsigned)oinfo.num_attrs; i++) {
-      attr = H5Aopen_by_idx(dataset, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)i, H5P_DEFAULT, H5P_DEFAULT);
-      atype = H5Aget_type(attr);
-      type_class = H5Tget_class(atype);
-      if (type_class == H5T_STRING) {
-           atype_mem = H5Tget_native_type(atype, H5T_DIR_ASCEND);
-           ret   = H5Aread(attr, atype_mem, string_out);
-           printf("Found string attribute; its index is %d , value =   %s \n", i, string_out);
-           ret   = H5Tclose(atype_mem);
-      }
-       ret   = H5Aclose(attr);
-       ret   = H5Tclose(atype);
+    hid_t file, dataset; /* File and dataset identifiers */
+
+    hid_t       fid;                 /* Dataspace identifier */
+    hid_t       attr1, attr2, attr3; /* Attribute identifiers */
+    hid_t       attr;
+    hid_t       aid1, aid2, aid3; /* Attribute dataspace identifiers */
+    hid_t       atype, atype_mem; /* Attribute type */
+    H5T_class_t type_class;
+
+    hsize_t fdim[] = {SIZE};
+    hsize_t adim[] = {ADIM1, ADIM2}; /* Dimensions of the first attribute  */
+
+    float matrix[ADIM1][ADIM2]; /* Attribute data */
+
+    herr_t      ret;            /* Return value */
+    H5O_info2_t oinfo;          /* Object info */
+    unsigned    i, j;           /* Counters */
+    char        string_out[80]; /* Buffer to read string attribute back */
+    int         point_out;      /* Buffer to read scalar attribute back */
+
+    /*
+     * Data initialization.
+     */
+    int  vector[] = {1, 2, 3, 4, 5, 6, 7}; /* Dataset data */
+    int  point    = 1;                     /* Value of the scalar attribute */
+    char string[] = "ABCD";                /* Value of the string attribute */
+
+    for (i = 0; i < ADIM1; i++) { /* Values of the array attribute */
+        for (j = 0; j < ADIM2; j++)
+            matrix[i][j] = -1.;
     }
 
-   /*
-    * Get attribute info using iteration function.
-    */
+    /*
+     * Create a file.
+     */
+    file = H5Fcreate(H5FILE_NAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+
+    /*
+     * Create the dataspace for the dataset in the file.
+     */
+    fid = H5Screate(H5S_SIMPLE);
+    ret = H5Sset_extent_simple(fid, RANK, fdim, NULL);
+
+    /*
+     * Create the dataset in the file.
+     */
+    dataset = H5Dcreate2(file, "Dataset", H5T_NATIVE_INT, fid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+
+    /*
+     * Write data to the dataset.
+     */
+    ret = H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, vector);
+
+    /*
+     * Create dataspace for the first attribute.
+     */
+    aid1 = H5Screate(H5S_SIMPLE);
+    ret  = H5Sset_extent_simple(aid1, ARANK, adim, NULL);
+
+    /*
+     * Create array attribute.
+     */
+    attr1 = H5Acreate2(dataset, ANAME, H5T_NATIVE_FLOAT, aid1, H5P_DEFAULT, H5P_DEFAULT);
+
+    /*
+     * Write array attribute.
+     */
+    ret = H5Awrite(attr1, H5T_NATIVE_FLOAT, matrix);
+
+    /*
+     * Create scalar attribute.
+     */
+    aid2  = H5Screate(H5S_SCALAR);
+    attr2 = H5Acreate2(dataset, "Integer attribute", H5T_NATIVE_INT, aid2, H5P_DEFAULT, H5P_DEFAULT);
+
+    /*
+     * Write scalar attribute.
+     */
+    ret = H5Awrite(attr2, H5T_NATIVE_INT, &point);
+
+    /*
+     * Create string attribute.
+     */
+    aid3  = H5Screate(H5S_SCALAR);
+    atype = H5Tcopy(H5T_C_S1);
+    H5Tset_size(atype, 5);
+    H5Tset_strpad(atype, H5T_STR_NULLTERM);
+    attr3 = H5Acreate2(dataset, ANAMES, atype, aid3, H5P_DEFAULT, H5P_DEFAULT);
+
+    /*
+     * Write string attribute.
+     */
+    ret = H5Awrite(attr3, atype, string);
+
+    /*
+     * Close attribute and file dataspaces, and datatype.
+     */
+    ret = H5Sclose(aid1);
+    ret = H5Sclose(aid2);
+    ret = H5Sclose(aid3);
+    ret = H5Sclose(fid);
+    ret = H5Tclose(atype);
+
+    /*
+     * Close the attributes.
+     */
+    ret = H5Aclose(attr1);
+    ret = H5Aclose(attr2);
+    ret = H5Aclose(attr3);
+
+    /*
+     * Close the dataset.
+     */
+    ret = H5Dclose(dataset);
+
+    /*
+     * Close the file.
+     */
+    ret = H5Fclose(file);
+
+    /*
+     * Reopen the file.
+     */
+    file = H5Fopen(H5FILE_NAME, H5F_ACC_RDONLY, H5P_DEFAULT);
+
+    /*
+     * Open the dataset.
+     */
+    dataset = H5Dopen2(file, "Dataset", H5P_DEFAULT);
+
+    /*
+     * Attach to the scalar attribute using attribute name, then read and
+     * display its value.
+     */
+    attr = H5Aopen(dataset, "Integer attribute", H5P_DEFAULT);
+    ret  = H5Aread(attr, H5T_NATIVE_INT, &point_out);
+    printf("The value of the attribute \"Integer attribute\" is %d \n", point_out);
+    ret = H5Aclose(attr);
+
+    //! [H5Oget_info3_snip]
+
+    /*
+     * Find string attribute by iterating through all attributes
+     */
+    ret = H5Oget_info3(dataset, &oinfo, H5O_INFO_NUM_ATTRS);
+    for (i = 0; i < (unsigned)oinfo.num_attrs; i++) {
+        attr       = H5Aopen_by_idx(dataset, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)i, H5P_DEFAULT,
+                                    H5P_DEFAULT);
+        atype      = H5Aget_type(attr);
+        type_class = H5Tget_class(atype);
+        if (type_class == H5T_STRING) {
+            atype_mem = H5Tget_native_type(atype, H5T_DIR_ASCEND);
+            ret       = H5Aread(attr, atype_mem, string_out);
+            printf("Found string attribute; its index is %d , value =   %s \n", i, string_out);
+            ret = H5Tclose(atype_mem);
+        }
+        ret = H5Aclose(attr);
+        ret = H5Tclose(atype);
+    }
+
+    //! [H5Oget_info3_snip]
+    /*
+     * Get attribute info using iteration function.
+     */
     ret = H5Aiterate2(dataset, H5_INDEX_NAME, H5_ITER_INC, NULL, attr_info, NULL);
 
-   /*
-    * Close the dataset and the file.
-    */
-   H5Dclose(dataset);
-   H5Fclose(file);
+    /*
+     * Close the dataset and the file.
+     */
+    H5Dclose(dataset);
+    H5Fclose(file);
 
-   return 0;
+    return 0;
 }
 
 /*
@@ -226,16 +225,16 @@ main (void)
 static herr_t
 attr_info(hid_t loc_id, const char *name, const H5A_info_t *ainfo, void *opdata)
 {
-    hid_t attr, atype, aspace;  /* Attribute, datatype and dataspace identifiers */
-    int   rank;
+    hid_t   attr, atype, aspace; /* Attribute, datatype and dataspace identifiers */
+    int     rank;
     hsize_t sdim[64];
-    herr_t ret;
-    int i;
-    size_t npoints;             /* Number of elements in the array attribute. */
-    float *float_array;         /* Pointer to the array attribute. */
+    herr_t  ret;
+    int     i;
+    size_t  npoints;     /* Number of elements in the array attribute. */
+    float  *float_array; /* Pointer to the array attribute. */
 
     /* avoid warnings */
-    opdata = opdata;
+    (void)opdata;
 
     /*
      * Open the attribute using its name.
@@ -252,17 +251,17 @@ attr_info(hid_t loc_id, const char *name, const H5A_info_t *ainfo, void *opdata)
      */
     atype  = H5Aget_type(attr);
     aspace = H5Aget_space(attr);
-    rank = H5Sget_simple_extent_ndims(aspace);
-    ret = H5Sget_simple_extent_dims(aspace, sdim, NULL);
+    rank   = H5Sget_simple_extent_ndims(aspace);
+    ret    = H5Sget_simple_extent_dims(aspace, sdim, NULL);
 
     /*
      *  Display rank and dimension sizes for the array attribute.
      */
 
-    if(rank > 0) {
+    if (rank > 0) {
         printf("Rank : %d \n", rank);
         printf("Dimension sizes : ");
-        for (i=0; i< rank; i++)
+        for (i = 0; i < rank; i++)
             printf("%d ", (int)sdim[i]);
         printf("\n");
     }
@@ -273,11 +272,11 @@ attr_info(hid_t loc_id, const char *name, const H5A_info_t *ainfo, void *opdata)
 
     if (H5T_FLOAT == H5Tget_class(atype)) {
         printf("Type : FLOAT \n");
-        npoints = H5Sget_simple_extent_npoints(aspace);
-        float_array = (float *)malloc(sizeof(float)*(int)npoints);
-        ret = H5Aread(attr, atype, float_array);
+        npoints     = H5Sget_simple_extent_npoints(aspace);
+        float_array = (float *)malloc(sizeof(float) * (int)npoints);
+        ret         = H5Aread(attr, atype, float_array);
         printf("Values : ");
-        for( i = 0; i < (int)npoints; i++)
+        for (i = 0; i < (int)npoints; i++)
             printf("%f ", float_array[i]);
         printf("\n");
         free(float_array);
@@ -292,4 +291,3 @@ attr_info(hid_t loc_id, const char *name, const H5A_info_t *ainfo, void *opdata)
 
     return 0;
 }
-
diff --git a/examples/h5_chunk_read.c b/examples/h5_chunk_read.c
index 98b0bb4..9e5332e 100644
--- a/examples/h5_chunk_read.c
+++ b/examples/h5_chunk_read.c
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
@@ -20,68 +17,66 @@
 
 #include "hdf5.h"
 
-#define H5FILE_NAME        "SDSextendible.h5"
+#define H5FILE_NAME "SDSextendible.h5"
 #define DATASETNAME "ExtendibleArray"
-#define RANK         2
-#define RANKC        1
-#define NX           10
-#define NY           5
+#define RANK        2
+#define RANKC       1
+#define NX          10
+#define NY          5
 
 int
-main (void)
+main(void)
 {
-    hid_t       file;                        /* handles */
-    hid_t       dataset;
-    hid_t       filespace;
-    hid_t       memspace;
-    hid_t       cparms;
-    hsize_t     dims[2];                     /* dataset and chunk dimensions*/
-    hsize_t     chunk_dims[2];
-    hsize_t     col_dims[1];
-    hsize_t     count[2];
-    hsize_t     offset[2];
-
-    herr_t      status, status_n;
-
-    int         data_out[NX][NY];  /* buffer for dataset to be read */
-    int         chunk_out[2][5];   /* buffer for chunk to be read */
-    int         column[10];        /* buffer for column to be read */
-    int         rank, rank_chunk;
-    int		i, j;
-
-
+    hid_t   file; /* handles */
+    hid_t   dataset;
+    hid_t   filespace;
+    hid_t   memspace;
+    hid_t   cparms;
+    hsize_t dims[2]; /* dataset and chunk dimensions*/
+    hsize_t chunk_dims[2];
+    hsize_t col_dims[1];
+    hsize_t count[2];
+    hsize_t offset[2];
+
+    herr_t status, status_n;
+
+    int data_out[NX][NY]; /* buffer for dataset to be read */
+    int chunk_out[2][5];  /* buffer for chunk to be read */
+    int column[10];       /* buffer for column to be read */
+    int rank, rank_chunk;
+    int i, j;
 
     /*
      * Open the file and the dataset.
      */
-    file = H5Fopen(H5FILE_NAME, H5F_ACC_RDONLY, H5P_DEFAULT);
+    file    = H5Fopen(H5FILE_NAME, H5F_ACC_RDONLY, H5P_DEFAULT);
     dataset = H5Dopen2(file, DATASETNAME, H5P_DEFAULT);
 
     /*
      * Get dataset rank and dimension.
      */
 
-    filespace = H5Dget_space(dataset);    /* Get filespace handle first. */
+    filespace = H5Dget_space(dataset); /* Get filespace handle first. */
     rank      = H5Sget_simple_extent_ndims(filespace);
     status_n  = H5Sget_simple_extent_dims(filespace, dims, NULL);
-    printf("dataset rank %d, dimensions %lu x %lu\n",
-	   rank, (unsigned long)(dims[0]), (unsigned long)(dims[1]));
+    printf("dataset rank %d, dimensions %lu x %lu\n", rank, (unsigned long)(dims[0]),
+           (unsigned long)(dims[1]));
 
     /*
      * Define the memory space to read dataset.
      */
-    memspace = H5Screate_simple(RANK,dims,NULL);
+    memspace = H5Screate_simple(RANK, dims, NULL);
 
     /*
      * Read dataset back and display.
      */
-    status = H5Dread(dataset, H5T_NATIVE_INT, memspace, filespace,
-		     H5P_DEFAULT, data_out);
+    status = H5Dread(dataset, H5T_NATIVE_INT, memspace, filespace, H5P_DEFAULT, data_out);
     printf("\n");
     printf("Dataset: \n");
     for (j = 0; j < dims[0]; j++) {
-	for (i = 0; i < dims[1]; i++) printf("%d ", data_out[j][i]);
-	printf("\n");
+        for (i = 0; i < dims[1]; i++)
+            printf("%d ", data_out[j][i]);
+        printf("\n");
     }
 
     /*
@@ -112,7 +107,7 @@ main (void)
      * and read it into column array.
      */
     col_dims[0] = 10;
-    memspace =  H5Screate_simple(RANKC, col_dims, NULL);
+    memspace    = H5Screate_simple(RANKC, col_dims, NULL);
 
     /*
      * Define the column (hyperslab) to read.
@@ -121,14 +116,12 @@ main (void)
     offset[1] = 2;
     count[0]  = 10;
     count[1]  = 1;
-    status = H5Sselect_hyperslab(filespace, H5S_SELECT_SET, offset, NULL,
-				 count, NULL);
-    status = H5Dread(dataset, H5T_NATIVE_INT, memspace, filespace,
-		     H5P_DEFAULT, column);
+    status    = H5Sselect_hyperslab(filespace, H5S_SELECT_SET, offset, NULL, count, NULL);
+    status    = H5Dread(dataset, H5T_NATIVE_INT, memspace, filespace, H5P_DEFAULT, column);
     printf("\n");
     printf("Third column: \n");
     for (i = 0; i < 10; i++) {
-	printf("%d \n", column[i]);
+        printf("%d \n", column[i]);
     }
 
     /*
@@ -155,19 +148,19 @@ main (void)
      */
     cparms = H5Dget_create_plist(dataset); /* Get properties handle first. */
 
-    if (H5D_CHUNKED == H5Pget_layout(cparms))  {
+    if (H5D_CHUNKED == H5Pget_layout(cparms)) {
 
-	/*
-	 * Get chunking information: rank and dimensions
-	 */
-	rank_chunk = H5Pget_chunk(cparms, 2, chunk_dims);
-	printf("chunk rank %d, dimensions %lu x %lu\n", rank_chunk,
-	       (unsigned long)(chunk_dims[0]), (unsigned long)(chunk_dims[1]));
+        /*
+         * Get chunking information: rank and dimensions
+         */
+        rank_chunk = H5Pget_chunk(cparms, 2, chunk_dims);
+        printf("chunk rank %d, dimensions %lu x %lu\n", rank_chunk, (unsigned long)(chunk_dims[0]),
+               (unsigned long)(chunk_dims[1]));
 
         /*
          * Define the memory space to read a chunk.
          */
-        memspace = H5Screate_simple(rank_chunk,chunk_dims,NULL);
+        memspace = H5Screate_simple(rank_chunk, chunk_dims, NULL);
 
         /*
          * Define chunk in the file (hyperslab) to read.
@@ -176,18 +169,17 @@ main (void)
         offset[1] = 0;
         count[0]  = chunk_dims[0];
         count[1]  = chunk_dims[1];
-        status = H5Sselect_hyperslab(filespace, H5S_SELECT_SET, offset, NULL,
-                                     count, NULL);
+        status    = H5Sselect_hyperslab(filespace, H5S_SELECT_SET, offset, NULL, count, NULL);
 
         /*
          * Read chunk back and display.
          */
-        status = H5Dread(dataset, H5T_NATIVE_INT, memspace, filespace,
-                         H5P_DEFAULT, chunk_out);
+        status = H5Dread(dataset, H5T_NATIVE_INT, memspace, filespace, H5P_DEFAULT, chunk_out);
         printf("\n");
         printf("Chunk: \n");
         for (j = 0; j < chunk_dims[0]; j++) {
-            for (i = 0; i < chunk_dims[1]; i++) printf("%d ", chunk_out[j][i]);
+            for (i = 0; i < chunk_dims[1]; i++)
+                printf("%d ", chunk_out[j][i]);
             printf("\n");
         }
         /*
diff --git a/examples/h5_cmprss.c b/examples/h5_cmprss.c
index 8d365a3..9aefe32 100644
--- a/examples/h5_cmprss.c
+++ b/examples/h5_cmprss.c
@@ -1,125 +1,120 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-/* 
+/*
  *  This example illustrates how to create a compressed dataset.
  *  It is used in the HDF5 Tutorial.
- */ 
+ */
 
 #include "hdf5.h"
 
-#define FILE    "cmprss.h5"
-#define RANK    2
-#define DIM0    100
-#define DIM1    20
- 
-int main () {
+#define FILE "cmprss.h5"
+#define RANK 2
+#define DIM0 100
+#define DIM1 20
 
-    hid_t    file_id, dataset_id, dataspace_id; /* identifiers */
-    hid_t    plist_id; 
+int
+main()
+{
 
-    size_t   nelmts;
-    unsigned flags, filter_info;
+    hid_t file_id, dataset_id, dataspace_id; /* identifiers */
+    hid_t plist_id;
+
+    size_t       nelmts;
+    unsigned     flags, filter_info;
     H5Z_filter_t filter_type;
 
-    herr_t   status;
-    hsize_t  dims[2];
-    hsize_t  cdims[2];
- 
-    int      idx;
-    int      i,j, numfilt;
-    int      buf[DIM0][DIM1];
-    int      rbuf [DIM0][DIM1];
+    herr_t  status;
+    hsize_t dims[2];
+    hsize_t cdims[2];
+
+    int i, j, numfilt;
+    int buf[DIM0][DIM1];
+    int rbuf[DIM0][DIM1];
 
-    /* Uncomment these variables to use SZIP compression 
+    /* Uncomment these variables to use SZIP compression
     unsigned szip_options_mask;
     unsigned szip_pixels_per_block;
     */
 
     /* Create a file.  */
-    file_id = H5Fcreate (FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-
+    file_id = H5Fcreate(FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
     /* Create dataset "Compressed Data" in the group using absolute name.  */
-    dims[0] = DIM0;
-    dims[1] = DIM1;
-    dataspace_id = H5Screate_simple (RANK, dims, NULL);
+    dims[0]      = DIM0;
+    dims[1]      = DIM1;
+    dataspace_id = H5Screate_simple(RANK, dims, NULL);
 
-    plist_id  = H5Pcreate (H5P_DATASET_CREATE);
+    plist_id = H5Pcreate(H5P_DATASET_CREATE);
 
     /* Dataset must be chunked for compression */
     cdims[0] = 20;
     cdims[1] = 20;
-    status = H5Pset_chunk (plist_id, 2, cdims);
+    status   = H5Pset_chunk(plist_id, 2, cdims);
 
     /* Set ZLIB / DEFLATE Compression using compression level 6.
-     * To use SZIP Compression comment out these lines. 
-    */ 
-    status = H5Pset_deflate (plist_id, 6); 
+     * To use SZIP Compression comment out these lines.
+     */
+    status = H5Pset_deflate(plist_id, 6);
 
-    /* Uncomment these lines to set SZIP Compression 
+    /* Uncomment these lines to set SZIP Compression
     szip_options_mask = H5_SZIP_NN_OPTION_MASK;
     szip_pixels_per_block = 16;
     status = H5Pset_szip (plist_id, szip_options_mask, szip_pixels_per_block);
     */
-    
-    dataset_id = H5Dcreate2 (file_id, "Compressed_Data", H5T_STD_I32BE, 
-                            dataspace_id, H5P_DEFAULT, plist_id, H5P_DEFAULT); 
 
-    for (i = 0; i< DIM0; i++) 
-        for (j=0; j<DIM1; j++) 
-           buf[i][j] = i+j;
+    dataset_id = H5Dcreate2(file_id, "Compressed_Data", H5T_STD_I32BE, dataspace_id, H5P_DEFAULT, plist_id,
+                            H5P_DEFAULT);
 
-    status = H5Dwrite (dataset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf);
+    for (i = 0; i < DIM0; i++)
+        for (j = 0; j < DIM1; j++)
+            buf[i][j] = i + j;
 
-    status = H5Sclose (dataspace_id);
-    status = H5Dclose (dataset_id);
-    status = H5Pclose (plist_id);
-    status = H5Fclose (file_id);
+    status = H5Dwrite(dataset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf);
+
+    status = H5Sclose(dataspace_id);
+    status = H5Dclose(dataset_id);
+    status = H5Pclose(plist_id);
+    status = H5Fclose(file_id);
 
     /* Now reopen the file and dataset in the file. */
-    file_id = H5Fopen (FILE, H5F_ACC_RDWR, H5P_DEFAULT);
-    dataset_id = H5Dopen2 (file_id, "Compressed_Data", H5P_DEFAULT);
+    file_id    = H5Fopen(FILE, H5F_ACC_RDWR, H5P_DEFAULT);
+    dataset_id = H5Dopen2(file_id, "Compressed_Data", H5P_DEFAULT);
 
     /* Retrieve filter information. */
-    plist_id = H5Dget_create_plist (dataset_id);
-    
-    numfilt = H5Pget_nfilters (plist_id);
-    printf ("Number of filters associated with dataset: %i\n", numfilt);
-     
-    for (i=0; i<numfilt; i++) {
-       nelmts = 0;
-       filter_type = H5Pget_filter2 (plist_id, 0, &flags, &nelmts, NULL, 0, NULL,
-                     &filter_info);
-       printf ("Filter Type: ");
-       switch (filter_type) {
-         case H5Z_FILTER_DEFLATE:
-              printf ("H5Z_FILTER_DEFLATE\n");
-              break;
-         case H5Z_FILTER_SZIP:
-              printf ("H5Z_FILTER_SZIP\n");
-              break;
-         default:
-              printf ("Other filter type included.\n");
-         }
+    plist_id = H5Dget_create_plist(dataset_id);
+
+    numfilt = H5Pget_nfilters(plist_id);
+    printf("Number of filters associated with dataset: %i\n", numfilt);
+
+    for (i = 0; i < numfilt; i++) {
+        nelmts      = 0;
+        filter_type = H5Pget_filter2(plist_id, i, &flags, &nelmts, NULL, 0, NULL, &filter_info);
+        printf("Filter Type: ");
+        switch (filter_type) {
+            case H5Z_FILTER_DEFLATE:
+                printf("H5Z_FILTER_DEFLATE\n");
+                break;
+            case H5Z_FILTER_SZIP:
+                printf("H5Z_FILTER_SZIP\n");
+                break;
+            default:
+                printf("Other filter type included.\n");
+        }
     }
 
-    status = H5Dread (dataset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, 
-                      H5P_DEFAULT, rbuf); 
-    
-    status = H5Dclose (dataset_id);
-    status = H5Pclose (plist_id);
-    status = H5Fclose (file_id);
+    status = H5Dread(dataset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf);
+
+    status = H5Dclose(dataset_id);
+    status = H5Pclose(plist_id);
+    status = H5Fclose(file_id);
 }
diff --git a/examples/h5_compound.c b/examples/h5_compound.c
index 3fca2a5..3ae1961 100644
--- a/examples/h5_compound.c
+++ b/examples/h5_compound.c
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
@@ -21,10 +18,10 @@
 
 #include "hdf5.h"
 
-#define H5FILE_NAME          "SDScompound.h5"
-#define DATASETNAME   "ArrayOfStructures"
-#define LENGTH        10
-#define RANK          1
+#define H5FILE_NAME "SDScompound.h5"
+#define DATASETNAME "ArrayOfStructures"
+#define LENGTH      10
+#define RANK        1
 
 int
 main(void)
@@ -32,38 +29,37 @@ main(void)
 
     /* First structure  and dataset*/
     typedef struct s1_t {
-	int    a;
-	float  b;
-	double c;
+        int    a;
+        float  b;
+        double c;
     } s1_t;
-    s1_t       s1[LENGTH];
-    hid_t      s1_tid;     /* File datatype identifier */
+    s1_t  s1[LENGTH];
+    hid_t s1_tid; /* File datatype identifier */
 
     /* Second structure (subset of s1_t)  and dataset*/
     typedef struct s2_t {
-	double c;
-	int    a;
+        double c;
+        int    a;
     } s2_t;
-    s2_t       s2[LENGTH];
-    hid_t      s2_tid;    /* Memory datatype handle */
+    s2_t  s2[LENGTH];
+    hid_t s2_tid; /* Memory datatype handle */
 
     /* Third "structure" ( will be used to read float field of s1) */
-    hid_t      s3_tid;   /* Memory datatype handle */
-    float      s3[LENGTH];
-
-    int        i;
-    hid_t      file, dataset, space; /* Handles */
-    herr_t     status;
-    hsize_t    dim[] = {LENGTH};   /* Dataspace dimensions */
+    hid_t s3_tid; /* Memory datatype handle */
+    float s3[LENGTH];
 
+    int     i;
+    hid_t   file, dataset, space; /* Handles */
+    herr_t  status;
+    hsize_t dim[] = {LENGTH}; /* Dataspace dimensions */
 
     /*
      * Initialize the data
      */
-    for (i = 0; i< LENGTH; i++) {
+    for (i = 0; i < LENGTH; i++) {
         s1[i].a = i;
-        s1[i].b = i*i;
-        s1[i].c = 1./(i+1);
+        s1[i].b = i * i;
+        s1[i].c = 1. / (i + 1);
     }
 
     /*
@@ -79,7 +75,7 @@ main(void)
     /*
      * Create the memory data type.
      */
-    s1_tid = H5Tcreate (H5T_COMPOUND, sizeof(s1_t));
+    s1_tid = H5Tcreate(H5T_COMPOUND, sizeof(s1_t));
     H5Tinsert(s1_tid, "a_name", HOFFSET(s1_t, a), H5T_NATIVE_INT);
     H5Tinsert(s1_tid, "c_name", HOFFSET(s1_t, c), H5T_NATIVE_DOUBLE);
     H5Tinsert(s1_tid, "b_name", HOFFSET(s1_t, b), H5T_NATIVE_FLOAT);
@@ -128,12 +124,14 @@ main(void)
      */
     printf("\n");
     printf("Field c : \n");
-    for( i = 0; i < LENGTH; i++) printf("%.4f ", s2[i].c);
+    for (i = 0; i < LENGTH; i++)
+        printf("%.4f ", s2[i].c);
     printf("\n");
 
     printf("\n");
     printf("Field a : \n");
-    for( i = 0; i < LENGTH; i++) printf("%d ", s2[i].a);
+    for (i = 0; i < LENGTH; i++)
+        printf("%d ", s2[i].a);
     printf("\n");
 
     /*
@@ -153,7 +151,8 @@ main(void)
      */
     printf("\n");
     printf("Field b : \n");
-    for( i = 0; i < LENGTH; i++) printf("%.4f ", s3[i]);
+    for (i = 0; i < LENGTH; i++)
+        printf("%.4f ", s3[i]);
     printf("\n");
 
     /*
diff --git a/examples/h5_crtatt.c b/examples/h5_crtatt.c
index 5e1378c..f33e1f1 100644
--- a/examples/h5_crtatt.c
+++ b/examples/h5_crtatt.c
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
@@ -21,43 +18,44 @@
 #include "hdf5.h"
 #define FILE "dset.h5"
 
-int main() {
+int
+main()
+{
 
-   hid_t       file_id, dataset_id, attribute_id, dataspace_id;  /* identifiers */
-   hsize_t     dims;
-   int         attr_data[2];
-   herr_t      status;
+    hid_t   file_id, dataset_id, attribute_id, dataspace_id; /* identifiers */
+    hsize_t dims;
+    int     attr_data[2];
+    herr_t  status;
 
-   /* Initialize the attribute data. */
-   attr_data[0] = 100;
-   attr_data[1] = 200;
+    /* Initialize the attribute data. */
+    attr_data[0] = 100;
+    attr_data[1] = 200;
 
-   /* Open an existing file. */
-   file_id = H5Fopen(FILE, H5F_ACC_RDWR, H5P_DEFAULT);
+    /* Open an existing file. */
+    file_id = H5Fopen(FILE, H5F_ACC_RDWR, H5P_DEFAULT);
 
-   /* Open an existing dataset. */
-   dataset_id = H5Dopen2(file_id, "/dset", H5P_DEFAULT);
+    /* Open an existing dataset. */
+    dataset_id = H5Dopen2(file_id, "/dset", H5P_DEFAULT);
 
-   /* Create the data space for the attribute. */
-   dims = 2;
-   dataspace_id = H5Screate_simple(1, &dims, NULL);
+    /* Create the data space for the attribute. */
+    dims         = 2;
+    dataspace_id = H5Screate_simple(1, &dims, NULL);
 
-   /* Create a dataset attribute. */
-   attribute_id = H5Acreate2 (dataset_id, "Units", H5T_STD_I32BE, dataspace_id, 
-                             H5P_DEFAULT, H5P_DEFAULT);
+    /* Create a dataset attribute. */
+    attribute_id = H5Acreate2(dataset_id, "Units", H5T_STD_I32BE, dataspace_id, H5P_DEFAULT, H5P_DEFAULT);
 
-   /* Write the attribute data. */
-   status = H5Awrite(attribute_id, H5T_NATIVE_INT, attr_data);
+    /* Write the attribute data. */
+    status = H5Awrite(attribute_id, H5T_NATIVE_INT, attr_data);
 
-   /* Close the attribute. */
-   status = H5Aclose(attribute_id);
+    /* Close the attribute. */
+    status = H5Aclose(attribute_id);
 
-   /* Close the dataspace. */
-   status = H5Sclose(dataspace_id);
+    /* Close the dataspace. */
+    status = H5Sclose(dataspace_id);
 
-   /* Close to the dataset. */
-   status = H5Dclose(dataset_id);
+    /* Close to the dataset. */
+    status = H5Dclose(dataset_id);
 
-   /* Close the file. */
-   status = H5Fclose(file_id);
+    /* Close the file. */
+    status = H5Fclose(file_id);
 }
diff --git a/examples/h5_crtdat.c b/examples/h5_crtdat.c
index f9327e7..8de9077 100644
--- a/examples/h5_crtdat.c
+++ b/examples/h5_crtdat.c
@@ -1,51 +1,49 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- *  This example illustrates how to create a dataset that is a 4 x 6 
+ *  This example illustrates how to create a dataset that is a 4 x 6
  *  array.  It is used in the HDF5 Tutorial.
  */
 
 #include "hdf5.h"
 #define FILE "dset.h5"
 
-int main() {
+int
+main()
+{
 
-   hid_t       file_id, dataset_id, dataspace_id;  /* identifiers */
-   hsize_t     dims[2];
-   herr_t      status;
+    hid_t   file_id, dataset_id, dataspace_id; /* identifiers */
+    hsize_t dims[2];
+    herr_t  status;
 
-   /* Create a new file using default properties. */
-   file_id = H5Fcreate(FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    /* Create a new file using default properties. */
+    file_id = H5Fcreate(FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
-   /* Create the data space for the dataset. */
-   dims[0] = 4; 
-   dims[1] = 6; 
-   dataspace_id = H5Screate_simple(2, dims, NULL);
+    /* Create the data space for the dataset. */
+    dims[0]      = 4;
+    dims[1]      = 6;
+    dataspace_id = H5Screate_simple(2, dims, NULL);
 
-   /* Create the dataset. */
-   dataset_id = H5Dcreate2(file_id, "/dset", H5T_STD_I32BE, dataspace_id, 
-                          H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    /* Create the dataset. */
+    dataset_id =
+        H5Dcreate2(file_id, "/dset", H5T_STD_I32BE, dataspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
-   /* End access to the dataset and release resources used by it. */
-   status = H5Dclose(dataset_id);
+    /* End access to the dataset and release resources used by it. */
+    status = H5Dclose(dataset_id);
 
-   /* Terminate access to the data space. */ 
-   status = H5Sclose(dataspace_id);
+    /* Terminate access to the data space. */
+    status = H5Sclose(dataspace_id);
 
-   /* Close the file. */
-   status = H5Fclose(file_id);
+    /* Close the file. */
+    status = H5Fclose(file_id);
 }
-
diff --git a/examples/h5_crtgrp.c b/examples/h5_crtgrp.c
index a626ed8..f9066f4 100644
--- a/examples/h5_crtgrp.c
+++ b/examples/h5_crtgrp.c
@@ -1,40 +1,39 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- *  This example illustrates how to create and close a group. 
+ *  This example illustrates how to create and close a group.
  *  It is used in the HDF5 Tutorial.
  */
 
 #include "hdf5.h"
 #define FILE "group.h5"
 
-int main() {
+int
+main()
+{
 
-   hid_t       file_id, group_id;  /* identifiers */
-   herr_t      status;
+    hid_t  file_id, group_id; /* identifiers */
+    herr_t status;
 
-   /* Create a new file using default properties. */
-   file_id = H5Fcreate(FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    /* Create a new file using default properties. */
+    file_id = H5Fcreate(FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
-   /* Create a group named "/MyGroup" in the file. */
-   group_id = H5Gcreate2(file_id, "/MyGroup", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    /* Create a group named "/MyGroup" in the file. */
+    group_id = H5Gcreate2(file_id, "/MyGroup", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
-   /* Close the group. */
-   status = H5Gclose(group_id);
+    /* Close the group. */
+    status = H5Gclose(group_id);
 
-   /* Terminate access to the file. */
-   status = H5Fclose(file_id);
+    /* Terminate access to the file. */
+    status = H5Fclose(file_id);
 }
diff --git a/examples/h5_crtgrpar.c b/examples/h5_crtgrpar.c
index e8cf7c3..f397155 100644
--- a/examples/h5_crtgrpar.c
+++ b/examples/h5_crtgrpar.c
@@ -1,48 +1,47 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- *  This example illustrates the creation of groups using absolute and 
+ *  This example illustrates the creation of groups using absolute and
  *  relative names.  It is used in the HDF5 Tutorial.
  */
 
 #include "hdf5.h"
 #define FILE "groups.h5"
 
-int main() {
+int
+main()
+{
 
-   hid_t       file_id, group1_id, group2_id, group3_id;  /* identifiers */
-   herr_t      status;
+    hid_t  file_id, group1_id, group2_id, group3_id; /* identifiers */
+    herr_t status;
 
-   /* Create a new file using default properties. */
-   file_id = H5Fcreate(FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    /* Create a new file using default properties. */
+    file_id = H5Fcreate(FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
-   /* Create group "MyGroup" in the root group using absolute name. */
-   group1_id = H5Gcreate2(file_id, "/MyGroup", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    /* Create group "MyGroup" in the root group using absolute name. */
+    group1_id = H5Gcreate2(file_id, "/MyGroup", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
-   /* Create group "Group_A" in group "MyGroup" using absolute name. */
-   group2_id = H5Gcreate2(file_id, "/MyGroup/Group_A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    /* Create group "Group_A" in group "MyGroup" using absolute name. */
+    group2_id = H5Gcreate2(file_id, "/MyGroup/Group_A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
-   /* Create group "Group_B" in group "MyGroup" using relative name. */
-   group3_id = H5Gcreate2(group1_id, "Group_B", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    /* Create group "Group_B" in group "MyGroup" using relative name. */
+    group3_id = H5Gcreate2(group1_id, "Group_B", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
-   /* Close groups. */
-   status = H5Gclose(group1_id);
-   status = H5Gclose(group2_id);
-   status = H5Gclose(group3_id);
+    /* Close groups. */
+    status = H5Gclose(group1_id);
+    status = H5Gclose(group2_id);
+    status = H5Gclose(group3_id);
 
-   /* Close the file. */
-   status = H5Fclose(file_id);
+    /* Close the file. */
+    status = H5Fclose(file_id);
 }
diff --git a/examples/h5_crtgrpd.c b/examples/h5_crtgrpd.c
index d6a320b..364a3b9 100644
--- a/examples/h5_crtgrpd.c
+++ b/examples/h5_crtgrpd.c
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
@@ -21,71 +18,70 @@
 #include "hdf5.h"
 #define FILE "groups.h5"
 
-int main() {
+int
+main()
+{
 
-   hid_t       file_id, group_id, dataset_id, dataspace_id;  /* identifiers */
-   hsize_t     dims[2];
-   herr_t      status;
-   int         i, j, dset1_data[3][3], dset2_data[2][10];
+    hid_t   file_id, group_id, dataset_id, dataspace_id; /* identifiers */
+    hsize_t dims[2];
+    herr_t  status;
+    int     i, j, dset1_data[3][3], dset2_data[2][10];
 
-   /* Initialize the first dataset. */
-   for (i = 0; i < 3; i++)
-      for (j = 0; j < 3; j++)
-         dset1_data[i][j] = j + 1;
+    /* Initialize the first dataset. */
+    for (i = 0; i < 3; i++)
+        for (j = 0; j < 3; j++)
+            dset1_data[i][j] = j + 1;
 
-   /* Initialize the second dataset. */
-   for (i = 0; i < 2; i++)
-      for (j = 0; j < 10; j++)
-         dset2_data[i][j] = j + 1;
+    /* Initialize the second dataset. */
+    for (i = 0; i < 2; i++)
+        for (j = 0; j < 10; j++)
+            dset2_data[i][j] = j + 1;
 
-   /* Open an existing file. */
-   file_id = H5Fopen(FILE, H5F_ACC_RDWR, H5P_DEFAULT);
+    /* Open an existing file. */
+    file_id = H5Fopen(FILE, H5F_ACC_RDWR, H5P_DEFAULT);
 
-   /* Create the data space for the first dataset. */
-   dims[0] = 3;
-   dims[1] = 3;
-   dataspace_id = H5Screate_simple(2, dims, NULL);
+    /* Create the data space for the first dataset. */
+    dims[0]      = 3;
+    dims[1]      = 3;
+    dataspace_id = H5Screate_simple(2, dims, NULL);
 
-   /* Create a dataset in group "MyGroup". */
-   dataset_id = H5Dcreate2(file_id, "/MyGroup/dset1", H5T_STD_I32BE, dataspace_id,
-                          H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    /* Create a dataset in group "MyGroup". */
+    dataset_id = H5Dcreate2(file_id, "/MyGroup/dset1", H5T_STD_I32BE, dataspace_id, H5P_DEFAULT, H5P_DEFAULT,
+                            H5P_DEFAULT);
 
-   /* Write the first dataset. */
-   status = H5Dwrite(dataset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT,
-                     dset1_data);
+    /* Write the first dataset. */
+    status = H5Dwrite(dataset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset1_data);
 
-   /* Close the data space for the first dataset. */
-   status = H5Sclose(dataspace_id);
+    /* Close the data space for the first dataset. */
+    status = H5Sclose(dataspace_id);
 
-   /* Close the first dataset. */
-   status = H5Dclose(dataset_id);
+    /* Close the first dataset. */
+    status = H5Dclose(dataset_id);
 
-   /* Open an existing group of the specified file. */
-   group_id = H5Gopen2(file_id, "/MyGroup/Group_A", H5P_DEFAULT);
+    /* Open an existing group of the specified file. */
+    group_id = H5Gopen2(file_id, "/MyGroup/Group_A", H5P_DEFAULT);
 
-   /* Create the data space for the second dataset. */
-   dims[0] = 2;
-   dims[1] = 10;
-   dataspace_id = H5Screate_simple(2, dims, NULL);
+    /* Create the data space for the second dataset. */
+    dims[0]      = 2;
+    dims[1]      = 10;
+    dataspace_id = H5Screate_simple(2, dims, NULL);
 
-   /* Create the second dataset in group "Group_A". */
-   dataset_id = H5Dcreate2(group_id, "dset2", H5T_STD_I32BE, dataspace_id, 
-                          H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    /* Create the second dataset in group "Group_A". */
+    dataset_id =
+        H5Dcreate2(group_id, "dset2", H5T_STD_I32BE, dataspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
-   /* Write the second dataset. */
-   status = H5Dwrite(dataset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT,
-                     dset2_data);
+    /* Write the second dataset. */
+    status = H5Dwrite(dataset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset2_data);
 
-   /* Close the data space for the second dataset. */
-   status = H5Sclose(dataspace_id);
+    /* Close the data space for the second dataset. */
+    status = H5Sclose(dataspace_id);
 
-   /* Close the second dataset */
-   status = H5Dclose(dataset_id);
+    /* Close the second dataset */
+    status = H5Dclose(dataset_id);
 
-   /* Close the group. */
-   status = H5Gclose(group_id);
+    /* Close the group. */
+    status = H5Gclose(group_id);
 
-   /* Close the file. */
-   status = H5Fclose(file_id);
+    /* Close the file. */
+    status = H5Fclose(file_id);
 }
-
diff --git a/examples/h5_debug_trace.c b/examples/h5_debug_trace.c
new file mode 100644
index 0000000..ebc5c54
--- /dev/null
+++ b/examples/h5_debug_trace.c
@@ -0,0 +1,137 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/* This example demonstrates debug trace output.
+ *
+ * Debug/trace/performance output is not tested as a regular part of our
+ * testing so this program gives a quick check that it's all working.
+ *
+ * Preconditions:
+ *
+ * You need to set an environment variable named HDF5_DEBUG to have a value
+ * of "+all trace ttimes".  In the bash shell, you'd use:
+ *
+ *      export HDF5_DEBUG="+all trace ttimes"
+ *
+ * When you are done with this test program, you can set the variable back
+ * to "-all" to suppress trace output.
+ *
+ * Usage:
+ *
+ * Compile and run the test program, then inspect the output.  You should see
+ * trace information for each HDF5 function call that increase over time.
+ * Each time stamp is in seconds and designated with an '@' sign.  The
+ * elapsed time for the function call is given in seconds in the [dt= ]
+ * part.
+ *
+ * You will also get summary output for the shuffle filter performance and
+ * data type conversion performance.  These will include the elapsed time
+ * (always) and the system and user times (if available on your system).  On
+ * fast machines, these numbers may be 0.0.  Adjust the loop variables in
+ * the program as needed to generate reasonable output.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "hdf5.h"
+
+#define BUF_SIZE 1048576
+#define N_LOOPS  64
+
+#define TESTFILE "h5_debug_trace_out.h5"
+
+int
+main(int argc, char **argv)
+{
+    int  i, j;
+    int *data;
+
+    hid_t fid;
+    hid_t pid;
+    hid_t did;
+    hid_t sid;
+
+    hsize_t dims[1]        = {BUF_SIZE};
+    hsize_t chunk_sizes[1] = {1024};
+
+    herr_t err;
+
+    /*************************************************************************/
+
+    /* Warn the user about trace deluge to come */
+
+    printf("Testing debug/trace/performance data generation\n");
+    printf("\n");
+    printf("This test should generate a large amount of trace data\n");
+    printf("\n");
+    printf("*** BEGIN TRACE OUTPUT ***\n");
+    printf("\n");
+    fflush(stdout);
+
+    /* This will emit H5Tconvert() performance information */
+
+    for (i = 0; i < N_LOOPS; i++) {
+
+        /* The buffer has to be large enough to hold the conversion output */
+        data = (int *)malloc(BUF_SIZE * sizeof(double));
+
+        for (j = 0; j < BUF_SIZE; j++) {
+            data[j] = j;
+        }
+
+        err = H5Tconvert(H5T_NATIVE_INT, H5T_NATIVE_DOUBLE, BUF_SIZE, data, NULL, H5P_DEFAULT);
+
+        if (err < 0) {
+            fprintf(stderr, "ERROR: Conversion failed\n");
+            free(data);
+            return err;
+        }
+
+        free(data);
+    }
+
+    /* This will emit H5Z performance information */
+
+    data = (int *)malloc(BUF_SIZE * sizeof(int));
+
+    for (i = 0; i < BUF_SIZE; i++) {
+        data[i] = i;
+    }
+
+    fid = H5Fcreate(TESTFILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+
+    pid = H5Pcreate(H5P_DATASET_CREATE);
+    err = H5Pset_chunk(pid, 1, chunk_sizes);
+    err = H5Pset_shuffle(pid);
+
+    sid = H5Screate_simple(1, dims, dims);
+    did = H5Dcreate2(fid, "somedata", H5T_NATIVE_INT, sid, H5P_DEFAULT, pid, H5P_DEFAULT);
+    err = H5Dwrite(did, H5T_NATIVE_INT, sid, sid, H5P_DEFAULT, data);
+
+    H5Sclose(sid);
+    H5Dclose(did);
+    H5Pclose(pid);
+    H5Fclose(fid);
+
+    free(data);
+
+    /* Finished */
+    fflush(stdout);
+    printf("\n");
+    printf("*** END TRACE OUTPUT ***\n");
+    printf("\n");
+
+    remove(TESTFILE);
+
+    return 0;
+}
diff --git a/examples/h5_drivers.c b/examples/h5_drivers.c
index 7245794..1c0ae37 100644
--- a/examples/h5_drivers.c
+++ b/examples/h5_drivers.c
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
@@ -24,13 +21,12 @@
 #include "stdlib.h"
 
 /* global variables */
-int cleanup_g	=	-1;	/* whether to clean.  Init to not set. */
+int cleanup_g = -1; /* whether to clean.  Init to not set. */
 
 /* prototypes */
 void cleanup(const char *);
 void split_file(void);
 
-
 /*
  * Cleanup a file unless $HDF5_NOCLEANUP is set.
  */
@@ -38,12 +34,11 @@ void
 cleanup(const char *filename)
 {
     if (cleanup_g == -1)
-	cleanup_g = getenv("HDF5_NOCLEANUP") ? 0 : 1;
+        cleanup_g = getenv(HDF5_NOCLEANUP) ? 0 : 1;
     if (cleanup_g)
-	remove(filename);
+        remove(filename);
 }
 
-
 /*
  * This shows how to use the split file driver.
  */
@@ -57,7 +52,7 @@ split_file(void)
     /*    the metadata and rawdata files.                          */
     fapl = H5Pcreate(H5P_FILE_ACCESS);
     H5Pset_fapl_split(fapl, "-m.h5", H5P_DEFAULT, "-r.h5", H5P_DEFAULT);
-    fid=H5Fcreate("Station1",H5F_ACC_TRUNC,H5P_DEFAULT,fapl);
+    fid = H5Fcreate("Station1", H5F_ACC_TRUNC, H5P_DEFAULT, fapl);
     /* using the file ... */
     H5Fclose(fid);
     H5Pclose(fapl);
@@ -70,7 +65,7 @@ split_file(void)
     /*    the metadata and rawdata files.                          */
     fapl = H5Pcreate(H5P_FILE_ACCESS);
     H5Pset_fapl_split(fapl, "-m.h5", H5P_DEFAULT, "/tmp/%s-r.h5", H5P_DEFAULT);
-    fid=H5Fcreate("PointA",H5F_ACC_TRUNC,H5P_DEFAULT,fapl);
+    fid = H5Fcreate("PointA", H5F_ACC_TRUNC, H5P_DEFAULT, fapl);
     /* using the file ... */
     H5Fclose(fid);
     H5Pclose(fapl);
@@ -83,7 +78,7 @@ split_file(void)
     /*    the metadata and rawdata files.                          */
     fapl = H5Pcreate(H5P_FILE_ACCESS);
     H5Pset_fapl_split(fapl, NULL, H5P_DEFAULT, NULL, H5P_DEFAULT);
-    fid=H5Fcreate("Measure",H5F_ACC_TRUNC,H5P_DEFAULT,fapl);
+    fid = H5Fcreate("Measure", H5F_ACC_TRUNC, H5P_DEFAULT, fapl);
     /* using the file ... */
     H5Fclose(fid);
     H5Pclose(fapl);
@@ -92,13 +87,12 @@ split_file(void)
     cleanup("Measure.raw");
 }
 
-
 /* Main Body */
 int
-main (void)
+main(void)
 {
 
     split_file();
 
-    return(0);
+    return (0);
 }
diff --git a/examples/h5_dtransform.c b/examples/h5_dtransform.c
index 71ec10a..c93b073 100644
--- a/examples/h5_dtransform.c
+++ b/examples/h5_dtransform.c
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
@@ -35,50 +32,48 @@
 
 #include "hdf5.h"
 
-#define ROWS    12
-#define COLS    18
+#define ROWS 12
+#define COLS 18
 
+/* clang-format off */
 const float windchillF[ROWS][COLS] =
-    {   {36.0, 31.0, 25.0, 19.0, 13.0, 7.0, 1.0, -5.0, -11.0, -16.0, -22.0, -28.0, -34.0, -40.0, -46.0, -52.0, -57.0, -63.0 },
-        {34.0, 27.0, 21.0, 15.0, 9.0, 3.0, -4.0, -10.0, -16.0, -22.0, -28.0, -35.0, -41.0, -47.0, -53.0, -59.0, -66.0, -72.0 } ,
-        {32.0, 25.0, 19.0, 13.0, 6.0, 0.0, -7.0, -13.0, -19.0, -26.0, -32.0, -39.0, -45.0, -51.0, -58.0, -64.0, -71.0, -77.0 },
-        {30.0, 24.0, 17.0, 11.0, 4.0, -2.0, -9.0, -15.0, -22.0, -29.0, -35.0, -42.0, -48.0, -55.0, -61.0, -68.0, -74.0, -81.0 },
-        {29.0, 23.0, 16.0, 9.0, 3.0, -4.0, -11.0, -17.0, -24.0, -31.0, -37.0, -44.0, -51.0, -58.0, -64.0, -71.0, -78.0, -84.0 },
-        {28.0, 22.0, 15.0, 8.0, 1.0, -5.0, -12.0, -19.0, -26.0, -33.0, -39.0, -46.0, -53.0, -60.0, -67.0, -73.0, -80.0, -87.0 },
-        {28.0, 21.0, 14.0, 7.0, 0.0, -7.0, -14.0, -21.0, -27.0, -34.0, -41.0, -48.0, -55.0, -62.0, -69.0, -76.0, -82.0, -89.0 },
-        {27.0, 20.0, 13.0, 6.0, -1.0, -8.0, -15.0, -22.0, -29.0, -36.0, -43.0, -50.0, -57.0, -64.0, -71.0, -78.0, -84.0, -91.0 },
-        {26.0, 19.0, 12.0, 5.0, -2.0, -9.0, -16.0, -23.0, -30.0, -37.0, -44.0, -51.0, -58.0, -65.0, -72.0, -79.0, -86.0, -93.0 },
+    {   {36.0, 31.0, 25.0, 19.0, 13.0, 7.0,   1.0,  -5.0,  -11.0, -16.0, -22.0, -28.0, -34.0, -40.0, -46.0, -52.0, -57.0, -63.0},
+        {34.0, 27.0, 21.0, 15.0, 9.0,  3.0,  -4.0,  -10.0, -16.0, -22.0, -28.0, -35.0, -41.0, -47.0, -53.0, -59.0, -66.0, -72.0},
+        {32.0, 25.0, 19.0, 13.0, 6.0,  0.0,  -7.0,  -13.0, -19.0, -26.0, -32.0, -39.0, -45.0, -51.0, -58.0, -64.0, -71.0, -77.0},
+        {30.0, 24.0, 17.0, 11.0, 4.0, -2.0,  -9.0,  -15.0, -22.0, -29.0, -35.0, -42.0, -48.0, -55.0, -61.0, -68.0, -74.0, -81.0},
+        {29.0, 23.0, 16.0, 9.0,  3.0, -4.0,  -11.0, -17.0, -24.0, -31.0, -37.0, -44.0, -51.0, -58.0, -64.0, -71.0, -78.0, -84.0},
+        {28.0, 22.0, 15.0, 8.0,  1.0, -5.0,  -12.0, -19.0, -26.0, -33.0, -39.0, -46.0, -53.0, -60.0, -67.0, -73.0, -80.0, -87.0},
+        {28.0, 21.0, 14.0, 7.0,  0.0, -7.0,  -14.0, -21.0, -27.0, -34.0, -41.0, -48.0, -55.0, -62.0, -69.0, -76.0, -82.0, -89.0},
+        {27.0, 20.0, 13.0, 6.0, -1.0, -8.0,  -15.0, -22.0, -29.0, -36.0, -43.0, -50.0, -57.0, -64.0, -71.0, -78.0, -84.0, -91.0},
+        {26.0, 19.0, 12.0, 5.0, -2.0, -9.0,  -16.0, -23.0, -30.0, -37.0, -44.0, -51.0, -58.0, -65.0, -72.0, -79.0, -86.0, -93.0},
         {26.0, 19.0, 12.0, 4.0, -3.0, -10.0, -17.0, -24.0, -31.0, -38.0, -45.0, -52.0, -60.0, -67.0, -74.0, -81.0, -88.0, -95.0},
         {25.0, 18.0, 11.0, 4.0, -3.0, -11.0, -18.0, -25.0, -32.0, -39.0, -46.0, -54.0, -61.0, -68.0, -75.0, -82.0, -89.0, -97.0},
         {25.0, 17.0, 10.0, 3.0, -4.0, -11.0, -19.0, -26.0, -33.0, -40.0, -48.0, -55.0, -62.0, -69.0, -76.0, -84.0, -91.0, -98.0}
     };
+/* clang-format on */
 
-#define PRINT(array)				\
-{						\
-    for(i=0; i<ROWS; i++)			\
-    {						\
-	for(j=0; j<COLS; j++)			\
-	    printf("%6.2f ", array[i][j]);	\
-	printf("\n");				\
-    }						\
-}
-
-
-
+#define PRINT(array)                                                                                         \
+    {                                                                                                        \
+        for (i = 0; i < ROWS; i++) {                                                                         \
+            for (j = 0; j < COLS; j++)                                                                       \
+                printf("%6.2f ", array[i][j]);                                                               \
+            printf("\n");                                                                                    \
+        }                                                                                                    \
+    }
 
 int
-main (void)
+main(void)
 {
-    hid_t       file, dataset;         /* file and dataset handles */
-    hid_t       dataspace;   /* handles */
-    hsize_t     dimsf[2];              /* dataset dimensions */
+    hid_t       file, dataset; /* file and dataset handles */
+    hid_t       dataspace;     /* handles */
+    hsize_t     dimsf[2];      /* dataset dimensions */
     herr_t      status;
-    hid_t	dxpl_id_f_to_c, dxpl_id_c_to_f;	/* data transform handles */
-    const char* f_to_c = "(5/9.0)*(x-32)";
-    const char* c_to_f =  "(9/5.0)*x + 32";
-    char*	transform;
-    float	windchillC[ROWS][COLS];
-    int 	i,j, transform_size;
+    hid_t       dxpl_id_f_to_c, dxpl_id_c_to_f; /* data transform handles */
+    const char *f_to_c = "(5/9.0)*(x-32)";
+    const char *c_to_f = "(9/5.0)*x + 32";
+    char       *transform;
+    float       windchillC[ROWS][COLS];
+    int         i, j, transform_size;
 
     /*
      * Create a new file using H5F_ACC_TRUNC access,
@@ -91,28 +86,25 @@ main (void)
      * Describe the size of the array and create the data space for fixed
      * size dataset.
      */
-    dimsf[0] = ROWS;
-    dimsf[1] = COLS;
+    dimsf[0]  = ROWS;
+    dimsf[1]  = COLS;
     dataspace = H5Screate_simple(2, dimsf, NULL);
 
     /*
      * Create a new dataset within the file using defined dataspace and
      * datatype and default dataset creation properties.
      */
-    dataset = H5Dcreate2(file, "data_no_trans", H5T_NATIVE_FLOAT, dataspace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    dataset =
+        H5Dcreate2(file, "data_no_trans", H5T_NATIVE_FLOAT, dataspace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     printf("\nOriginal Data: \n");
 
     PRINT(windchillF);
 
-
-
-
-/****************  PART 1 **************/
+    /****************  PART 1 **************/
     /*
      * Write the data to the dataset using default transfer properties (ie, no transform set)
      */
-    status = H5Dwrite(dataset, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL,
-		      H5P_DEFAULT, windchillF);
+    status = H5Dwrite(dataset, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, H5P_DEFAULT, windchillF);
 
     /* Create the dataset transfer property list */
     dxpl_id_f_to_c = H5Pcreate(H5P_DATASET_XFER);
@@ -127,13 +119,11 @@ main (void)
     printf("\nData with no write transform, but a read transform: \n");
     PRINT(windchillC);
 
-
-/****************  PART 2 **************/
+    /****************  PART 2 **************/
     /*
      * Write the data to the dataset with the f_to_c transform set
      */
-    status = H5Dwrite(dataset, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL,
-		      dxpl_id_f_to_c, windchillF);
+    status = H5Dwrite(dataset, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, dxpl_id_f_to_c, windchillF);
 
     /* Read out the data with the default transfer list (ie, no transform set) */
     H5Dread(dataset, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, H5P_DEFAULT, windchillC);
@@ -142,8 +132,7 @@ main (void)
     printf("\nData with write transform, but no read transform: \n");
     PRINT(windchillC);
 
-/************** PART 3 ***************/
-
+    /************** PART 3 ***************/
 
     /* Create the dataset transfer property list */
     dxpl_id_c_to_f = H5Pcreate(H5P_DATASET_XFER);
@@ -151,12 +140,10 @@ main (void)
     /* Set the data transform to be used on the read*/
     H5Pset_data_transform(dxpl_id_c_to_f, c_to_f);
 
-
     /*
      * Write the data to the dataset using the f_to_c transform
      */
-    status = H5Dwrite(dataset, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL,
-		      dxpl_id_f_to_c, windchillF);
+    status = H5Dwrite(dataset, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, dxpl_id_f_to_c, windchillF);
 
     /* Read the data with the c_to_f data transform */
     H5Dread(dataset, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, dxpl_id_c_to_f, windchillC);
@@ -165,10 +152,10 @@ main (void)
     printf("\nData with both read and write data transform: \n");
     PRINT(windchillC);
 
-/************** PART 4 **************/
+    /************** PART 4 **************/
     transform_size = H5Pget_data_transform(dxpl_id_f_to_c, NULL, 0);
-    transform = (char*) malloc(transform_size+1);
-    H5Pget_data_transform(dxpl_id_f_to_c, transform, transform_size+1);
+    transform      = (char *)malloc(transform_size + 1);
+    H5Pget_data_transform(dxpl_id_f_to_c, transform, transform_size + 1);
 
     printf("\nTransform string (from dxpl_id_f_to_c) is: %s\n", transform);
 
diff --git a/examples/h5_elink_unix2win.c b/examples/h5_elink_unix2win.c
index 9c0918c..ac5f63a 100644
--- a/examples/h5_elink_unix2win.c
+++ b/examples/h5_elink_unix2win.c
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /* This program demonstrates how to translate an external link created on
@@ -29,7 +26,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-
 /* "Windows to Unix" traversal function for external links
  *
  * Translates a filename stored in Unix format to Windows format by replacing
@@ -39,45 +35,44 @@
  * Note that this may not be necessary on your system; many Windows systems can
  * understand Unix paths.
  */
-static hid_t elink_unix2win_trav(const char *link_name, hid_t cur_group,
-    const void *udata, size_t udata_size, hid_t lapl_id)
+static hid_t
+elink_unix2win_trav(const char *link_name, hid_t cur_group, const void *udata, size_t udata_size,
+                    hid_t lapl_id, hid_t dxpl_id)
 {
-    hid_t         fid;
-    const char   *file_name;
-    const char   *obj_name;
-    char         *new_fname = NULL;     /* Buffer allocated to hold Unix file path */
-    ssize_t       prefix_len;           /* External link prefix length */
-    size_t        fname_len;
-    size_t        start_pos;            /* Initial position in new_fname buffer */
-    size_t        x;                    /* Counter variable */
-    hid_t         ret_value = -1;
+    hid_t       fid;
+    const char *file_name;
+    const char *obj_name;
+    char       *new_fname = NULL; /* Buffer allocated to hold Unix file path */
+    ssize_t     prefix_len;       /* External link prefix length */
+    size_t      fname_len;
+    size_t      start_pos; /* Initial position in new_fname buffer */
+    size_t      x;         /* Counter variable */
+    hid_t       ret_value = -1;
 
     printf("Converting Unix path to Windows path.\n");
 
-    if(H5Lunpack_elink_val(udata, udata_size, NULL, &file_name, &obj_name) < 0)
+    if (H5Lunpack_elink_val(udata, udata_size, NULL, &file_name, &obj_name) < 0)
         goto error;
     fname_len = strlen(file_name);
 
     /* See if the external link prefix property is set */
-    if((prefix_len = H5Pget_elink_prefix(lapl_id, NULL, 0)) < 0)
+    if ((prefix_len = H5Pget_elink_prefix(lapl_id, NULL, 0)) < 0)
         goto error;
 
     /* If so, prepend it to the filename.  We assume that the prefix
      * is in the correct format for the current file system.
      */
-    if(prefix_len > 0)
-    {
+    if (prefix_len > 0) {
         /* Allocate a buffer to hold the filename plus prefix */
         new_fname = malloc(prefix_len + fname_len + 1);
 
         /* Copy the prefix into the buffer */
-        if(H5Pget_elink_prefix(lapl_id, new_fname, (size_t)(prefix_len + 1)) < 0)
+        if (H5Pget_elink_prefix(lapl_id, new_fname, (size_t)(prefix_len + 1)) < 0)
             goto error;
 
         start_pos = prefix_len;
     }
-    else
-    {
+    else {
         /* Allocate a buffer to hold just the filename */
         new_fname = malloc(fname_len + 1);
         start_pos = 0;
@@ -86,9 +81,8 @@ static hid_t elink_unix2win_trav(const char *link_name, hid_t cur_group,
     /* We should now copy file_name into new_fname starting at position pos.
      * We'll convert '/' characters into '\' characters as we go.
      */
-    for(x=0; file_name[x] != '\0'; x++)
-    {
-        if(file_name[x] == '/')
+    for (x = 0; file_name[x] != '\0'; x++) {
+        if (file_name[x] == '/')
             new_fname[x + start_pos] = '\\';
         else
             new_fname[x + start_pos] = file_name[x];
@@ -96,38 +90,37 @@ static hid_t elink_unix2win_trav(const char *link_name, hid_t cur_group,
     new_fname[x + start_pos] = '\0';
 
     /* Now open the file and object within it */
-    if((fid = H5Fopen(new_fname, H5F_ACC_RDWR, H5P_DEFAULT)) < 0)
+    if ((fid = H5Fopen(new_fname, H5F_ACC_RDWR, H5P_DEFAULT)) < 0)
         goto error;
     ret_value = H5Oopen(fid, obj_name, lapl_id); /* If this fails, our return value will be negative. */
-    if(H5Fclose(fid) < 0)
+    if (H5Fclose(fid) < 0)
         goto error;
 
     /* Free file name if it's been allocated */
-    if(new_fname)
+    if (new_fname)
         free(new_fname);
 
     return ret_value;
 
 error:
     /* Free file name if it's been allocated */
-    if(new_fname)
+    if (new_fname)
         free(new_fname);
     return -1;
 }
 
 const H5L_class_t elink_unix2win_class[1] = {{
-    H5L_LINK_CLASS_T_VERS,      /* H5L_class_t version       */
-    H5L_TYPE_EXTERNAL,          /* Link type id number            */
-    "unix2win external link",   /* Link class name for debugging  */
-    NULL,                       /* Creation callback              */
-    NULL,                       /* Move callback                  */
-    NULL,                       /* Copy callback                  */
-    elink_unix2win_trav,        /* The actual traversal function  */
-    NULL,                       /* Deletion callback              */
-    NULL                        /* Query callback                 */
+    H5L_LINK_CLASS_T_VERS,    /* H5L_class_t version       */
+    H5L_TYPE_EXTERNAL,        /* Link type id number            */
+    "unix2win external link", /* Link class name for debugging  */
+    NULL,                     /* Creation callback              */
+    NULL,                     /* Move callback                  */
+    NULL,                     /* Copy callback                  */
+    elink_unix2win_trav,      /* The actual traversal function  */
+    NULL,                     /* Deletion callback              */
+    NULL                      /* Query callback                 */
 }};
 
-
 /* The example function.
  * Creates a file named "unix2win.h5" with an external link pointing to
  * the file "u2w/u2w_target.h5".
@@ -138,55 +131,65 @@ const H5L_class_t elink_unix2win_class[1] = {{
 static int
 unix2win_example(void)
 {
-    hid_t  fid = (-1);         /* File ID */
-    hid_t  gid = (-1);         /* Group ID */
+    hid_t fid = (-1); /* File ID */
+    hid_t gid = (-1); /* Group ID */
 
     /* Create the target file. */
 #ifdef H5_HAVE_WIN32_API
-    if((fid=H5Fcreate("u2w\\u2w_target.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT))<0) goto error;
+    if ((fid = H5Fcreate("u2w\\u2w_target.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto error;
 #else
-    if((fid=H5Fcreate("u2w/u2w_target.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT))<0) goto error;
+    if ((fid = H5Fcreate("u2w/u2w_target.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto error;
 #endif
-    if(H5Fclose(fid) < 0) goto error;
+    if (H5Fclose(fid) < 0)
+        goto error;
 
     /* Create the source file with an external link in Windows format */
-    if((fid=H5Fcreate("unix2win.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT))<0) goto error;
+    if ((fid = H5Fcreate("unix2win.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto error;
 
     /* Create the external link */
-    if(H5Lcreate_external("u2w/../u2w/u2w_target.h5", "/", fid, "ext_link", H5P_DEFAULT, H5P_DEFAULT) < 0) goto error;
+    if (H5Lcreate_external("u2w/../u2w/u2w_target.h5", "/", fid, "ext_link", H5P_DEFAULT, H5P_DEFAULT) < 0)
+        goto error;
 
-    /* If we are not on Windows, assume we are on a Unix-y filesystem and
-     * follow the external link normally.
-     * If we are on Windows, register the unix2win traversal function so
-     * that external links can be traversed.
-     */
+        /* If we are not on Windows, assume we are on a Unix-y filesystem and
+         * follow the external link normally.
+         * If we are on Windows, register the unix2win traversal function so
+         * that external links can be traversed.
+         */
 
 #ifdef H5_HAVE_WIN32_API
     /* Register the elink_unix2win class defined above to replace default
      * external links
      */
-    if(H5Lregister(elink_unix2win_class) < 0) goto error;
+    if (H5Lregister(elink_unix2win_class) < 0)
+        goto error;
 #endif
 
     /* Now follow the link */
-    if((gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT)) < 0) goto error;
+    if ((gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT)) < 0)
+        goto error;
     printf("Successfully followed external link.\n");
 
     /* Close the group and the file */
-    if(H5Gclose(gid) <0) goto error;
-    if(H5Fclose(fid) <0) goto error;
+    if (H5Gclose(gid) < 0)
+        goto error;
+    if (H5Fclose(fid) < 0)
+        goto error;
 
     return 0;
 
- error:
+error:
     printf("Error!\n");
-    H5E_BEGIN_TRY {
-      H5Gclose (gid);
-      H5Fclose (fid);
-    } H5E_END_TRY;
+    H5E_BEGIN_TRY
+    {
+        H5Gclose(gid);
+        H5Fclose(fid);
+    }
+    H5E_END_TRY;
     return -1;
 }
-
 
 /* Main function
  *
@@ -195,12 +198,10 @@ unix2win_example(void)
 int
 main(void)
 {
-    int    ret;
+    int ret;
 
     printf("Testing unix2win external links.\n");
     ret = unix2win_example();
 
     return ret;
 }
-
-
diff --git a/examples/h5_extend.c b/examples/h5_extend.c
index 105e553..91d7db7 100644
--- a/examples/h5_extend.c
+++ b/examples/h5_extend.c
@@ -1,146 +1,130 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- *  This example how to work with extendible datasets. The dataset 
+ *  This example how to work with extendible datasets. The dataset
  *  must be chunked in order to be extendible.
- * 
+ *
  *  It is used in the HDF5 Tutorial.
  */
 
-
 #include "hdf5.h"
 
 #define FILENAME    "extend.h5"
 #define DATASETNAME "ExtendibleArray"
-#define RANK         2
+#define RANK        2
 
 int
-main (void)
+main(void)
 {
-    hid_t        file;                          /* handles */
-    hid_t        dataspace, dataset;  
-    hid_t        filespace, memspace;
-    hid_t        prop;                     
-
-    hsize_t      dims[2]  = {3, 3};           /* dataset dimensions at creation time */		
-    hsize_t      maxdims[2] = {H5S_UNLIMITED, H5S_UNLIMITED};
-    herr_t       status;                             
-    hsize_t      chunk_dims[2] = {2, 5};
-    int          data[3][3] = { {1, 1, 1},    /* data to write */
-                                {1, 1, 1},
-                                {1, 1, 1} };      
+    hid_t file; /* handles */
+    hid_t dataspace, dataset;
+    hid_t filespace, memspace;
+    hid_t prop;
+
+    hsize_t dims[2]    = {3, 3}; /* dataset dimensions at creation time */
+    hsize_t maxdims[2] = {H5S_UNLIMITED, H5S_UNLIMITED};
+    herr_t  status;
+    hsize_t chunk_dims[2] = {2, 5};
+    int     data[3][3]    = {{1, 1, 1}, /* data to write */
+                      {1, 1, 1},
+                      {1, 1, 1}};
 
     /* Variables used in extending and writing to the extended portion of dataset */
-    hsize_t      size[2];
-    hsize_t      offset[2];
-    hsize_t      dimsext[2] = {7, 3};         /* extend dimensions */
-    int          dataext[7][3] = { {2, 3, 4}, 
-                                   {2, 3, 4}, 
-                                   {2, 3, 4}, 
-                                   {2, 3, 4}, 
-                                   {2, 3, 4}, 
-                                   {2, 3, 4}, 
-                                   {2, 3, 4} };
+    hsize_t size[2];
+    hsize_t offset[2];
+    hsize_t dimsext[2]    = {7, 3}; /* extend dimensions */
+    int     dataext[7][3] = {{2, 3, 4}, {2, 3, 4}, {2, 3, 4}, {2, 3, 4}, {2, 3, 4}, {2, 3, 4}, {2, 3, 4}};
 
     /* Variables used in reading data back */
-    hsize_t      chunk_dimsr[2];
-    hsize_t      dimsr[2];
-    hsize_t      i, j;
-    int          rdata[10][3];
-    herr_t       status_n;                             
-    int          rank, rank_chunk;
+    hsize_t chunk_dimsr[2];
+    hsize_t dimsr[2];
+    hsize_t i, j;
+    int     rdata[10][3];
+    herr_t  status_n;
+    int     rank, rank_chunk;
 
     /* Create the data space with unlimited dimensions. */
-    dataspace = H5Screate_simple (RANK, dims, maxdims); 
+    dataspace = H5Screate_simple(RANK, dims, maxdims);
 
     /* Create a new file. If file exists its contents will be overwritten. */
-    file = H5Fcreate (FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    file = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
     /* Modify dataset creation properties, i.e. enable chunking  */
-    prop = H5Pcreate (H5P_DATASET_CREATE);
-    status = H5Pset_chunk (prop, RANK, chunk_dims);
+    prop   = H5Pcreate(H5P_DATASET_CREATE);
+    status = H5Pset_chunk(prop, RANK, chunk_dims);
 
-    /* Create a new dataset within the file using chunk 
+    /* Create a new dataset within the file using chunk
        creation properties.  */
-    dataset = H5Dcreate2 (file, DATASETNAME, H5T_NATIVE_INT, dataspace,
-                         H5P_DEFAULT, prop, H5P_DEFAULT);
+    dataset = H5Dcreate2(file, DATASETNAME, H5T_NATIVE_INT, dataspace, H5P_DEFAULT, prop, H5P_DEFAULT);
 
     /* Write data to dataset */
-    status = H5Dwrite (dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL,
-                       H5P_DEFAULT, data);
+    status = H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data);
 
     /* Extend the dataset. Dataset becomes 10 x 3  */
-    size[0] = dims[0]+ dimsext[0];
+    size[0] = dims[0] + dimsext[0];
     size[1] = dims[1];
-    status = H5Dset_extent (dataset, size);
+    status  = H5Dset_extent(dataset, size);
 
     /* Select a hyperslab in extended portion of dataset  */
-    filespace = H5Dget_space (dataset);
+    filespace = H5Dget_space(dataset);
     offset[0] = 3;
     offset[1] = 0;
-    status = H5Sselect_hyperslab (filespace, H5S_SELECT_SET, offset, NULL,
-                                  dimsext, NULL);  
+    status    = H5Sselect_hyperslab(filespace, H5S_SELECT_SET, offset, NULL, dimsext, NULL);
 
     /* Define memory space */
-    memspace = H5Screate_simple (RANK, dimsext, NULL); 
+    memspace = H5Screate_simple(RANK, dimsext, NULL);
 
     /* Write the data to the extended portion of dataset  */
-    status = H5Dwrite (dataset, H5T_NATIVE_INT, memspace, filespace,
-                       H5P_DEFAULT, dataext);
+    status = H5Dwrite(dataset, H5T_NATIVE_INT, memspace, filespace, H5P_DEFAULT, dataext);
 
     /* Close resources */
-    status = H5Dclose (dataset);
-    status = H5Pclose (prop);
-    status = H5Sclose (dataspace);
-    status = H5Sclose (memspace);
-    status = H5Sclose (filespace);
-    status = H5Fclose (file);
+    status = H5Dclose(dataset);
+    status = H5Pclose(prop);
+    status = H5Sclose(dataspace);
+    status = H5Sclose(memspace);
+    status = H5Sclose(filespace);
+    status = H5Fclose(file);
 
     /********************************************
      * Re-open the file and read the data back. *
      ********************************************/
 
-    file = H5Fopen (FILENAME, H5F_ACC_RDONLY, H5P_DEFAULT);
-    dataset = H5Dopen2 (file, DATASETNAME, H5P_DEFAULT);
+    file    = H5Fopen(FILENAME, H5F_ACC_RDONLY, H5P_DEFAULT);
+    dataset = H5Dopen2(file, DATASETNAME, H5P_DEFAULT);
 
-    filespace = H5Dget_space (dataset);
-    rank = H5Sget_simple_extent_ndims (filespace);
-    status_n = H5Sget_simple_extent_dims (filespace, dimsr, NULL);
+    filespace = H5Dget_space(dataset);
+    rank      = H5Sget_simple_extent_ndims(filespace);
+    status_n  = H5Sget_simple_extent_dims(filespace, dimsr, NULL);
 
-    prop = H5Dget_create_plist (dataset);
+    prop = H5Dget_create_plist(dataset);
 
-    if (H5D_CHUNKED == H5Pget_layout (prop)) 
-       rank_chunk = H5Pget_chunk (prop, rank, chunk_dimsr);
+    if (H5D_CHUNKED == H5Pget_layout(prop))
+        rank_chunk = H5Pget_chunk(prop, rank, chunk_dimsr);
 
-    memspace = H5Screate_simple (rank, dimsr, NULL);
-    status = H5Dread (dataset, H5T_NATIVE_INT, memspace, filespace,
-                      H5P_DEFAULT, rdata);
+    memspace = H5Screate_simple(rank, dimsr, NULL);
+    status   = H5Dread(dataset, H5T_NATIVE_INT, memspace, filespace, H5P_DEFAULT, rdata);
 
     printf("\n");
     printf("Dataset: \n");
-    for (j = 0; j < dimsr[0]; j++)
-    {
-       for (i = 0; i < dimsr[1]; i++)
-           printf("%d ", rdata[j][i]);
-       printf("\n");
+    for (j = 0; j < dimsr[0]; j++) {
+        for (i = 0; i < dimsr[1]; i++)
+            printf("%d ", rdata[j][i]);
+        printf("\n");
     }
 
-    status = H5Pclose (prop);
-    status = H5Dclose (dataset);
-    status = H5Sclose (filespace);
-    status = H5Sclose (memspace);
-    status = H5Fclose (file);
+    status = H5Pclose(prop);
+    status = H5Dclose(dataset);
+    status = H5Sclose(filespace);
+    status = H5Sclose(memspace);
+    status = H5Fclose(file);
 }
diff --git a/examples/h5_extend_write.c b/examples/h5_extend_write.c
index 74f6c01..6c7afeb 100644
--- a/examples/h5_extend_write.c
+++ b/examples/h5_extend_write.c
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
@@ -22,43 +19,42 @@
 
 #include "hdf5.h"
 
-#define H5FILE_NAME        "SDSextendible.h5"
+#define H5FILE_NAME "SDSextendible.h5"
 #define DATASETNAME "ExtendibleArray"
-#define RANK         2
-#define NX     10
-#define NY     5
+#define RANK        2
+#define NX          10
+#define NY          5
 
 int
-main (void)
+main(void)
 {
-    hid_t       file;                          /* handles */
-    hid_t       dataspace, dataset;
-    hid_t       filespace;
-    hid_t       cparms;
-    hsize_t      dims[2]  = { 3, 3};            /*
-						 * dataset dimensions
-						 * at the creation time
-						 */
-    hsize_t      dims1[2] = { 3, 3};            /* data1 dimensions */
-    hsize_t      dims2[2] = { 7, 1};            /* data2 dimensions */
-    hsize_t      dims3[2] = { 2, 2};            /* data3 dimensions */
+    hid_t   file; /* handles */
+    hid_t   dataspace, dataset;
+    hid_t   filespace;
+    hid_t   cparms;
+    hsize_t dims[2] = {3, 3};  /*
+                                * dataset dimensions
+                                * at the creation time
+                                */
+    hsize_t dims1[2] = {3, 3}; /* data1 dimensions */
+    hsize_t dims2[2] = {7, 1}; /* data2 dimensions */
+    hsize_t dims3[2] = {2, 2}; /* data3 dimensions */
 
-    hsize_t      maxdims[2] = {H5S_UNLIMITED, H5S_UNLIMITED};
-    hsize_t      chunk_dims[2] ={2, 5};
-    hsize_t      size[2];
-    hsize_t      offset[2];
+    hsize_t maxdims[2]    = {H5S_UNLIMITED, H5S_UNLIMITED};
+    hsize_t chunk_dims[2] = {2, 5};
+    hsize_t size[2];
+    hsize_t offset[2];
 
-    herr_t      status;
+    herr_t status;
 
-    int         data1[3][3] = { {1, 1, 1},       /* data to write */
-				{1, 1, 1},
-				{1, 1, 1} };
+    int data1[3][3] = {{1, 1, 1}, /* data to write */
+                       {1, 1, 1},
+                       {1, 1, 1}};
 
-    int         data2[7]    = { 2, 2, 2, 2, 2, 2, 2};
+    int data2[7] = {2, 2, 2, 2, 2, 2, 2};
 
-    int         data3[2][2] = { {3, 3},
-				{3, 3} };
-    int fillvalue = 0;
+    int data3[2][2] = {{3, 3}, {3, 3}};
+    int fillvalue   = 0;
 
     /*
      * Create the data space with unlimited dimensions.
@@ -74,22 +70,21 @@ main (void)
      * Modify dataset creation properties, i.e. enable chunking.
      */
     cparms = H5Pcreate(H5P_DATASET_CREATE);
-    status = H5Pset_chunk( cparms, RANK, chunk_dims);
-    status = H5Pset_fill_value (cparms, H5T_NATIVE_INT, &fillvalue );
+    status = H5Pset_chunk(cparms, RANK, chunk_dims);
+    status = H5Pset_fill_value(cparms, H5T_NATIVE_INT, &fillvalue);
 
     /*
      * Create a new dataset within the file using cparms
      * creation properties.
      */
-    dataset = H5Dcreate2(file, DATASETNAME, H5T_NATIVE_INT, dataspace, H5P_DEFAULT,
-			cparms, H5P_DEFAULT);
+    dataset = H5Dcreate2(file, DATASETNAME, H5T_NATIVE_INT, dataspace, H5P_DEFAULT, cparms, H5P_DEFAULT);
 
     /*
      * Extend the dataset. This call assures that dataset is at least 3 x 3.
      */
-    size[0]   = 3;
-    size[1]   = 3;
-    status = H5Dset_extent(dataset, size);
+    size[0] = 3;
+    size[1] = 3;
+    status  = H5Dset_extent(dataset, size);
 
     /*
      * Select a hyperslab.
@@ -97,22 +92,20 @@ main (void)
     filespace = H5Dget_space(dataset);
     offset[0] = 0;
     offset[1] = 0;
-    status = H5Sselect_hyperslab(filespace, H5S_SELECT_SET, offset, NULL,
-				 dims1, NULL);
+    status    = H5Sselect_hyperslab(filespace, H5S_SELECT_SET, offset, NULL, dims1, NULL);
 
     /*
      * Write the data to the hyperslab.
      */
-    status = H5Dwrite(dataset, H5T_NATIVE_INT, dataspace, filespace,
-		      H5P_DEFAULT, data1);
+    status = H5Dwrite(dataset, H5T_NATIVE_INT, dataspace, filespace, H5P_DEFAULT, data1);
 
     /*
      * Extend the dataset. Dataset becomes 10 x 3.
      */
-    dims[0]   = dims1[0] + dims2[0];
-    size[0]   = dims[0];
-    size[1]   = dims[1];
-    status = H5Dset_extent(dataset, size);
+    dims[0] = dims1[0] + dims2[0];
+    size[0] = dims[0];
+    size[1] = dims[1];
+    status  = H5Dset_extent(dataset, size);
 
     /*
      * Select a hyperslab.
@@ -120,8 +113,7 @@ main (void)
     filespace = H5Dget_space(dataset);
     offset[0] = 3;
     offset[1] = 0;
-    status = H5Sselect_hyperslab(filespace, H5S_SELECT_SET, offset, NULL,
-				 dims2, NULL);
+    status    = H5Sselect_hyperslab(filespace, H5S_SELECT_SET, offset, NULL, dims2, NULL);
 
     /*
      * Define memory space
@@ -131,16 +123,15 @@ main (void)
     /*
      * Write the data to the hyperslab.
      */
-    status = H5Dwrite(dataset, H5T_NATIVE_INT, dataspace, filespace,
-		      H5P_DEFAULT, data2);
+    status = H5Dwrite(dataset, H5T_NATIVE_INT, dataspace, filespace, H5P_DEFAULT, data2);
 
     /*
      * Extend the dataset. Dataset becomes 10 x 5.
      */
-    dims[1]   = dims1[1] + dims3[1];
-    size[0]   = dims[0];
-    size[1]   = dims[1];
-    status = H5Dset_extent(dataset, size);
+    dims[1] = dims1[1] + dims3[1];
+    size[0] = dims[0];
+    size[1] = dims[1];
+    status  = H5Dset_extent(dataset, size);
 
     /*
      * Select a hyperslab
@@ -148,8 +139,7 @@ main (void)
     filespace = H5Dget_space(dataset);
     offset[0] = 0;
     offset[1] = 3;
-    status = H5Sselect_hyperslab(filespace, H5S_SELECT_SET, offset, NULL,
-				 dims3, NULL);
+    status    = H5Sselect_hyperslab(filespace, H5S_SELECT_SET, offset, NULL, dims3, NULL);
 
     /*
      * Define memory space.
@@ -159,15 +149,14 @@ main (void)
     /*
      * Write the data to the hyperslab.
      */
-    status = H5Dwrite(dataset, H5T_NATIVE_INT, dataspace, filespace,
-		      H5P_DEFAULT, data3);
+    status = H5Dwrite(dataset, H5T_NATIVE_INT, dataspace, filespace, H5P_DEFAULT, data3);
 
     /*
      * Resulting dataset
      *
-     *	 3 3 3 2 2
-     *	 3 3 3 2 2
-     *	 3 3 3 0 0
+     *   1 1 1 3 3
+     *   1 1 1 3 3
+     *   1 1 1 0 0
      *	 2 0 0 0 0
      *	 2 0 0 0 0
      *	 2 0 0 0 0
diff --git a/examples/h5_extlink.c b/examples/h5_extlink.c
index e8a24b8..8d3fc8c 100644
--- a/examples/h5_extlink.c
+++ b/examples/h5_extlink.c
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /* This program demonstrates how to create and use "external links" in
@@ -28,37 +25,36 @@
 
 #define PREFIX_SOURCE_FILE "extlink_prefix_source.h5"
 
-#define SOFT_LINK_FILE "soft_link.h5"
-#define SOFT_LINK_NAME "soft_link_to_group"
+#define SOFT_LINK_FILE    "soft_link.h5"
+#define SOFT_LINK_NAME    "soft_link_to_group"
 #define UD_SOFT_LINK_NAME "ud_soft_link"
-#define TARGET_GROUP "target_group"
+#define TARGET_GROUP      "target_group"
 
 #define UD_SOFT_CLASS 65
 
-#define HARD_LINK_FILE "hard_link.h5"
-#define HARD_LINK_NAME "hard_link_to_group"
+#define HARD_LINK_FILE    "hard_link.h5"
+#define HARD_LINK_NAME    "hard_link_to_group"
 #define UD_HARD_LINK_NAME "ud_hard_link"
 
 #define UD_HARD_CLASS 66
 
 #define PLIST_LINK_PROP "plist_link_prop"
-#define UD_PLIST_CLASS 66
+#define UD_PLIST_CLASS  66
 
-
-
 /* Basic external link example
  *
  * Creates two files and uses an external link to access an object in the
  * second file from the first file.
  */
-static void extlink_example(void)
+static void
+extlink_example(void)
 {
     hid_t source_file_id, targ_file_id;
     hid_t group_id, group2_id;
 
     /* Create two files, a source and a target */
     source_file_id = H5Fcreate(SOURCE_FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    targ_file_id = H5Fcreate(TARGET_FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    targ_file_id   = H5Fcreate(TARGET_FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
     /* Create a group in the target file for the external link to point to. */
     group_id = H5Gcreate2(targ_file_id, "target_group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
@@ -98,7 +94,6 @@ static void extlink_example(void)
      */
 }
 
-
 /* External link prefix example
  *
  * Uses a group access property list to set a "prefix" for the filenames
@@ -111,7 +106,8 @@ static void extlink_example(void)
  * where it is run (so to run this example on Unix, first mkdir red and mkdir
  * blue).
  */
-static void extlink_prefix_example(void)
+static void
+extlink_prefix_example(void)
 {
     hid_t source_file_id, red_file_id, blue_file_id;
     hid_t group_id, group2_id;
@@ -121,14 +117,15 @@ static void extlink_prefix_example(void)
      * the same name, but one will be located in the red directory and one will
      * be located in the blue directory */
     source_file_id = H5Fcreate(PREFIX_SOURCE_FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    red_file_id = H5Fcreate("red/prefix_target.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    blue_file_id = H5Fcreate("blue/prefix_target.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    red_file_id    = H5Fcreate("red/prefix_target.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    blue_file_id   = H5Fcreate("blue/prefix_target.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
     /* This test needs a red and a blue directory in the filesystem. If they're not present,
      * trying to create the files above will fail.
      */
-    if(red_file_id < 0 || blue_file_id < 0)
-      printf("This test requires directories named 'red' and 'blue' to exist. Did you forget to create them?\n");
+    if (red_file_id < 0 || blue_file_id < 0)
+        printf("This test requires directories named 'red' and 'blue' to exist. Did you forget to create "
+               "them?\n");
 
     /* Create an external link in the source file pointing to the root group of
      * a file named prefix_target.h5.  This file doesn't exist in the current
@@ -165,7 +162,7 @@ static void extlink_prefix_example(void)
      * directory.
      */
     H5Pset_elink_prefix(gapl_id, "blue/");
-    group_id = H5Gopen2(source_file_id, "ext_link", gapl_id);
+    group_id  = H5Gopen2(source_file_id, "ext_link", gapl_id);
     group2_id = H5Gcreate2(group_id, "sky blue", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
     /* Close both groups. */
@@ -173,7 +170,7 @@ static void extlink_prefix_example(void)
     H5Gclose(group_id);
 
     /* Each file has had a group created inside it using the same external link. */
-    group_id = H5Gopen2(red_file_id, "pink", H5P_DEFAULT);
+    group_id  = H5Gopen2(red_file_id, "pink", H5P_DEFAULT);
     group2_id = H5Gopen2(blue_file_id, "sky blue", H5P_DEFAULT);
 
     /* Clean up our open IDs */
@@ -191,7 +188,6 @@ static void extlink_prefix_example(void)
      */
 }
 
-
 /* Soft Link example
  *
  * Create a new class of user-defined links that behave like HDF5's built-in
@@ -209,10 +205,11 @@ static void extlink_prefix_example(void)
  * We might also have wanted to supply a creation callback that checks
  * that a path was supplied in the udata.
  */
-static hid_t UD_soft_traverse(const char *link_name, hid_t cur_group,
-    const void *udata, size_t udata_size, hid_t lapl_id);
+static hid_t UD_soft_traverse(const char *link_name, hid_t cur_group, const void *udata, size_t udata_size,
+                              hid_t lapl_id, hid_t dxpl_id);
 
-static void soft_link_example(void)
+static void
+soft_link_example(void)
 {
     hid_t file_id;
     hid_t group_id;
@@ -222,27 +219,26 @@ static void soft_link_example(void)
      * callback.
      */
     const H5L_class_t UD_soft_class[1] = {{
-        H5L_LINK_CLASS_T_VERS,      /* Version number for this struct.
-                                     * This field is always H5L_LINK_CLASS_T_VERS */
-        (H5L_type_t)UD_SOFT_CLASS,  /* Link class id number. This can be any
-                                     * value between H5L_TYPE_UD_MIN (64) and
-                                     * H5L_TYPE_MAX (255). It should be a
-                                     * value that isn't already being used by
-                                     * another kind of link. We'll use 65. */
-        "UD_soft_link",             /* Link class name for debugging  */
-        NULL,                       /* Creation callback              */
-        NULL,                       /* Move callback                  */
-        NULL,                       /* Copy callback                  */
-        UD_soft_traverse,           /* The actual traversal function  */
-        NULL,                       /* Deletion callback              */
-        NULL                        /* Query callback                 */
+        H5L_LINK_CLASS_T_VERS,     /* Version number for this struct.
+                                    * This field is always H5L_LINK_CLASS_T_VERS */
+        (H5L_type_t)UD_SOFT_CLASS, /* Link class id number. This can be any
+                                    * value between H5L_TYPE_UD_MIN (64) and
+                                    * H5L_TYPE_MAX (255). It should be a
+                                    * value that isn't already being used by
+                                    * another kind of link. We'll use 65. */
+        "UD_soft_link",            /* Link class name for debugging  */
+        NULL,                      /* Creation callback              */
+        NULL,                      /* Move callback                  */
+        NULL,                      /* Copy callback                  */
+        UD_soft_traverse,          /* The actual traversal function  */
+        NULL,                      /* Deletion callback              */
+        NULL                       /* Query callback                 */
     }};
 
-
     /* First, create a file and an object within the file for the link to
      * point to.
      */
-    file_id = H5Fcreate(SOFT_LINK_FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    file_id  = H5Fcreate(SOFT_LINK_FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     group_id = H5Gcreate2(file_id, TARGET_GROUP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     H5Gclose(group_id);
 
@@ -277,12 +273,13 @@ static void soft_link_example(void)
  * The actual traversal function simply needs to open the correct object by
  * name and return its ID.
  */
-
-static hid_t UD_soft_traverse(const char *link_name, hid_t cur_group,
-    const void *udata, size_t udata_size, hid_t lapl_id)
+
+static hid_t
+UD_soft_traverse(const char *link_name, hid_t cur_group, const void *udata, size_t udata_size, hid_t lapl_id,
+                 hid_t dxpl_id)
 {
-    const char *target = (const char *) udata;
-    hid_t ret_value;
+    const char *target = (const char *)udata;
+    hid_t       ret_value;
 
     /* Pass the udata straight through to HDF5. If it's invalid, let HDF5
      * return an error.
@@ -291,7 +288,6 @@ static hid_t UD_soft_traverse(const char *link_name, hid_t cur_group,
     return ret_value;
 }
 
-
 /* Hard Link example
  *
  * Create a new class of user-defined links that behave like HDF5's built-in
@@ -307,45 +303,44 @@ static hid_t UD_soft_traverse(const char *link_name, hid_t cur_group,
  * To keep the example simple, these links don't have a query callback.
  * Generally, real link classes should always be query-able.
  */
-static herr_t UD_hard_create(const char *link_name, hid_t loc_group,
-    const void *udata, size_t udata_size, hid_t lcpl_id);
-static herr_t UD_hard_delete(const char *link_name, hid_t loc_group,
-    const void *udata, size_t udata_size);
-static hid_t UD_hard_traverse(const char *link_name, hid_t cur_group,
-    const void *udata, size_t udata_size, hid_t lapl_id);
-
-static void hard_link_example(void)
+static herr_t UD_hard_create(const char *link_name, hid_t loc_group, const void *udata, size_t udata_size,
+                             hid_t lcpl_id);
+static herr_t UD_hard_delete(const char *link_name, hid_t loc_group, const void *udata, size_t udata_size);
+static hid_t  UD_hard_traverse(const char *link_name, hid_t cur_group, const void *udata, size_t udata_size,
+                               hid_t lapl_id, hid_t dxpl_id);
+
+static void
+hard_link_example(void)
 {
-    hid_t file_id;
-    hid_t group_id;
-    H5L_info_t li;
+    hid_t       file_id;
+    hid_t       group_id;
+    H5L_info2_t li;
     /* Define the link class that we'll use to register "user-defined hard
      * links" using the callbacks we defined above.
      * A link class can have NULL for any callback except its traverse
      * callback.
      */
     const H5L_class_t UD_hard_class[1] = {{
-        H5L_LINK_CLASS_T_VERS,      /* Version number for this struct.
-                                     * This field is always H5L_LINK_CLASS_T_VERS */
-        (H5L_type_t)UD_HARD_CLASS,  /* Link class id number. This can be any
-                                     * value between H5L_TYPE_UD_MIN (64) and
-                                     * H5L_TYPE_MAX (255). It should be a
-                                     * value that isn't already being used by
-                                     * another kind of link. We'll use 66. */
-        "UD_hard_link",             /* Link class name for debugging  */
-        UD_hard_create,             /* Creation callback              */
-        NULL,                       /* Move callback                  */
-        NULL,                       /* Copy callback                  */
-        UD_hard_traverse,           /* The actual traversal function  */
-        UD_hard_delete,             /* Deletion callback              */
-        NULL                        /* Query callback                 */
+        H5L_LINK_CLASS_T_VERS,     /* Version number for this struct.
+                                    * This field is always H5L_LINK_CLASS_T_VERS */
+        (H5L_type_t)UD_HARD_CLASS, /* Link class id number. This can be any
+                                    * value between H5L_TYPE_UD_MIN (64) and
+                                    * H5L_TYPE_MAX (255). It should be a
+                                    * value that isn't already being used by
+                                    * another kind of link. We'll use 66. */
+        "UD_hard_link",            /* Link class name for debugging  */
+        UD_hard_create,            /* Creation callback              */
+        NULL,                      /* Move callback                  */
+        NULL,                      /* Copy callback                  */
+        UD_hard_traverse,          /* The actual traversal function  */
+        UD_hard_delete,            /* Deletion callback              */
+        NULL                       /* Query callback                 */
     }};
 
-
     /* First, create a file and an object within the file for the link to
      * point to.
      */
-    file_id = H5Fcreate(HARD_LINK_FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    file_id  = H5Fcreate(HARD_LINK_FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     group_id = H5Gcreate2(file_id, TARGET_GROUP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     H5Gclose(group_id);
 
@@ -363,13 +358,13 @@ static void hard_link_example(void)
      * the target group's address. We do this by calling H5Lget_info
      * on a hard link to the object.
      */
-    H5Lget_info(file_id, TARGET_GROUP, &li, H5P_DEFAULT);
+    H5Lget_info2(file_id, TARGET_GROUP, &li, H5P_DEFAULT);
 
     /* Now create a user-defined link.  We give it the group's address
      * as its udata.
      */
-    H5Lcreate_ud(file_id, UD_HARD_LINK_NAME, (H5L_type_t)UD_HARD_CLASS, &(li.u.address),
-                 sizeof(li.u.address), H5P_DEFAULT, H5P_DEFAULT);
+    H5Lcreate_ud(file_id, UD_HARD_LINK_NAME, (H5L_type_t)UD_HARD_CLASS, &(li.u.token), sizeof(H5O_token_t),
+                 H5P_DEFAULT, H5P_DEFAULT);
 
     /* The UD hard link has now incremented the group's reference count
      * like a normal hard link would.  This means that we can unlink the
@@ -403,42 +398,44 @@ static void hard_link_example(void)
  * If this function returns a negative value, the call to H5Lcreate_ud()
  * will also return failure and the link will not be created.
  */
-static herr_t UD_hard_create(const char *link_name, hid_t loc_group,
-    const void *udata, size_t udata_size, hid_t lcpl_id)
+static herr_t
+UD_hard_create(const char *link_name, hid_t loc_group, const void *udata, size_t udata_size, hid_t lcpl_id)
 {
-    haddr_t addr;
-    hid_t target_obj = -1;
-    herr_t ret_value = 0;
+    H5O_token_t token;
+    hid_t       target_obj = H5I_INVALID_HID;
+    herr_t      ret_value  = 0;
 
     /* Make sure that the address passed in looks valid */
-    if(udata_size != sizeof(haddr_t))
-    {
-      ret_value = -1;
-      goto done;
+    if (udata_size != sizeof(H5O_token_t)) {
+        ret_value = -1;
+        goto done;
     }
 
-    addr = *((const haddr_t *) udata);
+    token = *((H5O_token_t *)udata);
+
+    //! [H5Oopen_by_token_snip]
 
     /* Open the object this link points to so that we can increment
-     * its reference count. This also ensures that the address passed
+     * its reference count. This also ensures that the token passed
      * in points to a real object (although this check is not perfect!) */
-    target_obj= H5Oopen_by_addr(loc_group, addr);
-    if(target_obj < 0)
-    {
-      ret_value = -1;
-      goto done;
+    target_obj = H5Oopen_by_token(loc_group, token);
+
+    //! [H5Oopen_by_token_snip]
+
+    if (target_obj < 0) {
+        ret_value = -1;
+        goto done;
     }
 
     /* Increment the reference count of the target object */
-    if(H5Oincr_refcount(target_obj) < 0)
-    {
-      ret_value = -1;
-      goto done;
+    if (H5Oincr_refcount(target_obj) < 0) {
+        ret_value = -1;
+        goto done;
     }
 
 done:
     /* Close the target object if we opened it */
-    if(target_obj >= 0)
+    if (target_obj >= 0)
         H5Oclose(target_obj);
     return ret_value;
 }
@@ -447,42 +444,39 @@ done:
  * Since the creation function increments the object's reference count, it's
  * important to decrement it again when the link is deleted.
  */
-static herr_t UD_hard_delete(const char *link_name, hid_t loc_group,
-    const void *udata, size_t udata_size)
+static herr_t
+UD_hard_delete(const char *link_name, hid_t loc_group, const void *udata, size_t udata_size)
 {
-    haddr_t addr;
-    hid_t target_obj = -1;
-    herr_t ret_value = 0;
+    H5O_token_t token;
+    hid_t       target_obj = H5I_INVALID_HID;
+    herr_t      ret_value  = 0;
 
     /* Sanity check; we have already verified the udata's size in the creation
      * callback.
      */
-    if(udata_size != sizeof(haddr_t))
-    {
-      ret_value = -1;
-      goto done;
+    if (udata_size != sizeof(H5O_token_t)) {
+        ret_value = -1;
+        goto done;
     }
 
-    addr = *((const haddr_t *) udata);
+    token = *((H5O_token_t *)udata);
 
     /* Open the object this link points to */
-    target_obj= H5Oopen_by_addr(loc_group, addr);
-    if(target_obj < 0)
-    {
-      ret_value = -1;
-      goto done;
+    target_obj = H5Oopen_by_token(loc_group, token);
+    if (target_obj < 0) {
+        ret_value = -1;
+        goto done;
     }
 
     /* Decrement the reference count of the target object */
-    if(H5Odecr_refcount(target_obj) < 0)
-    {
-      ret_value = -1;
-      goto done;
+    if (H5Odecr_refcount(target_obj) < 0) {
+        ret_value = -1;
+        goto done;
     }
 
 done:
     /* Close the target object if we opened it */
-    if(target_obj >= 0)
+    if (target_obj >= 0)
         H5Oclose(target_obj);
     return ret_value;
 }
@@ -491,30 +485,29 @@ done:
  * The actual traversal function simply needs to open the correct object and
  * return its ID.
  */
-static hid_t UD_hard_traverse(const char *link_name, hid_t cur_group,
-    const void *udata, size_t udata_size, hid_t lapl_id)
+static hid_t
+UD_hard_traverse(const char *link_name, hid_t cur_group, const void *udata, size_t udata_size, hid_t lapl_id,
+                 hid_t dxpl_id)
 {
-    haddr_t       addr;
-    hid_t         ret_value = -1;
+    H5O_token_t token;
+    hid_t       ret_value = H5I_INVALID_HID;
 
     /* Sanity check; we have already verified the udata's size in the creation
      * callback.
      */
-    if(udata_size != sizeof(haddr_t))
-      return -1;
+    if (udata_size != sizeof(H5O_token_t))
+        return H5I_INVALID_HID;
 
-    addr = *((const haddr_t *) udata);
+    token = *((H5O_token_t *)udata);
 
-    /* Open the object by address. If H5Oopen_by_addr fails, ret_value will
+    /* Open the object by token. If H5Oopen_by_token fails, ret_value will
      * be negative to indicate that the traversal function failed.
      */
-    ret_value = H5Oopen_by_addr(cur_group, addr);
+    ret_value = H5Oopen_by_token(cur_group, token);
 
     return ret_value;
 }
 
-
-
 /* Plist example
  *
  * Create a new class of user-defined links that open objects within a file
@@ -528,10 +521,11 @@ static hid_t UD_hard_traverse(const char *link_name, hid_t cur_group,
  * These are defined after the example below.
  * These links have no udata, so they don't need a query function.
  */
-static hid_t UD_plist_traverse(const char *link_name, hid_t cur_group,
-    const void *udata, size_t udata_size, hid_t lapl_id);
+static hid_t UD_plist_traverse(const char *link_name, hid_t cur_group, const void *udata, size_t udata_size,
+                               hid_t lapl_id, hid_t dxpl_id);
 
-static void plist_link_example(void)
+static void
+plist_link_example(void)
 {
     hid_t file_id;
     hid_t group_id, group2_id;
@@ -560,11 +554,10 @@ static void plist_link_example(void)
         NULL                        /* Query callback                 */
     }};
 
-
     /* First, create a file and two objects within the file for the link to
      * point to.
      */
-    file_id = H5Fcreate(HARD_LINK_FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    file_id  = H5Fcreate(HARD_LINK_FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     group_id = H5Gcreate2(file_id, "group_1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     H5Gclose(group_id);
     group_id = H5Gcreate2(file_id, "group_1/group_2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
@@ -572,8 +565,7 @@ static void plist_link_example(void)
 
     /* Register "plist links" and create one.  It has no udata at all. */
     H5Lregister(UD_plist_class);
-    H5Lcreate_ud(file_id, "plist_link", (H5L_type_t)UD_PLIST_CLASS, NULL, 0,
-                 H5P_DEFAULT, H5P_DEFAULT);
+    H5Lcreate_ud(file_id, "plist_link", (H5L_type_t)UD_PLIST_CLASS, NULL, 0, H5P_DEFAULT, H5P_DEFAULT);
 
     /* Create a group access property list to pass in the target for the
      * plist link.
@@ -619,17 +611,18 @@ static void plist_link_example(void)
 /* UD_plist_traverse
  * Open a path passed in through the property list.
  */
-static hid_t UD_plist_traverse(const char *link_name, hid_t cur_group,
-    const void *udata, size_t udata_size, hid_t lapl_id)
+static hid_t
+UD_plist_traverse(const char *link_name, hid_t cur_group, const void *udata, size_t udata_size, hid_t lapl_id,
+                  hid_t dxpl_id)
 {
-    char *        path;
-    hid_t         ret_value = -1;
+    char *path;
+    hid_t ret_value = H5I_INVALID_HID;
 
     /* If the link property isn't set or can't be found, traversal fails. */
-    if(H5Pexist(lapl_id, PLIST_LINK_PROP) < 0)
+    if (H5Pexist(lapl_id, PLIST_LINK_PROP) < 0)
         goto error;
 
-    if(H5Pget(lapl_id, PLIST_LINK_PROP, &path) < 0)
+    if (H5Pget(lapl_id, PLIST_LINK_PROP, &path) < 0)
         goto error;
 
     /* Open the object by address. If H5Oopen_by_addr fails, ret_value will
@@ -640,16 +633,14 @@ static hid_t UD_plist_traverse(const char *link_name, hid_t cur_group,
     return ret_value;
 
 error:
-    return -1;
+    return H5I_INVALID_HID;
 }
 
-
-
 /* Main function
  *
  * Invokes the example functions.
  */
- int
+int
 main(void)
 {
     printf("Testing basic external links.\n");
@@ -669,5 +660,3 @@ main(void)
 
     return 0;
 }
-
-
diff --git a/examples/h5_group.c b/examples/h5_group.c
index 6b73210..b84fe10 100644
--- a/examples/h5_group.c
+++ b/examples/h5_group.c
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
@@ -21,31 +18,29 @@
  * in the root group and in the created group.
  */
 
-
 #include "hdf5.h"
 
+#define H5FILE_NAME "group.h5"
+#define RANK        2
 
-#define H5FILE_NAME    "group.h5"
-#define RANK    2
-
-static herr_t file_info(hid_t loc_id, const char *name, const H5L_info_t *linfo,
-    void *opdata);              /* Link iteration operator function */
-static herr_t group_info(hid_t loc_id, const char *name, const H5L_info_t *linfo,
-    void *opdata);              /* Link iteration operator function */
+static herr_t file_info(hid_t loc_id, const char *name, const H5L_info2_t *linfo,
+                        void *opdata); /* Link iteration operator function */
+static herr_t group_info(hid_t loc_id, const char *name, const H5L_info2_t *linfo,
+                         void *opdata); /* Link iteration operator function */
 int
 main(void)
 {
 
-    hid_t    file;
-    hid_t    grp;
-    hid_t    dataset, dataspace;
-    hid_t    plist;
+    hid_t file;
+    hid_t grp;
+    hid_t dataset, dataspace;
+    hid_t plist;
 
-    herr_t   status;
-    hsize_t  dims[2];
-    hsize_t  cdims[2];
+    herr_t  status;
+    hsize_t dims[2];
+    hsize_t cdims[2];
 
-    int      idx_f, idx_g;
+    int idx_f, idx_g;
 
     /*
      * Create a file.
@@ -63,16 +58,16 @@ main(void)
      * GZIP compression with the compression effort set to 6.
      * Note that compression can be used only when dataset is chunked.
      */
-    dims[0] = 1000;
-    dims[1] = 20;
-    cdims[0] = 20;
-    cdims[1] = 20;
+    dims[0]   = 1000;
+    dims[1]   = 20;
+    cdims[0]  = 20;
+    cdims[1]  = 20;
     dataspace = H5Screate_simple(RANK, dims, NULL);
     plist     = H5Pcreate(H5P_DATASET_CREATE);
-                H5Pset_chunk(plist, 2, cdims);
-                H5Pset_deflate( plist, 6);
-    dataset = H5Dcreate2(file, "/Data/Compressed_Data", H5T_NATIVE_INT,
-                        dataspace, H5P_DEFAULT, plist, H5P_DEFAULT);
+    H5Pset_chunk(plist, 2, cdims);
+    H5Pset_deflate(plist, 6);
+    dataset =
+        H5Dcreate2(file, "/Data/Compressed_Data", H5T_NATIVE_INT, dataspace, H5P_DEFAULT, plist, H5P_DEFAULT);
     /*
      * Close the first dataset .
      */
@@ -82,11 +77,11 @@ main(void)
     /*
      * Create the second dataset.
      */
-    dims[0] = 500;
-    dims[1] = 20;
+    dims[0]   = 500;
+    dims[1]   = 20;
     dataspace = H5Screate_simple(RANK, dims, NULL);
-    dataset = H5Dcreate2(file, "/Data/Float_Data", H5T_NATIVE_FLOAT,
-			dataspace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    dataset   = H5Dcreate2(file, "/Data/Float_Data", H5T_NATIVE_FLOAT, dataspace, H5P_DEFAULT, H5P_DEFAULT,
+                           H5P_DEFAULT);
 
     /*
      *Close the second dataset and file.
@@ -107,7 +102,8 @@ main(void)
      * Access "Compressed_Data" dataset in the group.
      */
     dataset = H5Dopen2(grp, "Compressed_Data", H5P_DEFAULT);
-    if( dataset < 0) printf(" Dataset 'Compressed-Data' is not found. \n");
+    if (dataset < 0)
+        printf(" Dataset 'Compressed-Data' is not found. \n");
     printf("\"/Data/Compressed_Data\" dataset is open \n");
 
     /*
@@ -125,7 +121,8 @@ main(void)
      * hard link "Data_new".
      */
     dataset = H5Dopen2(file, "/Data_new/Compressed_Data", H5P_DEFAULT);
-    if( dataset < 0) printf(" Dataset is not found. \n");
+    if (dataset < 0)
+        printf(" Dataset is not found. \n");
     printf("\"/Data_new/Compressed_Data\" dataset is open \n");
 
     /*
@@ -133,28 +130,28 @@ main(void)
      */
     status = H5Dclose(dataset);
 
-
     /*
      * Use iterator to see the names of the objects in the root group.
      */
-    idx_f = H5Literate(file, H5_INDEX_NAME, H5_ITER_INC, NULL, file_info, NULL);
+    idx_f = H5Literate2(file, H5_INDEX_NAME, H5_ITER_INC, NULL, file_info, NULL);
 
     /*
      * Unlink  name "Data" and use iterator to see the names
      * of the objects in the file root direvtory.
      */
-    if(H5Ldelete(file, "Data", H5P_DEFAULT) < 0)
-      printf(" H5Ldelete failed \n");
+    if (H5Ldelete(file, "Data", H5P_DEFAULT) < 0)
+        printf(" H5Ldelete failed \n");
     else
-      printf("\"Data\" is unlinked \n");
+        printf("\"Data\" is unlinked \n");
 
-    idx_f = H5Literate(file, H5_INDEX_NAME, H5_ITER_INC, NULL, file_info, NULL);
+    idx_f = H5Literate2(file, H5_INDEX_NAME, H5_ITER_INC, NULL, file_info, NULL);
 
     /*
      * Use iterator to see the names of the objects in the group
      * /Data_new.
      */
-    idx_g = H5Literate_by_name(grp, "/Data_new", H5_INDEX_NAME, H5_ITER_INC, NULL, group_info, NULL, H5P_DEFAULT);
+    idx_g = H5Literate_by_name2(grp, "/Data_new", H5_INDEX_NAME, H5_ITER_INC, NULL, group_info, NULL,
+                                H5P_DEFAULT);
 
     /*
      * Close the file.
@@ -170,12 +167,12 @@ main(void)
  * Operator function.
  */
 static herr_t
-file_info(hid_t loc_id, const char *name, const H5L_info_t *linfo, void *opdata)
+file_info(hid_t loc_id, const char *name, const H5L_info2_t *linfo, void *opdata)
 {
     /* avoid compiler warnings */
-    loc_id = loc_id;
-    opdata = opdata;
-    linfo = linfo;
+    (void)loc_id;
+    (void)opdata;
+    (void)linfo;
 
     /*
      * Display group name. The name is passed to the function by
@@ -186,23 +183,22 @@ file_info(hid_t loc_id, const char *name, const H5L_info_t *linfo, void *opdata)
     return 0;
 }
 
-
 /*
  * Operator function.
  */
 static herr_t
-group_info(hid_t loc_id, const char *name, const H5L_info_t *linfo, void *opdata)
+group_info(hid_t loc_id, const char *name, const H5L_info2_t *linfo, void *opdata)
 {
-    hid_t did;  /* dataset identifier  */
-    hid_t tid;  /* datatype identifier */
+    hid_t       did; /* dataset identifier  */
+    hid_t       tid; /* datatype identifier */
     H5T_class_t t_class;
-    hid_t pid;  /* data_property identifier */
-    hsize_t chunk_dims_out[2];
-    int  rank_chunk;
+    hid_t       pid; /* data_property identifier */
+    hsize_t     chunk_dims_out[2];
+    int         rank_chunk;
 
     /* avoid warnings */
-    opdata = opdata;
-    linfo = linfo;
+    (void)opdata;
+    (void)linfo;
 
     /*
      * Open the datasets using their names.
@@ -217,38 +213,37 @@ group_info(hid_t loc_id, const char *name, const H5L_info_t *linfo, void *opdata
     /*
      * Display dataset information.
      */
-    tid = H5Dget_type(did);  /* get datatype*/
+    tid = H5Dget_type(did);         /* get datatype*/
     pid = H5Dget_create_plist(did); /* get creation property list */
 
     /*
      * Check if dataset is chunked.
      */
-    if(H5D_CHUNKED == H5Pget_layout(pid)) {
+    if (H5D_CHUNKED == H5Pget_layout(pid)) {
         /*
          * get chunking information: rank and dimensions.
          */
         rank_chunk = H5Pget_chunk(pid, 2, chunk_dims_out);
-        printf("chunk rank %d, dimensions %lu x %lu\n", rank_chunk,
-            (unsigned long)(chunk_dims_out[0]),
-            (unsigned long)(chunk_dims_out[1]));
+        printf("chunk rank %d, dimensions %lu x %lu\n", rank_chunk, (unsigned long)(chunk_dims_out[0]),
+               (unsigned long)(chunk_dims_out[1]));
     }
     else {
         t_class = H5Tget_class(tid);
-        if(t_class < 0) {
+        if (t_class < 0) {
             puts(" Invalid datatype.\n");
         }
         else {
-            if(t_class == H5T_INTEGER)
+            if (t_class == H5T_INTEGER)
                 puts(" Datatype is 'H5T_NATIVE_INTEGER'.\n");
-            if(t_class == H5T_FLOAT)
+            if (t_class == H5T_FLOAT)
                 puts(" Datatype is 'H5T_NATIVE_FLOAT'.\n");
-            if(t_class == H5T_STRING)
+            if (t_class == H5T_STRING)
                 puts(" Datatype is 'H5T_NATIVE_STRING'.\n");
-            if(t_class == H5T_BITFIELD)
+            if (t_class == H5T_BITFIELD)
                 puts(" Datatype is 'H5T_NATIVE_BITFIELD'.\n");
-            if(t_class == H5T_OPAQUE)
+            if (t_class == H5T_OPAQUE)
                 puts(" Datatype is 'H5T_NATIVE_OPAQUE'.\n");
-            if(t_class == H5T_COMPOUND)
+            if (t_class == H5T_COMPOUND)
                 puts(" Datatype is 'H5T_NATIVE_COMPOUND'.\n");
         }
     }
@@ -258,4 +253,3 @@ group_info(hid_t loc_id, const char *name, const H5L_info_t *linfo, void *opdata
     H5Tclose(tid);
     return 0;
 }
-
diff --git a/examples/h5_interm_group.c b/examples/h5_interm_group.c
index bd9c7c4..679238f 100644
--- a/examples/h5_interm_group.c
+++ b/examples/h5_interm_group.c
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
@@ -18,27 +15,24 @@
  * all intermediate groups.
  */
 
-
 #include "hdf5.h"
 
-
-#define H5FILE_NAME    "interm_group.h5"
-#define TRUE            1
-#define FALSE           0
+#define H5FILE_NAME "interm_group.h5"
+#define TRUE        1
+#define FALSE       0
 
 int
 main(void)
 {
 
-    hid_t    file;
-    hid_t    g1_id, g2_id, g3_id;
-    hid_t    grp_crt_plist;
+    hid_t      file;
+    hid_t      g1_id, g2_id, g3_id;
+    hid_t      grp_crt_plist;
     H5G_info_t g2_info;
-    char     name[3];
-
-    herr_t   status;
-    int      i;
+    char       name[3];
 
+    herr_t status;
+    int    i;
 
     /*
      * Create a file using the default properties.
@@ -61,53 +55,44 @@ main(void)
     /*
      * Check if group /G1 exists in the file.
      */
-    if(H5Lexists(file, "/G1", H5P_DEFAULT) !=FALSE)
-    printf("Group /G1 exists in the file\n");
+    if (H5Lexists(file, "/G1", H5P_DEFAULT) != FALSE)
+        printf("Group /G1 exists in the file\n");
 
     /*
      * Check that group G2/G3 exists in /G1 and if not create it using
      * intermediate group creation property.
      */
     g1_id = H5Gopen2(file, "/G1", H5P_DEFAULT);
-/* Next commented call causes error stack to be printed out; the next one
- * works fine; is it a bug or a feature? EIP 04-25-07
-*/
-/*  if (H5Lexists(g1_id, "G2/G3", H5P_DEFAULT) !=TRUE) { */
-    if (H5Lexists(g1_id, "G2", H5P_DEFAULT) !=TRUE) {
-
-    grp_crt_plist = H5Pcreate(H5P_LINK_CREATE);
-
-    /* Set flag for intermediate group creation */
-    status = H5Pset_create_intermediate_group(grp_crt_plist, TRUE);
-    g3_id = H5Gcreate2(g1_id, "G2/G3", grp_crt_plist, H5P_DEFAULT, H5P_DEFAULT);
-    H5Gclose(g3_id);
+    /* Next commented call causes error stack to be printed out; the next one
+     * works fine; is it a bug or a feature? EIP 04-25-07
+     */
+    /*  if (H5Lexists(g1_id, "G2/G3", H5P_DEFAULT) !=TRUE) { */
+    if (H5Lexists(g1_id, "G2", H5P_DEFAULT) != TRUE) {
+
+        grp_crt_plist = H5Pcreate(H5P_LINK_CREATE);
+
+        /* Set flag for intermediate group creation */
+        status = H5Pset_create_intermediate_group(grp_crt_plist, TRUE);
+        g3_id  = H5Gcreate2(g1_id, "G2/G3", grp_crt_plist, H5P_DEFAULT, H5P_DEFAULT);
+        H5Gclose(g3_id);
     }
     H5Gclose(g1_id);
 
-
     /* Now check if group /G1/G2 exists in the file, then open it and print
      * its members names
      */
     if (H5Lexists(file, "/G1/G2", H5P_DEFAULT)) {
 
-    	g2_id = H5Gopen2(file, "/G1/G2", H5P_DEFAULT);
-    	status = H5Gget_info(g2_id, &g2_info);
-    	printf("Group /G1/G2 has %d member(s)\n", (int)g2_info.nlinks);
+        g2_id  = H5Gopen2(file, "/G1/G2", H5P_DEFAULT);
+        status = H5Gget_info(g2_id, &g2_info);
+        printf("Group /G1/G2 has %d member(s)\n", (int)g2_info.nlinks);
 
-    	for (i=0; i < (int)g2_info.nlinks; i++) {
-    	H5Lget_name_by_idx(g2_id, ".", H5_INDEX_NAME, H5_ITER_NATIVE, (hsize_t)i,
-    	                   name, 3, H5P_DEFAULT);
-    	printf("Object's name is %s\n", name);
-
-    	}
-    H5Gclose(g2_id);
+        for (i = 0; i < (int)g2_info.nlinks; i++) {
+            H5Lget_name_by_idx(g2_id, ".", H5_INDEX_NAME, H5_ITER_NATIVE, (hsize_t)i, name, 3, H5P_DEFAULT);
+            printf("Object's name is %s\n", name);
+        }
+        H5Gclose(g2_id);
     }
     H5Fclose(file);
     return 0;
 }
-
-
-
-
-
-
diff --git a/examples/h5_mount.c b/examples/h5_mount.c
index 6da71a1..4be0b5a 100644
--- a/examples/h5_mount.c
+++ b/examples/h5_mount.c
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
@@ -27,107 +24,105 @@
 #define FILE2 "mount2.h5"
 
 #define RANK 2
-#define NX 4
-#define NY 5
+#define NX   4
+#define NY   5
 
-int main(void)
+int
+main(void)
 {
 
-   hid_t fid1, fid2, gid;  /* Files and group identifiers */
-   hid_t did, tid, sid;    /* Dataset and datatype identifiers */
-
-   herr_t status;
-   hsize_t dims[] = {NX,NY}; /* Dataset dimensions */
-
-   int i, j;
-   int bm[NX][NY], bm_out[NX][NY]; /* Data buffers */
-
-   /*
-    * Initialization of buffer matrix "bm"
-    */
-   for(i =0; i < NX; i++)
-    for(j = 0; j < NY; j++)
-      bm[i][j] = i + j;
-
-   /*
-    * Create first file and a group in it.
-    */
-   fid1 = H5Fcreate(FILE1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-   gid = H5Gcreate2(fid1, "/G", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-
-   /*
-    * Close group and file
-    */
-   H5Gclose(gid);
-   H5Fclose(fid1);
-
-   /*
-    * Create second file and dataset "D" in it.
-    */
-   fid2 = H5Fcreate(FILE2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-   dims[0] = NX;
-   dims[1] = NY;
-   sid = H5Screate_simple(RANK, dims, NULL);
-   did = H5Dcreate2(fid2, "D", H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-
-   /*
-    * Write data to the dataset.
-    */
-   status = H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, bm);
-
-   /*
-    * Close all identifiers.
-    */
-   H5Sclose(sid);
-   H5Dclose(did);
-   H5Fclose(fid2);
-
-   /*
-    * Reopen both files
-    */
-   fid1 = H5Fopen(FILE1, H5F_ACC_RDONLY, H5P_DEFAULT);
-   fid2 = H5Fopen(FILE2, H5F_ACC_RDONLY, H5P_DEFAULT);
-
-   /*
-    * Mount second file under G in the first file.
-    */
-   H5Fmount(fid1, "/G", fid2, H5P_DEFAULT);
-
-   /*
-    * Access dataset D in the first file under /G/D name.
-    */
-   did = H5Dopen2(fid1, "/G/D", H5P_DEFAULT);
-   tid = H5Dget_type(did);
-   status = H5Dread(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, bm_out);
-
-   /*
-    * Print out the data.
-    */
-   for(i=0; i<NX; i++){
-    for(j=0; j<NY; j++)
-        printf("  %d", bm_out[i][j]);
-	printf("\n");
-   }
-
-   /*
-    * Close all identifers
-    */
-   H5Tclose(tid);
-   H5Dclose(did);
-
-   /*
-    * Unmounting second file
-    */
-   H5Funmount(fid1, "/G");
-
-   /*
-    * Close both files
-    */
-   H5Fclose(fid1);
-   H5Fclose(fid2);
-
-   return 0;
+    hid_t fid1, fid2, gid; /* Files and group identifiers */
+    hid_t did, tid, sid;   /* Dataset and datatype identifiers */
+
+    herr_t  status;
+    hsize_t dims[] = {NX, NY}; /* Dataset dimensions */
+
+    int i, j;
+    int bm[NX][NY], bm_out[NX][NY]; /* Data buffers */
+
+    /*
+     * Initialization of buffer matrix "bm"
+     */
+    for (i = 0; i < NX; i++)
+        for (j = 0; j < NY; j++)
+            bm[i][j] = i + j;
+
+    /*
+     * Create first file and a group in it.
+     */
+    fid1 = H5Fcreate(FILE1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    gid  = H5Gcreate2(fid1, "/G", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+
+    /*
+     * Close group and file
+     */
+    H5Gclose(gid);
+    H5Fclose(fid1);
+
+    /*
+     * Create second file and dataset "D" in it.
+     */
+    fid2    = H5Fcreate(FILE2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    dims[0] = NX;
+    dims[1] = NY;
+    sid     = H5Screate_simple(RANK, dims, NULL);
+    did     = H5Dcreate2(fid2, "D", H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+
+    /*
+     * Write data to the dataset.
+     */
+    status = H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, bm);
+
+    /*
+     * Close all identifiers.
+     */
+    H5Sclose(sid);
+    H5Dclose(did);
+    H5Fclose(fid2);
+
+    /*
+     * Reopen both files
+     */
+    fid1 = H5Fopen(FILE1, H5F_ACC_RDONLY, H5P_DEFAULT);
+    fid2 = H5Fopen(FILE2, H5F_ACC_RDONLY, H5P_DEFAULT);
+
+    /*
+     * Mount second file under G in the first file.
+     */
+    H5Fmount(fid1, "/G", fid2, H5P_DEFAULT);
+
+    /*
+     * Access dataset D in the first file under /G/D name.
+     */
+    did    = H5Dopen2(fid1, "/G/D", H5P_DEFAULT);
+    tid    = H5Dget_type(did);
+    status = H5Dread(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, bm_out);
+
+    /*
+     * Print out the data.
+     */
+    for (i = 0; i < NX; i++) {
+        for (j = 0; j < NY; j++)
+            printf("  %d", bm_out[i][j]);
+        printf("\n");
+    }
+
+    /*
+     * Close all identifiers
+     */
+    H5Tclose(tid);
+    H5Dclose(did);
+
+    /*
+     * Unmounting second file
+     */
+    H5Funmount(fid1, "/G");
+
+    /*
+     * Close both files
+     */
+    H5Fclose(fid1);
+    H5Fclose(fid2);
+
+    return 0;
 }
-
-
-
diff --git a/examples/h5_rdwt.c b/examples/h5_rdwt.c
index 0e290ca..679dc46 100644
--- a/examples/h5_rdwt.c
+++ b/examples/h5_rdwt.c
@@ -1,19 +1,16 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-/* 
+/*
  *  This example illustrates how to write and read data in an existing
  *  dataset.  It is used in the HDF5 Tutorial.
  */
@@ -21,33 +18,33 @@
 #include "hdf5.h"
 #define FILE "dset.h5"
 
-int main() {
+int
+main()
+{
 
-   hid_t       file_id, dataset_id;  /* identifiers */
-   herr_t      status;
-   int         i, j, dset_data[4][6];
+    hid_t  file_id, dataset_id; /* identifiers */
+    herr_t status;
+    int    i, j, dset_data[4][6];
 
-   /* Initialize the dataset. */
-   for (i = 0; i < 4; i++)
-      for (j = 0; j < 6; j++)
-         dset_data[i][j] = i * 6 + j + 1;
+    /* Initialize the dataset. */
+    for (i = 0; i < 4; i++)
+        for (j = 0; j < 6; j++)
+            dset_data[i][j] = i * 6 + j + 1;
 
-   /* Open an existing file. */
-   file_id = H5Fopen(FILE, H5F_ACC_RDWR, H5P_DEFAULT);
+    /* Open an existing file. */
+    file_id = H5Fopen(FILE, H5F_ACC_RDWR, H5P_DEFAULT);
 
-   /* Open an existing dataset. */
-   dataset_id = H5Dopen2(file_id, "/dset", H5P_DEFAULT);
+    /* Open an existing dataset. */
+    dataset_id = H5Dopen2(file_id, "/dset", H5P_DEFAULT);
 
-   /* Write the dataset. */
-   status = H5Dwrite(dataset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, 
-                     dset_data);
+    /* Write the dataset. */
+    status = H5Dwrite(dataset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset_data);
 
-   status = H5Dread(dataset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, 
-                    dset_data);
+    status = H5Dread(dataset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset_data);
 
-   /* Close the dataset. */
-   status = H5Dclose(dataset_id);
+    /* Close the dataset. */
+    status = H5Dclose(dataset_id);
 
-   /* Close the file. */
-   status = H5Fclose(file_id);
+    /* Close the file. */
+    status = H5Fclose(file_id);
 }
diff --git a/examples/h5_read.c b/examples/h5_read.c
index 6fe75be..ad8e2d7 100644
--- a/examples/h5_read.c
+++ b/examples/h5_read.c
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
@@ -22,71 +19,73 @@
 
 #include "hdf5.h"
 
-#define H5FILE_NAME        "SDS.h5"
+#define H5FILE_NAME "SDS.h5"
 #define DATASETNAME "IntArray"
-#define NX_SUB  3           /* hyperslab dimensions */
-#define NY_SUB  4
-#define NX 7           /* output buffer dimensions */
-#define NY 7
-#define NZ  3
-#define RANK         2
-#define RANK_OUT     3
+#define NX_SUB      3 /* hyperslab dimensions */
+#define NY_SUB      4
+#define NX          7 /* output buffer dimensions */
+#define NY          7
+#define NZ          3
+#define RANK        2
+#define RANK_OUT    3
 
 int
-main (void)
+main(void)
 {
-    hid_t       file, dataset;         /* handles */
+    hid_t       file, dataset; /* handles */
     hid_t       datatype, dataspace;
     hid_t       memspace;
-    H5T_class_t t_class;                 /* data type class */
-    H5T_order_t order;                 /* data order */
-    size_t      size;                  /*
-				        * size of the data element
-				        * stored in file
-				        */
-    hsize_t     dimsm[3];              /* memory space dimensions */
-    hsize_t     dims_out[2];           /* dataset dimensions */
-    herr_t      status;
-
-    int         data_out[NX][NY][NZ ]; /* output buffer */
-
-    hsize_t      count[2];              /* size of the hyperslab in the file */
-    hsize_t      offset[2];             /* hyperslab offset in the file */
-    hsize_t      count_out[3];          /* size of the hyperslab in memory */
-    hsize_t      offset_out[3];         /* hyperslab offset in memory */
-    int          i, j, k, status_n, rank;
+    H5T_class_t t_class; /* data type class */
+    H5T_order_t order;   /* data order */
+    size_t      size;    /*
+                          * size of the data element
+                          * stored in file
+                          */
+    hsize_t dimsm[3];    /* memory space dimensions */
+    hsize_t dims_out[2]; /* dataset dimensions */
+    herr_t  status;
+
+    int data_out[NX][NY][NZ]; /* output buffer */
+
+    hsize_t count[2];      /* size of the hyperslab in the file */
+    hsize_t offset[2];     /* hyperslab offset in the file */
+    hsize_t count_out[3];  /* size of the hyperslab in memory */
+    hsize_t offset_out[3]; /* hyperslab offset in memory */
+    int     i, j, k, status_n, rank;
 
     for (j = 0; j < NX; j++) {
-	for (i = 0; i < NY; i++) {
-	    for (k = 0; k < NZ ; k++)
-		data_out[j][i][k] = 0;
-	}
+        for (i = 0; i < NY; i++) {
+            for (k = 0; k < NZ; k++)
+                data_out[j][i][k] = 0;
+        }
     }
 
     /*
      * Open the file and the dataset.
      */
-    file = H5Fopen(H5FILE_NAME, H5F_ACC_RDONLY, H5P_DEFAULT);
+    file    = H5Fopen(H5FILE_NAME, H5F_ACC_RDONLY, H5P_DEFAULT);
     dataset = H5Dopen2(file, DATASETNAME, H5P_DEFAULT);
 
     /*
      * Get datatype and dataspace handles and then query
      * dataset class, order, size, rank and dimensions.
      */
-    datatype  = H5Dget_type(dataset);     /* datatype handle */
-    t_class     = H5Tget_class(datatype);
-    if (t_class == H5T_INTEGER) printf("Data set has INTEGER type \n");
-    order     = H5Tget_order(datatype);
-    if (order == H5T_ORDER_LE) printf("Little endian order \n");
-
-    size  = H5Tget_size(datatype);
+    datatype = H5Dget_type(dataset); /* datatype handle */
+    t_class  = H5Tget_class(datatype);
+    if (t_class == H5T_INTEGER)
+        printf("Data set has INTEGER type \n");
+    order = H5Tget_order(datatype);
+    if (order == H5T_ORDER_LE)
+        printf("Little endian order \n");
+
+    size = H5Tget_size(datatype);
     printf(" Data size is %d \n", (int)size);
 
-    dataspace = H5Dget_space(dataset);    /* dataspace handle */
+    dataspace = H5Dget_space(dataset); /* dataspace handle */
     rank      = H5Sget_simple_extent_ndims(dataspace);
     status_n  = H5Sget_simple_extent_dims(dataspace, dims_out, NULL);
-    printf("rank %d, dimensions %lu x %lu \n", rank,
-	   (unsigned long)(dims_out[0]), (unsigned long)(dims_out[1]));
+    printf("rank %d, dimensions %lu x %lu \n", rank, (unsigned long)(dims_out[0]),
+           (unsigned long)(dims_out[1]));
 
     /*
      * Define hyperslab in the dataset.
@@ -95,16 +94,15 @@ main (void)
     offset[1] = 2;
     count[0]  = NX_SUB;
     count[1]  = NY_SUB;
-    status = H5Sselect_hyperslab(dataspace, H5S_SELECT_SET, offset, NULL,
-				 count, NULL);
+    status    = H5Sselect_hyperslab(dataspace, H5S_SELECT_SET, offset, NULL, count, NULL);
 
     /*
      * Define the memory dataspace.
      */
     dimsm[0] = NX;
     dimsm[1] = NY;
-    dimsm[2] = NZ ;
-    memspace = H5Screate_simple(RANK_OUT,dimsm,NULL);
+    dimsm[2] = NZ;
+    memspace = H5Screate_simple(RANK_OUT, dimsm, NULL);
 
     /*
      * Define memory hyperslab.
@@ -115,18 +113,17 @@ main (void)
     count_out[0]  = NX_SUB;
     count_out[1]  = NY_SUB;
     count_out[2]  = 1;
-    status = H5Sselect_hyperslab(memspace, H5S_SELECT_SET, offset_out, NULL,
-				 count_out, NULL);
+    status        = H5Sselect_hyperslab(memspace, H5S_SELECT_SET, offset_out, NULL, count_out, NULL);
 
     /*
      * Read data from hyperslab in the file into the hyperslab in
      * memory and display.
      */
-    status = H5Dread(dataset, H5T_NATIVE_INT, memspace, dataspace,
-		     H5P_DEFAULT, data_out);
+    status = H5Dread(dataset, H5T_NATIVE_INT, memspace, dataspace, H5P_DEFAULT, data_out);
     for (j = 0; j < NX; j++) {
-	for (i = 0; i < NY; i++) printf("%d ", data_out[j][i][0]);
-	printf("\n");
+        for (i = 0; i < NY; i++)
+            printf("%d ", data_out[j][i][0]);
+        printf("\n");
     }
     /*
      * 0 0 0 0 0 0 0
diff --git a/examples/h5_ref2reg.c b/examples/h5_ref2reg.c
deleted file mode 100644
index c4e8d3d..0000000
--- a/examples/h5_ref2reg.c
+++ /dev/null
@@ -1,210 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of HDF5.  The full HDF5 copyright notice, including     *
- * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-/*
-    This program shows how to create, store and dereference references
-    to the dataset regions.
-
-    It creates a file and writes a two dimensional integer dataset
-    to it. Then it creates a dataset to store region references in. It
-    stores references to a hyperslab and 3 points selected (for the
-    integer dataset previously created).
-
-    It then reopens the references dataset, reads and dereferences the
-    region references, and then reads and displays the selected hyperslab
-    and selected elements data from the integer dataset.
-*/
-
-#include "hdf5.h"
-
-#define filename "REF_REG.h5"
-#define dsetnamev "MATRIX"
-#define dsetnamer "REGION_REFERENCES"
-
-int main(void)
-{
-    hid_t file_id;        /* file identifier */
-    hid_t space_id;       /* dataspace identifiers */
-    hid_t spacer_id;
-    hid_t dsetv_id;       /*dataset identifiers*/
-    hid_t dsetr_id;
-    hsize_t dims[2] =  {2,9};
-    hsize_t dimsr[1] =  {2};
-    int rank = 2;
-    int rankr =1;
-    herr_t status;
-    hdset_reg_ref_t ref[2];
-    hdset_reg_ref_t ref_out[2];
-    int data[2][9] = {{1,1,2,3,3,4,5,5,6},{1,2,2,3,4,4,5,6,6}};
-    int data_out[2][9] = {{0,0,0,0,0,0,0,0,0},{0,0,0,0,0,0,0,0,0}};
-    hsize_t start[2];
-    hsize_t count[2];
-    hsize_t coord[2][3] = {{0, 0, 1}, {6, 0, 8}};
-    unsigned num_points = 3;
-    int i, j;
-    size_t name_size1, name_size2;
-    char buf1[10], buf2[10];
-
-    /*
-     * Create file with default file access and file creation properties.
-     */
-    file_id = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-
-    /*
-     * Create dataspace for datasets.
-     */
-    space_id = H5Screate_simple(rank, dims, NULL);
-    spacer_id = H5Screate_simple(rankr, dimsr, NULL);
-
-    /*
-     * Create integer dataset.
-     */
-    dsetv_id = H5Dcreate2(file_id, dsetnamev, H5T_NATIVE_INT, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-
-    /*
-     * Write data to the dataset.
-     */
-    status = H5Dwrite(dsetv_id, H5T_NATIVE_INT, H5S_ALL , H5S_ALL, H5P_DEFAULT,data);
-    status = H5Dclose(dsetv_id);
-
-    /*
-     * Dataset with references.
-     */
-    dsetr_id = H5Dcreate2(file_id, dsetnamer, H5T_STD_REF_DSETREG, spacer_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-
-    /*
-     * Create a reference to the hyperslab.
-     */
-    start[0] = 0;
-    start[1] = 3;
-    count[0] = 2;
-    count[1] = 3;
-    status = H5Sselect_hyperslab(space_id, H5S_SELECT_SET, start, NULL, count, NULL);
-    status = H5Rcreate(&ref[0], file_id, dsetnamev, H5R_DATASET_REGION, space_id);
-
-    /*
-     * Create a reference to elements selection.
-     */
-    status = H5Sselect_none(space_id);
-    status = H5Sselect_elements(space_id, H5S_SELECT_SET, num_points, (const hsize_t *)coord);
-    status = H5Rcreate(&ref[1], file_id, dsetnamev, H5R_DATASET_REGION, space_id);
-
-    /*
-     * Write dataset with the references.
-     */
-    status = H5Dwrite(dsetr_id, H5T_STD_REF_DSETREG, H5S_ALL, H5S_ALL, H5P_DEFAULT,ref);
-
-    /*
-     * Close all objects.
-     */
-    status = H5Sclose(space_id);
-    status = H5Sclose(spacer_id);
-    status = H5Dclose(dsetr_id);
-    status = H5Fclose(file_id);
-
-    /*
-     * Reopen the file to read selections back.
-     */
-    file_id = H5Fopen(filename, H5F_ACC_RDWR,  H5P_DEFAULT);
-
-    /*
-     * Reopen the dataset with object references and read references
-     * to the buffer.
-     */
-    dsetr_id = H5Dopen2(file_id, dsetnamer, H5P_DEFAULT);
-
-    status = H5Dread(dsetr_id, H5T_STD_REF_DSETREG, H5S_ALL, H5S_ALL,
-                   H5P_DEFAULT, ref_out);
-
-    /*
-     * Dereference the first reference.
-     */
-    dsetv_id = H5Rdereference2(dsetr_id, H5P_DEFAULT, H5R_DATASET_REGION, &ref_out[0]);
-    /*
-     * Get name of the dataset the first region reference points to
-     * using H5Rget_name
-     */
-    name_size1 = H5Rget_name(dsetr_id, H5R_DATASET_REGION, &ref_out[0], (char*)buf1, 10);
-    printf(" Dataset's name (returned by H5Rget_name) the reference points to is %s, name length is %d\n", buf1, (int)name_size1);
-    /*
-     * Get name of the dataset the first region reference points to
-     * using H5Iget_name
-     */
-    name_size2 = H5Iget_name(dsetv_id, (char*)buf2, 10);
-    printf(" Dataset's name (returned by H5Iget_name) the reference points to is %s, name length is %d\n", buf2, (int)name_size2);
-
-    space_id = H5Rget_region(dsetr_id, H5R_DATASET_REGION,&ref_out[0]);
-
-    /*
-     * Read and display hyperslab selection from the dataset.
-     */
-
-    status = H5Dread(dsetv_id, H5T_NATIVE_INT, H5S_ALL, space_id,
-                   H5P_DEFAULT, data_out);
-    printf("Selected hyperslab: ");
-    for (i = 0; i <= 1; i++)
-    {
-        printf("\n");
-        for (j = 0; j <= 8; j++)
-            printf("%d ", data_out[i][j]);
-    }
-    printf("\n");
-
-    /*
-     * Close dataspace and the dataset.
-     */
-    status = H5Sclose(space_id);
-    status = H5Dclose(dsetv_id);
-
-    /*
-     * Initialize data_out array again to get point selection.
-     */
-    for (i = 0; i <= 1; i++)
-        for (j = 0; j <= 8; j++)
-            data_out[i][j] = 0;
-
-    /*
-     * Dereference the second reference.
-     */
-    dsetv_id = H5Rdereference2(dsetr_id, H5P_DEFAULT, H5R_DATASET_REGION, &ref_out[1]);
-    space_id = H5Rget_region(dsetv_id, H5R_DATASET_REGION,&ref_out[1]);
-
-    /*
-     * Read selected data from the dataset.
-     */
-
-    status = H5Dread(dsetv_id, H5T_NATIVE_INT, H5S_ALL, space_id,
-                   H5P_DEFAULT, data_out);
-    printf("Selected points: ");
-    for (i = 0; i <= 1; i++)
-    {
-        printf("\n");
-        for (j = 0; j <= 8; j++)
-            printf("%d ", data_out[i][j]);
-    }
-    printf("\n");
-
-    /*
-     * Close dataspace and the dataset.
-     */
-    status = H5Sclose(space_id);
-    status = H5Dclose(dsetv_id);
-    status = H5Dclose(dsetr_id);
-    status = H5Fclose(file_id);
-
-    return 0;
-}
-
-
-
diff --git a/examples/h5_ref2reg_deprec.c b/examples/h5_ref2reg_deprec.c
new file mode 100644
index 0000000..a668e4b
--- /dev/null
+++ b/examples/h5_ref2reg_deprec.c
@@ -0,0 +1,204 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/*
+    This program shows how to create, store and dereference references
+    to the dataset regions.
+
+    It creates a file and writes a two dimensional integer dataset
+    to it. Then it creates a dataset to store region references in. It
+    stores references to a hyperslab and 3 points selected (for the
+    integer dataset previously created).
+
+    It then reopens the references dataset, reads and dereferences the
+    region references, and then reads and displays the selected hyperslab
+    and selected elements data from the integer dataset.
+*/
+
+#include "hdf5.h"
+
+#define filename  "REF_REG.h5"
+#define dsetnamev "MATRIX"
+#define dsetnamer "REGION_REFERENCES"
+
+int
+main(void)
+{
+    hid_t           file_id;  /* file identifier */
+    hid_t           space_id; /* dataspace identifiers */
+    hid_t           spacer_id;
+    hid_t           dsetv_id; /*dataset identifiers*/
+    hid_t           dsetr_id;
+    hsize_t         dims[2]  = {2, 9};
+    hsize_t         dimsr[1] = {2};
+    int             rank     = 2;
+    int             rankr    = 1;
+    herr_t          status;
+    hdset_reg_ref_t ref[2];
+    hdset_reg_ref_t ref_out[2];
+    int             data[2][9]     = {{1, 1, 2, 3, 3, 4, 5, 5, 6}, {1, 2, 2, 3, 4, 4, 5, 6, 6}};
+    int             data_out[2][9] = {{0, 0, 0, 0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0, 0, 0, 0}};
+    hsize_t         start[2];
+    hsize_t         count[2];
+    hsize_t         coord[2][3] = {{0, 0, 1}, {6, 0, 8}};
+    unsigned        num_points  = 3;
+    int             i, j;
+    size_t          name_size1, name_size2;
+    char            buf1[10], buf2[10];
+
+    /*
+     * Create file with default file access and file creation properties.
+     */
+    file_id = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+
+    /*
+     * Create dataspace for datasets.
+     */
+    space_id  = H5Screate_simple(rank, dims, NULL);
+    spacer_id = H5Screate_simple(rankr, dimsr, NULL);
+
+    /*
+     * Create integer dataset.
+     */
+    dsetv_id =
+        H5Dcreate2(file_id, dsetnamev, H5T_NATIVE_INT, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+
+    /*
+     * Write data to the dataset.
+     */
+    status = H5Dwrite(dsetv_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data);
+    status = H5Dclose(dsetv_id);
+
+    /*
+     * Dataset with references.
+     */
+    dsetr_id =
+        H5Dcreate2(file_id, dsetnamer, H5T_STD_REF_DSETREG, spacer_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+
+    /*
+     * Create a reference to the hyperslab.
+     */
+    start[0] = 0;
+    start[1] = 3;
+    count[0] = 2;
+    count[1] = 3;
+    status   = H5Sselect_hyperslab(space_id, H5S_SELECT_SET, start, NULL, count, NULL);
+    status   = H5Rcreate(&ref[0], file_id, dsetnamev, H5R_DATASET_REGION, space_id);
+
+    /*
+     * Create a reference to elements selection.
+     */
+    status = H5Sselect_none(space_id);
+    status = H5Sselect_elements(space_id, H5S_SELECT_SET, num_points, (const hsize_t *)coord);
+    status = H5Rcreate(&ref[1], file_id, dsetnamev, H5R_DATASET_REGION, space_id);
+
+    /*
+     * Write dataset with the references.
+     */
+    status = H5Dwrite(dsetr_id, H5T_STD_REF_DSETREG, H5S_ALL, H5S_ALL, H5P_DEFAULT, ref);
+
+    /*
+     * Close all objects.
+     */
+    status = H5Sclose(space_id);
+    status = H5Sclose(spacer_id);
+    status = H5Dclose(dsetr_id);
+    status = H5Fclose(file_id);
+
+    /*
+     * Reopen the file to read selections back.
+     */
+    file_id = H5Fopen(filename, H5F_ACC_RDWR, H5P_DEFAULT);
+
+    /*
+     * Reopen the dataset with object references and read references
+     * to the buffer.
+     */
+    dsetr_id = H5Dopen2(file_id, dsetnamer, H5P_DEFAULT);
+
+    status = H5Dread(dsetr_id, H5T_STD_REF_DSETREG, H5S_ALL, H5S_ALL, H5P_DEFAULT, ref_out);
+
+    /*
+     * Dereference the first reference.
+     */
+    dsetv_id = H5Rdereference2(dsetr_id, H5P_DEFAULT, H5R_DATASET_REGION, &ref_out[0]);
+    /*
+     * Get name of the dataset the first region reference points to
+     * using H5Rget_name
+     */
+    name_size1 = H5Rget_name(dsetr_id, H5R_DATASET_REGION, &ref_out[0], (char *)buf1, 10);
+    printf(" Dataset's name (returned by H5Rget_name) the reference points to is %s, name length is %d\n",
+           buf1, (int)name_size1);
+    /*
+     * Get name of the dataset the first region reference points to
+     * using H5Iget_name
+     */
+    name_size2 = H5Iget_name(dsetv_id, (char *)buf2, 10);
+    printf(" Dataset's name (returned by H5Iget_name) the reference points to is %s, name length is %d\n",
+           buf2, (int)name_size2);
+
+    space_id = H5Rget_region(dsetr_id, H5R_DATASET_REGION, &ref_out[0]);
+
+    /*
+     * Read and display hyperslab selection from the dataset.
+     */
+
+    status = H5Dread(dsetv_id, H5T_NATIVE_INT, H5S_ALL, space_id, H5P_DEFAULT, data_out);
+    printf("Selected hyperslab: ");
+    for (i = 0; i <= 1; i++) {
+        printf("\n");
+        for (j = 0; j <= 8; j++)
+            printf("%d ", data_out[i][j]);
+    }
+    printf("\n");
+
+    /*
+     * Close dataspace and the dataset.
+     */
+    status = H5Sclose(space_id);
+    status = H5Dclose(dsetv_id);
+
+    /*
+     * Initialize data_out array again to get point selection.
+     */
+    for (i = 0; i <= 1; i++)
+        for (j = 0; j <= 8; j++)
+            data_out[i][j] = 0;
+
+    /*
+     * Dereference the second reference.
+     */
+    dsetv_id = H5Rdereference2(dsetr_id, H5P_DEFAULT, H5R_DATASET_REGION, &ref_out[1]);
+    space_id = H5Rget_region(dsetv_id, H5R_DATASET_REGION, &ref_out[1]);
+
+    /*
+     * Read selected data from the dataset.
+     */
+
+    status = H5Dread(dsetv_id, H5T_NATIVE_INT, H5S_ALL, space_id, H5P_DEFAULT, data_out);
+    printf("Selected points: ");
+    for (i = 0; i <= 1; i++) {
+        printf("\n");
+        for (j = 0; j <= 8; j++)
+            printf("%d ", data_out[i][j]);
+    }
+    printf("\n");
+
+    /*
+     * Close dataspace and the dataset.
+     */
+    status = H5Sclose(space_id);
+    status = H5Dclose(dsetv_id);
+    status = H5Dclose(dsetr_id);
+    status = H5Fclose(file_id);
+
+    return 0;
+}
diff --git a/examples/h5_ref_compat.c b/examples/h5_ref_compat.c
new file mode 100644
index 0000000..cce755b
--- /dev/null
+++ b/examples/h5_ref_compat.c
@@ -0,0 +1,89 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/*
+ * The example below illustrates the use of the new API with a file that was
+ * written using the old-style reference API, showing how one can take
+ * advantage of the automatic type conversion from old reference type to new
+ * reference type.
+ */
+
+#include <stdlib.h>
+
+#include "hdf5.h"
+#include <assert.h>
+
+#define H5FILE_NAME "refer_deprec.h5"
+
+#define NDIMS    1 /* Number of dimensions */
+#define BUF_SIZE 4 /* Size of example buffer */
+#define NREFS    1 /* Number of references */
+
+int
+main(void)
+{
+    hid_t   file1, dset1, space1;
+    hsize_t dset1_dims[NDIMS] = {BUF_SIZE};
+    int     dset_buf[BUF_SIZE];
+
+    hid_t      dset2, space2;
+    hsize_t    dset2_dims[NDIMS]  = {NREFS};
+    hobj_ref_t ref_buf[NREFS]     = {0};
+    H5R_ref_t  new_ref_buf[NREFS] = {0};
+    H5O_type_t obj_type;
+    int        i;
+
+    for (i = 0; i < BUF_SIZE; i++)
+        dset_buf[i] = i;
+
+    /* Create file with one dataset and close it */
+    file1 = H5Fcreate(H5FILE_NAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+
+    space1 = H5Screate_simple(NDIMS, dset1_dims, NULL);
+    dset1  = H5Dcreate2(file1, "dataset1", H5T_NATIVE_INT, space1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    H5Dwrite(dset1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset_buf);
+    H5Dclose(dset1);
+    H5Sclose(space1);
+
+    /**
+     * Create reference to dataset1 with deprecated API
+     * (reminder: there is no destroy call for those references)
+     */
+    H5Rcreate(&ref_buf[0], file1, "dataset1", H5R_OBJECT, H5I_INVALID_HID);
+
+    /* Store reference in separate dataset using deprecated reference type */
+    space2 = H5Screate_simple(NDIMS, dset2_dims, NULL);
+    dset2  = H5Dcreate2(file1, "references", H5T_STD_REF_OBJ, space2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    H5Dwrite(dset2, H5T_STD_REF_OBJ, H5S_ALL, H5S_ALL, H5P_DEFAULT, ref_buf);
+    H5Dclose(dset2);
+    H5Sclose(space2);
+    H5Fclose(file1);
+
+    /* Read reference from file using new reference type */
+    file1 = H5Fopen(H5FILE_NAME, H5F_ACC_RDONLY, H5P_DEFAULT);
+    dset2 = H5Dopen2(file1, "references", H5P_DEFAULT);
+    H5Dread(dset2, H5T_STD_REF, H5S_ALL, H5S_ALL, H5P_DEFAULT, new_ref_buf);
+    H5Dclose(dset2);
+
+    /* Access reference and read dataset data through new API */
+    assert(H5Rget_type((const H5R_ref_t *)&new_ref_buf[0]) == H5R_OBJECT2);
+    H5Rget_obj_type3(&new_ref_buf[0], H5P_DEFAULT, &obj_type);
+    assert(obj_type == H5O_TYPE_DATASET);
+    dset1 = H5Ropen_object(&new_ref_buf[0], H5P_DEFAULT, H5P_DEFAULT);
+    H5Dread(dset1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset_buf);
+    H5Dclose(dset1);
+    H5Rdestroy(&new_ref_buf[0]);
+
+    for (i = 0; i < BUF_SIZE; i++)
+        assert(dset_buf[i] == i);
+    return 0;
+}
diff --git a/examples/h5_ref_extern.c b/examples/h5_ref_extern.c
new file mode 100644
index 0000000..691d235
--- /dev/null
+++ b/examples/h5_ref_extern.c
@@ -0,0 +1,92 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/*
+ * The example below illustrates the use of the new API with files that are
+ * opened read-only. Created references to the objects in that file are
+ * stored into a separate file, and accessed from that file, without the user
+ * explicitly opening the original file that was referenced.
+ */
+
+#include <stdlib.h>
+
+#include "hdf5.h"
+#include <assert.h>
+
+#define H5FILE_NAME1 "refer_extern1.h5"
+#define H5FILE_NAME2 "refer_extern2.h5"
+
+#define NDIMS    1 /* Number of dimensions */
+#define BUF_SIZE 4 /* Size of example buffer */
+#define NREFS    1 /* Number of references */
+
+int
+main(void)
+{
+    hid_t   file1, dset1, space1;
+    hsize_t dset1_dims[NDIMS] = {BUF_SIZE};
+    int     dset_buf[BUF_SIZE];
+
+    hid_t      file2, dset2, space2;
+    hsize_t    dset2_dims[NDIMS] = {NREFS};
+    H5R_ref_t  ref_buf[NREFS]    = {0};
+    H5O_type_t obj_type;
+    int        i;
+
+    for (i = 0; i < BUF_SIZE; i++)
+        dset_buf[i] = i;
+
+    /* Create file with one dataset and close it */
+    file1  = H5Fcreate(H5FILE_NAME1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    space1 = H5Screate_simple(NDIMS, dset1_dims, NULL);
+    dset1  = H5Dcreate2(file1, "dataset1", H5T_NATIVE_INT, space1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    H5Dwrite(dset1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset_buf);
+    H5Dclose(dset1);
+    H5Sclose(space1);
+    H5Fclose(file1);
+
+    /* Create reference to dataset1 in "refer_extern1.h5" */
+    file1 = H5Fopen(H5FILE_NAME1, H5F_ACC_RDONLY, H5P_DEFAULT);
+    H5Rcreate_object(file1, "dataset1", H5P_DEFAULT, &ref_buf[0]);
+    H5Fclose(file1);
+
+    /* Store reference in dataset in separate file "refer_extern2.h5" */
+    file2  = H5Fcreate(H5FILE_NAME2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    space2 = H5Screate_simple(NDIMS, dset2_dims, NULL);
+    dset2  = H5Dcreate2(file2, "references", H5T_STD_REF, space2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    H5Dwrite(dset2, H5T_STD_REF, H5S_ALL, H5S_ALL, H5P_DEFAULT, ref_buf);
+    H5Dclose(dset2);
+    H5Sclose(space2);
+    H5Fclose(file2);
+    H5Rdestroy(&ref_buf[0]);
+
+    /* Read reference back from "refer_extern2.h5" */
+    file2 = H5Fopen(H5FILE_NAME2, H5F_ACC_RDONLY, H5P_DEFAULT);
+    dset2 = H5Dopen2(file2, "references", H5P_DEFAULT);
+    H5Dread(dset2, H5T_STD_REF, H5S_ALL, H5S_ALL, H5P_DEFAULT, ref_buf);
+    H5Dclose(dset2);
+    H5Fclose(file2);
+
+    /* Access reference and read dataset data without opening original file */
+    assert(H5Rget_type((const H5R_ref_t *)&ref_buf[0]) == H5R_OBJECT2);
+    H5Rget_obj_type3(&ref_buf[0], H5P_DEFAULT, &obj_type);
+    assert(obj_type == H5O_TYPE_DATASET);
+    dset1 = H5Ropen_object(&ref_buf[0], H5P_DEFAULT, H5P_DEFAULT);
+    H5Dread(dset1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset_buf);
+    H5Dclose(dset1);
+    H5Rdestroy(&ref_buf[0]);
+
+    for (i = 0; i < BUF_SIZE; i++)
+        assert(dset_buf[i] == i);
+
+    return 0;
+}
diff --git a/examples/h5_reference.c b/examples/h5_reference.c
deleted file mode 100644
index 38e6146..0000000
--- a/examples/h5_reference.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of HDF5.  The full HDF5 copyright notice, including     *
- * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
- /*
-  *       This program illustrates how references to objects can be used.
-  *       Program creates a dataset and a group in a file. It also creates
-  *       second dataset, and references to the first dataset and the group
-  *       are stored in it.
-  *       Program reopens the file and reads dataset with the references.
-  *       References are used to open the objects. Information about the
-  *       objects is displayed.
-  */
-
-#include <stdlib.h>
-
-#include "hdf5.h"
-
-#define H5FILE_NAME "refere.h5"
-
-int
-main(void) {
-   hid_t fid;                         /* File, group, datasets, datatypes */
-   hid_t gid_a;                       /* and  dataspaces identifiers   */
-   hid_t did_b, sid_b, tid_b;
-   hid_t did_r, tid_r, sid_r;
-   H5O_type_t obj_type;
-   herr_t status;
-
-   hobj_ref_t *wbuf; /* buffer to write to disk */
-   hobj_ref_t *rbuf; /* buffer to read from disk */
-
-
-   hsize_t dim_r[1];
-   hsize_t dim_b[2];
-
-   /*
-    *  Create a file using default properties.
-    */
-   fid = H5Fcreate(H5FILE_NAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-
-   /*
-    *  Create  group "A" in the file.
-    */
-   gid_a = H5Gcreate2(fid, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-
-  /*
-   *  Create dataset "B" in the file.
-   */
-   dim_b[0] = 2;
-   dim_b[1] = 6;
-   sid_b = H5Screate_simple(2, dim_b, NULL);
-   did_b = H5Dcreate2(fid, "B", H5T_NATIVE_FLOAT, sid_b, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-
-   /*
-    *  Create dataset "R" to store references to the objects "A" and "B".
-    */
-   dim_r[0] = 2;
-   sid_r = H5Screate_simple(1, dim_r, NULL);
-   tid_r = H5Tcopy(H5T_STD_REF_OBJ);
-   did_r = H5Dcreate2(fid, "R", tid_r, sid_r, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-
-   /*
-    *  Allocate write and read buffers.
-    */
-   wbuf = (hobj_ref_t *)malloc(sizeof(hobj_ref_t) * 2);
-   rbuf = (hobj_ref_t *)malloc(sizeof(hobj_ref_t) * 2);
-
-   /*
-    *  Create references to the group "A" and dataset "B"
-    *  and store them in the wbuf.
-    */
-   H5Rcreate(&wbuf[0], fid, "A", H5R_OBJECT, (hid_t)-1);
-   H5Rcreate(&wbuf[1], fid, "B", H5R_OBJECT, (hid_t)-1);
-
-   /*
-    *  Write dataset R using default transfer properties.
-    */
-   status = H5Dwrite(did_r, H5T_STD_REF_OBJ, H5S_ALL, H5S_ALL, H5P_DEFAULT, wbuf);
-
-   /*
-    *  Close all objects.
-    */
-   H5Gclose(gid_a);
-
-   H5Sclose(sid_b);
-   H5Dclose(did_b);
-
-   H5Tclose(tid_r);
-   H5Sclose(sid_r);
-   H5Dclose(did_r);
-
-   H5Fclose(fid);
-
-   /*
-    * Reopen the file.
-    */
-   fid = H5Fopen(H5FILE_NAME, H5F_ACC_RDWR, H5P_DEFAULT);
-
-   /*
-    *  Open and read dataset "R".
-    */
-   did_r  = H5Dopen2(fid, "R", H5P_DEFAULT);
-   status = H5Dread(did_r, H5T_STD_REF_OBJ, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf);
-
-   /*
-    * Find the type of referenced objects.
-    */
-    status = H5Rget_obj_type2(did_r, H5R_OBJECT, &rbuf[0], &obj_type);
-    if(obj_type == H5O_TYPE_GROUP)
-        printf("First dereferenced object is a group. \n");
-
-    status = H5Rget_obj_type2(did_r, H5R_OBJECT, &rbuf[1], &obj_type);
-    if(obj_type == H5O_TYPE_DATASET)
-        printf("Second dereferenced object is a dataset. \n");
-
-   /*
-    *  Get datatype of the dataset "B"
-    */
-   did_b = H5Rdereference2(did_r, H5P_DEFAULT, H5R_OBJECT, &rbuf[1]);
-   tid_b = H5Dget_type(did_b);
-   if(H5Tequal(tid_b, H5T_NATIVE_FLOAT))
-     printf("Datatype of the dataset is H5T_NATIVE_FLOAT.\n");
-   printf("\n");
-
-   /*
-    * Close all objects and free memory buffers.
-    */
-   H5Dclose(did_r);
-   H5Dclose(did_b);
-   H5Tclose(tid_b);
-   H5Fclose(fid);
-   free(rbuf);
-   free(wbuf);
-
-   return 0;
- }
-
diff --git a/examples/h5_reference_deprec.c b/examples/h5_reference_deprec.c
new file mode 100644
index 0000000..2f72cdb
--- /dev/null
+++ b/examples/h5_reference_deprec.c
@@ -0,0 +1,145 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/*
+ *       This program illustrates how references to objects can be used.
+ *       Program creates a dataset and a group in a file. It also creates
+ *       second dataset, and references to the first dataset and the group
+ *       are stored in it.
+ *       Program reopens the file and reads dataset with the references.
+ *       References are used to open the objects. Information about the
+ *       objects is displayed.
+ */
+
+#include <stdlib.h>
+
+#include "hdf5.h"
+
+#define H5FILE_NAME "refere.h5"
+
+int
+main(void)
+{
+    hid_t      fid;   /* File, group, datasets, datatypes */
+    hid_t      gid_a; /* and  dataspaces identifiers   */
+    hid_t      did_b, sid_b, tid_b;
+    hid_t      did_r, tid_r, sid_r;
+    H5O_type_t obj_type;
+    herr_t     status;
+
+    hobj_ref_t *wbuf; /* buffer to write to disk */
+    hobj_ref_t *rbuf; /* buffer to read from disk */
+
+    hsize_t dim_r[1];
+    hsize_t dim_b[2];
+
+    /*
+     *  Create a file using default properties.
+     */
+    fid = H5Fcreate(H5FILE_NAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+
+    /*
+     *  Create  group "A" in the file.
+     */
+    gid_a = H5Gcreate2(fid, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+
+    /*
+     *  Create dataset "B" in the file.
+     */
+    dim_b[0] = 2;
+    dim_b[1] = 6;
+    sid_b    = H5Screate_simple(2, dim_b, NULL);
+    did_b    = H5Dcreate2(fid, "B", H5T_NATIVE_FLOAT, sid_b, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+
+    /*
+     *  Create dataset "R" to store references to the objects "A" and "B".
+     */
+    dim_r[0] = 2;
+    sid_r    = H5Screate_simple(1, dim_r, NULL);
+    tid_r    = H5Tcopy(H5T_STD_REF_OBJ);
+    did_r    = H5Dcreate2(fid, "R", tid_r, sid_r, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+
+    /*
+     *  Allocate write and read buffers.
+     */
+    wbuf = (hobj_ref_t *)malloc(sizeof(hobj_ref_t) * 2);
+    rbuf = (hobj_ref_t *)malloc(sizeof(hobj_ref_t) * 2);
+
+    /*
+     *  Create references to the group "A" and dataset "B"
+     *  and store them in the wbuf.
+     */
+    H5Rcreate(&wbuf[0], fid, "A", H5R_OBJECT, (hid_t)-1);
+    H5Rcreate(&wbuf[1], fid, "B", H5R_OBJECT, (hid_t)-1);
+
+    /*
+     *  Write dataset R using default transfer properties.
+     */
+    status = H5Dwrite(did_r, H5T_STD_REF_OBJ, H5S_ALL, H5S_ALL, H5P_DEFAULT, wbuf);
+
+    /*
+     *  Close all objects.
+     */
+    H5Gclose(gid_a);
+
+    H5Sclose(sid_b);
+    H5Dclose(did_b);
+
+    H5Tclose(tid_r);
+    H5Sclose(sid_r);
+    H5Dclose(did_r);
+
+    H5Fclose(fid);
+
+    /*
+     * Reopen the file.
+     */
+    fid = H5Fopen(H5FILE_NAME, H5F_ACC_RDWR, H5P_DEFAULT);
+
+    /*
+     *  Open and read dataset "R".
+     */
+    did_r  = H5Dopen2(fid, "R", H5P_DEFAULT);
+    status = H5Dread(did_r, H5T_STD_REF_OBJ, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf);
+
+    /*
+     * Find the type of referenced objects.
+     */
+    status = H5Rget_obj_type2(did_r, H5R_OBJECT, &rbuf[0], &obj_type);
+    if (obj_type == H5O_TYPE_GROUP)
+        printf("First dereferenced object is a group. \n");
+
+    status = H5Rget_obj_type2(did_r, H5R_OBJECT, &rbuf[1], &obj_type);
+    if (obj_type == H5O_TYPE_DATASET)
+        printf("Second dereferenced object is a dataset. \n");
+
+    /*
+     *  Get datatype of the dataset "B"
+     */
+    did_b = H5Rdereference2(did_r, H5P_DEFAULT, H5R_OBJECT, &rbuf[1]);
+    tid_b = H5Dget_type(did_b);
+    if (H5Tequal(tid_b, H5T_NATIVE_FLOAT))
+        printf("Datatype of the dataset is H5T_NATIVE_FLOAT.\n");
+    printf("\n");
+
+    /*
+     * Close all objects and free memory buffers.
+     */
+    H5Dclose(did_r);
+    H5Dclose(did_b);
+    H5Tclose(tid_b);
+    H5Fclose(fid);
+    free(rbuf);
+    free(wbuf);
+
+    return 0;
+}
diff --git a/examples/h5_select.c b/examples/h5_select.c
index ceb9c2c..12ea951 100644
--- a/examples/h5_select.c
+++ b/examples/h5_select.c
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
@@ -28,78 +25,80 @@
 
 #define H5FILE_NAME "Select.h5"
 
-#define MSPACE1_RANK     1          /* Rank of the first dataset in memory */
-#define MSPACE1_DIM      50         /* Dataset size in memory */
+#define MSPACE1_RANK 1  /* Rank of the first dataset in memory */
+#define MSPACE1_DIM  50 /* Dataset size in memory */
 
-#define MSPACE2_RANK     1          /* Rank of the second dataset in memory */
-#define MSPACE2_DIM      4          /* Dataset size in memory */
+#define MSPACE2_RANK 1 /* Rank of the second dataset in memory */
+#define MSPACE2_DIM  4 /* Dataset size in memory */
 
-#define FSPACE_RANK      2          /* Dataset rank as it is stored in the file */
-#define FSPACE_DIM1      8          /* Dimension sizes of the dataset as it is
-                                       stored in the file */
-#define FSPACE_DIM2      12
+#define FSPACE_RANK 2 /* Dataset rank as it is stored in the file */
+#define FSPACE_DIM1                                                                                          \
+    8 /* Dimension sizes of the dataset as it is                                                             \
+         stored in the file */
+#define FSPACE_DIM2 12
 
-                                    /* We will read dataset back from the file
-                                       to the dataset in memory with these
-                                       dataspace parameters. */
-#define MSPACE_RANK      2
-#define MSPACE_DIM1      8
-#define MSPACE_DIM2      9
+/* We will read dataset back from the file
+   to the dataset in memory with these
+   dataspace parameters. */
+#define MSPACE_RANK 2
+#define MSPACE_DIM1 8
+#define MSPACE_DIM2 9
 
-#define NPOINTS          4          /* Number of points that will be selected
-                                       and overwritten */
+#define NPOINTS                                                                                              \
+    4 /* Number of points that will be selected                                                              \
+         and overwritten */
 int
-main (void)
+main(void)
 {
 
-   hid_t   file, dataset;           /* File and dataset identifiers */
-   hid_t   mid1, mid2, mid, fid;    /* Dataspace identifiers */
-   hid_t   plist;                   /* Dataset property list identifier */
+    hid_t file, dataset;        /* File and dataset identifiers */
+    hid_t mid1, mid2, mid, fid; /* Dataspace identifiers */
+    hid_t plist;                /* Dataset property list identifier */
 
-   hsize_t dim1[] = {MSPACE1_DIM};  /* Dimension size of the first dataset
+    hsize_t dim1[] = {MSPACE1_DIM}; /* Dimension size of the first dataset
                                        (in memory) */
-   hsize_t dim2[] = {MSPACE2_DIM};  /* Dimension size of the second dataset
+    hsize_t dim2[] = {MSPACE2_DIM}; /* Dimension size of the second dataset
                                        (in memory */
-   hsize_t fdim[] = {FSPACE_DIM1, FSPACE_DIM2};
-                                    /* Dimension sizes of the dataset (on disk) */
-   hsize_t mdim[] = {MSPACE_DIM1, MSPACE_DIM2}; /* Dimension sizes of the
-                                                   dataset in memory when we
-                                                   read selection from the
-                                                   dataset on the disk */
-
-   hsize_t start[2];  /* Start of hyperslab */
-   hsize_t stride[2]; /* Stride of hyperslab */
-   hsize_t count[2];  /* Block count */
-   hsize_t block[2];  /* Block sizes */
-
-   hsize_t coord[NPOINTS][FSPACE_RANK]; /* Array to store selected points
-                                            from the file dataspace */
-   herr_t ret;
-   unsigned i,j;
-   int fillvalue = 0;   /* Fill value for the dataset */
-
-   int    matrix_out[MSPACE_DIM1][MSPACE_DIM2]; /* Buffer to read from the
-                                                   dataset */
-   int    vector[MSPACE1_DIM];
-   int    values[] = {53, 59, 61, 67};  /* New values to be written */
-
-   /*
-    * Buffers' initialization.
-    */
-   vector[0] = vector[MSPACE1_DIM - 1] = -1;
-   for(i = 1; i < MSPACE1_DIM - 1; i++)
-       vector[i] = i;
-
-   /*
-    * Create a file.
-    */
-   file = H5Fcreate(H5FILE_NAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-
-   /*
-    * Create property list for a dataset and set up fill values.
-    */
-   plist = H5Pcreate(H5P_DATASET_CREATE);
-   ret   = H5Pset_fill_value(plist, H5T_NATIVE_INT, &fillvalue);
+    hsize_t fdim[] = {FSPACE_DIM1, FSPACE_DIM2};
+    /* Dimension sizes of the dataset (on disk) */
+    hsize_t mdim[] = {MSPACE_DIM1, MSPACE_DIM2}; /* Dimension sizes of the
+                                                    dataset in memory when we
+                                                    read selection from the
+                                                    dataset on the disk */
+
+    hsize_t start[2];  /* Start of hyperslab */
+    hsize_t stride[2]; /* Stride of hyperslab */
+    hsize_t count[2];  /* Block count */
+    hsize_t block[2];  /* Block sizes */
+
+    hsize_t coord[NPOINTS][FSPACE_RANK]; /* Array to store selected points
+                                             from the file dataspace */
+    herr_t   ret;
+    unsigned i, j;
+    int      fillvalue = 0; /* Fill value for the dataset */
+
+    int matrix_out[MSPACE_DIM1][MSPACE_DIM2]; /* Buffer to read from the
+                                                 dataset */
+    int vector[MSPACE1_DIM];
+    int values[] = {53, 59, 61, 67}; /* New values to be written */
+
+    /*
+     * Buffers' initialization.
+     */
+    vector[0] = vector[MSPACE1_DIM - 1] = -1;
+    for (i = 1; i < MSPACE1_DIM - 1; i++)
+        vector[i] = i;
+
+    /*
+     * Create a file.
+     */
+    file = H5Fcreate(H5FILE_NAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+
+    /*
+     * Create property list for a dataset and set up fill values.
+     */
+    plist = H5Pcreate(H5P_DATASET_CREATE);
+    ret   = H5Pset_fill_value(plist, H5T_NATIVE_INT, &fillvalue);
 
     /*
      * Create dataspace for the dataset in the file.
@@ -116,11 +115,15 @@ main (void)
      * Select hyperslab for the dataset in the file, using 3x2 blocks,
      * (4,3) stride and (2,4) count starting at the position (0,1).
      */
-    start[0]  = 0; start[1]  = 1;
-    stride[0] = 4; stride[1] = 3;
-    count[0]  = 2; count[1]  = 4;
-    block[0]  = 3; block[1]  = 2;
-    ret = H5Sselect_hyperslab(fid, H5S_SELECT_SET, start, stride, count, block);
+    start[0]  = 0;
+    start[1]  = 1;
+    stride[0] = 4;
+    stride[1] = 3;
+    count[0]  = 2;
+    count[1]  = 4;
+    block[0]  = 3;
+    block[1]  = 2;
+    ret       = H5Sselect_hyperslab(fid, H5S_SELECT_SET, start, stride, count, block);
 
     /*
      * Create dataspace for the first dataset.
@@ -136,7 +139,7 @@ main (void)
     stride[0] = 1;
     count[0]  = 48;
     block[0]  = 1;
-    ret = H5Sselect_hyperslab(mid1, H5S_SELECT_SET, start, stride, count, block);
+    ret       = H5Sselect_hyperslab(mid1, H5S_SELECT_SET, start, stride, count, block);
 
     /*
      * Write selection from the vector buffer to the dataset in the file.
@@ -151,7 +154,7 @@ main (void)
      *                    0 41 42  0 43 44  0 45 46  0 47 48
      *                    0  0  0  0  0  0  0  0  0  0  0  0
      */
-     ret = H5Dwrite(dataset, H5T_NATIVE_INT, mid1, fid, H5P_DEFAULT, vector);
+    ret = H5Dwrite(dataset, H5T_NATIVE_INT, mid1, fid, H5P_DEFAULT, vector);
 
     /*
      * Reset the selection for the file dataspace fid.
@@ -166,10 +169,14 @@ main (void)
     /*
      * Select sequence of NPOINTS points in the file dataspace.
      */
-    coord[0][0] = 0; coord[0][1] = 0;
-    coord[1][0] = 3; coord[1][1] = 3;
-    coord[2][0] = 3; coord[2][1] = 5;
-    coord[3][0] = 5; coord[3][1] = 6;
+    coord[0][0] = 0;
+    coord[0][1] = 0;
+    coord[1][0] = 3;
+    coord[1][1] = 3;
+    coord[2][0] = 3;
+    coord[2][1] = 5;
+    coord[3][0] = 5;
+    coord[3][1] = 6;
 
     ret = H5Sselect_elements(fid, H5S_SELECT_SET, NPOINTS, (const hsize_t *)coord);
 
@@ -231,11 +238,15 @@ main (void)
      *                      0 59  0 61
      *
      */
-    start[0] = 1; start[1] = 2;
-    block[0] = 1; block[1] = 1;
-    stride[0] = 1; stride[1] = 1;
-    count[0]  = 3; count[1]  = 4;
-    ret = H5Sselect_hyperslab(fid, H5S_SELECT_SET, start, stride, count, block);
+    start[0]  = 1;
+    start[1]  = 2;
+    block[0]  = 1;
+    block[1]  = 1;
+    stride[0] = 1;
+    stride[1] = 1;
+    count[0]  = 3;
+    count[1]  = 4;
+    ret       = H5Sselect_hyperslab(fid, H5S_SELECT_SET, start, stride, count, block);
 
     /*
      * Add second selected hyperslab to the selection.
@@ -250,11 +261,15 @@ main (void)
      *                                              19 20
      *                                               0 61
      */
-    start[0] = 2; start[1] = 4;
-    block[0] = 1; block[1] = 1;
-    stride[0] = 1; stride[1] = 1;
-    count[0]  = 6; count[1]  = 5;
-    ret = H5Sselect_hyperslab(fid, H5S_SELECT_OR, start, stride, count, block);
+    start[0]  = 2;
+    start[1]  = 4;
+    block[0]  = 1;
+    block[1]  = 1;
+    stride[0] = 1;
+    stride[1] = 1;
+    count[0]  = 6;
+    count[1]  = 5;
+    ret       = H5Sselect_hyperslab(fid, H5S_SELECT_OR, start, stride, count, block);
 
     /*
      * Create memory dataspace.
@@ -265,30 +280,37 @@ main (void)
      * Select two hyperslabs in memory. Hyperslabs has the same
      * size and shape as the selected hyperslabs for the file dataspace.
      */
-    start[0] = 0; start[1] = 0;
-    block[0] = 1; block[1] = 1;
-    stride[0] = 1; stride[1] = 1;
-    count[0]  = 3; count[1]  = 4;
-    ret = H5Sselect_hyperslab(mid, H5S_SELECT_SET, start, stride, count, block);
-
-    start[0] = 1; start[1] = 2;
-    block[0] = 1; block[1] = 1;
-    stride[0] = 1; stride[1] = 1;
-    count[0]  = 6; count[1]  = 5;
-    ret = H5Sselect_hyperslab(mid, H5S_SELECT_OR, start, stride, count, block);
+    start[0]  = 0;
+    start[1]  = 0;
+    block[0]  = 1;
+    block[1]  = 1;
+    stride[0] = 1;
+    stride[1] = 1;
+    count[0]  = 3;
+    count[1]  = 4;
+    ret       = H5Sselect_hyperslab(mid, H5S_SELECT_SET, start, stride, count, block);
+
+    start[0]  = 1;
+    start[1]  = 2;
+    block[0]  = 1;
+    block[1]  = 1;
+    stride[0] = 1;
+    stride[1] = 1;
+    count[0]  = 6;
+    count[1]  = 5;
+    ret       = H5Sselect_hyperslab(mid, H5S_SELECT_OR, start, stride, count, block);
 
     /*
      * Initialize data buffer.
      */
     for (i = 0; i < MSPACE_DIM1; i++) {
-       for (j = 0; j < MSPACE_DIM2; j++)
+        for (j = 0; j < MSPACE_DIM2; j++)
             matrix_out[i][j] = 0;
     }
     /*
      * Read data back to the buffer matrix_out.
      */
-    ret = H5Dread(dataset, H5T_NATIVE_INT, mid, fid,
-                  H5P_DEFAULT, matrix_out);
+    ret = H5Dread(dataset, H5T_NATIVE_INT, mid, fid, H5P_DEFAULT, matrix_out);
 
     /*
      * Display the result. Memory dataset is:
@@ -302,8 +324,8 @@ main (void)
      *                     0  0  0  0  0  0  0  0  0
      *                     0  0  0  0  0  0  0  0  0
      */
-    for(i = 0; i < MSPACE_DIM1; i++) {
-        for(j = 0; j < MSPACE_DIM2; j++)
+    for (i = 0; i < MSPACE_DIM1; i++) {
+        for (j = 0; j < MSPACE_DIM2; j++)
             printf("%3d  ", matrix_out[i][j]);
         printf("\n");
     }
@@ -331,4 +353,3 @@ main (void)
 
     return 0;
 }
-
diff --git a/examples/h5_shared_mesg.c b/examples/h5_shared_mesg.c
index 0c7f2f0..03a1f80 100644
--- a/examples/h5_shared_mesg.c
+++ b/examples/h5_shared_mesg.c
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
@@ -29,29 +26,13 @@
 #include "hdf5.h"
 
 #define NUM_DATASETS 40
-const char* DSETNAME[] = {
-    "dataset0",    "dataset1",
-    "dataset2",    "dataset3",
-    "dataset4",    "dataset5",
-    "dataset6",    "dataset7",
-    "dataset8",    "dataset9",
-    "dataset10",   "dataset11",
-    "dataset12",   "dataset13",
-    "dataset14",   "dataset15",
-    "dataset16",   "dataset17",
-    "dataset18",   "dataset19",
-    "dataset20",   "dataset21",
-    "dataset22",   "dataset23",
-    "dataset24",   "dataset25",
-    "dataset26",   "dataset27",
-    "dataset28",   "dataset29",
-    "dataset30",   "dataset31",
-    "dataset32",   "dataset33",
-    "dataset34",   "dataset35",
-    "dataset36",   "dataset37",
-    "dataset38",   "dataset39",
-    NULL
-};
+const char *DSETNAME[] = {"dataset0",  "dataset1",  "dataset2",  "dataset3",  "dataset4",  "dataset5",
+                          "dataset6",  "dataset7",  "dataset8",  "dataset9",  "dataset10", "dataset11",
+                          "dataset12", "dataset13", "dataset14", "dataset15", "dataset16", "dataset17",
+                          "dataset18", "dataset19", "dataset20", "dataset21", "dataset22", "dataset23",
+                          "dataset24", "dataset25", "dataset26", "dataset27", "dataset28", "dataset29",
+                          "dataset30", "dataset31", "dataset32", "dataset33", "dataset34", "dataset35",
+                          "dataset36", "dataset37", "dataset38", "dataset39", NULL};
 
 herr_t create_standard_file(const char *filename, hid_t fcpl);
 
@@ -63,21 +44,24 @@ herr_t create_standard_file(const char *filename, hid_t fcpl);
  *
  *-------------------------------------------------------------------------
  */
-int main(void)
+int
+main(void)
 {
-    hid_t fcpl_id;
+    hid_t  fcpl_id;
     herr_t ret;
 
     /* Create a file creation property list */
     fcpl_id = H5Pcreate(H5P_FILE_CREATE);
-    if(fcpl_id < 0) goto error;
+    if (fcpl_id < 0)
+        goto error;
 
     /* The file creation property list is the default list right now.
      * Create a file using it (this is the same as creating a file with
      * H5P_DEFAULT).  Implicit shared messages will be disabled.
      */
     ret = create_standard_file("default_file.h5", fcpl_id);
-    if(ret < 0) goto error;
+    if (ret < 0)
+        goto error;
 
     /* There are five kinds of messages that can be shared: datatypes,
      * dataspaces, attributes, fill values, and filter pipelines.
@@ -88,7 +72,8 @@ int main(void)
      */
     /* To begin with, use only one index. */
     ret = H5Pset_shared_mesg_nindexes(fcpl_id, 1);
-    if(ret < 0) goto error;
+    if (ret < 0)
+        goto error;
 
     /* Each index has a "minimum message size" for a message of that
      * type to be shared.  Since sharing a message creates some overhead,
@@ -113,7 +98,8 @@ int main(void)
      * shared in this single index.
      */
     ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_ALL_FLAG, 40);
-    if(ret < 0) goto error;
+    if (ret < 0)
+        goto error;
 
     /* The other property that can be set for shared messages is the
      * list/B-tree cutoff for the indexes.
@@ -122,7 +108,7 @@ int main(void)
      * This keeps the indexes simple when only a few messages are shared,
      * but allows them to scale for many messages.  If many messages are
      * deleted from the B-tree, it scales back down into a list.
-     * A "resonable" setting for maximum list size and minimum btree size
+     * A "reasonable" setting for maximum list size and minimum btree size
      * depends on what kinds of messages will be stored in the file.
      * These numbers are the same for all indexes in a file.
      * We'll guess at some numbers, though we could just as easily have kept
@@ -130,7 +116,8 @@ int main(void)
      * second the minimum B-tree size.
      */
     ret = H5Pset_shared_mesg_phase_change(fcpl_id, 30, 20);
-    if(ret < 0) goto error;
+    if (ret < 0)
+        goto error;
 
     /* Now create a file with this property list.  After the FCPL is used,
      * everything is automatic; messages will be shared and this will be
@@ -139,7 +126,8 @@ int main(void)
      * written later.
      */
     ret = create_standard_file("one_index_file.h5", fcpl_id);
-    if(ret < 0) goto error;
+    if (ret < 0)
+        goto error;
 
     /* Now try some variations on this.  The FCPL hasn't been closed, so
      * we don't need to re-create it.
@@ -149,36 +137,42 @@ int main(void)
      * overhead).
      */
     ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_ALL_FLAG, 1000);
-    if(ret < 0) goto error;
+    if (ret < 0)
+        goto error;
 
     ret = create_standard_file("only_huge_mesgs_file.h5", fcpl_id);
-    if(ret < 0) goto error;
-
+    if (ret < 0)
+        goto error;
 
     /* Or, suppose we only wanted to shared dataspaces and
      * attributes (which might make sense if we were going to use committed
      * datatypes).  We could change the flags on the index:
      */
     ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_SDSPACE_FLAG | H5O_SHMESG_ATTR_FLAG, 40);
-    if(ret < 0) goto error;
+    if (ret < 0)
+        goto error;
 
     ret = create_standard_file("only_dspaces_and_attrs_file.h5", fcpl_id);
-    if(ret < 0) goto error;
-
+    if (ret < 0)
+        goto error;
 
     /* We could create a second index and put attributes in it to separate them
      * from datatypes and dataspaces (and then run some performance metrics to
      * see whether this improved caching performance).
      */
     ret = H5Pset_shared_mesg_nindexes(fcpl_id, 2);
-    if(ret < 0) goto error;
+    if (ret < 0)
+        goto error;
     ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_DTYPE_FLAG | H5O_SHMESG_SDSPACE_FLAG, 40);
-    if(ret < 0) goto error;
+    if (ret < 0)
+        goto error;
     ret = H5Pset_shared_mesg_index(fcpl_id, 1, H5O_SHMESG_ATTR_FLAG, 40);
-    if(ret < 0) goto error;
+    if (ret < 0)
+        goto error;
 
     ret = create_standard_file("separate_indexes_file.h5", fcpl_id);
-    if(ret < 0) goto error;
+    if (ret < 0)
+        goto error;
 
     /* We can try twiddling the "phase change" values and see what it does to
      * the file size.  Since there's only a few different messages (two
@@ -186,25 +180,30 @@ int main(void)
      * save some space.
      */
     ret = H5Pset_shared_mesg_nindexes(fcpl_id, 1);
-    if(ret < 0) goto error;
+    if (ret < 0)
+        goto error;
     ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_ALL_FLAG, 40);
-    if(ret < 0) goto error;
+    if (ret < 0)
+        goto error;
 
     ret = H5Pset_shared_mesg_phase_change(fcpl_id, 5, 0);
-    if(ret < 0) goto error;
+    if (ret < 0)
+        goto error;
 
     ret = create_standard_file("small_lists_file.h5", fcpl_id);
-    if(ret < 0) goto error;
+    if (ret < 0)
+        goto error;
 
     /* Or we could create indexes that are never lists, but are created as
      * B-trees.  We do this by setting the "maximum list size" to zero.
      */
     ret = H5Pset_shared_mesg_phase_change(fcpl_id, 0, 0);
-    if(ret < 0) goto error;
+    if (ret < 0)
+        goto error;
 
     ret = create_standard_file("btrees_file.h5", fcpl_id);
-    if(ret < 0) goto error;
-
+    if (ret < 0)
+        goto error;
 
     /* Obviously there are a lot more permutations of these options possible.
      * Performance will often be a tradeoff of speed for space, but will
@@ -214,10 +213,10 @@ int main(void)
      * Please let The HDF Group (help@hdfgroup.org) know what you find!
      */
 
-
     /* Close the property list */
     ret = H5Pclose(fcpl_id);
-    if(ret < 0) goto error;
+    if (ret < 0)
+        goto error;
     return 0;
 
 error:
@@ -227,7 +226,7 @@ error:
 /*-------------------------------------------------------------------------
  * Function:    create_standard_file
  *
- * Purpose:     A helper functon for the example.  Creates an HDF5 file
+ * Purpose:     A helper function for the example.  Creates an HDF5 file
  *              with many repeated messages using the file creation
  *              property list FCPL.
  *
@@ -240,21 +239,22 @@ error:
 herr_t
 create_standard_file(const char *filename, hid_t fcpl_id)
 {
-    hid_t file_id=-1;
-    hid_t type_id=-1, temp_type_id=-1;
-    hsize_t dims[] = {10, 9, 8, 7, 6, 5, 4, 3, 2, 1};
-    hid_t space_id=-1;
-    hid_t attr_type_id = -1;
-    hid_t attr_space_id = -1;
-    int attr_data[] = {1,2,3,4,5,6,7,8,9,0};
-    hid_t dset_id=-1;
-    hid_t attr_id=-1;
-    int x;
-    herr_t ret;
+    hid_t   file_id = -1;
+    hid_t   type_id = -1, temp_type_id = -1;
+    hsize_t dims[]        = {10, 9, 8, 7, 6, 5, 4, 3, 2, 1};
+    hid_t   space_id      = -1;
+    hid_t   attr_type_id  = -1;
+    hid_t   attr_space_id = -1;
+    int     attr_data[]   = {1, 2, 3, 4, 5, 6, 7, 8, 9, 0};
+    hid_t   dset_id       = -1;
+    hid_t   attr_id       = -1;
+    int     x;
+    herr_t  ret;
 
     /* Create the file */
     file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl_id, H5P_DEFAULT);
-    if(file_id < 0) goto error;
+    if (file_id < 0)
+        goto error;
 
     /* Create the datatype we'll be using.  Generally, sharing messages
      * is most useful when the message is complex and takes more space on
@@ -262,66 +262,80 @@ create_standard_file(const char *filename, hid_t fcpl_id)
      * However, any type can be shared.
      */
     temp_type_id = H5Tarray_create2(H5T_NATIVE_INT, 2, dims);
-    if(temp_type_id < 0) goto error;
-    type_id  = H5Tarray_create2(temp_type_id, 2, dims);
-    if(type_id < 0) goto error;
+    if (temp_type_id < 0)
+        goto error;
+    type_id = H5Tarray_create2(temp_type_id, 2, dims);
+    if (type_id < 0)
+        goto error;
     ret = H5Tclose(temp_type_id);
-    if(ret < 0) goto error;
+    if (ret < 0)
+        goto error;
 
     /* Create the dataspace we'll be using.
      * Again, create a more complex dataspace so that more space will
      * be saved when we share it.
      */
     space_id = H5Screate_simple(10, dims, dims);
-    if(space_id < 0) goto error;
+    if (space_id < 0)
+        goto error;
 
     /* Create a datatype and dataspace for the attributes we'll be creating.
      * The datatype will be a single integer, and each attribute will hold
      * 10 integers.
      */
     attr_type_id = H5Tcopy(H5T_NATIVE_INT);
-    if(attr_type_id < 0) goto error;
+    if (attr_type_id < 0)
+        goto error;
     attr_space_id = H5Screate_simple(1, dims, dims);
-    if(attr_space_id < 0) goto error;
-
+    if (attr_space_id < 0)
+        goto error;
 
     /* Begin using the messages many times.  Do this by creating datasets
      * that use this datatype, dataspace, and have this attribute.
      */
-    for(x = 0; x < NUM_DATASETS; ++x) {
-       /* Create a dataset */
-       dset_id = H5Dcreate2(file_id, DSETNAME[x], type_id, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-       if(dset_id < 0) goto error;
-
-       /* Create an attribute on the dataset */
-       attr_id = H5Acreate2(dset_id, "attr_name", attr_type_id, attr_space_id, H5P_DEFAULT, H5P_DEFAULT);
-       if(attr_id < 0) goto error;
-
-       /* Write data to the attribute */
-       ret = H5Awrite(attr_id, H5T_NATIVE_INT, attr_data);
-       if(ret < 0) goto error;
-
-       ret = H5Aclose(attr_id);
-       if(ret < 0) goto error;
-       ret = H5Dclose(dset_id);
-       if(ret < 0) goto error;
+    for (x = 0; x < NUM_DATASETS; ++x) {
+        /* Create a dataset */
+        dset_id = H5Dcreate2(file_id, DSETNAME[x], type_id, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+        if (dset_id < 0)
+            goto error;
+
+        /* Create an attribute on the dataset */
+        attr_id = H5Acreate2(dset_id, "attr_name", attr_type_id, attr_space_id, H5P_DEFAULT, H5P_DEFAULT);
+        if (attr_id < 0)
+            goto error;
+
+        /* Write data to the attribute */
+        ret = H5Awrite(attr_id, H5T_NATIVE_INT, attr_data);
+        if (ret < 0)
+            goto error;
+
+        ret = H5Aclose(attr_id);
+        if (ret < 0)
+            goto error;
+        ret = H5Dclose(dset_id);
+        if (ret < 0)
+            goto error;
     }
 
     /* Close all open IDs */
     ret = H5Tclose(attr_type_id);
-    if(ret < 0) goto error;
+    if (ret < 0)
+        goto error;
     ret = H5Sclose(attr_space_id);
-    if(ret < 0) goto error;
+    if (ret < 0)
+        goto error;
     ret = H5Tclose(type_id);
-    if(ret < 0) goto error;
+    if (ret < 0)
+        goto error;
     ret = H5Sclose(space_id);
-    if(ret < 0) goto error;
+    if (ret < 0)
+        goto error;
     ret = H5Fclose(file_id);
-    if(ret < 0) goto error;
+    if (ret < 0)
+        goto error;
 
     return 0;
 
 error:
     return -1;
 }
-
diff --git a/examples/h5_subset.c b/examples/h5_subset.c
index 66872ea..4df2091 100644
--- a/examples/h5_subset.c
+++ b/examples/h5_subset.c
@@ -1,109 +1,101 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-/* 
- *  This example illustrates how to read/write a subset of data (a slab) 
+/*
+ *  This example illustrates how to read/write a subset of data (a slab)
  *  from/to a dataset in an HDF5 file.  It is used in the HDF5 Tutorial.
  */
- 
+
 #include "hdf5.h"
 
 #define FILE        "subset.h5"
-#define DATASETNAME "IntArray" 
-#define RANK  2
-
-#define DIM0_SUB  3                         /* subset dimensions */ 
-#define DIM1_SUB  4 
+#define DATASETNAME "IntArray"
+#define RANK        2
 
+#define DIM0_SUB 3 /* subset dimensions */
+#define DIM1_SUB 4
 
-#define DIM0     8                          /* size of dataset */       
-#define DIM1     10 
+#define DIM0 8 /* size of dataset */
+#define DIM1 10
 
 int
-main (void)
+main(void)
 {
-    hsize_t     dims[2], dimsm[2];   
-    int         data[DIM0][DIM1];           /* data to write */
-    int         sdata[DIM0_SUB][DIM1_SUB];  /* subset to write */
-    int         rdata[DIM0][DIM1];          /* buffer for read */
- 
-    hid_t       file_id, dataset_id;        /* handles */
-    hid_t       dataspace_id, memspace_id; 
-
-    herr_t      status;                             
-   
-    hsize_t     count[2];              /* size of subset in the file */
-    hsize_t     offset[2];             /* subset offset in the file */
-    hsize_t     stride[2];
-    hsize_t     block[2];
-    int         i, j;
-
-    
+    hsize_t dims[2], dimsm[2];
+    int     data[DIM0][DIM1];          /* data to write */
+    int     sdata[DIM0_SUB][DIM1_SUB]; /* subset to write */
+    int     rdata[DIM0][DIM1];         /* buffer for read */
+
+    hid_t file_id, dataset_id; /* handles */
+    hid_t dataspace_id, memspace_id;
+
+    herr_t status;
+
+    hsize_t count[2];  /* size of subset in the file */
+    hsize_t offset[2]; /* subset offset in the file */
+    hsize_t stride[2];
+    hsize_t block[2];
+    int     i, j;
+
     /*****************************************************************
      * Create a new file with default creation and access properties.*
      * Then create a dataset and write data to it and close the file *
      * and dataset.                                                  *
      *****************************************************************/
 
-    file_id = H5Fcreate (FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-
-    dims[0] = DIM0;
-    dims[1] = DIM1;
-    dataspace_id = H5Screate_simple (RANK, dims, NULL); 
+    file_id = H5Fcreate(FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
-    dataset_id = H5Dcreate2 (file_id, DATASETNAME, H5T_STD_I32BE, dataspace_id,
-                            H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    dims[0]      = DIM0;
+    dims[1]      = DIM1;
+    dataspace_id = H5Screate_simple(RANK, dims, NULL);
 
+    dataset_id =
+        H5Dcreate2(file_id, DATASETNAME, H5T_STD_I32BE, dataspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
     for (j = 0; j < DIM0; j++) {
-	for (i = 0; i < DIM1; i++)
-            if (i< (DIM1/2))
-	       data[j][i] = 1;
+        for (i = 0; i < DIM1; i++)
+            if (i < (DIM1 / 2))
+                data[j][i] = 1;
             else
-               data[j][i] = 2;
-    }     
+                data[j][i] = 2;
+    }
 
-    status = H5Dwrite (dataset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL,
-                      H5P_DEFAULT, data);
+    status = H5Dwrite(dataset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data);
 
-    printf ("\nData Written to File:\n");
-    for (i = 0; i<DIM0; i++){
-       for (j = 0; j<DIM1; j++)
-           printf (" %i", data[i][j]);
-       printf ("\n");
+    printf("\nData Written to File:\n");
+    for (i = 0; i < DIM0; i++) {
+        for (j = 0; j < DIM1; j++)
+            printf(" %i", data[i][j]);
+        printf("\n");
     }
-    status = H5Sclose (dataspace_id);
-    status = H5Dclose (dataset_id);
-    status = H5Fclose (file_id);
-
+    status = H5Sclose(dataspace_id);
+    status = H5Dclose(dataset_id);
+    status = H5Fclose(file_id);
 
     /*****************************************************
      * Reopen the file and dataset and write a subset of *
-     * values to the dataset. 
+     * values to the dataset.
      *****************************************************/
 
-    file_id = H5Fopen (FILE, H5F_ACC_RDWR, H5P_DEFAULT);
-    dataset_id = H5Dopen2 (file_id, DATASETNAME, H5P_DEFAULT);
+    file_id    = H5Fopen(FILE, H5F_ACC_RDWR, H5P_DEFAULT);
+    dataset_id = H5Dopen2(file_id, DATASETNAME, H5P_DEFAULT);
 
     /* Specify size and shape of subset to write. */
 
     offset[0] = 1;
     offset[1] = 2;
 
-    count[0]  = DIM0_SUB;  
-    count[1]  = DIM1_SUB;
+    count[0] = DIM0_SUB;
+    count[1] = DIM1_SUB;
 
     stride[0] = 1;
     stride[1] = 1;
@@ -111,43 +103,39 @@ main (void)
     block[0] = 1;
     block[1] = 1;
 
-    /* Create memory space with size of subset. Get file dataspace 
+    /* Create memory space with size of subset. Get file dataspace
        and select subset from file dataspace. */
 
-    dimsm[0] = DIM0_SUB;
-    dimsm[1] = DIM1_SUB;
-    memspace_id = H5Screate_simple (RANK, dimsm, NULL); 
+    dimsm[0]    = DIM0_SUB;
+    dimsm[1]    = DIM1_SUB;
+    memspace_id = H5Screate_simple(RANK, dimsm, NULL);
 
-    dataspace_id = H5Dget_space (dataset_id);
-    status = H5Sselect_hyperslab (dataspace_id, H5S_SELECT_SET, offset,
-                                  stride, count, block);
+    dataspace_id = H5Dget_space(dataset_id);
+    status       = H5Sselect_hyperslab(dataspace_id, H5S_SELECT_SET, offset, stride, count, block);
 
-    /* Write a subset of data to the dataset, then read the 
+    /* Write a subset of data to the dataset, then read the
        entire dataset back from the file.  */
 
-    printf ("\nWrite subset to file specifying:\n");
-    printf ("    offset=1x2 stride=1x1 count=3x4 block=1x1\n");
+    printf("\nWrite subset to file specifying:\n");
+    printf("    offset=1x2 stride=1x1 count=3x4 block=1x1\n");
     for (j = 0; j < DIM0_SUB; j++) {
-	for (i = 0; i < DIM1_SUB; i++)
-	   sdata[j][i] = 5;
-    }     
-
-    status = H5Dwrite (dataset_id, H5T_NATIVE_INT, memspace_id,
-                       dataspace_id, H5P_DEFAULT, sdata);
-    
-    status = H5Dread (dataset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL,
-                       H5P_DEFAULT, rdata);
-
-    printf ("\nData in File after Subset is Written:\n");
-    for (i = 0; i<DIM0; i++){
-       for (j = 0; j<DIM1; j++)
-           printf (" %i", rdata[i][j]);
-       printf ("\n");
+        for (i = 0; i < DIM1_SUB; i++)
+            sdata[j][i] = 5;
+    }
+
+    status = H5Dwrite(dataset_id, H5T_NATIVE_INT, memspace_id, dataspace_id, H5P_DEFAULT, sdata);
+
+    status = H5Dread(dataset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rdata);
+
+    printf("\nData in File after Subset is Written:\n");
+    for (i = 0; i < DIM0; i++) {
+        for (j = 0; j < DIM1; j++)
+            printf(" %i", rdata[i][j]);
+        printf("\n");
     }
 
-    status = H5Sclose (memspace_id);
-    status = H5Sclose (dataspace_id);
-    status = H5Dclose (dataset_id);
-    status = H5Fclose (file_id);
- 
+    status = H5Sclose(memspace_id);
+    status = H5Sclose(dataspace_id);
+    status = H5Dclose(dataset_id);
+    status = H5Fclose(file_id);
 }
diff --git a/examples/h5_vds-eiger.c b/examples/h5_vds-eiger.c
new file mode 100644
index 0000000..fcde490
--- /dev/null
+++ b/examples/h5_vds-eiger.c
@@ -0,0 +1,179 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/************************************************************
+
+  This example illustrates the concept of the virtual dataset.
+  Eiger use case. Every 5 frames 10x10 are in the source
+  dataset "/A" in file with the name f-<#>.h5
+  This file is intended for use with HDF5 Library version 1.10
+
+ ************************************************************/
+/* EIP Add link to the picture */
+
+#include "hdf5.h"
+#include <stdio.h>
+#include <stdlib.h>
+
+#define FILE    "vds-eiger.h5"
+#define DATASET "VDS-Eiger"
+#define VDSDIM0 5
+#define VDSDIM1 10
+#define VDSDIM2 10
+#define DIM0    5
+#define DIM1    10
+#define DIM2    10
+#define RANK    3
+
+int
+main(void)
+{
+    hid_t   file, src_space, vspace, dset; /* Handles */
+    hid_t   dcpl;
+    herr_t  status;
+    hsize_t vdsdims[3] = {VDSDIM0, VDSDIM1, VDSDIM2}, vdsdims_max[3] = {H5S_UNLIMITED, VDSDIM1, VDSDIM1},
+            dims[3] = {DIM0, DIM1, DIM2}, start[3], /* Hyperslab parameters */
+        stride[3], count[3], block[3];
+    hsize_t start_out[3], /* Hyperslab parameter out */
+        stride_out[3], count_out[3], block_out[3];
+    int          i;
+    H5D_layout_t layout;  /* Storage layout */
+    size_t       num_map; /* Number of mappings */
+    ssize_t      len;     /* Length of the string; also a return value */
+    char        *filename;
+    char        *dsetname;
+
+    file = H5Fcreate(FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+
+    /* Create VDS dataspace.  */
+    vspace = H5Screate_simple(RANK, vdsdims, vdsdims_max);
+
+    /* Create dataspaces for the source dataset. */
+    src_space = H5Screate_simple(RANK, dims, NULL);
+
+    /* Create VDS creation property */
+    dcpl = H5Pcreate(H5P_DATASET_CREATE);
+
+    /* Initialize hyperslab values */
+
+    start[0]  = 0;
+    start[1]  = 0;
+    start[2]  = 0;
+    stride[0] = DIM0;
+    stride[1] = 1;
+    stride[2] = 1;
+    count[0]  = H5S_UNLIMITED;
+    count[1]  = 1;
+    count[2]  = 1;
+    block[0]  = DIM0;
+    block[1]  = DIM1;
+    block[2]  = DIM2;
+
+    /*
+     * Build the mappings
+     *
+     */
+    status = H5Sselect_hyperslab(vspace, H5S_SELECT_SET, start, stride, count, block);
+    status = H5Pset_virtual(dcpl, vspace, "f-%b.h5", "/A", src_space);
+
+    /* Create a virtual dataset */
+    dset   = H5Dcreate2(file, DATASET, H5T_NATIVE_INT, vspace, H5P_DEFAULT, dcpl, H5P_DEFAULT);
+    status = H5Sclose(vspace);
+    status = H5Sclose(src_space);
+    status = H5Dclose(dset);
+    status = H5Fclose(file);
+
+    /*
+     * Now we begin the read section of this example.
+     */
+
+    /*
+     * Open file and dataset using the default properties.
+     */
+    file = H5Fopen(FILE, H5F_ACC_RDONLY, H5P_DEFAULT);
+    dset = H5Dopen2(file, DATASET, H5P_DEFAULT);
+
+    /*
+     * Get creation property list and mapping properties.
+     */
+    dcpl = H5Dget_create_plist(dset);
+
+    /*
+     * Get storage layout.
+     */
+    layout = H5Pget_layout(dcpl);
+
+    if (H5D_VIRTUAL == layout)
+        printf(" Dataset has a virtual layout \n");
+    else
+        printf(" Wrong layout found \n");
+
+    /*
+     * Find number of mappings.
+     */
+    status = H5Pget_virtual_count(dcpl, &num_map);
+    printf(" Number of mappings is %d\n", (int)num_map);
+
+    /*
+     * Get mapping parameters for each mapping.
+     */
+    for (i = 0; i < (int)num_map; i++) {
+        printf(" Mapping %d \n", i);
+        printf("         Selection in the virtual dataset \n");
+        /* Get selection in the virtual dataset */
+        vspace = H5Pget_virtual_vspace(dcpl, (size_t)i);
+        if (H5Sget_select_type(vspace) == H5S_SEL_HYPERSLABS) {
+            if (H5Sis_regular_hyperslab(vspace)) {
+                status = H5Sget_regular_hyperslab(vspace, start_out, stride_out, count_out, block_out);
+                printf("         start  = [%llu, %llu, %llu] \n", (unsigned long long)start_out[0],
+                       (unsigned long long)start_out[1], (unsigned long long)start_out[2]);
+                printf("         stride = [%llu, %llu, %llu] \n", (unsigned long long)stride_out[0],
+                       (unsigned long long)stride_out[1], (unsigned long long)stride_out[2]);
+                printf("         count  = [%llu, %llu, %llu] \n", (unsigned long long)count_out[0],
+                       (unsigned long long)count_out[1], (unsigned long long)count_out[2]);
+                printf("         block  = [%llu, %llu, %llu] \n", (unsigned long long)block_out[0],
+                       (unsigned long long)block_out[1], (unsigned long long)block_out[2]);
+            }
+        }
+        /* Get source file name */
+        len      = H5Pget_virtual_filename(dcpl, (size_t)i, NULL, 0);
+        filename = (char *)malloc((size_t)len * sizeof(char) + 1);
+        H5Pget_virtual_filename(dcpl, (size_t)i, filename, len + 1);
+        printf("         Source filename %s\n", filename);
+
+        /* Get source dataset name */
+        len      = H5Pget_virtual_dsetname(dcpl, (size_t)i, NULL, 0);
+        dsetname = (char *)malloc((size_t)len * sizeof(char) + 1);
+        H5Pget_virtual_dsetname(dcpl, (size_t)i, dsetname, len + 1);
+        printf("         Source dataset name %s\n", dsetname);
+
+        /* Get selection in the source dataset */
+        printf("         Selection in the source dataset ");
+        src_space = H5Pget_virtual_srcspace(dcpl, (size_t)i);
+        if (H5Sget_select_type(src_space) == H5S_SEL_ALL) {
+            printf("H5S_ALL \n");
+        }
+        /* EIP read data back */
+        H5Sclose(vspace);
+        H5Sclose(src_space);
+        free(filename);
+        free(dsetname);
+    }
+
+    /*
+     * Close and release resources.
+     */
+    status = H5Pclose(dcpl);
+    status = H5Dclose(dset);
+    status = H5Fclose(file);
+
+    return 0;
+}
diff --git a/examples/h5_vds-exc.c b/examples/h5_vds-exc.c
new file mode 100644
index 0000000..fa6b720
--- /dev/null
+++ b/examples/h5_vds-exc.c
@@ -0,0 +1,217 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/************************************************************
+
+  This example illustrates the concept of the virtual dataset.
+  Excalibur use case with k=2 and m=3.
+  This file is intended for use with HDF5 Library version 1.10
+
+ ************************************************************/
+/* EIP Add link to the picture */
+
+#include "hdf5.h"
+#include <stdio.h>
+#include <stdlib.h>
+
+#define FILE    "vds-exc.h5"
+#define DATASET "VDS-Excalibur"
+#define VDSDIM0 0
+#define VDSDIM1 15
+#define VDSDIM2 6
+#define KDIM0   0
+#define KDIM1   2
+#define KDIM2   6
+#define NDIM0   0
+#define NDIM1   3
+#define NDIM2   6
+#define RANK    3
+
+const char *SRC_FILE[] = {"a.h5", "b.h5", "c.h5", "d.h5", "e.h5", "f.h5"};
+
+const char *SRC_DATASET[] = {"A", "B", "C", "D", "E", "F"};
+
+int
+main(void)
+{
+    hid_t   file, space, ksrc_space, nsrc_space, vspace, src_space, dset; /* Handles */
+    hid_t   dcpl;
+    herr_t  status;
+    hsize_t vdsdims[3] = {VDSDIM0, VDSDIM1, VDSDIM2}, vdsdims_max[3] = {H5S_UNLIMITED, VDSDIM1, VDSDIM2},
+            kdims[3] = {KDIM0, KDIM1, KDIM2}, kdims_max[3] = {H5S_UNLIMITED, KDIM1, KDIM2},
+            ndims[3] = {NDIM0, NDIM1, NDIM2}, ndims_max[3] = {H5S_UNLIMITED, NDIM1, NDIM2},
+            start[3], /* Hyperslab parameters */
+        stride[3], count[3], block[3];
+    hsize_t      start_out[3], stride_out[3], count_out[3], block_out[3];
+    int          k = 2;
+    int          n = 3;
+    int          i;
+    H5D_layout_t layout;  /* Storage layout */
+    size_t       num_map; /* Number of mappings */
+    ssize_t      len;     /* Length of the string; also a return value */
+    char        *filename;
+    char        *dsetname;
+
+    file = H5Fcreate(FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+
+    /* Create VDS dataspace.  */
+    space = H5Screate_simple(RANK, vdsdims, vdsdims_max);
+    /* Create dataspaces for A, C, and E datasets. */
+    ksrc_space = H5Screate_simple(RANK, kdims, kdims_max);
+    /* Create dataspaces for B, D, and F datasets. */
+    nsrc_space = H5Screate_simple(RANK, ndims, ndims_max);
+
+    /* Create VDS creation property */
+    dcpl = H5Pcreate(H5P_DATASET_CREATE);
+
+    /* Initialize hyperslab values */
+
+    start[0] = 0;
+    start[1] = 0;
+    start[2] = 0;
+    count[0] = H5S_UNLIMITED;
+    count[1] = 1;
+    count[2] = 1;
+    block[0] = 1;
+    block[1] = k;
+    block[2] = VDSDIM2;
+
+    /*
+     * Build the mappings for A, C and E source datasets.
+     * Unlimited hyperslab selection is the same in the source datasets.
+     * Unlimited hyperslab selections in the virtual dataset have different offsets.
+     */
+    status = H5Sselect_hyperslab(ksrc_space, H5S_SELECT_SET, start, NULL, count, block);
+    for (i = 0; i < 3; i++) {
+        start[1] = (hsize_t)((k + n) * i);
+        status   = H5Sselect_hyperslab(space, H5S_SELECT_SET, start, NULL, count, block);
+        status   = H5Pset_virtual(dcpl, space, SRC_FILE[2 * i], SRC_DATASET[2 * i], ksrc_space);
+    }
+
+    /* Reinitialize start[1] and block[1] to build the second set of mappings. */
+    start[1] = 0;
+    block[1] = n;
+    /*
+     * Build the mappings for B, D and F source datasets.
+     * Unlimited hyperslab selection is the same in the source datasets.
+     * Unlimited hyperslab selections in the virtual dataset have different offsets.
+     */
+    status = H5Sselect_hyperslab(nsrc_space, H5S_SELECT_SET, start, NULL, count, block);
+    for (i = 0; i < 3; i++) {
+        start[1] = (hsize_t)(k + (k + n) * i);
+        status   = H5Sselect_hyperslab(space, H5S_SELECT_SET, start, NULL, count, block);
+        status   = H5Pset_virtual(dcpl, space, SRC_FILE[2 * i + 1], SRC_DATASET[2 * i + 1], nsrc_space);
+    }
+
+    /* Create a virtual dataset */
+    dset   = H5Dcreate2(file, DATASET, H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, H5P_DEFAULT);
+    status = H5Sclose(space);
+    status = H5Sclose(nsrc_space);
+    status = H5Sclose(ksrc_space);
+    status = H5Dclose(dset);
+    status = H5Fclose(file);
+
+    /*
+     * Now we begin the read section of this example.
+     */
+
+    /*
+     * Open file and dataset using the default properties.
+     */
+    file = H5Fopen(FILE, H5F_ACC_RDONLY, H5P_DEFAULT);
+    dset = H5Dopen2(file, DATASET, H5P_DEFAULT);
+
+    /*
+     * Get creation property list and mapping properties.
+     */
+    dcpl = H5Dget_create_plist(dset);
+
+    /*
+     * Get storage layout.
+     */
+    layout = H5Pget_layout(dcpl);
+
+    if (H5D_VIRTUAL == layout)
+        printf(" Dataset has a virtual layout \n");
+    else
+        printf("Wrong layout found \n");
+
+    /*
+     * Find number of mappings.
+     */
+    status = H5Pget_virtual_count(dcpl, &num_map);
+    printf(" Number of mappings is %lu\n", (unsigned long)num_map);
+
+    /*
+     * Get mapping parameters for each mapping.
+     */
+    for (i = 0; i < (int)num_map; i++) {
+        printf(" Mapping %d \n", i);
+        printf("         Selection in the virtual dataset \n");
+        /* Get selection in the virtual dataset */
+        vspace = H5Pget_virtual_vspace(dcpl, (size_t)i);
+        if (H5Sget_select_type(vspace) == H5S_SEL_HYPERSLABS) {
+            if (H5Sis_regular_hyperslab(vspace)) {
+                status = H5Sget_regular_hyperslab(vspace, start_out, stride_out, count_out, block_out);
+                printf("         start  = [%llu, %llu, %llu] \n", (unsigned long long)start_out[0],
+                       (unsigned long long)start_out[1], (unsigned long long)start_out[2]);
+                printf("         stride = [%llu, %llu, %llu] \n", (unsigned long long)stride_out[0],
+                       (unsigned long long)stride_out[1], (unsigned long long)stride_out[2]);
+                printf("         count  = [%llu, %llu, %llu] \n", (unsigned long long)count_out[0],
+                       (unsigned long long)count_out[1], (unsigned long long)count_out[2]);
+                printf("         block  = [%llu, %llu, %llu] \n", (unsigned long long)block_out[0],
+                       (unsigned long long)block_out[1], (unsigned long long)block_out[2]);
+            }
+        }
+        /* Get source file name */
+        len      = H5Pget_virtual_filename(dcpl, (size_t)i, NULL, 0);
+        filename = (char *)malloc((size_t)len * sizeof(char) + 1);
+        H5Pget_virtual_filename(dcpl, (size_t)i, filename, len + 1);
+        printf("         Source filename %s\n", filename);
+
+        /* Get source dataset name */
+        len      = H5Pget_virtual_dsetname(dcpl, (size_t)i, NULL, 0);
+        dsetname = (char *)malloc((size_t)len * sizeof(char) + 1);
+        H5Pget_virtual_dsetname(dcpl, (size_t)i, dsetname, len + 1);
+        printf("         Source dataset name %s\n", dsetname);
+
+        /* Get selection in the source dataset */
+        printf("         Selection in the source dataset \n");
+        src_space = H5Pget_virtual_srcspace(dcpl, (size_t)i);
+        if (H5Sget_select_type(src_space) == H5S_SEL_HYPERSLABS) {
+            if (H5Sis_regular_hyperslab(vspace)) {
+                status = H5Sget_regular_hyperslab(src_space, start_out, stride_out, count_out, block_out);
+                printf("         start  = [%llu, %llu, %llu] \n", (unsigned long long)start_out[0],
+                       (unsigned long long)start_out[1], (unsigned long long)start_out[2]);
+                printf("         stride = [%llu, %llu, %llu] \n", (unsigned long long)stride_out[0],
+                       (unsigned long long)stride_out[1], (unsigned long long)stride_out[2]);
+                printf("         count  = [%llu, %llu, %llu] \n", (unsigned long long)count_out[0],
+                       (unsigned long long)count_out[1], (unsigned long long)count_out[2]);
+                printf("         block  = [%llu, %llu, %llu] \n", (unsigned long long)block_out[0],
+                       (unsigned long long)block_out[1], (unsigned long long)block_out[2]);
+            }
+        }
+        H5Sclose(vspace);
+        H5Sclose(src_space);
+        free(filename);
+        free(dsetname);
+    }
+    /* EIP read data back */
+
+    /*
+     * Close and release resources.
+     */
+    status = H5Pclose(dcpl);
+    status = H5Dclose(dset);
+    status = H5Fclose(file);
+
+    return 0;
+}
diff --git a/examples/h5_vds-exclim.c b/examples/h5_vds-exclim.c
new file mode 100644
index 0000000..58ed1f8
--- /dev/null
+++ b/examples/h5_vds-exclim.c
@@ -0,0 +1,214 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/************************************************************
+
+  This example illustrates the concept of the virtual dataset.
+  Excalibur use case with k=2 and m=3 and only 3 planes in
+  Z-direction (i.e., not unlimited).
+  This file is intended for use with HDF5 Library version 1.10
+
+ ************************************************************/
+/* EIP Add link to the picture */
+
+#include "hdf5.h"
+#include <stdio.h>
+#include <stdlib.h>
+
+#define FILE    "vds-exclim.h5"
+#define DATASET "VDS-Excaliburlim"
+#define VDSDIM0 3
+#define VDSDIM1 15
+#define VDSDIM2 6
+#define KDIM0   3
+#define KDIM1   2
+#define KDIM2   6
+#define NDIM0   3
+#define NDIM1   3
+#define NDIM2   6
+#define RANK    3
+
+const char *SRC_FILE[] = {"a.h5", "b.h5", "c.h5", "d.h5", "e.h5", "f.h5"};
+
+const char *SRC_DATASET[] = {"A", "B", "C", "D", "E", "F"};
+
+int
+main(void)
+{
+    hid_t   file, space, ksrc_space, nsrc_space, vspace, src_space, dset; /* Handles */
+    hid_t   dcpl;
+    herr_t  status;
+    hsize_t vdsdims[3] = {VDSDIM0, VDSDIM1, VDSDIM2}, kdims[3] = {KDIM0, KDIM1, KDIM2},
+            ndims[3] = {NDIM0, NDIM1, NDIM2}, start[3], /* Hyperslab parameters */
+        stride[3], count[3], block[3];
+    hsize_t      start_out[3], stride_out[3], count_out[3], block_out[3];
+    int          k = 2;
+    int          n = 3;
+    int          i;
+    H5D_layout_t layout;  /* Storage layout */
+    size_t       num_map; /* Number of mappings */
+    ssize_t      len;     /* Length of the string; also a return value */
+    char        *filename;
+    char        *dsetname;
+
+    file = H5Fcreate(FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+
+    /* Create VDS dataspace.  */
+    space = H5Screate_simple(RANK, vdsdims, NULL);
+    /* Create dataspaces for A, C, and E datasets. */
+    ksrc_space = H5Screate_simple(RANK, kdims, NULL);
+    /* Create dataspaces for B, D, and F datasets. */
+    nsrc_space = H5Screate_simple(RANK, ndims, NULL);
+
+    /* Create VDS creation property */
+    dcpl = H5Pcreate(H5P_DATASET_CREATE);
+
+    /* Initialize hyperslab values */
+
+    start[0] = 0;
+    start[1] = 0;
+    start[2] = 0;
+    count[0] = VDSDIM0;
+    count[1] = 1;
+    count[2] = 1;
+    block[0] = 1;
+    block[1] = k;
+    block[2] = VDSDIM2;
+
+    /*
+     * Build the mappings for A, C and E source datasets.
+     *
+     */
+    status = H5Sselect_hyperslab(ksrc_space, H5S_SELECT_SET, start, NULL, count, block);
+    for (i = 0; i < 3; i++) {
+        start[1] = (hsize_t)((k + n) * i);
+        status   = H5Sselect_hyperslab(space, H5S_SELECT_SET, start, NULL, count, block);
+        status   = H5Pset_virtual(dcpl, space, SRC_FILE[2 * i], SRC_DATASET[2 * i], ksrc_space);
+    }
+
+    /* Reinitialize start[0] and block[1] */
+    start[0] = 0;
+    block[1] = n;
+    /*
+     * Build the mappings for B, D and F source datasets.
+     *
+     */
+    status = H5Sselect_hyperslab(nsrc_space, H5S_SELECT_SET, start, NULL, count, block);
+    for (i = 0; i < 3; i++) {
+        start[1] = (hsize_t)(k + (k + n) * i);
+        status   = H5Sselect_hyperslab(space, H5S_SELECT_SET, start, NULL, count, block);
+        status   = H5Pset_virtual(dcpl, space, SRC_FILE[2 * i + 1], SRC_DATASET[2 * i + 1], nsrc_space);
+    }
+
+    /* Create a virtual dataset */
+    dset   = H5Dcreate2(file, DATASET, H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, H5P_DEFAULT);
+    status = H5Sclose(space);
+    status = H5Sclose(nsrc_space);
+    status = H5Sclose(ksrc_space);
+    status = H5Dclose(dset);
+    status = H5Fclose(file);
+
+    /*
+     * Now we begin the read section of this example.
+     */
+
+    /*
+     * Open file and dataset using the default properties.
+     */
+    file = H5Fopen(FILE, H5F_ACC_RDONLY, H5P_DEFAULT);
+    dset = H5Dopen2(file, DATASET, H5P_DEFAULT);
+
+    /*
+     * Get creation property list and mapping properties.
+     */
+    dcpl = H5Dget_create_plist(dset);
+
+    /*
+     * Get storage layout.
+     */
+    layout = H5Pget_layout(dcpl);
+
+    if (H5D_VIRTUAL == layout)
+        printf(" Dataset has a virtual layout \n");
+    else
+        printf("Wrong layout found \n");
+
+    /*
+     * Find number of mappings.
+     */
+    status = H5Pget_virtual_count(dcpl, &num_map);
+    printf(" Number of mappings is %lu\n", (unsigned long)num_map);
+
+    /*
+     * Get mapping parameters for each mapping.
+     */
+    for (i = 0; i < (int)num_map; i++) {
+        printf(" Mapping %d \n", i);
+        printf("         Selection in the virtual dataset \n");
+        /* Get selection in the virtual dataset */
+        vspace = H5Pget_virtual_vspace(dcpl, (size_t)i);
+        if (H5Sget_select_type(vspace) == H5S_SEL_HYPERSLABS) {
+            if (H5Sis_regular_hyperslab(vspace)) {
+                status = H5Sget_regular_hyperslab(vspace, start_out, stride_out, count_out, block_out);
+                printf("         start  = [%llu, %llu, %llu] \n", (unsigned long long)start_out[0],
+                       (unsigned long long)start_out[1], (unsigned long long)start_out[2]);
+                printf("         stride = [%llu, %llu, %llu] \n", (unsigned long long)stride_out[0],
+                       (unsigned long long)stride_out[1], (unsigned long long)stride_out[2]);
+                printf("         count  = [%llu, %llu, %llu] \n", (unsigned long long)count_out[0],
+                       (unsigned long long)count_out[1], (unsigned long long)count_out[2]);
+                printf("         block  = [%llu, %llu, %llu] \n", (unsigned long long)block_out[0],
+                       (unsigned long long)block_out[1], (unsigned long long)block_out[2]);
+            }
+        }
+        /* Get source file name */
+        len      = H5Pget_virtual_filename(dcpl, (size_t)i, NULL, 0);
+        filename = (char *)malloc((size_t)len * sizeof(char) + 1);
+        H5Pget_virtual_filename(dcpl, (size_t)i, filename, len + 1);
+        printf("         Source filename %s\n", filename);
+
+        /* Get source dataset name */
+        len      = H5Pget_virtual_dsetname(dcpl, (size_t)i, NULL, 0);
+        dsetname = (char *)malloc((size_t)len * sizeof(char) + 1);
+        H5Pget_virtual_dsetname(dcpl, (size_t)i, dsetname, len + 1);
+        printf("         Source dataset name %s\n", dsetname);
+
+        /* Get selection in the source dataset */
+        printf("         Selection in the source dataset \n");
+        src_space = H5Pget_virtual_srcspace(dcpl, (size_t)i);
+        if (H5Sget_select_type(src_space) == H5S_SEL_HYPERSLABS) {
+            if (H5Sis_regular_hyperslab(vspace)) {
+                status = H5Sget_regular_hyperslab(vspace, start_out, stride_out, count_out, block_out);
+                printf("         start  = [%d, %d, %d] \n", (int)start_out[0], (int)start_out[1],
+                       (int)start_out[2]);
+                printf("         stride = [%d, %d, %d] \n", (int)stride_out[0], (int)stride_out[1],
+                       (int)stride_out[2]);
+                printf("         count  = [%d, %d, %d] \n", (int)count_out[0], (int)count_out[1],
+                       (int)count_out[2]);
+                printf("         block  = [%d, %d, %d] \n", (int)block_out[0], (int)block_out[1],
+                       (int)block_out[2]);
+            }
+        }
+        H5Sclose(vspace);
+        H5Sclose(src_space);
+        free(filename);
+        free(dsetname);
+    }
+    /* EIP read data back */
+
+    /*
+     * Close and release resources.
+     */
+    status = H5Pclose(dcpl);
+    status = H5Dclose(dset);
+    status = H5Fclose(file);
+
+    return 0;
+}
diff --git a/examples/h5_vds-percival-unlim-maxmin.c b/examples/h5_vds-percival-unlim-maxmin.c
new file mode 100644
index 0000000..9ef514d
--- /dev/null
+++ b/examples/h5_vds-percival-unlim-maxmin.c
@@ -0,0 +1,304 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/************************************************************
+
+  This example illustrates the concept of the virtual dataset.
+  Percival use case. Every fifth 10x10 plane in VDS is stored in
+  the corresponding 3D unlimited dataset.
+  There are 4 source datasets total.
+  Each of the source datasets is extended to different sizes.
+  VDS access property can be used to get max and min extent.
+  This file is intended for use with HDF5 Library version 1.10
+
+ ************************************************************/
+/* EIP Add link to the picture */
+
+#include "hdf5.h"
+#include <stdio.h>
+#include <stdlib.h>
+
+#define VFILE   "vds-percival-unlim-maxmin.h5"
+#define DATASET "VDS-Percival-unlim-maxmin"
+#define VDSDIM0 H5S_UNLIMITED
+#define VDSDIM1 10
+#define VDSDIM2 10
+
+#define DIM0         H5S_UNLIMITED
+#define DIM0_1       4 /* Initial size of the source datasets */
+#define DIM1         10
+#define DIM2         10
+#define RANK         3
+#define PLANE_STRIDE 4
+
+const char *SRC_FILE[] = {"a.h5", "b.h5", "c.h5", "d.h5"};
+
+const char *SRC_DATASET[] = {"A", "B", "C", "D"};
+
+int
+main(void)
+{
+    hid_t   vfile, file, src_space, mem_space, vspace, vdset, dset; /* Handles */
+    hid_t   dcpl, dapl;
+    herr_t  status;
+    hsize_t vdsdims[3] = {4 * DIM0_1, VDSDIM1, VDSDIM2}, vdsdims_max[3] = {VDSDIM0, VDSDIM1, VDSDIM2},
+            dims[3] = {DIM0_1, DIM1, DIM2}, memdims[3] = {DIM0_1, DIM1, DIM2},
+            extdims[3] = {0, DIM1, DIM2}, /* Dimensions of the extended source datasets */
+        chunk_dims[3] = {DIM0_1, DIM1, DIM2}, dims_max[3] = {DIM0, DIM1, DIM2}, vdsdims_out[3],
+            vdsdims_max_out[3], start[3], /* Hyperslab parameters */
+        stride[3], count[3], src_count[3], block[3];
+    hsize_t start_out[3], /* Hyperslab parameter out */
+        stride_out[3], count_out[3], block_out[3];
+    int          i, j;
+    H5D_layout_t layout;  /* Storage layout */
+    size_t       num_map; /* Number of mappings */
+    ssize_t      len;     /* Length of the string; also a return value */
+    char        *filename;
+    char        *dsetname;
+    int          wdata[DIM0_1 * DIM1 * DIM2];
+
+    /*
+     * Create source files and datasets. This step is optional.
+     */
+    for (i = 0; i < PLANE_STRIDE; i++) {
+        /*
+         * Initialize data for i-th source dataset.
+         */
+        for (j = 0; j < DIM0_1 * DIM1 * DIM2; j++)
+            wdata[j] = i + 1;
+
+        /*
+         * Create the source files and  datasets. Write data to each dataset and
+         * close all resources.
+         */
+
+        file      = H5Fcreate(SRC_FILE[i], H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+        src_space = H5Screate_simple(RANK, dims, dims_max);
+        dcpl      = H5Pcreate(H5P_DATASET_CREATE);
+        status    = H5Pset_chunk(dcpl, RANK, chunk_dims);
+        dset   = H5Dcreate2(file, SRC_DATASET[i], H5T_NATIVE_INT, src_space, H5P_DEFAULT, dcpl, H5P_DEFAULT);
+        status = H5Dwrite(dset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata);
+        status = H5Sclose(src_space);
+        status = H5Pclose(dcpl);
+        status = H5Dclose(dset);
+        status = H5Fclose(file);
+    }
+
+    vfile = H5Fcreate(VFILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+
+    /* Create VDS dataspace.  */
+    vspace = H5Screate_simple(RANK, vdsdims, vdsdims_max);
+
+    /* Create dataspaces for the source dataset. */
+    src_space = H5Screate_simple(RANK, dims, dims_max);
+
+    /* Create VDS creation property */
+    dcpl = H5Pcreate(H5P_DATASET_CREATE);
+
+    /* Initialize hyperslab values */
+
+    start[0]     = 0;
+    start[1]     = 0;
+    start[2]     = 0;
+    stride[0]    = PLANE_STRIDE; /* we will select every fifth plane in VDS */
+    stride[1]    = 1;
+    stride[2]    = 1;
+    count[0]     = H5S_UNLIMITED;
+    count[1]     = 1;
+    count[2]     = 1;
+    src_count[0] = H5S_UNLIMITED;
+    src_count[1] = 1;
+    src_count[2] = 1;
+    block[0]     = 1;
+    block[1]     = DIM1;
+    block[2]     = DIM2;
+
+    /*
+     * Build the mappings
+     *
+     */
+    status = H5Sselect_hyperslab(src_space, H5S_SELECT_SET, start, NULL, src_count, block);
+    for (i = 0; i < PLANE_STRIDE; i++) {
+        status = H5Sselect_hyperslab(vspace, H5S_SELECT_SET, start, stride, count, block);
+        status = H5Pset_virtual(dcpl, vspace, SRC_FILE[i], SRC_DATASET[i], src_space);
+        start[0]++;
+    }
+
+    H5Sselect_none(vspace);
+
+    /* Create a virtual dataset */
+    vdset  = H5Dcreate2(vfile, DATASET, H5T_NATIVE_INT, vspace, H5P_DEFAULT, dcpl, H5P_DEFAULT);
+    status = H5Sclose(vspace);
+    status = H5Sclose(src_space);
+    status = H5Pclose(dcpl);
+
+    /* Let's add data to the source datasets and check new dimensions for VDS */
+    /* We will add only one plane to the first source dataset, two planes to the
+       second one, three to the third, and four to the forth.                 */
+
+    for (i = 0; i < PLANE_STRIDE; i++) {
+        /*
+         * Initialize data for i-th source dataset.
+         */
+        for (j = 0; j < (i + 1) * DIM1 * DIM2; j++)
+            wdata[j] = 10 * (i + 1);
+
+        /*
+         * Open the source files and datasets. Append data to each dataset and
+         * close all resources.
+         */
+
+        file       = H5Fopen(SRC_FILE[i], H5F_ACC_RDWR, H5P_DEFAULT);
+        dset       = H5Dopen2(file, SRC_DATASET[i], H5P_DEFAULT);
+        extdims[0] = DIM0_1 + i + 1;
+        status     = H5Dset_extent(dset, extdims);
+        src_space  = H5Dget_space(dset);
+        start[0]   = DIM0_1;
+        start[1]   = 0;
+        start[2]   = 0;
+        count[0]   = 1;
+        count[1]   = 1;
+        count[2]   = 1;
+        block[0]   = i + 1;
+        block[1]   = DIM1;
+        block[2]   = DIM2;
+
+        memdims[0] = i + 1;
+        mem_space  = H5Screate_simple(RANK, memdims, NULL);
+        status     = H5Sselect_hyperslab(src_space, H5S_SELECT_SET, start, NULL, count, block);
+        status     = H5Dwrite(dset, H5T_NATIVE_INT, mem_space, src_space, H5P_DEFAULT, wdata);
+        status     = H5Sclose(src_space);
+        status     = H5Dclose(dset);
+        status     = H5Fclose(file);
+    }
+
+    status = H5Dclose(vdset);
+    status = H5Fclose(vfile);
+
+    /*
+     * Now we begin the read section of this example.
+     */
+
+    /*
+     * Open file and dataset using the default properties.
+     */
+    vfile = H5Fopen(VFILE, H5F_ACC_RDONLY, H5P_DEFAULT);
+
+    /*
+     * Open VDS using different access properties to use max or
+     * min extents depending on the sizes of the underlying datasets
+     */
+    dapl = H5Pcreate(H5P_DATASET_ACCESS);
+
+    for (i = 0; i < 2; i++) {
+        status = H5Pset_virtual_view(dapl, i ? H5D_VDS_LAST_AVAILABLE : H5D_VDS_FIRST_MISSING);
+        vdset  = H5Dopen2(vfile, DATASET, dapl);
+
+        /* Let's get space of the VDS and its dimension; we should get 32(or 20)x10x10 */
+        vspace = H5Dget_space(vdset);
+        H5Sget_simple_extent_dims(vspace, vdsdims_out, vdsdims_max_out);
+        printf("VDS dimensions, bounds = H5D_VDS_%s: ", i ? "LAST_AVAILABLE" : "FIRST_MISSING");
+        for (j = 0; j < RANK; j++)
+            printf(" %d ", (int)vdsdims_out[j]);
+        printf("\n");
+
+        /* Close */
+        status = H5Dclose(vdset);
+        status = H5Sclose(vspace);
+    }
+
+    status = H5Pclose(dapl);
+
+    vdset = H5Dopen2(vfile, DATASET, H5P_DEFAULT);
+
+    /*
+     * Get creation property list and mapping properties.
+     */
+    dcpl = H5Dget_create_plist(vdset);
+
+    /*
+     * Get storage layout.
+     */
+    layout = H5Pget_layout(dcpl);
+
+    if (H5D_VIRTUAL == layout)
+        printf(" Dataset has a virtual layout \n");
+    else
+        printf(" Wrong layout found \n");
+
+    /*
+     * Find number of mappings.
+     */
+    status = H5Pget_virtual_count(dcpl, &num_map);
+    printf(" Number of mappings is %lu\n", (unsigned long)num_map);
+
+    /*
+     * Get mapping parameters for each mapping.
+     */
+    for (i = 0; i < (int)num_map; i++) {
+        printf(" Mapping %d \n", i);
+        printf("         Selection in the virtual dataset \n");
+        /* Get selection in the virtual dataset */
+        vspace = H5Pget_virtual_vspace(dcpl, (size_t)i);
+        if (H5Sget_select_type(vspace) == H5S_SEL_HYPERSLABS) {
+            if (H5Sis_regular_hyperslab(vspace)) {
+                status = H5Sget_regular_hyperslab(vspace, start_out, stride_out, count_out, block_out);
+                printf("         start  = [%llu, %llu, %llu] \n", (unsigned long long)start_out[0],
+                       (unsigned long long)start_out[1], (unsigned long long)start_out[2]);
+                printf("         stride = [%llu, %llu, %llu] \n", (unsigned long long)stride_out[0],
+                       (unsigned long long)stride_out[1], (unsigned long long)stride_out[2]);
+                printf("         count  = [%llu, %llu, %llu] \n", (unsigned long long)count_out[0],
+                       (unsigned long long)count_out[1], (unsigned long long)count_out[2]);
+                printf("         block  = [%llu, %llu, %llu] \n", (unsigned long long)block_out[0],
+                       (unsigned long long)block_out[1], (unsigned long long)block_out[2]);
+            }
+        }
+        /* Get source file name */
+        len      = H5Pget_virtual_filename(dcpl, (size_t)i, NULL, 0);
+        filename = (char *)malloc((size_t)len * sizeof(char) + 1);
+        H5Pget_virtual_filename(dcpl, (size_t)i, filename, len + 1);
+        printf("         Source filename %s\n", filename);
+
+        /* Get source dataset name */
+        len      = H5Pget_virtual_dsetname(dcpl, (size_t)i, NULL, 0);
+        dsetname = (char *)malloc((size_t)len * sizeof(char) + 1);
+        H5Pget_virtual_dsetname(dcpl, (size_t)i, dsetname, len + 1);
+        printf("         Source dataset name %s\n", dsetname);
+
+        /* Get selection in the source dataset */
+        printf("         Selection in the source dataset \n");
+        src_space = H5Pget_virtual_srcspace(dcpl, (size_t)i);
+        if (H5Sget_select_type(src_space) == H5S_SEL_HYPERSLABS) {
+            if (H5Sis_regular_hyperslab(src_space)) {
+                status = H5Sget_regular_hyperslab(src_space, start_out, stride_out, count_out, block_out);
+                printf("         start  = [%llu, %llu, %llu] \n", (unsigned long long)start_out[0],
+                       (unsigned long long)start_out[1], (unsigned long long)start_out[2]);
+                printf("         stride = [%llu, %llu, %llu] \n", (unsigned long long)stride_out[0],
+                       (unsigned long long)stride_out[1], (unsigned long long)stride_out[2]);
+                printf("         count  = [%llu, %llu, %llu] \n", (unsigned long long)count_out[0],
+                       (unsigned long long)count_out[1], (unsigned long long)count_out[2]);
+                printf("         block  = [%llu, %llu, %llu] \n", (unsigned long long)block_out[0],
+                       (unsigned long long)block_out[1], (unsigned long long)block_out[2]);
+            }
+        }
+        H5Sclose(vspace);
+        H5Sclose(src_space);
+        free(filename);
+        free(dsetname);
+    }
+    /*
+     * Close and release resources.
+     */
+    status = H5Pclose(dcpl);
+    status = H5Dclose(vdset);
+    status = H5Fclose(vfile);
+    return 0;
+}
diff --git a/examples/h5_vds-percival-unlim.c b/examples/h5_vds-percival-unlim.c
new file mode 100644
index 0000000..ddbcdec
--- /dev/null
+++ b/examples/h5_vds-percival-unlim.c
@@ -0,0 +1,346 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/************************************************************
+
+  This example illustrates the concept of the virtual dataset.
+  Percival use case. Every fifth 10x10 plane in VDS is stored in
+  the corresponding 3D unlimited dataset.
+  There are 4 source datasets total.
+  This file is intended for use with HDF5 Library version 1.10
+
+ ************************************************************/
+/* EIP Add link to the picture */
+
+#include "hdf5.h"
+#include <stdio.h>
+#include <stdlib.h>
+
+#define VFILE   "vds-percival-unlim.h5"
+#define DATASET "VDS-Percival-unlim"
+#define VDSDIM0 H5S_UNLIMITED
+#define VDSDIM1 10
+#define VDSDIM2 10
+
+#define DIM0         H5S_UNLIMITED
+#define DIM0_1       10 /* Initial size of the datasets */
+#define DIM1         10
+#define DIM2         10
+#define RANK         3
+#define PLANE_STRIDE 4
+
+const char *SRC_FILE[] = {"a.h5", "b.h5", "c.h5", "d.h5"};
+
+const char *SRC_DATASET[] = {"A", "B", "C", "D"};
+
+int
+main(void)
+{
+    hid_t   vfile, file, src_space, mem_space, vspace, vdset, dset; /* Handles */
+    hid_t   dcpl;
+    herr_t  status;
+    hsize_t vdsdims[3] = {4 * DIM0_1, VDSDIM1, VDSDIM2}, vdsdims_max[3] = {VDSDIM0, VDSDIM1, VDSDIM2},
+            dims[3] = {DIM0_1, DIM1, DIM2}, extdims[3] = {2 * DIM0_1, DIM1, DIM2},
+            chunk_dims[3] = {DIM0_1, DIM1, DIM2}, dims_max[3] = {DIM0, DIM1, DIM2}, vdsdims_out[3],
+            vdsdims_max_out[3], start[3], /* Hyperslab parameters */
+        stride[3], count[3], src_count[3], block[3];
+    hsize_t start_out[3], /* Hyperslab parameter out */
+        stride_out[3], count_out[3], block_out[3];
+    int          i, j, k;
+    H5D_layout_t layout;  /* Storage layout */
+    size_t       num_map; /* Number of mappings */
+    ssize_t      len;     /* Length of the string; also a return value */
+    char        *filename;
+    char        *dsetname;
+    int          wdata[DIM0_1 * DIM1 * DIM2];
+    int          rdata[80][10][10];
+    int          a_rdata[20][10][10];
+
+    /*
+     * Create source files and datasets. This step is optional.
+     */
+    for (i = 0; i < PLANE_STRIDE; i++) {
+        /*
+         * Initialize data for i-th source dataset.
+         */
+        for (j = 0; j < DIM0_1 * DIM1 * DIM2; j++)
+            wdata[j] = i + 1;
+
+        /*
+         * Create the source files and  datasets. Write data to each dataset and
+         * close all resources.
+         */
+
+        file      = H5Fcreate(SRC_FILE[i], H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+        src_space = H5Screate_simple(RANK, dims, dims_max);
+        dcpl      = H5Pcreate(H5P_DATASET_CREATE);
+        status    = H5Pset_chunk(dcpl, RANK, chunk_dims);
+        dset   = H5Dcreate2(file, SRC_DATASET[i], H5T_NATIVE_INT, src_space, H5P_DEFAULT, dcpl, H5P_DEFAULT);
+        status = H5Dwrite(dset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata);
+        status = H5Sclose(src_space);
+        status = H5Pclose(dcpl);
+        status = H5Dclose(dset);
+        status = H5Fclose(file);
+    }
+
+    vfile = H5Fcreate(VFILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+
+    /* Create VDS dataspace.  */
+    vspace = H5Screate_simple(RANK, vdsdims, vdsdims_max);
+
+    /* Create dataspaces for the source dataset. */
+    src_space = H5Screate_simple(RANK, dims, dims_max);
+
+    /* Create VDS creation property */
+    dcpl = H5Pcreate(H5P_DATASET_CREATE);
+
+    /* Initialize hyperslab values */
+
+    start[0]     = 0;
+    start[1]     = 0;
+    start[2]     = 0;
+    stride[0]    = PLANE_STRIDE; /* we will select every fifth plane in VDS */
+    stride[1]    = 1;
+    stride[2]    = 1;
+    count[0]     = H5S_UNLIMITED;
+    count[1]     = 1;
+    count[2]     = 1;
+    src_count[0] = H5S_UNLIMITED;
+    src_count[1] = 1;
+    src_count[2] = 1;
+    block[0]     = 1;
+    block[1]     = DIM1;
+    block[2]     = DIM2;
+
+    /*
+     * Build the mappings
+     *
+     */
+    status = H5Sselect_hyperslab(src_space, H5S_SELECT_SET, start, NULL, src_count, block);
+    for (i = 0; i < PLANE_STRIDE; i++) {
+        status = H5Sselect_hyperslab(vspace, H5S_SELECT_SET, start, stride, count, block);
+        status = H5Pset_virtual(dcpl, vspace, SRC_FILE[i], SRC_DATASET[i], src_space);
+        start[0]++;
+    }
+
+    H5Sselect_none(vspace);
+
+    /* Create a virtual dataset */
+    vdset  = H5Dcreate2(vfile, DATASET, H5T_NATIVE_INT, vspace, H5P_DEFAULT, dcpl, H5P_DEFAULT);
+    status = H5Sclose(vspace);
+    status = H5Sclose(src_space);
+    status = H5Pclose(dcpl);
+    /* Let's get space of the VDS and its dimension; we should get 40x10x10 */
+    vspace = H5Dget_space(vdset);
+    H5Sget_simple_extent_dims(vspace, vdsdims_out, vdsdims_max_out);
+    printf("VDS dimensions first time \n");
+    printf(" Current: ");
+    for (i = 0; i < RANK; i++)
+        printf(" %d ", (int)vdsdims_out[i]);
+    printf("\n");
+
+    /* Let's add data to the source datasets and check new dimensions for VDS */
+
+    for (i = 0; i < PLANE_STRIDE; i++) {
+        /*
+         * Initialize data for i-th source dataset.
+         */
+        for (j = 0; j < DIM0_1 * DIM1 * DIM2; j++)
+            wdata[j] = 10 * (i + 1);
+
+        /*
+         * Create the source files and  datasets. Write data to each dataset and
+         * close all resources.
+         */
+
+        file      = H5Fopen(SRC_FILE[i], H5F_ACC_RDWR, H5P_DEFAULT);
+        dset      = H5Dopen2(file, SRC_DATASET[i], H5P_DEFAULT);
+        status    = H5Dset_extent(dset, extdims);
+        src_space = H5Dget_space(dset);
+        start[0]  = DIM0_1;
+        start[1]  = 0;
+        start[2]  = 0;
+        count[0]  = 1;
+        count[1]  = 1;
+        count[2]  = 1;
+        block[0]  = DIM0_1;
+        block[1]  = DIM1;
+        block[2]  = DIM2;
+
+        mem_space = H5Screate_simple(RANK, dims, NULL);
+        status    = H5Sselect_hyperslab(src_space, H5S_SELECT_SET, start, NULL, count, block);
+        status    = H5Dwrite(dset, H5T_NATIVE_INT, mem_space, src_space, H5P_DEFAULT, wdata);
+        status    = H5Sclose(src_space);
+        status    = H5Dclose(dset);
+        status    = H5Fclose(file);
+    }
+
+    status = H5Dclose(vdset);
+    status = H5Fclose(vfile);
+
+    /*
+     * Now we begin the read section of this example.
+     */
+
+    /*
+     * Open file and dataset using the default properties.
+     */
+    vfile = H5Fopen(VFILE, H5F_ACC_RDONLY, H5P_DEFAULT);
+    vdset = H5Dopen2(vfile, DATASET, H5P_DEFAULT);
+
+    /*
+     * Get creation property list and mapping properties.
+     */
+    dcpl = H5Dget_create_plist(vdset);
+
+    /*
+     * Get storage layout.
+     */
+    layout = H5Pget_layout(dcpl);
+
+    if (H5D_VIRTUAL == layout)
+        printf(" Dataset has a virtual layout \n");
+    else
+        printf(" Wrong layout found \n");
+
+    /*
+     * Find number of mappings.
+     */
+    status = H5Pget_virtual_count(dcpl, &num_map);
+    printf(" Number of mappings is %lu\n", (unsigned long)num_map);
+
+    /*
+     * Get mapping parameters for each mapping.
+     */
+    for (i = 0; i < (int)num_map; i++) {
+        printf(" Mapping %d \n", i);
+        printf("         Selection in the virtual dataset \n");
+        /* Get selection in the virtual dataset */
+        vspace = H5Pget_virtual_vspace(dcpl, (size_t)i);
+        if (H5Sget_select_type(vspace) == H5S_SEL_HYPERSLABS) {
+            if (H5Sis_regular_hyperslab(vspace)) {
+                status = H5Sget_regular_hyperslab(vspace, start_out, stride_out, count_out, block_out);
+                printf("         start  = [%llu, %llu, %llu] \n", (unsigned long long)start_out[0],
+                       (unsigned long long)start_out[1], (unsigned long long)start_out[2]);
+                printf("         stride = [%llu, %llu, %llu] \n", (unsigned long long)stride_out[0],
+                       (unsigned long long)stride_out[1], (unsigned long long)stride_out[2]);
+                printf("         count  = [%llu, %llu, %llu] \n", (unsigned long long)count_out[0],
+                       (unsigned long long)count_out[1], (unsigned long long)count_out[2]);
+                printf("         block  = [%llu, %llu, %llu] \n", (unsigned long long)block_out[0],
+                       (unsigned long long)block_out[1], (unsigned long long)block_out[2]);
+            }
+        }
+        /* Get source file name */
+        len      = H5Pget_virtual_filename(dcpl, (size_t)i, NULL, 0);
+        filename = (char *)malloc((size_t)len * sizeof(char) + 1);
+        H5Pget_virtual_filename(dcpl, (size_t)i, filename, len + 1);
+        printf("         Source filename %s\n", filename);
+
+        /* Get source dataset name */
+        len      = H5Pget_virtual_dsetname(dcpl, (size_t)i, NULL, 0);
+        dsetname = (char *)malloc((size_t)len * sizeof(char) + 1);
+        H5Pget_virtual_dsetname(dcpl, (size_t)i, dsetname, len + 1);
+        printf("         Source dataset name %s\n", dsetname);
+
+        /* Get selection in the source dataset */
+        printf("         Selection in the source dataset \n");
+        src_space = H5Pget_virtual_srcspace(dcpl, (size_t)i);
+        if (H5Sget_select_type(src_space) == H5S_SEL_HYPERSLABS) {
+            if (H5Sis_regular_hyperslab(src_space)) {
+                status = H5Sget_regular_hyperslab(src_space, start_out, stride_out, count_out, block_out);
+                printf("         start  = [%llu, %llu, %llu] \n", (unsigned long long)start_out[0],
+                       (unsigned long long)start_out[1], (unsigned long long)start_out[2]);
+                printf("         stride = [%llu, %llu, %llu] \n", (unsigned long long)stride_out[0],
+                       (unsigned long long)stride_out[1], (unsigned long long)stride_out[2]);
+                printf("         count  = [%llu, %llu, %llu] \n", (unsigned long long)count_out[0],
+                       (unsigned long long)count_out[1], (unsigned long long)count_out[2]);
+                printf("         block  = [%llu, %llu, %llu] \n", (unsigned long long)block_out[0],
+                       (unsigned long long)block_out[1], (unsigned long long)block_out[2]);
+            }
+        }
+        H5Sclose(vspace);
+        H5Sclose(src_space);
+        free(filename);
+        free(dsetname);
+    }
+    /*
+     * Read data from VDS.
+     */
+    vspace = H5Dget_space(vdset);
+    H5Sget_simple_extent_dims(vspace, vdsdims_out, vdsdims_max_out);
+    printf("VDS dimensions second time \n");
+    printf(" Current: ");
+    for (i = 0; i < RANK; i++)
+        printf(" %d ", (int)vdsdims_out[i]);
+    printf("\n");
+
+    /* Read all VDS data */
+
+    /* EIP We should be able to do it by using H5S_ALL instead of making selection
+     * or using H5Sselect_all from vspace.
+     */
+    start[0] = 0;
+    start[1] = 0;
+    start[2] = 0;
+    count[0] = 1;
+    count[1] = 1;
+    count[2] = 1;
+    block[0] = vdsdims_out[0];
+    block[1] = vdsdims_out[1];
+    block[2] = vdsdims_out[2];
+
+    status    = H5Sselect_hyperslab(vspace, H5S_SELECT_SET, start, NULL, count, block);
+    mem_space = H5Screate_simple(RANK, vdsdims_out, NULL);
+    status    = H5Dread(vdset, H5T_NATIVE_INT, mem_space, vspace, H5P_DEFAULT, rdata);
+    printf(" All data: \n");
+    for (i = 0; i < (int)vdsdims_out[0]; i++) {
+        for (j = 0; j < (int)vdsdims_out[1]; j++) {
+            printf("(%d, %d, 0)", i, j);
+            for (k = 0; k < (int)vdsdims_out[2]; k++)
+                printf(" %d ", rdata[i][j][k]);
+            printf("\n");
+        }
+    }
+    /* Read VDS, but only data mapeed to dataset a.h5 */
+    start[0]  = 0;
+    start[1]  = 0;
+    start[2]  = 0;
+    stride[0] = PLANE_STRIDE;
+    stride[1] = 1;
+    stride[2] = 1;
+    count[0]  = 2 * DIM0_1;
+    count[1]  = 1;
+    count[2]  = 1;
+    block[0]  = 1;
+    block[1]  = vdsdims_out[1];
+    block[2]  = vdsdims_out[2];
+    dims[0]   = 2 * DIM0_1;
+    status    = H5Sselect_hyperslab(vspace, H5S_SELECT_SET, start, stride, count, block);
+    mem_space = H5Screate_simple(RANK, dims, NULL);
+    status    = H5Dread(vdset, H5T_NATIVE_INT, mem_space, vspace, H5P_DEFAULT, a_rdata);
+    printf(" All data: \n");
+    for (i = 0; i < 2 * DIM0_1; i++) {
+        for (j = 0; j < (int)vdsdims_out[1]; j++) {
+            printf("(%d, %d, 0)", i, j);
+            for (k = 0; k < (int)vdsdims_out[2]; k++)
+                printf(" %d ", a_rdata[i][j][k]);
+            printf("\n");
+        }
+    }
+    /*
+     * Close and release resources.
+     */
+    status = H5Sclose(mem_space);
+    status = H5Pclose(dcpl);
+    status = H5Dclose(vdset);
+    status = H5Fclose(vfile);
+    return 0;
+}
diff --git a/examples/h5_vds-percival.c b/examples/h5_vds-percival.c
new file mode 100644
index 0000000..82c8ef4
--- /dev/null
+++ b/examples/h5_vds-percival.c
@@ -0,0 +1,241 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/************************************************************
+
+  This example illustrates the concept of the virtual dataset.
+  Percival use case. Every fifth 10x10 plane in VDS is stored in
+  the corresponding 3D unlimited dataset.
+  EIP: For now we will use finite dimension.
+  There are 4 source datasets total.
+  This file is intended for use with HDF5 Library version 1.10
+
+ ************************************************************/
+/* EIP Add link to the picture */
+
+#include "hdf5.h"
+#include <stdio.h>
+#include <stdlib.h>
+
+#define FILE    "vds-percival.h5"
+#define DATASET "VDS-Percival"
+/* later
+#define VDSDIM0       H5S_UNLIMITED
+*/
+#define VDSDIM0 40
+#define VDSDIM1 10
+#define VDSDIM2 10
+/* later
+#define DIM0          H5S_UNLIMITED
+*/
+#define DIM0         10
+#define DIM1         10
+#define DIM2         10
+#define RANK         3
+#define PLANE_STRIDE 4
+
+const char *SRC_FILE[] = {"a.h5", "b.h5", "c.h5", "d.h5"};
+
+const char *SRC_DATASET[] = {"A", "B", "C", "D"};
+
+int
+main(void)
+{
+    hid_t   file, src_space, vspace, dset; /* Handles */
+    hid_t   dcpl;
+    herr_t  status;
+    hsize_t vdsdims[3] = {VDSDIM0, VDSDIM1, VDSDIM2}, vdsdims_max[3] = {VDSDIM0, VDSDIM1, VDSDIM2},
+            dims[3] = {DIM0, DIM1, DIM2}, dims_max[3] = {DIM0, DIM1, DIM2},
+            start[3], /* Hyperslab start parameter for VDS */
+        stride[3], count[3], src_count[3], block[3];
+    hsize_t start_out[3], /* Hyperslab parameter out */
+        stride_out[3], count_out[3], block_out[3];
+    int          i, j;
+    H5D_layout_t layout;  /* Storage layout */
+    size_t       num_map; /* Number of mappings */
+    ssize_t      len;     /* Length of the string; also a return value */
+    char        *filename;
+    char        *dsetname;
+    int          wdata[DIM0 * DIM1 * DIM2];
+
+    /*
+     * Create source files and datasets. This step is optional.
+     */
+    for (i = 0; i < PLANE_STRIDE; i++) {
+        /*
+         * Initialize data for i-th source dataset.
+         */
+        for (j = 0; j < DIM0 * DIM1 * DIM2; j++)
+            wdata[j] = i + 1;
+
+        /*
+         * Create the source files and  datasets. Write data to each dataset and
+         * close all resources.
+         */
+
+        file      = H5Fcreate(SRC_FILE[i], H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+        src_space = H5Screate_simple(RANK, dims, NULL);
+        dset      = H5Dcreate2(file, SRC_DATASET[i], H5T_NATIVE_INT, src_space, H5P_DEFAULT, H5P_DEFAULT,
+                               H5P_DEFAULT);
+        status    = H5Dwrite(dset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata);
+        status    = H5Sclose(src_space);
+        status    = H5Dclose(dset);
+        status    = H5Fclose(file);
+    }
+
+    file = H5Fcreate(FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+
+    /* Create VDS dataspace.  */
+    vspace = H5Screate_simple(RANK, vdsdims, vdsdims_max);
+
+    /* Create dataspaces for the source dataset. */
+    src_space = H5Screate_simple(RANK, dims, dims_max);
+
+    /* Create VDS creation property */
+    dcpl = H5Pcreate(H5P_DATASET_CREATE);
+
+    /* Initialize hyperslab values */
+
+    start[0]  = 0;
+    start[1]  = 0;
+    start[2]  = 0;
+    stride[0] = PLANE_STRIDE; /* we will select every fifth plane in VDS */
+    stride[1] = 1;
+    stride[2] = 1;
+    /* later
+        count[0] = H5S_UNLIMITED;
+    */
+    count[0] = VDSDIM0 / 4;
+    count[1] = 1;
+    count[2] = 1;
+    /* later
+        src_count[0] = H5S_UNLIMITED;
+    */
+    src_count[0] = DIM0;
+    src_count[1] = 1;
+    src_count[2] = 1;
+    block[0]     = 1;
+    block[1]     = DIM1;
+    block[2]     = DIM2;
+
+    /*
+     * Build the mappings
+     *
+     */
+    status = H5Sselect_hyperslab(src_space, H5S_SELECT_SET, start, NULL, src_count, block);
+    for (i = 0; i < PLANE_STRIDE; i++) {
+        status = H5Sselect_hyperslab(vspace, H5S_SELECT_SET, start, stride, count, block);
+        status = H5Pset_virtual(dcpl, vspace, SRC_FILE[i], SRC_DATASET[i], src_space);
+        start[0]++;
+    }
+
+    H5Sselect_none(vspace);
+
+    /* Create a virtual dataset */
+    dset   = H5Dcreate2(file, DATASET, H5T_NATIVE_INT, vspace, H5P_DEFAULT, dcpl, H5P_DEFAULT);
+    status = H5Sclose(vspace);
+    status = H5Sclose(src_space);
+    status = H5Dclose(dset);
+    status = H5Fclose(file);
+
+    /*
+     * Now we begin the read section of this example.
+     */
+
+    /*
+     * Open file and dataset using the default properties.
+     */
+    file = H5Fopen(FILE, H5F_ACC_RDONLY, H5P_DEFAULT);
+    dset = H5Dopen2(file, DATASET, H5P_DEFAULT);
+
+    /*
+     * Get creation property list and mapping properties.
+     */
+    dcpl = H5Dget_create_plist(dset);
+
+    /*
+     * Get storage layout.
+     */
+    layout = H5Pget_layout(dcpl);
+
+    if (H5D_VIRTUAL == layout)
+        printf(" Dataset has a virtual layout \n");
+    else
+        printf(" Wrong layout found \n");
+
+    /*
+     * Find number of mappings.
+     */
+    status = H5Pget_virtual_count(dcpl, &num_map);
+    printf(" Number of mappings is %lu\n", (unsigned long)num_map);
+
+    /*
+     * Get mapping parameters for each mapping.
+     */
+    for (i = 0; i < (int)num_map; i++) {
+        printf(" Mapping %d \n", i);
+        printf("         Selection in the virtual dataset \n");
+        /* Get selection in the virtual dataset */
+        vspace = H5Pget_virtual_vspace(dcpl, (size_t)i);
+        if (H5Sget_select_type(vspace) == H5S_SEL_HYPERSLABS) {
+            if (H5Sis_regular_hyperslab(vspace)) {
+                status = H5Sget_regular_hyperslab(vspace, start_out, stride_out, count_out, block_out);
+                printf("         start  = [%llu, %llu, %llu] \n", (unsigned long long)start_out[0],
+                       (unsigned long long)start_out[1], (unsigned long long)start_out[2]);
+                printf("         stride = [%llu, %llu, %llu] \n", (unsigned long long)stride_out[0],
+                       (unsigned long long)stride_out[1], (unsigned long long)stride_out[2]);
+                printf("         count  = [%llu, %llu, %llu] \n", (unsigned long long)count_out[0],
+                       (unsigned long long)count_out[1], (unsigned long long)count_out[2]);
+                printf("         block  = [%llu, %llu, %llu] \n", (unsigned long long)block_out[0],
+                       (unsigned long long)block_out[1], (unsigned long long)block_out[2]);
+            }
+        }
+        /* Get source file name */
+        len      = H5Pget_virtual_filename(dcpl, (size_t)i, NULL, 0);
+        filename = (char *)malloc((size_t)len * sizeof(char) + 1);
+        H5Pget_virtual_filename(dcpl, (size_t)i, filename, len + 1);
+        printf("         Source filename %s\n", filename);
+
+        /* Get source dataset name */
+        len      = H5Pget_virtual_dsetname(dcpl, (size_t)i, NULL, 0);
+        dsetname = (char *)malloc((size_t)len * sizeof(char) + 1);
+        H5Pget_virtual_dsetname(dcpl, (size_t)i, dsetname, len + 1);
+        printf("         Source dataset name %s\n", dsetname);
+
+        /* Get selection in the source dataset */
+        printf("         Selection in the source dataset \n");
+        src_space = H5Pget_virtual_srcspace(dcpl, (size_t)i);
+        if (H5Sget_select_type(src_space) == H5S_SEL_HYPERSLABS) {
+            if (H5Sis_regular_hyperslab(src_space)) {
+                status = H5Sget_regular_hyperslab(src_space, start_out, stride_out, count_out, block_out);
+                printf("         start  = [%llu, %llu, %llu] \n", (unsigned long long)start_out[0],
+                       (unsigned long long)start_out[1], (unsigned long long)start_out[2]);
+                printf("         stride = [%llu, %llu, %llu] \n", (unsigned long long)stride_out[0],
+                       (unsigned long long)stride_out[1], (unsigned long long)stride_out[2]);
+                printf("         count  = [%llu, %llu, %llu] \n", (unsigned long long)count_out[0],
+                       (unsigned long long)count_out[1], (unsigned long long)count_out[2]);
+                printf("         block  = [%llu, %llu, %llu] \n", (unsigned long long)block_out[0],
+                       (unsigned long long)block_out[1], (unsigned long long)block_out[2]);
+            }
+        }
+        H5Sclose(vspace);
+        H5Sclose(src_space);
+        free(filename);
+        free(dsetname);
+    }
+    /*
+     * Close and release resources.
+     */
+    status = H5Pclose(dcpl);
+    status = H5Dclose(dset);
+    status = H5Fclose(file);
+    return 0;
+}
diff --git a/examples/h5_vds-simpleIO.c b/examples/h5_vds-simpleIO.c
new file mode 100644
index 0000000..f516af9
--- /dev/null
+++ b/examples/h5_vds-simpleIO.c
@@ -0,0 +1,190 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/************************************************************
+
+  This example illustrates the concept of virtual dataset I/O
+  The program  creates 2-dim source dataset and writes
+  data to it. Then it creates 2-dim virtual dataset that has
+  the same dimension sizes and maps the all elements of the
+  virtual dataset to all elements of the source dataset.
+  Then VDS is read back.
+
+  This file is intended for use with HDF5 Library version 1.10
+
+ ************************************************************/
+/* EIP Add link to the picture */
+
+#include "hdf5.h"
+#include <stdio.h>
+#include <stdlib.h>
+
+#define FILE    "vds-simpleIO.h5"
+#define DATASET "VDS"
+#define DIM1    6
+#define DIM0    4
+#define RANK    2
+
+#define SRC_FILE    "a.h5"
+#define SRC_DATASET "/A"
+
+int
+main(void)
+{
+    hid_t   file, space, src_space, vspace, dset; /* Handles */
+    hid_t   dcpl;
+    herr_t  status;
+    hsize_t vdsdims[2] = {DIM0, DIM1}, /* Virtual dataset dimension */
+        dims[2]        = {DIM0, DIM1}; /* Source dataset dimensions */
+    int wdata[DIM0][DIM1],             /* Write buffer for source dataset */
+        rdata[DIM0][DIM1],             /* Read buffer for virtual dataset */
+        i, j;
+    H5D_layout_t layout;  /* Storage layout */
+    size_t       num_map; /* Number of mappings */
+    ssize_t      len;     /* Length of the string; also a return value */
+    char        *filename;
+    char        *dsetname;
+    /*
+     * Initialize data.
+     */
+    for (i = 0; i < DIM0; i++)
+        for (j = 0; j < DIM1; j++)
+            wdata[i][j] = i + 1;
+
+    /*
+     * Create the source file and the dataset. Write data to the source dataset
+     * and close all resources.
+     */
+
+    file   = H5Fcreate(SRC_FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    space  = H5Screate_simple(RANK, dims, NULL);
+    dset   = H5Dcreate2(file, SRC_DATASET, H5T_NATIVE_INT, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    status = H5Dwrite(dset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata[0]);
+    status = H5Sclose(space);
+    status = H5Dclose(dset);
+    status = H5Fclose(file);
+
+    /* Create file in which virtual dataset will be stored. */
+    file = H5Fcreate(FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+
+    /* Create VDS dataspace.  */
+    vspace = H5Screate_simple(RANK, vdsdims, NULL);
+
+    /* Set VDS creation property. */
+    dcpl = H5Pcreate(H5P_DATASET_CREATE);
+
+    /*
+     * Build the mappings.
+     * Selections in the source datasets are H5S_ALL.
+     * In the virtual dataset we select the first, the second and the third rows
+     * and map each row to the data in the corresponding source dataset.
+     */
+    src_space = H5Screate_simple(RANK, dims, NULL);
+    status    = H5Pset_virtual(dcpl, vspace, SRC_FILE, SRC_DATASET, src_space);
+
+    /* Create a virtual dataset. */
+    dset   = H5Dcreate2(file, DATASET, H5T_NATIVE_INT, vspace, H5P_DEFAULT, dcpl, H5P_DEFAULT);
+    status = H5Sclose(vspace);
+    status = H5Sclose(src_space);
+    status = H5Dclose(dset);
+    status = H5Fclose(file);
+
+    /*
+     * Now we begin the read section of this example.
+     */
+
+    /*
+     * Open the file and virtual dataset.
+     */
+    file = H5Fopen(FILE, H5F_ACC_RDONLY, H5P_DEFAULT);
+    dset = H5Dopen2(file, DATASET, H5P_DEFAULT);
+    /*
+     * Get creation property list and mapping properties.
+     */
+    dcpl = H5Dget_create_plist(dset);
+
+    /*
+     * Get storage layout.
+     */
+    layout = H5Pget_layout(dcpl);
+    if (H5D_VIRTUAL == layout)
+        printf(" Dataset has a virtual layout \n");
+    else
+        printf(" Wrong layout found \n");
+
+    /*
+     * Find the number of mappings.
+     */
+    status = H5Pget_virtual_count(dcpl, &num_map);
+    printf(" Number of mappings is %lu\n", (unsigned long)num_map);
+
+    /*
+     * Get mapping parameters for each mapping.
+     */
+    for (i = 0; i < (int)num_map; i++) {
+        printf(" Mapping %d \n", i);
+        printf("         Selection in the virtual dataset ");
+        /* Get selection in the virtual dataset */
+        vspace = H5Pget_virtual_vspace(dcpl, (size_t)i);
+
+        /* Make sure it is ALL selection and then print selection. */
+        if (H5Sget_select_type(vspace) == H5S_SEL_ALL) {
+            printf("Selection is H5S_ALL \n");
+        }
+        /* Get source file name. */
+        len      = H5Pget_virtual_filename(dcpl, (size_t)i, NULL, 0);
+        filename = (char *)malloc((size_t)len * sizeof(char) + 1);
+        H5Pget_virtual_filename(dcpl, (size_t)i, filename, len + 1);
+        printf("         Source filename %s\n", filename);
+
+        /* Get source dataset name. */
+        len      = H5Pget_virtual_dsetname(dcpl, (size_t)i, NULL, 0);
+        dsetname = (char *)malloc((size_t)len * sizeof(char) + 1);
+        H5Pget_virtual_dsetname(dcpl, (size_t)i, dsetname, len + 1);
+        printf("         Source dataset name %s\n", dsetname);
+
+        /* Get selection in the source dataset. */
+        printf("         Selection in the source dataset ");
+        src_space = H5Pget_virtual_srcspace(dcpl, (size_t)i);
+
+        /* Make sure it is ALL selection and then print selection. */
+        if (H5Sget_select_type(src_space) == H5S_SEL_ALL) {
+            printf("Selection is H5S_ALL \n");
+        }
+        H5Sclose(vspace);
+        H5Sclose(src_space);
+        free(filename);
+        free(dsetname);
+    }
+    /*
+     * Read the data using the default properties.
+     */
+    status = H5Dread(dset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rdata[0]);
+
+    /*
+     * Output the data to the screen.
+     */
+    printf(" VDS Data:\n");
+    for (i = 0; i < DIM0; i++) {
+        printf(" [");
+        for (j = 0; j < DIM1; j++)
+            printf(" %3d", rdata[i][j]);
+        printf("]\n");
+    }
+    /*
+     * Close and release resources.
+     */
+    status = H5Pclose(dcpl);
+    status = H5Dclose(dset);
+    status = H5Fclose(file);
+
+    return 0;
+}
diff --git a/examples/h5_vds.c b/examples/h5_vds.c
new file mode 100644
index 0000000..ceb4956
--- /dev/null
+++ b/examples/h5_vds.c
@@ -0,0 +1,252 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/************************************************************
+
+  This example illustrates the concept of virtual dataset.
+  The program  creates three 1-dim source datasets and writes
+  data to them. Then it creates a 2-dim virtual dataset and
+  maps the first three rows of the virtual dataset to the data
+  in the source datasets. Elements of a row are mapped to all
+  elements of the corresponding source dataset.
+  The fourth row is not mapped and will be filled with the fill
+  values when virtual dataset is read back.
+
+  The program closes all datasets, and then reopens the virtual
+  dataset, and finds and prints its creation properties.
+  Then it reads the values.
+
+  This file is intended for use with HDF5 Library version 1.10
+
+ ************************************************************/
+/* EIP Add link to the picture */
+
+#include "hdf5.h"
+#include <stdio.h>
+#include <stdlib.h>
+
+#define FILE    "vds.h5"
+#define DATASET "VDS"
+#define VDSDIM1 6
+#define VDSDIM0 4
+#define DIM0    6
+#define RANK1   1
+#define RANK2   2
+
+const char *SRC_FILE[] = {"a.h5", "b.h5", "c.h5"};
+
+const char *SRC_DATASET[] = {"A", "B", "C"};
+
+int
+main(void)
+{
+    hid_t   file, space, src_space, vspace, dset; /* Handles */
+    hid_t   dcpl;
+    herr_t  status;
+    hsize_t vdsdims[2] = {VDSDIM0, VDSDIM1}, /* Virtual datasets dimension */
+        dims[1]        = {DIM0},             /* Source datasets dimensions */
+        start[2],                            /* Hyperslab parameters */
+        stride[2], count[2], block[2];
+    hsize_t start_out[2], stride_out[2], count_out[2], block_out[2];
+    int     wdata[DIM0],         /* Write buffer for source dataset */
+        rdata[VDSDIM0][VDSDIM1], /* Read buffer for virtual dataset */
+        i, j, k, l, block_inc;
+    int          fill_value = -1; /* Fill value for VDS */
+    H5D_layout_t layout;          /* Storage layout */
+    size_t       num_map;         /* Number of mappings */
+    ssize_t      len;             /* Length of the string; also a return value */
+    char        *filename;
+    char        *dsetname;
+    hsize_t      nblocks;
+    hsize_t     *buf; /* Buffer to hold hyperslab coordinates */
+
+    /*
+     * Create source files and datasets. This step is optional.
+     */
+    for (i = 0; i < 3; i++) {
+        /*
+         * Initialize data for i-th source dataset.
+         */
+        for (j = 0; j < DIM0; j++)
+            wdata[j] = i + 1;
+
+        /*
+         * Create the source files and  datasets. Write data to each dataset and
+         * close all resources.
+         */
+
+        file  = H5Fcreate(SRC_FILE[i], H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+        space = H5Screate_simple(RANK1, dims, NULL);
+        dset = H5Dcreate2(file, SRC_DATASET[i], H5T_NATIVE_INT, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+        status = H5Dwrite(dset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata);
+        status = H5Sclose(space);
+        status = H5Dclose(dset);
+        status = H5Fclose(file);
+    }
+
+    /* Create file in which virtual dataset will be stored. */
+    file = H5Fcreate(FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+
+    /* Create VDS dataspace.  */
+    space = H5Screate_simple(RANK2, vdsdims, NULL);
+
+    /* Set VDS creation property. */
+    dcpl   = H5Pcreate(H5P_DATASET_CREATE);
+    status = H5Pset_fill_value(dcpl, H5T_NATIVE_INT, &fill_value);
+
+    /* Initialize hyperslab values. */
+    start[0] = 0;
+    start[1] = 0;
+    count[0] = 1;
+    count[1] = 1;
+    block[0] = 1;
+    block[1] = VDSDIM1;
+
+    /*
+     * Build the mappings.
+     * Selections in the source datasets are H5S_ALL.
+     * In the virtual dataset we select the first, the second and the third rows
+     * and map each row to the data in the corresponding source dataset.
+     */
+    src_space = H5Screate_simple(RANK1, dims, NULL);
+    for (i = 0; i < 3; i++) {
+        start[0] = (hsize_t)i;
+        /* Select i-th row in the virtual dataset; selection in the source datasets is the same. */
+        status = H5Sselect_hyperslab(space, H5S_SELECT_SET, start, NULL, count, block);
+        status = H5Pset_virtual(dcpl, space, SRC_FILE[i], SRC_DATASET[i], src_space);
+    }
+
+    /* Create a virtual dataset. */
+    dset   = H5Dcreate2(file, DATASET, H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, H5P_DEFAULT);
+    status = H5Sclose(space);
+    status = H5Sclose(src_space);
+    status = H5Dclose(dset);
+    status = H5Fclose(file);
+
+    /*
+     * Now we begin the read section of this example.
+     */
+
+    /*
+     * Open the file and virtual dataset.
+     */
+    file = H5Fopen(FILE, H5F_ACC_RDONLY, H5P_DEFAULT);
+    dset = H5Dopen2(file, DATASET, H5P_DEFAULT);
+
+    /*
+     * Get creation property list and mapping properties.
+     */
+    dcpl = H5Dget_create_plist(dset);
+
+    /*
+     * Get storage layout.
+     */
+    layout = H5Pget_layout(dcpl);
+    if (H5D_VIRTUAL == layout)
+        printf(" Dataset has a virtual layout \n");
+    else
+        printf(" Wrong layout found \n");
+
+    /*
+     * Find the number of mappings.
+     */
+    status = H5Pget_virtual_count(dcpl, &num_map);
+    printf(" Number of mappings is %lu\n", (unsigned long)num_map);
+
+    /*
+     * Get mapping parameters for each mapping.
+     */
+    for (i = 0; i < (int)num_map; i++) {
+        printf(" Mapping %d \n", i);
+        printf("         Selection in the virtual dataset ");
+        /* Get selection in the virtual dataset */
+        vspace = H5Pget_virtual_vspace(dcpl, (size_t)i);
+
+        /* Make sure that this is a hyperslab selection and then print information. */
+        if (H5Sget_select_type(vspace) == H5S_SEL_HYPERSLABS) {
+            nblocks = H5Sget_select_hyper_nblocks(vspace);
+            buf     = (hsize_t *)malloc(sizeof(hsize_t) * 2 * RANK2 * nblocks);
+            status  = H5Sget_select_hyper_blocklist(vspace, (hsize_t)0, nblocks, buf);
+            for (l = 0; l < nblocks; l++) {
+                block_inc = 2 * RANK2 * l;
+                printf("(");
+                for (k = 0; k < RANK2 - 1; k++)
+                    printf("%d,", (int)buf[block_inc + k]);
+                printf("%d) - (", (int)buf[block_inc + k]);
+                for (k = 0; k < RANK2 - 1; k++)
+                    printf("%d,", (int)buf[block_inc + RANK2 + k]);
+                printf("%d)\n", (int)buf[block_inc + RANK2 + k]);
+            }
+            /* We also can use new APIs to get start, stride, count and block */
+            if (H5Sis_regular_hyperslab(vspace)) {
+                status = H5Sget_regular_hyperslab(vspace, start_out, stride_out, count_out, block_out);
+                printf("         start  = [%llu, %llu] \n", (unsigned long long)start_out[0],
+                       (unsigned long long)start_out[1]);
+                printf("         stride = [%llu, %llu] \n", (unsigned long long)stride_out[0],
+                       (unsigned long long)stride_out[1]);
+                printf("         count  = [%llu, %llu] \n", (unsigned long long)count_out[0],
+                       (unsigned long long)count_out[1]);
+                printf("         block  = [%llu, %llu] \n", (unsigned long long)block_out[0],
+                       (unsigned long long)block_out[1]);
+            }
+        }
+        /* Get source file name. */
+        len      = H5Pget_virtual_filename(dcpl, (size_t)i, NULL, 0);
+        filename = (char *)malloc((size_t)len * sizeof(char) + 1);
+        H5Pget_virtual_filename(dcpl, (size_t)i, filename, len + 1);
+        printf("         Source filename %s\n", filename);
+
+        /* Get source dataset name. */
+        len      = H5Pget_virtual_dsetname(dcpl, (size_t)i, NULL, 0);
+        dsetname = (char *)malloc((size_t)len * sizeof(char) + 1);
+        H5Pget_virtual_dsetname(dcpl, (size_t)i, dsetname, len + 1);
+        printf("         Source dataset name %s\n", dsetname);
+
+        /* Get selection in the source dataset. */
+        printf("         Selection in the source dataset ");
+        src_space = H5Pget_virtual_srcspace(dcpl, (size_t)i);
+
+        /* Make sure it is ALL selection and then print the coordinates. */
+        if (H5Sget_select_type(src_space) == H5S_SEL_ALL) {
+            printf("(0) - (%d) \n", DIM0 - 1);
+        }
+        H5Sclose(vspace);
+        H5Sclose(src_space);
+        free(filename);
+        free(dsetname);
+        free(buf);
+    }
+
+    /*
+     * Read the data using the default properties.
+     */
+    status = H5Dread(dset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rdata[0]);
+
+    /*
+     * Output the data to the screen.
+     */
+    printf(" VDS Data:\n");
+    for (i = 0; i < VDSDIM0; i++) {
+        printf(" [");
+        for (j = 0; j < VDSDIM1; j++)
+            printf(" %3d", rdata[i][j]);
+        printf("]\n");
+    }
+    /*
+     * Close and release resources.
+     */
+    status = H5Pclose(dcpl);
+    status = H5Dclose(dset);
+    status = H5Fclose(file);
+
+    return 0;
+}
diff --git a/examples/h5_write.c b/examples/h5_write.c
index 93d40ea..2f6de3a 100644
--- a/examples/h5_write.c
+++ b/examples/h5_write.c
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
@@ -20,28 +17,28 @@
 
 #include "hdf5.h"
 
-#define H5FILE_NAME        "SDS.h5"
+#define H5FILE_NAME "SDS.h5"
 #define DATASETNAME "IntArray"
-#define NX     5                      /* dataset dimensions */
-#define NY     6
-#define RANK   2
+#define NX          5 /* dataset dimensions */
+#define NY          6
+#define RANK        2
 
 int
-main (void)
+main(void)
 {
-    hid_t       file, dataset;         /* file and dataset handles */
-    hid_t       datatype, dataspace;   /* handles */
-    hsize_t     dimsf[2];              /* dataset dimensions */
-    herr_t      status;
-    int         data[NX][NY];          /* data to write */
-    int         i, j;
+    hid_t   file, dataset;       /* file and dataset handles */
+    hid_t   datatype, dataspace; /* handles */
+    hsize_t dimsf[2];            /* dataset dimensions */
+    herr_t  status;
+    int     data[NX][NY]; /* data to write */
+    int     i, j;
 
     /*
      * Data  and output buffer initialization.
      */
-    for(j = 0; j < NX; j++)
-	for(i = 0; i < NY; i++)
-	    data[j][i] = i + j;
+    for (j = 0; j < NX; j++)
+        for (i = 0; i < NY; i++)
+            data[j][i] = i + j;
     /*
      * 0 1 2 3 4 5
      * 1 2 3 4 5 6
@@ -61,8 +58,8 @@ main (void)
      * Describe the size of the array and create the data space for fixed
      * size dataset.
      */
-    dimsf[0] = NX;
-    dimsf[1] = NY;
+    dimsf[0]  = NX;
+    dimsf[1]  = NY;
     dataspace = H5Screate_simple(RANK, dimsf, NULL);
 
     /*
@@ -70,14 +67,13 @@ main (void)
      * We will store little endian INT numbers.
      */
     datatype = H5Tcopy(H5T_NATIVE_INT);
-    status = H5Tset_order(datatype, H5T_ORDER_LE);
+    status   = H5Tset_order(datatype, H5T_ORDER_LE);
 
     /*
      * Create a new dataset within the file using defined dataspace and
      * datatype and default dataset creation properties.
      */
-    dataset = H5Dcreate2(file, DATASETNAME, datatype, dataspace,
-			H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    dataset = H5Dcreate2(file, DATASETNAME, datatype, dataspace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
     /*
      * Write the data to the dataset using default transfer properties.
@@ -94,4 +90,3 @@ main (void)
 
     return 0;
 }
-
diff --git a/examples/ph5_filtered_writes.c b/examples/ph5_filtered_writes.c
new file mode 100644
index 0000000..f5c1169
--- /dev/null
+++ b/examples/ph5_filtered_writes.c
@@ -0,0 +1,490 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/*
+ * Example of using the parallel HDF5 library to write to datasets
+ * with filters applied to them.
+ *
+ * If the HDF5_NOCLEANUP environment variable is set, the file that
+ * this example creates will not be removed as the example finishes.
+ *
+ * The need of requirement of parallel file prefix is that in general
+ * the current working directory in which compiling is done, is not suitable
+ * for parallel I/O and there is no standard pathname for parallel file
+ * systems. In some cases, the parallel file name may even need some
+ * parallel file type prefix such as: "pfs:/GF/...".  Therefore, this
+ * example parses the HDF5_PARAPREFIX environment variable for a prefix,
+ * if one is needed.
+ */
+
+#include <stdlib.h>
+
+#include "hdf5.h"
+
+#if defined(H5_HAVE_PARALLEL) && defined(H5_HAVE_PARALLEL_FILTERED_WRITES)
+
+#define EXAMPLE_FILE       "ph5_filtered_writes.h5"
+#define EXAMPLE_DSET1_NAME "DSET1"
+#define EXAMPLE_DSET2_NAME "DSET2"
+
+#define EXAMPLE_DSET_DIMS           2
+#define EXAMPLE_DSET_CHUNK_DIM_SIZE 10
+
+/* Dataset datatype */
+#define HDF5_DATATYPE H5T_NATIVE_INT
+typedef int C_DATATYPE;
+
+#ifndef PATH_MAX
+#define PATH_MAX 512
+#endif
+
+/* Global variables */
+int mpi_rank, mpi_size;
+
+/*
+ * Routine to set an HDF5 filter on the given DCPL
+ */
+static void
+set_filter(hid_t dcpl_id)
+{
+    htri_t filter_avail;
+
+    /*
+     * Check if 'deflate' filter is available
+     */
+    filter_avail = H5Zfilter_avail(H5Z_FILTER_DEFLATE);
+    if (filter_avail < 0)
+        return;
+    else if (filter_avail) {
+        /*
+         * Set 'deflate' filter with reasonable
+         * compression level on DCPL
+         */
+        H5Pset_deflate(dcpl_id, 6);
+    }
+    else {
+        /*
+         * Set Fletcher32 checksum filter on DCPL
+         * since it is always available in HDF5
+         */
+        H5Pset_fletcher32(dcpl_id);
+    }
+}
+
+/*
+ * Routine to fill a data buffer with data. Assumes
+ * dimension rank is 2 and data is stored contiguous.
+ */
+void
+fill_databuf(hsize_t start[], hsize_t count[], hsize_t stride[], C_DATATYPE *data)
+{
+    C_DATATYPE *dataptr = data;
+    hsize_t     i, j;
+
+    /* Use MPI rank value for data */
+    for (i = 0; i < count[0]; i++) {
+        for (j = 0; j < count[1]; j++) {
+            *dataptr++ = mpi_rank;
+        }
+    }
+}
+
+/* Cleanup created file */
+static void
+cleanup(char *filename)
+{
+    hbool_t do_cleanup = getenv(HDF5_NOCLEANUP) ? 0 : 1;
+
+    if (do_cleanup)
+        MPI_File_delete(filename, MPI_INFO_NULL);
+}
+
+/*
+ * Routine to write to a dataset in a fashion
+ * where no chunks in the dataset are written
+ * to by more than 1 MPI rank. This will
+ * generally give the best performance as the
+ * MPI ranks will need the least amount of
+ * inter-process communication.
+ */
+static void
+write_dataset_no_overlap(hid_t file_id, hid_t dxpl_id)
+{
+    C_DATATYPE data[EXAMPLE_DSET_CHUNK_DIM_SIZE][4 * EXAMPLE_DSET_CHUNK_DIM_SIZE];
+    hsize_t    dataset_dims[EXAMPLE_DSET_DIMS];
+    hsize_t    chunk_dims[EXAMPLE_DSET_DIMS];
+    hsize_t    start[EXAMPLE_DSET_DIMS];
+    hsize_t    stride[EXAMPLE_DSET_DIMS];
+    hsize_t    count[EXAMPLE_DSET_DIMS];
+    size_t     i, j;
+    hid_t      dset_id        = H5I_INVALID_HID;
+    hid_t      dcpl_id        = H5I_INVALID_HID;
+    hid_t      file_dataspace = H5I_INVALID_HID;
+
+    /*
+     * ------------------------------------
+     * Setup Dataset Creation Property List
+     * ------------------------------------
+     */
+
+    dcpl_id = H5Pcreate(H5P_DATASET_CREATE);
+
+    /*
+     * REQUIRED: Dataset chunking must be enabled to
+     *           apply a data filter to the dataset.
+     *           Chunks in the dataset are of size
+     *           EXAMPLE_DSET_CHUNK_DIM_SIZE x EXAMPLE_DSET_CHUNK_DIM_SIZE.
+     */
+    chunk_dims[0] = EXAMPLE_DSET_CHUNK_DIM_SIZE;
+    chunk_dims[1] = EXAMPLE_DSET_CHUNK_DIM_SIZE;
+    H5Pset_chunk(dcpl_id, EXAMPLE_DSET_DIMS, chunk_dims);
+
+    /* Set filter to be applied to created datasets */
+    set_filter(dcpl_id);
+
+    /*
+     * ------------------------------------
+     * Define the dimensions of the dataset
+     * and create it
+     * ------------------------------------
+     */
+
+    /*
+     * Create a dataset composed of 4 chunks
+     * per MPI rank. The first dataset dimension
+     * scales according to the number of MPI ranks.
+     * The second dataset dimension stays fixed
+     * according to the chunk size.
+     */
+    dataset_dims[0] = EXAMPLE_DSET_CHUNK_DIM_SIZE * mpi_size;
+    dataset_dims[1] = 4 * EXAMPLE_DSET_CHUNK_DIM_SIZE;
+
+    file_dataspace = H5Screate_simple(EXAMPLE_DSET_DIMS, dataset_dims, NULL);
+
+    /* Create the dataset */
+    dset_id = H5Dcreate2(file_id, EXAMPLE_DSET1_NAME, HDF5_DATATYPE, file_dataspace, H5P_DEFAULT, dcpl_id,
+                         H5P_DEFAULT);
+
+    /*
+     * ------------------------------------
+     * Setup selection in the dataset for
+     * each MPI rank
+     * ------------------------------------
+     */
+
+    /*
+     * Each MPI rank's selection covers a
+     * single chunk in the first dataset
+     * dimension. Each MPI rank's selection
+     * covers 4 chunks in the second dataset
+     * dimension. This leads to each MPI rank
+     * writing to 4 chunks of the dataset.
+     */
+    start[0]  = mpi_rank * EXAMPLE_DSET_CHUNK_DIM_SIZE;
+    start[1]  = 0;
+    stride[0] = 1;
+    stride[1] = 1;
+    count[0]  = EXAMPLE_DSET_CHUNK_DIM_SIZE;
+    count[1]  = 4 * EXAMPLE_DSET_CHUNK_DIM_SIZE;
+
+    H5Sselect_hyperslab(file_dataspace, H5S_SELECT_SET, start, stride, count, NULL);
+
+    /*
+     * --------------------------------------
+     * Fill data buffer with MPI rank's rank
+     * value to make it easy to see which
+     * part of the dataset each rank wrote to
+     * --------------------------------------
+     */
+
+    fill_databuf(start, count, stride, &data[0][0]);
+
+    /*
+     * ---------------------------------
+     * Write to the dataset collectively
+     * ---------------------------------
+     */
+
+    H5Dwrite(dset_id, HDF5_DATATYPE, H5S_BLOCK, file_dataspace, dxpl_id, data);
+
+    /*
+     * --------------
+     * Close HDF5 IDs
+     * --------------
+     */
+
+    H5Sclose(file_dataspace);
+    H5Pclose(dcpl_id);
+    H5Dclose(dset_id);
+}
+
+/*
+ * Routine to write to a dataset in a fashion
+ * where every chunk in the dataset is written
+ * to by every MPI rank. This will generally
+ * give the worst performance as the MPI ranks
+ * will need the most amount of inter-process
+ * communication.
+ */
+static void
+write_dataset_overlap(hid_t file_id, hid_t dxpl_id)
+{
+    C_DATATYPE *data = NULL;
+    hsize_t     dataset_dims[EXAMPLE_DSET_DIMS];
+    hsize_t     chunk_dims[EXAMPLE_DSET_DIMS];
+    hsize_t     start[EXAMPLE_DSET_DIMS];
+    hsize_t     stride[EXAMPLE_DSET_DIMS];
+    hsize_t     count[EXAMPLE_DSET_DIMS];
+    size_t      i, j;
+    hid_t       dset_id        = H5I_INVALID_HID;
+    hid_t       dcpl_id        = H5I_INVALID_HID;
+    hid_t       file_dataspace = H5I_INVALID_HID;
+
+    /*
+     * ------------------------------------
+     * Setup Dataset Creation Property List
+     * ------------------------------------
+     */
+
+    dcpl_id = H5Pcreate(H5P_DATASET_CREATE);
+
+    /*
+     * REQUIRED: Dataset chunking must be enabled to
+     *           apply a data filter to the dataset.
+     *           Chunks in the dataset are of size
+     *           mpi_size x EXAMPLE_DSET_CHUNK_DIM_SIZE.
+     */
+    chunk_dims[0] = mpi_size;
+    chunk_dims[1] = EXAMPLE_DSET_CHUNK_DIM_SIZE;
+    H5Pset_chunk(dcpl_id, EXAMPLE_DSET_DIMS, chunk_dims);
+
+    /* Set filter to be applied to created datasets */
+    set_filter(dcpl_id);
+
+    /*
+     * ------------------------------------
+     * Define the dimensions of the dataset
+     * and create it
+     * ------------------------------------
+     */
+
+    /*
+     * Create a dataset composed of N chunks,
+     * where N is the number of MPI ranks. The
+     * first dataset dimension scales according
+     * to the number of MPI ranks. The second
+     * dataset dimension stays fixed according
+     * to the chunk size.
+     */
+    dataset_dims[0] = mpi_size * chunk_dims[0];
+    dataset_dims[1] = EXAMPLE_DSET_CHUNK_DIM_SIZE;
+
+    file_dataspace = H5Screate_simple(EXAMPLE_DSET_DIMS, dataset_dims, NULL);
+
+    /* Create the dataset */
+    dset_id = H5Dcreate2(file_id, EXAMPLE_DSET2_NAME, HDF5_DATATYPE, file_dataspace, H5P_DEFAULT, dcpl_id,
+                         H5P_DEFAULT);
+
+    /*
+     * ------------------------------------
+     * Setup selection in the dataset for
+     * each MPI rank
+     * ------------------------------------
+     */
+
+    /*
+     * Each MPI rank's selection covers
+     * part of every chunk in the first
+     * dimension. Each MPI rank's selection
+     * covers all of every chunk in the
+     * second dimension. This leads to
+     * each MPI rank writing an equal
+     * amount of data to every chunk
+     * in the dataset.
+     */
+    start[0]  = mpi_rank;
+    start[1]  = 0;
+    stride[0] = chunk_dims[0];
+    stride[1] = 1;
+    count[0]  = mpi_size;
+    count[1]  = EXAMPLE_DSET_CHUNK_DIM_SIZE;
+
+    H5Sselect_hyperslab(file_dataspace, H5S_SELECT_SET, start, stride, count, NULL);
+
+    /*
+     * --------------------------------------
+     * Fill data buffer with MPI rank's rank
+     * value to make it easy to see which
+     * part of the dataset each rank wrote to
+     * --------------------------------------
+     */
+
+    data = malloc(mpi_size * EXAMPLE_DSET_CHUNK_DIM_SIZE * sizeof(C_DATATYPE));
+
+    fill_databuf(start, count, stride, data);
+
+    /*
+     * ---------------------------------
+     * Write to the dataset collectively
+     * ---------------------------------
+     */
+
+    H5Dwrite(dset_id, HDF5_DATATYPE, H5S_BLOCK, file_dataspace, dxpl_id, data);
+
+    free(data);
+
+    /*
+     * --------------
+     * Close HDF5 IDs
+     * --------------
+     */
+
+    H5Sclose(file_dataspace);
+    H5Pclose(dcpl_id);
+    H5Dclose(dset_id);
+}
+
+int
+main(int argc, char **argv)
+{
+    MPI_Comm comm       = MPI_COMM_WORLD;
+    MPI_Info info       = MPI_INFO_NULL;
+    hid_t    file_id    = H5I_INVALID_HID;
+    hid_t    fapl_id    = H5I_INVALID_HID;
+    hid_t    dxpl_id    = H5I_INVALID_HID;
+    char    *par_prefix = NULL;
+    char     filename[PATH_MAX];
+
+    MPI_Init(&argc, &argv);
+    MPI_Comm_size(comm, &mpi_size);
+    MPI_Comm_rank(comm, &mpi_rank);
+
+    /*
+     * ----------------------------------
+     * Start parallel access to HDF5 file
+     * ----------------------------------
+     */
+
+    /* Setup File Access Property List with parallel I/O access */
+    fapl_id = H5Pcreate(H5P_FILE_ACCESS);
+    H5Pset_fapl_mpio(fapl_id, comm, info);
+
+    /*
+     * OPTIONAL: Set collective metadata reads on FAPL to allow
+     *           parallel writes to filtered datasets to perform
+     *           better at scale. While not strictly necessary,
+     *           this is generally recommended.
+     */
+    H5Pset_all_coll_metadata_ops(fapl_id, true);
+
+    /*
+     * OPTIONAL: Set the latest file format version for HDF5 in
+     *           order to gain access to different dataset chunk
+     *           index types and better data encoding methods.
+     *           While not strictly necessary, this is generally
+     *           recommended.
+     */
+    H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST);
+
+    /* Parse any parallel prefix and create filename */
+    par_prefix = getenv("HDF5_PARAPREFIX");
+
+    snprintf(filename, PATH_MAX, "%s%s%s", par_prefix ? par_prefix : "", par_prefix ? "/" : "", EXAMPLE_FILE);
+
+    /* Create HDF5 file */
+    file_id = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id);
+
+    /*
+     * --------------------------------------
+     * Setup Dataset Transfer Property List
+     * with collective I/O
+     * --------------------------------------
+     */
+
+    dxpl_id = H5Pcreate(H5P_DATASET_XFER);
+
+    /*
+     * REQUIRED: Setup collective I/O for the dataset
+     *           write operations. Parallel writes to
+     *           filtered datasets MUST be collective,
+     *           even if some ranks have no data to
+     *           contribute to the write operation.
+     *
+     *           Refer to the 'ph5_filtered_writes_no_sel'
+     *           example to see how to setup a dataset
+     *           write when one or more MPI ranks have
+     *           no data to contribute to the write
+     *           operation.
+     */
+    H5Pset_dxpl_mpio(dxpl_id, H5FD_MPIO_COLLECTIVE);
+
+    /*
+     * --------------------------------
+     * Create and write to each dataset
+     * --------------------------------
+     */
+
+    /*
+     * Write to a dataset in a fashion where no
+     * chunks in the dataset are written to by
+     * more than 1 MPI rank. This will generally
+     * give the best performance as the MPI ranks
+     * will need the least amount of inter-process
+     * communication.
+     */
+    write_dataset_no_overlap(file_id, dxpl_id);
+
+    /*
+     * Write to a dataset in a fashion where
+     * every chunk in the dataset is written
+     * to by every MPI rank. This will generally
+     * give the worst performance as the MPI ranks
+     * will need the most amount of inter-process
+     * communication.
+     */
+    write_dataset_overlap(file_id, dxpl_id);
+
+    /*
+     * ------------------
+     * Close all HDF5 IDs
+     * ------------------
+     */
+
+    H5Pclose(dxpl_id);
+    H5Pclose(fapl_id);
+    H5Fclose(file_id);
+
+    printf("PHDF5 example finished with no errors\n");
+
+    /*
+     * ------------------------------------
+     * Cleanup created HDF5 file and finish
+     * ------------------------------------
+     */
+
+    cleanup(filename);
+
+    MPI_Finalize();
+
+    return 0;
+}
+
+#else
+
+int
+main(void)
+{
+    printf("HDF5 not configured with parallel support or parallel filtered writes are disabled!\n");
+    return 0;
+}
+
+#endif
diff --git a/examples/ph5_filtered_writes_no_sel.c b/examples/ph5_filtered_writes_no_sel.c
new file mode 100644
index 0000000..05367d7
--- /dev/null
+++ b/examples/ph5_filtered_writes_no_sel.c
@@ -0,0 +1,370 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/*
+ * Example of using the parallel HDF5 library to collectively write to
+ * datasets with filters applied to them when one or MPI ranks do not
+ * have data to contribute to the dataset.
+ *
+ * If the HDF5_NOCLEANUP environment variable is set, the file that
+ * this example creates will not be removed as the example finishes.
+ *
+ * The need of requirement of parallel file prefix is that in general
+ * the current working directory in which compiling is done, is not suitable
+ * for parallel I/O and there is no standard pathname for parallel file
+ * systems. In some cases, the parallel file name may even need some
+ * parallel file type prefix such as: "pfs:/GF/...".  Therefore, this
+ * example parses the HDF5_PARAPREFIX environment variable for a prefix,
+ * if one is needed.
+ */
+
+#include <stdlib.h>
+
+#include "hdf5.h"
+
+#if defined(H5_HAVE_PARALLEL) && defined(H5_HAVE_PARALLEL_FILTERED_WRITES)
+
+#define EXAMPLE_FILE      "ph5_filtered_writes_no_sel.h5"
+#define EXAMPLE_DSET_NAME "DSET"
+
+#define EXAMPLE_DSET_DIMS           2
+#define EXAMPLE_DSET_CHUNK_DIM_SIZE 10
+
+/* Dataset datatype */
+#define HDF5_DATATYPE H5T_NATIVE_INT
+typedef int C_DATATYPE;
+
+#ifndef PATH_MAX
+#define PATH_MAX 512
+#endif
+
+/* Global variables */
+int mpi_rank, mpi_size;
+
+/*
+ * Routine to set an HDF5 filter on the given DCPL
+ */
+static void
+set_filter(hid_t dcpl_id)
+{
+    htri_t filter_avail;
+
+    /*
+     * Check if 'deflate' filter is available
+     */
+    filter_avail = H5Zfilter_avail(H5Z_FILTER_DEFLATE);
+    if (filter_avail < 0)
+        return;
+    else if (filter_avail) {
+        /*
+         * Set 'deflate' filter with reasonable
+         * compression level on DCPL
+         */
+        H5Pset_deflate(dcpl_id, 6);
+    }
+    else {
+        /*
+         * Set Fletcher32 checksum filter on DCPL
+         * since it is always available in HDF5
+         */
+        H5Pset_fletcher32(dcpl_id);
+    }
+}
+
+/*
+ * Routine to fill a data buffer with data. Assumes
+ * dimension rank is 2 and data is stored contiguous.
+ */
+void
+fill_databuf(hsize_t start[], hsize_t count[], hsize_t stride[], C_DATATYPE *data)
+{
+    C_DATATYPE *dataptr = data;
+    hsize_t     i, j;
+
+    /* Use MPI rank value for data */
+    for (i = 0; i < count[0]; i++) {
+        for (j = 0; j < count[1]; j++) {
+            *dataptr++ = mpi_rank;
+        }
+    }
+}
+
+/* Cleanup created file */
+static void
+cleanup(char *filename)
+{
+    hbool_t do_cleanup = getenv(HDF5_NOCLEANUP) ? 0 : 1;
+
+    if (do_cleanup)
+        MPI_File_delete(filename, MPI_INFO_NULL);
+}
+
+/*
+ * Routine to write to a dataset in a fashion
+ * where no chunks in the dataset are written
+ * to by more than 1 MPI rank. This will
+ * generally give the best performance as the
+ * MPI ranks will need the least amount of
+ * inter-process communication.
+ */
+static void
+write_dataset_some_no_sel(hid_t file_id, hid_t dxpl_id)
+{
+    C_DATATYPE data[EXAMPLE_DSET_CHUNK_DIM_SIZE][4 * EXAMPLE_DSET_CHUNK_DIM_SIZE];
+    hsize_t    dataset_dims[EXAMPLE_DSET_DIMS];
+    hsize_t    chunk_dims[EXAMPLE_DSET_DIMS];
+    hsize_t    start[EXAMPLE_DSET_DIMS];
+    hsize_t    stride[EXAMPLE_DSET_DIMS];
+    hsize_t    count[EXAMPLE_DSET_DIMS];
+    hbool_t    no_selection;
+    size_t     i, j;
+    hid_t      dset_id        = H5I_INVALID_HID;
+    hid_t      dcpl_id        = H5I_INVALID_HID;
+    hid_t      file_dataspace = H5I_INVALID_HID;
+
+    /*
+     * ------------------------------------
+     * Setup Dataset Creation Property List
+     * ------------------------------------
+     */
+
+    dcpl_id = H5Pcreate(H5P_DATASET_CREATE);
+
+    /*
+     * REQUIRED: Dataset chunking must be enabled to
+     *           apply a data filter to the dataset.
+     *           Chunks in the dataset are of size
+     *           EXAMPLE_DSET_CHUNK_DIM_SIZE x EXAMPLE_DSET_CHUNK_DIM_SIZE.
+     */
+    chunk_dims[0] = EXAMPLE_DSET_CHUNK_DIM_SIZE;
+    chunk_dims[1] = EXAMPLE_DSET_CHUNK_DIM_SIZE;
+    H5Pset_chunk(dcpl_id, EXAMPLE_DSET_DIMS, chunk_dims);
+
+    /* Set filter to be applied to created datasets */
+    set_filter(dcpl_id);
+
+    /*
+     * ------------------------------------
+     * Define the dimensions of the dataset
+     * and create it
+     * ------------------------------------
+     */
+
+    /*
+     * Create a dataset composed of 4 chunks
+     * per MPI rank. The first dataset dimension
+     * scales according to the number of MPI ranks.
+     * The second dataset dimension stays fixed
+     * according to the chunk size.
+     */
+    dataset_dims[0] = EXAMPLE_DSET_CHUNK_DIM_SIZE * mpi_size;
+    dataset_dims[1] = 4 * EXAMPLE_DSET_CHUNK_DIM_SIZE;
+
+    file_dataspace = H5Screate_simple(EXAMPLE_DSET_DIMS, dataset_dims, NULL);
+
+    /* Create the dataset */
+    dset_id = H5Dcreate2(file_id, EXAMPLE_DSET_NAME, HDF5_DATATYPE, file_dataspace, H5P_DEFAULT, dcpl_id,
+                         H5P_DEFAULT);
+
+    /*
+     * ------------------------------------
+     * Setup selection in the dataset for
+     * each MPI rank
+     * ------------------------------------
+     */
+
+    /*
+     * Odd rank value MPI ranks do not
+     * contribute any data to the dataset.
+     */
+    no_selection = (mpi_rank % 2) == 1;
+
+    if (no_selection) {
+        /*
+         * MPI ranks not contributing data to
+         * the dataset should call H5Sselect_none
+         * on the file dataspace that will be
+         * passed to H5Dwrite.
+         */
+        H5Sselect_none(file_dataspace);
+    }
+    else {
+        /*
+         * Even MPI ranks contribute data to
+         * the dataset. Each MPI rank's selection
+         * covers a single chunk in the first dataset
+         * dimension. Each MPI rank's selection
+         * covers 4 chunks in the second dataset
+         * dimension. This leads to each contributing
+         * MPI rank writing to 4 chunks of the dataset.
+         */
+        start[0]  = mpi_rank * EXAMPLE_DSET_CHUNK_DIM_SIZE;
+        start[1]  = 0;
+        stride[0] = 1;
+        stride[1] = 1;
+        count[0]  = EXAMPLE_DSET_CHUNK_DIM_SIZE;
+        count[1]  = 4 * EXAMPLE_DSET_CHUNK_DIM_SIZE;
+
+        H5Sselect_hyperslab(file_dataspace, H5S_SELECT_SET, start, stride, count, NULL);
+
+        /*
+         * --------------------------------------
+         * Fill data buffer with MPI rank's rank
+         * value to make it easy to see which
+         * part of the dataset each rank wrote to
+         * --------------------------------------
+         */
+
+        fill_databuf(start, count, stride, &data[0][0]);
+    }
+
+    /*
+     * ---------------------------------
+     * Write to the dataset collectively
+     * ---------------------------------
+     */
+
+    H5Dwrite(dset_id, HDF5_DATATYPE, no_selection ? H5S_ALL : H5S_BLOCK, file_dataspace, dxpl_id, data);
+
+    /*
+     * --------------
+     * Close HDF5 IDs
+     * --------------
+     */
+
+    H5Sclose(file_dataspace);
+    H5Pclose(dcpl_id);
+    H5Dclose(dset_id);
+}
+
+int
+main(int argc, char **argv)
+{
+    MPI_Comm comm       = MPI_COMM_WORLD;
+    MPI_Info info       = MPI_INFO_NULL;
+    hid_t    file_id    = H5I_INVALID_HID;
+    hid_t    fapl_id    = H5I_INVALID_HID;
+    hid_t    dxpl_id    = H5I_INVALID_HID;
+    char    *par_prefix = NULL;
+    char     filename[PATH_MAX];
+
+    MPI_Init(&argc, &argv);
+    MPI_Comm_size(comm, &mpi_size);
+    MPI_Comm_rank(comm, &mpi_rank);
+
+    /*
+     * ----------------------------------
+     * Start parallel access to HDF5 file
+     * ----------------------------------
+     */
+
+    /* Setup File Access Property List with parallel I/O access */
+    fapl_id = H5Pcreate(H5P_FILE_ACCESS);
+    H5Pset_fapl_mpio(fapl_id, comm, info);
+
+    /*
+     * OPTIONAL: Set collective metadata reads on FAPL to allow
+     *           parallel writes to filtered datasets to perform
+     *           better at scale. While not strictly necessary,
+     *           this is generally recommended.
+     */
+    H5Pset_all_coll_metadata_ops(fapl_id, true);
+
+    /*
+     * OPTIONAL: Set the latest file format version for HDF5 in
+     *           order to gain access to different dataset chunk
+     *           index types and better data encoding methods.
+     *           While not strictly necessary, this is generally
+     *           recommended.
+     */
+    H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST);
+
+    /* Parse any parallel prefix and create filename */
+    par_prefix = getenv("HDF5_PARAPREFIX");
+
+    snprintf(filename, PATH_MAX, "%s%s%s", par_prefix ? par_prefix : "", par_prefix ? "/" : "", EXAMPLE_FILE);
+
+    /* Create HDF5 file */
+    file_id = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id);
+
+    /*
+     * --------------------------------------
+     * Setup Dataset Transfer Property List
+     * with collective I/O
+     * --------------------------------------
+     */
+
+    dxpl_id = H5Pcreate(H5P_DATASET_XFER);
+
+    /*
+     * REQUIRED: Setup collective I/O for the dataset
+     *           write operations. Parallel writes to
+     *           filtered datasets MUST be collective,
+     *           even if some ranks have no data to
+     *           contribute to the write operation.
+     */
+    H5Pset_dxpl_mpio(dxpl_id, H5FD_MPIO_COLLECTIVE);
+
+    /*
+     * --------------------------------
+     * Create and write to the dataset
+     * --------------------------------
+     */
+
+    /*
+     * Write to a dataset in a fashion where no
+     * chunks in the dataset are written to by
+     * more than 1 MPI rank and some MPI ranks
+     * have nothing to contribute to the dataset.
+     * In this case, the MPI ranks that have no
+     * data to contribute must still participate
+     * in the collective H5Dwrite call, but should
+     * call H5Sselect_none on the file dataspace
+     * passed to the H5Dwrite call.
+     */
+    write_dataset_some_no_sel(file_id, dxpl_id);
+
+    /*
+     * ------------------
+     * Close all HDF5 IDs
+     * ------------------
+     */
+
+    H5Pclose(dxpl_id);
+    H5Pclose(fapl_id);
+    H5Fclose(file_id);
+
+    printf("PHDF5 example finished with no errors\n");
+
+    /*
+     * ------------------------------------
+     * Cleanup created HDF5 file and finish
+     * ------------------------------------
+     */
+
+    cleanup(filename);
+
+    MPI_Finalize();
+
+    return 0;
+}
+
+#else
+
+int
+main(void)
+{
+    printf("HDF5 not configured with parallel support or parallel filtered writes are disabled!\n");
+    return 0;
+}
+
+#endif
diff --git a/examples/ph5_subfiling.c b/examples/ph5_subfiling.c
new file mode 100644
index 0000000..7d72448
--- /dev/null
+++ b/examples/ph5_subfiling.c
@@ -0,0 +1,551 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/*
+ * Example of using HDF5's Subfiling VFD to write to an
+ * HDF5 file that is striped across multiple subfiles
+ *
+ * If the HDF5_NOCLEANUP environment variable is set, the
+ * files that this example creates will not be removed as
+ * the example finishes.
+ *
+ * In general, the current working directory in which compiling
+ * is done, is not suitable for parallel I/O and there is no
+ * standard pathname for parallel file systems. In some cases,
+ * the parallel file name may even need some parallel file type
+ * prefix such as: "pfs:/GF/...".  Therefore, this example parses
+ * the HDF5_PARAPREFIX environment variable for a prefix, if one
+ * is needed.
+ */
+
+#include <stdlib.h>
+
+#include "hdf5.h"
+
+#if defined(H5_HAVE_PARALLEL) && defined(H5_HAVE_SUBFILING_VFD)
+
+#define EXAMPLE_FILE  "h5_subfiling_default_example.h5"
+#define EXAMPLE_FILE2 "h5_subfiling_custom_example.h5"
+#define EXAMPLE_FILE3 "h5_subfiling_precreate_example.h5"
+
+#define EXAMPLE_DSET_NAME "DSET"
+#define EXAMPLE_DSET_DIMS 2
+
+/* Have each MPI rank write 16MiB of data */
+#define EXAMPLE_DSET_NY 4194304
+
+/* Dataset datatype */
+#define EXAMPLE_DSET_DATATYPE H5T_NATIVE_INT
+typedef int EXAMPLE_DSET_C_DATATYPE;
+
+/* Cleanup created files */
+static void
+cleanup(char *filename, hid_t fapl_id)
+{
+    hbool_t do_cleanup = getenv(HDF5_NOCLEANUP) ? 0 : 1;
+
+    if (do_cleanup)
+        H5Fdelete(filename, fapl_id);
+}
+
+/*
+ * An example of using the HDF5 Subfiling VFD with
+ * its default settings of 1 subfile per node, with
+ * a stripe size of 32MiB
+ */
+static void
+subfiling_write_default(hid_t fapl_id, int mpi_size, int mpi_rank)
+{
+    EXAMPLE_DSET_C_DATATYPE *data;
+    hsize_t                  dset_dims[EXAMPLE_DSET_DIMS];
+    hsize_t                  start[EXAMPLE_DSET_DIMS];
+    hsize_t                  count[EXAMPLE_DSET_DIMS];
+    hid_t                    file_id;
+    hid_t                    subfiling_fapl;
+    hid_t                    dset_id;
+    hid_t                    filespace;
+    char                     filename[512];
+    char                    *par_prefix;
+
+    /*
+     * Make a copy of the FAPL so we don't disturb
+     * it for the other examples
+     */
+    subfiling_fapl = H5Pcopy(fapl_id);
+
+    /*
+     * Set Subfiling VFD on FAPL using default settings
+     * (use IOC VFD, 1 IOC per node, 32MiB stripe size)
+     *
+     * Note that all of Subfiling's configuration settings
+     * can be adjusted with environment variables as well
+     * in this case.
+     */
+    H5Pset_fapl_subfiling(subfiling_fapl, NULL);
+
+    /*
+     * OPTIONAL: Set alignment of objects in HDF5 file to
+     *           be equal to the Subfiling stripe size.
+     *           Choosing a Subfiling stripe size and HDF5
+     *           object alignment value that are some
+     *           multiple of the disk block size can
+     *           generally help performance by ensuring
+     *           that I/O is well-aligned and doesn't
+     *           excessively cross stripe boundaries.
+     *
+     *           Note that this option can substantially
+     *           increase the size of the resulting HDF5
+     *           files, so it is a good idea to keep an eye
+     *           on this.
+     */
+    H5Pset_alignment(subfiling_fapl, 0, 33554432); /* Align to default 32MiB stripe size */
+
+    /* Parse any parallel prefix and create filename */
+    par_prefix = getenv("HDF5_PARAPREFIX");
+
+    snprintf(filename, sizeof(filename), "%s%s%s", par_prefix ? par_prefix : "", par_prefix ? "/" : "",
+             EXAMPLE_FILE);
+
+    /*
+     * Create a new file collectively
+     */
+    file_id = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, subfiling_fapl);
+
+    /*
+     * Create the dataspace for the dataset. The first
+     * dimension varies with the number of MPI ranks
+     * while the second dimension is fixed.
+     */
+    dset_dims[0] = mpi_size;
+    dset_dims[1] = EXAMPLE_DSET_NY;
+    filespace    = H5Screate_simple(EXAMPLE_DSET_DIMS, dset_dims, NULL);
+
+    /*
+     * Create the dataset with default properties
+     */
+    dset_id = H5Dcreate2(file_id, EXAMPLE_DSET_NAME, EXAMPLE_DSET_DATATYPE, filespace, H5P_DEFAULT,
+                         H5P_DEFAULT, H5P_DEFAULT);
+
+    /*
+     * Each MPI rank writes from a contiguous memory
+     * region to the hyperslab in the file
+     */
+    start[0] = mpi_rank;
+    start[1] = 0;
+    count[0] = 1;
+    count[1] = dset_dims[1];
+    H5Sselect_hyperslab(filespace, H5S_SELECT_SET, start, NULL, count, NULL);
+
+    /*
+     * Initialize data buffer
+     */
+    data = malloc(count[0] * count[1] * sizeof(EXAMPLE_DSET_C_DATATYPE));
+    for (size_t i = 0; i < count[0] * count[1]; i++) {
+        data[i] = mpi_rank + i;
+    }
+
+    /*
+     * Write to dataset
+     */
+    H5Dwrite(dset_id, EXAMPLE_DSET_DATATYPE, H5S_BLOCK, filespace, H5P_DEFAULT, data);
+
+    /*
+     * Close/release resources.
+     */
+
+    free(data);
+
+    H5Dclose(dset_id);
+    H5Sclose(filespace);
+    H5Fclose(file_id);
+
+    cleanup(EXAMPLE_FILE, subfiling_fapl);
+
+    H5Pclose(subfiling_fapl);
+}
+
+/*
+ * An example of using the HDF5 Subfiling VFD with
+ * custom settings
+ */
+static void
+subfiling_write_custom(hid_t fapl_id, int mpi_size, int mpi_rank)
+{
+    EXAMPLE_DSET_C_DATATYPE *data;
+    H5FD_subfiling_config_t  subf_config;
+    H5FD_ioc_config_t        ioc_config;
+    hsize_t                  dset_dims[EXAMPLE_DSET_DIMS];
+    hsize_t                  start[EXAMPLE_DSET_DIMS];
+    hsize_t                  count[EXAMPLE_DSET_DIMS];
+    hid_t                    file_id;
+    hid_t                    subfiling_fapl;
+    hid_t                    dset_id;
+    hid_t                    filespace;
+    char                     filename[512];
+    char                    *par_prefix;
+
+    /*
+     * Make a copy of the FAPL so we don't disturb
+     * it for the other examples
+     */
+    subfiling_fapl = H5Pcopy(fapl_id);
+
+    /*
+     * Get a default Subfiling and IOC configuration
+     */
+    H5Pget_fapl_subfiling(subfiling_fapl, &subf_config);
+    H5Pget_fapl_ioc(subfiling_fapl, &ioc_config);
+
+    /*
+     * Set Subfiling configuration to use a 1MiB
+     * stripe size and the SELECT_IOC_EVERY_NTH_RANK
+     * selection method. By default, without a setting
+     * in the H5FD_SUBFILING_IOC_SELECTION_CRITERIA
+     * environment variable, this will use every MPI
+     * rank as an I/O concentrator.
+     */
+    subf_config.shared_cfg.stripe_size   = 1048576;
+    subf_config.shared_cfg.ioc_selection = SELECT_IOC_EVERY_NTH_RANK;
+
+    /*
+     * Set IOC configuration to use 2 worker threads
+     * per IOC instead of the default setting and
+     * update IOC configuration with new subfiling
+     * configuration.
+     */
+    ioc_config.thread_pool_size = 2;
+
+    /*
+     * Set our new configuration on the IOC
+     * FAPL used for Subfiling
+     */
+    H5Pset_fapl_ioc(subf_config.ioc_fapl_id, &ioc_config);
+
+    /*
+     * Finally, set our new Subfiling configuration
+     * on the original FAPL
+     */
+    H5Pset_fapl_subfiling(subfiling_fapl, &subf_config);
+
+    /*
+     * OPTIONAL: Set alignment of objects in HDF5 file to
+     *           be equal to the Subfiling stripe size.
+     *           Choosing a Subfiling stripe size and HDF5
+     *           object alignment value that are some
+     *           multiple of the disk block size can
+     *           generally help performance by ensuring
+     *           that I/O is well-aligned and doesn't
+     *           excessively cross stripe boundaries.
+     *
+     *           Note that this option can substantially
+     *           increase the size of the resulting HDF5
+     *           files, so it is a good idea to keep an eye
+     *           on this.
+     */
+    H5Pset_alignment(subfiling_fapl, 0, 1048576); /* Align to custom 1MiB stripe size */
+
+    /* Parse any parallel prefix and create filename */
+    par_prefix = getenv("HDF5_PARAPREFIX");
+
+    snprintf(filename, sizeof(filename), "%s%s%s", par_prefix ? par_prefix : "", par_prefix ? "/" : "",
+             EXAMPLE_FILE2);
+
+    /*
+     * Create a new file collectively
+     */
+    file_id = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, subfiling_fapl);
+
+    /*
+     * Create the dataspace for the dataset. The first
+     * dimension varies with the number of MPI ranks
+     * while the second dimension is fixed.
+     */
+    dset_dims[0] = mpi_size;
+    dset_dims[1] = EXAMPLE_DSET_NY;
+    filespace    = H5Screate_simple(EXAMPLE_DSET_DIMS, dset_dims, NULL);
+
+    /*
+     * Create the dataset with default properties
+     */
+    dset_id = H5Dcreate2(file_id, EXAMPLE_DSET_NAME, EXAMPLE_DSET_DATATYPE, filespace, H5P_DEFAULT,
+                         H5P_DEFAULT, H5P_DEFAULT);
+
+    /*
+     * Each MPI rank writes from a contiguous memory
+     * region to the hyperslab in the file
+     */
+    start[0] = mpi_rank;
+    start[1] = 0;
+    count[0] = 1;
+    count[1] = dset_dims[1];
+    H5Sselect_hyperslab(filespace, H5S_SELECT_SET, start, NULL, count, NULL);
+
+    /*
+     * Initialize data buffer
+     */
+    data = malloc(count[0] * count[1] * sizeof(EXAMPLE_DSET_C_DATATYPE));
+    for (size_t i = 0; i < count[0] * count[1]; i++) {
+        data[i] = mpi_rank + i;
+    }
+
+    /*
+     * Write to dataset
+     */
+    H5Dwrite(dset_id, EXAMPLE_DSET_DATATYPE, H5S_BLOCK, filespace, H5P_DEFAULT, data);
+
+    /*
+     * Close/release resources.
+     */
+
+    free(data);
+
+    H5Dclose(dset_id);
+    H5Sclose(filespace);
+    H5Fclose(file_id);
+
+    cleanup(EXAMPLE_FILE2, subfiling_fapl);
+
+    H5Pclose(subfiling_fapl);
+}
+
+/*
+ * An example of pre-creating an HDF5 file on MPI rank
+ * 0 when using the HDF5 Subfiling VFD. In this case,
+ * the subfiling stripe count must be set so that rank
+ * 0 knows how many subfiles to pre-create.
+ */
+static void
+subfiling_write_precreate(hid_t fapl_id, int mpi_size, int mpi_rank)
+{
+    EXAMPLE_DSET_C_DATATYPE *data;
+    H5FD_subfiling_config_t  subf_config;
+    hsize_t                  dset_dims[EXAMPLE_DSET_DIMS];
+    hsize_t                  start[EXAMPLE_DSET_DIMS];
+    hsize_t                  count[EXAMPLE_DSET_DIMS];
+    hid_t                    file_id;
+    hid_t                    subfiling_fapl;
+    hid_t                    dset_id;
+    hid_t                    filespace;
+    char                     filename[512];
+    char                    *par_prefix;
+
+    /*
+     * Make a copy of the FAPL so we don't disturb
+     * it for the other examples
+     */
+    subfiling_fapl = H5Pcopy(fapl_id);
+
+    /*
+     * Get a default Subfiling and IOC configuration
+     */
+    H5Pget_fapl_subfiling(subfiling_fapl, &subf_config);
+
+    /*
+     * Set the Subfiling stripe count so that rank
+     * 0 knows how many subfiles the logical HDF5
+     * file should consist of. In this case, use
+     * 5 subfiles with a default stripe size of
+     * 32MiB.
+     */
+    subf_config.shared_cfg.stripe_count = 5;
+
+    /*
+     * OPTIONAL: Set alignment of objects in HDF5 file to
+     *           be equal to the Subfiling stripe size.
+     *           Choosing a Subfiling stripe size and HDF5
+     *           object alignment value that are some
+     *           multiple of the disk block size can
+     *           generally help performance by ensuring
+     *           that I/O is well-aligned and doesn't
+     *           excessively cross stripe boundaries.
+     *
+     *           Note that this option can substantially
+     *           increase the size of the resulting HDF5
+     *           files, so it is a good idea to keep an eye
+     *           on this.
+     */
+    H5Pset_alignment(subfiling_fapl, 0, 1048576); /* Align to custom 1MiB stripe size */
+
+    /* Parse any parallel prefix and create filename */
+    par_prefix = getenv("HDF5_PARAPREFIX");
+
+    snprintf(filename, sizeof(filename), "%s%s%s", par_prefix ? par_prefix : "", par_prefix ? "/" : "",
+             EXAMPLE_FILE3);
+
+    /* Set dataset dimensionality */
+    dset_dims[0] = mpi_size;
+    dset_dims[1] = EXAMPLE_DSET_NY;
+
+    if (mpi_rank == 0) {
+        /*
+         * Make sure only this rank opens the file
+         */
+        H5Pset_mpi_params(subfiling_fapl, MPI_COMM_SELF, MPI_INFO_NULL);
+
+        /*
+         * Set the Subfiling VFD on our FAPL using
+         * our custom configuration
+         */
+        H5Pset_fapl_subfiling(subfiling_fapl, &subf_config);
+
+        /*
+         * Create a new file on rank 0
+         */
+        file_id = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, subfiling_fapl);
+
+        /*
+         * Create the dataspace for the dataset. The first
+         * dimension varies with the number of MPI ranks
+         * while the second dimension is fixed.
+         */
+        filespace = H5Screate_simple(EXAMPLE_DSET_DIMS, dset_dims, NULL);
+
+        /*
+         * Create the dataset with default properties
+         */
+        dset_id = H5Dcreate2(file_id, EXAMPLE_DSET_NAME, EXAMPLE_DSET_DATATYPE, filespace, H5P_DEFAULT,
+                             H5P_DEFAULT, H5P_DEFAULT);
+
+        /*
+         * Initialize data buffer
+         */
+        data = malloc(dset_dims[0] * dset_dims[1] * sizeof(EXAMPLE_DSET_C_DATATYPE));
+        for (size_t i = 0; i < dset_dims[0] * dset_dims[1]; i++) {
+            data[i] = i;
+        }
+
+        /*
+         * Rank 0 writes to the whole dataset
+         */
+        H5Dwrite(dset_id, EXAMPLE_DSET_DATATYPE, H5S_BLOCK, filespace, H5P_DEFAULT, data);
+
+        /*
+         * Close/release resources.
+         */
+
+        free(data);
+
+        H5Dclose(dset_id);
+        H5Sclose(filespace);
+        H5Fclose(file_id);
+    }
+
+    MPI_Barrier(MPI_COMM_WORLD);
+
+    /*
+     * Use all MPI ranks to re-open the file and
+     * read back the dataset that was created
+     */
+    H5Pset_mpi_params(subfiling_fapl, MPI_COMM_WORLD, MPI_INFO_NULL);
+
+    /*
+     * Use the same subfiling configuration as rank 0
+     * used to create the file
+     */
+    H5Pset_fapl_subfiling(subfiling_fapl, &subf_config);
+
+    /*
+     * Re-open the file on all ranks
+     */
+    file_id = H5Fopen(filename, H5F_ACC_RDONLY, subfiling_fapl);
+
+    /*
+     * Open the dataset that was created
+     */
+    dset_id = H5Dopen2(file_id, EXAMPLE_DSET_NAME, H5P_DEFAULT);
+
+    /*
+     * Initialize data buffer
+     */
+    data = malloc(dset_dims[0] * dset_dims[1] * sizeof(EXAMPLE_DSET_C_DATATYPE));
+
+    /*
+     * Read the dataset on all ranks
+     */
+    H5Dread(dset_id, EXAMPLE_DSET_DATATYPE, H5S_BLOCK, H5S_ALL, H5P_DEFAULT, data);
+
+    /*
+     * Close/release resources.
+     */
+
+    free(data);
+
+    H5Dclose(dset_id);
+    H5Fclose(file_id);
+
+    cleanup(EXAMPLE_FILE3, subfiling_fapl);
+
+    H5Pclose(subfiling_fapl);
+}
+
+int
+main(int argc, char **argv)
+{
+    MPI_Comm comm = MPI_COMM_WORLD;
+    MPI_Info info = MPI_INFO_NULL;
+    hid_t    fapl_id;
+    int      mpi_size;
+    int      mpi_rank;
+    int      mpi_thread_required = MPI_THREAD_MULTIPLE;
+    int      mpi_thread_provided = 0;
+
+    /* HDF5 Subfiling VFD requires MPI_Init_thread with MPI_THREAD_MULTIPLE */
+    MPI_Init_thread(&argc, &argv, mpi_thread_required, &mpi_thread_provided);
+    if (mpi_thread_provided < mpi_thread_required) {
+        printf("MPI_THREAD_MULTIPLE not supported\n");
+        MPI_Abort(comm, -1);
+    }
+
+    MPI_Comm_size(comm, &mpi_size);
+    MPI_Comm_rank(comm, &mpi_rank);
+
+    /*
+     * Set up File Access Property List with MPI
+     * parameters for the Subfiling VFD to use
+     */
+    fapl_id = H5Pcreate(H5P_FILE_ACCESS);
+    H5Pset_mpi_params(fapl_id, comm, info);
+
+    /* Use Subfiling VFD with default settings */
+    subfiling_write_default(fapl_id, mpi_size, mpi_rank);
+
+    /* Use Subfiling VFD with custom settings */
+    subfiling_write_custom(fapl_id, mpi_size, mpi_rank);
+
+    /*
+     * Use Subfiling VFD to precreate the HDF5
+     * file on MPI rank 0
+     */
+    subfiling_write_precreate(fapl_id, mpi_size, mpi_rank);
+
+    H5Pclose(fapl_id);
+
+    if (mpi_rank == 0)
+        printf("PHDF5 example finished with no errors\n");
+
+    MPI_Finalize();
+
+    return 0;
+}
+
+#else
+
+/* dummy program since HDF5 is not parallel-enabled */
+int
+main(void)
+{
+    printf(
+        "Example program cannot run - HDF5 must be built with parallel support and Subfiling VFD support\n");
+    return 0;
+}
+
+#endif /* H5_HAVE_PARALLEL && H5_HAVE_SUBFILING_VFD */
diff --git a/examples/ph5example.c b/examples/ph5example.c
index 7a41db2..e0fc644 100644
--- a/examples/ph5example.c
+++ b/examples/ph5example.c
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
@@ -32,7 +29,7 @@
  * for parallel I/O and there is no standard pathname for parallel file
  * systems.  In some cases, the parallel file name may even needs some
  * parallel file type prefix such as: "pfs:/GF/...".  Therefore, this
- * example requires an explicite parallel file prefix.  See the usage
+ * example requires an explicit parallel file prefix.  See the usage
  * for more detail.
  */
 
@@ -48,69 +45,73 @@
 
 /* Define some handy debugging shorthands, routines, ... */
 /* debugging tools */
-#define MESG(x)\
-	if (verbose) printf("%s\n", x);\
-
-#define MPI_BANNER(mesg)\
-    {printf("--------------------------------\n");\
-    printf("Proc %d: ", mpi_rank); \
-    printf("*** %s\n", mesg);\
-    printf("--------------------------------\n");}
+#define MESG(x)                                                                                              \
+    if (verbose)                                                                                             \
+        printf("%s\n", x);
+
+#define MPI_BANNER(mesg)                                                                                     \
+    {                                                                                                        \
+        printf("--------------------------------\n");                                                        \
+        printf("Proc %d: ", mpi_rank);                                                                       \
+        printf("*** %s\n", mesg);                                                                            \
+        printf("--------------------------------\n");                                                        \
+    }
 
-#define SYNC(comm)\
-    {MPI_BANNER("doing a SYNC"); MPI_Barrier(comm); MPI_BANNER("SYNC DONE");}
+#define SYNC(comm)                                                                                           \
+    {                                                                                                        \
+        MPI_BANNER("doing a SYNC");                                                                          \
+        MPI_Barrier(comm);                                                                                   \
+        MPI_BANNER("SYNC DONE");                                                                             \
+    }
 /* End of Define some handy debugging shorthands, routines, ... */
 
 /* Constants definitions */
 /* 24 is a multiple of 2, 3, 4, 6, 8, 12.  Neat for parallel tests. */
-#define SPACE1_DIM1	24
-#define SPACE1_DIM2	24
-#define SPACE1_RANK	2
-#define DATASETNAME1	"Data1"
-#define DATASETNAME2	"Data2"
-#define DATASETNAME3	"Data3"
+#define SPACE1_DIM1  24
+#define SPACE1_DIM2  24
+#define SPACE1_RANK  2
+#define DATASETNAME1 "Data1"
+#define DATASETNAME2 "Data2"
+#define DATASETNAME3 "Data3"
 /* hyperslab layout styles */
-#define BYROW		1	/* divide into slabs of rows */
-#define BYCOL		2	/* divide into blocks of columns */
-
-#define PARAPREFIX	"HDF5_PARAPREFIX"	/* file prefix environment variable name */
+#define BYROW 1 /* divide into slabs of rows */
+#define BYCOL 2 /* divide into blocks of columns */
 
+#define PARAPREFIX "HDF5_PARAPREFIX" /* file prefix environment variable name */
 
 /* dataset data type.  Int's can be easily octo dumped. */
 typedef int DATATYPE;
 
 /* global variables */
-int nerrors = 0;				/* errors count */
+int nerrors = 0; /* errors count */
 #ifndef PATH_MAX
-#define PATH_MAX    512
-#endif  /* !PATH_MAX */
-char    testfiles[2][PATH_MAX];
+#define PATH_MAX 512
+#endif /* !PATH_MAX */
+char testfiles[2][PATH_MAX];
 
-
-int mpi_size, mpi_rank;				/* mpi variables */
+int mpi_size, mpi_rank; /* mpi variables */
 
 /* option flags */
-int verbose = 0;			/* verbose, default as no. */
-int doread=1;				/* read test */
-int dowrite=1;				/* write test */
-int docleanup=1;			/* cleanup */
+int verbose   = 0; /* verbose, default as no. */
+int doread    = 1; /* read test */
+int dowrite   = 1; /* write test */
+int docleanup = 1; /* cleanup */
 
 /* Prototypes */
 void slab_set(hsize_t start[], hsize_t count[], hsize_t stride[], int mode);
-void dataset_fill(hsize_t start[], hsize_t count[], hsize_t stride[], DATATYPE * dataset);
-void dataset_print(hsize_t start[], hsize_t count[], hsize_t stride[], DATATYPE * dataset);
-int dataset_vrfy(hsize_t start[], hsize_t count[], hsize_t stride[], DATATYPE *dataset, DATATYPE *original);
+void dataset_fill(hsize_t start[], hsize_t count[], hsize_t stride[], DATATYPE *dataset);
+void dataset_print(hsize_t start[], hsize_t count[], hsize_t stride[], DATATYPE *dataset);
+int  dataset_vrfy(hsize_t start[], hsize_t count[], hsize_t stride[], DATATYPE *dataset, DATATYPE *original);
 void phdf5writeInd(char *filename);
 void phdf5readInd(char *filename);
 void phdf5writeAll(char *filename);
 void phdf5readAll(char *filename);
 void test_split_comm_access(char filenames[][PATH_MAX]);
-int parse_options(int argc, char **argv);
+int  parse_options(int argc, char **argv);
 void usage(void);
-int mkfilenames(char *prefix);
+int  mkfilenames(char *prefix);
 void cleanup(void);
 
-
 /*
  * Setup the dimensions of the hyperslab.
  * Two modes--by rows or by columns.
@@ -119,113 +120,110 @@ void cleanup(void);
 void
 slab_set(hsize_t start[], hsize_t count[], hsize_t stride[], int mode)
 {
-    switch (mode){
-    case BYROW:
-	/* Each process takes a slabs of rows. */
-	stride[0] = 1;
-	stride[1] = 1;
-	count[0] = SPACE1_DIM1/mpi_size;
-	count[1] = SPACE1_DIM2;
-	start[0] = mpi_rank*count[0];
-	start[1] = 0;
-	break;
-    case BYCOL:
-	/* Each process takes a block of columns. */
-	stride[0] = 1;
-	stride[1] = 1;
-	count[0] = SPACE1_DIM1;
-	count[1] = SPACE1_DIM2/mpi_size;
-	start[0] = 0;
-	start[1] = mpi_rank*count[1];
-	break;
-    default:
-	/* Unknown mode.  Set it to cover the whole dataset. */
-	printf("unknown slab_set mode (%d)\n", mode);
-	stride[0] = 1;
-	stride[1] = 1;
-	count[0] = SPACE1_DIM1;
-	count[1] = SPACE1_DIM2;
-	start[0] = 0;
-	start[1] = 0;
-	break;
+    switch (mode) {
+        case BYROW:
+            /* Each process takes a slabs of rows. */
+            stride[0] = 1;
+            stride[1] = 1;
+            count[0]  = SPACE1_DIM1 / mpi_size;
+            count[1]  = SPACE1_DIM2;
+            start[0]  = mpi_rank * count[0];
+            start[1]  = 0;
+            break;
+        case BYCOL:
+            /* Each process takes a block of columns. */
+            stride[0] = 1;
+            stride[1] = 1;
+            count[0]  = SPACE1_DIM1;
+            count[1]  = SPACE1_DIM2 / mpi_size;
+            start[0]  = 0;
+            start[1]  = mpi_rank * count[1];
+            break;
+        default:
+            /* Unknown mode.  Set it to cover the whole dataset. */
+            printf("unknown slab_set mode (%d)\n", mode);
+            stride[0] = 1;
+            stride[1] = 1;
+            count[0]  = SPACE1_DIM1;
+            count[1]  = SPACE1_DIM2;
+            start[0]  = 0;
+            start[1]  = 0;
+            break;
     }
 }
 
-
 /*
  * Fill the dataset with trivial data for testing.
  * Assume dimension rank is 2 and data is stored contiguous.
  */
 void
-dataset_fill(hsize_t start[], hsize_t count[], hsize_t stride[], DATATYPE * dataset)
+dataset_fill(hsize_t start[], hsize_t count[], hsize_t stride[], DATATYPE *dataset)
 {
     DATATYPE *dataptr = dataset;
-    hsize_t i, j;
+    hsize_t   i, j;
 
     /* put some trivial data in the data_array */
-    for (i=0; i < count[0]; i++){
-	for (j=0; j < count[1]; j++){
-	    *dataptr++ = (i*stride[0]+start[0])*100 + (j*stride[1]+start[1]+1);
-	}
+    for (i = 0; i < count[0]; i++) {
+        for (j = 0; j < count[1]; j++) {
+            *dataptr++ = (i * stride[0] + start[0]) * 100 + (j * stride[1] + start[1] + 1);
+        }
     }
 }
 
-
 /*
  * Print the content of the dataset.
  */
-void dataset_print(hsize_t start[], hsize_t count[], hsize_t stride[], DATATYPE * dataset)
+void
+dataset_print(hsize_t start[], hsize_t count[], hsize_t stride[], DATATYPE *dataset)
 {
     DATATYPE *dataptr = dataset;
-    hsize_t i, j;
+    hsize_t   i, j;
 
     /* print the slab read */
-    for (i=0; i < count[0]; i++){
-	printf("Row %lu: ", (unsigned long)(i*stride[0]+start[0]));
-	for (j=0; j < count[1]; j++){
-	    printf("%03d ", *dataptr++);
-	}
-	printf("\n");
+    for (i = 0; i < count[0]; i++) {
+        printf("Row %lu: ", (unsigned long)(i * stride[0] + start[0]));
+        for (j = 0; j < count[1]; j++) {
+            printf("%03d ", *dataptr++);
+        }
+        printf("\n");
     }
 }
 
-
 /*
  * Print the content of the dataset.
  */
-int dataset_vrfy(hsize_t start[], hsize_t count[], hsize_t stride[], DATATYPE *dataset, DATATYPE *original)
+int
+dataset_vrfy(hsize_t start[], hsize_t count[], hsize_t stride[], DATATYPE *dataset, DATATYPE *original)
 {
-#define MAX_ERR_REPORT	10		/* Maximum number of errors reported */
+#define MAX_ERR_REPORT 10 /* Maximum number of errors reported */
 
     hsize_t i, j;
-    int nerr;
+    int     nerr;
 
     /* print it if verbose */
     if (verbose)
-	dataset_print(start, count, stride, dataset);
+        dataset_print(start, count, stride, dataset);
 
     nerr = 0;
-    for (i=0; i < count[0]; i++){
-	for (j=0; j < count[1]; j++){
-	    if (*dataset++ != *original++){
-		nerr++;
-		if (nerr <= MAX_ERR_REPORT){
-		    printf("Dataset Verify failed at [%lu][%lu](row %lu, col %lu): expect %d, got %d\n",
-			(unsigned long)i, (unsigned long)j,
-			(unsigned long)(i*stride[0]+start[0]), (unsigned long)(j*stride[1]+start[1]),
-			*(dataset-1), *(original-1));
-		}
-	    }
-	}
+    for (i = 0; i < count[0]; i++) {
+        for (j = 0; j < count[1]; j++) {
+            if (*dataset++ != *original++) {
+                nerr++;
+                if (nerr <= MAX_ERR_REPORT) {
+                    printf("Dataset Verify failed at [%lu][%lu](row %lu, col %lu): expect %d, got %d\n",
+                           (unsigned long)i, (unsigned long)j, (unsigned long)(i * stride[0] + start[0]),
+                           (unsigned long)(j * stride[1] + start[1]), *(dataset - 1), *(original - 1));
+                }
+            }
+        }
     }
     if (nerr > MAX_ERR_REPORT)
-	printf("[more errors ...]\n");
+        printf("[more errors ...]\n");
     if (nerr)
-	printf("%d errors found in dataset_vrfy\n", nerr);
-    return(nerr);
+        printf("%d errors found in dataset_vrfy\n", nerr);
+    return (nerr);
 }
 
-
 /*
  * Example of using the parallel HDF5 library to create two datasets
  * in one HDF5 files with parallel MPIO access support.
@@ -237,32 +235,31 @@ int dataset_vrfy(hsize_t start[], hsize_t count[], hsize_t stride[], DATATYPE *d
 void
 phdf5writeInd(char *filename)
 {
-    hid_t fid1;			/* HDF5 file IDs */
-    hid_t acc_tpl1;		/* File access templates */
-    hid_t sid1;   		/* Dataspace ID */
-    hid_t file_dataspace;	/* File dataspace ID */
-    hid_t mem_dataspace;	/* memory dataspace ID */
-    hid_t dataset1, dataset2;	/* Dataset ID */
-    hsize_t dims1[SPACE1_RANK] =
-	{SPACE1_DIM1,SPACE1_DIM2};	/* dataspace dim sizes */
-    DATATYPE data_array1[SPACE1_DIM1][SPACE1_DIM2];	/* data buffer */
+    hid_t    fid1;                                            /* HDF5 file IDs */
+    hid_t    acc_tpl1;                                        /* File access templates */
+    hid_t    sid1;                                            /* Dataspace ID */
+    hid_t    file_dataspace;                                  /* File dataspace ID */
+    hid_t    mem_dataspace;                                   /* memory dataspace ID */
+    hid_t    dataset1, dataset2;                              /* Dataset ID */
+    hsize_t  dims1[SPACE1_RANK] = {SPACE1_DIM1, SPACE1_DIM2}; /* dataspace dim sizes */
+    DATATYPE data_array1[SPACE1_DIM1][SPACE1_DIM2];           /* data buffer */
 
-    hsize_t start[SPACE1_RANK];			/* for hyperslab setting */
-    hsize_t count[SPACE1_RANK], stride[SPACE1_RANK];	/* for hyperslab setting */
+    hsize_t start[SPACE1_RANK];                      /* for hyperslab setting */
+    hsize_t count[SPACE1_RANK], stride[SPACE1_RANK]; /* for hyperslab setting */
 
-    herr_t ret;         	/* Generic return value */
+    herr_t ret; /* Generic return value */
 
     MPI_Comm comm = MPI_COMM_WORLD;
     MPI_Info info = MPI_INFO_NULL;
 
     if (verbose)
-	printf("Independent write test on file %s\n", filename);
+        printf("Independent write test on file %s\n", filename);
 
     /* -------------------
      * START AN HDF5 FILE
      * -------------------*/
     /* setup file access template with parallel IO access. */
-    acc_tpl1 = H5Pcreate (H5P_FILE_ACCESS);
+    acc_tpl1 = H5Pcreate(H5P_FILE_ACCESS);
     assert(acc_tpl1 != FAIL);
     MESG("H5Pcreate access succeed");
     /* set Parallel access with communicator */
@@ -279,70 +276,60 @@ phdf5writeInd(char *filename)
     ret = H5Pclose(acc_tpl1);
     assert(ret != FAIL);
 
-
     /* --------------------------
      * Define the dimensions of the overall datasets
      * and the slabs local to the MPI process.
      * ------------------------- */
     /* setup dimensionality object */
     sid1 = H5Screate_simple(SPACE1_RANK, dims1, NULL);
-    assert (sid1 != FAIL);
+    assert(sid1 != FAIL);
     MESG("H5Screate_simple succeed");
 
-
     /* create a dataset collectively */
-    dataset1 = H5Dcreate2(fid1, DATASETNAME1, H5T_NATIVE_INT, sid1,
-			H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    dataset1 = H5Dcreate2(fid1, DATASETNAME1, H5T_NATIVE_INT, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     assert(dataset1 != FAIL);
     MESG("H5Dcreate2 succeed");
 
     /* create another dataset collectively */
-    dataset2 = H5Dcreate2(fid1, DATASETNAME2, H5T_NATIVE_INT, sid1,
-			H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    dataset2 = H5Dcreate2(fid1, DATASETNAME2, H5T_NATIVE_INT, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     assert(dataset2 != FAIL);
     MESG("H5Dcreate2 succeed");
 
-
-
     /* set up dimensions of the slab this process accesses */
-    start[0] = mpi_rank*SPACE1_DIM1/mpi_size;
-    start[1] = 0;
-    count[0] = SPACE1_DIM1/mpi_size;
-    count[1] = SPACE1_DIM2;
+    start[0]  = mpi_rank * SPACE1_DIM1 / mpi_size;
+    start[1]  = 0;
+    count[0]  = SPACE1_DIM1 / mpi_size;
+    count[1]  = SPACE1_DIM2;
     stride[0] = 1;
-    stride[1] =1;
-if (verbose)
-    printf("start[]=(%lu,%lu), count[]=(%lu,%lu), total datapoints=%lu\n",
-	(unsigned long)start[0], (unsigned long)start[1],
-        (unsigned long)count[0], (unsigned long)count[1],
-        (unsigned long)(count[0]*count[1]));
+    stride[1] = 1;
+    if (verbose)
+        printf("start[]=(%lu,%lu), count[]=(%lu,%lu), total datapoints=%lu\n", (unsigned long)start[0],
+               (unsigned long)start[1], (unsigned long)count[0], (unsigned long)count[1],
+               (unsigned long)(count[0] * count[1]));
 
     /* put some trivial data in the data_array */
     dataset_fill(start, count, stride, &data_array1[0][0]);
     MESG("data_array initialized");
 
     /* create a file dataspace independently */
-    file_dataspace = H5Dget_space (dataset1);
+    file_dataspace = H5Dget_space(dataset1);
     assert(file_dataspace != FAIL);
     MESG("H5Dget_space succeed");
-    ret=H5Sselect_hyperslab(file_dataspace, H5S_SELECT_SET, start, stride,
-	    count, NULL);
+    ret = H5Sselect_hyperslab(file_dataspace, H5S_SELECT_SET, start, stride, count, NULL);
     assert(ret != FAIL);
     MESG("H5Sset_hyperslab succeed");
 
     /* create a memory dataspace independently */
-    mem_dataspace = H5Screate_simple (SPACE1_RANK, count, NULL);
-    assert (mem_dataspace != FAIL);
+    mem_dataspace = H5Screate_simple(SPACE1_RANK, count, NULL);
+    assert(mem_dataspace != FAIL);
 
     /* write data independently */
-    ret = H5Dwrite(dataset1, H5T_NATIVE_INT, mem_dataspace, file_dataspace,
-	    H5P_DEFAULT, data_array1);
+    ret = H5Dwrite(dataset1, H5T_NATIVE_INT, mem_dataspace, file_dataspace, H5P_DEFAULT, data_array1);
     assert(ret != FAIL);
     MESG("H5Dwrite succeed");
 
     /* write data independently */
-    ret = H5Dwrite(dataset2, H5T_NATIVE_INT, mem_dataspace, file_dataspace,
-	    H5P_DEFAULT, data_array1);
+    ret = H5Dwrite(dataset2, H5T_NATIVE_INT, mem_dataspace, file_dataspace, H5P_DEFAULT, data_array1);
     assert(ret != FAIL);
     MESG("H5Dwrite succeed");
 
@@ -350,10 +337,10 @@ if (verbose)
     H5Sclose(file_dataspace);
 
     /* close dataset collectively */
-    ret=H5Dclose(dataset1);
+    ret = H5Dclose(dataset1);
     assert(ret != FAIL);
     MESG("H5Dclose1 succeed");
-    ret=H5Dclose(dataset2);
+    ret = H5Dclose(dataset2);
     assert(ret != FAIL);
     MESG("H5Dclose2 succeed");
 
@@ -368,39 +355,38 @@ if (verbose)
 void
 phdf5readInd(char *filename)
 {
-    hid_t fid1;			/* HDF5 file IDs */
-    hid_t acc_tpl1;		/* File access templates */
-    hid_t file_dataspace;	/* File dataspace ID */
-    hid_t mem_dataspace;	/* memory dataspace ID */
-    hid_t dataset1, dataset2;	/* Dataset ID */
-    DATATYPE data_array1[SPACE1_DIM1][SPACE1_DIM2];	/* data buffer */
-    DATATYPE data_origin1[SPACE1_DIM1][SPACE1_DIM2];	/* expected data buffer */
+    hid_t    fid1;                                   /* HDF5 file IDs */
+    hid_t    acc_tpl1;                               /* File access templates */
+    hid_t    file_dataspace;                         /* File dataspace ID */
+    hid_t    mem_dataspace;                          /* memory dataspace ID */
+    hid_t    dataset1, dataset2;                     /* Dataset ID */
+    DATATYPE data_array1[SPACE1_DIM1][SPACE1_DIM2];  /* data buffer */
+    DATATYPE data_origin1[SPACE1_DIM1][SPACE1_DIM2]; /* expected data buffer */
 
-    hsize_t start[SPACE1_RANK];			/* for hyperslab setting */
-    hsize_t count[SPACE1_RANK], stride[SPACE1_RANK];	/* for hyperslab setting */
+    hsize_t start[SPACE1_RANK];                      /* for hyperslab setting */
+    hsize_t count[SPACE1_RANK], stride[SPACE1_RANK]; /* for hyperslab setting */
 
-    herr_t ret;         	/* Generic return value */
+    herr_t ret; /* Generic return value */
 
     MPI_Comm comm = MPI_COMM_WORLD;
     MPI_Info info = MPI_INFO_NULL;
 
     if (verbose)
-	printf("Independent read test on file %s\n", filename);
+        printf("Independent read test on file %s\n", filename);
 
     /* setup file access template */
-    acc_tpl1 = H5Pcreate (H5P_FILE_ACCESS);
+    acc_tpl1 = H5Pcreate(H5P_FILE_ACCESS);
     assert(acc_tpl1 != FAIL);
     /* set Parallel access with communicator */
     ret = H5Pset_fapl_mpio(acc_tpl1, comm, info);
     assert(ret != FAIL);
 
-
     /* open the file collectively */
-    fid1=H5Fopen(filename,H5F_ACC_RDWR,acc_tpl1);
+    fid1 = H5Fopen(filename, H5F_ACC_RDWR, acc_tpl1);
     assert(fid1 != FAIL);
 
     /* Release file-access template */
-    ret=H5Pclose(acc_tpl1);
+    ret = H5Pclose(acc_tpl1);
     assert(ret != FAIL);
 
     /* open the dataset1 collectively */
@@ -411,37 +397,33 @@ phdf5readInd(char *filename)
     dataset2 = H5Dopen2(fid1, DATASETNAME1, H5P_DEFAULT);
     assert(dataset2 != FAIL);
 
-
     /* set up dimensions of the slab this process accesses */
-    start[0] = mpi_rank*SPACE1_DIM1/mpi_size;
-    start[1] = 0;
-    count[0] = SPACE1_DIM1/mpi_size;
-    count[1] = SPACE1_DIM2;
+    start[0]  = mpi_rank * SPACE1_DIM1 / mpi_size;
+    start[1]  = 0;
+    count[0]  = SPACE1_DIM1 / mpi_size;
+    count[1]  = SPACE1_DIM2;
     stride[0] = 1;
-    stride[1] =1;
-if (verbose)
-    printf("start[]=(%lu,%lu), count[]=(%lu,%lu), total datapoints=%lu\n",
-        (unsigned long)start[0], (unsigned long)start[1],
-        (unsigned long)count[0], (unsigned long)count[1],
-        (unsigned long)(count[0]*count[1]));
+    stride[1] = 1;
+    if (verbose)
+        printf("start[]=(%lu,%lu), count[]=(%lu,%lu), total datapoints=%lu\n", (unsigned long)start[0],
+               (unsigned long)start[1], (unsigned long)count[0], (unsigned long)count[1],
+               (unsigned long)(count[0] * count[1]));
 
     /* create a file dataspace independently */
-    file_dataspace = H5Dget_space (dataset1);
+    file_dataspace = H5Dget_space(dataset1);
     assert(file_dataspace != FAIL);
-    ret=H5Sselect_hyperslab(file_dataspace, H5S_SELECT_SET, start, stride,
-	    count, NULL);
+    ret = H5Sselect_hyperslab(file_dataspace, H5S_SELECT_SET, start, stride, count, NULL);
     assert(ret != FAIL);
 
     /* create a memory dataspace independently */
-    mem_dataspace = H5Screate_simple (SPACE1_RANK, count, NULL);
-    assert (mem_dataspace != FAIL);
+    mem_dataspace = H5Screate_simple(SPACE1_RANK, count, NULL);
+    assert(mem_dataspace != FAIL);
 
     /* fill dataset with test data */
     dataset_fill(start, count, stride, &data_origin1[0][0]);
 
     /* read data independently */
-    ret = H5Dread(dataset1, H5T_NATIVE_INT, mem_dataspace, file_dataspace,
-	    H5P_DEFAULT, data_array1);
+    ret = H5Dread(dataset1, H5T_NATIVE_INT, mem_dataspace, file_dataspace, H5P_DEFAULT, data_array1);
     assert(ret != FAIL);
 
     /* verify the read data with original expected data */
@@ -449,8 +431,7 @@ if (verbose)
     assert(ret != FAIL);
 
     /* read data independently */
-    ret = H5Dread(dataset2, H5T_NATIVE_INT, mem_dataspace, file_dataspace,
-	    H5P_DEFAULT, data_array1);
+    ret = H5Dread(dataset2, H5T_NATIVE_INT, mem_dataspace, file_dataspace, H5P_DEFAULT, data_array1);
     assert(ret != FAIL);
 
     /* verify the read data with original expected data */
@@ -458,9 +439,9 @@ if (verbose)
     assert(ret == 0);
 
     /* close dataset collectively */
-    ret=H5Dclose(dataset1);
+    ret = H5Dclose(dataset1);
     assert(ret != FAIL);
-    ret=H5Dclose(dataset2);
+    ret = H5Dclose(dataset2);
     assert(ret != FAIL);
 
     /* release all IDs created */
@@ -470,7 +451,6 @@ if (verbose)
     H5Fclose(fid1);
 }
 
-
 /*
  * Example of using the parallel HDF5 library to create two datasets
  * in one HDF5 file with collective parallel access support.
@@ -483,33 +463,32 @@ if (verbose)
 void
 phdf5writeAll(char *filename)
 {
-    hid_t fid1;			/* HDF5 file IDs */
-    hid_t acc_tpl1;		/* File access templates */
-    hid_t xfer_plist;		/* Dataset transfer properties list */
-    hid_t sid1;   		/* Dataspace ID */
-    hid_t file_dataspace;	/* File dataspace ID */
-    hid_t mem_dataspace;	/* memory dataspace ID */
-    hid_t dataset1, dataset2;	/* Dataset ID */
-    hsize_t dims1[SPACE1_RANK] =
-	{SPACE1_DIM1,SPACE1_DIM2};	/* dataspace dim sizes */
-    DATATYPE data_array1[SPACE1_DIM1][SPACE1_DIM2];	/* data buffer */
-
-    hsize_t start[SPACE1_RANK];			/* for hyperslab setting */
-    hsize_t count[SPACE1_RANK], stride[SPACE1_RANK];	/* for hyperslab setting */
-
-    herr_t ret;         	/* Generic return value */
+    hid_t    fid1;                                            /* HDF5 file IDs */
+    hid_t    acc_tpl1;                                        /* File access templates */
+    hid_t    xfer_plist;                                      /* Dataset transfer properties list */
+    hid_t    sid1;                                            /* Dataspace ID */
+    hid_t    file_dataspace;                                  /* File dataspace ID */
+    hid_t    mem_dataspace;                                   /* memory dataspace ID */
+    hid_t    dataset1, dataset2;                              /* Dataset ID */
+    hsize_t  dims1[SPACE1_RANK] = {SPACE1_DIM1, SPACE1_DIM2}; /* dataspace dim sizes */
+    DATATYPE data_array1[SPACE1_DIM1][SPACE1_DIM2];           /* data buffer */
+
+    hsize_t start[SPACE1_RANK];                      /* for hyperslab setting */
+    hsize_t count[SPACE1_RANK], stride[SPACE1_RANK]; /* for hyperslab setting */
+
+    herr_t ret; /* Generic return value */
 
     MPI_Comm comm = MPI_COMM_WORLD;
     MPI_Info info = MPI_INFO_NULL;
 
     if (verbose)
-	printf("Collective write test on file %s\n", filename);
+        printf("Collective write test on file %s\n", filename);
 
     /* -------------------
      * START AN HDF5 FILE
      * -------------------*/
     /* setup file access template with parallel IO access. */
-    acc_tpl1 = H5Pcreate (H5P_FILE_ACCESS);
+    acc_tpl1 = H5Pcreate(H5P_FILE_ACCESS);
     assert(acc_tpl1 != FAIL);
     MESG("H5Pcreate access succeed");
     /* set Parallel access with communicator */
@@ -518,25 +497,23 @@ phdf5writeAll(char *filename)
     MESG("H5Pset_fapl_mpio succeed");
 
     /* create the file collectively */
-    fid1=H5Fcreate(filename,H5F_ACC_TRUNC,H5P_DEFAULT,acc_tpl1);
+    fid1 = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, acc_tpl1);
     assert(fid1 != FAIL);
     MESG("H5Fcreate succeed");
 
     /* Release file-access template */
-    ret=H5Pclose(acc_tpl1);
+    ret = H5Pclose(acc_tpl1);
     assert(ret != FAIL);
 
-
     /* --------------------------
      * Define the dimensions of the overall datasets
      * and create the dataset
      * ------------------------- */
     /* setup dimensionality object */
-    sid1 = H5Screate_simple (SPACE1_RANK, dims1, NULL);
-    assert (sid1 != FAIL);
+    sid1 = H5Screate_simple(SPACE1_RANK, dims1, NULL);
+    assert(sid1 != FAIL);
     MESG("H5Screate_simple succeed");
 
-
     /* create a dataset collectively */
     dataset1 = H5Dcreate2(fid1, DATASETNAME1, H5T_NATIVE_INT, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     assert(dataset1 != FAIL);
@@ -553,43 +530,40 @@ phdf5writeAll(char *filename)
 
     /* Dataset1: each process takes a block of rows. */
     slab_set(start, count, stride, BYROW);
-if (verbose)
-    printf("start[]=(%lu,%lu), count[]=(%lu,%lu), total datapoints=%lu\n",
-	(unsigned long)start[0], (unsigned long)start[1],
-        (unsigned long)count[0], (unsigned long)count[1],
-        (unsigned long)(count[0]*count[1]));
+    if (verbose)
+        printf("start[]=(%lu,%lu), count[]=(%lu,%lu), total datapoints=%lu\n", (unsigned long)start[0],
+               (unsigned long)start[1], (unsigned long)count[0], (unsigned long)count[1],
+               (unsigned long)(count[0] * count[1]));
 
     /* create a file dataspace independently */
-    file_dataspace = H5Dget_space (dataset1);
+    file_dataspace = H5Dget_space(dataset1);
     assert(file_dataspace != FAIL);
     MESG("H5Dget_space succeed");
-    ret=H5Sselect_hyperslab(file_dataspace, H5S_SELECT_SET, start, stride,
-	    count, NULL);
+    ret = H5Sselect_hyperslab(file_dataspace, H5S_SELECT_SET, start, stride, count, NULL);
     assert(ret != FAIL);
     MESG("H5Sset_hyperslab succeed");
 
     /* create a memory dataspace independently */
-    mem_dataspace = H5Screate_simple (SPACE1_RANK, count, NULL);
-    assert (mem_dataspace != FAIL);
+    mem_dataspace = H5Screate_simple(SPACE1_RANK, count, NULL);
+    assert(mem_dataspace != FAIL);
 
     /* fill the local slab with some trivial data */
     dataset_fill(start, count, stride, &data_array1[0][0]);
     MESG("data_array initialized");
-    if (verbose){
-	MESG("data_array created");
-	dataset_print(start, count, stride, &data_array1[0][0]);
+    if (verbose) {
+        MESG("data_array created");
+        dataset_print(start, count, stride, &data_array1[0][0]);
     }
 
     /* set up the collective transfer properties list */
-    xfer_plist = H5Pcreate (H5P_DATASET_XFER);
+    xfer_plist = H5Pcreate(H5P_DATASET_XFER);
     assert(xfer_plist != FAIL);
-    ret=H5Pset_dxpl_mpio(xfer_plist, H5FD_MPIO_COLLECTIVE);
+    ret = H5Pset_dxpl_mpio(xfer_plist, H5FD_MPIO_COLLECTIVE);
     assert(ret != FAIL);
     MESG("H5Pcreate xfer succeed");
 
     /* write data collectively */
-    ret = H5Dwrite(dataset1, H5T_NATIVE_INT, mem_dataspace, file_dataspace,
-	    xfer_plist, data_array1);
+    ret = H5Dwrite(dataset1, H5T_NATIVE_INT, mem_dataspace, file_dataspace, xfer_plist, data_array1);
     assert(ret != FAIL);
     MESG("H5Dwrite succeed");
 
@@ -602,51 +576,48 @@ if (verbose)
 
     /* Dataset2: each process takes a block of columns. */
     slab_set(start, count, stride, BYCOL);
-if (verbose)
-    printf("start[]=(%lu,%lu), count[]=(%lu,%lu), total datapoints=%lu\n",
-	(unsigned long)start[0], (unsigned long)start[1],
-        (unsigned long)count[0], (unsigned long)count[1],
-        (unsigned long)(count[0]*count[1]));
+    if (verbose)
+        printf("start[]=(%lu,%lu), count[]=(%lu,%lu), total datapoints=%lu\n", (unsigned long)start[0],
+               (unsigned long)start[1], (unsigned long)count[0], (unsigned long)count[1],
+               (unsigned long)(count[0] * count[1]));
 
     /* put some trivial data in the data_array */
     dataset_fill(start, count, stride, &data_array1[0][0]);
     MESG("data_array initialized");
-    if (verbose){
-	MESG("data_array created");
-	dataset_print(start, count, stride, &data_array1[0][0]);
+    if (verbose) {
+        MESG("data_array created");
+        dataset_print(start, count, stride, &data_array1[0][0]);
     }
 
     /* create a file dataspace independently */
-    file_dataspace = H5Dget_space (dataset1);
+    file_dataspace = H5Dget_space(dataset1);
     assert(file_dataspace != FAIL);
     MESG("H5Dget_space succeed");
-    ret=H5Sselect_hyperslab(file_dataspace, H5S_SELECT_SET, start, stride,
-	    count, NULL);
+    ret = H5Sselect_hyperslab(file_dataspace, H5S_SELECT_SET, start, stride, count, NULL);
     assert(ret != FAIL);
     MESG("H5Sset_hyperslab succeed");
 
     /* create a memory dataspace independently */
-    mem_dataspace = H5Screate_simple (SPACE1_RANK, count, NULL);
-    assert (mem_dataspace != FAIL);
+    mem_dataspace = H5Screate_simple(SPACE1_RANK, count, NULL);
+    assert(mem_dataspace != FAIL);
 
     /* fill the local slab with some trivial data */
     dataset_fill(start, count, stride, &data_array1[0][0]);
     MESG("data_array initialized");
-    if (verbose){
-	MESG("data_array created");
-	dataset_print(start, count, stride, &data_array1[0][0]);
+    if (verbose) {
+        MESG("data_array created");
+        dataset_print(start, count, stride, &data_array1[0][0]);
     }
 
     /* set up the collective transfer properties list */
-    xfer_plist = H5Pcreate (H5P_DATASET_XFER);
+    xfer_plist = H5Pcreate(H5P_DATASET_XFER);
     assert(xfer_plist != FAIL);
-    ret=H5Pset_dxpl_mpio(xfer_plist, H5FD_MPIO_COLLECTIVE);
+    ret = H5Pset_dxpl_mpio(xfer_plist, H5FD_MPIO_COLLECTIVE);
     assert(ret != FAIL);
     MESG("H5Pcreate xfer succeed");
 
     /* write data independently */
-    ret = H5Dwrite(dataset2, H5T_NATIVE_INT, mem_dataspace, file_dataspace,
-	    xfer_plist, data_array1);
+    ret = H5Dwrite(dataset2, H5T_NATIVE_INT, mem_dataspace, file_dataspace, xfer_plist, data_array1);
     assert(ret != FAIL);
     MESG("H5Dwrite succeed");
 
@@ -655,14 +626,13 @@ if (verbose)
     H5Sclose(mem_dataspace);
     H5Pclose(xfer_plist);
 
-
     /*
      * All writes completed.  Close datasets collectively
      */
-    ret=H5Dclose(dataset1);
+    ret = H5Dclose(dataset1);
     assert(ret != FAIL);
     MESG("H5Dclose1 succeed");
-    ret=H5Dclose(dataset2);
+    ret = H5Dclose(dataset2);
     assert(ret != FAIL);
     MESG("H5Dclose2 succeed");
 
@@ -685,31 +655,31 @@ if (verbose)
 void
 phdf5readAll(char *filename)
 {
-    hid_t fid1;			/* HDF5 file IDs */
-    hid_t acc_tpl1;		/* File access templates */
-    hid_t xfer_plist;		/* Dataset transfer properties list */
-    hid_t file_dataspace;	/* File dataspace ID */
-    hid_t mem_dataspace;	/* memory dataspace ID */
-    hid_t dataset1, dataset2;	/* Dataset ID */
-    DATATYPE data_array1[SPACE1_DIM1][SPACE1_DIM2];	/* data buffer */
-    DATATYPE data_origin1[SPACE1_DIM1][SPACE1_DIM2];	/* expected data buffer */
+    hid_t    fid1;                                   /* HDF5 file IDs */
+    hid_t    acc_tpl1;                               /* File access templates */
+    hid_t    xfer_plist;                             /* Dataset transfer properties list */
+    hid_t    file_dataspace;                         /* File dataspace ID */
+    hid_t    mem_dataspace;                          /* memory dataspace ID */
+    hid_t    dataset1, dataset2;                     /* Dataset ID */
+    DATATYPE data_array1[SPACE1_DIM1][SPACE1_DIM2];  /* data buffer */
+    DATATYPE data_origin1[SPACE1_DIM1][SPACE1_DIM2]; /* expected data buffer */
 
-    hsize_t start[SPACE1_RANK];			/* for hyperslab setting */
-    hsize_t count[SPACE1_RANK], stride[SPACE1_RANK];	/* for hyperslab setting */
+    hsize_t start[SPACE1_RANK];                      /* for hyperslab setting */
+    hsize_t count[SPACE1_RANK], stride[SPACE1_RANK]; /* for hyperslab setting */
 
-    herr_t ret;         	/* Generic return value */
+    herr_t ret; /* Generic return value */
 
     MPI_Comm comm = MPI_COMM_WORLD;
     MPI_Info info = MPI_INFO_NULL;
 
     if (verbose)
-	printf("Collective read test on file %s\n", filename);
+        printf("Collective read test on file %s\n", filename);
 
     /* -------------------
      * OPEN AN HDF5 FILE
      * -------------------*/
     /* setup file access template with parallel IO access. */
-    acc_tpl1 = H5Pcreate (H5P_FILE_ACCESS);
+    acc_tpl1 = H5Pcreate(H5P_FILE_ACCESS);
     assert(acc_tpl1 != FAIL);
     MESG("H5Pcreate access succeed");
     /* set Parallel access with communicator */
@@ -718,15 +688,14 @@ phdf5readAll(char *filename)
     MESG("H5Pset_fapl_mpio succeed");
 
     /* open the file collectively */
-    fid1=H5Fopen(filename,H5F_ACC_RDWR,acc_tpl1);
+    fid1 = H5Fopen(filename, H5F_ACC_RDWR, acc_tpl1);
     assert(fid1 != FAIL);
     MESG("H5Fopen succeed");
 
     /* Release file-access template */
-    ret=H5Pclose(acc_tpl1);
+    ret = H5Pclose(acc_tpl1);
     assert(ret != FAIL);
 
-
     /* --------------------------
      * Open the datasets in it
      * ------------------------- */
@@ -746,43 +715,40 @@ phdf5readAll(char *filename)
 
     /* Dataset1: each process takes a block of columns. */
     slab_set(start, count, stride, BYCOL);
-if (verbose)
-    printf("start[]=(%lu,%lu), count[]=(%lu,%lu), total datapoints=%lu\n",
-	(unsigned long)start[0], (unsigned long)start[1],
-        (unsigned long)count[0], (unsigned long)count[1],
-        (unsigned long)(count[0]*count[1]));
+    if (verbose)
+        printf("start[]=(%lu,%lu), count[]=(%lu,%lu), total datapoints=%lu\n", (unsigned long)start[0],
+               (unsigned long)start[1], (unsigned long)count[0], (unsigned long)count[1],
+               (unsigned long)(count[0] * count[1]));
 
     /* create a file dataspace independently */
-    file_dataspace = H5Dget_space (dataset1);
+    file_dataspace = H5Dget_space(dataset1);
     assert(file_dataspace != FAIL);
     MESG("H5Dget_space succeed");
-    ret=H5Sselect_hyperslab(file_dataspace, H5S_SELECT_SET, start, stride,
-	    count, NULL);
+    ret = H5Sselect_hyperslab(file_dataspace, H5S_SELECT_SET, start, stride, count, NULL);
     assert(ret != FAIL);
     MESG("H5Sset_hyperslab succeed");
 
     /* create a memory dataspace independently */
-    mem_dataspace = H5Screate_simple (SPACE1_RANK, count, NULL);
-    assert (mem_dataspace != FAIL);
+    mem_dataspace = H5Screate_simple(SPACE1_RANK, count, NULL);
+    assert(mem_dataspace != FAIL);
 
     /* fill dataset with test data */
     dataset_fill(start, count, stride, &data_origin1[0][0]);
     MESG("data_array initialized");
-    if (verbose){
-	MESG("data_array created");
-	dataset_print(start, count, stride, &data_array1[0][0]);
+    if (verbose) {
+        MESG("data_array created");
+        dataset_print(start, count, stride, &data_array1[0][0]);
     }
 
     /* set up the collective transfer properties list */
-    xfer_plist = H5Pcreate (H5P_DATASET_XFER);
+    xfer_plist = H5Pcreate(H5P_DATASET_XFER);
     assert(xfer_plist != FAIL);
-    ret=H5Pset_dxpl_mpio(xfer_plist, H5FD_MPIO_COLLECTIVE);
+    ret = H5Pset_dxpl_mpio(xfer_plist, H5FD_MPIO_COLLECTIVE);
     assert(ret != FAIL);
     MESG("H5Pcreate xfer succeed");
 
     /* read data collectively */
-    ret = H5Dread(dataset1, H5T_NATIVE_INT, mem_dataspace, file_dataspace,
-	    xfer_plist, data_array1);
+    ret = H5Dread(dataset1, H5T_NATIVE_INT, mem_dataspace, file_dataspace, xfer_plist, data_array1);
     assert(ret != FAIL);
     MESG("H5Dread succeed");
 
@@ -799,43 +765,40 @@ if (verbose)
 
     /* Dataset2: each process takes a block of rows. */
     slab_set(start, count, stride, BYROW);
-if (verbose)
-    printf("start[]=(%lu,%lu), count[]=(%lu,%lu), total datapoints=%lu\n",
-	(unsigned long)start[0], (unsigned long)start[1],
-        (unsigned long)count[0], (unsigned long)count[1],
-        (unsigned long)(count[0]*count[1]));
+    if (verbose)
+        printf("start[]=(%lu,%lu), count[]=(%lu,%lu), total datapoints=%lu\n", (unsigned long)start[0],
+               (unsigned long)start[1], (unsigned long)count[0], (unsigned long)count[1],
+               (unsigned long)(count[0] * count[1]));
 
     /* create a file dataspace independently */
-    file_dataspace = H5Dget_space (dataset1);
+    file_dataspace = H5Dget_space(dataset1);
     assert(file_dataspace != FAIL);
     MESG("H5Dget_space succeed");
-    ret=H5Sselect_hyperslab(file_dataspace, H5S_SELECT_SET, start, stride,
-	    count, NULL);
+    ret = H5Sselect_hyperslab(file_dataspace, H5S_SELECT_SET, start, stride, count, NULL);
     assert(ret != FAIL);
     MESG("H5Sset_hyperslab succeed");
 
     /* create a memory dataspace independently */
-    mem_dataspace = H5Screate_simple (SPACE1_RANK, count, NULL);
-    assert (mem_dataspace != FAIL);
+    mem_dataspace = H5Screate_simple(SPACE1_RANK, count, NULL);
+    assert(mem_dataspace != FAIL);
 
     /* fill dataset with test data */
     dataset_fill(start, count, stride, &data_origin1[0][0]);
     MESG("data_array initialized");
-    if (verbose){
-	MESG("data_array created");
-	dataset_print(start, count, stride, &data_array1[0][0]);
+    if (verbose) {
+        MESG("data_array created");
+        dataset_print(start, count, stride, &data_array1[0][0]);
     }
 
     /* set up the collective transfer properties list */
-    xfer_plist = H5Pcreate (H5P_DATASET_XFER);
+    xfer_plist = H5Pcreate(H5P_DATASET_XFER);
     assert(xfer_plist != FAIL);
-    ret=H5Pset_dxpl_mpio(xfer_plist, H5FD_MPIO_COLLECTIVE);
+    ret = H5Pset_dxpl_mpio(xfer_plist, H5FD_MPIO_COLLECTIVE);
     assert(ret != FAIL);
     MESG("H5Pcreate xfer succeed");
 
     /* read data independently */
-    ret = H5Dread(dataset2, H5T_NATIVE_INT, mem_dataspace, file_dataspace,
-	    xfer_plist, data_array1);
+    ret = H5Dread(dataset2, H5T_NATIVE_INT, mem_dataspace, file_dataspace, xfer_plist, data_array1);
     assert(ret != FAIL);
     MESG("H5Dread succeed");
 
@@ -848,14 +811,13 @@ if (verbose)
     H5Sclose(mem_dataspace);
     H5Pclose(xfer_plist);
 
-
     /*
      * All reads completed.  Close datasets collectively
      */
-    ret=H5Dclose(dataset1);
+    ret = H5Dclose(dataset1);
     assert(ret != FAIL);
     MESG("H5Dclose1 succeed");
-    ret=H5Dclose(dataset2);
+    ret = H5Dclose(dataset2);
     assert(ret != FAIL);
     MESG("H5Dclose2 succeed");
 
@@ -879,52 +841,53 @@ test_split_comm_access(char filenames[][PATH_MAX])
 {
     MPI_Comm comm;
     MPI_Info info = MPI_INFO_NULL;
-    int color, mrc;
-    int newrank, newprocs;
-    hid_t fid;			/* file IDs */
-    hid_t acc_tpl;		/* File access properties */
-    herr_t ret;			/* generic return value */
+    int      color, mrc;
+    int      newrank, newprocs;
+    hid_t    fid;     /* file IDs */
+    hid_t    acc_tpl; /* File access properties */
+    herr_t   ret;     /* generic return value */
 
     if (verbose)
-	printf("Independent write test on file %s %s\n",
-	    filenames[0], filenames[1]);
-
-    color = mpi_rank%2;
-    mrc = MPI_Comm_split (MPI_COMM_WORLD, color, mpi_rank, &comm);
-    assert(mrc==MPI_SUCCESS);
-    MPI_Comm_size(comm,&newprocs);
-    MPI_Comm_rank(comm,&newrank);
-
-    if (color){
-	/* odd-rank processes */
-	mrc = MPI_Barrier(comm);
-	assert(mrc==MPI_SUCCESS);
-    }else{
-	/* even-rank processes */
-	/* setup file access template */
-	acc_tpl = H5Pcreate (H5P_FILE_ACCESS);
-	assert(acc_tpl != FAIL);
-
-	/* set Parallel access with communicator */
-	ret = H5Pset_fapl_mpio(acc_tpl, comm, info);
-	assert(ret != FAIL);
-
-	/* create the file collectively */
-	fid=H5Fcreate(filenames[color],H5F_ACC_TRUNC,H5P_DEFAULT,acc_tpl);
-	assert(fid != FAIL);
-	MESG("H5Fcreate succeed");
-
-	/* Release file-access template */
-	ret=H5Pclose(acc_tpl);
-	assert(ret != FAIL);
-
-	ret=H5Fclose(fid);
-	assert(ret != FAIL);
+        printf("Independent write test on file %s %s\n", filenames[0], filenames[1]);
+
+    color = mpi_rank % 2;
+    mrc   = MPI_Comm_split(MPI_COMM_WORLD, color, mpi_rank, &comm);
+    assert(mrc == MPI_SUCCESS);
+    MPI_Comm_size(comm, &newprocs);
+    MPI_Comm_rank(comm, &newrank);
+
+    if (color) {
+        /* odd-rank processes */
+        mrc = MPI_Barrier(comm);
+        assert(mrc == MPI_SUCCESS);
     }
-    if (mpi_rank == 0){
-	mrc = MPI_File_delete(filenames[color], info);
-	assert(mrc==MPI_SUCCESS);
+    else {
+        /* even-rank processes */
+        /* setup file access template */
+        acc_tpl = H5Pcreate(H5P_FILE_ACCESS);
+        assert(acc_tpl != FAIL);
+
+        /* set Parallel access with communicator */
+        ret = H5Pset_fapl_mpio(acc_tpl, comm, info);
+        assert(ret != FAIL);
+
+        /* create the file collectively */
+        fid = H5Fcreate(filenames[color], H5F_ACC_TRUNC, H5P_DEFAULT, acc_tpl);
+        assert(fid != FAIL);
+        MESG("H5Fcreate succeed");
+
+        /* Release file-access template */
+        ret = H5Pclose(acc_tpl);
+        assert(ret != FAIL);
+
+        ret = H5Fclose(fid);
+        assert(ret != FAIL);
     }
+    if (mpi_rank == 0) {
+        mrc = MPI_File_delete(filenames[color], info);
+        assert(mrc == MPI_SUCCESS);
+    }
+    MPI_Comm_free(&comm);
 }
 
 /*
@@ -935,7 +898,7 @@ usage(void)
 {
     printf("Usage: testphdf5 [-f <prefix>] [-r] [-w] [-v]\n");
     printf("\t-f\tfile prefix for parallel test files.\n");
-    printf("\t  \te.g. pfs:/PFS/myname\n");
+    printf("\t  \t e.g. pfs:/PFS/myname\n");
     printf("\t  \tcan be set via $" PARAPREFIX ".\n");
     printf("\t  \tDefault is current directory.\n");
     printf("\t-c\tno cleanup\n");
@@ -946,7 +909,6 @@ usage(void)
     printf("\n");
 }
 
-
 /*
  * compose the test filename with the prefix supplied.
  * return code: 0 if no error
@@ -955,88 +917,93 @@ usage(void)
 int
 mkfilenames(char *prefix)
 {
-    int i, n;
+    int    i, n;
     size_t strsize;
 
     /* filename will be prefix/ParaEgN.h5 where N is 0 to 9. */
     /* So, string must be big enough to hold the prefix, / and 10 more chars */
     /* and the terminating null. */
     strsize = strlen(prefix) + 12;
-    if (strsize > PATH_MAX){
-	printf("File prefix too long;  Use a short path name.\n");
-	return(1);
+    if (strsize > PATH_MAX) {
+        printf("File prefix too long;  Use a short path name.\n");
+        return (1);
     }
-    n = sizeof(testfiles)/sizeof(testfiles[0]);
-    if (n > 9){
-	printf("Warning: Too many entries in testfiles. "
-	    "Need to adjust the code to accommodate the large size.\n");
+    n = sizeof(testfiles) / sizeof(testfiles[0]);
+    if (n > 9) {
+        printf("Warning: Too many entries in testfiles. "
+               "Need to adjust the code to accommodate the large size.\n");
     }
-    for (i=0; i<n; i++){
-	sprintf(testfiles[i], "%s/ParaEg%d.h5", prefix, i);
+    for (i = 0; i < n; i++) {
+        snprintf(testfiles[i], PATH_MAX, "%s/ParaEg%d.h5", prefix, i);
     }
-    return(0);
-
+    return (0);
 }
 
-
 /*
  * parse the command line options
  */
 int
-parse_options(int argc, char **argv){
+parse_options(int argc, char **argv)
+{
     int i, n;
 
     /* initialize testfiles to nulls */
-    n = sizeof(testfiles)/sizeof(testfiles[0]);
-    for (i=0; i<n; i++){
-	testfiles[i][0] = '\0';
+    n = sizeof(testfiles) / sizeof(testfiles[0]);
+    for (i = 0; i < n; i++) {
+        testfiles[i][0] = '\0';
     }
 
-    while (--argc){
-	if (**(++argv) != '-'){
-	    break;
-	}else{
-	    switch(*(*argv+1)){
-		case 'f':   ++argv;
-			    if (--argc < 1){
-				usage();
-				nerrors++;
-				return(1);
-			    }
-			    if (mkfilenames(*argv)){
-				nerrors++;
-				return(1);
-			    }
-			    break;
-		case 'c':   docleanup = 0;	/* no cleanup */
-			    break;
-		case 'r':   doread = 0;
-			    break;
-		case 'w':   dowrite = 0;
-			    break;
-		case 'v':   verbose = 1;
-			    break;
-		default:    usage();
-			    nerrors++;
-			    return(1);
-	    }
-	}
+    while (--argc) {
+        if (**(++argv) != '-') {
+            break;
+        }
+        else {
+            switch (*(*argv + 1)) {
+                case 'f':
+                    ++argv;
+                    if (--argc < 1) {
+                        usage();
+                        nerrors++;
+                        return (1);
+                    }
+                    if (mkfilenames(*argv)) {
+                        nerrors++;
+                        return (1);
+                    }
+                    break;
+                case 'c':
+                    docleanup = 0; /* no cleanup */
+                    break;
+                case 'r':
+                    doread = 0;
+                    break;
+                case 'w':
+                    dowrite = 0;
+                    break;
+                case 'v':
+                    verbose = 1;
+                    break;
+                default:
+                    usage();
+                    nerrors++;
+                    return (1);
+            }
+        }
     }
 
     /* check the file prefix */
-    if (testfiles[0][0] == '\0'){
-	/* try get it from environment variable HDF5_PARAPREFIX */
-	char *env;
-	char *env_default = ".";	/* default to current directory */
-	if ((env=getenv(PARAPREFIX))==NULL){
-	    env = env_default;
-	}
-	mkfilenames(env);
+    if (testfiles[0][0] == '\0') {
+        /* try get it from environment variable HDF5_PARAPREFIX */
+        char *env;
+        char *env_default = "."; /* default to current directory */
+        if ((env = getenv(PARAPREFIX)) == NULL) {
+            env = env_default;
+        }
+        mkfilenames(env);
     }
-    return(0);
+    return (0);
 }
 
-
 /*
  * cleanup test files created
  */
@@ -1045,88 +1012,87 @@ cleanup(void)
 {
     int i, n;
 
-    n = sizeof(testfiles)/sizeof(testfiles[0]);
-    for (i=0; i<n; i++){
-	MPI_File_delete(testfiles[i], MPI_INFO_NULL);
+    n = sizeof(testfiles) / sizeof(testfiles[0]);
+    for (i = 0; i < n; i++) {
+        MPI_File_delete(testfiles[i], MPI_INFO_NULL);
     }
 }
 
-
 /* Main Program */
 int
 main(int argc, char **argv)
 {
-    int mpi_namelen;
+    int  mpi_namelen;
     char mpi_name[MPI_MAX_PROCESSOR_NAME];
-    int i, n;
+    int  i, n;
 
-    MPI_Init(&argc,&argv);
-    MPI_Comm_size(MPI_COMM_WORLD,&mpi_size);
-    MPI_Comm_rank(MPI_COMM_WORLD,&mpi_rank);
-    MPI_Get_processor_name(mpi_name,&mpi_namelen);
+    MPI_Init(&argc, &argv);
+    MPI_Comm_size(MPI_COMM_WORLD, &mpi_size);
+    MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
+    MPI_Get_processor_name(mpi_name, &mpi_namelen);
     /* Make sure datasets can be divided into equal chunks by the processes */
-    if ((SPACE1_DIM1 % mpi_size) || (SPACE1_DIM2 % mpi_size)){
-	printf("DIM1(%d) and DIM2(%d) must be multiples of processes (%d)\n",
-	    SPACE1_DIM1, SPACE1_DIM2, mpi_size);
-	nerrors++;
-	goto finish;
+    if ((SPACE1_DIM1 % mpi_size) || (SPACE1_DIM2 % mpi_size)) {
+        printf("DIM1(%d) and DIM2(%d) must be multiples of processes (%d)\n", SPACE1_DIM1, SPACE1_DIM2,
+               mpi_size);
+        nerrors++;
+        goto finish;
     }
 
     if (parse_options(argc, argv) != 0)
-	goto finish;
+        goto finish;
 
     /* show test file names */
-    if (mpi_rank == 0){
-	n = sizeof(testfiles)/sizeof(testfiles[0]);
-	printf("Parallel test files are:\n");
-	for (i=0; i<n; i++){
-	    printf("   %s\n", testfiles[i]);
-	}
+    if (mpi_rank == 0) {
+        n = sizeof(testfiles) / sizeof(testfiles[0]);
+        printf("Parallel test files are:\n");
+        for (i = 0; i < n; i++) {
+            printf("   %s\n", testfiles[i]);
+        }
     }
 
-    if (dowrite){
-	MPI_BANNER("testing PHDF5 dataset using split communicators...");
-	test_split_comm_access(testfiles);
-	MPI_BANNER("testing PHDF5 dataset independent write...");
-	phdf5writeInd(testfiles[0]);
-	MPI_BANNER("testing PHDF5 dataset collective write...");
-	phdf5writeAll(testfiles[1]);
+    if (dowrite) {
+        MPI_BANNER("testing PHDF5 dataset using split communicators...");
+        test_split_comm_access(testfiles);
+        MPI_BANNER("testing PHDF5 dataset independent write...");
+        phdf5writeInd(testfiles[0]);
+        MPI_BANNER("testing PHDF5 dataset collective write...");
+        phdf5writeAll(testfiles[1]);
     }
-    if (doread){
-	MPI_BANNER("testing PHDF5 dataset independent read...");
-	phdf5readInd(testfiles[0]);
-	MPI_BANNER("testing PHDF5 dataset collective read...");
-	phdf5readAll(testfiles[1]);
+    if (doread) {
+        MPI_BANNER("testing PHDF5 dataset independent read...");
+        phdf5readInd(testfiles[0]);
+        MPI_BANNER("testing PHDF5 dataset collective read...");
+        phdf5readAll(testfiles[1]);
     }
 
-    if (!(dowrite || doread)){
-	usage();
-	nerrors++;
+    if (!(dowrite || doread)) {
+        usage();
+        nerrors++;
     }
 
 finish:
-    if (mpi_rank == 0){		/* only process 0 reports */
-	if (nerrors)
-	    printf("***PHDF5 tests detected %d errors***\n", nerrors);
-	else{
-	    printf("===================================\n");
-	    printf("PHDF5 tests finished with no errors\n");
-	    printf("===================================\n");
-	}
+    if (mpi_rank == 0) { /* only process 0 reports */
+        if (nerrors)
+            printf("***PHDF5 example detected %d errors***\n", nerrors);
+        else {
+            printf("=====================================\n");
+            printf("PHDF5 example finished with no errors\n");
+            printf("=====================================\n");
+        }
     }
     if (docleanup)
-	cleanup();
+        cleanup();
     MPI_Finalize();
 
-    return(nerrors);
+    return (nerrors);
 }
 
-#else /* H5_HAVE_PARALLEL */
+#else  /* H5_HAVE_PARALLEL */
 /* dummy program since H5_HAVE_PARALLE is not configured in */
 int
 main(void)
 {
-printf("No PHDF5 example because parallel is not configured in\n");
-return(0);
+    printf("No PHDF5 example because parallel is not configured in\n");
+    return (0);
 }
 #endif /* H5_HAVE_PARALLEL */
diff --git a/examples/run-all-ex.sh b/examples/run-all-ex.sh
index 4ff2c55..afd4308 100755
--- a/examples/run-all-ex.sh
+++ b/examples/run-all-ex.sh
@@ -5,12 +5,10 @@
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 
 #
 #  This file:  run-hl-ex.sh
diff --git a/examples/run-c-ex.sh.in b/examples/run-c-ex.sh.in
index 9b2a2bb..aae1d34 100644
--- a/examples/run-c-ex.sh.in
+++ b/examples/run-c-ex.sh.in
@@ -5,12 +5,10 @@
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 
 #
 #  This file:  run-c-ex.sh
@@ -20,7 +18,7 @@
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 #                                                                               #
 # This script will compile and run the c examples from source files installed   #
-# in .../share/hdf5_examples/c using h5cc or h5pc.  The order for running       #
+# in @examplesdir@/c using h5cc or h5pc.  The order for running                 #
 # programs with RunTest in the MAIN section below is taken from the Makefile.   #
 # The order is important since some of the test programs use data files created #
 # by earlier test programs.  Any future additions should be placed accordingly. #
@@ -30,10 +28,33 @@
 # Initializations
 EXIT_SUCCESS=0
 EXIT_FAILURE=1
- 
+
+#
+# Try to derive the path to the installation $prefix established
+# by ./configure relative to the examples directory established by
+# ./configure.  If successful, set `prefix_relto_examplesdir` to the
+# relative path.  Otherwise, set `prefix_relto_examplesdir` to the
+# absolute installation $prefix.
+#
+# This script uses the value of `prefix` in the user's environment, if
+# it is set, below.  The content of $() is evaluated in a sub-shell, so
+# if `prefix` is set in the user's environment, the shell statements in
+# $() won't clobbered it.
+#
+prefix_relto_examplesdir=$(
+prefix=@prefix@
+examplesdir=@examplesdir@
+if [ ${examplesdir##${prefix}/} != ${examplesdir} ]; then
+	echo $(echo ${examplesdir##${prefix}/} | \
+	    sed 's,[^/][^/]*,..,g')
+else
+	echo $prefix
+fi
+)
+
 # Where the tool is installed.
-# default is relative path to installed location of the tools 
-prefix="${prefix:-../../../}"
+# default is relative path to installed location of the tools
+prefix="${prefix:-../${prefix_relto_examplesdir}}"
 PARALLEL=@PARALLEL@             # Am I in parallel mode?
 AR="@AR@"
 RANLIB="@RANLIB@"
@@ -114,18 +135,43 @@ then
         rm h5_attribute &&\
         RunTest h5_mount &&\
         rm h5_mount &&\
-        RunTest h5_reference &&\
-        rm h5_reference &&\
+        RunTest h5_reference_deprec &&\
+        rm h5_reference_deprec &&\
+        RunTest h5_ref_extern &&\
+        rm h5_ref_extern &&\
+        RunTest h5_ref_compat &&\
+        rm h5_ref_compat &&\
         RunTest h5_drivers &&\
         rm h5_drivers &&\
-        RunTest h5_ref2reg &&\
-        rm h5_ref2reg &&\
+        RunTest h5_ref2reg_deprec &&\
+        rm h5_ref2reg_deprec &&\
         RunTest h5_extlink &&\
         rm h5_extlink &&\
         RunTest h5_elink_unix2win &&\
         rm h5_elink_unix2win &&\
+        OLD_DEBUG_STRING=$HDF5_DEBUG &&\
+        export HDF5_DEBUG="+all +trace +ttimes" &&\
+        RunTest h5_debug_trace &&\
+        HDF5_DEBUG=$OLD_DEBUG_STRING &&\
+        rm h5_debug_trace &&\
         RunTest h5_shared_mesg &&\
-        rm h5_shared_mesg); then
+        rm h5_shared_mesg &&\
+        RunTest h5_vds-eiger &&\
+        rm h5_vds-eiger &&\
+        RunTest h5_vds-exclim &&\
+        rm h5_vds-exclim &&\
+        RunTest h5_vds-exc &&\
+        rm h5_vds-exc &&\
+        RunTest h5_vds-simpleIO &&\
+        rm h5_vds-simpleIO &&\
+        RunTest h5_vds-percival &&\
+        rm h5_vds-percival &&\
+        RunTest h5_vds-percival-unlim &&\
+        rm h5_vds-percival-unlim &&\
+        RunTest h5_vds-percival-unlim-maxmin&&\
+        rm h5_vds-percival-unlim-maxmin &&\
+        RunTest h5_vds &&\
+        rm h5_vds); then
         EXIT_VALUE=${EXIT_SUCCESS}
     else
         EXIT_VALUE=${EXIT_FAILURE}
@@ -138,5 +184,5 @@ rm *.h5
 rm -rf red blue u2w
 echo
 
-exit $EXIT_VALUE 
+exit $EXIT_VALUE
 
diff --git a/examples/testh5cc.sh.in b/examples/testh5cc.sh.in
index d3f1cfc..3eb8949 100644
--- a/examples/testh5cc.sh.in
+++ b/examples/testh5cc.sh.in
@@ -1,17 +1,14 @@
 #! /bin/sh
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 #
 # Tests for the h5cc compiler tool
 # Created: Albert Cheng, 2007/4/11
@@ -50,6 +47,11 @@ verbose=${HDF5_VERBOSE:-1}      # 0: none; 1: default; 2: chatty; 3: everything
 test $verbose -gt 2 && set -x
 H5_NO_DEPRECATED_SYMBOLS=`grep '#define H5_NO_DEPRECATED_SYMBOLS ' ../src/H5pubconf.h`
 H5_USE_16_API_DEFAULT=`grep '#define H5_USE_16_API_DEFAULT ' ../src/H5pubconf.h`
+H5_USE_18_API_DEFAULT=`grep '#define H5_USE_18_API_DEFAULT ' ../src/H5pubconf.h`
+H5_USE_110_API_DEFAULT=`grep '#define H5_USE_110_API_DEFAULT ' ../src/H5pubconf.h`
+H5_USE_112_API_DEFAULT=`grep '#define H5_USE_112_API_DEFAULT ' ../src/H5pubconf.h`
+H5_USE_114_API_DEFAULT=`grep '#define H5_USE_114_API_DEFAULT ' ../src/H5pubconf.h`
+H5_USE_116_API_DEFAULT=`grep '#define H5_USE_116_API_DEFAULT ' ../src/H5pubconf.h`
 
 # setup my machine information.
 myos=`uname -s`
@@ -63,6 +65,12 @@ v16main=${H5TOOL}_v16main.$suffix
 v16main_o=${H5TOOL}_v16main.o
 v18main=${H5TOOL}_v18main.$suffix
 v18main_o=${H5TOOL}_v18main.o
+v110main=${H5TOOL}_v110main.$suffix
+v110main_o=${H5TOOL}_v110main.o
+v112main=${H5TOOL}_v112main.$suffix
+v112main_o=${H5TOOL}_v112main.o
+v114main=${H5TOOL}_v114main.$suffix
+v114main_o=${H5TOOL}_v114main.o
 appmain=${H5TOOL}_appmain.$suffix
 appmain_o=${H5TOOL}_appmain.o
 prog1=${H5TOOL}_prog1.$suffix
@@ -74,9 +82,9 @@ applib=libapp${H5TOOL}.a
 # short hands
 # Caution: if some *.h5 files must be cleaned here, list them by names.
 # Don't use the wildcard form of *.h5 as it will wipe out even *.h5 generated
-# by otehr test programs. This will cause a racing condition error when
+# by other test programs. This will cause a racing condition error when
 # parallel make (e.g., gmake -j 4) is used.
-temp_SRC="$hdf5main $v16main $v18main $appmain $prog1 $prog2"
+temp_SRC="$hdf5main $v16main $v18main $v110main $v112main $v114main $appmain $prog1 $prog2"
 temp_OBJ=`echo $temp_SRC | sed -e "s/\.${suffix}/.o/g"`
 temp_FILES="a.out $applib"
 
@@ -85,6 +93,8 @@ temp_FILES="a.out $applib"
 cat > $appmain <<EOF
 #include "hdf5.h"
 #define H5FILE_NAME        "tmp.h5"
+extern void sub1(void);
+extern void sub2(void);
 int
 main (void)
 {
@@ -102,13 +112,15 @@ main (void)
 
     printf("HDF5 C Sample program ran successfully. File %s generated.\n", H5FILE_NAME);
     remove(H5FILE_NAME);
- 
+
     return 0;
-}     
+}
 EOF
 
 # generate prog1
 cat > $prog1 <<EOF
+#include <stdio.h>
+void
 sub1(void)
 {
     printf("in sub1\n");
@@ -117,6 +129,8 @@ EOF
 
 # generate prog2
 cat > $prog2 <<EOF
+#include <stdio.h>
+void
 sub2(void)
 {
     printf("in sub2\n");
@@ -145,7 +159,7 @@ main (void)
     remove(H5FILE_NAME);
 
     return 0;
-}     
+}
 EOF
 
 # Generate HDF5 v1.6 Main Program:
@@ -198,6 +212,129 @@ main (void)
 }
 EOF
 
+# Generate HDF5 v1.10 Main Program:
+# This makes unique V1.10 API calls.
+cat > $v110main <<EOF
+/* This is a V1.10 API calls example Program. */
+#include "hdf5.h"
+#define H5FILE_NAME        "tmp.h5"
+int
+main (void)
+{
+    hid_t       file, group, group2, dset, dset2;    /* file and group handles */
+
+    file = H5Fcreate(H5FILE_NAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    group = H5Gcreate(file, "/Group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    group2 = H5Gcreate2(file, "/Group1.8", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    dset = H5Dopen(group, "Dataset", H5P_DEFAULT);
+    dset2 = H5Dopen2(group2, "Dataset2", H5P_DEFAULT);
+    H5Dclose(dset);
+    H5Dclose(dset2);
+    H5Gclose(group2);
+    H5Gclose(group);
+    H5Fclose(file);
+
+    printf("HDF5 C program created with V1.10 API ran successfully. "
+       "File %s generated.\n", H5FILE_NAME);
+    remove(H5FILE_NAME);
+    return 0;
+}
+EOF
+
+# Generate HDF5 v1.12 Main Program:
+# This makes unique V1.12 API calls.
+cat > $v112main <<EOF
+/* This is a V1.12 API calls example Program. */
+#include "hdf5.h"
+#define H5FILE_NAME        "tmp.h5"
+#define SPACE1_RANK    3
+int
+main (void)
+{
+    hid_t       sid;                  /* Dataspace ID */
+    hid_t       fapl = -1;            /* File access property list ID */
+    int         rank;                 /* Logical rank of dataspace    */
+    hsize_t     dims[] = {3, 3, 15};
+    size_t      sbuf_size=0;
+    herr_t      ret;                  /* Generic return value        */
+    hsize_t             start[] = {0, 0, 0};
+    hsize_t             stride[] = {2, 5, 3};
+    hsize_t             count[] = {2, 2, 2};
+    hsize_t             block[] = {1, 3, 1};
+
+    /* Create the file access property list */
+    fapl = H5Pcreate(H5P_FILE_ACCESS);
+
+    /* Set low/high bounds in the fapl */
+    ret = H5Pset_libver_bounds(fapl, H5F_LIBVER_EARLIEST,
+                               H5F_LIBVER_LATEST);
+
+    /* Create the dataspace */
+    sid = H5Screate_simple(SPACE1_RANK, dims, NULL);
+
+    /* Set the hyperslab selection */
+    ret = H5Sselect_hyperslab(sid, H5S_SELECT_SET, start, stride, count, block);
+
+    /* Encode simple dataspace in a buffer with the fapl setting */
+    ret = H5Sencode(sid, NULL, &sbuf_size, fapl);
+
+    /* Encode simple dataspace in a buffer with the fapl setting */
+    ret = H5Sencode2(sid, NULL, &sbuf_size, fapl);
+
+    printf("HDF5 C program created with V1.12 API ran successfully. ");
+/*       "File %s generated.\n", H5FILE_NAME);
+      remove(H5FILE_NAME); */
+    return 0;
+}
+EOF
+
+# Generate HDF5 v1.14 Main Program:
+# This makes unique V1.14 API calls.
+cat > $v114main <<EOF
+/* This is a V1.14 API calls example Program. */
+#include "hdf5.h"
+#define H5FILE_NAME        "tmp.h5"
+#define SPACE1_RANK    3
+int
+main (void)
+{
+    hid_t       sid;                  /* Dataspace ID */
+    hid_t       fapl = -1;            /* File access property list ID */
+    int         rank;                 /* Logical rank of dataspace    */
+    hsize_t     dims[] = {3, 3, 15};
+    size_t      sbuf_size=0;
+    herr_t      ret;                  /* Generic return value        */
+    hsize_t             start[] = {0, 0, 0};
+    hsize_t             stride[] = {2, 5, 3};
+    hsize_t             count[] = {2, 2, 2};
+    hsize_t             block[] = {1, 3, 1};
+
+    /* Create the file access property list */
+    fapl = H5Pcreate(H5P_FILE_ACCESS);
+
+    /* Set low/high bounds in the fapl */
+    ret = H5Pset_libver_bounds(fapl, H5F_LIBVER_EARLIEST,
+                               H5F_LIBVER_LATEST);
+
+    /* Create the dataspace */
+    sid = H5Screate_simple(SPACE1_RANK, dims, NULL);
+
+    /* Set the hyperslab selection */
+    ret = H5Sselect_hyperslab(sid, H5S_SELECT_SET, start, stride, count, block);
+
+    /* Encode simple dataspace in a buffer with the fapl setting */
+    ret = H5Sencode(sid, NULL, &sbuf_size, fapl);
+
+    /* Encode simple dataspace in a buffer with the fapl setting */
+    ret = H5Sencode2(sid, NULL, &sbuf_size, fapl);
+
+    printf("HDF5 C program created with V1.14 API ran successfully. ");
+/*       "File %s generated.\n", H5FILE_NAME);
+      remove(H5FILE_NAME); */
+    return 0;
+}
+EOF
+
 
 # Parse option
 #   None
@@ -306,17 +443,32 @@ TOOLTEST -E $appmain $prog1 $prog2
 
 # Group5: Version compatibility tests.
 echo "***"Version compatibility tests.
-# Test these two cases now. More later.
+# 20200610 Updated for versions 1.10 - 1.14.
 # If H5_NO_DEPRECATED_SYMBOLS;
-# then only v18main works.
+# then versions v18main, v110main, and v112main work.
+# -DH5_USE_<N>_API_DEFAULT flags cannot be used with H5_NO_DEPRECATED_SYMBOLS;
 # else if H5_USE_16_API_DEFAULT;
-#      then v16main works and -DH5_NO_DEPRECATED_SYMBOLS v18main also works.
-#      else v18main works and -DH5_USE_16_API_DEFAULT v16main also works.
+#      then v16main works.
+# else v18main works and -DH5_USE_16_API_DEFAULT v16main also works.
+# As new versions with versioned functions are added, they will work with and 
+# should be added to H5_NO_DEPRECATED_SYMBOLS and to the else section, with and 
+# without the -DH5_USE_<N>_API_DEFAULT flag. A new H5_USE_<N>_API_DEFAULT section 
+# should also be added.
 #
 if [ -n "$H5_USE_16_API_DEFAULT" ]; then
     echo "H5_USE_16_API_DEFAULT is defined."
+elif [ -n "$H5_USE_18_API_DEFAULT" ]; then
+    echo "H5_USE_18_API_DEFAULT is defined."
+elif [ -n "$H5_USE_110_API_DEFAULT" ]; then
+    echo "H5_USE_110_API_DEFAULT is defined."
+elif [ -n "$H5_USE_112_API_DEFAULT" ]; then
+    echo "H5_USE_112_API_DEFAULT is defined."
+elif [ -n "$H5_USE_114_API_DEFAULT" ]; then
+    echo "H5_USE_114_API_DEFAULT is defined."
+elif [ -n "$H5_USE_116_API_DEFAULT" ]; then
+    echo "H5_USE_116_API_DEFAULT is defined."
 else
-    echo "H5_USE_16_API_DEFAULT is not defined."
+    echo "No H5 API_DEFAULT is defined."
 fi
 if [ -n "$H5_NO_DEPRECATED_SYMBOLS" ]; then
     echo "H5_NO_DEPRECATED_SYMBOLS is defined."
@@ -326,12 +478,46 @@ fi
 if [ -n "$H5_NO_DEPRECATED_SYMBOLS" ]; then
     echo "Skipping $v16main test"
     TOOLTEST $v18main
+    TOOLTEST $v18main
+    TOOLTEST $v110main
+    TOOLTEST $v112main
+    TOOLTEST $v114main
 elif [ -n "$H5_USE_16_API_DEFAULT" ]; then
+    echo "Testing HDF5  with 16_API_DEFAULT"
     TOOLTEST $v16main
-    TOOLTEST -DH5_NO_DEPRECATED_SYMBOLS $v18main
+elif [ -n "$H5_USE_18_API_DEFAULT" ]; then
+    echo "Testing HDF5  with 18_API_DEFAULT"
+    TOOLTEST -DH5_USE_16_API_DEFAULT $v16main
+    TOOLTEST $v18main
+elif [ -n "$H5_USE_110_API_DEFAULT" ]; then
+    echo "Testing HDF5  with 110_API_DEFAULT"
+    TOOLTEST -DH5_USE_16_API_DEFAULT $v16main
+    TOOLTEST -DH5_USE_18_API_DEFAULT $v18main
+    TOOLTEST $v110main
+elif [ -n "$H5_USE_112_API_DEFAULT" ]; then
+    echo "Testing HDF5  with 112_API_DEFAULT"
+    TOOLTEST -DH5_USE_16_API_DEFAULT $v16main
+    TOOLTEST -DH5_USE_18_API_DEFAULT $v18main
+    TOOLTEST -DH5_USE_110_API_DEFAULT $v110main
+    TOOLTEST $v112main
+elif [ -n "$H5_USE_114_API_DEFAULT" ]; then
+    echo "Testing HDF5  with 114_API_DEFAULT"
+    TOOLTEST -DH5_USE_16_API_DEFAULT $v16main
+    TOOLTEST -DH5_USE_18_API_DEFAULT $v18main
+    TOOLTEST -DH5_USE_110_API_DEFAULT $v110main
+    TOOLTEST -DH5_USE_112_API_DEFAULT $v112main
+    TOOLTEST $v114main
 else
+    echo "Testing HDF5  with 116_API_DEFAULT"
     TOOLTEST -DH5_USE_16_API_DEFAULT $v16main
+    TOOLTEST -DH5_USE_18_API_DEFAULT $v18main
+    TOOLTEST -DH5_USE_110_API_DEFAULT $v110main
+    TOOLTEST -DH5_USE_112_API_DEFAULT $v112main
+    TOOLTEST -DH5_USE_114_API_DEFAULT $v114main
     TOOLTEST $v18main
+    TOOLTEST $v110main
+    TOOLTEST $v112main
+    TOOLTEST $v114main
 fi
 
 ##############################################################################
diff --git a/fortran/CMakeLists.txt b/fortran/CMakeLists.txt
index c725047..cf9b427 100644
--- a/fortran/CMakeLists.txt
+++ b/fortran/CMakeLists.txt
@@ -1,32 +1,30 @@
-cmake_minimum_required (VERSION 3.1.0)
-PROJECT (HDF5_F90 C CXX Fortran)
+cmake_minimum_required (VERSION 3.18)
+project (HDF5_F90 C Fortran)
 
 if (H5_HAVE_PARALLEL)
-  INCLUDE (FindMPI)
-  set (LINK_LIBS ${LINK_LIBS} ${MPI_Fortran_LIBRARIES})
   if (MPI_Fortran_LINK_FLAGS)
     set (CMAKE_EXE_LINKER_FLAGS "${MPI_Fortran_LINK_FLAGS} ${CMAKE_EXE_LINKER_FLAGS}")
-  endif (MPI_Fortran_LINK_FLAGS)
-endif (H5_HAVE_PARALLEL)
+  endif ()
+endif ()
 
 #-----------------------------------------------------------------------------
 # Traverse source subdirectory
 #-----------------------------------------------------------------------------
-add_subdirectory (${HDF5_F90_SOURCE_DIR}/src ${HDF5_F90_BINARY_DIR}/src)
+add_subdirectory (src)
 
 #-----------------------------------------------------------------------------
 # Build the Fortran Examples
 #-----------------------------------------------------------------------------
 if (HDF5_BUILD_EXAMPLES)
-  add_subdirectory (${HDF5_F90_SOURCE_DIR}/examples ${HDF5_F90_BINARY_DIR}/examples)
-endif (HDF5_BUILD_EXAMPLES)
+  add_subdirectory (examples)
+endif ()
 
 #-----------------------------------------------------------------------------
 # Testing
 #-----------------------------------------------------------------------------
 if (BUILD_TESTING)
-  add_subdirectory (${HDF5_F90_SOURCE_DIR}/test ${HDF5_F90_BINARY_DIR}/test)
+  add_subdirectory (test)
   if (MPI_Fortran_FOUND)
-    add_subdirectory (${HDF5_F90_SOURCE_DIR}/testpar ${HDF5_F90_BINARY_DIR}/testpar)
-  endif (MPI_Fortran_FOUND)
-endif (BUILD_TESTING)
+    add_subdirectory (testpar)
+  endif ()
+endif ()
diff --git a/fortran/COPYING b/fortran/COPYING
deleted file mode 100644
index 6903daf..0000000
--- a/fortran/COPYING
+++ /dev/null
@@ -1,16 +0,0 @@
-
-  Copyright by  The HDF Group and 
-                The Board of Trustees of the University of Illinois. 
-  All rights reserved. 
-
-  The files and subdirectories in this directory are part of HDF5.  
-  The full HDF5 copyright notice, including terms governing use, 
-  modification, and redistribution, is contained in the files COPYING 
-  and Copyright.html.  COPYING can be found at the root of the source 
-  code distribution tree; Copyright.html can be found at the root 
-  level of an installed copy of the electronic HDF5 document set and 
-  is linked from the top-level documents page.  It can also be found 
-  at http://www.hdfgroup.org/HDF5/doc/Copyright.html.  If you do not 
-  have access to either file, you may request a copy from 
-  help@hdfgroup.org. 
-
diff --git a/fortran/Makefile.am b/fortran/Makefile.am
index 9ddd6dd..c17245d 100644
--- a/fortran/Makefile.am
+++ b/fortran/Makefile.am
@@ -1,16 +1,13 @@
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 #
 # This makefile mostly just reinvokes make in the various subdirectories
 # but does so in the correct order.  You can alternatively invoke make from
@@ -24,14 +21,22 @@
 
 include $(top_srcdir)/config/commence.am
 
-if BUILD_PARALLEL_CONDITIONAL
+if BUILD_TESTS_PARALLEL_CONDITIONAL
   TESTPARALLEL_DIR=testpar
+else
+  TESTPARALLEL_DIR=
+endif
+if BUILD_TESTS_CONDITIONAL
+   TESTSERIAL_DIR=test
+else
+   TESTSERIAL_DIR=
 endif
 
 # Subdirectories in build order, not including examples directory
 ## Only recurse into subdirectories if HDF5 is configured to use Fortran.
 if BUILD_FORTRAN_CONDITIONAL
-   SUBDIRS=src test $(TESTPARALLEL_DIR)
+   SUBDIRS=src $(TESTSERIAL_DIR) $(TESTPARALLEL_DIR)
+
 endif
 
 # All directories that have Makefiles
diff --git a/fortran/Makefile.in b/fortran/Makefile.in
deleted file mode 100644
index b0ffa95..0000000
--- a/fortran/Makefile.in
+++ /dev/null
@@ -1,1378 +0,0 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-#
-# This makefile mostly just reinvokes make in the various subdirectories
-# but does so in the correct order.  You can alternatively invoke make from
-# each subdirectory manually.
-#
-# Top-level HDF5-Fortran Makefile(.in)
-#
-VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-DIST_COMMON = $(top_srcdir)/config/commence.am \
-	$(top_srcdir)/config/conclude.am $(srcdir)/Makefile.in \
-	$(srcdir)/Makefile.am $(top_srcdir)/bin/mkinstalldirs \
-	$(top_srcdir)/bin/test-driver COPYING
-TESTS =
-subdir = fortran
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/aclocal_cxx.m4 \
-	$(top_srcdir)/m4/aclocal_fc.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/src/H5config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
-	ctags-recursive dvi-recursive html-recursive info-recursive \
-	install-data-recursive install-dvi-recursive \
-	install-exec-recursive install-html-recursive \
-	install-info-recursive install-pdf-recursive \
-	install-ps-recursive install-recursive installcheck-recursive \
-	installdirs-recursive pdf-recursive ps-recursive \
-	tags-recursive uninstall-recursive
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-am__recursive_targets = \
-  $(RECURSIVE_TARGETS) \
-  $(RECURSIVE_CLEAN_TARGETS) \
-  $(am__extra_recursive_targets)
-AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	check recheck distdir
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-am__tty_colors_dummy = \
-  mgn= red= grn= lgn= blu= brg= std=; \
-  am__color_tests=no
-am__tty_colors = { \
-  $(am__tty_colors_dummy); \
-  if test "X$(AM_COLOR_TESTS)" = Xno; then \
-    am__color_tests=no; \
-  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
-    am__color_tests=yes; \
-  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
-    am__color_tests=yes; \
-  fi; \
-  if test $$am__color_tests = yes; then \
-    red='[0;31m'; \
-    grn='[0;32m'; \
-    lgn='[1;32m'; \
-    blu='[1;34m'; \
-    mgn='[0;35m'; \
-    brg='[1m'; \
-    std='[m'; \
-  fi; \
-}
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__recheck_rx = ^[ 	]*:recheck:[ 	]*
-am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
-am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
-# A command that, given a newline-separated list of test names on the
-# standard input, print the name of the tests that are to be re-run
-# upon "make recheck".
-am__list_recheck_tests = $(AWK) '{ \
-  recheck = 1; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-        { \
-          if ((getline line2 < ($$0 ".log")) < 0) \
-	    recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
-        { \
-          recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
-        { \
-          break; \
-        } \
-    }; \
-  if (recheck) \
-    print $$0; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# A command that, given a newline-separated list of test names on the
-# standard input, create the global log from their .trs and .log files.
-am__create_global_log = $(AWK) ' \
-function fatal(msg) \
-{ \
-  print "fatal: making $@: " msg | "cat >&2"; \
-  exit 1; \
-} \
-function rst_section(header) \
-{ \
-  print header; \
-  len = length(header); \
-  for (i = 1; i <= len; i = i + 1) \
-    printf "="; \
-  printf "\n\n"; \
-} \
-{ \
-  copy_in_global_log = 1; \
-  global_test_result = "RUN"; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-         fatal("failed to read from " $$0 ".trs"); \
-      if (line ~ /$(am__global_test_result_rx)/) \
-        { \
-          sub("$(am__global_test_result_rx)", "", line); \
-          sub("[ 	]*$$", "", line); \
-          global_test_result = line; \
-        } \
-      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
-        copy_in_global_log = 0; \
-    }; \
-  if (copy_in_global_log) \
-    { \
-      rst_section(global_test_result ": " $$0); \
-      while ((rc = (getline line < ($$0 ".log"))) != 0) \
-      { \
-        if (rc < 0) \
-          fatal("failed to read from " $$0 ".log"); \
-        print line; \
-      }; \
-      printf "\n"; \
-    }; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# Restructured Text title.
-am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
-# Solaris 10 'make', and several other traditional 'make' implementations,
-# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
-# by disabling -e (using the XSI extension "set +e") if it's set.
-am__sh_e_setup = case $$- in *e*) set +e;; esac
-# Default flags passed to test drivers.
-am__common_driver_flags = \
-  --color-tests "$$am__color_tests" \
-  --enable-hard-errors "$$am__enable_hard_errors" \
-  --expect-failure "$$am__expect_failure"
-# To be inserted before the command running the test.  Creates the
-# directory for the log if needed.  Stores in $dir the directory
-# containing $f, in $tst the test, in $log the log.  Executes the
-# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
-# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
-# will run the test scripts (or their associated LOG_COMPILER, if
-# thy have one).
-am__check_pre = \
-$(am__sh_e_setup);					\
-$(am__vpath_adj_setup) $(am__vpath_adj)			\
-$(am__tty_colors);					\
-srcdir=$(srcdir); export srcdir;			\
-case "$@" in						\
-  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
-    *) am__odir=.;; 					\
-esac;							\
-test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
-  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
-if test -f "./$$f"; then dir=./;			\
-elif test -f "$$f"; then dir=;				\
-else dir="$(srcdir)/"; fi;				\
-tst=$$dir$$f; log='$@'; 				\
-if test -n '$(DISABLE_HARD_ERRORS)'; then		\
-  am__enable_hard_errors=no; 				\
-else							\
-  am__enable_hard_errors=yes; 				\
-fi; 							\
-case " $(XFAIL_TESTS) " in				\
-  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
-    am__expect_failure=yes;;				\
-  *)							\
-    am__expect_failure=no;;				\
-esac; 							\
-$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
-# A shell command to get the names of the tests scripts with any registered
-# extension removed (i.e., equivalently, the names of the test logs, with
-# the '.log' extension removed).  The result is saved in the shell variable
-# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
-# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
-# since that might cause problem with VPATH rewrites for suffix-less tests.
-# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
-am__set_TESTS_bases = \
-  bases='$(TEST_LOGS)'; \
-  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
-  bases=`echo $$bases`
-RECHECK_LOGS = $(TEST_LOGS)
-TEST_SUITE_LOG = test-suite.log
-am__test_logs1 = $(TESTS:=.log)
-am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
-TEST_LOGS = $(am__test_logs2:.sh.log=.log)
-SH_LOG_DRIVER = $(SHELL) $(top_srcdir)/bin/test-driver
-SH_LOG_COMPILE = $(SH_LOG_COMPILER) $(AM_SH_LOG_FLAGS) $(SH_LOG_FLAGS)
-am__set_b = \
-  case '$@' in \
-    */*) \
-      case '$*' in \
-        */*) b='$*';; \
-          *) b=`echo '$@' | sed 's/\.log$$//'`; \
-       esac;; \
-    *) \
-      b='$*';; \
-  esac
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
-  sed_rest='s,^[^/]*/*,,'; \
-  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
-  sed_butlast='s,/*[^/]*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
-ACLOCAL = @ACLOCAL@
-ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
-AMTAR = @AMTAR@
-
-# H5_CFLAGS holds flags that should be used when building hdf5,
-# but which should not be exported to h5cc for building other programs.
-# AM_CFLAGS is an automake construct which should be used by Makefiles 
-# instead of CFLAGS, as CFLAGS is reserved solely for the user to define.
-# This applies to FCFLAGS, CXXFLAGS, CPPFLAGS, and LDFLAGS as well.
-AM_CFLAGS = @AM_CFLAGS@ @H5_CFLAGS@
-AM_CPPFLAGS = @AM_CPPFLAGS@ @H5_CPPFLAGS@
-AM_CXXFLAGS = @AM_CXXFLAGS@ @H5_CXXFLAGS@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@
-AM_LDFLAGS = @AM_LDFLAGS@ @H5_LDFLAGS@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BYTESEX = @BYTESEX@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CC_VERSION = @CC_VERSION@
-CFLAGS = @CFLAGS@
-CLEARFILEBUF = @CLEARFILEBUF@
-CODESTACK = @CODESTACK@
-CONFIG_DATE = @CONFIG_DATE@
-CONFIG_MODE = @CONFIG_MODE@
-CONFIG_USER = @CONFIG_USER@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CXX_VERSION = @CXX_VERSION@
-CYGPATH_W = @CYGPATH_W@
-DEBUG_PKG = @DEBUG_PKG@
-DEFAULT_API_VERSION = @DEFAULT_API_VERSION@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
-DIRECT_VFD = @DIRECT_VFD@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-EXTERNAL_FILTERS = @EXTERNAL_FILTERS@
-
-# Make sure that these variables are exported to the Makefiles
-F9XMODEXT = @F9XMODEXT@
-F9XMODFLAG = @F9XMODFLAG@
-F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
-FC = @FC@
-FC2003 = @FC2003@
-FCFLAGS = @FCFLAGS@
-FCFLAGS_f90 = @FCFLAGS_f90@
-FCLIBS = @FCLIBS@
-FC_VERSION = @FC_VERSION@
-FGREP = @FGREP@
-FSEARCH_DIRS = @FSEARCH_DIRS@
-GREP = @GREP@
-H5_CFLAGS = @H5_CFLAGS@
-H5_CPPFLAGS = @H5_CPPFLAGS@
-H5_CXXFLAGS = @H5_CXXFLAGS@
-H5_CXX_SHARED = @H5_CXX_SHARED@
-H5_FCFLAGS = @H5_FCFLAGS@
-H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@
-H5_LDFLAGS = @H5_LDFLAGS@
-H5_LONE_COLON = @H5_LONE_COLON@
-H5_VERSION = @H5_VERSION@
-HADDR_T = @HADDR_T@
-HAVE_DMALLOC = @HAVE_DMALLOC@
-HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@
-HAVE_PTHREAD = @HAVE_PTHREAD@
-HDF5_HL = @HDF5_HL@
-HDF5_INTERFACES = @HDF5_INTERFACES@
-HDF_CXX = @HDF_CXX@
-HDF_FORTRAN = @HDF_FORTRAN@
-HDF_FORTRAN2003 = @HDF_FORTRAN2003@
-HID_T = @HID_T@
-HL = @HL@
-HL_FOR = @HL_FOR@
-HSIZE_T = @HSIZE_T@
-HSSIZE_T = @HSSIZE_T@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTRUMENT = @INSTRUMENT@
-INSTRUMENT_LIBRARY = @INSTRUMENT_LIBRARY@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LL_PATH = @LL_PATH@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_STATIC_EXEC = @LT_STATIC_EXEC@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MPE = @MPE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJECT_NAMELEN_DEFAULT_F = @OBJECT_NAMELEN_DEFAULT_F@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PARALLEL = @PARALLEL@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-RANLIB = @RANLIB@
-ROOT = @ROOT@
-RUNPARALLEL = @RUNPARALLEL@
-RUNSERIAL = @RUNSERIAL@
-R_INTEGER = @R_INTEGER@
-R_LARGE = @R_LARGE@
-SEARCH = @SEARCH@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SIZE_T = @SIZE_T@
-STATIC_EXEC = @STATIC_EXEC@
-STATIC_SHARED = @STATIC_SHARED@
-STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@
-STRIP = @STRIP@
-TESTPARALLEL = @TESTPARALLEL@
-THREADSAFE = @THREADSAFE@
-TIME = @TIME@
-TR = @TR@
-TRACE_API = @TRACE_API@
-UNAME_INFO = @UNAME_INFO@
-USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
-USE_FILTER_SZIP = @USE_FILTER_SZIP@
-USINGMEMCHECKER = @USINGMEMCHECKER@
-VERSION = @VERSION@
-WORDS_BIGENDIAN = @WORDS_BIGENDIAN@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_FC = @ac_ct_FC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-
-# Install directories that automake doesn't know about
-docdir = $(exec_prefix)/doc
-dvidir = @dvidir@
-enable_shared = @enable_shared@
-enable_static = @enable_static@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-
-# Shell commands used in Makefiles
-RM = rm -f
-CP = cp
-
-# Some machines need a command to run executables; this is that command
-# so that our tests will run.
-# We use RUNEXEC instead of RUNSERIAL directly because it may be that
-# some tests need to be run with a different command.  Older versions
-# of the makefiles used the command
-# $(LIBTOOL) --mode=execute
-# in some directories, for instance.
-RUNEXEC = $(RUNSERIAL)
-
-# Libraries to link to while building
-LIBHDF5 = $(top_builddir)/src/libhdf5.la
-LIBH5TEST = $(top_builddir)/test/libh5test.la
-LIBH5F = $(top_builddir)/fortran/src/libhdf5_fortran.la
-LIBH5FTEST = $(top_builddir)/fortran/test/libh5test_fortran.la
-LIBH5CPP = $(top_builddir)/c++/src/libhdf5_cpp.la
-LIBH5TOOLS = $(top_builddir)/tools/lib/libh5tools.la
-LIBH5_HL = $(top_builddir)/hl/src/libhdf5_hl.la
-LIBH5F_HL = $(top_builddir)/hl/fortran/src/libhdf5hl_fortran.la
-LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
-
-# Note that in svn revision 19400 the '/' after DESTDIR in H5* variables below  
-# has been removed. According to the official description of DESTDIR by Gnu at 
-# http://www.gnu.org/prep/standards/html_node/DESTDIR.html, DESTDIR is 
-# prepended to the normal and complete install path that it precedes for the 
-# purpose of installing in a temporary directory which is useful for building 
-# rpms and other packages.  The '/' after ${DESTDIR} will be followed by another 
-# '/' at the beginning of the normal install path.  When DESTDIR is empty the  
-# path then begins with '//', which is incorrect and causes problems at least for 
-# Cygwin.   
-
-# Scripts used to build examples
-# If only shared libraries have been installed, have h5cc build examples with
-# shared libraries instead of static libraries
-H5CC = ${DESTDIR}$(bindir)/h5cc
-H5CC_PP = ${DESTDIR}$(bindir)/h5pcc
-H5FC = ${DESTDIR}$(bindir)/h5fc
-H5FC_PP = ${DESTDIR}$(bindir)/h5pfc
-H5CPP = ${DESTDIR}$(bindir)/h5c++
-ACLOCAL_AMFLAGS = "-I m4"
-
-# The trace script; this is used on source files from the C library to
-# insert tracing macros.
-TRACE = perl $(top_srcdir)/bin/trace
-
-# .chkexe files are used to mark tests that have run successfully.
-# .chklog files are output from those tests.
-# *.clog and *.clog2 are from the MPE option.
-CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2
-@BUILD_PARALLEL_CONDITIONAL_TRUE@TESTPARALLEL_DIR = testpar
-
-# Subdirectories in build order, not including examples directory
-@BUILD_FORTRAN_CONDITIONAL_TRUE@SUBDIRS = src test $(TESTPARALLEL_DIR)
-
-# All directories that have Makefiles
-DIST_SUBDIRS = src test testpar examples
-
-# Automake needs to be taught how to build lib, progs, and tests targets.
-# These will be filled in automatically for the most part (e.g.,
-# lib_LIBRARIES are built for lib target), but EXTRA_LIB, EXTRA_PROG, and
-# EXTRA_TEST variables are supplied to allow the user to force targets to
-# be built at certain times. 
-LIB = $(lib_LIBRARIES) $(lib_LTLIBRARIES) $(noinst_LIBRARIES)                 \
-      $(noinst_LTLIBRARIES) $(check_LIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LIB)
-
-PROGS = $(bin_PROGRAMS) $(bin_SCRIPTS) $(noinst_PROGRAMS) $(noinst_SCRIPTS)   \
-        $(EXTRA_PROG)
-
-chk_TESTS = $(check_PROGRAMS) $(check_SCRIPTS) $(EXTRA_TEST) 
-TEST_EXTENSIONS = .sh
-SH_LOG_COMPILER = $(SHELL)
-AM_SH_LOG_FLAGS = 
-TEST_PROG_CHKEXE = $(TEST_PROG:=.chkexe_)
-TEST_PROG_PARA_CHKEXE = $(TEST_PROG_PARA:=.chkexe_)
-TEST_SCRIPT_CHKSH = $(TEST_SCRIPT:=.chkexe_)
-TEST_SCRIPT_PARA_CHKSH = $(TEST_SCRIPT_PARA:=.chkexe_)
-all: all-recursive
-
-.SUFFIXES:
-.SUFFIXES: .log .sh .sh$(EXEEXT) .trs
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign fortran/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign fortran/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-$(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am:
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run 'make' without going through this Makefile.
-# To change the values of 'make' variables: instead of editing Makefiles,
-# (1) if the variable is set in 'config.status', edit 'config.status'
-#     (which will cause the Makefiles to be regenerated when you run 'make');
-# (2) otherwise, pass the desired values on the 'make' command line.
-$(am__recursive_targets):
-	@fail=; \
-	if $(am__make_keepgoing); then \
-	  failcom='fail=yes'; \
-	else \
-	  failcom='exit 1'; \
-	fi; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-recursive
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: ctags-recursive
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-recursive
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-# Recover from deleted '.trs' file; this should ensure that
-# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
-# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
-# to avoid problems with "make -n".
-.log.trs:
-	rm -f $< $@
-	$(MAKE) $(AM_MAKEFLAGS) $<
-
-# Leading 'am--fnord' is there to ensure the list of targets does not
-# expand to empty, as could happen e.g. with make check TESTS=''.
-am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
-am--force-recheck:
-	@:
-
-$(TEST_SUITE_LOG): $(TEST_LOGS)
-	@$(am__set_TESTS_bases); \
-	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
-	redo_bases=`for i in $$bases; do \
-	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
-	            done`; \
-	if test -n "$$redo_bases"; then \
-	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
-	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
-	  if $(am__make_dryrun); then :; else \
-	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
-	  fi; \
-	fi; \
-	if test -n "$$am__remaking_logs"; then \
-	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
-	       "recursion detected" >&2; \
-	else \
-	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
-	fi; \
-	if $(am__make_dryrun); then :; else \
-	  st=0;  \
-	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
-	  for i in $$redo_bases; do \
-	    test -f $$i.trs && test -r $$i.trs \
-	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
-	    test -f $$i.log && test -r $$i.log \
-	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
-	  done; \
-	  test $$st -eq 0 || exit 1; \
-	fi
-	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
-	ws='[ 	]'; \
-	results=`for b in $$bases; do echo $$b.trs; done`; \
-	test -n "$$results" || results=/dev/null; \
-	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
-	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
-	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
-	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
-	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
-	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
-	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
-	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
-	  success=true; \
-	else \
-	  success=false; \
-	fi; \
-	br='==================='; br=$$br$$br$$br$$br; \
-	result_count () \
-	{ \
-	    if test x"$$1" = x"--maybe-color"; then \
-	      maybe_colorize=yes; \
-	    elif test x"$$1" = x"--no-color"; then \
-	      maybe_colorize=no; \
-	    else \
-	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
-	    fi; \
-	    shift; \
-	    desc=$$1 count=$$2; \
-	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
-	      color_start=$$3 color_end=$$std; \
-	    else \
-	      color_start= color_end=; \
-	    fi; \
-	    echo "$${color_start}# $$desc $$count$${color_end}"; \
-	}; \
-	create_testsuite_report () \
-	{ \
-	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
-	  result_count $$1 "PASS: " $$pass  "$$grn"; \
-	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
-	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
-	  result_count $$1 "FAIL: " $$fail  "$$red"; \
-	  result_count $$1 "XPASS:" $$xpass "$$red"; \
-	  result_count $$1 "ERROR:" $$error "$$mgn"; \
-	}; \
-	{								\
-	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
-	    $(am__rst_title);						\
-	  create_testsuite_report --no-color;				\
-	  echo;								\
-	  echo ".. contents:: :depth: 2";				\
-	  echo;								\
-	  for b in $$bases; do echo $$b; done				\
-	    | $(am__create_global_log);					\
-	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
-	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
-	if $$success; then						\
-	  col="$$grn";							\
-	 else								\
-	  col="$$red";							\
-	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
-	fi;								\
-	echo "$${col}$$br$${std}"; 					\
-	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
-	echo "$${col}$$br$${std}"; 					\
-	create_testsuite_report --maybe-color;				\
-	echo "$$col$$br$$std";						\
-	if $$success; then :; else					\
-	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
-	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
-	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
-	  fi;								\
-	  echo "$$col$$br$$std";					\
-	fi;								\
-	$$success || exit 1
-recheck: all 
-	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-	@set +e; $(am__set_TESTS_bases); \
-	bases=`for i in $$bases; do echo $$i; done \
-	         | $(am__list_recheck_tests)` || exit 1; \
-	log_list=`for i in $$bases; do echo $$i.log; done`; \
-	log_list=`echo $$log_list`; \
-	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
-	        am__force_recheck=am--force-recheck \
-	        TEST_LOGS="$$log_list"; \
-	exit $$?
-.sh.log:
-	@p='$<'; \
-	$(am__set_b); \
-	$(am__check_pre) $(SH_LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_SH_LOG_DRIVER_FLAGS) $(SH_LOG_DRIVER_FLAGS) -- $(SH_LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-@am__EXEEXT_TRUE@.sh$(EXEEXT).log:
-@am__EXEEXT_TRUE@	@p='$<'; \
-@am__EXEEXT_TRUE@	$(am__set_b); \
-@am__EXEEXT_TRUE@	$(am__check_pre) $(SH_LOG_DRIVER) --test-name "$$f" \
-@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
-@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_SH_LOG_DRIVER_FLAGS) $(SH_LOG_DRIVER_FLAGS) -- $(SH_LOG_COMPILE) \
-@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    $(am__make_dryrun) \
-	      || test -d "$(distdir)/$$subdir" \
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
-	      || exit 1; \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
-check: check-recursive
-all-am: Makefile all-local
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
-	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
-	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am: installcheck-local
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool \
-	mostlyclean-local
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: $(am__recursive_targets) check-am install-am install-strip
-
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \
-	check check-TESTS check-am clean clean-generic clean-libtool \
-	cscopelist-am ctags ctags-am distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installcheck-local installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
-	pdf-am ps ps-am recheck tags tags-am uninstall uninstall-am
-
-
-# List all build rules defined by HDF5 Makefiles as "PHONY" targets here.
-# This tells the Makefiles that these targets are not files to be built but
-# commands that should be executed even if a file with the same name already
-# exists.
-.PHONY: build-check-clean build-check-p build-check-s build-lib build-progs \
-        build-tests check-clean check-install check-p check-s check-vfd \
-        install-doc lib progs tests uninstall-doc _exec_check-s _test help
-
-help:
-	@$(top_srcdir)/bin/makehelp
-
-# Install examples
-install-examples uninstall-examples:
-	@(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
-
-installcheck-local:
-	@(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
-
-# Clean examples when check-clean is invoked
-check-clean ::
-	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
-	@for d in X $(SUBDIRS) examples; do                                   \
-	    if test $$d != X && test $$d != .; then                           \
-	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
-	    fi;                                                               \
-	done
-
-# lib/progs/tests targets recurse into subdirectories. build-* targets
-# build files in this directory.
-build-lib: $(LIB)
-build-progs: $(LIB) $(PROGS)
-build-tests: $(LIB) $(PROGS) $(chk_TESTS)
-
-# General rule for recursive building targets.
-# BUILT_SOURCES contain targets that need to be built before anything else
-# in the directory (e.g., for Fortran type detection)
-lib progs tests check-s check-p :: $(BUILT_SOURCES)
-	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
-	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X && test $$d != .; then                           \
-	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
-	    fi;                                                               \
-	done
-
-# General rule for recursive cleaning targets.  Like the rule above,
-# but doesn't require building BUILT_SOURCES.
-check-clean ::
-	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
-	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X && test $$d != .; then                           \
-	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
-	    fi;                                                               \
-	done
-
-# Tell Automake to build tests when the user types `make all' (this is
-# not its default behavior).  Also build EXTRA_LIB and EXTRA_PROG since
-# Automake won't build them automatically, either.
-all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(chk_TESTS)
-
-# make install-doc doesn't do anything outside of doc directory, but
-# Makefiles should recognize it.
-# UPDATE: docs no longer reside in this build tree, so this target
-# is depreciated.
-install-doc uninstall-doc:
-	@echo "Nothing to be done."
-
-# clean up files generated by tests so they can be re-run.
-build-check-clean:
-	$(RM) -rf $(CHECK_CLEANFILES)
-
-# run check-clean whenever mostlyclean is run
-mostlyclean-local: build-check-clean
-
-# check-install is just a synonym for installcheck
-check-install: installcheck
-
-# Run each test in order, passing $(TEST_FLAGS) to the program.
-# Since tests are done in a shell loop, "make -i" does apply inside it.
-# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
-# The timestamps give a rough idea how much time the tests use.
-#
-# Note that targets in chk_TESTS (defined above) will be built when the user
-# types 'make tests' or 'make check', but only programs in TEST_PROG,
-# TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
-check-TESTS: test
-
-test _test:
-	@$(MAKE) build-check-s
-	@$(MAKE) build-check-p
-
-# Actual execution of check-s.
-build-check-s: $(LIB) $(PROGS) $(chk_TESTS)
-	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
-	   echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
-	fi
-	@$(MAKE) $(AM_MAKEFLAGS) _exec_check-s
-	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
-	    echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
-	fi
-
-_exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH)
-
-# The dummy.chkexe here prevents the target from being
-# empty if there are no tests in the current directory.
-# $${log} is the log file.
-# $${tname} is the name of test.
-$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
-	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \
-	   tname=$(@:.chkexe_=)$(EXEEXT);\
-	   log=$(@:.chkexe_=.chklog); \
-	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \
-	      echo "No need to test $${tname} again."; \
-	   else \
-	      echo "============================" > $${log}; \
-	      if test "X$(FORTRAN_API)" = "Xyes"; then \
-	         echo "Fortran API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "Fortran API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(CXX_API)" = "Xyes"; then \
-	         echo "C++ API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "C++ API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log};\
-	      else \
-	         echo "Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "$(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      fi; \
-	      echo "============================" >> $${log}; \
-	      srcdir="$(srcdir)" \
-	         $(TIME) $(RUNEXEC) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \
-	         && touch $(@:.chkexe_=.chkexe) || \
-	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	         (cat $${log} && false) || exit 1; \
-	      echo "" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
-	      echo "============================" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
-	      cat $${log}; \
-	   fi; \
-	fi
-
-# The dummysh.chkexe here prevents the target from being
-# empty if there are no tests in the current directory.
-# $${log} is the log file.
-# $${tname} is the name of test.
-$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
-	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummysh.chkexe_"; then \
-	   cmd=$(@:.chkexe_=);\
-	   tname=`basename $$cmd`;\
-	   chkname=`basename $(@:.chkexe_=.chkexe)`;\
-	   log=`basename $(@:.chkexe_=.chklog)`; \
-	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer $${chkname} $$cmd $(SCRIPT_DEPEND); then \
-	      echo "No need to test $${tname} again."; \
-	   else \
-	      echo "============================" > $${log}; \
-	      if test "X$(FORTRAN_API)" = "Xyes"; then \
-	         echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(CXX_API)" = "Xyes"; then \
-	         echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      else \
-	         echo "Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      fi; \
-	      echo "============================" >> $${log}; \
-	      RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
-	      srcdir="$(srcdir)" \
-	         $(TIME) $(SHELL) $$cmd $(TEST_FLAGS) >> $${log} 2>&1 \
-	         && touch $${chkname} || \
-	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	         (cat $${log} && false) || exit 1; \
-	      echo "" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
-	      echo "============================" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
-	      cat $${log}; \
-	   fi; \
-	   echo "============================"; \
-	fi
-
-# Actual execution of check-p.
-build-check-p: $(LIB) $(PROGS) $(chk_TESTS)
-	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
-	   echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
-	fi
-	@if test -n "$(TEST_PROG_PARA)"; then                                \
-	    echo "**** Hint ****";                                            \
-	    echo "Parallel test files reside in the current directory"        \
-	         "by default.";                                               \
-	    echo "Set HDF5_PARAPREFIX to use another directory. E.g.,";       \
-	    echo "    HDF5_PARAPREFIX=/PFS/user/me";                          \
-	    echo "    export HDF5_PARAPREFIX";                                \
-	    echo "    make check";                                            \
-	    echo "**** end of Hint ****";                                     \
-	fi
-	@for test in $(TEST_PROG_PARA) dummy; do                             \
-	   if test $$test != dummy; then                                      \
-	      $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ \
-	      RUNEXEC="$(RUNPARALLEL)" || exit 1; \
-	   fi;                                                                \
-	done
-	@for test in $(TEST_SCRIPT_PARA) dummy; do                           \
-	  if test $$test != dummy; then                                      \
-	    $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ || exit 1; \
-	  fi;                                                                 \
-	done
-	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
-	    echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
-	fi
-
-# Run test with different Virtual File Driver
-check-vfd: $(LIB) $(PROGS) $(chk_TESTS)
-	@for vfd in $(VFD_LIST) dummy; do                                     \
-	    if test $$vfd != dummy; then                                      \
-	        echo "============================";                          \
-	        echo "Testing Virtual File Driver $$vfd";                     \
-	        echo "============================";                          \
-	        $(MAKE) $(AM_MAKEFLAGS) check-clean || exit 1;                \
-	        HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check || exit 1;    \
-	    fi;                                                               \
-	done
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/fortran/doc/DevelGuide/masterindex.html b/fortran/doc/DevelGuide/masterindex.html
deleted file mode 100644
index 9765ea0..0000000
--- a/fortran/doc/DevelGuide/masterindex.html
+++ /dev/null
@@ -1,589 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="./robodoc.css" type="text/css" />
-<title>Index</title>
-<!-- Source: ./ -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="extra">
-</div> <!-- extra -->
-<div id="navigation">
-<a class="menuitem" href="./toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="./robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="#top">Index</a>
-<a class="menuitem" href="./robo_functions.html#top">Functions</a>
-<a class="menuitem" href="./robo_modules.html#top">Modules</a>
-<a class="menuitem" href="./robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="./robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<h1>Index</h1>
-<h2><a href="#A">A</a> - <a href="#B">B</a> - <a href="#C">C</a> - <a href="#D">D</a> - <a href="#E">E</a> - <a href="#F">F</a> - <a href="#G">G</a> - <a href="#H">H</a> - <a href="#I">I</a> - <a href="#J">J</a> - <a href="#K">K</a> - <a href="#L">L</a> - <a href="#M">M</a> - <a href="#N">N</a> - <a href="#O">O</a> - <a href="#P">P</a> - <a href="#Q">Q</a> - <a href="#R">R</a> - <a href="#S">S</a> - <a href="#T">T</a> - <a href="#U">U</a> - <a href="#V">V</a> - <a href="#W">W</a> - <a href="#X">X</a> - <a href="#Y">Y</a> - <a href="#Z">Z</a> - <a href="#0">0</a> - <a href="#1">1</a> - <a href="#2">2</a> - <a href="#3">3</a> - <a href="#4">4</a> - <a href="#5">5</a> - <a href="#6">6</a> - <a href="#7">7</a> - <a href="#8">8</a> - <a href="#9">9</a></h2>
-<a href="./src/H5Pff_F03_f90.html#robo80" class="indexitem" > h5pget_double</a>
-<a href="./src/H5Pff_f90.html#robo81" class="indexitem" > h5pget_hyper_vector_size_f</a>
-<a href="./src/H5Pff_f90.html#robo82" class="indexitem" > h5pset_family_offset_f</a>
-<a href="./src/H5Pff_f90.html#robo83" class="indexitem" > h5pset_fapl_family_f</a>
-<a href="./src/H5Pff_f90.html#robo84" class="indexitem" > h5pset_meta_block_size_f</a>
-<h2><a name="F"></a>F</h2><a href="./test/fflush1_f90.html#robo_top_of_doc" class="indexitem" >fflush1.f90</a>
-<a href="./test/fflush2_f90.html#robo_top_of_doc" class="indexitem" >fflush2.f90</a>
-<a href="./test/fflush1_f90.html#robo0" class="indexitem" >fortran/test/fflush1.f90</a>
-<a href="./test/fflush2_f90.html#robo1" class="indexitem" >fortran/test/fflush2.f90</a>
-<a href="./test/fortranlib_test_f90.html#robo2" class="indexitem" >fortran/test/fortranlib_test.f90</a>
-<a href="./test/fortranlib_test_1_8_f90.html#robo3" class="indexitem" >fortran/test/fortranlib_test_1_8.f90</a>
-<a href="./test/fortranlib_test_F03_f90.html#robo4" class="indexitem" >fortran/test/fortranlib_test_F03.f90</a>
-<a href="./test/t_c.html#robo5" class="indexitem" >fortran/test/tc.c</a>
-<a href="./test/tf_f90.html#robo6" class="indexitem" >fortran/test/tf.f90</a>
-<a href="./test/tH5A_f90.html#robo7" class="indexitem" >fortran/test/tH5A.f90</a>
-<a href="./test/tH5A_1_8_f90.html#robo8" class="indexitem" >fortran/test/tH5A_1_8.f90</a>
-<a href="./test/tH5D_f90.html#robo9" class="indexitem" >fortran/test/tH5D.f90</a>
-<a href="./test/tH5E_f90.html#robo10" class="indexitem" >fortran/test/tH5E.f90</a>
-<a href="./test/tH5E_F03_f90.html#robo11" class="indexitem" >fortran/test/tH5E_F03.f90</a>
-<a href="./test/tH5F_f90.html#robo12" class="indexitem" >fortran/test/tH5F.f90</a>
-<a href="./test/tH5G_f90.html#robo13" class="indexitem" >fortran/test/tH5G.f90</a>
-<a href="./test/tH5G_1_8_f90.html#robo14" class="indexitem" >fortran/test/tH5G_1_8.f90</a>
-<a href="./test/tH5I_f90.html#robo15" class="indexitem" >fortran/test/tH5I.f90</a>
-<a href="./test/tH5L_F03_f90.html#robo16" class="indexitem" >fortran/test/tH5L_F03.f90</a>
-<a href="./test/tH5O_f90.html#robo17" class="indexitem" >fortran/test/tH5O.f90</a>
-<a href="./test/tH5P_f90.html#robo18" class="indexitem" >fortran/test/tH5P.f90</a>
-<a href="./test/tH5P_F03_f90.html#robo19" class="indexitem" >fortran/test/tH5P_F03.f90</a>
-<a href="./test/tH5R_f90.html#robo20" class="indexitem" >fortran/test/tH5R.f90</a>
-<a href="./test/tH5S_f90.html#robo21" class="indexitem" >fortran/test/tH5S.f90</a>
-<a href="./test/tH5Sselect_f90.html#robo22" class="indexitem" >fortran/test/tH5Sselect.f90</a>
-<a href="./test/tH5T_f90.html#robo23" class="indexitem" >fortran/test/tH5T.f90</a>
-<a href="./test/tH5T_F03_f90.html#robo24" class="indexitem" >fortran/test/tH5T_F03.f90</a>
-<a href="./test/tH5VL_f90.html#robo25" class="indexitem" >fortran/test/tH5VL.f90</a>
-<a href="./test/tH5Z_f90.html#robo26" class="indexitem" >fortran/test/tH5Z.f90</a>
-<a href="./test/fortranlib_test_f90.html#robo_top_of_doc" class="indexitem" >fortranlib_test.f90</a>
-<a href="./test/fortranlib_test_1_8_f90.html#robo_top_of_doc" class="indexitem" >fortranlib_test_1_8.f90</a>
-<a href="./test/fortranlib_test_F03_f90.html#robo_top_of_doc" class="indexitem" >fortranlib_test_F03.f90</a>
-<h2><a name="H"></a>H</h2><a href="./src/H5_DBLE_InterfaceExclude_f90.html#robo_top_of_doc" class="indexitem" >H5_DBLE_InterfaceExclude.f90</a>
-<a href="./src/H5_DBLE_InterfaceInclude_f90.html#robo_top_of_doc" class="indexitem" >H5_DBLE_InterfaceInclude.f90</a>
-<a href="./src/H5_ff_f90.html#robo_top_of_doc" class="indexitem" >H5_ff.f90</a>
-<a href="./src/H5_ff_F03_f90.html#robo_top_of_doc" class="indexitem" >H5_ff_F03.f90</a>
-<a href="./src/H5_ff_F90_f90.html#robo_top_of_doc" class="indexitem" >H5_ff_F90.f90</a>
-<a href="./src/H5Aff_f90.html#robo27" class="indexitem" >H5A</a>
-<a href="./src/H5Aff_F03_f90.html#robo28" class="indexitem" >H5A (F03)</a>
-<a href="./src/H5Aff_F90_f90.html#robo29" class="indexitem" >H5A (F90)</a>
-<a href="./src/H5Aff_f90.html#robo85" class="indexitem" >h5aclose_f</a>
-<a href="./src/H5Aff_f90.html#robo86" class="indexitem" >h5acreate_by_name_f</a>
-<a href="./src/H5Aff_f90.html#robo87" class="indexitem" >h5acreate_f</a>
-<a href="./src/H5Aff_f90.html#robo88" class="indexitem" >h5adelete_by_idx_f</a>
-<a href="./src/H5Aff_f90.html#robo89" class="indexitem" >h5adelete_by_name_f</a>
-<a href="./src/H5Aff_f90.html#robo90" class="indexitem" >h5adelete_f</a>
-<a href="./src/H5Aff_f90.html#robo91" class="indexitem" >H5Aexists_by_name_f</a>
-<a href="./src/H5Aff_f90.html#robo92" class="indexitem" >H5Aexists_f</a>
-<a href="./src/H5Af_c.html#robo30" class="indexitem" >H5Af</a>
-<a href="./src/H5Af_c.html#robo_top_of_doc" class="indexitem" >H5Af.c</a>
-<a href="./src/H5Aff_f90.html#robo_top_of_doc" class="indexitem" >H5Aff.f90</a>
-<a href="./src/H5Aff_F03_f90.html#robo_top_of_doc" class="indexitem" >H5Aff_F03.f90</a>
-<a href="./src/H5Aff_F90_f90.html#robo_top_of_doc" class="indexitem" >H5Aff_F90.f90</a>
-<a href="./src/H5Aff_f90.html#robo93" class="indexitem" >h5aget_create_plist_f</a>
-<a href="./src/H5Aff_f90.html#robo94" class="indexitem" >h5aget_info_by_idx_f</a>
-<a href="./src/H5Aff_f90.html#robo95" class="indexitem" >h5aget_info_by_name_f</a>
-<a href="./src/H5Aff_f90.html#robo96" class="indexitem" >h5aget_info_f</a>
-<a href="./src/H5Aff_f90.html#robo97" class="indexitem" >h5aget_name_by_idx_f</a>
-<a href="./src/H5Aff_f90.html#robo98" class="indexitem" >h5aget_name_f</a>
-<a href="./src/H5Aff_f90.html#robo99" class="indexitem" >h5aget_num_attrs_f</a>
-<a href="./src/H5Aff_f90.html#robo100" class="indexitem" >h5aget_space_f</a>
-<a href="./src/H5Aff_f90.html#robo101" class="indexitem" >h5aget_storage_size_f</a>
-<a href="./src/H5Aff_f90.html#robo102" class="indexitem" >h5aget_type_f</a>
-<a href="./src/H5Aff_f90.html#robo103" class="indexitem" >h5aopen_by_idx_f</a>
-<a href="./src/H5Aff_f90.html#robo104" class="indexitem" >H5Aopen_by_name_f</a>
-<a href="./src/H5Aff_f90.html#robo105" class="indexitem" >h5aopen_f</a>
-<a href="./src/H5Aff_f90.html#robo106" class="indexitem" >h5aopen_idx_f</a>
-<a href="./src/H5Aff_f90.html#robo107" class="indexitem" >h5aopen_name_f</a>
-<a href="./src/H5Aff_F03_f90.html#robo108" class="indexitem" >h5aread_f</a>
-<a href="./src/H5Aff_f90.html#robo109" class="indexitem" >h5arename_by_name_f</a>
-<a href="./src/H5Aff_f90.html#robo110" class="indexitem" >h5arename_f</a>
-<a href="./src/H5_ff_f90.html#robo111" class="indexitem" >h5check_version_f</a>
-<a href="./src/H5_ff_f90.html#robo112" class="indexitem" >h5close_f</a>
-<a href="./src/H5Dff_f90.html#robo31" class="indexitem" >H5D</a>
-<a href="./src/H5Dff_F03_f90.html#robo32" class="indexitem" >H5D (F03)</a>
-<a href="./src/H5Dff_F90_f90.html#robo33" class="indexitem" >H5D (F90)</a>
-<a href="./src/H5Dff_f90.html#robo113" class="indexitem" >h5dclose_f</a>
-<a href="./src/H5Dff_f90.html#robo114" class="indexitem" >h5dcreate_anon_f</a>
-<a href="./src/H5Dff_f90.html#robo115" class="indexitem" >h5dcreate_f</a>
-<a href="./src/H5Df_c.html#robo34" class="indexitem" >H5Df</a>
-<a href="./src/H5Df_c.html#robo_top_of_doc" class="indexitem" >H5Df.c</a>
-<a href="./src/H5Dff_f90.html#robo_top_of_doc" class="indexitem" >H5Dff.f90</a>
-<a href="./src/H5Dff_F03_f90.html#robo_top_of_doc" class="indexitem" >H5Dff_F03.f90</a>
-<a href="./src/H5Dff_F90_f90.html#robo_top_of_doc" class="indexitem" >H5Dff_F90.f90</a>
-<a href="./src/H5Dff_f90.html#robo116" class="indexitem" >h5dget_access_plist_f</a>
-<a href="./src/H5Dff_f90.html#robo117" class="indexitem" >h5dget_create_plist_f</a>
-<a href="./src/H5Dff_f90.html#robo118" class="indexitem" >h5dget_space_f</a>
-<a href="./src/H5Dff_f90.html#robo119" class="indexitem" >h5dget_space_status_f</a>
-<a href="./src/H5Dff_f90.html#robo120" class="indexitem" >h5dget_storage_size_f</a>
-<a href="./src/H5Dff_f90.html#robo121" class="indexitem" >h5dget_type_f</a>
-<a href="./src/H5_ff_f90.html#robo122" class="indexitem" >h5dont_atexit_f</a>
-<a href="./src/H5Dff_f90.html#robo123" class="indexitem" >h5dopen_f</a>
-<a href="./src/H5Dff_F90_f90.html#robo124" class="indexitem" >h5dread_f</a>
-<a href="./src/H5Dff_f90.html#robo125" class="indexitem" >h5dset_extent</a>
-<a href="./src/H5Dff_f90.html#robo126" class="indexitem" >h5dvlen_get_max_len_f</a>
-<a href="./src/H5Dff_F03_f90.html#robo127" class="indexitem" >h5dvlen_reclaim</a>
-<a href="./src/H5Eff_f90.html#robo35" class="indexitem" >H5E</a>
-<a href="./src/H5Eff_F03_f90.html#robo36" class="indexitem" >H5E (F03)</a>
-<a href="./src/H5Eff_F90_f90.html#robo37" class="indexitem" >H5E (F90)</a>
-<a href="./src/H5Eff_f90.html#robo128" class="indexitem" >h5eclear_f</a>
-<a href="./src/H5Ef_c.html#robo38" class="indexitem" >H5Ef</a>
-<a href="./src/H5Ef_c.html#robo_top_of_doc" class="indexitem" >H5Ef.c</a>
-<a href="./src/H5Eff_f90.html#robo_top_of_doc" class="indexitem" >H5Eff.f90</a>
-<a href="./src/H5Eff_F03_f90.html#robo_top_of_doc" class="indexitem" >H5Eff_F03.f90</a>
-<a href="./src/H5Eff_F90_f90.html#robo_top_of_doc" class="indexitem" >H5Eff_F90.f90</a>
-<a href="./src/H5Eff_F03_f90.html#robo129" class="indexitem" >h5eget_auto_f</a>
-<a href="./src/H5Eff_f90.html#robo130" class="indexitem" >h5eget_major_f</a>
-<a href="./src/H5Eff_f90.html#robo131" class="indexitem" >h5eget_minor_f</a>
-<a href="./src/H5Eff_f90.html#robo132" class="indexitem" >h5eprint_f</a>
-<a href="./src/H5Eff_F03_f90.html#robo133" class="indexitem" >h5eset_auto2_f</a>
-<a href="./src/H5Eff_F90_f90.html#robo134" class="indexitem" >h5eset_auto_f</a>
-<a href="./src/H5Fff_f90.html#robo39" class="indexitem" >H5F</a>
-<a href="./src/H5f90global_f90.html#robo_top_of_doc" class="indexitem" >H5f90global.f90</a>
-<a href="./src/H5f90kit_c.html#robo40" class="indexitem" >H5f90kit</a>
-<a href="./src/H5f90kit_c.html#robo_top_of_doc" class="indexitem" >H5f90kit.c</a>
-<a href="./src/H5Fff_f90.html#robo135" class="indexitem" >h5fclose_f</a>
-<a href="./src/H5Fff_f90.html#robo136" class="indexitem" >h5fcreate_f</a>
-<a href="./src/H5FDmpioff_f90.html#robo41" class="indexitem" >H5FDMPIO</a>
-<a href="./src/H5FDmpiof_c.html#robo42" class="indexitem" >H5FDmpiof</a>
-<a href="./src/H5FDmpiof_c.html#robo_top_of_doc" class="indexitem" >H5FDmpiof.c</a>
-<a href="./src/H5FDmpioff_f90.html#robo_top_of_doc" class="indexitem" >H5FDmpioff.f90</a>
-<a href="./src/H5Ff_c.html#robo43" class="indexitem" >H5Ff</a>
-<a href="./src/H5Ff_c.html#robo_top_of_doc" class="indexitem" >H5Ff.c</a>
-<a href="./src/H5Fff_f90.html#robo_top_of_doc" class="indexitem" >H5Fff.f90</a>
-<a href="./src/H5Fff_f90.html#robo137" class="indexitem" >h5fflush_f</a>
-<a href="./src/H5Fff_f90.html#robo138" class="indexitem" >h5fget_access_plist_f</a>
-<a href="./src/H5Fff_f90.html#robo139" class="indexitem" >h5fget_create_plist_f</a>
-<a href="./src/H5Fff_f90.html#robo140" class="indexitem" >h5fget_filesize_f</a>
-<a href="./src/H5Fff_f90.html#robo141" class="indexitem" >h5fget_freespace_f</a>
-<a href="./src/H5Fff_f90.html#robo142" class="indexitem" >h5fget_name_f</a>
-<a href="./src/H5Fff_f90.html#robo143" class="indexitem" >h5fget_obj_count_f</a>
-<a href="./src/H5Fff_f90.html#robo144" class="indexitem" >h5fget_obj_ids_f</a>
-<a href="./src/H5Fff_f90.html#robo145" class="indexitem" >h5fis_hdf5_f</a>
-<a href="./src/H5Fff_f90.html#robo146" class="indexitem" >h5fmount_f</a>
-<a href="./src/H5Fff_f90.html#robo147" class="indexitem" >h5fopen_f</a>
-<a href="./src/H5Fff_f90.html#robo148" class="indexitem" >h5freopen_f</a>
-<a href="./src/H5Fff_f90.html#robo149" class="indexitem" >h5funmount_f</a>
-<a href="./src/H5Gff_f90.html#robo44" class="indexitem" >H5G</a>
-<a href="./src/H5_ff_f90.html#robo150" class="indexitem" >h5garbage_collect_f</a>
-<a href="./src/H5Gff_f90.html#robo151" class="indexitem" >h5gclose_f</a>
-<a href="./src/H5Gff_f90.html#robo152" class="indexitem" >H5Gcreate_anon_f</a>
-<a href="./src/H5Gff_f90.html#robo153" class="indexitem" >h5gcreate_f</a>
-<a href="./src/H5_ff_f90.html#robo154" class="indexitem" >h5get_libversion_f</a>
-<a href="./src/H5Gf_c.html#robo45" class="indexitem" >H5Gf</a>
-<a href="./src/H5Gf_c.html#robo_top_of_doc" class="indexitem" >H5Gf.c</a>
-<a href="./src/H5Gff_f90.html#robo_top_of_doc" class="indexitem" >H5Gff.f90</a>
-<a href="./src/H5Gff_f90.html#robo155" class="indexitem" >h5gget_comment_f</a>
-<a href="./src/H5Gff_f90.html#robo156" class="indexitem" >H5Gget_create_plist_f</a>
-<a href="./src/H5Gff_f90.html#robo157" class="indexitem" >h5gget_info_by_idx_f</a>
-<a href="./src/H5Gff_f90.html#robo158" class="indexitem" >h5gget_info_by_name_f</a>
-<a href="./src/H5Gff_f90.html#robo159" class="indexitem" >h5gget_info_f</a>
-<a href="./src/H5Gff_f90.html#robo160" class="indexitem" >h5gget_linkval_f</a>
-<a href="./src/H5Gff_f90.html#robo161" class="indexitem" >h5gget_obj_info_idx_f</a>
-<a href="./src/H5Gff_f90.html#robo162" class="indexitem" >h5glink2_f</a>
-<a href="./src/H5Gff_f90.html#robo163" class="indexitem" >h5glink_f</a>
-<a href="./src/H5f90global_f90.html#robo46" class="indexitem" >H5GLOBAL</a>
-<a href="./src/H5Gff_f90.html#robo164" class="indexitem" >h5gmove2_f</a>
-<a href="./src/H5Gff_f90.html#robo165" class="indexitem" >h5gmove_f</a>
-<a href="./src/H5Gff_f90.html#robo166" class="indexitem" >h5gn_members_f</a>
-<a href="./src/H5Gff_f90.html#robo167" class="indexitem" >h5gopen_f</a>
-<a href="./src/H5Gff_f90.html#robo168" class="indexitem" >h5gset_comment_f</a>
-<a href="./src/H5Gff_f90.html#robo169" class="indexitem" >h5gunlink_f</a>
-<a href="./src/H5Iff_f90.html#robo47" class="indexitem" >H5I</a>
-<a href="./src/H5Iff_f90.html#robo170" class="indexitem" >h5idec_ref_f</a>
-<a href="./src/H5If_c.html#robo48" class="indexitem" >H5If</a>
-<a href="./src/H5If_c.html#robo_top_of_doc" class="indexitem" >H5If.c</a>
-<a href="./src/H5Iff_f90.html#robo_top_of_doc" class="indexitem" >H5Iff.f90</a>
-<a href="./src/H5Iff_f90.html#robo171" class="indexitem" >h5iget_file_id_f</a>
-<a href="./src/H5Iff_f90.html#robo172" class="indexitem" >h5iget_name_f</a>
-<a href="./src/H5Iff_f90.html#robo173" class="indexitem" >h5iget_ref_f</a>
-<a href="./src/H5Iff_f90.html#robo174" class="indexitem" >h5iget_type_f</a>
-<a href="./src/H5Iff_f90.html#robo175" class="indexitem" >h5iinc_ref_f</a>
-<a href="./src/H5Iff_f90.html#robo176" class="indexitem" >h5iis_valid_f</a>
-<a href="./src/H5_ff_f90.html#robo177" class="indexitem" >h5kind_to_type</a>
-<a href="./src/H5Lff_f90.html#robo49" class="indexitem" >H5L</a>
-<a href="./src/H5Lff_F03_f90.html#robo50" class="indexitem" >H5L (F03)</a>
-<a href="./src/H5Lff_F90_f90.html#robo51" class="indexitem" >H5L (F90)</a>
-<a href="./src/H5Lff_f90.html#robo178" class="indexitem" >h5lcopy_f</a>
-<a href="./src/H5Lff_f90.html#robo179" class="indexitem" >H5Lcreate_external_f</a>
-<a href="./src/H5Lff_f90.html#robo180" class="indexitem" >H5Lcreate_hard_f</a>
-<a href="./src/H5Lff_f90.html#robo181" class="indexitem" >H5Lcreate_soft_f</a>
-<a href="./src/H5Lff_f90.html#robo182" class="indexitem" >h5ldelete_by_idx_f</a>
-<a href="./src/H5Lff_f90.html#robo183" class="indexitem" >h5ldelete_f</a>
-<a href="./src/H5Lff_f90.html#robo184" class="indexitem" >H5Lexists_f</a>
-<a href="./src/H5Lf_c.html#robo52" class="indexitem" >H5Lf</a>
-<a href="./src/H5Lf_c.html#robo_top_of_doc" class="indexitem" >H5Lf.c</a>
-<a href="./src/H5Lff_f90.html#robo_top_of_doc" class="indexitem" >H5Lff.f90</a>
-<a href="./src/H5Lff_F03_f90.html#robo_top_of_doc" class="indexitem" >H5Lff_F03.f90</a>
-<a href="./src/H5Lff_F90_f90.html#robo_top_of_doc" class="indexitem" >H5Lff_F90.f90</a>
-<a href="./src/H5Lff_f90.html#robo185" class="indexitem" >h5lget_info_by_idx_f</a>
-<a href="./src/H5Lff_f90.html#robo186" class="indexitem" >h5lget_info_f</a>
-<a href="./src/H5Lff_f90.html#robo187" class="indexitem" >h5lget_name_by_idx_f</a>
-<a href="./src/H5_ff_f90.html#robo53" class="indexitem" >H5LIB</a>
-<a href="./src/H5_ff_F03_f90.html#robo54" class="indexitem" >H5LIB_PROVISIONAL</a>
-<a href="./src/H5_ff_F90_f90.html#robo55" class="indexitem" >H5LIB_PROVISIONAL (F90)</a>
-<a href="./src/H5Lff_f90.html#robo188" class="indexitem" >h5lis_registered_f</a>
-<a href="./src/H5Lff_F03_f90.html#robo189" class="indexitem" >h5literate_by_name_f</a>
-<a href="./src/H5Lff_F03_f90.html#robo190" class="indexitem" >h5literate_f</a>
-<a href="./src/H5Lff_f90.html#robo191" class="indexitem" >h5lmove_f</a>
-<a href="./src/H5match_types_c.html#robo192" class="indexitem" >H5match_types</a>
-<a href="./src/H5match_types_c.html#robo_top_of_doc" class="indexitem" >H5match_types.c</a>
-<a href="./src/H5Off_f90.html#robo56" class="indexitem" >H5O</a>
-<a href="./src/H5Off_F03_f90.html#robo57" class="indexitem" >H5O (F03)</a>
-<a href="./src/H5Off_F90_f90.html#robo58" class="indexitem" >H5O (F90)</a>
-<a href="./src/H5Off_f90.html#robo193" class="indexitem" >h5oclose_f</a>
-<a href="./src/H5Of_c.html#robo59" class="indexitem" >H5Of</a>
-<a href="./src/H5Of_c.html#robo_top_of_doc" class="indexitem" >H5Of.c</a>
-<a href="./src/H5Off_f90.html#robo_top_of_doc" class="indexitem" >H5Off.f90</a>
-<a href="./src/H5Off_F03_f90.html#robo_top_of_doc" class="indexitem" >H5Off_F03.f90</a>
-<a href="./src/H5Off_F90_f90.html#robo_top_of_doc" class="indexitem" >H5Off_F90.f90</a>
-<a href="./src/H5_ff_F03_f90.html#robo194" class="indexitem" >h5offsetof</a>
-<a href="./src/H5Off_f90.html#robo195" class="indexitem" >h5olink_f</a>
-<a href="./src/H5Off_f90.html#robo196" class="indexitem" >h5oopen_f</a>
-<a href="./src/H5Off_f90.html#robo197" class="indexitem" >h5open_by_addr_f</a>
-<a href="./src/H5_ff_f90.html#robo198" class="indexitem" >h5open_f</a>
-<a href="./src/H5Off_F03_f90.html#robo199" class="indexitem" >h5ovisit_f</a>
-<a href="./src/H5Pff_F90_f90.html#robo60" class="indexitem" >H5P (_F90)</a>
-<a href="./src/H5Pff_F03_f90.html#robo61" class="indexitem" >H5P (F03)</a>
-<a href="./src/H5Pff_f90.html#robo62" class="indexitem" >H5P (F90)</a>
-<a href="./src/H5Pff_f90.html#robo200" class="indexitem" >h5pall_filters_avail_f</a>
-<a href="./src/H5Pff_f90.html#robo201" class="indexitem" >h5pclose_class_f</a>
-<a href="./src/H5Pff_f90.html#robo202" class="indexitem" >h5pclose_f</a>
-<a href="./src/H5Pff_f90.html#robo203" class="indexitem" >h5pcopy_f</a>
-<a href="./src/H5Pff_f90.html#robo204" class="indexitem" >h5pcopy_prop_f</a>
-<a href="./src/H5Pff_F03_f90.html#robo205" class="indexitem" >h5pcreate_class_f</a>
-<a href="./src/H5Pff_F90_f90.html#robo206" class="indexitem" >h5pcreate_class_f</a>
-<a href="./src/H5Pff_f90.html#robo207" class="indexitem" >h5pcreate_f</a>
-<a href="./src/H5Pff_f90.html#robo208" class="indexitem" >h5pequal_f</a>
-<a href="./src/H5Pff_f90.html#robo209" class="indexitem" >h5pexist_f</a>
-<a href="./src/H5Pf_c.html#robo63" class="indexitem" >H5Pf</a>
-<a href="./src/H5Pf_c.html#robo_top_of_doc" class="indexitem" >H5Pf.c</a>
-<a href="./src/H5Pff_f90.html#robo_top_of_doc" class="indexitem" >H5Pff.f90</a>
-<a href="./src/H5Pff_F03_f90.html#robo_top_of_doc" class="indexitem" >H5Pff_F03.f90</a>
-<a href="./src/H5Pff_F90_f90.html#robo_top_of_doc" class="indexitem" >H5Pff_F90.f90</a>
-<a href="./src/H5Pff_f90.html#robo210" class="indexitem" >h5pfill_value_defined_f</a>
-<a href="./src/H5Pff_f90.html#robo211" class="indexitem" >h5pget_alignment_f</a>
-<a href="./src/H5Pff_f90.html#robo212" class="indexitem" >h5pget_alloc_time_f</a>
-<a href="./src/H5Pff_f90.html#robo213" class="indexitem" >H5Pget_attr_creation_order_f</a>
-<a href="./src/H5Pff_f90.html#robo214" class="indexitem" >H5Pget_attr_phase_change_f</a>
-<a href="./src/H5Pff_f90.html#robo215" class="indexitem" >h5pget_btree_ratios_f</a>
-<a href="./src/H5Pff_f90.html#robo216" class="indexitem" >h5pget_buffer_f</a>
-<a href="./src/H5Pff_f90.html#robo217" class="indexitem" >h5pget_cache_f</a>
-<a href="./src/H5Pff_F03_f90.html#robo218" class="indexitem" >h5pget_char</a>
-<a href="./src/H5Pff_F90_f90.html#robo219" class="indexitem" >h5pget_char</a>
-<a href="./src/H5Pff_f90.html#robo220" class="indexitem" >H5Pget_char_encoding_f</a>
-<a href="./src/H5Pff_f90.html#robo221" class="indexitem" >H5Pget_chunk_cache_f</a>
-<a href="./src/H5Pff_f90.html#robo222" class="indexitem" >h5pget_chunk_f</a>
-<a href="./src/H5Pff_f90.html#robo223" class="indexitem" >h5pget_class_f</a>
-<a href="./src/H5Pff_f90.html#robo224" class="indexitem" >h5pget_class_name_f</a>
-<a href="./src/H5Pff_f90.html#robo225" class="indexitem" >h5pget_class_parent_f</a>
-<a href="./src/H5Pff_f90.html#robo226" class="indexitem" >h5pget_copy_object_f</a>
-<a href="./src/H5Pff_f90.html#robo227" class="indexitem" >H5Pget_create_inter_group_f</a>
-<a href="./src/H5Pff_f90.html#robo228" class="indexitem" >h5pget_data_transform_f</a>
-<a href="./src/H5Pff_F90_f90.html#robo229" class="indexitem" >h5pget_double</a>
-<a href="./src/H5Pff_f90.html#robo230" class="indexitem" >h5pget_driver_f</a>
-<a href="./src/H5FDmpioff_f90.html#robo231" class="indexitem" >h5pget_dxpl_mpio_f</a>
-<a href="./src/H5Pff_f90.html#robo232" class="indexitem" >h5pget_edc_check_f</a>
-<a href="./src/H5Pff_f90.html#robo233" class="indexitem" >H5Pget_est_link_info_f</a>
-<a href="./src/H5Pff_f90.html#robo234" class="indexitem" >h5pget_external_count_f</a>
-<a href="./src/H5Pff_f90.html#robo235" class="indexitem" >h5pget_external_f</a>
-<a href="./src/H5Pff_f90.html#robo236" class="indexitem" >h5pget_fapl_core_f</a>
-<a href="./src/H5Pff_f90.html#robo237" class="indexitem" >h5pget_fapl_direct_f</a>
-<a href="./src/H5Pff_f90.html#robo238" class="indexitem" >h5pget_fapl_family_f</a>
-<a href="./src/H5FDmpioff_f90.html#robo239" class="indexitem" >h5pget_fapl_mpio_f</a>
-<a href="./src/H5FDmpioff_f90.html#robo240" class="indexitem" >h5pget_fapl_mpiposix_f</a>
-<a href="./src/H5Pff_f90.html#robo241" class="indexitem" >h5pget_fapl_multi_f</a>
-<a href="./src/H5Pff_f90.html#robo242" class="indexitem" >h5pget_fclose_degree_f</a>
-<a href="./src/H5Pff_f90.html#robo243" class="indexitem" >h5pget_fill_time_f</a>
-<a href="./src/H5Pff_f90.html#robo244" class="indexitem" >h5pget_filter_by_id_f</a>
-<a href="./src/H5Pff_f90.html#robo245" class="indexitem" >h5pget_filter_f</a>
-<a href="./src/H5Pff_f90.html#robo246" class="indexitem" >h5pget_gc_references_f</a>
-<a href="./src/H5Pff_F03_f90.html#robo247" class="indexitem" >h5pget_integer</a>
-<a href="./src/H5Pff_F90_f90.html#robo248" class="indexitem" >h5pget_integer</a>
-<a href="./src/H5Pff_f90.html#robo249" class="indexitem" >h5pget_istore_k_f</a>
-<a href="./src/H5Pff_f90.html#robo250" class="indexitem" >h5pget_layout_f</a>
-<a href="./src/H5Pff_f90.html#robo251" class="indexitem" >H5Pget_link_creation_order_f</a>
-<a href="./src/H5Pff_f90.html#robo252" class="indexitem" >H5Pget_link_phase_change_f</a>
-<a href="./src/H5Pff_f90.html#robo253" class="indexitem" >H5Pget_local_heap_size_hint_f</a>
-<a href="./src/H5Pff_f90.html#robo254" class="indexitem" >h5pget_meta_block_size_f</a>
-<a href="./src/H5Pff_f90.html#robo255" class="indexitem" >h5pget_nfilters_f</a>
-<a href="./src/H5Pff_f90.html#robo256" class="indexitem" >h5pget_nlinks_f</a>
-<a href="./src/H5Pff_f90.html#robo257" class="indexitem" >h5pget_npros_f</a>
-<a href="./src/H5Pff_f90.html#robo258" class="indexitem" >H5Pget_obj_track_times_f</a>
-<a href="./src/H5Pff_f90.html#robo259" class="indexitem" >h5pget_preserve_f</a>
-<a href="./src/H5Pff_F90_f90.html#robo260" class="indexitem" >h5pget_real</a>
-<a href="./src/H5Pff_F03_f90.html#robo261" class="indexitem" >h5pget_real</a>
-<a href="./src/H5Pff_f90.html#robo262" class="indexitem" >h5pget_sec2_f</a>
-<a href="./src/H5Pff_f90.html#robo263" class="indexitem" >h5pget_sieve_buf_size_f</a>
-<a href="./src/H5Pff_f90.html#robo264" class="indexitem" >h5pget_size_f</a>
-<a href="./src/H5Pff_f90.html#robo265" class="indexitem" >h5pget_sizes_f</a>
-<a href="./src/H5Pff_f90.html#robo266" class="indexitem" >h5pget_small_data_block_size_f</a>
-<a href="./src/H5Pff_f90.html#robo267" class="indexitem" >h5pget_split_f</a>
-<a href="./src/H5Pff_f90.html#robo268" class="indexitem" >h5pget_stdio_f</a>
-<a href="./src/H5Pff_f90.html#robo269" class="indexitem" >h5pget_sym_k_f</a>
-<a href="./src/H5Pff_f90.html#robo270" class="indexitem" >h5pget_userblock_f</a>
-<a href="./src/H5Pff_f90.html#robo271" class="indexitem" >h5pget_version_f</a>
-<a href="./src/H5Pff_F03_f90.html#robo273" class="indexitem" >h5pinsert_char</a>
-<a href="./src/H5Pff_F90_f90.html#robo272" class="indexitem" >h5pinsert_char</a>
-<a href="./src/H5Pff_F90_f90.html#robo275" class="indexitem" >h5pinsert_double</a>
-<a href="./src/H5Pff_F03_f90.html#robo274" class="indexitem" >h5pinsert_double</a>
-<a href="./src/H5Pff_F90_f90.html#robo277" class="indexitem" >h5pinsert_integer</a>
-<a href="./src/H5Pff_F03_f90.html#robo276" class="indexitem" >h5pinsert_integer</a>
-<a href="./src/H5Pff_F03_f90.html#robo278" class="indexitem" >h5pinsert_ptr</a>
-<a href="./src/H5Pff_F90_f90.html#robo279" class="indexitem" >h5pinsert_real</a>
-<a href="./src/H5Pff_F03_f90.html#robo280" class="indexitem" >h5pinsert_real</a>
-<a href="./src/H5Pff_f90.html#robo281" class="indexitem" >h5pisa_class_f</a>
-<a href="./src/H5Pff_f90.html#robo282" class="indexitem" >h5pmodify_filter_f</a>
-<a href="./src/H5Pff_F03_f90.html#robo283" class="indexitem" >h5pregister_char</a>
-<a href="./src/H5Pff_F90_f90.html#robo284" class="indexitem" >h5pregister_char</a>
-<a href="./src/H5Pff_F03_f90.html#robo286" class="indexitem" >h5pregister_double</a>
-<a href="./src/H5Pff_F90_f90.html#robo285" class="indexitem" >h5pregister_double</a>
-<a href="./src/H5Pff_F90_f90.html#robo288" class="indexitem" >h5pregister_integer</a>
-<a href="./src/H5Pff_F03_f90.html#robo287" class="indexitem" >h5pregister_integer</a>
-<a href="./src/H5Pff_F03_f90.html#robo289" class="indexitem" >h5pregister_ptr</a>
-<a href="./src/H5Pff_F90_f90.html#robo290" class="indexitem" >h5pregister_real</a>
-<a href="./src/H5Pff_F03_f90.html#robo291" class="indexitem" >h5pregister_real</a>
-<a href="./src/H5Pff_f90.html#robo292" class="indexitem" >h5premove_f</a>
-<a href="./src/H5Pff_f90.html#robo293" class="indexitem" >h5premove_filter_f</a>
-<a href="./src/H5Pff_F90_f90.html#robo295" class="indexitem" >h5pset(get)fill_value_f</a>
-<a href="./src/H5Pff_F03_f90.html#robo294" class="indexitem" >h5pset(get)fill_value_f</a>
-<a href="./src/H5Pff_f90.html#robo296" class="indexitem" >h5pset_alignment_f</a>
-<a href="./src/H5Pff_f90.html#robo297" class="indexitem" >h5pset_alloc_time_f</a>
-<a href="./src/H5Pff_f90.html#robo298" class="indexitem" >H5Pset_attr_creation_order_f</a>
-<a href="./src/H5Pff_f90.html#robo299" class="indexitem" >H5Pset_attr_phase_change_f</a>
-<a href="./src/H5Pff_f90.html#robo300" class="indexitem" >h5pset_btree_ratios_f</a>
-<a href="./src/H5Pff_f90.html#robo301" class="indexitem" >h5pset_buffer_f</a>
-<a href="./src/H5Pff_f90.html#robo302" class="indexitem" >h5pset_cache_f</a>
-<a href="./src/H5Pff_F03_f90.html#robo303" class="indexitem" >h5pset_char</a>
-<a href="./src/H5Pff_F90_f90.html#robo304" class="indexitem" >h5pset_char</a>
-<a href="./src/H5Pff_f90.html#robo305" class="indexitem" >H5Pset_char_encoding_f</a>
-<a href="./src/H5Pff_f90.html#robo306" class="indexitem" >H5Pset_chunk_cache_f</a>
-<a href="./src/H5Pff_f90.html#robo307" class="indexitem" >h5pset_chunk_f</a>
-<a href="./src/H5Pff_f90.html#robo308" class="indexitem" >h5pset_copy_object_f</a>
-<a href="./src/H5Pff_f90.html#robo309" class="indexitem" >H5Pset_create_inter_group_f</a>
-<a href="./src/H5Pff_f90.html#robo310" class="indexitem" >h5pset_data_transform_f</a>
-<a href="./src/H5Pff_f90.html#robo311" class="indexitem" >h5pset_deflate_f</a>
-<a href="./src/H5Pff_F90_f90.html#robo312" class="indexitem" >h5pset_double</a>
-<a href="./src/H5Pff_F03_f90.html#robo313" class="indexitem" >h5pset_double</a>
-<a href="./src/H5FDmpioff_f90.html#robo314" class="indexitem" >h5pset_dxpl_mpio_f</a>
-<a href="./src/H5Pff_f90.html#robo315" class="indexitem" >h5pset_edc_check_f</a>
-<a href="./src/H5Pff_f90.html#robo316" class="indexitem" >h5pset_est_link_info_f</a>
-<a href="./src/H5Pff_f90.html#robo317" class="indexitem" >h5pset_external_f</a>
-<a href="./src/H5Pff_f90.html#robo318" class="indexitem" >h5pset_fapl_core_f</a>
-<a href="./src/H5Pff_f90.html#robo319" class="indexitem" >h5pset_fapl_direct_f</a>
-<a href="./src/H5FDmpioff_f90.html#robo320" class="indexitem" >h5pset_fapl_mpio_f</a>
-<a href="./src/H5FDmpioff_f90.html#robo321" class="indexitem" >h5pset_fapl_mpiposix_f</a>
-<a href="./src/H5Pff_f90.html#robo322" class="indexitem" >h5pset_fapl_multi_l</a>
-<a href="./src/H5Pff_f90.html#robo323" class="indexitem" >h5pset_fapl_multi_s</a>
-<a href="./src/H5Pff_f90.html#robo324" class="indexitem" >h5pset_fapl_sec2_f</a>
-<a href="./src/H5Pff_f90.html#robo325" class="indexitem" >h5pset_fapl_split_f</a>
-<a href="./src/H5Pff_f90.html#robo326" class="indexitem" >h5pset_fapl_stdio_f</a>
-<a href="./src/H5Pff_f90.html#robo327" class="indexitem" >h5pset_fclose_degree_f</a>
-<a href="./src/H5Pff_f90.html#robo328" class="indexitem" >h5pset_fill_time_f</a>
-<a href="./src/H5Pff_f90.html#robo329" class="indexitem" >h5pset_filter_f</a>
-<a href="./src/H5Pff_f90.html#robo330" class="indexitem" >h5pset_fletcher32_f</a>
-<a href="./src/H5Pff_f90.html#robo331" class="indexitem" >h5pset_gc_references_f</a>
-<a href="./src/H5Pff_f90.html#robo332" class="indexitem" >h5pset_hyper_vector_size_f</a>
-<a href="./src/H5Pff_F03_f90.html#robo334" class="indexitem" >h5pset_integer</a>
-<a href="./src/H5Pff_F90_f90.html#robo333" class="indexitem" >h5pset_integer</a>
-<a href="./src/H5Pff_f90.html#robo335" class="indexitem" >h5pset_istore_k_f</a>
-<a href="./src/H5Pff_f90.html#robo336" class="indexitem" >h5pset_layout_f</a>
-<a href="./src/H5Pff_f90.html#robo337" class="indexitem" >H5Pset_libver_bounds_f</a>
-<a href="./src/H5Pff_f90.html#robo338" class="indexitem" >H5Pset_link_creation_order_f</a>
-<a href="./src/H5Pff_f90.html#robo339" class="indexitem" >h5pset_link_phase_change_f</a>
-<a href="./src/H5Pff_f90.html#robo340" class="indexitem" >H5Pset_local_heap_size_hint_f</a>
-<a href="./src/H5Pff_f90.html#robo341" class="indexitem" >H5Pset_nbit_f</a>
-<a href="./src/H5Pff_f90.html#robo342" class="indexitem" >h5pset_nlinks_f</a>
-<a href="./src/H5Pff_f90.html#robo343" class="indexitem" >H5Pset_obj_track_times_f</a>
-<a href="./src/H5Pff_f90.html#robo344" class="indexitem" >h5pset_preserve_f</a>
-<a href="./src/H5Pff_F90_f90.html#robo346" class="indexitem" >h5pset_real</a>
-<a href="./src/H5Pff_F03_f90.html#robo345" class="indexitem" >h5pset_real</a>
-<a href="./src/H5Pff_f90.html#robo347" class="indexitem" >h5pset_scaleoffset_f</a>
-<a href="./src/H5Pff_f90.html#robo348" class="indexitem" >H5Pset_shared_mesg_index_f</a>
-<a href="./src/H5Pff_f90.html#robo349" class="indexitem" >H5Pset_shared_mesg_nindexes_f</a>
-<a href="./src/H5Pff_f90.html#robo350" class="indexitem" >h5pset_shuffle_f</a>
-<a href="./src/H5Pff_f90.html#robo351" class="indexitem" >h5pset_sieve_buf_size_f</a>
-<a href="./src/H5Pff_f90.html#robo352" class="indexitem" >h5pset_sizes_f</a>
-<a href="./src/H5Pff_f90.html#robo353" class="indexitem" >h5pset_small_data_block_size_f</a>
-<a href="./src/H5Pff_f90.html#robo354" class="indexitem" >h5pset_sym_k_f</a>
-<a href="./src/H5Pff_f90.html#robo355" class="indexitem" >h5pset_szip_f</a>
-<a href="./src/H5Pff_f90.html#robo356" class="indexitem" >h5pset_userblock_f</a>
-<a href="./src/H5Pff_f90.html#robo357" class="indexitem" >h5punregister_f</a>
-<a href="./src/H5Rff_f90.html#robo64" class="indexitem" >H5R</a>
-<a href="./src/H5Rff_F03_f90.html#robo65" class="indexitem" >H5R (F03)</a>
-<a href="./src/H5Rff_F90_f90.html#robo66" class="indexitem" >H5R (F90)</a>
-<a href="./src/H5Rff_F03_f90.html#robo358" class="indexitem" >h5rcreate_object_f</a>
-<a href="./src/H5Rff_F90_f90.html#robo359" class="indexitem" >h5rcreate_object_f</a>
-<a href="./src/H5Rff_F03_f90.html#robo360" class="indexitem" >h5rcreate_ptr_f</a>
-<a href="./src/H5Rff_F03_f90.html#robo362" class="indexitem" >h5rcreate_region_f</a>
-<a href="./src/H5Rff_F90_f90.html#robo361" class="indexitem" >h5rcreate_region_f</a>
-<a href="./src/H5Rff_F03_f90.html#robo363" class="indexitem" >h5rdereference_object_f</a>
-<a href="./src/H5Rff_F90_f90.html#robo364" class="indexitem" >h5rdereference_object_f</a>
-<a href="./src/H5Rff_F03_f90.html#robo365" class="indexitem" >h5rdereference_ptr_f</a>
-<a href="./src/H5Rff_F90_f90.html#robo367" class="indexitem" >h5rdereference_region_f</a>
-<a href="./src/H5Rff_F03_f90.html#robo366" class="indexitem" >h5rdereference_region_f</a>
-<a href="./src/H5Rf_c.html#robo67" class="indexitem" >H5Rf</a>
-<a href="./src/H5Rf_c.html#robo_top_of_doc" class="indexitem" >H5Rf.c</a>
-<a href="./src/H5Rff_f90.html#robo_top_of_doc" class="indexitem" >H5Rff.f90</a>
-<a href="./src/H5Rff_F03_f90.html#robo_top_of_doc" class="indexitem" >H5Rff_F03.f90</a>
-<a href="./src/H5Rff_F90_f90.html#robo_top_of_doc" class="indexitem" >H5Rff_F90.f90</a>
-<a href="./src/H5Rff_F03_f90.html#robo369" class="indexitem" >h5rget_name_object_f</a>
-<a href="./src/H5Rff_F90_f90.html#robo368" class="indexitem" >h5rget_name_object_f</a>
-<a href="./src/H5Rff_F03_f90.html#robo370" class="indexitem" >h5rget_name_ptr_f</a>
-<a href="./src/H5Rff_F90_f90.html#robo371" class="indexitem" >h5rget_name_region_f</a>
-<a href="./src/H5Rff_F03_f90.html#robo372" class="indexitem" >h5rget_name_region_f</a>
-<a href="./src/H5Rff_F03_f90.html#robo373" class="indexitem" >h5rget_obj_type_f</a>
-<a href="./src/H5Rff_f90.html#robo374" class="indexitem" >h5rget_object_type_obj_f</a>
-<a href="./src/H5Rff_f90.html#robo375" class="indexitem" >h5rget_region_region_f</a>
-<a href="./src/H5Sff_f90.html#robo68" class="indexitem" >H5S</a>
-<a href="./src/H5Sff_f90.html#robo376" class="indexitem" >h5sclose_f</a>
-<a href="./src/H5Sff_f90.html#robo377" class="indexitem" >h5scopy_f</a>
-<a href="./src/H5Sff_f90.html#robo378" class="indexitem" >h5screate_f</a>
-<a href="./src/H5Sff_f90.html#robo379" class="indexitem" >h5screate_simple_f</a>
-<a href="./src/H5Sff_f90.html#robo380" class="indexitem" >H5Sdecode_f</a>
-<a href="./src/H5Sff_f90.html#robo381" class="indexitem" >H5Sencode_f</a>
-<a href="./src/H5Sff_f90.html#robo382" class="indexitem" >h5sextent_copy_f</a>
-<a href="./src/H5Sff_f90.html#robo383" class="indexitem" >h5sextent_equal_f</a>
-<a href="./src/H5Sf_c.html#robo69" class="indexitem" >H5Sf</a>
-<a href="./src/H5Sf_c.html#robo_top_of_doc" class="indexitem" >H5Sf.c</a>
-<a href="./src/H5Sff_f90.html#robo_top_of_doc" class="indexitem" >H5Sff.f90</a>
-<a href="./src/H5Sff_f90.html#robo384" class="indexitem" >h5sget_select_bounds_f</a>
-<a href="./src/H5Sff_f90.html#robo385" class="indexitem" >h5sget_select_elem_npoints_f</a>
-<a href="./src/H5Sff_f90.html#robo386" class="indexitem" >h5sget_select_elem_pointlist_f</a>
-<a href="./src/H5Sff_f90.html#robo387" class="indexitem" >h5sget_select_hyper_blocklist_f</a>
-<a href="./src/H5Sff_f90.html#robo388" class="indexitem" >h5sget_select_hyper_nblocks_f</a>
-<a href="./src/H5Sff_f90.html#robo389" class="indexitem" >h5sget_select_npoints_f</a>
-<a href="./src/H5Sff_f90.html#robo390" class="indexitem" >h5sget_select_type_f</a>
-<a href="./src/H5Sff_f90.html#robo391" class="indexitem" >h5sget_simple_extent_dims_f</a>
-<a href="./src/H5Sff_f90.html#robo392" class="indexitem" >h5sget_simple_extent_ndims_f</a>
-<a href="./src/H5Sff_f90.html#robo393" class="indexitem" >h5sget_simple_extent_npoints_f</a>
-<a href="./src/H5Sff_f90.html#robo394" class="indexitem" >h5sget_simple_extent_type_f</a>
-<a href="./src/H5Sff_f90.html#robo395" class="indexitem" >h5sis_simple_f</a>
-<a href="./src/H5Sff_f90.html#robo396" class="indexitem" >h5soffset_simple_f</a>
-<a href="./src/H5Sff_f90.html#robo397" class="indexitem" >h5sselect_all_f</a>
-<a href="./src/H5Sff_f90.html#robo398" class="indexitem" >h5sselect_elements_f</a>
-<a href="./src/H5Sff_f90.html#robo399" class="indexitem" >h5sselect_hyperslab_f</a>
-<a href="./src/H5Sff_f90.html#robo400" class="indexitem" >h5sselect_none_f</a>
-<a href="./src/H5Sff_f90.html#robo401" class="indexitem" >h5sselect_valid_f</a>
-<a href="./src/H5Sff_f90.html#robo402" class="indexitem" >h5sset_extent_none_f</a>
-<a href="./src/H5Sff_f90.html#robo403" class="indexitem" >h5sset_extent_simple_f</a>
-<a href="./src/H5Tff_f90.html#robo70" class="indexitem" >H5T</a>
-<a href="./src/H5Tff_F03_f90.html#robo71" class="indexitem" >H5T (F03)</a>
-<a href="./src/H5Tff_F90_f90.html#robo72" class="indexitem" >H5T (F90)</a>
-<a href="./src/H5Tff_f90.html#robo404" class="indexitem" >h5tarray_create_f</a>
-<a href="./src/H5Tff_f90.html#robo405" class="indexitem" >h5tclose_f</a>
-<a href="./src/H5Tff_f90.html#robo406" class="indexitem" >h5tcommit_anon_f</a>
-<a href="./src/H5Tff_f90.html#robo407" class="indexitem" >h5tcommit_f</a>
-<a href="./src/H5Tff_f90.html#robo408" class="indexitem" >h5tcommitted_f</a>
-<a href="./src/H5Tff_f90.html#robo409" class="indexitem" >h5tcompiler_conv_f</a>
-<a href="./src/H5Tff_F03_f90.html#robo410" class="indexitem" >H5Tconvert_f</a>
-<a href="./src/H5Tff_f90.html#robo411" class="indexitem" >h5tcopy_f</a>
-<a href="./src/H5Tff_f90.html#robo412" class="indexitem" >h5tcreate_f</a>
-<a href="./src/H5Tff_f90.html#robo413" class="indexitem" >H5Tdecode_f</a>
-<a href="./src/H5Tff_f90.html#robo414" class="indexitem" >h5tenaum_insert_f</a>
-<a href="./src/H5Tff_f90.html#robo415" class="indexitem" >H5Tencode_f</a>
-<a href="./src/H5Tff_f90.html#robo416" class="indexitem" >h5tenum_create_f</a>
-<a href="./src/H5Tff_f90.html#robo417" class="indexitem" >h5tenum_nameof_f</a>
-<a href="./src/H5Tff_f90.html#robo418" class="indexitem" >h5tenum_valuof_f</a>
-<a href="./src/H5Tff_f90.html#robo419" class="indexitem" >h5tequal_f</a>
-<a href="./src/H5test_kind_f90.html#robo420" class="indexitem" >H5test_kind</a>
-<a href="./src/H5test_kind_f90.html#robo_top_of_doc" class="indexitem" >H5test_kind.f90</a>
-<a href="./src/H5test_kind_SIZEOF_f90.html#robo421" class="indexitem" >H5test_kind_SIZEOF</a>
-<a href="./src/H5test_kind_SIZEOF_f90.html#robo_top_of_doc" class="indexitem" >H5test_kind_SIZEOF.f90</a>
-<a href="./src/H5Tf_c.html#robo73" class="indexitem" >H5Tf</a>
-<a href="./src/H5Tf_c.html#robo_top_of_doc" class="indexitem" >H5Tf.c</a>
-<a href="./src/H5Tff_f90.html#robo_top_of_doc" class="indexitem" >H5Tff.f90</a>
-<a href="./src/H5Tff_F03_f90.html#robo_top_of_doc" class="indexitem" >H5Tff_F03.f90</a>
-<a href="./src/H5Tff_F90_f90.html#robo_top_of_doc" class="indexitem" >H5Tff_F90.f90</a>
-<a href="./src/H5Tff_f90.html#robo422" class="indexitem" >h5tget_array_dims_f</a>
-<a href="./src/H5Tff_f90.html#robo423" class="indexitem" >h5tget_array_ndims_f</a>
-<a href="./src/H5Tff_f90.html#robo424" class="indexitem" >h5tget_class_f</a>
-<a href="./src/H5Tff_f90.html#robo425" class="indexitem" >h5tget_create_plist_f</a>
-<a href="./src/H5Tff_f90.html#robo426" class="indexitem" >h5tget_cset_f</a>
-<a href="./src/H5Tff_f90.html#robo427" class="indexitem" >h5tget_ebias_f</a>
-<a href="./src/H5Tff_f90.html#robo428" class="indexitem" >h5tget_fields_f</a>
-<a href="./src/H5Tff_f90.html#robo429" class="indexitem" >h5tget_inpad_f</a>
-<a href="./src/H5Tff_f90.html#robo430" class="indexitem" >h5tget_member_class_f</a>
-<a href="./src/H5Tff_f90.html#robo431" class="indexitem" >h5tget_member_index_f</a>
-<a href="./src/H5Tff_f90.html#robo432" class="indexitem" >h5tget_member_name_f</a>
-<a href="./src/H5Tff_f90.html#robo433" class="indexitem" >h5tget_member_offset_f</a>
-<a href="./src/H5Tff_f90.html#robo434" class="indexitem" >h5tget_member_type_f</a>
-<a href="./src/H5Tff_f90.html#robo435" class="indexitem" >h5tget_member_value_f</a>
-<a href="./src/H5Tff_f90.html#robo436" class="indexitem" >h5tget_native_type_f</a>
-<a href="./src/H5Tff_f90.html#robo437" class="indexitem" >h5tget_nmembers_f</a>
-<a href="./src/H5Tff_f90.html#robo438" class="indexitem" >h5tget_norm_f</a>
-<a href="./src/H5Tff_f90.html#robo439" class="indexitem" >h5tget_offset_f</a>
-<a href="./src/H5Tff_f90.html#robo440" class="indexitem" >h5tget_order_f</a>
-<a href="./src/H5Tff_f90.html#robo441" class="indexitem" >h5tget_pad_f</a>
-<a href="./src/H5Tff_f90.html#robo442" class="indexitem" >h5tget_precision_f</a>
-<a href="./src/H5Tff_f90.html#robo443" class="indexitem" >h5tget_sign_f</a>
-<a href="./src/H5Tff_f90.html#robo444" class="indexitem" >h5tget_size_f</a>
-<a href="./src/H5Tff_f90.html#robo445" class="indexitem" >h5tget_strpad_f</a>
-<a href="./src/H5Tff_f90.html#robo446" class="indexitem" >h5tget_super_f</a>
-<a href="./src/H5Tff_f90.html#robo447" class="indexitem" >h5tget_tag_f</a>
-<a href="./src/H5Tff_f90.html#robo448" class="indexitem" >h5tinsert_f</a>
-<a href="./src/H5Tff_f90.html#robo449" class="indexitem" >h5tis_variable_str_f</a>
-<a href="./src/H5Tff_f90.html#robo450" class="indexitem" >h5topen_f</a>
-<a href="./src/H5Tff_f90.html#robo451" class="indexitem" >h5tpack_f</a>
-<a href="./src/H5Tff_f90.html#robo452" class="indexitem" >h5tset_cset_f</a>
-<a href="./src/H5Tff_f90.html#robo453" class="indexitem" >h5tset_ebias_f</a>
-<a href="./src/H5Tff_f90.html#robo454" class="indexitem" >h5tset_fields_f</a>
-<a href="./src/H5Tff_f90.html#robo455" class="indexitem" >h5tset_inpad_f</a>
-<a href="./src/H5Tff_f90.html#robo456" class="indexitem" >h5tset_norm_f</a>
-<a href="./src/H5Tff_f90.html#robo457" class="indexitem" >h5tset_offset_f</a>
-<a href="./src/H5Tff_f90.html#robo458" class="indexitem" >h5tset_order_f</a>
-<a href="./src/H5Tff_f90.html#robo459" class="indexitem" >h5tset_pad_f</a>
-<a href="./src/H5Tff_f90.html#robo460" class="indexitem" >h5tset_precision_f</a>
-<a href="./src/H5Tff_f90.html#robo461" class="indexitem" >h5tset_sign_f</a>
-<a href="./src/H5Tff_f90.html#robo462" class="indexitem" >h5tset_size_f</a>
-<a href="./src/H5Tff_f90.html#robo463" class="indexitem" >h5tset_strpad_f</a>
-<a href="./src/H5Tff_f90.html#robo464" class="indexitem" >h5tset_tag_f</a>
-<a href="./src/H5Tff_f90.html#robo465" class="indexitem" >h5tvlen_create_f</a>
-<a href="./src/H5Zff_f90.html#robo74" class="indexitem" >H5Z</a>
-<a href="./src/H5Zf_c.html#robo75" class="indexitem" >H5Zf</a>
-<a href="./src/H5Zf_c.html#robo_top_of_doc" class="indexitem" >H5Zf.c</a>
-<a href="./src/H5Zff_f90.html#robo_top_of_doc" class="indexitem" >H5Zff.f90</a>
-<a href="./src/H5Zff_f90.html#robo466" class="indexitem" >h5zfilter_avail_f</a>
-<a href="./src/H5Zff_f90.html#robo467" class="indexitem" >h5zget_filter_info_f</a>
-<a href="./src/H5Zff_f90.html#robo468" class="indexitem" >h5zunregister_f</a>
-<a href="./src/HDF5_f90.html#robo76" class="indexitem" >HDF5</a>
-<a href="./src/HDF5mpio_f90.html#robo77" class="indexitem" >HDF5 (mpio)</a>
-<a href="./src/HDF5_f90.html#robo_top_of_doc" class="indexitem" >HDF5.f90</a>
-<a href="./src/HDF5mpio_f90.html#robo_top_of_doc" class="indexitem" >HDF5mpio.f90</a>
-<h2><a name="S"></a>S</h2><a href="./src/H5_DBLE_InterfaceExclude_f90.html#robo78" class="indexitem" >src/H5_DBLE_InterfaceExclude.f90</a>
-<a href="./src/H5_DBLE_InterfaceInclude_f90.html#robo79" class="indexitem" >src/H5_DBLE_InterfaceInclude.f90</a>
-<h2><a name="T"></a>T</h2><a href="./test/t_c.html#robo_top_of_doc" class="indexitem" >t.c</a>
-<a href="./test/tf_f90.html#robo_top_of_doc" class="indexitem" >tf.f90</a>
-<a href="./test/tH5A_f90.html#robo_top_of_doc" class="indexitem" >tH5A.f90</a>
-<a href="./test/tH5A_1_8_f90.html#robo_top_of_doc" class="indexitem" >tH5A_1_8.f90</a>
-<a href="./test/tH5D_f90.html#robo_top_of_doc" class="indexitem" >tH5D.f90</a>
-<a href="./test/tH5E_f90.html#robo_top_of_doc" class="indexitem" >tH5E.f90</a>
-<a href="./test/tH5E_F03_f90.html#robo_top_of_doc" class="indexitem" >tH5E_F03.f90</a>
-<a href="./test/tH5F_f90.html#robo_top_of_doc" class="indexitem" >tH5F.f90</a>
-<a href="./test/tH5G_f90.html#robo_top_of_doc" class="indexitem" >tH5G.f90</a>
-<a href="./test/tH5G_1_8_f90.html#robo_top_of_doc" class="indexitem" >tH5G_1_8.f90</a>
-<a href="./test/tH5I_f90.html#robo_top_of_doc" class="indexitem" >tH5I.f90</a>
-<a href="./test/tH5L_F03_f90.html#robo_top_of_doc" class="indexitem" >tH5L_F03.f90</a>
-<a href="./test/tH5O_f90.html#robo_top_of_doc" class="indexitem" >tH5O.f90</a>
-<a href="./test/tH5P_f90.html#robo_top_of_doc" class="indexitem" >tH5P.f90</a>
-<a href="./test/tH5P_F03_f90.html#robo_top_of_doc" class="indexitem" >tH5P_F03.f90</a>
-<a href="./test/tH5R_f90.html#robo_top_of_doc" class="indexitem" >tH5R.f90</a>
-<a href="./test/tH5S_f90.html#robo_top_of_doc" class="indexitem" >tH5S.f90</a>
-<a href="./test/tH5Sselect_f90.html#robo_top_of_doc" class="indexitem" >tH5Sselect.f90</a>
-<a href="./test/tH5T_f90.html#robo_top_of_doc" class="indexitem" >tH5T.f90</a>
-<a href="./test/tH5T_F03_f90.html#robo_top_of_doc" class="indexitem" >tH5T_F03.f90</a>
-<a href="./test/tH5VL_f90.html#robo_top_of_doc" class="indexitem" >tH5VL.f90</a>
-<a href="./test/tH5Z_f90.html#robo_top_of_doc" class="indexitem" >tH5Z.f90</a>
-<h2><a href="#A">A</a> - <a href="#B">B</a> - <a href="#C">C</a> - <a href="#D">D</a> - <a href="#E">E</a> - <a href="#F">F</a> - <a href="#G">G</a> - <a href="#H">H</a> - <a href="#I">I</a> - <a href="#J">J</a> - <a href="#K">K</a> - <a href="#L">L</a> - <a href="#M">M</a> - <a href="#N">N</a> - <a href="#O">O</a> - <a href="#P">P</a> - <a href="#Q">Q</a> - <a href="#R">R</a> - <a href="#S">S</a> - <a href="#T">T</a> - <a href="#U">U</a> - <a href="#V">V</a> - <a href="#W">W</a> - <a href="#X">X</a> - <a href="#Y">Y</a> - <a href="#Z">Z</a> - <a href="#0">0</a> - <a href="#1">1</a> - <a href="#2">2</a> - <a href="#3">3</a> - <a href="#4">4</a> - <a href="#5">5</a> - <a href="#6">6</a> - <a href="#7">7</a> - <a href="#8">8</a> - <a href="#9">9</a></h2>
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./ on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/robo_functions.html b/fortran/doc/DevelGuide/robo_functions.html
deleted file mode 100644
index e4f253a..0000000
--- a/fortran/doc/DevelGuide/robo_functions.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="./robodoc.css" type="text/css" />
-<title>Functions</title>
-<!-- Source: ./ -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="extra">
-</div> <!-- extra -->
-<div id="navigation">
-<a class="menuitem" href="./toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="./robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="./masterindex.html#top">Index</a>
-<a class="menuitem" href="#top">Functions</a>
-<a class="menuitem" href="./robo_modules.html#top">Modules</a>
-<a class="menuitem" href="./robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="./robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<h1>Functions</h1>
-<h2><a href="#A">A</a> - <a href="#B">B</a> - <a href="#C">C</a> - <a href="#D">D</a> - <a href="#E">E</a> - <a href="#F">F</a> - <a href="#G">G</a> - <a href="#H">H</a> - <a href="#I">I</a> - <a href="#J">J</a> - <a href="#K">K</a> - <a href="#L">L</a> - <a href="#M">M</a> - <a href="#N">N</a> - <a href="#O">O</a> - <a href="#P">P</a> - <a href="#Q">Q</a> - <a href="#R">R</a> - <a href="#S">S</a> - <a href="#T">T</a> - <a href="#U">U</a> - <a href="#V">V</a> - <a href="#W">W</a> - <a href="#X">X</a> - <a href="#Y">Y</a> - <a href="#Z">Z</a> - <a href="#0">0</a> - <a href="#1">1</a> - <a href="#2">2</a> - <a href="#3">3</a> - <a href="#4">4</a> - <a href="#5">5</a> - <a href="#6">6</a> - <a href="#7">7</a> - <a href="#8">8</a> - <a href="#9">9</a></h2>
-<h2><a name="H"></a>H</h2><a href="./src/H5_ff_f90.html#robo177" class="indexitem" >h5kind_to_type</a>
-<a href="./src/H5_ff_F03_f90.html#robo194" class="indexitem" >h5offsetof</a>
-<h2><a href="#A">A</a> - <a href="#B">B</a> - <a href="#C">C</a> - <a href="#D">D</a> - <a href="#E">E</a> - <a href="#F">F</a> - <a href="#G">G</a> - <a href="#H">H</a> - <a href="#I">I</a> - <a href="#J">J</a> - <a href="#K">K</a> - <a href="#L">L</a> - <a href="#M">M</a> - <a href="#N">N</a> - <a href="#O">O</a> - <a href="#P">P</a> - <a href="#Q">Q</a> - <a href="#R">R</a> - <a href="#S">S</a> - <a href="#T">T</a> - <a href="#U">U</a> - <a href="#V">V</a> - <a href="#W">W</a> - <a href="#X">X</a> - <a href="#Y">Y</a> - <a href="#Z">Z</a> - <a href="#0">0</a> - <a href="#1">1</a> - <a href="#2">2</a> - <a href="#3">3</a> - <a href="#4">4</a> - <a href="#5">5</a> - <a href="#6">6</a> - <a href="#7">7</a> - <a href="#8">8</a> - <a href="#9">9</a></h2>
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./ on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/robo_modules.html b/fortran/doc/DevelGuide/robo_modules.html
deleted file mode 100644
index 8e57f38..0000000
--- a/fortran/doc/DevelGuide/robo_modules.html
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="./robodoc.css" type="text/css" />
-<title>Modules</title>
-<!-- Source: ./ -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="extra">
-</div> <!-- extra -->
-<div id="navigation">
-<a class="menuitem" href="./toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="./robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="./masterindex.html#top">Index</a>
-<a class="menuitem" href="./robo_functions.html#top">Functions</a>
-<a class="menuitem" href="#top">Modules</a>
-<a class="menuitem" href="./robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="./robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<h1>Modules</h1>
-<h2><a href="#A">A</a> - <a href="#B">B</a> - <a href="#C">C</a> - <a href="#D">D</a> - <a href="#E">E</a> - <a href="#F">F</a> - <a href="#G">G</a> - <a href="#H">H</a> - <a href="#I">I</a> - <a href="#J">J</a> - <a href="#K">K</a> - <a href="#L">L</a> - <a href="#M">M</a> - <a href="#N">N</a> - <a href="#O">O</a> - <a href="#P">P</a> - <a href="#Q">Q</a> - <a href="#R">R</a> - <a href="#S">S</a> - <a href="#T">T</a> - <a href="#U">U</a> - <a href="#V">V</a> - <a href="#W">W</a> - <a href="#X">X</a> - <a href="#Y">Y</a> - <a href="#Z">Z</a> - <a href="#0">0</a> - <a href="#1">1</a> - <a href="#2">2</a> - <a href="#3">3</a> - <a href="#4">4</a> - <a href="#5">5</a> - <a href="#6">6</a> - <a href="#7">7</a> - <a href="#8">8</a> - <a href="#9">9</a></h2>
-<h2><a name="F"></a>F</h2><a href="./test/fflush1_f90.html#robo0" class="indexitem" >fortran/test/fflush1.f90</a>
-<a href="./test/fflush2_f90.html#robo1" class="indexitem" >fortran/test/fflush2.f90</a>
-<a href="./test/fortranlib_test_f90.html#robo2" class="indexitem" >fortran/test/fortranlib_test.f90</a>
-<a href="./test/fortranlib_test_1_8_f90.html#robo3" class="indexitem" >fortran/test/fortranlib_test_1_8.f90</a>
-<a href="./test/fortranlib_test_F03_f90.html#robo4" class="indexitem" >fortran/test/fortranlib_test_F03.f90</a>
-<a href="./test/t_c.html#robo5" class="indexitem" >fortran/test/tc.c</a>
-<a href="./test/tf_f90.html#robo6" class="indexitem" >fortran/test/tf.f90</a>
-<a href="./test/tH5A_f90.html#robo7" class="indexitem" >fortran/test/tH5A.f90</a>
-<a href="./test/tH5A_1_8_f90.html#robo8" class="indexitem" >fortran/test/tH5A_1_8.f90</a>
-<a href="./test/tH5D_f90.html#robo9" class="indexitem" >fortran/test/tH5D.f90</a>
-<a href="./test/tH5E_f90.html#robo10" class="indexitem" >fortran/test/tH5E.f90</a>
-<a href="./test/tH5E_F03_f90.html#robo11" class="indexitem" >fortran/test/tH5E_F03.f90</a>
-<a href="./test/tH5F_f90.html#robo12" class="indexitem" >fortran/test/tH5F.f90</a>
-<a href="./test/tH5G_f90.html#robo13" class="indexitem" >fortran/test/tH5G.f90</a>
-<a href="./test/tH5G_1_8_f90.html#robo14" class="indexitem" >fortran/test/tH5G_1_8.f90</a>
-<a href="./test/tH5I_f90.html#robo15" class="indexitem" >fortran/test/tH5I.f90</a>
-<a href="./test/tH5L_F03_f90.html#robo16" class="indexitem" >fortran/test/tH5L_F03.f90</a>
-<a href="./test/tH5O_f90.html#robo17" class="indexitem" >fortran/test/tH5O.f90</a>
-<a href="./test/tH5P_f90.html#robo18" class="indexitem" >fortran/test/tH5P.f90</a>
-<a href="./test/tH5P_F03_f90.html#robo19" class="indexitem" >fortran/test/tH5P_F03.f90</a>
-<a href="./test/tH5R_f90.html#robo20" class="indexitem" >fortran/test/tH5R.f90</a>
-<a href="./test/tH5S_f90.html#robo21" class="indexitem" >fortran/test/tH5S.f90</a>
-<a href="./test/tH5Sselect_f90.html#robo22" class="indexitem" >fortran/test/tH5Sselect.f90</a>
-<a href="./test/tH5T_f90.html#robo23" class="indexitem" >fortran/test/tH5T.f90</a>
-<a href="./test/tH5T_F03_f90.html#robo24" class="indexitem" >fortran/test/tH5T_F03.f90</a>
-<a href="./test/tH5VL_f90.html#robo25" class="indexitem" >fortran/test/tH5VL.f90</a>
-<a href="./test/tH5Z_f90.html#robo26" class="indexitem" >fortran/test/tH5Z.f90</a>
-<h2><a name="H"></a>H</h2><a href="./src/H5Aff_f90.html#robo27" class="indexitem" >H5A</a>
-<a href="./src/H5Aff_F03_f90.html#robo28" class="indexitem" >H5A (F03)</a>
-<a href="./src/H5Aff_F90_f90.html#robo29" class="indexitem" >H5A (F90)</a>
-<a href="./src/H5Af_c.html#robo30" class="indexitem" >H5Af</a>
-<a href="./src/H5Dff_f90.html#robo31" class="indexitem" >H5D</a>
-<a href="./src/H5Dff_F03_f90.html#robo32" class="indexitem" >H5D (F03)</a>
-<a href="./src/H5Dff_F90_f90.html#robo33" class="indexitem" >H5D (F90)</a>
-<a href="./src/H5Df_c.html#robo34" class="indexitem" >H5Df</a>
-<a href="./src/H5Eff_f90.html#robo35" class="indexitem" >H5E</a>
-<a href="./src/H5Eff_F03_f90.html#robo36" class="indexitem" >H5E (F03)</a>
-<a href="./src/H5Eff_F90_f90.html#robo37" class="indexitem" >H5E (F90)</a>
-<a href="./src/H5Ef_c.html#robo38" class="indexitem" >H5Ef</a>
-<a href="./src/H5Fff_f90.html#robo39" class="indexitem" >H5F</a>
-<a href="./src/H5f90kit_c.html#robo40" class="indexitem" >H5f90kit</a>
-<a href="./src/H5FDmpioff_f90.html#robo41" class="indexitem" >H5FDMPIO</a>
-<a href="./src/H5FDmpiof_c.html#robo42" class="indexitem" >H5FDmpiof</a>
-<a href="./src/H5Ff_c.html#robo43" class="indexitem" >H5Ff</a>
-<a href="./src/H5Gff_f90.html#robo44" class="indexitem" >H5G</a>
-<a href="./src/H5Gf_c.html#robo45" class="indexitem" >H5Gf</a>
-<a href="./src/H5f90global_f90.html#robo46" class="indexitem" >H5GLOBAL</a>
-<a href="./src/H5Iff_f90.html#robo47" class="indexitem" >H5I</a>
-<a href="./src/H5If_c.html#robo48" class="indexitem" >H5If</a>
-<a href="./src/H5Lff_f90.html#robo49" class="indexitem" >H5L</a>
-<a href="./src/H5Lff_F03_f90.html#robo50" class="indexitem" >H5L (F03)</a>
-<a href="./src/H5Lff_F90_f90.html#robo51" class="indexitem" >H5L (F90)</a>
-<a href="./src/H5Lf_c.html#robo52" class="indexitem" >H5Lf</a>
-<a href="./src/H5_ff_f90.html#robo53" class="indexitem" >H5LIB</a>
-<a href="./src/H5_ff_F03_f90.html#robo54" class="indexitem" >H5LIB_PROVISIONAL</a>
-<a href="./src/H5_ff_F90_f90.html#robo55" class="indexitem" >H5LIB_PROVISIONAL (F90)</a>
-<a href="./src/H5Off_f90.html#robo56" class="indexitem" >H5O</a>
-<a href="./src/H5Off_F03_f90.html#robo57" class="indexitem" >H5O (F03)</a>
-<a href="./src/H5Off_F90_f90.html#robo58" class="indexitem" >H5O (F90)</a>
-<a href="./src/H5Of_c.html#robo59" class="indexitem" >H5Of</a>
-<a href="./src/H5Pff_F90_f90.html#robo60" class="indexitem" >H5P (_F90)</a>
-<a href="./src/H5Pff_F03_f90.html#robo61" class="indexitem" >H5P (F03)</a>
-<a href="./src/H5Pff_f90.html#robo62" class="indexitem" >H5P (F90)</a>
-<a href="./src/H5Pf_c.html#robo63" class="indexitem" >H5Pf</a>
-<a href="./src/H5Rff_f90.html#robo64" class="indexitem" >H5R</a>
-<a href="./src/H5Rff_F03_f90.html#robo65" class="indexitem" >H5R (F03)</a>
-<a href="./src/H5Rff_F90_f90.html#robo66" class="indexitem" >H5R (F90)</a>
-<a href="./src/H5Rf_c.html#robo67" class="indexitem" >H5Rf</a>
-<a href="./src/H5Sff_f90.html#robo68" class="indexitem" >H5S</a>
-<a href="./src/H5Sf_c.html#robo69" class="indexitem" >H5Sf</a>
-<a href="./src/H5Tff_f90.html#robo70" class="indexitem" >H5T</a>
-<a href="./src/H5Tff_F03_f90.html#robo71" class="indexitem" >H5T (F03)</a>
-<a href="./src/H5Tff_F90_f90.html#robo72" class="indexitem" >H5T (F90)</a>
-<a href="./src/H5Tf_c.html#robo73" class="indexitem" >H5Tf</a>
-<a href="./src/H5Zff_f90.html#robo74" class="indexitem" >H5Z</a>
-<a href="./src/H5Zf_c.html#robo75" class="indexitem" >H5Zf</a>
-<a href="./src/HDF5_f90.html#robo76" class="indexitem" >HDF5</a>
-<a href="./src/HDF5mpio_f90.html#robo77" class="indexitem" >HDF5 (mpio)</a>
-<h2><a name="S"></a>S</h2><a href="./src/H5_DBLE_InterfaceExclude_f90.html#robo78" class="indexitem" >src/H5_DBLE_InterfaceExclude.f90</a>
-<a href="./src/H5_DBLE_InterfaceInclude_f90.html#robo79" class="indexitem" >src/H5_DBLE_InterfaceInclude.f90</a>
-<h2><a href="#A">A</a> - <a href="#B">B</a> - <a href="#C">C</a> - <a href="#D">D</a> - <a href="#E">E</a> - <a href="#F">F</a> - <a href="#G">G</a> - <a href="#H">H</a> - <a href="#I">I</a> - <a href="#J">J</a> - <a href="#K">K</a> - <a href="#L">L</a> - <a href="#M">M</a> - <a href="#N">N</a> - <a href="#O">O</a> - <a href="#P">P</a> - <a href="#Q">Q</a> - <a href="#R">R</a> - <a href="#S">S</a> - <a href="#T">T</a> - <a href="#U">U</a> - <a href="#V">V</a> - <a href="#W">W</a> - <a href="#X">X</a> - <a href="#Y">Y</a> - <a href="#Z">Z</a> - <a href="#0">0</a> - <a href="#1">1</a> - <a href="#2">2</a> - <a href="#3">3</a> - <a href="#4">4</a> - <a href="#5">5</a> - <a href="#6">6</a> - <a href="#7">7</a> - <a href="#8">8</a> - <a href="#9">9</a></h2>
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./ on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/robo_programs.html b/fortran/doc/DevelGuide/robo_programs.html
deleted file mode 100644
index 8c35230..0000000
--- a/fortran/doc/DevelGuide/robo_programs.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="./robodoc.css" type="text/css" />
-<title>Programs</title>
-<!-- Source: ./ -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="extra">
-</div> <!-- extra -->
-<div id="navigation">
-<a class="menuitem" href="./toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="./robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="./masterindex.html#top">Index</a>
-<a class="menuitem" href="./robo_functions.html#top">Functions</a>
-<a class="menuitem" href="./robo_modules.html#top">Modules</a>
-<a class="menuitem" href="#top">Programs</a>
-<a class="menuitem" href="./robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<h1>Programs</h1>
-<h2><a href="#A">A</a> - <a href="#B">B</a> - <a href="#C">C</a> - <a href="#D">D</a> - <a href="#E">E</a> - <a href="#F">F</a> - <a href="#G">G</a> - <a href="#H">H</a> - <a href="#I">I</a> - <a href="#J">J</a> - <a href="#K">K</a> - <a href="#L">L</a> - <a href="#M">M</a> - <a href="#N">N</a> - <a href="#O">O</a> - <a href="#P">P</a> - <a href="#Q">Q</a> - <a href="#R">R</a> - <a href="#S">S</a> - <a href="#T">T</a> - <a href="#U">U</a> - <a href="#V">V</a> - <a href="#W">W</a> - <a href="#X">X</a> - <a href="#Y">Y</a> - <a href="#Z">Z</a> - <a href="#0">0</a> - <a href="#1">1</a> - <a href="#2">2</a> - <a href="#3">3</a> - <a href="#4">4</a> - <a href="#5">5</a> - <a href="#6">6</a> - <a href="#7">7</a> - <a href="#8">8</a> - <a href="#9">9</a></h2>
-<h2><a name="H"></a>H</h2><a href="./src/H5test_kind_f90.html#robo132" class="indexitem" >H5test_kind</a>
-<a href="./src/H5test_kind_SIZEOF_f90.html#robo133" class="indexitem" >H5test_kind_SIZEOF</a>
-<h2><a href="#A">A</a> - <a href="#B">B</a> - <a href="#C">C</a> - <a href="#D">D</a> - <a href="#E">E</a> - <a href="#F">F</a> - <a href="#G">G</a> - <a href="#H">H</a> - <a href="#I">I</a> - <a href="#J">J</a> - <a href="#K">K</a> - <a href="#L">L</a> - <a href="#M">M</a> - <a href="#N">N</a> - <a href="#O">O</a> - <a href="#P">P</a> - <a href="#Q">Q</a> - <a href="#R">R</a> - <a href="#S">S</a> - <a href="#T">T</a> - <a href="#U">U</a> - <a href="#V">V</a> - <a href="#W">W</a> - <a href="#X">X</a> - <a href="#Y">Y</a> - <a href="#Z">Z</a> - <a href="#0">0</a> - <a href="#1">1</a> - <a href="#2">2</a> - <a href="#3">3</a> - <a href="#4">4</a> - <a href="#5">5</a> - <a href="#6">6</a> - <a href="#7">7</a> - <a href="#8">8</a> - <a href="#9">9</a></h2>
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./ on Wed Oct 22 2008 15:34:43
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/robo_sourcefiles.html b/fortran/doc/DevelGuide/robo_sourcefiles.html
deleted file mode 100644
index 63a8637..0000000
--- a/fortran/doc/DevelGuide/robo_sourcefiles.html
+++ /dev/null
@@ -1,309 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="./robodoc.css" type="text/css" />
-<title>Sourcefiles</title>
-<!-- Source: ./ -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="extra">
-</div> <!-- extra -->
-<div id="navigation">
-<a class="menuitem" href="./toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="#top">Sourcefiles</a>
-<a class="menuitem" href="./masterindex.html#top">Index</a>
-<a class="menuitem" href="./robo_functions.html#top">Functions</a>
-<a class="menuitem" href="./robo_modules.html#top">Modules</a>
-<a class="menuitem" href="./robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="./robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<ul>
-<li>
-./<ul>
-<li>
-./doc/<ul>
-</ul>
-</li>
-<li>
-./examples/<ul>
-</ul>
-</li>
-<li>
-./src/<ul>
-<li>
-<a href="./src/H5_DBLE_InterfaceExclude_f90.html#robo_top_of_doc"><tt>
-H5_DBLE_InterfaceExclude.f90</tt></a></li>
-<li>
-<a href="./src/H5_DBLE_InterfaceInclude_f90.html#robo_top_of_doc"><tt>
-H5_DBLE_InterfaceInclude.f90</tt></a></li>
-<li>
-<a href="./src/H5_ff_f90.html#robo_top_of_doc"><tt>
-H5_ff.f90</tt></a></li>
-<li>
-<a href="./src/H5_ff_F03_f90.html#robo_top_of_doc"><tt>
-H5_ff_F03.f90</tt></a></li>
-<li>
-<a href="./src/H5_ff_F90_f90.html#robo_top_of_doc"><tt>
-H5_ff_F90.f90</tt></a></li>
-<li>
-<a href="./src/H5Af_c.html#robo_top_of_doc"><tt>
-H5Af.c</tt></a></li>
-<li>
-<a href="./src/H5Aff_f90.html#robo_top_of_doc"><tt>
-H5Aff.f90</tt></a></li>
-<li>
-<a href="./src/H5Aff_F03_f90.html#robo_top_of_doc"><tt>
-H5Aff_F03.f90</tt></a></li>
-<li>
-<a href="./src/H5Aff_F90_f90.html#robo_top_of_doc"><tt>
-H5Aff_F90.f90</tt></a></li>
-<li>
-<a href="./src/H5Df_c.html#robo_top_of_doc"><tt>
-H5Df.c</tt></a></li>
-<li>
-<a href="./src/H5Dff_f90.html#robo_top_of_doc"><tt>
-H5Dff.f90</tt></a></li>
-<li>
-<a href="./src/H5Dff_F03_f90.html#robo_top_of_doc"><tt>
-H5Dff_F03.f90</tt></a></li>
-<li>
-<a href="./src/H5Dff_F90_f90.html#robo_top_of_doc"><tt>
-H5Dff_F90.f90</tt></a></li>
-<li>
-<a href="./src/H5Ef_c.html#robo_top_of_doc"><tt>
-H5Ef.c</tt></a></li>
-<li>
-<a href="./src/H5Eff_f90.html#robo_top_of_doc"><tt>
-H5Eff.f90</tt></a></li>
-<li>
-<a href="./src/H5Eff_F03_f90.html#robo_top_of_doc"><tt>
-H5Eff_F03.f90</tt></a></li>
-<li>
-<a href="./src/H5Eff_F90_f90.html#robo_top_of_doc"><tt>
-H5Eff_F90.f90</tt></a></li>
-<li>
-<a href="./src/H5f90global_f90.html#robo_top_of_doc"><tt>
-H5f90global.f90</tt></a></li>
-<li>
-<a href="./src/H5f90kit_c.html#robo_top_of_doc"><tt>
-H5f90kit.c</tt></a></li>
-<li>
-<a href="./src/H5FDmpiof_c.html#robo_top_of_doc"><tt>
-H5FDmpiof.c</tt></a></li>
-<li>
-<a href="./src/H5FDmpioff_f90.html#robo_top_of_doc"><tt>
-H5FDmpioff.f90</tt></a></li>
-<li>
-<a href="./src/H5Ff_c.html#robo_top_of_doc"><tt>
-H5Ff.c</tt></a></li>
-<li>
-<a href="./src/H5Fff_f90.html#robo_top_of_doc"><tt>
-H5Fff.f90</tt></a></li>
-<li>
-<a href="./src/H5Gf_c.html#robo_top_of_doc"><tt>
-H5Gf.c</tt></a></li>
-<li>
-<a href="./src/H5Gff_f90.html#robo_top_of_doc"><tt>
-H5Gff.f90</tt></a></li>
-<li>
-<a href="./src/H5If_c.html#robo_top_of_doc"><tt>
-H5If.c</tt></a></li>
-<li>
-<a href="./src/H5Iff_f90.html#robo_top_of_doc"><tt>
-H5Iff.f90</tt></a></li>
-<li>
-<a href="./src/H5Lf_c.html#robo_top_of_doc"><tt>
-H5Lf.c</tt></a></li>
-<li>
-<a href="./src/H5Lff_f90.html#robo_top_of_doc"><tt>
-H5Lff.f90</tt></a></li>
-<li>
-<a href="./src/H5Lff_F03_f90.html#robo_top_of_doc"><tt>
-H5Lff_F03.f90</tt></a></li>
-<li>
-<a href="./src/H5Lff_F90_f90.html#robo_top_of_doc"><tt>
-H5Lff_F90.f90</tt></a></li>
-<li>
-<a href="./src/H5match_types_c.html#robo_top_of_doc"><tt>
-H5match_types.c</tt></a></li>
-<li>
-<a href="./src/H5Of_c.html#robo_top_of_doc"><tt>
-H5Of.c</tt></a></li>
-<li>
-<a href="./src/H5Off_f90.html#robo_top_of_doc"><tt>
-H5Off.f90</tt></a></li>
-<li>
-<a href="./src/H5Off_F03_f90.html#robo_top_of_doc"><tt>
-H5Off_F03.f90</tt></a></li>
-<li>
-<a href="./src/H5Off_F90_f90.html#robo_top_of_doc"><tt>
-H5Off_F90.f90</tt></a></li>
-<li>
-<a href="./src/H5Pf_c.html#robo_top_of_doc"><tt>
-H5Pf.c</tt></a></li>
-<li>
-<a href="./src/H5Pff_f90.html#robo_top_of_doc"><tt>
-H5Pff.f90</tt></a></li>
-<li>
-<a href="./src/H5Pff_F03_f90.html#robo_top_of_doc"><tt>
-H5Pff_F03.f90</tt></a></li>
-<li>
-<a href="./src/H5Pff_F90_f90.html#robo_top_of_doc"><tt>
-H5Pff_F90.f90</tt></a></li>
-<li>
-<a href="./src/H5Rf_c.html#robo_top_of_doc"><tt>
-H5Rf.c</tt></a></li>
-<li>
-<a href="./src/H5Rff_f90.html#robo_top_of_doc"><tt>
-H5Rff.f90</tt></a></li>
-<li>
-<a href="./src/H5Rff_F03_f90.html#robo_top_of_doc"><tt>
-H5Rff_F03.f90</tt></a></li>
-<li>
-<a href="./src/H5Rff_F90_f90.html#robo_top_of_doc"><tt>
-H5Rff_F90.f90</tt></a></li>
-<li>
-<a href="./src/H5Sf_c.html#robo_top_of_doc"><tt>
-H5Sf.c</tt></a></li>
-<li>
-<a href="./src/H5Sff_f90.html#robo_top_of_doc"><tt>
-H5Sff.f90</tt></a></li>
-<li>
-<a href="./src/H5test_kind_f90.html#robo_top_of_doc"><tt>
-H5test_kind.f90</tt></a></li>
-<li>
-<a href="./src/H5test_kind_SIZEOF_f90.html#robo_top_of_doc"><tt>
-H5test_kind_SIZEOF.f90</tt></a></li>
-<li>
-<a href="./src/H5Tf_c.html#robo_top_of_doc"><tt>
-H5Tf.c</tt></a></li>
-<li>
-<a href="./src/H5Tff_f90.html#robo_top_of_doc"><tt>
-H5Tff.f90</tt></a></li>
-<li>
-<a href="./src/H5Tff_F03_f90.html#robo_top_of_doc"><tt>
-H5Tff_F03.f90</tt></a></li>
-<li>
-<a href="./src/H5Tff_F90_f90.html#robo_top_of_doc"><tt>
-H5Tff_F90.f90</tt></a></li>
-<li>
-<a href="./src/H5Zf_c.html#robo_top_of_doc"><tt>
-H5Zf.c</tt></a></li>
-<li>
-<a href="./src/H5Zff_f90.html#robo_top_of_doc"><tt>
-H5Zff.f90</tt></a></li>
-<li>
-<a href="./src/HDF5_f90.html#robo_top_of_doc"><tt>
-HDF5.f90</tt></a></li>
-<li>
-<a href="./src/HDF5mpio_f90.html#robo_top_of_doc"><tt>
-HDF5mpio.f90</tt></a></li>
-</ul>
-</li>
-<li>
-./test/<ul>
-<li>
-<a href="./test/fflush1_f90.html#robo_top_of_doc"><tt>
-fflush1.f90</tt></a></li>
-<li>
-<a href="./test/fflush2_f90.html#robo_top_of_doc"><tt>
-fflush2.f90</tt></a></li>
-<li>
-<a href="./test/fortranlib_test_f90.html#robo_top_of_doc"><tt>
-fortranlib_test.f90</tt></a></li>
-<li>
-<a href="./test/fortranlib_test_1_8_f90.html#robo_top_of_doc"><tt>
-fortranlib_test_1_8.f90</tt></a></li>
-<li>
-<a href="./test/fortranlib_test_F03_f90.html#robo_top_of_doc"><tt>
-fortranlib_test_F03.f90</tt></a></li>
-<li>
-<a href="./test/t_c.html#robo_top_of_doc"><tt>
-t.c</tt></a></li>
-<li>
-<a href="./test/tf_f90.html#robo_top_of_doc"><tt>
-tf.f90</tt></a></li>
-<li>
-<a href="./test/tH5A_f90.html#robo_top_of_doc"><tt>
-tH5A.f90</tt></a></li>
-<li>
-<a href="./test/tH5A_1_8_f90.html#robo_top_of_doc"><tt>
-tH5A_1_8.f90</tt></a></li>
-<li>
-<a href="./test/tH5D_f90.html#robo_top_of_doc"><tt>
-tH5D.f90</tt></a></li>
-<li>
-<a href="./test/tH5E_f90.html#robo_top_of_doc"><tt>
-tH5E.f90</tt></a></li>
-<li>
-<a href="./test/tH5E_F03_f90.html#robo_top_of_doc"><tt>
-tH5E_F03.f90</tt></a></li>
-<li>
-<a href="./test/tH5F_f90.html#robo_top_of_doc"><tt>
-tH5F.f90</tt></a></li>
-<li>
-<a href="./test/tH5G_f90.html#robo_top_of_doc"><tt>
-tH5G.f90</tt></a></li>
-<li>
-<a href="./test/tH5G_1_8_f90.html#robo_top_of_doc"><tt>
-tH5G_1_8.f90</tt></a></li>
-<li>
-<a href="./test/tH5I_f90.html#robo_top_of_doc"><tt>
-tH5I.f90</tt></a></li>
-<li>
-<a href="./test/tH5L_F03_f90.html#robo_top_of_doc"><tt>
-tH5L_F03.f90</tt></a></li>
-<li>
-<a href="./test/tH5O_f90.html#robo_top_of_doc"><tt>
-tH5O.f90</tt></a></li>
-<li>
-<a href="./test/tH5P_f90.html#robo_top_of_doc"><tt>
-tH5P.f90</tt></a></li>
-<li>
-<a href="./test/tH5P_F03_f90.html#robo_top_of_doc"><tt>
-tH5P_F03.f90</tt></a></li>
-<li>
-<a href="./test/tH5R_f90.html#robo_top_of_doc"><tt>
-tH5R.f90</tt></a></li>
-<li>
-<a href="./test/tH5S_f90.html#robo_top_of_doc"><tt>
-tH5S.f90</tt></a></li>
-<li>
-<a href="./test/tH5Sselect_f90.html#robo_top_of_doc"><tt>
-tH5Sselect.f90</tt></a></li>
-<li>
-<a href="./test/tH5T_f90.html#robo_top_of_doc"><tt>
-tH5T.f90</tt></a></li>
-<li>
-<a href="./test/tH5T_F03_f90.html#robo_top_of_doc"><tt>
-tH5T_F03.f90</tt></a></li>
-<li>
-<a href="./test/tH5VL_f90.html#robo_top_of_doc"><tt>
-tH5VL.f90</tt></a></li>
-<li>
-<a href="./test/tH5Z_f90.html#robo_top_of_doc"><tt>
-tH5Z.f90</tt></a></li>
-</ul>
-</li>
-<li>
-./testpar/<ul>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./ on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/robo_subroutines.html b/fortran/doc/DevelGuide/robo_subroutines.html
deleted file mode 100644
index 0846c77..0000000
--- a/fortran/doc/DevelGuide/robo_subroutines.html
+++ /dev/null
@@ -1,421 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="./robodoc.css" type="text/css" />
-<title>Subroutines</title>
-<!-- Source: ./ -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="extra">
-</div> <!-- extra -->
-<div id="navigation">
-<a class="menuitem" href="./toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="./robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="./masterindex.html#top">Index</a>
-<a class="menuitem" href="./robo_functions.html#top">Functions</a>
-<a class="menuitem" href="./robo_modules.html#top">Modules</a>
-<a class="menuitem" href="./robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<h1>Subroutines</h1>
-<h2><a href="#A">A</a> - <a href="#B">B</a> - <a href="#C">C</a> - <a href="#D">D</a> - <a href="#E">E</a> - <a href="#F">F</a> - <a href="#G">G</a> - <a href="#H">H</a> - <a href="#I">I</a> - <a href="#J">J</a> - <a href="#K">K</a> - <a href="#L">L</a> - <a href="#M">M</a> - <a href="#N">N</a> - <a href="#O">O</a> - <a href="#P">P</a> - <a href="#Q">Q</a> - <a href="#R">R</a> - <a href="#S">S</a> - <a href="#T">T</a> - <a href="#U">U</a> - <a href="#V">V</a> - <a href="#W">W</a> - <a href="#X">X</a> - <a href="#Y">Y</a> - <a href="#Z">Z</a> - <a href="#0">0</a> - <a href="#1">1</a> - <a href="#2">2</a> - <a href="#3">3</a> - <a href="#4">4</a> - <a href="#5">5</a> - <a href="#6">6</a> - <a href="#7">7</a> - <a href="#8">8</a> - <a href="#9">9</a></h2>
-<a href="./src/H5Pff_F03_f90.html#robo80" class="indexitem" > h5pget_double</a>
-<a href="./src/H5Pff_f90.html#robo81" class="indexitem" > h5pget_hyper_vector_size_f</a>
-<a href="./src/H5Pff_f90.html#robo82" class="indexitem" > h5pset_family_offset_f</a>
-<a href="./src/H5Pff_f90.html#robo83" class="indexitem" > h5pset_fapl_family_f</a>
-<a href="./src/H5Pff_f90.html#robo84" class="indexitem" > h5pset_meta_block_size_f</a>
-<h2><a name="H"></a>H</h2><a href="./src/H5Aff_f90.html#robo85" class="indexitem" >h5aclose_f</a>
-<a href="./src/H5Aff_f90.html#robo86" class="indexitem" >h5acreate_by_name_f</a>
-<a href="./src/H5Aff_f90.html#robo87" class="indexitem" >h5acreate_f</a>
-<a href="./src/H5Aff_f90.html#robo88" class="indexitem" >h5adelete_by_idx_f</a>
-<a href="./src/H5Aff_f90.html#robo89" class="indexitem" >h5adelete_by_name_f</a>
-<a href="./src/H5Aff_f90.html#robo90" class="indexitem" >h5adelete_f</a>
-<a href="./src/H5Aff_f90.html#robo91" class="indexitem" >H5Aexists_by_name_f</a>
-<a href="./src/H5Aff_f90.html#robo92" class="indexitem" >H5Aexists_f</a>
-<a href="./src/H5Aff_f90.html#robo93" class="indexitem" >h5aget_create_plist_f</a>
-<a href="./src/H5Aff_f90.html#robo94" class="indexitem" >h5aget_info_by_idx_f</a>
-<a href="./src/H5Aff_f90.html#robo95" class="indexitem" >h5aget_info_by_name_f</a>
-<a href="./src/H5Aff_f90.html#robo96" class="indexitem" >h5aget_info_f</a>
-<a href="./src/H5Aff_f90.html#robo97" class="indexitem" >h5aget_name_by_idx_f</a>
-<a href="./src/H5Aff_f90.html#robo98" class="indexitem" >h5aget_name_f</a>
-<a href="./src/H5Aff_f90.html#robo99" class="indexitem" >h5aget_num_attrs_f</a>
-<a href="./src/H5Aff_f90.html#robo100" class="indexitem" >h5aget_space_f</a>
-<a href="./src/H5Aff_f90.html#robo101" class="indexitem" >h5aget_storage_size_f</a>
-<a href="./src/H5Aff_f90.html#robo102" class="indexitem" >h5aget_type_f</a>
-<a href="./src/H5Aff_f90.html#robo103" class="indexitem" >h5aopen_by_idx_f</a>
-<a href="./src/H5Aff_f90.html#robo104" class="indexitem" >H5Aopen_by_name_f</a>
-<a href="./src/H5Aff_f90.html#robo105" class="indexitem" >h5aopen_f</a>
-<a href="./src/H5Aff_f90.html#robo106" class="indexitem" >h5aopen_idx_f</a>
-<a href="./src/H5Aff_f90.html#robo107" class="indexitem" >h5aopen_name_f</a>
-<a href="./src/H5Aff_F03_f90.html#robo108" class="indexitem" >h5aread_f</a>
-<a href="./src/H5Aff_f90.html#robo109" class="indexitem" >h5arename_by_name_f</a>
-<a href="./src/H5Aff_f90.html#robo110" class="indexitem" >h5arename_f</a>
-<a href="./src/H5_ff_f90.html#robo111" class="indexitem" >h5check_version_f</a>
-<a href="./src/H5_ff_f90.html#robo112" class="indexitem" >h5close_f</a>
-<a href="./src/H5Dff_f90.html#robo113" class="indexitem" >h5dclose_f</a>
-<a href="./src/H5Dff_f90.html#robo114" class="indexitem" >h5dcreate_anon_f</a>
-<a href="./src/H5Dff_f90.html#robo115" class="indexitem" >h5dcreate_f</a>
-<a href="./src/H5Dff_f90.html#robo116" class="indexitem" >h5dget_access_plist_f</a>
-<a href="./src/H5Dff_f90.html#robo117" class="indexitem" >h5dget_create_plist_f</a>
-<a href="./src/H5Dff_f90.html#robo118" class="indexitem" >h5dget_space_f</a>
-<a href="./src/H5Dff_f90.html#robo119" class="indexitem" >h5dget_space_status_f</a>
-<a href="./src/H5Dff_f90.html#robo120" class="indexitem" >h5dget_storage_size_f</a>
-<a href="./src/H5Dff_f90.html#robo121" class="indexitem" >h5dget_type_f</a>
-<a href="./src/H5_ff_f90.html#robo122" class="indexitem" >h5dont_atexit_f</a>
-<a href="./src/H5Dff_f90.html#robo123" class="indexitem" >h5dopen_f</a>
-<a href="./src/H5Dff_F90_f90.html#robo124" class="indexitem" >h5dread_f</a>
-<a href="./src/H5Dff_f90.html#robo125" class="indexitem" >h5dset_extent</a>
-<a href="./src/H5Dff_f90.html#robo126" class="indexitem" >h5dvlen_get_max_len_f</a>
-<a href="./src/H5Dff_F03_f90.html#robo127" class="indexitem" >h5dvlen_reclaim</a>
-<a href="./src/H5Eff_f90.html#robo128" class="indexitem" >h5eclear_f</a>
-<a href="./src/H5Eff_F03_f90.html#robo129" class="indexitem" >h5eget_auto_f</a>
-<a href="./src/H5Eff_f90.html#robo130" class="indexitem" >h5eget_major_f</a>
-<a href="./src/H5Eff_f90.html#robo131" class="indexitem" >h5eget_minor_f</a>
-<a href="./src/H5Eff_f90.html#robo132" class="indexitem" >h5eprint_f</a>
-<a href="./src/H5Eff_F03_f90.html#robo133" class="indexitem" >h5eset_auto2_f</a>
-<a href="./src/H5Eff_F90_f90.html#robo134" class="indexitem" >h5eset_auto_f</a>
-<a href="./src/H5Fff_f90.html#robo135" class="indexitem" >h5fclose_f</a>
-<a href="./src/H5Fff_f90.html#robo136" class="indexitem" >h5fcreate_f</a>
-<a href="./src/H5Fff_f90.html#robo137" class="indexitem" >h5fflush_f</a>
-<a href="./src/H5Fff_f90.html#robo138" class="indexitem" >h5fget_access_plist_f</a>
-<a href="./src/H5Fff_f90.html#robo139" class="indexitem" >h5fget_create_plist_f</a>
-<a href="./src/H5Fff_f90.html#robo140" class="indexitem" >h5fget_filesize_f</a>
-<a href="./src/H5Fff_f90.html#robo141" class="indexitem" >h5fget_freespace_f</a>
-<a href="./src/H5Fff_f90.html#robo142" class="indexitem" >h5fget_name_f</a>
-<a href="./src/H5Fff_f90.html#robo143" class="indexitem" >h5fget_obj_count_f</a>
-<a href="./src/H5Fff_f90.html#robo144" class="indexitem" >h5fget_obj_ids_f</a>
-<a href="./src/H5Fff_f90.html#robo145" class="indexitem" >h5fis_hdf5_f</a>
-<a href="./src/H5Fff_f90.html#robo146" class="indexitem" >h5fmount_f</a>
-<a href="./src/H5Fff_f90.html#robo147" class="indexitem" >h5fopen_f</a>
-<a href="./src/H5Fff_f90.html#robo148" class="indexitem" >h5freopen_f</a>
-<a href="./src/H5Fff_f90.html#robo149" class="indexitem" >h5funmount_f</a>
-<a href="./src/H5_ff_f90.html#robo150" class="indexitem" >h5garbage_collect_f</a>
-<a href="./src/H5Gff_f90.html#robo151" class="indexitem" >h5gclose_f</a>
-<a href="./src/H5Gff_f90.html#robo152" class="indexitem" >H5Gcreate_anon_f</a>
-<a href="./src/H5Gff_f90.html#robo153" class="indexitem" >h5gcreate_f</a>
-<a href="./src/H5_ff_f90.html#robo154" class="indexitem" >h5get_libversion_f</a>
-<a href="./src/H5Gff_f90.html#robo155" class="indexitem" >h5gget_comment_f</a>
-<a href="./src/H5Gff_f90.html#robo156" class="indexitem" >H5Gget_create_plist_f</a>
-<a href="./src/H5Gff_f90.html#robo157" class="indexitem" >h5gget_info_by_idx_f</a>
-<a href="./src/H5Gff_f90.html#robo158" class="indexitem" >h5gget_info_by_name_f</a>
-<a href="./src/H5Gff_f90.html#robo159" class="indexitem" >h5gget_info_f</a>
-<a href="./src/H5Gff_f90.html#robo160" class="indexitem" >h5gget_linkval_f</a>
-<a href="./src/H5Gff_f90.html#robo161" class="indexitem" >h5gget_obj_info_idx_f</a>
-<a href="./src/H5Gff_f90.html#robo162" class="indexitem" >h5glink2_f</a>
-<a href="./src/H5Gff_f90.html#robo163" class="indexitem" >h5glink_f</a>
-<a href="./src/H5Gff_f90.html#robo164" class="indexitem" >h5gmove2_f</a>
-<a href="./src/H5Gff_f90.html#robo165" class="indexitem" >h5gmove_f</a>
-<a href="./src/H5Gff_f90.html#robo166" class="indexitem" >h5gn_members_f</a>
-<a href="./src/H5Gff_f90.html#robo167" class="indexitem" >h5gopen_f</a>
-<a href="./src/H5Gff_f90.html#robo168" class="indexitem" >h5gset_comment_f</a>
-<a href="./src/H5Gff_f90.html#robo169" class="indexitem" >h5gunlink_f</a>
-<a href="./src/H5Iff_f90.html#robo170" class="indexitem" >h5idec_ref_f</a>
-<a href="./src/H5Iff_f90.html#robo171" class="indexitem" >h5iget_file_id_f</a>
-<a href="./src/H5Iff_f90.html#robo172" class="indexitem" >h5iget_name_f</a>
-<a href="./src/H5Iff_f90.html#robo173" class="indexitem" >h5iget_ref_f</a>
-<a href="./src/H5Iff_f90.html#robo174" class="indexitem" >h5iget_type_f</a>
-<a href="./src/H5Iff_f90.html#robo175" class="indexitem" >h5iinc_ref_f</a>
-<a href="./src/H5Iff_f90.html#robo176" class="indexitem" >h5iis_valid_f</a>
-<a href="./src/H5Lff_f90.html#robo178" class="indexitem" >h5lcopy_f</a>
-<a href="./src/H5Lff_f90.html#robo179" class="indexitem" >H5Lcreate_external_f</a>
-<a href="./src/H5Lff_f90.html#robo180" class="indexitem" >H5Lcreate_hard_f</a>
-<a href="./src/H5Lff_f90.html#robo181" class="indexitem" >H5Lcreate_soft_f</a>
-<a href="./src/H5Lff_f90.html#robo182" class="indexitem" >h5ldelete_by_idx_f</a>
-<a href="./src/H5Lff_f90.html#robo183" class="indexitem" >h5ldelete_f</a>
-<a href="./src/H5Lff_f90.html#robo184" class="indexitem" >H5Lexists_f</a>
-<a href="./src/H5Lff_f90.html#robo185" class="indexitem" >h5lget_info_by_idx_f</a>
-<a href="./src/H5Lff_f90.html#robo186" class="indexitem" >h5lget_info_f</a>
-<a href="./src/H5Lff_f90.html#robo187" class="indexitem" >h5lget_name_by_idx_f</a>
-<a href="./src/H5Lff_f90.html#robo188" class="indexitem" >h5lis_registered_f</a>
-<a href="./src/H5Lff_F03_f90.html#robo189" class="indexitem" >h5literate_by_name_f</a>
-<a href="./src/H5Lff_F03_f90.html#robo190" class="indexitem" >h5literate_f</a>
-<a href="./src/H5Lff_f90.html#robo191" class="indexitem" >h5lmove_f</a>
-<a href="./src/H5Off_f90.html#robo193" class="indexitem" >h5oclose_f</a>
-<a href="./src/H5Off_f90.html#robo195" class="indexitem" >h5olink_f</a>
-<a href="./src/H5Off_f90.html#robo196" class="indexitem" >h5oopen_f</a>
-<a href="./src/H5Off_f90.html#robo197" class="indexitem" >h5open_by_addr_f</a>
-<a href="./src/H5_ff_f90.html#robo198" class="indexitem" >h5open_f</a>
-<a href="./src/H5Off_F03_f90.html#robo199" class="indexitem" >h5ovisit_f</a>
-<a href="./src/H5Pff_f90.html#robo200" class="indexitem" >h5pall_filters_avail_f</a>
-<a href="./src/H5Pff_f90.html#robo201" class="indexitem" >h5pclose_class_f</a>
-<a href="./src/H5Pff_f90.html#robo202" class="indexitem" >h5pclose_f</a>
-<a href="./src/H5Pff_f90.html#robo203" class="indexitem" >h5pcopy_f</a>
-<a href="./src/H5Pff_f90.html#robo204" class="indexitem" >h5pcopy_prop_f</a>
-<a href="./src/H5Pff_F03_f90.html#robo205" class="indexitem" >h5pcreate_class_f</a>
-<a href="./src/H5Pff_F90_f90.html#robo206" class="indexitem" >h5pcreate_class_f</a>
-<a href="./src/H5Pff_f90.html#robo207" class="indexitem" >h5pcreate_f</a>
-<a href="./src/H5Pff_f90.html#robo208" class="indexitem" >h5pequal_f</a>
-<a href="./src/H5Pff_f90.html#robo209" class="indexitem" >h5pexist_f</a>
-<a href="./src/H5Pff_f90.html#robo210" class="indexitem" >h5pfill_value_defined_f</a>
-<a href="./src/H5Pff_f90.html#robo211" class="indexitem" >h5pget_alignment_f</a>
-<a href="./src/H5Pff_f90.html#robo212" class="indexitem" >h5pget_alloc_time_f</a>
-<a href="./src/H5Pff_f90.html#robo213" class="indexitem" >H5Pget_attr_creation_order_f</a>
-<a href="./src/H5Pff_f90.html#robo214" class="indexitem" >H5Pget_attr_phase_change_f</a>
-<a href="./src/H5Pff_f90.html#robo215" class="indexitem" >h5pget_btree_ratios_f</a>
-<a href="./src/H5Pff_f90.html#robo216" class="indexitem" >h5pget_buffer_f</a>
-<a href="./src/H5Pff_f90.html#robo217" class="indexitem" >h5pget_cache_f</a>
-<a href="./src/H5Pff_F03_f90.html#robo218" class="indexitem" >h5pget_char</a>
-<a href="./src/H5Pff_F90_f90.html#robo219" class="indexitem" >h5pget_char</a>
-<a href="./src/H5Pff_f90.html#robo220" class="indexitem" >H5Pget_char_encoding_f</a>
-<a href="./src/H5Pff_f90.html#robo221" class="indexitem" >H5Pget_chunk_cache_f</a>
-<a href="./src/H5Pff_f90.html#robo222" class="indexitem" >h5pget_chunk_f</a>
-<a href="./src/H5Pff_f90.html#robo223" class="indexitem" >h5pget_class_f</a>
-<a href="./src/H5Pff_f90.html#robo224" class="indexitem" >h5pget_class_name_f</a>
-<a href="./src/H5Pff_f90.html#robo225" class="indexitem" >h5pget_class_parent_f</a>
-<a href="./src/H5Pff_f90.html#robo226" class="indexitem" >h5pget_copy_object_f</a>
-<a href="./src/H5Pff_f90.html#robo227" class="indexitem" >H5Pget_create_inter_group_f</a>
-<a href="./src/H5Pff_f90.html#robo228" class="indexitem" >h5pget_data_transform_f</a>
-<a href="./src/H5Pff_F90_f90.html#robo229" class="indexitem" >h5pget_double</a>
-<a href="./src/H5Pff_f90.html#robo230" class="indexitem" >h5pget_driver_f</a>
-<a href="./src/H5FDmpioff_f90.html#robo231" class="indexitem" >h5pget_dxpl_mpio_f</a>
-<a href="./src/H5Pff_f90.html#robo232" class="indexitem" >h5pget_edc_check_f</a>
-<a href="./src/H5Pff_f90.html#robo233" class="indexitem" >H5Pget_est_link_info_f</a>
-<a href="./src/H5Pff_f90.html#robo234" class="indexitem" >h5pget_external_count_f</a>
-<a href="./src/H5Pff_f90.html#robo235" class="indexitem" >h5pget_external_f</a>
-<a href="./src/H5Pff_f90.html#robo236" class="indexitem" >h5pget_fapl_core_f</a>
-<a href="./src/H5Pff_f90.html#robo237" class="indexitem" >h5pget_fapl_direct_f</a>
-<a href="./src/H5Pff_f90.html#robo238" class="indexitem" >h5pget_fapl_family_f</a>
-<a href="./src/H5FDmpioff_f90.html#robo239" class="indexitem" >h5pget_fapl_mpio_f</a>
-<a href="./src/H5FDmpioff_f90.html#robo240" class="indexitem" >h5pget_fapl_mpiposix_f</a>
-<a href="./src/H5Pff_f90.html#robo241" class="indexitem" >h5pget_fapl_multi_f</a>
-<a href="./src/H5Pff_f90.html#robo242" class="indexitem" >h5pget_fclose_degree_f</a>
-<a href="./src/H5Pff_f90.html#robo243" class="indexitem" >h5pget_fill_time_f</a>
-<a href="./src/H5Pff_f90.html#robo244" class="indexitem" >h5pget_filter_by_id_f</a>
-<a href="./src/H5Pff_f90.html#robo245" class="indexitem" >h5pget_filter_f</a>
-<a href="./src/H5Pff_f90.html#robo246" class="indexitem" >h5pget_gc_references_f</a>
-<a href="./src/H5Pff_F03_f90.html#robo247" class="indexitem" >h5pget_integer</a>
-<a href="./src/H5Pff_F90_f90.html#robo248" class="indexitem" >h5pget_integer</a>
-<a href="./src/H5Pff_f90.html#robo249" class="indexitem" >h5pget_istore_k_f</a>
-<a href="./src/H5Pff_f90.html#robo250" class="indexitem" >h5pget_layout_f</a>
-<a href="./src/H5Pff_f90.html#robo251" class="indexitem" >H5Pget_link_creation_order_f</a>
-<a href="./src/H5Pff_f90.html#robo252" class="indexitem" >H5Pget_link_phase_change_f</a>
-<a href="./src/H5Pff_f90.html#robo253" class="indexitem" >H5Pget_local_heap_size_hint_f</a>
-<a href="./src/H5Pff_f90.html#robo254" class="indexitem" >h5pget_meta_block_size_f</a>
-<a href="./src/H5Pff_f90.html#robo255" class="indexitem" >h5pget_nfilters_f</a>
-<a href="./src/H5Pff_f90.html#robo256" class="indexitem" >h5pget_nlinks_f</a>
-<a href="./src/H5Pff_f90.html#robo257" class="indexitem" >h5pget_npros_f</a>
-<a href="./src/H5Pff_f90.html#robo258" class="indexitem" >H5Pget_obj_track_times_f</a>
-<a href="./src/H5Pff_f90.html#robo259" class="indexitem" >h5pget_preserve_f</a>
-<a href="./src/H5Pff_F90_f90.html#robo260" class="indexitem" >h5pget_real</a>
-<a href="./src/H5Pff_F03_f90.html#robo261" class="indexitem" >h5pget_real</a>
-<a href="./src/H5Pff_f90.html#robo262" class="indexitem" >h5pget_sec2_f</a>
-<a href="./src/H5Pff_f90.html#robo263" class="indexitem" >h5pget_sieve_buf_size_f</a>
-<a href="./src/H5Pff_f90.html#robo264" class="indexitem" >h5pget_size_f</a>
-<a href="./src/H5Pff_f90.html#robo265" class="indexitem" >h5pget_sizes_f</a>
-<a href="./src/H5Pff_f90.html#robo266" class="indexitem" >h5pget_small_data_block_size_f</a>
-<a href="./src/H5Pff_f90.html#robo267" class="indexitem" >h5pget_split_f</a>
-<a href="./src/H5Pff_f90.html#robo268" class="indexitem" >h5pget_stdio_f</a>
-<a href="./src/H5Pff_f90.html#robo269" class="indexitem" >h5pget_sym_k_f</a>
-<a href="./src/H5Pff_f90.html#robo270" class="indexitem" >h5pget_userblock_f</a>
-<a href="./src/H5Pff_f90.html#robo271" class="indexitem" >h5pget_version_f</a>
-<a href="./src/H5Pff_F03_f90.html#robo273" class="indexitem" >h5pinsert_char</a>
-<a href="./src/H5Pff_F90_f90.html#robo272" class="indexitem" >h5pinsert_char</a>
-<a href="./src/H5Pff_F90_f90.html#robo275" class="indexitem" >h5pinsert_double</a>
-<a href="./src/H5Pff_F03_f90.html#robo274" class="indexitem" >h5pinsert_double</a>
-<a href="./src/H5Pff_F90_f90.html#robo277" class="indexitem" >h5pinsert_integer</a>
-<a href="./src/H5Pff_F03_f90.html#robo276" class="indexitem" >h5pinsert_integer</a>
-<a href="./src/H5Pff_F03_f90.html#robo278" class="indexitem" >h5pinsert_ptr</a>
-<a href="./src/H5Pff_F90_f90.html#robo279" class="indexitem" >h5pinsert_real</a>
-<a href="./src/H5Pff_F03_f90.html#robo280" class="indexitem" >h5pinsert_real</a>
-<a href="./src/H5Pff_f90.html#robo281" class="indexitem" >h5pisa_class_f</a>
-<a href="./src/H5Pff_f90.html#robo282" class="indexitem" >h5pmodify_filter_f</a>
-<a href="./src/H5Pff_F03_f90.html#robo283" class="indexitem" >h5pregister_char</a>
-<a href="./src/H5Pff_F90_f90.html#robo284" class="indexitem" >h5pregister_char</a>
-<a href="./src/H5Pff_F03_f90.html#robo286" class="indexitem" >h5pregister_double</a>
-<a href="./src/H5Pff_F90_f90.html#robo285" class="indexitem" >h5pregister_double</a>
-<a href="./src/H5Pff_F90_f90.html#robo288" class="indexitem" >h5pregister_integer</a>
-<a href="./src/H5Pff_F03_f90.html#robo287" class="indexitem" >h5pregister_integer</a>
-<a href="./src/H5Pff_F03_f90.html#robo289" class="indexitem" >h5pregister_ptr</a>
-<a href="./src/H5Pff_F90_f90.html#robo290" class="indexitem" >h5pregister_real</a>
-<a href="./src/H5Pff_F03_f90.html#robo291" class="indexitem" >h5pregister_real</a>
-<a href="./src/H5Pff_f90.html#robo292" class="indexitem" >h5premove_f</a>
-<a href="./src/H5Pff_f90.html#robo293" class="indexitem" >h5premove_filter_f</a>
-<a href="./src/H5Pff_F90_f90.html#robo295" class="indexitem" >h5pset(get)fill_value_f</a>
-<a href="./src/H5Pff_F03_f90.html#robo294" class="indexitem" >h5pset(get)fill_value_f</a>
-<a href="./src/H5Pff_f90.html#robo296" class="indexitem" >h5pset_alignment_f</a>
-<a href="./src/H5Pff_f90.html#robo297" class="indexitem" >h5pset_alloc_time_f</a>
-<a href="./src/H5Pff_f90.html#robo298" class="indexitem" >H5Pset_attr_creation_order_f</a>
-<a href="./src/H5Pff_f90.html#robo299" class="indexitem" >H5Pset_attr_phase_change_f</a>
-<a href="./src/H5Pff_f90.html#robo300" class="indexitem" >h5pset_btree_ratios_f</a>
-<a href="./src/H5Pff_f90.html#robo301" class="indexitem" >h5pset_buffer_f</a>
-<a href="./src/H5Pff_f90.html#robo302" class="indexitem" >h5pset_cache_f</a>
-<a href="./src/H5Pff_F03_f90.html#robo303" class="indexitem" >h5pset_char</a>
-<a href="./src/H5Pff_F90_f90.html#robo304" class="indexitem" >h5pset_char</a>
-<a href="./src/H5Pff_f90.html#robo305" class="indexitem" >H5Pset_char_encoding_f</a>
-<a href="./src/H5Pff_f90.html#robo306" class="indexitem" >H5Pset_chunk_cache_f</a>
-<a href="./src/H5Pff_f90.html#robo307" class="indexitem" >h5pset_chunk_f</a>
-<a href="./src/H5Pff_f90.html#robo308" class="indexitem" >h5pset_copy_object_f</a>
-<a href="./src/H5Pff_f90.html#robo309" class="indexitem" >H5Pset_create_inter_group_f</a>
-<a href="./src/H5Pff_f90.html#robo310" class="indexitem" >h5pset_data_transform_f</a>
-<a href="./src/H5Pff_f90.html#robo311" class="indexitem" >h5pset_deflate_f</a>
-<a href="./src/H5Pff_F90_f90.html#robo312" class="indexitem" >h5pset_double</a>
-<a href="./src/H5Pff_F03_f90.html#robo313" class="indexitem" >h5pset_double</a>
-<a href="./src/H5FDmpioff_f90.html#robo314" class="indexitem" >h5pset_dxpl_mpio_f</a>
-<a href="./src/H5Pff_f90.html#robo315" class="indexitem" >h5pset_edc_check_f</a>
-<a href="./src/H5Pff_f90.html#robo316" class="indexitem" >h5pset_est_link_info_f</a>
-<a href="./src/H5Pff_f90.html#robo317" class="indexitem" >h5pset_external_f</a>
-<a href="./src/H5Pff_f90.html#robo318" class="indexitem" >h5pset_fapl_core_f</a>
-<a href="./src/H5Pff_f90.html#robo319" class="indexitem" >h5pset_fapl_direct_f</a>
-<a href="./src/H5FDmpioff_f90.html#robo320" class="indexitem" >h5pset_fapl_mpio_f</a>
-<a href="./src/H5FDmpioff_f90.html#robo321" class="indexitem" >h5pset_fapl_mpiposix_f</a>
-<a href="./src/H5Pff_f90.html#robo322" class="indexitem" >h5pset_fapl_multi_l</a>
-<a href="./src/H5Pff_f90.html#robo323" class="indexitem" >h5pset_fapl_multi_s</a>
-<a href="./src/H5Pff_f90.html#robo324" class="indexitem" >h5pset_fapl_sec2_f</a>
-<a href="./src/H5Pff_f90.html#robo325" class="indexitem" >h5pset_fapl_split_f</a>
-<a href="./src/H5Pff_f90.html#robo326" class="indexitem" >h5pset_fapl_stdio_f</a>
-<a href="./src/H5Pff_f90.html#robo327" class="indexitem" >h5pset_fclose_degree_f</a>
-<a href="./src/H5Pff_f90.html#robo328" class="indexitem" >h5pset_fill_time_f</a>
-<a href="./src/H5Pff_f90.html#robo329" class="indexitem" >h5pset_filter_f</a>
-<a href="./src/H5Pff_f90.html#robo330" class="indexitem" >h5pset_fletcher32_f</a>
-<a href="./src/H5Pff_f90.html#robo331" class="indexitem" >h5pset_gc_references_f</a>
-<a href="./src/H5Pff_f90.html#robo332" class="indexitem" >h5pset_hyper_vector_size_f</a>
-<a href="./src/H5Pff_F03_f90.html#robo334" class="indexitem" >h5pset_integer</a>
-<a href="./src/H5Pff_F90_f90.html#robo333" class="indexitem" >h5pset_integer</a>
-<a href="./src/H5Pff_f90.html#robo335" class="indexitem" >h5pset_istore_k_f</a>
-<a href="./src/H5Pff_f90.html#robo336" class="indexitem" >h5pset_layout_f</a>
-<a href="./src/H5Pff_f90.html#robo337" class="indexitem" >H5Pset_libver_bounds_f</a>
-<a href="./src/H5Pff_f90.html#robo338" class="indexitem" >H5Pset_link_creation_order_f</a>
-<a href="./src/H5Pff_f90.html#robo339" class="indexitem" >h5pset_link_phase_change_f</a>
-<a href="./src/H5Pff_f90.html#robo340" class="indexitem" >H5Pset_local_heap_size_hint_f</a>
-<a href="./src/H5Pff_f90.html#robo341" class="indexitem" >H5Pset_nbit_f</a>
-<a href="./src/H5Pff_f90.html#robo342" class="indexitem" >h5pset_nlinks_f</a>
-<a href="./src/H5Pff_f90.html#robo343" class="indexitem" >H5Pset_obj_track_times_f</a>
-<a href="./src/H5Pff_f90.html#robo344" class="indexitem" >h5pset_preserve_f</a>
-<a href="./src/H5Pff_F90_f90.html#robo346" class="indexitem" >h5pset_real</a>
-<a href="./src/H5Pff_F03_f90.html#robo345" class="indexitem" >h5pset_real</a>
-<a href="./src/H5Pff_f90.html#robo347" class="indexitem" >h5pset_scaleoffset_f</a>
-<a href="./src/H5Pff_f90.html#robo348" class="indexitem" >H5Pset_shared_mesg_index_f</a>
-<a href="./src/H5Pff_f90.html#robo349" class="indexitem" >H5Pset_shared_mesg_nindexes_f</a>
-<a href="./src/H5Pff_f90.html#robo350" class="indexitem" >h5pset_shuffle_f</a>
-<a href="./src/H5Pff_f90.html#robo351" class="indexitem" >h5pset_sieve_buf_size_f</a>
-<a href="./src/H5Pff_f90.html#robo352" class="indexitem" >h5pset_sizes_f</a>
-<a href="./src/H5Pff_f90.html#robo353" class="indexitem" >h5pset_small_data_block_size_f</a>
-<a href="./src/H5Pff_f90.html#robo354" class="indexitem" >h5pset_sym_k_f</a>
-<a href="./src/H5Pff_f90.html#robo355" class="indexitem" >h5pset_szip_f</a>
-<a href="./src/H5Pff_f90.html#robo356" class="indexitem" >h5pset_userblock_f</a>
-<a href="./src/H5Pff_f90.html#robo357" class="indexitem" >h5punregister_f</a>
-<a href="./src/H5Rff_F03_f90.html#robo358" class="indexitem" >h5rcreate_object_f</a>
-<a href="./src/H5Rff_F90_f90.html#robo359" class="indexitem" >h5rcreate_object_f</a>
-<a href="./src/H5Rff_F03_f90.html#robo360" class="indexitem" >h5rcreate_ptr_f</a>
-<a href="./src/H5Rff_F03_f90.html#robo362" class="indexitem" >h5rcreate_region_f</a>
-<a href="./src/H5Rff_F90_f90.html#robo361" class="indexitem" >h5rcreate_region_f</a>
-<a href="./src/H5Rff_F03_f90.html#robo363" class="indexitem" >h5rdereference_object_f</a>
-<a href="./src/H5Rff_F90_f90.html#robo364" class="indexitem" >h5rdereference_object_f</a>
-<a href="./src/H5Rff_F03_f90.html#robo365" class="indexitem" >h5rdereference_ptr_f</a>
-<a href="./src/H5Rff_F90_f90.html#robo367" class="indexitem" >h5rdereference_region_f</a>
-<a href="./src/H5Rff_F03_f90.html#robo366" class="indexitem" >h5rdereference_region_f</a>
-<a href="./src/H5Rff_F03_f90.html#robo369" class="indexitem" >h5rget_name_object_f</a>
-<a href="./src/H5Rff_F90_f90.html#robo368" class="indexitem" >h5rget_name_object_f</a>
-<a href="./src/H5Rff_F03_f90.html#robo370" class="indexitem" >h5rget_name_ptr_f</a>
-<a href="./src/H5Rff_F90_f90.html#robo371" class="indexitem" >h5rget_name_region_f</a>
-<a href="./src/H5Rff_F03_f90.html#robo372" class="indexitem" >h5rget_name_region_f</a>
-<a href="./src/H5Rff_F03_f90.html#robo373" class="indexitem" >h5rget_obj_type_f</a>
-<a href="./src/H5Rff_f90.html#robo374" class="indexitem" >h5rget_object_type_obj_f</a>
-<a href="./src/H5Rff_f90.html#robo375" class="indexitem" >h5rget_region_region_f</a>
-<a href="./src/H5Sff_f90.html#robo376" class="indexitem" >h5sclose_f</a>
-<a href="./src/H5Sff_f90.html#robo377" class="indexitem" >h5scopy_f</a>
-<a href="./src/H5Sff_f90.html#robo378" class="indexitem" >h5screate_f</a>
-<a href="./src/H5Sff_f90.html#robo379" class="indexitem" >h5screate_simple_f</a>
-<a href="./src/H5Sff_f90.html#robo380" class="indexitem" >H5Sdecode_f</a>
-<a href="./src/H5Sff_f90.html#robo381" class="indexitem" >H5Sencode_f</a>
-<a href="./src/H5Sff_f90.html#robo382" class="indexitem" >h5sextent_copy_f</a>
-<a href="./src/H5Sff_f90.html#robo383" class="indexitem" >h5sextent_equal_f</a>
-<a href="./src/H5Sff_f90.html#robo384" class="indexitem" >h5sget_select_bounds_f</a>
-<a href="./src/H5Sff_f90.html#robo385" class="indexitem" >h5sget_select_elem_npoints_f</a>
-<a href="./src/H5Sff_f90.html#robo386" class="indexitem" >h5sget_select_elem_pointlist_f</a>
-<a href="./src/H5Sff_f90.html#robo387" class="indexitem" >h5sget_select_hyper_blocklist_f</a>
-<a href="./src/H5Sff_f90.html#robo388" class="indexitem" >h5sget_select_hyper_nblocks_f</a>
-<a href="./src/H5Sff_f90.html#robo389" class="indexitem" >h5sget_select_npoints_f</a>
-<a href="./src/H5Sff_f90.html#robo390" class="indexitem" >h5sget_select_type_f</a>
-<a href="./src/H5Sff_f90.html#robo391" class="indexitem" >h5sget_simple_extent_dims_f</a>
-<a href="./src/H5Sff_f90.html#robo392" class="indexitem" >h5sget_simple_extent_ndims_f</a>
-<a href="./src/H5Sff_f90.html#robo393" class="indexitem" >h5sget_simple_extent_npoints_f</a>
-<a href="./src/H5Sff_f90.html#robo394" class="indexitem" >h5sget_simple_extent_type_f</a>
-<a href="./src/H5Sff_f90.html#robo395" class="indexitem" >h5sis_simple_f</a>
-<a href="./src/H5Sff_f90.html#robo396" class="indexitem" >h5soffset_simple_f</a>
-<a href="./src/H5Sff_f90.html#robo397" class="indexitem" >h5sselect_all_f</a>
-<a href="./src/H5Sff_f90.html#robo398" class="indexitem" >h5sselect_elements_f</a>
-<a href="./src/H5Sff_f90.html#robo399" class="indexitem" >h5sselect_hyperslab_f</a>
-<a href="./src/H5Sff_f90.html#robo400" class="indexitem" >h5sselect_none_f</a>
-<a href="./src/H5Sff_f90.html#robo401" class="indexitem" >h5sselect_valid_f</a>
-<a href="./src/H5Sff_f90.html#robo402" class="indexitem" >h5sset_extent_none_f</a>
-<a href="./src/H5Sff_f90.html#robo403" class="indexitem" >h5sset_extent_simple_f</a>
-<a href="./src/H5Tff_f90.html#robo404" class="indexitem" >h5tarray_create_f</a>
-<a href="./src/H5Tff_f90.html#robo405" class="indexitem" >h5tclose_f</a>
-<a href="./src/H5Tff_f90.html#robo406" class="indexitem" >h5tcommit_anon_f</a>
-<a href="./src/H5Tff_f90.html#robo407" class="indexitem" >h5tcommit_f</a>
-<a href="./src/H5Tff_f90.html#robo408" class="indexitem" >h5tcommitted_f</a>
-<a href="./src/H5Tff_f90.html#robo409" class="indexitem" >h5tcompiler_conv_f</a>
-<a href="./src/H5Tff_F03_f90.html#robo410" class="indexitem" >H5Tconvert_f</a>
-<a href="./src/H5Tff_f90.html#robo411" class="indexitem" >h5tcopy_f</a>
-<a href="./src/H5Tff_f90.html#robo412" class="indexitem" >h5tcreate_f</a>
-<a href="./src/H5Tff_f90.html#robo413" class="indexitem" >H5Tdecode_f</a>
-<a href="./src/H5Tff_f90.html#robo414" class="indexitem" >h5tenaum_insert_f</a>
-<a href="./src/H5Tff_f90.html#robo415" class="indexitem" >H5Tencode_f</a>
-<a href="./src/H5Tff_f90.html#robo416" class="indexitem" >h5tenum_create_f</a>
-<a href="./src/H5Tff_f90.html#robo417" class="indexitem" >h5tenum_nameof_f</a>
-<a href="./src/H5Tff_f90.html#robo418" class="indexitem" >h5tenum_valuof_f</a>
-<a href="./src/H5Tff_f90.html#robo419" class="indexitem" >h5tequal_f</a>
-<a href="./src/H5Tff_f90.html#robo422" class="indexitem" >h5tget_array_dims_f</a>
-<a href="./src/H5Tff_f90.html#robo423" class="indexitem" >h5tget_array_ndims_f</a>
-<a href="./src/H5Tff_f90.html#robo424" class="indexitem" >h5tget_class_f</a>
-<a href="./src/H5Tff_f90.html#robo425" class="indexitem" >h5tget_create_plist_f</a>
-<a href="./src/H5Tff_f90.html#robo426" class="indexitem" >h5tget_cset_f</a>
-<a href="./src/H5Tff_f90.html#robo427" class="indexitem" >h5tget_ebias_f</a>
-<a href="./src/H5Tff_f90.html#robo428" class="indexitem" >h5tget_fields_f</a>
-<a href="./src/H5Tff_f90.html#robo429" class="indexitem" >h5tget_inpad_f</a>
-<a href="./src/H5Tff_f90.html#robo430" class="indexitem" >h5tget_member_class_f</a>
-<a href="./src/H5Tff_f90.html#robo431" class="indexitem" >h5tget_member_index_f</a>
-<a href="./src/H5Tff_f90.html#robo432" class="indexitem" >h5tget_member_name_f</a>
-<a href="./src/H5Tff_f90.html#robo433" class="indexitem" >h5tget_member_offset_f</a>
-<a href="./src/H5Tff_f90.html#robo434" class="indexitem" >h5tget_member_type_f</a>
-<a href="./src/H5Tff_f90.html#robo435" class="indexitem" >h5tget_member_value_f</a>
-<a href="./src/H5Tff_f90.html#robo436" class="indexitem" >h5tget_native_type_f</a>
-<a href="./src/H5Tff_f90.html#robo437" class="indexitem" >h5tget_nmembers_f</a>
-<a href="./src/H5Tff_f90.html#robo438" class="indexitem" >h5tget_norm_f</a>
-<a href="./src/H5Tff_f90.html#robo439" class="indexitem" >h5tget_offset_f</a>
-<a href="./src/H5Tff_f90.html#robo440" class="indexitem" >h5tget_order_f</a>
-<a href="./src/H5Tff_f90.html#robo441" class="indexitem" >h5tget_pad_f</a>
-<a href="./src/H5Tff_f90.html#robo442" class="indexitem" >h5tget_precision_f</a>
-<a href="./src/H5Tff_f90.html#robo443" class="indexitem" >h5tget_sign_f</a>
-<a href="./src/H5Tff_f90.html#robo444" class="indexitem" >h5tget_size_f</a>
-<a href="./src/H5Tff_f90.html#robo445" class="indexitem" >h5tget_strpad_f</a>
-<a href="./src/H5Tff_f90.html#robo446" class="indexitem" >h5tget_super_f</a>
-<a href="./src/H5Tff_f90.html#robo447" class="indexitem" >h5tget_tag_f</a>
-<a href="./src/H5Tff_f90.html#robo448" class="indexitem" >h5tinsert_f</a>
-<a href="./src/H5Tff_f90.html#robo449" class="indexitem" >h5tis_variable_str_f</a>
-<a href="./src/H5Tff_f90.html#robo450" class="indexitem" >h5topen_f</a>
-<a href="./src/H5Tff_f90.html#robo451" class="indexitem" >h5tpack_f</a>
-<a href="./src/H5Tff_f90.html#robo452" class="indexitem" >h5tset_cset_f</a>
-<a href="./src/H5Tff_f90.html#robo453" class="indexitem" >h5tset_ebias_f</a>
-<a href="./src/H5Tff_f90.html#robo454" class="indexitem" >h5tset_fields_f</a>
-<a href="./src/H5Tff_f90.html#robo455" class="indexitem" >h5tset_inpad_f</a>
-<a href="./src/H5Tff_f90.html#robo456" class="indexitem" >h5tset_norm_f</a>
-<a href="./src/H5Tff_f90.html#robo457" class="indexitem" >h5tset_offset_f</a>
-<a href="./src/H5Tff_f90.html#robo458" class="indexitem" >h5tset_order_f</a>
-<a href="./src/H5Tff_f90.html#robo459" class="indexitem" >h5tset_pad_f</a>
-<a href="./src/H5Tff_f90.html#robo460" class="indexitem" >h5tset_precision_f</a>
-<a href="./src/H5Tff_f90.html#robo461" class="indexitem" >h5tset_sign_f</a>
-<a href="./src/H5Tff_f90.html#robo462" class="indexitem" >h5tset_size_f</a>
-<a href="./src/H5Tff_f90.html#robo463" class="indexitem" >h5tset_strpad_f</a>
-<a href="./src/H5Tff_f90.html#robo464" class="indexitem" >h5tset_tag_f</a>
-<a href="./src/H5Tff_f90.html#robo465" class="indexitem" >h5tvlen_create_f</a>
-<a href="./src/H5Zff_f90.html#robo466" class="indexitem" >h5zfilter_avail_f</a>
-<a href="./src/H5Zff_f90.html#robo467" class="indexitem" >h5zget_filter_info_f</a>
-<a href="./src/H5Zff_f90.html#robo468" class="indexitem" >h5zunregister_f</a>
-<h2><a href="#A">A</a> - <a href="#B">B</a> - <a href="#C">C</a> - <a href="#D">D</a> - <a href="#E">E</a> - <a href="#F">F</a> - <a href="#G">G</a> - <a href="#H">H</a> - <a href="#I">I</a> - <a href="#J">J</a> - <a href="#K">K</a> - <a href="#L">L</a> - <a href="#M">M</a> - <a href="#N">N</a> - <a href="#O">O</a> - <a href="#P">P</a> - <a href="#Q">Q</a> - <a href="#R">R</a> - <a href="#S">S</a> - <a href="#T">T</a> - <a href="#U">U</a> - <a href="#V">V</a> - <a href="#W">W</a> - <a href="#X">X</a> - <a href="#Y">Y</a> - <a href="#Z">Z</a> - <a href="#0">0</a> - <a href="#1">1</a> - <a href="#2">2</a> - <a href="#3">3</a> - <a href="#4">4</a> - <a href="#5">5</a> - <a href="#6">6</a> - <a href="#7">7</a> - <a href="#8">8</a> - <a href="#9">9</a></h2>
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./ on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/robodoc.css b/fortran/doc/DevelGuide/robodoc.css
deleted file mode 100644
index 207a172..0000000
--- a/fortran/doc/DevelGuide/robodoc.css
+++ /dev/null
@@ -1,302 +0,0 @@
-/****h* ROBODoc/ROBODoc Cascading Style Sheet
- * FUNCTION
- *   This is the default cascading style sheet for documentation
- *   generated with ROBODoc.
- *   You can edit this file to your own liking and then use
- *   it with the option
- *      --css <filename>
- *
- *   This style-sheet defines the following layout
- *      +----------------------------------------+
- *      |    logo                                |
- *      +----------------------------------------+
- *      |    extra                               |
- *      +----------------------------------------+
- *      |                              | navi-   |
- *      |                              | gation  |
- *      |      content                 |         |
- *      |                              |         |
- *      +----------------------------------------+
- *      |    footer                              |
- *      +----------------------------------------+
- *
- *   This style-sheet is based on a style-sheet that was automatically
- *   generated with the Strange Banana stylesheet generator.
- *   See http://www.strangebanana.com/generator.aspx
- *
- ******
- * $Id: html_generator.c,v 1.94 2008/06/17 11:49:27 gumpu Exp $
- */
-
-body
-{
-    background-color:    rgb(255,255,255);
-    color:               rgb(98,84,55);
-    font-family:         Arial, serif;
-    border-color:        rgb(226,199,143);
-}
-
-pre
-{
-    font-family:      monospace;
-    margin:      15px;
-    padding:     5px;
-    white-space: pre;
-    color:       #000;
-}
-
-pre.source
-{
-    background-color: #ffe;
-    border: dashed #aa9 1px;
-}
-
-p
-{
-    margin:15px;
-}
-
-p.item_name 
-{
-    font-weight: bolder;
-    margin:5px;
-    font-size: 120%;
-}
-
-#content
-{
-    font-size:           100%;
-    color:               rgb(0,0,0);
-    background-color:    rgb(255,255,255);
-    border-left-width:   0px; 
-    border-right-width:  0px; 
-    border-top-width:    0px; 
-    border-bottom-width: 0px;
-    border-left-style:   none; 
-    border-right-style:  none; 
-    border-top-style:    none; 
-    border-bottom-style: none;
-    padding:             40px 31px 14px 17px;
-    border-color:        rgb(0,0,0);
-    text-align:          justify;
-}
-
-#navigation
-{
-    background-color: rgb(98,84,55);
-    color:            rgb(230,221,202);
-    font-family:      "Times New Roman", serif;
-    font-style:       normal;
-    border-color:     rgb(0,0,0);
-}
-
-a.menuitem
-{
-    font-size: 120%;
-    background-color:    rgb(0,0,0);
-    color:               rgb(195,165,100);
-    font-variant:        normal;
-    text-transform:      none;
-    font-weight:         normal;
-    padding:             1px 8px 3px 1px;
-    margin-left:         5px; 
-    margin-right:        5px; 
-    margin-top:          5px; 
-    margin-bottom:       5px;
-    border-color:        rgb(159,126,57);
-    text-align:          right;
-}
-
-#logo, #logo a
-{
-    font-size: 130%;
-    background-color:   rgb(198,178,135);
-    color:              rgb(98,84,55);
-    font-family:        Georgia, serif;
-    font-style:         normal;
-    font-variant:       normal;
-    text-transform:     none;
-    font-weight:        bold;
-    padding:            20px 18px 20px 18px;
-    border-color:       rgb(255,255,255);
-    text-align:         right;
-}
-
-#extra, #extra a
-{
-    font-size: 128%;
-    background-color:    rgb(0,0,0);
-    color:               rgb(230,221,202);
-    font-style:          normal;
-    font-variant:        normal;
-    text-transform:      none;
-    font-weight:         normal;
-    border-left-width:   0px; 
-    border-right-width:  0px; 
-    border-top-width:    0px; 
-    border-bottom-width: 0px;
-    border-left-style:   none; 
-    border-right-style:  none; 
-    border-top-style:    none; 
-    border-bottom-style: none;
-    padding: 12px 12px 12px 12px;
-    border-color:        rgb(195,165,100);
-    text-align:          center;
-}
-
-#content a
-{
-    color:              rgb(159,126,57);
-    text-decoration:    none;
-}
-
-#content a:hover, #content a:active
-{
-    color:              rgb(255,255,255);
-    background-color:   rgb(159,126,57);
-}
-
-a.indexitem
-{
-    display: block;
-}
-
-h1, h2, h3, h4, h5, h6
-{
-    background-color: rgb(221,221,221);
-    font-family:      Arial, serif;
-    font-style:       normal;
-    font-variant:     normal;
-    text-transform:   none;
-    font-weight:      normal;
-}
-
-h1
-{
-    font-size: 151%;
-}
-
-h2
-{
-    font-size: 142%;
-}
-
-h3
-{
-    font-size: 133%;
-}
-
-h4
-{
-    font-size: 124%;
-}
-
-h5
-{
-    font-size: 115%;
-}
-
-h6
-{
-    font-size: 106%;
-}
-
-#navigation a
-{
-    text-decoration: none;
-}
-
-.menuitem:hover
-{
-    background-color:   rgb(195,165,100);
-    color:              rgb(0,0,0);
-}
-
-#extra a
-{
-    text-decoration: none;
-}
-
-#logo a
-{
-    text-decoration: none;
-}
-
-#extra a:hover
-{
-}
-
-/* layout */
-#navigation
-{
-    width:       22%; 
-    position:    relative; 
-    top:         0; 
-    right:       0; 
-    float:       right; 
-    text-align:  center;
-    margin-left: 10px;
-}
-
-.menuitem       {width: auto;}
-#content        {width: auto;}
-.menuitem       {display: block;}
-
-
-div#footer
-{
-    background-color: rgb(198,178,135);
-    color:      rgb(98,84,55);
-    clear:      left;
-    width:      100%;
-    font-size:   71%;
-}
-
-div#footer a
-{
-    background-color: rgb(198,178,135);
-    color:            rgb(98,84,55);
-}
-
-div#footer p
-{
-    margin:0;
-    padding:5px 10px
-}
-
-span.keyword
-{
-    color: #00F;
-}
-
-span.comment
-{
-    color: #080;
-}
-
-span.quote
-{
-    color: #F00;
-}
-
-span.squote
-{
-    color: #F0F;
-}
-
-span.sign
-{
-    color: #008B8B;
-}
-
-span.line_number
-{
-    color: #808080;
-}
-
-@media print
-{
-    #navigation {display: none;}
-    #content    {padding: 0px;}
-    #content a  {text-decoration: underline;}
-}
diff --git a/fortran/doc/DevelGuide/src/H5Af_c.html b/fortran/doc/DevelGuide/src/H5Af_c.html
deleted file mode 100644
index 7fcecc1..0000000
--- a/fortran/doc/DevelGuide/src/H5Af_c.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/H5Af.c</title>
-<!-- Source: ./src/H5Af.c -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="H5Af2fH5Af"></a>
-<a name="robo30"></a><h2>H5Af</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">PURPOSE</p>
-<pre>   This file contains C stubs for <a href="./H5Aff_f90.html#robo27">H5A</a> Fortran APIs
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/H5Af.c on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/H5Aff_F03_f90.html b/fortran/doc/DevelGuide/src/H5Aff_F03_f90.html
deleted file mode 100644
index 9e503f4..0000000
--- a/fortran/doc/DevelGuide/src/H5Aff_F03_f90.html
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/H5Aff_F03.f90</title>
-<!-- Source: ./src/H5Aff_F03.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="ROBODoc2fH5A2028F0329"></a>
-<a name="robo28"></a><h2>H5A (F03)</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  H5A_PROVISIONAL
-</pre>
-<p class="item_name">FILE</p>
-<pre>  src/fortran/src/<a href="#robo_top_of_doc">H5Aff_F03.f90</a>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  This file contains Fortran 90 and Fortran 2003 interfaces for <a href="./H5Aff_f90.html#robo27">H5A</a> functions.
-  It contains the same functions as <a href="./H5Aff_F90_f90.html#robo_top_of_doc">H5Aff_F90.f90</a> but includes the
-  Fortran 2003 functions and the interface listings. This file will be compiled
-  instead of <a href="./H5Aff_F90_f90.html#robo_top_of_doc">H5Aff_F90.f90</a> if Fortran 2003 functions are enabled.
-</pre>
-<p class="item_name">NOTES</p>
-<pre>  (A) C_LOC and character strings according to the Fortran 2003 standard:
-
-  15.1.2.5 C_LOC(X)
-
-  Argument. X shall either
-
-  (1) have interoperable type and type parameters and be
-    (a) a variable that has the TARGET attribute and is interoperable,
-    (b) an allocated allocatable variable that has the TARGET attribute
-        and is not an array of zero size, or
-    (c) an associated scalar pointer, or
-  (2) be a nonpolymorphic scalar, have no length type parameters, and be
-    (a) a nonallocatable, nonpointer variable that has the TARGET attribute,
-    (b) an allocated allocatable variable that has the TARGET attribute, or
-    (c) an associated pointer.
-
-  - When X is a character, for interoperability the standard is:
-
-  15.2.1 Interoperability of intrinsic types
-
-  ...if the type is character, interoperability also requires that the length type parameter
-  be omitted or be specified by an initialization expression whose value is one.
-
-  THEREFORE compilers that have not extended the standard  require
-
-  CHARACTER(LEN=1), TARGET :: chr
-  or
-  CHARACTER, TARGET :: chr
-
-  (B)
-                         *** IMPORTANT ***
-  If you add a new <a href="./H5Aff_f90.html#robo27">H5A</a> function you must add the function name to the
-  Windows dll file 'hdf5_fortrandll.def' in the fortran/src directory.
-  This is needed for Windows based operating systems.
-</pre>
-
-<hr />
-<a name="H5A2028F03292fh5aread5ff"></a>
-<a name="robo108"></a><h2>h5aread_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo28">H5A (F03)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5aread_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Reads an attribute.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  attr_id       - attribute identifier
-  memtype_id    - attribute memory type identifier
-  dims          - 1D array of size 7, stores sizes of the
-                - buf array dimensions.
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  buf           - buffer to read attribute data in
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces are added for
-  called C functions (it is needed for Windows
-  port).  February 27, 2001
-
-  dims parameter was added to make code portable;
-  Aprile 4, 2001
-
-  Changed buf intent to INOUT to be consistant
-  with how the C functions handles it. The pg
-  compiler will return 0 if a buf value is not set.
-  February, 2008
-</pre>
-<p class="item_name">NOTES</p>
-<pre>  This function is overloaded to write INTEGER,
-  REAL, DOUBLE PRECISION and CHARACTER buffers
-  up to 7 dimensions.
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/H5Aff_F03.f90 on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/H5Aff_F90_f90.html b/fortran/doc/DevelGuide/src/H5Aff_F90_f90.html
deleted file mode 100644
index aa01b49..0000000
--- a/fortran/doc/DevelGuide/src/H5Aff_F90_f90.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/H5Aff_F90.f90</title>
-<!-- Source: ./src/H5Aff_F90.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="ROBODoc2fH5A2028F9029"></a>
-<a name="robo29"></a><h2>H5A (F90)</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  H5A_PROVISIONAL
-</pre>
-<p class="item_name">FILE</p>
-<pre>  fortran/src/<a href="#robo_top_of_doc">H5Aff_F90.f90</a>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  This file contains Fortran 90 interfaces for <a href="./H5Aff_f90.html#robo27">H5A</a> functions. It contains
-  the same functions as <a href="./H5Aff_F03_f90.html#robo_top_of_doc">H5Aff_F03.f90</a> but excludes the Fortran 2003 functions
-  and the interface listings. This file will be compiled instead of <a href="./H5Aff_F03_f90.html#robo_top_of_doc">H5Aff_F03.f90</a>
-  if Fortran 2003 functions are not enabled.
-</pre>
-<p class="item_name">NOTES</p>
-<pre>                         *** IMPORTANT ***
-  If you add a new <a href="./H5Aff_f90.html#robo27">H5A</a> function you must add the function name to the
-  Windows dll file 'hdf5_fortrandll.def' in the fortran/src directory.
-  This is needed for Windows based operating systems.
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/H5Aff_F90.f90 on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/H5Aff_f90.html b/fortran/doc/DevelGuide/src/H5Aff_f90.html
deleted file mode 100644
index 268c1db..0000000
--- a/fortran/doc/DevelGuide/src/H5Aff_f90.html
+++ /dev/null
@@ -1,1102 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/H5Aff.f90</title>
-<!-- Source: ./src/H5Aff.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="ROBODoc2fH5A"></a>
-<a name="robo27"></a><h2>H5A</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  MODULE <strong>H5A</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  This file contains Fortran interfaces for <strong>H5A</strong> functions. It includes
-  all the functions that are independent on whether the Fortran 2003 functions
-  are enabled or disabled.
-</pre>
-<p class="item_name">NOTES</p>
-<pre>                         *** IMPORTANT ***
-  If you add a new <strong>H5A</strong> function you must add the function name to the
-  Windows dll file 'hdf5_fortrandll.def' in the fortran/src directory.
-  This is needed for Windows based operating systems.
-</pre>
-
-<hr />
-<a name="H5A2fh5aclose5ff"></a>
-<a name="robo85"></a><h2>h5aclose_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo27">H5A</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5aclose_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Closes the specified attribute.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  attr_id  - attribute identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr   - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces are added for
-  called C functions (it is needed for Windows
-  port).  February 27, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5aclose_f</strong><span class="sign">(</span>attr_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> attr_id  <span class="sign">!</span> Attribute identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5A2fh5acreate5fby5fname5ff"></a>
-<a name="robo86"></a><h2>h5acreate_by_name_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo27">H5A</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5acreate_by_name_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Creates an attribute attached to a specified object
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id        - Location or object identifier; may be dataset or group
-  obj_name      - Name, relative to loc_id, of object that attribute is to be attached to
-  attr_name     - Attribute name
-  type_id       - Attribute datatype identifier
-  space_id      - Attribute dataspace identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  attr          - an attribute identifier
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  acpl_id       - Attribute creation property list identifier (Currently not used.)
-  aapl_id       - Attribute access property list identifier (Currently not used.)
-  lapl_id       - Link access property list
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  February, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5acreate_by_name_f</strong><span class="sign">(</span>loc_id<span class="sign">,</span> obj_name<span class="sign">,</span> attr_name<span class="sign">,</span> type_id<span class="sign">,</span> space_id<span class="sign">,</span> attr<span class="sign">,</span> hdferr<span class="sign">,</span> <span class="sign">&amp;</span>
-       acpl_id<span class="sign">,</span> aapl_id<span class="sign">,</span> lapl_id<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span>   INTENT<span class="sign">(</span>IN<span class="sign">)</span>  <span class="sign">:</span><span class="sign">:</span> loc_id
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span>  <span class="sign">:</span><span class="sign">:</span> obj_name
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span>  <span class="sign">:</span><span class="sign">:</span> attr_name
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span>   INTENT<span class="sign">(</span>IN<span class="sign">)</span>  <span class="sign">:</span><span class="sign">:</span> type_id
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span>   INTENT<span class="sign">(</span>IN<span class="sign">)</span>  <span class="sign">:</span><span class="sign">:</span> space_id
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span>   INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> attr
-    INTEGER<span class="sign">,</span>          INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr
-
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span>   INTENT<span class="sign">(</span>IN<span class="sign">)</span><span class="sign">,</span> OPTIONAL <span class="sign">:</span><span class="sign">:</span> acpl_id
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span>   INTENT<span class="sign">(</span>IN<span class="sign">)</span><span class="sign">,</span> OPTIONAL <span class="sign">:</span><span class="sign">:</span> aapl_id
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span>   INTENT<span class="sign">(</span>IN<span class="sign">)</span><span class="sign">,</span> OPTIONAL <span class="sign">:</span><span class="sign">:</span> lapl_id
-</pre>
-
-<hr />
-<a name="H5A2fh5acreate5ff"></a>
-<a name="robo87"></a><h2>h5acreate_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo27">H5A</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5acreate_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Creates a dataset as an attribute of a group, dataset, or named datatype
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id        - identifier of an object (group, dataset,
-                  or named datatype) attribute is attached to
-  name          - attribute name
-  type_id       - attribute datatype identifier
-  space_id      - attribute dataspace identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  attr_id       - attribute identifier
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  acpl_id       - Attribute creation property list identifier
-  appl_id       - Attribute access property list identifier
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces are added for
-  called C functions (it is needed for Windows
-  port).  February 27, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5acreate_f</strong><span class="sign">(</span>loc_id<span class="sign">,</span> name<span class="sign">,</span> type_id<span class="sign">,</span> space_id<span class="sign">,</span> attr_id<span class="sign">,</span> <span class="sign">&amp;</span>
-                                 hdferr<span class="sign">,</span> acpl_id<span class="sign">,</span> aapl_id <span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> loc_id   <span class="sign">!</span> Object identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name   <span class="sign">!</span> Attribute name
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id  <span class="sign">!</span> Attribute datatype identifier
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> space_id <span class="sign">!</span> Attribute dataspace identifier
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> attr_id <span class="sign">!</span> Attribute identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code<span class="sign">:</span>
-                                           <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5A2fh5adelete5fby5fidx5ff"></a>
-<a name="robo88"></a><h2>h5adelete_by_idx_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo27">H5A</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5adelete_by_idx_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Deletes an attribute from an object according to index order
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id        - Location or object identifier; may be dataset or group
-  obj_name      - Name of object, relative to location, from which attribute is to be removed
-  idx_type      - Type of index; Possible values are:
-                   H5_INDEX_UNKNOWN_F = -1  - Unknown index type
-                   H5_INDEX_NAME_F          - Index on names
-                   H5_INDEX_CRT_ORDER_F     - Index on creation order
-                   H5_INDEX_N_F             - Number of indices defined
-
-  order         - Order in which to iterate over index; Possible values are:
-                   H5_ITER_UNKNOWN_F    - Unknown order
-                   H5_ITER_INC_F        - Increasing order
-                   H5_ITER_DEC_F        - Decreasing order
-                   H5_ITER_NATIVE_F     - No particular order, whatever is fastest
-                   H5_ITER_N_F          - Number of iteration orders
-
-  n             - Offset within index
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  lapl_id       - Link access property list
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  January, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5adelete_by_idx_f</strong><span class="sign">(</span>loc_id<span class="sign">,</span> obj_name<span class="sign">,</span> idx_type<span class="sign">,</span> order<span class="sign">,</span> n<span class="sign">,</span> hdferr<span class="sign">,</span> lapl_id<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> loc_id      <span class="sign">!</span> Identifer <span class="keyword">for</span> object to which attribute is attached
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> obj_name  <span class="sign">!</span> Name of object<span class="sign">,</span> relative to location<span class="sign">,</span>
-                                              <span class="sign">!</span>  from which attribute is to be removed
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> idx_type           <span class="sign">!</span> Type of index<span class="sign">;</span> Possible values are<span class="sign">:</span>
-                                              <span class="sign">!</span>    H5_INDEX_UNKNOWN_F   <span class="sign">-</span> Unknown index type
-                                              <span class="sign">!</span>    H5_INDEX_NAME_F      <span class="sign">-</span> Index on names
-                                              <span class="sign">!</span>    H5_INDEX_CRT_ORDER_F <span class="sign">-</span> Index on creation order
-                                              <span class="sign">!</span>    H5_INDEX_N_F       <span class="sign">-</span> Number of indices defined
-
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> order              <span class="sign">!</span> Order in which to iterate over index<span class="sign">;</span> Possible values are<span class="sign">:</span>
-                                              <span class="sign">!</span>    H5_ITER_UNKNOWN_F  <span class="sign">-</span> Unknown order
-                                              <span class="sign">!</span>    H5_ITER_INC_F      <span class="sign">-</span> Increasing order
-                                              <span class="sign">!</span>    H5_ITER_DEC_F      <span class="sign">-</span> Decreasing order
-                                              <span class="sign">!</span>    H5_ITER_NATIVE_F   <span class="sign">-</span> No particular order<span class="sign">,</span> whatever is fastest
-                                              <span class="sign">!</span>    H5_ITER_N_F      <span class="sign">-</span> Number of iteration orders
-    INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> n         <span class="sign">!</span> Offset within index
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code<span class="sign">:</span>
-                                           <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> lapl_id <span class="sign">!</span> Link access property list
-</pre>
-
-<hr />
-<a name="H5A2fh5adelete5fby5fname5ff"></a>
-<a name="robo89"></a><h2>h5adelete_by_name_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo27">H5A</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5adelete_by_name_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Removes an attribute from a specified location
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id        - Identifer for object to which attribute is attached
-  obj_name      - Name of attribute to open
-  attr_name     - Attribute access property list
-  lapl_id       - Link access property list
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  January, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5adelete_by_name_f</strong><span class="sign">(</span>loc_id<span class="sign">,</span> obj_name<span class="sign">,</span> attr_name<span class="sign">,</span> hdferr<span class="sign">,</span> lapl_id<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> loc_id      <span class="sign">!</span> Identifer <span class="keyword">for</span> object to which attribute is attached
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> obj_name  <span class="sign">!</span> Name of object<span class="sign">,</span> relative to location<span class="sign">,</span>
-                                              <span class="sign">!</span>  from which attribute is to be removed
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> attr_name <span class="sign">!</span> Name of attribute to delete
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr            <span class="sign">!</span> Error code<span class="sign">:</span>
-                                              <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> lapl_id <span class="sign">!</span> Link access property list
-</pre>
-
-<hr />
-<a name="H5A2fh5adelete5ff"></a>
-<a name="robo90"></a><h2>h5adelete_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo27">H5A</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5adelete_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Deletes an attribute of an object (group, dataset or
-  named datatype)
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  obj_id        - object identifier
-  name          - attribute name
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces are added for
-  called C functions (it is needed for Windows
-  port).  February 27, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5adelete_f</strong><span class="sign">(</span>obj_id<span class="sign">,</span> name<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> obj_id  <span class="sign">!</span> Object identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name  <span class="sign">!</span> Attribute name
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5A2fH5Aexists5fby5fname5ff"></a>
-<a name="robo91"></a><h2>H5Aexists_by_name_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo27">H5A</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>H5Aexists_by_name_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Determines whether an attribute with a given name exists on an object
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id        - Location identifier
-  obj_name      - Object name either relative to loc_id, absolute from the file’s root group, or '.' (a dot)
-  attr_name     - Attribute name
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  attr_exists   - attribute exists status
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  lapl_id       - Link access property list identifier
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  February, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE h5aexists_by_name_f<span class="sign">(</span>loc_id<span class="sign">,</span> obj_name<span class="sign">,</span> attr_name<span class="sign">,</span> attr_exists<span class="sign">,</span> hdferr<span class="sign">,</span> lapl_id<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> loc_id     <span class="sign">!</span> Location identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> obj_name <span class="sign">!</span> Object name either relative to loc_id<span class="sign">,</span>
-                                             <span class="sign">!</span> absolute from the file<span class="sign">�</span><span class="sign">�</span><span class="sign">�</span>s root group<span class="sign">,</span> or <span class="squote">'.'</span>
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> attr_name <span class="sign">!</span> Attribute name
-    LOGICAL<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> attr_exists <span class="sign">!</span> <span class="sign">.</span>TRUE<span class="sign">.</span> <span class="keyword">if</span> exists<span class="sign">,</span> <span class="sign">.</span>FALSE<span class="sign">.</span> otherwise
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr      <span class="sign">!</span> Error code<span class="sign">:</span>
-                                        <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> lapl_id <span class="sign">!</span> Link access property list identifier
-</pre>
-
-<hr />
-<a name="H5A2fH5Aexists5ff"></a>
-<a name="robo92"></a><h2>H5Aexists_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo27">H5A</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>H5Aexists_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Determines whether an attribute with a given name exists on an object
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  obj_id        - Object identifier
-  attr_name     - Attribute name
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  attr_exists   - attribute exists status
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  February, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE h5aexists_f<span class="sign">(</span>obj_id<span class="sign">,</span> attr_name<span class="sign">,</span> attr_exists<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> obj_id      <span class="sign">!</span> Object identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> attr_name <span class="sign">!</span> Attribute name
-    LOGICAL<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> attr_exists  <span class="sign">!</span> <span class="sign">.</span>TRUE<span class="sign">.</span> <span class="keyword">if</span> exists<span class="sign">,</span> <span class="sign">.</span>FALSE<span class="sign">.</span> otherwise
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code<span class="sign">:</span>
-                                         <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5A2fh5aget5fcreate5fplist5ff"></a>
-<a name="robo93"></a><h2>h5aget_create_plist_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo27">H5A</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5aget_create_plist_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Gets an attribute creation property list identifier
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  attr_id          - Identifier of the attribute
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  creation_prop_id - Identifier for the attribute’s creation property
-  hdferr           - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  January, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5aget_create_plist_f</strong><span class="sign">(</span>attr_id<span class="sign">,</span> creation_prop_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> attr_id  <span class="sign">!</span> Identifier of the attribute
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> creation_prop_id   <span class="sign">!</span> Identifier <span class="keyword">for</span> the attribute<span class="sign">�</span><span class="sign">�</span><span class="sign">�</span>s creation property
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code
-                                         <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5A2fh5aget5finfo5fby5fidx5ff"></a>
-<a name="robo94"></a><h2>h5aget_info_by_idx_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo27">H5A</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5aget_info_by_idx_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Retrieves attribute information, by attribute index position
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id        - Location of object to which attribute is attached
-  obj_name      - Name of object to which attribute is attached, relative to location
-  idx_type      - Type of index
-  order         - Index traversal order
-  n             - Attribute’s position in index
-
- OUTPUTS  NOTE: In C it is defined as a structure: H5A_info_t
-  corder_valid  - indicates whether the creation order data is valid for this attribute
-  corder        - is a positive integer containing the creation order of the attribute
-  cset          - indicates the character set used for the attribute’s name
-  data_size     - indicates the size, in the number of characters, of the attribute
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  lapl_id       - Link access property list
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  January, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5aget_info_by_idx_f</strong><span class="sign">(</span>loc_id<span class="sign">,</span> obj_name<span class="sign">,</span> idx_type<span class="sign">,</span> order<span class="sign">,</span> n<span class="sign">,</span> <span class="sign">&amp;</span>
-       f_corder_valid<span class="sign">,</span> corder<span class="sign">,</span> cset<span class="sign">,</span> data_size<span class="sign">,</span> hdferr<span class="sign">,</span> lapl_id<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> loc_id      <span class="sign">!</span> Object identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> obj_name  <span class="sign">!</span> Name of object to which attribute is attached
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> idx_type           <span class="sign">!</span> Type of index<span class="sign">;</span> Possible values are<span class="sign">:</span>
-                                              <span class="sign">!</span>    H5_INDEX_UNKNOWN_F   <span class="sign">-</span> Unknown index type
-                                              <span class="sign">!</span>    H5_INDEX_NAME_F      <span class="sign">-</span> Index on names
-                                              <span class="sign">!</span>    H5_INDEX_CRT_ORDER_F <span class="sign">-</span> Index on creation order
-                                              <span class="sign">!</span>    H5_INDEX_N_F       <span class="sign">-</span> Number of indices defined
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> order              <span class="sign">!</span> Order in which to iterate over index<span class="sign">;</span> Possible values are<span class="sign">:</span>
-                                              <span class="sign">!</span>    H5_ITER_UNKNOWN_F  <span class="sign">-</span> Unknown order
-                                              <span class="sign">!</span>    H5_ITER_INC_F      <span class="sign">-</span> Increasing order
-                                              <span class="sign">!</span>    H5_ITER_DEC_F      <span class="sign">-</span> Decreasing order
-                                              <span class="sign">!</span>    H5_ITER_NATIVE_F   <span class="sign">-</span> No particular order<span class="sign">,</span> whatever is fastest
-
-    INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> n         <span class="sign">!</span> Attribute<span class="sign">�</span><span class="sign">�</span><span class="sign">�</span>s position in index
-
-
-    LOGICAL<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> f_corder_valid <span class="sign">!</span> Indicates whether the creation order data is valid <span class="keyword">for</span> this attribute
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> corder <span class="sign">!</span> Is a positive integer containing the creation order of the attribute
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> cset   <span class="sign">!</span> Indicates the character set used <span class="keyword">for</span> the attribute<span class="sign">�</span><span class="sign">�</span><span class="sign">�</span>s name
-    INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> data_size <span class="sign">!</span> Indicates the size<span class="sign">,</span> in the number of characters<span class="sign">,</span> of the attribute
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code<span class="sign">:</span>
-                                         <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> lapl_id  <span class="sign">!</span> Link access property list
-</pre>
-
-<hr />
-<a name="H5A2fh5aget5finfo5fby5fname5ff"></a>
-<a name="robo95"></a><h2>h5aget_info_by_name_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo27">H5A</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5aget_info_by_name_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Retrieves attribute information, by attribute name
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id        - Location of object to which attribute is attached
-  obj_name      - Name of object to which attribute is attached, relative to location
-  attr_name     - Attribute name
-
- OUTPUTS  NOTE: In C it is defined as a structure: H5A_info_t
-  corder_valid  - indicates whether the creation order data is valid for this attribute
-  corder        - is a positive integer containing the creation order of the attribute
-  cset          - indicates the character set used for the attribute’s name
-  data_size     - indicates the size, in the number of characters, of the attribute
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  lapl_id       - Link access property list
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  January, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5aget_info_by_name_f</strong><span class="sign">(</span>loc_id<span class="sign">,</span> obj_name<span class="sign">,</span> attr_name<span class="sign">,</span> <span class="sign">&amp;</span>
-       f_corder_valid<span class="sign">,</span> corder<span class="sign">,</span> cset<span class="sign">,</span> data_size<span class="sign">,</span> hdferr<span class="sign">,</span> lapl_id<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> loc_id    <span class="sign">!</span> Object identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> obj_name <span class="sign">!</span> Name of object to which attribute is attached
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> attr_name <span class="sign">!</span> Attribute name
-
-
-    LOGICAL<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> f_corder_valid <span class="sign">!</span> Indicates whether the creation order data is valid <span class="keyword">for</span> this attribute
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> corder <span class="sign">!</span> Is a positive integer containing the creation order of the attribute
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> cset <span class="sign">!</span> Indicates the character set used <span class="keyword">for</span> the attribute<span class="sign">�</span><span class="sign">�</span><span class="sign">�</span>s name
-    INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> data_size   <span class="sign">!</span> Indicates the size<span class="sign">,</span> in the number of characters<span class="sign">,</span> of the attribute
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code<span class="sign">:</span>
-                                           <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> lapl_id  <span class="sign">!</span> Link access property list
-</pre>
-
-<hr />
-<a name="H5A2fh5aget5finfo5ff"></a>
-<a name="robo96"></a><h2>h5aget_info_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo27">H5A</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5aget_info_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Retrieves attribute information, by attribute identifier
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  attr_id       - attribute identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  NOTE: In C it is defined as a structure: H5A_info_t
-
-  corder_valid  - indicates whether the creation order data is valid for this attribute
-  corder        - is a positive integer containing the creation order of the attribute
-  cset          - indicates the character set used for the attribute’s name
-  data_size     - indicates the size, in the number of characters, of the attribute
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  January, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5aget_info_f</strong><span class="sign">(</span>attr_id<span class="sign">,</span> f_corder_valid<span class="sign">,</span> corder<span class="sign">,</span> cset<span class="sign">,</span> data_size<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> attr_id  <span class="sign">!</span> Attribute identifier
-
-    LOGICAL<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> f_corder_valid <span class="sign">!</span> Indicates whether the creation order data is valid <span class="keyword">for</span> this attribute
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> corder <span class="sign">!</span> Is a positive integer containing the creation order of the attribute
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> cset   <span class="sign">!</span> Indicates the character set used <span class="keyword">for</span> the attribute<span class="sign">�</span><span class="sign">�</span><span class="sign">�</span>s name
-    INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> data_size <span class="sign">!</span> Indicates the size<span class="sign">,</span> in the number of characters<span class="sign">,</span> of the attribute
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code<span class="sign">:</span>
-                                         <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5A2fh5aget5fname5fby5fidx5ff"></a>
-<a name="robo97"></a><h2>h5aget_name_by_idx_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo27">H5A</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5aget_name_by_idx_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Gets an attribute name, by attribute index position.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id        - Location of object to which attribute is attached
-  obj_name      - Name of object to which attribute is attached, relative to location
-  idx_type      - Type of index; Possible values are:
-                   H5_INDEX_UNKNOWN_F = -1  - Unknown index type
-                   H5_INDEX_NAME_F          - Index on names
-                   H5_INDEX_CRT_ORDER_F     - Index on creation order
-                   H5_INDEX_N_F             - Number of indices defined
-
-  order         - Order in which to iterate over index; Possible values are:
-                   H5_ITER_UNKNOWN_F    - Unknown order
-                   H5_ITER_INC_F        - Increasing order
-                   H5_ITER_DEC_F        - Decreasing order
-                   H5_ITER_NATIVE_F     - No particular order, whatever is fastest
-                   H5_ITER_N_F          - Number of iteration orders
-  order         - Index traversal order
-  n             - Attribute’s position in index
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  name          - Attribute name
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  lapl_id       - Link access property list
-  size          - Size, in bytes, of attribute name
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  January, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5aget_name_by_idx_f</strong><span class="sign">(</span>loc_id<span class="sign">,</span> obj_name<span class="sign">,</span> idx_type<span class="sign">,</span> order<span class="sign">,</span> <span class="sign">&amp;</span>
-       n<span class="sign">,</span> name<span class="sign">,</span> hdferr<span class="sign">,</span> size<span class="sign">,</span> lapl_id<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> loc_id      <span class="sign">!</span> Identifer <span class="keyword">for</span> object to which attribute is attached
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> obj_name  <span class="sign">!</span> Name of object<span class="sign">,</span> relative to location<span class="sign">,</span>
-                                              <span class="sign">!</span>  from which attribute is to be removed <span class="sign">*</span>TEST<span class="sign">*</span> check NULL
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> idx_type <span class="sign">!</span> Type of index<span class="sign">;</span> Possible values are<span class="sign">:</span>
-                                    <span class="sign">!</span>    H5_INDEX_UNKNOWN_F   <span class="sign">-</span> Unknown index type
-                                    <span class="sign">!</span>    H5_INDEX_NAME_F       <span class="sign">-</span> Index on names
-                                    <span class="sign">!</span>    H5_INDEX_CRT_ORDER_F  <span class="sign">-</span> Index on creation order
-                                    <span class="sign">!</span>    H5_INDEX_N_F         <span class="sign">-</span> Number of indices defined
-
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> order    <span class="sign">!</span> Order in which to iterate over index<span class="sign">;</span> Possible values are<span class="sign">:</span>
-                                    <span class="sign">!</span>    H5_ITER_UNKNOWN_F   <span class="sign">-</span> Unknown order
-                                    <span class="sign">!</span>    H5_ITER_INC_F      <span class="sign">-</span> Increasing order
-                                    <span class="sign">!</span>    H5_ITER_DEC_F       <span class="sign">-</span> Decreasing order
-                                    <span class="sign">!</span>    H5_ITER_NATIVE_F    <span class="sign">-</span> No particular order<span class="sign">,</span> whatever is fastest
-                                    <span class="sign">!</span>    H5_ITER_N_F        <span class="sign">-</span> Number of iteration orders
-    INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> n <span class="sign">!</span>  Attribute<span class="sign">�</span><span class="sign">�</span><span class="sign">�</span>s position in index
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name <span class="sign">!</span> Attribute name
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr    <span class="sign">!</span> Error code<span class="sign">:</span>
-                                      <span class="sign">!</span> Returns attribute name size<span class="sign">,</span>
-                                      <span class="sign">!</span> <span class="sign">-</span>1 <span class="keyword">if</span> fail
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> lapl_id <span class="sign">!</span> Link access property list
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> size  <span class="sign">!</span> Indicates the size<span class="sign">,</span> in the number of characters<span class="sign">,</span> 
-                                                    <span class="sign">!</span> of the attribute
-</pre>
-
-<hr />
-<a name="H5A2fh5aget5fname5ff"></a>
-<a name="robo98"></a><h2>h5aget_name_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo27">H5A</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5aget_name_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Gets an attribute name.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  attr_id       - attribute identifier
-  size          - size of a buffer to read name in
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  buf           - buffer to read name in
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces are added for
-  called C functions (it is needed for Windows
-  port).  February 27, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5aget_name_f</strong><span class="sign">(</span>attr_id<span class="sign">,</span> size<span class="sign">,</span> buf<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> attr_id  <span class="sign">!</span> Attribute identifier
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> size    <span class="sign">!</span> Buffer size
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>INOUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> buf <span class="sign">!</span> Buffer to hold attribute name
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr <span class="sign">!</span> Error code<span class="sign">:</span>
-                                   <span class="sign">!</span> name length is successful<span class="sign">,</span> <span class="sign">-</span>1 <span class="keyword">if</span> fail
-</pre>
-
-<hr />
-<a name="H5A2fh5aget5fnum5fattrs5ff"></a>
-<a name="robo99"></a><h2>h5aget_num_attrs_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo27">H5A</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5aget_num_attrs_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Determines the number of attributes attached to an object.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  obj_id        - object (group, dataset, or named datatype)
-  identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  attr_num      - number of attributes attached to the object
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces are added for
-  called C functions (it is needed for Windows
-  port).  February 27, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5aget_num_attrs_f</strong><span class="sign">(</span>obj_id<span class="sign">,</span> attr_num<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> obj_id  <span class="sign">!</span> Object identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> attr_num      <span class="sign">!</span> Number of attributes of the object
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5A2fh5aget5fspace5ff"></a>
-<a name="robo100"></a><h2>h5aget_space_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo27">H5A</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5aget_space_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Gets a copy of the dataspace for an attribute.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  attr_id       - attribute identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  space_id      - attribite dataspace identifier
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces are added for
-  called C functions (it is needed for Windows
-  port).  February 27, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5aget_space_f</strong><span class="sign">(</span>attr_id<span class="sign">,</span> space_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> attr_id   <span class="sign">!</span> Attribute identifier
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> space_id <span class="sign">!</span> Attribute dataspace identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr          <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5A2fh5aget5fstorage5fsize5ff"></a>
-<a name="robo101"></a><h2>h5aget_storage_size_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo27">H5A</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5aget_storage_size_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Returns the amount of storage required for an attribute.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  attr_id       - attribute identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  size          - attribute storage size
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  January, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5aget_storage_size_f</strong><span class="sign">(</span>attr_id<span class="sign">,</span> size<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> attr_id  <span class="sign">!</span> Attribute identifier
-    INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> size  <span class="sign">!</span> Attribute storage requirement
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5A2fh5aget5ftype5ff"></a>
-<a name="robo102"></a><h2>h5aget_type_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo27">H5A</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5aget_type_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Gets an attribute datatype.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  attr_id       - attribute identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  type_id       - attribute datatype identifier
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces are added for
-  called C functions (it is needed for Windows
-  port).  February 27, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5aget_type_f</strong><span class="sign">(</span>attr_id<span class="sign">,</span> type_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> attr_id  <span class="sign">!</span> Attribute identifier
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id <span class="sign">!</span> Attribute datatype identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5A2fh5aopen5fby5fidx5ff"></a>
-<a name="robo103"></a><h2>h5aopen_by_idx_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo27">H5A</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5aopen_by_idx_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Opens an existing attribute that is attached to an object specified by location and name
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id        - Location of object to which attribute is attached
-  obj_name      - Name of object to which attribute is attached, relative to location
-  idx_type      - Type of index
-  order         - Index traversal order
-  n             - Attribute’s position in index
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  aapl_id       - Attribute access property list
-  lapl_id       - Link access property list
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  January, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5aopen_by_idx_f</strong><span class="sign">(</span>loc_id<span class="sign">,</span> obj_name<span class="sign">,</span> idx_type<span class="sign">,</span> order<span class="sign">,</span> n<span class="sign">,</span> attr_id<span class="sign">,</span> hdferr<span class="sign">,</span> aapl_id<span class="sign">,</span> lapl_id<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> loc_id      <span class="sign">!</span> Object identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> obj_name  <span class="sign">!</span> Name of object to which attribute is attached
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> idx_type           <span class="sign">!</span> Type of index<span class="sign">;</span> Possible values are<span class="sign">:</span>
-                                              <span class="sign">!</span>    H5_INDEX_UNKNOWN_F   <span class="sign">-</span> Unknown index type
-                                              <span class="sign">!</span>    H5_INDEX_NAME_F      <span class="sign">-</span> Index on names
-                                              <span class="sign">!</span>    H5_INDEX_CRT_ORDER_F <span class="sign">-</span> Index on creation order
-                                              <span class="sign">!</span>    H5_INDEX_N_F       <span class="sign">-</span> Number of indices defined
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> order              <span class="sign">!</span> Order in which to iterate over index<span class="sign">;</span> Possible values are<span class="sign">:</span>
-                                              <span class="sign">!</span>    H5_ITER_UNKNOWN_F  <span class="sign">-</span> Unknown order
-                                              <span class="sign">!</span>    H5_ITER_INC_F      <span class="sign">-</span> Increasing order
-                                              <span class="sign">!</span>    H5_ITER_DEC_F      <span class="sign">-</span> Decreasing order
-                                              <span class="sign">!</span>    H5_ITER_NATIVE_F   <span class="sign">-</span> No particular order<span class="sign">,</span> whatever is fastest
-
-    INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> n       <span class="sign">!</span> Attribute<span class="sign">�</span><span class="sign">�</span><span class="sign">�</span>s position in index
-
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> attr_id  <span class="sign">!</span> Attribute identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr          <span class="sign">!</span> Error code<span class="sign">:</span>
-                                            <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> aapl_id  <span class="sign">!</span> Attribute access property list
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> lapl_id  <span class="sign">!</span> Link access property list
-</pre>
-
-<hr />
-<a name="H5A2fH5Aopen5fby5fname5ff"></a>
-<a name="robo104"></a><h2>H5Aopen_by_name_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo27">H5A</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>H5Aopen_by_name_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Opens an attribute for an object by object name and attribute name.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id        - Location from which to find object to which attribute is attached
-  obj_name      - Object name either relative to loc_id, absolute from the file’s root group, or '.' (a dot)
-  attr_name     - Attribute name
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  attr_id       - attribute identifier
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  aapl_id       - Attribute access property list (Currently unused; should be passed in as H5P_DEFAULT.)
-  lapl_id       - Link access property list identifier
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  February, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE h5aopen_by_name_f<span class="sign">(</span>loc_id<span class="sign">,</span> obj_name<span class="sign">,</span> attr_name<span class="sign">,</span> attr_id<span class="sign">,</span> hdferr<span class="sign">,</span> aapl_id<span class="sign">,</span> lapl_id<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> loc_id    <span class="sign">!</span> Location identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> obj_name <span class="sign">!</span> Object name either relative to loc_id<span class="sign">,</span>
-                                             <span class="sign">!</span> absolute from the file<span class="sign">�</span><span class="sign">�</span><span class="sign">�</span>s root group<span class="sign">,</span> or <span class="squote">'.'</span>
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> attr_name <span class="sign">!</span> Attribute name
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> attr_id <span class="sign">!</span> Attribute identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code<span class="sign">:</span>
-                                           <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> aapl_id <span class="sign">!</span> Attribute access property list
-                                                    <span class="sign">!</span> <span class="sign">(</span>Currently unused<span class="sign">;</span> should be passed in as H5P_DEFAULT_F<span class="sign">)</span>
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> lapl_id <span class="sign">!</span> Link access property list identifier
-</pre>
-
-<hr />
-<a name="H5A2fh5aopen5ff"></a>
-<a name="robo105"></a><h2>h5aopen_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo27">H5A</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5aopen_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Opens an attribute for an object specified by object
-  identifier and attribute name
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  obj_id        - Identifer for object to which attribute is attached
-  attr_name     - Name of attribute to open
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  attr_id       - attribute identifier
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  aapl_id       - Attribute access property list
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  January, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5aopen_f</strong><span class="sign">(</span>obj_id<span class="sign">,</span> attr_name<span class="sign">,</span> attr_id<span class="sign">,</span> hdferr<span class="sign">,</span> aapl_id<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> obj_id      <span class="sign">!</span> Object identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> attr_name <span class="sign">!</span> Attribute name
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> attr_id    <span class="sign">!</span> Attribute identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr            <span class="sign">!</span> Error code
-                                              <span class="sign">!</span>   Success<span class="sign">:</span>  0
-                                              <span class="sign">!</span>   Failure<span class="sign">:</span> <span class="sign">-</span>1
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> aapl_id     <span class="sign">!</span> Attribute access property list
-</pre>
-
-<hr />
-<a name="H5A2fh5aopen5fidx5ff"></a>
-<a name="robo106"></a><h2>h5aopen_idx_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo27">H5A</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5aopen_idx_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Opens the attribute specified by its index.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  obj_id        - identifier of a group, dataset, or named
-                  datatype an attribute to be attached to
-  index         - index of the attribute to open (zero-based)
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  attr_id       - attribute identifier
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces are added for
-  called C functions (it is needed for Windows
-  port).  February 27, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5aopen_idx_f</strong><span class="sign">(</span>obj_id<span class="sign">,</span> index<span class="sign">,</span> attr_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> obj_id    <span class="sign">!</span> Object identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> index            <span class="sign">!</span> Attribute index
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> attr_id  <span class="sign">!</span> Attribute identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr          <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5A2fh5aopen5fname5ff"></a>
-<a name="robo107"></a><h2>h5aopen_name_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo27">H5A</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5aopen_name_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Opens an attribute specified by name.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  obj_id        - identifier of a group, dataset, or named
-                  datatype atttribute to be attached to
-  name          - attribute name
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  attr_id       - attribute identifier
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces are added for
-  called C functions (it is needed for Windows
-  port).  February 27, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5aopen_name_f</strong><span class="sign">(</span>obj_id<span class="sign">,</span> name<span class="sign">,</span> attr_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> obj_id    <span class="sign">!</span> Object identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name    <span class="sign">!</span> Attribute name
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> attr_id  <span class="sign">!</span> Attribute identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr          <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5A2fh5arename5fby5fname5ff"></a>
-<a name="robo109"></a><h2>h5arename_by_name_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo27">H5A</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5arename_by_name_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Renames an attribute
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id        - Location or object identifier; may be dataset or group
-  obj_name      - Name of object, relative to location,
-                  whose attribute is to be renamed
-  old_attr_name - Prior attribute name
-  new_attr_name - New attribute name
-  lapl_id       - Link access property list identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  January, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5arename_by_name_f</strong><span class="sign">(</span>loc_id<span class="sign">,</span> obj_name<span class="sign">,</span> old_attr_name<span class="sign">,</span> new_attr_name<span class="sign">,</span> <span class="sign">&amp;</span>
-        hdferr<span class="sign">,</span> lapl_id<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> loc_id    <span class="sign">!</span> Object identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> obj_name  <span class="sign">!</span> Name of object<span class="sign">,</span> relative to location<span class="sign">,</span>
-                                              <span class="sign">!</span>  whose attribute is to be renamed
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> old_attr_name <span class="sign">!</span> Prior attribute name
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> new_attr_name <span class="sign">!</span> New attribute name
-
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code<span class="sign">:</span>
-                                         <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> lapl_id <span class="sign">!</span> Link access property list identifier
-</pre>
-
-<hr />
-<a name="H5A2fh5arename5ff"></a>
-<a name="robo110"></a><h2>h5arename_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo27">H5A</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5arename_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Renames an attribute
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id        - Location or object identifier; may be dataset or group
-  old_attr_name - Prior attribute name
-  new_attr_name - New attribute name
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  January, 2008
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  N/A
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5arename_f</strong><span class="sign">(</span>loc_id<span class="sign">,</span> old_attr_name<span class="sign">,</span> new_attr_name<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> loc_id    <span class="sign">!</span> Object identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> old_attr_name <span class="sign">!</span> Prior attribute name
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> new_attr_name <span class="sign">!</span> New attribute name
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code<span class="sign">:</span>
-                                         <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/H5Aff.f90 on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/H5Df_c.html b/fortran/doc/DevelGuide/src/H5Df_c.html
deleted file mode 100644
index 1e163f2..0000000
--- a/fortran/doc/DevelGuide/src/H5Df_c.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/H5Df.c</title>
-<!-- Source: ./src/H5Df.c -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="H5Df2fH5Df"></a>
-<a name="robo34"></a><h2>H5Df</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">PURPOSE</p>
-<pre>   This file contains C stubs for <a href="./H5Dff_f90.html#robo31">H5D</a> Fortran APIs
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/H5Df.c on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/H5Dff_F03_f90.html b/fortran/doc/DevelGuide/src/H5Dff_F03_f90.html
deleted file mode 100644
index 0bb4173..0000000
--- a/fortran/doc/DevelGuide/src/H5Dff_F03_f90.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/H5Dff_F03.f90</title>
-<!-- Source: ./src/H5Dff_F03.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="ROBODoc2fH5D2028F0329"></a>
-<a name="robo32"></a><h2>H5D (F03)</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  H5D_PROVISIONAL
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  This file contains Fortran 90 and Fortran 2003 interfaces for <a href="./H5Dff_f90.html#robo31">H5D</a> functions.
-  It contains the same functions as H5Dff_DEPRECIATE.f90 but includes the
-  Fortran 2003 functions and the interface listings. This file will be compiled
-  instead of H5Dff_DEPRECIATE.f90 if Fortran 2003 functions are enabled.
-</pre>
-<p class="item_name">NOTES</p>
-<pre>  (1) The maximum rank of an array allowed in Fortran is 7, therefore
-  we only provide an interface for arrays up to and including rank 7.
-
-  (2) Unfortunately we are using a generic interface and one of the factors
-  used in determining the proper routine to select is that of the array
-  rank being passed. Therefore, we can not create just one subroutine for
-  each array type (integer, real, etc...) and use a
-  rank 1 array of assumed size to handle multiple ranks, i.e.
-  (i.e. integer, dimension(*) :: ... )
-  (i.e. real   , dimension(*) :: ... ) etc...
-
-  (3) Could not place the USE ISO_C_BINDING in the module header because it may
-  conflict with the USE ISO_C_BINDING included in the user's program. Moved
-  the statement instead to each subroutine.
-
-
-  (4) C_LOC and character strings according to the Fortran 2003 standard:
-
-  15.1.2.5 C_LOC(X)
-
-  Argument. X shall either
-
-  (A) have interoperable type and type parameters and be
-  (a) a variable that has the TARGET attribute and is interoperable,
-  (b) an allocated allocatable variable that has the TARGET attribute
-  and is not an array of zero size, or
-  (c) an associated scalar pointer, or
-  (B) be a nonpolymorphic scalar, have no length type parameters, and be
-  (a) a nonallocatable, nonpointer variable that has the TARGET attribute,
-  (b) an allocated allocatable variable that has the TARGET attribute, or
-  (c) an associated pointer.
-
-        - When X is a character, for interoperability the standard is:
-
-  15.2.1 Interoperability of intrinsic types
-
-  ...if the type is character, interoperability also requires that the length type parameter
-  be omitted or be specified by an initialization expression whose value is one.
-
-  THEREFORE compilers that have not extended the standard require the
-  argument in C_LOC to be of the variant:
-
-  CHARACTER(LEN=1), TARGET :: chr
-  or
-  CHARACTER, TARGET :: chr
-  (B)
-                         *** IMPORTANT ***
-  If you add a new <a href="./H5Dff_f90.html#robo31">H5D</a> function you must add the function name to the
-  Windows dll file 'hdf5_fortrandll.def' in the fortran/src directory.
-  This is needed for Windows based operating systems.
-</pre>
-
-<hr />
-<a name="H5D2fh5dvlen5freclaim"></a>
-<a name="robo127"></a><h2>h5dvlen_reclaim</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="./H5Dff_f90.html#robo31">H5D</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5dvlen_reclaim</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Reclaims VL datatype memory buffers. 
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  type_id  - Identifier of the datatype. 
-  space_id - Identifier of the dataspace. 
-  plist_id - Identifier of the property list used to create the buffer. 
-       buf - Pointer to the buffer to be reclaimed. 
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr   - error code
-               Success:  0
-               Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre> M. Scot Breitenfeld
- January 11, 2011
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE H5Dvlen_reclaim_f<span class="sign">(</span>type_id<span class="sign">,</span> space_id<span class="sign">,</span> plist_id<span class="sign">,</span> buf<span class="sign">,</span> hdferr<span class="sign">)</span>
-
-    USE ISO_C_BINDING
-    IMPLICIT NONE
-
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id   <span class="sign">!</span> Identifier of the datatype<span class="sign">.</span> 
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> space_id  <span class="sign">!</span> Identifier of the dataspace<span class="sign">.</span> 
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> plist_id  <span class="sign">!</span> Identifier of the property list used to create the buffer<span class="sign">.</span> 
-    TYPE<span class="sign">(</span>C_PTR<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>INOUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> buf       <span class="sign">!</span> Pointer to the buffer to be reclaimed<span class="sign">.</span> 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr          <span class="sign">!</span> Error code<span class="sign">.</span>
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/H5Dff_F03.f90 on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/H5Dff_F90_f90.html b/fortran/doc/DevelGuide/src/H5Dff_F90_f90.html
deleted file mode 100644
index afebdd8..0000000
--- a/fortran/doc/DevelGuide/src/H5Dff_F90_f90.html
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/H5Dff_F90.f90</title>
-<!-- Source: ./src/H5Dff_F90.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="ROBODoc2fH5D2028F9029"></a>
-<a name="robo33"></a><h2>H5D (F90)</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  H5D_PROVISIONAL
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  This file contains Fortran 90 interfaces for <a href="./H5Dff_f90.html#robo31">H5D</a> functions. It contains
-  the same functions as <a href="./H5Dff_F03_f90.html#robo_top_of_doc">H5Dff_F03.f90</a> but excludes the Fortran 2003 functions
-  and the interface listings. This file will be compiled instead of <a href="./H5Dff_F03_f90.html#robo_top_of_doc">H5Dff_F03.f90</a>
-  if Fortran 2003 functions are not enabled.
-</pre>
-<p class="item_name">NOTES</p>
-<pre>  (1) The maximum rank of an array allowed in Fortran is 7, therefore
-  we only provide an interface for arrays up to and including rank 7.
-
-  (2) Unfortunately we are using a generic interface and one of the factors
-  used in determining the proper routine to select is that of the array
-  rank being passed, therefore we can not create just one subroutine for
-  each array type (integer, real, etc...) of various ranks and then use a
-  rank 1 array of assumed size in the just one subroutine,
-  (i.e. integer, dimension(*) :: ... )
-  (i.e. real   , dimension(*) :: ... ) etc...
-
-  (3)
-                         *** IMPORTANT ***
-  If you add a new <a href="./H5Dff_f90.html#robo31">H5D</a> function you must add the function name to the
-  Windows dll file 'hdf5_fortrandll.def' in the fortran/src directory.
-  This is needed for Windows based operating systems.
-</pre>
-
-<hr />
-<a name="H5D2fh5dread5ff"></a>
-<a name="robo124"></a><h2>h5dread_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="./H5Dff_f90.html#robo31">H5D</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5dread_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Reads raw data from the specified dataset into buf,
-  converting from file datatype and dataspace to memory
-  datatype and dataspace.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  dset_id       - dataset identifier
-  mem_type_id   - memory type identifier
-  dims          - 1-dim array of size 7; dims(k) has the size
-                  of k-th dimension of the buf array
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  buf     - buffer to read data in
-  hdferr: - error code
-             Success:  0
-             Failure: -1
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  mem_space_id  - memory dataspace identifier
-  file_space_id - file dataspace identifier
-  xfer_prp      - trasfer property list identifier
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  February 28, 2001
-
-  dims parameter was added to make code portable;
-  n parameter was replaced with dims parameter in
-  the h5dwrite_reference_obj and h5dwrite_reference_dsetreg
-  functions.  April 2, 2001
-</pre>
-<p class="item_name">NOTES</p>
-<pre>  This function is overloaded to read INTEGER,
-  REAL, DOUBLE PRECISION and CHARACTER buffers
-  up to 7 dimensions, and one dimensional buffers
-  of the TYPE(hobj_ref_t_f) and TYPE(hdset_reg_ref_t_f) types.
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/H5Dff_F90.f90 on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/H5Dff_f90.html b/fortran/doc/DevelGuide/src/H5Dff_f90.html
deleted file mode 100644
index 5444a93..0000000
--- a/fortran/doc/DevelGuide/src/H5Dff_f90.html
+++ /dev/null
@@ -1,506 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/H5Dff.f90</title>
-<!-- Source: ./src/H5Dff.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="ROBODoc2fH5D"></a>
-<a name="robo31"></a><h2>H5D</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  MODULE <strong>H5D</strong>
-</pre>
-<p class="item_name">FILE</p>
-<pre>  fortran/src/<a href="#robo_top_of_doc">H5Dff.f90</a>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  This file contains Fortran interfaces for <strong>H5D</strong> functions. It includes
-  all the functions that are independent on whether the Fortran 2003 functions
-  are enabled or disabled.
-</pre>
-<p class="item_name">NOTES</p>
-<pre>                         *** IMPORTANT ***
-  If you add a new <strong>H5D</strong> function you must add the function name to the
-  Windows dll file 'hdf5_fortrandll.def' in the fortran/src directory.
-  This is needed for Windows based operating systems.
-</pre>
-
-<hr />
-<a name="H5D2fh5dclose5ff"></a>
-<a name="robo113"></a><h2>h5dclose_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo31">H5D</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5dclose_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Closes a dataset.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  dset_id       - dataset identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  February 28, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5dclose_f</strong><span class="sign">(</span>dset_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> dset_id <span class="sign">!</span> Dataset identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5D2fh5dcreate5fanon5ff"></a>
-<a name="robo114"></a><h2>h5dcreate_anon_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo31">H5D</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5dcreate_anon_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Creates a dataset in a file without linking it into the file structure
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id        - Identifier of the file or group within which to create the dataset.
-  type_id       - Identifier of the datatype to use when creating the dataset.
-  space_id      - Identifier of the dataspace to use when creating the dataset.
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  dset_id       - dataset identifier
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  dcpl_id       - Dataset creation property list identifier.
-  dapl_id       - Dataset access property list identifier.
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  February 11, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5dcreate_anon_f</strong><span class="sign">(</span>loc_id<span class="sign">,</span> type_id<span class="sign">,</span> space_id<span class="sign">,</span> dset_id<span class="sign">,</span> hdferr<span class="sign">,</span> dcpl_id<span class="sign">,</span> dapl_id<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> loc_id   <span class="sign">!</span> File or group identifier<span class="sign">.</span>
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id  <span class="sign">!</span> Datatype identifier<span class="sign">.</span>
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> space_id <span class="sign">!</span> Dataspace identifier<span class="sign">.</span>
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> dset_id <span class="sign">!</span> Dataset identifier<span class="sign">.</span>
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code<span class="sign">.</span>
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> dcpl_id  <span class="sign">!</span> Dataset creation property list identifier<span class="sign">.</span>
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> dapl_id  <span class="sign">!</span> Dataset access property list identifier<span class="sign">.</span>
-</pre>
-
-<hr />
-<a name="H5D2fh5dcreate5ff"></a>
-<a name="robo115"></a><h2>h5dcreate_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo31">H5D</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5dcreate_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Creates a dataset at the specified location
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id        - file or group identifier
-  name          - dataset name
-  type_id       - dataset datatype identifier
-  space_id      - dataset dataspace identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  dset_id       - dataset identifier
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  creation_prp  - Dataset creation property list
-  lcpl_id       - Link creation property list
-  dapl_id       - Dataset access property list
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  - Explicit Fortran interfaces were added for
-    called C functions (it is needed for Windows
-    port).  February 28, 2001
-
-  - Added version's 1.8 new optional parameters
-    February, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5dcreate_f</strong><span class="sign">(</span>loc_id<span class="sign">,</span> name<span class="sign">,</span> type_id<span class="sign">,</span> space_id<span class="sign">,</span> dset_id<span class="sign">,</span> <span class="sign">&amp;</span>
-       hdferr<span class="sign">,</span> dcpl_id<span class="sign">,</span> lcpl_id<span class="sign">,</span> dapl_id<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> loc_id   <span class="sign">!</span> File or group identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name   <span class="sign">!</span> Name of the dataset
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id  <span class="sign">!</span> Datatype identifier
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> space_id <span class="sign">!</span> Dataspace identifier
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> dset_id <span class="sign">!</span> Dataset identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5D2fh5dget5faccess5fplist5ff"></a>
-<a name="robo116"></a><h2>h5dget_access_plist_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo31">H5D</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5dget_access_plist_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Returns a copy of the dataset creation property list.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  dset_id       - Dataset identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  plist_id      - Dataset access property list identifier
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  April 13, 2009
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">SUBROUTINE <strong>h5dget_access_plist_f</strong><span class="sign">(</span>dset_id<span class="sign">,</span> plist_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-  IMPLICIT NONE
-  INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span>  <span class="sign">:</span><span class="sign">:</span> dset_id
-  INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> plist_id 
-  INTEGER       <span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr  
-</pre>
-
-<hr />
-<a name="H5D2fh5dget5fcreate5fplist5ff"></a>
-<a name="robo117"></a><h2>h5dget_create_plist_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo31">H5D</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5dget_create_plist_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Returns an identifier for a copy of the dataset creation
-  property list for a dataset.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  dataset_id    - dataset identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  plist_id      - creation property list identifier
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  February 28, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5dget_create_plist_f</strong><span class="sign">(</span>dataset_id<span class="sign">,</span> plist_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> dataset_id   <span class="sign">!</span> Dataset identifier
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> plist_id    <span class="sign">!</span> Dataset creation
-                                               <span class="sign">!</span> property list identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr             <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5D2fh5dget5fspace5ff"></a>
-<a name="robo118"></a><h2>h5dget_space_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo31">H5D</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5dget_space_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Returns an identifier for a copy of the dataspace for a
-  dataset.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  dataset_id    - dataset identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  dataspace_id  - dataspace identifier
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  February 28, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5dget_space_f</strong><span class="sign">(</span>dataset_id<span class="sign">,</span> dataspace_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> dataset_id      <span class="sign">!</span> Dataset identifier
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> dataspace_id   <span class="sign">!</span> Dataspace identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr                <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5D2fh5dget5fspace5fstatus5ff"></a>
-<a name="robo119"></a><h2>h5dget_space_status_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo31">H5D</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5dget_space_status_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Returns the status of data space allocation.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  dset_id       - dataset identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  flag          - status; may have one of the following values:
-                   H5D_SPACE_STS_ERROR_F
-                   H5D_SPACE_STS_NOT_ALLOCATED_F
-                   H5D_SPACE_STS_PART_ALLOCATED_F
-                   H5D_SPACE_STS_ALLOCATED_F
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  March 12, 2003
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5dget_space_status_f</strong><span class="sign">(</span>dset_id<span class="sign">,</span> flag<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> dset_id  <span class="sign">!</span> Dataspace identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span>        <span class="sign">:</span><span class="sign">:</span> flag     <span class="sign">!</span> Memory buffer to fill in
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span>       <span class="sign">:</span><span class="sign">:</span> hdferr   <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5D2fh5dget5fstorage5fsize5ff"></a>
-<a name="robo120"></a><h2>h5dget_storage_size_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo31">H5D</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5dget_storage_size_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Returns the amount of storage requires by a dataset
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  dataset_id    - dataset identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  size          - datastorage size
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 15, 2002
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5dget_storage_size_f</strong><span class="sign">(</span>dataset_id<span class="sign">,</span> size<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> dataset_id <span class="sign">!</span> Dataset identifier
-    INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span>  INTENT<span class="sign">(</span>OUT<span class="sign">)</span>  <span class="sign">:</span><span class="sign">:</span> size  <span class="sign">!</span> Amount of storage
-                                             <span class="sign">!</span> allocated <span class="keyword">for</span> dataset
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr           <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5D2fh5dget5ftype5ff"></a>
-<a name="robo121"></a><h2>h5dget_type_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo31">H5D</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5dget_type_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Returns an identifier for a copy of the datatype for a
-  dataset.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  dataset_id    - dataset identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  datatype_id   - dataspace identifier
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  February 28, 2001
-</pre>
-<p class="item_name">NOTES</p>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5dget_type_f</strong><span class="sign">(</span>dataset_id<span class="sign">,</span> datatype_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> dataset_id      <span class="sign">!</span> Dataset identifier
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> datatype_id    <span class="sign">!</span> Datatype identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr                <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5D2fh5dopen5ff"></a>
-<a name="robo123"></a><h2>h5dopen_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo31">H5D</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5dopen_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Opens an existing dataset.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id        - file or group identifier
-  name          - dataset name
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  dset_id       - dataset identifier
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  dapl_id       - Dataset access property list
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  -Explicit Fortran interfaces were added for
-   called C functions (it is needed for Windows
-   port).  February 28, 2001
-
-  -Added 1.8 (optional) parameter dapl_id
-   February, 2008, M. Scot Breitenfeld
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5dopen_f</strong><span class="sign">(</span>loc_id<span class="sign">,</span> name<span class="sign">,</span> dset_id<span class="sign">,</span> hdferr<span class="sign">,</span> dapl_id<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> loc_id   <span class="sign">!</span> File or group identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name   <span class="sign">!</span> Name of the dataset
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> dset_id <span class="sign">!</span> Dataset identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> dapl_id <span class="sign">!</span> Dataset access property list
-</pre>
-
-<hr />
-<a name="H5D2fh5dset5fextent"></a>
-<a name="robo125"></a><h2>h5dset_extent</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo31">H5D</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5dset_extent</strong> (instead of obsolete name: h5dextend_f)
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Extends a dataset with unlimited dimension.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  dataset_id    - dataset identifier
-  size          - array containing the new magnitude of
-                  each dimension
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  February 28, 2001
-
-  Changed name from the now obsolete h5dextend_f
-  to h5dset_extent_f. Provided interface to old name
-  for backward compatability. -MSB- March 14, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE h5dset_extent_f<span class="sign">(</span>dataset_id<span class="sign">,</span> size<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> dataset_id      <span class="sign">!</span> Dataset identifier
-    INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> DIMENSION<span class="comment">(*), INTENT(IN)  :: size
-    ! Array containing
-    ! dimensions' sizes
-    INTEGER, INTENT(OUT) :: hdferr                ! Error code
-</pre>
-
-<hr />
-<a name="H5D2fh5dvlen5fget5fmax5flen5ff"></a>
-<a name="robo126"></a><h2>h5dvlen_get_max_len_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo31">H5D</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5dvlen_get_max_len_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Returns maximum length of the VL array elements
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  dataset_id    - dataset identifier
-  type_id       - datatype identifier
-  space_id      - dataspace identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  size          - buffer size
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  NONE
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 15, 2002
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5dvlen_get_max_len_f</strong><span class="sign">(</span>dataset_id<span class="sign">,</span> type_id<span class="sign">,</span> space_id<span class="sign">,</span> len<span class="sign">,</span>  hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> dataset_id      <span class="sign">!</span> Dataset identifier
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id         <span class="sign">!</span> Datatype identifier
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> space_id        <span class="sign">!</span> Dataspace identifier
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span>  INTENT<span class="sign">(</span>OUT<span class="sign">)</span>  <span class="sign">:</span><span class="sign">:</span> len         <span class="sign">!</span> Maximum length of the element
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr                <span class="sign">!</span> Error code
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/H5Dff.f90 on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/H5Ef_c.html b/fortran/doc/DevelGuide/src/H5Ef_c.html
deleted file mode 100644
index 79b7914..0000000
--- a/fortran/doc/DevelGuide/src/H5Ef_c.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/H5Ef.c</title>
-<!-- Source: ./src/H5Ef.c -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="H5Ef2fH5Ef"></a>
-<a name="robo38"></a><h2>H5Ef</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">PURPOSE</p>
-<pre>   This file contains C stubs for <a href="./H5Eff_f90.html#robo35">H5E</a> Fortran APIs
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/H5Ef.c on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/H5Eff_f90.html b/fortran/doc/DevelGuide/src/H5Eff_f90.html
deleted file mode 100644
index 7eb95e6..0000000
--- a/fortran/doc/DevelGuide/src/H5Eff_f90.html
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/H5Eff.f90</title>
-<!-- Source: ./src/H5Eff.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="ROBODoc2fH5E"></a>
-<a name="robo35"></a><h2>H5E</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  MODULE <strong>H5E</strong>
-</pre>
-<p class="item_name">FILE</p>
-<pre>  fortran/src/<a href="#robo_top_of_doc">H5Eff.f90</a>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  This Module contains Fortran interfaces for <strong>H5E</strong> functions.
-</pre>
-<p class="item_name">NOTES</p>
-<pre>                         *** IMPORTANT ***
-  If you add a new <strong>H5E</strong> function to the module you must add the function name
-  to the Windows dll file 'hdf5_fortrandll.def' in the fortran/src directory.
-  This is needed for Windows based operating systems.
-</pre>
-
-<hr />
-<a name="H5E2fh5eclear5ff"></a>
-<a name="robo128"></a><h2>h5eclear_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo35">H5E</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5eclear_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Clears the error stack for the current thread.
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  estack_id     - Error Stack id
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  April 6, 2001
-
-  Added optional error stack identifier in order to bring
-  the function in line with the h5eclear2 routine.
-  MSB, July 9, 2009
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5eclear_f</strong><span class="sign">(</span>hdferr<span class="sign">,</span> estack_id<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr  <span class="sign">!</span> Error code
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> estack_id
-</pre>
-
-<hr />
-<a name="H5E2fh5eget5fmajor5ff"></a>
-<a name="robo130"></a><h2>h5eget_major_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo35">H5E</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5eget_major_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Returns a character string describing an error specified
-  by a major error number.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  error_no      - major error number
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  name          - character string describing the error
-  namelen       - number of characters in the name buffer
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  April 6, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5eget_major_f</strong><span class="sign">(</span>error_no<span class="sign">,</span> name<span class="sign">,</span> namelen<span class="sign">,</span> hdferr<span class="sign">)</span>
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> error_no        <span class="sign">!</span> Major error number
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name  <span class="sign">!</span> Character string describing
-                                           <span class="sign">!</span> the error<span class="sign">.</span>
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> namelen <span class="sign">!</span> Anticipated number of characters
-                                           <span class="sign">!</span> in name<span class="sign">.</span>
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5E2fh5eget5fminor5ff"></a>
-<a name="robo131"></a><h2>h5eget_minor_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo35">H5E</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5eget_minor_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Returns a character string describing an error specified
-  by a minor error number.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  error_no      - minor error number
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  name          - character string describing the error
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  April 6, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5eget_minor_f</strong><span class="sign">(</span>error_no<span class="sign">,</span> name<span class="sign">,</span> hdferr<span class="sign">)</span>
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> error_no       <span class="sign">!</span> Major error number
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name <span class="sign">!</span> Character string describing
-                                          <span class="sign">!</span> the error
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5E2fh5eprint5ff"></a>
-<a name="robo132"></a><h2>h5eprint_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo35">H5E</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5eprint_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Prints the error stack in a default manner.
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  name          - name of the file that contains print output
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  April 6, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5eprint_f</strong><span class="sign">(</span>hdferr<span class="sign">,</span> name<span class="sign">)</span>
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name <span class="sign">!</span> File name
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr          <span class="sign">!</span> Error code
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/H5Eff.f90 on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/H5FDmpiof_c.html b/fortran/doc/DevelGuide/src/H5FDmpiof_c.html
deleted file mode 100644
index 74143d2..0000000
--- a/fortran/doc/DevelGuide/src/H5FDmpiof_c.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/H5FDmpiof.c</title>
-<!-- Source: ./src/H5FDmpiof.c -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="H5FDmpiof2fH5FDmpiof"></a>
-<a name="robo42"></a><h2>H5FDmpiof</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">PURPOSE</p>
-<pre>   This file contains C stubs for Parallel Fortran APIs
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/H5FDmpiof.c on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/H5FDmpioff_f90.html b/fortran/doc/DevelGuide/src/H5FDmpioff_f90.html
deleted file mode 100644
index 473b5db..0000000
--- a/fortran/doc/DevelGuide/src/H5FDmpioff_f90.html
+++ /dev/null
@@ -1,253 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/H5FDmpioff.f90</title>
-<!-- Source: ./src/H5FDmpioff.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="ROBODoc2fH5FDMPIO"></a>
-<a name="robo41"></a><h2>H5FDMPIO</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  MODULE <strong>H5FDMPIO</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  This file contains Fortran interfaces for H5P functions needed by
-  parallel MPI programs.
-</pre>
-<p class="item_name">NOTES</p>
-<pre>                         *** IMPORTANT ***
-  If you add a new H5P function you must add the function name to the
-  Windows dll file 'hdf5_fortrandll.def' in the fortran/src directory.
-  This is needed for Windows based operating systems.
-</pre>
-
-<hr />
-<a name="H5FDMPIO2fh5pget5fdxpl5fmpio5ff"></a>
-<a name="robo231"></a><h2>h5pget_dxpl_mpio_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo41">H5FDMPIO</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pget_dxpl_mpio_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Returns the data transfer mode.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id        - data transfer property list identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  data_xfer_mode- transfer mode; possible values are:
-                     H5FD_MPIO_INDEPENDENT_F
-                     H5FD_MPIO_COLLECTIVE_F
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  November, 2000
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pget_dxpl_mpio_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> data_xfer_mode<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id   <span class="sign">!</span> Property list identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> data_xfer_mode <span class="sign">!</span> Data transfer mode<span class="sign">.</span> Possible values are<span class="sign">:</span>
-                                           <span class="sign">!</span> H5FD_MPIO_INDEPENDENT_F
-                                           <span class="sign">!</span> H5FD_MPIO_COLLECTIVE_F
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5FDMPIO2fh5pget5ffapl5fmpio5ff"></a>
-<a name="robo239"></a><h2>h5pget_fapl_mpio_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo41">H5FDMPIO</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pget_fapl_mpio_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Returns MPI communicator information.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id        - file access property list identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  comm          - MPI-2 communicator
-  info          - MPI-2 info object
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  November, 2000
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pget_fapl_mpio_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> comm<span class="sign">,</span> info<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id <span class="sign">!</span> Property list identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> comm <span class="sign">!</span> buffer to <span class="keyword">return</span> communicator
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> info <span class="sign">!</span> buffer to <span class="keyword">return</span> info object
-                                 <span class="sign">!</span> as defined in MPI_FILE_OPEN of MPI<span class="sign">-</span>2
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr  <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5FDMPIO2fh5pget5ffapl5fmpiposix5ff"></a>
-<a name="robo240"></a><h2>h5pget_fapl_mpiposix_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo41">H5FDMPIO</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pget_fapl_mpiposix_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Returns MPI communicator information.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id        - file access property list identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  comm          - MPI-2 communicator
-  use_gpfs      - flag to use GPFS hints
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  May 6, 2003
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pget_fapl_mpiposix_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> comm<span class="sign">,</span> use_gpfs<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id <span class="sign">!</span> Property list identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> comm         <span class="sign">!</span> Buffer to <span class="keyword">return</span> communicator
-    LOGICAL<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> use_gpfs
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5FDMPIO2fh5pset5fdxpl5fmpio5ff"></a>
-<a name="robo314"></a><h2>h5pset_dxpl_mpio_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo41">H5FDMPIO</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pset_dxpl_mpio_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets data transfer mode.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id         - data transfer property list identifier
-  data_xfer_mode - transfer mode; possible values are:
-                     H5FD_MPIO_INDEPENDENT_F
-                     H5FD_MPIO_COLLECTIVE_F
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  November, 2000
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pset_dxpl_mpio_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> data_xfer_mode<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id  <span class="sign">!</span> Property list identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> data_xfer_mode <span class="sign">!</span> Data transfer mode<span class="sign">.</span> Possible values are<span class="sign">:</span>
-                                          <span class="sign">!</span> H5FD_MPIO_INDEPENDENT_F
-                                          <span class="sign">!</span> H5FD_MPIO_COLLECTIVE_F
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5FDMPIO2fh5pset5ffapl5fmpio5ff"></a>
-<a name="robo320"></a><h2>h5pset_fapl_mpio_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo41">H5FDMPIO</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pset_fapl_mpio_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Stores MPI IO communicator information to the file
-  access property list.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id        - file access property list identifier
-  comm          - MPI-2 communicator
-  info          - MPI-2 info object
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  November, 2000
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pset_fapl_mpio_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> comm<span class="sign">,</span> info<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id <span class="sign">!</span> Property list identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> comm <span class="sign">!</span> MPI communicator to be used <span class="keyword">for</span> file open
-                                <span class="sign">!</span> as defined in MPI_FILE_OPEN of MPI<span class="sign">-</span>2
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> info <span class="sign">!</span> MPI info object to be used <span class="keyword">for</span> file open
-                                <span class="sign">!</span> as defined in MPI_FILE_OPEN of MPI<span class="sign">-</span>2
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5FDMPIO2fh5pset5ffapl5fmpiposix5ff"></a>
-<a name="robo321"></a><h2>h5pset_fapl_mpiposix_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo41">H5FDMPIO</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pset_fapl_mpiposix_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Stores MPI IO communicator information to the file
-  access property list.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id        - file access property list identifier
-  comm          - MPI-2 communicator
-  use_gpfs      - logical flag to use the GPFS hints
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  May 6, 2003
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pset_fapl_mpiposix_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> comm<span class="sign">,</span> use_gpfs<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id <span class="sign">!</span> Property list identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> comm <span class="sign">!</span> MPI communicator to be used <span class="keyword">for</span> file open
-                                <span class="sign">!</span> as defined in MPI_FILE_OPEN of MPI<span class="sign">-</span>2
-    LOGICAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> use_gpfs
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr  <span class="sign">!</span> Error code
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/H5FDmpioff.f90 on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/H5Ff_c.html b/fortran/doc/DevelGuide/src/H5Ff_c.html
deleted file mode 100644
index c91a62d..0000000
--- a/fortran/doc/DevelGuide/src/H5Ff_c.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/H5Ff.c</title>
-<!-- Source: ./src/H5Ff.c -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="H5Ff2fH5Ff"></a>
-<a name="robo43"></a><h2>H5Ff</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">PURPOSE</p>
-<pre>   This file contains C stubs for <a href="./H5Fff_f90.html#robo39">H5F</a> Fortran APIs
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/H5Ff.c on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/H5Fff_f90.html b/fortran/doc/DevelGuide/src/H5Fff_f90.html
deleted file mode 100644
index b0164c9..0000000
--- a/fortran/doc/DevelGuide/src/H5Fff_f90.html
+++ /dev/null
@@ -1,653 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/H5Fff.f90</title>
-<!-- Source: ./src/H5Fff.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="ROBODoc2fH5F"></a>
-<a name="robo39"></a><h2>H5F</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  MODULE <strong>H5F</strong>
-</pre>
-<p class="item_name">FILE</p>
-<pre>  <a href="#robo_top_of_doc">H5Fff.f90</a>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  This file contains Fortran interfaces for <strong>H5F</strong> functions.
-</pre>
-<p class="item_name">NOTES</p>
-<pre>                         *** IMPORTANT ***
-  If you add a new <strong>H5F</strong> function you must add the function name to the
-  Windows dll file 'hdf5_fortrandll.def' in the fortran/src directory.
-  This is needed for Windows based operating systems.
-</pre>
-
-<hr />
-<a name="H5F2fh5fclose5ff"></a>
-<a name="robo135"></a><h2>h5fclose_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo39">H5F</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5fclose_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Closes <a href="./HDF5_f90.html#robo76">HDF5</a> file.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  file_id       - file identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  February 28, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5fclose_f</strong><span class="sign">(</span>file_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> file_id <span class="sign">!</span> File identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5F2fh5fcreate5ff"></a>
-<a name="robo136"></a><h2>h5fcreate_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo39">H5F</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5fcreate_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Creates <a href="./HDF5_f90.html#robo76">HDF5</a> files.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  name          - name of the file to create
-  access_flags  - File access flags. Allowable values are:
-                   H5F_ACC_TRUNC_F
-                   H5F_ACC_EXCL_F
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  file_id       - file identifier
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  creation_prp  - file creation property list identifier
-  access_prp    - file access property list identifier
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  February 28, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5fcreate_f</strong><span class="sign">(</span>name<span class="sign">,</span> access_flags<span class="sign">,</span> file_id<span class="sign">,</span> hdferr<span class="sign">,</span> <span class="sign">&amp;</span>
-       creation_prp<span class="sign">,</span> access_prp<span class="sign">)</span>
-    IMPLICIT NONE
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name   <span class="sign">!</span> Name of the file
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> access_flags    <span class="sign">!</span> File access flags
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> file_id <span class="sign">!</span> File identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> creation_prp
-                                           <span class="sign">!</span> File creation propertly
-                                           <span class="sign">!</span> list identifier
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> access_prp
-                                           <span class="sign">!</span> File access property list
-                                           <span class="sign">!</span> identifier
-</pre>
-
-<hr />
-<a name="H5F2fh5fflush5ff"></a>
-<a name="robo137"></a><h2>h5fflush_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo39">H5F</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5fflush_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Flushes all buffers associated WITH a file to disk
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  object_id     - identifier of object used to identify the file.
-  scope         - specifies the scope of the flushing action.
-                  Possible values are:
-                    H5F_SCOPE_GLOBAL_F
-                    H5F_SCOPE_LOCAL_F
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  creation_prp  - file creation property list identifier
-  access_prp    - file access property list identifier
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  February 28, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5fflush_f</strong><span class="sign">(</span>object_id<span class="sign">,</span> scope<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> object_id <span class="sign">!</span>identifier <span class="keyword">for</span> any object
-                                            <span class="sign">!</span>associate with a file<span class="sign">,</span>
-                                            <span class="sign">!</span>including the file itself<span class="sign">,</span>
-                                            <span class="sign">!</span>a dataset<span class="sign">,</span> a group<span class="sign">,</span> an
-                                            <span class="sign">!</span>attribute<span class="sign">,</span> or a named
-                                            <span class="sign">!</span>data type
-
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> scope            <span class="sign">!</span>scope of the flushing
-                                            <span class="sign">!</span>action<span class="sign">,</span> possible values
-                                            <span class="sign">!</span>are<span class="sign">:</span> H5F_SCOPE_GLOBAL_F
-                                            <span class="sign">!</span> which flushes the entire
-                                            <span class="sign">!</span>virtual file<span class="sign">,</span>
-                                            <span class="sign">!</span>and H5F_SCOPE_LOCAL_F
-                                            <span class="sign">!</span>which flushes only the
-                                            <span class="sign">!</span>specified file<span class="sign">.</span>
-
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr          <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5F2fh5fget5faccess5fplist5ff"></a>
-<a name="robo138"></a><h2>h5fget_access_plist_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo39">H5F</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5fget_access_plist_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Returns a file access property list identifier.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  file_id       - identifier of a file to creation property list of
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  access_id     - access property list identifier
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  February 28, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5fget_access_plist_f</strong><span class="sign">(</span>file_id<span class="sign">,</span> access_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> file_id      <span class="sign">!</span> File identifier
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> access_id   <span class="sign">!</span> File access property
-                                               <span class="sign">!</span> list identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr             <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5F2fh5fget5fcreate5fplist5ff"></a>
-<a name="robo139"></a><h2>h5fget_create_plist_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo39">H5F</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5fget_create_plist_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Returns a file creation property list identifier.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  file_id       - identifier of a file to creation property list of
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  prop_id       - creation property list identifier
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  February 28, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5fget_create_plist_f</strong><span class="sign">(</span>file_id<span class="sign">,</span> prop_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> file_id    <span class="sign">!</span> File identifier
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prop_id   <span class="sign">!</span> File creation property
-                                             <span class="sign">!</span> list identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr           <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5F2fh5fget5ffilesize5ff"></a>
-<a name="robo140"></a><h2>h5fget_filesize_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo39">H5F</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5fget_filesize_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Retrieves the file size of the <a href="./HDF5_f90.html#robo76">HDF5</a> file.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  file_id       - file identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  size          - file size
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  July 7, 2004
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5fget_filesize_f</strong><span class="sign">(</span>file_id<span class="sign">,</span> size<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> file_id  <span class="sign">!</span> file identifier
-    INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> size  <span class="sign">!</span> Size of the file
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code<span class="sign">:</span> 0 on success<span class="sign">,</span>
-                                           <span class="sign">!</span>     <span class="sign">-</span>1 <span class="keyword">if</span> fail
-</pre>
-
-<hr />
-<a name="H5F2fh5fget5ffreespace5ff"></a>
-<a name="robo141"></a><h2>h5fget_freespace_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo39">H5F</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5fget_freespace_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Get amount of free space within a file
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  file_id       - file identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  free_space    - amount of free space in file
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Quincey Koziol
-  October 7, 2003
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5fget_freespace_f</strong><span class="sign">(</span>file_id<span class="sign">,</span> free_space<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> file_id <span class="sign">!</span> File identifier
-    INTEGER<span class="sign">(</span>HSSIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> free_space
-                                          <span class="sign">!</span> amount of free space in file
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5F2fh5fget5fname5ff"></a>
-<a name="robo142"></a><h2>h5fget_name_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo39">H5F</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5fget_name_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Gets the name of the file from the object identifier
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  obj_id        - object identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  buf           - buffer to store the read name
-  size          - actual size of the name
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  July 6, 2004
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5fget_name_f</strong><span class="sign">(</span>obj_id<span class="sign">,</span> buf<span class="sign">,</span> size<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> obj_id   <span class="sign">!</span> Object identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>INOUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> buf
-                                           <span class="sign">!</span> Buffer to hold file name
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> size   <span class="sign">!</span> Size of the file name
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code<span class="sign">:</span> 0 on success<span class="sign">,</span>
-                                           <span class="sign">!</span>     <span class="sign">-</span>1 <span class="keyword">if</span> fail
-</pre>
-
-<hr />
-<a name="H5F2fh5fget5fobj5fcount5ff"></a>
-<a name="robo143"></a><h2>h5fget_obj_count_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo39">H5F</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5fget_obj_count_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Gets number of the objects open within a file
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  file_id       - file identifier
-  obj_type      - type of the object; possible values are:
-                    H5F_OBJ_FILE_F
-                    H5F_OBJ_DATASET_F
-                    H5F_OBJ_GROUP_F
-                    H5F_OBJ_DATATYPE_F
-                    H5F_OBJ_ALL_F
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  obj_count     - number of open objects
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  September 30, 2002
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Changed the type of obj_count to INTEGER(SIZE_T)
-  September 25, 2008 EIP
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5fget_obj_count_f</strong><span class="sign">(</span>file_id<span class="sign">,</span> obj_type<span class="sign">,</span> obj_count<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> file_id <span class="sign">!</span> File identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span>  <span class="sign">:</span><span class="sign">:</span> obj_type      <span class="sign">!</span> Object type
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> obj_count
-                                          <span class="sign">!</span> Number of open objects
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5F2fh5fget5fobj5fids5ff"></a>
-<a name="robo144"></a><h2>h5fget_obj_ids_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo39">H5F</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5fget_obj_ids_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Get list of open objects identifiers within a file
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  file_id       - file identifier
-  obj_type      - type of the object; possible values are:
-                    H5F_OBJ_FILE_F
-                    H5F_OBJ_DATASET_F
-                    H5F_OBJ_GROUP_F
-                    H5F_OBJ_DATATYPE_F
-                    H5F_OBJ_ALL_F
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  obj_ids       - array of open object identifiers
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  num_objs      - number of open objects
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  September 30, 2002
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Added optional parameter num_objs for number of open objects
-  of the specified type and changed type of max_obj to
-  INTEGER(SIZE_T)
-  September 25, 2008 EIP
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5fget_obj_ids_f</strong><span class="sign">(</span>file_id<span class="sign">,</span> obj_type<span class="sign">,</span> max_objs<span class="sign">,</span> obj_ids<span class="sign">,</span> hdferr<span class="sign">,</span> num_objs<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> file_id      <span class="sign">!</span> File identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span>  <span class="sign">:</span><span class="sign">:</span> obj_type           <span class="sign">!</span> Object type
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span>  <span class="sign">:</span><span class="sign">:</span> max_objs   <span class="sign">!</span> Maximum <span class="sign">#</span> of objects to retrieve
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> DIMENSION<span class="comment">(*), INTENT(INOUT) :: obj_ids
-                                               ! Array of open objects iidentifiers
-    INTEGER, INTENT(OUT) :: hdferr             ! Error code
-    INTEGER(SIZE_T), INTENT(OUT), OPTIONAL :: num_objs ! number of open objects
-</pre>
-
-<hr />
-<a name="H5F2fh5fis5fhdf55ff"></a>
-<a name="robo145"></a><h2>h5fis_hdf5_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo39">H5F</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5fis_hdf5_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Determines whether a file is in the <a href="./HDF5_f90.html#robo76">HDF5</a> format.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  name          - name of the file to check
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  status        - indicates if file is and <a href="./HDF5_f90.html#robo76">HDF5</a> file
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  February 28, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5fis_hdf5_f</strong><span class="sign">(</span>name<span class="sign">,</span> status<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name   <span class="sign">!</span> Name of the file
-    LOGICAL<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> status         <span class="sign">!</span> Indicates <span class="keyword">if</span> file
-                                           <span class="sign">!</span> is an <a href="./HDF5_f90.html#robo76">HDF5</a> file
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5F2fh5fmount5ff"></a>
-<a name="robo146"></a><h2>h5fmount_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo39">H5F</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5fmount_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Mounts a file.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id        - the identifier for of file or group in
-                  which name is defined
-  name          - the name of the group onto which the file
-                  specified by child_id is to be mounted.
-  child_id      - the identifier of the file to be mounted.
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  access_prp    - the identifier of the property list to be used
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  February 28, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5fmount_f</strong><span class="sign">(</span>loc_id<span class="sign">,</span> name<span class="sign">,</span> child_id<span class="sign">,</span> hdferr<span class="sign">,</span> access_prp<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> loc_id   <span class="sign">!</span> Identifier <span class="keyword">for</span> file or group
-                                           <span class="sign">!</span> in which dsetname is defined
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name   <span class="sign">!</span> Name of the group
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> child_id <span class="sign">!</span> File identifier <span class="keyword">for</span> the
-                                           <span class="sign">!</span> file to be mounted
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> access_prp
-                                           <span class="sign">!</span> File access property list
-                                           <span class="sign">!</span> identifier
-</pre>
-
-<hr />
-<a name="H5F2fh5fopen5ff"></a>
-<a name="robo147"></a><h2>h5fopen_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo39">H5F</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5fopen_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Opens <a href="./HDF5_f90.html#robo76">HDF5</a> file.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  name          - name of the file to acecss
-  access_flags  - File access flags. Allowable values are:
-                   H5F_ACC_RDWR_F
-                   H5F_ACC_RDONLY_F
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  file_id       - file identifier
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  access_prp    - file access property list identifier
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  February 28, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5fopen_f</strong><span class="sign">(</span>name<span class="sign">,</span> access_flags<span class="sign">,</span> file_id<span class="sign">,</span> hdferr<span class="sign">,</span> access_prp<span class="sign">)</span>
-    IMPLICIT NONE
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name   <span class="sign">!</span> Name of the file
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> access_flags    <span class="sign">!</span> File access flags
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> file_id <span class="sign">!</span> File identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> access_prp
-                                           <span class="sign">!</span> File access property list
-                                           <span class="sign">!</span> identifier
-</pre>
-
-<hr />
-<a name="H5F2fh5freopen5ff"></a>
-<a name="robo148"></a><h2>h5freopen_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo39">H5F</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5freopen_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Reopens <a href="./HDF5_f90.html#robo76">HDF5</a> file.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  file_id       - identifier of a file for which an
-                  additional identifier is required
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  ret_file_id   - new file identifier
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  February 28, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5freopen_f</strong><span class="sign">(</span>file_id<span class="sign">,</span> ret_file_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> file_id      <span class="sign">!</span> File identifier
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> ret_file_id <span class="sign">!</span> New File identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr             <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5F2fh5funmount5ff"></a>
-<a name="robo149"></a><h2>h5funmount_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo39">H5F</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5funmount_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Unmounts a file.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id        - the identifier for of file or group in
-                  which name is defined
-  name          - the name of the mount point
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  February 28, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5funmount_f</strong><span class="sign">(</span>loc_id<span class="sign">,</span> name<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> loc_id   <span class="sign">!</span> Identifier <span class="keyword">for</span> file or group
-                                           <span class="sign">!</span> at which the specified file
-                                           <span class="sign">!</span> is to be unmounted
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name   <span class="sign">!</span> Name of the mount point
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/H5Fff.f90 on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/H5Gf_c.html b/fortran/doc/DevelGuide/src/H5Gf_c.html
deleted file mode 100644
index a71f0e8..0000000
--- a/fortran/doc/DevelGuide/src/H5Gf_c.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/H5Gf.c</title>
-<!-- Source: ./src/H5Gf.c -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="H5Gf2fH5Gf"></a>
-<a name="robo45"></a><h2>H5Gf</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">PURPOSE</p>
-<pre>   This file contains C stubs for <a href="./H5Gff_f90.html#robo44">H5G</a> Fortran APIs
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/H5Gf.c on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/H5Gff_f90.html b/fortran/doc/DevelGuide/src/H5Gff_f90.html
deleted file mode 100644
index 74ec2f4..0000000
--- a/fortran/doc/DevelGuide/src/H5Gff_f90.html
+++ /dev/null
@@ -1,840 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/H5Gff.f90</title>
-<!-- Source: ./src/H5Gff.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="ROBODoc2fH5G"></a>
-<a name="robo44"></a><h2>H5G</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  MODULE <strong>H5G</strong>
-</pre>
-<p class="item_name">FILE</p>
-<pre>  fortran/src/<a href="#robo_top_of_doc">H5Gff.f90</a>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  This file contains Fortran interfaces for <strong>H5G</strong> functions.
-</pre>
-<p class="item_name">NOTES</p>
-<pre>                         *** IMPORTANT ***
-  If you add a new <strong>H5G</strong> function you must add the function name to the
-  Windows dll file 'hdf5_fortrandll.def' in the fortran/src directory.
-  This is needed for Windows based operating systems.
-</pre>
-
-<hr />
-<a name="H5G2fh5gclose5ff"></a>
-<a name="robo151"></a><h2>h5gclose_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo44">H5G</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5gclose_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Closes the specified group.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  grp_id        - group identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 5, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5gclose_f</strong><span class="sign">(</span>grp_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> grp_id  <span class="sign">!</span> Group identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5G2fH5Gcreate5fanon5ff"></a>
-<a name="robo152"></a><h2>H5Gcreate_anon_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo44">H5G</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>H5Gcreate_anon_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Creates a new empty group without linking it into the file structure.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id        - Location identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  grp_id        - group identifier
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  gcpl_id       - Group creation property list identifier
-  gapl_id       - Group access property list identifier
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  February 15, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE h5Gcreate_anon_f<span class="sign">(</span>loc_id<span class="sign">,</span> grp_id<span class="sign">,</span> hdferr<span class="sign">,</span> gcpl_id<span class="sign">,</span> gapl_id<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> loc_id   <span class="sign">!</span> File or group identifier
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> grp_id  <span class="sign">!</span> Group identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> gcpl_id  <span class="sign">!</span> Property list <span class="keyword">for</span> group creation
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> gapl_id  <span class="sign">!</span> Property list <span class="keyword">for</span> group access
-</pre>
-
-<hr />
-<a name="H5G2fh5gcreate5ff"></a>
-<a name="robo153"></a><h2>h5gcreate_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo44">H5G</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5gcreate_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Creates a new group.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id        - location identifier
-  name          - group name at the specified location
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  grp_id        - group identifier
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  size_hint     - a parameter indicating the number of bytes to
-                  reserve for the names that will appear in the group
-  lcpl_id       - Property list for link creation
-  gcpl_id       - Property list for group creation
-  gapl_id       - Property list for group access
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 5, 2001
-
-  Added additional optional paramaters in 1.8
-  MSB - February 27, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5gcreate_f</strong><span class="sign">(</span>loc_id<span class="sign">,</span> name<span class="sign">,</span> grp_id<span class="sign">,</span> hdferr<span class="sign">,</span> size_hint<span class="sign">,</span> lcpl_id<span class="sign">,</span> gcpl_id<span class="sign">,</span> gapl_id<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> loc_id   <span class="sign">!</span> File or group identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name   <span class="sign">!</span> Name of the group
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> grp_id  <span class="sign">!</span> Group identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> size_hint
-                                           <span class="sign">!</span> Parameter indicating
-                                           <span class="sign">!</span> the number of bytes
-                                           <span class="sign">!</span> to reserve <span class="keyword">for</span> the
-                                           <span class="sign">!</span> names that will appear
-                                           <span class="sign">!</span> in the group<span class="sign">.</span> Set to OBJECT_NAMELEN_DEFAULT_F
-                                           <span class="sign">!</span> <span class="keyword">if</span> using any of the optional
-                                           <span class="sign">!</span> parameters lcpl_id<span class="sign">,</span> gcpl_id<span class="sign">,</span> and<span class="sign">/</span>or gapl_id when not
-                                           <span class="sign">!</span> using keywords in specifying the optional parameters
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> lcpl_id  <span class="sign">!</span> Property list <span class="keyword">for</span> link creation
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> gcpl_id  <span class="sign">!</span> Property list <span class="keyword">for</span> group creation
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> gapl_id  <span class="sign">!</span> Property list <span class="keyword">for</span> group access
-</pre>
-
-<hr />
-<a name="H5G2fh5gget5fcomment5ff"></a>
-<a name="robo155"></a><h2>h5gget_comment_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo44">H5G</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5gget_comment_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Retrieves comment for specified object.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id        - location identifier
-  name          - name of the object at specified location
-  size          - size of the buffer required to hold comment
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  buffer        - buffer to hold object's comment
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 5, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5gget_comment_f</strong><span class="sign">(</span>loc_id<span class="sign">,</span> name<span class="sign">,</span> size<span class="sign">,</span> buffer<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> loc_id   <span class="sign">!</span> File or group identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name   <span class="sign">!</span> Current name of an object
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> size    <span class="sign">!</span> Maximum number of buffer
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span>size<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> buffer
-                                           <span class="sign">!</span> Buffer to hold a comment
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5G2fH5Gget5fcreate5fplist5ff"></a>
-<a name="robo156"></a><h2>H5Gget_create_plist_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo44">H5G</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>H5Gget_create_plist_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Gets a group creation property list identifier.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  grp_id        - group identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  gcpl_id       - Group creation property list identifier
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  February 15, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE h5gget_create_plist_f<span class="sign">(</span>grp_id<span class="sign">,</span> gcpl_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span>  <span class="sign">:</span><span class="sign">:</span> grp_id  <span class="sign">!</span> Group identifier
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> gcpl_id <span class="sign">!</span> Property list <span class="keyword">for</span> group creation
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5G2fh5gget5finfo5fby5fidx5ff"></a>
-<a name="robo157"></a><h2>h5gget_info_by_idx_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo44">H5G</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5gget_info_by_idx_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Retrieves information about a group, according to the group’s position within an index.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id        - File or group identifier
-  group_name    - Name of group containing group for which information is to be retrieved
-  index_type    - Index type
-  order         - Order of the count in the index
-  n             - Position in the index of the group for which information is retrieved
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  storage_type  - Type of storage for links in group
-                    H5G_STORAGE_TYPE_COMPACT: Compact storage
-                    H5G_STORAGE_TYPE_DENSE: Indexed storage
-                    H5G_STORAGE_TYPE_SYMBOL_TABLE: Symbol tables, the original <a href="./HDF5_f90.html#robo76">HDF5</a> structure
-  nlinks        - Number of links in group
-  max_corder    - Current maximum creation order value for group
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  lapl_id       - Link access property list
-  mounted       - Whether group has a file mounted on it
-</pre>
-<p class="item_name">NOTES</p>
-<pre>  In C the output is defined as a structure: H5G_info_t
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  February 18, 2008
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Added 'mounted' paramater
-  M. Scot Breitenfeld
-  July 16, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5gget_info_by_idx_f</strong><span class="sign">(</span>loc_id<span class="sign">,</span> group_name<span class="sign">,</span> index_type<span class="sign">,</span> order<span class="sign">,</span> n<span class="sign">,</span> <span class="sign">&amp;</span>
-       storage_type<span class="sign">,</span> nlinks<span class="sign">,</span> max_corder<span class="sign">,</span> hdferr<span class="sign">,</span> lapl_id<span class="sign">,</span> mounted<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> loc_id       <span class="sign">!</span> File or group identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> group_name <span class="sign">!</span> Name of group containing group <span class="keyword">for</span> which information is to be retrieved
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> index_type <span class="sign">!</span> Index type
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> order      <span class="sign">!</span> Order of the count in the index
-    INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> n <span class="sign">!</span> Position in the index of the group <span class="keyword">for</span> which information is retrieved
-
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> storage_type <span class="sign">!</span> Type of storage <span class="keyword">for</span> links in group<span class="sign">:</span>
-                                         <span class="sign">!</span>   H5G_STORAGE_TYPE_COMPACT_F<span class="sign">:</span> Compact storage
-                                         <span class="sign">!</span>   H5G_STORAGE_TYPE_DENSE_F<span class="sign">:</span> Indexed storage
-                                         <span class="sign">!</span>   H5G_STORAGE_TYPE_SYMBOL_TABLE_F<span class="sign">:</span> Symbol tables<span class="sign">,</span> the original <a href="./HDF5_f90.html#robo76">HDF5</a> structure
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> nlinks      <span class="sign">!</span> Number of links in group
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> max_corder  <span class="sign">!</span> Current maximum creation order value <span class="keyword">for</span> group
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr      <span class="sign">!</span> Error code<span class="sign">:</span>
-                                        <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> lapl_id <span class="sign">!</span> Link access property list
-    LOGICAL<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span><span class="sign">,</span> OPTIONAL <span class="sign">:</span><span class="sign">:</span> mounted       <span class="sign">!</span> Whether group has a file mounted on it
-</pre>
-
-<hr />
-<a name="H5G2fh5gget5finfo5fby5fname5ff"></a>
-<a name="robo158"></a><h2>h5gget_info_by_name_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo44">H5G</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5gget_info_by_name_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Retrieves information about a group.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id        - File or group identifier
-  group_name    - Name of group containing group for which information is to be retrieved
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  storage_type  - Type of storage for links in group
-                    H5G_STORAGE_TYPE_COMPACT: Compact storage
-                    H5G_STORAGE_TYPE_DENSE: Indexed storage
-                    H5G_STORAGE_TYPE_SYMBOL_TABLE: Symbol tables, the original <a href="./HDF5_f90.html#robo76">HDF5</a> structure
-  nlinks        - Number of links in group
-  max_corder    - Current maximum creation order value for group
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  lapl_id       - Link access property list
-  mounted       - Whether group has a file mounted on it
-</pre>
-<p class="item_name">NOTES</p>
-<pre>  In C the output is defined as a structure: H5G_info_t
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  February 18, 2008
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Added 'mounted' paramater
-  M. Scot Breitenfeld
-  July 16, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5gget_info_by_name_f</strong><span class="sign">(</span>loc_id<span class="sign">,</span> group_name<span class="sign">,</span> <span class="sign">&amp;</span>
-       storage_type<span class="sign">,</span> nlinks<span class="sign">,</span> max_corder<span class="sign">,</span> hdferr<span class="sign">,</span> lapl_id<span class="sign">,</span> mounted<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> loc_id       <span class="sign">!</span> File or group identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> group_name <span class="sign">!</span> Name of group containing group <span class="keyword">for</span> which information is to be retrieved
-
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> storage_type  <span class="sign">!</span> Type of storage <span class="keyword">for</span> links in group<span class="sign">:</span>
-                                          <span class="sign">!</span> H5G_STORAGE_TYPE_COMPACT_F<span class="sign">:</span> Compact storage
-                                          <span class="sign">!</span> H5G_STORAGE_TYPE_DENSE_F<span class="sign">:</span> Indexed storage
-                                          <span class="sign">!</span> H5G_STORAGE_TYPE_SYMBOL_TABLE_F<span class="sign">:</span> Symbol tables<span class="sign">,</span> the original <a href="./HDF5_f90.html#robo76">HDF5</a> structure
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> nlinks        <span class="sign">!</span> Number of links in group
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> max_corder    <span class="sign">!</span> Current maximum creation order value <span class="keyword">for</span> group
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code<span class="sign">:</span>
-                                          <span class="sign">!</span>   0 on success and <span class="sign">-</span>1 on failure
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> lapl_id <span class="sign">!</span> Link access property list
-    LOGICAL<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span><span class="sign">,</span> OPTIONAL <span class="sign">:</span><span class="sign">:</span> mounted       <span class="sign">!</span> Whether group has a file mounted on it
-</pre>
-
-<hr />
-<a name="H5G2fh5gget5finfo5ff"></a>
-<a name="robo159"></a><h2>h5gget_info_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo44">H5G</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5gget_info_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Retrieves information about a group
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  group_id      - Group identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  storage_type  - Type of storage for links in group
-                    H5G_STORAGE_TYPE_COMPACT: Compact storage
-                    H5G_STORAGE_TYPE_DENSE: Indexed storage
-                    H5G_STORAGE_TYPE_SYMBOL_TABLE: Symbol tables, the original <a href="./HDF5_f90.html#robo76">HDF5</a> structure
-  nlinks        - Number of links in group
-  max_corder    - Current maximum creation order value for group
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  mounted       - Whether group has a file mounted on it
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  February 15, 2008
-</pre>
-<p class="item_name">NOTES</p>
-<pre>  In C the output is defined as a structure: H5G_info_t
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  - Added 'mounted' paramater
-    M. Scot Breitenfeld
-    July 16, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5gget_info_f</strong><span class="sign">(</span>group_id<span class="sign">,</span> storage_type<span class="sign">,</span> nlinks<span class="sign">,</span> max_corder<span class="sign">,</span> hdferr<span class="sign">,</span> mounted<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> group_id <span class="sign">!</span> Group identifier
-
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> storage_type  <span class="sign">!</span> Type of storage <span class="keyword">for</span> links in group<span class="sign">:</span>
-                                          <span class="sign">!</span> H5G_STORAGE_TYPE_COMPACT_F<span class="sign">:</span> Compact storage
-                                          <span class="sign">!</span> H5G_STORAGE_TYPE_DENSE_F<span class="sign">:</span> Indexed storage
-                                          <span class="sign">!</span> H5G_STORAGE_TYPE_SYMBOL_TABLE_F<span class="sign">:</span> Symbol tables<span class="sign">,</span> the original <a href="./HDF5_f90.html#robo76">HDF5</a> structure
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> nlinks        <span class="sign">!</span> Number of links in group
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> max_corder    <span class="sign">!</span> Current maximum creation order value <span class="keyword">for</span> group
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code<span class="sign">:</span>
-                                          <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-    LOGICAL<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span><span class="sign">,</span> OPTIONAL <span class="sign">:</span><span class="sign">:</span> mounted  <span class="sign">!</span> Whether group has a file mounted on it
-</pre>
-
-<hr />
-<a name="H5G2fh5gget5flinkval5ff"></a>
-<a name="robo160"></a><h2>h5gget_linkval_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo44">H5G</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5gget_linkval_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Returns the name of the object that the symbolic link
-  points to.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id        - location identifier
-  name          - symbolic link to the object whose name
-                  is to be returned.
-  size          - maximum number of characters to be returned
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  buffer        - a buffer to hold the name of the object
-  being sought
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 5, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5gget_linkval_f</strong><span class="sign">(</span>loc_id<span class="sign">,</span> name<span class="sign">,</span> size<span class="sign">,</span> buffer<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> loc_id   <span class="sign">!</span> File or group identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name   <span class="sign">!</span> Current name of an object
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> size    <span class="sign">!</span> Maximum number of buffer
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span>size<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> buffer
-                                           <span class="sign">!</span> Buffer to hold a name of
-                                           <span class="sign">!</span> the object symbolic link
-                                           <span class="sign">!</span> points to
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5G2fh5gget5fobj5finfo5fidx5ff"></a>
-<a name="robo161"></a><h2>h5gget_obj_info_idx_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo44">H5G</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5gget_obj_info_idx_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Returns name and type of the group member identified by
-  its index.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id        - location identifier
-  name          - name of the group at the specified location
-  idx           - object index (zero-based)
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  obj_name      - object name
-  obj_type      - object type
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 5, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5gget_obj_info_idx_f</strong><span class="sign">(</span>loc_id<span class="sign">,</span> name<span class="sign">,</span> idx<span class="sign">,</span> <span class="sign">&amp;</span>
-       obj_name<span class="sign">,</span> obj_type<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> loc_id   <span class="sign">!</span> File or group identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name   <span class="sign">!</span> Name of the group
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> idx             <span class="sign">!</span> Index of member object
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> obj_name   <span class="sign">!</span> Name of the object
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> obj_type       <span class="sign">!</span> Object type
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5G2fh5glink25ff"></a>
-<a name="robo162"></a><h2>h5glink2_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo44">H5G</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5glink2_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Creates a link of the specified type from new_name
-  to current_name. current_name and new_name are interpreted
-  releative to current and new location identifiers.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  cur_loc_id    - location identifier
-  cur_name      - name of the existing object if link is a
-                  hard link. Can be anything for the soft link.
-  link_type     - link type; possible values are:
-                    H5G_LINK_HARD_F (0)
-                    H5G_LINK_SOFT_F (1)
-  new_loc_id    - new location identifier
-  new_name      - new name for the object
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  September 25, 2002
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5glink2_f</strong><span class="sign">(</span>cur_loc_id<span class="sign">,</span> cur_name<span class="sign">,</span> link_type<span class="sign">,</span> new_loc_id<span class="sign">,</span> <span class="sign">&amp;</span>
-       new_name<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> cur_loc_id <span class="sign">!</span> File or group identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> cur_name
-                                             <span class="sign">!</span> Current name of an object
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> link_type         <span class="sign">!</span> link type
-                                                 <span class="sign">!</span> Possible values are<span class="sign">:</span>
-                                                 <span class="sign">!</span> H5G_LINK_HARD_F <span class="sign">(</span>0<span class="sign">)</span> or
-                                                 <span class="sign">!</span> H5G_LINK_SOFT_F <span class="sign">(</span>1<span class="sign">)</span>
-
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> new_loc_id <span class="sign">!</span> File or group identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> new_name <span class="sign">!</span> New name of an object
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr           <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5G2fh5glink5ff"></a>
-<a name="robo163"></a><h2>h5glink_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo44">H5G</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5glink_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Creates a link of the specified type from new_name
-  to current_name.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id        - location identifier
-  link_type     - link type; possible values are:
-                    H5G_LINK_HARD_F (0)
-                    H5G_LINK_SOFT_F (1)
-  current_name  - name of the existing object if link is a
-                  hard link. Can be anything for the soft link
-  new_name      - new name for the object
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 5, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5glink_f</strong><span class="sign">(</span>loc_id<span class="sign">,</span> link_type<span class="sign">,</span> current_name<span class="sign">,</span> <span class="sign">&amp;</span>
-       new_name<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> loc_id   <span class="sign">!</span> File or group identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> link_type       <span class="sign">!</span> link type
-                                                   <span class="sign">!</span> Possible values are<span class="sign">:</span>
-                                                   <span class="sign">!</span> H5G_LINK_HARD_F <span class="sign">(</span>0<span class="sign">)</span> or
-                                                   <span class="sign">!</span> H5G_LINK_SOFT_F <span class="sign">(</span>1<span class="sign">)</span>
-
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> current_name
-                                                   <span class="sign">!</span> Current name of an object
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> new_name <span class="sign">!</span> New name of an object
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5G2fh5gmove25ff"></a>
-<a name="robo164"></a><h2>h5gmove2_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo44">H5G</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5gmove2_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Renames an object within an <a href="./HDF5_f90.html#robo76">HDF5</a> file.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  src_loc_id    - original location identifier
-  src_name      - object's name at specified original location
-  dst_loc_id    - original location identifier
-  dst_name      - object's new name
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  September 25, 2002
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5gmove2_f</strong><span class="sign">(</span>src_loc_id<span class="sign">,</span> src_name<span class="sign">,</span> dst_loc_id<span class="sign">,</span> dst_name<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span>   <span class="sign">:</span><span class="sign">:</span> src_loc_id  <span class="sign">!</span> File or group identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> src_name    <span class="sign">!</span> Original name of an object
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span>   <span class="sign">:</span><span class="sign">:</span> dst_loc_id  <span class="sign">!</span> File or group identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> dst_name    <span class="sign">!</span> New name of an object
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span>         <span class="sign">:</span><span class="sign">:</span> hdferr      <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5G2fh5gmove5ff"></a>
-<a name="robo165"></a><h2>h5gmove_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo44">H5G</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5gmove_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Renames an object within an <a href="./HDF5_f90.html#robo76">HDF5</a> file.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id        - location identifier
-  name          - object's name at specified location
-  new_name      - object's new name
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 5, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5gmove_f</strong><span class="sign">(</span>loc_id<span class="sign">,</span> name<span class="sign">,</span> new_name<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> loc_id     <span class="sign">!</span> File or group identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name     <span class="sign">!</span> Current name of an object
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> new_name <span class="sign">!</span> New name of an object
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr           <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5G2fh5gn5fmembers5ff"></a>
-<a name="robo166"></a><h2>h5gn_members_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo44">H5G</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5gn_members_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Returns the number of group members.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id        - location identifier
-  name          - name of the group at the specified location
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  nmembers      - number of group members
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 5, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5gn_members_f</strong><span class="sign">(</span>loc_id<span class="sign">,</span> name<span class="sign">,</span> nmembers<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> loc_id   <span class="sign">!</span> File or group identifier
-            CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name   <span class="sign">!</span> Name of the group
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> nmembers       <span class="sign">!</span> Number of members in the
-                                                   <span class="sign">!</span> group
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5G2fh5gopen5ff"></a>
-<a name="robo167"></a><h2>h5gopen_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo44">H5G</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5gopen_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Opens an existing group.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id        - location identifier
-  name          - name of the group to open
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  grp_id        - group identifier
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  gapl_id       - Group access property list identifier
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 5, 2001
-
-  Added 1.8 (optional) parameter gapl_id
-  February, 2008 M. Scot Breitenfeld
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5gopen_f</strong><span class="sign">(</span>loc_id<span class="sign">,</span> name<span class="sign">,</span> grp_id<span class="sign">,</span> hdferr<span class="sign">,</span> gapl_id<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> loc_id   <span class="sign">!</span> File or group identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name   <span class="sign">!</span> Name of the group
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> grp_id  <span class="sign">!</span> File identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> gapl_id  <span class="sign">!</span> Group access property list identifier
-</pre>
-
-<hr />
-<a name="H5G2fh5gset5fcomment5ff"></a>
-<a name="robo168"></a><h2>h5gset_comment_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo44">H5G</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5gset_comment_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets comment for specified object.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id        - location identifier
-  name          - name of the object
-  comment       - comment to set for the object
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 5, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5gset_comment_f</strong><span class="sign">(</span>loc_id<span class="sign">,</span> name<span class="sign">,</span> comment<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> loc_id   <span class="sign">!</span> File or group identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name   <span class="sign">!</span> Current name of an object
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> comment <span class="sign">!</span> New name of an object
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5G2fh5gunlink5ff"></a>
-<a name="robo169"></a><h2>h5gunlink_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo44">H5G</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5gunlink_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Removes the specified name from the group graph and
-  decrements the link count for the object to which name
-  points
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id        - location identifier
-  name          - name of the object to unlink
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 5, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5gunlink_f</strong><span class="sign">(</span>loc_id<span class="sign">,</span> name<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> loc_id   <span class="sign">!</span> File or group identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name   <span class="sign">!</span> Name of an object
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/H5Gff.f90 on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/H5If_c.html b/fortran/doc/DevelGuide/src/H5If_c.html
deleted file mode 100644
index 8dccce7..0000000
--- a/fortran/doc/DevelGuide/src/H5If_c.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/H5If.c</title>
-<!-- Source: ./src/H5If.c -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="H5If2fH5If"></a>
-<a name="robo48"></a><h2>H5If</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">PURPOSE</p>
-<pre>   This file contains C stubs for <a href="./H5Iff_f90.html#robo47">H5I</a> Fortran APIs
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/H5If.c on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/H5Iff_f90.html b/fortran/doc/DevelGuide/src/H5Iff_f90.html
deleted file mode 100644
index 5987581..0000000
--- a/fortran/doc/DevelGuide/src/H5Iff_f90.html
+++ /dev/null
@@ -1,304 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/H5Iff.f90</title>
-<!-- Source: ./src/H5Iff.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="ROBODoc2fH5I"></a>
-<a name="robo47"></a><h2>H5I</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  MODULE <strong>H5I</strong>
-</pre>
-<p class="item_name">FILE</p>
-<pre>  fortran/src/<a href="#robo_top_of_doc">H5Iff.f90</a>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  This file contains Fortran interfaces for <strong>H5I</strong> functions.
-</pre>
-<p class="item_name">NOTES</p>
-<pre>                         *** IMPORTANT ***
-  If you add a new <strong>H5I</strong> function you must add the function name to the
-  Windows dll file 'hdf5_fortrandll.def' in the fortran/src directory.
-  This is needed for Windows based operating systems.
-</pre>
-
-<hr />
-<a name="H5I2fh5idec5fref5ff"></a>
-<a name="robo170"></a><h2>h5idec_ref_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo47">H5I</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5idec_ref_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Decrements the reference count of an ID
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  obj_id        - Object identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  ref_count     - Current reference count of the ID
-  hdferr:       - Error code
-                   Success:  0
-                   Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Quincey Koziol
-  December  9, 2003
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5idec_ref_f</strong><span class="sign">(</span>obj_id<span class="sign">,</span> ref_count<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> obj_id <span class="sign">!</span> Object identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> ref_count    <span class="sign">!</span> Current reference count of ID
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5I2fh5iget5ffile5fid5ff"></a>
-<a name="robo171"></a><h2>h5iget_file_id_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo47">H5I</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5iget_file_id_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Obtains file identifier from the object identifier
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  obj_id        - object identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  file_id       - file identifier
-  hdferr:       - error code
-                    Success:  0
-                    Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 23, 2004
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5iget_file_id_f</strong><span class="sign">(</span>obj_id<span class="sign">,</span> file_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span>  <span class="sign">:</span><span class="sign">:</span> obj_id   <span class="sign">!</span> Object identifier
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> file_id  <span class="sign">!</span> File identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr          <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5I2fh5iget5fname5ff"></a>
-<a name="robo172"></a><h2>h5iget_name_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo47">H5I</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5iget_name_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Gets a name of an object specified by its idetifier.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  obj_id    - attribute identifier
-  buf_size  - size of a buffer to read name in
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  buf       - buffer to read name in, name will be truncated if
-              buffer is not big enough
-  name_size - name size
-  hdferr:   - error code
-               Success:  0
-               Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  March 12, 2003
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5iget_name_f</strong><span class="sign">(</span>obj_id<span class="sign">,</span> buf<span class="sign">,</span> buf_size<span class="sign">,</span> name_size<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> obj_id      <span class="sign">!</span> Object identifier
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> buf_size   <span class="sign">!</span> Buffer size
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> buf      <span class="sign">!</span> Buffer to hold object name
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name_size <span class="sign">!</span> Actual name size
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr            <span class="sign">!</span> Error code<span class="sign">:</span>
-                                              <span class="sign">!</span>   0 <span class="keyword">if</span> successful<span class="sign">,</span>
-                                              <span class="sign">!</span>   <span class="sign">-</span>1 <span class="keyword">if</span> fail
-</pre>
-
-<hr />
-<a name="H5I2fh5iget5fref5ff"></a>
-<a name="robo173"></a><h2>h5iget_ref_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo47">H5I</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5iget_ref_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Retrieves the reference count of an ID
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  obj_id        - object identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  ref_count     - Current reference count of the ID
-  hdferr:         - error code
-  Success:  0
-  Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Quincey Koziol
-  December  9, 2003
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5iget_ref_f</strong><span class="sign">(</span>obj_id<span class="sign">,</span> ref_count<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> obj_id <span class="sign">!</span> Object identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> ref_count    <span class="sign">!</span> Current reference count of ID
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5I2fh5iget5ftype5ff"></a>
-<a name="robo174"></a><h2>h5iget_type_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo47">H5I</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5iget_type_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Retrieves the type of an object.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  obj_id   - object identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  type     - type of the object, possible values:
-              H5I_FILE_F
-              H5I_GROUP_F
-              H5I_DATATYPE_F
-              H5I_DATASPACE_F
-              H5I_DATASET_F
-              H5I_ATTR_F
-              H5I_BADID_F
-  hdferr:  - error code
-              Success:  0
-              Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 5, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5iget_type_f</strong><span class="sign">(</span>obj_id<span class="sign">,</span> TYPE<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> obj_id  <span class="sign">!</span> Object identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> TYPE <span class="sign">!</span> type of an object<span class="sign">.</span>
-                                 <span class="sign">!</span> possible values are<span class="sign">:</span>
-                                 <span class="sign">!</span>   H5I_FILE_F
-                                 <span class="sign">!</span>   H5I_GROUP_F
-                                 <span class="sign">!</span>   H5I_DATATYPE_F
-                                 <span class="sign">!</span>   H5I_DATASPACE_F
-                                 <span class="sign">!</span>   H5I_DATASET_F
-                                 <span class="sign">!</span>   H5I_ATTR_F
-                                 <span class="sign">!</span>   H5I_BADID_F
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr  <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5I2fh5iinc5fref5ff"></a>
-<a name="robo175"></a><h2>h5iinc_ref_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo47">H5I</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5iinc_ref_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Increments the reference count of an ID
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  obj_id        - object identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  ref_count     - Current reference count of the ID
-  hdferr:              - error code
-  Success:  0
-  Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Quincey Koziol
-  December  9, 2003
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5iinc_ref_f</strong><span class="sign">(</span>obj_id<span class="sign">,</span> ref_count<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> obj_id <span class="sign">!</span> Object identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> ref_count    <span class="sign">!</span> Current reference count of ID
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5I2fh5iis5fvalid5ff"></a>
-<a name="robo176"></a><h2>h5iis_valid_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo47">H5I</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <a href="#robo171">h5iget_file_id_f</a>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Check if an ID is valid without producing an error message
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  id           - identifier 
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  valid        - status of id as a valid identifier
-  hdferr:      - error code            
-                  Success:  0
-                  Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  April 13, 2009
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5iis_valid_f</strong><span class="sign">(</span>id<span class="sign">,</span> valid<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span>  <span class="sign">:</span><span class="sign">:</span> id <span class="sign">!</span> Identifier 
-    LOGICAL<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> valid     <span class="sign">!</span> Status of id as a valid identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr    <span class="sign">!</span> Error code
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/H5Iff.f90 on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/H5Lf_c.html b/fortran/doc/DevelGuide/src/H5Lf_c.html
deleted file mode 100644
index 9adb759..0000000
--- a/fortran/doc/DevelGuide/src/H5Lf_c.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/H5Lf.c</title>
-<!-- Source: ./src/H5Lf.c -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="H5Lf2fH5Lf"></a>
-<a name="robo52"></a><h2>H5Lf</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">PURPOSE</p>
-<pre>   This file contains C stubs for <a href="./H5Lff_f90.html#robo49">H5L</a> Fortran APIs
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/H5Lf.c on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/H5Lff_F03_f90.html b/fortran/doc/DevelGuide/src/H5Lff_F03_f90.html
deleted file mode 100644
index 6b9640b..0000000
--- a/fortran/doc/DevelGuide/src/H5Lff_F03_f90.html
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/H5Lff_F03.f90</title>
-<!-- Source: ./src/H5Lff_F03.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="ROBODoc2fH5L2028F0329"></a>
-<a name="robo50"></a><h2>H5L (F03)</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  H5L_PROVISIONAL
-</pre>
-<p class="item_name">FILE</p>
-<pre>  src/fortran/src/<a href="#robo_top_of_doc">H5Lff_F03.f90</a>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  This file contains Fortran 90 and Fortran 2003 interfaces for <a href="./H5Lff_f90.html#robo49">H5L</a> functions.
-  It contains the same functions as H5Lff_DEPRECIATE.f90 but includes the
-  Fortran 2003 functions and the interface listings. This file will be compiled
-  instead of H5Lff_DEPRECIATE.f90 if Fortran 2003 functions are enabled.
-</pre>
-<p class="item_name">NOTES</p>
-<pre>                         *** IMPORTANT ***
-  If you add a new <a href="./H5Aff_f90.html#robo27">H5A</a> function you must add the function name to the
-  Windows dll file 'hdf5_fortrandll.def' in the fortran/src directory.
-  This is needed for Windows based operating systems.
-</pre>
-
-<hr />
-<a name="H5L2028F03292fh5literate5fby5fname5ff"></a>
-<a name="robo189"></a><h2>h5literate_by_name_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo50">H5L (F03)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5literate_by_name_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Iterates through links in a group.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id        - File or group identifier specifying location of subject group
-  group_name    - Name of subject group
-  index_type    - Type of index which determines the order
-  order         - Order within index
-  idx           - Iteration position at which to start
-  op            - Callback function passing data regarding the link to the calling application
-  op_data       - User-defined pointer to data required by the application for its processing of the link
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  idx      - Position at which an interrupted iteration may be restarted
-  hdferr   - Error code:
-               Success:  0
-               Failure: -1
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  lapl_id  - Link access property list
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  Augest 18, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5literate_by_name_f</strong><span class="sign">(</span>loc_id<span class="sign">,</span> group_name<span class="sign">,</span> index_type<span class="sign">,</span> order<span class="sign">,</span> idx<span class="sign">,</span> op<span class="sign">,</span> op_data<span class="sign">,</span> return_value<span class="sign">,</span> hdferr<span class="sign">,</span> lapl_id<span class="sign">)</span>
-    USE ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> loc_id    <span class="sign">!</span> Identifier specifying subject group
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> group_name          <span class="sign">!</span> Name of subject group
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> index_type       <span class="sign">!</span> Type of index which determines the order<span class="sign">:</span>
-                                                <span class="sign">!</span> H5_INDEX_NAME_F <span class="sign">-</span> Alpha<span class="sign">-</span>numeric index on name
-                                                <span class="sign">!</span> H5_INDEX_CRT_ORDER_F <span class="sign">-</span> Index on creation order
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> order            <span class="sign">!</span> Order within index<span class="sign">:</span>
-                                                <span class="sign">!</span> H5_ITER_INC_F <span class="sign">-</span> Increasing order
-                                                <span class="sign">!</span> H5_ITER_DEC_F <span class="sign">-</span> Decreasing order
-                                                <span class="sign">!</span> H5_ITER_NATIVE_F <span class="sign">-</span> Fastest available order
-    INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>INOUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> idx  <span class="sign">!</span> IN <span class="sign">:</span> Iteration position at which to start
-                                            <span class="sign">!</span> OUT<span class="sign">:</span> Position at which an interrupted iteration may be restarted
-
-    TYPE<span class="sign">(</span>C_FUNPTR<span class="sign">)</span><span class="sign">:</span><span class="sign">:</span> op      <span class="sign">!</span> Callback function passing data regarding the link to the calling application
-    TYPE<span class="sign">(</span>C_PTR<span class="sign">)</span>   <span class="sign">:</span><span class="sign">:</span> op_data <span class="sign">!</span> User<span class="sign">-</span>defined pointer to data required by the application <span class="keyword">for</span> its processing of the link
-
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> return_value <span class="sign">!</span> Success<span class="sign">:</span>   The <span class="keyword">return</span> value of the first operator that
-                                         <span class="sign">!</span>            returns non<span class="sign">-</span>zero<span class="sign">,</span> or zero <span class="keyword">if</span> all members were
-                                         <span class="sign">!</span>            processed with no operator returning non<span class="sign">-</span>zero<span class="sign">.</span>
-
-                                         <span class="sign">!</span> Failure<span class="sign">:</span>   Negative <span class="keyword">if</span> something goes wrong within the
-                                         <span class="sign">!</span>            library<span class="sign">,</span> or the negative value returned by one
-                                         <span class="sign">!</span>            of the operators<span class="sign">.</span>
-
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code<span class="sign">:</span>
-                                         <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> lapl_id <span class="sign">!</span> Link access property list
-</pre>
-
-<hr />
-<a name="H5L2028F03292fh5literate5ff"></a>
-<a name="robo190"></a><h2>h5literate_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo50">H5L (F03)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5literate_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Iterates through links in a group.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  group_id      - Identifier specifying subject group
-  index_type    - Type of index which determines the order
-  order         - Order within index
-  idx           - Iteration position at which to start
-  op            - Callback function passing data regarding the link to the calling application
-  op_data       - User-defined pointer to data required by the application for its processing of the link
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  idx           - Position at which an interrupted iteration may be restarted
-  hdferr        - Error code:
-                    Success:  0
-                    Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  July 8, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5literate_f</strong><span class="sign">(</span>group_id<span class="sign">,</span> index_type<span class="sign">,</span> order<span class="sign">,</span> idx<span class="sign">,</span> op<span class="sign">,</span> op_data<span class="sign">,</span> return_value<span class="sign">,</span> hdferr<span class="sign">)</span>
-    USE ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> group_id  <span class="sign">!</span> Identifier specifying subject group
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> index_type       <span class="sign">!</span> Type of index which determines the order<span class="sign">:</span>
-                                                <span class="sign">!</span> H5_INDEX_NAME_F <span class="sign">-</span> Alpha<span class="sign">-</span>numeric index on name
-                                                <span class="sign">!</span> H5_INDEX_CRT_ORDER_F <span class="sign">-</span> Index on creation order
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> order            <span class="sign">!</span> Order within index<span class="sign">:</span>
-                                                <span class="sign">!</span> H5_ITER_INC_F <span class="sign">-</span> Increasing order
-                                                <span class="sign">!</span> H5_ITER_DEC_F <span class="sign">-</span> Decreasing order
-                                                <span class="sign">!</span> H5_ITER_NATIVE_F <span class="sign">-</span> Fastest available order
-    INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>INOUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> idx  <span class="sign">!</span> IN <span class="sign">:</span> Iteration position at which to start
-                                            <span class="sign">!</span> OUT<span class="sign">:</span> Position at which an interrupted iteration may be restarted
-
-    TYPE<span class="sign">(</span>C_FUNPTR<span class="sign">)</span><span class="sign">:</span><span class="sign">:</span> op      <span class="sign">!</span> Callback function passing data regarding the link to the calling application
-    TYPE<span class="sign">(</span>C_PTR<span class="sign">)</span>   <span class="sign">:</span><span class="sign">:</span> op_data <span class="sign">!</span> User<span class="sign">-</span>defined pointer to data required by the application <span class="keyword">for</span> its processing of the link
-
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> return_value <span class="sign">!</span> Success<span class="sign">:</span>   The <span class="keyword">return</span> value of the first operator that
-                                         <span class="sign">!</span>            returns non<span class="sign">-</span>zero<span class="sign">,</span> or zero <span class="keyword">if</span> all members were
-                                         <span class="sign">!</span>            processed with no operator returning non<span class="sign">-</span>zero<span class="sign">.</span>
-
-                                         <span class="sign">!</span> Failure<span class="sign">:</span>   Negative <span class="keyword">if</span> something goes wrong within the
-                                         <span class="sign">!</span>            library<span class="sign">,</span> or the negative value returned by one
-                                         <span class="sign">!</span>            of the operators<span class="sign">.</span>
-
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code<span class="sign">:</span>
-                                         <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/H5Lff_F03.f90 on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/H5Lff_F90_f90.html b/fortran/doc/DevelGuide/src/H5Lff_F90_f90.html
deleted file mode 100644
index 6d1a9bb..0000000
--- a/fortran/doc/DevelGuide/src/H5Lff_F90_f90.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/H5Lff_F90.f90</title>
-<!-- Source: ./src/H5Lff_F90.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="ROBODoc2fH5L2028F9029"></a>
-<a name="robo51"></a><h2>H5L (F90)</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  MODULE H5L_PROVISIONAL
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  This file contains Fortran 90 interfaces for <a href="./H5Lff_f90.html#robo49">H5L</a> functions. It contains
-  the same functions as <a href="./H5Lff_F03_f90.html#robo_top_of_doc">H5Lff_F03.f90</a> but excludes the Fortran 2003 functions
-  and the interface listings. This file will be compiled instead of <a href="./H5Lff_F03_f90.html#robo_top_of_doc">H5Lff_F03.f90</a>
-  if Fortran 2003 functions are not enabled.
-
- NOTE
-  Currently contains no functions.
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/H5Lff_F90.f90 on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/H5Lff_f90.html b/fortran/doc/DevelGuide/src/H5Lff_f90.html
deleted file mode 100644
index 1a209f2..0000000
--- a/fortran/doc/DevelGuide/src/H5Lff_f90.html
+++ /dev/null
@@ -1,637 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/H5Lff.f90</title>
-<!-- Source: ./src/H5Lff.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="ROBODoc2fH5L"></a>
-<a name="robo49"></a><h2>H5L</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  MODULE <strong>H5L</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  This file contains Fortran interfaces for <strong>H5L</strong> functions. It includes
-  all the functions that are independent on whether the Fortran 2003 functions
-  are enabled or disabled.
-</pre>
-<p class="item_name">NOTES</p>
-<pre>                         *** IMPORTANT ***
-  If you add a new <strong>H5L</strong> function you must add the function name to the
-  Windows dll file 'hdf5_fortrandll.def' in the fortran/src directory.
-  This is needed for Windows based operating systems.
-</pre>
-
-<hr />
-<a name="H5L2fh5lcopy5ff"></a>
-<a name="robo178"></a><h2>h5lcopy_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo49">H5L</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5lcopy_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Copies a link from one location to another.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  src_loc_id    - Location identifier of the source link
-  src_name      - Name of the link to be copied
-  dest_loc_id   - Location identifier specifying the destination of the copy
-  dest_name     - Name to be assigned to the NEW copy
-  loc_id        - Identifier of the file or group containing the object
-  name          - Name of the link to delete
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  lcpl_id       - Link creation property list identifier
-  lapl_id       - Link access property list identifier
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  February 27, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5lcopy_f</strong><span class="sign">(</span>src_loc_id<span class="sign">,</span> src_name<span class="sign">,</span> dest_loc_id<span class="sign">,</span> dest_name<span class="sign">,</span> hdferr<span class="sign">,</span> <span class="sign">&amp;</span>
-       lcpl_id<span class="sign">,</span> lapl_id<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> src_loc_id  <span class="sign">!</span> Location identifier of the source link
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> src_name   <span class="sign">!</span> Name of the link to be copied
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> dest_loc_id <span class="sign">!</span> Location identifier specifying the destination of the copy
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> dest_name <span class="sign">!</span> Name to be assigned to the NEW copy
-
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code<span class="sign">:</span>
-                                          <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> lcpl_id <span class="sign">!</span> Link creation property list identifier
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> lapl_id <span class="sign">!</span> Link access property list identifier
-</pre>
-
-<hr />
-<a name="H5L2fH5Lcreate5fexternal5ff"></a>
-<a name="robo179"></a><h2>H5Lcreate_external_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo49">H5L</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>H5Lcreate_external_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Creates a soft link to an object in a different file.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  file_name     - Name of the file containing the target object. Neither the file nor the target object is
-  required to exist. May be the file the link is being created in.
-  obj_name      - Path within the target file to the target object.
-  link_loc_id   - The file or group identifier for the new link.
-  link_name     - The name of the new link.
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  lcpl_id       - Link creation property list identifier.
-  lapl_id       - Link access property list identifier.
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  February 27, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE h5lcreate_external_f<span class="sign">(</span>file_name<span class="sign">,</span> obj_name<span class="sign">,</span> link_loc_id<span class="sign">,</span> link_name<span class="sign">,</span> hdferr<span class="sign">,</span> lcpl_id<span class="sign">,</span> lapl_id<span class="sign">)</span>
-    IMPLICIT NONE
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> file_name <span class="sign">!</span> Name of the file containing the target object<span class="sign">.</span> Neither
-                                              <span class="sign">!</span> the file nor the target object is required to exist<span class="sign">.</span>
-                                              <span class="sign">!</span> May be the file the link is being created in<span class="sign">.</span>
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> obj_name  <span class="sign">!</span> Name of the target object<span class="sign">,</span> which must already exist<span class="sign">.</span>
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> link_loc_id <span class="sign">!</span> The file or group identifier <span class="keyword">for</span> the new link<span class="sign">.</span>
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> link_name <span class="sign">!</span> The name of the new link<span class="sign">.</span>
-
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code<span class="sign">:</span>
-                                          <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> lcpl_id <span class="sign">!</span> Link creation property list identifier<span class="sign">.</span>
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> lapl_id <span class="sign">!</span> Link access property list identifier<span class="sign">.</span>
-</pre>
-
-<hr />
-<a name="H5L2fH5Lcreate5fhard5ff"></a>
-<a name="robo180"></a><h2>H5Lcreate_hard_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo49">H5L</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>H5Lcreate_hard_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Creates a hard link to an object.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  obj_loc_id    - The file or group identifier for the target object.
-  obj_name      - Name of the target object, which must already exist.
-  link_loc_id   - The file or group identifier for the new link.
-  link_name     - The name of the new link.
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  lcpl_id       - Link creation property list identifier.
-  lapl_id       - Link access property list identifier.
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  February 27, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE h5lcreate_hard_f<span class="sign">(</span>obj_loc_id<span class="sign">,</span> obj_name<span class="sign">,</span> link_loc_id<span class="sign">,</span> link_name<span class="sign">,</span> hdferr<span class="sign">,</span> lcpl_id<span class="sign">,</span> lapl_id<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> obj_loc_id  <span class="sign">!</span> The file or group identifier <span class="keyword">for</span> the target object<span class="sign">.</span>
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> obj_name  <span class="sign">!</span> Name of the target object<span class="sign">,</span> which must already exist<span class="sign">.</span>
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> link_loc_id <span class="sign">!</span> The file or group identifier <span class="keyword">for</span> the new link<span class="sign">.</span>
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> link_name <span class="sign">!</span> The name of the new link<span class="sign">.</span>
-
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code<span class="sign">:</span>
-                                          <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span>   lcpl_id         <span class="sign">!</span> Link creation property list identifier<span class="sign">.</span>
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span>   lapl_id         <span class="sign">!</span> Link access property list identifier<span class="sign">.</span>
-</pre>
-
-<hr />
-<a name="H5L2fH5Lcreate5fsoft5ff"></a>
-<a name="robo181"></a><h2>H5Lcreate_soft_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo49">H5L</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>H5Lcreate_soft_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Creates a soft link to an object.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  target_path   - Path to the target object, which is not required to exist.
-  link_loc_id   - The file or group identifier for the new link.
-  link_name     - The name of the new link.
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  lcpl_id       - Link creation property list identifier.
-  lapl_id       - Link access property list identifier.
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  February 20, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE h5lcreate_soft_f<span class="sign">(</span>target_path<span class="sign">,</span> link_loc_id<span class="sign">,</span> link_name<span class="sign">,</span> hdferr<span class="sign">,</span> lcpl_id<span class="sign">,</span> lapl_id<span class="sign">)</span>
-    IMPLICIT NONE
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> target_path   <span class="sign">!</span> Path to the target object<span class="sign">,</span> which is not required to exist<span class="sign">.</span>
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> link_loc_id     <span class="sign">!</span> The file or group identifier <span class="keyword">for</span> the new link<span class="sign">.</span>
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> link_name     <span class="sign">!</span> The name of the new link<span class="sign">.</span>
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr                <span class="sign">!</span> Error code<span class="sign">:</span>
-                                                  <span class="sign">!</span>   0 on success and <span class="sign">-</span>1 on failure
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> lcpl_id <span class="sign">!</span> Link creation property list identifier<span class="sign">.</span>
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> lapl_id <span class="sign">!</span> Link access property list identifier<span class="sign">.</span>
-</pre>
-
-<hr />
-<a name="H5L2fh5ldelete5fby5fidx5ff"></a>
-<a name="robo182"></a><h2>h5ldelete_by_idx_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo49">H5L</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5ldelete_by_idx_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Removes the nth link in a group.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id        - File or group identifier specifying location of subject group
-  group_name    - Name of subject group
-  index_field   - Type of index; Possible values are:
-                    H5_INDEX_UNKNOWN_F = -1  - Unknown index type
-                    H5_INDEX_NAME_F          - Index on names
-                    H5_INDEX_CRT_ORDER_F     - Index on creation order
-                    H5_INDEX_N_F             - Number of indices defined
-
-  order         - Order within field or index; Possible values are:
-                    H5_ITER_UNKNOWN_F   - Unknown order
-                    H5_ITER_INC_F       - Increasing order
-                    H5_ITER_DEC_F       - Decreasing order
-                    H5_ITER_NATIVE_F    - No particular order, whatever is fastest
-                    H5_ITER_N_F         - Number of iteration orders
-
-  n             - Link for which to retrieve information
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  lapl_id       - Link access property list
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  February 29, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5ldelete_by_idx_f</strong><span class="sign">(</span>loc_id<span class="sign">,</span> group_name<span class="sign">,</span> index_field<span class="sign">,</span> order<span class="sign">,</span> n<span class="sign">,</span> hdferr<span class="sign">,</span> lapl_id<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> loc_id       <span class="sign">!</span> Identifer <span class="keyword">for</span> object to which attribute is attached
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> group_name <span class="sign">!</span> Name of object<span class="sign">,</span> relative to location<span class="sign">,</span>
-                                               <span class="sign">!</span>  from which attribute is to be removed
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> index_field         <span class="sign">!</span> Type of index<span class="sign">;</span> Possible values are<span class="sign">:</span>
-                                               <span class="sign">!</span>    H5_INDEX_UNKNOWN_F   <span class="sign">-</span> Unknown index type
-                                               <span class="sign">!</span>    H5_INDEX_NAME_F      <span class="sign">-</span> Index on names
-                                               <span class="sign">!</span>    H5_INDEX_CRT_ORDER_F <span class="sign">-</span> Index on creation order
-                                               <span class="sign">!</span>    H5_INDEX_N_F              <span class="sign">-</span> Number of indices defined
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> order               <span class="sign">!</span> Order in which to iterate over index<span class="sign">;</span> Possible values are<span class="sign">:</span>
-                                               <span class="sign">!</span>    H5_ITER_UNKNOWN_F  <span class="sign">-</span> Unknown order
-                                               <span class="sign">!</span>    H5_ITER_INC_F      <span class="sign">-</span> Increasing order
-                                               <span class="sign">!</span>    H5_ITER_DEC_F      <span class="sign">-</span> Decreasing order
-                                               <span class="sign">!</span>    H5_ITER_NATIVE_F   <span class="sign">-</span> No particular order<span class="sign">,</span> whatever is fastest
-                                               <span class="sign">!</span>    H5_ITER_N_F     <span class="sign">-</span> Number of iteration orders
-    INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> n      <span class="sign">!</span> Offset within index
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code<span class="sign">:</span>
-                                           <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> lapl_id     <span class="sign">!</span> Link access property list
-</pre>
-
-<hr />
-<a name="H5L2fh5ldelete5ff"></a>
-<a name="robo183"></a><h2>h5ldelete_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo49">H5L</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5ldelete_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Removes a link from a group.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id        - Identifier of the file or group containing the object
-  name          - Name of the link to delete
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  lapl_id       - Link access property list identifier
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  January, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5ldelete_f</strong><span class="sign">(</span>loc_id<span class="sign">,</span> name<span class="sign">,</span> hdferr<span class="sign">,</span> lapl_id<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> loc_id  <span class="sign">!</span> Identifier of the file or group containing the object
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name  <span class="sign">!</span> Name of the link to delete
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code<span class="sign">:</span>
-                                          <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> lapl_id <span class="sign">!</span> Link access property list identifier
-</pre>
-
-<hr />
-<a name="H5L2fH5Lexists5ff"></a>
-<a name="robo184"></a><h2>H5Lexists_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo49">H5L</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>H5Lexists_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Check if a link with a particular name exists in a group.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id        - Identifier of the file or group to query.
-  name          - Link name to check
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  link_exists   - link exists status (.TRUE.,.FALSE.)
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  lapl_id       - Link access property list identifier.
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  February 29, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE h5lexists_f<span class="sign">(</span>loc_id<span class="sign">,</span> name<span class="sign">,</span> link_exists<span class="sign">,</span> hdferr<span class="sign">,</span> lapl_id<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> loc_id  <span class="sign">!</span> Identifier of the file or group to query<span class="sign">.</span>
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name  <span class="sign">!</span> Link name to check<span class="sign">.</span>
-    LOGICAL<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> link_exists   <span class="sign">!</span> <span class="sign">.</span>TRUE<span class="sign">.</span> <span class="keyword">if</span> exists<span class="sign">,</span> <span class="sign">.</span>FALSE<span class="sign">.</span> otherwise
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code<span class="sign">:</span>
-                                          <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> lapl_id
-                                          <span class="sign">!</span> Link access property list identifier<span class="sign">.</span>
-</pre>
-
-<hr />
-<a name="H5L2fh5lget5finfo5fby5fidx5ff"></a>
-<a name="robo185"></a><h2>h5lget_info_by_idx_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo49">H5L</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5lget_info_by_idx_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Retrieves metadata for a link in a group, according to the order within a field or index.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id        - File or group identifier specifying location of subject group
-  group_name    - Name of subject group
-  index_field   - Index or field which determines the order
-  order         - Order within field or index
-  n             - Link for which to retrieve information
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>            NOTE: In C these are defined as a structure: H5L_info_t
-  corder_valid  - Indicates whether the creation order data is valid for this attribute
-  corder        - Is a positive integer containing the creation order of the attribute
-  cset          - Indicates the character set used for the attribute’s name 
- address        - If the link is a hard link, address specifies the file address that the link points to
- val_size       - If the link is a symbolic link, val_size will be the length of the link value, e.g., 
-                  the length of the name of the pointed-to object with a null terminator.
- hdferr         - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  lapl_id       - Link access property list
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  February 29, 2008
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>   Changed the link_type names to match those in C (bug 1720) from,
-   H5L_LINK_HARD_F, H5L_LINK_SOFT_F,H5L_LINK_EXTERNAL_F,H5L_LINK_ERROR_F
-   to
-   H5L_TYPE_HARD_F, H5L_TYPE_SOFT_F,H5L_TYPE_EXTERNAL_F,H5L_TYPE_ERROR_F
-   MSB January 8, 2010.  
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5lget_info_by_idx_f</strong><span class="sign">(</span>loc_id<span class="sign">,</span> group_name<span class="sign">,</span> index_field<span class="sign">,</span> order<span class="sign">,</span> n<span class="sign">,</span> <span class="sign">&amp;</span>
-       link_type<span class="sign">,</span> f_corder_valid<span class="sign">,</span> corder<span class="sign">,</span> cset<span class="sign">,</span> address<span class="sign">,</span> val_size<span class="sign">,</span> hdferr<span class="sign">,</span> lapl_id<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> loc_id       <span class="sign">!</span> File or group identifier specifying location of subject group  
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> group_name <span class="sign">!</span> Name of subject group
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> index_field  <span class="sign">!</span> Index or field which determines the order
-                                        <span class="sign">!</span>    H5_INDEX_UNKNOWN_F   <span class="sign">-</span> Unknown index type
-                                        <span class="sign">!</span>    H5_INDEX_NAME_F      <span class="sign">-</span> Index on names
-                                        <span class="sign">!</span>    H5_INDEX_CRT_ORDER_F <span class="sign">-</span> Index on creation order
-                                        <span class="sign">!</span>    H5_INDEX_N_F             <span class="sign">-</span> Number of indices defined
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> order        <span class="sign">!</span> Order in which to iterate over index<span class="sign">;</span> Possible values are<span class="sign">:</span>
-                                        <span class="sign">!</span>    H5_ITER_UNKNOWN_F  <span class="sign">-</span> Unknown order
-                                        <span class="sign">!</span>    H5_ITER_INC_F      <span class="sign">-</span> Increasing order
-                                        <span class="sign">!</span>    H5_ITER_DEC_F      <span class="sign">-</span> Decreasing order
-                                        <span class="sign">!</span>    H5_ITER_NATIVE_F   <span class="sign">-</span> No particular order<span class="sign">,</span> whatever is fastest
-    INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> n   <span class="sign">!</span> Attribute<span class="sign">�</span><span class="sign">�</span><span class="sign">�</span>s position in index
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> link_type <span class="sign">!</span> Specifies the link class<span class="sign">:</span>
-                                      <span class="sign">!</span>  H5L_TYPE_HARD_F      <span class="sign">-</span> Hard link
-                                      <span class="sign">!</span>  H5L_TYPE_SOFT_F      <span class="sign">-</span> Soft link
-                                      <span class="sign">!</span>  H5L_TYPE_EXTERNAL_F  <span class="sign">-</span> External link
-                                      <span class="sign">!</span>  H5L_TYPE_ERROR _F    <span class="sign">-</span> Error
-    LOGICAL<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> f_corder_valid <span class="sign">!</span> Indicates whether the creation order data is valid <span class="keyword">for</span> this attribute 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> corder         <span class="sign">!</span> Is a positive integer containing the creation order of the attribute
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> cset           <span class="sign">!</span> Indicates the character set used <span class="keyword">for</span> the attribute<span class="sign">�</span><span class="sign">�</span><span class="sign">�</span>s name
-    INTEGER<span class="sign">(</span>HADDR_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> address  <span class="sign">!</span> If the link is a hard link<span class="sign">,</span> address specifies the file address that the link points to
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> val_size  <span class="sign">!</span> If the link is a symbolic link<span class="sign">,</span> val_size will be the length of the link value<span class="sign">,</span> e<span class="sign">.</span>g<span class="sign">.</span><span class="sign">,</span> 
-                                              <span class="sign">!</span> the length of the name of the pointed<span class="sign">-</span>to object with a null terminator<span class="sign">.</span> 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code<span class="sign">:</span>
-                                         <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> lapl_id  <span class="sign">!</span> Link access property list
-</pre>
-
-<hr />
-<a name="H5L2fh5lget5finfo5ff"></a>
-<a name="robo186"></a><h2>h5lget_info_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo49">H5L</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5lget_info_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Returns information about a link.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  link_loc_id   - File or group identifier.
-  link_name     - Name of the link for which information is being sought
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>            NOTE: In C these are contained in the structure H5L_info_t
-
-  cset          - indicates the character set used for link’s name.
-  corder        - specifies the link’s creation order position.
-  corder_valid  - indicates whether the value in corder is valid.
-  link_type     - specifies the link class:
-                    H5L_TYPE_HARD_F     - Hard link
-                    H5L_TYPE_SOFT_F     - Soft link
-                    H5L_TYPE_EXTERNAL_F - External link
-                    H5L_TYPE_ERROR_ F   - Error
-  address       - If the link is a hard link, address specifies the file address that the link points to
-  val_size      - If the link is a symbolic link, val_size will be the length of the link value, e.g., 
-                  the length of the name of the pointed-to object with a null terminator. 
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  lapl_id       - Link access property list
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  February 29, 2008
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>   Changed the link_type names to match those in C (bug 1720) from,
-   H5L_LINK_HARD_F, H5L_LINK_SOFT_F,H5L_LINK_EXTERNAL_F,H5L_LINK_ERROR_F
-   to
-   H5L_TYPE_HARD_F, H5L_TYPE_SOFT_F,H5L_TYPE_EXTERNAL_F,H5L_TYPE_ERROR_F
-   MSB January 8, 2010.
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5lget_info_f</strong><span class="sign">(</span>link_loc_id<span class="sign">,</span> link_name<span class="sign">,</span> <span class="sign">&amp;</span>
-       cset<span class="sign">,</span> corder<span class="sign">,</span> f_corder_valid<span class="sign">,</span> link_type<span class="sign">,</span> address<span class="sign">,</span> val_size<span class="sign">,</span> <span class="sign">&amp;</span>
-       hdferr<span class="sign">,</span> lapl_id<span class="sign">)</span>
-    IMPLICIT NONE
-
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> link_loc_id <span class="sign">!</span> File or group identifier<span class="sign">.</span>
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> link_name <span class="sign">!</span> Name of the link <span class="keyword">for</span> which information is being sought
-
-<span class="sign">!</span> OUTPUTS  NOTE<span class="sign">:</span> In C these are contained in the structure H5L_info_t
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> cset <span class="sign">!</span> Indicates the character set used <span class="keyword">for</span> the link<span class="sign">�</span><span class="sign">�</span><span class="sign">�</span>s name<span class="sign">.</span>
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> corder <span class="sign">!</span> Specifies the link<span class="sign">�</span><span class="sign">�</span><span class="sign">�</span>s creation order position<span class="sign">.</span>
-    LOGICAL<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> f_corder_valid <span class="sign">!</span> Indicates whether the value in corder is valid<span class="sign">.</span>
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> link_type <span class="sign">!</span> Specifies the link class<span class="sign">:</span>
-                                      <span class="sign">!</span>  H5L_TYPE_HARD_F      <span class="sign">-</span> Hard link
-                                      <span class="sign">!</span>  H5L_TYPE_SOFT_F      <span class="sign">-</span> Soft link
-                                      <span class="sign">!</span>  H5L_TYPE_EXTERNAL_F  <span class="sign">-</span> External link
-                                      <span class="sign">!</span>  H5L_TYPE_ERROR _F    <span class="sign">-</span> Error
-    INTEGER<span class="sign">(</span>HADDR_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> address <span class="sign">!</span> If the link is a hard link<span class="sign">,</span> address specifies the file address that the link points to
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> val_size <span class="sign">!</span> If the link is a symbolic link<span class="sign">,</span> val_size will be the length of the link value<span class="sign">,</span> e<span class="sign">.</span>g<span class="sign">.</span><span class="sign">,</span> 
-                                             <span class="sign">!</span> the length of the name of the pointed<span class="sign">-</span>to object with a null terminator<span class="sign">.</span> 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code<span class="sign">:</span>
-                                         <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> lapl_id  <span class="sign">!</span> Link access property list
-</pre>
-
-<hr />
-<a name="H5L2fh5lget5fname5fby5fidx5ff"></a>
-<a name="robo187"></a><h2>h5lget_name_by_idx_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo49">H5L</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5lget_name_by_idx_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Retrieves name of the nth link in a group, according to the order within a specified field or index.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id        - File or group identifier specifying location of subject group
-  group_name    - Name of subject group
-  index_field   - Index or field which determines the order
-  order         - Order within field or index
-  n             - Link for which to retrieve information
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  name          - Buffer in which link value is returned
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  lapl_id       - List access property list identifier.
-  size          - Maximum number of characters of link value to be returned.
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  March 10, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5lget_name_by_idx_f</strong><span class="sign">(</span>loc_id<span class="sign">,</span> group_name<span class="sign">,</span> index_field<span class="sign">,</span> order<span class="sign">,</span> n<span class="sign">,</span> <span class="sign">&amp;</span>
-        name<span class="sign">,</span> hdferr<span class="sign">,</span> size<span class="sign">,</span> lapl_id<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> loc_id       <span class="sign">!</span> File or group identifier specifying location of subject group
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> group_name <span class="sign">!</span> Name of subject group
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> index_field  <span class="sign">!</span> Index or field which determines the order
-                                        <span class="sign">!</span>    H5_INDEX_UNKNOWN_F   <span class="sign">-</span> Unknown index type
-                                        <span class="sign">!</span>    H5_INDEX_NAME_F      <span class="sign">-</span> Index on names
-                                        <span class="sign">!</span>    H5_INDEX_CRT_ORDER_F <span class="sign">-</span> Index on creation order
-                                        <span class="sign">!</span>    H5_INDEX_N_F             <span class="sign">-</span> Number of indices defined
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> order        <span class="sign">!</span> Order in which to iterate over index<span class="sign">;</span> Possible values are<span class="sign">:</span>
-                                        <span class="sign">!</span>    H5_ITER_UNKNOWN_F  <span class="sign">-</span> Unknown order
-                                        <span class="sign">!</span>    H5_ITER_INC_F      <span class="sign">-</span> Increasing order
-                                        <span class="sign">!</span>    H5_ITER_DEC_F      <span class="sign">-</span> Decreasing order
-                                        <span class="sign">!</span>    H5_ITER_NATIVE_F   <span class="sign">-</span> No particular order<span class="sign">,</span> whatever is fastest
-    INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> n   <span class="sign">!</span> Attribute<span class="sign">�</span><span class="sign">�</span><span class="sign">�</span>s position in index
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name <span class="sign">!</span> Buffer in which link value is returned
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code<span class="sign">:</span>
-                                          <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5L2fh5lis5fregistered5ff"></a>
-<a name="robo188"></a><h2>h5lis_registered_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo49">H5L</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5lis_registered_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Determines whether a class of user-defined links is registered.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  link_cls_id   - User-defined link class identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  registered    - .TRUE.  - if the link class has been registered
-                  .FALSE. - if it is unregistered
-  hdferr        - Error code
-  Success:  0
-  Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  February 29, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5lis_registered_f</strong><span class="sign">(</span>link_cls_id<span class="sign">,</span> registered<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> link_cls_id  <span class="sign">!</span> User<span class="sign">-</span>defined link class identifier
-    LOGICAL<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> registered  <span class="sign">!</span> <span class="sign">.</span>TRUE<span class="sign">.</span> <span class="sign">-</span> <span class="keyword">if</span> the link class has been registered and
-                                        <span class="sign">!</span> <span class="sign">.</span>FALSE<span class="sign">.</span> <span class="sign">-</span> <span class="keyword">if</span> it is unregistered
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr      <span class="sign">!</span> Error code<span class="sign">:</span>
-                                        <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5L2fh5lmove5ff"></a>
-<a name="robo191"></a><h2>h5lmove_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo49">H5L</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5lmove_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Renames a link within an <a href="./HDF5_f90.html#robo76">HDF5</a> file.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  src_loc_id    - Original file or group identifier.
-  src_name      - Original link name.
-  dest_loc_id   - Destination file or group identifier.
-  dest_name     - NEW link name.
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Error code:
-                   0 on success and -1 on failure
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  lcpl_id       - Link creation property list identifier to be associated WITH the NEW link.
-  lapl_id       - Link access property list identifier to be associated WITH the NEW link.
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  March 3, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5lmove_f</strong><span class="sign">(</span>src_loc_id<span class="sign">,</span> src_name<span class="sign">,</span> dest_loc_id<span class="sign">,</span> dest_name<span class="sign">,</span> hdferr<span class="sign">,</span> lcpl_id<span class="sign">,</span> lapl_id<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> src_loc_id  <span class="sign">!</span> Original file or group identifier<span class="sign">.</span>
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> src_name  <span class="sign">!</span> Original link name<span class="sign">.</span>
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> dest_loc_id <span class="sign">!</span> Destination file or group identifier<span class="sign">.</span>
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> dest_name <span class="sign">!</span> NEW link name<span class="sign">.</span>
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr     <span class="sign">!</span> Error code<span class="sign">:</span>
-                                              <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> lcpl_id <span class="sign">!</span> Link creation property list identifier
-                                                    <span class="sign">!</span> to be associated WITH the NEW link<span class="sign">.</span>
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> lapl_id <span class="sign">!</span> Link access property list identifier
-                                                    <span class="sign">!</span> to be associated WITH the NEW link<span class="sign">.</span>
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/H5Lff.f90 on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/H5Of_c.html b/fortran/doc/DevelGuide/src/H5Of_c.html
deleted file mode 100644
index e4a97e9..0000000
--- a/fortran/doc/DevelGuide/src/H5Of_c.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/H5Of.c</title>
-<!-- Source: ./src/H5Of.c -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="H5Of2fH5Of"></a>
-<a name="robo59"></a><h2>H5Of</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">PURPOSE</p>
-<pre>   This file contains C stubs for <a href="./H5Off_f90.html#robo56">H5O</a> Fortran APIs
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/H5Of.c on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/H5Off_f90.html b/fortran/doc/DevelGuide/src/H5Off_f90.html
deleted file mode 100644
index 790810e..0000000
--- a/fortran/doc/DevelGuide/src/H5Off_f90.html
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/H5Off.f90</title>
-<!-- Source: ./src/H5Off.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="ROBODoc2fH5O"></a>
-<a name="robo56"></a><h2>H5O</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  MODULE <strong>H5O</strong>
-</pre>
-<p class="item_name">FILE</p>
-<pre>  fortran/src/<a href="#robo_top_of_doc">H5Off.f90</a>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  This file contains Fortran interfaces for <strong>H5O</strong> functions. It includes
-  all the functions that are independent on whether the Fortran 2003 functions
-  are enabled or disabled.
-</pre>
-<p class="item_name">NOTES</p>
-<pre>                         *** IMPORTANT ***
-  If you add a new <strong>H5O</strong> function you must add the function name to the
-  Windows dll file 'hdf5_fortrandll.def' in the fortran/src directory.
-  This is needed for Windows based operating systems.
-</pre>
-
-<hr />
-<a name="H5O2fh5oclose5ff"></a>
-<a name="robo193"></a><h2>h5oclose_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo56">H5O</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5oclose_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Closes an object in an <a href="./HDF5_f90.html#robo76">HDF5</a> file.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  object_id     - Object identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  December 17, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5oclose_f</strong><span class="sign">(</span>object_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span>  <span class="sign">:</span><span class="sign">:</span> object_id
-    INTEGER<span class="sign">,</span>        INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr
-</pre>
-
-<hr />
-<a name="H5O2fh5olink5ff"></a>
-<a name="robo195"></a><h2>h5olink_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo56">H5O</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5olink_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Creates a hard link to an object in an <a href="./HDF5_f90.html#robo76">HDF5</a> file.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  object_id     - Object to be linked.
-  new_loc_id    - File or group identifier specifying location at which object is to be linked.
-  new_link_name - Name of link to be created, relative to new_loc_id.
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr:       - error code
-                   Success:  0
-                   Failure: -1
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  lcpl_id       - Link creation property list identifier.
-  lapl_id       - Link access property list identifier.
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  April 21, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5olink_f</strong><span class="sign">(</span>object_id<span class="sign">,</span> new_loc_id<span class="sign">,</span> new_link_name<span class="sign">,</span> hdferr<span class="sign">,</span> lcpl_id<span class="sign">,</span> lapl_id<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> object_id  <span class="sign">!</span> Object to be linked
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> new_loc_id <span class="sign">!</span> File or group identifier specifying
-                                             <span class="sign">!</span> location at which object is to be linked<span class="sign">.</span>
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> new_link_name <span class="sign">!</span> Name of link to be created<span class="sign">,</span> relative to new_loc_id<span class="sign">.</span>
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-                                          <span class="sign">!</span>   Success<span class="sign">:</span>  0
-                                          <span class="sign">!</span>   Failure<span class="sign">:</span> <span class="sign">-</span>1
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> lcpl_id <span class="sign">!</span> Link creation property list identifier<span class="sign">.</span>
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> lapl_id <span class="sign">!</span> Link creation property list identifier<span class="sign">.</span>
-</pre>
-
-<hr />
-<a name="H5O2fh5oopen5ff"></a>
-<a name="robo196"></a><h2>h5oopen_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo56">H5O</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5oopen_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Opens an object in an <a href="./HDF5_f90.html#robo76">HDF5</a> file by location identifier and path name.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id        - File or group identifier
-  name          - Path to the object, relative to loc_id.
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  obj_id        - Object identifier for the opened object
-  hdferr:       - error code
-                   Success:  0
-                   Failure: -1
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  lapl_id       - Access property list identifier for the link pointing to the object
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  April 18, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5oopen_f</strong><span class="sign">(</span>loc_id<span class="sign">,</span> name<span class="sign">,</span> obj_id<span class="sign">,</span> hdferr<span class="sign">,</span> lapl_id<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> loc_id  <span class="sign">!</span> File or group identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name  <span class="sign">!</span> Path to the object<span class="sign">,</span> relative to loc_id
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> obj_id <span class="sign">!</span> Object identifier <span class="keyword">for</span> the opened object
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-                                          <span class="sign">!</span>   Success<span class="sign">:</span>  0
-                                          <span class="sign">!</span>   Failure<span class="sign">:</span> <span class="sign">-</span>1
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> lapl_id  <span class="sign">!</span> Attribute access property list
-</pre>
-
-<hr />
-<a name="H5O2fh5open5fby5faddr5ff"></a>
-<a name="robo197"></a><h2>h5open_by_addr_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo56">H5O</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  h5oopen_by_addr_f 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Opens an object using its address within an <a href="./HDF5_f90.html#robo76">HDF5</a> file. 
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>    loc_id - File or group identifier
-    addr   - Object’s address in the file
- OUTPUTS: 
-    obj_id - Object identifier for the opened object
-    hdferr - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  September 14, 2009
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE h5oopen_by_addr_f<span class="sign">(</span>loc_id<span class="sign">,</span> addr<span class="sign">,</span> obj_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> loc_id  <span class="sign">!</span> File or group identifier
-    INTEGER<span class="sign">(</span>HADDR_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> addr  <span class="sign">!</span> Object<span class="sign">�</span><span class="sign">�</span><span class="sign">�</span>s address in the file
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> obj_id <span class="sign">!</span> Object identifier <span class="keyword">for</span> the opened object
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code<span class="sign">:</span>
-                                          <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/H5Off.f90 on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/H5Pf_c.html b/fortran/doc/DevelGuide/src/H5Pf_c.html
deleted file mode 100644
index 6b8079a..0000000
--- a/fortran/doc/DevelGuide/src/H5Pf_c.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/H5Pf.c</title>
-<!-- Source: ./src/H5Pf.c -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="H5Pf2fH5Pf"></a>
-<a name="robo63"></a><h2>H5Pf</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">PURPOSE</p>
-<pre>   This file contains C stubs for H5P Fortran APIs
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/H5Pf.c on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/H5Pff_F03_f90.html b/fortran/doc/DevelGuide/src/H5Pff_F03_f90.html
deleted file mode 100644
index 51882ba..0000000
--- a/fortran/doc/DevelGuide/src/H5Pff_F03_f90.html
+++ /dev/null
@@ -1,832 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/H5Pff_F03.f90</title>
-<!-- Source: ./src/H5Pff_F03.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="ROBODoc2fH5P2028F0329"></a>
-<a name="robo61"></a><h2>H5P (F03)</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  H5P_PROVISIONAL
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  This file contains Fortran 90 and Fortran 2003 interfaces for H5P functions.
-  It contains the same functions as H5Pff_DEPRECIATE.f90 but includes the
-  Fortran 2003 functions and the interface listings. This file will be compiled
-  instead of H5Pff_DEPRECIATE.f90 if Fortran 2003 functions are enabled.
-</pre>
-<p class="item_name">NOTES</p>
-<pre>                         *** IMPORTANT ***
-  If you add a new H5P function you must add the function name to the
-  Windows dll file 'hdf5_fortrandll.def' in the fortran/src directory.
-  This is needed for Windows based operating systems.
-</pre>
-
-<hr />
-<a name="H5P2028F03292f20h5pget5fdouble"></a>
-<a name="robo80"></a><h2> h5pget_double</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo61">H5P (F03)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <a href="./H5Pff_F90_f90.html#robo229">h5pget_double</a>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Gets a property list value
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id        - iproperty list identifier to modify
-  name          - name of property to modify
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  value         - value of property
-  hdferr:       - error code
-                   Success:  0
-                   Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 9, 2002
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <a href="./H5Pff_F90_f90.html#robo229">h5pget_double</a><span class="sign">(</span>prp_id<span class="sign">,</span> name<span class="sign">,</span> value<span class="sign">,</span> hdferr<span class="sign">)</span>
-    USE<span class="sign">,</span> INTRINSIC <span class="sign">:</span><span class="sign">:</span> ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id  <span class="sign">!</span> Property list identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name  <span class="sign">!</span> Name of property to modify
-    DOUBLE PRECISION<span class="sign">,</span>   INTENT<span class="sign">(</span>OUT<span class="sign">)</span><span class="sign">,</span> TARGET <span class="sign">:</span><span class="sign">:</span> value <span class="sign">!</span> Property value
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5P2028F03292fh5pcreate5fclass5ff"></a>
-<a name="robo205"></a><h2>h5pcreate_class_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo61">H5P (F03)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pcreate_class_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Create a new property list class
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  parent        - Property list identifier of the parent class
-                  Possible values include:
-                   H5P_ROOT_F
-                   H5P_FILE_CREATE_F
-                   H5P_FILE_ACCESS_F
-                   H5P_DATASET_CREATE_F
-                   H5P_DATASET_XFER_F
-                   H5P_FILE_MOUNT_F
-  name          - name of the class we are creating
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  class         - porperty list class identifier
-  hdferr:       - error code
-
-  Success: 0
-  Failure: -1
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  H5P_cls_create_func_t (create) - Callback routine called when a property list is created
-  create_data                    - User pointer to any class creation information needed
-  H5P_cls_copy_func_t   (copy)   - Callback routine called when a property list is copied
-  copy_data                      - User pointer to any class copy information needed
-  H5P_cls_close_func_t  (close)  - Callback routine called when a property list is being closed
-  close_data                     - User pointer to any class close information needed
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 9, 2002
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Added callback arguments
-  M. Scot Breitenfeld, July 3, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pcreate_class_f</strong><span class="sign">(</span>parent<span class="sign">,</span> name<span class="sign">,</span> class<span class="sign">,</span> hdferr<span class="sign">,</span> create<span class="sign">,</span> create_data<span class="sign">,</span> copy<span class="sign">,</span> copy_data<span class="sign">,</span> close<span class="sign">,</span> close_data<span class="sign">)</span>
-    USE iso_c_binding
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> parent  <span class="sign">!</span> parent property list class identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name  <span class="sign">!</span> name of property tocreate
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> class  <span class="sign">!</span> property list class identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-    TYPE<span class="sign">(</span>C_PTR<span class="sign">)</span><span class="sign">,</span> OPTIONAL <span class="sign">:</span><span class="sign">:</span> create_data<span class="sign">,</span> copy_data<span class="sign">,</span> close_data
-    TYPE<span class="sign">(</span>C_FUNPTR<span class="sign">)</span><span class="sign">,</span> OPTIONAL <span class="sign">:</span><span class="sign">:</span> create<span class="sign">,</span> copy<span class="sign">,</span> close
-</pre>
-
-<hr />
-<a name="H5P2028F03292fh5pget5fchar"></a>
-<a name="robo218"></a><h2>h5pget_char</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo61">H5P (F03)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pget_char</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Gets a property list value
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id        - iproperty list identifier to modify
-  name          - name of property to modify
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  value         - value of property
-  hdferr:       - error code
-                   Success:  0
-                   Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 9, 2002
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pget_char</strong><span class="sign">(</span>prp_id<span class="sign">,</span> name<span class="sign">,</span> value<span class="sign">,</span> hdferr<span class="sign">)</span>
-    USE<span class="sign">,</span> INTRINSIC <span class="sign">:</span><span class="sign">:</span> ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id   <span class="sign">!</span> Property list identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name   <span class="sign">!</span> Name of property to modify
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> value <span class="sign">!</span> Property value
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5P2028F03292fh5pget5finteger"></a>
-<a name="robo247"></a><h2>h5pget_integer</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo61">H5P (F03)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pget_integer</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Gets a property list value
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id        - iproperty list identifier to modify
-  name          - name of property to modify
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  value         - value of property
-  hdferr:       - error code
-                   Success:  0
-                   Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 9, 2002
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pget_integer</strong><span class="sign">(</span>prp_id<span class="sign">,</span> name<span class="sign">,</span> value<span class="sign">,</span> hdferr<span class="sign">)</span>
-    USE<span class="sign">,</span> INTRINSIC <span class="sign">:</span><span class="sign">:</span> ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id    <span class="sign">!</span> Property list identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name    <span class="sign">!</span> Name of property to modify
-    INTEGER<span class="sign">,</span>   INTENT<span class="sign">(</span>OUT<span class="sign">)</span><span class="sign">,</span> TARGET <span class="sign">:</span><span class="sign">:</span> value <span class="sign">!</span> Property value
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr          <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5P2028F03292fh5pget5freal"></a>
-<a name="robo261"></a><h2>h5pget_real</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo61">H5P (F03)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pget_real</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Gets a property list value
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id        - iproperty list identifier to modify
-  name          - name of property to modify
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  value         - value of property
-  hdferr:       - error code
-                   Success:  0
-                   Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 9, 2002
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pget_real</strong><span class="sign">(</span>prp_id<span class="sign">,</span> name<span class="sign">,</span> value<span class="sign">,</span> hdferr<span class="sign">)</span>
-    USE<span class="sign">,</span> INTRINSIC <span class="sign">:</span><span class="sign">:</span> ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id <span class="sign">!</span> Property list identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name <span class="sign">!</span> Name of property to modify
-    REAL<span class="sign">,</span>   INTENT<span class="sign">(</span>OUT<span class="sign">)</span><span class="sign">,</span> TARGET <span class="sign">:</span><span class="sign">:</span> value <span class="sign">!</span> Property value
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5P2028F03292fh5pinsert5fchar"></a>
-<a name="robo273"></a><h2>h5pinsert_char</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo61">H5P (F03)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pinsert_char</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Registers a temporary property with a property list class.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  plist         - property list identifier
-                  permanent property within
-  name          - name of property to insert
-  size          - size of property in bytes
-  value         - initial value for the property
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr:       - error code
-                   Success:  0
-                   Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 10, 2002
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pinsert_char</strong><span class="sign">(</span>plist<span class="sign">,</span> name<span class="sign">,</span> size<span class="sign">,</span> value<span class="sign">,</span> hdferr<span class="sign">)</span>
-    USE iso_c_binding
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> plist      <span class="sign">!</span> Property list identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name     <span class="sign">!</span> Name of property to insert
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> size      <span class="sign">!</span> Size of property value
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span>   INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> value  <span class="sign">!</span> Property value
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr           <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5P2028F03292fh5pinsert5fdouble"></a>
-<a name="robo274"></a><h2>h5pinsert_double</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo61">H5P (F03)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pinsert_double</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Registers a temporary property with a property list class.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  plist         - property list identifier
-                  permanent property within
-  name          - name of property to insert
-  size          - size of property in bytes
-  value         - initial value for the property
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr:       - error code
-                   Success:  0
-                   Failure: -1
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  NONE
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 10, 2002
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pinsert_double</strong><span class="sign">(</span>plist<span class="sign">,</span> name<span class="sign">,</span> size<span class="sign">,</span> value<span class="sign">,</span> hdferr<span class="sign">)</span>
-    USE iso_c_binding
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> plist   <span class="sign">!</span> Property list identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name  <span class="sign">!</span> Name of property to insert
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> size   <span class="sign">!</span> Size of the property value
-    DOUBLE PRECISION<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span><span class="sign">,</span> TARGET <span class="sign">:</span><span class="sign">:</span> value <span class="sign">!</span> Property value
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5P2028F03292fh5pinsert5finteger"></a>
-<a name="robo276"></a><h2>h5pinsert_integer</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo61">H5P (F03)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pinsert_integer</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Registers a temporary property with a property list class.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  plist         - property list identifier
-  name          - name of property to insert
-  size          - size of property in bytes
-  value         - initial value for the property
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr:       - error code
-                   Success:  0
-                   Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 10, 2002
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pinsert_integer</strong><span class="sign">(</span>plist<span class="sign">,</span> name<span class="sign">,</span> size<span class="sign">,</span> value<span class="sign">,</span> hdferr<span class="sign">)</span>
-    USE iso_c_binding
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> plist    <span class="sign">!</span> Property list identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name   <span class="sign">!</span> Name of property to insert
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> size    <span class="sign">!</span> Size of the property value
-    INTEGER<span class="sign">,</span>   INTENT<span class="sign">(</span>IN<span class="sign">)</span><span class="sign">,</span> TARGET <span class="sign">:</span><span class="sign">:</span> value <span class="sign">!</span> Property value
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5P2028F03292fh5pinsert5fptr"></a>
-<a name="robo278"></a><h2>h5pinsert_ptr</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo61">H5P (F03)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pinsert_ptr</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Registers a temporary property with a property list class.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  plist         - property list identifier
-                  permanent property within
-  name          - name of property to insert
-  size          - size of property in bytes
-  value         - initial value for the property
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr:       - error code
-                   Success:  0
-                   Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  June 24, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pinsert_ptr</strong><span class="sign">(</span>plist<span class="sign">,</span> name<span class="sign">,</span> size<span class="sign">,</span> value<span class="sign">,</span> hdferr<span class="sign">)</span>
-    USE iso_c_binding
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> plist  <span class="sign">!</span> Property list identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name <span class="sign">!</span> Name of property to insert
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> size  <span class="sign">!</span> Size of property value
-    TYPE<span class="sign">(</span>c_ptr<span class="sign">)</span><span class="sign">,</span>   INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> value   <span class="sign">!</span> Property value
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5P2028F03292fh5pinsert5freal"></a>
-<a name="robo280"></a><h2>h5pinsert_real</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo61">H5P (F03)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pinsert_real</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Registers a temporary property with a property list class.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  plist         - property list identifier
-                  permanent property within
-  name          - name of property to insert
-  size          - size of property in bytes
-  value         - initial value for the property
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr:       - error code
-                   Success:  0
-                   Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 10, 2002
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pinsert_real</strong><span class="sign">(</span>plist<span class="sign">,</span> name<span class="sign">,</span> size<span class="sign">,</span> value<span class="sign">,</span> hdferr<span class="sign">)</span>
-    USE iso_c_binding
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> plist   <span class="sign">!</span> Property list identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name  <span class="sign">!</span> Name of property to insert
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> size   <span class="sign">!</span> Size of the property value
-    REAL<span class="sign">,</span>   INTENT<span class="sign">(</span>IN<span class="sign">)</span><span class="sign">,</span> TARGET <span class="sign">:</span><span class="sign">:</span> value   <span class="sign">!</span> Property value
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5P2028F03292fh5pregister5fchar"></a>
-<a name="robo283"></a><h2>h5pregister_char</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo61">H5P (F03)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pregister_char</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Registers a permanent property with a property list class.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  class         - property list class to register
-                  permanent property within
-  name          - name of property to register
-  size          - size of property in bytes
-  value         - default value for property in newly
-                  created property lists
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr:       - error code
-                   Success:  0
-                   Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 10, 2002
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pregister_char</strong><span class="sign">(</span>class<span class="sign">,</span> name<span class="sign">,</span> size<span class="sign">,</span> value<span class="sign">,</span> hdferr<span class="sign">)</span>
-    USE ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> class     <span class="sign">!</span> Property list class identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name    <span class="sign">!</span> Name of property to <span class="keyword">register</span>
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> size     <span class="sign">!</span> size of the property value
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span>   INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> value <span class="sign">!</span> Property value
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr          <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5P2028F03292fh5pregister5fdouble"></a>
-<a name="robo286"></a><h2>h5pregister_double</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo61">H5P (F03)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pregister_double</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Registers a permanent property with a property list class.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  class         - property list class to register
-                  permanent property within
-  name          - name of property to register
-  size          - size of property in bytes
-  value         - default value for property in newly
-                  created property lists
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr:       - error code
-                   Success:  0
-                   Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 10, 2002
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pregister_double</strong><span class="sign">(</span>class<span class="sign">,</span> name<span class="sign">,</span> size<span class="sign">,</span> value<span class="sign">,</span> hdferr<span class="sign">)</span>
-    USE ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> class  <span class="sign">!</span> Property list class identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name <span class="sign">!</span> Name of property to <span class="keyword">register</span>
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> size  <span class="sign">!</span> size of the property value
-    DOUBLE PRECISION<span class="sign">,</span>   INTENT<span class="sign">(</span>IN<span class="sign">)</span><span class="sign">,</span> TARGET <span class="sign">:</span><span class="sign">:</span> value <span class="sign">!</span> Property value
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5P2028F03292fh5pregister5finteger"></a>
-<a name="robo287"></a><h2>h5pregister_integer</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo61">H5P (F03)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pregister_integer</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Registers a permanent property with a property list class.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  class         - property list class to register
-                  permanent property within
-  name          - name of property to register
-  size          - size of property in bytes
-  value         - default value for property in newly
-                  created property lists
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr:       - error code
-                   Success:  0
-                   Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 10, 2002
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pregister_integer</strong><span class="sign">(</span>class<span class="sign">,</span> name<span class="sign">,</span> size<span class="sign">,</span> value<span class="sign">,</span> hdferr<span class="sign">)</span>
-    USE ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> class    <span class="sign">!</span> Property list class identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name   <span class="sign">!</span> Name of property to <span class="keyword">register</span>
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> size    <span class="sign">!</span> Size of the property value
-    INTEGER<span class="sign">,</span>   INTENT<span class="sign">(</span>IN<span class="sign">)</span><span class="sign">,</span> TARGET <span class="sign">:</span><span class="sign">:</span> value <span class="sign">!</span> Property value
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5P2028F03292fh5pregister5fptr"></a>
-<a name="robo289"></a><h2>h5pregister_ptr</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo61">H5P (F03)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pregister_ptr</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Registers a permanent property with a property list class.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  class         - property list class to register
-                  permanent property within
-  name          - name of property to register
-  size          - size of property in bytes
-  value         - default value for property in newly
-                  created property lists
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr:       - error code
-                   Success:  0
-                   Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  June 24, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pregister_ptr</strong><span class="sign">(</span>class<span class="sign">,</span> name<span class="sign">,</span> size<span class="sign">,</span> value<span class="sign">,</span> hdferr<span class="sign">)</span>
-    USE ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> class   <span class="sign">!</span> Property list class identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name  <span class="sign">!</span> Name of property to <span class="keyword">register</span>
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> size   <span class="sign">!</span> Size of the property value
-    TYPE<span class="sign">(</span>C_PTR<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> value      <span class="sign">!</span> Property value
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5P2028F03292fh5pregister5freal"></a>
-<a name="robo291"></a><h2>h5pregister_real</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo61">H5P (F03)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pregister_real</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Registers a permanent property with a property list class.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  class         - property list class to register
-                  permanent property within
-  name          - name of property to register
-  size          - size of property in bytes
-  value         - default value for property in newly
-                  created property lists
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr:       - error code
-                   Success:  0
-                   Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 10, 2002
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pregister_real</strong><span class="sign">(</span>class<span class="sign">,</span> name<span class="sign">,</span> size<span class="sign">,</span> value<span class="sign">,</span> hdferr<span class="sign">)</span>
-    USE ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> class   <span class="sign">!</span> Property list class identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name  <span class="sign">!</span> Name of property to <span class="keyword">register</span>
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> size   <span class="sign">!</span> size of the property value
-    REAL<span class="sign">,</span>   INTENT<span class="sign">(</span>IN<span class="sign">)</span><span class="sign">,</span> TARGET <span class="sign">:</span><span class="sign">:</span> value   <span class="sign">!</span> Property value
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5P2028F03292fh5pset28get29fill5fvalue5ff"></a>
-<a name="robo294"></a><h2>h5pset(get)fill_value_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo61">H5P (F03)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pset(get)fill_value_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets(gets) fill value for a dataset creation property list
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id        - dataset creation property list identifier
-  type_id       - datatype identifier for fill value
-  fillvalue     - fill value
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  type_id       - datatype identifier for fill value
-  fillvalue     - fill value
-  hdferr:       - error code
-                   Success:  0
-                   Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 14, 2001
-
-  Added the recommended way of passing fillvalue
-  and that is by passing the C address, all other
-  ways are obsolete and should be avoided. June, 2008 MSB
-</pre>
-<p class="item_name">NOTES</p>
-<pre>  <strong>h5pset(get)fill_value_f</strong> function is overloaded to support
-  INTEGER, REAL, DOUBLE PRECISION and CHARACTER dtatypes.
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE h5pset_fill_value_integer<span class="sign">(</span>prp_id<span class="sign">,</span> type_id<span class="sign">,</span> fillvalue<span class="sign">,</span> hdferr<span class="sign">)</span>
-    USE<span class="sign">,</span> INTRINSIC <span class="sign">:</span><span class="sign">:</span> ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id  <span class="sign">!</span> Property list identifier
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id <span class="sign">!</span> Datatype identifier of
-                                          <span class="sign">!</span> of fillvalue datatype
-                                          <span class="sign">!</span> <span class="sign">(</span>in memory<span class="sign">)</span>
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span><span class="sign">,</span> TARGET <span class="sign">:</span><span class="sign">:</span> fillvalue   <span class="sign">!</span> Fillvalue
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr  <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5P2028F03292fh5pset5fchar"></a>
-<a name="robo303"></a><h2>h5pset_char</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo61">H5P (F03)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pset_char</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets a property list value
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id        - iproperty list identifier to modify
-  name          - name of property to modify
-  value         - value to set property to
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr:       - error code
-                   Success:  0
-                   Failure: -1
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  NONE
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 9, 2002
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pset_char</strong><span class="sign">(</span>prp_id<span class="sign">,</span> name<span class="sign">,</span> value<span class="sign">,</span> hdferr<span class="sign">)</span>
-    USE<span class="sign">,</span> INTRINSIC <span class="sign">:</span><span class="sign">:</span> ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id    <span class="sign">!</span> Property list identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name    <span class="sign">!</span> Name of property to modify
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span>   INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> value <span class="sign">!</span> Property value
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr          <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5P2028F03292fh5pset5fdouble"></a>
-<a name="robo313"></a><h2>h5pset_double</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo61">H5P (F03)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pset_double</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets a property list value
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id        - iproperty list identifier to modify
-  name          - name of property to modify
-  value         - value to set property to
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr:       - error code
-                    Success:  0
-                    Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 9, 2002
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pset_double</strong><span class="sign">(</span>prp_id<span class="sign">,</span> name<span class="sign">,</span> value<span class="sign">,</span> hdferr<span class="sign">)</span>
-    USE<span class="sign">,</span> INTRINSIC <span class="sign">:</span><span class="sign">:</span> ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id  <span class="sign">!</span> Property list identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name  <span class="sign">!</span> Name of property to modify
-    DOUBLE PRECISION<span class="sign">,</span>   INTENT<span class="sign">(</span>IN<span class="sign">)</span><span class="sign">,</span> TARGET <span class="sign">:</span><span class="sign">:</span> value <span class="sign">!</span> Property value
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr                  <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5P2028F03292fh5pset5finteger"></a>
-<a name="robo334"></a><h2>h5pset_integer</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo61">H5P (F03)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pset_integer</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets a property list value
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id        - iproperty list identifier to modify
-  name          - name of property to modify
-  value         - value to set property to
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr:       - error code
-                   Success:  0
-                   Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 9, 2002
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pset_integer</strong><span class="sign">(</span>prp_id<span class="sign">,</span> name<span class="sign">,</span> value<span class="sign">,</span> hdferr<span class="sign">)</span>
-    USE<span class="sign">,</span> INTRINSIC <span class="sign">:</span><span class="sign">:</span> ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id   <span class="sign">!</span> Property list identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name   <span class="sign">!</span> Name of property to modify
-    INTEGER<span class="sign">,</span>   INTENT<span class="sign">(</span>IN<span class="sign">)</span><span class="sign">,</span> TARGET <span class="sign">:</span><span class="sign">:</span> value <span class="sign">!</span> Property value
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5P2028F03292fh5pset5freal"></a>
-<a name="robo345"></a><h2>h5pset_real</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo61">H5P (F03)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pset_real</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets a property list value
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id        - iproperty list identifier to modify
-  name          - name of property to modify
-  value         - value to set property to
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr:       - error code
-                   Success:  0
-                    Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 9, 2002
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pset_real</strong><span class="sign">(</span>prp_id<span class="sign">,</span> name<span class="sign">,</span> value<span class="sign">,</span> hdferr<span class="sign">)</span>
-    USE<span class="sign">,</span> INTRINSIC <span class="sign">:</span><span class="sign">:</span> ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id <span class="sign">!</span> Property list identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name <span class="sign">!</span> Name of property to modify
-    REAL<span class="sign">,</span>   INTENT<span class="sign">(</span>IN<span class="sign">)</span><span class="sign">,</span> TARGET <span class="sign">:</span><span class="sign">:</span> value  <span class="sign">!</span> Property value
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/H5Pff_F03.f90 on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/H5Pff_F90_f90.html b/fortran/doc/DevelGuide/src/H5Pff_F90_f90.html
deleted file mode 100644
index 5f8d579..0000000
--- a/fortran/doc/DevelGuide/src/H5Pff_F90_f90.html
+++ /dev/null
@@ -1,715 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/H5Pff_F90.f90</title>
-<!-- Source: ./src/H5Pff_F90.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="ROBODoc2fH5P20285fF9029"></a>
-<a name="robo60"></a><h2>H5P (_F90)</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  H5P_PROVISIONAL
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  This file contains Fortran 90 interfaces for H5P functions. It contains
-  the same functions as <a href="./H5Pff_F03_f90.html#robo_top_of_doc">H5Pff_F03.f90</a> but excludes the Fortran 2003 functions
-  and the interface listings. This file will be compiled instead of <a href="./H5Pff_F03_f90.html#robo_top_of_doc">H5Pff_F03.f90</a>
-  if Fortran 2003 functions are not enabled.
-</pre>
-<p class="item_name">NOTES</p>
-<pre>                         *** IMPORTANT ***
-  If you add a new H5P function you must add the function name to the
-  Windows dll file 'hdf5_fortrandll.def' in the fortran/src directory.
-  This is needed for Windows based operating systems.
-</pre>
-
-<hr />
-<a name="H5P2028F90292fh5pcreate5fclass5ff"></a>
-<a name="robo206"></a><h2>h5pcreate_class_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="./H5Pff_f90.html#robo62">H5P (F90)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pcreate_class_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Create a new property list class
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  parent        - Property list identifier of the parent class
-                  Possible values include:
-                    H5P_ROOT_F
-                    H5P_FILE_CREATE_F
-                    H5P_FILE_ACCESS_F
-                    H5P_DATASET_CREATE_F
-                    H5P_DATASET_XFER_F
-                    H5P_FILE_MOUNT_F
-  name          - name of the class we are creating
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  class         - property list class identifier
-  hdferr        - error code
-                   Success: 0
-                   Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 9, 2002
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pcreate_class_f</strong><span class="sign">(</span>parent<span class="sign">,</span> name<span class="sign">,</span> class<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> parent  <span class="sign">!</span> parent property list class
-                                          <span class="sign">!</span> identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name  <span class="sign">!</span> name of property tocreate
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> class  <span class="sign">!</span> property list class identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5P2028F90292fh5pget5fchar"></a>
-<a name="robo219"></a><h2>h5pget_char</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="./H5Pff_f90.html#robo62">H5P (F90)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pget_char</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Gets a property list value
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id        - iproperty list identifier to modify
-  name          - name of property to modify
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  value         - value of property
-  hdferr        - error code
-                   Success:  0
-                   Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 9, 2002
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pget_char</strong><span class="sign">(</span>prp_id<span class="sign">,</span> name<span class="sign">,</span> value<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id     <span class="sign">!</span> Property list identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name     <span class="sign">!</span> Name of property to modify
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span>   INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> value <span class="sign">!</span> Property value
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr           <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5P2028F90292fh5pget5fdouble"></a>
-<a name="robo229"></a><h2>h5pget_double</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="./H5Pff_f90.html#robo62">H5P (F90)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pget_double</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Gets a property list value
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id        - iproperty list identifier to modify
-  name          - name of property to modify
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  value         - value of property
-  hdferr        - error code
-                   Success:  0
-                   Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 9, 2002
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pget_double</strong><span class="sign">(</span>prp_id<span class="sign">,</span> name<span class="sign">,</span> value<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id     <span class="sign">!</span> Property list identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name     <span class="sign">!</span> Name of property to modify
-    DOUBLE PRECISION<span class="sign">,</span>   INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> value <span class="sign">!</span> Property value
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr           <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5P2028F90292fh5pget5finteger"></a>
-<a name="robo248"></a><h2>h5pget_integer</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="./H5Pff_f90.html#robo62">H5P (F90)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pget_integer</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Gets a property list value
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id        - iproperty list identifier to modify
-  name          - name of property to modify
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  value         - value of property
-  hdferr        - error code
-                   Success:  0
-                   Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 9, 2002
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pget_integer</strong><span class="sign">(</span>prp_id<span class="sign">,</span> name<span class="sign">,</span> value<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id  <span class="sign">!</span> Property list identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name  <span class="sign">!</span> Name of property to modify
-    INTEGER<span class="sign">,</span>   INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> value       <span class="sign">!</span> Property value
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5P2028F90292fh5pget5freal"></a>
-<a name="robo260"></a><h2>h5pget_real</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="./H5Pff_f90.html#robo62">H5P (F90)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pget_real</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Gets a property list value
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id        - iproperty list identifier to modify
-  name          - name of property to modify
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  value         - value of property
-  hdferr        - error code
-                   Success:  0
-                   Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 9, 2002
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pget_real</strong><span class="sign">(</span>prp_id<span class="sign">,</span> name<span class="sign">,</span> value<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id  <span class="sign">!</span> Property list identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name  <span class="sign">!</span> Name of property to modify
-    REAL<span class="sign">,</span>   INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> value          <span class="sign">!</span> Property value
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5P2028F90292fh5pinsert5fchar"></a>
-<a name="robo272"></a><h2>h5pinsert_char</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="./H5Pff_f90.html#robo62">H5P (F90)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pinsert_char</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Registers a temporary property with a property list class.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  plist         - property list identifier
-                  permanent property within
-  name          - name of property to insert
-  size          - size of property in bytes
-  value         - initial value for the property
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - error code
-                   Success:  0
-                   Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 10, 2002
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">SUBROUTINE <strong>h5pinsert_char</strong><span class="sign">(</span>plist<span class="sign">,</span> name<span class="sign">,</span> size<span class="sign">,</span> value<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> plist      <span class="sign">!</span> Property list identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name     <span class="sign">!</span> Name of property to insert
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> size      <span class="sign">!</span> Size of property value
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span>   INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> value  <span class="sign">!</span> Property value
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr           <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5P2028F90292fh5pinsert5fdouble"></a>
-<a name="robo275"></a><h2>h5pinsert_double</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="./H5Pff_f90.html#robo62">H5P (F90)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pinsert_double</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Registers a temporary property with a property list class.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  plist         - property list identifier
-                  permanent property within
-  name          - name of property to insert
-  size          - size of property in bytes
-  value         - initial value for the property
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - error code
-                   Success:  0
-                   Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 10, 2002
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pinsert_double</strong><span class="sign">(</span>plist<span class="sign">,</span> name<span class="sign">,</span> size<span class="sign">,</span> value<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> plist   <span class="sign">!</span> Property list identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name  <span class="sign">!</span> Name of property to insert
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> size   <span class="sign">!</span> Size of the property value
-    DOUBLE PRECISION<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> value <span class="sign">!</span> Property value
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5P2028F90292fh5pinsert5finteger"></a>
-<a name="robo277"></a><h2>h5pinsert_integer</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="./H5Pff_f90.html#robo62">H5P (F90)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pinsert_integer</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Registers a temporary property with a property list class.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  plist         - property list identifier
-  name          - name of property to insert
-  size          - size of property in bytes
-  value         - initial value for the property
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - error code
-                   Success:  0
-                   Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 10, 2002
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pinsert_integer</strong><span class="sign">(</span>plist<span class="sign">,</span> name<span class="sign">,</span> size<span class="sign">,</span> value<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> plist   <span class="sign">!</span> Property list identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name  <span class="sign">!</span> Name of property to insert
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> size   <span class="sign">!</span> Size of the property value
-    INTEGER<span class="sign">,</span>   INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> value        <span class="sign">!</span> Property value
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5P2028F90292fh5pinsert5freal"></a>
-<a name="robo279"></a><h2>h5pinsert_real</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="./H5Pff_f90.html#robo62">H5P (F90)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pinsert_real</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Registers a temporary property with a property list class.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  plist         - property list identifier
-                  permanent property within
-  name          - name of property to insert
-  size          - size of property in bytes
-  value         - initial value for the property
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - error code
-                   Success:  0
-                   Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 10, 2002
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pinsert_real</strong><span class="sign">(</span>plist<span class="sign">,</span> name<span class="sign">,</span> size<span class="sign">,</span> value<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> plist   <span class="sign">!</span> Property list identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name  <span class="sign">!</span> Name of property to insert
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> size   <span class="sign">!</span> Size of the property value
-    REAL<span class="sign">,</span>   INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> value           <span class="sign">!</span> Property value
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5P2028F90292fh5pregister5fchar"></a>
-<a name="robo284"></a><h2>h5pregister_char</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="./H5Pff_f90.html#robo62">H5P (F90)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pregister_char</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Registers a permanent property with a property list class.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  class         - property list class to register
-                  permanent property within
-  name          - name of property to register
-  size          - size of property in bytes
-  value         - default value for property in newly
-                  created property lists
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - error code
-                   Success:  0
-                   Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 10, 2002
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pregister_char</strong><span class="sign">(</span>class<span class="sign">,</span> name<span class="sign">,</span> size<span class="sign">,</span> value<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> class     <span class="sign">!</span> Property list class identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name    <span class="sign">!</span> Name of property to <span class="keyword">register</span>
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> size     <span class="sign">!</span> size of the property value
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span>   INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> value <span class="sign">!</span> Property value
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr          <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5P2028F90292fh5pregister5fdouble"></a>
-<a name="robo285"></a><h2>h5pregister_double</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="./H5Pff_f90.html#robo62">H5P (F90)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pregister_double</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Registers a permanent property with a property list class.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  class         - property list class to register
-                  permanent property within
-  name          - name of property to register
-  size          - size of property in bytes
-  value         - default value for property in newly
-                  created property lists
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - error code
-                   Success:  0
-                   Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 10, 2002
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pregister_double</strong><span class="sign">(</span>class<span class="sign">,</span> name<span class="sign">,</span> size<span class="sign">,</span> value<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> class     <span class="sign">!</span> Property list class identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name    <span class="sign">!</span> Name of property to <span class="keyword">register</span>
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> size     <span class="sign">!</span> Size of the property value
-    DOUBLE PRECISION<span class="sign">,</span>   INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> value <span class="sign">!</span> Property value
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr          <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5P2028F90292fh5pregister5finteger"></a>
-<a name="robo288"></a><h2>h5pregister_integer</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="./H5Pff_f90.html#robo62">H5P (F90)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pregister_integer</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Registers a permanent property with a property list class.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  class         - property list class to register
-  permanent property within
-  name          - name of property to register
-  size          - size of property in bytes
-  value         - default value for property in newly
-  created property lists
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - error code
-                   Success:  0
-                   Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 10, 2002
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pregister_integer</strong><span class="sign">(</span>class<span class="sign">,</span> name<span class="sign">,</span> size<span class="sign">,</span> value<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> class   <span class="sign">!</span> Property list class identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name  <span class="sign">!</span> Name of property to <span class="keyword">register</span>
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> size   <span class="sign">!</span> Size of the property value
-    INTEGER<span class="sign">,</span>   INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> value        <span class="sign">!</span> Property value
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5P2028F90292fh5pregister5freal"></a>
-<a name="robo290"></a><h2>h5pregister_real</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="./H5Pff_f90.html#robo62">H5P (F90)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pregister_real</strong>
-
- PURPOSE       Registers a permanent property with a property list class.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  class         - property list class to register
-                  permanent property within
-  name          - name of property to register
-  size          - size of property in bytes
-  value         - default value for property in newly
-                  created property lists
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - error code
-                   Success:  0
-                   Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 10, 2002
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pregister_real</strong><span class="sign">(</span>class<span class="sign">,</span> name<span class="sign">,</span> size<span class="sign">,</span> value<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> class   <span class="sign">!</span> Property list class identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name  <span class="sign">!</span> Name of property to <span class="keyword">register</span>
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> size   <span class="sign">!</span> size of the property value
-    REAL<span class="sign">,</span>   INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> value           <span class="sign">!</span> Property value
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5P2028F90292fh5pset28get29fill5fvalue5ff"></a>
-<a name="robo295"></a><h2>h5pset(get)fill_value_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="./H5Pff_f90.html#robo62">H5P (F90)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pset(get)fill_value_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets(gets) fill value for a dataset creation property list
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id        - dataset creation property list identifier
-  type_id       - datatype identifier for fill value
-  fillvalue     - fill value
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  type_id      - datatype identifier for fill value
-  fillvalue    - fill value
-  hdferr       - error code
-                  Success:  0
-                  Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 14, 2001
-</pre>
-<p class="item_name">NOTES</p>
-<pre>  <strong>h5pset(get)fill_value_f</strong> function is overloaded to support
-  INTEGER, REAL, DOUBLE PRECISION and CHARACTER dtatypes.
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE h5pset_fill_value_integer<span class="sign">(</span>prp_id<span class="sign">,</span> type_id<span class="sign">,</span> fillvalue<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id  <span class="sign">!</span> Property list identifier
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id <span class="sign">!</span> Datatype identifier of
-                                          <span class="sign">!</span> of fillvalue datatype
-                                          <span class="sign">!</span> <span class="sign">(</span>in memory<span class="sign">)</span>
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> fillvalue      <span class="sign">!</span> Fillvalue
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5P2028F90292fh5pset5fchar"></a>
-<a name="robo304"></a><h2>h5pset_char</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="./H5Pff_f90.html#robo62">H5P (F90)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pset_char</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets a property list value
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id        - iproperty list identifier to modify
-  name          - name of property to modify
-  value         - value to set property to
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - error code
-                   Success:  0
-                   Failure: -1
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  NONE
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 9, 2002
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pset_char</strong><span class="sign">(</span>prp_id<span class="sign">,</span> name<span class="sign">,</span> value<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id    <span class="sign">!</span> Property list identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name    <span class="sign">!</span> Name of property to modify
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span>   INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> value <span class="sign">!</span> Property value
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr          <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5P2028F90292fh5pset5fdouble"></a>
-<a name="robo312"></a><h2>h5pset_double</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="./H5Pff_f90.html#robo62">H5P (F90)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pset_double</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets a property list value
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id        - iproperty list identifier to modify
-  name          - name of property to modify
-  value         - value to set property to
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr:       - error code
-                   Success:  0
-                   Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 9, 2002
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pset_double</strong><span class="sign">(</span>prp_id<span class="sign">,</span> name<span class="sign">,</span> value<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id    <span class="sign">!</span> Property list identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name    <span class="sign">!</span> Name of property to modify
-    DOUBLE PRECISION<span class="sign">,</span>   INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> value <span class="sign">!</span> Property value
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr          <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5P2028F90292fh5pset5finteger"></a>
-<a name="robo333"></a><h2>h5pset_integer</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="./H5Pff_f90.html#robo62">H5P (F90)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pset_integer</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets a property list value
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id        - iproperty list identifier to modify
-  name          - name of property to modify
-  value         - value to set property to
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr:       - error code
-                   Success:  0
-                   Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 9, 2002
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pset_integer</strong><span class="sign">(</span>prp_id<span class="sign">,</span> name<span class="sign">,</span> value<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id  <span class="sign">!</span> Property list identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name  <span class="sign">!</span> Name of property to modify
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> value          <span class="sign">!</span> Property value
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5P2028F90292fh5pset5freal"></a>
-<a name="robo346"></a><h2>h5pset_real</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="./H5Pff_f90.html#robo62">H5P (F90)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pset_real</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets a property list value
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id        - iproperty list identifier to modify
-  name          - name of property to modify
-  value         - value to set property to
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr:       - error code
-                   Success:  0
-                   Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 9, 2002
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pset_real</strong><span class="sign">(</span>prp_id<span class="sign">,</span> name<span class="sign">,</span> value<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id  <span class="sign">!</span> Property list identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name  <span class="sign">!</span> Name of property to modify
-    REAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> value             <span class="sign">!</span> Property value
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/H5Pff_F90.f90 on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/H5Pff_f90.html b/fortran/doc/DevelGuide/src/H5Pff_f90.html
deleted file mode 100644
index 0e9ff5c..0000000
--- a/fortran/doc/DevelGuide/src/H5Pff_f90.html
+++ /dev/null
@@ -1,4752 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/H5Pff.f90</title>
-<!-- Source: ./src/H5Pff.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="ROBODoc2fH5P2028F9029"></a>
-<a name="robo62"></a><h2>H5P (F90)</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  H5P_PROVISIONAL
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  This file contains Fortran interfaces for H5P functions. It includes
-  all the functions that are independent on whether the Fortran 2003 functions
-  are enabled or disabled.
-</pre>
-<p class="item_name">NOTES</p>
-<pre>                         *** IMPORTANT ***
-  If you add a new H5P function you must add the function name to the
-  Windows dll file 'hdf5_fortrandll.def' in the fortran/src directory.
-  This is needed for Windows based operating systems.
-</pre>
-
-<hr />
-<a name="H5P2f20h5pget5fhyper5fvector5fsize5ff"></a>
-<a name="robo81"></a><h2> h5pget_hyper_vector_size_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  h5pget_hyper_vector_size_f 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Get the number of "I/O" vectors (vector size)
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  plist_id     - dataset transfer property list identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  size         - vector size
-  hdferr       - error code            
-                  Success:  0
-                  Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 7, 2002      
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE h5pget_hyper_vector_size_f<span class="sign">(</span>plist_id<span class="sign">,</span> size<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> plist_id <span class="sign">!</span> Dataset transfer property list identifier 
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> size   <span class="sign">!</span> Vector size
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code
-                                           <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2f20h5pset5ffamily5foffset5ff"></a>
-<a name="robo82"></a><h2> h5pset_family_offset_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  h5pset_family_offset_f 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets offset for family file driver.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id       - file creation property list identifier
-  offset       - file offset
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr       - error code            
-                  Success:  0
-                  Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  19 March 2003
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE h5pset_family_offset_f<span class="sign">(</span>prp_id<span class="sign">,</span> offset<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id   <span class="sign">!</span> Property list identifier 
-    INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> offset <span class="sign">!</span> Offset in bytes
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code
-                                           <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2f20h5pset5ffapl5ffamily5ff"></a>
-<a name="robo83"></a><h2> h5pset_fapl_family_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>   h5pset_fapl_family_f 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets the file access property list to use the family driver. 
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id       - file access property list identifier
-  memb_size    - size in bytes of each file member 
-  memb_plist   - identifier of the file access property 
-                 list to be used for each family member
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr  - error code         
-             Success:  0
-             Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999      
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for 
-  called C functions (it is needed for Windows
-  port).  March 14, 2001 
-               
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE h5pset_fapl_family_f<span class="sign">(</span>prp_id<span class="sign">,</span> memb_size<span class="sign">,</span> memb_plist <span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id      <span class="sign">!</span> Property list identifier 
-    INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> memb_size <span class="sign">!</span> Logical size<span class="sign">,</span> in bytes<span class="sign">,</span>
-                                              <span class="sign">!</span> of each family member
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> memb_plist  <span class="sign">!</span> Identifier of the file 
-                                              <span class="sign">!</span> access property list <span class="keyword">for</span> 
-                                              <span class="sign">!</span> each member of the family
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr            <span class="sign">!</span> Error code
-                                              <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2f20h5pset5fmeta5fblock5fsize5ff"></a>
-<a name="robo84"></a><h2> h5pset_meta_block_size_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  h5pset_meta_block_size_f 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets the minimum size of metadata block allocations 
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  plist_id     - file access property list identifier
-  size         - metatdata block size
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr       - error code            
-                  Success:  0
-                  Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 7, 2002      
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE h5pset_meta_block_size_f<span class="sign">(</span>plist_id<span class="sign">,</span> size<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> plist_id  <span class="sign">!</span> File access property list identifier 
-    INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> size    <span class="sign">!</span> Block size in bytes<span class="sign">;</span> 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr          <span class="sign">!</span> Error code
-                                            <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pall5ffilters5favail5ff"></a>
-<a name="robo200"></a><h2>h5pall_filters_avail_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pall_filters_avail_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Checks if all filters set in the dataset creation
-  property list are available
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id       - data creation property list identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  flag         - .TRUE. if all filters are available
-                 .FALSE. otherwise
-  hdferr       - error code            
-                  Success:  0
-                  Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  April 10 2003
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pall_filters_avail_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> flag<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id <span class="sign">!</span> Dataset creation property 
-                                         <span class="sign">!</span>  list identifier 
-    LOGICAL<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> flag         <span class="sign">!</span> <span class="sign">.</span>TRUE<span class="sign">.</span> <span class="keyword">if</span> all filters are available
-                                         <span class="sign">!</span> <span class="sign">.</span>FALSE<span class="sign">.</span> otherwise
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code
-                                         <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pclose5fclass5ff"></a>
-<a name="robo201"></a><h2>h5pclose_class_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pclose_class_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Closes an existing property list class.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  class        - Property list class identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr       - error code         
-                  Success: 0 
-                  Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 9, 2002      
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pclose_class_f</strong><span class="sign">(</span>class<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> class <span class="sign">!</span> Property list class identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr      <span class="sign">!</span> Error code
-                                        <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pclose5ff"></a>
-<a name="robo202"></a><h2>h5pclose_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pclose_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Terminates access to a property list. 
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id - identifier of the property list to 
-           terminate access to. 
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr - error code          
-           Success:  0
-           Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999      
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for 
-  called C functions (it is needed for Windows
-  port).  March 14, 2001 
-               
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pclose_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id  <span class="sign">!</span> Property list identifier 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-                                          <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pcopy5ff"></a>
-<a name="robo203"></a><h2>h5pcopy_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pcopy_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Copies an existing property list to create a new 
-  property list
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id       - property list identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  new_prp_id   - new property list identifier
-  hdferr:      - error code            
-                  Success:  0
-                  Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999      
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for 
-  called C functions (it is needed for Windows
-  port).  March 14, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pcopy_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> new_prp_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id      <span class="sign">!</span> Property list identifier 
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> new_prp_id <span class="sign">!</span> Identifier of property list
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr            <span class="sign">!</span> Error code
-                                              <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pcopy5fprop5ff"></a>
-<a name="robo204"></a><h2>h5pcopy_prop_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>   <strong>h5pcopy_prop_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Copies a property from one list or class to another.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  dst_id               - Identifier of the destination property list
-  src_id               - Identifier of the source property list 
-  name                 - name of the property to copy
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr:              - error code
-                          Success: 0 
-                          Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 9, 2002      
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pcopy_prop_f</strong><span class="sign">(</span>dst_id<span class="sign">,</span> src_id<span class="sign">,</span> name<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> dst_id  <span class="sign">!</span> Destination property list 
-                                          <span class="sign">!</span> identifier 
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> src_id  <span class="sign">!</span> Source property list identifier 
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name  <span class="sign">!</span> Property name
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-                                          <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pcreate5ff"></a>
-<a name="robo207"></a><h2>h5pcreate_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>   <strong>h5pcreate_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>       Creates a new property as an instance of a property 
-       list class.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  class  - type of the property class to be created.
-           Possible values are:
-             H5P_FILE_CREATE_F
-             H5P_FILE_ACCESS_F
-             H5P_DATASET_CREATE_F
-             H5P_DATASET_XFER_F
-             H5P_FILE_MOUNT_F
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  prp_id - property list identifier
-  hdferr - error code          
-            Success:  0
-            Failure: -1 
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999      
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for 
-  called C functions (it is needed for Windows
-  port).  March 14, 2001 
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pcreate_f</strong><span class="sign">(</span>class<span class="sign">,</span> prp_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> class   <span class="sign">!</span> The type of the property list 
-                                          <span class="sign">!</span> to be created<span class="sign">.</span> Possible values are<span class="sign">:</span> 
-                                          <span class="sign">!</span>  H5P_FILE_CREATE_F
-                                          <span class="sign">!</span>  H5P_FILE_ACCESS_F
-                                          <span class="sign">!</span>  H5P_DATASET_CREATE_F
-                                          <span class="sign">!</span>  H5P_DATASET_XFER_F
-                                          <span class="sign">!</span>  H5P_FILE_MOUNT_F
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id <span class="sign">!</span> Property list identifier 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-                                          <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pequal5ff"></a>
-<a name="robo208"></a><h2>h5pequal_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pequal_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Checks if two property lists are eqaul
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  plist1_id    - property list identifier
-  plist2_id    - property list identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  flag         - flag, possible values
-                   .TRUE. or .FALSE.
-  hdferr:      - error code            
-                  Success:  0
-                  Failure: -1, flag is set to .FALSE.   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  September 30, 2002   
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pequal_f</strong><span class="sign">(</span>plist1_id<span class="sign">,</span> plist2_id<span class="sign">,</span> flag<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> plist1_id <span class="sign">!</span> Property list identifier 
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> plist2_id <span class="sign">!</span> Property list identifier 
-    LOGICAL<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span>       <span class="sign">:</span><span class="sign">:</span> flag      <span class="sign">!</span> Flag
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span>       <span class="sign">:</span><span class="sign">:</span> hdferr    <span class="sign">!</span> Error code
-                                            <span class="sign">!</span>  0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pexist5ff"></a>
-<a name="robo209"></a><h2>h5pexist_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>   <strong>h5pexist_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Queries whether a property name exists in a property list or class. 
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id       - property list identifier to query
-  name         - name of property to check for
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  flag         - logical flag
-  hdferr       - error code            
-                  Success:  0
-                  Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 9, 2002      
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pexist_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> name<span class="sign">,</span> flag<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id  <span class="sign">!</span> Property list identifier 
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name  <span class="sign">!</span> Name of property to modify
-    LOGICAL<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> flag          <span class="sign">!</span> <span class="sign">.</span>TRUE<span class="sign">.</span> <span class="keyword">if</span> exists<span class="sign">,</span> <span class="sign">.</span>FALSE<span class="sign">.</span> otherwise
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr  <span class="sign">!</span> Error code
-                                    <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pfill5fvalue5fdefined5ff"></a>
-<a name="robo210"></a><h2>h5pfill_value_defined_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pfill_value_defined_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Check if fill value is defined.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  plist_id     - dataset creation property list identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  flag         - fill value status flag
-                 Possible values are:
-                   H5D_FILL_VALUE_ERROR_F
-                   H5D_FILL_VALUE_UNDEFINED_F
-                   H5D_FILL_VALUE_DEFAULT_F
-                   H5D_FILL_VALUE_USER_DEFINED_F
-  hdferr       - error code            
-                   Success:  0
-                   Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 4, 2002
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pfill_value_defined_f</strong><span class="sign">(</span>plist_id<span class="sign">,</span> flag<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> plist_id  <span class="sign">!</span> Dataset creation property list identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> flag            <span class="sign">!</span> Fill value status flag
-                                            <span class="sign">!</span>  H5D_FILL_VALUE_ERROR_F
-                                            <span class="sign">!</span>  H5D_FILL_VALUE_UNDEFINED_F
-                                            <span class="sign">!</span>  H5D_FILL_VALUE_DEFAULT_F
-                                            <span class="sign">!</span>  H5D_FILL_VALUE_USER_DEFINED_F
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr          <span class="sign">!</span> Error code
-                                            <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pget5falignment5ff"></a>
-<a name="robo211"></a><h2>h5pget_alignment_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>   <strong>h5pget_alignment_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Retrieves the current settings for alignment 
-  properties from a file access property list. 
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id       - file access property list identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  threshold    - threshold value       
-  alignment    - alignment value
-  hdferr       - error code            
-                  Success:  0
-                  Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999      
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for 
-  called C functions (it is needed for Windows
-  port).  March 14, 2001 
-               
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pget_alignment_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> threshold<span class="sign">,</span>  alignment<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id       <span class="sign">!</span> Property list identifier 
-    INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> threshold <span class="sign">!</span> Threshold value
-    INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> alignment <span class="sign">!</span> alignment value
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr             <span class="sign">!</span> Error code
-                                             <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pget5falloc5ftime5ff"></a>
-<a name="robo212"></a><h2>h5pget_alloc_time_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pget_alloc_time_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Get space allocation time for dataset during creation.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  plist_id     - dataset creation property list identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  flag         - allocation time flag:
-                   H5D_ALLOC_TIME_ERROR_F
-                   H5D_ALLOC_TIME_DEFAULT_F
-                   H5D_ALLOC_TIME_EARLY_F
-                   H5D_ALLOC_TIME_LATE_F
-                   H5D_ALLOC_TIME_INCR_F
-  hdferr:      - error code            
-                   Success:  0
-                   Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 4, 2002      
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pget_alloc_time_f</strong><span class="sign">(</span>plist_id<span class="sign">,</span> flag<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> plist_id  <span class="sign">!</span> Dataset creation property list identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> flag   <span class="sign">!</span> Allocation time flag<span class="sign">:</span>
-                                   <span class="sign">!</span>  H5D_ALLOC_TIME_ERROR_F
-                                   <span class="sign">!</span>  H5D_ALLOC_TIME_DEFAULT_F
-                                   <span class="sign">!</span>  H5D_ALLOC_TIME_EARLY_F
-                                   <span class="sign">!</span>  H5D_ALLOC_TIME_LATE_F
-                                   <span class="sign">!</span>  H5D_ALLOC_TIME_INCR_F
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr <span class="sign">!</span> Error code
-                                   <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fH5Pget5fattr5fcreation5forder5ff"></a>
-<a name="robo213"></a><h2>H5Pget_attr_creation_order_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>H5Pget_attr_creation_order_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Retrieves tracking and indexing settings for attribute creation order
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  ocpl_id         - Object (group or dataset) creation property list identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  crt_order_flags - Flags specifying whether to track and index attribute creation order
-  hdferr          - Error code         
-                       Success:  0
-                       Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  February, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE h5pget_attr_creation_order_f<span class="sign">(</span>ocpl_id<span class="sign">,</span> crt_order_flags<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> ocpl_id   <span class="sign">!</span> Object <span class="sign">(</span>group or dataset<span class="sign">)</span> creation property list identifier 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> crt_order_flags <span class="sign">!</span> Flags specifying whether to track and index attribute creation order 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr   <span class="sign">!</span> Error code
-                                     <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fH5Pget5fattr5fphase5fchange5ff"></a>
-<a name="robo214"></a><h2>H5Pget_attr_phase_change_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>H5Pget_attr_phase_change_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Retrieves attribute storage phase change thresholds 
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  ocpl_id         - Object (dataset or group) creation property list identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  max_compact     - Maximum number of attributes to be stored in compact storage
-                    (Default: 8)
-  min_dense       - Minimum number of attributes to be stored in dense storage
-                    (Default: 6)
-  hdferr          - Error code         
-                     Success:  0
-                     Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  January, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE h5pget_attr_phase_change_f<span class="sign">(</span>ocpl_id<span class="sign">,</span> max_compact<span class="sign">,</span> min_dense<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> ocpl_id <span class="sign">!</span> Object <span class="sign">(</span>dataset or group<span class="sign">)</span> creation property list identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> max_compact   <span class="sign">!</span> Maximum number of attributes to be stored in compact storage
-                                          <span class="sign">!</span> <span class="sign">(</span>Default<span class="sign">:</span> 8<span class="sign">)</span>
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> min_dense     <span class="sign">!</span> Minimum number of attributes to be stored in dense storage
-                                          <span class="sign">!</span> <span class="sign">(</span>Default<span class="sign">:</span> 6<span class="sign">)</span>
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-                                          <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pget5fbtree5fratios5ff"></a>
-<a name="robo215"></a><h2>h5pget_btree_ratios_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pget_btree_ratios_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Gets B-tree split ratios for a dataset transfer property list
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id       - the dataset transfer property list 
-                 identifier 
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  left         - the B-tree split ratio for left-most nodes 
-  middle       - the B-tree split ratio for all other nodes
-  right        - the B-tree split ratio for right-most nodes
-  hdferr       - error code            
-                  Success:  0
-                  Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999      
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for 
-  called C functions (it is needed for Windows
-  port).  March 14, 2001 
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pget_btree_ratios_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> left<span class="sign">,</span> middle<span class="sign">,</span> right<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id <span class="sign">!</span> Property list identifier
-    REAL<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> left   <span class="sign">!</span> The B<span class="sign">-</span>tree split ratio <span class="keyword">for</span> left<span class="sign">-</span>most nodes<span class="sign">.</span>
-    REAL<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> middle <span class="sign">!</span> The B<span class="sign">-</span>tree split ratio <span class="keyword">for</span> all other nodes 
-    REAL<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> right  <span class="sign">!</span> The B<span class="sign">-</span>tree split ratio <span class="keyword">for</span> right<span class="sign">-</span>most 
-                                <span class="sign">!</span>  nodes and lone nodes<span class="sign">.</span>
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr  <span class="sign">!</span> Error code
-                                    <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pget5fbuffer5ff"></a>
-<a name="robo216"></a><h2>h5pget_buffer_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pget_buffer_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Gets size for conversion buffer
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  plist_id     - data transfer property list identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  size         - buffer size 
-  hdferr       - error code            
-                  Success:  0
-                  Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 2, 2002      
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pget_buffer_f</strong><span class="sign">(</span>plist_id<span class="sign">,</span> size<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> plist_id <span class="sign">!</span> Data transfer property list identifier 
-    INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> size  <span class="sign">!</span> Buffer size in bytes<span class="sign">;</span> 
-                                           <span class="sign">!</span>  buffer is allocated and freed by 
-                                           <span class="sign">!</span>  the library<span class="sign">.</span>
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span>       <span class="sign">:</span><span class="sign">:</span> hdferr   <span class="sign">!</span> Error code
-                                           <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pget5fcache5ff"></a>
-<a name="robo217"></a><h2>h5pget_cache_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>   <strong>h5pget_cache_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Queries the meta data cache and raw data chunk cache 
-  parameters.  
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id       - file access property list identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  mdc_nelmts   - number of elements (objects) in the meta 
-                 data cache 
-  rdcc_nelmts  - number of elements (objects) in the raw 
-                 data chunk cache 
-  rdcc_nbytes  - total size of the raw data chunk cache, in bytes 
-  rdcc_w0      - preemption policy (0 or 1)
-  hdferr       - error code            
-                  Success:  0
-                  Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999      
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for 
-  called C functions (it is needed for Windows
-  port).  March 14, 2001 
-
-  Bug fix: type of the rdcc_nelmts parameter should be INTEGER
-  instead of INTEGER(SIZE_T) October 10, 2003 
-               
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pget_cache_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> mdc_nelmts<span class="sign">,</span> rdcc_nelmts<span class="sign">,</span> rdcc_nbytes<span class="sign">,</span> rdcc_w0<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id <span class="sign">!</span> Property list identifier 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> mdc_nelmts   <span class="sign">!</span> Number of elements <span class="sign">(</span>objects<span class="sign">)</span>
-                                         <span class="sign">!</span>  in the meta data cache
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> rdcc_nelmts  <span class="sign">!</span> Number of elements <span class="sign">(</span>objects<span class="sign">)</span>
-                                                 <span class="sign">!</span>  in the meta data cache
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> rdcc_nbytes  <span class="sign">!</span> Total size of the raw data 
-                                                 <span class="sign">!</span>  chunk cache<span class="sign">,</span> in bytes 
-    REAL<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> rdcc_w0                 <span class="sign">!</span> Preemption policy
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr               <span class="sign">!</span> Error code
-                                                 <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fH5Pget5fchar5fencoding5ff"></a>
-<a name="robo220"></a><h2>H5Pget_char_encoding_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>H5Pget_char_encoding_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Retrieves the character encoding used to create a string
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  plist_id - Property list identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  encoding - Valid values for encoding are:
-               H5T_CSET_ASCII_F -&gt; US ASCII
-               H5T_CSET_UTF8_F -&gt; UTF-8 Unicode encoding
-  hdferr   - Error code                
-               Success:  0
-               Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  March 3, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE  h5pget_char_encoding_f<span class="sign">(</span>plist_id<span class="sign">,</span> encoding<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> plist_id <span class="sign">!</span> Property list identifier
-
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> encoding       <span class="sign">!</span> Valid values <span class="keyword">for</span> encoding are<span class="sign">:</span>
-                                           <span class="sign">!</span>  H5T_CSET_ASCII_F <span class="sign">-</span><span class="sign">&gt;</span> US ASCII
-                                           <span class="sign">!</span>  H5T_CSET_UTF8_F  <span class="sign">-</span><span class="sign">&gt;</span> UTF<span class="sign">-</span>8 Unicode encoding
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr   <span class="sign">!</span> Error code
-                                     <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fH5Pget5fchunk5fcache5ff"></a>
-<a name="robo221"></a><h2>H5Pget_chunk_cache_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>H5Pget_chunk_cache_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Retrieves the maximum possible number of elements in the meta
-  data cache and the maximum possible number of elements and
-  bytes and the RDCC_W0 value in the raw data chunk cache.  Any
-  (or all) arguments may be null pointers in which case the
-  corresponding datum is not returned.  If these properties have
-  not been set on this property list, the default values for a
-  file access property list are returned.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  dapl_id            - Dataset access property list identifier.
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  rdcc_nslots        - Number of chunk slots in the raw data chunk cache hash table. 
-  rdcc_nbytes        - Total size of the raw data chunk cache, in bytes. 
-  rdcc_w0            - Preemption policy. 
-  hdferr             - Error code              
-                        Success:  0
-                        Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  April 13, 2009
-</pre>
-<p class="item_name">HISTORY</p>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE h5pget_chunk_cache_f<span class="sign">(</span>dapl_id<span class="sign">,</span> rdcc_nslots<span class="sign">,</span> rdcc_nbytes<span class="sign">,</span> rdcc_w0<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> dapl_id       <span class="sign">!</span> Dataset access property list identifier<span class="sign">.</span>
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> rdcc_nslots <span class="sign">!</span> Number of chunk slots in the raw data chunk cache hash table<span class="sign">.</span>
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> rdcc_nbytes <span class="sign">!</span> Total size of the raw data chunk cache<span class="sign">,</span> in bytes<span class="sign">.</span> 
-    REAL<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> rdcc_w0                <span class="sign">!</span> Preemption policy<span class="sign">.</span>
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr              <span class="sign">!</span> Error code<span class="sign">:</span>
-                                                <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pget5fchunk5ff"></a>
-<a name="robo222"></a><h2>h5pget_chunk_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>   <strong>h5pget_chunk_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Retrieves the size of chunks for the raw data of a 
-  chunked layout dataset
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id       - property list identifier
-  ndims        - size of dims array
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  dims         - array with dimension sizes for each chunk
-  hdferr       - error code            
-                  Success:  number of chunk dimensions
-                  Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999      
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for 
-  called C functions (it is needed for Windows
-  port).  March 14, 2001 
-               
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pget_chunk_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> ndims<span class="sign">,</span> dims<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id <span class="sign">!</span> Property list identifier 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> ndims         <span class="sign">!</span> Number of chunk dimensions to
-                                         <span class="sign">!</span> to <span class="keyword">return</span>
-    INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> DIMENSION<span class="sign">(</span>ndims<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> dims    
-                                         <span class="sign">!</span> Array containing sizes of
-                                         <span class="sign">!</span> chunk dimensions
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code<span class="sign">:</span>
-                                         <span class="sign">!</span>  number of chunk dimensions on success<span class="sign">,</span>
-                                         <span class="sign">!</span>  <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pget5fclass5ff"></a>
-<a name="robo223"></a><h2>h5pget_class_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pget_class_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Returns the property list class for a property list.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id       - property list identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  classtype    - property list class
-                 Possible values are:
-                  H5P_ROOT_F
-                  H5P_FILE_CREATE_F
-                  H5P_FILE_ACCESS_F
-                  H5PE_DATASET_CREATE_F
-                  H5P_DATASET_XFER_F
-                  H5P_FILE_MOUNT_F
-  hdferr:      - error code            
-                  Success:  0
-                  Failure: -1 
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999      
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for 
-  called C functions (it is needed for Windows
-  port).  March 14, 2001 
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pget_class_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> classtype<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id <span class="sign">!</span> Property list identifier 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> classtype    <span class="sign">!</span> The type of the property list 
-                                         <span class="sign">!</span> to be created<span class="sign">.</span> Possible values are<span class="sign">:</span> 
-                                         <span class="sign">!</span>  H5P_ROOT_F
-                                         <span class="sign">!</span>  H5P_FILE_CREATE_F
-                                         <span class="sign">!</span>  H5P_FILE_ACCESS_F
-                                         <span class="sign">!</span>  H5PE_DATASET_CREATE_F 
-                                         <span class="sign">!</span>  H5P_DATASET_XFER_F
-                                         <span class="sign">!</span>  H5P_FILE_MOUNT_F
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code
-                                         <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pget5fclass5fname5ff"></a>
-<a name="robo224"></a><h2>h5pget_class_name_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pget_class_name_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Queries the name of a class.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id       - property list identifier to query
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  name         - name of a class
-  size         - Actual length of the class name
-                   NOTE: If provided buffer "name" is smaller,
-                   than name will be truncated to fit into
-                   provided user buffer
-  hdferr:      - error code
-                  Success: 0
-                  Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 9, 2002      
-</pre>
-<p class="item_name">HISTORY</p>
-<pre> Returned the size of name as an argument      
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pget_class_name_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> name<span class="sign">,</span> size<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id  <span class="sign">!</span> Property list identifier 
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name <span class="sign">!</span> Buffer to retireve class name
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> size          <span class="sign">!</span> Actual length of the class name
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-                                          <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pget5fclass5fparent5ff"></a>
-<a name="robo225"></a><h2>h5pget_class_parent_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pget_class_parent_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Retrieves the parent class of a genric property class. 
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id       - property list identifier to query
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  parent_id    - identifier of the parent class
-  hdferr:      - error code          
-                  Success:  0
-                  Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 9, 2002      
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pget_class_parent_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> parent_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id     <span class="sign">!</span> Property list identifier 
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> parent_id <span class="sign">!</span> Parent class property list 
-                                             <span class="sign">!</span> identifier 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr  <span class="sign">!</span> Error code
-                                    <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pget5fcopy5fobject5ff"></a>
-<a name="robo226"></a><h2>h5pget_copy_object_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pget_copy_object_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Retrieves the properties to be used when an object is copied.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  ocp_plist_id - Object copy property list identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  copy_options - Copy option(s) to be get
-  hdferr       - Error code            
-                  Success:  0
-                  Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  March 3, 2008
-</pre>
-<p class="item_name">HISTORY</p>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pget_copy_object_f</strong><span class="sign">(</span>ocp_plist_id<span class="sign">,</span> copy_options<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> ocp_plist_id <span class="sign">!</span> Object copy property list identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> copy_options       <span class="sign">!</span> Valid copy options returned are<span class="sign">:</span>
-                                               <span class="sign">!</span>   H5O_COPY_SHALLOW_HIERARCHY_F
-                                               <span class="sign">!</span>   H5O_COPY_EXPAND_SOFT_LINK_F 
-                                               <span class="sign">!</span>   H5O_COPY_EXPAND_EXT_LINK_F
-                                               <span class="sign">!</span>   H5O_COPY_EXPAND_REFERENCE_F
-                                               <span class="sign">!</span>   H5O_COPY_WITHOUT_ATTR_FLAG_F
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr             <span class="sign">!</span> Error code
-                                               <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fH5Pget5fcreate5finter5fgroup5ff"></a>
-<a name="robo227"></a><h2>H5Pget_create_inter_group_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>H5Pget_create_inter_group_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Determines whether property is set to enable creating missing intermediate groups.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  lcpl_id            - Link creation property list identifier
-  crt_intermed_group - Specifying whether to create intermediate groups upon 
-                       the creation of an object
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr             - Error code              
-                        Success:  0
-                        Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  April 4, 2008
-</pre>
-<p class="item_name">HISTORY</p>
-<pre> The long subroutine name (&gt;31) on older f90 compilers causes problems
-          so the name was shortened
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE h5pget_create_inter_group_f<span class="sign">(</span>lcpl_id<span class="sign">,</span> crt_intermed_group<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> lcpl_id      <span class="sign">!</span> Link creation property list identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> crt_intermed_group  <span class="sign">!</span> Flag specifying whether to create intermediate groups
-                                               <span class="sign">!</span> upon creation of an object
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr             <span class="sign">!</span> Error code
-                                               <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pget5fdata5ftransform5ff"></a>
-<a name="robo228"></a><h2>h5pget_data_transform_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pget_data_transform_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Retrieves a data transform expression.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  plist_id   - Identifier of the property list or class
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  expression - buffer to hold transform expression
-  hdferr     - Error code
-                 Success:  Actual lenght of the expression
-                           If provided buffer "expression" is 
-                           smaller, than expression will be 
-                           truncated to fit into
-                           provided user buffer
-                 Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  March 19, 2008
-</pre>
-<p class="item_name">HISTORY</p>
-<pre> Should hdferr return just 0 or 1 and add another arguement for the size?
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">SUBROUTINE <strong>h5pget_data_transform_f</strong><span class="sign">(</span>plist_id<span class="sign">,</span> expression<span class="sign">,</span> hdferr<span class="sign">,</span> size<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> plist_id         <span class="sign">!</span> Identifier of the property list or class
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> expression    <span class="sign">!</span> Buffer to hold transform expression
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span><span class="sign">,</span> OPTIONAL <span class="sign">:</span><span class="sign">:</span> size <span class="sign">!</span> Registered size of the transform expression
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr                 <span class="sign">!</span> Error code
-                                                   <span class="sign">!</span>  0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pget5fdriver5ff"></a>
-<a name="robo230"></a><h2>h5pget_driver_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pget_driver_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Returns low-lever driver identifier. 
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id  - file access or data transfer property 
-            list identifier. 
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  driver  - low-level driver identifier
-  hdferr  - error code         
-             Success:  0
-             Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999      
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for 
-  called C functions (it is needed for Windows
-  port).  March 14, 2001 
-               
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pget_driver_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> driver<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id  <span class="sign">!</span> Property list identifier 
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> driver <span class="sign">!</span> Low<span class="sign">-</span>level file driver identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-                                          <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pget5fedc5fcheck5ff"></a>
-<a name="robo232"></a><h2>h5pget_edc_check_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pget_edc_check_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Queries error detecting  
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id       - dataset creation property list identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr       - error code            
-                  Success:  0
-                  Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  March 13, 2003
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pget_edc_check_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> flag<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id <span class="sign">!</span> Dataset transfer property list identifier 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> flag         <span class="sign">!</span> Checksum filter flag
-                                         <span class="sign">!</span> May have one of the following values<span class="sign">:</span>
-                                         <span class="sign">!</span>  H5Z_ERROR_EDC_F
-                                         <span class="sign">!</span>  H5Z_DISABLE_EDC_F
-                                         <span class="sign">!</span>  H5Z_ENABLE_EDC_F
-                                         <span class="sign">!</span>  H5Z_NO_EDC_F
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code
-                                         <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fH5Pget5fest5flink5finfo5ff"></a>
-<a name="robo233"></a><h2>H5Pget_est_link_info_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>H5Pget_est_link_info_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Queries data required to estimate required local heap or object header size.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  gcpl_id         - Group creation property list identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  est_num_entries - Estimated number of links to be inserted into group
-  est_name_len    - Estimated average length of link names
-  hdferr          - Error code
-                     Success:  0
-                     Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  March 21, 2008
-</pre>
-<p class="item_name">HISTORY</p>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE h5pget_est_link_info_f<span class="sign">(</span>gcpl_id<span class="sign">,</span> est_num_entries<span class="sign">,</span> est_name_len<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> gcpl_id   <span class="sign">!</span> Group creation property list identifier  
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> est_num_entries <span class="sign">!</span> Estimated number of links to be inserted into group
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> est_name_len    <span class="sign">!</span> Estimated average length of link names
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr          <span class="sign">!</span> Error code
-                                            <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pget5fexternal5fcount5ff"></a>
-<a name="robo234"></a><h2>h5pget_external_count_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>   <strong>h5pget_external_count_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Returns the number of external files for a dataset. 
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id       - dataset creation property list identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  count        - number of external files for the 
-                 specified dataset
-  hdferr       - error code            
-                   Success:  0
-                   Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999      
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for 
-  called C functions (it is needed for Windows
-  port).  March 14, 2001 
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pget_external_count_f</strong> <span class="sign">(</span>prp_id<span class="sign">,</span> count<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id <span class="sign">!</span> Property list identifier 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> count        <span class="sign">!</span> Number of external files <span class="keyword">for</span> the 
-                                         <span class="sign">!</span> Specified dataset
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code
-                                         <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pget5fexternal5ff"></a>
-<a name="robo235"></a><h2>h5pget_external_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pget_external_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Returns information about an external file. 
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id       - dataset creation property list identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  idx          - external file index 
-  name_size    - maximum size of name array
-  name         - name of the external file     
-  name         - name of external file
-  offset       - offset in bytes from the beginning of the 
-                 file to the location in the file
-                 where the data starts
-  bytes        - size of the external file data
-  hdferr       - error code            
-                  Success:  0
-                   Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999      
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for 
-  called C functions (it is needed for Windows
-  port).  March 14, 2001 
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pget_external_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> idx<span class="sign">,</span> name_size<span class="sign">,</span> name<span class="sign">,</span> offset<span class="sign">,</span>bytes<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id <span class="sign">!</span> Property list identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> idx           <span class="sign">!</span> External file index<span class="sign">.</span>
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name_size <span class="sign">!</span> Maximum length of name array 
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name    <span class="sign">!</span> Name of an external file
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> offset           <span class="sign">!</span> Offset<span class="sign">,</span> in bytes<span class="sign">,</span> from the beginning 
-                                             <span class="sign">!</span>  of the file to the location in the file 
-                                             <span class="sign">!</span>  where the data starts<span class="sign">.</span>
-    INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> bytes   <span class="sign">!</span> Number of bytes reserved in the 
-                                             <span class="sign">!</span>  file <span class="keyword">for</span> the data
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr           <span class="sign">!</span> Error code
-                                             <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pget5ffapl5fcore5ff"></a>
-<a name="robo236"></a><h2>h5pget_fapl_core_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>   <strong>h5pget_fapl_core_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Queries core file driver properties. 
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id        - file access property list identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  increment     - size, in bytes, of memory increments 
-  backing_store - boolean flag indicating whether to write 
-                  the file contents to disk when the file is closed. 
-  hdferr        - error code           
-                   Success:  0
-                   Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999      
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for 
-  called C functions (it is needed for Windows
-  port).  March 14, 2001 
-               
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pget_fapl_core_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> increment<span class="sign">,</span> backing_store<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id      <span class="sign">!</span> Property list identifier 
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> increment <span class="sign">!</span> File block size in bytes<span class="sign">.</span>
-    LOGICAL<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> backing_store   <span class="sign">!</span> Flag to indicate that
-                                            <span class="sign">!</span> entire file contents are flushed to a file 
-                                            <span class="sign">!</span> with the same name as this core file<span class="sign">.</span>
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr          <span class="sign">!</span> Error code
-                                            <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pget5ffapl5fdirect5ff"></a>
-<a name="robo237"></a><h2>h5pget_fapl_direct_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pget_fapl_direct_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Gets up use of the direct I/O driver.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  fapl_id      - File access property list identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  alignment    - Required memory alignment boundary
-  block_size   - File system block size
-  cbuf_size    - Copy buffer size
-  hdferr       - error code            
-                  Success:  0
-                  Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  March 21, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pget_fapl_direct_f</strong><span class="sign">(</span>fapl_id<span class="sign">,</span> alignment<span class="sign">,</span> block_size<span class="sign">,</span> cbuf_size<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE  
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> fapl_id       <span class="sign">!</span> File access property list identifier
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> alignment   <span class="sign">!</span> Required memory alignment boundary<span class="sign">!</span>
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> block_size  <span class="sign">!</span> File system block size
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> cbuf_size   <span class="sign">!</span> Copy buffer size
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr              <span class="sign">!</span> Error code
-                                                <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pget5ffapl5ffamily5ff"></a>
-<a name="robo238"></a><h2>h5pget_fapl_family_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pget_fapl_family_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Returns file access property list information.       
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id       - file access property list identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  memb_size    - size in bytes of each file member 
-  memb_plist   - identifier of the file access property 
-                 list to be used for each family member
-  hdferr       - error code            
-                  Success:  0
-                  Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999      
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for 
-  called C functions (it is needed for Windows
-  port).  March 14, 2001 
-               
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pget_fapl_family_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> memb_size<span class="sign">,</span> memb_plist <span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id       <span class="sign">!</span> Property list identifier 
-    INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> memb_size <span class="sign">!</span> Logical size<span class="sign">,</span> in bytes<span class="sign">,</span>
-                                               <span class="sign">!</span> of each family member
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> memb_plist  <span class="sign">!</span> Identifier of the file 
-                                               <span class="sign">!</span> access property list <span class="keyword">for</span> 
-                                               <span class="sign">!</span> each member of the family
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr             <span class="sign">!</span> Error code
-                                               <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pget5ffapl5fmulti5ff"></a>
-<a name="robo241"></a><h2>h5pget_fapl_multi_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pget_fapl_multi_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets up use of the multi-file driver. 
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id       - file creation property list identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  mem_map      - mapping array
-  memb_fapl    - property list for each memory usage type
-  memb_name    - names of member file
-  relax        - flag 
-  hdferr       - error code            
-                  Success:  0
-                  Failure: -1
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  maxlen_out   - maximum length for memb_name array element 
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  24 March 2003
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pget_fapl_multi_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> memb_map<span class="sign">,</span> memb_fapl<span class="sign">,</span> memb_name<span class="sign">,</span> memb_addr<span class="sign">,</span> relax<span class="sign">,</span> hdferr<span class="sign">,</span> maxlen_out<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id <span class="sign">!</span> File creation property list identifier 
-    INTEGER<span class="sign">,</span> DIMENSION<span class="sign">(</span>0<span class="sign">:</span>H5FD_MEM_NTYPES_F<span class="sign">-</span>1<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> memb_map
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> DIMENSION<span class="sign">(</span>0<span class="sign">:</span>H5FD_MEM_NTYPES_F<span class="sign">-</span>1<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> memb_fapl
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> DIMENSION<span class="sign">(</span>0<span class="sign">:</span>H5FD_MEM_NTYPES_F<span class="sign">-</span>1<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> memb_name
-    <span class="sign">!</span>INTEGER<span class="sign">(</span>HADDR_T<span class="sign">)</span><span class="sign">,</span> DIMENSION<span class="sign">(</span>0<span class="sign">:</span>H5FD_MEM_NTYPES_F<span class="sign">-</span>1<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> memb_addr
-    REAL<span class="sign">,</span> DIMENSION<span class="sign">(</span>0<span class="sign">:</span>H5FD_MEM_NTYPES_F<span class="sign">-</span>1<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> memb_addr
-    INTEGER<span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> maxlen_out 
-    LOGICAL<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> relax
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code
-                                         <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pget5ffclose5fdegree5ff"></a>
-<a name="robo242"></a><h2>h5pget_fclose_degree_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pget_fclose_degree_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Returns the degree for the file close behavior.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  fapl_id      - File access property list identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  degree       - Possible values are:
-                  H5F_CLOSE_DEFAULT_F
-                  H5F_CLOSE_WEAK_F
-                  H5F_CLOSE_SEMI_F
-                  H5F_CLOSE_STRONG_F
-  hdferr       - error code            
-                  Success:  0
-                  Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  September 26, 2002   
-</pre>
-<p class="item_name">HISTORY</p>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pget_fclose_degree_f</strong><span class="sign">(</span>fapl_id<span class="sign">,</span> degree<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> fapl_id <span class="sign">!</span> File Access Property list identifier 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> degree        <span class="sign">!</span> Possible values are<span class="sign">:</span> 
-                                          <span class="sign">!</span>  H5F_CLOSE_DEFAULT_F
-                                          <span class="sign">!</span>  H5F_CLOSE_WEAK_F
-                                          <span class="sign">!</span>  H5F_CLOSE_SEMI_F
-                                          <span class="sign">!</span>  H5F_CLOSE_STRONG_F
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-                                          <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pget5ffill5ftime5ff"></a>
-<a name="robo243"></a><h2>h5pget_fill_time_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>   <strong>h5pget_fill_time_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Get fill value writing time for dataset
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  plist_id     - dataset creation property list identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr:      - error code            
-                  Success:  0
-                  Failure: -1
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  flag         - fill time flag:
-                  H5D_FILL_TIME_ERROR_F
-                  H5D_FILL_TIME_ALLOC_F
-                  H5D_FILL_TIME_NEVER_F
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 4, 2002      
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pget_fill_time_f</strong><span class="sign">(</span>plist_id<span class="sign">,</span> flag<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> plist_id  <span class="sign">!</span> Dataset creation property list identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> flag   <span class="sign">!</span> Fill time flag<span class="sign">:</span>
-                                   <span class="sign">!</span>  H5D_FILL_TIME_ERROR_F
-                                   <span class="sign">!</span>  H5D_FILL_TIME_ALLOC_F
-                                   <span class="sign">!</span>  H5D_FILL_TIME_NEVER_F
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr <span class="sign">!</span> Error code
-                                   <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pget5ffilter5fby5fid5ff"></a>
-<a name="robo244"></a><h2>h5pget_filter_by_id_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pget_filter_by_id_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Returns information about a filter in a pipeline
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id       - data creation or transfer property list 
-                 identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  filter_id    - filter identifier
-  flags        - bit vector specifying certain general
-                 properties of the filter
-  cd_nelmts    - number of elements in cd_values
-  cd_values    - auxiliary data for the filter
-  namelen      - number of characters in the name buffer
-  name         - buffer to retrieve filter name
-  hdferr       - error code            
-                  Success:  0
-                  Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  April 10 2003
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pget_filter_by_id_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> filter_id<span class="sign">,</span> flags<span class="sign">,</span> cd_nelmts<span class="sign">,</span> cd_values<span class="sign">,</span> namelen<span class="sign">,</span> name<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id   <span class="sign">!</span> Property list identifier 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> filter_id       <span class="sign">!</span> Filter identifier
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>INOUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> cd_nelmts     <span class="sign">!</span> Number of elements in cd_values<span class="sign">.</span>
-    INTEGER<span class="sign">,</span> DIMENSION<span class="comment">(*), INTENT(OUT) :: cd_values ! Auxiliary data for the filter.
-    INTEGER, INTENT(OUT) :: flags          ! Bit vector specifying certain general
-                                           ! properties of the filter.
-    INTEGER(SIZE_T), INTENT(IN) :: namelen ! Anticipated number of characters in name.
-    CHARACTER(LEN=*)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name  <span class="sign">!</span> Name of the filter
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code
-                                           <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pget5ffilter5ff"></a>
-<a name="robo245"></a><h2>h5pget_filter_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>   <strong>h5pget_filter_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Returns information about a filter in a pipeline
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id        - data creation or transfer property list 
-                  identifier
-  filter_number - sequence number within the filter
-                  pipeline of the filter for which 
-                  information is sought
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  filter_id    - filter identification number
-  flags        - bit vector specifying certain general
-                 properties of the filter
-  cd_nelmts    - number of elements in cd_values
-  cd_values    - auxiliary data for the filter
-  namelen      - number of characters in the name buffer
-  name         - buffer to retrieve filter name
-  hdferr       - error code            
-                  Success:  0
-                  Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999      
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for 
-  called C functions (it is needed for Windows
-  port).  March 14, 2001 
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pget_filter_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> filter_number<span class="sign">,</span> flags<span class="sign">,</span> cd_nelmts<span class="sign">,</span> cd_values<span class="sign">,</span> namelen<span class="sign">,</span> name<span class="sign">,</span> filter_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id <span class="sign">!</span> Property list identifier 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> filter_number <span class="sign">!</span> Sequence number within the filter
-                                         <span class="sign">!</span>  pipeline of the filter <span class="keyword">for</span> which 
-                                         <span class="sign">!</span>  information is sought
-    INTEGER<span class="sign">,</span> DIMENSION<span class="comment">(*), INTENT(OUT) :: cd_values  ! Auxiliary data for the filter.
-    INTEGER, INTENT(OUT) :: flags        ! Bit vector specifying certain general
-                                         !  properties of the filter.
-    INTEGER(SIZE_T), INTENT(INOUT) :: cd_nelmts  ! Number of elements in cd_values.
-    INTEGER(SIZE_T), INTENT(IN) :: namelen       ! Anticipated number of characters in name.
-    CHARACTER(LEN=*)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name        <span class="sign">!</span> Name of the filter
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> filter_id            <span class="sign">!</span> Filter identification number  
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr               <span class="sign">!</span> Error code
-                                                 <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pget5fgc5freferences5ff"></a>
-<a name="robo246"></a><h2>h5pget_gc_references_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>   <strong>h5pget_gc_references_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Returns garbage collecting references setting.       
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id       - file access property list identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  gc_reference - flag for stting garbage collection on 
-                 and off (1 or 0)
-  hdferr       - error code            
-                  Success:  0
-                  Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999      
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for 
-  called C functions (it is needed for Windows
-  port).  March 14, 2001 
-               
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pget_gc_references_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> gc_reference<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id <span class="sign">!</span> Property list identifier 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> gc_reference <span class="sign">!</span> The flag <span class="keyword">for</span> garbage collecting
-                                         <span class="sign">!</span>  references <span class="keyword">for</span> the file
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code
-                                         <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pget5fistore5fk5ff"></a>
-<a name="robo249"></a><h2>h5pget_istore_k_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pget_istore_k_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Queries the 1/2 rank of an indexed storage B-tree. 
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id       - file creation property list identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  ik           - 1/2 rank of chunked storage B-tree
-  hdferr       - error code            
-                  Success:  0
-                  Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999      
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for 
-  called C functions (it is needed for Windows
-  port).  March 14, 2001 
-               
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pget_istore_k_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> ik<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id <span class="sign">!</span> Property list identifier 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> ik           <span class="sign">!</span> 1<span class="sign">/</span>2 rank of chunked storage B<span class="sign">-</span>tree
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code
-                                         <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pget5flayout5ff"></a>
-<a name="robo250"></a><h2>h5pget_layout_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>   <strong>h5pget_layout_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Returns the layout of the raw data for a dataset. 
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id       - data creation property list identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  layout       - type of storage layout for raw data
-                 possible values are:
-                  H5D_COMPACT_F
-                  H5D_CONTIGUOUS_F
-                  H5D_CHUNKED_F
-  hdferr       - error code            
-                  Success:  0
-                  Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999      
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for 
-  called C functions (it is needed for Windows
-  port).  March 14, 2001 
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pget_layout_f</strong> <span class="sign">(</span>prp_id<span class="sign">,</span> layout<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id <span class="sign">!</span> Property list identifier 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> layout       <span class="sign">!</span> Type of storage layout <span class="keyword">for</span> raw data
-                                         <span class="sign">!</span> possible values are<span class="sign">:</span>
-                                         <span class="sign">!</span>  H5D_COMPACT_F<span class="sign">(</span>0<span class="sign">)</span>
-                                         <span class="sign">!</span>  H5D_CONTIGUOUS_F<span class="sign">(</span>1<span class="sign">)</span>
-                                         <span class="sign">!</span>  H5D_CHUNKED_F<span class="sign">(</span>2<span class="sign">)</span>
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code
-                                         <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fH5Pget5flink5fcreation5forder5ff"></a>
-<a name="robo251"></a><h2>H5Pget_link_creation_order_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>H5Pget_link_creation_order_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Queries whether link creation order is tracked and/or indexed in a group.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  gcpl_id - Group creation property list identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  crt_order_flags - Creation order flag(s)
-  hdferr          - Error code         
-                     Success:  0
-                     Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  March 3, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE h5pget_link_creation_order_f<span class="sign">(</span>gcpl_id<span class="sign">,</span> crt_order_flags<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> gcpl_id   <span class="sign">!</span> Group creation property list identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> crt_order_flags <span class="sign">!</span> Creation order flag<span class="sign">(</span>s<span class="sign">)</span>
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr          <span class="sign">!</span> Error code
-                                            <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fH5Pget5flink5fphase5fchange5ff"></a>
-<a name="robo252"></a><h2>H5Pget_link_phase_change_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>H5Pget_link_phase_change_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Queries the settings for conversion between compact and dense groups.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  gcpl_id      - Group creation property list identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  max_compact  - Maximum number of attributes to be stored in compact storage
-  min_dense    - Minimum number of attributes to be stored in dense storage
-  hdferr       - Error code            
-                  Success:  0
-                  Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  February 20, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE h5pget_link_phase_change_f<span class="sign">(</span>gcpl_id<span class="sign">,</span> max_compact<span class="sign">,</span> min_dense<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> gcpl_id <span class="sign">!</span> Group creation property list identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> max_compact   <span class="sign">!</span> Maximum number of attributes to be stored in compact storage
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> min_dense     <span class="sign">!</span> Minimum number of attributes to be stored in dense storage
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-                                          <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fH5Pget5flocal5fheap5fsize5fhint5ff"></a>
-<a name="robo253"></a><h2>H5Pget_local_heap_size_hint_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>H5Pget_local_heap_size_hint_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Queries the local heap size hint for original-style groups.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  gcpl_id   - Group creation property list identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  size_hint - Hint for size of local heap
-  hdferr    - Error code
-               Success:  0
-               Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  March 21, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE h5pget_local_heap_size_hint_f<span class="sign">(</span>gcpl_id<span class="sign">,</span> size_hint<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> gcpl_id     <span class="sign">!</span> Group creation property list identifier
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> size_hint <span class="sign">!</span> Hint <span class="keyword">for</span> size of local heap
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr            <span class="sign">!</span> Error code
-                                              <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pget5fmeta5fblock5fsize5ff"></a>
-<a name="robo254"></a><h2>h5pget_meta_block_size_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pget_meta_block_size_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Gets the minimum size of metadata block allocations 
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  plist_id     - file access property list identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  size         - metatdata block size
-  hdferr       - error code            
-                  Success:  0
-                  Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 7, 2002      
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pget_meta_block_size_f</strong><span class="sign">(</span>plist_id<span class="sign">,</span> size<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> plist_id  <span class="sign">!</span> File access property list identifier 
-    INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> size   <span class="sign">!</span> Block size in bytes<span class="sign">;</span> 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr          <span class="sign">!</span> Error code
-                                            <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pget5fnfilters5ff"></a>
-<a name="robo255"></a><h2>h5pget_nfilters_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>   <strong>h5pget_nfilters_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Returns the number of filters in the pipeline. 
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id       - data creation or transfer property list 
-                 identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  nfilters     - number of filters in the pipeline
-  hdferr       - error code            
-                  Success:  0
-                  Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999      
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for 
-  called C functions (it is needed for Windows
-  port).  March 14, 2001 
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pget_nfilters_f</strong> <span class="sign">(</span>prp_id<span class="sign">,</span> nfilters<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id <span class="sign">!</span> Property list identifier 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> nfilters     <span class="sign">!</span> The number of filters in the pipeline
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code
-                                         <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pget5fnlinks5ff"></a>
-<a name="robo256"></a><h2>h5pget_nlinks_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pget_nlinks_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Gets maximum number of soft or user-defined link traversals.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  lapl_id - File access property list identifier
-  nlinks  - Maximum number of links to traverse
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr  - error code
-             Success:  0
-             Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  March 24, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pget_nlinks_f</strong><span class="sign">(</span>lapl_id<span class="sign">,</span> nlinks<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> lapl_id  <span class="sign">!</span> File access property list identifier
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> nlinks <span class="sign">!</span> Maximum number of links to traverse
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code
-                                           <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pget5fnpros5ff"></a>
-<a name="robo257"></a><h2>h5pget_npros_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>   <strong>h5pget_npros_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Queries number of properties in property list or class
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id       - iproperty list identifier to query
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  nprops       - number of properties in property object
-  hdferr       - error code            
-                  Success:  0
-                  Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 9, 2002      
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE h5pget_nprops_f<span class="sign">(</span>prp_id<span class="sign">,</span> nprops<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id    <span class="sign">!</span> Property list identifier 
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> nprops  <span class="sign">!</span> Number of properties
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr          <span class="sign">!</span> Error code
-                                            <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fH5Pget5fobj5ftrack5ftimes5ff"></a>
-<a name="robo258"></a><h2>H5Pget_obj_track_times_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>H5Pget_obj_track_times_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Returns whether times are tracked for an object.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  plist_id     - property list id
-  flag         - object timestamp setting
-                 .TRUE.,.FALSE.
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr       - error code            
-                 Success:  0
-                 Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  February 22, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE h5pget_obj_track_times_f<span class="sign">(</span>plist_id<span class="sign">,</span> flag<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> plist_id <span class="sign">!</span> Dataset creation property 
-                                           <span class="sign">!</span> list identifier 
-    LOGICAL<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> flag   <span class="sign">!</span> Object timestamp setting
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr <span class="sign">!</span> Error code
-                                   <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pget5fpreserve5ff"></a>
-<a name="robo259"></a><h2>h5pget_preserve_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pget_preserve_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Checks status of the dataset transfer property list.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id  - property list identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  flag    - status flag
-  hdferr  - error code         
-       Success:  0
-       Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999      
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for 
-  called C functions (it is needed for Windows
-  port).  March 14, 2001
- 
-  Datatype of the flag parameter is changed from 
-  INTEGER to LOGICAL 
-  June 4, 2003 
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pget_preserve_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> flag<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id <span class="sign">!</span> Property list identifier 
-    LOGICAL<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span>  flag        <span class="sign">!</span> TRUE<span class="sign">/</span>FALSE flag<span class="sign">.</span> Shows status of the dataset<span class="squote">'s
-                                         ! transfer property for partial writing/reading
-                                         ! compound datatype
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code
-                                         ! 0 on success and -1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pget5fsec25ff"></a>
-<a name="robo262"></a><h2>h5pget_sec2_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>   <strong>h5pget_sec2_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  NOT AVAILABLE
-</pre>
-<p class="item_name">INPUTS</p>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr  - error code         
-             Success:  0
-             Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999      
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for 
-  called C functions (it is needed for Windows
-  port).  March 14, 2001 
-               
- SOURCE!          SUBROUTINE <strong>h5pget_sec2_f</strong> (prp_id, sec2, hdferr) 
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
-            INTEGER, INTENT(OUT) :: sec2   ! value indicates whether the file
-            INTEGER, INTENT(OUT) :: hdferr  ! Error code
- 0 on success and -1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pget5fsieve5fbuf5fsize5ff"></a>
-<a name="robo263"></a><h2>h5pget_sieve_buf_size_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pget_sieve_buf_size_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Gets the maximum size of the data sieve buffer
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  plist_id     - file access property list identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  size         - sieve buffer size
-  hdferr       - error code            
-                  Success:  0
-                  Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 7, 2002      
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pget_sieve_buf_size_f</strong><span class="sign">(</span>plist_id<span class="sign">,</span> size<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> plist_id <span class="sign">!</span> File access property list identifier 
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> size   <span class="sign">!</span> Buffer size in bytes 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span>       <span class="sign">:</span><span class="sign">:</span> hdferr   <span class="sign">!</span> Error code
-                                           <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pget5fsize5ff"></a>
-<a name="robo264"></a><h2>h5pget_size_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pget_size_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Queries the size of a property value in bytes.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id       - property list identifier to query
-  name         - name of property to query
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  size         - size of property in bytes
-  hdferr       - error code            
-                  Success:  0
-                  Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 9, 2002      
-</pre>
-<p class="item_name">HISTORY</p>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pget_size_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> name<span class="sign">,</span> size<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id  <span class="sign">!</span> Property list identifier 
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name  <span class="sign">!</span> Name of property to query
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> size  <span class="sign">!</span> Size in bytes
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-                                          <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pget5fsizes5ff"></a>
-<a name="robo265"></a><h2>h5pget_sizes_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pget_sizes_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Retrieves the size of the offsets and lengths used 
-  in an <a href="./HDF5_f90.html#robo76">HDF5</a> file
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id       - file creation property list identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  sizeof_addr  - size of an object offset in bytes 
-  sizeof_size  - size of an object length in bytes
-  hdferr       - error code            
-                  Success:  0
-                  Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999      
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for 
-  called C functions (it is needed for Windows
-  port).  March 14, 2001 
-               
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pget_sizes_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> sizeof_addr<span class="sign">,</span> sizeof_size<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id        <span class="sign">!</span> Property list identifier 
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> sizeof_addr <span class="sign">!</span> Size of an object
-                                                <span class="sign">!</span> offset in bytes 
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> sizeof_size <span class="sign">!</span> Size of an object
-                                                <span class="sign">!</span> length in bytes 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr              <span class="sign">!</span> Error code
-                                                <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pget5fsmall5fdata5fblock5fsize5ff"></a>
-<a name="robo266"></a><h2>h5pget_small_data_block_size_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pget_small_data_block_size_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Gets the minimum size of "small" raw data block
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  plist_id     - file access property list identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  size         - small raw data block size
-  hdferr       - error code            
-                  Success:  0
-                  Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 7, 2002      
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pget_small_data_block_size_f</strong><span class="sign">(</span>plist_id<span class="sign">,</span> size<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> plist_id  <span class="sign">!</span> File access property list identifier 
-    INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> size   <span class="sign">!</span> Small raw data block size
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr          <span class="sign">!</span> Error code
-                                            <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pget5fsplit5ff"></a>
-<a name="robo267"></a><h2>h5pget_split_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>   <strong>h5pget_split_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  NOT AVAILABLE
-</pre>
-<p class="item_name">INPUTS</p>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr  - error code         
-             Success:  0
-             Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999      
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for 
-  called C functions (it is needed for Windows
-  port).  March 14, 2001 
-               
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source"><span class="sign">!</span>          SUBROUTINE <strong>h5pget_split_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> meta_ext_size<span class="sign">,</span> meta_ext<span class="sign">,</span> meta_plist<span class="sign">,</span>raw_ext_size<span class="sign">,</span><span class="sign">&amp;</span>
-<span class="sign">!</span>                                     raw_ext<span class="sign">,</span> raw_plist<span class="sign">,</span> hdferr<span class="sign">)</span>
-<span class="sign">!</span>            IMPLICIT NONE
-<span class="sign">!</span>            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id <span class="sign">!</span> Property list identifier
-<span class="sign">!</span>            INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> meta_ext_size <span class="sign">!</span> Number of characters of the meta
-                                                         <span class="sign">!</span> file extension to be copied to the
-                                                         <span class="sign">!</span> meta_ext buffer
-
-<span class="sign">!</span>            CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> meta_ext  <span class="sign">!</span>Name of the extension <span class="keyword">for</span>
-                                                      <span class="sign">!</span>the metafile filename
-<span class="sign">!</span>            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> meta_plist  <span class="sign">!</span> Identifier of the meta file
-                                                      <span class="sign">!</span> access property list
-<span class="sign">!</span>            INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> raw_ext_size <span class="sign">!</span> Number of characters of the raw
-                                                         <span class="sign">!</span> file extension to be copied to the
-                                                         <span class="sign">!</span> raw_ext buffer
-<span class="sign">!</span>            CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> raw_ext  <span class="sign">!</span>Name extension <span class="keyword">for</span> the raw file filename
-<span class="sign">!</span>            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> raw_plist  <span class="sign">!</span>Identifier of the raw file
-                                                     <span class="sign">!</span>access property list
-<span class="sign">!</span>            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr  <span class="sign">!</span> Error code
-                                     <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pget5fstdio5ff"></a>
-<a name="robo268"></a><h2>h5pget_stdio_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pget_stdio_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  NOT AVAILABLE
-</pre>
-<p class="item_name">INPUTS</p>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr  - error code         
-             Success:  0
-             Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999      
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for 
-  called C functions (it is needed for Windows
-  port).  March 14, 2001 
-               
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source"><span class="sign">!</span>          SUBROUTINE <strong>h5pget_stdio_f</strong> <span class="sign">(</span>prp_id<span class="sign">,</span> io<span class="sign">,</span> hdferr<span class="sign">)</span>
-<span class="sign">!</span>
-<span class="sign">!</span>            IMPLICIT NONE
-<span class="sign">!</span>            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id <span class="sign">!</span> Property list identifier
-<span class="sign">!</span>            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> io   <span class="sign">!</span> value indicates that the file
-                                         <span class="sign">!</span>access property list is set to
-                                         <span class="sign">!</span>the stdio driver
-<span class="sign">!</span>            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr  <span class="sign">!</span> Error code
-                                     <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pget5fsym5fk5ff"></a>
-<a name="robo269"></a><h2>h5pget_sym_k_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pget_sym_k_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Retrieves the size of the symbol table B-tree 1/2 rank
-  and the symbol table leaf node 1/2 size. 
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id       - file creation property list identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  ik           - symbol table tree 1/2 rank
-  lk           - symbol table node 1/2 size
-  hdferr       - error code            
-                  Success:  0
-                  Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999      
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for 
-  called C functions (it is needed for Windows
-  port).  March 14, 2001 
-               
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pget_sym_k_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> ik<span class="sign">,</span> lk<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id <span class="sign">!</span> Property list identifier 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> ik           <span class="sign">!</span> Symbol table tree rank
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> lk           <span class="sign">!</span> Symbol table node size
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code
-                                         <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pget5fuserblock5ff"></a>
-<a name="robo270"></a><h2>h5pget_userblock_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pget_userblock_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Gets user block size.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id       - file creation property list identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  block_size   - size of the user block in bytes
-  hdferr       - error code            
-                  Success:  0
-                  Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999      
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for 
-  called C functions (it is needed for Windows
-  port).  March 14, 2001 
-               
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pget_userblock_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> block_size<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id         <span class="sign">!</span> Property list identifier 
-    INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span>  block_size <span class="sign">!</span> Size of the 
-                                                 <span class="sign">!</span> user<span class="sign">-</span>block in bytes 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr               <span class="sign">!</span> Error code
-                                                 <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pget5fversion5ff"></a>
-<a name="robo271"></a><h2>h5pget_version_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pget_version_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Retrieves the version information of various objects 
-  for a file creation property list
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id       - file createion property list identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  boot         - super block version number
-  freelist     - global freelist version number
-  stab         - symbol table version number
-  shhdr        - shared object header version number
-  hdferr       - error code            
-                  Success:  0
-                  Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999      
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for 
-  called C functions (it is needed for Windows
-  port).  March 14, 2001 
-               
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pget_version_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> boot<span class="sign">,</span> freelist<span class="sign">,</span> <span class="sign">&amp;</span>
-       stab<span class="sign">,</span> shhdr<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id        <span class="sign">!</span> Property list identifier 
-    INTEGER<span class="sign">,</span> DIMENSION<span class="sign">(</span><span class="sign">:</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> boot  <span class="sign">!</span> Array to put boot
-                                                <span class="sign">!</span> block version number
-    INTEGER<span class="sign">,</span> DIMENSION<span class="sign">(</span><span class="sign">:</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> freelist  <span class="sign">!</span> Array to put global
-                                                    <span class="sign">!</span> Freelist version number
-
-    INTEGER<span class="sign">,</span> DIMENSION<span class="sign">(</span><span class="sign">:</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> stab  <span class="sign">!</span> Array to put symbol
-                                                <span class="sign">!</span> table version number
-    INTEGER<span class="sign">,</span> DIMENSION<span class="sign">(</span><span class="sign">:</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> shhdr <span class="sign">!</span> Array to put shared
-                                                <span class="sign">!</span> object header version number
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr              <span class="sign">!</span> Error code
-                                                <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pisa5fclass5ff"></a>
-<a name="robo281"></a><h2>h5pisa_class_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>   <strong>h5pisa_class_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Determines whether a property list is a member of a class. 
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  plist        - property list identifier 
-  pclass       - identifier of the property class
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  flag         - .TRUE. if a member, .FALSE. otherwise
-  hdferr:      - error code           
-                  Success:  0
-                  Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 9, 2002      
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pisa_class_f</strong><span class="sign">(</span>plist<span class="sign">,</span> pclass<span class="sign">,</span> flag<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> plist     <span class="sign">!</span> Property list identifier 
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> pclass    <span class="sign">!</span> Class identifier
-    LOGICAL<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> flag            <span class="sign">!</span> logical flag
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr  <span class="sign">!</span> Error code
-                                    <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pmodify5ffilter5ff"></a>
-<a name="robo282"></a><h2>h5pmodify_filter_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pmodify_filter_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Adds a filter to the filter pipeline. 
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id       - data creation or transfer property list 
-                 identifier
-  filter       - filter to be modified
-  flags        - bit vector specifying certain general
-                 properties of the filter
-  cd_nelmts    - number of elements in cd_values
-  cd_values    - auxiliary data for the filter
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr       - error code            
-                  Success:  0
-                  Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  April 10 2003
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pmodify_filter_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> filter<span class="sign">,</span> flags<span class="sign">,</span> cd_nelmts<span class="sign">,</span> cd_values<span class="sign">,</span>  hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id <span class="sign">!</span> Property list identifier 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> filter        <span class="sign">!</span> Filter to be modified
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> flags         <span class="sign">!</span> Bit vector specifying certain general
-                                         <span class="sign">!</span>  properties of the filter
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> cd_nelmts       <span class="sign">!</span> Number of elements in cd_values
-    INTEGER<span class="sign">,</span> DIMENSION<span class="comment">(*), INTENT(IN) :: cd_values ! Auxiliary data for the filter
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code
-                                         ! 0 on success and -1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5premove5ff"></a>
-<a name="robo292"></a><h2>h5premove_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>   <strong>h5premove_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Removes a property from a property list. 
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  plid         - Property list identofoer
-  name         - name of the property to remove
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr:      - error code
-                  Success: 0 
-                  Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 9, 2002      
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5premove_f</strong><span class="sign">(</span>plid<span class="sign">,</span> name<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> plid   <span class="sign">!</span> Property list identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name <span class="sign">!</span> Name of property to remove
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code
-                                         <span class="sign">!</span>  0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5premove5ffilter5ff"></a>
-<a name="robo293"></a><h2>h5premove_filter_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5premove_filter_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Delete one or more filters from the filter pipeline. 
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id       - data creation or transfer property list 
-                 identifier
-  filter       - filter to be removed
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr       - error code            
-                  Success:  0
-                  Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Quincey Koziol
-  January 27 2004
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5premove_filter_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> filter<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id <span class="sign">!</span> Dataset creation property list
-                                         <span class="sign">!</span> identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> filter        <span class="sign">!</span> Filter to be removed
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code
-                                         <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pset5falignment5ff"></a>
-<a name="robo296"></a><h2>h5pset_alignment_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pset_alignment_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets alignment properties of a file access property list. 
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id       - file access property list identifier
-  threshold    - threshold value       
-  alignment    - alignment value
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr       - error code            
-                  Success:  0
-                  Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999      
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for 
-  called C functions (it is needed for Windows
-  port).  March 14, 2001 
-               
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pset_alignment_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> threshold<span class="sign">,</span>  alignment<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id      <span class="sign">!</span> Property list identifier 
-    INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> threshold <span class="sign">!</span> Threshold value
-    INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> alignment <span class="sign">!</span> alignment value
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr            <span class="sign">!</span> Error code
-                                              <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pset5falloc5ftime5ff"></a>
-<a name="robo297"></a><h2>h5pset_alloc_time_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pset_alloc_time_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Set space allocation time for dataset during creation.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  plist_id     - dataset creation property list identifier
-  flag         - allocation time flag:
-                   H5D_ALLOC_TIME_ERROR_F
-                   H5D_ALLOC_TIME_DEFAULT_F
-                   H5D_ALLOC_TIME_EARLY_F
-                   H5D_ALLOC_TIME_LATE_F
-                   H5D_ALLOC_TIME_INCR_F
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr       - error code            
-                  Success:  0
-                  Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 4, 2002      
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pset_alloc_time_f</strong><span class="sign">(</span>plist_id<span class="sign">,</span> flag<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> plist_id  <span class="sign">!</span> Dataset creation property list identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> flag             <span class="sign">!</span> Allocation time flag<span class="sign">:</span>
-                                            <span class="sign">!</span>  H5D_ALLOC_TIME_ERROR_F
-                                            <span class="sign">!</span>  H5D_ALLOC_TIME_DEFAULT_F
-                                            <span class="sign">!</span>  H5D_ALLOC_TIME_EARLY_F
-                                            <span class="sign">!</span>  H5D_ALLOC_TIME_LATE_F
-                                            <span class="sign">!</span>  H5D_ALLOC_TIME_INCR_F
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr          <span class="sign">!</span> Error code
-                                            <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fH5Pset5fattr5fcreation5forder5ff"></a>
-<a name="robo298"></a><h2>H5Pset_attr_creation_order_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>H5Pset_attr_creation_order_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets tracking and indexing of attribute creation order
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  ocpl_id         - Object creation property list identifier
-  crt_order_flags - Flags specifying whether to track and index attribute creation order
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr          - Error code         
-                     Success:  0
-                     Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  January, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE h5pset_attr_creation_order_f<span class="sign">(</span>ocpl_id<span class="sign">,</span> crt_order_flags <span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> ocpl_id   <span class="sign">!</span> Object <span class="sign">(</span>dataset or group<span class="sign">)</span> creation property list identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> crt_order_flags  <span class="sign">!</span> Flags specifying whether to track and index attribute creation order
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr          <span class="sign">!</span> Error code
-                                            <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fH5Pset5fattr5fphase5fchange5ff"></a>
-<a name="robo299"></a><h2>H5Pset_attr_phase_change_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>H5Pset_attr_phase_change_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets attribute storage phase change thresholds.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  ocpl_id - Object (dataset or group) creation property list identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  max_compact     - Maximum number of attributes to be stored in compact storage
-                    (Default: 8)
-  min_dense       - Minimum number of attributes to be stored in dense storage
-                    (Default: 6)
-  hdferr          - Error code         
-                     Success:  0
-                     Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  January, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">SUBROUTINE h5pset_attr_phase_change_f<span class="sign">(</span>ocpl_id<span class="sign">,</span> max_compact<span class="sign">,</span> min_dense<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> ocpl_id <span class="sign">!</span> Object <span class="sign">(</span>dataset or group<span class="sign">)</span> creation property list identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> max_compact    <span class="sign">!</span> Maximum number of attributes to be stored in compact storage
-                                          <span class="sign">!</span><span class="sign">(</span>Default<span class="sign">:</span> 8<span class="sign">)</span>
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> min_dense      <span class="sign">!</span> Minimum number of attributes to be stored in dense storage
-                                          <span class="sign">!</span> <span class="sign">(</span>Default<span class="sign">:</span> 6<span class="sign">)</span>
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-                                          <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pset5fbtree5fratios5ff"></a>
-<a name="robo300"></a><h2>h5pset_btree_ratios_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>   <strong>h5pset_btree_ratios_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets B-tree split ratios for a dataset transfer 
-  property list. 
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id       - the dataset transfer property list 
-                 identifier 
-  left         - the B-tree split ratio for left-most nodes 
-  middle       - the B-tree split ratio for all other nodes
-  right        - the B-tree split ratio for right-most nodes
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr       - error code            
-                  Success:  0
-                  Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999      
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for 
-  called C functions (it is needed for Windows
-  port).  March 14, 2001 
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pset_btree_ratios_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> left<span class="sign">,</span> middle<span class="sign">,</span> right<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id <span class="sign">!</span> Property list identifier
-    REAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> left   <span class="sign">!</span> The B<span class="sign">-</span>tree split ratio <span class="keyword">for</span> left<span class="sign">-</span>most nodes<span class="sign">.</span>
-    REAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> middle <span class="sign">!</span> The B<span class="sign">-</span>tree split ratio <span class="keyword">for</span> all other nodes 
-    REAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> right  <span class="sign">!</span> The B<span class="sign">-</span>tree split ratio <span class="keyword">for</span> right<span class="sign">-</span>most 
-                               <span class="sign">!</span>  nodes and lone nodes<span class="sign">.</span> 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr  <span class="sign">!</span> Error code
-                                    <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pset5fbuffer5ff"></a>
-<a name="robo301"></a><h2>h5pset_buffer_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pset_buffer_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets sixe for conversion buffer
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  plist_id     - data transfer property list identifier
-  size         - buffer size 
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr:      - error code            
-                  Success:  0
-                  Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 2, 2002      
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pset_buffer_f</strong><span class="sign">(</span>plist_id<span class="sign">,</span> size<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> plist_id <span class="sign">!</span> Data transfer property list identifier 
-    INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> size   <span class="sign">!</span> Buffer size in bytes<span class="sign">;</span> 
-                                           <span class="sign">!</span> buffer is allocated and freed by 
-                                           <span class="sign">!</span> the library<span class="sign">.</span>
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span>       <span class="sign">:</span><span class="sign">:</span> hdferr   <span class="sign">!</span> Error code
-                                           <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pset5fcache5ff"></a>
-<a name="robo302"></a><h2>h5pset_cache_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>   <strong>h5pset_cache_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets the meta data cache and raw data chunk 
-  cache parameters
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id       - file access property list identifier
-  mdc_nelmts   - number of elements (objects) in the meta 
-                 data cache 
-  rdcc_nelmts  - number of elements (objects) in the raw 
-                 data chunk cache 
-  rdcc_nbytes  - total size of the raw data chunk cache, in bytes 
-  rdcc_w0      - preemption policy (0 or 1)
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr       - error code            
-                  Success:  0
-                  Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999      
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for 
-  called C functions (it is needed for Windows
-  port).  March 14, 2001 
-               
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pset_cache_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> mdc_nelmts<span class="sign">,</span>rdcc_nelmts<span class="sign">,</span> rdcc_nbytes<span class="sign">,</span> rdcc_w0<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id <span class="sign">!</span> Property list identifier 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> mdc_nelmts    <span class="sign">!</span> Number of elements <span class="sign">(</span>objects<span class="sign">)</span>
-                                         <span class="sign">!</span>  in the meta data cache
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> rdcc_nelmts <span class="sign">!</span> Number of elements <span class="sign">(</span>objects<span class="sign">)</span>
-                                               <span class="sign">!</span>  in the meta data cache
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> rdcc_nbytes <span class="sign">!</span> Total size of the raw data 
-                                               <span class="sign">!</span>  chunk cache<span class="sign">,</span> in bytes 
-    REAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> rdcc_w0                <span class="sign">!</span> Preemption policy
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr             <span class="sign">!</span> Error code
-                                               <span class="sign">!</span>  0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fH5Pset5fchar5fencoding5ff"></a>
-<a name="robo305"></a><h2>H5Pset_char_encoding_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>H5Pset_char_encoding_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets the character encoding used to encode a string.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  plist_id - Property list identifier
-  encoding - Valid values for encoding are:
-               H5T_CSET_ASCII_F -&gt; US ASCII
-               H5T_CSET_UTF8_F -&gt; UTF-8 Unicode encoding
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr   - Error code                
-               Success:  0
-               Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  March 3, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE h5pset_char_encoding_f<span class="sign">(</span>plist_id<span class="sign">,</span> encoding<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> plist_id <span class="sign">!</span> Property list identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> encoding        <span class="sign">!</span> String encoding character set<span class="sign">:</span>
-                                           <span class="sign">!</span>   H5T_CSET_ASCII_F <span class="sign">-</span><span class="sign">&gt;</span> US ASCII
-                                           <span class="sign">!</span>   H5T_CSET_UTF8_F  <span class="sign">-</span><span class="sign">&gt;</span> UTF<span class="sign">-</span>8 Unicode encoding
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code
-                                           <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fH5Pset5fchunk5fcache5ff"></a>
-<a name="robo306"></a><h2>H5Pset_chunk_cache_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>H5Pset_chunk_cache_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Set the number of objects in the meta data cache and the
-  maximum number of chunks and bytes in the raw data chunk cache.
-  Once set, these values will override the values in the file access
-  property list.  Each of these values can be individually unset
-  (or not set at all) by passing the macros:
-    H5D_CHUNK_CACHE_NSLOTS_DFLT_F,
-    H5D_CHUNK_CACHE_NBYTES_DFLT_F, and/or
-    H5D_CHUNK_CACHE_W0_DFLT_F
-    as appropriate.
-
-  The RDCC_W0 value should be between 0 and 1 inclusive and
-  indicates how much chunks that have been fully read or fully
-  written are favored for preemption.  A value of zero means
-  fully read or written chunks are treated no differently than
-  other chunks (the preemption is strictly LRU) while a value
-  of one means fully read chunks are always preempted before
-  other chunks.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  dapl_id          - Dataset access property list identifier.
-  rdcc_nslots      - The number of chunk slots in the raw data chunk cache for this dataset.
-  rdcc_nbytes      - The total size of the raw data chunk cache for this dataset.
-  rdcc_w0          - The chunk preemption policy for this dataset.
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr           - Error code                
-                       Success:  0
-                       Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  April 13, 2009
-</pre>
-<p class="item_name">HISTORY</p>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE h5pset_chunk_cache_f<span class="sign">(</span>dapl_id<span class="sign">,</span> rdcc_nslots<span class="sign">,</span> rdcc_nbytes<span class="sign">,</span> rdcc_w0<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> dapl_id      <span class="sign">!</span> Dataset access property list identifier<span class="sign">.</span>
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> rdcc_nslots <span class="sign">!</span> The number of chunk slots in the raw data 
-                                               <span class="sign">!</span> chunk cache <span class="keyword">for</span> this dataset<span class="sign">.</span>
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> rdcc_nbytes <span class="sign">!</span> The total size of the raw data chunk cache 
-                                               <span class="sign">!</span> <span class="keyword">for</span> this dataset<span class="sign">.</span>
-    REAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> rdcc_w0                <span class="sign">!</span> The chunk preemption policy <span class="keyword">for</span> this dataset<span class="sign">.</span>
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr             <span class="sign">!</span> Error code
-                                               <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pset5fchunk5ff"></a>
-<a name="robo307"></a><h2>h5pset_chunk_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>   <strong>h5pset_chunk_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets the size of the chunks used to store 
-  a chunked layout dataset. 
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id  - datatset creation property list identifier
-  ndims   - number of dimensions for each chunk
-  dims    - array with dimension sizes for each chunk
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr  - error code         
-             Success:  0
-             Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999      
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>   Explicit Fortran interfaces were added for 
-   called C functions (it is needed for Windows
-   port).  March 14, 2001 
-               
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pset_chunk_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> ndims<span class="sign">,</span> dims<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id <span class="sign">!</span> Property list identifier 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> ndims         <span class="sign">!</span> Number of chunk dimensions
-    INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> DIMENSION<span class="sign">(</span>ndims<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> dims    
-                                         <span class="sign">!</span> Array containing sizes of
-                                         <span class="sign">!</span> chunk dimensions
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code
-                                         <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pset5fcopy5fobject5ff"></a>
-<a name="robo308"></a><h2>h5pset_copy_object_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pset_copy_object_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets properties to be used when an object is copied.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  ocp_plist_id - Object copy property list identifier
-  copy_options - Copy option(s) to be set
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr       - error code            
-                  Success:  0
-                  Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  March 3, 2008
-</pre>
-<p class="item_name">HISTORY</p>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pset_copy_object_f</strong><span class="sign">(</span>ocp_plist_id<span class="sign">,</span> copy_options<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> ocp_plist_id <span class="sign">!</span> Object copy property list identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> copy_options <span class="sign">!</span> Copy option<span class="sign">(</span>s<span class="sign">)</span> to be set<span class="sign">,</span> valid options are<span class="sign">:</span>
-                                        <span class="sign">!</span>   H5O_COPY_SHALLOW_HIERARCHY_F
-                                        <span class="sign">!</span>   H5O_COPY_EXPAND_SOFT_LINK_F
-                                        <span class="sign">!</span>   H5O_COPY_EXPAND_EXT_LINK_F
-                                        <span class="sign">!</span>   H5O_COPY_EXPAND_REFERENCE_F
-                                        <span class="sign">!</span>   H5O_COPY_WITHOUT_ATTR_FLAG_F
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr      <span class="sign">!</span> Error code
-                                        <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fH5Pset5fcreate5finter5fgroup5ff"></a>
-<a name="robo309"></a><h2>H5Pset_create_inter_group_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>H5Pset_create_inter_group_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Specifies in property list whether to create missing intermediate groups.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  lcpl_id            - Link creation property list identifier
-  crt_intermed_group - crt_intermed_group specifying whether 
-                       to create intermediate groups upon the creation 
-                       of an object
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr             - Error code              
-                         Success:  0
-                         Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  February 22, 2008
-</pre>
-<p class="item_name">HISTORY</p>
-<pre> The long subroutine name (&gt;31) on older f90 compilers causes problems
-          so had to shorten the name
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE h5pset_create_inter_group_f<span class="sign">(</span>lcpl_id<span class="sign">,</span> crt_intermed_group<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> lcpl_id      <span class="sign">!</span> Link creation property list identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> crt_intermed_group  <span class="sign">!</span> specifying whether to create intermediate groups
-                                               <span class="sign">!</span> upon the creation of an object
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr <span class="sign">!</span> Error code
-                                   <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pset5fdata5ftransform5ff"></a>
-<a name="robo310"></a><h2>h5pset_data_transform_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pset_data_transform_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets a data transform expression.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  plist_id   - Identifier of the property list or class 
-  expression - Buffer to hold transform expression
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr     - error code
-                 Success:  0
-                 Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  March 19, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pset_data_transform_f</strong><span class="sign">(</span>plist_id<span class="sign">,</span> expression<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> plist_id     <span class="sign">!</span> Identifier of the property list or class
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> expression <span class="sign">!</span> Buffer to hold transform expression
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr             <span class="sign">!</span> Error code
-                                               <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pset5fdeflate5ff"></a>
-<a name="robo311"></a><h2>h5pset_deflate_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>   <strong>h5pset_deflate_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>   Sets compression method and compression level. 
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>   prp_id  - property list identifier
-   level   - compression level
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr  - error code         
-             Success:  0
-             Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>       Elena Pourmal
-               August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>       Explicit Fortran interfaces were added for 
-                       called C functions (it is needed for Windows
-                       port).  March 14, 2001
-               
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pset_deflate_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> level<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id <span class="sign">!</span> Property list identifier 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> level         <span class="sign">!</span> Compression level 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code
-                                         <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pset5fedc5fcheck5ff"></a>
-<a name="robo315"></a><h2>h5pset_edc_check_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pset_edc_check_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Enables/disables error detecting  
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id       - dataset creation property list identifier
-  flag         - EDC flag; possible values:
-                   H5Z_DISABLE_EDC_F
-                   H5Z_ENABLE_EDC_F
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr       - error code            
-                  Success:  0
-                  Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  March 13, 2003
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pset_edc_check_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> flag<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id <span class="sign">!</span> Property list identifier 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> flag          <span class="sign">!</span> Checksum filter flag
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code
-                                         <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pset5fest5flink5finfo5ff"></a>
-<a name="robo316"></a><h2>h5pset_est_link_info_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pset_est_link_info_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets estimated number of links and length of link names in a group.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre> gcpl_id         - Group creation property list identifier  
- est_num_entries - Estimated number of links to be inserted into group
- est_name_len    - Estimated average length of link names
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr         - Error code
-                    Success:  0
-                    Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  March 21, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pset_est_link_info_f</strong><span class="sign">(</span>gcpl_id<span class="sign">,</span> est_num_entries<span class="sign">,</span> est_name_len<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> gcpl_id  <span class="sign">!</span> Group creation property list identifier  
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> est_num_entries <span class="sign">!</span> Estimated number of links to be inserted into group
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> est_name_len    <span class="sign">!</span> Estimated average length of link names
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code
-                                           <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pset5fexternal5ff"></a>
-<a name="robo317"></a><h2>h5pset_external_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>   <strong>h5pset_external_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Adds an external file to the list of external files. 
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id       - dataset creation property list identifier
-  name         - name of external file
-  offset       - offset in bytes from the beginning of the 
-                 file to the location in the file
-                 where the data starts
-  bytes        - size of the external file data. 
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr       - error code            
-                  Success:  0
-                  Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999      
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for 
-  called C functions (it is needed for Windows
-  port).  March 14, 2001 
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pset_external_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> name<span class="sign">,</span> offset<span class="sign">,</span>bytes<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id  <span class="sign">!</span> Property list identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name  <span class="sign">!</span> Name of an external file
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> offset         <span class="sign">!</span> Offset<span class="sign">,</span> in bytes<span class="sign">,</span> from the beginning 
-                                          <span class="sign">!</span>  of the file to the location in the file 
-                                          <span class="sign">!</span>  where the data starts<span class="sign">.</span>
-    INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> bytes <span class="sign">!</span> Number of bytes reserved in the 
-                                          <span class="sign">!</span>  file <span class="keyword">for</span> the data
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-                                          <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pset5ffapl5fcore5ff"></a>
-<a name="robo318"></a><h2>h5pset_fapl_core_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>   <strong>h5pset_fapl_core_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Modifies the file access property list to use the 
-  H5FD_CORE driver. 
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id           - file access property list identifier
-  increment        - size, in bytes, of memory increments 
-  backing_store    - boolean flag indicating whether to write 
-                     the file contents to disk when the file is closed. 
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr           - error code                
-                       Success:  0
-                       Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999      
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for 
-  called C functions (it is needed for Windows
-  port).  March 14, 2001 
-               
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pset_fapl_core_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> increment<span class="sign">,</span> backing_store<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id     <span class="sign">!</span> Property list identifier 
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> increment <span class="sign">!</span> File block size in bytes<span class="sign">.</span>
-    LOGICAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> backing_store <span class="sign">!</span> Flag to indicate that
-                                         <span class="sign">!</span> entire file contents are flushed to a file 
-                                         <span class="sign">!</span> with the same name as this core file<span class="sign">.</span>
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code
-                                         <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pset5ffapl5fdirect5ff"></a>
-<a name="robo319"></a><h2>h5pset_fapl_direct_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pset_fapl_direct_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets up use of the direct I/O driver.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  fapl_id      - File access property list identifier
-  alignment    - Required memory alignment boundary
-  block_size   - File system block size
-  cbuf_size    - Copy buffer size
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr       - error code            
-                  Success:  0
-                  Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  March 21, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">SUBROUTINE <strong>h5pset_fapl_direct_f</strong><span class="sign">(</span>fapl_id<span class="sign">,</span> alignment<span class="sign">,</span> block_size<span class="sign">,</span> cbuf_size<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE  
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> fapl_id     <span class="sign">!</span> File access property list identifier
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> alignment  <span class="sign">!</span> Required memory alignment boundary<span class="sign">!</span>
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> block_size <span class="sign">!</span> File system block size
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> cbuf_size  <span class="sign">!</span> Copy buffer size
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr            <span class="sign">!</span> Error code
-                                              <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pset5ffapl5fmulti5fl"></a>
-<a name="robo322"></a><h2>h5pset_fapl_multi_l</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pset_fapl_multi_l</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets up use of the multi-file driver. 
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id       - file creation property list identifier
-  mem_map      - mapping array
-  memb_fapl    - property list for each memory usage type
-  memb_name    - names of member file
-  relax        - flag 
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr       - error code            
-                  Success:  0
-                  Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  20 March 2003
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pset_fapl_multi_l</strong><span class="sign">(</span>prp_id<span class="sign">,</span> memb_map<span class="sign">,</span> memb_fapl<span class="sign">,</span> memb_name<span class="sign">,</span> memb_addr<span class="sign">,</span> relax<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id <span class="sign">!</span> File creation property list identifier 
-    INTEGER<span class="sign">,</span> DIMENSION<span class="sign">(</span>0<span class="sign">:</span>H5FD_MEM_NTYPES_F<span class="sign">-</span>1<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> memb_map <span class="sign">!</span> Mapping array
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> DIMENSION<span class="sign">(</span>0<span class="sign">:</span>H5FD_MEM_NTYPES_F<span class="sign">-</span>1<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> memb_fapl <span class="sign">!</span> Property list <span class="keyword">for</span> each memory usage type
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> DIMENSION<span class="sign">(</span>0<span class="sign">:</span>H5FD_MEM_NTYPES_F<span class="sign">-</span>1<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> memb_name <span class="sign">!</span> Names of member file
-    REAL<span class="sign">,</span> DIMENSION<span class="sign">(</span>0<span class="sign">:</span>H5FD_MEM_NTYPES_F<span class="sign">-</span>1<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> memb_addr 
-    LOGICAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> relax     <span class="sign">!</span> Flag
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr   <span class="sign">!</span> Error code
-                                     <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pset5ffapl5fmulti5fs"></a>
-<a name="robo323"></a><h2>h5pset_fapl_multi_s</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pset_fapl_multi_s</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets up use of the multi-file driver. 
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id       - file creation property list identifier
-  relax        - flag 
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr       - error code            
-                  Success:  0
-                  Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  31 March 2003
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pset_fapl_multi_s</strong><span class="sign">(</span>prp_id<span class="sign">,</span> relax<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id <span class="sign">!</span> File creation property list identifier 
-    LOGICAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> relax
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code
-                                         <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pset5ffapl5fsec25ff"></a>
-<a name="robo324"></a><h2>h5pset_fapl_sec2_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pset_fapl_sec2_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets the sec2 driver. 
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id  - file access property list identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr  - error code         
-             Success:  0
-             Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999      
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for 
-  called C functions (it is needed for Windows
-  port).  March 14, 2001 
-               
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pset_fapl_sec2_f</strong> <span class="sign">(</span>prp_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id <span class="sign">!</span> Property list identifier 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code
-                                         <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pset5ffapl5fsplit5ff"></a>
-<a name="robo325"></a><h2>h5pset_fapl_split_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>   <strong>h5pset_fapl_split_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Emulates the old split file driver. 
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id       - file access property list identifier
-  meta_ext     - name of the extension for the metafile 
-                 filename
-  meta_plist   - identifier of the meta file access property 
-                 list
-  raw_ext      - name extension for the raw file filename
-  raw_plist    - identifier of the raw file access property list
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr       - error code            
-                   Success:  0
-                   Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999      
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for 
-  called C functions (it is needed for Windows
-  port).  March 14, 2001 
-               
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pset_fapl_split_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> meta_ext<span class="sign">,</span> meta_plist<span class="sign">,</span> raw_ext<span class="sign">,</span> raw_plist<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id     <span class="sign">!</span> Property list identifier 
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> meta_ext <span class="sign">!</span> Name of the extension <span class="keyword">for</span>
-                                             <span class="sign">!</span>  the metafile filename
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> meta_plist <span class="sign">!</span> Identifier of the meta file
-                                             <span class="sign">!</span>  access property list
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> raw_ext  <span class="sign">!</span> Name extension <span class="keyword">for</span> the raw file filename
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> raw_plist  <span class="sign">!</span> Identifier of the raw file 
-                                             <span class="sign">!</span>  access property list
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr           <span class="sign">!</span> Error code
-                                             <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pset5ffapl5fstdio5ff"></a>
-<a name="robo326"></a><h2>h5pset_fapl_stdio_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pset_fapl_stdio_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets the standard I/O driver. 
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id  - file access property list identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr  - error code         
-             Success:  0
-             Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999      
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for 
-  called C functions (it is needed for Windows
-  port).  March 14, 2001 
-               
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pset_fapl_stdio_f</strong> <span class="sign">(</span>prp_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id <span class="sign">!</span> Property list identifier 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code
-                                         <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pset5ffclose5fdegree5ff"></a>
-<a name="robo327"></a><h2>h5pset_fclose_degree_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pset_fclose_degree_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets the degree for the file close behavior.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  fapl_id      - file access property list identifier
-  degree       - Possible values are:
-                   H5F_CLOSE_DEFAULT_F
-                   H5F_CLOSE_WEAK_F
-                   H5F_CLOSE_SEMI_F
-                   H5F_CLOSE_STRONG_F
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr       - error code            
-                  Success:  0
-                  Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  September 26, 2002   
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pset_fclose_degree_f</strong><span class="sign">(</span>fapl_id<span class="sign">,</span> degree<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> fapl_id <span class="sign">!</span> File Access Property list identifier 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> degree         <span class="sign">!</span> Possible values are<span class="sign">:</span> 
-                                          <span class="sign">!</span>  H5F_CLOSE_DEFAULT_F
-                                          <span class="sign">!</span>  H5F_CLOSE_WEAK_F
-                                          <span class="sign">!</span>  H5F_CLOSE_SEMI_F
-                                          <span class="sign">!</span>  H5F_CLOSE_STRONG_F
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-                                          <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pset5ffill5ftime5ff"></a>
-<a name="robo328"></a><h2>h5pset_fill_time_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pset_fill_time_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Set fill value writing time for dataset
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  plist_id     - dataset creation property list identifier
-  flag         - fill time flag:
-                   H5D_FILL_TIME_ERROR_F
-                   H5D_FILL_TIME_ALLOC_F
-                   H5D_FILL_TIME_NEVER_F
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr       - error code            
-                  Success:  0
-                  Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 4, 2002      
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pset_fill_time_f</strong><span class="sign">(</span>plist_id<span class="sign">,</span> flag<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> plist_id  <span class="sign">!</span> Dataset creation property list identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> flag             <span class="sign">!</span> Fill time flag<span class="sign">:</span>
-                                            <span class="sign">!</span>  H5D_FILL_TIME_ERROR_F
-                                            <span class="sign">!</span>  H5D_FILL_TIME_ALLOC_F
-                                            <span class="sign">!</span>  H5D_FILL_TIME_NEVER_F
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr          <span class="sign">!</span> Error code
-                                            <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pset5ffilter5ff"></a>
-<a name="robo329"></a><h2>h5pset_filter_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pset_filter_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Adds a filter to the filter pipeline. 
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id       - data creation or transfer property list 
-                 identifier
-  filter       - filter to be added to the pipeline 
-  flags        - bit vector specifying certain general
-                 properties of the filter
-  cd_nelmts    - number of elements in cd_values
-  cd_values    - auxiliary data for the filter
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr       - error code            
-                  Success:  0
-                  Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  February, 2003
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pset_filter_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> filter<span class="sign">,</span> flags<span class="sign">,</span> cd_nelmts<span class="sign">,</span> cd_values<span class="sign">,</span>  hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id <span class="sign">!</span> Property list identifier 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> filter        <span class="sign">!</span> Filter to be added to the pipeline<span class="sign">.</span>
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> flags         <span class="sign">!</span> Bit vector specifying certain general
-                                       <span class="sign">!</span>  properties of the filter<span class="sign">.</span>
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> cd_nelmts       <span class="sign">!</span> Number of elements in cd_values<span class="sign">.</span>
-    INTEGER<span class="sign">,</span> DIMENSION<span class="comment">(*), INTENT(IN) :: cd_values ! Auxiliary data for the filter.
-    INTEGER, INTENT(OUT) :: hdferr                 ! Error code
-                                                 ! 0 on success and -1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pset5ffletcher325ff"></a>
-<a name="robo330"></a><h2>h5pset_fletcher32_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pset_fletcher32_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets Fletcher32 checksum of EDC for a dataset creation 
-  property list.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id       - dataset creation property list identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr       - error code            
-                  Success:  0
-                  Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  March 13, 2003
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pset_fletcher32_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id <span class="sign">!</span> Property list identifier 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code
-                                         <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pset5fgc5freferences5ff"></a>
-<a name="robo331"></a><h2>h5pset_gc_references_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>   <strong>h5pset_gc_references_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets garbage collecting references flag. 
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id       - file access property list identifier
-  gc_reference - flag for stting garbage collection on 
-                 and off (1 or 0)
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr       - error code            
-                  Success:  0
-                  Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999      
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for 
-  called C functions (it is needed for Windows
-  port).  March 14, 2001 
-               
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pset_gc_references_f</strong> <span class="sign">(</span>prp_id<span class="sign">,</span> gc_reference<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id <span class="sign">!</span> Property list identifier 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> gc_reference  <span class="sign">!</span> The flag <span class="keyword">for</span> garbage collecting
-                                         <span class="sign">!</span>  references <span class="keyword">for</span> the file
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code
-                                         <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pset5fhyper5fvector5fsize5ff"></a>
-<a name="robo332"></a><h2>h5pset_hyper_vector_size_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pset_hyper_vector_size_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Set the number of "I/O" vectors (vector size)
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  plist_id     - dataset transfer property list identifier
-  size         - vector size
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr       - error code            
-                  Success:  0
-                  Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 7, 2002      
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pset_hyper_vector_size_f</strong><span class="sign">(</span>plist_id<span class="sign">,</span> size<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> plist_id <span class="sign">!</span> Dataset transfer property list identifier 
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> size    <span class="sign">!</span> Vector size
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code
-                                           <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pset5fistore5fk5ff"></a>
-<a name="robo335"></a><h2>h5pset_istore_k_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pset_istore_k_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets the size of the parameter used to control the 
-  B-trees for indexing chunked datasets
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id       - file creation property list identifier
-  ik           - 1/2 rank of chunked storage B-tree
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr       - error code            
-                  Success:  0
-                  Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999      
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for 
-  called C functions (it is needed for Windows
-  port).  March 14, 2001 
-               
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pset_istore_k_f</strong> <span class="sign">(</span>prp_id<span class="sign">,</span> ik<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id <span class="sign">!</span> Property list identifier 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> ik            <span class="sign">!</span> 1<span class="sign">/</span>2 rank of chunked storage B<span class="sign">-</span>tree
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code
-                                         <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pset5flayout5ff"></a>
-<a name="robo336"></a><h2>h5pset_layout_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>   <strong>h5pset_layout_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets the type of storage used store the raw data 
-  for a dataset. 
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id       - data creation property list identifier
-  layout       - type of storage layout for raw data
-                 possible values are:
-                   H5D_COMPACT_F
-                   H5D_CONTIGUOUS_F
-                   H5D_CHUNKED_F
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr      - error code             
-                 Success:  0
-                 Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999      
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for 
-  called C functions (it is needed for Windows
-  port).  March 14, 2001 
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pset_layout_f</strong> <span class="sign">(</span>prp_id<span class="sign">,</span> layout<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id <span class="sign">!</span> Property list identifier 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> layout        <span class="sign">!</span> Type of storage layout <span class="keyword">for</span> raw data
-                                         <span class="sign">!</span> possible values are<span class="sign">:</span>
-                                         <span class="sign">!</span>   H5D_COMPACT_F
-                                         <span class="sign">!</span>   H5D_CONTIGUOUS_F
-                                         <span class="sign">!</span>   H5D_CHUNKED_F
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code
-                                         <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fH5Pset5flibver5fbounds5ff"></a>
-<a name="robo337"></a><h2>H5Pset_libver_bounds_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>             <strong>H5Pset_libver_bounds_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>    Sets bounds on library versions, and indirectly format versions, to be used when creating objects.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  fapl_id - File access property list identifier
-  low     - The earliest version of the library that will be used for writing objects.
-  high    - The latest version of the library that will be used for writing objects.
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr  - error code         
-             Success:  0
-             Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  February 18, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE h5pset_libver_bounds_f<span class="sign">(</span>fapl_id<span class="sign">,</span> low<span class="sign">,</span> high<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> fapl_id <span class="sign">!</span> File access property list identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> low   <span class="sign">!</span> The earliest version of the library that will be used <span class="keyword">for</span> writing objects<span class="sign">.</span>
-                                 <span class="sign">!</span> Currently<span class="sign">,</span> low must be one of two pre<span class="sign">-</span>defined values<span class="sign">:</span>
-                                 <span class="sign">!</span>            HDF_LIBVER_EARLIEST_F
-                                 <span class="sign">!</span>            HDF_LIBVER_LATEST_F
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> high  <span class="sign">!</span> The latest version of the library that will be used <span class="keyword">for</span> writing objects<span class="sign">.</span>
-                                 <span class="sign">!</span> Currently<span class="sign">,</span> low must set to the pre<span class="sign">-</span>defined value<span class="sign">:</span>
-                                 <span class="sign">!</span>            HDF_LIBVER_LATEST_F
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr  <span class="sign">!</span> Error code
-                                    <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fH5Pset5flink5fcreation5forder5ff"></a>
-<a name="robo338"></a><h2>H5Pset_link_creation_order_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>H5Pset_link_creation_order_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>    Sets creation order tracking and indexing for links in a group.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  gcpl_id         - Group creation property list identifier
-  crt_order_flags - Creation order flag(s)
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr           - Error code                
-                       Success:  0
-                       Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  February 18, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE h5pset_link_creation_order_f<span class="sign">(</span>gcpl_id<span class="sign">,</span> crt_order_flags<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> gcpl_id  <span class="sign">!</span> File access property list identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> crt_order_flags <span class="sign">!</span> Creation order flag<span class="sign">(</span>s<span class="sign">)</span>
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr   <span class="sign">!</span> Error code
-                                     <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pset5flink5fphase5fchange5ff"></a>
-<a name="robo339"></a><h2>h5pset_link_phase_change_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pset_link_phase_change_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets the parameters for conversion between compact and dense groups.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  gcpl_id         - Group creation property list identifier  
-  max_compact     - Maximum number of attributes to be stored in compact storage
-  min_dense       - Minimum number of attributes to be stored in dense storage
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr          - error code         
-                     Success:  0
-                     Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  March 21, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">SUBROUTINE <strong>h5pset_link_phase_change_f</strong><span class="sign">(</span>gcpl_id<span class="sign">,</span> max_compact<span class="sign">,</span> min_dense<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> gcpl_id <span class="sign">!</span> Group creation property list identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> max_compact    <span class="sign">!</span> Maximum number of attributes to be stored in compact storage
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> min_dense      <span class="sign">!</span> Minimum number of attributes to be stored in dense storage
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-                                          <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fH5Pset5flocal5fheap5fsize5fhint5ff"></a>
-<a name="robo340"></a><h2>H5Pset_local_heap_size_hint_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>H5Pset_local_heap_size_hint_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets the local heap size hint for original-style groups.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  gcpl_id   - Group creation property list identifier
-  size_hint - Hint for size of local heap
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr    - Error code
-               Success:  0
-               Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  March 21, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE h5pset_local_heap_size_hint_f<span class="sign">(</span>gcpl_id<span class="sign">,</span> size_hint<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> gcpl_id    <span class="sign">!</span> Group creation property list identifier
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> size_hint <span class="sign">!</span> Hint <span class="keyword">for</span> size of local heap
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr           <span class="sign">!</span> Error code
-                                             <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fH5Pset5fnbit5ff"></a>
-<a name="robo341"></a><h2>H5Pset_nbit_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>H5Pset_nbit_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets up the use of the N-Bit filter.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  plist_id - Dataset creation property list identifier.
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr   - Error code
-              Success:  0
-              Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  March 21, 2008
-</pre>
-<p class="item_name">HISTORY</p>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE h5pset_nbit_f<span class="sign">(</span>plist_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> plist_id <span class="sign">!</span> Dataset creation property list identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code
-                                           <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pset5fnlinks5ff"></a>
-<a name="robo342"></a><h2>h5pset_nlinks_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pset_nlinks_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets maximum number of soft or user-defined link traversals.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  lapl_id - File access property list identifier
-   nlinks - Maximum number of links to traverse
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr  - Error code
-             Success:  0
-             Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  March 24, 2008
-</pre>
-<p class="item_name">HISTORY</p>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pset_nlinks_f</strong><span class="sign">(</span>lapl_id<span class="sign">,</span> nlinks<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> lapl_id <span class="sign">!</span> File access property list identifier
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> nlinks <span class="sign">!</span> Maximum number of links to traverse
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code   
-                                          <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fH5Pset5fobj5ftrack5ftimes5ff"></a>
-<a name="robo343"></a><h2>H5Pset_obj_track_times_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>H5Pset_obj_track_times_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Set whether the birth, access, modification &amp; change times for
-  an object are stored.
-
-  Birth time is the time the object was created.  Access time is
-  the last time that metadata or raw data was read from this
-  object.  Modification time is the last time the data for
-  this object was changed (either writing raw data to a dataset
-  or inserting/modifying/deleting a link in a group).  Change
-  time is the last time the metadata for this object was written
-  (adding/modifying/deleting an attribute on an object, extending
-  the size of a dataset, etc).
-
-   If these times are not tracked, they will be reported as
-   12:00 AM UDT, Jan. 1, 1970 (i.e. 0 seconds past the UNIX
-   epoch) when queried.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  plist_id     - property list id
-  flag         - object timestamp setting
-                 .TRUE.,.FALSE.
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr       - error code            
-                  Success:  0
-                  Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  February 22, 2008
-       
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE h5pset_obj_track_times_f<span class="sign">(</span>plist_id<span class="sign">,</span> flag<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> plist_id <span class="sign">!</span> Dataset creation property
-                                           <span class="sign">!</span> list identifier
-    LOGICAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> flag    <span class="sign">!</span> Object timestamp setting
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr <span class="sign">!</span> Error code
-                                   <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pset5fpreserve5ff"></a>
-<a name="robo344"></a><h2>h5pset_preserve_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>   <strong>h5pset_preserve_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets the dataset transfer property list status to 
-  TRUE or FALSE for initializing compound datatype
-  members during write/read operations.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id       - property list identifier
-  flag         - status flag
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr       - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  NONE
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999      
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for 
-  called C functions (it is needed for Windows
-  port).  March 14, 2001 
-                       
-  Datatype of the flag parameter is changed from 
-  INTEGER to LOGICAL June 4, 2003
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pset_preserve_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> flag<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id <span class="sign">!</span> Property list identifier 
-    LOGICAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span>  flag         <span class="sign">!</span> TRUE<span class="sign">/</span>FALSE flag to set the dataset
-                                         <span class="sign">!</span> transfer property <span class="keyword">for</span> partila writing<span class="sign">/</span>reading
-                                         <span class="sign">!</span> compound datatype
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code
-                                         <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pset5fscaleoffset5ff"></a>
-<a name="robo347"></a><h2>h5pset_scaleoffset_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pset_scaleoffset_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets up the use of the Scale-Offset filter.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  plist_id     - Dataset creation property list identifier.
-  scale_type   - Flag indicating compression method.
-  scale_factor - Parameter related to scale.
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Error code
-                   Success:  0
-                   Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  March 21, 2008
-</pre>
-<p class="item_name">HISTORY</p>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pset_scaleoffset_f</strong><span class="sign">(</span>plist_id<span class="sign">,</span> scale_type<span class="sign">,</span> scale_factor<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> plist_id <span class="sign">!</span> Dataset creation property list identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> scale_type      <span class="sign">!</span> Flag indicating compression method<span class="sign">.</span>
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> scale_factor    <span class="sign">!</span> Parameter related to scale<span class="sign">.</span>
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code
-                                           <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fH5Pset5fshared5fmesg5findex5ff"></a>
-<a name="robo348"></a><h2>H5Pset_shared_mesg_index_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>H5Pset_shared_mesg_index_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Configures the specified shared object header message index
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  fcpl_id         - File creation property list identifier.
-  index_num       - Index being configured.
-  mesg_type_flags - Types of messages that should be stored in this index.
-  min_mesg_size   - Minimum message size.
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr  - error code         
-             Success:  0
-             Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  January, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE h5pset_shared_mesg_index_f<span class="sign">(</span>fcpl_id<span class="sign">,</span> index_num<span class="sign">,</span> mesg_type_flags<span class="sign">,</span> min_mesg_size<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> fcpl_id  <span class="sign">!</span> file creation property list
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> index_num       <span class="sign">!</span> Index being configured<span class="sign">.</span>
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> mesg_type_flags <span class="sign">!</span> Types of messages that should be stored in this index<span class="sign">.</span>
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> min_mesg_size   <span class="sign">!</span> Minimum message size<span class="sign">.</span>
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code
-                                           <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fH5Pset5fshared5fmesg5fnindexes5ff"></a>
-<a name="robo349"></a><h2>H5Pset_shared_mesg_nindexes_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>H5Pset_shared_mesg_nindexes_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets number of shared object header message indexes 
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  plist_id - file creation property list
-  nindexes - Number of shared object header message indexes to be available in files created with this property list
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr  - error code         
-             Success:  0
-             Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  January, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE h5pset_shared_mesg_nindexes_f<span class="sign">(</span> plist_id<span class="sign">,</span> nindexes<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> plist_id <span class="sign">!</span> File creation property list
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> nindexes  <span class="sign">!</span> Number of shared object header message indexes 
-                                     <span class="sign">!</span>  available in files created WITH this property list
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr   <span class="sign">!</span> Error code
-                                     <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pset5fshuffle5ff"></a>
-<a name="robo350"></a><h2>h5pset_shuffle_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pset_shuffle_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets shuffling filter
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id       - dataset creation property list identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr       - error code            
-                  Success:  0
-                  Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  March 12, 2003
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pset_shuffle_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id <span class="sign">!</span> Property list identifier 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code
-                                         <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pset5fsieve5fbuf5fsize5ff"></a>
-<a name="robo351"></a><h2>h5pset_sieve_buf_size_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pset_sieve_buf_size_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets the maximum size of the data sieve buffer
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  plist_id     - file access property list identifier
-  size         - sieve buffer size
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr       - error code            
-                  Success:  0
-                  Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 7, 2002      
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pset_sieve_buf_size_f</strong><span class="sign">(</span>plist_id<span class="sign">,</span> size<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> plist_id <span class="sign">!</span> File access property list identifier 
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> size    <span class="sign">!</span> Buffer size in bytes<span class="sign">;</span> 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code
-                                           <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pset5fsizes5ff"></a>
-<a name="robo352"></a><h2>h5pset_sizes_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pset_sizes_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets the byte size of the offsets and lengths used 
-  to address objects in an <a href="./HDF5_f90.html#robo76">HDF5</a> file.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id       - file creation property list identifier
-  sizeof_addr  - size of an object offset in bytes 
-  sizeof_size  - size of an object length in bytes
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr       - error code            
-                  Success:  0
-                  Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999      
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for 
-  called C functions (it is needed for Windows
-  port).  March 14, 2001 
-               
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pset_sizes_f</strong> <span class="sign">(</span>prp_id<span class="sign">,</span> sizeof_addr<span class="sign">,</span> sizeof_size<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id       <span class="sign">!</span> Property list identifier 
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> sizeof_addr <span class="sign">!</span> Size of an object 
-                                               <span class="sign">!</span>  offset in bytes 
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> sizeof_size <span class="sign">!</span> Size of an object 
-                                               <span class="sign">!</span>  length in bytes 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr             <span class="sign">!</span> Error code
-                                               <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pset5fsmall5fdata5fblock5fsize5ff"></a>
-<a name="robo353"></a><h2>h5pset_small_data_block_size_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pset_small_data_block_size_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets the minimum size of "small" raw data block
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  plist_id     - file access property list identifier
-  size         - small raw data block size
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr       - error code            
-                  Success:  0
-                  Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 7, 2002      
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pset_small_data_block_size_f</strong><span class="sign">(</span>plist_id<span class="sign">,</span> size<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> plist_id <span class="sign">!</span> File access property list identifier 
-    INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> size   <span class="sign">!</span> Small raw data block size
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code
-                                           <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pset5fsym5fk5ff"></a>
-<a name="robo354"></a><h2>h5pset_sym_k_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pset_sym_k_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets the size of parameters used to control the 
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id  - file creation property list identifier
-  ik      - symbol table tree rank
-  lk      - symbol table node size
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr  - error code         
-             Success:  0
-             Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999      
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for 
-  called C functions (it is needed for Windows
-  port).  March 14, 2001 
-               
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pset_sym_k_f</strong> <span class="sign">(</span>prp_id<span class="sign">,</span> ik<span class="sign">,</span> lk<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id <span class="sign">!</span> Property list identifier 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> ik            <span class="sign">!</span> Symbol table tree rank 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> lk            <span class="sign">!</span> Symbol table node size 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code
-                                         <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pset5fszip5ff"></a>
-<a name="robo355"></a><h2>h5pset_szip_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pset_szip_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets up use of szip compression
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  prp_id           - dataset creation property list identifier
-  options_mask     - A bit-mask conveying the desired SZIP options.
-                     Current valid values in Fortran are:
-                        H5_SZIP_EC_OM_F
-                        H5_SZIP_NN_OM_F
-  pixels_per_block - szip parameters
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr           - error code                
-                       Success:  0
-                       Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  April 10 2003
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pset_szip_f</strong><span class="sign">(</span>prp_id<span class="sign">,</span> options_mask<span class="sign">,</span> pixels_per_block<span class="sign">,</span> hdferr<span class="sign">)</span> 
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id <span class="sign">!</span> Dataset creation property 
-                                         <span class="sign">!</span> list identifier 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> options_mask  <span class="sign">!</span> A bit<span class="sign">-</span>mask conveying the desired
-                                         <span class="sign">!</span> SZIP options
-                                         <span class="sign">!</span> Current valid values in Fortran are<span class="sign">:</span>
-                                         <span class="sign">!</span>    H5_SZIP_EC_OM_F
-                                         <span class="sign">!</span>    H5_SZIP_NN_OM_F
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> pixels_per_block <span class="sign">!</span> The number of pixels or data elements 
-                                            <span class="sign">!</span> in each data block
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code
-                                         <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5pset5fuserblock5ff"></a>
-<a name="robo356"></a><h2>h5pset_userblock_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5pset_userblock_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>   Sets user block size
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>   prp_id - file creation property list to modify
-   size   - size of the user-block in bytes
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr  - error code         
-             Success:  0
-             Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999      
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for 
-  called C functions (it is needed for Windows
-  port).  March 14, 2001 
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5pset_userblock_f</strong> <span class="sign">(</span>prp_id<span class="sign">,</span> size<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> prp_id <span class="sign">!</span> Property list identifier 
-    INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> size <span class="sign">!</span> Size of the user<span class="sign">-</span>block in bytes 
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code
-                                         <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5P2fh5punregister5ff"></a>
-<a name="robo357"></a><h2>h5punregister_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5punregister_f</strong> 
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Removes a property from a property list class. 
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  class        - Property list class identifier
-  name         - name of the property to remove
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr:      - error code
-                  Success: 0 
-                  Failure: -1   
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 9, 2002      
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5punregister_f</strong><span class="sign">(</span>class<span class="sign">,</span> name<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> class  <span class="sign">!</span> property list class identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name <span class="sign">!</span> name of property to remove
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code
-                                         <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/H5Pff.f90 on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/H5Rf_c.html b/fortran/doc/DevelGuide/src/H5Rf_c.html
deleted file mode 100644
index bba197e..0000000
--- a/fortran/doc/DevelGuide/src/H5Rf_c.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/H5Rf.c</title>
-<!-- Source: ./src/H5Rf.c -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="H5Rf2fH5Rf"></a>
-<a name="robo67"></a><h2>H5Rf</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">PURPOSE</p>
-<pre>   This file contains C stubs for <a href="./H5Rff_f90.html#robo64">H5R</a> Fortran APIs
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/H5Rf.c on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/H5Rff_F03_f90.html b/fortran/doc/DevelGuide/src/H5Rff_F03_f90.html
deleted file mode 100644
index 3202540..0000000
--- a/fortran/doc/DevelGuide/src/H5Rff_F03_f90.html
+++ /dev/null
@@ -1,492 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/H5Rff_F03.f90</title>
-<!-- Source: ./src/H5Rff_F03.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="ROBODoc2fH5R2028F0329"></a>
-<a name="robo65"></a><h2>H5R (F03)</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  MODULE H5R_PROVISIONAL
-</pre>
-<p class="item_name">FILE</p>
-<pre>  fortran/src/<a href="#robo_top_of_doc">H5Rff_F03.f90</a>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  This file contains Fortran 90 and Fortran 2003 interfaces for <a href="./H5Rff_f90.html#robo64">H5R</a> functions.
-  It contains the same functions as H5Rff_DEPRECIATE.f90 but includes the
-  Fortran 2003 functions and the interface listings. This file will be compiled
-  instead of H5Rff_DEPRECIATE.f90 if Fortran 2003 functions are enabled.
-</pre>
-<p class="item_name">NOTES</p>
-<pre>                         *** IMPORTANT ***
-  If you add a new <a href="./H5Rff_f90.html#robo64">H5R</a> function you must add the function name to the
-  Windows dll file 'hdf5_fortrandll.def' in the fortran/src directory.
-  This is needed for Windows based operating systems.
-</pre>
-
-<hr />
-<a name="H5R2028F03292fh5rcreate5fobject5ff"></a>
-<a name="robo358"></a><h2>h5rcreate_object_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo65">H5R (F03)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5rcreate_object_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Creates reference to the object
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id    - location identifier
-  name      - name of the object at the specified location
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  ref       - reference to the specified object
-  hdferr:   - error code
-               Success:  0
-               Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  February 28, 2001
-</pre>
-<p class="item_name">NOTES</p>
-<pre>  This is a module procedure for the h5rcreate_f subroutine.
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5rcreate_object_f</strong><span class="sign">(</span>loc_id<span class="sign">,</span> name<span class="sign">,</span> ref<span class="sign">,</span> hdferr<span class="sign">)</span>
-    USE<span class="sign">,</span> INTRINSIC <span class="sign">:</span><span class="sign">:</span> ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> loc_id   <span class="sign">!</span> Location identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name   <span class="sign">!</span> Name of the object at location specified
-                                           <span class="sign">!</span> by loc_id identifier
-    TYPE<span class="sign">(</span>hobj_ref_t_f<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>INOUT<span class="sign">)</span><span class="sign">,</span> TARGET <span class="sign">:</span><span class="sign">:</span> ref   <span class="sign">!</span> Object reference
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5R2028F03292fh5rcreate5fptr5ff"></a>
-<a name="robo360"></a><h2>h5rcreate_ptr_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo65">H5R (F03)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5rcreate_ptr_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Creates a reference.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id     - location identifier
-  name       - name of the dataset at the specified location
-  ref_type   - type of reference:
-                H5R_OBJECT
-                H5T_STD_REF_DSETREG
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  ref        - reference created by the function call.
-  hdferr     - error code
-                  Success:  0
-                  Failure: -1
- OPTIONAL
-  space_id   - dataspace identifier that describes selected region
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  June 20, 2008
-</pre>
-<p class="item_name">NOTES</p>
-<pre>  This is a module procedure for the h5rcreate_f
-  subroutine where the output is a pointer.
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5rcreate_ptr_f</strong><span class="sign">(</span>loc_id<span class="sign">,</span> name<span class="sign">,</span> ref_type<span class="sign">,</span> ref<span class="sign">,</span> hdferr<span class="sign">,</span> space_id<span class="sign">)</span>
-    USE<span class="sign">,</span> INTRINSIC <span class="sign">:</span><span class="sign">:</span> ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> loc_id     <span class="sign">!</span> Location identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name     <span class="sign">!</span> Name of the dataset at location specified
-                                             <span class="sign">!</span> by loc_id identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> ref_type          <span class="sign">!</span> type of reference
-    TYPE<span class="sign">(</span>C_PTR<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>INOUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> ref        <span class="sign">!</span> Reference created by the function call
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr           <span class="sign">!</span> Error code
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span><span class="sign">,</span> OPTIONAL <span class="sign">:</span><span class="sign">:</span> space_id <span class="sign">!</span> Dataset<span class="squote">'s dataspace identifier
-</pre>
-
-<hr />
-<a name="H5R2028F03292fh5rcreate5fregion5ff"></a>
-<a name="robo362"></a><h2>h5rcreate_region_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo65">H5R (F03)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5rcreate_region_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Creates reference to the dataset region
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id        - location identifier
-  name          - name of the dataset at the specified location
-  space_id      - dataspace identifier that describes selected region
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  ref           - reference to the dataset region
-  hdferr:       - error code
-                   Success:  0
-                   Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  February 28, 2001
-</pre>
-<p class="item_name">NOTES</p>
-<pre>  This is a module procedure for the h5rcreate_f subroutine.
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5rcreate_region_f</strong><span class="sign">(</span>loc_id<span class="sign">,</span> name<span class="sign">,</span> space_id<span class="sign">,</span> ref<span class="sign">,</span> hdferr<span class="sign">)</span>
-    USE<span class="sign">,</span> INTRINSIC <span class="sign">:</span><span class="sign">:</span> ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> loc_id   <span class="sign">!</span> Location identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name   <span class="sign">!</span> Name of the dataset at location specified
-                                           <span class="sign">!</span> by loc_id identifier
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> space_id <span class="sign">!</span> Dataset<span class="squote">'s dataspace identifier
-    TYPE(hdset_reg_ref_t_f), INTENT(INOUT), TARGET :: ref ! Dataset region reference
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-</pre>
-
-<hr />
-<a name="H5R2028F03292fh5rdereference5fobject5ff"></a>
-<a name="robo363"></a><h2>h5rdereference_object_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo65">H5R (F03)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5rdereference_object_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Opens the <a href="./HDF5_f90.html#robo76">HDF5</a> object referenced
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  dset_id  - identifier of the dataset containing
-             reference
-  ref      - reference to open
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  obj_id   - object_identifier
-  hdferr:  - error code
-              Success:  0
-              Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  February 28, 2001
-</pre>
-<p class="item_name">NOTES</p>
-<pre>  This is a module procedure for the h5rdereference_f subroutine.
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5rdereference_object_f</strong><span class="sign">(</span>obj_id<span class="sign">,</span> ref<span class="sign">,</span> ref_obj_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-    USE<span class="sign">,</span> INTRINSIC <span class="sign">:</span><span class="sign">:</span> ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> obj_id          <span class="sign">!</span> Dataset identifier
-    TYPE<span class="sign">(</span>hobj_ref_t_f<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span><span class="sign">,</span> TARGET <span class="sign">:</span><span class="sign">:</span> ref <span class="sign">!</span> Object reference
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> ref_obj_id     <span class="sign">!</span> Object identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr                <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5R2028F03292fh5rdereference5fptr5ff"></a>
-<a name="robo365"></a><h2>h5rdereference_ptr_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo65">H5R (F03)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5rdereference_ptr_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Opens the <a href="./HDF5_f90.html#robo76">HDF5</a> object referenced.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  obj_id     - valid identifier for the file containing the
-               referenced object or any object in that file.
-  ref_type   - the reference type of ref.
-  ref        - Reference to open.
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  ref_obj_id - identifier of referenced object
-  hdferr     - error code
-                Success:  0
-                Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  June 20, 2008
-</pre>
-<p class="item_name">NOTES</p>
-<pre>  This is a module procedure for the h5rdereference_f
-  subroutine using pointers.
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5rdereference_ptr_f</strong><span class="sign">(</span>obj_id<span class="sign">,</span> ref_type<span class="sign">,</span> ref<span class="sign">,</span> ref_obj_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-    USE<span class="sign">,</span> INTRINSIC <span class="sign">:</span><span class="sign">:</span> ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> obj_id  <span class="sign">!</span> Valid identifier <span class="keyword">for</span> the file containing the
-                                          <span class="sign">!</span>  referenced object or any object in that file<span class="sign">.</span>
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> ref_type       <span class="sign">!</span> The reference type of ref<span class="sign">.</span>
-    TYPE<span class="sign">(</span>C_PTR<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> ref        <span class="sign">!</span> Object reference
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> ref_obj_id
-                                          <span class="sign">!</span> Identifier of referenced object
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5R2028F03292fh5rdereference5fregion5ff"></a>
-<a name="robo366"></a><h2>h5rdereference_region_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo65">H5R (F03)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5rdereference_region_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Opens the dataset region
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  dset_id       - identifier of the dataset containing
-                  reference to teh regions
-  ref           - reference to open
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  obj_id        - dataspace identifier
-  hdferr:       - error code
-                   Success:  0
-                   Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  February 28, 2001
-</pre>
-<p class="item_name">NOTES</p>
-<pre>  This is a module procedure for the h5rdereference_f subroutine.
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5rdereference_region_f</strong><span class="sign">(</span>obj_id<span class="sign">,</span> ref<span class="sign">,</span> ref_obj_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-    USE<span class="sign">,</span> INTRINSIC <span class="sign">:</span><span class="sign">:</span> ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> obj_id   <span class="sign">!</span> Dataset identifier
-    TYPE<span class="sign">(</span>hdset_reg_ref_t_f<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span><span class="sign">,</span> TARGET <span class="sign">:</span><span class="sign">:</span> ref   <span class="sign">!</span> Object reference
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> ref_obj_id  <span class="sign">!</span> Dataspace identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr          <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5R2028F03292fh5rget5fname5fobject5ff"></a>
-<a name="robo369"></a><h2>h5rget_name_object_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo65">H5R (F03)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5rget_name_object_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Retrieves a name of a referenced object.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id    - Identifier for the dataset containing the reference or for the group that dataset is in.
-  ref       - An object or dataset region reference.
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  name      - A name associated with the referenced object or dataset region.
-
-  hdferr:   - error code
-               Success:  0
-               Failure: -1
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  size     - The size of the name buffer.
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  March 28, 2008
-
- SOURCES
- or for the group that dataset is in.
- returning 0 (zero) if no name is associated
- with the identifier
-</pre>
-
-<hr />
-<a name="H5R2028F03292fh5rget5fname5fptr5ff"></a>
-<a name="robo370"></a><h2>h5rget_name_ptr_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo65">H5R (F03)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5rget_name_ptr_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Retrieves a name of a referenced object.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id   - Identifier for the dataset containing the reference or
-             for the group that dataset is in.
-  ref_type - Type of reference.
-  ref      - An object or dataset region reference.
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  name     - A name associated with the referenced object or dataset ptr.
-
-  hdferr   - error code
-               Success:  0
-               Failure: -1
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>   size   - The size of the name buffer.
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  March 28, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5rget_name_ptr_f</strong><span class="sign">(</span>loc_id<span class="sign">,</span> ref_type<span class="sign">,</span> ref<span class="sign">,</span> name<span class="sign">,</span> hdferr<span class="sign">,</span> size<span class="sign">)</span>
-    USE<span class="sign">,</span> INTRINSIC <span class="sign">:</span><span class="sign">:</span> ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> loc_id   <span class="sign">!</span> Identifier <span class="keyword">for</span> the dataset containing the reference
-                                           <span class="sign">!</span>  or <span class="keyword">for</span> the group that dataset is in<span class="sign">.</span>
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> ref_type <span class="sign">!</span> Type of reference<span class="sign">.</span>
-    TYPE<span class="sign">(</span>C_PTR<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> ref  <span class="sign">!</span> An object or dataset region reference<span class="sign">.</span>
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name  <span class="sign">!</span> A name associated with the referenced object or dataset ptr<span class="sign">.</span>
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> size   <span class="sign">!</span> The size of the name buffer<span class="sign">,</span>
-                                                     <span class="sign">!</span> returning 0 <span class="sign">(</span>zero<span class="sign">)</span> <span class="keyword">if</span> no name is associated
-                                                     <span class="sign">!</span> with the identifier
-</pre>
-
-<hr />
-<a name="H5R2028F03292fh5rget5fname5fregion5ff"></a>
-<a name="robo372"></a><h2>h5rget_name_region_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo65">H5R (F03)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5rget_name_region_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Retrieves a name of a dataset region.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id  - Identifier for the dataset containing the reference or
-            for the group that dataset is in.
-  ref     - An object or dataset region reference.
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  name    - A name associated with the referenced object or dataset region.
-  hdferr  - error code
-              Success:  0
-              Failure: -1
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  size    - The size of the name buffer.
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  March 28, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5rget_name_region_f</strong><span class="sign">(</span>loc_id<span class="sign">,</span> ref<span class="sign">,</span> name<span class="sign">,</span> hdferr<span class="sign">,</span> size<span class="sign">)</span>
-    USE<span class="sign">,</span> INTRINSIC <span class="sign">:</span><span class="sign">:</span> ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> loc_id   <span class="sign">!</span> Identifier <span class="keyword">for</span> the dataset containing the reference
-                                           <span class="sign">!</span> or <span class="keyword">for</span> the group that dataset is in<span class="sign">.</span>
-    TYPE<span class="sign">(</span>hdset_reg_ref_t_f<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span><span class="sign">,</span> TARGET <span class="sign">:</span><span class="sign">:</span> ref <span class="sign">!</span> Object reference
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> size     <span class="sign">!</span> The size of the name buffer<span class="sign">,</span>
-                                                       <span class="sign">!</span> returning 0 <span class="sign">(</span>zero<span class="sign">)</span> <span class="keyword">if</span> no name is associated with the identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name  <span class="sign">!</span> A name associated with the referenced object or dataset region<span class="sign">.</span>
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5R2028F03292fh5rget5fobj5ftype5ff"></a>
-<a name="robo373"></a><h2>h5rget_obj_type_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo65">H5R (F03)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5rget_obj_type_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Retrieves the type of object that an object reference points to.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id   - Identifier for the dataset containing the reference or
-             for the group that dataset is in.
-  ref_type - Type of reference to query.
-  ref      - Reference to query.
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  obj_type - Type of referenced object. 
-               H5G_UNKNOWN_F (-1)
-               H5G_LINK_F      0
-               H5G_GROUP_F     1
-               H5G_DATASET_F   2
-               H5G_TYPE_F      3
-              
-  hdferr   - error code
-               Success:  0
-               Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  Decemeber 17, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5rget_obj_type_f</strong><span class="sign">(</span>loc_id<span class="sign">,</span> ref_type<span class="sign">,</span> ref<span class="sign">,</span> obj_type<span class="sign">,</span> hdferr<span class="sign">)</span>
-    USE<span class="sign">,</span> INTRINSIC <span class="sign">:</span><span class="sign">:</span> ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> loc_id
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> ref_type
-    TYPE<span class="sign">(</span>C_PTR<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> ref
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> obj_type
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/H5Rff_F03.f90 on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/H5Rff_F90_f90.html b/fortran/doc/DevelGuide/src/H5Rff_F90_f90.html
deleted file mode 100644
index 7d20d0c..0000000
--- a/fortran/doc/DevelGuide/src/H5Rff_F90_f90.html
+++ /dev/null
@@ -1,305 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/H5Rff_F90.f90</title>
-<!-- Source: ./src/H5Rff_F90.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="ROBODoc2fH5R2028F9029"></a>
-<a name="robo66"></a><h2>H5R (F90)</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  MODULE H5R_PROVISIONAL
-</pre>
-<p class="item_name">FILE</p>
-<pre>  fortran/src/<a href="#robo_top_of_doc">H5Rff_F90.f90</a>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  This file contains Fortran 90 interfaces for <a href="./H5Rff_f90.html#robo64">H5R</a> functions. It contains
-  the same functions as <a href="./H5Rff_F03_f90.html#robo_top_of_doc">H5Rff_F03.f90</a> but excludes the Fortran 2003 functions
-  and the interface listings. This file will be compiled instead of <a href="./H5Rff_F03_f90.html#robo_top_of_doc">H5Rff_F03.f90</a>
-  if Fortran 2003 functions are not enabled.
-</pre>
-<p class="item_name">NOTES</p>
-<pre>                         *** IMPORTANT ***
-  If you add a new <a href="./H5Rff_f90.html#robo64">H5R</a> function you must add the function name to the
-  Windows dll file 'hdf5_fortrandll.def' in the fortran/src directory.
-  This is needed for Windows based operating systems.
-</pre>
-
-<hr />
-<a name="H5R2028F90292fh5rcreate5fobject5ff"></a>
-<a name="robo359"></a><h2>h5rcreate_object_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo66">H5R (F90)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5rcreate_object_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Creates reference to the object
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id        - location identifier
-  name          - name of the object at the specified location
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  ref           - reference to the specified object
-  hdferr:       - error code
-                   Success:  0
-                   Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  February 28, 2001
-</pre>
-<p class="item_name">NOTES</p>
-<pre>  This is a module procedure for the h5rcreate_f subroutine.
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5rcreate_object_f</strong><span class="sign">(</span>loc_id<span class="sign">,</span> name<span class="sign">,</span> ref<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> loc_id   <span class="sign">!</span> Location identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name   <span class="sign">!</span> Name of the object at location specified
-                                           <span class="sign">!</span> by loc_id identifier
-    TYPE<span class="sign">(</span>hobj_ref_t_f<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> ref <span class="sign">!</span> Object reference
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5R2028F90292fh5rcreate5fregion5ff"></a>
-<a name="robo361"></a><h2>h5rcreate_region_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo66">H5R (F90)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5rcreate_region_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Creates reference to the dataset region
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id        - location identifier
-  name          - name of the dataset at the specified location
-  space_id      - dataspace identifier that describes selected region
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  ref           - reference to the dataset region
-  hdferr:       - error code
-                   Success:  0
-                   Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  February 28, 2001
-</pre>
-<p class="item_name">NOTES</p>
-<pre>  This is a module procedure for the h5rcreate_f subroutine.
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5rcreate_region_f</strong><span class="sign">(</span>loc_id<span class="sign">,</span> name<span class="sign">,</span> space_id<span class="sign">,</span> ref<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> loc_id   <span class="sign">!</span> Location identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name   <span class="sign">!</span> Name of the dataset at location specified
-                                           <span class="sign">!</span> by loc_id identifier
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> space_id <span class="sign">!</span> Dataset<span class="squote">'s dataspace identifier
-    TYPE(hdset_reg_ref_t_f), INTENT(OUT) :: ref ! Dataset region reference
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-</pre>
-
-<hr />
-<a name="H5R2028F90292fh5rdereference5fobject5ff"></a>
-<a name="robo364"></a><h2>h5rdereference_object_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo66">H5R (F90)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5rdereference_object_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Opens the <a href="./HDF5_f90.html#robo76">HDF5</a> object referenced
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  dset_id  - identifier of the dataset containing reference
-  ref      - reference to open
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  obj_id   - object_identifier
-  hdferr   - error code
-              Success:  0
-              Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  February 28, 2001
-</pre>
-<p class="item_name">NOTES</p>
-<pre>  This is a module procedure for the h5rdereference_f subroutine.
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5rdereference_object_f</strong><span class="sign">(</span>dset_id<span class="sign">,</span> ref<span class="sign">,</span> obj_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> dset_id   <span class="sign">!</span> Dataset identifier
-    TYPE<span class="sign">(</span>hobj_ref_t_f<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> ref   <span class="sign">!</span> Object reference
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> obj_id   <span class="sign">!</span> Object identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr          <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5R2028F90292fh5rdereference5fregion5ff"></a>
-<a name="robo367"></a><h2>h5rdereference_region_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo66">H5R (F90)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5rdereference_region_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Opens the dataset region
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  dset_id       - identifier of the dataset containing
-                  reference to teh regions
-  ref           - reference to open
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  obj_id        - dataspace identifier
-  hdferr        - error code
-                   Success:  0
-                   Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  February 28, 2001
-</pre>
-<p class="item_name">NOTES</p>
-<pre>  This is a module procedure for the h5rdereference_f subroutine.
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5rdereference_region_f</strong><span class="sign">(</span>dset_id<span class="sign">,</span> ref<span class="sign">,</span> obj_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> dset_id      <span class="sign">!</span> Dataset identifier
-    TYPE<span class="sign">(</span>hdset_reg_ref_t_f<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> ref <span class="sign">!</span> Object reference
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> obj_id   <span class="sign">!</span> Dataspace identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr          <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5R2028F90292fh5rget5fname5fobject5ff"></a>
-<a name="robo368"></a><h2>h5rget_name_object_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo66">H5R (F90)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5rget_name_object_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Retrieves a name of a referenced object.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id  - Identifier for the dataset containing the reference or for the group that dataset is in.
-  ref     - An object or dataset region reference.
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  name    - A name associated with the referenced object or dataset region.
-
-  hdferr  - error code
-             Success:  0
-             Failure: -1
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  size    - The size of the name buffer.
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  March 28, 2008
-
- SOURCES
- or for the group that dataset is in.
- returning 0 (zero) if no name is associated with the identifier
-</pre>
-
-<hr />
-<a name="H5R2028F90292fh5rget5fname5fregion5ff"></a>
-<a name="robo371"></a><h2>h5rget_name_region_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo66">H5R (F90)</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5rget_name_region_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Retrieves a name of a dataset region.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id        - Identifier for the dataset containing the reference or
-                  for the group that dataset is in.
-  ref           - An object or dataset region reference.
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  name          - A name associated with the referenced object or dataset region.
-  hdferr        - error code
-                   Success:  0
-                   Failure: -1
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  size          - The size of the name buffer.
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  March 28, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5rget_name_region_f</strong><span class="sign">(</span>loc_id<span class="sign">,</span> ref<span class="sign">,</span> name<span class="sign">,</span> hdferr<span class="sign">,</span> size<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> loc_id   <span class="sign">!</span> Identifier <span class="keyword">for</span> the dataset containing the reference
-                                           <span class="sign">!</span> or <span class="keyword">for</span> the group that dataset is in<span class="sign">.</span>
-    TYPE<span class="sign">(</span>hdset_reg_ref_t_f<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> ref       <span class="sign">!</span> Object reference
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> size   <span class="sign">!</span> The size of the name buffer<span class="sign">,</span>
-                                                     <span class="sign">!</span> returning 0 <span class="sign">(</span>zero<span class="sign">)</span> <span class="keyword">if</span> no name is associated 
-                                                     <span class="sign">!</span> with the identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name  <span class="sign">!</span> A name associated with the referenced object or dataset region<span class="sign">.</span>
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/H5Rff_F90.f90 on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/H5Rff_f90.html b/fortran/doc/DevelGuide/src/H5Rff_f90.html
deleted file mode 100644
index 2b60b08..0000000
--- a/fortran/doc/DevelGuide/src/H5Rff_f90.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/H5Rff.f90</title>
-<!-- Source: ./src/H5Rff.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="ROBODoc2fH5R"></a>
-<a name="robo64"></a><h2>H5R</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  MODULE <strong>H5R</strong>
-</pre>
-<p class="item_name">FILE</p>
-<pre>  fortran/src/<a href="#robo_top_of_doc">H5Rff.f90</a>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  This file contains Fortran interfaces for <strong>H5R</strong> functions. It includes
-  all the functions that are independent on whether the Fortran 2003 functions
-  are enabled or disabled.
-</pre>
-<p class="item_name">NOTES</p>
-<pre>                         *** IMPORTANT ***
-  If you add a new <strong>H5R</strong> function you must add the function name to the
-  Windows dll file 'hdf5_fortrandll.def' in the fortran/src directory.
-  This is needed for Windows based operating systems.
-</pre>
-
-<hr />
-<a name="H5R2fh5rget5fobject5ftype5fobj5ff"></a>
-<a name="robo374"></a><h2>h5rget_object_type_obj_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo64">H5R</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5rget_object_type_obj_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Retrieves the type of object that an object reference points to.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  dset_id       - identifier of the dataset containing
-                  reference to the objects
-  ref           - reference to open
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  obj_type      - object_type, possible values:
-                    H5G_UNKNOWN_F     (-1)
-                    H5G_GROUP_F        0
-                    H5G_DATASET_F      1
-                    H5G_TYPE_F         2
-                    H5G_LINK_F         3
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  February 28, 2001
-</pre>
-<p class="item_name">NOTES</p>
-<pre>  This is a module procedure for the h5rget_object_type_f
-  subroutine.
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5rget_object_type_obj_f</strong><span class="sign">(</span>dset_id<span class="sign">,</span> ref<span class="sign">,</span> obj_type<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> dset_id   <span class="sign">!</span> Dataset identifier
-    TYPE<span class="sign">(</span>hobj_ref_t_f<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> ref   <span class="sign">!</span> Object reference
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> obj_type     <span class="sign">!</span> Object type
-                                         <span class="sign">!</span>  H5G_UNKNOWN_F     <span class="sign">(</span><span class="sign">-</span>1<span class="sign">)</span>
-                                         <span class="sign">!</span>  H5G_GROUP_F        0
-                                         <span class="sign">!</span>  H5G_DATASET_F      1
-                                         <span class="sign">!</span>  H5G_TYPE_F         2
-                                         <span class="sign">!</span>  H5G_LINK_F         3
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5R2fh5rget5fregion5fregion5ff"></a>
-<a name="robo375"></a><h2>h5rget_region_region_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo64">H5R</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5rget_region_region_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Retrieves a dataspace with the specified region selected
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  dset_id       - identifier of the dataset containing
-                  reference to the regions
-  ref           - reference to open
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  space_id      - dataspace identifier
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  February 28, 2001
-</pre>
-<p class="item_name">NOTES</p>
-<pre>  This is a module procedure for the h5rget_region_f subroutine.
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5rget_region_region_f</strong><span class="sign">(</span>dset_id<span class="sign">,</span> ref<span class="sign">,</span> space_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> dset_id      <span class="sign">!</span> Dataset identifier
-    TYPE<span class="sign">(</span>hdset_reg_ref_t_f<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> ref <span class="sign">!</span> Dataset region reference
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> space_id    <span class="sign">!</span> Space identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr             <span class="sign">!</span> Error code
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/H5Rff.f90 on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/H5Sf_c.html b/fortran/doc/DevelGuide/src/H5Sf_c.html
deleted file mode 100644
index ebdedf7..0000000
--- a/fortran/doc/DevelGuide/src/H5Sf_c.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/H5Sf.c</title>
-<!-- Source: ./src/H5Sf.c -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="H5Sf2fH5Sf"></a>
-<a name="robo69"></a><h2>H5Sf</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">PURPOSE</p>
-<pre>   This file contains C stubs for <a href="./H5Sff_f90.html#robo68">H5S</a> Fortran APIs
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/H5Sf.c on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/H5Sff_f90.html b/fortran/doc/DevelGuide/src/H5Sff_f90.html
deleted file mode 100644
index c26b191..0000000
--- a/fortran/doc/DevelGuide/src/H5Sff_f90.html
+++ /dev/null
@@ -1,1165 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/H5Sff.f90</title>
-<!-- Source: ./src/H5Sff.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="ROBODoc2fH5S"></a>
-<a name="robo68"></a><h2>H5S</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  MODULE <strong>H5S</strong>
-</pre>
-<p class="item_name">FILE</p>
-<pre>  fortran/src/<a href="#robo_top_of_doc">H5Sff.f90</a>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  This file contains Fortran interfaces for <strong>H5S</strong> functions. It includes
-  all the functions that are independent on whether the Fortran 2003 functions
-  are enabled or disabled.
-</pre>
-<p class="item_name">NOTES</p>
-<pre>                         *** IMPORTANT ***
-  If you add a new <strong>H5S</strong> function you must add the function name to the
-  Windows dll file 'hdf5_fortrandll.def' in the fortran/src directory.
-  This is needed for Windows based operating systems.
-</pre>
-
-<hr />
-<a name="H5S2fh5sclose5ff"></a>
-<a name="robo376"></a><h2>h5sclose_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo68">H5S</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5sclose_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Releases and terminates access to a dataspace.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  space_id    - identifier of dataspace to release
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr      - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 6, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">          SUBROUTINE <strong>h5sclose_f</strong><span class="sign">(</span>space_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> space_id <span class="sign">!</span> Dataspace identifier
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5S2fh5scopy5ff"></a>
-<a name="robo377"></a><h2>h5scopy_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo68">H5S</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5scopy_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Creates an exact copy of a dataspace.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  space_id      - dataspace identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  new_space_id  - identifier of dataspace's copy
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 6, 2001
-</pre>
-<p class="item_name">NOTES</p>
-<p class="item_name">SOURCE</p>
-<pre class="source">          SUBROUTINE <strong>h5scopy_f</strong><span class="sign">(</span>space_id<span class="sign">,</span> new_space_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> space_id <span class="sign">!</span> Dataspace identifier
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> new_space_id
-                                             <span class="sign">!</span> Identifier of dataspace<span class="squote">'s copy
-            INTEGER, INTENT(OUT) :: hdferr   ! Error code
-</pre>
-
-<hr />
-<a name="H5S2fh5screate5ff"></a>
-<a name="robo378"></a><h2>h5screate_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo68">H5S</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5screate_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Creates a new dataspace of a specified type.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  classtype   - the type of the dataspace to be created
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  space_id    - dataspace identifier
-  hdferr      - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 6, 2001
-</pre>
-<p class="item_name">NOTES</p>
-<p class="item_name">SOURCE</p>
-<pre class="source">          SUBROUTINE <strong>h5screate_f</strong><span class="sign">(</span>classtype<span class="sign">,</span> space_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> classtype     <span class="sign">!</span> The type of the dataspace
-                                                 <span class="sign">!</span> to be created<span class="sign">.</span>
-                                                 <span class="sign">!</span> Possible values are<span class="sign">:</span>
-                                                 <span class="sign">!</span>  H5S_SCALAR_F <span class="sign">(</span>0<span class="sign">)</span>
-                                                 <span class="sign">!</span>  H5S_SIMPLE_F<span class="sign">(</span>1<span class="sign">)</span>
-                                                 <span class="sign">!</span>  H5S_NULL_F<span class="sign">(</span>2<span class="sign">)</span>
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> space_id <span class="sign">!</span> Dataspace identifier
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr          <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5S2fh5screate5fsimple5ff"></a>
-<a name="robo379"></a><h2>h5screate_simple_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo68">H5S</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5screate_simple_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Creates a new simple data space and opens it for access      .
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  rank        - number of dimensions
-  dims        - an array of the size of each dimension
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  space_id    - dataspace identifier
-  hdferr      - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  maxdims     - an array of the maximum size of each dimension
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 6, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">          SUBROUTINE <strong>h5screate_simple_f</strong><span class="sign">(</span>rank<span class="sign">,</span> dims<span class="sign">,</span> space_id<span class="sign">,</span> hdferr<span class="sign">,</span> maxdims<span class="sign">)</span>
-
-            IMPLICIT NONE
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> rank             <span class="sign">!</span> Number of dataspace dimensions
-            INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> dims<span class="sign">(</span>rank<span class="sign">)</span>
-                                                    <span class="sign">!</span> Array with the dimension
-                                                    <span class="sign">!</span> sizes
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> space_id <span class="sign">!</span> Dataspace identifier
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr          <span class="sign">!</span> Error code
-            INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> maxdims<span class="sign">(</span>rank<span class="sign">)</span>
-                                                    <span class="sign">!</span> Array with the maximum
-                                                    <span class="sign">!</span> dimension sizes
-</pre>
-
-<hr />
-<a name="H5S2fH5Sdecode5ff"></a>
-<a name="robo380"></a><h2>H5Sdecode_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo68">H5S</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>H5Sdecode_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Decode a binary object description of data space and return a new object handle.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  buf   -  Buffer for the data space object to be decoded.
-  obj_id        - Object ID
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr      - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  March 26, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE h5sdecode_f<span class="sign">(</span>buf<span class="sign">,</span> obj_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> buf <span class="sign">!</span> Buffer <span class="keyword">for</span> the data space object to be decoded<span class="sign">.</span>
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> obj_id  <span class="sign">!</span> Object ID
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr     <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5S2fH5Sencode5ff"></a>
-<a name="robo381"></a><h2>H5Sencode_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo68">H5S</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>H5Sencode_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Encode a data space object description into a binary buffer.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  obj_id        - Identifier of the object to be encoded.
-  buf   - Buffer for the object to be encoded into.
-  nalloc        - The size of the allocated buffer.
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  nalloc        - The size of the buffer needed.
-  hdferr      - Returns 0 if successful and -1 if fails.
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  March 26, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE h5sencode_f<span class="sign">(</span>obj_id<span class="sign">,</span> buf<span class="sign">,</span> nalloc<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> obj_id <span class="sign">!</span> Identifier of the object to be encoded<span class="sign">.</span>
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> buf <span class="sign">!</span> Buffer <span class="keyword">for</span> the object to be encoded into<span class="sign">.</span>
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>INOUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> nalloc <span class="sign">!</span> The size of the allocated buffer<span class="sign">.</span>
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr     <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5S2fh5sextent5fcopy5ff"></a>
-<a name="robo382"></a><h2>h5sextent_copy_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo68">H5S</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5sextent_copy_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Copies the extent of a dataspace.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  dest_space_id         - the identifier for the dataspace to which
-  the extent is copied
-  source_space_id       - the identifier for the dataspace from
-  which the extent is copied
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr      - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  NONE
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 6, 2001
-</pre>
-<p class="item_name">NOTES</p>
-<p class="item_name">SOURCE</p>
-<pre class="source">          SUBROUTINE <strong>h5sextent_copy_f</strong><span class="sign">(</span>dest_space_id<span class="sign">,</span> source_space_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> dest_space_id  <span class="sign">!</span> Identifier of destination
-                                                         <span class="sign">!</span> dataspace
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> source_space_id <span class="sign">!</span> Identifier of source
-                                                          <span class="sign">!</span> dataspace
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr                <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5S2fh5sextent5fequal5ff"></a>
-<a name="robo383"></a><h2>h5sextent_equal_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo68">H5S</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5sextent_equal_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Determines whether two dataspace extents are equal.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  space1_id     - First dataspace identifier.
-  space2_id     - Second dataspace identifier.
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  Equal         - .TRUE. if equal, .FALSE. if unequal.
-  hdferr      - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  April 2, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5sextent_equal_f</strong><span class="sign">(</span>space1_id<span class="sign">,</span> space2_id<span class="sign">,</span> equal<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> space1_id <span class="sign">!</span> First dataspace identifier<span class="sign">.</span>
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> space2_id <span class="sign">!</span> Second dataspace identifier<span class="sign">.</span>
-    LOGICAL<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> Equal <span class="sign">!</span> <span class="sign">.</span>TRUE<span class="sign">.</span> <span class="keyword">if</span> equal<span class="sign">,</span> <span class="sign">.</span>FALSE<span class="sign">.</span> <span class="keyword">if</span> unequal<span class="sign">.</span>
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr                <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5S2fh5sget5fselect5fbounds5ff"></a>
-<a name="robo384"></a><h2>h5sget_select_bounds_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo68">H5S</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5sget_select_bounds_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Gets the bounding box containing the current selection.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  space_id    - dataspace identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  start       - starting coordinates of bounding box
-  end         - ending coordinates of bounding box
-  hdferr      - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  NONE
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 6, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE  <strong>h5sget_select_bounds_f</strong><span class="sign">(</span>space_id<span class="sign">,</span> start<span class="sign">,</span> END<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> space_id <span class="sign">!</span> Dataspace identifier
-    INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> DIMENSION<span class="comment">(*), INTENT(OUT) :: start
-                                           ! Starting coordinates of the bounding box.
-    INTEGER(HSIZE_T), DIMENSION(*)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> END
-                                           <span class="sign">!</span>Ending coordinates of the bounding box<span class="sign">,</span>
-                                           <span class="sign">!</span>i<span class="sign">.</span>e<span class="sign">.</span><span class="sign">,</span> the coordinates of the diagonally
-                                           <span class="sign">!</span>opposite corner
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5S2fh5sget5fselect5felem5fnpoints5ff"></a>
-<a name="robo385"></a><h2>h5sget_select_elem_npoints_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo68">H5S</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5sget_select_elem_npoints_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Gets the number of element points in the current selection
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  space_id      - dataspace identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  num_points    - number of element points in the current
-                  dataspace selection
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 6, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">          SUBROUTINE <strong>h5sget_select_elem_npoints_f</strong><span class="sign">(</span>space_id<span class="sign">,</span> num_points<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> space_id <span class="sign">!</span> Dataspace identifier
-            INTEGER<span class="sign">(</span>HSSIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> num_points
-                                             <span class="sign">!</span>number of element points
-                                             <span class="sign">!</span>in the current dataspace
-                                             <span class="sign">!</span>selection
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr   <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5S2fh5sget5fselect5felem5fpointlist5ff"></a>
-<a name="robo386"></a><h2>h5sget_select_elem_pointlist_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo68">H5S</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5sget_select_elem_pointlist_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Gets the list of element points currently selected.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  space_id    - dataspace identifier
-  startpoint  - element point to start with
-  num_points  - number of elemnt points to get
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  buf         - buffer with element points selected
-  hdferr      - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 6, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">          SUBROUTINE <strong>h5sget_select_elem_pointlist_f</strong><span class="sign">(</span>space_id<span class="sign">,</span> startpoint<span class="sign">,</span> <span class="sign">&amp;</span>
-                                                    num_points<span class="sign">,</span> buf<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> space_id <span class="sign">!</span> Dataspace identifier
-            INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> startpoint
-                                             <span class="sign">!</span>Element point to start with<span class="sign">.</span>
-            INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> num_points
-                                             <span class="sign">!</span>Number of element points to get
-            INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> DIMENSION<span class="comment">(*), INTENT(OUT) :: buf
-                                             !List of element points selected
-            INTEGER, INTENT(OUT) :: hdferr   ! Error code
-</pre>
-
-<hr />
-<a name="H5S2fh5sget5fselect5fhyper5fblocklist5ff"></a>
-<a name="robo387"></a><h2>h5sget_select_hyper_blocklist_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo68">H5S</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5sget_select_hyper_blocklist_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Gets the list of hyperslab blocks currently selected.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  space_id    - dataspace identifier
-  startblock  - hyperslab block to start with
-  num_blocks  - number of blocks to get
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  buf         - buffer to hold block list
-  hdferr      - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 6, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">          SUBROUTINE <strong>h5sget_select_hyper_blocklist_f</strong><span class="sign">(</span>space_id<span class="sign">,</span> startblock<span class="sign">,</span> <span class="sign">&amp;</span>
-                                                    num_blocks<span class="sign">,</span> buf<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> space_id <span class="sign">!</span> Dataspace identifier
-            INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> startblock
-                                             <span class="sign">!</span>Hyperslab block to start with<span class="sign">.</span>
-            INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> num_blocks
-                                             <span class="sign">!</span>number of hyperslab blocks
-                                             <span class="sign">!</span>to get in the current dataspace
-                                             <span class="sign">!</span>selection
-            INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> DIMENSION<span class="comment">(*), INTENT(OUT) :: buf
-                                             !List of hyperslab blocks selected
-            INTEGER, INTENT(OUT) :: hdferr   ! Error code
-</pre>
-
-<hr />
-<a name="H5S2fh5sget5fselect5fhyper5fnblocks5ff"></a>
-<a name="robo388"></a><h2>h5sget_select_hyper_nblocks_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo68">H5S</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5sget_select_hyper_nblocks_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Get number of hyperslab blocks.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  space_id    - dataspace identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  num_blocks  - number of hyperslab blocks in the current
-                hyperslab selection
-  hdferr      - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 6, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">          SUBROUTINE <strong>h5sget_select_hyper_nblocks_f</strong><span class="sign">(</span>space_id<span class="sign">,</span> num_blocks<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> space_id <span class="sign">!</span> Dataspace identifier
-            INTEGER<span class="sign">(</span>HSSIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> num_blocks
-                                             <span class="sign">!</span>number of hyperslab blocks
-                                             <span class="sign">!</span>in the current dataspace
-                                             <span class="sign">!</span>selection
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr   <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5S2fh5sget5fselect5fnpoints5ff"></a>
-<a name="robo389"></a><h2>h5sget_select_npoints_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo68">H5S</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5sget_select_npoints_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Determines the number of elements in a dataspace selection.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  space_id      - dataspace identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  npoints       - number of points in the dataspace selection
-  hdferr      - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 6, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">          SUBROUTINE <strong>h5sget_select_npoints_f</strong><span class="sign">(</span>space_id<span class="sign">,</span> npoints<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> space_id     <span class="sign">!</span> Dataspace identifier
-            INTEGER<span class="sign">(</span>HSSIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> npoints  <span class="sign">!</span> Number of elements in the
-                                                       <span class="sign">!</span> selection
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr             <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5S2fh5sget5fselect5ftype5ff"></a>
-<a name="robo390"></a><h2>h5sget_select_type_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo68">H5S</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5sget_select_type_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Retrieve the type of selection
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  space_id      - dataspace iidentifier with selection
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  type          - flag, valid values are:
-                    H5S_SEL_ERROR_F
-                    H5S_SEL_NONE_F
-                    H5S_SEL_POINTS_F
-                    H5S_SEL_HYPERSLABS_F
-                    H5S_SEL_ALL_F
-  hdferr      - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  October 7, 2002
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">          SUBROUTINE <strong>h5sget_select_type_f</strong><span class="sign">(</span>space_id<span class="sign">,</span> type<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>INOUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> space_id <span class="sign">!</span> Dataspace identifier to
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type        <span class="sign">!</span> Selection type
-                                                <span class="sign">!</span>  H5S_SEL_ERROR_F
-                                                <span class="sign">!</span>  H5S_SEL_NONE_F
-                                                <span class="sign">!</span>  H5S_SEL_POINTS_F
-                                                <span class="sign">!</span>  H5S_SEL_HYPERSLABS_F
-                                                <span class="sign">!</span>  H5S_SEL_ALL_F
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr     <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5S2fh5sget5fsimple5fextent5fdims5ff"></a>
-<a name="robo391"></a><h2>h5sget_simple_extent_dims_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo68">H5S</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5sget_simple_extent_dims_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Retrieves dataspace dimension size and maximum size.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  space_id      - dataspace identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  dims          - array to store size of each dimension
-  maxdims       - array to store maximum size of each
-  dimension
-  hdferr      - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 6, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">          SUBROUTINE <strong>h5sget_simple_extent_dims_f</strong><span class="sign">(</span>space_id<span class="sign">,</span> dims<span class="sign">,</span> maxdims<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> space_id <span class="sign">!</span> Dataspace identifier
-            INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> DIMENSION<span class="comment">(*), INTENT(OUT) :: dims
-                                                   ! Array to store dimension sizes
-            INTEGER(HSIZE_T), DIMENSION(*)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> maxdims
-                                                   <span class="sign">!</span> Array to store max dimension
-                                                   <span class="sign">!</span> sizes
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code<span class="sign">:</span> <span class="sign">-</span>1 on failure<span class="sign">,</span>
-                                                   <span class="sign">!</span> number of dimensions on
-                                                   <span class="sign">!</span> on success
-</pre>
-
-<hr />
-<a name="H5S2fh5sget5fsimple5fextent5fndims5ff"></a>
-<a name="robo392"></a><h2>h5sget_simple_extent_ndims_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo68">H5S</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5sget_simple_extent_ndims_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Determines the dimensionality of a dataspace
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  space_id      - dataspace identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  rank          - number of dataspace dimensions
-  hdferr      - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 6, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">          SUBROUTINE <strong>h5sget_simple_extent_ndims_f</strong><span class="sign">(</span>space_id<span class="sign">,</span> rank<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> space_id     <span class="sign">!</span> Dataspace identifier
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> rank               <span class="sign">!</span> Number of dimensions
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr             <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5S2fh5sget5fsimple5fextent5fnpoints5ff"></a>
-<a name="robo393"></a><h2>h5sget_simple_extent_npoints_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo68">H5S</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5sget_simple_extent_npoints_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Determines the number of elements in a dataspace.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  space_id      - dataspace identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  npoints       - number of elements in the dataspace
-  hdferr      - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 6, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">          SUBROUTINE <strong>h5sget_simple_extent_npoints_f</strong><span class="sign">(</span>space_id<span class="sign">,</span> npoints<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> space_id     <span class="sign">!</span> Dataspace identifier
-            INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> npoints  <span class="sign">!</span> Number of elements in
-                                                       <span class="sign">!</span> dataspace
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr             <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5S2fh5sget5fsimple5fextent5ftype5ff"></a>
-<a name="robo394"></a><h2>h5sget_simple_extent_type_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo68">H5S</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5sget_simple_extent_type_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Determine the current class of a dataspace
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  space_id      - dataspace identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  classtype     - class type, possible values are:
-  H5S_NO_CLASS_F (-1)
-  H5S_SCALAR_F (0)
-  H5S_SIMPLE_F (1)
-  H5S_NULL_F   (2)
-  hdferr      - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 6, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">          SUBROUTINE <strong>h5sget_simple_extent_type_f</strong><span class="sign">(</span>space_id<span class="sign">,</span> classtype<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> space_id <span class="sign">!</span> Dataspace identifier
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> classtype      <span class="sign">!</span> Class type <span class="sign">,</span> possible values
-                                                   <span class="sign">!</span> are<span class="sign">:</span>
-                                                   <span class="sign">!</span>  H5S_NO_CLASS_F <span class="sign">(</span><span class="sign">-</span>1<span class="sign">)</span>
-                                                   <span class="sign">!</span>  H5S_SCALAR_F <span class="sign">(</span>0<span class="sign">)</span>
-                                                   <span class="sign">!</span>  H5S_SIMPLE_F <span class="sign">(</span>1<span class="sign">)</span>
-                                                   <span class="sign">!</span>  H5S_NULL_F   <span class="sign">(</span>2<span class="sign">)</span>
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5S2fh5sis5fsimple5ff"></a>
-<a name="robo395"></a><h2>h5sis_simple_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo68">H5S</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5sis_simple_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Determines whether a dataspace is a simple dataspace.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  space_id      - dataspace identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  status        - flag to indicate if dataspace
-  is simple or not
-  hdferr      - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 6, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">          SUBROUTINE <strong>h5sis_simple_f</strong><span class="sign">(</span>space_id<span class="sign">,</span> status<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> space_id  <span class="sign">!</span> Dataspace identifier
-            LOGICAL<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> status      <span class="sign">!</span> Flag<span class="sign">,</span> idicates <span class="keyword">if</span> dataspace
-                                                <span class="sign">!</span> is simple or not <span class="sign">(</span> TRUE or
-                                                <span class="sign">!</span> FALSE<span class="sign">)</span>
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr      <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5S2fh5soffset5fsimple5ff"></a>
-<a name="robo396"></a><h2>h5soffset_simple_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo68">H5S</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5soffset_simple_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets the offset of a simple dataspace.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  space_id      - dataspace identifier
-  offset        - the offset at which to position the
-  selection
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr      - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  NONE
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 6, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">          SUBROUTINE <strong>h5soffset_simple_f</strong><span class="sign">(</span>space_id<span class="sign">,</span> offset<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> space_id <span class="sign">!</span> Dataspace identifier
-            INTEGER<span class="sign">(</span>HSSIZE_T<span class="sign">)</span><span class="sign">,</span> DIMENSION<span class="comment">(*), INTENT(IN) ::  offset
-                                                   ! The offset at which to position
-                                                   ! the selection
-            INTEGER, INTENT(OUT) :: hdferr         ! Error code
-</pre>
-
-<hr />
-<a name="H5S2fh5sselect5fall5ff"></a>
-<a name="robo397"></a><h2>h5sselect_all_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo68">H5S</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5sselect_all_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Selects the entire dataspace.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  space_id    - Identifier for the dataspace in which
-                selection being made
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr      - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 6, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">          SUBROUTINE <strong>h5sselect_all_f</strong><span class="sign">(</span>space_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> space_id  <span class="sign">!</span> Dataspace identifier
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr          <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5S2fh5sselect5felements5ff"></a>
-<a name="robo398"></a><h2>h5sselect_elements_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo68">H5S</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5sselect_elements_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Selects elements to be included in the selection for
-  a dataspace
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  space_id      - dataspace identifier
-  operator      - flag, valid values are:
-                   H5S_SELECT_SET_F 
-                   H5S_SELECT_APPEND_F 
-                   H5S_SELECT_PREPEND_F
-  rank          - number of dataspace dimensions
-  num_elements  - number of elements to be selected
-  coord         - 2D (rank x num_elements) array with the
-                  elements coordinates ( 1-based); in C the
-                  array is stored in 2D as (num_element x rank)
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 6, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5sselect_elements_f</strong><span class="sign">(</span>space_id<span class="sign">,</span> OPERATOR<span class="sign">,</span> rank<span class="sign">,</span> <span class="sign">&amp;</span>
-       num_elements<span class="sign">,</span> coord<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span>   INTENT<span class="sign">(</span>IN<span class="sign">)</span>                                <span class="sign">:</span><span class="sign">:</span> space_id
-    INTEGER<span class="sign">,</span>          INTENT<span class="sign">(</span>IN<span class="sign">)</span>                                <span class="sign">:</span><span class="sign">:</span> OPERATOR
-    INTEGER<span class="sign">,</span>          INTENT<span class="sign">(</span>IN<span class="sign">)</span>                                <span class="sign">:</span><span class="sign">:</span> rank
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span>  INTENT<span class="sign">(</span>IN<span class="sign">)</span>                                <span class="sign">:</span><span class="sign">:</span> num_elements
-    INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">,</span> DIMENSION<span class="sign">(</span>rank<span class="sign">,</span>num_elements<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> coord
-    INTEGER<span class="sign">,</span>          INTENT<span class="sign">(</span>OUT<span class="sign">)</span>                               <span class="sign">:</span><span class="sign">:</span> hdferr 
-</pre>
-
-<hr />
-<a name="H5S2fh5sselect5fhyperslab5ff"></a>
-<a name="robo399"></a><h2>h5sselect_hyperslab_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo68">H5S</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5sselect_hyperslab_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Selects a hyperslab region to add to the current selected
-  region
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  space_id      - dataspace identifier
-  operator      - flag, valid values are:
-  H5S_SELECT_SET_F (0)
-  H5S_SELECT_OR_F (1)
-  start         - array with hyperslab offsets
-  count         - number of blocks included in the
-  hyperslab
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr      - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  stride        - array with hyperslab strides
-  block         - array with hyperslab block sizes
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 6, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">          SUBROUTINE <strong>h5sselect_hyperslab_f</strong><span class="sign">(</span>space_id<span class="sign">,</span> operator<span class="sign">,</span> start<span class="sign">,</span> count<span class="sign">,</span> <span class="sign">&amp;</span>
-                                           hdferr<span class="sign">,</span> stride<span class="sign">,</span> block<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> space_id <span class="sign">!</span> Dataspace identifier
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> operator     <span class="sign">!</span> Flag<span class="sign">,</span> valid values are<span class="sign">:</span>
-                                                <span class="sign">!</span> H5S_SELECT_SET_F <span class="sign">(</span>0<span class="sign">)</span>
-                                                <span class="sign">!</span> H5S_SELECT_OR_F <span class="sign">(</span>1<span class="sign">)</span>
-                                                <span class="sign">!</span>
-            INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> DIMENSION<span class="comment">(*), INTENT(IN) :: start
-                                          ! Starting coordinates of the hyperslab
-            INTEGER(HSIZE_T), DIMENSION(*)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> count
-                                          <span class="sign">!</span> Number of blocks to select
-                                          <span class="sign">!</span> from dataspace
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr     <span class="sign">!</span> Error code
-            INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> DIMENSION<span class="sign">(</span><span class="sign">:</span><span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> stride
-                                          <span class="sign">!</span> Array of how many elements to move
-                                          <span class="sign">!</span> in each direction
-            INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> DIMENSION<span class="sign">(</span><span class="sign">:</span><span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> block
-                                          <span class="sign">!</span> Sizes of element block
-</pre>
-
-<hr />
-<a name="H5S2fh5sselect5fnone5ff"></a>
-<a name="robo400"></a><h2>h5sselect_none_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo68">H5S</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5sselect_none_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Resets the selection region to include no elements.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  space_id    - the identifier for the dataspace in which
-                the selection is being reset.
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr      - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 6, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">          SUBROUTINE <strong>h5sselect_none_f</strong><span class="sign">(</span>space_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> space_id  <span class="sign">!</span> Dataspace identifier
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr          <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5S2fh5sselect5fvalid5ff"></a>
-<a name="robo401"></a><h2>h5sselect_valid_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo68">H5S</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5sselect_valid_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Verifies that the selection is within the extent of
-  the dataspace.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  space_id      - identifier for the dataspace for which
-  selection is verified
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr      - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 6, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">          SUBROUTINE <strong>h5sselect_valid_f</strong><span class="sign">(</span>space_id<span class="sign">,</span> status<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> space_id  <span class="sign">!</span> Dataspace identifier
-            LOGICAL<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> status          <span class="sign">!</span> TRUE <span class="keyword">if</span> the selection is
-                                                    <span class="sign">!</span> contained within the extent<span class="sign">,</span>
-                                                    <span class="sign">!</span> FALSE otherwise<span class="sign">.</span>
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr          <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5S2fh5sset5fextent5fnone5ff"></a>
-<a name="robo402"></a><h2>h5sset_extent_none_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo68">H5S</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5sset_extent_none_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Removes the extent from a dataspace.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  space_id      - dataspace identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr      - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 6, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">          SUBROUTINE <strong>h5sset_extent_none_f</strong><span class="sign">(</span>space_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> space_id  <span class="sign">!</span> Dataspace identifier
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr          <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5S2fh5sset5fextent5fsimple5ff"></a>
-<a name="robo403"></a><h2>h5sset_extent_simple_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo68">H5S</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5sset_extent_simple_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets or resets the size of an existing dataspace.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  space_id      - dataspace identifier
-  rank          - dataspace number of dimensions
-  current_size          - array with the new sizes of dimensions
-  maximum_size          - array with the new maximum sizes of
-  dimensions
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr      - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 6, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">          SUBROUTINE <strong>h5sset_extent_simple_f</strong><span class="sign">(</span>space_id<span class="sign">,</span> rank<span class="sign">,</span> current_size<span class="sign">,</span> <span class="sign">&amp;</span>
-                                            maximum_size<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> space_id <span class="sign">!</span> Dataspace identifier
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> rank            <span class="sign">!</span> Dataspace rank
-            INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> DIMENSION<span class="sign">(</span>rank<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> current_size
-                                                   <span class="sign">!</span> Array with the new sizes
-                                                   <span class="sign">!</span> of dimensions
-            INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> DIMENSION<span class="sign">(</span>rank<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> maximum_size
-                                                   <span class="sign">!</span> Array with the new maximum
-                                                   <span class="sign">!</span> sizes of dimensions
-                                                   <span class="sign">!</span> sizes
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr         <span class="sign">!</span> Error code
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/H5Sff.f90 on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/H5Tf_c.html b/fortran/doc/DevelGuide/src/H5Tf_c.html
deleted file mode 100644
index b36c2a5..0000000
--- a/fortran/doc/DevelGuide/src/H5Tf_c.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/H5Tf.c</title>
-<!-- Source: ./src/H5Tf.c -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="H5Tf2fH5Tf"></a>
-<a name="robo73"></a><h2>H5Tf</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">PURPOSE</p>
-<pre>   This file contains C stubs for <a href="./H5Tff_f90.html#robo70">H5T</a> Fortran APIs
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/H5Tf.c on Sun Aug 14 2011 22:49:37
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/H5Tff_f90.html b/fortran/doc/DevelGuide/src/H5Tff_f90.html
deleted file mode 100644
index 3b7dfe8..0000000
--- a/fortran/doc/DevelGuide/src/H5Tff_f90.html
+++ /dev/null
@@ -1,2378 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/H5Tff.f90</title>
-<!-- Source: ./src/H5Tff.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="ROBODoc2fH5T"></a>
-<a name="robo70"></a><h2>H5T</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  MODULE <strong>H5T</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  This file contains Fortran interfaces for <strong>H5T</strong> functions. It includes
-  all the functions that are independent on whether the Fortran 2003 functions
-  are enabled or disabled.
-</pre>
-<p class="item_name">NOTES</p>
-<pre>                         *** IMPORTANT ***
-  If you add a new <strong>H5T</strong> function you must add the function name to the
-  Windows dll file 'hdf5_fortrandll.def' in the fortran/src directory.
-  This is needed for Windows based operating systems.
-</pre>
-
-<hr />
-<a name="H5T2fh5tarray5fcreate5ff"></a>
-<a name="robo404"></a><h2>h5tarray_create_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tarray_create_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Creates an array datatype object.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  base_id       - datatype identifier for the array
-                  base datatype
-  rank          - rank of the array
-  dims          - array dimension sizes
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  type_id       - array datatype identifier
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 7, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tarray_create_f</strong><span class="sign">(</span>base_id<span class="sign">,</span> rank<span class="sign">,</span> dims<span class="sign">,</span> type_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> base_id <span class="sign">!</span> identifier of array base datatype
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span>  rank <span class="sign">!</span> Rank of the array
-            INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span> DIMENSION<span class="comment">(*), INTENT(IN) :: dims !Sizes of each array dimension
-            INTEGER(HID_T), INTENT(OUT) :: type_id ! identifier of the array datatype
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
-</pre>
-
-<hr />
-<a name="H5T2fh5tclose5ff"></a>
-<a name="robo405"></a><h2>h5tclose_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tclose_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Releases a datatype.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  type_id       - datatype identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 7, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tclose_f</strong><span class="sign">(</span>type_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id <span class="sign">!</span> Datatype identifier
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5T2fh5tcommit5fanon5ff"></a>
-<a name="robo406"></a><h2>h5tcommit_anon_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tcommit_anon_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Commits a transient datatype to a file,
-  creating a new named datatype,
-  but does not link it into the file structure.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id        - A file or group identifier specifying the file
-                  in which the new named datatype is to be created.
-  dtype_id      - A datatype identifier.
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  tcpl_id       - A datatype creation property list identifier.
-                  (H5P_DEFAULT_F for the default property list.)
-  tapl_id       - A datatype access property list identifier.
-                  should always be passed as the value H5P_DEFAULT_F.
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  February 25, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tcommit_anon_f</strong><span class="sign">(</span>loc_id<span class="sign">,</span> dtype_id<span class="sign">,</span> hdferr<span class="sign">,</span> tcpl_id<span class="sign">,</span> tapl_id<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> loc_id  <span class="sign">!</span> A file or group identifier specifying
-                                          <span class="sign">!</span> the file in which the new named datatype
-                                          <span class="sign">!</span> is to be created<span class="sign">.</span>
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> dtype_id  <span class="sign">!</span> Datatype identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr          <span class="sign">!</span> Error code
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> tcpl_id <span class="sign">!</span> A datatype creation property
-                                                    <span class="sign">!</span> list identifier<span class="sign">.</span>
-                                                    <span class="sign">!</span> <span class="sign">(</span>H5P_DEFAULT_F <span class="keyword">for</span> the <span class="keyword">default</span> property list<span class="sign">.</span><span class="sign">)</span>
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> tapl_id <span class="sign">!</span> A datatype access property list identifier<span class="sign">.</span>
-                                                    <span class="sign">!</span> should always be passed as the value H5P_DEFAULT_F<span class="sign">.</span>
-</pre>
-
-<hr />
-<a name="H5T2fh5tcommit5ff"></a>
-<a name="robo407"></a><h2>h5tcommit_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tcommit_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Commits a transient datatype to a file, creating a
-  new named datatype.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id        - location identifier
-  name          - name of the datatype to be stored
-                  at the specified location
-  type_id       - identifier of a datatype to be stored
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  lcpl_id       - Link creation property list
-  tcpl_id       - Datatype creation property list
-  tapl_id       - Datatype access property list
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>        - Explicit Fortran interfaces were added for
-          called C functions (it is needed for Windows
-          port).  March 7, 2001
-
-        - Added optional parameters introduced in version 1.8
-          M. Scot Breitenfeld
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tcommit_f</strong><span class="sign">(</span>loc_id<span class="sign">,</span> name<span class="sign">,</span> type_id<span class="sign">,</span> hdferr<span class="sign">,</span> <span class="sign">&amp;</span>
-       lcpl_id<span class="sign">,</span> tcpl_id<span class="sign">,</span> tapl_id  <span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> loc_id  <span class="sign">!</span> File or group identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name
-                                  <span class="sign">!</span> Datatype name within file or group
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id  <span class="sign">!</span> Datatype identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr          <span class="sign">!</span> Error code
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> lcpl_id <span class="sign">!</span> Link creation property list
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> tcpl_id <span class="sign">!</span> Datatype creation property list
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> tapl_id <span class="sign">!</span> Datatype access property list
-</pre>
-
-<hr />
-<a name="H5T2fh5tcommitted5ff"></a>
-<a name="robo408"></a><h2>h5tcommitted_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tcommitted_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Determines whether a datatype is a named type or a transient type.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  dtype_id      - A datatype identifier.
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  committed     - .TRUE., if the datatype has been committed
-                  .FALSE., if the datatype has not been committed.
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  February 25, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tcommitted_f</strong><span class="sign">(</span>dtype_id<span class="sign">,</span> committed<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> dtype_id  <span class="sign">!</span> A datatype identifier
-    LOGICAL<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> committed <span class="sign">!</span> <span class="sign">.</span>TRUE<span class="sign">.</span><span class="sign">,</span> <span class="keyword">if</span> the datatype has been committed
-                                      <span class="sign">!</span><span class="sign">.</span>FALSE<span class="sign">.</span><span class="sign">,</span> <span class="keyword">if</span> the datatype has not been committed<span class="sign">.</span>
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr     <span class="sign">!</span> Error code<span class="sign">:</span>
-<span class="sign">!</span>  Success<span class="sign">:</span>  0
-<span class="sign">!</span>  Failure<span class="sign">:</span> <span class="sign">-</span>1
-</pre>
-
-<hr />
-<a name="H5T2fh5tcompiler5fconv5ff"></a>
-<a name="robo409"></a><h2>h5tcompiler_conv_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tcompiler_conv_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Check whether the library’s default conversion is hard conversion.R
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  src_id        - Identifier for the source datatype.
-  dst_id        - Identifier for the destination datatype.
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  flag          - TRUE for compiler conversion, FALSE for library conversion
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  April 9, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tcompiler_conv_f</strong><span class="sign">(</span> src_id<span class="sign">,</span> dst_id<span class="sign">,</span> flag<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> src_id <span class="sign">!</span> Identifier <span class="keyword">for</span> the source datatype<span class="sign">.</span>
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> dst_id <span class="sign">!</span> Identifier <span class="keyword">for</span> the destination datatype<span class="sign">.</span>
-    LOGICAL<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> flag  <span class="sign">!</span> <span class="sign">.</span>TRUE<span class="sign">.</span> <span class="keyword">for</span> compiler conversion<span class="sign">,</span> <span class="sign">.</span>FALSE<span class="sign">.</span> <span class="keyword">for</span> library conversion
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr  <span class="sign">!</span> Error code<span class="sign">:</span>
-                                    <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5T2fh5tcopy5ff"></a>
-<a name="robo411"></a><h2>h5tcopy_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tcopy_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Creates a copy of exisiting datatype.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  type_id       - datatype identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  new_type_id   - identifier of datatype's copy
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 7, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tcopy_f</strong><span class="sign">(</span>type_id<span class="sign">,</span> new_type_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id <span class="sign">!</span> Datatype identifier
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> new_type_id
-                                 <span class="sign">!</span> Identifier of datatype<span class="squote">'s copy
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
-</pre>
-
-<hr />
-<a name="H5T2fh5tcreate5ff"></a>
-<a name="robo412"></a><h2>h5tcreate_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tcreate_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Creates a new dataype
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  class         - datatype class, possible values are:
-                    H5T_COMPOUND_F
-                    H5T_ENUM_F
-                    H5T_OPAQUE_F
-  size          - datattype size
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  type_id       - datatype identifier
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 7, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tcreate_f</strong><span class="sign">(</span>class<span class="sign">,</span> size<span class="sign">,</span> type_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> class <span class="sign">!</span> Datatype class can be one of
-                                         <span class="sign">!</span> H5T_COMPOUND_F
-                                         <span class="sign">!</span> H5T_ENUM_F
-                                         <span class="sign">!</span> H5T_OPAQUE_F
-            INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> size <span class="sign">!</span> Size of the datatype
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id <span class="sign">!</span> Datatype identifier
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5T2fH5Tdecode5ff"></a>
-<a name="robo413"></a><h2>H5Tdecode_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>H5Tdecode_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Decode a binary object description of data type and return a new object handle.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  buf           -  Buffer for the data space object to be decoded.
-  obj_id        - Object ID
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  April 9, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE h5tdecode_f<span class="sign">(</span>buf<span class="sign">,</span> obj_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> buf <span class="sign">!</span> Buffer <span class="keyword">for</span> the data space object to be decoded<span class="sign">.</span>
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> obj_id  <span class="sign">!</span> Object ID
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr     <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5T2fh5tenaum5finsert5ff"></a>
-<a name="robo414"></a><h2>h5tenaum_insert_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tenaum_insert_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Inserts a new enumeration datatype member.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  type_id       - datatype identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 7, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE h5tenum_insert_f<span class="sign">(</span>type_id<span class="sign">,</span>  name<span class="sign">,</span> value<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id <span class="sign">!</span> Datatype identifier
-            CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name  <span class="sign">!</span>Name of  the new member
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> value <span class="sign">!</span>value of the new member
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5T2fH5Tencode5ff"></a>
-<a name="robo415"></a><h2>H5Tencode_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>H5Tencode_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Encode a data type object description into a binary buffer.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  obj_id        - Identifier of the object to be encoded.
-  buf           - Buffer for the object to be encoded into.
-  nalloc        - The size of the allocated buffer.
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  nalloc        - The size of the buffer needed.
-  hdferr        - Returns 0 if successful and -1 if fails.
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  April 9, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE h5tencode_f<span class="sign">(</span>obj_id<span class="sign">,</span> buf<span class="sign">,</span> nalloc<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> obj_id <span class="sign">!</span> Identifier of the object to be encoded<span class="sign">.</span>
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> buf <span class="sign">!</span> Buffer <span class="keyword">for</span> the object to be encoded into<span class="sign">.</span>
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>INOUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> nalloc <span class="sign">!</span> The size of the allocated buffer<span class="sign">.</span>
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr     <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5T2fh5tenum5fcreate5ff"></a>
-<a name="robo416"></a><h2>h5tenum_create_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tenum_create_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Creates a new enumeration datatype.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  parent_id     - datatype identifier for base datatype
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  new_type_id   - datatype identifier for the enumeration datatype
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 7, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tenum_create_f</strong><span class="sign">(</span>parent_id<span class="sign">,</span> new_type_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> parent_id  <span class="sign">!</span> Datatype identifier <span class="keyword">for</span>
-                                                     <span class="sign">!</span> the  base datatype
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> new_type_id
-                                                     <span class="sign">!</span>datatype identifier <span class="keyword">for</span> the
-                                                     <span class="sign">!</span> new enumeration datatype
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5T2fh5tenum5fnameof5ff"></a>
-<a name="robo417"></a><h2>h5tenum_nameof_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tenum_nameof_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Returns the symbol name corresponding to a specified
-  member of an enumeration datatype.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  type_id       - datatype identifier
-  value         - value of the enumeration datatype
-  namelen       - name buffer size
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  name          - buffer to hold symbol name
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 7, 2001
-
- NOTE
-   According to the standard: Because an INTENT(OUT) variable is considered undefined 
-   on entry to the procedure, any default initialization specified for its type will 
-   be applied. So we need to blank out the "name" to be portable and eliminate any 
-   characters the "name' may contain upon entry, depending on compiler implementation.
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tenum_nameof_f</strong><span class="sign">(</span>type_id<span class="sign">,</span>  value<span class="sign">,</span> namelen<span class="sign">,</span> name<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id <span class="sign">!</span> Datatype identifier
-            CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name  <span class="sign">!</span>Name of the  enumeration datatype<span class="sign">.</span>
-            INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> namelen <span class="sign">!</span>length of the name
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> value <span class="sign">!</span>value of the  enumeration datatype<span class="sign">.</span>
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5T2fh5tenum5fvaluof5ff"></a>
-<a name="robo418"></a><h2>h5tenum_valuof_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tenum_valuof_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Returns the value corresponding to a specified
-  member of an enumeration datatype.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  type_id       - datatype identifier
-  name          - symbol name
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  value         - value of the enumeration datatype
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 7, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE h5tenum_valueof_f<span class="sign">(</span>type_id<span class="sign">,</span>  name<span class="sign">,</span> value<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id <span class="sign">!</span> Datatype identifier
-            CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name  <span class="sign">!</span>Name of the  enumeration datatype<span class="sign">.</span>
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> value <span class="sign">!</span>value of the  enumeration datatype<span class="sign">.</span>
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5T2fh5tequal5ff"></a>
-<a name="robo419"></a><h2>h5tequal_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tequal_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Determines whether two datatype identifiers refer
-  to the same datatype.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  type1_id      - datatype identifier
-  type2_id      - datatype identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  flag          - TRUE/FALSE flag to indicate
-                  if two datatypes are equal
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 7, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tequal_f</strong><span class="sign">(</span>type1_id<span class="sign">,</span> type2_id<span class="sign">,</span> flag<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type1_id <span class="sign">!</span> Datatype identifier
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type2_id <span class="sign">!</span> Datatype identifier
-            LOGICAL<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> flag <span class="sign">!</span> TRUE<span class="sign">/</span>FALSE flag to indicate <span class="keyword">if</span> two
-                                         <span class="sign">!</span> datatypes are equal
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5T2fh5tget5farray5fdims5ff"></a>
-<a name="robo422"></a><h2>h5tget_array_dims_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tget_array_dims_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Returns sizes of array dimensions.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  type_id       - array datatype identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  dims          - buffer to store array datatype dimensions
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 7, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tget_array_dims_f</strong><span class="sign">(</span>type_id<span class="sign">,</span> dims<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id <span class="sign">!</span> Array datatype identifier
-            INTEGER<span class="sign">(</span>HSIZE_T<span class="sign">)</span><span class="sign">,</span>DIMENSION<span class="comment">(*), INTENT(OUT) ::  dims !buffer to store array datatype
-                                                                ! dimensions
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
-</pre>
-
-<hr />
-<a name="H5T2fh5tget5farray5fndims5ff"></a>
-<a name="robo423"></a><h2>h5tget_array_ndims_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tget_array_ndims_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Returns the rank of an array datatype.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  type_id       - array datatype identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  ndims         - number of array dimensions
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 7, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tget_array_ndims_f</strong><span class="sign">(</span>type_id<span class="sign">,</span> ndims<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id <span class="sign">!</span> Array datatype identifier
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span>  ndims <span class="sign">!</span> number of array dimensions
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5T2fh5tget5fclass5ff"></a>
-<a name="robo424"></a><h2>h5tget_class_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tget_class_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Returns the datatype class identifier.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  type_id       - datatype identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  class         - class, possible values are:
-                   H5T_NO_CLASS_F (-1)
-                   H5T_INTEGER_F  (0)
-                   H5T_FLOAT_F (1)
-                   H5T_TIME_F  (2)
-                   H5T_STRING_F (3)
-                   H5T_BITFIELD_F (4)
-                   H5T_OPAQUE_F (5)
-                   H5T_COMPOUND_F (6)
-                   H5T_REFERENCE_F (7)
-                   H5T_ENUM_F (8)
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 7, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tget_class_f</strong><span class="sign">(</span>type_id<span class="sign">,</span> class<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id <span class="sign">!</span> Datatype identifier
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> class
-                           <span class="sign">!</span> Datatype class<span class="sign">,</span> possible values are<span class="sign">:</span>
-                                          <span class="sign">!</span> H5T_NO_CLASS_F <span class="sign">(</span><span class="sign">-</span>1<span class="sign">)</span>
-                                          <span class="sign">!</span> H5T_INTEGER_F  <span class="sign">(</span>0<span class="sign">)</span>
-                                          <span class="sign">!</span> H5T_FLOAT_F <span class="sign">(</span>1<span class="sign">)</span>
-                                          <span class="sign">!</span> H5T_TIME_F  <span class="sign">(</span>2<span class="sign">)</span>
-                                          <span class="sign">!</span> H5T_STRING_F <span class="sign">(</span>3<span class="sign">)</span>
-                                          <span class="sign">!</span> H5T_BITFIELD_F <span class="sign">(</span>4<span class="sign">)</span>
-                                          <span class="sign">!</span> H5T_OPAQUE_F <span class="sign">(</span>5<span class="sign">)</span>
-                                          <span class="sign">!</span> H5T_COMPOUND_F <span class="sign">(</span>6<span class="sign">)</span>
-                                          <span class="sign">!</span> H5T_REFERENCE_F <span class="sign">(</span>7<span class="sign">)</span>
-                                          <span class="sign">!</span> H5T_ENUM_F <span class="sign">(</span>8<span class="sign">)</span>
-          INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5T2fh5tget5fcreate5fplist5ff"></a>
-<a name="robo425"></a><h2>h5tget_create_plist_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tget_create_plist_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Returns a copy of a datatype creation property list.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  dtype_id      - Datatype identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  dtpl_id       - Datatype property list identifier
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  April 9, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tget_create_plist_f</strong><span class="sign">(</span>dtype_id<span class="sign">,</span> dtpl_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> dtype_id  <span class="sign">!</span> Datatype identifier
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> dtpl_id  <span class="sign">!</span> Datatype property list identifier<span class="sign">.</span>
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr       <span class="sign">!</span> Error code<span class="sign">:</span>
-                                         <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5T2fh5tget5fcset5ff"></a>
-<a name="robo426"></a><h2>h5tget_cset_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tget_cset_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Retrieves the character set type of a string datatype.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  type_id  - Datatype identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  cset     - Character set type of a string datatype
-              Possible values are:
-              H5T_CSET_ASCII_F = 0
-              H5T_CSET_UTF8_F
-  hdferr   - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 7, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tget_cset_f</strong><span class="sign">(</span>type_id<span class="sign">,</span> cset<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id <span class="sign">!</span> Datatype identifier
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> cset   <span class="sign">!</span> character set type of a string datatype
-                                           <span class="sign">!</span>  Possible values are<span class="sign">:</span>
-                                           <span class="sign">!</span>  H5T_CSET_ASCII_F <span class="sign">=</span> 0
-                                           <span class="sign">!</span>  H5T_CSET_UTF8_F
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5T2fh5tget5febias5ff"></a>
-<a name="robo427"></a><h2>h5tget_ebias_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tget_ebias_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Retrieves the exponent bias of a floating-point type.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  type_id       - datatype identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  ebias         - datatype exponent bias
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 7, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tget_ebias_f</strong><span class="sign">(</span>type_id<span class="sign">,</span> ebias<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id <span class="sign">!</span> Datatype identifier
-            INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> ebias <span class="sign">!</span> Datatype exponent bias of a floating<span class="sign">-</span>point type
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5T2fh5tget5ffields5ff"></a>
-<a name="robo428"></a><h2>h5tget_fields_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tget_fields_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Retrieves floating point datatype bit field information.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  type_id       - datatype identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  spos          - sign bit-position
-  epos          - exponent bit-position
-  esize         - size of exponent in bits
-  mpos          - mantissa position
-  msize         - size of mantissa in bits
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 7, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tget_fields_f</strong><span class="sign">(</span>type_id<span class="sign">,</span> spos<span class="sign">,</span> epos<span class="sign">,</span> esize<span class="sign">,</span> mpos<span class="sign">,</span> msize<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id <span class="sign">!</span> Datatype identifier
-            INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> spos   <span class="sign">!</span> sign bit<span class="sign">-</span>position
-            INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> epos   <span class="sign">!</span> exponent bit<span class="sign">-</span>position
-            INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> esize  <span class="sign">!</span> size of exponent in bits
-            INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> mpos   <span class="sign">!</span> mantissa bit<span class="sign">-</span>position
-            INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> msize  <span class="sign">!</span> size of mantissa in bits
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5T2fh5tget5finpad5ff"></a>
-<a name="robo429"></a><h2>h5tget_inpad_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tget_inpad_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Retrieves the internal padding type for unused bits
-  in floating-point datatypes.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  type_id       - datatype identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  padtype       - padding type for unused bits
-                  Possible values of padding type are:
-                    H5T_PAD_ZERO_F = 0
-                    H5T_PAD_ONE_F = 1
-                    H5T_PAD_BACKGROUND_F = 2
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 7, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tget_inpad_f</strong><span class="sign">(</span>type_id<span class="sign">,</span> padtype<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id <span class="sign">!</span> Datatype identifier
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> padtype <span class="sign">!</span> padding type <span class="keyword">for</span> unused bits
-                                            <span class="sign">!</span> in floating<span class="sign">-</span>point datatypes<span class="sign">.</span>
-                                            <span class="sign">!</span> Possible values of padding type are<span class="sign">:</span>
-                                            <span class="sign">!</span> H5T__PAD_ZERO_F <span class="sign">=</span> 0
-                                            <span class="sign">!</span> H5T__PAD_ONE_F <span class="sign">=</span> 1
-                                            <span class="sign">!</span> H5T__PAD_BACKGROUND_F <span class="sign">=</span> 2
-
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5T2fh5tget5fmember5fclass5ff"></a>
-<a name="robo430"></a><h2>h5tget_member_class_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tget_member_class_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Returns datatype class of compound datatype member.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  type_id       - datartpe identifier
-  member_no     - index of compound datatype member
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  class         - class type for compound dadtype member
-                  Valid classes:
-                    H5T_NO_CLASS_F (error)
-                    H5T_INTEGER_F
-                    H5T_FLOAT_F
-                    H5T_TIME_F
-                    H5T_STRING_F
-                    H5T_BITFIELD_F
-                    H5T_OPAQUE_F
-                    H5T_COMPOUND_F
-                    H5T_REFERENCE_F
-                    H5T_ENUM_F
-                    H5T_VLEN_F
-                    H5T_ARRAY_F
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  April 6, 2005
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tget_member_class_f</strong><span class="sign">(</span>type_id<span class="sign">,</span> member_no<span class="sign">,</span> class<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id  <span class="sign">!</span> Datatype identifier
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span>       <span class="sign">:</span><span class="sign">:</span> member_no  <span class="sign">!</span> Member number
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span>     <span class="sign">:</span><span class="sign">:</span> class      <span class="sign">!</span> Member class
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr      <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5T2fh5tget5fmember5findex5ff"></a>
-<a name="robo431"></a><h2>h5tget_member_index_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tget_member_index_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Retrieves the index of a compound or enumeration datatype member.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  type_id       - datatype identifier
-  name          - name of the field or member whose index to
-  to be retrieved from the datatype.
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  index         - 0-based index of the filed or member (0 to N-1)
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  September 26, 2002
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tget_member_index_f</strong><span class="sign">(</span>type_id<span class="sign">,</span> name<span class="sign">,</span> index<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id  <span class="sign">!</span> Datatype identifier
-            CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name   <span class="sign">!</span> Field or member name
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> index          <span class="sign">!</span> Field or member index
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr          <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5T2fh5tget5fmember5fname5ff"></a>
-<a name="robo432"></a><h2>h5tget_member_name_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tget_member_name_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Retrieves the name of a field of a compound datatype.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  type_id       - datatype identifier
-  index         - filed index (0-based)
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  member_name   - buffer to hold member's name
-  namelen       - name length
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 7, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tget_member_name_f</strong><span class="sign">(</span>type_id<span class="sign">,</span> index<span class="sign">,</span> member_name<span class="sign">,</span>  namelen<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id <span class="sign">!</span> Datatype identifier
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> index <span class="sign">!</span>Field index <span class="sign">(</span>0<span class="sign">-</span>based<span class="sign">)</span> of the field name to retrieve
-            CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> member_name <span class="sign">!</span>name of a field of
-                                                         <span class="sign">!</span>a compound datatype
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> namelen <span class="sign">!</span> Length of the name
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5T2fh5tget5fmember5foffset5ff"></a>
-<a name="robo433"></a><h2>h5tget_member_offset_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tget_member_offset_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Retrieves the offset of a field of a compound datatype.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  type_id       - datatype identifier
-  member_no     - number of the field
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  offset        - byte offset of the requested field
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 7, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tget_member_offset_f</strong><span class="sign">(</span>type_id<span class="sign">,</span> member_no<span class="sign">,</span> offset<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id <span class="sign">!</span> Datatype identifier
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> member_no <span class="sign">!</span>Number of the field
-                                                       <span class="sign">!</span>whose offset is requested
-            INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> offset <span class="sign">!</span>byte offset of the beginning of the field
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5T2fh5tget5fmember5ftype5ff"></a>
-<a name="robo434"></a><h2>h5tget_member_type_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tget_member_type_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Returns the datatype of the specified member.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  type_id       - compound datatype identifier
-  field_idx     - field index (0-based)
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  datatype      - idnetifier of the member's datatype
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 7, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tget_member_type_f</strong><span class="sign">(</span>type_id<span class="sign">,</span>  field_idx<span class="sign">,</span> datatype<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id <span class="sign">!</span> Datatype identifier
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> field_idx <span class="sign">!</span>Field index <span class="sign">(</span>0<span class="sign">-</span>based<span class="sign">)</span> of the field type to retrieve
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> datatype <span class="sign">!</span>identifier of a copy of
-                                                    <span class="sign">!</span>the datatype of the field
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5T2fh5tget5fmember5fvalue5ff"></a>
-<a name="robo435"></a><h2>h5tget_member_value_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tget_member_value_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Returns the value of an enumeration datatype member.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  type_id       - datatype identifier
-  member_no     - number of the enumeration datatype member
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  value         - value of the enumeration datatype
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 7, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tget_member_value_f</strong><span class="sign">(</span>type_id<span class="sign">,</span>  member_no<span class="sign">,</span> value<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id <span class="sign">!</span> Datatype identifier
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> member_no <span class="sign">!</span>Number of the enumeration datatype member
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> value <span class="sign">!</span>value of the  enumeration datatype<span class="sign">.</span>
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5T2fh5tget5fnative5ftype5ff"></a>
-<a name="robo436"></a><h2>h5tget_native_type_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tget_native_type_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Returns the native datatype of a specified datatype.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  dtype_id      - Datatype identifier for the dataset datatype.
-  
-  direction     - Direction of search:
-                  H5T_DIR_DEFAULT     = 0,    /*default direction is inscendent */
-                  H5T_DIR_ASCEND      = 1,    /*in inscendent order             */
-                  H5T_DIR_DESCEND     = 2     /*in descendent order             */
-  * NOTE: In C it is defined as a structure: H5T_direction_t
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  native_dtype_id - The native datatype identifier for the specified dataset datatype
-  hdferr          - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  June 18, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tget_native_type_f</strong><span class="sign">(</span>dtype_id<span class="sign">,</span> direction<span class="sign">,</span> native_dtype_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> dtype_id  <span class="sign">!</span> Datatype identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> direction  <span class="sign">!</span> Direction of search<span class="sign">:</span>
-                                      <span class="sign">!</span> H5T_DIR_ASCEND_F      <span class="sign">=</span> 1  in inscendent order
-                                      <span class="sign">!</span> H5T_DIR_DESCEND_F     <span class="sign">=</span> 2  in descendent order
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> native_dtype_id  <span class="sign">!</span> The native datatype identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr    <span class="sign">!</span> Error code<span class="sign">:</span>
-                                      <span class="sign">!</span> 0 on success and <span class="sign">-</span>1 on failure
-</pre>
-
-<hr />
-<a name="H5T2fh5tget5fnmembers5ff"></a>
-<a name="robo437"></a><h2>h5tget_nmembers_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tget_nmembers_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Retrieves the number of fields in a compound datatype.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  type_id       - datatype identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  num_members   - number of members
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 7, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tget_nmembers_f</strong><span class="sign">(</span>type_id<span class="sign">,</span> num_members<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id <span class="sign">!</span> Datatype identifier
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> num_members <span class="sign">!</span>number of fields in a compound datatype
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5T2fh5tget5fnorm5ff"></a>
-<a name="robo438"></a><h2>h5tget_norm_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tget_norm_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Retrieves mantissa normalization of a floating-point
-  datatype.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  type_id       - datatype identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  norm          - normalization types, valid values are:
-                    H5T_NORM_IMPLIED_F(0)
-                    H5T_NORM_MSBSET_F(1)
-                    H5T_NORM_NONE_F(2)
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 7, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tget_norm_f</strong><span class="sign">(</span>type_id<span class="sign">,</span> norm<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id <span class="sign">!</span> Datatype identifier
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> norm <span class="sign">!</span>mantissa normalization of a floating<span class="sign">-</span>point datatype
-                                         <span class="sign">!</span>Valid normalization types are<span class="sign">:</span>
-                                         <span class="sign">!</span>H5T_NORM_IMPLIED_F<span class="sign">(</span>0<span class="sign">)</span><span class="sign">,</span>MSB of mantissa is not
-                                         <span class="sign">!</span>stored<span class="sign">,</span> always 1<span class="sign">,</span>  H5T_NORM_MSBSET_F<span class="sign">(</span>1<span class="sign">)</span><span class="sign">,</span> MSB of
-                                         <span class="sign">!</span>mantissa is always 1<span class="sign">,</span> H5T_NORM_NONE_F<span class="sign">(</span>2<span class="sign">)</span>
-                                         <span class="sign">!</span>Mantissa is not normalize
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5T2fh5tget5foffset5ff"></a>
-<a name="robo439"></a><h2>h5tget_offset_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tget_offset_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Retrieves the bit offset of the first significant bit.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  type_id       - datatype identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  offset        - offset value
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 7, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tget_offset_f</strong><span class="sign">(</span>type_id<span class="sign">,</span> offset<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id <span class="sign">!</span> Datatype identifier
-            INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> offset <span class="sign">!</span> Datatype bit offset of the
-                                           <span class="sign">!</span> first significant bit
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5T2fh5tget5forder5ff"></a>
-<a name="robo440"></a><h2>h5tget_order_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tget_order_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Returns the byte order of an atomic datatype.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  type_id       - datatype identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  order         - byte order for the datatype, possible
-                  values are:
-                    H5T_ORDER_LE_F
-                    H5T_ORDER_BE_F
-                    H5T_ORDER_VAX_F (not implemented yet)
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 7, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tget_order_f</strong><span class="sign">(</span>type_id<span class="sign">,</span> order<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id <span class="sign">!</span> Datatype identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> order
-                                    <span class="sign">!</span> Datatype byte order<span class="sign">,</span> possible values are<span class="sign">:</span>
-                                    <span class="sign">!</span> H5T_ORDER_LE_F
-                                    <span class="sign">!</span> H5T_ORDER_BE_F
-                                    <span class="sign">!</span> H5T_ORDER_VAX_F
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr  <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5T2fh5tget5fpad5ff"></a>
-<a name="robo441"></a><h2>h5tget_pad_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tget_pad_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Retrieves the padding type of the least and
-  most          -significant bit padding.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  type_id       - datatype identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  lsbpad        - least-significant bit padding type
-  msbpad        - most-significant bit padding type
-                  Possible values of padding type are:
-                    H5T_PAD_ERROR_F      = -1
-                    H5T_PAD_ZERO_F = 0
-                    H5T_PAD_ONE_F = 1
-                    H5T_PAD_BACKGROUND_F = 2
-                    H5T_PAD_NPAD_F      = 3
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 7, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tget_pad_f</strong><span class="sign">(</span>type_id<span class="sign">,</span> lsbpad<span class="sign">,</span> msbpad<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id <span class="sign">!</span> Datatype identifier
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> lsbpad <span class="sign">!</span> padding type of the
-                                           <span class="sign">!</span> least significant bit
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> msbpad <span class="sign">!</span> padding type of the
-                                           <span class="sign">!</span> most significant bit
-                                           <span class="sign">!</span> Possible values of padding type are<span class="sign">:</span>
-                                           <span class="sign">!</span> H5T__PAD_ZERO_F <span class="sign">=</span> 0
-                                           <span class="sign">!</span> H5T__PAD_ONE_F <span class="sign">=</span> 1
-                                           <span class="sign">!</span> H5T__PAD_BACKGROUND_F <span class="sign">=</span> 2
-                                           <span class="sign">!</span> H5T_PAD_ERROR_F      <span class="sign">=</span> <span class="sign">-</span>1
-                                           <span class="sign">!</span> H5T_PAD_NPAD_F      <span class="sign">=</span> 3
-
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5T2fh5tget5fprecision5ff"></a>
-<a name="robo442"></a><h2>h5tget_precision_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tget_precision_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Returns the precision of an atomic datatype.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  type_id       - datatype identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  precision     - precision of the datatype
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 7, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tget_precision_f</strong><span class="sign">(</span>type_id<span class="sign">,</span> precision<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id <span class="sign">!</span> Datatype identifier
-            INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> precision <span class="sign">!</span> Datatype precision
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5T2fh5tget5fsign5ff"></a>
-<a name="robo443"></a><h2>h5tget_sign_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tget_sign_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Retrieves the sign type for an integer type.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  type_id       - datatype identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  sign          - sign type
-                  Possible values are:
-                    - Unsigned integer type 
-                        H5T_SGN_NONE_F = 0
-                    - Two's complement signed integer type
-                        H5T_SGN_2_F = 1
-                    - error value: H5T_SGN_ERROR_F=-1
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 7, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tget_sign_f</strong><span class="sign">(</span>type_id<span class="sign">,</span> sign<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id <span class="sign">!</span> Datatype identifier
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> sign <span class="sign">!</span> sign type <span class="keyword">for</span> an integer type
-                                         <span class="sign">!</span>possible values are<span class="sign">:</span>
-                                         <span class="sign">!</span>Unsigned integer type H5T_SGN_NONE_F <span class="sign">=</span> 0
-                                         <span class="sign">!</span>Two<span class="squote">'s complement signed integer type
-                                         !H5T_SGN_2_F = 1
-                                         !or error value: H5T_SGN_ERROR_F=-1
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
-</pre>
-
-<hr />
-<a name="H5T2fh5tget5fsize5ff"></a>
-<a name="robo444"></a><h2>h5tget_size_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tget_size_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Returns the size of a datatype.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  type_id       - datatype identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  size          - datatype size
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 7, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tget_size_f</strong><span class="sign">(</span>type_id<span class="sign">,</span> size<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id <span class="sign">!</span> Datatype identifier
-            INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> size <span class="sign">!</span> Datatype size
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5T2fh5tget5fstrpad5ff"></a>
-<a name="robo445"></a><h2>h5tget_strpad_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tget_strpad_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Retrieves the storage mechanism for a string datatype.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  type_id       - datatype identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  strpad        - storage method for a string datatype
-                  Possible values are:
-                    H5T_STR_NULLTERM_F,
-                    H5T_STR_NULLPAD_F,
-                    H5T_STR_SPACEPAD_F
-                    H5T_STR_ERROR_F
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 7, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tget_strpad_f</strong><span class="sign">(</span>type_id<span class="sign">,</span> strpad<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id <span class="sign">!</span> Datatype identifier
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> strpad
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5T2fh5tget5fsuper5ff"></a>
-<a name="robo446"></a><h2>h5tget_super_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tget_super_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Returns the base datatype from which a datatype is derived.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  type_id       - datatype identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  base_type_id          - identifier of the base type
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 7, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tget_super_f</strong><span class="sign">(</span>type_id<span class="sign">,</span> base_type_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id <span class="sign">!</span> datatype identifier
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> base_type_id <span class="sign">!</span> identifier of the datatype
-                                           <span class="sign">!</span> from which datatype <span class="sign">(</span>type_id<span class="sign">)</span> was derived
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5T2fh5tget5ftag5ff"></a>
-<a name="robo447"></a><h2>h5tget_tag_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tget_tag_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Gets the tag associated with an opaque datatype.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  type_id       - identifier for opaque datatype
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  tag           - unique ASCII string associated with opaque
-                  datatype
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 7, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tget_tag_f</strong><span class="sign">(</span>type_id<span class="sign">,</span> tag<span class="sign">,</span>taglen<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id <span class="sign">!</span> Datatype identifier
-            CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> tag  <span class="sign">!</span> Unique ASCII string with which
-                                                  <span class="sign">!</span>  the opaque datatype is to be tagged
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> taglen        <span class="sign">!</span> Length of tag
-            INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span>      <span class="sign">:</span><span class="sign">:</span> tag_size      <span class="sign">!</span> Declared character length of tab 
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5T2fh5tinsert5ff"></a>
-<a name="robo448"></a><h2>h5tinsert_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tinsert_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Adds a new member to a compound datatype.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  type_id       - compound dattype identifier
-  name          - name of the field to insert
-  offset        - start of the member in an instance of
-                  the compound datatype
-  field_id      - datatype identifier of the field to insert
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 7, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tinsert_f</strong><span class="sign">(</span>type_id<span class="sign">,</span>  name<span class="sign">,</span> offset<span class="sign">,</span> field_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id <span class="sign">!</span> Datatype identifier
-            CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name <span class="sign">!</span>Name of the field to insert
-            INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> offset <span class="sign">!</span>start of the member in an instance of
-                                                   <span class="sign">!</span>the compound datatype
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> field_id <span class="sign">!</span>datatype identifier of the new member
-
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5T2fh5tis5fvariable5fstr5ff"></a>
-<a name="robo449"></a><h2>h5tis_variable_str_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tis_variable_str_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Determines whether a dattype is a variable string.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  type_id       - datartpe identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  status        - flag to indicate if datatype
-                  is a variable string
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  March 12, 2003
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tis_variable_str_f</strong><span class="sign">(</span>type_id<span class="sign">,</span> status<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id  <span class="sign">!</span> Datatype identifier
-            LOGICAL<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> status      <span class="sign">!</span> Flag<span class="sign">,</span> idicates <span class="keyword">if</span> datatype
-                                                <span class="sign">!</span> is a variable string or not <span class="sign">(</span> TRUE or
-                                                <span class="sign">!</span> FALSE<span class="sign">)</span>
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr      <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5T2fh5topen5ff"></a>
-<a name="robo450"></a><h2>h5topen_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5topen_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Opens named datatype.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  loc_id        - location identifier
-  name          - a datatype name
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  type_id       - datatype identifier
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">OPTIONAL PARAMETERS</p>
-<pre>  tapl_id       - datatype access property list identifier.
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 7, 2001
-
-  Added optional parameter 'tapl_id' for compatability
-  with H5Topen2. April 9, 2009.
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5topen_f</strong><span class="sign">(</span>loc_id<span class="sign">,</span> name<span class="sign">,</span> type_id<span class="sign">,</span> hdferr<span class="sign">,</span> tapl_id<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> loc_id  <span class="sign">!</span> File or group identifier
-    CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> name <span class="sign">!</span> Datatype name within file or group
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id  <span class="sign">!</span> Datatype identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr <span class="sign">!</span> Error code
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> OPTIONAL<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> tapl_id <span class="sign">!</span> datatype access property list identifier
-</pre>
-
-<hr />
-<a name="H5T2fh5tpack5ff"></a>
-<a name="robo451"></a><h2>h5tpack_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tpack_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Recursively removes padding from within a compound datatype.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  type_id       - compound datatype identifier
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 7, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tpack_f</strong><span class="sign">(</span>type_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id <span class="sign">!</span> Datatype identifier
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5T2fh5tset5fcset5ff"></a>
-<a name="robo452"></a><h2>h5tset_cset_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tset_cset_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets character set to be used.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  type_id       - datatype identifier
-  cset          - character set type of a string datatype
-                    Possible values are:
-                     H5T_CSET_ASCII_F = 0
-                     H5T_CSET_UTF8_F
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 7, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tset_cset_f</strong><span class="sign">(</span>type_id<span class="sign">,</span> cset<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id <span class="sign">!</span> Datatype identifier
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> cset <span class="sign">!</span>character set type of a string datatype
-                                           <span class="sign">!</span> Possible values of padding type are<span class="sign">:</span>
-                                           <span class="sign">!</span> H5T_CSET_ASCII_F <span class="sign">=</span> 0
-                                           <span class="sign">!</span> H5T_CSET_UTF8_F
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5T2fh5tset5febias5ff"></a>
-<a name="robo453"></a><h2>h5tset_ebias_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tset_ebias_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets the exponent bias of a floating-point type.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  type_id       - datatype identifier
-  ebias         - datatype exponent bias
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 7, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tset_ebias_f</strong><span class="sign">(</span>type_id<span class="sign">,</span> ebias<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id <span class="sign">!</span> Datatype identifier
-            INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> ebias <span class="sign">!</span>Datatype exponent bias of a floating<span class="sign">-</span>point type
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5T2fh5tset5ffields5ff"></a>
-<a name="robo454"></a><h2>h5tset_fields_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tset_fields_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets locations and sizes of floating point bit fields.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  type_id       - datatype identifier
-  spos          - sign bit-position
-  epos          - exponent bit-position
-  esize         - size of exponent in bits
-  mpos          - mantissa position
-  msize         - size of mantissa in bits
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 7, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tset_fields_f</strong><span class="sign">(</span>type_id<span class="sign">,</span> spos<span class="sign">,</span> epos<span class="sign">,</span> esize<span class="sign">,</span> mpos<span class="sign">,</span> msize<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id <span class="sign">!</span> Datatype identifier
-            INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> spos   <span class="sign">!</span> sign bit<span class="sign">-</span>position
-            INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> epos   <span class="sign">!</span> exponent bit<span class="sign">-</span>position
-            INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> esize  <span class="sign">!</span> size of exponent in bits
-            INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> mpos   <span class="sign">!</span> mantissa bit<span class="sign">-</span>position
-            INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> msize  <span class="sign">!</span> size of mantissa in bits
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5T2fh5tset5finpad5ff"></a>
-<a name="robo455"></a><h2>h5tset_inpad_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tset_inpad_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Fills unused internal floating point bits.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  type_id       - datatype identifier
-  padtype       - padding type for unused bits
-                  Possible values of padding type are:
-                    H5T_PAD_ZERO_F = 0
-                    H5T_PAD_ONE_F = 1
-                    H5T_PAD_BACKGROUND_F = 2
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 7, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tset_inpad_f</strong><span class="sign">(</span>type_id<span class="sign">,</span> padtype<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id <span class="sign">!</span> Datatype identifier
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> padtype <span class="sign">!</span> padding type <span class="keyword">for</span> unused bits
-                                           <span class="sign">!</span> in floating<span class="sign">-</span>point datatypes<span class="sign">.</span>
-                                           <span class="sign">!</span> Possible values of padding type are<span class="sign">:</span>
-                                           <span class="sign">!</span> H5T__PAD_ZERO_F <span class="sign">=</span> 0
-                                           <span class="sign">!</span> H5T__PAD_ONE_F <span class="sign">=</span> 1
-                                           <span class="sign">!</span> H5T__PAD_BACKGROUND_F <span class="sign">=</span> 2
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5T2fh5tset5fnorm5ff"></a>
-<a name="robo456"></a><h2>h5tset_norm_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tset_norm_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets the mantissa normalization of a floating-point datatype.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  type_id       - datatype identifier
-  norm          - normalization types, valid values are:
-                    H5T_NORM_IMPLIED_F(0)
-                    H5T_NORM_MSBSET_F(1)
-                    H5T_NORM_NONE_F(2)
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 7, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tset_norm_f</strong><span class="sign">(</span>type_id<span class="sign">,</span> norm<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id <span class="sign">!</span> Datatype identifier
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> norm <span class="sign">!</span>mantissa normalization of a floating<span class="sign">-</span>point datatype
-                                         <span class="sign">!</span>Valid normalization types are<span class="sign">:</span>
-                                         <span class="sign">!</span>H5T_NORM_IMPLIED_F<span class="sign">(</span>0<span class="sign">)</span><span class="sign">,</span>MSB of mantissa is not
-                                         <span class="sign">!</span>stored<span class="sign">,</span> always 1<span class="sign">,</span>  H5T_NORM_MSBSET_F<span class="sign">(</span>1<span class="sign">)</span><span class="sign">,</span> MSB of
-                                         <span class="sign">!</span>mantissa is always 1<span class="sign">,</span> H5T_NORM_NONE_F<span class="sign">(</span>2<span class="sign">)</span>
-                                         <span class="sign">!</span>Mantissa is not normalize
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5T2fh5tset5foffset5ff"></a>
-<a name="robo457"></a><h2>h5tset_offset_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tset_offset_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets the bit offset of the first significant bit.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  type_id       - datatype identifier
-  offset        - offset value
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 7, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tset_offset_f</strong><span class="sign">(</span>type_id<span class="sign">,</span> offset<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id <span class="sign">!</span> Datatype identifier
-            INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> offset <span class="sign">!</span> Datatype bit offset of the
-                                           <span class="sign">!</span> first significant bit
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5T2fh5tset5forder5ff"></a>
-<a name="robo458"></a><h2>h5tset_order_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tset_order_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets the byte ordering of an atomic datatype.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  type_id       - datatype identifier
-  order         - datatype byte order Possible values are:
-                    H5T_ORDER_LE_F
-                    H5T_ORDER_BE_F
-                    H5T_ORDER_VAX_F (not implemented yet)
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 7, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tset_order_f</strong><span class="sign">(</span>type_id<span class="sign">,</span> order<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id <span class="sign">!</span> Datatype identifier
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> order   <span class="sign">!</span> Datatype byte order<span class="sign">,</span> possible values
-                                   <span class="sign">!</span> are<span class="sign">:</span>
-                                   <span class="sign">!</span> H5T_ORDER_LE_F
-                                   <span class="sign">!</span> H5T_ORDER_BE_F
-                                   <span class="sign">!</span> H5T_ORDER_VAX_F
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5T2fh5tset5fpad5ff"></a>
-<a name="robo459"></a><h2>h5tset_pad_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tset_pad_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets the least and most-significant bits padding types.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  type_id       - datatype identifier
-  lsbpad        - least-significant bit padding type
-  msbpad        - most-significant bit padding type
-                  Possible values of padding type are:
-                    H5T_PAD_ERROR_F      = -1
-                    H5T_PAD_ZERO_F = 0
-                    H5T_PAD_ONE_F = 1
-                    H5T_PAD_BACKGROUND_F = 2
-                    H5T_PAD_NPAD_F      = 3
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 7, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tset_pad_f</strong><span class="sign">(</span>type_id<span class="sign">,</span> lsbpad<span class="sign">,</span> msbpad<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id <span class="sign">!</span> Datatype identifier
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> lsbpad <span class="sign">!</span> padding type of the
-                                           <span class="sign">!</span> least significant bit
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> msbpad <span class="sign">!</span> padding type of the
-                                           <span class="sign">!</span> most significant bit
-                                           <span class="sign">!</span> Possible values of padding type are<span class="sign">:</span>
-                                           <span class="sign">!</span> H5T_PAD_ZERO_F <span class="sign">=</span> 0
-                                           <span class="sign">!</span> H5T_PAD_ONE_F <span class="sign">=</span> 1
-                                           <span class="sign">!</span> H5T_PAD_BACKGROUND_F <span class="sign">=</span> 2
-                                           <span class="sign">!</span> H5T_PAD_ERROR_F      <span class="sign">=</span> <span class="sign">-</span>1
-                                           <span class="sign">!</span> H5T_PAD_NPAD_F      <span class="sign">=</span> 3
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5T2fh5tset5fprecision5ff"></a>
-<a name="robo460"></a><h2>h5tset_precision_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tset_precision_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets the precision of an atomic datatype.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  type_id       - datatype identifier
-  precision     - datatype precision
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 7, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tset_precision_f</strong><span class="sign">(</span>type_id<span class="sign">,</span> precision<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id <span class="sign">!</span> Datatype identifier
-            INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> precision <span class="sign">!</span> Datatype precision
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5T2fh5tset5fsign5ff"></a>
-<a name="robo461"></a><h2>h5tset_sign_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tset_sign_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets the sign proprety for an integer type.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  type_id       - datatype identifier
-  sign          - sign type
-                  Possible values are:
-                    - Unsigned integer type 
-                        H5T_SGN_NONE_F = 0
-                    - Two's complement signed integer type
-                        H5T_SGN_2_F = 1
-                    - error value: H5T_SGN_ERROR_F=-1
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 7, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tset_sign_f</strong><span class="sign">(</span>type_id<span class="sign">,</span> sign<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id <span class="sign">!</span> Datatype identifier
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> sign <span class="sign">!</span>sign type <span class="keyword">for</span> an integer type
-                                         <span class="sign">!</span>possible values are<span class="sign">:</span>
-                                         <span class="sign">!</span>Unsigned integer type H5T_SGN_NONE_F <span class="sign">=</span> 0
-                                         <span class="sign">!</span>Two<span class="squote">'s complement signed integer type
-                                         !H5T_SGN_2_F = 1
-                                         !or error value: H5T_SGN_ERROR_F=-1
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
-</pre>
-
-<hr />
-<a name="H5T2fh5tset5fsize5ff"></a>
-<a name="robo462"></a><h2>h5tset_size_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tset_size_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Sets the total size for an atomic datatype.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  type_id       - datatype identifier
-  size          - size of the datatype
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 7, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tset_size_f</strong><span class="sign">(</span>type_id<span class="sign">,</span> size<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id <span class="sign">!</span> Datatype identifier
-            INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> size <span class="sign">!</span> Datatype size
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5T2fh5tset5fstrpad5ff"></a>
-<a name="robo463"></a><h2>h5tset_strpad_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tset_strpad_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Defines the storage mechanism for character strings.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  type_id       - datatype identifier
-  strpad        - storage method for a string datatype
-                  Possible values are:
-                    H5T_STR_NULLTERM_F,
-                    H5T_STR_NULLPAD_F,
-                    H5T_STR_SPACEPAD_F
-                    H5T_STR_ERROR_F
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 7, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tset_strpad_f</strong><span class="sign">(</span>type_id<span class="sign">,</span> strpad<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id <span class="sign">!</span> Datatype identifier
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> strpad <span class="sign">!</span> string padding method <span class="keyword">for</span> a string datatype
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5T2fh5tset5ftag5ff"></a>
-<a name="robo464"></a><h2>h5tset_tag_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tset_tag_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Tags an opaque datatype.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  type_id       - identifier for opaque datatype
-  tag           - unique ASCII string with which the opaque
-                  datatype is to be tagged.
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  March 7, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tset_tag_f</strong><span class="sign">(</span>type_id<span class="sign">,</span> tag<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> type_id <span class="sign">!</span> Datatype identifier
-            CHARACTER<span class="sign">(</span>LEN<span class="sign">=</span><span class="sign">*</span><span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> tag <span class="sign">!</span>Unique ASCII string with which
-                                                <span class="sign">!</span>the opaque datatype is to be tagged
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr        <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5T2fh5tvlen5fcreate5ff"></a>
-<a name="robo465"></a><h2>h5tvlen_create_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo70">H5T</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5tvlen_create_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Creates a new variable-length datatype.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  type_id       - identifier iof base datatype
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  vltype_id     - identifier for VL datatype
-  hdferr        - Returns 0 if successful and -1 if fails
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  Wednesday, October 23, 2002
-</pre>
-<p class="item_name">NOTES</p>
-<pre>  Only basic Fortran base datatypes are supported
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5tvlen_create_f</strong><span class="sign">(</span>type_id<span class="sign">,</span> vltype_id<span class="sign">,</span> hdferr<span class="sign">)</span>
-            IMPLICIT NONE
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span>  <span class="sign">:</span><span class="sign">:</span> type_id    <span class="sign">!</span> Datatype identifier
-            INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span><span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> vltype_id  <span class="sign">!</span> VL datatype identifier
-            INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr            <span class="sign">!</span> Error code
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/H5Tff.f90 on Sun Aug 14 2011 22:49:37
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/H5Zf_c.html b/fortran/doc/DevelGuide/src/H5Zf_c.html
deleted file mode 100644
index 2973548..0000000
--- a/fortran/doc/DevelGuide/src/H5Zf_c.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/H5Zf.c</title>
-<!-- Source: ./src/H5Zf.c -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="H5Zf2fH5Zf"></a>
-<a name="robo75"></a><h2>H5Zf</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">PURPOSE</p>
-<pre>   This file contains C stubs for <a href="./H5Zff_f90.html#robo74">H5Z</a> Fortran APIs
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/H5Zf.c on Sun Aug 14 2011 22:49:37
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/H5Zff_f90.html b/fortran/doc/DevelGuide/src/H5Zff_f90.html
deleted file mode 100644
index 8ccd0ae..0000000
--- a/fortran/doc/DevelGuide/src/H5Zff_f90.html
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/H5Zff.f90</title>
-<!-- Source: ./src/H5Zff.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="ROBODoc2fH5Z"></a>
-<a name="robo74"></a><h2>H5Z</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  MODULE <strong>H5Z</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  This file contains Fortran interfaces for <strong>H5Z</strong> functions. It includes
-  all the functions that are independent on whether the Fortran 2003 functions
-  are enabled or disabled.
-</pre>
-<p class="item_name">NOTES</p>
-<pre>                         *** IMPORTANT ***
-  If you add a new <strong>H5Z</strong> function you must add the function name to the
-  Windows dll file 'hdf5_fortrandll.def' in the fortran/src directory.
-  This is needed for Windows based operating systems.
-</pre>
-
-<hr />
-<a name="H5Z2fh5zfilter5favail5ff"></a>
-<a name="robo466"></a><h2>h5zfilter_avail_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo74">H5Z</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5zfilter_avail_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Queries if filter is available
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  filter        - filter
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  status        - status; .TRUE. if filter is available,
-                  .FALSE. otherwise
-  hdferr:       - error code
-                   Success:  0
-                   Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  March 12, 2003
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5zfilter_avail_f</strong><span class="sign">(</span>filter<span class="sign">,</span> status<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span>  <span class="sign">:</span><span class="sign">:</span> filter      <span class="sign">!</span> Filter<span class="sign">;</span> may be one of the following<span class="sign">:</span>
-                                        <span class="sign">!</span>   H5Z_FILTER_DEFLATE_F
-                                        <span class="sign">!</span>   H5Z_FILTER_SZIP_F
-                                        <span class="sign">!</span>   H5Z_FILTER_NBIT_F
-                                        <span class="sign">!</span>   H5Z_FILTER_SCALEOFFSET_F
-                                        <span class="sign">!</span>   H5Z_FILTER_SHUFFLE_F
-                                        <span class="sign">!</span>   H5Z_FILTER_FLETCHER32_F
-    LOGICAL<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> status      <span class="sign">!</span> Flag<span class="sign">,</span> idicates <span class="keyword">if</span> filter
-                                        <span class="sign">!</span> is availble  not <span class="sign">(</span> TRUE or
-                                        <span class="sign">!</span> FALSE<span class="sign">)</span>
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr      <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5Z2fh5zget5ffilter5finfo5ff"></a>
-<a name="robo467"></a><h2>h5zget_filter_info_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo74">H5Z</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5zget_filter_info_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Queries if filter has its encoder and/or decoder
-  available
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  filter        - filter
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  config_flags  - Bit vector possibly containing the
-                  following values:
-                     H5Z_FILTER_ENCODE_ENABLED_F
-                     H5Z_FILTER_DECODE_ENABLED_F
-  hdferr:       - error code
-                   Success:  0
-                   Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Nat Furrer and James Laird
-  June 16, 2004
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5zget_filter_info_f</strong><span class="sign">(</span>filter<span class="sign">,</span> config_flags<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span>  <span class="sign">:</span><span class="sign">:</span> filter      <span class="sign">!</span> Filter<span class="sign">;</span> may be one of the following<span class="sign">:</span>
-                                        <span class="sign">!</span>   H5Z_FILTER_DEFLATE_F
-                                        <span class="sign">!</span>   H5Z_FILTER_SZIP_F
-                                        <span class="sign">!</span>   H5Z_FILTER_NBIT_F
-                                        <span class="sign">!</span>   H5Z_FILTER_SCALEOFFSET_F
-                                        <span class="sign">!</span>   H5Z_FILTER_SHUFFLE_F
-                                        <span class="sign">!</span>   H5Z_FILTER_FLETCHER32_F
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> config_flags<span class="sign">!</span> Flag<span class="sign">,</span> indicates <span class="keyword">if</span> filter
-                                        <span class="sign">!</span> has its encoder and<span class="sign">/</span>or decoder
-                                        <span class="sign">!</span> available
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr      <span class="sign">!</span> Error code
-</pre>
-
-<hr />
-<a name="H5Z2fh5zunregister5ff"></a>
-<a name="robo468"></a><h2>h5zunregister_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo74">H5Z</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5zunregister_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Unregisters specified filetr
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  filter - filter; may have one of the following values:
-            H5Z_FILTER_DEFLATE_F
-            H5Z_FILTER_SZIP_F
-            H5Z_FILTER_NBIT_F
-            H5Z_FILTER_SCALEOFFSET_F
-            H5Z_FILTER_SHUFFLE_F
-            H5Z_FILTER_FLETCHER32_F
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  hdferr - error code
-            Success:  0
-            Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  March 12, 2003
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5zunregister_f</strong><span class="sign">(</span>filter<span class="sign">,</span> hdferr<span class="sign">)</span>
-    IMPLICIT NONE
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span>  <span class="sign">:</span><span class="sign">:</span> filter
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> hdferr  <span class="sign">!</span> Error code
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/H5Zff.f90 on Sun Aug 14 2011 22:49:37
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/H5_DBLE_InterfaceExclude_f90.html b/fortran/doc/DevelGuide/src/H5_DBLE_InterfaceExclude_f90.html
deleted file mode 100644
index 4e51e7f..0000000
--- a/fortran/doc/DevelGuide/src/H5_DBLE_InterfaceExclude_f90.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/H5_DBLE_InterfaceExclude.f90</title>
-<!-- Source: ./src/H5_DBLE_InterfaceExclude.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="fortran2fsrc2fH55fDBLE5fInterfaceExclude2ef90"></a>
-<a name="robo78"></a><h2>src/H5_DBLE_InterfaceExclude.f90</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>   H5_DBLE_INTERFACE
-</pre>
-<p class="item_name">FUNCTION</p>
-<pre>   This module is used for when the default REAL is of type DOUBLE PRECISION.
-   We do not include the double precision interfaces if the defaut REAL is
-   DOUBLE PRECISION since this would lead to a non-unique conflict with the
-   generic interfaces declared as REAL and those declared as DOUBLE PRECISION.
-</pre>
-<p class="item_name">NOTES</p>
-<pre>   Empty module.
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/H5_DBLE_InterfaceExclude.f90 on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/H5_DBLE_InterfaceInclude_f90.html b/fortran/doc/DevelGuide/src/H5_DBLE_InterfaceInclude_f90.html
deleted file mode 100644
index 5a71d52..0000000
--- a/fortran/doc/DevelGuide/src/H5_DBLE_InterfaceInclude_f90.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/H5_DBLE_InterfaceInclude.f90</title>
-<!-- Source: ./src/H5_DBLE_InterfaceInclude.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="fortran2fsrc2fH55fDBLE5fInterfaceInclude2ef90"></a>
-<a name="robo79"></a><h2>src/H5_DBLE_InterfaceInclude.f90</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>   H5_DBLE_INTERFACE
-</pre>
-<p class="item_name">FUNCTION</p>
-<pre>   This module is used for when the default REAL is not of the type DOUBLE PRECISION.
-   We only do not include the double precision interfaces if the defaut REAL is
-   DOUBLE PRECISION since this would lead to a non-unique conflict with the
-   generic interfaces declared as REAL. Otherwise it is okay to include the interfaces.
-</pre>
-<p class="item_name">NOTES</p>
-<pre>   This module contains all the DOUBLE PRECISION interfaces and corresponding subroutines
-   from the HDF function catagory <a href="./H5Aff_f90.html#robo27">H5A</a>, <a href="./H5Dff_f90.html#robo31">H5D</a> and H5P.
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/H5_DBLE_InterfaceInclude.f90 on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/H5_f_c.html b/fortran/doc/DevelGuide/src/H5_f_c.html
deleted file mode 100644
index 2bdbce1..0000000
--- a/fortran/doc/DevelGuide/src/H5_f_c.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/H5_f.c</title>
-<!-- Source: ./src/H5_f.c -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_programs.html#top">Programs</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="root2ffortran2fsrc2fH55ff2ec"></a>
-<a name="robo0"></a><h2>fortran/src/H5_f.c</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">FUNCTION</p>
-<pre>   This file contains C stubs for H5 Fortran APIs
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/H5_f.c on Wed Oct 22 2008 15:34:43
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/H5_ff_F03_f90.html b/fortran/doc/DevelGuide/src/H5_ff_F03_f90.html
deleted file mode 100644
index 17f07c1..0000000
--- a/fortran/doc/DevelGuide/src/H5_ff_F03_f90.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/H5_ff_F03.f90</title>
-<!-- Source: ./src/H5_ff_F03.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="ROBODoc2fH5LIB5fPROVISIONAL"></a>
-<a name="robo54"></a><h2>H5LIB_PROVISIONAL</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  MODULE <strong>H5LIB_PROVISIONAL</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  This file contains helper functions for Fortran 2003 features and is
-  only compiled when Fortran 2003 features are enabled, otherwise
-  the file <a href="./H5_ff_F90_f90.html#robo_top_of_doc">H5_ff_F90.f90</a> is compiled.
-</pre>
-<p class="item_name">NOTES</p>
-<pre>                         *** IMPORTANT ***
-  If you add a new function you must add the function name to the
-  Windows dll file 'hdf5_fortrandll.def' in the fortran/src directory.
-  This is needed for Windows based operating systems.
-</pre>
-
-<hr />
-<a name="H5LIB5fPROVISIONAL2fh5offsetof"></a>
-<a name="robo194"></a><h2>h5offsetof</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo54">H5LIB_PROVISIONAL</a> ] [ <a href="../robo_functions.html#robo_top_of_doc">Functions</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5offsetof</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Computes the offset in memory
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  start - starting pointer address
-  end   - ending pointer address
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  offset - offset
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  Augest 25, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  FUNCTION <strong>h5offsetof</strong><span class="sign">(</span>start<span class="sign">,</span>end<span class="sign">)</span> RESULT<span class="sign">(</span>offset<span class="sign">)</span>
-    USE<span class="sign">,</span> INTRINSIC <span class="sign">:</span><span class="sign">:</span> ISO_C_BINDING
-    USE <a href="./H5f90global_f90.html#robo46">H5GLOBAL</a>
-    IMPLICIT NONE
-    INTEGER<span class="sign">(</span>SIZE_T<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> offset
-    TYPE<span class="sign">(</span>C_PTR<span class="sign">)</span><span class="sign">,</span> VALUE<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> start<span class="sign">,</span> end
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/H5_ff_F03.f90 on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/H5_ff_F90_f90.html b/fortran/doc/DevelGuide/src/H5_ff_F90_f90.html
deleted file mode 100644
index c310ef2..0000000
--- a/fortran/doc/DevelGuide/src/H5_ff_F90_f90.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/H5_ff_F90.f90</title>
-<!-- Source: ./src/H5_ff_F90.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="ROBODoc2fH5LIB5fPROVISIONAL2028F9029"></a>
-<a name="robo55"></a><h2>H5LIB_PROVISIONAL (F90)</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  MODULE <a href="./H5_ff_F03_f90.html#robo54">H5LIB_PROVISIONAL</a>
-</pre>
-<p class="item_name">FILE</p>
-<pre>  fortran/src/<a href="#robo_top_of_doc">H5_ff_F90.f90</a>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  This file is a dummy module for when Fortran 2003 features are not enabled.
-  It is compiled in place of <a href="./H5_ff_F03_f90.html#robo_top_of_doc">H5_ff_F03.f90</a> and is empty.
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/H5_ff_F90.f90 on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/H5_ff_f90.html b/fortran/doc/DevelGuide/src/H5_ff_f90.html
deleted file mode 100644
index 021c7c5..0000000
--- a/fortran/doc/DevelGuide/src/H5_ff_f90.html
+++ /dev/null
@@ -1,269 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/H5_ff.f90</title>
-<!-- Source: ./src/H5_ff.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="ROBODoc2fH5LIB"></a>
-<a name="robo53"></a><h2>H5LIB</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  MODULE <strong>H5LIB</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  This module provides fortran specific helper functions for the HDF library
-</pre>
-<p class="item_name">USES</p>
-<pre>  <a href="./H5_ff_F03_f90.html#robo54">H5LIB_PROVISIONAL</a> - This module provides helper functions for Fortran 2003
-                      only features. If Fortran 2003 functions are enabled then
-                      <a href="./H5_ff_F03_f90.html#robo_top_of_doc">H5_ff_F03.f90</a> is compiled, else <a href="./H5_ff_F90_f90.html#robo_top_of_doc">H5_ff_F90.f90</a>,
-                      which is just a place holder blank module, is compiled.
-</pre>
-<p class="item_name">NOTES</p>
-<pre>                         *** IMPORTANT ***
-  If you add a new function you must add the function name to the
-  Windows dll file 'hdf5_fortrandll.def' in the fortran/src directory.
-  This is needed for Windows based operating systems.
-</pre>
-
-<hr />
-<a name="H5LIB2fh5check5fversion5ff"></a>
-<a name="robo111"></a><h2>h5check_version_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo53">H5LIB</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5check_version_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Verifies that library versions are consistent.
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  majnum               - major version of the library
-  minum                - minor version of the library
-  relnum               - release version of the library
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  error                - error code
-                          Success:  0
-                          Failure:  application aborts
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  September 24, 2002
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5check_version_f</strong><span class="sign">(</span>majnum<span class="sign">,</span> minnum<span class="sign">,</span> relnum<span class="sign">,</span> error<span class="sign">)</span>
-    USE <a href="./H5f90global_f90.html#robo46">H5GLOBAL</a>
-    IMPLICIT NONE
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> majnum<span class="sign">,</span> minnum<span class="sign">,</span> relnum
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> error
-</pre>
-
-<hr />
-<a name="H5LIB2fh5close5ff"></a>
-<a name="robo112"></a><h2>h5close_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo53">H5LIB</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5close_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Closes the <a href="./HDF5_f90.html#robo76">HDF5</a> library and Fortran90 interface.
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  error - error code
-            Success:  0
-            Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  February 28, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5close_f</strong><span class="sign">(</span>error<span class="sign">)</span>
-    USE <a href="./H5f90global_f90.html#robo46">H5GLOBAL</a>
-    IMPLICIT NONE
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> error
-</pre>
-
-<hr />
-<a name="H5LIB2fh5dont5fatexit5ff"></a>
-<a name="robo122"></a><h2>h5dont_atexit_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo53">H5LIB</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5dont_atexit_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Instructs library not to install atexit cleanup routine.
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  error  - error code
-             Success:  0
-             Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  September 24, 2002
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5dont_atexit_f</strong><span class="sign">(</span>error<span class="sign">)</span>
-    USE <a href="./H5f90global_f90.html#robo46">H5GLOBAL</a>
-    IMPLICIT NONE
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> error
-</pre>
-
-<hr />
-<a name="H5LIB2fh5garbage5fcollect5ff"></a>
-<a name="robo150"></a><h2>h5garbage_collect_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo53">H5LIB</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5garbage_collect_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Garbage collects on all free-lists of all types.
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  error  - error code
-             Success:  0
-             Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  September 24, 2002
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5garbage_collect_f</strong><span class="sign">(</span>error<span class="sign">)</span>
-    USE <a href="./H5f90global_f90.html#robo46">H5GLOBAL</a>
-    IMPLICIT NONE
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> error
-</pre>
-
-<hr />
-<a name="H5LIB2fh5get5flibversion5ff"></a>
-<a name="robo154"></a><h2>h5get_libversion_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo53">H5LIB</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5get_libversion_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Returns the <a href="./HDF5_f90.html#robo76">HDF5</a> LIbrary release number
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  majnum               - major version of the library
-  minum                - minor version of the library
-  relnum               - release version of the library
-  error                - error code
-                           Success:  0
-                           Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  September 24, 2002
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5get_libversion_f</strong><span class="sign">(</span>majnum<span class="sign">,</span> minnum<span class="sign">,</span> relnum<span class="sign">,</span> error<span class="sign">)</span>
-    USE <a href="./H5f90global_f90.html#robo46">H5GLOBAL</a>
-    IMPLICIT NONE
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> majnum<span class="sign">,</span> minnum<span class="sign">,</span> relnum<span class="sign">,</span> error
-</pre>
-
-<hr />
-<a name="H5LIB2fh5kind5fto5ftype"></a>
-<a name="robo177"></a><h2>h5kind_to_type</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo53">H5LIB</a> ] [ <a href="../robo_functions.html#robo_top_of_doc">Functions</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5kind_to_type</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Converts the KIND to the correct HDF type
-</pre>
-<p class="item_name">INPUTS</p>
-<pre>  kind    - Fortran KIND parameter
-  flag    - whether KIND is of type INTEGER or REAL:
-              H5_INTEGER_KIND - integer
-              H5_REAL_KIND    - real
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  h5_type - returns the type
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-  Augest 25, 2008
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  INTEGER<span class="sign">(</span>HID_T<span class="sign">)</span> FUNCTION <strong>h5kind_to_type</strong><span class="sign">(</span>kind<span class="sign">,</span> flag<span class="sign">)</span> RESULT<span class="sign">(</span>h5_type<span class="sign">)</span>
-    USE <a href="./H5f90global_f90.html#robo46">H5GLOBAL</a>
-    IMPLICIT NONE
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> kind
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>IN<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> flag
-</pre>
-
-<hr />
-<a name="H5LIB2fh5open5ff"></a>
-<a name="robo198"></a><h2>h5open_f</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="#robo53">H5LIB</a> ] [ <a href="../robo_subroutines.html#robo_top_of_doc">Subroutines</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <strong>h5open_f</strong>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  Initializes the <a href="./HDF5_f90.html#robo76">HDF5</a> library and Fortran90 interface.
-</pre>
-<p class="item_name">OUTPUTS</p>
-<pre>  error - error code
-            Success:  0
-            Failure: -1
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-  August 12, 1999
-</pre>
-<p class="item_name">HISTORY</p>
-<pre>  Explicit Fortran interfaces were added for
-  called C functions (it is needed for Windows
-  port).  February 28, 2001
-</pre>
-<p class="item_name">SOURCE</p>
-<pre class="source">  SUBROUTINE <strong>h5open_f</strong><span class="sign">(</span>error<span class="sign">)</span>
-    USE <a href="./H5f90global_f90.html#robo46">H5GLOBAL</a>
-    IMPLICIT NONE
-    INTEGER<span class="sign">,</span> INTENT<span class="sign">(</span>OUT<span class="sign">)</span> <span class="sign">:</span><span class="sign">:</span> error
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/H5_ff.f90 on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/H5f90global_f90.html b/fortran/doc/DevelGuide/src/H5f90global_f90.html
deleted file mode 100644
index 587b6d0..0000000
--- a/fortran/doc/DevelGuide/src/H5f90global_f90.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/H5f90global.f90</title>
-<!-- Source: ./src/H5f90global.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="ROBODoc2fH5GLOBAL"></a>
-<a name="robo46"></a><h2>H5GLOBAL</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  MODULE <strong>H5GLOBAL</strong>
-</pre>
-<p class="item_name">FILE</p>
-<pre>  src/fortran/<a href="#robo_top_of_doc">H5f90global.f90</a>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  This module is used to pass C stubs for H5 Fortran APIs. The C stubs are
-  packed into arrays in H5_f.c and these arrays are then passed to Fortran.
-  This module then uses EQUIVALENCE to assign elements of the arrays to
-  Fortran equivalent C stubs.
-</pre>
-<p class="item_name">NOTES</p>
-<pre>  The size of the C arrays in H5_f.c has to match the values of the variables
-  declared as PARAMETER, hence if the size of an array in H5_f.c is changed
-  then the PARAMETER of that corresponding array in Fortran must also be changed.
-</pre>
-<p class="item_name">USES</p>
-<pre>  H5FORTRAN_TYPES       - This module is generated at run time. See
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourmal
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/H5f90global.f90 on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/H5f90kit_c.html b/fortran/doc/DevelGuide/src/H5f90kit_c.html
deleted file mode 100644
index 1329a87..0000000
--- a/fortran/doc/DevelGuide/src/H5f90kit_c.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/H5f90kit.c</title>
-<!-- Source: ./src/H5f90kit.c -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="H5f90kit2fH5f90kit"></a>
-<a name="robo40"></a><h2>H5f90kit</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">PURPOSE</p>
-<pre>   Routines from HDF4 to deal with C-FORTRAN issues:
-
-   HD5f2cstring   -- convert a Fortran string to a C string
-   HD5packFstring -- convert a C string into a Fortran string
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/H5f90kit.c on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/H5match_types_c.html b/fortran/doc/DevelGuide/src/H5match_types_c.html
deleted file mode 100644
index 083319a..0000000
--- a/fortran/doc/DevelGuide/src/H5match_types_c.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/H5match_types.c</title>
-<!-- Source: ./src/H5match_types.c -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="Program2fH5match5ftypes"></a>
-<a name="robo192"></a><h2>H5match_types</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_procedures.html#robo_top_of_doc">Procedures</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  Executable: <strong>H5match_types</strong>
-</pre>
-<p class="item_name">FILE</p>
-<pre>  fortran/src/<a href="#robo_top_of_doc">H5match_types.c</a>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  C Program to match C types to Fortran types.
-  Creates the files H5f90i_gen.h for the C code and
-  H5fortran_types.f90 for the Fortran code.
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/H5match_types.c on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/H5test_kind_SIZEOF_f90.html b/fortran/doc/DevelGuide/src/H5test_kind_SIZEOF_f90.html
deleted file mode 100644
index 3494db0..0000000
--- a/fortran/doc/DevelGuide/src/H5test_kind_SIZEOF_f90.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/H5test_kind_SIZEOF.f90</title>
-<!-- Source: ./src/H5test_kind_SIZEOF.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="Program2fH5test5fkind5fSIZEOF"></a>
-<a name="robo421"></a><h2>H5test_kind_SIZEOF</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_procedures.html#robo_top_of_doc">Procedures</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  Executable: <a href="./H5test_kind_f90.html#robo420">H5test_kind</a>
-</pre>
-<p class="item_name">FILE</p>
-<pre>  fortran/src/<a href="#robo_top_of_doc">H5test_kind_SIZEOF.f90</a>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  This stand alone program is used at build time to generate the program
-  H5fortran_detect.f90. It cycles through all the available KIND parameters for
-  integers and reals. The appropriate program and subroutines are then generated
-  depending on which of the KIND values are found.
-</pre>
-<p class="item_name">NOTES</p>
-<pre>  This program is used in place of <a href="./H5test_kind_f90.html#robo_top_of_doc">H5test_kind.f90</a> when the Fortran intrinsic
-  function SIZEOF is available. It generates code that makes use of SIZEOF in
-  H5fortran_detect.f90 which is a portable solution.
-
-  The availability of SIZEOF is checked at configure time and the TRUE/FALSE
-  condition is set in the configure variable "FORTRAN_HAVE_SIZEOF".
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  M. Scot Breitenfeld
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/H5test_kind_SIZEOF.f90 on Sun Aug 14 2011 22:49:37
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/H5test_kind_f90.html b/fortran/doc/DevelGuide/src/H5test_kind_f90.html
deleted file mode 100644
index c08e488..0000000
--- a/fortran/doc/DevelGuide/src/H5test_kind_f90.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/H5test_kind.f90</title>
-<!-- Source: ./src/H5test_kind.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="Program2fH5test5fkind"></a>
-<a name="robo420"></a><h2>H5test_kind</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_procedures.html#robo_top_of_doc">Procedures</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  Executable: <strong>H5test_kind</strong>
-</pre>
-<p class="item_name">FILE</p>
-<pre>  fortran/src/<a href="#robo_top_of_doc">H5test_kind.f90</a>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  This stand alone program is used at build time to generate the program
-  H5fortran_detect.f90. It cycles through all the available KIND parameters for
-  integers and reals. The appropriate program and subroutines are then generated
-  depending on which of the KIND values are found.
-</pre>
-<p class="item_name">NOTES</p>
-<pre>  This program is depreciated in favor of <a href="./H5test_kind_SIZEOF_f90.html#robo_top_of_doc">H5test_kind_SIZEOF.f90</a> and is only
-  used when the Fortran intrinsic function SIZEOF is not available. It generates
-  code that does not make use of SIZEOF in H5fortran_detect.f90 which is less
-  portable in comparison to using SIZEOF.
-
-  The availability of SIZEOF is checked at configure time and the TRUE/FALSE
-  condition is set in the configure variable "FORTRAN_HAVE_SIZEOF".
-</pre>
-<p class="item_name">AUTHOR</p>
-<pre>  Elena Pourma
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/H5test_kind.f90 on Sun Aug 14 2011 22:49:37
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/HDF5_f90.html b/fortran/doc/DevelGuide/src/HDF5_f90.html
deleted file mode 100644
index 1490c7c..0000000
--- a/fortran/doc/DevelGuide/src/HDF5_f90.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/HDF5.f90</title>
-<!-- Source: ./src/HDF5.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="ROBODoc2fHDF5"></a>
-<a name="robo76"></a><h2>HDF5</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  MODULE <strong>HDF5</strong>
-</pre>
-<p class="item_name">FILE</p>
-<pre>  src/fortran/src/<a href="#robo_top_of_doc">HDF5.f90</a>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  This is the main module used for linking to the Fortran HDF library.
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/HDF5.f90 on Sun Aug 14 2011 22:49:37
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/src/HDF5mpio_f90.html b/fortran/doc/DevelGuide/src/HDF5mpio_f90.html
deleted file mode 100644
index 9ef5f32..0000000
--- a/fortran/doc/DevelGuide/src/HDF5mpio_f90.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./src/HDF5mpio.f90</title>
-<!-- Source: ./src/HDF5mpio.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="ROBODoc2fHDF52028mpio29"></a>
-<a name="robo77"></a><h2>HDF5 (mpio)</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <a href="./HDF5_f90.html#robo76">HDF5</a>
-</pre>
-<p class="item_name">PURPOSE</p>
-<pre>  This is the main module used for linking to the Fortran parallel HDF library.
-  This file replaces <a href="./HDF5_f90.html#robo_top_of_doc">HDF5.f90</a> when compiling the parallel library.
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./src/HDF5mpio.f90 on Sun Aug 14 2011 22:49:37
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/test/fflush1_f90.html b/fortran/doc/DevelGuide/test/fflush1_f90.html
deleted file mode 100644
index eaab841..0000000
--- a/fortran/doc/DevelGuide/test/fflush1_f90.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./test/fflush1.f90</title>
-<!-- Source: ./test/fflush1.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="root2ffortran2ftest2ffflush12ef90"></a>
-<a name="robo0"></a><h2>fortran/test/fflush1.f90</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  FFLUSH1EXAMPLE
-</pre>
-<p class="item_name">FUNCTION</p>
-<pre>  This is the first half of a two-part test that makes sure
-  that a file can be read after an application crashes as long
-  as the file was flushed first.  We simulate by exit the 
-  the program using stop statement
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./test/fflush1.f90 on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/test/fflush2_f90.html b/fortran/doc/DevelGuide/test/fflush2_f90.html
deleted file mode 100644
index 23b7797..0000000
--- a/fortran/doc/DevelGuide/test/fflush2_f90.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./test/fflush2.f90</title>
-<!-- Source: ./test/fflush2.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="root2ffortran2ftest2ffflush22ef90"></a>
-<a name="robo1"></a><h2>fortran/test/fflush2.f90</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <a href="#robo_top_of_doc">fflush2.f90</a>
-</pre>
-<p class="item_name">FUNCTION</p>
-<pre>  This is the second half of a two-part test that makes sure
-  that a file can be read after an application crashes as long
-  as the file was flushed first.  This half tries to read the
-  file created by the first half.
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./test/fflush2.f90 on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/test/fortranlib_test_1_8_f90.html b/fortran/doc/DevelGuide/test/fortranlib_test_1_8_f90.html
deleted file mode 100644
index 3ce387d..0000000
--- a/fortran/doc/DevelGuide/test/fortranlib_test_1_8_f90.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./test/fortranlib_test_1_8.f90</title>
-<!-- Source: ./test/fortranlib_test_1_8.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="root2ffortran2ftest2ffortranlib5ftest5f15f82ef90"></a>
-<a name="robo3"></a><h2>fortran/test/fortranlib_test_1_8.f90</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <a href="#robo_top_of_doc">fortranlib_test_1_8.f90</a>
-</pre>
-<p class="item_name">FUNCTION</p>
-<pre>  Basic testing of Fortran API's introduced in 1.8 release.
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./test/fortranlib_test_1_8.f90 on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/test/fortranlib_test_F03_f90.html b/fortran/doc/DevelGuide/test/fortranlib_test_F03_f90.html
deleted file mode 100644
index 1a0c7be..0000000
--- a/fortran/doc/DevelGuide/test/fortranlib_test_F03_f90.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./test/fortranlib_test_F03.f90</title>
-<!-- Source: ./test/fortranlib_test_F03.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="root2ffortran2ftest2ffortranlib5ftest5fF032ef90"></a>
-<a name="robo4"></a><h2>fortran/test/fortranlib_test_F03.f90</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <a href="#robo_top_of_doc">fortranlib_test_F03.f90</a>
-</pre>
-<p class="item_name">FUNCTION</p>
-<pre>  Basic testing of Fortran API's requiring Fortran 2003
-  compliance.
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./test/fortranlib_test_F03.f90 on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/test/fortranlib_test_f90.html b/fortran/doc/DevelGuide/test/fortranlib_test_f90.html
deleted file mode 100644
index 29fb2f1..0000000
--- a/fortran/doc/DevelGuide/test/fortranlib_test_f90.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./test/fortranlib_test.f90</title>
-<!-- Source: ./test/fortranlib_test.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="root2ffortran2ftest2ffortranlib5ftest2ef90"></a>
-<a name="robo2"></a><h2>fortran/test/fortranlib_test.f90</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <a href="#robo_top_of_doc">fortranlib_test.f90</a>
-</pre>
-<p class="item_name">FUNCTION</p>
-<pre>  Basic testing of Fortran API's functionality.
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./test/fortranlib_test.f90 on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/test/tF2003_f90.html b/fortran/doc/DevelGuide/test/tF2003_f90.html
deleted file mode 100644
index 8101411..0000000
--- a/fortran/doc/DevelGuide/test/tF2003_f90.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./test/tF2003.f90</title>
-<!-- Source: ./test/tF2003.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="root2ffortran2ftest2ftF20032ef90"></a>
-<a name="robo7"></a><h2>fortran/test/tF2003.f90</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <a href="#robo_top_of_doc">tF2003.f90</a>
-</pre>
-<p class="item_name">FUNCTION</p>
-<pre>  Test FORTRAN <a href="../src/HDF5_f90.html#robo75">HDF5</a> APIs which are dependent on the FORTRAN 2003
-  features. Tests <a href="../src/H5Lff_f90.html#robo48">H5L</a>, H5P, <a href="../src/H5Tff_f90.html#robo69">H5T</a> APIs. 
-</pre>
-<p class="item_name">USES</p>
-<pre>  liter_cb_mod, test_genprop_cls_cb1_mod
-</pre>
-<p class="item_name">CONTAINS SUBROUTINES</p>
-<pre>  test_iter_group, test_create, test_genprop_class_callback,
-  test_array_compound_atomic, test_array_compound_array,
-  test_array_bkg 
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./test/tF2003.f90 on Tue Sep 14 2010 23:17:29
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/test/tH5A_1_8_f90.html b/fortran/doc/DevelGuide/test/tH5A_1_8_f90.html
deleted file mode 100644
index c217d99..0000000
--- a/fortran/doc/DevelGuide/test/tH5A_1_8_f90.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./test/tH5A_1_8.f90</title>
-<!-- Source: ./test/tH5A_1_8.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="root2ffortran2ftest2ftH5A5f15f82ef90"></a>
-<a name="robo8"></a><h2>fortran/test/tH5A_1_8.f90</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <a href="#robo_top_of_doc">tH5A_1_8.f90</a>
-</pre>
-<p class="item_name">FUNCTION</p>
-<pre>  Basic testing of Fortran <a href="../src/H5Aff_f90.html#robo27">H5A</a> APIs introduced in 1.8.
-</pre>
-<p class="item_name">CONTAINS SUBROUTINES</p>
-<pre>  attribute_test_1_8, test_attr_corder_create_compact, test_attr_null_space,
-  test_attr_create_by_name, test_attr_info_by_idx, attr_info_by_idx_check,
-  test_attr_shared_rename, test_attr_delete_by_idx, test_attr_shared_delete,
-  test_attr_dense_open, test_attr_dense_verify, test_attr_corder_create_basic,
-  test_attr_basic_write, test_attr_many, attr_open_check, 
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./test/tH5A_1_8.f90 on Sun Aug 14 2011 22:49:37
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/test/tH5A_f90.html b/fortran/doc/DevelGuide/test/tH5A_f90.html
deleted file mode 100644
index 87c5a45..0000000
--- a/fortran/doc/DevelGuide/test/tH5A_f90.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./test/tH5A.f90</title>
-<!-- Source: ./test/tH5A.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="root2ffortran2ftest2ftH5A2ef90"></a>
-<a name="robo7"></a><h2>fortran/test/tH5A.f90</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <a href="#robo_top_of_doc">tH5A.f90</a>
-</pre>
-<p class="item_name">FUNCTION</p>
-<pre>  Basic testing of Fortran <a href="../src/H5Aff_f90.html#robo27">H5A</a> APIs.
-</pre>
-<p class="item_name">CONTAINS SUBROUTINES</p>
-<pre>  attribute_test 
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./test/tH5A.f90 on Sun Aug 14 2011 22:49:37
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/test/tH5D_f90.html b/fortran/doc/DevelGuide/test/tH5D_f90.html
deleted file mode 100644
index c840425..0000000
--- a/fortran/doc/DevelGuide/test/tH5D_f90.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./test/tH5D.f90</title>
-<!-- Source: ./test/tH5D.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="root2ffortran2ftest2ftH5D2ef90"></a>
-<a name="robo9"></a><h2>fortran/test/tH5D.f90</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <a href="#robo_top_of_doc">tH5D.f90</a>
-</pre>
-<p class="item_name">FUNCTION</p>
-<pre>  Basic testing of Fortran <a href="../src/H5Dff_f90.html#robo31">H5D</a> APIs.
-</pre>
-<p class="item_name">NOTES</p>
-<pre>  Tests the <a href="../src/H5Dff_f90.html#robo31">H5D</a> APIs functionalities of:
-   <a href="../src/H5Dff_f90.html#robo115">h5dcreate_f</a>, <a href="../src/H5Dff_f90.html#robo123">h5dopen_f</a>, <a href="../src/H5Dff_f90.html#robo113">h5dclose_f</a>, <a href="../src/H5Dff_f90.html#robo118">h5dget_space_f</a>, <a href="../src/H5Dff_f90.html#robo121">h5dget_type_f</a>,
-   <a href="../src/H5Dff_F90_f90.html#robo124">h5dread_f</a>, and h5dwrite_f
-</pre>
-<p class="item_name">CONTAINS SUBROUTINES</p>
-<pre>  datasettest, extenddsettest
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./test/tH5D.f90 on Sun Aug 14 2011 22:49:37
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/test/tH5E_f90.html b/fortran/doc/DevelGuide/test/tH5E_f90.html
deleted file mode 100644
index 6a1ef56..0000000
--- a/fortran/doc/DevelGuide/test/tH5E_f90.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./test/tH5E.f90</title>
-<!-- Source: ./test/tH5E.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="root2ffortran2ftest2ftH5E2ef90"></a>
-<a name="robo10"></a><h2>fortran/test/tH5E.f90</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <a href="#robo_top_of_doc">tH5E.f90</a>
-</pre>
-<p class="item_name">FUNCTION</p>
-<pre>  Basic testing of Fortran <a href="../src/H5Eff_f90.html#robo35">H5E</a> APIs.
-</pre>
-<p class="item_name">NOTES</p>
-<pre>  Tests the <a href="../src/H5Dff_f90.html#robo31">H5D</a> APIs functionalities of:
-   <a href="../src/H5Eff_f90.html#robo132">h5eprint_f</a>
-</pre>
-<p class="item_name">CONTAINS SUBROUTINES</p>
-<pre>  error_report_test
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./test/tH5E.f90 on Sun Aug 14 2011 22:49:37
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/test/tH5F_f90.html b/fortran/doc/DevelGuide/test/tH5F_f90.html
deleted file mode 100644
index d1aff59..0000000
--- a/fortran/doc/DevelGuide/test/tH5F_f90.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./test/tH5F.f90</title>
-<!-- Source: ./test/tH5F.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="root2ffortran2ftest2ftH5F2ef90"></a>
-<a name="robo12"></a><h2>fortran/test/tH5F.f90</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <a href="#robo_top_of_doc">tH5F.f90</a>
-</pre>
-<p class="item_name">FUNCTION</p>
-<pre>  Basic testing of Fortran <a href="../src/H5Fff_f90.html#robo39">H5F</a> APIs.
-</pre>
-<p class="item_name">CONTAINS SUBROUTINES</p>
-<pre>  mountingtest, reopentest, plisttest, file_close, file_space
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./test/tH5F.f90 on Sun Aug 14 2011 22:49:37
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/test/tH5G_1_8_f90.html b/fortran/doc/DevelGuide/test/tH5G_1_8_f90.html
deleted file mode 100644
index 81fdd3c..0000000
--- a/fortran/doc/DevelGuide/test/tH5G_1_8_f90.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./test/tH5G_1_8.f90</title>
-<!-- Source: ./test/tH5G_1_8.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="root2ffortran2ftest2ftH5G5f15f82ef90"></a>
-<a name="robo14"></a><h2>fortran/test/tH5G_1_8.f90</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <a href="#robo_top_of_doc">tH5G_1_8.f90</a>
-</pre>
-<p class="item_name">FUNCTION</p>
-<pre>  Basic testing of Fortran <a href="../src/H5Gff_f90.html#robo44">H5G</a> APIs introduced in 1.8.
-</pre>
-<p class="item_name">CONTAINS SUBROUTINES</p>
-<pre>  group_test, group_info, timestamps, mklinks, test_move_preserves, lifecycle
-  cklinks, delete_by_idx, link_info_by_idx_check, test_lcpl, objcopy, 
-  lapl_nlinks
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./test/tH5G_1_8.f90 on Sun Aug 14 2011 22:49:37
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/test/tH5G_f90.html b/fortran/doc/DevelGuide/test/tH5G_f90.html
deleted file mode 100644
index 6c60a3c..0000000
--- a/fortran/doc/DevelGuide/test/tH5G_f90.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./test/tH5G.f90</title>
-<!-- Source: ./test/tH5G.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="root2ffortran2ftest2ftH5G2ef90"></a>
-<a name="robo13"></a><h2>fortran/test/tH5G.f90</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <a href="#robo_top_of_doc">tH5G.f90</a>
-</pre>
-<p class="item_name">FUNCTION</p>
-<pre>  Basic testing of Fortran <a href="../src/H5Gff_f90.html#robo44">H5G</a> APIs.
-</pre>
-<p class="item_name">CONTAINS SUBROUTINES</p>
-<pre>  group_test
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./test/tH5G.f90 on Sun Aug 14 2011 22:49:37
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/test/tH5I_f90.html b/fortran/doc/DevelGuide/test/tH5I_f90.html
deleted file mode 100644
index 52e21fc..0000000
--- a/fortran/doc/DevelGuide/test/tH5I_f90.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./test/tH5I.f90</title>
-<!-- Source: ./test/tH5I.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="root2ffortran2ftest2ftH5I2ef90"></a>
-<a name="robo15"></a><h2>fortran/test/tH5I.f90</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <a href="#robo_top_of_doc">tH5I.f90</a>
-</pre>
-<p class="item_name">FUNCTION</p>
-<pre>  Basic testing of Fortran <a href="../src/H5Iff_f90.html#robo47">H5I</a> APIs.
-</pre>
-<p class="item_name">CONTAINS SUBROUTINES</p>
-<pre>  identifier_test
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./test/tH5I.f90 on Sun Aug 14 2011 22:49:37
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/test/tH5O_f90.html b/fortran/doc/DevelGuide/test/tH5O_f90.html
deleted file mode 100644
index a128da5..0000000
--- a/fortran/doc/DevelGuide/test/tH5O_f90.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./test/tH5O.f90</title>
-<!-- Source: ./test/tH5O.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="root2ffortran2ftest2ftH5O2ef90"></a>
-<a name="robo17"></a><h2>fortran/test/tH5O.f90</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <a href="#robo_top_of_doc">tH5O.f90</a>
-</pre>
-<p class="item_name">FUNCTION</p>
-<pre>  Basic testing of Fortran <a href="../src/H5Off_f90.html#robo56">H5O</a> APIs.
-</pre>
-<p class="item_name">CONTAINS SUBROUTINES</p>
-<pre>  test_h5o, test_h5o_link, test_h5o_plist
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./test/tH5O.f90 on Sun Aug 14 2011 22:49:37
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/test/tH5P_f90.html b/fortran/doc/DevelGuide/test/tH5P_f90.html
deleted file mode 100644
index edc0787..0000000
--- a/fortran/doc/DevelGuide/test/tH5P_f90.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./test/tH5P.f90</title>
-<!-- Source: ./test/tH5P.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="root2ffortran2ftest2ftH5P2ef90"></a>
-<a name="robo18"></a><h2>fortran/test/tH5P.f90</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <a href="#robo_top_of_doc">tH5P.f90</a>
-</pre>
-<p class="item_name">FUNCTION</p>
-<pre>  Basic testing of Fortran H5P APIs.
-</pre>
-<p class="item_name">CONTAINS SUBROUTINES</p>
-<pre>  external_test, multi_file_test
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./test/tH5P.f90 on Sun Aug 14 2011 22:49:37
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/test/tH5R_f90.html b/fortran/doc/DevelGuide/test/tH5R_f90.html
deleted file mode 100644
index fd44062..0000000
--- a/fortran/doc/DevelGuide/test/tH5R_f90.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./test/tH5R.f90</title>
-<!-- Source: ./test/tH5R.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="root2ffortran2ftest2ftH5R2ef90"></a>
-<a name="robo20"></a><h2>fortran/test/tH5R.f90</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <a href="#robo_top_of_doc">tH5R.f90</a>
-</pre>
-<p class="item_name">FUNCTION</p>
-<pre>  Basic testing of Fortran <a href="../src/H5Rff_f90.html#robo64">H5R</a>, Reference Interface, APIs.
-</pre>
-<p class="item_name">NOTES</p>
-<pre>  Tests h5rcreate_f, h5rdereference_f, h5rget_name_f 
-  and H5Rget_object_type functions
-</pre>
-<p class="item_name">CONTAINS SUBROUTINES</p>
-<pre>  refobjtest, refregtest
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./test/tH5R.f90 on Sun Aug 14 2011 22:49:37
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/test/tH5S_f90.html b/fortran/doc/DevelGuide/test/tH5S_f90.html
deleted file mode 100644
index 5879d28..0000000
--- a/fortran/doc/DevelGuide/test/tH5S_f90.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./test/tH5S.f90</title>
-<!-- Source: ./test/tH5S.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="root2ffortran2ftest2ftH5S2ef90"></a>
-<a name="robo21"></a><h2>fortran/test/tH5S.f90</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <a href="#robo_top_of_doc">tH5S.f90</a>
-</pre>
-<p class="item_name">FUNCTION</p>
-<pre>  Basic testing of Fortran <a href="../src/H5Sff_f90.html#robo68">H5S</a>, Dataspace Interface, APIs.
-</pre>
-<p class="item_name">NOTES</p>
-<pre>  Tests the following functionalities:
-   <a href="../src/H5Sff_f90.html#robo378">h5screate_f</a>, <a href="../src/H5Sff_f90.html#robo377">h5scopy_f</a>, <a href="../src/H5Sff_f90.html#robo379">h5screate_simple_f</a>, <a href="../src/H5Sff_f90.html#robo395">h5sis_simple_f</a>,
-   <a href="../src/H5Sff_f90.html#robo391">h5sget_simple_extent_dims_f</a>,<a href="../src/H5Sff_f90.html#robo392">h5sget_simple_extent_ndims_f</a>
-   <a href="../src/H5Sff_f90.html#robo393">h5sget_simple_extent_npoints_f</a>, <a href="../src/H5Sff_f90.html#robo394">h5sget_simple_extent_type_f</a>,
-   <a href="../src/H5Sff_f90.html#robo382">h5sextent_copy_f</a>, <a href="../src/H5Sff_f90.html#robo403">h5sset_extent_simple_f</a>, <a href="../src/H5Sff_f90.html#robo402">h5sset_extent_none_f</a>
-</pre>
-<p class="item_name">CONTAINS SUBROUTINES</p>
-<pre>  dataspace_basic_test
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./test/tH5S.f90 on Sun Aug 14 2011 22:49:37
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/test/tH5Sselect_f90.html b/fortran/doc/DevelGuide/test/tH5Sselect_f90.html
deleted file mode 100644
index e8eaa73..0000000
--- a/fortran/doc/DevelGuide/test/tH5Sselect_f90.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./test/tH5Sselect.f90</title>
-<!-- Source: ./test/tH5Sselect.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="root2ffortran2ftest2ftH5Sselect2ef90"></a>
-<a name="robo22"></a><h2>fortran/test/tH5Sselect.f90</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <a href="#robo_top_of_doc">tH5Sselect.f90</a>
-</pre>
-<p class="item_name">FUNCTION</p>
-<pre>  Basic testing of Fortran <a href="../src/H5Sff_f90.html#robo68">H5S</a>, Selection-related Dataspace Interface, APIs.
-</pre>
-<p class="item_name">NOTES</p>
-<pre>  Tests the following functionalities:
-    <a href="../src/H5Sff_f90.html#robo389">h5sget_select_npoints_f</a>, <a href="../src/H5Sff_f90.html#robo398">h5sselect_elements_f</a>, <a href="../src/H5Sff_f90.html#robo397">h5sselect_all_f</a>,
-    <a href="../src/H5Sff_f90.html#robo400">h5sselect_none_f</a>, <a href="../src/H5Sff_f90.html#robo401">h5sselect_valid_f</a>, <a href="../src/H5Sff_f90.html#robo399">h5sselect_hyperslab_f</a>,
-    <a href="../src/H5Sff_f90.html#robo384">h5sget_select_bounds_f</a>, <a href="../src/H5Sff_f90.html#robo386">h5sget_select_elem_pointlist_f</a>,
-    <a href="../src/H5Sff_f90.html#robo385">h5sget_select_elem_npoints_f</a>, <a href="../src/H5Sff_f90.html#robo387">h5sget_select_hyper_blocklist_f</a>,
-    <a href="../src/H5Sff_f90.html#robo388">h5sget_select_hyper_nblocks_f</a>, <a href="../src/H5Sff_f90.html#robo389">h5sget_select_npoints_f</a>   
-</pre>
-<p class="item_name">CONTAINS SUBROUTINES</p>
-<pre>  test_select_hyperslab, test_select_element, test_basic_select,
-  test_select_point, test_select_combine, test_select_bounds
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./test/tH5Sselect.f90 on Sun Aug 14 2011 22:49:37
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/test/tH5T_f90.html b/fortran/doc/DevelGuide/test/tH5T_f90.html
deleted file mode 100644
index 35006b3..0000000
--- a/fortran/doc/DevelGuide/test/tH5T_f90.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./test/tH5T.f90</title>
-<!-- Source: ./test/tH5T.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="root2ffortran2ftest2ftH5T2ef90"></a>
-<a name="robo23"></a><h2>fortran/test/tH5T.f90</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <a href="#robo_top_of_doc">tH5T.f90</a>
-</pre>
-<p class="item_name">FUNCTION</p>
-<pre>  Basic testing of Fortran <a href="../src/H5Tff_f90.html#robo70">H5T</a> APIs.
-</pre>
-<p class="item_name">CONTAINS SUBROUTINES</p>
-<pre>  compoundtest, basic_data_type_test, enumtest, test_derived_flt
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./test/tH5T.f90 on Sun Aug 14 2011 22:49:37
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/test/tH5VL_f90.html b/fortran/doc/DevelGuide/test/tH5VL_f90.html
deleted file mode 100644
index a34a01d..0000000
--- a/fortran/doc/DevelGuide/test/tH5VL_f90.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./test/tH5VL.f90</title>
-<!-- Source: ./test/tH5VL.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="root2ffortran2ftest2ftH5VL2ef90"></a>
-<a name="robo25"></a><h2>fortran/test/tH5VL.f90</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <a href="#robo_top_of_doc">tH5VL.f90</a>
-</pre>
-<p class="item_name">FUNCTION</p>
-<pre>  Basic testing of Fortran Variable_length datatypes APIs.
-</pre>
-<p class="item_name">CONTAINS SUBROUTINES</p>
-<pre>  vl_test_integer, vl_test_real, vl_test_string 
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./test/tH5VL.f90 on Sun Aug 14 2011 22:49:37
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/test/tH5Z_f90.html b/fortran/doc/DevelGuide/test/tH5Z_f90.html
deleted file mode 100644
index 94325b9..0000000
--- a/fortran/doc/DevelGuide/test/tH5Z_f90.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./test/tH5Z.f90</title>
-<!-- Source: ./test/tH5Z.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="root2ffortran2ftest2ftH5Z2ef90"></a>
-<a name="robo26"></a><h2>fortran/test/tH5Z.f90</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <a href="#robo_top_of_doc">tH5Z.f90</a>
-</pre>
-<p class="item_name">FUNCTION</p>
-<pre>  Basic testing of Fortran <a href="../src/H5Zff_f90.html#robo74">H5Z</a> szip APIs.
-</pre>
-<p class="item_name">CONTAINS SUBROUTINES</p>
-<pre>  filters_test, szip_test
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./test/tH5Z.f90 on Sun Aug 14 2011 22:49:37
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/test/t_c.html b/fortran/doc/DevelGuide/test/t_c.html
deleted file mode 100644
index c9512a7..0000000
--- a/fortran/doc/DevelGuide/test/t_c.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./test/t.c</title>
-<!-- Source: ./test/t.c -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="root2ffortran2ftest2ftc2ec"></a>
-<a name="robo5"></a><h2>fortran/test/tc.c</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>   tc.c
-</pre>
-<p class="item_name">FUNCTION</p>
-<pre>   This file contains C routines needed for the test programs.
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./test/t.c on Sun Aug 14 2011 22:49:37
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/test/tf_f90.html b/fortran/doc/DevelGuide/test/tf_f90.html
deleted file mode 100644
index e3c51f4..0000000
--- a/fortran/doc/DevelGuide/test/tf_f90.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="../robodoc.css" type="text/css" />
-<title>./test/tf.f90</title>
-<!-- Source: ./test/tf.f90 -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="navigation">
-<a class="menuitem" href="../toc_index.html#top">Table of Contents</a>
-<a class="menuitem" href="../robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="../masterindex.html#top">Index</a>
-<a class="menuitem" href="../robo_functions.html#top">Functions</a>
-<a class="menuitem" href="../robo_modules.html#top">Modules</a>
-<a class="menuitem" href="../robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="../robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<hr />
-<a name="root2ffortran2ftest2ftf2ef90"></a>
-<a name="robo6"></a><h2>fortran/test/tf.f90</h2>
-
-<p>[ <a href="#robo_top_of_doc">Top</a> ] [ <a href="../robo_modules.html#robo_top_of_doc">Modules</a> ]</p>
-<p class="item_name">NAME</p>
-<pre>  <a href="#robo_top_of_doc">tf.f90</a>
-</pre>
-<p class="item_name">FUNCTION</p>
-<pre>  Contains subroutines which are needed in all the hdf5 fortran tests
-</pre>
-<p class="item_name">CONTAINS SUBROUTINES</p>
-<pre>  write_test_status, check, verify, verifyLogical, verifyString, h5_fixname_f,
-  h5_cleanup_f, h5_exit_f, h5_env_nocleanup_f
-</pre>
-
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./test/tf.f90 on Sun Aug 14 2011 22:49:37
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/doc/DevelGuide/toc_index.html b/fortran/doc/DevelGuide/toc_index.html
deleted file mode 100644
index 94a2792..0000000
--- a/fortran/doc/DevelGuide/toc_index.html
+++ /dev/null
@@ -1,552 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" />
-<link rel="stylesheet" href="./robodoc.css" type="text/css" />
-<title>Table of Contents</title>
-<!-- Source: ./ -->
-</head>
-<body>
-<div id="logo">
-<a name="robo_top_of_doc">HDF5 FORTRAN Developer's Guide</a>
-</div> <!-- logo -->
-<div id="extra">
-</div> <!-- extra -->
-<div id="navigation">
-<a class="menuitem" href="#top">Table of Contents</a>
-<a class="menuitem" href="./robo_sourcefiles.html#top">Sourcefiles</a>
-<a class="menuitem" href="./masterindex.html#top">Index</a>
-<a class="menuitem" href="./robo_functions.html#top">Functions</a>
-<a class="menuitem" href="./robo_modules.html#top">Modules</a>
-<a class="menuitem" href="./robo_procedures.html#top">Procedures</a>
-<a class="menuitem" href="./robo_subroutines.html#top">Subroutines</a>
-</div> <!-- navigation -->
-<div id="content">
-<h3>TABLE OF CONTENTS</h3>
-<ul>
-<li><a href="./test/fflush1_f90.html#robo0">fortran/test/fflush1.f90</a></li>
-<li><a href="./test/fflush2_f90.html#robo1">fortran/test/fflush2.f90</a></li>
-<li><a href="./test/fortranlib_test_f90.html#robo2">fortran/test/fortranlib_test.f90</a></li>
-<li><a href="./test/fortranlib_test_1_8_f90.html#robo3">fortran/test/fortranlib_test_1_8.f90</a></li>
-<li><a href="./test/fortranlib_test_F03_f90.html#robo4">fortran/test/fortranlib_test_F03.f90</a></li>
-<li><a href="./test/t_c.html#robo5">fortran/test/tc.c</a></li>
-<li><a href="./test/tf_f90.html#robo6">fortran/test/tf.f90</a></li>
-<li><a href="./test/tH5A_f90.html#robo7">fortran/test/tH5A.f90</a></li>
-<li><a href="./test/tH5A_1_8_f90.html#robo8">fortran/test/tH5A_1_8.f90</a></li>
-<li><a href="./test/tH5D_f90.html#robo9">fortran/test/tH5D.f90</a></li>
-<li><a href="./test/tH5E_f90.html#robo10">fortran/test/tH5E.f90</a></li>
-<li><a href="./test/tH5E_F03_f90.html#robo11">fortran/test/tH5E_F03.f90</a></li>
-<li><a href="./test/tH5F_f90.html#robo12">fortran/test/tH5F.f90</a></li>
-<li><a href="./test/tH5G_f90.html#robo13">fortran/test/tH5G.f90</a></li>
-<li><a href="./test/tH5G_1_8_f90.html#robo14">fortran/test/tH5G_1_8.f90</a></li>
-<li><a href="./test/tH5I_f90.html#robo15">fortran/test/tH5I.f90</a></li>
-<li><a href="./test/tH5L_F03_f90.html#robo16">fortran/test/tH5L_F03.f90</a></li>
-<li><a href="./test/tH5O_f90.html#robo17">fortran/test/tH5O.f90</a></li>
-<li><a href="./test/tH5P_f90.html#robo18">fortran/test/tH5P.f90</a></li>
-<li><a href="./test/tH5P_F03_f90.html#robo19">fortran/test/tH5P_F03.f90</a></li>
-<li><a href="./test/tH5R_f90.html#robo20">fortran/test/tH5R.f90</a></li>
-<li><a href="./test/tH5S_f90.html#robo21">fortran/test/tH5S.f90</a></li>
-<li><a href="./test/tH5Sselect_f90.html#robo22">fortran/test/tH5Sselect.f90</a></li>
-<li><a href="./test/tH5T_f90.html#robo23">fortran/test/tH5T.f90</a></li>
-<li><a href="./test/tH5T_F03_f90.html#robo24">fortran/test/tH5T_F03.f90</a></li>
-<li><a href="./test/tH5VL_f90.html#robo25">fortran/test/tH5VL.f90</a></li>
-<li><a href="./test/tH5Z_f90.html#robo26">fortran/test/tH5Z.f90</a></li>
-<li><a href="./src/H5Aff_f90.html#robo27">H5A</a></li>
-<ul>
-<li><a href="./src/H5Aff_f90.html#robo85">h5aclose_f</a></li>
-<li><a href="./src/H5Aff_f90.html#robo86">h5acreate_by_name_f</a></li>
-<li><a href="./src/H5Aff_f90.html#robo87">h5acreate_f</a></li>
-<li><a href="./src/H5Aff_f90.html#robo88">h5adelete_by_idx_f</a></li>
-<li><a href="./src/H5Aff_f90.html#robo89">h5adelete_by_name_f</a></li>
-<li><a href="./src/H5Aff_f90.html#robo90">h5adelete_f</a></li>
-<li><a href="./src/H5Aff_f90.html#robo91">H5Aexists_by_name_f</a></li>
-<li><a href="./src/H5Aff_f90.html#robo92">H5Aexists_f</a></li>
-<li><a href="./src/H5Aff_f90.html#robo93">h5aget_create_plist_f</a></li>
-<li><a href="./src/H5Aff_f90.html#robo94">h5aget_info_by_idx_f</a></li>
-<li><a href="./src/H5Aff_f90.html#robo95">h5aget_info_by_name_f</a></li>
-<li><a href="./src/H5Aff_f90.html#robo96">h5aget_info_f</a></li>
-<li><a href="./src/H5Aff_f90.html#robo97">h5aget_name_by_idx_f</a></li>
-<li><a href="./src/H5Aff_f90.html#robo98">h5aget_name_f</a></li>
-<li><a href="./src/H5Aff_f90.html#robo99">h5aget_num_attrs_f</a></li>
-<li><a href="./src/H5Aff_f90.html#robo100">h5aget_space_f</a></li>
-<li><a href="./src/H5Aff_f90.html#robo101">h5aget_storage_size_f</a></li>
-<li><a href="./src/H5Aff_f90.html#robo102">h5aget_type_f</a></li>
-<li><a href="./src/H5Aff_f90.html#robo103">h5aopen_by_idx_f</a></li>
-<li><a href="./src/H5Aff_f90.html#robo104">H5Aopen_by_name_f</a></li>
-<li><a href="./src/H5Aff_f90.html#robo105">h5aopen_f</a></li>
-<li><a href="./src/H5Aff_f90.html#robo106">h5aopen_idx_f</a></li>
-<li><a href="./src/H5Aff_f90.html#robo107">h5aopen_name_f</a></li>
-<li><a href="./src/H5Aff_f90.html#robo109">h5arename_by_name_f</a></li>
-<li><a href="./src/H5Aff_f90.html#robo110">h5arename_f</a></li>
-</ul>
-<li><a href="./src/H5Aff_F03_f90.html#robo28">H5A (F03)</a></li>
-<ul>
-<li><a href="./src/H5Aff_F03_f90.html#robo108">h5aread_f</a></li>
-</ul>
-<li><a href="./src/H5Aff_F90_f90.html#robo29">H5A (F90)</a></li>
-<li><a href="./src/H5Af_c.html#robo30">H5Af</a></li>
-<li><a href="./src/H5Dff_f90.html#robo31">H5D</a></li>
-<ul>
-<li><a href="./src/H5Dff_f90.html#robo113">h5dclose_f</a></li>
-<li><a href="./src/H5Dff_f90.html#robo114">h5dcreate_anon_f</a></li>
-<li><a href="./src/H5Dff_f90.html#robo115">h5dcreate_f</a></li>
-<li><a href="./src/H5Dff_f90.html#robo116">h5dget_access_plist_f</a></li>
-<li><a href="./src/H5Dff_f90.html#robo117">h5dget_create_plist_f</a></li>
-<li><a href="./src/H5Dff_f90.html#robo118">h5dget_space_f</a></li>
-<li><a href="./src/H5Dff_f90.html#robo119">h5dget_space_status_f</a></li>
-<li><a href="./src/H5Dff_f90.html#robo120">h5dget_storage_size_f</a></li>
-<li><a href="./src/H5Dff_f90.html#robo121">h5dget_type_f</a></li>
-<li><a href="./src/H5Dff_f90.html#robo123">h5dopen_f</a></li>
-<li><a href="./src/H5Dff_F90_f90.html#robo124">h5dread_f</a></li>
-<li><a href="./src/H5Dff_f90.html#robo125">h5dset_extent</a></li>
-<li><a href="./src/H5Dff_f90.html#robo126">h5dvlen_get_max_len_f</a></li>
-<li><a href="./src/H5Dff_F03_f90.html#robo127">h5dvlen_reclaim</a></li>
-</ul>
-<li><a href="./src/H5Dff_F03_f90.html#robo32">H5D (F03)</a></li>
-<li><a href="./src/H5Dff_F90_f90.html#robo33">H5D (F90)</a></li>
-<li><a href="./src/H5Df_c.html#robo34">H5Df</a></li>
-<li><a href="./src/H5Eff_f90.html#robo35">H5E</a></li>
-<ul>
-<li><a href="./src/H5Eff_f90.html#robo128">h5eclear_f</a></li>
-<li><a href="./src/H5Eff_F03_f90.html#robo129">h5eget_auto_f</a></li>
-<li><a href="./src/H5Eff_f90.html#robo130">h5eget_major_f</a></li>
-<li><a href="./src/H5Eff_f90.html#robo131">h5eget_minor_f</a></li>
-<li><a href="./src/H5Eff_f90.html#robo132">h5eprint_f</a></li>
-<li><a href="./src/H5Eff_F03_f90.html#robo133">h5eset_auto2_f</a></li>
-<li><a href="./src/H5Eff_F90_f90.html#robo134">h5eset_auto_f</a></li>
-</ul>
-<li><a href="./src/H5Eff_F03_f90.html#robo36">H5E (F03)</a></li>
-<li><a href="./src/H5Eff_F90_f90.html#robo37">H5E (F90)</a></li>
-<li><a href="./src/H5Ef_c.html#robo38">H5Ef</a></li>
-<li><a href="./src/H5Fff_f90.html#robo39">H5F</a></li>
-<ul>
-<li><a href="./src/H5Fff_f90.html#robo135">h5fclose_f</a></li>
-<li><a href="./src/H5Fff_f90.html#robo136">h5fcreate_f</a></li>
-<li><a href="./src/H5Fff_f90.html#robo137">h5fflush_f</a></li>
-<li><a href="./src/H5Fff_f90.html#robo138">h5fget_access_plist_f</a></li>
-<li><a href="./src/H5Fff_f90.html#robo139">h5fget_create_plist_f</a></li>
-<li><a href="./src/H5Fff_f90.html#robo140">h5fget_filesize_f</a></li>
-<li><a href="./src/H5Fff_f90.html#robo141">h5fget_freespace_f</a></li>
-<li><a href="./src/H5Fff_f90.html#robo142">h5fget_name_f</a></li>
-<li><a href="./src/H5Fff_f90.html#robo143">h5fget_obj_count_f</a></li>
-<li><a href="./src/H5Fff_f90.html#robo144">h5fget_obj_ids_f</a></li>
-<li><a href="./src/H5Fff_f90.html#robo145">h5fis_hdf5_f</a></li>
-<li><a href="./src/H5Fff_f90.html#robo146">h5fmount_f</a></li>
-<li><a href="./src/H5Fff_f90.html#robo147">h5fopen_f</a></li>
-<li><a href="./src/H5Fff_f90.html#robo148">h5freopen_f</a></li>
-<li><a href="./src/H5Fff_f90.html#robo149">h5funmount_f</a></li>
-</ul>
-<li><a href="./src/H5f90kit_c.html#robo40">H5f90kit</a></li>
-<li><a href="./src/H5FDmpioff_f90.html#robo41">H5FDMPIO</a></li>
-<ul>
-<li><a href="./src/H5FDmpioff_f90.html#robo231">h5pget_dxpl_mpio_f</a></li>
-<li><a href="./src/H5FDmpioff_f90.html#robo239">h5pget_fapl_mpio_f</a></li>
-<li><a href="./src/H5FDmpioff_f90.html#robo240">h5pget_fapl_mpiposix_f</a></li>
-<li><a href="./src/H5FDmpioff_f90.html#robo314">h5pset_dxpl_mpio_f</a></li>
-<li><a href="./src/H5FDmpioff_f90.html#robo320">h5pset_fapl_mpio_f</a></li>
-<li><a href="./src/H5FDmpioff_f90.html#robo321">h5pset_fapl_mpiposix_f</a></li>
-</ul>
-<li><a href="./src/H5FDmpiof_c.html#robo42">H5FDmpiof</a></li>
-<li><a href="./src/H5Ff_c.html#robo43">H5Ff</a></li>
-<li><a href="./src/H5Gff_f90.html#robo44">H5G</a></li>
-<ul>
-<li><a href="./src/H5Gff_f90.html#robo151">h5gclose_f</a></li>
-<li><a href="./src/H5Gff_f90.html#robo152">H5Gcreate_anon_f</a></li>
-<li><a href="./src/H5Gff_f90.html#robo153">h5gcreate_f</a></li>
-<li><a href="./src/H5Gff_f90.html#robo155">h5gget_comment_f</a></li>
-<li><a href="./src/H5Gff_f90.html#robo156">H5Gget_create_plist_f</a></li>
-<li><a href="./src/H5Gff_f90.html#robo157">h5gget_info_by_idx_f</a></li>
-<li><a href="./src/H5Gff_f90.html#robo158">h5gget_info_by_name_f</a></li>
-<li><a href="./src/H5Gff_f90.html#robo159">h5gget_info_f</a></li>
-<li><a href="./src/H5Gff_f90.html#robo160">h5gget_linkval_f</a></li>
-<li><a href="./src/H5Gff_f90.html#robo161">h5gget_obj_info_idx_f</a></li>
-<li><a href="./src/H5Gff_f90.html#robo162">h5glink2_f</a></li>
-<li><a href="./src/H5Gff_f90.html#robo163">h5glink_f</a></li>
-<li><a href="./src/H5Gff_f90.html#robo164">h5gmove2_f</a></li>
-<li><a href="./src/H5Gff_f90.html#robo165">h5gmove_f</a></li>
-<li><a href="./src/H5Gff_f90.html#robo166">h5gn_members_f</a></li>
-<li><a href="./src/H5Gff_f90.html#robo167">h5gopen_f</a></li>
-<li><a href="./src/H5Gff_f90.html#robo168">h5gset_comment_f</a></li>
-<li><a href="./src/H5Gff_f90.html#robo169">h5gunlink_f</a></li>
-</ul>
-<li><a href="./src/H5Gf_c.html#robo45">H5Gf</a></li>
-<li><a href="./src/H5f90global_f90.html#robo46">H5GLOBAL</a></li>
-<li><a href="./src/H5Iff_f90.html#robo47">H5I</a></li>
-<ul>
-<li><a href="./src/H5Iff_f90.html#robo170">h5idec_ref_f</a></li>
-<li><a href="./src/H5Iff_f90.html#robo171">h5iget_file_id_f</a></li>
-<li><a href="./src/H5Iff_f90.html#robo172">h5iget_name_f</a></li>
-<li><a href="./src/H5Iff_f90.html#robo173">h5iget_ref_f</a></li>
-<li><a href="./src/H5Iff_f90.html#robo174">h5iget_type_f</a></li>
-<li><a href="./src/H5Iff_f90.html#robo175">h5iinc_ref_f</a></li>
-<li><a href="./src/H5Iff_f90.html#robo176">h5iis_valid_f</a></li>
-</ul>
-<li><a href="./src/H5If_c.html#robo48">H5If</a></li>
-<li><a href="./src/H5Lff_f90.html#robo49">H5L</a></li>
-<ul>
-<li><a href="./src/H5Lff_f90.html#robo178">h5lcopy_f</a></li>
-<li><a href="./src/H5Lff_f90.html#robo179">H5Lcreate_external_f</a></li>
-<li><a href="./src/H5Lff_f90.html#robo180">H5Lcreate_hard_f</a></li>
-<li><a href="./src/H5Lff_f90.html#robo181">H5Lcreate_soft_f</a></li>
-<li><a href="./src/H5Lff_f90.html#robo182">h5ldelete_by_idx_f</a></li>
-<li><a href="./src/H5Lff_f90.html#robo183">h5ldelete_f</a></li>
-<li><a href="./src/H5Lff_f90.html#robo184">H5Lexists_f</a></li>
-<li><a href="./src/H5Lff_f90.html#robo185">h5lget_info_by_idx_f</a></li>
-<li><a href="./src/H5Lff_f90.html#robo186">h5lget_info_f</a></li>
-<li><a href="./src/H5Lff_f90.html#robo187">h5lget_name_by_idx_f</a></li>
-<li><a href="./src/H5Lff_f90.html#robo188">h5lis_registered_f</a></li>
-<li><a href="./src/H5Lff_f90.html#robo191">h5lmove_f</a></li>
-</ul>
-<li><a href="./src/H5Lff_F03_f90.html#robo50">H5L (F03)</a></li>
-<ul>
-<li><a href="./src/H5Lff_F03_f90.html#robo189">h5literate_by_name_f</a></li>
-<li><a href="./src/H5Lff_F03_f90.html#robo190">h5literate_f</a></li>
-</ul>
-<li><a href="./src/H5Lff_F90_f90.html#robo51">H5L (F90)</a></li>
-<li><a href="./src/H5Lf_c.html#robo52">H5Lf</a></li>
-<li><a href="./src/H5_ff_f90.html#robo53">H5LIB</a></li>
-<ul>
-<li><a href="./src/H5_ff_f90.html#robo111">h5check_version_f</a></li>
-<li><a href="./src/H5_ff_f90.html#robo112">h5close_f</a></li>
-<li><a href="./src/H5_ff_f90.html#robo122">h5dont_atexit_f</a></li>
-<li><a href="./src/H5_ff_f90.html#robo150">h5garbage_collect_f</a></li>
-<li><a href="./src/H5_ff_f90.html#robo154">h5get_libversion_f</a></li>
-<li><a href="./src/H5_ff_f90.html#robo177">h5kind_to_type</a></li>
-<li><a href="./src/H5_ff_f90.html#robo198">h5open_f</a></li>
-</ul>
-<li><a href="./src/H5_ff_F03_f90.html#robo54">H5LIB_PROVISIONAL</a></li>
-<ul>
-<li><a href="./src/H5_ff_F03_f90.html#robo194">h5offsetof</a></li>
-</ul>
-<li><a href="./src/H5_ff_F90_f90.html#robo55">H5LIB_PROVISIONAL (F90)</a></li>
-<li><a href="./src/H5Off_f90.html#robo56">H5O</a></li>
-<ul>
-<li><a href="./src/H5Off_f90.html#robo193">h5oclose_f</a></li>
-<li><a href="./src/H5Off_f90.html#robo195">h5olink_f</a></li>
-<li><a href="./src/H5Off_f90.html#robo196">h5oopen_f</a></li>
-<li><a href="./src/H5Off_f90.html#robo197">h5open_by_addr_f</a></li>
-</ul>
-<li><a href="./src/H5Off_F03_f90.html#robo57">H5O (F03)</a></li>
-<ul>
-<li><a href="./src/H5Off_F03_f90.html#robo199">h5ovisit_f</a></li>
-</ul>
-<li><a href="./src/H5Off_F90_f90.html#robo58">H5O (F90)</a></li>
-<li><a href="./src/H5Of_c.html#robo59">H5Of</a></li>
-<li><a href="./src/H5Pff_F90_f90.html#robo60">H5P (_F90)</a></li>
-<li><a href="./src/H5Pff_F03_f90.html#robo61">H5P (F03)</a></li>
-<ul>
-<li><a href="./src/H5Pff_F03_f90.html#robo80"> h5pget_double</a></li>
-<li><a href="./src/H5Pff_F03_f90.html#robo205">h5pcreate_class_f</a></li>
-<li><a href="./src/H5Pff_F03_f90.html#robo218">h5pget_char</a></li>
-<li><a href="./src/H5Pff_F03_f90.html#robo247">h5pget_integer</a></li>
-<li><a href="./src/H5Pff_F03_f90.html#robo261">h5pget_real</a></li>
-<li><a href="./src/H5Pff_F03_f90.html#robo273">h5pinsert_char</a></li>
-<li><a href="./src/H5Pff_F03_f90.html#robo274">h5pinsert_double</a></li>
-<li><a href="./src/H5Pff_F03_f90.html#robo276">h5pinsert_integer</a></li>
-<li><a href="./src/H5Pff_F03_f90.html#robo278">h5pinsert_ptr</a></li>
-<li><a href="./src/H5Pff_F03_f90.html#robo280">h5pinsert_real</a></li>
-<li><a href="./src/H5Pff_F03_f90.html#robo283">h5pregister_char</a></li>
-<li><a href="./src/H5Pff_F03_f90.html#robo286">h5pregister_double</a></li>
-<li><a href="./src/H5Pff_F03_f90.html#robo287">h5pregister_integer</a></li>
-<li><a href="./src/H5Pff_F03_f90.html#robo289">h5pregister_ptr</a></li>
-<li><a href="./src/H5Pff_F03_f90.html#robo291">h5pregister_real</a></li>
-<li><a href="./src/H5Pff_F03_f90.html#robo294">h5pset(get)fill_value_f</a></li>
-<li><a href="./src/H5Pff_F03_f90.html#robo303">h5pset_char</a></li>
-<li><a href="./src/H5Pff_F03_f90.html#robo313">h5pset_double</a></li>
-<li><a href="./src/H5Pff_F03_f90.html#robo334">h5pset_integer</a></li>
-<li><a href="./src/H5Pff_F03_f90.html#robo345">h5pset_real</a></li>
-</ul>
-<li><a href="./src/H5Pff_f90.html#robo62">H5P (F90)</a></li>
-<ul>
-<li><a href="./src/H5Pff_F90_f90.html#robo206">h5pcreate_class_f</a></li>
-<li><a href="./src/H5Pff_F90_f90.html#robo219">h5pget_char</a></li>
-<li><a href="./src/H5Pff_F90_f90.html#robo229">h5pget_double</a></li>
-<li><a href="./src/H5Pff_F90_f90.html#robo248">h5pget_integer</a></li>
-<li><a href="./src/H5Pff_F90_f90.html#robo260">h5pget_real</a></li>
-<li><a href="./src/H5Pff_F90_f90.html#robo272">h5pinsert_char</a></li>
-<li><a href="./src/H5Pff_F90_f90.html#robo275">h5pinsert_double</a></li>
-<li><a href="./src/H5Pff_F90_f90.html#robo277">h5pinsert_integer</a></li>
-<li><a href="./src/H5Pff_F90_f90.html#robo279">h5pinsert_real</a></li>
-<li><a href="./src/H5Pff_F90_f90.html#robo284">h5pregister_char</a></li>
-<li><a href="./src/H5Pff_F90_f90.html#robo285">h5pregister_double</a></li>
-<li><a href="./src/H5Pff_F90_f90.html#robo288">h5pregister_integer</a></li>
-<li><a href="./src/H5Pff_F90_f90.html#robo290">h5pregister_real</a></li>
-<li><a href="./src/H5Pff_F90_f90.html#robo295">h5pset(get)fill_value_f</a></li>
-<li><a href="./src/H5Pff_F90_f90.html#robo304">h5pset_char</a></li>
-<li><a href="./src/H5Pff_F90_f90.html#robo312">h5pset_double</a></li>
-<li><a href="./src/H5Pff_F90_f90.html#robo333">h5pset_integer</a></li>
-<li><a href="./src/H5Pff_F90_f90.html#robo346">h5pset_real</a></li>
-</ul>
-<li><a href="./src/H5Pf_c.html#robo63">H5Pf</a></li>
-<li><a href="./src/H5Rff_f90.html#robo64">H5R</a></li>
-<ul>
-<li><a href="./src/H5Rff_f90.html#robo374">h5rget_object_type_obj_f</a></li>
-<li><a href="./src/H5Rff_f90.html#robo375">h5rget_region_region_f</a></li>
-</ul>
-<li><a href="./src/H5Rff_F03_f90.html#robo65">H5R (F03)</a></li>
-<ul>
-<li><a href="./src/H5Rff_F03_f90.html#robo358">h5rcreate_object_f</a></li>
-<li><a href="./src/H5Rff_F03_f90.html#robo360">h5rcreate_ptr_f</a></li>
-<li><a href="./src/H5Rff_F03_f90.html#robo362">h5rcreate_region_f</a></li>
-<li><a href="./src/H5Rff_F03_f90.html#robo363">h5rdereference_object_f</a></li>
-<li><a href="./src/H5Rff_F03_f90.html#robo365">h5rdereference_ptr_f</a></li>
-<li><a href="./src/H5Rff_F03_f90.html#robo366">h5rdereference_region_f</a></li>
-<li><a href="./src/H5Rff_F03_f90.html#robo369">h5rget_name_object_f</a></li>
-<li><a href="./src/H5Rff_F03_f90.html#robo370">h5rget_name_ptr_f</a></li>
-<li><a href="./src/H5Rff_F03_f90.html#robo372">h5rget_name_region_f</a></li>
-<li><a href="./src/H5Rff_F03_f90.html#robo373">h5rget_obj_type_f</a></li>
-</ul>
-<li><a href="./src/H5Rff_F90_f90.html#robo66">H5R (F90)</a></li>
-<ul>
-<li><a href="./src/H5Rff_F90_f90.html#robo359">h5rcreate_object_f</a></li>
-<li><a href="./src/H5Rff_F90_f90.html#robo361">h5rcreate_region_f</a></li>
-<li><a href="./src/H5Rff_F90_f90.html#robo364">h5rdereference_object_f</a></li>
-<li><a href="./src/H5Rff_F90_f90.html#robo367">h5rdereference_region_f</a></li>
-<li><a href="./src/H5Rff_F90_f90.html#robo368">h5rget_name_object_f</a></li>
-<li><a href="./src/H5Rff_F90_f90.html#robo371">h5rget_name_region_f</a></li>
-</ul>
-<li><a href="./src/H5Rf_c.html#robo67">H5Rf</a></li>
-<li><a href="./src/H5Sff_f90.html#robo68">H5S</a></li>
-<ul>
-<li><a href="./src/H5Sff_f90.html#robo376">h5sclose_f</a></li>
-<li><a href="./src/H5Sff_f90.html#robo377">h5scopy_f</a></li>
-<li><a href="./src/H5Sff_f90.html#robo378">h5screate_f</a></li>
-<li><a href="./src/H5Sff_f90.html#robo379">h5screate_simple_f</a></li>
-<li><a href="./src/H5Sff_f90.html#robo380">H5Sdecode_f</a></li>
-<li><a href="./src/H5Sff_f90.html#robo381">H5Sencode_f</a></li>
-<li><a href="./src/H5Sff_f90.html#robo382">h5sextent_copy_f</a></li>
-<li><a href="./src/H5Sff_f90.html#robo383">h5sextent_equal_f</a></li>
-<li><a href="./src/H5Sff_f90.html#robo384">h5sget_select_bounds_f</a></li>
-<li><a href="./src/H5Sff_f90.html#robo385">h5sget_select_elem_npoints_f</a></li>
-<li><a href="./src/H5Sff_f90.html#robo386">h5sget_select_elem_pointlist_f</a></li>
-<li><a href="./src/H5Sff_f90.html#robo387">h5sget_select_hyper_blocklist_f</a></li>
-<li><a href="./src/H5Sff_f90.html#robo388">h5sget_select_hyper_nblocks_f</a></li>
-<li><a href="./src/H5Sff_f90.html#robo389">h5sget_select_npoints_f</a></li>
-<li><a href="./src/H5Sff_f90.html#robo390">h5sget_select_type_f</a></li>
-<li><a href="./src/H5Sff_f90.html#robo391">h5sget_simple_extent_dims_f</a></li>
-<li><a href="./src/H5Sff_f90.html#robo392">h5sget_simple_extent_ndims_f</a></li>
-<li><a href="./src/H5Sff_f90.html#robo393">h5sget_simple_extent_npoints_f</a></li>
-<li><a href="./src/H5Sff_f90.html#robo394">h5sget_simple_extent_type_f</a></li>
-<li><a href="./src/H5Sff_f90.html#robo395">h5sis_simple_f</a></li>
-<li><a href="./src/H5Sff_f90.html#robo396">h5soffset_simple_f</a></li>
-<li><a href="./src/H5Sff_f90.html#robo397">h5sselect_all_f</a></li>
-<li><a href="./src/H5Sff_f90.html#robo398">h5sselect_elements_f</a></li>
-<li><a href="./src/H5Sff_f90.html#robo399">h5sselect_hyperslab_f</a></li>
-<li><a href="./src/H5Sff_f90.html#robo400">h5sselect_none_f</a></li>
-<li><a href="./src/H5Sff_f90.html#robo401">h5sselect_valid_f</a></li>
-<li><a href="./src/H5Sff_f90.html#robo402">h5sset_extent_none_f</a></li>
-<li><a href="./src/H5Sff_f90.html#robo403">h5sset_extent_simple_f</a></li>
-</ul>
-<li><a href="./src/H5Sf_c.html#robo69">H5Sf</a></li>
-<li><a href="./src/H5Tff_f90.html#robo70">H5T</a></li>
-<ul>
-<li><a href="./src/H5Tff_f90.html#robo404">h5tarray_create_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo405">h5tclose_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo406">h5tcommit_anon_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo407">h5tcommit_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo408">h5tcommitted_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo409">h5tcompiler_conv_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo411">h5tcopy_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo412">h5tcreate_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo413">H5Tdecode_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo414">h5tenaum_insert_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo415">H5Tencode_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo416">h5tenum_create_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo417">h5tenum_nameof_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo418">h5tenum_valuof_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo419">h5tequal_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo422">h5tget_array_dims_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo423">h5tget_array_ndims_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo424">h5tget_class_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo425">h5tget_create_plist_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo426">h5tget_cset_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo427">h5tget_ebias_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo428">h5tget_fields_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo429">h5tget_inpad_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo430">h5tget_member_class_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo431">h5tget_member_index_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo432">h5tget_member_name_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo433">h5tget_member_offset_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo434">h5tget_member_type_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo435">h5tget_member_value_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo436">h5tget_native_type_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo437">h5tget_nmembers_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo438">h5tget_norm_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo439">h5tget_offset_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo440">h5tget_order_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo441">h5tget_pad_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo442">h5tget_precision_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo443">h5tget_sign_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo444">h5tget_size_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo445">h5tget_strpad_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo446">h5tget_super_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo447">h5tget_tag_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo448">h5tinsert_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo449">h5tis_variable_str_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo450">h5topen_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo451">h5tpack_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo452">h5tset_cset_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo453">h5tset_ebias_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo454">h5tset_fields_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo455">h5tset_inpad_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo456">h5tset_norm_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo457">h5tset_offset_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo458">h5tset_order_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo459">h5tset_pad_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo460">h5tset_precision_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo461">h5tset_sign_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo462">h5tset_size_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo463">h5tset_strpad_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo464">h5tset_tag_f</a></li>
-<li><a href="./src/H5Tff_f90.html#robo465">h5tvlen_create_f</a></li>
-</ul>
-<li><a href="./src/H5Tff_F03_f90.html#robo71">H5T (F03)</a></li>
-<ul>
-<li><a href="./src/H5Tff_F03_f90.html#robo410">H5Tconvert_f</a></li>
-</ul>
-<li><a href="./src/H5Tff_F90_f90.html#robo72">H5T (F90)</a></li>
-<li><a href="./src/H5Tf_c.html#robo73">H5Tf</a></li>
-<li><a href="./src/H5Zff_f90.html#robo74">H5Z</a></li>
-<ul>
-<li><a href="./src/H5Zff_f90.html#robo466">h5zfilter_avail_f</a></li>
-<li><a href="./src/H5Zff_f90.html#robo467">h5zget_filter_info_f</a></li>
-<li><a href="./src/H5Zff_f90.html#robo468">h5zunregister_f</a></li>
-</ul>
-<li><a href="./src/H5Zf_c.html#robo75">H5Zf</a></li>
-<li><a href="./src/HDF5_f90.html#robo76">HDF5</a></li>
-<li><a href="./src/HDF5mpio_f90.html#robo77">HDF5 (mpio)</a></li>
-<li><a href="./src/H5_DBLE_InterfaceExclude_f90.html#robo78">src/H5_DBLE_InterfaceExclude.f90</a></li>
-<li><a href="./src/H5_DBLE_InterfaceInclude_f90.html#robo79">src/H5_DBLE_InterfaceInclude.f90</a></li>
-<li><a href="./src/H5Pff_f90.html#robo81"> h5pget_hyper_vector_size_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo82"> h5pset_family_offset_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo83"> h5pset_fapl_family_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo84"> h5pset_meta_block_size_f</a></li>
-<li><a href="./src/H5match_types_c.html#robo192">H5match_types</a></li>
-<li><a href="./src/H5Pff_f90.html#robo200">h5pall_filters_avail_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo201">h5pclose_class_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo202">h5pclose_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo203">h5pcopy_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo204">h5pcopy_prop_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo207">h5pcreate_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo208">h5pequal_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo209">h5pexist_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo210">h5pfill_value_defined_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo211">h5pget_alignment_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo212">h5pget_alloc_time_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo213">H5Pget_attr_creation_order_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo214">H5Pget_attr_phase_change_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo215">h5pget_btree_ratios_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo216">h5pget_buffer_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo217">h5pget_cache_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo220">H5Pget_char_encoding_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo221">H5Pget_chunk_cache_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo222">h5pget_chunk_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo223">h5pget_class_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo224">h5pget_class_name_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo225">h5pget_class_parent_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo226">h5pget_copy_object_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo227">H5Pget_create_inter_group_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo228">h5pget_data_transform_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo230">h5pget_driver_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo232">h5pget_edc_check_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo233">H5Pget_est_link_info_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo234">h5pget_external_count_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo235">h5pget_external_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo236">h5pget_fapl_core_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo237">h5pget_fapl_direct_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo238">h5pget_fapl_family_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo241">h5pget_fapl_multi_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo242">h5pget_fclose_degree_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo243">h5pget_fill_time_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo244">h5pget_filter_by_id_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo245">h5pget_filter_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo246">h5pget_gc_references_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo249">h5pget_istore_k_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo250">h5pget_layout_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo251">H5Pget_link_creation_order_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo252">H5Pget_link_phase_change_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo253">H5Pget_local_heap_size_hint_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo254">h5pget_meta_block_size_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo255">h5pget_nfilters_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo256">h5pget_nlinks_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo257">h5pget_npros_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo258">H5Pget_obj_track_times_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo259">h5pget_preserve_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo262">h5pget_sec2_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo263">h5pget_sieve_buf_size_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo264">h5pget_size_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo265">h5pget_sizes_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo266">h5pget_small_data_block_size_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo267">h5pget_split_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo268">h5pget_stdio_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo269">h5pget_sym_k_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo270">h5pget_userblock_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo271">h5pget_version_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo281">h5pisa_class_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo282">h5pmodify_filter_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo292">h5premove_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo293">h5premove_filter_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo296">h5pset_alignment_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo297">h5pset_alloc_time_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo298">H5Pset_attr_creation_order_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo299">H5Pset_attr_phase_change_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo300">h5pset_btree_ratios_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo301">h5pset_buffer_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo302">h5pset_cache_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo305">H5Pset_char_encoding_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo306">H5Pset_chunk_cache_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo307">h5pset_chunk_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo308">h5pset_copy_object_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo309">H5Pset_create_inter_group_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo310">h5pset_data_transform_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo311">h5pset_deflate_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo315">h5pset_edc_check_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo316">h5pset_est_link_info_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo317">h5pset_external_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo318">h5pset_fapl_core_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo319">h5pset_fapl_direct_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo322">h5pset_fapl_multi_l</a></li>
-<li><a href="./src/H5Pff_f90.html#robo323">h5pset_fapl_multi_s</a></li>
-<li><a href="./src/H5Pff_f90.html#robo324">h5pset_fapl_sec2_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo325">h5pset_fapl_split_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo326">h5pset_fapl_stdio_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo327">h5pset_fclose_degree_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo328">h5pset_fill_time_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo329">h5pset_filter_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo330">h5pset_fletcher32_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo331">h5pset_gc_references_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo332">h5pset_hyper_vector_size_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo335">h5pset_istore_k_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo336">h5pset_layout_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo337">H5Pset_libver_bounds_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo338">H5Pset_link_creation_order_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo339">h5pset_link_phase_change_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo340">H5Pset_local_heap_size_hint_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo341">H5Pset_nbit_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo342">h5pset_nlinks_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo343">H5Pset_obj_track_times_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo344">h5pset_preserve_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo347">h5pset_scaleoffset_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo348">H5Pset_shared_mesg_index_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo349">H5Pset_shared_mesg_nindexes_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo350">h5pset_shuffle_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo351">h5pset_sieve_buf_size_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo352">h5pset_sizes_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo353">h5pset_small_data_block_size_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo354">h5pset_sym_k_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo355">h5pset_szip_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo356">h5pset_userblock_f</a></li>
-<li><a href="./src/H5Pff_f90.html#robo357">h5punregister_f</a></li>
-<li><a href="./src/H5test_kind_f90.html#robo420">H5test_kind</a></li>
-<li><a href="./src/H5test_kind_SIZEOF_f90.html#robo421">H5test_kind_SIZEOF</a></li>
-</ul>
-</div> <!-- content -->
-<div id="footer">
-<p>Generated from ./ on Sun Aug 14 2011 22:49:38
-</p>
-</div> <!-- footer -->
-</body>
-</html>
diff --git a/fortran/examples/CMakeLists.txt b/fortran/examples/CMakeLists.txt
index 2bf0bf6..6f1b825 100644
--- a/fortran/examples/CMakeLists.txt
+++ b/fortran/examples/CMakeLists.txt
@@ -1,16 +1,11 @@
-cmake_minimum_required (VERSION 3.1.0)
-PROJECT (HDF5_F90_EXAMPLES C CXX Fortran)
+cmake_minimum_required (VERSION 3.18)
+project (HDF5_F90_EXAMPLES C Fortran)
 # --------------------------------------------------------------------
 # Notes: When creating examples they should be prefixed
 # with "f90_ex_". This allows for easier filtering of the examples.
 # --------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
-# Setup include Directories
-#-----------------------------------------------------------------------------
-INCLUDE_DIRECTORIES (${HDF5_F90_BINARY_DIR} ${HDF5_F90_SRC_DIR}/src)
-
-#-----------------------------------------------------------------------------
 # Define Sources
 #-----------------------------------------------------------------------------
 set (examples
@@ -40,55 +35,139 @@ set (F2003_examples
 
 foreach (example ${examples})
   add_executable (f90_ex_${example} ${HDF5_F90_EXAMPLES_SOURCE_DIR}/${example}.f90)
-  TARGET_NAMING (f90_ex_${example} ${LIB_TYPE})
-  TARGET_FORTRAN_PROPERTIES (f90_ex_${example} ${LIB_TYPE} " " " ")
-  target_link_libraries (f90_ex_${example}
-      ${HDF5_F90_LIB_TARGET}
-      ${HDF5_LIB_TARGET}
-  )
-  target_include_directories (f90_ex_${example} PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY}/static)
-  set_target_properties (f90_ex_${example} PROPERTIES
-      LINKER_LANGUAGE Fortran
-      FOLDER examples/fortran
-      Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}
-  )
-endforeach (example ${examples})
+  target_compile_options(f90_ex_${example} PRIVATE $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_COMPILE_FLAGS}>)
+#  set_property(TARGET f90_ex_${example} APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"-SUBSYSTEM:CONSOLE">)
+#  set_property(TARGET f90_ex_${example} APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_LINK_FLAGS}>)
+  if(MSVC)
+    set_property(TARGET f90_ex_${example} PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE ${WIN_LINK_FLAGS}")
+  endif()
+  if (NOT BUILD_SHARED_LIBS)
+    target_include_directories (f90_ex_${example}
+        PRIVATE
+            "${CMAKE_Fortran_MODULE_DIRECTORY}/static"
+            "${HDF5_SRC_INCLUDE_DIRS}"
+            "${HDF5_SRC_BINARY_DIR}"
+            "${HDF5_F90_BINARY_DIR}"
+            "${HDF5_F90_BINARY_DIR}/static"
+    )
+    target_link_libraries (f90_ex_${example} PRIVATE ${HDF5_F90_LIB_TARGET} ${HDF5_LIB_TARGET})
+    set_target_properties (f90_ex_${example} PROPERTIES
+        LINKER_LANGUAGE Fortran
+        FOLDER examples/fortran
+        Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/static
+    )
+  else ()
+    target_include_directories (f90_ex_${example}
+        PRIVATE
+            "${CMAKE_Fortran_MODULE_DIRECTORY}/shared"
+            "${HDF5_SRC_INCLUDE_DIRS}"
+            "${HDF5_SRC_BINARY_DIR}"
+            "${HDF5_F90_BINARY_DIR}"
+            "${HDF5_F90_BINARY_DIR}/shared"
+    )
+    target_link_libraries (f90_ex_${example} PRIVATE ${HDF5_F90_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
+    set_target_properties (f90_ex_${example} PROPERTIES
+        LINKER_LANGUAGE Fortran
+        FOLDER examples/fortran
+        Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/shared
+    )
+  endif ()
+endforeach ()
 
-if (HDF5_ENABLE_F2003)
-  foreach (example ${F2003_examples})
-    add_executable (f03_ex_${example} ${HDF5_F90_EXAMPLES_SOURCE_DIR}/${example}.f90)
-    TARGET_NAMING (f03_ex_${example} ${LIB_TYPE})
-    TARGET_FORTRAN_PROPERTIES (f03_ex_${example} ${LIB_TYPE} " " " ")
-    target_link_libraries (f03_ex_${example}
-        ${HDF5_F90_LIB_TARGET}
-        ${HDF5_LIB_TARGET}
+foreach (example ${F2003_examples})
+  add_executable (f03_ex_${example} ${HDF5_F90_EXAMPLES_SOURCE_DIR}/${example}.f90)
+  target_compile_options(f03_ex_${example} PRIVATE $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_COMPILE_FLAGS}>)
+#  set_property(TARGET f03_ex_${example} APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"-SUBSYSTEM:CONSOLE">)
+#  set_property(TARGET f03_ex_${example} APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_LINK_FLAGS}>)
+  if(MSVC)
+    set_property(TARGET f03_ex_${example} PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE ${WIN_LINK_FLAGS}")
+  endif()
+  if (NOT ONLY_SHARED_LIBS)
+    target_include_directories (f03_ex_${example}
+        PRIVATE
+            "${CMAKE_Fortran_MODULE_DIRECTORY}/static"
+            "${HDF5_SRC_INCLUDE_DIRS}"
+            "${HDF5_SRC_BINARY_DIR}"
+            "${HDF5_F90_BINARY_DIR}"
+            "${HDF5_F90_BINARY_DIR}/static"
+    )
+    target_link_libraries (f03_ex_${example} PRIVATE ${HDF5_F90_LIB_TARGET} ${HDF5_LIB_TARGET})
+    set_target_properties (f03_ex_${example} PROPERTIES
+        LINKER_LANGUAGE Fortran
+        FOLDER examples/fortran03
+        Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/static
+    )
+  else ()
+    target_include_directories (f03_ex_${example}
+        PRIVATE
+            "${CMAKE_Fortran_MODULE_DIRECTORY}/shared"
+            "${HDF5_SRC_INCLUDE_DIRS}"
+            "${HDF5_SRC_BINARY_DIR}"
+            "${HDF5_F90_BINARY_DIR}"
+            "${HDF5_F90_BINARY_DIR}/shared"
     )
-    target_include_directories (f03_ex_${example} PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY}/static)
+    target_link_libraries (f03_ex_${example} PRIVATE ${HDF5_F90_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
     set_target_properties (f03_ex_${example} PROPERTIES
         LINKER_LANGUAGE Fortran
         FOLDER examples/fortran03
-        Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}
+        Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/shared
     )
-  endforeach (example ${F2003_examples})
-endif (HDF5_ENABLE_F2003)
+  endif ()
+endforeach ()
 
 if (H5_HAVE_PARALLEL AND MPI_Fortran_FOUND)
   add_executable (f90_ex_ph5example ${HDF5_F90_EXAMPLES_SOURCE_DIR}/ph5example.f90)
-  TARGET_NAMING (f90_ex_ph5example ${LIB_TYPE})
-  TARGET_FORTRAN_PROPERTIES (f90_ex_ph5example ${LIB_TYPE} " " " ")
-  target_link_libraries (f90_ex_ph5example
-      ${HDF5_F90_LIB_TARGET}
-      ${HDF5_LIB_TARGET}
-      ${MPI_Fortran_LIBRARIES}
-  )
-  target_include_directories (f90_ex_ph5example PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY}/static)
-  set_target_properties (f90_ex_ph5example PROPERTIES
-      LINKER_LANGUAGE Fortran
-      FOLDER examples/fortran
-      Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}
-  )
-endif (H5_HAVE_PARALLEL AND MPI_Fortran_FOUND)
+  target_compile_options(f90_ex_ph5example PRIVATE $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_COMPILE_FLAGS}>)
+#  set_property(TARGET f90_ex_ph5example APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"-SUBSYSTEM:CONSOLE">)
+#  set_property(TARGET f90_ex_ph5example APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_LINK_FLAGS}>)
+  if(MSVC)
+    set_property(TARGET f90_ex_ph5example PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE ${WIN_LINK_FLAGS}")
+  endif()
+  if (NOT ONLY_SHARED_LIBS)
+    target_include_directories (f90_ex_ph5example
+        PRIVATE
+            "${CMAKE_Fortran_MODULE_DIRECTORY}/static"
+            "${HDF5_SRC_INCLUDE_DIRS}"
+            "${HDF5_SRC_BINARY_DIR}"
+            "${HDF5_F90_BINARY_DIR}"
+            "${HDF5_F90_BINARY_DIR}/static"
+            "$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_Fortran_INCLUDE_DIRS}>"
+    )
+    target_link_libraries (f90_ex_ph5example
+        PRIVATE
+            ${HDF5_F90_LIB_TARGET}
+            ${HDF5_LIB_TARGET}
+            $<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_Fortran_LIBRARIES}>
+    )
+    set_target_properties (f90_ex_ph5example PROPERTIES
+        LINKER_LANGUAGE Fortran
+        FOLDER examples/fortran
+        Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/static
+    )
+  else ()
+    target_include_directories (f90_ex_ph5example
+        PRIVATE
+            "${CMAKE_Fortran_MODULE_DIRECTORY}/shared"
+            "${HDF5_SRC_INCLUDE_DIRS}"
+            "${HDF5_SRC_BINARY_DIR}"
+            "${HDF5_F90_BINARY_DIR}"
+            "${HDF5_F90_BINARY_DIR}/shared"
+            "$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_Fortran_INCLUDE_DIRS}>"
+    )
+    target_link_libraries (f90_ex_ph5example
+        PRIVATE
+            ${HDF5_F90_LIBSH_TARGET}
+            ${HDF5_LIBSH_TARGET}
+            $<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_Fortran_LIBRARIES}>
+    )
+    set_target_properties (f90_ex_ph5example PROPERTIES
+        LINKER_LANGUAGE Fortran
+        FOLDER examples/fortran
+        Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/shared
+    )
+  endif ()
+endif ()
 
-if (BUILD_TESTING)
+if (BUILD_TESTING AND HDF5_TEST_FORTRAN AND HDF5_TEST_EXAMPLES)
   include (CMakeTests.cmake)
-endif (BUILD_TESTING)
+endif ()
diff --git a/fortran/examples/CMakeTests.cmake b/fortran/examples/CMakeTests.cmake
index 57aec53..dabab8b 100644
--- a/fortran/examples/CMakeTests.cmake
+++ b/fortran/examples/CMakeTests.cmake
@@ -1,3 +1,14 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
 
 ##############################################################################
 ##############################################################################
@@ -5,48 +16,90 @@
 ##############################################################################
 ##############################################################################
 
+if (HDF5_TEST_SERIAL)
+  set (test_ex_fortran_CLEANFILES
+      compound.h5
+      copy1.h5
+      copy2.h5
+      dsetf.h5
+      extend.h5
+      FORTRAN.h5
+      groupf.h5
+      groupsf.h5
+      h5_cmprss.h5
+      mount1.h5
+      mount2.h5
+      sdsf.h5
+      subset.h5
+      SDScompound.h5
+      test.h5
+  )
+
   # Remove any output file left over from previous test run
   add_test (
       NAME f90_ex-clear-objects
-      COMMAND    ${CMAKE_COMMAND}
-          -E remove 
-          compound.h5
-          copy1.h5
-          copy2.h5
-          dsetf.h5
-          extend.h5 
-          FORTRAN.h5
-          groupf.h5
-          groupsf.h5
-          h5_cmprss.h5
-          mount1.h5
-          mount2.h5
-          sdsf.h5
-          subset.h5
+      COMMAND ${CMAKE_COMMAND} -E remove ${test_ex_fortran_CLEANFILES}
+  )
+  set_tests_properties (f90_ex-clear-objects PROPERTIES
+      FIXTURES_SETUP clear_f90_ex
+      WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+  )
+  add_test (
+      NAME f90_ex-clean-objects
+      COMMAND ${CMAKE_COMMAND} -E remove ${test_ex_fortran_CLEANFILES}
+  )
+  set_tests_properties (f90_ex-clean-objects PROPERTIES
+      FIXTURES_CLEANUP clear_f90_ex
+      WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
   )
-  if (NOT "${last_test}" STREQUAL "")
-    set_tests_properties (f90_ex-clear-objects PROPERTIES DEPENDS ${last_test})
-  endif (NOT "${last_test}" STREQUAL "")
-  set (last_test "f90_ex-clear-objects")
 
-foreach (example ${examples})
-  add_test (NAME f90_ex_${example} COMMAND $<TARGET_FILE:f90_ex_${example}>)
-  if (NOT "${last_test}" STREQUAL "")
-    set_tests_properties (f90_ex_${example} PROPERTIES DEPENDS ${last_test})
-  endif (NOT "${last_test}" STREQUAL "")
-  set (last_test "f90_ex_${example}")
-endforeach (example ${examples})
+  foreach (example ${examples})
+    if (HDF5_ENABLE_USING_MEMCHECKER)
+      add_test (NAME f90_ex_${example} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:f90_ex_${example}>)
+    else ()
+      add_test (NAME f90_ex_${example} COMMAND "${CMAKE_COMMAND}"
+          -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
+          -D "TEST_PROGRAM=$<TARGET_FILE:f90_ex_${example}>"
+          -D "TEST_ARGS:STRING="
+          -D "TEST_EXPECT=0"
+          -D "TEST_SKIP_COMPARE=TRUE"
+          -D "TEST_OUTPUT=f90_ex_${example}.txt"
+          #-D "TEST_REFERENCE=f90_ex_${example}.out"
+          -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+          -P "${HDF_RESOURCES_DIR}/runTest.cmake"
+      )
+    endif ()
+    set_tests_properties (f90_ex_${example} PROPERTIES FIXTURES_REQUIRED clear_f90_ex)
+    if (last_test)
+      set_tests_properties (f90_ex_${example} PROPERTIES DEPENDS ${last_test})
+    endif ()
+    set (last_test "f90_ex_${example}")
+  endforeach ()
 
-if (HDF5_ENABLE_F2003)
   foreach (example ${F2003_examples})
-    add_test (NAME f03_ex_${example} COMMAND $<TARGET_FILE:f03_ex_${example}>)
-    if (NOT "${last_test}" STREQUAL "")
+    if (HDF5_ENABLE_USING_MEMCHECKER)
+      add_test (NAME f03_ex_${example} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:f03_ex_${example}>)
+    else ()
+      add_test (NAME f03_ex_${example} COMMAND "${CMAKE_COMMAND}"
+          -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
+          -D "TEST_PROGRAM=$<TARGET_FILE:f03_ex_${example}>"
+          -D "TEST_ARGS:STRING="
+          -D "TEST_EXPECT=0"
+          -D "TEST_SKIP_COMPARE=TRUE"
+          -D "TEST_OUTPUT=f03_ex_${example}.txt"
+          #-D "TEST_REFERENCE=f03_ex_${example}.out"
+          -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+          -P "${HDF_RESOURCES_DIR}/runTest.cmake"
+      )
+    endif ()
+    set_tests_properties (f03_ex_${example} PROPERTIES FIXTURES_REQUIRED clear_f90_ex)
+    if (last_test)
       set_tests_properties (f03_ex_${example} PROPERTIES DEPENDS ${last_test})
-    endif (NOT "${last_test}" STREQUAL "")
+    endif ()
     set (last_test "f03_ex_${example}")
-  endforeach (example ${F2003_examples})
-endif (HDF5_ENABLE_F2003)
+  endforeach ()
+endif ()
 
-if (H5_HAVE_PARALLEL AND MPI_Fortran_FOUND)
-  add_test (NAME f90_ex_ph5example COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $<TARGET_FILE:f90_ex_ph5example>)
-endif (H5_HAVE_PARALLEL AND MPI_Fortran_FOUND)
+if (H5_HAVE_PARALLEL AND HDF5_TEST_PARALLEL AND MPI_Fortran_FOUND)
+  add_test (NAME MPI_TEST_f90_ex_ph5example COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:f90_ex_ph5example> ${MPIEXEC_POSTFLAGS})
+endif ()
diff --git a/fortran/examples/Makefile.am b/fortran/examples/Makefile.am
index feed32c..9000efc 100644
--- a/fortran/examples/Makefile.am
+++ b/fortran/examples/Makefile.am
@@ -1,16 +1,13 @@
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 ##
 ## Makefile.am
 ## Run automake to generate a Makefile.in from this file.
@@ -46,12 +43,10 @@ INSTALL_FILES=h5_crtdat.f90 h5_rdwt.f90 \
 
 
 # Add attention tests for Fortran 2003 features
-if FORTRAN_2003_CONDITIONAL_F
-  EXAMPLE_PROG +=  rwdset_fortran2003 nested_derived_type \
-      compound_fortran2003 compound_complex_fortran2003
-  INSTALL_FILES +=  rwdset_fortran2003.f90 nested_derived_type.f90 \
-      compound_fortran2003.f90 compound_complex_fortran2003.f90
-endif
+EXAMPLE_PROG +=  rwdset_fortran2003 nested_derived_type \
+    compound_fortran2003 compound_complex_fortran2003
+INSTALL_FILES +=  rwdset_fortran2003.f90 nested_derived_type.f90 \
+    compound_fortran2003.f90 compound_complex_fortran2003.f90
 TEST_SCRIPT=testh5fc.sh
 TEST_EXAMPLES_SCRIPT=$(INSTALL_SCRIPT_FILES)
 
@@ -70,15 +65,16 @@ h5_crtatt.chkexe_: h5_rdwt.chkexe_
 # Additional dependencies for the examples are listed below
 if BUILD_PARALLEL_CONDITIONAL
 $(EXTRA_PROG): $(H5FC_PP)
-	$(H5FC_PP) $(H5CCFLAGS) $(FCFLAGS) -o $@ $(srcdir)/$@.f90;
+	$(H5FC_PP) $(H5CCFLAGS) -o $@ $(srcdir)/$@.f90;
 else
 $(EXTRA_PROG): $(H5FC)
-	$(H5FC) $(H5CCFLAGS) $(FCFLAGS) -o $@ $(srcdir)/$@.f90;
+	$(H5FC) $(H5CCFLAGS) -o $@ $(srcdir)/$@.f90;
 endif
 
 # Tell automake how to install examples
 # Note: no '/' after DESTDIR.  Explanation in commence.am
-EXAMPLEDIR=${DESTDIR}$(exec_prefix)/share/hdf5_examples/fortran
+EXAMPLEDIR=${DESTDIR}$(examplesdir)/fortran
+EXAMPLETOPDIR=${DESTDIR}$(examplesdir)
 
 # List dependencies for each example.  Normally, automake would take
 # care of this for us, but if we tell automake about the programs it
@@ -102,12 +98,10 @@ refregexample: refregexample.f90
 mountexample: mountexample.f90
 compound: compound.f90
 ph5example: ph5example.f90
-if FORTRAN_2003_CONDITIONAL_F
 rwdset_fortran2003: rwdset_fortran2003.f90
 nested_derived_type: nested_derived_type.f90
 compound_fortran2003: compound_fortran2003.f90
 compound_complex_fortran2003: compound_complex_fortran2003.f90
-endif
 
 include $(top_srcdir)/config/examples.am
-include $(top_srcdir)/config/conclude.am
+include $(top_srcdir)/config/conclude_fc.am
diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in
deleted file mode 100644
index c1209b1..0000000
--- a/fortran/examples/Makefile.in
+++ /dev/null
@@ -1,1343 +0,0 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-#
-# HDF5-Fortran Examples Makefile(.in)
-#
-
-# We can't tell automake about example programs, because they need to be
-# built using h5cc (or h5fc, etc.) instead of the standard compilers.
-# This creates some extra work for us.
-VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-DIST_COMMON = $(top_srcdir)/config/commence.am \
-	$(top_srcdir)/config/examples.am \
-	$(top_srcdir)/config/conclude.am $(srcdir)/Makefile.in \
-	$(srcdir)/Makefile.am $(top_srcdir)/bin/mkinstalldirs \
-	$(srcdir)/run-fortran-ex.sh.in $(srcdir)/testh5fc.sh.in \
-	$(top_srcdir)/bin/test-driver
-
-# Add attention tests for Fortran 2003 features
-@FORTRAN_2003_CONDITIONAL_F_TRUE@am__append_1 = rwdset_fortran2003 nested_derived_type \
-@FORTRAN_2003_CONDITIONAL_F_TRUE@      compound_fortran2003 compound_complex_fortran2003
-
-@FORTRAN_2003_CONDITIONAL_F_TRUE@am__append_2 = rwdset_fortran2003.f90 nested_derived_type.f90 \
-@FORTRAN_2003_CONDITIONAL_F_TRUE@      compound_fortran2003.f90 compound_complex_fortran2003.f90
-
-TESTS = $(TEST_SCRIPT)
-subdir = fortran/examples
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/aclocal_cxx.m4 \
-	$(top_srcdir)/m4/aclocal_fc.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/src/H5config.h
-CONFIG_CLEAN_FILES = run-fortran-ex.sh testh5fc.sh
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__tty_colors_dummy = \
-  mgn= red= grn= lgn= blu= brg= std=; \
-  am__color_tests=no
-am__tty_colors = { \
-  $(am__tty_colors_dummy); \
-  if test "X$(AM_COLOR_TESTS)" = Xno; then \
-    am__color_tests=no; \
-  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
-    am__color_tests=yes; \
-  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
-    am__color_tests=yes; \
-  fi; \
-  if test $$am__color_tests = yes; then \
-    red='[0;31m'; \
-    grn='[0;32m'; \
-    lgn='[1;32m'; \
-    blu='[1;34m'; \
-    mgn='[0;35m'; \
-    brg='[1m'; \
-    std='[m'; \
-  fi; \
-}
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__recheck_rx = ^[ 	]*:recheck:[ 	]*
-am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
-am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
-# A command that, given a newline-separated list of test names on the
-# standard input, print the name of the tests that are to be re-run
-# upon "make recheck".
-am__list_recheck_tests = $(AWK) '{ \
-  recheck = 1; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-        { \
-          if ((getline line2 < ($$0 ".log")) < 0) \
-	    recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
-        { \
-          recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
-        { \
-          break; \
-        } \
-    }; \
-  if (recheck) \
-    print $$0; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# A command that, given a newline-separated list of test names on the
-# standard input, create the global log from their .trs and .log files.
-am__create_global_log = $(AWK) ' \
-function fatal(msg) \
-{ \
-  print "fatal: making $@: " msg | "cat >&2"; \
-  exit 1; \
-} \
-function rst_section(header) \
-{ \
-  print header; \
-  len = length(header); \
-  for (i = 1; i <= len; i = i + 1) \
-    printf "="; \
-  printf "\n\n"; \
-} \
-{ \
-  copy_in_global_log = 1; \
-  global_test_result = "RUN"; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-         fatal("failed to read from " $$0 ".trs"); \
-      if (line ~ /$(am__global_test_result_rx)/) \
-        { \
-          sub("$(am__global_test_result_rx)", "", line); \
-          sub("[ 	]*$$", "", line); \
-          global_test_result = line; \
-        } \
-      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
-        copy_in_global_log = 0; \
-    }; \
-  if (copy_in_global_log) \
-    { \
-      rst_section(global_test_result ": " $$0); \
-      while ((rc = (getline line < ($$0 ".log"))) != 0) \
-      { \
-        if (rc < 0) \
-          fatal("failed to read from " $$0 ".log"); \
-        print line; \
-      }; \
-      printf "\n"; \
-    }; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# Restructured Text title.
-am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
-# Solaris 10 'make', and several other traditional 'make' implementations,
-# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
-# by disabling -e (using the XSI extension "set +e") if it's set.
-am__sh_e_setup = case $$- in *e*) set +e;; esac
-# Default flags passed to test drivers.
-am__common_driver_flags = \
-  --color-tests "$$am__color_tests" \
-  --enable-hard-errors "$$am__enable_hard_errors" \
-  --expect-failure "$$am__expect_failure"
-# To be inserted before the command running the test.  Creates the
-# directory for the log if needed.  Stores in $dir the directory
-# containing $f, in $tst the test, in $log the log.  Executes the
-# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
-# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
-# will run the test scripts (or their associated LOG_COMPILER, if
-# thy have one).
-am__check_pre = \
-$(am__sh_e_setup);					\
-$(am__vpath_adj_setup) $(am__vpath_adj)			\
-$(am__tty_colors);					\
-srcdir=$(srcdir); export srcdir;			\
-case "$@" in						\
-  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
-    *) am__odir=.;; 					\
-esac;							\
-test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
-  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
-if test -f "./$$f"; then dir=./;			\
-elif test -f "$$f"; then dir=;				\
-else dir="$(srcdir)/"; fi;				\
-tst=$$dir$$f; log='$@'; 				\
-if test -n '$(DISABLE_HARD_ERRORS)'; then		\
-  am__enable_hard_errors=no; 				\
-else							\
-  am__enable_hard_errors=yes; 				\
-fi; 							\
-case " $(XFAIL_TESTS) " in				\
-  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
-    am__expect_failure=yes;;				\
-  *)							\
-    am__expect_failure=no;;				\
-esac; 							\
-$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
-# A shell command to get the names of the tests scripts with any registered
-# extension removed (i.e., equivalently, the names of the test logs, with
-# the '.log' extension removed).  The result is saved in the shell variable
-# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
-# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
-# since that might cause problem with VPATH rewrites for suffix-less tests.
-# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
-am__set_TESTS_bases = \
-  bases='$(TEST_LOGS)'; \
-  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
-  bases=`echo $$bases`
-RECHECK_LOGS = $(TEST_LOGS)
-AM_RECURSIVE_TARGETS = check recheck
-TEST_SUITE_LOG = test-suite.log
-am__test_logs1 = $(TESTS:=.log)
-am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
-TEST_LOGS = $(am__test_logs2:.sh.log=.log)
-SH_LOG_DRIVER = $(SHELL) $(top_srcdir)/bin/test-driver
-SH_LOG_COMPILE = $(SH_LOG_COMPILER) $(AM_SH_LOG_FLAGS) $(SH_LOG_FLAGS)
-am__set_b = \
-  case '$@' in \
-    */*) \
-      case '$*' in \
-        */*) b='$*';; \
-          *) b=`echo '$@' | sed 's/\.log$$//'`; \
-       esac;; \
-    *) \
-      b='$*';; \
-  esac
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
-AMTAR = @AMTAR@
-
-# H5_CFLAGS holds flags that should be used when building hdf5,
-# but which should not be exported to h5cc for building other programs.
-# AM_CFLAGS is an automake construct which should be used by Makefiles 
-# instead of CFLAGS, as CFLAGS is reserved solely for the user to define.
-# This applies to FCFLAGS, CXXFLAGS, CPPFLAGS, and LDFLAGS as well.
-AM_CFLAGS = @AM_CFLAGS@ @H5_CFLAGS@
-AM_CPPFLAGS = @AM_CPPFLAGS@ @H5_CPPFLAGS@
-AM_CXXFLAGS = @AM_CXXFLAGS@ @H5_CXXFLAGS@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@
-AM_LDFLAGS = @AM_LDFLAGS@ @H5_LDFLAGS@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BYTESEX = @BYTESEX@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CC_VERSION = @CC_VERSION@
-CFLAGS = @CFLAGS@
-CLEARFILEBUF = @CLEARFILEBUF@
-CODESTACK = @CODESTACK@
-CONFIG_DATE = @CONFIG_DATE@
-CONFIG_MODE = @CONFIG_MODE@
-CONFIG_USER = @CONFIG_USER@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CXX_VERSION = @CXX_VERSION@
-CYGPATH_W = @CYGPATH_W@
-DEBUG_PKG = @DEBUG_PKG@
-DEFAULT_API_VERSION = @DEFAULT_API_VERSION@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
-DIRECT_VFD = @DIRECT_VFD@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-EXTERNAL_FILTERS = @EXTERNAL_FILTERS@
-
-# Make sure that these variables are exported to the Makefiles
-F9XMODEXT = @F9XMODEXT@
-F9XMODFLAG = @F9XMODFLAG@
-F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
-FC = @FC@
-FC2003 = @FC2003@
-FCFLAGS = @FCFLAGS@
-FCFLAGS_f90 = @FCFLAGS_f90@
-FCLIBS = @FCLIBS@
-FC_VERSION = @FC_VERSION@
-FGREP = @FGREP@
-FSEARCH_DIRS = @FSEARCH_DIRS@
-GREP = @GREP@
-H5_CFLAGS = @H5_CFLAGS@
-H5_CPPFLAGS = @H5_CPPFLAGS@
-H5_CXXFLAGS = @H5_CXXFLAGS@
-H5_CXX_SHARED = @H5_CXX_SHARED@
-H5_FCFLAGS = @H5_FCFLAGS@
-H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@
-H5_LDFLAGS = @H5_LDFLAGS@
-H5_LONE_COLON = @H5_LONE_COLON@
-H5_VERSION = @H5_VERSION@
-HADDR_T = @HADDR_T@
-HAVE_DMALLOC = @HAVE_DMALLOC@
-HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@
-HAVE_PTHREAD = @HAVE_PTHREAD@
-HDF5_HL = @HDF5_HL@
-HDF5_INTERFACES = @HDF5_INTERFACES@
-HDF_CXX = @HDF_CXX@
-HDF_FORTRAN = @HDF_FORTRAN@
-HDF_FORTRAN2003 = @HDF_FORTRAN2003@
-HID_T = @HID_T@
-HL = @HL@
-HL_FOR = @HL_FOR@
-HSIZE_T = @HSIZE_T@
-HSSIZE_T = @HSSIZE_T@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTRUMENT = @INSTRUMENT@
-INSTRUMENT_LIBRARY = @INSTRUMENT_LIBRARY@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LL_PATH = @LL_PATH@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_STATIC_EXEC = @LT_STATIC_EXEC@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MPE = @MPE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJECT_NAMELEN_DEFAULT_F = @OBJECT_NAMELEN_DEFAULT_F@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PARALLEL = @PARALLEL@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-RANLIB = @RANLIB@
-ROOT = @ROOT@
-RUNPARALLEL = @RUNPARALLEL@
-RUNSERIAL = @RUNSERIAL@
-R_INTEGER = @R_INTEGER@
-R_LARGE = @R_LARGE@
-SEARCH = @SEARCH@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SIZE_T = @SIZE_T@
-STATIC_EXEC = @STATIC_EXEC@
-STATIC_SHARED = @STATIC_SHARED@
-STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@
-STRIP = @STRIP@
-TESTPARALLEL = @TESTPARALLEL@
-THREADSAFE = @THREADSAFE@
-TIME = @TIME@
-TR = @TR@
-TRACE_API = @TRACE_API@
-UNAME_INFO = @UNAME_INFO@
-USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
-USE_FILTER_SZIP = @USE_FILTER_SZIP@
-USINGMEMCHECKER = @USINGMEMCHECKER@
-VERSION = @VERSION@
-WORDS_BIGENDIAN = @WORDS_BIGENDIAN@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_FC = @ac_ct_FC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-
-# Install directories that automake doesn't know about
-docdir = $(exec_prefix)/doc
-dvidir = @dvidir@
-enable_shared = @enable_shared@
-enable_static = @enable_static@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-
-# Shell commands used in Makefiles
-RM = rm -f
-CP = cp
-
-# Some machines need a command to run executables; this is that command
-# so that our tests will run.
-# We use RUNEXEC instead of RUNSERIAL directly because it may be that
-# some tests need to be run with a different command.  Older versions
-# of the makefiles used the command
-# $(LIBTOOL) --mode=execute
-# in some directories, for instance.
-RUNEXEC = $(RUNSERIAL)
-
-# Libraries to link to while building
-LIBHDF5 = $(top_builddir)/src/libhdf5.la
-LIBH5TEST = $(top_builddir)/test/libh5test.la
-LIBH5F = $(top_builddir)/fortran/src/libhdf5_fortran.la
-LIBH5FTEST = $(top_builddir)/fortran/test/libh5test_fortran.la
-LIBH5CPP = $(top_builddir)/c++/src/libhdf5_cpp.la
-LIBH5TOOLS = $(top_builddir)/tools/lib/libh5tools.la
-LIBH5_HL = $(top_builddir)/hl/src/libhdf5_hl.la
-LIBH5F_HL = $(top_builddir)/hl/fortran/src/libhdf5hl_fortran.la
-LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
-
-# Note that in svn revision 19400 the '/' after DESTDIR in H5* variables below  
-# has been removed. According to the official description of DESTDIR by Gnu at 
-# http://www.gnu.org/prep/standards/html_node/DESTDIR.html, DESTDIR is 
-# prepended to the normal and complete install path that it precedes for the 
-# purpose of installing in a temporary directory which is useful for building 
-# rpms and other packages.  The '/' after ${DESTDIR} will be followed by another 
-# '/' at the beginning of the normal install path.  When DESTDIR is empty the  
-# path then begins with '//', which is incorrect and causes problems at least for 
-# Cygwin.   
-
-# Scripts used to build examples
-# If only shared libraries have been installed, have h5cc build examples with
-# shared libraries instead of static libraries
-H5CC = ${DESTDIR}$(bindir)/h5cc
-H5CC_PP = ${DESTDIR}$(bindir)/h5pcc
-H5FC = ${DESTDIR}$(bindir)/h5fc
-H5FC_PP = ${DESTDIR}$(bindir)/h5pfc
-H5CPP = ${DESTDIR}$(bindir)/h5c++
-ACLOCAL_AMFLAGS = "-I m4"
-
-# The trace script; this is used on source files from the C library to
-# insert tracing macros.
-TRACE = perl $(top_srcdir)/bin/trace
-
-# .chkexe files are used to mark tests that have run successfully.
-# .chklog files are output from those tests.
-# *.clog and *.clog2 are from the MPE option.
-CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5
-
-# Compile parallel fortran examples only if parallel is enabled
-@BUILD_PARALLEL_CONDITIONAL_TRUE@EXAMPLE_PROG_PARA = ph5example
-INSTALL_SCRIPT_FILES = run-fortran-ex.sh
-
-# These are the programs that 'make all' or 'make tests' will build and
-# that 'make check' will run.  List them in the order in which they should
-# be run.
-# We don't tell automake about these programs so that it doesn't try to
-# compile them with the regular fortran compiler.
-EXAMPLE_PROG = h5_crtdat h5_rdwt h5_crtatt h5_crtgrp h5_crtgrpar \
-	h5_crtgrpd h5_extend h5_subset h5_cmprss hyperslab selectele \
-	refobjexample refregexample mountexample compound \
-	$(am__append_1)
-
-# List files to be installed here
-INSTALL_FILES = h5_crtdat.f90 h5_rdwt.f90 h5_crtatt.f90 h5_crtgrp.f90 \
-	h5_crtgrpar.f90 h5_crtgrpd.f90 h5_extend.f90 h5_subset.f90 \
-	h5_cmprss.f90 hyperslab.f90 selectele.f90 refobjexample.f90 \
-	refregexample.f90 mountexample.f90 compound.f90 ph5example.f90 \
-	$(am__append_2)
-TEST_SCRIPT = testh5fc.sh
-TEST_EXAMPLES_SCRIPT = $(INSTALL_SCRIPT_FILES)
-
-# Mark this directory as part of the Fortran API
-FORTRAN_API = yes
-
-# Tell automake how to install examples
-# Note: no '/' after DESTDIR.  Explanation in commence.am
-EXAMPLEDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples/fortran
-
-# Assume that all tests in this directory are examples, and tell
-# conclude.am when to build them.
-EXTRA_PROG = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA)
-
-# We need to tell automake what to clean
-MOSTLYCLEANFILES = *.raw *.meta *.o
-CLEANFILES = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA)
-
-# Automake needs to be taught how to build lib, progs, and tests targets.
-# These will be filled in automatically for the most part (e.g.,
-# lib_LIBRARIES are built for lib target), but EXTRA_LIB, EXTRA_PROG, and
-# EXTRA_TEST variables are supplied to allow the user to force targets to
-# be built at certain times. 
-LIB = $(lib_LIBRARIES) $(lib_LTLIBRARIES) $(noinst_LIBRARIES)                 \
-      $(noinst_LTLIBRARIES) $(check_LIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LIB)
-
-PROGS = $(bin_PROGRAMS) $(bin_SCRIPTS) $(noinst_PROGRAMS) $(noinst_SCRIPTS)   \
-        $(EXTRA_PROG)
-
-chk_TESTS = $(check_PROGRAMS) $(check_SCRIPTS) $(EXTRA_TEST) 
-TEST_EXTENSIONS = .sh
-SH_LOG_COMPILER = $(SHELL)
-AM_SH_LOG_FLAGS = 
-TEST_PROG_CHKEXE = $(TEST_PROG:=.chkexe_)
-TEST_PROG_PARA_CHKEXE = $(TEST_PROG_PARA:=.chkexe_)
-TEST_SCRIPT_CHKSH = $(TEST_SCRIPT:=.chkexe_)
-TEST_SCRIPT_PARA_CHKSH = $(TEST_SCRIPT_PARA:=.chkexe_)
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .log .sh .sh$(EXEEXT) .trs
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/examples.am $(top_srcdir)/config/conclude.am $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign fortran/examples/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign fortran/examples/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-$(top_srcdir)/config/commence.am $(top_srcdir)/config/examples.am $(top_srcdir)/config/conclude.am:
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-run-fortran-ex.sh: $(top_builddir)/config.status $(srcdir)/run-fortran-ex.sh.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-testh5fc.sh: $(top_builddir)/config.status $(srcdir)/testh5fc.sh.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-# Recover from deleted '.trs' file; this should ensure that
-# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
-# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
-# to avoid problems with "make -n".
-.log.trs:
-	rm -f $< $@
-	$(MAKE) $(AM_MAKEFLAGS) $<
-
-# Leading 'am--fnord' is there to ensure the list of targets does not
-# expand to empty, as could happen e.g. with make check TESTS=''.
-am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
-am--force-recheck:
-	@:
-
-$(TEST_SUITE_LOG): $(TEST_LOGS)
-	@$(am__set_TESTS_bases); \
-	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
-	redo_bases=`for i in $$bases; do \
-	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
-	            done`; \
-	if test -n "$$redo_bases"; then \
-	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
-	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
-	  if $(am__make_dryrun); then :; else \
-	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
-	  fi; \
-	fi; \
-	if test -n "$$am__remaking_logs"; then \
-	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
-	       "recursion detected" >&2; \
-	else \
-	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
-	fi; \
-	if $(am__make_dryrun); then :; else \
-	  st=0;  \
-	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
-	  for i in $$redo_bases; do \
-	    test -f $$i.trs && test -r $$i.trs \
-	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
-	    test -f $$i.log && test -r $$i.log \
-	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
-	  done; \
-	  test $$st -eq 0 || exit 1; \
-	fi
-	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
-	ws='[ 	]'; \
-	results=`for b in $$bases; do echo $$b.trs; done`; \
-	test -n "$$results" || results=/dev/null; \
-	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
-	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
-	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
-	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
-	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
-	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
-	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
-	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
-	  success=true; \
-	else \
-	  success=false; \
-	fi; \
-	br='==================='; br=$$br$$br$$br$$br; \
-	result_count () \
-	{ \
-	    if test x"$$1" = x"--maybe-color"; then \
-	      maybe_colorize=yes; \
-	    elif test x"$$1" = x"--no-color"; then \
-	      maybe_colorize=no; \
-	    else \
-	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
-	    fi; \
-	    shift; \
-	    desc=$$1 count=$$2; \
-	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
-	      color_start=$$3 color_end=$$std; \
-	    else \
-	      color_start= color_end=; \
-	    fi; \
-	    echo "$${color_start}# $$desc $$count$${color_end}"; \
-	}; \
-	create_testsuite_report () \
-	{ \
-	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
-	  result_count $$1 "PASS: " $$pass  "$$grn"; \
-	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
-	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
-	  result_count $$1 "FAIL: " $$fail  "$$red"; \
-	  result_count $$1 "XPASS:" $$xpass "$$red"; \
-	  result_count $$1 "ERROR:" $$error "$$mgn"; \
-	}; \
-	{								\
-	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
-	    $(am__rst_title);						\
-	  create_testsuite_report --no-color;				\
-	  echo;								\
-	  echo ".. contents:: :depth: 2";				\
-	  echo;								\
-	  for b in $$bases; do echo $$b; done				\
-	    | $(am__create_global_log);					\
-	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
-	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
-	if $$success; then						\
-	  col="$$grn";							\
-	 else								\
-	  col="$$red";							\
-	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
-	fi;								\
-	echo "$${col}$$br$${std}"; 					\
-	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
-	echo "$${col}$$br$${std}"; 					\
-	create_testsuite_report --maybe-color;				\
-	echo "$$col$$br$$std";						\
-	if $$success; then :; else					\
-	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
-	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
-	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
-	  fi;								\
-	  echo "$$col$$br$$std";					\
-	fi;								\
-	$$success || exit 1
-recheck: all 
-	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-	@set +e; $(am__set_TESTS_bases); \
-	bases=`for i in $$bases; do echo $$i; done \
-	         | $(am__list_recheck_tests)` || exit 1; \
-	log_list=`for i in $$bases; do echo $$i.log; done`; \
-	log_list=`echo $$log_list`; \
-	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
-	        am__force_recheck=am--force-recheck \
-	        TEST_LOGS="$$log_list"; \
-	exit $$?
-.sh.log:
-	@p='$<'; \
-	$(am__set_b); \
-	$(am__check_pre) $(SH_LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_SH_LOG_DRIVER_FLAGS) $(SH_LOG_DRIVER_FLAGS) -- $(SH_LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-@am__EXEEXT_TRUE@.sh$(EXEEXT).log:
-@am__EXEEXT_TRUE@	@p='$<'; \
-@am__EXEEXT_TRUE@	$(am__set_b); \
-@am__EXEEXT_TRUE@	$(am__check_pre) $(SH_LOG_DRIVER) --test-name "$$f" \
-@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
-@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_SH_LOG_DRIVER_FLAGS) $(SH_LOG_DRIVER_FLAGS) -- $(SH_LOG_COMPILE) \
-@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
-check: check-am
-all-am: Makefile all-local
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
-	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
-	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
-	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-data-local
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am: installcheck-local
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool \
-	mostlyclean-local
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-local
-
-.MAKE: check-am install-am install-strip
-
-.PHONY: all all-am all-local check check-TESTS check-am clean \
-	clean-generic clean-libtool cscopelist-am ctags-am distclean \
-	distclean-generic distclean-libtool distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-data-local install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installcheck-local installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
-	pdf-am ps ps-am recheck tags-am uninstall uninstall-am \
-	uninstall-local
-
-
-# List all build rules defined by HDF5 Makefiles as "PHONY" targets here.
-# This tells the Makefiles that these targets are not files to be built but
-# commands that should be executed even if a file with the same name already
-# exists.
-.PHONY: build-check-clean build-check-p build-check-s build-lib build-progs \
-        build-tests check-clean check-install check-p check-s check-vfd \
-        install-doc lib progs tests uninstall-doc _exec_check-s _test help
-
-help:
-	@$(top_srcdir)/bin/makehelp
-
-# Some examples depend on files created by other examples.
-h5_crtgrpd.chkexe_: h5_crtgrpar.chkexe_
-refregexample.chkexe_: refobjexample.chkexe_
-# h5_rdwt and h5_crtatt both modify the same file created by
-# h5_crtdat. Serialize them.
-h5_rdwt.chkexe_: h5_crtdat.chkexe_
-h5_crtatt.chkexe_: h5_rdwt.chkexe_
-
-# Tell automake how to build examples using h5fc
-# Additional dependencies for the examples are listed below
-@BUILD_PARALLEL_CONDITIONAL_TRUE@$(EXTRA_PROG): $(H5FC_PP)
-@BUILD_PARALLEL_CONDITIONAL_TRUE@	$(H5FC_PP) $(H5CCFLAGS) $(FCFLAGS) -o $@ $(srcdir)/$@.f90;
-@BUILD_PARALLEL_CONDITIONAL_FALSE@$(EXTRA_PROG): $(H5FC)
-@BUILD_PARALLEL_CONDITIONAL_FALSE@	$(H5FC) $(H5CCFLAGS) $(FCFLAGS) -o $@ $(srcdir)/$@.f90;
-
-# List dependencies for each example.  Normally, automake would take
-# care of this for us, but if we tell automake about the programs it
-# will try to build them with the normal C compiler, not h5cc.  This is
-# an inelegant way of solving the problem.
-# All programs share the same build rule and a dependency on the main hdf5
-# and fortran libraries above.
-h5_crtdat: h5_crtdat.f90
-h5_extend: h5_extend.f90
-h5_subset: h5_subset.f90
-h5_rdwt: h5_rdwt.f90
-h5_crtatt: h5_crtatt.f90
-h5_crtgrp: h5_crtgrp.f90
-h5_crtgrpar: h5_crtgrpar.f90
-h5_crtgrpd: h5_crtgrpd.f90
-h5_cmprss: h5_cmprss.f90
-hyperslab: hyperslab.f90
-selectele: selectele.f90
-refobjexample: refobjexample.f90
-refregexample: refregexample.f90
-mountexample: mountexample.f90
-compound: compound.f90
-ph5example: ph5example.f90
-@FORTRAN_2003_CONDITIONAL_F_TRUE@rwdset_fortran2003: rwdset_fortran2003.f90
-@FORTRAN_2003_CONDITIONAL_F_TRUE@nested_derived_type: nested_derived_type.f90
-@FORTRAN_2003_CONDITIONAL_F_TRUE@compound_fortran2003: compound_fortran2003.f90
-@FORTRAN_2003_CONDITIONAL_F_TRUE@compound_complex_fortran2003: compound_complex_fortran2003.f90
-
-# How to create EXAMPLEDIR if it doesn't already exist
-$(EXAMPLEDIR):
-	-$(top_srcdir)/bin/mkdirs $@
-$(EXAMPLETOPDIR):
-	-$(top_srcdir)/bin/mkdirs $@
-
-# Install and uninstall rules.  We install the source files, not the
-# example programs themselves.
-install-data-local:
-	@$(MAKE) $(AM_MAKEFLAGS) install-examples
-uninstall-local:
-	@$(MAKE) $(AM_MAKEFLAGS) uninstall-examples
-
-install-examples: $(EXAMPLEDIR) $(INSTALL_FILES) 
-	@for f in X $(INSTALL_FILES); do                                     \
-	  if test $$f != X; then                                             \
-	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);    \
-            chmod a-x $(EXAMPLEDIR)/$$f;                                     \
-	  fi;                                                                \
-	done
-	@for f in X $(INSTALL_SCRIPT_FILES); do                                   \
-	  if test $$f != X; then                                             \
-	    (set -x; $(INSTALL) $$f $(EXAMPLEDIR)/. || exit 1);\
-	  fi;                                                                \
-	done
-	@for f in X $(INSTALL_TOP_FILES); do                       \
-	  if test $$f != X; then                                             \
-	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1); \
-            chmod a-x $(EXAMPLETOPDIR)/$$f;\
-	  fi;                                                                \
-	done
-	@for f in X $(INSTALL_TOP_SCRIPT_FILES); do                       \
-	  if test $$f != X; then                                             \
-	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1); \
-	  fi;                                                                \
-	done
-
-uninstall-examples:
-	@if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then             \
-	  set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_FILES);                \
-	fi
-	@if test -n "$(INSTALL_SCRIPT_FILES)" -a -d $(EXAMPLEDIR); then           \
-	  set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_SCRIPT_FILES);              \
-	fi
-	@if test -n "$(INSTALL_TOP_FILES)" -a -d $(EXAMPLETOPDIR); then    \
-	  set -x; cd $(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_FILES);       \
-	fi
-	@if test -n "$(INSTALL_TOP_SCRIPT_FILES)" -a -d $(EXAMPLETOPDIR); then    \
-	  set -x; cd $(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_SCRIPT_FILES);       \
-	fi
-
-installcheck-local:
-	@if test "$(STATIC_SHARED)" = "static, shared"; then               \
-	  H5CCFLAGS="-shlib" $(MAKE) $(AM_MAKEFLAGS) check;                \
-	  $(MAKE) $(AM_MAKEFLAGS) clean;                                   \
-	  H5CCFLAGS="" $(MAKE) $(AM_MAKEFLAGS) check;                      \
-	elif test "$(STATIC_SHARED)" = "shared"; then                     \
-	  H5CCFLAGS="-shlib" $(MAKE) $(AM_MAKEFLAGS) check;                \
-	else                                                              \
-	  $(MAKE) $(AM_MAKEFLAGS) check;                                   \
-	fi 
-	@if test "$(INSTALL_FILES)" -a $(TEST_EXAMPLES_SCRIPT) -a -d $(EXAMPLEDIR); then \
-	    echo "============================";                                         \
-	    echo "Testing $(TEST_EXAMPLES_SCRIPT)";                                      \
-	    echo "============================";                                         \
-	    (cd $(EXAMPLEDIR);                                                           \
-	     /bin/sh ./$(TEST_EXAMPLES_SCRIPT);)                                                   \
-	fi
-
-# lib/progs/tests targets recurse into subdirectories. build-* targets
-# build files in this directory.
-build-lib: $(LIB)
-build-progs: $(LIB) $(PROGS)
-build-tests: $(LIB) $(PROGS) $(chk_TESTS)
-
-# General rule for recursive building targets.
-# BUILT_SOURCES contain targets that need to be built before anything else
-# in the directory (e.g., for Fortran type detection)
-lib progs tests check-s check-p :: $(BUILT_SOURCES)
-	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
-	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X && test $$d != .; then                           \
-	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
-	    fi;                                                               \
-	done
-
-# General rule for recursive cleaning targets.  Like the rule above,
-# but doesn't require building BUILT_SOURCES.
-check-clean ::
-	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
-	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X && test $$d != .; then                           \
-	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
-	    fi;                                                               \
-	done
-
-# Tell Automake to build tests when the user types `make all' (this is
-# not its default behavior).  Also build EXTRA_LIB and EXTRA_PROG since
-# Automake won't build them automatically, either.
-all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(chk_TESTS)
-
-# make install-doc doesn't do anything outside of doc directory, but
-# Makefiles should recognize it.
-# UPDATE: docs no longer reside in this build tree, so this target
-# is depreciated.
-install-doc uninstall-doc:
-	@echo "Nothing to be done."
-
-# clean up files generated by tests so they can be re-run.
-build-check-clean:
-	$(RM) -rf $(CHECK_CLEANFILES)
-
-# run check-clean whenever mostlyclean is run
-mostlyclean-local: build-check-clean
-
-# check-install is just a synonym for installcheck
-check-install: installcheck
-
-# Run each test in order, passing $(TEST_FLAGS) to the program.
-# Since tests are done in a shell loop, "make -i" does apply inside it.
-# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
-# The timestamps give a rough idea how much time the tests use.
-#
-# Note that targets in chk_TESTS (defined above) will be built when the user
-# types 'make tests' or 'make check', but only programs in TEST_PROG,
-# TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
-check-TESTS: test
-
-test _test:
-	@$(MAKE) build-check-s
-	@$(MAKE) build-check-p
-
-# Actual execution of check-s.
-build-check-s: $(LIB) $(PROGS) $(chk_TESTS)
-	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
-	   echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
-	fi
-	@$(MAKE) $(AM_MAKEFLAGS) _exec_check-s
-	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
-	    echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
-	fi
-
-_exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH)
-
-# The dummy.chkexe here prevents the target from being
-# empty if there are no tests in the current directory.
-# $${log} is the log file.
-# $${tname} is the name of test.
-$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
-	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \
-	   tname=$(@:.chkexe_=)$(EXEEXT);\
-	   log=$(@:.chkexe_=.chklog); \
-	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \
-	      echo "No need to test $${tname} again."; \
-	   else \
-	      echo "============================" > $${log}; \
-	      if test "X$(FORTRAN_API)" = "Xyes"; then \
-	         echo "Fortran API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "Fortran API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(CXX_API)" = "Xyes"; then \
-	         echo "C++ API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "C++ API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log};\
-	      else \
-	         echo "Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "$(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      fi; \
-	      echo "============================" >> $${log}; \
-	      srcdir="$(srcdir)" \
-	         $(TIME) $(RUNEXEC) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \
-	         && touch $(@:.chkexe_=.chkexe) || \
-	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	         (cat $${log} && false) || exit 1; \
-	      echo "" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
-	      echo "============================" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
-	      cat $${log}; \
-	   fi; \
-	fi
-
-# The dummysh.chkexe here prevents the target from being
-# empty if there are no tests in the current directory.
-# $${log} is the log file.
-# $${tname} is the name of test.
-$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
-	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummysh.chkexe_"; then \
-	   cmd=$(@:.chkexe_=);\
-	   tname=`basename $$cmd`;\
-	   chkname=`basename $(@:.chkexe_=.chkexe)`;\
-	   log=`basename $(@:.chkexe_=.chklog)`; \
-	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer $${chkname} $$cmd $(SCRIPT_DEPEND); then \
-	      echo "No need to test $${tname} again."; \
-	   else \
-	      echo "============================" > $${log}; \
-	      if test "X$(FORTRAN_API)" = "Xyes"; then \
-	         echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(CXX_API)" = "Xyes"; then \
-	         echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      else \
-	         echo "Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      fi; \
-	      echo "============================" >> $${log}; \
-	      RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
-	      srcdir="$(srcdir)" \
-	         $(TIME) $(SHELL) $$cmd $(TEST_FLAGS) >> $${log} 2>&1 \
-	         && touch $${chkname} || \
-	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	         (cat $${log} && false) || exit 1; \
-	      echo "" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
-	      echo "============================" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
-	      cat $${log}; \
-	   fi; \
-	   echo "============================"; \
-	fi
-
-# Actual execution of check-p.
-build-check-p: $(LIB) $(PROGS) $(chk_TESTS)
-	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
-	   echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
-	fi
-	@if test -n "$(TEST_PROG_PARA)"; then                                \
-	    echo "**** Hint ****";                                            \
-	    echo "Parallel test files reside in the current directory"        \
-	         "by default.";                                               \
-	    echo "Set HDF5_PARAPREFIX to use another directory. E.g.,";       \
-	    echo "    HDF5_PARAPREFIX=/PFS/user/me";                          \
-	    echo "    export HDF5_PARAPREFIX";                                \
-	    echo "    make check";                                            \
-	    echo "**** end of Hint ****";                                     \
-	fi
-	@for test in $(TEST_PROG_PARA) dummy; do                             \
-	   if test $$test != dummy; then                                      \
-	      $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ \
-	      RUNEXEC="$(RUNPARALLEL)" || exit 1; \
-	   fi;                                                                \
-	done
-	@for test in $(TEST_SCRIPT_PARA) dummy; do                           \
-	  if test $$test != dummy; then                                      \
-	    $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ || exit 1; \
-	  fi;                                                                 \
-	done
-	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
-	    echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
-	fi
-
-# Run test with different Virtual File Driver
-check-vfd: $(LIB) $(PROGS) $(chk_TESTS)
-	@for vfd in $(VFD_LIST) dummy; do                                     \
-	    if test $$vfd != dummy; then                                      \
-	        echo "============================";                          \
-	        echo "Testing Virtual File Driver $$vfd";                     \
-	        echo "============================";                          \
-	        $(MAKE) $(AM_MAKEFLAGS) check-clean || exit 1;                \
-	        HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check || exit 1;    \
-	    fi;                                                               \
-	done
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/fortran/examples/compound.f90 b/fortran/examples/compound.f90
index 2005f41..47cbaa5 100644
--- a/fortran/examples/compound.f90
+++ b/fortran/examples/compound.f90
@@ -1,16 +1,13 @@
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
 !                                                                             *
 !   This file is part of HDF5.  The full HDF5 copyright notice, including     *
 !   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 !
@@ -43,7 +40,7 @@
      INTEGER(HID_T) :: dt3_id      ! Memory datatype identifier (for double precision field)
      INTEGER(HID_T) :: dt4_id      ! Memory datatype identifier (for real field)
      INTEGER(HID_T) :: dt5_id      ! Memory datatype identifier
-     INTEGER(HID_T) :: plist_id    ! Dataset trasfer property
+     INTEGER(HID_T) :: plist_id    ! Dataset transfer property
      INTEGER(SIZE_T) :: typesize
 
 
@@ -113,21 +110,21 @@
      type_size = type_sizec + type_sizei + type_sized + type_sizer
      CALL h5tcreate_f(H5T_COMPOUND_F, type_size, dtype_id, error)
      !
-     ! Insert memebers
+     ! Insert members
      !
-     ! CHARACTER*2 memeber
+     ! CHARACTER*2 member
      !
      offset = 0
      CALL h5tinsert_f(dtype_id, "char_field", offset, dt5_id, error)
      !
      ! INTEGER member
      !
-     offset = offset + type_sizec ! Offset of the second memeber is 2
+     offset = offset + type_sizec ! Offset of the second member is 2
      CALL h5tinsert_f(dtype_id, "integer_field", offset, H5T_NATIVE_INTEGER, error)
      !
      ! DOUBLE PRECISION member
      !
-     offset = offset + type_sizei  ! Offset of the third memeber is 6
+     offset = offset + type_sizei  ! Offset of the third member is 6
      CALL h5tinsert_f(dtype_id, "double_field", offset, H5T_NATIVE_DOUBLE, error)
      !
      ! REAL member
@@ -200,7 +197,7 @@
      !
      CALL h5dopen_f(file_id, dsetname, dset_id, error)
      !
-     ! Create memeory datatyoe to read character member of the compound datatype.
+     ! Create memory datatype to read character member of the compound datatype.
      !
      CALL h5tcopy_f(H5T_NATIVE_CHARACTER, dt2_id, error)
      typesize = 2
@@ -210,7 +207,7 @@
      offset = 0
      CALL h5tinsert_f(dt1_id, "char_field", offset, dt2_id, error)
      !
-     ! Read part of the datatset and display it.
+     ! Read part of the dataset and display it.
      !
      CALL h5dread_f(dset_id, dt1_id, char_member_out, data_dims, error)
      write(*,*) (char_member_out(i), i=1, dimsize)
diff --git a/fortran/examples/compound_complex_fortran2003.f90 b/fortran/examples/compound_complex_fortran2003.f90
index 19671f7..c45c778 100644
--- a/fortran/examples/compound_complex_fortran2003.f90
+++ b/fortran/examples/compound_complex_fortran2003.f90
@@ -1,20 +1,18 @@
 ! This is the F2003 version of the h5_compound.c example source code.
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-! Copyright by the Board of Trustees of the University of Illinois.         *
+! Copyright by The HDF Group.                                               *
 ! All rights reserved.                                                      *
 !                                                                           *
 ! This file is part of HDF5.  The full HDF5 copyright notice, including     *
 ! terms governing use, modification, and redistribution, is contained in    *
-! the files COPYING and Copyright.html.  COPYING can be found at the root   *
-! of the source code distribution tree; Copyright.html can be found at the  *
-! root level of an installed copy of the electronic HDF5 document set and   *
-! is linked from the top-level documents page.  It can also be found at     *
-! http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have     *
-! access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
+! the COPYING file, which can be found at the root of the source code       *
+! distribution tree, or in https://www.hdfgroup.org/licenses.               *
+! If you do not have access to either file, you may request a copy from     *
+! help@hdfgroup.org.                                                        *
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
-! This example shows how to create an array of a compound datatype which 
-! contains an array of type complex and how to write it to hdf5 
+! This example shows how to create an array of a compound datatype which
+! contains an array of type complex and how to write it to hdf5
 ! and how to read it back into a compound datatype for hdf5.
 !
 
@@ -87,7 +85,7 @@ PROGRAM compound_complex_fortran2003
   ! Open the file and the dataset.
   !
   CALL H5Fopen_f("test.h5", H5F_ACC_RDONLY_F, file_id, error)
-  
+
   CALL H5Dopen_f(file_id, "samples", dset_id, error)
   !
   ! Create the memory data type.
diff --git a/fortran/examples/compound_fortran2003.f90 b/fortran/examples/compound_fortran2003.f90
index a55d1a6..50261f7 100644
--- a/fortran/examples/compound_fortran2003.f90
+++ b/fortran/examples/compound_fortran2003.f90
@@ -1,16 +1,14 @@
 ! This is the F2003 version of the h5_compound.c example source code.
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-! Copyright by the Board of Trustees of the University of Illinois.         *
+! Copyright by The HDF Group.                                               *
 ! All rights reserved.                                                      *
 !                                                                           *
 ! This file is part of HDF5.  The full HDF5 copyright notice, including     *
 ! terms governing use, modification, and redistribution, is contained in    *
-! the files COPYING and Copyright.html.  COPYING can be found at the root   *
-! of the source code distribution tree; Copyright.html can be found at the  *
-! root level of an installed copy of the electronic HDF5 document set and   *
-! is linked from the top-level documents page.  It can also be found at     *
-! http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have     *
-! access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
+! the COPYING file, which can be found at the root of the source code       *
+! distribution tree, or in https://www.hdfgroup.org/licenses.               *
+! If you do not have access to either file, you may request a copy from     *
+! help@hdfgroup.org.                                                        *
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 ! This example shows how to create a compound data type,
@@ -79,10 +77,10 @@ PROGRAM main
   INTEGER(SIZE_T) :: offset, sizeof_compound
   INTEGER :: hdferr
   TYPE(C_PTR) :: f_ptr
-  
-  INTEGER(SIZE_T) :: type_sizei  ! Size of the integer datatype 
-  INTEGER(SIZE_T) :: type_sizer  ! Size of the real datatype 
-  INTEGER(SIZE_T) :: type_sized  ! Size of the double datatype 
+
+  INTEGER(SIZE_T) :: type_sizei  ! Size of the integer datatype
+  INTEGER(SIZE_T) :: type_sizer  ! Size of the real datatype
+  INTEGER(SIZE_T) :: type_sized  ! Size of the double datatype
   INTEGER(hid_t) :: tid3      ! /* Nested Array Datatype ID	*/
   INTEGER(HSIZE_T), DIMENSION(1) :: tdims1=(/13/)
   !
@@ -135,7 +133,7 @@ PROGRAM main
   !
   ! Write data to the dataset
   !
-  
+
   f_ptr = C_LOC(s1(1))
   CALL H5Dwrite_f(dataset, s1_tid, f_ptr, hdferr)
 
@@ -152,7 +150,7 @@ PROGRAM main
   !
 
   CALL H5Fopen_f(H5FILE_NAME, H5F_ACC_RDONLY_F, file, hdferr)
-  
+
   CALL H5Dopen_f(file, DATASETNAME, dataset,hdferr)
 
   !
diff --git a/fortran/examples/h5_cmprss.f90 b/fortran/examples/h5_cmprss.f90
index 9ab28f7..45c0d71 100644
--- a/fortran/examples/h5_cmprss.f90
+++ b/fortran/examples/h5_cmprss.f90
@@ -1,28 +1,25 @@
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
 !                                                                             *
 !   This file is part of HDF5.  The full HDF5 copyright notice, including     *
 !   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-! 
+!
 !  This example illustrates how to create a compressed dataset.
 !  It is used in the HDF5 Tutorial.
-! 
+!
 PROGRAM h5_cmprss
 
-  USE HDF5 ! This module contains all necessary modules 
+  USE HDF5 ! This module contains all necessary modules
 
   IMPLICIT NONE
   !
-  ! The dataset is stored in file "h5_cmprss.h5" 
+  ! The dataset is stored in file "h5_cmprss.h5"
   !
   CHARACTER(LEN=12), PARAMETER :: filename = "h5_cmprss.h5"
   INTEGER, PARAMETER  :: rank = 2   ! Rank of the data set
@@ -35,7 +32,7 @@ PROGRAM h5_cmprss
   INTEGER :: error
   INTEGER(hsize_t), DIMENSION(1:rank) :: dims ! dimensions of data
   INTEGER(hsize_t), DIMENSION(1:rank) :: cdims ! sizes of chunked data
- 
+
   INTEGER :: i,j, numfilt
   INTEGER, DIMENSION(1:dim0,1:dim1) :: buf ! write buffer
   INTEGER, DIMENSION(1:dim0,1:dim1) :: rbuf ! read buffer
@@ -53,7 +50,7 @@ PROGRAM h5_cmprss
   !INTEGER :: szip_pixels_per_block
 
   !
-  !Initialize FORTRAN predifined datatypes
+  !Initialize FORTRAN predefined datatypes
   !
   CALL h5open_f(error)
   !
@@ -65,15 +62,15 @@ PROGRAM h5_cmprss
   CALL h5screate_simple_f(rank, dims, dataspace_id, error)
   CALL h5pcreate_f(H5P_DATASET_CREATE_F, plist_id, error)
   !
-  ! Dataset must be chunked for compression 
+  ! Dataset must be chunked for compression
   cdims(1:2) = 20
   CALL h5pset_chunk_f(plist_id, 2, cdims, error)
 
   ! Set ZLIB / DEFLATE Compression using compression level 6.
-  ! To use SZIP Compression comment out these lines. 
+  ! To use SZIP Compression comment out these lines.
   CALL h5pset_deflate_f(plist_id, 6, error)
 
-  ! Uncomment these lines to set SZIP Compression 
+  ! Uncomment these lines to set SZIP Compression
   !szip_options_mask = H5_SZIP_NN_OM_F
   !szip_pixels_per_block = 16
   !CALL H5Pset_szip_f(plist_id, szip_options_mask, szip_pixels_per_block, error)
@@ -88,7 +85,7 @@ PROGRAM h5_cmprss
      ENDDO
   ENDDO
 
-  data_dims(1:2) = (/dim0,dim1/) 
+  data_dims(1:2) = (/dim0,dim1/)
   CALL h5dwrite_f(dataset_id, H5T_NATIVE_INTEGER, buf, data_dims, error)
 
   ! Close resources
@@ -101,12 +98,12 @@ PROGRAM h5_cmprss
   CALL h5fopen_f(filename, H5F_ACC_RDONLY_F, file_id, error)
   CALL h5dopen_f(file_id, "Compressed_Data", dataset_id, error)
 
-  ! Retrieve filter information. 
+  ! Retrieve filter information.
   CALL h5dget_create_plist_f(dataset_id, plist_id, error)
-    
+
   CALL h5pget_nfilters_f(plist_id, numfilt, error)
   WRITE(*,'(A, I0)') "Number of filters associated with dataset: ", numfilt
-     
+
   DO i = 1, numfilt
      nelmts = 1
      CALL h5pget_filter_f(plist_id, 0, flags, nelmts, cd_values, &
@@ -123,7 +120,7 @@ PROGRAM h5_cmprss
    ENDDO
   data_dims(1:2) = (/dim0,dim1/)
   CALL h5dread_f(dataset_id, H5T_NATIVE_INTEGER, rbuf, data_dims, error)
-    
+
   CALL h5dclose_f(dataset_id, error)
   CALL h5pclose_f(plist_id, error)
   CALL h5fclose_f(file_id, error)
diff --git a/fortran/examples/h5_crtatt.f90 b/fortran/examples/h5_crtatt.f90
index 79bc576..c8d313a 100644
--- a/fortran/examples/h5_crtatt.f90
+++ b/fortran/examples/h5_crtatt.f90
@@ -1,16 +1,13 @@
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
 !                                                                             *
 !   This file is part of HDF5.  The full HDF5 copyright notice, including     *
 !   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 ! This example shows how to create and write a dataset attribute.
@@ -37,7 +34,7 @@ PROGRAM H5_CRTATT
   INTEGER(HID_T) :: aspace_id     ! Attribute Dataspace identifier
   INTEGER(HID_T) :: atype_id      ! Attribute Dataspace identifier
   INTEGER(HSIZE_T), DIMENSION(1) :: adims = (/2/) ! Attribute dimension
-  INTEGER     ::   arank = 1                      ! Attribure rank
+  INTEGER     ::   arank = 1                      ! Attribute rank
   INTEGER(SIZE_T) :: attrlen    ! Length of the attribute string
 
   CHARACTER(LEN=80), DIMENSION(2) ::  attr_data  ! Attribute data
@@ -86,6 +83,10 @@ PROGRAM H5_CRTATT
   !
   CALL h5aclose_f(attr_id, error)
   !
+  ! Close the attribute datatype.
+  !
+  CALL h5tclose_f(atype_id, error)
+  !
   ! Terminate access to the data space.
   !
   CALL h5sclose_f(aspace_id, error)
diff --git a/fortran/examples/h5_crtdat.f90 b/fortran/examples/h5_crtdat.f90
index 6e4c3a4..6840bc7 100644
--- a/fortran/examples/h5_crtdat.f90
+++ b/fortran/examples/h5_crtdat.f90
@@ -1,16 +1,13 @@
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
 !                                                                             *
 !   This file is part of HDF5.  The full HDF5 copyright notice, including     *
 !   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 !
diff --git a/fortran/examples/h5_crtgrp.f90 b/fortran/examples/h5_crtgrp.f90
index 278d175..4c63caa 100644
--- a/fortran/examples/h5_crtgrp.f90
+++ b/fortran/examples/h5_crtgrp.f90
@@ -1,16 +1,13 @@
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
 !                                                                             *
 !   This file is part of HDF5.  The full HDF5 copyright notice, including     *
 !   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 !
diff --git a/fortran/examples/h5_crtgrpar.f90 b/fortran/examples/h5_crtgrpar.f90
index 4ef008a..e6ece17 100644
--- a/fortran/examples/h5_crtgrpar.f90
+++ b/fortran/examples/h5_crtgrpar.f90
@@ -1,16 +1,13 @@
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
 !                                                                             *
 !   This file is part of HDF5.  The full HDF5 copyright notice, including     *
 !   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 !
diff --git a/fortran/examples/h5_crtgrpd.f90 b/fortran/examples/h5_crtgrpd.f90
index d35f03d..7d754cd 100644
--- a/fortran/examples/h5_crtgrpd.f90
+++ b/fortran/examples/h5_crtgrpd.f90
@@ -1,16 +1,13 @@
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
 !                                                                             *
 !   This file is part of HDF5.  The full HDF5 copyright notice, including     *
 !   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 !
diff --git a/fortran/examples/h5_extend.f90 b/fortran/examples/h5_extend.f90
index 315d84f..47f767e 100644
--- a/fortran/examples/h5_extend.f90
+++ b/fortran/examples/h5_extend.f90
@@ -1,28 +1,25 @@
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
 !                                                                             *
 !   This file is part of HDF5.  The full HDF5 copyright notice, including     *
 !   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 ! This example extends an HDF5 dataset. It is used in the HDF5 Tutorial.
 
 PROGRAM H5_EXTEND
 
-  USE HDF5 ! This module contains all necessary modules 
+  USE HDF5 ! This module contains all necessary modules
 
   IMPLICIT NONE
 
   !
-  !the dataset is stored in file "extend.h5" 
+  !the dataset is stored in file "extend.h5"
   !
   CHARACTER(LEN=9), PARAMETER :: filename = "extend.h5"
 
@@ -32,11 +29,11 @@ PROGRAM H5_EXTEND
   CHARACTER(LEN=15), PARAMETER :: dsetname = "ExtendibleArray"
   INTEGER :: RANK = 2
 
-  INTEGER(HID_T) :: file_id       ! File identifier 
-  INTEGER(HID_T) :: dset_id       ! Dataset identifier 
-  INTEGER(HID_T) :: dataspace     ! Dataspace identifier 
-  INTEGER(HID_T) :: memspace      ! Memory dataspace identifier 
-  INTEGER(HID_T) :: crp_list      ! Dataset creation property identifier 
+  INTEGER(HID_T) :: file_id       ! File identifier
+  INTEGER(HID_T) :: dset_id       ! Dataset identifier
+  INTEGER(HID_T) :: dataspace     ! Dataspace identifier
+  INTEGER(HID_T) :: memspace      ! Memory dataspace identifier
+  INTEGER(HID_T) :: crp_list      ! Dataset creation property identifier
 
   !
   !dataset dimensions at creation time
@@ -44,7 +41,7 @@ PROGRAM H5_EXTEND
   INTEGER(HSIZE_T), DIMENSION(1:2) :: dims = (/3,3/)
 
   !
-  !data dimensions 
+  !data dimensions
   !
   INTEGER(HSIZE_T), DIMENSION(1:2) :: dimsc = (/2,5/)
   INTEGER(HSIZE_T), DIMENSION(1:2) :: dimsm = (/3,7/)
@@ -52,49 +49,49 @@ PROGRAM H5_EXTEND
   !
   !Maximum dimensions
   !
-  INTEGER(HSIZE_T), DIMENSION(1:2) :: maxdims 
+  INTEGER(HSIZE_T), DIMENSION(1:2) :: maxdims
 
   INTEGER(HSIZE_T), DIMENSION(1:2) :: offset
-  INTEGER(HSIZE_T), DIMENSION(1:2) :: count 
+  INTEGER(HSIZE_T), DIMENSION(1:2) :: count
 
   !
-  ! Variables for reading and writing 
+  ! Variables for reading and writing
   !
-  INTEGER, DIMENSION(1:3,1:3)  :: data1 
+  INTEGER, DIMENSION(1:3,1:3)  :: data1
   INTEGER, DIMENSION(1:21) :: data2 = &
        (/2, 3, 4, 2, 3, 4, 2, 3, 4, 2, 3, 4, 2, 3, 4, 2, 3, 4, 2, 3, 4/)
   INTEGER(HSIZE_T), DIMENSION(1:2) :: data_dims
 
   !
-  !Size of data in the file 
+  !Size of data in the file
   !
   INTEGER(HSIZE_T), DIMENSION(1:2) :: size
 
   !
-  !general purpose integer 
+  !general purpose integer
   !
   INTEGER(HSIZE_T) :: i, j
 
   !
-  !flag to check operation success 
+  !flag to check operation success
   !
-  INTEGER :: error 
+  INTEGER :: error
 
   !
   !Variables used in reading data back
-  !  
+  !
   INTEGER(HSIZE_T), DIMENSION(1:2) :: dimsr, maxdimsr
   INTEGER :: rankr
-  INTEGER, DIMENSION(1:3,1:10)  :: rdata 
+  INTEGER, DIMENSION(1:3,1:10)  :: rdata
 
   !
-  !Initialize FORTRAN predifined datatypes
+  !Initialize FORTRAN predefined datatypes
   !
-  CALL h5open_f(error) 
+  CALL h5open_f(error)
 
   !
   !Create a new file using default properties.
-  ! 
+  !
   CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, error)
 
   !
@@ -112,14 +109,14 @@ PROGRAM H5_EXTEND
   CALL h5pset_chunk_f(crp_list, RANK, dimsc, error)
 
   !
-  !Create a dataset with 3X3 dimensions using cparms creation propertie .
+  !Create a dataset with 3X3 dimensions using cparms creation properties.
   !
   CALL h5dcreate_f(file_id, dsetname, H5T_NATIVE_INTEGER, dataspace, &
        dset_id, error, crp_list )
   CALL h5sclose_f(dataspace, error)
 
   !
-  !Fill data array with 1's 
+  !Fill data array with 1's
   !
   DO i = 1, dims(1)
      DO j = 1, dims(2)
@@ -130,7 +127,7 @@ PROGRAM H5_EXTEND
   !
   !Write data array to dataset
   !
-  data_dims(1:2) = (/3,3/) 
+  data_dims(1:2) = (/3,3/)
   CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, data1, data_dims, error)
 
   !
@@ -146,7 +143,7 @@ PROGRAM H5_EXTEND
 
   !
   !Write to 3x7 extended part of dataset
-  !   
+  !
   CALL h5dget_space_f(dset_id, dataspace, error)
   CALL h5sselect_hyperslab_f(dataspace, H5S_SELECT_SET_F, &
        offset, count, error)
@@ -187,7 +184,7 @@ PROGRAM H5_EXTEND
 
   !
   !Get dataspace's dimensions.
-  ! 
+  !
   CALL h5sget_simple_extent_dims_f(dataspace, dimsr, maxdimsr, error)
 
   !
@@ -206,15 +203,15 @@ PROGRAM H5_EXTEND
   CALL h5screate_simple_f(rankr, dimsr, memspace, error)
 
   !
-  !Read data 
+  !Read data
   !
   data_dims(1:2) = (/3,10/)
   CALL H5dread_f(dset_id, H5T_NATIVE_INTEGER, rdata, data_dims, &
        error, memspace, dataspace)
 
-  WRITE(*,'(A)') "Dataset:" 
+  WRITE(*,'(A)') "Dataset:"
   DO i = 1, dimsr(1)
-     WRITE(*,'(100(I0,1X))') rdata(i,1:dimsr(2))    
+     WRITE(*,'(100(I0,1X))') rdata(i,1:dimsr(2))
   END DO
 
   !
diff --git a/fortran/examples/h5_rdwt.f90 b/fortran/examples/h5_rdwt.f90
index ba05b2f..6967882 100644
--- a/fortran/examples/h5_rdwt.f90
+++ b/fortran/examples/h5_rdwt.f90
@@ -1,16 +1,13 @@
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
 !                                                                             *
 !   This file is part of HDF5.  The full HDF5 copyright notice, including     *
 !   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 !
diff --git a/fortran/examples/h5_subset.f90 b/fortran/examples/h5_subset.f90
index 6cb8f7a..d5564ad 100644
--- a/fortran/examples/h5_subset.f90
+++ b/fortran/examples/h5_subset.f90
@@ -1,35 +1,32 @@
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!  Copyright by The HDF Group.                                              *
-!  Copyright by the Board of Trustees of the University of Illinois.        *
-!  All rights reserved.                                                     *
+! Copyright by The HDF Group.                                               *
+! All rights reserved.                                                      *
 !                                                                           *
-!  This file is part of HDF5.  The full HDF5 copyright notice, including    *
-!  terms governing use, modification, and redistribution, is contained in   *
-!  the files COPYING and Copyright.html.  COPYING can be found at the root  *
-!  of the source code distribution tree; Copyright.html can be found at the *
-!  root level of an installed copy of the electronic HDF5 document set and  *
-!  is linked from the top-level documents page.  It can also be found at    *
-!  http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have         *
-!  access to either file, you may request a copy from help@hdfgroup.org.    *
+! This file is part of HDF5.  The full HDF5 copyright notice, including     *
+! terms governing use, modification, and redistribution, is contained in    *
+! the COPYING file, which can be found at the root of the source code       *
+! distribution tree, or in https://www.hdfgroup.org/licenses.               *
+! If you do not have access to either file, you may request a copy from     *
+! help@hdfgroup.org.                                                        *
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
-! This example shows how to write and read a hyperslab.  
+! This example shows how to write and read a hyperslab.
 ! It is used in the HDF5 Tutorial.
 !
 
-PROGRAM H5_SUBSET 
+PROGRAM H5_SUBSET
 
-  USE HDF5 ! This module contains all necessary modules 
+  USE HDF5 ! This module contains all necessary modules
 
   IMPLICIT NONE
 
   CHARACTER(LEN=9), PARAMETER :: filename = "subset.h5"  ! File name
   CHARACTER(LEN=8), PARAMETER :: dsetname = "IntArray"   ! Dataset name
 
-  INTEGER(HID_T) :: file_id       ! File identifier 
-  INTEGER(HID_T) :: dset_id       ! Dataset identifier 
-  INTEGER(HID_T) :: dataspace     ! Dataspace identifier 
-  INTEGER(HID_T) :: memspace      ! memspace identifier 
+  INTEGER(HID_T) :: file_id       ! File identifier
+  INTEGER(HID_T) :: dset_id       ! Dataset identifier
+  INTEGER(HID_T) :: dataspace     ! Dataspace identifier
+  INTEGER(HID_T) :: memspace      ! memspace identifier
 
   !
   ! To change the subset size, modify size of dimsm, sdata, dim0_sub,
@@ -37,57 +34,57 @@ PROGRAM H5_SUBSET
   !
   INTEGER(HSIZE_T), DIMENSION(1:2) :: dimsm = (/4,3/) ! Dataset dimensions
   INTEGER, DIMENSION(1:4,1:3) :: sdata                  ! Subset buffer
-  INTEGER :: dim0_sub = 4   
-  INTEGER :: dim1_sub = 3 
+  INTEGER :: dim0_sub = 4
+  INTEGER :: dim1_sub = 3
   INTEGER(HSIZE_T), DIMENSION(1:2) :: count = (/4,3/)  ! Size of hyperslab
   INTEGER(HSIZE_T), DIMENSION(1:2) :: offset = (/2,1/) ! Hyperslab offset
-  INTEGER(HSIZE_T), DIMENSION(1:2) :: stride = (/1,1/) ! Hyperslab stride 
-  INTEGER(HSIZE_T), DIMENSION(1:2) :: block = (/1,1/)  ! Hyperslab block size 
+  INTEGER(HSIZE_T), DIMENSION(1:2) :: stride = (/1,1/) ! Hyperslab stride
+  INTEGER(HSIZE_T), DIMENSION(1:2) :: block = (/1,1/)  ! Hyperslab block size
 
   INTEGER(HSIZE_T), DIMENSION(1:2) :: dimsf = (/10,8/) ! Dataset dimensions
 
 
   INTEGER, DIMENSION(1:10,1:8) :: data     ! Data to write
-  INTEGER, DIMENSION(1:10,1:8) :: rdata    ! Data to read 
+  INTEGER, DIMENSION(1:10,1:8) :: rdata    ! Data to read
 
   INTEGER :: rank = 2      ! Dataset rank ( in file )
   INTEGER :: dim0 = 10     ! Dataset size in file
-  INTEGER :: dim1 = 8 
+  INTEGER :: dim1 = 8
 
-  INTEGER :: i, j 
+  INTEGER :: i, j
 
   INTEGER :: error         ! Error flag
   INTEGER(HSIZE_T), DIMENSION(2) :: data_dims
 
   !
-  ! Write data to the HDF5 file.  
+  ! Write data to the HDF5 file.
   !
 
   !
-  ! Data initialization. 
+  ! Data initialization.
   !
-  DO i = 1, dim0 
+  DO i = 1, dim0
      DO j = 1, dim1
         IF (i .LE. (dim0 / 2)) THEN
-           data(i,j) = 1 
-        ELSE 
-           data(i,j) = 2 
+           data(i,j) = 1
+        ELSE
+           data(i,j) = 2
         END IF
      END DO
   END DO
 
   !
-  ! Initialize FORTRAN interface. 
+  ! Initialize FORTRAN interface.
   !
-  CALL h5open_f(error) 
+  CALL h5open_f(error)
 
   !
   ! Create a new file using default properties.
-  ! 
+  !
   CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, error)
 
   !
-  ! Create the data space for the  dataset. 
+  ! Create the data space for the  dataset.
   !
   CALL h5screate_simple_f(rank, dimsf, dataspace, error)
 
@@ -100,12 +97,12 @@ PROGRAM H5_SUBSET
   !
   ! Write the dataset.
   !
-  data_dims(1) = dim0 
-  data_dims(2) = dim1 
+  data_dims(1) = dim0
+  data_dims(2) = dim1
   CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, data, data_dims, error)
 
   !
-  ! Data Written to File 
+  ! Data Written to File
   !
   WRITE(*,'(/,A)') "Original Data Written to File:"
   DO i = 1, dim0
@@ -140,7 +137,7 @@ PROGRAM H5_SUBSET
   !
   CALL h5dget_space_f(dset_id, dataspace, error)
   CALL h5sselect_hyperslab_f(dataspace, H5S_SELECT_SET_F, &
-       offset, count, error, stride, BLOCK) 
+       offset, count, error, stride, BLOCK)
   !
   ! Create memory dataspace.
   !
@@ -150,9 +147,9 @@ PROGRAM H5_SUBSET
   WRITE(*,'(A,/)') "   offset=2x1 stride=1x1 count=4x3 block=1x1"
 
   !
-  ! Write subset to dataset  
+  ! Write subset to dataset
   !
-  data_dims(1:2) = (/dim0_sub, dim1_sub/) 
+  data_dims(1:2) = (/dim0_sub, dim1_sub/)
   CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, sdata, data_dims, error, &
        memspace, dataspace)
 
@@ -160,10 +157,10 @@ PROGRAM H5_SUBSET
   CALL h5dread_f(dset_id, H5T_NATIVE_INTEGER, rdata, data_dims, error)
 
   !
-  ! Read entire dataset back 
+  ! Read entire dataset back
   !
   WRITE(*,'(A)') "Data in File after Subset Written:"
-  DO i = 1, dim0 
+  DO i = 1, dim0
     WRITE(*,'(100(1X,I0,1X))') rdata(i,1:dim1)
   END DO
   PRINT *, " "
diff --git a/fortran/examples/hyperslab.f90 b/fortran/examples/hyperslab.f90
index 7823ff6..46d345d 100644
--- a/fortran/examples/hyperslab.f90
+++ b/fortran/examples/hyperslab.f90
@@ -1,16 +1,13 @@
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
 !                                                                             *
 !   This file is part of HDF5.  The full HDF5 copyright notice, including     *
 !   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 !
diff --git a/fortran/examples/mountexample.f90 b/fortran/examples/mountexample.f90
index 5bdec2a..b74364b 100644
--- a/fortran/examples/mountexample.f90
+++ b/fortran/examples/mountexample.f90
@@ -1,16 +1,13 @@
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
 !                                                                             *
 !   This file is part of HDF5.  The full HDF5 copyright notice, including     *
 !   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 !
diff --git a/fortran/examples/nested_derived_type.f90 b/fortran/examples/nested_derived_type.f90
index f806110..1b8168f 100644
--- a/fortran/examples/nested_derived_type.f90
+++ b/fortran/examples/nested_derived_type.f90
@@ -1,16 +1,14 @@
-! 
+!
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-! Copyright by the Board of Trustees of the University of Illinois.         *
+! Copyright by The HDF Group.                                               *
 ! All rights reserved.                                                      *
 !                                                                           *
 ! This file is part of HDF5.  The full HDF5 copyright notice, including     *
 ! terms governing use, modification, and redistribution, is contained in    *
-! the files COPYING and Copyright.html.  COPYING can be found at the root   *
-! of the source code distribution tree; Copyright.html can be found at the  *
-! root level of an installed copy of the electronic HDF5 document set and   *
-! is linked from the top-level documents page.  It can also be found at     *
-! http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have     *
-! access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
+! the COPYING file, which can be found at the root of the source code       *
+! distribution tree, or in https://www.hdfgroup.org/licenses.               *
+! If you do not have access to either file, you may request a copy from     *
+! help@hdfgroup.org.                                                        *
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 ! This example shows how to create a nested compound data type,
@@ -23,13 +21,13 @@ PROGRAM main
   IMPLICIT NONE
 
 ! KIND parameters
-  INTEGER, PARAMETER :: int_k1 = SELECTED_INT_KIND(Fortran_INTEGER_1)  ! This should map to INTEGER*1 on most modern processors
-  INTEGER, PARAMETER :: int_k4 = SELECTED_INT_KIND(Fortran_INTEGER_2)  ! This should map to INTEGER*2 on most modern processors
-  INTEGER, PARAMETER :: int_k8 = SELECTED_INT_KIND(Fortran_INTEGER_4)  ! This should map to INTEGER*4 on most modern processors
-  INTEGER, PARAMETER :: int_k16 = SELECTED_INT_KIND(Fortran_INTEGER_8) ! This should map to INTEGER*8 on most modern processors
+  INTEGER, PARAMETER :: int_k1 = SELECTED_INT_KIND(2)  ! This should map to INTEGER*1 on most modern processors
+  INTEGER, PARAMETER :: int_k4 = SELECTED_INT_KIND(4)  ! This should map to INTEGER*2 on most modern processors
+  INTEGER, PARAMETER :: int_k8 = SELECTED_INT_KIND(9)  ! This should map to INTEGER*4 on most modern processors
+  INTEGER, PARAMETER :: int_k16 = SELECTED_INT_KIND(18) ! This should map to INTEGER*8 on most modern processors
 
-  INTEGER, PARAMETER :: r_k4 = SELECTED_REAL_KIND(Fortran_REAL_4) ! This should map to REAL*4 on most modern processors
-  INTEGER, PARAMETER :: r_k8 = SELECTED_REAL_KIND(Fortran_REAL_8) ! This should map to REAL*8 on most modern processors
+  INTEGER, PARAMETER :: r_k4 = SELECTED_REAL_KIND(6,37) ! This should map to REAL*4 on most modern processors
+  INTEGER, PARAMETER :: r_k8 = SELECTED_REAL_KIND(15,307) ! This should map to REAL*8 on most modern processors
 
 ! FILES
 
@@ -84,10 +82,10 @@ PROGRAM main
   INTEGER(SIZE_T) :: offset, sizeof_compound
   INTEGER :: hdferr
   TYPE(C_PTR) :: f_ptr
-  
-  INTEGER(SIZE_T) :: type_sizei  ! Size of the integer datatype 
-  INTEGER(SIZE_T) :: type_sizer  ! Size of the real datatype 
-  INTEGER(SIZE_T) :: type_sized  ! Size of the double datatype 
+
+  INTEGER(SIZE_T) :: type_sizei  ! Size of the integer datatype
+  INTEGER(SIZE_T) :: type_sizer  ! Size of the real datatype
+  INTEGER(SIZE_T) :: type_sized  ! Size of the double datatype
   INTEGER(hid_t) :: tid3      ! /* Nested Array Datatype ID	*/
   INTEGER(HSIZE_T), DIMENSION(1) :: tdims1=(/7/)
   INTEGER(HSIZE_T), DIMENSION(1) :: tdims1a=(/4/)
@@ -138,7 +136,7 @@ PROGRAM main
   !
   ! Write data to the dataset
   !
-  
+
   f_ptr = C_LOC(s1(1))
   CALL H5Dwrite_f(dataset, s1_tid, f_ptr, hdferr)
 
@@ -155,7 +153,7 @@ PROGRAM main
   !
 
   CALL H5Fopen_f(H5FILE_NAME, H5F_ACC_RDONLY_F, file, hdferr)
-  
+
   CALL H5Dopen_f(file, DATASETNAME, dataset,hdferr)
   !
   ! Create a data type for s2
diff --git a/fortran/examples/ph5example.f90 b/fortran/examples/ph5example.f90
index a0db200..05fedbd 100644
--- a/fortran/examples/ph5example.f90
+++ b/fortran/examples/ph5example.f90
@@ -1,16 +1,13 @@
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
 !                                                                             *
 !   This file is part of HDF5.  The full HDF5 copyright notice, including     *
 !   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 ! Fortran parallel example.  Copied from Tutorial's example program of
diff --git a/fortran/examples/refobjexample.f90 b/fortran/examples/refobjexample.f90
index c8622a7..a831440 100644
--- a/fortran/examples/refobjexample.f90
+++ b/fortran/examples/refobjexample.f90
@@ -1,16 +1,13 @@
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
 !                                                                             *
 !   This file is part of HDF5.  The full HDF5 copyright notice, including     *
 !   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 !
@@ -28,7 +25,7 @@
      IMPLICIT NONE
      CHARACTER(LEN=10), PARAMETER :: filename = "FORTRAN.h5"  ! File
      CHARACTER(LEN=8), PARAMETER :: dsetnamei = "INTEGERS"    ! Dataset with the integer data
-     CHARACTER(LEN=17), PARAMETER :: dsetnamer = "OBJECT_REFERENCES" ! Dataset wtih object
+     CHARACTER(LEN=17), PARAMETER :: dsetnamer = "OBJECT_REFERENCES" ! Dataset with object
                                                                      ! references
      CHARACTER(LEN=6), PARAMETER :: groupname1 = "GROUP1"            ! Groups in the file
      CHARACTER(LEN=6), PARAMETER :: groupname2 = "GROUP2"            !
@@ -67,7 +64,7 @@
      !
      CALL h5gcreate_f(file_id, groupname1, grp1_id, error)
      !
-     ! Create a group inside the created gorup
+     ! Create a group inside the created group
      !
      CALL h5gcreate_f(grp1_id, groupname2, grp2_id, error)
      !
diff --git a/fortran/examples/refregexample.f90 b/fortran/examples/refregexample.f90
index 68fbd24..7e9616f 100644
--- a/fortran/examples/refregexample.f90
+++ b/fortran/examples/refregexample.f90
@@ -1,16 +1,13 @@
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
 !                                                                             *
 !   This file is part of HDF5.  The full HDF5 copyright notice, including     *
 !   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 !
diff --git a/fortran/examples/run-fortran-ex.sh.in b/fortran/examples/run-fortran-ex.sh.in
index ead7361..d541115 100644
--- a/fortran/examples/run-fortran-ex.sh.in
+++ b/fortran/examples/run-fortran-ex.sh.in
@@ -5,12 +5,10 @@
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 
 #
 #  This file:  run-hlfortran-ex.sh
@@ -20,7 +18,7 @@
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 #                                                                               #
 # This script will compile and run the fortran examples from source files       #
-# installed in .../share/hdf5_examples/fortran using h5fc or h5pfc.  The        #
+# installed in @examplesdir@/fortran using h5fc or h5pfc.  The        #
 # order for running programs with RunTest in the MAIN section below is taken    #
 # from the Makefile.  The order is important since some of the test programs    #
 # use data files created by earlier test programs.  Any future additions should #
@@ -32,9 +30,32 @@
 EXIT_SUCCESS=0
 EXIT_FAILURE=1
 
+#
+# Try to derive the path to the installation $prefix established
+# by ./configure relative to the examples directory established by
+# ./configure.  If successful, set `prefix_relto_examplesdir` to the
+# relative path.  Otherwise, set `prefix_relto_examplesdir` to the
+# absolute installation $prefix.
+#
+# This script uses the value of `prefix` in the user's environment, if
+# it is set, below.  The content of $() is evaluated in a sub-shell, so
+# if `prefix` is set in the user's environment, the shell statements in
+# $() won't clobbered it.
+#
+prefix_relto_examplesdir=$(
+prefix=@prefix@
+examplesdir=@examplesdir@
+if [ ${examplesdir##${prefix}/} != ${examplesdir} ]; then
+	echo $(echo ${examplesdir##${prefix}/} | \
+	    sed 's,[^/][^/]*,..,g')
+else
+	echo $prefix
+fi
+)
+
 # Where the tool is installed.
 # default is relative path to installed location of the tools
-prefix="${prefix:-../../../}"
+prefix="${prefix:-../${prefix_relto_examplesdir}}"
 PARALLEL=@PARALLEL@             # Am I in parallel mode?
 AR="@AR@"
 RANLIB="@RANLIB@"
@@ -63,8 +84,6 @@ RunTest()
     ./$TEST_EXEC
 }
 
-F2003_ENABLED=@HAVE_FORTRAN_2003@
-
 ##################  MAIN  ##################
 
 # Run tests
@@ -99,17 +118,8 @@ then
         RunTest mountexample &&\
         rm mountexample &&\
         RunTest compound &&\
-        rm compound); then
-        EXIT_VALUE=${EXIT_SUCCESS}
-    else
-        EXIT_VALUE=${EXIT_FAILURE}
-    fi
-fi
-
-if [ $EXIT_VALUE -eq ${EXIT_SUCCESS} -a "$F2003_ENABLED" = "yes" ]
-then
-# Add attention tests for Fortran 2003 features
-    if (RunTest rwdset_fortran2003 &&\
+        rm compound &&\
+        RunTest rwdset_fortran2003 &&\
         rm rwdset_fortran2003 &&\
         RunTest nested_derived_type &&\
         rm nested_derived_type &&\
@@ -122,12 +132,11 @@ then
         EXIT_VALUE=${EXIT_FAILURE}
     fi
 fi
-  
 
 # Cleanup
 rm *.o
 rm *.h5
 echo
 
-exit $EXIT_VALUE 
+exit $EXIT_VALUE
 
diff --git a/fortran/examples/rwdset_fortran2003.f90 b/fortran/examples/rwdset_fortran2003.f90
index d65db9e..e7853ab 100644
--- a/fortran/examples/rwdset_fortran2003.f90
+++ b/fortran/examples/rwdset_fortran2003.f90
@@ -1,22 +1,19 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
 !                                                                             *
 !   This file is part of HDF5.  The full HDF5 copyright notice, including     *
 !   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 !
-! The following example shows how to write and read to/from an existing dataset. 
-! It opens the file created in the previous example, obtains the dataset 
-! identifier, writes the data to the dataset in the file, 
+! The following example shows how to write and read to/from an existing dataset.
+! It opens the file created in the previous example, obtains the dataset
+! identifier, writes the data to the dataset in the file,
 ! then reads the dataset to memory. Uses updated Fortran 2003 interface
 ! with different KINDs of integers and reals.
 !
@@ -24,17 +21,17 @@ PROGRAM RWDSET_FORTRAN2003
 
   USE ISO_C_BINDING
 
-  USE HDF5 ! This module contains all necessary modules 
-        
+  USE HDF5 ! This module contains all necessary modules
+
   IMPLICIT NONE
 
-  INTEGER, PARAMETER :: int_kind_1 = SELECTED_INT_KIND(Fortran_INTEGER_1)  !should map to INTEGER*1 on most modern processors
-  INTEGER, PARAMETER :: int_kind_4 = SELECTED_INT_KIND(Fortran_INTEGER_2)  !should map to INTEGER*2 on most modern processors
-  INTEGER, PARAMETER :: int_kind_8 = SELECTED_INT_KIND(Fortran_INTEGER_4)  !should map to INTEGER*4 on most modern processors
-  INTEGER, PARAMETER :: int_kind_16 = SELECTED_INT_KIND(Fortran_INTEGER_8) !should map to INTEGER*8 on most modern processors
+  INTEGER, PARAMETER :: int_kind_1 = SELECTED_INT_KIND(2)  !should map to INTEGER*1 on most modern processors
+  INTEGER, PARAMETER :: int_kind_4 = SELECTED_INT_KIND(4)  !should map to INTEGER*2 on most modern processors
+  INTEGER, PARAMETER :: int_kind_8 = SELECTED_INT_KIND(9)  !should map to INTEGER*4 on most modern processors
+  INTEGER, PARAMETER :: int_kind_16 = SELECTED_INT_KIND(18) !should map to INTEGER*8 on most modern processors
 
-  INTEGER, PARAMETER :: real_kind_7 = SELECTED_REAL_KIND(Fortran_REAL_4) !should map to REAL*4 on most modern processors
-  INTEGER, PARAMETER :: real_kind_15 = SELECTED_REAL_KIND(Fortran_REAL_8) !should map to REAL*8 on most modern processors
+  INTEGER, PARAMETER :: real_kind_7 = SELECTED_REAL_KIND(6,37) !should map to REAL*4 on most modern processors
+  INTEGER, PARAMETER :: real_kind_15 = SELECTED_REAL_KIND(15,307) !should map to REAL*8 on most modern processors
 
   CHARACTER(LEN=8), PARAMETER :: filename = "dsetf.h5" ! File name
   CHARACTER(LEN=5), PARAMETER :: dsetname1 = "dset1"     ! Dataset name
@@ -44,13 +41,13 @@ PROGRAM RWDSET_FORTRAN2003
   CHARACTER(LEN=6), PARAMETER :: dsetnamer4 = "dsetr4"     ! Dataset name
   CHARACTER(LEN=6), PARAMETER :: dsetnamer8 = "dsetr8"     ! Dataset name
 
-  INTEGER(HID_T) :: file_id       ! File identifier 
-  INTEGER(HID_T) :: dset_id1      ! Dataset identifier  
-  INTEGER(HID_T) :: dset_id4      ! Dataset identifier   
-  INTEGER(HID_T) :: dset_id8      ! Dataset identifier  
-  INTEGER(HID_T) :: dset_id16     ! Dataset identifier  
-  INTEGER(HID_T) :: dset_idr4      ! Dataset identifier   
-  INTEGER(HID_T) :: dset_idr8      ! Dataset identifier 
+  INTEGER(HID_T) :: file_id       ! File identifier
+  INTEGER(HID_T) :: dset_id1      ! Dataset identifier
+  INTEGER(HID_T) :: dset_id4      ! Dataset identifier
+  INTEGER(HID_T) :: dset_id8      ! Dataset identifier
+  INTEGER(HID_T) :: dset_id16     ! Dataset identifier
+  INTEGER(HID_T) :: dset_idr4      ! Dataset identifier
+  INTEGER(HID_T) :: dset_idr8      ! Dataset identifier
 
   INTEGER :: error ! Error flag
   INTEGER :: i
@@ -67,15 +64,15 @@ PROGRAM RWDSET_FORTRAN2003
   REAL(real_kind_7), DIMENSION(1:4), TARGET :: dset_data_r7, data_out_r7
   REAL(real_kind_15), DIMENSION(1:4), TARGET :: dset_data_r15, data_out_r15
 
-  INTEGER(HSIZE_T), DIMENSION(1:1) :: data_dims = (/4/) 
+  INTEGER(HSIZE_T), DIMENSION(1:1) :: data_dims = (/4/)
   INTEGER(HID_T) :: dspace_id     ! Dataspace identifier
-  
+
   TYPE(C_PTR) :: f_ptr
 
   !
   ! Initialize FORTRAN interface.
   !
-  CALL h5open_f(error) 
+  CALL h5open_f(error)
   !
   ! Initialize the dset_data array.
   !
@@ -132,7 +129,7 @@ PROGRAM RWDSET_FORTRAN2003
   !
   ! Read the dataset.
   !
-  ! Read data back into an integer size that is larger then the original size used for 
+  ! Read data back into an integer size that is larger then the original size used for
   ! writing the data
   f_ptr = C_LOC(data_out_i8a(1))
   CALL h5dread_f(dset_id1, h5kind_to_type(int_kind_8,H5_INTEGER_KIND), f_ptr,  error)
@@ -148,12 +145,12 @@ PROGRAM RWDSET_FORTRAN2003
   CALL h5dread_f(dset_idr8, h5kind_to_type(real_kind_15,H5_REAL_KIND), f_ptr,  error)
 
 ! memory type
-  WRITE(*,'(A,4i8)' )'SELECTED_INT_KIND(Fortran_INTEGER_1):  ',data_out_i8a
-  WRITE(*,'(A,4i8)' )'SELECTED_INT_KIND(Fortran_INTEGER_4):  ',data_out_i4
-  WRITE(*,'(A,4i8)' )'SELECTED_INT_KIND(Fortran_INTEGER_8):  ',data_out_i8
-  WRITE(*,'(A,4i8)' )'SELECTED_INT_KIND(Fortran_INTEGER_16): ',data_out_i16
-  WRITE(*,'(A,4(1x,f9.4))' )'SELECTED_REAL_KIND(Fortran_REAL_7):  ',data_out_r7
-  WRITE(*,'(A,4(1x,f16.10))' )'SELECTED_REAL_KIND(Fortran_REAL_15):  ',data_out_r15
+  WRITE(*,'(A,4i8)' )'SELECTED_INT_KIND(2):  ',data_out_i8a
+  WRITE(*,'(A,4i8)' )'SELECTED_INT_KIND(4):  ',data_out_i4
+  WRITE(*,'(A,4i8)' )'SELECTED_INT_KIND(9):  ',data_out_i8
+  WRITE(*,'(A,4i8)' )'SELECTED_INT_KIND(18): ',data_out_i16
+  WRITE(*,'(A,4(1x,f9.4))' )'SELECTED_REAL_KIND(6,37):  ',data_out_r7
+  WRITE(*,'(A,4(1x,f16.10))' )'SELECTED_REAL_KIND(15,307):  ',data_out_r15
   !
   ! Close the dataset.
   !
@@ -174,5 +171,5 @@ PROGRAM RWDSET_FORTRAN2003
 
 END PROGRAM RWDSET_FORTRAN2003
 
-               
+
 
diff --git a/fortran/examples/selectele.f90 b/fortran/examples/selectele.f90
index dcd2379..4c375a8 100644
--- a/fortran/examples/selectele.f90
+++ b/fortran/examples/selectele.f90
@@ -1,16 +1,13 @@
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
 !                                                                             *
 !   This file is part of HDF5.  The full HDF5 copyright notice, including     *
 !   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 !
diff --git a/fortran/examples/testh5fc.sh.in b/fortran/examples/testh5fc.sh.in
index cd3b86e..2f7c176 100644
--- a/fortran/examples/testh5fc.sh.in
+++ b/fortran/examples/testh5fc.sh.in
@@ -1,17 +1,14 @@
 #! /bin/sh
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 #
 # Tests for the h5fc compiler tool
 # Created: Albert Cheng, 2007/3/14
@@ -63,7 +60,7 @@ applib=libapp${H5TOOL}.a
 # short hands
 # Caution: if some *.h5 files must be cleaned here, list them by names.
 # Don't use the wildcard form of *.h5 as it will wipe out even *.h5 generated
-# by otehr test programs. This will cause a racing condition error when
+# by other test programs. This will cause a racing condition error when
 # parallel make (e.g., gmake -j 4) is used.
 temp_SRC="$hdf5main $appmain $prog1 $prog2"
 temp_OBJ=`echo $temp_SRC | sed -e "s/\.${suffix}/.o/g"`
@@ -73,13 +70,13 @@ temp_FILES="a.out $applib"
 # An application Main that calls hdf5 and application's own functions.
 cat > $appmain <<EOF
      PROGRAM FILEEXAMPLE
-     USE HDF5 ! This module contains all necessary modules 
-        
+     USE HDF5 ! This module contains all necessary modules
+
      IMPLICIT NONE
 
      CHARACTER(LEN=8), PARAMETER :: filename = "apptmp.h5" ! File name
      INTEGER(HID_T) :: file_id                            ! File identifier
- 
+
      INTEGER     ::   error  ! Error flag
 
      CALL sub1
@@ -88,7 +85,7 @@ cat > $appmain <<EOF
      CALL h5fclose_f(file_id, error)
      CALL h5close_f(error)
      CALL sub2
-     END PROGRAM FILEEXAMPLE 
+     END PROGRAM FILEEXAMPLE
 EOF
 
 # generate prog1
@@ -109,20 +106,20 @@ EOF
 # An HDF5 sample program that calls hdf5 functions.
 cat > $hdf5main <<EOF
      PROGRAM FILEEXAMPLE
-     USE HDF5 ! This module contains all necessary modules 
-        
+     USE HDF5 ! This module contains all necessary modules
+
      IMPLICIT NONE
 
      CHARACTER(LEN=8), PARAMETER :: filename = "apptmp.h5" ! File name
      INTEGER(HID_T) :: file_id                            ! File identifier
- 
+
      INTEGER     ::   error  ! Error flag
 
      CALL h5open_f (error)
      CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, error)
      CALL h5fclose_f(file_id, error)
      CALL h5close_f(error)
-     END PROGRAM FILEEXAMPLE 
+     END PROGRAM FILEEXAMPLE
 EOF
 
 
diff --git a/fortran/robodoc.rc b/fortran/robodoc.rc
index 07b8b35..b24e4f9 100644
--- a/fortran/robodoc.rc
+++ b/fortran/robodoc.rc
@@ -132,10 +132,7 @@ ignore files:
     *.o
     *e
     *.mod
-    *_F90.f90
     *.c
 accept files:
-    *_F03.f90
-    *_F90.f90
-    *.f90
+    *.F90
     *.h
diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt
index c015072..df246fc 100644
--- a/fortran/src/CMakeLists.txt
+++ b/fortran/src/CMakeLists.txt
@@ -1,5 +1,5 @@
-cmake_minimum_required (VERSION 3.1.0)
-PROJECT (HDF5_F90_SRC C CXX Fortran)
+cmake_minimum_required (VERSION 3.18)
+project (HDF5_F90_SRC C Fortran)
 
 #-----------------------------------------------------------------------------
 # configure def file for shared libs on windows
@@ -8,111 +8,112 @@ if (WIN32)
     if (MSVC)
       if (NOT H5_HAVE_PARALLEL)
         set (H5_NOPAREXP ";")
-      endif (NOT H5_HAVE_PARALLEL)
-      if (NOT HDF5_ENABLE_F2003)
-        set (H5_NOF03EXP ";")
-      else (NOT HDF5_ENABLE_F2003)
-        set (H5_F03EXP ";")
-      endif (NOT HDF5_ENABLE_F2003)
+      endif ()
+      set (H5_F03EXP ";")
+      if (NOT H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE)
+        set (H5_DBL_NOT_UNIQUE_EXP ";")
+      endif ()
       configure_file (${HDF5_F90_SRC_SOURCE_DIR}/hdf5_fortrandll.def.in ${HDF5_F90_SRC_BINARY_DIR}/hdf5_fortrandll.def @ONLY)
-    endif (MSVC)
-  endif (BUILD_SHARED_LIBS)
-endif (WIN32)
+    endif ()
+  endif ()
+endif ()
+
+# configure for Fortran preprocessor
+
+# Define Parallel variable for passing to H5config_f.inc.cmake
+set (CMAKE_H5_HAVE_PARALLEL 0)
+if (H5_HAVE_PARALLEL)
+  set (CMAKE_H5_HAVE_PARALLEL 1)
+endif ()
+
+set (CMAKE_H5_HAVE_FLOAT128 0)
+if (HAVE_FLOAT128)
+  set (CMAKE_H5_HAVE_FLOAT128 1)
+endif ()
+
+configure_file (${HDF5_F90_SRC_SOURCE_DIR}/H5config_f.inc.cmake ${HDF5_F90_BINARY_DIR}/H5config_f.inc @ONLY)
+configure_file (${HDF5_F90_SRC_SOURCE_DIR}/H5fort_type_defines.h.cmake ${HDF5_F90_BINARY_DIR}/H5fort_type_defines.h @ONLY)
+
+set (Fortran_COMPILER_ID CMAKE_Fortran_COMPILER_ID)
 
 #-----------------------------------------------------------------------------
 # Setup the Fortran auto-detection utilities
-# H5test_kind(_SIZEOF,_STORAGE_SIZE).f90 used to generate H5fortran_detect.f90
-# H5fortran_detect.f90     used to generate H5fort_type_defines.h
-# H5fort_type_defines.h    used to generate H5f90i_gen.h + H5fortran_types.f90
+# H5_buildiface.F90      used to generate various KIND interfaces
+# H5fort_type_defines.h   used to generate H5f90i_gen.h + H5fortran_types.F90
 #-----------------------------------------------------------------------------
-if (FORTRAN_HAVE_STORAGE_SIZE)
-  add_executable (H5test_FortranHavekind
-      ${HDF5_F90_SRC_SOURCE_DIR}/H5test_kind_STORAGE_SIZE.f90
-  )
-  set (H5_TEST_KIND_NAME "h5test_kind_storage_size_mod")
-else (FORTRAN_HAVE_STORAGE_SIZE)
-    if (FORTRAN_HAVE_SIZEOF)
-      add_executable (H5test_FortranHavekind
-          ${HDF5_F90_SRC_SOURCE_DIR}/H5test_kind_SIZEOF.f90
-      )
-      set (H5_TEST_KIND_NAME "h5test_kind_sizeof_mod")
-    else (FORTRAN_HAVE_SIZEOF)
-      add_executable (H5test_FortranHavekind
-          ${HDF5_F90_SRC_SOURCE_DIR}/H5test_kind.f90
-      )
-    endif (FORTRAN_HAVE_SIZEOF)
-endif (FORTRAN_HAVE_STORAGE_SIZE)
-if (WIN32 AND MSVC)
-  if (BUILD_SHARED_LIBS)
-    set_target_properties (H5test_FortranHavekind
-        PROPERTIES
-            COMPILE_FLAGS "/MT"
-    )
-  endif (BUILD_SHARED_LIBS)
-  set_target_properties (H5test_FortranHavekind
-      PROPERTIES
-          LINK_FLAGS "/SUBSYSTEM:CONSOLE"
-  )
-endif (WIN32 AND MSVC)
-set_target_properties (H5test_FortranHavekind PROPERTIES
+
+add_executable (H5_buildiface ${HDF5_F90_SRC_SOURCE_DIR}/H5_buildiface.F90)
+target_include_directories (H5_buildiface PRIVATE "${HDF5_SRC_BINARY_DIR};${HDF5_F90_BINARY_DIR}")
+#if (BUILD_SHARED_LIBS)
+#  target_compile_definitions(H5_buildiface PRIVATE $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:/MT>)
+#endif ()
+if(MSVC)
+  set_property(TARGET H5_buildiface PROPERTY COMPILE_FLAGS "/MT")
+endif()
+#set_property(TARGET H5_buildiface APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"-SUBSYSTEM:CONSOLE">)
+if(MSVC)
+  set_property(TARGET H5_buildiface PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE")
+endif()
+
+set_target_properties (H5_buildiface PROPERTIES
     LINKER_LANGUAGE Fortran
     Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}
 )
 
-set (CMD $<TARGET_FILE:H5test_FortranHavekind>)
-add_custom_command (
-    OUTPUT ${HDF5_F90_BINARY_DIR}/H5fortran_detect.f90
-    COMMAND ${CMD}
-    ARGS > ${HDF5_F90_BINARY_DIR}/H5fortran_detect.f90
-    WORKING_DIRECTORY ${HDF5_F90_BINARY_DIR}
-    DEPENDS H5test_FortranHavekind
-)
-#-----------------------------------------------------------------------------
-add_executable (H5fortran_detect
-    ${HDF5_F90_BINARY_DIR}/H5fortran_detect.f90
-)
-if (WIN32 AND MSVC)
-  if (BUILD_SHARED_LIBS)
-    set_target_properties (H5fortran_detect
-        PROPERTIES
-            COMPILE_FLAGS "/MT"
-    )
-  endif (BUILD_SHARED_LIBS)
-  set_target_properties (H5fortran_detect
-      PROPERTIES
-          LINK_FLAGS "/SUBSYSTEM:CONSOLE"
-  )
-endif (WIN32 AND MSVC)
-set_target_properties (H5fortran_detect PROPERTIES LINKER_LANGUAGE Fortran)
-
-set (CMD $<TARGET_FILE:H5fortran_detect>)
-add_custom_command (
-    OUTPUT ${HDF5_F90_BINARY_DIR}/H5fort_type_defines.h
-    COMMAND ${CMD}
-    ARGS > ${HDF5_F90_BINARY_DIR}/H5fort_type_defines.h
-    WORKING_DIRECTORY ${HDF5_F90_BINARY_DIR}
-    DEPENDS H5fortran_detect
-)
+if (BUILD_SHARED_LIBS)
+  file (MAKE_DIRECTORY "${HDF5_F90_BINARY_DIR}/shared")
+  set (MODSH_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/shared/${HDF_CFG_BUILD_TYPE})
+endif ()
+if (NOT ONLY_SHARED_LIBS)
+  file (MAKE_DIRECTORY "${HDF5_F90_BINARY_DIR}/static")
+  set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static/${HDF_CFG_BUILD_TYPE})
+endif ()
 
-INCLUDE_DIRECTORIES (${HDF5_F90_BINARY_DIR} ${CMAKE_Fortran_MODULE_DIRECTORY})
 #-----------------------------------------------------------------------------
 add_executable (H5match_types
     ${HDF5_F90_BINARY_DIR}/H5fort_type_defines.h
     ${HDF5_F90_SRC_SOURCE_DIR}/H5match_types.c
 )
-set (CMD $<TARGET_FILE:H5match_types>)
-add_custom_command (
-    OUTPUT ${HDF5_F90_BINARY_DIR}/H5f90i_gen.h
-           ${HDF5_F90_BINARY_DIR}/H5fortran_types.f90
-    COMMAND ${CMD}
+target_include_directories (H5match_types PRIVATE "${HDF5_SRC_BINARY_DIR};${HDF5_SRC_INCLUDE_DIRS};${HDF5_F90_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+
+add_custom_command (TARGET H5match_types POST_BUILD
+    BYPRODUCTS ${HDF5_F90_BINARY_DIR}/H5f90i_gen.h ${HDF5_F90_BINARY_DIR}/H5fortran_types.F90
+    COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:H5match_types>
     WORKING_DIRECTORY ${HDF5_F90_BINARY_DIR}
     DEPENDS H5match_types
 )
 
+if (NOT ONLY_SHARED_LIBS)
+  add_custom_command (TARGET H5match_types POST_BUILD
+      BYPRODUCTS ${HDF5_F90_BINARY_DIR}/static/H5f90i_gen.h ${HDF5_F90_BINARY_DIR}/static/H5fortran_types.F90
+      COMMAND    ${CMAKE_COMMAND}
+      ARGS       -E copy_if_different ${HDF5_F90_BINARY_DIR}/H5f90i_gen.h ${HDF5_F90_BINARY_DIR}/static/H5f90i_gen.h
+      COMMAND    ${CMAKE_COMMAND}
+      ARGS       -E copy_if_different ${HDF5_F90_BINARY_DIR}/H5fortran_types.F90 ${HDF5_F90_BINARY_DIR}/static/H5fortran_types.F90
+      WORKING_DIRECTORY ${HDF5_F90_BINARY_DIR}/static
+      DEPENDS H5_buildiface H5match_types ${HDF5_F90_BINARY_DIR}/H5f90i_gen.h
+  )
+  set_source_files_properties (${HDF5_F90_BINARY_DIR}/static/H5f90i_gen.h PROPERTIES GENERATED TRUE)
+  set_source_files_properties (${HDF5_F90_BINARY_DIR}/static/H5fortran_types.F90 PROPERTIES GENERATED TRUE)
+endif ()
+if (BUILD_SHARED_LIBS)
+  add_custom_command (TARGET H5match_types POST_BUILD
+      BYPRODUCTS ${HDF5_F90_BINARY_DIR}/shared/H5f90i_gen.h ${HDF5_F90_BINARY_DIR}/shared/H5fortran_types.F90
+      COMMAND    ${CMAKE_COMMAND}
+      ARGS       -E copy_if_different ${HDF5_F90_BINARY_DIR}/H5f90i_gen.h ${HDF5_F90_BINARY_DIR}/shared/H5f90i_gen.h
+      COMMAND    ${CMAKE_COMMAND}
+      ARGS       -E copy_if_different ${HDF5_F90_BINARY_DIR}/H5fortran_types.F90 ${HDF5_F90_BINARY_DIR}/shared/H5fortran_types.F90
+      WORKING_DIRECTORY ${HDF5_F90_BINARY_DIR}/shared
+      DEPENDS H5_buildiface H5match_types ${HDF5_F90_BINARY_DIR}/H5f90i_gen.h
+  )
+  set_source_files_properties (${HDF5_F90_BINARY_DIR}/shared/H5f90i_gen.h PROPERTIES GENERATED TRUE)
+  set_source_files_properties (${HDF5_F90_BINARY_DIR}/shared/H5fortran_types.F90 PROPERTIES GENERATED TRUE)
+endif ()
+
 #-----------------------------------------------------------------------------
 # f90CStub lib
 #-----------------------------------------------------------------------------
-set (f90CStub_C_SRCS
+set (f90CStub_C_SOURCES
     # normal distribution
     ${HDF5_F90_SRC_SOURCE_DIR}/H5f90kit.c
     ${HDF5_F90_SRC_SOURCE_DIR}/H5_f.c
@@ -130,218 +131,472 @@ set (f90CStub_C_SRCS
     ${HDF5_F90_SRC_SOURCE_DIR}/H5Tf.c
     ${HDF5_F90_SRC_SOURCE_DIR}/H5Zf.c
 )
-
-if (H5_HAVE_PARALLEL)
-  set (f90CStub_C_SRCS
-      ${f90CStub_C_SRCS}
-      ${HDF5_F90_SRC_SOURCE_DIR}/H5FDmpiof.c
-  )
-endif (H5_HAVE_PARALLEL)
-set_source_files_properties (${f90CStub_C_SRCS} PROPERTIES LANGUAGE C)
+set_source_files_properties (${f90CStub_C_SOURCES} PROPERTIES LANGUAGE C)
 
 set (f90CStub_C_HDRS
-    # generated files
-    ${HDF5_F90_BINARY_DIR}/H5f90i_gen.h
+    ${HDF5_F90_SRC_SOURCE_DIR}/H5f90.h
+    ${HDF5_F90_SRC_SOURCE_DIR}/H5f90i.h
+    ${HDF5_F90_SRC_SOURCE_DIR}/H5f90proto.h
 )
 
-add_library (${HDF5_F90_C_LIB_TARGET} ${LIB_TYPE} ${f90CStub_C_SRCS} ${f90CStub_C_HDRS})
-TARGET_C_PROPERTIES (${HDF5_F90_C_LIB_TARGET} ${LIB_TYPE} " " " ")
-target_link_libraries (${HDF5_F90_C_LIB_TARGET} ${HDF5_LIB_TARGET} ${LINK_LIBS})
-set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_F90_C_LIB_TARGET}")
-H5_SET_LIB_OPTIONS (${HDF5_F90_C_LIB_TARGET} ${HDF5_F90_C_LIB_NAME} ${LIB_TYPE})
-set_target_properties (${HDF5_F90_C_LIB_TARGET} PROPERTIES
-    FOLDER libraries/fortran
-    LINKER_LANGUAGE C
-    INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
-)
+if (NOT ONLY_SHARED_LIBS)
+  set (f90CStub_CGEN_HDRS
+      # generated files
+      ${HDF5_F90_BINARY_DIR}/static/H5f90i_gen.h
+  )
+  add_custom_target (H5gen_i ALL
+      DEPENDS H5match_types ${f90CStub_CGEN_HDRS}
+  )
+endif ()
 
-#-----------------------------------------------------------------------------
-# Fortran 2003 standard
-#-----------------------------------------------------------------------------
-if (HDF5_ENABLE_F2003)
-  # F2003 features are enabled
-  set (F_STATUS "_F03")
-else (HDF5_ENABLE_F2003)
-  # F2003 features are not enabled
-  set (F_STATUS "_F90")
-endif (HDF5_ENABLE_F2003)
+if (BUILD_SHARED_LIBS)
+  set (f90CStub_CGEN_SHHDRS
+      # generated files
+      ${HDF5_F90_BINARY_DIR}/shared/H5f90i_gen.h
+  )
+  add_custom_target (H5gen_iSH ALL
+      DEPENDS H5match_types ${f90CStub_CGEN_SHHDRS}
+  )
+endif ()
+
+if (NOT ONLY_SHARED_LIBS)
+  add_library (${HDF5_F90_C_LIB_TARGET} STATIC ${f90CStub_C_SOURCES} ${f90CStub_C_HDRS} ${f90CStub_CGEN_HDRS})
+  target_include_directories (${HDF5_F90_C_LIB_TARGET}
+      PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};${HDF5_F90_BINARY_DIR};${HDF5_F90_BINARY_DIR}/static;$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
+      INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
+  )
+  target_compile_options(${HDF5_F90_C_LIB_TARGET} PRIVATE "${HDF5_CMAKE_C_FLAGS}")
+  TARGET_C_PROPERTIES (${HDF5_F90_C_LIB_TARGET} STATIC)
+  target_link_libraries (${HDF5_F90_C_LIB_TARGET} PUBLIC ${HDF5_LIB_TARGET})
+  set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_F90_C_LIB_TARGET}")
+  H5_SET_LIB_OPTIONS (${HDF5_F90_C_LIB_TARGET} ${HDF5_F90_C_LIB_NAME} STATIC 0)
+  set_target_properties (${HDF5_F90_C_LIB_TARGET} PROPERTIES
+      FOLDER libraries/fortran
+      LINKER_LANGUAGE C
+  )
+  add_dependencies (${HDF5_F90_C_LIB_TARGET} H5gen_i)
+  set (install_targets ${HDF5_F90_C_LIB_TARGET})
+endif ()
+
+if (BUILD_SHARED_LIBS)
+  add_library (${HDF5_F90_C_LIBSH_TARGET} SHARED ${f90CStub_C_SOURCES} ${f90CStub_C_HDRS} ${f90CStub_CGEN_SHHDRS})
+  target_include_directories (${HDF5_F90_C_LIBSH_TARGET}
+      PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};${HDF5_F90_BINARY_DIR};${HDF5_F90_BINARY_DIR}/shared;$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
+      INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
+  )
+  target_compile_options(${HDF5_F90_C_LIBSH_TARGET} PRIVATE "${HDF5_CMAKE_C_FLAGS}")
+  target_compile_definitions(${HDF5_F90_C_LIBSH_TARGET} PUBLIC "H5_BUILT_AS_DYNAMIC_LIB")
+  TARGET_C_PROPERTIES (${HDF5_F90_C_LIBSH_TARGET} SHARED)
+  target_link_libraries (${HDF5_F90_C_LIBSH_TARGET} PUBLIC ${HDF5_LIBSH_TARGET})
+  set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_F90_C_LIBSH_TARGET}")
+  H5_SET_LIB_OPTIONS (${HDF5_F90_C_LIBSH_TARGET} ${HDF5_F90_C_LIB_NAME} SHARED "F")
+  set_target_properties (${HDF5_F90_C_LIBSH_TARGET} PROPERTIES
+      FOLDER libraries/fortran
+      LINKER_LANGUAGE C
+  )
+  add_dependencies (${HDF5_F90_C_LIBSH_TARGET} H5gen_iSH)
+  set (install_targets ${install_targets} ${HDF5_F90_C_LIBSH_TARGET})
+endif ()
 
 #-----------------------------------------------------------------------------
-# Fortran Real Size
+# Add Target to clang-format
 #-----------------------------------------------------------------------------
-if (FORTRAN_DEFAULT_REAL_NOT_DOUBLE)
-  # default real is 4 bytes, so include double signatures
-  set (F_DBLE "Include")
-else (FORTRAN_DEFAULT_REAL_NOT_DOUBLE)
-  # default real is 8 bytes, so exclude double signatures
-  set (F_DBLE "Exclude")
-endif (FORTRAN_DEFAULT_REAL_NOT_DOUBLE)
+if (HDF5_ENABLE_FORMATTERS)
+  if (NOT ONLY_SHARED_LIBS)
+    clang_format (HDF5_F90_C_SRC_FORMAT
+        ${HDF5_F90_C_LIB_TARGET}
+        ${HDF5_F90_SRC_SOURCE_DIR}/H5match_types.c
+        ${HDF5_F90_SRC_SOURCE_DIR}/H5f90.h
+        ${HDF5_F90_SRC_SOURCE_DIR}/H5f90i.h
+        ${HDF5_F90_SRC_SOURCE_DIR}/H5f90proto.h
+    )
+  else ()
+    clang_format (HDF5_F90_C_SRC_FORMAT
+        ${HDF5_F90_C_LIBSH_TARGET}
+        ${HDF5_F90_SRC_SOURCE_DIR}/H5match_types.c
+        ${HDF5_F90_SRC_SOURCE_DIR}/H5f90.h
+        ${HDF5_F90_SRC_SOURCE_DIR}/H5f90i.h
+        ${HDF5_F90_SRC_SOURCE_DIR}/H5f90proto.h
+    )
+  endif ()
+endif ()
 
 #-----------------------------------------------------------------------------
 # Fortran Modules
 #-----------------------------------------------------------------------------
-set (f90_F_SRCS
-    # generated files
-    ${HDF5_F90_BINARY_DIR}/H5fortran_types.f90
+set (f90_F_GEN_SOURCES
+    ${HDF5_F90_SRC_SOURCE_DIR}/H5Aff.F90
+    ${HDF5_F90_SRC_SOURCE_DIR}/H5Dff.F90
+    ${HDF5_F90_SRC_SOURCE_DIR}/H5Pff.F90
+)
+add_custom_command (TARGET H5_buildiface POST_BUILD
+    BYPRODUCTS ${HDF5_F90_BINARY_DIR}/H5_gen.F90
+    COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:H5_buildiface>
+    WORKING_DIRECTORY ${HDF5_F90_BINARY_DIR}
+    DEPENDS H5_buildiface ${f90_F_GEN_SOURCES}
+    COMMENT "Generating the H5_gen.F90 file"
+)
+if (NOT ONLY_SHARED_LIBS)
+  add_custom_command (TARGET H5_buildiface POST_BUILD
+      BYPRODUCTS ${HDF5_F90_BINARY_DIR}/static/H5_gen.F90
+      COMMAND    ${CMAKE_COMMAND}
+      ARGS       -E copy_if_different ${HDF5_F90_BINARY_DIR}/H5_gen.F90 ${HDF5_F90_BINARY_DIR}/static/H5_gen.F90
+      WORKING_DIRECTORY ${HDF5_F90_BINARY_DIR}/static
+      DEPENDS H5_buildiface ${HDF5_F90_BINARY_DIR}/H5_gen.F90
+      COMMENT "Generating the H5_gen.F90 file"
+  )
+  add_custom_target (H5gen ALL
+      DEPENDS H5_buildiface ${HDF5_F90_BINARY_DIR}/static/H5_gen.F90
+  )
+  set_source_files_properties (${HDF5_F90_BINARY_DIR}/static/H5_gen.F90 PROPERTIES GENERATED TRUE)
+endif ()
+
+if (BUILD_SHARED_LIBS)
+  add_custom_command (TARGET H5_buildiface POST_BUILD
+      BYPRODUCTS ${HDF5_F90_BINARY_DIR}/shared/H5_gen.F90
+      COMMAND    ${CMAKE_COMMAND}
+      ARGS       -E copy_if_different ${HDF5_F90_BINARY_DIR}/H5_gen.F90 ${HDF5_F90_BINARY_DIR}/shared/H5_gen.F90
+      WORKING_DIRECTORY ${HDF5_F90_BINARY_DIR}/shared
+      DEPENDS ${HDF5_F90_BINARY_DIR}/H5_gen.F90
+      COMMENT "Generating the H5_gen.F90 shared file"
+  )
+  add_custom_target (H5genSH ALL
+      DEPENDS H5_buildiface ${HDF5_F90_BINARY_DIR}/shared/H5_gen.F90
+  )
+  set_source_files_properties (${HDF5_F90_BINARY_DIR}/shared/H5_gen.F90 PROPERTIES GENERATED TRUE)
+endif ()
 
+set (f90_F_BASE_SOURCES
     # normal distribution
-    ${HDF5_F90_SRC_SOURCE_DIR}/H5f90global.f90
-    ${HDF5_F90_SRC_SOURCE_DIR}/H5_ff${F_STATUS}.f90
-    ${HDF5_F90_SRC_SOURCE_DIR}/H5_ff.f90
-    ${HDF5_F90_SRC_SOURCE_DIR}/H5Aff.f90
-    ${HDF5_F90_SRC_SOURCE_DIR}/H5Dff.f90
-    ${HDF5_F90_SRC_SOURCE_DIR}/H5Eff.f90
-    ${HDF5_F90_SRC_SOURCE_DIR}/H5Fff.f90
-    ${HDF5_F90_SRC_SOURCE_DIR}/H5Gff.f90
-    ${HDF5_F90_SRC_SOURCE_DIR}/H5Iff.f90
-    ${HDF5_F90_SRC_SOURCE_DIR}/H5Lff.f90
-    ${HDF5_F90_SRC_SOURCE_DIR}/H5Off.f90
-    ${HDF5_F90_SRC_SOURCE_DIR}/H5Pff.f90
-    ${HDF5_F90_SRC_SOURCE_DIR}/H5Rff.f90
-    ${HDF5_F90_SRC_SOURCE_DIR}/H5Sff.f90
-    ${HDF5_F90_SRC_SOURCE_DIR}/H5Tff.f90
-    ${HDF5_F90_SRC_SOURCE_DIR}/H5Zff.f90
-    ${HDF5_F90_SRC_SOURCE_DIR}/H5Aff${F_STATUS}.f90
-    ${HDF5_F90_SRC_SOURCE_DIR}/H5Dff${F_STATUS}.f90
-    ${HDF5_F90_SRC_SOURCE_DIR}/H5Eff${F_STATUS}.f90
-    ${HDF5_F90_SRC_SOURCE_DIR}/H5Fff${F_STATUS}.f90
-    ${HDF5_F90_SRC_SOURCE_DIR}/H5Lff${F_STATUS}.f90
-    ${HDF5_F90_SRC_SOURCE_DIR}/H5Off${F_STATUS}.f90
-    ${HDF5_F90_SRC_SOURCE_DIR}/H5Pff${F_STATUS}.f90
-    ${HDF5_F90_SRC_SOURCE_DIR}/H5Rff${F_STATUS}.f90
-    ${HDF5_F90_SRC_SOURCE_DIR}/H5Tff${F_STATUS}.f90
-    ${HDF5_F90_SRC_SOURCE_DIR}/H5_DBLE_Interface${F_DBLE}.f90
+    ${HDF5_F90_SRC_SOURCE_DIR}/H5f90global.F90
+    ${HDF5_F90_SRC_SOURCE_DIR}/H5fortkit.F90
+    ${HDF5_F90_SRC_SOURCE_DIR}/H5_ff.F90
+    ${HDF5_F90_SRC_SOURCE_DIR}/H5Aff.F90
+    ${HDF5_F90_SRC_SOURCE_DIR}/H5Dff.F90
+    ${HDF5_F90_SRC_SOURCE_DIR}/H5Eff.F90
+    ${HDF5_F90_SRC_SOURCE_DIR}/H5Fff.F90
+    ${HDF5_F90_SRC_SOURCE_DIR}/H5Gff.F90
+    ${HDF5_F90_SRC_SOURCE_DIR}/H5Iff.F90
+    ${HDF5_F90_SRC_SOURCE_DIR}/H5Lff.F90
+    ${HDF5_F90_SRC_SOURCE_DIR}/H5Off.F90
+    ${HDF5_F90_SRC_SOURCE_DIR}/H5Pff.F90
+    ${HDF5_F90_SRC_SOURCE_DIR}/H5Rff.F90
+    ${HDF5_F90_SRC_SOURCE_DIR}/H5Sff.F90
+    ${HDF5_F90_SRC_SOURCE_DIR}/H5Tff.F90
+    ${HDF5_F90_SRC_SOURCE_DIR}/H5VLff.F90
+    ${HDF5_F90_SRC_SOURCE_DIR}/H5Zff.F90
 )
 
-#-----------------------------------------------------------------------------
-# Add H5FDMPIO if parallel
-#-----------------------------------------------------------------------------
-if (H5_HAVE_PARALLEL AND MPI_Fortran_FOUND)
-  set (f90_F_SRCS
-    ${f90_F_SRCS}
-    ${HDF5_F90_SRC_SOURCE_DIR}/HDF5mpio.f90
-    ${HDF5_F90_SRC_SOURCE_DIR}/H5FDmpioff.f90
+if (NOT ONLY_SHARED_LIBS)
+  set (f90_F_SOURCES
+      # generated file
+      ${HDF5_F90_BINARY_DIR}/static/H5fortran_types.F90
+
+      ${f90_F_BASE_SOURCES}
+
+      # generated file
+      ${HDF5_F90_BINARY_DIR}/static/H5_gen.F90
+
+      # normal distribution
+      ${HDF5_F90_SRC_SOURCE_DIR}/HDF5.F90
   )
-else (H5_HAVE_PARALLEL AND MPI_Fortran_FOUND)
-  set (f90_F_SRCS
-    ${f90_F_SRCS}
-    ${HDF5_F90_SRC_SOURCE_DIR}/HDF5.f90
+endif ()
+if (BUILD_SHARED_LIBS)
+  set (f90_F_SOURCES_SHARED
+      # generated file
+      ${HDF5_F90_BINARY_DIR}/shared/H5fortran_types.F90
+
+      ${f90_F_BASE_SOURCES}
+
+     # generated file
+      ${HDF5_F90_BINARY_DIR}/shared/H5_gen.F90
+
+      # normal distribution
+      ${HDF5_F90_SRC_SOURCE_DIR}/HDF5.F90
   )
-endif (H5_HAVE_PARALLEL AND MPI_Fortran_FOUND)
-set_source_files_properties (${f90_F_SRCS} PROPERTIES LANGUAGE Fortran)
+endif ()
 
 #-----------------------------------------------------------------------------
 # Add Main fortran library
 #-----------------------------------------------------------------------------
-add_library (${HDF5_F90_LIB_TARGET} ${LIB_TYPE} ${f90_F_SRCS})
-set (SHARED_LINK_FLAGS " ")
-if (WIN32)
-  if (BUILD_SHARED_LIBS)
-    set_property (TARGET ${HDF5_F90_LIB_TARGET}
-      APPEND PROPERTY COMPILE_DEFINITIONS
-        BUILD_HDF5_DLL
-    )
-    if (MSVC)
-      set (SHARED_LINK_FLAGS "/DLL /DEF:${HDF5_F90_SRC_BINARY_DIR}/hdf5_fortrandll.def")
-    endif (MSVC)
-  endif (BUILD_SHARED_LIBS)
-  set_property (TARGET ${HDF5_F90_LIB_TARGET}
-      APPEND PROPERTY COMPILE_DEFINITIONS
-        HDF5F90_WINDOWS
-  )
-endif (WIN32)
-TARGET_FORTRAN_PROPERTIES (${HDF5_F90_LIB_TARGET} ${LIB_TYPE} " " ${SHARED_LINK_FLAGS})
-target_link_libraries (${HDF5_F90_LIB_TARGET} ${HDF5_F90_C_LIB_TARGET} ${HDF5_LIB_TARGET})
-if (H5_HAVE_PARALLEL AND MPI_Fortran_FOUND)
-  target_link_libraries (${HDF5_F90_LIB_TARGET} ${MPI_Fortran_LIBRARIES})
-endif (H5_HAVE_PARALLEL AND MPI_Fortran_FOUND)
-set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_F90_LIB_TARGET}")
-H5_SET_LIB_OPTIONS (${HDF5_F90_LIB_TARGET} ${HDF5_F90_LIB_NAME} ${LIB_TYPE})
-set_target_properties (${HDF5_F90_LIB_TARGET} PROPERTIES
-    FOLDER libraries/fortran
-    LINKER_LANGUAGE Fortran
-    INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
-    Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}
-)
+if (NOT ONLY_SHARED_LIBS)
+  add_library (${HDF5_F90_LIB_TARGET} STATIC ${f90_F_SOURCES})
+  target_include_directories (${HDF5_F90_LIB_TARGET}
+      PRIVATE "${HDF5_F90_SRC_SOURCE_DIR};${CMAKE_Fortran_MODULE_DIRECTORY}/static;${HDF5_F90_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_Fortran_INCLUDE_DIRS}>"
+      INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${HDF5_INSTALL_MODULE_DIR}/static>"
+  )
+  target_compile_options(${HDF5_F90_LIB_TARGET} PRIVATE "${HDF5_CMAKE_Fortran_FLAGS}")
+  target_compile_definitions(${HDF5_F90_LIB_TARGET}
+      PRIVATE
+          $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:HDF5F90_WINDOWS>
+          $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_COMPILE_FLAGS}>
+  )
+  target_link_libraries (${HDF5_F90_LIB_TARGET}
+      PUBLIC ${HDF5_F90_C_LIB_TARGET}
+      PRIVATE
+          ${LINK_Fortran_LIBS}
+          $<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_Fortran_LIBRARIES}>
+  )
+#  set_property(TARGET ${HDF5_F90_LIB_TARGET} APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"-SUBSYSTEM:CONSOLE">)
+#  set_property(TARGET ${HDF5_F90_LIB_TARGET} APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_LINK_FLAGS}>)
+  if(MSVC)
+    set_property(TARGET ${HDF5_F90_LIB_TARGET} PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE ${WIN_LINK_FLAGS}")
+  endif()
+  set_target_properties (${HDF5_F90_LIB_TARGET} PROPERTIES
+      FOLDER libraries/fortran
+      LINKER_LANGUAGE Fortran
+      Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/static
+  )
+  H5_SET_LIB_OPTIONS (${HDF5_F90_LIB_TARGET} ${HDF5_F90_LIB_NAME} STATIC 0)
+  set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_F90_LIB_TARGET}")
+  set (install_targets ${install_targets} ${HDF5_F90_LIB_TARGET})
+  add_dependencies(${HDF5_F90_LIB_TARGET} H5gen)
+endif ()
+
+if (BUILD_SHARED_LIBS)
+  add_library (${HDF5_F90_LIBSH_TARGET} SHARED ${f90_F_SOURCES_SHARED})
+  target_include_directories (${HDF5_F90_LIBSH_TARGET}
+      PRIVATE "${HDF5_F90_SRC_SOURCE_DIR};${CMAKE_Fortran_MODULE_DIRECTORY}/shared;${HDF5_F90_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_Fortran_INCLUDE_DIRS}>"
+      INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${HDF5_INSTALL_MODULE_DIR}/shared>"
+  )
+  target_compile_options(${HDF5_F90_LIBSH_TARGET} PRIVATE "${HDF5_CMAKE_Fortran_FLAGS}")
+  target_compile_definitions(${HDF5_F90_LIBSH_TARGET}
+      PUBLIC "H5_BUILT_AS_DYNAMIC_LIB"
+      PRIVATE
+          $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:BUILD_HDF5_DLL;HDF5F90_WINDOWS>
+          $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_COMPILE_FLAGS}>
+  )
+  target_link_libraries (${HDF5_F90_LIBSH_TARGET}
+      PUBLIC ${HDF5_F90_C_LIBSH_TARGET}
+      PRIVATE ${LINK_Fortran_LIBS} $<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_Fortran_LIBRARIES}>
+  )
+#  set_property(TARGET ${HDF5_F90_LIBSH_TARGET} APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"-SUBSYSTEM:CONSOLE">)
+#  set_property(TARGET ${HDF5_F90_LIBSH_TARGET} APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_LINK_FLAGS}>)
+#  set_property(TARGET ${HDF5_F90_LIBSH_TARGET} APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"-DLL">)
+#  set_property(TARGET ${HDF5_F90_LIBSH_TARGET} APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"-DEF:${HDF5_F90_SRC_BINARY_DIR}/hdf5_fortrandll.def">)
+  if(MSVC)
+    set_property(TARGET ${HDF5_F90_LIBSH_TARGET} PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE ${WIN_LINK_FLAGS} /DLL /DEF:${HDF5_F90_SRC_BINARY_DIR}/hdf5_fortrandll.def")
+  endif()
+  set_target_properties (${HDF5_F90_LIBSH_TARGET} PROPERTIES
+      FOLDER libraries/fortran
+      LINKER_LANGUAGE Fortran
+      Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/shared
+  )
+  set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_F90_LIBSH_TARGET}")
+  H5_SET_LIB_OPTIONS (${HDF5_F90_LIBSH_TARGET} ${HDF5_F90_LIB_NAME} SHARED "F")
+  set (install_targets ${install_targets} ${HDF5_F90_LIBSH_TARGET})
+  add_dependencies(${HDF5_F90_LIBSH_TARGET} H5genSH)
+endif ()
 
 #-----------------------------------------------------------------------------
 # Add file(s) to CMake Install
 #-----------------------------------------------------------------------------
 install (
-    FILES 
-        ${HDF5_F90_SRC_SOURCE_DIR}/H5f90.h 
-        ${HDF5_F90_SRC_SOURCE_DIR}/H5f90i.h 
-        ${HDF5_F90_SRC_SOURCE_DIR}/H5f90proto.h 
-        ${HDF5_F90_BINARY_DIR}/H5f90i_gen.h
-        ${HDF5_F90_BINARY_DIR}/H5fortran_types.f90
-    DESTINATION 
-        ${HDF5_INSTALL_INCLUDE_DIR}
-    COMPONENT 
-        fortheaders
-)
-
-if (WIN32)
-  set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/\${BUILD_TYPE})
-else (WIN32)
-  set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY})
-endif (WIN32)
-
-set (mod_files
-    ${MOD_BUILD_DIR}/h5fortran_types.mod
-    ${MOD_BUILD_DIR}/hdf5.mod
-    ${MOD_BUILD_DIR}/h5global.mod
-    ${MOD_BUILD_DIR}/h5a.mod
-    ${MOD_BUILD_DIR}/h5d.mod
-    ${MOD_BUILD_DIR}/h5e.mod
-    ${MOD_BUILD_DIR}/h5f.mod
-    ${MOD_BUILD_DIR}/h5g.mod
-    ${MOD_BUILD_DIR}/h5i.mod
-    ${MOD_BUILD_DIR}/h5l.mod
-    ${MOD_BUILD_DIR}/h5lib.mod
-    ${MOD_BUILD_DIR}/h5o.mod
-    ${MOD_BUILD_DIR}/h5p.mod
-    ${MOD_BUILD_DIR}/h5r.mod
-    ${MOD_BUILD_DIR}/h5s.mod
-    ${MOD_BUILD_DIR}/h5t.mod
-    ${MOD_BUILD_DIR}/h5z.mod
-    ${MOD_BUILD_DIR}/h5a_provisional.mod
-    ${MOD_BUILD_DIR}/h5d_provisional.mod
-    ${MOD_BUILD_DIR}/h5e_provisional.mod
-    ${MOD_BUILD_DIR}/h5f_provisional.mod
-    ${MOD_BUILD_DIR}/h5l_provisional.mod
-    ${MOD_BUILD_DIR}/h5lib_provisional.mod
-    ${MOD_BUILD_DIR}/h5o_provisional.mod
-    ${MOD_BUILD_DIR}/h5p_provisional.mod
-    ${MOD_BUILD_DIR}/h5r_provisional.mod
-    ${MOD_BUILD_DIR}/h5t_provisional.mod
-    ${MOD_BUILD_DIR}/h5_dble_interface.mod
-)
-install (
     FILES
-        ${mod_files}
+        ${HDF5_F90_SRC_SOURCE_DIR}/H5f90.h
+        ${HDF5_F90_SRC_SOURCE_DIR}/H5f90i.h
+        ${HDF5_F90_SRC_SOURCE_DIR}/H5f90proto.h
     DESTINATION
         ${HDF5_INSTALL_INCLUDE_DIR}
     COMPONENT
         fortheaders
 )
+if (NOT ONLY_SHARED_LIBS)
+  install (
+      FILES
+          ${HDF5_F90_BINARY_DIR}/static/H5f90i_gen.h
+          ${HDF5_F90_BINARY_DIR}/static/H5fortran_types.F90
+      DESTINATION
+          ${HDF5_INSTALL_INCLUDE_DIR}
+      COMPONENT
+          fortheaders
+  )
+else ()
+  install (
+      FILES
+          ${HDF5_F90_BINARY_DIR}/shared/H5f90i_gen.h
+          ${HDF5_F90_BINARY_DIR}/shared/H5fortran_types.F90
+      DESTINATION
+          ${HDF5_INSTALL_INCLUDE_DIR}
+      COMPONENT
+          fortheaders
+  )
+endif ()
+
+if (NOT ONLY_SHARED_LIBS)
+  set (mod_files
+      ${MOD_BUILD_DIR}/h5fortran_types.mod
+      ${MOD_BUILD_DIR}/hdf5.mod
+      ${MOD_BUILD_DIR}/h5fortkit.mod
+      ${MOD_BUILD_DIR}/h5global.mod
+      ${MOD_BUILD_DIR}/h5a.mod
+      ${MOD_BUILD_DIR}/h5d.mod
+      ${MOD_BUILD_DIR}/h5e.mod
+      ${MOD_BUILD_DIR}/h5f.mod
+      ${MOD_BUILD_DIR}/h5g.mod
+      ${MOD_BUILD_DIR}/h5i.mod
+      ${MOD_BUILD_DIR}/h5l.mod
+      ${MOD_BUILD_DIR}/h5lib.mod
+      ${MOD_BUILD_DIR}/h5o.mod
+      ${MOD_BUILD_DIR}/h5p.mod
+      ${MOD_BUILD_DIR}/h5r.mod
+      ${MOD_BUILD_DIR}/h5s.mod
+      ${MOD_BUILD_DIR}/h5t.mod
+      ${MOD_BUILD_DIR}/h5vl.mod
+      ${MOD_BUILD_DIR}/h5z.mod
+      ${MOD_BUILD_DIR}/h5_gen.mod
+  )
+  install (
+      FILES
+          ${mod_files}
+      DESTINATION
+          ${HDF5_INSTALL_MODULE_DIR}/static
+      COMPONENT
+          fortheaders
+  )
+  if (HDF5_INSTALL_MOD_FORTRAN MATCHES "STATIC")
+    install (
+        FILES
+            ${mod_files}
+        DESTINATION
+            ${HDF5_INSTALL_INCLUDE_DIR}
+        COMPONENT
+            fortheaders
+    )
+  endif ()
+endif ()
+
+if (BUILD_SHARED_LIBS)
+  set (modsh_files
+      ${MODSH_BUILD_DIR}/h5fortran_types.mod
+      ${MODSH_BUILD_DIR}/hdf5.mod
+      ${MODSH_BUILD_DIR}/h5fortkit.mod
+      ${MODSH_BUILD_DIR}/h5global.mod
+      ${MODSH_BUILD_DIR}/h5a.mod
+      ${MODSH_BUILD_DIR}/h5d.mod
+      ${MODSH_BUILD_DIR}/h5e.mod
+      ${MODSH_BUILD_DIR}/h5f.mod
+      ${MODSH_BUILD_DIR}/h5g.mod
+      ${MODSH_BUILD_DIR}/h5i.mod
+      ${MODSH_BUILD_DIR}/h5l.mod
+      ${MODSH_BUILD_DIR}/h5lib.mod
+      ${MODSH_BUILD_DIR}/h5o.mod
+      ${MODSH_BUILD_DIR}/h5p.mod
+      ${MODSH_BUILD_DIR}/h5r.mod
+      ${MODSH_BUILD_DIR}/h5s.mod
+      ${MODSH_BUILD_DIR}/h5t.mod
+      ${MODSH_BUILD_DIR}/h5vl.mod
+      ${MODSH_BUILD_DIR}/h5z.mod
+      ${MODSH_BUILD_DIR}/h5_gen.mod
+  )
+  install (
+      FILES
+          ${modsh_files}
+      DESTINATION
+          ${HDF5_INSTALL_MODULE_DIR}/shared
+      COMPONENT
+          fortheaders
+  )
+  if (HDF5_INSTALL_MOD_FORTRAN MATCHES "SHARED")
+    install (
+        FILES
+            ${modsh_files}
+        DESTINATION
+            ${HDF5_INSTALL_INCLUDE_DIR}
+        COMPONENT
+            fortheaders
+    )
+  endif ()
+endif ()
 
 #-----------------------------------------------------------------------------
 # Add Target(s) to CMake Install for import into other projects
 #-----------------------------------------------------------------------------
 if (HDF5_EXPORTED_TARGETS)
   if (BUILD_SHARED_LIBS)
-    INSTALL_TARGET_PDB (${HDF5_F90_C_LIB_TARGET} ${HDF5_INSTALL_BIN_DIR} fortlibraries)
-    #INSTALL_TARGET_PDB (${HDF5_F90_LIB_TARGET} ${HDF5_INSTALL_BIN_DIR} fortlibraries)
-  endif (BUILD_SHARED_LIBS)
+    INSTALL_TARGET_PDB (${HDF5_F90_C_LIBSH_TARGET} ${HDF5_INSTALL_BIN_DIR} fortlibraries)
+    #INSTALL_TARGET_PDB (${HDF5_F90_LIBSH_TARGET} ${HDF5_INSTALL_BIN_DIR} fortlibraries)
+  endif ()
+  if (NOT ONLY_SHARED_LIBS)
+    INSTALL_TARGET_PDB (${HDF5_F90_C_LIB_TARGET} ${HDF5_INSTALL_LIB_DIR} fortlibraries)
+    #INSTALL_TARGET_PDB (${HDF5_F90_LIB_TARGET} ${HDF5_INSTALL_LIB_DIR} fortlibraries)
+  endif ()
 
   install (
       TARGETS
-          ${HDF5_F90_C_LIB_TARGET}
-          ${HDF5_F90_LIB_TARGET}
+          ${install_targets}
       EXPORT
           ${HDF5_EXPORTED_TARGETS}
       LIBRARY DESTINATION ${HDF5_INSTALL_LIB_DIR} COMPONENT fortlibraries
       ARCHIVE DESTINATION ${HDF5_INSTALL_LIB_DIR} COMPONENT fortlibraries
       RUNTIME DESTINATION ${HDF5_INSTALL_BIN_DIR} COMPONENT fortlibraries
+      FRAMEWORK DESTINATION ${HDF5_INSTALL_FWRK_DIR} COMPONENT fortlibraries
+      INCLUDES DESTINATION include
   )
-endif (HDF5_EXPORTED_TARGETS)
+endif ()
+
+#-----------------------------------------------------------------------------
+# Create pkgconfig files
+#-----------------------------------------------------------------------------
+set (_PKG_CONFIG_PREFIX ${CMAKE_INSTALL_PREFIX})
+set (_PKG_CONFIG_EXEC_PREFIX \${prefix})
+set (_PKG_CONFIG_LIBDIR \${exec_prefix}/${HDF5_INSTALL_LIB_DIR})
+set (_PKG_CONFIG_INCLUDEDIR \${prefix}/${HDF5_INSTALL_INCLUDE_DIR})
+set (_PKG_CONFIG_MODULEDIR \${prefix}/${HDF5_INSTALL_MODULE_DIR})
+set (_PKG_CONFIG_LIBNAME "${HDF5_F90_LIB_CORENAME}")
+set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}")
+
+set (_PKG_CONFIG_LIBS_PRIVATE)
+
+if (NOT ONLY_SHARED_LIBS)
+  set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_F90_LIB_CORENAME}")
+endif ()
+if (BUILD_SHARED_LIBS)
+  set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_F90_LIB_CORENAME}")
+endif ()
+
+set (_PKG_CONFIG_REQUIRES "${HDF5_LIB_CORENAME} = ${HDF5_PACKAGE_VERSION}")
+set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_LIB_CORENAME} = ${HDF5_PACKAGE_VERSION}")
+
+configure_file (
+    ${HDF_CONFIG_DIR}/libhdf5.fpc.in
+    ${HDF5_BINARY_DIR}/CMakeFiles/${HDF5_F90_LIB_CORENAME}.pc
+    @ONLY
+)
+install (
+    FILES ${HDF5_BINARY_DIR}/CMakeFiles/${HDF5_F90_LIB_CORENAME}.pc
+    DESTINATION ${HDF5_INSTALL_LIB_DIR}/pkgconfig
+    COMPONENT fortlibraries
+)
+
+if (NOT WIN32 AND NOT MINGW)
+  if (HDF5_ENABLE_PARALLEL AND MPI_Fortran_FOUND)
+    set (_PKG_CONFIG_COMPILER ${MPI_Fortran_COMPILER})
+  else ()
+    set (_PKG_CONFIG_COMPILER ${CMAKE_Fortran_COMPILER})
+  endif ()
+  configure_file (
+      ${HDF_RESOURCES_DIR}/libh5cc.in
+      ${HDF5_BINARY_DIR}/CMakeFiles/h5fc
+      @ONLY
+  )
+  install (
+      FILES ${HDF5_BINARY_DIR}/CMakeFiles/h5fc
+      DESTINATION ${HDF5_INSTALL_BIN_DIR}
+      PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+      COMPONENT fortlibraries
+  )
+  if (HDF5_ENABLE_PARALLEL AND MPI_Fortran_FOUND)
+    configure_file (
+        ${HDF_RESOURCES_DIR}/libh5cc.in
+        ${HDF5_BINARY_DIR}/CMakeFiles/h5pfc
+        @ONLY
+    )
+    install (
+        FILES ${HDF5_BINARY_DIR}/CMakeFiles/h5pfc
+        DESTINATION ${HDF5_INSTALL_BIN_DIR}
+        PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+        COMPONENT fortlibraries
+    )
+  endif ()
+endif ()
diff --git a/fortran/src/H5Af.c b/fortran/src/H5Af.c
index 240fbc3..6e14d0f 100644
--- a/fortran/src/H5Af.c
+++ b/fortran/src/H5Af.c
@@ -1,1606 +1,570 @@
 /****h* H5Af/H5Af
  * PURPOSE
- *   This file contains C stubs for H5A Fortran APIs
+ *  This file contains C stubs for H5A Fortran APIs
  *
  * COPYRIGHT
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  ******
-*/
+ */
 
 #include "H5f90.h"
 #include "H5Eprivate.h"
 
 /****if* H5Af/h5acreate_c
  * NAME
- *        h5acreate_c
+ *  h5acreate_c
  * PURPOSE
- *     Call H5Acreate2 to create an attribute
+ *  Call H5Acreate2 to create an attribute
  * INPUTS
- *      obj_id - object identifier
- *              name - name of the attribute
- *              namelen - name length
- *              type_id - datatype identifier
- *              space_id - dataspace identifier
- *              crt_pr  - identifier of creation property list
+ *  obj_id - object identifier
+ *  name - name of the attribute
+ *  namelen - name length
+ *  type_id - datatype identifier
+ *  space_id - dataspace identifier
+ *  crt_pr  - identifier of creation property list
  * OUTPUTS
- *     attr_id - attribute identifier
+ *  attr_id - attribute identifier
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Thursday, August 12, 1999
+ *  Thursday, August 12, 1999
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5acreate_c(hid_t_f *obj_id, _fcd name, size_t_f *namelen, hid_t_f *type_id,
-    hid_t_f *space_id, hid_t_f *crt_prp, hid_t_f *aapl, hid_t_f *attr_id)
+h5acreate_c(hid_t_f *obj_id, _fcd name, size_t_f *namelen, hid_t_f *type_id, hid_t_f *space_id,
+            hid_t_f *crt_prp, hid_t_f *aapl, hid_t_f *attr_id)
 /*******/
 {
-    char *c_name = NULL;        /* Buffer to hold C string */
-    int_f ret_value = 0;        /* Return value */
+    char *c_name    = NULL; /* Buffer to hold C string */
+    int_f ret_value = 0;    /* Return value */
 
-     /*
-      * Convert FORTRAN name to C name
-      */
-    if(NULL == (c_name = HD5f2cstring(name, (size_t)*namelen)))
-        HGOTO_DONE(FAIL);
-
-     /*
-      * Call H5Acreate2 function.
-      */
-    if((*attr_id = (hid_t_f)H5Acreate2((hid_t)*obj_id, c_name, (hid_t)*type_id, (hid_t)*space_id, (hid_t)*crt_prp, (hid_t)*aapl)) < 0)
+    /*
+     * Convert FORTRAN name to C name
+     */
+    if (NULL == (c_name = HD5f2cstring(name, (size_t)*namelen)))
         HGOTO_DONE(FAIL);
 
-done:
-    if(c_name)
-        HDfree(c_name);
-    return ret_value;
-}
-
-/****if* H5Af/h5aopen_name_c
- * NAME
- *        h5aopen_name_c
- * PURPOSE
- *     Call H5Aopen to open an attribute
- * INPUTS
- *      obj_id - object identifier
- *              name - name of the attribute
- *              namelen - name length
- * OUTPUTS
- *     attr_id - dataset identifier
- * RETURNS
- *     0 on success, -1 on failure
- * AUTHOR
- *  Elena Pourmal
- *              Thursday, August 12, 1999
- * HISTORY
- *
- * SOURCE
-*/
-int_f
-nh5aopen_name_c (hid_t_f *obj_id, _fcd name, size_t_f *namelen, hid_t_f *attr_id)
-/*******/
-{
-    char *c_name = NULL;          /* Buffer to hold C string */
-    int_f ret_value = 0;          /* Return value */
-
-     /*
-      * Convert FORTRAN name to C name
-      */
-     if((c_name = HD5f2cstring(name, (size_t)*namelen)) == NULL)
+    /*
+     * Call H5Acreate2 function.
+     */
+    if ((*attr_id = (hid_t_f)H5Acreate2((hid_t)*obj_id, c_name, (hid_t)*type_id, (hid_t)*space_id,
+                                        (hid_t)*crt_prp, (hid_t)*aapl)) < 0)
         HGOTO_DONE(FAIL);
 
-     /*
-      * Call H5Aopen function.
-      */
-     if((*attr_id = (hid_t_f)H5Aopen((hid_t)*obj_id, c_name, H5P_DEFAULT)) < 0)
-         HGOTO_DONE(FAIL);
-
 done:
-    if(c_name)
+    if (c_name)
         HDfree(c_name);
     return ret_value;
 }
 
-/****if* H5Af/h5awritec_c
- * NAME
- *        h5awritec_c
- * PURPOSE
- *     Call h5awrite_c to write a character  attribute
- * INPUTS
- *      attr_id - dataset identifier
- *              mem_type_id - memory datatype identifier
- *              buf      - character data buffer
- *              dims     - array to store dimensions sizes of buf; used only
- *                         by Fortran routine.
- * RETURNS
- *     0 on success, -1 on failure
- * AUTHOR
- *  Elena Pourmal
- *              Thursday , August 12, 1999
- * HISTORY
- * dims paramete added.
- *                April 4, 2001
- * SOURCE
-*/
-int_f
-nh5awritec_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return nh5awrite_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
-}
-int_f
-nh5awritec_s_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return nh5awrite_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
-}
-
-int_f
-nh5awritec_1_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return nh5awrite_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
-}
-
-int_f
-nh5awritec_2_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return nh5awrite_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
-}
-
-int_f
-nh5awritec_3_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return nh5awrite_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
-}
-
-int_f
-nh5awritec_4_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return nh5awrite_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
-}
-
-int_f
-nh5awritec_5_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return nh5awrite_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
-}
-
-int_f
-nh5awritec_6_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return nh5awrite_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
-}
-
-int_f
-nh5awritec_7_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return nh5awrite_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
-}
-
-
-
-/****if* H5Af/h5awrite_c
- * NAME
- *        h5awrite_c
- * PURPOSE
- *     Call H5Awrite to write a attribute
- * INPUTS
- *      attr_id - attribute identifier
- *              mem_type_id - memory datatype identifier
- *              buf      - data buffer
- *              dims     - array to store dimensions sizes of buf; used only
- *                         by Fortran routine.
- * RETURNS
- *     0 on success, -1 on failure
- * AUTHOR
- *  Elena Pourmal
- *              Thursday, August 12, 1999
- * HISTORY
- * dims parameter added
- *                                           April 4, 2001
- *                Added nh5awrite_integer(real,double)_s,1-7 functions to eliminate
- *                complains about wrong parameters types in h5awrite_c function
- *                called by Fortran routines.
- *                                           October 9, 2006 EIP
- * SOURCE
-*/
-int_f
-nh5awrite_integer_s_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return nh5awrite_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-nh5awrite_integer_1_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return nh5awrite_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-nh5awrite_integer_2_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return nh5awrite_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-nh5awrite_integer_3_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return nh5awrite_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-nh5awrite_integer_4_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return nh5awrite_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-nh5awrite_integer_5_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return nh5awrite_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-nh5awrite_integer_6_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return nh5awrite_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-nh5awrite_integer_7_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return nh5awrite_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-nh5awrite_real_s_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return nh5awrite_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-nh5awrite_real_1_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return nh5awrite_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-nh5awrite_real_2_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return nh5awrite_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-nh5awrite_real_3_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return nh5awrite_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-nh5awrite_real_4_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return nh5awrite_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-nh5awrite_real_5_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return nh5awrite_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-nh5awrite_real_6_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return nh5awrite_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-nh5awrite_real_7_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return nh5awrite_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-nh5awrite_double_s_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return nh5awrite_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-nh5awrite_double_1_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return nh5awrite_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-nh5awrite_double_2_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return nh5awrite_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-nh5awrite_double_3_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return nh5awrite_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-nh5awrite_double_4_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return nh5awrite_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-nh5awrite_double_5_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return nh5awrite_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-nh5awrite_double_6_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return nh5awrite_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-nh5awrite_double_7_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return nh5awrite_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-nh5awrite_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
-/******/
-{
-    int_f ret_value=0;          /* Return value */
-
-     /*
-      * Call H5Awrite function.
-      */
-     if (H5Awrite((hid_t)*attr_id, (hid_t)*mem_type_id, buf) < 0)
-        HGOTO_DONE(FAIL);
-
-done:
-     return ret_value;
-}
-
-
-/****if* H5Af/h5areadc_c
- * NAME
- *        h5areadc_c
- * PURPOSE
- *     Call h5aread_c to read character  attribute
- * INPUTS
- *      dset_id - dataset identifier
- *              mem_type_id - memory datatype identifier
- *              dims     - array to store dimensions sizes of buf; used only
- *                         by Fortran routine.
- * OUTPUTS
- *     buf      - character data buffer
- * RETURNS
- *     0 on success, -1 on failure
- * AUTHOR
- *  Elena Pourmal
- *              Thursday, August 12, 1999
- * HISTORY
- * dims parameter added.
- *                April 4, 2001
- *                Added nh5areadc_s,1-7 functions to eliminate
- *                complains about wrong parameters types in h5awrite_c function
- *                called by Fortran routines.
- *                                           October 9, 2006 EIP
- * SOURCE
-*/
-int_f
-nh5areadc_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return nh5aread_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
-}
-int_f
-nh5areadc_s_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return nh5aread_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
-}
-
-int_f
-nh5areadc_1_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return nh5aread_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
-}
-
-int_f
-nh5areadc_2_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return nh5aread_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
-}
-
-int_f
-nh5areadc_3_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return nh5aread_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
-}
-
-int_f
-nh5areadc_4_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return nh5aread_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
-}
-
-int_f
-nh5areadc_5_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return nh5aread_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
-}
-
-int_f
-nh5areadc_6_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return nh5aread_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
-}
-int_f
-nh5areadc_7_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return nh5aread_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
-}
-
-
-
-/****if* H5Af/h5aread_c
- * NAME
- *        h5aread_c
- * PURPOSE
- *     Call H5Aread to read an attribute
- * INPUTS
- *      dset_id - dataset identifier
- *              mem_type_id - memory datatype identifier
- *              dims     - array to store dimensions sizes of buf; used only
- *                         by Fortran routine.
- * OUTPUTS
- *     buf      - data buffer
- * RETURNS
- *     0 on success, -1 on failure
- * AUTHOR
- *  Elena Pourmal
- *              Thursday, August 12, 1999
- * HISTORY
- * dims paramete added.
- *                April 4, 2001
- *                Added nh5aread_integer(real,double)_s,1-7 functions to eliminate
- *                complains about wrong parameters types in h5awrite_c function
- *                called by Fortran routines.
- *                                           October 9, 2006 EIP
- * SOURCE
-*/
-int_f
-nh5aread_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-    int_f ret_value=0;          /* Return value */
-
-     /*
-      * Call H5Aread function.
-      */
-     if (H5Aread((hid_t)*attr_id, (hid_t)*mem_type_id, buf) < 0)
-         HGOTO_DONE(FAIL);
-
-done:
-     return ret_value;
-}
-
-int_f
-nh5aread_integer_s_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return nh5aread_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-nh5aread_integer_1_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return nh5aread_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-nh5aread_integer_2_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return nh5aread_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-nh5aread_integer_3_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return nh5aread_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-nh5aread_integer_4_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return nh5aread_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-nh5aread_integer_5_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return nh5aread_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-nh5aread_integer_6_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return nh5aread_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-nh5aread_integer_7_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return nh5aread_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-nh5aread_real_s_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return nh5aread_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-nh5aread_real_1_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return nh5aread_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-nh5aread_real_2_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return nh5aread_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-nh5aread_real_3_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return nh5aread_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-nh5aread_real_4_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return nh5aread_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-nh5aread_real_5_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return nh5aread_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-nh5aread_real_6_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return nh5aread_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-nh5aread_real_7_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return nh5aread_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-nh5aread_double_s_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return nh5aread_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-nh5aread_double_1_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return nh5aread_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-nh5aread_double_2_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return nh5aread_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-nh5aread_double_3_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return nh5aread_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-nh5aread_double_4_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return nh5aread_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-nh5aread_double_5_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return nh5aread_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-nh5aread_double_6_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return nh5aread_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-nh5aread_double_7_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return nh5aread_c(attr_id, mem_type_id, buf, dims);
-}
-
-
-/****if* H5Af/h5aclose_c
- * NAME
- *        h5aclose_c
- * PURPOSE
- *     Call H5Aclose to close an attribute
- * INPUTS
- *      attr_id - identifier of an attribute to be closed
- * RETURNS
- *     0 on success, -1 on failure
- * AUTHOR
- *  Elena Pourmal
- *              Thursday, August 12, 1999
- * HISTORY
- *
- * SOURCE
-*/
-
-int_f
-nh5aclose_c ( hid_t_f *attr_id )
-/******/
-{
-    int_f ret_value=0;          /* Return value */
-
-    if (H5Aclose((hid_t)*attr_id) < 0)
-        HGOTO_DONE(FAIL);
-
-done:
-    return ret_value;
-}
-
 /****if* H5Af/h5adelete_c
  * NAME
- *        h5adelete_c
+ *  h5adelete_c
  * PURPOSE
- *     Call H5Adelete to delete an attribute
+ *  Call H5Adelete to delete an attribute
  * INPUTS
- *      obj_id - object identifier
- *              name - name of the attribute
- *              namelen - name length
+ *  obj_id - object identifier
+ *  name - name of the attribute
+ *  namelen - name length
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Thursday, August 12, 1999
+ *  Thursday, August 12, 1999
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5adelete_c (hid_t_f *obj_id, _fcd name, size_t_f *namelen)
+h5adelete_c(hid_t_f *obj_id, _fcd name, size_t_f *namelen)
 /******/
 {
-    char *c_name = NULL;        /* Buffer to hold C string */
-    int_f ret_value = 0;        /* Return value */
+    char *c_name    = NULL; /* Buffer to hold C string */
+    int_f ret_value = 0;    /* Return value */
 
-     /*
-      * Convert FORTRAN name to C name
-      */
-     if((c_name = HD5f2cstring(name, (size_t)*namelen)) == NULL)
+    /*
+     * Convert FORTRAN name to C name
+     */
+    if ((c_name = HD5f2cstring(name, (size_t)*namelen)) == NULL)
         HGOTO_DONE(FAIL);
 
-     /*
-      * Call H5Adelete function.
-      */
-     if(H5Adelete((hid_t)*obj_id, c_name) < 0)
-         HGOTO_DONE(FAIL);
+    /*
+     * Call H5Adelete function.
+     */
+    if (H5Adelete((hid_t)*obj_id, c_name) < 0)
+        HGOTO_DONE(FAIL);
 
 done:
-    if(c_name)
+    if (c_name)
         HDfree(c_name);
 
     return ret_value;
 }
 
-
-/****if* H5Af/h5aopen_idx_c
- * NAME
- *        h5aopen_idx_c
- * PURPOSE
- *     Call H5Aopen_by_idx to open an attribute
- * INPUTS
- *      obj_id - object identifier
- *              idx    - attribute index ( zero based)
- * OUTPUTS
- *     attr_id - attribute identifier
- * RETURNS
- *     0 on success, -1 on failure
- * AUTHOR
- *  Elena Pourmal
- *              Thursday, August 12, 1999
- * HISTORY
- *
- * SOURCE
-*/
-int_f
-nh5aopen_idx_c (hid_t_f *obj_id, int_f *idx, hid_t_f *attr_id)
-/******/
-{
-    int_f ret_value = 0;          /* Return value */
-
-     /*
-      * Call H5Aopen_by_idx function.
-      */
-     if((*attr_id = (hid_t_f)H5Aopen_by_idx((hid_t)*obj_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)*idx, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-        HGOTO_DONE(FAIL);
-
-done:
-     return ret_value;
-}
-
-
-/****if* H5Af/h5aget_space_c
- * NAME
- *        h5aget_space_c
- * PURPOSE
- *     Call H5Aget_space to get attribute's dataspace
- * INPUTS
- *      attr_id - attribute identifier
- * OUTPUTS
- *     space_id - dataspace identifier
- * RETURNS
- *     0 on success, -1 on failure
- * AUTHOR
- *  Elena Pourmal
- *              Thursday, August 12, 1999
- * HISTORY
- *
- * SOURCE
-*/
-int_f
-nh5aget_space_c (hid_t_f *attr_id, hid_t_f *space_id)
-/******/
-{
-    int_f ret_value=0;          /* Return value */
-
-     /*
-      * Call H5Aget_space function.
-      */
-     if ((*space_id = (hid_t_f)H5Aget_space((hid_t)*attr_id)) < 0)
-         HGOTO_DONE(FAIL);
-
-done:
-     return ret_value;
-}
-
-/****if* H5Af/h5aget_type_c
- * NAME
- *        h5aget_type_c
- * PURPOSE
- *     Call H5Aget_space to get attribute's datatype
- * INPUTS
- *      attr_id - attribute identifier
- * OUTPUTS
- *     type_id - datatype identifier
- * RETURNS
- *     0 on success, -1 on failure
- * AUTHOR
- *  Elena Pourmal
- *              Thursday, August 12, 1999
- * HISTORY
- *
- * SOURCE
-*/
-int_f
-nh5aget_type_c (hid_t_f *attr_id, hid_t_f *type_id)
-/******/
-{
-    int_f ret_value=0;          /* Return value */
-
-     /*
-      * Call H5Aget_type function.
-      */
-     if ((*type_id = (hid_t_f)H5Aget_type((hid_t)*attr_id)) < 0)
-         HGOTO_DONE(FAIL);
-
-done:
-     return ret_value;
-}
-
 /****if* H5Af/h5aget_num_attrs_c
  * NAME
- *        h5aget_num_attrs_c
+ *  h5aget_num_attrs_c
  * PURPOSE
- *     Call H5Oget_info to determine number of
- *              attributes of an object
+ *  Call H5Oget_info to determine number of
+ *  attributes of an object
  * INPUTS
- *      obj_id - object identifier
- *              attr_num - number of attributes
+ *  obj_id - object identifier
+ *  attr_num - number of attributes
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Thursday, August 12, 1999
+ *  Thursday, August 12, 1999
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5aget_num_attrs_c (hid_t_f *obj_id, int_f *attr_num)
+h5aget_num_attrs_c(hid_t_f *obj_id, int_f *attr_num)
 /******/
 {
-    H5O_info_t oinfo;           /* Object info */
-    int_f ret_value = 0;        /* Return value */
+    H5O_info2_t oinfo;         /* Object info */
+    int_f       ret_value = 0; /* Return value */
 
     /*
      * Call H5Oget_info function.
      */
-    if(H5Oget_info((hid_t)*obj_id, &oinfo) < 0)
+    if (H5Oget_info3((hid_t)*obj_id, &oinfo, H5O_INFO_NUM_ATTRS) < 0)
         HGOTO_DONE(FAIL);
 
     /* Set number of attributes */
     *attr_num = (int_f)oinfo.num_attrs;
 
 done:
-     return ret_value;
+    return ret_value;
 }
 
 /****if* H5Af/h5aget_name_c
  * NAME
- *        h5aget_name_c
+ *  h5aget_name_c
  * PURPOSE
- *     Call H5Aget_name to get attribute's name
+ *  Call H5Aget_name to get attribute's name
  * INPUTS
- *      attr_id - attribute identifier
- *              bufsize - size of the buffer
+ *  attr_id - attribute identifier
+ *  bufsize - size of the buffer
  * OUTPUTS
- *     buf - buffer to hold the name
+ *  buf - buffer to hold the name
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Thursday, August 12, 1999
+ *  Thursday, August 12, 1999
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5aget_name_c(hid_t_f *attr_id, size_t_f *bufsize, _fcd buf)
+h5aget_name_c(hid_t_f *attr_id, size_t_f *bufsize, _fcd buf)
 /******/
 {
-  size_t c_bufsize;
-  char *c_buf=NULL;           /* Buffer to hold C string */
-  int_f ret_value=0;          /* Return value */
-
-  c_bufsize = (size_t)*bufsize+1;
-
-  /*
-   * Allocate buffer to hold name of an attribute
-   */
-  if(NULL == (c_buf = (char *)HDmalloc(c_bufsize)))
-    HGOTO_DONE(FAIL);
-
-  /*
-   * Call H5Aget_name function
-   */
-  if ((ret_value = (int_f)H5Aget_name((hid_t)*attr_id, c_bufsize, c_buf)) < 0)
-    HGOTO_DONE(FAIL);
-
-  /*
-   * Convert C name to FORTRAN and place it in the given buffer
-   */
-  HD5packFstring(c_buf, _fcdtocp(buf), c_bufsize-1);
-
-done:
-  if(c_buf) HDfree(c_buf);
-  return ret_value;
-}
-
-/****if* H5Af/h5aget_storage_size_c
- * NAME
- *        h5aget_storage_size_c
- * PURPOSE
- *     Call H5Aget_storage_size
- * INPUTS
- *      attr_id - identifier of an attribute
- * OUTPUTS
- *     size    - attributes storage requirements
- * RETURNS
- *     0 on success, -1 on failure
- * AUTHOR
- *  M. Scot Breitenfeld
- *              January, 2008
- * HISTORY
- * N/A
- * SOURCE
-*/
+    size_t c_bufsize;
+    char  *c_buf     = NULL; /* Buffer to hold C string */
+    int_f  ret_value = 0;    /* Return value */
 
-int_f
-nh5aget_storage_size_c ( hid_t_f *attr_id,  hsize_t_f *size)
-/******/
-{
-    int_f ret_value=0;          /* Return value */
+    c_bufsize = (size_t)*bufsize + 1;
 
-    if ((*size = (hsize_t_f)H5Aget_storage_size((hid_t)*attr_id)) < 0)
+    /*
+     * Allocate buffer to hold name of an attribute
+     */
+    if (NULL == (c_buf = (char *)HDmalloc(c_bufsize)))
         HGOTO_DONE(FAIL);
 
-done:
-    return ret_value;
-}
-
-/****if* H5Af/h5aget_create_plist_c
- * NAME
- *        h5aget_create_plist_c
- * PURPOSE
- *     Call H5Aget_create_plist
- * INPUTS
- *      attr_id - identifier of an attribute
- * OUTPUTS
- *     creation_prop_id - Identifier for the attribute’s creation property
- * RETURNS
- *     0 on success, -1 on failure
- * AUTHOR
- *  M. Scot Breitenfeld
- *              January, 2008
- * HISTORY
- * N/A
- * SOURCE
-*/
-
-int_f
-nh5aget_create_plist_c ( hid_t_f *attr_id,  hid_t_f *creation_prop_id)
-/******/
-{
-    int_f ret_value=0;          /* Return value */
-
-    if ((*creation_prop_id = (hid_t_f)H5Aget_create_plist((hid_t)*attr_id)) < 0)
+    /*
+     * Call H5Aget_name function
+     */
+    if ((ret_value = (int_f)H5Aget_name((hid_t)*attr_id, c_bufsize, c_buf)) < 0)
         HGOTO_DONE(FAIL);
 
+    /*
+     * Convert C name to FORTRAN and place it in the given buffer
+     */
+    HD5packFstring(c_buf, _fcdtocp(buf), c_bufsize - 1);
+
 done:
+    if (c_buf)
+        HDfree(c_buf);
     return ret_value;
 }
 
 /****if* H5Af/h5arename_by_name_c
  * NAME
- *      h5arename_by_name_c
+ *  h5arename_by_name_c
  * PURPOSE
- *   Calls H5Arename_by_name
+ *  Calls H5Arename_by_name
  * INPUTS
- *    loc_id        - Object identifier
- *            obj_name      - Name of object, relative to location,
- *                             whose attribute is to be renamed
- *            obj_name_len      - Object name length
- *            old_attr_name     - Prior attribute name
- *            old_attr_name_len - Prior attribute name length
- *            new_attr_name     - New attribute name
- *            new_attr_name_len - New attribute name length
- *            lapl_id       - Link access property list identifier
+ *  loc_id        - Object identifier
+ *  obj_name      - Name of object, relative to location,
+ *  whose attribute is to be renamed
+ *  obj_name_len      - Object name length
+ *  old_attr_name     - Prior attribute name
+ *  old_attr_name_len - Prior attribute name length
+ *  new_attr_name     - New attribute name
+ *  new_attr_name_len - New attribute name length
+ *  lapl_id       - Link access property list identifier
  * OUTPUTS
  *     N/A
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              January, 2008
+ *  January, 2008
  * HISTORY
  * N/A
  * SOURCE
-*/
+ */
 
 int_f
-nh5arename_by_name_c( hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
-		      _fcd old_attr_name, size_t_f *old_attr_namelen,
-		      _fcd new_attr_name, size_t_f *new_attr_namelen,
-		      hid_t_f *lapl_id )
+h5arename_by_name_c(hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fcd old_attr_name,
+                    size_t_f *old_attr_namelen, _fcd new_attr_name, size_t_f *new_attr_namelen,
+                    hid_t_f *lapl_id)
 /******/
 {
-    char *c_obj_name = NULL;          /* Buffer to hold C string */
-    char *c_old_attr_name = NULL;     /* Buffer to hold C string */
-    char *c_new_attr_name = NULL;     /* Buffer to hold C string */
-    int_f ret_value=0;          /* Return value */
-     /*
-      * Convert FORTRAN name to C name
-      */
-    if((c_obj_name = HD5f2cstring(obj_name, (size_t)*obj_namelen)) == NULL)
-      HGOTO_DONE(FAIL);
-    if((c_old_attr_name = HD5f2cstring(old_attr_name, (size_t)*old_attr_namelen)) == NULL)
-      HGOTO_DONE(FAIL);
-    if((c_new_attr_name = HD5f2cstring(new_attr_name, (size_t)*new_attr_namelen)) == NULL)
-      HGOTO_DONE(FAIL);
-
-    if(H5Arename_by_name((hid_t)*loc_id,c_obj_name,c_old_attr_name,c_new_attr_name,(hid_t)*lapl_id) < 0)
+    char *c_obj_name      = NULL; /* Buffer to hold C string */
+    char *c_old_attr_name = NULL; /* Buffer to hold C string */
+    char *c_new_attr_name = NULL; /* Buffer to hold C string */
+    int_f ret_value       = 0;    /* Return value */
+                                  /*
+                                   * Convert FORTRAN name to C name
+                                   */
+    if ((c_obj_name = HD5f2cstring(obj_name, (size_t)*obj_namelen)) == NULL)
+        HGOTO_DONE(FAIL);
+    if ((c_old_attr_name = HD5f2cstring(old_attr_name, (size_t)*old_attr_namelen)) == NULL)
+        HGOTO_DONE(FAIL);
+    if ((c_new_attr_name = HD5f2cstring(new_attr_name, (size_t)*new_attr_namelen)) == NULL)
+        HGOTO_DONE(FAIL);
+
+    if (H5Arename_by_name((hid_t)*loc_id, c_obj_name, c_old_attr_name, c_new_attr_name, (hid_t)*lapl_id) < 0)
         HGOTO_DONE(FAIL);
 
 done:
-    if(c_obj_name)
-      HDfree(c_obj_name);
-    if(c_old_attr_name)
-      HDfree(c_old_attr_name);
-    if(c_new_attr_name)
-      HDfree(c_new_attr_name);
+    if (c_obj_name)
+        HDfree(c_obj_name);
+    if (c_old_attr_name)
+        HDfree(c_old_attr_name);
+    if (c_new_attr_name)
+        HDfree(c_new_attr_name);
     return ret_value;
 }
 
 /****if* H5Af/h5aopen_c
  * NAME
- *        h5aopen_c
+ *  h5aopen_c
  * PURPOSE
- *     Call H5Aopen to open an attribute
+ *  Call H5Aopen to open an attribute
  * INPUTS
- *      obj_id       - Identifer for object to which attribute is attached
+ *  obj_id       - Identifier for object to which attribute is attached
  *	        attr_name    - Attribute access property list
- *              attr_namelen - size of attr_name
- *              aapl_id      - Link access property list
+ *  attr_namelen - size of attr_name
+ *  aapl_id      - Link access property list
  * OUTPUTS
- *     attr_id - dataset identifier
+ *  attr_id - dataset identifier
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              January, 2008
+ *  January, 2008
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5aopen_c (hid_t_f *obj_id, _fcd attr_name, size_t_f *attr_namelen, hid_t_f *aapl_id, hid_t_f *attr_id)
+h5aopen_c(hid_t_f *obj_id, _fcd attr_name, size_t_f *attr_namelen, hid_t_f *aapl_id, hid_t_f *attr_id)
 /******/
 {
-    char *c_attr_name = NULL;          /* Buffer to hold C string */
-    int_f ret_value = 0;          /* Return value */
+    char *c_attr_name = NULL; /* Buffer to hold C string */
+    int_f ret_value   = 0;    /* Return value */
 
-     /*
-      * Convert FORTRAN name to C name
-      */
-     if((c_attr_name = HD5f2cstring(attr_name, (size_t)*attr_namelen)) == NULL)
+    /*
+     * Convert FORTRAN name to C name
+     */
+    if ((c_attr_name = HD5f2cstring(attr_name, (size_t)*attr_namelen)) == NULL)
         HGOTO_DONE(FAIL);
-     /*
-      * Call H5Aopen function.
-      */
+    /*
+     * Call H5Aopen function.
+     */
 
-      if((*attr_id = (hid_t_f)H5Aopen((hid_t)*obj_id, c_attr_name, (hid_t)*aapl_id)) < 0)
-	HGOTO_DONE(FAIL);
+    if ((*attr_id = (hid_t_f)H5Aopen((hid_t)*obj_id, c_attr_name, (hid_t)*aapl_id)) < 0)
+        HGOTO_DONE(FAIL);
 
 done:
-    if(c_attr_name)
+    if (c_attr_name)
         HDfree(c_attr_name);
     return ret_value;
 }
 /****if* H5Af/h5adelete_by_name_c
  * NAME
- *        h5adelete_by_name_c
+ *  h5adelete_by_name_c
  * PURPOSE
- *     Call h5adelete_by_name to remove an attribute from a specified location
+ *  Call h5adelete_by_name to remove an attribute from a specified location
  * INPUTS
- *      loc_id - identifer for object to which attribute is attached
- *              obj_name - object identifier
- *              obj_namelen - name length
- *              attr_name - name of the attribute
- *              attr_namelen - name length
- *              lapl_id - link access property list
+ *  loc_id - identifier for object to which attribute is attached
+ *  obj_name - object identifier
+ *  obj_namelen - name length
+ *  attr_name - name of the attribute
+ *  attr_namelen - name length
+ *  lapl_id - link access property list
  *
  * OUTPUTS
  *     N/A
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              January, 2008
+ *  January, 2008
  * HISTORY
  * N/A
  * SOURCE
-*/
+ */
 int_f
-nh5adelete_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fcd attr_name, size_t_f *attr_namelen, hid_t_f *lapl_id)
+h5adelete_by_name_c(hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fcd attr_name,
+                    size_t_f *attr_namelen, hid_t_f *lapl_id)
 /******/
 {
-    char *c_obj_name = NULL;          /* Buffer to hold C string */
-    char *c_attr_name = NULL;         /* Buffer to hold C string */
-    int_f ret_value = 0;          /* Return value */
-
-     /*
-      * Convert FORTRAN name to C name
-      */
-    if((c_obj_name = HD5f2cstring(obj_name, (size_t)*obj_namelen)) == NULL)
-      HGOTO_DONE(FAIL);
-    if((c_attr_name = HD5f2cstring(attr_name, (size_t)*attr_namelen)) == NULL)
-      HGOTO_DONE(FAIL);
-
-     /*
-      * Call H5Adelete_by_name function.
-      */
-    if(H5Adelete_by_name((hid_t)*loc_id, c_obj_name, c_attr_name, (hid_t)*lapl_id) < 0)
-      HGOTO_DONE(FAIL);
+    char *c_obj_name  = NULL; /* Buffer to hold C string */
+    char *c_attr_name = NULL; /* Buffer to hold C string */
+    int_f ret_value   = 0;    /* Return value */
+
+    /*
+     * Convert FORTRAN name to C name
+     */
+    if ((c_obj_name = HD5f2cstring(obj_name, (size_t)*obj_namelen)) == NULL)
+        HGOTO_DONE(FAIL);
+    if ((c_attr_name = HD5f2cstring(attr_name, (size_t)*attr_namelen)) == NULL)
+        HGOTO_DONE(FAIL);
+
+    /*
+     * Call H5Adelete_by_name function.
+     */
+    if (H5Adelete_by_name((hid_t)*loc_id, c_obj_name, c_attr_name, (hid_t)*lapl_id) < 0)
+        HGOTO_DONE(FAIL);
 
 done:
-    if(c_attr_name)
+    if (c_attr_name)
         HDfree(c_attr_name);
-    if(c_obj_name)
+    if (c_obj_name)
         HDfree(c_obj_name);
     return ret_value;
 }
 /****if* H5Af/h5adelete_by_idx_c
  * NAME
- *        h5adelete_by_idx_c
+ *  h5adelete_by_idx_c
  * PURPOSE
- *     Call h5adelete_by_idx
+ *  Call h5adelete_by_idx
  * INPUTS
- *      loc_id - Location or object identifier; may be dataset or group
- *              obj_name - object identifier
- *              obj_namelen - name length
- *              attr_name - name of the attribute
- *              attr_namelen - name length
- *              lapl_id - link access property list
+ *  loc_id - Location or object identifier; may be dataset or group
+ *  obj_name - object identifier
+ *  obj_namelen - name length
+ *  attr_name - name of the attribute
+ *  attr_namelen - name length
+ *  lapl_id - link access property list
  *
  * OUTPUTS
  *     N/A
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              January, 2008
+ *  January, 2008
  * HISTORY
  * N/A
  * SOURCE
-*/
+ */
 int_f
-nh5adelete_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
-		     int_f *idx_type, int_f *order, hsize_t_f *n, hid_t_f *lapl_id)
+h5adelete_by_idx_c(hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, int_f *idx_type, int_f *order,
+                   hsize_t_f *n, hid_t_f *lapl_id)
 /******/
 {
-    char *c_obj_name = NULL;          /* Buffer to hold C string */
-    int_f ret_value = 0;          /* Return value */
+    char *c_obj_name = NULL; /* Buffer to hold C string */
+    int_f ret_value  = 0;    /* Return value */
 
-     /*
-      * Convert FORTRAN name to C name
-      */
-    if(NULL == (c_obj_name = HD5f2cstring(obj_name, (size_t)*obj_namelen)))
+    /*
+     * Convert FORTRAN name to C name
+     */
+    if (NULL == (c_obj_name = HD5f2cstring(obj_name, (size_t)*obj_namelen)))
         HGOTO_DONE(FAIL)
 
-     /*
-      * Call H5Adelete_by_name function.
-      */
-    if(H5Adelete_by_idx((hid_t)*loc_id, c_obj_name, (H5_index_t)*idx_type, (H5_iter_order_t)*order, (hsize_t)*n, (hid_t)*lapl_id) < 0)
+    /*
+     * Call H5Adelete_by_name function.
+     */
+    if (H5Adelete_by_idx((hid_t)*loc_id, c_obj_name, (H5_index_t)*idx_type, (H5_iter_order_t)*order,
+                         (hsize_t)*n, (hid_t)*lapl_id) < 0)
         HGOTO_DONE(FAIL)
 
 done:
-    if(c_obj_name)
+    if (c_obj_name)
         HDfree(c_obj_name);
 
     return ret_value;
 }
 /****if* H5Af/h5aget_name_by_idx_c
  * NAME
- *        h5aget_name_by_idx_c
+ *  h5aget_name_by_idx_c
  * PURPOSE
- *     Call h5aget_name_by_idx
+ *  Call h5aget_name_by_idx
  * INPUTS
  *
  *
- *        loc_id - Identifer for object to which attribute is attached
- *      obj_name - Name of object, relative to location,
- *                  from which attribute is to be removed *TEST* check NULL
- *      idx_type - Type of index; Possible values are:
+ *  loc_id - Identifier for object to which attribute is attached
+ *  obj_name - Name of object, relative to location,
+ *  from which attribute is to be removed *TEST* check NULL
+ *  idx_type - Type of index; Possible values are:
  *                         H5_INDEX_UNKNOWN   - Unknown index type
  *                         H5_INDEX_NAME      - Index on names
  *                         H5_INDEX_CRT_ORDER - Index on creation order
  *                         H5_INDEX_N	      - Number of indices defined
  *
- *      order    - Order in which to iterate over index; Possible values are:
+ *  order    - Order in which to iterate over index; Possible values are:
  *                          H5_ITER_UNKNOWN  - Unknown order
  *                          H5_ITER_INC      - Increasing order
  *                          H5_ITER_DEC      - Decreasing order
  *                          H5_ITER_NATIVE   - No particular order, whatever is fastest
  *                          H5_ITER_N	     - Number of iteration orders
  *
- *            n  - Attribute’s position in index
- *      attr_id  - Attribute identifier
- *         size  - Buffer size ! *TEST* check for 0 value *CHECK* should this return the correct value
+ *  n  - Attribute’s position in index
+ *  attr_id  - Attribute identifier
+ *  size  - Buffer size ! *TEST* check for 0 value *CHECK* should this return the correct value
  *
- *     lapl_id   - Link access property list
- *      hdferr   - Error code:
- *                            Returns attribute name size, -1 if fail
+ *  lapl_id   - Link access property list
+ *  hdferr   - Error code:
+ *  Returns attribute name size, -1 if fail
  *
  * OUTPUTS
- *     name - Attribute name
+ *  name - Attribute name
  *
  * RETURNS
- *     Size of buffer on success, -1 on failure
+ *  Size of buffer on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              January, 2008
+ *  January, 2008
  * HISTORY
  * N/A
  * SOURCE
-*/
+ */
 int_f
-nh5aget_name_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
-		       int_f *idx_type, int_f *order, hsize_t_f *n, _fcd name,
-		       size_t_f *size, hid_t_f *lapl_id)
+h5aget_name_by_idx_c(hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, int_f *idx_type, int_f *order,
+                     hsize_t_f *n, _fcd name, size_t_f *size, hid_t_f *lapl_id)
 /******/
 {
-    char *c_obj_name = NULL;          /* Buffer to hold C string */
+    char   *c_obj_name = NULL; /* Buffer to hold C string */
     ssize_t c_size;
-    size_t c_buf_size;
-    char *c_buf = NULL;
-    int_f ret_value = 0;          /* Return value */
+    size_t  c_buf_size;
+    char   *c_buf     = NULL;
+    int_f   ret_value = 0; /* Return value */
 
     /*
      * Convert FORTRAN name to C name
      */
-    if(NULL == (c_obj_name = HD5f2cstring(obj_name, (size_t)*obj_namelen)))
+    if (NULL == (c_obj_name = HD5f2cstring(obj_name, (size_t)*obj_namelen)))
         HGOTO_DONE(FAIL)
 
     /*
      * Allocate buffer to hold name of an attribute
      */
     c_buf_size = (size_t)*size + 1;
-    if(NULL == (c_buf = (char *)HDmalloc(c_buf_size)))
+    if (NULL == (c_buf = (char *)HDmalloc(c_buf_size)))
         HGOTO_DONE(FAIL)
 
-     /*
-      * Call H5Aget_name_by_idx function.
-      */
-     c_size = H5Aget_name_by_idx((hid_t)*loc_id, c_obj_name, (H5_index_t)*idx_type, (H5_iter_order_t)*order, (hsize_t)*n, c_buf, c_buf_size,(hid_t)*lapl_id);
-     if(c_size < 0)
+    /*
+     * Call H5Aget_name_by_idx function.
+     */
+    c_size = H5Aget_name_by_idx((hid_t)*loc_id, c_obj_name, (H5_index_t)*idx_type, (H5_iter_order_t)*order,
+                                (hsize_t)*n, c_buf, c_buf_size, (hid_t)*lapl_id);
+    if (c_size < 0)
         HGOTO_DONE(FAIL)
 
-
-     /*
-      * Convert C name to FORTRAN and place it in the given buffer
-      */
-     HD5packFstring(c_buf, _fcdtocp(name), c_buf_size - 1);
-     *size = (size_t_f)c_size;
+    /*
+     * Convert C name to FORTRAN and place it in the given buffer
+     */
+    HD5packFstring(c_buf, _fcdtocp(name), c_buf_size - 1);
+    *size = (size_t_f)c_size;
 
 done:
-   if(c_obj_name)
-       HDfree(c_obj_name);
-   if(c_buf)
-       HDfree(c_buf);
+    if (c_obj_name)
+        HDfree(c_obj_name);
+    if (c_buf)
+        HDfree(c_buf);
     return ret_value;
 }
 
 /****if* H5Af/h5aopen_by_idx_c
  * NAME
- *        h5aopen_by_idx_c
+ *  h5aopen_by_idx_c
  * PURPOSE
- *     Call H5Aopen_by_idx
+ *  Call H5Aopen_by_idx
  * INPUTS
- *   loc_id    - Object identifier
- *            obj_name - Name of object to which attribute is attached
- *         obj_namelen - name length
- *            idx_type - Type of index; Possible values are:
+ *  loc_id    - Object identifier
+ *  obj_name - Name of object to which attribute is attached
+ *  obj_namelen - name length
+ *  idx_type - Type of index; Possible values are:
  *                         H5_INDEX_UNKNOWN   - Unknown index type
  *                         H5_INDEX_NAME      - Index on names
  *                         H5_INDEX_CRT_ORDER - Index on creation order
  *                         H5_INDEX_N	      - Number of indices defined
  *
- *               order - Order in which to iterate over index; Possible values are:
+ *  order - Order in which to iterate over index; Possible values are:
  *                          H5_ITER_UNKNOWN  - Unknown order
  *                          H5_ITER_INC      - Increasing order
  *                          H5_ITER_DEC      - Decreasing order
  *                          H5_ITER_NATIVE   - No particular order, whatever is fastest
  *                          H5_ITER_N	     - Number of iteration orders
  *
- *                   n - Attribute’s position in index
- *             aapl_id - Attribute access property list
- *             lapl_id - Link access property list
+ *  n - Attribute’s position in index
+ *  aapl_id - Attribute access property list
+ *  lapl_id - Link access property list
  * OUTPUTS
- *    attr_id - attribute identifer
+ *  attr_id - attribute identifier
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              January, 2008
+ *  January, 2008
  * HISTORY
  * N/A
  * SOURCE
-*/
+ */
 int_f
-nh5aopen_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
-		   int_f *idx_type, int_f *order, hsize_t_f *n, hid_t_f *aapl_id, hid_t_f *lapl_id, hid_t_f *attr_id )
+h5aopen_by_idx_c(hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, int_f *idx_type, int_f *order,
+                 hsize_t_f *n, hid_t_f *aapl_id, hid_t_f *lapl_id, hid_t_f *attr_id)
 /******/
 {
-    char *c_obj_name = NULL;          /* Buffer to hold C string */
-    int_f ret_value = 0;          /* Return value */
+    char *c_obj_name = NULL; /* Buffer to hold C string */
+    int_f ret_value  = 0;    /* Return value */
 
     /*
      * Convert FORTRAN name to C name
      */
-    if(NULL == (c_obj_name = HD5f2cstring(obj_name, (size_t)*obj_namelen)))
+    if (NULL == (c_obj_name = HD5f2cstring(obj_name, (size_t)*obj_namelen)))
         HGOTO_DONE(FAIL)
 
-     /*
-      * Call H5Aopen_by_idx function.
-      */
-    if((*attr_id = (hid_t_f)H5Aopen_by_idx((hid_t)*loc_id, c_obj_name, (H5_index_t)*idx_type, (H5_iter_order_t)*order, (hsize_t)*n, (hid_t)*aapl_id, (hid_t)*lapl_id)) < 0)
+    /*
+     * Call H5Aopen_by_idx function.
+     */
+    if ((*attr_id = (hid_t_f)H5Aopen_by_idx((hid_t)*loc_id, c_obj_name, (H5_index_t)*idx_type,
+                                            (H5_iter_order_t)*order, (hsize_t)*n, (hid_t)*aapl_id,
+                                            (hid_t)*lapl_id)) < 0)
         HGOTO_DONE(FAIL)
 
 done:
-    if(c_obj_name)
+    if (c_obj_name)
         HDfree(c_obj_name);
 
     return ret_value;
@@ -1608,50 +572,49 @@ done:
 
 /****if* H5Af/h5aget_info_c
  * NAME
- *        h5aget_info_c
+ *  h5aget_info_c
  * PURPOSE
- *     Call H5Aget_info
+ *  Call H5Aget_info
  * INPUTS
- *     loc_id  - Object identifier
+ *  loc_id  - Object identifier
  * OUTPUTS
  *
- *        corder_valid - Indicates whether the the creation order data is valid for this attribute
- *              corder - Is a positive integer containing the creation order of the attribute
- *                cset - Indicates the character set used for the attribute’s name
- *           data_size - indicates the size, in the number of characters, of the attribute
+ *  corder_valid - Indicates whether the the creation order data is valid for this attribute
+ *  corder - Is a positive integer containing the creation order of the attribute
+ *  cset - Indicates the character set used for the attribute’s name
+ *  data_size - indicates the size, in the number of characters, of the attribute
  *
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              January, 2008
+ *  January, 2008
  * HISTORY
  * N/A
  * SOURCE
-*/
+ */
 int_f
-nh5aget_info_c (hid_t_f *loc_id, int_f *corder_valid, int_f *corder,
-		int_f *cset, hsize_t_f *data_size )
+h5aget_info_c(hid_t_f *loc_id, int_f *corder_valid, int_f *corder, int_f *cset, hsize_t_f *data_size)
 /******/
 {
 
-    int_f ret_value = 0;          /* Return value */
+    int_f      ret_value = 0; /* Return value */
     H5A_info_t ainfo;
 
-
-     /*
-      * Call H5Aget_info function.
-      */
-    if(H5Aget_info((hid_t)*loc_id,&ainfo) < 0)
-      HGOTO_DONE(FAIL);
+    /*
+     * Call H5Aget_info function.
+     */
+    if (H5Aget_info((hid_t)*loc_id, &ainfo) < 0)
+        HGOTO_DONE(FAIL);
 
     /* Unpack the structure */
 
     *corder_valid = 0;
-    if(ainfo.corder_valid > 0) *corder_valid = 1;
+    if (ainfo.corder_valid > 0)
+        *corder_valid = 1;
 
-    *corder = (int_f)ainfo.corder;
-    *cset = (int_f)ainfo.cset;
+    *corder    = (int_f)ainfo.corder;
+    *cset      = (int_f)ainfo.cset;
     *data_size = (hsize_t_f)ainfo.data_size;
 
 done:
@@ -1660,78 +623,77 @@ done:
 
 /****if* H5Af/h5aget_info_by_idx_c
  * NAME
- *        h5aget_info_by_idx_c
+ *  h5aget_info_by_idx_c
  * PURPOSE
- *     Call  H5Aget_info_by_idx
+ *  Call  H5Aget_info_by_idx
  * INPUTS
- *    loc_id  - Object identifier
- *            obj_name - Name of object to which attribute is attached
- *         obj_namelen - name length
- *            idx_type - Type of index; Possible values are:
+ *  loc_id  - Object identifier
+ *  obj_name - Name of object to which attribute is attached
+ *  obj_namelen - name length
+ *  idx_type - Type of index; Possible values are:
  *                         H5_INDEX_UNKNOWN   - Unknown index type
  *                         H5_INDEX_NAME      - Index on names
  *                         H5_INDEX_CRT_ORDER - Index on creation order
  *                         H5_INDEX_N	      - Number of indices defined
  *
- *               order - Order in which to iterate over index; Possible values are:
+ *  order - Order in which to iterate over index; Possible values are:
  *                          H5_ITER_UNKNOWN  - Unknown order
  *                          H5_ITER_INC      - Increasing order
  *                          H5_ITER_DEC      - Decreasing order
  *                          H5_ITER_NATIVE   - No particular order, whatever is fastest
  *                          H5_ITER_N	     - Number of iteration orders
  *
- *                   n - Attribute’s position in index
- *             lapl_id - Link access property list
+ *  n - Attribute’s position in index
+ *  lapl_id - Link access property list
  * OUTPUTS
  *
- *        corder_valid - Indicates whether the the creation order data is valid for this attribute
- *              corder - Is a positive integer containing the creation order of the attribute
- *                cset - Indicates the character set used for the attribute’s name
- *           data_size - indicates the size, in the number of characters, of the attribute
+ *  corder_valid - Indicates whether the the creation order data is valid for this attribute
+ *  corder - Is a positive integer containing the creation order of the attribute
+ *  cset - Indicates the character set used for the attribute’s name
+ *  data_size - indicates the size, in the number of characters, of the attribute
  *
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              January, 2008
+ *  January, 2008
  * HISTORY
  * N/A
  * SOURCE
-*/
+ */
 int_f
-nh5aget_info_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
-		int_f *idx_type, int_f *order, hsize_t_f *n, hid_t_f *lapl_id,
-		int_f *corder_valid, int_f *corder,
-		int_f *cset, hsize_t_f *data_size )
+h5aget_info_by_idx_c(hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, int_f *idx_type, int_f *order,
+                     hsize_t_f *n, hid_t_f *lapl_id, int_f *corder_valid, int_f *corder, int_f *cset,
+                     hsize_t_f *data_size)
 /******/
 {
-    char *c_obj_name = NULL;          /* Buffer to hold C string */
+    char      *c_obj_name = NULL; /* Buffer to hold C string */
     H5A_info_t ainfo;
-    int_f ret_value = 0;          /* Return value */
+    int_f      ret_value = 0; /* Return value */
 
     /*
      * Convert FORTRAN name to C name
      */
-    if(NULL == (c_obj_name = HD5f2cstring(obj_name, (size_t)*obj_namelen)))
+    if (NULL == (c_obj_name = HD5f2cstring(obj_name, (size_t)*obj_namelen)))
         HGOTO_DONE(FAIL)
 
-     /*
-      * Call H5Ainfo_by_idx function.
-      */
-    if(H5Aget_info_by_idx((hid_t)*loc_id, c_obj_name, (H5_index_t)*idx_type, (H5_iter_order_t)*order, (hsize_t)*n,
-            &ainfo, (hid_t)*lapl_id) < 0)
-      HGOTO_DONE(FAIL)
+    /*
+     * Call H5Ainfo_by_idx function.
+     */
+    if (H5Aget_info_by_idx((hid_t)*loc_id, c_obj_name, (H5_index_t)*idx_type, (H5_iter_order_t)*order,
+                           (hsize_t)*n, &ainfo, (hid_t)*lapl_id) < 0)
+        HGOTO_DONE(FAIL)
 
     /* Unpack the structure */
     *corder_valid = 0;
-    if(ainfo.corder_valid > 0)
+    if (ainfo.corder_valid > 0)
         *corder_valid = 1;
-    *corder = (int_f)ainfo.corder;
-    *cset = (int_f)ainfo.cset;
+    *corder    = (int_f)ainfo.corder;
+    *cset      = (int_f)ainfo.cset;
     *data_size = (hsize_t_f)ainfo.data_size;
 
 done:
-    if(c_obj_name)
+    if (c_obj_name)
         HDfree(c_obj_name);
 
     return ret_value;
@@ -1739,70 +701,69 @@ done:
 
 /****if* H5Af/h5aget_info_by_name_c
  * NAME
- *        h5aget_info_by_name_c
+ *  h5aget_info_by_name_c
  * PURPOSE
- *     Call  H5Aget_info_by_name
+ *  Call  H5Aget_info_by_name
  * INPUTS
- *      loc_id - Object identifier
- *            obj_name - Name of object to which attribute is attached
- *         obj_namelen - name length
- *           attr_name - Attribute name
- *        attr_namelen - attribute name length
- *             lapl_id - Link access property list
+ *  loc_id - Object identifier
+ *  obj_name - Name of object to which attribute is attached
+ *  obj_namelen - name length
+ *  attr_name - Attribute name
+ *  attr_namelen - attribute name length
+ *  lapl_id - Link access property list
  * OUTPUTS
  *
- *        corder_valid - Indicates whether the the creation order data is valid for this attribute
- *              corder - Is a positive integer containing the creation order of the attribute
- *                cset - Indicates the character set used for the attribute’s name
- *           data_size - indicates the size, in the number of characters, of the attribute
+ *  corder_valid - Indicates whether the the creation order data is valid for this attribute
+ *  corder - Is a positive integer containing the creation order of the attribute
+ *  cset - Indicates the character set used for the attribute’s name
+ *  data_size - indicates the size, in the number of characters, of the attribute
  *
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              January, 2008
+ *  January, 2008
  * HISTORY
  * N/A
  * SOURCE
-*/
+ */
 int_f
-nh5aget_info_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
-			_fcd attr_name, size_t_f *attr_namelen, hid_t_f *lapl_id,
-			int_f *corder_valid, int_f *corder,
-			int_f *cset, hsize_t_f *data_size )
+h5aget_info_by_name_c(hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fcd attr_name,
+                      size_t_f *attr_namelen, hid_t_f *lapl_id, int_f *corder_valid, int_f *corder,
+                      int_f *cset, hsize_t_f *data_size)
 /******/
 {
-    char *c_obj_name = NULL;          /* Buffer to hold C string */
-    char *c_attr_name = NULL;          /* Buffer to hold C string */
+    char      *c_obj_name  = NULL; /* Buffer to hold C string */
+    char      *c_attr_name = NULL; /* Buffer to hold C string */
     H5A_info_t ainfo;
-    int_f ret_value = 0;          /* Return value */
+    int_f      ret_value = 0; /* Return value */
 
     /*
      * Convert FORTRAN name to C name
      */
-    if(NULL == (c_obj_name = HD5f2cstring(obj_name, (size_t)*obj_namelen)))
+    if (NULL == (c_obj_name = HD5f2cstring(obj_name, (size_t)*obj_namelen)))
         HGOTO_DONE(FAIL)
-    if(NULL == (c_attr_name = HD5f2cstring(attr_name, (size_t)*attr_namelen)))
+    if (NULL == (c_attr_name = HD5f2cstring(attr_name, (size_t)*attr_namelen)))
         HGOTO_DONE(FAIL)
 
-     /*
-      * Call H5Ainfo_by_name function.
-      */
-    if(H5Aget_info_by_name((hid_t)*loc_id, c_obj_name, c_attr_name, &ainfo, (hid_t)*lapl_id) < 0)
+    /*
+     * Call H5Ainfo_by_name function.
+     */
+    if (H5Aget_info_by_name((hid_t)*loc_id, c_obj_name, c_attr_name, &ainfo, (hid_t)*lapl_id) < 0)
         HGOTO_DONE(FAIL)
 
     /* Unpack the structure */
     *corder_valid = 0;
-    if(ainfo.corder_valid > 0)
+    if (ainfo.corder_valid > 0)
         *corder_valid = 1;
-    *corder = (int_f)ainfo.corder;
-    *cset = (int_f)ainfo.cset;
+    *corder    = (int_f)ainfo.corder;
+    *cset      = (int_f)ainfo.cset;
     *data_size = (hsize_t_f)ainfo.data_size;
 
 done:
-    if(c_obj_name)
+    if (c_obj_name)
         HDfree(c_obj_name);
-    if(c_attr_name)
+    if (c_attr_name)
         HDfree(c_attr_name);
 
     return ret_value;
@@ -1810,273 +771,274 @@ done:
 
 /****if* H5Af/h5acreate_by_name_c
  * NAME
- *        h5acreate_by_name_c
+ *  h5acreate_by_name_c
  * PURPOSE
- *     Call h5acreate_by_name
+ *  Call h5acreate_by_name
 
  * INPUTS
  *
- *         loc_id  - Object identifier
- *        obj_name - Name of object to which attribute is attached
- *     obj_namelen - name length
- *       attr_name - Attribute name
- *    attr_namelen - attribute name length
- *         type_id - Attribute datatype identifier
- *       space_id  - Attribute dataspace identifier
- *         acpl_id - Attribute creation property list identifier (Currently not used.)
- *         aapl_id - Attribute access property list identifier (Currently not used.)
- *         lapl_id - Link access property list
+ *  loc_id  - Object identifier
+ *  obj_name - Name of object to which attribute is attached
+ *  obj_namelen - name length
+ *  attr_name - Attribute name
+ *  attr_namelen - attribute name length
+ *  type_id - Attribute datatype identifier
+ *  space_id  - Attribute dataspace identifier
+ *  acpl_id - Attribute creation property list identifier (Currently not used.)
+ *  aapl_id - Attribute access property list identifier (Currently not used.)
+ *  lapl_id - Link access property list
  *
  * OUTPUTS
  *
- *            attr - an attribute identifier
+ *  attr - an attribute identifier
  *
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              February, 2008
+ *  February, 2008
  * HISTORY
  * N/A
  * SOURCE
 */
 int_f
-nh5acreate_by_name_c(hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
-		     _fcd attr_name, size_t_f *attr_namelen,  hid_t_f *type_id,
-		     hid_t_f *space_id, hid_t_f *acpl_id, hid_t_f *aapl_id,
-		     hid_t_f *lapl_id, hid_t_f *attr_id )
+h5acreate_by_name_c(hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fcd attr_name,
+                    size_t_f *attr_namelen, hid_t_f *type_id, hid_t_f *space_id, hid_t_f *acpl_id,
+                    hid_t_f *aapl_id, hid_t_f *lapl_id, hid_t_f *attr_id)
 /******/
 {
-  char *c_obj_name = NULL;      /* Buffer to hold C string */
-  char *c_attr_name = NULL;     /* Buffer to hold C string */
-  int_f ret_value = 0;          /* Return value */
-
-  /*
-   * Convert FORTRAN name to C name
-   */
-  if((c_obj_name = HD5f2cstring(obj_name, (size_t)*obj_namelen)) == NULL)
-    HGOTO_DONE(FAIL);
-  if((c_attr_name = HD5f2cstring(attr_name, (size_t)*attr_namelen)) == NULL)
-    HGOTO_DONE(FAIL);
-
-  /*
-   * Call H5Acreate_by_name function.
-   */
-  if((*attr_id = (hid_t_f)H5Acreate_by_name((hid_t)*loc_id, c_obj_name, c_attr_name,
-					    (hid_t)*type_id, (hid_t)*space_id,(hid_t)*acpl_id,(hid_t)*aapl_id,(hid_t)*lapl_id )) < 0)
-    HGOTO_DONE(FAIL);
+    char *c_obj_name  = NULL; /* Buffer to hold C string */
+    char *c_attr_name = NULL; /* Buffer to hold C string */
+    int_f ret_value   = 0;    /* Return value */
+
+    /*
+     * Convert FORTRAN name to C name
+     */
+    if ((c_obj_name = HD5f2cstring(obj_name, (size_t)*obj_namelen)) == NULL)
+        HGOTO_DONE(FAIL);
+    if ((c_attr_name = HD5f2cstring(attr_name, (size_t)*attr_namelen)) == NULL)
+        HGOTO_DONE(FAIL);
+
+    /*
+     * Call H5Acreate_by_name function.
+     */
+    if ((*attr_id = (hid_t_f)H5Acreate_by_name((hid_t)*loc_id, c_obj_name, c_attr_name, (hid_t)*type_id,
+                                               (hid_t)*space_id, (hid_t)*acpl_id, (hid_t)*aapl_id,
+                                               (hid_t)*lapl_id)) < 0)
+        HGOTO_DONE(FAIL);
 
 done:
-  if(c_obj_name)
-    HDfree(c_obj_name);
-  if(c_attr_name)
-    HDfree(c_attr_name);
-  return ret_value;
+    if (c_obj_name)
+        HDfree(c_obj_name);
+    if (c_attr_name)
+        HDfree(c_attr_name);
+    return ret_value;
 }
 
 /****if* H5Af/h5aexists_c
  * NAME
- *        h5aexists_c
+ *  h5aexists_c
  * PURPOSE
  *     CAll h5aexists
  * INPUTS
  *
- *             obj_id - Object identifier
- *          attr_name - Attribute name
+ *  obj_id - Object identifier
+ *  attr_name - Attribute name
  * OUTPUTS
  *
- *     attr_exists_c  - returns a positive value, for TRUE, or 0 (zero), for FALSE.
+ *  attr_exists_c  - returns a positive value, for TRUE, or 0 (zero), for FALSE.
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              February, 2008
+ *  February, 2008
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5aexists_c (hid_t_f *obj_id, _fcd name, size_t_f *namelen, hid_t_f *attr_exists)
+h5aexists_c(hid_t_f *obj_id, _fcd name, size_t_f *namelen, hid_t_f *attr_exists)
 /******/
 {
-  char *c_name = NULL;          /* Buffer to hold C string */
-  int_f ret_value = 0;          /* Return value */
+    char *c_name    = NULL; /* Buffer to hold C string */
+    int_f ret_value = 0;    /* Return value */
 
-  /*
-   * Convert FORTRAN name to C name
-   */
-  if((c_name = HD5f2cstring(name, (size_t)*namelen)) == NULL)
-    HGOTO_DONE(FAIL);
+    /*
+     * Convert FORTRAN name to C name
+     */
+    if ((c_name = HD5f2cstring(name, (size_t)*namelen)) == NULL)
+        HGOTO_DONE(FAIL);
 
-  /*
-   * Call H5Aexists function.
-   */
-  if((*attr_exists = (hid_t_f)H5Aexists((hid_t)*obj_id, c_name)) < 0)
-         HGOTO_DONE(FAIL);
+    /*
+     * Call H5Aexists function.
+     */
+    if ((*attr_exists = (hid_t_f)H5Aexists((hid_t)*obj_id, c_name)) < 0)
+        HGOTO_DONE(FAIL);
 
 done:
-    if(c_name)
+    if (c_name)
         HDfree(c_name);
     return ret_value;
 }
 
 /****if* H5Af/h5aexists_by_name_c
  * NAME
- *        h5aexists_by_name_c
+ *  h5aexists_by_name_c
  * PURPOSE
  *     CAll H5Aexists_by_name
  * INPUTS
  *
- *     loc_id - Location identifier
- *   obj_name - Object name either relative to loc_id, absolute from the file’s root group, or '.' (a dot)
+ *  loc_id - Location identifier
+ *  obj_name - Object name either relative to loc_id, absolute from the file’s root group, or '.' (a dot)
  *  attr_name - Attribute name
- *    lapl_id - Link access property list identifier
+ *  lapl_id - Link access property list identifier
  * OUTPUTS
  *
- *     attr_exists_c  - returns a positive value, for TRUE, or 0 (zero), for FALSE.
+ *  attr_exists_c  - returns a positive value, for TRUE, or 0 (zero), for FALSE.
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              February, 2008
+ *  February, 2008
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5aexists_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fcd attr_name, size_t_f *attr_namelen,
-		      hid_t_f *lapl_id, int_f *attr_exists)
+h5aexists_by_name_c(hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fcd attr_name,
+                    size_t_f *attr_namelen, hid_t_f *lapl_id, int_f *attr_exists)
 /******/
 {
-  char *c_obj_name = NULL;          /* Buffer to hold object name C string */
-  char *c_attr_name = NULL;          /* Buffer to hold attribute name C string */
-  int_f ret_value = 0;          /* Return value */
-
-  /*
-   * Convert FORTRAN name to C name
-   */
-  if((c_obj_name = HD5f2cstring(obj_name, (size_t)*obj_namelen)) == NULL)
-    HGOTO_DONE(FAIL);
-  if((c_attr_name = HD5f2cstring(attr_name, (size_t)*attr_namelen)) == NULL)
-    HGOTO_DONE(FAIL);
-
-  /*
-   * Call H5Aexists_by_name function.
-   */
-  if((*attr_exists = (int_f)H5Aexists_by_name((hid_t)*loc_id, c_obj_name, c_attr_name, (hid_t)*lapl_id)) < 0)
-         HGOTO_DONE(FAIL);
+    char *c_obj_name  = NULL; /* Buffer to hold object name C string */
+    char *c_attr_name = NULL; /* Buffer to hold attribute name C string */
+    int_f ret_value   = 0;    /* Return value */
+
+    /*
+     * Convert FORTRAN name to C name
+     */
+    if ((c_obj_name = HD5f2cstring(obj_name, (size_t)*obj_namelen)) == NULL)
+        HGOTO_DONE(FAIL);
+    if ((c_attr_name = HD5f2cstring(attr_name, (size_t)*attr_namelen)) == NULL)
+        HGOTO_DONE(FAIL);
+
+    /*
+     * Call H5Aexists_by_name function.
+     */
+    if ((*attr_exists = (int_f)H5Aexists_by_name((hid_t)*loc_id, c_obj_name, c_attr_name, (hid_t)*lapl_id)) <
+        0)
+        HGOTO_DONE(FAIL);
 
 done:
-    if(c_obj_name)
+    if (c_obj_name)
         HDfree(c_obj_name);
-    if(c_attr_name)
+    if (c_attr_name)
         HDfree(c_attr_name);
     return ret_value;
 }
 
 /****if* H5Af/h5aopen_by_name_c
  * NAME
- *        h5aopen_by_name_c
+ *  h5aopen_by_name_c
  * PURPOSE
- *     Call H5Aopen_by_name
+ *  Call H5Aopen_by_name
  * INPUTS
  *
- *     loc_id - Location identifier
- *   obj_name - Object name either relative to loc_id, absolute from the file’s root group, or '.' (a dot)
+ *  loc_id - Location identifier
+ *  obj_name - Object name either relative to loc_id, absolute from the file’s root group, or '.' (a dot)
  *  attr_name - Attribute name
- *    aapl_id - Attribute access property list (Currently unused; should be passed in as H5P_DEFAULT.)
- *    lapl_id - Link access property list identifier
+ *  aapl_id - Attribute access property list (Currently unused; should be passed in as H5P_DEFAULT.)
+ *  lapl_id - Link access property list identifier
  * OUTPUTS
  *
- *     attr_id  - attribute identifier
+ *  attr_id  - attribute identifier
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              February, 2008
+ *  February, 2008
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5aopen_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fcd attr_name, size_t_f *attr_namelen,
-		    hid_t_f *aapl_id, hid_t_f *lapl_id, hid_t_f *attr_id)
+h5aopen_by_name_c(hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fcd attr_name,
+                  size_t_f *attr_namelen, hid_t_f *aapl_id, hid_t_f *lapl_id, hid_t_f *attr_id)
 /******/
 {
-  char *c_obj_name = NULL;          /* Buffer to hold object name C string */
-  char *c_attr_name = NULL;          /* Buffer to hold attribute name C string */
-  int_f ret_value = 0;          /* Return value */
-
-  /*
-   * Convert FORTRAN name to C name
-   */
-  if((c_obj_name = HD5f2cstring(obj_name, (size_t)*obj_namelen)) == NULL)
-    HGOTO_DONE(FAIL);
-  if((c_attr_name = HD5f2cstring(attr_name, (size_t)*attr_namelen)) == NULL)
-    HGOTO_DONE(FAIL);
-
-  /*
-   * Call H5Aopen function.
-   */
-  if((*attr_id = (hid_t_f)H5Aopen_by_name((hid_t)*loc_id, c_obj_name, c_attr_name, (hid_t)*aapl_id, (hid_t)*lapl_id)) < 0)
-    HGOTO_DONE(FAIL);
-
- done:
-  if(c_obj_name)
-    HDfree(c_obj_name);
-  if(c_attr_name)
-    HDfree(c_attr_name);
-  return ret_value;
+    char *c_obj_name  = NULL; /* Buffer to hold object name C string */
+    char *c_attr_name = NULL; /* Buffer to hold attribute name C string */
+    int_f ret_value   = 0;    /* Return value */
+
+    /*
+     * Convert FORTRAN name to C name
+     */
+    if ((c_obj_name = HD5f2cstring(obj_name, (size_t)*obj_namelen)) == NULL)
+        HGOTO_DONE(FAIL);
+    if ((c_attr_name = HD5f2cstring(attr_name, (size_t)*attr_namelen)) == NULL)
+        HGOTO_DONE(FAIL);
+
+    /*
+     * Call H5Aopen function.
+     */
+    if ((*attr_id = (hid_t_f)H5Aopen_by_name((hid_t)*loc_id, c_obj_name, c_attr_name, (hid_t)*aapl_id,
+                                             (hid_t)*lapl_id)) < 0)
+        HGOTO_DONE(FAIL);
+
+done:
+    if (c_obj_name)
+        HDfree(c_obj_name);
+    if (c_attr_name)
+        HDfree(c_attr_name);
+    return ret_value;
 }
 
 /****if* H5Af/h5arename_c
  * NAME
- *      h5arename_c
+ *  h5arename_c
  * PURPOSE
- *   Calls H5Arename
+ *  Calls H5Arename
  * INPUTS
- *    loc_id            - Object identifier
- *            old_attr_name     - Prior attribute name
- *            old_attr_name_len - Prior attribute name length
- *            new_attr_name     - New attribute name
- *            new_attr_name_len - New attribute name length
+ *  loc_id            - Object identifier
+ *  old_attr_name     - Prior attribute name
+ *  old_attr_name_len - Prior attribute name length
+ *  new_attr_name     - New attribute name
+ *  new_attr_name_len - New attribute name length
  * OUTPUTS
  *     N/A
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              January, 2008
+ *  January, 2008
  * HISTORY
  * N/A
  * SOURCE
-*/
+ */
 
 int_f
-nh5arename_c( hid_t_f *loc_id,
-		      _fcd old_attr_name, size_t_f *old_attr_namelen,
-		      _fcd new_attr_name, size_t_f *new_attr_namelen)
+h5arename_c(hid_t_f *loc_id, _fcd old_attr_name, size_t_f *old_attr_namelen, _fcd new_attr_name,
+            size_t_f *new_attr_namelen)
 /******/
 {
-  char *c_old_attr_name = NULL;     /* Buffer to hold C string */
-  char *c_new_attr_name = NULL;     /* Buffer to hold C string */
-  int_f ret_value=0;          /* Return value */
-  /*
-   * Convert FORTRAN name to C name
-   */
-  if((c_old_attr_name = HD5f2cstring(old_attr_name, (size_t)*old_attr_namelen)) == NULL)
-    HGOTO_DONE(FAIL);
-  if((c_new_attr_name = HD5f2cstring(new_attr_name, (size_t)*new_attr_namelen)) == NULL)
-    HGOTO_DONE(FAIL);
-
-    if(H5Arename((hid_t)*loc_id,c_old_attr_name,c_new_attr_name) < 0)
+    char *c_old_attr_name = NULL; /* Buffer to hold C string */
+    char *c_new_attr_name = NULL; /* Buffer to hold C string */
+    int_f ret_value       = 0;    /* Return value */
+    /*
+     * Convert FORTRAN name to C name
+     */
+    if ((c_old_attr_name = HD5f2cstring(old_attr_name, (size_t)*old_attr_namelen)) == NULL)
+        HGOTO_DONE(FAIL);
+    if ((c_new_attr_name = HD5f2cstring(new_attr_name, (size_t)*new_attr_namelen)) == NULL)
+        HGOTO_DONE(FAIL);
+
+    if (H5Arename((hid_t)*loc_id, c_old_attr_name, c_new_attr_name) < 0)
         HGOTO_DONE(FAIL);
 
 done:
-    if(c_old_attr_name)
-      HDfree(c_old_attr_name);
-    if(c_new_attr_name)
-      HDfree(c_new_attr_name);
+    if (c_old_attr_name)
+        HDfree(c_old_attr_name);
+    if (c_new_attr_name)
+        HDfree(c_new_attr_name);
     return ret_value;
 }
 /****if* H5Af/h5awrite_f_c
@@ -2097,19 +1059,20 @@ done:
  *
  *
  * SOURCE
-*/
+ */
 int_f
-h5awrite_f_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf)
+h5awrite_f_c(hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf)
 /******/
 {
-  int ret_value = -1;
-  herr_t ret;
+    int    ret_value = -1;
+    herr_t ret;
 
-  ret = H5Awrite( (hid_t)*attr_id, (hid_t)*mem_type_id, buf);
+    ret = H5Awrite((hid_t)*attr_id, (hid_t)*mem_type_id, buf);
 
-  if (ret < 0) return ret_value;
-  ret_value = 0;
-  return ret_value;
+    if (ret < 0)
+        return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Af/h5aread_f_c
@@ -2130,18 +1093,18 @@ h5awrite_f_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf)
  *
  *
  * SOURCE
-*/
+ */
 int_f
-h5aread_f_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf)
+h5aread_f_c(hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf)
 /******/
 {
-  int ret_value = -1;
-  herr_t ret;
+    int    ret_value = -1;
+    herr_t ret;
 
-  ret = H5Aread( (hid_t)*attr_id, (hid_t)*mem_type_id, buf);
+    ret = H5Aread((hid_t)*attr_id, (hid_t)*mem_type_id, buf);
 
-  if (ret < 0) return ret_value;
-  ret_value = 0;
-  return ret_value;
+    if (ret < 0)
+        return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
-
diff --git a/fortran/src/H5Aff.F90 b/fortran/src/H5Aff.F90
new file mode 100644
index 0000000..75c92ab
--- /dev/null
+++ b/fortran/src/H5Aff.F90
@@ -0,0 +1,1509 @@
+!> @defgroup FH5A Fortran Attribute (H5A) Interface
+!!
+!! @see H5A, C-API
+!!
+!! @see @ref H5A_UG, User Guide
+!!
+
+!> @ingroup FH5A
+!!
+!! @brief This module contains Fortran interfaces for H5A functions.
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+! NOTES
+!
+!  (A) C_LOC and character strings according to the Fortran 2003 standard:
+!
+!  15.1.2.5 C_LOC(X)
+!
+!  Argument. X shall either
+!
+!  (1) have interoperable type and type parameters and be
+!    (a) a variable that has the TARGET attribute and is interoperable,
+!    (b) an allocated allocatable variable that has the TARGET attribute
+!        and is not an array of zero size, or
+!    (c) an associated scalar pointer, or
+!  (2) be a nonpolymorphic scalar, have no length type parameters, and be
+!    (a) a nonallocatable, nonpointer variable that has the TARGET attribute,
+!    (b) an allocated allocatable variable that has the TARGET attribute, or
+!    (c) an associated pointer.
+!
+!  - When X is a character, for interoperability the standard is:
+!
+!  15.2.1 Interoperability of intrinsic types
+!
+!  ...if the type is character, interoperability also requires that the length type parameter
+!  be omitted or be specified by an initialization expression whose value is one.
+!
+!  THEREFORE compilers that have not extended the standard  require
+!
+!  CHARACTER(LEN=1), TARGET :: chr
+!  or
+!  CHARACTER, TARGET :: chr
+!
+!  (B)
+!       _____ __  __ _____   ____  _____ _______       _   _ _______
+!      |_   _|  \/  |  __ \ / __ \|  __ \__   __|/\   | \ | |__   __|
+! ****   | | | \  / | |__) | |  | | |__) | | |  /  \  |  \| |  | |    ****
+! ****   | | | |\/| |  ___/| |  | |  _  /  | | / /\ \ | . ` |  | |    ****
+! ****  _| |_| |  | | |    | |__| | | \ \  | |/ ____ \| |\  |  | |    ****
+!      |_____|_|  |_|_|     \____/|_|  \_\ |_/_/    \_\_| \_|  |_|
+!
+!  If you add a new H5A function you must add the function name to the
+!  Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
+!  This is needed for Windows based operating systems.
+!
+
+#include <H5config_f.inc>
+
+MODULE H5A
+
+  USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR, C_CHAR, C_NULL_CHAR, C_LOC, C_INT
+
+  USE H5GLOBAL
+
+  PRIVATE h5awrite_char_scalar, h5awrite_ptr
+  PRIVATE h5aread_char_scalar, h5aread_ptr
+
+#ifndef H5_DOXYGEN
+  INTERFACE h5awrite_f
+     MODULE PROCEDURE h5awrite_char_scalar
+     ! This is the preferred way to call h5awrite
+     ! by passing an address
+     MODULE PROCEDURE h5awrite_ptr
+  END INTERFACE
+
+  INTERFACE h5aread_f
+     MODULE PROCEDURE h5aread_char_scalar
+     ! This is the preferred way to call h5aread
+     ! by passing an address
+     MODULE PROCEDURE h5aread_ptr
+  END INTERFACE
+
+!  Interface for the function used to pass the C pointer of the buffer
+!  to the C H5Awrite routine
+  INTERFACE
+     INTEGER FUNCTION h5awrite_f_c(attr_id, mem_type_id, buf) BIND(C, NAME='h5awrite_f_c')
+       IMPORT :: c_ptr
+       IMPORT :: HID_T
+       IMPLICIT NONE
+       INTEGER(HID_T), INTENT(IN) :: attr_id
+       INTEGER(HID_T), INTENT(IN) :: mem_type_id
+       TYPE(C_PTR), VALUE :: buf
+     END FUNCTION h5awrite_f_c
+  END INTERFACE
+
+!  Interface for the function used to pass the C pointer of the buffer
+!  to the C H5Aread routine
+  INTERFACE
+     INTEGER FUNCTION h5aread_f_c(attr_id, mem_type_id, buf) BIND(C, NAME='h5aread_f_c')
+       IMPORT :: c_ptr
+       IMPORT :: HID_T
+       IMPLICIT NONE
+       INTEGER(HID_T), INTENT(IN) :: attr_id
+       INTEGER(HID_T), INTENT(IN) :: mem_type_id
+       TYPE(C_PTR), VALUE :: buf
+     END FUNCTION h5aread_f_c
+  END INTERFACE
+#endif
+
+CONTAINS
+
+!>
+!! \ingroup FH5A
+!!
+!! \brief Creates a dataset as an attribute of a group, dataset, or named datatype
+!!
+!! \param loc_id   Identifier of an object (group, dataset, or named datatype) attribute is attached to
+!! \param name     Attribute name
+!! \param type_id  Attribute datatype identifier
+!! \param space_id Attribute dataspace identifier
+!! \param attr_id  Attribute identifier
+!! \param hdferr   \fortran_error
+!! \param acpl_id  Attribute creation property list identifier
+!! \param aapl_id  Attribute access property list identifier
+!!
+!! See C API: @ref H5Acreate2()
+!!
+  SUBROUTINE h5acreate_f(loc_id, name, type_id, space_id, attr_id, &
+       hdferr, acpl_id, aapl_id )
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER(HID_T), INTENT(IN) :: space_id
+    INTEGER(HID_T), INTENT(OUT) :: attr_id
+    INTEGER, INTENT(OUT) :: hdferr
+
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: acpl_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: aapl_id
+
+    INTEGER(HID_T) :: acpl_id_default
+    INTEGER(HID_T) :: aapl_id_default
+    CHARACTER(LEN=LEN_TRIM(name)+1,KIND=C_CHAR) :: c_name
+    INTERFACE
+       INTEGER(HID_T) FUNCTION H5Acreate2(loc_id, name, type_id, &
+            space_id, acpl_id_default, aapl_id_default) BIND(C,NAME='H5Acreate2')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T
+         INTEGER(HID_T), INTENT(IN), VALUE :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+         INTEGER(HID_T), INTENT(IN), VALUE :: type_id
+         INTEGER(HID_T), INTENT(IN), VALUE :: space_id
+         INTEGER(HID_T), INTENT(IN), VALUE :: acpl_id_default
+         INTEGER(HID_T), INTENT(IN), VALUE :: aapl_id_default
+       END FUNCTION H5Acreate2
+    END INTERFACE
+
+    acpl_id_default = H5P_DEFAULT_F
+    aapl_id_default = H5P_DEFAULT_F
+    IF (PRESENT(acpl_id)) acpl_id_default = acpl_id
+    IF (PRESENT(aapl_id)) aapl_id_default = aapl_id
+
+    c_name = TRIM(name)//C_NULL_CHAR
+    attr_id = h5acreate2(loc_id, c_name, type_id, space_id, &
+         acpl_id_default, aapl_id_default)
+
+    hdferr = 0
+    IF(attr_id.LT.0) hdferr = -1
+
+  END SUBROUTINE h5acreate_f
+
+!>
+!! \ingroup FH5A
+!!
+!! \brief Opens an attribute specified by name.
+!!
+!! \param obj_id  Identifier of a group, dataset, or named
+!!                       datatype attribute to be attached to
+!! \param name    Attribute name
+!! \param attr_id Attribute identifier
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Aopen_name()
+!!
+  SUBROUTINE H5Aopen_name_f(obj_id, name, attr_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: obj_id
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    INTEGER(HID_T), INTENT(OUT) :: attr_id
+    INTEGER, INTENT(OUT) :: hdferr
+
+    CHARACTER(LEN=LEN_TRIM(name)+1,KIND=C_CHAR) :: c_name
+
+! H5Aopen_name is deprecated
+    INTERFACE
+       INTEGER(HID_T) FUNCTION H5Aopen(obj_id, name, aapl_id) BIND(C,NAME='H5Aopen')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T
+         INTEGER(HID_T), INTENT(IN), VALUE :: obj_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+         INTEGER(HID_T), INTENT(IN), VALUE :: aapl_id
+       END FUNCTION H5Aopen
+    END INTERFACE
+
+    c_name = TRIM(name)//C_NULL_CHAR
+    attr_id = H5Aopen(obj_id, c_name, H5P_DEFAULT_F)
+
+    hdferr = 0
+    IF(attr_id.LT.0) hdferr = -1
+
+  END SUBROUTINE H5Aopen_name_f
+!>
+!! \ingroup FH5A
+!!
+!! \brief Opens the attribute specified by its index.
+!!
+!! \param obj_id  Identifier of a group, dataset, or named datatype an attribute to be attached to
+!! \param index   Index of the attribute to open (zero-based)
+!! \param attr_id Attribute identifier
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Aopen_idx()
+!!
+  SUBROUTINE H5Aopen_idx_f(obj_id, index, attr_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: obj_id
+    INTEGER, INTENT(IN) :: index
+    INTEGER(HID_T), INTENT(OUT) :: attr_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER(HID_T) FUNCTION H5Aopen_by_idx(obj_id, index) BIND(C,NAME='H5Aopen_by_idx')
+         IMPORT :: HID_T
+         IMPORT :: C_INT
+         INTEGER(HID_T), INTENT(IN) :: obj_id
+         INTEGER(C_INT), INTENT(IN) :: index
+       END FUNCTION H5Aopen_by_idx
+    END INTERFACE
+
+    attr_id = H5Aopen_by_idx(obj_id, INT(index, C_INT))
+
+    hdferr = 0
+    IF(attr_id.LT.0) hdferr = -1
+
+  END SUBROUTINE H5Aopen_idx_f
+!>
+!! \ingroup FH5A
+!!
+!! \brief Gets a copy of the dataspace for an attribute.
+!!
+!! \param attr_id  Attribute identifier
+!! \param space_id Attribite dataspace identifier
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Aget_space()
+!!
+  SUBROUTINE H5Aget_space_f(attr_id, space_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: attr_id
+    INTEGER(HID_T), INTENT(OUT) :: space_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER(HID_T) FUNCTION H5Aget_space(attr_id) BIND(C,NAME='H5Aget_space')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN), VALUE :: attr_id
+       END FUNCTION H5Aget_space
+    END INTERFACE
+
+    space_id = H5Aget_space(attr_id)
+
+    hdferr = 0
+    IF(space_id.LT.0) hdferr = -1
+
+  END SUBROUTINE H5Aget_space_f
+!>
+!! \ingroup FH5A
+!!
+!! \brief Gets an attribute datatype.
+!!
+!! \param attr_id Attribute identifier
+!! \param type_id Attribute datatype identifier
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Aget_type()
+!!
+  SUBROUTINE H5Aget_type_f(attr_id, type_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: attr_id
+    INTEGER(HID_T), INTENT(OUT) :: type_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER(HID_T) FUNCTION H5Aget_type(attr_id) BIND(C,NAME='H5Aget_type')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN), VALUE :: attr_id
+       END FUNCTION H5Aget_type
+    END INTERFACE
+
+    type_id = H5Aget_type(attr_id)
+
+    hdferr = 0
+    IF(type_id.LT.0) hdferr = -1
+
+  END SUBROUTINE H5Aget_type_f
+!>
+!! \ingroup FH5A
+!!
+!! \brief Gets an attribute name.
+!!
+!! \param attr_id Attribute identifier
+!! \param size    Size of a buffer to read name in
+!! \param buf     Buffer to read name in
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Aget_name()
+!!
+  SUBROUTINE h5aget_name_f(attr_id, size, buf, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: attr_id
+    INTEGER(SIZE_T), INTENT(IN) :: size
+    CHARACTER(LEN=*), INTENT(INOUT) :: buf
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5aget_name_c(attr_id, size, buf) &
+            BIND(C,NAME='h5aget_name_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T
+         INTEGER(HID_T), INTENT(IN) :: attr_id
+         INTEGER(SIZE_T), INTENT(IN) :: size
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(OUT) :: buf
+       END FUNCTION h5aget_name_c
+    END INTERFACE
+
+    hdferr = h5aget_name_c(attr_id, size, buf)
+  END SUBROUTINE h5aget_name_f
+!>
+!! \ingroup FH5A
+!!
+!! \brief Gets an attribute name, by attribute index position.
+!!
+!! \param loc_id   Location of object to which attribute is attached
+!! \param obj_name Name of object to which attribute is attached, relative to location
+!! \param idx_type Type of index; Possible values are:
+!!                 \li H5_INDEX_UNKNOWN_F = -1  - Unknown index type
+!!                 \li H5_INDEX_NAME_F          - Index on names
+!!                 \li H5_INDEX_CRT_ORDER_F     - Index on creation order
+!!                 \li H5_INDEX_N_F             - Number of indices defined
+!!
+!! \param order    Index traversal order in which to iterate over index; Possible values are:
+!!                 \li H5_ITER_UNKNOWN_F   - Unknown order
+!!                 \li H5_ITER_INC_F       - Increasing order
+!!                 \li H5_ITER_DEC_F       - Decreasing order
+!!                 \li H5_ITER_NATIVE_F    - No particular order, whatever is fastest
+!!                 \li H5_ITER_N_F         - Number of iteration orders
+!! \param n        Attribute’s position in index
+!! \param name     Attribute name
+!! \param hdferr   \fortran_error
+!!
+!! \param size     Size, in bytes, of attribute name
+!! \param lapl_id  Link access property list
+!!
+!! See C API: @ref H5Aget_name_by_idx()
+!!
+  SUBROUTINE h5aget_name_by_idx_f(loc_id, obj_name, idx_type, order, &
+       n, name, hdferr, size, lapl_id)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: obj_name
+    INTEGER, INTENT(IN) :: idx_type
+                                    !    H5_INDEX_N_F            - Number of indices defined
+
+    INTEGER, INTENT(IN) :: order
+                                    !    H5_ITER_NATIVE_F    - No particular order, whatever is fastest
+                                    !    H5_ITER_N_F          - Number of iteration orders
+    INTEGER(HSIZE_T), INTENT(IN) :: n
+    CHARACTER(LEN=*), INTENT(OUT) :: name
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id
+    INTEGER(SIZE_T), OPTIONAL, INTENT(OUT) :: size
+    INTEGER(HID_T) :: lapl_id_default
+    INTEGER(SIZE_T) :: obj_namelen
+    INTEGER(SIZE_T) :: size_default
+
+    INTERFACE
+       INTEGER FUNCTION h5aget_name_by_idx_c(loc_id, obj_name, obj_namelen, idx_type, order, &
+            n, name, size_default, lapl_id_default) BIND(C,NAME='h5aget_name_by_idx_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: obj_name
+         INTEGER, INTENT(IN) :: idx_type
+         INTEGER, INTENT(IN) :: order
+         INTEGER(HSIZE_T), INTENT(IN) :: n
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(OUT) :: name
+         INTEGER(SIZE_T) :: size_default
+         INTEGER(HID_T) :: lapl_id_default
+         INTEGER(SIZE_T) :: obj_namelen
+       END FUNCTION h5aget_name_by_idx_c
+    END INTERFACE
+
+    obj_namelen = LEN(obj_name)
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+
+    size_default = LEN(name)
+
+    hdferr = h5aget_name_by_idx_c(loc_id, obj_name, obj_namelen, idx_type, order, &
+         n, name, size_default, lapl_id_default)
+
+    IF(PRESENT(size)) size = size_default
+
+
+  END SUBROUTINE h5aget_name_by_idx_f
+!>
+!! \ingroup FH5A
+!!
+!! \brief Determines the number of attributes attached to an object.
+!!
+!! \param obj_id   Object (group, dataset, or named datatype) identifier
+!! \param attr_num Number of attributes attached to the object
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Aget_num_attrs()
+!!
+  SUBROUTINE h5aget_num_attrs_f(obj_id, attr_num, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: obj_id
+    INTEGER, INTENT(OUT) :: attr_num
+    INTEGER, INTENT(OUT) :: hdferr
+
+    INTERFACE
+       INTEGER FUNCTION h5aget_num_attrs_c(obj_id, attr_num) BIND(C,name='h5aget_num_attrs_c')
+         IMPORT :: HID_T
+         INTEGER(HID_T), INTENT(IN) :: obj_id
+         INTEGER, INTENT(OUT) :: attr_num
+       END FUNCTION h5aget_num_attrs_c
+    END INTERFACE
+
+    hdferr = h5aget_num_attrs_c(obj_id, attr_num)
+  END SUBROUTINE h5aget_num_attrs_f
+
+!>
+!! \ingroup FH5A
+!!
+!! \brief Deletes an attribute of an object (group, dataset or named datatype)
+!!
+!! \param obj_id Object identifier
+!! \param name   Attribute name
+!!
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Adelete()
+!!
+  SUBROUTINE H5Adelete_f(obj_id, name, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: obj_id
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(SIZE_T) :: namelen
+
+    INTERFACE
+       INTEGER FUNCTION H5Adelete_c(obj_id, name, namelen) BIND(C,NAME='h5adelete_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T
+         INTEGER(HID_T), INTENT(IN) :: obj_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+         INTEGER(SIZE_T) :: namelen
+       END FUNCTION H5Adelete_c
+    END INTERFACE
+
+    namelen = LEN(name)
+    hdferr = H5Adelete_c(obj_id, name, namelen)
+  END SUBROUTINE H5Adelete_f
+
+!>
+!! \ingroup FH5A
+!!
+!! \brief Closes the specified attribute.
+!!
+!! \param attr_id Attribute identifier
+!! \param  hdferr \fortran_error
+!!
+!! See C API: @ref H5Aclose()
+!!
+  SUBROUTINE H5Aclose_f(attr_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: attr_id
+    INTEGER, INTENT(OUT) :: hdferr
+
+    INTERFACE
+       INTEGER FUNCTION H5Aclose(attr_id) BIND(C, NAME='H5Aclose')
+         IMPORT :: HID_T
+         INTEGER(HID_T), INTENT(IN), VALUE :: attr_id
+       END FUNCTION H5Aclose
+    END INTERFACE
+
+    hdferr = INT(H5Aclose(attr_id))
+  END SUBROUTINE H5Aclose_f
+
+!>
+!! \ingroup FH5A
+!!
+!! \brief Returns the amount of storage required for an attribute.
+!!
+!! \param attr_id Attribute identifier
+!! \param size    Attribute storage size
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Aget_storage_size()
+!!
+  SUBROUTINE H5Aget_storage_size_f(attr_id, size, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: attr_id
+    INTEGER(HSIZE_T), INTENT(OUT) :: size
+    INTEGER, INTENT(OUT) :: hdferr
+
+    INTERFACE
+       INTEGER(HSIZE_T) FUNCTION H5Aget_storage_size(attr_id) BIND(C,NAME='H5Aget_storage_size')
+         IMPORT :: HID_T, HSIZE_T
+         INTEGER(HID_T),  INTENT(IN), VALUE :: attr_id
+       END FUNCTION H5Aget_storage_size
+    END INTERFACE
+
+    size = H5Aget_storage_size(attr_id)
+
+    hdferr = 0
+    IF(size.LT.0) hdferr = -1
+
+  END SUBROUTINE H5Aget_storage_size_f
+
+!>
+!! \ingroup FH5A
+!!
+!! \brief Gets an attribute creation property list identifier
+!!
+!! \param attr_id          Identifier of the attribute
+!! \param creation_prop_id Identifier for the attribute’s creation property
+!! \param hdferr           \fortran_error
+!!
+!! See C API: @ref H5Aget_create_plist()
+!!
+  SUBROUTINE H5Aget_create_plist_f(attr_id, creation_prop_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: attr_id
+    INTEGER(HID_T), INTENT(OUT) :: creation_prop_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER(HID_T) FUNCTION H5Aget_create_plist(attr_id) BIND(C,NAME='H5Aget_create_plist')
+         IMPORT :: HID_T
+         INTEGER(HID_T), INTENT(IN), VALUE :: attr_id
+       END FUNCTION H5Aget_create_plist
+    END INTERFACE
+
+    creation_prop_id = H5Aget_create_plist(attr_id)
+
+    hdferr = 0
+    IF(creation_prop_id.LT.0) hdferr = -1
+
+  END SUBROUTINE H5Aget_create_plist_f
+
+!>
+!! \ingroup FH5A
+!!
+!! \brief Renames an attribute
+!!
+!! \param loc_id        Location or object identifier; may be dataset or group
+!! \param obj_name      Name of object, relative to location, whose attribute is to be renamed
+!! \param old_attr_name Prior attribute name
+!! \param new_attr_name New attribute name
+!! \param lapl_id       Link access property list identifier
+!! \param hdferr        \fortran_error
+!!
+!! See C API: @ref H5Arename_by_name()
+!!
+  SUBROUTINE H5Arename_by_name_f(loc_id, obj_name, old_attr_name, new_attr_name, &
+        hdferr, lapl_id)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: obj_name
+    CHARACTER(LEN=*), INTENT(IN) :: old_attr_name
+    CHARACTER(LEN=*), INTENT(IN) :: new_attr_name
+
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id
+    INTEGER(HID_T) :: lapl_id_default
+    INTEGER(SIZE_T) :: obj_namelen
+    INTEGER(SIZE_T) :: old_attr_namelen
+    INTEGER(SIZE_T) :: new_attr_namelen
+
+    INTERFACE
+       INTEGER FUNCTION H5Arename_by_name_c(loc_id, obj_name, obj_namelen, &
+            old_attr_name, old_attr_namelen, new_attr_name, new_attr_namelen, &
+            lapl_id_default) BIND(C,NAME='h5arename_by_name_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: obj_name
+         INTEGER(SIZE_T) :: obj_namelen
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: old_attr_name
+         INTEGER(SIZE_T) :: old_attr_namelen
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: new_attr_name
+         INTEGER(SIZE_T) :: new_attr_namelen
+         INTEGER(HID_T) :: lapl_id_default
+
+       END FUNCTION H5Arename_by_name_c
+    END INTERFACE
+
+    obj_namelen = LEN(obj_name)
+    old_attr_namelen = LEN(old_attr_name)
+    new_attr_namelen = LEN(new_attr_name)
+
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default=lapl_id
+
+    hdferr = H5Arename_by_name_c(loc_id, obj_name, obj_namelen, &
+         old_attr_name, old_attr_namelen, new_attr_name, new_attr_namelen, &
+         lapl_id_default)
+
+  END SUBROUTINE H5Arename_by_name_f
+
+!>
+!! \ingroup FH5A
+!!
+!! \brief Opens an attribute for an object specified by object
+!!       identifier and attribute name
+!!
+!! \param obj_id    Identifier for object to which attribute is attached
+!! \param attr_name Name of attribute to open
+!! \param attr_id   Attribute identifier
+!! \param hdferr    \fortran_error
+!! \param aapl_id   Attribute access property list
+!!
+!! See C API: @ref H5Aopen()
+!!
+  SUBROUTINE H5Aopen_f(obj_id, attr_name, attr_id, hdferr, aapl_id)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: obj_id
+    CHARACTER(LEN=*), INTENT(IN) :: attr_name
+    INTEGER(HID_T), INTENT(OUT) :: attr_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: aapl_id
+    INTEGER(HID_T) :: aapl_id_default
+
+    INTEGER(SIZE_T) :: attr_namelen
+
+    INTERFACE
+       INTEGER FUNCTION H5Aopen_c(obj_id, attr_name, attr_namelen, aapl_id_default, attr_id) &
+            BIND(C,NAME='h5aopen_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T
+         INTEGER(HID_T), INTENT(IN) :: obj_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: attr_name
+         INTEGER(HID_T) :: aapl_id_default
+         INTEGER(SIZE_T) :: attr_namelen
+         INTEGER(HID_T), INTENT(OUT) :: attr_id
+       END FUNCTION H5Aopen_c
+    END INTERFACE
+
+    attr_namelen = LEN(attr_name)
+
+    aapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(aapl_id)) aapl_id_default = aapl_id
+
+    hdferr = H5Aopen_c(obj_id, attr_name, attr_namelen, aapl_id_default, attr_id)
+
+  END SUBROUTINE H5Aopen_f
+
+!>
+!! \ingroup FH5A
+!!
+!! \brief Deletes an attribute from an object according to index order
+!!
+!! \param loc_id   Location or object identifier; may be dataset or group
+!! \param obj_name Name of object, relative to location, from which attribute is to be removed
+!! \param idx_type Type of index; Possible values are:
+!!                 \li H5_INDEX_UNKNOWN_F = -1  - Unknown index type
+!!                 \li H5_INDEX_NAME_F          - Index on names
+!!                 \li H5_INDEX_CRT_ORDER_F     - Index on creation order
+!!                 \li H5_INDEX_N_F             - Number of indices defined
+!!
+!! \param order    Order in which to iterate over index; Possible values are:
+!!                 \li H5_ITER_UNKNOWN_F   - Unknown order
+!!                 \li H5_ITER_INC_F       - Increasing order
+!!                 \li H5_ITER_DEC_F       - Decreasing order
+!!                 \li H5_ITER_NATIVE_F    - No particular order, whatever is fastest
+!!                 \li H5_ITER_N_F         - Number of iteration orders
+!!
+!! \param n        Offset within index
+!! \param hdferr   \fortran_error
+!! \param lapl_id  Link access property list
+!!
+!! See C API: @ref H5Adelete_by_idx()
+!!
+  SUBROUTINE H5Adelete_by_idx_f(loc_id, obj_name, idx_type, order, n, hdferr, lapl_id)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: obj_name
+    INTEGER, INTENT(IN) :: idx_type
+    INTEGER, INTENT(IN) :: order
+    INTEGER(HSIZE_T), INTENT(IN) :: n
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id
+    INTEGER(SIZE_T) :: obj_namelen
+    INTEGER(HID_T) :: lapl_id_default
+
+    INTERFACE
+       INTEGER FUNCTION H5Adelete_by_idx_c(loc_id, obj_name, obj_namelen, idx_type, order, n, lapl_id_default) &
+            BIND(C,NAME='h5adelete_by_idx_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: obj_name
+         INTEGER, INTENT(IN) :: idx_type
+         INTEGER, INTENT(IN) :: order
+         INTEGER(HSIZE_T), INTENT(IN) :: n
+         INTEGER(HID_T) :: lapl_id_default
+         INTEGER(SIZE_T) :: obj_namelen
+       END FUNCTION H5Adelete_by_idx_c
+    END INTERFACE
+
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+
+    obj_namelen = LEN(obj_name)
+    hdferr = H5Adelete_by_idx_c(loc_id, obj_name, obj_namelen, idx_type, order, n, lapl_id_default)
+
+  END SUBROUTINE H5Adelete_by_idx_f
+
+!>
+!! \ingroup FH5A
+!!
+!! \brief Removes an attribute from a specified location
+!!
+!! \param loc_id    Identifier for object to which attribute is attached
+!! \param obj_name  Name of attribute to open
+!! \param attr_name Attribute access property list
+!! \param lapl_id   Link access property list
+!! \param hdferr    \fortran_error
+!!
+!! See C API: @ref H5Adelete_by_name()
+!!
+  SUBROUTINE H5Adelete_by_name_f(loc_id, obj_name, attr_name, hdferr, lapl_id)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: obj_name
+    CHARACTER(LEN=*), INTENT(IN) :: attr_name
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id
+    INTEGER(SIZE_T) :: attr_namelen
+    INTEGER(SIZE_T) :: obj_namelen
+
+    INTEGER(HID_T) :: lapl_id_default
+
+    INTERFACE
+       INTEGER FUNCTION H5Adelete_by_name_c(loc_id, obj_name, obj_namelen, attr_name, attr_namelen, lapl_id_default) &
+            BIND(C,NAME='h5adelete_by_name_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: obj_name
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: attr_name
+         INTEGER(HID_T) :: lapl_id_default
+         INTEGER(SIZE_T) :: attr_namelen
+         INTEGER(SIZE_T) :: obj_namelen
+       END FUNCTION H5Adelete_by_name_c
+    END INTERFACE
+
+    obj_namelen = LEN(obj_name)
+    attr_namelen = LEN(attr_name)
+
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+
+    hdferr = H5Adelete_by_name_c(loc_id, obj_name, obj_namelen, attr_name, attr_namelen, lapl_id_default)
+
+  END SUBROUTINE H5Adelete_by_name_f
+
+!>
+!! \ingroup FH5A
+!!
+!! \brief Opens an existing attribute that is attached to an object specified by location and name.
+!!
+!! \param loc_id   Location of object to which attribute is attached.
+!! \param obj_name Name of object to which attribute is attached, relative to location.
+!! \param idx_type Type of index; Possible values are:
+!!                 \li H5_INDEX_UNKNOWN_F = -1  - Unknown index type
+!!                 \li H5_INDEX_NAME_F          - Index on names
+!!                 \li H5_INDEX_CRT_ORDER_F     - Index on creation order
+!!                 \li H5_INDEX_N_F             - Number of indices defined
+!!
+!! \param order    Order in which to iterate over index; Possible values are:
+!!                 \li H5_ITER_UNKNOWN_F   - Unknown order
+!!                 \li H5_ITER_INC_F       - Increasing order
+!!                 \li H5_ITER_DEC_F       - Decreasing order
+!!                 \li H5_ITER_NATIVE_F    - No particular order, whatever is fastest
+!!                 \li H5_ITER_N_F         - Number of iteration orders
+!! \param n        Attribute’s position in index.
+!! \param attr_id  Attribute identifier.
+!! \param hdferr   \fortran_error
+!! \param aapl_id  Attribute access property list.
+!! \param lapl_id  Link access property list.
+!!
+!! See C API: @ref H5Aopen_by_idx()
+!!
+  SUBROUTINE H5Aopen_by_idx_f(loc_id, obj_name, idx_type, order, n, attr_id, hdferr, aapl_id, lapl_id)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: obj_name
+    INTEGER, INTENT(IN) :: idx_type
+    INTEGER, INTENT(IN) :: order
+
+    INTEGER(HSIZE_T), INTENT(IN) :: n
+
+    INTEGER(HID_T), INTENT(OUT) :: attr_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: aapl_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id
+    INTEGER(SIZE_T) :: obj_namelen
+    INTEGER(HID_T) :: aapl_id_default
+    INTEGER(HID_T) :: lapl_id_default
+
+    INTERFACE
+       INTEGER FUNCTION H5Aopen_by_idx_c(loc_id, obj_name, obj_namelen, idx_type, order, n, &
+            aapl_id_default, lapl_id_default, attr_id) BIND(C,NAME='h5aopen_by_idx_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T, HSIZE_T
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: obj_name
+         INTEGER, INTENT(IN) :: idx_type
+         INTEGER, INTENT(IN) :: order
+         INTEGER(HSIZE_T), INTENT(IN) :: n
+         INTEGER(HID_T) :: aapl_id_default
+         INTEGER(HID_T) :: lapl_id_default
+         INTEGER(SIZE_T) :: obj_namelen
+         INTEGER(HID_T), INTENT(OUT) :: attr_id
+       END FUNCTION H5Aopen_by_idx_c
+    END INTERFACE
+
+    obj_namelen = LEN(obj_name)
+
+    aapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(aapl_id)) aapl_id_default = aapl_id
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+
+    hdferr = H5Aopen_by_idx_c(loc_id, obj_name, obj_namelen, idx_type, order, n, &
+         aapl_id_default, lapl_id_default, attr_id)
+
+  END SUBROUTINE H5Aopen_by_idx_f
+
+!>
+!! \ingroup FH5A
+!!
+!! \brief Retrieves attribute information, by attribute identifier.
+!!
+!! \param attr_id        Attribute identifier.
+!!                       NOTE: In C it is defined as a structure: H5A_info_t.
+!! \param f_corder_valid Indicates whether the creation order data is valid for this attribute.
+!! \param corder         Is a positive integer containing the creation order of the attribute.
+!! \param cset           Indicates the character set used for the attribute’s name.
+!! \param data_size      Indicates the size, in the number of characters, of the attribute.
+!! \param hdferr         \fortran_error
+!!
+!! See C API: @ref H5Aget_info()
+!!
+  SUBROUTINE H5Aget_info_f(attr_id, f_corder_valid, corder, cset, data_size, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: attr_id
+    LOGICAL, INTENT(OUT) :: f_corder_valid
+    INTEGER, INTENT(OUT) :: corder
+    INTEGER, INTENT(OUT) :: cset
+    INTEGER(HSIZE_T), INTENT(OUT) :: data_size
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: corder_valid
+
+    INTERFACE
+       INTEGER FUNCTION H5Aget_info_c(attr_id, corder_valid, corder, cset, data_size) BIND(C,NAME='h5aget_info_c')
+         IMPORT :: HID_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: attr_id
+
+         INTEGER, INTENT(OUT) :: corder_valid
+         INTEGER, INTENT(OUT) :: corder
+         INTEGER, INTENT(OUT) :: cset
+         INTEGER(HSIZE_T), INTENT(OUT) :: data_size
+       END FUNCTION H5Aget_info_c
+    END INTERFACE
+
+    hdferr = H5Aget_info_c(attr_id, corder_valid, corder, cset, data_size)
+
+    f_corder_valid =.FALSE.
+    IF (corder_valid .EQ. 1) f_corder_valid =.TRUE.
+
+
+  END SUBROUTINE H5Aget_info_f
+
+!>
+!! \ingroup FH5A
+!!
+!! \brief Retrieves attribute information, by attribute index position
+!!
+!! \param loc_id         Location of object to which attribute is attached
+!! \param obj_name       Name of object to which attribute is attached, relative to location
+!! \param idx_type       Type of index
+!! \param order          Index traversal order
+!! \param n              Attribute’s position in index
+!! \param f_corder_valid Indicates whether the creation order data is valid for this attribute
+!! \param corder         Is a positive integer containing the creation order of the attribute
+!! \param cset           Indicates the character set used for the attribute’s name
+!! \param data_size      Indicates the size, in the number of characters, of the attribute
+!! \param hdferr         \fortran_error
+!! \param lapl_id        Link access property list
+!!
+!! See C API: @ref H5Aget_info_by_idx()
+!!
+  SUBROUTINE H5Aget_info_by_idx_f(loc_id, obj_name, idx_type, order, n, &
+       f_corder_valid, corder, cset, data_size, hdferr, lapl_id)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: obj_name
+    INTEGER, INTENT(IN) :: idx_type
+                                              !    H5_INDEX_N_F           - Number of indices defined
+    INTEGER, INTENT(IN) :: order
+                                              !    H5_ITER_NATIVE_F   - No particular order, whatever is fastest
+
+    INTEGER(HSIZE_T), INTENT(IN) :: n
+
+
+    LOGICAL, INTENT(OUT) :: f_corder_valid
+    INTEGER, INTENT(OUT) :: corder
+    INTEGER, INTENT(OUT) :: cset
+    INTEGER(HSIZE_T), INTENT(OUT) :: data_size
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id
+    INTEGER :: corder_valid
+    INTEGER(SIZE_T)  :: obj_namelen
+    INTEGER(HID_T) :: lapl_id_default
+
+    INTERFACE
+       INTEGER FUNCTION h5aget_info_by_idx_c(loc_id, obj_name, obj_namelen, idx_type, order, n, lapl_id_default, &
+            corder_valid, corder, cset, data_size) BIND(C,NAME='h5aget_info_by_idx_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T, HSIZE_T
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: obj_name
+         INTEGER, INTENT(IN) :: idx_type
+         INTEGER, INTENT(IN) :: order
+         INTEGER(HSIZE_T), INTENT(IN) :: n
+         INTEGER(HID_T) :: lapl_id_default
+         INTEGER, INTENT(OUT) :: corder_valid
+         INTEGER, INTENT(OUT) :: corder
+         INTEGER, INTENT(OUT) :: cset
+         INTEGER(HSIZE_T), INTENT(OUT) :: data_size
+
+         INTEGER(SIZE_T)  :: obj_namelen
+       END FUNCTION H5Aget_info_by_idx_c
+    END INTERFACE
+
+    obj_namelen = LEN(obj_name)
+
+    lapl_id_default = H5P_DEFAULT_F
+    IF(present(lapl_id)) lapl_id_default = lapl_id
+
+    hdferr = H5Aget_info_by_idx_c(loc_id, obj_name, obj_namelen, idx_type, order, n, lapl_id_default, &
+            corder_valid, corder, cset, data_size)
+
+    f_corder_valid =.FALSE.
+    IF (corder_valid .EQ. 1) f_corder_valid =.TRUE.
+
+  END SUBROUTINE H5Aget_info_by_idx_f
+
+!>
+!! \ingroup FH5A
+!!
+!! \brief Retrieves attribute information, by attribute name
+!!
+!! \param loc_id         Location of object to which attribute is attached
+!! \param obj_name       Name of object to which attribute is attached, relative to location
+!! \param attr_name      Attribute name
+!! \param f_corder_valid Indicates whether the creation order data is valid for this attribute
+!! \param corder         Is a positive integer containing the creation order of the attribute
+!! \param cset           Indicates the character set used for the attribute’s name
+!! \param data_size      Indicates the size, in the number of characters, of the attribute
+!! \param hdferr         \fortran_error
+!! \param lapl_id        Link access property list
+!!
+!! See C API: @ref H5Aget_info_by_name()
+!!
+  SUBROUTINE H5Aget_info_by_name_f(loc_id, obj_name, attr_name, &
+       f_corder_valid, corder, cset, data_size, hdferr, lapl_id)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: obj_name
+    CHARACTER(LEN=*), INTENT(IN) :: attr_name
+
+
+    LOGICAL, INTENT(OUT) :: f_corder_valid
+    INTEGER, INTENT(OUT) :: corder
+    INTEGER, INTENT(OUT) :: cset
+    INTEGER(HSIZE_T), INTENT(OUT) :: data_size
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id
+    INTEGER :: corder_valid
+    INTEGER(SIZE_T)  :: obj_namelen
+    INTEGER(SIZE_T)  :: attr_namelen
+    INTEGER(HID_T) :: lapl_id_default
+
+    INTERFACE
+       INTEGER FUNCTION H5Aget_info_by_name_c(loc_id, obj_name, obj_namelen, attr_name, attr_namelen, lapl_id_default, &
+            corder_valid, corder, cset, data_size) BIND(C,NAME='h5aget_info_by_name_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: obj_name
+         INTEGER(SIZE_T), INTENT(IN) :: obj_namelen
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: attr_name
+         INTEGER(SIZE_T), INTENT(IN) :: attr_namelen
+         INTEGER(HID_T) :: lapl_id_default
+         INTEGER, INTENT(OUT) :: corder_valid
+         INTEGER, INTENT(OUT) :: corder
+         INTEGER, INTENT(OUT) :: cset
+         INTEGER(HSIZE_T), INTENT(OUT) :: data_size
+
+       END FUNCTION H5Aget_info_by_name_c
+    END INTERFACE
+
+    obj_namelen = LEN(obj_name)
+    attr_namelen = LEN(attr_name)
+
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+
+    hdferr = H5Aget_info_by_name_c(loc_id, obj_name, obj_namelen, attr_name, attr_namelen, lapl_id_default, &
+            corder_valid, corder, cset, data_size)
+
+    f_corder_valid =.FALSE.
+    IF (corder_valid .EQ. 1) f_corder_valid =.TRUE.
+
+  END SUBROUTINE H5Aget_info_by_name_f
+
+!>
+!! \ingroup FH5A
+!!
+!! \brief Creates an attribute attached to a specified object
+!!
+!! \param loc_id    Location or object identifier; may be dataset or group
+!! \param obj_name  Name, relative to loc_id, of object that attribute is to be attached to
+!! \param attr_name Attribute name
+!! \param type_id   Attribute datatype identifier
+!! \param space_id  Attribute dataspace identifier
+!! \param attr      An attribute identifier
+!! \param hdferr    \fortran_error
+!! \param acpl_id   Attribute creation property list identifier (Currently not used.)
+!! \param aapl_id   Attribute access property list identifier (Currently not used.)
+!! \param lapl_id   Link access property list
+!!
+!! See C API: @ref H5Acreate_by_name()
+!!
+  SUBROUTINE H5Acreate_by_name_f(loc_id, obj_name, attr_name, type_id, space_id, attr, hdferr, &
+       acpl_id, aapl_id, lapl_id)
+    IMPLICIT NONE
+    INTEGER(HID_T),   INTENT(IN)  :: loc_id
+    CHARACTER(LEN=*), INTENT(IN)  :: obj_name
+    CHARACTER(LEN=*), INTENT(IN)  :: attr_name
+    INTEGER(HID_T),   INTENT(IN)  :: type_id
+    INTEGER(HID_T),   INTENT(IN)  :: space_id
+    INTEGER(HID_T),   INTENT(OUT) :: attr
+    INTEGER,          INTENT(OUT) :: hdferr
+
+    INTEGER(HID_T),   INTENT(IN), OPTIONAL :: acpl_id
+    INTEGER(HID_T),   INTENT(IN), OPTIONAL :: aapl_id
+    INTEGER(HID_T),   INTENT(IN), OPTIONAL :: lapl_id
+    INTEGER(SIZE_T)  :: obj_namelen
+    INTEGER(SIZE_T)  :: attr_namelen
+
+    INTEGER(HID_T) :: acpl_id_default
+    INTEGER(HID_T) :: aapl_id_default
+    INTEGER(HID_T) :: lapl_id_default
+
+    INTERFACE
+       INTEGER FUNCTION H5Acreate_by_name_c(loc_id, obj_name, obj_namelen, attr_name, attr_namelen, &
+            type_id, space_id, acpl_id_default, aapl_id_default, lapl_id_default, attr) &
+            BIND(C,NAME='h5acreate_by_name_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: obj_name
+         INTEGER(SIZE_T), INTENT(IN) :: obj_namelen
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: attr_name
+         INTEGER(SIZE_T), INTENT(IN) :: attr_namelen
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER(HID_T), INTENT(IN) :: space_id
+         INTEGER(HID_T) :: acpl_id_default
+         INTEGER(HID_T) :: aapl_id_default
+         INTEGER(HID_T) :: lapl_id_default
+         INTEGER(HID_T), INTENT(OUT) :: attr
+
+       END FUNCTION H5Acreate_by_name_c
+    END INTERFACE
+
+    obj_namelen = LEN(obj_name)
+    attr_namelen = LEN(attr_name)
+
+    acpl_id_default = H5P_DEFAULT_F
+    aapl_id_default = H5P_DEFAULT_F
+    lapl_id_default = H5P_DEFAULT_F
+
+    IF(PRESENT(acpl_id)) acpl_id_default = acpl_id
+    IF(PRESENT(aapl_id)) aapl_id_default = aapl_id
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+
+    hdferr = H5Acreate_by_name_c(loc_id, obj_name, obj_namelen, attr_name, attr_namelen, &
+            type_id, space_id, acpl_id_default, aapl_id_default, lapl_id_default, attr)
+  END SUBROUTINE H5Acreate_by_name_f
+
+!>
+!! \ingroup FH5A
+!!
+!! \brief Determines whether an attribute with a given name exists on an object
+!!
+!! \param obj_id      Object identifier
+!! \param attr_name   Attribute name
+!! \param attr_exists Attribute exists status
+!! \param hdferr      \fortran_error
+!!
+!! See C API: @ref H5Aexists()
+!!
+  SUBROUTINE H5Aexists_f(obj_id, attr_name, attr_exists, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: obj_id
+    CHARACTER(LEN=*), INTENT(IN) :: attr_name
+    LOGICAL, INTENT(OUT) :: attr_exists
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T) :: attr_exists_c
+    INTEGER(SIZE_T) :: attr_namelen
+
+    INTERFACE
+       INTEGER FUNCTION H5Aexists_c(obj_id, attr_name, attr_namelen, attr_exists_c) BIND(C,NAME='h5aexists_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: obj_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: attr_name
+         INTEGER(SIZE_T) :: attr_namelen
+         INTEGER(HID_T) :: attr_exists_c
+       END FUNCTION H5Aexists_c
+    END INTERFACE
+
+    attr_namelen = LEN(attr_name)
+
+    hdferr = H5Aexists_c(obj_id, attr_name, attr_namelen, attr_exists_c)
+
+    attr_exists = .FALSE.
+    IF(attr_exists_c.GT.0) attr_exists = .TRUE.
+
+  END SUBROUTINE H5Aexists_f
+
+!>
+!! \ingroup FH5A
+!!
+!! \brief Determines whether an attribute with a given name exists on an object
+!!
+!! \param loc_id      Location identifier
+!! \param obj_name    Object name either relative to loc_id, absolute from the file’s root group, or &apos;. &apos;(a dot)
+!! \param attr_name   Attribute name
+!! \param attr_exists Attribute exists status
+!! \param hdferr      \fortran_error
+!! \param lapl_id     Link access property list identifier
+!!
+!! See C API: @ref H5Aexists_by_name()
+!!
+  SUBROUTINE H5Aexists_by_name_f(loc_id, obj_name, attr_name, attr_exists, hdferr, lapl_id)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: obj_name
+    CHARACTER(LEN=*), INTENT(IN) :: attr_name
+    LOGICAL, INTENT(OUT) :: attr_exists
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id
+    INTEGER :: attr_exists_c
+    INTEGER(SIZE_T)  :: obj_namelen
+    INTEGER(SIZE_T)  :: attr_namelen
+
+    INTEGER(HID_T) :: lapl_id_default
+
+    INTERFACE
+       INTEGER FUNCTION H5Aexists_by_name_c(loc_id, obj_name, obj_namelen, attr_name, attr_namelen, &
+            lapl_id_default, attr_exists_c) BIND(C,NAME='h5aexists_by_name_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: obj_name
+         INTEGER(SIZE_T), INTENT(IN) :: obj_namelen
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: attr_name
+         INTEGER(SIZE_T), INTENT(IN) :: attr_namelen
+         INTEGER(HID_T), INTENT(IN) :: lapl_id_default
+         INTEGER, INTENT(OUT) :: attr_exists_c
+       END FUNCTION H5Aexists_by_name_c
+    END INTERFACE
+
+    attr_namelen = LEN(attr_name)
+    obj_namelen = LEN(obj_name)
+
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+
+    hdferr = H5Aexists_by_name_c(loc_id, obj_name, obj_namelen, attr_name, attr_namelen, lapl_id_default, attr_exists_c)
+
+    attr_exists = .FALSE.
+    IF(attr_exists_c.GT.0) attr_exists = .TRUE.
+
+  END SUBROUTINE H5Aexists_by_name_f
+!>
+!! \ingroup FH5A
+!!
+!! \brief Opens an attribute for an object by object name and attribute name.
+!!
+!! \param loc_id    Location from which to find object to which attribute is attached
+!! \param obj_name  Object name either relative to loc_id, absolute from the file’s root group, or &apos;.&apos; (a dot)
+!! \param attr_name Attribute name
+!! \param attr_id   Attribute identifier
+!! \param hdferr    \fortran_error
+!! \param aapl_id   Attribute access property list (Currently unused; should be passed in as H5P_DEFAULT.)
+!! \param lapl_id   Link access property list identifier
+!!
+!! See C API: @ref H5Aopen_by_name()
+!!
+  SUBROUTINE H5Aopen_by_name_f(loc_id, obj_name, attr_name, attr_id, hdferr, aapl_id, lapl_id)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: obj_name
+    CHARACTER(LEN=*), INTENT(IN) :: attr_name
+    INTEGER(HID_T), INTENT(OUT) :: attr_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: aapl_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id
+    INTEGER(HID_T) :: aapl_id_default
+    INTEGER(HID_T) :: lapl_id_default
+
+    INTEGER(SIZE_T) :: obj_namelen
+    INTEGER(SIZE_T) :: attr_namelen
+
+    INTERFACE
+       INTEGER FUNCTION H5Aopen_by_name_c(loc_id, obj_name, obj_namelen, attr_name, attr_namelen, &
+            aapl_id_default, lapl_id_default, attr_id) BIND(C,NAME='h5aopen_by_name_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: obj_name
+         INTEGER(SIZE_T), INTENT(IN) :: obj_namelen
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: attr_name
+         INTEGER(SIZE_T), INTENT(IN) :: attr_namelen
+         INTEGER(HID_T) :: aapl_id_default
+         INTEGER(HID_T) :: lapl_id_default
+         INTEGER(HID_T), INTENT(OUT) :: attr_id
+       END FUNCTION H5Aopen_by_name_c
+    END INTERFACE
+
+    attr_namelen = LEN(attr_name)
+    obj_namelen = LEN(obj_name)
+
+    aapl_id_default = H5P_DEFAULT_F
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(aapl_id)) aapl_id_default = aapl_id
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+
+    hdferr = H5Aopen_by_name_c(loc_id, obj_name, obj_namelen, attr_name, attr_namelen, &
+         aapl_id_default, lapl_id_default, attr_id)
+
+  END SUBROUTINE H5Aopen_by_name_f
+
+!>
+!! \ingroup FH5A
+!!
+!! \brief Renames an attribute
+!!
+!! \param loc_id        Location or object identifier; may be dataset or group
+!! \param old_attr_name Prior attribute name
+!! \param new_attr_name New attribute name
+!! \param hdferr        \fortran_error
+!!
+!! See C API: @ref H5Arename()
+!!
+  SUBROUTINE H5Arename_f(loc_id, old_attr_name, new_attr_name, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: old_attr_name
+    CHARACTER(LEN=*), INTENT(IN) :: new_attr_name
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(SIZE_T) :: old_attr_namelen
+    INTEGER(SIZE_T) :: new_attr_namelen
+
+    INTERFACE
+       INTEGER FUNCTION H5Arename_c(loc_id, &
+            old_attr_name, old_attr_namelen, new_attr_name, new_attr_namelen) BIND(C,NAME='h5arename_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: old_attr_name
+         INTEGER(SIZE_T) :: old_attr_namelen
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: new_attr_name
+         INTEGER(SIZE_T) :: new_attr_namelen
+       END FUNCTION H5Arename_c
+    END INTERFACE
+
+    old_attr_namelen = LEN(old_attr_name)
+    new_attr_namelen = LEN(new_attr_name)
+
+    hdferr = H5Arename_c(loc_id, &
+         old_attr_name, old_attr_namelen, new_attr_name, new_attr_namelen)
+
+  END SUBROUTINE H5Arename_f
+
+#ifdef H5_DOXYGEN
+
+
+!>
+!! \ingroup FH5A
+!!
+!! \brief Writes data to an attribute.
+!!
+!! \attention  \fortran_approved
+!!
+!! \param attr_id     Identifier of an attribute to write.
+!! \param memtype_id  Identifier of the attribute datatype (in memory).
+!! \param buf	      Data to be written.
+!! \param hdferr      \fortran_error
+!!
+!! See C API: @ref H5Awrite()
+!!
+  SUBROUTINE h5awrite_f(attr_id, memtype_id, buf, hdferr)
+    INTEGER(HID_T)  , INTENT(IN)  :: attr_id
+    INTEGER(HID_T)  , INTENT(IN)  :: memtype_id
+    TYPE(C_PTR)     , INTENT(IN)  :: buf
+    INTEGER         , INTENT(OUT) :: hdferr
+  END SUBROUTINE h5awrite_f
+
+!>
+!! \ingroup FH5A
+!!
+!! \brief Writes data to an attribute.
+!!
+!! \attention  \fortran_obsolete
+!!
+!! \param attr_id     Identifier of an attribute to write.
+!! \param memtype_id  Identifier of the attribute datatype (in memory).
+!! \param buf         Data buffer; may be a scalar or an array.
+!! \param dims        Array to hold corresponding dimension sizes of data buffer buf;
+!!                    dim(k) has value of the k-th dimension of buffer buf; values are ignored if buf is a scalar.
+!! \param hdferr      \fortran_error
+!!
+!! See C API: @ref H5Awrite()
+!!
+  SUBROUTINE h5awrite_f(attr_id, memtype_id, buf, dims, hdferr)
+    INTEGER(HID_T)  , INTENT(IN)               :: attr_id
+    INTEGER(HID_T)  , INTENT(IN)               :: memtype_id
+    TYPE(TYPE)      , INTENT(IN)               :: buf
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
+    INTEGER         , INTENT(OUT)              :: hdferr
+  END SUBROUTINE h5awrite_f
+!>
+!! \ingroup FH5A
+!!
+!! \brief Reads an attribute.
+!!
+!! \attention  \fortran_approved
+!!
+!! \param attr_id     Identifier of an attribute to read.
+!! \param memtype_id  Identifier of the attribute datatype (in memory).
+!! \param buf	      Buffer for data to be read.
+!! \param hdferr      \fortran_error
+!!
+!! See C API: @ref H5Aread()
+!!
+  SUBROUTINE h5aread_f(attr_id, memtype_id, buf, hdferr)
+    INTEGER(HID_T), INTENT(IN)    :: attr_id
+    INTEGER(HID_T), INTENT(IN)    :: memtype_id
+    TYPE(C_PTR)   , INTENT(INOUT) :: buf
+    INTEGER       , INTENT(OUT)   :: hdferr
+  END SUBROUTINE h5aread_f
+
+!>
+!! \ingroup FH5A
+!!
+!! \brief Reads an attribute.
+!!
+!! \attention  \fortran_obsolete
+!!
+!! \param attr_id     Identifier of an attribute to read.
+!! \param memtype_id  Identifier of the attribute datatype (in memory).
+!! \param buf         Buffer for data to be read.
+!! \param dims        Array to hold corresponding dimension sizes of data buffer buf;
+!!                    dim(k) has value of the k-th dimension of buffer buf; values are ignored if buf is a scalar.
+!! \param hdferr      \fortran_error
+!!
+!! See C API: @ref H5Aread()
+!!
+  SUBROUTINE h5aread_f(attr_id, memtype_id, buf, dims, hdferr)
+    INTEGER(HID_T)  , INTENT(IN)               :: attr_id
+    INTEGER(HID_T)  , INTENT(IN)               :: memtype_id
+    TYPE(TYPE)      , INTENT(INOUT)            :: buf
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
+    INTEGER         , INTENT(OUT)              :: hdferr
+  END SUBROUTINE h5aread_f
+
+#else
+
+  SUBROUTINE H5Awrite_char_scalar(attr_id, memtype_id, buf, dims, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: attr_id
+    INTEGER(HID_T), INTENT(IN) :: memtype_id
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
+    CHARACTER(LEN=*), INTENT(IN) :: buf
+    INTEGER, INTENT(OUT) :: hdferr
+
+    CALL H5Awrite_char_scalar_fix(attr_id, memtype_id, buf, LEN(buf), dims, hdferr)
+
+  END SUBROUTINE H5Awrite_char_scalar
+
+  SUBROUTINE H5Awrite_char_scalar_fix(attr_id, memtype_id, buf, buf_len, dims, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: attr_id
+    INTEGER(HID_T), INTENT(IN) :: memtype_id
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
+    INTEGER, INTENT(IN)  :: buf_len
+    CHARACTER(LEN=buf_len), INTENT(IN), TARGET :: buf
+    INTEGER, INTENT(OUT) :: hdferr
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1:1))
+
+    hdferr = H5Awrite_f_c(attr_id, memtype_id, f_ptr)
+
+  END SUBROUTINE H5Awrite_char_scalar_fix
+
+  SUBROUTINE H5Awrite_ptr(attr_id, mem_type_id, buf, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: attr_id
+    INTEGER(HID_T), INTENT(IN) :: mem_type_id
+    TYPE(C_PTR), INTENT(IN), TARGET :: buf
+    INTEGER, INTENT(OUT) :: hdferr
+
+    hdferr = H5Awrite_f_c(attr_id, mem_type_id, buf)
+
+  END SUBROUTINE H5Awrite_ptr
+
+  SUBROUTINE H5Aread_char_scalar(attr_id, memtype_id, buf, dims, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: attr_id
+    INTEGER(HID_T), INTENT(IN) :: memtype_id
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
+    CHARACTER(LEN=*), INTENT(INOUT) :: buf
+    INTEGER, INTENT(OUT) :: hdferr
+
+    CALL H5Aread_char_scalar_fix(attr_id, memtype_id, buf, LEN(buf), hdferr)
+
+  END SUBROUTINE H5Aread_char_scalar
+
+  SUBROUTINE H5Aread_char_scalar_fix(attr_id, memtype_id, buf, buf_len, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: attr_id
+    INTEGER(HID_T), INTENT(IN) :: memtype_id
+    INTEGER, INTENT(IN)  :: buf_len
+    CHARACTER(LEN=buf_len), INTENT(INOUT), TARGET :: buf
+    INTEGER, INTENT(OUT) :: hdferr
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1:1))
+
+    hdferr = H5Aread_f_c(attr_id, memtype_id, f_ptr)
+
+  END SUBROUTINE H5Aread_char_scalar_fix
+
+  SUBROUTINE H5Aread_ptr(attr_id, mem_type_id, buf, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: attr_id
+    INTEGER(HID_T), INTENT(IN) :: mem_type_id
+    TYPE(C_PTR), INTENT(INOUT), TARGET :: buf
+    INTEGER, INTENT(OUT) :: hdferr
+
+    hdferr = H5Aread_f_c(attr_id, mem_type_id, buf)
+
+  END SUBROUTINE H5Aread_ptr
+
+#endif
+
+END MODULE H5A
+
+
diff --git a/fortran/src/H5Aff.f90 b/fortran/src/H5Aff.f90
deleted file mode 100644
index 25f7fa7..0000000
--- a/fortran/src/H5Aff.f90
+++ /dev/null
@@ -1,1673 +0,0 @@
-!****h* ROBODoc/H5A
-!
-! NAME
-!  MODULE H5A
-!
-! PURPOSE
-!  This file contains Fortran interfaces for H5A functions. It includes
-!  all the functions that are independent on whether the Fortran 2003 functions
-!  are enabled or disabled.
-!
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! NOTES
-!                         *** IMPORTANT ***
-!  If you add a new H5A function you must add the function name to the
-!  Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
-!  This is needed for Windows based operating systems.
-!
-!*****
-
-MODULE H5A
-
-  USE H5GLOBAL
-!
-!  On Windows there are no big (integer*8) integers, so overloading
-!  for bug #670 does not work. I have to use DEC compilation directives to make
-!  Windows DEC Visual Fortran and OSF compilers happy and do right things.
-!  05/01/02 EP
-!
-
-CONTAINS
-
-!
-!****s* H5A/h5acreate_f
-!
-! NAME
-!  h5acreate_f
-!
-! PURPOSE
-!  Creates a dataset as an attribute of a group, dataset, or named datatype
-!
-! INPUTS
-!  loc_id 	 - identifier of an object (group, dataset,
-!                  or named datatype) attribute is attached to
-!  name 	 - attribute name
-!  type_id 	 - attribute datatype identifier
-!  space_id 	 - attribute dataspace identifier
-!
-! OUTPUTS
-!  attr_id 	 - attribute identifier
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! OPTIONAL PARAMETERS
-!  acpl_id 	 - Attribute creation property list identifier
-!  appl_id 	 - Attribute access property list identifier
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces are added for
-!  called C functions (it is needed for Windows
-!  port).  February 27, 2001
-!
-!
-! SOURCE
-  SUBROUTINE h5acreate_f(loc_id, name, type_id, space_id, attr_id, &
-                                 hdferr, acpl_id, aapl_id )
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id   ! Object identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name   ! Attribute name
-    INTEGER(HID_T), INTENT(IN) :: type_id  ! Attribute datatype identifier
-    INTEGER(HID_T), INTENT(IN) :: space_id ! Attribute dataspace identifier
-    INTEGER(HID_T), INTENT(OUT) :: attr_id ! Attribute identifier
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code:
-                                           ! 0 on success and -1 on failure
-!*****
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: acpl_id ! Attribute creation property list identifier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: aapl_id ! Attribute access property list identifier
-
-    INTEGER(HID_T) :: acpl_id_default
-    INTEGER(HID_T) :: aapl_id_default
-    INTEGER(SIZE_T) :: namelen
-    INTERFACE
-       INTEGER FUNCTION h5acreate_c(loc_id, name, namelen, type_id, &
-            space_id, acpl_id_default, aapl_id_default, attr_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5ACREATE_C'::h5acreate_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         INTEGER(HID_T), INTENT(IN) :: loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER(SIZE_T) :: namelen
-         INTEGER(HID_T), INTENT(IN) :: type_id
-         INTEGER(HID_T), INTENT(IN) :: space_id
-         INTEGER(HID_T) :: acpl_id_default
-         INTEGER(HID_T) :: aapl_id_default
-         INTEGER(HID_T), INTENT(OUT) :: attr_id
-       END FUNCTION h5acreate_c
-    END INTERFACE
-
-    acpl_id_default = H5P_DEFAULT_F
-    aapl_id_default = H5P_DEFAULT_F
-    namelen = LEN(name)
-    IF (PRESENT(acpl_id)) acpl_id_default = acpl_id
-    IF (PRESENT(aapl_id)) aapl_id_default = aapl_id
-
-    hdferr = h5acreate_c(loc_id, name, namelen, type_id, space_id, &
-         acpl_id_default, aapl_id_default, attr_id)
-
-  END SUBROUTINE h5acreate_f
-
-
-!
-!****s* H5A/h5aopen_name_f
-!
-! NAME
-!  h5aopen_name_f
-!
-! PURPOSE
-!  Opens an attribute specified by name.
-!
-! INPUTS
-!  obj_id 	 - identifier of a group, dataset, or named
-!                  datatype atttribute to be attached to
-!  name 	 - attribute name
-! OUTPUTS
-!  attr_id 	 - attribute identifier
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces are added for
-!  called C functions (it is needed for Windows
-!  port).  February 27, 2001
-!
-! SOURCE
-  SUBROUTINE h5aopen_name_f(obj_id, name, attr_id, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: obj_id    ! Object identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name    ! Attribute name
-    INTEGER(HID_T), INTENT(OUT) :: attr_id  ! Attribute identifier
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-!*****
-    INTEGER(SIZE_T) :: namelen
-
-    INTERFACE
-       INTEGER FUNCTION h5aopen_name_c(obj_id, name, namelen, attr_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AOPEN_NAME_C'::h5aopen_name_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         INTEGER(HID_T), INTENT(IN) :: obj_id
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER(SIZE_T) :: namelen
-         INTEGER(HID_T), INTENT(OUT) :: attr_id
-       END FUNCTION h5aopen_name_c
-    END INTERFACE
-
-    namelen = LEN(name)
-    hdferr = h5aopen_name_c(obj_id, name, namelen, attr_id)
-  END SUBROUTINE h5aopen_name_f
-!
-!****s* H5A/h5aopen_idx_f
-!
-! NAME
-!  h5aopen_idx_f
-!
-! PURPOSE
-!  Opens the attribute specified by its index.
-!
-! INPUTS
-!  obj_id 	 - identifier of a group, dataset, or named
-!                  datatype an attribute to be attached to
-!  index 	 - index of the attribute to open (zero-based)
-! OUTPUTS
-!  attr_id 	 - attribute identifier
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces are added for
-!  called C functions (it is needed for Windows
-!  port).  February 27, 2001
-!
-! SOURCE
-  SUBROUTINE h5aopen_idx_f(obj_id, index, attr_id, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: obj_id    ! Object identifier
-    INTEGER, INTENT(IN) :: index            ! Attribute index
-    INTEGER(HID_T), INTENT(OUT) :: attr_id  ! Attribute identifier
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-!*****
-
-    INTERFACE
-       INTEGER FUNCTION h5aopen_idx_c(obj_id, index, attr_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AOPEN_IDX_C'::h5aopen_idx_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: obj_id
-         INTEGER, INTENT(IN) :: index
-         INTEGER(HID_T), INTENT(OUT) :: attr_id
-       END FUNCTION h5aopen_idx_c
-    END INTERFACE
-
-    hdferr = h5aopen_idx_c(obj_id, index, attr_id)
-  END SUBROUTINE h5aopen_idx_f
-!
-!****s* H5A/h5aget_space_f
-!
-! NAME
-!  h5aget_space_f
-!
-! PURPOSE
-!  Gets a copy of the dataspace for an attribute.
-!
-! INPUTS
-!  attr_id 	 - attribute identifier
-!
-! OUTPUTS
-!  space_id 	 - attribite dataspace identifier
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces are added for
-!  called C functions (it is needed for Windows
-!  port).  February 27, 2001
-!
-!
-! SOURCE
-  SUBROUTINE h5aget_space_f(attr_id, space_id, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
-    INTEGER(HID_T), INTENT(OUT) :: space_id ! Attribute dataspace identifier
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5aget_space_c(attr_id, space_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AGET_SPACE_C'::h5aget_space_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(OUT) :: space_id
-       END FUNCTION h5aget_space_c
-    END INTERFACE
-    
-    hdferr = h5aget_space_c(attr_id, space_id)
-  END SUBROUTINE h5aget_space_f
-!
-!****s* H5A/h5aget_type_f
-!
-! NAME
-!  h5aget_type_f
-!
-! PURPOSE
-!  Gets an attribute datatype.
-!
-! INPUTS
-!  attr_id 	 - attribute identifier
-! OUTPUTS
-!  type_id 	 - attribute datatype identifier
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces are added for
-!  called C functions (it is needed for Windows
-!  port).  February 27, 2001
-!
-! SOURCE
-  SUBROUTINE h5aget_type_f(attr_id, type_id, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id  ! Attribute identifier
-    INTEGER(HID_T), INTENT(OUT) :: type_id ! Attribute datatype identifier
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5aget_type_c(attr_id, type_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AGET_TYPE_C'::h5aget_type_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(OUT) :: type_id
-       END FUNCTION h5aget_type_c
-    END INTERFACE
-    
-    hdferr = h5aget_type_c(attr_id, type_id)
-  END SUBROUTINE h5aget_type_f
-!
-!****s* H5A/h5aget_name_f
-!
-! NAME
-!  h5aget_name_f
-!
-! PURPOSE
-!  Gets an attribute name.
-!
-! INPUTS
-!  attr_id 	 - attribute identifier
-!  size 	 - size of a buffer to read name in
-! OUTPUTS
-!  buf 	         - buffer to read name in
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces are added for
-!  called C functions (it is needed for Windows
-!  port).  February 27, 2001
-!
-!
-! SOURCE
-  SUBROUTINE h5aget_name_f(attr_id, size, buf, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id  ! Attribute identifier
-    INTEGER(SIZE_T), INTENT(IN) :: size    ! Buffer size
-    CHARACTER(LEN=*), INTENT(INOUT) :: buf ! Buffer to hold attribute name
-    INTEGER, INTENT(OUT) :: hdferr ! Error code:
-                                   ! name length is successful, -1 if fail
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5aget_name_c(attr_id, size, buf)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AGET_NAME_C'::h5aget_name_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: buf
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(SIZE_T), INTENT(IN) :: size
-         CHARACTER(LEN=*), INTENT(OUT) :: buf
-       END FUNCTION h5aget_name_c
-    END INTERFACE
-
-    hdferr = h5aget_name_c(attr_id, size, buf)
-  END SUBROUTINE h5aget_name_f
-
-!
-!****s* H5A/h5aget_name_by_idx_f
-!
-! NAME
-!  h5aget_name_by_idx_f
-!
-! PURPOSE
-!  Gets an attribute name, by attribute index position.
-!
-! INPUTS
-!  loc_id 	 - Location of object to which attribute is attached
-!  obj_name 	 - Name of object to which attribute is attached, relative to location
-!  idx_type 	 - Type of index; Possible values are:
-!                   H5_INDEX_UNKNOWN_F = -1  - Unknown index type
-!                   H5_INDEX_NAME_F 	     - Index on names
-!                   H5_INDEX_CRT_ORDER_F     - Index on creation order
-!                   H5_INDEX_N_F 	     - Number of indices defined
-!
-!  order 	 - Order in which to iterate over index; Possible values are:
-!                   H5_ITER_UNKNOWN_F 	 - Unknown order
-!                   H5_ITER_INC_F 	 - Increasing order
-!                   H5_ITER_DEC_F 	 - Decreasing order
-!                   H5_ITER_NATIVE_F 	 - No particular order, whatever is fastest
-!                   H5_ITER_N_F 	 - Number of iteration orders
-!  order 	 - Index traversal order
-!  n 	         - Attribute’s position in index
-!
-! OUTPUTS
-!  name 	 - Attribute name
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! OPTIONAL PARAMETERS
-!  lapl_id 	 - Link access property list
-!  size 	 - Size, in bytes, of attribute name
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  January, 2008
-!
-! SOURCE
-  SUBROUTINE h5aget_name_by_idx_f(loc_id, obj_name, idx_type, order, &
-       n, name, hdferr, size, lapl_id)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id      ! Identifer for object to which attribute is attached
-    CHARACTER(LEN=*), INTENT(IN) :: obj_name  ! Name of object, relative to location,
-                                              !  from which attribute is to be removed *TEST* check NULL
-    INTEGER, INTENT(IN) :: idx_type ! Type of index; Possible values are:
-                                    !    H5_INDEX_UNKNOWN_F   - Unknown index type
-                                    !    H5_INDEX_NAME_F       - Index on names
-                                    !    H5_INDEX_CRT_ORDER_F  - Index on creation order
-                                    !    H5_INDEX_N_F 	      - Number of indices defined
-
-    INTEGER, INTENT(IN) :: order    ! Order in which to iterate over index; Possible values are:
-                                    !    H5_ITER_UNKNOWN_F   - Unknown order
-                                    !    H5_ITER_INC_F      - Increasing order
-                                    !    H5_ITER_DEC_F       - Decreasing order
-                                    !    H5_ITER_NATIVE_F    - No particular order, whatever is fastest
-                                    !    H5_ITER_N_F 	    - Number of iteration orders
-    INTEGER(HSIZE_T), INTENT(IN) :: n !  Attribute’s position in index
-    CHARACTER(LEN=*), INTENT(OUT) :: name ! Attribute name
-    INTEGER, INTENT(OUT) :: hdferr    ! Error code:
-                                      ! Returns attribute name size,
-                                      ! -1 if fail
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id ! Link access property list
-    INTEGER(SIZE_T), OPTIONAL, INTENT(OUT) :: size  ! Indicates the size, in the number of characters, 
-                                                    ! of the attribute
-!*****
-    INTEGER(HID_T) :: lapl_id_default
-    INTEGER(SIZE_T) :: obj_namelen
-    INTEGER(SIZE_T) :: size_default
-
-    INTERFACE
-       INTEGER FUNCTION h5aget_name_by_idx_c(loc_id, obj_name, obj_namelen, idx_type, order, &
-            n, name, size_default, lapl_id_default)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AGET_NAME_BY_IDX_C'::h5aget_name_by_idx_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: obj_name, name
-         INTEGER(HID_T), INTENT(IN) :: loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: obj_name
-         INTEGER, INTENT(IN) :: idx_type
-         INTEGER, INTENT(IN) :: order
-         INTEGER(HSIZE_T), INTENT(IN) :: n
-
-         CHARACTER(LEN=*), INTENT(OUT) :: name
-         INTEGER(SIZE_T) :: size_default
-         INTEGER(HID_T) :: lapl_id_default
-         INTEGER(SIZE_T) :: obj_namelen
-       END FUNCTION h5aget_name_by_idx_c
-    END INTERFACE
-
-    obj_namelen = LEN(obj_name)
-    lapl_id_default = H5P_DEFAULT_F
-    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
-
-    size_default = LEN(name)
-
-    hdferr = h5aget_name_by_idx_c(loc_id, obj_name, obj_namelen, idx_type, order, &
-         n, name, size_default, lapl_id_default)
-
-    IF(PRESENT(size)) size = size_default
-
-
-  END SUBROUTINE h5aget_name_by_idx_f
-!
-!****s* H5A/h5aget_num_attrs_f
-!
-! NAME
-!  h5aget_num_attrs_f
-!
-! PURPOSE
-!  Determines the number of attributes attached to an object.
-!
-! INPUTS
-!  obj_id 	 - object (group, dataset, or named datatype)
-!  identifier
-! OUTPUTS
-!  attr_num 	 - number of attributes attached to the object
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces are added for
-!  called C functions (it is needed for Windows
-!  port).  February 27, 2001
-!
-! SOURCE
-  SUBROUTINE h5aget_num_attrs_f(obj_id, attr_num, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: obj_id  ! Object identifier
-    INTEGER, INTENT(OUT) :: attr_num      ! Number of attributes of the object
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-
-    INTERFACE
-       INTEGER FUNCTION h5aget_num_attrs_c(obj_id, attr_num)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AGET_NUM_ATTRS_C'::h5aget_num_attrs_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: obj_id
-         INTEGER, INTENT(OUT) :: attr_num
-       END FUNCTION h5aget_num_attrs_c
-    END INTERFACE
-
-    hdferr = h5aget_num_attrs_c(obj_id, attr_num)
-  END SUBROUTINE h5aget_num_attrs_f
-
-!
-!****s* H5A/h5adelete_f
-!
-! NAME
-!  h5adelete_f
-!
-! PURPOSE
-!  Deletes an attribute of an object (group, dataset or
-!  named datatype)
-!
-! INPUTS
-!  obj_id 	 - object identifier
-!  name 	 - attribute name
-! OUTPUTS
-!
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces are added for
-!  called C functions (it is needed for Windows
-!  port).  February 27, 2001
-!
-! SOURCE
-  SUBROUTINE h5adelete_f(obj_id, name, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: obj_id  ! Object identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name  ! Attribute name
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-    INTEGER(SIZE_T) :: namelen
-
-    INTERFACE
-       INTEGER FUNCTION h5adelete_c(obj_id, name, namelen)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5ADELETE_C'::h5adelete_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         INTEGER(HID_T), INTENT(IN) :: obj_id
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER(SIZE_T) :: namelen
-       END FUNCTION h5adelete_c
-    END INTERFACE
-
-    namelen = LEN(name)
-    hdferr = h5adelete_c(obj_id, name, namelen)
-  END SUBROUTINE h5adelete_f
-
-!
-!****s* H5A/h5aclose_f
-!
-! NAME
-!  h5aclose_f
-!
-! PURPOSE
-!  Closes the specified attribute.
-!
-! INPUTS
-!  attr_id  - attribute identifier
-! OUTPUTS
-!
-!  hdferr   - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces are added for
-!  called C functions (it is needed for Windows
-!  port).  February 27, 2001
-! SOURCE
-  SUBROUTINE h5aclose_f(attr_id, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id  ! Attribute identifier
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-!*****
-
-    INTERFACE
-       INTEGER FUNCTION h5aclose_c(attr_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5ACLOSE_C'::h5aclose_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-       END FUNCTION h5aclose_c
-    END INTERFACE
-
-    hdferr = h5aclose_c(attr_id)
-  END SUBROUTINE h5aclose_f
-
-!
-!****s* H5A/h5aget_storage_size_f
-!
-! NAME
-!  h5aget_storage_size_f
-!
-! PURPOSE
-!  Returns the amount of storage required for an attribute.
-!
-! INPUTS
-!  attr_id 	 - attribute identifier
-! OUTPUTS
-!  size 	 - attribute storage size
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! AUTHOR
-!  M. Scot Breitenfeld
-!  January, 2008
-!
-! SOURCE
-  SUBROUTINE h5aget_storage_size_f(attr_id, size, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id  ! Attribute identifier
-    INTEGER(HSIZE_T), INTENT(OUT) :: size  ! Attribute storage requirement
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-!*****
-
-    INTERFACE
-       INTEGER FUNCTION h5aget_storage_size_c(attr_id, size)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AGET_STORAGE_SIZE_C'::h5aget_storage_size_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HSIZE_T), INTENT(OUT) :: size
-       END FUNCTION h5aget_storage_size_c
-    END INTERFACE
-
-    hdferr = h5aget_storage_size_c(attr_id, size)
-  END SUBROUTINE h5aget_storage_size_f
-
-!
-!****s* H5A/h5aget_create_plist_f
-!
-! NAME
-!  h5aget_create_plist_f
-!
-! PURPOSE
-!  Gets an attribute creation property list identifier
-!
-! INPUTS
-!  attr_id 	    - Identifier of the attribute
-! OUTPUTS
-!  creation_prop_id - Identifier for the attribute’s creation property
-!  hdferr 	    - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  January, 2008
-!
-! SOURCE
-  SUBROUTINE h5aget_create_plist_f(attr_id, creation_prop_id, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id  ! Identifier of the attribute
-    INTEGER(HID_T), INTENT(OUT) :: creation_prop_id   ! Identifier for the attribute’s creation property
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code
-                                         ! 0 on success and -1 on failure
-!*****
-
-    INTERFACE
-       INTEGER FUNCTION h5aget_create_plist_c(attr_id, creation_prop_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AGET_CREATE_PLIST_C'::h5aget_create_plist_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(OUT) :: creation_prop_id
-       END FUNCTION h5aget_create_plist_c
-    END INTERFACE
-
-    hdferr = h5aget_create_plist_c(attr_id, creation_prop_id)
-  END SUBROUTINE h5aget_create_plist_f
-
-!
-!****s* H5A/h5arename_by_name_f
-!
-! NAME
-!  h5arename_by_name_f
-!
-! PURPOSE
-!  Renames an attribute
-!
-! INPUTS
-!  loc_id 	 - Location or object identifier; may be dataset or group
-!  obj_name 	 - Name of object, relative to location,
-!                  whose attribute is to be renamed
-!  old_attr_name - Prior attribute name
-!  new_attr_name - New attribute name
-!  lapl_id 	 - Link access property list identifier
-!
-! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  January, 2008
-!
-! SOURCE
-  SUBROUTINE h5arename_by_name_f(loc_id, obj_name, old_attr_name, new_attr_name, &
-        hdferr, lapl_id)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id    ! Object identifier
-    CHARACTER(LEN=*), INTENT(IN) :: obj_name  ! Name of object, relative to location,
-                                              !  whose attribute is to be renamed
-    CHARACTER(LEN=*), INTENT(IN) :: old_attr_name ! Prior attribute name
-    CHARACTER(LEN=*), INTENT(IN) :: new_attr_name ! New attribute name
-
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code:
-                                         ! 0 on success and -1 on failure
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id ! Link access property list identifier
-!*****
-    INTEGER(HID_T) :: lapl_id_default
-    INTEGER(SIZE_T) :: obj_namelen
-    INTEGER(SIZE_T) :: old_attr_namelen
-    INTEGER(SIZE_T) :: new_attr_namelen
-
-    INTERFACE
-       INTEGER FUNCTION h5arename_by_name_c(loc_id, obj_name, obj_namelen, &
-            old_attr_name, old_attr_namelen, new_attr_name, new_attr_namelen, &
-            lapl_id_default)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5ARENAME_BY_NAME_C'::h5arename_by_name_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: obj_name, old_attr_name, new_attr_name
-         INTEGER(HID_T), INTENT(IN) :: loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: obj_name
-         INTEGER(SIZE_T) :: obj_namelen
-         CHARACTER(LEN=*), INTENT(IN) :: old_attr_name
-         INTEGER(SIZE_T) :: old_attr_namelen
-         CHARACTER(LEN=*), INTENT(IN) :: new_attr_name
-         INTEGER(SIZE_T) :: new_attr_namelen
-         INTEGER(HID_T) :: lapl_id_default
-
-       END FUNCTION h5arename_by_name_c
-    END INTERFACE
-
-    obj_namelen = LEN(obj_name)
-    old_attr_namelen = LEN(old_attr_name)
-    new_attr_namelen = LEN(new_attr_name)
-
-    lapl_id_default = H5P_DEFAULT_F
-    IF(PRESENT(lapl_id)) lapl_id_default=lapl_id
-
-    hdferr = h5arename_by_name_c(loc_id, obj_name, obj_namelen, &
-         old_attr_name, old_attr_namelen, new_attr_name, new_attr_namelen, &
-         lapl_id_default)
-
-  END SUBROUTINE h5arename_by_name_f
-
-!
-!****s* H5A/h5aopen_f
-!
-! NAME
-!  h5aopen_f
-!
-! PURPOSE
-!  Opens an attribute for an object specified by object
-!  identifier and attribute name
-!
-! INPUTS
-!  obj_id 	 - Identifer for object to which attribute is attached
-!  attr_name 	 - Name of attribute to open
-! OUTPUTS
-!  attr_id 	 - attribute identifier
-
-! OPTIONAL PARAMETERS
-!  aapl_id 	 - Attribute access property list
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  January, 2008
-!
-! SOURCE
-  SUBROUTINE h5aopen_f(obj_id, attr_name, attr_id, hdferr, aapl_id)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: obj_id      ! Object identifier
-    CHARACTER(LEN=*), INTENT(IN) :: attr_name ! Attribute name
-    INTEGER(HID_T), INTENT(OUT) :: attr_id    ! Attribute identifier
-    INTEGER, INTENT(OUT) :: hdferr            ! Error code
-                                              !   Success:  0
-                                              !   Failure: -1
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: aapl_id     ! Attribute access property list
-!*****
-    INTEGER(HID_T) :: aapl_id_default
-
-    INTEGER(SIZE_T) :: attr_namelen
-
-    INTERFACE
-       INTEGER FUNCTION h5aopen_c(obj_id, attr_name, attr_namelen, aapl_id_default, attr_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AOPEN_C'::h5aopen_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: attr_name
-         INTEGER(HID_T), INTENT(IN) :: obj_id
-         CHARACTER(LEN=*), INTENT(IN) :: attr_name
-         INTEGER(HID_T) :: aapl_id_default
-         INTEGER(SIZE_T) :: attr_namelen
-         INTEGER(HID_T), INTENT(OUT) :: attr_id
-       END FUNCTION h5aopen_c
-    END INTERFACE
-
-    attr_namelen = LEN(attr_name)
-
-    aapl_id_default = H5P_DEFAULT_F
-    IF(PRESENT(aapl_id)) aapl_id_default = aapl_id
-
-    hdferr = h5aopen_c(obj_id, attr_name, attr_namelen, aapl_id_default, attr_id)
-
-  END SUBROUTINE h5aopen_f
-
-!
-!****s* H5A/h5adelete_by_idx_f
-!
-! NAME
-!  h5adelete_by_idx_f
-!
-! PURPOSE
-!  Deletes an attribute from an object according to index order
-!
-! INPUTS
-!  loc_id 	 - Location or object identifier; may be dataset or group
-!  obj_name 	 - Name of object, relative to location, from which attribute is to be removed
-!  idx_type 	 - Type of index; Possible values are:
-!                   H5_INDEX_UNKNOWN_F = -1  - Unknown index type
-!                   H5_INDEX_NAME_F 	     - Index on names
-!                   H5_INDEX_CRT_ORDER_F     - Index on creation order
-!                   H5_INDEX_N_F 	     - Number of indices defined
-!
-!  order 	 - Order in which to iterate over index; Possible values are:
-!                   H5_ITER_UNKNOWN_F 	 - Unknown order
-!                   H5_ITER_INC_F 	 - Increasing order
-!                   H5_ITER_DEC_F 	 - Decreasing order
-!                   H5_ITER_NATIVE_F 	 - No particular order, whatever is fastest
-!                   H5_ITER_N_F 	 - Number of iteration orders
-!
-!  n 	         - Offset within index
-! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! OPTIONAL PARAMETERS
-!  lapl_id 	 - Link access property list
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  January, 2008
-!
-! SOURCE
-  SUBROUTINE h5adelete_by_idx_f(loc_id, obj_name, idx_type, order, n, hdferr, lapl_id)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id      ! Identifer for object to which attribute is attached
-    CHARACTER(LEN=*), INTENT(IN) :: obj_name  ! Name of object, relative to location,
-                                              !  from which attribute is to be removed
-    INTEGER, INTENT(IN) :: idx_type           ! Type of index; Possible values are:
-                                              !    H5_INDEX_UNKNOWN_F   - Unknown index type
-                                              !    H5_INDEX_NAME_F      - Index on names
-                                              !    H5_INDEX_CRT_ORDER_F - Index on creation order
-                                              !    H5_INDEX_N_F	      - Number of indices defined
-
-    INTEGER, INTENT(IN) :: order              ! Order in which to iterate over index; Possible values are:
-                                              !    H5_ITER_UNKNOWN_F  - Unknown order
-                                              !    H5_ITER_INC_F      - Increasing order
-                                              !    H5_ITER_DEC_F      - Decreasing order
-                                              !    H5_ITER_NATIVE_F   - No particular order, whatever is fastest
-                                              !    H5_ITER_N_F	    - Number of iteration orders
-    INTEGER(HSIZE_T), INTENT(IN) :: n         ! Offset within index
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code:
-                                           ! 0 on success and -1 on failure
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id ! Link access property list
-!*****
-    INTEGER(SIZE_T) :: obj_namelen
-    INTEGER(HID_T) :: lapl_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5adelete_by_idx_c(loc_id, obj_name, obj_namelen, idx_type, order, n, lapl_id_default)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5ADELETE_BY_IDX_C'::h5adelete_by_idx_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: obj_name
-         INTEGER(HID_T), INTENT(IN) :: loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: obj_name
-         INTEGER, INTENT(IN) :: idx_type
-         INTEGER, INTENT(IN) :: order
-         INTEGER(HSIZE_T), INTENT(IN) :: n
-         INTEGER(HID_T) :: lapl_id_default
-         INTEGER(SIZE_T) :: obj_namelen
-       END FUNCTION h5adelete_by_idx_c
-    END INTERFACE
-
-    lapl_id_default = H5P_DEFAULT_F
-    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
-
-    obj_namelen = LEN(obj_name)
-    hdferr = h5adelete_by_idx_c(loc_id, obj_name, obj_namelen, idx_type, order, n, lapl_id_default)
-
-  END SUBROUTINE h5adelete_by_idx_f
-
-!
-!****s* H5A/h5adelete_by_name_f
-!
-! NAME
-!  h5adelete_by_name_f
-!
-! PURPOSE
-!  Removes an attribute from a specified location
-!
-! INPUTS
-!  loc_id 	 - Identifer for object to which attribute is attached
-!  obj_name 	 - Name of attribute to open
-!  attr_name 	 - Attribute access property list
-!  lapl_id 	 - Link access property list
-! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  January, 2008
-!
-! SOURCE
-  SUBROUTINE h5adelete_by_name_f(loc_id, obj_name, attr_name, hdferr, lapl_id)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id      ! Identifer for object to which attribute is attached
-    CHARACTER(LEN=*), INTENT(IN) :: obj_name  ! Name of object, relative to location,
-                                              !  from which attribute is to be removed
-    CHARACTER(LEN=*), INTENT(IN) :: attr_name ! Name of attribute to delete
-    INTEGER, INTENT(OUT) :: hdferr            ! Error code:
-                                              ! 0 on success and -1 on failure
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id ! Link access property list
-!*****
-    INTEGER(SIZE_T) :: attr_namelen
-    INTEGER(SIZE_T) :: obj_namelen
-
-    INTEGER(HID_T) :: lapl_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5adelete_by_name_c(loc_id, obj_name, obj_namelen, attr_name, attr_namelen, lapl_id_default)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5ADELETE_BY_NAME_C'::h5adelete_by_name_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: obj_name, attr_name
-         INTEGER(HID_T), INTENT(IN) :: loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: obj_name
-         CHARACTER(LEN=*), INTENT(IN) :: attr_name
-         INTEGER(HID_T) :: lapl_id_default
-         INTEGER(SIZE_T) :: attr_namelen
-         INTEGER(SIZE_T) :: obj_namelen
-       END FUNCTION h5adelete_by_name_c
-    END INTERFACE
-
-    obj_namelen = LEN(obj_name)
-    attr_namelen = LEN(attr_name)
-
-    lapl_id_default = H5P_DEFAULT_F
-    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
-
-    hdferr = h5adelete_by_name_c(loc_id, obj_name, obj_namelen, attr_name, attr_namelen, lapl_id_default)
-
-  END SUBROUTINE h5adelete_by_name_f
-
-!
-!****s* H5A/h5aopen_by_idx_f
-!
-! NAME
-!  h5aopen_by_idx_f
-!
-! PURPOSE
-!  Opens an existing attribute that is attached to an object specified by location and name
-!
-! INPUTS
-!  loc_id 	 - Location of object to which attribute is attached
-!  obj_name 	 - Name of object to which attribute is attached, relative to location
-!  idx_type 	 - Type of index
-!  order 	 - Index traversal order
-!  n 	         - Attribute’s position in index
-! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! OPTIONAL PARAMETERS
-!  aapl_id 	 - Attribute access property list
-!  lapl_id 	 - Link access property list
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  January, 2008
-!
-! SOURCE
-  SUBROUTINE h5aopen_by_idx_f(loc_id, obj_name, idx_type, order, n, attr_id, hdferr, aapl_id, lapl_id)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id      ! Object identifier
-    CHARACTER(LEN=*), INTENT(IN) :: obj_name  ! Name of object to which attribute is attached
-    INTEGER, INTENT(IN) :: idx_type           ! Type of index; Possible values are:
-                                              !    H5_INDEX_UNKNOWN_F   - Unknown index type
-                                              !    H5_INDEX_NAME_F      - Index on names
-                                              !    H5_INDEX_CRT_ORDER_F - Index on creation order
-                                              !    H5_INDEX_N_F	      - Number of indices defined
-    INTEGER, INTENT(IN) :: order              ! Order in which to iterate over index; Possible values are:
-                                              !    H5_ITER_UNKNOWN_F  - Unknown order
-                                              !    H5_ITER_INC_F      - Increasing order
-                                              !    H5_ITER_DEC_F      - Decreasing order
-                                              !    H5_ITER_NATIVE_F   - No particular order, whatever is fastest
-
-    INTEGER(HSIZE_T), INTENT(IN) :: n       ! Attribute’s position in index
-
-    INTEGER(HID_T), INTENT(OUT) :: attr_id  ! Attribute identifier
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code:
-                                            ! 0 on success and -1 on failure
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: aapl_id  ! Attribute access property list
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id  ! Link access property list
-!*****
-    INTEGER(SIZE_T) :: obj_namelen
-    INTEGER(HID_T) :: aapl_id_default
-    INTEGER(HID_T) :: lapl_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5aopen_by_idx_c(loc_id, obj_name, obj_namelen, idx_type, order, n, &
-            aapl_id_default, lapl_id_default, attr_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AOPEN_BY_IDX_C'::h5aopen_by_idx_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: obj_name
-         INTEGER(HID_T), INTENT(IN) :: loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: obj_name
-         INTEGER, INTENT(IN) :: idx_type
-         INTEGER, INTENT(IN) :: order
-         INTEGER(HSIZE_T), INTENT(IN) :: n
-         INTEGER(HID_T) :: aapl_id_default
-         INTEGER(HID_T) :: lapl_id_default
-         INTEGER(SIZE_T) :: obj_namelen
-         INTEGER(HID_T), INTENT(OUT) :: attr_id  ! Attribute identifier
-       END FUNCTION h5aopen_by_idx_c
-    END INTERFACE
-
-    obj_namelen = LEN(obj_name)
-
-    aapl_id_default = H5P_DEFAULT_F
-    IF(PRESENT(aapl_id)) aapl_id_default = aapl_id
-    lapl_id_default = H5P_DEFAULT_F
-    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
-
-    hdferr = h5aopen_by_idx_c(loc_id, obj_name, obj_namelen, idx_type, order, n, &
-         aapl_id_default, lapl_id_default, attr_id)
-
-  END SUBROUTINE h5aopen_by_idx_f
-
-!
-!****s* H5A/h5aget_info_f
-!
-! NAME
-!  h5aget_info_f
-!
-! PURPOSE
-!  Retrieves attribute information, by attribute identifier
-!
-! INPUTS
-!  attr_id 	 - attribute identifier
-!
-! OUTPUTS
-!  NOTE: In C it is defined as a structure: H5A_info_t
-!
-!  corder_valid  - indicates whether the creation order data is valid for this attribute
-!  corder 	 - is a positive integer containing the creation order of the attribute
-!  cset 	 - indicates the character set used for the attribute’s name
-!  data_size 	 - indicates the size, in the number of characters, of the attribute
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! AUTHOR
-!  M. Scot Breitenfeld
-!  January, 2008
-! SOURCE
-  SUBROUTINE h5aget_info_f(attr_id, f_corder_valid, corder, cset, data_size, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id  ! Attribute identifier
-
-    LOGICAL, INTENT(OUT) :: f_corder_valid ! Indicates whether the creation order data is valid for this attribute
-    INTEGER, INTENT(OUT) :: corder ! Is a positive integer containing the creation order of the attribute
-    INTEGER, INTENT(OUT) :: cset   ! Indicates the character set used for the attribute’s name
-    INTEGER(HSIZE_T), INTENT(OUT) :: data_size ! Indicates the size, in the number of characters, of the attribute
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code:
-                                         ! 0 on success and -1 on failure
-!*****
-    INTEGER :: corder_valid
-
-    INTERFACE
-       INTEGER FUNCTION h5aget_info_c(attr_id, corder_valid, corder, cset, data_size)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AGET_INFO_C'::h5aget_info_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-
-         INTEGER, INTENT(OUT) :: corder_valid
-         INTEGER, INTENT(OUT) :: corder
-         INTEGER, INTENT(OUT) :: cset
-         INTEGER(HSIZE_T), INTENT(OUT) :: data_size
-       END FUNCTION h5aget_info_c
-    END INTERFACE
-
-    hdferr = h5aget_info_c(attr_id, corder_valid, corder, cset, data_size)
-
-    f_corder_valid =.FALSE.
-    IF (corder_valid .EQ. 1) f_corder_valid =.TRUE.
-
-
-  END SUBROUTINE h5aget_info_f
-
-!
-!****s* H5A/h5aget_info_by_idx_f
-!
-! NAME
-!  h5aget_info_by_idx_f
-!
-! PURPOSE
-!  Retrieves attribute information, by attribute index position
-!
-! INPUTS
-!  loc_id 	 - Location of object to which attribute is attached
-!  obj_name 	 - Name of object to which attribute is attached, relative to location
-!  idx_type 	 - Type of index
-!  order 	 - Index traversal order
-!  n 	         - Attribute’s position in index
-!
-! OUTPUTS  NOTE: In C it is defined as a structure: H5A_info_t
-!  corder_valid  - indicates whether the creation order data is valid for this attribute
-!  corder 	 - is a positive integer containing the creation order of the attribute
-!  cset 	 - indicates the character set used for the attribute’s name
-!  data_size 	 - indicates the size, in the number of characters, of the attribute
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! OPTIONAL PARAMETERS
-!  lapl_id 	 - Link access property list
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  January, 2008
-!
-! SOURCE
-  SUBROUTINE h5aget_info_by_idx_f(loc_id, obj_name, idx_type, order, n, &
-       f_corder_valid, corder, cset, data_size, hdferr, lapl_id)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id      ! Object identifier
-    CHARACTER(LEN=*), INTENT(IN) :: obj_name  ! Name of object to which attribute is attached
-    INTEGER, INTENT(IN) :: idx_type           ! Type of index; Possible values are:
-                                              !    H5_INDEX_UNKNOWN_F   - Unknown index type
-                                              !    H5_INDEX_NAME_F      - Index on names
-                                              !    H5_INDEX_CRT_ORDER_F - Index on creation order
-                                              !    H5_INDEX_N_F	      - Number of indices defined
-    INTEGER, INTENT(IN) :: order              ! Order in which to iterate over index; Possible values are:
-                                              !    H5_ITER_UNKNOWN_F  - Unknown order
-                                              !    H5_ITER_INC_F      - Increasing order
-                                              !    H5_ITER_DEC_F      - Decreasing order
-                                              !    H5_ITER_NATIVE_F   - No particular order, whatever is fastest
-
-    INTEGER(HSIZE_T), INTENT(IN) :: n         ! Attribute’s position in index
-
-
-    LOGICAL, INTENT(OUT) :: f_corder_valid ! Indicates whether the creation order data is valid for this attribute
-    INTEGER, INTENT(OUT) :: corder ! Is a positive integer containing the creation order of the attribute
-    INTEGER, INTENT(OUT) :: cset   ! Indicates the character set used for the attribute’s name
-    INTEGER(HSIZE_T), INTENT(OUT) :: data_size ! Indicates the size, in the number of characters, of the attribute
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code:
-                                         ! 0 on success and -1 on failure
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id  ! Link access property list
-!*****
-    INTEGER :: corder_valid
-    INTEGER(SIZE_T)  :: obj_namelen
-    INTEGER(HID_T) :: lapl_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5aget_info_by_idx_c(loc_id, obj_name, obj_namelen, idx_type, order, n, lapl_id_default, &
-            corder_valid, corder, cset, data_size)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AGET_INFO_BY_IDX_C'::h5aget_info_by_idx_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: obj_name
-         INTEGER(HID_T), INTENT(IN) :: loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: obj_name
-         INTEGER, INTENT(IN) :: idx_type
-         INTEGER, INTENT(IN) :: order
-         INTEGER(HSIZE_T), INTENT(IN) :: n
-         INTEGER(HID_T) :: lapl_id_default
-         INTEGER, INTENT(OUT) :: corder_valid
-         INTEGER, INTENT(OUT) :: corder
-         INTEGER, INTENT(OUT) :: cset
-         INTEGER(HSIZE_T), INTENT(OUT) :: data_size
-
-         INTEGER(SIZE_T)  :: obj_namelen
-       END FUNCTION h5aget_info_by_idx_c
-    END INTERFACE
-
-    obj_namelen = LEN(obj_name)
-
-    lapl_id_default = H5P_DEFAULT_F
-    IF(present(lapl_id)) lapl_id_default = lapl_id
-
-    hdferr = h5aget_info_by_idx_c(loc_id, obj_name, obj_namelen, idx_type, order, n, lapl_id_default, &
-            corder_valid, corder, cset, data_size)
-
-    f_corder_valid =.FALSE.
-    IF (corder_valid .EQ. 1) f_corder_valid =.TRUE.
-
-  END SUBROUTINE h5aget_info_by_idx_f
-
-!
-!****s* H5A/h5aget_info_by_name_f
-!
-! NAME
-!  h5aget_info_by_name_f
-!
-! PURPOSE
-!  Retrieves attribute information, by attribute name
-!
-! INPUTS
-!  loc_id 	 - Location of object to which attribute is attached
-!  obj_name 	 - Name of object to which attribute is attached, relative to location
-!  attr_name 	 - Attribute name
-!
-! OUTPUTS  NOTE: In C it is defined as a structure: H5A_info_t
-!  corder_valid  - indicates whether the creation order data is valid for this attribute
-!  corder 	 - is a positive integer containing the creation order of the attribute
-!  cset 	 - indicates the character set used for the attribute’s name
-!  data_size 	 - indicates the size, in the number of characters, of the attribute
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! OPTIONAL PARAMETERS
-!  lapl_id 	 - Link access property list
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  January, 2008
-!
-! SOURCE
-  SUBROUTINE h5aget_info_by_name_f(loc_id, obj_name, attr_name, &
-       f_corder_valid, corder, cset, data_size, hdferr, lapl_id)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id    ! Object identifier
-    CHARACTER(LEN=*), INTENT(IN) :: obj_name ! Name of object to which attribute is attached
-    CHARACTER(LEN=*), INTENT(IN) :: attr_name ! Attribute name
-
-
-    LOGICAL, INTENT(OUT) :: f_corder_valid ! Indicates whether the creation order data is valid for this attribute
-    INTEGER, INTENT(OUT) :: corder ! Is a positive integer containing the creation order of the attribute
-    INTEGER, INTENT(OUT) :: cset ! Indicates the character set used for the attribute’s name
-    INTEGER(HSIZE_T), INTENT(OUT) :: data_size   ! Indicates the size, in the number of characters, of the attribute
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code:
-                                           ! 0 on success and -1 on failure
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id  ! Link access property list
-!*****
-    INTEGER :: corder_valid
-    INTEGER(SIZE_T)  :: obj_namelen
-    INTEGER(SIZE_T)  :: attr_namelen
-    INTEGER(HID_T) :: lapl_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5aget_info_by_name_c(loc_id, obj_name, obj_namelen, attr_name, attr_namelen, lapl_id_default, &
-            corder_valid, corder, cset, data_size)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AGET_INFO_BY_NAME_C'::h5aget_info_by_name_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: obj_name, attr_name
-         INTEGER(HID_T), INTENT(IN) :: loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: obj_name
-         INTEGER(SIZE_T), INTENT(IN) :: obj_namelen
-         CHARACTER(LEN=*), INTENT(IN) :: attr_name
-         INTEGER(SIZE_T), INTENT(IN) :: attr_namelen
-         INTEGER(HID_T) :: lapl_id_default
-         INTEGER, INTENT(OUT) :: corder_valid
-         INTEGER, INTENT(OUT) :: corder
-         INTEGER, INTENT(OUT) :: cset
-         INTEGER(HSIZE_T), INTENT(OUT) :: data_size
-
-       END FUNCTION h5aget_info_by_name_c
-    END INTERFACE
-
-    obj_namelen = LEN(obj_name)
-    attr_namelen = LEN(attr_name)
-
-    lapl_id_default = H5P_DEFAULT_F
-    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
-
-    hdferr = h5aget_info_by_name_c(loc_id, obj_name, obj_namelen, attr_name, attr_namelen, lapl_id_default, &
-            corder_valid, corder, cset, data_size)
-
-    f_corder_valid =.FALSE.
-    IF (corder_valid .EQ. 1) f_corder_valid =.TRUE.
-
-  END SUBROUTINE h5aget_info_by_name_f
-
-!
-!****s* H5A/h5acreate_by_name_f
-!
-! NAME
-!  h5acreate_by_name_f
-!
-! PURPOSE
-!  Creates an attribute attached to a specified object
-!
-! INPUTS
-!  loc_id 	 - Location or object identifier; may be dataset or group
-!  obj_name 	 - Name, relative to loc_id, of object that attribute is to be attached to
-!  attr_name 	 - Attribute name
-!  type_id 	 - Attribute datatype identifier
-!  space_id 	 - Attribute dataspace identifier
-!
-! OUTPUTS
-!  attr 	 - an attribute identifier
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! OPTIONAL PARAMETERS
-!  acpl_id 	 - Attribute creation property list identifier (Currently not used.)
-!  aapl_id 	 - Attribute access property list identifier (Currently not used.)
-!  lapl_id 	 - Link access property list
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  February, 2008
-! SOURCE
-  SUBROUTINE h5acreate_by_name_f(loc_id, obj_name, attr_name, type_id, space_id, attr, hdferr, &
-       acpl_id, aapl_id, lapl_id)
-    IMPLICIT NONE
-    INTEGER(HID_T),   INTENT(IN)  :: loc_id
-    CHARACTER(LEN=*), INTENT(IN)  :: obj_name
-    CHARACTER(LEN=*), INTENT(IN)  :: attr_name
-    INTEGER(HID_T),   INTENT(IN)  :: type_id
-    INTEGER(HID_T),   INTENT(IN)  :: space_id
-    INTEGER(HID_T),   INTENT(OUT) :: attr
-    INTEGER,          INTENT(OUT) :: hdferr
-
-    INTEGER(HID_T),   INTENT(IN), OPTIONAL :: acpl_id
-    INTEGER(HID_T),   INTENT(IN), OPTIONAL :: aapl_id
-    INTEGER(HID_T),   INTENT(IN), OPTIONAL :: lapl_id
-!*****
-    INTEGER(SIZE_T)  :: obj_namelen
-    INTEGER(SIZE_T)  :: attr_namelen
-
-    INTEGER(HID_T) :: acpl_id_default
-    INTEGER(HID_T) :: aapl_id_default
-    INTEGER(HID_T) :: lapl_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5acreate_by_name_c(loc_id, obj_name, obj_namelen, attr_name, attr_namelen, &
-            type_id, space_id, acpl_id_default, aapl_id_default, lapl_id_default, attr)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5ACREATE_BY_NAME_C'::h5acreate_by_name_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: obj_name, attr_name
-         INTEGER(HID_T), INTENT(IN) :: loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: obj_name
-         INTEGER(SIZE_T), INTENT(IN) :: obj_namelen
-         CHARACTER(LEN=*), INTENT(IN) :: attr_name
-         INTEGER(SIZE_T), INTENT(IN) :: attr_namelen
-         INTEGER(HID_T), INTENT(IN) :: type_id
-         INTEGER(HID_T), INTENT(IN) :: space_id
-         INTEGER(HID_T) :: acpl_id_default
-         INTEGER(HID_T) :: aapl_id_default
-         INTEGER(HID_T) :: lapl_id_default
-         INTEGER(HID_T), INTENT(OUT) :: attr
-
-       END FUNCTION h5acreate_by_name_c
-    END INTERFACE
-
-    obj_namelen = LEN(obj_name)
-    attr_namelen = LEN(attr_name)
-
-    acpl_id_default = H5P_DEFAULT_F
-    aapl_id_default = H5P_DEFAULT_F
-    lapl_id_default = H5P_DEFAULT_F
-
-    IF(PRESENT(acpl_id)) acpl_id_default = acpl_id
-    IF(PRESENT(aapl_id)) aapl_id_default = aapl_id
-    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
-
-    hdferr = h5acreate_by_name_c(loc_id, obj_name, obj_namelen, attr_name, attr_namelen, &
-            type_id, space_id, acpl_id_default, aapl_id_default, lapl_id_default, attr)
-  END SUBROUTINE h5acreate_by_name_f
-
-!
-!****s* H5A/H5Aexists_f
-!
-! NAME
-!  H5Aexists_f
-!
-! PURPOSE
-!  Determines whether an attribute with a given name exists on an object
-!
-! INPUTS
-!  obj_id 	 - Object identifier
-!  attr_name 	 - Attribute name
-!
-! OUTPUTS
-!  attr_exists 	 - attribute exists status
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  February, 2008
-!
-! SOURCE
-  SUBROUTINE h5aexists_f(obj_id, attr_name, attr_exists, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: obj_id      ! Object identifier
-    CHARACTER(LEN=*), INTENT(IN) :: attr_name ! Attribute name
-    LOGICAL, INTENT(OUT) :: attr_exists  ! .TRUE. if exists, .FALSE. otherwise
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code:
-                                         ! 0 on success and -1 on failure
-!*****
-    INTEGER(HID_T) :: attr_exists_c
-    INTEGER(SIZE_T) :: attr_namelen
-
-    INTERFACE
-       INTEGER FUNCTION h5aexists_c(obj_id, attr_name, attr_namelen, attr_exists_c)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AEXISTS_C'::h5aexists_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: attr_name
-         INTEGER(HID_T), INTENT(IN) :: obj_id
-         CHARACTER(LEN=*), INTENT(IN) :: attr_name
-         INTEGER(SIZE_T) :: attr_namelen
-         INTEGER(HID_T) :: attr_exists_c
-       END FUNCTION h5aexists_c
-    END INTERFACE
-
-    attr_namelen = LEN(attr_name)
-
-    hdferr = h5aexists_c(obj_id, attr_name, attr_namelen, attr_exists_c)
-
-    attr_exists = .FALSE.
-    IF(attr_exists_c.GT.0) attr_exists = .TRUE.
-
-  END SUBROUTINE h5aexists_f
-
-!
-!****s* H5A/H5Aexists_by_name_f
-!
-! NAME
-!  H5Aexists_by_name_f
-!
-! PURPOSE
-!  Determines whether an attribute with a given name exists on an object
-!
-! INPUTS
-!  loc_id 	 - Location identifier
-!  obj_name 	 - Object name either relative to loc_id, absolute from the file’s root group, or '.' (a dot)
-!  attr_name 	 - Attribute name
-!
-! OUTPUTS
-!  attr_exists 	 - attribute exists status
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! OPTIONAL PARAMETERS
-!  lapl_id 	 - Link access property list identifier
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  February, 2008
-!
-! SOURCE
-  SUBROUTINE h5aexists_by_name_f(loc_id, obj_name, attr_name, attr_exists, hdferr, lapl_id)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id     ! Location identifier
-    CHARACTER(LEN=*), INTENT(IN) :: obj_name ! Object name either relative to loc_id,
-                                             ! absolute from the file’s root group, or '.'
-    CHARACTER(LEN=*), INTENT(IN) :: attr_name ! Attribute name
-    LOGICAL, INTENT(OUT) :: attr_exists ! .TRUE. if exists, .FALSE. otherwise
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code:
-                                        ! 0 on success and -1 on failure
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id ! Link access property list identifier
-!*****
-    INTEGER :: attr_exists_c
-    INTEGER(SIZE_T)  :: obj_namelen
-    INTEGER(SIZE_T)  :: attr_namelen
-
-    INTEGER(HID_T) :: lapl_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5aexists_by_name_c(loc_id, obj_name, obj_namelen, attr_name, attr_namelen, lapl_id_default, attr_exists_c)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AEXISTS_BY_NAME_C'::h5aexists_by_name_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: obj_name, attr_name 
-         INTEGER(HID_T), INTENT(IN) :: loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: obj_name
-         INTEGER(SIZE_T), INTENT(IN) :: obj_namelen
-         CHARACTER(LEN=*), INTENT(IN) :: attr_name
-         INTEGER(SIZE_T), INTENT(IN) :: attr_namelen
-         INTEGER(HID_T), INTENT(IN) :: lapl_id_default
-         INTEGER, INTENT(OUT) :: attr_exists_c
-       END FUNCTION h5aexists_by_name_c
-    END INTERFACE
-
-    attr_namelen = LEN(attr_name)
-    obj_namelen = LEN(obj_name)
-
-    lapl_id_default = H5P_DEFAULT_F
-    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
-
-    hdferr = h5aexists_by_name_c(loc_id, obj_name, obj_namelen, attr_name, attr_namelen, lapl_id_default, attr_exists_c)
-
-    attr_exists = .FALSE.
-    IF(attr_exists_c.GT.0) attr_exists = .TRUE.
-
-  END SUBROUTINE h5aexists_by_name_f
-!
-!****s* H5A/H5Aopen_by_name_f
-!
-! NAME
-!  H5Aopen_by_name_f
-!
-! PURPOSE
-!  Opens an attribute for an object by object name and attribute name.
-!
-! INPUTS
-!  loc_id 	 - Location from which to find object to which attribute is attached
-!  obj_name 	 - Object name either relative to loc_id, absolute from the file’s root group, or '.' (a dot)
-!  attr_name 	 - Attribute name
-!
-! OUTPUTS
-!  attr_id 	 - attribute identifier
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! OPTIONAL PARAMETERS
-!  aapl_id 	 - Attribute access property list (Currently unused; should be passed in as H5P_DEFAULT.)
-!  lapl_id 	 - Link access property list identifier
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  February, 2008
-! SOURCE
-  SUBROUTINE h5aopen_by_name_f(loc_id, obj_name, attr_name, attr_id, hdferr, aapl_id, lapl_id)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id    ! Location identifier
-    CHARACTER(LEN=*), INTENT(IN) :: obj_name ! Object name either relative to loc_id,
-                                             ! absolute from the file’s root group, or '.'
-    CHARACTER(LEN=*), INTENT(IN) :: attr_name ! Attribute name
-    INTEGER(HID_T), INTENT(OUT) :: attr_id ! Attribute identifier
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code:
-                                           ! 0 on success and -1 on failure
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: aapl_id ! Attribute access property list
-                                                    ! (Currently unused; should be passed in as H5P_DEFAULT_F)
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id ! Link access property list identifier
-!*****
-    INTEGER(HID_T) :: aapl_id_default
-    INTEGER(HID_T) :: lapl_id_default
-
-    INTEGER(SIZE_T) :: obj_namelen
-    INTEGER(SIZE_T) :: attr_namelen
-
-    INTERFACE
-       INTEGER FUNCTION h5aopen_by_name_c(loc_id, obj_name, obj_namelen, attr_name, attr_namelen, &
-            aapl_id_default, lapl_id_default, attr_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AOPEN_BY_NAME_C'::h5aopen_by_name_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: obj_name, attr_name
-         INTEGER(HID_T), INTENT(IN) :: loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: obj_name
-         INTEGER(SIZE_T), INTENT(IN) :: obj_namelen
-         CHARACTER(LEN=*), INTENT(IN) :: attr_name
-         INTEGER(SIZE_T), INTENT(IN) :: attr_namelen
-         INTEGER(HID_T) :: aapl_id_default
-         INTEGER(HID_T) :: lapl_id_default
-         INTEGER(HID_T), INTENT(OUT) :: attr_id
-       END FUNCTION h5aopen_by_name_c
-    END INTERFACE
-
-    attr_namelen = LEN(attr_name)
-    obj_namelen = LEN(obj_name)
-
-    aapl_id_default = H5P_DEFAULT_F
-    lapl_id_default = H5P_DEFAULT_F
-    IF(PRESENT(aapl_id)) aapl_id_default = aapl_id
-    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
-
-    hdferr = h5aopen_by_name_c(loc_id, obj_name, obj_namelen, attr_name, attr_namelen, &
-         aapl_id_default, lapl_id_default, attr_id)
-
-  END SUBROUTINE h5aopen_by_name_f
-
-!
-!****s* H5A/h5arename_f
-!
-! NAME
-!  h5arename_f
-!
-! PURPOSE
-!  Renames an attribute
-!
-! INPUTS
-!  loc_id 	 - Location or object identifier; may be dataset or group
-!  old_attr_name - Prior attribute name
-!  new_attr_name - New attribute name
-!
-! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  January, 2008
-!
-! HISTORY
-!  N/A
-!
-!
-
-! SOURCE
-  SUBROUTINE h5arename_f(loc_id, old_attr_name, new_attr_name, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id    ! Object identifier
-    CHARACTER(LEN=*), INTENT(IN) :: old_attr_name ! Prior attribute name
-    CHARACTER(LEN=*), INTENT(IN) :: new_attr_name ! New attribute name
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code:
-                                         ! 0 on success and -1 on failure
-!*****
-    INTEGER(SIZE_T) :: old_attr_namelen
-    INTEGER(SIZE_T) :: new_attr_namelen
-
-    INTERFACE
-       INTEGER FUNCTION h5arename_c(loc_id, &
-            old_attr_name, old_attr_namelen, new_attr_name, new_attr_namelen)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5ARENAME_C'::h5arename_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: old_attr_name, new_attr_name
-         INTEGER(HID_T), INTENT(IN) :: loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: old_attr_name
-         INTEGER(SIZE_T) :: old_attr_namelen
-         CHARACTER(LEN=*), INTENT(IN) :: new_attr_name
-         INTEGER(SIZE_T) :: new_attr_namelen
-
-       END FUNCTION h5arename_c
-    END INTERFACE
-
-    old_attr_namelen = LEN(old_attr_name)
-    new_attr_namelen = LEN(new_attr_name)
-
-    hdferr = h5arename_c(loc_id, &
-         old_attr_name, old_attr_namelen, new_attr_name, new_attr_namelen)
-
-  END SUBROUTINE h5arename_f
-
-END MODULE H5A
-
-
diff --git a/fortran/src/H5Aff_F03.f90 b/fortran/src/H5Aff_F03.f90
deleted file mode 100644
index 5278280..0000000
--- a/fortran/src/H5Aff_F03.f90
+++ /dev/null
@@ -1,1267 +0,0 @@
-!****h* ROBODoc/H5A (F03)
-! NAME
-!  H5A_PROVISIONAL
-!
-! FILE
-!  src/fortran/src/H5Aff_F03.f90
-!
-! PURPOSE
-!  This file contains Fortran 90 and Fortran 2003 interfaces for H5A functions.
-!  It contains the same functions as H5Aff_F90.f90 but includes the
-!  Fortran 2003 functions and the interface listings. This file will be compiled
-!  instead of H5Aff_F90.f90 if Fortran 2003 functions are enabled.
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! NOTES
-!
-!  (A) C_LOC and character strings according to the Fortran 2003 standard:
-!
-!  15.1.2.5 C_LOC(X)
-!
-!  Argument. X shall either
-!
-!  (1) have interoperable type and type parameters and be
-!    (a) a variable that has the TARGET attribute and is interoperable,
-!    (b) an allocated allocatable variable that has the TARGET attribute
-!        and is not an array of zero size, or
-!    (c) an associated scalar pointer, or
-!  (2) be a nonpolymorphic scalar, have no length type parameters, and be
-!    (a) a nonallocatable, nonpointer variable that has the TARGET attribute,
-!    (b) an allocated allocatable variable that has the TARGET attribute, or
-!    (c) an associated pointer.
-!
-!  - When X is a character, for interoperability the standard is:
-!
-!  15.2.1 Interoperability of intrinsic types
-!
-!  ...if the type is character, interoperability also requires that the length type parameter
-!  be omitted or be specified by an initialization expression whose value is one.
-!
-!  THEREFORE compilers that have not extended the standard  require
-!
-!  CHARACTER(LEN=1), TARGET :: chr
-!  or
-!  CHARACTER, TARGET :: chr
-!
-!  (B)
-!                         *** IMPORTANT ***
-!  If you add a new H5A function you must add the function name to the
-!  Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
-!  This is needed for Windows based operating systems.
-!
-!*****
-
-MODULE H5A_PROVISIONAL
-
-  USE H5GLOBAL
-!
-!  On Windows there are no big (integer*8) integers, so overloading
-!  for bug #670 does not work. I have to use DEC compilation directives to make
-!  Windows DEC Visual Fortran and OSF compilers happy and do right things.
-!  05/01/02 EP
-!
-  INTERFACE h5awrite_f
-     MODULE PROCEDURE h5awrite_integer_scalar
-     MODULE PROCEDURE h5awrite_integer_1
-     MODULE PROCEDURE h5awrite_integer_2
-     MODULE PROCEDURE h5awrite_integer_3
-     MODULE PROCEDURE h5awrite_integer_4
-     MODULE PROCEDURE h5awrite_integer_5
-     MODULE PROCEDURE h5awrite_integer_6
-     MODULE PROCEDURE h5awrite_integer_7
-     MODULE PROCEDURE h5awrite_char_scalar
-     MODULE PROCEDURE h5awrite_char_1
-     MODULE PROCEDURE h5awrite_char_2
-     MODULE PROCEDURE h5awrite_char_3
-     MODULE PROCEDURE h5awrite_char_4
-     MODULE PROCEDURE h5awrite_char_5
-     MODULE PROCEDURE h5awrite_char_6
-     MODULE PROCEDURE h5awrite_char_7
-     MODULE PROCEDURE h5awrite_real_scalar
-     MODULE PROCEDURE h5awrite_real_1
-     MODULE PROCEDURE h5awrite_real_2
-     MODULE PROCEDURE h5awrite_real_3
-     MODULE PROCEDURE h5awrite_real_4
-     MODULE PROCEDURE h5awrite_real_5
-     MODULE PROCEDURE h5awrite_real_6
-     MODULE PROCEDURE h5awrite_real_7
-     ! This is the preferred way to call h5awrite
-     ! by passing an address
-     MODULE PROCEDURE h5awrite_ptr
-
-  END INTERFACE
-
-  INTERFACE h5aread_f
-
-     MODULE PROCEDURE h5aread_integer_scalar
-     MODULE PROCEDURE h5aread_integer_1
-     MODULE PROCEDURE h5aread_integer_2
-     MODULE PROCEDURE h5aread_integer_3
-     MODULE PROCEDURE h5aread_integer_4
-     MODULE PROCEDURE h5aread_integer_5
-     MODULE PROCEDURE h5aread_integer_6
-     MODULE PROCEDURE h5aread_integer_7
-     MODULE PROCEDURE h5aread_char_scalar
-     MODULE PROCEDURE h5aread_char_1
-     MODULE PROCEDURE h5aread_char_2
-     MODULE PROCEDURE h5aread_char_3
-     MODULE PROCEDURE h5aread_char_4
-     MODULE PROCEDURE h5aread_char_5
-     MODULE PROCEDURE h5aread_char_6
-     MODULE PROCEDURE h5aread_char_7
-     MODULE PROCEDURE h5aread_real_scalar
-     MODULE PROCEDURE h5aread_real_1
-     MODULE PROCEDURE h5aread_real_2
-     MODULE PROCEDURE h5aread_real_3
-     MODULE PROCEDURE h5aread_real_4
-     MODULE PROCEDURE h5aread_real_5
-     MODULE PROCEDURE h5aread_real_6
-     MODULE PROCEDURE h5aread_real_7
-
-     ! This is the preferred way to call h5aread
-     ! by passing an address
-     MODULE PROCEDURE h5aread_ptr
-
-  END INTERFACE
-
-!  Interface for the function used to pass the C pointer of the buffer
-!  to the C H5Awrite routine
-
-  INTERFACE
-     INTEGER FUNCTION h5awrite_f_c(attr_id, mem_type_id, buf) BIND(C, NAME='h5awrite_f_c')
-       USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_ptr
-       USE H5GLOBAL
-       INTEGER(HID_T), INTENT(IN) :: attr_id
-       INTEGER(HID_T), INTENT(IN) :: mem_type_id
-       TYPE(C_PTR), VALUE :: buf
-     END FUNCTION h5awrite_f_c
-  END INTERFACE
-
-!  Interface for the function used to pass the C pointer of the buffer
-!  to the C H5Aread routine
-
-  INTERFACE
-     INTEGER FUNCTION h5aread_f_c(attr_id, mem_type_id, buf) BIND(C, NAME='h5aread_f_c')
-       USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_ptr
-       USE H5GLOBAL
-       INTEGER(HID_T), INTENT(IN) :: attr_id
-       INTEGER(HID_T), INTENT(IN) :: mem_type_id
-       TYPE(C_PTR), VALUE :: buf
-     END FUNCTION h5aread_f_c
-  END INTERFACE
-
-CONTAINS
-
-!****s* H5A (F03)/h5awrite_f_F90
-!
-! NAME
-!  h5awrite_f_F90
-!
-! PURPOSE
-!  Writes an attribute.
-!
-! Inputs:
-!  attr_id     - Attribute identifier
-!  memtype_id  - Attribute datatype identifier  (in memory)
-!  dims        - Array to hold corresponding dimension sizes of data buffer buf;
-!                dim(k) has value of the k-th dimension of buffer buf;
-!                values are ignored if buf is a scalar
-!  buf 	       - Data buffer; may be a scalar or an array
-!
-! Outputs:
-!  hdferr      - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces are added for
-!  called C functions (it is needed for Windows
-!  port).  February 27, 2001
-!
-!  dims parameter was added to make code portable;
-!  Aprile 4, 2001
-!
-!  Changed buf intent to INOUT to be consistant
-!  with how the C functions handles it. The pg
-!  compiler will return 0 if a buf value is not set.
-!  February, 2008
-!
-! NOTES
-!  This function is overloaded to write INTEGER,
-!  REAL, DOUBLE PRECISION and CHARACTER buffers
-!  up to 7 dimensions.
-!
-! Fortran90 Interface:
-!!  SUBROUTINE h5awrite_f(attr_id, memtype_id, buf, dims, hdferr) 
-!!    INTEGER(HID_T)  , INTENT(IN)               :: attr_id
-!!    INTEGER(HID_T)  , INTENT(IN)               :: memtype_id
-!!    TYPE            , INTENT(IN)               :: buf
-!!    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-!!    INTEGER         , INTENT(OUT)              :: hdferr
-!*****
-
-
-  SUBROUTINE h5awrite_integer_scalar(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    INTEGER, INTENT(IN), TARGET :: buf                 ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr                     ! Error code
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(buf)
-
-    hdferr = h5awrite_f_c(attr_id, memtype_id, f_ptr)
-
-  END SUBROUTINE h5awrite_integer_scalar
-
-  SUBROUTINE h5awrite_integer_1(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    INTEGER, INTENT(IN) , &
-         DIMENSION(dims(1)), TARGET :: buf  ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-    TYPE(C_PTR) :: f_ptr
-    
-    f_ptr = C_LOC(buf(1))
-
-    hdferr = h5awrite_f_c(attr_id, memtype_id, f_ptr)
-  END SUBROUTINE h5awrite_integer_1
-
-
-  SUBROUTINE h5awrite_integer_2(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    INTEGER, INTENT(IN) , &
-         DIMENSION(dims(1),dims(2)), TARGET :: buf
-                                            ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(buf(1,1))
-
-    hdferr = h5awrite_f_c(attr_id, memtype_id, f_ptr)
-
-  END SUBROUTINE h5awrite_integer_2
-
-  SUBROUTINE h5awrite_integer_3(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-    INTEGER, INTENT(IN), DIMENSION(dims(1),dims(2),dims(3)), TARGET :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(buf(1,1,1))
-
-    hdferr = h5awrite_f_c(attr_id, memtype_id, f_ptr)
-
-  END SUBROUTINE h5awrite_integer_3
-
-
-  SUBROUTINE h5awrite_integer_4(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims! Array to story buf dimension sizes
-    INTEGER, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4)), TARGET :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(buf(1,1,1,1))
-
-    hdferr = h5awrite_f_c(attr_id, memtype_id, f_ptr)
-
-  END SUBROUTINE h5awrite_integer_4
-
-
-  SUBROUTINE h5awrite_integer_5(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    INTEGER, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)), TARGET :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(buf(1,1,1,1,1))
-
-    hdferr = h5awrite_f_c(attr_id, memtype_id, f_ptr)
-
-  END SUBROUTINE h5awrite_integer_5
-
-
-  SUBROUTINE h5awrite_integer_6(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    INTEGER, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)), TARGET :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(buf(1,1,1,1,1,1))
-
-    hdferr = h5awrite_f_c(attr_id, memtype_id, f_ptr)
-  END SUBROUTINE h5awrite_integer_6
-
-
-  SUBROUTINE h5awrite_integer_7(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    INTEGER, INTENT(IN), DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)), &
-         TARGET :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(buf(1,1,1,1,1,1,1))
-
-    hdferr = h5awrite_f_c(attr_id, memtype_id, f_ptr)
-
-  END SUBROUTINE h5awrite_integer_7
-
-
-  SUBROUTINE h5awrite_real_scalar(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    REAL, INTENT(IN), TARGET :: buf          ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(buf)
-
-    hdferr = h5awrite_f_c(attr_id, memtype_id, f_ptr)
-  END SUBROUTINE h5awrite_real_scalar
-
-  SUBROUTINE h5awrite_real_1(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    REAL, INTENT(IN), &
-         DIMENSION(dims(1)), TARGET :: buf  ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(buf(1))
-
-    hdferr = h5awrite_f_c(attr_id, memtype_id, f_ptr)
-
-  END SUBROUTINE h5awrite_real_1
-
-
-  SUBROUTINE h5awrite_real_2(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    REAL, INTENT(IN), &
-         DIMENSION(dims(1),dims(2)), TARGET :: buf
-    ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(buf(1,1))
-
-    hdferr = h5awrite_f_c(attr_id, memtype_id, f_ptr)
-
-  END SUBROUTINE h5awrite_real_2
-
-
-  SUBROUTINE h5awrite_real_3(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-    REAL, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3)), TARGET :: buf
-    ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(buf(1,1,1))
-
-    hdferr = h5awrite_f_c(attr_id, memtype_id, f_ptr)
-  END SUBROUTINE h5awrite_real_3
-
-
-  SUBROUTINE h5awrite_real_4(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-    REAL, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4)), TARGET :: buf
-    ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(buf(1,1,1,1))
-
-    hdferr = h5awrite_f_c(attr_id, memtype_id, f_ptr)
-  END SUBROUTINE h5awrite_real_4
-
-
-  SUBROUTINE h5awrite_real_5(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-    REAL, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)), TARGET :: buf
-    ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(buf)
-
-    hdferr = h5awrite_f_c(attr_id, memtype_id, f_ptr)
-  END SUBROUTINE h5awrite_real_5
-
-
-  SUBROUTINE h5awrite_real_6(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    REAL, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)), TARGET :: buf
-    ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(buf(1,1,1,1,1,1))
-
-    hdferr = h5awrite_f_c(attr_id, memtype_id, f_ptr)
-  END SUBROUTINE h5awrite_real_6
-
-
-  SUBROUTINE h5awrite_real_7(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    REAL, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)), TARGET :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(buf(1,1,1,1,1,1,1))
-
-    hdferr = h5awrite_f_c(attr_id, memtype_id, f_ptr)
-  END SUBROUTINE h5awrite_real_7
-
-  SUBROUTINE h5awrite_char_scalar(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id               ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id            ! Attribute datatype
-                                                        !  identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims  ! Array to story buf dimension sizes
-    CHARACTER(LEN=*), INTENT(IN) :: buf                 ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr                      ! Error code
-
-    CALL h5awrite_char_scalar_fix(attr_id, memtype_id, buf, LEN(buf), dims, hdferr)
-
-  END SUBROUTINE h5awrite_char_scalar
-
-  SUBROUTINE h5awrite_char_scalar_fix(attr_id, memtype_id, buf, buf_len, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id               ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id            ! Attribute datatype
-                                                        !  identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims  ! Array to story buf dimension sizes
-    INTEGER, INTENT(IN)  :: buf_len
-    CHARACTER(LEN=buf_len), INTENT(IN), TARGET :: buf   ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr                      ! Error code
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(buf(1:1))
-
-    hdferr = h5awrite_f_c(attr_id, memtype_id, f_ptr)
-
-  END SUBROUTINE h5awrite_char_scalar_fix
-
-  SUBROUTINE h5awrite_char_1(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    CHARACTER(LEN=*), INTENT(IN), DIMENSION(dims(1)), TARGET :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(buf(1)(1:1))
-
-    hdferr = h5awrite_f_c(attr_id, memtype_id, f_ptr)
-
-  END SUBROUTINE h5awrite_char_1
-
-  SUBROUTINE h5awrite_char_2(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims  ! Array to story buf dimension sizes
-    CHARACTER(LEN=*), INTENT(IN), &
-         DIMENSION(dims(1),dims(2)), TARGET :: buf  ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(buf(1,1)(1:1))
-    hdferr = h5awrite_f_c(attr_id, memtype_id, f_ptr)
-
-  END SUBROUTINE h5awrite_char_2
-
-  SUBROUTINE h5awrite_char_3(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    CHARACTER(LEN=*), INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3)), TARGET :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(buf(1,1,1)(1:1))
-
-    hdferr = h5awrite_f_c(attr_id, memtype_id, f_ptr)
-
-  END SUBROUTINE h5awrite_char_3
-
-  SUBROUTINE h5awrite_char_4(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    CHARACTER(LEN=*), INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4)), TARGET :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(buf(1,1,1,1)(1:1))
-
-    hdferr = h5awrite_f_c(attr_id, memtype_id, f_ptr)
-
-  END SUBROUTINE h5awrite_char_4
-
-  SUBROUTINE h5awrite_char_5(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    CHARACTER(LEN=*), INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)), TARGET :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(buf(1,1,1,1,1)(1:1))
-
-    hdferr = h5awrite_f_c(attr_id, memtype_id, f_ptr)
-
-  END SUBROUTINE h5awrite_char_5
-
-
-  SUBROUTINE h5awrite_char_6(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    CHARACTER(LEN=*), INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)), TARGET :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(buf(1,1,1,1,1,1)(1:1))
-
-    hdferr = h5awrite_f_c(attr_id, memtype_id, f_ptr)
-
-  END SUBROUTINE h5awrite_char_6
-
-  SUBROUTINE h5awrite_char_7(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    CHARACTER(LEN=*), INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)), TARGET :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(buf(1,1,1,1,1,1,1)(1:1))
-    hdferr = h5awrite_f_c(attr_id, memtype_id, f_ptr)
-
-  END SUBROUTINE h5awrite_char_7
-
-!****s* H5A (F03)/h5awrite_f_F03
-!
-! NAME
-!  h5awrite_f_F03
-!
-! PURPOSE
-!  Writes an attribute.
-!
-! Inputs:
-!  attr_id     - Attribute identifier
-!  memtype_id  - Attribute datatype identifier  (in memory)
-!  buf 	       - Data buffer; may be a scalar or an array
-!
-! Outputs:
-!  hdferr      - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces are added for
-!  called C functions (it is needed for Windows
-!  port).  February 27, 2001
-!
-! NOTES
-!  This function is overloaded to write INTEGER,
-!  REAL, DOUBLE PRECISION and CHARACTER buffers
-!  up to 7 dimensions.
-!
-! Fortran2003 Interface:
-!!  SUBROUTINE h5awrite_f(attr_id, memtype_id, buf, hdferr) 
-!!    INTEGER(HID_T)  , INTENT(IN)  :: attr_id
-!!    INTEGER(HID_T)  , INTENT(IN)  :: memtype_id
-!!    TYPE(C_PTR)     , INTENT(IN)  :: buf
-!!    INTEGER         , INTENT(OUT) :: hdferr
-!*****
-
-  SUBROUTINE h5awrite_ptr(attr_id, mem_type_id, buf, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id     ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    TYPE(C_PTR), INTENT(IN), TARGET :: buf
-    INTEGER, INTENT(OUT) :: hdferr            ! Error code
-
-    hdferr = h5awrite_f_c(attr_id, mem_type_id, buf)
-
-  END SUBROUTINE h5awrite_ptr
-
-!****s* H5A (F03)/h5aread_f_F90
-!
-! NAME
-!  h5aread_f_F90
-!
-! PURPOSE
-!  Reads an attribute.
-!
-! Inputs:
-!  attr_id     - Attribute identifier
-!  memtype_id  - Attribute datatype identifier  (in memory)
-!  dims        - Array to hold corresponding dimension sizes of data buffer buf;
-!                dim(k) has value of the k-th dimension of buffer buf;
-!                values are ignored if buf is a scalar
-!
-! Outputs:
-!  buf 	       - Data buffer; may be a scalar or an array
-!  hdferr      - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces are added for
-!  called C functions (it is needed for Windows
-!  port).  February 27, 2001
-!
-!  dims parameter was added to make code portable;
-!  Aprile 4, 2001
-!
-!  Changed buf intent to INOUT to be consistant
-!  with how the C functions handles it. The pg
-!  compiler will return 0 if a buf value is not set.
-!  February, 2008
-!
-! NOTES
-!  This function is overloaded to write INTEGER,
-!  REAL, DOUBLE PRECISION and CHARACTER buffers
-!  up to 7 dimensions.
-! Fortran90 Interface:
-!!  SUBROUTINE h5aread_f(attr_id, memtype_id, buf, dims, hdferr) 
-!!    INTEGER(HID_T)  , INTENT(IN)               :: attr_id
-!!    INTEGER(HID_T)  , INTENT(IN)               :: memtype_id
-!!    TYPE            , INTENT(INOUT)            :: buf
-!!    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-!!    INTEGER         , INTENT(OUT)              :: hdferr
-!*****
-  SUBROUTINE h5aread_integer_scalar(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    INTEGER, INTENT(INOUT), TARGET :: buf              ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code 
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(buf)
-
-    hdferr = h5aread_f_c(attr_id, memtype_id, f_ptr)
-  END SUBROUTINE h5aread_integer_scalar
-
-  SUBROUTINE h5aread_integer_1(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    INTEGER, INTENT(INOUT), DIMENSION(dims(1)), TARGET :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(buf(1))
-
-    hdferr = h5aread_f_c(attr_id, memtype_id, f_ptr)
-  END SUBROUTINE h5aread_integer_1
-
-
-  SUBROUTINE h5aread_integer_2(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    INTEGER, INTENT(INOUT),DIMENSION(dims(1),dims(2)), TARGET :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(buf(1,1))
-
-    hdferr = h5aread_f_c(attr_id, memtype_id, f_ptr)
-  END SUBROUTINE h5aread_integer_2
-
-
-  SUBROUTINE h5aread_integer_3(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    INTEGER, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3)), TARGET :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(buf(1,1,1))
-
-    hdferr = h5aread_f_c(attr_id, memtype_id, f_ptr)
-  END SUBROUTINE h5aread_integer_3
-
-
-  SUBROUTINE h5aread_integer_4(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    INTEGER, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4)), TARGET :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(buf(1,1,1,1))
-
-    hdferr = h5aread_f_c(attr_id, memtype_id, f_ptr)
-  END SUBROUTINE h5aread_integer_4
-
-
-  SUBROUTINE h5aread_integer_5(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    INTEGER, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)), TARGET :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(buf(1,1,1,1,1))
-
-    hdferr = h5aread_f_c(attr_id, memtype_id, f_ptr)
-  END SUBROUTINE h5aread_integer_5
-
-
-  SUBROUTINE h5aread_integer_6(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    INTEGER, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)), TARGET :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(buf(1,1,1,1,1,1))
-
-    hdferr = h5aread_f_c(attr_id, memtype_id, f_ptr)
-  END SUBROUTINE h5aread_integer_6
-
-
-  SUBROUTINE h5aread_integer_7(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    INTEGER, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)), TARGET :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(buf(1,1,1,1,1,1,1))
-
-    hdferr = h5aread_f_c(attr_id, memtype_id, f_ptr)
-  END SUBROUTINE h5aread_integer_7
-
-
-  SUBROUTINE h5aread_real_scalar(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    REAL, INTENT(INOUT), TARGET :: buf                 ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(buf)
-
-    hdferr = h5aread_f_c(attr_id, memtype_id, f_ptr)
-  END SUBROUTINE h5aread_real_scalar
-
-  SUBROUTINE h5aread_real_1(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    REAL, INTENT(INOUT), &
-         DIMENSION(dims(1)), TARGET :: buf  ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(buf(1))
-
-    hdferr = h5aread_f_c(attr_id, memtype_id, f_ptr)
-  END SUBROUTINE h5aread_real_1
-
-
-  SUBROUTINE h5aread_real_2(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    REAL, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2)), TARGET :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(buf(1,1))
-
-    hdferr = h5aread_f_c(attr_id, memtype_id, f_ptr)
-  END SUBROUTINE h5aread_real_2
-
-
-  SUBROUTINE h5aread_real_3(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    REAL, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3)), TARGET :: buf
-                                            ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(buf(1,1,1))
-
-    hdferr = h5aread_f_c(attr_id, memtype_id, f_ptr)
-  END SUBROUTINE h5aread_real_3
-
-
-  SUBROUTINE h5aread_real_4(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    REAL, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4)), TARGET :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(buf(1,1,1,1))
-
-    hdferr = h5aread_f_c(attr_id, memtype_id, f_ptr)
-  END SUBROUTINE h5aread_real_4
-
-
-  SUBROUTINE h5aread_real_5(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    REAL, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)), TARGET :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(buf(1,1,1,1,1))
-
-    hdferr = h5aread_f_c(attr_id, memtype_id, f_ptr)
-  END SUBROUTINE h5aread_real_5
-
-
-  SUBROUTINE h5aread_real_6(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    REAL, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)), TARGET :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(buf(1,1,1,1,1,1))
-
-    hdferr = h5aread_f_c(attr_id, memtype_id, f_ptr)
-  END SUBROUTINE h5aread_real_6
-
-
-  SUBROUTINE h5aread_real_7(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    REAL, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)), TARGET :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(buf(1,1,1,1,1,1,1))
-
-    hdferr = h5aread_f_c(attr_id, memtype_id, f_ptr)
-  END SUBROUTINE h5aread_real_7
-
-  SUBROUTINE h5aread_char_scalar(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    CHARACTER(LEN=*), INTENT(INOUT) :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-
-    CALL h5aread_char_scalar_fix(attr_id, memtype_id, buf, LEN(buf), hdferr)
-
-  END SUBROUTINE h5aread_char_scalar
-
-  SUBROUTINE h5aread_char_scalar_fix(attr_id, memtype_id, buf, buf_len, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER, INTENT(IN)  :: buf_len
-    CHARACTER(LEN=buf_len), INTENT(INOUT), TARGET :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(buf(1:1))
-
-    hdferr = h5aread_f_c(attr_id, memtype_id, f_ptr)
-
-  END SUBROUTINE h5aread_char_scalar_fix
-
-  SUBROUTINE h5aread_char_1(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    CHARACTER(LEN=*), INTENT(INOUT), &
-         DIMENSION(dims(1)), TARGET :: buf  ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(buf(1)(1:1))
-    hdferr = h5aread_f_c(attr_id, memtype_id, f_ptr)
-
-  END SUBROUTINE h5aread_char_1
-
-
-  SUBROUTINE h5aread_char_2(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    CHARACTER(LEN=*), INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2)), TARGET :: buf  ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(buf(1,1)(1:1))
-    hdferr = h5aread_f_c(attr_id, memtype_id, f_ptr)
-
-  END SUBROUTINE h5aread_char_2
-
-
-  SUBROUTINE h5aread_char_3(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    CHARACTER(LEN=*), INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3)), TARGET :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(buf(1,1,1)(1:1))
-    hdferr = h5aread_f_c(attr_id, memtype_id, f_ptr)
-
-  END SUBROUTINE h5aread_char_3
-
-  SUBROUTINE h5aread_char_4(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    CHARACTER(LEN=*), INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4)), TARGET :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(buf(1,1,1,1)(1:1))
-
-    hdferr = h5aread_f_c(attr_id, memtype_id, f_ptr)
-
-  END SUBROUTINE h5aread_char_4
-
-  SUBROUTINE h5aread_char_5(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    CHARACTER(LEN=*), INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)), TARGET :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(buf(1,1,1,1,1)(1:1))
-    hdferr = h5aread_f_c(attr_id, memtype_id, f_ptr)
-
-  END SUBROUTINE h5aread_char_5
-
-
-  SUBROUTINE h5aread_char_6(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    CHARACTER(LEN=*), INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)), TARGET :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(buf(1,1,1,1,1,1)(1:1))
-    hdferr = h5aread_f_c(attr_id, memtype_id, f_ptr)
-
-  END SUBROUTINE h5aread_char_6
-
-
-  SUBROUTINE h5aread_char_7(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    CHARACTER(LEN=*), INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)), TARGET :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(buf(1,1,1,1,1,1,1)(1:1))
-    hdferr = h5aread_f_c(attr_id, memtype_id, f_ptr)
-
-  END SUBROUTINE h5aread_char_7
-
-
-!****s* H5A (F03)/h5aread_f_F03
-!
-! NAME
-!  h5aread_f_F03
-!
-! PURPOSE
-!  Reads an attribute.
-!
-! Inputs:
-!  attr_id     - Attribute identifier
-!  memtype_id  - Attribute datatype identifier  (in memory)
-!
-! Outputs:
-!  buf 	       - Data buffer; may be a scalar or an array
-!  hdferr      - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces are added for
-!  called C functions (it is needed for Windows
-!  port).  February 27, 2001
-!
-!  dims parameter was added to make code portable;
-!  Aprile 4, 2001
-!
-!  Changed buf intent to INOUT to be consistant
-!  with how the C functions handles it. The pg
-!  compiler will return 0 if a buf value is not set.
-!  February, 2008
-!
-! NOTES
-!  This function is overloaded to write INTEGER,
-!  REAL, DOUBLE PRECISION and CHARACTER buffers
-!  up to 7 dimensions.
-! Fortran2003 Interface:
-!!  SUBROUTINE h5aread_f(attr_id, memtype_id, buf, hdferr) 
-!!    INTEGER(HID_T)  , INTENT(IN)    :: attr_id
-!!    INTEGER(HID_T)  , INTENT(IN)    :: memtype_id
-!!    TYPE(C_PTR)     , INTENT(INOUT) :: buf
-!!    INTEGER         , INTENT(OUT)   :: hdferr
-!*****
-
-  SUBROUTINE h5aread_ptr(attr_id, mem_type_id, buf, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id     ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    TYPE(C_PTR), INTENT(INOUT), TARGET :: buf
-    INTEGER, INTENT(OUT) :: hdferr            ! Error code
-
-    hdferr = h5aread_f_c(attr_id, mem_type_id, buf)
-
-  END SUBROUTINE h5aread_ptr
-
-END MODULE H5A_PROVISIONAL
-
-
diff --git a/fortran/src/H5Aff_F90.f90 b/fortran/src/H5Aff_F90.f90
deleted file mode 100644
index 974b023..0000000
--- a/fortran/src/H5Aff_F90.f90
+++ /dev/null
@@ -1,1618 +0,0 @@
-!****h* ROBODoc/H5A (F90)
-!
-! NAME
-!  H5A_PROVISIONAL
-!
-! FILE
-!  fortran/src/H5Aff_F90.f90
-!
-! PURPOSE
-!
-!  This file contains Fortran 90 interfaces for H5A functions. It contains
-!  the same functions as H5Aff_F03.f90 but excludes the Fortran 2003 functions
-!  and the interface listings. This file will be compiled instead of H5Aff_F03.f90
-!  if Fortran 2003 functions are not enabled.
-!
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! NOTES
-!                         *** IMPORTANT ***
-!  If you add a new H5A function you must add the function name to the
-!  Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
-!  This is needed for Windows based operating systems.
-!
-!*****
-
-MODULE H5A_PROVISIONAL
-
-  USE H5GLOBAL
-  !
-  !On Windows there are no big (integer*8) integers, so overloading
-  !for bug #670 does not work. I have to use DEC compilation directives to make
-  !Windows DEC Visual Fortran and OSF compilers happy and do right things.
-  !						05/01/02 EP
-  !
-  INTERFACE h5awrite_f
-
-     MODULE PROCEDURE h5awrite_integer_scalar
-     MODULE PROCEDURE h5awrite_integer_1
-     MODULE PROCEDURE h5awrite_integer_2
-     MODULE PROCEDURE h5awrite_integer_3
-     MODULE PROCEDURE h5awrite_integer_4
-     MODULE PROCEDURE h5awrite_integer_5
-     MODULE PROCEDURE h5awrite_integer_6
-     MODULE PROCEDURE h5awrite_integer_7
-     MODULE PROCEDURE h5awrite_char_scalar
-     MODULE PROCEDURE h5awrite_char_1
-     MODULE PROCEDURE h5awrite_char_2
-     MODULE PROCEDURE h5awrite_char_3
-     MODULE PROCEDURE h5awrite_char_4
-     MODULE PROCEDURE h5awrite_char_5
-     MODULE PROCEDURE h5awrite_char_6
-     MODULE PROCEDURE h5awrite_char_7
-     MODULE PROCEDURE h5awrite_real_scalar
-     MODULE PROCEDURE h5awrite_real_1
-     MODULE PROCEDURE h5awrite_real_2
-     MODULE PROCEDURE h5awrite_real_3
-     MODULE PROCEDURE h5awrite_real_4
-     MODULE PROCEDURE h5awrite_real_5
-     MODULE PROCEDURE h5awrite_real_6
-     MODULE PROCEDURE h5awrite_real_7
-
-  END INTERFACE
-
-  INTERFACE h5aread_f
-
-     MODULE PROCEDURE h5aread_integer_scalar
-     MODULE PROCEDURE h5aread_integer_1
-     MODULE PROCEDURE h5aread_integer_2
-     MODULE PROCEDURE h5aread_integer_3
-     MODULE PROCEDURE h5aread_integer_4
-     MODULE PROCEDURE h5aread_integer_5
-     MODULE PROCEDURE h5aread_integer_6
-     MODULE PROCEDURE h5aread_integer_7
-     MODULE PROCEDURE h5aread_char_scalar
-     MODULE PROCEDURE h5aread_char_1
-     MODULE PROCEDURE h5aread_char_2
-     MODULE PROCEDURE h5aread_char_3
-     MODULE PROCEDURE h5aread_char_4
-     MODULE PROCEDURE h5aread_char_5
-     MODULE PROCEDURE h5aread_char_6
-     MODULE PROCEDURE h5aread_char_7
-     MODULE PROCEDURE h5aread_real_scalar
-     MODULE PROCEDURE h5aread_real_1
-     MODULE PROCEDURE h5aread_real_2
-     MODULE PROCEDURE h5aread_real_3
-     MODULE PROCEDURE h5aread_real_4
-     MODULE PROCEDURE h5aread_real_5
-     MODULE PROCEDURE h5aread_real_6
-     MODULE PROCEDURE h5aread_real_7
-  END INTERFACE
-
-CONTAINS
-
-  SUBROUTINE h5awrite_integer_scalar(attr_id, memtype_id, buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims  ! Array to story buf dimension sizes
-    INTEGER, INTENT(IN) :: buf              ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-
-    INTERFACE
-       INTEGER FUNCTION h5awrite_integer_s_c(attr_id, memtype_id, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_INTEGER_S_C'::h5awrite_integer_s_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         INTEGER, INTENT(IN)::buf
-       END FUNCTION h5awrite_integer_s_c
-    END INTERFACE
-
-    hdferr = h5awrite_integer_s_c(attr_id, memtype_id, buf, dims)
-  END SUBROUTINE h5awrite_integer_scalar
-
-  SUBROUTINE h5awrite_integer_1(attr_id, memtype_id, buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    INTEGER, INTENT(IN) , &
-         DIMENSION(dims(1)) :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr ! Error code
-    !            INTEGER, EXTERNAL :: h5awrite_integer_1_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5awrite_integer_1_c(attr_id, memtype_id, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_INTEGER_1_C'::h5awrite_integer_1_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         INTEGER, INTENT(IN), DIMENSION(dims(1)) :: buf
-       END FUNCTION h5awrite_integer_1_c
-    END INTERFACE
-
-    hdferr = h5awrite_integer_1_c(attr_id, memtype_id, buf, dims)
-
-  END SUBROUTINE h5awrite_integer_1
-
-
-  SUBROUTINE h5awrite_integer_2(attr_id, memtype_id, buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    INTEGER, INTENT(IN) , &
-         DIMENSION(dims(1),dims(2)) :: buf  ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-
-    !            INTEGER, EXTERNAL :: h5awrite_integer_2_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5awrite_integer_2_c(attr_id, memtype_id, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_INTEGER_2_C'::h5awrite_integer_2_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         INTEGER, INTENT(IN), DIMENSION(dims(1),dims(2)) :: buf
-       END FUNCTION h5awrite_integer_2_c
-    END INTERFACE
-
-    hdferr = h5awrite_integer_2_c(attr_id, memtype_id, buf, dims)
-  END SUBROUTINE h5awrite_integer_2
-
-
-  SUBROUTINE h5awrite_integer_3(attr_id, memtype_id, buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    INTEGER, INTENT(IN), DIMENSION(dims(1),dims(2),dims(3)) :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-
-    !            INTEGER, EXTERNAL :: h5awrite_integer_3_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5awrite_integer_3_c(attr_id, memtype_id, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_INTEGER_3_C'::h5awrite_integer_3_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         INTEGER, INTENT(IN), DIMENSION(dims(1),dims(2),dims(3)) :: buf
-       END FUNCTION h5awrite_integer_3_c
-    END INTERFACE
-
-    hdferr = h5awrite_integer_3_c(attr_id, memtype_id, buf, dims)
-  END SUBROUTINE h5awrite_integer_3
-
-
-  SUBROUTINE h5awrite_integer_4(attr_id, memtype_id, buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    INTEGER, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-
-    !            INTEGER, EXTERNAL :: h5awrite_integer_4_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5awrite_integer_4_c(attr_id, memtype_id, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_INTEGER_4_C'::h5awrite_integer_4_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         INTEGER, INTENT(IN), DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-       END FUNCTION h5awrite_integer_4_c
-    END INTERFACE
-
-    hdferr = h5awrite_integer_4_c(attr_id, memtype_id, buf, dims)
-  END SUBROUTINE h5awrite_integer_4
-
-
-  SUBROUTINE h5awrite_integer_5(attr_id, memtype_id, buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-    INTEGER, INTENT(IN), DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-
-    !            INTEGER, EXTERNAL :: h5awrite_integer_5_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5awrite_integer_5_c(attr_id, memtype_id, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_INTEGER_5_C'::h5awrite_integer_5_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         INTEGER, INTENT(IN), DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-       END FUNCTION h5awrite_integer_5_c
-    END INTERFACE
-
-    hdferr = h5awrite_integer_5_c(attr_id, memtype_id, buf, dims)
-  END SUBROUTINE h5awrite_integer_5
-
-
-  SUBROUTINE h5awrite_integer_6(attr_id, memtype_id, buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    INTEGER, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-
-    !            INTEGER, EXTERNAL :: h5awrite_integer_6_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5awrite_integer_6_c(attr_id, memtype_id, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_INTEGER_6_C'::h5awrite_integer_6_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         INTEGER, INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-       END FUNCTION h5awrite_integer_6_c
-    END INTERFACE
-
-    hdferr = h5awrite_integer_6_c(attr_id, memtype_id, buf, dims)
-  END SUBROUTINE h5awrite_integer_6
-
-
-  SUBROUTINE h5awrite_integer_7(attr_id, memtype_id, buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    INTEGER, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-
-    !            INTEGER, EXTERNAL :: h5awrite_integer_7_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5awrite_integer_7_c(attr_id, memtype_id, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_INTEGER_7_C'::h5awrite_integer_7_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         INTEGER, INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-       END FUNCTION h5awrite_integer_7_c
-    END INTERFACE
-
-    hdferr = h5awrite_integer_7_c(attr_id, memtype_id, buf, dims)
-  END SUBROUTINE h5awrite_integer_7
-
-
-  SUBROUTINE h5awrite_real_scalar(attr_id, memtype_id, buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-    REAL, INTENT(IN) :: buf                  ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-
-    !            INTEGER, EXTERNAL :: h5awrite_real_s_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5awrite_real_s_c(attr_id, memtype_id, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_REAL_S_C'::h5awrite_real_s_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         REAL, INTENT(IN)::buf
-       END FUNCTION h5awrite_real_s_c
-    END INTERFACE
-
-    hdferr = h5awrite_real_s_c(attr_id, memtype_id, buf, dims)
-  END SUBROUTINE h5awrite_real_scalar
-
-  SUBROUTINE h5awrite_real_1(attr_id, memtype_id, buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    REAL, INTENT(IN), &
-         DIMENSION(dims(1)) :: buf  ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr  ! Error code
-
-    !            INTEGER, EXTERNAL :: h5awrite_real_1_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5awrite_real_1_c(attr_id, memtype_id, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_REAL_1_C'::h5awrite_real_1_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         REAL, INTENT(IN), &
-              DIMENSION(dims(1)) :: buf
-       END FUNCTION h5awrite_real_1_c
-    END INTERFACE
-
-    hdferr = h5awrite_real_1_c(attr_id, memtype_id, buf, dims)
-  END SUBROUTINE h5awrite_real_1
-
-
-  SUBROUTINE h5awrite_real_2(attr_id, memtype_id, buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    REAL, INTENT(IN), &
-         DIMENSION(dims(1),dims(2)) :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-
-    !            INTEGER, EXTERNAL :: h5awrite_real_2_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5awrite_real_2_c(attr_id, memtype_id, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_REAL_2_C'::h5awrite_real_2_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         REAL, INTENT(IN), &
-              DIMENSION(dims(1),dims(2)) :: buf
-       END FUNCTION h5awrite_real_2_c
-    END INTERFACE
-
-    hdferr = h5awrite_real_2_c(attr_id, memtype_id, buf, dims)
-  END SUBROUTINE h5awrite_real_2
-
-
-  SUBROUTINE h5awrite_real_3(attr_id, memtype_id, buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    REAL, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3)) :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-
-    !            INTEGER, EXTERNAL :: h5awrite_real_3_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5awrite_real_3_c(attr_id, memtype_id, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_REAL_3_C'::h5awrite_real_3_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         REAL, INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3)) :: buf
-       END FUNCTION h5awrite_real_3_c
-    END INTERFACE
-
-    hdferr = h5awrite_real_3_c(attr_id, memtype_id, buf, dims)
-  END SUBROUTINE h5awrite_real_3
-
-
-  SUBROUTINE h5awrite_real_4(attr_id, memtype_id, buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    REAL, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-
-    !            INTEGER, EXTERNAL :: h5awrite_real_4_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5awrite_real_4_c(attr_id, memtype_id, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_REAL_4_C'::h5awrite_real_4_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         REAL, INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-       END FUNCTION h5awrite_real_4_c
-    END INTERFACE
-
-    hdferr = h5awrite_real_4_c(attr_id, memtype_id, buf, dims)
-  END SUBROUTINE h5awrite_real_4
-
-
-  SUBROUTINE h5awrite_real_5(attr_id, memtype_id, buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    REAL, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-
-    !            INTEGER, EXTERNAL :: h5awrite_real_5_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5awrite_real_5_c(attr_id, memtype_id, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_REAL_5_C'::h5awrite_real_5_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         REAL, INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-       END FUNCTION h5awrite_real_5_c
-    END INTERFACE
-
-    hdferr = h5awrite_real_5_c(attr_id, memtype_id, buf, dims)
-  END SUBROUTINE h5awrite_real_5
-
-
-  SUBROUTINE h5awrite_real_6(attr_id, memtype_id, buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    REAL, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-
-    !            INTEGER, EXTERNAL :: h5awrite_real_6_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5awrite_real_6_c(attr_id, memtype_id, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_REAL_6_C'::h5awrite_real_6_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         REAL, INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-       END FUNCTION h5awrite_real_6_c
-    END INTERFACE
-
-    hdferr = h5awrite_real_6_c(attr_id, memtype_id, buf, dims)
-  END SUBROUTINE h5awrite_real_6
-
-
-  SUBROUTINE h5awrite_real_7(attr_id, memtype_id, buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    REAL, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-
-    !            INTEGER, EXTERNAL :: h5awrite_real_7_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5awrite_real_7_c(attr_id, memtype_id, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_REAL_7_C'::h5awrite_real_7_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         REAL, INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-       END FUNCTION h5awrite_real_7_c
-    END INTERFACE
-
-    hdferr = h5awrite_real_7_c(attr_id, memtype_id, buf, dims)
-  END SUBROUTINE h5awrite_real_7
-
-  SUBROUTINE h5awrite_char_scalar(attr_id, memtype_id, buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    CHARACTER(LEN=*),INTENT(IN) :: buf
-                                             ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-    !            INTEGER, EXTERNAL :: h5awritec_s_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5awritec_s_c(attr_id, memtype_id, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AWRITEC_S_C'::h5awritec_s_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-         !DEC$ATTRIBUTES reference :: buf
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         CHARACTER(LEN=*), INTENT(IN)::buf
-       END FUNCTION h5awritec_s_c
-    END INTERFACE
-
-    hdferr = h5awritec_s_c(attr_id, memtype_id, buf, dims)
-  END SUBROUTINE h5awrite_char_scalar
-
-  SUBROUTINE h5awrite_char_1(attr_id, memtype_id, buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    CHARACTER(LEN=*), INTENT(IN), &
-         DIMENSION(dims(1)) :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr ! Error code
-    !            INTEGER, EXTERNAL :: h5awritec_1_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5awritec_1_c(attr_id, memtype_id, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AWRITEC_1_C'::h5awritec_1_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: buf
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         CHARACTER(LEN=*), INTENT(IN), DIMENSION(dims(1))::buf
-       END FUNCTION h5awritec_1_c
-    END INTERFACE
-
-    hdferr = h5awritec_1_c(attr_id, memtype_id, buf, dims)
-  END SUBROUTINE h5awrite_char_1
-
-
-  SUBROUTINE h5awrite_char_2(attr_id, memtype_id, buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    CHARACTER(LEN=*), INTENT(IN), &
-         DIMENSION(dims(1),dims(2)) :: buf   ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-
-    !            INTEGER, EXTERNAL :: h5awritec_2_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5awritec_2_c(attr_id, memtype_id, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AWRITEC_2_C'::h5awritec_2_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-         !DEC$ATTRIBUTES reference :: buf
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         CHARACTER(LEN=*), INTENT(IN), &
-              DIMENSION(dims(1),dims(2)) :: buf
-       END FUNCTION h5awritec_2_c
-    END INTERFACE
-
-    hdferr = h5awritec_2_c(attr_id, memtype_id, buf, dims)
-  END SUBROUTINE h5awrite_char_2
-
-
-  SUBROUTINE h5awrite_char_3(attr_id, memtype_id, buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    CHARACTER(LEN=*), INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3)) :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr ! Error code
-    !            INTEGER, EXTERNAL :: h5awritec_3_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5awritec_3_c(attr_id, memtype_id, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AWRITEC_3_C'::h5awritec_3_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: buf
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         CHARACTER(LEN=*), INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3)) :: buf
-       END FUNCTION h5awritec_3_c
-    END INTERFACE
-
-    hdferr = h5awritec_3_c(attr_id, memtype_id, buf, dims)
-  END SUBROUTINE h5awrite_char_3
-
-
-  SUBROUTINE h5awrite_char_4(attr_id, memtype_id, buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    CHARACTER(LEN=*), INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-    !            INTEGER, EXTERNAL :: h5awritec_4_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5awritec_4_c(attr_id, memtype_id, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AWRITEC_4_C'::h5awritec_4_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: buf
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         CHARACTER(LEN=*), INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-       END FUNCTION h5awritec_4_c
-    END INTERFACE
-
-    hdferr = h5awritec_4_c(attr_id, memtype_id, buf, dims)
-  END SUBROUTINE h5awrite_char_4
-
-
-  SUBROUTINE h5awrite_char_5(attr_id, memtype_id, buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    CHARACTER(LEN=*), INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-    !            INTEGER, EXTERNAL :: h5awritec_5_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5awritec_5_c(attr_id, memtype_id, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AWRITEC_5_C'::h5awritec_5_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: buf
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         CHARACTER(LEN=*), INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-       END FUNCTION h5awritec_5_c
-    END INTERFACE
-
-    hdferr = h5awritec_5_c(attr_id, memtype_id, buf, dims)
-  END SUBROUTINE h5awrite_char_5
-
-
-  SUBROUTINE h5awrite_char_6(attr_id, memtype_id, buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    CHARACTER(LEN=*), INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-    !            INTEGER, EXTERNAL :: h5awritec_6_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5awritec_6_c(attr_id, memtype_id, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AWRITEC_6_C'::h5awritec_6_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: buf
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         CHARACTER(LEN=*), INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-       END FUNCTION h5awritec_6_c
-    END INTERFACE
-
-    hdferr = h5awritec_6_c(attr_id, memtype_id, buf, dims)
-  END SUBROUTINE h5awrite_char_6
-
-
-  SUBROUTINE h5awrite_char_7(attr_id, memtype_id, buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    CHARACTER(LEN=*), INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-    !            INTEGER, EXTERNAL :: h5awritec_7_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5awritec_7_c(attr_id, memtype_id, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AWRITEC_7_C'::h5awritec_7_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: buf
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         CHARACTER(LEN=*), INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-       END FUNCTION h5awritec_7_c
-    END INTERFACE
-
-    hdferr = h5awritec_7_c(attr_id, memtype_id, buf, dims)
-  END SUBROUTINE h5awrite_char_7
-
-!
-! NAME
-!  h5aread_f
-!
-! PURPOSE
-!  Reads an attribute.
-!
-! INPUTS
-!		attr_id		- attribute identifier
-!		memtype_id	- attribute memory type identifier
-!		dims		- 1D array of size 7, stores sizes of the
-!				- buf array dimensions.
-! OUTPUTS
-!		buf		- buffer to read attribute data in
-!		hdferr:		- error code
-!				 	Success:  0
-!				 	Failure: -1
-! OPTIONAL PARAMETERS
-!   NONE
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!
-!  Explicit Fortran interfaces are added for
-!  called C functions (it is needed for Windows
-!  port).  February 27, 2001
-!
-!  dims parameter was added to make code portable;
-!  April 4, 2001
-!
-!  Changed buf intent to INOUT to be consistant
-!  with how the C functions handles it. The pg
-!  compiler will return 0 if a buf value is not set.
-!  February, 2008
-!
-! NOTES
-!  This function is overloaded to write INTEGER,
-!  REAL, DOUBLE PRECISION and CHARACTER buffers
-!  up to 7 dimensions.
-!
-
-  SUBROUTINE h5aread_integer_scalar(attr_id, memtype_id, buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    INTEGER, INTENT(INOUT) :: buf            ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-
-    !            INTEGER, EXTERNAL :: h5aread_integer_s_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5aread_integer_s_c(attr_id, memtype_id, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AREAD_INTEGER_S_C'::h5aread_integer_s_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         INTEGER, INTENT(INOUT)::buf
-       END FUNCTION h5aread_integer_s_c
-    END INTERFACE
-    hdferr = h5aread_integer_s_c(attr_id, memtype_id, buf, dims)
-  END SUBROUTINE h5aread_integer_scalar
-
-  SUBROUTINE h5aread_integer_1(attr_id, memtype_id, buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    INTEGER, INTENT(INOUT), DIMENSION(dims(1)) :: buf  ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-
-    !            INTEGER, EXTERNAL :: h5aread_integer_1_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5aread_integer_1_c(attr_id, memtype_id, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AREAD_INTEGER_1_C'::h5aread_integer_1_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         INTEGER, INTENT(INOUT), DIMENSION(dims(1)) :: buf
-       END FUNCTION h5aread_integer_1_c
-    END INTERFACE
-
-    hdferr = h5aread_integer_1_c(attr_id, memtype_id, buf, dims)
-  END SUBROUTINE h5aread_integer_1
-
-
-  SUBROUTINE h5aread_integer_2(attr_id, memtype_id, buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    INTEGER, INTENT(INOUT),DIMENSION(dims(1),dims(2)) :: buf  ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-
-    !            INTEGER, EXTERNAL :: h5aread_integer_2_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5aread_integer_2_c(attr_id, memtype_id, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AREAD_INTEGER_2_C'::h5aread_integer_2_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         INTEGER, INTENT(INOUT), DIMENSION(dims(1),dims(2)) :: buf
-       END FUNCTION h5aread_integer_2_c
-    END INTERFACE
-
-    hdferr = h5aread_integer_2_c(attr_id, memtype_id, buf, dims)
-  END SUBROUTINE h5aread_integer_2
-
-
-  SUBROUTINE h5aread_integer_3(attr_id, memtype_id, buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    INTEGER, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3)) :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-
-    !            INTEGER, EXTERNAL :: h5aread_integer_3_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5aread_integer_3_c(attr_id, memtype_id, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AREAD_INTEGER_3_C'::h5aread_integer_3_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         INTEGER, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3)) :: buf
-       END FUNCTION h5aread_integer_3_c
-    END INTERFACE
-
-    hdferr = h5aread_integer_3_c(attr_id, memtype_id, buf, dims)
-  END SUBROUTINE h5aread_integer_3
-
-
-  SUBROUTINE h5aread_integer_4(attr_id, memtype_id, buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    INTEGER, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf ! Attribute data
-    ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-
-    !            INTEGER, EXTERNAL :: h5aread_integer_4_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5aread_integer_4_c(attr_id, memtype_id, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AREAD_INTEGER_4_C'::h5aread_integer_4_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         INTEGER, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-       END FUNCTION h5aread_integer_4_c
-    END INTERFACE
-
-    hdferr = h5aread_integer_4_c(attr_id, memtype_id, buf, dims)
-  END SUBROUTINE h5aread_integer_4
-
-
-  SUBROUTINE h5aread_integer_5(attr_id, memtype_id, buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    INTEGER, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-
-    !            INTEGER, EXTERNAL :: h5aread_integer_5_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5aread_integer_5_c(attr_id, memtype_id, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AREAD_INTEGER_5_C'::h5aread_integer_5_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         INTEGER, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-       END FUNCTION h5aread_integer_5_c
-    END INTERFACE
-
-    hdferr = h5aread_integer_5_c(attr_id, memtype_id, buf, dims)
-  END SUBROUTINE h5aread_integer_5
-
-
-  SUBROUTINE h5aread_integer_6(attr_id, memtype_id, buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    INTEGER, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-
-    !            INTEGER, EXTERNAL :: h5aread_integer_6_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5aread_integer_6_c(attr_id, memtype_id, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AREAD_INTEGER_6_C'::h5aread_integer_6_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         INTEGER, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-       END FUNCTION h5aread_integer_6_c
-    END INTERFACE
-
-    hdferr = h5aread_integer_6_c(attr_id, memtype_id, buf, dims)
-  END SUBROUTINE h5aread_integer_6
-
-
-  SUBROUTINE h5aread_integer_7(attr_id, memtype_id, buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    INTEGER, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-
-    !            INTEGER, EXTERNAL :: h5aread_integer_7_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5aread_integer_7_c(attr_id, memtype_id, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AREAD_INTEGER_7_C'::h5aread_integer_7_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         INTEGER, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-       END FUNCTION h5aread_integer_7_c
-    END INTERFACE
-
-    hdferr = h5aread_integer_7_c(attr_id, memtype_id, buf, dims)
-  END SUBROUTINE h5aread_integer_7
-
-
-  SUBROUTINE h5aread_real_scalar(attr_id, memtype_id, buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    REAL, INTENT(INOUT) :: buf               ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-
-    !            INTEGER, EXTERNAL :: h5aread_real_s_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5aread_real_s_c(attr_id, memtype_id, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AREAD_REAL_S_C'::h5aread_real_s_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         REAL, INTENT(INOUT)::buf
-       END FUNCTION h5aread_real_s_c
-    END INTERFACE
-
-    hdferr = h5aread_real_s_c(attr_id, memtype_id, buf, dims)
-  END SUBROUTINE h5aread_real_scalar
-
-  SUBROUTINE h5aread_real_1(attr_id, memtype_id, buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    REAL, INTENT(INOUT), &
-         DIMENSION(dims(1)) :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-
-    !            INTEGER, EXTERNAL :: h5aread_real_1_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5aread_real_1_c(attr_id, memtype_id, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AREAD_REAL_1_C'::h5aread_real_1_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         REAL, INTENT(INOUT), &
-              DIMENSION(dims(1)) :: buf
-       END FUNCTION h5aread_real_1_c
-    END INTERFACE
-
-    hdferr = h5aread_real_1_c(attr_id, memtype_id, buf, dims)
-  END SUBROUTINE h5aread_real_1
-
-
-  SUBROUTINE h5aread_real_2(attr_id, memtype_id, buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    REAL, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2)) :: buf  ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-
-    !            INTEGER, EXTERNAL :: h5aread_real_2_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5aread_real_2_c(attr_id, memtype_id, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AREAD_REAL_2_C'::h5aread_real_2_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         REAL, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2)) :: buf
-       END FUNCTION h5aread_real_2_c
-    END INTERFACE
-
-    hdferr = h5aread_real_2_c(attr_id, memtype_id, buf, dims)
-  END SUBROUTINE h5aread_real_2
-
-
-  SUBROUTINE h5aread_real_3(attr_id, memtype_id, buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    REAL, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3)) :: buf  ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr                  ! Error code
-
-    !            INTEGER, EXTERNAL :: h5aread_real_3_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5aread_real_3_c(attr_id, memtype_id, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AREAD_REAL_3_C'::h5aread_real_3_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         REAL, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3)) :: buf
-       END FUNCTION h5aread_real_3_c
-    END INTERFACE
-
-    hdferr = h5aread_real_3_c(attr_id, memtype_id, buf, dims)
-  END SUBROUTINE h5aread_real_3
-
-
-  SUBROUTINE h5aread_real_4(attr_id, memtype_id, buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    REAL, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-
-    !            INTEGER, EXTERNAL :: h5aread_real_4_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5aread_real_4_c(attr_id, memtype_id, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AREAD_REAL_4_C'::h5aread_real_4_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         REAL, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-       END FUNCTION h5aread_real_4_c
-    END INTERFACE
-
-    hdferr = h5aread_real_4_c(attr_id, memtype_id, buf, dims)
-  END SUBROUTINE h5aread_real_4
-
-
-  SUBROUTINE h5aread_real_5(attr_id, memtype_id, buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    REAL, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-
-    !            INTEGER, EXTERNAL :: h5aread_real_5_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5aread_real_5_c(attr_id, memtype_id, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AREAD_REAL_5_C'::h5aread_real_5_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         REAL, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-       END FUNCTION h5aread_real_5_c
-    END INTERFACE
-
-    hdferr = h5aread_real_5_c(attr_id, memtype_id, buf, dims)
-  END SUBROUTINE h5aread_real_5
-
-
-  SUBROUTINE h5aread_real_6(attr_id, memtype_id, buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    REAL, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-
-    !            INTEGER, EXTERNAL :: h5aread_real_6_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5aread_real_6_c(attr_id, memtype_id, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AREAD_REAL_6_C'::h5aread_real_6_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         REAL, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-       END FUNCTION h5aread_real_6_c
-    END INTERFACE
-
-    hdferr = h5aread_real_6_c(attr_id, memtype_id, buf, dims)
-  END SUBROUTINE h5aread_real_6
-
-
-  SUBROUTINE h5aread_real_7(attr_id, memtype_id, buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    REAL, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-
-    !            INTEGER, EXTERNAL :: h5aread_real_7_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5aread_real_7_c(attr_id, memtype_id, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AREAD_REAL_7_C'::h5aread_real_7_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         REAL, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-       END FUNCTION h5aread_real_7_c
-    END INTERFACE
-
-    hdferr = h5aread_real_7_c(attr_id, memtype_id, buf, dims)
-  END SUBROUTINE h5aread_real_7
-
-  SUBROUTINE h5aread_char_scalar(attr_id, memtype_id, buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    CHARACTER(LEN=*), INTENT(INOUT) :: buf
-    ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-
-    !            INTEGER, EXTERNAL :: h5areadc_s_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5areadc_s_c(attr_id, memtype_id, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AREADC_S_C'::h5areadc_s_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: buf
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         CHARACTER(LEN=*), INTENT(INOUT) :: buf
-       END FUNCTION h5areadc_s_c
-    END INTERFACE
-
-    hdferr = h5areadc_s_c(attr_id, memtype_id, buf, dims)
-  END SUBROUTINE h5aread_char_scalar
-
-  SUBROUTINE h5aread_char_1(attr_id, memtype_id, buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    CHARACTER(LEN=*), INTENT(INOUT), &
-         DIMENSION(dims(1)) :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr ! Error code
-
-    !            INTEGER, EXTERNAL :: h5areadc_1_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5areadc_1_c(attr_id, memtype_id, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AREADC_1_C'::h5areadc_1_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: buf
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         CHARACTER(LEN=*), INTENT(INOUT), &
-              DIMENSION(dims(1)) :: buf
-       END FUNCTION h5areadc_1_c
-    END INTERFACE
-
-    hdferr = h5areadc_1_c(attr_id, memtype_id, buf, dims)
-  END SUBROUTINE h5aread_char_1
-
-
-  SUBROUTINE h5aread_char_2(attr_id, memtype_id, buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    CHARACTER(LEN=*), INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2)) :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr ! Error code
-
-    !            INTEGER, EXTERNAL :: h5areadc_2_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5areadc_2_c(attr_id, memtype_id, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AREADC_2_C'::h5areadc_2_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: buf
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         CHARACTER(LEN=*), INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2)) :: buf
-       END FUNCTION h5areadc_2_c
-    END INTERFACE
-
-    hdferr = h5areadc_2_c(attr_id, memtype_id, buf, dims)
-  END SUBROUTINE h5aread_char_2
-
-
-  SUBROUTINE h5aread_char_3(attr_id, memtype_id, buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    CHARACTER(LEN=*), INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3)) :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-
-    !            INTEGER, EXTERNAL :: h5areadc_3_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5areadc_3_c(attr_id, memtype_id, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AREADC_3_C'::h5areadc_3_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: buf
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         CHARACTER(LEN=*), INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3)) :: buf
-       END FUNCTION h5areadc_3_c
-    END INTERFACE
-
-    hdferr = h5areadc_3_c(attr_id, memtype_id, buf, dims)
-  END SUBROUTINE h5aread_char_3
-
-
-  SUBROUTINE h5aread_char_4(attr_id, memtype_id, buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    CHARACTER(LEN=*), INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-
-    !            INTEGER, EXTERNAL :: h5areadc_4_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5areadc_4_c(attr_id, memtype_id, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AREADC_4_C'::h5areadc_4_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: buf
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         CHARACTER(LEN=*), INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-       END FUNCTION h5areadc_4_c
-    END INTERFACE
-
-    hdferr = h5areadc_4_c(attr_id, memtype_id, buf, dims)
-  END SUBROUTINE h5aread_char_4
-
-
-  SUBROUTINE h5aread_char_5(attr_id, memtype_id, buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    CHARACTER(LEN=*), INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-    ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-
-    !            INTEGER, EXTERNAL :: h5areadc_5_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5areadc_5_c(attr_id, memtype_id, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AREADC_5_C'::h5areadc_5_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: buf
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         CHARACTER(LEN=*), INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-       END FUNCTION h5areadc_5_c
-    END INTERFACE
-
-    hdferr = h5areadc_5_c(attr_id, memtype_id, buf, dims)
-  END SUBROUTINE h5aread_char_5
-
-
-  SUBROUTINE h5aread_char_6(attr_id, memtype_id, buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    CHARACTER(LEN=*), INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-
-    !            INTEGER, EXTERNAL :: h5areadc_6_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5areadc_6_c(attr_id, memtype_id, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AREADC_6_C'::h5areadc_6_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: buf
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         CHARACTER(LEN=*), INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-       END FUNCTION h5areadc_6_c
-    END INTERFACE
-
-    hdferr = h5areadc_6_c(attr_id, memtype_id, buf, dims)
-  END SUBROUTINE h5aread_char_6
-
-
-  SUBROUTINE h5aread_char_7(attr_id, memtype_id, buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                             ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    CHARACTER(LEN=*), INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-
-    !            INTEGER, EXTERNAL :: h5areadc_7_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5areadc_7_c(attr_id, memtype_id, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AREADC_7_C'::h5areadc_7_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: buf
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         CHARACTER(LEN=*), INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-       END FUNCTION h5areadc_7_c
-    END INTERFACE
-
-    hdferr = h5areadc_7_c(attr_id, memtype_id, buf, dims)
-  END SUBROUTINE h5aread_char_7
-
-END MODULE H5A_PROVISIONAL
-
-
diff --git a/fortran/src/H5Df.c b/fortran/src/H5Df.c
index f4082a9..e92e6a8 100644
--- a/fortran/src/H5Df.c
+++ b/fortran/src/H5Df.c
@@ -1,25 +1,22 @@
 /****h* H5Df/H5Df
  * PURPOSE
- *   This file contains C stubs for H5D Fortran APIs
+ *  This file contains C stubs for H5D Fortran APIs
  *
  * COPYRIGHT
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  ******
-*/
+ */
 
 #include "H5f90.h"
 
@@ -46,34 +43,34 @@
  *   - Added optional parameters introduced in version 1.8
  *     February, 2008
  * SOURCE
-*/
+ */
 int_f
-nh5dcreate_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id, hid_t_f *space_id,
-	      hid_t_f *lcpl_id, hid_t_f *dcpl_id, hid_t_f *dapl_id, hid_t_f *dset_id)
+h5dcreate_c(hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id, hid_t_f *space_id, hid_t_f *lcpl_id,
+            hid_t_f *dcpl_id, hid_t_f *dapl_id, hid_t_f *dset_id)
 /******/
 {
-     char *c_name = NULL;
-     hid_t c_dset_id;
-     int ret_value = -1;
-
-     /*
-      * Convert FORTRAN name to C name
-      */
-     if(NULL == ( c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
-         goto DONE;
-
-     /*
-      * Call H5Dcreate2 function.
-      */
-     if((c_dset_id = H5Dcreate2((hid_t)*loc_id, c_name, (hid_t)*type_id, (hid_t)*space_id,
-				(hid_t)*lcpl_id, (hid_t)*dcpl_id, (hid_t)*dapl_id)) < 0)
-         goto DONE;
-     *dset_id = (hid_t_f)c_dset_id;
-
-     ret_value = 0;
+    char *c_name = NULL;
+    hid_t c_dset_id;
+    int   ret_value = -1;
+
+    /*
+     * Convert FORTRAN name to C name
+     */
+    if (NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
+        goto DONE;
+
+    /*
+     * Call H5Dcreate2 function.
+     */
+    if ((c_dset_id = H5Dcreate2((hid_t)*loc_id, c_name, (hid_t)*type_id, (hid_t)*space_id, (hid_t)*lcpl_id,
+                                (hid_t)*dcpl_id, (hid_t)*dapl_id)) < 0)
+        goto DONE;
+    *dset_id = (hid_t_f)c_dset_id;
+
+    ret_value = 0;
 
 DONE:
-    if(c_name)
+    if (c_name)
         HDfree(c_name);
     return ret_value;
 }
@@ -84,572 +81,47 @@ DONE:
  * PURPOSE
  *  Call H5Dopen2 to open a dataset
  * INPUTS
- *      loc_id - file or group identifier
- *              name - name of the dataset
- *              namelen - name length
- *              dapl_id	- Dataset access property list
+ *  loc_id - file or group identifier
+ *  name - name of the dataset
+ *  namelen - name length
+ *  dapl_id	- Dataset access property list
  * OUTPUTS
- *     dset_id - dataset identifier
- * RETURNS
- *     0 on success, -1 on failure
- * AUTHOR
- *  Elena Pourmal
- *              Wednesday, August 4, 1999
- * HISTORY
- * Added 1.8 parameter: dapl_id
- * SOURCE
-*/
-int_f
-nh5dopen_c(hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *dapl_id, hid_t_f *dset_id)
-/******/
-{
-     char *c_name = NULL;
-     hid_t c_dset_id;
-     int ret_value = -1;
-
-     /*
-      * Convert FORTRAN name to C name
-      */
-     if(NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
-         goto DONE;
-
-     /*
-      * Call H5Dopen2 function.
-      */
-     if((c_dset_id = H5Dopen2((hid_t)*loc_id, c_name, (hid_t)*dapl_id)) < 0)
-         goto DONE;
-
-     *dset_id = (hid_t_f)c_dset_id;
-     ret_value = 0;
-
-DONE:
-     if(c_name)
-         HDfree(c_name);
-     return ret_value;
-}
-
-
-/****if* H5Df/h5dwritec_c
- * NAME
- *  h5dwritec_c
- * PURPOSE
- *  Call h5dwrite_c to write a dataset of characters
- * INPUTS
- *      dset_id - dataset identifier
- *              mem_type_id - memory datatype identifier
- *              mem_space_id - memory dataspace identifier
- *              file_space_id - memory dataspace identifier
- *              xfer_pr  - identifier of transfer property list
- *              buf      - character data buffer
+ *  dset_id - dataset identifier
  * RETURNS
- *     0 on success, -1 on failure
- * AUTHOR
- *  Elena Pourmal
- *              Tuesday, May 14, 2002
- * HISTORY
- * This function is added to accomodate oveloaded h5dwrite_f
- *                with the dims argument being of INTEGER(HSIZE_T) type
-
- * SOURCE
-*/
-int_f
-nh5dwritec_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
-/******/
-{
-     int ret_value = -1;
-
-     /*
-      * Call h5dwrite_c  function.
-      */
-     ret_value = nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
-
-     return ret_value;
-}
-
-int_f
-nh5dwritec_s_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
-
-{
-     int ret_value = -1;
-
-     /*
-      * Call h5dwrite_c  function.
-      */
-     ret_value = nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
-
-     return ret_value;
-}
-
-int_f
-nh5dwritec_1_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
-
-{
-     int ret_value = -1;
-
-     /*
-      * Call h5dwrite_c  function.
-      */
-     ret_value = nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
-
-     return ret_value;
-}
-
-int_f
-nh5dwritec_2_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
-
-{
-     int ret_value = -1;
-
-     /*
-      * Call h5dwrite_c  function.
-      */
-     ret_value = nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
-
-     return ret_value;
-}
-
-int_f
-nh5dwritec_3_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
-
-{
-     int ret_value = -1;
-
-     /*
-      * Call h5dwrite_c  function.
-      */
-     ret_value = nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
-
-     return ret_value;
-}
-
-int_f
-nh5dwritec_4_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
-
-{
-     int ret_value = -1;
-
-     /*
-      * Call h5dwrite_c  function.
-      */
-     ret_value = nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
-
-     return ret_value;
-}
-
-int_f
-nh5dwritec_5_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
-
-{
-     int ret_value = -1;
-
-     /*
-      * Call h5dwrite_c  function.
-      */
-     ret_value = nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
-
-     return ret_value;
-}
-
-int_f
-nh5dwritec_6_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
-
-{
-     int ret_value = -1;
-
-     /*
-      * Call h5dwrite_c  function.
-      */
-     ret_value = nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
-
-     return ret_value;
-}
-
-int_f
-nh5dwritec_7_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
-
-{
-     int ret_value = -1;
-
-     /*
-      * Call h5dwrite_c  function.
-      */
-     ret_value = nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
-
-     return ret_value;
-}
-
-/****if* H5Df/h5dwrite_c
- * NAME
- *  h5dwrite_c
- * PURPOSE
- *  Call H5Dwrite to write a dataset
- * INPUTS
- *      dset_id - dataset identifier
- *              mem_type_id - memory datatype identifier
- *              mem_space_id - memory dataspace identifier
- *              file_space_id - memory dataspace identifier
- *              xfer_pr  - identifier of transfer property list
- *              buf      - data buffer
- * RETURNS
- *     0 on success, -1 on failure
- * AUTHOR
- *  Elena Pourmal
- *              Tuesday, May 14, 2002
- * HISTORY
- * This function is added to accomodate oveloaded h5dwrite_f
- *                with the dims argument being of INTEGER(HSIZE_T) type
- *
- *                Added nh5dwrite_integer(real,double)_s,1-7_c functions to eliminate
- *                complains about wrong parameter types in h5dwrite_c function
- *                called by Fortran rouitnes
- *                                           October 10, 2006 EIP
- *
- * SOURCE
-*/
-int_f
-nh5dwrite_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f UNUSED *dims)
-/******/
-{
-     int ret_value = -1;
-     herr_t ret;
-     hid_t c_dset_id;
-     hid_t c_mem_type_id;
-     hid_t c_mem_space_id;
-     hid_t c_file_space_id;
-     hid_t c_xfer_prp;
-
-     /*
-      * Define transfer property
-      */
-     c_xfer_prp = (hid_t)*xfer_prp;
-
-     /*
-      * Call H5Dwrite function.
-      */
-     c_dset_id = (hid_t)*dset_id;
-     c_mem_type_id = (hid_t)*mem_type_id;
-     c_mem_space_id = (hid_t)*mem_space_id;
-     c_file_space_id = (hid_t)*file_space_id;
-     ret = H5Dwrite(c_dset_id, c_mem_type_id, c_mem_space_id, c_file_space_id, c_xfer_prp, buf);
-
-     if (ret < 0) return ret_value;
-     ret_value = 0;
-     return ret_value;
-}
-
-int_f
-nh5dwrite_integer_s_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dwrite_c  function.
-      */
-     return nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-
-int_f
-nh5dwrite_integer_1_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dwrite_c  function.
-      */
-     return nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-
-int_f
-nh5dwrite_integer_2_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dwrite_c  function.
-      */
-     return nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-
-int_f
-nh5dwrite_integer_3_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dwrite_c  function.
-      */
-     return nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-
-int_f
-nh5dwrite_integer_4_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dwrite_c  function.
-      */
-     return nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-
-int_f
-nh5dwrite_integer_5_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dwrite_c  function.
-      */
-     return nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-
-int_f
-nh5dwrite_integer_6_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dwrite_c  function.
-      */
-     return nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-
-int_f
-nh5dwrite_integer_7_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dwrite_c  function.
-      */
-     return nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-
-int_f
-nh5dwrite_real_s_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dwrite_c  function.
-      */
-     return nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-nh5dwrite_real_1_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dwrite_c  function.
-      */
-     return nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-nh5dwrite_real_2_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dwrite_c  function.
-      */
-     return nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-nh5dwrite_real_3_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dwrite_c  function.
-      */
-     return nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-nh5dwrite_real_4_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dwrite_c  function.
-      */
-     return nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-nh5dwrite_real_5_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dwrite_c  function.
-      */
-     return nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-nh5dwrite_real_6_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dwrite_c  function.
-      */
-     return nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-nh5dwrite_real_7_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dwrite_c  function.
-      */
-     return nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-nh5dwrite_double_s_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dwrite_c  function.
-      */
-     return nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-nh5dwrite_double_1_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dwrite_c  function.
-      */
-     return nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-nh5dwrite_double_2_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dwrite_c  function.
-      */
-     return nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-nh5dwrite_double_3_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dwrite_c  function.
-      */
-     return nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-nh5dwrite_double_4_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dwrite_c  function.
-      */
-     return nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-nh5dwrite_double_5_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dwrite_c  function.
-      */
-     return nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-nh5dwrite_double_6_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dwrite_c  function.
-      */
-     return nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-nh5dwrite_double_7_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dwrite_c  function.
-      */
-     return nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-
-/****if* H5Df/h5dwrite_ref_obj_c
- * NAME
- *  h5dwrite_ref_obj_c
- * PURPOSE
- *  Call H5Dwrite to write a dataset  of object references
- * INPUTS
- *      dset_id - dataset identifier
- *              mem_type_id - memory datatype identifier
- *              mem_space_id - memory dataspace identifier
- *              file_space_id - memory dataspace identifier
- *              xfer_pr  - identifier of transfer property list
- *              buf      - data buffer with references to the objects.
- *              n - number of references to be stored.
- * RETURNS
- *     0 on success,e-1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Tuesday, May 14, 2002
+ *  Wednesday, August 4, 1999
  * HISTORY
- * This function was added to accomodate h5dwrite_f with the
- *                dims argumnet being of INTEGER(HSIZE_T) type.
+ *  Added 1.8 parameter: dapl_id
  * SOURCE
-*/
+ */
 int_f
-nh5dwrite_ref_obj_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, haddr_t_f *buf, hsize_t_f *dims)
+h5dopen_c(hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *dapl_id, hid_t_f *dset_id)
 /******/
 {
-    int ret_value = -1;
-    herr_t ret;
+    char *c_name = NULL;
     hid_t c_dset_id;
-    hid_t c_mem_type_id;
-    hid_t c_mem_space_id;
-    hid_t c_file_space_id;
-    hid_t c_xfer_prp;
-    hobj_ref_t *buf_c;
-    unsigned int i, n;
+    int   ret_value = -1;
 
     /*
-     * Define transfer property
+     * Convert FORTRAN name to C name
      */
-    c_xfer_prp = (hid_t)*xfer_prp;
+    if (NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
+        goto DONE;
 
     /*
-     * Allocate temporary buffer and copy references from Fortran.
+     * Call H5Dopen2 function.
      */
-    n = (unsigned int)*dims;
-    buf_c = (hobj_ref_t*)HDmalloc(sizeof(hobj_ref_t)*n);
-    if ( buf_c != NULL ) {
-        for (i = 0; i < n; i++)
-             HDmemcpy(&buf_c[i], &buf[i], sizeof(haddr_t));
-    }
-    else return ret_value;
+    if ((c_dset_id = H5Dopen2((hid_t)*loc_id, c_name, (hid_t)*dapl_id)) < 0)
+        goto DONE;
 
-    /*
-     * Call H5Dwrite function.
-     */
-    c_dset_id = (hid_t)*dset_id;
-    c_mem_type_id = (hid_t)*mem_type_id;
-    c_mem_space_id = (hid_t)*mem_space_id;
-    c_file_space_id = (hid_t)*file_space_id;
-    ret = H5Dwrite(c_dset_id, c_mem_type_id, c_mem_space_id, c_file_space_id, c_xfer_prp, buf_c);
-    HDfree(buf_c);
-    if (ret < 0) return ret_value;
+    *dset_id  = (hid_t_f)c_dset_id;
     ret_value = 0;
+
+DONE:
+    if (c_name)
+        HDfree(c_name);
     return ret_value;
 }
 
@@ -672,545 +144,97 @@ nh5dwrite_ref_obj_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_
  *  Elena Pourmal
  *  Tuesday, May 14, 2002
  * HISTORY
- *  This function was added to accomodate h5dwrite_f with the
+ *  This function was added to accommodate h5dwrite_f with the
  *  dims argument being of INTEGER(HSIZE_T) type
  * SOURCE
-*/
-int_f
-nh5dwrite_ref_reg_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, int_f *buf, hsize_t_f *dims)
-/******/
-{
-     int ret_value = -1;
-     herr_t ret;
-     hid_t c_dset_id;
-     hid_t c_mem_type_id;
-     hid_t c_mem_space_id;
-     hid_t c_file_space_id;
-     hid_t c_xfer_prp;
-     hdset_reg_ref_t *buf_c = NULL;
-     unsigned int i, n;
-
-      n = (unsigned int)*dims;
-     /*
-      * Define transfer property
-      */
-     c_xfer_prp = (hid_t)*xfer_prp;
-
-     /*
-      * Allocate temporary buffer and copy references from Fortran.
-      */
-     buf_c = (hdset_reg_ref_t *)HDmalloc(sizeof(hdset_reg_ref_t)*n);
-      if ( buf_c != NULL ) {
-      for (i = 0; i < n; i++) {
-           HDmemcpy(&buf_c[i], buf, H5R_DSET_REG_REF_BUF_SIZE);
-           buf = buf + REF_REG_BUF_LEN_F;
-      }
-      }
-      else return ret_value;
-
-
-     /*
-      * Call H5Dwrite function.
-      */
-     c_dset_id = (hid_t)*dset_id;
-     c_mem_type_id = (hid_t)*mem_type_id;
-     c_mem_space_id = (hid_t)*mem_space_id;
-     c_file_space_id = (hid_t)*file_space_id;
-     ret = H5Dwrite(c_dset_id, c_mem_type_id, c_mem_space_id, c_file_space_id, c_xfer_prp, buf_c);
-     HDfree(buf_c);
-     if (ret < 0) return ret_value;
-     ret_value = 0;
-     return ret_value;
-}
-
-
-
-/****if* H5Df/h5dreadc_c
- * NAME
- *  h5dreadc_c
- * PURPOSE
- *  Call h5dread_c to read a dataset of characters
- * INPUTS
- *      dset_id - dataset identifier
- *              mem_type_id - memory datatype identifier
- *              mem_space_id - memory dataspace identifier
- *              file_space_id - memory dataspace identifier
- *              xfer_pr  - identifier of transfer property list
- * OUTPUTS
- *     buf      - character data buffer
- * RETURNS
- *     0 on success, -1 on failure
- * AUTHOR
- *  Elena Pourmal
- *              Wednesday, May 15, 2002
- * HISTORY
- * This function was added to accomodate h5dread_f subroutine
- *                with the dims parameter being of INTEGER(HSIZE_T_F) size.
- * SOURCE
-*/
+ */
 int_f
-nh5dreadc_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
+h5dwrite_ref_reg_c(hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id,
+                   hid_t_f *xfer_prp, int_f *buf, hsize_t_f *dims)
 /******/
 {
-     int ret_value = -1;
-
-     /*
-      * Call h5dread_c  function.
-      */
-     ret_value = nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
-
-     return ret_value;
-}
-
-int_f
-nh5dreadc_s_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
-
-{
-     int ret_value = -1;
-
-     /*
-      * Call h5dread_c  function.
-      */
-     ret_value = nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
-
-     return ret_value;
-}
-
-int_f
-nh5dreadc_1_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
-
-{
-     int ret_value = -1;
-
-     /*
-      * Call h5dread_c  function.
-      */
-     ret_value = nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
-
-     return ret_value;
-}
-
-int_f
-nh5dreadc_2_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
-
-{
-     int ret_value = -1;
-
-     /*
-      * Call h5dread_c  function.
-      */
-     ret_value = nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
-
-     return ret_value;
-}
-
-int_f
-nh5dreadc_3_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
-
-{
-     int ret_value = -1;
-
-     /*
-      * Call h5dread_c  function.
-      */
-     ret_value = nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
+    int              ret_value = -1;
+    herr_t           ret;
+    hid_t            c_dset_id;
+    hid_t            c_mem_type_id;
+    hid_t            c_mem_space_id;
+    hid_t            c_file_space_id;
+    hid_t            c_xfer_prp;
+    hdset_reg_ref_t *buf_c = NULL;
+    unsigned int     i, n;
 
-     return ret_value;
-}
-
-int_f
-nh5dreadc_4_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
-
-{
-     int ret_value = -1;
-
-     /*
-      * Call h5dread_c  function.
-      */
-     ret_value = nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
-
-     return ret_value;
-}
-
-int_f
-nh5dreadc_5_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
-
-{
-     int ret_value = -1;
-
-     /*
-      * Call h5dread_c  function.
-      */
-     ret_value = nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
-
-     return ret_value;
-}
-
-int_f
-nh5dreadc_6_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
-
-{
-     int ret_value = -1;
-
-     /*
-      * Call h5dread_c  function.
-      */
-     ret_value = nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
-
-     return ret_value;
-}
-
-int_f
-nh5dreadc_7_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
-
-{
-     int ret_value = -1;
-
-     /*
-      * Call h5dread_c  function.
-      */
-     ret_value = nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
-
-     return ret_value;
-}
-
-/****if* H5Df/h5dread_c
- * NAME
- *  h5dread_c
- * PURPOSE
- *  Call H5Draed to read a dataset
- * INPUTS
- *      dset_id - dataset identifier
- *              mem_type_id - memory datatype identifier
- *              mem_space_id - memory dataspace identifier
- *              file_space_id - memory dataspace identifier
- *              xfer_pr  - identifier of transfer property list
- * OUTPUTS
- *     buf      - data buffer
- * RETURNS
- *     0 on success, -1 on failure
- * AUTHOR
- *  Elena Pourmal
- *              Wednesday, May 15, 2002
- * HISTORY
- * This function was added to accomodate h5dread_f subroutine
- *                with the dims parameter being of INTEGER(HSIZE_T_F) size.
- *
- *                Added nh5dread_integer(real,double)_s,1-7_c functions to eliminate
- *                complains about wrong parameter types in h5dwrite_c function
- *                called by Fortran rouitnes
- *                                           October 10, 2006 EIP
- *
- * SOURCE
-*/
-int_f
-nh5dread_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f UNUSED *dims)
-/******/
-{
-     int ret_value = -1;
-     herr_t ret;
-     hid_t c_dset_id;
-     hid_t c_mem_type_id;
-     hid_t c_mem_space_id;
-     hid_t c_file_space_id;
-     hid_t c_xfer_prp;
-
-     /*
-      * Define transfer property
-      */
-     c_xfer_prp = (hid_t)*xfer_prp;
-
-     /*
-      * Call H5Dread function.
-      */
-     c_dset_id = (hid_t)*dset_id;
-     c_mem_type_id = (hid_t)*mem_type_id;
-     c_mem_space_id = (hid_t)*mem_space_id;
-     c_file_space_id = (hid_t)*file_space_id;
-     ret = H5Dread(c_dset_id, c_mem_type_id, c_mem_space_id, c_file_space_id, c_xfer_prp, buf);
-
-     if (ret < 0) return ret_value;
-     ret_value = 0;
-     return ret_value;
-}
-
-int_f
-nh5dread_integer_s_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dread_c  function.
-      */
-     return nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-nh5dread_integer_1_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dread_c  function.
-      */
-     return nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-nh5dread_integer_2_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dread_c  function.
-      */
-     return nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-nh5dread_integer_3_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dread_c  function.
-      */
-     return nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-nh5dread_integer_4_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dread_c  function.
-      */
-     return nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-nh5dread_integer_5_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dread_c  function.
-      */
-     return nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-nh5dread_integer_6_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dread_c  function.
-      */
-     return nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-nh5dread_integer_7_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dread_c  function.
-      */
-     return nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-nh5dread_real_s_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dread_c  function.
-      */
-     return nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-nh5dread_real_1_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dread_c  function.
-      */
-     return nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-nh5dread_real_2_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dread_c  function.
-      */
-     return nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-nh5dread_real_3_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dread_c  function.
-      */
-     return nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-nh5dread_real_4_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dread_c  function.
-      */
-     return nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-nh5dread_real_5_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dread_c  function.
-      */
-     return nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-nh5dread_real_6_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dread_c  function.
-      */
-     return nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-nh5dread_real_7_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dread_c  function.
-      */
-     return nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-nh5dread_double_s_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dread_c  function.
-      */
-     return nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-nh5dread_double_1_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dread_c  function.
-      */
-     return nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-nh5dread_double_2_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dread_c  function.
-      */
-     return nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-nh5dread_double_3_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dread_c  function.
-      */
-     return nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-nh5dread_double_4_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dread_c  function.
-      */
-     return nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-nh5dread_double_5_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dread_c  function.
-      */
-     return nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-nh5dread_double_6_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dread_c  function.
-      */
-     return nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
+    n = (unsigned int)*dims;
+    /*
+     * Define transfer property
+     */
+    c_xfer_prp = (hid_t)*xfer_prp;
 
-int_f
-nh5dread_double_7_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
+    /*
+     * Allocate temporary buffer and copy references from Fortran.
+     */
+    buf_c = (hdset_reg_ref_t *)HDmalloc(sizeof(hdset_reg_ref_t) * n);
+    if (buf_c != NULL) {
+        for (i = 0; i < n; i++) {
+            HDmemcpy(&buf_c[i], buf, H5R_DSET_REG_REF_BUF_SIZE);
+            buf = buf + REF_REG_BUF_LEN_F;
+        }
+    }
+    else
+        return ret_value;
 
-{
-     /*
-      * Call h5dread_c  function.
-      */
-     return nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
+    /*
+     * Call H5Dwrite function.
+     */
+    c_dset_id       = (hid_t)*dset_id;
+    c_mem_type_id   = (hid_t)*mem_type_id;
+    c_mem_space_id  = (hid_t)*mem_space_id;
+    c_file_space_id = (hid_t)*file_space_id;
+    ret             = H5Dwrite(c_dset_id, c_mem_type_id, c_mem_space_id, c_file_space_id, c_xfer_prp, buf_c);
+    HDfree(buf_c);
+    if (ret < 0)
+        return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
-/****if* H5Df/h5dread_ref_obj_c
+/****if* H5Df/h5dread_ref_reg_c
  * NAME
- *  h5dread_ref_obj_c
+ *  h5dread_ref_reg_c
  * PURPOSE
- *  Call H5Dread to read a dataset  of object references
+ *  Call H5Dread to read a dataset of dataset region references
  * INPUTS
- *      dset_id - dataset identifier
- *              mem_type_id - memory datatype identifier
- *              mem_space_id - memory dataspace identifier
- *              file_space_id - memory dataspace identifier
- *              xfer_pr  - identifier of transfer property list
- *              buf      - data buffer to store references to the objects.
- *              n - number of references to be stored.
+ *  dset_id - dataset identifier
+ *  mem_type_id - memory datatype identifier
+ *  mem_space_id - memory dataspace identifier
+ *  file_space_id - memory dataspace identifier
+ *  xfer_pr  - identifier of transfer property list
+ *  buf      - data buffer to store references to the objects.
+ *  n - number of references to be stored.
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Wednesday, May 15, 2002
+ *  Wednesday, May 15, 2002
  * HISTORY
- * This function was added to accomodate h5dread_f subroutine
- *                with the dims parameter being of INTEGER(HSIZE_T_F) size.
+ *  This function was added to accommodate h5dread_f subroutine
+ *  with the dims parameter being of INTEGER(HSIZE_T_F) size.
  * SOURCE
-*/
+ */
 int_f
-nh5dread_ref_obj_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, haddr_t_f * buf, hsize_t_f *dims)
+h5dread_ref_reg_c(hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id,
+                  hid_t_f *xfer_prp, int_f *buf, hsize_t_f *dims)
 /******/
 {
-    int ret_value = -1;
-    herr_t ret = -1;
-    hid_t c_dset_id;
-    hid_t c_mem_type_id;
-    hid_t c_mem_space_id;
-    hid_t c_file_space_id;
-    hid_t c_xfer_prp;
-    hobj_ref_t *buf_c = NULL;
-    hsize_t i,n;
-
+    int              ret_value = -1;
+    herr_t           ret       = -1;
+    hid_t            c_dset_id;
+    hid_t            c_mem_type_id;
+    hid_t            c_mem_space_id;
+    hid_t            c_file_space_id;
+    hid_t            c_xfer_prp;
+    hdset_reg_ref_t *buf_c = NULL;
+    hsize_t          i, n;
+    n = (hsize_t)*dims;
     /*
      * Define transfer property
      */
@@ -1219,124 +243,58 @@ nh5dread_ref_obj_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_i
     /*
      * Allocate temporary buffer.
      */
-    n = (hsize_t)*dims;
-    buf_c = (hobj_ref_t*)HDmalloc(sizeof(hobj_ref_t)*(size_t)n);
-    if ( buf_c != NULL ) {
+    buf_c = (hdset_reg_ref_t *)HDmalloc(sizeof(hdset_reg_ref_t) * (size_t)n);
+    if (buf_c != NULL) {
         /*
          * Call H5Dread function.
          */
-        c_dset_id = (hid_t)*dset_id;
-        c_mem_type_id = (hid_t)*mem_type_id;
-        c_mem_space_id = (hid_t)*mem_space_id;
+        c_dset_id       = (hid_t)*dset_id;
+        c_mem_type_id   = (hid_t)*mem_type_id;
+        c_mem_space_id  = (hid_t)*mem_space_id;
         c_file_space_id = (hid_t)*file_space_id;
         ret = H5Dread(c_dset_id, c_mem_type_id, c_mem_space_id, c_file_space_id, c_xfer_prp, buf_c);
-        if (ret >=0) {
-           for (i = 0; i < n; i++)
-              HDmemcpy(&buf[i], &buf_c[i], sizeof(haddr_t));
+        if (ret >= 0) {
+            for (i = 0; i < n; i++) {
+                HDmemcpy(buf, &buf_c[i], H5R_DSET_REG_REF_BUF_SIZE);
+                buf = buf + REF_REG_BUF_LEN_F;
+            }
         }
-        if ( buf_c != NULL ) HDfree(buf_c);
+        if (buf_c != NULL)
+            HDfree(buf_c);
     }
-    if (ret < 0) return ret_value;
+    if (ret < 0)
+        return ret_value;
     ret_value = 0;
     return ret_value;
 }
 
-/****if* H5Df/h5dread_ref_reg_c
- * NAME
- *  h5dread_ref_reg_c
- * PURPOSE
- *  Call H5Dread to read a dataset of dataset region references
- * INPUTS
- *      dset_id - dataset identifier
- *              mem_type_id - memory datatype identifier
- *              mem_space_id - memory dataspace identifier
- *              file_space_id - memory dataspace identifier
- *              xfer_pr  - identifier of transfer property list
- *              buf      - data buffer to store references to the objects.
- *              n - number of references to be stored.
- * RETURNS
- *     0 on success, -1 on failure
- * AUTHOR
- *  Elena Pourmal
- *              Wednesday, May 15, 2002
- * HISTORY
- * This function was added to accomodate h5dread_f subroutine
- *                with the dims parameter being of INTEGER(HSIZE_T_F) size.
- * SOURCE
-*/
-int_f
-nh5dread_ref_reg_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, int_f * buf, hsize_t_f *dims)
-/******/
-{
-     int ret_value = -1;
-     herr_t ret = -1;
-     hid_t c_dset_id;
-     hid_t c_mem_type_id;
-     hid_t c_mem_space_id;
-     hid_t c_file_space_id;
-     hid_t c_xfer_prp;
-     hdset_reg_ref_t *buf_c = NULL;
-     hsize_t i, n;
-     n = (hsize_t)*dims;
-     /*
-      * Define transfer property
-      */
-     c_xfer_prp = (hid_t)*xfer_prp;
-
-     /*
-      * Allocate temporary buffer.
-      */
-     buf_c = (hdset_reg_ref_t *)HDmalloc(sizeof(hdset_reg_ref_t)*(size_t)n);
-     if ( buf_c != NULL ) {
-         /*
-          * Call H5Dread function.
-          */
-         c_dset_id = (hid_t)*dset_id;
-         c_mem_type_id = (hid_t)*mem_type_id;
-         c_mem_space_id = (hid_t)*mem_space_id;
-         c_file_space_id = (hid_t)*file_space_id;
-         ret = H5Dread(c_dset_id, c_mem_type_id, c_mem_space_id, c_file_space_id, c_xfer_prp, buf_c);
-         if (ret >=0) {
-            for (i = 0; i < n; i++) {
-               HDmemcpy(buf, &buf_c[i], H5R_DSET_REG_REF_BUF_SIZE);
-               buf = buf + REF_REG_BUF_LEN_F;
-            }
-         }
-         if ( buf_c != NULL ) HDfree(buf_c);
-     }
-     if (ret < 0) return ret_value;
-     ret_value = 0;
-     return ret_value;
-}
-
-
-
 /****if* H5Df/h5dclose_c
  * NAME
  *  h5dclose_c
  * PURPOSE
  *  Call H5Dclose to close a dataset
  * INPUTS
- *      dset_id - identifier of the dataset to be closed
+ *  dset_id - identifier of the dataset to be closed
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Wednesday, August 4, 1999
+ *  Wednesday, August 4, 1999
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5dclose_c ( hid_t_f *dset_id )
+h5dclose_c(hid_t_f *dset_id)
 /******/
 {
-  int ret_value = 0;
-  hid_t c_dset_id;
-  c_dset_id = (hid_t)*dset_id;
-  if ( H5Dclose(c_dset_id) < 0  ) ret_value = -1;
-  return ret_value;
+    int   ret_value = 0;
+    hid_t c_dset_id;
+    c_dset_id = (hid_t)*dset_id;
+    if (H5Dclose(c_dset_id) < 0)
+        ret_value = -1;
+    return ret_value;
 }
 
 /****if* H5Df/h5dget_space_c
@@ -1345,33 +303,34 @@ nh5dclose_c ( hid_t_f *dset_id )
  * PURPOSE
  *  Call H5Dget_space to obtain dataspace of a dataset
  * INPUTS
- *      dset_id - identifier of the dataset
+ *  dset_id - identifier of the dataset
  * OUTPUTS
- *     space_id - identifier of the dataset's dataspace
+ *  space_id - identifier of the dataset's dataspace
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Thursday, August 19, 1999
+ *  Thursday, August 19, 1999
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5dget_space_c ( hid_t_f *dset_id , hid_t_f *space_id)
+h5dget_space_c(hid_t_f *dset_id, hid_t_f *space_id)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_dset_id;
-  hid_t c_space_id;
-
-  c_dset_id = (hid_t)*dset_id;
-  c_space_id = H5Dget_space(c_dset_id);
-  if(c_space_id < 0 ) return ret_value;
-  ret_value = 0;
-  *space_id = (hid_t_f)c_space_id;
-  return ret_value;
+    int   ret_value = -1;
+    hid_t c_dset_id;
+    hid_t c_space_id;
+
+    c_dset_id  = (hid_t)*dset_id;
+    c_space_id = H5Dget_space(c_dset_id);
+    if (c_space_id < 0)
+        return ret_value;
+    ret_value = 0;
+    *space_id = (hid_t_f)c_space_id;
+    return ret_value;
 }
 
 /****if* H5Df/h5dget_type_c
@@ -1380,35 +339,36 @@ nh5dget_space_c ( hid_t_f *dset_id , hid_t_f *space_id)
  * PURPOSE
  *  Call H5Dget_type to obtain datatype of a dataset
  * INPUTS
- *      dset_id - identifier of the dataset
+ *  dset_id - identifier of the dataset
  * OUTPUTS
- *     type_id - identifier of the dataset's datatype
+ *  type_id - identifier of the dataset's datatype
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Thursday, August 19, 1999
+ *  Thursday, August 19, 1999
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5dget_type_c ( hid_t_f *dset_id , hid_t_f *type_id)
+h5dget_type_c(hid_t_f *dset_id, hid_t_f *type_id)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_dset_id;
-  hid_t c_type_id;
+    int   ret_value = -1;
+    hid_t c_dset_id;
+    hid_t c_type_id;
 
-  c_dset_id = (hid_t)*dset_id;
-  c_type_id = H5Dget_type(c_dset_id);
+    c_dset_id = (hid_t)*dset_id;
+    c_type_id = H5Dget_type(c_dset_id);
 
-  if(c_type_id < 0 ) return ret_value;
+    if (c_type_id < 0)
+        return ret_value;
 
-  *type_id = (hid_t_f)c_type_id;
-  ret_value = 0;
-  return ret_value;
+    *type_id  = (hid_t_f)c_type_id;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Df/h5dget_create_plist_c
@@ -1416,795 +376,674 @@ nh5dget_type_c ( hid_t_f *dset_id , hid_t_f *type_id)
  *  h5dget_create_plist_c
  * PURPOSE
  *  Call H5Dget_create_plist to obtain creation property list
- *              of a dataset
+ *  of a dataset
  * INPUTS
- *      dset_id - identifier of the dataset
+ *  dset_id - identifier of the dataset
  * OUTPUTS
- *     plist_id - identifier of he dataset creation property list
+ *  plist_id - identifier of he dataset creation property list
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Thursday, August 19, 1999
+ *  Thursday, August 19, 1999
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5dget_create_plist_c ( hid_t_f *dset_id , hid_t_f *plist_id)
+h5dget_create_plist_c(hid_t_f *dset_id, hid_t_f *plist_id)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_dset_id;
-  hid_t c_plist_id;
+    int   ret_value = -1;
+    hid_t c_dset_id;
+    hid_t c_plist_id;
 
-  c_dset_id = (hid_t)*dset_id;
-  c_plist_id = H5Dget_create_plist(c_dset_id);
+    c_dset_id  = (hid_t)*dset_id;
+    c_plist_id = H5Dget_create_plist(c_dset_id);
 
-  if(c_plist_id < 0 ) return ret_value;
+    if (c_plist_id < 0)
+        return ret_value;
 
-  ret_value = 0;
-  *plist_id = (hid_t_f)c_plist_id;
-  return ret_value;
+    ret_value = 0;
+    *plist_id = (hid_t_f)c_plist_id;
+    return ret_value;
 }
 
-
 /****if* H5Df/h5dset_extent_c
  * NAME
  *  h5dset_extent_c
  * PURPOSE
  *  Call H5Dset_extent to extend dataset with unlimited dimensions
  * INPUTS
- *      dset_id - identifier of the dataset
+ *  dset_id - identifier of the dataset
  * OUTPUTS
- *     dims - array with the dimension sizes
+ *  dims - array with the dimension sizes
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Thursday, August 19, 1999
+ *  Thursday, August 19, 1999
  *
  * HISTORY
- * Changed name from the now obsolete h5dextend
- *                to h5dset_extent in order to match new fortran interface.
+ *  Changed name from the now obsolete h5dextend
+ *  to h5dset_extent in order to match new fortran interface.
  *                -MSB- March 14, 2008
  * SOURCE
-*/
+ */
 
 int_f
-nh5dset_extent_c ( hid_t_f *dset_id , hsize_t_f *dims)
+h5dset_extent_c(hid_t_f *dset_id, hsize_t_f *dims)
 /******/
 {
-  hid_t c_space_id;
-  hsize_t c_dims[H5S_MAX_RANK];
-  int rank;
-  int i;
-  int status;
-  int ret_value = -1;
-
-  if((c_space_id = H5Dget_space((hid_t)*dset_id)) < 0) return ret_value;
+    hid_t   c_space_id;
+    hsize_t c_dims[H5S_MAX_RANK];
+    int     rank;
+    int     i;
+    int     status;
+    int     ret_value = -1;
 
-  rank = H5Sget_simple_extent_ndims(c_space_id);
-  H5Sclose(c_space_id);
-  if(rank < 0 ) return ret_value;
+    if ((c_space_id = H5Dget_space((hid_t)*dset_id)) < 0)
+        return ret_value;
 
+    rank = H5Sget_simple_extent_ndims(c_space_id);
+    H5Sclose(c_space_id);
+    if (rank < 0)
+        return ret_value;
 
-  /*
-   * Reverse dimensions due to C-FORTRAN storage order.
-   */
-  for(i = 0; i < rank; i++)
-      c_dims[i] = (hsize_t)dims[rank - i - 1];
+    /*
+     * Reverse dimensions due to C-FORTRAN storage order.
+     */
+    for (i = 0; i < rank; i++)
+        c_dims[i] = (hsize_t)dims[rank - i - 1];
 
-  status = H5Dset_extent((hid_t)*dset_id, c_dims);
+    status = H5Dset_extent((hid_t)*dset_id, c_dims);
 
-  if(status >= 0)
-      ret_value = 0;
-  return ret_value;
+    if (status >= 0)
+        ret_value = 0;
+    return ret_value;
 }
 
-/****if* H5Df/nh5dget_storage_size_c
+/****if* H5Df/h5dget_storage_size_c
  * NAME
- *  nh5dget_storage_size_c
+ *  h5dget_storage_size_c
  * PURPOSE
  *  Call H5Dget_storage_size to return the amount of storage
- *              required for a dataset
+ *  required for a dataset
  * INPUTS
- *      dset_id - identifier of the dataset
+ *  dset_id - identifier of the dataset
  * OUTPUTS
- *     size    - the amount of storage required for a dataset
+ *  size    - the amount of storage required for a dataset
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Tuesday, October 22, 2002
+ *  Tuesday, October 22, 2002
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5dget_storage_size_c ( hid_t_f *dset_id , hsize_t_f *size)
+h5dget_storage_size_c(hid_t_f *dset_id, hsize_t_f *size)
 /******/
 {
-  int ret_value = -1;
-  hsize_t c_size;
-  hid_t c_dset_id;
-
-  c_dset_id = (hid_t)*dset_id;
-  c_size = H5Dget_storage_size(c_dset_id);
-  if (c_size == 0) return ret_value;
-  *size = (hsize_t_f)c_size;
-  ret_value = 0;
-  return ret_value;
+    int     ret_value = -1;
+    hsize_t c_size;
+    hid_t   c_dset_id;
+
+    c_dset_id = (hid_t)*dset_id;
+    c_size    = H5Dget_storage_size(c_dset_id);
+    if (c_size != 0) {
+        ret_value = 0;
+    }
+    *size = (hsize_t_f)c_size;
+    return ret_value;
 }
 
-/****if* H5Df/nh5dvlen_get_max_len_c
+/****if* H5Df/h5dvlen_get_max_len_c
  * NAME
- *  nh5dvlen_get_max_len_c
+ *  h5dvlen_get_max_len_c
  * PURPOSE
  *  Get the maximum size of the VL dataset element
  * INPUTS
- *      dset_id - identifier of the dataset
- *              type_id - datatype identifier
- *              space_id - dataspace identifier
+ *  dset_id - identifier of the dataset
+ *  type_id - datatype identifier
+ *  space_id - dataspace identifier
  * OUTPUTS
- *     len      - maximum length of the VL dataset element
+ *  len      - maximum length of the VL dataset element
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Tuesday, October 22, 2002
+ *  Tuesday, October 22, 2002
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5dvlen_get_max_len_c ( hid_t_f *dset_id ,  hid_t_f *type_id, hid_t_f *space_id, size_t_f *len)
+h5dvlen_get_max_len_c(hid_t_f *dset_id, hid_t_f *type_id, hid_t_f *space_id, size_t_f *len)
 /******/
 {
-  int ret_value = -1;
-  size_t c_len;
-  hid_t c_dset_id;
-  hid_t c_type_id;
-  hid_t c_space_id;
-  hvl_t *c_buf;
-  int i;
-  hssize_t num_elem;
-  herr_t status;
-
-  c_dset_id = (hid_t)*dset_id;
-  c_type_id = (hid_t)*type_id;
-  c_space_id = (hid_t)*space_id;
-
-  num_elem = H5Sget_select_npoints(c_space_id);
-  if( num_elem < 0) return ret_value;
-
-  c_buf = (hvl_t *)HDmalloc(sizeof(hvl_t)*(size_t)num_elem);
-  if (c_buf == NULL) return ret_value;
-  status = H5Dread(c_dset_id, c_type_id, H5S_ALL, c_space_id, H5P_DEFAULT, c_buf);
-  if(status < 0) goto DONE;
-
-  c_len = 0;
-  for (i=0; i < num_elem; i++) c_len = H5_MAX(c_len, c_buf[i].len);
-  *len = (size_t_f)c_len;
-  H5Dvlen_reclaim(c_type_id, c_space_id, H5P_DEFAULT, c_buf);
-  ret_value = 0;
+    int      ret_value = -1;
+    size_t   c_len;
+    hid_t    c_dset_id;
+    hid_t    c_type_id;
+    hid_t    c_space_id;
+    hvl_t   *c_buf;
+    int      i;
+    hssize_t num_elem;
+    herr_t   status;
+
+    c_dset_id  = (hid_t)*dset_id;
+    c_type_id  = (hid_t)*type_id;
+    c_space_id = (hid_t)*space_id;
+
+    num_elem = H5Sget_select_npoints(c_space_id);
+    if (num_elem < 0)
+        return ret_value;
+
+    c_buf = (hvl_t *)HDmalloc(sizeof(hvl_t) * (size_t)num_elem);
+    if (c_buf == NULL)
+        return ret_value;
+    status = H5Dread(c_dset_id, c_type_id, H5S_ALL, c_space_id, H5P_DEFAULT, c_buf);
+    if (status < 0)
+        goto DONE;
+
+    c_len = 0;
+    for (i = 0; i < num_elem; i++)
+        c_len = H5_MAX(c_len, c_buf[i].len);
+    *len = (size_t_f)c_len;
+    H5Treclaim(c_type_id, c_space_id, H5P_DEFAULT, c_buf);
+    ret_value = 0;
 
 DONE:
 
-  HDfree(c_buf);
-  return ret_value;
+    HDfree(c_buf);
+    return ret_value;
 }
-/****if* H5Df/nh5dwrite_vl_integer_c
+/****if* H5Df/h5dwrite_vl_integer_c
  * NAME
- *  nh5dwrite_vl_integer_c
+ *  h5dwrite_vl_integer_c
  * PURPOSE
  *  Write variable length dataset
  * INPUTS
- *      dset_id - identifier of the dataset
- *              mem_type_id - datatype identifier
- *              mem_space_id - dataspace identifier
- *              file_space_id - file dataspace identifier
- *              xfer          - file transfer property
- *              buf           - data buffer
- *              dims          - one-demnsional array of size 2
- *                              dims[0] = MAXLENGTH
- *                              dims[1] = number of elements of VL type
- *              len           - array element lenghts
+ *  dset_id - identifier of the dataset
+ *  mem_type_id - datatype identifier
+ *  mem_space_id - dataspace identifier
+ *  file_space_id - file dataspace identifier
+ *  xfer          - file transfer property
+ *  buf           - data buffer
+ *  dims          - one-demnsional array of size 2
+ *  dims[0] = MAXLENGTH
+ *  dims[1] = number of elements of VL type
+ *  len           - array element lengths
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Wednesday, October 23, 2002
+ *  Wednesday, October 23, 2002
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5dwrite_vl_integer_c ( hid_t_f *dset_id ,  hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, int_f *buf, hsize_t_f *dims, size_t_f *len)
+h5dwrite_vl_integer_c(hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id,
+                      hid_t_f *xfer_prp, int_f *buf, hsize_t_f *dims, size_t_f *len)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_dset_id;
-  hid_t c_mem_type_id;
-  hid_t c_mem_space_id;
-  hid_t c_file_space_id;
-  hid_t c_xfer_prp;
-  herr_t status;
-  int_f *tmp;
-  size_t max_len;
-
-  hvl_t *c_buf;
-  hsize_t i;
-  hsize_t num_elem;
-
-  max_len = (size_t)dims[0];
-  num_elem = (hsize_t)dims[1];
-
-  c_dset_id       = (hid_t)*dset_id;
-  c_mem_type_id   = (hid_t)*mem_type_id;
-  c_mem_space_id  = (hid_t)*mem_space_id;
-  c_file_space_id = (hid_t)*file_space_id;
-  c_xfer_prp      = (hid_t)*xfer_prp;
-
-  c_buf = (hvl_t *)HDmalloc((size_t)num_elem * sizeof(hvl_t));
-  if (c_buf == NULL) return ret_value;
-  tmp = (int_f *)buf;
-  for (i=0; i < num_elem; i++) {
-       c_buf[i].len = (size_t)len[i];
-       c_buf[i].p   = tmp;
-       tmp = tmp + max_len;
- }
-  /*
-   * Call H5Dwrite function.
-   */
-   status = H5Dwrite(c_dset_id, c_mem_type_id, c_mem_space_id, c_file_space_id, c_xfer_prp, c_buf);
-
-  if( status < 0) goto DONE;
-  ret_value = 0;
+    int    ret_value = -1;
+    hid_t  c_dset_id;
+    hid_t  c_mem_type_id;
+    hid_t  c_mem_space_id;
+    hid_t  c_file_space_id;
+    hid_t  c_xfer_prp;
+    herr_t status;
+    int_f *tmp;
+    size_t max_len;
+
+    hvl_t  *c_buf;
+    hsize_t i;
+    hsize_t num_elem;
+
+    max_len  = (size_t)dims[0];
+    num_elem = (hsize_t)dims[1];
+
+    c_dset_id       = (hid_t)*dset_id;
+    c_mem_type_id   = (hid_t)*mem_type_id;
+    c_mem_space_id  = (hid_t)*mem_space_id;
+    c_file_space_id = (hid_t)*file_space_id;
+    c_xfer_prp      = (hid_t)*xfer_prp;
+
+    c_buf = (hvl_t *)HDmalloc((size_t)num_elem * sizeof(hvl_t));
+    if (c_buf == NULL)
+        return ret_value;
+    tmp = (int_f *)buf;
+    for (i = 0; i < num_elem; i++) {
+        c_buf[i].len = (size_t)len[i];
+        c_buf[i].p   = tmp;
+        tmp          = tmp + max_len;
+    }
+    /*
+     * Call H5Dwrite function.
+     */
+    status = H5Dwrite(c_dset_id, c_mem_type_id, c_mem_space_id, c_file_space_id, c_xfer_prp, c_buf);
+
+    if (status < 0)
+        goto DONE;
+    ret_value = 0;
 DONE:
-  HDfree(c_buf);
-  return ret_value;
+    HDfree(c_buf);
+    return ret_value;
 }
 
-/****if* H5Df/nh5dread_vl_integer_c
+/****if* H5Df/h5dread_vl_integer_c
  * NAME
- *  nh5dread_vl_integer_c
+ *  h5dread_vl_integer_c
  * PURPOSE
  *  Read variable length dataset
  * INPUTS
- *      dset_id - identifier of the dataset
- *              mem_type_id - datatype identifier
- *              mem_space_id - dataspace identifier
- *              file_space_id - file dataspace identifier
- *              xfer          - file transfer property
- *              dims          - one-demnsional array of size 2
- *                              dims[0] = MAXLENGTH
- *                              dims[1] = number of elements of VL type
+ *  dset_id - identifier of the dataset
+ *  mem_type_id - datatype identifier
+ *  mem_space_id - dataspace identifier
+ *  file_space_id - file dataspace identifier
+ *  xfer          - file transfer property
+ *  dims          - one-demnsional array of size 2
+ *  dims[0] = MAXLENGTH
+ *  dims[1] = number of elements of VL type
  * OUTPUTS
- *     buf           - data buffer
- *              len           - array element lenghts
+ *  buf           - data buffer
+ *  len           - array element lengths
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Wednesday, October 24, 2002
+ *  Wednesday, October 24, 2002
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5dread_vl_integer_c ( hid_t_f *dset_id ,  hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, int_f *buf, hsize_t_f *dims, size_t_f *len)
+h5dread_vl_integer_c(hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id,
+                     hid_t_f *xfer_prp, int_f *buf, hsize_t_f *dims, size_t_f *len)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_dset_id;
-  hid_t c_mem_type_id;
-  hid_t c_mem_space_id;
-  hid_t c_file_space_id;
-  hid_t c_xfer_prp;
-  herr_t status;
-  size_t max_len;
-
-  hvl_t *c_buf;
-  hsize_t i;
-  hssize_t num_elem;
-
-  c_dset_id       = (hid_t)*dset_id;
-  c_mem_type_id   = (hid_t)*mem_type_id;
-  c_mem_space_id  = (hid_t)*mem_space_id;
-  c_file_space_id = (hid_t)*file_space_id;
-  c_xfer_prp      = (hid_t)*xfer_prp;
-
-  max_len = (size_t)dims[0];
-  num_elem = H5Sget_select_npoints(c_mem_space_id);
-  if(num_elem != (hssize_t)dims[1]) return ret_value;
-
-  c_buf = (hvl_t *)HDmalloc((size_t)num_elem * sizeof(hvl_t));
-  if (c_buf == NULL) return ret_value;
-  /*
-   * Call H5Dread function.
-   */
-   status = H5Dread(c_dset_id, c_mem_type_id, c_mem_space_id, c_file_space_id, c_xfer_prp, c_buf);
- if ( status < 0 ) goto DONE;
-  for (i=0; i < (hsize_t)num_elem; i++) {
-       len[i] = (size_t_f)c_buf[i].len;
-       memcpy(&buf[i*max_len], c_buf[i].p, c_buf[i].len*sizeof(int_f));
-  }
-  H5Dvlen_reclaim(c_mem_type_id, c_mem_space_id, H5P_DEFAULT, c_buf);
-  ret_value = 0;
+    int    ret_value = -1;
+    hid_t  c_dset_id;
+    hid_t  c_mem_type_id;
+    hid_t  c_mem_space_id;
+    hid_t  c_file_space_id;
+    hid_t  c_xfer_prp;
+    herr_t status;
+    size_t max_len;
+
+    hvl_t   *c_buf;
+    hsize_t  i;
+    hssize_t num_elem;
+
+    c_dset_id       = (hid_t)*dset_id;
+    c_mem_type_id   = (hid_t)*mem_type_id;
+    c_mem_space_id  = (hid_t)*mem_space_id;
+    c_file_space_id = (hid_t)*file_space_id;
+    c_xfer_prp      = (hid_t)*xfer_prp;
+
+    max_len  = (size_t)dims[0];
+    num_elem = H5Sget_select_npoints(c_mem_space_id);
+    if (num_elem != (hssize_t)dims[1])
+        return ret_value;
+
+    c_buf = (hvl_t *)HDmalloc((size_t)num_elem * sizeof(hvl_t));
+    if (c_buf == NULL)
+        return ret_value;
+    /*
+     * Call H5Dread function.
+     */
+    status = H5Dread(c_dset_id, c_mem_type_id, c_mem_space_id, c_file_space_id, c_xfer_prp, c_buf);
+    if (status < 0)
+        goto DONE;
+    for (i = 0; i < (hsize_t)num_elem; i++) {
+        len[i] = (size_t_f)c_buf[i].len;
+        memcpy(&buf[i * max_len], c_buf[i].p, c_buf[i].len * sizeof(int_f));
+    }
+    H5Treclaim(c_mem_type_id, c_mem_space_id, H5P_DEFAULT, c_buf);
+    ret_value = 0;
 DONE:
-  HDfree(c_buf);
-  return ret_value;
+    HDfree(c_buf);
+    return ret_value;
 }
 
-/****if* H5Df/nh5dwrite_vl_string_c
+/****if* H5Df/h5dwrite_vl_string_c
  * NAME
- *  nh5dwrite_vl_string_c
+ *  h5dwrite_vl_string_c
  * PURPOSE
  *  Write variable length strings from Fortran program
  * INPUTS
- *      dset_id - identifier of the dataset
- *              mem_type_id - datatype identifier
- *              mem_space_id - dataspace identifier
- *              file_space_id - file dataspace identifier
- *              xfer          - file transfer property
- *              buf           - data buffer
- *              dims          - one-demnsional array of size 2
- *                              dims[0] = number of strings of size max_len
- *              len           - array of strings lengths
+ *  dset_id - identifier of the dataset
+ *  mem_type_id - datatype identifier
+ *  mem_space_id - dataspace identifier
+ *  file_space_id - file dataspace identifier
+ *  xfer          - file transfer property
+ *  buf           - data buffer
+ *  dims          - one-demnsional array of size 2
+ *  dims[0] = number of strings of size max_len
+ *  len           - array of strings lengths
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Monday, October 28, 2002
+ *  Monday, October 28, 2002
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5dwrite_vl_string_c( hid_t_f *dset_id ,  hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims, size_t_f *len)
+h5dwrite_vl_string_c(hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id,
+                     hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims, size_t_f *len)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_dset_id;
-  hid_t c_mem_type_id;
-  hid_t c_mem_space_id;
-  hid_t c_file_space_id;
-  hid_t c_xfer_prp;
-  herr_t status;
-  char *tmp, *tmp_p;
-  size_t max_len;
-
-  char **c_buf;
-  hsize_t i;
-  hsize_t num_elem;
-
-  max_len = (size_t)dims[0];
-  num_elem = (hsize_t)dims[1];
-
-  c_dset_id       = (hid_t)*dset_id;
-  c_mem_type_id   = (hid_t)*mem_type_id;
-  c_mem_space_id  = (hid_t)*mem_space_id;
-  c_file_space_id = (hid_t)*file_space_id;
-  c_xfer_prp      = (hid_t)*xfer_prp;
-
-  /*
-   * Allocate arra of character pointers
-   */
-  c_buf = (char **)HDmalloc((size_t)num_elem * sizeof(char *));
-  if (c_buf == NULL) return ret_value;
-
-  /* Copy data to long C string */
-  tmp = (char *)HD5f2cstring(buf, (size_t)(max_len*num_elem));
-  if (tmp == NULL) { HDfree(c_buf);
-                     return ret_value;
-                   }
-  /*
-   * Move data from temorary buffer
-   */
-   tmp_p = tmp;
-   for (i=0; i < num_elem; i++) {
-        c_buf[i] = (char *) HDmalloc((size_t)len[i]+1);
+    int    ret_value = -1;
+    hid_t  c_dset_id;
+    hid_t  c_mem_type_id;
+    hid_t  c_mem_space_id;
+    hid_t  c_file_space_id;
+    hid_t  c_xfer_prp;
+    herr_t status;
+    char  *tmp, *tmp_p;
+    size_t max_len;
+
+    char  **c_buf;
+    hsize_t i;
+    hsize_t num_elem;
+
+    max_len  = (size_t)dims[0];
+    num_elem = (hsize_t)dims[1];
+
+    c_dset_id       = (hid_t)*dset_id;
+    c_mem_type_id   = (hid_t)*mem_type_id;
+    c_mem_space_id  = (hid_t)*mem_space_id;
+    c_file_space_id = (hid_t)*file_space_id;
+    c_xfer_prp      = (hid_t)*xfer_prp;
+
+    /*
+     * Allocate arra of character pointers
+     */
+    c_buf = (char **)HDmalloc((size_t)num_elem * sizeof(char *));
+    if (c_buf == NULL)
+        return ret_value;
+
+    /* Copy data to long C string */
+    tmp = (char *)HD5f2cstring(buf, (size_t)(max_len * num_elem));
+    if (tmp == NULL) {
+        HDfree(c_buf);
+        return ret_value;
+    }
+    /*
+     * Move data from temporary buffer
+     */
+    tmp_p = tmp;
+    for (i = 0; i < num_elem; i++) {
+        c_buf[i] = (char *)HDmalloc((size_t)len[i] + 1);
         memcpy(c_buf[i], tmp_p, (size_t)len[i]);
         c_buf[i][len[i]] = '\0';
-        tmp_p = tmp_p + max_len;
-   }
+        tmp_p            = tmp_p + max_len;
+    }
 
-  /*
-   * Call H5Dwrite function.
-   */
-   status = H5Dwrite(c_dset_id, c_mem_type_id, c_mem_space_id, c_file_space_id, c_xfer_prp, c_buf);
+    /*
+     * Call H5Dwrite function.
+     */
+    status = H5Dwrite(c_dset_id, c_mem_type_id, c_mem_space_id, c_file_space_id, c_xfer_prp, c_buf);
 
-  if( status < 0) goto DONE;
-  ret_value = 0;
+    if (status < 0)
+        goto DONE;
+    ret_value = 0;
 DONE:
-  H5Dvlen_reclaim(c_mem_type_id, c_mem_space_id, H5P_DEFAULT, c_buf);
-  HDfree(c_buf);
-  HDfree(tmp);
-  return ret_value;
+    H5Treclaim(c_mem_type_id, c_mem_space_id, H5P_DEFAULT, c_buf);
+    HDfree(c_buf);
+    HDfree(tmp);
+    return ret_value;
 }
-/****if* H5Df/nh5dread_vl_string_c
+/****if* H5Df/h5dread_vl_string_c
  * NAME
- *  nh5dread_vl_string_c
+ *  h5dread_vl_string_c
  * PURPOSE
  *  Read variable length strings from Fortran program
  * INPUTS
- *      dset_id - identifier of the dataset
- *              mem_type_id - datatype identifier
- *              mem_space_id - dataspace identifier
- *              file_space_id - file dataspace identifier
- *              xfer          - file transfer property
- *              dims          - one-demnsional array of size 2
- *                              dims[0] = number of strings of size max_len
- * Output:      buf           - data buffer
- *              len           - array of strings lengths
+ *  dset_id - identifier of the dataset
+ *  mem_type_id - datatype identifier
+ *  mem_space_id - dataspace identifier
+ *  file_space_id - file dataspace identifier
+ *  xfer          - file transfer property
+ *  dims          - one-demnsional array of size 2
+ *  dims[0] = number of strings of size max_len
+ *  Output:      buf           - data buffer
+ *  len           - array of strings lengths
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Friday, November 1, 2002
+ *  Friday, November 1, 2002
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5dread_vl_string_c( hid_t_f *dset_id ,  hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims, size_t_f *len)
+h5dread_vl_string_c(hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id,
+                    hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims, size_t_f *len)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_dset_id;
-  hid_t c_mem_type_id;
-  hid_t c_mem_space_id;
-  hid_t c_file_space_id;
-  hid_t c_xfer_prp;
-  herr_t status;
-  char *tmp, *tmp_p;
-  size_t max_len;
-
-  char **c_buf;
-  hsize_t i;
-  hsize_t num_elem;
-
-  max_len = (size_t)dims[0];
-  num_elem = (hsize_t)dims[1];
-
-  c_dset_id       = (hid_t)*dset_id;
-  c_mem_type_id   = (hid_t)*mem_type_id;
-  c_mem_space_id  = (hid_t)*mem_space_id;
-  c_file_space_id = (hid_t)*file_space_id;
-  c_xfer_prp      = (hid_t)*xfer_prp;
-
-  /*
-   * Allocate array of character pointers
-   */
-  c_buf = (char **)HDmalloc((size_t)num_elem * sizeof(char *));
-  if (c_buf == NULL) return ret_value;
-
-  /*
-   * Call H5Dread function.
-   */
-   status = H5Dread(c_dset_id, c_mem_type_id, c_mem_space_id, c_file_space_id, c_xfer_prp, c_buf);
-   if (status < 0) { HDfree(c_buf);
-                     return ret_value;
-                   }
-  /* Copy data to long C string */
-  tmp = (char *)HDmalloc((size_t)(max_len*num_elem) +1);
-  tmp_p = tmp;
-  for (i=0; i<max_len*num_elem; i++) tmp[i] = ' ';
-  tmp[max_len*num_elem] = '\0';
-  for (i=0; i < num_elem; i++) {
+    int    ret_value = -1;
+    hid_t  c_dset_id;
+    hid_t  c_mem_type_id;
+    hid_t  c_mem_space_id;
+    hid_t  c_file_space_id;
+    hid_t  c_xfer_prp;
+    herr_t status;
+    char  *tmp, *tmp_p;
+    size_t max_len;
+
+    char  **c_buf;
+    hsize_t i;
+    hsize_t num_elem;
+
+    max_len  = (size_t)dims[0];
+    num_elem = (hsize_t)dims[1];
+
+    c_dset_id       = (hid_t)*dset_id;
+    c_mem_type_id   = (hid_t)*mem_type_id;
+    c_mem_space_id  = (hid_t)*mem_space_id;
+    c_file_space_id = (hid_t)*file_space_id;
+    c_xfer_prp      = (hid_t)*xfer_prp;
+
+    /*
+     * Allocate array of character pointers
+     */
+    c_buf = (char **)HDmalloc((size_t)num_elem * sizeof(char *));
+    if (c_buf == NULL)
+        return ret_value;
+
+    /*
+     * Call H5Dread function.
+     */
+    status = H5Dread(c_dset_id, c_mem_type_id, c_mem_space_id, c_file_space_id, c_xfer_prp, c_buf);
+    if (status < 0) {
+        HDfree(c_buf);
+        return ret_value;
+    }
+    /* Copy data to long C string */
+    tmp   = (char *)HDmalloc((size_t)(max_len * num_elem) + 1);
+    tmp_p = tmp;
+    for (i = 0; i < max_len * num_elem; i++)
+        tmp[i] = ' ';
+    tmp[max_len * num_elem] = '\0';
+    for (i = 0; i < num_elem; i++) {
         memcpy(tmp_p, c_buf[i], strlen(c_buf[i]));
         len[i] = (size_t_f)strlen(c_buf[i]);
-        tmp_p = tmp_p + max_len;
-  }
-  HD5packFstring(tmp, _fcdtocp(buf), (size_t)(max_len*num_elem));
-  ret_value = 0;
-  H5Dvlen_reclaim(c_mem_type_id, c_mem_space_id, H5P_DEFAULT, c_buf);
-  HDfree(c_buf);
-  HDfree(tmp);
-  return ret_value;
+        tmp_p  = tmp_p + max_len;
+    }
+    HD5packFstring(tmp, _fcdtocp(buf), (size_t)(max_len * num_elem));
+    ret_value = 0;
+    H5Treclaim(c_mem_type_id, c_mem_space_id, H5P_DEFAULT, c_buf);
+    HDfree(c_buf);
+    HDfree(tmp);
+    return ret_value;
 }
 
-/****if* H5Df/nh5dwrite_vl_real_c
+/****if* H5Df/h5dwrite_vl_real_c
  * NAME
- *  nh5dwrite_vl_real_c
+ *  h5dwrite_vl_real_c
  * PURPOSE
  *  Write variable length dataset
  * INPUTS
- *      dset_id - identifier of the dataset
- *              mem_type_id - datatype identifier
- *              mem_space_id - dataspace identifier
- *              file_space_id - file dataspace identifier
- *              xfer          - file transfer property
- *              buf           - data buffer
- *              dims          - one-demnsional array of size 2
- *                              dims[0] = MAXLENGTH
- *                              dims[1] = number of elements of VL type
- *              len           - array element lenghts
+ *  dset_id - identifier of the dataset
+ *  mem_type_id - datatype identifier
+ *  mem_space_id - dataspace identifier
+ *  file_space_id - file dataspace identifier
+ *  xfer          - file transfer property
+ *  buf           - data buffer
+ *  dims          - one-demnsional array of size 2
+ *  dims[0] = MAXLENGTH
+ *  dims[1] = number of elements of VL type
+ *  len           - array element lengths
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Monday, November 11, 2002
+ *  Monday, November 11, 2002
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5dwrite_vl_real_c ( hid_t_f *dset_id ,  hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, real_f *buf, hsize_t_f *dims, size_t_f *len)
+h5dwrite_vl_real_c(hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id,
+                   hid_t_f *xfer_prp, real_f *buf, hsize_t_f *dims, size_t_f *len)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_dset_id;
-  hid_t c_mem_type_id;
-  hid_t c_mem_space_id;
-  hid_t c_file_space_id;
-  hid_t c_xfer_prp;
-  herr_t status;
-  real_f *tmp;
-  size_t max_len;
-
-  hvl_t *c_buf;
-  hsize_t i;
-  hsize_t num_elem;
-
-  max_len = (size_t)dims[0];
-  num_elem = (hsize_t)dims[1];
-
-  c_dset_id       = (hid_t)*dset_id;
-  c_mem_type_id   = (hid_t)*mem_type_id;
-  c_mem_space_id  = (hid_t)*mem_space_id;
-  c_file_space_id = (hid_t)*file_space_id;
-  c_xfer_prp      = (hid_t)*xfer_prp;
-
-  c_buf = (hvl_t *)HDmalloc((size_t)num_elem * sizeof(hvl_t));
-  if (c_buf == NULL) return ret_value;
-  tmp = (real_f *)buf;
-  for (i=0; i < num_elem; i++) {
-       c_buf[i].len = (size_t)len[i];
-       c_buf[i].p   = tmp;
-       tmp = tmp + max_len;
- }
-  /*
-   * Call H5Dwrite function.
-   */
-   status = H5Dwrite(c_dset_id, c_mem_type_id, c_mem_space_id, c_file_space_id, c_xfer_prp, c_buf);
-
-  if( status < 0) goto DONE;
-  ret_value = 0;
+    int     ret_value = -1;
+    hid_t   c_dset_id;
+    hid_t   c_mem_type_id;
+    hid_t   c_mem_space_id;
+    hid_t   c_file_space_id;
+    hid_t   c_xfer_prp;
+    herr_t  status;
+    real_f *tmp;
+    size_t  max_len;
+
+    hvl_t  *c_buf;
+    hsize_t i;
+    hsize_t num_elem;
+
+    max_len  = (size_t)dims[0];
+    num_elem = (hsize_t)dims[1];
+
+    c_dset_id       = (hid_t)*dset_id;
+    c_mem_type_id   = (hid_t)*mem_type_id;
+    c_mem_space_id  = (hid_t)*mem_space_id;
+    c_file_space_id = (hid_t)*file_space_id;
+    c_xfer_prp      = (hid_t)*xfer_prp;
+
+    c_buf = (hvl_t *)HDmalloc((size_t)num_elem * sizeof(hvl_t));
+    if (c_buf == NULL)
+        return ret_value;
+    tmp = (real_f *)buf;
+    for (i = 0; i < num_elem; i++) {
+        c_buf[i].len = (size_t)len[i];
+        c_buf[i].p   = tmp;
+        tmp          = tmp + max_len;
+    }
+    /*
+     * Call H5Dwrite function.
+     */
+    status = H5Dwrite(c_dset_id, c_mem_type_id, c_mem_space_id, c_file_space_id, c_xfer_prp, c_buf);
+
+    if (status < 0)
+        goto DONE;
+    ret_value = 0;
 DONE:
-  HDfree(c_buf);
-  return ret_value;
+    HDfree(c_buf);
+    return ret_value;
 }
 
-/****if* H5Df/nh5dread_vl_real_c
+/****if* H5Df/h5dread_vl_real_c
  * NAME
- *  nh5dread_vl_real_c
+ *  h5dread_vl_real_c
  * PURPOSE
  *  Read variable length dataset
  * INPUTS
- *      dset_id - identifier of the dataset
- *              mem_type_id - datatype identifier
- *              mem_space_id - dataspace identifier
- *              file_space_id - file dataspace identifier
- *              xfer          - file transfer property
- *              dims          - one-demnsional array of size 2
- *                              dims[0] = MAXLENGTH
- *                              dims[1] = number of elements of VL type
+ *  dset_id - identifier of the dataset
+ *  mem_type_id - datatype identifier
+ *  mem_space_id - dataspace identifier
+ *  file_space_id - file dataspace identifier
+ *  xfer          - file transfer property
+ *  dims          - one-demnsional array of size 2
+ *  dims[0] = MAXLENGTH
+ *  dims[1] = number of elements of VL type
  * OUTPUTS
- *     buf           - data buffer
- *              len           - array element lenghts
- * RETURNS
- *     0 on success, -1 on failure
- * AUTHOR
- *  Elena Pourmal
- *              Monday, November 11, 2002
- * HISTORY
- *
- * SOURCE
-*/
-
-int_f
-nh5dread_vl_real_c ( hid_t_f *dset_id ,  hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, real_f *buf, hsize_t_f *dims, size_t_f *len)
-/******/
-{
-  int ret_value = -1;
-  hid_t c_dset_id;
-  hid_t c_mem_type_id;
-  hid_t c_mem_space_id;
-  hid_t c_file_space_id;
-  hid_t c_xfer_prp;
-  herr_t status;
-  size_t max_len;
-
-  hvl_t *c_buf;
-  hsize_t i;
-  hssize_t num_elem;
-
-  c_dset_id       = (hid_t)*dset_id;
-  c_mem_type_id   = (hid_t)*mem_type_id;
-  c_mem_space_id  = (hid_t)*mem_space_id;
-  c_file_space_id = (hid_t)*file_space_id;
-  c_xfer_prp      = (hid_t)*xfer_prp;
-
-  max_len = (size_t)dims[0];
-  num_elem = H5Sget_select_npoints(c_mem_space_id);
-  if(num_elem != (hssize_t)dims[1]) return ret_value;
-
-  c_buf = (hvl_t *)HDmalloc((size_t)num_elem * sizeof(hvl_t));
-  if (c_buf == NULL) return ret_value;
-  /*
-   * Call H5Dread function.
-   */
-   status = H5Dread(c_dset_id, c_mem_type_id, c_mem_space_id, c_file_space_id, c_xfer_prp, c_buf);
- if ( status <0  )  goto DONE;
-  for (i=0; i < (hsize_t)num_elem; i++) {
-       len[i] = (size_t_f)c_buf[i].len;
-       memcpy(&buf[i*max_len], c_buf[i].p, c_buf[i].len*sizeof(real_f));
-  }
-
-  H5Dvlen_reclaim(c_mem_type_id, c_mem_space_id, H5P_DEFAULT, c_buf);
-  ret_value = 0;
-DONE:
-  HDfree(c_buf);
-  return ret_value;
-}
-
-/****if* H5Df/h5dfillc_c
- * NAME
- *  h5dfillc_c
- * PURPOSE
- *  Call h5fill_c to fill memory buffer with a fill value
- * INPUTS
- *  fill_value   - fill value
- *  fill_type_id - fill value datatype identifier
- *  space_id     - memory space selection identifier
- *  buf          - memory buffer to fill
- *  mem_type_id  - memory buffer dtatype identifier
+ *  buf           - data buffer
+ *  len           - array element lengths
  * RETURNS
  *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *  Wednesday, March 12, 2003
+ *  Monday, November 11, 2002
  * HISTORY
  *
  * SOURCE
-*/
-int_f
-nh5dfillc_c (_fcd fill_value, hid_t_f *fill_type_id, hid_t_f *space_id, _fcd buf, hid_t_f *mem_type_id)
-/******/
-{
-     int ret_value = -1;
-
-     /*
-      * Call h5dfill_c  function.
-      */
-     ret_value = h5dfill_c(_fcdtocp(fill_value), fill_type_id, space_id, _fcdtocp(buf), mem_type_id);
+ */
 
-     return ret_value;
-}
-/****if* H5Df/h5dfill_c
- * NAME
- *  h5dfill_c
- * PURPOSE
- *  Call H5Dfill to fill memory buffer with a fill value
- * INPUTS
- *  fill_value   - fill value
- *  fill_type_id - fill value datatype identifier
- *  space_id     - memory space selection identifier
- *  buf          - memory buffer to fill
- *  mem_type_id  - memory buffer dtatype identifier
- * RETURNS
- *  0 on success, -1 on failure
- * AUTHOR
- *  Elena Pourmal
- *  Wednesday, March 12, 2003
- * HISTORY
- *
- * SOURCE
-*/
 int_f
-h5dfill_c (void * fill_value, hid_t_f *fill_type_id, hid_t_f *space_id, void * buf, hid_t_f *mem_type_id)
+h5dread_vl_real_c(hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id,
+                  hid_t_f *xfer_prp, real_f *buf, hsize_t_f *dims, size_t_f *len)
 /******/
 {
-     int ret_value = -1;
-     herr_t ret;
-     hid_t c_fill_type_id;
-     hid_t c_mem_type_id;
-     hid_t c_space_id;
-
-     c_fill_type_id = (hid_t)*fill_type_id;
-     c_mem_type_id = (hid_t)*mem_type_id;
-     c_space_id = (hid_t)*space_id;
-
-     /*
-      * Call H5Dfill function.
-      */
-     ret = H5Dfill(fill_value, c_fill_type_id, buf, c_mem_type_id, c_space_id);
-
-     if (ret < 0) return ret_value;
-     ret_value = 0;
-     return ret_value;
-}
-
-int_f
-nh5dfill_integer_c (void * fill_value, hid_t_f *fill_type_id, hid_t_f *space_id, void * buf, hid_t_f *mem_type_id)
-
-{
-     int ret_value = -1;
-     herr_t ret;
-     hid_t c_fill_type_id;
-     hid_t c_mem_type_id;
-     hid_t c_space_id;
-
-     c_fill_type_id = (hid_t)*fill_type_id;
-     c_mem_type_id = (hid_t)*mem_type_id;
-     c_space_id = (hid_t)*space_id;
-
-     /*
-      * Call H5Dfill function.
-      */
-     ret = H5Dfill(fill_value, c_fill_type_id, buf, c_mem_type_id, c_space_id);
-
-     if (ret < 0) return ret_value;
-     ret_value = 0;
-     return ret_value;
-}
-
-int_f
-nh5dfill_real_c (void * fill_value, hid_t_f *fill_type_id, hid_t_f *space_id, void * buf, hid_t_f *mem_type_id)
+    int    ret_value = -1;
+    hid_t  c_dset_id;
+    hid_t  c_mem_type_id;
+    hid_t  c_mem_space_id;
+    hid_t  c_file_space_id;
+    hid_t  c_xfer_prp;
+    herr_t status;
+    size_t max_len;
+
+    hvl_t   *c_buf;
+    hsize_t  i;
+    hssize_t num_elem;
+
+    c_dset_id       = (hid_t)*dset_id;
+    c_mem_type_id   = (hid_t)*mem_type_id;
+    c_mem_space_id  = (hid_t)*mem_space_id;
+    c_file_space_id = (hid_t)*file_space_id;
+    c_xfer_prp      = (hid_t)*xfer_prp;
 
-{
-     int ret_value = -1;
-     herr_t ret;
-     hid_t c_fill_type_id;
-     hid_t c_mem_type_id;
-     hid_t c_space_id;
-
-     c_fill_type_id = (hid_t)*fill_type_id;
-     c_mem_type_id = (hid_t)*mem_type_id;
-     c_space_id = (hid_t)*space_id;
-
-     /*
-      * Call H5Dfill function.
-      */
-     ret = H5Dfill(fill_value, c_fill_type_id, buf, c_mem_type_id, c_space_id);
-
-     if (ret < 0) return ret_value;
-     ret_value = 0;
-     return ret_value;
-}
+    max_len  = (size_t)dims[0];
+    num_elem = H5Sget_select_npoints(c_mem_space_id);
+    if (num_elem != (hssize_t)dims[1])
+        return ret_value;
 
-int_f
-nh5dfill_double_c (void * fill_value, hid_t_f *fill_type_id, hid_t_f *space_id, void * buf, hid_t_f *mem_type_id)
+    c_buf = (hvl_t *)HDmalloc((size_t)num_elem * sizeof(hvl_t));
+    if (c_buf == NULL)
+        return ret_value;
+    /*
+     * Call H5Dread function.
+     */
+    status = H5Dread(c_dset_id, c_mem_type_id, c_mem_space_id, c_file_space_id, c_xfer_prp, c_buf);
+    if (status < 0)
+        goto DONE;
+    for (i = 0; i < (hsize_t)num_elem; i++) {
+        len[i] = (size_t_f)c_buf[i].len;
+        memcpy(&buf[i * max_len], c_buf[i].p, c_buf[i].len * sizeof(real_f));
+    }
 
-{
-     int ret_value = -1;
-     herr_t ret;
-     hid_t c_fill_type_id;
-     hid_t c_mem_type_id;
-     hid_t c_space_id;
-
-     c_fill_type_id = (hid_t)*fill_type_id;
-     c_mem_type_id = (hid_t)*mem_type_id;
-     c_space_id = (hid_t)*space_id;
-
-     /*
-      * Call H5Dfill function.
-      */
-     ret = H5Dfill(fill_value, c_fill_type_id, buf, c_mem_type_id, c_space_id);
-
-     if (ret < 0) return ret_value;
-     ret_value = 0;
-     return ret_value;
+    H5Treclaim(c_mem_type_id, c_mem_space_id, H5P_DEFAULT, c_buf);
+    ret_value = 0;
+DONE:
+    HDfree(c_buf);
+    return ret_value;
 }
 
 /****if* H5Df/h5dget_space_status_c
@@ -2213,38 +1052,39 @@ nh5dfill_double_c (void * fill_value, hid_t_f *fill_type_id, hid_t_f *space_id,
  * PURPOSE
  *  Call H5Dget_space_status to request dataspace allocation status
  * INPUTS
- *      dset_id - dataset identifier
+ *  dset_id - dataset identifier
  * OUTPUTS
- *     flag - status flag
+ *  flag - status flag
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Wednesday, March 12, 2003
+ *  Wednesday, March 12, 2003
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5dget_space_status_c ( hid_t_f *dset_id, int_f *flag)
+h5dget_space_status_c(hid_t_f *dset_id, int_f *flag)
 /******/
 {
-     int ret_value = -1;
-     herr_t ret;
-     hid_t c_dset_id;
-     H5D_space_status_t c_flag;
-
-     c_dset_id = (hid_t)*dset_id;
-
-     /*
-      * Call H5Dget_space_status
-      */
-     ret = H5Dget_space_status(c_dset_id, &c_flag);
-
-     if (ret < 0) return ret_value;
-     *flag = (int_f)c_flag;
-     ret_value = 0;
-     return ret_value;
+    int                ret_value = -1;
+    herr_t             ret;
+    hid_t              c_dset_id;
+    H5D_space_status_t c_flag;
+
+    c_dset_id = (hid_t)*dset_id;
+
+    /*
+     * Call H5Dget_space_status
+     */
+    ret = H5Dget_space_status(c_dset_id, &c_flag);
+
+    if (ret < 0)
+        return ret_value;
+    *flag     = (int_f)c_flag;
+    ret_value = 0;
+    return ret_value;
 }
 /****if* H5Df/h5dcreate_anon_c
  * NAME
@@ -2256,37 +1096,37 @@ nh5dget_space_status_c ( hid_t_f *dset_id, int_f *flag)
  *		loc_id	   - Identifier of the file or group within which to create the dataset.
  *		type_id	   - Identifier of the datatype to use when creating the dataset.
  *		space_id   - Identifier of the dataspace to use when creating the dataset.
- *              dcpl_id    - Dataset creation property list identifier.
- *              dapl_id    - Dataset access property list identifier.
+ *  dcpl_id    - Dataset creation property list identifier.
+ *  dapl_id    - Dataset access property list identifier.
  * OUTPUTS
  *
- *              dset_id - dataset identifier
+ *  dset_id - dataset identifier
  *
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              February, 2008
+ *  February, 2008
  * SOURCE
-*/
+ */
 int_f
-nh5dcreate_anon_c (hid_t_f *loc_id, hid_t_f *type_id, hid_t_f *space_id,
-		   hid_t_f *dcpl_id, hid_t_f *dapl_id, hid_t_f *dset_id)
+h5dcreate_anon_c(hid_t_f *loc_id, hid_t_f *type_id, hid_t_f *space_id, hid_t_f *dcpl_id, hid_t_f *dapl_id,
+                 hid_t_f *dset_id)
 /******/
 {
-  int ret_value = -1;
+    int ret_value = -1;
 
-  /*
-   * Call H5Dcreate2 function.
-   */
-  if((*dset_id = (hid_t_f)H5Dcreate_anon((hid_t)*loc_id, (hid_t)*type_id, (hid_t)*space_id,
-					 (hid_t)*dcpl_id, (hid_t)*dapl_id)) < 0)
-    goto DONE;
+    /*
+     * Call H5Dcreate2 function.
+     */
+    if ((*dset_id = (hid_t_f)H5Dcreate_anon((hid_t)*loc_id, (hid_t)*type_id, (hid_t)*space_id,
+                                            (hid_t)*dcpl_id, (hid_t)*dapl_id)) < 0)
+        goto DONE;
 
-  ret_value = 0;
+    ret_value = 0;
 
- DONE:
-  return ret_value;
+DONE:
+    return ret_value;
 }
 
 /****if* H5Df/h5dwrite_f_c
@@ -2310,37 +1150,38 @@ nh5dcreate_anon_c (hid_t_f *loc_id, hid_t_f *type_id, hid_t_f *space_id,
  *
  *
  * SOURCE
-*/
+ */
 int_f
-h5dwrite_f_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id,
-		    hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf)
+h5dwrite_f_c(hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id,
+             hid_t_f *xfer_prp, void *buf)
 /******/
 {
-  int ret_value = -1;
-  herr_t ret;
-  hid_t c_dset_id;
-  hid_t c_mem_type_id;
-  hid_t c_mem_space_id;
-  hid_t c_file_space_id;
-  hid_t c_xfer_prp;
-
-  /*
-   * Define transfer property
-   */
-  c_xfer_prp = (hid_t)*xfer_prp;
-
-  /*
-   * Call H5Dwrite function.
-   */
-  c_dset_id = (hid_t)*dset_id;
-  c_mem_type_id = (hid_t)*mem_type_id;
-  c_mem_space_id = (hid_t)*mem_space_id;
-  c_file_space_id = (hid_t)*file_space_id;
-  ret = H5Dwrite(c_dset_id, c_mem_type_id, c_mem_space_id, c_file_space_id, c_xfer_prp, buf);
-
-  if (ret < 0) return ret_value;
-  ret_value = 0;
-  return ret_value;
+    int    ret_value = -1;
+    herr_t ret;
+    hid_t  c_dset_id;
+    hid_t  c_mem_type_id;
+    hid_t  c_mem_space_id;
+    hid_t  c_file_space_id;
+    hid_t  c_xfer_prp;
+
+    /*
+     * Define transfer property
+     */
+    c_xfer_prp = (hid_t)*xfer_prp;
+
+    /*
+     * Call H5Dwrite function.
+     */
+    c_dset_id       = (hid_t)*dset_id;
+    c_mem_type_id   = (hid_t)*mem_type_id;
+    c_mem_space_id  = (hid_t)*mem_space_id;
+    c_file_space_id = (hid_t)*file_space_id;
+    ret             = H5Dwrite(c_dset_id, c_mem_type_id, c_mem_space_id, c_file_space_id, c_xfer_prp, buf);
+
+    if (ret < 0)
+        return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Df/h5dread_f_c
@@ -2355,11 +1196,11 @@ h5dwrite_f_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id,
  *  file_space_id - file dataspace identifier
  *  xfer          - file transfer property
  *  dims          - one-demnsional array of size 2
- *                   dims[0] = MAXLENGTH
- *                   dims[1] = number of elements of VL type
+ *  dims[0] = MAXLENGTH
+ *  dims[1] = number of elements of VL type
  * OUTPUTS
  *  buf - data buffer
- *  len - array element lenghts
+ *  len - array element lengths
  * RETURNS
  *  0 on success, -1 on failure
  * AUTHOR
@@ -2368,37 +1209,38 @@ h5dwrite_f_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id,
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-h5dread_f_c ( hid_t_f *dset_id ,  hid_t_f *mem_type_id, hid_t_f *mem_space_id,
-	      hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf)
+h5dread_f_c(hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id,
+            hid_t_f *xfer_prp, void *buf)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_dset_id;
-  hid_t c_mem_type_id;
-  hid_t c_mem_space_id;
-  hid_t c_file_space_id;
-  hid_t c_xfer_prp;
-  herr_t status;
-
-  c_dset_id       = (hid_t)*dset_id;
-  c_mem_type_id   = (hid_t)*mem_type_id;
-  c_mem_space_id  = (hid_t)*mem_space_id;
-  c_file_space_id = (hid_t)*file_space_id;
-  c_xfer_prp      = (hid_t)*xfer_prp;
-  /*
-   * Call H5Dread function.
-   */
-  status = H5Dread(c_dset_id, c_mem_type_id, c_mem_space_id, c_file_space_id, c_xfer_prp, buf);
-  if ( status < 0 ) return ret_value;
-
-  ret_value = 0;
-  return ret_value;
+    int    ret_value = -1;
+    hid_t  c_dset_id;
+    hid_t  c_mem_type_id;
+    hid_t  c_mem_space_id;
+    hid_t  c_file_space_id;
+    hid_t  c_xfer_prp;
+    herr_t status;
+
+    c_dset_id       = (hid_t)*dset_id;
+    c_mem_type_id   = (hid_t)*mem_type_id;
+    c_mem_space_id  = (hid_t)*mem_space_id;
+    c_file_space_id = (hid_t)*file_space_id;
+    c_xfer_prp      = (hid_t)*xfer_prp;
+    /*
+     * Call H5Dread function.
+     */
+    status = H5Dread(c_dset_id, c_mem_type_id, c_mem_space_id, c_file_space_id, c_xfer_prp, buf);
+    if (status < 0)
+        return ret_value;
+
+    ret_value = 0;
+    return ret_value;
 }
-/****if* H5Df/nh5dget_access_plist_c
+/****if* H5Df/h5dget_access_plist_c
  * NAME
- *  nh5dget_access_plist_c
+ *  h5dget_access_plist_c
  * PURPOSE
  *  Call H5Dget_access_plist
  * INPUTS
@@ -2412,56 +1254,57 @@ h5dread_f_c ( hid_t_f *dset_id ,  hid_t_f *mem_type_id, hid_t_f *mem_space_id,
  *  April 13, 2009
  *
  * SOURCE
-*/
+ */
 int_f
-nh5dget_access_plist_c (hid_t_f *dset_id, hid_t_f *plist_id)
+h5dget_access_plist_c(hid_t_f *dset_id, hid_t_f *plist_id)
 /******/
 {
-  int ret_value = -1;
-  /*
-   * Call H5Dget_access_plist function.
-   */
-  if((*plist_id = (hid_t_f)H5Dget_access_plist((hid_t)*dset_id)) < 0)
-    goto DONE;
+    int ret_value = -1;
+    /*
+     * Call H5Dget_access_plist function.
+     */
+    if ((*plist_id = (hid_t_f)H5Dget_access_plist((hid_t)*dset_id)) < 0)
+        goto DONE;
 
-  ret_value = 0;
+    ret_value = 0;
 
- DONE:
-  return ret_value;
+DONE:
+    return ret_value;
 }
 
-/****if* H5Df/nh5dvlen_reclaim_c
+/****if* H5Df/h5dvlen_reclaim_c
  * NAME
  *  h5dvlen_reclaim_c
  * PURPOSE
- *  Call H5Dvlen_reclaim
+ *  Call H5Treclaim
  * INPUTS
- *   type_id   - Identifier of the datatype. 
- *   space_id  - Identifier of the dataspace. 
- *   plist_id  - Identifier of the property list used to create the buffer. 
- *   buf       - Pointer to the buffer to be reclaimed.    
+ *  type_id   - Identifier of the datatype.
+ *  space_id  - Identifier of the dataspace.
+ *  plist_id  - Identifier of the property list used to create the buffer.
+ *  buf       - Pointer to the buffer to be reclaimed.
  *
  * RETURNS
- *   0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *   M. Scot Breitenfeld
- *   January 15, 2011 
+ *  January 15, 2011
  *
  * SOURCE
-*/
+ */
 int_f
 h5dvlen_reclaim_c(hid_t_f *type_id, hid_t_f *space_id, hid_t_f *plist_id, void *buf)
 /******/
 {
-  int ret_value = -1;
-  herr_t status;
+    int    ret_value = -1;
+    herr_t status;
 
-  /*
-   * Call H5Dvlen_reclaim function.
-   */
-  status = H5Dvlen_reclaim((hid_t)*type_id, (hid_t)*space_id, (hid_t)*plist_id, buf);
-  if ( status < 0 ) return ret_value;
+    /*
+     * Call H5Treclaim function.
+     */
+    status = H5Treclaim((hid_t)*type_id, (hid_t)*space_id, (hid_t)*plist_id, buf);
+    if (status < 0)
+        return ret_value;
 
-  ret_value = 0;
-  return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
diff --git a/fortran/src/H5Dff.F90 b/fortran/src/H5Dff.F90
new file mode 100644
index 0000000..bbfeb06
--- /dev/null
+++ b/fortran/src/H5Dff.F90
@@ -0,0 +1,1871 @@
+!> @defgroup FH5D Fortran Datasets (H5D) Interface
+!!
+!! @see H5D, C-API
+!!
+!! @see @ref H5D_UG, User Guide
+!!
+
+!> @ingroup FH5D
+!!
+!! @brief This module contains Fortran interfaces for H5D functions.
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+! NOTES
+!  (1) The maximum rank of an array allowed in Fortran is 7, therefore
+!  we only provide an interface for arrays up to and including rank 7.
+!
+!  (2) Unfortunately we are using a generic interface and one of the factors
+!  used in determining the proper routine to select is that of the array
+!  rank being passed. Therefore, we can not create just one subroutine for
+!  each array type (integer, real, etc...) and use a
+!  rank 1 array of assumed size to handle multiple ranks, i.e.
+!  (i.e. integer, dimension(*) :: ... )
+!  (i.e. real   , dimension(*) :: ... ) etc...
+!
+!  (3) Could not place the USE, INTRINSIC :: ISO_C_BINDING in the module header because it may
+!  conflict with the USE, INTRINSIC :: ISO_C_BINDING included in the user&apos;s program. Moved
+!  the statement instead to each subroutine.
+!
+!
+!  (4) C_LOC and character strings according to the Fortran 2003 standard:
+!
+!  15.1.2.5 C_LOC(X)
+!
+!  Argument. X shall either
+!
+!  (A) have interoperable type and type parameters and be
+!  (a) a variable that has the TARGET attribute and is interoperable,
+!  (b) an allocated allocatable variable that has the TARGET attribute
+!  and is not an array of zero size, or
+!  (c) an associated scalar pointer, or
+!  (B) be a nonpolymorphic scalar, have no length type parameters, and be
+!  (a) a nonallocatable, nonpointer variable that has the TARGET attribute,
+!  (b) an allocated allocatable variable that has the TARGET attribute, or
+!  (c) an associated pointer.
+!
+!          - When X is a character, for interoperability the standard is:
+!
+!  15.2.1 Interoperability of intrinsic types
+!
+!  ...if the type is character, interoperability also requires that the length type parameter
+!  be omitted or be specified by an initialization expression whose value is one.
+!
+!  THEREFORE compilers that have not extended the standard require the
+!  argument in C_LOC to be of the variant:
+!
+!  CHARACTER(LEN=1), TARGET :: chr
+!  or
+!  CHARACTER, TARGET :: chr
+!
+!       _____ __  __ _____   ____  _____ _______       _   _ _______
+!      |_   _|  \/  |  __ \ / __ \|  __ \__   __|/\   | \ | |__   __|
+! ****   | | | \  / | |__) | |  | | |__) | | |  /  \  |  \| |  | |    ****
+! ****   | | | |\/| |  ___/| |  | |  _  /  | | / /\ \ | . ` |  | |    ****
+! ****  _| |_| |  | | |    | |__| | | \ \  | |/ ____ \| |\  |  | |    ****
+!      |_____|_|  |_|_|     \____/|_|  \_\ |_/_/    \_\_| \_|  |_|
+!
+!  If you add a new H5D function you must add the function name to the
+!  Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
+!  This is needed for Windows based operating systems.
+!
+
+#include <H5config_f.inc>
+
+MODULE H5D
+
+  USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR, C_CHAR
+  USE H5GLOBAL
+  USE H5LIB, ONLY : h5kind_to_type
+
+  PRIVATE h5dread_vl_integer, h5dread_vl_real, h5dread_vl_string
+  PRIVATE h5dwrite_vl_integer, h5dwrite_vl_real, h5dwrite_vl_string
+  PRIVATE h5dwrite_reference_obj, h5dwrite_reference_dsetreg, h5dwrite_char_scalar, h5dwrite_ptr
+  PRIVATE h5dread_reference_obj, h5dread_reference_dsetreg, h5dread_char_scalar, h5dread_ptr
+  PRIVATE h5dfill_integer, h5dfill_c_float, h5dfill_c_double, h5dfill_char, h5dfill_ptr
+#if H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE!=0
+  PRIVATE h5dfill_c_long_double
+#endif
+
+  INTERFACE h5dextend_f
+     MODULE PROCEDURE h5dset_extent_f
+  END INTERFACE
+
+#ifndef H5_DOXYGEN
+
+  INTERFACE h5dwrite_f
+     MODULE PROCEDURE h5dwrite_reference_obj
+     MODULE PROCEDURE h5dwrite_reference_dsetreg
+     MODULE PROCEDURE h5dwrite_char_scalar
+     ! This is the preferred way to call h5dwrite
+     ! by passing an address
+     MODULE PROCEDURE h5dwrite_ptr
+  END INTERFACE
+
+  INTERFACE h5dread_f
+     MODULE PROCEDURE h5dread_reference_obj
+     MODULE PROCEDURE h5dread_reference_dsetreg
+     MODULE PROCEDURE h5dread_char_scalar
+     ! This is the preferred way to call h5dread
+     ! by passing an address
+     MODULE PROCEDURE h5dread_ptr
+  END INTERFACE
+
+  INTERFACE h5dread_vl_f
+     MODULE PROCEDURE h5dread_vl_integer
+     MODULE PROCEDURE h5dread_vl_real
+     MODULE PROCEDURE h5dread_vl_string
+  END INTERFACE
+
+  INTERFACE h5dwrite_vl_f
+     MODULE PROCEDURE h5dwrite_vl_integer
+     MODULE PROCEDURE h5dwrite_vl_real
+     MODULE PROCEDURE h5dwrite_vl_string
+  END INTERFACE
+
+
+!  Interface for the function used to pass the C pointer of the buffer
+!  to the C H5Dwrite routine
+
+  INTERFACE
+     INTEGER FUNCTION h5dwrite_f_c(dset_id, mem_type_id, &
+          mem_space_id_default ,                         &
+          file_space_id_default,                         &
+          xfer_prp_default, buf ) BIND(C, NAME='h5dwrite_f_c')
+       IMPORT :: c_ptr
+       IMPORT :: HID_T
+       IMPLICIT NONE
+       INTEGER(HID_T), INTENT(IN) :: dset_id
+       INTEGER(HID_T), INTENT(IN) :: mem_type_id
+       INTEGER(HID_T) :: mem_space_id_default
+       INTEGER(HID_T) :: file_space_id_default
+       INTEGER(HID_T) :: xfer_prp_default
+       TYPE(C_PTR), VALUE :: buf
+     END FUNCTION h5dwrite_f_c
+  END INTERFACE
+
+!  Interface for the function used to pass the C pointer of the buffer
+!  to the C H5Dread routine
+
+  INTERFACE
+     INTEGER FUNCTION h5dread_f_c(dset_id, mem_type_id, &
+          mem_space_id_default,                         &
+          file_space_id_default,                        &
+          xfer_prp_default, buf) BIND(C, NAME='h5dread_f_c')
+       IMPORT :: c_ptr
+       IMPORT :: HID_T
+       IMPLICIT NONE
+       INTEGER(HID_T), INTENT(IN) :: dset_id
+       INTEGER(HID_T), INTENT(IN) :: mem_type_id
+       INTEGER(HID_T) :: mem_space_id_default
+       INTEGER(HID_T) :: file_space_id_default
+       INTEGER(HID_T) :: xfer_prp_default
+       TYPE(C_PTR), VALUE :: buf
+     END FUNCTION h5dread_f_c
+  END INTERFACE
+
+  INTERFACE h5dfill_f
+     MODULE PROCEDURE h5dfill_integer
+     MODULE PROCEDURE h5dfill_c_float
+     MODULE PROCEDURE h5dfill_c_double
+#if H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE!=0
+     MODULE PROCEDURE h5dfill_c_long_double
+#endif
+     MODULE PROCEDURE h5dfill_char
+     MODULE PROCEDURE h5dfill_ptr
+  END INTERFACE
+
+!  Interface for the function used to pass the C pointer of the buffer
+!  to the C H5Dfill routine
+
+  INTERFACE
+     INTEGER FUNCTION h5dfill_c(f_ptr_fill_value, fill_type_id, space_id, &
+          f_ptr_buf, mem_type_id) BIND(C, NAME='h5dfill_c')
+       IMPORT :: c_ptr
+       IMPORT :: HID_T
+       IMPLICIT NONE
+       TYPE(C_PTR), VALUE :: f_ptr_fill_value
+       INTEGER(HID_T) :: fill_type_id
+       INTEGER(HID_T), INTENT(IN) :: space_id
+       TYPE(C_PTR), VALUE :: f_ptr_buf
+       INTEGER(HID_T) :: mem_type_id
+     END FUNCTION h5dfill_c
+  END INTERFACE
+#endif
+
+CONTAINS
+
+!>
+!! \ingroup FH5D
+!!
+!! \brief Creates a dataset at the specified location.
+!!
+!! \param loc_id   File or group identifier
+!! \param name     Dataset name
+!! \param type_id  Dataset datatype identifier
+!! \param space_id Dataset dataspace identifier
+!! \param dset_id  Dataset identifier
+!! \param hdferr   \fortran_error
+!! \param dcpl_id  Dataset creation property list
+!! \param lcpl_id  Link creation property list
+!! \param dapl_id  Dataset access property list
+!!
+!! See C API: @ref H5Dcreate2()
+!!
+  SUBROUTINE h5dcreate_f(loc_id, name, type_id, space_id, dset_id, &
+       hdferr, dcpl_id, lcpl_id, dapl_id)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER(HID_T), INTENT(IN) :: space_id
+    INTEGER(HID_T), INTENT(OUT) :: dset_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: dcpl_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lcpl_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: dapl_id
+
+    INTEGER(HID_T) :: lcpl_id_default
+    INTEGER(HID_T) :: dcpl_id_default
+    INTEGER(HID_T) :: dapl_id_default
+
+    INTEGER :: namelen ! Name length
+
+    INTERFACE
+       INTEGER FUNCTION h5dcreate_c(loc_id, name, namelen, type_id, &
+            space_id, lcpl_id_default, dcpl_id_default, dapl_id_default, dset_id) &
+            BIND(C,NAME='h5dcreate_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+         INTEGER :: namelen
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER(HID_T), INTENT(IN) :: space_id
+
+         INTEGER(HID_T) :: lcpl_id_default
+         INTEGER(HID_T) :: dcpl_id_default
+         INTEGER(HID_T) :: dapl_id_default
+
+         INTEGER(HID_T), INTENT(OUT) :: dset_id
+       END FUNCTION h5dcreate_c
+    END INTERFACE
+
+    lcpl_id_default = H5P_DEFAULT_F
+    dcpl_id_default = H5P_DEFAULT_F
+    dapl_id_default = H5P_DEFAULT_F
+
+    IF(PRESENT(lcpl_id)) lcpl_id_default = lcpl_id
+    IF(PRESENT(dcpl_id)) dcpl_id_default = dcpl_id
+    IF(PRESENT(dapl_id)) dapl_id_default = dapl_id
+
+    namelen = LEN(name)
+    hdferr = h5dcreate_c(loc_id, name, namelen, type_id, space_id, &
+         lcpl_id_default, dcpl_id_default, dapl_id_default, dset_id)
+
+  END SUBROUTINE h5dcreate_f
+
+!>
+!! \ingroup FH5D
+!!
+!! \brief Opens an existing dataset.
+!!
+!! \param loc_id  File or group identifier
+!! \param name    Dataset name
+!! \param dset_id Dataset identifier
+!! \param hdferr  \fortran_error
+!! \param dapl_id Dataset access property list
+!!
+!! See C API: @ref H5Dopen2()
+!!
+  SUBROUTINE h5dopen_f(loc_id, name, dset_id, hdferr, dapl_id)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    INTEGER(HID_T), INTENT(OUT) :: dset_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: dapl_id
+    INTEGER :: namelen                     ! Name length
+
+    INTEGER(HID_T) :: dapl_id_default
+
+    INTERFACE
+       INTEGER FUNCTION h5dopen_c(loc_id, name, namelen, dapl_id_default, dset_id) &
+            BIND(C,NAME='h5dopen_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+         INTEGER :: namelen
+         INTEGER(HID_T), INTENT(IN) :: dapl_id_default
+         INTEGER(HID_T), INTENT(OUT) :: dset_id
+       END FUNCTION h5dopen_c
+    END INTERFACE
+
+    dapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(dapl_id)) dapl_id_default = dapl_id
+
+    namelen = LEN(name)
+    hdferr = h5dopen_c(loc_id, name, namelen, dapl_id_default, dset_id)
+
+  END SUBROUTINE h5dopen_f
+
+!>
+!! \ingroup FH5D
+!!
+!! \brief Closes a dataset.
+!!
+!! \param dset_id Dataset identifier
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Dclose()
+!!
+  SUBROUTINE h5dclose_f(dset_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dset_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5dclose_c(dset_id) &
+            BIND(C,NAME='h5dclose_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: dset_id
+       END FUNCTION h5dclose_c
+    END INTERFACE
+
+    hdferr = h5dclose_c(dset_id)
+
+  END SUBROUTINE h5dclose_f
+
+!>
+!! \ingroup FH5D
+!!
+!! \brief Returns an identifier for a copy of the datatype for a
+!!       dataset.
+!!
+!! \param dataset_id  Dataset identifier
+!! \param datatype_id Dataspace identifier
+!! \param hdferr      \fortran_error
+!!
+!! See C API: @ref H5Dget_type()
+!!
+  SUBROUTINE h5dget_type_f(dataset_id, datatype_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dataset_id
+    INTEGER(HID_T), INTENT(OUT) :: datatype_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5dget_type_c(dataset_id, datatype_id) &
+            BIND(C,NAME='h5dget_type_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: dataset_id
+         INTEGER(HID_T), INTENT(OUT) :: datatype_id
+       END FUNCTION h5dget_type_c
+    END INTERFACE
+
+    hdferr = h5dget_type_c (dataset_id, datatype_id)
+  END SUBROUTINE h5dget_type_f
+
+!>
+!! \ingroup FH5D
+!!
+!! \brief Extends a dataset with unlimited dimension.
+!!
+!! \param dataset_id Dataset identifier
+!! \param size       Array containing the new magnitude of each dimension
+!! \param hdferr     \fortran_error
+!!
+!! See C API: @ref H5Dset_extent()
+!!
+  SUBROUTINE h5dset_extent_f(dataset_id, size, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dataset_id
+    INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN)  :: size
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5dset_extent_c(dataset_id, size) &
+            BIND(C,NAME='h5dset_extent_c')
+         IMPORT :: HID_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: dataset_id
+         INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN)  :: size
+       END FUNCTION h5dset_extent_c
+    END INTERFACE
+
+    hdferr = H5Dset_extent_c(dataset_id, size)
+  END SUBROUTINE h5dset_extent_f
+
+!>
+!! \ingroup FH5D
+!!
+!! \brief Returns an identifier for a copy of the dataset creation property list for a dataset.
+!!
+!! \param dataset_id Dataset identifier
+!! \param plist_id   Creation property list identifier
+!! \param hdferr     \fortran_error
+!!
+!! See C API: @ref H5Dget_create_plist()
+!!
+  SUBROUTINE h5dget_create_plist_f(dataset_id, plist_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dataset_id
+    INTEGER(HID_T), INTENT(OUT) :: plist_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5dget_create_plist_c(dataset_id, plist_id) &
+            BIND(C,NAME='h5dget_create_plist_c')
+         IMPORT :: HID_T
+         INTEGER(HID_T), INTENT(IN) :: dataset_id
+         INTEGER(HID_T), INTENT(OUT) :: plist_id
+       END FUNCTION h5dget_create_plist_c
+    END INTERFACE
+
+    hdferr = h5dget_create_plist_c(dataset_id, plist_id)
+  END SUBROUTINE h5dget_create_plist_f
+
+!>
+!! \ingroup FH5D
+!!
+!! \brief Returns the amount of storage requires by a dataset
+!!
+!! \param dataset_id Dataset identifier
+!! \param size       Datastorage size
+!! \param hdferr     \fortran_error
+!!
+!! See C API: @ref H5Dget_storage_size()
+!!
+  SUBROUTINE h5dget_storage_size_f(dataset_id, size, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dataset_id
+    INTEGER(HSIZE_T),  INTENT(OUT)  :: size
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5dget_storage_size_c(dataset_id, size) &
+            BIND(C,NAME='h5dget_storage_size_c')
+         IMPORT :: HID_T, HSIZE_T
+         INTEGER(HID_T), INTENT(IN) :: dataset_id
+         INTEGER(HSIZE_T), INTENT(OUT)  :: size
+       END FUNCTION h5dget_storage_size_c
+    END INTERFACE
+
+    hdferr = h5dget_storage_size_c(dataset_id, size)
+  END SUBROUTINE h5dget_storage_size_f
+
+!>
+!! \ingroup FH5D
+!!
+!! \brief Returns maximum length of the VL array elements
+!!
+!! \param dataset_id Dataset identifier
+!! \param type_id    Datatype identifier
+!! \param space_id   Dataspace identifier
+!! \param len        Buffer size
+!! \param hdferr     \fortran_error
+!!
+  SUBROUTINE h5dvlen_get_max_len_f(dataset_id, type_id, space_id, len,  hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dataset_id
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER(HID_T), INTENT(IN) :: space_id
+    INTEGER(SIZE_T),  INTENT(OUT)  :: len
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5dvlen_get_max_len_c(dataset_id, type_id, space_id, len) &
+            BIND(C,NAME='h5dvlen_get_max_len_c')
+         IMPORT :: HID_T, SIZE_T
+         INTEGER(HID_T), INTENT(IN) :: dataset_id
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER(HID_T), INTENT(IN) :: space_id
+         INTEGER(SIZE_T), INTENT(OUT)  :: len
+       END FUNCTION h5dvlen_get_max_len_c
+    END INTERFACE
+
+    hdferr = h5dvlen_get_max_len_c(dataset_id, type_id,  space_id, len)
+  END SUBROUTINE h5dvlen_get_max_len_f
+
+!>
+!! \ingroup FH5D
+!!
+!! \brief Returns the status of data space allocation.
+!!
+!! \param dset_id Dataset identifier
+!! \param flag    Status; may have one of the following values:
+!!                \li H5D_SPACE_STS_ERROR_F
+!!                \li H5D_SPACE_STS_NOT_ALLOCATED_F
+!!                \li H5D_SPACE_STS_PART_ALLOCATED_F
+!!                \li H5D_SPACE_STS_ALLOCATED_F
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Dget_space_status()
+!!
+  SUBROUTINE h5dget_space_status_f(dset_id, flag, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dset_id
+    INTEGER, INTENT(OUT)       :: flag
+    INTEGER, INTENT(OUT)       :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5dget_space_status_c(dset_id, flag) &
+            BIND(C,NAME='h5dget_space_status_c')
+         IMPORT :: HID_T
+         INTEGER(HID_T) :: dset_id
+         INTEGER        :: flag
+       END FUNCTION h5dget_space_status_c
+    END INTERFACE
+
+    hdferr = h5dget_space_status_c(dset_id, flag)
+  END SUBROUTINE h5dget_space_status_f
+
+!>
+!! \ingroup FH5D
+!!
+!! \brief Creates a dataset in a file without linking it into the file structure
+!!
+!! \param loc_id   Identifier of the file or group within which to create the dataset.
+!! \param type_id  Identifier of the datatype to use when creating the dataset.
+!! \param space_id Identifier of the dataspace to use when creating the dataset.
+!! \param dset_id  Dataset identifier.
+!! \param hdferr   \fortran_error
+!! \param dcpl_id  Dataset creation property list identifier.
+!! \param dapl_id  Dataset access property list identifier.
+!!
+!! See C API: @ref H5Dcreate_anon()
+!!
+  SUBROUTINE h5dcreate_anon_f(loc_id, type_id, space_id, dset_id, hdferr, dcpl_id, dapl_id)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER(HID_T), INTENT(IN) :: space_id
+    INTEGER(HID_T), INTENT(OUT) :: dset_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: dcpl_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: dapl_id
+    INTEGER(HID_T) :: dcpl_id_default
+    INTEGER(HID_T) :: dapl_id_default
+
+    !
+    !  MS FORTRAN needs explicit interface for C functions called here.
+    !
+    INTERFACE
+       INTEGER FUNCTION h5dcreate_anon_c(loc_id, type_id, space_id, dcpl_id_default, dapl_id_default, dset_id) &
+            BIND(C,NAME='h5dcreate_anon_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER(HID_T), INTENT(IN) :: space_id
+         INTEGER(HID_T) :: dcpl_id_default
+         INTEGER(HID_T) :: dapl_id_default
+         INTEGER(HID_T), INTENT(OUT) :: dset_id
+       END FUNCTION h5dcreate_anon_c
+    END INTERFACE
+
+    dcpl_id_default = H5P_DEFAULT_F
+    dapl_id_default = H5P_DEFAULT_F
+
+    IF(PRESENT(dcpl_id)) dcpl_id_default = dcpl_id
+    IF(PRESENT(dapl_id)) dapl_id_default = dapl_id
+
+    hdferr = h5dcreate_anon_c(loc_id, type_id, space_id, dcpl_id_default, dapl_id_default, dset_id)
+
+  END SUBROUTINE h5dcreate_anon_f
+
+#if H5_DOXYGEN
+  !>
+  !! \ingroup FH5D
+  !!
+  !! \brief Reads variable-length data. F2003 API h5dread_f should be used instead.
+  !!
+  !! \param dset_id       Dataset identifier.
+  !! \param mem_type_id   Memory datatype identifier.
+  !! \param buf           Data buffer; may be a scalar or an array, TYPE(TYPE) must be one of the following:
+  !!                      \li INTEGER
+  !!                      \li REAL
+  !!                      \li CHARACTER
+  !! \param dims          Array to hold corresponding dimension sizes of data buffer buf, dim(k) has value of the k-th
+  !!                      dimension of buffer buf. Values are ignored if buf is a scalar.
+  !! \param len           Array to store length of each element.
+  !! \param hdferr        \fortran_error
+  !! \param mem_space_id  Memory dataspace identifier, default value is H5S_ALL_F.
+  !! \param file_space_id File dataspace identifier, default value is H5S_ALL_F.
+  !! \param xfer_prp      Transfer property list identifier, default value is H5P_DEFAULT_F.
+  !!
+  SUBROUTINE h5dread_vl_f(dset_id, mem_type_id, buf, dims, len, hdferr, mem_space_id, file_space_id, xfer_prp)
+    INTEGER(HID_T), INTENT(IN) :: dset_id
+    INTEGER(HID_T), INTENT(IN) :: mem_type_id
+    TYPE(TYPE), INTENT(INOUT), DIMENSION(dims(1),dims(2)) :: buf
+
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(2)  :: dims
+    INTEGER(SIZE_T), INTENT(INOUT), DIMENSION(*)  :: len
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+  END SUBROUTINE h5dread_vl_f
+  !>
+  !! \ingroup FH5D
+  !!
+  !! \brief Writes variable-length data. F2003 API h5dwritef should be used instead.
+  !!
+  !! \param dset_id       Dataset identifier.
+  !! \param mem_type_id   Memory datatype identifier.
+  !! \param buf           Data buffer; may be a scalar or an array, TYPE(TYPE) must be one of the following:
+  !!                      \li INTEGER
+  !!                      \li REAL
+  !!                      \li CHARACTER
+  !! \param dims          Array to hold corresponding dimension sizes of data buffer buf, dim(k) has value of the k-th
+  !!                      dimension of buffer buf. Values are ignored if buf is a scalar.
+  !! \param len           Array to store length of each element.
+  !! \param hdferr        \fortran_error
+  !! \param mem_space_id  Memory dataspace identifier, default value is H5S_ALL_F.
+  !! \param file_space_id File dataspace identifier, default value is H5S_ALL_F.
+  !! \param xfer_prp      Transfer property list identifier, default value is H5P_DEFAULT_F.
+  !!
+  SUBROUTINE h5dwrite_vl_f(dset_id, mem_type_id, buf, dims, len, hdferr, mem_space_id, file_space_id, xfer_prp)
+    INTEGER(HID_T), INTENT(IN) :: dset_id
+    INTEGER(HID_T), INTENT(IN) :: mem_type_id
+    TYPE(TYPE), INTENT(IN),DIMENSION(dims(1),dims(2)) :: buf
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(2)  :: dims
+    INTEGER(SIZE_T), INTENT(IN), DIMENSION(*)  :: len
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+  END SUBROUTINE h5dwrite_vl_f
+
+#else
+  SUBROUTINE h5dwrite_vl_integer(dset_id, mem_type_id, buf, dims, len, &
+       hdferr, &
+       mem_space_id, file_space_id, xfer_prp)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dset_id
+    INTEGER(HID_T), INTENT(IN) :: mem_type_id
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(2) :: dims
+    INTEGER(SIZE_T), INTENT(IN), DIMENSION(*) :: len
+    INTEGER, INTENT(IN), DIMENSION(dims(1),dims(2)), TARGET :: buf
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+    INTEGER(HID_T) :: xfer_prp_default
+    INTEGER(HID_T) :: mem_space_id_default
+    INTEGER(HID_T) :: file_space_id_default
+
+    INTERFACE
+       INTEGER FUNCTION h5dwrite_vl_integer_c(dset_id, mem_type_id, &
+            mem_space_id_default, &
+            file_space_id_default, &
+            xfer_prp_default, buf, dims, len) &
+            BIND(C,NAME='h5dwrite_vl_integer_c')
+         IMPORT :: HID_T, HSIZE_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: dset_id
+         INTEGER(HID_T), INTENT(IN) :: mem_type_id
+         INTEGER(HID_T)  :: mem_space_id_default
+         INTEGER(HID_T) :: file_space_id_default
+         INTEGER(HID_T) :: xfer_prp_default
+         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
+         INTEGER(SIZE_T), INTENT(IN), DIMENSION(*) :: len
+         INTEGER, INTENT(IN), DIMENSION(dims(1),dims(2)) :: buf
+       END FUNCTION h5dwrite_vl_integer_c
+    END INTERFACE
+
+    xfer_prp_default = H5P_DEFAULT_F
+    mem_space_id_default = H5S_ALL_F
+    file_space_id_default = H5S_ALL_F
+
+    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
+    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
+    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
+
+    hdferr = h5dwrite_vl_integer_c(dset_id, mem_type_id, mem_space_id_default, &
+         file_space_id_default, xfer_prp_default, &
+         buf, dims, len)
+
+  END SUBROUTINE h5dwrite_vl_integer
+
+  SUBROUTINE h5dread_vl_integer(dset_id, mem_type_id, buf, dims, len, &
+       hdferr, &
+       mem_space_id, file_space_id, xfer_prp)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dset_id
+    INTEGER(HID_T), INTENT(IN) :: mem_type_id
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(2) :: dims
+    INTEGER(SIZE_T), INTENT(INOUT), DIMENSION(*) :: len
+    INTEGER, INTENT(INOUT), DIMENSION(dims(1),dims(2)), TARGET :: buf
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+    INTEGER(HID_T) :: xfer_prp_default
+    INTEGER(HID_T)  :: mem_space_id_default
+    INTEGER(HID_T) :: file_space_id_default
+    INTEGER(HID_T) :: tmp
+    INTEGER :: error
+
+    INTERFACE
+       INTEGER FUNCTION h5dread_vl_integer_c(dset_id, mem_type_id, &
+            mem_space_id_default, &
+            file_space_id_default, &
+            xfer_prp_default, buf, dims, len) &
+            BIND(C,NAME='h5dread_vl_integer_c')
+         IMPORT :: HID_T, HSIZE_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: dset_id
+         INTEGER(HID_T), INTENT(IN) :: mem_type_id
+         INTEGER(HID_T)  :: mem_space_id_default
+         INTEGER(HID_T) :: file_space_id_default
+         INTEGER(HID_T) :: xfer_prp_default
+         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
+         INTEGER(SIZE_T), INTENT(INOUT), DIMENSION(*) :: len
+         INTEGER, INTENT(INOUT), DIMENSION(dims(1),dims(2)) :: buf
+       END FUNCTION h5dread_vl_integer_c
+    END INTERFACE
+
+    CALL h5dget_space_f(dset_id, tmp, error)
+    xfer_prp_default = H5P_DEFAULT_F
+    mem_space_id_default = tmp
+    file_space_id_default = tmp
+
+    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
+    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
+    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
+
+    hdferr = h5dread_vl_integer_c(dset_id, mem_type_id, mem_space_id_default, &
+         file_space_id_default, xfer_prp_default, &
+         buf, dims, len)
+
+  END SUBROUTINE h5dread_vl_integer
+
+  SUBROUTINE h5dwrite_vl_real(dset_id, mem_type_id, buf, dims, len, &
+       hdferr, &
+       mem_space_id, file_space_id, xfer_prp)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dset_id
+    INTEGER(HID_T), INTENT(IN) :: mem_type_id
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(2) :: dims
+    INTEGER(SIZE_T), INTENT(IN), DIMENSION(*) :: len
+    REAL, INTENT(IN), &
+         DIMENSION(dims(1),dims(2)) :: buf ! Data buffer
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+
+    INTEGER(HID_T) :: xfer_prp_default
+    INTEGER(HID_T) :: mem_space_id_default
+    INTEGER(HID_T) :: file_space_id_default
+
+    INTERFACE
+       INTEGER FUNCTION h5dwrite_vl_real_c(dset_id, mem_type_id, &
+            mem_space_id_default, &
+            file_space_id_default, &
+            xfer_prp_default, buf, dims, len) &
+            BIND(C,NAME='h5dwrite_vl_real_c')
+         IMPORT :: HID_T, HSIZE_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: dset_id
+         INTEGER(HID_T), INTENT(IN) :: mem_type_id
+         INTEGER(HID_T)  :: mem_space_id_default
+         INTEGER(HID_T) :: file_space_id_default
+         INTEGER(HID_T) :: xfer_prp_default
+         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
+         INTEGER(SIZE_T), INTENT(IN), DIMENSION(*) :: len
+         REAL, INTENT(IN), &
+              DIMENSION(dims(1),dims(2)) :: buf
+       END FUNCTION h5dwrite_vl_real_c
+    END INTERFACE
+
+
+    xfer_prp_default = H5P_DEFAULT_F
+    mem_space_id_default = H5S_ALL_F
+    file_space_id_default = H5S_ALL_F
+
+    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
+    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
+    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
+
+    hdferr = h5dwrite_vl_real_c(dset_id, mem_type_id, mem_space_id_default, &
+         file_space_id_default, xfer_prp_default, &
+         buf, dims, len)
+
+  END SUBROUTINE h5dwrite_vl_real
+
+  SUBROUTINE h5dread_vl_real(dset_id, mem_type_id, buf, dims, len, &
+       hdferr, &
+       mem_space_id, file_space_id, xfer_prp)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dset_id
+    INTEGER(HID_T), INTENT(IN) :: mem_type_id
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(2) :: dims
+    INTEGER(SIZE_T), INTENT(INOUT), DIMENSION(*) :: len
+    REAL, INTENT(INOUT), &
+         DIMENSION(dims(1),dims(2)) :: buf ! Data buffer
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+
+    INTEGER(HID_T) :: xfer_prp_default
+    INTEGER(HID_T)  :: mem_space_id_default
+    INTEGER(HID_T) :: file_space_id_default
+    INTEGER(HID_T) :: tmp
+    INTEGER :: error
+
+    INTERFACE
+       INTEGER FUNCTION h5dread_vl_real_c(dset_id, mem_type_id, &
+            mem_space_id_default, &
+            file_space_id_default, &
+            xfer_prp_default, buf, dims, len) &
+            BIND(C,NAME='h5dread_vl_real_c')
+         IMPORT :: HID_T, HSIZE_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: dset_id
+         INTEGER(HID_T), INTENT(IN) :: mem_type_id
+         INTEGER(HID_T)  :: mem_space_id_default
+         INTEGER(HID_T) :: file_space_id_default
+         INTEGER(HID_T) :: xfer_prp_default
+         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
+         INTEGER(SIZE_T), INTENT(INOUT), DIMENSION(*) :: len
+         REAL, INTENT(INOUT), &
+              DIMENSION(dims(1),dims(2)) :: buf
+       END FUNCTION h5dread_vl_real_c
+    END INTERFACE
+
+    CALL h5dget_space_f(dset_id, tmp, error)
+    xfer_prp_default = H5P_DEFAULT_F
+    mem_space_id_default = tmp
+    file_space_id_default = tmp
+
+    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
+    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
+    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
+
+    hdferr = h5dread_vl_real_c(dset_id, mem_type_id, mem_space_id_default, &
+         file_space_id_default, xfer_prp_default, &
+         buf, dims, len)
+
+  END SUBROUTINE h5dread_vl_real
+
+  SUBROUTINE h5dwrite_vl_string(dset_id, mem_type_id, buf, dims, str_len, &
+       hdferr, &
+       mem_space_id, file_space_id, xfer_prp)
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_CHAR
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dset_id
+    INTEGER(HID_T), INTENT(IN) :: mem_type_id
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(2) :: dims
+    INTEGER(SIZE_T), INTENT(IN), DIMENSION(*) :: str_len
+    CHARACTER(LEN=*), INTENT(IN), DIMENSION(dims(2)) :: buf
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+
+    INTEGER(HID_T) :: xfer_prp_default
+    INTEGER(HID_T)  :: mem_space_id_default
+    INTEGER(HID_T) :: file_space_id_default
+
+    INTERFACE
+       INTEGER FUNCTION h5dwrite_vl_string_c(dset_id, mem_type_id, &
+            mem_space_id_default, &
+            file_space_id_default, &
+            ! xfer_prp_default, tmp_buf, dims, str_len)
+            xfer_prp_default, buf, dims, str_len) &
+            BIND(C,NAME='h5dwrite_vl_string_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, HSIZE_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: dset_id
+         INTEGER(HID_T), INTENT(IN) :: mem_type_id
+         INTEGER(HID_T)  :: mem_space_id_default
+         INTEGER(HID_T) :: file_space_id_default
+         INTEGER(HID_T) :: xfer_prp_default
+         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(2) :: dims
+         INTEGER(SIZE_T), INTENT(IN), DIMENSION(*) :: str_len
+         CHARACTER(KIND=C_CHAR), DIMENSION(dims(2)) :: buf
+       END FUNCTION
+    END INTERFACE
+
+
+    xfer_prp_default = H5P_DEFAULT_F
+    mem_space_id_default = H5S_ALL_F
+    file_space_id_default = H5S_ALL_F
+
+    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
+    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
+    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
+
+    hdferr = h5dwrite_vl_string_c(dset_id, mem_type_id, mem_space_id_default, &
+         file_space_id_default, xfer_prp_default, &
+         buf, dims, str_len)
+
+  END SUBROUTINE h5dwrite_vl_string
+
+  SUBROUTINE h5dread_vl_string(dset_id, mem_type_id, buf, dims, str_len, &
+       hdferr, mem_space_id, file_space_id, xfer_prp)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dset_id
+    INTEGER(HID_T), INTENT(IN) :: mem_type_id
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(2) :: dims
+    INTEGER(SIZE_T), INTENT(OUT), DIMENSION(*) :: str_len
+    CHARACTER(LEN=*), INTENT(OUT), &
+         DIMENSION(dims(2)) :: buf      ! Data buffer
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+
+    INTEGER(HID_T) :: xfer_prp_default
+    INTEGER(HID_T)  :: mem_space_id_default
+    INTEGER(HID_T) :: file_space_id_default
+
+    INTERFACE
+       INTEGER FUNCTION h5dread_vl_string_c(dset_id, mem_type_id, &
+            mem_space_id_default, &
+            file_space_id_default, &
+            xfer_prp_default, buf, dims, str_len) &
+            BIND(C,NAME='h5dread_vl_string_c')
+         IMPORT :: c_char
+         IMPORT :: HID_T, HSIZE_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: dset_id
+         INTEGER(HID_T), INTENT(IN) :: mem_type_id
+         INTEGER(HID_T)  :: mem_space_id_default
+         INTEGER(HID_T) :: file_space_id_default
+         INTEGER(HID_T) :: xfer_prp_default
+         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(2) :: dims
+         INTEGER(SIZE_T), INTENT(OUT), DIMENSION(*) :: str_len
+         CHARACTER(KIND=C_CHAR), DIMENSION(dims(2)) :: buf
+       END FUNCTION h5dread_vl_string_c
+    END INTERFACE
+
+    xfer_prp_default = H5P_DEFAULT_F
+    mem_space_id_default = H5S_ALL_F
+    file_space_id_default = H5S_ALL_F
+
+    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
+    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
+    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
+
+    hdferr = h5dread_vl_string_c(dset_id, mem_type_id, mem_space_id_default, &
+         file_space_id_default, xfer_prp_default, &
+         buf, dims, str_len)
+    RETURN
+  END SUBROUTINE h5dread_vl_string
+#endif
+
+!>
+!! \ingroup FH5D
+!!
+!! \brief Returns dataset address in file.
+!!
+!! \param dset_id Dataset identifier.
+!! \param offset  The offset in bytes.
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Dget_offset()
+!!
+  SUBROUTINE h5dget_offset_f(dset_id, offset, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN)    :: dset_id
+    INTEGER(HADDR_T), INTENT(OUT) :: offset
+    INTEGER, INTENT(OUT)          :: hdferr
+    INTERFACE
+       INTEGER(HADDR_T) FUNCTION h5dget_offset(dset_id) BIND(C,NAME='H5Dget_offset')
+         IMPORT :: HID_T, HADDR_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN), VALUE :: dset_id
+       END FUNCTION h5dget_offset
+    END INTERFACE
+
+    offset = h5dget_offset(dset_id)
+
+    hdferr = 0 ! never returns a function error because C API never returns a function error.
+
+  END SUBROUTINE h5dget_offset_f
+
+!>
+!! \ingroup FH5D
+!!
+!! \brief Returns an identifier for a copy of the dataspace for a
+!!       dataset.
+!!
+!! \param dataset_id   Dataset identifier.
+!! \param dataspace_id Dataspace identifier.
+!! \param hdferr       \fortran_error
+!!
+!! See C API: @ref H5Dget_space()
+!!
+  SUBROUTINE h5dget_space_f(dataset_id, dataspace_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dataset_id
+    INTEGER(HID_T), INTENT(OUT) :: dataspace_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5dget_space_c(dataset_id, dataspace_id) BIND(C,NAME='h5dget_space_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: dataset_id
+         INTEGER(HID_T), INTENT(OUT) :: dataspace_id
+       END FUNCTION h5dget_space_c
+    END INTERFACE
+
+    hdferr = h5dget_space_c(dataset_id, dataspace_id)
+  END SUBROUTINE h5dget_space_f
+
+!>
+!! \ingroup FH5D
+!!
+!! \brief Returns a copy of the dataset creation property list.
+!!
+!! \param dset_id  Dataset identifier.
+!! \param plist_id Dataset access property list identifier.
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Dget_access_plist()
+!!
+  SUBROUTINE h5dget_access_plist_f(dset_id, plist_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN)  :: dset_id
+    INTEGER(HID_T), INTENT(OUT) :: plist_id
+    INTEGER       , INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5dget_access_plist_c(dset_id, plist_id) BIND(C,NAME='h5dget_access_plist_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: dset_id
+         INTEGER(HID_T), INTENT(OUT) :: plist_id
+       END FUNCTION h5dget_access_plist_c
+    END INTERFACE
+
+    hdferr = h5dget_access_plist_c(dset_id, plist_id)
+
+  END SUBROUTINE h5dget_access_plist_f
+
+!>
+!! \ingroup FH5D
+!!
+!! \brief Reclaims VL datatype memory buffers.
+!!
+!! \param type_id  Identifier of the datatype.
+!! \param space_id Identifier of the dataspace.
+!! \param plist_id Identifier of the property list used to create the buffer.
+!! \param buf      Pointer to the buffer to be reclaimed.
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Dvlen_reclaim()
+!!
+  SUBROUTINE h5dvlen_reclaim_f(type_id, space_id, plist_id, buf, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN)    :: type_id
+    INTEGER(HID_T), INTENT(IN)    :: space_id
+    INTEGER(HID_T), INTENT(IN)    :: plist_id
+    TYPE(C_PTR)   , INTENT(INOUT) :: buf
+    INTEGER       , INTENT(OUT)   :: hdferr
+
+    INTERFACE
+       INTEGER FUNCTION h5dvlen_reclaim_c(type_id, space_id, plist_id, buf) BIND(C, NAME='h5dvlen_reclaim_c')
+         IMPORT :: C_PTR
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T) :: type_id
+         INTEGER(HID_T) :: space_id
+         INTEGER(HID_T) :: plist_id
+         TYPE(C_PTR), VALUE :: buf
+       END FUNCTION h5dvlen_reclaim_c
+    END INTERFACE
+
+    hdferr = H5Dvlen_reclaim_c(type_id, space_id, plist_id, buf)
+
+  END SUBROUTINE H5Dvlen_reclaim_f
+
+#ifdef H5_DOXYGEN
+!>
+!! \ingroup FH5D
+!!
+!! \brief Writes raw data from a buffer to a dataset.
+!!
+!! \attention  \fortran_approved
+!!
+!! \param dset_id       Identifier of the dataset to write to.
+!! \param mem_type_id   Identifier of the memory datatype.
+!! \param buf           Buffer with data to be written to the file.
+!! \param hdferr        \fortran_error
+!! \param mem_space_id  Identifier of the memory dataspace.
+!! \param file_space_id Identifier of the dataset&apos;s dataspace in the file.
+!! \param xfer_prp      Identifier of a transfer property list for this I/O operation.
+!!
+!! See C API: @ref H5Dwrite()
+!!
+  SUBROUTINE h5dwrite_f(dset_id, mem_type_id, buf, hdferr, mem_space_id, file_space_id, xfer_prp)
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dset_id
+    INTEGER(HID_T), INTENT(IN) :: mem_type_id
+    TYPE(C_PTR), INTENT(IN) :: buf
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+  END SUBROUTINE h5dwrite
+!>
+!! \ingroup FH5D
+!!
+!! \brief Reads raw data from a dataset into a buffer (Passes Pointer).
+!!
+!! \attention  \fortran_approved
+!!
+!! \param dset_id       Identifier of the dataset read from.
+!! \param mem_type_id   Identifier of the memory datatype.
+!! \param buf           Buffer to receive data read from file.
+!! \param hdferr        \fortran_error
+!! \param mem_space_id  Identifier of the memory dataspace.
+!! \param file_space_id Identifier of dataset&apos;s dataspace in the file. (Default: H5S_ALL_F)
+!! \param xfer_prp      Identifier of a transfer property list for this I/O operation.
+!!
+!! See C API: @ref H5Dread()
+!!
+ SUBROUTINE h5dread_f(dset_id, mem_type_id, buf, hdferr, mem_space_id, file_space_id, xfer_prp)
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dset_id
+    INTEGER(HID_T), INTENT(IN) :: mem_type_id
+    TYPE(C_PTR), INTENT(INOUT) :: buf
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+  END SUBROUTINE h5dread_f
+
+!>
+!! \ingroup FH5D
+!!
+!! \brief There is no direct Fortran90 counterpart for the C function H5Dwrite. Instead, that
+!!        functionality is provided by two Fortran90 subroutines:
+!!        \li h5dwrite_f Purpose: Writes data other than variable-length data.
+!!        \li h5dwrite_vl_f Purpose: Writes variable-length data.
+!!
+!! \attention  \fortran_obsolete
+!!
+!! \param dset_id       Identifier of the dataset to write to.
+!! \param mem_type_id   Identifier of the memory datatype.
+!! \param buf           Data buffer; may be a scalar or an array.
+!! \param dims          Array to hold corresponding dimension sizes of data buffer buf; dim(k) has value.
+!!                      of the k-th dimension of buffer buf; values are ignored if buf is a scalar.
+!! \param hdferr        \fortran_error
+!! \param mem_space_id  Identifier of the memory dataspace. Default value is H5S_ALL_F.
+!! \param file_space_id Identifier of the dataset&apos;s dataspace in the file. Default value is H5S_ALL_F.
+!! \param xfer_prp      Identifier of a transfer property list for this I/O operation. Default value is H5P_DEFAULT_F.
+!!
+  SUBROUTINE h5dwrite_f___F90_VERSION(dset_id, mem_type_id, buf, dims, hdferr, mem_space_id, file_space_id, xfer_prp)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dset_id
+    INTEGER(HID_T), INTENT(IN) :: mem_type_id
+    TYPE(TYPE), INTENT(IN) :: buf
+    DIMENSION(*), INTEGER(HSIZE_T), INTENT(IN)  :: dims
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+  END SUBROUTINE h5dwrite_f___F90_VERSION
+
+!>
+!! \ingroup FH5D
+!!
+!! \brief There is no direct Fortran90 counterpart for the C function H5Dread. Instead, that functionality
+!!        is provided by two Fortran90 subroutines:
+!!        \li h5dread_f    Purpose: Reads data other than variable-length data, uses DIMENSION argument and buf is not a pointer.
+!!        \li h5dread_vl_f Purpose: Reads variable-length data.
+!!
+!! \attention  \fortran_obsolete
+!!
+!! \param dset_id       Identifier of the dataset read from.
+!! \param mem_type_id   Identifier of the memory datatype.
+!! \param buf           Buffer to receive data read from file, may be a scalar or an array.
+!! \param dims          Array to hold corresponding dimension sizes of data buffer buf. dim(k) has value of the k-th.
+!!                      dimension of buffer buf. Values are ignored if buf is a scalar.
+!! \param hdferr        \fortran_error
+!! \param mem_space_id  Identifier of the memory dataspace. (Default: H5S_ALL_F)
+!! \param file_space_id Identifier of dataset&apos;s dataspace in the file. (Default: H5S_ALL_F)
+!! \param xfer_prp      Identifier of a transfer property list for this I/O operation. (Default: H5P_DEFAULT_F)
+!!
+  SUBROUTINE h5dread_f___F90_VERSION(dset_id, mem_type_id, buf, dims, hdferr, mem_space_id, file_space_id, xfer_prp)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dset_id
+    INTEGER(HID_T), INTENT(IN) :: mem_type_id
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
+    TYPE(TYPE), INTENT(INOUT) :: buf
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+  END SUBROUTINE h5dread_f___F90_VERSION
+
+!>
+!! \ingroup FH5D
+!!
+!! \brief Fills dataspace elements with a fill value in a memory buffer.
+!!  Only INTEGER, CHARACTER, REAL and DOUBLE PRECISION datatypes of the fillvalues and buffers are supported.
+!!  Buffer and fillvalue are assumed to have the same datatype. Only one-dimesional buffers are supported.
+!!
+!! \attention  \fortran_obsolete
+!!
+!! \param fill_value Fill value.
+!! \param space_id   Identifier of the memory datatype.
+!! \param buf        Buffer to receive data read from file.
+!! \param hdferr     \fortran_error
+!!
+!! See C API: @ref H5Dfill()
+!!
+  SUBROUTINE h5dfill_f(fill_value, space_id, buf,  hdferr)
+    TYPE(TYPE), INTENT(IN) :: fill_value
+    INTEGER(HID_T), INTENT(IN) :: space_id
+    TYPE(TYPE), INTENT(OUT), DIMENSION(*) :: buf
+    INTEGER, INTENT(OUT) :: hdferr
+  END SUBROUTINE h5dfill_f
+!>
+!! \ingroup FH5D
+!!
+!! \brief Fills dataspace elements with a fill value in a memory buffer.
+!!
+!! \attention  \fortran_approved
+!!
+!! \param fill_value   Pointer to the fill value to be used.
+!! \param fill_type_id Fill value datatype identifier,
+!! \param buf          Pointer to the memory buffer containing the selection to be filled.
+!! \param buf_type_id  Datatype of dataspace elements to be filled.
+!! \param space_id     Dataspace identifier.
+!! \param hdferr       \fortran_error
+!!
+!! See C API: @ref H5Dfill()
+!!
+  SUBROUTINE h5dfill_f(fill_value, fill_type_id, buf, buf_type_id, space_id, hdferr)
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
+    IMPLICIT NONE
+    TYPE(C_PTR)                :: fill_value
+    INTEGER(HID_T), INTENT(IN) :: fill_type_id
+    TYPE(C_PTR)                :: buf
+    INTEGER(HID_T), INTENT(IN) :: buf_type_id
+    INTEGER(HID_T), INTENT(IN) :: space_id
+  END SUBROUTINE h5dfill_f
+
+#else
+
+  SUBROUTINE h5dwrite_reference_obj(dset_id, mem_type_id, buf, dims, hdferr, &
+       mem_space_id, file_space_id, xfer_prp)
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dset_id
+    INTEGER(HID_T), INTENT(IN) :: mem_type_id
+    INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: dims
+    TYPE(hobj_ref_t_f), DIMENSION(dims(1)), INTENT(IN), TARGET :: buf
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+
+    INTEGER(HID_T) :: xfer_prp_default
+    INTEGER(HID_T) :: mem_space_id_default
+    INTEGER(HID_T) :: file_space_id_default
+    TYPE(C_PTR) :: f_ptr
+
+    xfer_prp_default = H5P_DEFAULT_F
+    mem_space_id_default = H5S_ALL_F
+    file_space_id_default = H5S_ALL_F
+
+    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
+    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
+    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
+    f_ptr = C_LOC(buf(1))
+
+    hdferr = h5dwrite_f_c(dset_id, mem_type_id, mem_space_id_default, &
+         file_space_id_default, xfer_prp_default, f_ptr)
+
+  END SUBROUTINE h5dwrite_reference_obj
+
+  SUBROUTINE h5dwrite_reference_dsetreg(dset_id, mem_type_id, buf, dims, hdferr, &
+       mem_space_id, file_space_id, xfer_prp)
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dset_id
+    INTEGER(HID_T), INTENT(IN) :: mem_type_id
+    INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: dims
+    TYPE(hdset_reg_ref_t_f), DIMENSION(dims(1)), INTENT(IN), TARGET :: buf
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+
+    INTEGER(HID_T) :: xfer_prp_default
+    INTEGER(HID_T) :: mem_space_id_default
+    INTEGER(HID_T) :: file_space_id_default
+    INTEGER, ALLOCATABLE, DIMENSION(:) :: ref_buf
+    INTEGER :: i
+    INTEGER(HSIZE_T) :: j
+    TYPE(C_PTR) :: f_ptr
+    INTERFACE
+       INTEGER FUNCTION h5dwrite_ref_reg_c(dset_id, mem_type_id,&
+            mem_space_id_default, &
+            file_space_id_default, xfer_prp_default, ref_buf, dims) &
+            BIND(C,NAME='h5dwrite_ref_reg_c')
+         IMPORT :: HID_T, HSIZE_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: dset_id
+         INTEGER(HID_T), INTENT(IN) :: mem_type_id
+         INTEGER(HID_T) :: xfer_prp_default
+         INTEGER(HID_T)  :: mem_space_id_default
+         INTEGER(HID_T) :: file_space_id_default
+         INTEGER, DIMENSION(*) :: ref_buf
+         INTEGER(HSIZE_T), DIMENSION(*) ::  dims
+       END FUNCTION h5dwrite_ref_reg_c
+    END INTERFACE
+    xfer_prp_default = H5P_DEFAULT_F
+    mem_space_id_default = H5S_ALL_F
+    file_space_id_default = H5S_ALL_F
+
+    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
+    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
+    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
+    f_ptr = C_LOC(buf(1))
+
+    ALLOCATE(ref_buf(REF_REG_BUF_LEN*dims(1)), stat=hdferr)
+    IF (hdferr .NE. 0 ) THEN
+       hdferr = -1
+       RETURN
+    ELSE
+       DO j = 1, dims(1)
+          DO i = 1, REF_REG_BUF_LEN
+             ref_buf(REF_REG_BUF_LEN*(j-1) + i) = buf(j)%ref(i)
+          ENDDO
+       ENDDO
+    ENDIF
+    hdferr = h5dwrite_ref_reg_c(dset_id, mem_type_id, mem_space_id_default, &
+         file_space_id_default, xfer_prp_default, ref_buf, dims)
+    DEALLOCATE(ref_buf)
+
+  END SUBROUTINE h5dwrite_reference_dsetreg
+
+  SUBROUTINE h5dwrite_char_scalar(dset_id, mem_type_id, buf, dims, hdferr, &
+       mem_space_id, file_space_id, xfer_prp)
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dset_id
+    INTEGER(HID_T), INTENT(IN) :: mem_type_id
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
+    CHARACTER(*), INTENT(IN), TARGET :: buf
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+
+    CALL h5dwrite_char_scalar_fix(dset_id, mem_type_id, buf, LEN(buf), dims, hdferr, &
+       mem_space_id, file_space_id, xfer_prp)
+
+  END SUBROUTINE h5dwrite_char_scalar
+
+  SUBROUTINE h5dwrite_char_scalar_fix(dset_id, mem_type_id, buf, buf_len, dims, hdferr, &
+       mem_space_id, file_space_id, xfer_prp)
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dset_id
+    INTEGER(HID_T), INTENT(IN) :: mem_type_id
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
+    INTEGER, INTENT(IN) :: buf_len
+    CHARACTER(LEN=buf_len), INTENT(IN), TARGET :: buf
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+    INTEGER(HID_T) :: xfer_prp_default
+    INTEGER(HID_T) :: mem_space_id_default
+    INTEGER(HID_T) :: file_space_id_default
+    TYPE(C_PTR) :: f_ptr
+
+    xfer_prp_default = H5P_DEFAULT_F
+    mem_space_id_default = H5S_ALL_F
+    file_space_id_default = H5S_ALL_F
+
+    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
+    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
+    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
+
+    f_ptr = C_LOC(buf(1:1))
+
+    hdferr = h5dwrite_f_c(dset_id, mem_type_id, mem_space_id_default, &
+         file_space_id_default, xfer_prp_default, f_ptr)
+
+  END SUBROUTINE h5dwrite_char_scalar_fix
+
+  SUBROUTINE h5dread_reference_obj(dset_id, mem_type_id, buf, dims, hdferr, &
+       mem_space_id, file_space_id, xfer_prp)
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dset_id
+    INTEGER(HID_T), INTENT(IN) :: mem_type_id
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
+    TYPE(hobj_ref_t_f), INTENT(INOUT) , &
+         DIMENSION(dims(1)), TARGET :: buf
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+
+    INTEGER(HID_T) :: xfer_prp_default
+    INTEGER(HID_T) :: mem_space_id_default
+    INTEGER(HID_T) :: file_space_id_default
+    TYPE(C_PTR) :: f_ptr
+
+    xfer_prp_default = H5P_DEFAULT_F
+    mem_space_id_default = H5S_ALL_F
+    file_space_id_default = H5S_ALL_F
+
+    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
+    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
+    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
+    f_ptr = C_LOC(buf(1))
+
+    hdferr = h5dread_f_c(dset_id, mem_type_id, mem_space_id_default, &
+         file_space_id_default, xfer_prp_default, f_ptr)
+
+  END SUBROUTINE h5dread_reference_obj
+
+  SUBROUTINE h5dread_reference_dsetreg(dset_id, mem_type_id, buf, dims, hdferr, &
+       mem_space_id, file_space_id, xfer_prp)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dset_id
+    INTEGER(HID_T), INTENT(IN) :: mem_type_id
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
+    TYPE(hdset_reg_ref_t_f), INTENT(INOUT), &
+         DIMENSION(dims(1)), TARGET :: buf
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+    INTEGER(HID_T) :: xfer_prp_default
+    INTEGER(HID_T) :: mem_space_id_default
+    INTEGER(HID_T) :: file_space_id_default
+
+    INTEGER, ALLOCATABLE, DIMENSION(:) :: ref_buf
+    INTEGER :: i
+    INTEGER(HSIZE_T) :: j
+    INTERFACE
+       INTEGER FUNCTION h5dread_ref_reg_c(dset_id, mem_type_id,&
+            mem_space_id_default, &
+            file_space_id_default, xfer_prp_default, ref_buf, dims) &
+            BIND(C,NAME='h5dread_ref_reg_c')
+         IMPORT :: HID_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: dset_id
+         INTEGER(HID_T), INTENT(IN) :: mem_type_id
+         INTEGER(HID_T) :: xfer_prp_default
+         INTEGER(HID_T)  :: mem_space_id_default
+         INTEGER(HID_T) :: file_space_id_default
+         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
+         INTEGER, DIMENSION(*) :: ref_buf
+       END FUNCTION h5dread_ref_reg_c
+    END INTERFACE
+
+    ALLOCATE(ref_buf(REF_REG_BUF_LEN*dims(1)), stat=hdferr)
+    IF (hdferr .NE. 0) THEN
+       hdferr = -1
+       RETURN
+    ENDIF
+
+    xfer_prp_default = H5P_DEFAULT_F
+    mem_space_id_default = H5S_ALL_F
+    file_space_id_default = H5S_ALL_F
+
+    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
+    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
+    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
+
+    hdferr = h5dread_ref_reg_c(dset_id, mem_type_id, mem_space_id_default, &
+         file_space_id_default, xfer_prp_default, ref_buf, dims)
+
+    DO j = 1, dims(1)
+       DO i = 1, REF_REG_BUF_LEN
+          buf(j)%ref(i) = ref_buf(REF_REG_BUF_LEN*(j-1) + i)
+       ENDDO
+    ENDDO
+    DEALLOCATE(ref_buf)
+
+  END SUBROUTINE h5dread_reference_dsetreg
+
+  SUBROUTINE h5dread_char_scalar(dset_id, mem_type_id, buf, dims, hdferr, &
+       mem_space_id, file_space_id, xfer_prp)
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dset_id
+    INTEGER(HID_T), INTENT(IN) :: mem_type_id
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
+
+    CHARACTER(LEN=*), INTENT(INOUT) :: buf
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+
+    INTEGER(HID_T) :: xfer_prp_default
+    INTEGER(HID_T) :: mem_space_id_default
+    INTEGER(HID_T) :: file_space_id_default
+
+    xfer_prp_default = H5P_DEFAULT_F
+    mem_space_id_default = H5S_ALL_F
+    file_space_id_default = H5S_ALL_F
+
+    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
+    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
+    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
+
+    CALL h5dread_char_scalar_fix(dset_id, mem_type_id, buf, LEN(buf), hdferr, &
+         mem_space_id_default, file_space_id_default, xfer_prp_default)
+
+  END SUBROUTINE h5dread_char_scalar
+
+  SUBROUTINE h5dread_char_scalar_fix(dset_id, mem_type_id, buf, buf_len, hdferr, &
+       mem_space_id, file_space_id, xfer_prp)
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dset_id
+    INTEGER(HID_T), INTENT(IN) :: mem_type_id
+    INTEGER, INTENT(IN)  :: buf_len
+    CHARACTER(LEN=buf_len), INTENT(INOUT), TARGET :: buf
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1:1))
+
+    hdferr = h5dread_f_c(dset_id, mem_type_id, mem_space_id, &
+         file_space_id, xfer_prp, f_ptr)
+
+  END SUBROUTINE h5dread_char_scalar_fix
+
+  SUBROUTINE h5dwrite_ptr(dset_id, mem_type_id, buf, hdferr, &
+       mem_space_id, file_space_id, xfer_prp)
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dset_id
+    INTEGER(HID_T), INTENT(IN) :: mem_type_id
+    TYPE(C_PTR), INTENT(IN) :: buf
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+
+    INTEGER(HID_T) :: xfer_prp_default
+    INTEGER(HID_T) :: mem_space_id_default
+    INTEGER(HID_T) :: file_space_id_default
+
+    xfer_prp_default = H5P_DEFAULT_F
+    mem_space_id_default = H5S_ALL_F
+    file_space_id_default = H5S_ALL_F
+
+    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
+    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
+    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
+
+    hdferr = h5dwrite_f_c(dset_id, mem_type_id, mem_space_id_default, &
+         file_space_id_default, xfer_prp_default, buf)
+
+  END SUBROUTINE h5dwrite_ptr
+
+  SUBROUTINE h5dread_ptr(dset_id, mem_type_id, buf, hdferr, &
+       mem_space_id, file_space_id, xfer_prp)
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dset_id
+    INTEGER(HID_T), INTENT(IN) :: mem_type_id
+    TYPE(C_PTR), INTENT(INOUT) :: buf
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+
+    INTEGER(HID_T) :: xfer_prp_default
+    INTEGER(HID_T) :: mem_space_id_default
+    INTEGER(HID_T) :: file_space_id_default
+
+    xfer_prp_default = H5P_DEFAULT_F
+    mem_space_id_default = H5S_ALL_F
+    file_space_id_default = H5S_ALL_F
+
+    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
+    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
+    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
+
+    hdferr = h5dread_f_c(dset_id, mem_type_id, mem_space_id_default, &
+         file_space_id_default, xfer_prp_default, buf)
+
+  END SUBROUTINE h5dread_ptr
+
+ SUBROUTINE h5dfill_ptr(fill_value, fill_type_id, buf, buf_type_id, space_id, hdferr)
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
+    IMPLICIT NONE
+    TYPE(C_PTR)                :: fill_value
+    INTEGER(HID_T), INTENT(IN) :: fill_type_id
+    TYPE(C_PTR)                :: buf
+    INTEGER(HID_T), INTENT(IN) :: buf_type_id
+    INTEGER(HID_T), INTENT(IN) :: space_id
+    INTEGER, INTENT(OUT) :: hdferr
+
+    INTERFACE
+       INTEGER FUNCTION h5dfill(fill_value, fill_type_id, buf, buf_type_id, space_id) &
+            BIND(C,NAME='H5Dfill')
+         IMPORT :: HID_T, C_PTR
+         IMPLICIT NONE
+         TYPE(C_PTR)   , VALUE :: fill_value
+         INTEGER(HID_T), VALUE :: fill_type_id
+         TYPE(C_PTR)   , VALUE :: buf
+         INTEGER(HID_T), VALUE :: buf_type_id
+         INTEGER(HID_T), VALUE :: space_id
+       END FUNCTION h5dfill
+    END INTERFACE
+
+    hdferr = INT(h5dfill(fill_value, fill_type_id, buf, buf_type_id, space_id))
+
+  END SUBROUTINE h5dfill_ptr
+
+  SUBROUTINE h5dfill_integer(fill_value, space_id, buf,  hdferr)
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
+    IMPLICIT NONE
+    INTEGER, INTENT(IN), TARGET :: fill_value  ! Fill value
+    INTEGER(HID_T), INTENT(IN) :: space_id ! Memory dataspace selection identifier
+    INTEGER, INTENT(OUT), DIMENSION(*), TARGET :: buf ! Memory buffer to fill in
+    INTEGER, INTENT(OUT) :: hdferr      ! Error code
+
+    INTEGER(HID_T) :: fill_type_id ! Fill value datatype identifier
+    INTEGER(HID_T) :: mem_type_id  ! Buffer dadtype identifier
+
+    TYPE(C_PTR) :: f_ptr_fill_value ! C pointer to fill_value
+    TYPE(C_PTR) :: f_ptr_buf        ! C pointer to buf
+
+    f_ptr_fill_value = C_LOC(fill_value)
+    f_ptr_buf = C_LOC(buf(1))
+
+    fill_type_id = h5kind_to_type(KIND(fill_value), H5_INTEGER_KIND)
+    mem_type_id  = fill_type_id
+
+    CALL h5dfill_ptr(f_ptr_fill_value, fill_type_id, f_ptr_buf, mem_type_id, space_id, hdferr)
+
+  END SUBROUTINE h5dfill_integer
+
+  SUBROUTINE h5dfill_c_float(fill_value, space_id, buf,  hdferr)
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
+    IMPLICIT NONE
+    REAL(KIND=C_FLOAT), INTENT(IN), TARGET :: fill_value
+    INTEGER(HID_T), INTENT(IN) :: space_id
+    REAL(KIND=C_FLOAT), INTENT(OUT), DIMENSION(*), TARGET :: buf
+    INTEGER, INTENT(OUT) :: hdferr
+
+    INTEGER(HID_T) :: fill_type_id ! Fill value datatype identifier
+    INTEGER(HID_T) :: mem_type_id !  Buffer dadtype identifier
+
+    TYPE(C_PTR) :: f_ptr_fill_value ! C pointer to fill_value
+    TYPE(C_PTR) :: f_ptr_buf ! C pointer to buf
+
+    f_ptr_fill_value = C_LOC(fill_value)
+    f_ptr_buf = C_LOC(buf(1))
+
+    fill_type_id = h5kind_to_type(KIND(fill_value), H5_REAL_KIND)
+    mem_type_id  = fill_type_id
+
+    CALL h5dfill_ptr(f_ptr_fill_value, fill_type_id, f_ptr_buf, mem_type_id, space_id, hdferr)
+
+  END SUBROUTINE h5dfill_c_float
+
+  SUBROUTINE h5dfill_c_double(fill_value, space_id, buf,  hdferr)
+    IMPLICIT NONE
+    REAL(KIND=C_DOUBLE), INTENT(IN), TARGET :: fill_value
+    INTEGER(HID_T), INTENT(IN) :: space_id
+    REAL(KIND=C_DOUBLE), INTENT(OUT), DIMENSION(*), TARGET :: buf
+    INTEGER, INTENT(OUT) :: hdferr
+
+    INTEGER(HID_T) :: fill_type_id ! Fill value datatype identifier
+    INTEGER(HID_T) :: mem_type_id !  Buffer dadtype identifier
+
+    TYPE(C_PTR) :: f_ptr_fill_value ! C pointer to fill_value
+    TYPE(C_PTR) :: f_ptr_buf ! C pointer to buf
+
+    f_ptr_fill_value = C_LOC(fill_value)
+    f_ptr_buf = C_LOC(buf(1))
+
+    fill_type_id = h5kind_to_type(KIND(fill_value), H5_REAL_KIND)
+    mem_type_id  = fill_type_id
+
+    CALL h5dfill_ptr(f_ptr_fill_value, fill_type_id, f_ptr_buf, mem_type_id, space_id, hdferr)
+
+  END SUBROUTINE h5dfill_c_double
+
+#if H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE!=0
+  SUBROUTINE h5dfill_c_long_double(fill_value, space_id, buf,  hdferr)
+    IMPLICIT NONE
+    REAL(KIND=C_LONG_DOUBLE), INTENT(IN), TARGET :: fill_value
+    INTEGER(HID_T), INTENT(IN) :: space_id
+    REAL(KIND=C_LONG_DOUBLE), INTENT(OUT), DIMENSION(*), TARGET :: buf
+    INTEGER, INTENT(OUT) :: hdferr
+
+    INTEGER(HID_T) :: fill_type_id ! Fill value datatype identifier
+    INTEGER(HID_T) :: mem_type_id !  Buffer dadtype identifier
+
+    TYPE(C_PTR) :: f_ptr_fill_value ! C pointer to fill_value
+    TYPE(C_PTR) :: f_ptr_buf ! C pointer to buf
+
+    f_ptr_fill_value = C_LOC(fill_value)
+    f_ptr_buf = C_LOC(buf(1))
+
+    fill_type_id = h5kind_to_type(KIND(fill_value), H5_REAL_KIND)
+    mem_type_id  = fill_type_id
+
+    CALL h5dfill_ptr(f_ptr_fill_value, fill_type_id, f_ptr_buf, mem_type_id, space_id, hdferr)
+
+  END SUBROUTINE h5dfill_c_long_double
+#endif
+
+  SUBROUTINE h5dfill_char(fill_value, space_id, buf, hdferr)
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
+    IMPLICIT NONE
+    CHARACTER, INTENT(IN), TARGET :: fill_value
+    INTEGER(HID_T), INTENT(IN) :: space_id
+    CHARACTER, INTENT(OUT), DIMENSION(*), TARGET :: buf
+    INTEGER, INTENT(OUT) :: hdferr
+
+    INTEGER(HID_T) :: fill_type_id ! Fill value datatype identifier
+    INTEGER(HID_T) :: mem_type_id !  Buffer dadtype identifier
+
+    TYPE(C_PTR) :: f_ptr_fill_value ! C pointer to fill_value
+    TYPE(C_PTR) :: f_ptr_buf ! C pointer to buf
+
+    f_ptr_fill_value = C_LOC(fill_value)
+    f_ptr_buf = C_LOC(buf(1))
+
+    fill_type_id = H5T_NATIVE_CHARACTER
+    mem_type_id  = H5T_NATIVE_CHARACTER
+
+    CALL h5dfill_ptr(f_ptr_fill_value, fill_type_id, f_ptr_buf, mem_type_id, space_id, hdferr)
+
+  END SUBROUTINE h5dfill_char
+!>
+!! \ingroup FH5D
+!!
+!! \brief Reads data from a file to memory buffers for multiple datasets.
+!!
+!! \param count         Number of datasets to write to.
+!! \param dset_id       Identifier of the dataset to write to.
+!! \param mem_type_id   Identifier of the memory datatype.
+!! \param mem_space_id  Identifier of the memory dataspace.
+!! \param file_space_id Identifier of the dataset&apos;s dataspace in the file.
+!! \param buf           Buffer with data to be written to the file.
+!! \param hdferr        \fortran_error
+!! \param xfer_prp      Identifier of a transfer property list for this I/O operation.
+!!
+  SUBROUTINE H5Dread_multi_f(count, dset_id, mem_type_id, mem_space_id, file_space_id, buf, hdferr, xfer_prp)
+    IMPLICIT NONE
+
+    INTEGER(SIZE_T),      INTENT(IN)               :: count
+    INTEGER(HID_T),       INTENT(IN), DIMENSION(*) :: dset_id
+    INTEGER(HID_T),       INTENT(IN), DIMENSION(*) :: mem_type_id
+    INTEGER(HID_T),       INTENT(IN), DIMENSION(*) :: mem_space_id
+    INTEGER(HID_T),       INTENT(IN), DIMENSION(*) :: file_space_id
+    TYPE(C_PTR),                      DIMENSION(*) :: buf
+    INTEGER,              INTENT(OUT)              :: hdferr
+    INTEGER(HID_T),       INTENT(IN), OPTIONAL     :: xfer_prp
+
+    INTEGER(HID_T) :: xfer_prp_default
+
+    INTERFACE
+       INTEGER FUNCTION H5Dread_multi(count, dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf) &
+            BIND(C, NAME='H5Dread_multi')
+         IMPORT :: SIZE_T
+         IMPORT :: HID_T
+         IMPORT :: C_PTR
+         IMPLICIT NONE
+         INTEGER(SIZE_T), VALUE :: count
+         INTEGER(HID_T), DIMENSION(*) :: dset_id
+         INTEGER(HID_T), DIMENSION(*) :: mem_type_id
+         INTEGER(HID_T), DIMENSION(*) :: mem_space_id
+         INTEGER(HID_T), DIMENSION(*) :: file_space_id
+         INTEGER(HID_T), VALUE :: xfer_prp
+         TYPE(C_PTR), DIMENSION(*) :: buf
+       END FUNCTION H5Dread_multi
+    END INTERFACE 
+
+    xfer_prp_default = H5P_DEFAULT_F
+    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
+
+    hdferr = H5Dread_multi(count, dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp_default, buf)
+
+  END SUBROUTINE H5Dread_multi_f
+!>
+!! \ingroup FH5D
+!!
+!! \brief Writes data in memory to a file for multiple datasets.
+!!
+!! \param count         Number of datasets to write to.
+!! \param dset_id       Identifier of the dataset to write to.
+!! \param mem_type_id   Identifier of the memory datatype.
+!! \param mem_space_id  Identifier of the memory dataspace.
+!! \param file_space_id Identifier of the dataset&apos;s dataspace in the file.
+!! \param buf           Buffer with data to be written to the file.
+!! \param hdferr        \fortran_error
+!! \param xfer_prp      Identifier of a transfer property list for this I/O operation.
+!!
+  SUBROUTINE H5Dwrite_multi_f(count, dset_id, mem_type_id, mem_space_id, file_space_id, buf, hdferr, xfer_prp)
+    IMPLICIT NONE
+
+    INTEGER(SIZE_T),      INTENT(IN)               :: count
+    INTEGER(HID_T),       INTENT(IN), DIMENSION(*) :: dset_id
+    INTEGER(HID_T),       INTENT(IN), DIMENSION(*) :: mem_type_id
+    INTEGER(HID_T),       INTENT(IN), DIMENSION(*) :: mem_space_id
+    INTEGER(HID_T),       INTENT(IN), DIMENSION(*) :: file_space_id
+    TYPE(C_PTR),                      DIMENSION(*) :: buf
+    INTEGER,              INTENT(OUT)              :: hdferr
+    INTEGER(HID_T),       INTENT(IN), OPTIONAL     :: xfer_prp
+
+    INTEGER(HID_T) :: xfer_prp_default
+
+    INTERFACE
+       INTEGER FUNCTION H5Dwrite_multi(count, dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf) &
+            BIND(C, NAME='H5Dwrite_multi')
+         IMPORT :: SIZE_T
+         IMPORT :: HID_T
+         IMPORT :: C_PTR
+         IMPLICIT NONE
+         INTEGER(SIZE_T), VALUE :: count
+         INTEGER(HID_T), DIMENSION(*) :: dset_id
+         INTEGER(HID_T), DIMENSION(*) :: mem_type_id
+         INTEGER(HID_T), DIMENSION(*) :: mem_space_id
+         INTEGER(HID_T), DIMENSION(*) :: file_space_id
+         INTEGER(HID_T), VALUE :: xfer_prp
+         TYPE(C_PTR), DIMENSION(*) :: buf
+       END FUNCTION H5Dwrite_multi
+    END INTERFACE
+
+    xfer_prp_default = H5P_DEFAULT_F
+    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
+
+    hdferr = H5Dwrite_multi(count, dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp_default, buf)
+
+  END SUBROUTINE H5Dwrite_multi_f
+
+#endif
+
+END MODULE H5D
+
+
diff --git a/fortran/src/H5Dff.f90 b/fortran/src/H5Dff.f90
deleted file mode 100644
index 3ad868c..0000000
--- a/fortran/src/H5Dff.f90
+++ /dev/null
@@ -1,1035 +0,0 @@
-!****h* ROBODoc/H5D
-!
-! NAME
-!  MODULE H5D
-!
-! FILE
-!  fortran/src/H5Dff.f90
-!
-! PURPOSE
-!  This file contains Fortran interfaces for H5D functions. It includes
-!  all the functions that are independent on whether the Fortran 2003 functions
-!  are enabled or disabled.
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! NOTES
-!                         *** IMPORTANT ***
-!  If you add a new H5D function you must add the function name to the
-!  Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
-!  This is needed for Windows based operating systems.
-!
-!*****
-
-MODULE H5D
-  USE H5GLOBAL
-
-  INTERFACE h5dextend_f
-     MODULE PROCEDURE h5dset_extent_f
-  END INTERFACE
-
-  INTERFACE h5dread_vl_f
-     MODULE PROCEDURE h5dread_vl_integer
-     MODULE PROCEDURE h5dread_vl_real
-     MODULE PROCEDURE h5dread_vl_string
-  END INTERFACE
-
-  INTERFACE h5dwrite_vl_f
-     MODULE PROCEDURE h5dwrite_vl_integer
-     MODULE PROCEDURE h5dwrite_vl_real
-     MODULE PROCEDURE h5dwrite_vl_string
-  END INTERFACE
-
-CONTAINS
-
-!
-!****s* H5D/h5dcreate_f
-!
-! NAME
-!  h5dcreate_f
-!
-! PURPOSE
-!  Creates a dataset at the specified location
-!
-! INPUTS
-!  loc_id 	 - file or group identifier
-!  name 	 - dataset name
-!  type_id 	 - dataset datatype identifier
-!  space_id 	 - dataset dataspace identifier
-! OUTPUTS
-!  dset_id 	 - dataset identifier
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! OPTIONAL PARAMETERS
-!  creation_prp  - Dataset creation property list
-!  lcpl_id 	 - Link creation property list
-!  dapl_id 	 - Dataset access property list
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!
-!  - Explicit Fortran interfaces were added for
-!    called C functions (it is needed for Windows
-!    port).  February 28, 2001
-!
-!  - Added version's 1.8 new optional parameters
-!    February, 2008
-!
-! SOURCE
-  SUBROUTINE h5dcreate_f(loc_id, name, type_id, space_id, dset_id, &
-       hdferr, dcpl_id, lcpl_id, dapl_id)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of the dataset
-    INTEGER(HID_T), INTENT(IN) :: type_id  ! Datatype identifier
-    INTEGER(HID_T), INTENT(IN) :: space_id ! Dataspace identifier
-    INTEGER(HID_T), INTENT(OUT) :: dset_id ! Dataset identifier
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-!*****
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: dcpl_id ! Dataset creation property list
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lcpl_id ! Link creation property list
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: dapl_id ! Dataset access property list
-
-    INTEGER(HID_T) :: lcpl_id_default
-    INTEGER(HID_T) :: dcpl_id_default
-    INTEGER(HID_T) :: dapl_id_default
-
-    INTEGER :: namelen ! Name length
-
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5dcreate_c(loc_id, name, namelen, type_id, &
-            space_id, lcpl_id_default, dcpl_id_default, dapl_id_default, dset_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DCREATE_C'::h5dcreate_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         INTEGER(HID_T), INTENT(IN) :: loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER :: namelen
-         INTEGER(HID_T), INTENT(IN) :: type_id
-         INTEGER(HID_T), INTENT(IN) :: space_id
-
-         INTEGER(HID_T) :: lcpl_id_default
-         INTEGER(HID_T) :: dcpl_id_default
-         INTEGER(HID_T) :: dapl_id_default
-
-         INTEGER(HID_T), INTENT(OUT) :: dset_id
-       END FUNCTION h5dcreate_c
-    END INTERFACE
-
-    lcpl_id_default = H5P_DEFAULT_F
-    dcpl_id_default = H5P_DEFAULT_F
-    dapl_id_default = H5P_DEFAULT_F
-
-    IF(PRESENT(lcpl_id)) lcpl_id_default = lcpl_id
-    IF(PRESENT(dcpl_id)) dcpl_id_default = dcpl_id
-    IF(PRESENT(dapl_id)) dapl_id_default = dapl_id
-
-    namelen = LEN(name)
-    hdferr = h5dcreate_c(loc_id, name, namelen, type_id, space_id, &
-         lcpl_id_default, dcpl_id_default, dapl_id_default, dset_id)
-
-  END SUBROUTINE h5dcreate_f
-
-!
-!****s* H5D/h5dopen_f
-!
-! NAME
-!  h5dopen_f
-!
-! PURPOSE
-!  Opens an existing dataset.
-!
-! INPUTS
-!  loc_id 	 - file or group identifier
-!  name 	 - dataset name
-! OUTPUTS
-!  dset_id 	 - dataset identifier
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! OPTIONAL PARAMETERS
-!  dapl_id 	 - Dataset access property list
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  -Explicit Fortran interfaces were added for
-!   called C functions (it is needed for Windows
-!   port).  February 28, 2001
-!
-!  -Added 1.8 (optional) parameter dapl_id
-!   February, 2008, M. Scot Breitenfeld
-!
-! SOURCE
-  SUBROUTINE h5dopen_f(loc_id, name, dset_id, hdferr, dapl_id)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of the dataset
-    INTEGER(HID_T), INTENT(OUT) :: dset_id ! Dataset identifier
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: dapl_id ! Dataset access property list
-!*****
-    INTEGER :: namelen                     ! Name length
-
-    INTEGER(HID_T) :: dapl_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dopen_c(loc_id, name, namelen, dapl_id_default, dset_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DOPEN_C'::h5dopen_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         INTEGER(HID_T), INTENT(IN) :: loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER :: namelen
-         INTEGER(HID_T), INTENT(IN) :: dapl_id_default
-         INTEGER(HID_T), INTENT(OUT) :: dset_id
-       END FUNCTION h5dopen_c
-    END INTERFACE
-
-    dapl_id_default = H5P_DEFAULT_F
-    IF(PRESENT(dapl_id)) dapl_id_default = dapl_id
-
-    namelen = LEN(name)
-    hdferr = h5dopen_c(loc_id, name, namelen, dapl_id_default, dset_id)
-
-  END SUBROUTINE h5dopen_f
-
-!
-!****s* H5D/h5dclose_f
-!
-! NAME
-!  h5dclose_f
-!
-! PURPOSE
-!  Closes a dataset.
-!
-! INPUTS
-!  dset_id 	 - dataset identifier
-! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  February 28, 2001
-!
-! SOURCE
-  SUBROUTINE h5dclose_f(dset_id, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id ! Dataset identifier
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5dclose_c(dset_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DCLOSE_C'::h5dclose_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-       END FUNCTION h5dclose_c
-    END INTERFACE
-
-    hdferr = h5dclose_c(dset_id)
-
-  END SUBROUTINE h5dclose_f
-
-!
-!****s* H5D/h5dget_type_f
-!
-! NAME
-!  h5dget_type_f
-!
-! PURPOSE
-!  Returns an identifier for a copy of the datatype for a
-!  dataset.
-!
-! INPUTS
-!  dataset_id 	 - dataset identifier
-! OUTPUTS
-!  datatype_id 	 - dataspace identifier
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  February 28, 2001
-!
-! NOTES
-!
-! SOURCE
-  SUBROUTINE h5dget_type_f(dataset_id, datatype_id, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dataset_id      ! Dataset identifier
-    INTEGER(HID_T), INTENT(OUT) :: datatype_id    ! Datatype identifier
-    INTEGER, INTENT(OUT) :: hdferr                ! Error code
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5dget_type_c (dataset_id, datatype_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DGET_TYPE_C'::h5dget_type_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dataset_id
-         INTEGER(HID_T), INTENT(OUT) :: datatype_id
-       END FUNCTION h5dget_type_c
-    END INTERFACE
-
-    hdferr = h5dget_type_c (dataset_id, datatype_id)
-  END SUBROUTINE h5dget_type_f
-
-!
-!****s* H5D/h5dset_extent
-!
-! NAME
-!  h5dset_extent (instead of obsolete name: h5dextend_f)
-!
-! PURPOSE
-!  Extends a dataset with unlimited dimension.
-!
-! INPUTS
-!  dataset_id 	 - dataset identifier
-!  size 	 - array containing the new magnitude of
-!                  each dimension
-! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  February 28, 2001
-!
-!  Changed name from the now obsolete h5dextend_f
-!  to h5dset_extent_f. Provided interface to old name
-!  for backward compatability. -MSB- March 14, 2008
-!
-! SOURCE
-  SUBROUTINE h5dset_extent_f(dataset_id, size, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dataset_id      ! Dataset identifier
-    INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN)  :: size
-    ! Array containing
-    ! dimensions' sizes
-    INTEGER, INTENT(OUT) :: hdferr                ! Error code
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5dset_extent_c(dataset_id, size)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DSET_EXTENT_C'::h5dset_extent_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dataset_id
-         INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN)  :: size
-       END FUNCTION h5dset_extent_c
-    END INTERFACE
-
-    hdferr = H5Dset_extent_c(dataset_id, size)
-  END SUBROUTINE h5dset_extent_f
-
-!****s* H5D/h5dget_create_plist_f
-!
-! NAME
-!  h5dget_create_plist_f
-!
-! PURPOSE
-!  Returns an identifier for a copy of the dataset creation
-!  property list for a dataset.
-!
-! INPUTS
-!  dataset_id 	 - dataset identifier
-! OUTPUTS
-!  plist_id 	 - creation property list identifier
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  February 28, 2001
-! SOURCE
-  SUBROUTINE h5dget_create_plist_f(dataset_id, plist_id, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dataset_id   ! Dataset identifier
-    INTEGER(HID_T), INTENT(OUT) :: plist_id    ! Dataset creation
-                                               ! property list identifier
-    INTEGER, INTENT(OUT) :: hdferr             ! Error code
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5dget_create_plist_c(dataset_id, plist_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DGET_CREATE_PLIST_C'::h5dget_create_plist_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dataset_id
-         INTEGER(HID_T), INTENT(OUT) :: plist_id
-       END FUNCTION h5dget_create_plist_c
-    END INTERFACE
-
-    hdferr = h5dget_create_plist_c(dataset_id, plist_id)
-  END SUBROUTINE h5dget_create_plist_f
-
-!
-!****s* H5D/h5dget_storage_size_f
-!
-! NAME
-!  h5dget_storage_size_f
-!
-! PURPOSE
-!  Returns the amount of storage requires by a dataset
-!
-! INPUTS
-!  dataset_id 	 - dataset identifier
-! OUTPUTS
-!  size 	 - datastorage size
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  October 15, 2002
-! SOURCE
-  SUBROUTINE h5dget_storage_size_f(dataset_id, size, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dataset_id ! Dataset identifier
-    INTEGER(HSIZE_T),  INTENT(OUT)  :: size  ! Amount of storage
-                                             ! allocated for dataset
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5dget_storage_size_c(dataset_id, size)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DGET_STORAGE_SIZE_C'::h5dget_storage_size_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dataset_id
-         INTEGER(HSIZE_T), INTENT(OUT)  :: size
-       END FUNCTION h5dget_storage_size_c
-    END INTERFACE
-
-    hdferr = h5dget_storage_size_c(dataset_id, size)
-  END SUBROUTINE h5dget_storage_size_f
-
-!
-!****s* H5D/h5dvlen_get_max_len_f
-!
-! NAME
-!  h5dvlen_get_max_len_f
-!
-! PURPOSE
-!  Returns maximum length of the VL array elements
-!
-! INPUTS
-!  dataset_id 	 - dataset identifier
-!  type_id 	 - datatype identifier
-!  space_id 	 - dataspace identifier
-! OUTPUTS
-!  size 	 - buffer size
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! OPTIONAL PARAMETERS
-!  NONE
-!
-! AUTHOR
-!  Elena Pourmal
-!  October 15, 2002
-!
-! SOURCE
-  SUBROUTINE h5dvlen_get_max_len_f(dataset_id, type_id, space_id, len,  hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dataset_id      ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: type_id         ! Datatype identifier
-    INTEGER(HID_T), INTENT(IN) :: space_id        ! Dataspace identifier
-    INTEGER(SIZE_T),  INTENT(OUT)  :: len         ! Maximum length of the element
-    INTEGER, INTENT(OUT) :: hdferr                ! Error code
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5dvlen_get_max_len_c(dataset_id, type_id, space_id, len)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DVLEN_GET_MAX_LEN_C'::h5dvlen_get_max_len_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dataset_id
-         INTEGER(HID_T), INTENT(IN) :: type_id
-         INTEGER(HID_T), INTENT(IN) :: space_id
-         INTEGER(SIZE_T), INTENT(OUT)  :: len
-       END FUNCTION h5dvlen_get_max_len_c
-    END INTERFACE
-
-    hdferr = h5dvlen_get_max_len_c(dataset_id, type_id,  space_id, len)
-  END SUBROUTINE h5dvlen_get_max_len_f
-
-!
-!****s* H5D/h5dget_space_status_f
-!
-! NAME
-!  h5dget_space_status_f
-!
-! PURPOSE
-!  Returns the status of data space allocation.
-!
-! INPUTS
-!  dset_id	 - dataset identifier
-! OUTPUTS
-!  flag          - status; may have one of the following values:
-!		    H5D_SPACE_STS_ERROR_F
-!		    H5D_SPACE_STS_NOT_ALLOCATED_F
-!		    H5D_SPACE_STS_PART_ALLOCATED_F
-!		    H5D_SPACE_STS_ALLOCATED_F
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  March 12, 2003
-!
-! SOURCE
-  SUBROUTINE h5dget_space_status_f(dset_id, flag, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id  ! Dataspace identifier
-    INTEGER, INTENT(OUT)       :: flag     ! Memory buffer to fill in
-    INTEGER, INTENT(OUT)       :: hdferr   ! Error code
-  !*****
-    INTERFACE
-       INTEGER FUNCTION h5dget_space_status_c(dset_id, flag)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DGET_SPACE_STATUS_C'::h5dget_space_status_c
-         !DEC$ENDIF
-         INTEGER(HID_T) :: dset_id
-         INTEGER        :: flag
-       END FUNCTION h5dget_space_status_c
-    END INTERFACE
-
-    hdferr = h5dget_space_status_c(dset_id, flag)
-  END SUBROUTINE h5dget_space_status_f
-
-!
-!****s* H5D/h5dcreate_anon_f
-!
-! NAME
-!  h5dcreate_anon_f
-!
-! PURPOSE
-!  Creates a dataset in a file without linking it into the file structure
-!
-! INPUTS
-!  loc_id	 - Identifier of the file or group within which to create the dataset.
-!  type_id	 - Identifier of the datatype to use when creating the dataset.
-!  space_id	 - Identifier of the dataspace to use when creating the dataset.
-! OUTPUTS
-!  dset_id	 - dataset identifier
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! OPTIONAL PARAMETERS
-!  dcpl_id       - Dataset creation property list identifier.
-!  dapl_id  	 - Dataset access property list identifier.
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  February 11, 2008
-!
-! SOURCE
-  SUBROUTINE h5dcreate_anon_f(loc_id, type_id, space_id, dset_id, hdferr, dcpl_id, dapl_id)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier.
-    INTEGER(HID_T), INTENT(IN) :: type_id  ! Datatype identifier.
-    INTEGER(HID_T), INTENT(IN) :: space_id ! Dataspace identifier.
-    INTEGER(HID_T), INTENT(OUT) :: dset_id ! Dataset identifier.
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code.
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: dcpl_id  ! Dataset creation property list identifier.
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: dapl_id  ! Dataset access property list identifier.
-!*****
-    INTEGER(HID_T) :: dcpl_id_default
-    INTEGER(HID_T) :: dapl_id_default
-
-    !
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5dcreate_anon_c(loc_id, type_id, space_id, dcpl_id_default, dapl_id_default, dset_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DCREATE_ANON_C'::h5dcreate_anon_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: loc_id
-         INTEGER(HID_T), INTENT(IN) :: type_id
-         INTEGER(HID_T), INTENT(IN) :: space_id
-         INTEGER(HID_T) :: dcpl_id_default
-         INTEGER(HID_T) :: dapl_id_default
-         INTEGER(HID_T), INTENT(OUT) :: dset_id
-       END FUNCTION h5dcreate_anon_c
-    END INTERFACE
-
-    dcpl_id_default = H5P_DEFAULT_F
-    dapl_id_default = H5P_DEFAULT_F
-
-    IF(PRESENT(dcpl_id)) dcpl_id_default = dcpl_id
-    IF(PRESENT(dapl_id)) dapl_id_default = dapl_id
-
-    hdferr = h5dcreate_anon_c(loc_id, type_id, space_id, dcpl_id_default, dapl_id_default, dset_id)
-
-  END SUBROUTINE h5dcreate_anon_f
-
-  SUBROUTINE h5dwrite_vl_integer(dset_id, mem_type_id, buf, dims, len, &
-       hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(2) :: dims ! MAX len x num_elem
-    INTEGER(SIZE_T), INTENT(IN), DIMENSION(*) :: len ! Array to store
-                                                     ! the length of each
-                                                     ! element
-    INTEGER, INTENT(IN), &
-         DIMENSION(dims(1),dims(2)), TARGET :: buf   ! Data buffer
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dwrite_vl_integer_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims, len)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DWRITE_VL_INTEGER_C'::h5dwrite_vl_integer_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         INTEGER(SIZE_T), INTENT(IN), DIMENSION(*) :: len
-         INTEGER, INTENT(IN), &
-              DIMENSION(dims(1),dims(2)) :: buf
-       END FUNCTION h5dwrite_vl_integer_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dwrite_vl_integer_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, &
-         buf, dims, len)
-
-  END SUBROUTINE h5dwrite_vl_integer
-
-  SUBROUTINE h5dread_vl_integer(dset_id, mem_type_id, buf, dims, len, &
-       hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(2) :: dims  ! MAX len x num_elem
-    INTEGER(SIZE_T), INTENT(INOUT), DIMENSION(*) :: len ! Array to store
-                                                        ! the length of each
-                                                        ! element
-    INTEGER, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2)), TARGET :: buf   ! Data buffer
-    INTEGER, INTENT(OUT) :: hdferr ! Error code
-                                   ! -1 if failed, 0 otherwise
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T)  :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    INTEGER(HID_T) :: tmp
-    INTEGER :: error
-
-    INTERFACE
-       INTEGER FUNCTION h5dread_vl_integer_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims, len)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DREAD_VL_INTEGER_C'::h5dread_vl_integer_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         INTEGER(SIZE_T), INTENT(INOUT), DIMENSION(*) :: len
-         INTEGER, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2)) :: buf
-       END FUNCTION h5dread_vl_integer_c
-    END INTERFACE
-
-    CALL h5dget_space_f(dset_id, tmp, error)
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = tmp
-    file_space_id_default = tmp
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dread_vl_integer_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, &
-         buf, dims, len)
-
-  END SUBROUTINE h5dread_vl_integer
-
-  SUBROUTINE h5dwrite_vl_real(dset_id, mem_type_id, buf, dims, len, &
-       hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(2) :: dims ! MAX len x num_elem
-    INTEGER(SIZE_T), INTENT(IN), DIMENSION(*) :: len   ! Array to store
-                                                       ! the length of each
-                                                       ! element
-    REAL, INTENT(IN), &
-         DIMENSION(dims(1),dims(2)) :: buf ! Data buffer
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dwrite_vl_real_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims, len)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DWRITE_VL_REAL_C'::h5dwrite_vl_real_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         INTEGER(SIZE_T), INTENT(IN), DIMENSION(*) :: len
-         REAL, INTENT(IN), &
-              DIMENSION(dims(1),dims(2)) :: buf
-       END FUNCTION h5dwrite_vl_real_c
-    END INTERFACE
-
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dwrite_vl_real_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, &
-         buf, dims, len)
-
-  END SUBROUTINE h5dwrite_vl_real
-
-  SUBROUTINE h5dread_vl_real(dset_id, mem_type_id, buf, dims, len, &
-       hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(2) :: dims  ! MAX len x num_elem
-    INTEGER(SIZE_T), INTENT(INOUT), DIMENSION(*) :: len ! Array to store the length of each element
-    REAL, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2)) :: buf ! Data buffer
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-                                           ! -1 if failed, 0 otherwise
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T)  :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    INTEGER(HID_T) :: tmp
-    INTEGER :: error
-
-    INTERFACE
-       INTEGER FUNCTION h5dread_vl_real_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims, len)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DREAD_VL_REAL_C'::h5dread_vl_real_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         INTEGER(SIZE_T), INTENT(INOUT), DIMENSION(*) :: len
-         REAL, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2)) :: buf
-       END FUNCTION h5dread_vl_real_c
-    END INTERFACE
-
-    CALL h5dget_space_f(dset_id, tmp, error)
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = tmp
-    file_space_id_default = tmp
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dread_vl_real_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, &
-         buf, dims, len)
-
-  END SUBROUTINE h5dread_vl_real
-
-  SUBROUTINE h5dwrite_vl_string(dset_id, mem_type_id, buf, dims, str_len, &
-       hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(2) :: dims   ! Number of strings
-    INTEGER(SIZE_T), INTENT(IN), DIMENSION(*) :: str_len ! Array to store the length of each element
-    CHARACTER(LEN=*), INTENT(IN), &
-         DIMENSION(dims(2)) :: buf  ! Data buffer
-    INTEGER, INTENT(OUT) :: hdferr  ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T)  :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dwrite_vl_string_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            ! xfer_prp_default, tmp_buf, dims, str_len)
-            xfer_prp_default, buf, dims, str_len)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DWRITE_VL_STRING_C'::h5dwrite_vl_string_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: buf
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(2) :: dims
-         INTEGER(SIZE_T), INTENT(IN), DIMENSION(*) :: str_len
-         CHARACTER(LEN=*), DIMENSION(dims(2)) :: buf
-       END FUNCTION
-    END INTERFACE
-
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dwrite_vl_string_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, &
-         buf, dims, str_len)
-
-  END SUBROUTINE h5dwrite_vl_string
-
-  SUBROUTINE h5dread_vl_string(dset_id, mem_type_id, buf, dims, str_len, &
-                                         hdferr, &
-                                         mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(2) :: dims ! number of strings
-    INTEGER(SIZE_T), INTENT(OUT), DIMENSION(*) :: str_len ! Array to store
-    ! the length of each
-    ! element
-    CHARACTER(LEN=*), INTENT(OUT), &
-         DIMENSION(dims(2)) :: buf      ! Data buffer
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T)  :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dread_vl_string_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims, str_len)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DREAD_VL_STRING_C'::h5dread_vl_string_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: buf
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(2) :: dims
-         INTEGER(SIZE_T), INTENT(OUT), DIMENSION(*) :: str_len
-         CHARACTER(LEN=*), DIMENSION(dims(2)) :: buf
-       END FUNCTION h5dread_vl_string_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dread_vl_string_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, &
-         buf, dims, str_len)
-    RETURN
-  END SUBROUTINE h5dread_vl_string
-
-!
-!****s* H5D/h5dget_space_f
-!
-! NAME
-!  h5dget_space_f
-!
-! PURPOSE
-!  Returns an identifier for a copy of the dataspace for a
-!  dataset.
-!
-! INPUTS
-!  dataset_id 	 - dataset identifier
-! OUTPUTS
-!  dataspace_id  - dataspace identifier
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  February 28, 2001
-!
-! SOURCE
-  SUBROUTINE h5dget_space_f(dataset_id, dataspace_id, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dataset_id      ! Dataset identifier
-    INTEGER(HID_T), INTENT(OUT) :: dataspace_id   ! Dataspace identifier
-    INTEGER, INTENT(OUT) :: hdferr                ! Error code
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5dget_space_c(dataset_id, dataspace_id)
-       USE H5GLOBAL
-       !DEC$IF DEFINED(HDF5F90_WINDOWS)
-       !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DGET_SPACE_C'::h5dget_space_c
-       !DEC$ENDIF
-       INTEGER(HID_T), INTENT(IN) :: dataset_id
-       INTEGER(HID_T), INTENT(OUT) :: dataspace_id
-     END FUNCTION h5dget_space_c
-  END INTERFACE
-
-  hdferr = h5dget_space_c(dataset_id, dataspace_id)
-END SUBROUTINE h5dget_space_f
-
-!****s* H5D/h5dget_access_plist_f
-!
-! NAME
-!  h5dget_access_plist_f
-!
-! PURPOSE
-!  Returns a copy of the dataset creation property list.
-!
-! INPUTS
-!  dset_id       - Dataset identifier
-!
-! OUTPUTS
-!  plist_id	 - Dataset access property list identifier
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR   
-!  M. Scot Breitenfeld
-!  April 13, 2009
-!
-! SOURCE
-SUBROUTINE h5dget_access_plist_f(dset_id, plist_id, hdferr)
-  IMPLICIT NONE
-  INTEGER(HID_T), INTENT(IN)  :: dset_id
-  INTEGER(HID_T), INTENT(OUT) :: plist_id 
-  INTEGER       , INTENT(OUT) :: hdferr  
-!*****
-  INTERFACE
-     INTEGER FUNCTION h5dget_access_plist_c(dset_id, plist_id)
-       USE H5GLOBAL
-       !DEC$IF DEFINED(HDF5F90_WINDOWS)
-       !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DGET_ACCESS_PLIST_C'::h5dget_access_plist_c
-       !DEC$ENDIF
-       INTEGER(HID_T), INTENT(IN) :: dset_id
-       INTEGER(HID_T), INTENT(OUT) :: plist_id
-     END FUNCTION h5dget_access_plist_c
-  END INTERFACE
-  
-  hdferr = h5dget_access_plist_c(dset_id, plist_id)
-  
-END SUBROUTINE h5dget_access_plist_f
-
-END MODULE H5D
-
-
diff --git a/fortran/src/H5Dff_F03.f90 b/fortran/src/H5Dff_F03.f90
deleted file mode 100644
index 7026ae3..0000000
--- a/fortran/src/H5Dff_F03.f90
+++ /dev/null
@@ -1,2389 +0,0 @@
-!****h* ROBODoc/H5D (F03)
-!
-! NAME
-!  H5D_PROVISIONAL
-!
-! PURPOSE
-!  This file contains Fortran 90 and Fortran 2003 interfaces for H5D functions.
-!  It contains the same functions as H5Dff_F90.f90 but includes the
-!  Fortran 2003 functions and the interface listings. This file will be compiled
-!  instead of H5Dff_F90.f90 if Fortran 2003 functions are enabled.
-!
-! COPYRIGHT
-!  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!  Copyright by The HDF Group.                                                 *
-!  Copyright by the Board of Trustees of the University of Illinois.           *
-!  All rights reserved.                                                        *
-!                                                                              *
-!  This file is part of HDF5.  The full HDF5 copyright notice, including       *
-!  terms governing use, modification, and redistribution, is contained in      *
-!  the files COPYING and Copyright.html.  COPYING can be found at the root     *
-!  of the source code distribution tree; Copyright.html can be found at the    *
-!  root level of an installed copy of the electronic HDF5 document set and     *
-!  is linked from the top-level documents page.  It can also be found at       *
-!  http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have            *
-!  access to either file, you may request a copy from help@hdfgroup.org.       *
-!  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! NOTES
-!  (1) The maximum rank of an array allowed in Fortran is 7, therefore
-!  we only provide an interface for arrays up to and including rank 7.
-!
-!  (2) Unfortunately we are using a generic interface and one of the factors
-!  used in determining the proper routine to select is that of the array
-!  rank being passed. Therefore, we can not create just one subroutine for
-!  each array type (integer, real, etc...) and use a
-!  rank 1 array of assumed size to handle multiple ranks, i.e.
-!  (i.e. integer, dimension(*) :: ... )
-!  (i.e. real   , dimension(*) :: ... ) etc...
-!
-!  (3) Could not place the USE, INTRINSIC :: ISO_C_BINDING in the module header because it may
-!  conflict with the USE, INTRINSIC :: ISO_C_BINDING included in the user's program. Moved
-!  the statement instead to each subroutine.
-!
-!
-!  (4) C_LOC and character strings according to the Fortran 2003 standard:
-!
-!  15.1.2.5 C_LOC(X)
-!
-!  Argument. X shall either
-!
-!  (A) have interoperable type and type parameters and be
-!  (a) a variable that has the TARGET attribute and is interoperable,
-!  (b) an allocated allocatable variable that has the TARGET attribute
-!  and is not an array of zero size, or
-!  (c) an associated scalar pointer, or
-!  (B) be a nonpolymorphic scalar, have no length type parameters, and be
-!  (a) a nonallocatable, nonpointer variable that has the TARGET attribute,
-!  (b) an allocated allocatable variable that has the TARGET attribute, or
-!  (c) an associated pointer.
-!
-!   	 - When X is a character, for interoperability the standard is:
-!
-!  15.2.1 Interoperability of intrinsic types
-!
-!  ...if the type is character, interoperability also requires that the length type parameter
-!  be omitted or be specified by an initialization expression whose value is one.
-!
-!  THEREFORE compilers that have not extended the standard require the
-!  argument in C_LOC to be of the variant:
-!
-!  CHARACTER(LEN=1), TARGET :: chr
-!  or
-!  CHARACTER, TARGET :: chr
-!  
-!                         *** IMPORTANT ***
-!  If you add a new H5D function you must add the function name to the
-!  Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
-!  This is needed for Windows based operating systems.
-!
-!*****
-
-MODULE H5D_PROVISIONAL
-  USE H5GLOBAL
-
-  INTERFACE h5dwrite_f
-
-     MODULE PROCEDURE h5dwrite_reference_obj
-     MODULE PROCEDURE h5dwrite_reference_dsetreg
-     MODULE PROCEDURE h5dwrite_integer_scalar
-     MODULE PROCEDURE h5dwrite_integer_1
-     MODULE PROCEDURE h5dwrite_integer_2
-     MODULE PROCEDURE h5dwrite_integer_3
-     MODULE PROCEDURE h5dwrite_integer_4
-     MODULE PROCEDURE h5dwrite_integer_5
-     MODULE PROCEDURE h5dwrite_integer_6
-     MODULE PROCEDURE h5dwrite_integer_7
-     MODULE PROCEDURE h5dwrite_char_scalar
-     MODULE PROCEDURE h5dwrite_char_1
-     MODULE PROCEDURE h5dwrite_char_2
-     MODULE PROCEDURE h5dwrite_char_3
-     MODULE PROCEDURE h5dwrite_char_4
-     MODULE PROCEDURE h5dwrite_char_5
-     MODULE PROCEDURE h5dwrite_char_6
-     MODULE PROCEDURE h5dwrite_char_7
-     MODULE PROCEDURE h5dwrite_real_scalar
-     MODULE PROCEDURE h5dwrite_real_1
-     MODULE PROCEDURE h5dwrite_real_2
-     MODULE PROCEDURE h5dwrite_real_3
-     MODULE PROCEDURE h5dwrite_real_4
-     MODULE PROCEDURE h5dwrite_real_5
-     MODULE PROCEDURE h5dwrite_real_6
-     MODULE PROCEDURE h5dwrite_real_7
-
-     ! This is the preferred way to call h5dwrite
-     ! by passing an address
-     MODULE PROCEDURE h5dwrite_ptr
-
-  END INTERFACE
-
-  INTERFACE h5dread_f
-
-     MODULE PROCEDURE h5dread_reference_obj
-     MODULE PROCEDURE h5dread_reference_dsetreg
-     MODULE PROCEDURE h5dread_integer_scalar
-     MODULE PROCEDURE h5dread_integer_1
-     MODULE PROCEDURE h5dread_integer_2
-     MODULE PROCEDURE h5dread_integer_3
-     MODULE PROCEDURE h5dread_integer_4
-     MODULE PROCEDURE h5dread_integer_5
-     MODULE PROCEDURE h5dread_integer_6
-     MODULE PROCEDURE h5dread_integer_7
-     MODULE PROCEDURE h5dread_char_scalar
-     MODULE PROCEDURE h5dread_char_1
-     MODULE PROCEDURE h5dread_char_2
-     MODULE PROCEDURE h5dread_char_3
-     MODULE PROCEDURE h5dread_char_4
-     MODULE PROCEDURE h5dread_char_5
-     MODULE PROCEDURE h5dread_char_6
-     MODULE PROCEDURE h5dread_char_7
-     MODULE PROCEDURE h5dread_real_scalar
-     MODULE PROCEDURE h5dread_real_1
-     MODULE PROCEDURE h5dread_real_2
-     MODULE PROCEDURE h5dread_real_3
-     MODULE PROCEDURE h5dread_real_4
-     MODULE PROCEDURE h5dread_real_5
-     MODULE PROCEDURE h5dread_real_6
-     MODULE PROCEDURE h5dread_real_7
-
-     ! This is the preferred way to call h5dread
-     ! by passing an address
-     MODULE PROCEDURE h5dread_ptr
-
-  END INTERFACE
-
-!  Interface for the function used to pass the C pointer of the buffer
-!  to the C H5Dwrite routine
-
-  INTERFACE
-     INTEGER FUNCTION h5dwrite_f_c(dset_id, mem_type_id, &
-          mem_space_id_default ,                         &
-          file_space_id_default,                         &
-          xfer_prp_default, buf ) BIND(C, NAME='h5dwrite_f_c')
-       USE H5GLOBAL
-       USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_ptr
-       INTEGER(HID_T), INTENT(IN) :: dset_id
-       INTEGER(HID_T), INTENT(IN) :: mem_type_id
-       INTEGER(HID_T) :: mem_space_id_default
-       INTEGER(HID_T) :: file_space_id_default
-       INTEGER(HID_T) :: xfer_prp_default
-       TYPE(C_PTR), VALUE :: buf
-     END FUNCTION h5dwrite_f_c
-  END INTERFACE
-
-!  Interface for the function used to pass the C pointer of the buffer
-!  to the C H5Dread routine
-
-  INTERFACE
-     INTEGER FUNCTION h5dread_f_c(dset_id, mem_type_id, &
-          mem_space_id_default,                         &
-          file_space_id_default,                        &
-          xfer_prp_default, buf) BIND(C, NAME='h5dread_f_c')
-       USE H5GLOBAL
-       USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_ptr
-       INTEGER(HID_T), INTENT(IN) :: dset_id
-       INTEGER(HID_T), INTENT(IN) :: mem_type_id
-       INTEGER(HID_T) :: mem_space_id_default
-       INTEGER(HID_T) :: file_space_id_default
-       INTEGER(HID_T) :: xfer_prp_default
-       TYPE(C_PTR), VALUE :: buf
-     END FUNCTION h5dread_f_c
-  END INTERFACE
-
-  INTERFACE h5dfill_f
-     MODULE PROCEDURE h5dfill_integer
-     MODULE PROCEDURE h5dfill_real
-     MODULE PROCEDURE h5dfill_char
-  END INTERFACE
-
-!  Interface for the function used to pass the C pointer of the buffer
-!  to the C H5Dfill routine
-
-  INTERFACE
-     INTEGER FUNCTION h5dfill_c(f_ptr_fill_value, fill_type_id, space_id, &
-          f_ptr_buf, mem_type_id) BIND(C, NAME='h5dfill_c')
-       USE H5GLOBAL
-       USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_ptr
-       TYPE(C_PTR), VALUE :: f_ptr_fill_value
-       INTEGER(HID_T) :: fill_type_id ! Fill value datatype identifier
-       INTEGER(HID_T), INTENT(IN) :: space_id ! Memory dataspace selection identifier
-       TYPE(C_PTR), VALUE :: f_ptr_buf
-       INTEGER(HID_T) :: mem_type_id
-     END FUNCTION h5dfill_c
-  END INTERFACE
-
-CONTAINS
-
-  SUBROUTINE h5dwrite_reference_obj(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: dims ! size of the bufffer buf
-    TYPE(hobj_ref_t_f), DIMENSION(dims(1)), INTENT(IN), TARGET :: buf ! Data buffer
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    TYPE(C_PTR) :: f_ptr
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-    f_ptr = C_LOC(buf(1))
-
-    hdferr = h5dwrite_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, f_ptr)
-
-
-  END SUBROUTINE h5dwrite_reference_obj
-
-  SUBROUTINE h5dwrite_reference_dsetreg(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: dims ! size of the bufffer buf
-    TYPE(hdset_reg_ref_t_f), DIMENSION(dims(1)), INTENT(IN), TARGET :: buf ! Data buffer
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    INTEGER, ALLOCATABLE, DIMENSION(:) :: ref_buf
-    INTEGER :: i
-    INTEGER(HSIZE_T) :: j
-    TYPE(C_PTR) :: f_ptr
-    INTERFACE
-       INTEGER FUNCTION h5dwrite_ref_reg_c(dset_id, mem_type_id,&
-            mem_space_id_default, &
-            file_space_id_default, xfer_prp_default, ref_buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DWRITE_REF_REG_C'::h5dwrite_ref_reg_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER, DIMENSION(*) :: ref_buf
-         INTEGER(HSIZE_T), DIMENSION(*) ::  dims
-       END FUNCTION h5dwrite_ref_reg_c
-    END INTERFACE
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-    f_ptr = C_LOC(buf(1))
-
-    ALLOCATE(ref_buf(REF_REG_BUF_LEN*dims(1)), stat=hdferr)
-    IF (hdferr .NE. 0 ) THEN
-       hdferr = -1
-       RETURN
-    ELSE
-       DO j = 1, dims(1)
-          DO i = 1, REF_REG_BUF_LEN
-             ref_buf(REF_REG_BUF_LEN*(j-1) + i) = buf(j)%ref(i)
-          ENDDO
-       ENDDO
-    ENDIF
-    hdferr = h5dwrite_ref_reg_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, ref_buf, dims)
-    DEALLOCATE(ref_buf)
-
-  END SUBROUTINE h5dwrite_reference_dsetreg
-
-
-  SUBROUTINE h5dwrite_integer_scalar(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER, INTENT(IN), TARGET :: buf  ! Data buffer
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    TYPE(C_PTR) :: f_ptr
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-    f_ptr = C_LOC(buf)
-
-    hdferr = h5dwrite_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, f_ptr)
-
-  END SUBROUTINE h5dwrite_integer_scalar
-
-  SUBROUTINE h5dwrite_integer_1(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    INTEGER, INTENT(IN), &
-         DIMENSION(dims(1)), TARGET :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T)  :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    TYPE(C_PTR) :: f_ptr
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-    f_ptr = C_LOC(buf(1))
-
-    hdferr = h5dwrite_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, f_ptr)
-
-  END SUBROUTINE h5dwrite_integer_1
-
-  SUBROUTINE h5dwrite_integer_2(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    INTEGER, INTENT(IN), &
-         DIMENSION(dims(1),dims(2)),TARGET :: buf ! Data buffer
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    TYPE(C_PTR) :: f_ptr
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-    f_ptr = C_LOC(buf(1,1))
-
-    hdferr = h5dwrite_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, f_ptr)
-
-  END SUBROUTINE h5dwrite_integer_2
-
-  SUBROUTINE h5dwrite_integer_3(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    INTEGER, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3)), TARGET :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    TYPE(C_PTR) :: f_ptr
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-    f_ptr = C_LOC(buf(1,1,1))
-
-    hdferr = h5dwrite_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, f_ptr)
-
-  END SUBROUTINE h5dwrite_integer_3
-
-  SUBROUTINE h5dwrite_integer_4(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    INTEGER, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4)), TARGET :: buf
-    INTEGER, INTENT(OUT) :: hdferr            ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    TYPE(C_PTR) :: f_ptr
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-    f_ptr = C_LOC(buf(1,1,1,1))
-
-    hdferr = h5dwrite_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, f_ptr)
-
-  END SUBROUTINE h5dwrite_integer_4
-
-  SUBROUTINE h5dwrite_integer_5(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    INTEGER, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)), TARGET :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T)  :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    TYPE(C_PTR) :: f_ptr
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-    f_ptr = C_LOC(buf(1,1,1,1,1))
-
-    hdferr = h5dwrite_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, f_ptr)
-
-  END SUBROUTINE h5dwrite_integer_5
-
-  SUBROUTINE h5dwrite_integer_6(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    INTEGER, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)), TARGET :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    TYPE(C_PTR) :: f_ptr
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-    f_ptr = C_LOC(buf(1,1,1,1,1,1))
-
-    hdferr = h5dwrite_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, f_ptr)
-
-  END SUBROUTINE h5dwrite_integer_6
-
-  SUBROUTINE h5dwrite_integer_7(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    INTEGER, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)), TARGET :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    TYPE(C_PTR) :: f_ptr
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-    f_ptr = C_LOC(buf(1,1,1,1,1,1,1))
-
-    hdferr = h5dwrite_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, f_ptr)
-
-  END SUBROUTINE h5dwrite_integer_7
-
-  SUBROUTINE h5dwrite_char_scalar(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    CHARACTER(*), INTENT(IN), TARGET :: buf ! Data buffer
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-                                 
-    CALL h5dwrite_char_scalar_fix(dset_id, mem_type_id, buf, LEN(buf), dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-
-  END SUBROUTINE h5dwrite_char_scalar
-
-  SUBROUTINE h5dwrite_char_scalar_fix(dset_id, mem_type_id, buf, buf_len, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    INTEGER, INTENT(IN) :: buf_len
-    CHARACTER(LEN=buf_len), INTENT(IN), TARGET :: buf ! Data buffer
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    TYPE(C_PTR) :: f_ptr
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    f_ptr = C_LOC(buf(1:1))
-
-    hdferr = h5dwrite_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, f_ptr)
-
-  END SUBROUTINE h5dwrite_char_scalar_fix
-
-  SUBROUTINE h5dwrite_char_1(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    CHARACTER(LEN=*), INTENT(IN), DIMENSION(dims(1)), TARGET :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    TYPE(C_PTR) :: f_ptr
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    f_ptr = C_LOC(buf(1)(1:1))
-
-    hdferr = h5dwrite_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, f_ptr)
-
-  END SUBROUTINE h5dwrite_char_1
-
-  SUBROUTINE h5dwrite_char_2(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    CHARACTER(LEN=*), INTENT(IN), &
-         DIMENSION(dims(1),dims(2)), TARGET :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    TYPE(C_PTR) :: f_ptr
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    f_ptr = C_LOC(buf(1,1)(1:1))
-
-    hdferr = h5dwrite_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, f_ptr)
-
-  END SUBROUTINE h5dwrite_char_2
-
-  SUBROUTINE h5dwrite_char_3(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    CHARACTER(LEN=*), INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3)), TARGET :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    TYPE(C_PTR) :: f_ptr
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    f_ptr = C_LOC(buf(1,1,1)(1:1))
-
-    hdferr = h5dwrite_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, f_ptr)
-
-  END SUBROUTINE h5dwrite_char_3
-
-  SUBROUTINE h5dwrite_char_4(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    CHARACTER(LEN=*), INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4)), TARGET :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    TYPE(C_PTR) :: f_ptr
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    f_ptr = C_LOC(buf(1,1,1,1)(1:1))
-
-    hdferr = h5dwrite_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, f_ptr)
-
-  END SUBROUTINE h5dwrite_char_4
-
-  SUBROUTINE h5dwrite_char_5(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    CHARACTER(LEN=*), INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)), TARGET :: buf
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    TYPE(C_PTR) :: f_ptr
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    f_ptr = C_LOC(buf(1,1,1,1,1)(1:1))
-    hdferr = h5dwrite_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, f_ptr)
-
-  END SUBROUTINE h5dwrite_char_5
-
-  SUBROUTINE h5dwrite_char_6(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    CHARACTER(LEN=*), INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)), TARGET :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    TYPE(C_PTR) :: f_ptr
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    f_ptr = C_LOC(buf(1,1,1,1,1,1)(1:1))
-
-    hdferr = h5dwrite_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, f_ptr)
-
-  END SUBROUTINE h5dwrite_char_6
-
-  SUBROUTINE h5dwrite_char_7(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    CHARACTER(LEN=*), INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)), TARGET :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    TYPE(C_PTR) :: f_ptr
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    f_ptr = C_LOC(buf(1,1,1,1,1,1,1)(1:1))
-
-    hdferr = h5dwrite_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, f_ptr)
-
-  END SUBROUTINE h5dwrite_char_7
-
-
-  SUBROUTINE h5dwrite_real_scalar(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    REAL, INTENT(IN), TARGET :: buf ! Data buffer
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    TYPE(C_PTR) :: f_ptr
-
-    xfer_prp_default  = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-    f_ptr = C_LOC(buf)
-
-    hdferr = h5dwrite_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, f_ptr)
-
-  END SUBROUTINE h5dwrite_real_scalar
-
-
-  SUBROUTINE h5dwrite_real_1(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    REAL, INTENT(IN), &
-         DIMENSION(dims(1)), TARGET :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    TYPE(C_PTR) :: f_ptr
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-    f_ptr = C_LOC(buf(1))
-
-    hdferr = h5dwrite_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, f_ptr)
-
-  END SUBROUTINE h5dwrite_real_1
-
-  SUBROUTINE h5dwrite_real_2(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    REAL, INTENT(IN), &
-         DIMENSION(dims(1),dims(2)), TARGET :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    TYPE(C_PTR) :: f_ptr
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-    f_ptr = C_LOC(buf(1,1))
-
-    hdferr = h5dwrite_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, f_ptr)
-
-  END SUBROUTINE h5dwrite_real_2
-
-  SUBROUTINE h5dwrite_real_3(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    REAL, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3)), TARGET :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    TYPE(C_PTR) :: f_ptr
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-    f_ptr = C_LOC(buf(1,1,1))
-
-    hdferr = h5dwrite_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, f_ptr)
-
-  END SUBROUTINE h5dwrite_real_3
-
-  SUBROUTINE h5dwrite_real_4(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    REAL, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4)), TARGET :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    TYPE(C_PTR) :: f_ptr
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-    f_ptr = C_LOC(buf(1,1,1,1))
-
-    hdferr = h5dwrite_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, f_ptr)
-
-  END SUBROUTINE h5dwrite_real_4
-
-  SUBROUTINE h5dwrite_real_5(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    REAL, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)), TARGET :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    TYPE(C_PTR) :: f_ptr
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-    f_ptr = C_LOC(buf(1,1,1,1,1))
-
-    hdferr = h5dwrite_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, f_ptr)
-
-  END SUBROUTINE h5dwrite_real_5
-
-  SUBROUTINE h5dwrite_real_6(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    REAL, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)), TARGET :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    TYPE(C_PTR) :: f_ptr
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-    f_ptr = C_LOC(buf(1,1,1,1,1,1))
-
-    hdferr = h5dwrite_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, f_ptr)
-
-  END SUBROUTINE h5dwrite_real_6
-
-  SUBROUTINE h5dwrite_real_7(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    REAL, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)), TARGET :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    TYPE(C_PTR) :: f_ptr
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-    f_ptr = C_LOC(buf(1,1,1,1,1,1,1))
-
-    hdferr = h5dwrite_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, f_ptr)
-
-  END SUBROUTINE h5dwrite_real_7
-
-!
-! NAME		
-!  h5dread_f
-!
-! PURPOSE
-!  Reads raw data from the specified dataset into buf,
-!  converting from file datatype and dataspace to memory
-!  datatype and dataspace.
-!
-! Inputs:
-!		dset_id		- dataset identifier
-!		mem_type_id	- memory type identifier
-!		dims		- 1-dim array of size 7; dims(k) has the size
-!				- of k-th dimension of the buf array
-! Outputs:
-!		buf		- buffer to read data in
-!		hdferr:		- error code
-!				 	Success:  0
-!				 	Failure: -1
-! Optional parameters:
-!		mem_space_id	- memory dataspace identifier
-!		file_space_id 	- file dataspace identifier
-!		xfer_prp	- trasfer property list identifier
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY 	
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  February 28, 2001
-!
-!  dims parameter was added to make code portable;
-!  n parameter was replaced with dims parameter in
-!  the h5dwrite_reference_obj and h5dwrite_reference_dsetreg
-!  functions.  April 2, 2001
-!
-! NOTES	
-!  This function is overloaded to read INTEGER,
-!  REAL, DOUBLE PRECISION and CHARACTER buffers
-!  up to 7 dimensions, and one dimensional buffers
-!  of the TYPE(hobj_ref_t_f) and TYPE(hdset_reg_ref_t_f)
-!  types.
-!
-  SUBROUTINE h5dread_reference_obj(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    TYPE(hobj_ref_t_f), INTENT(INOUT) , &
-         DIMENSION(dims(1)), TARGET :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    TYPE(C_PTR) :: f_ptr
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-    f_ptr = C_LOC(buf(1))
-
-    hdferr = h5dread_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, f_ptr)
-
-  END SUBROUTINE h5dread_reference_obj
-
-  SUBROUTINE h5dread_reference_dsetreg(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    TYPE(hdset_reg_ref_t_f), INTENT(INOUT), &
-         DIMENSION(dims(1)), TARGET :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTEGER, ALLOCATABLE, DIMENSION(:) :: ref_buf
-    INTEGER :: i
-    INTEGER(HSIZE_T) :: j
-    INTERFACE
-       INTEGER FUNCTION h5dread_ref_reg_c(dset_id, mem_type_id,&
-            mem_space_id_default, &
-            file_space_id_default, xfer_prp_default, ref_buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DREAD_REF_REG_C'::h5dread_ref_reg_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         INTEGER, DIMENSION(*) :: ref_buf
-       END FUNCTION h5dread_ref_reg_c
-    END INTERFACE
-
-    ALLOCATE(ref_buf(REF_REG_BUF_LEN*dims(1)), stat=hdferr)
-    IF (hdferr .NE. 0) THEN
-       hdferr = -1
-       RETURN
-    ENDIF
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dread_ref_reg_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, ref_buf, dims)
-
-    DO j = 1, dims(1)
-       DO i = 1, REF_REG_BUF_LEN
-          buf(j)%ref(i) = ref_buf(REF_REG_BUF_LEN*(j-1) + i)
-       ENDDO
-    ENDDO
-    DEALLOCATE(ref_buf)
-
-  END SUBROUTINE h5dread_reference_dsetreg
-
-
-  SUBROUTINE h5dread_integer_scalar(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    INTEGER, INTENT(INOUT) , TARGET :: buf ! Data buffer
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    TYPE(C_PTR) :: f_ptr
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-    f_ptr = C_LOC(buf)
-
-    hdferr = h5dread_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, f_ptr)
-
-
-  END SUBROUTINE h5dread_integer_scalar
-
-  SUBROUTINE h5dread_integer_1(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    INTEGER, INTENT(INOUT), &
-         DIMENSION(dims(1)) , TARGET :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    TYPE(C_PTR) :: f_ptr
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-    f_ptr = C_LOC(buf(1))
-
-    hdferr = h5dread_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, f_ptr)
-
-  END SUBROUTINE h5dread_integer_1
-
-  SUBROUTINE h5dread_integer_2(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    INTEGER, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2)) , TARGET :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    TYPE(C_PTR) :: f_ptr
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-    f_ptr = C_LOC(buf(1,1))
-
-    hdferr = h5dread_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, f_ptr)
-
-  END SUBROUTINE h5dread_integer_2
-
-  SUBROUTINE h5dread_integer_3(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    INTEGER, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3)) , TARGET :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    TYPE(C_PTR) :: f_ptr
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-    f_ptr = C_LOC(buf(1,1,1))
-
-    hdferr = h5dread_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, f_ptr)
-
-  END SUBROUTINE h5dread_integer_3
-
-  SUBROUTINE h5dread_integer_4(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    INTEGER, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4)) , TARGET :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    TYPE(C_PTR) :: f_ptr
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-    f_ptr = C_LOC(buf(1,1,1,1))
-
-    hdferr = h5dread_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, f_ptr)
-
-  END SUBROUTINE h5dread_integer_4
-
-  SUBROUTINE h5dread_integer_5(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    INTEGER, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) , TARGET :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    TYPE(C_PTR) :: f_ptr
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-    f_ptr = C_LOC(buf(1,1,1,1,1))
-
-    hdferr = h5dread_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, f_ptr)
-
-  END SUBROUTINE h5dread_integer_5
-
-  SUBROUTINE h5dread_integer_6(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    INTEGER, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) , TARGET :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    TYPE(C_PTR) :: f_ptr
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-    f_ptr = C_LOC(buf(1,1,1,1,1,1))
-
-    hdferr = h5dread_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, f_ptr)
-
-  END SUBROUTINE h5dread_integer_6
-
-  SUBROUTINE h5dread_integer_7(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    INTEGER, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) , TARGET :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    TYPE(C_PTR) :: f_ptr
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-    f_ptr = C_LOC(buf(1,1,1,1,1,1,1))
-
-    hdferr = h5dread_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, f_ptr)
-
-  END SUBROUTINE h5dread_integer_7
-
-  SUBROUTINE h5dread_char_scalar(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id         ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id   ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    CHARACTER(LEN=*), INTENT(INOUT) :: buf     ! Data buffer
-    INTEGER, INTENT(OUT) :: hdferr             ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    CALL h5dread_char_scalar_fix(dset_id, mem_type_id, buf, LEN(buf), hdferr, &
-         mem_space_id_default, file_space_id_default, xfer_prp_default)
-
-  END SUBROUTINE h5dread_char_scalar
-
-  SUBROUTINE h5dread_char_scalar_fix(dset_id, mem_type_id, buf, buf_len, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER, INTENT(IN)  :: buf_len
-    CHARACTER(LEN=buf_len), INTENT(INOUT), TARGET :: buf ! Data buffer
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(buf(1:1))
-
-    hdferr = h5dread_f_c(dset_id, mem_type_id, mem_space_id, &
-         file_space_id, xfer_prp, f_ptr)
-
-  END SUBROUTINE h5dread_char_scalar_fix
-
-  SUBROUTINE h5dread_char_1(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    CHARACTER(LEN=*), INTENT(INOUT), &
-         DIMENSION(dims(1)), TARGET :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    TYPE(C_PTR) :: f_ptr
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    f_ptr = C_LOC(buf(1)(1:1))
-    hdferr = h5dread_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, f_ptr)
-
-  END SUBROUTINE h5dread_char_1
-
-  SUBROUTINE h5dread_char_2(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    CHARACTER(LEN=*), INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2)), TARGET :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    TYPE(C_PTR) :: f_ptr
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    f_ptr = C_LOC(buf(1,1)(1:1))
-
-    hdferr = h5dread_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, f_ptr)
-
-  END SUBROUTINE h5dread_char_2
-
-  SUBROUTINE h5dread_char_3(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    CHARACTER(LEN=*), INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3)), TARGET :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    TYPE(C_PTR) :: f_ptr
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    f_ptr = C_LOC(buf(1,1,1)(1:1))
-    hdferr = h5dread_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, f_ptr)
-
-  END SUBROUTINE h5dread_char_3
-
-  SUBROUTINE h5dread_char_4(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    CHARACTER(LEN=*), INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4)), TARGET :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    TYPE(C_PTR) :: f_ptr
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    f_ptr = C_LOC(buf(1,1,1,1)(1:1))
-
-    hdferr = h5dread_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, f_ptr)
-
-  END SUBROUTINE h5dread_char_4
-
-  SUBROUTINE h5dread_char_5(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    CHARACTER(LEN=*), INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)), TARGET :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    TYPE(C_PTR) :: f_ptr
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    f_ptr = C_LOC(buf(1,1,1,1,1)(1:1))
-
-    hdferr = h5dread_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, f_ptr)
-
-  END SUBROUTINE h5dread_char_5
-
-  SUBROUTINE h5dread_char_6(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    CHARACTER(LEN=*), INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)), TARGET :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    TYPE(C_PTR) :: f_ptr
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    f_ptr = C_LOC(buf(1,1,1,1,1,1)(1:1))
-
-    hdferr = h5dread_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, f_ptr)
-
-  END SUBROUTINE h5dread_char_6
-
-  SUBROUTINE h5dread_char_7(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    CHARACTER(LEN=*), INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)), TARGET :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    TYPE(C_PTR) :: f_ptr
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    f_ptr = C_LOC(buf(1,1,1,1,1,1,1)(1:1))
-
-    hdferr = h5dread_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, f_ptr)
-
-  END SUBROUTINE h5dread_char_7
-
-  SUBROUTINE h5dread_real_scalar(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    REAL, INTENT(INOUT) , TARGET :: buf ! Data buffer
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    TYPE(C_PTR) :: f_ptr
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-    f_ptr = C_LOC(buf)
-
-    hdferr = h5dread_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, f_ptr)
-
-  END SUBROUTINE h5dread_real_scalar
-
-  SUBROUTINE h5dread_real_1(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    REAL, INTENT(INOUT), &
-         DIMENSION(dims(1)) , TARGET :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    TYPE(C_PTR) :: f_ptr
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-    f_ptr = C_LOC(buf(1))
-
-    hdferr = h5dread_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, f_ptr)
-
-  END SUBROUTINE h5dread_real_1
-
-  SUBROUTINE h5dread_real_2(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    REAL, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2)) , TARGET :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    TYPE(C_PTR) :: f_ptr
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-    f_ptr = C_LOC(buf(1,1))
-
-    hdferr = h5dread_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, f_ptr)
-
-  END SUBROUTINE h5dread_real_2
-
-  SUBROUTINE h5dread_real_3(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    REAL, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3)) , TARGET :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    TYPE(C_PTR) :: f_ptr
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-    f_ptr = C_LOC(buf(1,1,1))
-
-    hdferr = h5dread_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, f_ptr)
-
-  END SUBROUTINE h5dread_real_3
-
-  SUBROUTINE h5dread_real_4(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    REAL, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3), dims(4)) , TARGET :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    TYPE(C_PTR) :: f_ptr
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-    f_ptr = C_LOC(buf(1,1,1,1))
-
-    hdferr = h5dread_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, f_ptr)
-
-  END SUBROUTINE h5dread_real_4
-
-  SUBROUTINE h5dread_real_5(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    REAL, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) , TARGET :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    TYPE(C_PTR) :: f_ptr
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-    f_ptr = C_LOC(buf(1,1,1,1,1))
-
-    hdferr = h5dread_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, f_ptr)
-
-  END SUBROUTINE h5dread_real_5
-
-  SUBROUTINE h5dread_real_6(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    REAL, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) , TARGET :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    TYPE(C_PTR) :: f_ptr
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-    f_ptr = C_LOC(buf(1,1,1,1,1,1))
-
-    hdferr = h5dread_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, f_ptr)
-
-  END SUBROUTINE h5dread_real_6
-
-  SUBROUTINE h5dread_real_7(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    REAL, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) , TARGET :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    TYPE(C_PTR) :: f_ptr
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id
-    f_ptr = C_LOC(buf(1,1,1,1,1,1,1))
-
-    hdferr = h5dread_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, f_ptr)
-
-  END SUBROUTINE h5dread_real_7
-
-!****s* H5D (F03)/h5dwrite_f_F03
-!
-! NAME		
-!  h5dwrite_f_F03
-!
-! PURPOSE
-!  Writes raw data from a dataset into a buffer. 
-!
-! Inputs:
-!  dset_id	 - Identifier of the dataset to write to.
-!  mem_type_id	 - Identifier of the memory datatype.
-!  buf		 - Buffer with data to be written to the file.
-!  
-! Outputs:
-!  hdferr        - Returns 0 if successful and -1 if fails
-!
-! Optional parameters:
-!  mem_space_id	 - Identifier of the memory dataspace.
-!  file_space_id - Identifier of the dataset's dataspace in the file.
-!  xfer_prp	 - Identifier of a transfer property list for this I/O operation.
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  September 17, 2011
-!
-! Fortran2003 Interface:
-!!  SUBROUTINE h5dwrite_f(dset_id, mem_type_id, buf, hdferr, &
-!!                        mem_space_id, file_space_id, xfer_prp)
-!!    INTEGER(HID_T), INTENT(IN)              :: dset_id
-!!    INTEGER(HID_T), INTENT(IN)              :: mem_type_id
-!!    TYPE(C_PTR)   , INTENT(IN)              :: buf
-!!    INTEGER       , INTENT(OUT)             :: hdferr
-!!    INTEGER(HID_T), INTENT(IN)   , OPTIONAL :: mem_space_id
-!!    INTEGER(HID_T), INTENT(IN)   , OPTIONAL :: file_space_id
-!!    INTEGER(HID_T), INTENT(IN)   , OPTIONAL :: xfer_prp
-!*****
-  SUBROUTINE h5dwrite_ptr(dset_id, mem_type_id, buf, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    TYPE(C_PTR), INTENT(IN) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dwrite_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf)
-
-  END SUBROUTINE h5dwrite_ptr
-!****s* H5D (F03)/h5dread_f_F03
-!
-! NAME		
-!  h5dread_f_F03
-!
-! PURPOSE
-!  Reads raw data from a dataset into a buffer. 
-!
-! Inputs:
-!  dset_id	 - Identifier of the dataset read from.
-!  mem_type_id	 - Identifier of the memory datatype.
-!  
-! Outputs:
-!  buf		 - Buffer to receive data read from file.
-!  hdferr        - Returns 0 if successful and -1 if fails
-!
-! Optional parameters:
-!  mem_space_id	 - Identifier of the memory dataspace.
-!  file_space_id - Identifier of the dataset's dataspace in the file.
-!  xfer_prp	 - Identifier of a transfer property list for this I/O operation.
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  September 17, 2011
-!
-! Fortran2003 Interface:
-!!  SUBROUTINE h5dread_f(dset_id, mem_type_id, buf, hdferr, &
-!!                       mem_space_id, file_space_id, xfer_prp)
-!!    INTEGER(HID_T), INTENT(IN)              :: dset_id
-!!    INTEGER(HID_T), INTENT(IN)              :: mem_type_id
-!!    TYPE(C_PTR)   , INTENT(INOUT)           :: buf
-!!    INTEGER       , INTENT(OUT)             :: hdferr
-!!    INTEGER(HID_T), INTENT(IN)   , OPTIONAL :: mem_space_id
-!!    INTEGER(HID_T), INTENT(IN)   , OPTIONAL :: file_space_id
-!!    INTEGER(HID_T), INTENT(IN)   , OPTIONAL :: xfer_prp
-!*****
-  SUBROUTINE h5dread_ptr(dset_id, mem_type_id, buf, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    TYPE(C_PTR), INTENT(INOUT) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dread_f_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf)
-
-  END SUBROUTINE h5dread_ptr
-
-!
-! NAME		
-!  h5dfill_integer
-!
-! PURPOSE 
-!  Fills dataspace elements with a fill value in a memory buffer.
-!  Only INTEGER, CHARACTER, REAL and DOUBLE PRECISION datatypes
-!  of the fillvalues and buffers are supported. Buffer and fillvalue
-!  are assumed to have the same datatype.
-!  Only one-dimesional buffers are supported.
-!
-! Inputs:
-!		fill_value	- fill value
-!		space_id	- memory space selection identifier
-!		buf		- data buffer iin memory ro apply selection to
-!				- of k-th dimension of the buf array
-! Outputs:
-!		hdferr:		- error code
-!				 	Success:  0
-!				 	Failure: -1
-! AUTHOR
-!  Elena Pourmal
-!  March 12, 2003
-!
-!
-
-  SUBROUTINE h5dfill_integer(fill_value, space_id, buf,  hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER, INTENT(IN), TARGET :: fill_value  ! Fill value
-    INTEGER(HID_T), INTENT(IN) :: space_id ! Memory dataspace selection identifier
-    INTEGER, INTENT(IN), DIMENSION(*), TARGET :: buf ! Memory buffer to fill in
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-
-    INTEGER(HID_T) :: fill_type_id ! Fill value datatype identifier
-    INTEGER(HID_T) :: mem_type_id  ! Buffer dadtype identifier
-
-    TYPE(C_PTR) :: f_ptr_fill_value ! C pointer to fill_value
-    TYPE(C_PTR) :: f_ptr_buf        ! C pointer to buf
-
-    f_ptr_fill_value = C_LOC(fill_value)
-    f_ptr_buf = C_LOC(buf(1))
-
-    fill_type_id = H5T_NATIVE_INTEGER
-    mem_type_id  = H5T_NATIVE_INTEGER
-
-    hdferr = h5dfill_c(f_ptr_fill_value, fill_type_id, space_id, &
-         f_ptr_buf, mem_type_id)
-
-  END SUBROUTINE h5dfill_integer
-
-!
-! NAME
-!  h5dfill_real
-!
-! PURPOSE
-!  Fills dataspace elements with a fill value in a memory buffer.
-!  Only INTEGER, CHARACTER, REAL and DOUBLE PRECISION datatypes
-!  of the fillvalues and buffers are supported. Buffer and fillvalue
-!  are assumed to have the same datatype.
-!  Only one-dimesional buffers are supported.
-!
-! Inputs:
-!		fill_value	- fill value
-!		space_id	- memory space selection identifier
-!		buf		- data buffer iin memory ro apply selection to
-!				- of k-th dimension of the buf array
-! Outputs:
-!		hdferr:		- error code
-!				 	Success:  0
-!				 	Failure: -1
-!
-! AUTHOR
-!  Elena Pourmal
-!  March 12, 2003
-!
-  SUBROUTINE h5dfill_real(fill_valuer, space_id, buf,  hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    REAL, INTENT(IN), TARGET :: fill_valuer  ! Fill value
-    INTEGER(HID_T), INTENT(IN) :: space_id ! Memory dataspace selection identifier
-    REAL, INTENT(IN), DIMENSION(*), TARGET :: buf ! Memory buffer to fill in
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-
-    INTEGER(HID_T) :: fill_type_id ! Fill value datatype identifier
-    INTEGER(HID_T) :: mem_type_id !  Buffer dadtype identifier
-
-    TYPE(C_PTR) :: f_ptr_fill_valuer ! C pointer to fill_value
-    TYPE(C_PTR) :: f_ptr_buf ! C pointer to buf
-
-    f_ptr_fill_valuer = C_LOC(fill_valuer)
-    f_ptr_buf = C_LOC(buf(1))
-
-    fill_type_id = H5T_NATIVE_REAL
-    mem_type_id  = H5T_NATIVE_REAL
-
-    hdferr = h5dfill_c(f_ptr_fill_valuer, fill_type_id, space_id, &
-         f_ptr_buf, mem_type_id)
-
-  END SUBROUTINE h5dfill_real
-
-!
-! NAME		
-!  h5dfill_char
-!
-! PURPOSE 
-!  Fills dataspace elements with a fill value in a memory buffer.
-!  Only INTEGER, CHARACTER, REAL and DOUBLE PRECISION datatypes
-!  of the fillvalues and buffers are supported. Buffer and fillvalue
-!  are assumed to have the same datatype.
-!  Only one-dimesional buffers are supported.
-!
-! Inputs:
-!		fill_value	- fill value
-!		space_id	- memory space selection identifier
-!		buf		- data buffer iin memory ro apply selection to
-!				- of k-th dimension of the buf array
-! Outputs:
-!		hdferr:		- error code
-!				 	Success:  0
-!				 	Failure: -1
-! AUTHOR
-!  Elena Pourmal
-!  March 12, 2003
-!
-  SUBROUTINE h5dfill_char(fill_value, space_id, buf,  hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    CHARACTER, INTENT(IN), TARGET :: fill_value  ! Fill value
-    INTEGER(HID_T), INTENT(IN) :: space_id ! Memory dataspace selection identifier
-    CHARACTER, INTENT(IN), DIMENSION(*), TARGET :: buf ! Memory buffer to fill in
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-
-    INTEGER(HID_T) :: fill_type_id ! Fill value datatype identifier
-    INTEGER(HID_T) :: mem_type_id !  Buffer dadtype identifier
-
-    TYPE(C_PTR) :: f_ptr_fill_value ! C pointer to fill_value
-    TYPE(C_PTR) :: f_ptr_buf ! C pointer to buf
-
-    f_ptr_fill_value = C_LOC(fill_value)
-    f_ptr_buf = C_LOC(buf(1))
-
-    hdferr = h5dfill_c(f_ptr_fill_value, fill_type_id, space_id, &
-         f_ptr_buf, mem_type_id)
-
-  END SUBROUTINE h5dfill_char
-!
-!****s* H5D (F03)/h5dvlen_reclaim_f
-! NAME
-!  h5dvlen_reclaim_f
-!
-! PURPOSE 
-!  Reclaims VL datatype memory buffers. 
-!
-! Inputs:
-!
-!  type_id  - Identifier of the datatype. 
-!  space_id - Identifier of the dataspace. 
-!  plist_id - Identifier of the property list used to create the buffer. 
-!  buf      - Pointer to the buffer to be reclaimed. 
-!
-! Outputs:
-!  hdferr   - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-! M. Scot Breitenfeld
-! January 11, 2011
-!
-! Fortran2003 Interface:
-  SUBROUTINE h5dvlen_reclaim_f(type_id, space_id, plist_id, buf, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN)    :: type_id
-    INTEGER(HID_T), INTENT(IN)    :: space_id
-    INTEGER(HID_T), INTENT(IN)    :: plist_id
-    TYPE(C_PTR)   , INTENT(INOUT) :: buf
-    INTEGER       , INTENT(OUT)   :: hdferr
-!*****
-
-    INTERFACE
-       INTEGER FUNCTION h5dvlen_reclaim_c(type_id, space_id, plist_id, buf) BIND(C, NAME='h5dvlen_reclaim_c')
-         USE H5GLOBAL
-         USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
-         INTEGER(HID_T) :: type_id
-         INTEGER(HID_T) :: space_id
-         INTEGER(HID_T) :: plist_id
-         TYPE(C_PTR), VALUE :: buf
-       END FUNCTION h5dvlen_reclaim_c
-    END INTERFACE
-
-    hdferr = H5Dvlen_reclaim_c(type_id, space_id, plist_id, buf)
-
-  END SUBROUTINE H5Dvlen_reclaim_f
-
-END MODULE H5D_PROVISIONAL
-
-
diff --git a/fortran/src/H5Dff_F90.f90 b/fortran/src/H5Dff_F90.f90
deleted file mode 100644
index 66cfe62..0000000
--- a/fortran/src/H5Dff_F90.f90
+++ /dev/null
@@ -1,3004 +0,0 @@
-!****h* ROBODoc/H5D (F90)
-!
-! NAME
-!
-!  H5D_PROVISIONAL
-!
-! PURPOSE
-!
-!  This file contains Fortran 90 interfaces for H5D functions. It contains
-!  the same functions as H5Dff_F03.f90 but excludes the Fortran 2003 functions
-!  and the interface listings. This file will be compiled instead of H5Dff_F03.f90
-!  if Fortran 2003 functions are not enabled.
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! NOTES
-!  (1) The maximum rank of an array allowed in Fortran is 7, therefore
-!  we only provide an interface for arrays up to and including rank 7.
-!
-!  (2) Unfortunately we are using a generic interface and one of the factors
-!  used in determining the proper routine to select is that of the array
-!  rank being passed, therefore we can not create just one subroutine for
-!  each array type (integer, real, etc...) of various ranks and then use a
-!  rank 1 array of assumed size in the just one subroutine,
-!  (i.e. integer, dimension(*) :: ... )
-!  (i.e. real   , dimension(*) :: ... ) etc...
-!
-!  (3)
-!                         *** IMPORTANT ***
-!  If you add a new H5D function you must add the function name to the
-!  Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
-!  This is needed for Windows based operating systems.
-!*****
-
-MODULE H5D_PROVISIONAL
-  USE H5GLOBAL
-
-  INTERFACE h5dwrite_f
-
-     MODULE PROCEDURE h5dwrite_reference_obj
-     MODULE PROCEDURE h5dwrite_reference_dsetreg
-     MODULE PROCEDURE h5dwrite_integer_scalar
-     MODULE PROCEDURE h5dwrite_integer_1
-     MODULE PROCEDURE h5dwrite_integer_2
-     MODULE PROCEDURE h5dwrite_integer_3
-     MODULE PROCEDURE h5dwrite_integer_4
-     MODULE PROCEDURE h5dwrite_integer_5
-     MODULE PROCEDURE h5dwrite_integer_6
-     MODULE PROCEDURE h5dwrite_integer_7
-     MODULE PROCEDURE h5dwrite_char_scalar
-     MODULE PROCEDURE h5dwrite_char_1
-     MODULE PROCEDURE h5dwrite_char_2
-     MODULE PROCEDURE h5dwrite_char_3
-     MODULE PROCEDURE h5dwrite_char_4
-     MODULE PROCEDURE h5dwrite_char_5
-     MODULE PROCEDURE h5dwrite_char_6
-     MODULE PROCEDURE h5dwrite_char_7
-     MODULE PROCEDURE h5dwrite_real_scalar
-     MODULE PROCEDURE h5dwrite_real_1
-     MODULE PROCEDURE h5dwrite_real_2
-     MODULE PROCEDURE h5dwrite_real_3
-     MODULE PROCEDURE h5dwrite_real_4
-     MODULE PROCEDURE h5dwrite_real_5
-     MODULE PROCEDURE h5dwrite_real_6
-     MODULE PROCEDURE h5dwrite_real_7
-
-  END INTERFACE
-
-  INTERFACE h5dread_f
-
-     MODULE PROCEDURE h5dread_reference_obj
-     MODULE PROCEDURE h5dread_reference_dsetreg
-     MODULE PROCEDURE h5dread_integer_scalar
-     MODULE PROCEDURE h5dread_integer_1
-     MODULE PROCEDURE h5dread_integer_2
-     MODULE PROCEDURE h5dread_integer_3
-     MODULE PROCEDURE h5dread_integer_4
-     MODULE PROCEDURE h5dread_integer_5
-     MODULE PROCEDURE h5dread_integer_6
-     MODULE PROCEDURE h5dread_integer_7
-     MODULE PROCEDURE h5dread_char_scalar
-     MODULE PROCEDURE h5dread_char_1
-     MODULE PROCEDURE h5dread_char_2
-     MODULE PROCEDURE h5dread_char_3
-     MODULE PROCEDURE h5dread_char_4
-     MODULE PROCEDURE h5dread_char_5
-     MODULE PROCEDURE h5dread_char_6
-     MODULE PROCEDURE h5dread_char_7
-     MODULE PROCEDURE h5dread_real_scalar
-     MODULE PROCEDURE h5dread_real_1
-     MODULE PROCEDURE h5dread_real_2
-     MODULE PROCEDURE h5dread_real_3
-     MODULE PROCEDURE h5dread_real_4
-     MODULE PROCEDURE h5dread_real_5
-     MODULE PROCEDURE h5dread_real_6
-     MODULE PROCEDURE h5dread_real_7
-  END INTERFACE
-
-  INTERFACE h5dfill_f
-     MODULE PROCEDURE h5dfill_integer
-     MODULE PROCEDURE h5dfill_real
-     MODULE PROCEDURE h5dfill_char
-  END INTERFACE
-
-CONTAINS
-
-!****s* H5D/h5dread_f
-!
-! NAME
-!  h5dread_f
-!
-! PURPOSE
-!  Reads raw data from the specified dataset into buf,
-!  converting from file datatype and dataspace to memory
-!  datatype and dataspace.
-!
-! INPUTS
-!  dset_id 	 - dataset identifier
-!  mem_type_id 	 - memory type identifier
-!  dims 	 - 1-dim array of size 7; dims(k) has the size
-!   	           of k-th dimension of the buf array
-! OUTPUTS
-!  buf 	   - buffer to read data in
-!  hdferr: - error code
-!             Success:  0
-!             Failure: -1
-!
-! OPTIONAL PARAMETERS
-!  mem_space_id  - memory dataspace identifier
-!  file_space_id - file dataspace identifier
-!  xfer_prp 	 - trasfer property list identifier
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  February 28, 2001
-!
-!  dims parameter was added to make code portable;
-!  n parameter was replaced with dims parameter in
-!  the h5dwrite_reference_obj and h5dwrite_reference_dsetreg
-!  functions.  April 2, 2001
-!
-! NOTES
-!  This function is overloaded to read INTEGER,
-!  REAL, DOUBLE PRECISION and CHARACTER buffers
-!  up to 7 dimensions, and one dimensional buffers
-!  of the TYPE(hobj_ref_t_f) and TYPE(hdset_reg_ref_t_f) types.
-!*****
-  SUBROUTINE h5dread_reference_obj(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    TYPE(hobj_ref_t_f), INTENT(INOUT) , &
-         DIMENSION(dims(1)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T)  :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    INTEGER(HADDR_T), ALLOCATABLE, DIMENSION(:) :: ref_buf
-    INTEGER(HSIZE_T) :: j
-
-    INTERFACE
-       INTEGER FUNCTION h5dread_ref_obj_c(dset_id, mem_type_id,&
-            mem_space_id_default, &
-            file_space_id_default, xfer_prp_default, ref_buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DREAD_REF_OBJ_C'::h5dread_ref_obj_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         INTEGER(HADDR_T), DIMENSION(*) :: ref_buf
-       END FUNCTION h5dread_ref_obj_c
-    END INTERFACE
-
-    ALLOCATE(ref_buf(dims(1)), stat=hdferr)
-    IF (hdferr .NE. 0) THEN
-       hdferr = -1
-       RETURN
-    ENDIF
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dread_ref_obj_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, ref_buf, dims)
-    DO j = 1, dims(1)
-       buf(j)%ref = ref_buf(j)
-    ENDDO
-    DEALLOCATE(ref_buf)
-  END SUBROUTINE h5dread_reference_obj
-
-  SUBROUTINE h5dread_reference_dsetreg(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    TYPE(hdset_reg_ref_t_f), INTENT(INOUT), &
-         DIMENSION(dims(1)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T)  :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    INTEGER, ALLOCATABLE, DIMENSION(:) :: ref_buf
-    INTEGER :: i
-    INTEGER(HSIZE_T) :: j
-
-    INTERFACE
-       INTEGER FUNCTION h5dread_ref_reg_c(dset_id, mem_type_id,&
-            mem_space_id_default, &
-            file_space_id_default, xfer_prp_default, ref_buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DREAD_REF_REG_C'::h5dread_ref_reg_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         INTEGER, DIMENSION(*) :: ref_buf
-       END FUNCTION h5dread_ref_reg_c
-    END INTERFACE
-
-    ALLOCATE(ref_buf(REF_REG_BUF_LEN*dims(1)), stat=hdferr)
-    IF (hdferr .NE. 0) THEN
-       hdferr = -1
-       RETURN
-    ENDIF
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dread_ref_reg_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, ref_buf, dims)
-
-    DO j = 1, dims(1)
-       DO i = 1, REF_REG_BUF_LEN
-          buf(j)%ref(i) = ref_buf(REF_REG_BUF_LEN*(j-1) + i)
-       ENDDO
-    ENDDO
-    DEALLOCATE(ref_buf)
-  END SUBROUTINE h5dread_reference_dsetreg
-
-  SUBROUTINE h5dread_integer_scalar(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    INTEGER, INTENT(INOUT) :: buf ! Data buffer
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T)  :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dread_integer_s_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DREAD_INTEGER_S_C'::h5dread_integer_s_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         INTEGER, INTENT(OUT) :: buf
-       END FUNCTION h5dread_integer_s_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dread_integer_s_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dread_integer_scalar
-
-  SUBROUTINE h5dread_integer_1(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    INTEGER, INTENT(INOUT), DIMENSION(dims(1)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T)  :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dread_integer_1_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DREAD_INTEGER_1_C'::h5dread_integer_1_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         INTEGER, INTENT(OUT), DIMENSION(dims(1)) :: buf
-       END FUNCTION h5dread_integer_1_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dread_integer_1_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dread_integer_1
-
-  SUBROUTINE h5dread_integer_2(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    INTEGER, INTENT(INOUT), DIMENSION(dims(1),dims(2)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T)  :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dread_integer_2_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DREAD_INTEGER_2_C'::h5dread_integer_2_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         INTEGER, INTENT(OUT), DIMENSION(dims(1),dims(2)) :: buf
-       END FUNCTION h5dread_integer_2_c
-    END INTERFACE
-
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dread_integer_2_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, &
-         buf, dims)
-
-  END SUBROUTINE h5dread_integer_2
-
-  SUBROUTINE h5dread_integer_3(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    INTEGER, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T)  :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    !
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5dread_integer_3_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DREAD_INTEGER_3_C'::h5dread_integer_3_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         INTEGER, INTENT(OUT), DIMENSION(dims(1),dims(2),dims(3)) :: buf
-       END FUNCTION h5dread_integer_3_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dread_integer_3_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, &
-         buf, dims)
-
-  END SUBROUTINE h5dread_integer_3
-
-  SUBROUTINE h5dread_integer_4(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    INTEGER, INTENT(INOUT), DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T)  :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    !
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5dread_integer_4_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DREAD_INTEGER_4_C'::h5dread_integer_4_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         INTEGER, INTENT(OUT), DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-       END FUNCTION h5dread_integer_4_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dread_integer_4_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, &
-         buf, dims)
-
-  END SUBROUTINE h5dread_integer_4
-
-  SUBROUTINE h5dread_integer_5(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    INTEGER, INTENT(INOUT), DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T)  :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    !
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5dread_integer_5_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DREAD_INTEGER_5_C'::h5dread_integer_5_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         INTEGER, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-       END FUNCTION h5dread_integer_5_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dread_integer_5_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, &
-         buf, dims)
-
-  END SUBROUTINE h5dread_integer_5
-
-  SUBROUTINE h5dread_integer_6(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    INTEGER, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T)  :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-
-    INTERFACE
-       INTEGER FUNCTION h5dread_integer_6_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DREAD_INTEGER_6_C'::h5dread_integer_6_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         INTEGER, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-       END FUNCTION h5dread_integer_6_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dread_integer_6_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, &
-         buf, dims)
-
-  END SUBROUTINE h5dread_integer_6
-
-  SUBROUTINE h5dread_integer_7(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    INTEGER, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T)  :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dread_integer_7_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DREAD_INTEGER_7_C'::h5dread_integer_7_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         INTEGER, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-       END FUNCTION h5dread_integer_7_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dread_integer_7_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, &
-         buf, dims)
-
-  END SUBROUTINE h5dread_integer_7
-
-  SUBROUTINE h5dread_char_scalar(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    CHARACTER(LEN=*), INTENT(INOUT) :: buf ! Data buffer
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dreadc_s_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DREADC_S_C'::h5dreadc_s_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: buf
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         CHARACTER(LEN=*), INTENT(OUT) :: buf
-       END FUNCTION h5dreadc_s_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dreadc_s_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dread_char_scalar
-
-  SUBROUTINE h5dread_char_1(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    CHARACTER(LEN=*), INTENT(INOUT), &
-         DIMENSION(dims(1)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dreadc_1_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DREADC_1_C'::h5dreadc_1_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: buf
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         CHARACTER(LEN=*), INTENT(INOUT), &
-              DIMENSION(dims(1)) :: buf
-       END FUNCTION h5dreadc_1_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dreadc_1_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dread_char_1
-
-  SUBROUTINE h5dread_char_2(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    CHARACTER(LEN=*), INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-
-    INTERFACE
-       INTEGER FUNCTION h5dreadc_2_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DREADC_2_C'::h5dreadc_2_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: buf
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         CHARACTER(LEN=*), INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2)) :: buf
-       END FUNCTION h5dreadc_2_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dreadc_2_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dread_char_2
-
-  SUBROUTINE h5dread_char_3(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    CHARACTER(LEN=*), INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dreadc_3_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DREADC_3_C'::h5dreadc_3_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: buf
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         CHARACTER(LEN=*), INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3)) :: buf
-       END FUNCTION h5dreadc_3_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dreadc_3_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dread_char_3
-
-  SUBROUTINE h5dread_char_4(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    CHARACTER(LEN=*), INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dreadc_4_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DREADC_4_C'::h5dreadc_4_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: buf
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         CHARACTER(LEN=*), INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-       END FUNCTION h5dreadc_4_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dreadc_4_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dread_char_4
-
-  SUBROUTINE h5dread_char_5(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    CHARACTER(LEN=*), INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dreadc_5_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DREADC_5_C'::h5dreadc_5_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: buf
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         CHARACTER(LEN=*), INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-       END FUNCTION h5dreadc_5_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dreadc_5_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dread_char_5
-
-  SUBROUTINE h5dread_char_6(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    CHARACTER(LEN=*), INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dreadc_6_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DREADC_6_C'::h5dreadc_6_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: buf
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         CHARACTER(LEN=*), INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-       END FUNCTION h5dreadc_6_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dreadc_6_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dread_char_6
-
-  SUBROUTINE h5dread_char_7(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    CHARACTER(LEN=*), INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dreadc_7_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DREADC_7_C'::h5dreadc_7_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: buf
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         CHARACTER(LEN=*), INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-       END FUNCTION h5dreadc_7_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dreadc_7_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dread_char_7
-
-  SUBROUTINE h5dread_real_scalar(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    REAL, INTENT(INOUT) :: buf ! Data buffer
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dread_real_s_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DREAD_REAL_S_C'::h5dread_real_s_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         REAL, INTENT(OUT) :: buf
-       END FUNCTION h5dread_real_s_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dread_real_s_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dread_real_scalar
-
-  SUBROUTINE h5dread_real_1(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    REAL, INTENT(INOUT), &
-         DIMENSION(dims(1)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    !            INTEGER, EXTERNAL :: h5dread_real_1_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5dread_real_1_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DREAD_REAL_1_C'::h5dread_real_1_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         REAL, INTENT(INOUT), &
-              DIMENSION(dims(1)) :: buf
-       END FUNCTION h5dread_real_1_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dread_real_1_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dread_real_1
-
-  SUBROUTINE h5dread_real_2(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    REAL, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dread_real_2_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DREAD_REAL_2_C'::h5dread_real_2_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         REAL, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2)) :: buf
-       END FUNCTION h5dread_real_2_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dread_real_2_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dread_real_2
-
-  SUBROUTINE h5dread_real_3(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    REAL, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dread_real_3_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DREAD_REAL_3_C'::h5dread_real_3_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         REAL, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3)) :: buf
-       END FUNCTION h5dread_real_3_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dread_real_3_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dread_real_3
-
-  SUBROUTINE h5dread_real_4(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    REAL, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3), dims(4)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dread_real_4_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DREAD_REAL_4_C'::h5dread_real_4_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         REAL, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3), dims(4)) :: buf
-       END FUNCTION h5dread_real_4_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dread_real_4_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dread_real_4
-
-  SUBROUTINE h5dread_real_5(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    REAL, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dread_real_5_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DREAD_REAL_5_C'::h5dread_real_5_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         REAL, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-       END FUNCTION h5dread_real_5_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dread_real_5_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dread_real_5
-
-  SUBROUTINE h5dread_real_6(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    REAL, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dread_real_6_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DREAD_REAL_6_C'::h5dread_real_6_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         REAL, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-       END FUNCTION h5dread_real_6_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dread_real_6_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dread_real_6
-
-  SUBROUTINE h5dread_real_7(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    REAL, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dread_real_7_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DREAD_REAL_7_C'::h5dread_real_7_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         REAL, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-       END FUNCTION h5dread_real_7_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dread_real_7_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dread_real_7
-
-  SUBROUTINE h5dwrite_reference_obj(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: dims ! size of the bufffer buf
-    TYPE(hobj_ref_t_f), DIMENSION(dims(1)), INTENT(IN) :: buf ! Data buffer
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T)  :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    INTEGER(HADDR_T), ALLOCATABLE, DIMENSION(:) :: ref_buf
-    INTEGER(HSIZE_T) :: j
-
-    INTERFACE
-       INTEGER FUNCTION h5dwrite_ref_obj_c(dset_id, mem_type_id,&
-            mem_space_id_default, &
-            file_space_id_default, xfer_prp_default, ref_buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DWRITE_REF_OBJ_C'::h5dwrite_ref_obj_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HADDR_T), DIMENSION(*) :: ref_buf
-         INTEGER(HSIZE_T), DIMENSION(*) :: dims
-       END FUNCTION h5dwrite_ref_obj_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    ALLOCATE(ref_buf(dims(1)), stat=hdferr)
-    IF (hdferr .NE. 0 ) THEN
-       hdferr = -1
-       RETURN
-    ELSE
-       DO j = 1, dims(1)
-          ref_buf(j) = buf(j)%ref
-       ENDDO
-    ENDIF
-    hdferr = h5dwrite_ref_obj_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, ref_buf, dims(1))
-    DEALLOCATE(ref_buf)
-
-  END SUBROUTINE h5dwrite_reference_obj
-
-  SUBROUTINE h5dwrite_reference_dsetreg(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: dims ! size of the bufffer buf
-    TYPE(hdset_reg_ref_t_f), DIMENSION(dims(1)), INTENT(IN) :: buf ! Data buffer
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T)  :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    INTEGER, ALLOCATABLE, DIMENSION(:) :: ref_buf
-    INTEGER :: i
-    INTEGER(HSIZE_T) :: j
-
-    INTERFACE
-       INTEGER FUNCTION h5dwrite_ref_reg_c(dset_id, mem_type_id,&
-            mem_space_id_default, &
-            file_space_id_default, xfer_prp_default, ref_buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DWRITE_REF_REG_C'::h5dwrite_ref_reg_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER, DIMENSION(*) :: ref_buf
-         INTEGER(HSIZE_T), DIMENSION(*) ::  dims
-       END FUNCTION h5dwrite_ref_reg_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    ALLOCATE(ref_buf(REF_REG_BUF_LEN*dims(1)), stat=hdferr)
-    IF (hdferr .NE. 0 ) THEN
-       hdferr = -1
-       RETURN
-    ELSE
-       DO j = 1, dims(1)
-          DO i = 1, REF_REG_BUF_LEN
-             ref_buf(REF_REG_BUF_LEN*(j-1) + i) = buf(j)%ref(i)
-          ENDDO
-       ENDDO
-    ENDIF
-    hdferr = h5dwrite_ref_reg_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, ref_buf, dims)
-    DEALLOCATE(ref_buf)
-
-  END SUBROUTINE h5dwrite_reference_dsetreg
-
-  SUBROUTINE h5dwrite_integer_scalar(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER, INTENT(IN) :: buf ! Data buffer
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T)  :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dwrite_integer_s_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DWRITE_INTEGER_S_C'::h5dwrite_integer_s_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         INTEGER, INTENT(IN) :: buf
-       END FUNCTION h5dwrite_integer_s_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dwrite_integer_s_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dwrite_integer_scalar
-
-  SUBROUTINE h5dwrite_integer_1(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    INTEGER, INTENT(IN), &
-         DIMENSION(dims(1)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T)  :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dwrite_integer_1_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DWRITE_INTEGER_1_C'::h5dwrite_integer_1_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         INTEGER, INTENT(IN), &
-              DIMENSION(dims(1)) :: buf
-       END FUNCTION h5dwrite_integer_1_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dwrite_integer_1_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dwrite_integer_1
-
-  SUBROUTINE h5dwrite_integer_2(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    INTEGER, INTENT(IN), &
-         DIMENSION(dims(1),dims(2)) :: buf   ! Data buffer
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T)  :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dwrite_integer_2_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DWRITE_INTEGER_2_C'::h5dwrite_integer_2_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         INTEGER, INTENT(IN), &
-              DIMENSION(dims(1),dims(2)) :: buf
-       END FUNCTION h5dwrite_integer_2_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-    hdferr = h5dwrite_integer_2_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, &
-         buf, dims)
-
-  END SUBROUTINE h5dwrite_integer_2
-
-  SUBROUTINE h5dwrite_integer_3(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    INTEGER, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T)  :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dwrite_integer_3_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DWRITE_INTEGER_3_C'::h5dwrite_integer_3_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         INTEGER, INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3)) :: buf
-       END FUNCTION h5dwrite_integer_3_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dwrite_integer_3_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, &
-         buf, dims)
-
-  END SUBROUTINE h5dwrite_integer_3
-
-  SUBROUTINE h5dwrite_integer_4(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    INTEGER, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T)  :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dwrite_integer_4_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DWRITE_INTEGER_4_C'::h5dwrite_integer_4_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         INTEGER, INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-       END FUNCTION h5dwrite_integer_4_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dwrite_integer_4_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, &
-         buf, dims)
-
-  END SUBROUTINE h5dwrite_integer_4
-
-  SUBROUTINE h5dwrite_integer_5(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    INTEGER, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T)  :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dwrite_integer_5_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DWRITE_INTEGER_5_C'::h5dwrite_integer_5_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         INTEGER, INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-       END FUNCTION h5dwrite_integer_5_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dwrite_integer_5_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, &
-         buf, dims)
-
-  END SUBROUTINE h5dwrite_integer_5
-
-  SUBROUTINE h5dwrite_integer_6(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    INTEGER, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T)  :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dwrite_integer_6_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DWRITE_INTEGER_6_C'::h5dwrite_integer_6_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         INTEGER, INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-       END FUNCTION h5dwrite_integer_6_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dwrite_integer_6_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, &
-         buf, dims)
-
-  END SUBROUTINE h5dwrite_integer_6
-
-  SUBROUTINE h5dwrite_integer_7(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    INTEGER, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T)  :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dwrite_integer_7_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DWRITE_INTEGER_7_C'::h5dwrite_integer_7_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         INTEGER, INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-       END FUNCTION h5dwrite_integer_7_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dwrite_integer_7_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, &
-         buf, dims)
-
-  END SUBROUTINE h5dwrite_integer_7
-
-
-  SUBROUTINE h5dwrite_char_scalar(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    CHARACTER(LEN=*), INTENT(IN) :: buf ! Data buffer
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dwritec_s_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DWRITEC_S_C'::h5dwritec_s_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: buf
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         CHARACTER(LEN=*), INTENT(IN) :: buf
-       END FUNCTION h5dwritec_s_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dwritec_s_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dwrite_char_scalar
-
-  SUBROUTINE h5dwrite_char_1(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    CHARACTER(LEN=*), INTENT(IN), &
-         DIMENSION(dims(1)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dwritec_1_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DWRITEC_1_C'::h5dwritec_1_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: buf
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         CHARACTER(LEN=*), INTENT(IN), &
-              DIMENSION(dims(1)) :: buf
-       END FUNCTION h5dwritec_1_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dwritec_1_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dwrite_char_1
-
-  SUBROUTINE h5dwrite_char_2(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    CHARACTER(LEN=*), INTENT(IN), &
-         DIMENSION(dims(1),dims(2)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dwritec_2_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DWRITEC_2_C'::h5dwritec_2_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: buf
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         CHARACTER(LEN=*), INTENT(IN), &
-              DIMENSION(dims(1),dims(2)) :: buf
-       END FUNCTION h5dwritec_2_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dwritec_2_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dwrite_char_2
-
-  SUBROUTINE h5dwrite_char_3(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    CHARACTER(LEN=*), INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dwritec_3_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DWRITEC_3_C'::h5dwritec_3_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: buf
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         CHARACTER(LEN=*), INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3)) :: buf
-       END FUNCTION h5dwritec_3_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dwritec_3_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dwrite_char_3
-
-  SUBROUTINE h5dwrite_char_4(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    CHARACTER(LEN=*), INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dwritec_4_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DWRITEC_4_C'::h5dwritec_4_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: buf
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         CHARACTER(LEN=*), INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-       END FUNCTION h5dwritec_4_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dwritec_4_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dwrite_char_4
-
-  SUBROUTINE h5dwrite_char_5(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    CHARACTER(LEN=*), INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dwritec_5_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DWRITEC_5_C'::h5dwritec_5_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: buf
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         CHARACTER(LEN=*), INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-       END FUNCTION h5dwritec_5_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dwritec_5_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dwrite_char_5
-
-  SUBROUTINE h5dwrite_char_6(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    CHARACTER(LEN=*), INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dwritec_6_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DWRITEC_6_C'::h5dwritec_6_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: buf
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         CHARACTER(LEN=*), INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-       END FUNCTION h5dwritec_6_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dwritec_6_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dwrite_char_6
-
-  SUBROUTINE h5dwrite_char_7(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    CHARACTER(LEN=*), INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dwritec_7_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DWRITEC_7_C'::h5dwritec_7_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: buf
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         CHARACTER(LEN=*), INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-       END FUNCTION h5dwritec_7_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dwritec_7_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dwrite_char_7
-
-  SUBROUTINE h5dwrite_real_scalar(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    REAL, INTENT(IN) :: buf ! Data buffer
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dwrite_real_s_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DWRITE_REAL_S_C'::h5dwrite_real_s_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         REAL, INTENT(IN) :: buf
-       END FUNCTION h5dwrite_real_s_c
-    END INTERFACE
-
-    xfer_prp_default  = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dwrite_real_s_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dwrite_real_scalar
-
-  SUBROUTINE h5dwrite_real_1(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    REAL, INTENT(IN), &
-         DIMENSION(dims(1)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dwrite_real_1_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DWRITE_REAL_1_C'::h5dwrite_real_1_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         REAL, INTENT(IN), &
-              DIMENSION(dims(1)) :: buf
-       END FUNCTION h5dwrite_real_1_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dwrite_real_1_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dwrite_real_1
-
-  SUBROUTINE h5dwrite_real_2(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    REAL, INTENT(IN), &
-         DIMENSION(dims(1),dims(2)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dwrite_real_2_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DWRITE_REAL_2_C'::h5dwrite_real_2_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         REAL, INTENT(IN), &
-              DIMENSION(dims(1),dims(2)) :: buf
-       END FUNCTION h5dwrite_real_2_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dwrite_real_2_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dwrite_real_2
-
-  SUBROUTINE h5dwrite_real_3(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    REAL, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dwrite_real_3_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DWRITE_REAL_3_C'::h5dwrite_real_3_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         REAL, INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3)) :: buf
-       END FUNCTION h5dwrite_real_3_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dwrite_real_3_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dwrite_real_3
-
-  SUBROUTINE h5dwrite_real_4(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    REAL, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dwrite_real_4_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DWRITE_REAL_4_C'::h5dwrite_real_4_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         REAL, INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-       END FUNCTION h5dwrite_real_4_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dwrite_real_4_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dwrite_real_4
-
-  SUBROUTINE h5dwrite_real_5(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    REAL, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dwrite_real_5_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DWRITE_REAL_5_C'::h5dwrite_real_5_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         REAL, INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-       END FUNCTION h5dwrite_real_5_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dwrite_real_5_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dwrite_real_5
-
-  SUBROUTINE h5dwrite_real_6(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    REAL, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dwrite_real_6_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DWRITE_REAL_6_C'::h5dwrite_real_6_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         REAL, INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-       END FUNCTION h5dwrite_real_6_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dwrite_real_6_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dwrite_real_6
-
-  SUBROUTINE h5dwrite_real_7(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    REAL, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dwrite_real_7_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DWRITE_REAL_7_C'::h5dwrite_real_7_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         REAL, INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-       END FUNCTION h5dwrite_real_7_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    IF (PRESENT(xfer_prp)) xfer_prp_default = xfer_prp
-    IF (PRESENT(mem_space_id))  mem_space_id_default = mem_space_id
-    IF (PRESENT(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dwrite_real_7_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dwrite_real_7
-
-!
-! NAME
-!  h5dfill_integer
-!
-! PURPOSE
-!  Fills dataspace elements with a fill value in a memory buffer.
-!  Only INTEGER, CHARACTER, REAL and DOUBLE PRECISION datatypes
-!  of the fillvalues and buffers are supported. Buffer and fillvalue
-!  are assumed to have the same datatype.
-!  Only one-dimesional buffers are supported.
-!
-! INPUTS
-!		fill_value	- fill value
-!		space_id	- memory space selection identifier
-!		buf		- data buffer iin memory ro apply selection to
-!				- of k-th dimension of the buf array
-! OUTPUTS
-!		hdferr:		- error code
-!				 	Success:  0
-!				 	Failure: -1
-!
-! AUTHOR
-!  Elena Pourmal
-!  March 12, 2003
-!
-!
-
-  SUBROUTINE h5dfill_integer(fill_value, space_id, buf, hdferr)
-    IMPLICIT NONE
-    INTEGER, INTENT(IN) :: fill_value  ! Fill value
-    INTEGER(HID_T), INTENT(IN) :: space_id ! Memory dataspace selection identifier
-    INTEGER, INTENT(IN), DIMENSION(*) :: buf ! Memory buffer to fill in
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-
-    INTEGER(HID_T) :: fill_type_id ! Fill value datatype identifier
-    INTEGER(HID_T) :: mem_type_id !  Buffer dadtype identifier
-
-    !            INTEGER, EXTERNAL :: h5dfill_integer_c
-    ! MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5dfill_integer_c(fill_value, fill_type_id, space_id, &
-            buf, mem_type_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DFILL_INTEGER_C'::h5dfill_integer_c
-         !DEC$ENDIF
-         INTEGER, INTENT(IN) :: fill_value  ! Fill value
-         INTEGER(HID_T) :: fill_type_id ! Fill value datatype identifier
-         INTEGER(HID_T), INTENT(IN) :: space_id ! Memory dataspace selection identifier
-         INTEGER, INTENT(IN), DIMENSION(*) :: buf ! Memory buffer to fill in
-         INTEGER(HID_T) :: mem_type_id !  Buffer dadtype identifier
-       END FUNCTION h5dfill_integer_c
-    END INTERFACE
-    fill_type_id = H5T_NATIVE_INTEGER
-    mem_type_id  = H5T_NATIVE_INTEGER
-
-    hdferr = h5dfill_integer_c(fill_value, fill_type_id, space_id, &
-         buf, mem_type_id)
-
-  END SUBROUTINE h5dfill_integer
-
-!
-! NAME
-!  h5dfill_real
-!
-! PURPOSE
-!  Fills dataspace elements with a fill value in a memory buffer.
-!  Only INTEGER, CHARACTER, REAL and DOUBLE PRECISION datatypes
-!  of the fillvalues and buffers are supported. Buffer and fillvalue
-!  are assumed to have the same datatype.
-!  Only one-dimesional buffers are supported.
-!
-! INPUTS
-!		fill_value	- fill value
-!		space_id	- memory space selection identifier
-!		buf		- data buffer iin memory ro apply selection to
-!				- of k-th dimension of the buf array
-! OUTPUTS
-!		hdferr:		- error code
-!				 	Success:  0
-!				 	Failure: -1
-!
-! AUTHOR
-!  Elena Pourmal
-!  March 12, 2003
-!
-!
-
-  SUBROUTINE h5dfill_real(fill_valuer, space_id, buf, hdferr)
-    IMPLICIT NONE
-    REAL, INTENT(IN) :: fill_valuer  ! Fill value
-    INTEGER(HID_T), INTENT(IN) :: space_id ! Memory dataspace selection identifier
-    REAL, INTENT(IN), DIMENSION(*) :: buf ! Memory buffer to fill in
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-
-    INTEGER(HID_T) :: fill_type_id ! Fill value datatype identifier
-    INTEGER(HID_T) :: mem_type_id !  Buffer dadtype identifier
-
-    !            INTEGER, EXTERNAL :: h5dfill_real_c
-    ! MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5dfill_real_c(fill_valuer, fill_type_id, space_id, &
-            buf, mem_type_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DFILL_REAL_C'::h5dfill_real_c
-         !DEC$ENDIF
-         REAL, INTENT(IN) :: fill_valuer  ! Fill value
-         INTEGER(HID_T) :: fill_type_id ! Fill value datatype identifier
-         INTEGER(HID_T), INTENT(IN) :: space_id ! Memory dataspace selection identifier
-         REAL, INTENT(IN), DIMENSION(*) :: buf ! Memory buffer to fill in
-         INTEGER(HID_T) :: mem_type_id !  Buffer dadtype identifier
-       END FUNCTION h5dfill_real_c
-    END INTERFACE
-    fill_type_id = H5T_NATIVE_REAL
-    mem_type_id  = H5T_NATIVE_REAL
-
-    hdferr = h5dfill_real_c(fill_valuer, fill_type_id, space_id, &
-         buf, mem_type_id)
-  END SUBROUTINE h5dfill_real
-
-!
-! NAME
-!  h5dfill_char
-!
-! PURPOSE
-!  Fills dataspace elements with a fill value in a memory buffer.
-!  Only INTEGER, CHARACTER, REAL and DOUBLE PRECISION datatypes
-!  of the fillvalues and buffers are supported. Buffer and fillvalue
-!  are assumed to have the same datatype.
-!  Only one-dimesional buffers are supported.
-!
-! INPUTS
-!		fill_value	- fill value
-!		space_id	- memory space selection identifier
-!		buf		- data buffer iin memory ro apply selection to
-!				- of k-th dimension of the buf array
-! OUTPUTS
-!		hdferr:		- error code
-!				 	Success:  0
-!				 	Failure: -1
-!
-! AUTHOR
-!  Elena Pourmal
-!  March 12, 2003
-!
-!
-
-  SUBROUTINE h5dfill_char(fill_value, space_id, buf, hdferr)
-    IMPLICIT NONE
-    CHARACTER, INTENT(IN) :: fill_value    ! Fill value
-    INTEGER(HID_T), INTENT(IN) :: space_id ! Memory dataspace selection identifier
-    CHARACTER, INTENT(IN), DIMENSION(*) :: buf ! Memory buffer to fill in
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-
-    INTEGER(HID_T) :: fill_type_id ! Fill value datatype identifier
-    INTEGER(HID_T) :: mem_type_id  ! Buffer dadtype identifier
-
-    !            INTEGER, EXTERNAL :: h5dfillc_c
-    ! MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5dfillc_c(fill_value, fill_type_id, space_id, &
-            buf, mem_type_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DFILLC_C'::h5dfillc_c
-         !DEC$ENDIF
-         CHARACTER, INTENT(IN) :: fill_value  ! Fill value
-         INTEGER(HID_T) :: fill_type_id ! Fill value datatype identifier
-         INTEGER(HID_T), INTENT(IN) :: space_id ! Memory dataspace selection identifier
-         CHARACTER, INTENT(IN), DIMENSION(*) :: buf ! Memory buffer to fill in
-         INTEGER(HID_T) :: mem_type_id !  Buffer dadtype identifier
-       END FUNCTION h5dfillc_c
-    END INTERFACE
-    fill_type_id = H5T_NATIVE_CHARACTER
-    mem_type_id  = H5T_NATIVE_CHARACTER
-
-    hdferr = h5dfillc_c(fill_value, fill_type_id, space_id, &
-         buf, mem_type_id)
-
-  END SUBROUTINE h5dfill_char
-
-
-END MODULE H5D_PROVISIONAL
diff --git a/fortran/src/H5Ef.c b/fortran/src/H5Ef.c
index f5c0c45..7948808 100644
--- a/fortran/src/H5Ef.c
+++ b/fortran/src/H5Ef.c
@@ -1,25 +1,22 @@
 /****h* H5Ef/H5Ef
  * PURPOSE
- *   This file contains C stubs for H5E Fortran APIs
+ *  This file contains C stubs for H5E Fortran APIs
  *
  * COPYRIGHT
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  ******
-*/
+ */
 #include "H5f90.h"
 #include "H5Eprivate.h"
 
@@ -40,18 +37,18 @@
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5eclear_c(hid_t_f *estack_id )
+h5eclear_c(hid_t_f *estack_id)
 /******/
 {
-  int_f ret_value = 0;
+    int_f ret_value = 0;
 
-  /*
-   * Call H5Eclear function.
-   */
-  if(H5Eclear2((hid_t)*estack_id) < 0)
-      HGOTO_DONE(FAIL)
+    /*
+     * Call H5Eclear function.
+     */
+    if (H5Eclear2((hid_t)*estack_id) < 0)
+        HGOTO_DONE(FAIL)
 
 done:
     return ret_value;
@@ -76,30 +73,30 @@ done:
  *  Bug fix: Added call to close the file with the error messages
  *  EP 11/26/01
  * SOURCE
-*/
+ */
 int_f
-nh5eprint_c1(_fcd name, int_f* namelen)
+h5eprint_c1(_fcd name, int_f *namelen)
 /******/
 {
-    FILE *file = NULL;
-    char *c_name = NULL;
+    FILE *file      = NULL;
+    char *c_name    = NULL;
     int_f ret_value = 0;
 
-    if(NULL == (c_name = (char*)HD5f2cstring(name, (size_t)*namelen)))
+    if (NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
         HGOTO_DONE(FAIL)
-    if(NULL == (file = HDfopen(c_name, "a")))
+    if (NULL == (file = HDfopen(c_name, "a")))
         HGOTO_DONE(FAIL)
 
     /*
      * Call H5Eprint2 function.
      */
-    if(H5Eprint2(H5E_DEFAULT, file) < 0)
+    if (H5Eprint2(H5E_DEFAULT, file) < 0)
         HGOTO_DONE(FAIL)
 
 done:
-    if(file)
+    if (file)
         HDfclose(file);
-    if(c_name)
+    if (c_name)
         HDfree(c_name);
 
     return ret_value;
@@ -122,9 +119,9 @@ done:
  *  Wednesday, March 29, 2000
  *
  * SOURCE
-*/
+ */
 int_f
-nh5eprint_c2(void)
+h5eprint_c2(void)
 /******/
 {
     int_f ret_value = 0;
@@ -132,7 +129,7 @@ nh5eprint_c2(void)
     /*
      * Call H5Eprint2 function.
      */
-    if(H5Eprint2(H5E_DEFAULT, NULL) < 0)
+    if (H5Eprint2(H5E_DEFAULT, NULL) < 0)
         HGOTO_DONE(FAIL)
 
 done:
@@ -157,31 +154,31 @@ done:
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5eget_major_c(int_f* error_no, _fcd name, size_t_f* namelen)
+h5eget_major_c(int_f *error_no, _fcd name, size_t_f *namelen)
 /******/
 {
-    char *c_name = NULL;
+    char  *c_name    = NULL;
     size_t c_namelen = (size_t)*namelen;
-    int_f ret_value = 0;
+    int_f  ret_value = 0;
 
-    if(c_namelen > 0) 
+    if (c_namelen > 0)
         c_name = (char *)HDmalloc(c_namelen + 1);
 
-    if(!c_name)
+    if (!c_name)
         HGOTO_DONE(FAIL)
 
     /*
      * Call H5Eget_msg function.
      */
     H5Eget_msg((hid_t)*error_no, NULL, c_name, c_namelen);
-    HD5packFstring((char*)c_name, _fcdtocp(name), c_namelen);
-    if(!HDstrcmp(c_name, "Invalid major error number"))
+    HD5packFstring((char *)c_name, _fcdtocp(name), c_namelen);
+    if (!HDstrcmp(c_name, "Invalid major error number"))
         HGOTO_DONE(FAIL)
 
 done:
-    if(c_name)
+    if (c_name)
         HDfree(c_name);
 
     return ret_value;
@@ -205,19 +202,19 @@ done:
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5eget_minor_c(int_f* error_no, _fcd name, size_t_f* namelen)
+h5eget_minor_c(int_f *error_no, _fcd name, size_t_f *namelen)
 /******/
 {
-    char *c_name = NULL;
+    char  *c_name    = NULL;
     size_t c_namelen = (size_t)*namelen;
-    int_f ret_value = 0;
+    int_f  ret_value = 0;
 
-    if(c_namelen > 0) 
+    if (c_namelen > 0)
         c_name = (char *)HDmalloc(c_namelen + 1);
 
-    if(!c_name)
+    if (!c_name)
         HGOTO_DONE(FAIL)
 
     /*
@@ -225,72 +222,35 @@ nh5eget_minor_c(int_f* error_no, _fcd name, size_t_f* namelen)
      */
     H5Eget_msg((hid_t)*error_no, NULL, c_name, c_namelen);
     HD5packFstring((char *)c_name, _fcdtocp(name), c_namelen);
-    if(!HDstrcmp(c_name, "Invalid minor error number"))
+    if (!HDstrcmp(c_name, "Invalid minor error number"))
         HGOTO_DONE(FAIL)
 
 done:
-    if(c_name)
+    if (c_name)
         HDfree(c_name);
 
     return ret_value;
 }
 
-/****if* H5Ef/h5eset_auto_c
+/****if* H5Ef/h5eset_auto2_c
  * NAME
- *  h5eset_auto_c
+ *  h5eset_auto2_c
  * PURPOSE
- *  Call H5Eset_auto to turn automatic error printing on or off.
+ *  Calls H5Eset_auto2
  * INPUTS
- *  printflag - flag to turn automatic error printing on or off.
- * OUTPUTS
+ *  estack_id   - Error stack identifier.
+ *  func 	- Function to be called upon an error condition.
+ *  client_data - Data passed to the error function.
  *
  * RETURNS
  *  0 on success, -1 on failure
  * AUTHOR
- *  Elena Pourmal
- *  Friday, November 17, 2000
- * HISTORY
- *  Major bug fix: Function never disabled printing.
- * SOURCE
-*/
-int_f
-nh5eset_auto_c(int_f* printflag)
-/******/
-{
-    herr_t status = -1;
-    int_f ret_value = 0;
-
-    if(*printflag == 1)
-        status = H5Eset_auto2(H5E_DEFAULT, (H5E_auto2_t)H5Eprint2, stderr);
-    else if(*printflag == 0)
-        status = H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
-    if(status < 0)
-        HGOTO_DONE(FAIL)
-
-done:
-    return ret_value;
-}
-
-
-/****if* H5Ef/h5eset_auto2_c
- * NAME
- *   h5eset_auto2_c
- * PURPOSE
- *   Calls H5Eset_auto2
- * INPUTS
- *   estack_id    - Error stack identifier.
- *   func 	 - Function to be called upon an error condition.
- *   client_data - Data passed to the error function.
- *   
- * RETURNS
- *   0 on success, -1 on failure
- * AUTHOR
  *   M. Scot Breitenfeld
- *   July 22, 2009
+ *  July 22, 2009
  * SOURCE
-*/
+ */
 /* int_f */
-/* nh5eset_auto2_c(hid_t_f *estack_id, H5E_auto2_t *func, void *client_data) */
+/* h5eset_auto2_c(hid_t_f *estack_id, H5E_auto2_t *func, void *client_data) */
 /* /\******\/ */
 /* { */
 /*   int ret_val = -1; */
@@ -305,17 +265,17 @@ int_f
 h5eset_auto2_c(int_f *printflag, hid_t_f *estack_id, H5E_auto2_t func, void *client_data)
 /******/
 {
-  int ret_val = -1;
-  herr_t status = -1;
+    int    ret_val = -1;
+    herr_t status  = -1;
 
-  if (*printflag == 1 && *estack_id == -1)
-    status = H5Eset_auto2(H5E_DEFAULT, (H5E_auto2_t)H5Eprint2, stderr);
-  else if (*printflag == 1)
-    status = H5Eset_auto2((hid_t)*estack_id, func, client_data);
-  else if (*printflag == 0)
-    status = H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
-  if (status >= 0) ret_val = 0;
+    if (*printflag == 1 && *estack_id == -1)
+        status = H5Eset_auto2(H5E_DEFAULT, (H5E_auto2_t)H5Eprint2, stderr);
+    else if (*printflag == 1)
+        status = H5Eset_auto2((hid_t)*estack_id, func, client_data);
+    else if (*printflag == 0)
+        status = H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
+    if (status >= 0)
+        ret_val = 0;
 
-  return ret_val;
+    return ret_val;
 }
-
diff --git a/fortran/src/H5Eff.F90 b/fortran/src/H5Eff.F90
new file mode 100644
index 0000000..26b2c77
--- /dev/null
+++ b/fortran/src/H5Eff.F90
@@ -0,0 +1,219 @@
+!> @defgroup FH5E Fortran Error (H5E) Interface
+!!
+!! @see H5E, C-API
+!!
+!! @see @ref H5E_UG, User Guide
+!!
+
+!> @ingroup FH5E
+!!
+!! @brief This module contains Fortran interfaces for H5E functions.
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+! NOTES
+!       _____ __  __ _____   ____  _____ _______       _   _ _______
+!      |_   _|  \/  |  __ \ / __ \|  __ \__   __|/\   | \ | |__   __|
+! ****   | | | \  / | |__) | |  | | |__) | | |  /  \  |  \| |  | |    ****
+! ****   | | | |\/| |  ___/| |  | |  _  /  | | / /\ \ | . ` |  | |    ****
+! ****  _| |_| |  | | |    | |__| | | \ \  | |/ ____ \| |\  |  | |    ****
+!      |_____|_|  |_|_|     \____/|_|  \_\ |_/_/    \_\_| \_|  |_|
+!
+!  If you add a new H5E function to the module you must add the function name
+!  to the Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
+!  This is needed for Windows based operating systems.
+!
+
+MODULE H5E
+
+  USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR, C_FUNPTR, C_CHAR
+  USE H5GLOBAL
+
+  INTEGER, PARAMETER :: PRINTON  = 1 !< Turn on automatic printing of errors
+  INTEGER, PARAMETER :: PRINTOFF = 0 !< Turn off automatic printing of errors
+
+CONTAINS
+
+!>
+!! \ingroup FH5E
+!!
+!! \brief Clears the error stack for the current thread.
+!!
+!! \param hdferr    \fortran_error
+!! \param estack_id Error Stack id
+!!
+!! See C API: @ref H5Eclear2()
+!!
+  SUBROUTINE h5eclear_f(hdferr, estack_id)
+    IMPLICIT NONE
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: estack_id
+    INTEGER(HID_T) :: estack_id_default
+
+    INTERFACE
+       INTEGER FUNCTION h5eclear_c(estack_id_default) BIND(C,NAME='h5eclear_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T) :: estack_id_default
+       END FUNCTION h5eclear_c
+    END INTERFACE
+
+    estack_id_default = H5E_DEFAULT_F
+    IF(PRESENT(estack_id)) estack_id_default = estack_id
+
+    hdferr = h5eclear_c(estack_id_default)
+  END SUBROUTINE h5eclear_f
+
+!>
+!! \ingroup FH5E
+!!
+!! \brief Prints the error stack in a default manner.
+!!
+!! \param hdferr \fortran_error
+!! \param name   Name of the file that contains print output
+!!
+!! See C API: @ref H5Eprint2()
+!!
+  SUBROUTINE h5eprint_f(hdferr, name)
+    CHARACTER(LEN=*), OPTIONAL, INTENT(IN) :: name
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: namelen
+
+    INTERFACE
+       INTEGER FUNCTION h5eprint_c1(name, namelen) BIND(C,NAME='h5eprint_c1')
+         IMPORT :: C_CHAR
+         IMPLICIT NONE
+         INTEGER :: namelen
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+       END FUNCTION h5eprint_c1
+    END INTERFACE
+
+    INTERFACE
+       INTEGER FUNCTION h5eprint_c2()  BIND(C,NAME='h5eprint_c2')
+       END FUNCTION h5eprint_c2
+    END INTERFACE
+
+    IF (PRESENT(name)) THEN
+       namelen = LEN(NAME)
+       hdferr = h5eprint_c1(name, namelen)
+    ELSE
+       hdferr = h5eprint_c2()
+    ENDIF
+  END SUBROUTINE h5eprint_f
+!>
+!! \ingroup FH5E
+!!
+!! \brief Returns a character string describing an error specified by a major error number.
+!!
+!! \param error_no Major error number.
+!! \param name     Character string describing the error.
+!! \param namelen  Number of characters in the name buffer.
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Eget_major()
+!!
+  SUBROUTINE h5eget_major_f(error_no, name, namelen, hdferr)
+    INTEGER, INTENT(IN) :: error_no
+    CHARACTER(LEN=*), INTENT(OUT) :: name
+    INTEGER(SIZE_T), INTENT(IN) :: namelen
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5eget_major_c(error_no, name, namelen)  BIND(C,NAME='h5eget_major_c')
+         IMPORT :: C_CHAR
+         IMPORT :: SIZE_T
+         IMPLICIT NONE
+         INTEGER :: error_no
+         CHARACTER(KIND=C_CHAR), DIMENSION(*) :: name
+         INTEGER(SIZE_T), INTENT(IN) :: namelen
+       END FUNCTION h5eget_major_c
+    END INTERFACE
+
+    hdferr = h5eget_major_c(error_no, name, namelen)
+  END SUBROUTINE h5eget_major_f
+!>
+!! \ingroup FH5E
+!!
+!! \brief Returns a character string describing an error specified by a minor error number.
+!!
+!! \param error_no Minor error number.
+!! \param name     Character string describing the error.
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Eget_minor()
+!!
+  SUBROUTINE h5eget_minor_f(error_no, name, hdferr)
+    INTEGER, INTENT(IN) :: error_no
+    CHARACTER(LEN=*), INTENT(OUT) :: name
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5eget_minor_c(error_no, name) BIND(C,NAME='h5eget_minor_c')
+         IMPORT :: C_CHAR
+         INTEGER :: error_no
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(OUT) :: name
+       END FUNCTION h5eget_minor_c
+    END INTERFACE
+
+    hdferr = h5eget_minor_c(error_no, name)
+  END SUBROUTINE h5eget_minor_f
+
+!>
+!! \ingroup FH5E
+!!
+!! \brief Returns settings for automatic error stack traversal function and its data.
+!!
+!! \param printflag   Flag to turn automatic error printing on or off; possible values are:
+!!                    \li printon (1)
+!!                    \li printoff(0)
+!! \param estack_id   Error stack identifier.
+!! \param func        Function to be called upon an error condition.
+!! \param client_data Data passed to the error function.
+!! \param hdferr      \fortran_error
+!!
+!! See C API: @ref H5Eset_auto2()
+!!
+  SUBROUTINE h5eset_auto_f(printflag, hdferr, estack_id, func, client_data)
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR, C_FUNPTR
+    INTEGER       , INTENT(IN)            :: printflag
+    INTEGER       , INTENT(OUT)           :: hdferr
+    INTEGER(HID_T), INTENT(IN) , OPTIONAL :: estack_id
+    TYPE(C_FUNPTR), INTENT(IN) , OPTIONAL :: func
+    TYPE(C_PTR)   , INTENT(IN) , OPTIONAL :: client_data
+    INTEGER(HID_T) :: estack_id_default
+    TYPE(C_FUNPTR) :: func_default
+    TYPE(C_PTR)    :: client_data_default
+    INTERFACE
+       INTEGER FUNCTION h5eset_auto2_c(printflag, estack_id, func, client_data) &
+            BIND(C, NAME='h5eset_auto2_c')
+         IMPORT :: c_ptr, c_funptr
+         IMPORT :: HID_T
+         INTEGER :: printflag
+         INTEGER(HID_T) :: estack_id
+         TYPE(C_FUNPTR), VALUE :: func
+         TYPE(C_PTR), VALUE :: client_data
+       END FUNCTION h5eset_auto2_c
+    END INTERFACE
+
+    estack_id_default = -1
+    func_default = C_NULL_FUNPTR
+    client_data_default = C_NULL_PTR
+
+    IF(PRESENT(estack_id)) estack_id_default = estack_id
+    IF(PRESENT(func)) func_default = func
+    IF(PRESENT(client_data)) client_data_default = client_data
+
+    hdferr = h5eset_auto2_c(printflag, estack_id_default, func_default, client_data_default)
+  END SUBROUTINE h5eset_auto_f
+
+END MODULE H5E
+
diff --git a/fortran/src/H5Eff.f90 b/fortran/src/H5Eff.f90
deleted file mode 100644
index 7b56376..0000000
--- a/fortran/src/H5Eff.f90
+++ /dev/null
@@ -1,251 +0,0 @@
-!****h* ROBODoc/H5E
-!
-! NAME
-!  MODULE H5E
-!
-! FILE
-!  fortran/src/H5Eff.f90
-!
-! PURPOSE
-!  This Module contains Fortran interfaces for H5E functions.
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! NOTES
-!                         *** IMPORTANT ***
-!  If you add a new H5E function to the module you must add the function name
-!  to the Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
-!  This is needed for Windows based operating systems.
-!
-!*****
-
-MODULE H5E
-
-  USE H5GLOBAL
-
-  !Turn on automatic printing of errors
-  INTEGER, PARAMETER :: PRINTON = 1
-
-  !Turn off automatic printing of errors
-  INTEGER, PARAMETER :: PRINTOFF = 0
-
-CONTAINS
-
-!****s* H5E/h5eclear_f
-!
-! NAME
-!  h5eclear_f
-!
-! PURPOSE
-!  Clears the error stack for the current thread.
-!
-! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! OPTIONAL PARAMETERS
-!  estack_id     - Error Stack id
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  April 6, 2001
-!
-!  Added optional error stack identifier in order to bring
-!  the function in line with the h5eclear2 routine.
-!  MSB, July 9, 2009
-!
-! SOURCE
-  SUBROUTINE h5eclear_f(hdferr, estack_id)
-    IMPLICIT NONE
-    INTEGER, INTENT(OUT) :: hdferr  ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: estack_id
-!*****
-    INTEGER(HID_T) :: estack_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5eclear_c(estack_id_default)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5ECLEAR_C'::h5eclear_c
-         !DEC$ENDIF
-         INTEGER(HID_T) :: estack_id_default
-       END FUNCTION h5eclear_c
-    END INTERFACE
-
-    estack_id_default = H5E_DEFAULT_F
-    IF(PRESENT(estack_id)) estack_id_default = estack_id
-
-    hdferr = h5eclear_c(estack_id_default)
-  END SUBROUTINE h5eclear_f
-
-!****s* H5E/h5eprint_f
-!
-! NAME
-!  h5eprint_f
-!
-! PURPOSE
-!  Prints the error stack in a default manner.
-!
-! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! OPTIONAL PARAMETERS
-!  name 	 - name of the file that contains print output
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  April 6, 2001
-!
-! SOURCE
-  SUBROUTINE h5eprint_f(hdferr, name)
-    CHARACTER(LEN=*), OPTIONAL, INTENT(IN) :: name ! File name
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-!*****
-    INTEGER :: namelen
-
-    INTERFACE
-       INTEGER FUNCTION h5eprint_c1(name, namelen)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5EPRINT_C1'::h5eprint_c1
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         INTEGER :: namelen
-         CHARACTER(LEN=*),INTENT(IN) :: name
-       END FUNCTION h5eprint_c1
-    END INTERFACE
-
-    INTERFACE
-       INTEGER FUNCTION h5eprint_c2()
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5EPRINT_C2'::h5eprint_c2
-         !DEC$ENDIF
-       END FUNCTION h5eprint_c2
-    END INTERFACE
-    namelen = LEN(NAME)
-    IF (PRESENT(name)) THEN
-       hdferr = h5eprint_c1(name, namelen)
-    ELSE
-       hdferr = h5eprint_c2()
-    ENDIF
-  END SUBROUTINE h5eprint_f
-!****s* H5E/h5eget_major_f
-!
-! NAME
-!  h5eget_major_f
-!
-! PURPOSE
-!  Returns a character string describing an error specified
-!  by a major error number.
-!
-! INPUTS
-!  error_no 	 - major error number
-!
-! OUTPUTS
-!  name 	 - character string describing the error
-!  namelen 	 - number of characters in the name buffer
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  April 6, 2001
-!
-! SOURCE
-  SUBROUTINE h5eget_major_f(error_no, name, namelen, hdferr)
-    INTEGER, INTENT(IN) :: error_no        ! Major error number
-    CHARACTER(LEN=*), INTENT(OUT) :: name  ! Character string describing
-                                           ! the error.
-    INTEGER(SIZE_T), INTENT(IN) :: namelen ! Anticipated number of characters
-                                           ! in name.
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5eget_major_c(error_no, name, namelen)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5EGET_MAJOR_C'::h5eget_major_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         INTEGER :: error_no
-         CHARACTER(LEN=*) :: name
-         INTEGER(SIZE_T), INTENT(IN) :: namelen
-       END FUNCTION h5eget_major_c
-    END INTERFACE
-
-    hdferr = h5eget_major_c(error_no, name, namelen)
-  END SUBROUTINE h5eget_major_f
-!****s* H5E/h5eget_minor_f
-!
-! NAME
-!  h5eget_minor_f
-!
-! PURPOSE
-!  Returns a character string describing an error specified
-!  by a minor error number.
-!
-! INPUTS
-!  error_no 	 - minor error number
-!
-! OUTPUTS
-!  name 	 - character string describing the error
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  April 6, 2001
-!
-! SOURCE
-  SUBROUTINE h5eget_minor_f(error_no, name, hdferr)
-    INTEGER, INTENT(IN) :: error_no       ! Major error number
-    CHARACTER(LEN=*), INTENT(OUT) :: name ! Character string describing
-                                          ! the error
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5eget_minor_c(error_no, name)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5EGET_MINOR_C'::h5eget_minor_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         INTEGER :: error_no
-         CHARACTER(LEN=*) :: name
-       END FUNCTION h5eget_minor_c
-    END INTERFACE
-
-    hdferr = h5eget_minor_c(error_no, name)
-  END SUBROUTINE h5eget_minor_f
-
-END MODULE H5E
-
diff --git a/fortran/src/H5Eff_F03.f90 b/fortran/src/H5Eff_F03.f90
deleted file mode 100644
index ff8d11c..0000000
--- a/fortran/src/H5Eff_F03.f90
+++ /dev/null
@@ -1,108 +0,0 @@
-!****h* ROBODoc/H5E (F03)
-!
-! NAME
-!  H5E_PROVISIONAL
-!
-! FILE
-!  src/fortran/src/H5Eff_F03.f90 
-!
-! PURPOSE
-!
-!  This file contains Fortran 90 and Fortran 2003 interfaces for H5E functions.
-!  It contains the same functions as H5Eff_F90.f90 but includes the
-!  Fortran 2003 functions and the interface listings. This file will be compiled
-!  instead of H5Eff_F90.f90 if Fortran 2003 functions are enabled.
-!
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! NOTES
-!                         *** IMPORTANT ***
-!  If you add a new H5E function to the module you must add the function name
-!  to the Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
-!  This is needed for Windows based operating systems.
-!
-!*****
-
-MODULE H5E_PROVISIONAL
-
-  USE H5GLOBAL
-
-CONTAINS
-
-!****s* H5E/h5eset_auto_f
-!
-! NAME
-!  h5eset_auto_f
-!
-! PURPOSE
-!  Returns settings for automatic error stack traversal function and its data.
-!
-! Inputs:
-!  printflag   - Flag to turn automatic error printing on or off;
-!                possible values are:
-!                  printon (1)
-!                  printoff(0)
-!  estack_id   - Error stack identifier.
-!  func        - Function to be called upon an error condition.
-!  client_data - Data passed to the error function
-!  
-! Outputs:
-!  hdferr      - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  July 10, 2009
-!
-! Fortran2003 Interface:
-  SUBROUTINE h5eset_auto_f(printflag, hdferr, estack_id, func, client_data)
-    USE, INTRINSIC :: ISO_C_BINDING
-    INTEGER       , INTENT(IN)            :: printflag
-    INTEGER       , INTENT(OUT)           :: hdferr
-    INTEGER(HID_T), INTENT(IN) , OPTIONAL :: estack_id
-    TYPE(C_FUNPTR), INTENT(IN) , OPTIONAL :: func
-    TYPE(C_PTR)   , INTENT(IN) , OPTIONAL :: client_data
-!*****
-    INTEGER(HID_T) :: estack_id_default
-    TYPE(C_FUNPTR) :: func_default
-    TYPE(C_PTR)    :: client_data_default
-    INTERFACE
-       INTEGER FUNCTION h5eset_auto2_c(printflag, estack_id, func, client_data) &
-            BIND(C, NAME='h5eset_auto2_c')
-         USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_ptr, c_funptr
-         USE H5GLOBAL
-         INTEGER :: printflag
-         INTEGER(HID_T) :: estack_id
-!!$         TYPE(C_FUNPTR) :: func
-!!$         TYPE(C_PTR), VALUE :: client_data
-         TYPE(C_FUNPTR), VALUE :: func
-         TYPE(C_PTR), VALUE :: client_data
-       END FUNCTION h5eset_auto2_c
-    END INTERFACE
-
-    estack_id_default = -1
-    func_default = C_NULL_FUNPTR
-    client_data_default = C_NULL_PTR
-
-    IF(PRESENT(estack_id)) estack_id_default = estack_id
-    IF(PRESENT(func)) func_default = func
-    IF(PRESENT(client_data)) client_data_default = client_data
-
-    hdferr = h5eset_auto2_c(printflag, estack_id_default, func_default, client_data_default)
-  END SUBROUTINE h5eset_auto_f
-
-END MODULE H5E_PROVISIONAL
diff --git a/fortran/src/H5Eff_F90.f90 b/fortran/src/H5Eff_F90.f90
deleted file mode 100644
index 158ec12..0000000
--- a/fortran/src/H5Eff_F90.f90
+++ /dev/null
@@ -1,89 +0,0 @@
-!****h* ROBODoc/H5E (F90)
-!
-! NAME
-!  MODULE H5E_PROVISIONAL
-!
-! PURPOSE
-!  This file contains Fortran 90 interfaces for H5E functions. It contains
-!  the same functions as H5Eff_F03.f90 but excludes the Fortran 2003 functions
-!  and the interface listings. This file will be compiled instead of H5Eff_F03.f90
-!  if Fortran 2003 functions are not enabled.
-!
-!
-! COPYRIGHT
-!  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!  Copyright by The HDF Group.                                               *
-!  Copyright by the Board of Trustees of the University of Illinois.         *
-!  All rights reserved.                                                      *
-!  *
-!  This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!  terms governing use, modification, and redistribution, is contained in    *
-!  the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!  of the source code distribution tree; Copyright.html can be found at the  *
-!  root level of an installed copy of the electronic HDF5 document set and   *
-!  is linked from the top-level documents page.  It can also be found at     *
-!  http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!  access to either file, you may request a copy from help@hdfgroup.org.     *
-!  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-!                         *** IMPORTANT ***
-!  If you add a new H5D function you must add the function name to the
-!  Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
-!  This is needed for Windows based operating systems.
-!*****
-
-MODULE H5E_PROVISIONAL
-
-  USE H5GLOBAL
-
-CONTAINS
-
-!****s* H5E/h5eset_auto_f
-!
-! NAME
-!  h5eset_auto_f
-!
-! PURPOSE
-!  Turns automatic error printing on or off.
-!
-! INPUTS
-!  printflag 	 - Flag to turn automatic error printing on or off;
-!                  possible values are:
-!                    printon (1)
-!                    printoff(0)
-! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  April 6, 2001
-!
-! SOURCE
-  SUBROUTINE h5eset_auto_f(printflag, hdferr)
-    INTEGER, INTENT(IN) :: printflag  ! flag to turn automatic error
-                                      ! printing on or off
-                                      ! possible values are:
-                                      !     printon (1)
-                                      !     printoff(0)
-    INTEGER, INTENT(OUT) :: hdferr    ! Error code
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5eset_auto_c(printflag)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5ESET_AUTO_C'::h5eset_auto_c
-         !DEC$ENDIF
-         INTEGER :: printflag
-       END FUNCTION h5eset_auto_c
-    END INTERFACE
-
-    hdferr = h5eset_auto_c(printflag)
-  END SUBROUTINE h5eset_auto_f
-
-
-END MODULE H5E_PROVISIONAL
diff --git a/fortran/src/H5FDmpiof.c b/fortran/src/H5FDmpiof.c
deleted file mode 100644
index bbdb170..0000000
--- a/fortran/src/H5FDmpiof.c
+++ /dev/null
@@ -1,258 +0,0 @@
-/****h* H5FDmpiof/H5FDmpiof
- *
- * PURPOSE
- *   This file contains C stubs for Parallel Fortran APIs
- *
- * COPYRIGHT
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of HDF5.  The full HDF5 copyright notice, including     *
- * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- ******
-*/
-
-#include "H5f90.h"
-#include <mpi.h>
-#include "H5public.h"
-
-
-/* Support for C to Fortran translation in MPI */
-#ifndef H5_HAVE_MPI_MULTI_LANG_Comm
-#define MPI_Comm_c2f(comm) (int_f)(comm)
-#define MPI_Comm_f2c(comm) (MPI_Comm)(comm)
-#endif /*MPI Comm*/
-#ifndef H5_HAVE_MPI_MULTI_LANG_Info
-#define MPI_Info_c2f(info) (int_f)(info)
-#define MPI_Info_f2c(info) (MPI_Info)(info)
-#endif /*MPI Info*/
-
-/****if* H5FDmpiof/h5pset_fapl_mpio_c
- * NAME
- *        h5pset_fapl_mpio_c
- * PURPOSE
- *     Call H5Pset_fapl_mpio to set mode for parallel I/O and the user
- *              supplied communicator and info object
- * INPUTS
- *      prp_id - property list identifier
- *              comm   - MPI communicator
- *              info   - MPI info object
- * RETURNS
- *     0 on success, -1 on failure
- * AUTHOR
- *  Elena Pourmal
- *              Thursday, October 26, 2000
- * HISTORY
- *
- * SOURCE
-*/
-int_f
-nh5pset_fapl_mpio_c(hid_t_f *prp_id, int_f* comm, int_f* info)
-/******/
-{
-     int ret_value = -1;
-     hid_t c_prp_id;
-     herr_t ret;
-     MPI_Comm c_comm;
-     MPI_Info c_info;
-     c_comm = MPI_Comm_f2c(*comm);
-     c_info = MPI_Info_f2c(*info);
-
-     /*
-      * Call H5Pset_mpi function.
-      */
-     c_prp_id = *prp_id;
-     ret = H5Pset_fapl_mpio(c_prp_id, c_comm, c_info);
-     if (ret < 0) return ret_value;
-     ret_value = 0;
-     return ret_value;
-}
-/****if* H5FDmpiof/h5pget_fapl_mpio_c
- * NAME
- *        h5pget_fapl_mpio_c
- * PURPOSE
- *     Call H5Pget_fapl_mpio to retrieve communicator and info object
- * INPUTS
- *      prp_id - property list identifier
- *              comm   - buffer to return MPI communicator
- *              info   - buffer to return MPI info object
- * RETURNS
- *     0 on success, -1 on failure
- * AUTHOR
- *  Elena Pourmal
- *              Thursday, October 26, 2000
- * HISTORY
- *
- * SOURCE
-*/
-int_f
-nh5pget_fapl_mpio_c(hid_t_f *prp_id, int_f* comm, int_f* info)
-/******/
-{
-     int ret_value = -1;
-     hid_t c_prp_id;
-     herr_t ret;
-     MPI_Comm c_comm;
-     MPI_Info c_info;
-
-     /*
-      * Call H5Pget_mpi function.
-      */
-     c_prp_id = *prp_id;
-     ret = H5Pget_fapl_mpio(c_prp_id, &c_comm, &c_info);
-     if (ret < 0) return ret_value;
-     *comm = (int_f) MPI_Comm_c2f(c_comm);
-     *info = (int_f) MPI_Info_c2f(c_info);
-     ret_value = 0;
-     return ret_value;
-}
-/****if* H5FDmpiof/h5pset_dxpl_mpio_c
- * NAME
- *        h5pset_dxpl_mpio_c
- * PURPOSE
- *     Call H5Pset_dxpl_mpio to set transfer mode of the dataset
- *              trasfer property list
- * INPUTS
- *      prp_id - property list identifier
- *              data_xfer_mode - transfer mode
- * RETURNS
- *     0 on success, -1 on failure
- * AUTHOR
- *  Elena Pourmal
- *              Thursday, October 26, 2000
- * HISTORY
- *
- * SOURCE
-*/
-int_f
-nh5pset_dxpl_mpio_c(hid_t_f *prp_id, int_f* data_xfer_mode)
-/******/
-{
-     int ret_value = -1;
-     hid_t c_prp_id;
-     herr_t ret;
-     H5FD_mpio_xfer_t c_data_xfer_mode;
-/*
-     switch (*data_xfer_mode) {
-
-        case H5FD_MPIO_INDEPENDENT_F:
-             c_data_xfer_mode = H5FD_MPIO_INDEPENDENT;
-             break;
-
-        case H5FD_MPIO_COLLECTIVE_F:
-             c_data_xfer_mode = H5FD_MPIO_COLLECTIVE;
-             break;
-        default:
-          return ret_value;
-      }
-*/
-     c_data_xfer_mode = (H5FD_mpio_xfer_t)*data_xfer_mode;
-     /*
-      * Call H5Pset_dxpl_mpio function.
-      */
-     c_prp_id = *prp_id;
-     ret = H5Pset_dxpl_mpio(c_prp_id, c_data_xfer_mode);
-     if (ret < 0) return ret_value;
-     ret_value = 0;
-     return ret_value;
-}
-
-/****if* H5FDmpiof/h5pget_dxpl_mpio_c
- * NAME
- *        h5pget_dxpl_mpio_c
- * PURPOSE
- *     Call H5Pget_dxpl_mpio to get transfer mode of the dataset
- *              trasfer property list
- * INPUTS
- *      prp_id - property list identifier
- *              data_xfer_mode  - buffer to retrieve transfer mode
- * RETURNS
- *     0 on success, -1 on failure
- * AUTHOR
- *  Elena Pourmal
- *              Thursday, June 15, 2000
- * HISTORY
- *
- * SOURCE
-*/
-int_f
-nh5pget_dxpl_mpio_c(hid_t_f *prp_id, int_f* data_xfer_mode)
-/******/
-{
-     int ret_value = -1;
-     hid_t c_prp_id;
-     herr_t ret;
-     H5FD_mpio_xfer_t c_data_xfer_mode;
-
-     /*
-      * Call H5Pget_xfer function.
-      */
-     c_prp_id = *prp_id;
-     ret = H5Pget_dxpl_mpio(c_prp_id, &c_data_xfer_mode);
-     if (ret < 0) return ret_value;
-     *data_xfer_mode = (int_f)c_data_xfer_mode;
-/*
-     switch (c_data_xfer_mode) {
-
-        case H5FD_MPIO_INDEPENDENT:
-             *data_xfer_mode = H5FD_MPIO_INDEPENDENT_F;
-             break;
-
-        case H5FD_MPIO_COLLECTIVE:
-             *data_xfer_mode = H5FD_MPIO_COLLECTIVE_F;
-             break;
-
-        default:
-          return ret_value;
-      }
-*/
-     ret_value = 0;
-     return ret_value;
-}
-
-/****if* H5Pf/h5pget_mpio_actual_io_mode_c
- * NAME
- *  h5pget_mpio_actual_io_mode_c
- * PURPOSE
- *  Calls H5Pget_mpio_actual_io_mode
- *
- * INPUTS
- *  dxpl_id        - Dataset transfer property list identifier.
- * OUTPUTS
- *  actual_io_mode - The type of I/O performed by this process.
- *
- * RETURNS
- *  0 on success, -1 on failure
- * AUTHOR
- *  M. Scot Breitenfeld
- *  July 27, 2012
- * SOURCE
-*/
-int_f
-nh5pget_mpio_actual_io_mode_c(hid_t_f *dxpl_id, int_f *actual_io_mode)
-/******/
-{
-  int ret_value = -1;
-  H5D_mpio_actual_io_mode_t c_actual_io_mode;
-
-  /*
-   * Call H5Pget_mpio_actual_io_mode_f function.
-   */
-  if( (H5Pget_mpio_actual_io_mode((hid_t)*dxpl_id, &c_actual_io_mode)) <0 )
-    return ret_value; /* error occurred */
-
-  *actual_io_mode =(int_f)c_actual_io_mode;
-
-  ret_value = 0;
-  return ret_value;
-}
diff --git a/fortran/src/H5FDmpioff.f90 b/fortran/src/H5FDmpioff.f90
deleted file mode 100644
index 50a77d9..0000000
--- a/fortran/src/H5FDmpioff.f90
+++ /dev/null
@@ -1,212 +0,0 @@
-!****h* ROBODoc/H5FDMPIO
-!
-! NAME
-!  MODULE H5FDMPIO
-!
-! PURPOSE
-!  This file contains Fortran interfaces for H5P functions needed by
-!  parallel MPI programs.
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! NOTES
-!                         *** IMPORTANT ***
-!  If you add a new H5P function you must add the function name to the
-!  Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
-!  This is needed for Windows based operating systems.
-!
-!*****
-
-MODULE H5FDMPIO
-  USE H5GLOBAL
-CONTAINS
-
-!****s* H5FDMPIO/h5pset_fapl_mpio_f
-!
-! NAME
-!  h5pset_fapl_mpio_f
-!
-! PURPOSE
-!  Stores MPI IO communicator information to the file
-!  access property list.
-!
-! INPUTS
-!  prp_id 	 - file access property list identifier
-!  comm 	 - MPI-2 communicator
-!  info 	 - MPI-2 info object
-! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! AUTHOR
-!  Elena Pourmal
-!  November, 2000
-!
-! SOURCE
-  SUBROUTINE h5pset_fapl_mpio_f(prp_id, comm, info, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
-    INTEGER, INTENT(IN) :: comm ! MPI communicator to be used for file open
-                                ! as defined in MPI_FILE_OPEN of MPI-2
-    INTEGER, INTENT(IN) :: info ! MPI info object to be used for file open
-                                ! as defined in MPI_FILE_OPEN of MPI-2
-    INTEGER, INTENT(OUT) :: hdferr ! Error code
-!*****
-    INTEGER, EXTERNAL :: h5pset_fapl_mpio_c
-    hdferr = h5pset_fapl_mpio_c(prp_id, comm, info)
-  END SUBROUTINE h5pset_fapl_mpio_f
-
-!****s* H5FDMPIO/h5pget_fapl_mpio_f
-!
-! NAME
-!  h5pget_fapl_mpio_f
-!
-! PURPOSE
-!  Returns MPI communicator information.
-!
-! INPUTS
-!  prp_id 	 - file access property list identifier
-! OUTPUTS
-!  comm 	 - MPI-2 communicator
-!  info 	 - MPI-2 info object
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  November, 2000
-!
-! SOURCE
-  SUBROUTINE h5pget_fapl_mpio_f(prp_id, comm, info, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
-    INTEGER, INTENT(OUT) :: comm ! buffer to return communicator
-    INTEGER, INTENT(OUT) :: info ! buffer to return info object
-                                 ! as defined in MPI_FILE_OPEN of MPI-2
-    INTEGER, INTENT(OUT) :: hdferr  ! Error code
-!*****
-    INTEGER, EXTERNAL :: h5pget_fapl_mpio_c
-    hdferr = h5pget_fapl_mpio_c(prp_id, comm, info)
-  END SUBROUTINE h5pget_fapl_mpio_f
-
-!****s* H5FDMPIO/h5pset_dxpl_mpio_f
-!
-! NAME
-!  h5pset_dxpl_mpio_f
-!
-! PURPOSE
-!  Sets data transfer mode.
-!
-! INPUTS
-!  prp_id 	  - data transfer property list identifier
-!  data_xfer_mode - transfer mode; possible values are:
-!                     H5FD_MPIO_INDEPENDENT_F
-!                     H5FD_MPIO_COLLECTIVE_F
-! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! AUTHOR
-!  Elena Pourmal
-!  November, 2000
-!
-! SOURCE
-  SUBROUTINE h5pset_dxpl_mpio_f(prp_id, data_xfer_mode, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier
-    INTEGER, INTENT(IN) :: data_xfer_mode ! Data transfer mode. Possible values are:
-                                          ! H5FD_MPIO_INDEPENDENT_F
-                                          ! H5FD_MPIO_COLLECTIVE_F
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-    INTEGER, EXTERNAL :: h5pset_dxpl_mpio_c
-    hdferr = h5pset_dxpl_mpio_c(prp_id, data_xfer_mode)
-  END SUBROUTINE h5pset_dxpl_mpio_f
-
-!****s* H5FDMPIO/h5pget_dxpl_mpio_f
-!
-! NAME
-!  h5pget_dxpl_mpio_f
-!
-! PURPOSE
-!  Returns the data transfer mode.
-!
-! INPUTS
-!  prp_id 	 - data transfer property list identifier
-! OUTPUTS
-!  data_xfer_mode- transfer mode; possible values are:
-!                     H5FD_MPIO_INDEPENDENT_F
-!                     H5FD_MPIO_COLLECTIVE_F
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  November, 2000
-!
-! SOURCE
-  SUBROUTINE h5pget_dxpl_mpio_f(prp_id, data_xfer_mode, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id   ! Property list identifier
-    INTEGER, INTENT(OUT) :: data_xfer_mode ! Data transfer mode. Possible values are:
-                                           ! H5FD_MPIO_INDEPENDENT_F
-                                           ! H5FD_MPIO_COLLECTIVE_F
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-!*****
-    INTEGER, EXTERNAL :: h5pget_dxpl_mpio_c
-    hdferr = h5pget_dxpl_mpio_c(prp_id, data_xfer_mode)
-  END SUBROUTINE h5pget_dxpl_mpio_f
-
-!****s* H5P/h5pget_mpio_actual_io_mode_f
-! NAME
-!  h5pget_mpio_actual_io_mode_f
-!
-! PURPOSE
-!  Retrieves the type of I/O that HDF5 actually performed on the last 
-!  parallel I/O call. This is not necessarily the type of I/O requested. 
-!
-! INPUTS
-!  dxpl_id        - Dataset transfer property list identifier.
-! OUTPUTS
-!  actual_io_mode - The type of I/O performed by this process.
-!  hdferr         - Returns 0 if successful and -1 if fails.
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  July 27, 2012
-!
-! HISTORY
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pget_mpio_actual_io_mode_f(dxpl_id, actual_io_mode, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN)  :: dxpl_id
-    INTEGER       , INTENT(OUT) :: actual_io_mode
-    INTEGER       , INTENT(OUT) :: hdferr
-!***** 
-    INTERFACE
-       INTEGER FUNCTION h5pget_mpio_actual_io_mode_c(dxpl_id, actual_io_mode)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_MPIO_ACTUAL_IO_MODE_C'::h5pget_mpio_actual_io_mode_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN)  :: dxpl_id
-         INTEGER       , INTENT(OUT) :: actual_io_mode
-       END FUNCTION h5pget_mpio_actual_io_mode_c
-    END INTERFACE
-
-    actual_io_mode = -1
-
-    hdferr = h5pget_mpio_actual_io_mode_c(dxpl_id, actual_io_mode)
-
-  END SUBROUTINE h5pget_mpio_actual_io_mode_f
-
-END MODULE H5FDMPIO
diff --git a/fortran/src/H5Ff.c b/fortran/src/H5Ff.c
index 1696672..7402e18 100644
--- a/fortran/src/H5Ff.c
+++ b/fortran/src/H5Ff.c
@@ -1,519 +1,477 @@
 /****h* H5Ff/H5Ff
  * PURPOSE
- *   This file contains C stubs for H5F Fortran APIs
+ *  This file contains C stubs for H5F Fortran APIs
  *
  * COPYRIGHT
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  ******
-*/
+ */
 
 #include "H5f90.h"
 #include "H5Eprivate.h"
 
 /****if* H5Ff/h5fcreate_c
  * NAME
- *        h5fcreate_c
+ *  h5fcreate_c
  * PURPOSE
- *     Call H5Fcreate to create the file
+ *  Call H5Fcreate to create the file
  * INPUTS
- *      name - name of the file
- *              namelen - name length
- *              access_flags - file access  flags
- *              crt_pr  - identifier of creation property list
- *              acc_prp - identifier of access property list
+ *  name - name of the file
+ *  namelen - name length
+ *  access_flags - file access  flags
+ *  crt_pr  - identifier of creation property list
+ *  acc_prp - identifier of access property list
  * OUTPUTS
- *     file_id - file identifier
+ *  file_id - file identifier
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Monday, July 26, 1999
+ *  Monday, July 26, 1999
  * SOURCE
-*/
+ */
 int_f
-nh5fcreate_c(_fcd name, int_f *namelen, int_f *access_flags, hid_t_f* crt_prp, hid_t_f *acc_prp, hid_t_f *file_id)
+h5fcreate_c(_fcd name, int_f *namelen, int_f *access_flags, hid_t_f *crt_prp, hid_t_f *acc_prp,
+            hid_t_f *file_id)
 /******/
 {
-     int ret_value = -1;
-     char *c_name;
-     int_f c_namelen;
-     hid_t c_file_id;
-     unsigned c_access_flags;
-     hid_t c_crt_prp;
-     hid_t c_acc_prp;
-
-     /*
-      * Define access flags
-      */
-     c_access_flags = (unsigned) *access_flags;
-
-     /*
-      * Define creation property
-      */
-     c_crt_prp = *crt_prp;
-
-     /*
-      * Define access property
-      */
-     c_acc_prp = *acc_prp;
-
-     /*
-      * Convert FORTRAN name to C name
-      */
-     c_namelen = *namelen;
-     c_name = (char *)HD5f2cstring(name, (size_t)c_namelen);
-     if(c_name == NULL)
-         return ret_value;
-
-     /*
-      * Call H5Fcreate function.
-      */
-     c_file_id = H5Fcreate(c_name, c_access_flags, c_crt_prp, c_acc_prp);
-
-     if (c_file_id >= 0) {
-         ret_value = 0;
-         *file_id = c_file_id;
-     }
-
-     HDfree(c_name);
-     return ret_value;
+    int      ret_value = -1;
+    char    *c_name;
+    int_f    c_namelen;
+    hid_t    c_file_id;
+    unsigned c_access_flags;
+    hid_t    c_crt_prp;
+    hid_t    c_acc_prp;
+
+    /*
+     * Define access flags
+     */
+    c_access_flags = (unsigned)*access_flags;
+
+    /*
+     * Define creation property
+     */
+    c_crt_prp = *crt_prp;
+
+    /*
+     * Define access property
+     */
+    c_acc_prp = *acc_prp;
+
+    /*
+     * Convert FORTRAN name to C name
+     */
+    c_namelen = *namelen;
+    c_name    = (char *)HD5f2cstring(name, (size_t)c_namelen);
+    if (c_name == NULL)
+        return ret_value;
+
+    /*
+     * Call H5Fcreate function.
+     */
+    c_file_id = H5Fcreate(c_name, c_access_flags, c_crt_prp, c_acc_prp);
+
+    if (c_file_id >= 0) {
+        ret_value = 0;
+        *file_id  = c_file_id;
+    }
+
+    HDfree(c_name);
+    return ret_value;
 }
 
 /****if* H5Ff/h5fflush_c
  * NAME
- *        h5fflush_c
+ *  h5fflush_c
  * PURPOSE
- *     Call H5Fflush to flush the object
+ *  Call H5Fflush to flush the object
  * INPUTS
- *      object_id - identifier of either a file, a dataset,
- *                          a group, an attribute or a named data type
- *              scope - integer to specify the flushing action, either
+ *  object_id - identifier of either a file, a dataset,
+ *  a group, an attribute or a named data type
+ *  scope - integer to specify the flushing action, either
  *                      H5F_SCOPE_GLOBAL or H5F_SCOPE_LOCAL
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Xiangyang Su
- *              Friday, November 5, 1999
+ *  Friday, November 5, 1999
  * SOURCE
-*/
+ */
 int_f
-nh5fflush_c (hid_t_f *object_id, int_f *scope)
+h5fflush_c(hid_t_f *object_id, int_f *scope)
 /******/
 {
-     int ret_value = -1;
-     hid_t c_file_id;
-     H5F_scope_t  c_scope;
-     htri_t status;
-     c_scope = (H5F_scope_t)*scope;
+    int         ret_value = -1;
+    hid_t       c_file_id;
+    H5F_scope_t c_scope;
+    htri_t      status;
+    c_scope = (H5F_scope_t)*scope;
 
-     /*
-      * Call H5Fflush function.
-      */
+    /*
+     * Call H5Fflush function.
+     */
 
-     c_file_id = *object_id;
+    c_file_id = *object_id;
 
-     status = H5Fflush(c_file_id, c_scope);
+    status = H5Fflush(c_file_id, c_scope);
 
-     if (status >= 0)  ret_value = 0;
+    if (status >= 0)
+        ret_value = 0;
 
-     return ret_value;
+    return ret_value;
 }
 
-
 /****if* H5Ff/h5fmount_c
  * NAME
- *        h5fmount_c
+ *  h5fmount_c
  * PURPOSE
- *     Call H5Fmount to mount the file
+ *  Call H5Fmount to mount the file
  * INPUTS
- *      loc_id - Identifier for file or group
- *              dsetname - name of dataset
- *              namelen - dsetname length
- *              file_id - file identifier for the file to be mounted
- *              acc_prp - identifier of access property list
+ *  loc_id - Identifier for file or group
+ *  dsetname - name of dataset
+ *  namelen - dsetname length
+ *  file_id - file identifier for the file to be mounted
+ *  acc_prp - identifier of access property list
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Xiangyang Su
- *              Monday, October 25, 1999
+ *  Monday, October 25, 1999
  * HISTORY
-*/
+ */
 int_f
-nh5fmount_c (hid_t_f *loc_id, _fcd dsetname, int_f *namelen, hid_t_f *file_id, hid_t_f *acc_prp)
+h5fmount_c(hid_t_f *loc_id, _fcd dsetname, int_f *namelen, hid_t_f *file_id, hid_t_f *acc_prp)
 /******/
 {
-     int ret_value = -1;
-     char *c_name;
-     int_f c_namelen;
-     hid_t c_loc_id;
-     hid_t c_file_id;
-     hid_t c_acc_prp;
-     htri_t status;
-
-     /*
-      * Define access property
-      */
-     c_acc_prp = *acc_prp;
-/*
-     if ( H5P_DEFAULT_F == c_acc_prp ) c_acc_prp = H5P_DEFAULT;
-*/
-
-     c_loc_id = *loc_id;
-     c_file_id = *file_id;
-     /*
-      * Convert FORTRAN name to C name
-      */
-     c_namelen = *namelen;
-     c_name = (char *)HD5f2cstring(dsetname, (size_t)c_namelen);
-     if (c_name == NULL) return ret_value;
-
-     /*
-      * Call H5Fmount function.
-      */
-     status = H5Fmount(c_loc_id, c_name, c_file_id, c_acc_prp);
-
-     if (status >= 0)  ret_value = 0;
-
-     HDfree(c_name);
-     return ret_value;
+    int    ret_value = -1;
+    char  *c_name;
+    int_f  c_namelen;
+    hid_t  c_loc_id;
+    hid_t  c_file_id;
+    hid_t  c_acc_prp;
+    htri_t status;
+
+    /*
+     * Define access property
+     */
+    c_acc_prp = *acc_prp;
+    /*
+         if ( H5P_DEFAULT_F == c_acc_prp ) c_acc_prp = H5P_DEFAULT;
+    */
+
+    c_loc_id  = *loc_id;
+    c_file_id = *file_id;
+    /*
+     * Convert FORTRAN name to C name
+     */
+    c_namelen = *namelen;
+    c_name    = (char *)HD5f2cstring(dsetname, (size_t)c_namelen);
+    if (c_name == NULL)
+        return ret_value;
+
+    /*
+     * Call H5Fmount function.
+     */
+    status = H5Fmount(c_loc_id, c_name, c_file_id, c_acc_prp);
+
+    if (status >= 0)
+        ret_value = 0;
+
+    HDfree(c_name);
+    return ret_value;
 }
 
 /****if* H5Ff/h5funmount_c
  * NAME
- *        h5funmount_c
+ *  h5funmount_c
  * PURPOSE
- *     Call H5Funmount to unmount the file
+ *  Call H5Funmount to unmount the file
  * INPUTS
- *      loc_id - Identifier for file or group
- *              dsetname - name of dataset
- *              namelen - dsetname length
+ *  loc_id - Identifier for file or group
+ *  dsetname - name of dataset
+ *  namelen - dsetname length
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Xiangyang Su
- *              Monday, October 25, 1999
+ *  Monday, October 25, 1999
  * SOURCE
-*/
+ */
 int_f
-nh5funmount_c (hid_t_f *loc_id, _fcd dsetname, int_f *namelen)
+h5funmount_c(hid_t_f *loc_id, _fcd dsetname, int_f *namelen)
 /******/
 {
-     int ret_value = -1;
-     char *c_name;
-     int_f c_namelen;
-     hid_t c_loc_id;
-     htri_t status;
-
-     c_loc_id = *loc_id;
-
-     /*
-      * Convert FORTRAN name to C name
-      */
-     c_namelen = *namelen;
-     c_name = (char *)HD5f2cstring(dsetname, (size_t)c_namelen);
-     if (c_name == NULL) return ret_value;
-
-     /*
-      * Call H5Fmount function.
-      */
-     status = H5Funmount(c_loc_id, c_name);
-
-     if (status >= 0)  ret_value = 0;
-
-     HDfree(c_name);
-     return ret_value;
-}
+    int    ret_value = -1;
+    char  *c_name;
+    int_f  c_namelen;
+    hid_t  c_loc_id;
+    htri_t status;
+
+    c_loc_id = *loc_id;
+
+    /*
+     * Convert FORTRAN name to C name
+     */
+    c_namelen = *namelen;
+    c_name    = (char *)HD5f2cstring(dsetname, (size_t)c_namelen);
+    if (c_name == NULL)
+        return ret_value;
 
+    /*
+     * Call H5Fmount function.
+     */
+    status = H5Funmount(c_loc_id, c_name);
 
+    if (status >= 0)
+        ret_value = 0;
+
+    HDfree(c_name);
+    return ret_value;
+}
 
 /****if* H5Ff/h5fopen_c
  * NAME
- *        h5fopen_c
+ *  h5fopen_c
  * PURPOSE
- *     Call H5Fopen to open the file
+ *  Call H5Fopen to open the file
  * INPUTS
- *      name - name of the file
- *              namelen - name length
- *              access_flags - file access  flags
- *              acc_prp - identifier of access property list
+ *  name - name of the file
+ *  namelen - name length
+ *  access_flags - file access  flags
+ *  acc_prp - identifier of access property list
  * OUTPUTS
- *     file_id - file identifier
+ *  file_id - file identifier
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Tuesday, August 3, 1999
+ *  Tuesday, August 3, 1999
  * SOURCE
-*/
+ */
 int_f
-nh5fopen_c (_fcd name, int_f *namelen, int_f *access_flags, hid_t_f *acc_prp, hid_t_f *file_id)
+h5fopen_c(_fcd name, int_f *namelen, int_f *access_flags, hid_t_f *acc_prp, hid_t_f *file_id)
 /******/
 {
-     int ret_value = -1;
-     char *c_name;
-     int_f c_namelen;
-     hid_t c_file_id;
-     unsigned c_access_flags;
-     hid_t c_acc_prp;
-     c_acc_prp = (hid_t)*acc_prp;
-
-     /*
-      * Define access flags
-      */
-     c_access_flags = (unsigned) *access_flags;
-
-     /*
-      * Define access property
-      */
-     c_acc_prp = *acc_prp;
-
-     /*
-      * Convert FORTRAN name to C name
-      */
-     c_namelen = *namelen;
-     c_name = (char *)HD5f2cstring(name, (size_t)c_namelen);
-     if(c_name == NULL)
-         return ret_value;
-
-     /*
-      * Call H5Fopen function.
-      */
-     c_file_id = H5Fopen(c_name, c_access_flags, c_acc_prp);
-
-     if(c_file_id >= 0) {
-         ret_value = 0;
-         *file_id = (hid_t_f)c_file_id;
-     } /* end if */
-
-     HDfree(c_name);
-     return ret_value;
+    int      ret_value = -1;
+    char    *c_name;
+    int_f    c_namelen;
+    hid_t    c_file_id;
+    unsigned c_access_flags;
+    hid_t    c_acc_prp;
+    c_acc_prp = (hid_t)*acc_prp;
+
+    /*
+     * Define access flags
+     */
+    c_access_flags = (unsigned)*access_flags;
+
+    /*
+     * Define access property
+     */
+    c_acc_prp = *acc_prp;
+
+    /*
+     * Convert FORTRAN name to C name
+     */
+    c_namelen = *namelen;
+    c_name    = (char *)HD5f2cstring(name, (size_t)c_namelen);
+    if (c_name == NULL)
+        return ret_value;
+
+    /*
+     * Call H5Fopen function.
+     */
+    c_file_id = H5Fopen(c_name, c_access_flags, c_acc_prp);
+
+    if (c_file_id >= 0) {
+        ret_value = 0;
+        *file_id  = (hid_t_f)c_file_id;
+    } /* end if */
+
+    HDfree(c_name);
+    return ret_value;
 }
 
 /****if* H5Ff/h5freopen_c
  * NAME
- *        h5freopen_c
+ *  h5freopen_c
  * PURPOSE
- *     Call H5Freopen to open the file
+ *  Call H5Freopen to open the file
  * INPUTS
- *      file_id1 - file identifier
+ *  file_id1 - file identifier
  * OUTPUTS
- *     file_id2 - file identifier
+ *  file_id2 - file identifier
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Xiangyang Su
- *              Wednesday, November 3, 1999
+ *  Wednesday, November 3, 1999
  * SOURCE
-*/
+ */
 int_f
-nh5freopen_c (hid_t_f *file_id1, hid_t_f *file_id2)
+h5freopen_c(hid_t_f *file_id1, hid_t_f *file_id2)
 /******/
 {
-     int ret_value = -1;
-     hid_t c_file_id1, c_file_id2;
+    int   ret_value = -1;
+    hid_t c_file_id1, c_file_id2;
 
-     c_file_id1 = *file_id1;
-     c_file_id2 = H5Freopen(c_file_id1);
+    c_file_id1 = *file_id1;
+    c_file_id2 = H5Freopen(c_file_id1);
 
-     if (c_file_id2 < 0) return ret_value;
-     *file_id2 = (hid_t_f)c_file_id2;
+    if (c_file_id2 < 0)
+        return ret_value;
+    *file_id2 = (hid_t_f)c_file_id2;
 
-     ret_value = 0;
-     return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Ff/h5fget_create_plist_c
  * NAME
- *        h5fget_create_plist_c
+ *  h5fget_create_plist_c
  * PURPOSE
- *     Call H5Fget_create_plist to get the file creation property list
+ *  Call H5Fget_create_plist to get the file creation property list
  * INPUTS
- *      file_id - file identifier
+ *  file_id - file identifier
  * OUTPUTS
- *     prop_id - creation property list identifier
+ *  prop_id - creation property list identifier
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal, Xiangyang Su
- *              Wednesday, November 3, 1999
+ *  Wednesday, November 3, 1999
  * SOURCE
-*/
+ */
 int_f
-nh5fget_create_plist_c (hid_t_f *file_id, hid_t_f *prop_id)
+h5fget_create_plist_c(hid_t_f *file_id, hid_t_f *prop_id)
 /******/
 {
-     int ret_value = -1;
-     hid_t c_file_id, c_prop_id;
+    int   ret_value = -1;
+    hid_t c_file_id, c_prop_id;
 
-     c_file_id = (hid_t)*file_id;
-     c_prop_id = H5Fget_create_plist(c_file_id);
+    c_file_id = (hid_t)*file_id;
+    c_prop_id = H5Fget_create_plist(c_file_id);
 
-     if (c_prop_id < 0) return ret_value;
-     *prop_id = (hid_t_f)c_prop_id;
+    if (c_prop_id < 0)
+        return ret_value;
+    *prop_id = (hid_t_f)c_prop_id;
 
-     ret_value = 0;
-     return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Ff/h5fget_access_plist_c
  * NAME
- *        h5fget_access_plist_c
+ *  h5fget_access_plist_c
  * PURPOSE
- *     Call H5Fget_access_plist to get the file access property list
+ *  Call H5Fget_access_plist to get the file access property list
  * INPUTS
- *      file_id - file identifier
+ *  file_id - file identifier
  * OUTPUTS
- *     access_id - access property list identifier
+ *  access_id - access property list identifier
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Monday, September 30, 2002
+ *  Monday, September 30, 2002
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5fget_access_plist_c (hid_t_f *file_id, hid_t_f *access_id)
+h5fget_access_plist_c(hid_t_f *file_id, hid_t_f *access_id)
 /******/
 {
-     int ret_value = -1;
-     hid_t c_file_id, c_access_id;
+    int   ret_value = -1;
+    hid_t c_file_id, c_access_id;
 
-     c_file_id = (hid_t)*file_id;
-     c_access_id = H5Fget_access_plist(c_file_id);
+    c_file_id   = (hid_t)*file_id;
+    c_access_id = H5Fget_access_plist(c_file_id);
 
-     if (c_access_id < 0) return ret_value;
-     *access_id = (hid_t_f)c_access_id;
+    if (c_access_id < 0)
+        return ret_value;
+    *access_id = (hid_t_f)c_access_id;
 
-     ret_value = 0;
-     return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
-/****if* H5Ff/h5fis_hdf5_c
- * NAME
- *        h5fis_hdf5_c
- * PURPOSE
- *     Call H5Fis_hdf5 to determone if the file is an HDF5 file
- * INPUTS
- *      name - name of the file
- *              namelen - name length
- * OUTPUTS
- *     flag - 0 if file is not HDF5 file , positive if a file
- *                     is an HDF5 file, and negative on failure.
- * RETURNS
- *     0 on success, -1 on failure
- * AUTHOR
- *  Elena Pourmal
- *              Tuesday, August 3, 1999
- * HISTORY
- *
- * SOURCE
-*/
-int_f
-nh5fis_hdf5_c (_fcd name, int_f *namelen, int_f *flag)
-/******/
-{
-     int ret_value = -1;
-     char *c_name;
-     int_f c_namelen;
-     htri_t status;
-
-     /*
-      * Convert FORTRAN name to C name
-      */
-     c_namelen = *namelen;
-     c_name = (char *)HD5f2cstring(name, (size_t)c_namelen);
-     if (c_name == NULL) return ret_value;
-
-     /*
-      * Call H5Fopen function.
-      */
-     status = H5Fis_hdf5(c_name);
-     *flag = (int_f)status;
-     if (status >= 0) ret_value = 0;
-
-     HDfree(c_name);
-     return ret_value;
-}
 /****if* H5Ff/h5fclose_c
  * NAME
- *        h5fclose_c
+ *  h5fclose_c
  * PURPOSE
- *     Call H5Fclose to close the file
+ *  Call H5Fclose to close the file
  * INPUTS
- *      file_id - identifier of the file to be closed
+ *  file_id - identifier of the file to be closed
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Monday, July 26, 1999
+ *  Monday, July 26, 1999
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5fclose_c ( hid_t_f *file_id )
+h5fclose_c(hid_t_f *file_id)
 /******/
 {
-  int ret_value = 0;
-  hid_t c_file_id;
+    int   ret_value = 0;
+    hid_t c_file_id;
 
-  c_file_id = (hid_t)*file_id;
-  if ( H5Fclose(c_file_id) < 0  ) ret_value = -1;
-  return ret_value;
+    c_file_id = (hid_t)*file_id;
+    if (H5Fclose(c_file_id) < 0)
+        ret_value = -1;
+    return ret_value;
 }
 /****if* H5Ff/h5fget_obj_count_c
  * NAME
- *        h5fget_obj_count_c
+ *  h5fget_obj_count_c
  * PURPOSE
- *     Call H5Fget_obj_count to get number of open objects within a file
+ *  Call H5Fget_obj_count to get number of open objects within a file
  * INPUTS
- *      file_id - identifier of the file to be closed
- *              obj_type - type of the object
+ *  file_id - identifier of the file to be closed
+ *  obj_type - type of the object
  * RETURNS
- *     obj_count - number of objects
- *              0 on success, -1 on failure
+ *  obj_count - number of objects
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Monday, September 30, 2002
+ *  Monday, September 30, 2002
  * HISTORY
  *
- *              Changed type of obj_count to size_t_f
- *              Thursday, September 25, 2008
+ *  Changed type of obj_count to size_t_f
+ *  Thursday, September 25, 2008
  * SOURCE
-*/
+ */
 
 int_f
-nh5fget_obj_count_c ( hid_t_f *file_id , int_f *obj_type, size_t_f * obj_count)
+h5fget_obj_count_c(hid_t_f *file_id, int_f *obj_type, size_t_f *obj_count)
 /******/
 {
-  int ret_value = 0;
-  hid_t c_file_id;
-  unsigned c_obj_type;
-  ssize_t c_obj_count;
-
+    int      ret_value = 0;
+    hid_t    c_file_id;
+    unsigned c_obj_type;
+    ssize_t  c_obj_count;
 
-  c_file_id = (hid_t)*file_id;
-  c_obj_type = (unsigned) *obj_type;
-  if ( (c_obj_count=H5Fget_obj_count(c_file_id, c_obj_type)) < 0  ) ret_value = -1;
-  *obj_count = (size_t_f)c_obj_count;
-  return ret_value;
+    c_file_id  = (hid_t)*file_id;
+    c_obj_type = (unsigned)*obj_type;
+    if ((c_obj_count = H5Fget_obj_count(c_file_id, c_obj_type)) < 0)
+        ret_value = -1;
+    *obj_count = (size_t_f)c_obj_count;
+    return ret_value;
 }
 /****if* H5Ff/h5fget_obj_ids_c
  * NAME
@@ -525,7 +483,7 @@ nh5fget_obj_count_c ( hid_t_f *file_id , int_f *obj_type, size_t_f * obj_count)
  *  obj_type - type of the object
  * RETURNS
  *  obj_ids  - iarray of open objects identifiers
- *              0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
  *  Monday, September 30, 2002
@@ -534,31 +492,30 @@ nh5fget_obj_count_c ( hid_t_f *file_id , int_f *obj_type, size_t_f * obj_count)
  *  Changed type of max_obj to size_t_f; added parameter for the
  *  number of open objects
  *  Thursday, September 25, 2008 EIP
- *	
+ *
  * SOURCE
-*/
+ */
 int_f
-nh5fget_obj_ids_c ( hid_t_f *file_id , int_f *obj_type, size_t_f *max_objs, 
-    hid_t_f *obj_ids, size_t_f *num_objs)
+h5fget_obj_ids_c(hid_t_f *file_id, int_f *obj_type, size_t_f *max_objs, hid_t_f *obj_ids, size_t_f *num_objs)
 /******/
 {
-    int ret_value = 0;
-    hid_t c_file_id;
+    int      ret_value = 0;
+    hid_t    c_file_id;
     unsigned c_obj_type;
-    size_t u;
-    size_t c_max_objs;
-    ssize_t c_num_objs;
-    hid_t *c_obj_ids;
+    size_t   u;
+    size_t   c_max_objs;
+    ssize_t  c_num_objs;
+    hid_t   *c_obj_ids;
 
-    c_file_id = (hid_t)*file_id;
-    c_obj_type = (unsigned) *obj_type;
+    c_file_id  = (hid_t)*file_id;
+    c_obj_type = (unsigned)*obj_type;
     c_max_objs = (size_t)*max_objs;
-    c_obj_ids = (hid_t *)HDmalloc(sizeof(hid_t)*c_max_objs);
+    c_obj_ids  = (hid_t *)HDmalloc(sizeof(hid_t) * c_max_objs);
 
     c_num_objs = H5Fget_obj_ids(c_file_id, c_obj_type, c_max_objs, c_obj_ids);
-    if(c_num_objs < 0)
+    if (c_num_objs < 0)
         ret_value = -1;
-    for(u = 0; u < c_max_objs; u++)
+    for (u = 0; u < c_max_objs; u++)
         obj_ids[u] = (hid_t_f)c_obj_ids[u];
 
     HDfree(c_obj_ids);
@@ -569,115 +526,155 @@ nh5fget_obj_ids_c ( hid_t_f *file_id , int_f *obj_type, size_t_f *max_objs,
 
 /****if* H5Ff/h5fget_freespace_c
  * NAME
- *        h5fget_freespace_c
+ *  h5fget_freespace_c
  * PURPOSE
- *     Call H5Fget_freespace to get amount of free space within a file
+ *  Call H5Fget_freespace to get amount of free space within a file
  * INPUTS
- *      file_id - identifier of the file to query
+ *  file_id - identifier of the file to query
  * RETURNS
- *     free_space  - amount of free space in file
- *              0 on success, -1 on failure
+ *  free_space  - amount of free space in file
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Quincey Koziol
- *              Tuesday, October 7, 2003
+ *  Tuesday, October 7, 2003
  * SOURCE
-*/
+ */
 
 int_f
-nh5fget_freespace_c ( hid_t_f *file_id , hssize_t_f *free_space)
+h5fget_freespace_c(hid_t_f *file_id, hssize_t_f *free_space)
 /******/
 {
-  int ret_value = 0;
-  hid_t c_file_id;
-  hssize_t c_free_space;
-
-  c_file_id = (hid_t)*file_id;
-  if ( (c_free_space=H5Fget_freespace(c_file_id)) < 0  ) ret_value = -1;
-  *free_space=(hssize_t_f)c_free_space;
-  return ret_value;
+    int      ret_value = 0;
+    hid_t    c_file_id;
+    hssize_t c_free_space;
+
+    c_file_id = (hid_t)*file_id;
+    if ((c_free_space = H5Fget_freespace(c_file_id)) < 0)
+        ret_value = -1;
+    *free_space = (hssize_t_f)c_free_space;
+    return ret_value;
 }
 
 /****if* H5Ff/h5fget_name_c
  * NAME
- *        h5fget_name_c
+ *  h5fget_name_c
  * PURPOSE
- *     Call H5Fget_name to get file's name
+ *  Call H5Fget_name to get file's name
  * INPUTS
- *      obj_id - object identifier
- *              buflen -size of the buffer
+ *  obj_id - object identifier
+ *  buflen -size of the buffer
  * OUTPUTS
- *     buf - buffer to hold the name
- *              size - size of the file's name
+ *  buf - buffer to hold the name
+ *  size - size of the file's name
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Tuesday, July 6, 2004
+ *  Tuesday, July 6, 2004
  * SOURCE
-*/
+ */
 int_f
-nh5fget_name_c(hid_t_f *obj_id, size_t_f *size, _fcd buf, size_t_f *buflen)
+h5fget_name_c(hid_t_f *obj_id, size_t_f *size, _fcd buf, size_t_f *buflen)
 /******/
 {
-    char *c_buf = NULL;           /* Buffer to hold C string */
-    ssize_t size_c = -1;
-    int_f ret_value = 0;          /* Return value */
-
-     /*
-      * Allocate buffer to hold name of an attribute
-      */
-     if(NULL == (c_buf = (char *)HDmalloc((size_t)*buflen + 1)))
-         HGOTO_DONE(FAIL);
-
-     /*
-      * Call H5Fget_name function
-      */
-     if ((size_c = H5Fget_name((hid_t)*obj_id, c_buf, (size_t)*buflen)) < 0)
-         HGOTO_DONE(FAIL);
-
-     /*
-      * Convert C name to FORTRAN and place it in the given buffer
-      */
-      HD5packFstring(c_buf, _fcdtocp(buf), (size_t)*buflen);
+    char   *c_buf     = NULL; /* Buffer to hold C string */
+    ssize_t size_c    = -1;
+    int_f   ret_value = 0; /* Return value */
+
+    /*
+     * Allocate buffer to hold name of file
+     */
+    if (NULL == (c_buf = (char *)HDmalloc((size_t)*buflen + 1)))
+        HGOTO_DONE(FAIL);
+
+    /*
+     * Call H5Fget_name function
+     */
+    if ((size_c = H5Fget_name((hid_t)*obj_id, c_buf, (size_t)*buflen + 1)) < 0)
+        HGOTO_DONE(FAIL);
+
+    /*
+     * Convert C name to FORTRAN and place it in the given buffer
+     */
+    HD5packFstring(c_buf, _fcdtocp(buf), (size_t)*buflen);
 
 done:
-      *size = (size_t_f)size_c;
-      if(c_buf) HDfree(c_buf);
-      return ret_value;
+    *size = (size_t_f)size_c;
+    if (c_buf)
+        HDfree(c_buf);
+    return ret_value;
 }
 
 /****if* H5Ff/h5fget_filesize_c
  * NAME
- *        h5fget_filesize_c
+ *  h5fget_filesize_c
  * PURPOSE
- *     Call H5Fget_filesize to get file size
+ *  Call H5Fget_filesize to get file size
  * INPUTS
- *      file_id - file identifier
+ *  file_id - file identifier
  * OUTPUTS
- *     size - size of the file
+ *  size - size of the file
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Wednesday, July 7, 2004
+ *  Wednesday, July 7, 2004
  * SOURCE
-*/
+ */
 int_f
-nh5fget_filesize_c(hid_t_f *file_id, hsize_t_f *size)
+h5fget_filesize_c(hid_t_f *file_id, hsize_t_f *size)
 /******/
 {
     hsize_t size_c;
-    herr_t ret_value=0;          /* Return value */
+    herr_t  ret_value = 0; /* Return value */
 
-     /*
-      * Call H5Fget_filesize function
-      */
-     if ((ret_value = H5Fget_filesize((hid_t)*file_id, &size_c)) < 0)
-         HGOTO_DONE(FAIL);
-      *size = (hsize_t_f)size_c;
+    /*
+     * Call H5Fget_filesize function
+     */
+    if ((ret_value = H5Fget_filesize((hid_t)*file_id, &size_c)) < 0)
+        HGOTO_DONE(FAIL);
+    *size = (hsize_t_f)size_c;
 
 done:
-      return ret_value;
+    return ret_value;
+}
+
+/****if* H5Ff/h5fget_fileno_c
+ * NAME
+ *  h5fget_fileno_c
+ * PURPOSE
+ *  Call H5Fget_fileno to get file number
+ * INPUTS
+ *  file_id - file identifier
+ * OUTPUTS
+ *  fileno - file number for open file
+ * RETURNS
+ *  0 on success, -1 on failure
+ * AUTHOR
+ *  Quincey Koziol
+ *  Saturday, April 13, 2019
+ * SOURCE
+ */
+int_f
+h5fget_fileno_c(hid_t_f *file_id, int_f *fileno)
+/******/
+{
+    unsigned long fileno_c;
+    herr_t        ret_value = 0; /* Return value */
+
+    /*
+     * Call H5Fget_fileno function
+     */
+    if ((ret_value = H5Fget_fileno((hid_t)*file_id, &fileno_c)) < 0)
+        HGOTO_DONE(FAIL);
+
+    /* XXX: This will have problems if the library fileno value doesn't fit
+     * into an int_f.
+     */
+    *fileno = (int_f)fileno_c;
+
+done:
+    return ret_value;
 }
 
 /****if* H5Ff/h5fget_file_image_c
@@ -697,22 +694,22 @@ done:
  *  M. Scot Breitenfeld
  *  November 26, 2012
  * SOURCE
-*/
+ */
 int_f
 h5fget_file_image_c(hid_t_f *file_id, void *buf_ptr, size_t_f *buf_len, size_t_f *buf_req)
 /******/
 {
-    herr_t ret_value=0;          /* Return value */
+    herr_t  ret_value = 0; /* Return value */
     ssize_t c_buf_req;
     /*
      * Call h5fget_file_image function
      */
-    
-    if ( (c_buf_req = H5Fget_file_image((hid_t)*file_id, buf_ptr, (size_t)*buf_len)) < 0)
-         HGOTO_DONE(FAIL);
+
+    if ((c_buf_req = H5Fget_file_image((hid_t)*file_id, buf_ptr, (size_t)*buf_len)) < 0)
+        HGOTO_DONE(FAIL);
 
     *buf_req = (size_t_f)c_buf_req;
 
 done:
-      return ret_value;
+    return ret_value;
 }
diff --git a/fortran/src/H5Fff.F90 b/fortran/src/H5Fff.F90
new file mode 100644
index 0000000..551db7d
--- /dev/null
+++ b/fortran/src/H5Fff.F90
@@ -0,0 +1,778 @@
+!> @defgroup FH5F Fortran File (H5F) Interface
+!!
+!! @see H5F, C-API
+!!
+!! @see @ref H5F_UG, User Guide
+!!
+
+!> @ingroup FH5F
+!!
+!! @brief This module contains Fortran interfaces for H5F functions.
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+! NOTES
+!       _____ __  __ _____   ____  _____ _______       _   _ _______
+!      |_   _|  \/  |  __ \ / __ \|  __ \__   __|/\   | \ | |__   __|
+! ****   | | | \  / | |__) | |  | | |__) | | |  /  \  |  \| |  | |    ****
+! ****   | | | |\/| |  ___/| |  | |  _  /  | | / /\ \ | . ` |  | |    ****
+! ****  _| |_| |  | | |    | |__| | | \ \  | |/ ____ \| |\  |  | |    ****
+!      |_____|_|  |_|_|     \____/|_|  \_\ |_/_/    \_\_| \_|  |_|
+!
+!  If you add a new H5F function you must add the function name to the
+!  Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
+!  This is needed for Windows based operating systems.
+!
+
+MODULE H5F
+  USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR, C_CHAR, C_NULL_PTR
+  USE H5GLOBAL
+  IMPLICIT NONE
+
+  ! Number of objects opened in H5open_f
+  INTEGER(SIZE_T) :: H5OPEN_NUM_OBJ
+
+#ifndef H5_DOXYGEN
+  INTERFACE
+     INTEGER(C_INT) FUNCTION h5fis_accessible(name, &
+          access_prp_default) BIND(C,NAME='H5Fis_accessible')
+       IMPORT :: C_CHAR
+       IMPORT :: HID_T
+       IMPORT :: C_INT
+       IMPLICIT NONE
+       CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+       INTEGER(HID_T), INTENT(IN), VALUE :: access_prp_default
+     END FUNCTION h5fis_accessible
+  END INTERFACE
+#endif
+
+CONTAINS
+!>
+!! \ingroup FH5F
+!!
+!! \brief Creates HDF5 files.
+!!
+!! \param name         Name of the file to create.
+!! \param access_flags File access flags. Allowable values are:
+!!                     \li H5F_ACC_TRUNC_F
+!!                     \li H5F_ACC_EXCL_F
+!! \param file_id      File identifier.
+!! \param hdferr       \fortran_error
+!! \param creation_prp File creation property list identifier.
+!! \param access_prp   File access property list identifier.
+!!
+!! See C API: @ref H5Fcreate()
+!!
+  SUBROUTINE h5fcreate_f(name, access_flags, file_id, hdferr, &
+       creation_prp, access_prp)
+    IMPLICIT NONE
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    INTEGER, INTENT(IN) :: access_flags
+    INTEGER(HID_T), INTENT(OUT) :: file_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: creation_prp
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: access_prp
+    INTEGER(HID_T) :: creation_prp_default
+    INTEGER(HID_T) :: access_prp_default
+    INTEGER :: namelen ! Length of the name character string
+
+    INTERFACE
+       INTEGER FUNCTION h5fcreate_c(name, namelen, access_flags, &
+            creation_prp_default, access_prp_default, file_id) BIND(C,NAME='h5fcreate_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+         INTEGER, INTENT(IN) :: access_flags
+         INTEGER(HID_T), INTENT(OUT) :: file_id
+         INTEGER(HID_T), INTENT(IN) :: creation_prp_default
+         INTEGER(HID_T), INTENT(IN) :: access_prp_default
+         INTEGER :: namelen
+       END FUNCTION h5fcreate_c
+    END INTERFACE
+
+    creation_prp_default = H5P_DEFAULT_F
+    access_prp_default = H5P_DEFAULT_F
+
+    IF (PRESENT(creation_prp)) creation_prp_default = creation_prp
+    IF (PRESENT(access_prp))   access_prp_default   = access_prp
+    namelen = LEN_TRIM(name)
+    hdferr = h5fcreate_c(name, namelen, access_flags, &
+         creation_prp_default, access_prp_default, file_id)
+
+  END SUBROUTINE h5fcreate_f
+!>
+!! \ingroup FH5F
+!!
+!! \brief Flushes all buffers associated with a file to disk
+!!
+!! \param object_id    Identifier of object used to identify the file.
+!! \param scope        Specifies the scope of the flushing action. Possible values are:
+!!                     \li H5F_SCOPE_GLOBAL_F
+!!                     \li H5F_SCOPE_LOCAL_F
+!! \param hdferr       \fortran_error
+!!
+!! See C API: @ref H5Fflush()
+!!
+  SUBROUTINE h5fflush_f(object_id, scope, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: object_id
+    INTEGER, INTENT(IN) :: scope
+    INTEGER, INTENT(OUT) :: hdferr
+
+    INTERFACE
+       INTEGER FUNCTION h5fflush_c(object_id, scope) BIND(C,NAME='h5fflush_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: object_id
+         INTEGER, INTENT(IN) :: scope
+       END FUNCTION h5fflush_c
+    END INTERFACE
+
+    hdferr = h5fflush_c(object_id, scope)
+
+  END SUBROUTINE h5fflush_f
+!>
+!! \ingroup FH5F
+!!
+!! \brief Mounts a file.
+!!
+!! \param loc_id     The identifier for of file or group in which name is defined.
+!! \param name       The name of the group onto which the file specified by child_id is to be mounted.
+!! \param child_id   The identifier of the file to be mounted.
+!! \param hdferr     \fortran_error
+!! \param access_prp The identifier of the property list to be used.
+!!
+!! See C API: @ref H5Fmount()
+!!
+  SUBROUTINE h5fmount_f(loc_id, name, child_id, hdferr, access_prp)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    INTEGER(HID_T), INTENT(IN) :: child_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: access_prp
+    INTEGER(HID_T) :: access_prp_default
+    INTEGER :: namelen ! Length of the name character string
+
+    INTERFACE
+       INTEGER FUNCTION h5fmount_c(loc_id, name, namelen, &
+            child_id, access_prp_default) BIND(C,NAME='h5fmount_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+         INTEGER(HID_T), INTENT(IN) :: child_id
+         INTEGER(HID_T), INTENT(IN) :: access_prp_default
+         INTEGER :: namelen
+       END FUNCTION h5fmount_c
+    END INTERFACE
+
+    access_prp_default = H5P_DEFAULT_F
+    IF (PRESENT(access_prp))   access_prp_default   = access_prp
+    namelen = LEN_TRIM(name)
+    hdferr = h5fmount_c(loc_id, name, namelen, child_id, access_prp_default)
+
+  END SUBROUTINE h5fmount_f
+
+!>
+!! \ingroup FH5F
+!!
+!! \brief Unmounts a file.
+!!
+!! \param loc_id The identifier for of file or group in which name is defined.
+!! \param name   The name of the mount point.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Funmount()
+!!
+  SUBROUTINE h5funmount_f(loc_id, name, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: namelen ! Length of the name character string
+
+    INTERFACE
+       INTEGER FUNCTION h5funmount_c(loc_id, name, namelen) BIND(C,NAME='h5funmount_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+         INTEGER :: namelen
+       END FUNCTION h5funmount_c
+    END INTERFACE
+
+    namelen = LEN_TRIM(name)
+    hdferr = h5funmount_c(loc_id, name, namelen)
+
+  END SUBROUTINE h5funmount_f
+!>
+!! \ingroup FH5F
+!!
+!! \brief Opens HDF5 file.
+!!
+!! \param name         Name of the file to acecss.
+!! \param access_flags File access flags. Allowable values are:
+!!                     \li H5F_ACC_RDWR_F
+!!                     \li H5F_ACC_RDONLY_F
+!! \param file_id      File identifier.
+!! \param hdferr       \fortran_error
+!! \param access_prp   File access property list identifier.
+!!
+!! See C API: @ref H5Fopen()
+!!
+  SUBROUTINE h5fopen_f(name, access_flags, file_id, hdferr, access_prp)
+    IMPLICIT NONE
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    INTEGER, INTENT(IN) :: access_flags
+    INTEGER(HID_T), INTENT(OUT) :: file_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: access_prp
+    INTEGER(HID_T) :: access_prp_default
+    INTEGER :: namelen ! Length of the name character string
+
+    INTERFACE
+       INTEGER FUNCTION h5fopen_c(name, namelen, access_flags, &
+            access_prp_default, file_id) BIND(C,NAME='h5fopen_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+         INTEGER :: namelen
+         INTEGER, INTENT(IN) :: access_flags
+         INTEGER(HID_T), INTENT(IN) :: access_prp_default
+         INTEGER(HID_T), INTENT(OUT) :: file_id
+       END FUNCTION h5fopen_c
+    END INTERFACE
+
+    access_prp_default = H5P_DEFAULT_F
+    IF (PRESENT(access_prp))   access_prp_default   = access_prp
+    namelen = LEN_TRIM(name)
+    hdferr = h5fopen_c(name, namelen, access_flags, &
+                               access_prp_default, file_id)
+  END SUBROUTINE h5fopen_f
+!>
+!! \ingroup FH5F
+!!
+!! \brief Reopens HDF5 file.
+!!
+!! \param file_id     Identifier of a file for which an additional identifier is required.
+!! \param ret_file_id New file identifier.
+!! \param hdferr      \fortran_error
+!!
+!! See C API: @ref H5Freopen()
+!!
+  SUBROUTINE h5freopen_f(file_id, ret_file_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: file_id
+    INTEGER(HID_T), INTENT(OUT) :: ret_file_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5freopen_c(file_id, ret_file_id) BIND(C,NAME='h5freopen_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: file_id
+         INTEGER(HID_T), INTENT(OUT) :: ret_file_id
+       END FUNCTION h5freopen_c
+    END INTERFACE
+
+    hdferr = h5freopen_c(file_id, ret_file_id)
+
+  END SUBROUTINE h5freopen_f
+!>
+!! \ingroup FH5F
+!!
+!! \brief Returns a file creation property list identifier.
+!!
+!! \param file_id Identifier of a file to creation property list of.
+!! \param prop_id Creation property list identifier.
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Fget_create_plist()
+!!
+  SUBROUTINE h5fget_create_plist_f(file_id, prop_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: file_id
+    INTEGER(HID_T), INTENT(OUT) :: prop_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5fget_create_plist_c(file_id, prop_id) BIND(C,NAME='h5fget_create_plist_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: file_id
+         INTEGER(HID_T), INTENT(OUT) :: prop_id
+       END FUNCTION h5fget_create_plist_c
+    END INTERFACE
+
+    hdferr = h5fget_create_plist_c(file_id, prop_id)
+
+  END SUBROUTINE h5fget_create_plist_f
+!>
+!! \ingroup FH5F
+!!
+!! \brief Returns a file access property list identifier.
+!!
+!! \param file_id   Identifier of a file to creation property list of.
+!! \param access_id Access property list identifier.
+!! \param hdferr    \fortran_error
+!!
+!! See C API: @ref H5Fget_access_plist()
+!!
+  SUBROUTINE h5fget_access_plist_f(file_id, access_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: file_id
+    INTEGER(HID_T), INTENT(OUT) :: access_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5fget_access_plist_c(file_id, access_id) BIND(C,NAME='h5fget_access_plist_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: file_id
+         INTEGER(HID_T), INTENT(OUT) :: access_id
+       END FUNCTION h5fget_access_plist_c
+    END INTERFACE
+
+    hdferr = h5fget_access_plist_c(file_id, access_id)
+
+  END SUBROUTINE h5fget_access_plist_f
+
+!>
+!! \ingroup FH5F
+!!
+!! \brief Determines whether a file can be accessed as HDF5.
+!!
+!! \param name       Name of the file to check.
+!! \param status     Indicates if file is and HDF5 file.
+!! \param hdferr     \fortran_error
+!! \param access_prp File access property list identifier.
+!!
+!! See C API: @ref H5Fis_accessible()
+!!
+  SUBROUTINE h5fis_accessible_f(name, status, hdferr, access_prp)
+    IMPLICIT NONE
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    LOGICAL, INTENT(OUT) :: status
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: access_prp
+
+    INTEGER(HID_T) :: access_prp_default
+    CHARACTER(LEN=LEN_TRIM(name)+1,KIND=C_CHAR) :: c_name
+    INTEGER(C_INT) :: flag    ! "TRUE/FALSE/ERROR" flag from C routine
+
+    access_prp_default = H5P_DEFAULT_F
+    IF (PRESENT(access_prp)) access_prp_default = access_prp
+
+    c_name = TRIM(name)//C_NULL_CHAR
+
+    flag = H5Fis_accessible(c_name, access_prp_default)
+
+    hdferr = 0
+    IF(flag.LT.0) hdferr = -1
+
+    status = .TRUE.
+    IF (flag .EQ. 0) status = .FALSE.
+
+  END SUBROUTINE h5fis_accessible_f
+
+! XXX (VOL_MERGE): This function should probably be marked as
+!                  deprecated since H5Fis_hdf5() is deprecated.
+
+!>
+!! \ingroup FH5F
+!!
+!! \brief Determines whether a file is in the HDF5 format.
+!!
+!! \param name   Name of the file to check.
+!! \param status Indicates if file is and HDF5 file.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Fis_hdf5()
+!!
+  SUBROUTINE h5fis_hdf5_f(name, status, hdferr)
+    IMPLICIT NONE
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    LOGICAL, INTENT(OUT) :: status
+    INTEGER, INTENT(OUT) :: hdferr
+    CHARACTER(LEN=LEN_TRIM(name)+1,KIND=C_CHAR) :: c_name
+    INTEGER(C_INT) :: flag    ! "TRUE/FALSE/ERROR" flag from C routine
+                              ! to define status value.
+
+    c_name = TRIM(name)//C_NULL_CHAR
+
+    flag = H5Fis_accessible(c_name, H5P_DEFAULT_F)
+
+    hdferr = 0
+    IF(flag.LT.0) hdferr = -1
+
+    status = .TRUE.
+    IF (flag .EQ. 0) status = .FALSE.
+
+  END SUBROUTINE h5fis_hdf5_f
+
+!>
+!! \ingroup FH5F
+!!
+!! \brief Closes HDF5 file.
+!!
+!! \param file_id File identifier.
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Fclose()
+!!
+  SUBROUTINE h5fclose_f(file_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: file_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5fclose_c(file_id) BIND(C,NAME='h5fclose_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: file_id
+       END FUNCTION h5fclose_c
+    END INTERFACE
+
+    hdferr = h5fclose_c(file_id)
+
+  END SUBROUTINE h5fclose_f
+
+!>
+!! \ingroup FH5F
+!!
+!! \brief Gets number of the objects open within a file
+!!
+!! \param file_id   File identifier.
+!! \param obj_type  Type of the object; possible values are:
+!!                  \li H5F_OBJ_FILE_F
+!!                  \li H5F_OBJ_DATASET_F
+!!                  \li H5F_OBJ_GROUP_F
+!!                  \li H5F_OBJ_DATATYPE_F
+!!                  \li H5F_OBJ_ALL_F
+!! \param obj_count Number of open objects.
+!! \param hdferr    \fortran_error
+!!
+!! See C API: @ref H5Fget_obj_count()
+!!
+  SUBROUTINE h5fget_obj_count_f(file_id, obj_type, obj_count, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: file_id
+    INTEGER, INTENT(IN)  :: obj_type
+    INTEGER(SIZE_T), INTENT(OUT) :: obj_count
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5fget_obj_count_c(file_id, obj_type, obj_count) BIND(C,NAME='h5fget_obj_count_c')
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: file_id
+         INTEGER, INTENT(IN)  :: obj_type
+         INTEGER(SIZE_T), INTENT(OUT) :: obj_count
+       END FUNCTION h5fget_obj_count_c
+    END INTERFACE
+
+    hdferr = h5fget_obj_count_c(file_id, obj_type, obj_count)
+
+    ! Don't include objects created by H5open in the H5F_OBJ_ALL_F count
+    IF(file_id.EQ.INT(H5F_OBJ_ALL_F,HID_T))THEN
+       obj_count = obj_count - H5OPEN_NUM_OBJ
+    ENDIF
+
+  END SUBROUTINE h5fget_obj_count_f
+
+!>
+!! \ingroup FH5F
+!!
+!! \brief Get list of open objects identifiers within a file
+!!
+!! \param file_id  File identifier.
+!! \param obj_type Type of the object; possible values are:
+!!                 \li H5F_OBJ_FILE_F
+!!                 \li H5F_OBJ_DATASET_F
+!!                 \li H5F_OBJ_GROUP_F
+!!                 \li H5F_OBJ_DATATYPE_F
+!!                 \li H5F_OBJ_ALL_F
+!! \param max_objs Maximum # of objects to retrieve.
+!! \param obj_ids  Array of open object identifiers.
+!! \param hdferr   \fortran_error
+!! \param num_objs Number of open objects.
+!!
+!! See C API: @ref H5Fget_obj_ids()
+!!
+  SUBROUTINE h5fget_obj_ids_f(file_id, obj_type, max_objs, obj_ids, hdferr, num_objs)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: file_id
+    INTEGER, INTENT(IN)  :: obj_type
+    INTEGER(SIZE_T), INTENT(IN)  :: max_objs
+    INTEGER(HID_T), DIMENSION(*), INTENT(INOUT) :: obj_ids
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(SIZE_T), INTENT(OUT), OPTIONAL :: num_objs
+
+    INTEGER(SIZE_T) :: c_num_objs ! Number of open objects of the specified type
+
+    INTERFACE
+       INTEGER FUNCTION h5fget_obj_ids_c(file_id, obj_type, max_objs, obj_ids, c_num_objs) &
+            BIND(C,NAME='h5fget_obj_ids_c')
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: file_id
+         INTEGER, INTENT(IN)  :: obj_type
+         INTEGER(SIZE_T), INTENT(IN)  :: max_objs
+         INTEGER(HID_T), DIMENSION(*), INTENT(INOUT) :: obj_ids
+         INTEGER(SIZE_T), INTENT(OUT) :: c_num_objs
+       END FUNCTION h5fget_obj_ids_c
+    END INTERFACE
+
+    hdferr = h5fget_obj_ids_c(file_id, obj_type, max_objs, obj_ids, c_num_objs)
+    IF (PRESENT(num_objs)) num_objs= c_num_objs
+
+  END SUBROUTINE h5fget_obj_ids_f
+!>
+!! \ingroup FH5F
+!!
+!! \brief Get amount of free space within a file.
+!!
+!! \param file_id    File identifier.
+!! \param free_space Amount of free space in file.
+!! \param hdferr     \fortran_error
+!!
+!! See C API: @ref H5Fget_freespace()
+!!
+  SUBROUTINE h5fget_freespace_f(file_id, free_space, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: file_id
+    INTEGER(HSSIZE_T), INTENT(OUT) :: free_space
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5fget_freespace_c(file_id, free_space) &
+            BIND(C,NAME='h5fget_freespace_c')
+         IMPORT :: HID_T, HSSIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: file_id
+         INTEGER(HSSIZE_T), INTENT(OUT) :: free_space
+       END FUNCTION h5fget_freespace_c
+    END INTERFACE
+
+    hdferr = h5fget_freespace_c(file_id, free_space)
+
+  END SUBROUTINE h5fget_freespace_f
+!>
+!! \ingroup FH5F
+!!
+!! \brief Gets the name of the file from the object identifier.
+!!
+!! \param obj_id Object identifier.
+!! \param buf    Buffer to store the read name.
+!! \param size   Actual size of the name.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Fget_name()
+!!
+  SUBROUTINE h5fget_name_f(obj_id, buf, size, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: obj_id
+    CHARACTER(LEN=*), INTENT(OUT) :: buf
+    INTEGER(SIZE_T), INTENT(OUT) :: size
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(SIZE_T) :: buflen
+
+    INTERFACE
+       INTEGER FUNCTION h5fget_name_c(obj_id, size, buf, buflen) &
+            BIND(C,NAME='h5fget_name_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: obj_id
+         INTEGER(SIZE_T), INTENT(OUT) :: size
+         INTEGER(SIZE_T) :: buflen
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(OUT) :: buf
+       END FUNCTION h5fget_name_c
+    END INTERFACE
+    buflen = LEN(buf)
+    hdferr = h5fget_name_c(obj_id, size, buf, buflen)
+  END SUBROUTINE h5fget_name_f
+!>
+!! \ingroup FH5F
+!!
+!! \brief Retrieves the file size of the HDF5 file.
+!!
+!! \param file_id File identifier.
+!! \param size    File size.
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Fget_filesize()
+!!
+  SUBROUTINE h5fget_filesize_f(file_id, size, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: file_id
+    INTEGER(HSIZE_T), INTENT(OUT) :: size
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5fget_filesize_c(file_id, size) &
+            BIND(C,NAME='h5fget_filesize_c')
+         IMPORT :: HID_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: file_id
+         INTEGER(HSIZE_T), INTENT(OUT) :: size
+       END FUNCTION h5fget_filesize_c
+    END INTERFACE
+    hdferr = h5fget_filesize_c(file_id, size)
+  END SUBROUTINE h5fget_filesize_f
+
+!>
+!! \ingroup FH5F
+!!
+!! \brief Retrieves the file number of the HDF5 file.
+!!
+!! \param file_id File identifier.
+!! \param fileno  File number.
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Fget_fileno()
+!!
+  SUBROUTINE h5fget_fileno_f(file_id, fileno, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: file_id
+    INTEGER, INTENT(OUT) :: fileno
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5fget_fileno_c(file_id, fileno) &
+            BIND(C,NAME='h5fget_fileno_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: file_id
+         INTEGER, INTENT(OUT) :: fileno
+       END FUNCTION h5fget_fileno_c
+    END INTERFACE
+    hdferr = h5fget_fileno_c(file_id, fileno)
+  END SUBROUTINE h5fget_fileno_f
+
+!>
+!! \ingroup FH5F
+!!
+!! \brief Retrieves a copy of the image of an existing, open file.
+!!
+!! \param file_id  Target file identifier.
+!! \param buf_ptr  Pointer to the buffer into which the image of the HDF5 file is to be copied.
+!! \param buf_len  Size of the supplied buffer.
+!! \param hdferr   \fortran_error
+!! \param buf_size Returns the size in bytes of the buffer required to store the file image, no data will be copied.
+!!
+!! See C API: @ref H5Fget_file_image()
+!!
+  SUBROUTINE h5fget_file_image_f(file_id, buf_ptr, buf_len, hdferr, buf_size)
+    IMPLICIT NONE
+    INTEGER(HID_T) , INTENT(IN)              :: file_id
+    TYPE(C_PTR)    , INTENT(INOUT)           :: buf_ptr
+    INTEGER(SIZE_T), INTENT(IN)              :: buf_len
+    INTEGER        , INTENT(OUT)             :: hdferr
+    INTEGER(SIZE_T), INTENT(OUT)  , OPTIONAL :: buf_size
+
+    INTEGER(SIZE_T) :: buf_size_default
+
+    INTERFACE
+       INTEGER FUNCTION h5fget_file_image_c(file_id, buf_ptr, buf_len, buf_size) BIND(C, NAME='h5fget_file_image_c')
+         IMPORT :: C_PTR
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T) , INTENT(IN) :: file_id
+         TYPE(C_PTR)    , VALUE      :: buf_ptr
+         INTEGER(SIZE_T), INTENT(IN) :: buf_len
+         INTEGER(SIZE_T), INTENT(OUT) :: buf_size
+       END FUNCTION h5fget_file_image_c
+    END INTERFACE
+
+    IF(PRESENT(buf_size))THEN
+       buf_ptr = C_NULL_PTR
+    ENDIF
+
+    hdferr = h5fget_file_image_c(file_id, buf_ptr, buf_len, buf_size_default)
+
+    IF(PRESENT(buf_size))THEN
+       buf_size = buf_size_default
+    ENDIF
+
+  END SUBROUTINE h5fget_file_image_f
+
+!>
+!! \ingroup FH5F
+!!
+!! \brief Gets the value of the "minimize dataset headers" value which creates
+!!        smaller dataset object headers when its set and no attributes are present.
+!!
+!! \param file_id  Target file identifier.
+!! \param minimize Value of the setting.
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Fget_dset_no_attrs_hint()
+!!
+  SUBROUTINE h5fget_dset_no_attrs_hint_f(file_id, minimize, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T) , INTENT(IN)              :: file_id
+    LOGICAL        , INTENT(OUT)             :: minimize
+    INTEGER        , INTENT(OUT)             :: hdferr
+    LOGICAL(C_BOOL) :: c_minimize
+
+    INTERFACE
+       INTEGER FUNCTION h5fget_dset_no_attrs_hint_c(file_id, minimize) BIND(C, NAME='H5Fget_dset_no_attrs_hint')
+         IMPORT :: HID_T, C_BOOL
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN), VALUE :: file_id
+         LOGICAL(C_BOOL), INTENT(OUT) :: minimize
+       END FUNCTION h5fget_dset_no_attrs_hint_c
+    END INTERFACE
+
+    hdferr = INT(h5fget_dset_no_attrs_hint_c(file_id, c_minimize))
+
+    ! Transfer value of C C_BOOL type to Fortran LOGICAL
+    minimize = c_minimize
+
+  END SUBROUTINE h5fget_dset_no_attrs_hint_f
+
+!>
+!! \ingroup FH5F
+!!
+!! \brief Sets the value of the "minimize dataset headers" value which creates
+!!        smaller dataset object headers when its set and no attributes are present.
+!!
+!! \param file_id  Target file identifier.
+!! \param minimize Value of the setting.
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Fset_dset_no_attrs_hint()
+!!
+  SUBROUTINE h5fset_dset_no_attrs_hint_f(file_id, minimize, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T) , INTENT(IN)              :: file_id
+    LOGICAL        , INTENT(IN)              :: minimize
+    INTEGER        , INTENT(OUT)             :: hdferr
+    LOGICAL(C_BOOL) :: c_minimize
+
+    INTERFACE
+       INTEGER FUNCTION h5fset_dset_no_attrs_hint_c(file_id, minimize) BIND(C, NAME='H5Fset_dset_no_attrs_hint')
+         IMPORT :: HID_T, C_BOOL
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN), VALUE :: file_id
+         LOGICAL(C_BOOL), INTENT(IN), VALUE :: minimize
+       END FUNCTION h5fset_dset_no_attrs_hint_c
+    END INTERFACE
+
+    ! Transfer value of Fortran LOGICAL to C C_BOOL type
+    c_minimize = minimize
+
+    hdferr = INT(h5fset_dset_no_attrs_hint_c(file_id, c_minimize))
+
+  END SUBROUTINE h5fset_dset_no_attrs_hint_f
+
+END MODULE H5F
+
diff --git a/fortran/src/H5Fff.f90 b/fortran/src/H5Fff.f90
deleted file mode 100644
index faa1967..0000000
--- a/fortran/src/H5Fff.f90
+++ /dev/null
@@ -1,834 +0,0 @@
-!****h* ROBODoc/H5F
-!
-! NAME
-!  MODULE H5F
-!
-! FILE
-!  H5Fff.f90
-!
-! PURPOSE
-!  This file contains Fortran interfaces for H5F functions.
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! NOTES
-!                         *** IMPORTANT ***
-!  If you add a new H5F function you must add the function name to the
-!  Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
-!  This is needed for Windows based operating systems.
-!
-!*****
-
-MODULE H5F
-  USE H5GLOBAL
-
-CONTAINS
-!****s* H5F/h5fcreate_f
-!
-! NAME
-!  h5fcreate_f
-!
-! PURPOSE
-!  Creates HDF5 files.
-!
-! INPUTS
-!  name 	 - name of the file to create
-!  access_flags  - File access flags. Allowable values are:
-!                   H5F_ACC_TRUNC_F
-!                   H5F_ACC_EXCL_F
-! OUTPUTS
-!  file_id 	 - file identifier
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! OPTIONAL PARAMETERS
-!  creation_prp  - file creation property list identifier
-!  access_prp 	 - file access property list identifier
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  February 28, 2001
-!
-! SOURCE
-  SUBROUTINE h5fcreate_f(name, access_flags, file_id, hdferr, &
-       creation_prp, access_prp)
-    IMPLICIT NONE
-    CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of the file
-    INTEGER, INTENT(IN) :: access_flags    ! File access flags
-    INTEGER(HID_T), INTENT(OUT) :: file_id ! File identifier
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: creation_prp
-                                           ! File creation propertly
-                                           ! list identifier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: access_prp
-                                           ! File access property list
-                                           ! identifier
-!*****
-    INTEGER(HID_T) :: creation_prp_default
-    INTEGER(HID_T) :: access_prp_default
-    INTEGER :: namelen ! Length of the name character string
-
-    INTERFACE
-       INTEGER FUNCTION h5fcreate_c(name, namelen, access_flags, &
-            creation_prp_default, access_prp_default, file_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5FCREATE_C':: h5fcreate_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER, INTENT(IN) :: access_flags
-         INTEGER(HID_T), INTENT(OUT) :: file_id
-         INTEGER(HID_T), INTENT(IN) :: creation_prp_default
-         INTEGER(HID_T), INTENT(IN) :: access_prp_default
-         INTEGER :: namelen
-       END FUNCTION h5fcreate_c
-    END INTERFACE
-
-    creation_prp_default = H5P_DEFAULT_F
-    access_prp_default = H5P_DEFAULT_F
-
-    IF (PRESENT(creation_prp)) creation_prp_default = creation_prp
-    IF (PRESENT(access_prp))   access_prp_default   = access_prp
-    namelen = LEN_TRIM(name)
-    hdferr = h5fcreate_c(name, namelen, access_flags, &
-         creation_prp_default, access_prp_default, file_id)
-
-  END SUBROUTINE h5fcreate_f
-!****s* H5F/h5fflush_f
-!
-! NAME
-!  h5fflush_f
-!
-! PURPOSE
-!  Flushes all buffers associated WITH a file to disk
-!
-! INPUTS
-!  object_id 	 - identifier of object used to identify the file.
-!  scope 	 - specifies the scope of the flushing action.
-!                  Possible values are:
-!                    H5F_SCOPE_GLOBAL_F
-!                    H5F_SCOPE_LOCAL_F
-! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! OPTIONAL PARAMETERS
-!  creation_prp  - file creation property list identifier
-!  access_prp 	 - file access property list identifier
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  February 28, 2001
-!
-! SOURCE
-  SUBROUTINE h5fflush_f(object_id, scope, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: object_id !identifier for any object
-                                            !associate with a file,
-                                            !including the file itself,
-                                            !a dataset, a group, an
-                                            !attribute, or a named
-                                            !data type
-
-    INTEGER, INTENT(IN) :: scope            !scope of the flushing
-                                            !action, possible values
-                                            !are: H5F_SCOPE_GLOBAL_F
-                                            ! which flushes the entire
-                                            !virtual file,
-                                            !and H5F_SCOPE_LOCAL_F
-                                            !which flushes only the
-                                            !specified file.
-
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5fflush_c(object_id, scope)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5FFLUSH_C':: h5fflush_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: object_id
-         INTEGER, INTENT(IN) :: scope
-       END FUNCTION h5fflush_c
-    END INTERFACE
-
-    hdferr = h5fflush_c(object_id, scope)
-
-  END SUBROUTINE h5fflush_f
-!****s* H5F/h5fmount_f
-!
-! NAME
-!  h5fmount_f
-!
-! PURPOSE
-!  Mounts a file.
-!
-! INPUTS
-!  loc_id 	 - the identifier for of file or group in
-!                  which name is defined
-!  name 	 - the name of the group onto which the file
-!                  specified by child_id is to be mounted.
-!  child_id 	 - the identifier of the file to be mounted.
-! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! OPTIONAL PARAMETERS
-!  access_prp 	 - the identifier of the property list to be used
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  February 28, 2001
-!
-! SOURCE
-  SUBROUTINE h5fmount_f(loc_id, name, child_id, hdferr, access_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id   ! Identifier for file or group
-                                           ! in which dsetname is defined
-    CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of the group
-    INTEGER(HID_T), INTENT(IN) :: child_id ! File identifier for the
-                                           ! file to be mounted
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: access_prp
-                                           ! File access property list
-                                           ! identifier
-!*****
-    INTEGER(HID_T) :: access_prp_default
-    INTEGER :: namelen ! Length of the name character string
-
-    INTERFACE
-       INTEGER FUNCTION h5fmount_c(loc_id, name, namelen, &
-            child_id, access_prp_default)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5FMOUNT_C':: h5fmount_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         INTEGER(HID_T), INTENT(IN) :: loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER(HID_T), INTENT(IN) :: child_id
-         INTEGER(HID_T), INTENT(IN) :: access_prp_default
-         INTEGER :: namelen
-       END FUNCTION h5fmount_c
-    END INTERFACE
-
-    access_prp_default = H5P_DEFAULT_F
-    IF (PRESENT(access_prp))   access_prp_default   = access_prp
-    namelen = LEN_TRIM(name)
-    hdferr = h5fmount_c(loc_id, name, namelen, child_id, access_prp_default)
-
-  END SUBROUTINE h5fmount_f
-
-!****s* H5F/h5funmount_f
-!
-! NAME
-!  h5funmount_f
-!
-! PURPOSE
-!  Unmounts a file.
-!
-! INPUTS
-!  loc_id 	 - the identifier for of file or group in
-!                  which name is defined
-!  name 	 - the name of the mount point
-! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  February 28, 2001
-!
-! SOURCE
-  SUBROUTINE h5funmount_f(loc_id, name, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id   ! Identifier for file or group
-                                           ! at which the specified file
-                                           ! is to be unmounted
-    CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of the mount point
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-!*****
-    INTEGER :: namelen ! Length of the name character string
-
-    INTERFACE
-       INTEGER FUNCTION h5funmount_c(loc_id, name, namelen)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5FUNMOUNT_C':: h5funmount_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         INTEGER(HID_T), INTENT(IN) :: loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER :: namelen
-       END FUNCTION h5funmount_c
-    END INTERFACE
-
-    namelen = LEN_TRIM(name)
-    hdferr = h5funmount_c(loc_id, name, namelen)
-
-  END SUBROUTINE h5funmount_f
-!****s* H5F/h5fopen_f
-!
-! NAME
-!  h5fopen_f
-!
-! PURPOSE
-!  Opens HDF5 file.
-!
-! INPUTS
-!  name 	 - name of the file to acecss
-!  access_flags  - File access flags. Allowable values are:
-!                   H5F_ACC_RDWR_F
-!                   H5F_ACC_RDONLY_F
-! OUTPUTS
-!  file_id 	 - file identifier
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! OPTIONAL PARAMETERS
-!  access_prp 	 - file access property list identifier
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  February 28, 2001
-!
-! SOURCE
-  SUBROUTINE h5fopen_f(name, access_flags, file_id, hdferr, access_prp)
-    IMPLICIT NONE
-    CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of the file
-    INTEGER, INTENT(IN) :: access_flags    ! File access flags
-    INTEGER(HID_T), INTENT(OUT) :: file_id ! File identifier
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: access_prp
-                                           ! File access property list
-                                           ! identifier
-!*****
-    INTEGER(HID_T) :: access_prp_default
-    INTEGER :: namelen ! Length of the name character string
-
-    INTERFACE
-       INTEGER FUNCTION h5fopen_c(name, namelen, access_flags, &
-            access_prp_default, file_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5FOPEN_C':: h5fopen_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER :: namelen
-         INTEGER, INTENT(IN) :: access_flags
-         INTEGER(HID_T), INTENT(IN) :: access_prp_default
-         INTEGER(HID_T), INTENT(OUT) :: file_id
-       END FUNCTION h5fopen_c
-    END INTERFACE
-
-    access_prp_default = H5P_DEFAULT_F
-    IF (PRESENT(access_prp))   access_prp_default   = access_prp
-    namelen = LEN_TRIM(name)
-    hdferr = h5fopen_c(name, namelen, access_flags, &
-                               access_prp_default, file_id)
-  END SUBROUTINE h5fopen_f
-!****s* H5F/h5freopen_f
-!
-! NAME
-!  h5freopen_f
-!
-! PURPOSE
-!  Reopens HDF5 file.
-!
-! INPUTS
-!  file_id 	 - identifier of a file for which an
-!                  additional identifier is required
-! OUTPUTS
-!  ret_file_id 	 - new file identifier
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  February 28, 2001
-!
-! SOURCE
-  SUBROUTINE h5freopen_f(file_id, ret_file_id, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: file_id      ! File identifier
-    INTEGER(HID_T), INTENT(OUT) :: ret_file_id ! New File identifier
-    INTEGER, INTENT(OUT) :: hdferr             ! Error code
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5freopen_c(file_id, ret_file_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5FREOPEN_C':: h5freopen_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: file_id
-         INTEGER(HID_T), INTENT(OUT) :: ret_file_id
-       END FUNCTION h5freopen_c
-    END INTERFACE
-
-    hdferr = h5freopen_c(file_id, ret_file_id)
-
-  END SUBROUTINE h5freopen_f
-!****s* H5F/h5fget_create_plist_f
-!
-! NAME
-!  h5fget_create_plist_f
-!
-! PURPOSE
-!  Returns a file creation property list identifier.
-!
-! INPUTS
-!  file_id 	 - identifier of a file to creation property list of
-! OUTPUTS
-!  prop_id 	 - creation property list identifier
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  February 28, 2001
-!
-! SOURCE
-  SUBROUTINE h5fget_create_plist_f(file_id, prop_id, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: file_id    ! File identifier
-    INTEGER(HID_T), INTENT(OUT) :: prop_id   ! File creation property
-                                             ! list identifier
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5fget_create_plist_c(file_id, prop_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5FGET_CREATE_PLIST_C':: h5fget_create_plist_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: file_id
-         INTEGER(HID_T), INTENT(OUT) :: prop_id
-       END FUNCTION h5fget_create_plist_c
-    END INTERFACE
-
-    hdferr = h5fget_create_plist_c(file_id, prop_id)
-
-  END SUBROUTINE h5fget_create_plist_f
-!****s* H5F/h5fget_access_plist_f
-!
-! NAME
-!  h5fget_access_plist_f
-!
-! PURPOSE
-!  Returns a file access property list identifier.
-!
-! INPUTS
-!  file_id 	 - identifier of a file to creation property list of
-! OUTPUTS
-!  access_id 	 - access property list identifier
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  February 28, 2001
-!
-! SOURCE
-  SUBROUTINE h5fget_access_plist_f(file_id, access_id, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: file_id      ! File identifier
-    INTEGER(HID_T), INTENT(OUT) :: access_id   ! File access property
-                                               ! list identifier
-    INTEGER, INTENT(OUT) :: hdferr             ! Error code
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5fget_access_plist_c(file_id, access_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5FGET_CREATE_PLIST_C':: h5fget_access_plist_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: file_id
-         INTEGER(HID_T), INTENT(OUT) :: access_id
-       END FUNCTION h5fget_access_plist_c
-    END INTERFACE
-
-    hdferr = h5fget_access_plist_c(file_id, access_id)
-
-  END SUBROUTINE h5fget_access_plist_f
-
-!****s* H5F/h5fis_hdf5_f
-!
-! NAME
-!  h5fis_hdf5_f
-!
-! PURPOSE
-!  Determines whether a file is in the HDF5 format.
-!
-! INPUTS
-!  name 	 - name of the file to check
-! OUTPUTS
-!  status 	 - indicates if file is and HDF5 file
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  February 28, 2001
-!
-! SOURCE
-  SUBROUTINE h5fis_hdf5_f(name, status, hdferr)
-    IMPLICIT NONE
-    CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of the file
-    LOGICAL, INTENT(OUT) :: status         ! Indicates if file
-                                           ! is an HDF5 file
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-!*****
-    INTEGER :: namelen ! Length of the name character string
-    INTEGER :: flag    ! "TRUE/FALSE" flag from C routine
-                       ! to define status value.
-
-    INTERFACE
-       INTEGER FUNCTION h5fis_hdf5_c(name, namelen, flag)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5FIS_HDF5_C':: h5fis_hdf5_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER :: namelen
-         INTEGER :: flag
-       END FUNCTION h5fis_hdf5_c
-    END INTERFACE
-
-    namelen = LEN_TRIM(name)
-    hdferr = h5fis_hdf5_c(name, namelen, flag)
-    status = .TRUE.
-    IF (flag .EQ. 0) status = .FALSE.
-
-  END SUBROUTINE h5fis_hdf5_f
-!****s* H5F/h5fclose_f
-!
-! NAME
-!  h5fclose_f
-!
-! PURPOSE
-!  Closes HDF5 file.
-!
-! INPUTS
-!  file_id 	 - file identifier
-! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  February 28, 2001
-!
-! SOURCE
-  SUBROUTINE h5fclose_f(file_id, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: file_id ! File identifier
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5fclose_c(file_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5FCLOSE_C':: h5fclose_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: file_id
-       END FUNCTION h5fclose_c
-    END INTERFACE
-
-    hdferr = h5fclose_c(file_id)
-
-  END SUBROUTINE h5fclose_f
-
-!****s* H5F/h5fget_obj_count_f
-!
-! NAME
-!  h5fget_obj_count_f
-!
-! PURPOSE
-!  Gets number of the objects open within a file
-!
-! INPUTS
-!  file_id 	 - file identifier
-!  obj_type 	 - type of the object; possible values are:
-!                    H5F_OBJ_FILE_F
-!                    H5F_OBJ_DATASET_F
-!                    H5F_OBJ_GROUP_F
-!                    H5F_OBJ_DATATYPE_F
-!                    H5F_OBJ_ALL_F
-! OUTPUTS
-!  obj_count 	 - number of open objects
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! AUTHOR
-!  Elena Pourmal
-!  September 30, 2002
-!
-! HISTORY
-!  Changed the type of obj_count to INTEGER(SIZE_T)
-!  September 25, 2008 EIP
-!
-! SOURCE
-  SUBROUTINE h5fget_obj_count_f(file_id, obj_type, obj_count, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: file_id ! File identifier
-    INTEGER, INTENT(IN)  :: obj_type      ! Object type
-    INTEGER(SIZE_T), INTENT(OUT) :: obj_count
-                                          ! Number of open objects
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5fget_obj_count_c(file_id, obj_type, obj_count)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5FGET_OBJ_COUNT_C':: h5fget_obj_count_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: file_id
-         INTEGER, INTENT(IN)  :: obj_type      ! Object type
-         INTEGER(SIZE_T), INTENT(OUT) :: obj_count
-         ! Number of open objects
-       END FUNCTION h5fget_obj_count_c
-    END INTERFACE
-
-    hdferr = h5fget_obj_count_c(file_id, obj_type, obj_count)
-
-  END SUBROUTINE h5fget_obj_count_f
-
-!****s* H5F/h5fget_obj_ids_f
-!
-! NAME
-!  h5fget_obj_ids_f
-!
-! PURPOSE
-!  Get list of open objects identifiers within a file
-!
-! INPUTS
-!  file_id 	 - file identifier
-!  obj_type 	 - type of the object; possible values are:
-!                    H5F_OBJ_FILE_F
-!                    H5F_OBJ_DATASET_F
-!                    H5F_OBJ_GROUP_F
-!                    H5F_OBJ_DATATYPE_F
-!                    H5F_OBJ_ALL_F
-! OUTPUTS
-!  obj_ids 	 - array of open object identifiers
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! OPTIONAL PARAMETERS
-!  num_objs 	 - number of open objects
-!
-! AUTHOR
-!  Elena Pourmal
-!  September 30, 2002
-!
-! HISTORY
-!  Added optional parameter num_objs for number of open objects
-!  of the specified type and changed type of max_obj to
-!  INTEGER(SIZE_T)
-!  September 25, 2008 EIP
-!
-! SOURCE
-  SUBROUTINE h5fget_obj_ids_f(file_id, obj_type, max_objs, obj_ids, hdferr, num_objs)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: file_id      ! File identifier
-    INTEGER, INTENT(IN)  :: obj_type           ! Object type
-    INTEGER(SIZE_T), INTENT(IN)  :: max_objs   ! Maximum # of objects to retrieve
-    INTEGER(HID_T), DIMENSION(*), INTENT(INOUT) :: obj_ids
-                                               ! Array of open objects iidentifiers
-    INTEGER, INTENT(OUT) :: hdferr             ! Error code
-    INTEGER(SIZE_T), INTENT(OUT), OPTIONAL :: num_objs ! number of open objects
-!*****
-    INTEGER(SIZE_T) :: c_num_objs ! Number of open objects of the specified type
-
-    INTERFACE
-       INTEGER FUNCTION h5fget_obj_ids_c(file_id, obj_type, max_objs, obj_ids, c_num_objs)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5FGET_OBJ_IDS_C':: h5fget_obj_ids_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: file_id
-         INTEGER, INTENT(IN)  :: obj_type
-         INTEGER(SIZE_T), INTENT(IN)  :: max_objs
-         INTEGER(HID_T), DIMENSION(*), INTENT(INOUT) :: obj_ids
-         INTEGER(SIZE_T), INTENT(OUT) :: c_num_objs
-       END FUNCTION h5fget_obj_ids_c
-    END INTERFACE
-
-    hdferr = h5fget_obj_ids_c(file_id, obj_type, max_objs, obj_ids, c_num_objs)
-    IF (PRESENT(num_objs)) num_objs= c_num_objs
-
-  END SUBROUTINE h5fget_obj_ids_f
-!****s* H5F/h5fget_freespace_f
-!
-! NAME
-!  h5fget_freespace_f
-!
-! PURPOSE
-!  Get amount of free space within a file
-!
-! INPUTS
-!  file_id 	 - file identifier
-! OUTPUTS
-!  free_space 	 - amount of free space in file
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Quincey Koziol
-!  October 7, 2003
-!
-! SOURCE
-  SUBROUTINE h5fget_freespace_f(file_id, free_space, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: file_id ! File identifier
-    INTEGER(HSSIZE_T), INTENT(OUT) :: free_space
-                                          ! amount of free space in file
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5fget_freespace_c(file_id, free_space)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5FGET_FREESPACE_C':: h5fget_freespace_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: file_id
-         INTEGER(HSSIZE_T), INTENT(OUT) :: free_space
-       END FUNCTION h5fget_freespace_c
-    END INTERFACE
-
-    hdferr = h5fget_freespace_c(file_id, free_space)
-
-  END SUBROUTINE h5fget_freespace_f
-!****s* H5F/h5fget_name_f
-!
-! NAME
-!  h5fget_name_f
-!
-! PURPOSE
-!  Gets the name of the file from the object identifier
-!
-! INPUTS
-!  obj_id 	 - object identifier
-! OUTPUTS
-!  buf 	         - buffer to store the read name
-!  size 	 - actual size of the name
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! AUTHOR
-!  Elena Pourmal
-!  July 6, 2004
-!
-! SOURCE
-  SUBROUTINE h5fget_name_f(obj_id, buf, size, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: obj_id   ! Object identifier
-    CHARACTER(LEN=*), INTENT(INOUT) :: buf
-                                           ! Buffer to hold file name
-    INTEGER(SIZE_T), INTENT(OUT) :: size   ! Size of the file name
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code: 0 on success,
-                                           !   	 -1 if fail
-!*****
-    INTEGER(SIZE_T) :: buflen
-
-    INTERFACE
-       INTEGER FUNCTION h5fget_name_c(obj_id, size, buf, buflen)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5FGET_NAME_C'::h5fget_name_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: buf
-         INTEGER(HID_T), INTENT(IN) :: obj_id
-         INTEGER(SIZE_T), INTENT(OUT) :: size
-         INTEGER(SIZE_T) :: buflen
-         CHARACTER(LEN=*), INTENT(OUT) :: buf
-       END FUNCTION h5fget_name_c
-    END INTERFACE
-    buflen = LEN_TRIM(buf)
-    hdferr = h5fget_name_c(obj_id, size, buf, buflen)
-  END SUBROUTINE h5fget_name_f
-!****s* H5F/h5fget_filesize_f
-!
-! NAME
-!  h5fget_filesize_f
-!
-! PURPOSE
-!  Retrieves the file size of the HDF5 file.
-!
-! INPUTS
-!  file_id 	 - file identifier
-! OUTPUTS
-!  size 	 - file size
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  July 7, 2004
-!
-! SOURCE
-  SUBROUTINE h5fget_filesize_f(file_id, size, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: file_id  ! file identifier
-    INTEGER(HSIZE_T), INTENT(OUT) :: size  ! Size of the file
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code: 0 on success,
-                                           !   	 -1 if fail
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5fget_filesize_c(file_id, size)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5FGET_FILESIZE_C'::h5fget_filesize_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: file_id
-         INTEGER(HSIZE_T), INTENT(OUT) :: size
-       END FUNCTION h5fget_filesize_c
-    END INTERFACE
-    hdferr = h5fget_filesize_c(file_id, size)
-  END SUBROUTINE h5fget_filesize_f
-
-
-END MODULE H5F
diff --git a/fortran/src/H5Fff_F03.f90 b/fortran/src/H5Fff_F03.f90
deleted file mode 100644
index 8544870..0000000
--- a/fortran/src/H5Fff_F03.f90
+++ /dev/null
@@ -1,99 +0,0 @@
-!****h* ROBODoc/H5F (F03)
-!
-! NAME
-!  H5F_PROVISIONAL
-!
-! PURPOSE
-!  This file contains Fortran 2003 interfaces for H5F functions.
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! NOTES
-!                         *** IMPORTANT ***
-!  If you add a new H5T function you must add the function name to the
-!  Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
-!  This is needed for Windows based operating systems.
-!
-!*****
-
-MODULE H5F_PROVISIONAL
-
-  USE H5GLOBAL
-  USE, INTRINSIC :: ISO_C_BINDING
-
-CONTAINS
-!****s* H5F (F03)/h5fget_file_image_f_F03
-!
-! NAME
-!  h5fget_file_image_f
-!
-! PURPOSE
-!  Retrieves a copy of the image of an existing, open file. 
-!
-! INPUTS
-!  file_id    - Target file identifier.
-!  buf_ptr    - Pointer to the buffer into which the image of the HDF5 file is to be copied.
-!  buf_len    - Size of the supplied buffer.
-!
-! OUTPUTS
-!  hdferr     - error code:
-!                 0 on success and -1 on failure
-! OPTIONAL PARAMETERS  
-!  buf_size   - Returns the size in bytes of the buffer required to store the file image,
-!               no data will be copied.
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  November 26, 2012
-!
-! Fortran2003 Interface:
-  SUBROUTINE h5fget_file_image_f(file_id, buf_ptr, buf_len, hdferr, buf_size)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T) , INTENT(IN)              :: file_id
-    TYPE(C_PTR)    , INTENT(INOUT)           :: buf_ptr
-    INTEGER(SIZE_T), INTENT(IN)              :: buf_len
-    INTEGER        , INTENT(OUT)             :: hdferr
-    INTEGER(SIZE_T), INTENT(OUT)  , OPTIONAL :: buf_size
-!*****
-
-    INTEGER(SIZE_T) :: buf_size_default
-
-    INTERFACE
-       INTEGER FUNCTION h5fget_file_image_c(file_id, buf_ptr, buf_len, buf_size) BIND(C, NAME='h5fget_file_image_c')
-         USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
-         USE H5GLOBAL
-         INTEGER(HID_T) , INTENT(IN) :: file_id
-         TYPE(C_PTR)    , VALUE      :: buf_ptr
-         INTEGER(SIZE_T), INTENT(IN) :: buf_len
-         INTEGER(SIZE_T), INTENT(IN) :: buf_size
-       END FUNCTION h5fget_file_image_c
-    END INTERFACE
-
-    IF(PRESENT(buf_size))THEN
-       buf_ptr = C_NULL_PTR
-    ENDIF
-
-    hdferr = h5fget_file_image_c(file_id, buf_ptr, buf_len, buf_size_default)
-
-    IF(PRESENT(buf_size))THEN
-       buf_size = buf_size_default
-    ENDIF
-
-  END SUBROUTINE h5fget_file_image_f
-
-END MODULE H5F_PROVISIONAL
diff --git a/fortran/src/H5Fff_F90.f90 b/fortran/src/H5Fff_F90.f90
deleted file mode 100644
index b6e659b..0000000
--- a/fortran/src/H5Fff_F90.f90
+++ /dev/null
@@ -1,43 +0,0 @@
-!****h* ROBODoc/H5F (F90)
-!
-! NAME
-!  H5F_PROVISIONAL
-!
-! PURPOSE
-!  This file contains Fortran 90 interfaces for H5F functions. It 
-!  containsthe same functions as H5Fff_F03.f90, when applicable,
-!  but excludes the Fortran 2003 functions and the interface listings. 
-!  This file will be compiled instead of H5Fff_F03.f90 if Fortran 2003 
-!  functions are not enabled.
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! NOTES
-!                         *** IMPORTANT ***
-!  If you add a new H5F function you must add the function name to the
-!  Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
-!  This is needed for Windows based operating systems.
-!
-!*****
-
-
-MODULE H5F_PROVISIONAL
-
-  USE H5GLOBAL
-  IMPLICIT NONE
-
-END MODULE H5F_PROVISIONAL
diff --git a/fortran/src/H5Gf.c b/fortran/src/H5Gf.c
index 7f755b3..9513a58 100644
--- a/fortran/src/H5Gf.c
+++ b/fortran/src/H5Gf.c
@@ -1,214 +1,213 @@
 /****h* H5Gf/H5Gf
  * PURPOSE
- *   This file contains C stubs for H5G Fortran APIs
+ *  This file contains C stubs for H5G Fortran APIs
  *
  * COPYRIGHT
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  ******
-*/
+ */
 
 #include "H5f90.h"
 #include "H5Eprivate.h"
 
 /****if* H5Gf/h5gcreate_c
  * NAME
- *        h5gcreate_c
+ *  h5gcreate_c
  * PURPOSE
- *     Call H5Gcreate to create a group
+ *  Call H5Gcreate to create a group
  * INPUTS
- *      loc_id - file or group identifier
- *              name - name of the group
- *              namelen - name length
- *              size_hint - length of names in the group
+ *  loc_id - file or group identifier
+ *  name - name of the group
+ *  namelen - name length
+ *  size_hint - length of names in the group
  * OUTPUTS
- *     grp_id - group identifier
+ *  grp_id - group identifier
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Wednesday, August 5, 1999
+ *  Wednesday, August 5, 1999
  * HISTORY
- *
- *              Changed to call H5Gcreate2 because H5Gcreate flip-flops and
- *              H5Gcreate1 can be compiled out of the library
- *              QAK - 2007/08/23
+ *  Changed to call H5Gcreate2 because H5Gcreate flip-flops and
+ *  H5Gcreate1 can be compiled out of the library
+ *  QAK - 2007/08/23
  * SOURCE
-*/
+ */
 int_f
-nh5gcreate_c(hid_t_f *loc_id, _fcd name, int_f *namelen, size_t_f *size_hint,
-	     hid_t_f *grp_id, hid_t_f *lcpl_id, hid_t_f *gcpl_id, hid_t_f *gapl_id )
+h5gcreate_c(hid_t_f *loc_id, _fcd name, int_f *namelen, size_t_f *size_hint, hid_t_f *grp_id,
+            hid_t_f *lcpl_id, hid_t_f *gcpl_id, hid_t_f *gapl_id)
 /******/
 {
-    hid_t c_gcpl_id = -1;          /* Group creation property list */
-    char *c_name = NULL;
+    hid_t c_gcpl_id = -1; /* Group creation property list */
+    char *c_name    = NULL;
     hid_t c_grp_id;
     int_f ret_value = -1;
 
     /*
      * Convert FORTRAN name to C name
      */
-    if(NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
+    if (NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
         goto DONE;
 
     /*
      * Call H5Gcreate function.
      */
-    if(*size_hint == (size_t_f)OBJECT_NAMELEN_DEFAULT_F ){
-      c_grp_id = H5Gcreate2((hid_t)*loc_id, c_name,(hid_t)*lcpl_id,(hid_t)*gcpl_id,(hid_t)*gapl_id);}
+    if (*size_hint == (size_t_f)OBJECT_NAMELEN_DEFAULT_F) {
+        c_grp_id = H5Gcreate2((hid_t)*loc_id, c_name, (hid_t)*lcpl_id, (hid_t)*gcpl_id, (hid_t)*gapl_id);
+    }
     else {
-      /* Create the group creation property list */
-      if((c_gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0)
-	goto DONE;
+        /* Create the group creation property list */
+        if ((c_gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0)
+            goto DONE;
 
-      /* Set the local heap size hint */
-      if(H5Pset_local_heap_size_hint(c_gcpl_id, (size_t)*size_hint) < 0)
-	goto DONE;
+        /* Set the local heap size hint */
+        if (H5Pset_local_heap_size_hint(c_gcpl_id, (size_t)*size_hint) < 0)
+            goto DONE;
 
-      /* Create the group */
-      c_grp_id = H5Gcreate2((hid_t)*loc_id, c_name, H5P_DEFAULT, c_gcpl_id, H5P_DEFAULT);
+        /* Create the group */
+        c_grp_id = H5Gcreate2((hid_t)*loc_id, c_name, H5P_DEFAULT, c_gcpl_id, H5P_DEFAULT);
     }
-    if(c_grp_id < 0)
+    if (c_grp_id < 0)
         goto DONE;
 
     /* Everything OK, set values to return */
-    *grp_id = (hid_t_f)c_grp_id;
+    *grp_id   = (hid_t_f)c_grp_id;
     ret_value = 0;
 
 DONE:
-    if(c_gcpl_id > 0)
+    if (c_gcpl_id > 0)
         H5Pclose(c_gcpl_id);
-    if(c_name)
+    if (c_name)
         HDfree(c_name);
     return ret_value;
 }
 
 /****if* H5Gf/h5gopen_c
  * NAME
- *        h5gopen_c
+ *  h5gopen_c
  * PURPOSE
- *     Call H5Gopen to open a dataset
+ *  Call H5Gopen to open a dataset
  * INPUTS
- *      loc_id - file or group identifier
- *              name - name of the group
- *              namelen - name length
- *              gapl_id - Group access property list identifier
+ *  loc_id - file or group identifier
+ *  name - name of the group
+ *  namelen - name length
+ *  gapl_id - Group access property list identifier
  * OUTPUTS
- *     grp_id - group identifier
+ *  grp_id - group identifier
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Wednesday, August 5, 1999
+ *  Wednesday, August 5, 1999
  *
  * SOURCE
-*/
+ */
 int_f
-nh5gopen_c(hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *gapl_id, hid_t_f *grp_id)
+h5gopen_c(hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *gapl_id, hid_t_f *grp_id)
 /******/
 {
-     char *c_name = NULL;
-     hid_t c_grp_id;
-     int ret_value = -1;
-
-     /*
-      * Convert FORTRAN name to C name
-      */
-    if(NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
+    char *c_name = NULL;
+    hid_t c_grp_id;
+    int   ret_value = -1;
+
+    /*
+     * Convert FORTRAN name to C name
+     */
+    if (NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
         goto DONE;
 
-     /*
-      * Call H5Gopen function.
-      */
-    if((c_grp_id = H5Gopen2((hid_t)*loc_id, c_name, (hid_t)*gapl_id)) < 0)
+    /*
+     * Call H5Gopen function.
+     */
+    if ((c_grp_id = H5Gopen2((hid_t)*loc_id, c_name, (hid_t)*gapl_id)) < 0)
         goto DONE;
 
     /* Everything OK, set values to return */
-    *grp_id = (hid_t_f)c_grp_id;
+    *grp_id   = (hid_t_f)c_grp_id;
     ret_value = 0;
 
 DONE:
-     if(c_name)
-         HDfree(c_name);
-     return ret_value;
+    if (c_name)
+        HDfree(c_name);
+    return ret_value;
 }
 
 /****if* H5Gf/h5gget_obj_info_idx_c
  * NAME
- *        h5gget_obj_info_idx_c
+ *  h5gget_obj_info_idx_c
  * PURPOSE
- *     Call H5Gget_obj_info to return name and the type of group
- *              member
+ *  Call H5Gget_obj_info to return name and the type of group
+ *  member
  * INPUTS
- *      loc_id - file or group identifier
- *              name - name of the group
- *              namelen - name length
- *              idx - index of the group member
+ *  loc_id - file or group identifier
+ *  name - name of the group
+ *  namelen - name length
+ *  idx - index of the group member
  * OUTPUTS
- *     obj_name - buffer to store member's name
- *              obj_namelen - length of the buffer
- *              obj_type - type of the object
+ *  obj_name - buffer to store member's name
+ *  obj_namelen - length of the buffer
+ *  obj_type - type of the object
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Wednesday, August 5, 1999
+ *  Wednesday, August 5, 1999
  * SOURCE
-*/
+ */
 int_f
-nh5gget_obj_info_idx_c(hid_t_f *loc_id, _fcd name, int_f *namelen, int_f *idx,
-    _fcd obj_name, int_f *obj_namelen, int_f *obj_type)
+h5gget_obj_info_idx_c(hid_t_f *loc_id, _fcd name, int_f *namelen, int_f *idx, _fcd obj_name,
+                      int_f *obj_namelen, int_f *obj_type)
 /******/
 {
-    H5O_info_t oinfo;
-    hid_t c_loc_id = (hid_t)*loc_id;
-    char *c_name = NULL;
-    size_t c_obj_namelen;
-    char *c_obj_name = NULL;
-    hsize_t c_idx = (hsize_t)*idx;
-    hid_t gid = (-1);                 /* Temporary group ID */
-    int ret_value = -1;
+    H5O_info2_t oinfo;
+    hid_t       c_loc_id = (hid_t)*loc_id;
+    char       *c_name   = NULL;
+    size_t      c_obj_namelen;
+    char       *c_obj_name = NULL;
+    hsize_t     c_idx      = (hsize_t)*idx;
+    hid_t       gid        = (-1); /* Temporary group ID */
+    int         ret_value  = -1;
 
     /*
      * Convert FORTRAN name to C name
      */
-    if(NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
+    if (NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
         goto DONE;
 
     /*
      * Allocate buffer to hold name of the object
      */
     c_obj_namelen = (size_t)*obj_namelen;
-    if(c_obj_namelen)
-       if(NULL == (c_obj_name = (char *)HDmalloc(c_obj_namelen + 1)))
-           goto DONE;
+    if (c_obj_namelen)
+        if (NULL == (c_obj_name = (char *)HDmalloc(c_obj_namelen + 1)))
+            goto DONE;
 
     /* Get a temporary group ID for the group to query */
-    if((gid = H5Gopen2(c_loc_id, c_name, H5P_DEFAULT)) < 0)
+    if ((gid = H5Gopen2(c_loc_id, c_name, H5P_DEFAULT)) < 0)
         goto DONE;
 
     /* Query the object's information */
-    if(H5Lget_name_by_idx(gid, ".", H5_INDEX_NAME, H5_ITER_INC, c_idx, c_obj_name, c_obj_namelen, H5P_DEFAULT) < 0)
+    if (H5Lget_name_by_idx(gid, ".", H5_INDEX_NAME, H5_ITER_INC, c_idx, c_obj_name, c_obj_namelen,
+                           H5P_DEFAULT) < 0)
         goto DONE;
-    if(H5Oget_info_by_idx(gid, ".", H5_INDEX_NAME, H5_ITER_INC, c_idx, &oinfo, H5P_DEFAULT) < 0)
+    if (H5Oget_info_by_idx3(gid, ".", H5_INDEX_NAME, H5_ITER_INC, c_idx, &oinfo, H5O_INFO_BASIC,
+                            H5P_DEFAULT) < 0)
         goto DONE;
 
-/* XXX: Switch from using H5Gget_objtype_by_idx() means that this routine won't
- *      work on non-hard links - QAK
- */
+    /* XXX: Switch from using H5Gget_objtype_by_idx() means that this routine won't
+     *  work on non-hard links - QAK
+     */
     *obj_type = oinfo.type;
 
     /*
@@ -219,448 +218,450 @@ nh5gget_obj_info_idx_c(hid_t_f *loc_id, _fcd name, int_f *namelen, int_f *idx,
 
 DONE:
     /* Close the temporary group, if it was opened */
-    if(gid > 0)
+    if (gid > 0)
         H5Gclose(gid);
 
-    if(c_obj_name)
+    if (c_obj_name)
         HDfree(c_obj_name);
-    if(c_name)
+    if (c_name)
         HDfree(c_name);
     return ret_value;
 }
 
 /****if* H5Gf/h5gn_members_c
  * NAME
- *        h5gn_members_c
+ *  h5gn_members_c
  * PURPOSE
- *     Call H5Gget_info_by_name to find number of objects in the group
+ *  Call H5Gget_info_by_name to find number of objects in the group
  * INPUTS
- *      loc_id - file or group identifier
- *              name - name of the group
- *              namelen - name length
+ *  loc_id - file or group identifier
+ *  name - name of the group
+ *  namelen - name length
  * OUTPUTS
- *     nmemebers - number of members
+ *  nmemebers - number of members
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Wednesday, August 5, 1999
+ *  Wednesday, August 5, 1999
  * SOURCE
-*/
+ */
 int_f
-nh5gn_members_c(hid_t_f *loc_id, _fcd name, int_f *namelen, int_f *nmembers)
+h5gn_members_c(hid_t_f *loc_id, _fcd name, int_f *namelen, int_f *nmembers)
 /******/
 {
-    char *c_name = NULL;
+    char      *c_name = NULL;
     H5G_info_t ginfo;
-    int ret_value = -1;
+    int        ret_value = -1;
 
     /*
      * Convert FORTRAN name to C name
      */
-    if(NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
+    if (NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
         goto DONE;
 
     /* Call H5Gget_info_by_name() for the number of objects in the group */
-    if(H5Gget_info_by_name((hid_t)*loc_id, c_name, &ginfo, H5P_DEFAULT) < 0)
+    if (H5Gget_info_by_name((hid_t)*loc_id, c_name, &ginfo, H5P_DEFAULT) < 0)
         goto DONE;
 
     *nmembers = (int_f)ginfo.nlinks;
     ret_value = 0;
 
 DONE:
-    if(c_name)
+    if (c_name)
         HDfree(c_name);
     return ret_value;
 }
 
 /****if* H5Gf/h5gclose_c
  * NAME
- *        h5gclose_c
+ *  h5gclose_c
  * PURPOSE
- *     Call H5Gclose to close the group
+ *  Call H5Gclose to close the group
  * INPUTS
- *      grp_id - identifier of the group to be closed
+ *  grp_id - identifier of the group to be closed
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Wednesday, August 5, 1999
+ *  Wednesday, August 5, 1999
  * SOURCE
-*/
+ */
 
 int_f
-nh5gclose_c(hid_t_f *grp_id)
+h5gclose_c(hid_t_f *grp_id)
 /******/
 {
     int ret_value = 0;
 
-    if(H5Gclose((hid_t)*grp_id) < 0)
+    if (H5Gclose((hid_t)*grp_id) < 0)
         ret_value = -1;
     return ret_value;
 }
 
-
 /****if* H5Gf/h5glink_c
  * NAME
- *        h5glink_c
+ *  h5glink_c
  * PURPOSE
- *     Call H5Glink to link the specified type
+ *  Call H5Glink to link the specified type
  * INPUTS
- *      loc_id - identifier of file or group
- *              link_type - link type
- *              current_name - name of the existing object for hard link,
- *                             anything for the soft link
- *              current_namelen - current name lenghth
- *              new_name - new name for the object
- *              new_namelen - new_name lenghth
+ *  loc_id - identifier of file or group
+ *  link_type - link type
+ *  current_name - name of the existing object for hard link,
+ *  anything for the soft link
+ *  current_namelen - current name length
+ *  new_name - new name for the object
+ *  new_namelen - new_name length
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Mingshi Chen
  *  Friday, August 6, 1999
  * SOURCE
-*/
+ */
 
 int_f
-nh5glink_c(hid_t_f *loc_id, int_f *link_type, _fcd current_name,
-    int_f *current_namelen, _fcd new_name, int_f *new_namelen)
+h5glink_c(hid_t_f *loc_id, int_f *link_type, _fcd current_name, int_f *current_namelen, _fcd new_name,
+          int_f *new_namelen)
 /******/
 {
     char *c_current_name = NULL, *c_new_name = NULL;
-    int ret_value = -1;
+    int   ret_value = -1;
 
     /*
-    *  Convert Fortran name to C name
-    */
-    if(NULL == (c_current_name = (char *)HD5f2cstring(current_name, (size_t)*current_namelen)))
+     *  Convert Fortran name to C name
+     */
+    if (NULL == (c_current_name = (char *)HD5f2cstring(current_name, (size_t)*current_namelen)))
         goto DONE;
-    if(NULL == (c_new_name = (char *)HD5f2cstring(new_name, (size_t)*new_namelen)))
+    if (NULL == (c_new_name = (char *)HD5f2cstring(new_name, (size_t)*new_namelen)))
         goto DONE;
 
     /*
-    *  Call appropriate link creation function
-    */
-    switch((H5L_type_t)*link_type) {
+     *  Call appropriate link creation function
+     */
+    switch ((H5L_type_t)*link_type) {
         case H5L_TYPE_HARD:
-            if(H5Lcreate_hard((hid_t)*loc_id, c_current_name, H5L_SAME_LOC, c_new_name, H5P_DEFAULT, H5P_DEFAULT) < 0)
+            if (H5Lcreate_hard((hid_t)*loc_id, c_current_name, H5L_SAME_LOC, c_new_name, H5P_DEFAULT,
+                               H5P_DEFAULT) < 0)
                 goto DONE;
             break;
 
         case H5L_TYPE_SOFT:
-            if(H5Lcreate_soft(c_current_name, (hid_t)*loc_id, c_new_name, H5P_DEFAULT, H5P_DEFAULT) < 0)
+            if (H5Lcreate_soft(c_current_name, (hid_t)*loc_id, c_new_name, H5P_DEFAULT, H5P_DEFAULT) < 0)
                 goto DONE;
             break;
 
-    /* Cases below were added to remove the warnings in gcc 4.9.2 and probably other */
+            /* Cases below were added to remove the warnings in gcc 4.9.2 and probably other */
         case H5L_TYPE_EXTERNAL:
             ret_value = -1;
-                goto DONE;
+            goto DONE;
             break;
 
         case H5L_TYPE_MAX:
             ret_value = -1;
-                goto DONE;
+            goto DONE;
             break;
 
         case H5L_TYPE_ERROR:
             ret_value = -1;
-                goto DONE;
+            goto DONE;
             break;
-    /* End of the warnings fix */
- 
-        default:        /* Unknown/unhandled link type */
+            /* End of the warnings fix */
+
+        default: /* Unknown/unhandled link type */
             goto DONE;
     } /* end switch */
     ret_value = 0;
 
 DONE:
-    if(c_current_name)
+    if (c_current_name)
         HDfree(c_current_name);
-    if(c_new_name)
+    if (c_new_name)
         HDfree(c_new_name);
 
-    return ret_value ;
+    return ret_value;
 }
 
 /****if* H5Gf/h5glink2_c
  * NAME
- *        h5glink2_c
+ *  h5glink2_c
  * PURPOSE
- *     Call H5Glink2 to link the specified type
+ *  Call H5Glink2 to link the specified type
  * INPUTS
- *      cur_loc_id - identifier of file or group
- *              cur_name - name of the existing object for hard link releative
- *                         to cur_loc_id location,
- *                         anything for the soft link
- *              current_namelen - current name lenghth
- *              link_type - link type
- *              new_loc_id - location identifier
- *              new_name - new name for the object releative to the new_loc_id
- *                         location
- *              new_namelen - new_name lenghth
+ *  cur_loc_id - identifier of file or group
+ *  cur_name - name of the existing object for hard link relative
+ *  to cur_loc_id location,
+ *  anything for the soft link
+ *  current_namelen - current name length
+ *  link_type - link type
+ *  new_loc_id - location identifier
+ *  new_name - new name for the object relative to the new_loc_id
+ *  location
+ *  new_namelen - new_name length
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Wednesday, September 25, 2002
+ *  Wednesday, September 25, 2002
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5glink2_c(hid_t_f *cur_loc_id, _fcd cur_name, int_f *cur_namelen,
-    int_f *link_type, hid_t_f *new_loc_id, _fcd new_name, int_f *new_namelen)
+h5glink2_c(hid_t_f *cur_loc_id, _fcd cur_name, int_f *cur_namelen, int_f *link_type, hid_t_f *new_loc_id,
+           _fcd new_name, int_f *new_namelen)
 /******/
 {
     char *c_cur_name = NULL, *c_new_name = NULL;
-    int ret_value = -1;
+    int   ret_value = -1;
 
     /*
      *  Convert Fortran name to C name
      */
-    if(NULL == (c_cur_name = (char *)HD5f2cstring(cur_name, (size_t)*cur_namelen)))
+    if (NULL == (c_cur_name = (char *)HD5f2cstring(cur_name, (size_t)*cur_namelen)))
         goto DONE;
-    if(NULL == (c_new_name = (char *)HD5f2cstring(new_name, (size_t)*new_namelen)))
+    if (NULL == (c_new_name = (char *)HD5f2cstring(new_name, (size_t)*new_namelen)))
         goto DONE;
 
     /*
-    *  Call appropriate link creation function
-    */
-    switch((H5L_type_t)*link_type) {
+     *  Call appropriate link creation function
+     */
+    switch ((H5L_type_t)*link_type) {
         case H5L_TYPE_HARD:
-            if(H5Lcreate_hard((hid_t)*cur_loc_id, c_cur_name, (hid_t)*new_loc_id, c_new_name, H5P_DEFAULT, H5P_DEFAULT) < 0)
+            if (H5Lcreate_hard((hid_t)*cur_loc_id, c_cur_name, (hid_t)*new_loc_id, c_new_name, H5P_DEFAULT,
+                               H5P_DEFAULT) < 0)
                 goto DONE;
             break;
 
         case H5L_TYPE_SOFT:
-            if(H5Lcreate_soft(c_cur_name, (hid_t)*new_loc_id, c_new_name, H5P_DEFAULT, H5P_DEFAULT) < 0)
+            if (H5Lcreate_soft(c_cur_name, (hid_t)*new_loc_id, c_new_name, H5P_DEFAULT, H5P_DEFAULT) < 0)
                 goto DONE;
             break;
-    /* Cases below were added to remove the warnings in gcc 4.9.2 and probably other */
+            /* Cases below were added to remove the warnings in gcc 4.9.2 and probably other */
         case H5L_TYPE_EXTERNAL:
             ret_value = -1;
-                goto DONE;
+            goto DONE;
             break;
 
         case H5L_TYPE_MAX:
             ret_value = -1;
-                goto DONE;
+            goto DONE;
             break;
 
         case H5L_TYPE_ERROR:
             ret_value = -1;
-                goto DONE;
+            goto DONE;
             break;
-    /* End of the warnings fix */
+            /* End of the warnings fix */
 
-        default:        /* Unknown/unhandled link type */
+        default: /* Unknown/unhandled link type */
             goto DONE;
     } /* end switch */
     ret_value = 0;
 
 DONE:
-    if(c_cur_name)
+    if (c_cur_name)
         HDfree(c_cur_name);
-    if(c_new_name)
+    if (c_new_name)
         HDfree(c_new_name);
-    return ret_value ;
+    return ret_value;
 }
 
 /****if* H5Gf/h5gunlink_c
  * NAME
- *        h5gunlink_c
+ *  h5gunlink_c
  * PURPOSE
- *     Call H5Gunlink to remove  the specified name
+ *  Call H5Gunlink to remove  the specified name
  * INPUTS
- *      loc_id - identifier of file or group
- *              name - name of the object to unlink
+ *  loc_id - identifier of file or group
+ *  name - name of the object to unlink
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Mingshi Chen
  *  Friday, August 6, 1999
  * SOURCE
-*/
+ */
 
 int_f
-nh5gunlink_c(hid_t_f *loc_id, _fcd name, int_f *namelen)
+h5gunlink_c(hid_t_f *loc_id, _fcd name, int_f *namelen)
 /******/
 {
-    char *c_name = NULL;
-    int ret_value = -1;
+    char *c_name    = NULL;
+    int   ret_value = -1;
 
     /*
      *  Convert Fortran name to C name
      */
-    if(NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
+    if (NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
         goto DONE;
 
     /*
      *  Call H5Gunlink function
      */
-    if(H5Ldelete((hid_t)*loc_id, c_name, H5P_DEFAULT) < 0)
+    if (H5Ldelete((hid_t)*loc_id, c_name, H5P_DEFAULT) < 0)
         goto DONE;
     ret_value = 0;
 
 DONE:
-    if(c_name)
+    if (c_name)
         HDfree(c_name);
     return ret_value;
 }
 
 /****if* H5Gf/h5gmove_c
  * NAME
- *        h5gmove_c
+ *  h5gmove_c
  * PURPOSE
- *     Call H5Gmove to rename an object within an HDF5 file
+ *  Call H5Gmove to rename an object within an HDF5 file
  * INPUTS
- *      loc_id - identifier of file or group
- *              src_name - name of the original object
- *              src_namelen - original name lenghth
- *              dst_name - new name for the object
- *              dst_namelen - new name lenghth
+ *  loc_id - identifier of file or group
+ *  src_name - name of the original object
+ *  src_namelen - original name length
+ *  dst_name - new name for the object
+ *  dst_namelen - new name length
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Mingshi Chen
  *  Friday, August 6, 1999
  * SOURCE
-*/
+ */
 
 int_f
-nh5gmove_c(hid_t_f *loc_id, _fcd src_name, int_f *src_namelen, _fcd dst_name, int_f*dst_namelen)
+h5gmove_c(hid_t_f *loc_id, _fcd src_name, int_f *src_namelen, _fcd dst_name, int_f *dst_namelen)
 /******/
 {
     char *c_src_name = NULL, *c_dst_name = NULL;
-    int ret_value = -1;
+    int   ret_value = -1;
 
     /*
      *  Convert Fortran name to C name
      */
-    if(NULL == (c_src_name = (char *)HD5f2cstring(src_name, (size_t)*src_namelen)))
+    if (NULL == (c_src_name = (char *)HD5f2cstring(src_name, (size_t)*src_namelen)))
         goto DONE;
-    if(NULL == (c_dst_name = (char *)HD5f2cstring(dst_name, (size_t)*dst_namelen)))
+    if (NULL == (c_dst_name = (char *)HD5f2cstring(dst_name, (size_t)*dst_namelen)))
         goto DONE;
 
     /*
      *  Call H5Gmove function
      */
-    if(H5Lmove((hid_t)*loc_id, c_src_name, H5L_SAME_LOC, c_dst_name, H5P_DEFAULT, H5P_DEFAULT) < 0)
+    if (H5Lmove((hid_t)*loc_id, c_src_name, H5L_SAME_LOC, c_dst_name, H5P_DEFAULT, H5P_DEFAULT) < 0)
         goto DONE;
 
     ret_value = 0;
 
 DONE:
-    if(c_src_name)
+    if (c_src_name)
         HDfree(c_src_name);
-    if(c_dst_name)
+    if (c_dst_name)
         HDfree(c_dst_name);
     return ret_value;
 }
 
 /****if* H5Gf/h5gmove2_c
  * NAME
- *        h5gmove2_c
+ *  h5gmove2_c
  * PURPOSE
- *     Call H5Gmove2 to rename an object within an HDF5 file
+ *  Call H5Gmove2 to rename an object within an HDF5 file
  * INPUTS
- *      src_loc_id - identifier of file or group
- *              src_name - name of the original object relative to src_loc_id
- *              src_namelen - original name lenghth
- *              dst_loc_id - new location identifier
- *              dst_name - new name for the object relative to dst_loc_id
- *              dst_namelen - new name lenghth
+ *  src_loc_id - identifier of file or group
+ *  src_name - name of the original object relative to src_loc_id
+ *  src_namelen - original name length
+ *  dst_loc_id - new location identifier
+ *  dst_name - new name for the object relative to dst_loc_id
+ *  dst_namelen - new name length
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
  *  Wednesday, September 25, 2002
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5gmove2_c(hid_t_f *src_loc_id, _fcd src_name, int_f *src_namelen, hid_t_f *dst_loc_id, _fcd dst_name, int_f*dst_namelen)
+h5gmove2_c(hid_t_f *src_loc_id, _fcd src_name, int_f *src_namelen, hid_t_f *dst_loc_id, _fcd dst_name,
+           int_f *dst_namelen)
 /******/
 {
     char *c_src_name = NULL, *c_dst_name = NULL;
-    int ret_value = -1;
+    int   ret_value = -1;
 
     /*
      *  Convert Fortran name to C name
      */
-    if(NULL == (c_src_name = (char *)HD5f2cstring(src_name, (size_t)*src_namelen)))
+    if (NULL == (c_src_name = (char *)HD5f2cstring(src_name, (size_t)*src_namelen)))
         goto DONE;
-    if(NULL == (c_dst_name = (char *)HD5f2cstring(dst_name, (size_t)*dst_namelen)))
+    if (NULL == (c_dst_name = (char *)HD5f2cstring(dst_name, (size_t)*dst_namelen)))
         goto DONE;
 
     /*
      *  Call H5Gmove2 function
      */
-    if(H5Lmove((hid_t)*src_loc_id, c_src_name, (hid_t)*dst_loc_id, c_dst_name, H5P_DEFAULT, H5P_DEFAULT) < 0)
+    if (H5Lmove((hid_t)*src_loc_id, c_src_name, (hid_t)*dst_loc_id, c_dst_name, H5P_DEFAULT, H5P_DEFAULT) < 0)
         goto DONE;
 
     ret_value = 0;
 
 DONE:
-    if(c_src_name)
+    if (c_src_name)
         HDfree(c_src_name);
-    if(c_dst_name)
+    if (c_dst_name)
         HDfree(c_dst_name);
     return ret_value;
 }
 
 /****if* H5Gf/h5gget_linkval_c
  * NAME
- *        h5gget_linkval_c
+ *  h5gget_linkval_c
  * PURPOSE
- *     Call H5Gget_linkval to return the name of object
+ *  Call H5Gget_linkval to return the name of object
  * INPUTS
- *      loc_id - identifier of file or group
- *              name - name of the object that symbolic link points to
- *              namelen - the name lenghth
- *              size - lenghth of retrurned value
+ *  loc_id - identifier of file or group
+ *  name - name of the object that symbolic link points to
+ *  namelen - the name length
+ *  size - length of retrurned value
  * OUTPUTS
- *     value - name to be returned
+ *  value - name to be returned
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Mingshi Chen
  *  Friday, August 6, 1999
  * SOURCE
-*/
+ */
 
 int_f
-nh5gget_linkval_c(hid_t_f *loc_id, _fcd name, int_f *namelen, size_t_f *size,
-    _fcd value)
+h5gget_linkval_c(hid_t_f *loc_id, _fcd name, int_f *namelen, size_t_f *size, _fcd value)
 /******/
 {
-    char *c_name = NULL;
-    char *c_value = NULL;
-    int ret_value = -1;
+    char *c_name    = NULL;
+    char *c_value   = NULL;
+    int   ret_value = -1;
 
     /*
      *  Convert Fortran name to C name
      */
-    if(NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
+    if (NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
         goto DONE;
 
     /*
      *  Allocate buffer to hold name of the value
      */
-    if(*size) c_value = (char *)HDmalloc((size_t)*size);
-    if(c_value == NULL) {
-                       HDfree(c_name);
-                       return ret_value;
-                       }
+    if (*size)
+        c_value = (char *)HDmalloc((size_t)*size);
+    if (c_value == NULL) {
+        HDfree(c_name);
+        return ret_value;
+    }
 
     /*
      *  Call H5Lget_val function
      */
-    if(H5Lget_val((hid_t)*loc_id, c_name, c_value, (size_t)*size, H5P_DEFAULT) < 0)
-         goto DONE;
+    if (H5Lget_val((hid_t)*loc_id, c_name, c_value, (size_t)*size, H5P_DEFAULT) < 0)
+        goto DONE;
 
     /*
      *  Convert C name to FORTRAN and place it in the given buffer
@@ -669,155 +670,153 @@ nh5gget_linkval_c(hid_t_f *loc_id, _fcd name, int_f *namelen, size_t_f *size,
     ret_value = 0;
 
 DONE:
-    if(c_value)
+    if (c_value)
         HDfree(c_value);
-    if(c_name)
+    if (c_name)
         HDfree(c_name);
     return ret_value;
 }
 
 /****if* H5Gf/h5gset_comment_c
  * NAME
- *        h5gset_comment_c
+ *  h5gset_comment_c
  * PURPOSE
- *     Call H5Oset_comment_by_name to set comments for the specified object
+ *  Call H5Oset_comment_by_name to set comments for the specified object
  * INPUTS
- *      loc_id - identifier of file or group
- *              name - name of object whose comment is to be set or reset
- *              namelen - the name lenghth
- *              comment - the new comment
- *              commentlen - new comment lenghth
+ *  loc_id - identifier of file or group
+ *  name - name of object whose comment is to be set or reset
+ *  namelen - the name length
+ *  comment - the new comment
+ *  commentlen - new comment length
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Mingshi Chen
- *              Friday, August 6, 1999
+ *  Friday, August 6, 1999
  * HISTORY
- * Elena Pourmal
+ *  Elena Pourmal
  * SOURCE
-*/
+ */
 int_f
-nh5gset_comment_c(hid_t_f *loc_id, _fcd name, int_f *namelen, _fcd comment,
-    int_f *commentlen)
+h5gset_comment_c(hid_t_f *loc_id, _fcd name, int_f *namelen, _fcd comment, int_f *commentlen)
 /******/
 {
     char *c_name = NULL, *c_comment = NULL;
-    int ret_value = -1;
+    int   ret_value = -1;
 
     /*
      *  Convert Fortran name to C name
      */
-    if(NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
+    if (NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
         goto DONE;
-    if(NULL == (c_comment = (char *)HD5f2cstring(comment, (size_t)*commentlen)))
+    if (NULL == (c_comment = (char *)HD5f2cstring(comment, (size_t)*commentlen)))
         goto DONE;
 
     /*
      *  Call H5Oset_comment_by_name function
      */
-    if(H5Oset_comment_by_name((hid_t)*loc_id, c_name, c_comment, H5P_DEFAULT) < 0)
+    if (H5Oset_comment_by_name((hid_t)*loc_id, c_name, c_comment, H5P_DEFAULT) < 0)
         goto DONE;
     ret_value = 0;
 
 DONE:
-    if(c_name)
+    if (c_name)
         HDfree(c_name);
-    if(c_comment)
+    if (c_comment)
         HDfree(c_comment);
     return ret_value;
 }
 
 /****if* H5Gf/h5gget_comment_c
  * NAME
- *        h5gget_comment_c
+ *  h5gget_comment_c
  * PURPOSE
- *     Call H5Oget_comment_by_name to retrieve comments for the specified object
+ *  Call H5Oget_comment_by_name to retrieve comments for the specified object
  * INPUTS
- *      loc_id - identifier of file or group
- *              name - name of object whose comment is to be set or reset
- *              namelen - the name lenghth
- *              bufsize - at most bufsize characters
- *              comment - the new comment
+ *  loc_id - identifier of file or group
+ *  name - name of object whose comment is to be set or reset
+ *  namelen - the name length
+ *  bufsize - at most bufsize characters
+ *  comment - the new comment
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Mingshi Chen
- *              Friday, August 6, 1999
+ *  Friday, August 6, 1999
  * SOURCE
-*/
+ */
 int_f
-nh5gget_comment_c(hid_t_f *loc_id, _fcd name, int_f *namelen, size_t_f *bufsize,
-    _fcd comment)
+h5gget_comment_c(hid_t_f *loc_id, _fcd name, int_f *namelen, size_t_f *bufsize, _fcd comment)
 /******/
 {
-    char *c_name = NULL, *c_comment = NULL;
+    char  *c_name = NULL, *c_comment = NULL;
     size_t c_bufsize;
-    int ret_value = -1;
+    int    ret_value = -1;
 
     /*
      *  Convert Fortran name to C name
      */
-    if(NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
+    if (NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
         goto DONE;
 
     /*
      *  Allocate buffer to hold the comment
      */
     c_bufsize = (size_t)*bufsize;
-    if(c_bufsize) {
-        if(NULL == (c_comment = (char *)HDmalloc(c_bufsize + 1)))
+    if (c_bufsize) {
+        if (NULL == (c_comment = (char *)HDmalloc(c_bufsize + 1)))
             goto DONE;
     } /* end if */
 
     /*
      *  Call H5Oget_comment_by_name function
      */
-    if(H5Oget_comment_by_name((hid_t)*loc_id, c_name, c_comment, c_bufsize, H5P_DEFAULT) < 0)
+    if (H5Oget_comment_by_name((hid_t)*loc_id, c_name, c_comment, c_bufsize, H5P_DEFAULT) < 0)
         goto DONE;
 
     /*
-    *  Convert C name to FORTRAN and place it in the given buffer
-    */
+     *  Convert C name to FORTRAN and place it in the given buffer
+     */
     HD5packFstring(c_comment, _fcdtocp(comment), c_bufsize);
     ret_value = 0;
 
 DONE:
-    if(c_name)
+    if (c_name)
         HDfree(c_name);
-    if(c_comment)
+    if (c_comment)
         HDfree(c_comment);
     return ret_value;
 }
 
 /****if* H5Gf/h5gcreate_anon_c
  * NAME
- *        h5gcreate_anon_c
+ *  h5gcreate_anon_c
  * PURPOSE
- *     Call H5Gcreate_anon
+ *  Call H5Gcreate_anon
  * INPUTS
  *
- *              loc_id  - Location identifier
- *              gcpl_id - Group creation property list identifier
- *              gapl_id - Group access property list identifier
+ *  loc_id  - Location identifier
+ *  gcpl_id - Group creation property list identifier
+ *  gapl_id - Group access property list identifier
  *
  * OUTPUTS
- *     grp_id - group identifier
+ *  grp_id - group identifier
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
  *  February 15, 2008
  * SOURCE
-*/
+ */
 int_f
-nh5gcreate_anon_c(hid_t_f *loc_id, hid_t_f *gcpl_id, hid_t_f *gapl_id, hid_t_f *grp_id)
+h5gcreate_anon_c(hid_t_f *loc_id, hid_t_f *gcpl_id, hid_t_f *gapl_id, hid_t_f *grp_id)
 /******/
 {
 
-  int_f ret_value=0;          /* Return value */
+    int_f ret_value = 0; /* Return value */
 
-  if ((*grp_id = (hid_t_f)H5Gcreate_anon((hid_t)*loc_id,(hid_t)*gcpl_id,(hid_t)*gapl_id)) < 0)
-    HGOTO_DONE(FAIL);
+    if ((*grp_id = (hid_t_f)H5Gcreate_anon((hid_t)*loc_id, (hid_t)*gcpl_id, (hid_t)*gapl_id)) < 0)
+        HGOTO_DONE(FAIL);
 
 done:
     return ret_value;
@@ -825,230 +824,231 @@ done:
 
 /****if* H5Gf/h5gget_create_plist_c
  * NAME
- *        h5gget_create_plist_c
+ *  h5gget_create_plist_c
  * PURPOSE
- *     Call H5Gget_create_plist
+ *  Call H5Gget_create_plist
  * INPUTS
  *
- *              grp_id - group identifier
+ *  grp_id - group identifier
  *
  * OUTPUTS
- *     gcpl_id - Group creation property list identifier
+ *  gcpl_id - Group creation property list identifier
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
  *  February 15, 2008
  * SOURCE
-*/
+ */
 int_f
-nh5gget_create_plist_c(hid_t_f *grp_id, hid_t_f *gcpl_id )
+h5gget_create_plist_c(hid_t_f *grp_id, hid_t_f *gcpl_id)
 /******/
 {
-  int_f ret_value=0; /* Return value */
+    int_f ret_value = 0; /* Return value */
 
-  if ((*gcpl_id = (hid_t_f)H5Gget_create_plist((hid_t)*grp_id)) < 0)
-    HGOTO_DONE(FAIL);
+    if ((*gcpl_id = (hid_t_f)H5Gget_create_plist((hid_t)*grp_id)) < 0)
+        HGOTO_DONE(FAIL);
 
 done:
     return ret_value;
 }
 
-
 /****if* H5Gf/h5gget_info_c
  * NAME
- *      h5gget_info_c
+ *  h5gget_info_c
  * PURPOSE
- *   Call H5Gget_info
+ *  Call H5Gget_info
  * INPUTS
- *    group_id - Group identifier
+ *  group_id - Group identifier
  * OUTPUTS
  *
- *            storage_type - Type of storage for links in group:
+ *  storage_type - Type of storage for links in group:
  *                             H5G_STORAGE_TYPE_COMPACT: Compact storage
  *                             H5G_STORAGE_TYPE_DENSE: Indexed storage
  *                             H5G_STORAGE_TYPE_SYMBOL_TABLE: Symbol tables, the original HDF5 structure
  *
- *                  nlinks - Number of links in group
- *              max_corder - Current maximum creation order value for group
- *                 mounted - Whether group has a file mounted on it (0 = false, 1 = true)
+ *  nlinks - Number of links in group
+ *  max_corder - Current maximum creation order value for group
+ *  mounted - Whether group has a file mounted on it (0 = false, 1 = true)
  *
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              February 15, 2008
+ *  February 15, 2008
  * HISTORY
  *
- *          - Added 'mounted' paramater
- *            M. Scot Breitenfeld
- *            July 16, 2008
+ *  - Added 'mounted' parameter
+ *  M. Scot Breitenfeld
+ *  July 16, 2008
  * SOURCE
-*/
+ */
 int_f
-nh5gget_info_c (hid_t_f *group_id, int_f *storage_type, int_f *nlinks, int_f *max_corder, int_f *mounted )
+h5gget_info_c(hid_t_f *group_id, int_f *storage_type, int_f *nlinks, int_f *max_corder, int_f *mounted)
 /******/
 {
 
-    int_f ret_value = 0;          /* Return value */
+    int_f      ret_value = 0; /* Return value */
     H5G_info_t ginfo;
 
-     /*
-      * Call H5Gget_info function.
-      */
-    if(H5Gget_info((hid_t)*group_id,&ginfo) < 0)
-      HGOTO_DONE(FAIL);
+    /*
+     * Call H5Gget_info function.
+     */
+    if (H5Gget_info((hid_t)*group_id, &ginfo) < 0)
+        HGOTO_DONE(FAIL);
 
     /* Unpack the structure */
 
     *storage_type = (int_f)ginfo.storage_type;
-    *nlinks = (int_f)ginfo.nlinks;
-    *max_corder = (int_f)ginfo.max_corder;
-    *mounted = 0;
-    if(ginfo.mounted) *mounted = 1;
+    *nlinks       = (int_f)ginfo.nlinks;
+    *max_corder   = (int_f)ginfo.max_corder;
+    *mounted      = 0;
+    if (ginfo.mounted)
+        *mounted = 1;
 
 done:
     return ret_value;
 }
 
-
 /****if* H5Gf/h5gget_info_by_idx_c
  * NAME
- *      h5gget_info_by_idx_c
+ *  h5gget_info_by_idx_c
  * PURPOSE
- *   Call H5Gget_info_by_idx
+ *  Call H5Gget_info_by_idx
  * INPUTS
  *
- *          loc_id - File or group identifier
- *      group_name - Name of group containing group for which information is to be retrieved
- *   group_namelen - name length
- *      index_type - Index type
- *           order - Order of the count in the index
- *               n - Position in the index of the group for which information is retrieved
- *         lapl_id - Link access property list
+ *  loc_id - File or group identifier
+ *  group_name - Name of group containing group for which information is to be retrieved
+ *  group_namelen - name length
+ *  index_type - Index type
+ *  order - Order of the count in the index
+ *  n - Position in the index of the group for which information is retrieved
+ *  lapl_id - Link access property list
  * OUTPUTS
  *
- *            storage_type - Type of storage for links in group:
+ *  storage_type - Type of storage for links in group:
  *                             H5G_STORAGE_TYPE_COMPACT: Compact storage
  *                             H5G_STORAGE_TYPE_DENSE: Indexed storage
  *                             H5G_STORAGE_TYPE_SYMBOL_TABLE: Symbol tables, the original HDF5 structure
  *
- *                  nlinks - Number of links in group
- *              max_corder - Current maximum creation order value for group
- *                 mounted - Whether group has a file mounted on it (0 = false, 1 = true)
+ *  nlinks - Number of links in group
+ *  max_corder - Current maximum creation order value for group
+ *  mounted - Whether group has a file mounted on it (0 = false, 1 = true)
  *
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              February 18, 2008
+ *  February 18, 2008
  * HISTORY
  *
- *          - Added 'mounted' paramater
- *            M. Scot Breitenfeld
- *            July 16, 2008
+ *  - Added 'mounted' parameter
+ *    M. Scot Breitenfeld
+ *    July 16, 2008
  * SOURCE
-*/
+ */
 int_f
-nh5gget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
-		      int_f *index_type, int_f *order, hsize_t_f *n, hid_t_f *lapl_id,
-		      int_f *storage_type, int_f *nlinks, int_f *max_corder, int_f *mounted )
+h5gget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, int_f *index_type,
+                     int_f *order, hsize_t_f *n, hid_t_f *lapl_id, int_f *storage_type, int_f *nlinks,
+                     int_f *max_corder, int_f *mounted)
 /******/
 {
-  char *c_group_name = NULL;          /* Buffer to hold group name C string */
-  int_f ret_value = 0;          /* Return value */
-  H5G_info_t ginfo;
-  /*
-   * Convert FORTRAN name to C name
-   */
-  if((c_group_name = HD5f2cstring(group_name, (size_t)*group_namelen)) == NULL)
-    HGOTO_DONE(FAIL);
-
-  /*
-   * Call H5Gget_info_by_idx function.
-   */
-  if(H5Gget_info_by_idx((hid_t)*loc_id,c_group_name, (H5_index_t)*index_type,(H5_iter_order_t)*order,(hsize_t)*n,
-			&ginfo, (hid_t)*lapl_id) < 0)
-    HGOTO_DONE(FAIL);
-
-  /* Unpack the structure */
-
-  *storage_type = (int_f)ginfo.storage_type;
-  *nlinks = (int_f)ginfo.nlinks;
-  *max_corder = (int_f)ginfo.max_corder;
-  *mounted = 0;
-  if(ginfo.mounted) *mounted = 1;
-
- done:
-  if(c_group_name)
-    HDfree(c_group_name);
-  return ret_value;
+    char      *c_group_name = NULL; /* Buffer to hold group name C string */
+    int_f      ret_value    = 0;    /* Return value */
+    H5G_info_t ginfo;
+    /*
+     * Convert FORTRAN name to C name
+     */
+    if ((c_group_name = HD5f2cstring(group_name, (size_t)*group_namelen)) == NULL)
+        HGOTO_DONE(FAIL);
+
+    /*
+     * Call H5Gget_info_by_idx function.
+     */
+    if (H5Gget_info_by_idx((hid_t)*loc_id, c_group_name, (H5_index_t)*index_type, (H5_iter_order_t)*order,
+                           (hsize_t)*n, &ginfo, (hid_t)*lapl_id) < 0)
+        HGOTO_DONE(FAIL);
+
+    /* Unpack the structure */
+
+    *storage_type = (int_f)ginfo.storage_type;
+    *nlinks       = (int_f)ginfo.nlinks;
+    *max_corder   = (int_f)ginfo.max_corder;
+    *mounted      = 0;
+    if (ginfo.mounted)
+        *mounted = 1;
+
+done:
+    if (c_group_name)
+        HDfree(c_group_name);
+    return ret_value;
 }
 
 /****if* H5Gf/h5gget_info_by_name_c
  * NAME
- *      h5gget_info_by_name_c
+ *  h5gget_info_by_name_c
  * PURPOSE
- *   Call H5Gget_info_by_name
+ *  Call H5Gget_info_by_name
  * INPUTS
  *
- *          loc_id - File or group identifier
- *      group_name - Name of group containing group for which information is to be retrieved
- *   group_namelen - name length
- *         lapl_id - Link access property list
+ *  loc_id - File or group identifier
+ *  group_name - Name of group containing group for which information is to be retrieved
+ *  group_namelen - name length
+ *  lapl_id - Link access property list
  * OUTPUTS
  *
- *            storage_type - Type of storage for links in group:
+ *  storage_type - Type of storage for links in group:
  *                             H5G_STORAGE_TYPE_COMPACT: Compact storage
  *                             H5G_STORAGE_TYPE_DENSE: Indexed storage
  *                             H5G_STORAGE_TYPE_SYMBOL_TABLE: Symbol tables, the original HDF5 structure
  *
- *                  nlinks - Number of links in group
- *              max_corder - Current maximum creation order value for group
- *                 mounted - Whether group has a file mounted on it (0 = false, 1 = true)
+ *  nlinks - Number of links in group
+ *  max_corder - Current maximum creation order value for group
+ *  mounted - Whether group has a file mounted on it (0 = false, 1 = true)
  *
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              February 18, 2008
+ *  February 18, 2008
  * HISTORY
  *
- *          - Added 'mounted' paramater
- *            M. Scot Breitenfeld
- *            July 16, 2008
+ *  - Added 'mounted' parameter
+ *    M. Scot Breitenfeld
+ *    July 16, 2008
  * SOURCE
-*/
+ */
 int_f
-nh5gget_info_by_name_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, hid_t_f *lapl_id,
-		       int_f *storage_type, int_f *nlinks, int_f *max_corder, int_f *mounted)
+h5gget_info_by_name_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, hid_t_f *lapl_id,
+                      int_f *storage_type, int_f *nlinks, int_f *max_corder, int_f *mounted)
 /******/
 {
-  char *c_group_name = NULL;          /* Buffer to hold group name C string */
-  int_f ret_value = 0;          /* Return value */
-  H5G_info_t ginfo;
-  /*
-   * Convert FORTRAN name to C name
-   */
-  if((c_group_name = HD5f2cstring(group_name, (size_t)*group_namelen)) == NULL)
-    HGOTO_DONE(FAIL);
-
-  /*
-   * Call H5Gget_info_by_name function.
-   */
-  if(H5Gget_info_by_name((hid_t)*loc_id, c_group_name, &ginfo, (hid_t)*lapl_id) < 0)
-    HGOTO_DONE(FAIL);
-
-  /* Unpack the structure */
-
-  *storage_type = (int_f)ginfo.storage_type;
-  *nlinks = (int_f)ginfo.nlinks;
-  *max_corder = (int_f)ginfo.max_corder;
-  *mounted = 0;
-  if(ginfo.mounted) *mounted = 1;
-
- done:
-  if(c_group_name)
-    HDfree(c_group_name);
-  return ret_value;
+    char      *c_group_name = NULL; /* Buffer to hold group name C string */
+    int_f      ret_value    = 0;    /* Return value */
+    H5G_info_t ginfo;
+    /*
+     * Convert FORTRAN name to C name
+     */
+    if ((c_group_name = HD5f2cstring(group_name, (size_t)*group_namelen)) == NULL)
+        HGOTO_DONE(FAIL);
+
+    /*
+     * Call H5Gget_info_by_name function.
+     */
+    if (H5Gget_info_by_name((hid_t)*loc_id, c_group_name, &ginfo, (hid_t)*lapl_id) < 0)
+        HGOTO_DONE(FAIL);
+
+    /* Unpack the structure */
+
+    *storage_type = (int_f)ginfo.storage_type;
+    *nlinks       = (int_f)ginfo.nlinks;
+    *max_corder   = (int_f)ginfo.max_corder;
+    *mounted      = 0;
+    if (ginfo.mounted)
+        *mounted = 1;
+
+done:
+    if (c_group_name)
+        HDfree(c_group_name);
+    return ret_value;
 }
diff --git a/fortran/src/H5Gff.F90 b/fortran/src/H5Gff.F90
new file mode 100644
index 0000000..436eece
--- /dev/null
+++ b/fortran/src/H5Gff.F90
@@ -0,0 +1,862 @@
+!> @defgroup FH5G Fortran Group (H5G) Interface
+!!
+!! @see H5G, C-API
+!!
+!! @see @ref H5G_UG, User Guide
+!!
+
+!> @ingroup FH5G
+!!
+!! @brief This module contains Fortran interfaces for H5G functions.
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+! NOTES
+!       _____ __  __ _____   ____  _____ _______       _   _ _______
+!      |_   _|  \/  |  __ \ / __ \|  __ \__   __|/\   | \ | |__   __|
+! ****   | | | \  / | |__) | |  | | |__) | | |  /  \  |  \| |  | |    ****
+! ****   | | | |\/| |  ___/| |  | |  _  /  | | / /\ \ | . ` |  | |    ****
+! ****  _| |_| |  | | |    | |__| | | \ \  | |/ ____ \| |\  |  | |    ****
+!      |_____|_|  |_|_|     \____/|_|  \_\ |_/_/    \_\_| \_|  |_|
+!
+!  If you add a new H5G function you must add the function name to the
+!  Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
+!  This is needed for Windows based operating systems.
+!
+
+MODULE H5G
+  USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_CHAR
+  USE H5GLOBAL
+
+CONTAINS
+
+!>
+!! \ingroup FH5G
+!!
+!! \brief Creates a new group.
+!!
+!! \param loc_id    Location identifier.
+!! \param name      Group name at the specified location.
+!! \param grp_id    Group identifier.
+!! \param hdferr    \fortran_error
+!! \param size_hint A parameter indicating the number of bytes to reserve for the names that will appear in the group.
+!!                  Set to OBJECT_NAMELEN_DEFAULT_F if using any of the optional parameters lcpl_id, gcpl_id,
+!!                  and/or gapl_id when not using keywords in specifying the optional parameters.
+!! \param lcpl_id   Property list for link creation.
+!! \param gcpl_id   Property list for group creation.
+!! \param gapl_id   Property list for group access.
+!!
+!! See C API: @ref H5Gcreate2()
+!!
+  SUBROUTINE h5gcreate_f(loc_id, name, grp_id, hdferr, size_hint, lcpl_id, gcpl_id, gapl_id)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    INTEGER(HID_T), INTENT(OUT) :: grp_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(SIZE_T), OPTIONAL, INTENT(IN) :: size_hint
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lcpl_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: gcpl_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: gapl_id
+
+    INTEGER(HID_T) :: lcpl_id_default
+    INTEGER(HID_T) :: gcpl_id_default
+    INTEGER(HID_T) :: gapl_id_default
+    INTEGER :: namelen ! Length of the name character string
+    INTEGER(SIZE_T) :: size_hint_default
+
+    INTERFACE
+       INTEGER FUNCTION h5gcreate_c(loc_id, name, namelen, &
+            size_hint_default, grp_id, lcpl_id_default, gcpl_id_default, gapl_id_default) &
+            BIND(C,NAME='h5gcreate_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+         INTEGER :: namelen
+         INTEGER(SIZE_T) :: size_hint_default
+         INTEGER(HID_T), INTENT(OUT) :: grp_id
+         INTEGER(HID_T) :: lcpl_id_default
+         INTEGER(HID_T) :: gcpl_id_default
+         INTEGER(HID_T) :: gapl_id_default
+       END FUNCTION h5gcreate_c
+    END INTERFACE
+
+    size_hint_default = OBJECT_NAMELEN_DEFAULT_F
+    IF (PRESENT(size_hint)) size_hint_default = size_hint
+    lcpl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lcpl_id)) lcpl_id_default = lcpl_id
+    gcpl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(gcpl_id)) gcpl_id_default = gcpl_id
+    gapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(gapl_id)) gapl_id_default = gapl_id
+
+    namelen = LEN(name)
+
+    hdferr = h5gcreate_c(loc_id, name, namelen, size_hint_default, grp_id, &
+         lcpl_id_default, gcpl_id_default, gapl_id_default)
+
+  END SUBROUTINE h5gcreate_f
+
+!>
+!! \ingroup FH5G
+!!
+!! \brief Opens an existing group.
+!!
+!! \param loc_id  Location identifier.
+!! \param name    Name of the group to open.
+!! \param grp_id  Group identifier.
+!! \param hdferr  \fortran_error
+!! \param gapl_id Group access property list identifier.
+!!
+!! See C API: @ref H5Gopen2()
+!!
+  SUBROUTINE h5gopen_f(loc_id, name, grp_id, hdferr, gapl_id)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    INTEGER(HID_T), INTENT(OUT) :: grp_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: gapl_id
+    INTEGER(HID_T) :: gapl_id_default
+    INTEGER :: namelen ! Length of the name character string
+
+    INTERFACE
+       INTEGER FUNCTION h5gopen_c(loc_id, name, namelen, gapl_id_default, grp_id) &
+            BIND(C,NAME='h5gopen_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+         INTEGER :: namelen
+         INTEGER(HID_T), INTENT(IN) :: gapl_id_default
+         INTEGER(HID_T), INTENT(OUT) :: grp_id
+       END FUNCTION h5gopen_c
+    END INTERFACE
+
+    gapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(gapl_id)) gapl_id_default = gapl_id
+
+    namelen = LEN(name)
+    hdferr = h5gopen_c(loc_id, name, namelen, gapl_id_default, grp_id)
+
+  END SUBROUTINE h5gopen_f
+!>
+!! \ingroup FH5G
+!!
+!! \brief Closes the specified group.
+!!
+!! \param grp_id Group identifier.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Gclose()
+!!
+  SUBROUTINE h5gclose_f(grp_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: grp_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5gclose_c(grp_id) BIND(C,NAME='h5gclose_c')
+         IMPORT :: HID_T
+         INTEGER(HID_T), INTENT(IN) :: grp_id
+       END FUNCTION h5gclose_c
+    END INTERFACE
+
+    hdferr = h5gclose_c(grp_id)
+
+  END SUBROUTINE h5gclose_f
+!>
+!! \ingroup FH5G
+!!
+!! \brief Returns name and type of the group member identified by its index.
+!!
+!! \param loc_id   Location identifier.
+!! \param name     Name of the group at the specified location.
+!! \param idx      Object index (zero-based).
+!! \param obj_name Object name.
+!! \param obj_type Object type.
+!! \param hdferr   \fortran_error
+!!
+  SUBROUTINE h5gget_obj_info_idx_f(loc_id, name, idx, &
+       obj_name, obj_type, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    INTEGER, INTENT(IN) :: idx
+    CHARACTER(LEN=*), INTENT(OUT) :: obj_name
+    INTEGER, INTENT(OUT) :: obj_type
+    INTEGER, INTENT(OUT) :: hdferr
+
+    INTEGER :: namelen ! Length of the name character string
+    INTEGER :: obj_namelen ! Length of the obj_name character string
+
+    INTERFACE
+       INTEGER FUNCTION h5gget_obj_info_idx_c(loc_id, name, &
+            namelen, idx, &
+            obj_name, obj_namelen, obj_type) BIND(C,NAME='h5gget_obj_info_idx_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+         INTEGER :: namelen
+         INTEGER, INTENT(IN) :: idx
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(OUT) :: obj_name
+         INTEGER :: obj_namelen
+         INTEGER, INTENT(OUT) :: obj_type
+       END FUNCTION h5gget_obj_info_idx_c
+    END INTERFACE
+
+    namelen = LEN(name)
+    obj_namelen = LEN(obj_name)
+    hdferr = h5gget_obj_info_idx_c(loc_id, name, namelen, idx, &
+                                           obj_name, obj_namelen, obj_type)
+  END SUBROUTINE h5gget_obj_info_idx_f
+
+!>
+!! \ingroup FH5G
+!!
+!! \brief Returns the number of group members.
+!!
+!! \param loc_id   Location identifier.
+!! \param name     Name of the group at the specified location.
+!! \param nmembers Number of group members.
+!! \param hdferr   \fortran_error
+!!
+  SUBROUTINE h5gn_members_f(loc_id, name, nmembers, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    INTEGER, INTENT(OUT) :: nmembers
+    INTEGER, INTENT(OUT) :: hdferr
+
+    INTEGER :: namelen ! Length of the name character string
+
+    INTERFACE
+       INTEGER FUNCTION h5gn_members_c(loc_id, name, namelen, nmembers) &
+            BIND(C,NAME='h5gn_members_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+         INTEGER :: namelen
+         INTEGER, INTENT(OUT) :: nmembers
+       END FUNCTION h5gn_members_c
+    END INTERFACE
+
+    namelen = LEN(name)
+    hdferr = h5gn_members_c(loc_id, name, namelen, nmembers)
+
+  END SUBROUTINE h5gn_members_f
+!>
+!! \ingroup FH5G
+!!
+!! \brief Creates a link of the specified type from new_name to current_name.
+!!
+!! \param loc_id       Location identifier.
+!! \param link_type    Link type; possible values are:
+!!                     \li H5G_LINK_HARD_F
+!!                     \li H5G_LINK_SOFT_F
+!! \param current_name Name of the existing object if link is a hard link. Can be anything for the soft link.
+!! \param new_name     New name for the object.
+!! \param hdferr       \fortran_error
+!!
+!! See C API: @ref H5Glink()
+!!
+  SUBROUTINE h5glink_f(loc_id, link_type, current_name, &
+       new_name, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id
+    INTEGER, INTENT(IN) :: link_type
+
+    CHARACTER(LEN=*), INTENT(IN) :: current_name
+    CHARACTER(LEN=*), INTENT(IN) :: new_name
+    INTEGER, INTENT(OUT) :: hdferr
+
+    INTEGER :: current_namelen ! Length of the current_name string
+    INTEGER :: new_namelen     ! Length of the new_name string
+
+    INTERFACE
+       INTEGER FUNCTION h5glink_c(loc_id, link_type, current_name, &
+            current_namelen, new_name, new_namelen) &
+                   BIND(C,NAME='h5glink_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         INTEGER, INTENT(IN) :: link_type
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: current_name
+         INTEGER :: current_namelen
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: new_name
+         INTEGER :: new_namelen
+       END FUNCTION h5glink_c
+    END INTERFACE
+
+    current_namelen = LEN(current_name)
+    new_namelen = LEN(new_name)
+    hdferr = h5glink_c(loc_id, link_type, current_name, &
+         current_namelen, new_name, new_namelen)
+  END SUBROUTINE h5glink_f
+
+!>
+!! \ingroup FH5G
+!!
+!! \brief Creates a link of the specified type from new_name
+!!        to current_name. current_name and new_name are interpreted
+!!        relative to current and new location identifiers.
+!!
+!! \param cur_loc_id Location identifier.
+!! \param cur_name   Name of the existing object if link is a hard link. Can be anything for the soft link.
+!! \param link_type  Link type; possible values are:
+!!                   \li H5G_LINK_HARD_F
+!!                   \li H5G_LINK_SOFT_F
+!! \param new_loc_id New location identifier.
+!! \param new_name   New name for the object.
+!! \param hdferr     \fortran_error
+!!
+!! See C API: @ref H5Glink2()
+!!
+  SUBROUTINE h5glink2_f(cur_loc_id, cur_name, link_type, new_loc_id, &
+       new_name, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: cur_loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: cur_name
+    INTEGER, INTENT(IN) :: link_type
+
+    INTEGER(HID_T), INTENT(IN) :: new_loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: new_name
+    INTEGER, INTENT(OUT) :: hdferr
+
+    INTEGER :: cur_namelen ! Length of the current_name string
+    INTEGER :: new_namelen ! Length of the new_name string
+
+    INTERFACE
+       INTEGER FUNCTION h5glink2_c(cur_loc_id, cur_name, cur_namelen, &
+            link_type, new_loc_id, &
+            new_name, new_namelen) BIND(C,NAME='h5glink2_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T
+         INTEGER(HID_T), INTENT(IN) :: cur_loc_id
+         INTEGER(HID_T), INTENT(IN) :: new_loc_id
+         INTEGER, INTENT(IN) :: link_type
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: cur_name
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: new_name
+         INTEGER :: cur_namelen
+         INTEGER :: new_namelen
+       END FUNCTION h5glink2_c
+    END INTERFACE
+
+    cur_namelen = LEN(cur_name)
+    new_namelen = LEN(new_name)
+    hdferr = h5glink2_c(cur_loc_id, cur_name, cur_namelen, link_type, &
+         new_loc_id, new_name, new_namelen)
+  END SUBROUTINE h5glink2_f
+
+!>
+!! \ingroup FH5G
+!!
+!! \brief Removes the specified name from the group graph and
+!!        decrements the link count for the object to which name points
+!!
+!! \param loc_id Location identifier.
+!! \param name   Name of the object to unlink.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Gunlink()
+!!
+  SUBROUTINE h5gunlink_f(loc_id, name, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: namelen ! Length of the name character string
+
+    INTERFACE
+       INTEGER FUNCTION h5gunlink_c(loc_id, name, namelen) BIND(C,NAME='h5gunlink_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+         INTEGER :: namelen
+       END FUNCTION h5gunlink_c
+    END INTERFACE
+
+    namelen = LEN(name)
+    hdferr = h5gunlink_c(loc_id, name, namelen)
+  END SUBROUTINE h5gunlink_f
+
+!>
+!! \ingroup FH5G
+!!
+!! \brief Renames an object within an HDF5 file.
+!!
+!! \param loc_id   Location identifier.
+!! \param name     Object&apos;s name at specified location.
+!! \param new_name Object&apos;s new name.
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Gmove()
+!!
+  SUBROUTINE h5gmove_f(loc_id, name, new_name, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    CHARACTER(LEN=*), INTENT(IN) :: new_name
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: namelen         ! Length of the current_name string
+    INTEGER :: new_namelen     ! Length of the new_name string
+
+    INTERFACE
+       INTEGER FUNCTION h5gmove_c(loc_id, name, namelen, new_name, new_namelen) BIND(C,NAME='h5gmove_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+         INTEGER :: namelen
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: new_name
+         INTEGER :: new_namelen
+       END FUNCTION h5gmove_c
+    END INTERFACE
+
+    namelen = LEN(name)
+    new_namelen = LEN(new_name)
+    hdferr = h5gmove_c(loc_id, name, namelen, new_name, new_namelen)
+  END SUBROUTINE h5gmove_f
+!>
+!! \ingroup FH5G
+!!
+!! \brief Renames an object within an HDF5 file.
+!!
+!! \param src_loc_id Original location identifier.
+!! \param src_name   Object&apos;s name at specified original location.
+!! \param dst_loc_id Original location identifier.
+!! \param dst_name   Object&apos;s new name.
+!! \param hdferr     \fortran_error
+!!
+!! See C API: @ref H5Gmove2()
+!!
+  SUBROUTINE h5gmove2_f(src_loc_id, src_name, dst_loc_id, dst_name, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN)   :: src_loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: src_name
+    INTEGER(HID_T), INTENT(IN)   :: dst_loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: dst_name
+    INTEGER, INTENT(OUT)         :: hdferr
+    INTEGER :: src_namelen         ! Length of the current_name string
+    INTEGER :: dst_namelen         ! Length of the new_name string
+
+    INTERFACE
+       INTEGER FUNCTION h5gmove2_c(src_loc_id, src_name, src_namelen, &
+            dst_loc_id, dst_name, dst_namelen) BIND(C,NAME='h5gmove2_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T
+         INTEGER(HID_T), INTENT(IN) :: src_loc_id
+         INTEGER(HID_T), INTENT(IN) :: dst_loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: src_name
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: dst_name
+         INTEGER :: src_namelen
+         INTEGER :: dst_namelen
+       END FUNCTION h5gmove2_c
+    END INTERFACE
+
+    src_namelen = LEN(src_name)
+    dst_namelen = LEN(dst_name)
+    hdferr = h5gmove2_c(src_loc_id, src_name, src_namelen, dst_loc_id, dst_name, dst_namelen)
+  END SUBROUTINE h5gmove2_f
+!>
+!! \ingroup FH5G
+!!
+!! \brief Returns the name of the object that the symbolic link points to.
+!!
+!! \param loc_id Location identifier.
+!! \param name   Symbolic link to the object whose name is to be returned.
+!! \param size   Maximum number of characters to be returned.
+!! \param buffer A buffer to hold the name of the object being sought.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Gget_linkval()
+!!
+  SUBROUTINE h5gget_linkval_f(loc_id, name, size, buffer, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    INTEGER(SIZE_T), INTENT(IN) :: size
+    CHARACTER(LEN=size), INTENT(OUT) :: buffer
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: namelen ! Length of the current_name string
+
+    INTERFACE
+       INTEGER FUNCTION h5gget_linkval_c(loc_id, name, namelen, size, buffer) BIND(C,NAME='h5gget_linkval_c')
+         IMPORT :: C_CHAR, SIZE_T
+         IMPORT :: HID_T
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+         INTEGER :: namelen
+         INTEGER(SIZE_T), INTENT(IN) :: size
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(OUT) :: buffer
+       END FUNCTION h5gget_linkval_c
+    END INTERFACE
+
+    namelen = LEN(name)
+    hdferr = h5gget_linkval_c(loc_id, name, namelen, size, buffer)
+  END SUBROUTINE h5gget_linkval_f
+
+!>
+!! \ingroup FH5G
+!!
+!! \brief Sets comment for specified object.
+!!
+!! \param loc_id  Location identifier.
+!! \param name    Name of the object.
+!! \param comment Comment to set for the object.
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Gset_comment()
+!!
+  SUBROUTINE h5gset_comment_f(loc_id, name, comment, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    CHARACTER(LEN=*), INTENT(IN) :: comment
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: namelen ! Length of the current_name string
+    INTEGER :: commentlen     ! Length of the comment string
+
+    INTERFACE
+       INTEGER FUNCTION h5gset_comment_c(loc_id, name, namelen, &
+            comment, commentlen) BIND(C,NAME='h5gset_comment_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+         INTEGER :: namelen
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: comment
+         INTEGER :: commentlen
+       END FUNCTION h5gset_comment_c
+    END INTERFACE
+
+    namelen = LEN(name)
+    commentlen = LEN(comment)
+    hdferr = h5gset_comment_c(loc_id, name, namelen, comment, commentlen)
+  END SUBROUTINE h5gset_comment_f
+!>
+!! \ingroup FH5G
+!!
+!! \brief Retrieves comment for specified object.
+!!
+!! \param loc_id Location identifier.
+!! \param name   Name of the object at specified location.
+!! \param size   Size of the buffer required to hold comment.
+!! \param buffer Buffer to hold object&apos;s comment.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Gget_comment()
+!!
+  SUBROUTINE h5gget_comment_f(loc_id, name, size, buffer, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    INTEGER(SIZE_T), INTENT(IN) :: size
+    CHARACTER(LEN=size), INTENT(OUT) :: buffer
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: namelen ! Length of the current_name string
+
+    INTERFACE
+       INTEGER FUNCTION h5gget_comment_c(loc_id, name, namelen, size, buffer) BIND(C,NAME='h5gget_comment_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+         INTEGER :: namelen
+         INTEGER(SIZE_T), INTENT(IN) :: size
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(OUT) :: buffer
+       END FUNCTION h5gget_comment_c
+    END INTERFACE
+
+    namelen = LEN(name)
+    hdferr = h5gget_comment_c(loc_id, name, namelen, size, buffer)
+
+  END SUBROUTINE h5gget_comment_f
+!>
+!! \ingroup FH5G
+!!
+!! \brief Creates a new empty group without linking it into the file structure.
+!!
+!! \param loc_id  Location identifier.
+!! \param grp_id  Group identifier.
+!! \param hdferr  \fortran_error
+!! \param gcpl_id Group creation property list identifier.
+!! \param gapl_id Group access property list identifier.
+!!
+!! See C API: @ref H5Gcreate_anon()
+!!
+  SUBROUTINE h5Gcreate_anon_f(loc_id, grp_id, hdferr, gcpl_id, gapl_id)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id
+    INTEGER(HID_T), INTENT(OUT) :: grp_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: gcpl_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: gapl_id
+    INTEGER(HID_T) :: gcpl_id_default
+    INTEGER(HID_T) :: gapl_id_default
+
+    INTERFACE
+       INTEGER FUNCTION h5gcreate_anon_c(loc_id, gcpl_id_default, gapl_id_default, grp_id) &
+            BIND(C,NAME='h5gcreate_anon_c')
+         IMPORT :: HID_T
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         INTEGER(HID_T), INTENT(IN) :: gcpl_id_default
+         INTEGER(HID_T), INTENT(IN) :: gapl_id_default
+         INTEGER(HID_T), INTENT(OUT) :: grp_id
+       END FUNCTION h5gcreate_anon_c
+    END INTERFACE
+
+    gcpl_id_default = H5P_DEFAULT_F
+    gapl_id_default = H5P_DEFAULT_F
+
+    IF(PRESENT(gcpl_id)) gcpl_id_default = gcpl_id
+    IF(PRESENT(gapl_id)) gapl_id_default = gapl_id
+
+    hdferr = h5gcreate_anon_c(loc_id, gcpl_id_default, gapl_id_default, grp_id)
+
+  END SUBROUTINE h5Gcreate_anon_f
+!>
+!! \ingroup FH5G
+!!
+!! \brief Gets a group creation property list identifier.
+!!
+!! \param grp_id  Group identifier.
+!! \param gcpl_id Group creation property list identifier.
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Gget_create_plist()
+!!
+  SUBROUTINE h5gget_create_plist_f(grp_id, gcpl_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN)  :: grp_id
+    INTEGER(HID_T), INTENT(OUT) :: gcpl_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5gget_create_plist_c(grp_id, gcpl_id ) BIND(C,NAME='h5gget_create_plist_c')
+         IMPORT :: HID_T
+         INTEGER(HID_T), INTENT(IN)  :: grp_id
+         INTEGER(HID_T), INTENT(OUT) :: gcpl_id
+       END FUNCTION h5gget_create_plist_c
+    END INTERFACE
+
+    hdferr = h5gget_create_plist_c(grp_id, gcpl_id )
+
+  END SUBROUTINE h5gget_create_plist_f
+
+!>
+!! \ingroup FH5G
+!!
+!! \brief Retrieves information about a group
+!!
+!! \param group_id     Group identifier.
+!! \param storage_type Type of storage for links in group:
+!!                     \li H5G_STORAGE_TYPE_COMPACT_F: Compact storage
+!!                     \li H5G_STORAGE_TYPE_DENS_FE: Indexed storage
+!!                     \li H5G_STORAGE_TYPE_SYMBOL_TABLE_F: Symbol tables, the original HDF5 structure
+!! \param nlinks       Number of links in group.
+!! \param max_corder   Current maximum creation order value for group.
+!! \param hdferr       \fortran_error
+!! \param mounted      Whether group has a file mounted on it.
+!!
+!! See C API: @ref H5Gget_info()
+!!
+  SUBROUTINE h5gget_info_f(group_id, storage_type, nlinks, max_corder, hdferr, mounted)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: group_id
+
+    INTEGER, INTENT(OUT) :: storage_type
+    INTEGER, INTENT(OUT) :: nlinks
+    INTEGER, INTENT(OUT) :: max_corder
+    INTEGER, INTENT(OUT) :: hdferr
+    LOGICAL, INTENT(OUT), OPTIONAL :: mounted
+    INTEGER :: mounted_c
+
+    INTERFACE
+       INTEGER FUNCTION h5gget_info_c(group_id, storage_type, nlinks, max_corder, mounted_c) &
+            BIND(C,NAME='h5gget_info_c')
+         IMPORT :: HID_T
+         INTEGER(HID_T), INTENT(IN) :: group_id
+         INTEGER, INTENT(OUT) :: storage_type
+         INTEGER, INTENT(OUT) :: nlinks
+         INTEGER, INTENT(OUT) :: max_corder
+         INTEGER :: mounted_c
+       END FUNCTION h5gget_info_c
+    END INTERFACE
+
+    hdferr = h5gget_info_c(group_id, storage_type, nlinks, max_corder, mounted_c)
+
+    IF(PRESENT(mounted))THEN
+       IF(mounted_c.EQ.0) THEN
+          mounted = .FALSE.
+       ELSE
+          mounted = .TRUE.
+       ENDIF
+    ENDIF
+
+  END SUBROUTINE h5gget_info_f
+!>
+!! \ingroup FH5G
+!!
+!! \brief Retrieves information about a group, according to the group’s position within an index.
+!!
+!! \param loc_id       File or group identifier.
+!! \param group_name   Name of group containing group for which information is to be retrieved.
+!! \param index_type   Index type.
+!! \param order        Order of the count in the index.
+!! \param n            Position in the index of the group for which information is retrieved.
+!! \param storage_type Type of storage for links in group:
+!!                     \li H5G_STORAGE_TYPE_COMPACT_F: Compact storage
+!!                     \li H5G_STORAGE_TYPE_DENSE_F: Indexed storage
+!!                     \li H5G_STORAGE_TYPE_SYMBOL_TABLE_F: Symbol tables, the original HDF5 structure
+!! \param nlinks       Number of links in group.
+!! \param max_corder   Current maximum creation order value for group.
+!! \param hdferr       \fortran_error
+!! \param lapl_id      Link access property list.
+!! \param mounted      Whether group has a file mounted on it.
+!!
+!! See C API: @ref H5Gget_info_by_idx()
+!!
+  SUBROUTINE h5gget_info_by_idx_f(loc_id, group_name, index_type, order, n, &
+       storage_type, nlinks, max_corder, hdferr, lapl_id, mounted)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: group_name
+    INTEGER, INTENT(IN) :: index_type
+    INTEGER, INTENT(IN) :: order
+    INTEGER(HSIZE_T), INTENT(IN) :: n
+
+    INTEGER, INTENT(OUT) :: storage_type
+    INTEGER, INTENT(OUT) :: nlinks
+    INTEGER, INTENT(OUT) :: max_corder
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id
+    LOGICAL, INTENT(OUT), OPTIONAL :: mounted
+    INTEGER :: mounted_c
+    INTEGER(HID_T) :: lapl_id_default
+    INTEGER(SIZE_T) :: group_name_len ! length of group name
+
+    INTERFACE
+       INTEGER FUNCTION h5gget_info_by_idx_c(loc_id, group_name, group_name_len, index_type, order, n, lapl_id_default, &
+            storage_type, nlinks, max_corder, mounted_c) BIND(C,NAME='h5gget_info_by_idx_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T, HSIZE_T
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: group_name
+         INTEGER, INTENT(IN) :: index_type
+         INTEGER, INTENT(IN) :: order
+         INTEGER(HSIZE_T), INTENT(IN) :: n
+         INTEGER(HID_T) :: lapl_id_default
+         INTEGER, INTENT(OUT) :: storage_type
+         INTEGER, INTENT(OUT) :: nlinks
+         INTEGER, INTENT(OUT) :: max_corder
+
+         INTEGER(SIZE_T) :: group_name_len
+         INTEGER :: mounted_c
+
+       END FUNCTION h5gget_info_by_idx_c
+    END INTERFACE
+
+    group_name_len = LEN(group_name)
+
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+
+    hdferr = h5gget_info_by_idx_c(loc_id, group_name, group_name_len, &
+         index_type, order, n, lapl_id_default, &
+         storage_type, nlinks, max_corder, mounted_c)
+
+    IF(PRESENT(mounted))THEN
+       IF(mounted_c.EQ.0) THEN
+          mounted = .FALSE.
+       ELSE
+          mounted = .TRUE.
+       ENDIF
+    ENDIF
+
+  END SUBROUTINE h5gget_info_by_idx_f
+!>
+!! \ingroup FH5G
+!!
+!! \brief Retrieves information about a group.
+!!
+!! \param loc_id       File or group identifier.
+!! \param group_name   Name of group containing group for which information is to be retrieved.
+!! \param storage_type Type of storage for links in group:
+!!                     \li H5G_STORAGE_TYPE_COMPACT_F: Compact storage
+!!                     \li H5G_STORAGE_TYPE_DENSE_F: Indexed storage
+!!                     \li H5G_STORAGE_TYPE_SYMBOL_TABLE_F: Symbol tables, the original HDF5 structure
+!! \param nlinks       Number of links in group.
+!! \param max_corder   Current maximum creation order value for group.
+!! \param hdferr       \fortran_error
+!! \param lapl_id      Link access property list.
+!! \param mounted      Whether group has a file mounted on it.
+!!
+!! See C API: @ref H5Gget_info_by_name()
+!!
+  SUBROUTINE h5gget_info_by_name_f(loc_id, group_name, &
+       storage_type, nlinks, max_corder, hdferr, lapl_id, mounted)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: group_name
+
+    INTEGER, INTENT(OUT) :: storage_type
+    INTEGER, INTENT(OUT) :: nlinks
+    INTEGER, INTENT(OUT) :: max_corder
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id
+    LOGICAL, INTENT(OUT), OPTIONAL :: mounted
+    INTEGER :: mounted_c
+    INTEGER(HID_T) :: lapl_id_default
+    INTEGER(SIZE_T) :: group_name_len ! length of group name
+
+    INTERFACE
+       INTEGER FUNCTION h5gget_info_by_name_c(loc_id, group_name, group_name_len, lapl_id_default, &
+            storage_type, nlinks, max_corder, mounted_c) BIND(C,NAME='h5gget_info_by_name_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: group_name
+         INTEGER(HID_T), INTENT(IN) :: lapl_id_default
+         INTEGER, INTENT(OUT) :: storage_type
+         INTEGER, INTENT(OUT) :: nlinks
+         INTEGER, INTENT(OUT) :: max_corder
+
+         INTEGER(SIZE_T) :: group_name_len
+         INTEGER :: mounted_c
+
+       END FUNCTION h5gget_info_by_name_c
+    END INTERFACE
+
+    group_name_len = LEN(group_name)
+
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+
+    hdferr = h5gget_info_by_name_c(loc_id, group_name, group_name_len, lapl_id_default, &
+         storage_type, nlinks, max_corder, mounted_c)
+
+    IF(PRESENT(mounted))THEN
+       IF(mounted_c.EQ.0) THEN
+          mounted = .FALSE.
+       ELSE
+          mounted = .TRUE.
+       ENDIF
+    ENDIF
+
+  END SUBROUTINE h5gget_info_by_name_f
+
+END MODULE H5G
diff --git a/fortran/src/H5Gff.f90 b/fortran/src/H5Gff.f90
deleted file mode 100644
index d4d7496..0000000
--- a/fortran/src/H5Gff.f90
+++ /dev/null
@@ -1,1331 +0,0 @@
-!****h* ROBODoc/H5G
-!
-! NAME
-!  MODULE H5G
-!
-! FILE
-!  fortran/src/H5Gff.f90
-!
-! PURPOSE
-!  This file contains Fortran interfaces for H5G functions.
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! NOTES
-!                         *** IMPORTANT ***
-!  If you add a new H5G function you must add the function name to the
-!  Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
-!  This is needed for Windows based operating systems.
-!
-!*****
-
-MODULE H5G
-  USE H5GLOBAL
-
-!  PRIVATE :: h5gcreate1_f
-!  PRIVATE :: h5gcreate2_f
-
-!  INTERFACE h5gcreate_f
-!  MODULE PROCEDURE h5gcreate1_f
-!  MODULE PROCEDURE h5gcreate2_f
-!  END INTERFACE
-
-CONTAINS
-
-!****s* H5G/h5gcreate_f
-!
-! NAME
-!  h5gcreate_f
-!
-! PURPOSE
-!  Creates a new group.
-!
-! INPUTS
-!  loc_id 	 - location identifier
-!  name 	 - group name at the specified location
-! OUTPUTS
-!  grp_id 	 - group identifier
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! OPTIONAL PARAMETERS
-!  size_hint 	 - a parameter indicating the number of bytes to
-!                  reserve for the names that will appear in the group
-!  lcpl_id 	 - Property list for link creation
-!  gcpl_id 	 - Property list for group creation
-!  gapl_id 	 - Property list for group access
-!
-! AUTHOR	
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY 	
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 5, 2001
-!
-!  Added additional optional paramaters in 1.8
-!  MSB - February 27, 2008
-!
-! SOURCE
-  SUBROUTINE h5gcreate_f(loc_id, name, grp_id, hdferr, size_hint, lcpl_id, gcpl_id, gapl_id)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of the group
-    INTEGER(HID_T), INTENT(OUT) :: grp_id  ! Group identifier
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-    INTEGER(SIZE_T), OPTIONAL, INTENT(IN) :: size_hint
-                                           ! Parameter indicating
-                                           ! the number of bytes
-                                           ! to reserve for the
-                                           ! names that will appear
-                                           ! in the group. Set to OBJECT_NAMELEN_DEFAULT_F
-                                           ! if using any of the optional
-                                           ! parameters lcpl_id, gcpl_id, and/or gapl_id when not
-                                           ! using keywords in specifying the optional parameters
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lcpl_id  ! Property list for link creation
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: gcpl_id  ! Property list for group creation
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: gapl_id  ! Property list for group access
-!*****
-    INTEGER(HID_T) :: lcpl_id_default
-    INTEGER(HID_T) :: gcpl_id_default
-    INTEGER(HID_T) :: gapl_id_default
-
-    INTEGER :: namelen ! Length of the name character string
-    INTEGER(SIZE_T) :: size_hint_default
-
-    INTERFACE
-       INTEGER FUNCTION h5gcreate_c(loc_id, name, namelen, &
-            size_hint_default, grp_id, lcpl_id_default, gcpl_id_default, gapl_id_default)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5GCREATE_C'::h5gcreate_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         INTEGER(HID_T), INTENT(IN) :: loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER :: namelen
-         INTEGER(SIZE_T) :: size_hint_default
-         INTEGER(HID_T), INTENT(OUT) :: grp_id
-         INTEGER(HID_T) :: lcpl_id_default
-         INTEGER(HID_T) :: gcpl_id_default
-         INTEGER(HID_T) :: gapl_id_default
-       END FUNCTION h5gcreate_c
-    END INTERFACE
-
-    size_hint_default = OBJECT_NAMELEN_DEFAULT_F
-    IF (PRESENT(size_hint)) size_hint_default = size_hint
-    lcpl_id_default = H5P_DEFAULT_F
-    IF(PRESENT(lcpl_id)) lcpl_id_default = lcpl_id
-    gcpl_id_default = H5P_DEFAULT_F
-    IF(PRESENT(gcpl_id)) gcpl_id_default = gcpl_id
-    gapl_id_default = H5P_DEFAULT_F
-    IF(PRESENT(gapl_id)) gapl_id_default = gapl_id
-
-    namelen = LEN(name)
-
-    hdferr = h5gcreate_c(loc_id, name, namelen, size_hint_default, grp_id, &
-         lcpl_id_default, gcpl_id_default, gapl_id_default)
-
-  END SUBROUTINE h5gcreate_f
-
-!!$!
-!!$!****s* H5G/
-!!$!
-!!$! NAME
-!!$!  h5gcreate2_f
-!!$!
-!!$! PURPOSE
-!!$!	Creates a new group.
-!!$!
-!!$! INPUTS
-!!$!		loc_id		- location identifier
-!!$!		name		- group name at the specified location
-!!$! OUTPUTS
-!!$!		grp_id		- group identifier
-!!$!		hdferr:		- error code
-!!$!				 	Success:  0
-!!$!				 	Failure: -1
-!!$! OPTIONAL PARAMETERS
-!!$!
-!!$!    lcpl_id  - Property list for link creation
-!!$!    gcpl_id  - Property list for group creation
-!!$!    gapl_id  - Property list for group access
-!!$!
-!!$! AUTHOR	M. Scot Breitenfeld
-!!$!		February 27, 2008
-!!$!
-!!$! HISTORY
-!!$!
-!!$! NOTES Needed to switch the first 2 arguments to avoid conflect
-!!$!          with h5gcreate1_f
-!!$!
-!!$
-!!$  SUBROUTINE h5gcreate2_f(name, loc_id, grp_id, hdferr, &
-!!$        lcpl_id, gcpl_id, gapl_id)
-!!$    IMPLICIT NONE
-!!$    CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of the group
-!!$    INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier
-!!$    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-!!$    INTEGER(HID_T), INTENT(OUT) :: grp_id  ! Group identifier
-!!$
-!!$    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lcpl_id  ! Property list for link creation
-!!$    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: gcpl_id  ! Property list for group creation
-!!$    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: gapl_id  ! Property list for group access
-!!$
-!!$    INTEGER(HID_T) :: lcpl_id_default
-!!$    INTEGER(HID_T) :: gcpl_id_default
-!!$    INTEGER(HID_T) :: gapl_id_default
-!!$
-!!$    INTEGER(SIZE_T) :: OBJECT_NAME
-!  LEN_DEFAULT ! Dummy argument to pass to c call
-!!$    INTEGER :: namelen ! Length of the name character string
-!!$
-!!$!  MS FORTRAN needs explicit interface for C functions called here.
-!!$!
-!!$    INTERFACE
-!!$       INTEGER FUNCTION h5gcreate_c(loc_id, name, namelen, &
-!!$            OBJECT_NAME
-!  LEN_DEFAULT, grp_id, lcpl_id_default, gcpl_id_default, gapl_id_default)
-!!$         USE H5GLOBAL
-!!$         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-!!$         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5GCREATE_C'::h5gcreate_c
-!!$         !DEC$ENDIF
-!!$         !DEC$ATTRIBUTES reference :: name
-!!$         INTEGER(HID_T), INTENT(IN) :: loc_id
-!!$         CHARACTER(LEN=*), INTENT(IN) :: name
-!!$         INTEGER :: namelen
-!!$         INTEGER(SIZE_T) :: OBJECT_NAME
-!  LEN_DEFAULT
-!!$         INTEGER(HID_T) :: lcpl_id_default
-!!$         INTEGER(HID_T) :: gcpl_id_default
-!!$         INTEGER(HID_T) :: gapl_id_default
-!!$         INTEGER(HID_T), INTENT(OUT) :: grp_id
-!!$       END FUNCTION h5gcreate_c
-!!$    END INTERFACE
-!!$
-!!$    namelen = LEN(name)
-!!$    OBJECT_NAME
-!  LEN_DEFAULT = OBJECT_NAME
-!  LEN_DEFAULT_F
-!!$
-!!$    lcpl_id_default = H5P_DEFAULT_F
-!!$    IF(PRESENT(lcpl_id)) lcpl_id_default = lcpl_id
-!!$    gcpl_id_default = H5P_DEFAULT_F
-!!$    IF(PRESENT(gcpl_id)) gcpl_id_default = gcpl_id
-!!$    gapl_id_default = H5P_DEFAULT_F
-!!$    IF(PRESENT(gapl_id)) gapl_id_default = gapl_id
-!!$
-!!$
-!!$    hdferr = h5gcreate_c(loc_id, name, namelen, OBJECT_NAME
-!  LEN_DEFAULT, grp_id, &
-!!$         lcpl_id_default, gcpl_id_default, gapl_id_default)
-!!$
-!!$  END SUBROUTINE h5gcreate2_f
-
-!
-!****s* H5G/h5gopen_f
-!
-! NAME
-!  h5gopen_f
-!
-! PURPOSE
-!  Opens an existing group.
-!
-! INPUTS
-!  loc_id 	 - location identifier
-!  name 	 - name of the group to open
-! OUTPUTS
-!  grp_id 	 - group identifier
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! OPTIONAL PARAMETERS
-!  gapl_id 	 - Group access property list identifier
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 5, 2001
-!
-!  Added 1.8 (optional) parameter gapl_id
-!  February, 2008 M. Scot Breitenfeld
-!
-! SOURCE
-  SUBROUTINE h5gopen_f(loc_id, name, grp_id, hdferr, gapl_id)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of the group
-    INTEGER(HID_T), INTENT(OUT) :: grp_id  ! File identifier
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: gapl_id  ! Group access property list identifier
-!*****
-    INTEGER(HID_T) :: gapl_id_default
-    INTEGER :: namelen ! Length of the name character string
-
-    INTERFACE
-       INTEGER FUNCTION h5gopen_c(loc_id, name, namelen, gapl_id_default, grp_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5GOPEN_C'::h5gopen_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         INTEGER(HID_T), INTENT(IN) :: loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER :: namelen
-         INTEGER(HID_T), INTENT(IN) :: gapl_id_default
-         INTEGER(HID_T), INTENT(OUT) :: grp_id
-       END FUNCTION h5gopen_c
-    END INTERFACE
-
-    gapl_id_default = H5P_DEFAULT_F
-    IF(PRESENT(gapl_id)) gapl_id_default = gapl_id
-
-    namelen = LEN(name)
-    hdferr = h5gopen_c(loc_id, name, namelen, gapl_id_default, grp_id)
-
-  END SUBROUTINE h5gopen_f
-!
-!****s* H5G/h5gclose_f
-!
-! NAME
-!  h5gclose_f
-!
-! PURPOSE
-!  Closes the specified group.
-!
-! INPUTS
-!  grp_id 	 - group identifier
-! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 5, 2001
-!
-! SOURCE
-  SUBROUTINE h5gclose_f(grp_id, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: grp_id  ! Group identifier
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5gclose_c(grp_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5GCLOSE_C'::h5gclose_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: grp_id
-       END FUNCTION h5gclose_c
-    END INTERFACE
-
-    hdferr = h5gclose_c(grp_id)
-
-  END SUBROUTINE h5gclose_f
-!
-!****s* H5G/h5gget_obj_info_idx_f
-!
-! NAME
-!  h5gget_obj_info_idx_f
-!
-! PURPOSE
-!  Returns name and type of the group member identified by
-!  its index.
-!
-! INPUTS
-!  loc_id 	 - location identifier
-!  name 	 - name of the group at the specified location
-!  idx 	         - object index (zero-based)
-! OUTPUTS
-!  obj_name 	 - object name
-!  obj_type 	 - object type
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 5, 2001
-!
-! SOURCE
-  SUBROUTINE h5gget_obj_info_idx_f(loc_id, name, idx, &
-       obj_name, obj_type, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of the group
-    INTEGER, INTENT(IN) :: idx             ! Index of member object
-    CHARACTER(LEN=*), INTENT(OUT) :: obj_name   ! Name of the object
-    INTEGER, INTENT(OUT) :: obj_type       ! Object type
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-!*****
-    INTEGER :: namelen ! Length of the name character string
-    INTEGER :: obj_namelen ! Length of the obj_name character string
-
-    INTERFACE
-       INTEGER FUNCTION h5gget_obj_info_idx_c(loc_id, name, &
-            namelen, idx, &
-            obj_name, obj_namelen, obj_type)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5GGET_OBJ_INFO_IDX_C'::h5gget_obj_info_idx_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         !DEC$ATTRIBUTES reference :: obj_name
-         INTEGER(HID_T), INTENT(IN) :: loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER :: namelen
-         INTEGER, INTENT(IN) :: idx
-         CHARACTER(LEN=*), INTENT(OUT) :: obj_name
-         INTEGER :: obj_namelen
-         INTEGER, INTENT(OUT) :: obj_type
-       END FUNCTION h5gget_obj_info_idx_c
-    END INTERFACE
-
-    namelen = LEN(name)
-    obj_namelen = LEN(obj_name)
-    hdferr = h5gget_obj_info_idx_c(loc_id, name, namelen, idx, &
-                                           obj_name, obj_namelen, obj_type)
-  END SUBROUTINE h5gget_obj_info_idx_f
-
-!
-!****s* H5G/h5gn_members_f
-!
-! NAME
-!  h5gn_members_f
-!
-! PURPOSE
-!  Returns the number of group members.
-!
-! INPUTS
-!  loc_id 	 - location identifier
-!  name 	 - name of the group at the specified location
-! OUTPUTS
-!  nmembers 	 - number of group members
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 5, 2001
-!
-! SOURCE
-  SUBROUTINE h5gn_members_f(loc_id, name, nmembers, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier
-            CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of the group
-            INTEGER, INTENT(OUT) :: nmembers       ! Number of members in the
-                                                   ! group
-            INTEGER, INTENT(OUT) :: hdferr         ! Error code
-!*****
-            INTEGER :: namelen ! Length of the name character string
-
-            INTERFACE
-              INTEGER FUNCTION h5gn_members_c(loc_id, name, namelen, nmembers)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5GN_MEMBERS_C'::h5gn_members_c
-              !DEC$ENDIF
-              !DEC$ATTRIBUTES reference :: name
-              INTEGER(HID_T), INTENT(IN) :: loc_id
-              CHARACTER(LEN=*), INTENT(IN) :: name
-              INTEGER :: namelen
-              INTEGER, INTENT(OUT) :: nmembers
-              END FUNCTION h5gn_members_c
-            END INTERFACE
-
-            namelen = LEN(name)
-            hdferr = h5gn_members_c(loc_id, name, namelen, nmembers)
-
-          END SUBROUTINE h5gn_members_f
-!
-!****s* H5G/h5glink_f
-!
-! NAME
-!  h5glink_f
-!
-! PURPOSE
-!  Creates a link of the specified type from new_name
-!  to current_name.
-!
-! INPUTS
-!  loc_id 	 - location identifier
-!  link_type 	 - link type; possible values are:
-!                    H5G_LINK_HARD_F (0)
-!                    H5G_LINK_SOFT_F (1)
-!  current_name  - name of the existing object if link is a
-!                  hard link. Can be anything for the soft link
-!  new_name 	 - new name for the object
-! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 5, 2001
-!
-! SOURCE
-  SUBROUTINE h5glink_f(loc_id, link_type, current_name, &
-       new_name, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier
-    INTEGER, INTENT(IN) :: link_type       ! link type
-                                                   ! Possible values are:
-                                                   ! H5G_LINK_HARD_F (0) or
-                                                   ! H5G_LINK_SOFT_F (1)
-
-    CHARACTER(LEN=*), INTENT(IN) :: current_name
-                                                   ! Current name of an object
-    CHARACTER(LEN=*), INTENT(IN) :: new_name ! New name of an object
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-!*****
-
-    INTEGER :: current_namelen ! Lenghth of the current_name string
-    INTEGER :: new_namelen     ! Lenghth of the new_name string
-
-    INTERFACE
-       INTEGER FUNCTION h5glink_c(loc_id, link_type, current_name, &
-            current_namelen, new_name, new_namelen)
-
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5GLINK_C'::h5glink_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: current_name
-         !DEC$ATTRIBUTES reference :: new_name
-         INTEGER(HID_T), INTENT(IN) :: loc_id
-         INTEGER, INTENT(IN) :: link_type
-         CHARACTER(LEN=*), INTENT(IN) :: current_name
-         INTEGER :: current_namelen
-         CHARACTER(LEN=*), INTENT(IN) :: new_name
-         INTEGER :: new_namelen
-       END FUNCTION h5glink_c
-    END INTERFACE
-
-    current_namelen = LEN(current_name)
-    new_namelen = LEN(new_name)
-    hdferr = h5glink_c(loc_id, link_type, current_name, &
-         current_namelen, new_name, new_namelen)
-  END SUBROUTINE h5glink_f
-
-!
-!****s* H5G/h5glink2_f
-!
-! NAME
-!  h5glink2_f
-!
-! PURPOSE
-!  Creates a link of the specified type from new_name
-!  to current_name. current_name and new_name are interpreted
-!  releative to current and new location identifiers.
-!
-! INPUTS
-!  cur_loc_id 	 - location identifier
-!  cur_name 	 - name of the existing object if link is a
-!                  hard link. Can be anything for the soft link.
-!  link_type 	 - link type; possible values are:
-!                    H5G_LINK_HARD_F (0)
-!                    H5G_LINK_SOFT_F (1)
-!  new_loc_id 	 - new location identifier
-!  new_name 	 - new name for the object
-! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  September 25, 2002
-!
-! SOURCE
-  SUBROUTINE h5glink2_f(cur_loc_id, cur_name, link_type, new_loc_id, &
-       new_name, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: cur_loc_id ! File or group identifier
-    CHARACTER(LEN=*), INTENT(IN) :: cur_name
-                                             ! Current name of an object
-    INTEGER, INTENT(IN) :: link_type         ! link type
-                                                 ! Possible values are:
-                                                 ! H5G_LINK_HARD_F (0) or
-                                                 ! H5G_LINK_SOFT_F (1)
-
-    INTEGER(HID_T), INTENT(IN) :: new_loc_id ! File or group identifier
-    CHARACTER(LEN=*), INTENT(IN) :: new_name ! New name of an object
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-!*****
-
-    INTEGER :: cur_namelen ! Lenghth of the current_name string
-    INTEGER :: new_namelen ! Lenghth of the new_name string
-
-    INTERFACE
-       INTEGER FUNCTION h5glink2_c(cur_loc_id, cur_name, cur_namelen, &
-            link_type, new_loc_id, &
-            new_name, new_namelen)
-
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5GLINK2_C'::h5glink2_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: cur_name
-         !DEC$ATTRIBUTES reference :: new_name
-         INTEGER(HID_T), INTENT(IN) :: cur_loc_id
-         INTEGER(HID_T), INTENT(IN) :: new_loc_id
-         INTEGER, INTENT(IN) :: link_type
-         CHARACTER(LEN=*), INTENT(IN) :: cur_name
-         CHARACTER(LEN=*), INTENT(IN) :: new_name
-         INTEGER :: cur_namelen
-         INTEGER :: new_namelen
-       END FUNCTION h5glink2_c
-    END INTERFACE
-
-    cur_namelen = LEN(cur_name)
-    new_namelen = LEN(new_name)
-    hdferr = h5glink2_c(cur_loc_id, cur_name, cur_namelen, link_type, &
-         new_loc_id, new_name, new_namelen)
-  END SUBROUTINE h5glink2_f
-
-!
-!****s* H5G/h5gunlink_f
-!
-! NAME
-!  h5gunlink_f
-!
-! PURPOSE
-!  Removes the specified name from the group graph and
-!  decrements the link count for the object to which name
-!  points
-!
-! INPUTS
-!  loc_id 	 - location identifier
-!  name 	 - name of the object to unlink
-! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 5, 2001
-!
-! SOURCE
-  SUBROUTINE h5gunlink_f(loc_id, name, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of an object
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-!*****
-    INTEGER :: namelen ! Lenghth of the name character string
-
-    INTERFACE
-       INTEGER FUNCTION h5gunlink_c(loc_id, name, namelen)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5GUNLINK_C'::h5gunlink_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         INTEGER(HID_T), INTENT(IN) :: loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER :: namelen
-       END FUNCTION h5gunlink_c
-    END INTERFACE
-
-    namelen = LEN(name)
-    hdferr = h5gunlink_c(loc_id, name, namelen)
-  END SUBROUTINE h5gunlink_f
-
-!
-!****s* H5G/h5gmove_f
-!
-! NAME
-!  h5gmove_f
-!
-! PURPOSE
-!  Renames an object within an HDF5 file.
-!
-! INPUTS
-!  loc_id 	 - location identifier
-!  name 	 - object's name at specified location
-!  new_name 	 - object's new name
-! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 5, 2001
-!
-! SOURCE
-  SUBROUTINE h5gmove_f(loc_id, name, new_name, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id     ! File or group identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name     ! Current name of an object
-    CHARACTER(LEN=*), INTENT(IN) :: new_name ! New name of an object
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-!*****
-    INTEGER :: namelen         ! Lenghth of the current_name string
-    INTEGER :: new_namelen     ! Lenghth of the new_name string
-    
-    INTERFACE
-       INTEGER FUNCTION h5gmove_c(loc_id, name, namelen, new_name, new_namelen)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5GMOVE_C'::h5gmove_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         !DEC$ATTRIBUTES reference :: new_name
-         INTEGER(HID_T), INTENT(IN) :: loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER :: namelen
-         CHARACTER(LEN=*), INTENT(IN) :: new_name
-         INTEGER :: new_namelen
-       END FUNCTION h5gmove_c
-    END INTERFACE
-    
-    namelen = LEN(name)
-    new_namelen = LEN(new_name)
-    hdferr = h5gmove_c(loc_id, name, namelen, new_name, new_namelen)
-  END SUBROUTINE h5gmove_f
-!
-!****s* H5G/h5gmove2_f
-!
-! NAME
-!  h5gmove2_f
-!
-! PURPOSE
-!  Renames an object within an HDF5 file.
-!
-! INPUTS
-!  src_loc_id 	 - original location identifier
-!  src_name 	 - object's name at specified original location
-!  dst_loc_id 	 - original location identifier
-!  dst_name 	 - object's new name
-! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! AUTHOR
-!  Elena Pourmal
-!  September 25, 2002
-!
-! SOURCE
-  SUBROUTINE h5gmove2_f(src_loc_id, src_name, dst_loc_id, dst_name, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN)   :: src_loc_id  ! File or group identifier
-    CHARACTER(LEN=*), INTENT(IN) :: src_name    ! Original name of an object
-    INTEGER(HID_T), INTENT(IN)   :: dst_loc_id  ! File or group identifier
-    CHARACTER(LEN=*), INTENT(IN) :: dst_name    ! New name of an object
-    INTEGER, INTENT(OUT)         :: hdferr      ! Error code
-!*****
-    INTEGER :: src_namelen         ! Length of the current_name string
-    INTEGER :: dst_namelen         ! Lenghth of the new_name string
-    
-    INTERFACE
-       INTEGER FUNCTION h5gmove2_c(src_loc_id, src_name, src_namelen, &
-            dst_loc_id, dst_name, dst_namelen)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5GMOVE2_C'::h5gmove2_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: src_name
-         !DEC$ATTRIBUTES reference :: dst_name
-         INTEGER(HID_T), INTENT(IN) :: src_loc_id
-         INTEGER(HID_T), INTENT(IN) :: dst_loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: src_name
-         CHARACTER(LEN=*), INTENT(IN) :: dst_name
-         INTEGER :: src_namelen
-         INTEGER :: dst_namelen
-       END FUNCTION h5gmove2_c
-    END INTERFACE
-    
-    src_namelen = LEN(src_name)
-    dst_namelen = LEN(dst_name)
-    hdferr = h5gmove2_c(src_loc_id, src_name, src_namelen, dst_loc_id, dst_name, dst_namelen)
-  END SUBROUTINE h5gmove2_f
-!
-!****s* H5G/h5gget_linkval_f
-!
-! NAME
-!  h5gget_linkval_f
-!
-! PURPOSE
-!  Returns the name of the object that the symbolic link
-!  points to.
-!
-! INPUTS
-!  loc_id 	 - location identifier
-!  name 	 - symbolic link to the object whose name
-!                  is to be returned.
-!  size 	 - maximum number of characters to be returned
-! OUTPUTS
-!  buffer 	 - a buffer to hold the name of the object
-!  being sought
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 5, 2001
-!
-! SOURCE
-  SUBROUTINE h5gget_linkval_f(loc_id, name, size, buffer, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name   ! Current name of an object
-    INTEGER(SIZE_T), INTENT(IN) :: size    ! Maximum number of buffer
-    CHARACTER(LEN=size), INTENT(OUT) :: buffer
-                                           ! Buffer to hold a name of
-                                           ! the object symbolic link
-                                           ! points to
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-!*****
-    INTEGER :: namelen ! Lenghth of the current_name string
-    
-    INTERFACE
-       INTEGER FUNCTION h5gget_linkval_c(loc_id, name, namelen, size, buffer)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5GGET_LINKVAL_C'::h5gget_linkval_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         !DEC$ATTRIBUTES reference :: buffer
-         INTEGER(HID_T), INTENT(IN) :: loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER :: namelen
-         INTEGER(SIZE_T), INTENT(IN) :: size
-         CHARACTER(LEN=*), INTENT(OUT) :: buffer
-       END FUNCTION h5gget_linkval_c
-    END INTERFACE
-    
-    namelen = LEN(name)
-    hdferr = h5gget_linkval_c(loc_id, name, namelen, size, buffer)
-  END SUBROUTINE h5gget_linkval_f
-
-!
-!****s* H5G/h5gset_comment_f
-!
-! NAME
-!  h5gset_comment_f
-!
-! PURPOSE
-!  Sets comment for specified object.
-!
-! INPUTS
-!  loc_id 	 - location identifier
-!  name 	 - name of the object
-!  comment 	 - comment to set for the object
-! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 5, 2001
-!
-! SOURCE
-  SUBROUTINE h5gset_comment_f(loc_id, name, comment, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name   ! Current name of an object
-    CHARACTER(LEN=*), INTENT(IN) :: comment ! New name of an object
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-!*****
-    INTEGER :: namelen ! Lenghth of the current_name string
-    INTEGER :: commentlen     ! Lenghth of the comment string
-    
-    INTERFACE
-       INTEGER FUNCTION h5gset_comment_c(loc_id, name, namelen, &
-            comment, commentlen)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5GSET_COMMENT_C'::h5gset_comment_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         !DEC$ATTRIBUTES reference :: comment
-         INTEGER(HID_T), INTENT(IN) :: loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER :: namelen
-         CHARACTER(LEN=*), INTENT(IN) :: comment
-         INTEGER :: commentlen
-       END FUNCTION h5gset_comment_c
-    END INTERFACE
-    
-    namelen = LEN(name)
-    commentlen = LEN(comment)
-    hdferr = h5gset_comment_c(loc_id, name, namelen, comment, commentlen)
-  END SUBROUTINE h5gset_comment_f
-!
-!****s* H5G/h5gget_comment_f
-!
-! NAME
-!  h5gget_comment_f
-!
-! PURPOSE
-!  Retrieves comment for specified object.
-!
-! INPUTS
-!  loc_id 	 - location identifier
-!  name 	 - name of the object at specified location
-!  size 	 - size of the buffer required to hold comment
-! OUTPUTS
-!  buffer 	 - buffer to hold object's comment
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 5, 2001
-!
-! SOURCE
-  SUBROUTINE h5gget_comment_f(loc_id, name, size, buffer, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name   ! Current name of an object
-    INTEGER(SIZE_T), INTENT(IN) :: size    ! Maximum number of buffer
-    CHARACTER(LEN=size), INTENT(OUT) :: buffer
-                                           ! Buffer to hold a comment
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-!*****
-    INTEGER :: namelen ! Length of the current_name string
-
-    INTERFACE
-       INTEGER FUNCTION h5gget_comment_c(loc_id, name, namelen, size, buffer)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5GGET_COMMENT_C'::h5gget_comment_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name, buffer
-         INTEGER(HID_T), INTENT(IN) :: loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER :: namelen
-         INTEGER(SIZE_T), INTENT(IN) :: size
-         CHARACTER(LEN=*), INTENT(OUT) :: buffer
-       END FUNCTION h5gget_comment_c
-    END INTERFACE
-
-    namelen = LEN(name)
-    hdferr = h5gget_comment_c(loc_id, name, namelen, size, buffer)
-
-  END SUBROUTINE h5gget_comment_f
-!
-!****s* H5G/H5Gcreate_anon_f
-!
-! NAME
-!  H5Gcreate_anon_f
-!
-! PURPOSE
-!  Creates a new empty group without linking it into the file structure.
-!
-! INPUTS
-!  loc_id 	 - Location identifier
-! OUTPUTS
-!  grp_id 	 - group identifier
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! OPTIONAL PARAMETERS
-!  gcpl_id 	 - Group creation property list identifier
-!  gapl_id 	 - Group access property list identifier
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  February 15, 2008
-!
-! SOURCE
-  SUBROUTINE h5Gcreate_anon_f(loc_id, grp_id, hdferr, gcpl_id, gapl_id)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier
-    INTEGER(HID_T), INTENT(OUT) :: grp_id  ! Group identifier
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: gcpl_id  ! Property list for group creation
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: gapl_id  ! Property list for group access
-!*****
-    INTEGER(HID_T) :: gcpl_id_default
-    INTEGER(HID_T) :: gapl_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5gcreate_anon_c(loc_id, gcpl_id_default, gapl_id_default, grp_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5GCREATE_ANON_C'::h5gcreate_anon_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier
-         INTEGER(HID_T), INTENT(IN) :: gcpl_id_default  ! Property list for group creation
-         INTEGER(HID_T), INTENT(IN) :: gapl_id_default  ! Property list for group access
-         INTEGER(HID_T), INTENT(OUT) :: grp_id  ! Group identifier
-       END FUNCTION h5gcreate_anon_c
-    END INTERFACE
-
-    gcpl_id_default = H5P_DEFAULT_F
-    gapl_id_default = H5P_DEFAULT_F
-
-    IF(PRESENT(gcpl_id)) gcpl_id_default = gcpl_id
-    IF(PRESENT(gapl_id)) gapl_id_default = gapl_id
-
-    hdferr = h5gcreate_anon_c(loc_id, gcpl_id_default, gapl_id_default, grp_id)
-
-  END SUBROUTINE h5Gcreate_anon_f
-!
-!****s* H5G/H5Gget_create_plist_f
-!
-! NAME
-!  H5Gget_create_plist_f
-!
-! PURPOSE
-!  Gets a group creation property list identifier.
-!
-! INPUTS
-!  grp_id 	 - group identifier
-! OUTPUTS
-!  gcpl_id 	 - Group creation property list identifier
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! AUTHOR
-!  M. Scot Breitenfeld
-!  February 15, 2008
-!
-! SOURCE
-  SUBROUTINE h5gget_create_plist_f(grp_id, gcpl_id, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN)  :: grp_id  ! Group identifier
-    INTEGER(HID_T), INTENT(OUT) :: gcpl_id ! Property list for group creation
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5gget_create_plist_c(grp_id, gcpl_id )
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5GGET_CREATE_PLIST_C'::h5gget_create_plist_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN)  :: grp_id
-         INTEGER(HID_T), INTENT(OUT) :: gcpl_id
-       END FUNCTION h5gget_create_plist_c
-    END INTERFACE
-
-    hdferr = h5gget_create_plist_c(grp_id, gcpl_id )
-
-  END SUBROUTINE h5gget_create_plist_f
-
-!
-!****s* H5G/h5gget_info_f
-!
-! NAME
-!  h5gget_info_f
-!
-! PURPOSE
-!  Retrieves information about a group
-!
-! INPUTS
-!  group_id 	 - Group identifier
-!
-! OUTPUTS  
-!  storage_type  - Type of storage for links in group
-!                    H5G_STORAGE_TYPE_COMPACT: Compact storage
-!                    H5G_STORAGE_TYPE_DENSE: Indexed storage
-!                    H5G_STORAGE_TYPE_SYMBOL_TABLE: Symbol tables, the original HDF5 structure
-!  nlinks 	 - Number of links in group
-!  max_corder 	 - Current maximum creation order value for group
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! OPTIONAL PARAMETERS
-!  mounted 	 - Whether group has a file mounted on it
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  February 15, 2008
-!
-! NOTES
-!  In C the output is defined as a structure: H5G_info_t
-!
-! HISTORY
-!
-!  - Added 'mounted' paramater
-!    M. Scot Breitenfeld
-!    July 16, 2008
-!
-! SOURCE
-  SUBROUTINE h5gget_info_f(group_id, storage_type, nlinks, max_corder, hdferr, mounted)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: group_id ! Group identifier
-
-    INTEGER, INTENT(OUT) :: storage_type  ! Type of storage for links in group:
-                                          ! H5G_STORAGE_TYPE_COMPACT_F: Compact storage
-                                          ! H5G_STORAGE_TYPE_DENSE_F: Indexed storage
-                                          ! H5G_STORAGE_TYPE_SYMBOL_TABLE_F: Symbol tables, the original HDF5 structure
-    INTEGER, INTENT(OUT) :: nlinks        ! Number of links in group
-    INTEGER, INTENT(OUT) :: max_corder    ! Current maximum creation order value for group
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code:
-                                          ! 0 on success and -1 on failure
-    LOGICAL, INTENT(OUT), OPTIONAL :: mounted  ! Whether group has a file mounted on it
-!*****
-    INTEGER :: mounted_c
-
-    INTERFACE
-       INTEGER FUNCTION h5gget_info_c(group_id, storage_type, nlinks, max_corder, mounted_c)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5GGET_INFO_C'::h5gget_info_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: group_id
-         INTEGER, INTENT(OUT) :: storage_type
-         INTEGER, INTENT(OUT) :: nlinks
-         INTEGER, INTENT(OUT) :: max_corder
-         INTEGER :: mounted_c
-       END FUNCTION h5gget_info_c
-    END INTERFACE
-
-    hdferr = h5gget_info_c(group_id, storage_type, nlinks, max_corder, mounted_c)
-
-    IF(PRESENT(mounted))THEN
-       IF(mounted_c.EQ.0) THEN
-          mounted = .FALSE.
-       ELSE
-          mounted = .TRUE.
-       ENDIF
-    ENDIF
-
-  END SUBROUTINE h5gget_info_f
-!
-!****s* H5G/h5gget_info_by_idx_f
-!
-! NAME
-!  h5gget_info_by_idx_f
-!
-! PURPOSE
-!  Retrieves information about a group, according to the group’s position within an index.
-!
-! INPUTS
-!  loc_id 	 - File or group identifier
-!  group_name 	 - Name of group containing group for which information is to be retrieved
-!  index_type 	 - Index type
-!  order 	 - Order of the count in the index
-!  n 	         - Position in the index of the group for which information is retrieved
-!
-! OUTPUTS
-!  storage_type  - Type of storage for links in group
-!                    H5G_STORAGE_TYPE_COMPACT: Compact storage
-!                    H5G_STORAGE_TYPE_DENSE: Indexed storage
-!                    H5G_STORAGE_TYPE_SYMBOL_TABLE: Symbol tables, the original HDF5 structure
-!  nlinks 	 - Number of links in group
-!  max_corder 	 - Current maximum creation order value for group
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! OPTIONAL PARAMETERS
-!  lapl_id 	 - Link access property list
-!  mounted 	 - Whether group has a file mounted on it
-!
-! NOTES
-!  In C the output is defined as a structure: H5G_info_t
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  February 18, 2008
-!
-! HISTORY
-!  Added 'mounted' paramater
-!  M. Scot Breitenfeld
-!  July 16, 2008
-!
-! SOURCE
-  SUBROUTINE h5gget_info_by_idx_f(loc_id, group_name, index_type, order, n, &
-       storage_type, nlinks, max_corder, hdferr, lapl_id, mounted)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id       ! File or group identifier
-    CHARACTER(LEN=*), INTENT(IN) :: group_name ! Name of group containing group for which information is to be retrieved
-    INTEGER, INTENT(IN) :: index_type ! Index type
-    INTEGER, INTENT(IN) :: order      ! Order of the count in the index
-    INTEGER(HSIZE_T), INTENT(IN) :: n ! Position in the index of the group for which information is retrieved
-
-    INTEGER, INTENT(OUT) :: storage_type ! Type of storage for links in group:
-                                         !   H5G_STORAGE_TYPE_COMPACT_F: Compact storage
-                                         !   H5G_STORAGE_TYPE_DENSE_F: Indexed storage
-                                         !   H5G_STORAGE_TYPE_SYMBOL_TABLE_F: Symbol tables, the original HDF5 structure
-    INTEGER, INTENT(OUT) :: nlinks      ! Number of links in group
-    INTEGER, INTENT(OUT) :: max_corder  ! Current maximum creation order value for group
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code:
-                                        ! 0 on success and -1 on failure
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id ! Link access property list
-    LOGICAL, INTENT(OUT), OPTIONAL :: mounted       ! Whether group has a file mounted on it
-!*****
-    INTEGER :: mounted_c
-    INTEGER(HID_T) :: lapl_id_default
-    INTEGER(SIZE_T) :: group_name_len ! length of group name
-
-    INTERFACE
-       INTEGER FUNCTION h5gget_info_by_idx_c(loc_id, group_name, group_name_len, index_type, order, n, lapl_id_default, &
-            storage_type, nlinks, max_corder, mounted_c)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5GGET_INFO_BY_IDX_C'::h5gget_info_by_idx_c
-         !DEC$ENDIF
-         
-         !DEC$ATTRIBUTES reference :: group_name
-         INTEGER(HID_T), INTENT(IN) :: loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: group_name
-         INTEGER, INTENT(IN) :: index_type
-         INTEGER, INTENT(IN) :: order
-         INTEGER(HSIZE_T), INTENT(IN) :: n
-         INTEGER(HID_T) :: lapl_id_default
-         INTEGER, INTENT(OUT) :: storage_type
-         INTEGER, INTENT(OUT) :: nlinks
-         INTEGER, INTENT(OUT) :: max_corder
-
-         INTEGER(SIZE_T) :: group_name_len
-         INTEGER :: mounted_c
-
-       END FUNCTION h5gget_info_by_idx_c
-    END INTERFACE
-
-    group_name_len = LEN(group_name)
-
-    lapl_id_default = H5P_DEFAULT_F
-    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
-
-    hdferr = h5gget_info_by_idx_c(loc_id, group_name, group_name_len, &
-         index_type, order, n, lapl_id_default, &
-         storage_type, nlinks, max_corder, mounted_c)
-
-    IF(PRESENT(mounted))THEN
-       IF(mounted_c.EQ.0) THEN
-          mounted = .FALSE.
-       ELSE
-          mounted = .TRUE.
-       ENDIF
-    ENDIF
-
-  END SUBROUTINE h5gget_info_by_idx_f
-!
-!****s* H5G/h5gget_info_by_name_f
-!
-! NAME
-!  h5gget_info_by_name_f
-!
-! PURPOSE
-!  Retrieves information about a group.
-!
-! INPUTS
-!  loc_id 	 - File or group identifier
-!  group_name 	 - Name of group containing group for which information is to be retrieved
-!
-! OUTPUTS
-!
-!  storage_type  - Type of storage for links in group
-!                    H5G_STORAGE_TYPE_COMPACT: Compact storage
-!                    H5G_STORAGE_TYPE_DENSE: Indexed storage
-!                    H5G_STORAGE_TYPE_SYMBOL_TABLE: Symbol tables, the original HDF5 structure
-!  nlinks 	 - Number of links in group
-!  max_corder 	 - Current maximum creation order value for group
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! OPTIONAL PARAMETERS
-!  lapl_id 	 - Link access property list
-!  mounted 	 - Whether group has a file mounted on it
-!
-! NOTES
-!  In C the output is defined as a structure: H5G_info_t
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  February 18, 2008
-!
-! HISTORY
-!  Added 'mounted' paramater
-!  M. Scot Breitenfeld
-!  July 16, 2008
-! SOURCE
-  SUBROUTINE h5gget_info_by_name_f(loc_id, group_name, &
-       storage_type, nlinks, max_corder, hdferr, lapl_id, mounted)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id       ! File or group identifier
-    CHARACTER(LEN=*), INTENT(IN) :: group_name ! Name of group containing group for which information is to be retrieved
-
-    INTEGER, INTENT(OUT) :: storage_type  ! Type of storage for links in group:
-                                          ! H5G_STORAGE_TYPE_COMPACT_F: Compact storage
-                                          ! H5G_STORAGE_TYPE_DENSE_F: Indexed storage
-                                          ! H5G_STORAGE_TYPE_SYMBOL_TABLE_F: Symbol tables, the original HDF5 structure
-    INTEGER, INTENT(OUT) :: nlinks        ! Number of links in group
-    INTEGER, INTENT(OUT) :: max_corder    ! Current maximum creation order value for group
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code:
-                                          !   0 on success and -1 on failure
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id ! Link access property list
-    LOGICAL, INTENT(OUT), OPTIONAL :: mounted       ! Whether group has a file mounted on it
-!*****
-    INTEGER :: mounted_c
-    INTEGER(HID_T) :: lapl_id_default
-    INTEGER(SIZE_T) :: group_name_len ! length of group name
-
-    INTERFACE
-       INTEGER FUNCTION h5gget_info_by_name_c(loc_id, group_name, group_name_len, lapl_id_default, &
-            storage_type, nlinks, max_corder, mounted_c)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5GGET_INFO_BY_NAME_C'::h5gget_info_by_name_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: group_name
-         INTEGER(HID_T), INTENT(IN) :: loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: group_name
-         INTEGER(HID_T), INTENT(IN) :: lapl_id_default
-         INTEGER, INTENT(OUT) :: storage_type
-         INTEGER, INTENT(OUT) :: nlinks
-         INTEGER, INTENT(OUT) :: max_corder
-
-         INTEGER(SIZE_T) :: group_name_len
-         INTEGER :: mounted_c
-
-       END FUNCTION h5gget_info_by_name_c
-    END INTERFACE
-
-    group_name_len = LEN(group_name)
-
-    lapl_id_default = H5P_DEFAULT_F
-    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
-
-    hdferr = h5gget_info_by_name_c(loc_id, group_name, group_name_len, lapl_id_default, &
-         storage_type, nlinks, max_corder, mounted_c)
-
-    IF(PRESENT(mounted))THEN
-       IF(mounted_c.EQ.0) THEN
-          mounted = .FALSE.
-       ELSE
-          mounted = .TRUE.
-       ENDIF
-    ENDIF
-
-  END SUBROUTINE h5gget_info_by_name_f
-
-END MODULE H5G
diff --git a/fortran/src/H5If.c b/fortran/src/H5If.c
index 55868dd..ef0128a 100644
--- a/fortran/src/H5If.c
+++ b/fortran/src/H5If.c
@@ -1,296 +1,296 @@
 /****h* H5If/H5If
  * PURPOSE
- *   This file contains C stubs for H5I Fortran APIs
+ *  This file contains C stubs for H5I Fortran APIs
  *
  * COPYRIGHT
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  ******
-*/
+ */
 #include "H5f90.h"
 #include "H5Eprivate.h"
 
 /****if* H5If/h5iget_type_c
  * NAME
- *        h5iget_type_c
+ *  h5iget_type_c
  * PURPOSE
- *     Call H5Iget_type to get the type of an object
+ *  Call H5Iget_type to get the type of an object
  * INPUTS
- *      obj_id - object identifier
+ *  obj_id - object identifier
  * OUTPUTS
- *     type - object type
+ *  type - object type
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Xiangyang Su
  *  Thursday, March 24, 2000
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5iget_type_c (hid_t_f *obj_id, int_f *type)
+h5iget_type_c(hid_t_f *obj_id, int_f *type)
 /******/
 {
-     int ret_value = -1;
-     hid_t c_obj_id;
-     H5I_type_t c_type;
+    int        ret_value = -1;
+    hid_t      c_obj_id;
+    H5I_type_t c_type;
 
-     /*
-      * Call H5Iget_type function.
-      */
-     c_obj_id = *obj_id;
-     c_type = H5Iget_type(c_obj_id);
-     if (c_type == H5I_BADID) return ret_value;
-     *type = (int_f)c_type;
-     ret_value = 0;
-     return ret_value;
+    /*
+     * Call H5Iget_type function.
+     */
+    c_obj_id = *obj_id;
+    c_type   = H5Iget_type(c_obj_id);
+    if (c_type == H5I_BADID)
+        return ret_value;
+    *type     = (int_f)c_type;
+    ret_value = 0;
+    return ret_value;
 }
 /****if* H5If/h5iget_name_c
  * NAME
- *        h5iget_name_c
+ *  h5iget_name_c
  * PURPOSE
- *     Call H5Iget_name to get object's name
+ *  Call H5Iget_name to get object's name
  * INPUTS
- *      obj_id - object identifier
- *              buf_size - size of the buffer
+ *  obj_id - object identifier
+ *  buf_size - size of the buffer
  * OUTPUTS
- *     buf - buffer to hold the name
+ *  buf - buffer to hold the name
  * RETURNS
- *     length of the name on success, -1 on failure
+ *  length of the name on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Wednesday, March 12, 2003
+ *  Wednesday, March 12, 2003
  * HISTORY
  *
- *               Changed the size of c_buf_size to c_buf_size + 1, which
- *               fixes the problem of truncating the string by 1 if the
- *               exact size of the string (buf_size) is passed in.
+ *  Changed the size of c_buf_size to c_buf_size + 1, which
+ *  fixes the problem of truncating the string by 1 if the
+ *  exact size of the string (buf_size) is passed in.
  *               M. Scot Breitenfeld, April 21, 2008
  * SOURCE
-*/
+ */
 int_f
-nh5iget_name_c(hid_t_f *obj_id, _fcd buf, size_t_f *buf_size, size_t_f *name_size)
+h5iget_name_c(hid_t_f *obj_id, _fcd buf, size_t_f *buf_size, size_t_f *name_size)
 /******/
 {
-     int ret_value = -1;
-     hid_t c_obj_id;
-     ssize_t c_size;
-     size_t c_buf_size;
-     char *c_buf =NULL;
+    int     ret_value = -1;
+    hid_t   c_obj_id;
+    ssize_t c_size;
+    size_t  c_buf_size;
+    char   *c_buf = NULL;
 
-     /*
-      * Allocate buffer to hold name of an object
-      */
-     c_buf_size = (size_t)*buf_size +1;
-     c_buf = (char *)HDmalloc(c_buf_size);
-     if (c_buf == NULL) return ret_value;
+    /*
+     * Allocate buffer to hold name of an object
+     */
+    c_buf_size = (size_t)*buf_size + 1;
+    c_buf      = (char *)HDmalloc(c_buf_size);
+    if (c_buf == NULL)
+        return ret_value;
 
-     /*
-      * Call H5IAget_name function
-      */
-     c_obj_id = (hid_t)*obj_id;
-     c_size = H5Iget_name(c_obj_id, c_buf, c_buf_size);
-     if (c_size < 0) goto DONE;
+    /*
+     * Call H5IAget_name function
+     */
+    c_obj_id = (hid_t)*obj_id;
+    c_size   = H5Iget_name(c_obj_id, c_buf, c_buf_size);
+    if (c_size < 0)
+        goto DONE;
 
-     /*
-      * Convert C name to FORTRAN and place it in the given buffer
-      */
-      HD5packFstring(c_buf, _fcdtocp(buf), c_buf_size-1);
-      *name_size = (size_t_f)c_size;
-      ret_value = 0;
+    /*
+     * Convert C name to FORTRAN and place it in the given buffer
+     */
+    HD5packFstring(c_buf, _fcdtocp(buf), c_buf_size - 1);
+    *name_size = (size_t_f)c_size;
+    ret_value  = 0;
 
 DONE:
-      HDfree(c_buf);
-      return ret_value;
+    HDfree(c_buf);
+    return ret_value;
 }
 
 /****if* H5If/h5iinc_ref_c
  * NAME
- *        h5iinc_ref_c
+ *  h5iinc_ref_c
  * PURPOSE
- *     Call H5Iinc_ref to increment object's reference count
+ *  Call H5Iinc_ref to increment object's reference count
  * INPUTS
- *      obj_id - object identifier
+ *  obj_id - object identifier
  * OUTPUTS
- *     ref_count - Reference count of ID
+ *  ref_count - Reference count of ID
  * RETURNS
- *     current reference count on success, -1 on failure
+ *  current reference count on success, -1 on failure
  * AUTHOR
  *  Quincey Koziol
  *  Tuesday, December  9, 2003
  * SOURCE
-*/
+ */
 int_f
-nh5iinc_ref_c(hid_t_f *obj_id, int_f *ref_count)
+h5iinc_ref_c(hid_t_f *obj_id, int_f *ref_count)
 /******/
 {
-     int ret_value;
+    int ret_value;
 
-     /*
-      * Call H5Iinc_ref function
-      */
-     if ((ret_value = H5Iinc_ref(*obj_id)) < 0)
-         HGOTO_DONE(FAIL);
+    /*
+     * Call H5Iinc_ref function
+     */
+    if ((ret_value = H5Iinc_ref(*obj_id)) < 0)
+        HGOTO_DONE(FAIL);
 
     /* Set output & return values */
-    *ref_count=ret_value;
-    ret_value=0;
+    *ref_count = ret_value;
+    ret_value  = 0;
 
 done:
-      return ret_value;
+    return ret_value;
 }
 
 /****if* H5If/h5idec_ref_c
  * NAME
- *        h5idec_ref_c
+ *  h5idec_ref_c
  * PURPOSE
- *     Call H5Idec_ref to decrement object's reference count
+ *  Call H5Idec_ref to decrement object's reference count
  * INPUTS
- *      obj_id - object identifier
+ *  obj_id - object identifier
  * OUTPUTS
- *     ref_count - Reference count of ID
+ *  ref_count - Reference count of ID
  * RETURNS
- *     current reference count on success, -1 on failure
+ *  current reference count on success, -1 on failure
  * AUTHOR
  *  Quincey Koziol
- *              Tuesday, December  9, 2003
+ *  Tuesday, December  9, 2003
  * SOURCE
-*/
+ */
 int_f
-nh5idec_ref_c(hid_t_f *obj_id, int_f *ref_count)
+h5idec_ref_c(hid_t_f *obj_id, int_f *ref_count)
 /******/
 {
-     int ret_value;
+    int ret_value;
 
-     /*
-      * Call H5Idec_ref function
-      */
-     if ((ret_value = H5Idec_ref(*obj_id)) < 0)
-         HGOTO_DONE(FAIL);
+    /*
+     * Call H5Idec_ref function
+     */
+    if ((ret_value = H5Idec_ref(*obj_id)) < 0)
+        HGOTO_DONE(FAIL);
 
     /* Set output & return values */
-    *ref_count=ret_value;
-    ret_value=0;
+    *ref_count = ret_value;
+    ret_value  = 0;
 
 done:
-      return ret_value;
+    return ret_value;
 }
 
 /****if* H5If/h5iget_ref_c
  * NAME
- *        h5iget_ref_c
+ *  h5iget_ref_c
  * PURPOSE
- *     Call H5Iget_ref to retrieve object's reference count
+ *  Call H5Iget_ref to retrieve object's reference count
  * INPUTS
- *      obj_id - object identifier
+ *  obj_id - object identifier
  * OUTPUTS
- *     ref_count - Reference count of ID
+ *  ref_count - Reference count of ID
  * RETURNS
- *     current reference count on success, -1 on failure
+ *  current reference count on success, -1 on failure
  * AUTHOR
  *  Quincey Koziol
  *  Tuesday, December  9, 2003
  *
  * SOURCE
-*/
+ */
 int_f
-nh5iget_ref_c(hid_t_f *obj_id, int_f *ref_count)
+h5iget_ref_c(hid_t_f *obj_id, int_f *ref_count)
 /******/
 {
-     int ret_value;
+    int ret_value;
 
-     /*
-      * Call H5Iget_ref function
-      */
-     if ((ret_value = H5Iget_ref(*obj_id)) < 0)
-         HGOTO_DONE(FAIL);
+    /*
+     * Call H5Iget_ref function
+     */
+    if ((ret_value = H5Iget_ref(*obj_id)) < 0)
+        HGOTO_DONE(FAIL);
 
     /* Set output & return values */
-    *ref_count=ret_value;
-    ret_value=0;
+    *ref_count = ret_value;
+    ret_value  = 0;
 
 done:
-      return ret_value;
+    return ret_value;
 }
 
 /****if* H5If/h5iget_file_id_c
  * NAME
- *        h5iget_file_id_c
+ *  h5iget_file_id_c
  * PURPOSE
- *     Call H5Iget_file_id to obtain file identifier from object identifier
+ *  Call H5Iget_file_id to obtain file identifier from object identifier
  * INPUTS
- *      obj_id - object identifier
+ *  obj_id - object identifier
  * OUTPUTS
- *     file_id - file identifier
+ *  file_id - file identifier
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
  *  Tuesday, August 24, 2004
  *
  * SOURCE
-*/
+ */
 int_f
-nh5iget_file_id_c(hid_t_f *obj_id, hid_t_f *file_id)
+h5iget_file_id_c(hid_t_f *obj_id, hid_t_f *file_id)
 /******/
 {
-     int ret_value;
-     hid_t c_file_id;
+    int   ret_value;
+    hid_t c_file_id;
 
-     /*
-      * Call H5Iget_file_id
-      */
-     if ((c_file_id = H5Iget_file_id(*obj_id)) < 0)
-         HGOTO_DONE(FAIL);
+    /*
+     * Call H5Iget_file_id
+     */
+    if ((c_file_id = H5Iget_file_id(*obj_id)) < 0)
+        HGOTO_DONE(FAIL);
 
     /* Set output & return values */
-    *file_id=(hid_t_f)c_file_id;
-    ret_value=0;
+    *file_id  = (hid_t_f)c_file_id;
+    ret_value = 0;
 
 done:
-      return ret_value;
+    return ret_value;
 }
 
 /*----------------------------------------------------------------------------
- * Name:        h5iis_valid_c
- * Purpose:     Calls H5Iis_valid
- * Inputs:      obj_id - object identifier
- * Outputs:     0 = false, 1 = true
- * Returns:     0 on success, -1 on failure
- * Programmer:  Elena Pourmal
- *              Tuesday, August 24, 2004
- * Modifications:
+ *  Name:        h5iis_valid_c
+ *  Purpose:     Calls H5Iis_valid
+ *  Inputs:      obj_id - object identifier
+ *  Outputs:     0 = false, 1 = true
+ *  Returns:     0 on success, -1 on failure
+ *  Programmer:  Elena Pourmal
+ *  Tuesday, August 24, 2004
+ *  Modifications:
  *---------------------------------------------------------------------------*/
 int_f
-nh5iis_valid_c(hid_t_f *obj_id, int_f *c_valid)
+h5iis_valid_c(hid_t_f *obj_id, int_f *c_valid)
 {
-     int ret_value;
-     htri_t c_ret_value;
+    int    ret_value;
+    htri_t c_ret_value;
 
-     /*
-      * Call H5Iis_valid
-      */
-     if ((c_ret_value = H5Iis_valid(*obj_id)) < 0)
-       HGOTO_DONE(FAIL);
+    /*
+     * Call H5Iis_valid
+     */
+    if ((c_ret_value = H5Iis_valid(*obj_id)) < 0)
+        HGOTO_DONE(FAIL);
 
-     /* Set output & return values */
-     *c_valid = (int_f)c_ret_value;
-     ret_value=0;
+    /* Set output & return values */
+    *c_valid  = (int_f)c_ret_value;
+    ret_value = 0;
 
 done:
-      return ret_value;
+    return ret_value;
 }
diff --git a/fortran/src/H5Iff.F90 b/fortran/src/H5Iff.F90
new file mode 100644
index 0000000..6e6662c
--- /dev/null
+++ b/fortran/src/H5Iff.F90
@@ -0,0 +1,254 @@
+!> @defgroup FH5I Fortran Identifier (H5I) Interface
+!!
+!! @see H5I, C-API
+!!
+!! @see @ref H5I_UG, User Guide
+!!
+
+!> @ingroup FH5I
+!!
+!! @brief This module contains Fortran interfaces for H5I functions.
+!
+! COPYRIGHT
+!  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+!  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+! NOTES
+!       _____ __  __ _____   ____  _____ _______       _   _ _______
+!      |_   _|  \/  |  __ \ / __ \|  __ \__   __|/\   | \ | |__   __|
+! ****   | | | \  / | |__) | |  | | |__) | | |  /  \  |  \| |  | |    ****
+! ****   | | | |\/| |  ___/| |  | |  _  /  | | / /\ \ | . ` |  | |    ****
+! ****  _| |_| |  | | |    | |__| | | \ \  | |/ ____ \| |\  |  | |    ****
+!      |_____|_|  |_|_|     \____/|_|  \_\ |_/_/    \_\_| \_|  |_|
+!
+!  If you add a new H5I function you must add the function name to the
+!  Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
+!  This is needed for Windows based operating systems.
+!
+
+MODULE H5I
+
+  USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR, C_CHAR
+  USE H5GLOBAL
+
+CONTAINS
+
+!>
+!! \ingroup FH5I
+!!
+!! \brief Retrieves the type of an object.
+!!
+!! \param obj_id Object identifier.
+!! \param type   Type of the object, possible values:
+!!               \li H5I_FILE_F
+!!               \li H5I_GROUP_F
+!!               \li H5I_DATATYPE_F
+!!               \li H5I_DATASPACE_F
+!!               \li H5I_DATASET_F
+!!               \li H5I_ATTR_F
+!!               \li H5I_BADID_F
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Iget_type()
+!!
+  SUBROUTINE h5iget_type_f(obj_id, TYPE, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: obj_id
+    INTEGER, INTENT(OUT) :: TYPE
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5iget_type_c(obj_id, TYPE) BIND(C, NAME='h5iget_type_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: obj_id
+         INTEGER, INTENT(OUT) :: TYPE
+       END FUNCTION h5iget_type_c
+    END INTERFACE
+    hdferr = h5iget_type_c(obj_id, TYPE)
+  END SUBROUTINE h5iget_type_f
+
+!>
+!! \ingroup FH5I
+!!
+!! \brief Gets a name of an object specified by its identifier.
+!!
+!! \param obj_id    Attribute identifier.
+!! \param buf_size  Size of a buffer to read name in.
+!! \param buf       Buffer to read name in, name will be truncated if buffer is not big enough.
+!! \param name_size Name size.
+!! \param hdferr    \fortran_error
+!!
+!! See C API: @ref H5Iget_name()
+!!
+  SUBROUTINE h5iget_name_f(obj_id, buf, buf_size, name_size, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: obj_id
+    INTEGER(SIZE_T), INTENT(IN) :: buf_size
+    CHARACTER(LEN=*), INTENT(OUT) :: buf
+    INTEGER(SIZE_T), INTENT(OUT) :: name_size
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5iget_name_c(obj_id, buf, buf_size, name_size) BIND(C, NAME='h5iget_name_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: obj_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(OUT) :: buf
+         INTEGER(SIZE_T), INTENT(IN) :: buf_size
+         INTEGER(SIZE_T), INTENT(OUT) :: name_size
+       END FUNCTION h5iget_name_c
+    END INTERFACE
+
+    hdferr = h5iget_name_c(obj_id, buf, buf_size, name_size)
+  END SUBROUTINE h5iget_name_f
+
+!>
+!! \ingroup FH5I
+!!
+!! \brief Increments the reference count of an ID.
+!!
+!! \param obj_id    Object identifier.
+!! \param ref_count Current reference count of the ID.
+!! \param hdferr    \fortran_error
+!!
+!! See C API: @ref H5Iinc_ref()
+!!
+  SUBROUTINE h5iinc_ref_f(obj_id, ref_count, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: obj_id
+    INTEGER, INTENT(OUT) :: ref_count
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5iinc_ref_c(obj_id, ref_count) BIND(C, NAME='h5iinc_ref_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: obj_id
+         INTEGER, INTENT(OUT) :: ref_count
+       END FUNCTION h5iinc_ref_c
+    END INTERFACE
+    hdferr = h5iinc_ref_c(obj_id, ref_count)
+  END SUBROUTINE h5iinc_ref_f
+
+!>
+!! \ingroup FH5I
+!!
+!! \brief Decrements the reference count of an ID.
+!!
+!! \param obj_id    Object identifier.
+!! \param ref_count Current reference count of the ID.
+!! \param hdferr    \fortran_error
+!!
+!! See C API: @ref H5Idec_ref()
+!!
+  SUBROUTINE h5idec_ref_f(obj_id, ref_count, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: obj_id
+    INTEGER, INTENT(OUT) :: ref_count
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5idec_ref_c(obj_id, ref_count) BIND(C, NAME='h5idec_ref_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: obj_id
+         INTEGER, INTENT(OUT) :: ref_count
+       END FUNCTION h5idec_ref_c
+    END INTERFACE
+    hdferr = h5idec_ref_c(obj_id, ref_count)
+  END SUBROUTINE h5idec_ref_f
+
+!>
+!! \ingroup FH5I
+!!
+!! \brief Retrieves the reference count of an ID.
+!!
+!! \param obj_id    Object identifier.
+!! \param ref_count Current reference count of the ID.
+!! \param hdferr     \fortran_error
+!!
+!! See C API: @ref H5Iget_ref()
+!!
+  SUBROUTINE h5iget_ref_f(obj_id, ref_count, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: obj_id
+    INTEGER, INTENT(OUT) :: ref_count
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5iget_ref_c(obj_id, ref_count) BIND(C, NAME='h5iget_ref_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: obj_id
+         INTEGER, INTENT(OUT) :: ref_count
+       END FUNCTION h5iget_ref_c
+    END INTERFACE
+    hdferr = h5iget_ref_c(obj_id, ref_count)
+  END SUBROUTINE h5iget_ref_f
+!>
+!! \ingroup FH5I
+!!
+!! \brief Obtains file identifier from the object identifier.
+!!
+!! \param obj_id  Object identifier.
+!! \param file_id File identifier.
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Iget_file_id()
+!!
+  SUBROUTINE h5iget_file_id_f(obj_id, file_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN)  :: obj_id
+    INTEGER(HID_T), INTENT(OUT) :: file_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5iget_file_id_c(obj_id, file_id) BIND(C, NAME='h5iget_file_id_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN)  :: obj_id
+         INTEGER(HID_T), INTENT(OUT) :: file_id
+       END FUNCTION h5iget_file_id_c
+    END INTERFACE
+    hdferr = h5iget_file_id_c(obj_id, file_id)
+  END SUBROUTINE h5iget_file_id_f
+!>
+!! \ingroup FH5I
+!!
+!! \brief Check if an ID is valid without producing an error message.
+!!
+!! \param id      Identifier.
+!! \param valid   Status of id as a valid identifier.
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Iis_valid()
+!!
+  SUBROUTINE h5iis_valid_f(id, valid, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN)  :: id
+    LOGICAL, INTENT(OUT) :: valid
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER  :: c_valid ! 0 = .false, 1 = .true.
+
+    INTERFACE
+       INTEGER FUNCTION h5iis_valid_c(id, c_valid) BIND(C, NAME='h5iis_valid_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN)  :: id
+         INTEGER  :: c_valid
+       END FUNCTION h5iis_valid_c
+    END INTERFACE
+
+    hdferr = h5iis_valid_c(id, c_valid)
+
+    valid = .FALSE. ! Default
+    IF(c_valid.EQ.1) valid = .TRUE.
+
+  END SUBROUTINE h5iis_valid_f
+END MODULE H5I
+
diff --git a/fortran/src/H5Iff.f90 b/fortran/src/H5Iff.f90
deleted file mode 100644
index 7c9a843..0000000
--- a/fortran/src/H5Iff.f90
+++ /dev/null
@@ -1,352 +0,0 @@
-!****h* ROBODoc/H5I
-!
-! NAME
-!  MODULE H5I
-!
-!  FILE
-!  fortran/src/H5Iff.f90
-!
-! PURPOSE
-!  This file contains Fortran interfaces for H5I functions.
-!
-! COPYRIGHT
-!  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!  Copyright by The HDF Group.                                               *
-!  Copyright by the Board of Trustees of the University of Illinois.         *
-!  All rights reserved.                                                      *
-!  *
-!  This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!  terms governing use, modification, and redistribution, is contained in    *
-!  the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!  of the source code distribution tree; Copyright.html can be found at the  *
-!  root level of an installed copy of the electronic HDF5 document set and   *
-!  is linked from the top-level documents page.  It can also be found at     *
-!  http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!  access to either file, you may request a copy from help@hdfgroup.org.     *
-!  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! NOTES
-!                         *** IMPORTANT ***
-!  If you add a new H5I function you must add the function name to the
-!  Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
-!  This is needed for Windows based operating systems.
-!
-!*****
-
-MODULE H5I
-
-  USE H5GLOBAL
-
-CONTAINS
-
-!****s* H5I/h5iget_type_f
-!
-! NAME
-!  h5iget_type_f
-!
-! PURPOSE
-!  Retrieves the type of an object.
-!
-! INPUTS
-!  obj_id   - object identifier
-! OUTPUTS
-!  type     - type of the object, possible values:
-!              H5I_FILE_F
-!              H5I_GROUP_F
-!              H5I_DATATYPE_F
-!              H5I_DATASPACE_F
-!              H5I_DATASET_F
-!              H5I_ATTR_F
-!              H5I_BADID_F
-!  hdferr:  - error code
-!              Success:  0
-!              Failure: -1
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 5, 2001
-!
-! SOURCE
-  SUBROUTINE h5iget_type_f(obj_id, TYPE, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: obj_id  ! Object identifier
-    INTEGER, INTENT(OUT) :: TYPE ! type of an object.
-                                 ! possible values are:
-                                 !   H5I_FILE_F
-                                 !   H5I_GROUP_F
-                                 !   H5I_DATATYPE_F
-                                 !   H5I_DATASPACE_F
-                                 !   H5I_DATASET_F
-                                 !   H5I_ATTR_F
-                                 !   H5I_BADID_F
-    INTEGER, INTENT(OUT) :: hdferr  ! Error code
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5iget_type_c(obj_id, TYPE)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5IGET_TYPE_C':: h5iget_type_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: obj_id
-         INTEGER, INTENT(OUT) :: TYPE
-       END FUNCTION h5iget_type_c
-    END INTERFACE
-    hdferr = h5iget_type_c(obj_id, TYPE)
-  END SUBROUTINE h5iget_type_f
-
-!****s* H5I/h5iget_name_f
-!
-! NAME
-!  h5iget_name_f
-!
-! PURPOSE
-!  Gets a name of an object specified by its idetifier.
-!
-! INPUTS
-!  obj_id    - attribute identifier
-!  buf_size  - size of a buffer to read name in
-! OUTPUTS
-!  buf 	     - buffer to read name in, name will be truncated if
-!              buffer is not big enough
-!  name_size - name size
-!  hdferr:   - error code
-!               Success:  0
-!               Failure: -1
-!
-! AUTHOR
-!  Elena Pourmal
-!  March 12, 2003
-! SOURCE
-  SUBROUTINE h5iget_name_f(obj_id, buf, buf_size, name_size, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: obj_id      ! Object identifier
-    INTEGER(SIZE_T), INTENT(IN) :: buf_size   ! Buffer size
-    CHARACTER(LEN=*), INTENT(OUT) :: buf      ! Buffer to hold object name
-    INTEGER(SIZE_T), INTENT(OUT) :: name_size ! Actual name size
-    INTEGER, INTENT(OUT) :: hdferr            ! Error code:
-                                              !   0 if successful,
-                                              !   -1 if fail
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5iget_name_c(obj_id, buf, buf_size, name_size)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5IGET_NAME_C'::h5iget_name_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: buf
-         INTEGER(HID_T), INTENT(IN) :: obj_id
-         CHARACTER(LEN=*), INTENT(OUT) :: buf
-         INTEGER(SIZE_T), INTENT(IN) :: buf_size
-         INTEGER(SIZE_T), INTENT(OUT) :: name_size
-       END FUNCTION h5iget_name_c
-    END INTERFACE
-
-    hdferr = h5iget_name_c(obj_id, buf, buf_size, name_size)
-  END SUBROUTINE h5iget_name_f
-
-!****s* H5I/h5iinc_ref_f
-!
-! NAME
-!  h5iinc_ref_f
-!
-! PURPOSE
-!  Increments the reference count of an ID
-!
-! INPUTS
-!  obj_id 	 - object identifier
-! OUTPUTS
-!  ref_count 	 - Current reference count of the ID
-!  hdferr:		- error code
-!  Success:  0
-!  Failure: -1
-! AUTHOR
-!  Quincey Koziol
-!  December  9, 2003
-!
-! SOURCE
-  SUBROUTINE h5iinc_ref_f(obj_id, ref_count, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: obj_id ! Object identifier
-    INTEGER, INTENT(OUT) :: ref_count    ! Current reference count of ID
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5iinc_ref_c(obj_id, ref_count)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5IINC_REF_C':: h5iinc_ref_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: obj_id
-         INTEGER, INTENT(OUT) :: ref_count
-       END FUNCTION h5iinc_ref_c
-    END INTERFACE
-    hdferr = h5iinc_ref_c(obj_id, ref_count)
-  END SUBROUTINE h5iinc_ref_f
-
-!****s* H5I/h5idec_ref_f
-!
-! NAME
-!  h5idec_ref_f
-!
-! PURPOSE
-!  Decrements the reference count of an ID
-!
-! INPUTS
-!  obj_id 	 - Object identifier
-! OUTPUTS
-!  ref_count 	 - Current reference count of the ID
-!  hdferr:	 - Error code
-!                   Success:  0
-!                   Failure: -1
-! AUTHOR
-!  Quincey Koziol
-!  December  9, 2003
-!
-! SOURCE
-  SUBROUTINE h5idec_ref_f(obj_id, ref_count, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: obj_id ! Object identifier
-    INTEGER, INTENT(OUT) :: ref_count    ! Current reference count of ID
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5idec_ref_c(obj_id, ref_count)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5IDEC_REF_C':: h5idec_ref_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: obj_id
-         INTEGER, INTENT(OUT) :: ref_count
-       END FUNCTION h5idec_ref_c
-    END INTERFACE
-    hdferr = h5idec_ref_c(obj_id, ref_count)
-  END SUBROUTINE h5idec_ref_f
-
-!****s* H5I/h5iget_ref_f
-! NAME
-!  h5iget_ref_f
-!
-! PURPOSE
-!  Retrieves the reference count of an ID
-!
-! INPUTS
-!  obj_id 	 - object identifier
-!
-! OUTPUTS
-!  ref_count 	 - Current reference count of the ID
-!  hdferr:	   - error code
-!  Success:  0
-!  Failure: -1
-! AUTHOR
-!  Quincey Koziol
-!  December  9, 2003
-!
-! SOURCE
-  SUBROUTINE h5iget_ref_f(obj_id, ref_count, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: obj_id ! Object identifier
-    INTEGER, INTENT(OUT) :: ref_count    ! Current reference count of ID
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5iget_ref_c(obj_id, ref_count)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5IGET_REF_C':: h5iget_ref_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: obj_id
-         INTEGER, INTENT(OUT) :: ref_count
-       END FUNCTION h5iget_ref_c
-    END INTERFACE
-    hdferr = h5iget_ref_c(obj_id, ref_count)
-  END SUBROUTINE h5iget_ref_f
-!
-!****s* H5I/h5iget_file_id_f
-! NAME
-!  h5iget_file_id_f
-!
-! PURPOSE
-!  Obtains file identifier from the object identifier
-!
-! INPUTS
-!  obj_id 	 - object identifier
-! OUTPUTS
-!  file_id 	 - file identifier
-!  hdferr:       - error code
-!                    Success:  0
-!                    Failure: -1
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 23, 2004
-! SOURCE
-  SUBROUTINE h5iget_file_id_f(obj_id, file_id, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN)  :: obj_id   ! Object identifier
-    INTEGER(HID_T), INTENT(OUT) :: file_id  ! File identifier
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5iget_file_id_c(obj_id, file_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5IGET_FILE_ID_C':: h5iget_file_id_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN)  :: obj_id
-         INTEGER(HID_T), INTENT(OUT) :: file_id
-       END FUNCTION h5iget_file_id_c
-    END INTERFACE
-    hdferr = h5iget_file_id_c(obj_id, file_id)
-  END SUBROUTINE h5iget_file_id_f
-!
-!****s* H5I/h5iis_valid_f
-! NAME
-!  h5iget_file_id_f
-!
-! PURPOSE
-!  Check if an ID is valid without producing an error message
-!
-! INPUTS
-!  id		- identifier 
-! OUTPUTS       
-!  valid        - status of id as a valid identifier
-!  hdferr:	- error code		
-!		   Success:  0
-!		   Failure: -1
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  April 13, 2009
-! SOURCE
-  SUBROUTINE h5iis_valid_f(id, valid, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN)  :: id ! Identifier 
-    LOGICAL, INTENT(OUT) :: valid     ! Status of id as a valid identifier
-    INTEGER, INTENT(OUT) :: hdferr    ! Error code
-!*****
-    INTEGER  :: c_valid ! 0 = .false, 1 = .true.
-    
-    INTERFACE
-       INTEGER FUNCTION h5iis_valid_c(id, c_valid)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5IIS_VALID_C':: h5iis_valid_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN)  :: id   ! Identifier 
-         INTEGER  :: c_valid
-       END FUNCTION h5iis_valid_c
-    END INTERFACE
-    
-    hdferr = h5iis_valid_c(id, c_valid)
-    
-    valid = .FALSE. ! Default
-    IF(c_valid.EQ.1) valid = .TRUE.
-    
-  END SUBROUTINE h5iis_valid_f
-END MODULE H5I
-
diff --git a/fortran/src/H5Lf.c b/fortran/src/H5Lf.c
index 6523ab4..6951fef 100644
--- a/fortran/src/H5Lf.c
+++ b/fortran/src/H5Lf.c
@@ -1,195 +1,191 @@
 /****h* H5Lf/H5Lf
  * PURPOSE
- *   This file contains C stubs for H5L Fortran APIs
+ *  This file contains C stubs for H5L Fortran APIs
  *
  * COPYRIGHT
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  ******
-*/
+ */
 
 #include "H5f90.h"
 #include "H5Eprivate.h"
 
 /****if* H5Lf/h5lcopy_c
  * NAME
- *        h5lcopy_c
+ *  h5lcopy_c
  * PURPOSE
- *     Call H5Lcopy
+ *  Call H5Lcopy
  * INPUTS
  *
- *     src_loc_id - Location identifier of the source link
- *       src_name - Name of the link to be copied
- *    src_namelen - length of the name
- *    dest_loc_id - Location identifier specifying the destination of the copy
- *      dest_name - Name to be assigned to the NEW copy
- *   dest_namelen - Length of the name
- *         loc_id - Identifier of the file or group containing the object
- *           name - Name of the link to delete
- *        lcpl_id - Link creation property list identifier
- *        lapl_id - Link access property list identifier
+ *  src_loc_id - Location identifier of the source link
+ *  src_name - Name of the link to be copied
+ *  src_namelen - length of the name
+ *  dest_loc_id - Location identifier specifying the destination of the copy
+ *  dest_name - Name to be assigned to the NEW copy
+ *  dest_namelen - Length of the name
+ *  loc_id - Identifier of the file or group containing the object
+ *  name - Name of the link to delete
+ *  lcpl_id - Link creation property list identifier
+ *  lapl_id - Link access property list identifier
  *
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              January, 2008
+ *  January, 2008
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5lcopy_c(hid_t_f *src_loc_id, _fcd src_name, size_t_f *src_namelen, hid_t_f *dest_loc_id,
-	     _fcd dest_name, size_t_f *dest_namelen,
-	     hid_t_f *lcpl_id, hid_t_f *lapl_id)
+h5lcopy_c(hid_t_f *src_loc_id, _fcd src_name, size_t_f *src_namelen, hid_t_f *dest_loc_id, _fcd dest_name,
+          size_t_f *dest_namelen, hid_t_f *lcpl_id, hid_t_f *lapl_id)
 /******/
 {
-    char *c_src_name = NULL;
+    char *c_src_name  = NULL;
     char *c_dest_name = NULL;
-    int_f ret_value = 0;
+    int_f ret_value   = 0;
 
     /*
      * Convert FORTRAN name to C name
      */
-    if(NULL == (c_src_name = HD5f2cstring(src_name, (size_t)*src_namelen)))
+    if (NULL == (c_src_name = HD5f2cstring(src_name, (size_t)*src_namelen)))
         HGOTO_DONE(FAIL)
-    if(NULL == (c_dest_name = HD5f2cstring(dest_name, (size_t)*dest_namelen)))
+    if (NULL == (c_dest_name = HD5f2cstring(dest_name, (size_t)*dest_namelen)))
         HGOTO_DONE(FAIL)
 
     /*
      * Call H5Lcopy function.
      */
-    if(H5Lcopy((hid_t)*src_loc_id, c_src_name, (hid_t) *dest_loc_id,
-  	       c_dest_name, (hid_t)*lcpl_id, (hid_t)*lapl_id ) < 0)
+    if (H5Lcopy((hid_t)*src_loc_id, c_src_name, (hid_t)*dest_loc_id, c_dest_name, (hid_t)*lcpl_id,
+                (hid_t)*lapl_id) < 0)
         HGOTO_DONE(FAIL)
 
 done:
-    if(c_src_name)
+    if (c_src_name)
         HDfree(c_src_name);
-    if(c_dest_name)
+    if (c_dest_name)
         HDfree(c_dest_name);
 
-  return ret_value;
+    return ret_value;
 }
 
 /****if* H5Lf/h5lcreate_external_c
  * NAME
- *        h5lcreate_external_c
+ *  h5lcreate_external_c
  * PURPOSE
- *     Call H5Lcreate_external_c
+ *  Call H5Lcreate_external_c
  * INPUTS
  *
- *    file_name - Name of the file containing the target object. Neither the file nor the target object is
- *                required to exist. May be the file the link is being created in.
- *     obj_name - Path within the target file to the target object.
+ *  file_name - Name of the file containing the target object. Neither the file nor the target object is
+ *  required to exist. May be the file the link is being created in.
+ *  obj_name - Path within the target file to the target object.
  *  link_loc_id - The file or group identifier for the new link.
- *    link_name - The name of the new link.
- *      lcpl_id - Link creation property list identifier.
- *      lapl_id - Link access property list identifier.
+ *  link_name - The name of the new link.
+ *  lcpl_id - Link creation property list identifier.
+ *  lapl_id - Link access property list identifier.
  *
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
  *  February 29, 2008
  * SOURCE
-*/
+ */
 
 int_f
-nh5lcreate_external_c(_fcd file_name, size_t_f *file_namelen, _fcd obj_name, size_t_f *obj_namelen,
-		      hid_t_f *link_loc_id, _fcd link_name, size_t_f *link_namelen,
-		      hid_t_f *lcpl_id, hid_t_f *lapl_id)
+h5lcreate_external_c(_fcd file_name, size_t_f *file_namelen, _fcd obj_name, size_t_f *obj_namelen,
+                     hid_t_f *link_loc_id, _fcd link_name, size_t_f *link_namelen, hid_t_f *lcpl_id,
+                     hid_t_f *lapl_id)
 /******/
 {
-  char *c_file_name = NULL;
-  char *c_obj_name = NULL;
-  char *c_link_name = NULL;
-  int_f ret_value = 0;
-
-  /*
-   * Convert FORTRAN name to C name
-   */
-  if((c_file_name = HD5f2cstring(file_name, (size_t)*file_namelen)) == NULL)
-    HGOTO_DONE(FAIL);
-  if((c_obj_name = HD5f2cstring(obj_name, (size_t)*obj_namelen)) == NULL)
-    HGOTO_DONE(FAIL);
-  if((c_link_name = HD5f2cstring(link_name, (size_t)*link_namelen)) == NULL)
-    HGOTO_DONE(FAIL);
-
-  /*
-   * Call H5Lcopy function.
-   */
-  if( H5Lcreate_external( c_file_name, c_obj_name, (hid_t) *link_loc_id, c_link_name,
-			  (hid_t) *lcpl_id, (hid_t) *lapl_id) < 0)
-    HGOTO_DONE(FAIL);
+    char *c_file_name = NULL;
+    char *c_obj_name  = NULL;
+    char *c_link_name = NULL;
+    int_f ret_value   = 0;
+
+    /*
+     * Convert FORTRAN name to C name
+     */
+    if ((c_file_name = HD5f2cstring(file_name, (size_t)*file_namelen)) == NULL)
+        HGOTO_DONE(FAIL);
+    if ((c_obj_name = HD5f2cstring(obj_name, (size_t)*obj_namelen)) == NULL)
+        HGOTO_DONE(FAIL);
+    if ((c_link_name = HD5f2cstring(link_name, (size_t)*link_namelen)) == NULL)
+        HGOTO_DONE(FAIL);
+
+    /*
+     * Call H5Lcopy function.
+     */
+    if (H5Lcreate_external(c_file_name, c_obj_name, (hid_t)*link_loc_id, c_link_name, (hid_t)*lcpl_id,
+                           (hid_t)*lapl_id) < 0)
+        HGOTO_DONE(FAIL);
 
 done:
-  if(c_file_name)
-    HDfree(c_file_name);
-  if(c_obj_name)
-    HDfree(c_obj_name);
-  if(c_link_name)
-    HDfree(c_link_name);
-
-  return ret_value;
+    if (c_file_name)
+        HDfree(c_file_name);
+    if (c_obj_name)
+        HDfree(c_obj_name);
+    if (c_link_name)
+        HDfree(c_link_name);
+
+    return ret_value;
 }
 
 /****if* H5Lf/h5ldelete_c
  * NAME
- *        h5ldelete_c
+ *  h5ldelete_c
  * PURPOSE
- *     Call H5Ldelete
+ *  Call H5Ldelete
  * INPUTS
  *
  *
- *    loc_id  - Identifier of the file or group containing the object
- *    name    - Name of the link to delete
- *    lapl_id - Link access property list identifier
- *    namelen - length of name
+ *  loc_id  - Identifier of the file or group containing the object
+ *  name    - Name of the link to delete
+ *  lapl_id - Link access property list identifier
+ *  namelen - length of name
  *
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              January, 2008
+ *  January, 2008
  * SOURCE
-*/
+ */
 
 int_f
-nh5ldelete_c ( hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *lapl_id )
+h5ldelete_c(hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *lapl_id)
 /******/
 {
-  char *c_name = NULL;
-  int_f ret_value = 0;
+    char *c_name    = NULL;
+    int_f ret_value = 0;
 
-  /*
-   * Convert FORTRAN name to C name
-   */
-  if((c_name = HD5f2cstring(name, (size_t)*namelen)) == NULL)
-    HGOTO_DONE(FAIL);
+    /*
+     * Convert FORTRAN name to C name
+     */
+    if ((c_name = HD5f2cstring(name, (size_t)*namelen)) == NULL)
+        HGOTO_DONE(FAIL);
 
-  /*
-   * Call H5Ldelete function.
-   */
-  if( H5Ldelete( (hid_t)*loc_id, c_name, (hid_t)*lapl_id  ) < 0)
-    HGOTO_DONE(FAIL);
+    /*
+     * Call H5Ldelete function.
+     */
+    if (H5Ldelete((hid_t)*loc_id, c_name, (hid_t)*lapl_id) < 0)
+        HGOTO_DONE(FAIL);
 
 done:
-    if(c_name)
+    if (c_name)
         HDfree(c_name);
 
     return ret_value;
@@ -197,55 +193,53 @@ done:
 
 /****if* H5Lf/h5lcreate_soft_c
  * NAME
- *        h5lcreate_soft_c
+ *  h5lcreate_soft_c
  * PURPOSE
- *     Call H5Lcreate_soft
+ *  Call H5Lcreate_soft
  * INPUTS
  *
  *
- *       target_path - Path to the target object, which is not required to exist.
- *       link_loc_id - The file or group identifier for the new link.
- *       link_name   - The name of the new link.
- *       lcpl_id     - Link creation property list identifier.
- *       lapl_id     - Link access property list identifier.
+ *  target_path - Path to the target object, which is not required to exist.
+ *  link_loc_id - The file or group identifier for the new link.
+ *  link_name   - The name of the new link.
+ *  lcpl_id     - Link creation property list identifier.
+ *  lapl_id     - Link access property list identifier.
  *
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              February 20, 2008
+ *  February 20, 2008
  * SOURCE
-*/
+ */
 
 int_f
-nh5lcreate_soft_c(_fcd target_path, size_t_f *target_path_len,
-		  hid_t_f *link_loc_id,
-		  _fcd link_name, size_t_f *link_name_len,
-		  hid_t_f *lcpl_id, hid_t_f *lapl_id )
+h5lcreate_soft_c(_fcd target_path, size_t_f *target_path_len, hid_t_f *link_loc_id, _fcd link_name,
+                 size_t_f *link_name_len, hid_t_f *lcpl_id, hid_t_f *lapl_id)
 /******/
 {
-  char *c_target_path = NULL;
-  char *c_link_name = NULL;
-  int_f ret_value = 0;
-
-  /*
-   * Convert FORTRAN name to C name
-   */
-  if((c_target_path = HD5f2cstring(target_path, (size_t)*target_path_len)) == NULL)
-    HGOTO_DONE(FAIL);
-  if((c_link_name = HD5f2cstring(link_name, (size_t)*link_name_len)) == NULL)
-    HGOTO_DONE(FAIL);
-
-  /*
-   * Call H5Adelete function.
-   */
-  if ( H5Lcreate_soft(c_target_path,(hid_t)*link_loc_id, c_link_name, (hid_t)*lcpl_id, (hid_t)*lapl_id) < 0)
-    HGOTO_DONE(FAIL);
-
- done:
-    if(c_target_path)
+    char *c_target_path = NULL;
+    char *c_link_name   = NULL;
+    int_f ret_value     = 0;
+
+    /*
+     * Convert FORTRAN name to C name
+     */
+    if ((c_target_path = HD5f2cstring(target_path, (size_t)*target_path_len)) == NULL)
+        HGOTO_DONE(FAIL);
+    if ((c_link_name = HD5f2cstring(link_name, (size_t)*link_name_len)) == NULL)
+        HGOTO_DONE(FAIL);
+
+    /*
+     * Call H5Adelete function.
+     */
+    if (H5Lcreate_soft(c_target_path, (hid_t)*link_loc_id, c_link_name, (hid_t)*lcpl_id, (hid_t)*lapl_id) < 0)
+        HGOTO_DONE(FAIL);
+
+done:
+    if (c_target_path)
         HDfree(c_target_path);
-    if(c_link_name)
+    if (c_link_name)
         HDfree(c_link_name);
 
     return ret_value;
@@ -253,56 +247,55 @@ nh5lcreate_soft_c(_fcd target_path, size_t_f *target_path_len,
 
 /****if* H5Lf/h5lcreate_hard_c
  * NAME
- *        h5lcreate_hard_c
+ *  h5lcreate_hard_c
  * PURPOSE
- *     Call H5Lcreate_hard
+ *  Call H5Lcreate_hard
  * INPUTS
  *
- *       obj_loc_id  - The file or group identifier for the target object.
- *       obj_name    - Name of the target object, which must already exist.
- *       obj_namelen - Name length
- *       link_loc_id - The file or group identifier for the new link.
- *       link_name   - The name of the new link.
- *       link_namelen- Name length
- *       lcpl_id     - Link creation property list identifier.
- *       lapl_id     - Link access property list identifier.
+ *  obj_loc_id  - The file or group identifier for the target object.
+ *  obj_name    - Name of the target object, which must already exist.
+ *  obj_namelen - Name length
+ *  link_loc_id - The file or group identifier for the new link.
+ *  link_name   - The name of the new link.
+ *  link_namelen- Name length
+ *  lcpl_id     - Link creation property list identifier.
+ *  lapl_id     - Link access property list identifier.
  *
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
  *  February 27, 2008
  * SOURCE
-*/
+ */
 int_f
-nh5lcreate_hard_c(hid_t_f *obj_loc_id, _fcd obj_name, size_t_f *obj_namelen,
-		  hid_t_f *link_loc_id,
-		  _fcd link_name, size_t_f *link_namelen,
-		  hid_t_f *lcpl_id, hid_t_f *lapl_id )
+h5lcreate_hard_c(hid_t_f *obj_loc_id, _fcd obj_name, size_t_f *obj_namelen, hid_t_f *link_loc_id,
+                 _fcd link_name, size_t_f *link_namelen, hid_t_f *lcpl_id, hid_t_f *lapl_id)
 /******/
 {
-  char *c_obj_name = NULL;
-  char *c_link_name = NULL;
-  int_f ret_value = 0;
-
-  /*
-   * Convert FORTRAN name to C name
-   */
-  if((c_obj_name = HD5f2cstring(obj_name, (size_t)*obj_namelen)) == NULL)
-    HGOTO_DONE(FAIL);
-  if((c_link_name = HD5f2cstring(link_name, (size_t)*link_namelen)) == NULL)
-    HGOTO_DONE(FAIL);
-
-  /*
-   * Call H5Lcreate_hard function.
-   */
-  if ( H5Lcreate_hard((hid_t)*obj_loc_id, c_obj_name, (hid_t)*link_loc_id, c_link_name, (hid_t)*lcpl_id, (hid_t)*lapl_id) < 0)
-    HGOTO_DONE(FAIL);
-
- done:
-    if(c_obj_name)
+    char *c_obj_name  = NULL;
+    char *c_link_name = NULL;
+    int_f ret_value   = 0;
+
+    /*
+     * Convert FORTRAN name to C name
+     */
+    if ((c_obj_name = HD5f2cstring(obj_name, (size_t)*obj_namelen)) == NULL)
+        HGOTO_DONE(FAIL);
+    if ((c_link_name = HD5f2cstring(link_name, (size_t)*link_namelen)) == NULL)
+        HGOTO_DONE(FAIL);
+
+    /*
+     * Call H5Lcreate_hard function.
+     */
+    if (H5Lcreate_hard((hid_t)*obj_loc_id, c_obj_name, (hid_t)*link_loc_id, c_link_name, (hid_t)*lcpl_id,
+                       (hid_t)*lapl_id) < 0)
+        HGOTO_DONE(FAIL);
+
+done:
+    if (c_obj_name)
         HDfree(c_obj_name);
-    if(c_link_name)
+    if (c_link_name)
         HDfree(c_link_name);
 
     return ret_value;
@@ -310,185 +303,185 @@ nh5lcreate_hard_c(hid_t_f *obj_loc_id, _fcd obj_name, size_t_f *obj_namelen,
 
 /****if* H5Lf/h5ldelete_by_idx_c
  * NAME
- *        h5ldelete_by_idx_c
+ *  h5ldelete_by_idx_c
  * PURPOSE
- *     Calls h5ldelete_by_idx
+ *  Calls h5ldelete_by_idx
  * INPUTS
  *
- *          loc_id - File or group identifier specifying location of subject group
- *      group_name - Name of subject group
- *   group_namelen - Name length
- *     index_field - Type of index; Possible values are:
+ *  loc_id - File or group identifier specifying location of subject group
+ *  group_name - Name of subject group
+ *  group_namelen - Name length
+ *  index_field - Type of index; Possible values are:
  *                    H5_INDEX_UNKNOWN_F = -1  - Unknown index type
  *                    H5_INDEX_NAME_F          - Index on names
  *                    H5_INDEX_CRT_ORDER_F     - Index on creation order
  *                    H5_INDEX_N_F	       - Number of indices defined
- *           order - Order within field or index; Possible values are:
+ *  order - Order within field or index; Possible values are:
  *                    H5_ITER_UNKNOWN_F   - Unknown order
  *                    H5_ITER_INC_F       - Increasing order
  *                    H5_ITER_DEC_F       - Decreasing order
  *                    H5_ITER_NATIVE_F    - No particular order, whatever is fastest
  *                    H5_ITER_N_F	  - Number of iteration orders
- *               n - Link for which to retrieve information
- *         lapl_id - Link access property list
+ *  n - Link for which to retrieve information
+ *  lapl_id - Link access property list
  *
  * OUTPUTS
  *     N/A
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              February 29, 2008
+ *  February 29, 2008
  * HISTORY
  * N/A
  * SOURCE
-*/
+ */
 int_f
-nh5ldelete_by_idx_c (hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
-		     int_f *index_field, int_f *order, hsize_t_f *n, hid_t_f *lapl_id)
+h5ldelete_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, int_f *index_field,
+                   int_f *order, hsize_t_f *n, hid_t_f *lapl_id)
 /******/
 {
-    char *c_group_name = NULL;          /* Buffer to hold C string */
-    H5_index_t c_index_field;
+    char           *c_group_name = NULL; /* Buffer to hold C string */
+    H5_index_t      c_index_field;
     H5_iter_order_t c_order;
-    int_f ret_value = 0;          /* Return value */
+    int_f           ret_value = 0; /* Return value */
 
-     /*
-      * Convert FORTRAN name to C name
-      */
-    if((c_group_name = HD5f2cstring(group_name, (size_t)*group_namelen)) == NULL)
-      HGOTO_DONE(FAIL);
+    /*
+     * Convert FORTRAN name to C name
+     */
+    if ((c_group_name = HD5f2cstring(group_name, (size_t)*group_namelen)) == NULL)
+        HGOTO_DONE(FAIL);
 
     c_index_field = (H5_index_t)*index_field;
-    c_order = (H5_iter_order_t)*order;
+    c_order       = (H5_iter_order_t)*order;
 
-     /*
-      * Call H5Ldelete_by_name function.
-      */
-    if(H5Ldelete_by_idx((hid_t)*loc_id, c_group_name, c_index_field, c_order, (hsize_t)*n, (hid_t)*lapl_id) < 0)
-      HGOTO_DONE(FAIL);
+    /*
+     * Call H5Ldelete_by_name function.
+     */
+    if (H5Ldelete_by_idx((hid_t)*loc_id, c_group_name, c_index_field, c_order, (hsize_t)*n, (hid_t)*lapl_id) <
+        0)
+        HGOTO_DONE(FAIL);
 
 done:
-    if(c_group_name)
+    if (c_group_name)
         HDfree(c_group_name);
     return ret_value;
 }
 
 /****if* H5Lf/h5lexists_c
  * NAME
- *        h5lexists_c
+ *  h5lexists_c
  * PURPOSE
- *     Calls H5Lexists
+ *  Calls H5Lexists
  * INPUTS
  *
- *      loc_id - Identifier of the file or group to query.
- *        name - Link name to check
- *     lapl_id - Link access property list identifier.
+ *  loc_id - Identifier of the file or group to query.
+ *  name - Link name to check
+ *  lapl_id - Link access property list identifier.
  * OUTPUTS
  *
- *     link_exists_c  - returns a positive value, for TRUE, or 0 (zero), for FALSE.
+ *  link_exists_c  - returns a positive value, for TRUE, or 0 (zero), for FALSE.
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              February 29, 2008
+ *  February 29, 2008
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5lexists_c (hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *lapl_id, int_f *link_exists)
+h5lexists_c(hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *lapl_id, int_f *link_exists)
 /******/
 {
-  char *c_name = NULL;          /* Buffer to hold C string */
-  int_f ret_value = 0;          /* Return value */
+    char *c_name    = NULL; /* Buffer to hold C string */
+    int_f ret_value = 0;    /* Return value */
 
-  /*
-   * Convert FORTRAN name to C name
-   */
-  if((c_name = HD5f2cstring(name, (size_t)*namelen)) == NULL)
-    HGOTO_DONE(FAIL);
+    /*
+     * Convert FORTRAN name to C name
+     */
+    if ((c_name = HD5f2cstring(name, (size_t)*namelen)) == NULL)
+        HGOTO_DONE(FAIL);
 
-  /*
-   * Call H5Lexists function.
-   */
-  if((*link_exists = (int_f)H5Lexists((hid_t)*loc_id, c_name, (hid_t)*lapl_id)) < 0)
-         HGOTO_DONE(FAIL);
+    /*
+     * Call H5Lexists function.
+     */
+    if ((*link_exists = (int_f)H5Lexists((hid_t)*loc_id, c_name, (hid_t)*lapl_id)) < 0)
+        HGOTO_DONE(FAIL);
 
 done:
-    if(c_name)
+    if (c_name)
         HDfree(c_name);
     return ret_value;
 }
 
 /****if* H5Lf/h5lget_info_c
  * NAME
- *        h5lget_info_c
+ *  h5lget_info_c
  * PURPOSE
- *     Call  H5Lget_info
+ *  Call  H5Lget_info
  * INPUTS
  *
  *		link_loc_id - File or group identifier.
- *                link_name - Name of the link for which information is being sought
- *             link_namelen - Name length
- *                  lapl_id - Link access property list
+ *  link_name - Name of the link for which information is being sought
+ *  link_namelen - Name length
+ *  lapl_id - Link access property list
  * OUTPUTS
  *
  *
- *              cset - indicates the character set used for link’s name.
- *            corder - specifies the link’s creation order position.
- *      corder_valid - indicates whether the value in corder is valid.
- *         link_type -  specifies the link class:
+ *  cset - indicates the character set used for link’s name.
+ *  corder - specifies the link’s creation order position.
+ *  corder_valid - indicates whether the value in corder is valid.
+ *  link_type -  specifies the link class:
  *     	                H5L_LINK_HARD_F      - Hard link
  *     	                H5L_LINK_SOFT_F      - Soft link
  *     	                H5L_LINK_EXTERNAL_F  - External link
  *     	                H5L_LINK_ERROR_F     - Error
- *           address - If the link is a hard link, address specifies the file address that the link points to
- *          val_size - If the link is a symbolic link, val_size will be the length of the link value
+ *  token - If the link is a hard link, token specifies the token for the object that the link points to
+ *  val_size - If the link is a symbolic link, val_size will be the length of the link value
  *
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              January, 2008
+ *  January, 2008
  * HISTORY
  * N/A
  * SOURCE
-*/
+ */
 int_f
-nh5lget_info_c(hid_t_f *link_loc_id, _fcd link_name, size_t_f *link_namelen,
-		int_f *cset, int_f *corder, int_f *corder_valid, int_f *link_type,
-		haddr_t_f *address, size_t_f *val_size,
-		hid_t_f *lapl_id)
+h5lget_info_c(hid_t_f *link_loc_id, _fcd link_name, size_t_f *link_namelen, int_f *cset, int_f *corder,
+              int_f *corder_valid, int_f *link_type, H5O_token_t *token, size_t_f *val_size, hid_t_f *lapl_id)
 /******/
 {
-    char *c_link_name = NULL;          /* Buffer to hold C string */
-    int_f ret_value = 0;          /* Return value */
-    H5L_info_t link_buff;
+    char       *c_link_name = NULL; /* Buffer to hold C string */
+    int_f       ret_value   = 0;    /* Return value */
+    H5L_info2_t link_buff;
 
     /*
      * Convert FORTRAN name to C name
      */
-    if(NULL == (c_link_name = HD5f2cstring(link_name, (size_t)*link_namelen)))
+    if (NULL == (c_link_name = HD5f2cstring(link_name, (size_t)*link_namelen)))
         HGOTO_DONE(FAIL);
 
     /*
      * Call H5Linfo function.
      */
-    if(H5Lget_info((hid_t)*link_loc_id, c_link_name, &link_buff, (hid_t)*lapl_id) < 0)
+    if (H5Lget_info2((hid_t)*link_loc_id, c_link_name, &link_buff, (hid_t)*lapl_id) < 0)
         HGOTO_DONE(FAIL);
 
     /* Unpack the structure */
-    *cset = (int_f)link_buff.cset;
-    *corder = (int_f)link_buff.corder;
+    *cset         = (int_f)link_buff.cset;
+    *corder       = (int_f)link_buff.corder;
     *corder_valid = 0;
-    if(link_buff.corder_valid > 0) *corder_valid = 1;
+    if (link_buff.corder_valid > 0)
+        *corder_valid = 1;
     *link_type = (int_f)link_buff.type;
-    *address = (haddr_t_f)link_buff.u.address;
-    *val_size = (size_t_f)link_buff.u.val_size;
+    *token     = link_buff.u.token;
+    *val_size  = (size_t_f)link_buff.u.val_size;
 
 done:
-    if(c_link_name)
+    if (c_link_name)
         HDfree(c_link_name);
 
     return ret_value;
@@ -496,71 +489,72 @@ done:
 
 /****if* H5Lf/h5lget_info_by_idx_c
  * NAME
- *        h5lget_info_by_idx_c
+ *  h5lget_info_by_idx_c
  * PURPOSE
- *     Call  H5Lget_info_by_idx
+ *  Call  H5Lget_info_by_idx
  * INPUTS
  *
  *	loc_id  - File or group identifier specifying location of subject group
- *   group_name - Name of subject group
- *group_namelen - Name length
+ *  group_name - Name of subject group
+ *  group_namelen - Name length
  *  index_field - Index or field which determines the order
- *        order - Order within field or index
- *            n - Link for which to retrieve information
- *      lapl_id - Link access property list
+ *  order - Order within field or index
+ *  n - Link for which to retrieve information
+ *  lapl_id - Link access property list
  * OUTPUTS
  *
- *        corder_valid - Indicates whether the the creation order data is valid for this attribute
- *              corder - Is a positive integer containing the creation order of the attribute
- *                cset - Indicates the character set used for the attribute’s name
- *           data_size - indicates the size, in the number of characters, of the attribute
+ *  corder_valid - Indicates whether the the creation order data is valid for this attribute
+ *  corder - Is a positive integer containing the creation order of the attribute
+ *  cset - Indicates the character set used for the attribute’s name
+ *  data_size - indicates the size, in the number of characters, of the attribute
  *
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              January, 2008
+ *  January, 2008
  * HISTORY
  * N/A
  * SOURCE
-*/
+ */
 int_f
-nh5lget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
-		      int_f *index_field, int_f *order, hsize_t_f *n,
-		      int_f *link_type, int_f *corder_valid, int_f *corder, int_f *cset,  haddr_t_f *address, size_t_f *val_size, hid_t_f *lapl_id)
+h5lget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, int_f *index_field,
+                     int_f *order, hsize_t_f *n, int_f *link_type, int_f *corder_valid, int_f *corder,
+                     int_f *cset, H5O_token_t *token, size_t_f *val_size, hid_t_f *lapl_id)
 /******/
 {
-    char *c_group_name = NULL;          /* Buffer to hold C string */
-    H5_index_t c_index_field;
+    char           *c_group_name = NULL; /* Buffer to hold C string */
+    H5_index_t      c_index_field;
     H5_iter_order_t c_order;
-    int_f ret_value = 0;          /* Return value */
-    H5L_info_t link_buff;
+    int_f           ret_value = 0; /* Return value */
+    H5L_info2_t     link_buff;
 
     /*
      * Convert FORTRAN name to C name
      */
-    if((c_group_name = HD5f2cstring(group_name, (size_t)*group_namelen)) == NULL)
-      HGOTO_DONE(FAIL);
+    if ((c_group_name = HD5f2cstring(group_name, (size_t)*group_namelen)) == NULL)
+        HGOTO_DONE(FAIL);
 
     c_index_field = (H5_index_t)*index_field;
-    c_order = (H5_iter_order_t)*order;
-     /*
-      * Call H5Linfo_by_idx function.
-      */
-    if(H5Lget_info_by_idx((hid_t)*loc_id, c_group_name, c_index_field, c_order, (hsize_t)*n,
-			  &link_buff, (hid_t)*lapl_id) < 0)
-      HGOTO_DONE(FAIL);
+    c_order       = (H5_iter_order_t)*order;
+    /*
+     * Call H5Linfo_by_idx function.
+     */
+    if (H5Lget_info_by_idx2((hid_t)*loc_id, c_group_name, c_index_field, c_order, (hsize_t)*n, &link_buff,
+                            (hid_t)*lapl_id) < 0)
+        HGOTO_DONE(FAIL);
 
     /* Unpack the structure */
 
     *corder_valid = 0;
-    if(link_buff.corder_valid > 0) *corder_valid = 1;
+    if (link_buff.corder_valid > 0)
+        *corder_valid = 1;
 
-    *corder = (int_f)link_buff.corder;
-    *cset = (int_f)link_buff.cset;
+    *corder    = (int_f)link_buff.corder;
+    *cset      = (int_f)link_buff.cset;
     *link_type = (int_f)link_buff.type;
-    *address = (haddr_t_f)link_buff.u.address;
-    *val_size = (size_t_f)link_buff.u.val_size;
+    *token     = link_buff.u.token;
+    *val_size  = (size_t_f)link_buff.u.val_size;
 
 done:
     return ret_value;
@@ -570,7 +564,7 @@ done:
  * NAME
  *        H5Lis_registered_c
  * PURPOSE
- *     Call H5Lis_registered
+ *  Call H5Lis_registered
  * INPUTS
  *
  *  link_cls_id - User-defined link class identifier
@@ -578,20 +572,20 @@ done:
  *     NONE
  *
  * RETURNS
- *     Returns a positive value if the link class has been registered
- *              and zero if it is unregistered. Otherwise returns a negative value
+ *  Returns a positive value if the link class has been registered
+ *  and zero if it is unregistered. Otherwise returns a negative value
  * AUTHOR
  *  M. Scot Breitenfeld
- *              March 3, 2008
+ *  March 3, 2008
  * HISTORY
  * N/A
  * SOURCE
-*/
+ */
 int_f
-nh5lis_registered_c(int_f *link_cls_id)
+h5lis_registered_c(int_f *link_cls_id)
 /******/
 {
-    int_f ret_value;      /* Return value */
+    int_f ret_value; /* Return value */
 
     /*
      * Call H5Lis_registered
@@ -606,7 +600,6 @@ nh5lis_registered_c(int_f *link_cls_id)
 /*   H5L_type_t c_link_cls_id; /\* User-defined link class identifier *\/ */
 /*   htri_t registered; /\* registration status *\/ */
 
-
 /*   c_link_cls_id = (H5L_type_t)*link_cls_id; */
 /*   /\* */
 /*    * Call H5Lis_registered */
@@ -618,58 +611,57 @@ nh5lis_registered_c(int_f *link_cls_id)
 /*   return ret_value; */
 /* } */
 
-
 /****if* H5Lf/h5lmove_c
  * NAME
- *        h5lmove_c
+ *  h5lmove_c
  * PURPOSE
- *     Call  H5Lmove
+ *  Call  H5Lmove
  * INPUTS
  *
- *    src_loc_id   - Original file or group identifier.
- *    src_name     - Original link name.
- *    src_namelen  - name length
- *    dest_loc_id  - Destination file or group identifier.
- *    dest_name    - NEW link name.
- *    dest_namelen - name length
+ *  src_loc_id   - Original file or group identifier.
+ *  src_name     - Original link name.
+ *  src_namelen  - name length
+ *  dest_loc_id  - Destination file or group identifier.
+ *  dest_name    - NEW link name.
+ *  dest_namelen - name length
  * OUTPUTS
  *
  *
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              March 3, 2008
+ *  March 3, 2008
  * SOURCE
-*/
+ */
 int_f
-nh5lmove_c(hid_t_f *src_loc_id, _fcd src_name, size_t_f *src_namelen, hid_t_f *dest_loc_id,
-	   _fcd dest_name, size_t_f *dest_namelen, hid_t_f *lcpl_id, hid_t_f *lapl_id)
+h5lmove_c(hid_t_f *src_loc_id, _fcd src_name, size_t_f *src_namelen, hid_t_f *dest_loc_id, _fcd dest_name,
+          size_t_f *dest_namelen, hid_t_f *lcpl_id, hid_t_f *lapl_id)
 /******/
 {
-    char *c_src_name = NULL;  /* Buffer to hold C string */
+    char *c_src_name  = NULL; /* Buffer to hold C string */
     char *c_dest_name = NULL; /* Buffer to hold C string */
-    int_f ret_value = 0;          /* Return value */
+    int_f ret_value   = 0;    /* Return value */
 
     /*
      * Convert FORTRAN name to C name
      */
-    if(NULL == (c_src_name = HD5f2cstring(src_name, (size_t)*src_namelen)))
+    if (NULL == (c_src_name = HD5f2cstring(src_name, (size_t)*src_namelen)))
         HGOTO_DONE(FAIL)
-    if(NULL == (c_dest_name = HD5f2cstring(dest_name, (size_t)*dest_namelen)))
+    if (NULL == (c_dest_name = HD5f2cstring(dest_name, (size_t)*dest_namelen)))
         HGOTO_DONE(FAIL)
 
-     /*
-      * Call H5Lmove function.
-      */
-    if(H5Lmove((hid_t)*src_loc_id, c_src_name, (hid_t)*dest_loc_id,
-	       c_dest_name, (hid_t)*lcpl_id, (hid_t)*lapl_id) < 0)
+    /*
+     * Call H5Lmove function.
+     */
+    if (H5Lmove((hid_t)*src_loc_id, c_src_name, (hid_t)*dest_loc_id, c_dest_name, (hid_t)*lcpl_id,
+                (hid_t)*lapl_id) < 0)
         HGOTO_DONE(FAIL)
 
 done:
-    if(c_src_name)
+    if (c_src_name)
         HDfree(c_src_name);
-    if(c_dest_name)
+    if (c_dest_name)
         HDfree(c_dest_name);
 
     return ret_value;
@@ -682,40 +674,39 @@ done:
  *  Call  H5Lget_name_by_idx
  * INPUTS
  *
- *   loc_id      - File or group identifier specifying location of subject group
- *   group_name  - Name of subject group
- *   index_field - Index or field which determines the order
- *   order       - Order within field or index
- *   n           - Link for which to retrieve information
- *   size        - Maximum number of characters of link value to be returned.
- *   lapl_id     - Link access property list
+ *  loc_id      - File or group identifier specifying location of subject group
+ *  group_name  - Name of subject group
+ *  index_field - Index or field which determines the order
+ *  order       - Order within field or index
+ *  n           - Link for which to retrieve information
+ *  size        - Maximum number of characters of link value to be returned.
+ *  lapl_id     - Link access property list
  * OUTPUTS
  *
- *   name        - Buffer in which link value is returned
- *   size        - The size of the link name on success
+ *  name        - Buffer in which link value is returned
+ *  size        - The size of the link name on success
  * RETURNS
  *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
  *  March 10, 2008
  * SOURCE
-*/
+ */
 int_f
-nh5lget_name_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
-		      int_f *index_field, int_f *order, hsize_t_f *n,
-		      size_t_f *size, _fcd name, hid_t_f *lapl_id)
+h5lget_name_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, int_f *index_field,
+                     int_f *order, hsize_t_f *n, size_t_f *size, _fcd name, hid_t_f *lapl_id)
 /******/
 {
-    char *c_group_name = NULL;    /* Buffer to hold C string */
-    char *c_name = NULL;          /* Buffer to hold C string */
-    size_t c_size;
+    char   *c_group_name = NULL; /* Buffer to hold C string */
+    char   *c_name       = NULL; /* Buffer to hold C string */
+    size_t  c_size;
     ssize_t c_size_link;
-    int_f ret_value = 0;          /* Return value */
+    int_f   ret_value = 0; /* Return value */
 
     /*
      * Convert FORTRAN name to C name
      */
-    if(NULL == (c_group_name = HD5f2cstring(group_name, (size_t)*group_namelen)))
+    if (NULL == (c_group_name = HD5f2cstring(group_name, (size_t)*group_namelen)))
         HGOTO_DONE(FAIL)
 
     c_size = (size_t)*size + 1;
@@ -723,11 +714,12 @@ nh5lget_name_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
     /*
      * Allocate buffer to hold name of an attribute
      */
-    if(NULL == (c_name = (char *)HDmalloc(c_size)))
+    if (NULL == (c_name = (char *)HDmalloc(c_size)))
         HGOTO_DONE(FAIL)
 
-    if((c_size_link = H5Lget_name_by_idx((hid_t)*loc_id, c_group_name, (H5_index_t)*index_field,
-            (H5_iter_order_t)*order, (hsize_t)*n,c_name, c_size, (hid_t)*lapl_id)) < 0)
+    if ((c_size_link =
+             H5Lget_name_by_idx((hid_t)*loc_id, c_group_name, (H5_index_t)*index_field,
+                                (H5_iter_order_t)*order, (hsize_t)*n, c_name, c_size, (hid_t)*lapl_id)) < 0)
         HGOTO_DONE(FAIL)
 
     *size = (size_t_f)c_size_link;
@@ -735,19 +727,18 @@ nh5lget_name_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
     /*
      * Convert C name to FORTRAN and place it in the given buffer
      */
-    if(c_name)
+    if (c_name)
         HD5packFstring(c_name, _fcdtocp(name), c_size - 1);
 
 done:
-    if(c_group_name)
+    if (c_group_name)
         HDfree(c_group_name);
-    if(c_name)
+    if (c_name)
         HDfree(c_name);
 
     return ret_value;
 }
 
-
 /* /\****if* H5Lf/h5lget_val_c */
 /*  * NAME */
 /*  *        h5lget_val_c */
@@ -774,7 +765,7 @@ done:
 /*  * SOURCE */
 /* *\/ */
 /* int_f */
-/* nh5lget_val_c (hid_t_f *link_loc_id, _fcd link_name, size_t_f *link_namelen, */
+/* h5lget_val_c (hid_t_f *link_loc_id, _fcd link_name, size_t_f *link_namelen, */
 /* 	       size_t_f *size, _fcd linkval_buff, */
 /* 	       hid_t_f *lapl_id) */
 /* { */
@@ -797,12 +788,10 @@ done:
 /*    *\/ */
 /*     HD5packFstring(c_buf, _fcdtocp(buf), c_bufsize-1); */
 
-
 /* done: */
 /*     return ret_value; */
 /* } */
 
-
 /* /\****if* H5Lf/ */
 /*  * NAME */
 /*  *        H5Lregistered_c */
@@ -842,7 +831,7 @@ done:
 
 /* int_f */
 
-/* nh5lregistered_c(int_f *version, int_f *class_id, */
+/* h5lregistered_c(int_f *version, int_f *class_id, */
 /* 		 _fcd comment, size_t_f *comment_len, */
 /* 		 _fcd create_func, size_t_f *create_func_len, */
 /* 		 _fcd move_func, size_t_f *move_func_len, */
@@ -916,49 +905,49 @@ done:
 
 /****if* H5Lf/h5lget_val_c
  * NAME
- *        h5lget_val_c
+ *  h5lget_val_c
  * PURPOSE
- *     Call H5Lget_val
+ *  Call H5Lget_val
  * INPUTS
  *
- *               link_loc_id - File or group identifier.
- *                 link_name - Link whose value is to be returned.
- *             link_name_len - length of link_name
- *                      size - Maximum number of characters of link value to be returned.
- *                  lapl_id  - List access property list identifier
+ *  link_loc_id - File or group identifier.
+ *  link_name - Link whose value is to be returned.
+ *  link_name_len - length of link_name
+ *  size - Maximum number of characters of link value to be returned.
+ *  lapl_id  - List access property list identifier
  * OUTPUTS
  *
- *             linkval_buff  - The buffer to hold the returned link value.
+ *  linkval_buff  - The buffer to hold the returned link value.
  *
  * RETURNS
- *      0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              April 11, 2008
+ *  April 11, 2008
  * SOURCE
-*/
+ */
 int_f
-nh5lget_val_c(hid_t_f *link_loc_id, _fcd link_name, size_t_f *link_namelen, size_t_f *size,
-	      void *linkval_buff, hid_t_f *lapl_id)
+h5lget_val_c(hid_t_f *link_loc_id, _fcd link_name, size_t_f *link_namelen, size_t_f *size, void *linkval_buff,
+             hid_t_f *lapl_id)
 /******/
-{    
+{
     char *c_link_name = NULL; /* Buffer to hold C string */
-    int_f ret_value = 0;       /* Return value */
+    int_f ret_value   = 0;    /* Return value */
 
     /*
      * Convert FORTRAN name to C name
      */
-    if(NULL == (c_link_name = HD5f2cstring(link_name, (size_t)*link_namelen)))
+    if (NULL == (c_link_name = HD5f2cstring(link_name, (size_t)*link_namelen)))
         HGOTO_DONE(FAIL)
 
     /*
      * Call H5Lget_val
      */
-    if(H5Lget_val((hid_t)*link_loc_id, c_link_name, &linkval_buff, (size_t)*size, (hid_t)*lapl_id )< 0)
+    if (H5Lget_val((hid_t)*link_loc_id, c_link_name, &linkval_buff, (size_t)*size, (hid_t)*lapl_id) < 0)
         HGOTO_DONE(FAIL)
 
 done:
-   if(c_link_name)
+    if (c_link_name)
         HDfree(c_link_name);
 
     return ret_value;
@@ -971,16 +960,16 @@ done:
  *  Calls H5Literate
  * INPUTS
  *
- *     group_id - Identifier specifying subject group
- *   index_type - Type of index which determines the order
- *        order - Order within index
- *          idx - Iteration position at which to start
- *           op - Callback function passing data regarding the link to the calling application
- *      op_data - User-defined pointer to data required by the application for its processing of the link
+ *  group_id - Identifier specifying subject group
+ *  index_type - Type of index which determines the order
+ *  order - Order within index
+ *  idx - Iteration position at which to start
+ *  op - Callback function passing data regarding the link to the calling application
+ *  op_data - User-defined pointer to data required by the application for its processing of the link
  *
  * OUTPUTS
  *
- *          idx - Position at which an interrupted iteration may be restarted
+ *  idx - Position at which an interrupted iteration may be restarted
  *
  * RETURNS
  *  >0 on success, 0< on failure
@@ -988,27 +977,29 @@ done:
  *  M. Scot Breitenfeld
  *  July 8, 2008
  * SOURCE
-*/
+ */
 int_f
-h5literate_c(hid_t_f *group_id, int_f *index_type, int_f *order, hsize_t_f *idx, H5L_iterate_t op, void *op_data )
+h5literate_c(hid_t_f *group_id, int_f *index_type, int_f *order, hsize_t_f *idx, H5L_iterate2_t op,
+             void *op_data)
 /******/
 {
-  int_f ret_value = -1;  /* Return value */
-  herr_t func_ret_value; /* H5Linterate return value */
-  hsize_t idx_c = 0;
+    int_f   ret_value = -1; /* Return value */
+    herr_t  func_ret_value; /* H5Linterate return value */
+    hsize_t idx_c = 0;
 
-  idx_c = (hsize_t)*idx;
+    idx_c = (hsize_t)*idx;
 
-  /*
-   * Call H5Linterate
-   */
+    /*
+     * Call H5Linterate
+     */
 
-  func_ret_value = H5Literate( (hid_t)*group_id, (H5_index_t)*index_type, (H5_iter_order_t)*order, &idx_c, op, op_data);
+    func_ret_value =
+        H5Literate2((hid_t)*group_id, (H5_index_t)*index_type, (H5_iter_order_t)*order, &idx_c, op, op_data);
 
-  ret_value = (int_f)func_ret_value;
-  *idx = (hsize_t_f)idx_c;
+    ret_value = (int_f)func_ret_value;
+    *idx      = (hsize_t_f)idx_c;
 
-  return ret_value;
+    return ret_value;
 }
 
 /****if* H5Lf/h5literate_by_name_c
@@ -1018,19 +1009,19 @@ h5literate_c(hid_t_f *group_id, int_f *index_type, int_f *order, hsize_t_f *idx,
  *  Call H5Literate_by_name
  * INPUTS
  *
- *      loc_id - Identifier specifying subject group
- *         name - Name of subject group
- *      namelen - Name length
- *   index_type - Type of index which determines the order
- *        order - Order within index
- *          idx - Iteration position at which to start
- *           op - Callback function passing data regarding the link to the calling application
- *      op_data - User-defined pointer to data required by the application for its processing of the link
- *      lapl_id - List access property list identifier
+ *  loc_id - Identifier specifying subject group
+ *  name - Name of subject group
+ *  namelen - Name length
+ *  index_type - Type of index which determines the order
+ *  order - Order within index
+ *  idx - Iteration position at which to start
+ *  op - Callback function passing data regarding the link to the calling application
+ *  op_data - User-defined pointer to data required by the application for its processing of the link
+ *  lapl_id - List access property list identifier
  *
  * OUTPUTS
  *
- *          idx - Position at which an interrupted iteration may be restarted
+ *  idx - Position at which an interrupted iteration may be restarted
  *
  * RETURNS
  *  >0 on success, 0< on failure
@@ -1038,38 +1029,37 @@ h5literate_c(hid_t_f *group_id, int_f *index_type, int_f *order, hsize_t_f *idx,
  *  M. Scot Breitenfeld
  *  August 18, 2008
  * SOURCE
-*/
+ */
 int_f
-h5literate_by_name_c(hid_t_f *loc_id, _fcd name, size_t_f *namelen, int_f *index_type, int_f *order, hsize_t_f *idx, H5L_iterate_t op, void *op_data, hid_t_f *lapl_id)
+h5literate_by_name_c(hid_t_f *loc_id, _fcd name, size_t_f *namelen, int_f *index_type, int_f *order,
+                     hsize_t_f *idx, H5L_iterate2_t op, void *op_data, hid_t_f *lapl_id)
 /******/
 {
-  int_f ret_value = -1;       /* Return value */
-  herr_t func_ret_value; /* H5Linterate return value */
-  hsize_t idx_c = 0;
-  char *c_name = NULL;        /* Buffer to hold C string */
+    int_f   ret_value = -1; /* Return value */
+    herr_t  func_ret_value; /* H5Linterate return value */
+    hsize_t idx_c  = 0;
+    char   *c_name = NULL; /* Buffer to hold C string */
 
-  /*
-   * Convert FORTRAN name to C name
-   */
-  if((c_name = HD5f2cstring(name, (size_t)*namelen)) == NULL)
-    return ret_value=-1;
+    /*
+     * Convert FORTRAN name to C name
+     */
+    if ((c_name = HD5f2cstring(name, (size_t)*namelen)) == NULL)
+        return ret_value = -1;
 
-  idx_c = (hsize_t)*idx;
+    idx_c = (hsize_t)*idx;
 
-  /*
-   * Call H5Linterate
-   */
+    /*
+     * Call H5Linterate
+     */
 
-  func_ret_value = H5Literate_by_name((hid_t)*loc_id, c_name,(H5_index_t)*index_type,(H5_iter_order_t)*order,&idx_c,op,op_data,(hid_t)*lapl_id);
+    func_ret_value = H5Literate_by_name2((hid_t)*loc_id, c_name, (H5_index_t)*index_type,
+                                         (H5_iter_order_t)*order, &idx_c, op, op_data, (hid_t)*lapl_id);
 
-  ret_value = (int_f)func_ret_value;
-  *idx = (hsize_t_f)idx_c;
+    ret_value = (int_f)func_ret_value;
+    *idx      = (hsize_t_f)idx_c;
 
-  if(c_name) HDfree(c_name);
+    if (c_name)
+        HDfree(c_name);
 
-  return ret_value;
+    return ret_value;
 }
-
-
-
-
diff --git a/fortran/src/H5Lff.F90 b/fortran/src/H5Lff.F90
new file mode 100644
index 0000000..8171c1b
--- /dev/null
+++ b/fortran/src/H5Lff.F90
@@ -0,0 +1,1077 @@
+!> @defgroup FH5L Fortran Link (H5L) Interface
+!!
+!! @see H5L, C-API
+!!
+!! @see @ref H5L_UG, User Guide
+!!
+
+!> @ingroup FH5L
+!!
+!! @brief This module contains Fortran interfaces for H5L functions.
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+! NOTES
+!       _____ __  __ _____   ____  _____ _______       _   _ _______
+!      |_   _|  \/  |  __ \ / __ \|  __ \__   __|/\   | \ | |__   __|
+! ****   | | | \  / | |__) | |  | | |__) | | |  /  \  |  \| |  | |    ****
+! ****   | | | |\/| |  ___/| |  | |  _  /  | | / /\ \ | . ` |  | |    ****
+! ****  _| |_| |  | | |    | |__| | | \ \  | |/ ____ \| |\  |  | |    ****
+!      |_____|_|  |_|_|     \____/|_|  \_\ |_/_/    \_\_| \_|  |_|
+!
+!  If you add a new H5L function you must add the function name to the
+!  Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
+!  This is needed for Windows based operating systems.
+!
+
+MODULE H5L
+
+  USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR, C_FUNPTR, C_CHAR, C_INT64_T, C_INT
+  USE H5GLOBAL
+
+  IMPLICIT NONE
+
+  TYPE, bind(c) :: union_t
+     TYPE(H5O_TOKEN_T_F) :: token !< Type for object tokens
+     INTEGER(size_t)  :: val_size !< Size of a soft link or user-defined link value
+  END TYPE union_t
+
+!
+! @brief Fortran2003 Derived Type for h5l_info_t
+!
+  TYPE, bind(c) :: h5l_info_t
+     INTEGER(c_int) :: type !< Specifies the link class. Valid values include the following:
+                            !< \li H5L_TYPE_HARD_F     Hard link
+                            !< \li H5L_TYPE_SOFT_F     Soft link
+                            !< \li H5L_TYPE_EXTERNAL_F External link
+                            !< \li H5L_TYPE_ERROR_F    Invalid link type id
+ !   LOGICAL(c_bool) :: corder_valid ! hbool_t corder_valid
+     INTEGER(c_int64_t) :: corder !< Creation order
+     INTEGER(c_int)     :: cset   !< Character set of link name is encoded. Valid values include the following:
+                                  !< \li H5T_CSET_ASCII  US ASCII
+                                  !< \li H5T_CSET_UTF8   UTF-8 Unicode encoding
+     TYPE(union_t) :: u
+  END TYPE h5l_info_t
+
+CONTAINS
+
+!>
+!! \ingroup FH5L
+!!
+!! \brief Copies a link from one location to another.
+!!
+!! \param src_loc_id  Location identifier. The identifier may be that of a file, group, dataset, or named datatype.
+!! \param src_name    Name of the link to be copied.
+!! \param dest_loc_id Location identifier. The identifier may be that of a file, group, dataset, or named datatype.
+!! \param dest_name   Name to be assigned to the new copy.
+!! \param hdferr      \fortran_error
+!! \param lcpl_id     Link creation property list identifier.
+!! \param lapl_id     Link access property list identifier.
+!!
+!! See C API: @ref H5Lcopy()
+!!
+  SUBROUTINE h5lcopy_f(src_loc_id, src_name, dest_loc_id, dest_name, hdferr, &
+       lcpl_id, lapl_id)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: src_loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: src_name
+    INTEGER(HID_T), INTENT(IN) :: dest_loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: dest_name
+
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lcpl_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id
+    INTEGER(HID_T) :: lcpl_id_default
+    INTEGER(HID_T) :: lapl_id_default
+
+    INTEGER(SIZE_T) :: src_namelen
+    INTEGER(SIZE_T) :: dest_namelen
+
+    INTERFACE
+       INTEGER FUNCTION h5lcopy_c(src_loc_id, src_name, src_namelen, dest_loc_id, dest_name, dest_namelen, &
+            lcpl_id_default, lapl_id_default) BIND(C,name='h5lcopy_c')
+         IMPORT ::  c_char
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: src_loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: src_name
+         INTEGER(HID_T), INTENT(IN) :: dest_loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: dest_name
+
+         INTEGER(HID_T) :: lcpl_id_default
+         INTEGER(HID_T) :: lapl_id_default
+
+         INTEGER(SIZE_T) :: src_namelen
+         INTEGER(SIZE_T) :: dest_namelen
+       END FUNCTION h5lcopy_c
+    END INTERFACE
+
+    src_namelen  = LEN(src_name)
+    dest_namelen = LEN(dest_name)
+
+    lcpl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lcpl_id)) lcpl_id_default = lcpl_id
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+
+    hdferr = h5lcopy_c(src_loc_id, src_name, src_namelen, dest_loc_id, dest_name, dest_namelen, &
+         lcpl_id_default, lapl_id_default)
+
+  END SUBROUTINE h5lcopy_f
+
+!>
+!! \ingroup FH5L
+!!
+!! \brief Removes a link from a group.
+!!
+!! \param loc_id  Identifier of the file or group containing the object.
+!! \param name    Name of the link to delete.
+!! \param hdferr  \fortran_error
+!! \param lapl_id Link access property list identifier.
+!!
+!! See C API: @ref H5Ldelete()
+!!
+  SUBROUTINE h5ldelete_f(loc_id, name, hdferr, lapl_id)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id
+    INTEGER(HID_T) :: lapl_id_default
+    INTEGER(SIZE_T) :: namelen
+
+    INTERFACE
+       INTEGER FUNCTION h5ldelete_c(loc_id, name, namelen, lapl_id_default) BIND(C,name='h5ldelete_c')
+         IMPORT :: c_char
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+         INTEGER(HID_T) :: lapl_id_default
+         INTEGER(SIZE_T) :: namelen
+       END FUNCTION h5ldelete_c
+    END INTERFACE
+
+    namelen = LEN(name)
+
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+
+    hdferr = h5ldelete_c(loc_id, name, namelen, lapl_id_default)
+
+  END SUBROUTINE h5ldelete_f
+
+!>
+!! \ingroup FH5L
+!!
+!! \brief Creates a soft link to an object.
+!!
+!! \param target_path Path to the target object, which is not required to exist.
+!! \param link_loc_id The file or group identifier for the new link.
+!! \param link_name   The name of the new link.
+!! \param hdferr      \fortran_error
+!! \param lcpl_id     Link creation property list identifier.
+!! \param lapl_id     Link access property list identifier.
+!!
+!! See C API: @ref H5Lcreate_soft()
+!!
+  SUBROUTINE h5lcreate_soft_f(target_path, link_loc_id, link_name, hdferr, lcpl_id, lapl_id)
+    IMPLICIT NONE
+    CHARACTER(LEN=*), INTENT(IN) :: target_path
+    INTEGER(HID_T), INTENT(IN) :: link_loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: link_name
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lcpl_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id
+    INTEGER(HID_T) :: lcpl_id_default
+    INTEGER(HID_T) :: lapl_id_default
+    INTEGER(SIZE_T) :: target_path_len
+    INTEGER(SIZE_T) :: link_name_len
+
+    INTERFACE
+       INTEGER FUNCTION h5lcreate_soft_c(target_path, target_path_len, &
+            link_loc_id, &
+            link_name,link_name_len, &
+            lcpl_id_default, lapl_id_default ) BIND(C,NAME='h5lcreate_soft_c')
+         IMPORT :: c_char
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: target_path
+         INTEGER(SIZE_T) :: target_path_len
+         INTEGER(HID_T), INTENT(IN) ::   link_loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: link_name
+         INTEGER(SIZE_T) :: link_name_len
+         INTEGER(HID_T) :: lcpl_id_default
+         INTEGER(HID_T) :: lapl_id_default
+       END FUNCTION h5lcreate_soft_c
+    END INTERFACE
+
+    target_path_len = LEN(target_path)
+    link_name_len = LEN(link_name)
+
+    lcpl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lcpl_id)) lcpl_id_default = lcpl_id
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+
+    hdferr = h5lcreate_soft_c(target_path, target_path_len,&
+         link_loc_id, &
+         link_name, link_name_len, &
+         lcpl_id_default, lapl_id_default )
+
+  END SUBROUTINE h5lcreate_soft_f
+
+!>
+!! \ingroup FH5L
+!!
+!! \brief Creates a hard link to an object.
+!!
+!! \param obj_loc_id  The file or group identifier for the target object.
+!! \param obj_name    Name of the target object, which must already exist.
+!! \param link_loc_id The file or group identifier for the new link.
+!! \param link_name   The name of the new link.
+!! \param hdferr      \fortran_error
+!! \param lcpl_id     Link creation property list identifier.
+!! \param lapl_id     Link access property list identifier.
+!!
+!! See C API: @ref H5Lcreate_hard()
+!!
+  SUBROUTINE h5lcreate_hard_f(obj_loc_id, obj_name, link_loc_id, link_name, hdferr, lcpl_id, lapl_id)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: obj_loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: obj_name
+    INTEGER(HID_T), INTENT(IN) :: link_loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: link_name
+
+    INTEGER, INTENT(OUT) :: hdferr
+
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) ::   lcpl_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) ::   lapl_id
+    INTEGER(HID_T) :: lcpl_id_default
+    INTEGER(HID_T) :: lapl_id_default
+
+    INTEGER(SIZE_T) :: obj_namelen
+    INTEGER(SIZE_T) :: link_namelen
+
+    INTERFACE
+       INTEGER FUNCTION h5lcreate_hard_c(obj_loc_id, obj_name, obj_namelen, &
+            link_loc_id, link_name, link_namelen, lcpl_id_default, lapl_id_default) BIND(C,NAME='h5lcreate_hard_c')
+         IMPORT :: c_char
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: obj_loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: obj_name
+         INTEGER(HID_T), INTENT(IN) :: link_loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: link_name
+         INTEGER(SIZE_T) :: obj_namelen
+         INTEGER(SIZE_T) :: link_namelen
+         INTEGER(HID_T) :: lcpl_id_default
+         INTEGER(HID_T) :: lapl_id_default
+       END FUNCTION h5lcreate_hard_c
+    END INTERFACE
+    obj_namelen = LEN(obj_name)
+    link_namelen = LEN(link_name)
+
+    lcpl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lcpl_id)) lcpl_id_default = lcpl_id
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+
+    hdferr = h5lcreate_hard_c(obj_loc_id, obj_name, obj_namelen, &
+            link_loc_id, link_name, link_namelen, lcpl_id_default, lapl_id_default)
+
+  END SUBROUTINE h5lcreate_hard_f
+
+!>
+!! \ingroup FH5L
+!!
+!! \brief Creates a soft link to an object in a different file.
+!!
+!! \param file_name   Name of the file containing the target object. Neither the file nor the target object is
+!!                    required to exist. May be the file the link is being created in.
+!! \param obj_name    Path within the target file to the target object.
+!! \param link_loc_id The file or group identifier for the new link.
+!! \param link_name   The name of the new link.
+!! \param hdferr      \fortran_error
+!! \param lcpl_id     Link creation property list identifier.
+!! \param lapl_id     Link access property list identifier.
+!!
+!! See C API: @ref H5Lcreate_external()
+!!
+  SUBROUTINE h5lcreate_external_f(file_name, obj_name, link_loc_id, link_name, hdferr, lcpl_id, lapl_id)
+    IMPLICIT NONE
+    CHARACTER(LEN=*), INTENT(IN) :: file_name
+    CHARACTER(LEN=*), INTENT(IN) :: obj_name
+    INTEGER(HID_T), INTENT(IN) :: link_loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: link_name
+
+    INTEGER, INTENT(OUT) :: hdferr
+
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lcpl_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id
+
+    INTEGER(HID_T) :: lcpl_id_default
+    INTEGER(HID_T) :: lapl_id_default
+
+    INTEGER(SIZE_T) :: file_namelen
+    INTEGER(SIZE_T) :: obj_namelen
+    INTEGER(SIZE_T) :: link_namelen
+
+    INTERFACE
+       INTEGER FUNCTION h5lcreate_external_c(file_name, file_namelen, obj_name, obj_namelen, &
+            link_loc_id, link_name, link_namelen, lcpl_id_default, lapl_id_default) BIND(C,NAME='h5lcreate_external_c')
+         IMPORT :: c_char
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: file_name
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: obj_name
+         INTEGER(HID_T), INTENT(IN) :: link_loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: link_name
+         INTEGER(SIZE_T) :: file_namelen
+         INTEGER(SIZE_T) :: obj_namelen
+         INTEGER(SIZE_T) :: link_namelen
+         INTEGER(HID_T) :: lcpl_id_default
+         INTEGER(HID_T) :: lapl_id_default
+       END FUNCTION h5lcreate_external_c
+    END INTERFACE
+    file_namelen = LEN(file_name)
+    obj_namelen = LEN(obj_name)
+    link_namelen = LEN(link_name)
+
+    lcpl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lcpl_id)) lcpl_id_default = lcpl_id
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+
+    hdferr = h5lcreate_external_c(file_name, file_namelen, obj_name, obj_namelen, &
+            link_loc_id, link_name, link_namelen, lcpl_id_default, lapl_id_default)
+
+  END SUBROUTINE h5lcreate_external_f
+
+!>
+!! \ingroup FH5L
+!!
+!! \brief Removes the nth link in a group.
+!!
+!! \param loc_id      File or group identifier specifying location of subject group.
+!! \param group_name  Name of subject group.
+!! \param index_field Type of index; Possible values are:
+!!                    \li H5_INDEX_UNKNOWN_F = -1 - Unknown index type
+!!                    \li H5_INDEX_NAME_F         - Index on names
+!!                    \li H5_INDEX_CRT_ORDER_F    - Index on creation order
+!!                    \li H5_INDEX_N_F            - Number of indices defined
+!! \param order       Order within field or index; Possible values are:
+!!                    \li H5_ITER_UNKNOWN_F - Unknown order
+!!                    \li H5_ITER_INC_F     - Increasing order
+!!                    \li H5_ITER_DEC_F     - Decreasing order
+!!                    \li H5_ITER_NATIVE_F  - No particular order, whatever is fastest
+!!                    \li H5_ITER_N_F       - Number of iteration orders
+!! \param n           Link for which to retrieve information.
+!! \param hdferr      \fortran_error
+!! \param lapl_id     Link access property list.
+!!
+!! See C API: @ref H5Ldelete_by_idx()
+!!
+  SUBROUTINE h5ldelete_by_idx_f(loc_id, group_name, index_field, order, n, hdferr, lapl_id)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: group_name
+    INTEGER, INTENT(IN) :: index_field
+    INTEGER, INTENT(IN) :: order
+    INTEGER(HSIZE_T), INTENT(IN) :: n
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id
+    INTEGER(HID_T) :: lapl_id_default
+    INTEGER(SIZE_T) :: group_namelen
+
+    INTERFACE
+       INTEGER FUNCTION h5ldelete_by_idx_c(loc_id, group_name, group_namelen, index_field, order, n, lapl_id_default) &
+            BIND(C,NAME='h5ldelete_by_idx_c')
+         IMPORT :: c_char
+         IMPORT :: HID_T, SIZE_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: group_name
+         INTEGER, INTENT(IN) :: index_field
+         INTEGER, INTENT(IN) :: order
+         INTEGER(HSIZE_T), INTENT(IN) :: n
+         INTEGER(HID_T) :: lapl_id_default
+         INTEGER(SIZE_T) :: group_namelen
+       END FUNCTION h5ldelete_by_idx_c
+    END INTERFACE
+
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+
+    group_namelen = LEN(group_name)
+    hdferr = h5ldelete_by_idx_c(loc_id, group_name, group_namelen, index_field, order, n, lapl_id_default)
+
+  END SUBROUTINE h5ldelete_by_idx_f
+
+!>
+!! \ingroup FH5L
+!!
+!! \brief Check if a link with a particular name exists in a group.
+!!
+!! \param loc_id      Identifier of the file or group to query.
+!! \param name        Link name to check.
+!! \param link_exists Link exists status (.TRUE.,.FALSE.).
+!! \param hdferr      \fortran_error
+!! \param lapl_id     Link access property list identifier.
+!!
+!! See C API: @ref H5Lexists()
+!!
+  SUBROUTINE h5lexists_f(loc_id, name, link_exists, hdferr, lapl_id)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    LOGICAL, INTENT(OUT) :: link_exists
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id
+    INTEGER :: link_exists_c
+    INTEGER(HID_T)  :: lapl_id_default
+    INTEGER(SIZE_T) :: namelen
+
+    INTERFACE
+       INTEGER FUNCTION h5lexists_c(loc_id, name, namelen, lapl_id_default, link_exists_c) &
+            BIND(C,NAME='h5lexists_c')
+         IMPORT :: c_char
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+         INTEGER(SIZE_T), INTENT(IN) :: namelen
+         INTEGER, INTENT(OUT) :: link_exists_c
+         INTEGER(HID_T) :: lapl_id_default
+
+       END FUNCTION h5lexists_c
+    END INTERFACE
+
+    namelen = LEN(name)
+
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+
+    hdferr = h5lexists_c(loc_id, name, namelen, lapl_id_default, link_exists_c)
+
+    link_exists = .FALSE.
+    IF(link_exists_c.GT.0) link_exists = .TRUE.
+
+  END SUBROUTINE h5lexists_f
+
+!>
+!! \ingroup FH5L
+!!
+!! \brief Returns information about a link.
+!!
+!! \param link_loc_id File or group identifier.
+!! \param link_name   Name of the link for which information is being sought.
+!!                     NOTE: In C these are contained in the structure H5L_info_t
+!! \param cset         Indicates the character set used for link’s name.
+!! \param corder       Specifies the link’s creation order position.
+!! \param f_corder_valid Indicates whether the value in corder is valid.
+!! \param link_type    Specifies the link class:
+!!                     \li H5L_TYPE_HARD_F     - Hard link
+!!                     \li H5L_TYPE_SOFT_F     - Soft link
+!!                     \li H5L_TYPE_EXTERNAL_F - External link
+!!                     \li H5L_TYPE_ERROR_ F   - Error
+!! \param token        If the link is a hard link, token specifies the object token that the link points to.
+!! \param val_size     If the link is a symbolic link, val_size will be the length of the link value, e.g.,
+!!                     the length of the name of the pointed-to object with a null terminator.
+!! \param hdferr       \fortran_error
+!! \param lapl_id      Link access property list.
+!!
+!! See C API: @ref H5Lget_info2()
+!!
+  SUBROUTINE h5lget_info_f(link_loc_id, link_name, &
+       cset, corder, f_corder_valid, link_type, token, val_size, &
+       hdferr, lapl_id)
+    IMPLICIT NONE
+
+    INTEGER(HID_T), INTENT(IN) :: link_loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: link_name
+
+    INTEGER, INTENT(OUT) :: cset
+    INTEGER, INTENT(OUT) :: corder
+    LOGICAL, INTENT(OUT) :: f_corder_valid
+    INTEGER, INTENT(OUT) :: link_type
+    TYPE(H5O_TOKEN_T_F), INTENT(OUT), TARGET :: token
+    INTEGER(SIZE_T), INTENT(OUT) :: val_size
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id
+    INTEGER(SIZE_T) :: link_namelen
+    INTEGER(HID_T) :: lapl_id_default
+    INTEGER :: corder_valid
+
+    INTERFACE
+       INTEGER FUNCTION h5lget_info_c(link_loc_id, link_name, link_namelen, &
+            cset, corder, corder_valid, link_type, token, val_size, &
+            lapl_id_default) BIND(C,NAME='h5lget_info_c')
+         IMPORT :: c_char
+         IMPORT :: HID_T, SIZE_T, H5O_TOKEN_T_F
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: link_loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: link_name
+         INTEGER, INTENT(OUT) :: cset
+         INTEGER, INTENT(OUT) :: corder
+         INTEGER, INTENT(OUT) :: link_type
+         TYPE(H5O_TOKEN_T_F), INTENT(OUT) :: token
+         INTEGER(SIZE_T), INTENT(OUT) :: val_size
+         INTEGER(HID_T) :: lapl_id_default
+         INTEGER(SIZE_T) :: link_namelen
+         INTEGER :: corder_valid
+       END FUNCTION h5lget_info_c
+    END INTERFACE
+
+    link_namelen = LEN(link_name)
+
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+
+    hdferr = h5lget_info_c(link_loc_id, link_name, link_namelen, cset, &
+         corder, corder_valid, link_type, token, val_size, lapl_id_default)
+
+    f_corder_valid =.FALSE.
+    IF(corder_valid .EQ. 1) f_corder_valid =.TRUE.
+
+  END SUBROUTINE h5lget_info_f
+
+!>
+!! \ingroup FH5L
+!!
+!! \brief Retrieves metadata for a link in a group, according to the order within a field or index.
+!!
+!! \param loc_id         File or group identifier specifying location of subject group.
+!! \param group_name     Name of subject group.
+!! \param index_field    Index or field which determines the order:
+!!                       \li H5_INDEX_UNKNOWN_F = -1  - Unknown index type
+!!                       \li H5_INDEX_NAME_F          - Index on names
+!!                       \li H5_INDEX_CRT_ORDER_F     - Index on creation order
+!!                       \li H5_INDEX_N_F             - Number of indices defined
+!! \param order          Order within field or index:
+!!                       \li H5_ITER_UNKNOWN_F  - Unknown order
+!!                       \li H5_ITER_INC_F      - Increasing order
+!!                       \li H5_ITER_DEC_F      - Decreasing order
+!!                       \li H5_ITER_NATIVE_F   - No particular order, whatever is fastest
+!!                       \li H5_ITER_N_F        - Number of iteration orders
+!! \param n              Link for which to retrieve information.
+!!                       NOTE: In C these are defined as a structure: H5L_info_t
+!! \param link_type      Specifies the link class:
+!!                       \li H5L_TYPE_HARD_F      - Hard link
+!!                       \li H5L_TYPE_SOFT_F      - Soft link
+!!                       \li H5L_TYPE_EXTERNAL_F  - External link
+!!                       \li H5L_TYPE_ERROR _F    - Error
+!! \param f_corder_valid Indicates whether the creation order data is valid for this attribute.
+!! \param corder         Is a positive integer containing the creation order of the attribute.
+!! \param cset           Indicates the character set used for the attribute’s name.
+!! \param token          If the link is a hard link, token specifies the object token that the link points to.
+!! \param val_size       If the link is a symbolic link, val_size will be the length of the link value, e.g.,
+!!                       the length of the name of the pointed-to object with a null terminator.
+!! \param hdferr         \fortran_error
+!!
+!! \param lapl_id        Link access property list.
+!!
+!! See C API: @ref H5Lget_info_by_idx2()
+!!
+  SUBROUTINE h5lget_info_by_idx_f(loc_id, group_name, index_field, order, n, &
+       link_type, f_corder_valid, corder, cset, token, val_size, hdferr, lapl_id)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: group_name
+    INTEGER, INTENT(IN) :: index_field
+    INTEGER, INTENT(IN) :: order
+    INTEGER(HSIZE_T), INTENT(IN) :: n
+    INTEGER, INTENT(OUT) :: link_type
+    LOGICAL, INTENT(OUT) :: f_corder_valid
+    INTEGER, INTENT(OUT) :: corder
+    INTEGER, INTENT(OUT) :: cset
+    TYPE(H5O_TOKEN_T_F), INTENT(OUT), TARGET :: token
+    INTEGER(SIZE_T), INTENT(OUT) :: val_size
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id
+    INTEGER :: corder_valid
+    INTEGER(SIZE_T)  :: group_namelen
+    INTEGER(HID_T) :: lapl_id_default
+
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5lget_info_by_idx_c(loc_id, group_name, group_namelen, index_field, order, n, &
+            link_type, corder_valid, corder, cset, token, val_size, lapl_id_default) &
+            BIND(C,NAME='h5lget_info_by_idx_c')
+         IMPORT :: c_char
+         IMPORT :: HID_T, SIZE_T, HSIZE_T, H5O_TOKEN_T_F
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: group_name
+         INTEGER(SIZE_T)  :: group_namelen
+         INTEGER, INTENT(IN) :: index_field
+         INTEGER, INTENT(IN) :: order
+         INTEGER(HSIZE_T), INTENT(IN) :: n
+         INTEGER, INTENT(OUT) :: link_type
+         INTEGER :: corder_valid
+         INTEGER, INTENT(OUT) :: corder
+         INTEGER, INTENT(OUT) :: cset
+         TYPE(H5O_TOKEN_T_F), INTENT(OUT) :: token
+         INTEGER(SIZE_T), INTENT(OUT) :: val_size
+         INTEGER(HID_T) :: lapl_id_default
+       END FUNCTION h5lget_info_by_idx_c
+    END INTERFACE
+
+    group_namelen = LEN(group_name)
+
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+
+    hdferr = h5lget_info_by_idx_c(loc_id, group_name, group_namelen, index_field, order, n, &
+         link_type, corder_valid, corder, cset, token, val_size, lapl_id_default)
+
+    f_corder_valid =.FALSE.
+    IF (corder_valid .EQ. 1) f_corder_valid =.TRUE.
+
+  END SUBROUTINE h5lget_info_by_idx_f
+
+!>
+!! \ingroup FH5L
+!!
+!! \brief Determines whether a class of user-defined links is registered.
+!!
+!! \param link_cls_id User-defined link class identifier.
+!! \param registered  .TRUE. if the link class has been registered.
+!! \param hdferr      \fortran_error
+!!
+!! See C API: @ref H5Lis_registered()
+!!
+  SUBROUTINE h5lis_registered_f(link_cls_id, registered, hdferr)
+    IMPLICIT NONE
+    INTEGER, INTENT(IN) :: link_cls_id
+    LOGICAL, INTENT(OUT) :: registered
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5lis_registered_c(link_cls_id) BIND(C,NAME='h5lis_registered_c')
+         IMPLICIT NONE
+         INTEGER, INTENT(IN) :: link_cls_id
+       END FUNCTION h5lis_registered_c
+    END INTERFACE
+
+    hdferr = h5lis_registered_c(link_cls_id)
+
+    IF(hdferr.GT.0)THEN
+       registered = .TRUE.
+    ELSE IF(hdferr.EQ.0)THEN
+       registered = .FALSE.
+    ENDIF
+
+  END SUBROUTINE h5lis_registered_f
+
+!>
+!! \ingroup FH5L
+!!
+!! \brief Renames a link within an HDF5 file.
+!!
+!! \param src_loc_id  Original file or group identifier.
+!! \param src_name    Original link name.
+!! \param dest_loc_id Destination file or group identifier.
+!! \param dest_name   NEW link name.
+!! \param hdferr      \fortran_error
+!! \param lcpl_id     Link creation property list identifier to be associated WITH the NEW link.
+!! \param lapl_id     Link access property list identifier to be associated WITH the NEW link.
+!!
+!! See C API: @ref H5Lmove()
+!!
+  SUBROUTINE h5lmove_f(src_loc_id, src_name, dest_loc_id, dest_name, hdferr, lcpl_id, lapl_id)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: src_loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: src_name
+    INTEGER(HID_T), INTENT(IN) :: dest_loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: dest_name
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lcpl_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id
+    INTEGER(SIZE_T) :: src_namelen
+    INTEGER(SIZE_T) :: dest_namelen
+
+    INTEGER(HID_T) :: lcpl_id_default
+    INTEGER(HID_T) :: lapl_id_default
+
+    INTERFACE
+       INTEGER FUNCTION h5lmove_c(src_loc_id, src_name, src_namelen, dest_loc_id, &
+            dest_name, dest_namelen, lcpl_id_default, lapl_id_default) BIND(C,NAME='h5lmove_c')
+         IMPORT :: c_char
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: src_loc_id
+
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: src_name
+         INTEGER(SIZE_T) :: src_namelen
+         INTEGER(HID_T), INTENT(IN) :: dest_loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: dest_name
+         INTEGER(SIZE_T) :: dest_namelen
+
+         INTEGER(HID_T) :: lcpl_id_default
+         INTEGER(HID_T) :: lapl_id_default
+
+       END FUNCTION h5lmove_c
+    END INTERFACE
+
+    lcpl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lcpl_id)) lcpl_id_default = lcpl_id
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+
+    src_namelen = LEN(src_name)
+    dest_namelen = LEN(dest_name)
+
+    hdferr = H5Lmove_c(src_loc_id, src_name, src_namelen, dest_loc_id, &
+         dest_name, dest_namelen, lcpl_id_default, lapl_id_default)
+
+  END SUBROUTINE h5lmove_f
+
+!>
+!! \ingroup FH5L
+!!
+!! \brief Retrieves name of the nth link in a group, according to the order within a specified field or index.
+!!
+!! \param loc_id      File or group identifier specifying location of subject group.
+!! \param group_name  Name of subject group.
+!! \param index_field Index or field which determines the order:
+!!                    \li H5_INDEX_UNKNOWN_F = -1  - Unknown index type
+!!                    \li H5_INDEX_NAME_F          - Index on names
+!!                    \li H5_INDEX_CRT_ORDER_F     - Index on creation order
+!!                    \li H5_INDEX_N_F             - Number of indices defined
+!! \param order       Order within field or index:
+!!                    \li H5_ITER_UNKNOWN_F  - Unknown order
+!!                    \li H5_ITER_INC_F      - Increasing order
+!!                    \li H5_ITER_DEC_F      - Decreasing order
+!!                    \li H5_ITER_NATIVE_F   - No particular order, whatever is fastest
+!!                    \li H5_ITER_N_F        - Number of iteration orders
+!! \param n           Link for which to retrieve information.
+!! \param name        Buffer in which link value is returned.
+!! \param hdferr      \fortran_error
+!! \param lapl_id     List access property list identifier.
+!! \param size        Maximum number of characters of link value to be returned.
+!!
+!! See C API: @ref H5Lget_name_by_idx()
+!!
+  SUBROUTINE h5lget_name_by_idx_f(loc_id, group_name, index_field, order, n, &
+        name, hdferr, size, lapl_id)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: group_name
+    INTEGER, INTENT(IN) :: index_field
+    INTEGER, INTENT(IN) :: order
+    INTEGER(HSIZE_T), INTENT(IN) :: n
+    CHARACTER(LEN=*), INTENT(OUT) :: name
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(SIZE_T)  :: group_namelen
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id
+    INTEGER(HID_T) :: lapl_id_default
+    INTEGER(SIZE_T), OPTIONAL, INTENT(OUT) :: size
+    INTEGER(SIZE_T) :: size_default
+
+    INTERFACE
+       INTEGER FUNCTION h5lget_name_by_idx_c(loc_id, group_name, group_namelen, index_field, order, n, &
+             size_default, name, lapl_id_default) BIND(C,NAME='h5lget_name_by_idx_c')
+         IMPORT :: c_char
+         IMPORT :: HID_T, SIZE_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: group_name
+         INTEGER(SIZE_T)  :: group_namelen
+         INTEGER, INTENT(IN) :: index_field
+         INTEGER, INTENT(IN) :: order
+         INTEGER(HSIZE_T), INTENT(IN) :: n
+         INTEGER(SIZE_T) :: size_default
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(OUT) :: name
+         INTEGER(HID_T) :: lapl_id_default
+       END FUNCTION h5lget_name_by_idx_c
+    END INTERFACE
+
+    group_namelen = LEN(group_name)
+
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+
+    size_default = LEN(name)
+
+    hdferr = h5lget_name_by_idx_c(loc_id, group_name, group_namelen, index_field, order, n, &
+             size_default, name, lapl_id_default)
+
+    IF(PRESENT(size)) size = size_default
+
+
+  END SUBROUTINE h5lget_name_by_idx_f
+
+
+!  HAS PROBLEM WITH void pointer in C
+!!$!
+!>
+!!$  SUBROUTINE h5lget_val_by_idx_f(loc_id, group_name, index_field, order, n, &
+!!$       f_corder_valid, corder, cset, data_size, hdferr, lapl_id)
+!!$    IMPLICIT NONE
+
+!!$                                        !    H5_INDEX_N_F            - Number of indices defined
+
+!!$                                        !    H5_ITER_NATIVE_F   - No particular order, whatever is fastest
+
+
+!!$       INTEGER FUNCTION h5lget_val_by_idx_c(loc_id, group_name, group_namelen, index_field, order, n, &
+!!$            corder_valid, corder, cset, data_size, lapl_id_default)
+!!$         USE H5GLOBAL
+!!$         !DEC$IF DEFINED(HDF5F90_WINDOWS)
+!!$         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LGET_VAL_BY_IDX_C'::h5lget_val_by_idx_c
+!!$         !DEC$ENDIF
+
+!!$
+!!$    group_namelen = LEN(group_name)
+!!$
+!!$    lapl_id_default = H5P_DEFAULT_F
+!!$    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+!!$
+!!$    hdferr = h5lget_info_by_idx_c(loc_id, group_name, group_namelen, index_field, order, n, &
+!!$         corder_valid, corder, cset, data_size, lapl_id_default)
+!!$
+!!$    f_corder_valid =.FALSE.
+!!$    IF (corder_valid .EQ. 1) f_corder_valid =.TRUE.
+!!$
+!!$  END SUBROUTINE h5lget_val_by_idx_f
+
+!!$!
+!>
+!!$  SUBROUTINE h5lget_val_f(link_loc_id, link_name, size, linkval_buff,   &
+!!$       hdferr, lapl_id)
+!!$    IMPLICIT NONE
+
+!!$    INTEGER :: corder_valid
+!!$
+!!$    INTEGER :: link_namelen
+!!$    INTEGER(HID_T) :: lapl_id_default
+!!$
+!!$!  MS FORTRAN needs explicit interface for C functions called here.
+!!$!
+!!$    INTERFACE
+!!$       INTEGER FUNCTION h5lget_val_c(link_loc_id, link_name, link_namelen, size, linkval_buff, &
+!!$            lapl_id_default)
+!!$         USE H5GLOBAL
+!!$         !DEC$IF DEFINED(HDF5F90_WINDOWS)
+!!$         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LGET_VAL_C'::h5lget_val_c
+!!$         !DEC$ENDIF
+
+!!$
+!!$       END FUNCTION h5lget_val_c
+!!$    END INTERFACE
+!!$
+!!$    link_namelen = LEN(link_name)
+!!$
+!!$    lapl_id_default = H5P_DEFAULT_F
+!!$    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+!!$
+!!$    hdferr = h5lget_val_c(link_loc_id, link_name, link_namelen, size, linkval_buff, &
+!!$         lapl_id_default)
+!!$
+!!$  END SUBROUTINE h5lget_val_f
+
+!!$!
+!>
+!!$  SUBROUTINE H5Lregistered_f(version, class_id, comment, create_func, &
+!!$       move_func, copy_func, trav_func, del_func, query_func, hdferr)
+!!$    IMPLICIT NONE
+
+!!$    INTEGER :: move_func_len
+!!$    INTEGER :: copy_func_len
+!!$    INTEGER :: trav_func_len
+!!$    INTEGER :: del_func_len
+!!$    INTEGER :: query_func_len
+!!$
+!!$    INTERFACE
+!!$       INTEGER FUNCTION H5Lregistered_c(version, class_id, comment, &
+!!$            create_func, create_func_len, &
+!!$            move_func, move_func_len, &
+!!$            copy_func, copy_func_len, &
+!!$            trav_func, trav_func_len, &
+!!$            del_func, del_func_len, &
+!!$            query_func,query_func_len)
+!!$         USE H5GLOBAL
+!!$         !DEC$IF DEFINED(HDF5F90_WINDOWS)
+!!$         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LREGISTERED_C'::H5Lregistered_c
+!!$         !DEC$ENDIF
+
+!!$         INTEGER :: move_func_len
+!!$         INTEGER :: copy_func_len
+!!$         INTEGER :: trav_func_len
+!!$         INTEGER :: del_func_len
+!!$         INTEGER :: query_func_len
+!!$
+!!$       END FUNCTION H5Lregistered_c
+!!$    END INTERFACE
+!!$
+!!$    comment_len     = LEN(comment)
+!!$    create_func_len = LEN(create_func)
+!!$    move_func_len   = LEN(move_func)
+!!$    copy_func_len   = LEN(copy_func)
+!!$    trav_func_len   = LEN(trav_func)
+!!$    del_func_len    = LEN(del_func)
+!!$    query_func_len  = LEN(query_func)
+!!$
+!!$    hdferr = H5Lregistered_c(version, class_id, comment, &
+!!$         create_func, create_func_len, &
+!!$         move_func, move_func_len, &
+!!$         copy_func, copy_func_len, &
+!!$         trav_func, trav_func_len, &
+!!$         del_func, del_func_len, &
+!!$         query_func, query_func_len)
+!!$
+!!$  END SUBROUTINE H5Lregistered_f
+
+!>
+!! \ingroup FH5L
+!!
+!! \brief Iterates through links in a group.
+!!
+!! \param group_id      Identifier specifying subject group.
+!! \param index_type    Type of index which determines the order:
+!!                      \li H5_INDEX_NAME_F      - Alphanumeric index on name
+!!                      \li H5_INDEX_CRT_ORDER_F - Index on creation order
+!! \param order         Order within index:
+!!                      \li H5_ITER_INC_F    - Increasing order
+!!                      \li H5_ITER_DEC_F    - Decreasing order
+!!                      \li H5_ITER_NATIVE_F - Fastest available order
+!! \param idx          Iteration position at which to start, or <br />
+!!                     Position at which an interrupted iteration may be restarted
+!! \param op            Callback function passing data regarding the link to the calling application.
+!! \param op_data       User-defined pointer to data required by the application for its processing of the link.
+!! \param return_value  Return context:
+!!                      \li Success: The return value of the first operator that
+!!                               returns non-zero, or zero if all members were processed with no operator returning non-zero.
+!!                      \li Failure: Negative if something goes wrong within the
+!!                               library, or the negative value returned by one of the operators.
+!! \param hdferr        \fortran_error
+!!
+!! See C API: @ref H5Literate2()
+!!
+  SUBROUTINE h5literate_f(group_id, index_type, order, idx, op, op_data, return_value, hdferr)
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR, C_FUNPTR
+    IMPLICIT NONE
+    INTEGER(HID_T)  , INTENT(IN)    :: group_id
+    INTEGER         , INTENT(IN)    :: index_type
+    INTEGER         , INTENT(IN)    :: order
+    INTEGER(HSIZE_T), INTENT(INOUT) :: idx
+    TYPE(C_FUNPTR)  , INTENT(IN)    :: op
+    TYPE(C_PTR)     , INTENT(IN)    :: op_data
+    INTEGER         , INTENT(OUT)   :: return_value
+    INTEGER         , INTENT(OUT)   :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5literate_c(group_id, index_type, order, idx, op, op_data) &
+            BIND(C, NAME='h5literate_c')
+         IMPORT :: c_ptr, c_funptr
+         IMPORT :: HID_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: group_id
+         INTEGER, INTENT(IN) :: index_type
+         INTEGER, INTENT(IN) :: order
+         INTEGER(HSIZE_T), INTENT(INOUT) :: idx
+         TYPE(C_FUNPTR), VALUE :: op
+         TYPE(C_PTR), VALUE :: op_data
+       END FUNCTION h5literate_c
+    END INTERFACE
+
+    return_value = h5literate_c(group_id, index_type, order, idx, op, op_data)
+
+    IF(return_value.GE.0)THEN
+       hdferr = 0
+    ELSE
+       hdferr = -1
+    END IF
+
+  END SUBROUTINE h5literate_f
+
+!>
+!! \ingroup FH5L
+!!
+!! \brief Iterates through links in a group.
+!!
+!! \param loc_id        File or group identifier specifying location of subject group.
+!! \param group_name    Name of subject group.
+!! \param index_type    Type of index which determines the order:
+!!                      \li H5_INDEX_NAME_F      - Alphanumeric index on name
+!!                      \li H5_INDEX_CRT_ORDER_F - Index on creation order
+!! \param order        Order within index:
+!!                     \li H5_ITER_INC_F    - Increasing order
+!!                     \li H5_ITER_DEC_F    - Decreasing order
+!!                     \li H5_ITER_NATIVE_F - Fastest available order
+!! \param idx          Iteration position at which to start, or <br />
+!!                     Position at which an interrupted iteration may be restarted
+!! \param op           Callback function passing data regarding the link to the calling application.
+!! \param op_data      User-defined pointer to data required by the application for its processing of the link.
+!! \param return_value Return context:
+!!                      \li Success: The return value of the first operator that returns non-zero, or zero if
+!!                               all members were processed with no operator returning non-zero.
+!!                      \li Failure: Negative if something goes wrong within the
+!!                               library, or the negative value returned by one of the operators.
+!! \param hdferr       \fortran_error
+!! \param lapl_id      Link access property list
+!!
+!! See C API: @ref H5Literate_by_name2()
+!!
+  SUBROUTINE h5literate_by_name_f(loc_id, group_name, index_type, order, &
+       idx, op, op_data, return_value, hdferr, lapl_id)
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR, C_FUNPTR
+    IMPLICIT NONE
+    INTEGER(HID_T)  , INTENT(IN)           :: loc_id
+    CHARACTER(LEN=*), INTENT(IN)           :: group_name
+    INTEGER         , INTENT(IN)           :: index_type
+    INTEGER         , INTENT(IN)           :: order
+    INTEGER(HSIZE_T), INTENT(INOUT)        :: idx
+    TYPE(C_FUNPTR)  , INTENT(IN)           :: op
+    TYPE(C_PTR)     , INTENT(IN)           :: op_data
+    INTEGER         , INTENT(OUT)          :: return_value
+    INTEGER         , INTENT(OUT)          :: hdferr
+    INTEGER(HID_T)  , INTENT(IN), OPTIONAL :: lapl_id
+    INTEGER(HID_T) :: lapl_id_default
+    INTEGER(SIZE_T) :: namelen
+
+    INTERFACE
+       INTEGER FUNCTION h5literate_by_name_c(loc_id, name, namelen, index_type, order,&
+            idx, op, op_data, lapl_id_default) BIND(C, NAME='h5literate_by_name_c')
+         IMPORT :: c_char, c_ptr, c_funptr
+         IMPORT :: HID_T, SIZE_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T)  , INTENT(IN) :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+         INTEGER(SIZE_T) , INTENT(IN) :: namelen
+         INTEGER         , INTENT(IN) :: index_type
+         INTEGER         , INTENT(IN) :: order
+         INTEGER(HSIZE_T), INTENT(INOUT) :: idx
+         TYPE(C_FUNPTR), VALUE :: op
+         TYPE(C_PTR), VALUE :: op_data
+         INTEGER(HID_T)  , INTENT(IN) :: lapl_id_default
+       END FUNCTION
+    END INTERFACE
+
+    namelen  = LEN(group_name)
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+
+    return_value = h5literate_by_name_c(loc_id, group_name, namelen, index_type, order, idx, op, op_data, lapl_id_default)
+
+    IF(return_value.GE.0)THEN
+       hdferr = 0
+    ELSE
+       hdferr = -1
+    END IF
+
+  END SUBROUTINE h5literate_by_name_f
+
+END MODULE H5L
diff --git a/fortran/src/H5Lff.f90 b/fortran/src/H5Lff.f90
deleted file mode 100644
index 4660e52..0000000
--- a/fortran/src/H5Lff.f90
+++ /dev/null
@@ -1,1300 +0,0 @@
-!****h* ROBODoc/H5L
-!
-! NAME
-!  MODULE H5L
-!
-! PURPOSE
-!  This file contains Fortran interfaces for H5L functions. It includes
-!  all the functions that are independent on whether the Fortran 2003 functions
-!  are enabled or disabled.
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! NOTES
-!                         *** IMPORTANT ***
-!  If you add a new H5L function you must add the function name to the
-!  Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
-!  This is needed for Windows based operating systems.
-!
-!*****
-
-MODULE H5L
-
-  USE H5GLOBAL
-
-CONTAINS
-
-!
-!****s* H5L/h5lcopy_f
-!
-! NAME
-!  h5lcopy_f
-!
-! PURPOSE
-!  Copies a link from one location to another.
-!
-! INPUTS
-!  src_loc_id 	 - Location identifier of the source link
-!  src_name 	 - Name of the link to be copied
-!  dest_loc_id 	 - Location identifier specifying the destination of the copy
-!  dest_name 	 - Name to be assigned to the NEW copy
-!  loc_id 	 - Identifier of the file or group containing the object
-!  name 	 - Name of the link to delete
-!
-! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! OPTIONAL PARAMETERS
-!  lcpl_id 	 - Link creation property list identifier
-!  lapl_id 	 - Link access property list identifier
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  February 27, 2008
-!
-! SOURCE
-  SUBROUTINE h5lcopy_f(src_loc_id, src_name, dest_loc_id, dest_name, hdferr, &
-       lcpl_id, lapl_id)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: src_loc_id  ! Location identifier of the source link
-    CHARACTER(LEN=*), INTENT(IN) :: src_name   ! Name of the link to be copied
-    INTEGER(HID_T), INTENT(IN) :: dest_loc_id ! Location identifier specifying the destination of the copy
-    CHARACTER(LEN=*), INTENT(IN) :: dest_name ! Name to be assigned to the NEW copy
-
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code:
-                                          ! 0 on success and -1 on failure
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lcpl_id ! Link creation property list identifier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id ! Link access property list identifier
-!*****
-    INTEGER(HID_T) :: lcpl_id_default
-    INTEGER(HID_T) :: lapl_id_default
-
-    INTEGER(SIZE_T) :: src_namelen
-    INTEGER(SIZE_T) :: dest_namelen
-
-    INTERFACE
-       INTEGER FUNCTION h5lcopy_c(src_loc_id, src_name, src_namelen, dest_loc_id, dest_name, dest_namelen, &
-            lcpl_id_default, lapl_id_default)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LCOPY_C'::h5lcopy_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: src_name, dest_name
-         INTEGER(HID_T), INTENT(IN) :: src_loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: src_name
-         INTEGER(HID_T), INTENT(IN) :: dest_loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: dest_name
-
-         INTEGER(HID_T) :: lcpl_id_default
-         INTEGER(HID_T) :: lapl_id_default
-
-         INTEGER(SIZE_T) :: src_namelen
-         INTEGER(SIZE_T) :: dest_namelen
-       END FUNCTION h5lcopy_c
-    END INTERFACE
-
-    src_namelen  = LEN(src_name)
-    dest_namelen = LEN(dest_name)
-
-    lcpl_id_default = H5P_DEFAULT_F
-    IF(PRESENT(lcpl_id)) lcpl_id_default = lcpl_id
-    lapl_id_default = H5P_DEFAULT_F
-    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
-
-    hdferr = h5lcopy_c(src_loc_id, src_name, src_namelen, dest_loc_id, dest_name, dest_namelen, &
-         lcpl_id_default, lapl_id_default)
-
-  END SUBROUTINE h5lcopy_f
-
-!
-!****s* H5L/h5ldelete_f
-!
-! NAME
-!  h5ldelete_f
-!
-! PURPOSE
-!  Removes a link from a group.
-!
-! INPUTS
-!  loc_id 	 - Identifier of the file or group containing the object
-!  name 	 - Name of the link to delete
-!
-! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! OPTIONAL PARAMETERS
-!  lapl_id 	 - Link access property list identifier
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  January, 2008
-!
-! SOURCE
-  SUBROUTINE h5ldelete_f(loc_id, name, hdferr, lapl_id)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id  ! Identifier of the file or group containing the object
-    CHARACTER(LEN=*), INTENT(IN) :: name  ! Name of the link to delete
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code:
-                                          ! 0 on success and -1 on failure
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id ! Link access property list identifier
-!*****
-    INTEGER(HID_T) :: lapl_id_default
-    INTEGER(SIZE_T) :: namelen
-
-    INTERFACE
-       INTEGER FUNCTION h5ldelete_c(loc_id, name, namelen, lapl_id_default)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LDELETE_C'::h5ldelete_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         INTEGER(HID_T), INTENT(IN) :: loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER(HID_T) :: lapl_id_default
-         INTEGER(SIZE_T) :: namelen
-       END FUNCTION h5ldelete_c
-    END INTERFACE
-
-    namelen = LEN(name)
-
-    lapl_id_default = H5P_DEFAULT_F
-    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
-
-    hdferr = h5ldelete_c(loc_id, name, namelen, lapl_id_default)
-
-  END SUBROUTINE h5ldelete_f
-
-!
-!****s* H5L/H5Lcreate_soft_f
-!
-! NAME
-!  H5Lcreate_soft_f
-!
-! PURPOSE
-!  Creates a soft link to an object.
-!
-! INPUTS
-!  target_path 	 - Path to the target object, which is not required to exist.
-!  link_loc_id 	 - The file or group identifier for the new link.
-!  link_name 	 - The name of the new link.
-!
-! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! OPTIONAL PARAMETERS
-!  lcpl_id 	 - Link creation property list identifier.
-!  lapl_id 	 - Link access property list identifier.
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  February 20, 2008
-!
-! SOURCE
-  SUBROUTINE h5lcreate_soft_f(target_path, link_loc_id, link_name, hdferr, lcpl_id, lapl_id)
-    IMPLICIT NONE
-    CHARACTER(LEN=*), INTENT(IN) :: target_path   ! Path to the target object, which is not required to exist.
-    INTEGER(HID_T), INTENT(IN) :: link_loc_id     ! The file or group identifier for the new link.
-    CHARACTER(LEN=*), INTENT(IN) :: link_name     ! The name of the new link.
-    INTEGER, INTENT(OUT) :: hdferr                ! Error code:
-                                                  !   0 on success and -1 on failure
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lcpl_id ! Link creation property list identifier.
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id ! Link access property list identifier.
-!*****
-    INTEGER(HID_T) :: lcpl_id_default
-    INTEGER(HID_T) :: lapl_id_default
-    INTEGER(SIZE_T) :: target_path_len
-    INTEGER(SIZE_T) :: link_name_len
-
-    INTERFACE
-       INTEGER FUNCTION h5lcreate_soft_c(target_path, target_path_len, &
-            link_loc_id, &
-            link_name,link_name_len, &
-            lcpl_id_default, lapl_id_default )
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LCREATE_SOFT_C'::h5lcreate_soft_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: target_path, link_name
-         CHARACTER(LEN=*), INTENT(IN) :: target_path
-         INTEGER(SIZE_T) :: target_path_len
-         INTEGER(HID_T), INTENT(IN) ::   link_loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: link_name
-         INTEGER(SIZE_T) :: link_name_len
-         INTEGER(HID_T) :: lcpl_id_default
-         INTEGER(HID_T) :: lapl_id_default
-       END FUNCTION h5lcreate_soft_c
-    END INTERFACE
-
-    target_path_len = LEN(target_path)
-    link_name_len = LEN(link_name)
-
-    lcpl_id_default = H5P_DEFAULT_F
-    IF(PRESENT(lcpl_id)) lcpl_id_default = lcpl_id
-    lapl_id_default = H5P_DEFAULT_F
-    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
-
-    hdferr = h5lcreate_soft_c(target_path, target_path_len,&
-         link_loc_id, &
-         link_name, link_name_len, &
-         lcpl_id_default, lapl_id_default )
-
-  END SUBROUTINE h5lcreate_soft_f
-
-!
-!****s* H5L/H5Lcreate_hard_f
-!
-! NAME
-!  H5Lcreate_hard_f
-!
-! PURPOSE
-!  Creates a hard link to an object.
-!
-! INPUTS
-!
-!  obj_loc_id 	 - The file or group identifier for the target object.
-!  obj_name 	 - Name of the target object, which must already exist.
-!  link_loc_id 	 - The file or group identifier for the new link.
-!  link_name 	 - The name of the new link.
-!
-! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! OPTIONAL PARAMETERS
-!  lcpl_id 	 - Link creation property list identifier.
-!  lapl_id 	 - Link access property list identifier.
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  February 27, 2008
-!
-! SOURCE
-  SUBROUTINE h5lcreate_hard_f(obj_loc_id, obj_name, link_loc_id, link_name, hdferr, lcpl_id, lapl_id)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: obj_loc_id  ! The file or group identifier for the target object.
-    CHARACTER(LEN=*), INTENT(IN) :: obj_name  ! Name of the target object, which must already exist.
-    INTEGER(HID_T), INTENT(IN) :: link_loc_id ! The file or group identifier for the new link.
-    CHARACTER(LEN=*), INTENT(IN) :: link_name ! The name of the new link.
-
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code:
-                                          ! 0 on success and -1 on failure
-
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) ::   lcpl_id         ! Link creation property list identifier.
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) ::   lapl_id         ! Link access property list identifier.
-!*****
-    INTEGER(HID_T) :: lcpl_id_default
-    INTEGER(HID_T) :: lapl_id_default
-
-    INTEGER(SIZE_T) :: obj_namelen
-    INTEGER(SIZE_T) :: link_namelen
-
-    INTERFACE
-       INTEGER FUNCTION h5lcreate_hard_c(obj_loc_id, obj_name, obj_namelen, &
-            link_loc_id, link_name, link_namelen, lcpl_id_default, lapl_id_default)
-
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LCREATE_HARD_C'::h5lcreate_hard_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: obj_name, link_name
-         INTEGER(HID_T), INTENT(IN) :: obj_loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: obj_name
-         INTEGER(HID_T), INTENT(IN) :: link_loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: link_name
-         INTEGER(SIZE_T) :: obj_namelen
-         INTEGER(SIZE_T) :: link_namelen
-         INTEGER(HID_T) :: lcpl_id_default
-         INTEGER(HID_T) :: lapl_id_default
-       END FUNCTION h5lcreate_hard_c
-    END INTERFACE
-    obj_namelen = LEN(obj_name)
-    link_namelen = LEN(link_name)
-
-    lcpl_id_default = H5P_DEFAULT_F
-    IF(PRESENT(lcpl_id)) lcpl_id_default = lcpl_id
-    lapl_id_default = H5P_DEFAULT_F
-    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
-
-    hdferr = h5lcreate_hard_c(obj_loc_id, obj_name, obj_namelen, &
-            link_loc_id, link_name, link_namelen, lcpl_id_default, lapl_id_default)
-
-  END SUBROUTINE h5lcreate_hard_f
-
-!
-!****s* H5L/H5Lcreate_external_f
-!
-! NAME
-!  H5Lcreate_external_f
-!
-! PURPOSE
-!  Creates a soft link to an object in a different file.
-!
-! INPUTS
-!
-!  file_name 	 - Name of the file containing the target object. Neither the file nor the target object is
-!  required to exist. May be the file the link is being created in.
-!  obj_name 	 - Path within the target file to the target object.
-!  link_loc_id 	 - The file or group identifier for the new link.
-!  link_name 	 - The name of the new link.
-!
-! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! OPTIONAL PARAMETERS
-!  lcpl_id 	 - Link creation property list identifier.
-!  lapl_id 	 - Link access property list identifier.
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  February 27, 2008
-! SOURCE
-  SUBROUTINE h5lcreate_external_f(file_name, obj_name, link_loc_id, link_name, hdferr, lcpl_id, lapl_id)
-    IMPLICIT NONE
-    CHARACTER(LEN=*), INTENT(IN) :: file_name ! Name of the file containing the target object. Neither
-                                              ! the file nor the target object is required to exist.
-                                              ! May be the file the link is being created in.
-    CHARACTER(LEN=*), INTENT(IN) :: obj_name  ! Name of the target object, which must already exist.
-    INTEGER(HID_T), INTENT(IN) :: link_loc_id ! The file or group identifier for the new link.
-    CHARACTER(LEN=*), INTENT(IN) :: link_name ! The name of the new link.
-
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code:
-                                          ! 0 on success and -1 on failure
-
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lcpl_id ! Link creation property list identifier.
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id ! Link access property list identifier.
-!*****
-    INTEGER(HID_T) :: lcpl_id_default
-    INTEGER(HID_T) :: lapl_id_default
-
-    INTEGER(SIZE_T) :: file_namelen
-    INTEGER(SIZE_T) :: obj_namelen
-    INTEGER(SIZE_T) :: link_namelen
-
-    INTERFACE
-       INTEGER FUNCTION h5lcreate_external_c(file_name, file_namelen, obj_name, obj_namelen, &
-            link_loc_id, link_name, link_namelen, lcpl_id_default, lapl_id_default)
-
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LCREATE_EXTERNAL_C'::h5lcreate_external_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: file_name, obj_name, link_name
-         CHARACTER(LEN=*), INTENT(IN) :: file_name
-         CHARACTER(LEN=*), INTENT(IN) :: obj_name
-         INTEGER(HID_T), INTENT(IN) :: link_loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: link_name
-         INTEGER(SIZE_T) :: file_namelen
-         INTEGER(SIZE_T) :: obj_namelen
-         INTEGER(SIZE_T) :: link_namelen
-         INTEGER(HID_T) :: lcpl_id_default
-         INTEGER(HID_T) :: lapl_id_default
-       END FUNCTION h5lcreate_external_c
-    END INTERFACE
-    file_namelen = LEN(file_name)
-    obj_namelen = LEN(obj_name)
-    link_namelen = LEN(link_name)
-
-    lcpl_id_default = H5P_DEFAULT_F
-    IF(PRESENT(lcpl_id)) lcpl_id_default = lcpl_id
-    lapl_id_default = H5P_DEFAULT_F
-    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
-
-    hdferr = h5lcreate_external_c(file_name, file_namelen, obj_name, obj_namelen, &
-            link_loc_id, link_name, link_namelen, lcpl_id_default, lapl_id_default)
-
-  END SUBROUTINE h5lcreate_external_f
-
-!
-!****s* H5L/h5ldelete_by_idx_f
-!
-! NAME
-!  h5ldelete_by_idx_f
-!
-! PURPOSE
-!  Removes the nth link in a group.
-! INPUTS
-!  loc_id 	 - File or group identifier specifying location of subject group
-!  group_name 	 - Name of subject group
-!  index_field 	 - Type of index; Possible values are:
-!                    H5_INDEX_UNKNOWN_F = -1  - Unknown index type
-!                    H5_INDEX_NAME_F 	      - Index on names
-!                    H5_INDEX_CRT_ORDER_F     - Index on creation order
-!                    H5_INDEX_N_F 	      - Number of indices defined
-!
-!  order 	 - Order within field or index; Possible values are:
-!                    H5_ITER_UNKNOWN_F 	 - Unknown order
-!                    H5_ITER_INC_F 	 - Increasing order
-!                    H5_ITER_DEC_F 	 - Decreasing order
-!                    H5_ITER_NATIVE_F 	 - No particular order, whatever is fastest
-!                    H5_ITER_N_F 	 - Number of iteration orders
-!
-!  n 	         - Link for which to retrieve information
-! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! OPTIONAL PARAMETERS
-!  lapl_id 	 - Link access property list
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  February 29, 2008
-! SOURCE
-  SUBROUTINE h5ldelete_by_idx_f(loc_id, group_name, index_field, order, n, hdferr, lapl_id)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id       ! Identifer for object to which attribute is attached
-    CHARACTER(LEN=*), INTENT(IN) :: group_name ! Name of object, relative to location,
-                                               !  from which attribute is to be removed
-    INTEGER, INTENT(IN) :: index_field         ! Type of index; Possible values are:
-                                               !    H5_INDEX_UNKNOWN_F   - Unknown index type
-                                               !    H5_INDEX_NAME_F      - Index on names
-                                               !    H5_INDEX_CRT_ORDER_F - Index on creation order
-                                               !    H5_INDEX_N_F	      - Number of indices defined
-    INTEGER, INTENT(IN) :: order               ! Order in which to iterate over index; Possible values are:
-                                               !    H5_ITER_UNKNOWN_F  - Unknown order
-                                               !    H5_ITER_INC_F      - Increasing order
-                                               !    H5_ITER_DEC_F      - Decreasing order
-                                               !    H5_ITER_NATIVE_F   - No particular order, whatever is fastest
-                                               !    H5_ITER_N_F	    - Number of iteration orders
-    INTEGER(HSIZE_T), INTENT(IN) :: n      ! Offset within index
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code:
-                                           ! 0 on success and -1 on failure
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id     ! Link access property list
-!*****
-    INTEGER(HID_T) :: lapl_id_default
-    INTEGER(SIZE_T) :: group_namelen
-
-    INTERFACE
-       INTEGER FUNCTION h5ldelete_by_idx_c(loc_id, group_name, group_namelen, index_field, order, n, lapl_id_default)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LDELETE_BY_IDX_C'::h5ldelete_by_idx_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: group_name
-         INTEGER(HID_T), INTENT(IN) :: loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: group_name
-         INTEGER, INTENT(IN) :: index_field
-         INTEGER, INTENT(IN) :: order
-         INTEGER(HSIZE_T), INTENT(IN) :: n
-         INTEGER(HID_T) :: lapl_id_default
-         INTEGER(SIZE_T) :: group_namelen
-       END FUNCTION h5ldelete_by_idx_c
-    END INTERFACE
-
-    lapl_id_default = H5P_DEFAULT_F
-    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
-
-    group_namelen = LEN(group_name)
-    hdferr = h5ldelete_by_idx_c(loc_id, group_name, group_namelen, index_field, order, n, lapl_id_default)
-
-  END SUBROUTINE h5ldelete_by_idx_f
-
-!
-!****s* H5L/H5Lexists_f
-!
-! NAME
-!  H5Lexists_f
-!
-! PURPOSE
-!  Check if a link with a particular name exists in a group.
-!
-! INPUTS
-!  loc_id 	 - Identifier of the file or group to query.
-!  name 	 - Link name to check
-!
-! OUTPUTS
-!  link_exists 	 - link exists status (.TRUE.,.FALSE.)
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! OPTIONAL PARAMETERS
-!  lapl_id 	 - Link access property list identifier.
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  February 29, 2008
-!
-! SOURCE
-  SUBROUTINE h5lexists_f(loc_id, name, link_exists, hdferr, lapl_id)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id  ! Identifier of the file or group to query.
-    CHARACTER(LEN=*), INTENT(IN) :: name  ! Link name to check.
-    LOGICAL, INTENT(OUT) :: link_exists   ! .TRUE. if exists, .FALSE. otherwise
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code:
-                                          ! 0 on success and -1 on failure
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id
-                                          ! Link access property list identifier.
-!*****
-    INTEGER :: link_exists_c
-    INTEGER(HID_T) :: lapl_id_default
-    INTEGER(SIZE_T)  :: namelen
-
-    INTERFACE
-       INTEGER FUNCTION h5lexists_c(loc_id, name, namelen, lapl_id_default, link_exists_c)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LEXISTS_C'::h5lexists_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         INTEGER(HID_T), INTENT(IN) :: loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER(SIZE_T), INTENT(IN) :: namelen
-         INTEGER, INTENT(OUT) :: link_exists_c
-         INTEGER(HID_T) :: lapl_id_default
-
-       END FUNCTION h5lexists_c
-    END INTERFACE
-
-    namelen = LEN(name)
-
-    lapl_id_default = H5P_DEFAULT_F
-    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
-
-    hdferr = h5lexists_c(loc_id, name, namelen, lapl_id_default, link_exists_c)
-
-    link_exists = .FALSE.
-    IF(link_exists_c.GT.0) link_exists = .TRUE.
-
-  END SUBROUTINE h5lexists_f
-
-!
-!****s* H5L/h5lget_info_f
-!
-! NAME
-!  h5lget_info_f
-!
-! PURPOSE
-!  Returns information about a link.
-!
-! INPUTS
-!  link_loc_id 	 - File or group identifier.
-!  link_name 	 - Name of the link for which information is being sought
-!
-! OUTPUTS  
-!            NOTE: In C these are contained in the structure H5L_info_t
-!
-!  cset 	 - indicates the character set used for link’s name.
-!  corder 	 - specifies the link’s creation order position.
-!  corder_valid  - indicates whether the value in corder is valid.
-!  link_type 	 - specifies the link class:
-!                    H5L_TYPE_HARD_F 	 - Hard link
-!                    H5L_TYPE_SOFT_F 	 - Soft link
-!                    H5L_TYPE_EXTERNAL_F - External link
-!                    H5L_TYPE_ERROR_ F   - Error
-!  address 	 - If the link is a hard link, address specifies the file address that the link points to
-!  val_size 	 - If the link is a symbolic link, val_size will be the length of the link value, e.g., 
-!                  the length of the name of the pointed-to object with a null terminator. 
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! OPTIONAL PARAMETERS
-!  lapl_id 	 - Link access property list
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  February 29, 2008
-!
-! HISTORY
-!   Changed the link_type names to match those in C (bug 1720) from,
-!   H5L_LINK_HARD_F, H5L_LINK_SOFT_F,H5L_LINK_EXTERNAL_F,H5L_LINK_ERROR_F
-!   to
-!   H5L_TYPE_HARD_F, H5L_TYPE_SOFT_F,H5L_TYPE_EXTERNAL_F,H5L_TYPE_ERROR_F
-!   MSB January 8, 2010.
-!
-! SOURCE
-  SUBROUTINE h5lget_info_f(link_loc_id, link_name, &
-       cset, corder, f_corder_valid, link_type, address, val_size, &
-       hdferr, lapl_id)
-    IMPLICIT NONE
-
-    INTEGER(HID_T), INTENT(IN) :: link_loc_id ! File or group identifier.
-    CHARACTER(LEN=*), INTENT(IN) :: link_name ! Name of the link for which information is being sought
-
-! OUTPUTS  NOTE: In C these are contained in the structure H5L_info_t
-    INTEGER, INTENT(OUT) :: cset ! Indicates the character set used for the link’s name.
-    INTEGER, INTENT(OUT) :: corder ! Specifies the link’s creation order position.
-    LOGICAL, INTENT(OUT) :: f_corder_valid ! Indicates whether the value in corder is valid.
-    INTEGER, INTENT(OUT) :: link_type ! Specifies the link class:
-     	                              !  H5L_TYPE_HARD_F      - Hard link
-     	                              !  H5L_TYPE_SOFT_F      - Soft link
-     	                              !  H5L_TYPE_EXTERNAL_F  - External link
-     	                              !  H5L_TYPE_ERROR _F    - Error
-    INTEGER(HADDR_T), INTENT(OUT) :: address ! If the link is a hard link, address specifies the file address that the link points to
-    INTEGER(SIZE_T), INTENT(OUT) :: val_size ! If the link is a symbolic link, val_size will be the length of the link value, e.g., 
-                                             ! the length of the name of the pointed-to object with a null terminator. 
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code:
-                                         ! 0 on success and -1 on failure
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id  ! Link access property list
-!*****
-    INTEGER(SIZE_T) :: link_namelen
-    INTEGER(HID_T) :: lapl_id_default
-    INTEGER :: corder_valid
-
-    INTERFACE
-       INTEGER FUNCTION h5lget_info_c(link_loc_id, link_name, link_namelen, &
-            cset, corder, corder_valid, link_type, address, val_size, &
-            lapl_id_default)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LGET_INFO_C'::h5lget_info_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: link_name
-         INTEGER(HID_T), INTENT(IN) :: link_loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: link_name
-         INTEGER, INTENT(OUT) :: cset
-         INTEGER, INTENT(OUT) :: corder
-         INTEGER, INTENT(OUT) :: link_type
-         INTEGER(HADDR_T), INTENT(OUT) :: address
-         INTEGER(SIZE_T), INTENT(OUT) :: val_size
-         INTEGER(HID_T) :: lapl_id_default
-         INTEGER(SIZE_T) :: link_namelen
-         INTEGER :: corder_valid
-       END FUNCTION h5lget_info_c
-    END INTERFACE
-
-    link_namelen = LEN(link_name)
-
-    lapl_id_default = H5P_DEFAULT_F
-    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
-
-    hdferr = h5lget_info_c(link_loc_id, link_name, link_namelen, &
-         cset, corder, corder_valid, link_type, &
-         address, val_size, &
-         lapl_id_default)
-
-    f_corder_valid =.FALSE.
-    IF(corder_valid .EQ. 1) f_corder_valid =.TRUE.
-
-  END SUBROUTINE h5lget_info_f
-
-!
-!****s* H5L/h5lget_info_by_idx_f
-!
-! NAME
-!  h5lget_info_by_idx_f
-!
-! PURPOSE
-!  Retrieves metadata for a link in a group, according to the order within a field or index.
-!
-! INPUTS
-!  loc_id 	 - File or group identifier specifying location of subject group
-!  group_name 	 - Name of subject group
-!  index_field 	 - Index or field which determines the order
-!  order 	 - Order within field or index
-!  n 	         - Link for which to retrieve information
-!
-! OUTPUTS  
-!            NOTE: In C these are defined as a structure: H5L_info_t
-!  corder_valid  - Indicates whether the creation order data is valid for this attribute
-!  corder 	 - Is a positive integer containing the creation order of the attribute
-!  cset 	 - Indicates the character set used for the attribute’s name 
-! address        - If the link is a hard link, address specifies the file address that the link points to
-! val_size       - If the link is a symbolic link, val_size will be the length of the link value, e.g., 
-!                  the length of the name of the pointed-to object with a null terminator.
-! hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! OPTIONAL PARAMETERS
-!  lapl_id 	 - Link access property list
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  February 29, 2008
-!
-! HISTORY
-!   Changed the link_type names to match those in C (bug 1720) from,
-!   H5L_LINK_HARD_F, H5L_LINK_SOFT_F,H5L_LINK_EXTERNAL_F,H5L_LINK_ERROR_F
-!   to
-!   H5L_TYPE_HARD_F, H5L_TYPE_SOFT_F,H5L_TYPE_EXTERNAL_F,H5L_TYPE_ERROR_F
-!   MSB January 8, 2010.  
-!
-! SOURCE
-  SUBROUTINE h5lget_info_by_idx_f(loc_id, group_name, index_field, order, n, &
-       link_type, f_corder_valid, corder, cset, address, val_size, hdferr, lapl_id)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id       ! File or group identifier specifying location of subject group  
-    CHARACTER(LEN=*), INTENT(IN) :: group_name ! Name of subject group
-    INTEGER, INTENT(IN) :: index_field  ! Index or field which determines the order
-                                        !    H5_INDEX_UNKNOWN_F   - Unknown index type
-                                        !    H5_INDEX_NAME_F      - Index on names
-                                        !    H5_INDEX_CRT_ORDER_F - Index on creation order
-                                        !    H5_INDEX_N_F	      - Number of indices defined
-    INTEGER, INTENT(IN) :: order        ! Order in which to iterate over index; Possible values are:
-                                        !    H5_ITER_UNKNOWN_F  - Unknown order
-                                        !    H5_ITER_INC_F      - Increasing order
-                                        !    H5_ITER_DEC_F      - Decreasing order
-                                        !    H5_ITER_NATIVE_F   - No particular order, whatever is fastest
-    INTEGER(HSIZE_T), INTENT(IN) :: n   ! Attribute’s position in index
-    INTEGER, INTENT(OUT) :: link_type ! Specifies the link class:
-     	                              !  H5L_TYPE_HARD_F      - Hard link
-     	                              !  H5L_TYPE_SOFT_F      - Soft link
-     	                              !  H5L_TYPE_EXTERNAL_F  - External link
-     	                              !  H5L_TYPE_ERROR _F    - Error
-    LOGICAL, INTENT(OUT) :: f_corder_valid ! Indicates whether the creation order data is valid for this attribute 
-    INTEGER, INTENT(OUT) :: corder         ! Is a positive integer containing the creation order of the attribute
-    INTEGER, INTENT(OUT) :: cset           ! Indicates the character set used for the attribute’s name
-    INTEGER(HADDR_T), INTENT(OUT) :: address  ! If the link is a hard link, address specifies the file address that the link points to
-    INTEGER(SIZE_T), INTENT(OUT) :: val_size  ! If the link is a symbolic link, val_size will be the length of the link value, e.g., 
-                                              ! the length of the name of the pointed-to object with a null terminator. 
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code:
-                                         ! 0 on success and -1 on failure
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id  ! Link access property list
-!*****
-    INTEGER :: corder_valid
-    INTEGER(SIZE_T)  :: group_namelen
-    INTEGER(HID_T) :: lapl_id_default
-
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5lget_info_by_idx_c(loc_id, group_name, group_namelen, index_field, order, n, &
-            link_type, corder_valid, corder, cset, address, val_size, lapl_id_default)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LGET_INFO_BY_IDX_C'::h5lget_info_by_idx_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: group_name
-         INTEGER(HID_T), INTENT(IN) :: loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: group_name
-         INTEGER(SIZE_T)  :: group_namelen
-         INTEGER, INTENT(IN) :: index_field
-         INTEGER, INTENT(IN) :: order
-         INTEGER(HSIZE_T), INTENT(IN) :: n
-         INTEGER, INTENT(OUT) :: link_type
-         INTEGER :: corder_valid 
-         INTEGER, INTENT(OUT) :: corder
-         INTEGER, INTENT(OUT) :: cset
-         INTEGER(HADDR_T), INTENT(OUT) :: address
-         INTEGER(SIZE_T), INTENT(OUT) :: val_size
-         INTEGER(HID_T) :: lapl_id_default
-       END FUNCTION h5lget_info_by_idx_c
-    END INTERFACE
-
-    group_namelen = LEN(group_name)
-
-    lapl_id_default = H5P_DEFAULT_F
-    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
-
-    hdferr = h5lget_info_by_idx_c(loc_id, group_name, group_namelen, index_field, order, n, &
-         link_type, corder_valid, corder, cset, address, val_size, lapl_id_default)
-
-    f_corder_valid =.FALSE.
-    IF (corder_valid .EQ. 1) f_corder_valid =.TRUE.
-
-  END SUBROUTINE h5lget_info_by_idx_f
-
-!
-!****s* H5L/h5lis_registered_f
-!
-! NAME
-!  h5lis_registered_f
-!
-! PURPOSE
-!  Determines whether a class of user-defined links is registered.
-!
-! INPUTS
-!  link_cls_id 	 - User-defined link class identifier
-!
-! OUTPUTS
-!  registered 	 - .TRUE.  - if the link class has been registered
-!                  .FALSE. - if it is unregistered
-!  hdferr 	 - Error code
-!  Success:  0
-!  Failure: -1
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  February 29, 2008
-!
-! SOURCE
-  SUBROUTINE h5lis_registered_f(link_cls_id, registered, hdferr)
-    IMPLICIT NONE
-    INTEGER, INTENT(IN) :: link_cls_id  ! User-defined link class identifier
-    LOGICAL, INTENT(OUT) :: registered  ! .TRUE. - if the link class has been registered and
-                                        ! .FALSE. - if it is unregistered
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code:
-                                        ! 0 on success and -1 on failure
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5lis_registered_c(link_cls_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LIS_REGISTERED_C'::h5lis_registered_c
-         !DEC$ENDIF
-         INTEGER, INTENT(IN) :: link_cls_id  ! User-defined link class identifier
-       END FUNCTION h5lis_registered_c
-    END INTERFACE
-
-    hdferr = h5lis_registered_c(link_cls_id)
-
-    IF(hdferr.GT.0)THEN
-       registered = .TRUE.
-    ELSE IF(hdferr.EQ.0)THEN
-       registered = .FALSE.
-    ENDIF
-
-  END SUBROUTINE h5lis_registered_f
-
-!
-!****s* H5L/h5lmove_f
-!
-! NAME
-!  h5lmove_f
-!
-! PURPOSE
-!  Renames a link within an HDF5 file.
-!
-! INPUTS
-!  src_loc_id 	 - Original file or group identifier.
-!  src_name 	 - Original link name.
-!  dest_loc_id 	 - Destination file or group identifier.
-!  dest_name 	 - NEW link name.
-!
-! OUTPUTS
-!  hdferr 	 - Error code:
-!                   0 on success and -1 on failure
-!
-! OPTIONAL PARAMETERS
-!  lcpl_id 	 - Link creation property list identifier to be associated WITH the NEW link.
-!  lapl_id 	 - Link access property list identifier to be associated WITH the NEW link.
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  March 3, 2008
-!
-! SOURCE
-  SUBROUTINE h5lmove_f(src_loc_id, src_name, dest_loc_id, dest_name, hdferr, lcpl_id, lapl_id)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: src_loc_id  ! Original file or group identifier.
-    CHARACTER(LEN=*), INTENT(IN) :: src_name  ! Original link name.
-    INTEGER(HID_T), INTENT(IN) :: dest_loc_id ! Destination file or group identifier.
-    CHARACTER(LEN=*), INTENT(IN) :: dest_name ! NEW link name.
-    INTEGER, INTENT(OUT) :: hdferr     ! Error code:
-                                              ! 0 on success and -1 on failure
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lcpl_id ! Link creation property list identifier
-                                                    ! to be associated WITH the NEW link.
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id ! Link access property list identifier
-                                                    ! to be associated WITH the NEW link.
-!*****
-    INTEGER(SIZE_T) :: src_namelen
-    INTEGER(SIZE_T) :: dest_namelen
-
-    INTEGER(HID_T) :: lcpl_id_default
-    INTEGER(HID_T) :: lapl_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5lmove_c(src_loc_id, src_name, src_namelen, dest_loc_id, &
-            dest_name, dest_namelen, lcpl_id_default, lapl_id_default)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LMOVE_C'::h5lmove_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: src_name, dest_name
-         INTEGER(HID_T), INTENT(IN) :: src_loc_id
-
-         CHARACTER(LEN=*), INTENT(IN) :: src_name
-         INTEGER(SIZE_T) :: src_namelen
-         INTEGER(HID_T), INTENT(IN) :: dest_loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: dest_name
-         INTEGER(SIZE_T) :: dest_namelen
-
-         INTEGER(HID_T) :: lcpl_id_default
-         INTEGER(HID_T) :: lapl_id_default
-
-       END FUNCTION h5lmove_c
-    END INTERFACE
-
-    lcpl_id_default = H5P_DEFAULT_F
-    IF(PRESENT(lcpl_id)) lcpl_id_default = lcpl_id
-    lapl_id_default = H5P_DEFAULT_F
-    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
-
-    src_namelen = LEN(src_name)
-    dest_namelen = LEN(dest_name)
-
-    hdferr = H5Lmove_c(src_loc_id, src_name, src_namelen, dest_loc_id, &
-         dest_name, dest_namelen, lcpl_id_default, lapl_id_default)
-
-  END SUBROUTINE h5lmove_f
-
-!
-!****s* H5L/h5lget_name_by_idx_f
-!
-! NAME
-!  h5lget_name_by_idx_f
-!
-! PURPOSE
-!  Retrieves name of the nth link in a group, according to the order within a specified field or index.
-!
-! INPUTS
-!  loc_id 	 - File or group identifier specifying location of subject group
-!  group_name 	 - Name of subject group
-!  index_field 	 - Index or field which determines the order
-!  order 	 - Order within field or index
-!  n 	         - Link for which to retrieve information
-!
-! OUTPUTS
-!  name 	 - Buffer in which link value is returned
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! OPTIONAL PARAMETERS
-!  lapl_id 	 - List access property list identifier.
-!  size 	 - Maximum number of characters of link value to be returned.
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  March 10, 2008
-!
-! SOURCE
-  SUBROUTINE h5lget_name_by_idx_f(loc_id, group_name, index_field, order, n, &
-        name, hdferr, size, lapl_id)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id       ! File or group identifier specifying location of subject group
-    CHARACTER(LEN=*), INTENT(IN) :: group_name ! Name of subject group
-    INTEGER, INTENT(IN) :: index_field  ! Index or field which determines the order
-                                        !    H5_INDEX_UNKNOWN_F   - Unknown index type
-                                        !    H5_INDEX_NAME_F      - Index on names
-                                        !    H5_INDEX_CRT_ORDER_F - Index on creation order
-                                        !    H5_INDEX_N_F	      - Number of indices defined
-    INTEGER, INTENT(IN) :: order        ! Order in which to iterate over index; Possible values are:
-                                        !    H5_ITER_UNKNOWN_F  - Unknown order
-                                        !    H5_ITER_INC_F      - Increasing order
-                                        !    H5_ITER_DEC_F      - Decreasing order
-                                        !    H5_ITER_NATIVE_F   - No particular order, whatever is fastest
-    INTEGER(HSIZE_T), INTENT(IN) :: n   ! Attribute’s position in index
-    CHARACTER(LEN=*), INTENT(OUT) :: name ! Buffer in which link value is returned
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code:
-                                          ! 0 on success and -1 on failure
-!*****
-    INTEGER(SIZE_T)  :: group_namelen
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id  ! Link access property list
-    INTEGER(HID_T) :: lapl_id_default
-    INTEGER(SIZE_T), OPTIONAL, INTENT(OUT) :: size   ! Indicates the size, in the number of characters, of the link
-    INTEGER(SIZE_T) :: size_default
-
-    INTERFACE
-       INTEGER FUNCTION h5lget_name_by_idx_c(loc_id, group_name, group_namelen, index_field, order, n, &
-             size_default, name, lapl_id_default)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LGET_NAME_BY_IDX_C'::h5lget_name_by_idx_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: group_name, name
-         INTEGER(HID_T), INTENT(IN) :: loc_id
-
-         CHARACTER(LEN=*), INTENT(IN) :: group_name
-         INTEGER(SIZE_T)  :: group_namelen
-         INTEGER, INTENT(IN) :: index_field
-         INTEGER, INTENT(IN) :: order
-         INTEGER(HSIZE_T), INTENT(IN) :: n
-         INTEGER(SIZE_T) :: size_default
-         CHARACTER(LEN=*), INTENT(OUT) :: name
-         INTEGER(HID_T) :: lapl_id_default
-       END FUNCTION h5lget_name_by_idx_c
-    END INTERFACE
-
-    group_namelen = LEN(group_name)
-
-    lapl_id_default = H5P_DEFAULT_F
-    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
-
-    size_default = LEN(name)
-
-    hdferr = h5lget_name_by_idx_c(loc_id, group_name, group_namelen, index_field, order, n, &
-             size_default, name, lapl_id_default)
-
-    IF(PRESENT(size)) size = size_default
-
-
-  END SUBROUTINE h5lget_name_by_idx_f
-
-
-!  HAS PROBLEM WITH void pointer in C
-!!$!
-!!$!****s* H5L/
-!!$!
-!!$! NAME
-!!$!		h5lget_val_by_idx_f
-!!$!
-!!$! PURPOSE
-!!$!      Returns the link value of a link, according to the order of
-!!$!               an index.  For symbolic links, this is the path to which the
-!!$!               link points, including the null terminator.  For user-defined
-!!$!               links, it is the link buffer.
-!!$! INPUTS
-!!$!   loc_id      - File or group identifier specifying location of subject group
-!!$!   group_name  - Name of subject group
-!!$!   index_field - Index or field which determines the order
-!!$!   order       - Order within field or index
-!!$!   n           - Link for which to retrieve information
-!!$!   size        - Maximum number of characters of link value to be returned.
-!!$!
-!!$! OUTPUTS  NOTE: In C these are defined as a structure: H5L_info_t
-!!$!    corder_valid   - indicates whether the creation order data is valid for this attribute
-!!$!    corder         - is a positive integer containing the creation order of the attribute
-!!$!    cset           - indicates the character set used for the attribute’s name
-!!$!    data_size      - indicates the size, in the number of characters, of the attribute
-!!$!    hdferr         - error code
-!!$!				 Success:  0
-!!$!				 Failure: -1
-!!$! OPTIONAL PARAMETERS
-!!$!    lapl_id      - List access property list identifier.
-!!$!
-!!$! AUTHOR
-!!$!	M. Scot Breitenfeld
-!!$!		March 3, 2008
-!!$!
-!!$! HISTORY  N/A
-!!$!
-!!$!
-!!$! SOURCE
-!!$  SUBROUTINE h5lget_val_by_idx_f(loc_id, group_name, index_field, order, n, &
-!!$       f_corder_valid, corder, cset, data_size, hdferr, lapl_id)
-!!$    IMPLICIT NONE
-!!$    INTEGER(HID_T), INTENT(IN) :: loc_id  ! File or group identifier specifying location of subject group
-!!$    CHARACTER(LEN=*), INTENT(IN) :: group_name ! Name of subject group
-!!$    INTEGER, INTENT(IN) :: index_field  ! Index or field which determines the order
-!!$                                        !    H5_INDEX_UNKNOWN_F   - Unknown index type
-!!$                                        !    H5_INDEX_NAME_F      - Index on names
-!!$                                        !    H5_INDEX_CRT_ORDER_F - Index on creation order
-!!$                                        !    H5_INDEX_N_F	      - Number of indices defined
-!!$    INTEGER, INTENT(IN) :: order        ! Order in which to iterate over index; Possible values are:
-!!$                                        !    H5_ITER_UNKNOWN_F  - Unknown order
-!!$                                        !    H5_ITER_INC_F      - Increasing order
-!!$                                        !    H5_ITER_DEC_F      - Decreasing order
-!!$                                        !    H5_ITER_NATIVE_F   - No particular order, whatever is fastest
-!!$    INTEGER(HSIZE_T), INTENT(IN) :: n   ! Attribute’s position in index
-!!$    LOGICAL, INTENT(OUT) :: f_corder_valid ! Indicates whether the creation order data is valid for this attribute
-!!$    INTEGER, INTENT(OUT) :: corder ! Is a positive integer containing the creation order of the attribute
-!!$    INTEGER, INTENT(OUT) :: cset ! Indicates the character set used for the attribute’s name
-!!$    INTEGER(HSIZE_T), INTENT(OUT) :: data_size   ! Indicates the size, in the number of characters, of the attribute
-!!$    INTEGER, INTENT(OUT) :: hdferr       ! Error code:
-!!$                                         ! 0 on success and -1 on failure
-!!$    INTEGER :: corder_valid
-!!$    INTEGER(SIZE_T)  :: group_namelen
-!!$    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id  ! Link access property list
-!!$    INTEGER(HID_T) :: lapl_id_default
-!!$
-!!$    INTERFACE
-!!$       INTEGER FUNCTION h5lget_val_by_idx_c(loc_id, group_name, group_namelen, index_field, order, n, &
-!!$            corder_valid, corder, cset, data_size, lapl_id_default)
-!!$         USE H5GLOBAL
-!!$         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-!!$         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LGET_VAL_BY_IDX_C'::h5lget_val_by_idx_c
-!!$         !DEC$ENDIF
-!!$         INTEGER(HID_T), INTENT(IN) :: loc_id
-!!$         CHARACTER(LEN=*), INTENT(IN) :: group_name
-!!$         INTEGER(SIZE_T)  :: group_namelen
-!!$         INTEGER, INTENT(IN) :: index_field
-!!$         INTEGER, INTENT(IN) :: order
-!!$         INTEGER(HSIZE_T), INTENT(IN) :: n
-!!$         INTEGER :: corder_valid
-!!$         INTEGER, INTENT(OUT) :: corder
-!!$         INTEGER, INTENT(OUT) :: cset
-!!$         INTEGER(HSIZE_T), INTENT(OUT) :: data_size
-!!$         INTEGER(HID_T) :: lapl_id_default
-!!$       END FUNCTION h5lget_val_by_idx_c
-!!$    END INTERFACE
-!!$
-!!$    group_namelen = LEN(group_name)
-!!$
-!!$    lapl_id_default = H5P_DEFAULT_F
-!!$    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
-!!$
-!!$    hdferr = h5lget_info_by_idx_c(loc_id, group_name, group_namelen, index_field, order, n, &
-!!$         corder_valid, corder, cset, data_size, lapl_id_default)
-!!$
-!!$    f_corder_valid =.FALSE.
-!!$    IF (corder_valid .EQ. 1) f_corder_valid =.TRUE.
-!!$
-!!$  END SUBROUTINE h5lget_val_by_idx_f
-
-!!$!
-!!$!****s* H5L/h5lget_val_f
-!!$!
-!!$! NAME
-!!$!		h5lget_val_f
-!!$!
-!!$! PURPOSE
-!!$!  	Returns the value of a symbolic link.
-!!$!
-!!$! INPUTS
-!!$!   link_loc_id  - File or group identifier.
-!!$!   link_name    - Link whose value is to be returned.
-!!$!   size         - Maximum number of characters of link value to be returned.
-!!$!
-!!$! OUTPUTS
-!!$!   linkval_buff - The buffer to hold the returned link value.
-!!$!         hdferr - error code
-!!$!				 Success:  0
-!!$!				 Failure: -1
-!!$! OPTIONAL PARAMETERS
-!!$!    lapl_id      - List access property list identifier.
-!!$!
-!!$! AUTHOR
-!!$!	M. Scot Breitenfeld
-!!$!	March 3, 2008
-!!$! SOURCE
-!!$  SUBROUTINE h5lget_val_f(link_loc_id, link_name, size, linkval_buff,   &
-!!$       hdferr, lapl_id)
-!!$    IMPLICIT NONE
-!!$    INTEGER(HID_T), INTENT(IN) :: link_loc_id  ! File or group identifier.
-!!$    CHARACTER(LEN=*), INTENT(IN) :: link_name  ! Link whose value is to be returned.
-!!$    INTEGER(SIZE_T), INTENT(IN) :: size        !  Maximum number of characters of link value to be returned.
-!!$
-!!$    CHARACTER(LEN=size), INTENT(OUT) :: linkval_buff ! The buffer to hold the returned link value.
-!!$    INTEGER, INTENT(OUT) :: hdferr       ! Error code:
-!!$    ! 0 on success and -1 on failure
-!!$    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id  ! Link access property list
-!!$
-!!$    INTEGER :: link_namelen
-!!$    INTEGER(HID_T) :: lapl_id_default
-!!$    INTEGER :: corder_valid
-!!$
-!!$    INTEGER :: link_namelen
-!!$    INTEGER(HID_T) :: lapl_id_default
-!!$
-!!$!  MS FORTRAN needs explicit interface for C functions called here.
-!!$!
-!!$    INTERFACE
-!!$       INTEGER FUNCTION h5lget_val_c(link_loc_id, link_name, link_namelen, size, linkval_buff, &
-!!$            lapl_id_default)
-!!$         USE H5GLOBAL
-!!$         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-!!$         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LGET_VAL_C'::h5lget_val_c
-!!$         !DEC$ENDIF
-!!$         INTEGER(HID_T), INTENT(IN) :: link_loc_id  ! File or group identifier.
-!!$         CHARACTER(LEN=*), INTENT(IN) :: link_name  ! Link whose value is to be returned.
-!!$         INTEGER :: link_namelen
-!!$         INTEGER(SIZE_T), INTENT(IN) :: size        !  Maximum number of characters of link value to be returned.
-!!$
-!!$         CHARACTER(LEN=size), INTENT(OUT) :: linkval_buff ! The buffer to hold the returned link value.
-!!$
-!!$         INTEGER :: link_namelen
-!!$         INTEGER(HID_T) :: lapl_id_default
-!!$
-!!$       END FUNCTION h5lget_val_c
-!!$    END INTERFACE
-!!$
-!!$    link_namelen = LEN(link_name)
-!!$
-!!$    lapl_id_default = H5P_DEFAULT_F
-!!$    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
-!!$
-!!$    hdferr = h5lget_val_c(link_loc_id, link_name, link_namelen, size, linkval_buff, &
-!!$         lapl_id_default)
-!!$
-!!$  END SUBROUTINE h5lget_val_f
-
-!!$!
-!!$!****s* H5L/H5Lregistered_f
-!!$!
-!!$! NAME
-!!$!	    H5Lregistered_f
-!!$!
-!!$! PURPOSE
-!!$!  Registers user-defined link class or changes behavior of existing class.
-!!$!
-!!$! INPUTS NOTE: In C the following represents struct H5L_class_t:
-!!$!     version      - Version number of this struct
-!!$!     class_id     - Link class identifier
-!!$!     comment      - Comment for debugging
-!!$!     create_func  - Callback during link creation
-!!$!     move_func    - Callback after moving link
-!!$!     copy_func    - Callback after copying link
-!!$!     trav_func    - The main traversal function
-!!$!     del_func     - Callback for link deletion
-!!$!     query_func   - Callback for queries
-!!$!
-!!$! OUTPUTS
-!!$!           hdferr - Error code
-!!$!		       Success:  0
-!!$!	               Failure: -1
-!!$! OPTIONAL PARAMETERS
-!!$!                      None
-!!$!
-!!$! AUTHOR
-!!$! M. Scot Breitenfeld
-!!$!	      February 29, 2008
-!!$!
-!!$! HISTORY  N/A
-!!$!
-!!$!
-!!$! SOURCE
-!!$  SUBROUTINE H5Lregistered_f(version, class_id, comment, create_func, &
-!!$       move_func, copy_func, trav_func, del_func, query_func, hdferr)
-!!$    IMPLICIT NONE
-!!$    INTEGER, INTENT(IN) :: version      ! Version number of this struct
-!!$    INTEGER, INTENT(IN) :: class_id     ! Link class identifier
-!!$    CHARACTER(LEN=*), INTENT(IN) :: comment      ! Comment for debugging
-!!$    CHARACTER(LEN=*), INTENT(IN) :: create_func  ! Callback during link creation
-!!$    CHARACTER(LEN=*), INTENT(IN) :: move_func    ! Callback after moving link
-!!$    CHARACTER(LEN=*), INTENT(IN) :: copy_func    ! Callback after copying link
-!!$    CHARACTER(LEN=*), INTENT(IN) :: trav_func    ! The main traversal function
-!!$    CHARACTER(LEN=*), INTENT(IN) :: del_func     ! Callback for link deletion
-!!$    CHARACTER(LEN=*), INTENT(IN) :: query_func   ! Callback for queries
-!!$    INTEGER, INTENT(OUT) :: hdferr      ! Error code:
-!!$                                        ! 0 on success and -1 on failure
-!!$    INTEGER :: comment_len
-!!$    INTEGER :: create_func_len
-!!$    INTEGER :: move_func_len
-!!$    INTEGER :: copy_func_len
-!!$    INTEGER :: trav_func_len
-!!$    INTEGER :: del_func_len
-!!$    INTEGER :: query_func_len
-!!$
-!!$    INTERFACE
-!!$       INTEGER FUNCTION H5Lregistered_c(version, class_id, comment, &
-!!$            create_func, create_func_len, &
-!!$            move_func, move_func_len, &
-!!$            copy_func, copy_func_len, &
-!!$            trav_func, trav_func_len, &
-!!$            del_func, del_func_len, &
-!!$            query_func,query_func_len)
-!!$         USE H5GLOBAL
-!!$         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-!!$         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LREGISTERED_C'::H5Lregistered_c
-!!$         !DEC$ENDIF
-!!$         INTEGER, INTENT(IN) :: version      ! Version number of this struct
-!!$         INTEGER, INTENT(IN) :: class_id     ! Link class identifier
-!!$         CHARACTER(LEN=*), INTENT(IN) :: comment      ! Comment for debugging
-!!$         CHARACTER(LEN=*), INTENT(IN) :: create_func  ! Callback during link creation
-!!$         CHARACTER(LEN=*), INTENT(IN) :: move_func    ! Callback after moving link
-!!$         CHARACTER(LEN=*), INTENT(IN) :: copy_func    ! Callback after copying link
-!!$         CHARACTER(LEN=*), INTENT(IN) :: trav_func    ! The main traversal function
-!!$         CHARACTER(LEN=*), INTENT(IN) :: del_func     ! Callback for link deletion
-!!$         CHARACTER(LEN=*), INTENT(IN) :: query_func   ! Callback for queries
-!!$         INTEGER, INTENT(OUT) :: hdferr   ! Error code:
-!!$                                          ! 0 on success and -1 on failure
-!!$         INTEGER :: comment_len
-!!$         INTEGER :: create_func_len
-!!$         INTEGER :: move_func_len
-!!$         INTEGER :: copy_func_len
-!!$         INTEGER :: trav_func_len
-!!$         INTEGER :: del_func_len
-!!$         INTEGER :: query_func_len
-!!$
-!!$       END FUNCTION H5Lregistered_c
-!!$    END INTERFACE
-!!$
-!!$    comment_len     = LEN(comment)
-!!$    create_func_len = LEN(create_func)
-!!$    move_func_len   = LEN(move_func)
-!!$    copy_func_len   = LEN(copy_func)
-!!$    trav_func_len   = LEN(trav_func)
-!!$    del_func_len    = LEN(del_func)
-!!$    query_func_len  = LEN(query_func)
-!!$
-!!$    hdferr = H5Lregistered_c(version, class_id, comment, &
-!!$         create_func, create_func_len, &
-!!$         move_func, move_func_len, &
-!!$         copy_func, copy_func_len, &
-!!$         trav_func, trav_func_len, &
-!!$         del_func, del_func_len, &
-!!$         query_func, query_func_len)
-!!$
-!!$  END SUBROUTINE H5Lregistered_f
-
-END MODULE H5L
diff --git a/fortran/src/H5Lff_F03.f90 b/fortran/src/H5Lff_F03.f90
deleted file mode 100644
index fa95717..0000000
--- a/fortran/src/H5Lff_F03.f90
+++ /dev/null
@@ -1,242 +0,0 @@
-!****h* ROBODoc/H5L (F03)
-!
-! NAME
-!  H5L_PROVISIONAL
-!
-! FILE
-!  src/fortran/src/H5Lff_F03.f90
-!
-! PURPOSE
-!
-!  This file contains Fortran 90 and Fortran 2003 interfaces for H5L functions.
-!  It contains the same functions as H5Lff_F90.f90 but includes the
-!  Fortran 2003 functions and the interface listings. This file will be compiled
-!  instead of H5Lff_F90.f90 if Fortran 2003 functions are enabled.
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! NOTES
-!                         *** IMPORTANT ***
-!  If you add a new H5A function you must add the function name to the
-!  Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
-!  This is needed for Windows based operating systems.
-!
-!*****
-
-MODULE H5L_PROVISIONAL
-
-  USE H5GLOBAL
-  USE ISO_C_BINDING
-
-  IMPLICIT NONE
-
-!****t* H5L (F03)/h5l_info_t
-!
-! Fortran2003 Derived Type:
-!
-  TYPE, bind(c) :: union_t
-     INTEGER(haddr_t) :: address
-     INTEGER(size_t)  :: val_size
-  END TYPE union_t
-
-  TYPE, bind(c) :: h5l_info_t
-     INTEGER(c_int) :: type ! H5L_type_t     type
-!       LOGICAL(c_bool) :: corder_valid ! hbool_t        corder_valid
-     INTEGER(c_int64_t) :: corder ! int64_t        corder;
-     INTEGER(c_int) :: cset ! H5T_cset_t     cset;
-     TYPE(union_t) :: u
-  END TYPE h5l_info_t
-
-!*****
-
-!type specifies the link class. Valid values include the following:
-!     	H5L_TYPE_HARD 	Hard link
-!     	H5L_TYPE_SOFT 	Soft link
-!     	H5L_TYPE_EXTERNAL     	External link
-!     	H5L_TYPE_ERROR 	Error 
-!cset specifies the character set in which the link name is encoded. Valid values include the following:
-!     	H5T_CSET_ASCII 	US ASCII
-!     	H5T_CSET_UTF8     	UTF-8 Unicode encoding 
-
-CONTAINS
-
-!****s* H5L (F03)/h5literate_f
-!
-! NAME
-!  h5literate_f
-!
-! PURPOSE
-!  Iterates through links in a group.
-!
-! Inputs:
-!  group_id   - Identifier specifying subject group
-!  index_type - Type of index which determines the order:
-!                H5_INDEX_NAME_F      - Alpha-numeric index on name
-!                H5_INDEX_CRT_ORDER_F - Index on creation order
-!  order      - Order within index:
-!                H5_ITER_INC_F    - Increasing order
-!                H5_ITER_DEC_F    - Decreasing order
-!                H5_ITER_NATIVE_F - Fastest available order
-!  idx 	      - IN: Iteration position at which to start
-!  op 	      - Callback function passing data regarding the link to the calling application
-!  op_data    - User-defined pointer to data required by the application for its processing of the link
-!
-! Outputs:
-!  idx 	        - OUT: Position at which an interrupted iteration may be restarted
-!  return_value - Success: The return value of the first operator that
-! 			   returns non-zero, or zero if all members were
-! 			   processed with no operator returning non-zero.
-!
-! 		  Failure: Negative if something goes wrong within the
-! 			   library, or the negative value returned by one
-! 			   of the operators.
-!
-!  hdferr     - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  July 8, 2008
-!
-! Fortran2003 Interface:
-  SUBROUTINE h5literate_f(group_id, index_type, order, idx, op, op_data, return_value, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T)  , INTENT(IN)    :: group_id
-    INTEGER         , INTENT(IN)    :: index_type
-    INTEGER         , INTENT(IN)    :: order
-    INTEGER(HSIZE_T), INTENT(INOUT) :: idx
-    TYPE(C_FUNPTR)  , INTENT(IN)    :: op
-    TYPE(C_PTR)     , INTENT(IN)    :: op_data
-    INTEGER         , INTENT(OUT)   :: return_value
-    INTEGER         , INTENT(OUT)   :: hdferr
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5literate_c(group_id, index_type, order, idx, op, op_data) &
-            BIND(C, NAME='h5literate_c')
-         USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_ptr, c_funptr
-         USE H5GLOBAL
-         INTEGER(HID_T), INTENT(IN) :: group_id
-         INTEGER, INTENT(IN) :: index_type
-         INTEGER, INTENT(IN) :: order
-         INTEGER(HSIZE_T), INTENT(INOUT) :: idx
-         TYPE(C_FUNPTR), VALUE :: op
-         TYPE(C_PTR), VALUE :: op_data
-       END FUNCTION h5literate_c
-    END INTERFACE
-
-    return_value = h5literate_c(group_id, index_type, order, idx, op, op_data)
-
-    IF(return_value.GE.0)THEN
-       hdferr = 0
-    ELSE
-       hdferr = -1
-    END IF
-
-  END SUBROUTINE h5literate_f
-
-!****s* H5L (F03)/h5literate_by_name_f
-!
-! NAME
-!  h5literate_by_name_f
-!
-! PURPOSE
-!  Iterates through links in a group.
-!
-! Inputs:
-!  loc_id     - File or group identifier specifying location of subject group
-!  group_name - Name of subject group
-!  index_type - Type of index which determines the order:
-!                H5_INDEX_NAME_F      - Alpha-numeric index on name
-!                H5_INDEX_CRT_ORDER_F - Index on creation order
-!  order      - Order within index:
-!                H5_ITER_INC_F    - Increasing order
-!                H5_ITER_DEC_F    - Decreasing order
-!                H5_ITER_NATIVE_F - Fastest available order
-!  idx 	      - IN: Iteration position at which to start
-!  op 	      - Callback function passing data regarding the link to the calling application
-!  op_data    - User-defined pointer to data required by the application for its processing of the link
-!
-! Outputs:
-!  idx 	        - OUT: Position at which an interrupted iteration may be restarted
-!  return_value - Success: The return value of the first operator that
-! 			   returns non-zero, or zero if all members were
-! 			   processed with no operator returning non-zero.
-!
-! 		  Failure: Negative if something goes wrong within the
-! 			   library, or the negative value returned by one
-! 			   of the operators.
-!
-!  hdferr        - Returns 0 if successful and -1 if fails
-!
-! Optional parameters:
-!  lapl_id    - Link access property list
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  Augest 18, 2008
-!
-! Fortran2003 Interface:
-  SUBROUTINE h5literate_by_name_f(loc_id, group_name, index_type, order, &
-       idx, op, op_data, return_value, hdferr, lapl_id)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T)  , INTENT(IN)           :: loc_id
-    CHARACTER(LEN=*), INTENT(IN)           :: group_name 
-    INTEGER         , INTENT(IN)           :: index_type
-    INTEGER         , INTENT(IN)           :: order
-    INTEGER(HSIZE_T), INTENT(INOUT)        :: idx
-    TYPE(C_FUNPTR)  , INTENT(IN)           :: op  
-    TYPE(C_PTR)     , INTENT(IN)           :: op_data
-    INTEGER         , INTENT(OUT)          :: return_value
-    INTEGER         , INTENT(OUT)          :: hdferr
-    INTEGER(HID_T)  , INTENT(IN), OPTIONAL :: lapl_id
-!*****
-    INTEGER(HID_T) :: lapl_id_default
-    INTEGER(SIZE_T) :: namelen
-
-    INTERFACE
-       INTEGER FUNCTION h5literate_by_name_c(loc_id, name, namelen, index_type, order,&
-            idx, op, op_data, lapl_id_default) BIND(C, NAME='h5literate_by_name_c')
-         USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_char, c_ptr, c_funptr
-         USE H5GLOBAL
-         INTEGER(HID_T)  , INTENT(IN) :: loc_id
-         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
-         INTEGER(SIZE_T) , INTENT(IN) :: namelen
-         INTEGER         , INTENT(IN) :: index_type
-         INTEGER         , INTENT(IN) :: order
-         INTEGER(HSIZE_T), INTENT(INOUT) :: idx
-         TYPE(C_FUNPTR), VALUE :: op
-         TYPE(C_PTR), VALUE :: op_data
-         INTEGER(HID_T)  , INTENT(IN) :: lapl_id_default
-       END FUNCTION
-    END INTERFACE
-
-    namelen  = LEN(group_name)
-    lapl_id_default = H5P_DEFAULT_F
-    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
-
-    return_value = h5literate_by_name_c(loc_id, group_name, namelen, index_type, order, idx, op, op_data, lapl_id_default)
-
-    IF(return_value.GE.0)THEN
-       hdferr = 0
-    ELSE
-       hdferr = -1
-    END IF
-
-  END SUBROUTINE h5literate_by_name_f
-
-END MODULE H5L_PROVISIONAL
diff --git a/fortran/src/H5Lff_F90.f90 b/fortran/src/H5Lff_F90.f90
deleted file mode 100644
index dd62b7b..0000000
--- a/fortran/src/H5Lff_F90.f90
+++ /dev/null
@@ -1,39 +0,0 @@
-!****h* ROBODoc/H5L (F90)
-!
-! NAME
-!  MODULE H5L_PROVISIONAL
-!
-! PURPOSE
-!  This file contains Fortran 90 interfaces for H5L functions. It contains
-!  the same functions as H5Lff_F03.f90 but excludes the Fortran 2003 functions
-!  and the interface listings. This file will be compiled instead of H5Lff_F03.f90
-!  if Fortran 2003 functions are not enabled.
-!
-! NOTE
-!  Currently contains no functions.
-!
-! COPYRIGHT
-!  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!  Copyright by The HDF Group.                                               *
-!  Copyright by the Board of Trustees of the University of Illinois.         *
-!  All rights reserved.                                                      *
-!  *
-!  This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!  terms governing use, modification, and redistribution, is contained in    *
-!  the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!  of the source code distribution tree; Copyright.html can be found at the  *
-!  root level of an installed copy of the electronic HDF5 document set and   *
-!  is linked from the top-level documents page.  It can also be found at     *
-!  http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!  access to either file, you may request a copy from help@hdfgroup.org.     *
-!  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-!                         *** IMPORTANT ***
-!  If you add a new H5D function you must add the function name to the
-!  Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
-!  This is needed for Windows based operating systems.
-!*****
-
-MODULE H5L_PROVISIONAL
-
-END MODULE H5L_PROVISIONAL
diff --git a/fortran/src/H5Of.c b/fortran/src/H5Of.c
index ae344a5..019699e 100644
--- a/fortran/src/H5Of.c
+++ b/fortran/src/H5Of.c
@@ -1,106 +1,90 @@
 /****h* H5Of/H5Of
  * PURPOSE
- *   This file contains C stubs for H5O Fortran APIs
+ *  This file contains C stubs for H5O Fortran APIs
  *
  * COPYRIGHT
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  ******
-*/
+ */
 
 #include "H5f90.h"
 #include "H5Eprivate.h"
-int_f
-fill_h5o_info_t_f(H5O_info_t Oinfo, H5O_info_t_f *object_info);
+int_f fill_h5o_info_t_f(H5O_info2_t Oinfo, H5O_info_t_f *object_info);
 
 int_f
-fill_h5o_info_t_f(H5O_info_t Oinfo, H5O_info_t_f *object_info) {
-
-  struct tm *ts;
-
-  object_info->fileno    = Oinfo.fileno;
-  object_info->addr      = (haddr_t_f)Oinfo.addr;
- 
-  object_info->type      = (int_f)Oinfo.type;
-  object_info->rc        = (int_f)Oinfo.rc;
-
-  ts = HDgmtime(&Oinfo.atime);
-
-  object_info->atime[0]     = (int_f)ts->tm_year+1900; /* year starts at 1900 */
-  object_info->atime[1]     = (int_f)ts->tm_mon+1; /* month starts at 0 in C */
-  object_info->atime[2]     = (int_f)ts->tm_mday;
-  object_info->atime[3]     = 0; /* time is expressed as UTC (or GMT timezone) */
-  object_info->atime[4]     = (int_f)ts->tm_hour;
-  object_info->atime[5]     = (int_f)ts->tm_min;
-  object_info->atime[6]     = (int_f)ts->tm_sec;
-  object_info->atime[7]     = -32767; /* millisecond is not available, assign it -HUGE(0) */
-
-  ts = HDgmtime(&Oinfo.btime);
-
-  object_info->btime[0]     = (int_f)ts->tm_year+1900; /* year starts at 1900 */
-  object_info->btime[1]     = (int_f)ts->tm_mon+1; /* month starts at 0 in C */
-  object_info->btime[2]     = (int_f)ts->tm_mday;
-  object_info->btime[3]     = 0; /* time is expressed as UTC (or GMT timezone) */
-  object_info->btime[4]     = (int_f)ts->tm_hour;
-  object_info->btime[5]     = (int_f)ts->tm_min;
-  object_info->btime[6]     = (int_f)ts->tm_sec;
-  object_info->btime[7]     = -32767; /* millisecond is not available, assign it -HUGE(0) */
-
-  ts = HDgmtime(&Oinfo.ctime);
-
-  object_info->ctime[0]     = (int_f)ts->tm_year+1900; /* year starts at 1900 */
-  object_info->ctime[1]     = (int_f)ts->tm_mon+1; /* month starts at 0 in C */
-  object_info->ctime[2]     = (int_f)ts->tm_mday;
-  object_info->ctime[3]     = 0; /* time is expressed as UTC (or GMT timezone) */
-  object_info->ctime[4]     = (int_f)ts->tm_hour;
-  object_info->ctime[5]     = (int_f)ts->tm_min;
-  object_info->ctime[6]     = (int_f)ts->tm_sec;
-  object_info->ctime[7]     = -32767; /* millisecond is not available, assign it -HUGE(0) */
-
-  ts = HDgmtime(&Oinfo.mtime);
-
-  object_info->mtime[0]     = (int_f)ts->tm_year+1900; /* year starts at 1900 */
-  object_info->mtime[1]     = (int_f)ts->tm_mon+1; /* month starts at 0 in C */
-  object_info->mtime[2]     = (int_f)ts->tm_mday;
-  object_info->mtime[3]     = 0; /* time is expressed as UTC (or GMT timezone) */
-  object_info->mtime[4]     = (int_f)ts->tm_hour;
-  object_info->mtime[5]     = (int_f)ts->tm_min;
-  object_info->mtime[6]     = (int_f)ts->tm_sec;
-  object_info->mtime[7]     = -32767; /* millisecond is not available, assign it -HUGE(0) */
-
-  object_info->num_attrs = (hsize_t_f)Oinfo.num_attrs;
-
-  object_info->hdr.version = (int_f)Oinfo.hdr.version;
-  object_info->hdr.nmesgs  = (int_f)Oinfo.hdr.nmesgs;
-  object_info->hdr.nchunks = (int_f)Oinfo.hdr.nchunks;
-  object_info->hdr.flags   = (int_f)Oinfo.hdr.flags;
-
-  object_info->hdr.space.total = (hsize_t_f)Oinfo.hdr.space.total;
-  object_info->hdr.space.meta  = (hsize_t_f)Oinfo.hdr.space.meta;
-  object_info->hdr.space.mesg  = (hsize_t_f)Oinfo.hdr.space.mesg;
-  object_info->hdr.space.free  = (hsize_t_f)Oinfo.hdr.space.free;
-
-  object_info->hdr.mesg.present = Oinfo.hdr.mesg.present;
-  object_info->hdr.mesg.shared  = Oinfo.hdr.mesg.shared;
-
-  object_info->meta_size.obj.index_size = (hsize_t_f)Oinfo.meta_size.obj.index_size;
-  object_info->meta_size.obj.heap_size  = (hsize_t_f)Oinfo.meta_size.obj.heap_size;
-
-  return 0;
+fill_h5o_info_t_f(H5O_info2_t Oinfo, H5O_info_t_f *object_info)
+{
 
+    /* This function does not used the field parameter because we want
+     * this function to fill the unfilled fields with C's default values.
+     */
+
+    struct tm *ts;
+
+    object_info->fileno = Oinfo.fileno;
+    object_info->token  = Oinfo.token;
+
+    object_info->type = (int_f)Oinfo.type;
+    object_info->rc   = (int_f)Oinfo.rc;
+
+    ts = HDgmtime(&Oinfo.atime);
+
+    object_info->atime[0] = (int_f)ts->tm_year + 1900; /* year starts at 1900 */
+    object_info->atime[1] = (int_f)ts->tm_mon + 1;     /* month starts at 0 in C */
+    object_info->atime[2] = (int_f)ts->tm_mday;
+    object_info->atime[3] = 0; /* time is expressed as UTC (or GMT timezone) */
+    object_info->atime[4] = (int_f)ts->tm_hour;
+    object_info->atime[5] = (int_f)ts->tm_min;
+    object_info->atime[6] = (int_f)ts->tm_sec;
+    object_info->atime[7] = -32767; /* millisecond is not available, assign it -HUGE(0) */
+
+    ts = HDgmtime(&Oinfo.btime);
+
+    object_info->btime[0] = (int_f)ts->tm_year + 1900; /* year starts at 1900 */
+    object_info->btime[1] = (int_f)ts->tm_mon + 1;     /* month starts at 0 in C */
+    object_info->btime[2] = (int_f)ts->tm_mday;
+    object_info->btime[3] = 0; /* time is expressed as UTC (or GMT timezone) */
+    object_info->btime[4] = (int_f)ts->tm_hour;
+    object_info->btime[5] = (int_f)ts->tm_min;
+    object_info->btime[6] = (int_f)ts->tm_sec;
+    object_info->btime[7] = -32767; /* millisecond is not available, assign it -HUGE(0) */
+
+    ts = HDgmtime(&Oinfo.ctime);
+
+    object_info->ctime[0] = (int_f)ts->tm_year + 1900; /* year starts at 1900 */
+    object_info->ctime[1] = (int_f)ts->tm_mon + 1;     /* month starts at 0 in C */
+    object_info->ctime[2] = (int_f)ts->tm_mday;
+    object_info->ctime[3] = 0; /* time is expressed as UTC (or GMT timezone) */
+    object_info->ctime[4] = (int_f)ts->tm_hour;
+    object_info->ctime[5] = (int_f)ts->tm_min;
+    object_info->ctime[6] = (int_f)ts->tm_sec;
+    object_info->ctime[7] = -32767; /* millisecond is not available, assign it -HUGE(0) */
+
+    ts = HDgmtime(&Oinfo.mtime);
+
+    object_info->mtime[0] = (int_f)ts->tm_year + 1900; /* year starts at 1900 */
+    object_info->mtime[1] = (int_f)ts->tm_mon + 1;     /* month starts at 0 in C */
+    object_info->mtime[2] = (int_f)ts->tm_mday;
+    object_info->mtime[3] = 0; /* time is expressed as UTC (or GMT timezone) */
+    object_info->mtime[4] = (int_f)ts->tm_hour;
+    object_info->mtime[5] = (int_f)ts->tm_min;
+    object_info->mtime[6] = (int_f)ts->tm_sec;
+    object_info->mtime[7] = -32767; /* millisecond is not available, assign it -HUGE(0) */
+
+    object_info->num_attrs = (hsize_t_f)Oinfo.num_attrs;
+
+    return 0;
 }
 
 /****if* H5Of/h5olink_c
@@ -109,44 +93,43 @@ fill_h5o_info_t_f(H5O_info_t Oinfo, H5O_info_t_f *object_info) {
  * PURPOSE
  *  Calls H5Olink
  * INPUTS
- *      object_id        - Object to be linked.
- *      new_loc_id       - File or group identifier specifying location at which object is to be linked.
- *      name             - Name of link to be created, relative to new_loc_id.
- *      namelen          - Length of buffer for link to be created.
- *      lcpl_id          - Link creation property list identifier.
- *      lapl_id          - Link access property list identifier.
+ *  object_id        - Object to be linked.
+ *  new_loc_id       - File or group identifier specifying location at which object is to be linked.
+ *  name             - Name of link to be created, relative to new_loc_id.
+ *  namelen          - Length of buffer for link to be created.
+ *  lcpl_id          - Link creation property list identifier.
+ *  lapl_id          - Link access property list identifier.
  * RETURNS
  *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
  *  April 21, 2008
  * SOURCE
-*/
+ */
 int_f
-nh5olink_c (hid_t_f *object_id, hid_t_f *new_loc_id, _fcd name, size_t_f *namelen,
-            hid_t_f *lcpl_id, hid_t_f *lapl_id)
+h5olink_c(hid_t_f *object_id, hid_t_f *new_loc_id, _fcd name, size_t_f *namelen, hid_t_f *lcpl_id,
+          hid_t_f *lapl_id)
 /******/
 {
-  char *c_name = NULL;          /* Buffer to hold C string */
-  int_f ret_value = 0;          /* Return value */
-
-  /*
-   * Convert FORTRAN name to C name
-   */
-  if( (c_name = HD5f2cstring(name, (size_t)*namelen)) == NULL)
-    HGOTO_DONE(FAIL);
-
-  /*
-   * Call H5Olink function.
-   */
-  if((hid_t_f)H5Olink((hid_t)*object_id, (hid_t)*new_loc_id, c_name,
-		       (hid_t)*lcpl_id, (hid_t)*lapl_id) < 0)
-    HGOTO_DONE(FAIL);
-
- done:
-  if(c_name)
-    HDfree(c_name);
-  return ret_value;
+    char *c_name    = NULL; /* Buffer to hold C string */
+    int_f ret_value = 0;    /* Return value */
+
+    /*
+     * Convert FORTRAN name to C name
+     */
+    if ((c_name = HD5f2cstring(name, (size_t)*namelen)) == NULL)
+        HGOTO_DONE(FAIL);
+
+    /*
+     * Call H5Olink function.
+     */
+    if ((hid_t_f)H5Olink((hid_t)*object_id, (hid_t)*new_loc_id, c_name, (hid_t)*lcpl_id, (hid_t)*lapl_id) < 0)
+        HGOTO_DONE(FAIL);
+
+done:
+    if (c_name)
+        HDfree(c_name);
+    return ret_value;
 }
 
 /****if* H5Of/h5oopen_c
@@ -167,56 +150,56 @@ nh5olink_c (hid_t_f *object_id, hid_t_f *new_loc_id, _fcd name, size_t_f *namele
  *  M. Scot Breitenfeld
  *  April 18, 2008
  * SOURCE
-*/
+ */
 int_f
-nh5oopen_c (hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *lapl_id, hid_t_f *obj_id)
+h5oopen_c(hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *lapl_id, hid_t_f *obj_id)
 /******/
 {
-  char *c_name = NULL;          /* Buffer to hold C string */
-  int_f ret_value = 0;          /* Return value */
-
-  /*
-   * Convert FORTRAN name to C name
-   */
-  if((c_name = HD5f2cstring(name, (size_t)*namelen)) == NULL)
-    HGOTO_DONE(FAIL);
-
-  /*
-   * Call H5Oopen function.
-   */
-  if((*obj_id = (hid_t_f)H5Oopen((hid_t)*loc_id, c_name, (hid_t)*lapl_id)) < 0)
-    HGOTO_DONE(FAIL);
-
- done:
-  if(c_name)
-    HDfree(c_name);
-  return ret_value;
+    char *c_name    = NULL; /* Buffer to hold C string */
+    int_f ret_value = 0;    /* Return value */
+
+    /*
+     * Convert FORTRAN name to C name
+     */
+    if ((c_name = HD5f2cstring(name, (size_t)*namelen)) == NULL)
+        HGOTO_DONE(FAIL);
+
+    /*
+     * Call H5Oopen function.
+     */
+    if ((*obj_id = (hid_t_f)H5Oopen((hid_t)*loc_id, c_name, (hid_t)*lapl_id)) < 0)
+        HGOTO_DONE(FAIL);
+
+done:
+    if (c_name)
+        HDfree(c_name);
+    return ret_value;
 }
 /****if* H5Of/h5oclose_c
  * NAME
- *   h5oclose_c
+ *  h5oclose_c
  * PURPOSE
- *   Call H5Oclose
+ *  Call H5Oclose
  * INPUTS
- *   object_id   - Object identifier  
+ *  object_id   - Object identifier
  * RETURNS
- *   0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *   M. Scot Breitenfeld
- *   December 17, 2008
+ *  December 17, 2008
  * SOURCE
-*/
+ */
 int_f
-nh5oclose_c ( hid_t_f *object_id )
+h5oclose_c(hid_t_f *object_id)
 /******/
 {
-  int_f ret_value=0;          /* Return value */
-  
-  if (H5Oclose((hid_t)*object_id) < 0)
-    HGOTO_DONE(FAIL);
-  
- done:
-  return ret_value;
+    int_f ret_value = 0; /* Return value */
+
+    if (H5Oclose((hid_t)*object_id) < 0)
+        HGOTO_DONE(FAIL);
+
+done:
+    return ret_value;
 }
 
 /****if* H5Of/h5ovisit_c
@@ -225,15 +208,16 @@ nh5oclose_c ( hid_t_f *object_id )
  * PURPOSE
  *  Calls H5Ovisit
  * INPUTS
- *    object_id - Identifier specifying subject group
- *   index_type - Type of index which determines the order
- *        order - Order within index
- *          idx - Iteration position at which to start
- *           op - Callback function passing data regarding the link to the calling application
- *      op_data - User-defined pointer to data required by the application for its processing of the link
+ *  object_id - Identifier specifying subject group
+ *  index_type - Type of index which determines the order
+ *  order - Order within index
+ *  idx - Iteration position at which to start
+ *  op - Callback function passing data regarding the link to the calling application
+ *  op_data - User-defined pointer to data required by the application for its processing of the link
+ *  fields - Flags specifying the fields to include in object_info.
  *
  * OUTPUTS
- *          idx - Position at which an interrupted iteration may be restarted
+ *  idx - Position at which an interrupted iteration may be restarted
  *
  * RETURNS
  *     >0 on success, 0< on failure
@@ -241,57 +225,60 @@ nh5oclose_c ( hid_t_f *object_id )
  *  M. Scot Breitenfeld
  *  November 19, 2008
  * SOURCE
-*/
+ */
 int_f
-h5ovisit_c(hid_t_f *group_id, int_f *index_type, int_f *order, H5O_iterate_t op, void *op_data )
+h5ovisit_c(hid_t_f *group_id, int_f *index_type, int_f *order, H5O_iterate2_t op, void *op_data,
+           int_f *fields)
 /******/
 {
-  int_f ret_value = -1;       /* Return value */
-  herr_t func_ret_value; /* H5Linterate return value */
+    int_f  ret_value = -1; /* Return value */
+    herr_t func_ret_value; /* H5Linterate return value */
+
+    /*
+     * Call H5Ovisit
+     */
 
-  /*
-   * Call H5Ovisit
-   */
-  func_ret_value = H5Ovisit( (hid_t)*group_id, (H5_index_t)*index_type, (H5_iter_order_t)*order, op, op_data);
+    func_ret_value = H5Ovisit3((hid_t)*group_id, (H5_index_t)*index_type, (H5_iter_order_t)*order, op,
+                               op_data, (unsigned)*fields);
 
-  ret_value = (int_f)func_ret_value;
+    ret_value = (int_f)func_ret_value;
 
-  return ret_value;
+    return ret_value;
 }
 
-/****if* H5Of/h5oopen_by_addr_c
+/****if* H5Of/h5oopen_by_token_c
  * NAME
- *  h5oopen_by_addr_c
+ *  h5oopen_by_token_c
  * PURPOSE
- *  Calls H5open_by_addr
+ *  Calls H5open_by_token
  * INPUTS
- *  loc_id  - File or group identifier
- *    addr  - Object’s address in the file
+ *  loc_id - File or group identifier
+ *  token  - Object’s token in the file
  *
  * OUTPUTS
- *  obj_id  - Dataset identifier      
+ *  obj_id  - Object identifier
  *
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
  *  September 14, 2009
  * SOURCE
-*/
+ */
 int_f
-nh5oopen_by_addr_c (hid_t_f *loc_id, haddr_t_f *addr, hid_t_f *obj_id)
+h5oopen_by_token_c(hid_t_f *loc_id, H5O_token_t *token, hid_t_f *obj_id)
 /******/
 {
-  int_f ret_value = 0;          /* Return value */
+    int_f ret_value = 0; /* Return value */
 
-  /*
-   * Call H5Oopen_by_address function.
-   */
-  if((*obj_id = (hid_t_f)H5Oopen_by_addr((hid_t)*loc_id, (haddr_t)*addr)) < 0)
-    HGOTO_DONE(FAIL);
+    /*
+     * Call H5Oopen_by_token function.
+     */
+    if ((*obj_id = (hid_t_f)H5Oopen_by_token((hid_t)*loc_id, *token)) < 0)
+        HGOTO_DONE(FAIL);
 
- done:
-  return ret_value;
+done:
+    return ret_value;
 }
 
 /****if* H5Of/H5Oget_info_by_name_c
@@ -304,6 +291,7 @@ nh5oopen_by_addr_c (hid_t_f *loc_id, haddr_t_f *addr, hid_t_f *obj_id)
  *  name         - Name of group, relative to loc_id.
  *  namelen      - Name length.
  *  lapl_id      - Link access property list.
+ *  fields       - Flags specifying the fields to include in object_info.
  * OUTPUTS
  *  object_info  - Buffer in which to return object information.
  *
@@ -313,35 +301,34 @@ nh5oopen_by_addr_c (hid_t_f *loc_id, haddr_t_f *addr, hid_t_f *obj_id)
  *  M. Scot Breitenfeld
  *  December 1, 2008
  * SOURCE
-*/
+ */
 int_f
-h5oget_info_by_name_c (hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *lapl_id,
-			H5O_info_t_f *object_info)
+h5oget_info_by_name_c(hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *lapl_id,
+                      H5O_info_t_f *object_info, int_f *fields)
 /******/
 {
-  char *c_name = NULL;          /* Buffer to hold C string */
-  int_f ret_value = 0;          /* Return value */
-  H5O_info_t Oinfo;
-  
-  /*
-   * Convert FORTRAN name to C name
-   */
-  if((c_name = HD5f2cstring(name, (size_t)*namelen)) == NULL)
-    HGOTO_DONE(FAIL);
-
-  /*
-   * Call H5Oinfo_by_name function.
-   */
-  if(H5Oget_info_by_name((hid_t)*loc_id, c_name,
-			 &Oinfo, (hid_t)*lapl_id) < 0)
-    HGOTO_DONE(FAIL);
-
-  ret_value = fill_h5o_info_t_f(Oinfo,object_info);
-
- done:
-  if(c_name)
-    HDfree(c_name);
-  return ret_value;
+    char       *c_name    = NULL; /* Buffer to hold C string */
+    int_f       ret_value = 0;    /* Return value */
+    H5O_info2_t Oinfo;
+
+    /*
+     * Convert FORTRAN name to C name
+     */
+    if ((c_name = HD5f2cstring(name, (size_t)*namelen)) == NULL)
+        HGOTO_DONE(FAIL);
+
+    /*
+     * Call H5Oinfo_by_name function.
+     */
+    if (H5Oget_info_by_name3((hid_t)*loc_id, c_name, &Oinfo, (unsigned)*fields, (hid_t)*lapl_id) < 0)
+        HGOTO_DONE(FAIL);
+
+    ret_value = fill_h5o_info_t_f(Oinfo, object_info);
+
+done:
+    if (c_name)
+        HDfree(c_name);
+    return ret_value;
 }
 
 /****if* H5Of/H5Oget_info_by_idx_c
@@ -356,6 +343,7 @@ h5oget_info_by_name_c (hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *l
  *  lapl_id      - Link access property list.
  * OUTPUTS
  *  object_info  - Buffer in which to return object information.
+ *  fields       - Flags specifying the fields to include in object_info.
  *
  * RETURNS
  *  0 on success, -1 on failure
@@ -363,40 +351,40 @@ h5oget_info_by_name_c (hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *l
  *  M. Scot Breitenfeld
  *  December 1, 2008
  * SOURCE
-*/
+ */
 int_f
-h5oget_info_by_idx_c (hid_t_f *loc_id, _fcd  group_name, size_t_f *namelen, 
-		       int_f *index_field, int_f *order, hsize_t_f *n, hid_t_f *lapl_id, H5O_info_t_f *object_info)
+h5oget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *namelen, int_f *index_field, int_f *order,
+                     hsize_t_f *n, hid_t_f *lapl_id, H5O_info_t_f *object_info, int_f *fields)
 /******/
 {
-  char *c_group_name = NULL;     /* Buffer to hold C string */
-  int_f ret_value = 0;          /* Return value */
-  H5O_info_t Oinfo;
-  H5_index_t c_index_field;
-  H5_iter_order_t c_order;
-  
-  /*
-   * Convert FORTRAN name to C name
-   */
-  if((c_group_name = HD5f2cstring( group_name, (size_t)*namelen)) == NULL)
-    HGOTO_DONE(FAIL);
-
-  c_index_field = (H5_index_t)*index_field;
-  c_order = (H5_iter_order_t)*order;
-
-  /*
-   * Call H5Oinfo_by_idx function.
-   */
-  if(H5Oget_info_by_idx((hid_t)*loc_id, c_group_name, c_index_field, c_order, (hsize_t)*n,
-			 &Oinfo, (hid_t)*lapl_id) < 0)
-    HGOTO_DONE(FAIL);
-
-  ret_value = fill_h5o_info_t_f(Oinfo,object_info);
-
- done:
-  if(c_group_name)
-    HDfree(c_group_name);
-  return ret_value;
+    char           *c_group_name = NULL; /* Buffer to hold C string */
+    int_f           ret_value    = 0;    /* Return value */
+    H5O_info2_t     Oinfo;
+    H5_index_t      c_index_field;
+    H5_iter_order_t c_order;
+
+    /*
+     * Convert FORTRAN name to C name
+     */
+    if ((c_group_name = HD5f2cstring(group_name, (size_t)*namelen)) == NULL)
+        HGOTO_DONE(FAIL);
+
+    c_index_field = (H5_index_t)*index_field;
+    c_order       = (H5_iter_order_t)*order;
+
+    /*
+     * Call H5Oinfo_by_idx function.
+     */
+    if (H5Oget_info_by_idx3((hid_t)*loc_id, c_group_name, c_index_field, c_order, (hsize_t)*n, &Oinfo,
+                            (unsigned)*fields, (hid_t)*lapl_id) < 0)
+        HGOTO_DONE(FAIL);
+
+    ret_value = fill_h5o_info_t_f(Oinfo, object_info);
+
+done:
+    if (c_group_name)
+        HDfree(c_group_name);
+    return ret_value;
 }
 
 /****if* H5Of/H5Oget_info_c
@@ -406,6 +394,7 @@ h5oget_info_by_idx_c (hid_t_f *loc_id, _fcd  group_name, size_t_f *namelen,
  *  Calls H5Oget_info
  * INPUTS
  *  object_id   - Identifier for target object.
+ *  fields      - Flags specifying the fields to include in object_info.
  * OUTPUTS
  *  object_info - Buffer in which to return object information.
  *
@@ -415,24 +404,24 @@ h5oget_info_by_idx_c (hid_t_f *loc_id, _fcd  group_name, size_t_f *namelen,
  *  M. Scot Breitenfeld
  *  May 16, 2012
  * SOURCE
-*/
+ */
 int_f
-h5oget_info_c (hid_t_f *object_id, H5O_info_t_f *object_info)
+h5oget_info_c(hid_t_f *object_id, H5O_info_t_f *object_info, int_f *fields)
 /******/
 {
-  int_f ret_value = 0;          /* Return value */
-  H5O_info_t Oinfo;
-  
-  /*
-   * Call H5Oinfo_by_name function.
-   */
-  if(H5Oget_info((hid_t)*object_id, &Oinfo) < 0)
-    HGOTO_DONE(FAIL);
-
-  ret_value = fill_h5o_info_t_f(Oinfo,object_info);
-
- done:
-  return ret_value;
+    int_f       ret_value = 0; /* Return value */
+    H5O_info2_t Oinfo;
+
+    /*
+     * Call H5Oinfo_by_name function.
+     */
+    if (H5Oget_info3((hid_t)*object_id, &Oinfo, (unsigned)*fields) < 0)
+        HGOTO_DONE(FAIL);
+
+    ret_value = fill_h5o_info_t_f(Oinfo, object_info);
+
+done:
+    return ret_value;
 }
 
 /* ***if* H5Of/H5Ocopy_c
@@ -440,12 +429,12 @@ h5oget_info_c (hid_t_f *object_id, H5O_info_t_f *object_info)
  *  H5Ocopy_c
  * PURPOSE
  *  Calls H5Ocopy
- * INPUTS  
- *  src_loc_id   - Object identifier indicating the location of the source object to be copied 
- *  src_name     - Name of the source object to be copied 
+ * INPUTS
+ *  src_loc_id   - Object identifier indicating the location of the source object to be copied
+ *  src_name     - Name of the source object to be copied
  *  src_name_len - Length of src_name
- *  dst_loc_id   - Location identifier specifying the destination 
- *  dst_name     - Name to be assigned to the new copy 
+ *  dst_loc_id   - Location identifier specifying the destination
+ *  dst_name     - Name to be assigned to the new copy
  *  dst_name_len - Length of dst_name
  *  ocpypl_id    - Object copy property list
  *  lcpl_id      - Link creation property list for the new hard link
@@ -456,41 +445,39 @@ h5oget_info_c (hid_t_f *object_id, H5O_info_t_f *object_info)
  *  M. Scot Breitenfeld
  *  March 14, 2012
  * SOURCE
-*/
+ */
 int_f
-nh5ocopy_c (hid_t_f *src_loc_id, _fcd src_name, size_t_f *src_name_len,
-	    hid_t_f *dst_loc_id, _fcd dst_name, size_t_f *dst_name_len, 
-	    hid_t_f *ocpypl_id, hid_t_f *lcpl_id )
+h5ocopy_c(hid_t_f *src_loc_id, _fcd src_name, size_t_f *src_name_len, hid_t_f *dst_loc_id, _fcd dst_name,
+          size_t_f *dst_name_len, hid_t_f *ocpypl_id, hid_t_f *lcpl_id)
 /******/
 {
-  char *c_src_name = NULL;  /* Buffer to hold C string */
-  char *c_dst_name = NULL;  /* Buffer to hold C string */
-  
-  int_f ret_value = 0;      /* Return value */
-  
-  /*
-   * Convert FORTRAN name to C name
-   */
-  if((c_src_name = HD5f2cstring(src_name, (size_t)*src_name_len)) == NULL)
-    HGOTO_DONE(FAIL);
-  if((c_dst_name = HD5f2cstring(dst_name, (size_t)*dst_name_len)) == NULL)
-    HGOTO_DONE(FAIL);
-
-  /*
-   * Call H5Ocopy function.
-   */
-  if(H5Ocopy( (hid_t)*src_loc_id, c_src_name, (hid_t)*dst_loc_id, c_dst_name, 
-	      (hid_t)*ocpypl_id, (hid_t)*lcpl_id) < 0)
-    HGOTO_DONE(FAIL);
-
- done:
-  if(c_src_name)
-    HDfree(c_src_name);
-  if(c_dst_name)
-    HDfree(c_dst_name);
-
-  return ret_value;
-
+    char *c_src_name = NULL; /* Buffer to hold C string */
+    char *c_dst_name = NULL; /* Buffer to hold C string */
+
+    int_f ret_value = 0; /* Return value */
+
+    /*
+     * Convert FORTRAN name to C name
+     */
+    if ((c_src_name = HD5f2cstring(src_name, (size_t)*src_name_len)) == NULL)
+        HGOTO_DONE(FAIL);
+    if ((c_dst_name = HD5f2cstring(dst_name, (size_t)*dst_name_len)) == NULL)
+        HGOTO_DONE(FAIL);
+
+    /*
+     * Call H5Ocopy function.
+     */
+    if (H5Ocopy((hid_t)*src_loc_id, c_src_name, (hid_t)*dst_loc_id, c_dst_name, (hid_t)*ocpypl_id,
+                (hid_t)*lcpl_id) < 0)
+        HGOTO_DONE(FAIL);
+
+done:
+    if (c_src_name)
+        HDfree(c_src_name);
+    if (c_dst_name)
+        HDfree(c_dst_name);
+
+    return ret_value;
 }
 
 /****if* H5Of/h5ovisit_by_name_c
@@ -499,15 +486,16 @@ nh5ocopy_c (hid_t_f *src_loc_id, _fcd src_name, size_t_f *src_name_len,
  * PURPOSE
  *  Calls H5Ovisit_by_name
  * INPUTS
- *    object_id - Identifier specifying subject group
- *   index_type - Type of index which determines the order
- *        order - Order within index
- *          idx - Iteration position at which to start
- *           op - Callback function passing data regarding the link to the calling application
- *      op_data - User-defined pointer to data required by the application for its processing of the link
+ *  object_id - Identifier specifying subject group
+ *  index_type - Type of index which determines the order
+ *  order - Order within index
+ *  idx - Iteration position at which to start
+ *  op - Callback function passing data regarding the link to the calling application
+ *  op_data - User-defined pointer to data required by the application for its processing of the link
+ *  fields - Flags specifying the fields to include in object_info.
  *
  * OUTPUTS
- *          idx - Position at which an interrupted iteration may be restarted
+ *  idx - Position at which an interrupted iteration may be restarted
  *
  * RETURNS
  *  >0 on success, 0< on failure
@@ -515,34 +503,34 @@ nh5ocopy_c (hid_t_f *src_loc_id, _fcd src_name, size_t_f *src_name_len,
  *  M. Scot Breitenfeld
  *  May 16, 2012
  * SOURCE
-*/
+ */
 int_f
-h5ovisit_by_name_c(hid_t_f *loc_id,  _fcd object_name, size_t_f *namelen, int_f *index_type, int_f *order,
-		    H5O_iterate_t op, void *op_data, hid_t_f *lapl_id )
+h5ovisit_by_name_c(hid_t_f *loc_id, _fcd object_name, size_t_f *namelen, int_f *index_type, int_f *order,
+                   H5O_iterate2_t op, void *op_data, hid_t_f *lapl_id, int_f *fields)
 /******/
 {
-  int_f ret_value = -1;       /* Return value */
-  herr_t func_ret_value;      /* H5Linterate return value */
-  char *c_object_name = NULL; /* Buffer to hold C string */
-
-  /*
-   * Convert FORTRAN name to C name
-   */
-  if( (c_object_name = HD5f2cstring(object_name, (size_t)*namelen)) == NULL)
-    HGOTO_DONE(FAIL);
-
-  /*
-   * Call H5Ovisit
-   */
-  func_ret_value = H5Ovisit_by_name( (hid_t)*loc_id, c_object_name, (H5_index_t)*index_type, (H5_iter_order_t)*order,
-				     op, op_data, (hid_t)*lapl_id);
-  ret_value = (int_f)func_ret_value;
-
- done:
-  if(c_object_name)
-    HDfree(c_object_name);
-  return ret_value;
-
+    int_f  ret_value = -1;       /* Return value */
+    herr_t func_ret_value;       /* H5Linterate return value */
+    char  *c_object_name = NULL; /* Buffer to hold C string */
+
+    /*
+     * Convert FORTRAN name to C name
+     */
+    if ((c_object_name = HD5f2cstring(object_name, (size_t)*namelen)) == NULL)
+        HGOTO_DONE(FAIL);
+
+    /*
+     * Call H5Ovisit_by_name
+     */
+    func_ret_value =
+        H5Ovisit_by_name3((hid_t)*loc_id, c_object_name, (H5_index_t)*index_type, (H5_iter_order_t)*order, op,
+                          op_data, (unsigned)*fields, (hid_t)*lapl_id);
+    ret_value = (int_f)func_ret_value;
+
+done:
+    if (c_object_name)
+        HDfree(c_object_name);
+    return ret_value;
 }
 
 /****if* H5Of/h5odecr_refcount_c
@@ -558,21 +546,21 @@ h5ovisit_by_name_c(hid_t_f *loc_id,  _fcd object_name, size_t_f *namelen, int_f
  *  M. Scot Breitenfeld
  *  May 16, 2012
  * SOURCE
-*/
+ */
 int_f
-nh5odecr_refcount_c (hid_t_f *object_id)
+h5odecr_refcount_c(hid_t_f *object_id)
 /******/
 {
-  int_f ret_value = 0;  /* Return value */
+    int_f ret_value = 0; /* Return value */
 
-  /*
-   * Call H5Odecr_refcount function.
-   */
-  if((hid_t_f)H5Odecr_refcount((hid_t)*object_id) < 0)
-    HGOTO_DONE(FAIL);
+    /*
+     * Call H5Odecr_refcount function.
+     */
+    if ((hid_t_f)H5Odecr_refcount((hid_t)*object_id) < 0)
+        HGOTO_DONE(FAIL);
 
- done:
-  return ret_value;
+done:
+    return ret_value;
 }
 
 /****if* H5Of/h5oexists_by_name_c
@@ -592,30 +580,30 @@ nh5odecr_refcount_c (hid_t_f *object_id)
  *  M. Scot Breitenfeld
  *  May 17, 2012
  * SOURCE
-*/
+ */
 int_f
-nh5oexists_by_name_c (hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *lapl_id)
+h5oexists_by_name_c(hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *lapl_id)
 /******/
 {
-  char *c_name = NULL;          /* Buffer to hold C string */
-  int_f ret_value = 0;          /* Return value */
-
-  /*
-   * Convert FORTRAN name to C name
-   */
-  if((c_name = HD5f2cstring(name, (size_t)*namelen)) == NULL)
-    HGOTO_DONE(FAIL);
-
-  /*
-   * Call H5Oopen function.
-   */
-  if((ret_value = (int_f)H5Oexists_by_name((hid_t)*loc_id, c_name, (hid_t)*lapl_id)) < 0)
-    HGOTO_DONE(FAIL);
-
- done:
-  if(c_name)
-    HDfree(c_name);
-  return ret_value;
+    char *c_name    = NULL; /* Buffer to hold C string */
+    int_f ret_value = 0;    /* Return value */
+
+    /*
+     * Convert FORTRAN name to C name
+     */
+    if ((c_name = HD5f2cstring(name, (size_t)*namelen)) == NULL)
+        HGOTO_DONE(FAIL);
+
+    /*
+     * Call H5Oopen function.
+     */
+    if ((ret_value = (int_f)H5Oexists_by_name((hid_t)*loc_id, c_name, (hid_t)*lapl_id)) < 0)
+        HGOTO_DONE(FAIL);
+
+done:
+    if (c_name)
+        HDfree(c_name);
+    return ret_value;
 }
 
 /****if* H5Of/h5oincr_refcount_c
@@ -631,21 +619,21 @@ nh5oexists_by_name_c (hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *la
  *  M. Scot Breitenfeld
  *  May 16, 2012
  * SOURCE
-*/
+ */
 int_f
-nh5oincr_refcount_c (hid_t_f *object_id)
+h5oincr_refcount_c(hid_t_f *object_id)
 /******/
 {
-  int_f ret_value = 0;  /* Return value */
+    int_f ret_value = 0; /* Return value */
 
-  /*
-   * Call H5Oincr_refcount function.
-   */
-  if((hid_t_f)H5Oincr_refcount((hid_t)*object_id) < 0)
-    HGOTO_DONE(FAIL);
+    /*
+     * Call H5Oincr_refcount function.
+     */
+    if ((hid_t_f)H5Oincr_refcount((hid_t)*object_id) < 0)
+        HGOTO_DONE(FAIL);
 
- done:
-  return ret_value;
+done:
+    return ret_value;
 }
 
 /****if* H5Of/h5oset_comment_c
@@ -663,30 +651,30 @@ nh5oincr_refcount_c (hid_t_f *object_id)
  *  M. Scot Breitenfeld
  *  May 17, 2012
  * SOURCE
-*/
+ */
 int_f
-nh5oset_comment_c (hid_t_f *object_id, _fcd comment, size_t_f *commentlen)
+h5oset_comment_c(hid_t_f *object_id, _fcd comment, size_t_f *commentlen)
 /******/
 {
-  char *c_comment = NULL;   /* Buffer to hold C string */
-  int_f ret_value = 0;     /* Return value */
-
-  /*
-   * Convert FORTRAN string to C string
-   */
-  if((c_comment = HD5f2cstring(comment, (size_t)*commentlen)) == NULL)
-    HGOTO_DONE(FAIL);
-
-  /*
-   * Call H5Oset_comment function.
-   */
-  if((hid_t_f)H5Oset_comment((hid_t)*object_id, c_comment) < 0)
-    HGOTO_DONE(FAIL);
-
- done:
-  if(c_comment)
-    HDfree(c_comment);
-  return ret_value;
+    char *c_comment = NULL; /* Buffer to hold C string */
+    int_f ret_value = 0;    /* Return value */
+
+    /*
+     * Convert FORTRAN string to C string
+     */
+    if ((c_comment = HD5f2cstring(comment, (size_t)*commentlen)) == NULL)
+        HGOTO_DONE(FAIL);
+
+    /*
+     * Call H5Oset_comment function.
+     */
+    if ((hid_t_f)H5Oset_comment((hid_t)*object_id, c_comment) < 0)
+        HGOTO_DONE(FAIL);
+
+done:
+    if (c_comment)
+        HDfree(c_comment);
+    return ret_value;
 }
 
 /****if* H5Of/h5oset_comment_by_name_c
@@ -696,8 +684,8 @@ nh5oset_comment_c (hid_t_f *object_id, _fcd comment, size_t_f *commentlen)
  *  Calls H5Oset_comment_by_name
  * INPUTS
  *  object_id  - Identifier of the target object.
- *  name       - Name of the object whose comment is to be set or reset, 
- *               specified as a path relative to loc_id. 
+ *  name       - Name of the object whose comment is to be set or reset,
+ *  specified as a path relative to loc_id.
  *  namelen    - Length of the name.
  *  comment    - The new comment.
  *  commentlen - Length of the comment.
@@ -708,38 +696,39 @@ nh5oset_comment_c (hid_t_f *object_id, _fcd comment, size_t_f *commentlen)
  *  M. Scot Breitenfeld
  *  May 17, 2012
  * SOURCE
-*/
+ */
 int_f
-nh5oset_comment_by_name_c (hid_t_f *object_id, _fcd name, size_t_f *namelen,  _fcd comment, size_t_f *commentlen, hid_t_f *lapl_id)
+h5oset_comment_by_name_c(hid_t_f *object_id, _fcd name, size_t_f *namelen, _fcd comment, size_t_f *commentlen,
+                         hid_t_f *lapl_id)
 /******/
 {
-  char *c_comment = NULL;   /* Buffer to hold C string */
-  char *c_name = NULL;   /* Buffer to hold C string */
-  int_f ret_value = 0;     /* Return value */
-
-  /*
-   * Convert FORTRAN string to C string
-   */
-  if((c_comment = HD5f2cstring(comment, (size_t)*commentlen)) == NULL)
-    HGOTO_DONE(FAIL);
-  /*
-   * Convert FORTRAN string to C string
-   */
-  if((c_name = HD5f2cstring(name, (size_t)*namelen)) == NULL)
-    HGOTO_DONE(FAIL);
-
-  /*
-   * Call H5Oset_comment_by_name function.
-   */
-  if((hid_t_f)H5Oset_comment_by_name((hid_t)*object_id, c_name, c_comment, (hid_t)*lapl_id) < 0)
-    HGOTO_DONE(FAIL);
-
- done:
-  if(c_name)
-    HDfree(c_name);
-  if(c_comment)
-    HDfree(c_comment);
-  return ret_value;
+    char *c_comment = NULL; /* Buffer to hold C string */
+    char *c_name    = NULL; /* Buffer to hold C string */
+    int_f ret_value = 0;    /* Return value */
+
+    /*
+     * Convert FORTRAN string to C string
+     */
+    if ((c_comment = HD5f2cstring(comment, (size_t)*commentlen)) == NULL)
+        HGOTO_DONE(FAIL);
+    /*
+     * Convert FORTRAN string to C string
+     */
+    if ((c_name = HD5f2cstring(name, (size_t)*namelen)) == NULL)
+        HGOTO_DONE(FAIL);
+
+    /*
+     * Call H5Oset_comment_by_name function.
+     */
+    if ((hid_t_f)H5Oset_comment_by_name((hid_t)*object_id, c_name, c_comment, (hid_t)*lapl_id) < 0)
+        HGOTO_DONE(FAIL);
+
+done:
+    if (c_name)
+        HDfree(c_name);
+    if (c_comment)
+        HDfree(c_comment);
+    return ret_value;
 }
 /****if* H5Of/h5oopen_by_idx_c
  * NAME
@@ -755,43 +744,44 @@ nh5oset_comment_by_name_c (hid_t_f *object_id, _fcd name, size_t_f *namelen,  _f
  *  n             - Object to open.
  *  lapl_id       - Link access property list.
  * OUTPUTS
- *   obj_id       - An object identifier for the opened object.
+ *  obj_id       - An object identifier for the opened object.
  * RETURNS
  *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
  *  May 17, 2012
  * SOURCE
-*/
+ */
 int_f
-nh5oopen_by_idx_c (hid_t_f *loc_id, _fcd  group_name, size_t_f *group_namelen, 
-		       int_f *index_type, int_f *order, hsize_t_f *n, hid_t_f *obj_id, hid_t_f *lapl_id)
+h5oopen_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, int_f *index_type, int_f *order,
+                 hsize_t_f *n, hid_t_f *obj_id, hid_t_f *lapl_id)
 /******/
 {
-  char *c_group_name = NULL;     /* Buffer to hold C string */
-  int_f ret_value = 0;
-  H5_index_t c_index_type;
-  H5_iter_order_t c_order;
-  
-  /*
-   * Convert FORTRAN string to C string
-   */
-  if((c_group_name = HD5f2cstring( group_name, (size_t)*group_namelen)) == NULL)
-    HGOTO_DONE(FAIL);
-
-  c_index_type = (H5_index_t)*index_type;
-  c_order = (H5_iter_order_t)*order;
-
-  /*
-   * Call H5Oopen_by_idx function.
-   */
-  if((*obj_id =(hid_t_f)H5Oopen_by_idx((hid_t)*loc_id, c_group_name, c_index_type, c_order, (hsize_t)*n, (hid_t)*lapl_id)) < 0)
-    HGOTO_DONE(FAIL);
-
- done:
-  if(c_group_name)
-    HDfree(c_group_name);
-  return ret_value;
+    char           *c_group_name = NULL; /* Buffer to hold C string */
+    int_f           ret_value    = 0;
+    H5_index_t      c_index_type;
+    H5_iter_order_t c_order;
+
+    /*
+     * Convert FORTRAN string to C string
+     */
+    if ((c_group_name = HD5f2cstring(group_name, (size_t)*group_namelen)) == NULL)
+        HGOTO_DONE(FAIL);
+
+    c_index_type = (H5_index_t)*index_type;
+    c_order      = (H5_iter_order_t)*order;
+
+    /*
+     * Call H5Oopen_by_idx function.
+     */
+    if ((*obj_id = (hid_t_f)H5Oopen_by_idx((hid_t)*loc_id, c_group_name, c_index_type, c_order, (hsize_t)*n,
+                                           (hid_t)*lapl_id)) < 0)
+        HGOTO_DONE(FAIL);
+
+done:
+    if (c_group_name)
+        HDfree(c_group_name);
+    return ret_value;
 }
 
 /****if* H5Of/h5oget_comment_c
@@ -811,43 +801,43 @@ nh5oopen_by_idx_c (hid_t_f *loc_id, _fcd  group_name, size_t_f *group_namelen,
  *  M. Scot Breitenfeld
  *  June 24, 2012
  * SOURCE
-*/
+ */
 int_f
-nh5oget_comment_c (hid_t_f *object_id, _fcd comment, size_t_f *commentsize,  hssize_t_f *bufsize)
+h5oget_comment_c(hid_t_f *object_id, _fcd comment, size_t_f *commentsize, hssize_t_f *bufsize)
 /******/
 {
-  char *c_comment = NULL;  /* Buffer to hold C string */
-  int_f ret_value = 0;     /* Return value */
-  size_t c_commentsize;
-
-  c_commentsize = (size_t)*commentsize + 1;
-
-  /*
-   * Allocate buffer to hold comment name
-   */
-  
-  if(NULL == (c_comment = (char *)HDmalloc(c_commentsize)))
-    HGOTO_DONE(FAIL);
-
-  /*
-   * Call H5Oget_comment function.
-   */ 
-
-  if((*bufsize = (hssize_t_f)H5Oget_comment((hid_t)*object_id, c_comment, (size_t)*commentsize)) < 0)
-    HGOTO_DONE(FAIL);
-
-  /*
-   * Convert C name to FORTRAN and place it in the given buffer
-   */
-  if(c_comment)
-    HD5packFstring(c_comment, _fcdtocp(comment), c_commentsize - 1);
-  return ret_value;
-
- done:
-  if(c_comment)
-    HDfree(c_comment);
-
-  return ret_value;
+    char  *c_comment = NULL; /* Buffer to hold C string */
+    int_f  ret_value = 0;    /* Return value */
+    size_t c_commentsize;
+
+    c_commentsize = (size_t)*commentsize + 1;
+
+    /*
+     * Allocate buffer to hold comment name
+     */
+
+    if (NULL == (c_comment = (char *)HDmalloc(c_commentsize)))
+        HGOTO_DONE(FAIL);
+
+    /*
+     * Call H5Oget_comment function.
+     */
+
+    if ((*bufsize = (hssize_t_f)H5Oget_comment((hid_t)*object_id, c_comment, (size_t)*commentsize)) < 0)
+        HGOTO_DONE(FAIL);
+
+    /*
+     * Convert C name to FORTRAN and place it in the given buffer
+     */
+    if (c_comment)
+        HD5packFstring(c_comment, _fcdtocp(comment), c_commentsize - 1);
+    return ret_value;
+
+done:
+    if (c_comment)
+        HDfree(c_comment);
+
+    return ret_value;
 }
 
 /****if* H5Of/h5oget_comment_by_name_c
@@ -867,54 +857,97 @@ nh5oget_comment_c (hid_t_f *object_id, _fcd comment, size_t_f *commentsize,  hss
  *  M. Scot Breitenfeld
  *  July 6, 2012
  * SOURCE
-*/
+ */
 int_f
-nh5oget_comment_by_name_c (hid_t_f *loc_id, _fcd name, size_t_f *name_size, 
-			   _fcd comment, size_t_f *commentsize, size_t_f *bufsize, hid_t_f *lapl_id)
+h5oget_comment_by_name_c(hid_t_f *loc_id, _fcd name, size_t_f *name_size, _fcd comment, size_t_f *commentsize,
+                         size_t_f *bufsize, hid_t_f *lapl_id)
 /******/
 {
-  char *c_comment = NULL;  /* Buffer to hold C string */
-  char *c_name = NULL;     /* Buffer to hold C string */
-  int_f ret_value = 0;     /* Return value */
-  ssize_t c_bufsize;
-  size_t c_commentsize;
-
-  /*
-   * Convert FORTRAN string to C string
-   */
-  if((c_name = HD5f2cstring(name, (size_t)*name_size)) == NULL)
-    HGOTO_DONE(FAIL);
-
-  c_commentsize = (size_t)*commentsize + 1;
-
-  /*
-   * Allocate buffer to hold comment name
-   */
-  
-  if(NULL == (c_comment = (char *)HDmalloc(c_commentsize)))
-    HGOTO_DONE(FAIL);
-
-  /*
-   * Call H5Oget_comment_by_name function.
-   */ 
-
-  if((c_bufsize = H5Oget_comment_by_name((hid_t)*loc_id, c_name, c_comment, (size_t)*commentsize,(hid_t)*lapl_id )) < 0)
-    HGOTO_DONE(FAIL);
-
-  *bufsize = (size_t_f)c_bufsize;
-
-  /*
-   * Convert C name to FORTRAN and place it in the given buffer
-   */
-  if(c_comment)
-    HD5packFstring(c_comment, _fcdtocp(comment), c_commentsize - 1);
-  return ret_value;
-
- done:
-  if(c_comment)
-    HDfree(c_comment);
-  if(c_name)
-    HDfree(c_name);
-
-  return ret_value;
+    char   *c_comment = NULL; /* Buffer to hold C string */
+    char   *c_name    = NULL; /* Buffer to hold C string */
+    int_f   ret_value = 0;    /* Return value */
+    ssize_t c_bufsize;
+    size_t  c_commentsize;
+
+    /*
+     * Convert FORTRAN string to C string
+     */
+    if ((c_name = HD5f2cstring(name, (size_t)*name_size)) == NULL)
+        HGOTO_DONE(FAIL);
+
+    c_commentsize = (size_t)*commentsize + 1;
+
+    /*
+     * Allocate buffer to hold comment name
+     */
+
+    if (NULL == (c_comment = (char *)HDmalloc(c_commentsize)))
+        HGOTO_DONE(FAIL);
+
+    /*
+     * Call H5Oget_comment_by_name function.
+     */
+
+    if ((c_bufsize = H5Oget_comment_by_name((hid_t)*loc_id, c_name, c_comment, (size_t)*commentsize,
+                                            (hid_t)*lapl_id)) < 0)
+        HGOTO_DONE(FAIL);
+
+    if (c_name)
+        HDfree(c_name);
+
+    *bufsize = (size_t_f)c_bufsize;
+
+    /*
+     * Convert C name to FORTRAN and place it in the given buffer
+     */
+    if (c_comment) {
+        HD5packFstring(c_comment, _fcdtocp(comment), c_commentsize - 1);
+        HDfree(c_comment);
+    }
+
+    return ret_value;
+
+done:
+    if (c_comment)
+        HDfree(c_comment);
+    if (c_name)
+        HDfree(c_name);
+
+    return ret_value;
+}
+
+/****if* H5Of/h5otoken_cmp_c
+ * NAME
+ *  h5otoken_cmp_c
+ * PURPOSE
+ *  Calls H5Otoken_cmp
+ * INPUTS
+ *  loc_id  - Identifier of an object in the file / container.
+ *  token1  - The first token to compare.
+ *  token2  - The second token to compare.
+ *  cmp_value - Whether the tokens are equal.
+ * RETURNS
+ *  0 on success, -1 on failure
+ * AUTHOR
+ *  Quincey Koziol
+ *  January 10, 2019
+ * SOURCE
+ */
+int_f
+h5otoken_cmp_c(hid_t_f *loc_id, H5O_token_t *token1, H5O_token_t *token2, int_f *cmp_value_f)
+/******/
+{
+    int   cmp_value;     /* Token comparison result */
+    int_f ret_value = 0; /* Return value */
+
+    /* Call H5Otoken_cmp function */
+    cmp_value = 0;
+    if (H5Otoken_cmp((hid_t)*loc_id, token1, token2, &cmp_value) < 0)
+        HGOTO_DONE(FAIL);
+
+    /* Set the comparison value to return */
+    *cmp_value_f = cmp_value;
+
+done:
+    return ret_value;
 }
diff --git a/fortran/src/H5Off.F90 b/fortran/src/H5Off.F90
new file mode 100644
index 0000000..7bb3a0c
--- /dev/null
+++ b/fortran/src/H5Off.F90
@@ -0,0 +1,1059 @@
+!> @defgroup FH5O Fortran Object (H5O) Interface
+!!
+!! @see H5O, C-API
+!!
+!! @see @ref H5O_UG, User Guide
+!!
+
+!> @ingroup FH5O
+!!
+!!  @brief This module contains Fortran interfaces for H5O functions.
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+! NOTES
+!       _____ __  __ _____   ____  _____ _______       _   _ _______
+!      |_   _|  \/  |  __ \ / __ \|  __ \__   __|/\   | \ | |__   __|
+! ****   | | | \  / | |__) | |  | | |__) | | |  /  \  |  \| |  | |    ****
+! ****   | | | |\/| |  ___/| |  | |  _  /  | | / /\ \ | . ` |  | |    ****
+! ****  _| |_| |  | | |    | |__| | | \ \  | |/ ____ \| |\  |  | |    ****
+!      |_____|_|  |_|_|     \____/|_|  \_\ |_/_/    \_\_| \_|  |_|
+!
+!  If you add a new H5O function you must add the function name to the
+!  Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
+!  This is needed for Windows based operating systems.
+!
+
+MODULE H5O
+
+  USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR, C_FUNPTR, C_CHAR, C_INT64_T, C_LONG, C_INT, C_LOC
+  USE H5GLOBAL
+  IMPLICIT NONE
+
+!> @brief h5o_info_t derived type. The time values are an integer array as specified in the Fortran intrinsic DATE_AND_TIME(VALUES).
+  TYPE, BIND(C) :: h5o_info_t
+     INTEGER(C_LONG)     :: fileno     !< File number that object is located in
+     TYPE(H5O_TOKEN_T_F) :: token      !< Token for object in file
+     INTEGER(C_INT)      :: type       !< Basic object type (group, dataset, etc.)
+     INTEGER             :: rc         !< Reference count of object
+     !    -- NOTE --
+     ! Returns an integer array
+     ! as specified in the Fortran
+     ! intrinsic DATE_AND_TIME(VALUES)
+     INTEGER, DIMENSION(8) :: atime !<  Access time
+     INTEGER, DIMENSION(8) :: mtime !<  Modification time
+     INTEGER, DIMENSION(8) :: ctime !<  Change time
+     INTEGER, DIMENSION(8) :: btime !<  Birth time
+
+     INTEGER(hsize_t) :: num_attrs  !<  Number of attributes attached to object
+  END TYPE h5o_info_t
+
+!> @brief C interoperable structure for h5o_info_t. The Fortran derived type returns the time
+!! values as an integer array as specified in the Fortran intrinsic DATE_AND_TIME(VALUES).
+!! Whereas, this derived type does not.
+
+  TYPE, BIND(C) :: c_h5o_info_t
+     INTEGER(C_LONG)  :: fileno     !<  File number that object is located in
+     TYPE(H5O_TOKEN_T_F) :: token   !<  Token for object in file
+     INTEGER(C_INT)   :: type       !<  Basic object type (group, dataset, etc.)
+     INTEGER(C_INT)   :: rc         !<  Reference count of object
+
+     INTEGER(KIND=TIME_T) :: atime  !<  Access time
+     INTEGER(KIND=TIME_T) :: mtime  !<  Modify time
+     INTEGER(KIND=TIME_T) :: ctime  !<  Create time
+     INTEGER(KIND=TIME_T) :: btime  !<  Birth time
+
+     INTEGER(hsize_t) :: num_attrs  !<  Number of attributes attached to object
+  END TYPE c_h5o_info_t
+
+!> @brief space_t derived type
+  TYPE, BIND(C) :: space_t
+     INTEGER(hsize_t) :: total !<  Total space for storing object header in file
+     INTEGER(hsize_t) :: meta  !<  Space within header for object header metadata information
+     INTEGER(hsize_t) :: mesg  !<  Space within header for actual message information
+     INTEGER(hsize_t) :: free  !<  Free space within object header
+  END TYPE space_t
+
+!> @brief mesg_t derived type
+  TYPE, BIND(C) :: mesg_t
+     INTEGER(c_int64_t) :: present !<  Flags to indicate presence of message type in header
+     INTEGER(c_int64_t) :: shared  !<  Flags to indicate message type is shared in header
+  END TYPE mesg_t
+
+!> @brief hdr_t derived type
+  TYPE, BIND(C) :: hdr_t
+     INTEGER :: version !<  Version number of header format in file
+     INTEGER :: nmesgs  !<  Number of object header messages
+     INTEGER :: nchunks !<  Number of object header chunks
+     INTEGER :: flags   !<  Object header status flags
+     TYPE(space_t)  :: space
+     TYPE(mesg_t)   :: mesg
+  END TYPE hdr_t
+
+!> @brief c_hdr_t derived type
+  TYPE, BIND(C) :: c_hdr_t
+     INTEGER(C_INT) :: version !<  Version number of header format in file
+     INTEGER(C_INT) :: nmesgs  !<  Number of object header messages
+     INTEGER(C_INT) :: nchunks !<  Number of object header chunks
+     INTEGER(C_INT) :: flags   !<  Object header status flags
+     TYPE(space_t)  :: space
+     TYPE(mesg_t)   :: mesg
+  END TYPE c_hdr_t
+
+!> @brief Extra metadata storage for obj & attributes
+  TYPE, BIND(C) :: H5_ih_info_t
+     INTEGER(hsize_t) :: index_size !<  btree and/or list
+     INTEGER(hsize_t) :: heap_size  !<  heap
+  END TYPE H5_ih_info_t
+
+!> @brief meta_size_t derived type
+  TYPE, BIND(C) :: meta_size_t
+     TYPE(H5_ih_info_t) :: obj  !<  v1/v2 B-tree & local/fractal heap for groups, B-tree for chunked datasets
+     TYPE(H5_ih_info_t) :: attr !<  v2 B-tree & heap for attributes
+  ENDTYPE meta_size_t
+
+!> @brief h5o_native_info_t derived type
+  TYPE, BIND(C) :: h5o_native_info_t
+     TYPE(hdr_t) :: hdr
+     TYPE(meta_size_t) :: meta_size
+  END TYPE h5o_native_info_t
+
+! @brief C interoperable structure for h5o_native_info_t.
+  TYPE, BIND(C) :: c_h5o_native_info_t
+     TYPE(c_hdr_t) :: hdr
+     TYPE(meta_size_t) :: meta_size
+  END TYPE c_h5o_native_info_t
+
+
+CONTAINS
+
+!>
+!! \ingroup FH5O
+!!
+!! \brief Creates a hard link to an object in an HDF5 file.
+!!
+!! \param object_id     Object to be linked.
+!! \param new_loc_id    File or group identifier specifying location at which object is to be linked.
+!! \param new_link_name Name of link to be created, relative to new_loc_id.
+!! \param hdferr        \fortran_error
+!! \param lcpl_id       Link creation property list identifier.
+!! \param lapl_id       Link access property list identifier.
+!!
+!! See C API: @ref H5Olink()
+!!
+  SUBROUTINE h5olink_f(object_id, new_loc_id, new_link_name, hdferr, lcpl_id, lapl_id)
+    IMPLICIT NONE
+    INTEGER(HID_T)  , INTENT(IN)  :: object_id
+    INTEGER(HID_T)  , INTENT(IN)  :: new_loc_id
+    CHARACTER(LEN=*), INTENT(IN)  :: new_link_name
+    INTEGER         , INTENT(OUT) :: hdferr
+    INTEGER(HID_T)  , INTENT(IN), OPTIONAL :: lcpl_id
+    INTEGER(HID_T)  , INTENT(IN), OPTIONAL :: lapl_id
+    INTEGER(HID_T) :: lapl_id_default
+    INTEGER(HID_T) :: lcpl_id_default
+
+    INTEGER(SIZE_T) :: new_link_namelen
+
+    INTERFACE
+       INTEGER FUNCTION h5olink_c(object_id, new_loc_id, new_link_name, new_link_namelen, &
+            lcpl_id_default, lapl_id_default) BIND(C,NAME='h5olink_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: object_id
+         INTEGER(HID_T), INTENT(IN) :: new_loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: new_link_name
+         INTEGER(SIZE_T) :: new_link_namelen
+         INTEGER(HID_T) :: lapl_id_default
+         INTEGER(HID_T) :: lcpl_id_default
+       END FUNCTION h5olink_c
+    END INTERFACE
+
+    new_link_namelen = LEN(new_link_name)
+
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+    lcpl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lcpl_id)) lcpl_id_default = lcpl_id
+
+    hdferr = h5olink_c(object_id, new_loc_id, new_link_name, new_link_namelen, &
+         lcpl_id_default, lapl_id_default)
+
+  END SUBROUTINE h5olink_f
+
+!>
+!! \ingroup FH5O
+!!
+!! \brief Opens an object in an HDF5 file by location identifier and path name.
+!!
+!! \param loc_id  File or group identifier.
+!! \param name    Path to the object, relative to loc_id.
+!! \param obj_id  Object identifier for the opened object.
+!! \param hdferr  \fortran_error
+!! \param lapl_id Access property list identifier for the link pointing to the object.
+!!
+!! See C API: @ref H5Oopen()
+!!
+  SUBROUTINE h5oopen_f(loc_id, name, obj_id, hdferr, lapl_id)
+    IMPLICIT NONE
+    INTEGER(HID_T)  , INTENT(IN)  :: loc_id
+    CHARACTER(LEN=*), INTENT(IN)  :: name
+    INTEGER(HID_T)  , INTENT(OUT) :: obj_id
+    INTEGER         , INTENT(OUT) :: hdferr
+    INTEGER(HID_T)  , INTENT(IN), OPTIONAL :: lapl_id
+    INTEGER(HID_T) :: lapl_id_default
+    INTEGER(SIZE_T) :: namelen
+
+    INTERFACE
+       INTEGER FUNCTION h5oopen_c(loc_id, name, namelen, lapl_id_default, obj_id) BIND(C,NAME='h5oopen_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+         INTEGER(HID_T) :: lapl_id_default
+         INTEGER(SIZE_T) :: namelen
+         INTEGER(HID_T), INTENT(OUT) :: obj_id
+       END FUNCTION h5oopen_c
+    END INTERFACE
+
+    namelen = LEN(name)
+
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+
+    hdferr = h5oopen_c(loc_id, name, namelen, lapl_id_default, obj_id)
+
+  END SUBROUTINE h5oopen_f
+!>
+!! \ingroup FH5O
+!!
+!! \brief Closes an object in an HDF5 file.
+!!
+!! \param object_id Object identifier.
+!! \param hdferr    \fortran_error
+!!
+!! See C API: @ref H5Oclose()
+!!
+  SUBROUTINE h5oclose_f(object_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN)   :: object_id
+    INTEGER       , INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5oclose_c(object_id) BIND(C,NAME='h5oclose_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: object_id
+       END FUNCTION h5oclose_c
+    END INTERFACE
+
+    hdferr = h5oclose_c(object_id)
+  END SUBROUTINE h5oclose_f
+
+!>
+!! \ingroup FH5O
+!!
+!! \brief Opens an object using its token within an HDF5 file.
+!!
+!! \param loc_id File or group identifier.
+!! \param token  Object’s token in the file.
+!! \param obj_id Object identifier for the opened object.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Oopen_by_token()
+!!
+  SUBROUTINE h5oopen_by_token_f(loc_id, token, obj_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T)  , INTENT(IN)        :: loc_id
+    TYPE(H5O_TOKEN_T_F), INTENT(IN)     :: token
+    INTEGER(HID_T)  , INTENT(OUT)       :: obj_id
+    INTEGER         , INTENT(OUT)       :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5oopen_by_token_c(loc_id, token, obj_id) BIND(C,NAME='h5oopen_by_token_c')
+         IMPORT :: HID_T, H5O_TOKEN_T_F
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         TYPE(H5O_TOKEN_T_F), INTENT(IN) :: token
+         INTEGER(HID_T), INTENT(OUT) :: obj_id
+       END FUNCTION h5oopen_by_token_c
+    END INTERFACE
+
+    hdferr = h5oopen_by_token_c(loc_id, token, obj_id)
+
+  END SUBROUTINE h5oopen_by_token_f
+
+!>
+!! \ingroup FH5O
+!!
+!! \brief Copies an object in an HDF5 file.
+!!
+!! \param src_loc_id Object identifier indicating the location of the source object to be copied.
+!! \param src_name   Name of the source object to be copied.
+!! \param dst_loc_id Location identifier specifying the destination.
+!! \param dst_name   Name to be assigned to the new copy.
+!! \param ocpypl_id  Object copy property list.
+!! \param lcpl_id    Link creation property list for the new hard link.
+!! \param hdferr     \fortran_error
+!!
+!! See C API: @ref H5Ocopy()
+!!
+  SUBROUTINE h5ocopy_f(src_loc_id, src_name, dst_loc_id, dst_name, hdferr, ocpypl_id, lcpl_id)
+    IMPLICIT NONE
+    INTEGER(HID_T)  , INTENT(IN)  :: src_loc_id
+    CHARACTER(LEN=*), INTENT(IN)  :: src_name
+    INTEGER(HID_T)  , INTENT(IN)  :: dst_loc_id
+    CHARACTER(LEN=*), INTENT(IN)  :: dst_name
+    INTEGER         , INTENT(OUT) :: hdferr
+    INTEGER(HID_T)  , INTENT(IN), OPTIONAL :: ocpypl_id
+    INTEGER(HID_T)  , INTENT(IN), OPTIONAL :: lcpl_id
+
+    INTEGER(SIZE_T) :: src_name_len, dst_name_len
+    INTEGER(HID_T)  :: ocpypl_id_default, lcpl_id_default
+
+    INTERFACE
+       INTEGER FUNCTION h5ocopy_c(src_loc_id, src_name, src_name_len, &
+            dst_loc_id, dst_name, dst_name_len, ocpypl_id_default, lcpl_id_default) &
+            BIND(C,NAME='h5ocopy_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T)  , INTENT(IN) :: src_loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: src_name
+         INTEGER(HID_T)  , INTENT(IN) :: dst_loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: dst_name
+         INTEGER(HID_T)  , INTENT(IN) :: ocpypl_id_default
+         INTEGER(HID_T)  , INTENT(IN) :: lcpl_id_default
+         INTEGER(SIZE_T)              :: src_name_len, dst_name_len
+
+       END FUNCTION h5ocopy_c
+    END INTERFACE
+
+    src_name_len = LEN(src_name)
+    dst_name_len = LEN(dst_name)
+
+    ocpypl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(ocpypl_id)) ocpypl_id_default = ocpypl_id
+    lcpl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lcpl_id)) lcpl_id_default = lcpl_id
+
+    hdferr = h5ocopy_c(src_loc_id, src_name, src_name_len, &
+         dst_loc_id, dst_name, dst_name_len, ocpypl_id_default, lcpl_id_default)
+
+  END SUBROUTINE h5ocopy_f
+
+!>
+!! \ingroup FH5O
+!!
+!! \brief Decrements an object reference count.
+!!
+!! \param object_id Object identifier.
+!! \param hdferr    \fortran_error
+!!
+!! See C API: @ref H5Odecr_refcount()
+!!
+  SUBROUTINE h5odecr_refcount_f(object_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN)  :: object_id
+    INTEGER       , INTENT(OUT) :: hdferr
+
+    INTERFACE
+       INTEGER FUNCTION h5odecr_refcount_c(object_id) BIND(C,NAME='h5odecr_refcount_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T)  , INTENT(IN) :: object_id
+       END FUNCTION h5odecr_refcount_c
+    END INTERFACE
+
+    hdferr = h5odecr_refcount_c(object_id)
+
+  END SUBROUTINE h5odecr_refcount_f
+
+!>
+!! \ingroup FH5O
+!!
+!! \brief Determines whether a link resolves to an actual object.
+!!
+!! \param loc_id   IdeIdentifier of the file or group to query.
+!! \param name     TheThe name of the link to check.
+!!
+!!
+!! \param lapl_id     Link access property list identifier.
+!! \param link_exists Existing link resolves to an object.
+!! \param hdferr      \fortran_error
+!!
+!! See C API: @ref H5Oexists_by_name()
+!!
+  SUBROUTINE h5oexists_by_name_f(loc_id, name, link_exists, hdferr, lapl_id)
+    IMPLICIT NONE
+    INTEGER(HID_T)  , INTENT(IN)  :: loc_id
+    CHARACTER(LEN=*), INTENT(IN)  :: name
+    LOGICAL         , INTENT(OUT) :: link_exists
+    INTEGER         , INTENT(OUT) :: hdferr
+    INTEGER(HID_T)  , INTENT(IN), OPTIONAL :: lapl_id
+
+    INTEGER(size_t) :: namelen
+    INTEGER :: status
+    INTEGER(HID_T) :: lapl_id_default
+
+    INTERFACE
+       INTEGER FUNCTION h5oexists_by_name_c(loc_id, name, namelen, lapl_id) &
+            BIND(C,NAME='h5oexists_by_name_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T)  , INTENT(IN) :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+         INTEGER(SIZE_T) , INTENT(IN) :: namelen
+         INTEGER(HID_T)  , INTENT(IN) :: lapl_id
+
+       END FUNCTION h5oexists_by_name_c
+    END INTERFACE
+
+    namelen = LEN(name)
+
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+
+    status = h5oexists_by_name_c(loc_id, name, namelen, lapl_id_default)
+
+    link_exists = .FALSE.
+    IF(status.EQ.1)THEN
+       link_exists = .TRUE.
+    ENDIF
+
+    hdferr = 0
+    IF(status.LT.0)THEN
+       hdferr = -1
+    ENDIF
+
+  END SUBROUTINE h5oexists_by_name_f
+
+!>
+!! \ingroup FH5O
+!!
+!! \brief Retrieves comment for specified object.
+!!
+!! \param obj_id  Identifier for the target object.
+!! \param bufsize Size of the comment buffer.
+!! \param comment The comment.
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Oget_comment()
+!!
+  SUBROUTINE h5oget_comment_f(obj_id, comment, hdferr, bufsize)
+    IMPLICIT NONE
+    INTEGER(HID_T)   , INTENT(IN)            :: obj_id
+    CHARACTER(LEN=*) , INTENT(OUT)           :: comment
+    INTEGER          , INTENT(OUT)           :: hdferr
+    INTEGER(HSSIZE_T), INTENT(OUT), OPTIONAL :: bufsize
+
+    INTEGER(SIZE_T)   :: commentsize_default
+    INTEGER(HSSIZE_T) :: bufsize_default
+
+    INTERFACE
+       INTEGER FUNCTION h5oget_comment_c(obj_id, comment, commentsize_default, bufsize) &
+            BIND(C,NAME='h5oget_comment_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T, HSSIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T)  , INTENT(IN)  :: obj_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(OUT) :: comment
+         INTEGER(SIZE_T) , INTENT(IN)  :: commentsize_default
+         INTEGER(HSSIZE_T) , INTENT(OUT) :: bufsize
+       END FUNCTION h5oget_comment_c
+    END INTERFACE
+
+    commentsize_default = LEN(comment)
+
+    hdferr = h5oget_comment_c(obj_id, comment, commentsize_default, bufsize_default)
+
+    IF(PRESENT(bufsize)) bufsize = bufsize_default
+
+  END SUBROUTINE h5oget_comment_f
+
+!>
+!! \ingroup FH5O
+!!
+!! \brief Retrieves comment for specified object.
+!!
+!! \param loc_id  Identifier of a file, group, dataset, or named datatype.
+!! \param name    Name of the object whose comment is to be retrieved, specified as a path relative to loc_id.
+!! \param comment The comment.
+!! \param hdferr  \fortran_error
+!! \param bufsize Size of the comment buffer.
+!! \param lapl_id File access property list identifier.
+!!
+!! See C API: @ref H5Oget_comment_by_name()
+!!
+  SUBROUTINE h5oget_comment_by_name_f(loc_id, name, comment, hdferr, bufsize, lapl_id)
+    IMPLICIT NONE
+    INTEGER(HID_T)  , INTENT(IN)            :: loc_id
+    CHARACTER(LEN=*), INTENT(IN)            :: name
+    CHARACTER(LEN=*), INTENT(OUT)           :: comment
+    INTEGER         , INTENT(OUT)           :: hdferr
+    INTEGER(SIZE_T) , INTENT(OUT), OPTIONAL :: bufsize
+    INTEGER(HID_T)  , INTENT(IN) , OPTIONAL :: lapl_id
+
+    INTEGER(SIZE_T) :: commentsize_default
+    INTEGER(SIZE_T) :: name_size
+    INTEGER(SIZE_T) :: bufsize_default
+    INTEGER(HID_T)  :: lapl_id_default
+    INTERFACE
+       INTEGER FUNCTION h5oget_comment_by_name_c(loc_id, name, name_size, &
+            comment, commentsize_default, bufsize_default, lapl_id) BIND(C,NAME='h5oget_comment_by_name_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T)  , INTENT(IN)  :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN)  :: name
+         INTEGER(SIZE_T) , INTENT(IN)  :: name_size
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(OUT) :: comment
+         INTEGER(SIZE_T) , INTENT(IN)  :: commentsize_default
+         INTEGER(SIZE_T) , INTENT(OUT) :: bufsize_default
+         INTEGER(HID_T)  , INTENT(IN)  :: lapl_id
+       END FUNCTION h5oget_comment_by_name_c
+    END INTERFACE
+
+    commentsize_default = LEN(comment)
+    name_size = LEN(name)
+
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+
+    hdferr = h5oget_comment_by_name_c(loc_id, name, name_size, &
+         comment, commentsize_default, bufsize_default, lapl_id_default)
+
+    IF(PRESENT(bufsize)) bufsize = bufsize_default
+
+  END SUBROUTINE h5oget_comment_by_name_f
+
+!>
+!! \ingroup FH5O
+!!
+!! \brief Increments an object reference count.
+!!
+!! \param obj_id Object identifier.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Oincr_refcount()
+!!
+  SUBROUTINE h5oincr_refcount_f(obj_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN)  :: obj_id
+    INTEGER       , INTENT(OUT) :: hdferr
+
+    INTERFACE
+       INTEGER FUNCTION h5oincr_refcount_c(obj_id) BIND(C,NAME='h5oincr_refcount_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T)  , INTENT(IN) :: obj_id
+       END FUNCTION h5oincr_refcount_c
+    END INTERFACE
+
+    hdferr = h5oincr_refcount_c(obj_id)
+
+  END SUBROUTINE h5oincr_refcount_f
+
+!>
+!! \ingroup FH5O
+!!
+!! \brief Open the nth object in a group.
+!!
+!! \param loc_id     A file or group identifier.
+!! \param group_name Name of group, relative to loc_id, in which object is located.
+!! \param index_type Type of index by which objects are ordered.
+!! \param order      Order of iteration within index, NOTE: zero-based.
+!! \param n          Object to open.
+!! \param obj_id     An object identifier for the opened object.
+!! \param hdferr     \fortran_error
+!!
+!! \param lapl_id    Link access property list.
+!!
+!! See C API: @ref H5Oopen_by_idx()
+!!
+  SUBROUTINE h5oopen_by_idx_f(loc_id, group_name, index_type, order, n, obj_id, &
+       hdferr, lapl_id)
+    IMPLICIT NONE
+    INTEGER(HID_T)  , INTENT(IN)            :: loc_id
+    CHARACTER(LEN=*), INTENT(IN)            :: group_name
+    INTEGER         , INTENT(IN)            :: index_type
+    INTEGER         , INTENT(IN)            :: order
+    INTEGER(HSIZE_T), INTENT(IN)            :: n
+    INTEGER(HID_T)  , INTENT(OUT)           :: obj_id
+    INTEGER         , INTENT(OUT)           :: hdferr
+    INTEGER(HID_T)  , INTENT(IN) , OPTIONAL :: lapl_id
+    INTEGER(SIZE_T) :: group_namelen
+    INTEGER(HID_T)  :: lapl_id_default
+
+    INTERFACE
+       INTEGER FUNCTION h5oopen_by_idx_c(loc_id, group_name, group_namelen, index_type, order, n, obj_id, lapl_id_default) &
+            BIND(C,NAME='h5oopen_by_idx_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T)  , INTENT(IN)  :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN)  :: group_name
+         INTEGER(SIZE_T) , INTENT(IN)  :: group_namelen
+         INTEGER         , INTENT(IN)  :: index_type
+         INTEGER         , INTENT(IN)  :: order
+         INTEGER(HSIZE_T), INTENT(IN)  :: n
+         INTEGER(HID_T)  , INTENT(OUT) :: obj_id
+         INTEGER(HID_T)  , INTENT(IN)  :: lapl_id_default
+
+       END FUNCTION h5oopen_by_idx_c
+    END INTERFACE
+
+    group_namelen = LEN(group_name)
+
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+
+    hdferr = h5oopen_by_idx_c(loc_id, group_name, group_namelen, index_type, order, n, obj_id, lapl_id_default)
+
+  END SUBROUTINE H5Oopen_by_idx_f
+
+!>
+!! \ingroup FH5O
+!!
+!! \brief Sets comment for specified object.
+!!
+!! \param obj_id  Identifier of the target object.
+!! \param comment The new comment.
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Oset_comment()
+!!
+  SUBROUTINE h5oset_comment_f(obj_id, comment, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T)  , INTENT(IN)  :: obj_id
+    CHARACTER(LEN=*), INTENT(IN)  :: comment
+    INTEGER         , INTENT(OUT) :: hdferr
+    INTEGER(SIZE_T) :: commentlen
+
+    INTERFACE
+       INTEGER FUNCTION h5oset_comment_c(obj_id, comment, commentlen) BIND(C,NAME='h5oset_comment_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T)  , INTENT(IN) :: obj_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: comment
+         INTEGER(SIZE_T) , INTENT(IN) :: commentlen
+
+       END FUNCTION h5oset_comment_c
+    END INTERFACE
+
+    commentlen = LEN(comment)
+
+    hdferr = h5oset_comment_c(obj_id, comment, commentlen)
+
+  END SUBROUTINE h5oset_comment_f
+
+!>
+!! \ingroup FH5O
+!!
+!! \brief Sets comment for specified object.
+!!
+!! \param loc_id  Identifier of a file, group, dataset, or named datatype.
+!! \param name    Name of the object whose comment is to be set or reset, specified as a path relative to loc_id.
+!! \param comment The new comment.
+!! \param hdferr  \fortran_error
+!! \param lapl_id Link access property list identifier.
+!!
+!! See C API: @ref H5Oset_comment_by_name()
+!!
+  SUBROUTINE h5oset_comment_by_name_f(loc_id, name, comment, hdferr, lapl_id)
+    IMPLICIT NONE
+    INTEGER(HID_T)  , INTENT(IN)  :: loc_id
+    CHARACTER(LEN=*), INTENT(IN)  :: name
+    CHARACTER(LEN=*), INTENT(IN)  :: comment
+    INTEGER         , INTENT(OUT) :: hdferr
+    INTEGER(HID_T)  , INTENT(IN), OPTIONAL :: lapl_id
+    INTEGER(SIZE_T) :: commentlen
+    INTEGER(SIZE_T) :: namelen
+    INTEGER(HID_T) :: lapl_id_default
+
+    INTERFACE
+       INTEGER FUNCTION h5oset_comment_by_name_c(loc_id, name, namelen, comment, commentlen, lapl_id) &
+            BIND(C,NAME='h5oset_comment_by_name_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T)  , INTENT(IN) :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: comment
+         INTEGER(SIZE_T) , INTENT(IN) :: commentlen
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+         INTEGER(SIZE_T) , INTENT(IN) :: namelen
+         INTEGER(HID_T)  , INTENT(IN) :: lapl_id
+       END FUNCTION h5oset_comment_by_name_c
+    END INTERFACE
+
+    commentlen = LEN(comment)
+    namelen = LEN(name)
+
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+
+    hdferr = h5oset_comment_by_name_c(loc_id, name, namelen, comment, commentlen, lapl_id_default)
+
+  END SUBROUTINE h5oset_comment_by_name_f
+
+!>
+!! \ingroup FH5O
+!!
+!! \brief Recursively visits all objects starting from a specified object.
+!!
+!! \param object_id    Identifier of the object at which the recursive iteration begins.
+!! \param index_type   Type of index; valid values include:
+!!                     \li H5_INDEX_NAME_F
+!!                     \li H5_INDEX_CRT_ORDER_F
+!! \param order        Order in which index is traversed; valid values include:
+!!                     \li H5_ITER_DEC_F
+!!                     \li H5_ITER_INC_F
+!!                     \li H5_ITER_NATIVE_F
+!! \param op           Callback function passing data regarding the group to the calling application.
+!! \param op_data      User-defined pointer to data required by the application for its processing of the group.
+!! \param return_value Returns the return value of the first operator that returns a positive value, or
+!!                     zero if all members were processed with no operator returning non-zero.
+!! \param hdferr       \fortran_error
+!! \param fields       Flags specifying the fields to include in object_info.
+!!
+!! See C API: @ref H5Ovisit3()
+!!
+  SUBROUTINE h5ovisit_f(object_id, index_type, order, op, op_data, return_value, hdferr, fields)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: object_id
+    INTEGER, INTENT(IN) :: index_type
+    INTEGER, INTENT(IN) :: order
+
+    TYPE(C_FUNPTR):: op
+    TYPE(C_PTR)   :: op_data
+    INTEGER, INTENT(OUT) :: return_value
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER, INTENT(IN), OPTIONAL  :: fields
+    INTEGER :: fields_c
+
+    INTERFACE
+       INTEGER FUNCTION h5ovisit_c(object_id, index_type, order, op, op_data, fields) &
+            BIND(C, NAME='h5ovisit_c')
+         IMPORT :: C_FUNPTR, C_PTR
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: object_id
+         INTEGER, INTENT(IN) :: index_type
+         INTEGER, INTENT(IN) :: order
+         TYPE(C_FUNPTR), VALUE :: op
+         TYPE(C_PTR), VALUE :: op_data
+         INTEGER, INTENT(IN) :: fields
+       END FUNCTION h5ovisit_c
+    END INTERFACE
+
+    fields_c = H5O_INFO_ALL_F
+    IF(PRESENT(fields)) fields_c = fields
+
+    return_value = h5ovisit_c(object_id, index_type, order, op, op_data, fields_c)
+
+    IF(return_value.GE.0)THEN
+       hdferr = 0
+    ELSE
+       hdferr = -1
+    END IF
+
+  END SUBROUTINE h5ovisit_f
+
+!>
+!! \ingroup FH5O
+!!
+!! \brief Retrieves the metadata for an object, identifying the object by location and relative name.
+!!
+!! \param loc_id      File or group identifier specifying location of group in which object is located.
+!! \param name        Name of group, relative to loc_id.
+!! \param object_info Buffer in which to return object information.
+!! \param hdferr      \fortran_error
+!! \param lapl_id     Link access property list.
+!! \param fields      Flags specifying the fields to include in object_info.
+!!
+!! See C API: @ref H5Oget_info_by_name3()
+!!
+  SUBROUTINE h5oget_info_by_name_f(loc_id, name, object_info, hdferr, lapl_id, fields)
+    IMPLICIT NONE
+    INTEGER(HID_T)  , INTENT(IN)            :: loc_id
+    CHARACTER(LEN=*), INTENT(IN)            :: name
+    TYPE(h5o_info_t), INTENT(OUT), TARGET   :: object_info
+    INTEGER         , INTENT(OUT)           :: hdferr
+    INTEGER(HID_T)  , INTENT(IN) , OPTIONAL :: lapl_id
+    INTEGER         , INTENT(IN) , OPTIONAL :: fields
+
+    INTEGER(SIZE_T) :: namelen
+    INTEGER(HID_T)  :: lapl_id_default
+    TYPE(C_PTR)     :: ptr
+    INTEGER :: fields_c
+
+    INTERFACE
+       INTEGER FUNCTION h5oget_info_by_name_c(loc_id, name, namelen, lapl_id_default, object_info, fields) &
+            BIND(C, NAME='h5oget_info_by_name_c')
+         IMPORT :: c_char, c_ptr
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T)  , INTENT(IN)  :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+         INTEGER(SIZE_T) , INTENT(IN)  :: namelen
+         INTEGER(HID_T)  , INTENT(IN)  :: lapl_id_default
+         TYPE(C_PTR), VALUE            :: object_info
+         INTEGER         , INTENT(IN)  :: fields
+       END FUNCTION h5oget_info_by_name_c
+    END INTERFACE
+
+    fields_c = H5O_INFO_ALL_F
+    IF(PRESENT(fields)) fields_c = fields
+
+    namelen = LEN(name)
+
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+
+    ptr = C_LOC(object_info)
+
+    hdferr = H5Oget_info_by_name_c(loc_id, name, namelen, lapl_id_default, ptr, fields_c)
+
+  END SUBROUTINE H5Oget_info_by_name_f
+
+!>
+!! \ingroup FH5O
+!!
+!! \brief Retrieves the metadata for an object specified by an identifier.
+!!
+!! \param object_id   Identifier for target object.
+!! \param object_info Buffer in which to return object information.
+!! \param hdferr      \fortran_error
+!! \param fields      Flags specifying the fields to include in object_info.
+!!
+!! See C API: @ref H5Oget_info3()
+!!
+  SUBROUTINE h5oget_info_f(object_id, object_info, hdferr, fields)
+
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
+    IMPLICIT NONE
+    INTEGER(HID_T)  , INTENT(IN)            :: object_id
+    TYPE(h5o_info_t), INTENT(OUT), TARGET   :: object_info
+    INTEGER         , INTENT(OUT)           :: hdferr
+    INTEGER         , INTENT(IN), OPTIONAL  :: fields
+    TYPE(C_PTR) :: ptr
+    INTEGER :: fields_c
+
+    INTERFACE
+       INTEGER FUNCTION h5oget_info_c(object_id, object_info, fields) &
+            BIND(C, NAME='h5oget_info_c')
+         IMPORT :: C_PTR
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN)  :: object_id
+         TYPE(C_PTR), VALUE          :: object_info
+         INTEGER, INTENT(IN)         :: fields
+       END FUNCTION h5oget_info_c
+    END INTERFACE
+
+    fields_c = H5O_INFO_ALL_F
+    IF(PRESENT(fields)) fields_c = fields
+
+    ptr = C_LOC(object_info)
+    hdferr = H5Oget_info_c(object_id, ptr, fields_c)
+
+  END SUBROUTINE H5Oget_info_f
+
+!>
+!! \ingroup FH5O
+!!
+!! \brief Retrieves the metadata for an object, identifying the object by an index position.
+!!
+!! \param loc_id      File or group identifier specifying location of group in which object is located.
+!! \param group_name  Name of group in which object is located.
+!! \param index_field Index or field that determines the order.
+!! \param order       Order within field or index.
+!! \param n           Object for which information is to be returned.
+!! \param object_info Buffer in which to return object information.
+!! \param hdferr      \fortran_error
+!!
+!! \param lapl_id     Link access property list. (Not currently used.).
+!! \param fields      Flags specifying the fields to include in object_info.
+!!
+!! See C API: @ref H5Oget_info_by_idx3()
+!!
+  SUBROUTINE h5oget_info_by_idx_f(loc_id, group_name, index_field, order, n, &
+       object_info, hdferr, lapl_id, fields)
+
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
+    IMPLICIT NONE
+    INTEGER(HID_T)  , INTENT(IN)            :: loc_id
+    CHARACTER(LEN=*), INTENT(IN)            :: group_name
+    INTEGER         , INTENT(IN)            :: index_field
+    INTEGER         , INTENT(IN)            :: order
+    INTEGER(HSIZE_T), INTENT(IN)            :: n
+    TYPE(h5o_info_t), INTENT(OUT), TARGET   :: object_info
+    INTEGER         , INTENT(OUT)           :: hdferr
+    INTEGER(HID_T)  , INTENT(IN) , OPTIONAL :: lapl_id
+    INTEGER         , INTENT(IN) , OPTIONAL :: fields
+    INTEGER(SIZE_T) :: namelen
+    INTEGER(HID_T)  :: lapl_id_default
+    TYPE(C_PTR)     :: ptr
+    INTEGER         :: fields_c
+
+    INTERFACE
+       INTEGER FUNCTION h5oget_info_by_idx_c(loc_id, group_name, namelen, &
+            index_field, order, n, lapl_id_default, object_info, fields) BIND(C, NAME='h5oget_info_by_idx_c')
+         IMPORT :: c_char, c_ptr, c_funptr
+         IMPORT :: HID_T, SIZE_T, HSIZE_T
+         INTEGER(HID_T)  , INTENT(IN)  :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: group_name
+         INTEGER(SIZE_T) , INTENT(IN)  :: namelen
+         INTEGER         , INTENT(IN)  :: index_field
+         INTEGER         , INTENT(IN)  :: order
+         INTEGER(HSIZE_T), INTENT(IN)  :: n
+         INTEGER(HID_T)  , INTENT(IN)  :: lapl_id_default
+         TYPE(C_PTR), VALUE            :: object_info
+         INTEGER, INTENT(IN)           :: fields
+       END FUNCTION h5oget_info_by_idx_c
+    END INTERFACE
+
+    fields_c = H5O_INFO_ALL_F
+    IF(PRESENT(fields)) fields_c = fields
+
+    namelen = LEN(group_name)
+
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+
+    ptr = C_LOC(object_info)
+    hdferr = H5Oget_info_by_idx_c(loc_id, group_name, namelen, index_field, order, n, lapl_id_default, ptr, fields_c)
+
+  END SUBROUTINE H5Oget_info_by_idx_f
+
+
+!>
+!! \ingroup FH5O
+!!
+!! \brief Recursively visits all objects starting from a specified object.
+!!
+!! \param loc_id       Identifier of a file or group.
+!! \param object_name  Name of the object, generally relative to loc_id, that will serve as root of the iteration.
+!! \param index_type   Type of index; valid values include:
+!!                     \li H5_INDEX_NAME_F
+!!                     \li H5_INDEX_CRT_ORDER_F
+!! \param order        Order in which index is traversed; valid values include:
+!!                     \li H5_ITER_DEC_F
+!!                     \li H5_ITER_INC_F
+!!                     \li H5_ITER_NATIVE_F
+!! \param op           Callback function passing data regarding the group to the calling application.
+!! \param op_data      User-defined pointer to data required by the application for its processing of the group.
+!! \param return_value Returns the return value of the first operator that returns a positive value, or
+!!                     zero if all members were processed with no operator returning non-zero.
+!! \param hdferr       \fortran_error
+!! \param lapl_id      Link access property list identifier.
+!! \param fields       Flags specifying the fields to include in object_info.
+!!
+!! See C API: @ref H5Ovisit_by_name3()
+!!
+  SUBROUTINE h5ovisit_by_name_f(loc_id, object_name, index_type, order, op, op_data, &
+       return_value, hdferr, lapl_id, fields)
+    IMPLICIT NONE
+    INTEGER(HID_T)  , INTENT(IN)             :: loc_id
+    CHARACTER(LEN=*), INTENT(IN)             :: object_name
+    INTEGER         , INTENT(IN)             :: index_type
+    INTEGER         , INTENT(IN)             :: order
+
+    TYPE(C_FUNPTR)                           :: op
+    TYPE(C_PTR)                              :: op_data
+    INTEGER         , INTENT(OUT)            :: return_value
+    INTEGER         , INTENT(OUT)            :: hdferr
+    INTEGER(HID_T)  , INTENT(IN) , OPTIONAL  :: lapl_id
+    INTEGER         , INTENT(IN) , OPTIONAL  :: fields
+
+    INTEGER(SIZE_T) :: namelen
+    INTEGER(HID_T)  :: lapl_id_default
+    INTEGER :: fields_c
+
+    INTERFACE
+       INTEGER FUNCTION h5ovisit_by_name_c(loc_id, object_name, namelen, index_type, order, &
+            op, op_data, lapl_id, fields) BIND(C, NAME='h5ovisit_by_name_c')
+         IMPORT :: C_CHAR, C_PTR, C_FUNPTR
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T)  , INTENT(IN) :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: object_name
+         INTEGER(SIZE_T)              :: namelen
+         INTEGER         , INTENT(IN) :: index_type
+         INTEGER         , INTENT(IN) :: order
+         TYPE(C_FUNPTR)  , VALUE      :: op
+         TYPE(C_PTR)     , VALUE      :: op_data
+         INTEGER(HID_T)  , INTENT(IN) :: lapl_id
+         INTEGER         , INTENT(IN) :: fields
+       END FUNCTION h5ovisit_by_name_c
+    END INTERFACE
+
+    fields_c = H5O_INFO_ALL_F
+    IF(PRESENT(fields)) fields_c = fields
+
+    namelen = LEN(object_name)
+
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+
+    return_value = h5ovisit_by_name_c(loc_id, object_name, namelen, index_type, order, &
+         op, op_data, lapl_id_default, fields_c)
+
+    IF(return_value.GE.0)THEN
+       hdferr = 0
+    ELSE
+       hdferr = -1
+    END IF
+
+  END SUBROUTINE h5ovisit_by_name_f
+
+!>
+!! \ingroup FH5O
+!!
+!! \brief Compare two tokens, which must be from the same file / containers.
+!!
+!! \param loc_id    Identifier of an object in the file / container.
+!! \param token1    The first token to compare.
+!! \param token2    The second token to compare.
+!! \param cmp_value Returns 0 if tokens are equal, non-zero for unequal tokens.
+!! \param hdferr    \fortran_error
+!!
+!! See C API: @ref H5Otoken_cmp()
+!!
+  SUBROUTINE h5otoken_cmp_f(loc_id, token1, token2, cmp_value, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T)  , INTENT(IN)  :: loc_id
+    TYPE(H5O_TOKEN_T_F), INTENT(IN) :: token1
+    TYPE(H5O_TOKEN_T_F), INTENT(IN) :: token2
+    INTEGER         , INTENT(OUT) :: cmp_value
+    INTEGER         , INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5otoken_cmp_c(loc_id, token1, token2, cmp_value) BIND(C,NAME='h5otoken_cmp_c')
+         IMPORT :: HID_T, C_PTR, H5O_TOKEN_T_F
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN)     :: loc_id
+         TYPE(H5O_TOKEN_T_F), INTENT(IN) :: token1
+         TYPE(H5O_TOKEN_T_F), INTENT(IN) :: token2
+         INTEGER, INTENT(OUT)           :: cmp_value
+
+       END FUNCTION h5otoken_cmp_c
+    END INTERFACE
+
+    hdferr = h5otoken_cmp_c(loc_id, token1, token2, cmp_value)
+
+  END SUBROUTINE h5otoken_cmp_f
+
+END MODULE H5O
+
diff --git a/fortran/src/H5Off.f90 b/fortran/src/H5Off.f90
deleted file mode 100644
index 8a40079..0000000
--- a/fortran/src/H5Off.f90
+++ /dev/null
@@ -1,775 +0,0 @@
-!****h* ROBODoc/H5O
-!
-! NAME
-!  MODULE H5O
-!
-! FILE
-!  fortran/src/H5Off.f90
-!
-! PURPOSE
-!  This file contains Fortran interfaces for H5O functions. It includes
-!  all the functions that are independent on whether the Fortran 2003 functions
-!  are enabled or disabled.
-!
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! NOTES
-!                         *** IMPORTANT ***
-!  If you add a new H5O function you must add the function name to the
-!  Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
-!  This is needed for Windows based operating systems.
-!
-!*****
-
-MODULE H5O
-
-  USE H5GLOBAL
-
-CONTAINS
-
-!****s* H5O/h5olink_f
-!
-! NAME
-!  h5olink_f
-!
-! PURPOSE
-!  Creates a hard link to an object in an HDF5 file.
-!
-! Inputs:
-!  object_id 	 - Object to be linked.
-!  new_loc_id 	 - File or group identifier specifying location at which object is to be linked.
-!  new_link_name - Name of link to be created, relative to new_loc_id.
-!
-! Outputs:
-!  hdferr        - Returns 0 if successful and -1 if fails.
-!
-! Optional parameters:
-!  lcpl_id 	 - Link creation property list identifier.
-!  lapl_id 	 - Link access property list identifier.
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  April 21, 2008
-!
-! Fortran90 Interface:
-  SUBROUTINE h5olink_f(object_id, new_loc_id, new_link_name, hdferr, lcpl_id, lapl_id)
-    IMPLICIT NONE
-    INTEGER(HID_T)  , INTENT(IN)  :: object_id
-    INTEGER(HID_T)  , INTENT(IN)  :: new_loc_id
-    CHARACTER(LEN=*), INTENT(IN)  :: new_link_name
-    INTEGER         , INTENT(OUT) :: hdferr
-    INTEGER(HID_T)  , INTENT(IN), OPTIONAL :: lcpl_id
-    INTEGER(HID_T)  , INTENT(IN), OPTIONAL :: lapl_id
-!*****
-    INTEGER(HID_T) :: lapl_id_default
-    INTEGER(HID_T) :: lcpl_id_default
-
-    INTEGER(SIZE_T) :: new_link_namelen
-
-    INTERFACE
-       INTEGER FUNCTION h5olink_c(object_id, new_loc_id, new_link_name, new_link_namelen, &
-            lcpl_id_default, lapl_id_default)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5OLINK_C'::h5olink_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: new_link_name
-         INTEGER(HID_T), INTENT(IN) :: object_id
-         INTEGER(HID_T), INTENT(IN) :: new_loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: new_link_name
-         INTEGER(SIZE_T) :: new_link_namelen
-         INTEGER(HID_T) :: lapl_id_default
-         INTEGER(HID_T) :: lcpl_id_default
-       END FUNCTION h5olink_c
-    END INTERFACE
-
-    new_link_namelen = LEN(new_link_name)
-
-    lapl_id_default = H5P_DEFAULT_F
-    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
-    lcpl_id_default = H5P_DEFAULT_F
-    IF(PRESENT(lcpl_id)) lcpl_id_default = lcpl_id
-
-    hdferr = h5olink_c(object_id, new_loc_id, new_link_name, new_link_namelen, &
-         lcpl_id_default, lapl_id_default)
-
-  END SUBROUTINE h5olink_f
-
-!****s* H5O/h5oopen_f
-!
-! NAME
-!  h5oopen_f
-!
-! PURPOSE
-!  Opens an object in an HDF5 file by location identifier and path name.
-!
-! Inputs:
-!  loc_id  - File or group identifier.
-!  name    - Path to the object, relative to loc_id.
-!
-! Outputs:
-!  obj_id  - Object identifier for the opened object.
-!  hdferr  - Returns 0 if successful and -1 if fails.
-!
-! Optional parameters:
-!  lapl_id - Access property list identifier for the link pointing to the object.
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  April 18, 2008
-!
-! Fortran90 Interface:
-  SUBROUTINE h5oopen_f(loc_id, name, obj_id, hdferr, lapl_id)
-    IMPLICIT NONE
-    INTEGER(HID_T)  , INTENT(IN)  :: loc_id
-    CHARACTER(LEN=*), INTENT(IN)  :: name
-    INTEGER(HID_T)  , INTENT(OUT) :: obj_id
-    INTEGER         , INTENT(OUT) :: hdferr
-    INTEGER(HID_T)  , INTENT(IN), OPTIONAL :: lapl_id
-!*****
-    INTEGER(HID_T) :: lapl_id_default
-    INTEGER(SIZE_T) :: namelen
-
-    INTERFACE
-       INTEGER FUNCTION h5oopen_c(loc_id, name, namelen, lapl_id_default, obj_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5OOPEN_C'::h5oopen_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         INTEGER(HID_T), INTENT(IN) :: loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER(HID_T) :: lapl_id_default
-         INTEGER(SIZE_T) :: namelen
-         INTEGER(HID_T), INTENT(OUT) :: obj_id
-       END FUNCTION h5oopen_c
-    END INTERFACE
-
-    namelen = LEN(name)
-
-    lapl_id_default = H5P_DEFAULT_F
-    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
-
-    hdferr = h5oopen_c(loc_id, name, namelen, lapl_id_default, obj_id)
-
-  END SUBROUTINE h5oopen_f
-!
-!****s* H5O/h5oclose_f
-!
-! NAME
-!  h5oclose_f
-!
-! PURPOSE
-!  Closes an object in an HDF5 file.
-!
-! Inputs:
-!  object_id - Object identifier.
-!
-! Outputs:
-!  hdferr    - Returns 0 if successful and -1 if fails.
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  December 17, 2008
-!
-! Fortran90 Interface:
-  SUBROUTINE h5oclose_f(object_id, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN)   :: object_id
-    INTEGER       , INTENT(OUT) :: hdferr
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5oclose_c(object_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5OCLOSE_C'::h5oclose_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: object_id
-       END FUNCTION h5oclose_c
-    END INTERFACE
-
-    hdferr = h5oclose_c(object_id)
-  END SUBROUTINE h5oclose_f
-
-!
-!****s* H5O/h5open_by_addr_f
-! NAME		
-!  h5oopen_by_addr_f 
-!
-! PURPOSE
-!  Opens an object using its address within an HDF5 file. 
-!
-! Inputs:  
-!  loc_id - File or group identifier.
-!  addr   - Object’s address in the file.
-!
-! Outputs:
-!  obj_id - Object identifier for the opened object.
-!  hdferr - Returns 0 if successful and -1 if fails.
-!
-! AUTHOR	
-!  M. Scot Breitenfeld
-!  September 14, 2009
-! 
-! Fortran90 Interface:
-  SUBROUTINE h5oopen_by_addr_f(loc_id, addr, obj_id, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T)  , INTENT(IN)  :: loc_id
-    INTEGER(HADDR_T), INTENT(IN)  :: addr
-    INTEGER(HID_T)  , INTENT(OUT) :: obj_id
-    INTEGER         , INTENT(OUT) :: hdferr
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5oopen_by_addr_c(loc_id, addr, obj_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5OOPEN_BY_ADDR_C'::h5oopen_by_addr_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: loc_id
-         INTEGER(HADDR_T), INTENT(IN) :: addr
-         INTEGER(HID_T), INTENT(OUT) :: obj_id
-       END FUNCTION h5oopen_by_addr_c
-    END INTERFACE
-
-    hdferr = h5oopen_by_addr_c(loc_id, addr, obj_id)
-
-  END SUBROUTINE h5oopen_by_addr_f
-!
-!****s* H5O/h5ocopy_f
-! NAME		
-!  h5ocopy_f 
-!
-! PURPOSE
-!  Copies an object in an HDF5 file.
-!
-! Inputs:  
-!  src_loc_id - Object identifier indicating the location of the source object to be copied.
-!  src_name   - Name of the source object to be copied.
-!  dst_loc_id - Location identifier specifying the destination.
-!  dst_name   - Name to be assigned to the new copy.
-!
-! Optional parameters:
-!  ocpypl_id  - Object copy property list.
-!  lcpl_id    - Link creation property list for the new hard link.
-!
-! Outputs: 
-!  hdferr     - Returns 0 if successful and -1 if fails.
-!
-! AUTHOR	
-!  M. Scot Breitenfeld
-!  March 14, 2012
-! 
-! Fortran90 Interface:
-  SUBROUTINE h5ocopy_f(src_loc_id, src_name, dst_loc_id, dst_name, hdferr, ocpypl_id, lcpl_id)
-    IMPLICIT NONE
-    INTEGER(HID_T)  , INTENT(IN)  :: src_loc_id
-    CHARACTER(LEN=*), INTENT(IN)  :: src_name
-    INTEGER(HID_T)  , INTENT(IN)  :: dst_loc_id
-    CHARACTER(LEN=*), INTENT(IN)  :: dst_name
-    INTEGER         , INTENT(OUT) :: hdferr
-    INTEGER(HID_T)  , INTENT(IN), OPTIONAL :: ocpypl_id
-    INTEGER(HID_T)  , INTENT(IN), OPTIONAL :: lcpl_id
-!*****
-
-    INTEGER(SIZE_T) :: src_name_len, dst_name_len
-    INTEGER(HID_T)  :: ocpypl_id_default, lcpl_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5ocopy_c(src_loc_id, src_name, src_name_len, &
-            dst_loc_id, dst_name, dst_name_len, ocpypl_id_default, lcpl_id_default)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5OCOPY_C'::h5ocopy_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: src_name, dst_name
-         INTEGER(HID_T)  , INTENT(IN) :: src_loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: src_name
-         INTEGER(HID_T)  , INTENT(IN) :: dst_loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: dst_name
-         INTEGER(HID_T)  , INTENT(IN) :: ocpypl_id_default
-         INTEGER(HID_T)  , INTENT(IN) :: lcpl_id_default
-         INTEGER(SIZE_T)              :: src_name_len, dst_name_len
-
-       END FUNCTION h5ocopy_c
-    END INTERFACE
-
-    src_name_len = LEN(src_name)
-    dst_name_len = LEN(dst_name)
-
-    ocpypl_id_default = H5P_DEFAULT_F
-    IF(PRESENT(ocpypl_id)) ocpypl_id_default = ocpypl_id
-    lcpl_id_default = H5P_DEFAULT_F
-    IF(PRESENT(lcpl_id)) lcpl_id_default = lcpl_id
-
-    hdferr = h5ocopy_c(src_loc_id, src_name, src_name_len, &
-         dst_loc_id, dst_name, dst_name_len, ocpypl_id_default, lcpl_id_default)
-
-  END SUBROUTINE h5ocopy_f
-
-!****s* H5O/h5odecr_refcount_f
-! NAME		
-!  h5odecr_refcount_f
-!
-! PURPOSE
-!  Decrements an object reference count. 
-!
-! Inputs:  
-!  object_id - Object identifier.
-!
-! Outputs: 
-!  hdferr    - Returns 0 if successful and -1 if fails.
-!
-! AUTHOR	
-!  M. Scot Breitenfeld
-!  May 11, 2012
-! 
-! Fortran90 Interface:
-  SUBROUTINE h5odecr_refcount_f(object_id, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN)  :: object_id
-    INTEGER       , INTENT(OUT) :: hdferr
-!*****
-
-    INTERFACE
-       INTEGER FUNCTION h5odecr_refcount_c(object_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5ODECR_REFCOUNT_C'::h5odecr_refcount_c
-         !DEC$ENDIF
-         INTEGER(HID_T)  , INTENT(IN) :: object_id
-       END FUNCTION h5odecr_refcount_c
-    END INTERFACE
-
-    hdferr = h5odecr_refcount_c(object_id)  
-
-  END SUBROUTINE h5odecr_refcount_f
-
-!****s* H5O/h5oexists_by_name_f
-! NAME		
-!  h5oexists_by_name_f
-!
-! PURPOSE
-!  Determines whether a link resolves to an actual object.
-!
-! Inputs:
-!  loc_id   - Identifier of the file or group to query. 
-!  name     - The name of the link to check. 
-!    
-!
-! Optional parameters:
-!  lapl_id  - Link access property list identifier.
-!
-! Outputs: 
-!  link_exists - Existing link resolves to an object.
-!  hdferr      - Returns 0 if successful and -1 if fails.
-!
-! AUTHOR	
-!  M. Scot Breitenfeld
-!  May 11, 2012
-! 
-! Fortran90 Interface:
-  SUBROUTINE h5oexists_by_name_f(loc_id, name, link_exists, hdferr, lapl_id)
-    IMPLICIT NONE
-    INTEGER(HID_T)  , INTENT(IN)  :: loc_id
-    CHARACTER(LEN=*), INTENT(IN)  :: name
-    LOGICAL         , INTENT(OUT) :: link_exists
-    INTEGER         , INTENT(OUT) :: hdferr
-    INTEGER(HID_T)  , INTENT(IN), OPTIONAL :: lapl_id
-!*****
-
-    INTEGER(size_t) :: namelen
-    INTEGER :: status
-    INTEGER(HID_T) :: lapl_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5oexists_by_name_c(loc_id, name, namelen, lapl_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5OEXISTS_BY_NAME_C'::h5oexists_by_name_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         INTEGER(HID_T)  , INTENT(IN) :: loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER(SIZE_T) , INTENT(IN) :: namelen
-         INTEGER(HID_T)  , INTENT(IN) :: lapl_id
-
-       END FUNCTION h5oexists_by_name_c
-    END INTERFACE
-
-    namelen = LEN(name)
-    
-    lapl_id_default = H5P_DEFAULT_F
-    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
-
-    status = h5oexists_by_name_c(loc_id, name, namelen, lapl_id_default)
-
-    link_exists = .FALSE.
-    IF(status.EQ.1)THEN
-       link_exists = .TRUE.
-    ENDIF
-
-    hdferr = 0
-    IF(status.LT.0)THEN
-       hdferr = -1
-    ENDIF
-
-  END SUBROUTINE h5oexists_by_name_f
-
-!****s* H5O/h5oget_comment_f
-! NAME		
-!  h5oget_comment_f
-!
-! PURPOSE
-!  Retrieves comment for specified object. 
-!
-! Inputs:
-!  obj_id - Identifier for the target object.
-!
-! Optional parameters:
-!  bufsize - Size of the comment buffer.
-!
-! Outputs: 
-!  comment - The comment.
-!  hdferr  - Returns 0 if successful and -1 if fails.
-!
-! AUTHOR	
-!  M. Scot Breitenfeld
-!  May 11, 2012
-! 
-! Fortran90 Interface:
-  SUBROUTINE h5oget_comment_f(obj_id, comment, hdferr, bufsize)
-    IMPLICIT NONE
-    INTEGER(HID_T)   , INTENT(IN)            :: obj_id
-    CHARACTER(LEN=*) , INTENT(OUT)           :: comment
-    INTEGER          , INTENT(OUT)           :: hdferr
-    INTEGER(HSSIZE_T), INTENT(OUT), OPTIONAL :: bufsize 
-!*****
-
-    INTEGER(SIZE_T)   :: commentsize_default
-    INTEGER(HSSIZE_T) :: bufsize_default
-
-    INTERFACE
-       INTEGER FUNCTION h5oget_comment_c(obj_id, comment, commentsize_default, bufsize)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5OGET_COMMENT_C'::h5oget_comment_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: comment
-         INTEGER(HID_T)  , INTENT(IN)  :: obj_id
-         CHARACTER(LEN=*), INTENT(OUT) :: comment
-         INTEGER(SIZE_T) , INTENT(IN)  :: commentsize_default
-         INTEGER(HSSIZE_T) , INTENT(OUT) :: bufsize
-       END FUNCTION h5oget_comment_c
-    END INTERFACE
-
-    commentsize_default = LEN(comment)
-
-    hdferr = h5oget_comment_c(obj_id, comment, commentsize_default, bufsize_default)
-    
-    IF(PRESENT(bufsize)) bufsize = bufsize_default
-
-  END SUBROUTINE h5oget_comment_f
-
-!****s* H5O/h5oget_comment_by_name_f
-! NAME		
-!  h5oget_comment_by_name_f
-!
-! PURPOSE
-!  Retrieves comment for specified object.
-!
-! Inputs:
-!  loc_id   - Identifier of a file, group, dataset, or named datatype.
-!  name     - Name of the object whose comment is to be retrieved, 
-!             specified as a path relative to loc_id. 
-!
-! Optional parameters:
-!  bufsize  - Size of the comment buffer.
-!
-! Outputs: 
-!  comment  - The comment.
-!  hdferr   - Returns 0 if successful and -1 if fails.
-!
-! AUTHOR	
-!  M. Scot Breitenfeld
-!  July 6, 2012
-! 
-! Fortran90 Interface:
-  SUBROUTINE h5oget_comment_by_name_f(loc_id, name, comment, hdferr, bufsize, lapl_id)
-    IMPLICIT NONE
-    INTEGER(HID_T)  , INTENT(IN)            :: loc_id
-    CHARACTER(LEN=*), INTENT(IN)            :: name
-    CHARACTER(LEN=*), INTENT(OUT)           :: comment
-    INTEGER         , INTENT(OUT)           :: hdferr
-    INTEGER(SIZE_T) , INTENT(OUT), OPTIONAL :: bufsize 
-    INTEGER(HID_T)  , INTENT(IN) , OPTIONAL :: lapl_id 
-!*****
-
-    INTEGER(SIZE_T) :: commentsize_default
-    INTEGER(SIZE_T) :: name_size
-    INTEGER(SIZE_T) :: bufsize_default
-    INTEGER(HID_T)  :: lapl_id_default
-    INTERFACE
-       INTEGER FUNCTION h5oget_comment_by_name_c(loc_id, name, name_size, &
-            comment, commentsize_default, bufsize_default, lapl_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5OGET_COMMENT_BY_NAME_C'::h5oget_comment_by_name_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: comment, name
-         INTEGER(HID_T)  , INTENT(IN)  :: loc_id
-         CHARACTER(LEN=*), INTENT(IN)  :: name
-         INTEGER(SIZE_T) , INTENT(IN)  :: name_size
-         CHARACTER(LEN=*), INTENT(OUT) :: comment
-         INTEGER(SIZE_T) , INTENT(IN)  :: commentsize_default
-         INTEGER(SIZE_T) , INTENT(OUT) :: bufsize_default
-         INTEGER(HID_T)  , INTENT(IN)  :: lapl_id
-       END FUNCTION h5oget_comment_by_name_c
-    END INTERFACE
-
-    commentsize_default = LEN(comment)
-    name_size = LEN(name)
-
-    lapl_id_default = H5P_DEFAULT_F
-    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
-
-    hdferr = h5oget_comment_by_name_c(loc_id, name, name_size, &
-         comment, commentsize_default, bufsize_default, lapl_id_default)
-    
-    IF(PRESENT(bufsize)) bufsize = bufsize_default
-
-  END SUBROUTINE h5oget_comment_by_name_f
-
-!****s* H5O/h5oincr_refcount_f
-! NAME		
-!  h5oincr_refcount_f
-!
-! PURPOSE
-!  Increments an object reference count.
-!
-! Inputs:  
-!  obj_id  - Object identifier.
-!
-! Outputs: 
-!  hdferr  - Returns 0 if successful and -1 if fails.
-!
-! AUTHOR	
-!  M. Scot Breitenfeld
-!  May 15, 2012
-! 
-! Fortran90 Interface:
-  SUBROUTINE h5oincr_refcount_f(obj_id, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN)  :: obj_id
-    INTEGER       , INTENT(OUT) :: hdferr
-!*****
-
-    INTERFACE
-       INTEGER FUNCTION h5oincr_refcount_c(obj_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5OINCR_REFCOUNT_C'::h5oincr_refcount_c
-         !DEC$ENDIF
-         INTEGER(HID_T)  , INTENT(IN) :: obj_id
-       END FUNCTION h5oincr_refcount_c
-    END INTERFACE
-
-    hdferr = h5oincr_refcount_c(obj_id) 
-
-  END SUBROUTINE h5oincr_refcount_f
-
-!****s* H5O/h5oopen_by_idx_f
-!
-! NAME
-!  h5oopen_by_idx_f
-!
-! PURPOSE
-!  Open the nth object in a group. 
-!
-! Inputs:
-!  loc_id      - A file or group identifier.
-!  group_name  - Name of group, relative to loc_id, in which object is located.
-!  index_type  - Type of index by which objects are ordered.
-!  order       - Order of iteration within index, NOTE: zero-based.
-!  n           - Object to open.
-!
-! Outputs:
-!  obj_id      - An object identifier for the opened object.
-!  hdferr      - Returns 0 if successful and -1 if fails.
-!
-! Optional parameters:
-!  lapl_id     - Link access property list.
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  May 17, 2012
-!
-! Fortran90 Interface:
-  SUBROUTINE h5oopen_by_idx_f(loc_id, group_name, index_type, order, n, obj_id, &
-       hdferr, lapl_id)
-    IMPLICIT NONE
-    INTEGER(HID_T)  , INTENT(IN)            :: loc_id
-    CHARACTER(LEN=*), INTENT(IN)            :: group_name
-    INTEGER         , INTENT(IN)            :: index_type
-    INTEGER         , INTENT(IN)            :: order
-    INTEGER(HSIZE_T), INTENT(IN)            :: n
-    INTEGER(HID_T)  , INTENT(OUT)           :: obj_id
-    INTEGER         , INTENT(OUT)           :: hdferr
-    INTEGER(HID_T)  , INTENT(IN) , OPTIONAL :: lapl_id
-!*****
-    INTEGER(SIZE_T) :: group_namelen
-    INTEGER(HID_T)  :: lapl_id_default
-    
-    INTERFACE
-       INTEGER FUNCTION h5oopen_by_idx_c(loc_id, group_name, group_namelen, index_type, order, n, obj_id, lapl_id_default)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5OOPEN_BY_IDX_C'::h5oopen_by_idx_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: group_name
-         INTEGER(HID_T)  , INTENT(IN)  :: loc_id
-         CHARACTER(LEN=*), INTENT(IN)  :: group_name
-         INTEGER(SIZE_T) , INTENT(IN)  :: group_namelen
-         INTEGER         , INTENT(IN)  :: index_type
-         INTEGER         , INTENT(IN)  :: order
-         INTEGER(HSIZE_T), INTENT(IN)  :: n
-         INTEGER(HID_T)  , INTENT(OUT) :: obj_id
-         INTEGER(HID_T)  , INTENT(IN)  :: lapl_id_default
-
-       END FUNCTION h5oopen_by_idx_c
-    END INTERFACE
-
-    group_namelen = LEN(group_name)
-
-    lapl_id_default = H5P_DEFAULT_F
-    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
-
-    hdferr = h5oopen_by_idx_c(loc_id, group_name, group_namelen, index_type, order, n, obj_id, lapl_id_default)
-
-  END SUBROUTINE H5Oopen_by_idx_f
-
-!****s* H5O/h5oset_comment_f
-! NAME		
-!  h5oset_comment_f
-!
-! PURPOSE
-!  Sets comment for specified object.
-!
-! Inputs:  
-!  obj_id    - Identifier of the target object.
-!  comment   - The new comment.
-!
-! Outputs: 
-!  hdferr    - Returns 0 if successful and -1 if fails.
-!
-! AUTHOR	
-!  M. Scot Breitenfeld
-!  May 15, 2012
-! 
-! Fortran90 Interface:
-  SUBROUTINE h5oset_comment_f(obj_id, comment, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T)  , INTENT(IN)  :: obj_id
-    CHARACTER(LEN=*), INTENT(IN)  :: comment
-    INTEGER         , INTENT(OUT) :: hdferr
-!*****
-    INTEGER(SIZE_T) :: commentlen
-
-    INTERFACE
-       INTEGER FUNCTION h5oset_comment_c(obj_id, comment, commentlen)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5OSET_COMMENT_C'::h5oset_comment_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: comment
-         INTEGER(HID_T)  , INTENT(IN) :: obj_id
-         CHARACTER(LEN=*), INTENT(IN) :: comment
-         INTEGER(SIZE_T) , INTENT(IN) :: commentlen
-
-       END FUNCTION h5oset_comment_c
-    END INTERFACE
-
-    commentlen = LEN(comment)
-    
-    hdferr = h5oset_comment_c(obj_id, comment, commentlen)
-
-  END SUBROUTINE h5oset_comment_f
-
-!****s* H5O/h5oset_comment_by_name_f
-! NAME		
-!  h5oset_comment_by_name_f
-!
-! PURPOSE
-!  Sets comment for specified object. 
-!
-! Inputs:  
-!  loc_id   - Identifier of a file, group, dataset, or named datatype.
-!  name     - Name of the object whose comment is to be set or reset, 
-!              specified as a path relative to loc_id. 
-!  comment  - The new comment.
-!
-! Outputs: 
-!  hdferr   - Returns 0 if successful and -1 if fails.
-!
-! Optional parameters:
-!  lapl_id  - Link access property list identifier.
-!
-! AUTHOR	
-!  M. Scot Breitenfeld
-!  May 15, 2012
-! 
-! Fortran90 Interface:
-  SUBROUTINE h5oset_comment_by_name_f(loc_id, name, comment, hdferr, lapl_id)
-    IMPLICIT NONE
-    INTEGER(HID_T)  , INTENT(IN)  :: loc_id
-    CHARACTER(LEN=*), INTENT(IN)  :: name
-    CHARACTER(LEN=*), INTENT(IN)  :: comment
-    INTEGER         , INTENT(OUT) :: hdferr
-    INTEGER(HID_T)  , INTENT(IN), OPTIONAL :: lapl_id
-!*****
-    INTEGER(SIZE_T) :: commentlen
-    INTEGER(SIZE_T) :: namelen
-    INTEGER(HID_T) :: lapl_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5oset_comment_by_name_c(loc_id, name, namelen, comment, commentlen, lapl_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5OSET_COMMENT_BY_NAME_C'::h5oset_comment_by_name_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name, comment
-         INTEGER(HID_T)  , INTENT(IN) :: loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: comment
-         INTEGER(SIZE_T) , INTENT(IN) :: commentlen
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER(SIZE_T) , INTENT(IN) :: namelen
-         INTEGER(HID_T)  , INTENT(IN) :: lapl_id
-       END FUNCTION h5oset_comment_by_name_c
-    END INTERFACE
-
-    commentlen = LEN(comment)
-    namelen = LEN(name)
-
-    lapl_id_default = H5P_DEFAULT_F
-    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
-    
-    hdferr = h5oset_comment_by_name_c(loc_id, name, namelen, comment, commentlen, lapl_id_default)
-
-  END SUBROUTINE h5oset_comment_by_name_f
-
-END MODULE H5O
-
diff --git a/fortran/src/H5Off_F03.f90 b/fortran/src/H5Off_F03.f90
deleted file mode 100644
index 36b6246..0000000
--- a/fortran/src/H5Off_F03.f90
+++ /dev/null
@@ -1,435 +0,0 @@
-!****h* ROBODoc/H5O (F03)
-!
-! NAME
-!  H5O_PROVISIONAL
-!
-! PURPOSE
-!  This file contains Fortran 90 and Fortran 2003 interfaces for H5O functions.
-!  It contains the same functions as H5Off_F90.f90 but includes the
-!  Fortran 2003 functions and the interface listings. This file will be compiled
-!  instead of H5Off_F90.f90 if Fortran 2003 functions are enabled.
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! NOTES
-!                         *** IMPORTANT ***
-!  If you add a new H5P function you must add the function name to the
-!  Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
-!  This is needed for Windows based operating systems.
-!
-!*****
-
-MODULE H5O_PROVISIONAL
-
-  USE H5GLOBAL
-  USE, INTRINSIC :: ISO_C_BINDING
-
-  IMPLICIT NONE
-
-!****t* H5T (F03)/h5o_info_t
-!
-! Fortran2003 Derived Type:
-!
-  TYPE, BIND(C) :: space_t
-     INTEGER(hsize_t) :: total ! Total space for storing object header in file
-     INTEGER(hsize_t) :: meta  ! Space within header for object header metadata information
-     INTEGER(hsize_t) :: mesg  ! Space within header for actual message information
-     INTEGER(hsize_t) :: free  ! Free space within object header
-  END TYPE space_t
-
-  TYPE, BIND(C) :: mesg_t
-     INTEGER(c_int64_t) :: present ! Flags to indicate presence of message type in header 
-     INTEGER(c_int64_t) :: shared  ! Flags to indicate message type is shared in header
-  END TYPE mesg_t
-  
-  TYPE, BIND(C) :: hdr_t
-     INTEGER :: version ! Version number of header format in file
-     INTEGER :: nmesgs  ! Number of object header messages
-     INTEGER :: nchunks ! Number of object header chunks
-     INTEGER :: flags   ! Object header status flags
-     TYPE(space_t)  :: space   
-     TYPE(mesg_t)   :: mesg
-  END TYPE hdr_t
-
-  ! Extra metadata storage for obj & attributes
-  TYPE, BIND(C) :: H5_ih_info_t
-     INTEGER(hsize_t) :: index_size ! btree and/or list
-     INTEGER(hsize_t) :: heap_size
-  END TYPE H5_ih_info_t
-
-  TYPE, BIND(C) :: meta_size_t
-     TYPE(H5_ih_info_t) :: obj  ! v1/v2 B-tree & local/fractal heap for groups, B-tree for chunked datasets
-     TYPE(H5_ih_info_t) :: attr ! v2 B-tree & heap for attributes
-  ENDTYPE meta_size_t
-  
-  TYPE, BIND(C) :: h5o_info_t
-     INTEGER(C_LONG)  :: fileno     ! File number that object is located in
-     INTEGER(haddr_t) :: addr       ! Object address in file  
-     INTEGER(C_INT)   :: type       ! Basic object type (group, dataset, etc.) 
-     INTEGER          :: rc         ! Reference count of object
-
-     INTEGER, DIMENSION(8) :: atime ! Access time         !    -- NOTE --
-     INTEGER, DIMENSION(8) :: mtime ! Modification time   ! Returns an integer array    
-     INTEGER, DIMENSION(8) :: ctime ! Change time         ! as specified in the Fortran 
-     INTEGER, DIMENSION(8) :: btime ! Birth time          ! intrinsic DATE_AND_TIME(VALUES)
-
-     INTEGER(hsize_t) :: num_attrs  ! # of attributes attached to object
-
-     TYPE(hdr_t) :: hdr
-
-     TYPE(meta_size_t) :: meta_size
-  END TYPE h5o_info_t
-
-!*****
-
-CONTAINS
-
-!****s* H5O (F03)/h5ovisit_f_F03
-!
-! NAME
-!  h5ovisit_f
-!
-! PURPOSE
-!  Recursively visits all objects starting from a specified object.
-!
-! Inputs:
-!  object_id  - Identifier of the object at which the recursive iteration begins.
-!  index_type - Type of index; valid values include:
-!                H5_INDEX_NAME_F
-!                H5_INDEX_CRT_ORDER_F
-!  order      - Order in which index is traversed; valid values include:
-!                H5_ITER_DEC_F
-!                H5_ITER_INC_F
-!                H5_ITER_NATIVE_F
-!  op 	      - Callback function passing data regarding the group to the calling application
-!  op_data    - User-defined pointer to data required by the application for its processing of the group
-!
-! Outputs:
-!  return_value - returns the return value of the first operator that returns a positive value, or 
-!                 zero if all members were processed with no operator returning non-zero.
-!  hdferr       - Returns 0 if successful and -1 if fails
-! AUTHOR
-!  M. Scot Breitenfeld
-!  November 19, 2008
-!
-! Fortran2003 Interface:
-  SUBROUTINE h5ovisit_f(object_id, index_type, order, op, op_data, return_value, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: object_id
-    INTEGER, INTENT(IN) :: index_type 
-    INTEGER, INTENT(IN) :: order
-
-    TYPE(C_FUNPTR):: op
-    TYPE(C_PTR)   :: op_data
-    INTEGER, INTENT(OUT) :: return_value
-    INTEGER, INTENT(OUT) :: hdferr
-!*****
-
-    INTERFACE
-       INTEGER FUNCTION h5ovisit_c(object_id, index_type, order, op, op_data) &
-            BIND(C, NAME='h5ovisit_c')
-         USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_ptr, c_funptr
-         USE H5GLOBAL
-         INTEGER(HID_T), INTENT(IN) :: object_id
-         INTEGER, INTENT(IN) :: index_type
-         INTEGER, INTENT(IN) :: order
-         TYPE(C_FUNPTR), VALUE :: op
-         TYPE(C_PTR), VALUE :: op_data
-       END FUNCTION h5ovisit_c
-    END INTERFACE
-
-    return_value = h5ovisit_c(object_id, index_type, order, op, op_data)
-
-    IF(return_value.GE.0)THEN
-       hdferr = 0
-    ELSE
-       hdferr = -1
-    END IF
-
-  END SUBROUTINE h5ovisit_f
-
-!****s* H5O (F03)/h5oget_info_by_name_f_F03
-!
-! NAME
-!  h5oget_info_by_name_f
-!
-! PURPOSE
-!  Retrieves the metadata for an object, identifying the object by location and relative name.
-!
-! Inputs:
-!  loc_id      - File or group identifier specifying location of group 
-!                in which object is located.
-!  name        - Name of group, relative to loc_id.
-!
-! Outputs:  
-!  object_info - Buffer in which to return object information.
-!  hdferr      - Returns 0 if successful and -1 if fails.
-!
-! Optional parameters:
-!  lapl_id     - Link access property list.
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  December 1, 2008
-!
-! Fortran2003 Interface:
-  SUBROUTINE h5oget_info_by_name_f(loc_id, name, object_info, hdferr, lapl_id)
-
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T)  , INTENT(IN)            :: loc_id
-    CHARACTER(LEN=*), INTENT(IN)            :: name
-    TYPE(h5o_info_t), INTENT(OUT), TARGET   :: object_info
-    INTEGER         , INTENT(OUT)           :: hdferr
-    INTEGER(HID_T)  , INTENT(IN) , OPTIONAL :: lapl_id
-!*****
-    INTEGER(SIZE_T) :: namelen
-    INTEGER(HID_T)  :: lapl_id_default
-    TYPE(C_PTR)     :: ptr
-    
-    INTERFACE
-       INTEGER FUNCTION h5oget_info_by_name_c(loc_id, name, namelen, lapl_id_default, object_info) &
-            BIND(C, NAME='h5oget_info_by_name_c')
-         USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_char, c_ptr
-         USE H5GLOBAL
-         INTEGER(HID_T)  , INTENT(IN)  :: loc_id
-         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
-         INTEGER(SIZE_T) , INTENT(IN)  :: namelen
-         INTEGER(HID_T)  , INTENT(IN)  :: lapl_id_default
-         TYPE(C_PTR),VALUE             :: object_info
-
-       END FUNCTION h5oget_info_by_name_c
-    END INTERFACE
-
-    namelen = LEN(name)
-
-    lapl_id_default = H5P_DEFAULT_F
-    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
-
-    ptr = C_LOC(object_info)
-
-    hdferr = H5Oget_info_by_name_c(loc_id, name, namelen, lapl_id_default, ptr)
-
-  END SUBROUTINE H5Oget_info_by_name_f
-
-!****s* H5O (F03)/h5oget_info_f_F03
-!
-! NAME
-!  h5oget_info_f
-!
-! PURPOSE
-!  Retrieves the metadata for an object specified by an identifier.
-!
-! Inputs:
-!  object_id   - Identifier for target object.
-!
-! Outputs:
-!  object_info - Buffer in which to return object information.
-!  hdferr      - Returns 0 if successful and -1 if fails.
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  May 11, 2012
-!
-! Fortran2003 Interface:
-  SUBROUTINE h5oget_info_f(object_id, object_info, hdferr)
-
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T)  , INTENT(IN)            :: object_id
-    TYPE(h5o_info_t), INTENT(OUT), TARGET   :: object_info
-    INTEGER         , INTENT(OUT)           :: hdferr
-!*****
-    TYPE(C_PTR) :: ptr
-    
-    INTERFACE
-       INTEGER FUNCTION h5oget_info_c(object_id, object_info) &
-            BIND(C, NAME='h5oget_info_c')
-         USE H5GLOBAL
-         USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_ptr
-         INTEGER(HID_T), INTENT(IN)  :: object_id
-         TYPE(C_PTR), VALUE          :: object_info
-       END FUNCTION h5oget_info_c
-    END INTERFACE
-
-    ptr = C_LOC(object_info)
-    hdferr = H5Oget_info_c(object_id, ptr)
-
-  END SUBROUTINE H5Oget_info_f
-
-!****s* H5O (F03)/h5oget_info_by_idx_f_F03
-!
-! NAME
-!  h5oget_info_by_idx_f
-!
-! PURPOSE
-!  Retrieves the metadata for an object, identifying the object by an index position.
-!
-! Inputs:
-!  loc_id      - File or group identifier specifying location of group 
-!                in which object is located.
-!  group_name  - Name of group in which object is located.
-!  index_field - Index or field that determines the order.
-!  order       - Order within field or index.
-!  n           - Object for which information is to be returned
-!
-! Outputs:  
-!  object_info - Buffer in which to return object information.
-!  hdferr      - Returns 0 if successful and -1 if fails.
-!
-! Optional parameters:
-!  lapl_id     - Link access property list. (Not currently used.)
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  May 11, 2012
-!
-! Fortran2003 Interface:
-  SUBROUTINE h5oget_info_by_idx_f(loc_id, group_name, index_field, order, n, &
-       object_info, hdferr, lapl_id)
-
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T)  , INTENT(IN)            :: loc_id
-    CHARACTER(LEN=*), INTENT(IN)            :: group_name
-    INTEGER         , INTENT(IN)            :: index_field
-    INTEGER         , INTENT(IN)            :: order
-    INTEGER(HSIZE_T), INTENT(IN)            :: n
-    TYPE(h5o_info_t), INTENT(OUT), TARGET   :: object_info
-    INTEGER         , INTENT(OUT)           :: hdferr
-    INTEGER(HID_T)  , INTENT(IN) , OPTIONAL :: lapl_id
-!*****
-    INTEGER(SIZE_T) :: namelen
-    INTEGER(HID_T)  :: lapl_id_default
-    TYPE(C_PTR)     :: ptr
-    
-    INTERFACE
-       INTEGER FUNCTION h5oget_info_by_idx_c(loc_id, group_name, namelen, &
-            index_field, order, n, lapl_id_default, object_info) BIND(C, NAME='h5oget_info_by_idx_c')
-         USE H5GLOBAL
-         USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_char, c_ptr, c_funptr
-         INTEGER(HID_T)  , INTENT(IN)  :: loc_id
-         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: group_name
-         INTEGER(SIZE_T) , INTENT(IN)  :: namelen
-         INTEGER         , INTENT(IN)  :: index_field
-         INTEGER         , INTENT(IN)  :: order
-         INTEGER(HSIZE_T), INTENT(IN)  :: n
-         INTEGER(HID_T)  , INTENT(IN)  :: lapl_id_default
-         TYPE(C_PTR), VALUE            :: object_info
-
-       END FUNCTION h5oget_info_by_idx_c
-    END INTERFACE
-
-    namelen = LEN(group_name)
-
-    lapl_id_default = H5P_DEFAULT_F
-    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
-
-    ptr = C_LOC(object_info)
-    hdferr = H5Oget_info_by_idx_c(loc_id, group_name, namelen, index_field, order, n, lapl_id_default, ptr)
-
-  END SUBROUTINE H5Oget_info_by_idx_f
-
-
-!****s* H5O (F03)/h5ovisit_by_name_f_F03
-!
-! NAME
-!  h5ovisit_by_name_f
-!
-! PURPOSE
-!  Recursively visits all objects starting from a specified object.
-!
-! Inputs:
-!  loc_id      - Identifier of a file or group.
-!  object_name - Name of the object, generally relative to loc_id, that will serve as root of the iteration 
-!  index_type  - Type of index; valid values include:
-!                 H5_INDEX_NAME_F
-!                 H5_INDEX_CRT_ORDER_F
-!  order       - Order in which index is traversed; valid values include:
-!                 H5_ITER_DEC_F
-!                 H5_ITER_INC_F
-!                 H5_ITER_NATIVE_F
-!  op 	       - Callback function passing data regarding the group to the calling application
-!  op_data     - User-defined pointer to data required by the application for its processing of the group
-!
-! Outputs:
-!  return_value - Returns the return value of the first operator that returns a positive value, or 
-!                 zero if all members were processed with no operator returning non-zero.
-!  hdferr       - Returns 0 if successful and -1 if fails
-!
-! Optional parameters:
-!  lapl_id      - Link access property list identifier.
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  November 19, 2008
-!
-! Fortran2003 Interface:
-  SUBROUTINE h5ovisit_by_name_f(loc_id, object_name, index_type, order, op, op_data, &
-       return_value, hdferr, lapl_id)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T)  , INTENT(IN)             :: loc_id
-    CHARACTER(LEN=*), INTENT(IN)             :: object_name
-    INTEGER         , INTENT(IN)             :: index_type 
-    INTEGER         , INTENT(IN)             :: order
-
-    TYPE(C_FUNPTR)                           :: op
-    TYPE(C_PTR)                              :: op_data
-    INTEGER         , INTENT(OUT)            :: return_value
-    INTEGER         , INTENT(OUT)            :: hdferr
-    INTEGER(HID_T)  , INTENT(IN) , OPTIONAL  :: lapl_id
-!*****
-
-    INTEGER(SIZE_T) :: namelen
-    INTEGER(HID_T)  :: lapl_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5ovisit_by_name_c(loc_id, object_name, namelen, index_type, order, &
-            op, op_data, lapl_id) BIND(C, NAME='h5ovisit_by_name_c')
-         USE, INTRINSIC :: ISO_C_BINDING
-         USE H5GLOBAL
-         INTEGER(HID_T)  , INTENT(IN) :: loc_id
-         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: object_name
-         INTEGER(SIZE_T)              :: namelen
-         INTEGER         , INTENT(IN) :: index_type
-         INTEGER         , INTENT(IN) :: order
-         TYPE(C_FUNPTR)  , VALUE      :: op
-         TYPE(C_PTR)     , VALUE      :: op_data
-         INTEGER(HID_T)  , INTENT(IN) :: lapl_id
-       END FUNCTION h5ovisit_by_name_c
-    END INTERFACE
-
-    namelen = LEN(object_name)
-
-    lapl_id_default = H5P_DEFAULT_F
-    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
-
-    return_value = h5ovisit_by_name_c(loc_id, object_name, namelen, index_type, order, &
-         op, op_data, lapl_id_default)
-
-    IF(return_value.GE.0)THEN
-       hdferr = 0
-    ELSE
-       hdferr = -1
-    END IF
-
-  END SUBROUTINE h5ovisit_by_name_f
-
-END MODULE H5O_PROVISIONAL
-
diff --git a/fortran/src/H5Off_F90.f90 b/fortran/src/H5Off_F90.f90
deleted file mode 100644
index 5688c5d..0000000
--- a/fortran/src/H5Off_F90.f90
+++ /dev/null
@@ -1,39 +0,0 @@
-!****h* ROBODoc/H5O (F90)
-!
-! NAME
-!  MODULE H5O_PROVISIONAL
-!
-! PURPOSE
-!  This file contains Fortran 90 interfaces for H5O functions. It contains
-!  the same functions as H5Off_F03.f90 but excludes the Fortran 2003 functions
-!  and the interface listings. This file will be compiled instead of H5Off_F03.f90
-!  if Fortran 2003 functions are not enabled.
-!
-! NOTE
-!  Currently contains no functions.
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-!                         *** IMPORTANT ***
-!  If you add a new H5D function you must add the function name to the
-!  Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
-!  This is needed for Windows based operating systems.
-!*****
-
-MODULE H5O_PROVISIONAL
-
-END MODULE H5O_PROVISIONAL
diff --git a/fortran/src/H5Pf.c b/fortran/src/H5Pf.c
index e9082d6..2cec2ce 100644
--- a/fortran/src/H5Pf.c
+++ b/fortran/src/H5Pf.c
@@ -1,56 +1,70 @@
 /****h* H5Pf/H5Pf
  * PURPOSE
- *   This file contains C stubs for H5P Fortran APIs
+ *  This file contains C stubs for H5P Fortran APIs
  *
  * COPYRIGHT
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  ******
-*/
+ */
 
 #include "H5f90.h"
 #include "H5Eprivate.h"
+#include "H5public.h"
+
+#ifdef H5_HAVE_PARALLEL
+
+#include <mpi.h>
+/* Support for C to Fortran translation in MPI */
+#ifndef H5_HAVE_MPI_MULTI_LANG_Comm
+#define MPI_Comm_c2f(comm) (int_f)(comm)
+#define MPI_Comm_f2c(comm) (MPI_Comm)(comm)
+#endif /*MPI Comm*/
+
+#ifndef H5_HAVE_MPI_MULTI_LANG_Info
+#define MPI_Info_c2f(info) (int_f)(info)
+#define MPI_Info_f2c(info) (MPI_Info)(info)
+#endif /*MPI Info*/
+
+#endif /*H5_HAVE_PARALLEL*/
 
 /****if* H5Pf/h5pcreate_c
  * NAME
- *        h5pcreate_c
+ *  h5pcreate_c
  * PURPOSE
- *     Call H5Pcreate to create a property list
+ *  Call H5Pcreate to create a property list
  * INPUTS
- *      cls - property list class identifier
+ *  cls - property list class identifier
  * OUTPUTS
- *     prp_id - identifier of the created property list
+ *  prp_id - identifier of the created property list
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
  *  Wednesday, October 9, 2002
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5pcreate_c ( hid_t_f *cls, hid_t_f *prp_id )
+h5pcreate_c(hid_t_f *cls, hid_t_f *prp_id)
 /******/
 {
     hid_t c_prp_id;
     int_f ret_value = 0;
 
     c_prp_id = H5Pcreate((hid_t)*cls);
-    if(c_prp_id  < 0)
+    if (c_prp_id < 0)
         HGOTO_DONE(FAIL)
 
     *prp_id = (hid_t_f)c_prp_id;
@@ -61,59 +75,58 @@ done:
 
 /****if* H5Pf/h5pclose_c
  * NAME
- *        h5pclose_c
+ *  h5pclose_c
  * PURPOSE
- *     Call H5Pclose to close property lis
+ *  Call H5Pclose to close property lis
  * INPUTS
- *      prp_id - identifier of the property list to be closed
+ *  prp_id - identifier of the property list to be closed
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Saturday, August 14, 1999
+ *  Saturday, August 14, 1999
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5pclose_c ( hid_t_f *prp_id )
+h5pclose_c(hid_t_f *prp_id)
 /******/
 {
     int_f ret_value = 0;
 
-    if(H5Pclose((hid_t)*prp_id) < 0)
+    if (H5Pclose((hid_t)*prp_id) < 0)
         ret_value = -1;
 
     return ret_value;
 }
 
-
 /****if* H5Pf/h5pcopy_c
  * NAME
- *        h5pcopy_c
+ *  h5pcopy_c
  * PURPOSE
- *     Call H5Pcopy to copy property list
+ *  Call H5Pcopy to copy property list
  * INPUTS
- *      prp_id - identifier of the property list to be copied
+ *  prp_id - identifier of the property list to be copied
  * OUTPUTS
- *     new_prp_id - identifier of the new property list
+ *  new_prp_id - identifier of the new property list
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Saturday, August 14, 1999
+ *  Saturday, August 14, 1999
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pcopy_c ( hid_t_f *prp_id , hid_t_f *new_prp_id)
+h5pcopy_c(hid_t_f *prp_id, hid_t_f *new_prp_id)
 /******/
 {
     hid_t c_new_prp_id;
     int_f ret_value = 0;
 
     c_new_prp_id = H5Pcopy((hid_t)*prp_id);
-    if(c_new_prp_id < 0)
+    if (c_new_prp_id < 0)
         HGOTO_DONE(FAIL)
 
     *new_prp_id = (hid_t_f)c_new_prp_id;
@@ -124,31 +137,31 @@ done:
 
 /****if* H5Pf/h5pequal_c
  * NAME
- *        h5pequal_c
+ *  h5pequal_c
  * PURPOSE
- *     Call H5Pequal to check if two property lists are equal
+ *  Call H5Pequal to check if two property lists are equal
  * INPUTS
- *      plist1_id - property list identifier
- *              plist2_id - property list identifier
+ *  plist1_id - property list identifier
+ *  plist2_id - property list identifier
  * OUTPUTS
- *     c_flag    - flag to indicate that lists are eqaul
+ *  c_flag    - flag to indicate that lists are equal
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Monday, September 30, 2002
+ *  Monday, September 30, 2002
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pequal_c ( hid_t_f *plist1_id , hid_t_f *plist2_id, int_f * c_flag)
+h5pequal_c(hid_t_f *plist1_id, hid_t_f *plist2_id, int_f *c_flag)
 /******/
 {
     htri_t c_c_flag;
-    int_f ret_value = 0;
+    int_f  ret_value = 0;
 
     c_c_flag = H5Pequal((hid_t)*plist1_id, (hid_t)*plist2_id);
-    if(c_c_flag < 0)
+    if (c_c_flag < 0)
         HGOTO_DONE(FAIL)
 
     *c_flag = (int_f)c_c_flag;
@@ -157,7 +170,6 @@ done:
     return ret_value;
 }
 
-
 /****if* H5Pf/h5pget_class_c
  * NAME
  *  h5pget_class_c
@@ -173,17 +185,17 @@ done:
  *  Elena Pourmal
  *  Saturday, August 14, 1999
  * SOURCE
-*/
+ */
 
 int_f
-nh5pget_class_c ( hid_t_f *prp_id , hid_t_f *classtype)
+h5pget_class_c(hid_t_f *prp_id, hid_t_f *classtype)
 /******/
 {
     hid_t c_classtype;
     int_f ret_value = 0;
 
-    if( (c_classtype = H5Pget_class((hid_t)*prp_id)) < 0)
-       HGOTO_DONE(FAIL)
+    if ((c_classtype = H5Pget_class((hid_t)*prp_id)) < 0)
+        HGOTO_DONE(FAIL)
 
     *classtype = (hid_t_f)c_classtype;
 
@@ -193,218 +205,190 @@ done:
 
 /****if* H5Pf/h5pset_preserve_c
  * NAME
- *        h5pset_preserve_c
+ *  h5pset_preserve_c
  * PURPOSE
- *     Call H5Pset_preserve to set  transfer property for compound
- *              datatype
+ *  Call H5Pset_preserve to set  transfer property for compound
+ *  datatype
  * INPUTS
- *      prp_id - property list identifier
- *              flag - TRUE/FALSE flag
+ *  prp_id - property list identifier
+ *  flag - TRUE/FALSE flag
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
  *  Thursday, February 17, 2000
  * SOURCE
-*/
+ */
 
 int_f
-nh5pset_preserve_c ( hid_t_f *prp_id , int_f *flag)
+h5pset_preserve_c(hid_t_f *prp_id, int_f *flag)
 /******/
 {
-  int ret_value = 0;
-  hid_t c_prp_id;
-  herr_t status;
-  hbool_t c_flag = 0;
+    int     ret_value = 0;
+    hid_t   c_prp_id;
+    herr_t  status;
+    hbool_t c_flag = 0;
 
-  if (*flag > 0) c_flag = 1;
-  c_prp_id = (hid_t)*prp_id;
-  status = H5Pset_preserve(c_prp_id, c_flag);
-  if ( status < 0  ) ret_value = -1;
-  return ret_value;
+    if (*flag > 0)
+        c_flag = 1;
+    c_prp_id = (hid_t)*prp_id;
+    status   = H5Pset_preserve(c_prp_id, c_flag);
+    if (status < 0)
+        ret_value = -1;
+    return ret_value;
 }
 
-
 /****if* H5Pf/h5pget_preserve_c
  * NAME
- *        h5pget_preserve_c
+ *  h5pget_preserve_c
  * PURPOSE
- *     Call H5Pget_preserve to set  transfer property for compound
- *              datatype
+ *  Call H5Pget_preserve to set  transfer property for compound
+ *  datatype
  * INPUTS
- *      prp_id - property list identifier
+ *  prp_id - property list identifier
  * OUTPUTS
- *     flag - TRUE/FALSE flag
+ *  flag - TRUE/FALSE flag
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
  *  Thursday, February 17, 2000
  * SOURCE
-*/
+ */
 
 int_f
-nh5pget_preserve_c ( hid_t_f *prp_id , int_f *flag)
+h5pget_preserve_c(hid_t_f *prp_id, int_f *flag)
 /******/
 {
-  int ret_value = 0;
-  hid_t c_prp_id;
-  int c_flag;
+    int   ret_value = 0;
+    hid_t c_prp_id;
+    int   c_flag;
 
-  c_prp_id = (hid_t)*prp_id;
-  c_flag = H5Pget_preserve(c_prp_id);
-  if ( c_flag < 0  ) ret_value = -1;
-  *flag = (int_f)c_flag;
-  return ret_value;
+    c_prp_id = (hid_t)*prp_id;
+    c_flag   = H5Pget_preserve(c_prp_id);
+    if (c_flag < 0)
+        ret_value = -1;
+    *flag = (int_f)c_flag;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pset_deflate_c
  * NAME
- *        h5pset_deflate_c
+ *  h5pset_deflate_c
  * PURPOSE
- *     Call H5Pset_deflate to set deflate level
+ *  Call H5Pset_deflate to set deflate level
  * INPUTS
- *      prp_id - property list identifier
- *              level - level of deflation
+ *  prp_id - property list identifier
+ *  level - level of deflation
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Saturday, August 14, 1999
+ *  Saturday, August 14, 1999
  * SOURCE
-*/
+ */
 
 int_f
-nh5pset_deflate_c ( hid_t_f *prp_id , int_f *level)
+h5pset_deflate_c(hid_t_f *prp_id, int_f *level)
 /******/
 {
-  int ret_value = 0;
-  hid_t c_prp_id;
-  unsigned c_level;
-  herr_t status;
+    int      ret_value = 0;
+    hid_t    c_prp_id;
+    unsigned c_level;
+    herr_t   status;
 
-  c_prp_id = (hid_t)*prp_id;
-  c_level = (unsigned)*level;
-  status = H5Pset_deflate(c_prp_id, c_level);
-  if ( status < 0  ) ret_value = -1;
-  return ret_value;
+    c_prp_id = (hid_t)*prp_id;
+    c_level  = (unsigned)*level;
+    status   = H5Pset_deflate(c_prp_id, c_level);
+    if (status < 0)
+        ret_value = -1;
+    return ret_value;
 }
 
-
-
 /****if* H5Pf/h5pset_chunk_c
  * NAME
- *        h5pset_chunk_c
+ *  h5pset_chunk_c
  * PURPOSE
- *     Call H5Pset_chunk to set the sizes of chunks for a chunked
- *              layout dataset
+ *  Call H5Pset_chunk to set the sizes of chunks for a chunked
+ *  layout dataset
  * INPUTS
- *      prp_id - property list identifier
- *              rank - number of dimensions of each chunk
- *              dims - array of the size of each chunk
+ *  prp_id - property list identifier
+ *  rank - number of dimensions of each chunk
+ *  dims - array of the size of each chunk
  * RETURNS
- *     0 on success, -1 on failure
- *              Saturday, August 14, 1999
+ *  0 on success, -1 on failure
+ *  Saturday, August 14, 1999
  * AUTHOR
  *  Elena Pourmal
  * SOURCE
-*/
+ */
 
 int_f
-nh5pset_chunk_c ( hid_t_f *prp_id, int_f *rank, hsize_t_f *dims )
+h5pset_chunk_c(hid_t_f *prp_id, int_f *rank, hsize_t_f *dims)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_prp_id = (hid_t)*prp_id;
-  int c_rank = (int)*rank;
-  hsize_t c_dims[H5S_MAX_RANK];
-  herr_t status;
-  int i;
+    int     ret_value = -1;
+    hid_t   c_prp_id  = (hid_t)*prp_id;
+    int     c_rank    = (int)*rank;
+    hsize_t c_dims[H5S_MAX_RANK];
+    herr_t  status;
+    int     i;
 
-  /*
-   * Transpose dimension arrays because of C-FORTRAN storage order
-   */
-  for (i = 0; i < c_rank ; i++)
-       c_dims[i] =  (hsize_t)dims[c_rank - i - 1];
+    /*
+     * Transpose dimension arrays because of C-FORTRAN storage order
+     */
+    for (i = 0; i < c_rank; i++)
+        c_dims[i] = (hsize_t)dims[c_rank - i - 1];
 
-  status = H5Pset_chunk(c_prp_id, c_rank, c_dims);
-  if (status < 0) goto DONE;
-  ret_value = 0;
+    status = H5Pset_chunk(c_prp_id, c_rank, c_dims);
+    if (status < 0)
+        goto DONE;
+    ret_value = 0;
 
 DONE:
-  return ret_value;
+    return ret_value;
 }
 
-
 /****if* H5Pf/h5pget_chunk_c
  * NAME
- *        h5pget_chunk_c
+ *  h5pget_chunk_c
  * PURPOSE
- *     Call H5Pget_chunk to get the sizes of chunks for a chunked
- *              layout dataset  for at list max_rank number of dimensions
- * INPUTS
- *      prp_id - property list identifier
- *              max rank - maximum number of dimensions to return
- *              dims - array of the size of each chunk
- * RETURNS
- *     number of chunk's dimnesion on success, -1 on failure
- *              Saturday, August 14, 1999
- * AUTHOR
- *  Elena Pourmal
- * SOURCE
-*/
-
-int_f
-nh5pget_chunk_c ( hid_t_f *prp_id, int_f *max_rank, hsize_t_f *dims )
-/******/
-{
-  int ret_value = -1;
-  hid_t c_prp_id = (hid_t)*prp_id;
-  hsize_t c_dims[H5S_MAX_RANK];
-  int rank;
-  int c_max_rank = (int)*max_rank;
-  int i;
-
-  rank = H5Pget_chunk(c_prp_id, c_max_rank, c_dims);
-
-  /*
-   * Transpose dimension arrays because of C-FORTRAN storage order
-   */
-  for (i = 0; i < c_max_rank ; i++)
-       dims[c_max_rank - i - 1] = (hsize_t_f)c_dims[i];
-  if (rank < 0) return ret_value;
-  ret_value = (int_f)rank;
-  return ret_value;
-}
-
-/****if* H5Pf/h5pset_fill_valuec_c
- * NAME
- *  h5pset_fill_valuec_c
- * PURPOSE
- *  Call h5pset_fill_value_c to a character fill value
+ *  Call H5Pget_chunk to get the sizes of chunks for a chunked
+ *  layout dataset  for at list max_rank number of dimensions
  * INPUTS
  *  prp_id - property list identifier
- *  type_id - datatype identifier (fill value is of type type_id)
- *  fillvalue  - character value
+ *  max rank - maximum number of dimensions to return
+ *  dims - array of the size of each chunk
  * RETURNS
- *  0 on success, -1 on failure
+ *  number of chunk's dimnesion on success, -1 on failure
  *  Saturday, August 14, 1999
  * AUTHOR
  *  Elena Pourmal
  * SOURCE
-*/
+ */
+
 int_f
-nh5pset_fill_valuec_c (hid_t_f *prp_id, hid_t_f *type_id, _fcd fillvalue)
+h5pget_chunk_c(hid_t_f *prp_id, int_f *max_rank, hsize_t_f *dims)
 /******/
 {
-     int ret_value = -1;
+    int     ret_value = -1;
+    hid_t   c_prp_id  = (hid_t)*prp_id;
+    hsize_t c_dims[H5S_MAX_RANK];
+    int     rank;
+    int     c_max_rank = (int)*max_rank;
+    int     i;
 
-     /*
-      * Call h5pset_fill_value_c  function.
-      */
-     ret_value = h5pset_fill_value_c(prp_id, type_id, _fcdtocp(fillvalue));
+    rank = H5Pget_chunk(c_prp_id, c_max_rank, c_dims);
 
-     return ret_value;
+    /*
+     * Transpose dimension arrays because of C-FORTRAN storage order
+     */
+    for (i = 0; i < c_max_rank; i++)
+        dims[c_max_rank - i - 1] = (hsize_t_f)c_dims[i];
+    if (rank < 0)
+        return ret_value;
+    ret_value = (int_f)rank;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pset_fill_value_c
@@ -422,1388 +406,1344 @@ nh5pset_fill_valuec_c (hid_t_f *prp_id, hid_t_f *type_id, _fcd fillvalue)
  *  Elena Pourmal
  *  Saturday, August 14, 1999
  * SOURCE
-*/
-int_f
-h5pset_fill_value_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue)
-/******/
-{
-     int ret_value = -1;
-     hid_t c_prp_id;
-     hid_t c_type_id;
-     herr_t ret;
-
-     /*
-      * Call H5Pset_fill_value function.
-      */
-     c_prp_id = (hid_t)*prp_id;
-     c_type_id = (hid_t)*type_id;
-     ret = H5Pset_fill_value(c_prp_id, c_type_id, fillvalue);
-
-     if (ret < 0) return ret_value;
-     ret_value = 0;
-     return ret_value;
-}
-
+ */
 int_f
-nh5pset_fill_value_integer_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue)
+h5pset_fill_value_c(hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue)
 /******/
 {
-     /*
-      * Call h5pset_fill_value_c  function.
-      */
-     return h5pset_fill_value_c(prp_id, type_id, fillvalue);
-}
+    int    ret_value = -1;
+    hid_t  c_prp_id;
+    hid_t  c_type_id;
+    herr_t ret;
 
-int_f
-nh5pset_fill_value_real_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue)
-{
-     /*
-      * Call h5pset_fill_value_c  function.
-      */
-     return h5pset_fill_value_c(prp_id, type_id, fillvalue);
-}
+    /*
+     * Call H5Pset_fill_value function.
+     */
+    c_prp_id  = (hid_t)*prp_id;
+    c_type_id = (hid_t)*type_id;
+    ret       = H5Pset_fill_value(c_prp_id, c_type_id, fillvalue);
 
-int_f
-nh5pset_fill_value_double_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue)
-{
-     /*
-      * Call h5pset_fill_value_c  function.
-      */
-     return h5pset_fill_value_c(prp_id, type_id, fillvalue);
+    if (ret < 0)
+        return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
-/****if* H5Pf/h5pget_fill_valuec_c
+/****if* H5Pf/h5pget_fill_value_c
  * NAME
- *  h5pget_fill_valuec_c
+ *  h5pget_fill_value_c
  * PURPOSE
- *  Call h5pget_fill_value_c to a character fill value
+ *  Call H5Pget_fill_value to set a fillvalue for a dataset
  * INPUTS
- *  prp_id     - property list identifier
- *  type_id    - datatype identifier (fill value is of type type_id)
- *  fillvalue - character value
+ *  prp_id - property list identifier
+ *  type_id - datatype identifier (fill value is of type type_id)
+ *  fillvalue - fillvalue
  * RETURNS
  *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
  *  Saturday, August 14, 1999
- * HISTORY
- *  Fixed wrong call to C wrapper, was nh5pset_fill_value_c, changed
- *  to nh5pget_fill_value_c. MSB - 7/21/2014
- *
  * SOURCE
-*/
+ */
 int_f
-nh5pget_fill_valuec_c (hid_t_f *prp_id, hid_t_f *type_id, _fcd fillvalue)
+h5pget_fill_value_c(hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue)
 /******/
 {
-     int ret_value = -1;
+    int    ret_value = -1;
+    hid_t  c_prp_id;
+    hid_t  c_type_id;
+    herr_t ret;
 
-     /*
-      * Call h5pget_fill_value_c function.
-      */
-     ret_value = h5pget_fill_value_c(prp_id, type_id, _fcdtocp(fillvalue));
+    /*
+     * Call H5Pget_fill_value function.
+     */
+    c_prp_id  = (hid_t)*prp_id;
+    c_type_id = (hid_t)*type_id;
+    ret       = H5Pget_fill_value(c_prp_id, c_type_id, fillvalue);
 
-     return ret_value;
+    if (ret < 0)
+        return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
-/****if* H5Pf/h5pget_fill_value_c
+/****if* H5Pf/h5pget_version_c
  * NAME
- *  h5pget_fill_value_c
+ *  h5pget_version_c
  * PURPOSE
- *  Call H5Pget_fill_value to set a fillvalue for a dataset
+ *  Call H5Pget_version to get the version information
+ *  of various objects for a file creation property list
  * INPUTS
  *  prp_id - property list identifier
- *  type_id - datatype identifier (fill value is of type type_id)
- *  fillvalue - fillvalue
+ * OUTPUTS
+ *  boot - array to put boot block version number
+ *  freelist - array to put global freelist version number
+ *  stab - array to put symbol table version number
+ *  shhdr - array to put shared object header version number
  * RETURNS
  *  0 on success, -1 on failure
  * AUTHOR
- *  Elena Pourmal
- *  Saturday, August 14, 1999
+ *  Xiangyang Su
+ *  Wednesday, February 23, 2000
+ * HISTORY
+ *  Removed extra length parameters EP 7/6/00
  * SOURCE
-*/
+ */
+#ifdef H5_NO_DEPRECATED_SYMBOLS
 int_f
-h5pget_fill_value_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue)
+h5pget_version_c(hid_t_f H5_ATTR_UNUSED *prp_id, int_f *boot, int_f *freelist, int_f *stab, int_f *shhdr)
 /******/
 {
-     int ret_value = -1;
-     hid_t c_prp_id;
-     hid_t c_type_id;
-     herr_t ret;
-
-     /*
-      * Call H5Pget_fill_value function.
-      */
-     c_prp_id = (hid_t)*prp_id;
-     c_type_id = (hid_t)*type_id;
-     ret = H5Pget_fill_value(c_prp_id, c_type_id, fillvalue);
+    /*
+     * Fill in fake values [since we need a file ID to call H5Fget_info :-( -QAK ]
+     */
+    *boot     = (int_f)0;
+    *freelist = (int_f)0;
+    *stab     = (int_f)0;
+    *shhdr    = (int_f)0;
 
-     if (ret < 0) return ret_value;
-     ret_value = 0;
-     return ret_value;
+    return 0;
 }
-
+#else  /* H5_NO_DEPRECATED_SYMBOLS */
 int_f
-nh5pget_fill_value_integer_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue)
+h5pget_version_c(hid_t_f *prp_id, int_f *boot, int_f *freelist, int_f *stab, int_f *shhdr)
+/******/
 {
-     /*
-      * Call h5pget_fill_value_c  function.
-      */
-     return h5pget_fill_value_c(prp_id, type_id, fillvalue);
-}
+    herr_t   ret;
+    unsigned c_boot;
+    unsigned c_freelist;
+    unsigned c_stab;
+    unsigned c_shhdr;
 
-int_f
-nh5pget_fill_value_real_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue)
-{
-     /*
-      * Call h5pget_fill_value_c  function.
-      */
-     return h5pget_fill_value_c(prp_id, type_id, fillvalue);
-}
+    /*
+     * Call H5Pget_version function.
+     */
+    ret = H5Pget_version((hid_t)*prp_id, &c_boot, &c_freelist, &c_stab, &c_shhdr);
+    if (ret < 0)
+        return -1;
 
-int_f
-nh5pget_fill_value_double_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue)
-{
-     /*
-      * Call h5pget_fill_value_c  function.
-      */
-     return h5pget_fill_value_c(prp_id, type_id, fillvalue);
-}
+    *boot     = (int_f)c_boot;
+    *freelist = (int_f)c_freelist;
+    *stab     = (int_f)c_stab;
+    *shhdr    = (int_f)c_shhdr;
 
-/****if* H5Pf/h5pget_version_c
- * NAME
- *        h5pget_version_c
- * PURPOSE
- *     Call H5Pget_version to get the version information
- *              of various objects for a file creation property list
- * INPUTS
- *      prp_id - property list identifier
- * OUTPUTS
- *     boot - array to put boot block version number
- *              freelist - array to put global freelist version number
- *              stab - array to put symbol table version number
- *              shhdr - array to put shared object header version number
- * RETURNS
- *     0 on success, -1 on failure
- * AUTHOR
- *  Xiangyang Su
- *              Wednesday, February 23, 2000
- * HISTORY
- * Removed extra length parameters EP 7/6/00
- * SOURCE
-*/
-int_f
-nh5pget_version_c (hid_t_f *prp_id, int_f * boot,int_f * freelist, int_f * stab, int_f *shhdr)
-/******/
-{
-     int ret_value = -1;
-#ifndef H5_NO_DEPRECATED_SYMBOLS
-     herr_t ret;
-     unsigned c_boot;
-     unsigned c_freelist;
-     unsigned c_stab;
-     unsigned c_shhdr;
-
-     /*
-      * Call H5Pget_version function.
-      */
-     ret = H5Pget_version((hid_t)*prp_id, &c_boot, &c_freelist, &c_stab, &c_shhdr);
-     if (ret < 0) return ret_value;
-
-     *boot = (int_f)c_boot;
-     *freelist = (int_f)c_freelist;
-     *stab = (int_f)c_stab;
-     *shhdr = (int_f)c_shhdr;
-#else /* H5_NO_DEPRECATED_SYMBOLS */
-     /*
-      * Fill in fake values [since we need a file ID to call H5Fget_info :-( -QAK ]
-      */
-     *boot = (int_f)0;
-     *freelist = (int_f)0;
-     *stab = (int_f)0;
-     *shhdr = (int_f)0;
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
-     ret_value = 0;
-
-     return ret_value;
+    return 0;
 }
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
 
 /****if* H5Pf/h5pget_userblock_c
  * NAME
- *        h5pget_userblock_c
+ *  h5pget_userblock_c
  * PURPOSE
- *     Call H5Pget_userblock to get the size of a user block in
- *              a file creation property list
+ *  Call H5Pget_userblock to get the size of a user block in
+ *  a file creation property list
  * INPUTS
- *      prp_id - property list identifier
- * Outputs      size - Size of the user-block in bytes
+ *  prp_id - property list identifier
+ *  Outputs      size - Size of the user-block in bytes
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Xiangyang Su
- *              Wednesday, February 23, 2000
+ *  Wednesday, February 23, 2000
  * SOURCE
-*/
+ */
 int_f
-nh5pget_userblock_c (hid_t_f *prp_id, hsize_t_f * size)
+h5pget_userblock_c(hid_t_f *prp_id, hsize_t_f *size)
 /******/
 {
-     int ret_value = -1;
-     hid_t c_prp_id;
-     herr_t ret;
-     hsize_t c_size;
+    int     ret_value = -1;
+    hid_t   c_prp_id;
+    herr_t  ret;
+    hsize_t c_size;
 
-     /*
-      * Call H5Pget_userblock function.
-      */
-     c_prp_id = (hid_t)*prp_id;
-     ret = H5Pget_userblock(c_prp_id, &c_size);
-     if (ret < 0) return ret_value;
+    /*
+     * Call H5Pget_userblock function.
+     */
+    c_prp_id = (hid_t)*prp_id;
+    ret      = H5Pget_userblock(c_prp_id, &c_size);
+    if (ret < 0)
+        return ret_value;
 
-     *size = (hsize_t_f)c_size;
-     ret_value = 0;
+    *size     = (hsize_t_f)c_size;
+    ret_value = 0;
 
-     return ret_value;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pset_userblock_c
  * NAME
- *        h5pset_userblock_c
+ *  h5pset_userblock_c
  * PURPOSE
- *     Call H5Pset_userblock to set the size of a user block in
- *              a file creation property list
+ *  Call H5Pset_userblock to set the size of a user block in
+ *  a file creation property list
  * INPUTS
- *      prp_id - property list identifier
- *              size - Size of the user-block in bytes
+ *  prp_id - property list identifier
+ *  size - Size of the user-block in bytes
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Xiangyang Su
- *              Wednesday, February 23, 2000
+ *  Wednesday, February 23, 2000
  * SOURCE
-*/
+ */
 int_f
-nh5pset_userblock_c (hid_t_f *prp_id, hsize_t_f * size)
+h5pset_userblock_c(hid_t_f *prp_id, hsize_t_f *size)
 /******/
 {
-     int ret_value = -1;
-     hid_t c_prp_id;
-     herr_t ret;
-     hsize_t c_size;
-     c_size = (hsize_t)*size;
+    int     ret_value = -1;
+    hid_t   c_prp_id;
+    herr_t  ret;
+    hsize_t c_size;
+    c_size = (hsize_t)*size;
 
-     /*
-      * Call H5Pset_userblock function.
-      */
-     c_prp_id = (hid_t)*prp_id;
-     ret = H5Pset_userblock(c_prp_id, c_size);
+    /*
+     * Call H5Pset_userblock function.
+     */
+    c_prp_id = (hid_t)*prp_id;
+    ret      = H5Pset_userblock(c_prp_id, c_size);
 
-     if (ret < 0) return ret_value;
-     ret_value = 0;
-     return ret_value;
+    if (ret < 0)
+        return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pget_sizes_c
  * NAME
- *        h5pget_sizes_c
+ *  h5pget_sizes_c
  * PURPOSE
- *     Call H5Pget_sizes to get the size of the offsets
- *              and lengths used in an HDF5 file
+ *  Call H5Pget_sizes to get the size of the offsets
+ *  and lengths used in an HDF5 file
  * INPUTS
- *      prp_id - property list identifier
- * Outputs      sizeof_addr - Size of an object offset in bytes
- *              sizeof_size - Size of an object length in bytes
+ *  prp_id - property list identifier
+ *  Outputs      sizeof_addr - Size of an object offset in bytes
+ *  sizeof_size - Size of an object length in bytes
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Xiangyang Su
- *              Wednesday, February 23, 2000
+ *  Wednesday, February 23, 2000
  * HISTORY
- * Deleted extra length parameters. EP 6/7/00
+ *  Deleted extra length parameters. EP 6/7/00
  * SOURCE
-*/
+ */
 int_f
-nh5pget_sizes_c (hid_t_f *prp_id, size_t_f * sizeof_addr, size_t_f * sizeof_size)
+h5pget_sizes_c(hid_t_f *prp_id, size_t_f *sizeof_addr, size_t_f *sizeof_size)
 /******/
 {
-     int ret_value = -1;
-     hid_t c_prp_id;
-     herr_t ret;
-     size_t c_sizeof_addr;
-     size_t c_sizeof_size;
+    int    ret_value = -1;
+    hid_t  c_prp_id;
+    herr_t ret;
+    size_t c_sizeof_addr;
+    size_t c_sizeof_size;
 
-     /*
-      * Call H5Pget_sizes function.
-      */
-     c_prp_id = (hid_t)*prp_id;
-     ret = H5Pget_sizes(c_prp_id, &c_sizeof_addr, &c_sizeof_size);
-     if (ret < 0) return ret_value;
+    /*
+     * Call H5Pget_sizes function.
+     */
+    c_prp_id = (hid_t)*prp_id;
+    ret      = H5Pget_sizes(c_prp_id, &c_sizeof_addr, &c_sizeof_size);
+    if (ret < 0)
+        return ret_value;
 
-     *sizeof_addr = (size_t_f)c_sizeof_addr;
-     *sizeof_size = (size_t_f)c_sizeof_size;
-     ret_value = 0;
+    *sizeof_addr = (size_t_f)c_sizeof_addr;
+    *sizeof_size = (size_t_f)c_sizeof_size;
+    ret_value    = 0;
 
-     return ret_value;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pset_sizes_c
  * NAME
- *        h5pset_sizes_c
+ *  h5pset_sizes_c
  * PURPOSE
- *     Call H5Pset_sizes to set the size of the offsets
+ *  Call H5Pset_sizes to set the size of the offsets
  * INPUTS
- *      prp_id - property list identifier
- *              sizeof_addr - Size of an object offset in bytes
- *              sizeof_size - Size of an object length in bytes
+ *  prp_id - property list identifier
+ *  sizeof_addr - Size of an object offset in bytes
+ *  sizeof_size - Size of an object length in bytes
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Xiangyang Su
- *              Wednesday, February 23, 2000
+ *  Wednesday, February 23, 2000
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pset_sizes_c (hid_t_f *prp_id, size_t_f * sizeof_addr, size_t_f * sizeof_size)
+h5pset_sizes_c(hid_t_f *prp_id, size_t_f *sizeof_addr, size_t_f *sizeof_size)
 /******/
 {
-     int ret_value = -1;
-     hid_t c_prp_id;
-     herr_t ret;
-     size_t c_addr, c_size;
-     c_addr = (size_t)*sizeof_addr;
-     c_size = (size_t)*sizeof_size;
+    int    ret_value = -1;
+    hid_t  c_prp_id;
+    herr_t ret;
+    size_t c_addr, c_size;
+    c_addr = (size_t)*sizeof_addr;
+    c_size = (size_t)*sizeof_size;
 
-     /*
-      * Call H5Pset_sizes function.
-      */
-     c_prp_id = (hid_t)*prp_id;
-     ret = H5Pset_sizes(c_prp_id, c_addr, c_size);
+    /*
+     * Call H5Pset_sizes function.
+     */
+    c_prp_id = (hid_t)*prp_id;
+    ret      = H5Pset_sizes(c_prp_id, c_addr, c_size);
 
-     if (ret < 0) return ret_value;
-     ret_value = 0;
-     return ret_value;
+    if (ret < 0)
+        return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pset_sym_k_c
  * NAME
- *        h5pset_sym_k_c
+ *  h5pset_sym_k_c
  * PURPOSE
- *     Call H5Pset_sym_k to set the size of parameters used
- *              to control the symbol table node
+ *  Call H5Pset_sym_k to set the size of parameters used
+ *  to control the symbol table node
  * INPUTS
- *      prp_id - property list identifier
- *              ik - Symbol table tree rank
- *              lk - Symbol table node size
+ *  prp_id - property list identifier
+ *  ik - Symbol table tree rank
+ *  lk - Symbol table node size
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Xiangyang Su
- *              Friday, February 25, 2000
+ *  Friday, February 25, 2000
  * SOURCE
-*/
+ */
 int_f
-nh5pset_sym_k_c (hid_t_f *prp_id, int_f* ik, int_f* lk)
+h5pset_sym_k_c(hid_t_f *prp_id, int_f *ik, int_f *lk)
 /******/
 {
-     int ret_value = -1;
-     hid_t c_prp_id;
-     unsigned c_ik;
-     unsigned c_lk;
-     herr_t ret;
+    int      ret_value = -1;
+    hid_t    c_prp_id;
+    unsigned c_ik;
+    unsigned c_lk;
+    herr_t   ret;
 
-     /*
-      * Call H5Pset_sym_k function.
-      */
-     c_prp_id = (hid_t)*prp_id;
-     c_ik = (unsigned)*ik;
-     c_lk = (unsigned)*lk;
-     ret = H5Pset_sym_k(c_prp_id, c_ik, c_lk);
+    /*
+     * Call H5Pset_sym_k function.
+     */
+    c_prp_id = (hid_t)*prp_id;
+    c_ik     = (unsigned)*ik;
+    c_lk     = (unsigned)*lk;
+    ret      = H5Pset_sym_k(c_prp_id, c_ik, c_lk);
 
-     if (ret < 0) return ret_value;
-     ret_value = 0;
-     return ret_value;
+    if (ret < 0)
+        return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pget_sym_k_c
  * NAME
- *        h5pget_sym_k_c
+ *  h5pget_sym_k_c
  * PURPOSE
- *     Call H5Pget_sym_k to get the size of parameters used
- *              to control the symbol table node
+ *  Call H5Pget_sym_k to get the size of parameters used
+ *  to control the symbol table node
  * INPUTS
- *      prp_id - property list identifier
+ *  prp_id - property list identifier
  * OUTPUTS
- *     ik - Symbol table tree rank
- *              lk - Symbol table node size
+ *  ik - Symbol table tree rank
+ *  lk - Symbol table node size
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Xiangyang Su
- *              Friday, February 25, 2000
+ *  Friday, February 25, 2000
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pget_sym_k_c (hid_t_f *prp_id, int_f* ik, int_f* lk)
+h5pget_sym_k_c(hid_t_f *prp_id, int_f *ik, int_f *lk)
 /******/
 {
-     int ret_value = -1;
-     hid_t c_prp_id;
-     herr_t ret;
-     unsigned c_ik;
-     unsigned c_lk;
+    int      ret_value = -1;
+    hid_t    c_prp_id;
+    herr_t   ret;
+    unsigned c_ik;
+    unsigned c_lk;
 
-     /*
-      * Call H5Pget_sym_k function.
-      */
-     c_prp_id = (hid_t)*prp_id;
-     ret = H5Pget_sym_k(c_prp_id, &c_ik, &c_lk);
-     *ik = (int_f)c_ik;
-     *lk = (int_f)c_lk;
-     if (ret < 0) return ret_value;
-     ret_value = 0;
-     return ret_value;
+    /*
+     * Call H5Pget_sym_k function.
+     */
+    c_prp_id = (hid_t)*prp_id;
+    ret      = H5Pget_sym_k(c_prp_id, &c_ik, &c_lk);
+    *ik      = (int_f)c_ik;
+    *lk      = (int_f)c_lk;
+    if (ret < 0)
+        return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pset_istore_k_c
  * NAME
- *        h5pset_istore_k_c
+ *  h5pset_istore_k_c
  * PURPOSE
- *     Call H5Pset_istore_k to set the size of the parameter
- *              used to control the B-trees for indexing chunked datasets
+ *  Call H5Pset_istore_k to set the size of the parameter
+ *  used to control the B-trees for indexing chunked datasets
  * INPUTS
- *      prp_id - property list identifier
- *              ik - Symbol table tree rank
+ *  prp_id - property list identifier
+ *  ik - Symbol table tree rank
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Xiangyang Su
- *              Friday, February 25, 2000
+ *  Friday, February 25, 2000
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pset_istore_k_c (hid_t_f *prp_id, int_f* ik)
+h5pset_istore_k_c(hid_t_f *prp_id, int_f *ik)
 /******/
 {
-     int ret_value = -1;
-     hid_t c_prp_id;
-     unsigned c_ik;
-     herr_t ret;
+    int      ret_value = -1;
+    hid_t    c_prp_id;
+    unsigned c_ik;
+    herr_t   ret;
 
-     /*
-      * Call H5Pset_istore_k function.
-      */
-     c_prp_id = (hid_t)*prp_id;
-     c_ik = (unsigned)*ik;
-     ret = H5Pset_istore_k(c_prp_id, c_ik);
+    /*
+     * Call H5Pset_istore_k function.
+     */
+    c_prp_id = (hid_t)*prp_id;
+    c_ik     = (unsigned)*ik;
+    ret      = H5Pset_istore_k(c_prp_id, c_ik);
 
-     if (ret < 0) return ret_value;
-     ret_value = 0;
-     return ret_value;
+    if (ret < 0)
+        return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pget_istore_k_c
  * NAME
- *        h5pget_istore_k_c
+ *  h5pget_istore_k_c
  * PURPOSE
- *     Call H5Pget_istore_k to get the size of parameters used
- *              to control the B-trees for indexing chunked datasets
+ *  Call H5Pget_istore_k to get the size of parameters used
+ *  to control the B-trees for indexing chunked datasets
  * INPUTS
- *      prp_id - property list identifier
+ *  prp_id - property list identifier
  * OUTPUTS
- *     ik - Symbol table tree rank
+ *  ik - Symbol table tree rank
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Xiangyang Su
- *              Friday, February 25, 2000
+ *  Friday, February 25, 2000
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pget_istore_k_c (hid_t_f *prp_id, int_f* ik)
+h5pget_istore_k_c(hid_t_f *prp_id, int_f *ik)
 /******/
 {
-     int ret_value = -1;
-     hid_t c_prp_id;
-     herr_t ret;
-     unsigned c_ik;
+    int      ret_value = -1;
+    hid_t    c_prp_id;
+    herr_t   ret;
+    unsigned c_ik;
 
-     /*
-      * Call H5Pget_istore_k function.
-      */
-     c_prp_id = (hid_t)*prp_id;
-     ret = H5Pget_istore_k(c_prp_id, &c_ik);
-     *ik = (int_f)c_ik;
-     if (ret < 0) return ret_value;
-     ret_value = 0;
-     return ret_value;
+    /*
+     * Call H5Pget_istore_k function.
+     */
+    c_prp_id = (hid_t)*prp_id;
+    ret      = H5Pget_istore_k(c_prp_id, &c_ik);
+    *ik      = (int_f)c_ik;
+    if (ret < 0)
+        return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pget_driver_c
  * NAME
- *        h5pget_driver_c
+ *  h5pget_driver_c
  * PURPOSE
- *     Call H5Pget_driver to get low-level file driver identifier
+ *  Call H5Pget_driver to get low-level file driver identifier
  * INPUTS
- *      prp_id - property list identifier
+ *  prp_id - property list identifier
  * OUTPUTS
- *     driver - low-level file driver identifier
+ *  driver - low-level file driver identifier
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Xiangyang Su
- *              Friday, February 25, 2000
+ *  Friday, February 25, 2000
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pget_driver_c (hid_t_f *prp_id, hid_t_f* driver)
+h5pget_driver_c(hid_t_f *prp_id, hid_t_f *driver)
 /******/
 {
-     int ret_value = -1;
-     hid_t c_driver;
+    int   ret_value = -1;
+    hid_t c_driver;
 
-     /*
-      * Call H5Pget_driver function.
-      */
-     c_driver = H5Pget_driver((hid_t)*prp_id);
-     if (c_driver < 0) goto DONE;
+    /*
+     * Call H5Pget_driver function.
+     */
+    c_driver = H5Pget_driver((hid_t)*prp_id);
+    if (c_driver < 0)
+        goto DONE;
 
-     *driver = (hid_t_f) c_driver;
-     ret_value = 0;
+    *driver   = (hid_t_f)c_driver;
+    ret_value = 0;
 
 DONE:
-     return ret_value;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pset_fapl_stdio_c
  * NAME
- *        h5pset_fapl_stdio_c
+ *  h5pset_fapl_stdio_c
  * PURPOSE
- *     Call H5Pset_stdio to set the low level file driver to
- *              use the functions declared in the stdio.h
+ *  Call H5Pset_stdio to set the low level file driver to
+ *  use the functions declared in the stdio.h
  * INPUTS
- *      prp_id - property list identifier
+ *  prp_id - property list identifier
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              March 7, 2001
+ *  March 7, 2001
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pset_fapl_stdio_c (hid_t_f *prp_id)
+h5pset_fapl_stdio_c(hid_t_f *prp_id)
 /******/
 {
-     int ret_value = -1;
-     hid_t c_prp_id;
-     herr_t ret = -1;
-     /*
-      * Call H5Pset_fapl_stdio function.
-      */
-     c_prp_id = (hid_t)*prp_id;
-     ret = H5Pset_fapl_stdio(c_prp_id);
-     if (ret < 0) return ret_value;
-     ret_value = 0;
-     return ret_value;
+    int    ret_value = -1;
+    hid_t  c_prp_id;
+    herr_t ret = -1;
+    /*
+     * Call H5Pset_fapl_stdio function.
+     */
+    c_prp_id = (hid_t)*prp_id;
+    ret      = H5Pset_fapl_stdio(c_prp_id);
+    if (ret < 0)
+        return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 #ifdef NO_SUCH_F90_FUNCTION
 /****if* H5Pf/h5pget_fapl_stdio_c
  * NAME
- *        h5pget_fapl_stdio_c
+ *  h5pget_fapl_stdio_c
  * PURPOSE
- *     Call H5Pget_fapl_stdio to determine whther the low level file driver
- *              uses the functions declared in the stdio.h
+ *  Call H5Pget_fapl_stdio to determine whether the low level file driver
+ *  uses the functions declared in the stdio.h
  * INPUTS
- *      prp_id - property list identifier
+ *  prp_id - property list identifier
  * OUTPUTS
- *     io - value indicates whether the file driver uses
- *                   the functions declared in the stdio.h
+ *  io - value indicates whether the file driver uses
+ *  the functions declared in the stdio.h
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              March 9, 2001
+ *  March 9, 2001
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pget_fapl_stdio_c (hid_t_f *prp_id, int_f* io)
+h5pget_fapl_stdio_c(hid_t_f *prp_id, int_f *io)
 /******/
 {
-     int ret_value = -1;
-     hid_t c_prp_id;
-     herr_t ret = -1;
-     /*
-      * Call H5Pget_fapl_stdio function.
-      */
-     c_prp_id = *prp_id;
-     ret = H5Pget_fapl_stdio(c_prp_id);
-     if (ret < 0) return ret_value;
-     *io = (int_f)ret;
-     ret_value = 0;
-     return ret_value;
+    int    ret_value = -1;
+    hid_t  c_prp_id;
+    herr_t ret = -1;
+    /*
+     * Call H5Pget_fapl_stdio function.
+     */
+    c_prp_id = *prp_id;
+    ret      = H5Pget_fapl_stdio(c_prp_id);
+    if (ret < 0)
+        return ret_value;
+    *io       = (int_f)ret;
+    ret_value = 0;
+    return ret_value;
 }
 
 #endif /*NO_SUCH_F90_FUNCTION*/
 
 /****if* H5Pf/h5pset_fapl_sec2_c
  * NAME
- *        h5pset_fapl_sec2_c
+ *  h5pset_fapl_sec2_c
  * PURPOSE
- *     Call H5Pset_fapl_sec2 to set the low level file driver to
- *              use the functions declared in the  unistd.h
+ *  Call H5Pset_fapl_sec2 to set the low level file driver to
+ *  use the functions declared in the  unistd.h
  * INPUTS
- *      prp_id - property list identifier
+ *  prp_id - property list identifier
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              March 9, 2001
+ *  March 9, 2001
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pset_fapl_sec2_c (hid_t_f *prp_id)
+h5pset_fapl_sec2_c(hid_t_f *prp_id)
 /******/
 {
-     int ret_value = -1;
-     hid_t c_prp_id;
-     herr_t ret = -1;
-     /*
-      * Call H5Pset_fapl_sec2 function.
-      */
-     c_prp_id = (hid_t)*prp_id;
-     ret = H5Pset_fapl_sec2(c_prp_id);
-     if (ret < 0) return ret_value;
-     ret_value = 0;
-     return ret_value;
+    int    ret_value = -1;
+    hid_t  c_prp_id;
+    herr_t ret = -1;
+    /*
+     * Call H5Pset_fapl_sec2 function.
+     */
+    c_prp_id = (hid_t)*prp_id;
+    ret      = H5Pset_fapl_sec2(c_prp_id);
+    if (ret < 0)
+        return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 #ifdef NO_SUCH_F90_FUNCTION
 /****if* H5Pf/h5pget_fapl_sec2_c
  * NAME
- *        h5pget_fapl_sec2_c
+ *  h5pget_fapl_sec2_c
  * PURPOSE
- *     Call H5Pget_fapl_stdio to determine whther the low level file driver
- *              uses the functions declared in the  unistd.h
+ *  Call H5Pget_fapl_stdio to determine whether the low level file driver
+ *  uses the functions declared in the  unistd.h
  * INPUTS
- *      prp_id - property list identifier
+ *  prp_id - property list identifier
  * OUTPUTS
- *     sec2 - value indicates whether the file driver uses
- *                   the functions declared in the  unistd.h
+ *  sec2 - value indicates whether the file driver uses
+ *  the functions declared in the  unistd.h
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              March 9, 2001
+ *  March 9, 2001
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pget_fapl_sec2_c (hid_t_f *prp_id, int_f* sec2)
+h5pget_fapl_sec2_c(hid_t_f *prp_id, int_f *sec2)
 /******/
 {
-     int ret_value = -1;
-     hid_t c_prp_id;
-     herr_t ret = -1;
-     /*
-      * Call H5Pget_fapl_sec2 function.
-      */
-     c_prp_id = (hid_t)*prp_id;
-     ret = H5Pget_fapl_sec2(c_prp_id);
-     if (ret < 0) return ret_value;
-     *sec2 = (int_f)ret;
-     ret_value = 0;
-     return ret_value;
+    int    ret_value = -1;
+    hid_t  c_prp_id;
+    herr_t ret = -1;
+    /*
+     * Call H5Pget_fapl_sec2 function.
+     */
+    c_prp_id = (hid_t)*prp_id;
+    ret      = H5Pget_fapl_sec2(c_prp_id);
+    if (ret < 0)
+        return ret_value;
+    *sec2     = (int_f)ret;
+    ret_value = 0;
+    return ret_value;
 }
 #endif /*NO_SUCH_F90_FUNCTION*/
 
 /****if* H5Pf/h5pset_alignment_c
  * NAME
- *        h5pset_alignment_c
+ *  h5pset_alignment_c
  * PURPOSE
- *     Call H5Pset_alignment to set alignment properties of
- *              a file access property list
+ *  Call H5Pset_alignment to set alignment properties of
+ *  a file access property list
  * INPUTS
- *      prp_id - property list identifier
- *              threshold - Threshold value
- *              alignment - Alignment value
+ *  prp_id - property list identifier
+ *  threshold - Threshold value
+ *  alignment - Alignment value
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Xiangyang Su
- *              Friday, February 25, 2000
+ *  Friday, February 25, 2000
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pset_alignment_c (hid_t_f *prp_id, hsize_t_f* threshold, hsize_t_f* alignment)
+h5pset_alignment_c(hid_t_f *prp_id, hsize_t_f *threshold, hsize_t_f *alignment)
 /******/
 {
-     int ret_value = -1;
-     hid_t c_prp_id;
-     herr_t ret;
-     hsize_t c_threshold, c_alignment;
-     c_threshold = (hsize_t)*threshold;
-     c_alignment = (hsize_t)* alignment;
-     /*
-      * Call H5Pset_alignment function.
-      */
-     c_prp_id = (hid_t)*prp_id;
-     ret = H5Pset_alignment(c_prp_id, c_threshold, c_alignment);
-     if (ret < 0) return ret_value;
-     ret_value = 0;
-     return ret_value;
+    int     ret_value = -1;
+    hid_t   c_prp_id;
+    herr_t  ret;
+    hsize_t c_threshold, c_alignment;
+    c_threshold = (hsize_t)*threshold;
+    c_alignment = (hsize_t)*alignment;
+    /*
+     * Call H5Pset_alignment function.
+     */
+    c_prp_id = (hid_t)*prp_id;
+    ret      = H5Pset_alignment(c_prp_id, c_threshold, c_alignment);
+    if (ret < 0)
+        return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pget_alignment_c
  * NAME
- *        h5pget_alignment_c
+ *  h5pget_alignment_c
  * PURPOSE
- *     Call H5Pget_alignment to get alignment properties of
- *              a file access property list
+ *  Call H5Pget_alignment to get alignment properties of
+ *  a file access property list
  * INPUTS
- *      prp_id - property list identifier
- *              threshold - Threshold value
- *              alignment - Alignment value
+ *  prp_id - property list identifier
+ *  threshold - Threshold value
+ *  alignment - Alignment value
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Xiangyang Su
- *              Friday, February 25, 2000
+ *  Friday, February 25, 2000
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pget_alignment_c (hid_t_f *prp_id, hsize_t_f* threshold, hsize_t_f* alignment)
+h5pget_alignment_c(hid_t_f *prp_id, hsize_t_f *threshold, hsize_t_f *alignment)
 /******/
 {
-     int ret_value = -1;
-     hid_t c_prp_id;
-     herr_t ret;
-     hsize_t c_threshold, c_alignment;
-     /*
-      * Call H5Pget_alignment function.
-      */
-     c_prp_id = (hid_t)*prp_id;
-     ret = H5Pget_alignment(c_prp_id, &c_threshold, &c_alignment);
-     if (ret < 0) return ret_value;
-     *threshold = (hsize_t_f)c_threshold;
-     *alignment = (hsize_t_f)c_alignment;
+    int     ret_value = -1;
+    hid_t   c_prp_id;
+    herr_t  ret;
+    hsize_t c_threshold, c_alignment;
+    /*
+     * Call H5Pget_alignment function.
+     */
+    c_prp_id = (hid_t)*prp_id;
+    ret      = H5Pget_alignment(c_prp_id, &c_threshold, &c_alignment);
+    if (ret < 0)
+        return ret_value;
+    *threshold = (hsize_t_f)c_threshold;
+    *alignment = (hsize_t_f)c_alignment;
 
-     ret_value = 0;
-     return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pset_fapl_core_c
  * NAME
- *        h5pset_fapl_core_c
+ *  h5pset_fapl_core_c
  * PURPOSE
- *     Call H5Pset_fapl_core to set the low-level file driver
- *              to use malloc() and free()
+ *  Call H5Pset_fapl_core to set the low-level file driver
+ *  to use malloc() and free()
  * INPUTS
- *      prp_id - property list identifier
- *              increment - File block size in bytes
- *              flag - Boolean flag indicating whether to write the
- *              file contents to disk when the file is closed.
+ *  prp_id - property list identifier
+ *  increment - File block size in bytes
+ *  flag - Boolean flag indicating whether to write the
+ *  file contents to disk when the file is closed.
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              March 9, 2001
+ *  March 9, 2001
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pset_fapl_core_c (hid_t_f *prp_id, size_t_f* increment, int_f *flag)
+h5pset_fapl_core_c(hid_t_f *prp_id, size_t_f *increment, int_f *flag)
 /******/
 {
-     int ret_value = -1;
-     hid_t c_prp_id;
-     herr_t ret = -1;
-     size_t c_increment;
-     hbool_t c_backing_store;
-     c_increment = (size_t)*increment;
-     c_backing_store = (hbool_t)*flag;
+    int     ret_value = -1;
+    hid_t   c_prp_id;
+    herr_t  ret = -1;
+    size_t  c_increment;
+    hbool_t c_backing_store;
+    c_increment     = (size_t)*increment;
+    c_backing_store = (hbool_t)*flag;
 
-     /*
-      * Call H5Pset_fapl_core function.
-      */
-     c_prp_id = (hid_t)*prp_id;
-     ret = H5Pset_fapl_core(c_prp_id, c_increment, c_backing_store);
-     if (ret < 0) return ret_value;
-     ret_value = 0;
-     return ret_value;
+    /*
+     * Call H5Pset_fapl_core function.
+     */
+    c_prp_id = (hid_t)*prp_id;
+    ret      = H5Pset_fapl_core(c_prp_id, c_increment, c_backing_store);
+    if (ret < 0)
+        return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pget_fapl_core_c
  * NAME
- *        h5pget_fapl_core_c
+ *  h5pget_fapl_core_c
  * PURPOSE
- *     Call H5Pget_fapl_core to determine whether the file access
- *              property list is set to the core drive
+ *  Call H5Pget_fapl_core to determine whether the file access
+ *  property list is set to the core drive
  * INPUTS
- *      prp_id - property list identifier
- * Outputs      increment - File block size in bytes
+ *  prp_id - property list identifier
+ *  Outputs      increment - File block size in bytes
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              March 9, 2001
+ *  March 9, 2001
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pget_fapl_core_c (hid_t_f *prp_id, size_t_f* increment, int_f *flag)
+h5pget_fapl_core_c(hid_t_f *prp_id, size_t_f *increment, int_f *flag)
 /******/
 {
-     int ret_value = -1;
-     hid_t c_prp_id;
-     herr_t ret = -1;
-     size_t c_increment = 0;
-     hbool_t c_backing_store;
-     *flag = 0;
-     /*
-      * Call H5Pset_fapl_core function.
-      */
-     c_prp_id = (hid_t)*prp_id;
-     ret = H5Pget_fapl_core(c_prp_id, &c_increment, &c_backing_store);
-     if (ret < 0) return ret_value;
-     *increment = (size_t_f)c_increment;
-     if(c_backing_store  > 0) *flag = 1;
-     ret_value = 0;
-     return ret_value;
+    int     ret_value = -1;
+    hid_t   c_prp_id;
+    herr_t  ret         = -1;
+    size_t  c_increment = 0;
+    hbool_t c_backing_store;
+    *flag = 0;
+    /*
+     * Call H5Pset_fapl_core function.
+     */
+    c_prp_id = (hid_t)*prp_id;
+    ret      = H5Pget_fapl_core(c_prp_id, &c_increment, &c_backing_store);
+    if (ret < 0)
+        return ret_value;
+    *increment = (size_t_f)c_increment;
+    if (c_backing_store > 0)
+        *flag = 1;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pset_fapl_family_c
  * NAME
- *        h5pset_fapl_family_c
+ *  h5pset_fapl_family_c
  * PURPOSE
- *     Call H5Pset_fapl_family to set the file access properties list
- *              to the family driver
+ *  Call H5Pset_fapl_family to set the file access properties list
+ *  to the family driver
  * INPUTS
- *      prp_id - property list identifier
- *              memb_size -  Logical size, in bytes, of each family member.
- *              memb_plist - Identifier of the file access property list
- *                           for each member of the family
+ *  prp_id - property list identifier
+ *  memb_size -  Logical size, in bytes, of each family member.
+ *  memb_plist - Identifier of the file access property list
+ *  for each member of the family
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              March 9, 2001
+ *  March 9, 2001
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pset_fapl_family_c(hid_t_f *prp_id, hsize_t_f* memb_size, hid_t_f* memb_plist )
+h5pset_fapl_family_c(hid_t_f *prp_id, hsize_t_f *memb_size, hid_t_f *memb_plist)
 /******/
 {
-     int ret_value = -1;
-     hid_t c_prp_id;
-     herr_t ret = -1;
-     hsize_t c_memb_size;
-     hid_t c_memb_plist;
-     c_memb_size =(hsize_t) *memb_size;
-     c_memb_plist =(hid_t) *memb_plist;
-     /*
-      * Call H5Pset_fapl_family function.
-      */
-     c_prp_id = (hid_t)*prp_id;
-     ret = H5Pset_fapl_family(c_prp_id, c_memb_size, c_memb_plist);
-     if (ret < 0) return ret_value;
-     ret_value = 0;
-     return ret_value;
+    int     ret_value = -1;
+    hid_t   c_prp_id;
+    herr_t  ret = -1;
+    hsize_t c_memb_size;
+    hid_t   c_memb_plist;
+    c_memb_size  = (hsize_t)*memb_size;
+    c_memb_plist = (hid_t)*memb_plist;
+    /*
+     * Call H5Pset_fapl_family function.
+     */
+    c_prp_id = (hid_t)*prp_id;
+    ret      = H5Pset_fapl_family(c_prp_id, c_memb_size, c_memb_plist);
+    if (ret < 0)
+        return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pget_fapl_family_c
  * NAME
- *        h5pget_fapl_family_c
+ *  h5pget_fapl_family_c
  * PURPOSE
- *     Call H5Pget_fapl_family to determine whether the file access
- *              property list is set to the family driver
+ *  Call H5Pget_fapl_family to determine whether the file access
+ *  property list is set to the family driver
  * INPUTS
- *      prp_id - property list identifier
- *              memb_size -  Logical size, in bytes, of each family member.
- *              memb_plist - Identifier of the file access property list
- *                           for each member of the family
+ *  prp_id - property list identifier
+ *  memb_size -  Logical size, in bytes, of each family member.
+ *  memb_plist - Identifier of the file access property list
+ *  for each member of the family
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              March 9, 2001
+ *  March 9, 2001
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pget_fapl_family_c(hid_t_f *prp_id, hsize_t_f* memb_size, hid_t_f* memb_plist)
+h5pget_fapl_family_c(hid_t_f *prp_id, hsize_t_f *memb_size, hid_t_f *memb_plist)
 /******/
 {
-     int ret_value = -1;
-     hid_t c_prp_id;
-     herr_t ret = -1;
-     hsize_t c_memb_size = 0;
-     hid_t c_memb_plist = -1;
-     /*
-      * Call H5Pget_fapl_family function.
-      */
-     c_prp_id = (hid_t)*prp_id;
-     ret = H5Pget_fapl_family(c_prp_id, &c_memb_size, &c_memb_plist);
-     if (ret < 0) return ret_value;
-     *memb_size = (hsize_t_f)c_memb_size;
-     *memb_plist = (hid_t_f)c_memb_plist;
+    int     ret_value = -1;
+    hid_t   c_prp_id;
+    herr_t  ret          = -1;
+    hsize_t c_memb_size  = 0;
+    hid_t   c_memb_plist = -1;
+    /*
+     * Call H5Pget_fapl_family function.
+     */
+    c_prp_id = (hid_t)*prp_id;
+    ret      = H5Pget_fapl_family(c_prp_id, &c_memb_size, &c_memb_plist);
+    if (ret < 0)
+        return ret_value;
+    *memb_size  = (hsize_t_f)c_memb_size;
+    *memb_plist = (hid_t_f)c_memb_plist;
 
-     ret_value = 0;
-     return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pset_cache_c
  * NAME
- *        h5pset_cache_c
+ *  h5pset_cache_c
  * PURPOSE
- *     Call H5Pset_cache to set he number of elements in
- *              the meta data cache and the total number of bytes in
- *              the raw data chunk cache
+ *  Call H5Pset_cache to set he number of elements in
+ *  the meta data cache and the total number of bytes in
+ *  the raw data chunk cache
  * INPUTS
- *      prp_id - property list identifier
- *              mdc_nelmts - Number of elements (objects) in the
- *                           meta data cache
- *              rdcc_nbytes - Total size of the raw data chunk cache, in bytes
- *              rdcc_w0 - Preemption policy
+ *  prp_id - property list identifier
+ *  mdc_nelmts - Number of elements (objects) in the
+ *  meta data cache
+ *  rdcc_nbytes - Total size of the raw data chunk cache, in bytes
+ *  rdcc_w0 - Preemption policy
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Xiangyang Su
- *              Friday, February 25, 2000
+ *  Friday, February 25, 2000
  * HISTORY
- * Changed the type of the rdcc_w0 parameter to be real_f EP 7/7/00
- *                instead of double
+ *  Changed the type of the rdcc_w0 parameter to be real_f EP 7/7/00
+ *  instead of double
  * SOURCE
-*/
+ */
 int_f
-nh5pset_cache_c(hid_t_f *prp_id, int_f* mdc_nelmts, size_t_f* rdcc_nelmts,  size_t_f* rdcc_nbytes , real_f* rdcc_w0 )
+h5pset_cache_c(hid_t_f *prp_id, int_f *mdc_nelmts, size_t_f *rdcc_nelmts, size_t_f *rdcc_nbytes,
+               real_f *rdcc_w0)
 /******/
 {
-     int ret_value = -1;
-     hid_t c_prp_id;
-     herr_t ret;
-     int c_mdc_nelmts;
-     size_t c_rdcc_nelmts;
-     size_t c_rdcc_nbytes;
-     double c_rdcc_w0;
-     c_rdcc_nbytes =(size_t) *rdcc_nbytes;
-     c_rdcc_w0 = (double)*rdcc_w0;
+    int    ret_value = -1;
+    hid_t  c_prp_id;
+    herr_t ret;
+    int    c_mdc_nelmts;
+    size_t c_rdcc_nelmts;
+    size_t c_rdcc_nbytes;
+    double c_rdcc_w0;
+    c_rdcc_nbytes = (size_t)*rdcc_nbytes;
+    c_rdcc_w0     = (double)*rdcc_w0;
 
-     /*
-      * Call H5Pset_cache function.
-      */
-     c_prp_id = (hid_t)*prp_id;
-     c_mdc_nelmts = (int)*mdc_nelmts;
-     c_rdcc_nelmts = (size_t)*rdcc_nelmts;
-     ret = H5Pset_cache(c_prp_id, c_mdc_nelmts, c_rdcc_nelmts, c_rdcc_nbytes, c_rdcc_w0  );
-     if (ret < 0) return ret_value;
-     ret_value = 0;
-     return ret_value;
+    /*
+     * Call H5Pset_cache function.
+     */
+    c_prp_id      = (hid_t)*prp_id;
+    c_mdc_nelmts  = (int)*mdc_nelmts;
+    c_rdcc_nelmts = (size_t)*rdcc_nelmts;
+    ret           = H5Pset_cache(c_prp_id, c_mdc_nelmts, c_rdcc_nelmts, c_rdcc_nbytes, c_rdcc_w0);
+    if (ret < 0)
+        return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pget_cache_c
  * NAME
- *        h5pget_cache_c
+ *  h5pget_cache_c
  * PURPOSE
- *     Call H5Pget_cache to get he number of elements in
- *              the meta data cache and the total number of bytes in
- *              the raw data chunk cache
+ *  Call H5Pget_cache to get he number of elements in
+ *  the meta data cache and the total number of bytes in
+ *  the raw data chunk cache
  * INPUTS
- *      prp_id - property list identifier
+ *  prp_id - property list identifier
  * OUTPUTS
- *     mdc_nelmts - Number of elements (objects) in the
- *                           meta data cache
- *              rdcc_nelmts - Number of elements in the raw data chunk
- *              rdcc_nbytes - Total size of the raw data chunk cache, in bytes
- *              rdcc_w0 - Preemption policy
+ *  mdc_nelmts - Number of elements (objects) in the
+ *  meta data cache
+ *  rdcc_nelmts - Number of elements in the raw data chunk
+ *  rdcc_nbytes - Total size of the raw data chunk cache, in bytes
+ *  rdcc_w0 - Preemption policy
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Xiangyang Su
- *              Friday, February 25, 2000
+ *  Friday, February 25, 2000
  * HISTORY
- * Changed type of the rdcc_w0 parameter to be real_f instead of double
- *                Changed type of the rdcc_nelmts parameter to be int_f.
+ *  Changed type of the rdcc_w0 parameter to be real_f instead of double
+ *  Changed type of the rdcc_nelmts parameter to be int_f.
  *                                                          EIP  October 10, 2003
  * SOURCE
-*/
+ */
 int_f
-nh5pget_cache_c(hid_t_f *prp_id, int_f* mdc_nelmts, size_t_f* rdcc_nelmts, size_t_f* rdcc_nbytes , real_f* rdcc_w0)
+h5pget_cache_c(hid_t_f *prp_id, int_f *mdc_nelmts, size_t_f *rdcc_nelmts, size_t_f *rdcc_nbytes,
+               real_f *rdcc_w0)
 /******/
 {
-     int ret_value = -1;
-     hid_t c_prp_id;
-     herr_t ret;
-     int c_mdc_nelmts;
-     size_t c_rdcc_nelmts;
-     size_t c_rdcc_nbytes;
-     double c_rdcc_w0;
-     /*
-      * Call H5Pget_cache function.
-      */
-     c_prp_id = (hid_t)*prp_id;
-     ret = H5Pget_cache(c_prp_id, &c_mdc_nelmts, &c_rdcc_nelmts, &c_rdcc_nbytes, &c_rdcc_w0);
-     if (ret < 0) return ret_value;
-     *mdc_nelmts = (int_f)c_mdc_nelmts;
-     *rdcc_nelmts = (size_t_f)c_rdcc_nelmts;
-     *rdcc_nbytes = (size_t_f)c_rdcc_nbytes;
-     *rdcc_w0 = (real_f)c_rdcc_w0;
+    int    ret_value = -1;
+    hid_t  c_prp_id;
+    herr_t ret;
+    int    c_mdc_nelmts;
+    size_t c_rdcc_nelmts;
+    size_t c_rdcc_nbytes;
+    double c_rdcc_w0;
+    /*
+     * Call H5Pget_cache function.
+     */
+    c_prp_id = (hid_t)*prp_id;
+    ret      = H5Pget_cache(c_prp_id, &c_mdc_nelmts, &c_rdcc_nelmts, &c_rdcc_nbytes, &c_rdcc_w0);
+    if (ret < 0)
+        return ret_value;
+    *mdc_nelmts  = (int_f)c_mdc_nelmts;
+    *rdcc_nelmts = (size_t_f)c_rdcc_nelmts;
+    *rdcc_nbytes = (size_t_f)c_rdcc_nbytes;
+    *rdcc_w0     = (real_f)c_rdcc_w0;
 
-     ret_value = 0;
-     return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pset_fapl_split_c
  * NAME
- *        h5pset_fapl_split_c
+ *  h5pset_fapl_split_c
  * PURPOSE
- *     Call H5Pset_fapl_split to set he low-level driver to split meta data
- *              from raw data
+ *  Call H5Pset_fapl_split to set he low-level driver to split meta data
+ *  from raw data
  * INPUTS
- *      prp_id - property list identifier
- *              meta_len - Length of meta_ext
- *              meta_ext - Name of the extension for the metafile filename.
- *              meta_plist - Identifier of the meta file access property list
- *              raw_len - Length of raw _ext
- *              raw_ext - Name of the extension for the raw file filename.
- *              raw_plist - Identifier of the raw  file access property list
+ *  prp_id - property list identifier
+ *  meta_len - Length of meta_ext
+ *  meta_ext - Name of the extension for the metafile filename.
+ *  meta_plist - Identifier of the meta file access property list
+ *  raw_len - Length of raw _ext
+ *  raw_ext - Name of the extension for the raw file filename.
+ *  raw_plist - Identifier of the raw  file access property list
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              March 9, 2001
+ *  March 9, 2001
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pset_fapl_split_c(hid_t_f *prp_id, int_f* meta_len, _fcd meta_ext, hid_t_f* meta_plist, int_f* raw_len, _fcd raw_ext, hid_t_f * raw_plist)
+h5pset_fapl_split_c(hid_t_f *prp_id, int_f *meta_len, _fcd meta_ext, hid_t_f *meta_plist, int_f *raw_len,
+                    _fcd raw_ext, hid_t_f *raw_plist)
 /******/
 {
-     int ret_value = -1;
-     hid_t c_prp_id;
-     hid_t c_meta_plist;
-     hid_t c_raw_plist;
-     herr_t ret = -1;
-     char* c_meta_ext;
-     char* c_raw_ext;
+    int    ret_value = -1;
+    hid_t  c_prp_id;
+    hid_t  c_meta_plist;
+    hid_t  c_raw_plist;
+    herr_t ret = -1;
+    char  *c_meta_ext;
+    char  *c_raw_ext;
 
-     c_meta_ext = (char *)HD5f2cstring(meta_ext, (size_t)*meta_len);
-     if (c_meta_ext == NULL) return ret_value;
-     c_raw_ext = (char *)HD5f2cstring(raw_ext, (size_t)*raw_len);
-     if (c_raw_ext == NULL) { HDfree(c_meta_ext);
-                              return ret_value;
-                            }
+    c_meta_ext = (char *)HD5f2cstring(meta_ext, (size_t)*meta_len);
+    if (c_meta_ext == NULL)
+        return ret_value;
+    c_raw_ext = (char *)HD5f2cstring(raw_ext, (size_t)*raw_len);
+    if (c_raw_ext == NULL) {
+        HDfree(c_meta_ext);
+        return ret_value;
+    }
 
-     /*
-      * Call H5Pset_fapl_split function.
-      */
-     c_prp_id = (hid_t)*prp_id;
-     c_meta_plist = (hid_t)*meta_plist;
-     c_raw_plist = (hid_t)*raw_plist;
-     ret = H5Pset_fapl_split(c_prp_id, c_meta_ext, c_meta_plist, c_raw_ext, c_raw_plist );
+    /*
+     * Call H5Pset_fapl_split function.
+     */
+    c_prp_id     = (hid_t)*prp_id;
+    c_meta_plist = (hid_t)*meta_plist;
+    c_raw_plist  = (hid_t)*raw_plist;
+    ret          = H5Pset_fapl_split(c_prp_id, c_meta_ext, c_meta_plist, c_raw_ext, c_raw_plist);
 
-     if (ret < 0) goto DONE;
-     ret_value = 0;
+    if (ret < 0)
+        goto DONE;
+    ret_value = 0;
 
 DONE:
-     HDfree(c_meta_ext);
-     HDfree(c_raw_ext);
-     return ret_value;
+    HDfree(c_meta_ext);
+    HDfree(c_raw_ext);
+    return ret_value;
 }
 
-
 #ifdef NO_SUCH_F90_FUNCTION
 /****if* H5Pf/h5pget_fapl_split_c
  * NAME
- *        h5pget_fapl_split_c
+ *  h5pget_fapl_split_c
  * PURPOSE
- *     Call H5Pget_fapl_split to determine whether the file access
- *              property list is set to the split driver
+ *  Call H5Pget_fapl_split to determine whether the file access
+ *  property list is set to the split driver
  * INPUTS
- *      prp_id - property list identifier
- *              meta_ext_size - Number of characters of the meta file extension
- *                              to be copied to the meta_ext buffer
- *              raw_ext_size - Number of characters of the raw file extension
- *                              to be copied to the raw_ext buffer
+ *  prp_id - property list identifier
+ *  meta_ext_size - Number of characters of the meta file extension
+ *  to be copied to the meta_ext buffer
+ *  raw_ext_size - Number of characters of the raw file extension
+ *  to be copied to the raw_ext buffer
  *OUTPUT
- *      meta_ext - Name of the extension for the metafile filename.
- *              meta_plist - Identifier of the meta file access property list
- *              raw_ext - Name of the extension for the raw file filename.
- *              raw_plist - Identifier of the raw  file access property list
+ *  meta_ext - Name of the extension for the metafile filename.
+ *  meta_plist - Identifier of the meta file access property list
+ *  raw_ext - Name of the extension for the raw file filename.
+ *  raw_plist - Identifier of the raw  file access property list
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              March 9 , 2001
+ *  March 9 , 2001
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pget_fapl_split_c(hid_t_f *prp_id, size_t_f* meta_ext_size , _fcd meta_ext, hid_t_f* meta_plist, size_t_f* raw_ext_size, _fcd raw_ext, hid_t_f * raw_plist)
+h5pget_fapl_split_c(hid_t_f *prp_id, size_t_f *meta_ext_size, _fcd meta_ext, hid_t_f *meta_plist,
+                    size_t_f *raw_ext_size, _fcd raw_ext, hid_t_f *raw_plist)
 /******/
 {
-     int ret_value = -1;
-     hid_t c_prp_id;
-     herr_t ret = -1;
-     size_t c_meta_ext_size, c_raw_ext_size;
-     hid_t c_meta_plist = -1;
-     hid_t c_raw_plist = -1;
+    int    ret_value = -1;
+    hid_t  c_prp_id;
+    herr_t ret = -1;
+    size_t c_meta_ext_size, c_raw_ext_size;
+    hid_t  c_meta_plist = -1;
+    hid_t  c_raw_plist  = -1;
 
-     char* c_meta_ext = NULL;
-     char* c_raw_ext  = NULL;
+    char *c_meta_ext = NULL;
+    char *c_raw_ext  = NULL;
 
-     c_meta_ext_size = (size_t) *meta_ext_size;
-     c_raw_ext_size = (size_t) *raw_ext_size;
-     c_meta_ext = (char *)HDmalloc(sizeof(char) * c_meta_ext_size);
-     c_raw_ext = (char *)HDmalloc(sizeof(char) * c_raw_ext_size);
-     if(c_meta_ext == NULL || c_raw_ext == NULL) return ret_value;
+    c_meta_ext_size = (size_t)*meta_ext_size;
+    c_raw_ext_size  = (size_t)*raw_ext_size;
+    c_meta_ext      = (char *)HDmalloc(sizeof(char) * c_meta_ext_size);
+    c_raw_ext       = (char *)HDmalloc(sizeof(char) * c_raw_ext_size);
+    if (c_meta_ext == NULL || c_raw_ext == NULL)
+        return ret_value;
 
-     /*
-      * Call H5Pget_fapl_split function.
-      */
-     c_prp_id = *prp_id;
-     ret = H5Pget_fapl_split(c_prp_id, c_meta_ext_size, c_meta_ext,&c_meta_plist, c_raw_ext_size, c_raw_ext, &c_raw_plist );
+    /*
+     * Call H5Pget_fapl_split function.
+     */
+    c_prp_id = *prp_id;
+    ret = H5Pget_fapl_split(c_prp_id, c_meta_ext_size, c_meta_ext, &c_meta_plist, c_raw_ext_size, c_raw_ext,
+                            &c_raw_plist);
 
-     if (ret < 0) return ret_value;
-     *meta_plist = c_meta_plist;
-     *raw_plist = c_raw_plist;
-     HD5packFstring(c_meta_ext, _fcdtocp(meta_ext), strlen(c_meta_ext));
-     HD5packFstring(c_raw_ext, _fcdtocp(raw_ext), strlen(c_raw_ext));
+    if (ret < 0)
+        return ret_value;
+    *meta_plist = c_meta_plist;
+    *raw_plist  = c_raw_plist;
+    HD5packFstring(c_meta_ext, _fcdtocp(meta_ext), strlen(c_meta_ext));
+    HD5packFstring(c_raw_ext, _fcdtocp(raw_ext), strlen(c_raw_ext));
 
-     ret_value = 0;
-     return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 #endif /*NO_SUCH_F90_FUNCTION*/
 
 /****if* H5Pf/h5pset_gc_references_c
  * NAME
- *        h5pset_gc_references_c
+ *  h5pset_gc_references_c
  * PURPOSE
- *     Call H5Pset_gc_references to set garbage
- *              collecting references flag
+ *  Call H5Pset_gc_references to set garbage
+ *  collecting references flag
  * INPUTS
- *      prp_id - property list identifier
- *              gc_reference - flag for garbage collecting references
- *                             for the file
+ *  prp_id - property list identifier
+ *  gc_reference - flag for garbage collecting references
+ *  for the file
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Xiangyang Su
- *              Friday, February 25, 2000
+ *  Friday, February 25, 2000
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pset_gc_references_c (hid_t_f *prp_id, int_f* gc_references)
+h5pset_gc_references_c(hid_t_f *prp_id, int_f *gc_references)
 /******/
 {
-     int ret_value = -1;
-     hid_t c_prp_id;
-     herr_t ret;
-     unsigned c_gc_references;
-     c_gc_references = (unsigned)*gc_references;
+    int      ret_value = -1;
+    hid_t    c_prp_id;
+    herr_t   ret;
+    unsigned c_gc_references;
+    c_gc_references = (unsigned)*gc_references;
 
-     /*
-      * Call H5Pset_gc_references function.
-      */
-     c_prp_id = *prp_id;
-     ret = H5Pset_gc_references(c_prp_id, c_gc_references);
+    /*
+     * Call H5Pset_gc_references function.
+     */
+    c_prp_id = *prp_id;
+    ret      = H5Pset_gc_references(c_prp_id, c_gc_references);
 
-     if (ret < 0) return ret_value;
-     ret_value = 0;
-     return ret_value;
+    if (ret < 0)
+        return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pget_gc_references_c
  * NAME
- *        h5pget_gc_references_c
+ *  h5pget_gc_references_c
  * PURPOSE
- *     Call H5Pget_gc_references to set garbage
- *              collecting references flag
+ *  Call H5Pget_gc_references to set garbage
+ *  collecting references flag
  * INPUTS
- *      prp_id - property list identifier
- * Outputs      gc_reference - flag for garbage collecting references
- *                             for the file
+ *  prp_id - property list identifier
+ *  Outputs      gc_reference - flag for garbage collecting references
+ *  for the file
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Xiangyang Su
- *              Friday, February 25, 2000
+ *  Friday, February 25, 2000
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pget_gc_references_c (hid_t_f *prp_id, int_f* gc_references)
+h5pget_gc_references_c(hid_t_f *prp_id, int_f *gc_references)
 /******/
 {
-     int ret_value = -1;
-     hid_t c_prp_id;
-     unsigned c_gc_references;
-     herr_t ret;
-     /*
-      * Call H5Pget_gc_references function.
-      */
-     c_prp_id = (hid_t)*prp_id;
-     ret = H5Pget_gc_references(c_prp_id, &c_gc_references);
-     if (ret < 0) return ret_value;
-     *gc_references = (int_f)c_gc_references;
-     ret_value = 0;
-     return ret_value;
+    int      ret_value = -1;
+    hid_t    c_prp_id;
+    unsigned c_gc_references;
+    herr_t   ret;
+    /*
+     * Call H5Pget_gc_references function.
+     */
+    c_prp_id = (hid_t)*prp_id;
+    ret      = H5Pget_gc_references(c_prp_id, &c_gc_references);
+    if (ret < 0)
+        return ret_value;
+    *gc_references = (int_f)c_gc_references;
+    ret_value      = 0;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pset_layout_c
  * NAME
- *        h5pset_layout_c
+ *  h5pset_layout_c
  * PURPOSE
- *     Call H5Pset_layout to the type of storage used
- *              store the raw data for a dataset
+ *  Call H5Pset_layout to the type of storage used
+ *  store the raw data for a dataset
  * INPUTS
- *      prp_id - property list identifier
- *              layout - Type of storage layout for raw data.
+ *  prp_id - property list identifier
+ *  layout - Type of storage layout for raw data.
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Xiangyang Su
- *              Friday, February 25, 2000
+ *  Friday, February 25, 2000
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pset_layout_c (hid_t_f *prp_id, int_f* layout)
+h5pset_layout_c(hid_t_f *prp_id, int_f *layout)
 /******/
 {
-     int ret_value = -1;
-     hid_t c_prp_id;
-     herr_t ret;
-     H5D_layout_t c_layout;
-     c_layout = (H5D_layout_t)*layout;
-     /*
-      * Call H5Pset_layout function.
-      */
-     c_prp_id = (hid_t)*prp_id;
-     ret = H5Pset_layout(c_prp_id, c_layout);
+    int          ret_value = -1;
+    hid_t        c_prp_id;
+    herr_t       ret;
+    H5D_layout_t c_layout;
+    c_layout = (H5D_layout_t)*layout;
+    /*
+     * Call H5Pset_layout function.
+     */
+    c_prp_id = (hid_t)*prp_id;
+    ret      = H5Pset_layout(c_prp_id, c_layout);
 
-     if (ret < 0) return ret_value;
-     ret_value = 0;
-     return ret_value;
+    if (ret < 0)
+        return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pget_layout_c
  * NAME
- *        h5pget_layout_c
+ *  h5pget_layout_c
  * PURPOSE
- *     Call H5Pget_layout to the type of storage used
- *              store the raw data for a dataset
+ *  Call H5Pget_layout to the type of storage used
+ *  store the raw data for a dataset
  * INPUTS
- *      prp_id - property list identifier
+ *  prp_id - property list identifier
  * OUTPUTS
- *     layout - Type of storage layout for raw data.
+ *  layout - Type of storage layout for raw data.
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Xiangyang Su
- *              Friday, February 25, 2000
+ *  Friday, February 25, 2000
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pget_layout_c (hid_t_f *prp_id, int_f* layout)
+h5pget_layout_c(hid_t_f *prp_id, int_f *layout)
 /******/
 {
-     int ret_value = -1;
-     hid_t c_prp_id;
-     H5D_layout_t c_layout;
-     /*
-      * Call H5Pget_layout function.
-      */
-     c_prp_id = (hid_t)*prp_id;
-     c_layout = H5Pget_layout(c_prp_id);
-     if (c_layout < 0) return ret_value;
-     *layout = (int_f)c_layout;
-     ret_value = 0;
-     return ret_value;
+    int          ret_value = -1;
+    hid_t        c_prp_id;
+    H5D_layout_t c_layout;
+    /*
+     * Call H5Pget_layout function.
+     */
+    c_prp_id = (hid_t)*prp_id;
+    c_layout = H5Pget_layout(c_prp_id);
+    if (c_layout < 0)
+        return ret_value;
+    *layout   = (int_f)c_layout;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pset_filter_c
  * NAME
- *        h5pset_filter_c
+ *  h5pset_filter_c
  * PURPOSE
- *     Call H5Pset_filter to add a filter to the filter pipeline.
+ *  Call H5Pset_filter to add a filter to the filter pipeline.
  * INPUTS
- *      prp_id - property list identifier
- *              filter - Filter to be added to the pipeline.
- *              flags - Bit vector specifying certain general
- *                      properties of the filter.
- *              cd_nelmts - Number of elements in cd_values.
- *              cd_values - Auxiliary data for the filter.
+ *  prp_id - property list identifier
+ *  filter - Filter to be added to the pipeline.
+ *  flags - Bit vector specifying certain general
+ *  properties of the filter.
+ *  cd_nelmts - Number of elements in cd_values.
+ *  cd_values - Auxiliary data for the filter.
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Xiangyang Su
- *              Wednesday, February 23, 2000
+ *  Wednesday, February 23, 2000
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pset_filter_c (hid_t_f *prp_id, int_f* filter, int_f* flags, size_t_f* cd_nelmts, int_f* cd_values )
+h5pset_filter_c(hid_t_f *prp_id, int_f *filter, int_f *flags, size_t_f *cd_nelmts, int_f *cd_values)
 /******/
 {
-     int ret_value = -1;
-     hid_t c_prp_id = (hid_t)*prp_id;
-     herr_t ret;
-     size_t c_cd_nelmts = (size_t)*cd_nelmts;
-     unsigned int c_flags = (unsigned)*flags;
-     H5Z_filter_t c_filter = (H5Z_filter_t)*filter;
-     unsigned int * c_cd_values;
-     unsigned i;
+    int           ret_value = -1;
+    hid_t         c_prp_id  = (hid_t)*prp_id;
+    herr_t        ret;
+    size_t        c_cd_nelmts = (size_t)*cd_nelmts;
+    unsigned int  c_flags     = (unsigned)*flags;
+    H5Z_filter_t  c_filter    = (H5Z_filter_t)*filter;
+    unsigned int *c_cd_values;
+    unsigned      i;
 
-     c_cd_values = (unsigned int*)HDmalloc(sizeof(unsigned int) * c_cd_nelmts);
-     if (!c_cd_values) return ret_value;
-     for (i = 0; i < c_cd_nelmts; i++)
-          c_cd_values[i] = (unsigned int)cd_values[i];
+    c_cd_values = (unsigned int *)HDmalloc(sizeof(unsigned int) * c_cd_nelmts);
+    if (!c_cd_values)
+        return ret_value;
+    for (i = 0; i < c_cd_nelmts; i++)
+        c_cd_values[i] = (unsigned int)cd_values[i];
 
-     /*
-      * Call H5Pset_filter function.
-      */
-     ret = H5Pset_filter(c_prp_id, c_filter, c_flags, c_cd_nelmts,c_cd_values );
+    /*
+     * Call H5Pset_filter function.
+     */
+    ret = H5Pset_filter(c_prp_id, c_filter, c_flags, c_cd_nelmts, c_cd_values);
 
-     if (ret < 0) goto DONE;
-     ret_value = 0;
+    if (ret < 0)
+        goto DONE;
+    ret_value = 0;
 
 DONE:
-     HDfree(c_cd_values);
-     return ret_value;
+    HDfree(c_cd_values);
+    return ret_value;
 }
 
 /****if* H5Pf/h5pget_nfilters_c
@@ -1822,90 +1762,93 @@ DONE:
  *  Xiangyang Su
  *  Friday, February 25, 2000
  * SOURCE
-*/
+ */
 int_f
-nh5pget_nfilters_c (hid_t_f *prp_id, int_f* nfilters)
+h5pget_nfilters_c(hid_t_f *prp_id, int_f *nfilters)
 /******/
 {
-     int ret_value = -1;
-     hid_t c_prp_id;
-     int c_nfilters;
-     /*
-      * Call H5Pget_nfilters function.
-      */
-     c_prp_id = (hid_t)*prp_id;
-     c_nfilters = H5Pget_nfilters(c_prp_id);
-     if (c_nfilters < 0) return ret_value;
+    int   ret_value = -1;
+    hid_t c_prp_id;
+    int   c_nfilters;
+    /*
+     * Call H5Pget_nfilters function.
+     */
+    c_prp_id   = (hid_t)*prp_id;
+    c_nfilters = H5Pget_nfilters(c_prp_id);
+    if (c_nfilters < 0)
+        return ret_value;
 
-     *nfilters = (int_f)c_nfilters;
-     ret_value = 0;
+    *nfilters = (int_f)c_nfilters;
+    ret_value = 0;
 
-     return ret_value;
+    return ret_value;
 }
 
 /*----------------------------------------------------------------------------
- * Name:        h5pget_filter_c
- * Purpose:     Call H5Pget_filter2 to get information about a filter
- *              in a pipeline
- * Inputs:      prp_id - property list identifier
- *              filter_number - Sequence number within the filter
- *                              pipeline of the filter for which
- *                              information is sought.
- *              namelen - Anticipated number of characters in name.
- *Outputs:      flags - Bit vector specifying certain general
- *                      properties of the filter.
- *              cd_nelmts - Number of elements in cd_value
- *              cd_values - Auxiliary data for the filter.
- *              name - Name of the filter
- *              filter_id - filter identification number
- * Returns:     0 on success, -1 on failure
- * Programmer:  Xiangyang Su
- *              Friday, February 25, 2000
- * Modifications:
- *              Since cd_nelmts has IN/OUT attributes, fixed the input and
- *              returned value of cd_nelmnts to satisfy this specification.
+ *  Name:        h5pget_filter_c
+ *  Purpose:     Call H5Pget_filter2 to get information about a filter
+ *  in a pipeline
+ *  Inputs:      prp_id - property list identifier
+ *  filter_number - Sequence number within the filter
+ *  pipeline of the filter for which
+ *  information is sought.
+ *  namelen - Anticipated number of characters in name.
+ *  Outputs:      flags - Bit vector specifying certain general
+ *  properties of the filter.
+ *  cd_nelmts - Number of elements in cd_value
+ *  cd_values - Auxiliary data for the filter.
+ *  name - Name of the filter
+ *  filter_id - filter identification number
+ *  Returns:     0 on success, -1 on failure
+ *  Programmer:  Xiangyang Su
+ *  Friday, February 25, 2000
+ *  Modifications:
+ *  Since cd_nelmts has IN/OUT attributes, fixed the input and
+ *  returned value of cd_nelmnts to satisfy this specification.
  *              MSB January 27, 2009
  *---------------------------------------------------------------------------*/
 int_f
-nh5pget_filter_c(hid_t_f *prp_id, int_f* filter_number, int_f* flags, size_t_f* cd_nelmts, int_f* cd_values, size_t_f *namelen, _fcd name, int_f* filter_id)
+h5pget_filter_c(hid_t_f *prp_id, int_f *filter_number, int_f *flags, size_t_f *cd_nelmts, int_f *cd_values,
+                size_t_f *namelen, _fcd name, int_f *filter_id)
 /******/
 {
     unsigned int  c_flags;
-    size_t c_cd_nelmts = 0;
-    H5Z_filter_t c_filter;
+    size_t        c_cd_nelmts = 0;
+    H5Z_filter_t  c_filter;
     unsigned int *c_cd_values = NULL;
-    char *c_name = NULL;
-    unsigned i;
-    int ret_value = -1;
+    char         *c_name      = NULL;
+    unsigned      i;
+    int           ret_value = -1;
 
     c_cd_nelmts = (size_t)*cd_nelmts;
 
-    if(NULL == (c_name = (char *)HDmalloc((size_t)*namelen + 1)))
+    if (NULL == (c_name = (char *)HDmalloc((size_t)*namelen + 1)))
         goto DONE;
 
-    if(NULL == (c_cd_values = (unsigned int *)HDmalloc(sizeof(unsigned int) * c_cd_nelmts)))
+    if (NULL == (c_cd_values = (unsigned int *)HDmalloc(sizeof(unsigned int) * c_cd_nelmts)))
         goto DONE;
 
     /*
      * Call H5Pget_filter2 function.
      */
-    if((c_filter = H5Pget_filter2((hid_t)*prp_id, (unsigned)*filter_number, &c_flags, &c_cd_nelmts, c_cd_values, (size_t)*namelen, c_name, NULL)) < 0)
+    if ((c_filter = H5Pget_filter2((hid_t)*prp_id, (unsigned)*filter_number, &c_flags, &c_cd_nelmts,
+                                   c_cd_values, (size_t)*namelen, c_name, NULL)) < 0)
         goto DONE;
 
     *filter_id = (int_f)c_filter;
     *cd_nelmts = (size_t_f)c_cd_nelmts;
-    *flags = (int_f)c_flags;
+    *flags     = (int_f)c_flags;
     HD5packFstring(c_name, _fcdtocp(name), strlen(c_name));
 
-    for(i = 0; i < c_cd_nelmts; i++)
-         cd_values[i] = (int_f)c_cd_values[i];
+    for (i = 0; i < c_cd_nelmts; i++)
+        cd_values[i] = (int_f)c_cd_values[i];
 
     ret_value = 0;
 
 DONE:
-    if(c_name)
+    if (c_name)
         HDfree(c_name);
-    if(c_cd_values)
+    if (c_cd_values)
         HDfree(c_cd_values);
     return ret_value;
 }
@@ -1921,7 +1864,7 @@ DONE:
  *  name    - Name of an external file
  *  namelen - length of name
  *  offset  - Offset, in bytes, from the beginning of the file
- *            to the location in the file where the data starts.
+ *  to the location in the file where the data starts.
  *  bytes   - Number of bytes reserved in the file for the data.
  * RETURNS
  *  0 on success, -1 on failure
@@ -1930,76 +1873,78 @@ DONE:
  *  Wednesday, February 23, 2000
  * HISTORY
  *  Changed type of 'offset' from int_f to off_t_f -- MSB January 9, 2012
- *  
+ *
  * SOURCE
-*/
+ */
 int_f
-nh5pset_external_c (hid_t_f *prp_id, _fcd name, int_f* namelen, off_t_f* offset, hsize_t_f*bytes)
+h5pset_external_c(hid_t_f *prp_id, _fcd name, int_f *namelen, off_t_f *offset, hsize_t_f *bytes)
 /******/
 {
-     int ret_value = -1;
-     hid_t c_prp_id;
-     herr_t ret;
-     hsize_t c_bytes;
-     char* c_name;
-     size_t c_namelen = (size_t)*namelen;
-     off_t c_offset;
-     c_bytes = (hsize_t) *bytes;
-     c_offset = (off_t) *offset;
+    int     ret_value = -1;
+    hid_t   c_prp_id;
+    herr_t  ret;
+    hsize_t c_bytes;
+    char   *c_name;
+    size_t  c_namelen = (size_t)*namelen;
+    off_t   c_offset;
+    c_bytes  = (hsize_t)*bytes;
+    c_offset = (off_t)*offset;
 
+    c_name = (char *)HD5f2cstring(name, c_namelen);
+    if (c_name == NULL)
+        return ret_value;
 
-     c_name = (char *)HD5f2cstring(name, c_namelen);
-     if (c_name == NULL) return ret_value;
-
-     /*
-      * Call H5Pset_external function.
-      */
-     c_prp_id = (hid_t)*prp_id;
-     ret = H5Pset_external(c_prp_id, c_name, c_offset, c_bytes);
+    /*
+     * Call H5Pset_external function.
+     */
+    c_prp_id = (hid_t)*prp_id;
+    ret      = H5Pset_external(c_prp_id, c_name, c_offset, c_bytes);
 
-     if (ret < 0) goto DONE;
-     ret_value = 0;
+    if (ret < 0)
+        goto DONE;
+    ret_value = 0;
 
 DONE:
-     HDfree(c_name);
-     return ret_value;
+    HDfree(c_name);
+    return ret_value;
 }
 
 /****if* H5Pf/h5pget_external_count_c
  * NAME
- *        h5pget_external_count_c
+ *  h5pget_external_count_c
  * PURPOSE
- *     Call H5Pget_external_count to get the number of external
- *              files for the specified dataset.
+ *  Call H5Pget_external_count to get the number of external
+ *  files for the specified dataset.
  * INPUTS
- *      prp_id - property list identifier
+ *  prp_id - property list identifier
  * OUTPUTS
- *     count - number of external files
+ *  count - number of external files
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Xiangyang Su
- *              Friday, February 25, 2000
+ *  Friday, February 25, 2000
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pget_external_count_c (hid_t_f *prp_id, int_f* count)
+h5pget_external_count_c(hid_t_f *prp_id, int_f *count)
 /******/
 {
-     int ret_value = -1;
-     hid_t c_prp_id;
-     int c_count;
-     /*
-      * Call H5Pget_external_count function.
-      */
-     c_prp_id = (hid_t)*prp_id;
-     c_count = H5Pget_external_count(c_prp_id);
-     if (c_count < 0) return ret_value;
-     *count = (int_f)c_count;
-     ret_value = 0;
-     return ret_value;
+    int   ret_value = -1;
+    hid_t c_prp_id;
+    int   c_count;
+    /*
+     * Call H5Pget_external_count function.
+     */
+    c_prp_id = (hid_t)*prp_id;
+    c_count  = H5Pget_external_count(c_prp_id);
+    if (c_count < 0)
+        return ret_value;
+    *count    = (int_f)c_count;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pget_external_c
@@ -2008,14 +1953,14 @@ nh5pget_external_count_c (hid_t_f *prp_id, int_f* count)
  * PURPOSE
  *  Call H5Pget_external to get nformation about an external file.
  * INPUTS
- *    prp_id - property list identifier
- * name_size - length of name
- *       idx - External file index.
+ *  prp_id - property list identifier
+ *  name_size - length of name
+ *  idx - External file index.
  * OUTPUT
- *      name - Name of an external file
- *    offset - Offset, in bytes, from the beginning of the file
- *             to the location in the file where the data starts.
- *     bytes - Number of bytes reserved in the file for the data.
+ *  name - Name of an external file
+ *  offset - Offset, in bytes, from the beginning of the file
+ *  to the location in the file where the data starts.
+ *  bytes - Number of bytes reserved in the file for the data.
  * RETURNS
  *  on success, -1 on failure
  * AUTHOR
@@ -2025,745 +1970,730 @@ nh5pget_external_count_c (hid_t_f *prp_id, int_f* count)
  *  Changed type of 'offset' from integer to off_t -- MSB January 9, 2012
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pget_external_c(hid_t_f *prp_id, int_f *idx, size_t_f* name_size, _fcd name, off_t_f* offset, hsize_t_f*bytes)
+h5pget_external_c(hid_t_f *prp_id, int_f *idx, size_t_f *name_size, _fcd name, off_t_f *offset,
+                  hsize_t_f *bytes)
 /******/
 {
-     int ret_value = -1;
-     hid_t c_prp_id;
-     unsigned c_idx;
-     herr_t status;
-     size_t c_namelen;
-     char* c_name = NULL;
-     off_t c_offset;
-     hsize_t size;
+    int      ret_value = -1;
+    hid_t    c_prp_id;
+    unsigned c_idx;
+    herr_t   status;
+    size_t   c_namelen;
+    char    *c_name = NULL;
+    off_t    c_offset;
+    hsize_t  size;
 
-     c_namelen = (size_t)*name_size;
-     /*
-      * Allocate memory to store the name of the external file.
-      */
-     if(c_namelen) c_name = (char*)HDmalloc(c_namelen + 1);
-     if (c_name == NULL) return ret_value;
+    c_namelen = (size_t)*name_size;
+    /*
+     * Allocate memory to store the name of the external file.
+     */
+    if (c_namelen)
+        c_name = (char *)HDmalloc(c_namelen + 1);
+    if (c_name == NULL)
+        return ret_value;
 
-     /*
-      * Call H5Pget_external function.
-      */
-     c_prp_id = (hid_t)*prp_id;
-     c_idx = (unsigned)*idx;
-     status = H5Pget_external(c_prp_id, c_idx, c_namelen+1, c_name, &c_offset, &size );
+    /*
+     * Call H5Pget_external function.
+     */
+    c_prp_id = (hid_t)*prp_id;
+    c_idx    = (unsigned)*idx;
+    status   = H5Pget_external(c_prp_id, c_idx, c_namelen + 1, c_name, &c_offset, &size);
 
-     if (status < 0) goto DONE;
+    if (status < 0)
+        goto DONE;
 
-     *offset = (off_t_f)c_offset;
-     *bytes = (hsize_t_f)size;
-     /* Note: if the size of the fortran buffer is larger then the returned string
-      *       from the function then we need to give HD5packFstring the fortran buffer size so
-      *       that it fills the remaining unused characters with blanks. MSB
-      */
-     HD5packFstring(c_name, _fcdtocp(name), c_namelen);
-     ret_value = 0;
+    *offset = (off_t_f)c_offset;
+    *bytes  = (hsize_t_f)size;
+    /* Note: if the size of the fortran buffer is larger then the returned string
+     *       from the function then we need to give HD5packFstring the fortran buffer size so
+     *       that it fills the remaining unused characters with blanks. MSB
+     */
+    HD5packFstring(c_name, _fcdtocp(name), c_namelen);
+    ret_value = 0;
 
 DONE:
-     HDfree(c_name);
-     return ret_value;
+    HDfree(c_name);
+    return ret_value;
 }
 
 /****if* H5Pf/h5pset_btree_ratios_c
  * NAME
- *        h5pset_btree_ratios_c
+ *  h5pset_btree_ratios_c
  * PURPOSE
- *     Call H5Pset_btree_ratios to set B-tree split ratios for B-tree split ratios for a dataset transfer property list. a
- *              dataset transfer property list.
- * INPUTS
- *      prp_id - property list identifier
- *              left - The B-tree split ratio for left-most nodes.
- *              middle - The B-tree split ratio for all other nodes
- *              right - The B-tree split ratio for right-most nodes
- *                      and lone nodes.
- * RETURNS
- *     0 on success, -1 on failure
- * AUTHOR
- *  Xiangyang Su
- *              Friday, February 25, 2000
+ *  Call H5Pset_btree_ratios to set B-tree split ratios for B-tree split ratios for a dataset transfer
+ * property list. a dataset transfer property list. INPUTS prp_id - property list identifier left - The B-tree
+ * split ratio for left-most nodes. middle - The B-tree split ratio for all other nodes right - The B-tree
+ * split ratio for right-most nodes and lone nodes. RETURNS 0 on success, -1 on failure AUTHOR Xiangyang Su
+ *  Friday, February 25, 2000
  * HISTORY
- * Changed the type of the last three parameters from double to real_f
+ *  Changed the type of the last three parameters from double to real_f
  * SOURCE
-*/
+ */
 int_f
-nh5pset_btree_ratios_c(hid_t_f *prp_id, real_f* left, real_f* middle, real_f* right)
+h5pset_btree_ratios_c(hid_t_f *prp_id, real_f *left, real_f *middle, real_f *right)
 /******/
 {
-     int ret_value = -1;
-     hid_t c_prp_id;
-     herr_t ret;
-     double c_left;
-     double c_middle;
-     double c_right;
-     c_left = (double)*left;
-     c_middle = (double)*middle;
-     c_right = (double)*right;
+    int    ret_value = -1;
+    hid_t  c_prp_id;
+    herr_t ret;
+    double c_left;
+    double c_middle;
+    double c_right;
+    c_left   = (double)*left;
+    c_middle = (double)*middle;
+    c_right  = (double)*right;
 
-     /*
-      * Call H5Pset_btree_ratios function.
-      */
-     c_prp_id = (hid_t)*prp_id;
-     ret = H5Pset_btree_ratios(c_prp_id, c_left, c_middle, c_right);
-     if (ret < 0) return ret_value;
-     ret_value = 0;
-     return ret_value;
+    /*
+     * Call H5Pset_btree_ratios function.
+     */
+    c_prp_id = (hid_t)*prp_id;
+    ret      = H5Pset_btree_ratios(c_prp_id, c_left, c_middle, c_right);
+    if (ret < 0)
+        return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pget_btree_ratios_c
  * NAME
- *        h5pget_btree_ratios_c
+ *  h5pget_btree_ratios_c
  * PURPOSE
- *     Call H5Pget_btree_ratios to Gets B-tree split ratios
- *              for a dataset transfer property list.
+ *  Call H5Pget_btree_ratios to Gets B-tree split ratios
+ *  for a dataset transfer property list.
  * INPUTS
- *      prp_id - property list identifier
- *              left - The B-tree split ratio for left-most nodes.
- *              middle - The B-tree split ratio for all other nodes
- *              right - The B-tree split ratio for right-most nodes
- *                      and lone nodes.
+ *  prp_id - property list identifier
+ *  left - The B-tree split ratio for left-most nodes.
+ *  middle - The B-tree split ratio for all other nodes
+ *  right - The B-tree split ratio for right-most nodes
+ *  and lone nodes.
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Xiangyang Su
- *              Friday, February 25, 2000
+ *  Friday, February 25, 2000
  * HISTORY
- * Changed the type of the last three parameters from double to real_f
+ *  Changed the type of the last three parameters from double to real_f
  * SOURCE
-*/
+ */
 int_f
-nh5pget_btree_ratios_c(hid_t_f *prp_id, real_f* left, real_f* middle, real_f* right)
+h5pget_btree_ratios_c(hid_t_f *prp_id, real_f *left, real_f *middle, real_f *right)
 /******/
 {
-     int ret_value = -1;
-     hid_t c_prp_id;
-     herr_t ret;
-     double c_left, c_right, c_middle;
+    int    ret_value = -1;
+    hid_t  c_prp_id;
+    herr_t ret;
+    double c_left, c_right, c_middle;
 
-     /*
-      * Call H5Pget_btree_ratios function.
-      */
-     c_prp_id = (hid_t)*prp_id;
-     ret = H5Pget_btree_ratios(c_prp_id, &c_left, &c_middle, &c_right);
-     *left = (real_f)c_left;
-     *middle = (real_f)c_middle;
-     *right = (real_f)c_right;
-     if (ret < 0) return ret_value;
-     ret_value = 0;
-     return ret_value;
+    /*
+     * Call H5Pget_btree_ratios function.
+     */
+    c_prp_id = (hid_t)*prp_id;
+    ret      = H5Pget_btree_ratios(c_prp_id, &c_left, &c_middle, &c_right);
+    *left    = (real_f)c_left;
+    *middle  = (real_f)c_middle;
+    *right   = (real_f)c_right;
+    if (ret < 0)
+        return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 /****if* H5Pf/h5pget_fclose_degree_c
  * NAME
- *        h5pget_fclose_degree_c
+ *  h5pget_fclose_degree_c
  * PURPOSE
- *     Call H5Pget_fclose_degree to determine file close behavior
+ *  Call H5Pget_fclose_degree to determine file close behavior
  * INPUTS
- *      fapl_id - file access identifier
+ *  fapl_id - file access identifier
  * OUTPUTS
  *
- *              degree  - possible values are:
- *              		H5F_CLOSE_DEFAULT
- *              		H5F_CLOSE_WEAK
- *              		H5F_CLOSE_SEMI
- *              		H5F_CLOSE_STRONG
+ *  degree  - possible values are:
+ *                      H5F_CLOSE_DEFAULT
+ *                      H5F_CLOSE_WEAK
+ *                      H5F_CLOSE_SEMI
+ *                      H5F_CLOSE_STRONG
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Thursday, September 26, 2002
+ *  Thursday, September 26, 2002
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5pget_fclose_degree_c ( hid_t_f *fapl_id , int_f *degree)
+h5pget_fclose_degree_c(hid_t_f *fapl_id, int_f *degree)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_fapl_id;
-  H5F_close_degree_t c_degree;
+    int                ret_value = -1;
+    hid_t              c_fapl_id;
+    H5F_close_degree_t c_degree;
 
-  c_fapl_id = (hid_t)*fapl_id;
-  if( H5Pget_fclose_degree(c_fapl_id, &c_degree) < 0) return ret_value;
+    c_fapl_id = (hid_t)*fapl_id;
+    if (H5Pget_fclose_degree(c_fapl_id, &c_degree) < 0)
+        return ret_value;
 
-  *degree = (int_f)c_degree;
-  ret_value = 0;
-  return ret_value;
+    *degree   = (int_f)c_degree;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pset_fclose_degree_c
  * NAME
- *        h5pset_fclose_degree_c
+ *  h5pset_fclose_degree_c
  * PURPOSE
- *     Call H5Pset_fclose_degree to set file close behavior
+ *  Call H5Pset_fclose_degree to set file close behavior
  * INPUTS
- *      fapl_id - file access identifier
- *              degree  - possible values are:
- *              		H5F_CLOSE_DEFAULT
- *              		H5F_CLOSE_WEAK
- *              		H5F_CLOSE_SEMI
- *              		H5F_CLOSE_STRONG
+ *  fapl_id - file access identifier
+ *  degree  - possible values are:
+ *                      H5F_CLOSE_DEFAULT
+ *                      H5F_CLOSE_WEAK
+ *                      H5F_CLOSE_SEMI
+ *                      H5F_CLOSE_STRONG
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Thursday, September 26, 2002
+ *  Thursday, September 26, 2002
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5pset_fclose_degree_c ( hid_t_f *fapl_id , int_f *degree)
+h5pset_fclose_degree_c(hid_t_f *fapl_id, int_f *degree)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_fapl_id;
-  H5F_close_degree_t c_degree;
+    int                ret_value = -1;
+    hid_t              c_fapl_id;
+    H5F_close_degree_t c_degree;
 
-  c_fapl_id = (hid_t)*fapl_id;
-  c_degree = (H5F_close_degree_t)*degree;
-  if( H5Pset_fclose_degree(c_fapl_id, c_degree) < 0) return ret_value;
+    c_fapl_id = (hid_t)*fapl_id;
+    c_degree  = (H5F_close_degree_t)*degree;
+    if (H5Pset_fclose_degree(c_fapl_id, c_degree) < 0)
+        return ret_value;
 
-  ret_value = 0;
-  return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pset_buffer_c
  * NAME
- *        h5pset_buffer_c
+ *  h5pset_buffer_c
  * PURPOSE
- *     Call H5Pset_buffer to set size of conversion buffer
+ *  Call H5Pset_buffer to set size of conversion buffer
  * INPUTS
- *      prp_id - t`dataset trasfer property list identifier
- *              size   - size of the buffer
+ *  prp_id - t`dataset transfer property list identifier
+ *  size   - size of the buffer
  * OUTPUTS
  *     NONE
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Wednesday, October 2, 2002
+ *  Wednesday, October 2, 2002
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5pset_buffer_c ( hid_t_f *prp_id , hsize_t_f *size)
+h5pset_buffer_c(hid_t_f *prp_id, hsize_t_f *size)
 /******/
 {
-  int ret_value = 0;
-  hid_t c_prp_id;
-  size_t c_size;
+    int    ret_value = 0;
+    hid_t  c_prp_id;
+    size_t c_size;
 
-  c_prp_id = (hid_t)*prp_id;
-  c_size = (size_t)*size;
-  if ( H5Pset_buffer(c_prp_id, c_size, NULL, NULL) < 0  ) ret_value = -1;
-  return ret_value;
+    c_prp_id = (hid_t)*prp_id;
+    c_size   = (size_t)*size;
+    if (H5Pset_buffer(c_prp_id, c_size, NULL, NULL) < 0)
+        ret_value = -1;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pget_buffer_c
  * NAME
- *        h5pget_buffer_c
+ *  h5pget_buffer_c
  * PURPOSE
- *     Call H5Pget_buffer to get size of conversion buffer
+ *  Call H5Pget_buffer to get size of conversion buffer
  * INPUTS
- *      prp_id - t`dataset trasfer property list identifier
+ *  prp_id - t`dataset transfer property list identifier
  * OUTPUTS
- *     size - size of conversion buffer
+ *  size - size of conversion buffer
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Wednesday, October 2, 2002
+ *  Wednesday, October 2, 2002
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5pget_buffer_c ( hid_t_f *prp_id , hsize_t_f *size)
+h5pget_buffer_c(hid_t_f *prp_id, hsize_t_f *size)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_prp_id;
-  hsize_t c_size;
+    int     ret_value = -1;
+    hid_t   c_prp_id;
+    hsize_t c_size;
 
-  c_prp_id = (hid_t)*prp_id;
-  c_size = H5Pget_buffer(c_prp_id, NULL, NULL);
-  if ( c_size == 0  ) return ret_value;
-  *size = (hsize_t_f)c_size;
-  ret_value = 0;
-  return ret_value;
+    c_prp_id = (hid_t)*prp_id;
+    c_size   = H5Pget_buffer(c_prp_id, NULL, NULL);
+    if (c_size == 0)
+        return ret_value;
+    *size     = (hsize_t_f)c_size;
+    ret_value = 0;
+    return ret_value;
 }
 /****if* H5Pf/h5pfill_value_defined_c
  * NAME
- *        h5pfill_value_defined_c
+ *  h5pfill_value_defined_c
  * PURPOSE
- *     Call H5Pfill_value_defined to check if fill value is defined
+ *  Call H5Pfill_value_defined to check if fill value is defined
  * INPUTS
- *      prp_id - dataset creation property list identifier
+ *  prp_id - dataset creation property list identifier
  * OUTPUTS
- *     flag - fill value status flag
+ *  flag - fill value status flag
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Friday, October 4, 2002
+ *  Friday, October 4, 2002
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5pfill_value_defined_c ( hid_t_f *prp_id , int_f *flag)
+h5pfill_value_defined_c(hid_t_f *prp_id, int_f *flag)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_prp_id;
-  H5D_fill_value_t c_flag;
+    int              ret_value = -1;
+    hid_t            c_prp_id;
+    H5D_fill_value_t c_flag;
 
-  c_prp_id = (hid_t)*prp_id;
-  if ( H5Pfill_value_defined(c_prp_id, &c_flag) < 0  ) return ret_value;
-  *flag = (int_f)c_flag;
-  ret_value = 0;
-  return ret_value;
+    c_prp_id = (hid_t)*prp_id;
+    if (H5Pfill_value_defined(c_prp_id, &c_flag) < 0)
+        return ret_value;
+    *flag     = (int_f)c_flag;
+    ret_value = 0;
+    return ret_value;
 }
 /****if* H5Pf/h5pget_alloc_time_c
  * NAME
- *        h5pget_alloc_time_c
+ *  h5pget_alloc_time_c
  * PURPOSE
- *     Call H5Pget_alloc_time to get space allocation
- *              time for dataset during creation
+ *  Call H5Pget_alloc_time to get space allocation
+ *  time for dataset during creation
  * INPUTS
- *      prp_id - dataset creation property list identifier
+ *  prp_id - dataset creation property list identifier
  * OUTPUTS
- *     flag - allocation time flag
+ *  flag - allocation time flag
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Friday, October 4, 2002
+ *  Friday, October 4, 2002
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5pget_alloc_time_c ( hid_t_f *prp_id , int_f *flag)
+h5pget_alloc_time_c(hid_t_f *prp_id, int_f *flag)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_prp_id;
-  H5D_alloc_time_t c_flag;
+    int              ret_value = -1;
+    hid_t            c_prp_id;
+    H5D_alloc_time_t c_flag;
 
-  c_prp_id = (hid_t)*prp_id;
-  if ( H5Pget_alloc_time(c_prp_id, &c_flag) < 0  ) return ret_value;
-  *flag = (int_f)c_flag;
-  ret_value = 0;
-  return ret_value;
+    c_prp_id = (hid_t)*prp_id;
+    if (H5Pget_alloc_time(c_prp_id, &c_flag) < 0)
+        return ret_value;
+    *flag     = (int_f)c_flag;
+    ret_value = 0;
+    return ret_value;
 }
 /****if* H5Pf/h5pset_alloc_time_c
  * NAME
- *        h5pset_alloc_time_c
+ *  h5pset_alloc_time_c
  * PURPOSE
- *     Call H5Pset_alloc_time to get space allocation
- *              time for dataset during creation
+ *  Call H5Pset_alloc_time to get space allocation
+ *  time for dataset during creation
  * INPUTS
- *      prp_id - dataset creation property list identifier
- *              flag - allocation time flag
+ *  prp_id - dataset creation property list identifier
+ *  flag - allocation time flag
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Friday, October 4, 2002
+ *  Friday, October 4, 2002
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5pset_alloc_time_c ( hid_t_f *prp_id , int_f *flag)
+h5pset_alloc_time_c(hid_t_f *prp_id, int_f *flag)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_prp_id;
-  H5D_alloc_time_t c_flag;
+    int              ret_value = -1;
+    hid_t            c_prp_id;
+    H5D_alloc_time_t c_flag;
 
-  c_prp_id = (hid_t)*prp_id;
-  c_flag = (H5D_alloc_time_t)*flag;
-  if ( H5Pset_alloc_time(c_prp_id, c_flag) < 0  ) return ret_value;
-  ret_value = 0;
-  return ret_value;
+    c_prp_id = (hid_t)*prp_id;
+    c_flag   = (H5D_alloc_time_t)*flag;
+    if (H5Pset_alloc_time(c_prp_id, c_flag) < 0)
+        return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 /****if* H5Pf/h5pget_fill_time_c
  * NAME
- *        h5pget_fill_time_c
+ *  h5pget_fill_time_c
  * PURPOSE
- *     Call H5Pget_fill_time to get fill value writing
- *              time for dataset during creation
+ *  Call H5Pget_fill_time to get fill value writing
+ *  time for dataset during creation
  * INPUTS
- *      prp_id - dataset creation property list identifier
+ *  prp_id - dataset creation property list identifier
  * OUTPUTS
- *     flag - fill value writing  time flag
+ *  flag - fill value writing  time flag
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Friday, October 4, 2002
+ *  Friday, October 4, 2002
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5pget_fill_time_c ( hid_t_f *prp_id , int_f *flag)
+h5pget_fill_time_c(hid_t_f *prp_id, int_f *flag)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_prp_id;
-  H5D_fill_time_t c_flag;
+    int             ret_value = -1;
+    hid_t           c_prp_id;
+    H5D_fill_time_t c_flag;
 
-  c_prp_id = (hid_t)*prp_id;
-  if ( H5Pget_fill_time(c_prp_id, &c_flag) < 0  ) return ret_value;
-  *flag = (int_f)c_flag;
-  ret_value = 0;
-  return ret_value;
+    c_prp_id = (hid_t)*prp_id;
+    if (H5Pget_fill_time(c_prp_id, &c_flag) < 0)
+        return ret_value;
+    *flag     = (int_f)c_flag;
+    ret_value = 0;
+    return ret_value;
 }
 /****if* H5Pf/h5pset_fill_time_c
  * NAME
- *        h5pset_fill_time_c
+ *  h5pset_fill_time_c
  * PURPOSE
- *     Call H5Pset_fill_time to set fill value writing
- *              time for dataset during creation
+ *  Call H5Pset_fill_time to set fill value writing
+ *  time for dataset during creation
  * INPUTS
- *      prp_id - dataset creation property list identifier
- *              flag - fill value writing  time flag
+ *  prp_id - dataset creation property list identifier
+ *  flag - fill value writing  time flag
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Friday, October 4, 2002
+ *  Friday, October 4, 2002
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5pset_fill_time_c ( hid_t_f *prp_id , int_f *flag)
+h5pset_fill_time_c(hid_t_f *prp_id, int_f *flag)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_prp_id;
-  H5D_fill_time_t c_flag;
+    int             ret_value = -1;
+    hid_t           c_prp_id;
+    H5D_fill_time_t c_flag;
 
-  c_prp_id = (hid_t)*prp_id;
-  c_flag = (H5D_fill_time_t)*flag;
-  if ( H5Pset_fill_time(c_prp_id, c_flag) < 0  ) return ret_value;
-  ret_value = 0;
-  return ret_value;
+    c_prp_id = (hid_t)*prp_id;
+    c_flag   = (H5D_fill_time_t)*flag;
+    if (H5Pset_fill_time(c_prp_id, c_flag) < 0)
+        return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 /****if* H5Pf/h5pset_meta_block_size_c
  * NAME
- *        h5pset_meta_block_size_c
+ *  h5pset_meta_block_size_c
  * PURPOSE
- *     Call H5Pset_meta_block_size to set size of  metadata block
+ *  Call H5Pset_meta_block_size to set size of  metadata block
  * INPUTS
- *      prp_id - file access  property list identifier
- *              size   - size of the metadata block
+ *  prp_id - file access  property list identifier
+ *  size   - size of the metadata block
  * OUTPUTS
  *     NONE
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Monday, October 7, 2002
+ *  Monday, October 7, 2002
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5pset_meta_block_size_c ( hid_t_f *prp_id , hsize_t_f *size)
+h5pset_meta_block_size_c(hid_t_f *prp_id, hsize_t_f *size)
 /******/
 {
-  int ret_value = 0;
-  hid_t c_prp_id;
-  hsize_t c_size;
+    int     ret_value = 0;
+    hid_t   c_prp_id;
+    hsize_t c_size;
 
-  c_prp_id = (hid_t)*prp_id;
-  c_size = (hsize_t)*size;
-  if ( H5Pset_meta_block_size(c_prp_id, c_size) < 0  ) ret_value = -1;
-  return ret_value;
+    c_prp_id = (hid_t)*prp_id;
+    c_size   = (hsize_t)*size;
+    if (H5Pset_meta_block_size(c_prp_id, c_size) < 0)
+        ret_value = -1;
+    return ret_value;
 }
 /****if* H5Pf/h5pget_meta_block_size_c
  * NAME
- *        h5pget_meta_block_size_c
+ *  h5pget_meta_block_size_c
  * PURPOSE
- *     Call H5Pget_meta_block_size to get size of  metadata block
+ *  Call H5Pget_meta_block_size to get size of  metadata block
  * INPUTS
- *      prp_id - file access  property list identifier
+ *  prp_id - file access  property list identifier
  * OUTPUTS
  *
- *              size   - size of the metadata block
+ *  size   - size of the metadata block
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Monday, October 7, 2002
+ *  Monday, October 7, 2002
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5pget_meta_block_size_c ( hid_t_f *prp_id , hsize_t_f *size)
+h5pget_meta_block_size_c(hid_t_f *prp_id, hsize_t_f *size)
 /******/
 {
-  int ret_value = 0;
-  hid_t c_prp_id;
-  hsize_t c_size;
+    int     ret_value = 0;
+    hid_t   c_prp_id;
+    hsize_t c_size;
 
-  c_prp_id = (hid_t)*prp_id;
-  if ( H5Pget_meta_block_size(c_prp_id, &c_size) < 0  ) ret_value = -1;
-  *size = (hsize_t_f)c_size;
-  return ret_value;
+    c_prp_id = (hid_t)*prp_id;
+    if (H5Pget_meta_block_size(c_prp_id, &c_size) < 0)
+        ret_value = -1;
+    *size = (hsize_t_f)c_size;
+    return ret_value;
 }
 /****if* H5Pf/h5pset_sieve_buf_size_c
  * NAME
- *        h5pset_sieve_buf_size_c
+ *  h5pset_sieve_buf_size_c
  * PURPOSE
- *     Call H5Pset_sieve_buf_size to set size of datasieve buffer
+ *  Call H5Pset_sieve_buf_size to set size of datasieve buffer
  * INPUTS
- *      prp_id - file access  property list identifier
- *              size   - size of the buffer
+ *  prp_id - file access  property list identifier
+ *  size   - size of the buffer
  * OUTPUTS
  *     NONE
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Monday, October 7, 2002
+ *  Monday, October 7, 2002
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5pset_sieve_buf_size_c ( hid_t_f *prp_id , size_t_f *size)
+h5pset_sieve_buf_size_c(hid_t_f *prp_id, size_t_f *size)
 /******/
 {
-  int ret_value = 0;
-  hid_t c_prp_id;
-  size_t c_size;
+    int    ret_value = 0;
+    hid_t  c_prp_id;
+    size_t c_size;
 
-  c_prp_id = (hid_t)*prp_id;
-  c_size = (size_t)*size;
-  if ( H5Pset_sieve_buf_size(c_prp_id, c_size) < 0  ) ret_value = -1;
-  return ret_value;
+    c_prp_id = (hid_t)*prp_id;
+    c_size   = (size_t)*size;
+    if (H5Pset_sieve_buf_size(c_prp_id, c_size) < 0)
+        ret_value = -1;
+    return ret_value;
 }
 /****if* H5Pf/h5pget_sieve_buf_size_c
  * NAME
- *        h5pget_sieve_buf_size_c
+ *  h5pget_sieve_buf_size_c
  * PURPOSE
- *     Call H5Pget_sieve_buf_size to get size of datasieve buffer
+ *  Call H5Pget_sieve_buf_size to get size of datasieve buffer
  * INPUTS
- *      prp_id - file access  property list identifier
+ *  prp_id - file access  property list identifier
  * OUTPUTS
  *
- *              size   - size of the buffer
+ *  size   - size of the buffer
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Monday, October 7, 2002
+ *  Monday, October 7, 2002
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5pget_sieve_buf_size_c ( hid_t_f *prp_id , size_t_f *size)
+h5pget_sieve_buf_size_c(hid_t_f *prp_id, size_t_f *size)
 /******/
 {
-  int ret_value = 0;
-  hid_t c_prp_id;
-  size_t c_size;
+    int    ret_value = 0;
+    hid_t  c_prp_id;
+    size_t c_size;
 
-  c_prp_id = (hid_t)*prp_id;
-  if ( H5Pget_sieve_buf_size(c_prp_id, &c_size) < 0  ) ret_value = -1;
-  *size = (size_t_f)c_size;
-  return ret_value;
+    c_prp_id = (hid_t)*prp_id;
+    if (H5Pget_sieve_buf_size(c_prp_id, &c_size) < 0)
+        ret_value = -1;
+    *size = (size_t_f)c_size;
+    return ret_value;
 }
 /****if* H5Pf/h5pset_small_data_block_size_c
  * NAME
- *        h5pset_small_data_block_size_c
+ *  h5pset_small_data_block_size_c
  * PURPOSE
- *     Call H5Pset_small_data_block_size to set size of raw small data block
+ *  Call H5Pset_small_data_block_size to set size of raw small data block
  * INPUTS
- *      prp_id - file access  property list identifier
- *              size   - size of the block
+ *  prp_id - file access  property list identifier
+ *  size   - size of the block
  * OUTPUTS
  *     NONE
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Monday, October 7, 2002
+ *  Monday, October 7, 2002
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5pset_small_data_block_size_c ( hid_t_f *prp_id , hsize_t_f *size)
+h5pset_small_data_block_size_c(hid_t_f *prp_id, hsize_t_f *size)
 /******/
 {
-  int ret_value = 0;
-  hid_t c_prp_id;
-  hsize_t c_size;
+    int     ret_value = 0;
+    hid_t   c_prp_id;
+    hsize_t c_size;
 
-  c_prp_id = (hid_t)*prp_id;
-  c_size = (hsize_t)*size;
-  if ( H5Pset_small_data_block_size(c_prp_id, c_size) < 0  ) ret_value = -1;
-  return ret_value;
+    c_prp_id = (hid_t)*prp_id;
+    c_size   = (hsize_t)*size;
+    if (H5Pset_small_data_block_size(c_prp_id, c_size) < 0)
+        ret_value = -1;
+    return ret_value;
 }
 /****if* H5Pf/h5pget_small_data_block_size_c
  * NAME
- *        h5pget_small_data_block_size_c
+ *  h5pget_small_data_block_size_c
  * PURPOSE
- *     Call H5Pget_small_data_block_size to get size of raw small data block
+ *  Call H5Pget_small_data_block_size to get size of raw small data block
  * INPUTS
- *      prp_id - file access  property list identifier
+ *  prp_id - file access  property list identifier
  * OUTPUTS
  *
- *              size   - size of the block
+ *  size   - size of the block
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Monday, October 7, 2002
+ *  Monday, October 7, 2002
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5pget_small_data_block_size_c ( hid_t_f *prp_id , hsize_t_f *size)
+h5pget_small_data_block_size_c(hid_t_f *prp_id, hsize_t_f *size)
 /******/
 {
-  int ret_value = 0;
-  hid_t c_prp_id;
-  hsize_t c_size;
+    int     ret_value = 0;
+    hid_t   c_prp_id;
+    hsize_t c_size;
 
-  c_prp_id = (hid_t)*prp_id;
-  if ( H5Pget_small_data_block_size(c_prp_id, &c_size) < 0  ) ret_value = -1;
-  *size = (hsize_t_f)c_size;
-  return ret_value;
+    c_prp_id = (hid_t)*prp_id;
+    if (H5Pget_small_data_block_size(c_prp_id, &c_size) < 0)
+        ret_value = -1;
+    *size = (hsize_t_f)c_size;
+    return ret_value;
 }
 /****if* H5Pf/h5pset_hyper_vector_size_c
  * NAME
- *        h5pset_hyper_vector_size_c
+ *  h5pset_hyper_vector_size_c
  * PURPOSE
- *     Call H5Pset_hyper_vector_size to set size of the hyper vector
+ *  Call H5Pset_hyper_vector_size to set size of the hyper vector
  * INPUTS
- *      prp_id - dataset transfer property list identifier
- *              size   - size of the vector
+ *  prp_id - dataset transfer property list identifier
+ *  size   - size of the vector
  * OUTPUTS
  *     NONE
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Monday, October 7, 2002
+ *  Monday, October 7, 2002
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5pset_hyper_vector_size_c ( hid_t_f *prp_id , size_t_f *size)
+h5pset_hyper_vector_size_c(hid_t_f *prp_id, size_t_f *size)
 /******/
 {
-  int ret_value = 0;
-  hid_t c_prp_id;
-  size_t c_size;
+    int    ret_value = 0;
+    hid_t  c_prp_id;
+    size_t c_size;
 
-  c_prp_id = (hid_t)*prp_id;
-  c_size = (size_t)*size;
-  if ( H5Pset_hyper_vector_size(c_prp_id, c_size) < 0  ) ret_value = -1;
-  return ret_value;
+    c_prp_id = (hid_t)*prp_id;
+    c_size   = (size_t)*size;
+    if (H5Pset_hyper_vector_size(c_prp_id, c_size) < 0)
+        ret_value = -1;
+    return ret_value;
 }
 /****if* H5Pf/h5pget_hyper_vector_size_c
  * NAME
- *        h5pget_hyper_vector_size_c
+ *  h5pget_hyper_vector_size_c
  * PURPOSE
- *     Call H5Pget_hyper_vector_size to get size of the hyper vector
+ *  Call H5Pget_hyper_vector_size to get size of the hyper vector
  * INPUTS
- *      prp_id - dataset transfer property list identifier
+ *  prp_id - dataset transfer property list identifier
  * OUTPUTS
  *
- *              size   - size of the vector
+ *  size   - size of the vector
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Monday, October 7, 2002
+ *  Monday, October 7, 2002
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5pget_hyper_vector_size_c ( hid_t_f *prp_id , size_t_f *size)
+h5pget_hyper_vector_size_c(hid_t_f *prp_id, size_t_f *size)
 /******/
 {
-  int ret_value = 0;
-  hid_t c_prp_id;
-  size_t c_size;
+    int    ret_value = 0;
+    hid_t  c_prp_id;
+    size_t c_size;
 
-  c_prp_id = (hid_t)*prp_id;
-  if ( H5Pget_hyper_vector_size(c_prp_id, &c_size) < 0  ) ret_value = -1;
-  *size = (size_t_f)c_size;
-  return ret_value;
-}
-/****if* H5Pf/h5pcreate_class_c
- * NAME
- *  h5pcreate_class_c
- * PURPOSE
- *  Call H5Pcreate_class to create a new property class
- * INPUTS
- *  parent - property list class identifier
- *  name   - name of the new class
- *  name_len - lenght of the "name" buffer
- * OUTPUTS
- *  cls - new class identifier
- * RETURNS
- *  0 on success, -1 on failure
- * AUTHOR
- *  Elena Pourmal
- *  October 11, 2002
- *
- * HISTORY
- * SOURCE
-*/
-int_f
-nh5pcreate_class_f90_c(hid_t_f *parent, _fcd name, int_f *name_len, hid_t_f *cls)
-/******/
-{
-     int ret_value = -1;
-
-     ret_value = h5pcreate_class_c(parent, name, name_len, cls, NULL, NULL, NULL, NULL, NULL, NULL);
-     return  ret_value;
+    c_prp_id = (hid_t)*prp_id;
+    if (H5Pget_hyper_vector_size(c_prp_id, &c_size) < 0)
+        ret_value = -1;
+    *size = (size_t_f)c_size;
+    return ret_value;
 }
 
-
 /****if* H5Pf/h5pcreate_class_c
  * NAME
  *  h5pcreate_class_c
@@ -2772,7 +2702,7 @@ nh5pcreate_class_f90_c(hid_t_f *parent, _fcd name, int_f *name_len, hid_t_f *cls
  * INPUTS
  *  parent - property list class identifier
  *  name   - name of the new class
- *  name_len - lenght of the "name" buffer
+ *  name_len - length of the "name" buffer
  * OUTPUTS
  *  class - new class identifier
  * RETURNS
@@ -2785,67 +2715,36 @@ nh5pcreate_class_f90_c(hid_t_f *parent, _fcd name, int_f *name_len, hid_t_f *cls
  *  Added the callback parameters (FORTRAN 2003 compilers only)
  *  M. Scot Breitenfeld, July 3, 2008
  * SOURCE
-*/
+ */
 int_f
-h5pcreate_class_c(hid_t_f *parent, _fcd name, int_f *name_len, hid_t_f *cls,
-		   H5P_cls_create_func_t create, void *create_data,
-		   H5P_cls_copy_func_t copy, void *copy_data,
-		   H5P_cls_close_func_t close, void *close_data)
+h5pcreate_class_c(hid_t_f *parent, _fcd name, int_f *name_len, hid_t_f *cls, H5P_cls_create_func_t create,
+                  void *create_data, H5P_cls_copy_func_t copy, void *copy_data, H5P_cls_close_func_t close,
+                  void *close_data)
 /******/
 {
-     int ret_value = -1;
-     hid_t c_class;
-     char* c_name;
+    int   ret_value = -1;
+    hid_t c_class;
+    char *c_name;
 
-     c_name = (char *)HD5f2cstring(name, (size_t)*name_len);
-     if (c_name == NULL) goto DONE;
+    c_name = (char *)HD5f2cstring(name, (size_t)*name_len);
+    if (c_name == NULL)
+        goto DONE;
 
-     /*
-      * Call H5Pcreate_class function.
-      */
-     c_class = H5Pcreate_class((hid_t)*parent, c_name, create, create_data, copy, copy_data, close, close_data);
+    /*
+     * Call H5Pcreate_class function.
+     */
+    c_class =
+        H5Pcreate_class((hid_t)*parent, c_name, create, create_data, copy, copy_data, close, close_data);
 
-     if (c_class < 0) goto DONE;
-     *cls = (hid_t_f)c_class;
-     ret_value = 0;
+    if (c_class < 0)
+        goto DONE;
+    *cls      = (hid_t_f)c_class;
+    ret_value = 0;
 
 DONE:
-     if(c_name != NULL) HDfree(c_name);
-     return ret_value;
-}
-
-
-/****if* H5Pf/h5pregisterc_c
- * NAME
- *  h5pregisterc_c
- * PURPOSE
- *  Call h5pregister_c to registers a permanent property
- * INPUTS
- *  class - property list class identifier
- *  name   - name of the new property
- *  name_len - length of the "name" buffer
- *  size - property size
- *  value - property value of character type
- * RETURNS
- *  0 on success, -1 on failure
- * AUTHOR
- *  Elena Pourmal
- *  October 11, 2002
- * HISTORY
- *
- * SOURCE
-*/
-int_f
-nh5pregisterc_c(hid_t_f *cls, _fcd name, int_f *name_len, size_t_f *size, _fcd value, int_f UNUSED *value_len)
-/******/
-{
-     int ret_value = -1;
-
-     /*
-      * Call h5pregister_c function
-      */
-      ret_value = h5pregister_c(cls, name, name_len, size, _fcdtocp(value));
-      return ret_value;
+    if (c_name != NULL)
+        HDfree(c_name);
+    return ret_value;
 }
 
 /****if* H5Pf/h5pregister_c
@@ -2867,88 +2766,28 @@ nh5pregisterc_c(hid_t_f *cls, _fcd name, int_f *name_len, size_t_f *size, _fcd v
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-h5pregister_c(hid_t_f *cls, _fcd name, int_f *name_len, size_t_f *size, void UNUSED *value)
+h5pregister_c(hid_t_f *cls, _fcd name, int_f *name_len, size_t_f *size, void H5_ATTR_UNUSED *value)
 /******/
 {
-     char* c_name = NULL;
-     int_f ret_value = -1;
+    char *c_name    = NULL;
+    int_f ret_value = -1;
 
-     if(NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*name_len)))
-         goto DONE;
+    if (NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*name_len)))
+        goto DONE;
 
-     /*
-      * Call H5Pregister2 function.
-      */
-     if(H5Pregister2((hid_t)*cls, c_name, (size_t)*size, value, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
-         goto DONE;
-     ret_value = 0;
+    /*
+     * Call H5Pregister2 function.
+     */
+    if (H5Pregister2((hid_t)*cls, c_name, (size_t)*size, value, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+        goto DONE;
+    ret_value = 0;
 
 DONE:
-     if(c_name != NULL)
-         HDfree(c_name);
-     return ret_value;
-}
-
-int_f
-nh5pregister_integer_c(hid_t_f *cls, _fcd name, int_f *name_len, size_t_f *size, void *value)
-{
-     /*
-      * Call h5pregister_c function
-      */
-     return h5pregister_c(cls, name, name_len, size, value);
-}
-
-int_f
-nh5pregister_real_c(hid_t_f *cls, _fcd name, int_f *name_len, size_t_f *size, void *value)
-{
-     /*
-      * Call h5pregister_c function
-      */
-     return h5pregister_c(cls, name, name_len, size, value);
-}
-
-int_f
-nh5pregister_double_c(hid_t_f *cls, _fcd name, int_f *name_len, size_t_f *size, void *value)
-{
-     /*
-      * Call h5pregister_c function
-      */
-     return h5pregister_c(cls, name, name_len, size, value);
-}
-
-/****if* H5Pf/h5pinsertc_c
- * NAME
- *  h5pinsertc_c
- * PURPOSE
- *  Call h5pinsert_c to register a temporary property
- * INPUTS
- *  plist - property list identifier
- *  name   - name of the new property
- *  name_len - length of the "name" buffer
- *  size - property size
- *  value - property value of character type
- * RETURNS
- *  0 on success, -1 on failure
- * AUTHOR
- *  Elena Pourmal
- *  October 11, 2002
- * HISTORY
- *
- * SOURCE
-*/
-int_f
-nh5pinsertc_c(hid_t_f *plist, _fcd name, int_f *name_len, size_t_f *size, _fcd value, int_f UNUSED *value_len)
-/******/
-{
-     int_f ret_value = -1;
-
-     /*
-      * Call h5pinsert_c function
-      */
-      ret_value = h5pinsert_c(plist, name, name_len, size, _fcdtocp(value));
-      return ret_value;
+    if (c_name != NULL)
+        HDfree(c_name);
+    return ret_value;
 }
 
 /****if* H5Pf/h5pinsert_c
@@ -2970,483 +2809,441 @@ nh5pinsertc_c(hid_t_f *plist, _fcd name, int_f *name_len, size_t_f *size, _fcd v
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-h5pinsert_c(hid_t_f *plist, _fcd name, int_f *name_len, size_t_f *size, void UNUSED *value)
+h5pinsert_c(hid_t_f *plist, _fcd name, int_f *name_len, size_t_f *size, void H5_ATTR_UNUSED *value)
 /******/
 {
-     char* c_name = NULL;
-     int_f ret_value = -1;
+    char *c_name    = NULL;
+    int_f ret_value = -1;
 
-     if(NULL == ( c_name = (char *)HD5f2cstring(name, (size_t)*name_len)))
-         goto DONE;
+    if (NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*name_len)))
+        goto DONE;
 
-     /*
-      * Call H5Pinsert2 function.
-      */
-     if(H5Pinsert2((hid_t)*plist, c_name, (size_t)*size, value, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
-         goto DONE;
-     ret_value = 0;
+    /*
+     * Call H5Pinsert2 function.
+     */
+    if (H5Pinsert2((hid_t)*plist, c_name, (size_t)*size, value, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+        goto DONE;
+    ret_value = 0;
 
 DONE:
-     if(c_name)
-         HDfree(c_name);
-     return ret_value;
-}
-
-int_f
-nh5pinsert_integer_c(hid_t_f *plist, _fcd name, int_f *name_len, size_t_f *size, void *value)
-{
-     /*
-      * Call h5pinsert_c function
-      */
-     return h5pinsert_c(plist, name, name_len, size, value);
-}
-
-int_f
-nh5pinsert_real_c(hid_t_f *plist, _fcd name, int_f *name_len, size_t_f *size, void *value)
-{
-     /*
-      * Call h5pinsert_c function
-      */
-     return h5pinsert_c(plist, name, name_len, size, value);
-}
-
-int_f
-nh5pinsert_double_c(hid_t_f *plist, _fcd name, int_f *name_len, size_t_f *size, void *value)
-{
-     /*
-      * Call h5pinsert_c function
-      */
-     return h5pinsert_c(plist, name, name_len, size, value);
+    if (c_name)
+        HDfree(c_name);
+    return ret_value;
 }
 
 /****if* H5Pf/h5pexist_c
  * NAME
- *        h5pexist_c
+ *  h5pexist_c
  * PURPOSE
- *     Call H5Pexist to querie whether a property name exists
- *              in a property list or class
+ *  Call H5Pexist to querie whether a property name exists
+ *  in a property list or class
  * INPUTS
- *      plist - property list or property class identifier
- *              name   - name of the new property
- *              name_len - length of the "name" buffer
+ *  plist - property list or property class identifier
+ *  name   - name of the new property
+ *  name_len - length of the "name" buffer
  * RETURNS
- *     nonnegative on success, -1 on failure
+ *  nonnegative on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              October 11, 2002
+ *  October 11, 2002
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pexist_c(hid_t_f *cls, _fcd name, int_f *name_len)
+h5pexist_c(hid_t_f *cls, _fcd name, int_f *name_len)
 /******/
 {
-     int_f ret_value = -1;
-     hid_t c_class;
-     char* c_name;
-     htri_t status;
+    int_f  ret_value = -1;
+    hid_t  c_class;
+    char  *c_name;
+    htri_t status;
 
-     c_name = (char *)HD5f2cstring(name, (size_t)*name_len);
-     if (c_name == NULL) goto DONE;
+    c_name = (char *)HD5f2cstring(name, (size_t)*name_len);
+    if (c_name == NULL)
+        goto DONE;
 
-     c_class = (hid_t)*cls;
-     /*
-      * Call H5Pexist function.
-      */
-     status = H5Pexist(c_class, c_name);
-     ret_value = status;
+    c_class = (hid_t)*cls;
+    /*
+     * Call H5Pexist function.
+     */
+    status    = H5Pexist(c_class, c_name);
+    ret_value = status;
 
 DONE:
-     if(c_name != NULL) HDfree(c_name);
-     return  ret_value;
+    if (c_name != NULL)
+        HDfree(c_name);
+    return ret_value;
 }
 /****if* H5Pf/h5pisa_class_c
  * NAME
- *        h5pisa_class_c
+ *  h5pisa_class_c
  * PURPOSE
- *     Call H5Pisa_class to querie whether a property is a
- *              member of a class
+ *  Call H5Pisa_class to querie whether a property is a
+ *  member of a class
  * INPUTS
- *      plist - property list identifier
- *              cls - property class identifier
+ *  plist - property list identifier
+ *  cls - property class identifier
  * RETURNS
- *     nonnegative on success, -1 on failure
+ *  nonnegative on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              October 11, 2002
+ *  October 11, 2002
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pisa_class_c(hid_t_f *plist, hid_t_f *cls)
+h5pisa_class_c(hid_t_f *plist, hid_t_f *cls)
 /******/
 {
-     int_f ret_value = -1;
-     hid_t c_class;
-     hid_t c_plist;
-     htri_t status;
+    int_f  ret_value = -1;
+    hid_t  c_class;
+    hid_t  c_plist;
+    htri_t status;
 
-     c_class = (hid_t)*cls;
-     c_plist = (hid_t)*plist;
+    c_class = (hid_t)*cls;
+    c_plist = (hid_t)*plist;
 
-     /*
-      * Call H5Pisa_class function.
-      */
-     status = H5Pisa_class(c_plist, c_class);
-     ret_value = status;
-     return  ret_value;
+    /*
+     * Call H5Pisa_class function.
+     */
+    status    = H5Pisa_class(c_plist, c_class);
+    ret_value = status;
+    return ret_value;
 }
 /****if* H5Pf/h5pget_size_c
  * NAME
- *        h5pget_size_c
+ *  h5pget_size_c
  * PURPOSE
- *     Call H5Pget_size to querie the size of the property
+ *  Call H5Pget_size to querie the size of the property
  * INPUTS
- *      plist - property list to query
- *              name   - name of the property
- *              name_len - length of the "name" buffer
+ *  plist - property list to query
+ *  name   - name of the property
+ *  name_len - length of the "name" buffer
  * OUTPUTS
- *     size - size of the property in bytes
+ *  size - size of the property in bytes
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              October 11, 2002
+ *  October 11, 2002
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pget_size_c(hid_t_f *plist, _fcd name, int_f *name_len, size_t_f *size)
+h5pget_size_c(hid_t_f *plist, _fcd name, int_f *name_len, size_t_f *size)
 /******/
 {
-     int_f ret_value = -1;
-     hid_t c_plist;
-     char* c_name;
-     size_t c_size;
+    int_f  ret_value = -1;
+    hid_t  c_plist;
+    char  *c_name;
+    size_t c_size;
 
-     c_name = (char *)HD5f2cstring(name, (size_t)*name_len);
-     if (c_name == NULL) goto DONE;
+    c_name = (char *)HD5f2cstring(name, (size_t)*name_len);
+    if (c_name == NULL)
+        goto DONE;
 
-     c_plist = (hid_t)*plist;
-     /*
-      * Call H5Pget_size function.
-      */
-     if( H5Pget_size(c_plist, c_name, &c_size) < 0) goto DONE;
-     *size = (size_t_f)c_size;
-      ret_value = 0;
+    c_plist = (hid_t)*plist;
+    /*
+     * Call H5Pget_size function.
+     */
+    if (H5Pget_size(c_plist, c_name, &c_size) < 0)
+        goto DONE;
+    *size     = (size_t_f)c_size;
+    ret_value = 0;
 
 DONE:
-     if(c_name != NULL) HDfree(c_name);
-     return ret_value;
+    if (c_name != NULL)
+        HDfree(c_name);
+    return ret_value;
 }
 /****if* H5Pf/h5pget_nprops_c
  * NAME
- *        h5pget_nprops_c
+ *  h5pget_nprops_c
  * PURPOSE
- *     Call H5Pget_nporps to get number of the properties in the list
+ *  Call H5Pget_nporps to get number of the properties in the list
  * INPUTS
- *      plist - property list to query
+ *  plist - property list to query
  * OUTPUTS
- *     nprops - number of properties in the list
+ *  nprops - number of properties in the list
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              October 11, 2002
+ *  October 11, 2002
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pget_nprops_c(hid_t_f *plist, size_t_f *nprops)
+h5pget_nprops_c(hid_t_f *plist, size_t_f *nprops)
 /******/
 {
-     int_f ret_value = -1;
-     hid_t c_plist;
-     size_t c_nprops;
+    int_f  ret_value = -1;
+    hid_t  c_plist;
+    size_t c_nprops;
 
-     c_plist = (hid_t)*plist;
+    c_plist = (hid_t)*plist;
 
-     /*
-      * Call H5Pget_nprops function.
-      */
-     if( H5Pget_nprops(c_plist, &c_nprops) < 0) return ret_value;
+    /*
+     * Call H5Pget_nprops function.
+     */
+    if (H5Pget_nprops(c_plist, &c_nprops) < 0)
+        return ret_value;
 
-     *nprops = (size_t_f)c_nprops;
-     ret_value = 0;
-     return ret_value;
+    *nprops   = (size_t_f)c_nprops;
+    ret_value = 0;
+    return ret_value;
 }
 /****if* H5Pf/h5pget_class_parent_c
  * NAME
- *        h5pget_class_parent_c
+ *  h5pget_class_parent_c
  * PURPOSE
- *     Call H5Pget_class_parent to get the parent class of
- *              a genereic property class
+ *  Call H5Pget_class_parent to get the parent class of
+ *  a generic property class
  * INPUTS
- *      prp_id - property list to query
+ *  prp_id - property list to query
  * OUTPUTS
- *     parent_id - parent classs identifier
+ *  parent_id - parent class identifier
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              October 11, 2002
+ *  October 11, 2002
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pget_class_parent_c(hid_t_f *prp_id, hid_t_f *parent_id)
+h5pget_class_parent_c(hid_t_f *prp_id, hid_t_f *parent_id)
 /******/
 {
-     int_f ret_value = -1;
-     hid_t c_prp_id;
-     hid_t c_parent_id;
+    int_f ret_value = -1;
+    hid_t c_prp_id;
+    hid_t c_parent_id;
 
-     c_prp_id = (hid_t)*prp_id;
+    c_prp_id = (hid_t)*prp_id;
 
-     /*
-      * Call H5Pget_class_parent function.
-      */
-     c_parent_id = H5Pget_class_parent(c_prp_id);
-     if( c_parent_id < 0) return ret_value;
+    /*
+     * Call H5Pget_class_parent function.
+     */
+    c_parent_id = H5Pget_class_parent(c_prp_id);
+    if (c_parent_id < 0)
+        return ret_value;
 
-     *parent_id =(hid_t_f)c_parent_id;
-     ret_value = 0;
-     return ret_value;
+    *parent_id = (hid_t_f)c_parent_id;
+    ret_value  = 0;
+    return ret_value;
 }
 /****if* H5Pf/h5pcopy_prop_c
  * NAME
- *        h5pcopy_prop_c
+ *  h5pcopy_prop_c
  * PURPOSE
- *     Call H5Pcopy_prop to copy a property from one list or
- *              class to another
+ *  Call H5Pcopy_prop to copy a property from one list or
+ *  class to another
  * INPUTS
- *      dst_id - identifier of destination property list
- *              src_id - identifier of source property list
- *              name   - name of the property
- *              name_len - length of the "name" buffer
+ *  dst_id - identifier of destination property list
+ *  src_id - identifier of source property list
+ *  name   - name of the property
+ *  name_len - length of the "name" buffer
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              October 11, 2002
+ *  October 11, 2002
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pcopy_prop_c(hid_t_f *dst_id, hid_t_f *src_id, _fcd name, int_f *name_len)
+h5pcopy_prop_c(hid_t_f *dst_id, hid_t_f *src_id, _fcd name, int_f *name_len)
 /******/
 {
-     int_f ret_value = -1;
-     hid_t c_dst_id, c_src_id;
-     char* c_name;
+    int_f ret_value = -1;
+    hid_t c_dst_id, c_src_id;
+    char *c_name;
 
-     c_name = (char *)HD5f2cstring(name, (size_t)*name_len);
-     if (c_name == NULL) goto DONE;
+    c_name = (char *)HD5f2cstring(name, (size_t)*name_len);
+    if (c_name == NULL)
+        goto DONE;
 
-     c_dst_id = (hid_t)*dst_id;
-     c_src_id = (hid_t)*src_id;
-     /*
-      * Call H5Pcopy_prop function.
-      */
-     if( H5Pcopy_prop(c_dst_id, c_src_id, c_name) < 0) goto DONE;
-     ret_value = 0;
+    c_dst_id = (hid_t)*dst_id;
+    c_src_id = (hid_t)*src_id;
+    /*
+     * Call H5Pcopy_prop function.
+     */
+    if (H5Pcopy_prop(c_dst_id, c_src_id, c_name) < 0)
+        goto DONE;
+    ret_value = 0;
 
 DONE:
-     if(c_name != NULL) HDfree(c_name);
-     return ret_value;
+    if (c_name != NULL)
+        HDfree(c_name);
+    return ret_value;
 }
 /****if* H5Pf/h5premove_c
  * NAME
- *        h5premove_c
+ *  h5premove_c
  * PURPOSE
- *     Call H5Premove to remove a property from a list
+ *  Call H5Premove to remove a property from a list
  * INPUTS
- *      plid - identifier of property list
- *              name   - name of the property to remove
- *              name_len - length of the "name" buffer
+ *  plid - identifier of property list
+ *  name   - name of the property to remove
+ *  name_len - length of the "name" buffer
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              October 11, 2002
+ *  October 11, 2002
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5premove_c(hid_t_f *plid, _fcd name, int_f *name_len)
+h5premove_c(hid_t_f *plid, _fcd name, int_f *name_len)
 /******/
 {
-     int_f ret_value = -1;
-     hid_t c_plid;
-     char* c_name;
+    int_f ret_value = -1;
+    hid_t c_plid;
+    char *c_name;
 
-     c_name = (char *)HD5f2cstring(name, (size_t)*name_len);
-     if (c_name == NULL) goto DONE;
+    c_name = (char *)HD5f2cstring(name, (size_t)*name_len);
+    if (c_name == NULL)
+        goto DONE;
 
-     c_plid = (hid_t)*plid;
-     /*
-      * Call H5Premove function.
-      */
-     if( H5Premove(c_plid, c_name) < 0) goto DONE;
-     ret_value = 0;
+    c_plid = (hid_t)*plid;
+    /*
+     * Call H5Premove function.
+     */
+    if (H5Premove(c_plid, c_name) < 0)
+        goto DONE;
+    ret_value = 0;
 
 DONE:
-     if(c_name != NULL) HDfree(c_name);
-     return ret_value;
+    if (c_name != NULL)
+        HDfree(c_name);
+    return ret_value;
 }
 /****if* H5Pf/h5punregister_c
  * NAME
- *        h5punregister_c
+ *  h5punregister_c
  * PURPOSE
- *     Call H5Punregister to remove a property from a property class
+ *  Call H5Punregister to remove a property from a property class
  * INPUTS
- *      cls - identifier of property class
- *              name   - name of the property to unregister
- *              name_len - length of the "name" buffer
+ *  cls - identifier of property class
+ *  name   - name of the property to unregister
+ *  name_len - length of the "name" buffer
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
  *  October 11, 2002
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5punregister_c(hid_t_f *cls, _fcd name, int_f *name_len)
+h5punregister_c(hid_t_f *cls, _fcd name, int_f *name_len)
 /******/
 {
-     int_f ret_value = -1;
-     hid_t c_class;
-     char* c_name;
+    int_f ret_value = -1;
+    hid_t c_class;
+    char *c_name;
 
-     c_name = (char *)HD5f2cstring(name, (size_t)*name_len);
-     if (c_name == NULL) goto DONE;
+    c_name = (char *)HD5f2cstring(name, (size_t)*name_len);
+    if (c_name == NULL)
+        goto DONE;
 
-     c_class = (hid_t)*cls;
-     /*
-      * Call H5Punregister function.
-      */
-     if( H5Punregister(c_class, c_name) < 0) goto DONE;
-     ret_value = 0;
+    c_class = (hid_t)*cls;
+    /*
+     * Call H5Punregister function.
+     */
+    if (H5Punregister(c_class, c_name) < 0)
+        goto DONE;
+    ret_value = 0;
 
 DONE:
-     if(c_name != NULL) HDfree(c_name);
-     return ret_value;
+    if (c_name != NULL)
+        HDfree(c_name);
+    return ret_value;
 }
 /****if* H5Pf/h5pclose_class_c
  * NAME
- *        h5pclose_class_c
+ *  h5pclose_class_c
  * PURPOSE
- *     Call H5Pclose_class to close property class
+ *  Call H5Pclose_class to close property class
  * INPUTS
- *      class - identifier of property class to close
+ *  class - identifier of property class to close
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
  *  October 11, 2002
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pclose_class_c(hid_t_f *cls)
+h5pclose_class_c(hid_t_f *cls)
 /******/
 {
-     int_f ret_value = -1;
-     hid_t c_class;
+    int_f ret_value = -1;
+    hid_t c_class;
 
-     c_class = (hid_t)*cls;
-     /*
-      * Call H5Pclose_class function.
-      */
-     if( H5Pclose_class(c_class) < 0) return ret_value;
-     ret_value = 0;
-     return ret_value;
+    c_class = (hid_t)*cls;
+    /*
+     * Call H5Pclose_class function.
+     */
+    if (H5Pclose_class(c_class) < 0)
+        return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pget_class_name_c
  * NAME
- *        h5pget_class_name_c
+ *  h5pget_class_name_c
  * PURPOSE
- *     Call H5Pget_class_name to get property class name
+ *  Call H5Pget_class_name to get property class name
  * INPUTS
- *              cls - identifier of property class
- *              name - buffer to retrieve name in
- *              name_len - length of the "name" buffer
+ *  cls - identifier of property class
+ *  name - buffer to retrieve name in
+ *  name_len - length of the "name" buffer
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
  *  October 11, 2002
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pget_class_name_c(hid_t_f *cls, _fcd name, int_f *name_len)
+h5pget_class_name_c(hid_t_f *cls, _fcd name, int_f *name_len)
 /******/
 {
-     int_f ret_value = -1;
+    int_f ret_value = -1;
 
-     /* Buffer to return name by C function */
-     char *c_name;
+    /* Buffer to return name by C function */
+    char *c_name;
 
-     /*
-      * Call H5Pget_class_name function. c_name is allocated by the library, 
-      * has to be freed by application.
-      */
-     if(NULL == (c_name = H5Pget_class_name((hid_t)*cls)))
-         goto DONE;
+    /*
+     * Call H5Pget_class_name function. c_name is allocated by the library,
+     * has to be freed by application.
+     */
+    if (NULL == (c_name = H5Pget_class_name((hid_t)*cls)))
+        goto DONE;
 
-     HD5packFstring(c_name, _fcdtocp(name), (size_t)*name_len);
-     ret_value = (int_f)HDstrlen(c_name);
-     H5free_memory(c_name);
+    HD5packFstring(c_name, _fcdtocp(name), (size_t)*name_len);
+    ret_value = (int_f)HDstrlen(c_name);
+    H5free_memory(c_name);
 
 DONE:
-     return ret_value;
-}
-
-/****if* H5Pf/h5psetc_c
- * NAME
- *        h5psetc_c
- * PURPOSE
- *     Call h5setc_c to set property with the character string value
- * INPUTS
- *      plist - property list identifier
- *              name   - name of property
- *              name_len - length of the "name" buffer
- *              value - property value of character type
- * RETURNS
- *     0 on success, -1 on failure
- * AUTHOR
- *  Elena Pourmal
- *              October 11, 2002
- * HISTORY
- *
- * SOURCE
-*/
-int_f
-nh5psetc_c(hid_t_f *plist, _fcd name, int_f *name_len, _fcd value, int_f UNUSED *value_len)
-/******/
-{
-     int_f ret_value = -1;
-
-     /*
-      * Call h5pset_c function
-      */
-      ret_value = h5pset_c(plist, name, name_len, _fcdtocp(value));
-      return ret_value;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pset_c
@@ -3467,84 +3264,29 @@ nh5psetc_c(hid_t_f *plist, _fcd name, int_f *name_len, _fcd value, int_f UNUSED
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
 h5pset_c(hid_t_f *plist, _fcd name, int_f *name_len, void *value)
 /******/
 {
-     int_f ret_value = -1;
-     char* c_name;
+    int_f ret_value = -1;
+    char *c_name;
 
-     c_name = (char *)HD5f2cstring(name, (size_t)*name_len);
-     if (c_name == NULL) goto DONE;
+    c_name = (char *)HD5f2cstring(name, (size_t)*name_len);
+    if (c_name == NULL)
+        goto DONE;
 
-     /*
-      * Call H5Pset function.
-      */
-     if( H5Pset((hid_t)*plist, c_name, value) <0) goto DONE;
-     ret_value = 0;
+    /*
+     * Call H5Pset function.
+     */
+    if (H5Pset((hid_t)*plist, c_name, value) < 0)
+        goto DONE;
+    ret_value = 0;
 
 DONE:
-     if(c_name != NULL) HDfree(c_name);
-     return ret_value;
-}
-
-int_f
-nh5pset_integer_c(hid_t_f *plist, _fcd name, int_f *name_len, void *value)
-{
-     /*
-      * Call h5pset_c function
-      */
-     return h5pset_c(plist, name, name_len, value);
-}
-
-int_f
-nh5pset_real_c(hid_t_f *plist, _fcd name, int_f *name_len, void *value)
-{
-     /*
-      * Call h5pset_c function
-      */
-     return h5pset_c(plist, name, name_len, value);
-}
-
-int_f
-nh5pset_double_c(hid_t_f *plist, _fcd name, int_f *name_len, void *value)
-{
-     /*
-      * Call h5pset_c function
-      */
-     return h5pset_c(plist, name, name_len, value);
-}
-/****if* H5Pf/h5pgetc_c
- * NAME
- *        h5pgetc_c
- * PURPOSE
- *     Call h5set_c to set property with the character string value
- * INPUTS
- *      plist - property list identifier
- *              name   - name of property
- *              name_len - length of the "name" buffer
- * Output:      value - property value of character type
- * RETURNS
- *     0 on success, -1 on failure
- * AUTHOR
- *  Elena Pourmal
- *              October 11, 2002
- * HISTORY
- *
- * SOURCE
-*/
-int_f
-nh5pgetc_c(hid_t_f *plist, _fcd name, int_f *name_len, _fcd value, int_f UNUSED *value_len)
-/******/
-{
-     int_f ret_value = -1;
-
-     /*
-      * Call h5pget_c function
-      */
-      ret_value = h5pget_c(plist, name, name_len, _fcdtocp(value));
-      return ret_value;
+    if (c_name != NULL)
+        HDfree(c_name);
+    return ret_value;
 }
 
 /****if* H5Pf/h5pget_c
@@ -3556,7 +3298,7 @@ nh5pgetc_c(hid_t_f *plist, _fcd name, int_f *name_len, _fcd value, int_f UNUSED
  *  plist   - property list class identifier
  *  name     - name of the new property
  *  name_len - length of the "name" buffer
- * Output:  
+ *  Output:
  *  value - property value
  * RETURNS
  *  0 on success, -1 on failure
@@ -3566,571 +3308,570 @@ nh5pgetc_c(hid_t_f *plist, _fcd name, int_f *name_len, _fcd value, int_f UNUSED
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
 h5pget_c(hid_t_f *plist, _fcd name, int_f *name_len, void *value)
 /******/
 {
-     int_f ret_value = -1;
-     char* c_name;
+    int_f ret_value = -1;
+    char *c_name;
 
-     c_name = (char *)HD5f2cstring(name, (size_t)*name_len);
-     if (c_name == NULL) goto DONE;
+    c_name = (char *)HD5f2cstring(name, (size_t)*name_len);
+    if (c_name == NULL)
+        goto DONE;
 
-     /*
-      * Call H5Pset function.
-      */
-     if( H5Pget((hid_t)*plist, c_name, value) <0) goto DONE;
-     ret_value = 0;
+    /*
+     * Call H5Pset function.
+     */
+    if (H5Pget((hid_t)*plist, c_name, value) < 0)
+        goto DONE;
+    ret_value = 0;
 
 DONE:
-     if(c_name != NULL) HDfree(c_name);
-     return ret_value;
-}
-
-int_f
-nh5pget_integer_c(hid_t_f *plist, _fcd name, int_f *name_len, void *value)
-{
-     /*
-      * Call h5pget_c function
-      */
-     return h5pget_c(plist, name, name_len, value);
-}
-
-int_f
-nh5pget_real_c(hid_t_f *plist, _fcd name, int_f *name_len, void *value)
-{
-     /*
-      * Call h5pget_c function
-      */
-     return h5pget_c(plist, name, name_len, value);
-}
-
-int_f
-nh5pget_double_c(hid_t_f *plist, _fcd name, int_f *name_len, void *value)
-{
-     /*
-      * Call h5pget_c function
-      */
-     return h5pget_c(plist, name, name_len, value);
+    if (c_name != NULL)
+        HDfree(c_name);
+    return ret_value;
 }
 
-
 /****if* H5Pf/h5pset_shuffle_c
  * NAME
- *        h5pset_shuffle_c
+ *  h5pset_shuffle_c
  * PURPOSE
- *     Call H5Pset_shuffle
+ *  Call H5Pset_shuffle
  * INPUTS
- *      prp_id - property list identifier
- *              type_size - size of the datatype in bytes
+ *  prp_id - property list identifier
+ *  type_size - size of the datatype in bytes
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Wednesday, March 12, 2003
+ *  Wednesday, March 12, 2003
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5pset_shuffle_c ( hid_t_f *prp_id )
+h5pset_shuffle_c(hid_t_f *prp_id)
 /******/
 {
-  int_f ret_value = 0;
-  hid_t c_prp_id;
-  herr_t status;
+    int_f  ret_value = 0;
+    hid_t  c_prp_id;
+    herr_t status;
 
-  c_prp_id = (hid_t)*prp_id;
-  status = H5Pset_shuffle(c_prp_id);
-  if ( status < 0  ) ret_value = -1;
-  return ret_value;
+    c_prp_id = (hid_t)*prp_id;
+    status   = H5Pset_shuffle(c_prp_id);
+    if (status < 0)
+        ret_value = -1;
+    return ret_value;
 }
 /****if* H5Pf/h5pset_fletcher32_c
  * NAME
- *        h5pset_fletcher32_c
+ *  h5pset_fletcher32_c
  * PURPOSE
- *     Call H5Pset_fletcher32 to enable EDC
+ *  Call H5Pset_fletcher32 to enable EDC
  * INPUTS
- *      prp_id - dataset creation property list identifier
+ *  prp_id - dataset creation property list identifier
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Thursday, March 13, 2003
+ *  Thursday, March 13, 2003
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5pset_fletcher32_c ( hid_t_f *prp_id )
+h5pset_fletcher32_c(hid_t_f *prp_id)
 /******/
 {
-  int_f ret_value = 0;
-  hid_t c_prp_id;
-  herr_t status;
+    int_f  ret_value = 0;
+    hid_t  c_prp_id;
+    herr_t status;
 
-  c_prp_id = (hid_t)*prp_id;
-  status = H5Pset_fletcher32(c_prp_id);
-  if ( status < 0  ) ret_value = -1;
-  return ret_value;
+    c_prp_id = (hid_t)*prp_id;
+    status   = H5Pset_fletcher32(c_prp_id);
+    if (status < 0)
+        ret_value = -1;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pset_edc_check_c
  * NAME
- *        h5pset_edc_check_c
+ *  h5pset_edc_check_c
  * PURPOSE
- *     Call H5Pset_edc_check to enable EDC
+ *  Call H5Pset_edc_check to enable EDC
  * INPUTS
- *      prp_id - dataset transfer property list identifier
- *              flag   - EDC flag
+ *  prp_id - dataset transfer property list identifier
+ *  flag   - EDC flag
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Thursday, March 13, 2003
+ *  Thursday, March 13, 2003
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5pset_edc_check_c ( hid_t_f *prp_id, int_f *flag )
+h5pset_edc_check_c(hid_t_f *prp_id, int_f *flag)
 /******/
 {
-  int_f ret_value = 0;
-  hid_t c_prp_id;
-  H5Z_EDC_t c_flag;
-  herr_t status;
+    int_f     ret_value = 0;
+    hid_t     c_prp_id;
+    H5Z_EDC_t c_flag;
+    herr_t    status;
 
-  c_prp_id = (hid_t)*prp_id;
-  c_flag = (H5Z_EDC_t)*flag;
-  status = H5Pset_edc_check(c_prp_id, c_flag);
-  if ( status < 0  ) ret_value = -1;
-  return ret_value;
+    c_prp_id = (hid_t)*prp_id;
+    c_flag   = (H5Z_EDC_t)*flag;
+    status   = H5Pset_edc_check(c_prp_id, c_flag);
+    if (status < 0)
+        ret_value = -1;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pget_edc_check_c
  * NAME
- *        h5pget_edc_check_c
+ *  h5pget_edc_check_c
  * PURPOSE
- *     Call H5Pget_edc_check to query EDC
+ *  Call H5Pget_edc_check to query EDC
  * INPUTS
- *      prp_id - dataset transfer property list identifier
- * Outouts:     flag   - EDC flag
+ *  prp_id - dataset transfer property list identifier
+ *  Outouts:     flag   - EDC flag
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Thursday, March 13, 2003
+ *  Thursday, March 13, 2003
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5pget_edc_check_c ( hid_t_f *prp_id, int_f *flag )
+h5pget_edc_check_c(hid_t_f *prp_id, int_f *flag)
 /******/
 {
-  int_f ret_value = 0;
-  hid_t c_prp_id;
-  H5Z_EDC_t c_flag;
+    int_f     ret_value = 0;
+    hid_t     c_prp_id;
+    H5Z_EDC_t c_flag;
 
-  c_prp_id = (hid_t)*prp_id;
-  c_flag = H5Pget_edc_check(c_prp_id);
-  if ( c_flag  < 0  ) ret_value = -1;
-  *flag = (int_f)c_flag;
-  return ret_value;
+    c_prp_id = (hid_t)*prp_id;
+    c_flag   = H5Pget_edc_check(c_prp_id);
+    if (c_flag < 0)
+        ret_value = -1;
+    *flag = (int_f)c_flag;
+    return ret_value;
 }
 /****if* H5Pf/h5pset_family_offset_c
  * NAME
- *        h5pset_family_offset_c
+ *  h5pset_family_offset_c
  * PURPOSE
- *     Call H5Pset_family_offset to set and offset for family driver
+ *  Call H5Pset_family_offset to set and offset for family driver
  * INPUTS
- *      prp_id - property list identifier
- *              offset - offset in bytes
+ *  prp_id - property list identifier
+ *  offset - offset in bytes
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Wednesday, 19 March 2003
+ *  Wednesday, 19 March 2003
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5pset_family_offset_c ( hid_t_f *prp_id , hsize_t_f *offset)
+h5pset_family_offset_c(hid_t_f *prp_id, hsize_t_f *offset)
 /******/
 {
-  int_f ret_value = 0;
-  hid_t c_prp_id;
-  hsize_t c_offset;
-  herr_t status;
+    int_f   ret_value = 0;
+    hid_t   c_prp_id;
+    hsize_t c_offset;
+    herr_t  status;
 
-  c_prp_id = (hid_t)*prp_id;
-  c_offset = (hsize_t)*offset;
-  status = H5Pset_family_offset(c_prp_id, c_offset);
-  if ( status < 0  ) ret_value = -1;
-  return ret_value;
+    c_prp_id = (hid_t)*prp_id;
+    c_offset = (hsize_t)*offset;
+    status   = H5Pset_family_offset(c_prp_id, c_offset);
+    if (status < 0)
+        ret_value = -1;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pset_fapl_multi_c
  * NAME
- *        h5pset_fapl_multi_c
+ *  h5pset_fapl_multi_c
  * PURPOSE
- *     Call H5Pset_fapl_multi to set multi file dirver
+ *  Call H5Pset_fapl_multi to set multi file driver
  * INPUTS
- *      prp_id - file_creation property list identifier
- *              mem_map - memory mapping array
- *              memb_fapl - property list for each memory usage type
- *              memb_name - array with members names
- *              len - array with the lenght of each name
- *              lenmax - lenght of the name a sdeclared in Fortran
- *              flag - flag allowing partila access when one of the files is missing
+ *  prp_id - file_creation property list identifier
+ *  mem_map - memory mapping array
+ *  memb_fapl - property list for each memory usage type
+ *  memb_name - array with members names
+ *  len - array with the length of each name
+ *  lenmax - length of the name a sdeclared in Fortran
+ *  flag - flag allowing partila access when one of the files is missing
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Monday 24, March 2003
+ *  Monday 24, March 2003
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-/*nh5pset_fapl_multi_c ( hid_t_f *prp_id , int_f *memb_map, hid_t_f *memb_fapl, _fcd memb_name, int_f *len, int_f *lenmax, haddr_t_f *memb_addr, int_f *flag) */
-nh5pset_fapl_multi_c ( hid_t_f *prp_id , int_f *memb_map, hid_t_f *memb_fapl, _fcd memb_name, int_f *len, int_f *lenmax, real_f *memb_addr, int_f *flag)
-/******/
-{
-  int_f ret_value = -1;
-  hid_t c_prp_id;
-  H5FD_mem_t c_memb_map[H5FD_MEM_NTYPES];
-  hid_t c_memb_fapl[H5FD_MEM_NTYPES];
-  char *c_memb_name[H5FD_MEM_NTYPES];
-  haddr_t c_memb_addr[H5FD_MEM_NTYPES];
-  hbool_t relax;
-  herr_t status;
-  char *tmp, *tmp_p, *tmp_pp;
-  int i;
-  int c_lenmax;
-  long double  tmp_max_addr;
-  c_lenmax = (int)*lenmax;
-  relax = (hbool_t)*flag;
 /*
- * Check that we got correct values from Fortran for memb_addr array
- */
-  for (i=0; i < H5FD_MEM_NTYPES; i++) {
-       if(memb_addr[i] >= 1.0f) return ret_value;
-  }
-/*
- * Take care of names array
- */
-
-  tmp = (char *)HD5f2cstring(memb_name, (size_t)c_lenmax*(H5FD_MEM_NTYPES));
-  if (tmp ==NULL) return ret_value;
-  tmp_p = tmp;
-  for (i=0; i < H5FD_MEM_NTYPES; i++) {
-       c_memb_name[i] = (char *)HDmalloc((size_t)len[i] + 1);
-       HDmemcpy(c_memb_name[i], tmp_p, (size_t)len[i]);
-       tmp_pp = c_memb_name[i];
-       tmp_pp[len[i]] = '\0';
-       tmp_p = tmp_p + c_lenmax;
- }
-/*
- * Take care of othe arguments
- */
-  tmp_max_addr =  (long double)(HADDR_MAX);
-  c_prp_id = (hid_t)*prp_id;
-  for (i=0; i < H5FD_MEM_NTYPES; i++) {
-       c_memb_map[i] = (H5FD_mem_t)memb_map[i];
-       c_memb_fapl[i] = (hid_t)memb_fapl[i];
-       if(memb_addr[i] < 0) c_memb_addr[i] = HADDR_UNDEF;
-       else c_memb_addr[i] = (haddr_t)(((float)memb_addr[i])*(tmp_max_addr));
-  }
-/*
- * Call  H5Pset_fapl_multi function
+ * h5pset_fapl_multi_c(hid_t_f *prp_id , int_f *memb_map, hid_t_f *memb_fapl, _fcd memb_name,
+ * int_f *len, int_f *lenmax, haddr_t_f *memb_addr, int_f *flag)
  */
+h5pset_fapl_multi_c(hid_t_f *prp_id, int_f *memb_map, hid_t_f *memb_fapl, _fcd memb_name, int_f *len,
+                    int_f *lenmax, real_f *memb_addr, int_f *flag)
+/******/
+{
+    int_f       ret_value = -1;
+    hid_t       c_prp_id;
+    H5FD_mem_t  c_memb_map[H5FD_MEM_NTYPES];
+    hid_t       c_memb_fapl[H5FD_MEM_NTYPES];
+    char       *c_memb_name[H5FD_MEM_NTYPES];
+    haddr_t     c_memb_addr[H5FD_MEM_NTYPES];
+    hbool_t     relax;
+    herr_t      status;
+    char       *tmp, *tmp_p, *tmp_pp;
+    int         i;
+    int         c_lenmax;
+    long double tmp_max_addr;
+    c_lenmax = (int)*lenmax;
+    relax    = (hbool_t)*flag;
+    /*
+     *  Check that we got correct values from Fortran for memb_addr array
+     */
+    for (i = 0; i < H5FD_MEM_NTYPES; i++) {
+        if (memb_addr[i] >= 1.0f)
+            return ret_value;
+    }
+    /*
+     *  Take care of names array
+     */
+
+    tmp = (char *)HD5f2cstring(memb_name, (size_t)c_lenmax * (H5FD_MEM_NTYPES));
+    if (tmp == NULL)
+        return ret_value;
+    tmp_p = tmp;
+    for (i = 0; i < H5FD_MEM_NTYPES; i++) {
+        c_memb_name[i] = (char *)HDmalloc((size_t)len[i] + 1);
+        HDmemcpy(c_memb_name[i], tmp_p, (size_t)len[i]);
+        tmp_pp         = c_memb_name[i];
+        tmp_pp[len[i]] = '\0';
+        tmp_p          = tmp_p + c_lenmax;
+    }
+    /*
+     *  Take care of other arguments
+     */
+    tmp_max_addr = (long double)(HADDR_MAX);
+    c_prp_id     = (hid_t)*prp_id;
+    for (i = 0; i < H5FD_MEM_NTYPES; i++) {
+        c_memb_map[i]  = (H5FD_mem_t)memb_map[i];
+        c_memb_fapl[i] = (hid_t)memb_fapl[i];
+        if (memb_addr[i] < 0)
+            c_memb_addr[i] = HADDR_UNDEF;
+        else
+            c_memb_addr[i] = (haddr_t)(((float)memb_addr[i]) * (tmp_max_addr));
+    }
+    /*
+     *  Call  H5Pset_fapl_multi function
+     */
 
-  status = H5Pset_fapl_multi(c_prp_id, c_memb_map, c_memb_fapl, (const char * const *)c_memb_name, c_memb_addr, relax);
-  if ( status < 0  ) goto DONE;
-  ret_value = 0;
+    status = H5Pset_fapl_multi(c_prp_id, c_memb_map, c_memb_fapl, (const char *const *)c_memb_name,
+                               c_memb_addr, relax);
+    if (status < 0)
+        goto DONE;
+    ret_value = 0;
 
 DONE:
-  HDfree(tmp);
-  for (i=0; i < H5FD_MEM_NTYPES; i++)
-      HDfree(c_memb_name[i]);
-  return ret_value;
+    HDfree(tmp);
+    for (i = 0; i < H5FD_MEM_NTYPES; i++)
+        HDfree(c_memb_name[i]);
+    return ret_value;
 }
 
 /****if* H5Pf/h5pset_fapl_multi_sc
  * NAME
- *        h5pset_fapl_multi_sc
+ *  h5pset_fapl_multi_sc
  * PURPOSE
- *     Call H5Pset_fapl_multi to set multi file dirver
+ *  Call H5Pset_fapl_multi to set multi file driver
  * INPUTS
- *      prp_id - file_creation property list identifier
+ *  prp_id - file_creation property list identifier
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              March 31 2003
+ *  March 31 2003
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5pset_fapl_multi_sc ( hid_t_f *prp_id , int_f *flag)
+h5pset_fapl_multi_sc(hid_t_f *prp_id, int_f *flag)
 /******/
 {
-  int_f ret_value = -1;
-  hid_t c_prp_id;
-  hbool_t relax;
-  herr_t status;
+    int_f   ret_value = -1;
+    hid_t   c_prp_id;
+    hbool_t relax;
+    herr_t  status;
 
-  relax = (hbool_t)*flag;
-  c_prp_id = (hid_t)*prp_id;
-/*
- * Call  H5Pset_fapl_multi function
- */
+    relax    = (hbool_t)*flag;
+    c_prp_id = (hid_t)*prp_id;
+    /*
+     *  Call  H5Pset_fapl_multi function
+     */
 
-  status = H5Pset_fapl_multi(c_prp_id, NULL, NULL, NULL, NULL, relax);
-  if ( status < 0  ) return ret_value; /* error occurred */
-  ret_value = 0;
-  return ret_value;
+    status = H5Pset_fapl_multi(c_prp_id, NULL, NULL, NULL, NULL, relax);
+    if (status < 0)
+        return ret_value; /* error occurred */
+    ret_value = 0;
+    return ret_value;
 }
 /****if* H5Pf/h5pget_fapl_multi_c
  * NAME
- *        h5pget_fapl_multi_c
+ *  h5pget_fapl_multi_c
  * PURPOSE
- *     Call H5Pget_fapl_multi to set multi file dirver
+ *  Call H5Pget_fapl_multi to set multi file driver
  * INPUTS
- *      prp_id - file_creation property list identifier
- *              lenmax - lenght of the name a sdeclared in Fortran
+ *  prp_id - file_creation property list identifier
+ *  lenmax - length of the name a sdeclared in Fortran
  * OUTPUTS
- *     memb_map - memory mapping array
- *              memb_fapl - property list for each memory usage type
- *              memb_name - array with members names
- *              len - array with the lenght of each name
- *              flag - flag allowing partila access when one of the files is missing
+ *  memb_map - memory mapping array
+ *  memb_fapl - property list for each memory usage type
+ *  memb_name - array with members names
+ *  len - array with the length of each name
+ *  flag - flag allowing partila access when one of the files is missing
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Monday 24, March 2003
+ *  Monday 24, March 2003
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5pget_fapl_multi_c ( hid_t_f *prp_id , int_f *memb_map, hid_t_f *memb_fapl, _fcd memb_name, int_f *len, int_f *lenmax, real_f *memb_addr, int_f *flag, int_f *maxlen_out)
+h5pget_fapl_multi_c(hid_t_f *prp_id, int_f *memb_map, hid_t_f *memb_fapl, _fcd memb_name, int_f *len,
+                    int_f *lenmax, real_f *memb_addr, int_f *flag, int_f *maxlen_out)
 /******/
 {
-  int_f ret_value = -1;
-  hid_t c_prp_id;
-  H5FD_mem_t c_memb_map[H5FD_MEM_NTYPES];
-  hid_t c_memb_fapl[H5FD_MEM_NTYPES];
-  char *c_memb_name[H5FD_MEM_NTYPES];
-  haddr_t c_memb_addr[H5FD_MEM_NTYPES];
-  hbool_t relax;
-  herr_t status;
-  char *tmp, *tmp_p;
-  int i;
-  size_t c_lenmax;
-  size_t length = 0;
-  c_lenmax = (size_t)*lenmax;
+    int_f      ret_value = -1;
+    hid_t      c_prp_id;
+    H5FD_mem_t c_memb_map[H5FD_MEM_NTYPES];
+    hid_t      c_memb_fapl[H5FD_MEM_NTYPES];
+    char      *c_memb_name[H5FD_MEM_NTYPES];
+    haddr_t    c_memb_addr[H5FD_MEM_NTYPES];
+    hbool_t    relax;
+    herr_t     status;
+    char      *tmp, *tmp_p;
+    int        i;
+    size_t     c_lenmax;
+    size_t     length = 0;
+    c_lenmax          = (size_t)*lenmax;
 
-  c_prp_id = (hid_t)*prp_id;
-/*
- * Call  H5Pget_fapl_multi function
- */
+    c_prp_id = (hid_t)*prp_id;
+    /*
+     *  Call  H5Pget_fapl_multi function
+     */
 
-  status = H5Pget_fapl_multi(c_prp_id, c_memb_map, c_memb_fapl, c_memb_name, c_memb_addr, &relax);
-  if ( status < 0  ) return ret_value;
+    status = H5Pget_fapl_multi(c_prp_id, c_memb_map, c_memb_fapl, c_memb_name, c_memb_addr, &relax);
+    if (status < 0)
+        return ret_value;
 
-/*
- * Take care of names array
- */
-  tmp = (char *)HDmalloc(c_lenmax*H5FD_MEM_NTYPES + 1);
-  tmp_p = tmp;
-  HDmemset(tmp,' ', c_lenmax*H5FD_MEM_NTYPES);
-  tmp[c_lenmax*H5FD_MEM_NTYPES] = '\0';
-  for (i=0; i < H5FD_MEM_NTYPES; i++) {
-       memcpy(tmp_p, c_memb_name[i], strlen(c_memb_name[i]));
-       len[i] = (int_f)strlen(c_memb_name[i]);
-       length = H5_MAX(length, strlen(c_memb_name[i]));
-       tmp_p = tmp_p + c_lenmax;
- }
-HD5packFstring(tmp, _fcdtocp(memb_name), (size_t)(c_lenmax*H5FD_MEM_NTYPES));
+    /*
+     *  Take care of names array
+     */
+    tmp   = (char *)HDmalloc(c_lenmax * H5FD_MEM_NTYPES + 1);
+    tmp_p = tmp;
+    HDmemset(tmp, ' ', c_lenmax * H5FD_MEM_NTYPES);
+    tmp[c_lenmax * H5FD_MEM_NTYPES] = '\0';
+    for (i = 0; i < H5FD_MEM_NTYPES; i++) {
+        memcpy(tmp_p, c_memb_name[i], strlen(c_memb_name[i]));
+        len[i] = (int_f)strlen(c_memb_name[i]);
+        length = H5_MAX(length, strlen(c_memb_name[i]));
+        tmp_p  = tmp_p + c_lenmax;
+    }
+    HD5packFstring(tmp, _fcdtocp(memb_name), (size_t)(c_lenmax * H5FD_MEM_NTYPES));
 
-/*
- * Take care of other arguments
- */
+    /*
+     *  Take care of other arguments
+     */
 
-  for (i=0; i < H5FD_MEM_NTYPES; i++) {
-       memb_map[i] = (int_f)c_memb_map[i];
-       memb_fapl[i] = (hid_t_f)c_memb_fapl[i];
-       if(c_memb_addr[i] == HADDR_UNDEF) memb_addr[i] = -1;
-       else memb_addr[i] = (real_f) (c_memb_addr[i]/HADDR_MAX);
-  }
-  *flag = (int_f)relax;
-  *maxlen_out = (int_f)length;
-  ret_value = 0;
-  HDfree(tmp);
-  for (i=0; i < H5FD_MEM_NTYPES; i++)
-      HDfree(c_memb_name[i]);
-  return ret_value;
+    for (i = 0; i < H5FD_MEM_NTYPES; i++) {
+        memb_map[i]  = (int_f)c_memb_map[i];
+        memb_fapl[i] = (hid_t_f)c_memb_fapl[i];
+        if (c_memb_addr[i] == HADDR_UNDEF)
+            memb_addr[i] = -1;
+        else
+            memb_addr[i] = (real_f)(c_memb_addr[i] / HADDR_MAX);
+    }
+    *flag       = (int_f)relax;
+    *maxlen_out = (int_f)length;
+    ret_value   = 0;
+    HDfree(tmp);
+    for (i = 0; i < H5FD_MEM_NTYPES; i++)
+        HDfree(c_memb_name[i]);
+    return ret_value;
 }
 
 /****if* H5Pf/h5pset_szip_c
  * NAME
- *        h5pset_szip_c
+ *  h5pset_szip_c
  * PURPOSE
- *     Call H5Pset_szip to set szip compression
+ *  Call H5Pset_szip to set szip compression
  * INPUTS
- *      prp_id - dataset creation property list identifier
- *              options_mask
- *              pixels_per_block -szip compression parameters
+ *  prp_id - dataset creation property list identifier
+ *  options_mask
+ *  pixels_per_block -szip compression parameters
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              April 8 2003
+ *  April 8 2003
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5pset_szip_c ( hid_t_f *prp_id , int_f *options_mask, int_f *pixels_per_block)
+h5pset_szip_c(hid_t_f *prp_id, int_f *options_mask, int_f *pixels_per_block)
 /******/
 {
-  int_f ret_value = -1;
-  hid_t c_prp_id;
-  unsigned   c_options_mask;
-  unsigned  c_pixels_per_block;
-  herr_t status;
+    int_f    ret_value = -1;
+    hid_t    c_prp_id;
+    unsigned c_options_mask;
+    unsigned c_pixels_per_block;
+    herr_t   status;
 
-  c_prp_id = (hid_t)*prp_id;
-  c_options_mask = (unsigned)*options_mask;
-  c_pixels_per_block = (unsigned)*pixels_per_block;
-/*
- * Call  H5Pset_szip function
- */
+    c_prp_id           = (hid_t)*prp_id;
+    c_options_mask     = (unsigned)*options_mask;
+    c_pixels_per_block = (unsigned)*pixels_per_block;
+    /*
+     *  Call  H5Pset_szip function
+     */
 
-  status = H5Pset_szip(c_prp_id, c_options_mask, c_pixels_per_block);
-  if ( status < 0  ) return ret_value;
-  ret_value = 0;
-  return ret_value;
+    status = H5Pset_szip(c_prp_id, c_options_mask, c_pixels_per_block);
+    if (status < 0)
+        return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 /****if* H5Pf/h5pall_filters_avail_c
  * NAME
- *        h5pall_filters_avail_c
+ *  h5pall_filters_avail_c
  * PURPOSE
- *     Call H5Pall_filters_avail
+ *  Call H5Pall_filters_avail
  * INPUTS
- *      prp_id - dataset creation property list identifier
+ *  prp_id - dataset creation property list identifier
  * OUTPUTS
- *     status - logical flag
+ *  status - logical flag
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              April 10 2003
+ *  April 10 2003
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5pall_filters_avail_c ( hid_t_f *prp_id , int_f *status)
+h5pall_filters_avail_c(hid_t_f *prp_id, int_f *status)
 /******/
 {
-  int_f ret_value = -1;
-  hid_t c_prp_id;
-  htri_t c_status;
-
+    int_f  ret_value = -1;
+    hid_t  c_prp_id;
+    htri_t c_status;
 
-  c_prp_id = (hid_t)*prp_id;
-/*
- * Call  H5Pall_filters_avail function
- */
+    c_prp_id = (hid_t)*prp_id;
+    /*
+     *  Call  H5Pall_filters_avail function
+     */
 
-  c_status = H5Pall_filters_avail(c_prp_id);
-  if ( c_status < 0  ) return ret_value;
-  *status = 0;
-  if (c_status == 1) *status = 1;
-  ret_value = 0;
-  return ret_value;
+    c_status = H5Pall_filters_avail(c_prp_id);
+    if (c_status < 0)
+        return ret_value;
+    *status = 0;
+    if (c_status == 1)
+        *status = 1;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pget_filter_by_id_c
  * NAME
- *        h5pget_filter_by_id_c
+ *  h5pget_filter_by_id_c
  * PURPOSE
- *     Call H5Pget_filter_by_id2 to get information about a filter
- *              in a pipeline
+ *  Call H5Pget_filter_by_id2 to get information about a filter
+ *  in a pipeline
  * INPUTS
- *      prp_id - property list identifier
- *              filter_id - filter id
- *              namelen - Anticipated number of characters in name.
+ *  prp_id - property list identifier
+ *  filter_id - filter id
+ *  namelen - Anticipated number of characters in name.
  *OUTPUT
- *      flags - Bit vector specifying certain general
- *                      properties of the filter.
- *              cd_nelmts - Number of elements in cd_value
- *              cd_values - Auxiliary data for the filter.
- *              name - Name of the filter
+ *  flags - Bit vector specifying certain general
+ *  properties of the filter.
+ *  cd_nelmts - Number of elements in cd_value
+ *  cd_values - Auxiliary data for the filter.
+ *  name - Name of the filter
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena POurmal
- *              April 10, 2003
+ *  April 10, 2003
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pget_filter_by_id_c(hid_t_f *prp_id, int_f* filter_id, int_f* flags, size_t_f* cd_nelmts, int_f* cd_values, size_t_f *namelen, _fcd name)
+h5pget_filter_by_id_c(hid_t_f *prp_id, int_f *filter_id, int_f *flags, size_t_f *cd_nelmts, int_f *cd_values,
+                      size_t_f *namelen, _fcd name)
 /******/
 {
-     unsigned int c_flags;
-     size_t c_cd_nelmts = (size_t)*cd_nelmts;
-     size_t c_cd_nelmts_in = (size_t)*cd_nelmts;
-     unsigned int *c_cd_values = NULL;
-     char *c_name = NULL;
-     unsigned i;
-     int_f ret_value = -1;
-
-     if(NULL == (c_name = (char *)HDmalloc((size_t)*namelen + 1)))
-         goto DONE;
+    unsigned int  c_flags;
+    size_t        c_cd_nelmts    = (size_t)*cd_nelmts;
+    size_t        c_cd_nelmts_in = (size_t)*cd_nelmts;
+    unsigned int *c_cd_values    = NULL;
+    char         *c_name         = NULL;
+    unsigned      i;
+    int_f         ret_value = -1;
+
+    if (NULL == (c_name = (char *)HDmalloc((size_t)*namelen + 1)))
+        goto DONE;
 
-     if(NULL == (c_cd_values = (unsigned int *)HDmalloc(sizeof(unsigned int) * c_cd_nelmts_in)))
-         goto DONE;
+    if (NULL == (c_cd_values = (unsigned int *)HDmalloc(sizeof(unsigned int) * c_cd_nelmts_in)))
+        goto DONE;
 
-     /*
-      * Call H5Pget_filter_by_id2 function.
-      */
-     if(H5Pget_filter_by_id2((hid_t)*prp_id, (H5Z_filter_t)*filter_id, &c_flags, &c_cd_nelmts, c_cd_values, (size_t)*namelen, c_name, NULL) < 0)
-         goto DONE;
+    /*
+     * Call H5Pget_filter_by_id2 function.
+     */
+    if (H5Pget_filter_by_id2((hid_t)*prp_id, (H5Z_filter_t)*filter_id, &c_flags, &c_cd_nelmts, c_cd_values,
+                             (size_t)*namelen, c_name, NULL) < 0)
+        goto DONE;
 
-     *cd_nelmts = (size_t_f)c_cd_nelmts;
-     *flags = (int_f)c_flags;
-     HD5packFstring(c_name, _fcdtocp(name), HDstrlen(c_name));
+    *cd_nelmts = (size_t_f)c_cd_nelmts;
+    *flags     = (int_f)c_flags;
+    HD5packFstring(c_name, _fcdtocp(name), HDstrlen(c_name));
 
-     for(i = 0; i < c_cd_nelmts_in; i++)
-          cd_values[i] = (int_f)c_cd_values[i];
+    for (i = 0; i < c_cd_nelmts_in; i++)
+        cd_values[i] = (int_f)c_cd_values[i];
 
-     ret_value = 0;
+    ret_value = 0;
 
 DONE:
-    if(c_name)
+    if (c_name)
         HDfree(c_name);
-    if(c_cd_values)
+    if (c_cd_values)
         HDfree(c_cd_values);
 
     return ret_value;
@@ -4138,793 +3879,774 @@ DONE:
 
 /****if* H5Pf/h5pmodify_filter_c
  * NAME
- *        h5pmodify_filter_c
+ *  h5pmodify_filter_c
  * PURPOSE
- *     Call H5Pmodify_filter to modify a filter
+ *  Call H5Pmodify_filter to modify a filter
  * INPUTS
- *      prp_id - property list identifier
- *              filter - Filter to be modified
- *              flags - Bit vector specifying certain general
- *                      properties of the filter.
- *              cd_nelmts - Number of elements in cd_values.
- *              cd_values - Auxiliary data for the filter.
+ *  prp_id - property list identifier
+ *  filter - Filter to be modified
+ *  flags - Bit vector specifying certain general
+ *  properties of the filter.
+ *  cd_nelmts - Number of elements in cd_values.
+ *  cd_values - Auxiliary data for the filter.
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              April 10 2003
+ *  April 10 2003
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pmodify_filter_c (hid_t_f *prp_id, int_f* filter, int_f* flags, size_t_f* cd_nelmts, int_f* cd_values )
+h5pmodify_filter_c(hid_t_f *prp_id, int_f *filter, int_f *flags, size_t_f *cd_nelmts, int_f *cd_values)
 /******/
 {
-     int_f ret_value = -1;
-     hid_t c_prp_id = (hid_t)*prp_id;
-     herr_t ret;
-     size_t c_cd_nelmts = (size_t)*cd_nelmts;
-     unsigned int c_flags = (unsigned)*flags;
-     H5Z_filter_t c_filter = (H5Z_filter_t)*filter;
-     unsigned int * c_cd_values;
-     unsigned i;
+    int_f         ret_value = -1;
+    hid_t         c_prp_id  = (hid_t)*prp_id;
+    herr_t        ret;
+    size_t        c_cd_nelmts = (size_t)*cd_nelmts;
+    unsigned int  c_flags     = (unsigned)*flags;
+    H5Z_filter_t  c_filter    = (H5Z_filter_t)*filter;
+    unsigned int *c_cd_values;
+    unsigned      i;
 
-     c_cd_values = (unsigned int *)HDmalloc(sizeof(unsigned int) * c_cd_nelmts);
-     if (!c_cd_values) return ret_value;
-     for (i = 0; i < c_cd_nelmts; i++)
-          c_cd_values[i] = (unsigned int)cd_values[i];
+    c_cd_values = (unsigned int *)HDmalloc(sizeof(unsigned int) * c_cd_nelmts);
+    if (!c_cd_values)
+        return ret_value;
+    for (i = 0; i < c_cd_nelmts; i++)
+        c_cd_values[i] = (unsigned int)cd_values[i];
 
-     /*
-      * Call H5Pmodify_filter function.
-      */
-     ret = H5Pmodify_filter(c_prp_id, c_filter, c_flags, c_cd_nelmts,c_cd_values );
+    /*
+     * Call H5Pmodify_filter function.
+     */
+    ret = H5Pmodify_filter(c_prp_id, c_filter, c_flags, c_cd_nelmts, c_cd_values);
 
-     if (ret < 0) goto DONE;
-     ret_value = 0;
+    if (ret < 0)
+        goto DONE;
+    ret_value = 0;
 
 DONE:
-     HDfree(c_cd_values);
-     return ret_value;
+    HDfree(c_cd_values);
+    return ret_value;
 }
 
 /****if* H5Pf/h5premove_filter_c
  * NAME
- *        h5premove_filter_c
+ *  h5premove_filter_c
  * PURPOSE
- *     Call H5Premove_filter to delete one or more filters
+ *  Call H5Premove_filter to delete one or more filters
  * INPUTS
- *      prp_id - property list identifier
- *              filter - Filter to be deleted
+ *  prp_id - property list identifier
+ *  filter - Filter to be deleted
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Quincey Koziol
- *              January 27 2004
+ *  January 27 2004
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5premove_filter_c (hid_t_f *prp_id, int_f* filter)
+h5premove_filter_c(hid_t_f *prp_id, int_f *filter)
 /******/
 {
-     int_f ret_value = -1;
-     hid_t c_prp_id;
-     H5Z_filter_t c_filter;
+    int_f        ret_value = -1;
+    hid_t        c_prp_id;
+    H5Z_filter_t c_filter;
 
-     c_filter = (H5Z_filter_t)*filter;
-     c_prp_id = (hid_t)*prp_id;
+    c_filter = (H5Z_filter_t)*filter;
+    c_prp_id = (hid_t)*prp_id;
 
-     /*
-      * Call H5Premove_filter function.
-      */
-     if(H5Premove_filter(c_prp_id, c_filter) < 0) goto DONE;
-     ret_value = 0;
+    /*
+     * Call H5Premove_filter function.
+     */
+    if (H5Premove_filter(c_prp_id, c_filter) < 0)
+        goto DONE;
+    ret_value = 0;
 
 DONE:
-     return ret_value;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pget_attr_phase_change_c
  * NAME
- *        h5pget_attr_phase_change_c
+ *  h5pget_attr_phase_change_c
  * PURPOSE
- *     Calls H5Pget_attr_phase_change
+ *  Calls H5Pget_attr_phase_change
  *
  * INPUTS
- *      ocpl_id		- Object (dataset or group) creation property list identifier
- * Outputs      max_compact     - Maximum number of attributes to be stored in compact storage
- *              min_dense       - Minimum number of attributes to be stored in dense storage
+ *  ocpl_id        - Object (dataset or group) creation property list identifier
+ * OUTPUTS
+ *  max_compact    - Maximum number of attributes to be stored in compact storage
+ *  min_dense      - Minimum number of attributes to be stored in dense storage
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              January, 2008
+ *  January, 2008
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pget_attr_phase_change_c(hid_t_f *ocpl_id, int_f *max_compact, int_f *min_dense )
+h5pget_attr_phase_change_c(hid_t_f *ocpl_id, int_f *max_compact, int_f *min_dense)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_ocpl_id;
-  unsigned c_max_compact;
-  unsigned c_min_dense;
-  herr_t ret;
-  /*
-   * Call H5Pget_attr_phase_change function.
-   */
-  c_ocpl_id = (hid_t)*ocpl_id;
-  ret = H5Pget_attr_phase_change(c_ocpl_id, &c_max_compact,&c_min_dense);
-  if (ret < 0) return ret_value;
-
-  *max_compact = (int_f)c_max_compact;
-  *min_dense = (int_f)c_min_dense;
-  ret_value = 0;
-  return ret_value;
+    int      ret_value = -1;
+    hid_t    c_ocpl_id;
+    unsigned c_max_compact;
+    unsigned c_min_dense;
+    herr_t   ret;
+    /*
+     * Call H5Pget_attr_phase_change function.
+     */
+    c_ocpl_id = (hid_t)*ocpl_id;
+    ret       = H5Pget_attr_phase_change(c_ocpl_id, &c_max_compact, &c_min_dense);
+    if (ret < 0)
+        return ret_value;
+
+    *max_compact = (int_f)c_max_compact;
+    *min_dense   = (int_f)c_min_dense;
+    ret_value    = 0;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pset_attr_creation_order_c
  * NAME
- *        h5pset_attr_creation_order_c
+ *  h5pset_attr_creation_order_c
  * PURPOSE
- *     Calls H5Ppset_attr_creation_order
+ *  Calls H5Ppset_attr_creation_order
  *
  * INPUTS
- *      ocpl_id		- Object (dataset or group) creation property list identifier
- * Outputs      crt_order_flags - Flags specifying whether to track and index attribute creation order
+ *  ocpl_id         - Object (dataset or group) creation property list identifier
+ * OUTPUTS
+ *  crt_order_flags - Flags specifying whether to track and index attribute creation order
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              January, 2008
+ *  January, 2008
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pset_attr_creation_order_c(hid_t_f *ocpl_id, int_f *crt_order_flags )
+h5pset_attr_creation_order_c(hid_t_f *ocpl_id, int_f *crt_order_flags)
 /******/
 {
-  int ret_value = -1;
-  unsigned c_crt_order_flags;
-  herr_t ret;
-  /*
-   * Call h5pset_attr_creation_order function.
-   */
-  c_crt_order_flags = (unsigned)*crt_order_flags;
-  ret = H5Pset_attr_creation_order((hid_t)*ocpl_id, c_crt_order_flags);
-  if (ret < 0) return ret_value;
+    int      ret_value = -1;
+    unsigned c_crt_order_flags;
+    herr_t   ret;
+    /*
+     * Call h5pset_attr_creation_order function.
+     */
+    c_crt_order_flags = (unsigned)*crt_order_flags;
+    ret               = H5Pset_attr_creation_order((hid_t)*ocpl_id, c_crt_order_flags);
+    if (ret < 0)
+        return ret_value;
 
-  *crt_order_flags = (int_f)c_crt_order_flags;
-  ret_value = 0;
-  return ret_value;
+    *crt_order_flags = (int_f)c_crt_order_flags;
+    ret_value        = 0;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pset_shared_mesg_nindexes_c
  * NAME
- *        h5pset_shared_mesg_nindexes_c
+ *  h5pset_shared_mesg_nindexes_c
  * PURPOSE
- *     Calls h5pset_shared_mesg_nindexes
+ *  Calls h5pset_shared_mesg_nindexes
  *
  * INPUTS
  *
- *       plist_id - file creation property list
- *       nindexes - Number of shared object header message indexes
- *                   available in files created WITH this property list
+ *  plist_id - file creation property list
+ *  nindexes - Number of shared object header message indexes
+ *  available in files created WITH this property list
  *
  * OUTPUTS
  *
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              January, 2008
+ *  January, 2008
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pset_shared_mesg_nindexes_c(hid_t_f *plist_id, int_f *nindexes )
+h5pset_shared_mesg_nindexes_c(hid_t_f *plist_id, int_f *nindexes)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_plist_id;
-  unsigned c_nindexes;
-  herr_t ret;
-  /*
-   * Call h5pset_shared_mesg_nindexes function.
-   */
-  c_plist_id = (hid_t)*plist_id;
-  c_nindexes = (unsigned)*nindexes;
-  ret = H5Pset_shared_mesg_nindexes(c_plist_id, c_nindexes );
-  if (ret < 0) return ret_value;
+    int      ret_value = -1;
+    hid_t    c_plist_id;
+    unsigned c_nindexes;
+    herr_t   ret;
+    /*
+     * Call h5pset_shared_mesg_nindexes function.
+     */
+    c_plist_id = (hid_t)*plist_id;
+    c_nindexes = (unsigned)*nindexes;
+    ret        = H5Pset_shared_mesg_nindexes(c_plist_id, c_nindexes);
+    if (ret < 0)
+        return ret_value;
 
-  ret_value = 0;
-  return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pset_shared_mesg_index_c
  * NAME
- *        h5pset_shared_mesg_index_c
+ *  h5pset_shared_mesg_index_c
  * PURPOSE
- *     Calls H5Pset_shared_mesg_index
+ *  Calls H5Pset_shared_mesg_index
  *
  * INPUTS
  *
- *            fcpl_id - File creation property list identifier.
- *          index_num - Index being configured.
- *    mesg_type_flags - Types of messages that should be stored in this index.
- *      min_mesg_size - Minimum message size.
+ *  fcpl_id - File creation property list identifier.
+ *  index_num - Index being configured.
+ *  mesg_type_flags - Types of messages that should be stored in this index.
+ *  min_mesg_size - Minimum message size.
  *
  * OUTPUTS
  *
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              January, 2008
+ *  January, 2008
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pset_shared_mesg_index_c(hid_t_f *fcpl_id, int_f *index_num, int_f *mesg_type_flags, int_f *min_mesg_size)
+h5pset_shared_mesg_index_c(hid_t_f *fcpl_id, int_f *index_num, int_f *mesg_type_flags, int_f *min_mesg_size)
 /******/
 {
-  int ret_value = -1;
-  herr_t ret;
-  /*
-   * Call h5pset_shared_mesg_index function.
-   */
-  ret = H5Pset_shared_mesg_index((hid_t)*fcpl_id,(unsigned)*index_num, (unsigned)*mesg_type_flags, (unsigned)*min_mesg_size);
-  if (ret < 0) return ret_value;
+    int    ret_value = -1;
+    herr_t ret;
+    /*
+     * Call h5pset_shared_mesg_index function.
+     */
+    ret = H5Pset_shared_mesg_index((hid_t)*fcpl_id, (unsigned)*index_num, (unsigned)*mesg_type_flags,
+                                   (unsigned)*min_mesg_size);
+    if (ret < 0)
+        return ret_value;
 
-  ret_value = 0;
-  return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pget_attr_creation_order_c
  * NAME
- *        h5pget_attr_creation_order_c
+ *  h5pget_attr_creation_order_c
  * PURPOSE
- *     Calls H5Pget_attr_creation_order
+ *  Calls H5Pget_attr_creation_order
  *
  * INPUTS
  *
- *           ocpl_id - Object (group or dataset) creation property list identifier
+ *  ocpl_id - Object (group or dataset) creation property list identifier
  * OUTPUTS
  *
- *           crt_order_flags - Flags specifying whether to track and index attribute creation order
+ *  crt_order_flags - Flags specifying whether to track and index attribute creation order
  *
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              February, 2008
+ *  February, 2008
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pget_attr_creation_order_c(hid_t_f *ocpl_id, int_f *crt_order_flags)
+h5pget_attr_creation_order_c(hid_t_f *ocpl_id, int_f *crt_order_flags)
 /******/
 {
-  int ret_value = -1;
-  herr_t ret;
+    int    ret_value = -1;
+    herr_t ret;
 
-  unsigned c_crt_order_flags;
-  /*
-   * Call h5pget_attr_creation_order function.
-   */
+    unsigned c_crt_order_flags;
+    /*
+     * Call h5pget_attr_creation_order function.
+     */
 
-  ret = H5Pget_attr_creation_order((hid_t)*ocpl_id, &c_crt_order_flags);
-  if (ret < 0) return ret_value;
+    ret = H5Pget_attr_creation_order((hid_t)*ocpl_id, &c_crt_order_flags);
+    if (ret < 0)
+        return ret_value;
 
-  *crt_order_flags = (int_f)c_crt_order_flags;
+    *crt_order_flags = (int_f)c_crt_order_flags;
 
-  ret_value = 0;
-  return ret_value;
-}
-/****if* H5Pf/h5pset_libver_bounds_c
- * NAME
- *        h5pset_libver_bounds_c
- * PURPOSE
- *     Calls H5Pset_libver_bounds
- *
- * INPUTS
- *
- *             fapl_id - File access property list identifier
- *                 low - The earliest version of the library that will be used for writing objects.
- *                high - The latest version of the library that will be used for writing objects.
- * OUTPUTS
- *
- *
- * RETURNS
- *     0 on success, -1 on failure
- * AUTHOR
- *  M. Scot Breitenfeld
- *              February 18, 2008
- * HISTORY
- *
- * SOURCE
-*/
-int_f
-nh5pset_libver_bounds_c(hid_t_f *fapl_id, int_f *low, int_f *high )
-/******/
-{
-  int ret_value = -1;
-  herr_t ret;
-
-  /*
-   * Call H5Pset_libver_bounds function.
-   */
-  ret = H5Pset_libver_bounds( (hid_t)*fapl_id, (H5F_libver_t)*low, (H5F_libver_t)*high );
-  if (ret < 0) return ret_value;
-
-  ret_value = 0;
-  return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
-
 /****if* H5Pf/h5pset_link_creation_order_c
  * NAME
- *        h5pset_link_creation_order_c
+ *  h5pset_link_creation_order_c
  * PURPOSE
- *     Calls H5Pset_link_creation_order
+ *  Calls H5Pset_link_creation_order
  *
  * INPUTS
- *      gcpl_id		- Group creation property list identifier
- *              crt_order_flags - Creation order flag(s)
+ *  gcpl_id         - Group creation property list identifier
+ *  crt_order_flags - Creation order flag(s)
  * OUTPUTS
  *
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              February 18, 2008
+ *  February 18, 2008
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pset_link_creation_order_c(hid_t_f *gcpl_id, int_f *crt_order_flags )
+h5pset_link_creation_order_c(hid_t_f *gcpl_id, int_f *crt_order_flags)
 /******/
 {
-  int ret_value = -1;
-  herr_t ret;
-  /*
-   * Call H5Pset_link_creation_order function.
-   */
-  ret = H5Pset_link_creation_order((hid_t)*gcpl_id, (unsigned)*crt_order_flags);
-  if (ret < 0) return ret_value;
+    int    ret_value = -1;
+    herr_t ret;
+    /*
+     * Call H5Pset_link_creation_order function.
+     */
+    ret = H5Pset_link_creation_order((hid_t)*gcpl_id, (unsigned)*crt_order_flags);
+    if (ret < 0)
+        return ret_value;
 
-  ret_value = 0;
-  return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pget_link_phase_change_c
  * NAME
- *        h5pget_link_phase_change_c
+ *  h5pget_link_phase_change_c
  * PURPOSE
- *     Calls H5Pget_link_phase_change
+ *  Calls H5Pget_link_phase_change
  *
  * INPUTS
- *      gcpl_id  	- Group creation property list identifier
- * Outputs      max_compact     - Maximum number of attributes to be stored in compact storage
- *              min_dense       - Minimum number of attributes to be stored in dense storage
+ *  gcpl_id      - Group creation property list identifier
+ * OUTPUTS
+ *  max_compact  - Maximum number of attributes to be stored in compact storage
+ *  min_dense    - Minimum number of attributes to be stored in dense storage
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              February 20, 2008
+ *  February 20, 2008
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pget_link_phase_change_c(hid_t_f *gcpl_id, int_f *max_compact, int_f *min_dense )
+h5pget_link_phase_change_c(hid_t_f *gcpl_id, int_f *max_compact, int_f *min_dense)
 /******/
 {
-  int ret_value = -1;
-  unsigned c_max_compact;
-  unsigned c_min_dense;
-  herr_t ret;
+    int      ret_value = -1;
+    unsigned c_max_compact;
+    unsigned c_min_dense;
+    herr_t   ret;
 
-  /*
-   * Call H5Pget_link_phase_change function.
-   */
-  ret = H5Pget_link_phase_change((hid_t)*gcpl_id, &c_max_compact,&c_min_dense);
-  if (ret < 0) return ret_value;
+    /*
+     * Call H5Pget_link_phase_change function.
+     */
+    ret = H5Pget_link_phase_change((hid_t)*gcpl_id, &c_max_compact, &c_min_dense);
+    if (ret < 0)
+        return ret_value;
 
-  *max_compact = (int_f)c_max_compact;
-  *min_dense = (int_f)c_min_dense;
-  ret_value = 0;
-  return ret_value;
+    *max_compact = (int_f)c_max_compact;
+    *min_dense   = (int_f)c_min_dense;
+    ret_value    = 0;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pget_obj_track_times_c
  * NAME
- *        h5pget_obj_track_times_c
+ *  h5pget_obj_track_times_c
  * PURPOSE
- *     Call H5Pget_obj_track_times
+ *  Call H5Pget_obj_track_times
  *
  * INPUTS
- *      plist_id - property list id
+ *  plist_id - property list id
  * OUTPUTS
  *
- *              flag     - TRUE/FALSE flag
+ *  flag     - TRUE/FALSE flag
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              February 22, 2008
+ *  February 22, 2008
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5pget_obj_track_times_c(hid_t_f *plist_id, int_f *flag)
+h5pget_obj_track_times_c(hid_t_f *plist_id, int_f *flag)
 /******/
 {
-  int ret_value = -1;
-  hbool_t c_track_times=0;
-  herr_t ret;
+    int     ret_value     = -1;
+    hbool_t c_track_times = 0;
+    herr_t  ret;
 
-  /*
-   * Call H5Pget_obj_track_times function.
-   */
-  ret = H5Pget_obj_track_times((hid_t)*plist_id, &c_track_times);
+    /*
+     * Call H5Pget_obj_track_times function.
+     */
+    ret = H5Pget_obj_track_times((hid_t)*plist_id, &c_track_times);
 
-  if (ret < 0) return ret_value; /* error occurred */
+    if (ret < 0)
+        return ret_value; /* error occurred */
 
-  *flag = 0;
-  if(c_track_times > 0) *flag = 1;
-  ret_value = 0;
-  return ret_value;
+    *flag = 0;
+    if (c_track_times > 0)
+        *flag = 1;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pset_obj_track_times_c
  * NAME
- *        h5pset_obj_track_times_c
+ *  h5pset_obj_track_times_c
  * PURPOSE
- *     Call H5Pset_obj_track_times
+ *  Call H5Pset_obj_track_times
  *
  * INPUTS
- *      plist_id - property list id
- *              flag     - TRUE/FALSE flag
+ *  plist_id - property list id
+ *  flag     - TRUE/FALSE flag
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              February 22, 2008
+ *  February 22, 2008
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5pset_obj_track_times_c(hid_t_f *plist_id, int_f *flag)
+h5pset_obj_track_times_c(hid_t_f *plist_id, int_f *flag)
 /******/
 {
-  int ret_value = -1;
-  hbool_t c_track_times;
-  herr_t ret;
-
+    int     ret_value = -1;
+    hbool_t c_track_times;
+    herr_t  ret;
 
-  c_track_times = (hbool_t)*flag;
+    c_track_times = (hbool_t)*flag;
 
-  /*
-   * Call H5Pset_obj_track_times function.
-   */
-  ret = H5Pset_obj_track_times((hid_t)*plist_id, c_track_times);
+    /*
+     * Call H5Pset_obj_track_times function.
+     */
+    ret = H5Pset_obj_track_times((hid_t)*plist_id, c_track_times);
 
-  if (ret < 0) return ret_value; /* error occurred */
-  ret_value = 0;
-  return ret_value;
+    if (ret < 0)
+        return ret_value; /* error occurred */
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pset_create_inter_group_c
  * NAME
- *        h5pset_create_inter_group_c
+ *  h5pset_create_inter_group_c
  * PURPOSE
- *     Calls H5Pset_create_intermediate_group
+ *  Calls H5Pset_create_intermediate_group
  *
  * INPUTS
  *
- *		lcpl_id - Link creation property list identifier
- *   crt_intermed_group - crt_intermed_group specifying whether
- *                        to create intermediate groups upon the
- *                        creation of an object
+ *  lcpl_id - Link creation property list identifier
+ *  crt_intermed_group - crt_intermed_group specifying whether
+ *                       to create intermediate groups upon the
+ *                       creation of an object
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              February 22, 2008
+ *  February 22, 2008
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5pset_create_inter_group_c(hid_t_f *lcpl_id, int_f *crt_intermed_group)
+h5pset_create_inter_group_c(hid_t_f *lcpl_id, int_f *crt_intermed_group)
 /******/
 {
-  int ret_value = -1;
-  herr_t ret;
+    int    ret_value = -1;
+    herr_t ret;
 
-  /*
-   * Call H5Pset_create_intermediate_group function.
-   */
-  ret = H5Pset_create_intermediate_group((hid_t)*lcpl_id, (unsigned)*crt_intermed_group);
+    /*
+     * Call H5Pset_create_intermediate_group function.
+     */
+    ret = H5Pset_create_intermediate_group((hid_t)*lcpl_id, (unsigned)*crt_intermed_group);
 
-  if (ret < 0) return ret_value; /* error occurred */
-  ret_value = 0;
-  return ret_value;
+    if (ret < 0)
+        return ret_value; /* error occurred */
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pget_link_creation_order_c
  * NAME
- *        h5pget_link_creation_order_c
+ *  h5pget_link_creation_order_c
  * PURPOSE
- *     Calls H5Pget_link_creation_order
+ *  Calls H5Pget_link_creation_order
  *
  * INPUTS
  *
- *           gcpl_id - Group creation property list identifier
+ *  gcpl_id - Group creation property list identifier
  * OUTPUTS
  *
- *           crt_order_flags - Creation order flag(s)
+ *  crt_order_flags - Creation order flag(s)
  *
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              March 3, 2008
+ *  March 3, 2008
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pget_link_creation_order_c(hid_t_f *gcpl_id, int_f *crt_order_flags)
+h5pget_link_creation_order_c(hid_t_f *gcpl_id, int_f *crt_order_flags)
 /******/
 {
-  int ret_value = -1;
-  herr_t ret;
+    int    ret_value = -1;
+    herr_t ret;
 
-  unsigned c_crt_order_flags;
-  /*
-   * Call h5pget_link_creation_order function.
-   */
+    unsigned c_crt_order_flags;
+    /*
+     * Call h5pget_link_creation_order function.
+     */
 
-  ret = H5Pget_link_creation_order((hid_t)*gcpl_id, &c_crt_order_flags);
-  if (ret < 0) return ret_value;
+    ret = H5Pget_link_creation_order((hid_t)*gcpl_id, &c_crt_order_flags);
+    if (ret < 0)
+        return ret_value;
 
-  *crt_order_flags = (int_f)c_crt_order_flags;
+    *crt_order_flags = (int_f)c_crt_order_flags;
 
-  ret_value = 0;
-  return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pset_char_encoding_c
  * NAME
- *     h5pset_char_encoding_c
+ *  h5pset_char_encoding_c
  * PURPOSE
  *  Calls H5Pset_char_encoding
  *
  * INPUTS
  *
- *           plist_id - Property list identifier
- *           encoding - String encoding character set:
- *     	                     H5T_CSET_ASCII_F -> US ASCII
- *     	                     H5T_CSET_UTF8_F -> UTF-8 Unicode encoding
+ *  plist_id - Property list identifier
+ *  encoding - String encoding character set:
+ *                              H5T_CSET_ASCII_F -> US ASCII
+ *                              H5T_CSET_UTF8_F -> UTF-8 Unicode encoding
  * OUTPUTS
  *  NONE
  *
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              March 3, 2008
+ *  March 3, 2008
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pset_char_encoding_c(hid_t_f *plist_id, int_f *encoding)
+h5pset_char_encoding_c(hid_t_f *plist_id, int_f *encoding)
 /******/
 {
-  int ret_value = -1;
-  herr_t ret;
+    int    ret_value = -1;
+    herr_t ret;
 
-  /*
-   * Call H5Pset_char_encoding function.
-   */
-  ret = H5Pset_char_encoding((hid_t)*plist_id, (H5T_cset_t)*encoding);
-  if (ret < 0) return ret_value;
+    /*
+     * Call H5Pset_char_encoding function.
+     */
+    ret = H5Pset_char_encoding((hid_t)*plist_id, (H5T_cset_t)*encoding);
+    if (ret < 0)
+        return ret_value;
 
-  ret_value = 0;
-  return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
-
 /****if* H5Pf/h5pget_char_encoding_c
  * NAME
- *     h5pget_char_encoding_c
+ *  h5pget_char_encoding_c
  * PURPOSE
  *  Calls H5Pget_char_encoding
  *
  * INPUTS
  *
- *           plist_id - Property list identifier
+ *  plist_id - Property list identifier
  * OUTPUTS
  *
- *           encoding - Encoding character set:
- *     	                  H5T_CSET_ASCII_F -> US ASCII
- *     	                  H5T_CSET_UTF8_F -> UTF-8 Unicode encoding
+ *  encoding - Encoding character set:
+ *                           H5T_CSET_ASCII_F -> US ASCII
+ *                           H5T_CSET_UTF8_F -> UTF-8 Unicode encoding
  *
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              March 3, 2008
+ *  March 3, 2008
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pget_char_encoding_c(hid_t_f *plist_id, int_f *encoding)
+h5pget_char_encoding_c(hid_t_f *plist_id, int_f *encoding)
 /******/
 {
-  int ret_value = -1;
-  H5T_cset_t c_encoding;
-  herr_t ret;
-  /*
-   * Call H5Pget_char_encoding function.
-   */
-  ret = H5Pget_char_encoding((hid_t)*plist_id, &c_encoding);
-  if (ret < 0) return ret_value;
+    int        ret_value = -1;
+    H5T_cset_t c_encoding;
+    herr_t     ret;
+    /*
+     * Call H5Pget_char_encoding function.
+     */
+    ret = H5Pget_char_encoding((hid_t)*plist_id, &c_encoding);
+    if (ret < 0)
+        return ret_value;
 
-  *encoding = (int_f)c_encoding;
+    *encoding = (int_f)c_encoding;
 
-  ret_value = 0;
-  return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pset_copy_object_c
  * NAME
- *     h5pset_copy_object_c
+ *  h5pset_copy_object_c
  * PURPOSE
  *  Calls H5Pset_copy_object
  *
  * INPUTS
  *
- *    ocp_plist_id - Object copy property list identifier
- *    copy_options - Copy option(s) to be set
+ *  ocp_plist_id - Object copy property list identifier
+ *  copy_options - Copy option(s) to be set
  *
  * OUTPUTS
  *
  *            NONE
  *
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              March 3, 2008
+ *  March 3, 2008
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pset_copy_object_c(hid_t_f *ocp_plist_id, int_f *copy_options)
+h5pset_copy_object_c(hid_t_f *ocp_plist_id, int_f *copy_options)
 /******/
 {
-  int ret_value = -1;
-  herr_t ret;
-  /*
-   * Call H5Pset_copy_object function.
-   */
-  ret = H5Pset_copy_object((hid_t)*ocp_plist_id, (unsigned)*copy_options);
-  if (ret < 0) return ret_value;
+    int    ret_value = -1;
+    herr_t ret;
+    /*
+     * Call H5Pset_copy_object function.
+     */
+    ret = H5Pset_copy_object((hid_t)*ocp_plist_id, (unsigned)*copy_options);
+    if (ret < 0)
+        return ret_value;
 
-  ret_value = 0;
-  return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pget_copy_object_c
  * NAME
- *     h5pget_copy_object_c
+ *  h5pget_copy_object_c
  * PURPOSE
  *  Calls H5Pget_copy_object
  *
  * INPUTS
  *
- *    ocp_plist_id - Object copy property list identifier
+ *  ocp_plist_id - Object copy property list identifier
  *
  * OUTPUTS
  *
- *    copy_options - Copy option(s) to be get
+ *  copy_options - Copy option(s) to be get
  *
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              March 3, 2008
+ *  March 3, 2008
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pget_copy_object_c(hid_t_f *ocp_plist_id, int_f *copy_options)
+h5pget_copy_object_c(hid_t_f *ocp_plist_id, int_f *copy_options)
 /******/
 {
-  int ret_value = -1;
-  unsigned c_copy_options;
-  herr_t ret;
-  /*
-   * Call H5Pget_copy_object function.
-   */
-  ret = H5Pget_copy_object((hid_t)*ocp_plist_id, &c_copy_options);
-  if (ret < 0) return ret_value;
+    int      ret_value = -1;
+    unsigned c_copy_options;
+    herr_t   ret;
+    /*
+     * Call H5Pget_copy_object function.
+     */
+    ret = H5Pget_copy_object((hid_t)*ocp_plist_id, &c_copy_options);
+    if (ret < 0)
+        return ret_value;
 
-  *copy_options = (int_f)c_copy_options;
+    *copy_options = (int_f)c_copy_options;
 
-  ret_value = 0;
-  return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pget_data_transform_c
  * NAME
- *        h5pget_data_transform_c
+ *  h5pget_data_transform_c
  * PURPOSE
- *     Calls H5Pget_data_transform
+ *  Calls H5Pget_data_transform
  * INPUTS
  *
- *              prp_id - property list identifier to query
- *      expression_len - buffer size transorm expression
+ *  prp_id - property list identifier to query
+ *  expression_len - buffer size transform expression
  *
- * Output:
- *          expression - buffer to hold transform expression
+ *  Output:
+ *  expression - buffer to hold transform expression
  *
  * RETURNS
  *
- *          Success:  0
- *	    Failure: -1
+ *  Success:  0
+ *  Failure: -1
  *
  * AUTHOR
  *  M. Scot Breitenfeld
- *              March 19, 2008
+ *  March 19, 2008
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pget_data_transform_c(hid_t_f *plist_id, _fcd expression, int_f *expression_len, size_t_f *size)
+h5pget_data_transform_c(hid_t_f *plist_id, _fcd expression, int_f *expression_len, size_t_f *size)
 /******/
 {
-    char *c_expression = NULL;          /* Buffer to hold C string */
-    size_t c_expression_len = (size_t)*expression_len + 1;
+    char   *c_expression     = NULL; /* Buffer to hold C string */
+    size_t  c_expression_len = (size_t)*expression_len + 1;
     ssize_t ret;
-    int_f ret_value = 0;
+    int_f   ret_value = 0;
 
     /*
      * Allocate memory to store the expression.
      */
-    if(c_expression_len) {
+    if (c_expression_len) {
         c_expression = (char *)HDmalloc(c_expression_len);
-        if(NULL == c_expression)
-           HGOTO_DONE(FAIL)
+        if (NULL == c_expression)
+            HGOTO_DONE(FAIL)
     } /* end if */
 
     /*
      * Call H5Pget_data_transform function.
      */
     ret = H5Pget_data_transform((hid_t)*plist_id, c_expression, c_expression_len);
-    if(ret < 0)
-       HGOTO_DONE(FAIL)
+    if (ret < 0)
+        HGOTO_DONE(FAIL)
 
     /* or strlen ? */
     HD5packFstring(c_expression, _fcdtocp(expression), (size_t)*expression_len);
@@ -4932,7 +4654,7 @@ nh5pget_data_transform_c(hid_t_f *plist_id, _fcd expression, int_f *expression_l
     *size = (size_t_f)ret;
 
 done:
-    if(c_expression)
+    if (c_expression)
         HDfree(c_expression);
 
     return ret_value;
@@ -4940,419 +4662,438 @@ done:
 
 /****if* H5Pf/h5pset_data_transform_c
  * NAME
- *        h5pset_data_transform_c
+ *  h5pset_data_transform_c
  * PURPOSE
- *     Calls H5Pset_data_transform
+ *  Calls H5Pset_data_transform
  * INPUTS
  *
- *              prp_id - property list identifier to query
- *          expression - buffer to hold transform expression
- *      expression_len - buffer size transorm expression
+ *  prp_id - property list identifier to query
+ *  expression - buffer to hold transform expression
+ *  expression_len - buffer size transform expression
  *
- * Output:
+ *  Output:
  *
  * RETURNS
  *
- *          Success:  0
- *	    Failure: -1
+ *  Success:  0
+ *  Failure: -1
  *
  * AUTHOR
  *  M. Scot Breitenfeld
- *              March 19, 2008
+ *  March 19, 2008
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pset_data_transform_c(hid_t_f *plist_id, _fcd expression, int_f *expression_len)
+h5pset_data_transform_c(hid_t_f *plist_id, _fcd expression, int_f *expression_len)
 /******/
 {
-     char* c_expression = NULL; /* Buffer to hold C string */
-     int_f ret_value = 0; /* Return value */
+    char *c_expression = NULL; /* Buffer to hold C string */
+    int_f ret_value    = 0;    /* Return value */
 
-     /*
-      * Convert FORTRAN name to C name
-      */
-     if(NULL == (c_expression = HD5f2cstring(expression, (size_t)*expression_len)))
+    /*
+     * Convert FORTRAN name to C name
+     */
+    if (NULL == (c_expression = HD5f2cstring(expression, (size_t)*expression_len)))
         HGOTO_DONE(FAIL)
 
-     /*
-      * Call H5Pset_data_transform function.
-      */
-     if(H5Pset_data_transform((hid_t)*plist_id, c_expression) < 0)
+    /*
+     * Call H5Pset_data_transform function.
+     */
+    if (H5Pset_data_transform((hid_t)*plist_id, c_expression) < 0)
         HGOTO_DONE(FAIL)
 
 done:
-    if(c_expression)
+    if (c_expression)
         HDfree(c_expression);
 
-     return ret_value;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pget_local_heap_size_hint_c
  * NAME
- *        h5pget_local_heap_size_hint_c
+ *  h5pget_local_heap_size_hint_c
  * PURPOSE
- *     Calls H5Pget_local_heap_size_hint
+ *  Calls H5Pget_local_heap_size_hint
  * INPUTS
  *
- *         gcpl_id - Group creation property list identifier
+ *  gcpl_id - Group creation property list identifier
  *
- * Output:
- *       size_hint - Hint for size of local heap
+ *  Output:
+ *  size_hint - Hint for size of local heap
  * RETURNS
  *
- *          Success:  0
- *	    Failure: -1
+ *  Success:  0
+ *  Failure: -1
  *
  * AUTHOR
  *  M. Scot Breitenfeld
- *              March 21, 2008
+ *  March 21, 2008
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pget_local_heap_size_hint_c(hid_t_f *gcpl_id, size_t_f *size_hint)
+h5pget_local_heap_size_hint_c(hid_t_f *gcpl_id, size_t_f *size_hint)
 /******/
 {
-     int_f ret_value = -1; /* Return value */
-     size_t c_size_hint;
-     herr_t ret;
-     /*
-      * Call H5Pget_local_heap_size_hint function.
-      */
-     ret = H5Pget_local_heap_size_hint((hid_t)*gcpl_id, &c_size_hint);
-     if(ret<0) return ret_value;
+    int_f  ret_value = -1; /* Return value */
+    size_t c_size_hint;
+    herr_t ret;
+    /*
+     * Call H5Pget_local_heap_size_hint function.
+     */
+    ret = H5Pget_local_heap_size_hint((hid_t)*gcpl_id, &c_size_hint);
+    if (ret < 0)
+        return ret_value;
 
-     *size_hint = (size_t_f)c_size_hint;
-     ret_value = 0;
-     return ret_value;
+    *size_hint = (size_t_f)c_size_hint;
+    ret_value  = 0;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pget_est_link_info_c
  * NAME
- *        h5pget_est_link_info_c
+ *  h5pget_est_link_info_c
  * PURPOSE
- *     Calls H5Pget_est_link_info
+ *  Calls H5Pget_est_link_info
  * INPUTS
  *
- *              gcpl_id - Group creation property list identifier
+ *  gcpl_id - Group creation property list identifier
  *
- * Output:
- *      est_num_entries - Estimated number of links to be inserted into group
- *         est_name_len - Estimated average length of link names
+ *  Output:
+ *  est_num_entries - Estimated number of links to be inserted into group
+ *  est_name_len - Estimated average length of link names
  * RETURNS
  *
- *          Success:  0
- *	    Failure: -1
+ *  Success:  0
+ *  Failure: -1
  *
  * AUTHOR
  *  M. Scot Breitenfeld
- *              March 21, 2008
+ *  March 21, 2008
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pget_est_link_info_c(hid_t_f *gcpl_id, int_f *est_num_entries, int_f *est_name_len)
+h5pget_est_link_info_c(hid_t_f *gcpl_id, int_f *est_num_entries, int_f *est_name_len)
 /******/
 {
-     int_f ret_value = -1; /* Return value */
-     unsigned c_est_num_entries;
-     unsigned c_est_name_len;
-     herr_t ret;
-     /*
-      * Call h5pget_est_link_info function.
-      */
-     ret = H5Pget_est_link_info((hid_t)*gcpl_id, &c_est_num_entries, &c_est_name_len);
-     if(ret<0) return ret_value;
+    int_f    ret_value = -1; /* Return value */
+    unsigned c_est_num_entries;
+    unsigned c_est_name_len;
+    herr_t   ret;
+    /*
+     * Call h5pget_est_link_info function.
+     */
+    ret = H5Pget_est_link_info((hid_t)*gcpl_id, &c_est_num_entries, &c_est_name_len);
+    if (ret < 0)
+        return ret_value;
 
-     *est_num_entries = (int_f)c_est_num_entries;
-     *est_name_len = (int_f)c_est_name_len;
+    *est_num_entries = (int_f)c_est_num_entries;
+    *est_name_len    = (int_f)c_est_name_len;
 
-     ret_value = 0;
-     return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pset_local_heap_size_hint_c
  * NAME
- *        h5pset_local_heap_size_hint_c
+ *  h5pset_local_heap_size_hint_c
  * PURPOSE
- *     Calls H5Pset_local_heap_size_hint
+ *  Calls H5Pset_local_heap_size_hint
  * INPUTS
  *
- *         gcpl_id - Group creation property list identifier
- *       size_hint - Hint for size of local heap
+ *  gcpl_id - Group creation property list identifier
+ *  size_hint - Hint for size of local heap
  *
- * Output:
+ *  Output:
  *
  * RETURNS
  *
- *          Success:  0
- *	    Failure: -1
+ *  Success:  0
+ *  Failure: -1
  *
  * AUTHOR
  *  M. Scot Breitenfeld
- *              March 21, 2008
+ *  March 21, 2008
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pset_local_heap_size_hint_c(hid_t_f *gcpl_id, size_t_f *size_hint)
+h5pset_local_heap_size_hint_c(hid_t_f *gcpl_id, size_t_f *size_hint)
 /******/
 {
-     int_f ret_value = -1; /* Return value */
-     herr_t ret;
-     /*
-      * Call H5Pget_local_heap_size_hint function.
-      */
-     ret = H5Pset_local_heap_size_hint((hid_t)*gcpl_id, (size_t)*size_hint);
-     if(ret<0) return ret_value;
+    int_f  ret_value = -1; /* Return value */
+    herr_t ret;
+    /*
+     * Call H5Pget_local_heap_size_hint function.
+     */
+    ret = H5Pset_local_heap_size_hint((hid_t)*gcpl_id, (size_t)*size_hint);
+    if (ret < 0)
+        return ret_value;
 
-     ret_value = 0;
-     return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pset_est_link_info_c
  * NAME
- *        h5pset_est_link_info_c
+ *  h5pset_est_link_info_c
  * PURPOSE
- *     Calls H5Pset_est_link_info
+ *  Calls H5Pset_est_link_info
  * INPUTS
  *
- *              gcpl_id - Group creation property list identifier
- *      est_num_entries - Estimated number of links to be inserted into group
- *         est_name_len - Estimated average length of link names
+ *  gcpl_id - Group creation property list identifier
+ *  est_num_entries - Estimated number of links to be inserted into group
+ *  est_name_len - Estimated average length of link names
  *
- * Output:
+ *  Output:
  * RETURNS
  *
- *          Success:  0
- *	    Failure: -1
+ *  Success:  0
+ *  Failure: -1
  *
  * AUTHOR
  *  M. Scot Breitenfeld
- *              March 21, 2008
+ *  March 21, 2008
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pset_est_link_info_c(hid_t_f *gcpl_id, int_f *est_num_entries, int_f *est_name_len)
+h5pset_est_link_info_c(hid_t_f *gcpl_id, int_f *est_num_entries, int_f *est_name_len)
 /******/
 {
-     int_f ret_value = -1; /* Return value */
-     herr_t ret;
-     /*
-      * Call h5pset_est_link_info function.
-      */
-     ret = H5Pset_est_link_info((hid_t)*gcpl_id, (unsigned)*est_num_entries, (unsigned)*est_name_len);
-     if(ret<0) return ret_value;
+    int_f  ret_value = -1; /* Return value */
+    herr_t ret;
+    /*
+     * Call h5pset_est_link_info function.
+     */
+    ret = H5Pset_est_link_info((hid_t)*gcpl_id, (unsigned)*est_num_entries, (unsigned)*est_name_len);
+    if (ret < 0)
+        return ret_value;
 
-     ret_value = 0;
-     return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pset_link_phase_change_c
  * NAME
- *        h5pset_link_phase_change_c
+ *  h5pset_link_phase_change_c
  * PURPOSE
- *     Calls H5Pset_link_phase_change
+ *  Calls H5Pset_link_phase_change
  *
  * INPUTS
- *      gcpl_id     - Group creation property list identifier
- *              max_compact - Maximum number of attributes to be stored in compact storage
- *              min_dense   - Minimum number of attributes to be stored in dense storage
- * Outputs
+ *  gcpl_id     - Group creation property list identifier
+ *  max_compact - Maximum number of attributes to be stored in compact storage
+ *  min_dense   - Minimum number of attributes to be stored in dense storage
+ *  Outputs
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              March 21, 2008
+ *  March 21, 2008
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pset_link_phase_change_c(hid_t_f *gcpl_id, int_f *max_compact, int_f *min_dense )
+h5pset_link_phase_change_c(hid_t_f *gcpl_id, int_f *max_compact, int_f *min_dense)
 /******/
 {
-  int ret_value = -1;
-  herr_t ret;
+    int    ret_value = -1;
+    herr_t ret;
 
-  /*
-   * Call H5Pset_link_phase_change function.
-   */
-  ret = H5Pset_link_phase_change((hid_t)*gcpl_id, (unsigned)*max_compact,(unsigned)*min_dense);
-  if (ret < 0) return ret_value;
+    /*
+     * Call H5Pset_link_phase_change function.
+     */
+    ret = H5Pset_link_phase_change((hid_t)*gcpl_id, (unsigned)*max_compact, (unsigned)*min_dense);
+    if (ret < 0)
+        return ret_value;
 
-  ret_value = 0;
-  return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pset_fapl_direct_c
  * NAME
- *        h5pset_fapl_direct_c
+ *  h5pset_fapl_direct_c
  * PURPOSE
- *     Calls H5Pset_fapl_direct
+ *  Calls H5Pset_fapl_direct
  *
  * INPUTS
  *
- *    fapl_id 	 - File access property list identifier
- *    alignment  - Required memory alignment boundary
- *    block_size - File system block size
- *    cbuf_size  - Copy buffer size
- * Outputs
+ *  fapl_id    - File access property list identifier
+ *  alignment  - Required memory alignment boundary
+ *  block_size - File system block size
+ *  cbuf_size  - Copy buffer size
+ *  Outputs
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              March 21, 2008
+ *  March 21, 2008
  * HISTORY
  *
  * SOURCE
-*/
+ */
+#ifndef H5_HAVE_DIRECT
+/* Only gets gcc const attribute when the direct VFD is not built. */
+H5_ATTR_CONST
+#endif
 int_f
-nh5pset_fapl_direct_c(hid_t_f UNUSED *fapl_id, size_t_f UNUSED *alignment, size_t_f UNUSED *block_size, size_t_f UNUSED *cbuf_size)
+h5pset_fapl_direct_c(hid_t_f H5_ATTR_UNUSED *fapl_id, size_t_f H5_ATTR_UNUSED *alignment,
+                     size_t_f H5_ATTR_UNUSED *block_size, size_t_f H5_ATTR_UNUSED *cbuf_size)
 /******/
 {
-  int ret_value = -1;
+    int ret_value = -1;
 #ifdef H5_HAVE_DIRECT
-  herr_t ret;
+    herr_t ret;
 
-  /*
-   * Call H5Pset_link_phase_change function.
-   */
-  ret = H5Pset_fapl_direct((hid_t)*fapl_id, (size_t)*alignment, (size_t)*block_size, (size_t)*cbuf_size );
-    if (ret < 0) return ret_value;
+    /*
+     * Call H5Pset_link_phase_change function.
+     */
+    ret = H5Pset_fapl_direct((hid_t)*fapl_id, (size_t)*alignment, (size_t)*block_size, (size_t)*cbuf_size);
+    if (ret < 0)
+        return ret_value;
 
-  ret_value = 0;
+    ret_value = 0;
 
 #endif
-  return ret_value;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pget_fapl_direct_c
  * NAME
- *        h5pget_fapl_direct_c
+ *  h5pget_fapl_direct_c
  * PURPOSE
- *     Calls H5Pget_fapl_direct
+ *  Calls H5Pget_fapl_direct
  *
  * INPUTS
  *
- *    fapl_id 	 - File access property list identifier
+ *  fapl_id    - File access property list identifier
  * OUTPUTS
  *
- *    alignment  - Required memory alignment boundary
- *    block_size - File system block size
- *    cbuf_size  - Copy buffer size
+ *  alignment  - Required memory alignment boundary
+ *  block_size - File system block size
+ *  cbuf_size  - Copy buffer size
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              March 21, 2008
+ *  March 21, 2008
  * HISTORY
  *
  * SOURCE
-*/
+ */
+#ifndef H5_HAVE_DIRECT
+/* Only gets gcc const attribute when the direct VFD is not built. */
+H5_ATTR_CONST
+#endif
 int_f
-nh5pget_fapl_direct_c(hid_t_f UNUSED *fapl_id, size_t_f UNUSED *alignment, size_t_f UNUSED *block_size, size_t_f UNUSED *cbuf_size)
+h5pget_fapl_direct_c(hid_t_f H5_ATTR_UNUSED *fapl_id, size_t_f H5_ATTR_UNUSED *alignment,
+                     size_t_f H5_ATTR_UNUSED *block_size, size_t_f H5_ATTR_UNUSED *cbuf_size)
 /******/
 {
-  int ret_value = -1;
+    int ret_value = -1;
 #ifdef H5_HAVE_DIRECT
-  herr_t ret;
-  size_t c_alignment;
-  size_t c_block_size;
-  size_t c_cbuf_size;
-
-  /*
-   * Call H5Pget_link_phase_change function.
-   */
-  ret = H5Pget_fapl_direct((hid_t)*fapl_id, &c_alignment, &c_block_size, &c_cbuf_size );
-  if (ret < 0) return ret_value;
-
-  *alignment  = (size_t_f)c_alignment;
-  *block_size = (size_t_f)c_block_size;
-  *cbuf_size  = (size_t_f)c_cbuf_size;
-
-  ret_value = 0;
+    herr_t ret;
+    size_t c_alignment;
+    size_t c_block_size;
+    size_t c_cbuf_size;
+
+    /*
+     * Call H5Pget_link_phase_change function.
+     */
+    ret = H5Pget_fapl_direct((hid_t)*fapl_id, &c_alignment, &c_block_size, &c_cbuf_size);
+    if (ret < 0)
+        return ret_value;
+
+    *alignment  = (size_t_f)c_alignment;
+    *block_size = (size_t_f)c_block_size;
+    *cbuf_size  = (size_t_f)c_cbuf_size;
+
+    ret_value = 0;
 #endif
-  return ret_value;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pset_attr_phase_change_c
  * NAME
- *        h5pset_attr_phase_change_c
+ *  h5pset_attr_phase_change_c
  * PURPOSE
- *     Calls H5Pset_attr_phase_change
+ *  Calls H5Pset_attr_phase_change
  *
  * INPUTS
- *      ocpl_id		- Object (dataset or group) creation property list identifier
- *              max_compact     - Maximum number of attributes to be stored in compact storage
- *              min_dense       - Minimum number of attributes to be stored in dense storage
+ *  ocpl_id        - Object (dataset or group) creation property list identifier
+ *  max_compact    - Maximum number of attributes to be stored in compact storage
+ *  min_dense      - Minimum number of attributes to be stored in dense storage
  * OUTPUTS
  *
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              March 21, 2008
+ *  March 21, 2008
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pset_attr_phase_change_c(hid_t_f *ocpl_id, int_f *max_compact, int_f *min_dense )
+h5pset_attr_phase_change_c(hid_t_f *ocpl_id, int_f *max_compact, int_f *min_dense)
 /******/
 {
-  int ret_value = -1;
-  herr_t ret;
-  /*
-   * Call H5Pset_attr_phase_change function.
-   */
-  ret = H5Pset_attr_phase_change((hid_t)*ocpl_id, (unsigned)*max_compact,(unsigned)*min_dense);
-  if (ret < 0) return ret_value;
+    int    ret_value = -1;
+    herr_t ret;
+    /*
+     * Call H5Pset_attr_phase_change function.
+     */
+    ret = H5Pset_attr_phase_change((hid_t)*ocpl_id, (unsigned)*max_compact, (unsigned)*min_dense);
+    if (ret < 0)
+        return ret_value;
 
-  ret_value = 0;
-  return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pset_nbit_c
  * NAME
- *        h5pset_nbit_c
+ *  h5pset_nbit_c
  * PURPOSE
- *     Calls H5Pset_nbit
+ *  Calls H5Pset_nbit
  *
  * INPUTS
- *      plist_id - Dataset creation property list identifier
+ *  plist_id - Dataset creation property list identifier
  * OUTPUTS
  *
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              March 21, 2008
+ *  March 21, 2008
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pset_nbit_c(hid_t_f *plist_id )
+h5pset_nbit_c(hid_t_f *plist_id)
 /******/
 {
-  int ret_value = -1;
-  herr_t ret;
-  /*
-   * Call H5Pset_nbit_change function.
-   */
-  ret = H5Pset_nbit((hid_t)*plist_id);
-  if (ret < 0) return ret_value;
+    int    ret_value = -1;
+    herr_t ret;
+    /*
+     * Call H5Pset_nbit_change function.
+     */
+    ret = H5Pset_nbit((hid_t)*plist_id);
+    if (ret < 0)
+        return ret_value;
 
-  ret_value = 0;
-  return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 /****if* H5Pf/h5pset_scaleoffset_c
  * NAME
@@ -5371,24 +5112,25 @@ nh5pset_nbit_c(hid_t_f *plist_id )
  *  M. Scot Breitenfeld
  *  March 21, 2008
  * SOURCE
-*/
+ */
 int_f
-nh5pset_scaleoffset_c(hid_t_f *plist_id, int_f *scale_type, int_f *scale_factor )
+h5pset_scaleoffset_c(hid_t_f *plist_id, int_f *scale_type, int_f *scale_factor)
 /******/
 {
-  int ret_value = -1;
-  H5Z_SO_scale_type_t c_scale_type;
-  herr_t ret;
-  /*
-   * Call H5Pset_scaleoffset_change function.
-   */
-  c_scale_type = (H5Z_SO_scale_type_t)*scale_type;
+    int                 ret_value = -1;
+    H5Z_SO_scale_type_t c_scale_type;
+    herr_t              ret;
+    /*
+     * Call H5Pset_scaleoffset_change function.
+     */
+    c_scale_type = (H5Z_SO_scale_type_t)*scale_type;
 
-  ret = H5Pset_scaleoffset((hid_t)*plist_id, c_scale_type, (int)*scale_factor);
-  if (ret < 0) return ret_value;
+    ret = H5Pset_scaleoffset((hid_t)*plist_id, c_scale_type, (int)*scale_factor);
+    if (ret < 0)
+        return ret_value;
 
-  ret_value = 0;
-  return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pset_nlinks
@@ -5406,237 +5148,551 @@ nh5pset_scaleoffset_c(hid_t_f *plist_id, int_f *scale_type, int_f *scale_factor
  *  M. Scot Breitenfeld
  *  March 24, 2008
  * SOURCE
-*/
+ */
 int_f
-nh5pset_nlinks_c(hid_t_f *lapl_id, size_t_f *nlinks)
+h5pset_nlinks_c(hid_t_f *lapl_id, size_t_f *nlinks)
 /******/
 {
-  int ret_value = -1;
-  herr_t ret;
-  /*
-   * Call H5Pset_nlinks function.
-   */
-  ret = H5Pset_nlinks((hid_t)*lapl_id, (size_t)*nlinks);
-  if (ret < 0) return ret_value;
+    int    ret_value = -1;
+    herr_t ret;
+    /*
+     * Call H5Pset_nlinks function.
+     */
+    ret = H5Pset_nlinks((hid_t)*lapl_id, (size_t)*nlinks);
+    if (ret < 0)
+        return ret_value;
 
-  ret_value = 0;
-  return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pget_nlinks
  * NAME
- *        h5pget_nlinks
+ *  h5pget_nlinks
  * PURPOSE
- *     Calls H5Pget_nlinks
+ *  Calls H5Pget_nlinks
  *
  * INPUTS
  *
- *            lapl_id - File access property list identifier
+ *  lapl_id - File access property list identifier
  *
  * OUTPUTS
  *
- *             nlinks - Maximum number of links to traverse
+ *  nlinks - Maximum number of links to traverse
  *
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              March 24, 2008
+ *  March 24, 2008
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pget_nlinks_c(hid_t_f *lapl_id, size_t_f *nlinks)
+h5pget_nlinks_c(hid_t_f *lapl_id, size_t_f *nlinks)
 /******/
 {
-  int ret_value = -1;
-  herr_t ret;
-  size_t c_nlinks;
-  /*
-   * Call H5Pget_nlinks function.
-   */
-  ret = H5Pget_nlinks((hid_t)*lapl_id, &c_nlinks);
-  if (ret < 0) return ret_value;
+    int    ret_value = -1;
+    herr_t ret;
+    size_t c_nlinks;
+    /*
+     * Call H5Pget_nlinks function.
+     */
+    ret = H5Pget_nlinks((hid_t)*lapl_id, &c_nlinks);
+    if (ret < 0)
+        return ret_value;
 
-  *nlinks = (size_t_f)c_nlinks;
-  ret_value = 0;
-  return ret_value;
+    *nlinks   = (size_t_f)c_nlinks;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Pf/h5pget_create_inter_group_c
  * NAME
- *        h5pget_create_inter_group_c
+ *  h5pget_create_inter_group_c
  * PURPOSE
- *     Calls H5Pget_create_intermediate_group
+ *  Calls H5Pget_create_intermediate_group
  *
  * INPUTS
  *
- *		lcpl_id - Link creation property list identifier
- *   crt_intermed_group - Specifying whether to create intermediate groups upon
- *                        the creation of an object
+ *  lcpl_id - Link creation property list identifier
+ *  crt_intermed_group - Specifying whether to create intermediate groups upon
+ *  the creation of an object
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              April 4, 2008
+ *  April 4, 2008
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5pget_create_inter_group_c(hid_t_f *lcpl_id, int_f *crt_intermed_group)
+h5pget_create_inter_group_c(hid_t_f *lcpl_id, int_f *crt_intermed_group)
 /******/
 {
-  int ret_value = -1;
-  herr_t ret;
-  unsigned c_crt_intermed_group;
+    int      ret_value = -1;
+    herr_t   ret;
+    unsigned c_crt_intermed_group;
 
-  /*
-   * Call H5Pget_create_intermediate_group function.
-   */
-  ret = H5Pget_create_intermediate_group((hid_t)*lcpl_id, &c_crt_intermed_group);
+    /*
+     * Call H5Pget_create_intermediate_group function.
+     */
+    ret = H5Pget_create_intermediate_group((hid_t)*lcpl_id, &c_crt_intermed_group);
 
-  if (ret < 0) return ret_value; /* error occurred */
+    if (ret < 0)
+        return ret_value; /* error occurred */
 
-  *crt_intermed_group = (int_f)c_crt_intermed_group;
-  ret_value = 0;
-  return ret_value;
+    *crt_intermed_group = (int_f)c_crt_intermed_group;
+    ret_value           = 0;
+    return ret_value;
 }
 
 /*----------------------------------------------------------------------------
- * Name:        h5pset_chunk_cache_c
- * Purpose:     Calls H5Pset_chunk_cache
- *
- * Inputs:	dapl_id            - Link creation property list identifier
- *              rdcc_nslots        -
- *              rdcc_nbytes        -
- *              rdcc_w0            -
- *
- * Returns:     0 on success, -1 on failure
- * Programmer:  M. Scot Breitenfeld
- *              April 13, 2009
- * Modifications:
+ *  Name:        h5pset_chunk_cache_c
+ *  Purpose:     Calls H5Pset_chunk_cache
+ *
+ *  Inputs:
+ *  dapl_id            - Link creation property list identifier
+ *  rdcc_nslots        -
+ *  rdcc_nbytes        -
+ *  rdcc_w0            -
+ *
+ *  Returns:     0 on success, -1 on failure
+ *  Programmer:  M. Scot Breitenfeld
+ *  April 13, 2009
+ *  Modifications:
  *---------------------------------------------------------------------------*/
 
 int_f
-nh5pset_chunk_cache_c(hid_t_f *dapl_id, size_t_f *rdcc_nslots, size_t_f *rdcc_nbytes, real_f *rdcc_w0)
+h5pset_chunk_cache_c(hid_t_f *dapl_id, size_t_f *rdcc_nslots, size_t_f *rdcc_nbytes, real_f *rdcc_w0)
 {
-  int ret_value = -1;
+    int ret_value = -1;
 
-  /*
-   * Call H5Pset_chunk_cache function.
-   */
-  if( (H5Pset_chunk_cache((hid_t)*dapl_id, (size_t)*rdcc_nslots, (size_t)*rdcc_nbytes, (double)*rdcc_w0)) <0 )
-    return ret_value; /* error occurred */
+    /*
+     * Call H5Pset_chunk_cache function.
+     */
+    if ((H5Pset_chunk_cache((hid_t)*dapl_id, (size_t)*rdcc_nslots, (size_t)*rdcc_nbytes, (double)*rdcc_w0)) <
+        0)
+        return ret_value; /* error occurred */
 
-  ret_value = 0;
-  return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /*----------------------------------------------------------------------------
- * Name:        h5pget_chunk_cache_c
- * Purpose:     Calls H5Pget_chunk_cache
- *
- * Inputs:	dapl_id            - Link creation property list identifier
- * Outputs:
- *              rdcc_nslots        -
- *              rdcc_nbytes        -
- *              rdcc_w0            -
- *
- * Returns:     0 on success, -1 on failure
- * Programmer:  M. Scot Breitenfeld
- *              April 13, 2009
- * Modifications:
+ *  Name:        h5pget_chunk_cache_c
+ *  Purpose:     Calls H5Pget_chunk_cache
+ *
+ *  Inputs:
+ *  dapl_id            - Link creation property list identifier
+ *  Outputs:
+ *  rdcc_nslots        -
+ *  rdcc_nbytes        -
+ *  rdcc_w0            -
+ *
+ *  Returns:     0 on success, -1 on failure
+ *  Programmer:  M. Scot Breitenfeld
+ *  April 13, 2009
+ *  Modifications:
  *---------------------------------------------------------------------------*/
 
 int_f
-nh5pget_chunk_cache_c(hid_t_f *dapl_id, size_t_f *rdcc_nslots, size_t_f *rdcc_nbytes, real_f *rdcc_w0)
+h5pget_chunk_cache_c(hid_t_f *dapl_id, size_t_f *rdcc_nslots, size_t_f *rdcc_nbytes, real_f *rdcc_w0)
 {
-  int ret_value = -1;
-  size_t c_rdcc_nslots;
-  size_t c_rdcc_nbytes;
-  double c_rdcc_w0;
-  /*
-   * Call H5Pget_chunk_cache function.
-   */
-  if( (H5Pget_chunk_cache((hid_t)*dapl_id, &c_rdcc_nslots, &c_rdcc_nbytes, &c_rdcc_w0)) <0 )
-    return ret_value; /* error occurred */
+    int    ret_value = -1;
+    size_t c_rdcc_nslots;
+    size_t c_rdcc_nbytes;
+    double c_rdcc_w0;
+    /*
+     * Call H5Pget_chunk_cache function.
+     */
+    if ((H5Pget_chunk_cache((hid_t)*dapl_id, &c_rdcc_nslots, &c_rdcc_nbytes, &c_rdcc_w0)) < 0)
+        return ret_value; /* error occurred */
 
-  *rdcc_nslots=(size_t_f)c_rdcc_nslots;
-  *rdcc_nbytes=(size_t_f)c_rdcc_nbytes;
-  *rdcc_w0=(real_f)c_rdcc_w0;
+    *rdcc_nslots = (size_t_f)c_rdcc_nslots;
+    *rdcc_nbytes = (size_t_f)c_rdcc_nbytes;
+    *rdcc_w0     = (real_f)c_rdcc_w0;
 
-  ret_value = 0;
-  return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /*----------------------------------------------------------------------------
- * Name:        h5pset_file_image_c
- * Purpose:     Calls H5Pset_file_image
+ *  Name:        h5pset_file_image_c
+ *  Purpose:     Calls H5Pset_file_image
  *
- * Inputs:
+ *  Inputs:
  *  fapl_id - File access property list identifier
- *  buf_ptr - Pointer to the initial file image, 
- *            or NULL if no initial file image is desired
+ *  buf_ptr - Pointer to the initial file image,
+ *  or NULL if no initial file image is desired
  *  buf_len - Size of the supplied buffer, or 0 (zero) if no initial image is desired
  *
- * Returns:     0 on success, -1 on failure
- * Programmer:  M. Scot Breitenfeld
- *              February 19, 2012
+ *  Returns:     0 on success, -1 on failure
+ *  Programmer:  M. Scot Breitenfeld
+ *  February 19, 2012
  *---------------------------------------------------------------------------*/
 
 int_f
 h5pset_file_image_c(hid_t_f *fapl_id, void *buf_ptr, size_t_f *buf_len)
 {
-  int ret_value = -1;
-  /*
-   * Call H5Pset_file_image function.
-   */
-  if( (H5Pset_file_image((hid_t)*fapl_id, buf_ptr, (size_t)*buf_len)) <0 )
-    return ret_value; /* error occurred */
+    int ret_value = -1;
+    /*
+     * Call H5Pset_file_image function.
+     */
+    if ((H5Pset_file_image((hid_t)*fapl_id, buf_ptr, (size_t)*buf_len)) < 0)
+        return ret_value; /* error occurred */
 
-  ret_value = 0;
-  return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /*----------------------------------------------------------------------------
- * Name:        h5pget_file_image_c
- * Purpose:     Calls H5Pget_file_image
+ *  Name:        h5pget_file_image_c
+ *  Purpose:     Calls H5Pget_file_image
  *
- * Inputs:
+ *  Inputs:
  *  fapl_id - File access property list identifier
- * Outputs:
- *  buf_ptr - Pointer to the initial file image, 
- *            or NULL if no initial file image is desired
+ *  Outputs:
+ *  buf_ptr - Pointer to the initial file image,
+ *  or NULL if no initial file image is desired
  *  buf_len - Size of the supplied buffer, or 0 (zero) if no initial image is desired
  *
- * Returns:     0 on success, -1 on failure
- * Programmer:  M. Scot Breitenfeld
- *              February 19, 2012
+ *  Returns:     0 on success, -1 on failure
+ *  Programmer:  M. Scot Breitenfeld
+ *  February 19, 2012
  *---------------------------------------------------------------------------*/
 
 int_f
 h5pget_file_image_c(hid_t_f *fapl_id, void **buf_ptr, size_t_f *buf_len_ptr)
 {
-  int ret_value = -1;
-  size_t c_buf_len_ptr;
-  void *c_buf_ptr = NULL;
+    int    ret_value = -1;
+    size_t c_buf_len_ptr;
+    void  *c_buf_ptr = NULL;
 
-  c_buf_len_ptr = (size_t)*buf_len_ptr;
+    c_buf_len_ptr = (size_t)*buf_len_ptr;
 
-  /*
-   * Call H5Pget_file_image function.
-   */
-  if( (H5Pget_file_image((hid_t)*fapl_id, (void **)&c_buf_ptr, &c_buf_len_ptr)) <0 )
-    return ret_value; /* error occurred */
+    /*
+     * Call H5Pget_file_image function.
+     */
+    if ((H5Pget_file_image((hid_t)*fapl_id, (void **)&c_buf_ptr, &c_buf_len_ptr)) < 0)
+        return ret_value; /* error occurred */
 
-  HDmemcpy((void *)*buf_ptr, (void *)c_buf_ptr, c_buf_len_ptr);
+    HDmemcpy((void *)*buf_ptr, (void *)c_buf_ptr, c_buf_len_ptr);
 
-  *buf_len_ptr=(size_t_f)c_buf_len_ptr;
+    *buf_len_ptr = (size_t_f)c_buf_len_ptr;
 
-  ret_value = 0;
-  if(c_buf_ptr) HDfree(c_buf_ptr);
+    ret_value = 0;
+    if (c_buf_ptr)
+        H5free_memory(c_buf_ptr);
 
-  return ret_value;
+    return ret_value;
+}
+
+#ifdef H5_HAVE_PARALLEL
+/****if* H5Pf/h5pset_fapl_mpio_c
+ * NAME
+ *  h5pset_fapl_mpio_c
+ * PURPOSE
+ *  Call H5Pset_fapl_mpio to set mode for parallel I/O and the user
+ *  supplied communicator and info object
+ * INPUTS
+ *  prp_id - property list identifier
+ *  comm   - MPI communicator
+ *  info   - MPI info object
+ * RETURNS
+ *  0 on success, -1 on failure
+ * AUTHOR
+ *  Elena Pourmal
+ *  Thursday, October 26, 2000
+ * HISTORY
+ *
+ * SOURCE
+ */
+int_f
+h5pset_fapl_mpio_c(hid_t_f *prp_id, int_f *comm, int_f *info)
+/******/
+{
+    int      ret_value = -1;
+    hid_t    c_prp_id;
+    herr_t   ret;
+    MPI_Comm c_comm;
+    MPI_Info c_info;
+    c_comm = MPI_Comm_f2c(*comm);
+    c_info = MPI_Info_f2c(*info);
+
+    /*
+     * Call H5Pset_mpi function.
+     */
+    c_prp_id = *prp_id;
+    ret      = H5Pset_fapl_mpio(c_prp_id, c_comm, c_info);
+    if (ret < 0)
+        return ret_value;
+    ret_value = 0;
+    return ret_value;
+}
+/****if* H5Pf/h5pget_fapl_mpio_c
+ * NAME
+ *  h5pget_fapl_mpio_c
+ * PURPOSE
+ *  Call H5Pget_fapl_mpio to retrieve communicator and info object
+ * INPUTS
+ *  prp_id - property list identifier
+ *  comm   - buffer to return MPI communicator
+ *  info   - buffer to return MPI info object
+ * RETURNS
+ *  0 on success, -1 on failure
+ * AUTHOR
+ *  Elena Pourmal
+ *  Thursday, October 26, 2000
+ * HISTORY
+ *
+ * SOURCE
+ */
+int_f
+h5pget_fapl_mpio_c(hid_t_f *prp_id, int_f *comm, int_f *info)
+/******/
+{
+    int      ret_value = -1;
+    hid_t    c_prp_id;
+    herr_t   ret;
+    MPI_Comm c_comm;
+    MPI_Info c_info;
+
+    /*
+     * Call H5Pget_mpi function.
+     */
+    c_prp_id = *prp_id;
+    ret      = H5Pget_fapl_mpio(c_prp_id, &c_comm, &c_info);
+    if (ret < 0)
+        return ret_value;
+    *comm     = (int_f)MPI_Comm_c2f(c_comm);
+    *info     = (int_f)MPI_Info_c2f(c_info);
+    ret_value = 0;
+    return ret_value;
+}
+
+/****if* H5Pf/h5pset_mpi_params_c
+ * NAME
+ *  h5pset_mpi_params_c
+ * PURPOSE
+ *  Set the MPI communicator and info.
+ * INPUTS
+ *  prp_id - property list identifier
+ *  comm   - MPI communicator
+ *  info   - MPI info object
+ * RETURNS
+ *  0 on success, -1 on failure
+ * AUTHOR
+ *  M.S. Breitenfeld
+ *  October 2022
+ *
+ * SOURCE
+ */
+int_f
+h5pset_mpi_params_c(hid_t_f *prp_id, int_f *comm, int_f *info)
+/******/
+{
+    int      ret_value = -1;
+    hid_t    c_prp_id;
+    herr_t   ret;
+    MPI_Comm c_comm;
+    MPI_Info c_info;
+    c_comm = MPI_Comm_f2c(*comm);
+    c_info = MPI_Info_f2c(*info);
+
+    /*
+     * Call H5Pset_mpi_params.
+     */
+    c_prp_id = *prp_id;
+    ret      = H5Pset_mpi_params(c_prp_id, c_comm, c_info);
+    if (ret < 0)
+        return ret_value;
+    ret_value = 0;
+    return ret_value;
+}
+
+/****if* H5Pf/h5pget_mpi_params_c
+ * NAME
+ *  h5pget_mpi_params_c
+ * PURPOSE
+ *  Get the MPI communicator and info.
+ * INPUTS
+ *  prp_id - property list identifier
+ *  comm   - MPI communicator
+ *  info   - MPI info object
+ * RETURNS
+ *  0 on success, -1 on failure
+ * AUTHOR
+ *  M.S. Breitenfeld
+ *  October 2022
+ *
+ * SOURCE
+ */
+int_f
+h5pget_mpi_params_c(hid_t_f *prp_id, int_f *comm, int_f *info)
+/******/
+{
+    int      ret_value = -1;
+    hid_t    c_prp_id;
+    herr_t   ret;
+    MPI_Comm c_comm;
+    MPI_Info c_info;
+
+    /*
+     * Call H5Pget_mpi_params function.
+     */
+    c_prp_id = *prp_id;
+    ret      = H5Pget_mpi_params(c_prp_id, &c_comm, &c_info);
+    if (ret < 0)
+        return ret_value;
+    *comm     = (int_f)MPI_Comm_c2f(c_comm);
+    *info     = (int_f)MPI_Info_c2f(c_info);
+    ret_value = 0;
+    return ret_value;
+}
+
+/****if* H5Pf/h5pset_dxpl_mpio_c
+ * NAME
+ *  h5pset_dxpl_mpio_c
+ * PURPOSE
+ *  Call H5Pset_dxpl_mpio to set transfer mode of the dataset
+ *  transfer property list
+ * INPUTS
+ *  prp_id - property list identifier
+ *  data_xfer_mode - transfer mode
+ * RETURNS
+ *  0 on success, -1 on failure
+ * AUTHOR
+ *  Elena Pourmal
+ *  Thursday, October 26, 2000
+ * HISTORY
+ *
+ * SOURCE
+ */
+int_f
+h5pset_dxpl_mpio_c(hid_t_f *prp_id, int_f *data_xfer_mode)
+/******/
+{
+    int              ret_value = -1;
+    hid_t            c_prp_id;
+    herr_t           ret;
+    H5FD_mpio_xfer_t c_data_xfer_mode;
+    /*
+         switch (*data_xfer_mode) {
+
+            case H5FD_MPIO_INDEPENDENT_F:
+                 c_data_xfer_mode = H5FD_MPIO_INDEPENDENT;
+                 break;
+
+            case H5FD_MPIO_COLLECTIVE_F:
+                 c_data_xfer_mode = H5FD_MPIO_COLLECTIVE;
+                 break;
+            default:
+              return ret_value;
+          }
+    */
+    c_data_xfer_mode = (H5FD_mpio_xfer_t)*data_xfer_mode;
+    /*
+     * Call H5Pset_dxpl_mpio function.
+     */
+    c_prp_id = *prp_id;
+    ret      = H5Pset_dxpl_mpio(c_prp_id, c_data_xfer_mode);
+    if (ret < 0)
+        return ret_value;
+    ret_value = 0;
+    return ret_value;
+}
+
+/****if* H5Pf/h5pget_dxpl_mpio_c
+ * NAME
+ *  h5pget_dxpl_mpio_c
+ * PURPOSE
+ *  Call H5Pget_dxpl_mpio to get transfer mode of the dataset
+ *  transfer property list
+ * INPUTS
+ *  prp_id - property list identifier
+ *  data_xfer_mode  - buffer to retrieve transfer mode
+ * RETURNS
+ *  0 on success, -1 on failure
+ * AUTHOR
+ *  Elena Pourmal
+ *  Thursday, June 15, 2000
+ * HISTORY
+ *
+ * SOURCE
+ */
+int_f
+h5pget_dxpl_mpio_c(hid_t_f *prp_id, int_f *data_xfer_mode)
+/******/
+{
+    int              ret_value = -1;
+    hid_t            c_prp_id;
+    herr_t           ret;
+    H5FD_mpio_xfer_t c_data_xfer_mode;
+
+    /*
+     * Call H5Pget_xfer function.
+     */
+    c_prp_id = *prp_id;
+    ret      = H5Pget_dxpl_mpio(c_prp_id, &c_data_xfer_mode);
+    if (ret < 0)
+        return ret_value;
+    *data_xfer_mode = (int_f)c_data_xfer_mode;
+    /*
+         switch (c_data_xfer_mode) {
+
+            case H5FD_MPIO_INDEPENDENT:
+                 *data_xfer_mode = H5FD_MPIO_INDEPENDENT_F;
+                 break;
+
+            case H5FD_MPIO_COLLECTIVE:
+                 *data_xfer_mode = H5FD_MPIO_COLLECTIVE_F;
+                 break;
+
+            default:
+              return ret_value;
+          }
+    */
+    ret_value = 0;
+    return ret_value;
+}
+
+/****if* H5Pf/h5pget_mpio_actual_io_mode_c
+ * NAME
+ *  h5pget_mpio_actual_io_mode_c
+ * PURPOSE
+ *  Calls H5Pget_mpio_actual_io_mode
+ *
+ * INPUTS
+ *  dxpl_id        - Dataset transfer property list identifier.
+ * OUTPUTS
+ *  actual_io_mode - The type of I/O performed by this process.
+ *
+ * RETURNS
+ *  0 on success, -1 on failure
+ * AUTHOR
+ *  M. Scot Breitenfeld
+ *  July 27, 2012
+ * SOURCE
+ */
+int_f
+h5pget_mpio_actual_io_mode_c(hid_t_f *dxpl_id, int_f *actual_io_mode)
+/******/
+{
+    int                       ret_value = -1;
+    H5D_mpio_actual_io_mode_t c_actual_io_mode;
+
+    /*
+     * Call H5Pget_mpio_actual_io_mode_f function.
+     */
+    if ((H5Pget_mpio_actual_io_mode((hid_t)*dxpl_id, &c_actual_io_mode)) < 0)
+        return ret_value; /* error occurred */
+
+    *actual_io_mode = (int_f)c_actual_io_mode;
+
+    ret_value = 0;
+    return ret_value;
 }
+#endif /*H5_HAVE_PARALLEL*/
diff --git a/fortran/src/H5Pff.F90 b/fortran/src/H5Pff.F90
new file mode 100644
index 0000000..75d7365
--- /dev/null
+++ b/fortran/src/H5Pff.F90
@@ -0,0 +1,6111 @@
+!> @defgroup FH5P Fortran Property List (H5P) Interface
+!!
+!! @see H5P, C-API
+!!
+!! @see @ref H5P_UG, User Guide
+!!
+
+!> @ingroup FH5P
+!!
+!! @brief This module contains Fortran interfaces for H5P functions.
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+! NOTES
+!
+!       _____ __  __ _____   ____  _____ _______       _   _ _______
+!      |_   _|  \/  |  __ \ / __ \|  __ \__   __|/\   | \ | |__   __|
+! ****   | | | \  / | |__) | |  | | |__) | | |  /  \  |  \| |  | |    ****
+! ****   | | | |\/| |  ___/| |  | |  _  /  | | / /\ \ | . ` |  | |    ****
+! ****  _| |_| |  | | |    | |__| | | \ \  | |/ ____ \| |\  |  | |    ****
+!      |_____|_|  |_|_|     \____/|_|  \_\ |_/_/    \_\_| \_|  |_|
+!
+!  If you add a new H5P function you must add the function name to the
+!  Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
+!  This is needed for Windows based operating systems.
+
+#include <H5config_f.inc>
+
+MODULE H5P
+
+  USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR, C_CHAR
+  USE H5GLOBAL
+  USE H5fortkit
+
+  PRIVATE h5pset_fapl_multi_l, h5pset_fapl_multi_s
+  PRIVATE h5pset_fill_value_integer, h5pset_fill_value_char, h5pset_fill_value_ptr
+  PRIVATE h5pget_fill_value_integer, h5pget_fill_value_char, h5pget_fill_value_ptr
+  PRIVATE h5pset_integer, h5pset_char, h5pset_ptr
+  PRIVATE h5pget_integer, h5pget_char, h5pget_ptr
+  PRIVATE h5pregister_integer, h5pregister_ptr
+  PRIVATE h5pinsert_integer, h5pinsert_char, h5pinsert_ptr
+
+#ifndef H5_DOXYGEN
+
+  INTERFACE h5pset_fapl_multi_f
+     MODULE PROCEDURE h5pset_fapl_multi_l
+     MODULE PROCEDURE h5pset_fapl_multi_s
+  END INTERFACE
+
+  INTERFACE h5pset_fill_value_f
+     MODULE PROCEDURE h5pset_fill_value_integer
+     MODULE PROCEDURE h5pset_fill_value_char
+     ! Recommended procedure:
+     MODULE PROCEDURE h5pset_fill_value_ptr
+
+  END INTERFACE
+
+  INTERFACE h5pget_fill_value_f
+     MODULE PROCEDURE h5pget_fill_value_integer
+     MODULE PROCEDURE h5pget_fill_value_char
+     ! Recommended procedure:
+     MODULE PROCEDURE h5pget_fill_value_ptr
+
+  END INTERFACE
+
+  INTERFACE h5pset_f
+     MODULE PROCEDURE h5pset_integer
+     MODULE PROCEDURE h5pset_char
+     ! Recommended procedure:
+     MODULE PROCEDURE h5pset_ptr
+
+  END INTERFACE
+
+  INTERFACE h5pget_f
+     MODULE PROCEDURE h5pget_integer
+     MODULE PROCEDURE h5pget_char
+     ! Recommended procedure:
+     MODULE PROCEDURE h5pget_ptr
+  END INTERFACE
+
+  INTERFACE h5pregister_f
+     MODULE PROCEDURE h5pregister_integer
+     ! Recommended procedure:
+     MODULE PROCEDURE h5pregister_ptr
+  END INTERFACE
+
+  INTERFACE h5pinsert_f
+     MODULE PROCEDURE h5pinsert_integer
+     MODULE PROCEDURE h5pinsert_char
+     ! Recommended procedure:
+     MODULE PROCEDURE h5pinsert_ptr
+  END INTERFACE
+
+  INTERFACE
+     INTEGER FUNCTION h5pget_fill_value_c(prp_id, type_id, fillvalue) &
+          BIND(C, NAME='h5pget_fill_value_c')
+       IMPORT :: c_ptr
+       IMPORT :: HID_T
+       IMPLICIT NONE
+       INTEGER(HID_T), INTENT(IN) :: prp_id
+       INTEGER(HID_T), INTENT(IN) :: type_id
+       TYPE(C_PTR), VALUE :: fillvalue
+     END FUNCTION h5pget_fill_value_c
+  END INTERFACE
+
+  INTERFACE
+     INTEGER FUNCTION h5pset_fill_value_c(prp_id, type_id, fillvalue) &
+          BIND(C, NAME='h5pset_fill_value_c')
+       IMPORT :: c_ptr
+       IMPORT :: HID_T
+       IMPLICIT NONE
+       INTEGER(HID_T), INTENT(IN) :: prp_id
+       INTEGER(HID_T), INTENT(IN) :: type_id
+       TYPE(C_PTR), VALUE :: fillvalue
+     END FUNCTION h5pset_fill_value_c
+  END INTERFACE
+
+  INTERFACE
+     INTEGER FUNCTION h5pset_c(prp_id, name, name_len, value) &
+          BIND(C, NAME='h5pset_c')
+       IMPORT :: c_char, c_ptr
+       IMPORT :: HID_T
+       IMPLICIT NONE
+       INTEGER(HID_T), INTENT(IN) :: prp_id
+       CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+       INTEGER :: name_len
+       TYPE(C_PTR), VALUE :: value
+     END FUNCTION h5pset_c
+  END INTERFACE
+
+  INTERFACE
+     INTEGER FUNCTION h5pget_c(prp_id, name, name_len, value) &
+          BIND(C, NAME='h5pget_c')
+       IMPORT :: c_char, c_ptr
+       IMPORT :: HID_T
+       INTEGER(HID_T), INTENT(IN) :: prp_id
+       CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+       INTEGER :: name_len
+       TYPE(C_PTR), VALUE :: value
+     END FUNCTION h5pget_c
+  END INTERFACE
+
+  INTERFACE
+     INTEGER FUNCTION h5pregister_c(class, name, name_len, size, value) &
+          BIND(C, NAME='h5pregister_c')
+       IMPORT :: c_char, c_ptr
+       IMPORT :: HID_T, SIZE_T
+       IMPLICIT NONE
+       INTEGER(HID_T), INTENT(IN) :: class
+       CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+       INTEGER, INTENT(IN)         :: name_len
+       INTEGER(SIZE_T), INTENT(IN) :: size
+       TYPE(C_PTR), INTENT(IN), VALUE :: value
+     END FUNCTION h5pregister_c
+  END INTERFACE
+
+  INTERFACE
+     INTEGER FUNCTION h5pinsert_c(plist, name, name_len, size, value) &
+          BIND(C, NAME='h5pinsert_c')
+       IMPORT :: c_char, c_ptr
+       IMPORT :: HID_T, SIZE_T
+       IMPLICIT NONE
+       INTEGER(HID_T), INTENT(IN) :: plist
+       CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+       INTEGER, INTENT(IN)         :: name_len
+       INTEGER(SIZE_T), INTENT(IN) :: size
+       TYPE(C_PTR), INTENT(IN), VALUE :: value
+     END FUNCTION h5pinsert_c
+  END INTERFACE
+
+#endif
+
+#ifdef H5_HAVE_PARALLEL
+#ifdef H5_HAVE_SUBFILING_VFD
+!> \addtogroup FH5P
+!> @{
+
+  !> @brief H5FD_subfiling_params_t derived type used in the subfiling VFD.
+  TYPE, BIND(C) :: H5FD_subfiling_params_t
+    INTEGER(ENUM_T)    :: ioc_selection !< Method to select I/O concentrators
+    INTEGER(C_INT64_T) :: stripe_size   !< Size (in bytes) of data stripes in subfiles
+    INTEGER(C_INT32_T) :: stripe_count  !< Target number of subfiles to use
+  END TYPE H5FD_subfiling_params_t
+
+  !> @brief H5FD_subfiling_config_t derived type used in the subfiling VFD.
+  TYPE, BIND(C) :: H5FD_subfiling_config_t
+    INTEGER(C_INT32_T) :: magic                  !< Set to H5FD_SUBFILING_FAPL_MAGIC_F
+    INTEGER(C_INT32_T) :: version                !< Set to H5FD_CURR_SUBFILING_FAPL_VERSION_F
+    INTEGER(HID_T)     :: ioc_fapl_id            !< The FAPL setup with the stacked VFD to use for I/O concentrators
+    LOGICAL(C_BOOL)    :: require_ioc            !< Whether to use the IOC VFD (currently must always be TRUE)
+    TYPE(H5FD_subfiling_params_t) :: shared_cfg  !< Subfiling/IOC parameters (stripe size, stripe count, etc.)
+  END TYPE H5FD_subfiling_config_t
+
+  !> @brief H5FD_ioc_config_t derived type used in the IOC VFD (SUBFILING).
+  TYPE, BIND(C) :: H5FD_ioc_config_t
+    INTEGER(C_INT32_T) :: magic            !< Must be set to H5FD_IOC_FAPL_MAGIC_F
+    INTEGER(C_INT32_T) :: version          !< Must be set to H5FD_IOC_CURR_FAPL_VERSION_F
+    INTEGER(C_INT32_T) :: thread_pool_size !< Number of I/O concentrator worker threads to use
+  END TYPE H5FD_ioc_config_t
+!> @}
+#endif
+#endif
+
+CONTAINS
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Creates a new property as an instance of a property list class.
+!!
+!! \param class  Type of the property class to be created. Possible values are:
+!!               \li H5P_OBJECT_CREATE_F
+!!               \li H5P_FILE_CREATE_F
+!!               \li H5P_FILE_ACCESS_F
+!!               \li H5P_DATASET_CREATE_F
+!!               \li H5P_DATASET_ACCESS_F
+!!               \li H5P_DATASET_XFER_F
+!!               \li H5P_FILE_MOUNT_F
+!!               \li H5P_GROUP_CREATE_F
+!!               \li H5P_GROUP_ACCESS_F
+!!               \li H5P_DATATYPE_CREATE_F
+!!               \li H5P_DATATYPE_ACCESS_F
+!!               \li H5P_STRING_CREATE_F
+!!               \li H5P_ATTRIBUTE_CREATE _F
+!!               \li H5P_OBJECT_COPY_F
+!!               \li H5P_LINK_CREATE_F
+!!               \li H5P_LINK_ACCESS_F
+!! \param prp_id Property list identifier.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Pcreate()
+!!
+  SUBROUTINE h5pcreate_f(class, prp_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN)  :: class
+    INTEGER(HID_T), INTENT(OUT) :: prp_id
+    INTEGER       , INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pcreate_c(class, prp_id) &
+            BIND(C,NAME='h5pcreate_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: class
+         INTEGER(HID_T), INTENT(OUT) :: prp_id
+       END FUNCTION h5pcreate_c
+    END INTERFACE
+
+    hdferr = h5pcreate_c(class, prp_id)
+  END SUBROUTINE h5pcreate_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets the dataset transfer property list status to TRUE or FALSE for initializing
+!!        compound datatype members during write/read operations.
+!!
+!! \param prp_id Property list identifier.
+!! \param flag   Status flag.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Pset_preserve()
+!!
+  SUBROUTINE h5pset_preserve_f(prp_id, flag, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    LOGICAL, INTENT(IN) ::  flag
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: flag_c
+
+    INTERFACE
+       INTEGER FUNCTION h5pset_preserve_c(prp_id, flag_c) &
+            BIND(C,NAME='h5pset_preserve_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         INTEGER ::  flag_c
+       END FUNCTION h5pset_preserve_c
+    END INTERFACE
+    flag_c = 0
+    IF(flag) flag_c = 1
+    hdferr = h5pset_preserve_c(prp_id, flag_c)
+  END SUBROUTINE h5pset_preserve_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Checks status of the dataset transfer property list.
+!!
+!! \param prp_id Property list identifier.
+!! \param flag   Status flag.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Pget_preserve()
+!!
+  SUBROUTINE h5pget_preserve_f(prp_id, flag, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    LOGICAL, INTENT(OUT) ::  flag
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: flag_c
+
+    INTERFACE
+       INTEGER FUNCTION h5pget_preserve_c(prp_id, flag_c) &
+            BIND(C,NAME='h5pget_preserve_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         INTEGER ::  flag_c
+       END FUNCTION h5pget_preserve_c
+    END INTERFACE
+
+    hdferr = h5pget_preserve_c(prp_id, flag_c)
+    flag = .FALSE.
+    IF(flag_c .EQ. 1) flag = .TRUE.
+  END SUBROUTINE h5pget_preserve_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Returns the property list class for a property list.
+!!
+!! \param prp_id    Property list identifier.
+!! \param classtype Property list class.
+!! \param hdferr    \fortran_error
+!!
+!! See C API: @ref H5Pget_class()
+!!
+  SUBROUTINE h5pget_class_f(prp_id, classtype, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER(HID_T), INTENT(OUT) :: classtype
+    INTEGER, INTENT(OUT) :: hdferr
+
+    INTERFACE
+       INTEGER FUNCTION h5pget_class_c(prp_id, classtype) &
+            BIND(C,NAME='h5pget_class_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN)  :: prp_id
+         INTEGER(HID_T), INTENT(OUT) :: classtype
+       END FUNCTION h5pget_class_c
+    END INTERFACE
+
+    hdferr = h5pget_class_c(prp_id, classtype)
+  END SUBROUTINE h5pget_class_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Copies an existing property list to create a new property list
+!!
+!! \param prp_id     Property list identifier.
+!! \param new_prp_id New property list identifier.
+!! \param hdferr     \fortran_error
+!!
+!! See C API: @ref H5Pcopy()
+!!
+  SUBROUTINE h5pcopy_f(prp_id, new_prp_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER(HID_T), INTENT(OUT) :: new_prp_id
+    INTEGER, INTENT(OUT) :: hdferr
+
+    INTERFACE
+       INTEGER FUNCTION h5pcopy_c(prp_id, new_prp_id) &
+            BIND(C,NAME='h5pcopy_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         INTEGER(HID_T), INTENT(OUT) :: new_prp_id
+       END FUNCTION h5pcopy_c
+    END INTERFACE
+
+    hdferr = h5pcopy_c(prp_id, new_prp_id)
+  END SUBROUTINE h5pcopy_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Terminates access to a property list.
+!!
+!! \param prp_id Identifier of the property list to terminate access to.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Pclose()
+!!
+  SUBROUTINE h5pclose_f(prp_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pclose_c(prp_id) &
+            BIND(C,NAME='h5pclose_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+       END FUNCTION h5pclose_c
+    END INTERFACE
+
+    hdferr = h5pclose_c(prp_id)
+  END SUBROUTINE h5pclose_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets the size of the chunks used to store
+!!       a chunked layout dataset.
+!!
+!! \param prp_id Dataset creation property list identifier.
+!! \param ndims  Number of dimensions for each chunk.
+!! \param dims   Array with dimension sizes for each chunk.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Pset_chunk()
+!!
+  SUBROUTINE h5pset_chunk_f(prp_id, ndims, dims, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER, INTENT(IN) :: ndims
+    INTEGER(HSIZE_T), DIMENSION(ndims), INTENT(IN) :: dims
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pset_chunk_c(prp_id, ndims, dims) &
+            BIND(C,NAME='h5pset_chunk_c')
+         IMPORT :: HID_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         INTEGER, INTENT(IN) :: ndims
+         INTEGER(HSIZE_T), DIMENSION(ndims), INTENT(IN) :: dims
+       END FUNCTION h5pset_chunk_c
+    END INTERFACE
+
+    hdferr =  h5pset_chunk_c(prp_id, ndims, dims)
+  END SUBROUTINE h5pset_chunk_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Retrieves the size of chunks for the raw data of a chunked layout dataset
+!!
+!! \param prp_id Property list identifier.
+!! \param ndims  Size of dims array.
+!! \param dims   Array with dimension sizes for each chunk.
+!! \param hdferr Returns number of chunk dimensions if successful and -1 if fails.
+!!
+!! See C API: @ref H5Pget_chunk()
+!!
+  SUBROUTINE h5pget_chunk_f(prp_id, ndims, dims, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER, INTENT(IN) :: ndims
+    INTEGER(HSIZE_T), DIMENSION(ndims), INTENT(OUT) :: dims
+    INTEGER, INTENT(OUT) :: hdferr
+
+    INTERFACE
+       INTEGER FUNCTION h5pget_chunk_c(prp_id, ndims, dims) &
+            BIND(C,NAME='h5pget_chunk_c')
+         IMPORT :: HID_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         INTEGER :: ndims
+         INTEGER(HSIZE_T), DIMENSION(*), INTENT(OUT) :: dims
+       END FUNCTION h5pget_chunk_c
+    END INTERFACE
+
+    hdferr =  h5pget_chunk_c(prp_id, ndims, dims)
+  END SUBROUTINE h5pget_chunk_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets compression method and compression level.
+!!
+!! \param prp_id Property list identifier.
+!! \param level  Compression level.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Pset_deflate()
+!!
+  SUBROUTINE h5pset_deflate_f(prp_id, level, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER, INTENT(IN) :: level
+    INTEGER, INTENT(OUT) :: hdferr
+
+!  INTEGER, EXTERNAL :: h5pset_deflate_c
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5pset_deflate_c(prp_id, level) &
+            BIND(C,NAME='h5pset_deflate_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         INTEGER, INTENT(IN) :: level
+       END FUNCTION h5pset_deflate_c
+    END INTERFACE
+    hdferr = h5pset_deflate_c(prp_id, level)
+
+  END SUBROUTINE h5pset_deflate_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Retrieves the version information of various objects for a file creation property list.
+!!
+!! \param prp_id   File createion property list identifier.
+!! \param boot     Super block version number.
+!! \param freelist Global freelist version number.
+!! \param stab     Symbol table version number.
+!! \param shhdr    Shared object header version number.
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Pget_version()
+!!
+  SUBROUTINE h5pget_version_f(prp_id, boot, freelist, &
+       stab, shhdr, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER, DIMENSION(:), INTENT(OUT) :: boot
+    INTEGER, DIMENSION(:), INTENT(OUT) :: freelist
+
+    INTEGER, DIMENSION(:), INTENT(OUT) :: stab
+    INTEGER, DIMENSION(:), INTENT(OUT) :: shhdr
+    INTEGER, INTENT(OUT) :: hdferr
+
+    INTERFACE
+       INTEGER FUNCTION h5pget_version_c(prp_id, boot, freelist, stab, shhdr) &
+            BIND(C,NAME='h5pget_version_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         INTEGER, DIMENSION(*), INTENT(OUT) :: boot
+         INTEGER, DIMENSION(*), INTENT(OUT) :: freelist
+         INTEGER, DIMENSION(*), INTENT(OUT) :: stab
+         INTEGER, DIMENSION(*), INTENT(OUT) :: shhdr
+       END FUNCTION h5pget_version_c
+    END INTERFACE
+
+    hdferr = h5pget_version_c(prp_id, boot, freelist, stab, shhdr)
+  END SUBROUTINE h5pget_version_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets user block size.
+!!
+!! \param prp_id File creation property list to modify.
+!! \param size   Size of the user-block in bytes.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Pset_userblock()
+!!
+  SUBROUTINE h5pset_userblock_f(prp_id, size, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER(HSIZE_T), INTENT(IN) :: size
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pset_userblock_c(prp_id, size) &
+            BIND(C,NAME='h5pset_userblock_c')
+         IMPORT :: HID_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         INTEGER(HSIZE_T), INTENT(IN) :: size
+       END FUNCTION h5pset_userblock_c
+    END INTERFACE
+
+    hdferr = h5pset_userblock_c(prp_id, size)
+  END SUBROUTINE h5pset_userblock_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Gets user block size.
+!!
+!! \param prp_id     File creation property list identifier.
+!! \param block_size Size of the user block in bytes.
+!! \param hdferr     \fortran_error
+!!
+!! See C API: @ref H5Pget_userblock()
+!!
+  SUBROUTINE h5pget_userblock_f(prp_id, block_size, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER(HSIZE_T), INTENT(OUT) ::  block_size
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pget_userblock_c(prp_id, block_size) &
+            BIND(C,NAME='h5pget_userblock_c')
+         IMPORT :: HID_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         INTEGER(HSIZE_T), INTENT(OUT) :: block_size
+       END FUNCTION h5pget_userblock_c
+    END INTERFACE
+    hdferr = h5pget_userblock_c(prp_id,  block_size)
+  END SUBROUTINE h5pget_userblock_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets the byte size of the offsets and lengths used to address objects in an HDF5 file.
+!!
+!! \param prp_id      File creation property list identifier.
+!! \param sizeof_addr Size of an object offset in bytes.
+!! \param sizeof_size Size of an object length in bytes.
+!! \param hdferr      \fortran_error
+!!
+!! See C API: @ref H5Pset_sizes()
+!!
+  SUBROUTINE h5pset_sizes_f(prp_id, sizeof_addr, sizeof_size, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER(SIZE_T), INTENT(IN) :: sizeof_addr
+    INTEGER(SIZE_T), INTENT(IN) :: sizeof_size
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pset_sizes_c(prp_id, sizeof_addr, sizeof_size) &
+            BIND(C,NAME='h5pset_sizes_c')
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         INTEGER(SIZE_T), INTENT(IN) :: sizeof_addr
+         INTEGER(SIZE_T), INTENT(IN) :: sizeof_size
+       END FUNCTION h5pset_sizes_c
+    END INTERFACE
+
+    hdferr = h5pset_sizes_c(prp_id, sizeof_addr, sizeof_size)
+  END SUBROUTINE h5pset_sizes_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Retrieves the size of the offsets and lengths used in an HDF5 file
+!!
+!! \param prp_id File Creation property list identifier.
+!! \param sizeof_addr Size of an object offset in bytes.
+!! \param sizeof_size Size of an object length in bytes.
+!! \param hdferr      \fortran_error
+!!
+!! See C API: @ref H5Pget_sizes()
+!!
+  SUBROUTINE h5pget_sizes_f(prp_id, sizeof_addr, sizeof_size, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER(SIZE_T), INTENT(OUT) :: sizeof_addr
+    INTEGER(SIZE_T), INTENT(OUT) :: sizeof_size
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pget_sizes_c(prp_id, sizeof_addr, sizeof_size) &
+            BIND(C,NAME='h5pget_sizes_c')
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         INTEGER(SIZE_T), INTENT(OUT) :: sizeof_addr
+         INTEGER(SIZE_T), INTENT(OUT) :: sizeof_size
+       END FUNCTION h5pget_sizes_c
+    END INTERFACE
+
+    hdferr = h5pget_sizes_c(prp_id, sizeof_addr, sizeof_size)
+  END SUBROUTINE h5pget_sizes_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets the size of parameters used to control the symbol table nodes.
+!!
+!! \param prp_id  File creation property list identifier.
+!! \param ik      Symbol table tree rank.
+!! \param lk      Symbol table node size.
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Pset_sym_k()
+!!
+  SUBROUTINE h5pset_sym_k_f(prp_id, ik, lk, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER, INTENT(IN) :: ik
+    INTEGER, INTENT(IN) :: lk
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pset_sym_k_c(prp_id, ik, lk) &
+            BIND(C,NAME='h5pset_sym_k_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         INTEGER, INTENT(IN) :: ik
+         INTEGER, INTENT(IN) :: lk
+       END FUNCTION h5pset_sym_k_c
+    END INTERFACE
+
+    hdferr = h5pset_sym_k_c(prp_id, ik, lk)
+  END SUBROUTINE h5pset_sym_k_f
+!>
+!! \ingroup FH5P
+!!
+!! \brief Retrieves the size of the symbol table B-tree 1/2 rank and the symbol table leaf node 1/2 size.
+!!
+!! \param prp_id File creation property list identifier.
+!! \param ik     Symbol table tree 1/2 rank.
+!! \param lk     Symbol table node 1/2 size.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Pget_sym_k()
+!!
+  SUBROUTINE h5pget_sym_k_f(prp_id, ik, lk, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER, INTENT(OUT) :: ik
+    INTEGER, INTENT(OUT) :: lk
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pget_sym_k_c(prp_id, ik, lk) &
+            BIND(C,NAME='h5pget_sym_k_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         INTEGER, INTENT(OUT) :: ik
+         INTEGER, INTENT(OUT) :: lk
+       END FUNCTION h5pget_sym_k_c
+    END INTERFACE
+
+    hdferr = h5pget_sym_k_c(prp_id, ik, lk)
+  END SUBROUTINE h5pget_sym_k_f
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets the size of the parameter used to control the B-trees for indexing chunked datasets
+!!
+!! \param  prp_id File creation property list identifier
+!! \param ik      1/2 rank of chunked storage B-tree
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Pset_istore_k()
+!!
+  SUBROUTINE h5pset_istore_k_f(prp_id, ik, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER, INTENT(IN) :: ik
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pset_istore_k_c(prp_id, ik) &
+            BIND(C,NAME='h5pset_istore_k_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         INTEGER, INTENT(IN) :: ik
+       END FUNCTION h5pset_istore_k_c
+    END INTERFACE
+
+    hdferr = h5pset_istore_k_c(prp_id, ik)
+  END SUBROUTINE h5pset_istore_k_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Queries the 1/2 rank of an indexed storage B-tree.
+!!
+!! \param prp_id File creation property list identifier.
+!! \param ik     Rank of chunked storage B-tree.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Pget_istore_k()
+!!
+  SUBROUTINE h5pget_istore_k_f(prp_id, ik, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER, INTENT(OUT) :: ik
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pget_istore_k_c(prp_id, ik) &
+            BIND(C,NAME='h5pget_istore_k_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         INTEGER, INTENT(OUT) :: ik
+       END FUNCTION h5pget_istore_k_c
+    END INTERFACE
+
+    hdferr = h5pget_istore_k_c(prp_id, ik)
+  END SUBROUTINE h5pget_istore_k_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Returns low-lever driver identifier.
+!!
+!! \param prp_id File access or data transfer property list identifier.
+!! \param driver Low-level driver identifier.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Pget_driver()
+!!
+  SUBROUTINE h5pget_driver_f(prp_id, driver, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER(HID_T), INTENT(OUT) :: driver
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pget_driver_c(prp_id, driver) &
+            BIND(C,NAME='h5pget_driver_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         INTEGER(HID_T), INTENT(OUT) :: driver
+       END FUNCTION h5pget_driver_c
+    END INTERFACE
+
+    hdferr = h5pget_driver_c(prp_id, driver)
+  END SUBROUTINE h5pget_driver_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets the standard I/O driver.
+!!
+!! \param prp_id File access property list identifier.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Pset_fapl_stdio()
+!!
+  SUBROUTINE h5pset_fapl_stdio_f(prp_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pset_fapl_stdio_c(prp_id) &
+            BIND(C,NAME='h5pset_fapl_stdio_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+       END FUNCTION h5pset_fapl_stdio_c
+    END INTERFACE
+
+    hdferr = h5pset_fapl_stdio_c(prp_id)
+  END SUBROUTINE h5pset_fapl_stdio_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets the sec2 driver.
+!!
+!! \param prp_id File access property list identifier.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Pset_fapl_sec2()
+!!
+  SUBROUTINE h5pset_fapl_sec2_f(prp_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pset_fapl_sec2_c(prp_id) &
+            BIND(C,NAME='h5pset_fapl_sec2_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+       END FUNCTION h5pset_fapl_sec2_c
+    END INTERFACE
+
+    hdferr = h5pset_fapl_sec2_c(prp_id)
+  END SUBROUTINE h5pset_fapl_sec2_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets alignment properties of a file access property list.
+!!
+!! \param prp_id    File access property list identifier.
+!! \param threshold Threshold value.
+!! \param alignment Alignment value.
+!! \param hdferr    \fortran_error
+!!
+!! See C API: @ref H5Pset_alignment()
+!!
+  SUBROUTINE h5pset_alignment_f(prp_id, threshold,  alignment, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER(HSIZE_T), INTENT(IN) :: threshold
+    INTEGER(HSIZE_T), INTENT(IN) :: alignment
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pset_alignment_c(prp_id, threshold, alignment) &
+            BIND(C,NAME='h5pset_alignment_c')
+         IMPORT :: HID_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         INTEGER(HSIZE_T), INTENT(IN) :: threshold
+         INTEGER(HSIZE_T), INTENT(IN) :: alignment
+       END FUNCTION h5pset_alignment_c
+    END INTERFACE
+
+    hdferr = h5pset_alignment_c(prp_id, threshold, alignment)
+  END SUBROUTINE h5pset_alignment_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Retrieves the current settings for alignment properties from a file access property list.
+!!
+!! \param prp_id    File access property list identifier.
+!! \param threshold Threshold value.
+!! \param alignment Alignment value.
+!! \param hdferr    \fortran_error
+!!
+!! See C API: @ref H5Pget_alignment()
+!!
+  SUBROUTINE h5pget_alignment_f(prp_id, threshold,  alignment, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER(HSIZE_T), INTENT(OUT) :: threshold
+    INTEGER(HSIZE_T), INTENT(OUT) :: alignment
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pget_alignment_c(prp_id, threshold, alignment) &
+            BIND(C,NAME='h5pget_alignment_c')
+         IMPORT :: HID_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         INTEGER(HSIZE_T), INTENT(OUT) :: threshold
+         INTEGER(HSIZE_T), INTENT(OUT) :: alignment
+       END FUNCTION h5pget_alignment_c
+    END INTERFACE
+
+    hdferr = h5pget_alignment_c(prp_id, threshold, alignment)
+  END SUBROUTINE h5pget_alignment_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Modifies the file access property list to use the H5FD_CORE driver.
+!!
+!! \param prp_id        File access property list identifier.
+!! \param increment     Size, in bytes, of memory increments.
+!! \param backing_store Boolean flag indicating whether to write the file contents to disk when the file is closed.
+!! \param hdferr        \fortran_error
+!!
+!! See C API: @ref H5Pset_fapl_core()
+!!
+  SUBROUTINE h5pset_fapl_core_f(prp_id, increment, backing_store, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER(SIZE_T), INTENT(IN) :: increment
+    LOGICAL, INTENT(IN) :: backing_store
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: backing_store_flag
+    INTERFACE
+       INTEGER FUNCTION h5pset_fapl_core_c(prp_id, increment, backing_store_flag) &
+            BIND(C,NAME='h5pset_fapl_core_c')
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         INTEGER(SIZE_T), INTENT(IN) :: increment
+         INTEGER :: backing_store_flag
+       END FUNCTION h5pset_fapl_core_c
+    END INTERFACE
+    backing_store_flag = 0
+    IF(backing_store) backing_store_flag = 1
+    hdferr = h5pset_fapl_core_c(prp_id, increment, backing_store_flag)
+  END SUBROUTINE h5pset_fapl_core_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Queries core file driver properties.
+!!
+!! \param prp_id        File access property list identifier.
+!! \param increment     Size, in bytes, of memory increments.
+!! \param backing_store Boolean flag indicating whether to write the file contents to disk when the file is closed.
+!! \param hdferr        \fortran_error
+!!
+!! See C API: @ref H5Pget_fapl_core()
+!!
+  SUBROUTINE h5pget_fapl_core_f(prp_id, increment, backing_store, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER(SIZE_T), INTENT(OUT) :: increment
+    LOGICAL, INTENT(OUT) :: backing_store
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: backing_store_flag
+
+    INTERFACE
+       INTEGER FUNCTION h5pget_fapl_core_c(prp_id, increment, backing_store_flag) &
+            BIND(C,NAME='h5pget_fapl_core_c')
+         IMPORT :: HID_T,SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         INTEGER(SIZE_T), INTENT(OUT) :: increment
+         INTEGER :: backing_store_flag
+       END FUNCTION h5pget_fapl_core_c
+    END INTERFACE
+
+    hdferr = h5pget_fapl_core_c(prp_id, increment, backing_store_flag)
+    backing_store =.FALSE.
+    IF (backing_store_flag .EQ. 1) backing_store =.TRUE.
+  END SUBROUTINE h5pget_fapl_core_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets the file access property list to use the family driver.
+!!
+!! \param prp_id     File access property list identifier.
+!! \param memb_size  Size in bytes of each file member.
+!! \param memb_plist Identifier of the file access property list to be used for each family member
+!! \param hdferr     \fortran_error
+!!
+!! See C API: @ref H5Pset_fapl_family()
+!!
+  SUBROUTINE h5pset_fapl_family_f(prp_id, memb_size, memb_plist , hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER(HSIZE_T), INTENT(IN) :: memb_size
+    INTEGER(HID_T), INTENT(IN) :: memb_plist
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pset_fapl_family_c(prp_id, memb_size, memb_plist) &
+            BIND(C,NAME='h5pset_fapl_family_c')
+         IMPORT :: HID_T,HSIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         INTEGER(HSIZE_T), INTENT(IN) :: memb_size
+         INTEGER(HID_T), INTENT(IN) :: memb_plist
+       END FUNCTION h5pset_fapl_family_c
+    END INTERFACE
+
+    hdferr = h5pset_fapl_family_c(prp_id, memb_size, memb_plist)
+  END SUBROUTINE h5pset_fapl_family_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Returns file access property list information.
+!!
+!! \param prp_id     File access property list identifier.
+!! \param memb_size  Size in bytes of each file member.
+!! \param memb_plist Identifier of the file access property list to be used for each family member
+!! \param hdferr     \fortran_error
+!!
+!! See C API: @ref H5Pget_fapl_family()
+!!
+  SUBROUTINE h5pget_fapl_family_f(prp_id, memb_size, memb_plist , hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER(HSIZE_T), INTENT(OUT) :: memb_size
+    INTEGER(HID_T), INTENT(OUT) :: memb_plist
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pget_fapl_family_c(prp_id, memb_size, memb_plist) &
+            BIND(C,NAME='h5pget_fapl_family_c')
+         IMPORT :: HID_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         INTEGER(HSIZE_T), INTENT(OUT) :: memb_size
+         INTEGER(HID_T), INTENT(OUT) :: memb_plist
+       END FUNCTION h5pget_fapl_family_c
+    END INTERFACE
+
+    hdferr = h5pget_fapl_family_c(prp_id, memb_size, memb_plist)
+  END SUBROUTINE h5pget_fapl_family_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets the meta data cache and raw data chunk cache parameters
+!!
+!! \param prp_id      File access property list identifier.
+!! \param mdc_nelmts  Number of elements (objects) in the metadata cache.
+!! \param rdcc_nelmts Number of elements (objects) in the raw data chunk cache.
+!! \param rdcc_nbytes Total size of the raw data chunk cache, in bytes.
+!! \param rdcc_w0     Preemption policy (0 or 1).
+!! \param hdferr      \fortran_error
+!!
+!! See C API: @ref H5Pset_cache()
+!!
+  SUBROUTINE h5pset_cache_f(prp_id, mdc_nelmts,rdcc_nelmts, rdcc_nbytes, rdcc_w0, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER, INTENT(IN) :: mdc_nelmts
+    INTEGER(SIZE_T), INTENT(IN) :: rdcc_nelmts
+    INTEGER(SIZE_T), INTENT(IN) :: rdcc_nbytes
+    REAL, INTENT(IN) :: rdcc_w0
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pset_cache_c(prp_id,mdc_nelmts,rdcc_nelmts,rdcc_nbytes,rdcc_w0) &
+            BIND(C,NAME='h5pset_cache_c')
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         INTEGER, INTENT(IN) :: mdc_nelmts
+         INTEGER(SIZE_T), INTENT(IN) :: rdcc_nelmts
+         INTEGER(SIZE_T), INTENT(IN) :: rdcc_nbytes
+         REAL, INTENT(IN) :: rdcc_w0
+       END FUNCTION h5pset_cache_c
+    END INTERFACE
+
+    hdferr = h5pset_cache_c(prp_id, mdc_nelmts, rdcc_nelmts, rdcc_nbytes, rdcc_w0 )
+  END SUBROUTINE h5pset_cache_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Queries the meta data cache and raw data chunk cache parameters.
+!!
+!! \param prp_id      File access property list identifier.
+!! \param mdc_nelmts  Number of elements (objects) in the metadata cache
+!! \param rdcc_nelmts Number of elements (objects) in the raw data chunk cache
+!! \param rdcc_nbytes Total size of the raw data chunk cache, in bytes.
+!! \param rdcc_w0     Preemption policy (0 or 1).
+!! \param hdferr      \fortran_error
+!!
+!! See C API: @ref H5Pget_cache()
+!!
+  SUBROUTINE h5pget_cache_f(prp_id, mdc_nelmts, rdcc_nelmts, rdcc_nbytes, rdcc_w0, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER, INTENT(OUT) :: mdc_nelmts
+    INTEGER(SIZE_T), INTENT(OUT) :: rdcc_nelmts
+    INTEGER(SIZE_T), INTENT(OUT) :: rdcc_nbytes
+    REAL, INTENT(OUT) :: rdcc_w0
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pget_cache_c(prp_id,mdc_nelmts,rdcc_nelmts,rdcc_nbytes,rdcc_w0) &
+            BIND(C,NAME='h5pget_cache_c')
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         INTEGER, INTENT(OUT) :: mdc_nelmts
+         INTEGER(SIZE_T), INTENT(OUT) :: rdcc_nelmts
+         INTEGER(SIZE_T), INTENT(OUT) :: rdcc_nbytes
+         REAL, INTENT(OUT) :: rdcc_w0
+       END FUNCTION h5pget_cache_c
+    END INTERFACE
+
+    hdferr = h5pget_cache_c(prp_id, mdc_nelmts,rdcc_nelmts, rdcc_nbytes, rdcc_w0 )
+  END SUBROUTINE h5pget_cache_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Emulates the old split file driver.
+!!
+!! \param prp_id     File access property list identifier.
+!! \param meta_ext   Name of the extension for the metafile filename.
+!! \param meta_plist Identifier of the meta file access property list.
+!! \param raw_ext    Name extension for the raw file filename.
+!! \param raw_plist  Identifier of the raw file access property list.
+!! \param hdferr     \fortran_error
+!!
+!! See C API: @ref H5Pset_fapl_split()
+!!
+  SUBROUTINE h5pset_fapl_split_f(prp_id, meta_ext, meta_plist, raw_ext, raw_plist, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    CHARACTER(LEN=*), INTENT(IN) :: meta_ext
+    INTEGER(HID_T), INTENT(IN) :: meta_plist
+    CHARACTER(LEN=*), INTENT(IN) :: raw_ext
+    INTEGER(HID_T), INTENT(IN) :: raw_plist
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: meta_len, raw_len
+    INTERFACE
+       INTEGER FUNCTION h5pset_fapl_split_c(prp_id,meta_len,meta_ext,meta_plist,raw_len,raw_ext,raw_plist) &
+            BIND(C,NAME='h5pset_fapl_split_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: meta_ext
+         INTEGER(HID_T), INTENT(IN) :: meta_plist
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: raw_ext
+         INTEGER(HID_T), INTENT(IN) :: raw_plist
+         INTEGER :: meta_len, raw_len
+       END FUNCTION h5pset_fapl_split_c
+    END INTERFACE
+
+    meta_len = LEN(meta_ext)
+    raw_len = LEN(raw_ext)
+    hdferr = h5pset_fapl_split_c(prp_id,meta_len,meta_ext,meta_plist,raw_len,raw_ext,raw_plist)
+  END SUBROUTINE h5pset_fapl_split_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets garbage collecting references flag.
+!!
+!! \param prp_id       File access property list identifier.
+!! \param gc_reference Flag for setting garbage collection on and off (1 or 0).
+!! \param hdferr       \fortran_error
+!!
+!! See C API: @ref H5Pset_gc_references()
+!!
+  SUBROUTINE h5pset_gc_references_f(prp_id, gc_reference, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER, INTENT(IN) :: gc_reference
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pset_gc_references_c(prp_id, gc_reference) &
+            BIND(C,NAME='h5pset_gc_references_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         INTEGER, INTENT(IN) :: gc_reference
+       END FUNCTION h5pset_gc_references_c
+    END INTERFACE
+
+    hdferr = h5pset_gc_references_c(prp_id, gc_reference)
+  END SUBROUTINE h5pset_gc_references_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Returns garbage collecting references setting.
+!!
+!! \param prp_id       File access property list identifier.
+!! \param gc_reference Flag for setting garbage collection on and off (1 or 0)
+!! \param hdferr       \fortran_error
+!!
+!! See C API: @ref H5Pget_gc_references()
+!!
+  SUBROUTINE h5pget_gc_references_f(prp_id, gc_reference, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER, INTENT(OUT) :: gc_reference
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pget_gc_references_c(prp_id, gc_reference) &
+            BIND(C,NAME='h5pget_gc_references_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         INTEGER, INTENT(OUT) :: gc_reference
+       END FUNCTION h5pget_gc_references_c
+    END INTERFACE
+
+    hdferr = h5pget_gc_references_c(prp_id, gc_reference)
+  END SUBROUTINE h5pget_gc_references_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets the type of storage used store the raw data
+!!       for a dataset.
+!!
+!! \param prp_id Data creation property list identifier.
+!! \param layout Type of storage layout for raw data. Possible values are:
+!!               \li H5D_COMPACT_F
+!!               \li H5D_CONTIGUOUS_F
+!!               \li H5D_CHUNKED_F
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Pset_layout()
+!!
+  SUBROUTINE h5pset_layout_f(prp_id, layout, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER, INTENT(IN) :: layout
+                                         !   H5D_CHUNKED_F
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pset_layout_c(prp_id, layout) &
+            BIND(C,NAME='h5pset_layout_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         INTEGER, INTENT(IN) :: layout
+       END FUNCTION h5pset_layout_c
+    END INTERFACE
+
+    hdferr = h5pset_layout_c(prp_id, layout)
+  END SUBROUTINE h5pset_layout_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Returns the layout of the raw data for a dataset.
+!!
+!! \param prp_id Data creation property list identifier.
+!! \param layout Type of storage layout for raw data. Possible values are:
+!!               \li H5D_COMPACT_F
+!!               \li H5D_CONTIGUOUS_F
+!!               \li H5D_CHUNKED_F
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Pget_layout()
+!!
+  SUBROUTINE h5pget_layout_f(prp_id, layout, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER, INTENT(OUT) :: layout
+                                         !  H5D_CHUNKED_F(2)
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pget_layout_c(prp_id, layout) &
+            BIND(C,NAME='h5pget_layout_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         INTEGER, INTENT(OUT) :: layout
+       END FUNCTION h5pget_layout_c
+    END INTERFACE
+
+    hdferr = h5pget_layout_c(prp_id, layout)
+  END SUBROUTINE h5pget_layout_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Adds a filter to the filter pipeline.
+!!
+!! \param prp_id    Data creation or transfer property list identifier.
+!! \param filter    Filter to be added to the pipeline.
+!! \param flags     Bit vector specifying certain general properties of the filter.
+!! \param cd_nelmts Number of elements in cd_values.
+!! \param cd_values Auxiliary data for the filter.
+!! \param hdferr    \fortran_error
+!!
+!! See C API: @ref H5Pset_filter()
+!!
+  SUBROUTINE h5pset_filter_f(prp_id, filter, flags, cd_nelmts, cd_values,  hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER, INTENT(IN) :: filter
+    INTEGER, INTENT(IN) :: flags
+    INTEGER(SIZE_T), INTENT(IN) :: cd_nelmts
+    INTEGER, DIMENSION(*), INTENT(IN) :: cd_values
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pset_filter_c(prp_id, filter, flags, cd_nelmts, cd_values) &
+            BIND(C,NAME='h5pset_filter_c')
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         INTEGER, INTENT(IN) :: filter
+         INTEGER, INTENT(IN) :: flags
+         INTEGER(SIZE_T), INTENT(IN) :: cd_nelmts
+         INTEGER, DIMENSION(*), INTENT(IN) :: cd_values
+       END FUNCTION h5pset_filter_c
+    END INTERFACE
+
+    hdferr = h5pset_filter_c(prp_id, filter, flags, cd_nelmts, cd_values )
+  END SUBROUTINE h5pset_filter_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Returns the number of filters in the pipeline.
+!!
+!! \param prp_id   Data creation or transfer property list identifier.
+!! \param nfilters Number of filters in the pipeline.
+!! \param hdferr   \fortran_error
+!!
+  SUBROUTINE h5pget_nfilters_f(prp_id, nfilters, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER, INTENT(OUT) :: nfilters
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pget_nfilters_c(prp_id, nfilters) &
+            BIND(C,NAME='h5pget_nfilters_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         INTEGER, INTENT(OUT) :: nfilters
+       END FUNCTION h5pget_nfilters_c
+    END INTERFACE
+
+    hdferr = h5pget_nfilters_c(prp_id, nfilters)
+  END SUBROUTINE h5pget_nfilters_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Returns information about a filter in a pipeline
+!!
+!! \param prp_id        Data creation or transfer property list identifier
+!! \param filter_number Sequence number within the filter pipeline of the filter for which information is sought
+!! \param filter_id     Filter identification number.
+!! \param flags         Bitbit vector specifying certain general properties of the filter.
+!! \param cd_nelmts     Number of elements in cd_values.
+!! \param cd_values     Auxiliary data for the filter.
+!! \param namelen       Number of characters in the name buffer.
+!! \param name          Buffer to retrieve filter name.
+!! \param hdferr        \fortran_error
+!!
+!! See C API: @ref H5Pget_filter2()
+!!
+  SUBROUTINE h5pget_filter_f(prp_id, filter_number, flags, cd_nelmts, cd_values, namelen, name, filter_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER, INTENT(IN) :: filter_number
+    INTEGER, DIMENSION(*), INTENT(OUT) :: cd_values
+    INTEGER, INTENT(OUT) :: flags
+    INTEGER(SIZE_T), INTENT(INOUT) :: cd_nelmts
+    INTEGER(SIZE_T), INTENT(IN) :: namelen
+    CHARACTER(LEN=*), INTENT(OUT) :: name
+    INTEGER, INTENT(OUT) :: filter_id
+    INTEGER, INTENT(OUT) :: hdferr
+
+!            INTEGER, EXTERNAL :: h5pget_filter_c
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5pget_filter_c(prp_id, filter_number, flags, cd_nelmts,  &
+            cd_values, namelen, name, filter_id ) &
+            BIND(C,NAME='h5pget_filter_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         INTEGER, INTENT(IN) :: filter_number
+         INTEGER, DIMENSION(*), INTENT(OUT) :: cd_values
+         INTEGER, INTENT(OUT) :: flags
+         INTEGER(SIZE_T), INTENT(INOUT) :: cd_nelmts
+         INTEGER(SIZE_T), INTENT(IN) :: namelen
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(OUT) :: name
+         INTEGER, INTENT(OUT) :: filter_id
+       END FUNCTION h5pget_filter_c
+    END INTERFACE
+
+    hdferr = h5pget_filter_c(prp_id, filter_number, flags, cd_nelmts,  &
+         cd_values, namelen, name, filter_id )
+  END SUBROUTINE h5pget_filter_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Adds an external file to the list of external files.
+!!
+!! \param prp_id Dataset creation property list identifier.
+!! \param name   Name of external file.
+!! \param offset Offset in bytes from the beginning of the file to the location in the file where the data starts.
+!! \param bytes  Size of the external file data.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Pset_external()
+!!
+  SUBROUTINE h5pset_external_f(prp_id, name, offset, bytes, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    INTEGER(OFF_T), INTENT(IN) :: offset
+    INTEGER(HSIZE_T), INTENT(IN) :: bytes
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: namelen
+
+    INTERFACE
+       INTEGER FUNCTION h5pset_external_c(prp_id, name,namelen, offset, bytes) &
+            BIND(C,NAME='h5pset_external_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, OFF_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+         INTEGER :: namelen
+         INTEGER(OFF_T), INTENT(IN) :: offset
+         INTEGER(HSIZE_T), INTENT(IN) :: bytes
+       END FUNCTION h5pset_external_c
+    END INTERFACE
+
+    namelen = LEN(name)
+    hdferr = h5pset_external_c(prp_id, name, namelen, offset, bytes)
+  END SUBROUTINE h5pset_external_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Returns the number of external files for a dataset.
+!!
+!! \param prp_id Dataset creation property list identifier.
+!! \param count  Number of external files for the specified dataset.
+!! \param hdferr \fortran_error
+!!
+!! See C API: int H5Pget_external_count(hid_t plist_id);
+!!
+  SUBROUTINE h5pget_external_count_f(prp_id, count, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER, INTENT(OUT) :: count
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pget_external_count_c(prp_id, count) &
+            BIND(C,NAME='h5pget_external_count_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         INTEGER, INTENT(OUT) :: count
+       END FUNCTION h5pget_external_count_c
+    END INTERFACE
+
+    hdferr = h5pget_external_count_c(prp_id, count)
+  END SUBROUTINE h5pget_external_count_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Returns information about an external file.
+!!
+!! \param prp_id    Dataset creation property list identifier.
+!! \param idx       External file index.
+!! \param name_size Maximum size of name array.
+!! \param name      Name of the external file.
+!! \param offset    Offset in bytes from the beginning of the file to the location in the file where the data starts.
+!! \param bytes     Size of the external file data.
+!! \param hdferr    \fortran_error
+!!
+!! See C API: @ref H5Pget_external()
+!!
+  SUBROUTINE h5pget_external_f(prp_id, idx, name_size, name, offset,bytes, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER, INTENT(IN) :: idx
+    INTEGER(SIZE_T), INTENT(IN) :: name_size
+    CHARACTER(LEN=*), INTENT(OUT) :: name
+    INTEGER(OFF_T), INTENT(OUT) :: offset
+    INTEGER(HSIZE_T), INTENT(OUT) :: bytes
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pget_external_c(prp_id, idx, name_size, name, offset, bytes) &
+            BIND(C,NAME='h5pget_external_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T, HSIZE_T, OFF_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         INTEGER, INTENT(IN) :: idx
+         INTEGER(SIZE_T), INTENT(IN) :: name_size
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(OUT) :: name
+         INTEGER(OFF_T), INTENT(OUT) :: offset
+         INTEGER(HSIZE_T), INTENT(OUT) :: bytes
+       END FUNCTION h5pget_external_c
+    END INTERFACE
+
+    hdferr = h5pget_external_c(prp_id, idx, name_size, name, offset, bytes)
+  END SUBROUTINE h5pget_external_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets B-tree split ratios for a dataset transfer property list.
+!!
+!! \param prp_id The dataset transfer property list identifier.
+!! \param left   The B-tree split ratio for left-most nodes.
+!! \param middle The B-tree split ratio for all other nodes.
+!! \param right  The B-tree split ratio for right-most nodes.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Pset_btree_ratios()
+!!
+  SUBROUTINE h5pset_btree_ratios_f(prp_id, left, middle, right, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    REAL, INTENT(IN) :: left
+    REAL, INTENT(IN) :: middle
+    REAL, INTENT(IN) :: right
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION  h5pset_btree_ratios_c(prp_id, left, middle, right) &
+            BIND(C,NAME='h5pset_btree_ratios_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         REAL, INTENT(IN) :: left
+         REAL, INTENT(IN) :: middle
+         REAL, INTENT(IN) :: right
+       END FUNCTION h5pset_btree_ratios_c
+    END INTERFACE
+
+    hdferr = h5pset_btree_ratios_c(prp_id, left, middle, right)
+  END SUBROUTINE h5pset_btree_ratios_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Gets B-tree split ratios for a dataset transfer property list
+!!
+!! \param prp_id The dataset transfer property list identifier.
+!! \param left   The B-tree split ratio for left-most nodes.
+!! \param middle The B-tree split ratio for all other nodes.
+!! \param right  The B-tree split ratio for right-most nodes.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Pget_btree_ratios()
+!!
+  SUBROUTINE h5pget_btree_ratios_f(prp_id, left, middle, right, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    REAL, INTENT(OUT) :: left
+    REAL, INTENT(OUT) :: middle
+    REAL, INTENT(OUT) :: right
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION  h5pget_btree_ratios_c(prp_id, left, middle, right) &
+            BIND(C,NAME='h5pget_btree_ratios_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         REAL, INTENT(OUT) :: left
+         REAL, INTENT(OUT) :: middle
+         REAL, INTENT(OUT) :: right
+       END FUNCTION h5pget_btree_ratios_c
+    END INTERFACE
+
+    hdferr = h5pget_btree_ratios_c(prp_id, left, middle, right)
+  END SUBROUTINE h5pget_btree_ratios_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Returns the degree for the file close behavior.
+!!
+!! \param fapl_id File access property list identifier.
+!! \param degree  Possible values are:
+!!                \li H5F_CLOSE_DEFAULT_F
+!!                \li H5F_CLOSE_WEAK_F
+!!                \li H5F_CLOSE_SEMI_F
+!!                \li H5F_CLOSE_STRONG_F
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Pget_fclose_degree()
+!!
+  SUBROUTINE h5pget_fclose_degree_f(fapl_id, degree, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: fapl_id
+    INTEGER, INTENT(OUT) :: degree
+                                !  H5F_CLOSE_STRONG_F
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pget_fclose_degree_c(fapl_id, degree) &
+            BIND(C,NAME='h5pget_fclose_degree_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: fapl_id
+         INTEGER, INTENT(OUT) :: degree
+       END FUNCTION h5pget_fclose_degree_c
+    END INTERFACE
+
+    hdferr = h5pget_fclose_degree_c(fapl_id, degree)
+  END SUBROUTINE h5pget_fclose_degree_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets the degree for the file close behavior.
+!!
+!! \param fapl_id File access property list identifier.
+!! \param degree  Possible values are:
+!!                \li H5F_CLOSE_DEFAULT_F
+!!                \li H5F_CLOSE_WEAK_F
+!!                \li H5F_CLOSE_SEMI_F
+!!                \li H5F_CLOSE_STRONG_F
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Pset_fclose_degree()
+!!
+  SUBROUTINE h5pset_fclose_degree_f(fapl_id, degree, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: fapl_id
+    INTEGER, INTENT(IN) :: degree
+                                !  H5F_CLOSE_STRONG_F
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pset_fclose_degree_c(fapl_id, degree) &
+            BIND(C,NAME='h5pset_fclose_degree_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: fapl_id
+         INTEGER, INTENT(IN) :: degree
+       END FUNCTION h5pset_fclose_degree_c
+    END INTERFACE
+
+    hdferr = h5pset_fclose_degree_c(fapl_id, degree)
+  END SUBROUTINE h5pset_fclose_degree_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Checks if two property lists are equal
+!!
+!! \param plist1_id Property list identifier.
+!! \param plist2_id Property list identifier.
+!! \param flag      Flag, Possible values: .TRUE. or .FALSE.
+!! \param hdferr:   \fortran_error and flag is set to .FALSE.
+!!
+!! See C API: @ref H5Pequal()
+!!
+  SUBROUTINE h5pequal_f(plist1_id, plist2_id, flag, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: plist1_id
+    INTEGER(HID_T), INTENT(IN) :: plist2_id
+    LOGICAL, INTENT(OUT)       :: flag
+    INTEGER, INTENT(OUT)       :: hdferr
+    INTEGER                    :: c_flag
+
+    INTERFACE
+       INTEGER FUNCTION h5pequal_c(plist1_id, plist2_id, c_flag) &
+            BIND(C,NAME='h5pequal_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: plist1_id
+         INTEGER(HID_T), INTENT(IN) :: plist2_id
+         INTEGER, INTENT(OUT) :: c_flag
+       END FUNCTION h5pequal_c
+    END INTERFACE
+
+    flag = .FALSE.
+    hdferr = h5pequal_c(plist1_id, plist2_id, c_flag)
+    IF (c_flag .GT. 0) flag = .TRUE.
+  END SUBROUTINE h5pequal_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets sixe for conversion buffer
+!!
+!! \param plist_id Data transfer property list identifier.
+!! \param size     Buffer size.
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Pset_buffer()
+!!
+  SUBROUTINE h5pset_buffer_f(plist_id, size, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: plist_id
+    INTEGER(HSIZE_T), INTENT(IN) :: size
+    INTEGER, INTENT(OUT)       :: hdferr
+
+    INTERFACE
+       INTEGER FUNCTION h5pset_buffer_c(plist_id, size) &
+            BIND(C,NAME='h5pset_buffer_c')
+         IMPORT :: HID_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: plist_id
+         INTEGER(HSIZE_T), INTENT(IN) :: size
+       END FUNCTION h5pset_buffer_c
+    END INTERFACE
+
+    hdferr = h5pset_buffer_c(plist_id, size)
+  END SUBROUTINE h5pset_buffer_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Gets size for conversion buffer
+!!
+!! \param plist_id Data transfer property list identifier.
+!! \param size     Buffer size.
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Pget_buffer()
+!!
+  SUBROUTINE h5pget_buffer_f(plist_id, size, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: plist_id
+    INTEGER(HSIZE_T), INTENT(OUT) :: size
+    INTEGER, INTENT(OUT)       :: hdferr
+
+    INTERFACE
+       INTEGER FUNCTION h5pget_buffer_c(plist_id, size) &
+            BIND(C,NAME='h5pget_buffer_c')
+         IMPORT :: HID_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: plist_id
+         INTEGER(HSIZE_T), INTENT(OUT) :: size
+       END FUNCTION h5pget_buffer_c
+    END INTERFACE
+
+    hdferr = h5pget_buffer_c(plist_id, size)
+  END SUBROUTINE h5pget_buffer_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Check if fill value is defined.
+!!
+!! \param plist_id Dataset creation property list identifier.
+!! \param flag     Fill value status flag. Possible values are:
+!!                 \li H5D_FILL_VALUE_ERROR_F
+!!                 \li H5D_FILL_VALUE_UNDEFINED_F
+!!                 \li H5D_FILL_VALUE_DEFAULT_F
+!!                 \li H5D_FILL_VALUE_USER_DEFINED_F
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Pfill_value_defined()
+!!
+  SUBROUTINE h5pfill_value_defined_f(plist_id, flag, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: plist_id
+    INTEGER, INTENT(OUT) :: flag
+                                            !  H5D_FILL_VALUE_USER_DEFINED_F
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pfill_value_defined_c(plist_id, flag) &
+            BIND(C,NAME='h5pfill_value_defined_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: plist_id
+         INTEGER, INTENT(OUT) :: flag
+       END FUNCTION h5pfill_value_defined_c
+    END INTERFACE
+
+    hdferr = h5pfill_value_defined_c(plist_id, flag)
+  END SUBROUTINE h5pfill_value_defined_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Set space allocation time for dataset during creation.
+!!
+!! \param plist_id Dataset creation property list identifier.
+!! \param flag     Allocation time flag: Possible values are:
+!!                 \li H5D_ALLOC_TIME_ERROR_F
+!!                 \li H5D_ALLOC_TIME_DEFAULT_F
+!!                 \li H5D_ALLOC_TIME_EARLY_F
+!!                 \li H5D_ALLOC_TIME_LATE_F
+!!                 \li H5D_ALLOC_TIME_INCR_F
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Pset_alloc_time()
+!!
+  SUBROUTINE h5pset_alloc_time_f(plist_id, flag, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: plist_id
+    INTEGER, INTENT(IN) :: flag
+    INTEGER, INTENT(OUT) :: hdferr
+
+    INTERFACE
+       INTEGER FUNCTION h5pset_alloc_time_c(plist_id, flag) &
+            BIND(C,NAME='h5pset_alloc_time_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: plist_id
+         INTEGER, INTENT(IN) :: flag
+       END FUNCTION h5pset_alloc_time_c
+    END INTERFACE
+
+    hdferr = h5pset_alloc_time_c(plist_id, flag)
+  END SUBROUTINE h5pset_alloc_time_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Get space allocation time for dataset during creation.
+!!
+!! \param plist_id Dataset creation property list identifier.
+!! \param flag     Allocation time flag. Possible values are:
+!!                 \li H5D_ALLOC_TIME_ERROR_F
+!!                 \li H5D_ALLOC_TIME_DEFAULT_F
+!!                 \li H5D_ALLOC_TIME_EARLY_F
+!!                 \li H5D_ALLOC_TIME_LATE_F
+!!                 \li H5D_ALLOC_TIME_INCR_F
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Pget_alloc_time()
+!!
+  SUBROUTINE h5pget_alloc_time_f(plist_id, flag, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: plist_id
+    INTEGER, INTENT(OUT) :: flag
+    INTEGER, INTENT(OUT) :: hdferr
+
+    INTERFACE
+       INTEGER FUNCTION h5pget_alloc_time_c(plist_id, flag) &
+            BIND(C,NAME='h5pget_alloc_time_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: plist_id
+         INTEGER, INTENT(OUT) :: flag
+       END FUNCTION h5pget_alloc_time_c
+    END INTERFACE
+
+    hdferr = h5pget_alloc_time_c(plist_id, flag)
+  END SUBROUTINE h5pget_alloc_time_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Set fill value writing time for dataset
+!!
+!! \param plist_id Dataset creation property list identifier.
+!! \param flag     Fill time flag: Possible values are:
+!!                 \li H5D_FILL_TIME_ERROR_F
+!!                 \li H5D_FILL_TIME_ALLOC_F
+!!                 \li H5D_FILL_TIME_NEVER_F
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Pset_fill_time()
+!!
+  SUBROUTINE h5pset_fill_time_f(plist_id, flag, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: plist_id
+    INTEGER, INTENT(IN) :: flag
+    INTEGER, INTENT(OUT) :: hdferr
+
+    INTERFACE
+       INTEGER FUNCTION h5pset_fill_time_c(plist_id, flag) &
+            BIND(C,NAME='h5pset_fill_time_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: plist_id
+         INTEGER, INTENT(IN) :: flag
+       END FUNCTION h5pset_fill_time_c
+    END INTERFACE
+
+    hdferr = h5pset_fill_time_c(plist_id, flag)
+  END SUBROUTINE h5pset_fill_time_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Get fill value writing time for dataset
+!!
+!! \param plist_id Dataset creation property list identifier.
+!!
+!! \param flag     Fill time flag. Possible values are:
+!!                 \li H5D_FILL_TIME_ERROR_F
+!!                 \li H5D_FILL_TIME_ALLOC_F
+!!                 \li H5D_FILL_TIME_NEVER_F
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Pget_fill_time()
+!!
+  SUBROUTINE h5pget_fill_time_f(plist_id, flag, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: plist_id
+    INTEGER, INTENT(OUT) :: flag
+    INTEGER, INTENT(OUT) :: hdferr
+
+    INTERFACE
+       INTEGER FUNCTION h5pget_fill_time_c(plist_id, flag) &
+            BIND(C,NAME='h5pget_fill_time_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: plist_id
+         INTEGER, INTENT(OUT) :: flag
+       END FUNCTION h5pget_fill_time_c
+    END INTERFACE
+
+    hdferr = h5pget_fill_time_c(plist_id, flag)
+  END SUBROUTINE h5pget_fill_time_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets the minimum size of metadata block allocations
+!!
+!! \param plist_id File access property list identifier.
+!! \param size     Metadata block size.
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Pset_meta_block_size()
+!!
+  SUBROUTINE h5pset_meta_block_size_f(plist_id, size, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: plist_id
+    INTEGER(HSIZE_T), INTENT(IN) :: size
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pset_meta_block_size_c(plist_id, size) &
+            BIND(C,NAME='h5pset_meta_block_size_c')
+         IMPORT :: HID_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: plist_id
+         INTEGER(HSIZE_T), INTENT(IN) :: size
+       END FUNCTION h5pset_meta_block_size_c
+    END INTERFACE
+
+    hdferr = h5pset_meta_block_size_c(plist_id, size)
+  END SUBROUTINE h5pset_meta_block_size_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Gets the minimum size of metadata block allocations
+!!
+!! \param plist_id File access property list identifier.
+!! \param size     Metadata block size.
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Pget_meta_block_size()
+!!
+  SUBROUTINE h5pget_meta_block_size_f(plist_id, size, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: plist_id
+    INTEGER(HSIZE_T), INTENT(OUT) :: size
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pget_meta_block_size_c(plist_id, size) &
+            BIND(C,NAME='h5pget_meta_block_size_c')
+         IMPORT :: HID_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: plist_id
+         INTEGER(HSIZE_T), INTENT(OUT) :: size
+       END FUNCTION h5pget_meta_block_size_c
+    END INTERFACE
+
+    hdferr = h5pget_meta_block_size_c(plist_id, size)
+  END SUBROUTINE h5pget_meta_block_size_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets the maximum size of the data sieve buffer
+!!
+!! \param plist_id File access property list identifier.
+!! \param size     Sieve buffer size.
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Pset_sieve_buf_size()
+!!
+  SUBROUTINE h5pset_sieve_buf_size_f(plist_id, size, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: plist_id
+    INTEGER(SIZE_T), INTENT(IN) :: size
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pset_sieve_buf_size_c(plist_id, size) &
+            BIND(C,NAME='h5pset_sieve_buf_size_c')
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: plist_id
+         INTEGER(SIZE_T), INTENT(IN) :: size
+       END FUNCTION h5pset_sieve_buf_size_c
+    END INTERFACE
+
+    hdferr = h5pset_sieve_buf_size_c(plist_id, size)
+  END SUBROUTINE h5pset_sieve_buf_size_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Gets the maximum size of the data sieve buffer
+!!
+!! \param plist_id File access property list identifier.
+!! \param size     Sieve buffer size.
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Pget_sieve_buf_size()
+!!
+  SUBROUTINE h5pget_sieve_buf_size_f(plist_id, size, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: plist_id
+    INTEGER(SIZE_T), INTENT(OUT) :: size
+    INTEGER, INTENT(OUT)       :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pget_sieve_buf_size_c(plist_id, size) &
+            BIND(C,NAME='h5pget_sieve_buf_size_c')
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: plist_id
+         INTEGER(SIZE_T), INTENT(OUT) :: size
+       END FUNCTION h5pget_sieve_buf_size_c
+    END INTERFACE
+
+    hdferr = h5pget_sieve_buf_size_c(plist_id, size)
+  END SUBROUTINE h5pget_sieve_buf_size_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets the minimum size of "small" raw data block
+!!
+!! \param plist_id File access property list identifier.
+!! \param size     Small raw data block size.
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Pset_small_data_block_size()
+!!
+  SUBROUTINE h5pset_small_data_block_size_f(plist_id, size, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: plist_id
+    INTEGER(HSIZE_T), INTENT(IN) :: size
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pset_small_data_block_size_c(plist_id, size) &
+            BIND(C,NAME='h5pset_small_data_block_size_c')
+         IMPORT :: HID_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: plist_id
+         INTEGER(HSIZE_T), INTENT(IN) :: size
+       END FUNCTION h5pset_small_data_block_size_c
+    END INTERFACE
+
+    hdferr = h5pset_small_data_block_size_c(plist_id, size)
+  END SUBROUTINE h5pset_small_data_block_size_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Gets the minimum size of "small" raw data block
+!!
+!! \param plist_id File access property list identifier.
+!! \param size     Small raw data block size.
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Pget_small_data_block_size()
+!!
+  SUBROUTINE h5pget_small_data_block_size_f(plist_id, size, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: plist_id
+    INTEGER(HSIZE_T), INTENT(OUT) :: size
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pget_small_data_block_size_c(plist_id, size) &
+            BIND(C,NAME='h5pget_small_data_block_size_c')
+         IMPORT :: HID_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: plist_id
+         INTEGER(HSIZE_T), INTENT(OUT) :: size
+       END FUNCTION h5pget_small_data_block_size_c
+    END INTERFACE
+
+    hdferr = h5pget_small_data_block_size_c(plist_id, size)
+  END SUBROUTINE h5pget_small_data_block_size_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Set the number of "I/O" vectors (vector size)
+!!
+!! \param plist_id Dataset transfer property list identifier.
+!! \param size     Vector size.
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Pset_hyper_vector_size()
+!!
+  SUBROUTINE h5pset_hyper_vector_size_f(plist_id, size, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: plist_id
+    INTEGER(SIZE_T), INTENT(IN) :: size
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pset_hyper_vector_size_c(plist_id, size) &
+            BIND(C,NAME='h5pset_hyper_vector_size_c')
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: plist_id
+         INTEGER(SIZE_T), INTENT(IN) :: size
+       END FUNCTION h5pset_hyper_vector_size_c
+    END INTERFACE
+
+    hdferr = h5pset_hyper_vector_size_c(plist_id, size)
+  END SUBROUTINE h5pset_hyper_vector_size_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Get the number of "I/O" vectors (vector size)
+!!
+!! \param plist_id Dataset transfer property list identifier.
+!! \param size     Vector size.
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Pget_hyper_vector_size()
+!!
+  SUBROUTINE h5pget_hyper_vector_size_f(plist_id, size, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: plist_id
+    INTEGER(SIZE_T), INTENT(OUT) :: size
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pget_hyper_vector_size_c(plist_id, size) &
+            BIND(C,NAME='h5pget_hyper_vector_size_c')
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: plist_id
+         INTEGER(SIZE_T), INTENT(OUT) :: size
+       END FUNCTION h5pget_hyper_vector_size_c
+    END INTERFACE
+
+    hdferr = h5pget_hyper_vector_size_c(plist_id, size)
+  END SUBROUTINE h5pget_hyper_vector_size_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Queries whether a property name exists in a property list or class.
+!!
+!! \param prp_id Property list identifier to query.
+!! \param name   Name of property to check for.
+!! \param flag   Logical flag.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Pexist()
+!!
+  SUBROUTINE h5pexist_f(prp_id, name, flag, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    LOGICAL, INTENT(OUT) :: flag
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: name_len
+
+    INTERFACE
+       INTEGER FUNCTION h5pexist_c(prp_id, name, name_len) &
+            BIND(C,NAME='h5pexist_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+         INTEGER, INTENT(IN)         :: name_len
+       END FUNCTION h5pexist_c
+    END INTERFACE
+    flag = .FALSE.
+    name_len = LEN(name)
+    hdferr = h5pexist_c(prp_id, name , name_len)
+    IF (hdferr > 0) THEN
+       flag = .TRUE.
+       hdferr = 0
+    ENDIF
+  END SUBROUTINE h5pexist_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Queries the size of a property value in bytes.
+!!
+!! \param prp_id Property list identifier to query.
+!! \param name   Name of property to query.
+!! \param size   Size of property in bytes.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Pget_size()
+!!
+  SUBROUTINE h5pget_size_f(prp_id, name, size, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    INTEGER(SIZE_T), INTENT(OUT) :: size
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: name_len
+
+    INTERFACE
+       INTEGER FUNCTION h5pget_size_c(prp_id, name, name_len, size) &
+            BIND(C,NAME='h5pget_size_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+         INTEGER, INTENT(IN)         :: name_len
+         INTEGER(SIZE_T), INTENT(OUT) :: size
+       END FUNCTION h5pget_size_c
+    END INTERFACE
+    name_len = LEN(name)
+    hdferr = h5pget_size_c(prp_id, name , name_len, size)
+  END SUBROUTINE h5pget_size_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Queries number of properties in property list or class
+!!
+!! \param prp_id Iproperty list identifier to query.
+!! \param nprops Number of properties in property object.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Pget_nprops()
+!!
+  SUBROUTINE h5pget_nprops_f(prp_id, nprops, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER(SIZE_T), INTENT(OUT) :: nprops
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pget_nprops_c(prp_id, nprops) &
+            BIND(C,NAME='h5pget_nprops_c')
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         INTEGER(SIZE_T), INTENT(OUT) :: nprops
+       END FUNCTION h5pget_nprops_c
+    END INTERFACE
+    hdferr = h5pget_nprops_c(prp_id, nprops)
+  END SUBROUTINE h5pget_nprops_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Queries the name of a class.
+!!
+!! \param prp_id  Property list identifier to query.
+!! \param name    Name of a class.
+!! \param size    Actual length of the class name.
+!!                NOTE: If provided buffer "name" is smaller, than name will be
+!!                      truncated to fit into provided user buffer.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Pget_class_name()
+!!
+  SUBROUTINE h5pget_class_name_f(prp_id, name, size, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    CHARACTER(LEN=*), INTENT(OUT) :: name
+    INTEGER, INTENT(OUT) :: size
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: name_len
+
+    INTERFACE
+       INTEGER FUNCTION h5pget_class_name_c(prp_id, name, name_len) &
+            BIND(C,NAME='h5pget_class_name_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(INOUT) :: name
+         INTEGER, INTENT(IN)         :: name_len
+       END FUNCTION h5pget_class_name_c
+    END INTERFACE
+
+    name_len = LEN(name)
+    size = h5pget_class_name_c(prp_id, name, name_len)
+
+    hdferr = 0
+    IF(size.LT.0) hdferr = -1
+
+  END SUBROUTINE h5pget_class_name_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Retrieves the parent class of a generic property class.
+!!
+!! \param prp_id    Property list identifier to query.
+!! \param parent_id Identifier of the parent class.
+!! \param hdferr:   \fortran_error
+!!
+!! See C API: @ref H5Pget_class_parent()
+!!
+  SUBROUTINE h5pget_class_parent_f(prp_id, parent_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER(HID_T), INTENT(OUT) :: parent_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pget_class_parent_c(prp_id, parent_id) &
+            BIND(C,NAME='h5pget_class_parent_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         INTEGER(HID_T), INTENT(OUT) :: parent_id
+       END FUNCTION h5pget_class_parent_c
+    END INTERFACE
+    hdferr = h5pget_class_parent_c(prp_id, parent_id)
+  END SUBROUTINE h5pget_class_parent_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Determines whether a property list is a member of a class.
+!!
+!! \param plist   Property list identifier.
+!! \param pclass  Identifier of the property class.
+!! \param flag    TRUE. if a member, .FALSE. otherwise.
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Pisa_class()
+!!
+  SUBROUTINE h5pisa_class_f(plist, pclass, flag, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: plist
+    INTEGER(HID_T), INTENT(IN) :: pclass
+    LOGICAL, INTENT(OUT) :: flag
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pisa_class_c(plist, pclass) &
+            BIND(C,NAME='h5pisa_class_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: plist
+         INTEGER(HID_T), INTENT(IN) :: pclass
+       END FUNCTION h5pisa_class_c
+    END INTERFACE
+    flag = .FALSE.
+    hdferr = h5pisa_class_c(plist, pclass)
+    IF (hdferr .GT. 0) THEN
+       flag = .TRUE.
+       hdferr = 0
+    ENDIF
+  END SUBROUTINE h5pisa_class_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Copies a property from one list or class to another.
+!!
+!! \param dst_id  Identifier of the destination property list.
+!! \param src_id  Identifier of the source property list.
+!! \param name    Name of the property to copy.
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Pcopy_prop()
+!!
+  SUBROUTINE h5pcopy_prop_f(dst_id, src_id, name, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dst_id
+    INTEGER(HID_T), INTENT(IN) :: src_id
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: name_len
+
+    INTERFACE
+       INTEGER FUNCTION h5pcopy_prop_c(dst_id, src_id, name, name_len) &
+            BIND(C,NAME='h5pcopy_prop_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: dst_id
+         INTEGER(HID_T), INTENT(IN) :: src_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+         INTEGER, INTENT(IN)         :: name_len
+       END FUNCTION h5pcopy_prop_c
+    END INTERFACE
+    name_len = LEN(name)
+    hdferr = h5pcopy_prop_c(dst_id, src_id, name , name_len)
+  END SUBROUTINE h5pcopy_prop_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Removes a property from a property list.
+!!
+!! \param plid    Property list identofoer.
+!! \param name    Name of the property to remove.
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Premove()
+!!
+  SUBROUTINE h5premove_f(plid, name, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: plid
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: name_len
+
+    INTERFACE
+       INTEGER FUNCTION h5premove_c(plid, name, name_len) &
+            BIND(C,NAME='h5premove_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: plid
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+         INTEGER, INTENT(IN)         :: name_len
+       END FUNCTION h5premove_c
+    END INTERFACE
+    name_len = LEN(name)
+    hdferr = h5premove_c(plid, name , name_len)
+  END SUBROUTINE h5premove_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Removes a property from a property list class.
+!!
+!! \param class   Property list class identifier.
+!! \param name    Name of the property to remove.
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Punregister()
+!!
+  SUBROUTINE h5punregister_f(class, name, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: class
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: name_len
+
+    INTERFACE
+       INTEGER FUNCTION h5punregister_c(class, name, name_len) &
+            BIND(C,NAME='h5punregister_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: class
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+         INTEGER, INTENT(IN)         :: name_len
+       END FUNCTION h5punregister_c
+    END INTERFACE
+    name_len = LEN(name)
+    hdferr = h5punregister_c(class, name , name_len)
+  END SUBROUTINE h5punregister_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Closes an existing property list class.
+!!
+!! \param class  Property list class identifier.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Pclose_class()
+!!
+  SUBROUTINE h5pclose_class_f(class, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: class
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pclose_class_c(class) &
+            BIND(C,NAME='h5pclose_class_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: class
+       END FUNCTION h5pclose_class_c
+    END INTERFACE
+    hdferr = h5pclose_class_c(class)
+  END SUBROUTINE h5pclose_class_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets shuffling filter
+!!
+!! \param prp_id Dataset creation property list identifier.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Pset_shuffle()
+!!
+  SUBROUTINE h5pset_shuffle_f(prp_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pset_shuffle_c(prp_id) &
+            BIND(C,NAME='h5pset_shuffle_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+       END FUNCTION h5pset_shuffle_c
+    END INTERFACE
+    hdferr = h5pset_shuffle_c(prp_id)
+
+  END SUBROUTINE h5pset_shuffle_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Enables/disables error detecting
+!!
+!! \param prp_id Dataset creation property list identifier.
+!! \param flag   EDC flag. Possible values:
+!!               \li H5Z_DISABLE_EDC_F
+!!               \li H5Z_ENABLE_EDC_F
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Pset_edc_check()
+!!
+  SUBROUTINE h5pset_edc_check_f(prp_id, flag, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER, INTENT(IN) :: flag
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pset_edc_check_c(prp_id, flag) &
+            BIND(C,NAME='h5pset_edc_check_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         INTEGER, INTENT(IN) :: flag
+       END FUNCTION h5pset_edc_check_c
+    END INTERFACE
+    hdferr = h5pset_edc_check_c(prp_id, flag)
+
+  END SUBROUTINE h5pset_edc_check_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Determines whether error-detection is enabled for dataset reads.
+!!
+!! \param prp_id Dataset creation property list identifier.
+!! \param flag   EDC flag; possible values:
+!!               \li H5Z_DISABLE_EDC_F
+!!               \li H5Z_ENABLE_EDC_F
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Pget_edc_check()
+!!
+  SUBROUTINE h5pget_edc_check_f(prp_id, flag, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER, INTENT(OUT) :: flag
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pget_edc_check_c(prp_id, flag) &
+            BIND(C,NAME='h5pget_edc_check_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         INTEGER, INTENT(OUT) :: flag
+       END FUNCTION h5pget_edc_check_c
+    END INTERFACE
+    hdferr = h5pget_edc_check_c(prp_id, flag)
+
+  END SUBROUTINE h5pget_edc_check_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets Fletcher32 checksum of EDC for a dataset creation property list.
+!!
+!! \param prp_id Dataset creation property list identifier.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Pset_fletcher32()
+!!
+  SUBROUTINE h5pset_fletcher32_f(prp_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pset_fletcher32_c(prp_id) &
+            BIND(C,NAME='h5pset_fletcher32_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+       END FUNCTION h5pset_fletcher32_c
+    END INTERFACE
+    hdferr = h5pset_fletcher32_c(prp_id)
+
+  END SUBROUTINE h5pset_fletcher32_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets offset for family file driver.
+!!
+!! \param prp_id File creation property list identifier.
+!! \param offset File offset.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Pset_family_offset()
+!!
+  SUBROUTINE h5pset_family_offset_f(prp_id, offset, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER(HSIZE_T), INTENT(IN) :: offset
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pset_family_offset_c(prp_id, offset) &
+            BIND(C,NAME='h5pset_family_offset_c')
+         IMPORT :: HID_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         INTEGER(HSIZE_T), INTENT(IN) :: offset
+       END FUNCTION h5pset_family_offset_c
+    END INTERFACE
+    hdferr = h5pset_family_offset_c(prp_id, offset)
+
+  END SUBROUTINE h5pset_family_offset_f
+
+#ifdef H5_DOXYGEN
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets up use of the multi-file driver.
+!!
+!! \param prp_id    File creation property list identifier.
+!! \param memb_map  Mapping array.
+!! \param memb_fapl Property list for each memory usage type.
+!! \param memb_name Names of member file.
+!! \param memb_addr Offsets within the virtual address space, from 0 (zero) to HADDR_MAX_F, at which each type of data storage begins.
+!! \param relax     Flag.
+!! \param hdferr    \fortran_error
+!!
+  SUBROUTINE h5pset_fapl_multi_l(prp_id, memb_map, memb_fapl, memb_name, memb_addr, relax, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER, DIMENSION(*), INTENT(IN) :: memb_map
+    INTEGER(HID_T), DIMENSION(*), INTENT(IN) :: memb_fapl
+    CHARACTER(LEN=*), DIMENSION(*), INTENT(IN) :: memb_name
+    REAL, DIMENSION(*), INTENT(IN) :: memb_addr
+    LOGICAL, INTENT(IN) :: relax
+    INTEGER, INTENT(OUT) :: hdferr
+  END SUBROUTINE h5pset_fapl_multi_l
+
+#else
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets up use of the multi-file driver.
+!!
+!! \param prp_id    File creation property list identifier.
+!! \param memb_map  Mapping array.
+!! \param memb_fapl Property list for each memory usage type.
+!! \param memb_name Names of member file.
+!! \param memb_addr Offsets within the virtual address space, from 0 (zero) to HADDR_MAX_F, at which each type of data storage begins.
+!! \param relax     Flag.
+!! \param hdferr    \fortran_error
+!!
+  SUBROUTINE h5pset_fapl_multi_l(prp_id, memb_map, memb_fapl, memb_name, memb_addr, relax, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER, DIMENSION(*), INTENT(IN) :: memb_map
+    INTEGER(HID_T), DIMENSION(*), INTENT(IN) :: memb_fapl
+    CHARACTER(LEN=*), DIMENSION(*), INTENT(IN) :: memb_name
+    REAL, DIMENSION(*), INTENT(IN) :: memb_addr
+    LOGICAL, INTENT(IN) :: relax
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER, DIMENSION(1:H5FD_MEM_NTYPES_F) :: lenm
+    INTEGER :: maxlen
+    INTEGER :: flag = 0
+    INTEGER :: i
+
+    INTERFACE
+       INTEGER FUNCTION h5pset_fapl_multi_c(prp_id, memb_map, memb_fapl, memb_name, lenm, &
+            maxlen, memb_addr, flag) &
+            BIND(C,NAME='h5pset_fapl_multi_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         INTEGER, DIMENSION(*), INTENT(IN) :: memb_map
+         INTEGER(HID_T), DIMENSION(*), INTENT(IN) :: memb_fapl
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: memb_name
+         REAL, DIMENSION(*), INTENT(IN) :: memb_addr
+         INTEGER, DIMENSION(*) :: lenm
+         INTEGER :: maxlen
+         INTEGER, INTENT(IN) :: flag
+       END FUNCTION h5pset_fapl_multi_c
+    END INTERFACE
+
+    maxlen = LEN(memb_name(1))
+    DO i=1, H5FD_MEM_NTYPES_F
+       lenm(i) = LEN_TRIM(memb_name(i))
+    ENDDO
+    IF(relax) flag = 1
+    hdferr = h5pset_fapl_multi_c(prp_id, memb_map, memb_fapl, memb_name, lenm, maxlen, memb_addr, flag)
+
+  END SUBROUTINE h5pset_fapl_multi_l
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets up use of the multi-file driver.
+!!
+!! \param prp_id File creation property list identifier.
+!! \param relax  Flag.
+!! \param hdferr \fortran_error
+!!
+  SUBROUTINE h5pset_fapl_multi_s(prp_id, relax, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    LOGICAL, INTENT(IN) :: relax
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: flag
+
+    INTERFACE
+       INTEGER FUNCTION h5pset_fapl_multi_sc(prp_id,flag) &
+            BIND(C,NAME='h5pset_fapl_multi_sc')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         INTEGER, INTENT(IN) :: flag
+       END FUNCTION h5pset_fapl_multi_sc
+    END INTERFACE
+    flag = 0
+    IF (relax) flag = 1
+    hdferr = h5pset_fapl_multi_sc(prp_id, flag)
+
+  END SUBROUTINE h5pset_fapl_multi_s
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets up use of the multi-file driver.
+!!
+!! \param prp_id     File creation property list identifier.
+!! \param memb_map   Mapping array.
+!! \param memb_fapl  Property list for each memory usage type.
+!! \param memb_name  Names of member file.
+!! \param memb_addr  Offsets within the virtual address space, from 0 (zero) to HADDR_MAX_F, at which each type of data storage begins.
+!! \param relax      Flag.
+!! \param hdferr     \fortran_error
+!! \param maxlen_out Maximum length for memb_name array element.
+!!
+  SUBROUTINE h5pget_fapl_multi_f(prp_id, memb_map, memb_fapl, memb_name, memb_addr, relax, hdferr, maxlen_out)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER, DIMENSION(*), INTENT(OUT) :: memb_map
+    INTEGER(HID_T), DIMENSION(*), INTENT(OUT) :: memb_fapl
+    CHARACTER(LEN=*), DIMENSION(*), INTENT(OUT) :: memb_name
+    REAL, DIMENSION(*), INTENT(OUT) :: memb_addr
+    INTEGER, OPTIONAL, INTENT(OUT) :: maxlen_out
+    LOGICAL, INTENT(OUT) :: relax
+    INTEGER, INTENT(OUT) :: hdferr
+
+    INTEGER, DIMENSION(1:H5FD_MEM_NTYPES_F) :: lenm
+    INTEGER :: maxlen
+    INTEGER :: c_maxlen_out
+    INTEGER :: flag
+    INTEGER :: i
+
+    INTERFACE
+       INTEGER FUNCTION h5pget_fapl_multi_c(prp_id, memb_map, memb_fapl, memb_name, lenm, &
+            maxlen, memb_addr, flag, c_maxlen_out) &
+            BIND(C,NAME='h5pget_fapl_multi_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         INTEGER, DIMENSION(*), INTENT(OUT) :: memb_map
+         INTEGER(HID_T), DIMENSION(*), INTENT(OUT) :: memb_fapl
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(OUT) :: memb_name
+         REAL, DIMENSION(*), INTENT(OUT) :: memb_addr
+         INTEGER, DIMENSION(*) :: lenm
+         INTEGER :: maxlen
+         INTEGER :: c_maxlen_out
+         INTEGER, INTENT(OUT) :: flag
+       END FUNCTION h5pget_fapl_multi_c
+    END INTERFACE
+
+    maxlen = LEN(memb_name(1))
+    DO i=1, H5FD_MEM_NTYPES_F
+       lenm(i) = LEN_TRIM(memb_name(i))
+    ENDDO
+    hdferr = h5pget_fapl_multi_c(prp_id, memb_map, memb_fapl, memb_name, lenm, maxlen, memb_addr, flag, c_maxlen_out)
+
+    relax = .TRUE.
+    IF(flag .EQ. 0) relax = .FALSE.
+    IF(PRESENT(maxlen_out)) maxlen_out = c_maxlen_out
+  END SUBROUTINE h5pget_fapl_multi_f
+#endif
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets up use of szip compression
+!!
+!! \param prp_id           Dataset creation property list identifier.
+!! \param options_mask     A bit-mask conveying the desired SZIP options. Current valid values in Fortran are:
+!!                         \li H5_SZIP_EC_OM_F
+!!                         \li H5_SZIP_NN_OM_F
+!! \param pixels_per_block Szip parameters.
+!! \param hdferr           \fortran_error
+!!
+!! See C API: @ref H5Pset_szip()
+!!
+  SUBROUTINE h5pset_szip_f(prp_id, options_mask, pixels_per_block, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER, INTENT(IN) :: options_mask
+                                         !    H5_SZIP_NN_OM_F
+    INTEGER, INTENT(IN) :: pixels_per_block
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pset_szip_c(prp_id, options_mask, pixels_per_block) &
+            BIND(C,NAME='h5pset_szip_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         INTEGER, INTENT(IN) :: options_mask
+         INTEGER, INTENT(IN) :: pixels_per_block
+       END FUNCTION h5pset_szip_c
+    END INTERFACE
+    hdferr = h5pset_szip_c(prp_id, options_mask, pixels_per_block)
+
+  END SUBROUTINE h5pset_szip_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Checks if all filters set in the dataset creation property list are available.
+!!
+!! \param prp_id Data creation property list identifier.
+!! \param flag   .TRUE. if all filters are available, .FALSE. otherwise.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Pall_filters_avail()
+!!
+  SUBROUTINE h5pall_filters_avail_f(prp_id, flag, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    LOGICAL, INTENT(OUT) :: flag
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: status
+
+    INTERFACE
+       INTEGER FUNCTION h5pall_filters_avail_c(prp_id, status) &
+            BIND(C,NAME='h5pall_filters_avail_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         INTEGER, INTENT(OUT) :: status
+       END FUNCTION h5pall_filters_avail_c
+    END INTERFACE
+    flag = .TRUE.
+    hdferr = h5pall_filters_avail_c(prp_id, status)
+    IF (status .EQ. 0 ) flag = .FALSE.
+
+  END SUBROUTINE h5pall_filters_avail_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Returns information about a filter in a pipeline
+!!
+!! \param prp_id    Data creation or transfer property list identifier
+!! \param filter_id Filter identifier.
+!! \param flags     Bit vector specifying certain general properties of the filter
+!! \param cd_nelmts Number of elements in cd_values.
+!! \param cd_values Auxiliary data for the filter.
+!! \param namelen   Number of characters in the name buffer.
+!! \param name      Buffer to retrieve filter name.
+!! \param hdferr    \fortran_error
+!!
+!! See C API: @ref H5Pget_filter_by_id2()
+!!
+  SUBROUTINE h5pget_filter_by_id_f(prp_id, filter_id, flags, cd_nelmts, cd_values, namelen, name, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER, INTENT(IN) :: filter_id
+    INTEGER(SIZE_T), INTENT(INOUT) :: cd_nelmts
+    INTEGER, DIMENSION(*), INTENT(OUT) :: cd_values
+    INTEGER, INTENT(OUT) :: flags
+    INTEGER(SIZE_T), INTENT(IN) :: namelen
+    CHARACTER(LEN=*), INTENT(OUT) :: name
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pget_filter_by_id_c(prp_id, filter_id, flags, cd_nelmts,  &
+            cd_values, namelen, name) &
+            BIND(C,NAME='h5pget_filter_by_id_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         INTEGER, INTENT(IN) :: filter_id
+         INTEGER, DIMENSION(*), INTENT(OUT) :: cd_values
+         INTEGER, INTENT(OUT) :: flags
+         INTEGER(SIZE_T), INTENT(INOUT) :: cd_nelmts
+         INTEGER(SIZE_T), INTENT(IN) :: namelen
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(OUT) :: name
+       END FUNCTION h5pget_filter_by_id_c
+    END INTERFACE
+
+    hdferr = h5pget_filter_by_id_c(prp_id, filter_id, flags, cd_nelmts,  &
+         cd_values, namelen, name)
+  END SUBROUTINE h5pget_filter_by_id_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Adds a filter to the filter pipeline.
+!!
+!! \param prp_id    Data creation or transfer property list identifier
+!! \param filter    Filter to be modified.
+!! \param flags     Bit vector specifying certain general properties of the filter
+!! \param cd_nelmts Number of elements in cd_values.
+!! \param cd_values Auxiliary data for the filter.
+!! \param hdferr    \fortran_error
+!!
+!! See C API: @ref H5Pmodify_filter()
+!!
+  SUBROUTINE h5pmodify_filter_f(prp_id, filter, flags, cd_nelmts, cd_values,  hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER, INTENT(IN) :: filter
+    INTEGER, INTENT(IN) :: flags
+    INTEGER(SIZE_T), INTENT(IN) :: cd_nelmts
+    INTEGER, DIMENSION(*), INTENT(IN) :: cd_values
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pmodify_filter_c(prp_id, filter, flags, cd_nelmts, cd_values) &
+            BIND(C,NAME='h5pmodify_filter_c')
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         INTEGER, INTENT(IN) :: filter
+         INTEGER, INTENT(IN) :: flags
+         INTEGER(SIZE_T), INTENT(IN) :: cd_nelmts
+         INTEGER, DIMENSION(*), INTENT(IN) :: cd_values
+       END FUNCTION h5pmodify_filter_c
+    END INTERFACE
+
+    hdferr = h5pmodify_filter_c(prp_id, filter, flags, cd_nelmts, cd_values )
+  END SUBROUTINE h5pmodify_filter_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Delete one or more filters from the filter pipeline.
+!!
+!! \param prp_id Data creation or transfer property list identifier
+!! \param filter Filter to be removed.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Premove_filter()
+!!
+  SUBROUTINE h5premove_filter_f(prp_id, filter, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER, INTENT(IN) :: filter
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5premove_filter_c(prp_id, filter) &
+            BIND(C,NAME='h5premove_filter_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         INTEGER, INTENT(IN) :: filter
+       END FUNCTION h5premove_filter_c
+    END INTERFACE
+
+    hdferr = h5premove_filter_c(prp_id, filter)
+  END SUBROUTINE h5premove_filter_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Retrieves attribute storage phase change thresholds
+!!
+!! \param ocpl_id     Object (dataset or group) creation property list identifier.
+!! \param max_compact Maximum number of attributes to be stored in compact storage (Default: 8).
+!! \param min_dense   Minimum number of attributes to be stored in dense storage (Default: 6).
+!! \param hdferr      \fortran_error
+!!
+!! See C API: @ref H5Pget_attr_phase_change()
+!!
+  SUBROUTINE h5pget_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: ocpl_id
+    INTEGER, INTENT(OUT) :: max_compact
+    INTEGER, INTENT(OUT) :: min_dense
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pget_attr_phase_change_c(ocpl_id, max_compact, min_dense) &
+            BIND(C,NAME='h5pget_attr_phase_change_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: ocpl_id
+         INTEGER, INTENT(OUT) :: max_compact
+         INTEGER, INTENT(OUT) :: min_dense
+
+       END FUNCTION h5pget_attr_phase_change_c
+    END INTERFACE
+
+    hdferr = h5pget_attr_phase_change_c(ocpl_id, max_compact, min_dense)
+  END SUBROUTINE h5pget_attr_phase_change_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets tracking and indexing of attribute creation order
+!!
+!! \param ocpl_id         Object creation property list identifier.
+!! \param crt_order_flags Flags specifying whether to track and index attribute creation order.
+!! \param hdferr          \fortran_error
+!!
+!! See C API: @ref H5Pset_attr_creation_order()
+!!
+  SUBROUTINE h5pset_attr_creation_order_f(ocpl_id, crt_order_flags , hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: ocpl_id
+    INTEGER, INTENT(IN) :: crt_order_flags
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION H5Pset_attr_creation_order_c(ocpl_id, crt_order_flags) &
+            BIND(C,NAME='h5pset_attr_creation_order_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: ocpl_id
+         INTEGER, INTENT(IN) :: crt_order_flags
+
+       END FUNCTION H5Pset_attr_creation_order_c
+    END INTERFACE
+
+    hdferr = H5Pset_attr_creation_order_c(ocpl_id, crt_order_flags)
+  END SUBROUTINE h5pset_attr_creation_order_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets number of shared object header message indexes
+!!
+!! \param plist_id File creation property list.
+!! \param nindexes Number of shared object header message indexes to be available in files created with this property list.
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Pset_shared_mesg_nindexes()
+!!
+  SUBROUTINE h5pset_shared_mesg_nindexes_f( plist_id, nindexes, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: plist_id
+    INTEGER, INTENT(IN) :: nindexes
+    INTEGER, INTENT(OUT) :: hdferr
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5pset_shared_mesg_nindexes_c(plist_id, nindexes) &
+            BIND(C,NAME='h5pset_shared_mesg_nindexes_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: plist_id
+         INTEGER, INTENT(IN) :: nindexes
+
+       END FUNCTION H5pset_shared_mesg_nindexes_c
+    END INTERFACE
+
+    hdferr = h5pset_shared_mesg_nindexes_c(plist_id, nindexes)
+
+  END SUBROUTINE h5pset_shared_mesg_nindexes_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Configures the specified shared object header message index
+!!
+!! \param fcpl_id         File creation property list identifier.
+!! \param index_num       Index being configured.
+!! \param mesg_type_flags Types of messages that should be stored in this index.
+!! \param min_mesg_size   Minimum message size.
+!! \param hdferr          \fortran_error
+!!
+!! See C API: @ref H5Pset_shared_mesg_index()
+!!
+  SUBROUTINE h5pset_shared_mesg_index_f(fcpl_id, index_num, mesg_type_flags, min_mesg_size, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: fcpl_id
+    INTEGER, INTENT(IN) :: index_num
+    INTEGER, INTENT(IN) :: mesg_type_flags
+    INTEGER, INTENT(IN) :: min_mesg_size
+    INTEGER, INTENT(OUT) :: hdferr
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5pset_shared_mesg_index_c(fcpl_id, index_num, mesg_type_flags, min_mesg_size) &
+            BIND(C,NAME='h5pset_shared_mesg_index_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: fcpl_id
+         INTEGER, INTENT(IN) :: index_num
+         INTEGER, INTENT(IN) :: mesg_type_flags
+         INTEGER, INTENT(IN) :: min_mesg_size
+       END FUNCTION H5pset_shared_mesg_index_c
+    END INTERFACE
+
+    hdferr = h5pset_shared_mesg_index_c(fcpl_id, index_num, mesg_type_flags, min_mesg_size)
+
+  END SUBROUTINE h5pset_shared_mesg_index_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Retrieves tracking and indexing settings for attribute creation order
+!!
+!! \param ocpl_id         Object (group or dataset) creation property list identifier.
+!! \param crt_order_flags Flags specifying whether to track and index attribute creation order.
+!! \param hdferr          \fortran_error
+!!
+!! See C API: @ref H5Pget_attr_creation_order()
+!!
+  SUBROUTINE h5pget_attr_creation_order_f(ocpl_id, crt_order_flags, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: ocpl_id
+    INTEGER, INTENT(OUT) :: crt_order_flags
+    INTEGER, INTENT(OUT) :: hdferr
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5pget_attr_creation_order_c(ocpl_id, crt_order_flags) &
+            BIND(C,NAME='h5pget_attr_creation_order_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: ocpl_id
+         INTEGER, INTENT(OUT) :: crt_order_flags
+       END FUNCTION H5pget_attr_creation_order_c
+    END INTERFACE
+
+    hdferr = h5pget_attr_creation_order_c(ocpl_id, crt_order_flags)
+
+  END SUBROUTINE h5pget_attr_creation_order_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Retrieves the lower and upper bounds on the HDF5 library release versions that indirectly
+!!        determine the object format versions used when creating objects in the file.
+!!
+!! \param fapl_id File access property list identifier.
+!! \param low     The earliest version of the library that will be used for writing objects.
+!! \param high    The latest version of the library that will be used for writing objects.
+!! \param hdferr  \fortran_error
+!!
+!! Fortran Interface:
+!! See C API: @ref H5Pget_libver_bounds()
+!!
+  SUBROUTINE h5pget_libver_bounds_f(fapl_id, low, high, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: fapl_id
+    INTEGER, INTENT(OUT) :: low
+    INTEGER, INTENT(OUT) :: high
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(ENUM_T) :: low_c, high_c
+    INTEGER(C_INT) :: hdferr_c
+!
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER(C_INT) FUNCTION h5pget_libver_bounds(fapl_id, low, high) &
+            BIND(C,NAME='H5Pget_libver_bounds')
+         IMPORT :: C_INT, HID_T, ENUM_T
+         IMPLICIT NONE
+         INTEGER(HID_T) , INTENT(IN) , VALUE :: fapl_id
+         INTEGER(ENUM_T), INTENT(OUT) :: low
+         INTEGER(ENUM_T), INTENT(OUT) :: high
+       END FUNCTION h5pget_libver_bounds
+    END INTERFACE
+
+    hdferr_c = H5Pget_libver_bounds(fapl_id, low_c, high_c)
+
+    low  = INT(low_c)
+    high = INT(high_c)
+
+    hdferr = 0
+    IF(hdferr_c.LT.0) hdferr = -1
+
+  END SUBROUTINE h5pget_libver_bounds_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets bounds on library versions, and indirectly format versions, to be used when creating objects.
+!!
+!! \param fapl_id File access property list identifier.
+!! \param low     The earliest version of the library that will be used for writing objects.
+!! \param high    The latest version of the library that will be used for writing objects.
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Pset_libver_bounds()
+!!
+  SUBROUTINE h5pset_libver_bounds_f(fapl_id, low, high, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: fapl_id
+    INTEGER, INTENT(IN)  :: low
+    INTEGER, INTENT(IN)  :: high
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(C_INT) :: hdferr_c
+!
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER(C_INT) FUNCTION h5pset_libver_bounds(fapl_id, low, high) &
+            BIND(C,NAME='H5Pset_libver_bounds')
+         IMPORT :: C_INT, HID_T, ENUM_T
+         IMPLICIT NONE
+         INTEGER(HID_T),  INTENT(IN), VALUE :: fapl_id
+         INTEGER(ENUM_T), INTENT(IN), VALUE :: low
+         INTEGER(ENUM_T), INTENT(IN), VALUE :: high
+       END FUNCTION h5pset_libver_bounds
+    END INTERFACE
+
+    hdferr_c = h5pset_libver_bounds(fapl_id, INT(low, ENUM_T), INT(high, ENUM_T))
+
+    hdferr = 0
+    IF(hdferr_c.LT.0) hdferr = -1
+
+  END SUBROUTINE h5pset_libver_bounds_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets creation order tracking and indexing for links in a group.
+!!
+!! \param gcpl_id         Group creation property list identifier.
+!! \param crt_order_flags Creation order flag(s).
+!! \param hdferr          \fortran_error
+!!
+!! See C API: @ref H5Pset_link_creation_order()
+!!
+  SUBROUTINE h5pset_link_creation_order_f(gcpl_id, crt_order_flags, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: gcpl_id
+    INTEGER, INTENT(IN) :: crt_order_flags
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pset_link_creation_order_c(gcpl_id, crt_order_flags) &
+            BIND(C,NAME='h5pset_link_creation_order_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: gcpl_id
+         INTEGER, INTENT(IN) :: crt_order_flags
+
+       END FUNCTION H5pset_link_creation_order_c
+    END INTERFACE
+
+    hdferr = h5pset_link_creation_order_c(gcpl_id, crt_order_flags)
+
+  END SUBROUTINE h5pset_link_creation_order_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Queries the settings for conversion between compact and dense groups.
+!!
+!! \param gcpl_id     Group creation property list identifier.
+!! \param max_compact Maximum number of attributes to be stored in compact storage.
+!! \param min_dense   Minimum number of attributes to be stored in dense storage.
+!! \param hdferr      \fortran_error
+!!
+!! See C API: @ref H5Pget_link_phase_change()
+!!
+  SUBROUTINE h5pget_link_phase_change_f(gcpl_id, max_compact, min_dense, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: gcpl_id
+    INTEGER, INTENT(OUT) :: max_compact
+    INTEGER, INTENT(OUT) :: min_dense
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pget_link_phase_change_c(gcpl_id, max_compact, min_dense) &
+            BIND(C,NAME='h5pget_link_phase_change_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: gcpl_id
+         INTEGER, INTENT(OUT) :: max_compact
+         INTEGER, INTENT(OUT) :: min_dense
+
+       END FUNCTION h5pget_link_phase_change_c
+    END INTERFACE
+
+    hdferr = h5pget_link_phase_change_c(gcpl_id, max_compact, min_dense)
+  END SUBROUTINE h5pget_link_phase_change_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Returns whether times are tracked for an object.
+!!
+!! \param plist_id Property list id.
+!! \param flag     Object timestamp setting, .TRUE. or .FALSE.
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Pget_obj_track_times()
+!!
+  SUBROUTINE h5pget_obj_track_times_f(plist_id, flag, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: plist_id
+    LOGICAL, INTENT(OUT) :: flag
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: status
+!
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5pget_obj_track_times_c(plist_id, status) &
+            BIND(C,NAME='h5pget_obj_track_times_c')
+         IMPORT :: HID_T
+         INTEGER(HID_T), INTENT(IN) :: plist_id
+         INTEGER, INTENT(OUT) :: status
+       END FUNCTION h5pget_obj_track_times_c
+    END INTERFACE
+    flag = .TRUE.
+    hdferr = h5pget_obj_track_times_c(plist_id, status)
+    IF(status.EQ.0) flag = .FALSE.
+
+  END SUBROUTINE h5pget_obj_track_times_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Set whether the birth, access, modification & change times for an object are stored.
+!!
+!! \param plist_id Property list id.
+!! \param flag     Object timestamp setting, .TRUE. or .FALSE.
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Pset_obj_track_times()
+!!
+  SUBROUTINE h5pset_obj_track_times_f(plist_id, flag, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: plist_id
+    LOGICAL, INTENT(IN) :: flag
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: status
+!
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5pset_obj_track_times_c(plist_id, status) &
+            BIND(C,NAME='h5pset_obj_track_times_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: plist_id
+         INTEGER, INTENT(IN) :: status
+       END FUNCTION h5pset_obj_track_times_c
+    END INTERFACE
+
+    status = 0
+    IF(flag) status = 1
+
+    hdferr = h5pset_obj_track_times_c(plist_id, status)
+
+  END SUBROUTINE h5pset_obj_track_times_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Specifies in property list whether to create missing intermediate groups.
+!!
+!! \param lcpl_id            Link creation property list identifier.
+!! \param crt_intermed_group Specifies whether to create intermediate groups upon the creation of an object.
+!! \param hdferr             \fortran_error
+!!
+!! See C API: @ref H5Pset_create_intermediate_group()
+!!
+  SUBROUTINE h5pset_create_inter_group_f(lcpl_id, crt_intermed_group, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: lcpl_id
+    INTEGER, INTENT(IN) :: crt_intermed_group
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pset_create_inter_group_c(lcpl_id, crt_intermed_group) &
+            BIND(C,NAME='h5pset_create_inter_group_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: lcpl_id
+         INTEGER, INTENT(IN) :: crt_intermed_group
+       END FUNCTION h5pset_create_inter_group_c
+    END INTERFACE
+
+    hdferr = h5pset_create_inter_group_c(lcpl_id, crt_intermed_group)
+
+  END SUBROUTINE h5pset_create_inter_group_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Queries whether link creation order is tracked and/or indexed in a group.
+!!
+!! \param gcpl_id         Group creation property list identifier.
+!! \param crt_order_flags Creation order flag(s).
+!! \param hdferr          \fortran_error
+!!
+!! See C API: @ref H5Pget_link_creation_order()
+!!
+  SUBROUTINE h5pget_link_creation_order_f(gcpl_id, crt_order_flags, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: gcpl_id
+    INTEGER, INTENT(OUT) :: crt_order_flags
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pget_link_creation_order_c(gcpl_id, crt_order_flags) &
+            BIND(C,NAME='h5pget_link_creation_order_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: gcpl_id
+         INTEGER, INTENT(OUT) :: crt_order_flags
+
+       END FUNCTION H5pget_link_creation_order_c
+    END INTERFACE
+
+    hdferr = h5pget_link_creation_order_c(gcpl_id, crt_order_flags)
+
+  END SUBROUTINE h5pget_link_creation_order_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets the character encoding used to encode a string.
+!!
+!! \param plist_id Property list identifier.
+!! \param encoding Valid values for encoding are:
+!!                 \li H5T_CSET_ASCII_F -> US ASCII
+!!                 \li H5T_CSET_UTF8_F -> UTF-8 Unicode encoding
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Pset_char_encoding()
+!!
+  SUBROUTINE h5pset_char_encoding_f(plist_id, encoding, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: plist_id
+    INTEGER, INTENT(IN) :: encoding
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pset_char_encoding_c(plist_id, encoding) &
+            BIND(C,NAME='h5pset_char_encoding_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: plist_id
+         INTEGER, INTENT(IN) :: encoding
+
+       END FUNCTION H5pset_char_encoding_c
+    END INTERFACE
+
+    hdferr = h5pset_char_encoding_c(plist_id, encoding)
+
+  END SUBROUTINE h5pset_char_encoding_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Retrieves the character encoding used to create a string
+!!
+!! \param plist_id Property list identifier.
+!! \param encoding Valid values for encoding are:
+!!                 \li H5T_CSET_ASCII_F -> US ASCII
+!!                 \li H5T_CSET_UTF8_F -> UTF-8 Unicode encoding
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Pget_char_encoding()
+!!
+  SUBROUTINE  h5pget_char_encoding_f(plist_id, encoding, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: plist_id
+
+    INTEGER, INTENT(OUT) :: encoding
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pget_char_encoding_c(plist_id, encoding) &
+            BIND(C,NAME='h5pget_char_encoding_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: plist_id
+         INTEGER, INTENT(OUT) :: encoding
+
+       END FUNCTION H5pget_char_encoding_c
+    END INTERFACE
+
+    hdferr = h5pget_char_encoding_c(plist_id, encoding)
+
+  END SUBROUTINE h5pget_char_encoding_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets properties to be used when an object is copied.
+!!
+!! \param ocp_plist_id Object copy property list identifier.
+!! \param copy_options Copy option(s) to be set.
+!! \param hdferr       \fortran_error
+!!
+!! See C API: @ref H5Pset_copy_object()
+!!
+  SUBROUTINE h5pset_copy_object_f(ocp_plist_id, copy_options, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: ocp_plist_id
+    INTEGER, INTENT(IN) :: copy_options
+                                        !   H5O_COPY_EXPAND_REFERENCE_F
+                                        !   H5O_COPY_WITHOUT_ATTR_FLAG_F
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pset_copy_object_c(ocp_plist_id, copy_options) &
+            BIND(C,NAME='h5pset_copy_object_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: ocp_plist_id
+         INTEGER, INTENT(IN) :: copy_options
+       END FUNCTION h5pset_copy_object_c
+    END INTERFACE
+    hdferr = h5pset_copy_object_c(ocp_plist_id, copy_options)
+  END SUBROUTINE h5pset_copy_object_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Retrieves the properties to be used when an object is copied.
+!!
+!! \param ocp_plist_id Object copy property list identifier.
+!! \param copy_options Copy option(s) to be get.
+!! \param hdferr       \fortran_error
+!!
+!! See C API: @ref H5Pget_copy_object()
+!!
+  SUBROUTINE h5pget_copy_object_f(ocp_plist_id, copy_options, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: ocp_plist_id
+    INTEGER, INTENT(OUT) :: copy_options
+                                               !   H5O_COPY_EXPAND_REFERENCE_F
+                                               !   H5O_COPY_WITHOUT_ATTR_FLAG_F
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pget_copy_object_c(ocp_plist_id, copy_options) &
+            BIND(C,NAME='h5pget_copy_object_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: ocp_plist_id
+         INTEGER, INTENT(OUT) :: copy_options
+       END FUNCTION h5pget_copy_object_c
+    END INTERFACE
+    hdferr = h5pget_copy_object_c(ocp_plist_id, copy_options)
+  END SUBROUTINE h5pget_copy_object_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Retrieves a data transform expression.
+!!
+!! \param plist_id   Identifier of the property list or class.
+!! \param expression Buffer to hold transform expression.
+!! \param hdferr     Error code:
+!!                     Success:  Actual length of the expression. If provided buffer "expression" is
+!!                               smaller, than expression will be truncated to fit into provided user buffer.
+!!                     Failure: -1
+!! \param size       Registered size of the transform expression
+!!
+!! See C API: @ref H5Pget_data_transform()
+!!
+SUBROUTINE h5pget_data_transform_f(plist_id, expression, hdferr, size)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: plist_id
+    CHARACTER(LEN=*), INTENT(OUT) :: expression
+    INTEGER(SIZE_T), INTENT(OUT), OPTIONAL :: size
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: expression_len
+    INTEGER(SIZE_T) :: size_default
+
+    INTERFACE
+       INTEGER FUNCTION h5pget_data_transform_c(plist_id, expression, expression_len, size_default) &
+            BIND(C,NAME='h5pget_data_transform_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: plist_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(OUT) :: expression
+         INTEGER(SIZE_T) :: size_default
+         INTEGER :: expression_len
+       END FUNCTION h5pget_data_transform_c
+    END INTERFACE
+
+    size_default = 0
+    expression_len = LEN(expression)
+
+    hdferr = h5pget_data_transform_c(plist_id, expression, expression_len, size_default)
+
+    IF(present(size)) size = size_default
+
+  END SUBROUTINE h5pget_data_transform_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets a data transform expression.
+!!
+!! \param plist_id   Identifier of the property list or class.
+!! \param expression Buffer to hold transform expression.
+!! \param hdferr     \fortran_error
+!!
+!! See C API: @ref H5Pset_data_transform()
+!!
+  SUBROUTINE h5pset_data_transform_f(plist_id, expression, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: plist_id
+    CHARACTER(LEN=*), INTENT(IN) :: expression
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: expression_len
+
+    INTERFACE
+       INTEGER FUNCTION h5pset_data_transform_c(plist_id, expression, expression_len) &
+            BIND(C,NAME='h5pset_data_transform_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: plist_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: expression
+         INTEGER :: expression_len
+       END FUNCTION h5pset_data_transform_c
+    END INTERFACE
+
+    expression_len = LEN(expression)
+    hdferr = h5pset_data_transform_c(plist_id, expression, expression_len)
+
+  END SUBROUTINE h5pset_data_transform_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Queries the local heap size hint for original-style groups.
+!!
+!! \param gcpl_id   Group creation property list identifier.
+!! \param size_hint Hint for size of local heap.
+!! \param hdferr    \fortran_error
+!!
+!! See C API: @ref H5Pget_local_heap_size_hint()
+!!
+  SUBROUTINE h5pget_local_heap_size_hint_f(gcpl_id, size_hint, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: gcpl_id
+    INTEGER(SIZE_T), INTENT(OUT) :: size_hint
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pget_local_heap_size_hint_c(gcpl_id, size_hint) &
+            BIND(C,NAME='h5pget_local_heap_size_hint_c')
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: gcpl_id
+         INTEGER(SIZE_T), INTENT(OUT) :: size_hint
+       END FUNCTION H5Pget_local_heap_size_hint_c
+    END INTERFACE
+
+    hdferr = H5Pget_local_heap_size_hint_c(gcpl_id, size_hint)
+
+  END SUBROUTINE h5pget_local_heap_size_hint_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Queries data required to estimate required local heap or object header size.
+!!
+!! \param gcpl_id         Group creation property list identifier.
+!! \param est_num_entries Estimated number of links to be inserted into group.
+!! \param est_name_len    Estimated average length of link names.
+!! \param hdferr          \fortran_error
+!!
+!! See C API: @ref H5Pget_est_link_info()
+!!
+  SUBROUTINE h5pget_est_link_info_f(gcpl_id, est_num_entries, est_name_len, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: gcpl_id
+    INTEGER, INTENT(OUT) :: est_num_entries
+    INTEGER, INTENT(OUT) :: est_name_len
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pget_est_link_info_c(gcpl_id, est_num_entries, est_name_len) &
+            BIND(C,NAME='h5pget_est_link_info_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: gcpl_id
+         INTEGER, INTENT(OUT) :: est_num_entries
+         INTEGER, INTENT(OUT) :: est_name_len
+       END FUNCTION h5pget_est_link_info_c
+    END INTERFACE
+
+    hdferr = h5pget_est_link_info_c(gcpl_id, est_num_entries, est_name_len)
+
+  END SUBROUTINE h5pget_est_link_info_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets the local heap size hint for original-style groups.
+!!
+!! \param gcpl_id   Group creation property list identifier.
+!! \param size_hint Hint for size of local heap.
+!! \param hdferr    \fortran_error
+!!
+!! See C API: @ref H5Pset_local_heap_size_hint()
+!!
+  SUBROUTINE h5pset_local_heap_size_hint_f(gcpl_id, size_hint, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: gcpl_id
+    INTEGER(SIZE_T), INTENT(IN) :: size_hint
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pset_local_heap_size_hint_c(gcpl_id, size_hint) &
+            BIND(C,NAME='h5pset_local_heap_size_hint_c')
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: gcpl_id
+         INTEGER(SIZE_T), INTENT(IN) :: size_hint
+       END FUNCTION h5pset_local_heap_size_hint_c
+    END INTERFACE
+
+    hdferr = H5Pset_local_heap_size_hint_c(gcpl_id, size_hint)
+
+  END SUBROUTINE h5pset_local_heap_size_hint_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets estimated number of links and length of link names in a group.
+!!
+!! \param gcpl_id         Group creation property list identifier.
+!! \param est_num_entries Estimated number of links to be inserted into group.
+!! \param est_name_len    Estimated average length of link names.
+!! \param hdferr          \fortran_error
+!!
+!! See C API: @ref H5Pset_est_link_info()
+!!
+  SUBROUTINE h5pset_est_link_info_f(gcpl_id, est_num_entries, est_name_len, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: gcpl_id
+    INTEGER, INTENT(IN) :: est_num_entries
+    INTEGER, INTENT(IN) :: est_name_len
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pset_est_link_info_c(gcpl_id, est_num_entries, est_name_len) &
+            BIND(C,NAME='h5pset_est_link_info_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: gcpl_id
+         INTEGER, INTENT(IN) :: est_num_entries
+         INTEGER, INTENT(IN) :: est_name_len
+       END FUNCTION h5pset_est_link_info_c
+    END INTERFACE
+
+    hdferr = H5Pset_est_link_info_c(gcpl_id, est_num_entries, est_name_len)
+
+  END SUBROUTINE h5pset_est_link_info_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets the parameters for conversion between compact and dense groups.
+!!
+!! \param gcpl_id     Group creation property list identifier.
+!! \param max_compact Maximum number of attributes to be stored in compact storage.
+!! \param min_dense   Minimum number of attributes to be stored in dense storage.
+!! \param hdferr      \fortran_error
+!!
+!! See C API: @ref H5Pset_link_phase_change()
+!!
+SUBROUTINE h5pset_link_phase_change_f(gcpl_id, max_compact, min_dense, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: gcpl_id
+    INTEGER, INTENT(IN) :: max_compact
+    INTEGER, INTENT(IN) :: min_dense
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pset_link_phase_change_c(gcpl_id, max_compact, min_dense) &
+            BIND(C,NAME='h5pset_link_phase_change_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: gcpl_id
+         INTEGER, INTENT(IN) :: max_compact
+         INTEGER, INTENT(IN) :: min_dense
+       END FUNCTION h5pset_link_phase_change_c
+    END INTERFACE
+
+    hdferr = h5pset_link_phase_change_c(gcpl_id, max_compact, min_dense)
+  END SUBROUTINE h5pset_link_phase_change_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets up use of the direct I/O driver.
+!!
+!! \param fapl_id    File access property list identifier.
+!! \param alignment  Required memory alignment boundary.
+!! \param block_size File system block size.
+!! \param cbuf_size  Copy buffer size.
+!! \param hdferr     \fortran_error
+!!
+!! See C API: @ref H5Pset_fapl_direct()
+!!
+SUBROUTINE h5pset_fapl_direct_f(fapl_id, alignment, block_size, cbuf_size, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: fapl_id
+    INTEGER(SIZE_T), INTENT(IN) :: alignment
+    INTEGER(SIZE_T), INTENT(IN) :: block_size
+    INTEGER(SIZE_T), INTENT(IN) :: cbuf_size
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pset_fapl_direct_c(fapl_id, alignment, block_size, cbuf_size) &
+            BIND(C,NAME='h5pset_fapl_direct_c')
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: fapl_id
+         INTEGER(SIZE_T), INTENT(IN) :: alignment
+         INTEGER(SIZE_T), INTENT(IN) :: block_size
+         INTEGER(SIZE_T), INTENT(IN) :: cbuf_size
+       END FUNCTION h5pset_fapl_direct_c
+    END INTERFACE
+
+    hdferr = H5Pset_fapl_direct_c(fapl_id, alignment, block_size, cbuf_size)
+  END SUBROUTINE h5pset_fapl_direct_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Gets up use of the direct I/O driver.
+!!
+!! \param fapl_id    File access property list identifier.
+!! \param alignment  Required memory alignment boundary.
+!! \param block_size File system block size.
+!! \param cbuf_size  Copy buffer size.
+!! \param hdferr     \fortran_error
+!!
+!! See C API: @ref H5Pget_fapl_direct()
+!!
+  SUBROUTINE h5pget_fapl_direct_f(fapl_id, alignment, block_size, cbuf_size, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: fapl_id
+    INTEGER(SIZE_T), INTENT(OUT) :: alignment
+    INTEGER(SIZE_T), INTENT(OUT) :: block_size
+    INTEGER(SIZE_T), INTENT(OUT) :: cbuf_size
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pget_fapl_direct_c(fapl_id, alignment, block_size, cbuf_size) &
+            BIND(C,NAME='h5pget_fapl_direct_c')
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: fapl_id
+         INTEGER(SIZE_T), INTENT(OUT) :: alignment
+         INTEGER(SIZE_T), INTENT(OUT) :: block_size
+         INTEGER(SIZE_T), INTENT(OUT) :: cbuf_size
+       END FUNCTION h5pget_fapl_direct_c
+    END INTERFACE
+
+    hdferr = H5Pget_fapl_direct_c(fapl_id, alignment, block_size, cbuf_size)
+
+  END SUBROUTINE h5pget_fapl_direct_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets attribute storage phase change thresholds.
+!!
+!! \param ocpl_id     Object (dataset or group) creation property list identifier.
+!! \param max_compact Maximum number of attributes to be stored in compact storage, (Default: 8).
+!! \param min_dense   Minimum number of attributes to be stored in dense storage, (Default: 6).
+!! \param hdferr      \fortran_error
+!!
+!! See C API: @ref H5Pset_attr_phase_change()
+!!
+SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: ocpl_id
+    INTEGER, INTENT(IN) :: max_compact
+    INTEGER, INTENT(IN) :: min_dense
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pset_attr_phase_change_c(ocpl_id, max_compact, min_dense) &
+            BIND(C,NAME='h5pset_attr_phase_change_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: ocpl_id
+         INTEGER, INTENT(IN) :: max_compact
+         INTEGER, INTENT(IN) :: min_dense
+
+       END FUNCTION h5pset_attr_phase_change_c
+    END INTERFACE
+
+    hdferr = h5pset_attr_phase_change_c(ocpl_id, max_compact, min_dense)
+
+  END SUBROUTINE h5pset_attr_phase_change_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets up the use of the N-Bit filter.
+!!
+!! \param plist_id Dataset creation property list identifier.
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Pset_nbit()
+!!
+  SUBROUTINE h5pset_nbit_f(plist_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN)  :: plist_id
+    INTEGER       , INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION H5Pset_nbit_c(plist_id) &
+            BIND(C,NAME='h5pset_nbit_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: plist_id
+       END FUNCTION H5Pset_nbit_c
+    END INTERFACE
+
+    hdferr = H5Pset_nbit_c(plist_id)
+
+  END SUBROUTINE h5pset_nbit_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets up the use of the scale-offset filter.
+!!
+!! \param plist_id     Dataset creation property list identifier.
+!! \param scale_type   Flag indicating compression method. Valid values:
+!!                     \li H5Z_SO_FLOAT_DSCALE_F
+!!                     \li H5Z_SO_FLOAT_ESCALE_F
+!!                     \li H5Z_SO_INT_F
+!! \param scale_factor Parameter related to scale.
+!! \param hdferr       \fortran_error
+!!
+!! See C API: @ref H5Pset_scaleoffset()
+!!
+  SUBROUTINE h5pset_scaleoffset_f(plist_id, scale_type, scale_factor, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN)  :: plist_id
+    INTEGER       , INTENT(IN)  :: scale_type
+    INTEGER       , INTENT(IN)  :: scale_factor
+    INTEGER       , INTENT(OUT) :: hdferr
+
+    INTERFACE
+       INTEGER FUNCTION h5pset_scaleoffset_c(plist_id, scale_type, scale_factor) &
+            BIND(C,NAME='h5pset_scaleoffset_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: plist_id
+         INTEGER, INTENT(IN) :: scale_type
+         INTEGER, INTENT(IN) :: scale_factor
+       END FUNCTION h5pset_scaleoffset_c
+    END INTERFACE
+
+    hdferr = H5Pset_scaleoffset_c(plist_id, scale_type, scale_factor)
+
+  END SUBROUTINE h5pset_scaleoffset_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets maximum number of soft or user-defined link traversals.
+!!
+!! \param lapl_id File access property list identifier.
+!! \param nlinks  Maximum number of links to traverse.
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Pset_nlinks()
+!!
+  SUBROUTINE h5pset_nlinks_f(lapl_id, nlinks, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: lapl_id
+    INTEGER(SIZE_T), INTENT(IN) :: nlinks
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pset_nlinks_c(lapl_id, nlinks) &
+            BIND(C,NAME='h5pset_nlinks_c')
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: lapl_id
+         INTEGER(SIZE_T), INTENT(IN) :: nlinks
+       END FUNCTION h5pset_nlinks_c
+    END INTERFACE
+
+    hdferr = h5pset_nlinks_c(lapl_id, nlinks)
+
+  END SUBROUTINE h5pset_nlinks_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Gets maximum number of soft or user-defined link traversals.
+!!
+!! \param lapl_id File access property list identifier.
+!! \param nlinks  Maximum number of links to traverse.
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Pget_nlinks()
+!!
+  SUBROUTINE h5pget_nlinks_f(lapl_id, nlinks, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: lapl_id
+    INTEGER(SIZE_T), INTENT(OUT) :: nlinks
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pget_nlinks_c(lapl_id, nlinks) &
+            BIND(C,NAME='h5pget_nlinks_c')
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: lapl_id
+         INTEGER(SIZE_T), INTENT(OUT) :: nlinks
+       END FUNCTION h5pget_nlinks_c
+    END INTERFACE
+
+    hdferr = h5pget_nlinks_c(lapl_id, nlinks)
+
+  END SUBROUTINE h5pget_nlinks_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Determines whether property is set to enable creating missing intermediate groups.
+!!
+!! \param lcpl_id            Link creation property list identifier.
+!! \param crt_intermed_group Specifying whether to create intermediate groups upon the creation of an object.
+!! \param hdferr             \fortran_error
+!!
+!! See C API: @ref H5Pget_create_intermediate_group()
+!!
+  SUBROUTINE h5pget_create_inter_group_f(lcpl_id, crt_intermed_group, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: lcpl_id
+    INTEGER, INTENT(IN) :: crt_intermed_group
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pget_create_inter_group_c(lcpl_id, crt_intermed_group) &
+            BIND(C,NAME='h5pget_create_inter_group_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: lcpl_id
+         INTEGER, INTENT(IN) :: crt_intermed_group
+       END FUNCTION h5pget_create_inter_group_c
+    END INTERFACE
+
+    hdferr = h5pget_create_inter_group_c(lcpl_id, crt_intermed_group)
+
+  END SUBROUTINE h5pget_create_inter_group_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Set the number of objects in the meta data cache and the maximum number of chunks and bytes in the raw data chunk cache.
+!!  Once set, these values will override the values in the file access
+!!  property list.  Each of these values can be individually unset
+!!  (or not set at all) by passing the macros:
+!!    H5D_CHUNK_CACHE_NSLOTS_DFLT_F,
+!!    H5D_CHUNK_CACHE_NBYTES_DFLT_F, and/or
+!!    H5D_CHUNK_CACHE_W0_DFLT_F
+!!    as appropriate.
+!!
+!!  The RDCC_W0 value should be between 0 and 1 inclusive and
+!!  indicates how much chunks that have been fully read or fully
+!!  written are favored for preemption.  A value of zero means
+!!  fully read or written chunks are treated no differently than
+!!  other chunks (the preemption is strictly LRU) while a value
+!!  of one means fully read chunks are always preempted before
+!!  other chunks.
+!!
+!! \param dapl_id     Dataset access property list identifier.
+!! \param rdcc_nslots The number of chunk slots in the raw data chunk cache for this dataset.
+!! \param rdcc_nbytes The total size of the raw data chunk cache for this dataset.
+!! \param rdcc_w0     The chunk preemption policy for this dataset.
+!! \param hdferr      \fortran_error
+!!
+!! See C API: @ref H5Pset_chunk_cache()
+!!
+  SUBROUTINE h5pset_chunk_cache_f(dapl_id, rdcc_nslots, rdcc_nbytes, rdcc_w0, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dapl_id
+    INTEGER(SIZE_T), INTENT(IN) :: rdcc_nslots
+    INTEGER(SIZE_T), INTENT(IN) :: rdcc_nbytes
+    REAL, INTENT(IN) :: rdcc_w0
+    INTEGER, INTENT(OUT) :: hdferr
+
+    INTERFACE
+       INTEGER FUNCTION h5pset_chunk_cache_c(dapl_id, rdcc_nslots, rdcc_nbytes, rdcc_w0) &
+            BIND(C,NAME='h5pset_chunk_cache_c')
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: dapl_id
+         INTEGER(SIZE_T), INTENT(IN) :: rdcc_nslots
+         INTEGER(SIZE_T), INTENT(IN) :: rdcc_nbytes
+         REAL, INTENT(IN) :: rdcc_w0
+       END FUNCTION h5pset_chunk_cache_c
+    END INTERFACE
+
+    hdferr = h5pset_chunk_cache_c(dapl_id, rdcc_nslots, rdcc_nbytes, rdcc_w0)
+
+  END SUBROUTINE h5pset_chunk_cache_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Retrieves the raw data chunk cache parameters.
+!!
+!! \param dapl_id     Dataset access property list identifier.
+!! \param rdcc_nslots Number of chunk slots in the raw data chunk cache hash table.
+!! \param rdcc_nbytes Total size of the raw data chunk cache, in bytes.
+!! \param rdcc_w0     Preemption policy.
+!! \param hdferr      \fortran_error
+!!
+!! See C API: @ref H5Pget_chunk_cache()
+!!
+  SUBROUTINE h5pget_chunk_cache_f(dapl_id, rdcc_nslots, rdcc_nbytes, rdcc_w0, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dapl_id
+    INTEGER(SIZE_T), INTENT(OUT) :: rdcc_nslots
+    INTEGER(SIZE_T), INTENT(OUT) :: rdcc_nbytes
+    REAL, INTENT(OUT) :: rdcc_w0
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pget_chunk_cache_c(dapl_id, rdcc_nslots, rdcc_nbytes, rdcc_w0) &
+            BIND(C,NAME='h5pget_chunk_cache_c')
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: dapl_id
+         INTEGER(SIZE_T), INTENT(OUT) :: rdcc_nslots
+         INTEGER(SIZE_T), INTENT(OUT) :: rdcc_nbytes
+         REAL, INTENT(OUT) :: rdcc_w0
+       END FUNCTION h5pget_chunk_cache_c
+    END INTERFACE
+
+    hdferr = h5pget_chunk_cache_c(dapl_id, rdcc_nslots, rdcc_nbytes, rdcc_w0)
+
+  END SUBROUTINE h5pget_chunk_cache_f
+
+#ifdef H5_DOXYGEN
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets fill value for a dataset creation property list
+!!
+!! \attention  \fortran_approved
+!!
+!! \param prp_id    Property list identifier.
+!! \param type_id   Datatype identifier of fill value datatype (in memory).
+!! \param fillvalue Fillvalue.
+!! \param hdferr    \fortran_error
+!!
+!! See C API: @ref H5Pset_fill_value()
+!!
+  SUBROUTINE h5pset_fill_value_f(prp_id, type_id, fillvalue, hdferr)
+    INTEGER(HID_T), INTENT(IN)  :: prp_id
+    INTEGER(HID_T), INTENT(IN)  :: type_id
+    TYPE(C_PTR)   , INTENT(IN)  :: fillvalue
+    INTEGER       , INTENT(OUT) :: hdferr
+  END SUBROUTINE h5pset_fill_value_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Gets fill value for a dataset creation property list
+!!
+!! \attention  \fortran_approved
+!!
+!! \param prp_id    Property list identifier.
+!! \param type_id   Datatype identifier of fill value datatype (in memory).
+!! \param fillvalue Fillvalue.
+!! \param hdferr    \fortran_error
+!!
+!! See C API: @ref H5Pget_fill_value()
+!!
+  SUBROUTINE h5pget_fill_value_f(prp_id, type_id, fillvalue, hdferr)
+    INTEGER(HID_T), INTENT(IN)  :: prp_id
+    INTEGER(HID_T), INTENT(IN)  :: type_id
+    TYPE(C_PTR)   , INTENT(IN)  :: fillvalue
+    INTEGER       , INTENT(OUT) :: hdferr
+  END SUBROUTINE h5pget_fill_value_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets fill value for a dataset creation property list
+!!
+!! \attention  \fortran_obsolete
+!!
+!! \param prp_id    Property list identifier.
+!! \param type_id   Datatype identifier of fill value datatype (in memory).
+!! \param fillvalue Fillvalue.
+!! \param hdferr    \fortran_error
+!!
+!! See C API: @ref H5Pset_fill_value()
+!!
+  SUBROUTINE h5pset_fill_value_f(prp_id, type_id, fillvalue, hdferr)
+    INTEGER(HID_T), INTENT(IN)  :: prp_id
+    INTEGER(HID_T), INTENT(IN)  :: type_id
+    TYPE(TYPE)    , INTENT(IN)  :: fillvalue
+    INTEGER       , INTENT(OUT) :: hdferr
+  END SUBROUTINE h5pset_fill_value_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Gets fill value for a dataset creation property list.
+!!
+!! \attention  \fortran_obsolete
+!!
+!! \param prp_id    Property list identifier.
+!! \param type_id   Datatype identifier of fill value datatype (in memory).
+!! \param fillvalue Fillvalue.
+!! \param hdferr    \fortran_error
+!!
+!! See C API: @ref H5Pget_fill_value()
+!!
+  SUBROUTINE h5pget_fill_value_f(prp_id, type_id, fillvalue, hdferr)
+    INTEGER(HID_T), INTENT(IN)  :: prp_id
+    INTEGER(HID_T), INTENT(IN)  :: type_id
+    TYPE(TYPE)    , INTENT(OUT) :: fillvalue
+    INTEGER       , INTENT(OUT) :: hdferr
+  END SUBROUTINE h5pget_fill_value_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets a property list value.
+!!
+!! \attention  \fortran_approved
+!!
+!! \param prp_id Property list identifier to modify.
+!! \param name   Name of property to modify.
+!! \param value  Pointer to value to set the property to.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Pset()
+!!
+  SUBROUTINE h5pset_f(prp_id, name, value, hdferr)
+    INTEGER(HID_T)  , INTENT(IN)  :: prp_id
+    CHARACTER(LEN=*), INTENT(IN)  :: name
+    TYPE(C_PTR)     , INTENT(IN)  :: value
+    INTEGER         , INTENT(OUT) :: hdferr
+  END SUBROUTINE h5pset_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets a property list value.
+!!
+!! \attention  \fortran_obsolete
+!!
+!! \param prp_id Property list identifier to modify.
+!! \param name   Name of property to modify.
+!! \param value  Property value, supported types are:
+!!               \li INTEGER
+!!               \li REAL
+!!               \li DOUBLE PRECISION
+!!               \li CHARACTER(LEN=*)
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Pset()
+!!
+  SUBROUTINE h5pset_f(prp_id, name, value, hdferr)
+    INTEGER(HID_T)  , INTENT(IN)  :: prp_id
+    CHARACTER(LEN=*), INTENT(IN)  :: name
+    INTEGER         , INTENT(IN)  :: value
+    INTEGER         , INTENT(OUT) :: hdferr
+  END SUBROUTINE h5pset_f
+!>
+!! \ingroup FH5P
+!!
+!! \brief Queries the value of a property.
+!!
+!! \attention  \fortran_approved
+!!
+!! \param prp_id Property list identifier to modify.
+!! \param name   Name of property to get.
+!! \param value  Pointer to a location to which to copy the value of of the property.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Pget()
+!!
+  SUBROUTINE h5pget_f(prp_id, name, value, hdferr)
+    INTEGER(HID_T)  , INTENT(IN)  :: prp_id
+    CHARACTER(LEN=*), INTENT(IN)  :: name
+    TYPE(C_PTR)     , INTENT(OUT) :: value
+    INTEGER         , INTENT(OUT) :: hdferr
+  END SUBROUTINE h5pget_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Queries the value of a property.
+!!
+!! \attention  \fortran_obsolete
+!!
+!! \param prp_id Property list identifier to modify.
+!! \param name   Name of property to get.
+!! \param value  Property value, supported types are:
+!!               \li INTEGER
+!!               \li REAL
+!!               \li DOUBLE PRECISION
+!!               \li CHARACTER(LEN=*)
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Pget()
+!!
+  SUBROUTINE h5pget_f(prp_id, name, value, hdferr)
+    INTEGER(HID_T)  , INTENT(IN)  :: prp_id
+    CHARACTER(LEN=*), INTENT(IN)  :: name
+    INTEGER         , INTENT(OUT) :: value
+    INTEGER         , INTENT(OUT) :: hdferr
+  END SUBROUTINE h5pget_f
+!>
+!! \ingroup FH5P
+!!
+!! \brief Registers a permanent property with a property list class.
+!!
+!! \attention  \fortran_approved
+!!
+!! \param class Property list class identifier.
+!! \param name  Name of property to register.
+!! \param size  Size of the property value.
+!! \param value Pointer to value to set the property to.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Pregister2()
+!!
+  SUBROUTINE h5pregister_f(class, name, size, value, hdferr)
+    INTEGER(HID_T)  , INTENT(IN)  :: class
+    CHARACTER(LEN=*), INTENT(IN)  :: name
+    INTEGER(SIZE_T) , INTENT(IN)  :: size
+    TYPE(C_PTR)     , INTENT(IN)  :: value
+    INTEGER         , INTENT(OUT) :: hdferr
+  END SUBROUTINE h5pregister_f
+!>
+!! \ingroup FH5P
+!!
+!! \brief Registers a permanent property with a property list class.
+!!
+!! \attention  \fortran_obsolete
+!!
+!! \param class Property list class identifier.
+!! \param name  Name of property to register.
+!! \param size  Size of the property value.
+!! \param value Property value, supported types are:
+!!              \li INTEGER
+!!              \li REAL
+!!              \li DOUBLE PRECISION
+!!              \li CHARACTER(LEN=*)
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Pregister2()
+!!
+  SUBROUTINE h5pregister_f(class, name, size, value, hdferr)
+    INTEGER(HID_T)  , INTENT(IN)  :: class
+    CHARACTER(LEN=*), INTENT(IN)  :: name
+    INTEGER(SIZE_T) , INTENT(IN)  :: size
+    TYPE(TYPE)      , INTENT(IN)  :: value
+    INTEGER         , INTENT(OUT) :: hdferr
+  END SUBROUTINE h5pregister_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Registers a temporary property with a property list class.
+!!
+!! \attention  \fortran_approved
+!!
+!! \param plist  Property list class identifier.
+!! \param name   Name of property to insert.
+!! \param size   Size of the property value.
+!! \param value  Pointer to new value pointer for the property being modified.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Pinsert2()
+!!
+  SUBROUTINE h5pinsert_f(plist, name, size, value, hdferr)
+    INTEGER(HID_T)  , INTENT(IN)  :: plist
+    CHARACTER(LEN=*), INTENT(IN)  :: name
+    INTEGER(SIZE_T) , INTENT(IN)  :: size
+    TYPE(C_PTR)     , INTENT(IN)  :: value
+    INTEGER         , INTENT(OUT) :: hdferr
+  END SUBROUTINE h5pinsert_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Registers a temporary property with a property list class.
+!!
+!! \attention  \fortran_obsolete
+!!
+!! \param plist  Property list class identifier.
+!! \param name   Name of property to insert.
+!! \param size   Size of the property value.
+!! \param value  Property value, supported types are:
+!!               \li INTEGER
+!!               \li REAL
+!!               \li DOUBLE PRECISION
+!!               \li CHARACTER(LEN=*)
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Pinsert2()
+!!
+  SUBROUTINE h5pinsert_f(plist, name, size, value, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T)  , INTENT(IN)  :: plist
+    CHARACTER(LEN=*), INTENT(IN)  :: name
+    INTEGER(SIZE_T) , INTENT(IN)  :: size
+    TYPE(TYPE)      , INTENT(IN)  :: value
+    INTEGER         , INTENT(OUT) :: hdferr
+  END SUBROUTINE h5pinsert_f
+
+#else
+
+  SUBROUTINE h5pset_fill_value_integer(prp_id, type_id, fillvalue, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER, INTENT(IN), TARGET :: fillvalue
+    INTEGER, INTENT(OUT) :: hdferr
+    TYPE(C_PTR) :: f_ptr ! C address
+
+    f_ptr = C_LOC(fillvalue)
+
+    hdferr = h5pset_fill_value_c(prp_id, type_id, f_ptr)
+
+  END SUBROUTINE h5pset_fill_value_integer
+
+  SUBROUTINE h5pget_fill_value_integer(prp_id, type_id, fillvalue, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER, INTENT(OUT), TARGET :: fillvalue
+    INTEGER, INTENT(OUT) :: hdferr
+    TYPE(C_PTR) :: f_ptr                      ! C address
+
+    f_ptr = C_LOC(fillvalue)
+
+    hdferr = h5pget_fill_value_c(prp_id, type_id, f_ptr)
+
+  END SUBROUTINE h5pget_fill_value_integer
+
+  SUBROUTINE h5pset_fill_value_char(prp_id, type_id, fillvalue, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    CHARACTER(LEN=1), INTENT(IN), TARGET :: fillvalue
+    INTEGER, INTENT(OUT) :: hdferr
+    TYPE(C_PTR) :: f_ptr                       ! C address
+
+    f_ptr = C_LOC(fillvalue(1:1))
+    hdferr = h5pset_fill_value_c(prp_id, type_id, f_ptr)
+
+  END SUBROUTINE h5pset_fill_value_char
+
+  SUBROUTINE h5pget_fill_value_char(prp_id, type_id, fillvalue, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    CHARACTER(LEN=*), INTENT(OUT) :: fillvalue
+    INTEGER, INTENT(OUT) :: hdferr
+
+    INTEGER :: i
+    CHARACTER(LEN=1), ALLOCATABLE, DIMENSION(:), TARGET :: chr
+    INTEGER :: chr_len
+
+    TYPE(C_PTR) :: f_ptr ! C address
+    ! To resolve Issue #1 outlined in the preamble of this file we
+    ! need to pack the character string into an array.
+
+    chr_len = LEN(fillvalue(1:1))
+    ALLOCATE(chr(1:chr_len), STAT=hdferr)
+    IF (hdferr .NE. 0) THEN
+       hdferr = -1
+       RETURN
+    ENDIF
+
+    f_ptr = C_LOC(chr(1)(1:1))
+    hdferr = h5pget_fill_value_c(prp_id, type_id, f_ptr)
+
+    DO i = 1, chr_len
+       fillvalue(i:i) = chr(i)
+    ENDDO
+    DEALLOCATE(chr)
+
+  END SUBROUTINE h5pget_fill_value_char
+
+  SUBROUTINE h5pset_fill_value_ptr(prp_id, type_id, fillvalue, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    TYPE(C_PTR), INTENT(IN)    :: fillvalue
+    INTEGER, INTENT(OUT)       :: hdferr
+
+    hdferr = h5pset_fill_value_c(prp_id, type_id, fillvalue)
+
+  END SUBROUTINE h5pset_fill_value_ptr
+
+  SUBROUTINE h5pget_fill_value_ptr(prp_id, type_id, fillvalue, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN)  :: prp_id
+    INTEGER(HID_T), INTENT(IN)  :: type_id
+    TYPE(C_PTR)                 :: fillvalue
+    INTEGER       , INTENT(OUT) :: hdferr
+
+    hdferr = h5pget_fill_value_c(prp_id, type_id, fillvalue)
+
+  END SUBROUTINE h5pget_fill_value_ptr
+
+  SUBROUTINE h5pset_integer(prp_id, name, value, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    INTEGER,   INTENT(IN), TARGET :: value
+    INTEGER, INTENT(OUT) :: hdferr
+
+    INTEGER :: name_len
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(value)
+
+    name_len = LEN(name)
+    hdferr = h5pget_c(prp_id, name, name_len, f_ptr)
+
+  END SUBROUTINE h5pset_integer
+
+  SUBROUTINE h5pset_char(prp_id, name, value, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    CHARACTER(LEN=*),   INTENT(IN) :: value
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: name_len
+
+    INTEGER :: i
+    CHARACTER(LEN=1), ALLOCATABLE, DIMENSION(:), TARGET :: chr
+    INTEGER :: chr_len
+
+    TYPE(C_PTR) :: f_ptr
+    ! To resolve Issue #1 outlined in the preamble of this file we
+    ! need to pack the character string into an array.
+
+    chr_len = LEN(value)
+    ALLOCATE(chr(1:chr_len), STAT=hdferr)
+    IF (hdferr .NE. 0) THEN
+       hdferr = -1
+       RETURN
+    ENDIF
+
+    DO i = 1, chr_len
+       chr(i) = value(i:i)
+    ENDDO
+
+    f_ptr = C_LOC(chr(1)(1:1))
+
+    name_len = LEN(name)
+    hdferr = h5pget_c(prp_id, name, name_len, f_ptr)
+
+    DEALLOCATE(chr)
+
+  END SUBROUTINE h5pset_char
+
+! \brief Queries the value of a property.
+!
+! \param prp_id Property list identifier to modify.
+! \param name   Name of property to get.
+! \param value  Property value, supported types are:
+!               \li INTEGER
+!               \li REAL
+!               \li DOUBLE PRECISION
+!               \li CHARACTER(LEN=*)
+! \param hdferr \fortran_error
+!
+  SUBROUTINE h5pget_integer(prp_id, name, value, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    INTEGER,   INTENT(OUT), TARGET :: value
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: name_len
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(value)
+
+    name_len = LEN(name)
+    hdferr = h5pget_c(prp_id, name, name_len, f_ptr)
+
+  END SUBROUTINE h5pget_integer
+
+  SUBROUTINE h5pget_char(prp_id, name, value, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    CHARACTER(LEN=*), INTENT(OUT) :: value
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: name_len
+
+    INTEGER :: i
+    CHARACTER(LEN=1), ALLOCATABLE, DIMENSION(:), TARGET :: chr
+    INTEGER :: chr_len
+    TYPE(C_PTR) :: f_ptr
+
+    chr_len = LEN(value)
+    ALLOCATE(chr(1:chr_len), STAT=hdferr)
+    IF (hdferr .NE. 0) THEN
+       hdferr = -1
+       RETURN
+    ENDIF
+    f_ptr = C_LOC(chr(1)(1:1))
+
+    name_len = LEN(name)
+    hdferr = h5pget_c(prp_id, name, name_len, f_ptr)
+
+    DO i = 1, chr_len
+       value(i:i) = chr(i)
+    ENDDO
+
+    DEALLOCATE(chr)
+
+  END SUBROUTINE h5pget_char
+
+! \brief Sets a property list value
+!
+! \param prp_id Property list identifier to modify.
+! \param name   Name of property to modify.
+! \param value  Pointer to value to set the property to.
+! \param hdferr \fortran_error
+!
+  SUBROUTINE h5pset_ptr(prp_id, name, value, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    TYPE(C_PTR), INTENT(IN) :: value
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: name_len
+
+    name_len = LEN(name)
+    hdferr = h5pset_c(prp_id, name, name_len, value)
+
+  END SUBROUTINE h5pset_ptr
+
+! \brief Queries the value of a property.
+!
+! \param prp_id Property list identifier to modify.
+! \param name   Name of property to get.
+! \param value  Pointer to a location to which to copy the value of of the property.
+! \param hdferr \fortran_error
+!
+  SUBROUTINE h5pget_ptr(prp_id, name, value, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    TYPE(C_PTR), INTENT(OUT) :: value
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: name_len
+
+    name_len = LEN(name)
+    hdferr = h5pget_c(prp_id, name, name_len, value)
+
+  END SUBROUTINE h5pget_ptr
+
+  SUBROUTINE h5pregister_integer(class, name, size, value, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: class
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    INTEGER(SIZE_T), INTENT(IN) :: size
+    INTEGER,   INTENT(IN), TARGET :: value
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: name_len
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(value)
+
+    name_len = LEN(name)
+    hdferr = h5pregister_c(class, name, name_len, size, f_ptr)
+
+  END SUBROUTINE h5pregister_integer
+
+  SUBROUTINE h5pregister_char(class, name, size, value, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: class
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    INTEGER(SIZE_T), INTENT(IN) :: size
+    CHARACTER(LEN=*),   INTENT(IN) :: value
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: name_len
+
+    INTEGER :: i
+    CHARACTER(LEN=1), ALLOCATABLE, DIMENSION(:), TARGET :: chr
+    INTEGER :: chr_len
+
+    TYPE(C_PTR) :: f_ptr
+    ! To resolve Issue #1 outlined in the preamble of this file we
+    ! need to pack the character string into an array.
+
+    chr_len = LEN(value)
+    ALLOCATE(chr(1:chr_len), STAT=hdferr)
+    IF (hdferr .NE. 0) THEN
+       hdferr = -1
+       RETURN
+    ENDIF
+
+    DO i = 1, chr_len
+       chr(i) = value(i:i)
+    ENDDO
+
+    f_ptr = C_LOC(chr(1)(1:1))
+
+    name_len = LEN(name)
+    hdferr = h5pregister_c(class, name, name_len, size, f_ptr)
+    DEALLOCATE(chr)
+  END SUBROUTINE h5pregister_char
+
+  SUBROUTINE h5pregister_ptr(class, name, size, value, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: class
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    INTEGER(SIZE_T), INTENT(IN) :: size
+    TYPE(C_PTR), INTENT(IN) :: value
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: name_len
+
+    name_len = LEN(name)
+    hdferr = h5pregister_c(class, name, name_len, size, value)
+  END SUBROUTINE h5pregister_ptr
+
+  SUBROUTINE h5pinsert_integer(plist, name, size, value, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: plist
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    INTEGER(SIZE_T), INTENT(IN) :: size
+    INTEGER,   INTENT(IN), TARGET :: value
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: name_len
+    TYPE(c_ptr) :: f_ptr
+
+    f_ptr = c_loc(value)
+
+    name_len = LEN(name)
+    hdferr = h5pinsert_c(plist, name , name_len, size, f_ptr)
+  END SUBROUTINE h5pinsert_integer
+
+  SUBROUTINE h5pinsert_char(plist, name, size, value, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: plist
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    INTEGER(SIZE_T), INTENT(IN) :: size
+    CHARACTER(LEN=*),   INTENT(IN) :: value
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: name_len
+
+    INTEGER :: i
+    CHARACTER(LEN=1), ALLOCATABLE, DIMENSION(:), TARGET :: chr
+    INTEGER :: chr_len
+
+    TYPE(c_ptr) :: f_ptr
+    ! To resolve Issue #1 outlined in the preamble of this file we
+    ! need to pack the character string into an array.
+
+    chr_len = LEN(value)
+    ALLOCATE(chr(1:chr_len), STAT=hdferr)
+    IF (hdferr .NE. 0) THEN
+       hdferr = -1
+       RETURN
+    ENDIF
+
+    DO i = 1, chr_len
+       chr(i) = value(i:i)
+    ENDDO
+
+    f_ptr = C_LOC(chr(1)(1:1))
+
+    name_len = LEN(name)
+    hdferr = h5pinsert_c(plist, name , name_len, size, f_ptr)
+
+    DEALLOCATE(chr)
+
+  END SUBROUTINE h5pinsert_char
+
+  SUBROUTINE h5pinsert_ptr(plist, name, size, value, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: plist
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    INTEGER(SIZE_T), INTENT(IN) :: size
+    TYPE(c_ptr),   INTENT(IN) :: value
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: name_len
+
+    name_len = LEN(name)
+    hdferr = h5pinsert_c(plist, name , name_len, size, value)
+  END SUBROUTINE h5pinsert_ptr
+
+#endif
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Create a new property list class
+!!
+!! \param parent     Parent property list class identifier. Possible values include:
+!!                   \li H5P_ROOT_F
+!!                   \li H5P_FILE_CREATE_F
+!!                   \li H5P_FILE_ACCESS_F
+!!                   \li H5P_DATASET_CREATE_F
+!!                   \li H5P_DATASET_XFER_F
+!!                   \li H5P_FILE_MOUNT_F
+!! \param name        Name of property to create.
+!! \param class       Property list class identifier.
+!! \param hdferr      \fortran_error
+!! \param create      (H5P_cls_create_func_t) - Callback routine called when a property list is created.
+!! \param create_data User pointer to any class creation information needed.
+!! \param copy        (H5P_cls_copy_func_t)   - Callback routine called when a property list is copied.
+!! \param copy_data   User pointer to any class copy information needed.
+!! \param close       (H5P_cls_close_func_t)  - Callback routine called when a property list is being closed.
+!! \param close_data  User pointer to any class close information needed.
+!!
+!! See C API: @ref H5Pcreate_class()
+!!
+  SUBROUTINE h5pcreate_class_f(parent, name, class, hdferr, create, create_data, &
+       copy, copy_data, close, close_data)
+    IMPLICIT NONE
+    INTEGER(HID_T)  , INTENT(IN)  :: parent
+    CHARACTER(LEN=*), INTENT(IN)  :: name
+    INTEGER(HID_T)  , INTENT(OUT) :: class
+    INTEGER         , INTENT(OUT) :: hdferr
+    TYPE(C_PTR)     , OPTIONAL    :: create_data, copy_data, close_data
+    TYPE(C_FUNPTR)  , OPTIONAL    :: create, copy, close
+    INTEGER :: name_len
+    TYPE(C_PTR) :: create_data_default, copy_data_default, close_data_default
+    TYPE(C_FUNPTR) :: create_default, copy_default, close_default
+    INTERFACE
+       INTEGER FUNCTION h5pcreate_class_c(parent, name, name_len, class, &
+            create, create_data, copy, copy_data, close, close_data) &
+            BIND(C, NAME='h5pcreate_class_c')
+         IMPORT :: c_char, c_ptr, c_funptr
+         IMPORT :: HID_T
+         INTEGER(HID_T), INTENT(IN) :: parent
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+         INTEGER, INTENT(IN)         :: name_len
+         INTEGER(HID_T), INTENT(OUT) :: class
+         TYPE(C_PTR), VALUE :: create_data, copy_data, close_data
+         TYPE(C_FUNPTR), VALUE :: create, copy, close
+       END FUNCTION h5pcreate_class_c
+    END INTERFACE
+    name_len = LEN(name)
+
+    create_default = c_null_funptr     !fix:scot
+    create_data_default = c_null_ptr
+    copy_default = c_null_funptr    !fix:scot
+    copy_data_default = c_null_ptr
+    close_default = c_null_funptr   !fix:scot
+    close_data_default = c_null_ptr
+
+    IF(PRESENT(create)) create_default = create
+    IF(PRESENT(create_data)) create_data_default = create_data
+    IF(PRESENT(copy)) copy_default = copy
+    IF(PRESENT(copy_data)) copy_data_default = copy_data
+    IF(PRESENT(close)) close_default = close
+    IF(PRESENT(close_data)) close_data_default = close_data
+
+    hdferr = h5pcreate_class_c(parent, name , name_len, class, &
+         create_default, create_data_default, &
+         copy_default, copy_data_default, &
+         close_default, close_data_default)
+
+  END SUBROUTINE h5pcreate_class_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets an initial file image in a memory buffer.
+!!
+!! \param fapl_id File access property list identifier.
+!! \param buf_ptr Pointer to the initial file image, or C_NULL_PTR if no initial file image is desired.
+!! \param buf_len Size of the supplied buffer, or 0 (zero) if no initial image is desired.
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Pset_file_image()
+!!
+  SUBROUTINE h5pset_file_image_f(fapl_id, buf_ptr, buf_len, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T) , INTENT(IN)  :: fapl_id
+    TYPE(C_PTR)    , INTENT(IN)  :: buf_ptr
+    INTEGER(SIZE_T), INTENT(IN)  :: buf_len
+    INTEGER        , INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pset_file_image_c(fapl_id, buf_ptr, buf_len) &
+            BIND(C, NAME='h5pset_file_image_c')
+         IMPORT :: c_ptr
+         IMPORT :: HID_T, SIZE_T
+         INTEGER(HID_T), INTENT(IN) :: fapl_id
+         TYPE(C_PTR), VALUE :: buf_ptr
+         INTEGER(SIZE_T), INTENT(IN)  :: buf_len
+       END FUNCTION h5pset_file_image_c
+    END INTERFACE
+
+    hdferr = h5pset_file_image_c(fapl_id, buf_ptr, buf_len)
+
+  END SUBROUTINE h5pset_file_image_f
+!>
+!! \ingroup FH5P
+!!
+!! \brief Retrieves a copy of the file image designated as the initial content and structure of a file.
+!!
+!! \param fapl_id     File access property list identifier.
+!! \param buf_ptr     Will hold either a C_NULL_PTR or a scalar of type c_loc. If buf_ptr is not C_NULL_PTR, on successful
+!!                    return, buf_ptr shall contain a C pointer to a copy of the initial image provided in the last call to
+!!                    H5Pset_file_image_f for the supplied fapl_id, or buf_ptr shall contain a C_NULL_PTR if there is no
+!!                    initial image set.
+!! \param buf_len_ptr Contains the value of the buffer parameter for the initial image in the supplied fapl_id. The value
+!!                    will be 0 if no initial image is set.
+!! \param hdferr      \fortran_error
+!!
+!! See C API: @ref H5Pget_file_image()
+!!
+  SUBROUTINE h5pget_file_image_f(fapl_id, buf_ptr, buf_len_ptr, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T) , INTENT(IN)                :: fapl_id
+    TYPE(C_PTR)    , INTENT(OUT), DIMENSION(*) :: buf_ptr
+    INTEGER(SIZE_T), INTENT(OUT)               :: buf_len_ptr
+    INTEGER        , INTENT(OUT)               :: hdferr
+
+    INTERFACE
+       INTEGER FUNCTION h5pget_file_image_c(fapl_id, buf_ptr, buf_len_ptr) &
+            BIND(C, NAME='h5pget_file_image_c')
+         IMPORT :: c_ptr
+         IMPORT :: HID_T, SIZE_T
+         INTEGER(HID_T), INTENT(IN) :: fapl_id
+         TYPE(C_PTR), DIMENSION(*), INTENT(OUT)  :: buf_ptr
+         INTEGER(SIZE_T), INTENT(OUT)  :: buf_len_ptr
+       END FUNCTION h5pget_file_image_c
+    END INTERFACE
+
+    hdferr = h5pget_file_image_c(fapl_id, buf_ptr, buf_len_ptr)
+
+  END SUBROUTINE h5pget_file_image_f
+
+! *********************************************************************
+! Fortran interfaces for H5P functions needed by parallel MPI programs.
+! *********************************************************************
+
+#ifdef H5_HAVE_PARALLEL
+!>
+!! \ingroup FH5P
+!!
+!! \brief Stores MPI IO communicator information to the file access property list.
+!!
+!! \param prp_id File access property list identifier.
+!! \param comm   MPI-2 communicator.
+!! \param info   MPI-2 info object.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Pset_fapl_mpio()
+!!
+  SUBROUTINE h5pset_fapl_mpio_f(prp_id, comm, info, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER, INTENT(IN) :: comm
+    INTEGER, INTENT(IN) :: info
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pset_fapl_mpio_c(prp_id, comm, info) &
+            BIND(C,NAME='h5pset_fapl_mpio_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: prp_id
+         INTEGER       , INTENT(IN) :: comm
+         INTEGER       , INTENT(IN) :: info
+       END FUNCTION h5pset_fapl_mpio_c
+    END INTERFACE
+
+    hdferr = h5pset_fapl_mpio_c(prp_id, comm, info)
+
+  END SUBROUTINE h5pset_fapl_mpio_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Returns MPI communicator information.
+!!
+!! \param prp_id File access property list identifier.
+!! \param comm   MPI-2 communicator.
+!! \param info   MPI-2 info object.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Pget_fapl_mpio()
+!!
+  SUBROUTINE h5pget_fapl_mpio_f(prp_id, comm, info, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER, INTENT(OUT) :: comm
+    INTEGER, INTENT(OUT) :: info
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pget_fapl_mpio_c(prp_id, comm, info) &
+            BIND(C,NAME='h5pget_fapl_mpio_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN)  :: prp_id
+         INTEGER       , INTENT(OUT) :: comm
+         INTEGER       , INTENT(OUT) :: info
+       END FUNCTION h5pget_fapl_mpio_c
+    END INTERFACE
+
+    hdferr = h5pget_fapl_mpio_c(prp_id, comm, info)
+
+  END SUBROUTINE h5pget_fapl_mpio_f
+
+#ifdef H5_HAVE_SUBFILING_VFD
+!>
+!! \ingroup FH5P
+!!
+!! \brief Modifies the specified File Access Property List to use the #H5FD_SUBFILING driver.
+!!
+!! \param prp_id     File access property list identifier.
+!! \param hdferr     \fortran_error
+!! \param vfd_config #H5FD_SUBFILING driver configuration derived type.
+!!
+!! See C API: @ref H5Pset_fapl_subfiling()
+!!
+ SUBROUTINE h5pset_fapl_subfiling_f(prp_id, hdferr, vfd_config)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER, INTENT(OUT) :: hdferr
+    TYPE(H5FD_subfiling_config_t), OPTIONAL, TARGET :: vfd_config
+    TYPE(C_PTR) :: f_ptr
+
+    INTERFACE
+       INTEGER FUNCTION H5Pset_fapl_subfiling(prp_id, vfd_config) &
+            BIND(C,NAME='H5Pset_fapl_subfiling')
+         IMPORT :: HID_T, C_PTR
+         IMPLICIT NONE
+         INTEGER(HID_T), VALUE :: prp_id
+         TYPE(C_PTR)   , VALUE :: vfd_config
+       END FUNCTION h5pset_fapl_subfiling
+    END INTERFACE
+
+    IF(PRESENT(vfd_config))THEN
+       f_ptr = C_LOC(vfd_config)
+    ELSE
+       f_ptr = C_NULL_PTR
+    ENDIF
+
+    hdferr = h5pset_fapl_subfiling(prp_id, f_ptr)
+
+  END SUBROUTINE h5pset_fapl_subfiling_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Queries a File Access Property List for #H5FD_SUBFILING file driver properties.
+!!
+!! \param prp_id     File access property list identifier.
+!! \param vfd_config #H5FD_SUBFILING driver configuration derived type.
+!! \param hdferr     \fortran_error
+!!
+!! See C API: @ref H5Pget_fapl_subfiling()
+!!
+  SUBROUTINE h5pget_fapl_subfiling_f(prp_id, vfd_config, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    TYPE(H5FD_subfiling_config_t), TARGET :: vfd_config
+    INTEGER, INTENT(OUT) :: hdferr
+    TYPE(C_PTR) :: f_ptr
+
+    INTERFACE
+       INTEGER FUNCTION H5Pget_fapl_subfiling(prp_id, vfd_config) &
+            BIND(C,NAME='H5Pget_fapl_subfiling')
+         IMPORT :: HID_T, C_PTR
+         IMPLICIT NONE
+         INTEGER(HID_T), VALUE :: prp_id
+         TYPE(C_PTR)   , VALUE :: vfd_config
+       END FUNCTION H5Pget_fapl_subfiling
+    END INTERFACE
+
+    f_ptr = C_LOC(vfd_config)
+    hdferr = h5pget_fapl_subfiling(prp_id, f_ptr)
+
+  END SUBROUTINE h5pget_fapl_subfiling_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Modifies the specified File Access Property List to use the #H5FD_IOC driver.
+!!
+!! \param prp_id     File access property list identifier.
+!! \param hdferr     \fortran_error
+!! \param vfd_config #H5FD_IOC driver configuration derived type.
+!!
+!! See C API: @ref H5Pset_fapl_ioc()
+!!
+ SUBROUTINE h5pset_fapl_ioc_f(prp_id, hdferr, vfd_config)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    TYPE(H5FD_ioc_config_t), OPTIONAL, TARGET :: vfd_config
+    INTEGER, INTENT(OUT) :: hdferr
+    TYPE(C_PTR) :: f_ptr
+
+    INTERFACE
+       INTEGER FUNCTION H5Pset_fapl_ioc(prp_id, vfd_config) &
+            BIND(C,NAME='H5Pset_fapl_ioc')
+         IMPORT :: HID_T, C_PTR
+         IMPLICIT NONE
+         INTEGER(HID_T), VALUE :: prp_id
+         TYPE(C_PTR)   , VALUE :: vfd_config
+       END FUNCTION h5pset_fapl_ioc
+    END INTERFACE
+
+    IF(PRESENT(vfd_config))THEN
+       f_ptr = C_LOC(vfd_config)
+    ELSE
+       f_ptr = C_NULL_PTR
+    ENDIF
+
+    hdferr = h5pset_fapl_ioc(prp_id, f_ptr)
+
+  END SUBROUTINE h5pset_fapl_ioc_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Queries a File Access Property List for #H5FD_IOC file driver properties.
+!!
+!! \param prp_id     File access property list identifier.
+!! \param vfd_config #H5FD_IOC driver configuration derived type.
+!! \param hdferr     \fortran_error
+!!
+!! See C API: @ref H5Pget_fapl_ioc()
+!!
+  SUBROUTINE h5pget_fapl_ioc_f(prp_id, vfd_config, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    TYPE(H5FD_ioc_config_t), TARGET :: vfd_config
+    INTEGER, INTENT(OUT) :: hdferr
+    TYPE(C_PTR) :: f_ptr
+
+    INTERFACE
+       INTEGER FUNCTION H5Pget_fapl_ioc(prp_id, vfd_config) &
+            BIND(C,NAME='H5Pget_fapl_ioc')
+         IMPORT :: HID_T, C_PTR
+         IMPLICIT NONE
+         INTEGER(HID_T), VALUE :: prp_id
+         TYPE(C_PTR)   , VALUE :: vfd_config
+       END FUNCTION H5Pget_fapl_ioc
+    END INTERFACE
+
+    f_ptr = C_LOC(vfd_config)
+    hdferr = h5pget_fapl_ioc(prp_id, f_ptr)
+
+  END SUBROUTINE h5pget_fapl_ioc_f
+#endif
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Set the MPI communicator and info.
+!!
+!! \param prp_id File access property list identifier.
+!! \param comm   The MPI communicator.
+!! \param info   The MPI info object.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Pset_mpi_params()
+!!
+  SUBROUTINE H5Pset_mpi_params_f(prp_id, comm, info, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN)  :: prp_id
+    INTEGER       , INTENT(IN)  :: comm
+    INTEGER       , INTENT(IN)  :: info
+    INTEGER       , INTENT(OUT) :: hdferr
+
+    INTERFACE
+       INTEGER FUNCTION h5pset_mpi_params_c(prp_id, comm, info) &
+            BIND(C,NAME='h5pset_mpi_params_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T) :: prp_id
+         INTEGER :: comm
+         INTEGER :: info
+       END FUNCTION H5pset_mpi_params_c
+    END INTERFACE
+
+    hdferr = H5Pset_mpi_params_c(prp_id, comm, info)
+
+  END SUBROUTINE H5Pset_mpi_params_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Get the MPI communicator and info.
+!!
+!! \param prp_id File access property list identifier.
+!! \param comm   The MPI communicator.
+!! \param info   The MPI info object.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Pget_mpi_params()
+!!
+  SUBROUTINE H5Pget_mpi_params_f(prp_id, comm, info, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN)  :: prp_id
+    INTEGER       , INTENT(OUT) :: comm
+    INTEGER       , INTENT(OUT) :: info
+    INTEGER       , INTENT(OUT) :: hdferr
+
+    INTERFACE
+       INTEGER FUNCTION h5pget_mpi_params_c(prp_id, comm, info) &
+            BIND(C,NAME='h5pget_mpi_params_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T) :: prp_id
+         INTEGER        :: comm
+         INTEGER        :: info
+       END FUNCTION H5pget_mpi_params_c
+    END INTERFACE
+
+    hdferr = H5Pget_mpi_params_c(prp_id, comm, info)
+
+  END SUBROUTINE H5Pget_mpi_params_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets data transfer mode.
+!!
+!! \param prp_id         Data transfer property list identifier.
+!! \param data_xfer_mode Transfer mode; possible values are:
+!!                       \li H5FD_MPIO_INDEPENDENT_F
+!!                       \li H5FD_MPIO_COLLECTIVE_F
+!! \param hdferr         \fortran_error
+!!
+!! See C API: @ref H5Pset_dxpl_mpio()
+!!
+  SUBROUTINE h5pset_dxpl_mpio_f(prp_id, data_xfer_mode, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER, INTENT(IN) :: data_xfer_mode
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pset_dxpl_mpio_c(prp_id, data_xfer_mode) &
+            BIND(C,NAME='h5pset_dxpl_mpio_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN)  :: prp_id
+         INTEGER       , INTENT(IN) :: data_xfer_mode
+       END FUNCTION h5pset_dxpl_mpio_c
+    END INTERFACE
+
+    hdferr = h5pset_dxpl_mpio_c(prp_id, data_xfer_mode)
+  END SUBROUTINE h5pset_dxpl_mpio_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Returns the data transfer mode.
+!!
+!! \param prp_id         Data transfer property list identifier.
+!! \param data_xfer_mode Transfer mode; possible values are:
+!!                       \li H5FD_MPIO_INDEPENDENT_F
+!!                       \li H5FD_MPIO_COLLECTIVE_F
+!! \param hdferr         \fortran_error
+!!
+!! See C API: @ref H5Pget_dxpl_mpio()
+!!
+  SUBROUTINE h5pget_dxpl_mpio_f(prp_id, data_xfer_mode, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id
+    INTEGER, INTENT(OUT) :: data_xfer_mode
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pget_dxpl_mpio_c(prp_id, data_xfer_mode) &
+            BIND(C,NAME='h5pget_dxpl_mpio_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN)  :: prp_id
+         INTEGER       , INTENT(OUT) :: data_xfer_mode
+       END FUNCTION h5pget_dxpl_mpio_c
+    END INTERFACE
+
+    hdferr = h5pget_dxpl_mpio_c(prp_id, data_xfer_mode)
+  END SUBROUTINE h5pget_dxpl_mpio_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Retrieves the type of I/O that HDF5 actually performed on the last
+!!       parallel I/O call. This is not necessarily the type of I/O requested.
+!!
+!! \param dxpl_id        Dataset transfer property list identifier.
+!! \param actual_io_mode The type of I/O performed by this process.
+!! \param hdferr         \fortran_error
+!!
+!! See C API: @ref H5Pget_mpio_actual_io_mode()
+!!
+  SUBROUTINE h5pget_mpio_actual_io_mode_f(dxpl_id, actual_io_mode, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN)  :: dxpl_id
+    INTEGER       , INTENT(OUT) :: actual_io_mode
+    INTEGER       , INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pget_mpio_actual_io_mode_c(dxpl_id, actual_io_mode) &
+            BIND(C,NAME='h5pget_mpio_actual_io_mode_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN)  :: dxpl_id
+         INTEGER       , INTENT(OUT) :: actual_io_mode
+       END FUNCTION h5pget_mpio_actual_io_mode_c
+    END INTERFACE
+
+    actual_io_mode = -1
+
+    hdferr = h5pget_mpio_actual_io_mode_c(dxpl_id, actual_io_mode)
+
+  END SUBROUTINE h5pget_mpio_actual_io_mode_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets requirement whether HDF5 metadata read operations using the access property
+!!        list are required to be collective or independent. If collective requirement is
+!!        selected, the HDF5 library will optimize the metadata reads improving performance.
+!!        The default setting is independent (false).
+!!
+!! \param plist_id      File access property list identifier.
+!! \param is_collective Indicates if metadata writes are collective or not.
+!! \param hdferr        \fortran_error
+!!
+!! See C API: @ref H5Pset_all_coll_metadata_ops()
+!!
+  SUBROUTINE h5pset_all_coll_metadata_ops_f(plist_id, is_collective, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T)  , INTENT(IN)  :: plist_id
+    LOGICAL, INTENT(IN)           :: is_collective
+    INTEGER, INTENT(OUT)          :: hdferr
+    LOGICAL(C_BOOL) :: c_is_collective
+
+    INTERFACE
+       INTEGER FUNCTION h5pset_all_coll_metadata_ops(plist_id, is_collective) BIND(C, NAME='H5Pset_all_coll_metadata_ops')
+         IMPORT :: HID_T, C_BOOL
+         IMPLICIT NONE
+         INTEGER(HID_T) , INTENT(IN), VALUE :: plist_id
+         LOGICAL(C_BOOL), INTENT(IN), VALUE :: is_collective
+       END FUNCTION h5pset_all_coll_metadata_ops
+    END INTERFACE
+
+    ! Transfer value of Fortran LOGICAL to C c_bool type
+    c_is_collective = is_collective
+
+    hdferr = INT(H5Pset_all_coll_metadata_ops(plist_id, c_is_collective))
+
+  END SUBROUTINE h5pset_all_coll_metadata_ops_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Retrieves metadata read mode from the access property list.
+!!
+!! \param plist_id      File access property list identifier.
+!! \param is_collective Collective access setting.
+!! \param hdferr        \fortran_error
+!!
+!! See C API: @ref H5Pget_all_coll_metadata_ops()
+!!
+  SUBROUTINE h5pget_all_coll_metadata_ops_f(plist_id, is_collective, hdferr)
+
+    IMPLICIT NONE
+    INTEGER(HID_T)  , INTENT(IN)  :: plist_id
+    LOGICAL, INTENT(OUT)          :: is_collective
+    INTEGER, INTENT(OUT)          :: hdferr
+    LOGICAL(C_BOOL) :: c_is_collective
+
+    INTERFACE
+       INTEGER FUNCTION h5pget_all_coll_metadata_ops(plist_id, is_collective) BIND(C, NAME='H5Pget_all_coll_metadata_ops')
+         IMPORT :: HID_T, C_BOOL
+         IMPLICIT NONE
+         INTEGER(HID_T) , INTENT(IN), VALUE :: plist_id
+         LOGICAL(C_BOOL), INTENT(OUT) :: is_collective
+       END FUNCTION h5pget_all_coll_metadata_ops
+    END INTERFACE
+
+    hdferr = INT(H5Pget_all_coll_metadata_ops(plist_id, c_is_collective))
+
+    ! Transfer value of C c_bool type to Fortran LOGICAL
+    is_collective = c_is_collective
+
+  END SUBROUTINE h5pget_all_coll_metadata_ops_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets metadata writes to collective or independent. Default setting is independent (false).
+!!
+!! \param plist_id      File access property list identifier.
+!! \param is_collective Indicates if metadata writes are collective or not.
+!! \param hdferr        \fortran_error
+!!
+!! See C API: @ref H5Pset_coll_metadata_write()
+!!
+  SUBROUTINE h5pset_coll_metadata_write_f(plist_id, is_collective, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T)  , INTENT(IN)  :: plist_id
+    LOGICAL, INTENT(IN)           :: is_collective
+    INTEGER, INTENT(OUT)          :: hdferr
+    LOGICAL(C_BOOL) :: c_is_collective
+
+    INTERFACE
+       INTEGER FUNCTION h5pset_coll_metadata_write(plist_id, is_collective) BIND(C, NAME='H5Pset_coll_metadata_write')
+         IMPORT :: HID_T, C_BOOL
+         IMPLICIT NONE
+         INTEGER(HID_T) , INTENT(IN), VALUE :: plist_id
+         LOGICAL(C_BOOL), INTENT(IN), VALUE :: is_collective
+       END FUNCTION h5pset_coll_metadata_write
+    END INTERFACE
+
+    ! Transfer value of Fortran LOGICAL to C c_bool type
+    c_is_collective = is_collective
+
+    hdferr = INT(H5Pset_coll_metadata_write(plist_id, c_is_collective))
+
+  END SUBROUTINE h5pset_coll_metadata_write_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Retrieves metadata write mode from the file access property list.
+!!
+!! \param plist_id      File access property list identifier.
+!! \param is_collective Collective access setting.
+!! \param hdferr        \fortran_error
+!!
+!! See C API: @ref H5Pget_coll_metadata_write()
+!!
+  SUBROUTINE h5pget_coll_metadata_write_f(plist_id, is_collective, hdferr)
+
+    IMPLICIT NONE
+    INTEGER(HID_T)  , INTENT(IN)  :: plist_id
+    LOGICAL, INTENT(OUT)          :: is_collective
+    INTEGER, INTENT(OUT)          :: hdferr
+    LOGICAL(C_BOOL) :: c_is_collective
+
+    INTERFACE
+       INTEGER FUNCTION h5pget_coll_metadata_write(plist_id, is_collective) BIND(C, NAME='H5Pget_coll_metadata_write')
+         IMPORT :: HID_T, C_BOOL
+         IMPLICIT NONE
+         INTEGER(HID_T) , INTENT(IN), VALUE :: plist_id
+         LOGICAL(C_BOOL), INTENT(OUT) :: is_collective
+       END FUNCTION h5pget_coll_metadata_write
+    END INTERFACE
+
+    hdferr = INT(H5Pget_coll_metadata_write(plist_id, c_is_collective))
+
+    ! Transfer value of C c_bool type to Fortran LOGICAL
+    is_collective = c_is_collective
+
+  END SUBROUTINE h5pget_coll_metadata_write_f
+
+#endif
+
+!
+! V I R T U A L  D A T S E T S
+!
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets the view of the virtual dataset (VDS) to include or exclude missing mapped elements.
+!!
+!! \param dapl_id Identifier Of the virtual dataset access property list.
+!! \param view    Flag specifying the extent of the data to be included in the view. Valid values are:
+!!                \li H5D_VDS_FIRST_MISSING_F
+!!                \li H5D_VDS_LAST_AVAILABLE_F
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Pset_virtual_view()
+!!
+  SUBROUTINE h5pset_virtual_view_f(dapl_id, view, hdferr)
+    IMPLICIT NONE
+
+    INTEGER(HID_T), INTENT(IN)  :: dapl_id
+    INTEGER       , INTENT(IN)  :: view
+    INTEGER       , INTENT(OUT) :: hdferr
+
+    INTERFACE
+       INTEGER FUNCTION h5pset_virtual_view(dapl_id, view) BIND(C,NAME='H5Pset_virtual_view')
+         IMPORT :: HID_T, ENUM_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN), VALUE :: dapl_id
+         INTEGER(ENUM_T), INTENT(IN), VALUE :: view
+       END FUNCTION h5pset_virtual_view
+    END INTERFACE
+
+    hdferr = INT( h5pset_virtual_view(dapl_id, INT(view,ENUM_T)) )
+
+  END SUBROUTINE h5pset_virtual_view_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Retrieves the view of a virtual dataset accessed with dapl_id.
+!!
+!! \param dapl_id Dataset access property list identifier for the virtual dataset.
+!! \param view    The flag specifying the view of the virtual dataset. Valid values are:
+!!                \li H5D_VDS_FIRST_MISSING_F
+!!                \li H5D_VDS_LAST_AVAILABLE_F
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Pget_virtual_view()
+!!
+  SUBROUTINE h5pget_virtual_view_f(dapl_id, view, hdferr)
+    IMPLICIT NONE
+
+    INTEGER(HID_T), INTENT(IN)  :: dapl_id
+    INTEGER       , INTENT(INOUT) :: view
+    INTEGER       , INTENT(OUT) :: hdferr
+    INTEGER(ENUM_T) :: view_enum
+    INTERFACE
+       INTEGER FUNCTION h5pget_virtual_view(dapl_id, view) BIND(C,NAME='H5Pget_virtual_view')
+         IMPORT :: HID_T, ENUM_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN), VALUE :: dapl_id
+         INTEGER(ENUM_T), INTENT(OUT) :: view
+       END FUNCTION h5pget_virtual_view
+    END INTERFACE
+
+    hdferr = INT( h5pget_virtual_view(dapl_id, view_enum) )
+    view = INT(view_enum)
+
+  END SUBROUTINE h5pget_virtual_view_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets the maximum number of missing source files and/or datasets with the printf-style names
+!!        when getting the extent of an unlimited virtual dataset.
+!!
+!! \param dapl_id  Dataset access property list identifier for the virtual dataset.
+!! \param gap_size Maximum number of files and/or datasets allowed to be missing for determining
+!!                 the extent of an unlimited virtual dataset with printf-style mappings.
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Pset_virtual_printf_gap()
+!!
+  SUBROUTINE h5pset_virtual_printf_gap_f(dapl_id, gap_size, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T)  , INTENT(IN)  :: dapl_id
+    INTEGER(HSIZE_T), INTENT(IN)  :: gap_size
+    INTEGER         , INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pset_virtual_printf_gap(dapl_id, gap_size) BIND(C,NAME='H5Pset_virtual_printf_gap')
+         IMPORT :: HID_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN), VALUE :: dapl_id
+         INTEGER(HSIZE_T), INTENT(IN), VALUE :: gap_size
+       END FUNCTION h5pset_virtual_printf_gap
+    END INTERFACE
+
+    hdferr = INT( h5pset_virtual_printf_gap(dapl_id, gap_size) )
+
+  END SUBROUTINE h5pset_virtual_printf_gap_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Returns the maximum number of missing source files and/or datasets with the
+!!        printf-style names when getting the extent for an unlimited virtual dataset.
+!!
+!! \param dapl_id  Dataset access property list identifier for the virtual dataset.
+!! \param gap_size Maximum Number of the files and/or datasets allowed to be missing for
+!!                 determining the extent of an unlimited virtual dataset with printf-style mappings.
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Pget_virtual_printf_gap()
+!!
+  SUBROUTINE h5pget_virtual_printf_gap_f(dapl_id, gap_size, hdferr)
+    IMPLICIT NONE
+
+    INTEGER(HID_T)  , INTENT(IN)  :: dapl_id
+    INTEGER(HSIZE_T), INTENT(OUT) :: gap_size
+    INTEGER         , INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5pget_virtual_printf_gap(dapl_id, gap_size) BIND(C,NAME='H5Pget_virtual_printf_gap')
+         IMPORT :: HID_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN), VALUE :: dapl_id
+         INTEGER(HSIZE_T), INTENT(OUT) :: gap_size
+       END FUNCTION h5pget_virtual_printf_gap
+    END INTERFACE
+
+    hdferr = INT( h5pget_virtual_printf_gap(dapl_id, gap_size) )
+
+  END SUBROUTINE h5pget_virtual_printf_gap_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets the mapping between virtual and source datasets.
+!!
+!! \param dcpl_id       The identifier of the dataset creation property list that will be used when creating the virtual dataset.
+!! \param vspace_id     The dataspace identifier with the selection within the virtual dataset applied, possibly an unlimited selection.
+!! \param src_file_name The name of the HDF5 file where the source dataset is located.
+!! \param src_dset_name The path to the HDF5 dataset in the file specified by src_file_name.
+!! \param src_space_id  The source dataset’s dataspace identifier with a selection applied, possibly an unlimited selection.
+!! \param hdferr        \fortran_error
+!!
+!! See C API: @ref H5Pset_virtual()
+!!
+  SUBROUTINE h5pset_virtual_f(dcpl_id, vspace_id, src_file_name, src_dset_name, src_space_id, hdferr)
+    IMPLICIT NONE
+
+    INTEGER(HID_T), INTENT(IN)   :: dcpl_id
+    INTEGER(HID_T), INTENT(IN)   :: vspace_id
+    CHARACTER(LEN=*), INTENT(IN) :: src_file_name
+    CHARACTER(LEN=*), INTENT(IN) :: src_dset_name
+    INTEGER(HID_T), INTENT(IN)   :: src_space_id
+    INTEGER, INTENT(OUT)         :: hdferr
+    CHARACTER(LEN=LEN_TRIM(src_file_name)+1,KIND=C_CHAR) :: c_src_file_name
+    CHARACTER(LEN=LEN_TRIM(src_dset_name)+1,KIND=C_CHAR) :: c_src_dset_name
+
+    INTERFACE
+       INTEGER FUNCTION h5pset_virtual(dcpl_id, vspace_id, c_src_file_name, c_src_dset_name, src_space_id) &
+            BIND(C,NAME='H5Pset_virtual')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN), VALUE :: dcpl_id
+         INTEGER(HID_T), INTENT(IN), VALUE :: vspace_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: c_src_file_name
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: c_src_dset_name
+         INTEGER(HID_T), INTENT(IN), VALUE :: src_space_id
+       END FUNCTION h5pset_virtual
+    END INTERFACE
+
+    c_src_file_name = TRIM(src_file_name)//C_NULL_CHAR
+    c_src_dset_name = TRIM(src_dset_name)//C_NULL_CHAR
+
+    hdferr = h5pset_virtual(dcpl_id, vspace_id, c_src_file_name, c_src_dset_name, src_space_id)
+
+  END SUBROUTINE h5pset_virtual_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Gets the number of mappings for the virtual dataset.
+!!
+!! \param dcpl_id The identifier of the virtual dataset creation property list.
+!! \param count   The number of mappings.
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Pget_virtual_count()
+!!
+  SUBROUTINE h5pget_virtual_count_f(dcpl_id, count, hdferr)
+
+    IMPLICIT NONE
+
+    INTEGER(HID_T), INTENT(IN)   :: dcpl_id
+    INTEGER(SIZE_T), INTENT(OUT) :: count
+    INTEGER, INTENT(OUT)         :: hdferr
+    INTERFACE
+       INTEGER(C_INT) FUNCTION h5pget_virtual_count(dcpl_id, count) BIND(C,NAME='H5Pget_virtual_count')
+         IMPORT :: HID_T, SIZE_T, C_INT
+         IMPLICIT NONE
+         INTEGER(HID_T) , INTENT(IN), VALUE :: dcpl_id
+         INTEGER(SIZE_T), INTENT(OUT) :: count
+       END FUNCTION h5pget_virtual_count
+    END INTERFACE
+
+    hdferr = INT( h5pget_virtual_count(dcpl_id, count))
+
+  END SUBROUTINE h5pget_virtual_count_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Gets a dataspace identifier for the selection within the virtual dataset used in the mapping.
+!!
+!! \param dcpl_id The identifier of the virtual dataset creation property list.
+!! \param index   Mapping index. The value of index is 0 (zero) or greater and less than count (0 ≤ index < count),
+!!                where count is the number of mappings returned by h5pget_virtual_count.
+!! \param ds_id   Valid dataspace identifier identifier if successful; otherwise returns H5I_INVALID_HID_F.
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Pget_virtual_vspace()
+!!
+  SUBROUTINE h5pget_virtual_vspace_f(dcpl_id, index, ds_id, hdferr)
+    IMPLICIT NONE
+
+    INTEGER(HID_T) , INTENT(IN)  :: dcpl_id
+    INTEGER(SIZE_T), INTENT(IN)  :: index
+    INTEGER(HID_T) , INTENT(OUT) :: ds_id
+    INTEGER, INTENT(OUT)         :: hdferr
+
+    INTERFACE
+       INTEGER(HID_T) FUNCTION h5pget_virtual_vspace(dcpl_id, index) BIND(C,NAME='H5Pget_virtual_vspace')
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T) , INTENT(IN), VALUE :: dcpl_id
+         INTEGER(SIZE_T), INTENT(IN), VALUE :: index
+       END FUNCTION h5pget_virtual_vspace
+    END INTERFACE
+
+    ds_id = h5pget_virtual_vspace(dcpl_id, index)
+
+    hdferr = 0
+    IF(ds_id.LT.0) hdferr = -1
+
+END SUBROUTINE h5pget_virtual_vspace_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Gets a dataspace identifier for the selection within the source dataset used in the mapping.
+!!
+!! \param dcpl_id The Identifier of the virtual dataset creation property list.
+!! \param index   Mapping index.The value of index is 0 (zero) or greater and less than count (0 ≤ index < count),
+!!                where count is the number of mappings returned by h5pget_virtual_count.
+!! \param ds_id   Dataspace identifier.
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Pget_virtual_srcspace()
+!!
+SUBROUTINE h5pget_virtual_srcspace_f(dcpl_id, index, ds_id, hdferr)
+  IMPLICIT NONE
+
+  INTEGER(HID_T) , INTENT(IN)  :: dcpl_id
+  INTEGER(SIZE_T), INTENT(IN)  :: index
+  INTEGER(HID_T) , INTENT(OUT) :: ds_id
+  INTEGER, INTENT(OUT)         :: hdferr
+
+  INTERFACE
+     INTEGER(HID_T) FUNCTION h5pget_virtual_srcspace(dcpl_id, index) BIND(C,NAME='H5Pget_virtual_srcspace')
+       IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+       INTEGER(HID_T) , INTENT(IN), VALUE :: dcpl_id
+       INTEGER(SIZE_T), INTENT(IN), VALUE :: index
+     END FUNCTION h5pget_virtual_srcspace
+  END INTERFACE
+
+  ds_id = h5pget_virtual_srcspace(dcpl_id, index)
+
+  hdferr = 0
+  IF(ds_id.LT.0) hdferr = -1
+
+END SUBROUTINE h5pget_virtual_srcspace_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Gets the filename of a source dataset used in the mapping.
+!!
+!! \param dcpl_id  The identifier of the virtual dataset creation property list.
+!! \param index    Mapping index. The value of index is 0 (zero) or greater and less than count (0 ≤ index < count),
+!!                 where count is the number of mappings returned by h5pget_virtual_count.
+!! \param name     A buffer containing the name of the file containing the source dataset.
+!! \param hdferr   \fortran_error
+!! \param name_len The size of name needed to hold the filename. (OUT)
+!!
+!!
+!! See C API: @ref H5Pget_virtual_filename()
+!!
+SUBROUTINE h5pget_virtual_filename_f(dcpl_id, index, name, hdferr, name_len)
+
+  IMPLICIT NONE
+  INTEGER(HID_T)  , INTENT(IN)  :: dcpl_id
+  INTEGER(SIZE_T) , INTENT(IN)  :: index
+  CHARACTER(LEN=*), INTENT(OUT) :: name
+  INTEGER, INTENT(OUT)          :: hdferr
+  INTEGER(SIZE_T), OPTIONAL     :: name_len
+
+  CHARACTER(LEN=1,KIND=C_CHAR), DIMENSION(1:LEN(name)+1), TARGET :: c_name
+  TYPE(C_PTR) :: f_ptr
+
+  INTERFACE
+     INTEGER(SIZE_T) FUNCTION h5pget_virtual_filename(dcpl_id, index, name, size) BIND(C, NAME='H5Pget_virtual_filename')
+       IMPORT :: HID_T, SIZE_T, C_PTR
+         IMPLICIT NONE
+       INTEGER(HID_T) , INTENT(IN), VALUE :: dcpl_id
+       INTEGER(SIZE_T), INTENT(IN), VALUE :: index
+       TYPE(C_PTR), VALUE :: name
+       INTEGER(SIZE_T), INTENT(IN), VALUE :: size
+     END FUNCTION h5pget_virtual_filename
+  END INTERFACE
+
+  hdferr = 0
+  IF(PRESENT(name_len))THEN
+     name_len = INT(h5pget_virtual_filename(dcpl_id, index, C_NULL_PTR, 0_SIZE_T), SIZE_T)
+     IF(name_len.LT.0) hdferr = -1
+  ELSE
+     f_ptr = C_LOC(c_name(1)(1:1))
+
+     IF(INT(h5pget_virtual_filename(dcpl_id, index, f_ptr, INT(LEN(name)+1,SIZE_T)), SIZE_T).LT.0)THEN
+        hdferr = -1
+     ELSE
+        CALL HD5c2fstring(name,c_name,LEN(name))
+     ENDIF
+
+  ENDIF
+
+END SUBROUTINE h5pget_virtual_filename_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Gets the name of a source dataset used in the mapping.
+!!
+!! \param dcpl_id  The identifier of the virtual dataset creation property list.
+!! \param index    Mapping index. The value of index is 0 (zero) or greater and less than count (0 ≤ index < count),
+!!                 where count is the number of mappings returned by h5pget_virtual_count.
+!! \param name     A buffer containing the name of the source dataset.
+!! \param hdferr   \fortran_error
+!! \param name_len The size of name needed to hold the source dataset name.
+!!
+!! See C API: @ref H5Pget_virtual_dsetname()
+!!
+SUBROUTINE h5pget_virtual_dsetname_f(dcpl_id, index, name, hdferr, name_len)
+
+  IMPLICIT NONE
+  INTEGER(HID_T)  , INTENT(IN)  :: dcpl_id
+  INTEGER(SIZE_T) , INTENT(IN)  :: index
+  CHARACTER(LEN=*), INTENT(OUT) :: name
+  INTEGER, INTENT(OUT)          :: hdferr
+  INTEGER(SIZE_T), OPTIONAL     :: name_len
+
+  CHARACTER(LEN=1,KIND=C_CHAR), DIMENSION(1:LEN(name)+1), TARGET :: c_name
+  TYPE(C_PTR) :: f_ptr
+
+  INTERFACE
+     INTEGER(SIZE_T) FUNCTION h5pget_virtual_dsetname(dcpl_id, index, name, size) BIND(C, NAME='H5Pget_virtual_dsetname')
+       IMPORT :: HID_T, SIZE_T, C_PTR
+         IMPLICIT NONE
+       INTEGER(HID_T) , INTENT(IN), VALUE :: dcpl_id
+       INTEGER(SIZE_T), INTENT(IN), VALUE :: index
+       TYPE(C_PTR), VALUE :: name
+       INTEGER(SIZE_T), INTENT(IN), VALUE :: size
+     END FUNCTION h5pget_virtual_dsetname
+  END INTERFACE
+
+  hdferr = 0
+  IF(PRESENT(name_len))THEN
+     name_len = INT(h5pget_virtual_dsetname(dcpl_id, index, C_NULL_PTR, 0_SIZE_T), SIZE_T)
+     IF(name_len.LT.0) hdferr = -1
+  ELSE
+     f_ptr = C_LOC(c_name(1)(1:1))
+
+     IF(INT(h5pget_virtual_dsetname(dcpl_id, index, f_ptr, INT(LEN(name)+1,SIZE_T)), SIZE_T).LT.0)THEN
+        hdferr = -1
+     ELSE
+        CALL HD5c2fstring(name,c_name,LEN(name))
+     ENDIF
+  ENDIF
+
+END SUBROUTINE h5pget_virtual_dsetname_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Gets the value of the "minimize dataset headers" value which creates
+!!        smaller dataset object headers when its set and no attributes are present.
+!!
+!! \param dcpl_id  Target dataset creation property list identifier.
+!! \param minimize Value of the setting.
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Pget_dset_no_attrs_hint()
+!!
+  SUBROUTINE h5pget_dset_no_attrs_hint_f(dcpl_id, minimize, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T) , INTENT(IN)              :: dcpl_id
+    LOGICAL        , INTENT(OUT)             :: minimize
+    INTEGER        , INTENT(OUT)             :: hdferr
+    LOGICAL(C_BOOL) :: c_minimize
+
+    INTERFACE
+       INTEGER FUNCTION h5pget_dset_no_attrs_hint_c(dcpl_id, minimize) BIND(C, NAME='H5Pget_dset_no_attrs_hint')
+         IMPORT :: HID_T, C_BOOL
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN), VALUE :: dcpl_id
+         LOGICAL(C_BOOL), INTENT(OUT) :: minimize
+       END FUNCTION h5pget_dset_no_attrs_hint_c
+    END INTERFACE
+
+    hdferr = INT(h5pget_dset_no_attrs_hint_c(dcpl_id, c_minimize))
+
+    ! Transfer value of C C_BOOL type to Fortran LOGICAL
+    minimize = c_minimize
+
+   END SUBROUTINE h5pget_dset_no_attrs_hint_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets the value of the "minimize dataset headers" value which creates
+!!       smaller dataset object headers when its set and no attributes are present.
+!!
+!! \param dcpl_id  Target dataset creation property list identifier.
+!! \param minimize Value of the setting.
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Pset_dset_no_attrs_hint()
+!!
+  SUBROUTINE h5pset_dset_no_attrs_hint_f(dcpl_id, minimize, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T) , INTENT(IN)              :: dcpl_id
+    LOGICAL        , INTENT(IN)              :: minimize
+    INTEGER        , INTENT(OUT)             :: hdferr
+    LOGICAL(C_BOOL) :: c_minimize
+
+    INTERFACE
+       INTEGER FUNCTION h5pset_dset_no_attrs_hint_c(dcpl_id, minimize) BIND(C, NAME='H5Pset_dset_no_attrs_hint')
+         IMPORT :: HID_T, C_BOOL
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN), VALUE :: dcpl_id
+         LOGICAL(C_BOOL), INTENT(IN), VALUE :: minimize
+       END FUNCTION h5pset_dset_no_attrs_hint_c
+    END INTERFACE
+
+    ! Transfer value of Fortran LOGICAL to C C_BOOL type
+    c_minimize = minimize
+
+    hdferr = INT(h5pset_dset_no_attrs_hint_c(dcpl_id, c_minimize))
+
+  END SUBROUTINE h5pset_dset_no_attrs_hint_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Set the file VOL connector (VOL_ID) for a file access property list (PLIST_ID)
+!!
+!! \param plist_id     Access property list identifier.
+!! \param new_vol_id   VOL connector id.
+!! \param hdferr       \fortran_error
+!! \param new_vol_info VOL connector info.
+!!
+!! See C API: @ref H5Pset_vol()
+!!
+  SUBROUTINE h5pset_vol_f(plist_id, new_vol_id, hdferr, new_vol_info)
+    IMPLICIT NONE
+    INTEGER(HID_T) , INTENT(IN)   :: plist_id
+    INTEGER(HID_T) , INTENT(IN)   :: new_vol_id
+    INTEGER        , INTENT(OUT)  :: hdferr
+    TYPE(C_PTR)    , OPTIONAL     :: new_vol_info
+
+    TYPE(C_PTR) :: new_vol_info_default
+
+    INTERFACE
+       INTEGER FUNCTION h5pset_vol(plist_id, new_vol_id, new_vol_info) BIND(C, NAME='H5Pset_vol')
+         IMPORT :: HID_T, C_PTR
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN), VALUE :: plist_id
+         INTEGER(HID_T), INTENT(IN), VALUE :: new_vol_id
+         TYPE(C_PTR)   , INTENT(IN), VALUE :: new_vol_info
+       END FUNCTION h5pset_vol
+    END INTERFACE
+
+    new_vol_info_default = C_NULL_PTR
+    IF(PRESENT(new_vol_info)) new_vol_info_default=new_vol_info
+
+    hdferr = INT(h5pset_vol(plist_id, new_vol_id, new_vol_info_default))
+
+  END SUBROUTINE h5pset_vol_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Get the file VOL connector (VOL_ID) for a file access property list (PLIST_ID)
+!
+!! \param plist_id Access property list identifier.
+!! \param vol_id   VOL connector id.
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Pget_vol_id()
+!!
+  SUBROUTINE h5pget_vol_id_f(plist_id, vol_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T) , INTENT(IN)   :: plist_id
+    INTEGER(HID_T) , INTENT(OUT)  :: vol_id
+    INTEGER        , INTENT(OUT)  :: hdferr
+
+    INTERFACE
+       INTEGER FUNCTION h5pget_vol_id(plist_id, vol_id) BIND(C, NAME='H5Pget_vol_id')
+         IMPORT :: HID_T, C_PTR
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN), VALUE :: plist_id
+         INTEGER(HID_T), INTENT(OUT) :: vol_id
+       END FUNCTION h5pget_vol_id
+    END INTERFACE
+
+    hdferr = INT(h5pget_vol_id(plist_id, vol_id))
+
+  END SUBROUTINE h5pget_vol_id_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Gets the file locking properties. File locking is mainly used to help enforce SWMR semantics.
+!!
+!! \param fapl_id               Target fileTarget file access property list identifier.
+!! \param use_file_locking      Whether or not to use file locks.
+!! \param ignore_disabled_locks Whether or not to ignore file locks when locking is disabled on a file system.
+!! \param hdferr                \fortran_error
+!!
+!! See C API: @ref H5Pget_file_locking()
+!!
+  SUBROUTINE h5pget_file_locking_f(fapl_id, use_file_locking, ignore_disabled_locks, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T) , INTENT(IN)              :: fapl_id
+    LOGICAL        , INTENT(OUT)             :: use_file_locking
+    LOGICAL        , INTENT(OUT)             :: ignore_disabled_locks
+    INTEGER        , INTENT(OUT)             :: hdferr
+    LOGICAL(C_BOOL) :: c_use_flag
+    LOGICAL(C_BOOL) :: c_ignore_flag
+
+    INTERFACE
+       INTEGER FUNCTION h5pget_file_locking(fapl_id, use_file_locking, ignore_disabled_locks) BIND(C, NAME='H5Pget_file_locking')
+         IMPORT :: HID_T, C_BOOL
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN), VALUE :: fapl_id
+         LOGICAL(C_BOOL), INTENT(OUT) :: use_file_locking
+         LOGICAL(C_BOOL), INTENT(OUT) :: ignore_disabled_locks
+       END FUNCTION h5pget_file_locking
+    END INTERFACE
+
+    hdferr = INT(h5pget_file_locking(fapl_id, c_use_flag, c_ignore_flag))
+
+    ! Transfer value of C C_BOOL type to Fortran LOGICAL
+    use_file_locking = c_use_flag
+    ignore_disabled_locks = c_ignore_flag
+
+   END SUBROUTINE h5pget_file_locking_f
+
+!>
+!! \ingroup FH5P
+!!
+!! \brief Sets the file locking properties. File locking is mainly used to help enforce SWMR semantics.
+!!
+!! \param fapl_id               Target file access property list identifier.
+!! \param use_file_locking      Whether or not to use file locks.
+!! \param ignore_disabled_locks Whether or not to ignore file locks when locking is disabled on a file system.
+!! \param hdferr                \fortran_error
+!!
+!! See C API: @ref H5Pset_file_locking()
+!!
+  SUBROUTINE h5pset_file_locking_f(fapl_id, use_file_locking, ignore_disabled_locks, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T) , INTENT(IN)              :: fapl_id
+    LOGICAL        , INTENT(IN)              :: use_file_locking
+    LOGICAL        , INTENT(IN)              :: ignore_disabled_locks
+    INTEGER        , INTENT(OUT)             :: hdferr
+    LOGICAL(C_BOOL) :: c_use_flag
+    LOGICAL(C_BOOL) :: c_ignore_flag
+
+    INTERFACE
+       INTEGER FUNCTION h5pset_file_locking(fapl_id, use_file_locking, ignore_disabled_locks) BIND(C, NAME='H5Pset_file_locking')
+         IMPORT :: HID_T, C_BOOL
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN), VALUE :: fapl_id
+         LOGICAL(C_BOOL), INTENT(IN), VALUE :: use_file_locking
+         LOGICAL(C_BOOL), INTENT(IN), VALUE :: ignore_disabled_locks
+       END FUNCTION h5pset_file_locking
+    END INTERFACE
+
+    ! Transfer value of Fortran LOGICAL to C C_BOOL type
+    c_use_flag = use_file_locking
+    c_ignore_flag = ignore_disabled_locks
+
+    hdferr = INT(h5pset_file_locking(fapl_id, c_use_flag, c_ignore_flag))
+
+  END SUBROUTINE h5pset_file_locking_f
+
+END MODULE H5P
+
diff --git a/fortran/src/H5Pff.f90 b/fortran/src/H5Pff.f90
deleted file mode 100644
index 3409f15..0000000
--- a/fortran/src/H5Pff.f90
+++ /dev/null
@@ -1,6400 +0,0 @@
-!****h* ROBODoc/H5P (F90)
-!
-! NAME
-!  H5P_PROVISIONAL
-!
-! PURPOSE
-!  This file contains Fortran interfaces for H5P functions. It includes
-!  all the functions that are independent on whether the Fortran 2003 functions
-!  are enabled or disabled.
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! NOTES
-!                         *** IMPORTANT ***
-!  If you add a new H5P function you must add the function name to the
-!  Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
-!  This is needed for Windows based operating systems.
-!*****
-
-MODULE H5P
-
-  USE H5GLOBAL
-  
-  INTERFACE h5pset_fapl_multi_f
-     MODULE PROCEDURE h5pset_fapl_multi_l
-     MODULE PROCEDURE h5pset_fapl_multi_s
-  END INTERFACE
-
-CONTAINS
-
-!****s* H5P/h5pcreate_f 
-! NAME
-!  h5pcreate_f 
-!
-! PURPOSE
-!  Creates a new property as an instance of a property 
-!  list class.
-!
-! INPUTS
-!  class  - type of the property class to be created.
-!	    Possible values are:
-!             H5P_OBJECT_CREATE_F
-!             H5P_FILE_CREATE_F
-!             H5P_FILE_ACCESS_F
-!             H5P_DATASET_CREATE_F
-!             H5P_DATASET_ACCESS_F
-!             H5P_DATASET_XFER_F
-!             H5P_FILE_MOUNT_F
-!             H5P_GROUP_CREATE_F
-!             H5P_GROUP_ACCESS_F
-!             H5P_DATATYPE_CREATE_F
-!             H5P_DATATYPE_ACCESS_F
-!             H5P_STRING_CREATE_F
-!             H5P_ATTRIBUTE_CREATE _F
-!             H5P_OBJECT_COPY_F
-!             H5P_LINK_CREATE_F
-!             H5P_LINK_ACCESS_F
-!
-! OUTPUTS
-!  prp_id - property list identifier
-!  hdferr - error code		
-!	     Success:  0
-!	     Failure: -1 
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999	
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for 
-!  called C functions (it is needed for Windows
-!  port).  March 14, 2001 
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pcreate_f(class, prp_id, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN)  :: class
-    INTEGER(HID_T), INTENT(OUT) :: prp_id
-    INTEGER       , INTENT(OUT) :: hdferr
-!*****
-!            INTEGER, EXTERNAL :: h5pcreate_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pcreate_c(class, prp_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PCREATE_C'::h5pcreate_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: class
-         INTEGER(HID_T), INTENT(OUT) :: prp_id
-       END FUNCTION h5pcreate_c
-    END INTERFACE
-
-    hdferr = h5pcreate_c(class, prp_id) 
-  END SUBROUTINE h5pcreate_f
-
-!****s* H5P/h5pset_preserve_f 
-! NAME
-!   h5pset_preserve_f 
-!
-! PURPOSE
-!  Sets the dataset transfer property list status to 
-!  TRUE or FALSE for initializing compound datatype
-!  members during write/read operations.
-!
-! INPUTS
-!  prp_id	- property list identifier
-!  flag		- status flag
-!
-! OUTPUTS
-!  hdferr	- Returns 0 if successful and -1 if fails
-!
-! OPTIONAL PARAMETERS
-!  NONE
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999	
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for 
-!  called C functions (it is needed for Windows
-!  port).  March 14, 2001 
-!                       
-!  Datatype of the flag parameter is changed from 
-!  INTEGER to LOGICAL June 4, 2003
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pset_preserve_f(prp_id, flag, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
-    LOGICAL, INTENT(IN) ::  flag         ! TRUE/FALSE flag to set the dataset
-                                         ! transfer property for partila writing/reading
-                                         ! compound datatype
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code
-                                         ! 0 on success and -1 on failure
-!*****
-    INTEGER :: flag_c
-
-!            INTEGER, EXTERNAL :: h5pset_preserve_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pset_preserve_c(prp_id, flag_c)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_PRESERVE_C'::h5pset_preserve_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         INTEGER ::  flag_c
-       END FUNCTION h5pset_preserve_c
-    END INTERFACE
-    flag_c = 0
-    IF(flag) flag_c = 1
-    hdferr = h5pset_preserve_c(prp_id, flag_c) 
-  END SUBROUTINE h5pset_preserve_f
-
-!****s* H5P/h5pget_preserve_f 
-! NAME
-!  h5pget_preserve_f 
-!
-! PURPOSE
-!  Checks status of the dataset transfer property list.
-!
-! INPUTS
-!  prp_id  - property list identifier
-!
-! OUTPUTS
-!  flag	   - status flag
-!  hdferr  - error code		
-!	Success:  0
-!	Failure: -1
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999	
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for 
-!  called C functions (it is needed for Windows
-!  port).  March 14, 2001
-! 
-!  Datatype of the flag parameter is changed from 
-!  INTEGER to LOGICAL 
-!  June 4, 2003 
-! 
-! Fortran90 Interface:
-  SUBROUTINE h5pget_preserve_f(prp_id, flag, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
-    LOGICAL, INTENT(OUT) ::  flag        ! TRUE/FALSE flag. Shows status of the dataset's
-                                         ! transfer property for partial writing/reading
-                                         ! compound datatype
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code
-                                         ! 0 on success and -1 on failure
-!*****
-    INTEGER :: flag_c
-
-!            INTEGER, EXTERNAL :: h5pget_preserve_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pget_preserve_c(prp_id, flag_c)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_PRESERVE_C'::h5pget_preserve_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         INTEGER ::  flag_c
-       END FUNCTION h5pget_preserve_c
-    END INTERFACE
-    
-    hdferr = h5pget_preserve_c(prp_id, flag_c) 
-    flag = .FALSE.
-    IF(flag_c .EQ. 1) flag = .TRUE.
-  END SUBROUTINE h5pget_preserve_f
-
-!****s* H5P/h5pget_class_f 
-! NAME
-!  h5pget_class_f 
-!
-! PURPOSE
-!  Returns the property list class for a property list.
-!
-! INPUTS
-!  prp_id	- property list identifier
-!
-! OUTPUTS
-!  classtype	- property list class
-!  hdferr:	- error code		
-!		   Success:  0
-!		   Failure: -1 
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999	
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for 
-!  called C functions (it is needed for Windows
-!  port).  March 14, 2001 
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pget_class_f(prp_id, classtype, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id      ! Property list identifier 
-    INTEGER(HID_T), INTENT(OUT) :: classtype  ! The type of the property list 
-                                              ! to be created.
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code
-                                         ! 0 on success and -1 on failure
-!*****
-
-    INTERFACE
-       INTEGER FUNCTION h5pget_class_c(prp_id, classtype)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_CLASS_C'::h5pget_class_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN)  :: prp_id
-         INTEGER(HID_T), INTENT(OUT) :: classtype 
-       END FUNCTION h5pget_class_c
-    END INTERFACE
-
-    hdferr = h5pget_class_c(prp_id, classtype) 
-  END SUBROUTINE h5pget_class_f
-
-!****s* H5P/h5pcopy_f 
-! NAME
-!  h5pcopy_f 
-!
-! PURPOSE
-!  Copies an existing property list to create a new 
-!  property list
-!
-! INPUTS
-!  prp_id       - property list identifier
-! OUTPUTS
-!  new_prp_id	- new property list identifier
-!  hdferr:	- error code		
-!		   Success:  0
-!		   Failure: -1
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999	
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for 
-!  called C functions (it is needed for Windows
-!  port).  March 14, 2001
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pcopy_f(prp_id, new_prp_id, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id      ! Property list identifier 
-    INTEGER(HID_T), INTENT(OUT) :: new_prp_id ! Identifier of property list
-    INTEGER, INTENT(OUT) :: hdferr            ! Error code
-                                              ! 0 on success and -1 on failure
-!*****
-
-!            INTEGER, EXTERNAL :: h5pcopy_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pcopy_c(prp_id, new_prp_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PCOPY_C'::h5pcopy_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         INTEGER(HID_T), INTENT(OUT) :: new_prp_id
-       END FUNCTION h5pcopy_c
-    END INTERFACE
-    
-    hdferr = h5pcopy_c(prp_id, new_prp_id)
-  END SUBROUTINE h5pcopy_f
-
-!****s* H5P/h5pclose_f 
-! NAME
-!  h5pclose_f 
-!
-! PURPOSE
-!  Terminates access to a property list. 
-!
-! INPUTS
-!  prp_id - identifier of the property list to 
-!	    terminate access to. 
-! OUTPUTS
-!  hdferr - error code		
-!	    Success:  0
-!	    Failure: -1
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999	
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for 
-!  called C functions (it is needed for Windows
-!  port).  March 14, 2001 
-!		
-! Fortran90 Interface:
-  SUBROUTINE h5pclose_f(prp_id, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier 
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code
-                                          ! 0 on success and -1 on failure
-!*****
-
-!            INTEGER, EXTERNAL :: h5pclose_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pclose_c(prp_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PCLOSE_C'::h5pclose_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id 
-       END FUNCTION h5pclose_c
-    END INTERFACE
-    
-    hdferr = h5pclose_c(prp_id)
-  END SUBROUTINE h5pclose_f
-
-!****s* H5P/h5pset_chunk_f 
-! NAME
-!   h5pset_chunk_f 
-!
-! PURPOSE
-!  Sets the size of the chunks used to store 
-!  a chunked layout dataset. 
-!
-! INPUTS
-!  prp_id  - datatset creation property list identifier
-!  ndims   - number of dimensions for each chunk
-!  dims	   - array with dimension sizes for each chunk
-! OUTPUTS
-!  hdferr  - error code		
-!	      Success:  0
-!	      Failure: -1
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999	
-!
-! HISTORY
-!   Explicit Fortran interfaces were added for 
-!   called C functions (it is needed for Windows
-!   port).  March 14, 2001 
-!		
-! Fortran90 Interface:
-  SUBROUTINE h5pset_chunk_f(prp_id, ndims, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
-    INTEGER, INTENT(IN) :: ndims         ! Number of chunk dimensions
-    INTEGER(HSIZE_T), DIMENSION(ndims), INTENT(IN) :: dims    
-                                         ! Array containing sizes of
-                                         ! chunk dimensions
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code
-                                         ! 0 on success and -1 on failure
-!*****
-
-!            INTEGER, EXTERNAL :: h5pset_chunk_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pset_chunk_c(prp_id, ndims, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_CHUNK_C'::h5pset_chunk_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         INTEGER, INTENT(IN) :: ndims
-         INTEGER(HSIZE_T), DIMENSION(ndims), INTENT(IN) :: dims
-       END FUNCTION h5pset_chunk_c
-    END INTERFACE
-    
-    hdferr =  h5pset_chunk_c(prp_id, ndims, dims)
-  END SUBROUTINE h5pset_chunk_f
-
-!****s* H5P/h5pget_chunk_f 
-! NAME
-!   h5pget_chunk_f 
-!
-! PURPOSE
-!  Retrieves the size of chunks for the raw data of a 
-!  chunked layout dataset
-!
-! INPUTS
-!  prp_id	- property list identifier
-!  ndims	- size of dims array
-! OUTPUTS
-!  dims		- array with dimension sizes for each chunk
-!  hdferr	- error code		
-!		   Success:  number of chunk dimensions
-!		   Failure: -1
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999	
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for 
-!  called C functions (it is needed for Windows
-!  port).  March 14, 2001 
-!		
-! Fortran90 Interface:
-  SUBROUTINE h5pget_chunk_f(prp_id, ndims, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
-    INTEGER, INTENT(IN) :: ndims         ! Number of chunk dimensions to
-                                         ! to return
-    INTEGER(HSIZE_T), DIMENSION(ndims), INTENT(OUT) :: dims    
-                                         ! Array containing sizes of
-                                         ! chunk dimensions
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code:
-                                         !  number of chunk dimensions on success,
-                                         !  -1 on failure
-!*****
-!            INTEGER, EXTERNAL :: h5pget_chunk_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pget_chunk_c(prp_id, ndims, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_CHUNK_C'::h5pget_chunk_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         INTEGER :: ndims
-         INTEGER(HSIZE_T), DIMENSION(*), INTENT(OUT) :: dims
-       END FUNCTION h5pget_chunk_c
-    END INTERFACE
-
-    hdferr =  h5pget_chunk_c(prp_id, ndims, dims)
-  END SUBROUTINE h5pget_chunk_f
-
-!****s* H5P/h5pset_deflate_f 
-! NAME
-!   h5pset_deflate_f 
-!
-! PURPOSE
-!   Sets compression method and compression level. 
-!
-! INPUTS
-!   prp_id  - property list identifier
-!   level   - compression level
-! OUTPUTS
-!  
-!  hdferr  - error code		
-!	      Success:  0
-!	      Failure: -1
-!
-! AUTHOR
-!	Elena Pourmal
-!		August 12, 1999
-!
-! HISTORY
-! 	Explicit Fortran interfaces were added for 
-!			called C functions (it is needed for Windows
-!			port).  March 14, 2001
-!		
-! Fortran90 Interface:
-  SUBROUTINE h5pset_deflate_f(prp_id, level, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
-    INTEGER, INTENT(IN) :: level         ! Compression level 
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code
-                                         ! 0 on success and -1 on failure
-!*****
-
-!  INTEGER, EXTERNAL :: h5pset_deflate_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pset_deflate_c(prp_id, level)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_DEFLATE_C'::h5pset_deflate_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         INTEGER, INTENT(IN) :: level
-       END FUNCTION h5pset_deflate_c
-    END INTERFACE
-    hdferr = h5pset_deflate_c(prp_id, level)
-    
-  END SUBROUTINE h5pset_deflate_f
-
-!****s* H5P/h5pget_version_f 
-! NAME
-!  h5pget_version_f 
-!
-! PURPOSE
-!  Retrieves the version information of various objects 
-!  for a file creation property list
-!
-! INPUTS
-!  prp_id	- file createion property list identifier
-! OUTPUTS
-!  boot		- super block version number
-!  freelist	- global freelist version number
-!  stab		- symbol table version number
-!  shhdr	- shared object header version number
-!  hdferr       - error code		
-!	           Success:  0
-!	           Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999	
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for 
-!  called C functions (it is needed for Windows
-!  port).  March 14, 2001 
-!		
-! Fortran90 Interface:          
-  SUBROUTINE h5pget_version_f(prp_id, boot, freelist, &
-       stab, shhdr, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id        ! Property list identifier 
-    INTEGER, DIMENSION(:), INTENT(OUT) :: boot  ! Array to put boot
-                                                ! block version number
-    INTEGER, DIMENSION(:), INTENT(OUT) :: freelist  ! Array to put global
-                                                    ! Freelist version number
-
-    INTEGER, DIMENSION(:), INTENT(OUT) :: stab  ! Array to put symbol
-                                                ! table version number
-    INTEGER, DIMENSION(:), INTENT(OUT) :: shhdr ! Array to put shared
-                                                ! object header version number
-    INTEGER, INTENT(OUT) :: hdferr              ! Error code
-                                                ! 0 on success and -1 on failure
-!*****
-
-!            INTEGER, EXTERNAL :: h5pget_version_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pget_version_c(prp_id, boot, freelist, stab, shhdr)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_VERSION_C'::h5pget_version_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         INTEGER, DIMENSION(:), INTENT(OUT) :: boot 
-         INTEGER, DIMENSION(:), INTENT(OUT) :: freelist 
-         INTEGER, DIMENSION(:), INTENT(OUT) :: stab
-         INTEGER, DIMENSION(:), INTENT(OUT) :: shhdr
-       END FUNCTION h5pget_version_c
-    END INTERFACE
-    
-    hdferr = h5pget_version_c(prp_id, boot, freelist, stab, shhdr)
-  END SUBROUTINE h5pget_version_f
-
-!****s* H5P/h5pset_userblock_f 
-! NAME
-!  h5pset_userblock_f 
-!
-! PURPOSE
-!   Sets user block size
-!
-! INPUTS
-!   prp_id - file creation property list to modify
-!   size   - size of the user-block in bytes
-!
-! OUTPUTS
-!  hdferr  - error code		
-!	      Success:  0
-!	      Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999	
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for 
-!  called C functions (it is needed for Windows
-!  port).  March 14, 2001 
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pset_userblock_f (prp_id, size, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
-    INTEGER(HSIZE_T), INTENT(IN) :: size ! Size of the user-block in bytes 
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code
-                                         ! 0 on success and -1 on failure
-!*****
-
-!            INTEGER, EXTERNAL :: h5pset_userblock_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pset_userblock_c(prp_id, size)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_USERBLOCK_C'::h5pset_userblock_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         INTEGER(HSIZE_T), INTENT(IN) :: size
-       END FUNCTION h5pset_userblock_c
-    END INTERFACE
-
-    hdferr = h5pset_userblock_c(prp_id, size)
-  END SUBROUTINE h5pset_userblock_f
-
-!****s* H5P/h5pget_userblock_f 
-! NAME
-!  h5pget_userblock_f 
-!
-! PURPOSE
-!  Gets user block size.
-!
-! INPUTS
-!  
-!  prp_id	- file creation property list identifier
-! OUTPUTS
-!  
-!  block_size	- size of the user block in bytes
-!  hdferr       - error code		
-!	           Success:  0
-!	           Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999	
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for 
-!  called C functions (it is needed for Windows
-!  port).  March 14, 2001 
-!		
-! Fortran90 Interface:
-  SUBROUTINE h5pget_userblock_f(prp_id, block_size, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id         ! Property list identifier 
-    INTEGER(HSIZE_T), INTENT(OUT) ::  block_size ! Size of the 
-                                                 ! user-block in bytes 
-    INTEGER, INTENT(OUT) :: hdferr               ! Error code
-                                                 ! 0 on success and -1 on failure
-!*****
-!            INTEGER, EXTERNAL :: h5pget_userblock_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pget_userblock_c(prp_id, block_size)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_USERBLOCK_C'::h5pget_userblock_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         INTEGER(HSIZE_T), INTENT(OUT) :: block_size
-       END FUNCTION h5pget_userblock_c
-    END INTERFACE
-    hdferr = h5pget_userblock_c(prp_id,  block_size)
-  END SUBROUTINE h5pget_userblock_f
-
-!****s* H5P/h5pset_sizes_f 
-! NAME
-!  h5pset_sizes_f 
-!
-! PURPOSE
-!  Sets the byte size of the offsets and lengths used 
-!  to address objects in an HDF5 file.
-!
-! INPUTS
-!  prp_id	- file creation property list identifier
-!  sizeof_addr	- size of an object offset in bytes 
-!  sizeof_size	- size of an object length in bytes
-! OUTPUTS
-!  
-!  hdferr       - error code		
-!	           Success:  0
-!	           Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999	
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for 
-!  called C functions (it is needed for Windows
-!  port).  March 14, 2001 
-!		
-! Fortran90 Interface:
-  SUBROUTINE h5pset_sizes_f (prp_id, sizeof_addr, sizeof_size, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id       ! Property list identifier 
-    INTEGER(SIZE_T), INTENT(IN) :: sizeof_addr ! Size of an object 
-                                               !  offset in bytes 
-    INTEGER(SIZE_T), INTENT(IN) :: sizeof_size ! Size of an object 
-                                               !  length in bytes 
-    INTEGER, INTENT(OUT) :: hdferr             ! Error code
-                                               ! 0 on success and -1 on failure
-!*****
-!            INTEGER, EXTERNAL :: h5pset_sizes_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pset_sizes_c(prp_id, sizeof_addr, sizeof_size)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_SIZES_C'::h5pset_sizes_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id 
-         INTEGER(SIZE_T), INTENT(IN) :: sizeof_addr
-         INTEGER(SIZE_T), INTENT(IN) :: sizeof_size
-       END FUNCTION h5pset_sizes_c
-    END INTERFACE
-    
-    hdferr = h5pset_sizes_c(prp_id, sizeof_addr, sizeof_size)
-  END SUBROUTINE h5pset_sizes_f
-
-!****s* H5P/h5pget_sizes_f 
-! NAME
-!  h5pget_sizes_f 
-!
-! PURPOSE
-!  Retrieves the size of the offsets and lengths used 
-!  in an HDF5 file
-!
-! INPUTS
-!  prp_id	- file creation property list identifier
-! OUTPUTS
-!  
-!  sizeof_addr	- size of an object offset in bytes 
-!  sizeof_size	- size of an object length in bytes
-!  hdferr       - error code		
-!	           Success:  0
-!	           Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999	
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for 
-!  called C functions (it is needed for Windows
-!  port).  March 14, 2001 
-!		
-! Fortran90 Interface:
-  SUBROUTINE h5pget_sizes_f(prp_id, sizeof_addr, sizeof_size, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id        ! Property list identifier 
-    INTEGER(SIZE_T), INTENT(OUT) :: sizeof_addr ! Size of an object
-                                                ! offset in bytes 
-    INTEGER(SIZE_T), INTENT(OUT) :: sizeof_size ! Size of an object
-                                                ! length in bytes 
-    INTEGER, INTENT(OUT) :: hdferr              ! Error code
-                                                ! 0 on success and -1 on failure
-!*****
-!            INTEGER, EXTERNAL :: h5pget_sizes_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pget_sizes_c(prp_id, sizeof_addr, sizeof_size)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_SIZES_C'::h5pget_sizes_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id 
-         INTEGER(SIZE_T), INTENT(OUT) :: sizeof_addr
-         INTEGER(SIZE_T), INTENT(OUT) :: sizeof_size
-       END FUNCTION h5pget_sizes_c
-    END INTERFACE
-    
-    hdferr = h5pget_sizes_c(prp_id, sizeof_addr, sizeof_size)
-  END SUBROUTINE h5pget_sizes_f
-
-!****s* H5P/h5pset_sym_k_f 
-! NAME
-!  h5pset_sym_k_f 
-!
-! PURPOSE
-!  Sets the size of parameters used to control the 
-!symbol table nodes
-!
-! INPUTS
-!  
-!  prp_id  - file creation property list identifier
-!  ik	   - symbol table tree rank
-!  lk	   - symbol table node size
-! OUTPUTS
-!  
-!  hdferr  - error code		
-!	      Success:  0
-!	      Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999	
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for 
-!  called C functions (it is needed for Windows
-!  port).  March 14, 2001 
-!		
-! Fortran90 Interface:
-  SUBROUTINE h5pset_sym_k_f (prp_id, ik, lk, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
-    INTEGER, INTENT(IN) :: ik            ! Symbol table tree rank 
-    INTEGER, INTENT(IN) :: lk            ! Symbol table node size 
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code
-                                         ! 0 on success and -1 on failure
-!*****
-
-!            INTEGER, EXTERNAL :: h5pset_sym_k_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pset_sym_k_c(prp_id, ik, lk)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_SYM_K_C'::h5pset_sym_k_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id 
-         INTEGER, INTENT(IN) :: ik
-         INTEGER, INTENT(IN) :: lk
-       END FUNCTION h5pset_sym_k_c
-    END INTERFACE
-  
-    hdferr = h5pset_sym_k_c(prp_id, ik, lk)
-  END SUBROUTINE h5pset_sym_k_f
-!****s* H5P/h5pget_sym_k_f 
-! NAME
-!  h5pget_sym_k_f 
-!
-! PURPOSE
-!  Retrieves the size of the symbol table B-tree 1/2 rank
-!  and the symbol table leaf node 1/2 size. 
-!
-! INPUTS
-!  
-!  prp_id	- file creation property list identifier
-! OUTPUTS
-!  
-!  ik		- symbol table tree 1/2 rank
-!  lk		- symbol table node 1/2 size
-!  hdferr       - error code		
-!	           Success:  0
-!	           Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999	
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for 
-!  called C functions (it is needed for Windows
-!  port).  March 14, 2001 
-!		
-! Fortran90 Interface:
-  SUBROUTINE h5pget_sym_k_f(prp_id, ik, lk, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
-    INTEGER, INTENT(OUT) :: ik           ! Symbol table tree rank
-    INTEGER, INTENT(OUT) :: lk           ! Symbol table node size
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code
-                                         ! 0 on success and -1 on failure
-!*****
-
-!            INTEGER, EXTERNAL :: h5pget_sym_k_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pget_sym_k_c(prp_id, ik, lk)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_SYM_K_C'::h5pget_sym_k_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id 
-         INTEGER, INTENT(OUT) :: ik
-         INTEGER, INTENT(OUT) :: lk
-       END FUNCTION h5pget_sym_k_c
-    END INTERFACE
-    
-    hdferr = h5pget_sym_k_c(prp_id, ik, lk)
-  END SUBROUTINE h5pget_sym_k_f
-!****s* H5P/h5pset_istore_k_f 
-! NAME
-!  h5pset_istore_k_f 
-!
-! PURPOSE
-!  Sets the size of the parameter used to control the 
-!  B-trees for indexing chunked datasets
-!
-! INPUTS
-!  
-!  prp_id	- file creation property list identifier
-!  ik		- 1/2 rank of chunked storage B-tree
-! OUTPUTS
-!  
-!  hdferr       - error code		
-!	           Success:  0
-!	           Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999	
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for 
-!  called C functions (it is needed for Windows
-!  port).  March 14, 2001 
-!		
-! Fortran90 Interface:
-  SUBROUTINE h5pset_istore_k_f (prp_id, ik, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
-    INTEGER, INTENT(IN) :: ik            ! 1/2 rank of chunked storage B-tree
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code
-                                         ! 0 on success and -1 on failure
-!*****
-
-!            INTEGER, EXTERNAL :: h5pset_istore_k_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pset_istore_k_c(prp_id, ik)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_ISTORE_K_C'::h5pset_istore_k_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         INTEGER, INTENT(IN) :: ik
-       END FUNCTION h5pset_istore_k_c
-    END INTERFACE
-    
-    hdferr = h5pset_istore_k_c(prp_id, ik)
-  END SUBROUTINE h5pset_istore_k_f
-
-!****s* H5P/h5pget_istore_k_f 
-! NAME
-!  h5pget_istore_k_f 
-!
-! PURPOSE
-!  Queries the 1/2 rank of an indexed storage B-tree. 
-!
-! INPUTS
-!  
-!  prp_id	- file creation property list identifier
-! OUTPUTS
-!  
-!  ik		- 1/2 rank of chunked storage B-tree
-!  hdferr       - error code		
-!	           Success:  0
-!	           Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999	
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for 
-!  called C functions (it is needed for Windows
-!  port).  March 14, 2001 
-!		
-! Fortran90 Interface:
-  SUBROUTINE h5pget_istore_k_f(prp_id, ik, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
-    INTEGER, INTENT(OUT) :: ik           ! 1/2 rank of chunked storage B-tree
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code
-                                         ! 0 on success and -1 on failure
-!*****
-
-!            INTEGER, EXTERNAL :: h5pget_istore_k_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pget_istore_k_c(prp_id, ik)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_ISTORE_K_C'::h5pget_istore_k_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         INTEGER, INTENT(OUT) :: ik
-       END FUNCTION h5pget_istore_k_c
-    END INTERFACE
-    
-    hdferr = h5pget_istore_k_c(prp_id, ik)
-  END SUBROUTINE h5pget_istore_k_f
-
-!****s* H5P/h5pget_driver_f 
-! NAME
-!  h5pget_driver_f 
-!
-! PURPOSE
-!  Returns low-lever driver identifier. 
-!
-! INPUTS
-!  
-!  prp_id  - file access or data transfer property 
-!	     list identifier. 
-! OUTPUTS
-!  
-!  driver  - low-level driver identifier
-!  hdferr  - error code		
-!	      Success:  0
-!	      Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999	
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for 
-!  called C functions (it is needed for Windows
-!  port).  March 14, 2001 
-!		
-! Fortran90 Interface:
-  SUBROUTINE h5pget_driver_f(prp_id, driver, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier 
-    INTEGER(HID_T), INTENT(OUT) :: driver ! Low-level file driver identifier
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code
-                                          ! 0 on success and -1 on failure
-!*****
-!            INTEGER, EXTERNAL :: h5pget_driver_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pget_driver_c(prp_id, driver)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_DRIVER_C'::h5pget_driver_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         INTEGER(HID_T), INTENT(OUT) :: driver
-       END FUNCTION h5pget_driver_c
-    END INTERFACE
-    
-    hdferr = h5pget_driver_c(prp_id, driver)
-  END SUBROUTINE h5pget_driver_f
-
-!****s* H5P/h5pset_fapl_stdio_f 
-! NAME
-!  h5pset_fapl_stdio_f 
-!
-! PURPOSE
-!  Sets the standard I/O driver. 
-!
-! INPUTS
-!  
-!  prp_id  - file access property list identifier
-! OUTPUTS
-!  
-!  hdferr  - error code		
-!	      Success:  0
-!	      Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999	
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for 
-!  called C functions (it is needed for Windows
-!  port).  March 14, 2001 
-!		
-! Fortran90 Interface:
-  SUBROUTINE h5pset_fapl_stdio_f (prp_id, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code
-                                         ! 0 on success and -1 on failure
-!*****
-    
-!            INTEGER, EXTERNAL :: h5pset_fapl_stdio_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pset_fapl_stdio_c(prp_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_FAPL_STDIO_C'::h5pset_fapl_stdio_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-       END FUNCTION h5pset_fapl_stdio_c
-    END INTERFACE
-    
-    hdferr = h5pset_fapl_stdio_c(prp_id)
-  END SUBROUTINE h5pset_fapl_stdio_f
-
-!****s* H5P/h5pget_stdio_f 
-! NAME
-!  h5pget_stdio_f 
-!
-! PURPOSE
-!  NOT AVAILABLE
-!
-! INPUTS
-!  
-! OUTPUTS
-!  
-!  hdferr  - error code		
-!	      Success:  0
-!	      Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999	
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for 
-!  called C functions (it is needed for Windows
-!  port).  March 14, 2001 
-!		
-! SOURCE
-!          SUBROUTINE h5pget_stdio_f (prp_id, io, hdferr)
-!
-!            IMPLICIT NONE
-!            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
-!            INTEGER, INTENT(OUT) :: io   ! value indicates that the file
-                                         !access property list is set to
-                                         !the stdio driver
-!            INTEGER, INTENT(OUT) :: hdferr  ! Error code
-                                     ! 0 on success and -1 on failure
-!*****
-!            INTEGER, EXTERNAL :: h5pget_stdio_c
-!            hdferr = h5pget_stdio_c(prp_id, io)
-!          END SUBROUTINE h5pget_stdio_f
-
-!****s* H5P/h5pset_fapl_sec2_f 
-! NAME
-!  h5pset_fapl_sec2_f 
-!
-! PURPOSE
-!  Sets the sec2 driver. 
-!
-! INPUTS
-!  
-!  prp_id  - file access property list identifier
-! OUTPUTS
-!  
-!  hdferr  - error code		
-!	      Success:  0
-!	      Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999	
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for 
-!  called C functions (it is needed for Windows
-!  port).  March 14, 2001 
-!		
-! Fortran90 Interface:
-  SUBROUTINE h5pset_fapl_sec2_f (prp_id, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code
-                                         ! 0 on success and -1 on failure
-!*****
-
-!            INTEGER, EXTERNAL :: h5pset_fapl_sec2_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pset_fapl_sec2_c(prp_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_FAPL_SEC2_C'::h5pset_fapl_sec2_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
-       END FUNCTION h5pset_fapl_sec2_c
-    END INTERFACE
-  
-    hdferr = h5pset_fapl_sec2_c(prp_id)
-  END SUBROUTINE h5pset_fapl_sec2_f
-
-!****s* H5P/h5pget_sec2_f 
-! NAME
-!   h5pget_sec2_f 
-!
-! PURPOSE
-!  NOT AVAILABLE
-!
-! INPUTS
-!  
-! OUTPUTS
-!  
-!  hdferr  - error code		
-!	      Success:  0
-!	      Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999	
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for 
-!  called C functions (it is needed for Windows
-!  port).  March 14, 2001 
-!		
-! SOURCE!          SUBROUTINE h5pget_sec2_f (prp_id, sec2, hdferr) 
-!            IMPLICIT NONE
-!            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
-!            INTEGER, INTENT(OUT) :: sec2   ! value indicates whether the file
-                                           !driver uses the functions declared
-                                           !in the unistd.h file
-!            INTEGER, INTENT(OUT) :: hdferr  ! Error code
-                                     ! 0 on success and -1 on failure
-!*****
-!            INTEGER, EXTERNAL :: h5pget_sec2_c
-!            hdferr = h5pget_sec2_c(prp_id, sec2)
-!          END SUBROUTINE h5pget_sec2_f
-
-!****s* H5P/h5pset_alignment_f 
-! NAME
-!  h5pset_alignment_f 
-!
-! PURPOSE
-!  Sets alignment properties of a file access property list. 
-!
-! INPUTS
-!  
-!  prp_id	- file access property list identifier
-!  threshold	- threshold value	
-!  alignment	- alignment value
-! OUTPUTS
-!  
-!  hdferr       - error code		
-!	           Success:  0
-!	           Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999	
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for 
-!  called C functions (it is needed for Windows
-!  port).  March 14, 2001 
-!		
-! Fortran90 Interface:
-  SUBROUTINE h5pset_alignment_f(prp_id, threshold,  alignment, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id      ! Property list identifier 
-    INTEGER(HSIZE_T), INTENT(IN) :: threshold ! Threshold value
-    INTEGER(HSIZE_T), INTENT(IN) :: alignment ! alignment value
-    INTEGER, INTENT(OUT) :: hdferr            ! Error code
-                                              ! 0 on success and -1 on failure
-!*****
-
-!            INTEGER, EXTERNAL :: h5pset_alignment_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pset_alignment_c(prp_id, threshold, alignment)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_ALIGNMENT_C'::h5pset_alignment_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         INTEGER(HSIZE_T), INTENT(IN) :: threshold
-         INTEGER(HSIZE_T), INTENT(IN) :: alignment
-       END FUNCTION h5pset_alignment_c
-    END INTERFACE
-  
-    hdferr = h5pset_alignment_c(prp_id, threshold, alignment)
-  END SUBROUTINE h5pset_alignment_f
-
-!****s* H5P/h5pget_alignment_f 
-! NAME
-!   h5pget_alignment_f 
-!
-! PURPOSE
-!  Retrieves the current settings for alignment 
-!  properties from a file access property list. 
-!
-! INPUTS
-!  prp_id       - file access property list identifier
-!
-! OUTPUTS
-!  threshold	- threshold value	
-!  alignment	- alignment value
-!  hdferr       - error code		
-!	           Success:  0
-!	           Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999	
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for 
-!  called C functions (it is needed for Windows
-!  port).  March 14, 2001 
-!		
-! Fortran90 Interface:
-  SUBROUTINE h5pget_alignment_f(prp_id, threshold,  alignment, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id       ! Property list identifier 
-    INTEGER(HSIZE_T), INTENT(OUT) :: threshold ! Threshold value
-    INTEGER(HSIZE_T), INTENT(OUT) :: alignment ! alignment value
-    INTEGER, INTENT(OUT) :: hdferr             ! Error code
-                                             ! 0 on success and -1 on failure
-!*****
-!            INTEGER, EXTERNAL :: h5pget_alignment_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pget_alignment_c(prp_id, threshold, alignment)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_ALIGNMENT_C'::h5pget_alignment_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         INTEGER(HSIZE_T), INTENT(OUT) :: threshold
-         INTEGER(HSIZE_T), INTENT(OUT) :: alignment
-       END FUNCTION h5pget_alignment_c
-    END INTERFACE
-    
-    hdferr = h5pget_alignment_c(prp_id, threshold, alignment)
-  END SUBROUTINE h5pget_alignment_f
-
-!****s* H5P/h5pset_fapl_core_f 
-! NAME
-!   h5pset_fapl_core_f 
-!
-! PURPOSE
-!  Modifies the file access property list to use the 
-!  H5FD_CORE driver. 
-!
-! INPUTS
-!  prp_id	    - file access property list identifier
-!  increment	    - size, in bytes, of memory increments 
-!  backing_store    - boolean flag indicating whether to write 
-!		      the file contents to disk when the file is closed. 
-! OUTPUTS
-!  hdferr           - error code		
-!	                Success:  0
-!	                Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999	
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for 
-!  called C functions (it is needed for Windows
-!  port).  March 14, 2001 
-!		
-! Fortran90 Interface:
-  SUBROUTINE h5pset_fapl_core_f(prp_id, increment, backing_store, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id     ! Property list identifier 
-    INTEGER(SIZE_T), INTENT(IN) :: increment ! File block size in bytes.
-    LOGICAL, INTENT(IN) :: backing_store ! Flag to indicate that
-                                         ! entire file contents are flushed to a file 
-                                         ! with the same name as this core file.
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code
-                                         ! 0 on success and -1 on failure
-!*****
-    INTEGER :: backing_store_flag 
-
-!            INTEGER, EXTERNAL :: h5pset_fapl_core_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pset_fapl_core_c(prp_id, increment, backing_store_flag)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_FAPL_CORE_C'::h5pset_fapl_core_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id 
-         INTEGER(SIZE_T), INTENT(IN) :: increment 
-         INTEGER :: backing_store_flag 
-       END FUNCTION h5pset_fapl_core_c
-    END INTERFACE
-    backing_store_flag = 0
-    IF(backing_store) backing_store_flag = 1
-    hdferr = h5pset_fapl_core_c(prp_id, increment, backing_store_flag)
-  END SUBROUTINE h5pset_fapl_core_f
-
-!****s* H5P/h5pget_fapl_core_f 
-! NAME
-!  h5pget_fapl_core_f 
-!
-! PURPOSE
-!  Queries core file driver properties. 
-!
-! INPUTS
-!  prp_id	 - file access property list identifier
-! OUTPUTS
-!  
-!  increment	 - size, in bytes, of memory increments 
-!  backing_store - boolean flag indicating whether to write 
-!		   the file contents to disk when the file is closed. 
-!  hdferr        - error code		
-!	            Success:  0
-!	            Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999	
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for 
-!  called C functions (it is needed for Windows
-!  port).  March 14, 2001 
-!		
-! Fortran90 Interface:
-  SUBROUTINE h5pget_fapl_core_f(prp_id, increment, backing_store, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id      ! Property list identifier 
-    INTEGER(SIZE_T), INTENT(OUT) :: increment ! File block size in bytes.
-    LOGICAL, INTENT(OUT) :: backing_store   ! Flag to indicate that
-                                            ! entire file contents are flushed to a file 
-                                            ! with the same name as this core file.
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-                                            ! 0 on success and -1 on failure
-!*****
-    INTEGER :: backing_store_flag 
-
-    INTERFACE
-       INTEGER FUNCTION h5pget_fapl_core_c(prp_id, increment, backing_store_flag)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_FAPL_CORE_C'::h5pget_fapl_core_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id 
-         INTEGER(SIZE_T), INTENT(OUT) :: increment 
-         INTEGER :: backing_store_flag 
-       END FUNCTION h5pget_fapl_core_c
-    END INTERFACE
-    
-    hdferr = h5pget_fapl_core_c(prp_id, increment, backing_store_flag)
-    backing_store =.FALSE.
-    IF (backing_store_flag .EQ. 1) backing_store =.TRUE.
-  END SUBROUTINE h5pget_fapl_core_f
-
-!****s* H5P/ h5pset_fapl_family_f 
-! NAME
-!   h5pset_fapl_family_f 
-!
-! PURPOSE
-!  Sets the file access property list to use the family driver. 
-!
-! INPUTS
-!  prp_id	- file access property list identifier
-!  memb_size	- size in bytes of each file member 
-!  memb_plist	- identifier of the file access property 
-!		  list to be used for each family member
-! OUTPUTS
-!  hdferr  - error code		
-!	      Success:  0
-!	      Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999	
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for 
-!  called C functions (it is needed for Windows
-!  port).  March 14, 2001 
-!		
-! Fortran90 Interface:
-  SUBROUTINE h5pset_fapl_family_f(prp_id, memb_size, memb_plist , hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id      ! Property list identifier 
-    INTEGER(HSIZE_T), INTENT(IN) :: memb_size ! Logical size, in bytes,
-                                              ! of each family member
-    INTEGER(HID_T), INTENT(IN) :: memb_plist  ! Identifier of the file 
-                                              ! access property list for 
-                                              ! each member of the family
-    INTEGER, INTENT(OUT) :: hdferr            ! Error code
-                                              ! 0 on success and -1 on failure
-!*****
-
-!            INTEGER, EXTERNAL :: h5pset_fapl_family_f
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pset_fapl_family_c(prp_id, memb_size, memb_plist)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_FAPL_FAMILY_C'::h5pset_fapl_family_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         INTEGER(HSIZE_T), INTENT(IN) :: memb_size
-         INTEGER(HID_T), INTENT(IN) :: memb_plist
-       END FUNCTION h5pset_fapl_family_c
-    END INTERFACE
-
-    hdferr = h5pset_fapl_family_c(prp_id, memb_size, memb_plist)
-  END SUBROUTINE h5pset_fapl_family_f
-
-!****s* H5P/h5pget_fapl_family_f 
-! NAME
-!  h5pget_fapl_family_f 
-!
-! PURPOSE
-!  Returns file access property list information.  	
-!
-! INPUTS
-!  prp_id	- file access property list identifier
-! OUTPUTS
-!  memb_size	- size in bytes of each file member 
-!  memb_plist	- identifier of the file access property 
-!		  list to be used for each family member
-!  hdferr       - error code		
-!	           Success:  0
-!	           Failure: -1   
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999	
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for 
-!  called C functions (it is needed for Windows
-!  port).  March 14, 2001 
-!		
-! Fortran90 Interface:
-  SUBROUTINE h5pget_fapl_family_f(prp_id, memb_size, memb_plist , hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id       ! Property list identifier 
-    INTEGER(HSIZE_T), INTENT(OUT) :: memb_size ! Logical size, in bytes,
-                                               ! of each family member
-    INTEGER(HID_T), INTENT(OUT) :: memb_plist  ! Identifier of the file 
-                                               ! access property list for 
-                                               ! each member of the family
-    INTEGER, INTENT(OUT) :: hdferr             ! Error code
-                                               ! 0 on success and -1 on failure
-!*****
-
-!            INTEGER, EXTERNAL :: h5pget_fapl_family_f
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pget_fapl_family_c(prp_id, memb_size, memb_plist)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_FAPL_FAMILY_C'::h5pget_fapl_family_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         INTEGER(HSIZE_T), INTENT(OUT) :: memb_size
-         INTEGER(HID_T), INTENT(OUT) :: memb_plist
-       END FUNCTION h5pget_fapl_family_c
-    END INTERFACE
-    
-    hdferr = h5pget_fapl_family_c(prp_id, memb_size, memb_plist)
-  END SUBROUTINE h5pget_fapl_family_f
-
-!****s* H5P/h5pset_cache_f 
-! NAME
-!   h5pset_cache_f 
-!
-! PURPOSE
-!  Sets the meta data cache and raw data chunk 
-!  cache parameters
-!
-! INPUTS
-!  
-!  prp_id	- file access property list identifier
-!  mdc_nelmts	- number of elements (objects) in the meta 
-!		  data cache 
-!  rdcc_nelmts	- number of elements (objects) in the raw 
-!		  data chunk cache 
-!  rdcc_nbytes	- total size of the raw data chunk cache, in bytes 
-!  rdcc_w0	- preemption policy (0 or 1)
-! OUTPUTS
-!  
-!  hdferr       - error code		
-!	           Success:  0
-!	           Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999	
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for 
-!  called C functions (it is needed for Windows
-!  port).  March 14, 2001 
-!		
-! Fortran90 Interface:
-  SUBROUTINE h5pset_cache_f(prp_id, mdc_nelmts,rdcc_nelmts, rdcc_nbytes, rdcc_w0, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
-    INTEGER, INTENT(IN) :: mdc_nelmts    ! Number of elements (objects)
-                                         !  in the meta data cache
-    INTEGER(SIZE_T), INTENT(IN) :: rdcc_nelmts ! Number of elements (objects)
-                                               !  in the meta data cache
-    INTEGER(SIZE_T), INTENT(IN) :: rdcc_nbytes ! Total size of the raw data 
-                                               !  chunk cache, in bytes 
-    REAL, INTENT(IN) :: rdcc_w0                ! Preemption policy
-    INTEGER, INTENT(OUT) :: hdferr             ! Error code
-                                               !  0 on success and -1 on failure
-!*****
-
-!            INTEGER, EXTERNAL :: h5pset_cache_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pset_cache_c(prp_id,mdc_nelmts,rdcc_nelmts,rdcc_nbytes,rdcc_w0)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_CACHE_C'::h5pset_cache_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         INTEGER, INTENT(IN) :: mdc_nelmts 
-         INTEGER(SIZE_T), INTENT(IN) :: rdcc_nelmts 
-         INTEGER(SIZE_T), INTENT(IN) :: rdcc_nbytes
-         REAL, INTENT(IN) :: rdcc_w0
-       END FUNCTION h5pset_cache_c
-    END INTERFACE
-
-    hdferr = h5pset_cache_c(prp_id, mdc_nelmts, rdcc_nelmts, rdcc_nbytes, rdcc_w0 )
-  END SUBROUTINE h5pset_cache_f
-
-!****s* H5P/h5pget_cache_f 
-! NAME
-!   h5pget_cache_f 
-!
-! PURPOSE
-!  Queries the meta data cache and raw data chunk cache 
-!  parameters.  
-!
-! INPUTS
-!  prp_id	- file access property list identifier
-!
-! OUTPUTS
-!  mdc_nelmts	- number of elements (objects) in the meta 
-!		  data cache 
-!  rdcc_nelmts	- number of elements (objects) in the raw 
-!		  data chunk cache 
-!  rdcc_nbytes	- total size of the raw data chunk cache, in bytes 
-!  rdcc_w0	- preemption policy (0 or 1)
-!  hdferr       - error code		
-!	           Success:  0
-!	           Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999	
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for 
-!  called C functions (it is needed for Windows
-!  port).  March 14, 2001 
-!
-!  Bug fix: type of the rdcc_nelmts parameter should be INTEGER
-!  instead of INTEGER(SIZE_T) October 10, 2003 
-!		
-! Fortran90 Interface:
-  SUBROUTINE h5pget_cache_f(prp_id, mdc_nelmts, rdcc_nelmts, rdcc_nbytes, rdcc_w0, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
-    INTEGER, INTENT(OUT) :: mdc_nelmts   ! Number of elements (objects)
-                                         !  in the meta data cache
-    INTEGER(SIZE_T), INTENT(OUT) :: rdcc_nelmts  ! Number of elements (objects)
-                                                 !  in the meta data cache
-    INTEGER(SIZE_T), INTENT(OUT) :: rdcc_nbytes  ! Total size of the raw data 
-                                                 !  chunk cache, in bytes 
-    REAL, INTENT(OUT) :: rdcc_w0                 ! Preemption policy
-    INTEGER, INTENT(OUT) :: hdferr               ! Error code
-                                                 ! 0 on success and -1 on failure
-!*****
-!            INTEGER, EXTERNAL :: h5pget_cache_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pget_cache_c(prp_id,mdc_nelmts,rdcc_nelmts,rdcc_nbytes,rdcc_w0)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_CACHE_C'::h5pget_cache_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         INTEGER, INTENT(OUT) :: mdc_nelmts 
-         INTEGER(SIZE_T), INTENT(OUT) :: rdcc_nelmts 
-         INTEGER(SIZE_T), INTENT(OUT) :: rdcc_nbytes
-         REAL, INTENT(OUT) :: rdcc_w0
-       END FUNCTION h5pget_cache_c
-    END INTERFACE
-    
-    hdferr = h5pget_cache_c(prp_id, mdc_nelmts,rdcc_nelmts, rdcc_nbytes, rdcc_w0 )
-  END SUBROUTINE h5pget_cache_f
-
-!****s* H5P/h5pset_fapl_split_f 
-! NAME
-!   h5pset_fapl_split_f 
-!
-! PURPOSE
-!  Emulates the old split file driver. 
-!
-! INPUTS
-!  
-!  prp_id	- file access property list identifier
-!  meta_ext	- name of the extension for the metafile 
-!		  filename
-!  meta_plist	- identifier of the meta file access property 
-!		  list
-!  raw_ext 	- name extension for the raw file filename
-!  raw_plist	- identifier of the raw file access property list
-!
-! OUTPUTS
-!  
-!  hdferr       - error code		
-!	            Success:  0
-!	            Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999	
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for 
-!  called C functions (it is needed for Windows
-!  port).  March 14, 2001 
-!		
-! Fortran90 Interface:
-  SUBROUTINE h5pset_fapl_split_f(prp_id, meta_ext, meta_plist, raw_ext, raw_plist, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id     ! Property list identifier 
-    CHARACTER(LEN=*), INTENT(IN) :: meta_ext ! Name of the extension for
-                                             !  the metafile filename
-    INTEGER(HID_T), INTENT(IN) :: meta_plist ! Identifier of the meta file
-                                             !  access property list
-    CHARACTER(LEN=*), INTENT(IN) :: raw_ext  ! Name extension for the raw file filename
-    INTEGER(HID_T), INTENT(IN) :: raw_plist  ! Identifier of the raw file 
-                                             !  access property list
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-                                             ! 0 on success and -1 on failure
-!*****
-    INTEGER :: meta_len, raw_len
-
-!            INTEGER, EXTERNAL :: h5pset_fapl_split_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pset_fapl_split_c(prp_id,meta_len,meta_ext,meta_plist,raw_len,raw_ext,raw_plist)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_FAPL_SPLIT_C'::h5pset_fapl_split_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: meta_ext
-         !DEC$ATTRIBUTES reference :: raw_ext
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         CHARACTER(LEN=*), INTENT(IN) :: meta_ext 
-         INTEGER(HID_T), INTENT(IN) :: meta_plist
-         CHARACTER(LEN=*), INTENT(IN) :: raw_ext
-         INTEGER(HID_T), INTENT(IN) :: raw_plist 
-         INTEGER :: meta_len, raw_len
-       END FUNCTION h5pset_fapl_split_c
-    END INTERFACE
-
-    meta_len = LEN(meta_ext)
-    raw_len = LEN(raw_ext)
-    hdferr = h5pset_fapl_split_c(prp_id,meta_len,meta_ext,meta_plist,raw_len,raw_ext,raw_plist)
-  END SUBROUTINE h5pset_fapl_split_f
-
-!****s* H5P/h5pget_split_f 
-! NAME
-!   h5pget_split_f 
-!
-! PURPOSE
-!  NOT AVAILABLE
-!
-! INPUTS
-!  
-! OUTPUTS
-!  
-!  hdferr  - error code		
-!	      Success:  0
-!	      Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999	
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for 
-!  called C functions (it is needed for Windows
-!  port).  March 14, 2001 
-!		
-! SOURCE
-!          SUBROUTINE h5pget_split_f(prp_id, meta_ext_size, meta_ext, meta_plist,raw_ext_size,&
-!                                     raw_ext, raw_plist, hdferr)
-!            IMPLICIT NONE
-!            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
-!            INTEGER(SIZE_T), INTENT(IN) :: meta_ext_size ! Number of characters of the meta
-                                                         ! file extension to be copied to the
-                                                         ! meta_ext buffer
-
-!            CHARACTER(LEN=*), INTENT(OUT) :: meta_ext  !Name of the extension for
-                                                      !the metafile filename
-!            INTEGER(HID_T), INTENT(OUT) :: meta_plist  ! Identifier of the meta file
-                                                      ! access property list
-!            INTEGER(SIZE_T), INTENT(IN) :: raw_ext_size ! Number of characters of the raw
-                                                         ! file extension to be copied to the
-                                                         ! raw_ext buffer
-!            CHARACTER(LEN=*), INTENT(OUT) :: raw_ext  !Name extension for the raw file filename
-!            INTEGER(HID_T), INTENT(OUT) :: raw_plist  !Identifier of the raw file
-                                                     !access property list
-!            INTEGER, INTENT(OUT) :: hdferr  ! Error code
-                                     ! 0 on success and -1 on failure
-!*****
-
-!            INTEGER, EXTERNAL :: h5pget_split_c
-!            hdferr = h5pget_split_c(prp_id, meta_ext_size, meta_ext, meta_plist, &
-!                                    raw_ext_size, raw_ext, raw_plist )
-!          END SUBROUTINE h5pget_split_f
-
-!****s* H5P/h5pset_gc_references_f 
-! NAME
-!   h5pset_gc_references_f 
-!
-! PURPOSE
-!  Sets garbage collecting references flag. 
-!
-! INPUTS
-!  
-!  prp_id	- file access property list identifier
-!  gc_reference	- flag for stting garbage collection on 
-!		  and off (1 or 0)
-! OUTPUTS
-!  
-!  hdferr       - error code		
-!	           Success:  0
-!	           Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999	
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for 
-!  called C functions (it is needed for Windows
-!  port).  March 14, 2001 
-!		
-! Fortran90 Interface: 
-  SUBROUTINE h5pset_gc_references_f (prp_id, gc_reference, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
-    INTEGER, INTENT(IN) :: gc_reference  ! The flag for garbage collecting
-                                         !  references for the file
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code
-                                         ! 0 on success and -1 on failure
-!*****
-
-!            INTEGER, EXTERNAL :: h5pset_gc_references_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pset_gc_references_c(prp_id, gc_reference)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_GC_REFERENCES_C'::h5pset_gc_references_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         INTEGER, INTENT(IN) :: gc_reference
-       END FUNCTION h5pset_gc_references_c
-    END INTERFACE
-
-    hdferr = h5pset_gc_references_c(prp_id, gc_reference)
-  END SUBROUTINE h5pset_gc_references_f
-
-!****s* H5P/h5pget_gc_references_f 
-! NAME
-!   h5pget_gc_references_f 
-!
-! PURPOSE
-!  Returns garbage collecting references setting. 	
-!
-! INPUTS
-!  
-!  prp_id	- file access property list identifier
-! OUTPUTS
-!  
-!  gc_reference	- flag for stting garbage collection on 
-!		  and off (1 or 0)
-!  hdferr       - error code		
-!	           Success:  0
-!	           Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999	
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for 
-!  called C functions (it is needed for Windows
-!  port).  March 14, 2001 
-!		
-! Fortran90 Interface:
-  SUBROUTINE h5pget_gc_references_f(prp_id, gc_reference, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
-    INTEGER, INTENT(OUT) :: gc_reference ! The flag for garbage collecting
-                                         !  references for the file
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code
-                                         ! 0 on success and -1 on failure
-!*****
-
-!            INTEGER, EXTERNAL :: h5pget_gc_references_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pget_gc_references_c(prp_id, gc_reference)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_GC_REFERENCES_C'::h5pget_gc_references_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         INTEGER, INTENT(OUT) :: gc_reference
-       END FUNCTION h5pget_gc_references_c
-    END INTERFACE
-    
-    hdferr = h5pget_gc_references_c(prp_id, gc_reference)
-  END SUBROUTINE h5pget_gc_references_f
-
-!****s* H5P/h5pset_layout_f 
-! NAME
-!   h5pset_layout_f 
-!
-! PURPOSE
-!  Sets the type of storage used store the raw data 
-!  for a dataset. 
-!
-! INPUTS
-!  
-!  prp_id	- data creation property list identifier
-!  layout	- type of storage layout for raw data
-!  		  possible values are:
-!  		    H5D_COMPACT_F
-!  		    H5D_CONTIGUOUS_F
-!  		    H5D_CHUNKED_F
-! OUTPUTS
-!  
-!  hdferr      - error code		
-!	          Success:  0
-!	          Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999	
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for 
-!  called C functions (it is needed for Windows
-!  port).  March 14, 2001 
-!  
-! Fortran90 Interface:
-  SUBROUTINE h5pset_layout_f (prp_id, layout, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
-    INTEGER, INTENT(IN) :: layout        ! Type of storage layout for raw data
-                                         ! possible values are:
-                                         !   H5D_COMPACT_F
-                                         !   H5D_CONTIGUOUS_F
-                                         !   H5D_CHUNKED_F
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code
-                                         ! 0 on success and -1 on failure
-!*****
-
-!            INTEGER, EXTERNAL :: h5pset_layout_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pset_layout_c(prp_id, layout)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_LAYOUT_C'::h5pset_layout_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         INTEGER, INTENT(IN) :: layout
-       END FUNCTION h5pset_layout_c
-    END INTERFACE
-    
-    hdferr = h5pset_layout_c(prp_id, layout)
-  END SUBROUTINE h5pset_layout_f
-
-!****s* H5P/h5pget_layout_f 
-! NAME
-!   h5pget_layout_f 
-!
-! PURPOSE
-!  Returns the layout of the raw data for a dataset. 
-!
-! INPUTS
-!  
-!  prp_id	- data creation property list identifier
-! OUTPUTS
-!  
-!  layout	- type of storage layout for raw data
-!  		  possible values are:
-!  		   H5D_COMPACT_F
-!  		   H5D_CONTIGUOUS_F
-!  		   H5D_CHUNKED_F
-!  hdferr       - error code		
-!	           Success:  0
-!	           Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999	
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for 
-!  called C functions (it is needed for Windows
-!  port).  March 14, 2001 
-!  
-! Fortran90 Interface:
-  SUBROUTINE h5pget_layout_f (prp_id, layout, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
-    INTEGER, INTENT(OUT) :: layout       ! Type of storage layout for raw data
-                                         ! possible values are:
-                                         !  H5D_COMPACT_F(0)
-                                         !  H5D_CONTIGUOUS_F(1)
-                                         !  H5D_CHUNKED_F(2)
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code
-                                         ! 0 on success and -1 on failure
-!*****
-
-!            INTEGER, EXTERNAL :: h5pget_layout_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pget_layout_c(prp_id, layout)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_LAYOUT_C'::h5pget_layout_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         INTEGER, INTENT(OUT) :: layout
-       END FUNCTION h5pget_layout_c
-    END INTERFACE
-    
-    hdferr = h5pget_layout_c(prp_id, layout)
-  END SUBROUTINE h5pget_layout_f
-
-!****s* H5P/h5pset_filter_f 
-! NAME
-!  h5pset_filter_f 
-!
-! PURPOSE
-!  Adds a filter to the filter pipeline. 
-!
-! INPUTS
-!  
-!  prp_id	- data creation or transfer property list 
-!  		  identifier
-!  filter	- filter to be added to the pipeline 
-!  flags	- bit vector specifying certain general
-!  		  properties of the filter
-!  cd_nelmts	- number of elements in cd_values
-!  cd_values	- auxiliary data for the filter
-! OUTPUTS
-!  
-!  hdferr       - error code		
-!	           Success:  0
-!	           Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  February, 2003
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pset_filter_f(prp_id, filter, flags, cd_nelmts, cd_values,  hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
-    INTEGER, INTENT(IN) :: filter        ! Filter to be added to the pipeline.
-    INTEGER, INTENT(IN) :: flags         ! Bit vector specifying certain general
-                                       !  properties of the filter.
-    INTEGER(SIZE_T), INTENT(IN) :: cd_nelmts       ! Number of elements in cd_values.
-    INTEGER, DIMENSION(*), INTENT(IN) :: cd_values ! Auxiliary data for the filter.
-    INTEGER, INTENT(OUT) :: hdferr                 ! Error code
-                                                 ! 0 on success and -1 on failure
-!*****
-
-!            INTEGER, EXTERNAL :: h5pset_filter_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pset_filter_c(prp_id, filter, flags, cd_nelmts, cd_values)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_FILTER_C'::h5pset_filter_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id 
-         INTEGER, INTENT(IN) :: filter 
-         INTEGER, INTENT(IN) :: flags 
-         INTEGER(SIZE_T), INTENT(IN) :: cd_nelmts 
-         INTEGER, DIMENSION(*), INTENT(IN) :: cd_values 
-       END FUNCTION h5pset_filter_c
-    END INTERFACE
-  
-    hdferr = h5pset_filter_c(prp_id, filter, flags, cd_nelmts, cd_values )
-  END SUBROUTINE h5pset_filter_f
-
-!****s* H5P/h5pget_nfilters_f 
-! NAME
-!   h5pget_nfilters_f 
-!
-! PURPOSE
-!  Returns the number of filters in the pipeline. 
-!
-! INPUTS
-!  
-!  prp_id	- data creation or transfer property list 
-!  		  identifier
-! OUTPUTS
-!  
-!  nfilters	- number of filters in the pipeline
-!  hdferr       - error code		
-!	           Success:  0
-!	           Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999	
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for 
-!  called C functions (it is needed for Windows
-!  port).  March 14, 2001 
-!  
-! Fortran90 Interface:
-  SUBROUTINE h5pget_nfilters_f (prp_id, nfilters, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
-    INTEGER, INTENT(OUT) :: nfilters     ! The number of filters in the pipeline
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code
-                                         ! 0 on success and -1 on failure
-!*****
-
-!            INTEGER, EXTERNAL :: h5pget_nfilters_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pget_nfilters_c(prp_id, nfilters)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_NFILTERS_C'::h5pget_nfilters_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         INTEGER, INTENT(OUT) :: nfilters
-       END FUNCTION h5pget_nfilters_c
-    END INTERFACE
-    
-    hdferr = h5pget_nfilters_c(prp_id, nfilters)
-  END SUBROUTINE h5pget_nfilters_f
-
-!****s* H5P/h5pget_filter_f 
-! NAME
-!   h5pget_filter_f 
-!
-! PURPOSE
-!  Returns information about a filter in a pipeline
-!
-! INPUTS
-!  
-!  prp_id	 - data creation or transfer property list 
-!  		   identifier
-!  filter_number - sequence number within the filter
-!                  pipeline of the filter for which 
-!                  information is sought
-! OUTPUTS
-!  
-!  filter_id	- filter identification number
-!  flags	- bit vector specifying certain general
-!  		  properties of the filter
-!  cd_nelmts	- number of elements in cd_values
-!  cd_values	- auxiliary data for the filter
-!  namelen	- number of characters in the name buffer
-!  name		- buffer to retrieve filter name
-!  hdferr       - error code		
-!	           Success:  0
-!	           Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999	
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for 
-!  called C functions (it is needed for Windows
-!  port).  March 14, 2001 
-!  
-! Fortran90 Interface:
-  SUBROUTINE h5pget_filter_f(prp_id, filter_number, flags, cd_nelmts, cd_values, namelen, name, filter_id, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
-    INTEGER, INTENT(IN) :: filter_number ! Sequence number within the filter
-                                         !  pipeline of the filter for which 
-                                         !  information is sought
-    INTEGER, DIMENSION(*), INTENT(OUT) :: cd_values  ! Auxiliary data for the filter.
-    INTEGER, INTENT(OUT) :: flags        ! Bit vector specifying certain general
-                                         !  properties of the filter.
-    INTEGER(SIZE_T), INTENT(INOUT) :: cd_nelmts  ! Number of elements in cd_values.
-    INTEGER(SIZE_T), INTENT(IN) :: namelen       ! Anticipated number of characters in name.
-    CHARACTER(LEN=*), INTENT(OUT) :: name        ! Name of the filter
-    INTEGER, INTENT(OUT) :: filter_id            ! Filter identification number  
-    INTEGER, INTENT(OUT) :: hdferr               ! Error code
-                                                 ! 0 on success and -1 on failure
-!*****
-
-
-!            INTEGER, EXTERNAL :: h5pget_filter_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pget_filter_c(prp_id, filter_number, flags, cd_nelmts,  &
-            cd_values, namelen, name, filter_id )
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_FILTER_C'::h5pget_filter_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         INTEGER, INTENT(IN) :: filter_number 
-         INTEGER, DIMENSION(*), INTENT(OUT) :: cd_values
-         INTEGER, INTENT(OUT) :: flags 
-         INTEGER(SIZE_T), INTENT(INOUT) :: cd_nelmts
-         INTEGER(SIZE_T), INTENT(IN) :: namelen
-         CHARACTER(LEN=*), INTENT(OUT) :: name
-         INTEGER, INTENT(OUT) :: filter_id
-       END FUNCTION h5pget_filter_c
-    END INTERFACE
-    
-    hdferr = h5pget_filter_c(prp_id, filter_number, flags, cd_nelmts,  & 
-         cd_values, namelen, name, filter_id )
-  END SUBROUTINE h5pget_filter_f
-
-!****s* H5P/h5pset_external_f 
-! NAME
-!   h5pset_external_f 
-!
-! PURPOSE
-!  Adds an external file to the list of external files. 
-!
-! INPUTS
-!   
-!  prp_id	- dataset creation property list identifier
-!  name		- name of external file
-!  offset	- offset in bytes from the beginning of the 
-!  		  file to the location in the file
-!  		  where the data starts
-!  bytes	- size of the external file data. 
-! OUTPUTS
-!  hdferr       - error code		
-!	           Success:  0
-!	           Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999	
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for 
-!  called C functions (it is needed for Windows
-!  port).  March 14, 2001
-!
-!  Changed type of 'offset' from integer to off_t -- MSB January 9, 2012
-!  
-! Fortran90 Interface:
-  SUBROUTINE h5pset_external_f(prp_id, name, offset, bytes, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name  ! Name of an external file
-    INTEGER(OFF_T), INTENT(IN) :: offset  ! Offset, in bytes, from the beginning 
-                                          !  of the file to the location in the file 
-                                          !  where the data starts.
-    INTEGER(HSIZE_T), INTENT(IN) :: bytes ! Number of bytes reserved in the 
-                                          !  file for the data
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code
-                                          ! 0 on success and -1 on failure
-!*****
-
-    INTEGER :: namelen
-
-    INTERFACE
-       INTEGER FUNCTION h5pset_external_c(prp_id, name,namelen, offset, bytes)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_EXTERNAL_C'::h5pset_external_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER :: namelen
-         INTEGER(OFF_T), INTENT(IN) :: offset
-         INTEGER(HSIZE_T), INTENT(IN) :: bytes
-       END FUNCTION h5pset_external_c
-    END INTERFACE
-  
-    namelen = LEN(name)
-    hdferr = h5pset_external_c(prp_id, name, namelen, offset, bytes)
-  END SUBROUTINE h5pset_external_f
-
-!****s* H5P/h5pget_external_count_f 
-! NAME
-!   h5pget_external_count_f 
-!
-! PURPOSE
-!  Returns the number of external files for a dataset. 
-!
-! INPUTS
-!  
-!  prp_id	- dataset creation property list identifier
-! OUTPUTS
-!  
-!  count	- number of external files for the 
-!  		  specified dataset
-!  hdferr       - error code		
-!	            Success:  0
-!	            Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999	
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for 
-!  called C functions (it is needed for Windows
-!  port).  March 14, 2001 
-!  
-! Fortran90 Interface:
-  SUBROUTINE h5pget_external_count_f (prp_id, count, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
-    INTEGER, INTENT(OUT) :: count        ! Number of external files for the 
-                                         ! Specified dataset
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code
-                                         ! 0 on success and -1 on failure
-!*****
-!            INTEGER, EXTERNAL :: h5pget_external_count_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pget_external_count_c(prp_id, count)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_EXTERNAL_COUNT_C'::h5pget_external_count_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id 
-         INTEGER, INTENT(OUT) :: count
-       END FUNCTION h5pget_external_count_c
-    END INTERFACE
-    
-    hdferr = h5pget_external_count_c(prp_id, count)
-  END SUBROUTINE h5pget_external_count_f
-
-!****s* H5P/h5pget_external_f 
-! NAME
-!  h5pget_external_f 
-!
-! PURPOSE
-!  Returns information about an external file. 
-!
-! INPUTS
-!  
-!  prp_id	- dataset creation property list identifier
-! OUTPUTS
-!  
-!  idx		- external file index 
-!  name_size	- maximum size of name array
-!  name		- name of the external file	
-!  name		- name of external file
-!  offset	- offset in bytes from the beginning of the 
-!  		  file to the location in the file
-!  		  where the data starts
-!  bytes	- size of the external file data
-!  hdferr       - error code		
-!	           Success:  0
-!	            Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999	
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for 
-!  called C functions (it is needed for Windows
-!  port).  March 14, 2001
-!
-! Changed type of 'offset' from integer to off_t -- MSB January 9, 2012
-!  
-! Fortran90 Interface:
-  SUBROUTINE h5pget_external_f(prp_id, idx, name_size, name, offset,bytes, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
-    INTEGER, INTENT(IN) :: idx           ! External file index.
-    INTEGER(SIZE_T), INTENT(IN) :: name_size ! Maximum length of name array 
-    CHARACTER(LEN=*), INTENT(OUT) :: name    ! Name of an external file
-    INTEGER(OFF_T), INTENT(OUT) :: offset    ! Offset, in bytes, from the beginning 
-                                             !  of the file to the location in the file 
-                                             !  where the data starts.
-    INTEGER(HSIZE_T), INTENT(OUT) :: bytes   ! Number of bytes reserved in the 
-                                             !  file for the data
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-                                             ! 0 on success and -1 on failure
-!*****
-
-!            INTEGER, EXTERNAL :: h5pget_external_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pget_external_c(prp_id, idx, name_size, name, offset, bytes)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_EXTERNAL_C'::h5pget_external_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         INTEGER, INTENT(IN) :: idx 
-         INTEGER(SIZE_T), INTENT(IN) :: name_size
-         CHARACTER(LEN=*), INTENT(OUT) :: name
-         INTEGER(OFF_T), INTENT(OUT) :: offset
-         INTEGER(HSIZE_T), INTENT(OUT) :: bytes
-       END FUNCTION h5pget_external_c
-    END INTERFACE
-    
-    hdferr = h5pget_external_c(prp_id, idx, name_size, name, offset, bytes)
-  END SUBROUTINE h5pget_external_f
-
-!****s* H5P/h5pset_btree_ratios_f 
-! NAME
-!   h5pset_btree_ratios_f 
-!
-! PURPOSE
-!  Sets B-tree split ratios for a dataset transfer 
-!  property list. 
-!
-! INPUTS
-!  	
-!  prp_id	- the dataset transfer property list 
-!  		  identifier 
-!  left		- the B-tree split ratio for left-most nodes 
-!  middle	- the B-tree split ratio for all other nodes
-!  right	- the B-tree split ratio for right-most nodes
-! OUTPUTS
-!  hdferr       - error code		
-!	           Success:  0
-!	           Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999	
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for 
-!  called C functions (it is needed for Windows
-!  port).  March 14, 2001 
-!  
-! Fortran90 Interface:
-  SUBROUTINE h5pset_btree_ratios_f(prp_id, left, middle, right, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
-    REAL, INTENT(IN) :: left   ! The B-tree split ratio for left-most nodes.
-    REAL, INTENT(IN) :: middle ! The B-tree split ratio for all other nodes 
-    REAL, INTENT(IN) :: right  ! The B-tree split ratio for right-most 
-                               !  nodes and lone nodes. 
-    INTEGER, INTENT(OUT) :: hdferr  ! Error code
-                                    ! 0 on success and -1 on failure
-!*****
-
-!            INTEGER, EXTERNAL :: h5pset_btree_ratios_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION  h5pset_btree_ratios_c(prp_id, left, middle, right)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_BTREE_RATIOS_C'::h5pset_btree_ratios_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         REAL, INTENT(IN) :: left
-         REAL, INTENT(IN) :: middle
-         REAL, INTENT(IN) :: right
-       END FUNCTION h5pset_btree_ratios_c
-    END INTERFACE
-    
-    hdferr = h5pset_btree_ratios_c(prp_id, left, middle, right)
-  END SUBROUTINE h5pset_btree_ratios_f
-
-!****s* H5P/h5pget_btree_ratios_f
-! NAME
-!  h5pget_btree_ratios_f
-!
-! PURPOSE
-!  Gets B-tree split ratios for a dataset transfer property list
-!
-! INPUTS
-!  
-!  prp_id	- the dataset transfer property list 
-!  		  identifier 
-! OUTPUTS
-!  
-!  left		- the B-tree split ratio for left-most nodes 
-!  middle	- the B-tree split ratio for all other nodes
-!  right	- the B-tree split ratio for right-most nodes
-!  hdferr       - error code		
-!	           Success:  0
-!	           Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999	
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for 
-!  called C functions (it is needed for Windows
-!  port).  March 14, 2001 
-!  
-! Fortran90 Interface:
-  SUBROUTINE h5pget_btree_ratios_f(prp_id, left, middle, right, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
-    REAL, INTENT(OUT) :: left   ! The B-tree split ratio for left-most nodes.
-    REAL, INTENT(OUT) :: middle ! The B-tree split ratio for all other nodes 
-    REAL, INTENT(OUT) :: right  ! The B-tree split ratio for right-most 
-                                !  nodes and lone nodes.
-    INTEGER, INTENT(OUT) :: hdferr  ! Error code
-                                    ! 0 on success and -1 on failure
-!*****
-
-
-!            INTEGER, EXTERNAL :: h5pget_btree_ratios_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION  h5pget_btree_ratios_c(prp_id, left, middle, right)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_BTREE_RATIOS_C'::h5pget_btree_ratios_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         REAL, INTENT(OUT) :: left
-         REAL, INTENT(OUT) :: middle
-         REAL, INTENT(OUT) :: right
-       END FUNCTION h5pget_btree_ratios_c
-    END INTERFACE
-  
-    hdferr = h5pget_btree_ratios_c(prp_id, left, middle, right)
-  END SUBROUTINE h5pget_btree_ratios_f
-
-!****s* H5P/h5pget_fclose_degree_f 
-! NAME
-!  h5pget_fclose_degree_f 
-!
-! PURPOSE
-!  Returns the degree for the file close behavior.
-!
-! INPUTS
-!  
-!  fapl_id	- File access property list identifier
-! OUTPUTS
-!  
-!  degree  	- Possible values are:
-!  		   H5F_CLOSE_DEFAULT_F
-!  		   H5F_CLOSE_WEAK_F
-!  		   H5F_CLOSE_SEMI_F
-!  		   H5F_CLOSE_STRONG_F
-!  hdferr       - error code		
-!	           Success:  0
-!	           Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  September 26, 2002	
-!
-! HISTORY
-! 
-!  
-! Fortran90 Interface:
-  SUBROUTINE h5pget_fclose_degree_f(fapl_id, degree, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: fapl_id ! File Access Property list identifier 
-    INTEGER, INTENT(OUT) :: degree        ! Possible values are: 
-                                          !  H5F_CLOSE_DEFAULT_F
-					  !  H5F_CLOSE_WEAK_F
-					  !  H5F_CLOSE_SEMI_F
-					  !  H5F_CLOSE_STRONG_F
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code
-                                          ! 0 on success and -1 on failure
-!*****
-
-!            INTEGER, EXTERNAL :: h5pget_fclose_degree_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pget_fclose_degree_c(fapl_id, degree)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_FCLOSE_DEGREE_C'::h5pget_fclose_degree_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: fapl_id
-         INTEGER, INTENT(OUT) :: degree
-       END FUNCTION h5pget_fclose_degree_c
-    END INTERFACE
-    
-    hdferr = h5pget_fclose_degree_c(fapl_id, degree) 
-  END SUBROUTINE h5pget_fclose_degree_f
-
-!****s* H5P/h5pset_fclose_degree_f 
-! NAME
-!  h5pset_fclose_degree_f 
-!
-! PURPOSE
-!  Sets the degree for the file close behavior.
-!
-! INPUTS
-!  
-!  fapl_id	- file access property list identifier
-!  degree  	- Possible values are:
-!  		    H5F_CLOSE_DEFAULT_F
-!  		    H5F_CLOSE_WEAK_F
-!  		    H5F_CLOSE_SEMI_F
-!  		    H5F_CLOSE_STRONG_F
-! OUTPUTS
-!  hdferr       - error code		
-!	           Success:  0
-!	           Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  September 26, 2002	
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pset_fclose_degree_f(fapl_id, degree, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: fapl_id ! File Access Property list identifier 
-    INTEGER, INTENT(IN) :: degree         ! Possible values are: 
-                                          !  H5F_CLOSE_DEFAULT_F
-					  !  H5F_CLOSE_WEAK_F
-					  !  H5F_CLOSE_SEMI_F
-					  !  H5F_CLOSE_STRONG_F
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code
-                                          ! 0 on success and -1 on failure
-!*****
-
-    INTERFACE
-       INTEGER FUNCTION h5pset_fclose_degree_c(fapl_id, degree)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_FCLOSE_DEGREE_C'::h5pset_fclose_degree_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: fapl_id
-         INTEGER, INTENT(IN) :: degree
-       END FUNCTION h5pset_fclose_degree_c
-    END INTERFACE
-
-    hdferr = h5pset_fclose_degree_c(fapl_id, degree) 
-  END SUBROUTINE h5pset_fclose_degree_f
-
-!****s* H5P/h5pequal_f 
-! NAME
-!  h5pequal_f 
-!
-! PURPOSE
-!  Checks if two property lists are eqaul
-!
-! INPUTS
-!  
-!  plist1_id	- property list identifier
-!  plist2_id	- property list identifier
-! OUTPUTS
-!  
-!  flag		- flag, possible values
-!  		    .TRUE. or .FALSE.
-!  hdferr:	- error code		
-!  		   Success:  0
-!  		   Failure: -1, flag is set to .FALSE.   
-!
-! AUTHOR
-!  Elena Pourmal
-!  September 30, 2002	
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pequal_f(plist1_id, plist2_id, flag, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: plist1_id ! Property list identifier 
-    INTEGER(HID_T), INTENT(IN) :: plist2_id ! Property list identifier 
-    LOGICAL, INTENT(OUT)       :: flag      ! Flag
-    INTEGER, INTENT(OUT)       :: hdferr    ! Error code
-                                            !  0 on success and -1 on failure
-!*****
-    INTEGER                    :: c_flag
-    
-    INTERFACE
-       INTEGER FUNCTION h5pequal_c(plist1_id, plist2_id, c_flag)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PEQUAL_C'::h5pequal_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: plist1_id
-         INTEGER(HID_T), INTENT(IN) :: plist2_id
-         INTEGER, INTENT(OUT) :: c_flag
-       END FUNCTION h5pequal_c
-    END INTERFACE
-
-    flag = .FALSE.
-    hdferr = h5pequal_c(plist1_id, plist2_id, c_flag) 
-    IF (c_flag .GT. 0) flag = .TRUE.
-  END SUBROUTINE h5pequal_f
-
-!****s* H5P/h5pset_buffer_f
-! NAME
-!  h5pset_buffer_f 
-!
-! PURPOSE
-!  Sets sixe for conversion buffer
-!
-! INPUTS
-!  plist_id	- data transfer property list identifier
-!  size		- buffer size 
-! OUTPUTS
-!  
-!  hdferr:	- error code		
-!  		   Success:  0
-!  		   Failure: -1
-!
-! AUTHOR
-!  Elena Pourmal
-!  October 2, 2002	
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pset_buffer_f(plist_id, size, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: plist_id ! Data transfer property list identifier 
-    INTEGER(HSIZE_T), INTENT(IN) :: size   ! Buffer size in bytes; 
-                                           ! buffer is allocated and freed by 
-                                           ! the library.
-    INTEGER, INTENT(OUT)       :: hdferr   ! Error code
-                                           ! 0 on success and -1 on failure
-!*****
-
-    INTERFACE
-       INTEGER FUNCTION h5pset_buffer_c(plist_id, size)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_BUFFER_C'::h5pset_buffer_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: plist_id
-         INTEGER(HSIZE_T), INTENT(IN) :: size
-       END FUNCTION h5pset_buffer_c
-    END INTERFACE
-
-    hdferr = h5pset_buffer_c(plist_id, size) 
-  END SUBROUTINE h5pset_buffer_f
-
-!****s* H5P/h5pget_buffer_f
-! NAME
-!  h5pget_buffer_f 
-!
-! PURPOSE
-!  Gets size for conversion buffer
-!
-! INPUTS
-!  
-!  plist_id	- data transfer property list identifier
-! OUTPUTS
-!  
-!  size		- buffer size 
-!  hdferr	- error code		
-!  		   Success:  0
-!  		   Failure: -1
-!
-! AUTHOR
-!  Elena Pourmal
-!  October 2, 2002	
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pget_buffer_f(plist_id, size, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: plist_id ! Data transfer property list identifier 
-    INTEGER(HSIZE_T), INTENT(OUT) :: size  ! Buffer size in bytes; 
-                                           !  buffer is allocated and freed by 
-                                           !  the library.
-    INTEGER, INTENT(OUT)       :: hdferr   ! Error code
-                                           ! 0 on success and -1 on failure
-!*****
-
-    INTERFACE
-       INTEGER FUNCTION h5pget_buffer_c(plist_id, size)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_BUFFER_C'::h5pget_buffer_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: plist_id
-         INTEGER(HSIZE_T), INTENT(OUT) :: size
-       END FUNCTION h5pget_buffer_c
-    END INTERFACE
-
-    hdferr = h5pget_buffer_c(plist_id, size) 
-  END SUBROUTINE h5pget_buffer_f
-
-!****s* H5P/h5pfill_value_defined_f
-! NAME
-!  h5pfill_value_defined_f
-!
-! PURPOSE
-!  Check if fill value is defined.
-!
-! INPUTS
-!  
-!  plist_id	- dataset creation property list identifier
-! OUTPUTS
-!  
-!  flag         - fill value status flag
-!                 Possible values are:
-!  		    H5D_FILL_VALUE_ERROR_F
-!  		    H5D_FILL_VALUE_UNDEFINED_F
-!  		    H5D_FILL_VALUE_DEFAULT_F
-!  		    H5D_FILL_VALUE_USER_DEFINED_F
-!  hdferr	- error code		
-!  		    Success:  0
-!  		    Failure: -1
-!
-! AUTHOR
-!  Elena Pourmal
-!  October 4, 2002
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pfill_value_defined_f(plist_id, flag, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: plist_id  ! Dataset creation property list identifier
-    INTEGER, INTENT(OUT) :: flag            ! Fill value status flag
-                                            !  H5D_FILL_VALUE_ERROR_F
-                                            !  H5D_FILL_VALUE_UNDEFINED_F
-                                            !  H5D_FILL_VALUE_DEFAULT_F
-                                            !  H5D_FILL_VALUE_USER_DEFINED_F
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-                                            ! 0 on success and -1 on failure
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5pfill_value_defined_c(plist_id, flag)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PFILL_VALUE_DEFINED_C'::h5pfill_value_defined_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: plist_id
-         INTEGER, INTENT(OUT) :: flag
-       END FUNCTION h5pfill_value_defined_c
-    END INTERFACE
-
-    hdferr = h5pfill_value_defined_c(plist_id, flag) 
-  END SUBROUTINE h5pfill_value_defined_f
-
-!****s* H5P/h5pset_alloc_time_f
-! NAME
-!  h5pset_alloc_time_f
-!
-! PURPOSE
-!  Set space allocation time for dataset during creation.
-!
-! INPUTS
-!  
-!  plist_id	- dataset creation property list identifier
-!  flag         - allocation time flag:
-!  		    H5D_ALLOC_TIME_ERROR_F
-!  		    H5D_ALLOC_TIME_DEFAULT_F
-!  		    H5D_ALLOC_TIME_EARLY_F
-!  		    H5D_ALLOC_TIME_LATE_F
-!  		    H5D_ALLOC_TIME_INCR_F
-! OUTPUTS
-!  
-!  hdferr	- error code		
-!  		   Success:  0
-!  		   Failure: -1
-!
-! AUTHOR
-!  Elena Pourmal
-!  October 4, 2002	
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pset_alloc_time_f(plist_id, flag, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: plist_id  ! Dataset creation property list identifier
-    INTEGER, INTENT(IN) :: flag             ! Allocation time flag:
-                                            !  H5D_ALLOC_TIME_ERROR_F
-                                            !  H5D_ALLOC_TIME_DEFAULT_F
-                                            !  H5D_ALLOC_TIME_EARLY_F
-                                            !  H5D_ALLOC_TIME_LATE_F
-                                            !  H5D_ALLOC_TIME_INCR_F
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-                                            ! 0 on success and -1 on failure
-!*****  
-    
-    INTERFACE
-       INTEGER FUNCTION h5pset_alloc_time_c(plist_id, flag)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_ALLOC_TIME_C'::h5pset_alloc_time_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: plist_id
-         INTEGER, INTENT(IN) :: flag
-       END FUNCTION h5pset_alloc_time_c
-    END INTERFACE
-    
-    hdferr = h5pset_alloc_time_c(plist_id, flag) 
-  END SUBROUTINE h5pset_alloc_time_f
-
-!****s* H5P/h5pget_alloc_time_f
-! NAME
-!  h5pget_alloc_time_f
-!
-! PURPOSE
-!  Get space allocation time for dataset during creation.
-!
-! INPUTS
-!  
-!  plist_id	- dataset creation property list identifier
-! OUTPUTS
-!  
-!  flag         - allocation time flag:
-!  		    H5D_ALLOC_TIME_ERROR_F
-!  		    H5D_ALLOC_TIME_DEFAULT_F
-!  		    H5D_ALLOC_TIME_EARLY_F
-!  		    H5D_ALLOC_TIME_LATE_F
-!  		    H5D_ALLOC_TIME_INCR_F
-!  hdferr:	- error code		
-!  		    Success:  0
-!  		    Failure: -1
-!
-! AUTHOR
-!  Elena Pourmal
-!  October 4, 2002	
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pget_alloc_time_f(plist_id, flag, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: plist_id  ! Dataset creation property list identifier
-    INTEGER, INTENT(OUT) :: flag   ! Allocation time flag:
-                                   !  H5D_ALLOC_TIME_ERROR_F
-                                   !  H5D_ALLOC_TIME_DEFAULT_F
-                                   !  H5D_ALLOC_TIME_EARLY_F
-                                   !  H5D_ALLOC_TIME_LATE_F
-                                   !  H5D_ALLOC_TIME_INCR_F
-    INTEGER, INTENT(OUT) :: hdferr ! Error code
-                                   ! 0 on success and -1 on failure
-!*****
-
-    INTERFACE
-       INTEGER FUNCTION h5pget_alloc_time_c(plist_id, flag)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_ALLOC_TIME_C'::h5pget_alloc_time_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: plist_id
-         INTEGER, INTENT(OUT) :: flag
-       END FUNCTION h5pget_alloc_time_c
-    END INTERFACE
-    
-    hdferr = h5pget_alloc_time_c(plist_id, flag) 
-  END SUBROUTINE h5pget_alloc_time_f
-
-!****s* H5P/h5pset_fill_time_f
-! NAME
-!  h5pset_fill_time_f
-!
-! PURPOSE
-!  Set fill value writing time for dataset
-!
-! INPUTS
-!  
-!  plist_id	- dataset creation property list identifier
-!  flag         - fill time flag:
-!  		    H5D_FILL_TIME_ERROR_F
-!  		    H5D_FILL_TIME_ALLOC_F
-!  		    H5D_FILL_TIME_NEVER_F
-! OUTPUTS
-!  
-!  hdferr	- error code		
-!  		   Success:  0
-!  		   Failure: -1
-!
-! AUTHOR
-!  Elena Pourmal
-!  October 4, 2002	
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pset_fill_time_f(plist_id, flag, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: plist_id  ! Dataset creation property list identifier
-    INTEGER, INTENT(IN) :: flag             ! Fill time flag:
-                                            !  H5D_FILL_TIME_ERROR_F
-                                            !  H5D_FILL_TIME_ALLOC_F
-                                            !  H5D_FILL_TIME_NEVER_F
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-                                            ! 0 on success and -1 on failure
-!*****  
-
-    INTERFACE
-       INTEGER FUNCTION h5pset_fill_time_c(plist_id, flag)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_FILL_TIME_C'::h5pset_fill_time_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: plist_id
-         INTEGER, INTENT(IN) :: flag
-       END FUNCTION h5pset_fill_time_c
-    END INTERFACE
-    
-    hdferr = h5pset_fill_time_c(plist_id, flag) 
-  END SUBROUTINE h5pset_fill_time_f
-
-!****s* H5P/h5pget_fill_time_f
-! NAME
-!   h5pget_fill_time_f
-!
-! PURPOSE
-!  Get fill value writing time for dataset
-!
-! INPUTS
-!  
-!  plist_id	- dataset creation property list identifier
-! OUTPUTS
-!  
-!  hdferr:	- error code		
-!  		   Success:  0
-!  		   Failure: -1
-! OPTIONAL PARAMETERS
-!
-!  flag         - fill time flag:
-!  		   H5D_FILL_TIME_ERROR_F
-!  		   H5D_FILL_TIME_ALLOC_F
-!  		   H5D_FILL_TIME_NEVER_F
-! AUTHOR
-!  Elena Pourmal
-!  October 4, 2002	
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pget_fill_time_f(plist_id, flag, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: plist_id  ! Dataset creation property list identifier
-    INTEGER, INTENT(OUT) :: flag   ! Fill time flag:
-                                   !  H5D_FILL_TIME_ERROR_F
-                                   !  H5D_FILL_TIME_ALLOC_F
-                                   !  H5D_FILL_TIME_NEVER_F
-    INTEGER, INTENT(OUT) :: hdferr ! Error code
-                                   ! 0 on success and -1 on failure
-!*****   
-  
-    INTERFACE
-       INTEGER FUNCTION h5pget_fill_time_c(plist_id, flag)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_FILL_TIME_C'::h5pget_fill_time_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: plist_id
-         INTEGER, INTENT(OUT) :: flag
-       END FUNCTION h5pget_fill_time_c
-    END INTERFACE
-    
-    hdferr = h5pget_fill_time_c(plist_id, flag) 
-  END SUBROUTINE h5pget_fill_time_f
-
-!****s* H5P/ h5pset_meta_block_size_f 
-! NAME
-!  h5pset_meta_block_size_f 
-!
-! PURPOSE
-!  Sets the minimum size of metadata block allocations 
-!
-! INPUTS
-!  
-!  plist_id	- file access property list identifier
-!  size		- metatdata block size
-! OUTPUTS
-!  
-!  hdferr	- error code		
-!  		   Success:  0
-!  		   Failure: -1
-!
-! AUTHOR
-!  Elena Pourmal
-!  October 7, 2002	
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pset_meta_block_size_f(plist_id, size, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: plist_id  ! File access property list identifier 
-    INTEGER(HSIZE_T), INTENT(IN) :: size    ! Block size in bytes; 
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-                                            ! 0 on success and -1 on failure
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5pset_meta_block_size_c(plist_id, size)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_META_BLOCK_SIZE_C'::h5pset_meta_block_size_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: plist_id
-         INTEGER(HSIZE_T), INTENT(IN) :: size
-       END FUNCTION h5pset_meta_block_size_c
-    END INTERFACE
-    
-    hdferr = h5pset_meta_block_size_c(plist_id, size) 
-  END SUBROUTINE h5pset_meta_block_size_f
-
-!****s* H5P/h5pget_meta_block_size_f 
-! NAME
-!  h5pget_meta_block_size_f 
-!
-! PURPOSE
-!  Gets the minimum size of metadata block allocations 
-!
-! INPUTS
-!  
-!  plist_id	- file access property list identifier
-! OUTPUTS
-!  
-!  size		- metatdata block size
-!  hdferr	- error code		
-!  		   Success:  0
-!  		   Failure: -1
-!
-! AUTHOR
-!  Elena Pourmal
-!  October 7, 2002	
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pget_meta_block_size_f(plist_id, size, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: plist_id  ! File access property list identifier 
-    INTEGER(HSIZE_T), INTENT(OUT) :: size   ! Block size in bytes; 
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-                                            ! 0 on success and -1 on failure
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5pget_meta_block_size_c(plist_id, size)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_META_BLOCK_SIZE_C'::h5pget_meta_block_size_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: plist_id
-         INTEGER(HSIZE_T), INTENT(OUT) :: size
-       END FUNCTION h5pget_meta_block_size_c
-    END INTERFACE
-    
-    hdferr = h5pget_meta_block_size_c(plist_id, size) 
-  END SUBROUTINE h5pget_meta_block_size_f
-
-!****s* H5P/h5pset_sieve_buf_size_f 
-! NAME
-!  h5pset_sieve_buf_size_f 
-!
-! PURPOSE
-!  Sets the maximum size of the data sieve buffer
-!
-! INPUTS
-!  
-!  plist_id	- file access property list identifier
-!  size		- sieve buffer size
-! OUTPUTS
-!  
-!  hdferr	- error code		
-!  		   Success:  0
-!  		   Failure: -1
-!
-! AUTHOR
-!  Elena Pourmal
-!  October 7, 2002	
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pset_sieve_buf_size_f(plist_id, size, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: plist_id ! File access property list identifier 
-    INTEGER(SIZE_T), INTENT(IN) :: size    ! Buffer size in bytes; 
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-                                           ! 0 on success and -1 on failure
-!*****
-
-    INTERFACE
-       INTEGER FUNCTION h5pset_sieve_buf_size_c(plist_id, size)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_SIEVE_BUF_SIZE_C'::h5pset_sieve_buf_size_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: plist_id
-         INTEGER(SIZE_T), INTENT(IN) :: size
-       END FUNCTION h5pset_sieve_buf_size_c
-    END INTERFACE
-    
-    hdferr = h5pset_sieve_buf_size_c(plist_id, size) 
-  END SUBROUTINE h5pset_sieve_buf_size_f
-
-!****s* H5P/h5pget_sieve_buf_size_f
-! NAME
-!  h5pget_sieve_buf_size_f 
-!
-! PURPOSE
-!  Gets the maximum size of the data sieve buffer
-!
-! INPUTS
-!  
-!  plist_id	- file access property list identifier
-! OUTPUTS
-!  
-!  size		- sieve buffer size
-!  hdferr	- error code		
-!  		   Success:  0
-!  		   Failure: -1
-!
-! AUTHOR
-!  Elena Pourmal
-!  October 7, 2002	
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pget_sieve_buf_size_f(plist_id, size, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: plist_id ! File access property list identifier 
-    INTEGER(SIZE_T), INTENT(OUT) :: size   ! Buffer size in bytes 
-    INTEGER, INTENT(OUT)       :: hdferr   ! Error code
-                                           ! 0 on success and -1 on failure
-!*****
-
-    INTERFACE
-       INTEGER FUNCTION h5pget_sieve_buf_size_c(plist_id, size)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_SIEVE_BUF_SIZE_C'::h5pget_sieve_buf_size_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: plist_id
-         INTEGER(SIZE_T), INTENT(OUT) :: size
-       END FUNCTION h5pget_sieve_buf_size_c
-    END INTERFACE
-    
-    hdferr = h5pget_sieve_buf_size_c(plist_id, size) 
-  END SUBROUTINE h5pget_sieve_buf_size_f
-
-!****s* H5P/h5pset_small_data_block_size_f 
-! NAME
-!  h5pset_small_data_block_size_f 
-!
-! PURPOSE
-!  Sets the minimum size of "small" raw data block
-!
-! INPUTS
-!  
-!  plist_id	- file access property list identifier
-!  size		- small raw data block size
-! OUTPUTS
-!  
-!  hdferr	- error code		
-!  		   Success:  0
-!  		   Failure: -1
-!
-! AUTHOR
-!  Elena Pourmal
-!  October 7, 2002	
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pset_small_data_block_size_f(plist_id, size, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: plist_id ! File access property list identifier 
-    INTEGER(HSIZE_T), INTENT(IN) :: size   ! Small raw data block size
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-                                           ! 0 on success and -1 on failure
-!*****
-
-    INTERFACE
-       INTEGER FUNCTION h5pset_small_data_block_size_c(plist_id, size)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_SMALL_DATA_BLOCK_SIZE_C'::h5pset_small_data_block_size_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: plist_id
-         INTEGER(HSIZE_T), INTENT(IN) :: size
-       END FUNCTION h5pset_small_data_block_size_c
-    END INTERFACE
-
-    hdferr = h5pset_small_data_block_size_c(plist_id, size) 
-  END SUBROUTINE h5pset_small_data_block_size_f
-
-!****s* H5P/h5pget_small_data_block_size_f 
-! NAME
-!  h5pget_small_data_block_size_f 
-!
-! PURPOSE
-!  Gets the minimum size of "small" raw data block
-!
-! INPUTS
-!  
-!  plist_id	- file access property list identifier
-! OUTPUTS
-!  
-!  size		- small raw data block size
-!  hdferr	- error code		
-!  		   Success:  0
-!  		   Failure: -1
-!
-! AUTHOR
-!  Elena Pourmal
-!  October 7, 2002	
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pget_small_data_block_size_f(plist_id, size, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: plist_id  ! File access property list identifier 
-    INTEGER(HSIZE_T), INTENT(OUT) :: size   ! Small raw data block size
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-                                            ! 0 on success and -1 on failure
-!*****
-
-    INTERFACE
-       INTEGER FUNCTION h5pget_small_data_block_size_c(plist_id, size)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_SMALL_DATA_BLOCK_SIZE_C'::h5pget_small_data_block_size_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: plist_id
-         INTEGER(HSIZE_T), INTENT(OUT) :: size
-       END FUNCTION h5pget_small_data_block_size_c
-    END INTERFACE
-    
-    hdferr = h5pget_small_data_block_size_c(plist_id, size) 
-  END SUBROUTINE h5pget_small_data_block_size_f
-
-!****s* H5P/h5pset_hyper_vector_size_f 
-! NAME
-!  h5pset_hyper_vector_size_f 
-!
-! PURPOSE
-!  Set the number of "I/O" vectors (vector size)
-!
-! INPUTS
-!  
-!  plist_id	- dataset transfer property list identifier
-!  size		- vector size
-! OUTPUTS
-!  
-!  hdferr	- error code		
-!  		   Success:  0
-!  		   Failure: -1
-!
-! AUTHOR
-!  Elena Pourmal
-!  October 7, 2002	
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pset_hyper_vector_size_f(plist_id, size, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: plist_id ! Dataset transfer property list identifier 
-    INTEGER(SIZE_T), INTENT(IN) :: size    ! Vector size
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-                                           ! 0 on success and -1 on failure
-!*****
-
-    INTERFACE
-       INTEGER FUNCTION h5pset_hyper_vector_size_c(plist_id, size)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_HYPER_VECTOR_SIZE_C'::h5pset_hyper_vector_size_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: plist_id
-         INTEGER(SIZE_T), INTENT(IN) :: size
-       END FUNCTION h5pset_hyper_vector_size_c
-    END INTERFACE
-    
-    hdferr = h5pset_hyper_vector_size_c(plist_id, size) 
-  END SUBROUTINE h5pset_hyper_vector_size_f
-
-!****s* H5P/ h5pget_hyper_vector_size_f 
-! NAME
-!  h5pget_hyper_vector_size_f 
-!
-! PURPOSE
-!  Get the number of "I/O" vectors (vector size)
-!
-! INPUTS
-!  
-!  plist_id	- dataset transfer property list identifier
-! OUTPUTS
-!  
-!  size		- vector size
-!  hdferr	- error code		
-!  		   Success:  0
-!  		   Failure: -1
-!
-! AUTHOR
-!  Elena Pourmal
-!  October 7, 2002	
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pget_hyper_vector_size_f(plist_id, size, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: plist_id ! Dataset transfer property list identifier 
-    INTEGER(SIZE_T), INTENT(OUT) :: size   ! Vector size
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-                                           ! 0 on success and -1 on failure
-!*****
-
-    INTERFACE
-       INTEGER FUNCTION h5pget_hyper_vector_size_c(plist_id, size)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_HYPER_VECTOR_SIZE_C'::h5pget_hyper_vector_size_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: plist_id
-         INTEGER(SIZE_T), INTENT(OUT) :: size
-       END FUNCTION h5pget_hyper_vector_size_c
-    END INTERFACE
-
-    hdferr = h5pget_hyper_vector_size_c(plist_id, size) 
-  END SUBROUTINE h5pget_hyper_vector_size_f
-
-!****s* H5P/h5pexist_f 
-! NAME
-!   h5pexist_f 
-!
-! PURPOSE
-!  Queries whether a property name exists in a property list or class. 
-!
-! INPUTS
-!  
-!  prp_id	- property list identifier to query
-!  name 	- name of property to check for
-! OUTPUTS
-!  
-!  flag         - logical flag
-!  hdferr       - error code		
-!	           Success:  0
-!	           Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  October 9, 2002	
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pexist_f(prp_id, name, flag, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier 
-    CHARACTER(LEN=*), INTENT(IN) :: name  ! Name of property to modify
-    LOGICAL, INTENT(OUT) :: flag          ! .TRUE. if exists, .FALSE. otherwise
-    INTEGER, INTENT(OUT) :: hdferr  ! Error code
-                                    ! 0 on success and -1 on failure
-!*****
-    INTEGER :: name_len
-    
-    INTERFACE
-       INTEGER FUNCTION h5pexist_c(prp_id, name, name_len)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PEXIST_C'::h5pexist_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER, INTENT(IN)         :: name_len
-       END FUNCTION h5pexist_c
-    END INTERFACE
-    flag = .FALSE.
-    name_len = LEN(name)
-    hdferr = h5pexist_c(prp_id, name , name_len)
-    IF (hdferr > 0) THEN
-       flag = .TRUE.
-       hdferr = 0
-    ENDIF
-  END SUBROUTINE h5pexist_f
-
-!****s* H5P/h5pget_size_f 
-!
-! NAME
-!  h5pget_size_f 
-!
-! PURPOSE
-!  Queries the size of a property value in bytes.
-!
-! INPUTS
-!  
-!  prp_id	- property list identifier to query
-!  name 	- name of property to query
-! OUTPUTS
-!  
-!  size         - size of property in bytes
-!  hdferr       - error code		
-!	           Success:  0
-!	           Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  October 9, 2002	
-!
-! HISTORY
-! 	
-!  
-! Fortran90 Interface:
-  SUBROUTINE h5pget_size_f(prp_id, name, size, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier 
-    CHARACTER(LEN=*), INTENT(IN) :: name  ! Name of property to query
-    INTEGER(SIZE_T), INTENT(OUT) :: size  ! Size in bytes
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code
-                                          ! 0 on success and -1 on failure
-!*****
-    INTEGER :: name_len
-    
-    INTERFACE
-       INTEGER FUNCTION h5pget_size_c(prp_id, name, name_len, size)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_SIZE_C'::h5pget_size_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER, INTENT(IN)         :: name_len
-         INTEGER(SIZE_T), INTENT(OUT) :: size
-       END FUNCTION h5pget_size_c
-    END INTERFACE
-    name_len = LEN(name)
-    hdferr = h5pget_size_c(prp_id, name , name_len, size)
-  END SUBROUTINE h5pget_size_f
-
-!****s* H5P/h5pget_npros_f 
-! NAME
-!   h5pget_npros_f 
-!
-! PURPOSE
-!  Queries number of properties in property list or class
-!
-! INPUTS
-!  
-!  prp_id	- iproperty list identifier to query
-! OUTPUTS
-!  
-!  nprops       - number of properties in property object
-!  hdferr       - error code		
-!	           Success:  0
-!	           Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  October 9, 2002	
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pget_nprops_f(prp_id, nprops, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id    ! Property list identifier 
-    INTEGER(SIZE_T), INTENT(OUT) :: nprops  ! Number of properties
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-                                            ! 0 on success and -1 on failure
-!*****
-
-    INTERFACE
-       INTEGER FUNCTION h5pget_nprops_c(prp_id, nprops)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_NPROPS_C'::h5pget_nprops_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         INTEGER(SIZE_T), INTENT(OUT) :: nprops
-       END FUNCTION h5pget_nprops_c
-    END INTERFACE
-    hdferr = h5pget_nprops_c(prp_id, nprops)
-  END SUBROUTINE h5pget_nprops_f
-
-!****s* H5P/h5pget_class_name_f 
-! NAME
-!  h5pget_class_name_f 
-!
-! PURPOSE
-!  Queries the name of a class.
-!
-! INPUTS
-!  
-!  prp_id       - property list identifier to query
-! OUTPUTS
-!  
-!  name 	- name of a class
-!  size         - Actual length of the class name
-!                   NOTE: If provided buffer "name" is smaller,
-!                   than name will be truncated to fit into
-!                   provided user buffer.
-!  hdferr:	- error code
-!  		   Success: 0
-!  		   Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  October 9, 2002	
-!
-! HISTORY
-! Returned the size of name as an argument	
-!  
-! Fortran90 Interface:
-  SUBROUTINE h5pget_class_name_f(prp_id, name, size, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier 
-    CHARACTER(LEN=*), INTENT(OUT) :: name ! Buffer to retireve class name
-    INTEGER, INTENT(OUT) :: size          ! Actual length of the class name
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code
-                                          ! 0 on success and -1 on failure
-!*****
-    INTEGER :: name_len
-    
-    INTERFACE
-       INTEGER FUNCTION h5pget_class_name_c(prp_id, name, name_len)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_CLASS_NAME_C'::h5pget_class_name_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         CHARACTER(LEN=*), INTENT(INOUT) :: name
-         INTEGER, INTENT(IN)         :: name_len
-       END FUNCTION h5pget_class_name_c
-    END INTERFACE
-    
-    name_len = LEN(name)
-    size = h5pget_class_name_c(prp_id, name, name_len)
-    
-    hdferr = 0
-    IF(size.LT.0) hdferr = -1
-    
-  END SUBROUTINE h5pget_class_name_f
-
-!****s* H5P/h5pget_class_parent_f 
-! NAME
-!  h5pget_class_parent_f 
-!
-! PURPOSE
-!  Retrieves the parent class of a genric property class. 
-!
-! INPUTS
-!  
-!  prp_id	- property list identifier to query
-! OUTPUTS
-!  
-!  parent_id 	- identifier of the parent class
-!  hdferr:	- error code          
-!  		   Success:  0
-!  		   Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  October 9, 2002	
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pget_class_parent_f(prp_id, parent_id, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id     ! Property list identifier 
-    INTEGER(HID_T), INTENT(OUT) :: parent_id ! Parent class property list 
-                                             ! identifier 
-    INTEGER, INTENT(OUT) :: hdferr  ! Error code
-                                    ! 0 on success and -1 on failure
-!*****
-
-    INTERFACE
-       INTEGER FUNCTION h5pget_class_parent_c(prp_id, parent_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_CLASS_PARENT_C'::h5pget_class_parent_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         INTEGER(HID_T), INTENT(OUT) :: parent_id
-       END FUNCTION h5pget_class_parent_c
-    END INTERFACE
-    hdferr = h5pget_class_parent_c(prp_id, parent_id)
-  END SUBROUTINE h5pget_class_parent_f
-
-!****s* H5P/h5pisa_class_f 
-! NAME
-!   h5pisa_class_f 
-!
-! PURPOSE
-!  Determines whether a property list is a member of a class. 
-!
-! INPUTS
-!  
-!  plist	- property list identifier 
-!  pclass	- identifier of the property class
-! OUTPUTS
-!  
-!  flag         - .TRUE. if a member, .FALSE. otherwise
-!  hdferr:	- error code           
-!  		   Success:  0
-!  		   Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  October 9, 2002	
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pisa_class_f(plist, pclass, flag, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: plist     ! Property list identifier 
-    INTEGER(HID_T), INTENT(IN) :: pclass    ! Class identifier
-    LOGICAL, INTENT(OUT) :: flag            ! logical flag
-    INTEGER, INTENT(OUT) :: hdferr  ! Error code
-                                    ! 0 on success and -1 on failure
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5pisa_class_c(plist, pclass)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PISA_CLASS_C'::h5pisa_class_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: plist
-         INTEGER(HID_T), INTENT(IN) :: pclass
-       END FUNCTION h5pisa_class_c
-    END INTERFACE
-    flag = .FALSE.
-    hdferr = h5pisa_class_c(plist, pclass)
-    IF (hdferr .GT. 0) THEN
-       flag = .TRUE.
-       hdferr = 0
-    ENDIF
-  END SUBROUTINE h5pisa_class_f
-
-!****s* H5P/h5pcopy_prop_f 
-! NAME
-!   h5pcopy_prop_f 
-!
-! PURPOSE
-!  Copies a property from one list or class to another.
-!
-! INPUTS
-!  
-!  dst_id		- Identifier of the destination property list
-!  src_id		- Identifier of the source property list 
-!  name 		- name of the property to copy
-! OUTPUTS
-!  
-!  hdferr:		- error code
-!  		 	   Success: 0 
-!  		  	   Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  October 9, 2002	
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pcopy_prop_f(dst_id, src_id, name, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dst_id  ! Destination property list 
-                                          ! identifier 
-    INTEGER(HID_T), INTENT(IN) :: src_id  ! Source property list identifier 
-    CHARACTER(LEN=*), INTENT(IN) :: name  ! Property name
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code
-                                          ! 0 on success and -1 on failure
-!*****
-    INTEGER :: name_len
-    
-    INTERFACE
-       INTEGER FUNCTION h5pcopy_prop_c(dst_id, src_id, name, name_len)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PCOPY_PROP_C'::h5pcopy_prop_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         INTEGER(HID_T), INTENT(IN) :: dst_id
-         INTEGER(HID_T), INTENT(IN) :: src_id
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER, INTENT(IN)         :: name_len
-       END FUNCTION h5pcopy_prop_c
-    END INTERFACE
-    name_len = LEN(name)
-    hdferr = h5pcopy_prop_c(dst_id, src_id, name , name_len)
-  END SUBROUTINE h5pcopy_prop_f
-
-!****s* H5P/h5premove_f 
-! NAME
-!   h5premove_f 
-!
-! PURPOSE
-!  Removes a property from a property list. 
-
-!
-! INPUTS
-!  
-!  plid		- Property list identofoer
-!  name 	- name of the property to remove
-! OUTPUTS
-!  
-!  hdferr:	- error code
-!  		   Success: 0 
-!  		   Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  October 9, 2002	
-!
-! Fortran90 Interface:
-  SUBROUTINE h5premove_f(plid, name, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: plid   ! Property list identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name ! Name of property to remove
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code
-                                         !  0 on success and -1 on failure
-!*****
-    INTEGER :: name_len
-    
-    INTERFACE
-       INTEGER FUNCTION h5premove_c(plid, name, name_len)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PREMOVE_C'::h5premove_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         INTEGER(HID_T), INTENT(IN) :: plid 
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER, INTENT(IN)         :: name_len
-       END FUNCTION h5premove_c
-    END INTERFACE
-    name_len = LEN(name)
-    hdferr = h5premove_c(plid, name , name_len)
-  END SUBROUTINE h5premove_f
-
-!****s* H5P/h5punregister_f 
-! NAME
-!  h5punregister_f 
-!
-! PURPOSE
-!  Removes a property from a property list class. 
-!
-! INPUTS
-!  
-!  class	- Property list class identifier
-!  name 	- name of the property to remove
-! OUTPUTS
-!  
-!  hdferr:	- error code
-!                  Success: 0 
-!  		   Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  October 9, 2002	
-!
-! Fortran90 Interface:
-  SUBROUTINE h5punregister_f(class, name, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: class  ! property list class identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name ! name of property to remove
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code
-                                         ! 0 on success and -1 on failure
-!*****
-    INTEGER :: name_len
-
-    INTERFACE
-       INTEGER FUNCTION h5punregister_c(class, name, name_len)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PUNREGISTER_C'::h5punregister_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         INTEGER(HID_T), INTENT(IN) :: class
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER, INTENT(IN)         :: name_len
-       END FUNCTION h5punregister_c
-    END INTERFACE
-    name_len = LEN(name)
-    hdferr = h5punregister_c(class, name , name_len)
-  END SUBROUTINE h5punregister_f
-
-!****s* H5P/h5pclose_class_f 
-! NAME
-!  h5pclose_class_f 
-!
-! PURPOSE
-!  Closes an existing property list class.
-!
-! INPUTS
-!  
-!  class	- Property list class identifier
-! OUTPUTS
-!  
-!  hdferr	- error code         
-!  		   Success: 0 
-!  		   Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  October 9, 2002	
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pclose_class_f(class, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: class ! Property list class identifier
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-                                        ! 0 on success and -1 on failure
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5pclose_class_c(class)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PCLOSE_CLASS_C'::h5pclose_class_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: class
-       END FUNCTION h5pclose_class_c
-    END INTERFACE
-    hdferr = h5pclose_class_c(class)
-  END SUBROUTINE h5pclose_class_f
-
-!****s* H5P/h5pset_shuffle_f 
-! NAME
-!  h5pset_shuffle_f 
-!
-! PURPOSE
-!  Sets shuffling filter
-!
-! INPUTS
-!  prp_id	- dataset creation property list identifier
-! OUTPUTS
-!  hdferr       - error code		
-!	           Success:  0
-!	           Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  March 12, 2003
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pset_shuffle_f(prp_id, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code
-                                         ! 0 on success and -1 on failure
-!*****
-
-!            INTEGER, EXTERNAL :: h5pset_shuffle_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pset_shuffle_c(prp_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_SHUFFLE_C'::h5pset_shuffle_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-       END FUNCTION h5pset_shuffle_c
-    END INTERFACE
-    hdferr = h5pset_shuffle_c(prp_id)
-    
-  END SUBROUTINE h5pset_shuffle_f
-
-!****s* H5P/h5pset_edc_check_f 
-! NAME
-!  h5pset_edc_check_f 
-!
-! PURPOSE
-!  Enables/disables error detecting  
-!
-! INPUTS
-!  
-!  prp_id	- dataset creation property list identifier
-!  flag         - EDC flag; possible values:
-!                   H5Z_DISABLE_EDC_F
-!                   H5Z_ENABLE_EDC_F
-! OUTPUTS
-!  hdferr       - error code		
-!	           Success:  0
-!	           Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  March 13, 2003
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pset_edc_check_f(prp_id, flag, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
-    INTEGER, INTENT(IN) :: flag          ! Checksum filter flag
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code
-                                         ! 0 on success and -1 on failure
-!*****
-
-!            INTEGER, EXTERNAL :: h5pset_edc_check_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pset_edc_check_c(prp_id, flag)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_EDC_CHECK_C'::h5pset_edc_check_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         INTEGER, INTENT(IN) :: flag 
-       END FUNCTION h5pset_edc_check_c
-    END INTERFACE
-    hdferr = h5pset_edc_check_c(prp_id, flag)
-    
-  END SUBROUTINE h5pset_edc_check_f
-
-!****s* H5P/h5pget_edc_check_f
-! NAME
-!  h5pget_edc_check_f 
-!
-! PURPOSE
-!  Queries error detecting  
-!
-! INPUTS
-!  
-!  prp_id	- dataset creation property list identifier
-! OUTPUTS
-!  hdferr       - error code		
-!	           Success:  0
-!	           Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  March 13, 2003
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pget_edc_check_f(prp_id, flag, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id ! Dataset transfer property list identifier 
-    INTEGER, INTENT(OUT) :: flag         ! Checksum filter flag
-                                         ! May have one of the following values:
-                                         !  H5Z_ERROR_EDC_F
-                                         !  H5Z_DISABLE_EDC_F
-                                         !  H5Z_ENABLE_EDC_F
-                                         !  H5Z_NO_EDC_F
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code
-                                         ! 0 on success and -1 on failure
-!*****
-
-!            INTEGER, EXTERNAL :: h5pget_edc_check_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pget_edc_check_c(prp_id, flag)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_EDC_CHECK_C'::h5pget_edc_check_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         INTEGER, INTENT(OUT) :: flag
-       END FUNCTION h5pget_edc_check_c
-    END INTERFACE
-    hdferr = h5pget_edc_check_c(prp_id, flag)
-    
-  END SUBROUTINE h5pget_edc_check_f
-
-!****s* H5P/h5pset_fletcher32_f
-! NAME
-!  h5pset_fletcher32_f 
-!
-! PURPOSE
-!  Sets Fletcher32 checksum of EDC for a dataset creation 
-!  property list.
-!
-! INPUTS
-!  
-!  prp_id	- dataset creation property list identifier
-! OUTPUTS
-!  hdferr       - error code		
-!	           Success:  0
-!	           Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  March 13, 2003
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pset_fletcher32_f(prp_id, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code
-                                         ! 0 on success and -1 on failure
-!***** 
-
-!            INTEGER, EXTERNAL :: h5pset_fletcher32_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pset_fletcher32_c(prp_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_FLETCHER32_C'::h5pset_fletcher32_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-       END FUNCTION h5pset_fletcher32_c
-    END INTERFACE
-    hdferr = h5pset_fletcher32_c(prp_id)
-
-  END SUBROUTINE h5pset_fletcher32_f
-
-!****s* H5P/ h5pset_family_offset_f
-! NAME
-!  h5pset_family_offset_f 
-!
-! PURPOSE
-!  Sets offset for family file driver.
-!
-! INPUTS
-!  
-!  prp_id	- file creation property list identifier
-!  offset	- file offset
-! OUTPUTS
-!  hdferr       - error code		
-!	           Success:  0
-!	           Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  19 March 2003
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pset_family_offset_f(prp_id, offset, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id   ! Property list identifier 
-    INTEGER(HSIZE_T), INTENT(IN) :: offset ! Offset in bytes
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-                                           ! 0 on success and -1 on failure
-!***** 
-
-!            INTEGER, EXTERNAL :: h5pset_family_offset_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pset_family_offset_c(prp_id, offset)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_FAMILY_OFFSET_C'::h5pset_family_offset_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         INTEGER(HSIZE_T), INTENT(IN) :: offset 
-       END FUNCTION h5pset_family_offset_c
-    END INTERFACE
-    hdferr = h5pset_family_offset_c(prp_id, offset)
-    
-  END SUBROUTINE h5pset_family_offset_f
-
-!****s* H5P/h5pset_fapl_multi_l
-! NAME
-!  h5pset_fapl_multi_l 
-!
-! PURPOSE
-!  Sets up use of the multi-file driver. 
-!
-! INPUTS
-!  
-!  prp_id	- file creation property list identifier
-!  mem_map      - mapping array
-!  memb_fapl    - property list for each memory usage type
-!  memb_name    - names of member file
-!  relax        - flag 
-! OUTPUTS
-!  hdferr       - error code		
-!	           Success:  0
-!	           Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  20 March 2003
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pset_fapl_multi_l(prp_id, memb_map, memb_fapl, memb_name, memb_addr, relax, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id
-    INTEGER, DIMENSION(*), INTENT(IN) :: memb_map
-    INTEGER(HID_T), DIMENSION(*), INTENT(IN) :: memb_fapl
-    CHARACTER(LEN=*), DIMENSION(*), INTENT(IN) :: memb_name
-    REAL, DIMENSION(*), INTENT(IN) :: memb_addr 
-    LOGICAL, INTENT(IN) :: relax
-    INTEGER, INTENT(OUT) :: hdferr
-!***** 
-    INTEGER, DIMENSION(1:H5FD_MEM_NTYPES_F) :: lenm
-    INTEGER :: maxlen
-    INTEGER :: flag = 0
-    INTEGER :: i
-
-    INTERFACE
-       INTEGER FUNCTION h5pset_fapl_multi_c(prp_id, memb_map, memb_fapl, memb_name, lenm, &
-            maxlen, memb_addr, flag)
-         USE H5GLOBAL
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_FAPL_MULTI_C'::h5pset_fapl_multi_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: memb_name
-         INTEGER(HID_T), INTENT(IN) :: prp_id ! File creation property list identifier 
-         INTEGER, DIMENSION(*), INTENT(IN) :: memb_map
-         INTEGER(HID_T), DIMENSION(*), INTENT(IN) :: memb_fapl
-         CHARACTER(LEN=*), DIMENSION(*), INTENT(IN) :: memb_name
-         REAL, DIMENSION(*), INTENT(IN) :: memb_addr
-         INTEGER, DIMENSION(*) :: lenm
-         INTEGER :: maxlen
-         INTEGER, INTENT(IN) :: flag
-       END FUNCTION h5pset_fapl_multi_c
-    END INTERFACE
-
-    maxlen = LEN(memb_name(1))
-    DO i=1, H5FD_MEM_NTYPES_F
-       lenm(i) = LEN_TRIM(memb_name(i))
-    ENDDO
-    IF(relax) flag = 1
-    hdferr = h5pset_fapl_multi_c(prp_id, memb_map, memb_fapl, memb_name, lenm, maxlen, memb_addr, flag)
-
-  END SUBROUTINE h5pset_fapl_multi_l
-!****s* H5P/h5pset_fapl_multi_s 
-! NAME
-!  h5pset_fapl_multi_s 
-!
-! PURPOSE
-!  Sets up use of the multi-file driver. 
-!
-! INPUTS
-!  
-!  prp_id	- file creation property list identifier
-!  relax        - flag 
-! OUTPUTS
-!  hdferr       - error code		
-!	           Success:  0
-!	           Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  31 March 2003
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pset_fapl_multi_s(prp_id, relax, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id ! File creation property list identifier 
-    LOGICAL, INTENT(IN) :: relax
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code
-                                         ! 0 on success and -1 on failure
-!***** 
-    INTEGER :: flag
-
-!            INTEGER, EXTERNAL :: h5pset_fapl_multi_sc
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pset_fapl_multi_sc(prp_id,flag) 
-         USE H5GLOBAL
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_FAPL_MULTI_SC'::h5pset_fapl_multi_sc
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id ! File creation property list identifier 
-         INTEGER, INTENT(IN) :: flag
-       END FUNCTION h5pset_fapl_multi_sc
-    END INTERFACE
-    flag = 0
-    IF (relax) flag = 1
-    hdferr = h5pset_fapl_multi_sc(prp_id, flag) 
-    
-  END SUBROUTINE h5pset_fapl_multi_s
-!****s* H5P/h5pget_fapl_multi_f 
-! NAME
-!  h5pget_fapl_multi_f 
-!
-! PURPOSE
-!  Sets up use of the multi-file driver. 
-!
-! INPUTS
-!  
-!  prp_id	- file creation property list identifier
-! OUTPUTS
-!  
-!  mem_map      - mapping array
-!  memb_fapl    - property list for each memory usage type
-!  memb_name    - names of member file
-!  relax        - flag 
-!  hdferr       - error code		
-!	           Success:  0
-!	           Failure: -1
-!
-! OPTIONAL PARAMETERS
-!  maxlen_out   - maximum length for memb_name array element 
-!
-! AUTHOR
-!  Elena Pourmal
-!  24 March 2003
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pget_fapl_multi_f(prp_id, memb_map, memb_fapl, memb_name, memb_addr, relax, hdferr, maxlen_out)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id ! File creation property list identifier 
-    INTEGER, DIMENSION(*), INTENT(OUT) :: memb_map
-    INTEGER(HID_T), DIMENSION(*), INTENT(OUT) :: memb_fapl
-    CHARACTER(LEN=*), DIMENSION(*), INTENT(OUT) :: memb_name
-    REAL, DIMENSION(*), INTENT(OUT) :: memb_addr
-    INTEGER, OPTIONAL, INTENT(OUT) :: maxlen_out 
-    LOGICAL, INTENT(OUT) :: relax
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code
-                                         ! 0 on success and -1 on failure
-!***** 
-    INTEGER, DIMENSION(1:H5FD_MEM_NTYPES_F) :: lenm
-    INTEGER :: maxlen
-    INTEGER :: c_maxlen_out 
-    INTEGER :: flag
-    INTEGER :: i
-!
-    INTERFACE
-       INTEGER FUNCTION h5pget_fapl_multi_c(prp_id, memb_map, memb_fapl, memb_name, lenm, &
-            maxlen, memb_addr, flag, c_maxlen_out)
-         USE H5GLOBAL
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_FAPL_MULTI_C'::h5pget_fapl_multi_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: memb_name
-         INTEGER(HID_T), INTENT(IN) :: prp_id ! File creation property list identifier 
-         INTEGER, DIMENSION(*), INTENT(OUT) :: memb_map
-         INTEGER(HID_T), DIMENSION(*), INTENT(OUT) :: memb_fapl
-         CHARACTER(LEN=*), DIMENSION(*), INTENT(OUT) :: memb_name
-         REAL, DIMENSION(*), INTENT(OUT) :: memb_addr
-         INTEGER, DIMENSION(*) :: lenm
-         INTEGER :: maxlen
-         INTEGER :: c_maxlen_out 
-         INTEGER, INTENT(OUT) :: flag
-       END FUNCTION h5pget_fapl_multi_c
-    END INTERFACE
-
-    maxlen = LEN(memb_name(1))
-    DO i=1, H5FD_MEM_NTYPES_F
-       lenm(i) = LEN_TRIM(memb_name(i))
-    ENDDO
-    hdferr = h5pget_fapl_multi_c(prp_id, memb_map, memb_fapl, memb_name, lenm, maxlen, memb_addr, flag, c_maxlen_out)
-    
-    relax = .TRUE.
-    IF(flag .EQ. 0) relax = .FALSE.
-    IF(PRESENT(maxlen_out)) maxlen_out = c_maxlen_out
-  END SUBROUTINE h5pget_fapl_multi_f
-!****s* H5P/h5pset_szip_f 
-! NAME
-!  h5pset_szip_f 
-!
-! PURPOSE
-!  Sets up use of szip compression
-!
-! INPUTS
-!  
-!  prp_id	    - dataset creation property list identifier
-!  options_mask     - A bit-mask conveying the desired SZIP options.
-!                     Current valid values in Fortran are:
-!                        H5_SZIP_EC_OM_F
-!                        H5_SZIP_NN_OM_F
-!  pixels_per_block - szip parameters
-! OUTPUTS
-!  hdferr           - error code		
-!	                Success:  0
-!	                Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  April 10 2003
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pset_szip_f(prp_id, options_mask, pixels_per_block, hdferr) 
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id ! Dataset creation property 
-                                         ! list identifier 
-    INTEGER, INTENT(IN) :: options_mask  ! A bit-mask conveying the desired
-                                         ! SZIP options
-                                         ! Current valid values in Fortran are:
-                                         !    H5_SZIP_EC_OM_F
-                                         !    H5_SZIP_NN_OM_F
-    INTEGER, INTENT(IN) :: pixels_per_block ! The number of pixels or data elements 
-                                            ! in each data block
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code
-                                         ! 0 on success and -1 on failure
-!***** 
-
-!  INTEGER, EXTERNAL :: h5pset_szip_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pset_szip_c(prp_id, options_mask, pixels_per_block) 
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_SZIP_C'::h5pset_szip_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id ! File creation property list identifier 
-         INTEGER, INTENT(IN) :: options_mask
-         INTEGER, INTENT(IN) :: pixels_per_block
-       END FUNCTION h5pset_szip_c
-    END INTERFACE
-    hdferr = h5pset_szip_c(prp_id, options_mask, pixels_per_block) 
-    
-  END SUBROUTINE h5pset_szip_f
-
-!****s* H5P/h5pall_filters_avail_f 
-! NAME
-!  h5pall_filters_avail_f 
-!
-! PURPOSE
-!  Checks if all filters set in the dataset creation
-!  property list are available
-!
-! INPUTS
-!  
-!  prp_id	- data creation property list identifier
-! OUTPUTS
-!  
-!  flag         - .TRUE. if all filters are available
-!                 .FALSE. otherwise
-!  hdferr       - error code		
-!	           Success:  0
-!	           Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  April 10 2003
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pall_filters_avail_f(prp_id, flag, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id ! Dataset creation property 
-                                         !  list identifier 
-    LOGICAL, INTENT(OUT) :: flag         ! .TRUE. if all filters are available
-                                         ! .FALSE. otherwise
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code
-                                         ! 0 on success and -1 on failure
-!***** 
-    INTEGER :: status
-
-!            INTEGER, EXTERNAL :: h5pall_filters_avail_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pall_filters_avail_c(prp_id, status) 
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PALL_FILTERS_AVAIL_C'::h5pall_filters_avail_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id ! File creation property list identifier 
-         INTEGER, INTENT(OUT) :: status
-       END FUNCTION h5pall_filters_avail_c
-    END INTERFACE
-    flag = .TRUE.
-    hdferr = h5pall_filters_avail_c(prp_id, status) 
-    IF (status .EQ. 0 ) flag = .FALSE.
-    
-  END SUBROUTINE h5pall_filters_avail_f
-
-!****s* H5P/h5pget_filter_by_id_f
-! NAME
-!  h5pget_filter_by_id_f 
-!
-! PURPOSE
-!  Returns information about a filter in a pipeline
-!
-! INPUTS
-!  
-!  prp_id	- data creation or transfer property list 
-!  		  identifier
-! OUTPUTS
-!  
-!  filter_id	- filter identifier
-!  flags	- bit vector specifying certain general
-!  		  properties of the filter
-!  cd_nelmts	- number of elements in cd_values
-!  cd_values	- auxiliary data for the filter
-!  namelen	- number of characters in the name buffer
-!  name		- buffer to retrieve filter name
-!  hdferr       - error code		
-!	           Success:  0
-!	           Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  April 10 2003
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pget_filter_by_id_f(prp_id, filter_id, flags, cd_nelmts, cd_values, namelen, name, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id   ! Property list identifier 
-    INTEGER, INTENT(IN) :: filter_id       ! Filter identifier
-    INTEGER(SIZE_T), INTENT(INOUT) :: cd_nelmts     ! Number of elements in cd_values.
-    INTEGER, DIMENSION(*), INTENT(OUT) :: cd_values ! Auxiliary data for the filter.
-    INTEGER, INTENT(OUT) :: flags          ! Bit vector specifying certain general
-                                           ! properties of the filter.
-    INTEGER(SIZE_T), INTENT(IN) :: namelen ! Anticipated number of characters in name.
-    CHARACTER(LEN=*), INTENT(OUT) :: name  ! Name of the filter
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-                                           ! 0 on success and -1 on failure
-!***** 
-
-
-!            INTEGER, EXTERNAL :: h5pget_filter_by_id_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pget_filter_by_id_c(prp_id, filter_id, flags, cd_nelmts,  &
-            cd_values, namelen, name)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_FILTER_BY_ID_C'::h5pget_filter_by_id_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         INTEGER, INTENT(IN) :: filter_id 
-         INTEGER, DIMENSION(*), INTENT(OUT) :: cd_values
-         INTEGER, INTENT(OUT) :: flags 
-         INTEGER(SIZE_T), INTENT(INOUT) :: cd_nelmts
-         INTEGER(SIZE_T), INTENT(IN) :: namelen
-         CHARACTER(LEN=*), INTENT(OUT) :: name
-       END FUNCTION h5pget_filter_by_id_c
-    END INTERFACE
-    
-    hdferr = h5pget_filter_by_id_c(prp_id, filter_id, flags, cd_nelmts,  & 
-         cd_values, namelen, name)
-  END SUBROUTINE h5pget_filter_by_id_f
-
-!****s* H5P/h5pmodify_filter_f
-! NAME
-!  h5pmodify_filter_f 
-!
-! PURPOSE
-!  Adds a filter to the filter pipeline. 
-!
-! INPUTS
-!  
-!  prp_id	- data creation or transfer property list 
-!  		  identifier
-!  filter	- filter to be modified
-!  flags	- bit vector specifying certain general
-!  		  properties of the filter
-!  cd_nelmts	- number of elements in cd_values
-!  cd_values	- auxiliary data for the filter
-! OUTPUTS
-!  hdferr       - error code		
-!	           Success:  0
-!	           Failure: -1   
-!
-! AUTHOR
-!  Elena Pourmal
-!  April 10 2003
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pmodify_filter_f(prp_id, filter, flags, cd_nelmts, cd_values,  hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
-    INTEGER, INTENT(IN) :: filter        ! Filter to be modified
-    INTEGER, INTENT(IN) :: flags         ! Bit vector specifying certain general
-                                         !  properties of the filter
-    INTEGER(SIZE_T), INTENT(IN) :: cd_nelmts       ! Number of elements in cd_values
-    INTEGER, DIMENSION(*), INTENT(IN) :: cd_values ! Auxiliary data for the filter
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code
-                                         ! 0 on success and -1 on failure
-!***** 
-
-!            INTEGER, EXTERNAL :: h5pmodify_filter_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pmodify_filter_c(prp_id, filter, flags, cd_nelmts, cd_values)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PMODIFY_FILTER_C'::h5pmodify_filter_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id 
-         INTEGER, INTENT(IN) :: filter 
-         INTEGER, INTENT(IN) :: flags 
-         INTEGER(SIZE_T), INTENT(IN) :: cd_nelmts 
-         INTEGER, DIMENSION(*), INTENT(IN) :: cd_values 
-       END FUNCTION h5pmodify_filter_c
-    END INTERFACE
-    
-    hdferr = h5pmodify_filter_c(prp_id, filter, flags, cd_nelmts, cd_values )
-  END SUBROUTINE h5pmodify_filter_f
-
-!****s* H5P/h5premove_filter_f 
-! NAME
-!  h5premove_filter_f 
-!
-! PURPOSE
-!  Delete one or more filters from the filter pipeline. 
-!
-! INPUTS
-!  
-!  prp_id	- data creation or transfer property list 
-!  		  identifier
-!  filter	- filter to be removed
-! OUTPUTS
-!  hdferr       - error code		
-!	           Success:  0
-!	           Failure: -1   
-!
-! AUTHOR
-!  Quincey Koziol
-!  January 27 2004
-!
-! Fortran90 Interface:
-  SUBROUTINE h5premove_filter_f(prp_id, filter, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id ! Dataset creation property list
-                                         ! identifier
-    INTEGER, INTENT(IN) :: filter        ! Filter to be removed
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code
-                                         ! 0 on success and -1 on failure
-!***** 
-
-!            INTEGER, EXTERNAL :: h5premove_filter_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5premove_filter_c(prp_id, filter)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PREMOVE_FILTER_C'::h5premove_filter_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id 
-         INTEGER, INTENT(IN) :: filter 
-       END FUNCTION h5premove_filter_c
-    END INTERFACE
-    
-    hdferr = h5premove_filter_c(prp_id, filter)
-  END SUBROUTINE h5premove_filter_f
-
-!****s* H5P/H5Pget_attr_phase_change_f
-! NAME
-!  H5Pget_attr_phase_change_f 
-!
-! PURPOSE
-!  Retrieves attribute storage phase change thresholds 
-!
-! INPUTS
-!  
-!  ocpl_id	   - Object (dataset or group) creation property list identifier
-! OUTPUTS
-!  
-!  max_compact     - Maximum number of attributes to be stored in compact storage
-!                    (Default: 8)
-!  min_dense       - Minimum number of attributes to be stored in dense storage
-!                    (Default: 6)
-!  hdferr          - Error code		
-!	              Success:  0
-!	              Failure: -1   
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  January, 2008
-!
-! Fortran90 Interface:  
-  SUBROUTINE h5pget_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: ocpl_id ! Object (dataset or group) creation property list identifier
-    INTEGER, INTENT(OUT) :: max_compact   ! Maximum number of attributes to be stored in compact storage
-                                          ! (Default: 8)
-    INTEGER, INTENT(OUT) :: min_dense     ! Minimum number of attributes to be stored in dense storage
-                                          ! (Default: 6)
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code
-                                          ! 0 on success and -1 on failure
-!***** 
-!
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pget_attr_phase_change_c(ocpl_id, max_compact, min_dense)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_ATTR_PHASE_CHANGE_C'::h5pget_attr_phase_change_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: ocpl_id
-         INTEGER, INTENT(OUT) :: max_compact
-         INTEGER, INTENT(OUT) :: min_dense
-
-       END FUNCTION h5pget_attr_phase_change_c
-    END INTERFACE
-
-    hdferr = h5pget_attr_phase_change_c(ocpl_id, max_compact, min_dense)
-  END SUBROUTINE h5pget_attr_phase_change_f
-
-!****s* H5P/H5Pset_attr_creation_order_f 
-! NAME
-!  H5Pset_attr_creation_order_f 
-!
-! PURPOSE
-!  Sets tracking and indexing of attribute creation order
-!
-! INPUTS
-!  
-!  ocpl_id	   - Object creation property list identifier
-!  crt_order_flags - Flags specifying whether to track and index attribute creation order
-! OUTPUTS
-!
-!  hdferr          - Error code		
-!	              Success:  0
-!	              Failure: -1   
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  January, 2008
-!
-! Fortran90 Interface: 
-  SUBROUTINE h5pset_attr_creation_order_f(ocpl_id, crt_order_flags , hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: ocpl_id   ! Object (dataset or group) creation property list identifier
-    INTEGER, INTENT(IN) :: crt_order_flags  ! Flags specifying whether to track and index attribute creation order
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-                                            ! 0 on success and -1 on failure
-!***** 
-!
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION H5Pset_attr_creation_order_c(ocpl_id, crt_order_flags)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_ATTR_CREATION_ORDER_C'::h5pset_attr_creation_order_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: ocpl_id
-         INTEGER, INTENT(IN) :: crt_order_flags
-
-       END FUNCTION H5Pset_attr_creation_order_c
-    END INTERFACE
-
-    hdferr = H5Pset_attr_creation_order_c(ocpl_id, crt_order_flags)
-  END SUBROUTINE h5pset_attr_creation_order_f
-
-!****s* H5P/H5Pset_shared_mesg_nindexes_f 
-! NAME
-!  H5Pset_shared_mesg_nindexes_f 
-!
-! PURPOSE
-!  Sets number of shared object header message indexes 
-!
-! INPUTS
-!  
-!  plist_id - file creation property list
-!  nindexes - Number of shared object header message indexes to be available in files created with this property list
-! OUTPUTS
-!
-!  hdferr  - error code		
-!	      Success:  0
-!	      Failure: -1   
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  January, 2008
-!
-! Fortran90 Interface:  
-  SUBROUTINE h5pset_shared_mesg_nindexes_f( plist_id, nindexes, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: plist_id ! File creation property list
-    INTEGER, INTENT(IN) :: nindexes  ! Number of shared object header message indexes 
-                                     !  available in files created WITH this property list
-    INTEGER, INTENT(OUT) :: hdferr   ! Error code
-                                     ! 0 on success and -1 on failure
-!***** 
-!
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pset_shared_mesg_nindexes_c(plist_id, nindexes)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_SHARED_MESG_NINDEXES_C'::h5pset_shared_mesg_nindexes_c
-         !DEC$ENDIF
-         
-         INTEGER(HID_T), INTENT(IN) :: plist_id
-         INTEGER, INTENT(IN) :: nindexes
-
-       END FUNCTION H5pset_shared_mesg_nindexes_c
-    END INTERFACE
-
-    hdferr = h5pset_shared_mesg_nindexes_c(plist_id, nindexes)
-
-  END SUBROUTINE h5pset_shared_mesg_nindexes_f
-
-!****s* H5P/H5Pset_shared_mesg_index_f
-! NAME
-!  H5Pset_shared_mesg_index_f
-!
-! PURPOSE
-!  Configures the specified shared object header message index
-!
-! INPUTS
-!  
-!  fcpl_id         - File creation property list identifier.
-!  index_num       - Index being configured.
-!  mesg_type_flags - Types of messages that should be stored in this index.
-!  min_mesg_size   - Minimum message size.
-!
-! OUTPUTS
-!
-!  hdferr  - error code		
-!	      Success:  0
-!	      Failure: -1   
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  January, 2008
-!
-! Fortran90 Interface:  
-  SUBROUTINE h5pset_shared_mesg_index_f(fcpl_id, index_num, mesg_type_flags, min_mesg_size, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: fcpl_id  ! file creation property list
-    INTEGER, INTENT(IN) :: index_num       ! Index being configured.
-    INTEGER, INTENT(IN) :: mesg_type_flags ! Types of messages that should be stored in this index.
-    INTEGER, INTENT(IN) :: min_mesg_size   ! Minimum message size.
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-                                           ! 0 on success and -1 on failure
-!***** 
-!
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pset_shared_mesg_index_c(fcpl_id, index_num, mesg_type_flags, min_mesg_size)
-
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_SHARED_MESG_INDEX_C'::h5pset_shared_mesg_index_c
-         !DEC$ENDIF
-         
-         INTEGER(HID_T), INTENT(IN) :: fcpl_id 
-         INTEGER, INTENT(IN) :: index_num
-         INTEGER, INTENT(IN) :: mesg_type_flags
-         INTEGER, INTENT(IN) :: min_mesg_size
-
-       END FUNCTION H5pset_shared_mesg_index_c
-    END INTERFACE
-
-    hdferr = h5pset_shared_mesg_index_c(fcpl_id, index_num, mesg_type_flags, min_mesg_size)
-
-  END SUBROUTINE h5pset_shared_mesg_index_f
-
-!****s* H5P/H5Pget_attr_creation_order_f
-! NAME
-!  H5Pget_attr_creation_order_f
-!
-! PURPOSE
-!  Retrieves tracking and indexing settings for attribute creation order
-!
-! INPUTS
-!
-!  ocpl_id         - Object (group or dataset) creation property list identifier
-!
-! OUTPUTS
-!
-!  crt_order_flags - Flags specifying whether to track and index attribute creation order
-!  hdferr	   - Error code		
-!  		 	Success:  0
-!  		 	Failure: -1   
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  February, 2008
-!
-! Fortran90 Interface:  
-  SUBROUTINE h5pget_attr_creation_order_f(ocpl_id, crt_order_flags, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: ocpl_id   ! Object (group or dataset) creation property list identifier 
-    INTEGER, INTENT(OUT) :: crt_order_flags ! Flags specifying whether to track and index attribute creation order 
-    INTEGER, INTENT(OUT) :: hdferr   ! Error code
-                                     ! 0 on success and -1 on failure
-!***** 
-!
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pget_attr_creation_order_c(ocpl_id, crt_order_flags)
-
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_ATTR_CREATION_ORDER_C'::h5pget_attr_creation_order_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: ocpl_id
-         INTEGER, INTENT(OUT) :: crt_order_flags
-
-       END FUNCTION H5pget_attr_creation_order_c
-    END INTERFACE
-
-    hdferr = h5pget_attr_creation_order_c(ocpl_id, crt_order_flags)
-
-  END SUBROUTINE h5pget_attr_creation_order_f
-
-!****s* H5P/H5Pset_libver_bounds_f
-! NAME
-! 	      H5Pset_libver_bounds_f
-!
-! PURPOSE
-!    Sets bounds on library versions, and indirectly format versions, to be used when creating objects.
-!
-! INPUTS
-!
-!  fapl_id - File access property list identifier
-!  low     - The earliest version of the library that will be used for writing objects.
-!  high    - The latest version of the library that will be used for writing objects.
-!
-! OUTPUTS
-!
-!  hdferr  - error code		
-!  	      Success:  0
-!  	      Failure: -1   
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  February 18, 2008
-!
-! Fortran90 Interface:  
-  SUBROUTINE h5pset_libver_bounds_f(fapl_id, low, high, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: fapl_id ! File access property list identifier
-    INTEGER, INTENT(IN) :: low   ! The earliest version of the library that will be used for writing objects.
-                                 ! Currently, low must be one of two pre-defined values:
-                                 !            HDF_LIBVER_EARLIEST_F
-                                 !            HDF_LIBVER_LATEST_F
-    INTEGER, INTENT(IN) :: high  ! The latest version of the library that will be used for writing objects.
-                                 ! Currently, low must set to the pre-defined value:
-                                 !            HDF_LIBVER_LATEST_F
-    INTEGER, INTENT(OUT) :: hdferr  ! Error code
-                                    ! 0 on success and -1 on failure
-!***** 
-!
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pset_libver_bounds_c(fapl_id, low, high)
-
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_LIBVER_BOUNDS_C'::h5pset_libver_bounds_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: fapl_id
-         INTEGER, INTENT(IN) :: low
-         INTEGER, INTENT(IN) :: high
-
-       END FUNCTION H5pset_libver_bounds_c
-    END INTERFACE
-
-    hdferr = h5pset_libver_bounds_c(fapl_id, low, high)
-
-  END SUBROUTINE h5pset_libver_bounds_f
-
-!****s* H5P/H5Pset_link_creation_order_f 
-! NAME
-!  H5Pset_link_creation_order_f 
-!
-! PURPOSE
-!    Sets creation order tracking and indexing for links in a group.
-!
-! INPUTS
-!
-!  gcpl_id  	   - Group creation property list identifier
-!  crt_order_flags - Creation order flag(s)
-!
-! OUTPUTS
-!
-!  hdferr	    - Error code		
-!  		 	Success:  0
-!  		 	Failure: -1   
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  February 18, 2008
-!
-! Fortran90 Interface:  
-  SUBROUTINE h5pset_link_creation_order_f(gcpl_id, crt_order_flags, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: gcpl_id  ! File access property list identifier
-    INTEGER, INTENT(IN) :: crt_order_flags ! Creation order flag(s)
-    INTEGER, INTENT(OUT) :: hdferr   ! Error code
-                                     ! 0 on success and -1 on failure
-!***** 
-!
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pset_link_creation_order_c(gcpl_id, crt_order_flags)
-
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_LINK_CREATION_ORDER_C'::h5pset_link_creation_order_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: gcpl_id
-         INTEGER, INTENT(IN) :: crt_order_flags
-
-       END FUNCTION H5pset_link_creation_order_c
-    END INTERFACE
-
-    hdferr = h5pset_link_creation_order_c(gcpl_id, crt_order_flags)
-
-  END SUBROUTINE h5pset_link_creation_order_f
-
-!****s* H5P/H5Pget_link_phase_change_f
-! NAME
-!  H5Pget_link_phase_change_f
-!
-! PURPOSE
-!  Queries the settings for conversion between compact and dense groups.
-!
-! INPUTS
-!  
-!  gcpl_id  	- Group creation property list identifier
-! OUTPUTS
-!  
-!  max_compact  - Maximum number of attributes to be stored in compact storage
-!  min_dense    - Minimum number of attributes to be stored in dense storage
-!  hdferr       - Error code		
-!	           Success:  0
-!	           Failure: -1   
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  February 20, 2008
-!
-! Fortran90 Interface:  
-  SUBROUTINE h5pget_link_phase_change_f(gcpl_id, max_compact, min_dense, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: gcpl_id ! Group creation property list identifier
-    INTEGER, INTENT(OUT) :: max_compact   ! Maximum number of attributes to be stored in compact storage
-    INTEGER, INTENT(OUT) :: min_dense     ! Minimum number of attributes to be stored in dense storage
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code
-                                          ! 0 on success and -1 on failure
-!***** 
-!
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pget_link_phase_change_c(gcpl_id, max_compact, min_dense)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_LINK_PHASE_CHANGE_C'::h5pget_link_phase_change_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: gcpl_id
-         INTEGER, INTENT(OUT) :: max_compact
-         INTEGER, INTENT(OUT) :: min_dense
-
-       END FUNCTION h5pget_link_phase_change_c
-    END INTERFACE
-
-    hdferr = h5pget_link_phase_change_c(gcpl_id, max_compact, min_dense)
-  END SUBROUTINE h5pget_link_phase_change_f
-
-!****s* H5P/H5Pget_obj_track_times_f 
-! NAME
-!  H5Pget_obj_track_times_f 
-!
-! PURPOSE
-!  Returns whether times are tracked for an object.
-!
-! INPUTS
-!  
-!  plist_id	- property list id
-!  flag         - object timestamp setting
-!                 .TRUE.,.FALSE.
-! OUTPUTS
-!
-!  hdferr       - error code		
-!	          Success:  0
-!	          Failure: -1   
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  February 22, 2008
-!
-! Fortran90 Interface:  
-  SUBROUTINE h5pget_obj_track_times_f(plist_id, flag, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: plist_id ! Dataset creation property 
-                                           ! list identifier 
-    LOGICAL, INTENT(OUT) :: flag   ! Object timestamp setting
-    INTEGER, INTENT(OUT) :: hdferr ! Error code
-                                   ! 0 on success and -1 on failure
-!***** 
-    INTEGER :: status
-!
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pget_obj_track_times_c(plist_id, status)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_OBJ_TRACK_TIMES_C'::h5pget_obj_track_times_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: plist_id ! File creation property list identifier 
-         INTEGER, INTENT(OUT) :: status
-       END FUNCTION h5pget_obj_track_times_c
-    END INTERFACE
-    flag = .TRUE.
-    hdferr = h5pget_obj_track_times_c(plist_id, status)
-    IF(status.EQ.0) flag = .FALSE.
-
-  END SUBROUTINE h5pget_obj_track_times_f
-
-!****s* H5P/H5Pset_obj_track_times_f 
-! NAME
-!  H5Pset_obj_track_times_f 
-!
-! PURPOSE
-!  Set whether the birth, access, modification & change times for
-!  an object are stored.
-!
-!  Birth time is the time the object was created.  Access time is
-!  the last time that metadata or raw data was read from this
-!  object.  Modification time is the last time the data for
-!  this object was changed (either writing raw data to a dataset
-!  or inserting/modifying/deleting a link in a group).  Change
-!  time is the last time the metadata for this object was written
-!  (adding/modifying/deleting an attribute on an object, extending
-!  the size of a dataset, etc).
-!
-!   If these times are not tracked, they will be reported as
-!   12:00 AM UDT, Jan. 1, 1970 (i.e. 0 seconds past the UNIX
-!   epoch) when queried.
-!
-! INPUTS
-!  
-!  plist_id	- property list id
-!  flag         - object timestamp setting
-!                 .TRUE.,.FALSE.
-! OUTPUTS
-!
-!  hdferr       - error code		
-!	           Success:  0
-!	           Failure: -1   
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  February 22, 2008
-!	
-!  
-! Fortran90 Interface:  
-  SUBROUTINE h5pset_obj_track_times_f(plist_id, flag, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: plist_id ! Dataset creation property
-                                           ! list identifier
-    LOGICAL, INTENT(IN) :: flag    ! Object timestamp setting
-    INTEGER, INTENT(OUT) :: hdferr ! Error code
-                                   ! 0 on success and -1 on failure
-!***** 
-    INTEGER :: status
-!
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pset_obj_track_times_c(plist_id, status)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_OBJ_TRACK_TIMES_C'::h5pset_obj_track_times_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: plist_id ! File creation property list identifier 
-         INTEGER, INTENT(IN) :: status
-       END FUNCTION h5pset_obj_track_times_c
-    END INTERFACE
-
-    status = 0
-    IF(flag) status = 1
-
-    hdferr = h5pset_obj_track_times_c(plist_id, status)
-
-  END SUBROUTINE h5pset_obj_track_times_f
-
-!****s* H5P/H5Pset_create_inter_group_f
-! NAME
-!  H5Pset_create_inter_group_f
-!
-! PURPOSE
-!  Specifies in property list whether to create missing intermediate groups.
-!
-! INPUTS
-!  
-!  lcpl_id            - Link creation property list identifier
-!  crt_intermed_group - crt_intermed_group specifying whether 
-!                       to create intermediate groups upon the creation 
-!                       of an object
-! OUTPUTS
-!
-!  hdferr	      - Error code		
-!  		 	  Success:  0
-!  		 	  Failure: -1   
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  February 22, 2008
-!
-! HISTORY	
-! The long subroutine name (>31) on older f90 compilers causes problems
-!          so had to shorten the name
-! Fortran90 Interface:
-  SUBROUTINE h5pset_create_inter_group_f(lcpl_id, crt_intermed_group, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: lcpl_id      ! Link creation property list identifier
-    INTEGER, INTENT(IN) :: crt_intermed_group  ! specifying whether to create intermediate groups
-                                               ! upon the creation of an object
-    INTEGER, INTENT(OUT) :: hdferr ! Error code
-                                   ! 0 on success and -1 on failure
-!***** 
-!
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pset_create_inter_group_c(lcpl_id, crt_intermed_group)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_CREATE_INTER_GROUP_C'::h5pset_create_inter_group_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: lcpl_id
-         INTEGER, INTENT(IN) :: crt_intermed_group
-       END FUNCTION h5pset_create_inter_group_c
-    END INTERFACE
-
-    hdferr = h5pset_create_inter_group_c(lcpl_id, crt_intermed_group)
-
-  END SUBROUTINE h5pset_create_inter_group_f
-
-!****s* H5P/H5Pget_link_creation_order_f
-! NAME
-!  H5Pget_link_creation_order_f
-!
-! PURPOSE
-!  Queries whether link creation order is tracked and/or indexed in a group.
-!
-! INPUTS
-!
-!  gcpl_id - Group creation property list identifier
-!
-! OUTPUTS
-!
-!  crt_order_flags - Creation order flag(s)
-!  hdferr	   - Error code		
-!  		      Success:  0
-!  		      Failure: -1   
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  March 3, 2008
-!
-! Fortran90 Interface:  
-  SUBROUTINE h5pget_link_creation_order_f(gcpl_id, crt_order_flags, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: gcpl_id   ! Group creation property list identifier
-    INTEGER, INTENT(OUT) :: crt_order_flags ! Creation order flag(s)
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-                                            ! 0 on success and -1 on failure
-!***** 
-!
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pget_link_creation_order_c(gcpl_id, crt_order_flags)
-
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_LINK_CREATION_ORDER_C'::h5pget_link_creation_order_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: gcpl_id
-         INTEGER, INTENT(OUT) :: crt_order_flags
-
-       END FUNCTION H5pget_link_creation_order_c
-    END INTERFACE
-
-    hdferr = h5pget_link_creation_order_c(gcpl_id, crt_order_flags)
-
-  END SUBROUTINE h5pget_link_creation_order_f
-
-!****s* H5P/H5Pset_char_encoding_f
-! NAME
-!  H5Pset_char_encoding_f
-!
-! PURPOSE
-!  Sets the character encoding used to encode a string.
-!
-! INPUTS
-!
-!  plist_id - Property list identifier
-!  encoding - Valid values for encoding are:
-!     	        H5T_CSET_ASCII_F -> US ASCII
-!     	        H5T_CSET_UTF8_F -> UTF-8 Unicode encoding
-!
-! OUTPUTS
-!  hdferr   - Error code		
-!  	        Success:  0
-!  		Failure: -1   
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  March 3, 2008
-!
-! Fortran90 Interface:  
-  SUBROUTINE h5pset_char_encoding_f(plist_id, encoding, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: plist_id ! Property list identifier
-    INTEGER, INTENT(IN) :: encoding        ! String encoding character set:
-     	                                   !   H5T_CSET_ASCII_F -> US ASCII
-     	                                   !   H5T_CSET_UTF8_F  -> UTF-8 Unicode encoding
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-                                           ! 0 on success and -1 on failure
-!***** 
-!
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pset_char_encoding_c(plist_id, encoding)
-
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_CHAR_ENCODING_C'::h5pset_char_encoding_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: plist_id
-         INTEGER, INTENT(IN) :: encoding
-
-       END FUNCTION H5pset_char_encoding_c
-    END INTERFACE
-
-    hdferr = h5pset_char_encoding_c(plist_id, encoding)
-
-  END SUBROUTINE h5pset_char_encoding_f
-
-!****s* H5P/H5Pget_char_encoding_f
-! NAME
-!  H5Pget_char_encoding_f
-!
-! PURPOSE
-!  Retrieves the character encoding used to create a string
-!
-! INPUTS
-!
-!  plist_id - Property list identifier
-!
-! OUTPUTS
-!
-!  encoding - Valid values for encoding are:
-!     	        H5T_CSET_ASCII_F -> US ASCII
-!     	        H5T_CSET_UTF8_F -> UTF-8 Unicode encoding
-!  hdferr   - Error code		
-!               Success:  0
-!               Failure: -1   
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  March 3, 2008
-!
-! Fortran90 Interface:  
-  SUBROUTINE  h5pget_char_encoding_f(plist_id, encoding, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: plist_id ! Property list identifier
-
-    INTEGER, INTENT(OUT) :: encoding       ! Valid values for encoding are:
-     	                                   !  H5T_CSET_ASCII_F -> US ASCII
-     	                                   !  H5T_CSET_UTF8_F  -> UTF-8 Unicode encoding
-    INTEGER, INTENT(OUT) :: hdferr   ! Error code
-                                     ! 0 on success and -1 on failure
-!***** 
-!
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pget_char_encoding_c(plist_id, encoding)
-
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_CHAR_ENCODING_C'::h5pget_char_encoding_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: plist_id
-         INTEGER, INTENT(OUT) :: encoding
-
-       END FUNCTION H5pget_char_encoding_c
-    END INTERFACE
-
-    hdferr = h5pget_char_encoding_c(plist_id, encoding)
-
-  END SUBROUTINE h5pget_char_encoding_f
-
-!****s* H5P/h5pset_copy_object_f
-! NAME
-!  h5pset_copy_object_f 
-!
-! PURPOSE
-!  Sets properties to be used when an object is copied.
-!
-! INPUTS
-! 
-!  ocp_plist_id - Object copy property list identifier
-!  copy_options - Copy option(s) to be set
-! OUTPUTS
-!  
-!  hdferr	- error code		
-!  		   Success:  0
-!  		   Failure: -1   
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  March 3, 2008
-!
-! HISTORY
-!
-!  
-! Fortran90 Interface:  
-  SUBROUTINE h5pset_copy_object_f(ocp_plist_id, copy_options, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: ocp_plist_id ! Object copy property list identifier
-    INTEGER, INTENT(IN) :: copy_options ! Copy option(s) to be set, valid options are:
-                                        !   H5O_COPY_SHALLOW_HIERARCHY_F
-                                        !   H5O_COPY_EXPAND_SOFT_LINK_F
-                                        !   H5O_COPY_EXPAND_EXT_LINK_F
-                                        !   H5O_COPY_EXPAND_REFERENCE_F
-                                        !   H5O_COPY_WITHOUT_ATTR_FLAG_F
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-                                        ! 0 on success and -1 on failure
-!***** 
-
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pset_copy_object_c(ocp_plist_id, copy_options)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_COPY_OBJECT_C'::h5pset_copy_object_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: ocp_plist_id
-         INTEGER, INTENT(IN) :: copy_options
-       END FUNCTION h5pset_copy_object_c
-    END INTERFACE
-    hdferr = h5pset_copy_object_c(ocp_plist_id, copy_options)
-  END SUBROUTINE h5pset_copy_object_f
-
-!****s* H5P/h5pget_copy_object_f
-! NAME
-!  h5pget_copy_object_f 
-!
-! PURPOSE
-!  Retrieves the properties to be used when an object is copied.
-!
-! INPUTS
-! 
-!  ocp_plist_id - Object copy property list identifier
-! OUTPUTS
-!  
-!  copy_options - Copy option(s) to be get
-!  hdferr	- Error code		
-!  		   Success:  0
-!  		   Failure: -1   
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  March 3, 2008
-!
-! HISTORY
-!
-!  
-! Fortran90 Interface:
-  SUBROUTINE h5pget_copy_object_f(ocp_plist_id, copy_options, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: ocp_plist_id ! Object copy property list identifier
-    INTEGER, INTENT(OUT) :: copy_options       ! Valid copy options returned are:
-                                               !   H5O_COPY_SHALLOW_HIERARCHY_F
-                                               !   H5O_COPY_EXPAND_SOFT_LINK_F 
-                                               !   H5O_COPY_EXPAND_EXT_LINK_F
-                                               !   H5O_COPY_EXPAND_REFERENCE_F
-                                               !   H5O_COPY_WITHOUT_ATTR_FLAG_F
-    INTEGER, INTENT(OUT) :: hdferr             ! Error code
-                                               ! 0 on success and -1 on failure
-!***** 
-
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pget_copy_object_c(ocp_plist_id, copy_options)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_COPY_OBJECT_C'::h5pget_copy_object_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: ocp_plist_id
-         INTEGER, INTENT(OUT) :: copy_options
-       END FUNCTION h5pget_copy_object_c
-    END INTERFACE
-    hdferr = h5pget_copy_object_c(ocp_plist_id, copy_options)
-  END SUBROUTINE h5pget_copy_object_f
-
-!****s* H5P/h5pget_data_transform_f 
-! NAME
-!  h5pget_data_transform_f 
-!
-! PURPOSE
-!  Retrieves a data transform expression.
-!
-! INPUTS
-! 
-!  plist_id   - Identifier of the property list or class
-! OUTPUTS
-!  
-!  expression - buffer to hold transform expression
-!  hdferr     - Error code
-!                 Success:  Actual lenght of the expression
-!                           If provided buffer "expression" is 
-!                           smaller, than expression will be 
-!                           truncated to fit into
-!                           provided user buffer
-!  		  Failure: -1
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  March 19, 2008
-!
-! HISTORY
-!
-! Should hdferr return just 0 or 1 and add another arguement for the size?
-! Fortran90 Interface:
-SUBROUTINE h5pget_data_transform_f(plist_id, expression, hdferr, size)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: plist_id         ! Identifier of the property list or class
-    CHARACTER(LEN=*), INTENT(OUT) :: expression    ! Buffer to hold transform expression
-    INTEGER(SIZE_T), INTENT(OUT), OPTIONAL :: size ! Registered size of the transform expression
-    INTEGER, INTENT(OUT) :: hdferr                 ! Error code
-                                                   !  0 on success and -1 on failure
-!***** 
-    INTEGER :: expression_len
-    INTEGER(SIZE_T) :: size_default
-
-
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pget_data_transform_c(plist_id, expression, expression_len, size_default)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_DATA_TRANSFORM_C'::h5pget_data_transform_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: expression
-         INTEGER(HID_T), INTENT(IN) :: plist_id 
-         CHARACTER(LEN=*), INTENT(OUT) :: expression 
-         INTEGER(SIZE_T) :: size_default
-         INTEGER :: expression_len
-       END FUNCTION h5pget_data_transform_c
-    END INTERFACE
-
-    size_default = 0
-    expression_len = LEN(expression)
-
-    hdferr = h5pget_data_transform_c(plist_id, expression, expression_len, size_default)
-
-    IF(present(size)) size = size_default
-
-  END SUBROUTINE h5pget_data_transform_f
-
-!****s* H5P/h5pset_data_transform_f 
-! NAME
-!  h5pset_data_transform_f 
-!
-! PURPOSE
-!  Sets a data transform expression.
-!
-! INPUTS
-! 
-!  plist_id   - Identifier of the property list or class 
-!  expression - Buffer to hold transform expression
-! OUTPUTS
-! 
-!  hdferr     - error code
-!                 Success:  0
-!  		  Failure: -1
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  March 19, 2008
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pset_data_transform_f(plist_id, expression, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: plist_id     ! Identifier of the property list or class
-    CHARACTER(LEN=*), INTENT(IN) :: expression ! Buffer to hold transform expression
-    INTEGER, INTENT(OUT) :: hdferr             ! Error code
-                                               ! 0 on success and -1 on failure
-!***** 
-    INTEGER :: expression_len
-
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pset_data_transform_c(plist_id, expression, expression_len)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_DATA_TRANSFORM_C'::h5pset_data_transform_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: expression
-         INTEGER(HID_T), INTENT(IN) :: plist_id 
-         CHARACTER(LEN=*), INTENT(IN) :: expression
-         INTEGER :: expression_len
-       END FUNCTION h5pset_data_transform_c
-    END INTERFACE
-
-    expression_len = LEN(expression)
-    hdferr = h5pset_data_transform_c(plist_id, expression, expression_len)
-
-  END SUBROUTINE h5pset_data_transform_f
-
-!****s* H5P/H5Pget_local_heap_size_hint_f 
-! NAME
-!  H5Pget_local_heap_size_hint_f 
-!
-! PURPOSE
-!  Queries the local heap size hint for original-style groups.
-!
-! INPUTS
-! 
-!  gcpl_id   - Group creation property list identifier
-! OUTPUTS
-!
-!  size_hint - Hint for size of local heap
-!  hdferr    - Error code
-!               Success:  0
-!  		Failure: -1
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  March 21, 2008
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pget_local_heap_size_hint_f(gcpl_id, size_hint, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: gcpl_id     ! Group creation property list identifier
-    INTEGER(SIZE_T), INTENT(OUT) :: size_hint ! Hint for size of local heap
-    INTEGER, INTENT(OUT) :: hdferr            ! Error code
-                                              ! 0 on success and -1 on failure
-!***** 
-
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pget_local_heap_size_hint_c(gcpl_id, size_hint)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_LOCAL_HEAP_SIZE_HINT_C'::h5pget_local_heap_size_hint_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: gcpl_id
-         INTEGER(SIZE_T), INTENT(OUT) :: size_hint
-       END FUNCTION H5Pget_local_heap_size_hint_c
-    END INTERFACE
-
-    hdferr = H5Pget_local_heap_size_hint_c(gcpl_id, size_hint)
-
-  END SUBROUTINE h5pget_local_heap_size_hint_f
-
-!****s* H5P/H5Pget_est_link_info_f 
-! NAME
-!  H5Pget_est_link_info_f 
-!
-! PURPOSE
-!  Queries data required to estimate required local heap or object header size.
-!
-! INPUTS
-! 
-!  gcpl_id         - Group creation property list identifier
-! OUTPUTS
-!  
-!  est_num_entries - Estimated number of links to be inserted into group
-!  est_name_len    - Estimated average length of link names
-!  hdferr	   - Error code
-!                     Success:  0
-!  		      Failure: -1
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  March 21, 2008
-!
-! HISTORY
-!
-! 
-! Fortran90 Interface:
-  SUBROUTINE h5pget_est_link_info_f(gcpl_id, est_num_entries, est_name_len, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: gcpl_id   ! Group creation property list identifier  
-    INTEGER, INTENT(OUT) :: est_num_entries ! Estimated number of links to be inserted into group
-    INTEGER, INTENT(OUT) :: est_name_len    ! Estimated average length of link names
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-                                            ! 0 on success and -1 on failure
-!***** 
-
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pget_est_link_info_c(gcpl_id, est_num_entries, est_name_len)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_EST_LINK_INFO_C'::h5pget_est_link_info_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: gcpl_id  
-         INTEGER, INTENT(OUT) :: est_num_entries
-         INTEGER, INTENT(OUT) :: est_name_len
-       END FUNCTION h5pget_est_link_info_c
-    END INTERFACE
-
-    hdferr = h5pget_est_link_info_c(gcpl_id, est_num_entries, est_name_len)
-
-  END SUBROUTINE h5pget_est_link_info_f
-
-!****s* H5P/H5Pset_local_heap_size_hint_f 
-! NAME
-!  H5Pset_local_heap_size_hint_f 
-!
-! PURPOSE
-!  Sets the local heap size hint for original-style groups.
-!
-! INPUTS
-! 
-!  gcpl_id   - Group creation property list identifier
-!  size_hint - Hint for size of local heap
-! OUTPUTS
-!
-!  hdferr    - Error code
-!               Success:  0
-!  		Failure: -1
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  March 21, 2008
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pset_local_heap_size_hint_f(gcpl_id, size_hint, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: gcpl_id    ! Group creation property list identifier
-    INTEGER(SIZE_T), INTENT(IN) :: size_hint ! Hint for size of local heap
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-                                             ! 0 on success and -1 on failure
-!***** 
-
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pset_local_heap_size_hint_c(gcpl_id, size_hint)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_LOCAL_HEAP_SIZE_HINT_C'::h5pset_local_heap_size_hint_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: gcpl_id
-         INTEGER(SIZE_T), INTENT(IN) :: size_hint
-       END FUNCTION h5pset_local_heap_size_hint_c
-    END INTERFACE
-
-    hdferr = H5Pset_local_heap_size_hint_c(gcpl_id, size_hint)
-
-  END SUBROUTINE h5pset_local_heap_size_hint_f
-
-!****s* H5P/h5pset_est_link_info_f 
-! NAME
-!  h5pset_est_link_info_f 
-!
-! PURPOSE
-!  Sets estimated number of links and length of link names in a group.
-!
-! INPUTS
-! 
-! gcpl_id         - Group creation property list identifier  
-! est_num_entries - Estimated number of links to be inserted into group
-! est_name_len    - Estimated average length of link names
-! OUTPUTS
-!
-!  hdferr	  - Error code
-!                    Success:  0
-!  		     Failure: -1
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  March 21, 2008
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pset_est_link_info_f(gcpl_id, est_num_entries, est_name_len, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: gcpl_id  ! Group creation property list identifier  
-    INTEGER, INTENT(IN) :: est_num_entries ! Estimated number of links to be inserted into group
-    INTEGER, INTENT(IN) :: est_name_len    ! Estimated average length of link names
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-                                           ! 0 on success and -1 on failure
-!***** 
-
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pset_est_link_info_c(gcpl_id, est_num_entries, est_name_len)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_EST_LINK_INFO_C'::h5pset_est_link_info_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: gcpl_id  
-         INTEGER, INTENT(IN) :: est_num_entries
-         INTEGER, INTENT(IN) :: est_name_len
-       END FUNCTION h5pset_est_link_info_c
-    END INTERFACE
-
-    hdferr = H5Pset_est_link_info_c(gcpl_id, est_num_entries, est_name_len)
-
-  END SUBROUTINE h5pset_est_link_info_f
-
-!****s* H5P/h5pset_link_phase_change_f
-! NAME
-!  h5pset_link_phase_change_f
-!
-! PURPOSE
-!  Sets the parameters for conversion between compact and dense groups.
-!
-! INPUTS
-!  
-!  gcpl_id         - Group creation property list identifier  
-!  max_compact     - Maximum number of attributes to be stored in compact storage
-!  min_dense       - Minimum number of attributes to be stored in dense storage
-! OUTPUTS
-!
-!  hdferr          - error code		
-!	              Success:  0
-!	              Failure: -1   
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  March 21, 2008
-!
-! Fortran90 Interface:
-SUBROUTINE h5pset_link_phase_change_f(gcpl_id, max_compact, min_dense, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: gcpl_id ! Group creation property list identifier
-    INTEGER, INTENT(IN) :: max_compact    ! Maximum number of attributes to be stored in compact storage
-    INTEGER, INTENT(IN) :: min_dense      ! Minimum number of attributes to be stored in dense storage
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code
-                                          ! 0 on success and -1 on failure
-!***** 
-!
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pset_link_phase_change_c(gcpl_id, max_compact, min_dense)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_LINK_PHASE_CHANGE_C'::h5pset_link_phase_change_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: gcpl_id
-         INTEGER, INTENT(IN) :: max_compact
-         INTEGER, INTENT(IN) :: min_dense
-
-       END FUNCTION h5pset_link_phase_change_c
-    END INTERFACE
-
-    hdferr = h5pset_link_phase_change_c(gcpl_id, max_compact, min_dense)
-  END SUBROUTINE h5pset_link_phase_change_f
-
-!****s* H5P/h5pset_fapl_direct_f
-! NAME
-!  h5pset_fapl_direct_f
-!
-! PURPOSE
-!  Sets up use of the direct I/O driver.
-!
-! INPUTS
-!  
-!  fapl_id 	- File access property list identifier
-!  alignment 	- Required memory alignment boundary
-!  block_size   - File system block size
-!  cbuf_size 	- Copy buffer size
-! OUTPUTS
-!
-!  hdferr       - error code		
-!                  Success:  0
-!                  Failure: -1   
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  March 21, 2008
-!
-! Fortran90 Interface:
-SUBROUTINE h5pset_fapl_direct_f(fapl_id, alignment, block_size, cbuf_size, hdferr)
-    IMPLICIT NONE  
-    INTEGER(HID_T), INTENT(IN) :: fapl_id     ! File access property list identifier
-    INTEGER(SIZE_T), INTENT(IN) :: alignment  ! Required memory alignment boundary!
-    INTEGER(SIZE_T), INTENT(IN) :: block_size ! File system block size
-    INTEGER(SIZE_T), INTENT(IN) :: cbuf_size  ! Copy buffer size
-    INTEGER, INTENT(OUT) :: hdferr            ! Error code
-                                              ! 0 on success and -1 on failure
-!***** 
-!
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pset_fapl_direct_c(fapl_id, alignment, block_size, cbuf_size)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_FAPL_DIRECT_C'::h5pset_fapl_direct_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: fapl_id 
-         INTEGER(SIZE_T), INTENT(IN) :: alignment
-         INTEGER(SIZE_T), INTENT(IN) :: block_size
-         INTEGER(SIZE_T), INTENT(IN) :: cbuf_size
-       END FUNCTION h5pset_fapl_direct_c
-    END INTERFACE
-
-    hdferr = H5Pset_fapl_direct_c(fapl_id, alignment, block_size, cbuf_size)
-  END SUBROUTINE h5pset_fapl_direct_f
-
-!****s* H5P/h5pget_fapl_direct_f
-! NAME
-!  h5pget_fapl_direct_f
-!
-! PURPOSE
-!  Gets up use of the direct I/O driver.
-!
-! INPUTS
-!  
-!  fapl_id 	- File access property list identifier
-! OUTPUTS
-!
-!  alignment 	- Required memory alignment boundary
-!  block_size   - File system block size
-!  cbuf_size 	- Copy buffer size
-!  hdferr       - error code		
-!                  Success:  0
-!                  Failure: -1   
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  March 21, 2008
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pget_fapl_direct_f(fapl_id, alignment, block_size, cbuf_size, hdferr)
-    IMPLICIT NONE  
-    INTEGER(HID_T), INTENT(IN) :: fapl_id       ! File access property list identifier
-    INTEGER(SIZE_T), INTENT(OUT) :: alignment   ! Required memory alignment boundary!
-    INTEGER(SIZE_T), INTENT(OUT) :: block_size  ! File system block size
-    INTEGER(SIZE_T), INTENT(OUT) :: cbuf_size   ! Copy buffer size
-    INTEGER, INTENT(OUT) :: hdferr              ! Error code
-                                                ! 0 on success and -1 on failure
-!***** 
-!
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pget_fapl_direct_c(fapl_id, alignment, block_size, cbuf_size)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_FAPL_DIRECT_C'::h5pget_fapl_direct_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: fapl_id 
-         INTEGER(SIZE_T), INTENT(OUT) :: alignment
-         INTEGER(SIZE_T), INTENT(OUT) :: block_size
-         INTEGER(SIZE_T), INTENT(OUT) :: cbuf_size
-       END FUNCTION h5pget_fapl_direct_c
-    END INTERFACE
-
-    hdferr = H5Pget_fapl_direct_c(fapl_id, alignment, block_size, cbuf_size)
-  END SUBROUTINE h5pget_fapl_direct_f
-
-!****s* H5P/H5Pset_attr_phase_change_f
-! NAME
-!  H5Pset_attr_phase_change_f 
-!
-! PURPOSE
-!  Sets attribute storage phase change thresholds.
-!
-! INPUTS
-!  
-!  ocpl_id - Object (dataset or group) creation property list identifier
-! OUTPUTS
-!  
-!  max_compact     - Maximum number of attributes to be stored in compact storage
-!                    (Default: 8)
-!  min_dense       - Minimum number of attributes to be stored in dense storage
-!                    (Default: 6)
-!  hdferr          - Error code		
-!	              Success:  0
-!	              Failure: -1   
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  January, 2008
-!
-! Fortran90 Interface:
-SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: ocpl_id ! Object (dataset or group) creation property list identifier
-    INTEGER, INTENT(IN) :: max_compact    ! Maximum number of attributes to be stored in compact storage
-                                          !(Default: 8)
-    INTEGER, INTENT(IN) :: min_dense      ! Minimum number of attributes to be stored in dense storage
-                                          ! (Default: 6)
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code
-                                          ! 0 on success and -1 on failure
-!***** 
-!
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pset_attr_phase_change_c(ocpl_id, max_compact, min_dense)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_ATTR_PHASE_CHANGE_C'::h5pset_attr_phase_change_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: ocpl_id
-         INTEGER, INTENT(IN) :: max_compact
-         INTEGER, INTENT(IN) :: min_dense
-
-       END FUNCTION h5pset_attr_phase_change_c
-    END INTERFACE
-
-    hdferr = h5pset_attr_phase_change_c(ocpl_id, max_compact, min_dense)
-
-
-  END SUBROUTINE h5pset_attr_phase_change_f
-
-!****s* H5P/H5Pset_nbit_f
-! NAME
-!  H5Pset_nbit_f 
-!
-! PURPOSE
-!  Sets up the use of the N-Bit filter.
-!
-! Inputs:
-!  plist_id - Dataset creation property list identifier.
-!
-! Outputs:
-!  hdferr   - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  March 21, 2008
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pset_nbit_f(plist_id, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN)  :: plist_id
-    INTEGER       , INTENT(OUT) :: hdferr
-!*****
-    INTERFACE
-       INTEGER FUNCTION H5Pset_nbit_c(plist_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_NBIT_C'::h5pset_nbit_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: plist_id
-       END FUNCTION H5Pset_nbit_c
-    END INTERFACE
-
-    hdferr = H5Pset_nbit_c(plist_id)
-
-  END SUBROUTINE h5pset_nbit_f
-
-!****s* H5P/h5pset_scaleoffset_f
-! NAME
-!  h5pset_scaleoffset_f 
-!
-! PURPOSE
-!  Sets up the use of the scale-offset filter.
-!
-! Inputs:
-!  plist_id     - Dataset creation property list identifier.
-!  scale_type   - Flag indicating compression method. Valid values:
-!                    H5Z_SO_FLOAT_DSCALE_F
-!                    H5Z_SO_FLOAT_ESCALE_F
-!                    H5Z_SO_INT_F
-!
-!  scale_factor - Parameter related to scale.
-!
-! Outputs:
-!  hdferr       - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  March 21, 2008
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pset_scaleoffset_f(plist_id, scale_type, scale_factor, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN)  :: plist_id
-    INTEGER       , INTENT(IN)  :: scale_type
-    INTEGER       , INTENT(IN)  :: scale_factor
-    INTEGER       , INTENT(OUT) :: hdferr
-!***** 
-
-    INTERFACE
-       INTEGER FUNCTION h5pset_scaleoffset_c(plist_id, scale_type, scale_factor)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_SCALEOFFSET_C'::h5pset_scaleoffset_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: plist_id
-         INTEGER, INTENT(IN) :: scale_type
-         INTEGER, INTENT(IN) :: scale_factor
-       END FUNCTION h5pset_scaleoffset_c
-    END INTERFACE
-
-    hdferr = H5Pset_scaleoffset_c(plist_id, scale_type, scale_factor)
-
-  END SUBROUTINE h5pset_scaleoffset_f
-
-!****s* H5P/h5pset_nlinks_f 
-! NAME
-!  h5pset_nlinks_f 
-!
-! PURPOSE
-!  Sets maximum number of soft or user-defined link traversals.
-!
-! INPUTS
-! 
-!  lapl_id - File access property list identifier
-!   nlinks - Maximum number of links to traverse
-!
-! OUTPUTS
-!
-!  hdferr  - Error code
-!             Success:  0
-!  	      Failure: -1
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  March 24, 2008
-!
-! HISTORY
-!
-! 
-! Fortran90 Interface:
-  SUBROUTINE h5pset_nlinks_f(lapl_id, nlinks, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: lapl_id ! File access property list identifier
-    INTEGER(SIZE_T), INTENT(IN) :: nlinks ! Maximum number of links to traverse
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code   
-                                          ! 0 on success and -1 on failure
-!*****      
-
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pset_nlinks_c(lapl_id, nlinks)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_NLINKS_C'::h5pset_nlinks_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: lapl_id
-         INTEGER(SIZE_T), INTENT(IN) :: nlinks
-       END FUNCTION h5pset_nlinks_c
-    END INTERFACE
-
-    hdferr = h5pset_nlinks_c(lapl_id, nlinks)
-
-  END SUBROUTINE h5pset_nlinks_f
-
-!****s* H5P/h5pget_nlinks_f 
-! NAME
-!  h5pget_nlinks_f 
-!
-! PURPOSE
-!  Gets maximum number of soft or user-defined link traversals.
-!
-! INPUTS
-! 
-!  lapl_id - File access property list identifier
-!  nlinks  - Maximum number of links to traverse
-!
-! OUTPUTS
-!
-!  hdferr  - error code
-!             Success:  0
-!  	      Failure: -1
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  March 24, 2008
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pget_nlinks_f(lapl_id, nlinks, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: lapl_id  ! File access property list identifier
-    INTEGER(SIZE_T), INTENT(OUT) :: nlinks ! Maximum number of links to traverse
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-                                           ! 0 on success and -1 on failure
-!***** 
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-    INTERFACE
-       INTEGER FUNCTION h5pget_nlinks_c(lapl_id, nlinks)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_NLINKS_C'::h5pget_nlinks_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: lapl_id
-         INTEGER(SIZE_T), INTENT(OUT) :: nlinks
-       END FUNCTION h5pget_nlinks_c
-    END INTERFACE
-
-    hdferr = h5pget_nlinks_c(lapl_id, nlinks)
-
-  END SUBROUTINE h5pget_nlinks_f
-
-!****s* H5P/H5Pget_create_inter_group_f
-! NAME
-!  H5Pget_create_inter_group_f
-!
-! PURPOSE
-!  Determines whether property is set to enable creating missing intermediate groups.
-!
-! INPUTS
-!  
-!  lcpl_id            - Link creation property list identifier
-!  crt_intermed_group - Specifying whether to create intermediate groups upon 
-!                       the creation of an object
-! OUTPUTS
-!
-!  hdferr	      - Error code		
-!  		 	 Success:  0
-!  		 	 Failure: -1   
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  April 4, 2008
-!
-! HISTORY
-! 	
-! The long subroutine name (>31) on older f90 compilers causes problems
-!          so the name was shortened
-! Fortran90 Interface:
-  SUBROUTINE h5pget_create_inter_group_f(lcpl_id, crt_intermed_group, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: lcpl_id      ! Link creation property list identifier
-    INTEGER, INTENT(IN) :: crt_intermed_group  ! Flag specifying whether to create intermediate groups
-                                               ! upon creation of an object
-    INTEGER, INTENT(OUT) :: hdferr             ! Error code
-                                               ! 0 on success and -1 on failure
-!***** 
-    INTERFACE
-       INTEGER FUNCTION h5pget_create_inter_group_c(lcpl_id, crt_intermed_group)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_CREATE_INTER_GROUP_C'::h5pget_create_inter_group_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: lcpl_id
-         INTEGER, INTENT(IN) :: crt_intermed_group
-       END FUNCTION h5pget_create_inter_group_c
-    END INTERFACE
-
-    hdferr = h5pget_create_inter_group_c(lcpl_id, crt_intermed_group)
-
-  END SUBROUTINE h5pget_create_inter_group_f
-
-!****s* H5P/H5Pset_chunk_cache_f
-! NAME
-!  H5Pset_chunk_cache_f
-!
-! PURPOSE
-!  Set the number of objects in the meta data cache and the
-!  maximum number of chunks and bytes in the raw data chunk cache.
-!  Once set, these values will override the values in the file access
-!  property list.  Each of these values can be individually unset
-!  (or not set at all) by passing the macros:
-!    H5D_CHUNK_CACHE_NSLOTS_DFLT_F,
-!    H5D_CHUNK_CACHE_NBYTES_DFLT_F, and/or
-!    H5D_CHUNK_CACHE_W0_DFLT_F
-!    as appropriate.
-!
-!  The RDCC_W0 value should be between 0 and 1 inclusive and
-!  indicates how much chunks that have been fully read or fully
-!  written are favored for preemption.  A value of zero means
-!  fully read or written chunks are treated no differently than
-!  other chunks (the preemption is strictly LRU) while a value
-!  of one means fully read chunks are always preempted before
-!  other chunks.
-!
-! INPUTS
-!  
-!  dapl_id          - Dataset access property list identifier.
-!  rdcc_nslots      - The number of chunk slots in the raw data chunk cache for this dataset.
-!  rdcc_nbytes      - The total size of the raw data chunk cache for this dataset.
-!  rdcc_w0          - The chunk preemption policy for this dataset.
-! OUTPUTS
-!
-!  hdferr	    - Error code		
-!  		 	Success:  0
-!  		 	Failure: -1   
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  April 13, 2009
-!
-! HISTORY
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pset_chunk_cache_f(dapl_id, rdcc_nslots, rdcc_nbytes, rdcc_w0, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dapl_id      ! Dataset access property list identifier.
-    INTEGER(SIZE_T), INTENT(IN) :: rdcc_nslots ! The number of chunk slots in the raw data 
-                                               ! chunk cache for this dataset.
-    INTEGER(SIZE_T), INTENT(IN) :: rdcc_nbytes ! The total size of the raw data chunk cache 
-                                               ! for this dataset.
-    REAL, INTENT(IN) :: rdcc_w0                ! The chunk preemption policy for this dataset.
-    INTEGER, INTENT(OUT) :: hdferr             ! Error code
-                                               ! 0 on success and -1 on failure
-!*****       
-
-    INTERFACE
-       INTEGER FUNCTION h5pset_chunk_cache_c(dapl_id, rdcc_nslots, rdcc_nbytes, rdcc_w0)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_CHUNK_CACHE_C'::h5pset_chunk_cache_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dapl_id
-         INTEGER(SIZE_T), INTENT(IN) :: rdcc_nslots
-         INTEGER(SIZE_T), INTENT(IN) :: rdcc_nbytes
-         REAL, INTENT(IN) :: rdcc_w0
-       END FUNCTION h5pset_chunk_cache_c
-    END INTERFACE
-
-    hdferr = h5pset_chunk_cache_c(dapl_id, rdcc_nslots, rdcc_nbytes, rdcc_w0)
-
-  END SUBROUTINE h5pset_chunk_cache_f
-
-!****s* H5P/H5Pget_chunk_cache_f
-! NAME
-!  H5Pget_chunk_cache_f
-!
-! PURPOSE
-!  Retrieves the maximum possible number of elements in the meta
-!  data cache and the maximum possible number of elements and
-!  bytes and the RDCC_W0 value in the raw data chunk cache.  Any
-!  (or all) arguments may be null pointers in which case the
-!  corresponding datum is not returned.  If these properties have
-!  not been set on this property list, the default values for a
-!  file access property list are returned.
-!
-! INPUTS
-!  
-!  dapl_id            - Dataset access property list identifier.
-! OUTPUTS
-! 
-!  rdcc_nslots        - Number of chunk slots in the raw data chunk cache hash table. 
-!  rdcc_nbytes        - Total size of the raw data chunk cache, in bytes. 
-!  rdcc_w0            - Preemption policy. 
-!  hdferr	      - Error code		
-!  		 	 Success:  0
-!  		 	 Failure: -1   
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  April 13, 2009
-!
-! HISTORY
-!
-! Fortran90 Interface:
-  SUBROUTINE h5pget_chunk_cache_f(dapl_id, rdcc_nslots, rdcc_nbytes, rdcc_w0, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dapl_id       ! Dataset access property list identifier.
-    INTEGER(SIZE_T), INTENT(OUT) :: rdcc_nslots ! Number of chunk slots in the raw data chunk cache hash table.
-    INTEGER(SIZE_T), INTENT(OUT) :: rdcc_nbytes ! Total size of the raw data chunk cache, in bytes. 
-    REAL, INTENT(OUT) :: rdcc_w0                ! Preemption policy.
-    INTEGER, INTENT(OUT) :: hdferr              ! Error code:
-                                                ! 0 on success and -1 on failure
-!*****    
-    INTERFACE
-       INTEGER FUNCTION h5pget_chunk_cache_c(dapl_id, rdcc_nslots, rdcc_nbytes, rdcc_w0)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_CHUNK_CACHE_C'::h5pget_chunk_cache_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dapl_id
-         INTEGER(SIZE_T), INTENT(OUT) :: rdcc_nslots
-         INTEGER(SIZE_T), INTENT(OUT) :: rdcc_nbytes
-         REAL, INTENT(OUT) :: rdcc_w0
-       END FUNCTION h5pget_chunk_cache_c
-    END INTERFACE
-
-    hdferr = h5pget_chunk_cache_c(dapl_id, rdcc_nslots, rdcc_nbytes, rdcc_w0)
-
-  END SUBROUTINE h5pget_chunk_cache_f
-
-END MODULE H5P
-
-
-
diff --git a/fortran/src/H5Pff_F03.f90 b/fortran/src/H5Pff_F03.f90
deleted file mode 100644
index 01d1d98..0000000
--- a/fortran/src/H5Pff_F03.f90
+++ /dev/null
@@ -1,1267 +0,0 @@
-!****h* ROBODoc/H5P (F03)
-!
-! NAME
-!  H5P_PROVISIONAL
-!
-! PURPOSE
-!  This file contains Fortran 90 and Fortran 2003 interfaces for H5P functions.
-!  It contains the same functions as H5Pff_F90.f90 but includes the
-!  Fortran 2003 functions and the interface listings. This file will be compiled
-!  instead of H5Pff_F90.f90 if Fortran 2003 functions are enabled.
-!
-! COPYRIGHT
-!  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!  Copyright by The HDF Group.                                               *
-!  Copyright by the Board of Trustees of the University of Illinois.         *
-!  All rights reserved.                                                      *
-!  *
-!  This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!  terms governing use, modification, and redistribution, is contained in    *
-!  the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!  of the source code distribution tree; Copyright.html can be found at the  *
-!  root level of an installed copy of the electronic HDF5 document set and   *
-!  is linked from the top-level documents page.  It can also be found at     *
-!  http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!  access to either file, you may request a copy from help@hdfgroup.org.     *
-!  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! NOTES
-!                         *** IMPORTANT ***
-!  If you add a new H5P function you must add the function name to the
-!  Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
-!  This is needed for Windows based operating systems.
-!
-!*****
-
-MODULE H5P_PROVISIONAL
-
-  USE H5GLOBAL
-
-  INTERFACE h5pset_fill_value_f
-     MODULE PROCEDURE h5pset_fill_value_integer
-     MODULE PROCEDURE h5pset_fill_value_real
-     MODULE PROCEDURE h5pset_fill_value_char
-     ! Recommended procedure:
-     MODULE PROCEDURE h5pset_fill_value_ptr
-
-  END INTERFACE
-
-  INTERFACE h5pget_fill_value_f
-     MODULE PROCEDURE h5pget_fill_value_integer
-     MODULE PROCEDURE h5pget_fill_value_real
-     MODULE PROCEDURE h5pget_fill_value_char
-     ! Recommended procedure:
-     MODULE PROCEDURE h5pget_fill_value_ptr
-
-  END INTERFACE
-
-  INTERFACE h5pset_f
-     MODULE PROCEDURE h5pset_integer
-     MODULE PROCEDURE h5pset_real
-     MODULE PROCEDURE h5pset_char
-     ! Recommended procedure:
-     MODULE PROCEDURE h5pset_ptr
-
-  END INTERFACE
-
-  INTERFACE h5pget_f
-     MODULE PROCEDURE h5pget_integer
-     MODULE PROCEDURE h5pget_real
-     MODULE PROCEDURE h5pget_char
-     ! Recommended procedure:
-     MODULE PROCEDURE h5pget_ptr
-  END INTERFACE
-
-  INTERFACE h5pregister_f
-     MODULE PROCEDURE h5pregister_integer
-     MODULE PROCEDURE h5pregister_real
-     MODULE PROCEDURE h5pregister_char
-     ! Recommended procedure:
-     MODULE PROCEDURE h5pregister_ptr
-  END INTERFACE
-
-  INTERFACE h5pinsert_f
-     MODULE PROCEDURE h5pinsert_integer
-     MODULE PROCEDURE h5pinsert_real
-     MODULE PROCEDURE h5pinsert_char
-     ! Recommended procedure:
-     MODULE PROCEDURE h5pinsert_ptr
-  END INTERFACE
-
-  INTERFACE
-     INTEGER FUNCTION h5pget_fill_value_c(prp_id, type_id, fillvalue) &
-          BIND(C, NAME='h5pget_fill_value_c')
-       USE H5GLOBAL
-       USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_ptr
-       INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier
-       INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier of
-                                             ! of fillvalue datatype
-                                             ! (in memory)
-       TYPE(C_PTR), VALUE :: fillvalue       ! Fillvalue
-     END FUNCTION h5pget_fill_value_c
-  END INTERFACE
-
-  INTERFACE
-     INTEGER FUNCTION h5pset_fill_value_c(prp_id, type_id, fillvalue) &
-          BIND(C, NAME='h5pset_fill_value_c')
-       USE H5GLOBAL
-       USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_ptr
-       INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier
-       INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier of
-                                             ! of fillvalue datatype
-                                             ! (in memory)
-       TYPE(C_PTR), VALUE :: fillvalue       ! Fillvalue
-     END FUNCTION h5pset_fill_value_c
-  END INTERFACE
-
-  INTERFACE
-     INTEGER FUNCTION h5pset_c(prp_id, name, name_len, value) &
-          BIND(C, NAME='h5pset_c')
-       USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_char, c_ptr
-       USE H5GLOBAL
-       INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier
-       CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name  ! Name of property to modify
-       INTEGER :: name_len
-       TYPE(C_PTR), VALUE :: value ! Property value
-     END FUNCTION h5pset_c
-  END INTERFACE
-
-  INTERFACE
-     INTEGER FUNCTION h5pget_c(prp_id, name, name_len, value) &
-          BIND(C, NAME='h5pget_c')
-       USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_char, c_ptr
-       USE H5GLOBAL
-       INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier
-       CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name  ! Name of property to modify
-       INTEGER :: name_len
-       TYPE(C_PTR), VALUE :: value ! Property value
-     END FUNCTION h5pget_c
-  END INTERFACE
-
-  INTERFACE
-     INTEGER FUNCTION h5pregister_c(class, name, name_len, size, value) &
-          BIND(C, NAME='h5pregister_c')
-       USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_char, c_ptr
-       USE H5GLOBAL
-       INTEGER(HID_T), INTENT(IN) :: class
-       CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
-       INTEGER, INTENT(IN)         :: name_len
-       INTEGER(SIZE_T), INTENT(IN) :: size
-       TYPE(C_PTR), INTENT(IN), VALUE :: value
-     END FUNCTION h5pregister_c
-  END INTERFACE
-
-  INTERFACE
-     INTEGER FUNCTION h5pinsert_c(plist, name, name_len, size, value) &
-          BIND(C, NAME='h5pinsert_c')
-       USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_char, c_ptr
-       USE H5GLOBAL
-       INTEGER(HID_T), INTENT(IN) :: plist
-       CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
-       INTEGER, INTENT(IN)         :: name_len
-       INTEGER(SIZE_T), INTENT(IN) :: size
-       TYPE(C_PTR), INTENT(IN), VALUE :: value
-     END FUNCTION h5pinsert_c
-  END INTERFACE
-
-CONTAINS
-
-!
-!****s* H5P (F03)/h5pset_fill_value_f_F90
-!
-! NAME
-!  h5pset_fill_value_f
-!
-! PURPOSE
-!  Sets fill value for a dataset creation property list
-!
-! Inputs:
-!  prp_id    - Property list identifier
-!  type_id   - Datatype identifier of fill value datatype (in memory)
-!  fillvalue - Fillvalue
-!
-! Outputs:
-!  hdferr    - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 14, 2001
-!
-!  Added the recommended way of passing fillvalue
-!  and that is by passing the C address, all other
-!  ways are obsolete and should be avoided. June, 2008 MSB
-!
-! NOTES
-!  h5pset(get)fill_value_f function is overloaded to support
-!  INTEGER, REAL, DOUBLE PRECISION and CHARACTER dtatypes.
-!
-! Fortran90 Interface:
-!!  SUBROUTINE h5pset_fill_value_f(prp_id, type_id, fillvalue, hdferr) 
-!!    IMPLICIT NONE
-!!    INTEGER(HID_T), INTENT(IN)  :: prp_id
-!!    INTEGER(HID_T), INTENT(IN)  :: type_id
-!!    TYPE(VOID)    , INTENT(IN)  :: fillvalue
-!!    INTEGER       , INTENT(OUT) :: hdferr
-!*****
-
-
-  SUBROUTINE h5pset_fill_value_integer(prp_id, type_id, fillvalue, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier
-    INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier of
-                                          ! of fillvalue datatype
-                                          ! (in memory)
-    INTEGER, INTENT(IN), TARGET :: fillvalue   ! Fillvalue
-    INTEGER, INTENT(OUT) :: hdferr  ! Error code
-    TYPE(C_PTR) :: f_ptr ! C address
-
-    f_ptr = C_LOC(fillvalue)
-
-    hdferr = h5pset_fill_value_c(prp_id, type_id, f_ptr)
-
-  END SUBROUTINE h5pset_fill_value_integer
-!
-!****s* H5P (F03)/h5pget_fill_value_f_F90
-!
-! NAME
-!  h5pget_fill_value_f
-!
-! PURPOSE
-!  Gets fill value for a dataset creation property list
-!
-! Inputs:
-!  prp_id    - Property list identifier
-!  type_id   - Datatype identifier of fill value datatype (in memory)
-!
-! Outputs:
-!  fillvalue - Fillvalue
-!  hdferr    - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 14, 2001
-!
-!  Added the recommended way of passing fillvalue
-!  and that is by passing the C address, all other
-!  ways are obsolete and should be avoided. June, 2008 MSB
-!
-! NOTES
-!  h5pget(get)fill_value_f function is overloaded to support
-!  INTEGER, REAL, DOUBLE PRECISION and CHARACTER dtatypes.
-!
-! Fortran90 Interface:
-!!  SUBROUTINE h5pget_fill_value_f(prp_id, type_id, fillvalue, hdferr)
-!!    INTEGER(HID_T), INTENT(IN)  :: prp_id 
-!!    INTEGER(HID_T), INTENT(IN)  :: type_id
-!!    TYPE(VOID)    , INTENT(OUT) :: fillvalue
-!!    INTEGER       , INTENT(OUT) :: hdferr
-!*****
-
-  SUBROUTINE h5pget_fill_value_integer(prp_id, type_id, fillvalue, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier
-    INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier of
-                                          ! of fillvalue datatype
-                                          ! (in memory)
-    INTEGER, INTENT(OUT), TARGET :: fillvalue ! Fillvalue
-    INTEGER, INTENT(OUT) :: hdferr            ! Error code
-    TYPE(C_PTR) :: f_ptr                      ! C address
-
-    f_ptr = C_LOC(fillvalue)
-
-    hdferr = h5pget_fill_value_c(prp_id, type_id, f_ptr)
-
-  END SUBROUTINE h5pget_fill_value_integer
-
-
-  SUBROUTINE h5pset_fill_value_real(prp_id, type_id, fillvalue, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier
-    INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier of
-                                          ! of fillvalue datatype
-                                          ! (in memory)
-    REAL, INTENT(IN), TARGET :: fillvalue ! Fillvalue
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code
-    TYPE(C_PTR) :: f_ptr                  ! C address
-
-    f_ptr = C_LOC(fillvalue)
-
-    hdferr = h5pset_fill_value_c(prp_id, type_id, f_ptr)
-
-  END SUBROUTINE h5pset_fill_value_real
-
-
-  SUBROUTINE h5pget_fill_value_real(prp_id, type_id, fillvalue, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier
-    INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier of
-                                          ! of fillvalue datatype
-                                          ! (in memory)
-    REAL, INTENT(OUT), TARGET :: fillvalue  ! Fillvalue
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-    TYPE(C_PTR) :: f_ptr                    ! C address
-
-    f_ptr = C_LOC(fillvalue)
-
-    hdferr = h5pget_fill_value_c(prp_id, type_id, f_ptr)
-
-  END SUBROUTINE h5pget_fill_value_real
-
-  SUBROUTINE h5pset_fill_value_char(prp_id, type_id, fillvalue, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier
-    INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier of
-                                          ! of fillvalue datatype
-                                          ! (in memory)
-    CHARACTER, INTENT(IN), TARGET :: fillvalue ! Fillvalue
-    INTEGER, INTENT(OUT) :: hdferr             ! Error code
-    TYPE(C_PTR) :: f_ptr                       ! C address
-
-    f_ptr = C_LOC(fillvalue)
-
-    hdferr = h5pset_fill_value_c(prp_id, type_id, f_ptr)
-
-  END SUBROUTINE h5pset_fill_value_char
-
-  SUBROUTINE h5pget_fill_value_char(prp_id, type_id, fillvalue, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier
-    INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier of
-                                          ! of fillvalue datatype
-                                          ! (in memory)
-    CHARACTER, INTENT(OUT) :: fillvalue   ! Fillvalue
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code
-
-    INTEGER :: i
-    CHARACTER(LEN=1), ALLOCATABLE, DIMENSION(:), TARGET :: chr
-    INTEGER :: chr_len
-
-    TYPE(C_PTR) :: f_ptr ! C address
-    ! To resolve Issue #1 outlined in the preamble of this file we
-    ! need to pack the character string into an array.
-
-    chr_len = LEN(fillvalue)
-    ALLOCATE(chr(1:chr_len), STAT=hdferr)
-    IF (hdferr .NE. 0) THEN
-       hdferr = -1
-       RETURN
-    ENDIF
-
-    f_ptr = C_LOC(chr(1)(1:1))
-
-    hdferr = h5pget_fill_value_c(prp_id, type_id, f_ptr)
-
-    DO i = 1, chr_len
-       fillvalue(i:i) = chr(i)
-    ENDDO
-    DEALLOCATE(chr)
-
-  END SUBROUTINE h5pget_fill_value_char
-!
-!****s* H5P (F03)/h5pset_fill_value_f_F03
-!
-! NAME
-!  h5pset_fill_value_f
-!
-! PURPOSE
-!  Sets fill value for a dataset creation property list
-!
-! Inputs:
-!  prp_id    - Property list identifier
-!  type_id   - Datatype identifier of fill value datatype (in memory)
-!  fillvalue - Fillvalue
-!
-! Outputs:
-!  hdferr    - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 14, 2001
-!
-!  Added the recommended way of passing fillvalue
-!  and that is by passing the C address, all other
-!  ways are obsolete and should be avoided. June, 2008 MSB
-!
-! NOTES
-!  h5pset(get)fill_value_f function is overloaded to support
-!  INTEGER, REAL, DOUBLE PRECISION and CHARACTER dtatypes.
-!
-! Fortran2003 Interface:
-!!  SUBROUTINE h5pset_fill_value_f(prp_id, type_id, fillvalue, hdferr)
-!!    INTEGER(HID_T), INTENT(IN)  :: prp_id 
-!!    INTEGER(HID_T), INTENT(IN)  :: type_id
-!!    TYPE(C_PTR)   , INTENT(IN)  :: fillvalue
-!!    INTEGER       , INTENT(OUT) :: hdferr
-!*****
-
-  SUBROUTINE h5pset_fill_value_ptr(prp_id, type_id, fillvalue, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id    ! Property list identifier
-    INTEGER(HID_T), INTENT(IN) :: type_id   ! Datatype identifier of
-                                            ! of fillvalue datatype
-                                            ! (in memory)
-    TYPE(C_PTR), INTENT(IN)    :: fillvalue ! Fillvalue
-    INTEGER, INTENT(OUT)       :: hdferr    ! Error code
-
-    hdferr = h5pset_fill_value_c(prp_id, type_id, fillvalue)
-
-  END SUBROUTINE h5pset_fill_value_ptr
-
-!
-!****s* H5P (F03)/h5pget_fill_value_f_F03
-!
-! NAME
-!  h5pget_fill_value_f
-!
-! PURPOSE
-!  Gets fill value for a dataset creation property list
-!
-! Inputs:
-!  prp_id    - Property list identifier
-!  type_id   - Datatype identifier of fill value datatype (in memory)
-!
-! Outputs:
-!  fillvalue - Fillvalue
-!  hdferr    - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 14, 2001
-!
-!  Added the recommended way of passing fillvalue
-!  and that is by passing the C address, all other
-!  ways are obsolete and should be avoided. June, 2008 MSB
-!
-! NOTES
-!  h5pget(get)fill_value_f function is overloaded to support
-!  INTEGER, REAL, DOUBLE PRECISION and CHARACTER dtatypes.
-!
-! Fortran2003 Interface:
-!!  SUBROUTINE h5pget_fill_value_f(prp_id, type_id, fillvalue, hdferr)
-!!    INTEGER(HID_T), INTENT(IN)  :: prp_id 
-!!    INTEGER(HID_T), INTENT(IN)  :: type_id
-!!    TYPE(C_PTR)   , INTENT(OUT) :: fillvalue
-!!    INTEGER       , INTENT(OUT) :: hdferr
-!*****
-
-  SUBROUTINE h5pget_fill_value_ptr(prp_id, type_id, fillvalue, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier
-    INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier of
-                                          ! of fillvalue datatype
-                                          ! (in memory)
-    TYPE(C_PTR), INTENT(OUT) :: fillvalue ! Fillvalue
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code
-
-    hdferr = h5pget_fill_value_c(prp_id, type_id, fillvalue)
-
-  END SUBROUTINE h5pget_fill_value_ptr
-
-!
-!****s* H5P (F03)/h5pset_f_F90
-!
-! NAME
-!  h5pset_f
-!
-! PURPOSE
-!  Sets a property list value
-!
-! Inputs:
-!  prp_id  - Property list identifier to modify
-!  name    - Name of property to modify
-!  value   - Property value, supported types are:
-!             INTEGER
-!             REAL
-!             DOUBLE PRECISION
-!             CHARACTER(LEN=*)
-! Outputs:
-!  hdferr  - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  October 9, 2002
-!
-! Fortran90 Interface:
-!!  SUBROUTINE h5pset_f(plid, name, value, hdferr)
-!!    INTEGER(HID_T)  , INTENT(IN)  :: plid
-!!    CHARACTER(LEN=*), INTENT(IN)  :: name
-!!    TYPE            , INTENT(IN)  :: value
-!!    INTEGER         , INTENT(OUT) :: hdferr
-!*****
-  SUBROUTINE h5pset_integer(prp_id, name, value, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id   ! Property list identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of property to modify
-    INTEGER,   INTENT(IN), TARGET :: value ! Property value
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-
-    INTEGER :: name_len
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(value)
-
-    name_len = LEN(name)
-    hdferr = h5pget_c(prp_id, name, name_len, f_ptr)
-
-  END SUBROUTINE h5pset_integer
-
-  SUBROUTINE h5pset_real(prp_id, name, value, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name ! Name of property to modify
-    REAL,   INTENT(IN), TARGET :: value  ! Property value
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code
-    INTEGER :: name_len
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(value)
-
-    name_len = LEN(name)
-    hdferr = h5pget_c(prp_id, name, name_len, f_ptr)
-
-  END SUBROUTINE h5pset_real
-
-  SUBROUTINE h5pset_char(prp_id, name, value, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id    ! Property list identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name    ! Name of property to modify
-    CHARACTER(LEN=*),   INTENT(IN) :: value ! Property value
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-    INTEGER :: name_len
-
-    INTEGER :: i
-    CHARACTER(LEN=1), ALLOCATABLE, DIMENSION(:), TARGET :: chr
-    INTEGER :: chr_len
-
-    TYPE(C_PTR) :: f_ptr
-    ! To resolve Issue #1 outlined in the preamble of this file we
-    ! need to pack the character string into an array.
-
-    chr_len = LEN(value)
-    ALLOCATE(chr(1:chr_len), STAT=hdferr)
-    IF (hdferr .NE. 0) THEN
-       hdferr = -1
-       RETURN
-    ENDIF
-
-    DO i = 1, chr_len
-       chr(i) = value(i:i)
-    ENDDO
-
-    f_ptr = C_LOC(chr(1)(1:1))
-
-    name_len = LEN(name)
-    hdferr = h5pget_c(prp_id, name, name_len, f_ptr)
-
-    DEALLOCATE(chr)
-
-  END SUBROUTINE h5pset_char
-!
-!****s* H5P (F03)/h5pget_f_F90
-!
-! NAME
-!  h5pget_f
-!
-! PURPOSE
-!  Queries the value of a property.
-!
-! Inputs:
-!  prp_id  - Property list identifier to modify
-!  name    - Name of property to get
-!  value   - Property value, supported types are:
-!             INTEGER
-!             REAL
-!             DOUBLE PRECISION
-!             CHARACTER(LEN=*)
-! Outputs:
-!  hdferr  - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  October 9, 2002
-!
-! Fortran90 Interface:
-!!  SUBROUTINE h5pget_f(plid, name, value, hdferr)
-!!    INTEGER(HID_T)  , INTENT(IN)  :: plid
-!!    CHARACTER(LEN=*), INTENT(IN)  :: name
-!!    TYPE            , INTENT(OUT) :: value
-!!    INTEGER         , INTENT(OUT) :: hdferr
-!*****
-
-  SUBROUTINE h5pget_integer(prp_id, name, value, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id    ! Property list identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name    ! Name of property to modify
-    INTEGER,   INTENT(OUT), TARGET :: value ! Property value
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-    INTEGER :: name_len
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(value)
-
-    name_len = LEN(name)
-    hdferr = h5pget_c(prp_id, name, name_len, f_ptr)
-
-  END SUBROUTINE h5pget_integer
-
-  SUBROUTINE h5pget_real(prp_id, name, value, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name ! Name of property to modify
-    REAL,   INTENT(OUT), TARGET :: value ! Property value
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code
-    INTEGER :: name_len
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(value)
-
-    name_len = LEN(name)
-    hdferr = h5pget_c(prp_id, name, name_len, f_ptr)
-  END SUBROUTINE h5pget_real
-
-  SUBROUTINE h5pget_char(prp_id, name, value, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id   ! Property list identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of property to modify
-    CHARACTER(LEN=*), INTENT(OUT) :: value ! Property value
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-    INTEGER :: name_len
-
-    INTEGER :: i
-    CHARACTER(LEN=1), ALLOCATABLE, DIMENSION(:), TARGET :: chr
-    INTEGER :: chr_len
-    TYPE(C_PTR) :: f_ptr
-
-    chr_len = LEN(value)
-    ALLOCATE(chr(1:chr_len), STAT=hdferr)
-    IF (hdferr .NE. 0) THEN
-       hdferr = -1
-       RETURN
-    ENDIF
-    f_ptr = C_LOC(chr(1)(1:1))
-
-    name_len = LEN(name)
-    hdferr = h5pget_c(prp_id, name, name_len, f_ptr)
-
-    DO i = 1, chr_len
-       value(i:i) = chr(i)
-    ENDDO
-
-    DEALLOCATE(chr)
-
-  END SUBROUTINE h5pget_char
-
-
-!
-!****s* H5P (F03)/h5pset_f_F03
-!
-! NAME
-!  h5pset_f
-!
-! PURPOSE
-!  Sets a property list value
-!
-! Inputs:
-!  prp_id  - Property list identifier to modify
-!  name    - Name of property to modify
-!  value   - Pointer to value to set the property to
-! Outputs:
-!  hdferr  - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  October 9, 2002
-!
-! Fortran2003 Interface:
-!!  SUBROUTINE h5pset_f(plid, name, value, hdferr)
-!!    INTEGER(HID_T)  , INTENT(IN)  :: plid
-!!    CHARACTER(LEN=*), INTENT(IN)  :: name
-!!    TYPE(C_PTR)     , INTENT(IN)  :: value
-!!    INTEGER         , INTENT(OUT) :: hdferr
-!*****
-  SUBROUTINE h5pset_ptr(prp_id, name, value, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name  ! Name of property to modify
-    TYPE(C_PTR), INTENT(IN) :: value      ! Property value
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code
-    INTEGER :: name_len
-
-    name_len = LEN(name)
-    hdferr = h5pset_c(prp_id, name, name_len, value)
-
-  END SUBROUTINE h5pset_ptr
-!
-!****s* H5P (F03)/h5pget_f_F03
-!
-! NAME
-!  h5pget_f (F03)
-!
-! PURPOSE
-!  Queries the value of a property.
-!
-! Inputs:
-!  prp_id  - Property list identifier to modify
-!  name    - Name of property to get
-!  value   - Pointer to a location to which to copy the value of of the property
-! Outputs:
-!  hdferr  - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  October 9, 2002
-!
-! Fortran2003 Interface:
-!!  SUBROUTINE h5pget_f(plid, name, value, hdferr)
-!!    INTEGER(HID_T)  , INTENT(IN)  :: plid
-!!    CHARACTER(LEN=*), INTENT(IN)  :: name
-!!    TYPE(C_PTR)     , INTENT(OUT) :: value
-!!    INTEGER         , INTENT(OUT) :: hdferr
-!*****
-  SUBROUTINE h5pget_ptr(prp_id, name, value, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name  ! Name of property to modify
-    TYPE(C_PTR), INTENT(OUT) :: value     ! Property value
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code
-    INTEGER :: name_len
-
-    name_len = LEN(name)
-    hdferr = h5pget_c(prp_id, name, name_len, value)
-
-  END SUBROUTINE h5pget_ptr
-
-
-!
-!****s* H5P (F03)/h5pregister_f_F90
-!
-! NAME
-!  h5pregister
-!
-! PURPOSE
-!  Registers a permanent property with a property list class.
-!
-! Inputs:
-!  class  - Property list class identifier
-!  name   - Name of property to register
-!  size   - Size of the property value
-!  value  - Property value, supported types are:
-!             INTEGER
-!             REAL
-!             DOUBLE PRECISION
-!             CHARACTER(LEN=*)
-!
-! Outputs:
-!  hdferr - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  October 10, 2002
-!
-! Fortran90 Interface:
-!!  SUBROUTINE h5pregister_f(class, name, size, value, hdferr)
-!!    INTEGER(HID_T)  , INTENT(IN)  :: class
-!!    CHARACTER(LEN=*), INTENT(IN)  :: name
-!!    INTEGER(SIZE_T) , INTENT(IN)  :: size
-!!    TYPE            , INTENT(IN)  :: value
-!!    INTEGER         , INTENT(OUT) :: hdferr  
-!*****
-  SUBROUTINE h5pregister_integer(class, name, size, value, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: class    ! Property list class identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of property to register
-    INTEGER(SIZE_T), INTENT(IN) :: size    ! Size of the property value
-    INTEGER,   INTENT(IN), TARGET :: value ! Property value
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-    INTEGER :: name_len
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(value)
-
-    name_len = LEN(name)
-    hdferr = h5pregister_c(class, name, name_len, size, f_ptr)
-
-  END SUBROUTINE h5pregister_integer
-
-  SUBROUTINE h5pregister_real(class, name, size, value, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: class   ! Property list class identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name  ! Name of property to register
-    INTEGER(SIZE_T), INTENT(IN) :: size   ! size of the property value
-    REAL,   INTENT(IN), TARGET :: value   ! Property value
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code
-    INTEGER :: name_len
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(value)
-
-    name_len = LEN(name)
-    hdferr = h5pregister_c(class, name, name_len, size, f_ptr)
-
-  END SUBROUTINE h5pregister_real
-
-  SUBROUTINE h5pregister_char(class, name, size, value, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: class     ! Property list class identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name    ! Name of property to register
-    INTEGER(SIZE_T), INTENT(IN) :: size     ! size of the property value
-    CHARACTER(LEN=*),   INTENT(IN) :: value ! Property value
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-    INTEGER :: name_len
-
-    INTEGER :: i
-    CHARACTER(LEN=1), ALLOCATABLE, DIMENSION(:), TARGET :: chr
-    INTEGER :: chr_len
-
-    TYPE(C_PTR) :: f_ptr
-    ! To resolve Issue #1 outlined in the preamble of this file we
-    ! need to pack the character string into an array.
-
-    chr_len = LEN(value)
-    ALLOCATE(chr(1:chr_len), STAT=hdferr)
-    IF (hdferr .NE. 0) THEN
-       hdferr = -1
-       RETURN
-    ENDIF
-
-    DO i = 1, chr_len
-       chr(i) = value(i:i)
-    ENDDO
-
-    f_ptr = C_LOC(chr(1)(1:1))
-
-    name_len = LEN(name)
-    hdferr = h5pregister_c(class, name, name_len, size, f_ptr)
-    DEALLOCATE(chr)
-  END SUBROUTINE h5pregister_char
-!
-!****s* H5P (F03)/h5pregister_f_F03
-!
-! NAME
-!  h5pregister (F03)
-!
-! PURPOSE
-!  Registers a permanent property with a property list class.
-!
-! Inputs:
-!  class  - Property list class identifier
-!  name   - Name of property to register
-!  size   - Size of the property value
-!  value  - Pointer to value to set the property to
-!
-! Outputs:
-!  hdferr - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  June 24, 2008
-!
-! Fortran2003 Interface:
-!!  SUBROUTINE h5pregister_f(class, name, size, value, hdferr)
-!!    INTEGER(HID_T)  , INTENT(IN)  :: class
-!!    CHARACTER(LEN=*), INTENT(IN)  :: name
-!!    INTEGER(SIZE_T) , INTENT(IN)  :: size
-!!    TYPE(C_PTR)     , INTENT(IN)  :: value
-!!    INTEGER         , INTENT(OUT) :: hdferr  
-!*****
-
-  SUBROUTINE h5pregister_ptr(class, name, size, value, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: class   ! Property list class identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name  ! Name of property to register
-    INTEGER(SIZE_T), INTENT(IN) :: size   ! Size of the property value
-    TYPE(C_PTR), INTENT(IN) :: value      ! Property value
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code
-    INTEGER :: name_len
-
-    name_len = LEN(name)
-    hdferr = h5pregister_c(class, name, name_len, size, value)
-  END SUBROUTINE h5pregister_ptr
-
-!
-!****s* H5P (F03)/h5pinsert_f_F90
-!
-! NAME
-!  h5pinsert  (f90)
-!
-! PURPOSE
-!  Registers a temporary property with a property list class.
-!
-! Inputs:
-!  plist  - Property list class identifier
-!  name   - Name of property to insert
-!  size   - Size of the property value
-!  value  - Property value, supported types are:
-!             INTEGER
-!             REAL
-!             DOUBLE PRECISION
-!             CHARACTER(LEN=*)
-! Outputs:
-!  hdferr - Returns 0 if successful and -1 if fails
-! AUTHOR
-!  Elena Pourmal
-!  October 10, 2002
-!
-! Fortran90 Interface:
-!!  SUBROUTINE h5pinsert_f
-!!    INTEGER(HID_T)  , INTENT(IN)  :: plist
-!!    CHARACTER(LEN=*), INTENT(IN)  :: name
-!!    INTEGER(SIZE_T) , INTENT(IN)  :: size
-!!    TYPE            , INTENT(IN)  :: value
-!!    INTEGER         , INTENT(OUT) :: hdferr
-!*****
-  SUBROUTINE h5pinsert_integer(plist, name, size, value, hdferr)
-    USE iso_c_binding
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: plist    ! Property list identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of property to insert
-    INTEGER(SIZE_T), INTENT(IN) :: size    ! Size of the property value
-    INTEGER,   INTENT(IN), TARGET :: value ! Property value
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-    INTEGER :: name_len
-    TYPE(c_ptr) :: f_ptr
-
-    f_ptr = c_loc(value)
-
-    name_len = LEN(name)
-    hdferr = h5pinsert_c(plist, name , name_len, size, f_ptr)
-  END SUBROUTINE h5pinsert_integer
-
-  SUBROUTINE h5pinsert_real(plist, name, size, value, hdferr)
-    USE iso_c_binding
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: plist   ! Property list identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name  ! Name of property to insert
-    INTEGER(SIZE_T), INTENT(IN) :: size   ! Size of the property value
-    REAL,   INTENT(IN), TARGET :: value   ! Property value
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code
-    INTEGER :: name_len
-    TYPE(c_ptr) :: f_ptr
-
-    f_ptr = c_loc(value)
-
-    name_len = LEN(name)
-    hdferr = h5pinsert_c(plist, name , name_len, size, f_ptr)
-
-  END SUBROUTINE h5pinsert_real
-
-  SUBROUTINE h5pinsert_char(plist, name, size, value, hdferr)
-    USE iso_c_binding
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: plist      ! Property list identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name     ! Name of property to insert
-    INTEGER(SIZE_T), INTENT(IN) :: size      ! Size of property value
-    CHARACTER(LEN=*),   INTENT(IN) :: value  ! Property value
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-    INTEGER :: name_len
-
-    INTEGER :: i
-    CHARACTER(LEN=1), ALLOCATABLE, DIMENSION(:), TARGET :: chr
-    INTEGER :: chr_len
-
-    TYPE(c_ptr) :: f_ptr
-    ! To resolve Issue #1 outlined in the preamble of this file we
-    ! need to pack the character string into an array.
-
-    chr_len = LEN(value)
-    ALLOCATE(chr(1:chr_len), STAT=hdferr)
-    IF (hdferr .NE. 0) THEN
-       hdferr = -1
-       RETURN
-    ENDIF
-
-    DO i = 1, chr_len
-       chr(i) = value(i:i)
-    ENDDO
-
-    f_ptr = C_LOC(chr(1)(1:1))
-
-    name_len = LEN(name)
-    hdferr = h5pinsert_c(plist, name , name_len, size, f_ptr)
-
-    DEALLOCATE(chr)
-
-  END SUBROUTINE h5pinsert_char
-
-!
-!****s* H5P (F03)/h5pinsert_f_F03
-!
-! NAME
-!  h5pinsert  (f03)
-!
-! PURPOSE
-!  Registers a temporary property with a property list class.
-!
-! Inputs:
-!  plist  - Property list class identifier
-!  name   - Name of property to insert
-!  size   - Size of the property value
-!  value  - Pointer to new value pointer for the property being modified
-!
-! Outputs:
-!  hdferr - Returns 0 if successful and -1 if fails
-!
-! AUTHOR 
-!  M. Scot Breitenfeld
-!  June 24, 2008
-!
-! Fortran90 Interface:
-!!  SUBROUTINE h5pinsert_f
-!!    INTEGER(HID_T)  , INTENT(IN)  :: plist
-!!    CHARACTER(LEN=*), INTENT(IN)  :: name
-!!    INTEGER(SIZE_T) , INTENT(IN)  :: size
-!!    TYPE(C_PTR)     , INTENT(IN)  :: value
-!!    INTEGER         , INTENT(OUT) :: hdferr
-!*****
-  SUBROUTINE h5pinsert_ptr(plist, name, size, value, hdferr)
-    USE iso_c_binding
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: plist  ! Property list identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name ! Name of property to insert
-    INTEGER(SIZE_T), INTENT(IN) :: size  ! Size of property value
-    TYPE(c_ptr),   INTENT(IN) :: value   ! Property value
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code
-    INTEGER :: name_len
-
-    name_len = LEN(name)
-    hdferr = h5pinsert_c(plist, name , name_len, size, value)
-  END SUBROUTINE h5pinsert_ptr
-!
-!****s* H5P (F03)/h5pcreate_class_f_F03
-!
-! NAME
-!  h5pcreate_class_f
-!
-! PURPOSE
-!  Create a new property list class
-!
-! Inputs:
-!  parent  - Parent property list class identifier
-!            Possible values include:
-!              H5P_ROOT_F
-!              H5P_FILE_CREATE_F
-!              H5P_FILE_ACCESS_F
-!              H5P_DATASET_CREATE_F
-!              H5P_DATASET_XFER_F
-!              H5P_FILE_MOUNT_F
-!  name    - Name of property to create
-!
-! Outputs:
-!  class   - Property list class identifier
-!  hdferr  - Returns 0 if successful and -1 if fails
-!
-! Optional parameters:
-!  H5P_cls_create_func_t (create) - Callback routine called when a property list is created
-!  create_data 	                  - User pointer to any class creation information needed
-!  H5P_cls_copy_func_t   (copy)   - Callback routine called when a property list is copied
-!  copy_data 	                  - User pointer to any class copy information needed
-!  H5P_cls_close_func_t  (close)  - Callback routine called when a property list is being closed
-!  close_data 	                  - User pointer to any class close information needed
-!
-! AUTHOR
-!  Elena Pourmal
-!  October 9, 2002
-!
-! HISTORY
-!  Added callback arguments
-!  M. Scot Breitenfeld, July 3, 2008
-!
-! Fortran2003 Interface:
-  SUBROUTINE h5pcreate_class_f(parent, name, class, hdferr, create, create_data, copy, copy_data, close, close_data)
-    USE iso_c_binding
-    IMPLICIT NONE
-    INTEGER(HID_T)  , INTENT(IN)  :: parent
-    CHARACTER(LEN=*), INTENT(IN)  :: name
-    INTEGER(HID_T)  , INTENT(OUT) :: class
-    INTEGER         , INTENT(OUT) :: hdferr
-    TYPE(C_PTR)     , OPTIONAL    :: create_data, copy_data, close_data
-    TYPE(C_FUNPTR)  , OPTIONAL    :: create, copy, close
-!*****
-    INTEGER :: name_len
-    TYPE(C_PTR) :: create_data_default, copy_data_default, close_data_default
-    TYPE(C_FUNPTR) :: create_default, copy_default, close_default
-    INTERFACE
-       INTEGER FUNCTION h5pcreate_class_c(parent, name, name_len, class, &
-            create, create_data, copy, copy_data, close, close_data) &
-          BIND(C, NAME='h5pcreate_class_c')
-         USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_char, c_ptr, c_funptr
-         USE H5GLOBAL
-         INTEGER(HID_T), INTENT(IN) :: parent
-         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
-         INTEGER, INTENT(IN)         :: name_len
-         INTEGER(HID_T), INTENT(OUT) :: class
-         TYPE(C_PTR), VALUE :: create_data, copy_data, close_data
-         TYPE(C_FUNPTR), VALUE :: create, copy, close
-       END FUNCTION h5pcreate_class_c
-    END INTERFACE
-    name_len = LEN(name)
-
-    create_default = c_null_funptr     !fix:scot
-    create_data_default = c_null_ptr
-    copy_default = c_null_funptr    !fix:scot
-    copy_data_default = c_null_ptr
-    close_default = c_null_funptr   !fix:scot
-    close_data_default = c_null_ptr
-
-    IF(PRESENT(create)) create_default = create
-    IF(PRESENT(create_data)) create_data_default = create_data
-    IF(PRESENT(copy)) copy_default = copy
-    IF(PRESENT(copy_data)) copy_data_default = copy_data
-    IF(PRESENT(close)) close_default = close
-    IF(PRESENT(close_data)) close_data_default = close_data
-
-    hdferr = h5pcreate_class_c(parent, name , name_len, class, &
-         create_default, create_data_default, &
-         copy_default, copy_data_default, &
-         close_default, close_data_default)
-
-  END SUBROUTINE h5pcreate_class_f
-
-!
-!****s* H5P (F03)/h5pset_file_image_f_F03
-!
-! NAME
-!  h5pset_file_image_f
-!
-! PURPOSE
-!  Sets an initial file image in a memory buffer.
-!
-! Inputs:
-!  fapl_id - File access property list identifier
-!  buf_ptr - Pointer to the initial file image, 
-!            or C_NULL_PTR if no initial file image is desired
-!  buf_len - Size of the supplied buffer, or 0 (zero) if no initial image is desired
-!
-! Outputs:
-!  hdferr  - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  February 19, 2012
-!
-! Fortran2003 Interface:
-  SUBROUTINE h5pset_file_image_f(fapl_id, buf_ptr, buf_len, hdferr)
-    USE iso_c_binding
-    IMPLICIT NONE
-    INTEGER(HID_T) , INTENT(IN)  :: fapl_id
-    TYPE(C_PTR)    , INTENT(IN)  :: buf_ptr
-    INTEGER(SIZE_T), INTENT(IN)  :: buf_len
-    INTEGER        , INTENT(OUT) :: hdferr
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5pset_file_image_c(fapl_id, buf_ptr, buf_len) &
-            BIND(C, NAME='h5pset_file_image_c')
-         USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_ptr
-         USE H5GLOBAL
-         INTEGER(HID_T), INTENT(IN) :: fapl_id
-         TYPE(C_PTR), VALUE :: buf_ptr
-         INTEGER(SIZE_T), INTENT(IN)  :: buf_len
-       END FUNCTION h5pset_file_image_c
-    END INTERFACE
-
-    hdferr = h5pset_file_image_c(fapl_id, buf_ptr, buf_len)
-
-  END SUBROUTINE h5pset_file_image_f
-!
-!****s* H5P (F03)/h5pget_file_image_f_F03
-!
-! NAME
-!  h5pget_file_image_f
-!
-! PURPOSE
-!  Retrieves a copy of the file image designated as the initial content and structure of a file. 
-!
-! Inputs:
-!  fapl_id     - File access property list identifier.
-!
-! Outputs:
-!  buf_ptr     - Will hold either a C_NULL_PTR or a scalar of type
-!                c_loc. If buf_ptr is not C_NULL_PTR, on successful
-!                return, buf_ptr shall contain a C pointer to a copy
-!                of the initial image provided in the last call to
-!                H5Pset_file_image_f for the supplied fapl_id, or
-!                buf_ptr shall contain a C_NULL_PTR if there is no
-!                initial image set.
-!
-!  buf_len_ptr - Contains the value of the buffer parameter for
-!                the initial image in the supplied fapl_id. The value
-!                will be 0 if no initial image is set.
-!
-!
-!  hdferr      - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  February 19, 2012
-!
-! Fortran2003 Interface:
-  SUBROUTINE h5pget_file_image_f(fapl_id, buf_ptr, buf_len_ptr, hdferr)
-    USE iso_c_binding
-    IMPLICIT NONE
-    INTEGER(HID_T) , INTENT(IN)                :: fapl_id
-    TYPE(C_PTR)    , INTENT(OUT), DIMENSION(*) :: buf_ptr
-    INTEGER(SIZE_T), INTENT(OUT)               :: buf_len_ptr
-    INTEGER        , INTENT(OUT)               :: hdferr
-    
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5pget_file_image_c(fapl_id, buf_ptr, buf_len_ptr) &
-            BIND(C, NAME='h5pget_file_image_c')
-         USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_ptr
-         USE H5GLOBAL
-         INTEGER(HID_T), INTENT(IN) :: fapl_id
-         TYPE(C_PTR), DIMENSION(*), INTENT(OUT)  :: buf_ptr
-         INTEGER(SIZE_T), INTENT(OUT)  :: buf_len_ptr
-       END FUNCTION h5pget_file_image_c
-    END INTERFACE
-
-    hdferr = h5pget_file_image_c(fapl_id, buf_ptr, buf_len_ptr)
-
-  END SUBROUTINE h5pget_file_image_f
-
-END MODULE H5P_PROVISIONAL
-
diff --git a/fortran/src/H5Pff_F90.f90 b/fortran/src/H5Pff_F90.f90
deleted file mode 100644
index b5ea13d..0000000
--- a/fortran/src/H5Pff_F90.f90
+++ /dev/null
@@ -1,949 +0,0 @@
-!****h* ROBODoc/H5P (_F90)
-!
-! NAME
-!  H5P_PROVISIONAL
-!
-! PURPOSE
-!
-!  This file contains Fortran 90 interfaces for H5P functions. It contains
-!  the same functions as H5Pff_F03.f90 but excludes the Fortran 2003 functions
-!  and the interface listings. This file will be compiled instead of H5Pff_F03.f90
-!  if Fortran 2003 functions are not enabled.
-!
-! COPYRIGHT
-!  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!  Copyright by The HDF Group.                                               *
-!  Copyright by the Board of Trustees of the University of Illinois.         *
-!  All rights reserved.                                                      *
-!  *
-!  This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!  terms governing use, modification, and redistribution, is contained in    *
-!  the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!  of the source code distribution tree; Copyright.html can be found at the  *
-!  root level of an installed copy of the electronic HDF5 document set and   *
-!  is linked from the top-level documents page.  It can also be found at     *
-!  http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!  access to either file, you may request a copy from help@hdfgroup.org.     *
-!  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! NOTES
-!                         *** IMPORTANT ***
-!  If you add a new H5P function you must add the function name to the
-!  Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
-!  This is needed for Windows based operating systems.
-!*****
-
-MODULE H5P_PROVISIONAL
-
-  USE H5GLOBAL
-
-  INTERFACE h5pset_fill_value_f
-     MODULE PROCEDURE h5pset_fill_value_integer
-     MODULE PROCEDURE h5pset_fill_value_real
-     MODULE PROCEDURE h5pset_fill_value_char
-  END INTERFACE
-
-  INTERFACE h5pget_fill_value_f
-     MODULE PROCEDURE h5pget_fill_value_integer
-     MODULE PROCEDURE h5pget_fill_value_real
-     MODULE PROCEDURE h5pget_fill_value_char
-  END INTERFACE
-
-  INTERFACE h5pset_f
-     MODULE PROCEDURE h5pset_integer
-     MODULE PROCEDURE h5pset_real
-     MODULE PROCEDURE h5pset_char
-  END INTERFACE
-
-  INTERFACE h5pget_f
-     MODULE PROCEDURE h5pget_integer
-     MODULE PROCEDURE h5pget_real
-     MODULE PROCEDURE h5pget_char
-  END INTERFACE
-
-  INTERFACE h5pregister_f
-     MODULE PROCEDURE h5pregister_integer
-     MODULE PROCEDURE h5pregister_real
-     MODULE PROCEDURE h5pregister_char
-  END INTERFACE
-
-  INTERFACE h5pinsert_f
-     MODULE PROCEDURE h5pinsert_integer
-     MODULE PROCEDURE h5pinsert_real
-     MODULE PROCEDURE h5pinsert_char
-  END INTERFACE
-
-CONTAINS
-!
-!****s* H5P (F90)/h5pset(get)fill_value_f
-!
-! NAME
-!  h5pset(get)fill_value_f
-!
-! PURPOSE
-!  Sets(gets) fill value for a dataset creation property list
-!
-! INPUTS
-!  prp_id 	 - dataset creation property list identifier
-!  type_id 	 - datatype identifier for fill value
-!  fillvalue 	 - fill value
-! OUTPUTS
-!  type_id	- datatype identifier for fill value
-!  fillvalue	- fill value
-!  hdferr 	- error code
-!                  Success:  0
-!                  Failure: -1
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 14, 2001
-!
-! NOTES
-!  h5pset(get)fill_value_f function is overloaded to support
-!  INTEGER, REAL, DOUBLE PRECISION and CHARACTER dtatypes.
-!
-! SOURCE
-  SUBROUTINE h5pset_fill_value_integer(prp_id, type_id, fillvalue, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier
-    INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier of
-                                          ! of fillvalue datatype
-                                          ! (in memory)
-    INTEGER, INTENT(IN) :: fillvalue      ! Fillvalue
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5pset_fill_value_integer_c(prp_id, type_id, fillvalue)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_FILL_VALUE_INTEGER_C'::h5pset_fill_value_integer_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         INTEGER(HID_T), INTENT(IN) :: type_id
-         INTEGER, INTENT(IN) :: fillvalue
-       END FUNCTION h5pset_fill_value_integer_c
-    END INTERFACE
-
-    hdferr = h5pset_fill_value_integer_c(prp_id, type_id, fillvalue)
-  END SUBROUTINE h5pset_fill_value_integer
-
-
-  SUBROUTINE h5pget_fill_value_integer(prp_id, type_id, fillvalue, &
-       hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
-    INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier of
-                                          ! of fillvalue datatype
-                                          ! (in memory)
-    INTEGER, INTENT(IN) :: fillvalue   ! Fillvalue
-    INTEGER, INTENT(OUT) :: hdferr  ! Error code
-
-    INTERFACE
-       INTEGER FUNCTION h5pget_fill_value_integer_c(prp_id, type_id, fillvalue)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_FILL_VALUE_INTEGER_C'::h5pget_fill_value_integer_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         INTEGER(HID_T), INTENT(IN) :: type_id
-         INTEGER :: fillvalue
-       END FUNCTION h5pget_fill_value_integer_c
-    END INTERFACE
-
-    hdferr = h5pget_fill_value_integer_c(prp_id, type_id, fillvalue)
-  END SUBROUTINE h5pget_fill_value_integer
-
-
-  SUBROUTINE h5pset_fill_value_real(prp_id, type_id, fillvalue, &
-       hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier
-    INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier of
-                                          ! of fillvalue datatype
-                                          ! (in memory)
-    REAL, INTENT(IN) :: fillvalue   ! Fillvalue
-    INTEGER, INTENT(OUT) :: hdferr  ! Error code
-
-    INTERFACE
-       INTEGER FUNCTION h5pset_fill_value_real_c(prp_id, type_id, fillvalue)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_FILL_VALUE_REAL_C'::h5pset_fill_value_real_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         INTEGER(HID_T), INTENT(IN) :: type_id
-         REAL, INTENT(IN) :: fillvalue
-       END FUNCTION h5pset_fill_value_real_c
-    END INTERFACE
-
-    hdferr = h5pset_fill_value_real_c(prp_id, type_id, fillvalue)
-  END SUBROUTINE h5pset_fill_value_real
-
-
-  SUBROUTINE h5pget_fill_value_real(prp_id, type_id, fillvalue, &
-       hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier
-    INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier of
-                                          ! of fillvalue datatype
-                                          ! (in memory)
-    REAL, INTENT(IN) :: fillvalue   ! Fillvalue
-    INTEGER, INTENT(OUT) :: hdferr  ! Error code
-
-    INTERFACE
-       INTEGER FUNCTION h5pget_fill_value_real_c(prp_id, type_id, fillvalue)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_FILL_VALUE_REAL_C'::h5pget_fill_value_real_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         INTEGER(HID_T), INTENT(IN) :: type_id
-         REAL :: fillvalue
-       END FUNCTION h5pget_fill_value_real_c
-    END INTERFACE
-
-    hdferr = h5pget_fill_value_real_c(prp_id, type_id, fillvalue)
-  END SUBROUTINE h5pget_fill_value_real
-
-  SUBROUTINE h5pset_fill_value_char(prp_id, type_id, fillvalue, &
-       hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier
-    INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier of
-                                          ! of fillvalue datatype
-                                          ! (in memory)
-    CHARACTER, INTENT(IN) :: fillvalue    ! Fillvalue
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code
-
-    INTERFACE
-       INTEGER FUNCTION h5pset_fill_valuec_c(prp_id, type_id, fillvalue)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_FILL_VALUEC_C'::h5pset_fill_valuec_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: fillvalue
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         INTEGER(HID_T), INTENT(IN) :: type_id
-         CHARACTER, INTENT(IN) :: fillvalue
-       END FUNCTION h5pset_fill_valuec_c
-    END INTERFACE
-
-    hdferr = h5pset_fill_valuec_c(prp_id, type_id, fillvalue)
-  END SUBROUTINE h5pset_fill_value_char
-
-  SUBROUTINE h5pget_fill_value_char(prp_id, type_id, fillvalue, &
-       hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier
-    INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier of
-                                          ! of fillvalue datatype
-                                          ! (in memory)
-    CHARACTER, INTENT(IN) :: fillvalue    ! Fillvalue
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code
-
-    INTERFACE
-       INTEGER FUNCTION h5pget_fill_valuec_c(prp_id, type_id, fillvalue)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_FILL_VALUEC_C'::h5pget_fill_valuec_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: fillvalue
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         INTEGER(HID_T), INTENT(IN) :: type_id
-         CHARACTER :: fillvalue
-       END FUNCTION h5pget_fill_valuec_c
-    END INTERFACE
-
-    hdferr = h5pget_fill_valuec_c(prp_id, type_id, fillvalue)
-  END SUBROUTINE h5pget_fill_value_char
-!
-!****s* H5P (F90)/h5pset_integer
-!
-! NAME
-!  h5pset_integer
-!
-! PURPOSE
-!  Sets a property list value
-!
-! INPUTS
-!  prp_id 	 - iproperty list identifier to modify
-!  name 	 - name of property to modify
-!  value 	 - value to set property to
-! OUTPUTS
-!  hdferr:	 - error code
-!                   Success:  0
-!                   Failure: -1
-! AUTHOR
-!  Elena Pourmal
-!  October 9, 2002
-!
-! SOURCE
-  SUBROUTINE h5pset_integer(prp_id, name, value, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name  ! Name of property to modify
-    INTEGER, INTENT(IN) :: value          ! Property value
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-    INTEGER :: name_len
-
-    INTERFACE
-       INTEGER FUNCTION h5pset_integer_c(prp_id, name, name_len, value)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_INTEGER_C'::h5pset_integer_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER, INTENT(IN)         :: name_len
-         INTEGER, INTENT(IN) :: value
-       END FUNCTION h5pset_integer_c
-    END INTERFACE
-
-    name_len = LEN(name)
-    hdferr = h5pset_integer_c(prp_id, name , name_len, value)
-  END SUBROUTINE h5pset_integer
-
-!
-!****s* H5P (F90)/h5pset_real
-!
-! NAME
-!  h5pset_real
-!
-! PURPOSE
-!  Sets a property list value
-!
-! INPUTS
-!  prp_id 	 - iproperty list identifier to modify
-!  name 	 - name of property to modify
-!  value 	 - value to set property to
-! OUTPUTS
-!  hdferr:	 - error code
-!                   Success:  0
-!                   Failure: -1
-! AUTHOR
-!  Elena Pourmal
-!  October 9, 2002
-!
-! SOURCE
-  SUBROUTINE h5pset_real(prp_id, name, value, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name  ! Name of property to modify
-    REAL, INTENT(IN) :: value             ! Property value
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-    INTEGER :: name_len
-
-    INTERFACE
-       INTEGER FUNCTION h5pset_real_c(prp_id, name, name_len, value)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_REAL_C'::h5pset_real_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER, INTENT(IN)         :: name_len
-         REAL, INTENT(IN) :: value
-       END FUNCTION h5pset_real_c
-    END INTERFACE
-
-    name_len = LEN(name)
-    hdferr = h5pset_real_c(prp_id, name , name_len, value)
-  END SUBROUTINE h5pset_real
-
-!****s* H5P (F90)/h5pset_char
-!
-! NAME
-!  h5pset_char
-!
-! PURPOSE
-!  Sets a property list value
-!
-! INPUTS
-!  prp_id 	 - iproperty list identifier to modify
-!  name 	 - name of property to modify
-!  value 	 - value to set property to
-! OUTPUTS
-!  hdferr	 - error code
-!                   Success:  0
-!                   Failure: -1
-! OPTIONAL PARAMETERS
-!  NONE
-!
-! AUTHOR
-!  Elena Pourmal
-!  October 9, 2002
-! SOURCE
-  SUBROUTINE h5pset_char(prp_id, name, value, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id    ! Property list identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name    ! Name of property to modify
-    CHARACTER(LEN=*),   INTENT(IN) :: value ! Property value
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-!*****
-    INTEGER :: name_len
-    INTEGER :: value_len
-
-    INTERFACE
-       INTEGER FUNCTION h5psetc_c(prp_id, name, name_len, value, value_len)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSETC_C'::h5psetc_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         !DEC$ATTRIBUTES reference :: value
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER, INTENT(IN)         :: name_len
-         CHARACTER(LEN=*), INTENT(IN) :: value
-         INTEGER, INTENT(IN)         :: value_len
-       END FUNCTION h5psetc_c
-    END INTERFACE
-
-    name_len = LEN(name)
-    value_len = LEN(value)
-    hdferr = h5psetc_c(prp_id, name , name_len, value, value_len)
-  END SUBROUTINE h5pset_char
-
-!****s* H5P (F90)/h5pget_integer
-!
-! NAME
-!  h5pget_integer
-!
-! PURPOSE
-!  Gets a property list value
-!
-! INPUTS
-!  prp_id 	 - iproperty list identifier to modify
-!  name 	 - name of property to modify
-! OUTPUTS
-!  value 	 - value of property
-!  hdferr	 - error code
-!                   Success:  0
-!                   Failure: -1
-! AUTHOR
-!  Elena Pourmal
-!  October 9, 2002
-!
-! SOURCE
-  SUBROUTINE h5pget_integer(prp_id, name, value, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name  ! Name of property to modify
-    INTEGER,   INTENT(OUT) :: value       ! Property value
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-    INTEGER :: name_len
-
-    INTERFACE
-       INTEGER FUNCTION h5pget_integer_c(prp_id, name, name_len, value)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_INTEGER_C'::h5pget_integer_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER, INTENT(IN)         :: name_len
-         INTEGER, INTENT(OUT) :: value
-       END FUNCTION h5pget_integer_c
-    END INTERFACE
-
-    name_len = LEN(name)
-    hdferr = h5pget_integer_c(prp_id, name , name_len, value)
-  END SUBROUTINE h5pget_integer
-
-!
-!****s* H5P (F90)/h5pget_real
-!
-! NAME
-!  h5pget_real
-!
-! PURPOSE
-!  Gets a property list value
-!
-! INPUTS
-!  prp_id 	 - iproperty list identifier to modify
-!  name 	 - name of property to modify
-! OUTPUTS
-!  value 	 - value of property
-!  hdferr	 - error code
-!                   Success:  0
-!                   Failure: -1
-! AUTHOR
-!  Elena Pourmal
-!  October 9, 2002
-! SOURCE
-  SUBROUTINE h5pget_real(prp_id, name, value, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name  ! Name of property to modify
-    REAL,   INTENT(OUT) :: value          ! Property value
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-    INTEGER :: name_len
-
-    INTERFACE
-       INTEGER FUNCTION h5pget_real_c(prp_id, name, name_len, value)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_REAL_C'::h5pget_real_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER, INTENT(IN)         :: name_len
-         REAL, INTENT(OUT) :: value
-       END FUNCTION h5pget_real_c
-    END INTERFACE
-
-    name_len = LEN(name)
-    hdferr = h5pget_real_c(prp_id, name , name_len, value)
-  END SUBROUTINE h5pget_real
-
-!
-!****s* H5P (F90)/h5pget_char
-!
-! NAME
-!  h5pget_char
-!
-! PURPOSE
-!  Gets a property list value
-!
-! INPUTS
-!  prp_id 	 - iproperty list identifier to modify
-!  name 	 - name of property to modify
-! OUTPUTS
-!  value 	 - value of property
-!  hdferr	 - error code
-!                   Success:  0
-!                   Failure: -1
-!
-! AUTHOR
-!  Elena Pourmal
-!  October 9, 2002
-!
-! SOURCE
-  SUBROUTINE h5pget_char(prp_id, name, value, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id     ! Property list identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name     ! Name of property to modify
-    CHARACTER(LEN=*),   INTENT(OUT) :: value ! Property value
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-!*****
-    INTEGER :: name_len
-    INTEGER :: value_len
-
-    INTERFACE
-       INTEGER FUNCTION h5pgetc_c(prp_id, name, name_len, value, value_len)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGETC_C'::h5pgetc_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         !DEC$ATTRIBUTES reference :: value
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER, INTENT(IN)         :: name_len
-         CHARACTER(LEN=*), INTENT(OUT) :: value
-         INTEGER, INTENT(IN)         :: value_len
-       END FUNCTION h5pgetc_c
-    END INTERFACE
-
-    name_len = LEN(name)
-    value_len = LEN(value)
-    hdferr = h5pgetc_c(prp_id, name , name_len, value, value_len)
-  END SUBROUTINE h5pget_char
-
-!
-!****s* H5P (F90)/h5pregister_integer
-!
-! NAME
-!  h5pregister_integer
-!
-! PURPOSE
-!  Registers a permanent property with a property list class.
-!
-! INPUTS
-!  class 	 - property list class to register
-!  permanent property within
-!  name 	 - name of property to register
-!  size 	 - size of property in bytes
-!  value 	 - default value for property in newly
-!  created property lists
-! OUTPUTS
-!  hdferr	 - error code
-!                   Success:  0
-!                   Failure: -1
-!
-! AUTHOR
-!  Elena Pourmal
-!  October 10, 2002
-!
-! SOURCE
-  SUBROUTINE h5pregister_integer(class, name, size, value, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: class   ! Property list class identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name  ! Name of property to register
-    INTEGER(SIZE_T), INTENT(IN) :: size   ! Size of the property value
-    INTEGER,   INTENT(IN) :: value        ! Property value
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-    INTEGER :: name_len
-
-    INTERFACE
-       INTEGER FUNCTION h5pregister_integer_c(class, name, name_len, size, value)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PREGISTER_INTEGER_C'::h5pregister_integer_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         INTEGER(HID_T), INTENT(IN) :: class
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER, INTENT(IN)         :: name_len
-         INTEGER(SIZE_T), INTENT(IN) :: size
-         INTEGER, INTENT(IN) :: value
-       END FUNCTION h5pregister_integer_c
-    END INTERFACE
-
-    name_len = LEN(name)
-    hdferr = h5pregister_integer_c(class, name , name_len, size, value)
-  END SUBROUTINE h5pregister_integer
-
-!****s* H5P (F90)/h5pregister_real
-!
-! NAME
-!
-!  h5pregister_real
-!
-! PURPOSE 	Registers a permanent property with a property list class.
-!
-! INPUTS
-!  class 	 - property list class to register
-!                  permanent property within
-!  name 	 - name of property to register
-!  size 	 - size of property in bytes
-!  value 	 - default value for property in newly
-!                  created property lists
-! OUTPUTS
-!  hdferr	 - error code
-!                   Success:  0
-!                   Failure: -1
-!
-! AUTHOR
-!  Elena Pourmal
-!  October 10, 2002
-! SOURCE
-  SUBROUTINE h5pregister_real(class, name, size, value, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: class   ! Property list class identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name  ! Name of property to register
-    INTEGER(SIZE_T), INTENT(IN) :: size   ! size of the property value
-    REAL,   INTENT(IN) :: value           ! Property value
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-    INTEGER :: name_len
-
-    INTERFACE
-       INTEGER FUNCTION h5pregister_real_c(class, name, name_len, size, value)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PREGISTER_REAL_C'::h5pregister_real_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         INTEGER(HID_T), INTENT(IN) :: class
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER, INTENT(IN)         :: name_len
-         INTEGER(SIZE_T), INTENT(IN) :: size
-         REAL, INTENT(IN) :: value
-       END FUNCTION h5pregister_real_c
-    END INTERFACE
-
-    name_len = LEN(name)
-    hdferr = h5pregister_real_c(class, name , name_len, size, value)
-  END SUBROUTINE h5pregister_real
-
-!
-!****s* H5P (F90)/h5pregister_char
-!
-! NAME
-!  h5pregister_char
-!
-! PURPOSE
-!  Registers a permanent property with a property list class.
-!
-! INPUTS
-!  class 	 - property list class to register
-!                  permanent property within
-!  name 	 - name of property to register
-!  size 	 - size of property in bytes
-!  value 	 - default value for property in newly
-!                  created property lists
-! OUTPUTS
-!  hdferr	 - error code
-!                   Success:  0
-!                   Failure: -1
-! AUTHOR
-!  Elena Pourmal
-!  October 10, 2002
-! SOURCE
-  SUBROUTINE h5pregister_char(class, name, size, value, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: class     ! Property list class identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name    ! Name of property to register
-    INTEGER(SIZE_T), INTENT(IN) :: size     ! size of the property value
-    CHARACTER(LEN=*),   INTENT(IN) :: value ! Property value
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-!*****
-    INTEGER :: name_len
-    INTEGER :: value_len
-
-    INTERFACE
-       INTEGER FUNCTION h5pregisterc_c(class, name, name_len, size, value, &
-            value_len)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PREGISTERC_C'::h5pregisterc_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         !DEC$ATTRIBUTES reference :: value
-         INTEGER(HID_T), INTENT(IN) :: class
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER, INTENT(IN)         :: name_len
-         INTEGER(SIZE_T), INTENT(IN) :: size
-         CHARACTER(LEN=*), INTENT(IN) :: value
-         INTEGER, INTENT(IN)          :: value_len
-       END FUNCTION h5pregisterc_c
-    END INTERFACE
-
-    name_len = LEN(name)
-    value_len = LEN(value)
-    hdferr = h5pregisterc_c(class, name , name_len, size, value, value_len)
-  END SUBROUTINE h5pregister_char
-!
-!****s* H5P (F90)/h5pinsert_integer
-!
-! NAME
-!  h5pinsert_integer
-!
-! PURPOSE
-!  Registers a temporary property with a property list class.
-!
-! INPUTS
-!  plist 	 - property list identifier
-!  name 	 - name of property to insert
-!  size 	 - size of property in bytes
-!  value 	 - initial value for the property
-! OUTPUTS
-!  hdferr	 - error code
-!                   Success:  0
-!                   Failure: -1
-! AUTHOR
-!  Elena Pourmal
-!  October 10, 2002
-! SOURCE
-  SUBROUTINE h5pinsert_integer(plist, name, size, value, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: plist   ! Property list identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name  ! Name of property to insert
-    INTEGER(SIZE_T), INTENT(IN) :: size   ! Size of the property value
-    INTEGER,   INTENT(IN) :: value        ! Property value
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-    INTEGER :: name_len
-
-    INTERFACE
-       INTEGER FUNCTION h5pinsert_integer_c(plist, name, name_len, size, value)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PINSERT_INTEGER_C'::h5pinsert_integer_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         INTEGER(HID_T), INTENT(IN) :: plist
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER, INTENT(IN)         :: name_len
-         INTEGER(SIZE_T), INTENT(IN) :: size
-         INTEGER, INTENT(IN) :: value
-       END FUNCTION h5pinsert_integer_c
-    END INTERFACE
-
-    name_len = LEN(name)
-    hdferr = h5pinsert_integer_c(plist, name , name_len, size, value)
-  END SUBROUTINE h5pinsert_integer
-
-!
-!****s* H5P (F90)/h5pinsert_real
-!
-! NAME
-!  h5pinsert_real
-!
-! PURPOSE
-!  Registers a temporary property with a property list class.
-!
-! INPUTS
-!  plist 	 - property list identifier
-!                  permanent property within
-!  name 	 - name of property to insert
-!  size 	 - size of property in bytes
-!  value 	 - initial value for the property
-! OUTPUTS
-!  hdferr	 - error code
-!                   Success:  0
-!                   Failure: -1
-! AUTHOR
-!  Elena Pourmal
-!  October 10, 2002
-! SOURCE
-  SUBROUTINE h5pinsert_real(plist, name, size, value, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: plist   ! Property list identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name  ! Name of property to insert
-    INTEGER(SIZE_T), INTENT(IN) :: size   ! Size of the property value
-    REAL,   INTENT(IN) :: value           ! Property value
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-    INTEGER :: name_len
-
-    INTERFACE
-       INTEGER FUNCTION h5pinsert_real_c(plist, name, name_len, size, value)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PINSERT_REAL_C'::h5pinsert_real_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         INTEGER(HID_T), INTENT(IN) :: plist
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER, INTENT(IN)         :: name_len
-         INTEGER(SIZE_T), INTENT(IN) :: size
-         REAL, INTENT(IN) :: value
-       END FUNCTION h5pinsert_real_c
-    END INTERFACE
-
-    name_len = LEN(name)
-    hdferr = h5pinsert_real_c(plist, name , name_len, size, value)
-  END SUBROUTINE h5pinsert_real
-
-
-!
-!****s* H5P (F90)/h5pinsert_char
-!
-! NAME
-!  h5pinsert_char
-!
-! PURPOSE
-!  Registers a temporary property with a property list class.
-!
-! INPUTS
-!  plist 	 - property list identifier
-!                  permanent property within
-!  name 	 - name of property to insert
-!  size 	 - size of property in bytes
-!  value 	 - initial value for the property
-! OUTPUTS
-!  hdferr	 - error code
-!                   Success:  0
-!                   Failure: -1
-! AUTHOR
-!  Elena Pourmal
-!  October 10, 2002
-! SOURCE
-SUBROUTINE h5pinsert_char(plist, name, size, value, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: plist      ! Property list identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name     ! Name of property to insert
-    INTEGER(SIZE_T), INTENT(IN) :: size      ! Size of property value
-    CHARACTER(LEN=*),   INTENT(IN) :: value  ! Property value
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-!*****
-    INTEGER :: name_len
-    INTEGER :: value_len
-
-    INTERFACE
-       INTEGER FUNCTION h5pinsertc_c(plist, name, name_len, size, value, value_len)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PINSERTC_C'::h5pinsertc_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         !DEC$ATTRIBUTES reference :: value
-         INTEGER(HID_T), INTENT(IN) :: plist
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER, INTENT(IN)         :: name_len
-         INTEGER(SIZE_T), INTENT(IN) :: size
-         CHARACTER(LEN=*), INTENT(IN) :: value
-         INTEGER, INTENT(IN)         :: value_len
-       END FUNCTION h5pinsertc_c
-    END INTERFACE
-
-    name_len = LEN(name)
-    value_len = LEN(value)
-    hdferr = h5pinsertc_c(plist, name , name_len, size, value, value_len)
-  END SUBROUTINE h5pinsert_char
-
-!
-!****s* H5P (F90)/h5pcreate_class_f
-!
-! NAME
-!  h5pcreate_class_f
-!
-! PURPOSE
-!  Create a new property list class
-!
-! INPUTS
-!  parent 	 - Property list identifier of the parent class
-!                  Possible values include:
-!                    H5P_ROOT_F
-!                    H5P_FILE_CREATE_F
-!                    H5P_FILE_ACCESS_F
-!                    H5P_DATASET_CREATE_F
-!                    H5P_DATASET_XFER_F
-!                    H5P_FILE_MOUNT_F
-!  name 	 - name of the class we are creating
-! OUTPUTS
-!  class 	 - property list class identifier
-!  hdferr	 - error code
-!                   Success: 0
-!                   Failure: -1
-! AUTHOR
-!  Elena Pourmal
-!  October 9, 2002
-!
-! SOURCE
-  SUBROUTINE h5pcreate_class_f(parent, name, class, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: parent  ! parent property list class
-                                          ! identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name  ! name of property tocreate
-    INTEGER(HID_T), INTENT(OUT) :: class  ! property list class identifier
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-    INTEGER :: name_len
-
-    INTERFACE
-       INTEGER FUNCTION h5pcreate_class_f90_c(parent, name, name_len, class)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PCREATE_CLASS_F90_C'::h5pcreate_class_f90_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         INTEGER(HID_T), INTENT(IN) :: parent
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER, INTENT(IN)         :: name_len
-         INTEGER(HID_T), INTENT(OUT) :: class
-       END FUNCTION h5pcreate_class_f90_c
-    END INTERFACE
-
-    name_len = LEN(name)
-    hdferr = h5pcreate_class_f90_c(parent, name, name_len, class)
-
-  END SUBROUTINE h5pcreate_class_f
-
-END MODULE H5P_PROVISIONAL
-
diff --git a/fortran/src/H5Rf.c b/fortran/src/H5Rf.c
index 068f24e..a253b4a 100644
--- a/fortran/src/H5Rf.c
+++ b/fortran/src/H5Rf.c
@@ -1,126 +1,76 @@
 /****h* H5Rf/H5Rf
  * PURPOSE
- *   This file contains C stubs for H5R Fortran APIs
+ *  This file contains C stubs for H5R Fortran APIs
  *
  * COPYRIGHT
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  ******
-*/
+ */
 
 #include "H5f90.h"
 #include "H5Eprivate.h"
 
-/****if* H5Rf/h5rcreate_object_c
- * NAME
- *     h5rcreate_object_c
- * PURPOSE
- *     Call H5Rcreate to create a reference to an object
- * INPUTS
- *     loc_id - file or group identifier
- *       name - name of the dataset
- *    namelen - name length
- * OUTPUTS
- *     ref  - reference to the object
- * RETURNS
- *     0 on success, -1 on failure
- * AUTHOR
- *  Elena Pourmal
- *  Wednesday, December 1, 1999
- * SOURCE
-*/
-int_f
-nh5rcreate_object_c(haddr_t_f *ref, hid_t_f *loc_id, _fcd name, int_f *namelen)
-/******/
-{
-     char *c_name = NULL;
-     hobj_ref_t ref_c;
-     int_f ret_value = 0;
-
-     /*
-      * Convert FORTRAN name to C name
-      */
-     if(NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
-         HGOTO_DONE(FAIL)
-
-     /*
-      * Call H5Rcreate function.
-      */
-     if(H5Rcreate(&ref_c, *loc_id, c_name, H5R_OBJECT, (hid_t)-1) < 0)
-         HGOTO_DONE(FAIL)
-
-     /* Copy the reference created */
-     *ref = (haddr_t_f)ref_c;
-
-done:
-     if(c_name)
-         HDfree(c_name);
-     return ret_value;
-} /* nh5rcreate_object_c() */
-
 /****if* H5Rf/h5rcreate_region_c
  * NAME
- *        h5rcreate_region_c
+ *  h5rcreate_region_c
  * PURPOSE
- *     Call H5Rcreate to create a reference to dataset region
- *              region
+ *  Call H5Rcreate to create a reference to dataset region
+ *  region
  * INPUTS
- *      loc_id - file or group identifier
- *              name - name of the dataset
- *              namelen - name length
- *              space_id - dataset space identifier
+ *  loc_id - file or group identifier
+ *  name - name of the dataset
+ *  namelen - name length
+ *  space_id - dataset space identifier
  * OUTPUTS
- *     ref  - reference to the dataset region
+ *  ref  - reference to the dataset region
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
  *  Wednesday, December 1, 1999
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5rcreate_region_c(int_f *ref, hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *space_id)
+h5rcreate_region_c(int_f *ref, hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *space_id)
 /******/
 {
-     char *c_name = NULL;
-     hdset_reg_ref_t ref_c;
-     int_f ret_value = 0;
+    char           *c_name = NULL;
+    hdset_reg_ref_t ref_c;
+    int_f           ret_value = 0;
 
-     /*
-      * Convert FORTRAN name to C name
-      */
-     if(NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
-         HGOTO_DONE(FAIL)
+    /*
+     * Convert FORTRAN name to C name
+     */
+    if (NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
+        HGOTO_DONE(FAIL)
 
-     /*
-      * Call H5Rcreate function.
-      */
-     if(H5Rcreate(&ref_c, (hid_t)*loc_id, c_name, H5R_DATASET_REGION, (hid_t)*space_id) < 0)
-         HGOTO_DONE(FAIL)
+    /*
+     * Call H5Rcreate function.
+     */
+    if (H5Rcreate(&ref_c, (hid_t)*loc_id, c_name, H5R_DATASET_REGION, (hid_t)*space_id) < 0)
+        HGOTO_DONE(FAIL)
 
-     /* Copy the reference created */
-     HDmemcpy(ref, &ref_c, H5R_DSET_REG_REF_BUF_SIZE);
+    /* Copy the reference created */
+    HDmemcpy(ref, &ref_c, H5R_DSET_REG_REF_BUF_SIZE);
 
 done:
-     if(c_name)
-         HDfree(c_name);
-     return ret_value;
-} /* end nh5rcreate_region_c() */
+    if (c_name)
+        HDfree(c_name);
+    return ret_value;
+} /* end h5rcreate_region_c() */
 
 /****if* H5Rf/h5rcreate_ptr_c
  * NAME
@@ -141,113 +91,31 @@ done:
  *  June 20, 2008
  *
  * SOURCE
-*/
+ */
 int_f
-h5rcreate_ptr_c (void *ref, hid_t_f *loc_id, _fcd name, int_f *namelen, int_f *ref_type, hid_t_f *space_id)
+h5rcreate_ptr_c(void *ref, hid_t_f *loc_id, _fcd name, int_f *namelen, int_f *ref_type, hid_t_f *space_id)
 /******/
 {
-     int ret_value = -1;
-     char *c_name;
-
-     /*
-      * Convert FORTRAN name to C name
-      */
-     c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
-     if (c_name == NULL) return ret_value;
-
-     /*
-      * Call H5Rcreate function.
-      */
-     if(H5Rcreate(ref, (hid_t)*loc_id, c_name, (H5R_type_t)*ref_type, (hid_t)*space_id) >= 0)
-       ret_value = 0;
-
-     HDfree(c_name);
-     return ret_value;
+    int   ret_value = -1;
+    char *c_name;
+
+    /*
+     * Convert FORTRAN name to C name
+     */
+    c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
+    if (c_name == NULL)
+        return ret_value;
+
+    /*
+     * Call H5Rcreate function.
+     */
+    if (H5Rcreate(ref, (hid_t)*loc_id, c_name, (H5R_type_t)*ref_type, (hid_t)*space_id) >= 0)
+        ret_value = 0;
+
+    HDfree(c_name);
+    return ret_value;
 }
 
-/****if* H5Rf/h5rdereference_region_c
- * NAME
- *        h5rdereference_region_c
- * PURPOSE
- *     Call H5Rdereference to dereference to dataset region
- * INPUTS
- *      dset_id - dataset identifier
- *              ref - reference to the dataset region
- * OUTPUTS
- *     obj_id - dereferenced dataset identifier
- * RETURNS
- *     0 on success, -1 on failure
- * AUTHOR
- *  Elena Pourmal
- *  Wednesday, December 1, 1999
- * HISTORY
- *
- * SOURCE
-*/
-int_f
-nh5rdereference_region_c(hid_t_f *dset_id, int_f *ref, hid_t_f *obj_id)
-/******/
-{
-     hdset_reg_ref_t ref_c;
-     hid_t c_obj_id;
-     int_f ret_value = 0;
-
-     /* Copy the reference to dereference */
-     HDmemcpy(&ref_c, ref, H5R_DSET_REG_REF_BUF_SIZE);
-
-     /*
-      * Call H5Rdereference function.
-      */
-     if((c_obj_id = H5Rdereference2((hid_t)*dset_id, H5P_DEFAULT, H5R_DATASET_REGION, &ref_c)) < 0)
-         HGOTO_DONE(FAIL)
-
-     /* Copy the object's ID */
-     *obj_id = (hid_t_f)c_obj_id;
-
-done:
-     return ret_value;
-} /* end nh5rdereference_region_c() */
-
-/****if* H5Rf/h5rdereference_object_c
- * NAME
- *        h5rdereference_object_c
- * PURPOSE
- *     Call H5Rdereference to dereference an object
- * INPUTS
- *      dset_id - dataset identifier
- *              ref - reference to an object
- * OUTPUTS
- *     obj_id - dereferenced  object identifier
- * RETURNS
- *     0 on success, -1 on failure
- * AUTHOR
- *  Elena Pourmal
- *  Wednesday, December 1, 1999
- * HISTORY
- *
- * SOURCE
-*/
-int_f
-nh5rdereference_object_c(hid_t_f *dset_id, haddr_t_f *ref, hid_t_f *obj_id)
-/******/
-{
-     hid_t c_obj_id;
-     hobj_ref_t ref_c = (hobj_ref_t)*ref;
-     int_f ret_value = 0;
-
-     /*
-      * Call H5Rdereference function.
-      */
-     if((c_obj_id = H5Rdereference2((hid_t)*dset_id, H5P_DEFAULT, H5R_OBJECT, &ref_c)) < 0)
-         HGOTO_DONE(FAIL)
-
-     /* Copy the object's ID */
-     *obj_id = (hid_t_f)c_obj_id;
-
-done:
-     return ret_value;
-} /* end nh5rdereference_object_c() */
-
 /****if* H5Rf/h5rdereference_ptr_c
  * NAME
  *  h5rdereference_ptr_c
@@ -255,7 +123,7 @@ done:
  *  Call H5Rdereference
  * INPUTS
  *  obj_id  - Valid identifier for the file containing the
- *            referenced object or any object in that file.
+ *  referenced object or any object in that file.
  *  ref_typ - The reference type of ref.
  *  ref     - Object reference
  * OUTPUTS
@@ -268,22 +136,23 @@ done:
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-h5rdereference_ptr_c (hid_t_f *obj_id, int_f *ref_type, void *ref, hid_t_f *ref_obj_id)
+h5rdereference_ptr_c(hid_t_f *obj_id, int_f *ref_type, void *ref, hid_t_f *ref_obj_id)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_ref_obj_id;
-
-  /*
-   * Call H5Rdereference function.
-   */
-  c_ref_obj_id = H5Rdereference2((hid_t)*obj_id, H5P_DEFAULT, (H5R_type_t)*ref_type, ref);
-  if(c_ref_obj_id < 0) return ret_value;
-  *ref_obj_id = (hid_t_f)c_ref_obj_id;
-  ret_value = 0;
-  return ret_value;
+    int   ret_value = -1;
+    hid_t c_ref_obj_id;
+
+    /*
+     * Call H5Rdereference function.
+     */
+    c_ref_obj_id = H5Rdereference2((hid_t)*obj_id, H5P_DEFAULT, (H5R_type_t)*ref_type, ref);
+    if (c_ref_obj_id < 0)
+        return ret_value;
+    *ref_obj_id = (hid_t_f)c_ref_obj_id;
+    ret_value   = 0;
+    return ret_value;
 }
 
 /****if* H5Rf/h5rget_region_region_object_c
@@ -292,8 +161,8 @@ h5rdereference_ptr_c (hid_t_f *obj_id, int_f *ref_type, void *ref, hid_t_f *ref_
  * PURPOSE
  *  Call H5Rget_region to dereference dataspace region
  * INPUTS
- *   dset_id - dataset identifier
- *       ref - reference to the dataset region
+ *  dset_id - dataset identifier
+ *  ref - reference to the dataset region
  * OUTPUTS
  *  space_id - dereferenced  dataset dataspace identifier
  * RETURNS
@@ -304,30 +173,30 @@ h5rdereference_ptr_c (hid_t_f *obj_id, int_f *ref_type, void *ref, hid_t_f *ref_
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5rget_region_region_c(hid_t_f *dset_id, int_f *ref, hid_t_f *space_id)
+h5rget_region_region_c(hid_t_f *dset_id, int_f *ref, hid_t_f *space_id)
 /******/
 {
-     hid_t c_space_id;
-     hdset_reg_ref_t ref_c;
-     int_f ret_value = 0;
+    hid_t           c_space_id;
+    hdset_reg_ref_t ref_c;
+    int_f           ret_value = 0;
 
-     /* Copy the reference to dereference */
-     HDmemcpy(&ref_c, ref, H5R_DSET_REG_REF_BUF_SIZE);
+    /* Copy the reference to dereference */
+    HDmemcpy(&ref_c, ref, H5R_DSET_REG_REF_BUF_SIZE);
 
-     /*
-      * Call H5Rget_region function.
-      */
-     if((c_space_id = H5Rget_region((hid_t)*dset_id, H5R_DATASET_REGION, &ref_c)) < 0)
-         HGOTO_DONE(FAIL)
+    /*
+     * Call H5Rget_region function.
+     */
+    if ((c_space_id = H5Rget_region((hid_t)*dset_id, H5R_DATASET_REGION, &ref_c)) < 0)
+        HGOTO_DONE(FAIL)
 
-     /* Copy the dataspace ID */
-     *space_id = (hid_t_f)c_space_id;
+    /* Copy the dataspace ID */
+    *space_id = (hid_t_f)c_space_id;
 
 done:
-     return ret_value;
-} /* end nh5rget_region_region_c() */
+    return ret_value;
+} /* end h5rget_region_region_c() */
 
 /****if* H5Rf/h5rget_region_ptr_c
  * NAME
@@ -335,8 +204,8 @@ done:
  * PURPOSE
  *  Call H5Rget_region to dereference dataspace region
  * INPUTS
- *   dset_id - dataset identifier
- *       ref - reference to the dataset region
+ *  dset_id - dataset identifier
+ *  ref - reference to the dataset region
  * OUTPUTS
  *  space_id - dereferenced  dataset dataspace identifier
  * RETURNS
@@ -347,186 +216,67 @@ done:
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
 h5rget_region_ptr_c(hid_t_f *dset_id, void *ref, hid_t_f *space_id)
 /******/
 {
-     hid_t c_space_id;
-     int_f ret_value = 0;
+    hid_t c_space_id;
+    int_f ret_value = 0;
 
-     /*
-      * Call H5Rget_region function.
-      */
-     if((c_space_id = H5Rget_region((hid_t)*dset_id, H5R_DATASET_REGION, ref)) < 0)
-         HGOTO_DONE(FAIL)
+    /*
+     * Call H5Rget_region function.
+     */
+    if ((c_space_id = H5Rget_region((hid_t)*dset_id, H5R_DATASET_REGION, ref)) < 0)
+        HGOTO_DONE(FAIL)
 
-     /* Copy the dataspace ID */
-     *space_id = (hid_t_f)c_space_id;
+    /* Copy the dataspace ID */
+    *space_id = (hid_t_f)c_space_id;
 
 done:
-     return ret_value;
-} /* end nh5rget_region_ptr_c() */
-
+    return ret_value;
+} /* end h5rget_region_ptr_c() */
 
 /****if* H5Rf/h5rget_object_type_obj_c
  * NAME
- *        h5rget_object_type_obj_c
+ *  h5rget_object_type_obj_c
  * PURPOSE
- *     Call H5Rget_object_type to retrieve the type of the object reference points
- *              to
+ *  Call H5Rget_object_type to retrieve the type of the object reference points
+ *  to
  * INPUTS
- *      dset_id - dataset identifier
- *              ref - reference to the dataset region
+ *  dset_id - dataset identifier
+ *  ref - reference to the dataset region
  * OUTPUTS
- *     obj_type - type of dereferenced object
+ *  obj_type - type of dereferenced object
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
  *  Wednesday, December 1, 1999
  * HISTORY
  *
  * SOURCE
-*/
-int_f
-nh5rget_object_type_obj_c(hid_t_f *dset_id, haddr_t_f *ref, int_f *obj_type)
-/******/
-{
-     H5O_type_t c_obj_type;
-     hobj_ref_t ref_c = (hobj_ref_t)*ref;
-     int_f ret_value = 0;
-
-     /*
-      * Call H5Rget_object_type function.
-      */
-     if(H5Rget_obj_type2((hid_t)*dset_id, H5R_OBJECT, &ref_c, &c_obj_type) < 0)
-         HGOTO_DONE(FAIL)
-
-     /* Copy the object type */
-     *obj_type = (int_f)c_obj_type;
-
-done:
-     return ret_value;
-} /* end nh5rget_object_type_obj_c() */
-
-/****if* H5Rf/h5rget_name_object_c
- * NAME
- *        h5rget_name_object_c
- * PURPOSE
- *     Call H5Rget_name for an object
- * INPUTS
- *
- *       loc_id - Identifier for the dataset containing the reference or for the group that dataset is in.
- *          ref - An object or dataset region reference.
- *
- * OUTPUTS
- *     name - A name associated with the referenced object or dataset region.
- *              size - The size of the name buffer.
- *
- * RETURNS
- *     0 on success, -1 on failure
- * AUTHOR
- *  M. Scot Breitenfeld
- *  March 31, 2008
- * HISTORY
- *
- * SOURCE
-*/
+ */
 int_f
-nh5rget_name_object_c(hid_t_f *loc_id, haddr_t_f *ref, _fcd name, size_t_f *name_len, size_t_f *size_default)
+h5rget_object_type_obj_c(hid_t_f *dset_id, haddr_t_f *ref, int_f *obj_type)
 /******/
 {
-     hobj_ref_t ref_c = (hobj_ref_t)*ref;
-     ssize_t c_size;
-     size_t c_bufsize = (size_t)*name_len + 1;
-     char *c_buf = NULL;  /* Buffer to hold C string */
-     int_f ret_value = 0;
-
-
-     /*
-      * Allocate buffer to hold name of an attribute
-      */
-     if(NULL == (c_buf = (char *)HDmalloc(c_bufsize)))
-         HGOTO_DONE(FAIL)
-        
-     /*
-      * Call H5Rget_name function.
-      */
-     if((c_size = H5Rget_name((hid_t)*loc_id, H5R_OBJECT, &ref_c, c_buf, c_bufsize)) < 0)
-         HGOTO_DONE(FAIL)
-
-     /*
-      * Convert C name to FORTRAN and place it in the given buffer
-      */
-     HD5packFstring(c_buf, _fcdtocp(name), c_bufsize-1);
-     *size_default = (size_t_f)c_size;
+    H5O_type_t c_obj_type;
+    hobj_ref_t ref_c     = (hobj_ref_t)*ref;
+    int_f      ret_value = 0;
 
-done:
-     if(c_buf) 
-         HDfree(c_buf);
-     return ret_value;
-} /* end nh5rget_name_object_c() */
+    /*
+     * Call H5Rget_object_type function.
+     */
+    if (H5Rget_obj_type2((hid_t)*dset_id, H5R_OBJECT, &ref_c, &c_obj_type) < 0)
+        HGOTO_DONE(FAIL)
 
-/****if* H5Rf/h5rget_name_region_c
- * NAME
- *        h5rget_name_region_c
- * PURPOSE
- *     Call H5Rget_name for a dataset region
- * INPUTS
- *
- *       loc_id - Identifier for the dataset containing the reference or for the group that dataset is in.
- *          ref - An object or dataset region reference.
- *
- * OUTPUTS
- *     name - A name associated with the referenced object or dataset region.
- *              size - The size of the name buffer.
- *
- * RETURNS
- *     0 on success, -1 on failure
- * AUTHOR
- *  M. Scot Breitenfeld
- *  March 31, 2008
- * HISTORY
- *
- * SOURCE
-*/
-int_f
-nh5rget_name_region_c(hid_t_f *loc_id, int_f *ref, _fcd name, size_t_f *name_len, size_t_f *size_default)
-/******/
-{
-     hdset_reg_ref_t ref_c;
-     ssize_t c_size;
-     size_t c_bufsize = (size_t)*name_len + 1;
-     char *c_buf = NULL;  /* Buffer to hold C string */
-     int_f ret_value = 0;
-
-     /* Copy the reference to query */
-     HDmemcpy(&ref_c, ref, H5R_DSET_REG_REF_BUF_SIZE);
-
-     /*
-      * Allocate buffer to hold name of an attribute
-      */
-     if(NULL == (c_buf = (char *)HDmalloc(c_bufsize)))
-         HGOTO_DONE(FAIL)
-
-     /*
-      * Call H5Rget_name function.
-      */
-     if((c_size = H5Rget_name((hid_t)*loc_id, H5R_DATASET_REGION, &ref_c, c_buf, c_bufsize)) < 0)
-         HGOTO_DONE(FAIL)
-
-     /*
-      * Convert C name to FORTRAN and place it in the given buffer
-      */
-     HD5packFstring(c_buf, _fcdtocp(name), c_bufsize - 1);
-     *size_default = (size_t_f)c_size;
+    /* Copy the object type */
+    *obj_type = (int_f)c_obj_type;
 
 done:
-     if(c_buf) 
-         HDfree(c_buf);
-     return ret_value;
-}
+    return ret_value;
+} /* end h5rget_object_type_obj_c() */
 
 /****if* H5Rf/h5rget_name_ptr_c
  * NAME
@@ -535,13 +285,13 @@ done:
  *  Call H5Rget_name
  * INPUTS
  *
- *       loc_id - Identifier for the dataset containing the reference or for the group that dataset is in.
- *     ref_type - Type of reference.
- *          ref - An object or dataset region reference.
+ *  loc_id - Identifier for the dataset containing the reference or for the group that dataset is in.
+ *  ref_type - Type of reference.
+ *  ref - An object or dataset region reference.
  *
  * OUTPUTS
- *     name - A name associated with the referenced object or dataset region.
- *     size - The size of the name buffer.
+ *  name - A name associated with the referenced object or dataset region.
+ *  size - The size of the name buffer.
  *
  * RETURNS
  *  0 on success, -1 on failure
@@ -551,80 +301,83 @@ done:
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-h5rget_name_ptr_c (hid_t_f *loc_id, int_f *ref_type, void *ref, _fcd name, size_t_f *name_len, size_t_f *size_default)
+h5rget_name_ptr_c(hid_t_f *loc_id, int_f *ref_type, void *ref, _fcd name, size_t_f *name_len,
+                  size_t_f *size_default)
 /******/
 {
-     int_f ret_value = -1;
-     ssize_t c_size;
-     size_t c_bufsize;
-     char *c_buf= NULL;  /* Buffer to hold C string */
-
-     c_bufsize = (size_t)*name_len+1;
-     /*
-      * Allocate buffer to hold name of an attribute
-      */
-     if ((c_buf = (char *)HDmalloc(c_bufsize)) == NULL)
-       return ret_value;
-
-     /*
-      * Call H5Rget_name function.
-      */
-     if((c_size=H5Rget_name((hid_t)*loc_id, (H5R_type_t)*ref_type, ref, c_buf, c_bufsize)) < 0){
-       if(c_buf) HDfree(c_buf);
-       return ret_value;
-     }
-     /*
-      * Convert C name to FORTRAN and place it in the given buffer
-      */
-     HD5packFstring(c_buf, _fcdtocp(name), c_bufsize-1);
-
-     *size_default = (size_t_f)c_size;
-     ret_value = 0;
-     if(c_buf) HDfree(c_buf);
-
-     return ret_value;
+    int_f   ret_value = -1;
+    ssize_t c_size;
+    size_t  c_bufsize;
+    char   *c_buf = NULL; /* Buffer to hold C string */
+
+    c_bufsize = (size_t)*name_len + 1;
+    /*
+     * Allocate buffer to hold name of an attribute
+     */
+    if ((c_buf = (char *)HDmalloc(c_bufsize)) == NULL)
+        return ret_value;
+
+    /*
+     * Call H5Rget_name function.
+     */
+    if ((c_size = H5Rget_name((hid_t)*loc_id, (H5R_type_t)*ref_type, ref, c_buf, c_bufsize)) < 0) {
+        if (c_buf)
+            HDfree(c_buf);
+        return ret_value;
+    }
+    /*
+     * Convert C name to FORTRAN and place it in the given buffer
+     */
+    HD5packFstring(c_buf, _fcdtocp(name), c_bufsize - 1);
+
+    *size_default = (size_t_f)c_size;
+    ret_value     = 0;
+    if (c_buf)
+        HDfree(c_buf);
+
+    return ret_value;
 }
 
 /****if* H5Rf/h5rget_obj_type_c
  * NAME
- *   h5rget_obj_type_c
+ *  h5rget_obj_type_c
  * PURPOSE
- *   Call H5Rget_obj_type
+ *  Call H5Rget_obj_type
  * INPUTS
- *   loc_id   - Identifier for the dataset containing the reference or
- *              for the group that dataset is in.
- *   ref_type - Type of reference to query.
- *   ref      - Reference to query.
+ *  loc_id   - Identifier for the dataset containing the reference or
+ *  for the group that dataset is in.
+ *  ref_type - Type of reference to query.
+ *  ref      - Reference to query.
  *
  * OUTPUTS
- *   obj_type - Type of referenced object. These are defined in H5Opublic.h,
- *              enum H5O_type_t
- *              
+ *  obj_type - Type of referenced object. These are defined in H5Opublic.h,
+ *  enum H5O_type_t
+ *
  * RETURNS
- *   0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
- *   M. Scot Breitenfeld
- *   December 17, 2008
+ *  M. Scot Breitenfeld
+ *  December 17, 2008
  *
  * SOURCE
-*/
+ */
 int_f
-h5rget_obj_type_c (hid_t_f *loc_id, int_f *ref_type, void *ref, int_f *obj_type)
+h5rget_obj_type_c(hid_t_f *loc_id, int_f *ref_type, void *ref, int_f *obj_type)
 /******/
 {
-  int_f ret_value = -1;
-  H5O_type_t obj_type_c;
+    int_f      ret_value = -1;
+    H5O_type_t obj_type_c;
 
-  /*
-   * Call H5Rget_obj_type function.
-   */
-  if((H5Rget_obj_type2((hid_t)*loc_id, (H5R_type_t)*ref_type, ref, &obj_type_c)) < 0)
-    return ret_value;
+    /*
+     * Call H5Rget_obj_type function.
+     */
+    if ((H5Rget_obj_type2((hid_t)*loc_id, (H5R_type_t)*ref_type, ref, &obj_type_c)) < 0)
+        return ret_value;
 
-  *obj_type = (int_f)obj_type_c;
+    *obj_type = (int_f)obj_type_c;
 
-  ret_value = 0;
-  return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
diff --git a/fortran/src/H5Rff.F90 b/fortran/src/H5Rff.F90
new file mode 100644
index 0000000..3aed34a
--- /dev/null
+++ b/fortran/src/H5Rff.F90
@@ -0,0 +1,643 @@
+!> @defgroup FH5R Fortran References (H5R) Interface
+!!
+!! @see H5R, C-API
+!!
+!! @see @ref H5R_UG, User Guide
+!!
+
+!> @ingroup FH5R
+!!
+!! @brief This module contains Fortran interfaces for H5R functions.
+!
+! NAME
+!  MODULE H5R
+!
+! FILE
+!  fortran/src/H5Rff.F90
+!
+! PURPOSE
+!  This file contains Fortran interfaces for H5R functions.
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+! NOTES
+!
+!       _____ __  __ _____   ____  _____ _______       _   _ _______
+!      |_   _|  \/  |  __ \ / __ \|  __ \__   __|/\   | \ | |__   __|
+! ****   | | | \  / | |__) | |  | | |__) | | |  /  \  |  \| |  | |    ****
+! ****   | | | |\/| |  ___/| |  | |  _  /  | | / /\ \ | . ` |  | |    ****
+! ****  _| |_| |  | | |    | |__| | | \ \  | |/ ____ \| |\  |  | |    ****
+!      |_____|_|  |_|_|     \____/|_|  \_\ |_/_/    \_\_| \_|  |_|
+!
+!  If you add a new H5R function you must add the function name to the
+!  Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
+!  This is needed for Windows based operating systems.
+!
+
+MODULE H5R
+  USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR, C_CHAR, C_SIGNED_CHAR
+  USE H5GLOBAL
+
+  ! If you change the value of these parameters, do not forget to change corresponding
+  ! values in the H5f90.h file.
+  !        INTEGER, PARAMETER :: REF_OBJ_BUF_LEN = 2
+  !        INTEGER, PARAMETER :: REF_REG_BUF_LEN = 3
+  !
+  !        TYPE hobj_ref_t_f
+  !             INTEGER ref(REF_OBJ_BUF_LEN)
+  !        END TYPE
+  !
+  !        TYPE hdset_reg_ref_t_f
+  !             INTEGER ref(REF_REG_BUF_LEN)
+  !        END TYPE
+  !
+
+  PRIVATE h5rget_object_type_obj_f
+  PRIVATE h5rget_region_region_f, h5rget_region_ptr_f
+  PRIVATE h5rcreate_object_f, h5rcreate_region_f, h5rcreate_ptr_f
+  PRIVATE h5rdereference_object_f, h5rdereference_region_f, h5rdereference_ptr_f
+  PRIVATE h5rget_name_object_f, h5rget_name_region_f, h5rget_name_ptr_f
+
+!> @brief hdset_reg_ref_t_f03 C compatible reference
+  TYPE :: hdset_reg_ref_t_f03
+     INTEGER(C_SIGNED_CHAR), DIMENSION(1:H5R_DSET_REG_REF_BUF_SIZE_F) :: ref
+  END TYPE hdset_reg_ref_t_f03
+
+  INTERFACE h5rget_object_type_f
+     MODULE PROCEDURE h5rget_object_type_obj_f
+  END INTERFACE
+
+#ifndef H5_DOXYGEN
+
+  INTERFACE h5rget_region_f
+     MODULE PROCEDURE h5rget_region_ptr_f    ! F2003
+     MODULE PROCEDURE h5rget_region_region_f ! obsolete
+  END INTERFACE
+
+  INTERFACE h5rcreate_f
+     MODULE PROCEDURE h5rcreate_ptr_f    ! F2003
+     MODULE PROCEDURE h5rcreate_object_f ! obsolete
+     MODULE PROCEDURE h5rcreate_region_f ! obsolete
+  END INTERFACE
+
+  INTERFACE h5rdereference_f
+     MODULE PROCEDURE h5rdereference_ptr_f    ! F2003
+     MODULE PROCEDURE h5rdereference_object_f ! obsolete
+     MODULE PROCEDURE h5rdereference_region_f ! obsolete
+  END INTERFACE
+
+  INTERFACE h5rget_name_f
+     MODULE PROCEDURE h5rget_name_ptr_f    ! F2003
+     MODULE PROCEDURE h5rget_name_object_f ! obsolete
+     MODULE PROCEDURE h5rget_name_region_f ! obsolete
+  END INTERFACE
+
+  INTERFACE
+     INTEGER FUNCTION h5rget_name_ptr_c(loc_id, ref_type, ref, name, name_len, size_default) &
+          BIND(C, NAME='h5rget_name_ptr_c')
+       IMPORT :: c_char, c_ptr
+       IMPORT :: HID_T, SIZE_T
+       IMPLICIT NONE
+       INTEGER(HID_T), INTENT(IN) :: loc_id
+       INTEGER, INTENT(IN) :: ref_type
+       TYPE(C_PTR), INTENT(IN), VALUE :: ref
+       CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+       INTEGER(SIZE_T) :: name_len
+       INTEGER(SIZE_T) :: size_default
+     END FUNCTION h5rget_name_ptr_c
+  END INTERFACE
+
+  INTERFACE
+     INTEGER FUNCTION h5rdereference_ptr_c(obj_id, ref_type, ref, ref_obj_id) &
+          BIND(C, NAME='h5rdereference_ptr_c')
+       IMPORT :: c_ptr
+       IMPORT :: HID_T
+       IMPLICIT NONE
+       INTEGER(HID_T), INTENT(IN) :: obj_id
+       INTEGER, INTENT(IN) :: ref_type
+       TYPE(C_PTR), INTENT(IN), VALUE :: ref
+       INTEGER(HID_T), INTENT(OUT) :: ref_obj_id
+     END FUNCTION h5rdereference_ptr_c
+  END INTERFACE
+
+  INTERFACE
+     INTEGER FUNCTION h5rcreate_ptr_c(ref, loc_id, name, namelen, ref_type, space_id) &
+          BIND(C, NAME='h5rcreate_ptr_c')
+       IMPORT :: c_ptr, c_char
+       IMPORT :: HID_T
+       IMPLICIT NONE
+       TYPE(C_PTR), VALUE :: ref
+       INTEGER(HID_T), INTENT(IN) :: loc_id
+       CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+       INTEGER :: namelen
+       INTEGER, INTENT(IN) :: ref_type
+       INTEGER(HID_T), INTENT(IN) :: space_id
+     END FUNCTION h5rcreate_ptr_c
+  END INTERFACE
+
+  INTERFACE
+     INTEGER FUNCTION h5rget_region_ptr_c(dset_id, ref, space_id) &
+          BIND(C, NAME='h5rget_region_ptr_c')
+       IMPORT :: c_ptr
+       IMPORT :: HID_T
+       IMPLICIT NONE
+       INTEGER(HID_T), INTENT(IN) :: dset_id
+       TYPE(C_PTR), VALUE :: ref
+       INTEGER(HID_T), INTENT(OUT) :: space_id
+     END FUNCTION h5rget_region_ptr_c
+  END INTERFACE
+#endif
+
+CONTAINS
+
+!>
+!! \ingroup FH5R
+!!
+!! \brief Retrieves the type of object that an object reference points to.
+!!
+!! \attention  \fortran_obsolete
+!!
+!! \param dset_id  Identifier of the dataset containing reference to the objects.
+!! \param ref      Reference to open.
+!! \param obj_type Object_type, possible values:
+!!                 \li H5G_UNKNOWN_F
+!!                 \li H5G_GROUP_F
+!!                 \li H5G_DATASET_F
+!!                 \li H5G_TYPE_F
+!! \param hdferr   \fortran_error
+!!
+#ifdef H5_DOXYGEN
+  SUBROUTINE h5rget_object_type_f(&
+#else
+  SUBROUTINE h5rget_object_type_obj_f(&
+#endif
+    dset_id, ref, obj_type, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dset_id
+    TYPE(hobj_ref_t_f), INTENT(IN) :: ref
+    INTEGER, INTENT(OUT) :: obj_type
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HADDR_T) :: ref_f          ! Local buffer to pass reference
+
+    INTERFACE
+       INTEGER FUNCTION h5rget_object_type_obj_c(dset_id, ref_f, obj_type) BIND(C, NAME='h5rget_object_type_obj_c')
+         IMPORT :: HID_T, HADDR_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: dset_id
+         INTEGER(HADDR_T) :: ref_f
+         INTEGER, INTENT(OUT) :: obj_type
+       END FUNCTION h5rget_object_type_obj_c
+    END INTERFACE
+
+    ref_f = ref%ref
+    hdferr = h5rget_object_type_obj_c(dset_id, ref_f, obj_type )
+
+#ifdef H5_DOXYGEN
+  END SUBROUTINE h5rget_object_type_f
+#else
+  END SUBROUTINE h5rget_object_type_obj_f
+#endif
+
+!>
+!! \ingroup FH5R
+!!
+!! \brief Retrieves a dataspace with the specified region selected.
+!!
+!! \attention  \fortran_obsolete
+!!
+!! \param dset_id  Identifier of the dataset containing reference to the regions.
+!! \param ref      Reference to open.
+!! \param space_id Dataspace identifier.
+!! \param hdferr   \fortran_error
+!!
+  SUBROUTINE h5rget_region_region_f(dset_id, ref, space_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dset_id
+    TYPE(hdset_reg_ref_t_f), INTENT(IN) :: ref
+    INTEGER(HID_T), INTENT(OUT) :: space_id
+    INTEGER, INTENT(OUT) :: hdferr
+
+    INTEGER :: ref_f(REF_REG_BUF_LEN)          ! Local buffer to pass reference
+
+    INTERFACE
+       INTEGER FUNCTION h5rget_region_region_c(dset_id, ref_f, space_id) BIND(C, NAME='h5rget_region_region_c')
+         IMPORT :: HID_T, REF_REG_BUF_LEN
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: dset_id
+         INTEGER :: ref_f(REF_REG_BUF_LEN)
+         INTEGER(HID_T), INTENT(OUT) :: space_id
+       END FUNCTION h5rget_region_region_c
+    END INTERFACE
+
+    ref_f = ref%ref
+    hdferr = h5rget_region_region_c(dset_id, ref_f, space_id )
+
+  END SUBROUTINE h5rget_region_region_f
+
+!>
+!! \ingroup FH5R
+!!
+!! \brief Retrieves a dataspace with the specified region selected using pointer.
+!!
+!! \attention  \fortran_approved
+!!
+!! \param dset_id  Identifier of the dataset containing reference to the regions.
+!! \param ref      Reference to open.
+!! \param space_id Dataspace identifier.
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Rget_region()
+!!
+#ifdef H5_DOXYGEN
+  SUBROUTINE h5rget_region_f(&
+#else
+  SUBROUTINE h5rget_region_ptr_f(&
+#endif
+       dset_id, ref, space_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dset_id
+    TYPE(C_PTR), INTENT(IN) :: ref
+    INTEGER(HID_T), INTENT(OUT) :: space_id
+    INTEGER, INTENT(OUT) :: hdferr
+
+    hdferr = h5rget_region_ptr_c(dset_id, ref, space_id)
+
+#ifdef H5_DOXYGEN
+  END SUBROUTINE h5rget_region_f
+#else
+  END SUBROUTINE h5rget_region_ptr_f
+#endif
+
+!>
+!! \ingroup FH5R
+!!
+!! \brief Creates reference to the object.
+!!
+!! \attention  \fortran_obsolete
+!!
+!! \param loc_id Location identifier.
+!! \param name   Name of the object at the specified location.
+!! \param ref    Reference to the specified object.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Rcreate_object()
+!!
+  SUBROUTINE h5rcreate_object_f(loc_id, name, ref, hdferr)
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    TYPE(hobj_ref_t_f), INTENT(INOUT), TARGET :: ref
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: namelen                     ! Name length
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(ref)
+
+    namelen = LEN(name)
+
+    hdferr = h5rcreate_ptr_c(f_ptr, loc_id, name, namelen, INT(0), INT(-1,HID_T))
+
+  END SUBROUTINE h5rcreate_object_f
+
+!>
+!! \ingroup FH5R
+!!
+!! \brief Creates reference to the dataset region
+!!
+!! \attention  \fortran_obsolete
+!!
+!! \param loc_id   Location identifier.
+!! \param name     Name of the dataset at the specified location.
+!! \param space_id Dataspace identifier that describes selected region.
+!! \param ref      Reference to the dataset region.
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Rcreate_region()
+!!
+  SUBROUTINE h5rcreate_region_f(loc_id, name, space_id, ref, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    INTEGER(HID_T), INTENT(IN) :: space_id
+    TYPE(hdset_reg_ref_t_f), INTENT(OUT) :: ref
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: namelen                     ! Name length
+    INTEGER :: ref_f(REF_REG_BUF_LEN)      ! Local buffer to pass reference
+
+    INTERFACE
+       INTEGER FUNCTION h5rcreate_region_c(ref_f, loc_id, name, namelen, space_id) BIND(C,NAME='h5rcreate_region_c')
+         IMPORT :: HID_T, REF_REG_BUF_LEN
+         IMPORT :: C_CHAR
+         IMPLICIT NONE
+         INTEGER :: ref_f(REF_REG_BUF_LEN)
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+         INTEGER :: namelen
+         INTEGER(HID_T), INTENT(IN) :: space_id
+       END FUNCTION h5rcreate_region_c
+    END INTERFACE
+
+    namelen = LEN(name)
+    ref_f = 0
+    hdferr = h5rcreate_region_c(ref_f, loc_id, name, namelen, space_id )
+    ref%ref = ref_f
+
+  END SUBROUTINE h5rcreate_region_f
+
+!>
+!! \ingroup FH5R
+!!
+!! \brief Creates a reference.
+!!
+!! \attention  \fortran_approved
+!!
+!! \param loc_id   Location identifier.
+!! \param name     Name of the dataset at the specified location.
+!! \param ref_type Type of reference:
+!!                 \li H5R_OBJECT_F
+!!                 \li H5T_STD_REF_DSETREG_F
+!! \param ref      Reference created by the function call.
+!! \param hdferr   \fortran_error
+!! \param space_id Dataspace identifier that describes selected region.
+!!
+#ifdef H5_DOXYGEN
+!! See C API: @ref H5Rcreate_object()
+!!
+  SUBROUTINE h5rcreate_f(&
+#else
+  SUBROUTINE h5rcreate_ptr_f(&
+#endif
+       loc_id, name, ref_type, ref, hdferr, space_id)
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    INTEGER, INTENT(IN) :: ref_type
+    TYPE(C_PTR), INTENT(INOUT) :: ref
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), INTENT(IN), OPTIONAL :: space_id
+    INTEGER :: namelen                       ! Name length
+    INTEGER(HID_T) :: space_id_c
+
+    namelen = LEN(name)
+    space_id_c = -1
+    IF(PRESENT(space_id)) space_id_c =  space_id
+    hdferr = h5rcreate_ptr_c(ref, loc_id, name, namelen, ref_type, space_id_c)
+
+#ifdef H5_DOXYGEN
+  END SUBROUTINE h5rcreate_f
+#else
+  END SUBROUTINE h5rcreate_ptr_f
+#endif
+!>
+!! \ingroup FH5R
+!!
+!! \brief Opens the HDF5 object referenced
+!!
+!! \attention  \fortran_obsolete
+!!
+!! \param obj_id     Identifier of the dataset containing reference.
+!! \param ref        Reference to open.
+!! \param ref_obj_id Object_identifier.
+!! \param hdferr     \fortran_error
+!!
+  SUBROUTINE h5rdereference_object_f(obj_id, ref, ref_obj_id, hdferr)
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: obj_id
+    TYPE(hobj_ref_t_f), INTENT(IN), TARGET :: ref
+    INTEGER(HID_T), INTENT(OUT) :: ref_obj_id
+    INTEGER, INTENT(OUT) :: hdferr
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(ref)
+    hdferr = h5rdereference_ptr_c(obj_id, 0, f_ptr, ref_obj_id)
+
+  END SUBROUTINE h5rdereference_object_f
+
+!>
+!! \ingroup FH5R
+!!
+!! \brief Opens the dataset region
+!!
+!! \attention  \fortran_obsolete
+!!
+!! \param obj_id     Object identifier.
+!! \param ref        Reference to open.
+!! \param ref_obj_id Identifier of the object containing reference to the regions.
+!! \param hdferr     \fortran_error
+!!
+  SUBROUTINE h5rdereference_region_f(obj_id, ref, ref_obj_id, hdferr)
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: obj_id
+    TYPE(hdset_reg_ref_t_f), INTENT(IN), TARGET :: ref
+    INTEGER(HID_T), INTENT(OUT) :: ref_obj_id
+    INTEGER, INTENT(OUT) :: hdferr
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(ref)
+    hdferr = h5rdereference_ptr_c(obj_id, 1, f_ptr, ref_obj_id)
+
+  END SUBROUTINE h5rdereference_region_f
+
+!>
+!! \ingroup FH5R
+!!
+!! \brief Opens the HDF5 object referenced.
+!!
+!! \attention  \fortran_approved
+!!
+!! \param obj_id     Valid identifier for the file containing the referenced object or any object in that file.
+!! \param ref_type   The reference type of ref.
+!! \param ref        Reference to open.
+!! \param ref_obj_id Identifier of referenced object.
+!! \param hdferr     \fortran_error
+!!
+  SUBROUTINE h5rdereference_ptr_f(obj_id, ref_type, ref, ref_obj_id, hdferr)
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: obj_id
+    INTEGER, INTENT(IN) :: ref_type
+    TYPE(C_PTR), INTENT(IN) :: ref
+    INTEGER(HID_T), INTENT(OUT) :: ref_obj_id
+    INTEGER, INTENT(OUT) :: hdferr
+
+    hdferr = h5rdereference_ptr_c(obj_id, ref_type, ref, ref_obj_id)
+
+  END SUBROUTINE h5rdereference_ptr_f
+
+!>
+!! \ingroup FH5R
+!!
+!! \brief Retrieves a name of a referenced object.
+!!
+!! \attention  \fortran_obsolete
+!!
+!! \param loc_id Identifier for the file containing the reference or for any object in that file.
+!! \param ref    An object or dataset region reference.
+!! \param name   A name associated with the referenced object or dataset region.
+!! \param hdferr \fortran_error
+!! \param size   The size of the name buffer, returning 0 (zero) if no name is associated with the identifier.
+!!
+  SUBROUTINE h5rget_name_object_f(loc_id,  ref, name, hdferr, size)
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id
+    TYPE(hobj_ref_t_f), INTENT(IN), TARGET :: ref
+    INTEGER(SIZE_T), OPTIONAL, INTENT(OUT) :: size
+    CHARACTER(LEN=*), INTENT(INOUT) :: name
+    INTEGER, INTENT(OUT) :: hdferr
+
+    INTEGER(SIZE_T) :: size_default
+    INTEGER(SIZE_T) :: name_len
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(ref)
+
+    name_len=LEN(name)
+
+    hdferr = h5rget_name_ptr_c(loc_id, 0, f_ptr, name, name_len, size_default)
+
+    IF(PRESENT(size)) size = size_default
+
+  END SUBROUTINE h5rget_name_object_f
+
+!>
+!! \ingroup FH5R
+!!
+!! \brief Retrieves a name of a dataset region.
+!!
+!! \attention  \fortran_obsolete
+!!
+!! \param loc_id Identifier for the file containing the reference or for any object in that file.
+!! \param ref    An object or dataset region reference.
+!! \param name   A name associated with the referenced object or dataset region.
+!! \param hdferr \fortran_error
+!! \param size   The size of the name buffer, returning 0 (zero) if no name is associated with the identifier.
+!!
+  SUBROUTINE h5rget_name_region_f(loc_id, ref, name, hdferr, size)
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id
+    TYPE(hdset_reg_ref_t_f), INTENT(IN), TARGET :: ref
+    INTEGER(SIZE_T), OPTIONAL, INTENT(OUT) :: size
+    CHARACTER(LEN=*), INTENT(INOUT) :: name
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(SIZE_T) :: size_default
+    INTEGER(SIZE_T) :: name_len
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(ref)
+
+    name_len=LEN(name)
+
+    hdferr = h5rget_name_ptr_c(loc_id, 1, f_ptr, name, name_len, size_default)
+
+    IF(PRESENT(size)) size = size_default
+
+  END SUBROUTINE h5rget_name_region_f
+
+!>
+!! \ingroup FH5R
+!!
+!! \brief Retrieves a name of a referenced object.
+!!
+!! \attention  \fortran_approved
+!!
+!! \param loc_id   Identifier for the file containing the reference or for any object in that file.
+!! \param ref_type Type of reference.
+!! \param ref      An object or dataset region reference.
+!! \param name     A name associated with the referenced object or dataset ptr.
+!! \param hdferr   \fortran_error
+!!\param  size     The size of the name buffer, returning 0 (zero) if no name is associated with the identifier.
+!!
+
+#ifdef H5_DOXYGEN
+!! See C API: @ref H5Rget_name()
+!!
+  SUBROUTINE h5rget_name_f(&
+#else
+  SUBROUTINE h5rget_name_ptr_f(&
+#endif
+       loc_id, ref_type, ref, name, hdferr, size)
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id
+    INTEGER, INTENT(IN) :: ref_type
+    TYPE(C_PTR), INTENT(IN) :: ref
+    CHARACTER(LEN=*), INTENT(INOUT) :: name
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(SIZE_T), OPTIONAL, INTENT(OUT) :: size
+    INTEGER(SIZE_T) :: size_default
+    INTEGER(SIZE_T) :: name_len
+
+    name_len=LEN(name)
+
+    hdferr = h5rget_name_ptr_c(loc_id, ref_type, ref, name, name_len, size_default)
+
+    IF(PRESENT(size)) size = size_default
+
+#ifdef H5_DOXYGEN
+  END SUBROUTINE h5rget_name_f
+#else
+  END SUBROUTINE h5rget_name_ptr_f
+#endif
+
+!>
+!! \ingroup FH5R
+!!
+!! \brief Retrieves the type of object that an object reference points to.
+!!
+!!  loc_id   - Identifier for the dataset containing the reference or for the group that dataset is in.
+!!  ref_type - Type of reference to query.
+!!  ref      - Reference to query.
+!!  obj_type - Type of referenced object:
+!!             \li H5G_UNKNOWN_F
+!!             \li H H5G_GROUP_F
+!!             \li H H5G_DATASET_F
+!!             \li H H5G_TYPE_F
+!!  hdferr   - \fortran_error
+!!
+!! See C API: @ref H5Rget_obj_type3()
+!!
+  SUBROUTINE h5rget_obj_type_f(loc_id, ref_type, ref, obj_type, hdferr)
+
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id
+    INTEGER, INTENT(IN) :: ref_type
+    TYPE(C_PTR), INTENT(IN) :: ref
+    INTEGER, INTENT(OUT) :: obj_type
+    INTEGER, INTENT(OUT) :: hdferr
+
+    INTERFACE
+       INTEGER FUNCTION h5rget_obj_type_c(loc_id, ref_type, ref, obj_type) &
+            BIND(C, NAME='h5rget_obj_type_c')
+         IMPORT :: C_PTR
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         INTEGER, INTENT(IN) :: ref_type
+         TYPE(C_PTR), VALUE :: ref
+         INTEGER :: obj_type
+       END FUNCTION h5rget_obj_type_c
+    END INTERFACE
+
+    hdferr = h5rget_obj_type_c(loc_id, ref_type, ref, obj_type)
+
+  END SUBROUTINE h5rget_obj_type_f
+
+END MODULE H5R
diff --git a/fortran/src/H5Rff.f90 b/fortran/src/H5Rff.f90
deleted file mode 100644
index 77a1ff8..0000000
--- a/fortran/src/H5Rff.f90
+++ /dev/null
@@ -1,128 +0,0 @@
-!****h* ROBODoc/H5R
-!
-! NAME
-!  MODULE H5R
-!
-! FILE
-!  fortran/src/H5Rff.f90
-!
-! PURPOSE
-!  This file contains Fortran interfaces for H5R functions. It includes
-!  all the functions that are independent on whether the Fortran 2003 functions
-!  are enabled or disabled.
-!
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! NOTES
-!                         *** IMPORTANT ***
-!  If you add a new H5R function you must add the function name to the
-!  Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
-!  This is needed for Windows based operating systems.
-!
-!*****
-
-MODULE H5R
-  USE H5GLOBAL
-
-  ! If you change the value of these parameters, do not forget to change corresponding
-  ! values in the H5f90.h file.
-  !        INTEGER, PARAMETER :: REF_OBJ_BUF_LEN = 2
-  !        INTEGER, PARAMETER :: REF_REG_BUF_LEN = 3
-  !
-  !        TYPE hobj_ref_t_f
-  !             INTEGER ref(REF_OBJ_BUF_LEN)
-  !        END TYPE
-  !
-  !        TYPE hdset_reg_ref_t_f
-  !             INTEGER ref(REF_REG_BUF_LEN)
-  !        END TYPE
-  !
-
-  INTERFACE h5rget_object_type_f
-
-     MODULE PROCEDURE h5rget_object_type_obj_f
-
-  END INTERFACE
-
-CONTAINS
-
-!****s* H5R/h5rget_object_type_obj_f
-!
-! NAME
-!  h5rget_object_type_obj_f
-!
-! PURPOSE
-!  Retrieves the type of object that an object reference points to.
-!
-! INPUTS
-!  dset_id 	 - identifier of the dataset containing
-!                  reference to the objects
-!  ref 	         - reference to open
-! OUTPUTS
-!  obj_type 	 - object_type, possible values:
-!                    H5G_UNKNOWN_F
-!                    H5G_GROUP_F 
-!                    H5G_DATASET_F
-!                    H5G_TYPE_F
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  February 28, 2001
-!
-! NOTES
-!  This is a module procedure for the h5rget_object_type_f
-!  subroutine.
-! SOURCE
-  SUBROUTINE h5rget_object_type_obj_f(dset_id, ref, obj_type, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-    TYPE(hobj_ref_t_f), INTENT(IN) :: ref   ! Object reference
-    INTEGER, INTENT(OUT) :: obj_type     ! Object type
-                                         !  H5G_UNKNOWN_F
-                                         !  H5G_GROUP_F
-                                         !  H5G_DATASET_F
-                                         !  H5G_TYPE_F
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code
-!*****
-    INTEGER(HADDR_T) :: ref_f          ! Local buffer to pass reference
-
-    INTERFACE
-       INTEGER FUNCTION h5rget_object_type_obj_c(dset_id, ref_f, obj_type)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5RGET_OBJECT_TYPE_OBJ_C':: h5rget_object_type_obj_c
-         !DEC$ENDIF
-         !              INTEGER, PARAMETER :: REF_OBJ_BUF_LEN = 2
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HADDR_T) :: ref_f
-         INTEGER, INTENT(OUT) :: obj_type
-       END FUNCTION h5rget_object_type_obj_c
-    END INTERFACE
-
-    ref_f = ref%ref
-    hdferr = h5rget_object_type_obj_c(dset_id, ref_f, obj_type )
-
-  END SUBROUTINE h5rget_object_type_obj_f
-
-END MODULE H5R
diff --git a/fortran/src/H5Rff_F03.f90 b/fortran/src/H5Rff_F03.f90
deleted file mode 100644
index 8f40607..0000000
--- a/fortran/src/H5Rff_F03.f90
+++ /dev/null
@@ -1,719 +0,0 @@
-!****h* ROBODoc/H5R (F03)
-!
-! NAME
-!  MODULE H5R_PROVISIONAL
-!
-! FILE
-!  fortran/src/H5Rff_F03.f90
-!
-! PURPOSE
-!  This file contains Fortran 90 and Fortran 2003 interfaces for H5R functions.
-!  It contains the same functions as H5Rff_DEPRECIATE.f90 but includes the
-!  Fortran 2003 functions and the interface listings. This file will be compiled
-!  instead of H5Rff_DEPRECIATE.f90 if Fortran 2003 functions are enabled.
-!
-! COPYRIGHT
-!  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!  Copyright by The HDF Group.                                                 *
-!  Copyright by the Board of Trustees of the University of Illinois.           *
-!  All rights reserved.                                                        *
-!                                                                              *
-!  This file is part of HDF5.  The full HDF5 copyright notice, including       *
-!  terms governing use, modification, and redistribution, is contained in      *
-!  the files COPYING and Copyright.html.  COPYING can be found at the root     *
-!  of the source code distribution tree; Copyright.html can be found at the    *
-!  root level of an installed copy of the electronic HDF5 document set and     *
-!  is linked from the top-level documents page.  It can also be found at       *
-!  http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have            *
-!  access to either file, you may request a copy from help@hdfgroup.org.       *
-!  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! NOTES
-!                         *** IMPORTANT ***
-!  If you add a new H5R function you must add the function name to the
-!  Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
-!  This is needed for Windows based operating systems.
-!
-!*****
-MODULE H5R_PROVISIONAL
-  USE H5GLOBAL
-  USE, INTRINSIC :: ISO_C_BINDING
-
-  ! If you change the value of these parameters, do not forget to change corresponding
-  ! values in the H5f90.h file.
-  !        INTEGER, PARAMETER :: REF_OBJ_BUF_LEN = 2
-  !        INTEGER, PARAMETER :: REF_REG_BUF_LEN = 3
-  !
-  !        TYPE hobj_ref_t_f
-  !             INTEGER ref(REF_OBJ_BUF_LEN)
-  !        END TYPE
-  !
-  !        TYPE hdset_reg_ref_t_f
-  !             INTEGER ref(REF_REG_BUF_LEN)
-  !        END TYPE
-  !
-
-  TYPE :: hdset_reg_ref_t_f03 
-     INTEGER(C_SIGNED_CHAR), DIMENSION(1:H5R_DSET_REG_REF_BUF_SIZE_F) :: ref
-  END TYPE hdset_reg_ref_t_f03
-
-  INTERFACE h5rget_region_f
-
-     MODULE PROCEDURE h5rget_region_region_f ! obsolete
-     MODULE PROCEDURE h5rget_region_ptr_f  ! F2003
-
-  END INTERFACE
-
-
-  INTERFACE h5rcreate_f
-
-     MODULE PROCEDURE h5rcreate_object_f ! obsolete
-     MODULE PROCEDURE h5rcreate_region_f ! obsolete
-     MODULE PROCEDURE h5rcreate_ptr_f  ! F2003
-
-  END INTERFACE
-
-  INTERFACE h5rdereference_f
-
-     MODULE PROCEDURE h5rdereference_object_f ! obsolete
-     MODULE PROCEDURE h5rdereference_region_f ! obsolete
-     MODULE PROCEDURE h5rdereference_ptr_f ! F2003
-
-  END INTERFACE
-
-  INTERFACE h5rget_name_f
-
-     MODULE PROCEDURE h5rget_name_object_f ! obsolete
-     MODULE PROCEDURE h5rget_name_region_f ! obsolete
-     MODULE PROCEDURE h5rget_name_ptr_f ! F2003
-
-  END INTERFACE
-
-  INTERFACE
-     INTEGER FUNCTION h5rget_name_ptr_c(loc_id, ref_type, ref, name, name_len, size_default) &
-          BIND(C, NAME='h5rget_name_ptr_c')
-       USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_char, c_ptr
-       USE H5GLOBAL
-       INTEGER(HID_T), INTENT(IN) :: loc_id
-       INTEGER, INTENT(IN) :: ref_type
-       TYPE(C_PTR), INTENT(IN), VALUE :: ref
-       CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
-       INTEGER(SIZE_T) :: name_len
-       INTEGER(SIZE_T) :: size_default
-     END FUNCTION h5rget_name_ptr_c
-  END INTERFACE
-
-  INTERFACE
-     INTEGER FUNCTION h5rdereference_ptr_c(obj_id, ref_type, ref, ref_obj_id) &
-          BIND(C, NAME='h5rdereference_ptr_c')
-       USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_ptr
-       USE H5GLOBAL
-       INTEGER(HID_T), INTENT(IN) :: obj_id
-       INTEGER, INTENT(IN) :: ref_type
-       TYPE(C_PTR), INTENT(IN), VALUE :: ref
-       INTEGER(HID_T), INTENT(OUT) :: ref_obj_id
-     END FUNCTION h5rdereference_ptr_c
-  END INTERFACE
-
-  INTERFACE
-     INTEGER FUNCTION h5rcreate_ptr_c(ref, loc_id, name, namelen, ref_type, space_id) &
-          BIND(C, NAME='h5rcreate_ptr_c')
-       USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_char, c_ptr
-       USE H5GLOBAL
-       TYPE(C_PTR), VALUE :: ref
-       INTEGER(HID_T), INTENT(IN) :: loc_id
-       CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
-       INTEGER :: namelen
-       INTEGER, INTENT(IN) :: ref_type
-       INTEGER(HID_T), INTENT(IN) :: space_id
-     END FUNCTION h5rcreate_ptr_c
-  END INTERFACE
-
-  INTERFACE
-     INTEGER FUNCTION h5rget_region_ptr_c(dset_id, ref, space_id) &
-          BIND(C, NAME='h5rget_region_ptr_c')
-       USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_ptr
-       USE H5GLOBAL
-       INTEGER(HID_T), INTENT(IN) :: dset_id
-       TYPE(C_PTR), VALUE :: ref
-       INTEGER(HID_T), INTENT(OUT) :: space_id
-     END FUNCTION h5rget_region_ptr_c
-  END INTERFACE
-
-CONTAINS
-
-!****s* H5R/h5rget_region_region_f
-!
-! NAME
-!  h5rget_region_region_f
-!
-! PURPOSE
-!  Retrieves a dataspace with the specified region selected
-!
-! INPUTS
-!  dset_id 	 - identifier of the dataset containing
-!                  reference to the regions
-!  ref 	         - reference to open
-! OUTPUTS
-!  space_id 	 - dataspace identifier
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY 	
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  February 28, 2001
-!
-! NOTES
-!  This is a module procedure for the h5rget_region_f subroutine.
-!
-! SOURCE
-  SUBROUTINE h5rget_region_region_f(dset_id, ref, space_id, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id      ! Dataset identifier
-    TYPE(hdset_reg_ref_t_f), INTENT(IN) :: ref ! Dataset region reference
-    INTEGER(HID_T), INTENT(OUT) :: space_id    ! Space identifier
-    INTEGER, INTENT(OUT) :: hdferr             ! Error code
-!*****
-    INTEGER :: ref_f(REF_REG_BUF_LEN)          ! Local buffer to pass reference
-
-    INTERFACE
-       INTEGER FUNCTION h5rget_region_region_c(dset_id, ref_f, space_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5RGET_REGION_REGION_C':: h5rget_region_region_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         !              INTEGER, PARAMETER :: REF_REG_BUF_LEN = 3
-         INTEGER :: ref_f(REF_REG_BUF_LEN)
-         INTEGER(HID_T), INTENT(OUT) :: space_id
-       END FUNCTION h5rget_region_region_c
-    END INTERFACE
-
-    ref_f = ref%ref
-    hdferr = h5rget_region_region_c(dset_id, ref_f, space_id )
-
-  END SUBROUTINE h5rget_region_region_f
-
-!****s* H5R/h5rget_region_ptr_f
-!
-! NAME
-!  h5rget_region_ptr_f
-!
-! PURPOSE
-!  Retrieves a dataspace with the specified region 
-!  selected using pointer
-!
-! INPUTS
-!  dset_id 	 - identifier of the dataset containing
-!                  reference to the regions
-!  ref 	         - reference to open
-! OUTPUTS
-!  space_id 	 - dataspace identifier
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! AUTHOR
-!  M. Scot Breitenfeld
-!  August 4, 2012
-!
-! NOTES
-!  This is a module procedure for the h5rget_region_f subroutine.
-!
-! SOURCE
-  SUBROUTINE h5rget_region_ptr_f(dset_id, ref, space_id, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id      ! Dataset identifier
-    TYPE(C_PTR), INTENT(IN) :: ref ! Dataset region reference
-    INTEGER(HID_T), INTENT(OUT) :: space_id    ! Space identifier
-    INTEGER, INTENT(OUT) :: hdferr             ! Error code
-!*****
-
-    hdferr = h5rget_region_ptr_c(dset_id, ref, space_id )
-
-  END SUBROUTINE h5rget_region_ptr_f
-
-
-!****s* H5R (F03)/h5rcreate_object_f
-!
-! NAME
-!  h5rcreate_object_f
-!
-! PURPOSE
-!  Creates reference to the object
-!
-! Inputs:
-!  loc_id    - location identifier
-!  name      - name of the object at the specified location
-! Outputs:
-!  ref 	     - reference to the specified object
-!  hdferr    - returns 0 if successful and -1 if fails
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  February 28, 2001
-!
-! NOTES
-!  This is a module procedure for the h5rcreate_f subroutine.
-!
-! Signature:
-  SUBROUTINE h5rcreate_object_f(loc_id, name, ref, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id   ! Location identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of the object at location specified
-                                           ! by loc_id identifier
-    TYPE(hobj_ref_t_f), INTENT(INOUT), TARGET :: ref   ! Object reference
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-!*****
-    INTEGER :: namelen                     ! Name length
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(ref)
-
-    namelen = LEN(name)
-
-    hdferr = h5rcreate_ptr_c(f_ptr, loc_id, name, namelen, INT(0), INT(-1,HID_T))
-
-  END SUBROUTINE h5rcreate_object_f
-
-!****s* H5R (F90)/h5rcreate_region_f
-!
-! NAME
-!  h5rcreate_region_f
-!
-! PURPOSE
-!  Creates reference to the dataset region
-!
-! INPUTS
-!  loc_id 	 - location identifier
-!  name 	 - name of the dataset at the specified location
-!  space_id 	 - dataspace identifier that describes selected region
-! OUTPUTS
-!  ref 	         - reference to the dataset region
-!  hdferr        - returns 0 if successful and -1 if fails
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  February 28, 2001
-!
-! NOTES
-!  This is a module procedure for the h5rcreate_f subroutine.
-!
-! SOURCE
-  SUBROUTINE h5rcreate_region_f(loc_id, name, space_id, ref, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id   ! Location identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of the dataset at location specified
-                                           ! by loc_id identifier
-    INTEGER(HID_T), INTENT(IN) :: space_id ! Dataset's dataspace identifier
-    TYPE(hdset_reg_ref_t_f), INTENT(OUT) :: ref ! Dataset region reference
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-!*****
-    INTEGER :: namelen                     ! Name length
-    INTEGER :: ref_f(REF_REG_BUF_LEN)      ! Local buffer to pass reference
-
-    INTERFACE
-       INTEGER FUNCTION h5rcreate_region_c(ref_f, loc_id, name, namelen, space_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5RCREATE_REGION_C':: h5rcreate_region_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         !              INTEGER, PARAMETER :: REF_REG_BUF_LEN = 3
-         INTEGER :: ref_f(REF_REG_BUF_LEN)
-         INTEGER(HID_T), INTENT(IN) :: loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER :: namelen
-         INTEGER(HID_T), INTENT(IN) :: space_id
-       END FUNCTION h5rcreate_region_c
-    END INTERFACE
-
-    namelen = LEN(name)
-    ref_f = 0
-    hdferr = h5rcreate_region_c(ref_f, loc_id, name, namelen, space_id )
-    ref%ref = ref_f
-
-  END SUBROUTINE h5rcreate_region_f
-
-!****s* H5R (F03)/h5rcreate_ptr_f
-!
-! NAME
-!  h5rcreate_ptr_f
-!
-! PURPOSE
-!  Creates a reference.
-!
-! Inputs:
-!  loc_id     - location identifier
-!  name	      - name of the dataset at the specified location
-!  ref_type   - type of reference:
-!                H5R_OBJECT
-!                H5T_STD_REF_DSETREG
-! Outputs:
-!  ref	      - reference created by the function call.
-!  hdferr     - returns 0 if successful and -1 if fails.
-! OPTIONAL
-!  space_id   - dataspace identifier that describes selected region
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  June 20, 2008
-!
-! NOTES
-!  This is a module procedure for the h5rcreate_f
-!  subroutine where the output is a pointer.
-!
-! Signature:
-  SUBROUTINE h5rcreate_ptr_f(loc_id, name, ref_type, ref, hdferr, space_id)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id     ! Location identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name     ! Name of the dataset at location specified
-                                             ! by loc_id identifier
-    INTEGER, INTENT(IN) :: ref_type          ! type of reference
-    TYPE(C_PTR), INTENT(INOUT) :: ref        ! Reference created by the function call
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-    INTEGER(HID_T), INTENT(IN), OPTIONAL :: space_id ! Dataset's dataspace identifier
-!*****
-    INTEGER :: namelen                       ! Name length
-    INTEGER(HID_T) :: space_id_c
-
-    namelen = LEN(name)
-    space_id_c = -1
-    IF(PRESENT(space_id)) space_id_c =  space_id
-    hdferr = h5rcreate_ptr_c(ref, loc_id, name, namelen, ref_type, space_id_c)
-
-  END SUBROUTINE h5rcreate_ptr_f
-!****s* H5R (F03)/h5rdereference_object_f
-!
-! NAME
-!  h5rdereference_object_f
-!
-! PURPOSE
-!  Opens the HDF5 object referenced
-!
-! Inputs:
-!  dset_id  - identifier of the dataset containing
-!             reference
-!  ref 	    - reference to open
-! Outputs:
-!  obj_id   - object_identifier
-!  hdferr   - returns 0 if successful and -1 if fails
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  February 28, 2001
-!
-! NOTES
-!  This is a module procedure for the h5rdereference_f subroutine.
-!
-! Signature:
-  SUBROUTINE h5rdereference_object_f(obj_id, ref, ref_obj_id, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: obj_id          ! Dataset identifier
-    TYPE(hobj_ref_t_f), INTENT(IN), TARGET :: ref ! Object reference
-    INTEGER(HID_T), INTENT(OUT) :: ref_obj_id     ! Object identifier
-    INTEGER, INTENT(OUT) :: hdferr                ! Error code
-!*****
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(ref)
-    hdferr = h5rdereference_ptr_c(obj_id, 0, f_ptr, ref_obj_id)
-
-  END SUBROUTINE h5rdereference_object_f
-!****s* H5R (F03)/h5rdereference_region_f
-!
-! NAME
-!  h5rdereference_region_f
-!
-! PURPOSE
-!  Opens the dataset region
-!
-! Inputs:
-!  dset_id  - identifier of the dataset containing
-!             reference to teh regions
-!  ref 	    - reference to open
-! Outputs:
-!  obj_id   - dataspace identifier
-!  hdferr   - returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  February 28, 2001
-!
-! NOTES
-!  This is a module procedure for the h5rdereference_f subroutine.
-!
-! Signature:
-  SUBROUTINE h5rdereference_region_f(obj_id, ref, ref_obj_id, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: obj_id   ! Dataset identifier
-    TYPE(hdset_reg_ref_t_f), INTENT(IN), TARGET :: ref   ! Object reference
-    INTEGER(HID_T), INTENT(OUT) :: ref_obj_id  ! Dataspace identifier
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-!*****
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(ref)
-    hdferr = h5rdereference_ptr_c(obj_id, 1, f_ptr, ref_obj_id)
-
-  END SUBROUTINE h5rdereference_region_f
-
-!****s* H5R (F03)/h5rdereference_ptr_f
-!
-! NAME
-!  h5rdereference_ptr_f
-!
-! PURPOSE
-!  Opens the HDF5 object referenced.
-!
-! Inputs:
-!  obj_id     - valid identifier for the file containing the
-!               referenced object or any object in that file.
-!  ref_type   - the reference type of ref.
-!  ref        - Reference to open.
-! Outputs:
-!  ref_obj_id - identifier of referenced object
-!  hdferr     - returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  June 20, 2008
-!
-! NOTES
-!  This is a module procedure for the h5rdereference_f
-!  subroutine using pointers.
-!
-! Signature:
-  SUBROUTINE h5rdereference_ptr_f(obj_id, ref_type, ref, ref_obj_id, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: obj_id  ! Valid identifier for the file containing the
-                                          !  referenced object or any object in that file.
-    INTEGER, INTENT(IN) :: ref_type       ! The reference type of ref.
-    TYPE(C_PTR), INTENT(IN) :: ref        ! Object reference
-    INTEGER(HID_T), INTENT(OUT) :: ref_obj_id
-                                          ! Identifier of referenced object
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!***** 
-    hdferr = h5rdereference_ptr_c(obj_id, ref_type, ref, ref_obj_id)
-
-  END SUBROUTINE h5rdereference_ptr_f
-!
-!****s* H5R (F03)/h5rget_name_object_f
-!
-! NAME
-!  h5rget_name_object_f
-!
-! PURPOSE
-!  Retrieves a name of a referenced object.
-!
-! Inputs:
-!  loc_id    - Identifier for the file containing the reference or for any object in that file.
-!  ref 	     - An object or dataset region reference.
-!
-! Outputs:
-!  name      - A name associated with the referenced object or dataset region.
-!  hdferr    - Returns 0 if successful and -1 if fails.
-!
-! Optional parameters:
-!  size     - The size of the name buffer, returning 0 (zero) if no name is associated 
-!             with the identifier.
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  March 28, 2008
-!
-! Signature:
-  SUBROUTINE h5rget_name_object_f(loc_id,  ref, name, hdferr, size)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id
-    TYPE(hobj_ref_t_f), INTENT(IN), TARGET :: ref
-    INTEGER(SIZE_T), OPTIONAL, INTENT(OUT) :: size
-    CHARACTER(LEN=*), INTENT(INOUT) :: name
-    INTEGER, INTENT(OUT) :: hdferr
-!*****
-
-    INTEGER(SIZE_T) :: size_default
-    INTEGER(SIZE_T) :: name_len
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(ref)
-
-    name_len=LEN(name)
-
-    hdferr = h5rget_name_ptr_c(loc_id, 0, f_ptr, name, name_len, size_default)
-
-    IF(PRESENT(size)) size = size_default
-
-  END SUBROUTINE h5rget_name_object_f
-!****s* H5R (F03)/h5rget_name_region_f
-!
-! NAME
-!  h5rget_name_region_f
-!
-! PURPOSE
-!  Retrieves a name of a dataset region.
-!
-! Inputs:
-!  loc_id  - Identifier for the file containing the reference or for any object in that file.
-!  ref 	   - An object or dataset region reference.
-!
-! Outputs:
-!  name    - A name associated with the referenced object or dataset region.
-!  hdferr  - Returns 0 if successful and -1 if fails.
-!
-! Optional parameters:
-!  size    - The size of the name buffer, returning 0 (zero) if no name is associated with the identifier
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  March 28, 2008
-!
-! Signature:
-  SUBROUTINE h5rget_name_region_f(loc_id, ref, name, hdferr, size)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id
-    TYPE(hdset_reg_ref_t_f), INTENT(IN), TARGET :: ref
-    INTEGER(SIZE_T), OPTIONAL, INTENT(OUT) :: size
-    CHARACTER(LEN=*), INTENT(INOUT) :: name
-    INTEGER, INTENT(OUT) :: hdferr
-!*****
-    INTEGER(SIZE_T) :: size_default
-    INTEGER(SIZE_T) :: name_len
-    TYPE(C_PTR) :: f_ptr
-
-    f_ptr = C_LOC(ref)
-
-    name_len=LEN(name)
-
-    hdferr = h5rget_name_ptr_c(loc_id, 1, f_ptr, name, name_len, size_default)
-
-    IF(PRESENT(size)) size = size_default
-
-  END SUBROUTINE h5rget_name_region_f
-
-  !****s* H5R (F03)/h5rget_name_ptr_f
-  !
-  ! NAME
-  !  h5rget_name_ptr_f
-  !
-  ! PURPOSE
-  !  Retrieves a name of a referenced object.
-  !
-  ! Inputs:
-  !  loc_id   - Identifier for the file containing the reference or for any object in that file.
-  !  ref_type - Type of reference.
-  !  ref      - An object or dataset region reference.
-  !
-  ! Outputs:
-  !  name     - A name associated with the referenced object or dataset ptr.
-  !  hdferr   - Returns 0 if successful and -1 if fails.
-  !
-  ! Optional parameters:
-  !   size    - The size of the name buffer, returning 0 (zero) if no name is associated
-  !             with the identifier
-  !
-  ! AUTHOR
-  !  M. Scot Breitenfeld
-  !  March 28, 2008
-  !
-  ! Signature:
-  SUBROUTINE h5rget_name_ptr_f(loc_id, ref_type, ref, name, hdferr, size)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id
-    INTEGER, INTENT(IN) :: ref_type
-    TYPE(C_PTR), INTENT(IN) :: ref
-    CHARACTER(LEN=*), INTENT(INOUT) :: name
-    INTEGER, INTENT(OUT) :: hdferr
-    INTEGER(SIZE_T), OPTIONAL, INTENT(OUT) :: size
-!*****
-    INTEGER(SIZE_T) :: size_default
-    INTEGER(SIZE_T) :: name_len
-
-    name_len=LEN(name)
-
-    hdferr = h5rget_name_ptr_c(loc_id, ref_type, ref, name, name_len, size_default)
-
-    IF(PRESENT(size)) size = size_default
-
-  END SUBROUTINE h5rget_name_ptr_f
-
-  !****s* H5R (F03)/h5rget_obj_type_f
-  !
-  ! NAME
-  !  h5rget_obj_type_f
-  !
-  ! PURPOSE
-  !  Retrieves the type of object that an object reference points to.
-  !
-  ! Inputs:
-  !  loc_id   - Identifier for the dataset containing the reference or
-  !             for the group that dataset is in.
-  !  ref_type - Type of reference to query.
-  !  ref      - Reference to query.
-  !
-  ! Outputs:
-  !  obj_type - Type of referenced object. 
-  !               H5G_UNKNOWN_F
-  !               H5G_GROUP_F
-  !               H5G_DATASET_F
-  !               H5G_TYPE_F
-  !              
-  !  hdferr   - Returns 0 if successful and -1 if fails.
-  !
-  ! AUTHOR
-  !  M. Scot Breitenfeld
-  !  Decemeber 17, 2008
-  !
-  ! Signature:
-  SUBROUTINE h5rget_obj_type_f(loc_id, ref_type, ref, obj_type, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id
-    INTEGER, INTENT(IN) :: ref_type
-    TYPE(C_PTR), INTENT(IN) :: ref
-    INTEGER, INTENT(OUT) :: obj_type
-    INTEGER, INTENT(OUT) :: hdferr
-    !*****
-
-    INTERFACE
-       INTEGER FUNCTION h5rget_obj_type_c(loc_id, ref_type, ref, obj_type) &
-            BIND(C, NAME='h5rget_obj_type_c')
-         USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_ptr
-         USE H5GLOBAL
-         INTEGER(HID_T), INTENT(IN) :: loc_id
-         INTEGER, INTENT(IN) :: ref_type
-         TYPE(C_PTR), VALUE :: ref
-         INTEGER :: obj_type
-       END FUNCTION h5rget_obj_type_c
-    END INTERFACE
-
-    hdferr = h5rget_obj_type_c(loc_id, ref_type, ref, obj_type)
-
-  END SUBROUTINE h5rget_obj_type_f
-
-END MODULE H5R_PROVISIONAL
diff --git a/fortran/src/H5Rff_F90.f90 b/fortran/src/H5Rff_F90.f90
deleted file mode 100644
index ac45857..0000000
--- a/fortran/src/H5Rff_F90.f90
+++ /dev/null
@@ -1,514 +0,0 @@
-!****h* ROBODoc/H5R (F90)
-!
-! NAME
-!  MODULE H5R_PROVISIONAL
-!
-! FILE
-!  fortran/src/H5Rff_F90.f90
-!
-! PURPOSE
-!  This file contains Fortran 90 interfaces for H5R functions. It contains
-!  the same functions as H5Rff_F03.f90 but excludes the Fortran 2003 functions
-!  and the interface listings. This file will be compiled instead of H5Rff_F03.f90
-!  if Fortran 2003 functions are not enabled.
-!
-! COPYRIGHT
-!  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!  Copyright by The HDF Group.                                                 *
-!  Copyright by the Board of Trustees of the University of Illinois.           *
-!  All rights reserved.                                                        *
-!                                                                              *
-!  This file is part of HDF5.  The full HDF5 copyright notice, including       *
-!  terms governing use, modification, and redistribution, is contained in      *
-!  the files COPYING and Copyright.html.  COPYING can be found at the root     *
-!  of the source code distribution tree; Copyright.html can be found at the    *
-!  root level of an installed copy of the electronic HDF5 document set and     *
-!  is linked from the top-level documents page.  It can also be found at       *
-!  http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have            *
-!  access to either file, you may request a copy from help@hdfgroup.org.       *
-!  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! NOTES
-!                         *** IMPORTANT ***
-!  If you add a new H5R function you must add the function name to the
-!  Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
-!  This is needed for Windows based operating systems.
-!*****
-
-MODULE H5R_PROVISIONAL
-  USE H5GLOBAL
-
-!  If you change the value of these parameters, do not forget to change corresponding
-!  values in the H5f90.h file.
-!  INTEGER, PARAMETER :: REF_OBJ_BUF_LEN = 2
-!  INTEGER, PARAMETER :: REF_REG_BUF_LEN = 3
-!
-!  TYPE hobj_ref_t_f
-!  INTEGER ref(REF_OBJ_BUF_LEN)
-!  END TYPE
-!
-!  TYPE hdset_reg_ref_t_f
-!  INTEGER ref(REF_REG_BUF_LEN)
-!  END TYPE
-!
-  INTERFACE h5rcreate_f
-
-     MODULE PROCEDURE h5rcreate_object_f
-     MODULE PROCEDURE h5rcreate_region_f
-
-  END INTERFACE
-
-  INTERFACE h5rdereference_f
-
-     MODULE PROCEDURE h5rdereference_object_f
-     MODULE PROCEDURE h5rdereference_region_f
-
-  END INTERFACE
-
-  INTERFACE h5rget_name_f
-
-     MODULE PROCEDURE h5rget_name_object_f
-     MODULE PROCEDURE h5rget_name_region_f
-
-  END INTERFACE
-
-  INTERFACE h5rget_region_f
-
-     MODULE PROCEDURE h5rget_region_region_f
-
-  END INTERFACE
-
-
-CONTAINS
-
-
-!****s* H5R/h5rget_region_region_f
-!
-! NAME
-!  h5rget_region_region_f
-!
-! PURPOSE
-!  Retrieves a dataspace with the specified region selected
-!
-! INPUTS
-!  dset_id 	 - identifier of the dataset containing
-!                  reference to the regions
-!  ref 	         - reference to open
-! OUTPUTS
-!  space_id 	 - dataspace identifier
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY 	
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  February 28, 2001
-!
-! NOTES
-!  This is a module procedure for the h5rget_region_f subroutine.
-!
-! SOURCE
-  SUBROUTINE h5rget_region_region_f(dset_id, ref, space_id, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id      ! Dataset identifier
-    TYPE(hdset_reg_ref_t_f), INTENT(IN) :: ref ! Dataset region reference
-    INTEGER(HID_T), INTENT(OUT) :: space_id    ! Space identifier
-    INTEGER, INTENT(OUT) :: hdferr             ! Error code
-!*****
-    INTEGER :: ref_f(REF_REG_BUF_LEN)          ! Local buffer to pass reference
-
-    INTERFACE
-       INTEGER FUNCTION h5rget_region_region_c(dset_id, ref_f, space_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5RGET_REGION_REGION_C':: h5rget_region_region_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         !              INTEGER, PARAMETER :: REF_REG_BUF_LEN = 3
-         INTEGER :: ref_f(REF_REG_BUF_LEN)
-         INTEGER(HID_T), INTENT(OUT) :: space_id
-       END FUNCTION h5rget_region_region_c
-    END INTERFACE
-
-    ref_f = ref%ref
-    hdferr = h5rget_region_region_c(dset_id, ref_f, space_id )
-
-  END SUBROUTINE h5rget_region_region_f
-
-
-
-!****s* H5R (F90)/h5rcreate_object_f
-!
-! NAME
-!  h5rcreate_object_f
-!
-! PURPOSE
-!  Creates reference to the object
-!
-! INPUTS
-!  loc_id 	 - location identifier
-!  name 	 - name of the object at the specified location
-! OUTPUTS
-!  ref 	         - reference to the specified object
-!  hdferr:	 - error code
-!                   Success:  0
-!                   Failure: -1
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  February 28, 2001
-!
-! NOTES
-!  This is a module procedure for the h5rcreate_f subroutine.
-!
-! SOURCE
-  SUBROUTINE h5rcreate_object_f(loc_id, name, ref, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id   ! Location identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of the object at location specified
-                                           ! by loc_id identifier
-    TYPE(hobj_ref_t_f), INTENT(OUT) :: ref ! Object reference
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-!*****
-    INTEGER :: namelen                     ! Name length
-    INTEGER(HADDR_T) :: ref_f              ! Local buffer to pass reference
-
-    INTERFACE
-       INTEGER FUNCTION h5rcreate_object_c(ref_f, loc_id, name, namelen)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5RCREATE_OBJECT_C':: h5rcreate_object_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         INTEGER(HADDR_T) :: ref_f
-         INTEGER(HID_T), INTENT(IN) :: loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER :: namelen
-       END FUNCTION h5rcreate_object_c
-    END INTERFACE
-
-    namelen = LEN(name)
-    ref_f = 0
-    hdferr = h5rcreate_object_c(ref_f, loc_id, name, namelen )
-    ref%ref = ref_f
-
-  END SUBROUTINE h5rcreate_object_f
-
-!****s* H5R (F90)/h5rcreate_region_f
-!
-! NAME
-!  h5rcreate_region_f
-!
-! PURPOSE
-!  Creates reference to the dataset region
-!
-! INPUTS
-!  loc_id 	 - location identifier
-!  name 	 - name of the dataset at the specified location
-!  space_id 	 - dataspace identifier that describes selected region
-! OUTPUTS
-!  ref 	         - reference to the dataset region
-!  hdferr:	 - error code
-!                   Success:  0
-!                   Failure: -1
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  February 28, 2001
-!
-! NOTES
-!  This is a module procedure for the h5rcreate_f subroutine.
-!
-! SOURCE
-  SUBROUTINE h5rcreate_region_f(loc_id, name, space_id, ref, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id   ! Location identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of the dataset at location specified
-                                           ! by loc_id identifier
-    INTEGER(HID_T), INTENT(IN) :: space_id ! Dataset's dataspace identifier
-    TYPE(hdset_reg_ref_t_f), INTENT(OUT) :: ref ! Dataset region reference
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-!*****
-    INTEGER :: namelen                     ! Name length
-    INTEGER :: ref_f(REF_REG_BUF_LEN)      ! Local buffer to pass reference
-
-    INTERFACE
-       INTEGER FUNCTION h5rcreate_region_c(ref_f, loc_id, name, namelen, space_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5RCREATE_REGION_C':: h5rcreate_region_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         !              INTEGER, PARAMETER :: REF_REG_BUF_LEN = 3
-         INTEGER :: ref_f(REF_REG_BUF_LEN)
-         INTEGER(HID_T), INTENT(IN) :: loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER :: namelen
-         INTEGER(HID_T), INTENT(IN) :: space_id
-       END FUNCTION h5rcreate_region_c
-    END INTERFACE
-
-    namelen = LEN(name)
-    ref_f = 0
-    hdferr = h5rcreate_region_c(ref_f, loc_id, name, namelen, space_id )
-    ref%ref = ref_f
-
-  END SUBROUTINE h5rcreate_region_f
-!****s* H5R (F90)/h5rdereference_object_f
-!
-! NAME
-!  h5rdereference_object_f
-!
-! PURPOSE
-!  Opens the HDF5 object referenced
-!
-! INPUTS
-!  dset_id  - identifier of the dataset containing reference
-!  ref 	    - reference to open
-! OUTPUTS
-!  obj_id   - object_identifier
-!  hdferr   - error code
-!              Success:  0
-!              Failure: -1
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  February 28, 2001
-!
-! NOTES
-!  This is a module procedure for the h5rdereference_f subroutine.
-!
-! SOURCE
-  SUBROUTINE h5rdereference_object_f(dset_id, ref, obj_id, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-    TYPE(hobj_ref_t_f), INTENT(IN) :: ref   ! Object reference
-    INTEGER(HID_T), INTENT(OUT) :: obj_id   ! Object identifier
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-!*****
-    INTEGER(HADDR_T) :: ref_f          ! Local buffer to pass reference
-
-    INTERFACE
-       INTEGER FUNCTION h5rdereference_object_c(dset_id, ref_f, obj_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5RDEREFERENCE_OBJECT_C':: h5rdereference_object_c
-         !DEC$ENDIF
-         !              INTEGER, PARAMETER :: REF_OBJ_BUF_LEN = 2
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HADDR_T) :: ref_f
-         INTEGER(HID_T), INTENT(OUT) :: obj_id
-       END FUNCTION h5rdereference_object_c
-    END INTERFACE
-
-    ref_f = ref%ref
-    hdferr = h5rdereference_object_c(dset_id, ref_f, obj_id )
-
-  END SUBROUTINE h5rdereference_object_f
-!****s* H5R (F90)/h5rdereference_region_f
-!
-! NAME
-!  h5rdereference_region_f
-!
-! PURPOSE
-!  Opens the dataset region
-!
-! INPUTS
-!  dset_id 	 - identifier of the dataset containing
-!                  reference to teh regions
-!  ref 	         - reference to open
-! OUTPUTS
-!  obj_id 	 - dataspace identifier
-!  hdferr 	 - error code
-!                   Success:  0
-!                   Failure: -1
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  February 28, 2001
-!
-! NOTES
-!  This is a module procedure for the h5rdereference_f subroutine.
-!
-! SOURCE
-  SUBROUTINE h5rdereference_region_f(dset_id, ref, obj_id, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id      ! Dataset identifier
-    TYPE(hdset_reg_ref_t_f), INTENT(IN) :: ref ! Object reference
-    INTEGER(HID_T), INTENT(OUT) :: obj_id   ! Dataspace identifier
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-!*****
-    INTEGER :: ref_f(REF_REG_BUF_LEN)       ! Local buffer to pass reference
-
-    INTERFACE
-       INTEGER FUNCTION h5rdereference_region_c(dset_id, ref_f, obj_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5RDEREFERENCE_REGION_C':: h5rdereference_region_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-!  INTEGER, PARAMETER :: REF_REG_BUF_LEN = 3
-         INTEGER :: ref_f(REF_REG_BUF_LEN)
-         INTEGER(HID_T), INTENT(OUT) :: obj_id
-       END FUNCTION h5rdereference_region_c
-    END INTERFACE
-
-    ref_f = ref%ref
-    hdferr = h5rdereference_region_c(dset_id, ref_f, obj_id )
-
-  END SUBROUTINE h5rdereference_region_f
-!****s* H5R (F90)/h5rget_name_object_f
-!
-! NAME
-!  h5rget_name_object_f
-!
-! PURPOSE
-!  Retrieves a name of a referenced object.
-!
-! INPUTS
-!  loc_id  - Identifier for the file containing the reference or for any object in that file.
-!  ref 	   - An object or dataset region reference.
-!
-! OUTPUTS
-!  name    - A name associated with the referenced object or dataset region.
-!
-!  hdferr  - error code
-!             Success:  0
-!             Failure: -1
-!
-! OPTIONAL PARAMETERS
-!  size    - The size of the name buffer, returning 0 (zero) if 
-!            no name is associated with the identifier
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  March 28, 2008
-!
-! SOURCES
-  SUBROUTINE h5rget_name_object_f(loc_id,  ref, name, hdferr, size)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id   ! Identifier for the file containing the reference or 
-                                           ! for any object in that file.
-                                           ! or for the group that dataset is in.
-    TYPE(hobj_ref_t_f), INTENT(IN) :: ref  ! Object reference
-    INTEGER(SIZE_T), OPTIONAL, INTENT(OUT) :: size   ! The size of the name buffer,
-                                           ! returning 0 (zero) if no name is associated with the identifier
-    CHARACTER(LEN=*), INTENT(OUT) :: name  ! A name associated with the referenced object or dataset region.
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-!*****
-    INTEGER(HADDR_T) :: ref_f              ! Local buffer to pass reference
-
-    INTEGER(SIZE_T) :: size_default
-    INTEGER(SIZE_T) :: name_len
-
-    INTERFACE
-       INTEGER FUNCTION h5rget_name_object_c(loc_id, ref_f, name, name_len, size_default)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5RGET_NAME_OBJECT_C':: h5rget_name_object_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         INTEGER(HID_T), INTENT(IN) :: loc_id
-         INTEGER(SIZE_T)  :: size_default
-         CHARACTER(LEN=*), INTENT(OUT) :: name
-         INTEGER(HADDR_T) :: ref_f
-
-         INTEGER(SIZE_T) :: name_len
-       END FUNCTION h5rget_name_object_c
-    END INTERFACE
-
-    name_len=LEN(name)
-
-    ref_f = ref%ref
-    hdferr = h5rget_name_object_c(loc_id, ref_f, name, name_len, size_default)
-
-    IF(PRESENT(size)) size = size_default
-
-  END SUBROUTINE h5rget_name_object_f
-
-!****s* H5R (F90)/h5rget_name_region_f
-!
-! NAME
-!  h5rget_name_region_f
-!
-! PURPOSE
-!  Retrieves a name of a dataset region.
-!
-! INPUTS
-!  loc_id 	 - Identifier for the file containing the reference or 
-!                  for any object in that file.
-!  ref 	         - An object or dataset region reference.
-!
-! OUTPUTS
-!  name 	 - A name associated with the referenced object or dataset region.
-!  hdferr 	 - error code
-!                   Success:  0
-!                   Failure: -1
-!
-! OPTIONAL PARAMETERS
-!  size 	 - The size of the name buffer,  returning 0 (zero) if no 
-!                  name is associated  with the identifier
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  March 28, 2008
-!
-! SOURCE
-  SUBROUTINE h5rget_name_region_f(loc_id, ref, name, hdferr, size)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id
-    TYPE(hdset_reg_ref_t_f), INTENT(IN) :: ref
-    INTEGER(SIZE_T), OPTIONAL, INTENT(OUT) :: size
-    CHARACTER(LEN=*), INTENT(OUT) :: name
-    INTEGER, INTENT(OUT) :: hdferr
-!*****
-    INTEGER :: ref_f(REF_REG_BUF_LEN)      ! Local buffer to pass reference
-    INTEGER(SIZE_T) :: size_default
-    INTEGER(SIZE_T) :: name_len
-
-    INTERFACE
-       INTEGER FUNCTION h5rget_name_region_c(loc_id, ref_f, name, name_len, size_default)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5RGET_NAME_REGION_C':: h5rget_name_region_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         INTEGER(HID_T), INTENT(IN) :: loc_id
-         INTEGER(SIZE_T)  :: size_default
-         CHARACTER(LEN=*), INTENT(OUT) :: name
-         INTEGER :: ref_f(REF_REG_BUF_LEN)
-
-         INTEGER(SIZE_T) :: name_len
-       END FUNCTION h5rget_name_region_c
-    END INTERFACE
-
-    name_len=LEN(name)
-
-    ref_f = ref%ref
-    hdferr = h5rget_name_region_c(loc_id, ref_f, name, name_len, size_default)
-
-    IF(PRESENT(size)) size = size_default
-
-  END SUBROUTINE h5rget_name_region_f
-
-END MODULE H5R_PROVISIONAL
diff --git a/fortran/src/H5Sf.c b/fortran/src/H5Sf.c
index 6947d64..d04b639 100644
--- a/fortran/src/H5Sf.c
+++ b/fortran/src/H5Sf.c
@@ -1,70 +1,67 @@
 /****h* H5Sf/H5Sf
  * PURPOSE
- *   This file contains C stubs for H5S Fortran APIs
+ *  This file contains C stubs for H5S Fortran APIs
  *
  * COPYRIGHT
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  ******
-*/
+ */
 
 #include "H5f90.h"
 #include "H5Eprivate.h"
 
 /****if* H5Sf/h5screate_simple_c
  * NAME
- *        h5screate_simple_c
+ *  h5screate_simple_c
  * PURPOSE
- *     Call H5Screate_simple to create a dataspace
+ *  Call H5Screate_simple to create a dataspace
  * INPUTS
- *      rank - number of dimensions of dataspace
- *              dims - array of the size of each dimension
-                maxdims - an array of the maximum size of each dimension
+ *  rank     - number of dimensions of dataspace
+ *  dims     - array of the size of each dimension
+ *  maxdims  - an array of the maximum size of each dimension
  * OUTPUTS
- *     space_id - identifier of the created dataspace
+ *  space_id - identifier of the created dataspace
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Wednesday, August 4, 1999
+ *  Wednesday, August 4, 1999
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5screate_simple_c ( int_f *rank, hsize_t_f *dims, hsize_t_f *maxdims, hid_t_f *space_id )
+h5screate_simple_c(int_f *rank, hsize_t_f *dims, hsize_t_f *maxdims, hid_t_f *space_id)
 /******/
 {
     hsize_t c_dims[H5S_MAX_RANK];
     hsize_t c_maxdims[H5S_MAX_RANK];
-    hid_t c_space_id;
-    int i;
-    int_f ret_value = 0;
+    hid_t   c_space_id;
+    int     i;
+    int_f   ret_value = 0;
 
     /*
      * Transpose dimension arrays because of C-FORTRAN storage order
      */
-    for(i = 0; i < *rank ; i++) {
-         c_dims[i] =  dims[*rank - i - 1];
-         c_maxdims[i] = maxdims[*rank - i - 1];
+    for (i = 0; i < *rank; i++) {
+        c_dims[i]    = dims[*rank - i - 1];
+        c_maxdims[i] = maxdims[*rank - i - 1];
     } /* end for */
 
     c_space_id = H5Screate_simple(*rank, c_dims, c_maxdims);
-    if(c_space_id < 0)
+    if (c_space_id < 0)
         HGOTO_DONE(FAIL)
 
     *space_id = (hid_t_f)c_space_id;
@@ -75,302 +72,309 @@ done:
 
 /****if* H5Sf/h5sclose_c
  * NAME
- *        h5sclose_c
+ *  h5sclose_c
  * PURPOSE
- *     Call H5Sclose to close the dataspace
+ *  Call H5Sclose to close the dataspace
  * INPUTS
- *      space_id - identifier of the dataspace to be closed
+ *  space_id - identifier of the dataspace to be closed
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Wednesday, August 4, 1999
+ *  Wednesday, August 4, 1999
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5sclose_c ( hid_t_f *space_id )
+h5sclose_c(hid_t_f *space_id)
 /******/
 {
-  int ret_value = 0;
-  hid_t c_space_id;
+    int   ret_value = 0;
+    hid_t c_space_id;
 
-  c_space_id = (hid_t)*space_id;
-  if ( H5Sclose(c_space_id) < 0  ) ret_value = -1;
-  return ret_value;
+    c_space_id = (hid_t)*space_id;
+    if (H5Sclose(c_space_id) < 0)
+        ret_value = -1;
+    return ret_value;
 }
 
 /****if* H5Sf/h5screate_c
  * NAME
- *        h5screate_c
+ *  h5screate_c
  * PURPOSE
- *     Call H5Screate to create a dataspace
+ *  Call H5Screate to create a dataspace
  * INPUTS
- *      classtype - type of the dataspace class
+ *  classtype - type of the dataspace class
  * OUTPUTS
- *     space_id - identifier of the created dataspace
+ *  space_id  - identifier of the created dataspace
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Tuesday, August 10, 1999
+ *  Tuesday, August 10, 1999
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5screate_c ( int_f *classtype, hid_t_f *space_id )
+h5screate_c(int_f *classtype, hid_t_f *space_id)
 /******/
 {
-  H5S_class_t c_classtype;
-  int ret_value = 0;
-  hid_t c_space_id;
-  c_classtype = (H5S_class_t) *classtype;
-  c_space_id = H5Screate(c_classtype);
-
-  if ( c_space_id  < 0  ) ret_value = -1;
-  *space_id = (hid_t_f) c_space_id;
-  return ret_value;
+    H5S_class_t c_classtype;
+    int         ret_value = 0;
+    hid_t       c_space_id;
+    c_classtype = (H5S_class_t)*classtype;
+    c_space_id  = H5Screate(c_classtype);
+
+    if (c_space_id < 0)
+        ret_value = -1;
+    *space_id = (hid_t_f)c_space_id;
+    return ret_value;
 }
 
 /****if* H5Sf/h5scopy_c
  * NAME
- *        h5scopy_c
+ *  h5scopy_c
  * PURPOSE
- *     Call H5Scopy to copy dataspace
+ *  Call H5Scopy to copy dataspace
  * INPUTS
- *      space_id - identifier of the dataspace to be copied
+ *  space_id     - identifier of the dataspace to be copied
  * OUTPUTS
- *     new_space_id - identifier of the new datspace
+ *  new_space_id - identifier of the new datspace
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Tuesday, August 10, 1999
+ *  Tuesday, August 10, 1999
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5scopy_c( hid_t_f *space_id , hid_t_f *new_space_id)
+h5scopy_c(hid_t_f *space_id, hid_t_f *new_space_id)
 /******/
 {
-  int ret_value = 0;
-  hid_t c_new_space_id;
-  hid_t c_space_id;
+    int   ret_value = 0;
+    hid_t c_new_space_id;
+    hid_t c_space_id;
 
-  c_space_id = (hid_t)*space_id;
-  c_new_space_id = H5Scopy(c_space_id);
-  if ( c_new_space_id < 0  ) ret_value = -1;
+    c_space_id     = (hid_t)*space_id;
+    c_new_space_id = H5Scopy(c_space_id);
+    if (c_new_space_id < 0)
+        ret_value = -1;
 
-  *new_space_id = (hid_t_f)c_new_space_id;
-  return ret_value;
+    *new_space_id = (hid_t_f)c_new_space_id;
+    return ret_value;
 }
 
 /****if* H5Sf/h5sget_select_hyper_nblocks_c
  * NAME
- *        h5sget_select_hyper_nblocks_c
+ *  h5sget_select_hyper_nblocks_c
  * PURPOSE
- *     Call H5SH5Sget_select_hyper_nblocks to
- *              get the the number of hyperslab blocks in
- *              the current dataspace selection if successful
+ *  Call H5SH5Sget_select_hyper_nblocks to
+ *  get the the number of hyperslab blocks in
+ *  the current dataspace selection if successful
  * INPUTS
- *      space_id - identifier of the dataspace
+ *  space_id   - identifier of the dataspace
  * OUTPUTS
- *     num_blocks -  number of hyperslab blocks in
- *              the current dataspace selection
+ *  num_blocks -  number of hyperslab blocks in
+ *                the current dataspace selection
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Xiangyang Su
- *              Friday, November 12, 1999
+ *  Friday, November 12, 1999
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5sget_select_hyper_nblocks_c( hid_t_f *space_id , hssize_t_f * num_blocks)
+h5sget_select_hyper_nblocks_c(hid_t_f *space_id, hssize_t_f *num_blocks)
 /******/
 {
-  int ret_value = 0;
-  hid_t c_space_id;
-  hssize_t c_num_blocks;
+    int      ret_value = 0;
+    hid_t    c_space_id;
+    hssize_t c_num_blocks;
 
-  c_space_id = (hid_t)*space_id;
-  c_num_blocks = H5Sget_select_hyper_nblocks(c_space_id);
-  if ( c_num_blocks < 0  ) ret_value = -1;
+    c_space_id   = (hid_t)*space_id;
+    c_num_blocks = H5Sget_select_hyper_nblocks(c_space_id);
+    if (c_num_blocks < 0)
+        ret_value = -1;
 
-  *num_blocks = (hssize_t_f)c_num_blocks;
-  return ret_value;
+    *num_blocks = (hssize_t_f)c_num_blocks;
+    return ret_value;
 }
 
 /****if* H5Sf/h5sget_select_elem_npoints_c
  * NAME
- *        h5sget_select_elem_npoints_c
+ *  h5sget_select_elem_npoints_c
  * PURPOSE
- *     Call H5Sget_select_elem_npoints to
- *              get the the number of element points in
- *              the current dataspace selection if successful
+ *  Call H5Sget_select_elem_npoints to
+ *  get the the number of element points in
+ *  the current dataspace selection if successful
  * INPUTS
- *      space_id - identifier of the dataspace
+ *  space_id   - identifier of the dataspace
  * OUTPUTS
- *     num_points -  number of element points in
- *              the current dataspace selection
+ *  num_points -  number of element points in
+ *                the current dataspace selection
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Xiangyang Su
- *              Monday, November 15, 1999
+ *  Monday, November 15, 1999
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5sget_select_elem_npoints_c( hid_t_f *space_id , hssize_t_f * num_points)
+h5sget_select_elem_npoints_c(hid_t_f *space_id, hssize_t_f *num_points)
 /******/
 {
-  int ret_value = 0;
-  hid_t c_space_id;
-  hssize_t c_num_points;
+    int      ret_value = 0;
+    hid_t    c_space_id;
+    hssize_t c_num_points;
 
-  c_space_id = (hid_t)*space_id;
-  c_num_points = H5Sget_select_elem_npoints(c_space_id);
-  if ( c_num_points < 0  ) ret_value = -1;
+    c_space_id   = (hid_t)*space_id;
+    c_num_points = H5Sget_select_elem_npoints(c_space_id);
+    if (c_num_points < 0)
+        ret_value = -1;
 
-  *num_points = (hssize_t_f)c_num_points;
-  return ret_value;
+    *num_points = (hssize_t_f)c_num_points;
+    return ret_value;
 }
 
 /****if* H5Sf/h5sget_select_hyper_blocklist_c
  * NAME
- *        h5sget_select_hyper_blocklist_c
+ *  h5sget_select_hyper_blocklist_c
  * PURPOSE
- *     Call H5Sget_select_hyper_blocklist to
- *              get a list of the hyperslab blocks currently selected
- *              Starting with the startblock-th block in the
- *              list of blocks, num_blocks blocks are put into the user's
- *              buffer. If the user's buffer fills up before numblocks
- *              blocks are inserted, the buffer
- *              will contain only as many blocks as fit.
+ *  Call H5Sget_select_hyper_blocklist to
+ *  get a list of the hyperslab blocks currently selected
+ *  Starting with the startblock-th block in the
+ *  list of blocks, num_blocks blocks are put into the user's
+ *  buffer. If the user's buffer fills up before numblocks
+ *  blocks are inserted, the buffer
+ *  will contain only as many blocks as fit.
  * INPUTS
- *      space_id - identifier of the dataspace
- *              startblock - Hyperslab block to start with
- *              num_blocks -  number of hyperslab blocks in
- *                            the current dataspace selection
+ *  space_id   - identifier of the dataspace
+ *  startblock - Hyperslab block to start with
+ *  num_blocks -  number of hyperslab blocks in
+ *                the current dataspace selection
  * OUTPUTS
- *     buf - List of hyperslab blocks selected
+ *  buf - List of hyperslab blocks selected
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Xiangyang Su
- *              Monday, November 15, 1999
+ *  Monday, November 15, 1999
  * HISTORY
  *
- *              Transpose dimension arrays because of C-FORTRAN storage order
- *              M. Scot Breitenfeld
+ *  Transpose dimension arrays because of C-FORTRAN storage order
+ *  M. Scot Breitenfeld
  * SOURCE
-*/
+ */
 
 int_f
-nh5sget_select_hyper_blocklist_c( hid_t_f *space_id ,hsize_t_f *startblock,
-                                  hsize_t_f *num_blocks, hsize_t_f *buf)
+h5sget_select_hyper_blocklist_c(hid_t_f *space_id, hsize_t_f *startblock, hsize_t_f *num_blocks,
+                                hsize_t_f *buf)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_space_id;
-  hsize_t c_num_blocks;
-
-  hsize_t i;
-  int j,k,m,n;
-  int rank;
-  hsize_t c_startblock, *c_buf;
-
-  c_space_id = (hid_t)*space_id;
-  c_num_blocks = (hsize_t)*num_blocks;
-
-  rank = H5Sget_simple_extent_ndims(c_space_id);
-  if (rank < 0 ) return ret_value;
-  c_startblock = (hsize_t)*startblock;
-
-  c_buf = (hsize_t*)HDmalloc(sizeof(hsize_t)*(size_t)(c_num_blocks*2*(hsize_t)rank));
-  if (!c_buf) return ret_value;
-
-  ret_value = H5Sget_select_hyper_blocklist(c_space_id, c_startblock,
-                                            c_num_blocks, c_buf);
-
-  /*
-   * Transpose dimension arrays because of C-FORTRAN storage order and add 1
-   */
-  n = 0;
-  m = 0;
-  for (i=0; i < c_num_blocks; i++) {
-    for (j=0; j < rank; j++) {
-      for (k=0; k < rank; k++) {
-	int t= (m + rank - k - 1);
-	buf[n] = (hsize_t_f)c_buf[t]+1;
-	n = n + 1;
-      }
-      m = m + rank;
+    int     ret_value = -1;
+    hid_t   c_space_id;
+    hsize_t c_num_blocks;
+
+    hsize_t i;
+    int     j, k, m, n;
+    int     rank;
+    hsize_t c_startblock, *c_buf;
+
+    c_space_id   = (hid_t)*space_id;
+    c_num_blocks = (hsize_t)*num_blocks;
+
+    rank = H5Sget_simple_extent_ndims(c_space_id);
+    if (rank < 0)
+        return ret_value;
+    c_startblock = (hsize_t)*startblock;
+
+    c_buf = (hsize_t *)HDmalloc(sizeof(hsize_t) * (size_t)(c_num_blocks * 2 * (hsize_t)rank));
+    if (!c_buf)
+        return ret_value;
+
+    ret_value = H5Sget_select_hyper_blocklist(c_space_id, c_startblock, c_num_blocks, c_buf);
+
+    /*
+     * Transpose dimension arrays because of C-FORTRAN storage order and add 1
+     */
+    n = 0;
+    m = 0;
+    for (i = 0; i < c_num_blocks; i++) {
+        for (j = 0; j < rank; j++) {
+            for (k = 0; k < rank; k++) {
+                int t  = (m + rank - k - 1);
+                buf[n] = (hsize_t_f)c_buf[t] + 1;
+                n      = n + 1;
+            }
+            m = m + rank;
+        }
     }
-  }
 
-  HDfree(c_buf);
-  if (ret_value  >= 0  ) ret_value = 0;
-  return ret_value;
+    HDfree(c_buf);
+    if (ret_value >= 0)
+        ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Sf/h5sget_select_bounds_c
  * NAME
- *        h5sget_select_bounds_c
+ *  h5sget_select_bounds_c
  * PURPOSE
- *     Call H5Sget_select_bounds to retrieve the coordinates
- *              of the bounding box containing the current selection
- *              and places them into user-supplied buffers
+ *  Call H5Sget_select_bounds to retrieve the coordinates
+ *  of the bounding box containing the current selection
+ *  and places them into user-supplied buffers
  * INPUTS
- *      space_id - identifier of the dataspace
+ *  space_id - identifier of the dataspace
  * OUTPUTS
- *     start -  Starting coordinates of the bounding box
- *              end -  Ending coordinates of the bounding box,
- *                     i.e., the coordinates of the diagonally opposite corne
+ *  start -  Starting coordinates of the bounding box
+ *  end   -  Ending coordinates of the bounding box,
+ *           i.e., the coordinates of the diagonally opposite corne
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Xiangyang Su
- *              Wednesday, November 17, 1999
+ *  Wednesday, November 17, 1999
  * HISTORY
- * swapped array bounds to account for C and Fortran reversed
- *                matrix notation.
- *                M. Scot Breitenfeld
+ *  swapped array bounds to account for C and Fortran reversed
+ *  matrix notation.
+ *  M. Scot Breitenfeld
  * SOURCE
-*/
+ */
 
 int_f
-nh5sget_select_bounds_c( hid_t_f *space_id , hsize_t_f * start, hsize_t_f * end)
+h5sget_select_bounds_c(hid_t_f *space_id, hsize_t_f *start, hsize_t_f *end)
 /******/
 {
-    hid_t c_space_id;
+    hid_t   c_space_id;
     hsize_t c_start[H5S_MAX_RANK];
     hsize_t c_end[H5S_MAX_RANK];
-    int i, rank;
-    int_f ret_value = 0;
+    int     i, rank;
+    int_f   ret_value = 0;
 
     c_space_id = (hid_t)*space_id;
-    rank = H5Sget_simple_extent_ndims(c_space_id);
-    if(rank < 0 )
+    rank       = H5Sget_simple_extent_ndims(c_space_id);
+    if (rank < 0)
         HGOTO_DONE(FAIL)
 
-    if(H5Sget_select_bounds(c_space_id, c_start, c_end) < 0)
+    if (H5Sget_select_bounds(c_space_id, c_start, c_end) < 0)
         HGOTO_DONE(FAIL)
 
-    for(i = 0; i < rank; i++) {
+    for (i = 0; i < rank; i++) {
         start[i] = (hsize_t_f)(c_start[rank - i - 1] + 1);
-        end[i] = (hsize_t_f)(c_end[rank - i - 1] + 1);
+        end[i]   = (hsize_t_f)(c_end[rank - i - 1] + 1);
     } /* end for */
 
 done:
@@ -379,357 +383,365 @@ done:
 
 /****if* H5Sf/h5sget_select_elem_pointlist_c
  * NAME
- *        h5sget_select_elem_pointlist_c
+ *  h5sget_select_elem_pointlist_c
  * PURPOSE
- *     Call  H5Sget_select_elem_pointlist
- *              get a list of  element points in the
- *              current dataspace selectin.
- *              Starting with the startpoint-th point in the
- *              list of points, numpoints points are put into the user's
- *              buffer. If the user's buffer fills up before numpoints
- *              points are inserted, the buffer
- *              will contain only as many points as fit.
+ *  Call  H5Sget_select_elem_pointlist
+ *  get a list of  element points in the
+ *  current dataspace selection.
+ *  Starting with the startpoint-th point in the
+ *  list of points, numpoints points are put into the user's
+ *  buffer. If the user's buffer fills up before numpoints
+ *  points are inserted, the buffer
+ *  will contain only as many points as fit.
  * INPUTS
- *      space_id - identifier of the dataspace
- *              startpoint - Element point to start with
- *              numpoints -  Number of element points to get
+ *  space_id   - identifier of the dataspace
+ *  startpoint - Element point to start with
+ *  numpoints  -  Number of element points to get
  * OUTPUTS
- *     buf - List of element points selected
+ *  buf - List of element points selected
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Xiangyang Su
- *              Wednesday, November 17, 1999
+ *  Wednesday, November 17, 1999
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5sget_select_elem_pointlist_c( hid_t_f *space_id ,hsize_t_f * startpoint,
-                                  hsize_t_f * numpoints, hsize_t_f * buf)
+h5sget_select_elem_pointlist_c(hid_t_f *space_id, hsize_t_f *startpoint, hsize_t_f *numpoints, hsize_t_f *buf)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_space_id;
-  hsize_t c_num_points;
-  hsize_t c_startpoint,* c_buf;
-  hsize_t i, i1;
-  int rank;
-  int j,i2;
-
-  c_space_id = (hid_t)*space_id;
-  c_num_points = (hsize_t)* numpoints;
-
-  rank = H5Sget_simple_extent_ndims(c_space_id);
-  if (rank < 0 ) return ret_value;
-
-  c_startpoint = (hsize_t)*startpoint;
-  c_buf = (hsize_t*)HDmalloc(sizeof(hsize_t)*(size_t)(c_num_points*(hsize_t)rank));
-  if (!c_buf) return ret_value;
-  ret_value = H5Sget_select_elem_pointlist(c_space_id, c_startpoint,
-                                            c_num_points, c_buf);
-
-  /* re-arrange the return buffer to account for Fortran ordering of 2D arrays */
-  /* and add 1 to account for array's starting at one in Fortran */
-  i2 = 0;
-  for( i = 0; i < c_num_points; i++) {
-    i1 =  (hsize_t)rank*(i+1);
-    for(j = 0; j < rank; j++) {
-      buf[i2] = (hsize_t_f)(c_buf[i1-1]+1);
-      i2 = i2 + 1;
-      i1 = i1 - 1;
+    int     ret_value = -1;
+    hid_t   c_space_id;
+    hsize_t c_num_points;
+    hsize_t c_startpoint, *c_buf;
+    hsize_t i, i1;
+    int     rank;
+    int     j, i2;
+
+    c_space_id   = (hid_t)*space_id;
+    c_num_points = (hsize_t)*numpoints;
+
+    rank = H5Sget_simple_extent_ndims(c_space_id);
+    if (rank < 0)
+        return ret_value;
+
+    c_startpoint = (hsize_t)*startpoint;
+    c_buf        = (hsize_t *)HDmalloc(sizeof(hsize_t) * (size_t)(c_num_points * (hsize_t)rank));
+    if (!c_buf)
+        return ret_value;
+    ret_value = H5Sget_select_elem_pointlist(c_space_id, c_startpoint, c_num_points, c_buf);
+
+    /* re-arrange the return buffer to account for Fortran ordering of 2D arrays */
+    /* and add 1 to account for array's starting at one in Fortran */
+    i2 = 0;
+    for (i = 0; i < c_num_points; i++) {
+        i1 = (hsize_t)rank * (i + 1);
+        for (j = 0; j < rank; j++) {
+            buf[i2] = (hsize_t_f)(c_buf[i1 - 1] + 1);
+            i2      = i2 + 1;
+            i1      = i1 - 1;
+        }
     }
-  }
 
-  if (ret_value  >= 0  ) ret_value = 0;
+    if (ret_value >= 0)
+        ret_value = 0;
 
-  HDfree(c_buf);
+    HDfree(c_buf);
 
-  return ret_value;
+    return ret_value;
 }
 
 /****if* H5Sf/h5sselect_all_c
  * NAME
- *        h5sselect_all_c
+ *  h5sselect_all_c
  * PURPOSE
- *     Call H5Sselect_all to select entire dataspace
+ *  Call H5Sselect_all to select entire dataspace
  * INPUTS
- *      space_id - identifier of the dataspace
+ *  space_id - identifier of the dataspace
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Tuesday, August 10, 1999
+ *  Tuesday, August 10, 1999
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5sselect_all_c ( hid_t_f *space_id )
+h5sselect_all_c(hid_t_f *space_id)
 /******/
 {
-  int ret_value = 0;
-  hid_t c_space_id;
+    int   ret_value = 0;
+    hid_t c_space_id;
 
-  c_space_id = (hid_t)*space_id;
-  if ( H5Sselect_all(c_space_id) < 0  ) ret_value = -1;
-  return ret_value;
+    c_space_id = (hid_t)*space_id;
+    if (H5Sselect_all(c_space_id) < 0)
+        ret_value = -1;
+    return ret_value;
 }
 
 /****if* H5Sf/h5sselect_none_c
  * NAME
- *        h5sselect_none_c
+ *  h5sselect_none_c
  * PURPOSE
- *     Call H5Sselect_none to reset the selection region
+ *  Call H5Sselect_none to reset the selection region
  * INPUTS
- *      space_id - identifier of the dataspace
+ *  space_id - identifier of the dataspace
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Tuesday, August 10, 1999
+ *  Tuesday, August 10, 1999
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5sselect_none_c ( hid_t_f *space_id )
+h5sselect_none_c(hid_t_f *space_id)
 /******/
 {
-  int ret_value = 0;
-  hid_t c_space_id;
+    int   ret_value = 0;
+    hid_t c_space_id;
 
-  c_space_id = (hid_t)*space_id;
-  if ( H5Sselect_none(c_space_id) < 0  ) ret_value = -1;
-  return ret_value;
+    c_space_id = (hid_t)*space_id;
+    if (H5Sselect_none(c_space_id) < 0)
+        ret_value = -1;
+    return ret_value;
 }
 
 /****if* H5Sf/h5sselect_valid_c
  * NAME
- *        h5sselect_valid_c
+ *  h5sselect_valid_c
  * PURPOSE
- *     Call H5Sselect_valid to verify that selection
- *              is within dataspace extent.
+ *  Call H5Sselect_valid to verify that selection
+ *  is within dataspace extent.
  * INPUTS
- *      space_id - identifier of the dataspace
+ *  space_id - identifier of the dataspace
  * OUTPUTS
- *     flag - 0 if not valid selection, 1 if is valid selection,
- *              and negative on failure.
+ *  flag     - 0 if not valid selection, 1 if is valid selection,
+ *             and negative on failure.
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Tuesday, August 10, 1999
+ *  Tuesday, August 10, 1999
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5sselect_valid_c ( hid_t_f *space_id , int_f *flag )
+h5sselect_valid_c(hid_t_f *space_id, int_f *flag)
 /******/
 {
-  int ret_value = 0;
-  hid_t c_space_id;
-  htri_t status;
-
-  c_space_id = (hid_t)*space_id;
-  status = H5Sselect_valid(c_space_id);
-  *flag = (int_f)status;
-  if ( status < 0  ) ret_value = -1;
-  return ret_value;
+    int    ret_value = 0;
+    hid_t  c_space_id;
+    htri_t status;
+
+    c_space_id = (hid_t)*space_id;
+    status     = H5Sselect_valid(c_space_id);
+    *flag      = (int_f)status;
+    if (status < 0)
+        ret_value = -1;
+    return ret_value;
 }
 
 /****if* H5Sf/h5sget_simple_extent_npoints_c
  * NAME
- *        h5sget_simple_extent_npoints_c
+ *  h5sget_simple_extent_npoints_c
  * PURPOSE
- *     Call H5Sget_simple_extent_npoints to determine the number
- *              of elements in a dataspace
+ *  Call H5Sget_simple_extent_npoints to determine the number
+ *  of elements in a dataspace
  * INPUTS
- *      space_id - identifier of the dataspace
+ *  space_id - identifier of the dataspace
  * OUTPUTS
- *     npoints - number of points in a dataspace
+ *  npoints  - number of points in a dataspace
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Wednesday, August 11, 1999
+ *  Wednesday, August 11, 1999
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5sget_simple_extent_npoints_c ( hid_t_f *space_id , hsize_t_f *npoints )
+h5sget_simple_extent_npoints_c(hid_t_f *space_id, hsize_t_f *npoints)
 /******/
 {
-  int ret_value = 0;
-  hid_t c_space_id;
-  hssize_t c_npoints;
-
-  c_space_id = (hid_t)*space_id;
-  c_npoints = H5Sget_simple_extent_npoints(c_space_id);
-  if ( c_npoints == 0  ) ret_value = -1;
-  *npoints = (hsize_t_f)c_npoints;
-  return ret_value;
+    int      ret_value = 0;
+    hid_t    c_space_id;
+    hssize_t c_npoints;
+
+    c_space_id = (hid_t)*space_id;
+    c_npoints  = H5Sget_simple_extent_npoints(c_space_id);
+    if (c_npoints == 0)
+        ret_value = -1;
+    *npoints = (hsize_t_f)c_npoints;
+    return ret_value;
 }
 
 /****if* H5Sf/h5sget_select_npoints_c
  * NAME
- *        h5sget_select_npoints_c
+ *  h5sget_select_npoints_c
  * PURPOSE
- *     Call H5Sget_select_npoints to determine the number
- *              of elements in a dataspace selection
+ *  Call H5Sget_select_npoints to determine the number
+ *  of elements in a dataspace selection
  * INPUTS
- *      space_id - identifier of the dataspace
+ *  space_id - identifier of the dataspace
  * OUTPUTS
- *     npoints - number of points in a dataspace selection
+ *  npoints  - number of points in a dataspace selection
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Wednesday, August 11, 1999
+ *  Wednesday, August 11, 1999
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5sget_select_npoints_c ( hid_t_f *space_id , hssize_t_f *npoints )
+h5sget_select_npoints_c(hid_t_f *space_id, hssize_t_f *npoints)
 /******/
 {
-  int ret_value = 0;
-  hssize_t c_npoints;
-  hid_t c_space_id;
-
-  c_space_id = (hid_t)*space_id;
-  c_npoints = H5Sget_select_npoints(c_space_id);
-  if ( c_npoints < 0  ) ret_value = -1;
-  *npoints = (hssize_t_f)c_npoints;
-  return ret_value;
+    int      ret_value = 0;
+    hssize_t c_npoints;
+    hid_t    c_space_id;
+
+    c_space_id = (hid_t)*space_id;
+    c_npoints  = H5Sget_select_npoints(c_space_id);
+    if (c_npoints < 0)
+        ret_value = -1;
+    *npoints = (hssize_t_f)c_npoints;
+    return ret_value;
 }
 
 /****if* H5Sf/h5sget_simple_extent_ndims_c
  * NAME
- *        h5sget_simple_extent_ndims_c
+ *  h5sget_simple_extent_ndims_c
  * PURPOSE
- *     Call H5Sget_simple_extent_ndims to determine the number
- *              dimensions
+ *  Call H5Sget_simple_extent_ndims to determine the number
+ *  dimensions
  * INPUTS
- *      space_id - identifier of the dataspace
+ *  space_id - identifier of the dataspace
  * OUTPUTS
- *     rank - number of dataspace dimensions
+ *  rank - number of dataspace dimensions
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Wednesday, August 11, 1999
+ *  Wednesday, August 11, 1999
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5sget_simple_extent_ndims_c ( hid_t_f *space_id , int_f *ndims )
+h5sget_simple_extent_ndims_c(hid_t_f *space_id, int_f *ndims)
 /******/
 {
-  int ret_value = 0;
-  hid_t c_space_id;
-  int c_ndims;
-
-  c_space_id = (hid_t)*space_id;
-  c_ndims = H5Sget_simple_extent_ndims(c_space_id);
-  if ( c_ndims < 0  ) ret_value = -1;
-  *ndims = (int_f)c_ndims;
-  return ret_value;
+    int   ret_value = 0;
+    hid_t c_space_id;
+    int   c_ndims;
+
+    c_space_id = (hid_t)*space_id;
+    c_ndims    = H5Sget_simple_extent_ndims(c_space_id);
+    if (c_ndims < 0)
+        ret_value = -1;
+    *ndims = (int_f)c_ndims;
+    return ret_value;
 }
 
 /****if* H5Sf/h5sget_simple_extent_type_c
  * NAME
- *        h5sget_simple_extent_type_c
+ *  h5sget_simple_extent_type_c
  * PURPOSE
- *     Call H5Sget_simple_extent_type to determine the class type
- *              of a dataspace
+ *  Call H5Sget_simple_extent_type to determine the class type
+ *  of a dataspace
  * INPUTS
- *      space_id - identifier of the dataspace
+ *  space_id  - identifier of the dataspace
  * OUTPUTS
- *     classtype - class type; possible values are:
+ *  classtype - class type; possible values are:
  *              H5S_SCALAR_F (0), H5S_SIMPLE_F (1), H5S_NULL_F (2)
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Wednesday, August 11, 1999
+ *  Wednesday, August 11, 1999
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5sget_simple_extent_type_c ( hid_t_f *space_id , int_f *classtype)
+h5sget_simple_extent_type_c(hid_t_f *space_id, int_f *classtype)
 /******/
 {
-  int ret_value = 0;
-  hid_t c_space_id;
-  H5S_class_t c_classtype;
-
-  c_space_id = (hid_t)*space_id;
-  c_classtype = H5Sget_simple_extent_type(c_space_id);
-  if ( c_classtype < 0  ) ret_value = -1;
-   *classtype = c_classtype;
-/*
-  if (c_classtype == H5S_SCALAR) *classtype = H5S_SCALAR_F;
-  if (c_classtype == H5S_SIMPLE) *classtype = H5S_SIMPLE_F;
-  if (c_classtype == H5S_NULL)   *classtype = H5S_NULL_F;
-*/
-  return ret_value;
+    int         ret_value = 0;
+    hid_t       c_space_id;
+    H5S_class_t c_classtype;
+
+    c_space_id  = (hid_t)*space_id;
+    c_classtype = H5Sget_simple_extent_type(c_space_id);
+    if (c_classtype < 0)
+        ret_value = -1;
+    *classtype = c_classtype;
+    /*
+      if (c_classtype == H5S_SCALAR) *classtype = H5S_SCALAR_F;
+      if (c_classtype == H5S_SIMPLE) *classtype = H5S_SIMPLE_F;
+      if (c_classtype == H5S_NULL)   *classtype = H5S_NULL_F;
+    */
+    return ret_value;
 }
 
 /****if* H5Sf/h5soffset_simple_c
  * NAME
- *        h5soffset_simple_c
+ *  h5soffset_simple_c
  * PURPOSE
- *     Call H5Soffset_simple to set the offset of a simple
- *              dataspace
+ *  Call H5Soffset_simple to set the offset of a simple
+ *  dataspace
  * INPUTS
- *      space_id - identifier of the dataspace
- *              offset - offset array
+ *  space_id - identifier of the dataspace
+ *  offset   - offset array
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Wednesday, August 11, 1999
+ *  Wednesday, August 11, 1999
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5soffset_simple_c ( hid_t_f *space_id , hssize_t_f *offset)
+h5soffset_simple_c(hid_t_f *space_id, hssize_t_f *offset)
 /******/
 {
-    hid_t c_space_id;
-    int rank;
+    hid_t    c_space_id;
+    int      rank;
     hssize_t c_offset[H5S_MAX_RANK];
-    int i;
-    int_f ret_value = 0;
+    int      i;
+    int_f    ret_value = 0;
 
     c_space_id = (hid_t)*space_id;
-    rank = H5Sget_simple_extent_ndims(c_space_id);
-    if(rank < 0)
+    rank       = H5Sget_simple_extent_ndims(c_space_id);
+    if (rank < 0)
         HGOTO_DONE(FAIL)
 
     /*
      * Reverse dimensions due to C-FORTRAN storage order.
      */
-    for(i = 0; i < rank; i++)
+    for (i = 0; i < rank; i++)
         c_offset[i] = offset[rank - i - 1];
 
-    if(H5Soffset_simple(c_space_id, c_offset) < 0)
+    if (H5Soffset_simple(c_space_id, c_offset) < 0)
         HGOTO_DONE(FAIL)
 
 done:
@@ -738,95 +750,94 @@ done:
 
 /****if* H5Sf/h5sset_extent_simple_c
  * NAME
- *        h5sset_extent_simple_c
+ *  h5sset_extent_simple_c
  * PURPOSE
- *     Call H5Sset_extent_simple to set or reset size of
- *              existing  dataspace
+ *  Call H5Sset_extent_simple to set or reset size of
+ *  existing  dataspace
  * INPUTS
- *      space_id - identifier of the dataspace
- *              rank - dataspace rank
- *              current_size - array with the new dimension sizes
- *              maximum_size - aray with maximum sizes of dimensions
+ *  space_id     - identifier of the dataspace
+ *  rank         - dataspace rank
+ *  current_size - array with the new dimension sizes
+ *  maximum_size - array with maximum sizes of dimensions
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Wednesday, August 11, 1999
+ *  Wednesday, August 11, 1999
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5sset_extent_simple_c ( hid_t_f *space_id , int_f *rank, hsize_t_f *current_size, hsize_t_f *maximum_size)
+h5sset_extent_simple_c(hid_t_f *space_id, int_f *rank, hsize_t_f *current_size, hsize_t_f *maximum_size)
 /******/
 {
     hsize_t c_current_size[H5S_MAX_RANK];
     hsize_t c_maximum_size[H5S_MAX_RANK];
-    int i;
-    int_f ret_value = 0;
+    int     i;
+    int_f   ret_value = 0;
 
     /*
      * Reverse dimensions due to C-FORTRAN storage order.
      */
-    for(i = 0; i < *rank; i++) {
+    for (i = 0; i < *rank; i++) {
         c_current_size[i] = (hsize_t)current_size[*rank - i - 1];
         c_maximum_size[i] = (hsize_t)maximum_size[*rank - i - 1];
     } /* end for */
 
-    if(H5Sset_extent_simple((hid_t)*space_id, (int)*rank, c_current_size, c_maximum_size) < 0)
+    if (H5Sset_extent_simple((hid_t)*space_id, (int)*rank, c_current_size, c_maximum_size) < 0)
         HGOTO_DONE(FAIL)
 
 done:
     return ret_value;
 }
 
-
 /****if* H5Sf/h5sget_simple_extent_dims_c
  * NAME
- *        h5sget_simple_extent_dims_c
+ *  h5sget_simple_extent_dims_c
  * PURPOSE
- *     Call H5Sget_simple_extent_dims to retrieve sizes of an
- *              existing  dataspace
+ *  Call H5Sget_simple_extent_dims to retrieve sizes of an
+ *  existing  dataspace
  * INPUTS
- *      space_id - identifier of the dataspace
+ *  space_id - identifier of the dataspace
  * OUTPUTS
- *     dims - array with the dimension sizes
- *              maxdims - aray with maximum sizes of dimensions
+ *  dims    - array with the dimension sizes
+ *  maxdims - array with maximum sizes of dimensions
  * RETURNS
- *     number of dataspace dimensions (rank) on success, -1 on failure
+ *  number of dataspace dimensions (rank) on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Wednesday, August 11, 1999
+ *  Wednesday, August 11, 1999
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5sget_simple_extent_dims_c ( hid_t_f *space_id , hsize_t_f *dims, hsize_t_f *maxdims)
+h5sget_simple_extent_dims_c(hid_t_f *space_id, hsize_t_f *dims, hsize_t_f *maxdims)
 /******/
 {
-    hid_t c_space_id;
+    hid_t   c_space_id;
     hsize_t c_dims[H5S_MAX_RANK];
     hsize_t c_maxdims[H5S_MAX_RANK];
-    int rank;
-    int i;
-    int_f ret_value;
+    int     rank;
+    int     i;
+    int_f   ret_value;
 
     c_space_id = (hid_t)*space_id;
-    rank = H5Sget_simple_extent_ndims(c_space_id);
-    if(rank < 0)
+    rank       = H5Sget_simple_extent_ndims(c_space_id);
+    if (rank < 0)
         HGOTO_DONE(FAIL)
 
-    if(H5Sget_simple_extent_dims(c_space_id, c_dims, c_maxdims) < 0)
+    if (H5Sget_simple_extent_dims(c_space_id, c_dims, c_maxdims) < 0)
         HGOTO_DONE(FAIL)
 
     /*
      * Reverse dimensions due to C-FORTRAN storage order.
      */
-    for(i = 0; i < rank; i++) {
-        dims[rank - i - 1] = (hsize_t_f)c_dims[i];
+    for (i = 0; i < rank; i++) {
+        dims[rank - i - 1]    = (hsize_t_f)c_dims[i];
         maxdims[rank - i - 1] = (hsize_t_f)c_maxdims[i];
     } /* end for */
 
@@ -838,564 +849,572 @@ done:
 
 /****if* H5Sf/h5sis_simple_c
  * NAME
- *        h5sis_simple_c
+ *  h5sis_simple_c
  * PURPOSE
- *     Call H5Sis_simple to detrmine if the dataspace
- *              is simple.
+ *  Call H5Sis_simple to determine if the dataspace
+ *  is simple.
  * INPUTS
- *      space_id - identifier of the dataspace
+ *  space_id - identifier of the dataspace
  * OUTPUTS
- *     flag - 0 if not simple, 1 if is simple,
- *              and negative on failure.
+ *  flag     - 0 if not simple, 1 if is simple,
+ *             and negative on failure.
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Wednesday, August 11, 1999
+ *  Wednesday, August 11, 1999
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5sis_simple_c ( hid_t_f *space_id , int_f *flag )
+h5sis_simple_c(hid_t_f *space_id, int_f *flag)
 /******/
 {
-  int ret_value = 0;
-  hid_t c_space_id;
-  htri_t status;
-
-  c_space_id = (hid_t)*space_id;
-  status = H5Sis_simple(c_space_id);
-  *flag = (int_f)status;
-  if ( status < 0  ) ret_value = -1;
-  return ret_value;
-}
+    int    ret_value = 0;
+    hid_t  c_space_id;
+    htri_t status;
 
+    c_space_id = (hid_t)*space_id;
+    status     = H5Sis_simple(c_space_id);
+    *flag      = (int_f)status;
+    if (status < 0)
+        ret_value = -1;
+    return ret_value;
+}
 
 /****if* H5Sf/h5sextent_copy_c
  * NAME
- *        h5sextent_copy_c
+ *  h5sextent_copy_c
  * PURPOSE
- *     Call H5Sextent_copy to copy an extent of dataspace
+ *  Call H5Sextent_copy to copy an extent of dataspace
  * INPUTS
- *      dest_space_id - identifier of the destination dataspace
- *              source_space_id - identifier of the source dataspace
+ *  dest_space_id   - identifier of the destination dataspace
+ *  source_space_id - identifier of the source dataspace
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Wednesday, August 11, 1999
+ *  Wednesday, August 11, 1999
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5sextent_copy_c ( hid_t_f *dest_space_id , hid_t_f *source_space_id)
+h5sextent_copy_c(hid_t_f *dest_space_id, hid_t_f *source_space_id)
 /******/
 {
-  int ret_value = 0;
-  hid_t c_dest_space_id, c_source_space_id;
-  herr_t status;
-
-  c_dest_space_id = (hid_t)*dest_space_id;
-  c_source_space_id = (hid_t)*source_space_id;
-  status = H5Sextent_copy(c_dest_space_id, c_source_space_id);
-  if ( status < 0  ) ret_value = -1;
-  return ret_value;
+    int    ret_value = 0;
+    hid_t  c_dest_space_id, c_source_space_id;
+    herr_t status;
+
+    c_dest_space_id   = (hid_t)*dest_space_id;
+    c_source_space_id = (hid_t)*source_space_id;
+    status            = H5Sextent_copy(c_dest_space_id, c_source_space_id);
+    if (status < 0)
+        ret_value = -1;
+    return ret_value;
 }
 
 /****if* H5Sf/h5sset_extent_none_c
  * NAME
- *        h5sset_extent_none_c
+ *  h5sset_extent_none_c
  * PURPOSE
- *     Call H5Sset_extent_none to remove extent from a dataspace
+ *  Call H5Sset_extent_none to remove extent from a dataspace
  * INPUTS
- *      space_id - dataspace identifier
+ *  space_id - dataspace identifier
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Wednesday, August 11, 1999
+ *  Wednesday, August 11, 1999
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5sset_extent_none_c ( hid_t_f *space_id )
+h5sset_extent_none_c(hid_t_f *space_id)
 /******/
 {
-  int ret_value = 0;
-  hid_t c_space_id;
-  herr_t status;
-
-  c_space_id = (hid_t)*space_id;
-  status = H5Sset_extent_none(c_space_id);
-  if ( status < 0  ) ret_value = -1;
-  return ret_value;
+    int    ret_value = 0;
+    hid_t  c_space_id;
+    herr_t status;
+
+    c_space_id = (hid_t)*space_id;
+    status     = H5Sset_extent_none(c_space_id);
+    if (status < 0)
+        ret_value = -1;
+    return ret_value;
 }
 
 /****if* H5Sf/h5sselect_hyperslab_c
  * NAME
- *        h5sselect_hyperslab_c
+ *  h5sselect_hyperslab_c
  * PURPOSE
- *     Call H5Sselect_hyperslab to select a hyperslab
+ *  Call H5Sselect_hyperslab to select a hyperslab
  * INPUTS
- *      space_id - identifier of the dataspace
- *              operator - defines how the new selection is combined
- *              with the previous one; current values are
- *              H5S_SELECT_SET_F (0) and H5S_SELECT_OR_F (1)
- *              start - offset of start of hyperslab
- *              count - number of blocks included in the hyperslab
- *              stride - hyperslab stride (interval between blocks)
- *              block - size of block in the hyperslab
+ *  space_id - identifier of the dataspace
+ *  operator - defines how the new selection is combined
+ *             with the previous one; current values are
+ *             H5S_SELECT_SET_F (0) and H5S_SELECT_OR_F (1)
+ *  start    - offset of start of hyperslab
+ *  count    - number of blocks included in the hyperslab
+ *  stride   - hyperslab stride (interval between blocks)
+ *  block    - size of block in the hyperslab
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Wednesday, August 11, 1999
+ *  Wednesday, August 11, 1999
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5sselect_hyperslab_c ( hid_t_f *space_id , int_f *op, hsize_t_f *start, hsize_t_f *count, hsize_t_f *stride, hsize_t_f *block)
+h5sselect_hyperslab_c(hid_t_f *space_id, int_f *op, hsize_t_f *start, hsize_t_f *count, hsize_t_f *stride,
+                      hsize_t_f *block)
 /******/
 {
     hsize_t c_start[H5S_MAX_RANK];
     hsize_t c_count[H5S_MAX_RANK];
     hsize_t c_stride[H5S_MAX_RANK];
     hsize_t c_block[H5S_MAX_RANK];
-    int rank;
-    int i;
-    int_f ret_value = 0;
+    int     rank;
+    int     i;
+    int_f   ret_value = 0;
 
     rank = H5Sget_simple_extent_ndims((hid_t)*space_id);
-    if(rank < 0 )
+    if (rank < 0)
         HGOTO_DONE(FAIL)
 
     /*
      * Reverse dimensions due to C-FORTRAN storage order.
      */
-    for(i = 0; i < rank; i++) {
+    for (i = 0; i < rank; i++) {
         int t = (rank - i) - 1;
 
-        c_start[i] = (hsize_t)start[t];
-        c_count[i] = (hsize_t)count[t];
+        c_start[i]  = (hsize_t)start[t];
+        c_count[i]  = (hsize_t)count[t];
         c_stride[i] = (hsize_t)stride[t];
-        c_block[i] = (hsize_t)block[t];
+        c_block[i]  = (hsize_t)block[t];
     } /* end for */
 
-    if(H5Sselect_hyperslab((hid_t)*space_id, (H5S_seloper_t)*op, c_start, c_stride, c_count, c_block) < 0)
+    if (H5Sselect_hyperslab((hid_t)*space_id, (H5S_seloper_t)*op, c_start, c_stride, c_count, c_block) < 0)
         HGOTO_DONE(FAIL)
 
 done:
     return ret_value;
 }
 
-
-#ifdef NEW_HYPERSLAB_API
 /****if* H5Sf/h5scombine_hyperslab_c
  * NAME
- *        h5scombine_hyperslab_c
+ *  h5scombine_hyperslab_c
  * PURPOSE
- *     Call H5Scombine_hyperslab
+ *  Call H5Scombine_hyperslab
  * INPUTS
- *      space_id - identifier of the dataspace
- *              operator - defines how the new selection is combined
- *              start - offset of start of hyperslab
- *              count - number of blocks included in the hyperslab
- *              stride - hyperslab stride (interval between blocks)
- *              block - size of block in the hyperslab
+ *  space_id - identifier of the dataspace
+ *  operator - defines how the new selection is combined
+ *  start    - offset of start of hyperslab
+ *  count    - number of blocks included in the hyperslab
+ *  stride   - hyperslab stride (interval between blocks)
+ *  block    - size of block in the hyperslab
  * OUTPUTS
- *     hyper_id - identifier for the new dataspace
+ *  hyper_id - identifier for the new dataspace
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Monday, October 7, 2002
+ *  Monday, October 7, 2002
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5scombine_hyperslab_c ( hid_t_f *space_id , int_f *op, hsize_t_f *start, hsize_t_f *count, hsize_t_f *stride, hsize_t_f *block, hid_t_f *hyper_id)
+h5scombine_hyperslab_c(hid_t_f *space_id, int_f *op, hsize_t_f *start, hsize_t_f *count, hsize_t_f *stride,
+                       hsize_t_f *block, hid_t_f *hyper_id)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_space_id;
-  hid_t c_hyper_id;
-  hsize_t *c_start = NULL;
-  hsize_t *c_count = NULL;
-  hsize_t *c_stride = NULL;
-  hsize_t *c_block = NULL;
-
-  H5S_seloper_t c_op;
-  herr_t  status;
-  int rank;
-  int i;
-
-  rank = H5Sget_simple_extent_ndims(*space_id);
-  if (rank < 0 ) return ret_value;
-  c_start = (hsize_t *)HDmalloc(sizeof(hsize_t)*rank);
-  if (c_start == NULL) goto DONE;
-
-  c_count = (hsize_t *)HDmalloc(sizeof(hsize_t)*rank);
-  if (c_count == NULL) goto DONE;
-
-  c_stride = (hsize_t *)HDmalloc(sizeof(hsize_t)*rank);
-  if (c_stride == NULL) goto DONE;
-
-  c_block = (hsize_t *)HDmalloc(sizeof(hsize_t)*rank);
-  if (c_block == NULL) goto DONE;
-
-
-  /*
-   * Reverse dimensions due to C-FORTRAN storage order.
-   */
-
-  for (i=0; i < rank; i++) {
-      int t= (rank - i) - 1;
-      c_start[i] = (hsize_t)start[t];
-      c_count[i] = (hsize_t)count[t];
-      c_stride[i] = (hsize_t)stride[t];
-      c_block[i] = (hsize_t)block[t];
-  }
-
-   c_op = (H5S_seloper_t)*op;
-
-  c_space_id = (hid_t)*space_id;
-  c_hyper_id = H5Scombine_hyperslab(c_space_id, c_op, c_start, c_stride, c_count, c_block);
-  if ( c_hyper_id < 0  ) goto DONE;
-  *hyper_id = (hid_t_f)c_hyper_id;
-  ret_value = 0;
+    int      ret_value = -1;
+    hid_t    c_space_id;
+    hid_t    c_hyper_id;
+    hsize_t *c_start  = NULL;
+    hsize_t *c_count  = NULL;
+    hsize_t *c_stride = NULL;
+    hsize_t *c_block  = NULL;
+
+    H5S_seloper_t c_op;
+    int           rank;
+    int           i;
+
+    rank = H5Sget_simple_extent_ndims(*space_id);
+    if (rank < 0)
+        return ret_value;
+    c_start = (hsize_t *)HDmalloc(sizeof(hsize_t) * (unsigned)rank);
+    if (c_start == NULL)
+        goto DONE;
+
+    c_count = (hsize_t *)HDmalloc(sizeof(hsize_t) * (unsigned)rank);
+    if (c_count == NULL)
+        goto DONE;
+
+    c_stride = (hsize_t *)HDmalloc(sizeof(hsize_t) * (unsigned)rank);
+    if (c_stride == NULL)
+        goto DONE;
+
+    c_block = (hsize_t *)HDmalloc(sizeof(hsize_t) * (unsigned)rank);
+    if (c_block == NULL)
+        goto DONE;
+
+    /*
+     * Reverse dimensions due to C-FORTRAN storage order.
+     */
+
+    for (i = 0; i < rank; i++) {
+        int t       = (rank - i) - 1;
+        c_start[i]  = (hsize_t)start[t];
+        c_count[i]  = (hsize_t)count[t];
+        c_stride[i] = (hsize_t)stride[t];
+        c_block[i]  = (hsize_t)block[t];
+    }
+
+    c_op = (H5S_seloper_t)*op;
+
+    c_space_id = (hid_t)*space_id;
+    c_hyper_id = H5Scombine_hyperslab(c_space_id, c_op, c_start, c_stride, c_count, c_block);
+    if (c_hyper_id < 0)
+        goto DONE;
+    *hyper_id = (hid_t_f)c_hyper_id;
+    ret_value = 0;
 DONE:
-  if(c_start != NULL) HDfree(c_start);
-  if(c_count != NULL) HDfree(c_count);
-  if(c_stride!= NULL) HDfree(c_stride);
-  if(c_block != NULL) HDfree(c_block);
-  return ret_value;
+    if (c_start != NULL)
+        HDfree(c_start);
+    if (c_count != NULL)
+        HDfree(c_count);
+    if (c_stride != NULL)
+        HDfree(c_stride);
+    if (c_block != NULL)
+        HDfree(c_block);
+    return ret_value;
 }
 /****if* H5Sf/h5scombine_select_c
  * NAME
- *        h5scombine_select_c
+ *  h5scombine_select_c
  * PURPOSE
- *     Call H5Scombine_ select
+ *  Call H5Scombine_ select
  * INPUTS
- *      space1_id - identifier of the first dataspace
- *              operator - defines how the new selection is combined
- *              space2_id - identifier of the second dataspace
+ *  space1_id - identifier of the first dataspace
+ *  operator  - defines how the new selection is combined
+ *  space2_id - identifier of the second dataspace
  * OUTPUTS
- *     ds_id   - identifier for the new dataspace
+ *  ds_id     - identifier for the new dataspace
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Monday, October 7, 2002
+ *  Monday, October 7, 2002
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5scombine_select_c ( hid_t_f *space1_id , int_f *op, hid_t_f *space2_id, hid_t_f *ds_id)
+h5scombine_select_c(hid_t_f *space1_id, int_f *op, hid_t_f *space2_id, hid_t_f *ds_id)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_space1_id;
-  hid_t c_space2_id;
-  hid_t c_ds_id;
-  H5S_seloper_t c_op;
-
-  c_op = (H5S_seloper_t)*op;
-
-  c_space1_id = (hid_t)*space1_id;
-  c_space2_id = (hid_t)*space2_id;
-  c_ds_id = H5Scombine_select(c_space1_id, c_op, c_space2_id);
-  if ( c_ds_id < 0  ) return ret_value;
-  *ds_id = (hid_t_f)c_ds_id;
-  ret_value = 0;
-  return ret_value;
+    int           ret_value = -1;
+    hid_t         c_space1_id;
+    hid_t         c_space2_id;
+    hid_t         c_ds_id;
+    H5S_seloper_t c_op;
+
+    c_op = (H5S_seloper_t)*op;
+
+    c_space1_id = (hid_t)*space1_id;
+    c_space2_id = (hid_t)*space2_id;
+    c_ds_id     = H5Scombine_select(c_space1_id, c_op, c_space2_id);
+    if (c_ds_id < 0)
+        return ret_value;
+    *ds_id    = (hid_t_f)c_ds_id;
+    ret_value = 0;
+    return ret_value;
 }
-/****if* H5Sf/h5sselect_select_c
+/****if* H5Sf/h5smodify_select_c
  * NAME
- *        h5sselect_select_c
+ *  h5smodify_select_c
  * PURPOSE
- *     Call H5Sselect_ select
+ *  Call H5Smodify_select
  * INPUTS
- *      space1_id - identifier of the first dataspace  to modify
- *              operator - defines how the new selection is combined
- *              space2_id - identifier of the second dataspace
+ *  space1_id - identifier of the first dataspace  to modify
+ *  operator - defines how the new selection is combined
+ *  space2_id - identifier of the second dataspace
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Monday, October 7, 2002
+ *  Monday, October 7, 2002
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5sselect_select_c ( hid_t_f *space1_id , int_f *op, hid_t_f *space2_id)
+h5smodify_select_c(hid_t_f *space1_id, int_f *op, hid_t_f *space2_id)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_space1_id;
-  hid_t c_space2_id;
-  H5S_seloper_t c_op;
-
-  c_op = (H5S_seloper_t)*op;
-
-  c_space1_id = (hid_t)*space1_id;
-  c_space2_id = (hid_t)*space2_id;
-  if( H5Sselect_select(c_space1_id, c_op, c_space2_id)< 0) return ret_value;
-  ret_value = 0;
-  return ret_value;
+    int           ret_value = -1;
+    hid_t         c_space1_id;
+    hid_t         c_space2_id;
+    H5S_seloper_t c_op;
+
+    c_op = (H5S_seloper_t)*op;
+
+    c_space1_id = (hid_t)*space1_id;
+    c_space2_id = (hid_t)*space2_id;
+    if (H5Smodify_select(c_space1_id, c_op, c_space2_id) < 0)
+        return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
-#endif /*NEW_HYPERSLAB_API*/
+
 /****if* H5Sf/h5sget_select_type_c
  * NAME
- *        h5sget_select_type_c
+ *  h5sget_select_type_c
  * PURPOSE
- *     Call H5Sget_select_type
+ *  Call H5Sget_select_type
  * INPUTS
- *      space_id - identifier of the dataspace
+ *  space_id - identifier of the dataspace
  * OUTPUTS
- *     type - type of selection
+ *  type - type of selection
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Monday, October 7, 2002
+ *  Monday, October 7, 2002
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5sget_select_type_c ( hid_t_f *space_id , int_f *type)
+h5sget_select_type_c(hid_t_f *space_id, int_f *type)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_space_id;
-  H5S_sel_type c_type;
-
-  c_space_id = (hid_t)*space_id;
-  c_type = H5Sget_select_type(c_space_id);
-  if(c_type < 0) return ret_value;
-  *type = (int_f)c_type;
-  ret_value = 0;
-  return ret_value;
-}
+    int          ret_value = -1;
+    hid_t        c_space_id;
+    H5S_sel_type c_type;
 
+    c_space_id = (hid_t)*space_id;
+    c_type     = H5Sget_select_type(c_space_id);
+    if (c_type < 0)
+        return ret_value;
+    *type     = (int_f)c_type;
+    ret_value = 0;
+    return ret_value;
+}
 
 /****if* H5Sf/h5sselect_elements_c
  * NAME
- *        h5sselect_elements_c
+ *  h5sselect_elements_c
  * PURPOSE
- *     Call H5Sselect_elements to select elements of a dataspace
+ *  Call H5Sselect_elements to select elements of a dataspace
  * INPUTS
- *      space_id - identifier of the dataspace
- *              operator - defines how the new selection is combined
- *              with the previous one; current values are
- *              H5S_SELECT_SET_F (0)
- *              nelements - number of elements in the selection
- *              coord - arrays with the elements coordinates
+ *  space_id  - identifier of the dataspace
+ *  operator  - defines how the new selection is combined
+ *             with the previous one; current values are
+ *                 H5S_SELECT_SET_F (0)
+ *  nelements - number of elements in the selection
+ *  coord     - arrays with the elements coordinates
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Wednesday, August 11, 1999
+ *  Wednesday, August 11, 1999
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5sselect_elements_c ( hid_t_f *space_id , int_f *op, size_t_f *nelements,  hsize_t_f *coord)
+h5sselect_elements_c(hid_t_f *space_id, int_f *op, size_t_f *nelements, hsize_t_f *coord)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_space_id;
-  H5S_seloper_t c_op;
-  herr_t  status;
-  int rank;
-  size_t i;
-  int j;
-  hsize_t *c_coord;
-  size_t c_nelements;
-
-  c_op = (H5S_seloper_t)*op;
-
-  c_space_id = *space_id;
-  rank = H5Sget_simple_extent_ndims(c_space_id);
-
-  c_coord = (hsize_t *)HDmalloc(sizeof(hsize_t)*(size_t)rank*((size_t)*nelements));
-  if(!c_coord) return ret_value;
-  for (i=0; i< (size_t)*nelements; i++) {
-      for (j = 0; j < rank; j++) {
-	c_coord[(size_t)j+i*(size_t)rank] = (hsize_t)coord[(size_t)j + i*(size_t)rank];
-      }
-  }
-
-  c_nelements = *nelements;
-  status = H5Sselect_elements(c_space_id, c_op, c_nelements, c_coord);
-  if ( status >= 0  ) ret_value = 0;
-  HDfree(c_coord);
-  return ret_value;
+    int           ret_value = -1;
+    hid_t         c_space_id;
+    H5S_seloper_t c_op;
+    herr_t        status;
+    int           rank;
+    size_t        i;
+    int           j;
+    hsize_t      *c_coord;
+    size_t        c_nelements;
+
+    c_op = (H5S_seloper_t)*op;
+
+    c_space_id = *space_id;
+    rank       = H5Sget_simple_extent_ndims(c_space_id);
+
+    c_coord = (hsize_t *)HDmalloc(sizeof(hsize_t) * (size_t)rank * ((size_t)*nelements));
+    if (!c_coord)
+        return ret_value;
+    for (i = 0; i < (size_t)*nelements; i++) {
+        for (j = 0; j < rank; j++) {
+            c_coord[(size_t)j + i * (size_t)rank] = (hsize_t)coord[(size_t)j + i * (size_t)rank];
+        }
+    }
+
+    c_nelements = *nelements;
+    status      = H5Sselect_elements(c_space_id, c_op, c_nelements, c_coord);
+    if (status >= 0)
+        ret_value = 0;
+    HDfree(c_coord);
+    return ret_value;
 }
 
 /****if* H5Sf/h5sdecode_c
  * NAME
- *        h5sdecode_c
+ *  h5sdecode_c
  * PURPOSE
- *     Call H5Sdecode
+ *  Call H5Sdecode
  * INPUTS
- *
- *		buf     - Buffer for the data space object to be decoded.
+ *  buf    - Buffer for the data space object to be decoded.
  * OUTPUTS
- *
- *              obj_id  - Object_id (non-negative)
- *
+ *  obj_id  - Object_id (non-negative)
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              March 26, 2008
+ *  March 26, 2008
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5sdecode_c ( _fcd buf, hid_t_f *obj_id )
+h5sdecode_c(_fcd buf, hid_t_f *obj_id)
 /******/
 {
-  int ret_value = -1;
-  unsigned char *c_buf = NULL;  /* Buffer to hold C string */
-  hid_t c_obj_id;
+    int            ret_value = -1;
+    unsigned char *c_buf     = NULL; /* Buffer to hold C string */
+    hid_t          c_obj_id;
 
-  /*
-   * Call H5Sdecode function.
-   */
+    /*
+     * Call H5Sdecode function.
+     */
 
-  c_buf = (unsigned char*)buf;
+    c_buf = (unsigned char *)buf;
 
-  c_obj_id = H5Sdecode(c_buf);
-  if(c_obj_id < 0)
-    return ret_value;
+    c_obj_id = H5Sdecode(c_buf);
+    if (c_obj_id < 0)
+        return ret_value;
 
-  *obj_id = (hid_t_f)c_obj_id;
-  ret_value = 0;
+    *obj_id   = (hid_t_f)c_obj_id;
+    ret_value = 0;
 
-  return ret_value;
+    return ret_value;
 }
 
 /****if* H5Sf/h5sencode_c
  * NAME
- *        h5sencode_c
+ *  h5sencode_c
  * PURPOSE
- *     Call H5Sencode
+ *  Call H5Sencode
  * INPUTS
- *
- *            obj_id - Identifier of the object to be encoded.
- *		 buf - Buffer for the object to be encoded into.
- *            nalloc - The size of the allocated buffer.
+ *  obj_id - Identifier of the object to be encoded.
+ *  buf    - Buffer for the object to be encoded into.
+ *  nalloc - The size of the allocated buffer.
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              March 26, 2008
+ *  March 26, 2008
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5sencode_c (_fcd buf, hid_t_f *obj_id, size_t_f *nalloc )
+h5sencode_c(_fcd buf, hid_t_f *obj_id, size_t_f *nalloc, hid_t_f *fapl_id)
 /******/
 {
-  int ret_value = -1;
-  unsigned char *c_buf = NULL;          /* Buffer to hold C string */
-  size_t c_size;
+    int            ret_value = -1;
+    unsigned char *c_buf     = NULL; /* Buffer to hold C string */
+    size_t         c_size;
 
-  /* return just the size of the allocated buffer;
-   * equivalent to C routine for which 'name' is set equal to NULL
-   */
+    /* return just the size of the allocated buffer;
+     * equivalent to C routine for which 'name' is set equal to NULL
+     */
 
-  if (*nalloc == 0) {
+    if (*nalloc == 0) {
 
-    if(H5Sencode((hid_t)*obj_id, c_buf, &c_size) < 0)
-      return ret_value;
+        if (H5Sencode2((hid_t)*obj_id, c_buf, &c_size, (hid_t)*fapl_id) < 0)
+            return ret_value;
 
-    *nalloc = (size_t_f)c_size;
+        *nalloc = (size_t_f)c_size;
 
-    ret_value = 0;
-    return ret_value;
-  }
+        ret_value = 0;
+        return ret_value;
+    }
 
-  c_size = (size_t)*nalloc;
-  /*
-   * Allocate buffer
-   */
-  if(NULL == (c_buf = (unsigned char *)HDmalloc(c_size)))
-    return ret_value;
-  /*
-   * Call H5Sencode function.
-   */
-  if(H5Sencode((hid_t)*obj_id, c_buf, &c_size) < 0){
-    return ret_value;
-  }
+    c_size = (size_t)*nalloc;
+    /*
+     * Allocate buffer
+     */
+    if (NULL == (c_buf = (unsigned char *)HDmalloc(c_size)))
+        return ret_value;
+    /*
+     * Call H5Sencode function.
+     */
+    if (H5Sencode2((hid_t)*obj_id, c_buf, &c_size, (hid_t)*fapl_id) < 0) {
+        return ret_value;
+    }
 
-  /* copy the C buffer to the FORTRAN buffer.
-   * Can not use HD5packFstring because we don't want to
-   * eliminate the NUL terminator or pad remaining space
-   * with blanks.
-   */
+    /* copy the C buffer to the FORTRAN buffer.
+     * Can not use HD5packFstring because we don't want to
+     * eliminate the NUL terminator or pad remaining space
+     * with blanks.
+     */
 
-  HDmemcpy(_fcdtocp(buf),(char *)c_buf,c_size);
+    HDmemcpy(_fcdtocp(buf), (char *)c_buf, c_size);
 
-  ret_value = 0;
-  if(c_buf) HDfree(c_buf);
-  return ret_value;
+    ret_value = 0;
+    if (c_buf)
+        HDfree(c_buf);
+    return ret_value;
 }
 
 /****if* H5Sf/h5sextent_equal_c
  * NAME
- *        h5sextent_equal_c
+ *  h5sextent_equal_c
  * PURPOSE
- *     Call H5Sextent_equal
+ *  Call H5Sextent_equal
  * INPUTS
- *
- *		space1_id - First dataspace identifier.
- *              space2_id - Second dataspace identifier.
+ *  space1_id - First dataspace identifier.
+ *  space2_id - Second dataspace identifier.
  * OUTPUTS
- *
- *              equal - TRUE if equal, FALSE if unequal.
+ *  equal - TRUE if equal, FALSE if unequal.
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              April 4, 2008
+ *  April 4, 2008
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5sextent_equal_c ( hid_t_f * space1_id, hid_t_f *space2_id, hid_t_f *c_equal)
+h5sextent_equal_c(hid_t_f *space1_id, hid_t_f *space2_id, hid_t_f *c_equal)
 /******/
 {
-  int ret_value = -1;
+    int ret_value = -1;
 
-  if( (*c_equal = (hid_t_f)H5Sextent_equal((hid_t)*space1_id, (hid_t)*space2_id)) < 0)
-    return ret_value;
+    if ((*c_equal = (hid_t_f)H5Sextent_equal((hid_t)*space1_id, (hid_t)*space2_id)) < 0)
+        return ret_value;
 
-  ret_value = 0;
-  return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
-
diff --git a/fortran/src/H5Sff.F90 b/fortran/src/H5Sff.F90
new file mode 100644
index 0000000..9a2f89a
--- /dev/null
+++ b/fortran/src/H5Sff.F90
@@ -0,0 +1,1383 @@
+!> @defgroup FH5S Fortran Dataspace (H5S) Interface
+!!
+!! @see H5S, C-API
+!!
+!! @see @ref H5S_UG, User Guide
+!!
+
+!> @ingroup FH5S
+!!
+!! @brief This module contains Fortran interfaces for H5S functions.
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+! NOTES
+!
+!       _____ __  __ _____   ____  _____ _______       _   _ _______
+!      |_   _|  \/  |  __ \ / __ \|  __ \__   __|/\   | \ | |__   __|
+! ****   | | | \  / | |__) | |  | | |__) | | |  /  \  |  \| |  | |    ****
+! ****   | | | |\/| |  ___/| |  | |  _  /  | | / /\ \ | . ` |  | |    ****
+! ****  _| |_| |  | | |    | |__| | | \ \  | |/ ____ \| |\  |  | |    ****
+!      |_____|_|  |_|_|     \____/|_|  \_\ |_/_/    \_\_| \_|  |_|
+!
+!  If you add a new H5S function you must add the function name to the
+!  Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
+!  This is needed for Windows based operating systems.
+!
+
+MODULE H5S
+  USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR, C_CHAR, C_INT
+  USE H5GLOBAL
+
+CONTAINS
+!>
+!! \ingroup FH5S
+!!
+!! \brief Creates a new simple data space and opens it for access.
+!!
+!! \param rank     Number of dimensions.
+!! \param dims     An array of the size of each dimension.
+!! \param space_id Dataspace identifier.
+!! \param hdferr   \fortran_error
+!! \param maxdims  An array of the maximum size of each dimension.
+!!
+!! See C API: @ref H5Screate_simple()
+!!
+  SUBROUTINE h5screate_simple_f(rank, dims, space_id, hdferr, maxdims)
+
+    IMPLICIT NONE
+    INTEGER, INTENT(IN) :: rank
+    INTEGER(HSIZE_T), INTENT(IN) :: dims(rank)
+    INTEGER(HID_T), INTENT(OUT) :: space_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HSIZE_T), OPTIONAL, INTENT(IN) :: maxdims(rank)
+    INTEGER(HSIZE_T), ALLOCATABLE, DIMENSION(:) :: f_maxdims
+
+    INTERFACE
+       INTEGER FUNCTION h5screate_simple_c(rank, dims, maxdims, space_id) BIND(C,NAME='h5screate_simple_c')
+         IMPORT :: HID_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER, INTENT(IN) :: rank
+         INTEGER(HSIZE_T), INTENT(IN) :: dims(rank)
+         INTEGER(HSIZE_T), DIMENSION(:),INTENT(IN) :: maxdims(rank)
+         INTEGER(HID_T), INTENT(OUT) :: space_id
+       END FUNCTION h5screate_simple_c
+    END INTERFACE
+
+    ALLOCATE (f_maxdims(rank), stat=hdferr)
+    IF (hdferr .NE. 0) THEN
+       hdferr = -1
+       RETURN
+    ENDIF
+    IF (PRESENT(maxdims)) THEN
+       f_maxdims = maxdims
+    ELSE
+       f_maxdims = dims
+    ENDIF
+    hdferr = h5screate_simple_c(rank, dims, f_maxdims, space_id)
+    DEALLOCATE(f_maxdims)
+
+  END SUBROUTINE h5screate_simple_f
+
+!>
+!! \ingroup FH5S
+!!
+!! \brief Releases and terminates access to a dataspace.
+!!
+!! \param space_id Identifier of dataspace to release.
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Sclose()
+!!
+  SUBROUTINE h5sclose_f(space_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: space_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5sclose_c(space_id) BIND(C,NAME='h5sclose_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: space_id
+       END FUNCTION h5sclose_c
+    END INTERFACE
+
+    hdferr = h5sclose_c(space_id)
+
+  END SUBROUTINE h5sclose_f
+
+!>
+!! \ingroup FH5S
+!!
+!! \brief Creates a new dataspace of a specified type.
+!!
+!! \param classtype The type of the dataspace to be created. Possible values are:
+!!                  \li H5S_SCALAR_F
+!!                  \li H5S_SIMPLE_F
+!!                  \li H5S_NULL_F
+!! \param space_id  Dataspace identifier.
+!! \param hdferr    \fortran_error
+!!
+!! See C API: @ref H5Screate()
+!!
+  SUBROUTINE h5screate_f(classtype, space_id, hdferr)
+    IMPLICIT NONE
+    INTEGER, INTENT(IN) :: classtype
+    INTEGER(HID_T), INTENT(OUT) :: space_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5screate_c(classtype, space_id) BIND(C,NAME='h5screate_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER, INTENT(IN) :: classtype
+         INTEGER(HID_T), INTENT(OUT) :: space_id
+       END FUNCTION h5screate_c
+    END INTERFACE
+
+    hdferr = h5screate_c(classtype, space_id)
+
+  END SUBROUTINE h5screate_f
+
+!>
+!! \ingroup FH5S
+!!
+!! \brief Creates an exact copy of a dataspace.
+!!
+!! \param space_id     Dataspace identifier.
+!! \param new_space_id Identifier of dataspace&apos;s copy.
+!! \param hdferr       \fortran_error
+!!
+!! See C API: @ref H5Scopy()
+!!
+  SUBROUTINE h5scopy_f(space_id, new_space_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: space_id
+    INTEGER(HID_T), INTENT(OUT) :: new_space_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5scopy_c(space_id, new_space_id) BIND(C,NAME='h5scopy_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: space_id
+         INTEGER(HID_T), INTENT(OUT):: new_space_id
+       END FUNCTION h5scopy_c
+    END INTERFACE
+
+    hdferr = h5scopy_c(space_id, new_space_id)
+
+  END SUBROUTINE h5scopy_f
+
+!>
+!! \ingroup FH5S
+!!
+!! \brief Get number of hyperslab blocks.
+!!
+!! \param space_id   Dataspace identifier.
+!! \param num_blocks Number of hyperslab blocks in the current hyperslab selection.
+!! \param hdferr     \fortran_error
+!!
+!! See C API: @ref H5Sget_select_hyper_nblocks()
+!!
+  SUBROUTINE h5sget_select_hyper_nblocks_f(space_id, num_blocks, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: space_id
+    INTEGER(HSSIZE_T), INTENT(OUT) :: num_blocks
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5sget_select_hyper_nblocks_c (space_id, num_blocks) &
+            BIND(C,NAME='h5sget_select_hyper_nblocks_c')
+         IMPORT :: HID_T, HSSIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: space_id
+         INTEGER(HSSIZE_T), INTENT(OUT) :: num_blocks
+       END FUNCTION h5sget_select_hyper_nblocks_c
+    END INTERFACE
+
+    hdferr =  h5sget_select_hyper_nblocks_c (space_id, num_blocks)
+
+  END SUBROUTINE h5sget_select_hyper_nblocks_f
+
+!>
+!! \ingroup FH5S
+!!
+!! \brief Gets the list of hyperslab blocks currently selected.
+!!
+!! \param space_id   Dataspace identifier.
+!! \param startblock Hyperslab block to start with.
+!! \param num_blocks Number of blocks to get.
+!! \param buf        Buffer to hold block list.
+!! \param hdferr     \fortran_error
+!!
+!! See C API: @ref H5Sget_select_hyper_blocklist()
+!!
+  SUBROUTINE h5sget_select_hyper_blocklist_f(space_id, startblock, &
+                                                    num_blocks, buf, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: space_id
+    INTEGER(HSIZE_T), INTENT(IN) :: startblock
+    INTEGER(HSIZE_T), INTENT(IN) :: num_blocks
+    INTEGER(HSIZE_T), DIMENSION(*), INTENT(OUT) :: buf
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5sget_select_hyper_blocklist_c(space_id, startblock, &
+            num_blocks, buf ) BIND(C,NAME='h5sget_select_hyper_blocklist_c')
+         IMPORT :: HID_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: space_id
+         INTEGER(HSIZE_T), INTENT(IN) :: startblock
+         INTEGER(HSIZE_T), INTENT(IN) :: num_blocks
+         INTEGER(HSIZE_T), DIMENSION(*), INTENT(OUT) :: buf
+       END FUNCTION h5sget_select_hyper_blocklist_c
+    END INTERFACE
+
+    hdferr =  h5sget_select_hyper_blocklist_c(space_id, startblock, num_blocks, buf )
+
+  END SUBROUTINE h5sget_select_hyper_blocklist_f
+
+!>
+!! \ingroup FH5S
+!!
+!! \brief Gets the bounding box containing the current selection.
+!!
+!! \param space_id Dataspace identifier.
+!! \param start    Starting coordinates of bounding box.
+!! \param end      Ending coordinates of bounding box, i.e., the coordinates of the diagonally opposite corner.
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Sget_select_bounds()
+!!
+  SUBROUTINE  h5sget_select_bounds_f(space_id, start, END, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: space_id
+    INTEGER(HSIZE_T), DIMENSION(*), INTENT(OUT) :: start
+    INTEGER(HSIZE_T), DIMENSION(*), INTENT(OUT) :: END
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5sget_select_bounds_c(space_id, start, end) &
+            BIND(C,NAME='h5sget_select_bounds_c')
+         IMPORT :: HID_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: space_id
+         INTEGER(HSIZE_T), DIMENSION(*), INTENT(OUT) :: start
+         INTEGER(HSIZE_T), DIMENSION(*), INTENT(OUT) :: END
+       END FUNCTION h5sget_select_bounds_c
+    END INTERFACE
+
+    hdferr =   h5sget_select_bounds_c(space_id, start, END)
+
+  END SUBROUTINE h5sget_select_bounds_f
+
+!>
+!! \ingroup FH5S
+!!
+!! \brief Gets the number of element points in the current selection
+!!
+!! \param space_id   Dataspace identifier.
+!! \param num_points Number of element points in the current dataspace selection
+!! \param hdferr     \fortran_error
+!!
+!! See C API: @ref H5Sget_select_elem_npoints()
+!!
+  SUBROUTINE h5sget_select_elem_npoints_f(space_id, num_points, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: space_id
+    INTEGER(HSSIZE_T), INTENT(OUT) :: num_points
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5sget_select_elem_npoints_c (space_id, num_points) BIND(C,NAME='h5sget_select_elem_npoints_c')
+         IMPORT :: HID_T, HSSIZE_T
+         INTEGER(HID_T), INTENT(IN) :: space_id
+         INTEGER(HSSIZE_T), INTENT(OUT) :: num_points
+       END FUNCTION h5sget_select_elem_npoints_c
+    END INTERFACE
+
+    hdferr =  h5sget_select_elem_npoints_c (space_id, num_points)
+
+  END SUBROUTINE h5sget_select_elem_npoints_f
+
+!>
+!! \ingroup FH5S
+!!
+!! \brief Gets the list of element points currently selected.
+!!
+!! \param space_id   Dataspace identifier.
+!! \param startpoint Element point to start with.
+!! \param num_points Number of element points to get.
+!! \param buf        Buffer with element points selected.
+!! \param hdferr     \fortran_error
+!!
+!! See C API: @ref H5Sget_select_elem_pointlist()
+!!
+  SUBROUTINE h5sget_select_elem_pointlist_f(space_id, startpoint, &
+       num_points, buf, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: space_id
+    INTEGER(HSIZE_T), INTENT(IN) :: startpoint
+    INTEGER(HSIZE_T), INTENT(IN) :: num_points
+    INTEGER(HSIZE_T), DIMENSION(*), INTENT(OUT) :: buf
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5sget_select_elem_pointlist_c(space_id, startpoint, &
+            num_points, buf ) BIND(C,NAME='h5sget_select_elem_pointlist_c')
+         IMPORT :: HID_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: space_id
+         INTEGER(HSIZE_T), INTENT(IN) :: startpoint
+         INTEGER(HSIZE_T), INTENT(IN) :: num_points
+         INTEGER(HSIZE_T), DIMENSION(*), INTENT(OUT) :: buf
+       END FUNCTION h5sget_select_elem_pointlist_c
+    END INTERFACE
+
+    hdferr =  h5sget_select_elem_pointlist_c(space_id, startpoint, &
+         num_points, buf )
+
+  END SUBROUTINE h5sget_select_elem_pointlist_f
+
+!>
+!! \ingroup FH5S
+!!
+!! \brief Selects elements to be included in the selection for a dataspace
+!!
+!! \param space_id     Dataspace identifier.
+!! \param operator     Flag, valid values are:
+!!                     \li H5S_SELECT_SET_F
+!!                     \li H5S_SELECT_APPEND_F
+!!                     \li H5S_SELECT_PREPEND_F
+!! \param rank         Number of dataspace dimensions.
+!! \param num_elements Number of elements to be selected.
+!! \param coord        2D (rank x num_elements) array with the elements coordinates ( 1-based); in C the
+!!                     array is stored in 2D as (num_element x rank).
+!! \param hdferr       \fortran_error
+!!
+!! See C API: @ref H5Sselect_elements()
+!!
+  SUBROUTINE h5sselect_elements_f(space_id, OPERATOR, rank, &
+       num_elements, coord, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T),   INTENT(IN)                                :: space_id
+    INTEGER,          INTENT(IN)                                :: OPERATOR
+    INTEGER,          INTENT(IN)                                :: rank
+    INTEGER(SIZE_T),  INTENT(IN)                                :: num_elements
+    INTEGER(HSIZE_T), INTENT(IN) , DIMENSION(rank,num_elements) :: coord
+    INTEGER,          INTENT(OUT)                               :: hdferr
+    INTEGER(HSIZE_T), ALLOCATABLE, DIMENSION(:,:) :: c_coord
+    INTEGER :: error, i
+
+    INTERFACE
+       INTEGER FUNCTION h5sselect_elements_c(space_id, OPERATOR,&
+            num_elements,c_c_coord) BIND(C,NAME='h5sselect_elements_c')
+         IMPORT :: HID_T, SIZE_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: space_id
+         INTEGER, INTENT(IN) :: OPERATOR
+         INTEGER(SIZE_T), INTENT(IN) :: num_elements
+         INTEGER(HSIZE_T),DIMENSION(*) :: c_c_coord
+       END FUNCTION h5sselect_elements_c
+    END INTERFACE
+
+    ALLOCATE(c_coord(rank,num_elements), STAT = error)
+    IF (error.NE. 0) THEN
+       hdferr = -1
+       RETURN
+    ENDIF
+    DO i = 1, rank
+       c_coord(i,:) = coord(rank-i+1, :) - 1
+    ENDDO
+    hdferr = h5sselect_elements_c(space_id, OPERATOR, num_elements, c_coord)
+
+!  ALLOCATE(c_coord(num_elements,rank), stat = error)
+!  IF (error.NE. 0) THEN
+!  hdferr = -1
+!  RETURN
+!  ENDIF
+!
+!  c_coord = TRANSPOSE(coord)
+!  hdferr = h5sselect_elements_c(space_id, OPERATOR, INT(rank,size_t), c_coord)
+
+
+    DEALLOCATE(c_coord)
+
+  END SUBROUTINE h5sselect_elements_f
+
+!>
+!! \ingroup FH5S
+!!
+!! \brief Selects the entire dataspace.
+!!
+!! \param space_id Identifier for the dataspace in which selection being made.
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Sselect_all()
+!!
+  SUBROUTINE h5sselect_all_f(space_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: space_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5sselect_all_c(space_id) BIND(C,NAME='h5sselect_all_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: space_id
+       END FUNCTION h5sselect_all_c
+    END INTERFACE
+
+    hdferr = h5sselect_all_c(space_id)
+
+  END SUBROUTINE h5sselect_all_f
+
+!>
+!! \ingroup FH5S
+!!
+!! \brief Resets the selection region to include no elements.
+!!
+!! \param space_id The identifier for the dataspace in which the selection is being reset.
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Sselect_none()
+!!
+  SUBROUTINE h5sselect_none_f(space_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: space_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5sselect_none_c(space_id) BIND(C,NAME='h5sselect_none_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: space_id
+       END FUNCTION h5sselect_none_c
+    END INTERFACE
+
+    hdferr = h5sselect_none_c(space_id)
+
+  END SUBROUTINE h5sselect_none_f
+
+!>
+!! \ingroup FH5S
+!!
+!! \brief Verifies that the selection is within the extent of the dataspace.
+!!
+!! \param space_id Identifier for the dataspace for which selection is verified
+!! \param status   TRUE if the selection is contained within the extent, FALSE otherwise.
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Sselect_valid()
+!!
+  SUBROUTINE h5sselect_valid_f(space_id, status, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: space_id
+    LOGICAL, INTENT(OUT) :: status
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: flag ! "TRUE/FALSE/ERROR" flag from C routine
+
+    INTERFACE
+       INTEGER FUNCTION h5sselect_valid_c(space_id, flag) BIND(C,NAME='h5sselect_valid_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: space_id
+         INTEGER :: flag
+       END FUNCTION h5sselect_valid_c
+    END INTERFACE
+
+    hdferr = h5sselect_valid_c(space_id, flag)
+    status = .TRUE.
+    IF (flag .EQ. 0) status = .FALSE.
+
+  END SUBROUTINE h5sselect_valid_f
+
+!>
+!! \ingroup FH5S
+!!
+!! \brief Determines the number of elements in a dataspace.
+!!
+!! \param space_id Dataspace identifier.
+!! \param npoints  Number of elements in the dataspace.
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Sget_simple_extent_npoints()
+!!
+  SUBROUTINE h5sget_simple_extent_npoints_f(space_id, npoints, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: space_id
+    INTEGER(HSIZE_T), INTENT(OUT) :: npoints
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5sget_simple_extent_npoints_c( space_id, npoints) BIND(C,NAME='h5sget_simple_extent_npoints_c')
+         IMPORT :: HID_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: space_id
+         INTEGER(HSIZE_T), INTENT(OUT) :: npoints
+       END FUNCTION h5sget_simple_extent_npoints_c
+    END INTERFACE
+
+    hdferr = h5sget_simple_extent_npoints_c( space_id, npoints)
+
+  END SUBROUTINE h5sget_simple_extent_npoints_f
+
+!>
+!! \ingroup FH5S
+!!
+!! \brief Determines the number of elements in a dataspace selection.
+!!
+!! \param space_id Dataspace identifier.
+!! \param npoints  Number of points in the dataspace selection.
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Sget_select_npoints()
+!!
+  SUBROUTINE h5sget_select_npoints_f(space_id, npoints, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: space_id
+    INTEGER(HSSIZE_T), INTENT(OUT) :: npoints
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5sget_select_npoints_c(space_id, npoints) BIND(C,NAME='h5sget_select_npoints_c')
+         IMPORT :: HID_T, HSSIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: space_id
+         INTEGER(HSSIZE_T), INTENT(OUT) :: npoints
+       END FUNCTION h5sget_select_npoints_c
+    END INTERFACE
+
+    hdferr = h5sget_select_npoints_c(space_id, npoints)
+
+  END SUBROUTINE h5sget_select_npoints_f
+
+!>
+!! \ingroup FH5S
+!!
+!! \brief Determines the dimensionality of a dataspace
+!!
+!! \param space_id Dataspace identifier.
+!! \param rank     Number of dataspace dimensions.
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Sget_simple_extent_ndims()
+!!
+  SUBROUTINE h5sget_simple_extent_ndims_f(space_id, rank, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: space_id
+    INTEGER, INTENT(OUT) :: rank
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5sget_simple_extent_ndims_c(space_id, rank) BIND(C,NAME='h5sget_simple_extent_ndims_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: space_id
+         INTEGER, INTENT(OUT) :: rank
+       END FUNCTION h5sget_simple_extent_ndims_c
+    END INTERFACE
+
+    hdferr = h5sget_simple_extent_ndims_c(space_id, rank)
+
+  END SUBROUTINE h5sget_simple_extent_ndims_f
+!>
+!! \ingroup FH5S
+!!
+!! \brief Retrieves dataspace dimension size and maximum size.
+!!
+!! \param space_id Dataspace identifier.
+!! \param dims     Array to store size of each dimension.
+!! \param maxdims  Array to store maximum size of each dimension.
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Sget_simple_extent_dims()
+!!
+  SUBROUTINE h5sget_simple_extent_dims_f(space_id, dims, maxdims, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: space_id
+    INTEGER(HSIZE_T), DIMENSION(*), INTENT(OUT) :: dims
+    INTEGER(HSIZE_T), DIMENSION(*), INTENT(OUT) :: maxdims
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5sget_simple_extent_dims_c(space_id, dims, maxdims) BIND(C,NAME='h5sget_simple_extent_dims_c')
+         IMPORT :: HID_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: space_id
+         INTEGER(HSIZE_T), DIMENSION(*), INTENT(OUT) :: dims
+         INTEGER(HSIZE_T), DIMENSION(*), INTENT(OUT) :: maxdims
+       END FUNCTION h5sget_simple_extent_dims_c
+    END INTERFACE
+
+    hdferr = h5sget_simple_extent_dims_c(space_id, dims, maxdims)
+
+  END SUBROUTINE h5sget_simple_extent_dims_f
+
+!>
+!! \ingroup FH5S
+!!
+!! \brief Determine the current class of a dataspace
+!!
+!! \param space_id  Dataspace identifier.
+!! \param classtype Class type, possible values are:
+!!                  \li H5S_NO_CLASS_F
+!!                  \li H5S_SCALAR_F
+!!                  \li H5S_SIMPLE_F
+!!                  \li H5S_NULL_F
+!! \param hdferr    \fortran_error
+!!
+!! See C API: @ref H5Sget_simple_extent_type()
+!!
+  SUBROUTINE h5sget_simple_extent_type_f(space_id, classtype, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: space_id
+    INTEGER, INTENT(OUT) :: classtype
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5sget_simple_extent_type_c(space_id, classtype) BIND(C,NAME='h5sget_simple_extent_type_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: space_id
+         INTEGER, INTENT(OUT) :: classtype
+       END FUNCTION h5sget_simple_extent_type_c
+    END INTERFACE
+
+    hdferr = h5sget_simple_extent_type_c(space_id, classtype)
+
+  END SUBROUTINE h5sget_simple_extent_type_f
+  !
+!>
+!! \ingroup FH5S
+!!
+!! \brief Sets or resets the size of an existing dataspace.
+!!
+!! \param space_id     Dataspace identifier.
+!! \param rank         Dataspace number of dimensions.
+!! \param current_size Array with the new sizes of dimensions.
+!! \param maximum_size Array with the new maximum sizes of dimensions.
+!! \param hdferr       \fortran_error
+!!
+!! See C API: @ref H5Sset_extent_simple()
+!!
+  SUBROUTINE h5sset_extent_simple_f(space_id, rank, current_size, &
+       maximum_size, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: space_id
+    INTEGER, INTENT(IN) :: rank
+    INTEGER(HSIZE_T), DIMENSION(rank), INTENT(IN) :: current_size
+    INTEGER(HSIZE_T), DIMENSION(rank), INTENT(IN) :: maximum_size
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5sset_extent_simple_c(space_id, rank, &
+            current_size, maximum_size) BIND(C,NAME='h5sset_extent_simple_c')
+         IMPORT :: HID_T, HSIZE_T
+         INTEGER(HID_T), INTENT(IN) :: space_id
+         INTEGER, INTENT(IN) :: rank
+         INTEGER(HSIZE_T), DIMENSION(rank), INTENT(IN) :: current_size
+         INTEGER(HSIZE_T), DIMENSION(rank), INTENT(IN) :: maximum_size
+       END FUNCTION h5sset_extent_simple_c
+    END INTERFACE
+
+    hdferr = h5sset_extent_simple_c(space_id, rank, current_size, &
+         maximum_size)
+
+  END SUBROUTINE h5sset_extent_simple_f
+!>
+!! \ingroup FH5S
+!!
+!! \brief Determines whether a dataspace is a simple dataspace.
+!!
+!! \param space_id Dataspace identifier.
+!! \param status   Flag to indicate if dataspace is simple or not (TRUE or FALSE).
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Sis_simple()
+!!
+  SUBROUTINE h5sis_simple_f(space_id, status, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: space_id
+    LOGICAL, INTENT(OUT) :: status
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: flag                     ! "TRUE/FALSE/ERROR from C"
+
+    INTERFACE
+       INTEGER FUNCTION h5sis_simple_c(space_id, flag) BIND(C,NAME='h5sis_simple_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: space_id
+         INTEGER :: flag
+       END FUNCTION h5sis_simple_c
+    END INTERFACE
+
+    hdferr = h5sis_simple_c(space_id, flag)
+    status = .TRUE.
+    IF (flag .EQ. 0) status = .FALSE.
+
+  END SUBROUTINE h5sis_simple_f
+
+!>
+!! \ingroup FH5S
+!!
+!! \brief Sets the offset of a simple dataspace.
+!!
+!! \param space_id Dataspace identifier.
+!! \param offset   The offset at which to position the selection.
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Soffset_simple()
+!!
+  SUBROUTINE h5soffset_simple_f(space_id, offset, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: space_id
+    INTEGER(HSSIZE_T), DIMENSION(*), INTENT(IN) ::  offset
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5soffset_simple_c(space_id, offset) BIND(C,NAME='h5soffset_simple_c')
+         IMPORT :: HID_T, HSSIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: space_id
+         INTEGER(HSSIZE_T), DIMENSION(*), INTENT(IN) ::  offset
+       END FUNCTION h5soffset_simple_c
+    END INTERFACE
+
+    hdferr = h5soffset_simple_c(space_id, offset)
+
+  END SUBROUTINE h5soffset_simple_f
+
+!>
+!! \ingroup FH5S
+!!
+!! \brief Copies the extent of a dataspace.
+!!
+!! \param dest_space_id   The identifier for the dataspace to which the extent is copied.
+!! \param source_space_id The identifier for the dataspace from which the extent is copied.
+!! \param hdferr          \fortran_error
+!!
+!! See C API: @ref H5Sextent_copy()
+!!
+  SUBROUTINE h5sextent_copy_f(dest_space_id, source_space_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dest_space_id
+    INTEGER(HID_T), INTENT(IN) :: source_space_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5sextent_copy_c(dest_space_id, source_space_id) BIND(C,NAME='h5sextent_copy_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: dest_space_id
+         INTEGER(HID_T), INTENT(IN) :: source_space_id
+       END FUNCTION h5sextent_copy_c
+    END INTERFACE
+
+    hdferr = h5sextent_copy_c(dest_space_id, source_space_id)
+
+  END SUBROUTINE h5sextent_copy_f
+
+!>
+!! \ingroup FH5S
+!!
+!! \brief Removes the extent from a dataspace.
+!!
+!! \param space_id Dataspace identifier.
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Sset_extent_none()
+!!
+  SUBROUTINE h5sset_extent_none_f(space_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: space_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5sset_extent_none_c(space_id) BIND(C,NAME='h5sset_extent_none_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: space_id
+       END FUNCTION h5sset_extent_none_c
+    END INTERFACE
+
+    hdferr = h5sset_extent_none_c(space_id)
+
+  END SUBROUTINE h5sset_extent_none_f
+!>
+!! \ingroup FH5S
+!!
+!! \brief Selects a hyperslab region to add to the current selected
+!!       region
+!!
+!! \param space_id Dataspace identifier.
+!! \param operator Flag, valid values are:
+!!                 \li H5S_SELECT_SET_F
+!!                 \li H5S_SELECT_OR_F
+!! \param start    Array with hyperslab offsets.
+!! \param count    Number of blocks included in the hyperslab.
+!! \param hdferr   \fortran_error
+!! \param stride   Array with hyperslab strides.
+!! \param block    Array with hyperslab block sizes.
+!!
+!! See C API: @ref H5Sselect_hyperslab()
+!!
+  SUBROUTINE h5sselect_hyperslab_f(space_id, OPERATOR, start, count, &
+       hdferr, stride, BLOCK)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: space_id
+    INTEGER, INTENT(IN) :: OPERATOR
+    INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: start
+    INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: count
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HSIZE_T), DIMENSION(:), OPTIONAL, INTENT(IN) :: stride
+    INTEGER(HSIZE_T), DIMENSION(:), OPTIONAL, INTENT(IN) :: BLOCK
+    INTEGER(HSIZE_T), DIMENSION(:), ALLOCATABLE :: def_block
+    INTEGER(HSIZE_T), DIMENSION(:), ALLOCATABLE :: def_stride
+    INTEGER :: rank
+    INTEGER :: error1, error2
+
+    INTERFACE
+       INTEGER FUNCTION h5sselect_hyperslab_c(space_id, OPERATOR, &
+            start, count, stride, BLOCK) BIND(C,NAME='h5sselect_hyperslab_c')
+         IMPORT :: HID_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: space_id
+         INTEGER, INTENT(IN) :: OPERATOR
+         INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: start
+         INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: count
+         INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: stride
+         INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: BLOCK
+       END FUNCTION h5sselect_hyperslab_c
+    END INTERFACE
+
+    IF (PRESENT(stride).AND. PRESENT(BLOCK)) THEN
+       hdferr = h5sselect_hyperslab_c(space_id, OPERATOR, start, count, &
+            stride, BLOCK)
+       RETURN
+    ENDIF
+    ! Case of optional parameters.
+    !
+    ! Find the rank of the dataspace to allocate memory for
+    ! default stride and block arrays.
+    !
+    CALL h5sget_simple_extent_ndims_f(space_id, rank, hdferr)
+    IF( hdferr .EQ. -1) RETURN
+    !
+    IF (PRESENT(stride).AND. .NOT.PRESENT(BLOCK)) THEN
+       ALLOCATE(def_block(rank), stat=error1)
+       IF (error1.NE.0) THEN
+          hdferr = -1
+          RETURN
+       ENDIF
+       def_block = 1
+       hdferr = h5sselect_hyperslab_c(space_id, OPERATOR, start, count, &
+            stride, def_block)
+       DEALLOCATE(def_block)
+       RETURN
+    ENDIF
+
+    IF (.NOT.PRESENT(stride).AND. PRESENT(BLOCK)) THEN
+       ALLOCATE(def_stride(rank), stat=error2)
+       IF (error2.NE.0) THEN
+          hdferr = -1
+          RETURN
+       ENDIF
+       def_stride = 1
+       hdferr = h5sselect_hyperslab_c(space_id, OPERATOR, start, count, &
+            def_stride, BLOCK)
+       DEALLOCATE(def_stride)
+       RETURN
+    ENDIF
+    ALLOCATE(def_block(rank), stat=error1)
+    ALLOCATE(def_stride(rank), stat=error2)
+    IF ((error1.NE.0) .OR. (error2.NE.0)) THEN
+       hdferr = -1
+       RETURN
+    ENDIF
+    def_block = 1
+    def_stride = 1
+    hdferr = h5sselect_hyperslab_c(space_id, OPERATOR, start, count, &
+         def_stride, def_block)
+    DEALLOCATE(def_block)
+    DEALLOCATE(def_stride)
+
+  END SUBROUTINE h5sselect_hyperslab_f
+!
+! NAME
+!      h5scombine_hyperslab_f
+!
+! PURPOSE
+!      Combine a hyperslab selection with the current
+!               selection for a dataspace
+!
+! INPUTS
+!            space_id      - dataspace of selection to use
+!            operator      - flag, valid values are:
+!                          H5S_SELECT_NOOP_F
+!                          H5S_SELECT_SET_F
+!                          H5S_SELECT_OR_F
+!                          H5S_SELECT_AND_F
+!                          H5S_SELECT_XOR_F
+!                          H5S_SELECT_NOTB_F
+!                          H5S_SELECT_NOTA_F
+!                          H5S_SELECT_APPEND_F
+!                          H5S_SELECT_PREPEND_F
+!            start            - array with hyperslab offsets
+!            count            - number of blocks included in the
+!                          hyperslab
+! OUTPUTS
+!               hyper_id        - identifier for the new hyperslab
+!            hdferr:            - error code
+!                               Success:  0
+!                               Failure: -1
+! OPTIONAL PARAMETERS
+!            stride            - array with hyperslab strides
+!            block            - array with hyperslab block sizes
+!
+! AUTHOR
+!      Elena Pourmal
+!            October 7, 2002
+!
+! HISTORY
+!
+!
+! NOTES
+! Commented out until 1.6 ? 10/08/2002
+!
+! SOURCE
+!  SUBROUTINE h5scombine_hyperslab_f(space_id, operator, start, count, &
+!  hyper_id,  hdferr, stride, block)
+!  IMPLICIT NONE
+   !  H5S_SELECT_AND_F
+   !  H5S_SELECT_XOR_F
+   !  H5S_SELECT_NOTB_F
+   !  H5S_SELECT_NOTA_F
+   !  H5S_SELECT_APPEND_F
+   !  H5S_SELECT_PREPEND_F
+                                                !
+
+!  INTEGER :: rank
+!  INTEGER :: error1, error2
+
+!  INTERFACE
+!  INTEGER FUNCTION h5scombine_hyperslab_c(space_id, operator, &
+!  start, count, stride, block, hyper_id)
+!  USE H5GLOBAL
+!  !DEC$IF DEFINED(HDF5F90_WINDOWS)
+!  !DEC$ATTRIBUTES C,reference,decorate,alias:'H5SCOMBINE_HYPERSLAB_C'::h5scombine_hyperslab_c
+!  !DEC$ENDIF
+
+
+!  if (present(stride).and. present(block)) then
+!  hdferr = h5scombine_hyperslab_c(space_id, operator, start, count, &
+!  stride, block, hyper_id)
+!  return
+!  endif
+            ! Case of optional parameters.
+            !
+            ! Find the rank of the dataspace to allocate memory for
+            ! default stride and block arrays.
+            !
+!  CALL h5sget_simple_extent_ndims_f(space_id, rank, hdferr)
+!  if( hdferr .EQ. -1) return
+            !
+!  if (present(stride).and. .not.present(block)) then
+!  allocate(def_block(rank), stat=error1)
+!  if (error1.NE.0) then
+!  hdferr = -1
+!  return
+!  endif
+!  def_block = 1
+!  hdferr = h5scombine_hyperslab_c(space_id, operator, start, count, &
+!  stride, def_block, hyper_id)
+!  deallocate(def_block)
+!  return
+!  endif
+
+!  if (.not.present(stride).and. present(block)) then
+!  allocate(def_stride(rank), stat=error2)
+!  if (error2.NE.0) then
+!  hdferr = -1
+!  return
+!  endif
+!  def_stride = 1
+!  hdferr = h5scombine_hyperslab_c(space_id, operator, start, count, &
+!  def_stride, block, hyper_id)
+!  deallocate(def_stride)
+!  return
+!  endif
+!  allocate(def_block(rank), stat=error1)
+!  allocate(def_stride(rank), stat=error2)
+!  if ((error1.NE.0) .OR. (error2.NE.0)) then
+!  hdferr = -1
+!  return
+!  endif
+!  def_block = 1
+!  def_stride = 1
+!  hdferr = h5scombine_hyperslab_c(space_id, operator, start, count, &
+!  def_stride, def_block, hyper_id)
+!  deallocate(def_block)
+!  deallocate(def_stride)
+
+!  END SUBROUTINE h5scombine_hyperslab_f
+
+!
+! NAME
+!   h5scombine_select_f
+!
+! PURPOSE
+!      Combine two hyperslab selections with an operation
+!               and return a dataspace with resulting selection.
+!
+! INPUTS
+!            space1_id      - dataspace of selection to use
+!            operator      - flag, valid values are:
+!                          H5S_SELECT_NOOP_F
+!                          H5S_SELECT_SET_F
+!                          H5S_SELECT_OR_F
+!                          H5S_SELECT_AND_F
+!                          H5S_SELECT_XOR_F
+!                          H5S_SELECT_NOTB_F
+!                          H5S_SELECT_NOTA_F
+!                          H5S_SELECT_APPEND_F
+!                          H5S_SELECT_PREPEND_F
+!            space2_id      - dataspace of selection to use
+! OUTPUTS
+!               ds_id           - idataspace identifier with the new selection
+!            hdferr:            - error code
+!                               Success:  0
+!                               Failure: -1
+! OPTIONAL PARAMETERS            - NONE
+!
+! AUTHOR
+!      Elena Pourmal
+!            October 7, 2002
+!
+! HISTORY
+!
+!
+! NOTES commented out until 1.6 release(?) 10/08/2002
+!
+!
+! SOURCE
+!  SUBROUTINE h5scombine_select_f(space1_id, operator, space2_id, s_id,  hdferr)
+!  IMPLICIT NONE
+
+                                    !  H5S_SELECT_AND_F
+                                    !  H5S_SELECT_XOR_F
+                                    !  H5S_SELECT_NOTB_F
+                                    !  H5S_SELECT_NOTA_F
+                                    !  H5S_SELECT_APPEND_F
+                                    !  H5S_SELECT_PREPEND_F
+                                                !
+
+!  space2_id, ds_id)
+!  USE H5GLOBAL
+!  !DEC$IF DEFINED(HDF5F90_WINDOWS)
+!  !DEC$ATTRIBUTES C,reference,decorate,alias:'H5SCOMBINE_SELECT_C'::h5scombine_select_c
+!  !DEC$ENDIF
+
+
+!  hdferr = h5scombine_select_c(space1_id, operator, space2_id, &
+!  ds_id)
+!  return
+
+!  END SUBROUTINE h5scombine_select_f
+
+!
+! NAME
+!            h5smodify_select_f
+!
+! PURPOSE
+!      Refine a hyperslab selection with an operation
+!               using second hyperslab
+!
+! INPUTS
+!            space1_id      - dataspace of selection  to modify
+!            operator      - flag, valid values are:
+!                          H5S_SELECT_NOOP_F
+!                          H5S_SELECT_SET_F
+!                          H5S_SELECT_OR_F
+!                          H5S_SELECT_AND_F
+!                          H5S_SELECT_XOR_F
+!                          H5S_SELECT_NOTB_F
+!                          H5S_SELECT_NOTA_F
+!                          H5S_SELECT_APPEND_F
+!                          H5S_SELECT_PREPEND_F
+!            space2_id      - dataspace of selection to use
+!
+! OUTPUTS
+!            hdferr:            - error code
+!                               Success:  0
+!                               Failure: -1
+! OPTIONAL PARAMETERS            - NONE
+!
+! AUTHOR
+!      Elena Pourmal
+!            October 7, 2002
+!
+! HISTORY
+!
+!
+! NOTESCommented out until 1.6 release(?) 10/08/2002 EIP
+!
+!
+! SOURCE
+!  SUBROUTINE h5smodify_select_f(space1_id, operator, space2_id, &
+!  hdferr)
+!  IMPLICIT NONE
+
+                                    !  H5S_SELECT_AND_F
+                                    !  H5S_SELECT_XOR_F
+                                    !  H5S_SELECT_NOTB_F
+                                    !  H5S_SELECT_NOTA_F
+                                    !  H5S_SELECT_APPEND_F
+                                    !  H5S_SELECT_PREPEND_F
+ !
+
+
+!  space2_id)
+!  USE H5GLOBAL
+!  !DEC$IF DEFINED(HDF5F90_WINDOWS)
+!  !DEC$ATTRIBUTES C,reference,decorate,alias:'H5SMODIFY_SELECT_C'::h5smodify_select_c
+!  !DEC$ENDIF
+
+
+!  hdferr = h5smodify_select_c(space1_id, operator, space2_id)
+!  return
+
+!  END SUBROUTINE h5smodify_select_f
+
+!>
+!! \ingroup FH5S
+!!
+!! \brief Retrieve the type of selection
+!!
+!! \param space_id Dataspace identifier with selection.
+!! \param type     Selection type flag, valid values are:
+!!                 \li H5S_SEL_ERROR_F
+!!                 \li H5S_SEL_NONE_F
+!!                 \li H5S_SEL_POINTS_F
+!!                 \li H5S_SEL_HYPERSLABS_F
+!!                 \li H5S_SEL_ALL_F
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Sget_select_type()
+!!
+  SUBROUTINE h5sget_select_type_f(space_id, TYPE, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(INOUT) :: space_id
+    INTEGER, INTENT(OUT) :: TYPE
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5sget_select_type_c(space_id, TYPE) BIND(C,NAME='h5sget_select_type_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: space_id
+         INTEGER, INTENT(OUT) :: TYPE
+       END FUNCTION h5sget_select_type_c
+    END INTERFACE
+
+    hdferr = h5sget_select_type_c(space_id, TYPE)
+    RETURN
+
+  END SUBROUTINE h5sget_select_type_f
+
+!>
+!! \ingroup FH5S
+!!
+!! \brief Decode a binary object description of data space and return a new object handle.
+!!
+!! \param buf    Buffer for the data space object to be decoded.
+!! \param obj_id Object ID.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Sdecode()
+!!
+  SUBROUTINE h5sdecode_f(buf, obj_id, hdferr)
+    IMPLICIT NONE
+    CHARACTER(LEN=*), INTENT(IN) :: buf
+    INTEGER(HID_T), INTENT(OUT) :: obj_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5sdecode_c(buf, obj_id) BIND(C,NAME='h5sdecode_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: buf
+         INTEGER(HID_T), INTENT(OUT) :: obj_id
+       END FUNCTION h5sdecode_c
+    END INTERFACE
+
+    hdferr = h5sdecode_c(buf, obj_id)
+
+  END SUBROUTINE h5sdecode_f
+
+!>
+!! \ingroup FH5S
+!!
+!! \brief Encode a data space object description into a binary buffer.
+!!
+!! \param obj_id  Identifier of the object to be encoded.
+!! \param buf     Buffer for the object to be encoded into.
+!! \param nalloc  The size of the buffer needed.
+!! \param hdferr  \fortran_error
+!! \param fapl_id File access property list identifier.
+!!
+!! See C API: @ref H5Sencode2()
+!!
+  SUBROUTINE h5sencode_f(obj_id, buf, nalloc, hdferr, fapl_id)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: obj_id
+    CHARACTER(LEN=*), INTENT(OUT) :: buf
+    INTEGER(SIZE_T), INTENT(INOUT) :: nalloc
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: fapl_id
+    INTEGER(HID_T) :: fapl_id_default
+
+    INTERFACE
+       INTEGER FUNCTION h5sencode_c(buf, obj_id, nalloc, fapl_id_default) BIND(C,NAME='h5sencode_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T
+         INTEGER(HID_T), INTENT(IN) :: obj_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(OUT) :: buf
+         INTEGER(SIZE_T), INTENT(INOUT) :: nalloc
+         INTEGER(HID_T) :: fapl_id_default
+       END FUNCTION h5sencode_c
+    END INTERFACE
+
+    fapl_id_default = H5P_DEFAULT_F
+
+    IF(PRESENT(fapl_id)) fapl_id_default = fapl_id
+
+    hdferr = h5sencode_c(buf, obj_id, nalloc, fapl_id_default)
+
+  END SUBROUTINE h5sencode_f
+
+!>
+!! \ingroup FH5S
+!!
+!! \brief Determines whether two dataspace extents are equal.
+!!
+!! \param space1_id First dataspace identifier.
+!! \param space2_id Second dataspace identifier.
+!! \param Equal     .TRUE. if equal, .FALSE. if unequal.
+!! \param hdferr    \fortran_error
+!!
+!! See C API: @ref H5Sextent_equal()
+!!
+  SUBROUTINE h5sextent_equal_f(space1_id, space2_id, equal, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: space1_id
+    INTEGER(HID_T), INTENT(IN) :: space2_id
+    LOGICAL, INTENT(OUT) :: Equal
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T) :: c_equal
+
+    INTERFACE
+       INTEGER FUNCTION h5sextent_equal_c(space1_id, space2_id, c_equal) BIND(C,NAME='h5sextent_equal_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: space1_id
+         INTEGER(HID_T), INTENT(IN) :: space2_id
+         INTEGER(HID_T) :: c_equal
+       END FUNCTION h5sextent_equal_c
+    END INTERFACE
+
+    hdferr = h5sextent_equal_c(space1_id, space2_id, c_equal)
+    equal = .FALSE.
+    IF(c_equal.GT.0) equal = .TRUE.
+
+  END SUBROUTINE h5sextent_equal_f
+
+!>
+!! \ingroup FH5S
+!!
+!! \brief Retrieves a regular hyperslab selection.
+!!
+!! \param space_id The identifier of the dataspace.
+!! \param start    Offset of the start of the regular hyperslab.
+!! \param stride   Stride of the regular hyperslab.
+!! \param count    Number of blocks in the regular hyperslab.
+!! \param block    Size of a block in the regular hyperslab.
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Sget_regular_hyperslab()
+!!
+  SUBROUTINE h5sget_regular_hyperslab_f(space_id, start, stride, count, block, hdferr)
+
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) ::  space_id
+    INTEGER(HSIZE_T), INTENT(OUT), DIMENSION(*), TARGET ::  start
+    INTEGER(HSIZE_T), INTENT(OUT), DIMENSION(*), TARGET ::  stride
+    INTEGER(HSIZE_T), INTENT(OUT), DIMENSION(*), TARGET ::  count
+    INTEGER(HSIZE_T), INTENT(OUT), DIMENSION(*), TARGET ::  block
+    INTEGER, INTENT(OUT) :: hdferr
+    TYPE(C_PTR) :: start_c, stride_c, count_c, block_c
+    INTEGER :: n
+
+    INTERFACE
+       INTEGER FUNCTION h5sget_regular_hyperslab(space_id, start, stride, count, block) BIND(C,NAME='H5Sget_regular_hyperslab')
+         IMPORT :: HID_T, C_PTR
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN), VALUE :: space_id
+         TYPE(C_PTR), VALUE :: start, stride, count, block
+       END FUNCTION h5sget_regular_hyperslab
+    END INTERFACE
+
+    hdferr = 0
+
+    start_c = C_LOC(start(1))
+    stride_c = C_LOC(stride(1))
+    count_c = C_LOC(count(1))
+    block_c = C_LOC(block(1))
+
+    IF(INT(h5sget_regular_hyperslab(space_id, start_c, stride_c, count_c, block_c)).LT.0) hdferr = -1
+
+    ! Reverse the C arrays description values of the hyperslab because
+    ! the hyperslab was for a C stored hyperslab
+
+    CALL H5Sget_simple_extent_ndims_f(space_id,n,hdferr)
+    IF(hdferr.LT.0.OR.n.EQ.0)THEN
+       hdferr=-1
+    ELSE
+       start(1:n)  = start(n:1:-1)
+       stride(1:n) = stride(n:1:-1)
+       count(1:n)  = count(n:1:-1)
+       block(1:n)  = block(n:1:-1)
+    ENDIF
+
+  END SUBROUTINE h5sget_regular_hyperslab_f
+
+!>
+!! \ingroup FH5S
+!!
+!! \brief Retrieves a regular hyperslab selection.
+!!
+!! \param space_id  The identifier of the dataspace.
+!! \param IsRegular TRUE or FALSE for hyperslab selection if successful.
+!! \param hdferr    \fortran_error
+!!
+!! See C API: @ref H5Sis_regular_hyperslab()
+!!
+  SUBROUTINE h5sis_regular_hyperslab_f(space_id, IsRegular, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) ::  space_id
+    LOGICAL :: IsRegular
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(C_INT) :: status
+
+    INTERFACE
+       INTEGER(C_INT) FUNCTION H5Sis_regular_hyperslab(space_id) BIND(C,NAME='H5Sis_regular_hyperslab')
+         IMPORT :: HID_T, C_INT
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN), VALUE :: space_id
+       END FUNCTION H5Sis_regular_hyperslab
+    END INTERFACE
+
+    status = H5Sis_regular_hyperslab(space_id)
+
+    hdferr = 0
+    IsRegular = .FALSE.
+    IF(status.GT.0)THEN
+       IsRegular = .TRUE.
+    ELSE IF(status.LT.0)THEN
+       hdferr = -1
+    ENDIF
+
+  END SUBROUTINE H5Sis_regular_hyperslab_f
+
+END MODULE H5S
diff --git a/fortran/src/H5Sff.f90 b/fortran/src/H5Sff.f90
deleted file mode 100644
index c493d46..0000000
--- a/fortran/src/H5Sff.f90
+++ /dev/null
@@ -1,1875 +0,0 @@
-!****h* ROBODoc/H5S
-!
-! NAME
-!  MODULE H5S
-!
-! FILE
-!  fortran/src/H5Sff.f90
-!
-! PURPOSE
-!  This file contains Fortran interfaces for H5S functions. It includes
-!  all the functions that are independent on whether the Fortran 2003 functions
-!  are enabled or disabled.
-!
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! NOTES
-!                         *** IMPORTANT ***
-!  If you add a new H5S function you must add the function name to the
-!  Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
-!  This is needed for Windows based operating systems.
-!
-!*****
-
-MODULE H5S
-  USE H5GLOBAL
-
-CONTAINS
-
-!
-!****s* H5S/h5screate_simple_f
-!
-! NAME
-!  h5screate_simple_f
-!
-! PURPOSE 	
-!  Creates a new simple data space and opens it for access	.
-!
-! INPUTS
-!  rank        - number of dimensions
-!  dims        - an array of the size of each dimension
-! OUTPUTS
-!  space_id    - dataspace identifier
-!  hdferr      - Returns 0 if successful and -1 if fails
-! OPTIONAL PARAMETERS
-!  maxdims     - an array of the maximum size of each dimension
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 6, 2001
-! SOURCE
-          SUBROUTINE h5screate_simple_f(rank, dims, space_id, hdferr, maxdims)
-
-            IMPLICIT NONE
-            INTEGER, INTENT(IN) :: rank             ! Number of dataspace dimensions
-            INTEGER(HSIZE_T), INTENT(IN) :: dims(rank)
-                                                    ! Array with the dimension
-                                                    ! sizes
-            INTEGER(HID_T), INTENT(OUT) :: space_id ! Dataspace identifier
-            INTEGER, INTENT(OUT) :: hdferr          ! Error code
-            INTEGER(HSIZE_T), OPTIONAL, INTENT(IN) :: maxdims(rank)
-                                                    ! Array with the maximum
-                                                    ! dimension sizes
-!*****
-            INTEGER(HSIZE_T), ALLOCATABLE, DIMENSION(:) :: f_maxdims
-
-            INTERFACE
-              INTEGER FUNCTION h5screate_simple_c(rank, dims, maxdims, space_id)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5SCREATE_SIMPLE_C'::h5screate_simple_c
-              !DEC$ENDIF
-              INTEGER, INTENT(IN) :: rank
-              INTEGER(HSIZE_T), INTENT(IN) :: dims(rank)
-              INTEGER(HSIZE_T), DIMENSION(:),INTENT(IN) :: maxdims(rank)
-              INTEGER(HID_T), INTENT(OUT) :: space_id
-              END FUNCTION h5screate_simple_c
-            END INTERFACE
-
-            allocate (f_maxdims(rank), stat=hdferr)
-            if (hdferr .NE. 0) then
-                hdferr = -1
-                return
-            endif
-            if (present(maxdims)) then
-                f_maxdims = maxdims
-            else
-                f_maxdims = dims
-            endif
-            hdferr = h5screate_simple_c(rank, dims, f_maxdims, space_id)
-            deallocate(f_maxdims)
-
-          END SUBROUTINE h5screate_simple_f
-
-!
-!****s* H5S/h5sclose_f
-!
-! NAME
-!  h5sclose_f
-!
-! PURPOSE
-!  Releases and terminates access to a dataspace.
-!
-! INPUTS
-!  space_id    - identifier of dataspace to release
-! OUTPUTS
-!  hdferr      - Returns 0 if successful and -1 if fails
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 6, 2001
-!
-! SOURCE
-          SUBROUTINE h5sclose_f(space_id, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: space_id ! Dataspace identifier
-            INTEGER, INTENT(OUT) :: hdferr         ! Error code
-!*****
-            INTERFACE
-              INTEGER FUNCTION h5sclose_c(space_id)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5SCLOSE_C'::h5sclose_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: space_id
-              END FUNCTION h5sclose_c
-            END INTERFACE
-
-            hdferr = h5sclose_c(space_id)
-
-          END SUBROUTINE h5sclose_f
-
-!
-!****s* H5S/h5screate_f
-!
-! NAME
-!  h5screate_f
-!
-! PURPOSE
-!  Creates a new dataspace of a specified type.
-!
-! INPUTS
-!  classtype   - the type of the dataspace to be created
-! OUTPUTS
-!  space_id    - dataspace identifier
-!  hdferr      - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 6, 2001
-!
-! NOTES
-!
-
-! SOURCE
-          SUBROUTINE h5screate_f(classtype, space_id, hdferr)
-            IMPLICIT NONE
-            INTEGER, INTENT(IN) :: classtype     ! The type of the dataspace
-                                                 ! to be created.
-                                                 ! Possible values are:
-                                                 !  H5S_SCALAR_F (0)
-                                                 !  H5S_SIMPLE_F(1)
-                                                 !  H5S_NULL_F(2)
-            INTEGER(HID_T), INTENT(OUT) :: space_id ! Dataspace identifier
-            INTEGER, INTENT(OUT) :: hdferr          ! Error code
-!*****
-            INTERFACE
-              INTEGER FUNCTION h5screate_c(classtype, space_id)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5SCREATE_C'::h5screate_c
-              !DEC$ENDIF
-              INTEGER, INTENT(IN) :: classtype
-              INTEGER(HID_T), INTENT(OUT) :: space_id
-              END FUNCTION h5screate_c
-            END INTERFACE
-
-            hdferr = h5screate_c(classtype, space_id)
-
-          END SUBROUTINE h5screate_f
-
-!
-!****s* H5S/h5scopy_f
-!
-! NAME
-!  h5scopy_f
-!
-! PURPOSE
-!  Creates an exact copy of a dataspace.
-!
-! INPUTS
-!  space_id 	 - dataspace identifier
-! OUTPUTS
-!  new_space_id  - identifier of dataspace's copy
-!  hdferr        - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 6, 2001
-!
-! NOTES
-!
-
-! SOURCE
-          SUBROUTINE h5scopy_f(space_id, new_space_id, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: space_id ! Dataspace identifier
-            INTEGER(HID_T), INTENT(OUT) :: new_space_id
-                                             ! Identifier of dataspace's copy
-            INTEGER, INTENT(OUT) :: hdferr   ! Error code
-!*****
-            INTERFACE
-              INTEGER FUNCTION h5scopy_c(space_id, new_space_id)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5SCOPY_C'::h5scopy_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: space_id
-              INTEGER(HID_T), INTENT(OUT):: new_space_id
-              END FUNCTION h5scopy_c
-            END INTERFACE
-
-            hdferr = h5scopy_c(space_id, new_space_id)
-
-          END SUBROUTINE h5scopy_f
-
-!
-!****s* H5S/h5sget_select_hyper_nblocks_f
-!
-! NAME
-!  h5sget_select_hyper_nblocks_f
-!
-! PURPOSE
-!  Get number of hyperslab blocks.
-!
-! INPUTS
-!  space_id    - dataspace identifier
-! OUTPUTS
-!  num_blocks  - number of hyperslab blocks in the current
-!                hyperslab selection
-!  hdferr      - Returns 0 if successful and -1 if fails
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 6, 2001
-!
-! SOURCE
-          SUBROUTINE h5sget_select_hyper_nblocks_f(space_id, num_blocks, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: space_id ! Dataspace identifier
-            INTEGER(HSSIZE_T), INTENT(OUT) :: num_blocks
-                                             !number of hyperslab blocks
-                                             !in the current dataspace
-                                             !selection
-            INTEGER, INTENT(OUT) :: hdferr   ! Error code
-!*****
-            INTERFACE
-              INTEGER FUNCTION h5sget_select_hyper_nblocks_c (space_id, num_blocks)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-!  DEC$ ATTRIBUTES C,reference,decorate,alias:'H5SGET_SELECT_HYPER_NBLOCKS_C'::h5sget_select_hyper_nblocks_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: space_id
-              INTEGER(HSSIZE_T), INTENT(OUT) :: num_blocks
-              END FUNCTION h5sget_select_hyper_nblocks_c
-            END INTERFACE
-
-            hdferr =  h5sget_select_hyper_nblocks_c (space_id, num_blocks)
-
-          END SUBROUTINE h5sget_select_hyper_nblocks_f
-
-!
-!****s* H5S/h5sget_select_hyper_blocklist_f
-!
-! NAME
-!  h5sget_select_hyper_blocklist_f
-!
-! PURPOSE
-!  Gets the list of hyperslab blocks currently selected.
-!
-! INPUTS
-!  space_id    - dataspace identifier
-!  startblock  - hyperslab block to start with
-!  num_blocks  - number of blocks to get
-! OUTPUTS
-!  buf 	       - buffer to hold block list
-!  hdferr      - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 6, 2001
-! SOURCE
-          SUBROUTINE h5sget_select_hyper_blocklist_f(space_id, startblock, &
-                                                    num_blocks, buf, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: space_id ! Dataspace identifier
-            INTEGER(HSIZE_T), INTENT(IN) :: startblock
-                                             !Hyperslab block to start with.
-            INTEGER(HSIZE_T), INTENT(IN) :: num_blocks
-                                             !number of hyperslab blocks
-                                             !to get in the current dataspace
-                                             !selection
-            INTEGER(HSIZE_T), DIMENSION(*), INTENT(OUT) :: buf
-                                             !List of hyperslab blocks selected
-            INTEGER, INTENT(OUT) :: hdferr   ! Error code
-!*****
-
-            INTERFACE
-              INTEGER FUNCTION h5sget_select_hyper_blocklist_c(space_id, startblock, &
-                                                              num_blocks, buf )
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-            !DEC$ATTRIBUTES C,reference,decorate,alias:'H5SGET_SELECT_HYPER_BLOCKLIST_C'::h5sget_select_hyper_blocklist_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: space_id
-              INTEGER(HSIZE_T), INTENT(IN) :: startblock
-              INTEGER(HSIZE_T), INTENT(IN) :: num_blocks
-              INTEGER(HSIZE_T), DIMENSION(*), INTENT(OUT) :: buf
-              END FUNCTION h5sget_select_hyper_blocklist_c
-            END INTERFACE
-
-
-            hdferr =  h5sget_select_hyper_blocklist_c(space_id, startblock, &
-                                                       num_blocks, buf )
-
-          END SUBROUTINE h5sget_select_hyper_blocklist_f
-
-!
-!****s* H5S/h5sget_select_bounds_f
-!
-! NAME
-!  h5sget_select_bounds_f
-!
-! PURPOSE
-!  Gets the bounding box containing the current selection.
-!
-! INPUTS
-!  space_id    - dataspace identifier
-!
-! OUTPUTS
-!  start       - starting coordinates of bounding box
-!  end 	       - ending coordinates of bounding box
-!  hdferr      - Returns 0 if successful and -1 if fails
-! OPTIONAL PARAMETERS
-!  NONE
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 6, 2001
-! SOURCE
-  SUBROUTINE  h5sget_select_bounds_f(space_id, start, END, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: space_id ! Dataspace identifier
-    INTEGER(HSIZE_T), DIMENSION(*), INTENT(OUT) :: start
-                                           ! Starting coordinates of the bounding box.
-    INTEGER(HSIZE_T), DIMENSION(*), INTENT(OUT) :: END
-                                           !Ending coordinates of the bounding box,
-                                           !i.e., the coordinates of the diagonally
-                                           !opposite corner
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5sget_select_bounds_c(space_id, start, END)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5SGET_SELECT_BOUNDS_C'::h5sget_select_bounds_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: space_id
-         INTEGER(HSIZE_T), DIMENSION(*), INTENT(OUT) :: start
-         INTEGER(HSIZE_T), DIMENSION(*), INTENT(OUT) :: END
-       END FUNCTION h5sget_select_bounds_c
-    END INTERFACE
-
-    hdferr =   h5sget_select_bounds_c(space_id, start, END)
-
-  END SUBROUTINE h5sget_select_bounds_f
-
-!
-!****s* H5S/h5sget_select_elem_npoints_f
-!
-! NAME
-!  h5sget_select_elem_npoints_f
-!
-! PURPOSE
-!  Gets the number of element points in the current selection
-!
-! INPUTS
-!  space_id 	 - dataspace identifier
-! OUTPUTS
-!  num_points 	 - number of element points in the current
-!                  dataspace selection
-!  hdferr        - Returns 0 if successful and -1 if fails
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 6, 2001
-!
-! SOURCE
-          SUBROUTINE h5sget_select_elem_npoints_f(space_id, num_points, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: space_id ! Dataspace identifier
-            INTEGER(HSSIZE_T), INTENT(OUT) :: num_points
-                                             !number of element points
-                                             !in the current dataspace
-                                             !selection
-            INTEGER, INTENT(OUT) :: hdferr   ! Error code
-!*****
-            INTERFACE
-              INTEGER FUNCTION h5sget_select_elem_npoints_c (space_id, num_points)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-!  DEC$ ATTRIBUTES C,reference,decorate,alias:'H5SGET_SELECT_ELEM_NPOINTS_C'::h5sget_select_elem_npoints_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: space_id
-              INTEGER(HSSIZE_T), INTENT(OUT) :: num_points
-              END FUNCTION h5sget_select_elem_npoints_c
-            END INTERFACE
-
-            hdferr =  h5sget_select_elem_npoints_c (space_id, num_points)
-
-          END SUBROUTINE h5sget_select_elem_npoints_f
-
-!
-!****s* H5S/h5sget_select_elem_pointlist_f
-!
-! NAME
-!  h5sget_select_elem_pointlist_f
-!
-! PURPOSE
-!  Gets the list of element points currently selected.
-!
-! INPUTS
-!  space_id    - dataspace identifier
-!  startpoint  - element point to start with
-!  num_points  - number of elemnt points to get
-! OUTPUTS
-!  buf 	       - buffer with element points selected
-!  hdferr      - Returns 0 if successful and -1 if fails
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 6, 2001
-!
-! SOURCE
-          SUBROUTINE h5sget_select_elem_pointlist_f(space_id, startpoint, &
-                                                    num_points, buf, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: space_id ! Dataspace identifier
-            INTEGER(HSIZE_T), INTENT(IN) :: startpoint
-                                             !Element point to start with.
-            INTEGER(HSIZE_T), INTENT(IN) :: num_points
-                                             !Number of element points to get
-            INTEGER(HSIZE_T), DIMENSION(*), INTENT(OUT) :: buf
-                                             !List of element points selected
-            INTEGER, INTENT(OUT) :: hdferr   ! Error code
-!*****
-            INTERFACE
-              INTEGER FUNCTION h5sget_select_elem_pointlist_c(space_id, startpoint, &
-                                                              num_points, buf )
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-!  DEC$ ATTRIBUTES C,reference,decorate,alias:'H5SGET_SELECT_ELEM_POINTLIST_C'::h5sget_select_elem_pointlist_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: space_id
-              INTEGER(HSIZE_T), INTENT(IN) :: startpoint
-              INTEGER(HSIZE_T), INTENT(IN) :: num_points
-              INTEGER(HSIZE_T), DIMENSION(*), INTENT(OUT) :: buf
-              END FUNCTION h5sget_select_elem_pointlist_c
-            END INTERFACE
-
-            hdferr =  h5sget_select_elem_pointlist_c(space_id, startpoint, &
-                                                       num_points, buf )
-
-          END SUBROUTINE h5sget_select_elem_pointlist_f
-
-!
-!****s* H5S/h5sselect_elements_f
-!
-! NAME
-!  h5sselect_elements_f
-!
-! PURPOSE
-!  Selects elements to be included in the selection for
-!  a dataspace
-!
-! INPUTS
-!  space_id 	 - dataspace identifier
-!  operator 	 - flag, valid values are:
-!                   H5S_SELECT_SET_F 
-!                   H5S_SELECT_APPEND_F 
-!                   H5S_SELECT_PREPEND_F
-!  rank 	 - number of dataspace dimensions
-!  num_elements  - number of elements to be selected
-!  coord 	 - 2D (rank x num_elements) array with the
-!                  elements coordinates ( 1-based); in C the
-!                  array is stored in 2D as (num_element x rank)
-! OUTPUTS
-!  hdferr        - Returns 0 if successful and -1 if fails
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 6, 2001
-! SOURCE
-  SUBROUTINE h5sselect_elements_f(space_id, OPERATOR, rank, &
-       num_elements, coord, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T),   INTENT(IN)                                :: space_id
-    INTEGER,          INTENT(IN)                                :: OPERATOR
-    INTEGER,          INTENT(IN)                                :: rank
-    INTEGER(SIZE_T),  INTENT(IN)                                :: num_elements
-    INTEGER(HSIZE_T), INTENT(IN) , DIMENSION(rank,num_elements) :: coord
-    INTEGER,          INTENT(OUT)                               :: hdferr 
-!*****
-    INTEGER(HSIZE_T), ALLOCATABLE, DIMENSION(:,:) :: c_coord
-    INTEGER :: error, i
-
-    INTERFACE
-       INTEGER FUNCTION h5sselect_elements_c(space_id, OPERATOR,&
-            num_elements,c_c_coord)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5SSELECT_ELEMENTS_C'::h5sselect_elements_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: space_id
-         INTEGER, INTENT(IN) :: OPERATOR
-         INTEGER(SIZE_T), INTENT(IN) :: num_elements
-         INTEGER(HSIZE_T),DIMENSION(*) :: c_c_coord
-       END FUNCTION h5sselect_elements_c
-    END INTERFACE
-
-    ALLOCATE(c_coord(rank,num_elements), STAT = error)
-    IF (error.NE. 0) THEN
-       hdferr = -1
-       RETURN
-    ENDIF
-    DO i = 1, rank
-       c_coord(i,:) = coord(rank-i+1, :) - 1
-    ENDDO
-    hdferr = h5sselect_elements_c(space_id, OPERATOR, num_elements, c_coord)
-
-!  ALLOCATE(c_coord(num_elements,rank), stat = error)
-!  IF (error.NE. 0) THEN
-!  hdferr = -1
-!  RETURN
-!  ENDIF
-!
-!  c_coord = TRANSPOSE(coord)
-!  hdferr = h5sselect_elements_c(space_id, OPERATOR, INT(rank,size_t), c_coord)
-
-
-    DEALLOCATE(c_coord)
-
-  END SUBROUTINE h5sselect_elements_f
-
-!
-!****s* H5S/h5sselect_all_f
-!
-! NAME
-!  h5sselect_all_f
-!
-! PURPOSE
-!  Selects the entire dataspace.
-!
-! INPUTS
-!  space_id    - Identifier for the dataspace in which
-!                selection being made
-! OUTPUTS
-!  hdferr      - Returns 0 if successful and -1 if fails
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 6, 2001
-!
-! SOURCE
-          SUBROUTINE h5sselect_all_f(space_id, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: space_id  ! Dataspace identifier
-            INTEGER, INTENT(OUT) :: hdferr          ! Error code
-!*****
-            INTERFACE
-              INTEGER FUNCTION h5sselect_all_c(space_id)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5SSELECT_ALL_C'::h5sselect_all_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: space_id
-              END FUNCTION h5sselect_all_c
-            END INTERFACE
-
-            hdferr = h5sselect_all_c(space_id)
-
-          END SUBROUTINE h5sselect_all_f
-
-!
-!****s* H5S/h5sselect_none_f
-!
-! NAME
-!  h5sselect_none_f
-!
-! PURPOSE
-!  Resets the selection region to include no elements.
-!
-! INPUTS
-!  space_id    - the identifier for the dataspace in which
-!                the selection is being reset.
-! OUTPUTS
-!  hdferr      - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 6, 2001
-!
-! SOURCE
-          SUBROUTINE h5sselect_none_f(space_id, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: space_id  ! Dataspace identifier
-            INTEGER, INTENT(OUT) :: hdferr          ! Error code
-!*****
-            INTERFACE
-              INTEGER FUNCTION h5sselect_none_c(space_id)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5SSELECT_NONE_C'::h5sselect_none_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: space_id
-              END FUNCTION h5sselect_none_c
-            END INTERFACE
-
-            hdferr = h5sselect_none_c(space_id)
-
-          END SUBROUTINE h5sselect_none_f
-
-!
-!****s* H5S/h5sselect_valid_f
-!
-! NAME
-!  h5sselect_valid_f
-!
-! PURPOSE
-!  Verifies that the selection is within the extent of
-!  the dataspace.
-!
-! INPUTS
-!  space_id 	 - identifier for the dataspace for which
-!  selection is verified
-! OUTPUTS
-!  hdferr      - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 6, 2001
-!
-! SOURCE
-          SUBROUTINE h5sselect_valid_f(space_id, status, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: space_id  ! Dataspace identifier
-            LOGICAL, INTENT(OUT) :: status          ! TRUE if the selection is
-                                                    ! contained within the extent,
-                                                    ! FALSE otherwise.
-            INTEGER, INTENT(OUT) :: hdferr          ! Error code
-!*****
-            INTEGER :: flag ! "TRUE/FALSE/ERROR" flag from C routine
-
-            INTERFACE
-              INTEGER FUNCTION h5sselect_valid_c(space_id, flag)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5SSELECT_VALID_C'::h5sselect_valid_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: space_id
-              INTEGER :: flag
-              END FUNCTION h5sselect_valid_c
-            END INTERFACE
-
-            hdferr = h5sselect_valid_c(space_id, flag)
-            status = .TRUE.
-            if (flag .EQ. 0) status = .FALSE.
-
-          END SUBROUTINE h5sselect_valid_f
-
-!
-!****s* H5S/h5sget_simple_extent_npoints_f
-!
-! NAME
-!  h5sget_simple_extent_npoints_f
-!
-! PURPOSE
-!  Determines the number of elements in a dataspace.
-!
-! INPUTS
-!  space_id 	 - dataspace identifier
-! OUTPUTS
-!  npoints 	 - number of elements in the dataspace
-!  hdferr      - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 6, 2001
-!
-! SOURCE
-          SUBROUTINE h5sget_simple_extent_npoints_f(space_id, npoints, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: space_id     ! Dataspace identifier
-            INTEGER(HSIZE_T), INTENT(OUT) :: npoints  ! Number of elements in
-                                                       ! dataspace
-            INTEGER, INTENT(OUT) :: hdferr             ! Error code
-!*****
-            INTERFACE
-              INTEGER FUNCTION h5sget_simple_extent_npoints_c( space_id, npoints)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5SGET_SIMPLE_EXTENT_NPOINTS_C'::h5sget_simple_extent_npoints_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: space_id
-              INTEGER(HSIZE_T), INTENT(OUT) :: npoints
-              END FUNCTION h5sget_simple_extent_npoints_c
-            END INTERFACE
-
-            hdferr = h5sget_simple_extent_npoints_c( space_id, npoints)
-
-          END SUBROUTINE h5sget_simple_extent_npoints_f
-
-!
-!****s* H5S/h5sget_select_npoints_f
-!
-! NAME
-!  h5sget_select_npoints_f
-!
-! PURPOSE
-!  Determines the number of elements in a dataspace selection.
-!
-! INPUTS
-!  space_id 	 - dataspace identifier
-! OUTPUTS
-!  npoints 	 - number of points in the dataspace selection
-!  hdferr      - Returns 0 if successful and -1 if fails
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 6, 2001
-! SOURCE
-          SUBROUTINE h5sget_select_npoints_f(space_id, npoints, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: space_id     ! Dataspace identifier
-            INTEGER(HSSIZE_T), INTENT(OUT) :: npoints  ! Number of elements in the
-                                                       ! selection
-            INTEGER, INTENT(OUT) :: hdferr             ! Error code
-!*****
-            INTERFACE
-              INTEGER FUNCTION h5sget_select_npoints_c(space_id, npoints)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5SGET_SELECT_NPOINTS_C'::h5sget_select_npoints_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: space_id
-              INTEGER(HSSIZE_T), INTENT(OUT) :: npoints
-              END FUNCTION h5sget_select_npoints_c
-            END INTERFACE
-
-            hdferr = h5sget_select_npoints_c(space_id, npoints)
-
-          END SUBROUTINE h5sget_select_npoints_f
-
-!
-!****s* H5S/h5sget_simple_extent_ndims_f
-!
-! NAME
-!  h5sget_simple_extent_ndims_f
-!
-! PURPOSE
-!  Determines the dimensionality of a dataspace
-!
-! INPUTS
-!  space_id 	 - dataspace identifier
-! OUTPUTS
-!  rank 	 - number of dataspace dimensions
-!  hdferr      - Returns 0 if successful and -1 if fails
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 6, 2001
-!
-! SOURCE
-          SUBROUTINE h5sget_simple_extent_ndims_f(space_id, rank, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: space_id     ! Dataspace identifier
-            INTEGER, INTENT(OUT) :: rank               ! Number of dimensions
-            INTEGER, INTENT(OUT) :: hdferr             ! Error code
-!*****
-            INTERFACE
-              INTEGER FUNCTION h5sget_simple_extent_ndims_c(space_id, rank)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5SGET_SIMPLE_EXTENT_NDIMS_C'::h5sget_simple_extent_ndims_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: space_id
-              INTEGER, INTENT(OUT) :: rank
-              END FUNCTION h5sget_simple_extent_ndims_c
-            END INTERFACE
-
-            hdferr = h5sget_simple_extent_ndims_c(space_id, rank)
-
-          END SUBROUTINE h5sget_simple_extent_ndims_f
-!
-!****s* H5S/h5sget_simple_extent_dims_f
-!
-! NAME
-!  h5sget_simple_extent_dims_f
-!
-! PURPOSE
-!  Retrieves dataspace dimension size and maximum size.
-!
-! INPUTS
-!  space_id 	 - dataspace identifier
-! OUTPUTS
-!  dims 	 - array to store size of each dimension
-!  maxdims 	 - array to store maximum size of each
-!  dimension
-!  hdferr      - Returns 0 if successful and -1 if fails
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 6, 2001
-!
-! SOURCE
-          SUBROUTINE h5sget_simple_extent_dims_f(space_id, dims, maxdims, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: space_id ! Dataspace identifier
-            INTEGER(HSIZE_T), DIMENSION(*), INTENT(OUT) :: dims
-                                                   ! Array to store dimension sizes
-            INTEGER(HSIZE_T), DIMENSION(*), INTENT(OUT) :: maxdims
-                                                   ! Array to store max dimension
-                                                   ! sizes
-            INTEGER, INTENT(OUT) :: hdferr         ! Error code: -1 on failure,
-                                                   ! number of dimensions on
-                                                   ! on success
-!*****
-            INTERFACE
-              INTEGER FUNCTION h5sget_simple_extent_dims_c(space_id, dims, maxdims)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5SGET_SIMPLE_EXTENT_DIMS_C'::h5sget_simple_extent_dims_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: space_id
-              INTEGER(HSIZE_T), DIMENSION(*), INTENT(OUT) :: dims
-              INTEGER(HSIZE_T), DIMENSION(*), INTENT(OUT) :: maxdims
-              END FUNCTION h5sget_simple_extent_dims_c
-            END INTERFACE
-
-            hdferr = h5sget_simple_extent_dims_c(space_id, dims, maxdims)
-
-          END SUBROUTINE h5sget_simple_extent_dims_f
-
-!
-!****s* H5S/h5sget_simple_extent_type_f
-!
-! NAME
-!  h5sget_simple_extent_type_f
-!
-! PURPOSE
-!  Determine the current class of a dataspace
-!
-! INPUTS
-!  space_id 	 - dataspace identifier
-! OUTPUTS
-!  classtype 	 - class type, possible values are:
-!  H5S_NO_CLASS_F (-1)
-!  H5S_SCALAR_F (0)
-!  H5S_SIMPLE_F (1)
-!  H5S_NULL_F   (2)
-!  hdferr      - Returns 0 if successful and -1 if fails
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 6, 2001
-!
-! SOURCE
-          SUBROUTINE h5sget_simple_extent_type_f(space_id, classtype, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: space_id ! Dataspace identifier
-            INTEGER, INTENT(OUT) :: classtype      ! Class type , possible values
-                                                   ! are:
-                                                   !  H5S_NO_CLASS_F (-1)
-                                                   !  H5S_SCALAR_F (0)
-                                                   !  H5S_SIMPLE_F (1)
-                                                   !  H5S_NULL_F   (2)
-            INTEGER, INTENT(OUT) :: hdferr         ! Error code
-!*****
-            INTERFACE
-              INTEGER FUNCTION h5sget_simple_extent_type_c(space_id, classtype)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5SGET_SIMPLE_EXTENT_TYPE_C'::h5sget_simple_extent_type_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: space_id
-              INTEGER, INTENT(OUT) :: classtype
-              END FUNCTION h5sget_simple_extent_type_c
-            END INTERFACE
-
-            hdferr = h5sget_simple_extent_type_c(space_id, classtype)
-
-          END SUBROUTINE h5sget_simple_extent_type_f
-!
-!****s* H5S/h5sset_extent_simple_f
-!
-! NAME
-!  h5sset_extent_simple_f
-!
-! PURPOSE
-!  Sets or resets the size of an existing dataspace.
-!
-! INPUTS
-!  space_id 	 - dataspace identifier
-!  rank 	 - dataspace number of dimensions
-!  current_size 	 - array with the new sizes of dimensions
-!  maximum_size 	 - array with the new maximum sizes of
-!  dimensions
-! OUTPUTS
-!  hdferr      - Returns 0 if successful and -1 if fails
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 6, 2001
-!
-! SOURCE
-          SUBROUTINE h5sset_extent_simple_f(space_id, rank, current_size, &
-                                            maximum_size, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: space_id ! Dataspace identifier
-            INTEGER, INTENT(IN) :: rank            ! Dataspace rank
-            INTEGER(HSIZE_T), DIMENSION(rank), INTENT(IN) :: current_size
-                                                   ! Array with the new sizes
-                                                   ! of dimensions
-            INTEGER(HSIZE_T), DIMENSION(rank), INTENT(IN) :: maximum_size
-                                                   ! Array with the new maximum
-                                                   ! sizes of dimensions
-                                                   ! sizes
-            INTEGER, INTENT(OUT) :: hdferr         ! Error code
-!*****
-            INTERFACE
-              INTEGER FUNCTION h5sset_extent_simple_c(space_id, rank, &
-                               current_size,  maximum_size)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5SSET_EXTENT_SIMPLE_C'::h5sset_extent_simple_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: space_id
-              INTEGER, INTENT(IN) :: rank
-              INTEGER(HSIZE_T), DIMENSION(rank), INTENT(IN) :: current_size
-              INTEGER(HSIZE_T), DIMENSION(rank), INTENT(IN) :: maximum_size
-              END FUNCTION h5sset_extent_simple_c
-            END INTERFACE
-
-            hdferr = h5sset_extent_simple_c(space_id, rank, current_size, &
-                                            maximum_size)
-
-          END SUBROUTINE h5sset_extent_simple_f
-!
-!****s* H5S/h5sis_simple_f
-!
-! NAME
-!  h5sis_simple_f
-!
-! PURPOSE
-!  Determines whether a dataspace is a simple dataspace.
-!
-! INPUTS
-!  space_id 	 - dataspace identifier
-! OUTPUTS
-!  status 	 - flag to indicate if dataspace
-!  is simple or not
-!  hdferr      - Returns 0 if successful and -1 if fails
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 6, 2001
-!
-! SOURCE
-          SUBROUTINE h5sis_simple_f(space_id, status, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: space_id  ! Dataspace identifier
-            LOGICAL, INTENT(OUT) :: status      ! Flag, idicates if dataspace
-                                                ! is simple or not ( TRUE or
-                                                ! FALSE)
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code
-!*****
-            INTEGER :: flag                     ! "TRUE/FALSE/ERROR from C"
-
-            INTERFACE
-              INTEGER FUNCTION h5sis_simple_c(space_id, flag)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5SIS_SIMPLE_C'::h5sis_simple_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: space_id
-              INTEGER :: flag
-              END FUNCTION h5sis_simple_c
-            END INTERFACE
-
-            hdferr = h5sis_simple_c(space_id, flag)
-            status = .TRUE.
-            if (flag .EQ. 0) status = .FALSE.
-
-          END SUBROUTINE h5sis_simple_f
-
-!
-!****s* H5S/h5soffset_simple_f
-!
-! NAME
-!  h5soffset_simple_f
-!
-! PURPOSE
-!  Sets the offset of a simple dataspace.
-!
-! INPUTS
-!  space_id 	 - dataspace identifier
-!  offset 	 - the offset at which to position the
-!  selection
-! OUTPUTS
-!  hdferr      - Returns 0 if successful and -1 if fails
-! OPTIONAL PARAMETERS
-!  NONE
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 6, 2001
-!
-! SOURCE
-          SUBROUTINE h5soffset_simple_f(space_id, offset, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: space_id ! Dataspace identifier
-            INTEGER(HSSIZE_T), DIMENSION(*), INTENT(IN) ::  offset
-                                                   ! The offset at which to position
-                                                   ! the selection
-            INTEGER, INTENT(OUT) :: hdferr         ! Error code
-!*****
-            INTERFACE
-              INTEGER FUNCTION h5soffset_simple_c(space_id, offset)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5SOFFSET_SIMPLE_C'::h5soffset_simple_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: space_id
-              INTEGER(HSSIZE_T), DIMENSION(*), INTENT(IN) ::  offset
-              END FUNCTION h5soffset_simple_c
-            END INTERFACE
-
-            hdferr = h5soffset_simple_c(space_id, offset)
-
-          END SUBROUTINE h5soffset_simple_f
-
-!
-!****s* H5S/h5sextent_copy_f
-!
-! NAME
-!  h5sextent_copy_f
-!
-! PURPOSE
-!  Copies the extent of a dataspace.
-!
-! INPUTS
-!  dest_space_id 	 - the identifier for the dataspace to which
-!  the extent is copied
-!  source_space_id 	 - the identifier for the dataspace from
-!  which the extent is copied
-! OUTPUTS
-!  hdferr      - Returns 0 if successful and -1 if fails
-! OPTIONAL PARAMETERS
-!  NONE
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 6, 2001
-!
-! NOTES
-!
-
-! SOURCE
-          SUBROUTINE h5sextent_copy_f(dest_space_id, source_space_id, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: dest_space_id  ! Identifier of destination
-                                                         ! dataspace
-            INTEGER(HID_T), INTENT(IN) :: source_space_id ! Identifier of source
-                                                          ! dataspace
-            INTEGER, INTENT(OUT) :: hdferr                ! Error code
-!*****
-            INTERFACE
-              INTEGER FUNCTION h5sextent_copy_c(dest_space_id, source_space_id)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5SEXTENT_COPY_C'::h5sextent_copy_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: dest_space_id
-              INTEGER(HID_T), INTENT(IN) :: source_space_id
-              END FUNCTION h5sextent_copy_c
-            END INTERFACE
-
-            hdferr = h5sextent_copy_c(dest_space_id, source_space_id)
-
-          END SUBROUTINE h5sextent_copy_f
-
-!
-!****s* H5S/h5sset_extent_none_f
-!
-! NAME
-!  h5sset_extent_none_f
-!
-! PURPOSE
-!  Removes the extent from a dataspace.
-!
-! INPUTS
-!  space_id 	 - dataspace identifier
-! OUTPUTS
-!  hdferr      - Returns 0 if successful and -1 if fails
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 6, 2001
-!
-! SOURCE
-          SUBROUTINE h5sset_extent_none_f(space_id, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: space_id  ! Dataspace identifier
-            INTEGER, INTENT(OUT) :: hdferr          ! Error code
-!*****
-            INTERFACE
-              INTEGER FUNCTION h5sset_extent_none_c(space_id)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5SSET_EXTENT_NONE_C'::h5sset_extent_none_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: space_id
-              END FUNCTION h5sset_extent_none_c
-            END INTERFACE
-
-            hdferr = h5sset_extent_none_c(space_id)
-
-          END SUBROUTINE h5sset_extent_none_f
-
-!
-!****s* H5S/h5sselect_hyperslab_f
-!
-! NAME
-!  h5sselect_hyperslab_f
-!
-! PURPOSE
-!  Selects a hyperslab region to add to the current selected
-!  region
-!
-! INPUTS
-!  space_id 	 - dataspace identifier
-!  operator 	 - flag, valid values are:
-!  H5S_SELECT_SET_F (0)
-!  H5S_SELECT_OR_F (1)
-!  start 	 - array with hyperslab offsets
-!  count 	 - number of blocks included in the
-!  hyperslab
-! OUTPUTS
-!  hdferr      - Returns 0 if successful and -1 if fails
-! OPTIONAL PARAMETERS
-!  stride 	 - array with hyperslab strides
-!  block 	 - array with hyperslab block sizes
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 6, 2001
-!
-! SOURCE
-          SUBROUTINE h5sselect_hyperslab_f(space_id, operator, start, count, &
-                                           hdferr, stride, block)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: space_id ! Dataspace identifier
-            INTEGER, INTENT(IN) :: operator     ! Flag, valid values are:
-                                                ! H5S_SELECT_SET_F (0)
-                                                ! H5S_SELECT_OR_F (1)
-                                                !
-            INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: start
-                                          ! Starting coordinates of the hyperslab
-            INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: count
-                                          ! Number of blocks to select
-                                          ! from dataspace
-            INTEGER, INTENT(OUT) :: hdferr     ! Error code
-            INTEGER(HSIZE_T), DIMENSION(:), OPTIONAL, INTENT(IN) :: stride
-                                          ! Array of how many elements to move
-                                          ! in each direction
-            INTEGER(HSIZE_T), DIMENSION(:), OPTIONAL, INTENT(IN) :: block
-                                          ! Sizes of element block
-!*****
-            INTEGER(HSIZE_T), DIMENSION(:), ALLOCATABLE :: def_block
-            INTEGER(HSIZE_T), DIMENSION(:), ALLOCATABLE :: def_stride
-            INTEGER :: rank
-            INTEGER :: error1, error2
-
-            INTERFACE
-              INTEGER FUNCTION h5sselect_hyperslab_c(space_id, operator, &
-                               start, count, stride, block)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5SSELECT_HYPERSLAB_C'::h5sselect_hyperslab_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: space_id
-              INTEGER, INTENT(IN) :: operator
-              INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: start
-              INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: count
-              INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: stride
-              INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: block
-              END FUNCTION h5sselect_hyperslab_c
-            END INTERFACE
-
-            if (present(stride).and. present(block)) then
-            hdferr = h5sselect_hyperslab_c(space_id, operator, start, count, &
-                                           stride, block)
-            return
-            endif
-            ! Case of optional parameters.
-            !
-            ! Find the rank of the dataspace to allocate memery for
-            ! default stride and block arrays.
-            !
-            CALL h5sget_simple_extent_ndims_f(space_id, rank, hdferr)
-            if( hdferr .EQ. -1) return
-            !
-            if (present(stride).and. .not.present(block)) then
-            allocate(def_block(rank), stat=error1)
-                if (error1.NE.0) then
-                    hdferr = -1
-                    return
-                endif
-            def_block = 1
-            hdferr = h5sselect_hyperslab_c(space_id, operator, start, count, &
-                                           stride, def_block)
-            deallocate(def_block)
-            return
-            endif
-
-            if (.not.present(stride).and. present(block)) then
-            allocate(def_stride(rank), stat=error2)
-                if (error2.NE.0) then
-                    hdferr = -1
-                    return
-                endif
-            def_stride = 1
-            hdferr = h5sselect_hyperslab_c(space_id, operator, start, count, &
-                                           def_stride, block)
-            deallocate(def_stride)
-            return
-            endif
-            allocate(def_block(rank), stat=error1)
-            allocate(def_stride(rank), stat=error2)
-                if ((error1.NE.0) .OR. (error2.NE.0)) then
-                    hdferr = -1
-                    return
-                endif
-            def_block = 1
-            def_stride = 1
-            hdferr = h5sselect_hyperslab_c(space_id, operator, start, count, &
-                                           def_stride, def_block)
-            deallocate(def_block)
-            deallocate(def_stride)
-
-          END SUBROUTINE h5sselect_hyperslab_f
-!  !$!
-!  !$!****s* H5S/h5scombine_hyperslab_f
-!  !$!
-!  !$! NAME
-!  !$!		h5scombine_hyperslab_f
-!  !$!
-!  !$! PURPOSE
-!  !$!	Combine a hyperslab selection with the current
-!  !$!               selection for a dataspace
-!  !$!
-!  !$! INPUTS
-!  !$!		space_id	- dataspace of selection to use
-!  !$!		operator	- flag, valid values are:
-!  !$!				  H5S_SELECT_NOOP_F
-!  !$!				  H5S_SELECT_SET_F
-!  !$!				  H5S_SELECT_OR_F
-!  !$!				  H5S_SELECT_AND_F
-!  !$!				  H5S_SELECT_XOR_F
-!  !$!				  H5S_SELECT_NOTB_F
-!  !$!				  H5S_SELECT_NOTA_F
-!  !$!				  H5S_SELECT_APPEND_F
-!  !$!				  H5S_SELECT_PREPEND_F
-!  !$!		start		- array with hyperslab offsets
-!  !$!		count		- number of blocks included in the
-!  !$!				  hyperslab
-!  !$! OUTPUTS
-!  !$!               hyper_id        - identifier for the new hyperslab
-!  !$!		hdferr:		- error code
-!  !$!				 	Success:  0
-!  !$!				 	Failure: -1
-!  !$! OPTIONAL PARAMETERS
-!  !$!		stride		- array with hyperslab strides
-!  !$!		block		- array with hyperslab block sizes
-!  !$!
-!  !$! AUTHOR
-!  !$!	Elena Pourmal
-!  !$!		October 7, 2002
-!  !$!
-!  !$! HISTORY
-!  !$!
-!  !$!
-!  !$! NOTES
-!  !$! Commented out until 1.6 ? 10/08/2002
-!  !$!
-!  !$! SOURCE
-!  SUBROUTINE h5scombine_hyperslab_f(space_id, operator, start, count, &
-!  hyper_id,  hdferr, stride, block)
-!  IMPLICIT NONE
-!  INTEGER(HID_T), INTENT(IN) :: space_id ! Dataspace identifier
-!  INTEGER, INTENT(IN) :: operator     ! Flag, valid values are:
-						!  H5S_SELECT_NOOP_F
-						!  H5S_SELECT_SET_F
-						!  H5S_SELECT_OR_F
-						!  H5S_SELECT_AND_F
-						!  H5S_SELECT_XOR_F
-						!  H5S_SELECT_NOTB_F
-						!  H5S_SELECT_NOTA_F
-						!  H5S_SELECT_APPEND_F
-						!  H5S_SELECT_PREPEND_F
-                                                !
-!  INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: start
-                                          ! Starting coordinates of the hyperslab
-!  INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: count
-                                          ! Number of blocks to select
-                                          ! from dataspace
-!  INTEGER(HID_T), INTENT(OUT) :: hyper_id ! New hyperslab identifier
-!  INTEGER, INTENT(OUT) :: hdferr     ! Error code
-!  INTEGER(HSIZE_T), DIMENSION(:), OPTIONAL, INTENT(IN) :: stride
-                                          ! Array of how many elements to move
-                                          ! in each direction
-!  INTEGER(HSIZE_T), DIMENSION(:), OPTIONAL, INTENT(IN) :: block
-                                          ! Sizes of element block
-!  INTEGER(HSIZE_T), DIMENSION(:), ALLOCATABLE :: def_block
-!  INTEGER(HSIZE_T), DIMENSION(:), ALLOCATABLE :: def_stride
-!  INTEGER :: rank
-!  INTEGER :: error1, error2
-
-!  INTERFACE
-!  INTEGER FUNCTION h5scombine_hyperslab_c(space_id, operator, &
-!  start, count, stride, block, hyper_id)
-!  USE H5GLOBAL
-!  !DEC$IF DEFINED(HDF5F90_WINDOWS)
-!  !DEC$ATTRIBUTES C,reference,decorate,alias:'H5SCOMBINE_HYPERSLAB_C'::h5scombine_hyperslab_c
-!  !DEC$ENDIF
-!  INTEGER(HID_T), INTENT(IN) :: space_id
-!  INTEGER, INTENT(IN) :: operator
-!  INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: start
-!  INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: count
-!  INTEGER(HSIZE_T), DIMENSION(*), OPTIONAL, INTENT(IN) :: stride
-!  INTEGER(HSIZE_T), DIMENSION(*), OPTIONAL, INTENT(IN) :: block
-!  INTEGER(HID_T), INTENT(OUT) :: hyper_id
-!  END FUNCTION h5scombine_hyperslab_c
-!  END INTERFACE
-
-!  if (present(stride).and. present(block)) then
-!  hdferr = h5scombine_hyperslab_c(space_id, operator, start, count, &
-!  stride, block, hyper_id)
-!  return
-!  endif
-            ! Case of optional parameters.
-            !
-            ! Find the rank of the dataspace to allocate memery for
-            ! default stride and block arrays.
-            !
-!  CALL h5sget_simple_extent_ndims_f(space_id, rank, hdferr)
-!  if( hdferr .EQ. -1) return
-            !
-!  if (present(stride).and. .not.present(block)) then
-!  allocate(def_block(rank), stat=error1)
-!  if (error1.NE.0) then
-!  hdferr = -1
-!  return
-!  endif
-!  def_block = 1
-!  hdferr = h5scombine_hyperslab_c(space_id, operator, start, count, &
-!  stride, def_block, hyper_id)
-!  deallocate(def_block)
-!  return
-!  endif
-
-!  if (.not.present(stride).and. present(block)) then
-!  allocate(def_stride(rank), stat=error2)
-!  if (error2.NE.0) then
-!  hdferr = -1
-!  return
-!  endif
-!  def_stride = 1
-!  hdferr = h5scombine_hyperslab_c(space_id, operator, start, count, &
-!  def_stride, block, hyper_id)
-!  deallocate(def_stride)
-!  return
-!  endif
-!  allocate(def_block(rank), stat=error1)
-!  allocate(def_stride(rank), stat=error2)
-!  if ((error1.NE.0) .OR. (error2.NE.0)) then
-!  hdferr = -1
-!  return
-!  endif
-!  def_block = 1
-!  def_stride = 1
-!  hdferr = h5scombine_hyperslab_c(space_id, operator, start, count, &
-!  def_stride, def_block, hyper_id)
-!  deallocate(def_block)
-!  deallocate(def_stride)
-
-!  END SUBROUTINE h5scombine_hyperslab_f
-
-!  !$!
-!  !$!****s* H5S/
-!  !$!
-!  !$! NAME
-!  !$!		h5scombine_select_f
-!  !$!
-!  !$! PURPOSE
-!  !$!	Combine two hyperslab selections with an operation
-!  !$!               and return a dataspace with resulting selection.
-!  !$!
-!  !$! INPUTS
-!  !$!		space1_id	- dataspace of selection to use
-!  !$!		operator	- flag, valid values are:
-!  !$!				  H5S_SELECT_NOOP_F
-!  !$!				  H5S_SELECT_SET_F
-!  !$!				  H5S_SELECT_OR_F
-!  !$!				  H5S_SELECT_AND_F
-!  !$!				  H5S_SELECT_XOR_F
-!  !$!				  H5S_SELECT_NOTB_F
-!  !$!				  H5S_SELECT_NOTA_F
-!  !$!				  H5S_SELECT_APPEND_F
-!  !$!				  H5S_SELECT_PREPEND_F
-!  !$!		space2_id	- dataspace of selection to use
-!  !$! OUTPUTS
-!  !$!               ds_id           - idataspace identifier with the new selection
-!  !$!		hdferr:		- error code
-!  !$!				 	Success:  0
-!  !$!				 	Failure: -1
-!  !$! OPTIONAL PARAMETERS		- NONE
-!  !$!
-!  !$! AUTHOR
-!  !$!	Elena Pourmal
-!  !$!		October 7, 2002
-!  !$!
-!  !$! HISTORY
-!  !$!
-!  !$!
-!  !$! NOTES commented out until 1.6 release(?) 10/08/2002
-!  !$!
-
-!  ! SOURCE
-!  !$          SUBROUTINE h5scombine_select_f(space1_id, operator, space2_id, &
-!  ds_id,  hdferr)
-!  IMPLICIT NONE
-!  INTEGER(HID_T), INTENT(IN) :: space1_id ! First dataspace identifier
-!  INTEGER(HID_T), INTENT(IN) :: space2_id ! Second dataspace identifier
-!  INTEGER, INTENT(IN) :: operator     ! Flag, valid values are:
-						!  H5S_SELECT_NOOP_F
-						!  H5S_SELECT_SET_F
-						!  H5S_SELECT_OR_F
-						!  H5S_SELECT_AND_F
-						!  H5S_SELECT_XOR_F
-						!  H5S_SELECT_NOTB_F
-						!  H5S_SELECT_NOTA_F
-						!  H5S_SELECT_APPEND_F
-						!  H5S_SELECT_PREPEND_F
-                                                !
-!  INTEGER(HID_T), INTENT(OUT) :: ds_id ! New dataspace identifier
-!  INTEGER, INTENT(OUT) :: hdferr     ! Error code
-!
-!  INTERFACE
-!  INTEGER FUNCTION h5scombine_select_c(space1_id, operator, &
-!  space2_id, ds_id)
-!  USE H5GLOBAL
-!  !DEC$IF DEFINED(HDF5F90_WINDOWS)
-!  !DEC$ATTRIBUTES C,reference,decorate,alias:'H5SCOMBINE_SELECT_C'::h5scombine_select_c
-!  !DEC$ENDIF
-!  INTEGER(HID_T), INTENT(IN) :: space1_id
-!  INTEGER(HID_T), INTENT(IN) :: space2_id
-!  INTEGER, INTENT(IN) :: operator
-!  INTEGER(HID_T), INTENT(OUT) :: ds_id
-!  END FUNCTION h5scombine_select_c
-!  END INTERFACE
-
-!  hdferr = h5scombine_select_c(space1_id, operator, space2_id, &
-!  ds_id)
-!  return
-
-!  END SUBROUTINE h5scombine_select_f
-
-!  !$!
-!  !$!****s* H5S/
-!  !$!
-!  !$! NAME
-!  !$!		h5sselect_select_f
-!  !$!
-!  !$! PURPOSE
-!  !$!	Refine a hyperslab selection with an operation
-!  !$!               using second hyperslab
-!  !$!
-!  !$! INPUTS
-!  !$!		space1_id	- dataspace of selection  to modify
-!  !$!		operator	- flag, valid values are:
-!  !$!				  H5S_SELECT_NOOP_F
-!  !$!				  H5S_SELECT_SET_F
-!  !$!				  H5S_SELECT_OR_F
-!  !$!				  H5S_SELECT_AND_F
-!  !$!				  H5S_SELECT_XOR_F
-!  !$!				  H5S_SELECT_NOTB_F
-!  !$!				  H5S_SELECT_NOTA_F
-!  !$!				  H5S_SELECT_APPEND_F
-!  !$!				  H5S_SELECT_PREPEND_F
-!  !$!		space2_id	- dataspace of selection to use
-!  !$!
-!  !$! OUTPUTS
-!  !$!		hdferr:		- error code
-!  !$!				 	Success:  0
-!  !$!				 	Failure: -1
-!  !$! OPTIONAL PARAMETERS		- NONE
-!  !$!
-!  !$! AUTHOR
-!  !$!	Elena Pourmal
-!  !$!		October 7, 2002
-!  !$!
-!  !$! HISTORY
-!  !$!
-!  !$!
-!  !$! NOTESCommented out until 1.6 release(?) 10/08/2002 EIP
-!  !$!
-
-!  ! SOURCE
-!  SUBROUTINE h5sselect_select_f(space1_id, operator, space2_id, &
-!  hdferr)
-!  IMPLICIT NONE
-!  INTEGER(HID_T), INTENT(INOUT) :: space1_id ! Dataspace identifier to
-                                                       ! modify
-!  INTEGER(HID_T), INTENT(IN) :: space2_id ! Second dataspace identifier
-!  INTEGER, INTENT(IN) :: operator     ! Flag, valid values are:
-						!  H5S_SELECT_NOOP_F
-						!  H5S_SELECT_SET_F
-						!  H5S_SELECT_OR_F
-						!  H5S_SELECT_AND_F
-						!  H5S_SELECT_XOR_F
-						!  H5S_SELECT_NOTB_F
-						!  H5S_SELECT_NOTA_F
-						!  H5S_SELECT_APPEND_F
-						!  H5S_SELECT_PREPEND_F
-                                                !
-!  INTEGER, INTENT(OUT) :: hdferr     ! Error code
-
-!  INTERFACE
-!  INTEGER FUNCTION h5sselect_select_c(space1_id, operator, &
-!  space2_id)
-!  USE H5GLOBAL
-!  !DEC$IF DEFINED(HDF5F90_WINDOWS)
-!  !DEC$ATTRIBUTES C,reference,decorate,alias:'H5SSELECT_SELECT_C'::h5sselect_select_c
-!  !DEC$ENDIF
-!  INTEGER(HID_T), INTENT(INOUT) :: space1_id
-!  INTEGER(HID_T), INTENT(IN) :: space2_id
-!  INTEGER, INTENT(IN) :: operator
-!  END FUNCTION h5sselect_select_c
-!  END INTERFACE
-
-!  hdferr = h5sselect_select_c(space1_id, operator, space2_id)
-!  return
-
-!  END SUBROUTINE h5sselect_select_f
-
-!
-!****s* H5S/h5sget_select_type_f
-!
-! NAME
-!  h5sget_select_type_f
-!
-! PURPOSE
-!  Retrieve the type of selection
-!
-! INPUTS
-!  space_id 	 - dataspace iidentifier with selection
-! OUTPUTS
-!  type 	 - flag, valid values are:
-!                    H5S_SEL_ERROR_F
-!                    H5S_SEL_NONE_F
-!                    H5S_SEL_POINTS_F
-!                    H5S_SEL_HYPERSLABS_F
-!                    H5S_SEL_ALL_F
-!  hdferr      - Returns 0 if successful and -1 if fails
-! AUTHOR
-!  Elena Pourmal
-!  October 7, 2002
-!
-! SOURCE
-          SUBROUTINE h5sget_select_type_f(space_id, type, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(INOUT) :: space_id ! Dataspace identifier to
-            INTEGER, INTENT(OUT) :: type        ! Selection type
-						!  H5S_SEL_ERROR_F
-						!  H5S_SEL_NONE_F
-						!  H5S_SEL_POINTS_F
-						!  H5S_SEL_HYPERSLABS_F
-						!  H5S_SEL_ALL_F
-            INTEGER, INTENT(OUT) :: hdferr     ! Error code
-!*****
-            INTERFACE
-              INTEGER FUNCTION h5sget_select_type_c(space_id, type)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5SGET_SELECT_TYPE_C'::h5sget_select_type_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: space_id
-              INTEGER, INTENT(OUT) :: type
-              END FUNCTION h5sget_select_type_c
-            END INTERFACE
-
-            hdferr = h5sget_select_type_c(space_id, type)
-            return
-
-          END SUBROUTINE h5sget_select_type_f
-
-!
-!****s* H5S/H5Sdecode_f
-!
-! NAME
-!  H5Sdecode_f
-!
-! PURPOSE
-!  Decode a binary object description of data space and return a new object handle.
-!
-! INPUTS
-!  buf 	 -  Buffer for the data space object to be decoded.
-!  obj_id 	 - Object ID
-! OUTPUTS
-!  hdferr      - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  March 26, 2008
-! SOURCE
-  SUBROUTINE h5sdecode_f(buf, obj_id, hdferr)
-    IMPLICIT NONE
-    CHARACTER(LEN=*), INTENT(IN) :: buf ! Buffer for the data space object to be decoded.
-    INTEGER(HID_T), INTENT(OUT) :: obj_id  ! Object ID
-    INTEGER, INTENT(OUT) :: hdferr     ! Error code
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5sdecode_c(buf, obj_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5SDECODE_C'::h5sdecode_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: buf
-         CHARACTER(LEN=*), INTENT(IN) :: buf
-         INTEGER(HID_T), INTENT(OUT) :: obj_id  ! Object ID
-       END FUNCTION h5sdecode_c
-    END INTERFACE
-
-    hdferr = h5sdecode_c(buf, obj_id)
-
-  END SUBROUTINE h5sdecode_f
-
-!
-!****s* H5S/H5Sencode_f
-!
-! NAME
-!  H5Sencode_f
-!
-! PURPOSE
-!  Encode a data space object description into a binary buffer.
-!
-! INPUTS
-!  obj_id 	 - Identifier of the object to be encoded.
-!  buf 	 - Buffer for the object to be encoded into.
-!  nalloc 	 - The size of the allocated buffer.
-! OUTPUTS
-!  nalloc 	 - The size of the buffer needed.
-!  hdferr      - Returns 0 if successful and -1 if fails.
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  March 26, 2008
-! SOURCE
-  SUBROUTINE h5sencode_f(obj_id, buf, nalloc, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: obj_id ! Identifier of the object to be encoded.
-    CHARACTER(LEN=*), INTENT(OUT) :: buf ! Buffer for the object to be encoded into.
-    INTEGER(SIZE_T), INTENT(INOUT) :: nalloc ! The size of the allocated buffer.
-    INTEGER, INTENT(OUT) :: hdferr     ! Error code
-!*****
-
-    INTERFACE
-       INTEGER FUNCTION h5sencode_c(buf, obj_id, nalloc)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5SENCODE_C'::h5sencode_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: buf
-         INTEGER(HID_T), INTENT(IN) :: obj_id
-         CHARACTER(LEN=*), INTENT(OUT) :: buf
-         INTEGER(SIZE_T), INTENT(INOUT) :: nalloc
-       END FUNCTION h5sencode_c
-    END INTERFACE
-
-    hdferr = h5sencode_c(buf, obj_id, nalloc)
-
-  END SUBROUTINE h5sencode_f
-
-!****s* H5S/h5sextent_equal_f
-!
-! NAME
-!  h5sextent_equal_f
-!
-! PURPOSE
-!  Determines whether two dataspace extents are equal.
-!
-! INPUTS
-!  space1_id 	 - First dataspace identifier.
-!  space2_id 	 - Second dataspace identifier.
-! OUTPUTS
-!  Equal 	 - .TRUE. if equal, .FALSE. if unequal.
-!  hdferr      - Returns 0 if successful and -1 if fails
-! AUTHOR
-!  M. Scot Breitenfeld
-!  April 2, 2008
-!
-! SOURCE
-  SUBROUTINE h5sextent_equal_f(space1_id, space2_id, equal, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: space1_id ! First dataspace identifier.
-    INTEGER(HID_T), INTENT(IN) :: space2_id ! Second dataspace identifier.
-    LOGICAL, INTENT(OUT) :: Equal ! .TRUE. if equal, .FALSE. if unequal.
-    INTEGER, INTENT(OUT) :: hdferr                ! Error code
-!*****
-    INTEGER(HID_T) :: c_equal
-
-    INTERFACE
-       INTEGER FUNCTION h5sextent_equal_c(space1_id, space2_id, c_equal)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5SEXTENT_EQUAL_C'::h5sextent_equal_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: space1_id
-         INTEGER(HID_T), INTENT(IN) :: space2_id
-         INTEGER(HID_T) :: c_equal
-       END FUNCTION h5sextent_equal_c
-    END INTERFACE
-
-    hdferr = h5sextent_equal_c(space1_id, space2_id, c_equal)
-
-
-    equal = .FALSE.
-    IF(c_equal.GT.0) equal = .TRUE.
-
-
-  END SUBROUTINE h5sextent_equal_f
-
-END MODULE H5S
diff --git a/fortran/src/H5Tf.c b/fortran/src/H5Tf.c
index 7e1aa42..11f62b7 100644
--- a/fortran/src/H5Tf.c
+++ b/fortran/src/H5Tf.c
@@ -1,125 +1,121 @@
 /****h* H5Tf/H5Tf
  * PURPOSE
- *   This file contains C stubs for H5T Fortran APIs
+ *  This file contains C stubs for H5T Fortran APIs
  *
  * COPYRIGHT
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  ******
-*/
+ */
 
 #include "H5f90.h"
 
-
 /****if* H5Tf/h5topen_c
  * NAME
  *  h5topen_c
  * PURPOSE
  *  Call H5Topen2 to open a datatype
  * INPUTS
- *      loc_id - file or group identifier
- *              name - name of the datatype within file or  group
- *              namelen - name length
- *              tapl_id - datatype access property list identifier
+ *  loc_id - file or group identifier
+ *  name - name of the datatype within file or  group
+ *  namelen - name length
+ *  tapl_id - datatype access property list identifier
  * OUTPUTS
- *     type_id - dataset identifier
+ *  type_id - dataset identifier
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Saturday, August 14, 1999
+ *  Saturday, August 14, 1999
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5topen_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id, hid_t_f *tapl_id)
+h5topen_c(hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id, hid_t_f *tapl_id)
 /******/
 {
     char *c_name = NULL;
     hid_t c_type_id;
-    int ret_value = -1;
+    int   ret_value = -1;
 
     /*
      * Convert FORTRAN name to C name
      */
-    if(NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
+    if (NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
         goto done;
 
     /*
      * Call H5Topen2 function.
      */
-    if((c_type_id = H5Topen2((hid_t)*loc_id, c_name, (hid_t)*tapl_id)) < 0)
+    if ((c_type_id = H5Topen2((hid_t)*loc_id, c_name, (hid_t)*tapl_id)) < 0)
         goto done;
     *type_id = (hid_t_f)c_type_id;
 
     ret_value = 0;
 
 done:
-    if(c_name)
+    if (c_name)
         HDfree(c_name);
 
     return ret_value;
 }
 
-
 /****if* H5Tf/h5tcommit_c
  * NAME
  *  h5tcommit_c
  * PURPOSE
  *  Call H5Tcommit2 to commit a datatype
  * INPUTS
- *      loc_id - file or group identifier
- *              name - name of the datatype within file or  group
- *              namelen - name length
- *              type_id - dataset identifier
- *              lcpl_id - Link creation property list
- *              tcpl_id - Datatype creation property list
- *              tapl_id - Datatype access property list
+ *  loc_id - file or group identifier
+ *  name - name of the datatype within file or  group
+ *  namelen - name length
+ *  type_id - dataset identifier
+ *  lcpl_id - Link creation property list
+ *  tcpl_id - Datatype creation property list
+ *  tapl_id - Datatype access property list
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Saturday, August 14, 1999
+ *  Saturday, August 14, 1999
  * HISTORY
  *
  *              - Added passing optional parameters for version 1.8
  *                M. Scot Breitenfeld
  * SOURCE
-*/
+ */
 int_f
-nh5tcommit_c(hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id,
-	     hid_t_f *lcpl_id, hid_t_f *tcpl_id, hid_t_f *tapl_id)
+h5tcommit_c(hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id, hid_t_f *lcpl_id, hid_t_f *tcpl_id,
+            hid_t_f *tapl_id)
 /******/
 {
-    char *c_name = NULL;
-    int ret_value = -1;
+    char *c_name    = NULL;
+    int   ret_value = -1;
 
     /* Convert FORTRAN name to C name */
-    if(NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
+    if (NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
         goto done;
 
     /* Call H5Tcommit2 function */
-    if(H5Tcommit2((hid_t)*loc_id, c_name, (hid_t)*type_id, (hid_t)*lcpl_id, (hid_t)*tcpl_id, (hid_t)*tapl_id) < 0)
+    if (H5Tcommit2((hid_t)*loc_id, c_name, (hid_t)*type_id, (hid_t)*lcpl_id, (hid_t)*tcpl_id,
+                   (hid_t)*tapl_id) < 0)
         goto done;
 
     ret_value = 0;
 
 done:
-    if(c_name)
+    if (c_name)
         HDfree(c_name);
     return ret_value;
 }
@@ -130,62 +126,63 @@ done:
  * PURPOSE
  *  Call H5Tclose to close the datatype
  * INPUTS
- *      type_id - identifier of the datatype to be closed
+ *  type_id - identifier of the datatype to be closed
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Saturday, August 14, 1999
+ *  Saturday, August 14, 1999
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5tclose_c ( hid_t_f *type_id )
+h5tclose_c(hid_t_f *type_id)
 /******/
 {
-  int ret_value = 0;
-  hid_t c_type_id;
+    int   ret_value = 0;
+    hid_t c_type_id;
 
-  c_type_id = *type_id;
-  if ( H5Tclose(c_type_id) < 0  ) ret_value = -1;
-  return ret_value;
+    c_type_id = *type_id;
+    if (H5Tclose(c_type_id) < 0)
+        ret_value = -1;
+    return ret_value;
 }
 
-
 /****if* H5Tf/h5tcopy_c
  * NAME
  *  h5tcopy_c
  * PURPOSE
  *  Call H5Tcopy to copy a datatype
  * INPUTS
- *      type_id - identifier of the datatype to be copied
+ *  type_id - identifier of the datatype to be copied
  * OUTPUTS
- *     new_type_id - identifier of the new datatype
+ *  new_type_id - identifier of the new datatype
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Saturday, August 14, 1999
+ *  Saturday, August 14, 1999
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5tcopy_c ( hid_t_f *type_id , hid_t_f *new_type_id)
+h5tcopy_c(hid_t_f *type_id, hid_t_f *new_type_id)
 /******/
 {
-  int ret_value = 0;
-  hid_t c_type_id;
-  hid_t c_new_type_id;
-
-  c_type_id = *type_id;
-  c_new_type_id = H5Tcopy(c_type_id);
-  if ( c_new_type_id < 0  ) ret_value = -1;
-  *new_type_id = (hid_t_f)c_new_type_id;
-  return ret_value;
+    int   ret_value = 0;
+    hid_t c_type_id;
+    hid_t c_new_type_id;
+
+    c_type_id     = *type_id;
+    c_new_type_id = H5Tcopy(c_type_id);
+    if (c_new_type_id < 0)
+        ret_value = -1;
+    *new_type_id = (hid_t_f)c_new_type_id;
+    return ret_value;
 }
 
 /****if* H5Tf/h5tequal_c
@@ -194,35 +191,36 @@ nh5tcopy_c ( hid_t_f *type_id , hid_t_f *new_type_id)
  * PURPOSE
  *  Call H5Tequal to copy a datatype
  * INPUTS
- *      type1_id - datatype identifier
- *              type2_id - datatype identifier
+ *  type1_id - datatype identifier
+ *  type2_id - datatype identifier
  * OUTPUTS
- *     c_flag - flag; indicates if two datatypes are equal or not.
+ *  c_flag - flag; indicates if two datatypes are equal or not.
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Tuesday, February 22, 2000
+ *  Tuesday, February 22, 2000
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5tequal_c ( hid_t_f *type1_id , hid_t_f *type2_id, int_f *c_flag)
+h5tequal_c(hid_t_f *type1_id, hid_t_f *type2_id, int_f *c_flag)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_type1_id, c_type2_id;
-  htri_t status;
-
-  c_type1_id = *type1_id;
-  c_type2_id = *type2_id;
-  status = H5Tequal(c_type1_id, c_type2_id);
-  if ( status < 0  ) return ret_value;
-  *c_flag = (int_f)status;
-  ret_value = 0;
-  return ret_value;
+    int    ret_value = -1;
+    hid_t  c_type1_id, c_type2_id;
+    htri_t status;
+
+    c_type1_id = *type1_id;
+    c_type2_id = *type2_id;
+    status     = H5Tequal(c_type1_id, c_type2_id);
+    if (status < 0)
+        return ret_value;
+    *c_flag   = (int_f)status;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Tf/h5tget_class_c
@@ -254,37 +252,37 @@ nh5tequal_c ( hid_t_f *type1_id , hid_t_f *type2_id, int_f *c_flag)
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5tget_class_c ( hid_t_f *type_id , int_f *classtype)
+h5tget_class_c(hid_t_f *type_id, int_f *classtype)
 /******/
 {
-  int ret_value = 0;
-  hid_t c_type_id;
-  H5T_class_t c_classtype;
-
-  c_type_id = *type_id;
-  c_classtype = H5Tget_class(c_type_id);
-  if (c_classtype == H5T_NO_CLASS ) {
-      /* *classtype = H5T_NO_CLASS_F; */
-      *classtype = (int_f)H5T_NO_CLASS;
-       ret_value = -1;
-       return ret_value;
-  }
-  *classtype = c_classtype;
-/*
-  if (c_classtype == H5T_INTEGER)   *classtype = H5T_INTEGER_F;
-  if (c_classtype == H5T_FLOAT)     *classtype = H5T_FLOAT_F;
-  if (c_classtype == H5T_TIME)      *classtype = H5T_TIME_F;
-  if (c_classtype == H5T_STRING)    *classtype = H5T_STRING_F;
-  if (c_classtype == H5T_BITFIELD)  *classtype = H5T_BITFIELD_F;
-  if (c_classtype == H5T_OPAQUE)    *classtype = H5T_OPAQUE_F;
-  if (c_classtype == H5T_COMPOUND)  *classtype = H5T_COMPOUND_F;
-  if (c_classtype == H5T_REFERENCE) *classtype = H5T_REFERENCE_F;
-  if (c_classtype == H5T_ENUM)      *classtype = H5T_ENUM_F;
-*/
-  return ret_value;
+    int         ret_value = 0;
+    hid_t       c_type_id;
+    H5T_class_t c_classtype;
+
+    c_type_id   = *type_id;
+    c_classtype = H5Tget_class(c_type_id);
+    if (c_classtype == H5T_NO_CLASS) {
+        /* *classtype = H5T_NO_CLASS_F; */
+        *classtype = (int_f)H5T_NO_CLASS;
+        ret_value  = -1;
+        return ret_value;
+    }
+    *classtype = c_classtype;
+    /*
+      if (c_classtype == H5T_INTEGER)   *classtype = H5T_INTEGER_F;
+      if (c_classtype == H5T_FLOAT)     *classtype = H5T_FLOAT_F;
+      if (c_classtype == H5T_TIME)      *classtype = H5T_TIME_F;
+      if (c_classtype == H5T_STRING)    *classtype = H5T_STRING_F;
+      if (c_classtype == H5T_BITFIELD)  *classtype = H5T_BITFIELD_F;
+      if (c_classtype == H5T_OPAQUE)    *classtype = H5T_OPAQUE_F;
+      if (c_classtype == H5T_COMPOUND)  *classtype = H5T_COMPOUND_F;
+      if (c_classtype == H5T_REFERENCE) *classtype = H5T_REFERENCE_F;
+      if (c_classtype == H5T_ENUM)      *classtype = H5T_ENUM_F;
+    */
+    return ret_value;
 }
 
 /****if* H5Tf/h5tget_order_c
@@ -293,43 +291,43 @@ nh5tget_class_c ( hid_t_f *type_id , int_f *classtype)
  * PURPOSE
  *  Call H5Tget_order to determine byte order
  * INPUTS
- *      type_id - identifier of the dataspace
+ *  type_id - identifier of the dataspace
  * OUTPUTS
- *     order; possible values are:
+ *  order; possible values are:
  *              H5T_ORDER_LE_F (0)
  *              H5T_ORDER_BE_F (1)
  *              H5T_ORDER_VAX_F (2)
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Saturday, August 14, 1999
+ *  Saturday, August 14, 1999
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5tget_order_c ( hid_t_f *type_id , int_f *order)
+h5tget_order_c(hid_t_f *type_id, int_f *order)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_type_id;
-  H5T_order_t c_order;
-
-  c_type_id = *type_id;
-  c_order = H5Tget_order(c_type_id);
-  if ( c_order < 0  ) return ret_value;
-  *order = (int_f)c_order;
-   ret_value = 0;
-/*
-  if ( c_order == H5T_ORDER_LE)  *order = H5T_ORDER_LE_F;
-  if ( c_order == H5T_ORDER_BE)  *order = H5T_ORDER_BE_F;
-  if ( c_order == H5T_ORDER_VAX) *order = H5T_ORDER_VAX_F;
-*/
-  return ret_value;
-}
+    int         ret_value = -1;
+    hid_t       c_type_id;
+    H5T_order_t c_order;
 
+    c_type_id = *type_id;
+    c_order   = H5Tget_order(c_type_id);
+    if (c_order < 0)
+        return ret_value;
+    *order    = (int_f)c_order;
+    ret_value = 0;
+    /*
+      if ( c_order == H5T_ORDER_LE)  *order = H5T_ORDER_LE_F;
+      if ( c_order == H5T_ORDER_BE)  *order = H5T_ORDER_BE_F;
+      if ( c_order == H5T_ORDER_VAX) *order = H5T_ORDER_VAX_F;
+    */
+    return ret_value;
+}
 
 /****if* H5Tf/h5tset_order_c
  * NAME
@@ -337,39 +335,40 @@ nh5tget_order_c ( hid_t_f *type_id , int_f *order)
  * PURPOSE
  *  Call H5Tset_order to set byte order
  * INPUTS
- *      type_id - identifier of the dataspace
- *              order; possible values are:
+ *  type_id - identifier of the dataspace
+ *  order; possible values are:
  *              H5T_ORDER_LE_F (0)
  *              H5T_ORDER_BE_F (1)
  *              H5T_ORDER_VAX_F (2)
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Saturday, August 14, 1999
+ *  Saturday, August 14, 1999
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5tset_order_c ( hid_t_f *type_id , int_f *order)
+h5tset_order_c(hid_t_f *type_id, int_f *order)
 /******/
 {
-  int ret_value = 0;
-  hid_t c_type_id;
-  H5T_order_t c_order;
-  herr_t status;
-  c_order = (H5T_order_t)*order;
-/*
-  if ( *order == H5T_ORDER_LE_F) c_order = H5T_ORDER_LE;
-  if ( *order == H5T_ORDER_BE_F) c_order = H5T_ORDER_BE;
-  if ( *order == H5T_ORDER_VAX_F) c_order = H5T_ORDER_VAX;
-*/
-  c_type_id = *type_id;
-  status = H5Tset_order(c_type_id, c_order);
-  if ( status < 0  ) ret_value = -1;
-  return ret_value;
+    int         ret_value = 0;
+    hid_t       c_type_id;
+    H5T_order_t c_order;
+    herr_t      status;
+    c_order = (H5T_order_t)*order;
+    /*
+      if ( *order == H5T_ORDER_LE_F) c_order = H5T_ORDER_LE;
+      if ( *order == H5T_ORDER_BE_F) c_order = H5T_ORDER_BE;
+      if ( *order == H5T_ORDER_VAX_F) c_order = H5T_ORDER_VAX;
+    */
+    c_type_id = *type_id;
+    status    = H5Tset_order(c_type_id, c_order);
+    if (status < 0)
+        ret_value = -1;
+    return ret_value;
 }
 
 /****if* H5Tf/h5tget_size_c
@@ -378,33 +377,34 @@ nh5tset_order_c ( hid_t_f *type_id , int_f *order)
  * PURPOSE
  *  Call H5Tget_size to get size of the datatype
  * INPUTS
- *      type_id - identifier of the dataspace
+ *  type_id - identifier of the dataspace
  * OUTPUTS
- *     size (in bytes)
+ *  size (in bytes)
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Saturday, August 14, 1999
+ *  Saturday, August 14, 1999
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5tget_size_c ( hid_t_f *type_id , size_t_f *size)
+h5tget_size_c(hid_t_f *type_id, size_t_f *size)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_type_id;
-  size_t c_size;
-
-  c_type_id = *type_id;
-  c_size = H5Tget_size(c_type_id);
-  if ( c_size == 0  ) return ret_value;
-  *size = (size_t_f)c_size ;
-  ret_value = 0;
-  return ret_value;
+    int    ret_value = -1;
+    hid_t  c_type_id;
+    size_t c_size;
+
+    c_type_id = *type_id;
+    c_size    = H5Tget_size(c_type_id);
+    if (c_size == 0)
+        return ret_value;
+    *size     = (size_t_f)c_size;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Tf/h5tset_size_c
@@ -413,34 +413,35 @@ nh5tget_size_c ( hid_t_f *type_id , size_t_f *size)
  * PURPOSE
  *  Call H5Tget_size to get size of the datatype
  * INPUTS
- *      type_id - identifier of the dataspace
+ *  type_id - identifier of the dataspace
  * OUTPUTS
- *     size (in bytes)
+ *  size (in bytes)
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Saturday, August 14, 1999
+ *  Saturday, August 14, 1999
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5tset_size_c ( hid_t_f *type_id , size_t_f *size)
+h5tset_size_c(hid_t_f *type_id, size_t_f *size)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_type_id;
-  size_t c_size;
-  herr_t status;
-
-  c_size = (size_t)*size;
-  c_type_id = *type_id;
-  status = H5Tset_size(c_type_id, c_size);
-  if ( status < 0  ) return ret_value;
-  ret_value = 0;
-  return ret_value;
+    int    ret_value = -1;
+    hid_t  c_type_id;
+    size_t c_size;
+    herr_t status;
+
+    c_size    = (size_t)*size;
+    c_type_id = *type_id;
+    status    = H5Tset_size(c_type_id, c_size);
+    if (status < 0)
+        return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Tf/h5tget_precision_c
@@ -449,33 +450,34 @@ nh5tset_size_c ( hid_t_f *type_id , size_t_f *size)
  * PURPOSE
  *  Call H5Tget_precision to get precision of the datatype
  * INPUTS
- *      type_id - identifier of the dataspace
+ *  type_id - identifier of the dataspace
  * OUTPUTS
- *     precision -  number of significant bits
+ *  precision -  number of significant bits
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  XIANGYANG SU
- *              Tuesday, January 25, 2000
+ *  Tuesday, January 25, 2000
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5tget_precision_c ( hid_t_f *type_id , size_t_f *precision)
+h5tget_precision_c(hid_t_f *type_id, size_t_f *precision)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_type_id;
-  size_t c_precision;
-
-  c_type_id = *type_id;
-  c_precision = H5Tget_precision(c_type_id);
-  if ( c_precision == 0  ) return ret_value;
-  *precision = (size_t_f)c_precision ;
-  ret_value = 0;
-  return ret_value;
+    int    ret_value = -1;
+    hid_t  c_type_id;
+    size_t c_precision;
+
+    c_type_id   = *type_id;
+    c_precision = H5Tget_precision(c_type_id);
+    if (c_precision == 0)
+        return ret_value;
+    *precision = (size_t_f)c_precision;
+    ret_value  = 0;
+    return ret_value;
 }
 
 /****if* H5Tf/h5tset_precision_c
@@ -484,33 +486,34 @@ nh5tget_precision_c ( hid_t_f *type_id , size_t_f *precision)
  * PURPOSE
  *  Call H5Tset_precision to set precision of the datatype
  * INPUTS
- *      type_id - identifier of the dataspace
- *              precision -  number of significant bits
+ *  type_id - identifier of the dataspace
+ *  precision -  number of significant bits
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  XIANGYANG SU
- *              Tuesday, January 25, 2000
+ *  Tuesday, January 25, 2000
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5tset_precision_c ( hid_t_f *type_id , size_t_f *precision)
+h5tset_precision_c(hid_t_f *type_id, size_t_f *precision)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_type_id;
-  size_t c_precision;
-  herr_t status;
-
-  c_type_id = *type_id;
-  c_precision = (size_t)*precision;
-  status = H5Tset_precision(c_type_id, c_precision);
-  if ( status < 0 ) return ret_value;
-  ret_value = 0;
-  return ret_value;
+    int    ret_value = -1;
+    hid_t  c_type_id;
+    size_t c_precision;
+    herr_t status;
+
+    c_type_id   = *type_id;
+    c_precision = (size_t)*precision;
+    status      = H5Tset_precision(c_type_id, c_precision);
+    if (status < 0)
+        return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Tf/h5tget_offset_c
@@ -518,36 +521,37 @@ nh5tset_precision_c ( hid_t_f *type_id , size_t_f *precision)
  *  h5tget_offset_c
  * PURPOSE
  *  Call H5Tget_offset to get bit offset of the first
- *              significant bit of the datatype
+ *  significant bit of the datatype
  * INPUTS
- *      type_id - identifier of the dataspace
+ *  type_id - identifier of the dataspace
  * OUTPUTS
- *     offset - bit offset of the first significant bit
+ *  offset - bit offset of the first significant bit
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  XIANGYANG SU
- *              Tuesday, January 25, 2000
+ *  Tuesday, January 25, 2000
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5tget_offset_c ( hid_t_f *type_id , size_t_f *offset)
+h5tget_offset_c(hid_t_f *type_id, size_t_f *offset)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_type_id;
-  int c_offset;
+    int   ret_value = -1;
+    hid_t c_type_id;
+    int   c_offset;
 
-  c_type_id = *type_id;
-  c_offset = H5Tget_offset(c_type_id);
-  if ( c_offset < 0  ) return ret_value;
+    c_type_id = *type_id;
+    c_offset  = H5Tget_offset(c_type_id);
+    if (c_offset < 0)
+        return ret_value;
 
-  *offset = (size_t_f)c_offset ;
-  ret_value = 0;
-  return ret_value;
+    *offset   = (size_t_f)c_offset;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Tf/h5tset_offset_c
@@ -555,35 +559,36 @@ nh5tget_offset_c ( hid_t_f *type_id , size_t_f *offset)
  *  h5tset_offset_c
  * PURPOSE
  *  Call H5Tset_offset to set bit offset of the first
- *              significant bit of the datatype
+ *  significant bit of the datatype
  * INPUTS
- *      type_id - identifier of the dataspace
- *              offset - bit offset of the first significant bit
+ *  type_id - identifier of the dataspace
+ *  offset - bit offset of the first significant bit
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  XIANGYANG SU
- *              Tuesday, January 25, 2000
+ *  Tuesday, January 25, 2000
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5tset_offset_c ( hid_t_f *type_id , size_t_f *offset)
+h5tset_offset_c(hid_t_f *type_id, size_t_f *offset)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_type_id;
-  size_t c_offset;
-  herr_t status;
-
-  c_offset = (size_t)*offset;
-  c_type_id = *type_id;
-  status = H5Tset_offset(c_type_id, c_offset);
-  if ( status < 0 ) return ret_value;
-  ret_value = 0;
-  return ret_value;
+    int    ret_value = -1;
+    hid_t  c_type_id;
+    size_t c_offset;
+    herr_t status;
+
+    c_offset  = (size_t)*offset;
+    c_type_id = *type_id;
+    status    = H5Tset_offset(c_type_id, c_offset);
+    if (status < 0)
+        return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Tf/h5tget_pad_c
@@ -591,81 +596,83 @@ nh5tset_offset_c ( hid_t_f *type_id , size_t_f *offset)
  *  h5tget_pad_c
  * PURPOSE
  *  Call H5Tget_pad to get the padding type of the least and
- *              most-significant bit padding
+ *  most-significant bit padding
  *
  * INPUTS
- *      type_id - identifier of the dataspace
+ *  type_id - identifier of the dataspace
  * OUTPUTS
- *     lsbpad - padding type of the least significant bit
- *              msbpad - padding type of the least significant bit
+ *  lsbpad - padding type of the least significant bit
+ *  msbpad - padding type of the least significant bit
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  XIANGYANG SU
- *              Wednesday, January 26, 2000
+ *  Wednesday, January 26, 2000
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5tget_pad_c ( hid_t_f *type_id , int_f * lsbpad, int_f * msbpad)
+h5tget_pad_c(hid_t_f *type_id, int_f *lsbpad, int_f *msbpad)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_type_id;
-  herr_t status;
-  H5T_pad_t c_lsb, c_msb;
-
-  c_type_id = *type_id;
-  status = H5Tget_pad(c_type_id, &c_lsb, &c_msb);
-  if ( status < 0  ) return ret_value;
-
-  *lsbpad = (int_f) c_lsb;
-  *msbpad = (int_f) c_msb;
-  ret_value = 0;
-  return ret_value;
+    int       ret_value = -1;
+    hid_t     c_type_id;
+    herr_t    status;
+    H5T_pad_t c_lsb, c_msb;
+
+    c_type_id = *type_id;
+    status    = H5Tget_pad(c_type_id, &c_lsb, &c_msb);
+    if (status < 0)
+        return ret_value;
+
+    *lsbpad   = (int_f)c_lsb;
+    *msbpad   = (int_f)c_msb;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Tf/h5tset_pad_c
  * NAME
  *  h5tset_pad_c
  * INPUTS
- *      type_id - identifier of the dataspace
+ *  type_id - identifier of the dataspace
  * PURPOSE
  *  Call H5Tset_pad to set the padding type of the least and
- *              most-significant bit padding
+ *  most-significant bit padding
  *
  * INPUTS
- *      type_id - identifier of the dataspace
- *              lsbpad - padding type of the least significant bit
- *              msbpad - padding type of the least significant bit
+ *  type_id - identifier of the dataspace
+ *  lsbpad - padding type of the least significant bit
+ *  msbpad - padding type of the least significant bit
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  XIANGYANG SU
- *              Wednesday, January 26, 2000
+ *  Wednesday, January 26, 2000
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5tset_pad_c ( hid_t_f *type_id, int_f * lsbpad, int_f* msbpad )
+h5tset_pad_c(hid_t_f *type_id, int_f *lsbpad, int_f *msbpad)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_type_id;
-  herr_t status;
-  H5T_pad_t c_lsb, c_msb;
-
-  c_type_id = *type_id;
-  c_lsb = (H5T_pad_t)*lsbpad;
-  c_msb = (H5T_pad_t)*msbpad;
-  status = H5Tset_pad(c_type_id, c_lsb, c_msb);
-  if ( status < 0 ) return ret_value;
-  ret_value = 0;
-  return ret_value;
+    int       ret_value = -1;
+    hid_t     c_type_id;
+    herr_t    status;
+    H5T_pad_t c_lsb, c_msb;
+
+    c_type_id = *type_id;
+    c_lsb     = (H5T_pad_t)*lsbpad;
+    c_msb     = (H5T_pad_t)*msbpad;
+    status    = H5Tset_pad(c_type_id, c_lsb, c_msb);
+    if (status < 0)
+        return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Tf/h5tget_sign_c
@@ -674,33 +681,34 @@ nh5tset_pad_c ( hid_t_f *type_id, int_f * lsbpad, int_f* msbpad )
  * PURPOSE
  *  Call H5Tget_sign to get sign type for an integer type
  * INPUTS
- *      type_id - identifier of the dataspace
+ *  type_id - identifier of the dataspace
  * OUTPUTS
- *     sign - sign type for an integer type
+ *  sign - sign type for an integer type
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  XIANGYANG SU
- *              Wednesday, January 26, 2000
+ *  Wednesday, January 26, 2000
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5tget_sign_c ( hid_t_f *type_id , int_f *sign)
+h5tget_sign_c(hid_t_f *type_id, int_f *sign)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_type_id;
-  H5T_sign_t c_sign;
-
-  c_type_id = *type_id;
-  c_sign = H5Tget_sign(c_type_id);
-  if ( c_sign == -1  ) return ret_value;
-  *sign = (int_f)c_sign ;
-  ret_value = 0;
-  return ret_value;
+    int        ret_value = -1;
+    hid_t      c_type_id;
+    H5T_sign_t c_sign;
+
+    c_type_id = *type_id;
+    c_sign    = H5Tget_sign(c_type_id);
+    if (c_sign == -1)
+        return ret_value;
+    *sign     = (int_f)c_sign;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Tf/h5tset_sign_c
@@ -709,34 +717,35 @@ nh5tget_sign_c ( hid_t_f *type_id , int_f *sign)
  * PURPOSE
  *  Call H5Tset_sign to set sign type for an integer type
  * INPUTS
- *      type_id - identifier of the dataspace
- *              sign - sign type for an integer typ
+ *  type_id - identifier of the dataspace
+ *  sign - sign type for an integer typ
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  XIANGYANG SU
- *              Wednesday, January 26, 2000
+ *  Wednesday, January 26, 2000
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5tset_sign_c ( hid_t_f *type_id , int_f* sign)
+h5tset_sign_c(hid_t_f *type_id, int_f *sign)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_type_id;
-  H5T_sign_t c_sign;
-  herr_t status;
-
-  c_type_id = *type_id;
-  c_sign = (H5T_sign_t)*sign;
-  status = H5Tset_sign(c_type_id, c_sign);
-  if ( status < 0 ) return ret_value;
-
-  ret_value = 0;
-  return ret_value;
+    int        ret_value = -1;
+    hid_t      c_type_id;
+    H5T_sign_t c_sign;
+    herr_t     status;
+
+    c_type_id = *type_id;
+    c_sign    = (H5T_sign_t)*sign;
+    status    = H5Tset_sign(c_type_id, c_sign);
+    if (status < 0)
+        return ret_value;
+
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Tf/h5tget_fields_c
@@ -744,43 +753,45 @@ nh5tset_sign_c ( hid_t_f *type_id , int_f* sign)
  *  h5tget_fields_c
  * PURPOSE
  *  Call H5Tget_fields to get floating point datatype
- *              bit field information
+ *  bit field information
  * INPUTS
- *      type_id - identifier of the dataspace
+ *  type_id - identifier of the dataspace
  * OUTPUTS
- *     epos -  exponent bit-position
- *              esize - size of exponent in bits
- *              mpos -  mantissa bit-position
- *              msize -  size of mantissa in bits
+ *  epos -  exponent bit-position
+ *  esize - size of exponent in bits
+ *  mpos -  mantissa bit-position
+ *  msize -  size of mantissa in bits
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  XIANGYANG SU
- *              Thursday, January 27, 2000
+ *  Thursday, January 27, 2000
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5tget_fields_c ( hid_t_f *type_id , size_t_f *spos, size_t_f *epos, size_t_f* esize, size_t_f* mpos, size_t_f* msize)
+h5tget_fields_c(hid_t_f *type_id, size_t_f *spos, size_t_f *epos, size_t_f *esize, size_t_f *mpos,
+                size_t_f *msize)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_type_id;
-  herr_t status;
-  size_t  c_spos, c_epos, c_esize, c_mpos, c_msize;
-
-  c_type_id = *type_id;
-  status = H5Tget_fields(c_type_id, &c_spos, &c_epos, &c_esize, &c_mpos, &c_msize);
-  if ( status < 0  ) return ret_value;
-  *spos = (size_t_f) c_spos;
-  *epos = (size_t_f) c_epos;
-  *esize = (size_t_f) c_esize;
-  *mpos = (size_t_f) c_mpos;
-  *msize = (size_t_f) c_msize;
-  ret_value = 0;
-  return ret_value;
+    int    ret_value = -1;
+    hid_t  c_type_id;
+    herr_t status;
+    size_t c_spos, c_epos, c_esize, c_mpos, c_msize;
+
+    c_type_id = *type_id;
+    status    = H5Tget_fields(c_type_id, &c_spos, &c_epos, &c_esize, &c_mpos, &c_msize);
+    if (status < 0)
+        return ret_value;
+    *spos     = (size_t_f)c_spos;
+    *epos     = (size_t_f)c_epos;
+    *esize    = (size_t_f)c_esize;
+    *mpos     = (size_t_f)c_mpos;
+    *msize    = (size_t_f)c_msize;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Tf/h5tset_fields_c
@@ -788,43 +799,45 @@ nh5tget_fields_c ( hid_t_f *type_id , size_t_f *spos, size_t_f *epos, size_t_f*
  *  h5tset_fields_c
  * PURPOSE
  *  Call H5Tset_fields to set floating point datatype
- *              bit field information
+ *  bit field information
  * INPUTS
- *      type_id - identifier of the dataspace
- *              epos -  exponent bit-position
- *              esize - size of exponent in bits
- *              mpos -  mantissa bit-position
- *              msize -  size of mantissa in bits
+ *  type_id - identifier of the dataspace
+ *  epos -  exponent bit-position
+ *  esize - size of exponent in bits
+ *  mpos -  mantissa bit-position
+ *  msize -  size of mantissa in bits
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  XIANGYANG SU
- *              Wednesday, January 26, 2000
+ *  Wednesday, January 26, 2000
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5tset_fields_c ( hid_t_f *type_id, size_t_f *spos, size_t_f *epos, size_t_f* esize, size_t_f* mpos, size_t_f* msize)
+h5tset_fields_c(hid_t_f *type_id, size_t_f *spos, size_t_f *epos, size_t_f *esize, size_t_f *mpos,
+                size_t_f *msize)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_type_id;
-  herr_t status;
-  size_t  c_spos, c_epos, c_esize, c_mpos, c_msize;
-
-  c_spos = (size_t)*spos;
-  c_epos = (size_t)*epos;
-  c_esize = (size_t)*esize;
-  c_mpos = (size_t)*mpos;
-  c_msize = (size_t)*msize;
-  c_type_id = *type_id;
-  status = H5Tset_fields(c_type_id, c_spos, c_epos, c_esize, c_mpos, c_msize);
-  if ( status < 0 ) return ret_value;
-
-  ret_value = 0;
-  return ret_value;
+    int    ret_value = -1;
+    hid_t  c_type_id;
+    herr_t status;
+    size_t c_spos, c_epos, c_esize, c_mpos, c_msize;
+
+    c_spos    = (size_t)*spos;
+    c_epos    = (size_t)*epos;
+    c_esize   = (size_t)*esize;
+    c_mpos    = (size_t)*mpos;
+    c_msize   = (size_t)*msize;
+    c_type_id = *type_id;
+    status    = H5Tset_fields(c_type_id, c_spos, c_epos, c_esize, c_mpos, c_msize);
+    if (status < 0)
+        return ret_value;
+
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Tf/h5tget_ebias_c
@@ -832,36 +845,37 @@ nh5tset_fields_c ( hid_t_f *type_id, size_t_f *spos, size_t_f *epos, size_t_f* e
  *  h5tget_ebias_c
  * PURPOSE
  *  Call H5Tget_ebias to get  exponent bias of a
- *              floating-point type of the datatype
+ *  floating-point type of the datatype
  * INPUTS
- *      type_id - identifier of the dataspace
+ *  type_id - identifier of the dataspace
  * OUTPUTS
- *     ebias - exponent bias of a floating-point type of the datatype
+ *  ebias - exponent bias of a floating-point type of the datatype
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Xiangyang Su
- *              Friday, January 27, 2000
+ *  Friday, January 27, 2000
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5tget_ebias_c ( hid_t_f *type_id , size_t_f *ebias)
+h5tget_ebias_c(hid_t_f *type_id, size_t_f *ebias)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_type_id;
-  size_t c_ebias;
+    int    ret_value = -1;
+    hid_t  c_type_id;
+    size_t c_ebias;
 
-  c_type_id = *type_id;
-  c_ebias = H5Tget_ebias(c_type_id);
-  if ( c_ebias == 0  ) return ret_value;
+    c_type_id = *type_id;
+    c_ebias   = H5Tget_ebias(c_type_id);
+    if (c_ebias == 0)
+        return ret_value;
 
-  *ebias = (size_t_f)c_ebias;
-  ret_value = 0;
-  return ret_value;
+    *ebias    = (size_t_f)c_ebias;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Tf/h5tset_ebias_c
@@ -869,36 +883,37 @@ nh5tget_ebias_c ( hid_t_f *type_id , size_t_f *ebias)
  *  h5tset_ebias_c
  * PURPOSE
  *  Call H5Tset_ebias to set exponent bias of a
- *              floating-point type of the datatype
+ *  floating-point type of the datatype
  * INPUTS
- *      type_id - identifier of the dataspace
- *              ebias - exponent bias of a floating-point type of the datatyp
+ *  type_id - identifier of the dataspace
+ *  ebias - exponent bias of a floating-point type of the datatype
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Xiangyang Su
- *              Friday, January 27, 2000
+ *  Friday, January 27, 2000
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5tset_ebias_c ( hid_t_f *type_id , size_t_f *ebias)
+h5tset_ebias_c(hid_t_f *type_id, size_t_f *ebias)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_type_id;
-  size_t c_ebias;
-  herr_t status;
-
-  c_type_id = *type_id;
-  c_ebias = (size_t)*ebias;
-  status = H5Tset_ebias(c_type_id, c_ebias);
-  if ( status < 0  ) return ret_value;
-
-  ret_value = 0;
-  return ret_value;
+    int    ret_value = -1;
+    hid_t  c_type_id;
+    size_t c_ebias;
+    herr_t status;
+
+    c_type_id = *type_id;
+    c_ebias   = (size_t)*ebias;
+    status    = H5Tset_ebias(c_type_id, c_ebias);
+    if (status < 0)
+        return ret_value;
+
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Tf/h5tget_norm_c
@@ -906,36 +921,37 @@ nh5tset_ebias_c ( hid_t_f *type_id , size_t_f *ebias)
  *  h5tget_norm_c
  * PURPOSE
  *  Call H5Tget_norm to get mantissa normalization
- *              of a floating-point datatype
+ *  of a floating-point datatype
  * INPUTS
- *      type_id - identifier of the dataspace
+ *  type_id - identifier of the dataspace
  * OUTPUTS
- *     norm - mantissa normalization of a floating-point type
+ *  norm - mantissa normalization of a floating-point type
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Xiangyang Su
- *              Friday, January 27, 2000
+ *  Friday, January 27, 2000
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5tget_norm_c ( hid_t_f *type_id , int_f *norm)
+h5tget_norm_c(hid_t_f *type_id, int_f *norm)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_type_id;
-  H5T_norm_t  c_norm;
+    int        ret_value = -1;
+    hid_t      c_type_id;
+    H5T_norm_t c_norm;
 
-  c_type_id = *type_id;
-  c_norm = H5Tget_norm(c_type_id);
-  if ( c_norm == H5T_NORM_ERROR  ) return ret_value;
+    c_type_id = *type_id;
+    c_norm    = H5Tget_norm(c_type_id);
+    if (c_norm == H5T_NORM_ERROR)
+        return ret_value;
 
-  *norm = (int_f)c_norm;
-  ret_value = 0;
-  return ret_value;
+    *norm     = (int_f)c_norm;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Tf/h5tset_norm_c
@@ -943,36 +959,37 @@ nh5tget_norm_c ( hid_t_f *type_id , int_f *norm)
  *  h5tset_norm_c
  * PURPOSE
  *  Call H5Tset_norm to set mantissa normalization of
- *              floating-point type of the datatype
+ *  floating-point type of the datatype
  * INPUTS
- *      type_id - identifier of the dataspace
- *              norm -  mantissa normalization of a floating-point type
+ *  type_id - identifier of the dataspace
+ *  norm -  mantissa normalization of a floating-point type
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Xiangyang Su
- *              Friday, January 27, 2000
+ *  Friday, January 27, 2000
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5tset_norm_c ( hid_t_f *type_id , int_f *norm)
+h5tset_norm_c(hid_t_f *type_id, int_f *norm)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_type_id;
-  H5T_norm_t  c_norm;
-  herr_t status;
-
-  c_type_id = *type_id;
-  c_norm = (H5T_norm_t)*norm;
-  status = H5Tset_norm(c_type_id, c_norm);
-  if ( status < 0  ) return ret_value;
-
-  ret_value = 0;
-  return ret_value;
+    int        ret_value = -1;
+    hid_t      c_type_id;
+    H5T_norm_t c_norm;
+    herr_t     status;
+
+    c_type_id = *type_id;
+    c_norm    = (H5T_norm_t)*norm;
+    status    = H5Tset_norm(c_type_id, c_norm);
+    if (status < 0)
+        return ret_value;
+
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Tf/h5tget_inpad_c
@@ -980,79 +997,81 @@ nh5tset_norm_c ( hid_t_f *type_id , int_f *norm)
  *  h5tget_inpad_c
  * PURPOSE
  *  Call H5Tget_inpad to get the padding type for
- *              unused bits in floating-point datatypes
+ *  unused bits in floating-point datatypes
  *
  * INPUTS
- *      type_id - identifier of the dataspace
+ *  type_id - identifier of the dataspace
  * OUTPUTS
- *     padtype - padding type for
- *                        unused bits in floating-point datatype
+ *  padtype - padding type for
+ *  unused bits in floating-point datatype
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  XIANGYANG SU
- *              Wednesday, January 26, 2000
+ *  Wednesday, January 26, 2000
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5tget_inpad_c ( hid_t_f *type_id , int_f * padtype)
+h5tget_inpad_c(hid_t_f *type_id, int_f *padtype)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_type_id;
-  H5T_pad_t c_padtype;
+    int       ret_value = -1;
+    hid_t     c_type_id;
+    H5T_pad_t c_padtype;
 
-  c_type_id = *type_id;
-  c_padtype = H5Tget_inpad(c_type_id);
-  if ( c_padtype == H5T_PAD_ERROR  ) return ret_value;
+    c_type_id = *type_id;
+    c_padtype = H5Tget_inpad(c_type_id);
+    if (c_padtype == H5T_PAD_ERROR)
+        return ret_value;
 
-  *padtype = (int_f) c_padtype;
-  ret_value = 0;
-  return ret_value;
+    *padtype  = (int_f)c_padtype;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Tf/h5tset_inpad_c
  * NAME
  *  h5tset_inpad_c
  * INPUTS
- *      type_id - identifier of the dataspace
+ *  type_id - identifier of the dataspace
  * PURPOSE
  *  Call H5Tset_inpad to set the padding type
- *              unused bits in floating-point datatype
+ *  unused bits in floating-point datatype
  *
  * INPUTS
- *      type_id - identifier of the dataspace
- *              padtype - padding type for unused bits
- *                        in floating-point datatypes
+ *  type_id - identifier of the dataspace
+ *  padtype - padding type for unused bits
+ *  in floating-point datatypes
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  XIANGYANG SU
- *              Wednesday, January 26, 2000
+ *  Wednesday, January 26, 2000
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5tset_inpad_c ( hid_t_f *type_id, int_f * padtype)
+h5tset_inpad_c(hid_t_f *type_id, int_f *padtype)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_type_id;
-  herr_t status;
-  H5T_pad_t c_padtype;
-
-  c_type_id = *type_id;
-  c_padtype = (H5T_pad_t)*padtype;
-  status = H5Tset_inpad(c_type_id, c_padtype);
-  if ( status < 0 ) return ret_value;
-
-  ret_value = 0;
-  return ret_value;
+    int       ret_value = -1;
+    hid_t     c_type_id;
+    herr_t    status;
+    H5T_pad_t c_padtype;
+
+    c_type_id = *type_id;
+    c_padtype = (H5T_pad_t)*padtype;
+    status    = H5Tset_inpad(c_type_id, c_padtype);
+    if (status < 0)
+        return ret_value;
+
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Tf/h5tget_cset_c
@@ -1060,77 +1079,79 @@ nh5tset_inpad_c ( hid_t_f *type_id, int_f * padtype)
  *  h5tget_cset_c
  * PURPOSE
  *  Call H5Tget_cset to get character set
- *              type of a string datatype
+ *  type of a string datatype
  *
  * INPUTS
- *      type_id - identifier of the dataspace
+ *  type_id - identifier of the dataspace
  * OUTPUTS
- *     cset - character set type of a string datatype
+ *  cset - character set type of a string datatype
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  XIANGYANG SU
- *              Wednesday, January 26, 2000
+ *  Wednesday, January 26, 2000
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5tget_cset_c ( hid_t_f *type_id , int_f * cset)
+h5tget_cset_c(hid_t_f *type_id, int_f *cset)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_type_id;
-  H5T_cset_t  c_cset;
+    int        ret_value = -1;
+    hid_t      c_type_id;
+    H5T_cset_t c_cset;
 
-  c_type_id = *type_id;
-  c_cset = H5Tget_cset(c_type_id);
-  if ( c_cset == H5T_CSET_ERROR  ) return ret_value;
+    c_type_id = *type_id;
+    c_cset    = H5Tget_cset(c_type_id);
+    if (c_cset == H5T_CSET_ERROR)
+        return ret_value;
 
-  *cset = (int_f) c_cset;
-  ret_value = 0;
-  return ret_value;
+    *cset     = (int_f)c_cset;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Tf/h5tset_cset_c
  * NAME
  *  h5tset_cset_c
  * INPUTS
- *      type_id - identifier of the dataspace
+ *  type_id - identifier of the dataspace
  * PURPOSE
  *  Call H5Tset_cset to set character set
- *              type of a string datatype
+ *  type of a string datatype
  *
  * INPUTS
- *      type_id - identifier of the dataspace
- *              cset -  character set type of a string datatype
+ *  type_id - identifier of the dataspace
+ *  cset -  character set type of a string datatype
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  XIANGYANG SU
- *              Wednesday, January 26, 2000
+ *  Wednesday, January 26, 2000
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5tset_cset_c ( hid_t_f *type_id, int_f * cset)
+h5tset_cset_c(hid_t_f *type_id, int_f *cset)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_type_id;
-  herr_t status;
-  H5T_cset_t c_cset;
-
-  c_type_id = *type_id;
-  c_cset = (H5T_cset_t)*cset;
-  status = H5Tset_cset(c_type_id, c_cset);
-
-  if ( status < 0 ) return ret_value;
-  ret_value = 0;
-  return ret_value;
+    int        ret_value = -1;
+    hid_t      c_type_id;
+    herr_t     status;
+    H5T_cset_t c_cset;
+
+    c_type_id = *type_id;
+    c_cset    = (H5T_cset_t)*cset;
+    status    = H5Tset_cset(c_type_id, c_cset);
+
+    if (status < 0)
+        return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Tf/h5tget_strpad_c
@@ -1138,75 +1159,77 @@ nh5tset_cset_c ( hid_t_f *type_id, int_f * cset)
  *  h5tget_strpad_c
  * PURPOSE
  *  Call H5Tget_strpad to get string padding method
- *              for a string datatype
+ *  for a string datatype
  * INPUTS
- *      type_id - identifier of the dataspace
+ *  type_id - identifier of the dataspace
  * OUTPUTS
- *     strpad - string padding method for a string datatype
+ *  strpad - string padding method for a string datatype
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  XIANGYANG SU
- *              Wednesday, January 26, 2000
+ *  Wednesday, January 26, 2000
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5tget_strpad_c ( hid_t_f *type_id , int_f * strpad)
+h5tget_strpad_c(hid_t_f *type_id, int_f *strpad)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_type_id;
-  H5T_str_t  c_strpad;
+    int       ret_value = -1;
+    hid_t     c_type_id;
+    H5T_str_t c_strpad;
 
-  c_type_id = *type_id;
-  c_strpad = H5Tget_strpad(c_type_id);
-  if ( c_strpad == H5T_STR_ERROR  ) return ret_value;
+    c_type_id = *type_id;
+    c_strpad  = H5Tget_strpad(c_type_id);
+    if (c_strpad == H5T_STR_ERROR)
+        return ret_value;
 
-  *strpad = (int_f) c_strpad;
-  ret_value = 0;
-  return ret_value;
+    *strpad   = (int_f)c_strpad;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Tf/h5tset_strpad_c
  * NAME
  *  h5tset_strpad_c
  * INPUTS
- *      type_id - identifier of the dataspace
+ *  type_id - identifier of the dataspace
  * PURPOSE
  *  Call H5Tset_strpad to set string padding method
- *              for a string datatype
+ *  for a string datatype
  *
  * INPUTS
- *      type_id - identifier of the dataspace
- *              strpad - string padding method for a string datatype
+ *  type_id - identifier of the dataspace
+ *  strpad - string padding method for a string datatype
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  XIANGYANG SU
- *              Wednesday, January 26, 2000
+ *  Wednesday, January 26, 2000
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5tset_strpad_c ( hid_t_f *type_id, int_f * strpad)
+h5tset_strpad_c(hid_t_f *type_id, int_f *strpad)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_type_id;
-  herr_t status;
-  H5T_str_t c_strpad;
-
-  c_type_id = *type_id;
-  c_strpad = (H5T_str_t)*strpad;
-  status = H5Tset_strpad(c_type_id, c_strpad);
-  if ( status < 0 ) return ret_value;
-
-  ret_value = 0;
-  return ret_value;
+    int       ret_value = -1;
+    hid_t     c_type_id;
+    herr_t    status;
+    H5T_str_t c_strpad;
+
+    c_type_id = *type_id;
+    c_strpad  = (H5T_str_t)*strpad;
+    status    = H5Tset_strpad(c_type_id, c_strpad);
+    if (status < 0)
+        return ret_value;
+
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Tf/h5tget_nmembers_c
@@ -1214,34 +1237,35 @@ nh5tset_strpad_c ( hid_t_f *type_id, int_f * strpad)
  *  h5tget_nmembers_c
  * PURPOSE
  *  Call H5Tget_nmembers to get number of fields
- *              in a compound datatype
+ *  in a compound datatype
  * INPUTS
- *      type_id - identifier of the dataspace
+ *  type_id - identifier of the dataspace
  * OUTPUTS
- *     num_members - number of fields in a compound datatype
+ *  num_members - number of fields in a compound datatype
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  XIANGYANG SU
- *              Thursday, February 3, 2000
+ *  Thursday, February 3, 2000
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5tget_nmembers_c ( hid_t_f *type_id , int_f * num_members)
+h5tget_nmembers_c(hid_t_f *type_id, int_f *num_members)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_type_id;
+    int   ret_value = -1;
+    hid_t c_type_id;
 
-  c_type_id = *type_id;
-  *num_members = (int_f)H5Tget_nmembers(c_type_id);
-  if (*num_members < 0  ) return ret_value;
+    c_type_id    = *type_id;
+    *num_members = (int_f)H5Tget_nmembers(c_type_id);
+    if (*num_members < 0)
+        return ret_value;
 
-  ret_value = 0;
-  return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Tf/h5tget_member_name_c
@@ -1249,127 +1273,129 @@ nh5tget_nmembers_c ( hid_t_f *type_id , int_f * num_members)
  *  h5tget_member_name_c
  * PURPOSE
  *  Call H5Tget_member_name to get name
- *              of a compound datatype
+ *  of a compound datatype
  * INPUTS
- *      type_id - identifier of the dataspace
+ *  type_id - identifier of the dataspace
  * OUTPUTS
- *     member_name - name of a field of a compound datatype
+ *  member_name - name of a field of a compound datatype
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  XIANGYANG SU
- *              Thursday, February 3, 2000
+ *  Thursday, February 3, 2000
  * HISTORY
- * Elena Pourmal
- * Added namelen parameter to return length of the name to Fortran user
+ *  Elena Pourmal
+ *  Added namelen parameter to return length of the name to Fortran user
  * SOURCE
-*/
+ */
 
 int_f
-nh5tget_member_name_c ( hid_t_f *type_id ,int_f* idx, _fcd member_name, int_f *namelen)
+h5tget_member_name_c(hid_t_f *type_id, int_f *idx, _fcd member_name, int_f *namelen)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_type_id;
-  unsigned c_index;
-  char *c_name;
-
-  c_type_id = *type_id;
-  c_index = (unsigned)*idx;
-  c_name = H5Tget_member_name(c_type_id, c_index);
-  if (c_name == NULL ) return ret_value;
-
-  HD5packFstring(c_name, _fcdtocp(member_name), strlen(c_name));
-  *namelen = (int_f)strlen(c_name);
-  H5free_memory(c_name);
-  ret_value = 0;
-  return ret_value;
+    int      ret_value = -1;
+    hid_t    c_type_id;
+    unsigned c_index;
+    char    *c_name;
+
+    c_type_id = *type_id;
+    c_index   = (unsigned)*idx;
+    c_name    = H5Tget_member_name(c_type_id, c_index);
+    if (c_name == NULL)
+        return ret_value;
+
+    HD5packFstring(c_name, _fcdtocp(member_name), strlen(c_name));
+    *namelen = (int_f)strlen(c_name);
+    H5free_memory(c_name);
+    ret_value = 0;
+    return ret_value;
 }
 /****if* H5Tf/h5tget_member_index_c
  * NAME
  *  h5tget_member_index_c
  * PURPOSE
  *  Call H5Tget_member_index to get an index of
- *              the specified datatype filed or member.
+ *  the specified datatype filed or member.
  * INPUTS
- *      type_id - datatype identifier
- *              name - name of the datatype within file or  group
- *              namelen - name length
+ *  type_id - datatype identifier
+ *  name - name of the datatype within file or  group
+ *  namelen - name length
  * OUTPUTS
- *     index - 0-based index
+ *  index - 0-based index
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
  *  Thursday, September 26, 2002
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5tget_member_index_c (hid_t_f *type_id, _fcd name, int_f *namelen, int_f *idx)
+h5tget_member_index_c(hid_t_f *type_id, _fcd name, int_f *namelen, int_f *idx)
 /******/
 {
-     int ret_value = -1;
-     char *c_name;
-     hid_t c_type_id;
-     int c_index;
-
-     /*
-      * Convert FORTRAN name to C name
-      */
-     c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
-     if (c_name == NULL) return ret_value;
-
-     /*
-      * Call H5Tget_member_index function.
-      */
-     c_type_id = (hid_t)*type_id;
-     c_index = H5Tget_member_index(c_type_id, c_name);
-
-     if (c_index < 0) goto DONE;
-     *idx = (int_f)c_index;
+    int   ret_value = -1;
+    char *c_name;
+    hid_t c_type_id;
+    int   c_index;
+
+    /*
+     * Convert FORTRAN name to C name
+     */
+    c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
+    if (c_name == NULL)
+        return ret_value;
+
+    /*
+     * Call H5Tget_member_index function.
+     */
+    c_type_id = (hid_t)*type_id;
+    c_index   = H5Tget_member_index(c_type_id, c_name);
+
+    if (c_index < 0)
+        goto DONE;
+    *idx = (int_f)c_index;
 DONE:
-     HDfree(c_name);
-     ret_value = 0;
-     return ret_value;
+    HDfree(c_name);
+    ret_value = 0;
+    return ret_value;
 }
 
-
 /****if* H5Tf/h5tget_member_offset_c
  * NAME
  *  h5tget_member_offset_c
  * PURPOSE
  *  Call H5Tget_member_offset to get byte offset of the
- *              beginning of a field within a compound datatype with
- *              respect to the beginning of the compound data type datum
+ *  beginning of a field within a compound datatype with
+ *  respect to the beginning of the compound data type datum
  * INPUTS
- *      type_id - identifier of the dataspace
- *              member_no - Number of the field whose offset is requested
+ *  type_id - identifier of the dataspace
+ *  member_no - Number of the field whose offset is requested
  * OUTPUTS
- *     offset - byte offset of the the beginning of the field of
- *                       a compound datatype
+ *  offset - byte offset of the the beginning of the field of
+ *  a compound datatype
  * RETURNS
- *     always 0
+ *  always 0
  * AUTHOR
  *  XIANGYANG SU
- *              Thursday, February 3, 2000
+ *  Thursday, February 3, 2000
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5tget_member_offset_c ( hid_t_f *type_id ,int_f* member_no, size_t_f * offset)
+h5tget_member_offset_c(hid_t_f *type_id, int_f *member_no, size_t_f *offset)
 /******/
 {
-  int ret_value = -1;
-  size_t c_offset;
+    int    ret_value = -1;
+    size_t c_offset;
 
-  c_offset = H5Tget_member_offset((hid_t)*type_id, (unsigned)*member_no);
-  *offset = (size_t_f)c_offset;
-  ret_value = 0;
-  return ret_value;
+    c_offset  = H5Tget_member_offset((hid_t)*type_id, (unsigned)*member_no);
+    *offset   = (size_t_f)c_offset;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Tf/h5tget_array_dims_c
@@ -1377,36 +1403,36 @@ nh5tget_member_offset_c ( hid_t_f *type_id ,int_f* member_no, size_t_f * offset)
  *  h5tget_array_dims_c
  * PURPOSE
  *  Call H5Tget_array_dims2 to get
- *              dimensions of array datatype
+ *  dimensions of array datatype
  * INPUTS
- *      type_id - identifier of the array datatype
+ *  type_id - identifier of the array datatype
  * OUTPUTS
- *     dims -  dimensions(sizes of dimensions) of the array
+ *  dims -  dimensions(sizes of dimensions) of the array
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Thursday, November 16, 2000
+ *  Thursday, November 16, 2000
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5tget_array_dims_c ( hid_t_f *type_id , hsize_t_f * dims)
+h5tget_array_dims_c(hid_t_f *type_id, hsize_t_f *dims)
 /******/
 {
     hsize_t c_dims[H5S_MAX_RANK];
-    int rank, i;
-    int ret_value = -1;
+    int     rank, i;
+    int     ret_value = -1;
 
-    if((rank = H5Tget_array_ndims((hid_t)*type_id)) < 0)
+    if ((rank = H5Tget_array_ndims((hid_t)*type_id)) < 0)
         goto DONE;
 
-    if(H5Tget_array_dims2((hid_t)*type_id, c_dims) < 0)
+    if (H5Tget_array_dims2((hid_t)*type_id, c_dims) < 0)
         goto DONE;
 
-    for(i = 0; i < rank; i++)
+    for (i = 0; i < rank; i++)
         dims[(rank - i) - 1] = (hsize_t_f)c_dims[i];
 
     ret_value = 0;
@@ -1420,36 +1446,37 @@ DONE:
  *  h5tget_array_ndims_c
  * PURPOSE
  *  Call H5Tget_array_ndims to get number
- *              of dimensions of array datatype
+ *  of dimensions of array datatype
  * INPUTS
- *      type_id - identifier of the array datatype
+ *  type_id - identifier of the array datatype
  * OUTPUTS
- *     ndims -  number of dimensions of the array
+ *  ndims -  number of dimensions of the array
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Thursday, November 16, 2000
+ *  Thursday, November 16, 2000
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5tget_array_ndims_c ( hid_t_f *type_id , int_f * ndims)
+h5tget_array_ndims_c(hid_t_f *type_id, int_f *ndims)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_type_id;
-  int c_ndims;
+    int   ret_value = -1;
+    hid_t c_type_id;
+    int   c_ndims;
 
-  c_type_id = (hid_t)*type_id;
-  c_ndims = H5Tget_array_ndims(c_type_id);
-  if (c_ndims < 0) return ret_value;
+    c_type_id = (hid_t)*type_id;
+    c_ndims   = H5Tget_array_ndims(c_type_id);
+    if (c_ndims < 0)
+        return ret_value;
 
-  *ndims = (int_f)c_ndims;
-  ret_value = 0;
-  return ret_value;
+    *ndims    = (int_f)c_ndims;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Tf/h5tget_super_c
@@ -1457,108 +1484,109 @@ nh5tget_array_ndims_c ( hid_t_f *type_id , int_f * ndims)
  *  h5tget_super_c
  * PURPOSE
  *  Call H5Tget_super to get base datatype from which
- *              datatype was derived
+ *  datatype was derived
  * INPUTS
- *      type_id - identifier of the array datatype
+ *  type_id - identifier of the array datatype
  * OUTPUTS
- *     base_type_id - base datatype identifier
+ *  base_type_id - base datatype identifier
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Thursday, November 16, 2000
+ *  Thursday, November 16, 2000
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5tget_super_c ( hid_t_f *type_id , hid_t_f *base_type_id)
+h5tget_super_c(hid_t_f *type_id, hid_t_f *base_type_id)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_type_id;
-  hid_t c_base_type_id;
+    int   ret_value = -1;
+    hid_t c_type_id;
+    hid_t c_base_type_id;
 
-  c_type_id = (hid_t)*type_id;
-  c_base_type_id = H5Tget_super(c_type_id);
-  if (c_base_type_id < 0) return ret_value;
+    c_type_id      = (hid_t)*type_id;
+    c_base_type_id = H5Tget_super(c_type_id);
+    if (c_base_type_id < 0)
+        return ret_value;
 
-  *base_type_id = (hid_t_f)c_base_type_id;
-  ret_value = 0;
-  return ret_value;
+    *base_type_id = (hid_t_f)c_base_type_id;
+    ret_value     = 0;
+    return ret_value;
 }
 
-
 /****if* H5Tf/h5tget_member_type_c
  * NAME
  *  h5tget_member_type_c
  * PURPOSE
  *  Call H5Tget_member_type to get the identifier of a copy of
- *              the datatype of the field
+ *  the datatype of the field
  * INPUTS
- *      type_id - identifier of the datatype
- *              field_idx - Field index (0-based) of the field type to retrieve
+ *  type_id - identifier of the datatype
+ *  field_idx - Field index (0-based) of the field type to retrieve
  * OUTPUTS
- *     datatype - identifier of a copy of the datatype of the field
+ *  datatype - identifier of a copy of the datatype of the field
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  XIANGYANG SU
  *  Thursday, February 3, 2000
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5tget_member_type_c ( hid_t_f *type_id ,int_f* field_idx, hid_t_f * datatype)
+h5tget_member_type_c(hid_t_f *type_id, int_f *field_idx, hid_t_f *datatype)
 /******/
 {
-  int ret_value = -1;
+    int ret_value = -1;
 
-  *datatype = (hid_t_f)H5Tget_member_type((hid_t)*type_id, (unsigned)*field_idx);
-  if(*datatype < 0) return ret_value;
+    *datatype = (hid_t_f)H5Tget_member_type((hid_t)*type_id, (unsigned)*field_idx);
+    if (*datatype < 0)
+        return ret_value;
 
-  ret_value = 0;
-  return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
-
 /****if* H5Tf/h5tcreate_c
  * NAME
  *  h5tcreate_c
  * PURPOSE
  *  Call H5Tcreate to create a datatype
  * INPUTS
- *      cls - class type
- *     size - size of the class memeber
+ *  cls - class type
+ *  size - size of the class member
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
  *  Thursday, February 17, 2000
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5tcreate_c(int_f *cls, size_t_f *size, hid_t_f *type_id)
+h5tcreate_c(int_f *cls, size_t_f *size, hid_t_f *type_id)
 /******/
 {
-  int ret_value = -1;
-  H5T_class_t c_class;
-  size_t c_size;
+    int         ret_value = -1;
+    H5T_class_t c_class;
+    size_t      c_size;
 
-  c_size =(size_t) *size;
-  c_class = (H5T_class_t) *cls;
+    c_size  = (size_t)*size;
+    c_class = (H5T_class_t)*cls;
 
-  *type_id = (hid_t_f)H5Tcreate(c_class, c_size);
-  if(*type_id < 0) return ret_value;
+    *type_id = (hid_t_f)H5Tcreate(c_class, c_size);
+    if (*type_id < 0)
+        return ret_value;
 
-  ret_value = 0;
-  return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Tf/h5tinsert_c
@@ -1580,28 +1608,29 @@ nh5tcreate_c(int_f *cls, size_t_f *size, hid_t_f *type_id)
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5tinsert_c(hid_t_f *type_id, _fcd name, int_f* namelen, size_t_f *offset, hid_t_f * field_id)
+h5tinsert_c(hid_t_f *type_id, _fcd name, int_f *namelen, size_t_f *offset, hid_t_f *field_id)
 /******/
 {
-  int ret_value = -1;
-  char* c_name;
-  herr_t error;
+    int    ret_value = -1;
+    char  *c_name;
+    herr_t error;
 
-  c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
-  if (c_name == NULL) return ret_value;
+    c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
+    if (c_name == NULL)
+        return ret_value;
 
-  error = H5Tinsert((hid_t)*type_id, c_name, (size_t)*offset, (hid_t)*field_id);
+    error = H5Tinsert((hid_t)*type_id, c_name, (size_t)*offset, (hid_t)*field_id);
 
-  HDfree(c_name);
-  if(error < 0) return ret_value;
-  ret_value = 0;
-  return ret_value;
+    HDfree(c_name);
+    if (error < 0)
+        return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
-
 /****if* H5Tf/h5tpack_c
  * NAME
  *  h5tpack_c
@@ -1619,22 +1648,23 @@ nh5tinsert_c(hid_t_f *type_id, _fcd name, int_f* namelen, size_t_f *offset, hid_
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5tpack_c(hid_t_f * type_id)
+h5tpack_c(hid_t_f *type_id)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_type_id;
-  herr_t status;
+    int    ret_value = -1;
+    hid_t  c_type_id;
+    herr_t status;
 
-  c_type_id = *type_id;
-  status = H5Tpack(c_type_id);
-  if (status < 0) return ret_value;
+    c_type_id = *type_id;
+    status    = H5Tpack(c_type_id);
+    if (status < 0)
+        return ret_value;
 
-  ret_value = 0;
-  return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Tf/h5tarray_create_c
@@ -1643,46 +1673,44 @@ nh5tpack_c(hid_t_f * type_id)
  * PURPOSE
  *  Call H5Tarray_create2 to create array datatype
  * INPUTS
- *      base_id - identifier of array base datatype
- *              rank - array's rank
- *              dims - Size of new member array
- *              type_id - identifier of the array datatype
+ *  base_id - identifier of array base datatype
+ *  rank - array's rank
+ *  dims - Size of new member array
+ *  type_id - identifier of the array datatype
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
  *  Thursday, November 16, 2000
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5tarray_create_c(hid_t_f * base_id, int_f *rank, hsize_t_f* dims, hid_t_f* type_id)
+h5tarray_create_c(hid_t_f *base_id, int_f *rank, hsize_t_f *dims, hid_t_f *type_id)
 /******/
 {
-    hsize_t c_dims[H5S_MAX_RANK];
-    hid_t c_type_id;
-    unsigned u;                 /* Local index variable */
-    int ret_value = -1;
-
+    hsize_t  c_dims[H5S_MAX_RANK];
+    hid_t    c_type_id;
+    unsigned u; /* Local index variable */
+    int      ret_value = -1;
 
     /*
      * Transpose dimension arrays because of C-FORTRAN storage order
      */
-    for(u = 0; u < (unsigned)*rank ; u++)
-      c_dims[u] =  (hsize_t)dims[((unsigned)*rank - u) - 1];
+    for (u = 0; u < (unsigned)*rank; u++)
+        c_dims[u] = (hsize_t)dims[((unsigned)*rank - u) - 1];
 
-    if((c_type_id = H5Tarray_create2((hid_t)*base_id, (unsigned)*rank, c_dims)) < 0)
+    if ((c_type_id = H5Tarray_create2((hid_t)*base_id, (unsigned)*rank, c_dims)) < 0)
         goto DONE;
 
-    *type_id = (hid_t_f)c_type_id;
+    *type_id  = (hid_t_f)c_type_id;
     ret_value = 0;
 
 DONE:
     return ret_value;
 }
 
-
 /****if* H5Tf/h5tenum_create_c
  * NAME
  *  h5tenum_create_c
@@ -1692,7 +1720,7 @@ DONE:
  *  parent_id - Datatype identifier for the base datatype
  * OUTPUTS
  *  new_type_id - datatype identifier for the new
- *                enumeration datatype
+ *  enumeration datatype
  * RETURNS
  *  0 on success, -1 on failure
  * AUTHOR
@@ -1701,20 +1729,21 @@ DONE:
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5tenum_create_c ( hid_t_f *parent_id , hid_t_f *new_type_id)
+h5tenum_create_c(hid_t_f *parent_id, hid_t_f *new_type_id)
 /******/
 {
-  int ret_value = 0;
-  hid_t c_new_type_id;
+    int   ret_value = 0;
+    hid_t c_new_type_id;
 
-  c_new_type_id = H5Tenum_create((hid_t)*parent_id);
-  if ( c_new_type_id < 0  ) ret_value = -1;
+    c_new_type_id = H5Tenum_create((hid_t)*parent_id);
+    if (c_new_type_id < 0)
+        ret_value = -1;
 
-  *new_type_id = (hid_t_f)c_new_type_id;
-  return ret_value;
+    *new_type_id = (hid_t_f)c_new_type_id;
+    return ret_value;
 }
 
 /****if* H5Tf/h5tenum_insert_c
@@ -1737,73 +1766,75 @@ nh5tenum_create_c ( hid_t_f *parent_id , hid_t_f *new_type_id)
  *  it should not be cast to an int (which might be 4 bytes). Instead the value
  *  is written as the size of an int_f.
  * SOURCE
-*/
+ */
 
 int_f
-nh5tenum_insert_c(hid_t_f *type_id, _fcd name, int_f* namelen, int_f* value)
+h5tenum_insert_c(hid_t_f *type_id, _fcd name, int_f *namelen, int_f *value)
 /******/
 {
-  int ret_value = -1;
-  char* c_name;
-  herr_t error;
-  int_f c_value;
+    int    ret_value = -1;
+    char  *c_name;
+    herr_t error;
+    int_f  c_value;
 
-  c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
-  if (c_name == NULL) return ret_value;
+    c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
+    if (c_name == NULL)
+        return ret_value;
 
-  c_value = *value;
-  error = H5Tenum_insert((hid_t)*type_id, c_name, &c_value);
+    c_value = *value;
+    error   = H5Tenum_insert((hid_t)*type_id, c_name, &c_value);
 
-  HDfree(c_name);
-  if(error < 0) return ret_value;
+    HDfree(c_name);
+    if (error < 0)
+        return ret_value;
 
-  ret_value = 0;
-  return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
-
 /****if* H5Tf/h5tenum_nameof_c
  * NAME
  *  h5tenum_nameof_c
  * PURPOSE
  *  Call H5Tenum_nameof to find the symbol name that corresponds to
- *              the specified value of the enumeration datatype type
+ *  the specified value of the enumeration datatype type
  * INPUTS
- *      type_id - identifier of the datatype
- *              namelen - length of the name
- *              value - value of the enumeration datatype
- * Output:      name  - Name of  the enumeration datatype
+ *  type_id - identifier of the datatype
+ *  namelen - length of the name
+ *  value - value of the enumeration datatype
+ *  Output:      name  - Name of  the enumeration datatype
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  XIANGYANG SU
- *              Thursday, February 3, 2000
+ *  Thursday, February 3, 2000
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5tenum_nameof_c(hid_t_f *type_id, int_f* value, _fcd name, size_t_f* namelen)
+h5tenum_nameof_c(hid_t_f *type_id, int_f *value, _fcd name, size_t_f *namelen)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_type_id;
-  char* c_name;
-  size_t c_namelen;
-  herr_t error;
-  int_f c_value;
-  c_value = *value;
-  c_namelen = ((size_t)*namelen) +1;
-  c_name = (char *)HDmalloc(sizeof(char)*c_namelen);
-  c_type_id = (hid_t)*type_id;
-  error = H5Tenum_nameof(c_type_id, &c_value, c_name, c_namelen);
-  HD5packFstring(c_name, _fcdtocp(name), strlen(c_name));
-  HDfree(c_name);
-
-  if(error < 0) return ret_value;
-  ret_value = 0;
-  return ret_value;
+    int    ret_value = -1;
+    hid_t  c_type_id;
+    char  *c_name;
+    size_t c_namelen;
+    herr_t error;
+    int_f  c_value;
+    c_value   = *value;
+    c_namelen = ((size_t)*namelen) + 1;
+    c_name    = (char *)HDmalloc(sizeof(char) * c_namelen);
+    c_type_id = (hid_t)*type_id;
+    error     = H5Tenum_nameof(c_type_id, &c_value, c_name, c_namelen);
+    HD5packFstring(c_name, _fcdtocp(name), strlen(c_name));
+    HDfree(c_name);
+
+    if (error < 0)
+        return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Tf/h5tenum_valueof_c
@@ -1811,114 +1842,117 @@ nh5tenum_nameof_c(hid_t_f *type_id, int_f* value, _fcd name, size_t_f* namelen)
  *  h5tenum_valueof_c
  * PURPOSE
  *  Call H5Tenum_valueof to find the value of that corresponds to
- *              the specified name of the enumeration datatype type
+ *  the specified name of the enumeration datatype type
  * INPUTS
- *      type_id - identifier of the datatype
- *              name - Name of  the enumeration datatype
- *              namelen - length of name
- * Output:      value  - value of the enumeration datatype
+ *  type_id - identifier of the datatype
+ *  name - Name of  the enumeration datatype
+ *  namelen - length of name
+ *  Output:      value  - value of the enumeration datatype
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  XIANGYANG SU
- *              Thursday, February 3, 2000
+ *  Thursday, February 3, 2000
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5tenum_valueof_c(hid_t_f *type_id, _fcd name, int_f* namelen, int_f* value)
+h5tenum_valueof_c(hid_t_f *type_id, _fcd name, int_f *namelen, int_f *value)
 /******/
 {
-  int ret_value = -1;
-  char* c_name;
-  herr_t error;
-  c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
-  if (c_name == NULL) return ret_value;
-
-  error = H5Tenum_valueof((hid_t)*type_id, c_name, value);
-  HDfree(c_name);
-
-  if(error < 0) return ret_value;
-  ret_value = 0;
-  return ret_value;
-}
+    int    ret_value = -1;
+    char  *c_name;
+    herr_t error;
+    c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
+    if (c_name == NULL)
+        return ret_value;
 
+    error = H5Tenum_valueof((hid_t)*type_id, c_name, value);
+    HDfree(c_name);
+
+    if (error < 0)
+        return ret_value;
+    ret_value = 0;
+    return ret_value;
+}
 
 /****if* H5Tf/h5tget_member_value_c
  * NAME
  *  h5tget_member_value_c
  * PURPOSE
  *  Call H5Tget_member_value to get the value of an
- *              enumeration datatype member
+ *  enumeration datatype member
  * INPUTS
- *      type_id - identifier of the datatype
- *              member_no - Number of the enumeration datatype member.
- * Output:      value  - value of the enumeration datatype
+ *  type_id - identifier of the datatype
+ *  member_no - Number of the enumeration datatype member.
+ *  Output:      value  - value of the enumeration datatype
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  XIANGYANG SU
- *              Thursday, February 3, 2000
+ *  Thursday, February 3, 2000
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5tget_member_value_c(hid_t_f *type_id, int_f* member_no, int_f* value)
+h5tget_member_value_c(hid_t_f *type_id, int_f *member_no, int_f *value)
 /******/
 {
-  int ret_value = -1;
-  int c_value;
-  herr_t error;
+    int    ret_value = -1;
+    int    c_value;
+    herr_t error;
 
-  error = H5Tget_member_value((hid_t)*type_id, (unsigned)*member_no, &c_value);
-  if(error < 0) return ret_value;
+    error = H5Tget_member_value((hid_t)*type_id, (unsigned)*member_no, &c_value);
+    if (error < 0)
+        return ret_value;
 
-  *value = (int_f)c_value;
-  ret_value = 0;
-  return ret_value;
+    *value    = (int_f)c_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Tf/h5tset_tag_c
  * NAME
  *  h5tset_tag_c
  * INPUTS
- *      type_id - identifier of the dataspace
+ *  type_id - identifier of the dataspace
  * PURPOSE
  *  Call H5Tset_tag to set an opaque datatype tag
  * INPUTS
- *      type_id - identifier of the dataspace
- *              tag -  Unique ASCII string with which the opaque
- *                     datatype is to be tagged
- *              namelen - length of tag
+ *  type_id - identifier of the dataspace
+ *  tag -  Unique ASCII string with which the opaque
+ *  datatype is to be tagged
+ *  namelen - length of tag
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  XIANGYANG SU
- *              Wednesday, January 26, 2000
+ *  Wednesday, January 26, 2000
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5tset_tag_c(hid_t_f* type_id, _fcd tag, int_f* namelen)
+h5tset_tag_c(hid_t_f *type_id, _fcd tag, int_f *namelen)
 /******/
 {
-  int ret_value = -1;
-  herr_t status;
-  char* c_tag;
+    int    ret_value = -1;
+    herr_t status;
+    char  *c_tag;
 
-  c_tag = (char *)HD5f2cstring(tag, (size_t)*namelen);
+    c_tag = (char *)HD5f2cstring(tag, (size_t)*namelen);
 
-  status = H5Tset_tag((hid_t)*type_id, c_tag);
-  HDfree(c_tag);
-  if ( status < 0 ) return ret_value;
+    status = H5Tset_tag((hid_t)*type_id, c_tag);
+    HDfree(c_tag);
+    if (status < 0)
+        return ret_value;
 
-  ret_value = 0;
-  return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Tf/h5tget_tag_c
@@ -1929,35 +1963,36 @@ nh5tset_tag_c(hid_t_f* type_id, _fcd tag, int_f* namelen)
  * INPUTS
  *  type_id - identifier of the datatype
  * OUTPUTS
- *      tag -  Unique ASCII string with which the opaque
- *                     datatype is to be tagged
- *   taglen - length of tag
+ *  tag -  Unique ASCII string with which the opaque
+ *  datatype is to be tagged
+ *  taglen - length of tag
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  XIANGYANG SU
  *  Wednesday, January 26, 2000
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5tget_tag_c(hid_t_f* type_id, _fcd tag, size_t_f* tag_size, int_f* taglen)
+h5tget_tag_c(hid_t_f *type_id, _fcd tag, size_t_f *tag_size, int_f *taglen)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_type_id;
-  char *c_tag;
-
-  c_type_id = *type_id;
-  c_tag = H5Tget_tag(c_type_id);
-  if (c_tag == NULL ) return ret_value;
-
-  HD5packFstring(c_tag, _fcdtocp(tag), (size_t)*tag_size);
-  *taglen = (int_f)HDstrlen(c_tag);
-  H5free_memory(c_tag);
-  ret_value = 0;
-  return ret_value;
+    int   ret_value = -1;
+    hid_t c_type_id;
+    char *c_tag;
+
+    c_type_id = *type_id;
+    c_tag     = H5Tget_tag(c_type_id);
+    if (c_tag == NULL)
+        return ret_value;
+
+    HD5packFstring(c_tag, _fcdtocp(tag), (size_t)*tag_size);
+    *taglen = (int_f)HDstrlen(c_tag);
+    H5free_memory(c_tag);
+    ret_value = 0;
+    return ret_value;
 }
 /****if* H5Tf/h5tvlen_create_c
  * NAME
@@ -1965,106 +2000,109 @@ nh5tget_tag_c(hid_t_f* type_id, _fcd tag, size_t_f* tag_size, int_f* taglen)
  * PURPOSE
  *  Call H5Tvlen_create to create VL dtatype
  * INPUTS
- *      type_id - identifier of the base datatype
+ *  type_id - identifier of the base datatype
  * OUTPUTS
- *     vltype_id - identifier of the VL datatype
+ *  vltype_id - identifier of the VL datatype
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Wednesday, October 23, 2002
+ *  Wednesday, October 23, 2002
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5tvlen_create_c(hid_t_f* type_id, hid_t_f *vltype_id)
+h5tvlen_create_c(hid_t_f *type_id, hid_t_f *vltype_id)
 /******/
 {
-  int ret_value = -1;
-  hid_t c_type_id;
-  hid_t c_vltype_id;
-
-  c_type_id = (hid_t)*type_id;
-  c_vltype_id = H5Tvlen_create(c_type_id);
-  if (c_vltype_id < 0 ) return ret_value;
-  *vltype_id = (hid_t_f)c_vltype_id;
-  ret_value = 0;
-  return ret_value;
+    int   ret_value = -1;
+    hid_t c_type_id;
+    hid_t c_vltype_id;
+
+    c_type_id   = (hid_t)*type_id;
+    c_vltype_id = H5Tvlen_create(c_type_id);
+    if (c_vltype_id < 0)
+        return ret_value;
+    *vltype_id = (hid_t_f)c_vltype_id;
+    ret_value  = 0;
+    return ret_value;
 }
 /****if* H5Tf/h5tis_variable_str_c
  * NAME
  *  h5tis_variable_str_c
  * PURPOSE
- *  Call H5Tis_variable_str to detrmine if the datatype
- *              is a variable string.
+ *  Call H5Tis_variable_str to determine if the datatype
+ *  is a variable string.
  * INPUTS
- *      type_id - identifier of the dataspace
+ *  type_id - identifier of the dataspace
  * OUTPUTS
- *     flag - 0 if not VL str, 1 if is not
- *              and negative on failure.
+ *  flag - 0 if not VL str, 1 if is not
+ *  and negative on failure.
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Wednesday, March 12 , 2003
+ *  Wednesday, March 12 , 2003
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5tis_variable_str_c ( hid_t_f *type_id , int_f *flag )
+h5tis_variable_str_c(hid_t_f *type_id, int_f *flag)
 /******/
 {
-  int ret_value = 0;
-  hid_t c_type_id;
-  htri_t status;
-
-  c_type_id = (hid_t)*type_id;
-  status = H5Tis_variable_str(c_type_id);
-  *flag = (int_f)status;
-  if ( status < 0  ) ret_value = -1;
-  return ret_value;
+    int    ret_value = 0;
+    hid_t  c_type_id;
+    htri_t status;
+
+    c_type_id = (hid_t)*type_id;
+    status    = H5Tis_variable_str(c_type_id);
+    *flag     = (int_f)status;
+    if (status < 0)
+        ret_value = -1;
+    return ret_value;
 }
 /****if* H5Tf/h5tget_member_class_c
  * NAME
  *  h5tget_member_class_c
  * PURPOSE
- *  Call H5Tget_member_class to detrmine ithe class of the compound
+ *  Call H5Tget_member_class to determine ithe class of the compound
  *		datatype member
  * INPUTS
- *      type_id - identifier of the dataspace
- *              member_no - member's index
+ *  type_id - identifier of the dataspace
+ *  member_no - member's index
  * OUTPUTS
- *     class - member's class
- *             and negative on failure.
+ *  class - member's class
+ *  and negative on failure.
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
  *  Wednesday, April 6, 2005
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5tget_member_class_c ( hid_t_f *type_id ,  int_f *member_no, int_f *cls )
+h5tget_member_class_c(hid_t_f *type_id, int_f *member_no, int_f *cls)
 /******/
 {
-  int ret_value = 0;
-  hid_t c_type_id;
-  unsigned c_member_no;
-  H5T_class_t c_class;
-
-  c_type_id = (hid_t)*type_id;
-  c_member_no = (unsigned)*member_no;
-  c_class = H5Tget_member_class(c_type_id, c_member_no);
-
-  if ( c_class == H5T_NO_CLASS  ) ret_value = -1;
-  *cls = (int_f)c_class;
-  return ret_value;
+    int         ret_value = 0;
+    hid_t       c_type_id;
+    unsigned    c_member_no;
+    H5T_class_t c_class;
+
+    c_type_id   = (hid_t)*type_id;
+    c_member_no = (unsigned)*member_no;
+    c_class     = H5Tget_member_class(c_type_id, c_member_no);
+
+    if (c_class == H5T_NO_CLASS)
+        ret_value = -1;
+    *cls = (int_f)c_class;
+    return ret_value;
 }
 
 /****if* H5Tf/h5tcommit_anon_c
@@ -2073,34 +2111,33 @@ nh5tget_member_class_c ( hid_t_f *type_id ,  int_f *member_no, int_f *cls )
  * PURPOSE
  *  Call H5Tcommit_anon
  * INPUTS
- *      loc_id - file or group identifier
- *              dtype_id - dataset identifier
- *              tcpl_id - Datatype creation property list
- *              tapl_id - Datatype access property list
+ *  loc_id - file or group identifier
+ *  dtype_id - dataset identifier
+ *  tcpl_id - Datatype creation property list
+ *  tapl_id - Datatype access property list
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
  *  February 25, 2008
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5tcommit_anon_c(hid_t_f *loc_id, hid_t_f *dtype_id,
-		  hid_t_f *tcpl_id, hid_t_f *tapl_id)
+h5tcommit_anon_c(hid_t_f *loc_id, hid_t_f *dtype_id, hid_t_f *tcpl_id, hid_t_f *tapl_id)
 /******/
 {
-  int ret_value = -1;
+    int ret_value = -1;
 
-  /* Call H5Tcommit_anon function */
-  if(H5Tcommit_anon((hid_t)*loc_id, (hid_t)*dtype_id, (hid_t)*tcpl_id, (hid_t)*tapl_id) < 0)
-    goto done;
+    /* Call H5Tcommit_anon function */
+    if (H5Tcommit_anon((hid_t)*loc_id, (hid_t)*dtype_id, (hid_t)*tcpl_id, (hid_t)*tapl_id) < 0)
+        goto done;
 
-  ret_value = 0;
+    ret_value = 0;
 
- done:
-  return ret_value;
+done:
+    return ret_value;
 }
 
 /****if* H5Tf/h5tcommitted_c
@@ -2108,10 +2145,10 @@ nh5tcommit_anon_c(hid_t_f *loc_id, hid_t_f *dtype_id,
  *  h5tcommitted_c
  * PURPOSE
  *  Call H5Tcommitted
- *              dtype_id - dataset identifier
+ *  dtype_id - dataset identifier
  * RETURNS
- *     a positive value, for TRUE, if the datatype has been committed,
- *              or 0 (zero), for FALSE, if the datatype has not been committed.
+ *  a positive value, for TRUE, if the datatype has been committed,
+ *  or 0 (zero), for FALSE, if the datatype has not been committed.
  *		Otherwise returns a negative value.
  * AUTHOR
  *  M. Scot Breitenfeld
@@ -2119,19 +2156,18 @@ nh5tcommit_anon_c(hid_t_f *loc_id, hid_t_f *dtype_id,
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5tcommitted_c(hid_t_f *dtype_id)
+h5tcommitted_c(hid_t_f *dtype_id)
 /******/
 {
-  int_f ret_value;
-
-  /* Call H5Tcommitted function */
+    int_f ret_value;
 
-  ret_value=(int_f)H5Tcommitted((hid_t)*dtype_id);
+    /* Call H5Tcommitted function */
 
-  return ret_value;
+    ret_value = (int_f)H5Tcommitted((hid_t)*dtype_id);
 
+    return ret_value;
 }
 
 /****if* H5Tf/h5tdecode_c
@@ -2144,40 +2180,40 @@ nh5tcommitted_c(hid_t_f *dtype_id)
  *		buf     - Buffer for the data space object to be decoded.
  * OUTPUTS
  *
- *              obj_id  - Object_id (non-negative)
+ *  obj_id  - Object_id (non-negative)
  *
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
  *  April 9, 2008
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5tdecode_c ( _fcd buf, hid_t_f *obj_id )
+h5tdecode_c(_fcd buf, hid_t_f *obj_id)
 /******/
 {
-  int ret_value = -1;
-  unsigned char *c_buf = NULL;  /* Buffer to hold C string */
-  hid_t c_obj_id;
+    int            ret_value = -1;
+    unsigned char *c_buf     = NULL; /* Buffer to hold C string */
+    hid_t          c_obj_id;
 
-  /*
-   * Call H5Tdecode function.
-   */
+    /*
+     * Call H5Tdecode function.
+     */
 
-  c_buf = (unsigned char*)buf;
+    c_buf = (unsigned char *)buf;
 
-  c_obj_id = H5Tdecode(c_buf);
-  if(c_obj_id < 0)
-    return ret_value;
+    c_obj_id = H5Tdecode(c_buf);
+    if (c_obj_id < 0)
+        return ret_value;
 
-  *obj_id = (hid_t_f)c_obj_id;
-  ret_value = 0;
+    *obj_id   = (hid_t_f)c_obj_id;
+    ret_value = 0;
 
-  return ret_value;
+    return ret_value;
 }
 
 /****if* H5Tf/h5tencode_c
@@ -2187,67 +2223,67 @@ nh5tdecode_c ( _fcd buf, hid_t_f *obj_id )
  *  Call H5Tencode
  * INPUTS
  *
- *            obj_id - Identifier of the object to be encoded.
+ *  obj_id - Identifier of the object to be encoded.
  *		 buf - Buffer for the object to be encoded into.
- *            nalloc - The size of the allocated buffer.
+ *  nalloc - The size of the allocated buffer.
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
  *  April 9, 2008
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5tencode_c (_fcd buf, hid_t_f *obj_id, size_t_f *nalloc )
+h5tencode_c(_fcd buf, hid_t_f *obj_id, size_t_f *nalloc)
 /******/
 {
-  int ret_value = -1;
-  unsigned char *c_buf = NULL;          /* Buffer to hold C string */
-  size_t c_size;
+    int            ret_value = -1;
+    unsigned char *c_buf     = NULL; /* Buffer to hold C string */
+    size_t         c_size;
 
-  /* return just the size of the allocated buffer;
-   * equivalent to C routine for which 'name' is set equal to NULL
-   */
+    /* return just the size of the allocated buffer;
+     * equivalent to C routine for which 'name' is set equal to NULL
+     */
 
-  if (*nalloc == 0) {
+    if (*nalloc == 0) {
 
-    if(H5Tencode((hid_t)*obj_id, c_buf, &c_size) < 0)
-      return ret_value;
+        if (H5Tencode((hid_t)*obj_id, c_buf, &c_size) < 0)
+            return ret_value;
 
-    *nalloc = (size_t_f)c_size;
+        *nalloc = (size_t_f)c_size;
 
-    ret_value = 0;
-    return ret_value;
-  }
+        ret_value = 0;
+        return ret_value;
+    }
 
-  /*
-   * Allocate buffer
-   */
-  c_size = (size_t)*nalloc;
-  if(NULL == (c_buf = (unsigned char *)HDmalloc(c_size)))
-    return ret_value;
+    /*
+     * Allocate buffer
+     */
+    c_size = (size_t)*nalloc;
+    if (NULL == (c_buf = (unsigned char *)HDmalloc(c_size)))
+        return ret_value;
 
-  /*
-   * Call H5Tencode function.
-   */
-  if(H5Tencode((hid_t)*obj_id, c_buf, &c_size) < 0)
-    return ret_value;
+    /*
+     * Call H5Tencode function.
+     */
+    if (H5Tencode((hid_t)*obj_id, c_buf, &c_size) < 0)
+        return ret_value;
 
-  /* copy the C buffer to the FORTRAN buffer.
-   * Can not use HD5packFstring because we don't want to
-   * eliminate the NUL terminator or pad remaining space
-   * with blanks.
-   */
+    /* copy the C buffer to the FORTRAN buffer.
+     * Can not use HD5packFstring because we don't want to
+     * eliminate the NUL terminator or pad remaining space
+     * with blanks.
+     */
 
-  HDmemcpy(_fcdtocp(buf),(char *)c_buf,c_size);
+    HDmemcpy(_fcdtocp(buf), (char *)c_buf, c_size);
 
-  ret_value = 0;
-  if(c_buf)
-      HDfree(c_buf);
-  return ret_value;
+    ret_value = 0;
+    if (c_buf)
+        HDfree(c_buf);
+    return ret_value;
 }
 
 /****if* H5Tf/h5tget_create_plist_c
@@ -2256,24 +2292,24 @@ nh5tencode_c (_fcd buf, hid_t_f *obj_id, size_t_f *nalloc )
  * PURPOSE
  *  Call H5Tget_create_plist
  * INPUTS
- *      dtype_id          - Datatype identifier
+ *  dtype_id          - Datatype identifier
  * OUTPUTS
- *     dtpl_id           - Datatype property list identifier
+ *  dtpl_id           - Datatype property list identifier
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
  *  April 9, 2008
  * HISTORY
  * N/A
  * SOURCE
-*/
+ */
 
 int_f
-nh5tget_create_plist_c ( hid_t_f *dtype_id,  hid_t_f *dtpl_id)
+h5tget_create_plist_c(hid_t_f *dtype_id, hid_t_f *dtpl_id)
 /******/
 {
-    int_f ret_value=-1;          /* Return value */
+    int_f ret_value = -1; /* Return value */
 
     if ((*dtpl_id = (hid_t_f)H5Tget_create_plist((hid_t)*dtype_id)) < 0)
         return ret_value;
@@ -2289,32 +2325,33 @@ nh5tget_create_plist_c ( hid_t_f *dtype_id,  hid_t_f *dtpl_id)
  *  Call H5Tcompiler_conv
  * INPUTS
  *
- *              src_id - Identifier for the source datatype.
- *              dst_id - Identifier for the destination datatype.
+ *  src_id - Identifier for the source datatype.
+ *  dst_id - Identifier for the destination datatype.
  * OUTPUTS
- *     c_flag - flag; TRUE for compiler conversion, FALSE for library conversion
+ *  c_flag - flag; TRUE for compiler conversion, FALSE for library conversion
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M.Scot Breitenfeld
  *  April 9, 2008
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5tcompiler_conv_c ( hid_t_f *src_id, hid_t_f *dst_id, int_f *c_flag)
+h5tcompiler_conv_c(hid_t_f *src_id, hid_t_f *dst_id, int_f *c_flag)
 /******/
 {
-  int ret_value = -1;
-  htri_t status;
-
-  status = H5Tcompiler_conv( (hid_t)*src_id , (hid_t)*dst_id);
-  if ( status < 0  ) return ret_value;
-  *c_flag = (int_f)status;
-  ret_value = 0;
-  return ret_value;
+    int    ret_value = -1;
+    htri_t status;
+
+    status = H5Tcompiler_conv((hid_t)*src_id, (hid_t)*dst_id);
+    if (status < 0)
+        return ret_value;
+    *c_flag   = (int_f)status;
+    ret_value = 0;
+    return ret_value;
 }
 /****if* H5Tf/h5tget_native_type_c
  * NAME
@@ -2323,32 +2360,33 @@ nh5tcompiler_conv_c ( hid_t_f *src_id, hid_t_f *dst_id, int_f *c_flag)
  *  Call H5Tget_native_type
  * INPUTS
  *
- *              dtype_id         - Datatype identifier for the dataset datatype.
- *              direction        - Direction of search.
+ *  dtype_id         - Datatype identifier for the dataset datatype.
+ *  direction        - Direction of search.
  * OUTPUTS
- *     native_dtype_id  - The native datatype identifier for the specified dataset datatype
+ *  native_dtype_id  - The native datatype identifier for the specified dataset datatype
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
  *  June 18, 2008
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5tget_native_type_c(hid_t_f *dtype_id, int_f *direction, hid_t_f *native_dtype_id)
+h5tget_native_type_c(hid_t_f *dtype_id, int_f *direction, hid_t_f *native_dtype_id)
 /******/
 {
-  int ret_value = -1;
-  hid_t status;
-
-  status = H5Tget_native_type( (hid_t)*dtype_id, (H5T_direction_t)*direction);
-  if ( status < 0  ) return ret_value;
-  *native_dtype_id = (hid_t_f)status;
-  ret_value = 0;
-  return ret_value;
+    int   ret_value = -1;
+    hid_t status;
+
+    status = H5Tget_native_type((hid_t)*dtype_id, (H5T_direction_t)*direction);
+    if (status < 0)
+        return ret_value;
+    *native_dtype_id = (hid_t_f)status;
+    ret_value        = 0;
+    return ret_value;
 }
 
 /****if* H5Tf/h5tconvert_c
@@ -2375,18 +2413,20 @@ nh5tget_native_type_c(hid_t_f *dtype_id, int_f *direction, hid_t_f *native_dtype
  *  December 8, 2008
  *
  * SOURCE
-*/
+ */
 int_f
-h5tconvert_c(hid_t_f *src_id, hid_t_f *dst_id, size_t_f *nelmts, void *buf, void *background, hid_t_f *plist_id)
+h5tconvert_c(hid_t_f *src_id, hid_t_f *dst_id, size_t_f *nelmts, void *buf, void *background,
+             hid_t_f *plist_id)
 /******/
 {
-  int ret_value = -1;
-  hid_t status;
+    int   ret_value = -1;
+    hid_t status;
 
-  status = H5Tconvert( (hid_t)*src_id, (hid_t)*dst_id, (size_t)*nelmts, buf, background, (hid_t)*plist_id );
-  if ( status < 0  ) return ret_value;
-  ret_value = 0;
-  return ret_value;
+    status = H5Tconvert((hid_t)*src_id, (hid_t)*dst_id, (size_t)*nelmts, buf, background, (hid_t)*plist_id);
+    if (status < 0)
+        return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 
 /****if* H5Tf/h5tenum_insert_ptr_c
@@ -2408,25 +2448,28 @@ h5tconvert_c(hid_t_f *src_id, hid_t_f *dst_id, size_t_f *nelmts, void *buf, void
  *  February 6, 2015
  *
  * SOURCE
-*/
+ */
 int_f
-h5tenum_insert_ptr_c(hid_t_f *type_id, _fcd name, int_f* namelen, void *value)
+h5tenum_insert_ptr_c(hid_t_f *type_id, _fcd name, int_f *namelen, void *value)
 /******/
 {
-  int ret_value = -1;
-  hid_t status;
-  char *c_name;
-
-  /*
-   * Convert FORTRAN name to C name
-   */
-  c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
-  if (c_name == NULL) return ret_value;
-
-  status = H5Tenum_insert( (hid_t)*type_id, c_name, value);
-  if ( status < 0  ) return ret_value;
-  ret_value = 0;
-  return ret_value;
-}
+    int   ret_value = -1;
+    hid_t status;
+    char *c_name;
+
+    /*
+     * Convert FORTRAN name to C name
+     */
+    c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
+    if (c_name == NULL)
+        return ret_value;
 
+    status = H5Tenum_insert((hid_t)*type_id, c_name, value);
 
+    HDfree(c_name);
+    if (status < 0)
+        return ret_value;
+
+    ret_value = 0;
+    return ret_value;
+}
diff --git a/fortran/src/H5Tff.F90 b/fortran/src/H5Tff.F90
new file mode 100644
index 0000000..006aa79
--- /dev/null
+++ b/fortran/src/H5Tff.F90
@@ -0,0 +1,2171 @@
+!> @defgroup FH5T Fortran Datatype (H5T) Interface
+!!
+!! @see H5T, C-API
+!!
+!! @see @ref H5T_UG, User Guide
+!!
+
+!> @ingroup FH5T
+!!
+!! @brief This module contains Fortran interfaces for H5T functions.
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+! NOTES
+!
+!       _____ __  __ _____   ____  _____ _______       _   _ _______
+!      |_   _|  \/  |  __ \ / __ \|  __ \__   __|/\   | \ | |__   __|
+! ****   | | | \  / | |__) | |  | | |__) | | |  /  \  |  \| |  | |    ****
+! ****   | | | |\/| |  ___/| |  | |  _  /  | | / /\ \ | . ` |  | |    ****
+! ****  _| |_| |  | | |    | |__| | | \ \  | |/ ____ \| |\  |  | |    ****
+!      |_____|_|  |_|_|     \____/|_|  \_\ |_/_/    \_\_| \_|  |_|
+!
+!  If you add a new function here then you MUST add the function name to the
+!  Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
+!  This is needed for Windows based operating systems.
+!
+
+MODULE H5T
+
+  USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR,  C_CHAR, C_NULL_PTR
+  USE H5GLOBAL
+  IMPLICIT NONE
+
+  PRIVATE h5tenum_insert_f03, h5tenum_insert_f90
+
+! Fortran2003 Derived Type:
+  TYPE hvl_t
+     INTEGER(size_t) :: len !< Length of VL data (in base type units)
+     TYPE(C_PTR)     :: p   !< Pointer to VL data
+  END TYPE hvl_t
+
+#ifndef H5_DOXYGEN
+
+  INTERFACE h5tenum_insert_f
+     MODULE PROCEDURE h5tenum_insert_f03
+     MODULE PROCEDURE h5tenum_insert_f90
+  END INTERFACE
+
+#endif
+
+CONTAINS
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Opens named datatype.
+!!
+!! \param loc_id  Location identifier.
+!! \param name    A datatype name.
+!! \param type_id Datatype identifier.
+!! \param hdferr  \fortran_error
+!! \param tapl_id Datatype access property list identifier.
+!!
+!! See C API: @ref H5Topen2()
+!!
+  SUBROUTINE h5topen_f(loc_id, name, type_id, hdferr, tapl_id)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    INTEGER(HID_T), INTENT(OUT) :: type_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: tapl_id
+    INTEGER :: namelen                  ! Name length
+    INTEGER(HID_T) :: tapl_id_default
+
+    INTERFACE
+       INTEGER FUNCTION h5topen_c(loc_id, name, namelen, type_id, tapl_id_default) BIND(C,NAME='h5topen_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(KIND=C_CHAR), INTENT(IN) :: name
+         INTEGER :: namelen
+         INTEGER(HID_T), INTENT(OUT) :: type_id
+         INTEGER(HID_T) :: tapl_id_default
+       END FUNCTION h5topen_c
+    END INTERFACE
+
+    namelen = LEN(name)
+
+    tapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(tapl_id)) tapl_id_default = tapl_id
+
+    hdferr = h5topen_c(loc_id, name, namelen, type_id, tapl_id_default)
+  END SUBROUTINE h5topen_f
+!>
+!! \ingroup FH5T
+!!
+!! \brief Commits a transient datatype to a file, creating a new named datatype.
+!!
+!! \param loc_id  Location identifier.
+!! \param name    Name of the datatype to be stored at the specified location
+!! \param type_id Identifier of a datatype to be stored.
+!! \param hdferr  \fortran_error
+!! \param lcpl_id Link creation property list.
+!! \param tcpl_id Datatype creation property list.
+!! \param tapl_id Datatype access property list.
+!!
+!! See C API: @ref H5Tcommit2()
+!!
+  SUBROUTINE h5tcommit_f(loc_id, name, type_id, hdferr, &
+       lcpl_id, tcpl_id, tapl_id  )
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lcpl_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: tcpl_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: tapl_id
+
+    INTEGER :: namelen          ! Name length
+
+    INTEGER(HID_T) :: lcpl_id_default
+    INTEGER(HID_T) :: tcpl_id_default
+    INTEGER(HID_T) :: tapl_id_default
+
+    INTERFACE
+       INTEGER FUNCTION h5tcommit_c(loc_id, name, namelen, type_id, &
+            lcpl_id_default, tcpl_id_default, tapl_id_default ) BIND(C,NAME='h5tcommit_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+         INTEGER :: namelen
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER(HID_T) :: lcpl_id_default
+         INTEGER(HID_T) :: tcpl_id_default
+         INTEGER(HID_T) :: tapl_id_default
+       END FUNCTION h5tcommit_c
+    END INTERFACE
+
+    lcpl_id_default = H5P_DEFAULT_F
+    tcpl_id_default = H5P_DEFAULT_F
+    tapl_id_default = H5P_DEFAULT_F
+
+    IF (PRESENT(lcpl_id)) lcpl_id_default = lcpl_id
+    IF (PRESENT(tcpl_id)) tcpl_id_default = tcpl_id
+    IF (PRESENT(tapl_id)) tapl_id_default = tapl_id
+
+    namelen = LEN(name)
+
+    hdferr = h5tcommit_c(loc_id, name, namelen, type_id, &
+         lcpl_id_default, tcpl_id_default, tapl_id_default )
+
+  END SUBROUTINE h5tcommit_f
+!>
+!! \ingroup FH5T
+!!
+!! \brief Creates a copy of existing datatype.
+!!
+!! \param type_id     Datatype identifier.
+!! \param new_type_id Identifier of datatype&apos;s copy.
+!! \param hdferr      \fortran_error
+!!
+!! See C API: @ref H5Tcopy()
+!!
+  SUBROUTINE h5tcopy_f(type_id, new_type_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER(HID_T), INTENT(OUT) :: new_type_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION  h5tcopy_c(type_id, new_type_id) BIND(C,NAME='h5tcopy_c')
+         IMPORT :: HID_T
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER(HID_T), INTENT(OUT) :: new_type_id
+       END FUNCTION h5tcopy_c
+    END INTERFACE
+
+    hdferr = h5tcopy_c(type_id, new_type_id)
+  END SUBROUTINE h5tcopy_f
+!>
+!! \ingroup FH5T
+!!
+!! \brief Determines whether two datatype identifiers refer to the same datatype.
+!!
+!! \param type1_id Datatype identifier.
+!! \param type2_id Datatype identifier.
+!! \param flag     TRUE/FALSE flag to indicate if two datatypes are equal.
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Tequal()
+!!
+  SUBROUTINE h5tequal_f(type1_id, type2_id, flag, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type1_id
+    INTEGER(HID_T), INTENT(IN) :: type2_id
+    LOGICAL, INTENT(OUT) :: flag
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: c_flag
+    INTERFACE
+       INTEGER FUNCTION h5tequal_c(type1_id, type2_id, c_flag) BIND(C,NAME='h5tequal_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type1_id
+         INTEGER(HID_T), INTENT(IN) :: type2_id
+         INTEGER :: c_flag
+       END FUNCTION h5tequal_c
+    END INTERFACE
+
+    flag = .FALSE.
+    hdferr = h5tequal_c(type1_id, type2_id, c_flag)
+    IF(c_flag .GT. 0) flag = .TRUE.
+  END SUBROUTINE h5tequal_f
+!>
+!! \ingroup FH5T
+!!
+!! \brief Releases a datatype.
+!!
+!! \param type_id Datatype identifier.
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Tclose()
+!!
+  SUBROUTINE h5tclose_f(type_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5tclose_c(type_id) BIND(C,NAME='h5tclose_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+       END FUNCTION h5tclose_c
+    END INTERFACE
+
+    hdferr = h5tclose_c(type_id)
+  END SUBROUTINE h5tclose_f
+!>
+!! \ingroup FH5T
+!!
+!! \brief Returns the datatype class identifier.
+!!
+!! \param type_id Datatype identifier.
+!! \param class   Class, possible values are:
+!!                \li H5T_NO_CLASS_F
+!!                \li H5T_INTEGER_F
+!!                \li H5T_FLOAT_F
+!!                \li H5T_TIME_F
+!!                \li H5T_STRING_F
+!!                \li H5T_BITFIELD_F
+!!                \li H5T_OPAQUE_F
+!!                \li H5T_COMPOUND_F
+!!                \li H5T_REFERENCE_F
+!!                \li H5T_ENUM_F
+!!                \li H5T_VLEN_F
+!!                \li H5T_ARRAY_F
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Tget_class()
+!!
+  SUBROUTINE h5tget_class_f(type_id, class, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER, INTENT(OUT) :: class
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5tget_class_c(type_id, class) BIND(C,NAME='h5tget_class_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER, INTENT(OUT) :: class
+       END FUNCTION h5tget_class_c
+    END INTERFACE
+
+    hdferr = h5tget_class_c(type_id, class)
+  END SUBROUTINE h5tget_class_f
+!>
+!! \ingroup FH5T
+!!
+!! \brief Returns the size of a datatype.
+!!
+!! \param type_id Datatype identifier.
+!! \param size    Datatype size.
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Tget_size()
+!!
+  SUBROUTINE h5tget_size_f(type_id, size, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER(SIZE_T), INTENT(OUT) :: size
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5tget_size_c(type_id, size) BIND(C,NAME='h5tget_size_c')
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER(SIZE_T), INTENT(OUT) :: size
+       END FUNCTION h5tget_size_c
+    END INTERFACE
+
+    hdferr = h5tget_size_c(type_id, size)
+  END SUBROUTINE h5tget_size_f
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Sets the total size for an atomic datatype.
+!!
+!! \param type_id Datatype identifier.
+!! \param size    Size of the datatype.
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Tset_size()
+!!
+  SUBROUTINE h5tset_size_f(type_id, size, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER(SIZE_T), INTENT(IN) :: size
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5tset_size_c(type_id, size) BIND(C,NAME='h5tset_size_c')
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER(SIZE_T), INTENT(IN) :: size
+       END FUNCTION h5tset_size_c
+    END INTERFACE
+
+    hdferr = h5tset_size_c(type_id, size)
+  END SUBROUTINE h5tset_size_f
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Returns the byte order of an atomic datatype.
+!!
+!! \param type_id Datatype identifier.
+!! \param order   Byte order for the datatype, possible values are:
+!!                \li H5T_ORDER_LE_F
+!!                \li H5T_ORDER_BE_F
+!!                \li H5T_ORDER_VAX_F (not implemented yet)
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Tget_order()
+!!
+  SUBROUTINE h5tget_order_f(type_id, order, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER, INTENT(OUT) :: order
+                                    ! H5T_ORDER_VAX_F
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5tget_order_c(type_id, order) BIND(C,NAME='h5tget_order_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER, INTENT(OUT) :: order
+       END FUNCTION h5tget_order_c
+    END INTERFACE
+
+    hdferr = h5tget_order_c(type_id, order)
+  END SUBROUTINE h5tget_order_f
+!>
+!! \ingroup FH5T
+!!
+!! \brief Sets the byte ordering of an atomic datatype.
+!!
+!! \param type_id Datatype identifier.
+!! \param order   Datatype byte order Possible values are:
+!!                \li H5T_ORDER_LE_F
+!!                \li H5T_ORDER_BE_F
+!!                \li H5T_ORDER_VAX_F (not implemented yet)
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Tset_order()
+!!
+  SUBROUTINE h5tset_order_f(type_id, order, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER, INTENT(IN) :: order
+                                   ! H5T_ORDER_VAX_F
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5tset_order_c(type_id, order) BIND(C,NAME='h5tset_order_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER, INTENT(IN) :: order
+       END FUNCTION h5tset_order_c
+    END INTERFACE
+
+    hdferr = h5tset_order_c(type_id, order)
+  END SUBROUTINE h5tset_order_f
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Returns the precision of an atomic datatype.
+!!
+!! \param type_id   Datatype identifier.
+!! \param precision Precision of the datatype.
+!! \param hdferr    \fortran_error
+!!
+!! See C API: @ref H5Tget_precision()
+!!
+  SUBROUTINE h5tget_precision_f(type_id, PRECISION, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER(SIZE_T), INTENT(OUT) :: precision
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5tget_precision_c(type_id, PRECISION) BIND(C,NAME='h5tget_precision_c')
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER(SIZE_T), INTENT(OUT) :: PRECISION
+       END FUNCTION h5tget_precision_c
+    END INTERFACE
+
+    hdferr = h5tget_precision_c(type_id, PRECISION)
+  END SUBROUTINE h5tget_precision_f
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Sets the precision of an atomic datatype.
+!!
+!! \param type_id   Datatype identifier.
+!! \param precision Datatype precision.
+!! \param hdferr    \fortran_error
+!!
+!! See C API: @ref H5Tset_precision()
+!!
+  SUBROUTINE h5tset_precision_f(type_id, PRECISION, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER(SIZE_T), INTENT(IN) :: PRECISION
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5tset_precision_c (type_id, PRECISION) BIND(C,NAME='h5tset_precision_c')
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER(SIZE_T), INTENT(IN) :: PRECISION
+       END FUNCTION h5tset_precision_c
+    END INTERFACE
+
+    hdferr = h5tset_precision_c(type_id, PRECISION)
+  END SUBROUTINE h5tset_precision_f
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Retrieves the bit offset of the first significant bit.
+!!
+!! \param type_id Datatype identifier.
+!! \param offset  Offset value.
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Tget_offset()
+!!
+  SUBROUTINE h5tget_offset_f(type_id, offset, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER(SIZE_T), INTENT(OUT) :: offset
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5tget_offset_c(type_id, offset) BIND(C,NAME='h5tget_offset_c')
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER(SIZE_T), INTENT(OUT) :: offset
+       END FUNCTION h5tget_offset_c
+    END INTERFACE
+
+    hdferr = h5tget_offset_c(type_id, offset)
+  END SUBROUTINE h5tget_offset_f
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Sets the bit offset of the first significant bit.
+!!
+!! \param type_id Datatype identifier.
+!! \param offset  Offset value.
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Tset_offset()
+!!
+  SUBROUTINE h5tset_offset_f(type_id, offset, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER(SIZE_T), INTENT(IN) :: offset
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5tset_offset_c(type_id, offset) BIND(C,NAME='h5tset_offset_c')
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER(SIZE_T), INTENT(IN) :: offset
+       END FUNCTION h5tset_offset_c
+    END INTERFACE
+
+    hdferr = h5tset_offset_c(type_id, offset)
+  END SUBROUTINE h5tset_offset_f
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Retrieves the padding type of the least and most-significant bit padding.
+!!
+!! \param type_id Datatype identifier.
+!! \param lsbpad  Least-significant bit padding type.
+!! \param msbpad  Most-significant bit padding type. Possible values are:
+!!                \li H5T_PAD_ERROR_F
+!!                \li H5T_PAD_ZERO_F
+!!                \li H5T_PAD_ONE_F
+!!                \li H5T_PAD_BACKGROUND_F
+!!                \li H5T_PAD_NPAD_F
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Tget_pad()
+!!
+  SUBROUTINE h5tget_pad_f(type_id, lsbpad, msbpad, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER, INTENT(OUT) :: lsbpad
+    INTEGER, INTENT(OUT) :: msbpad
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5tget_pad_c(type_id, lsbpad, msbpad) BIND(C,NAME='h5tget_pad_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER, INTENT(OUT) :: lsbpad
+         INTEGER, INTENT(OUT) :: msbpad
+       END FUNCTION h5tget_pad_c
+    END INTERFACE
+
+    hdferr = h5tget_pad_c(type_id, lsbpad, msbpad)
+  END SUBROUTINE h5tget_pad_f
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Sets the least and most-significant bits padding types.
+!!
+!! \param type_id Datatype identifier.
+!! \param lsbpad  Least-significant bit padding type.
+!! \param msbpad  Most-significant bit padding type. Possible values are:
+!!                \li H5T_PAD_ERROR_F
+!!                \li H5T_PAD_ZERO_F
+!!                \li H5T_PAD_ONE_F
+!!                \li H5T_PAD_BACKGROUND_F
+!!                \li H5T_PAD_NPAD_F
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Tset_pad()
+!!
+  SUBROUTINE h5tset_pad_f(type_id, lsbpad, msbpad, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER, INTENT(IN) :: lsbpad
+    INTEGER, INTENT(IN) :: msbpad
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5tset_pad_c(type_id, lsbpad, msbpad) BIND(C,NAME='h5tset_pad_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER, INTENT(IN) :: lsbpad
+         INTEGER, INTENT(IN) :: msbpad
+       END FUNCTION h5tset_pad_c
+    END INTERFACE
+
+    hdferr = h5tset_pad_c(type_id, lsbpad, msbpad)
+  END SUBROUTINE h5tset_pad_f
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Retrieves the sign type for an integer type.
+!!
+!! \param type_id  Datatype identifier.
+!! \param sign     Sign type. Possible values are:
+!!                \li  Unsigned integer type
+!!                     H5T_SGN_NONE_F = 0
+!!                \li  Two&apos;s complement signed integer type
+!!                     H5T_SGN_2_F = 1
+!!                \li  Error value
+!!                     H5T_SGN_ERROR_F = -1
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Tget_sign()
+!!
+  SUBROUTINE h5tget_sign_f(type_id, sign, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER, INTENT(OUT) :: sign
+    INTEGER, INTENT(OUT) :: hdferr
+
+    INTERFACE
+       INTEGER FUNCTION h5tget_sign_c(type_id, sign) BIND(C,NAME='h5tget_sign_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER, INTENT(OUT) :: sign
+       END FUNCTION h5tget_sign_c
+    END INTERFACE
+
+    hdferr = h5tget_sign_c(type_id, sign)
+  END SUBROUTINE h5tget_sign_f
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Sets the sign property for an integer type.
+!!
+!! \param type_id  Datatype identifier.
+!! \param sign     Sign type. Possible values are:
+!!                 \li Unsigned integer type
+!!                     H5T_SGN_NONE_F = 0
+!!                 \li Two&apos;s complement signed integer type
+!!                     H5T_SGN_2_F = 1
+!!                 \li Error value
+!!                     H5T_SGN_ERROR_F = -1
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Tset_sign()
+!!
+  SUBROUTINE h5tset_sign_f(type_id, sign, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER, INTENT(IN) :: sign
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5tset_sign_c(type_id, sign) BIND(C,NAME='h5tset_sign_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER, INTENT(IN) :: sign
+       END FUNCTION h5tset_sign_c
+    END INTERFACE
+
+    hdferr = h5tset_sign_c(type_id, sign)
+  END SUBROUTINE h5tset_sign_f
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Retrieves floating point datatype bit field information.
+!!
+!! \param type_id Datatype identifier.
+!! \param spos    Sign bit-position.
+!! \param epos    Exponent bit-position.
+!! \param esize   Size of exponent in bits.
+!! \param mpos    Mantissa position.
+!! \param msize   Size of mantissa in bits.
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Tget_fields()
+!!
+  SUBROUTINE h5tget_fields_f(type_id, spos, epos, esize, mpos, msize, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER(SIZE_T), INTENT(OUT) :: spos
+    INTEGER(SIZE_T), INTENT(OUT) :: epos
+    INTEGER(SIZE_T), INTENT(OUT) :: esize
+    INTEGER(SIZE_T), INTENT(OUT) :: mpos
+    INTEGER(SIZE_T), INTENT(OUT) :: msize
+    INTEGER, INTENT(OUT) :: hdferr
+
+    INTERFACE
+       INTEGER FUNCTION h5tget_fields_c(type_id, spos, epos, esize, mpos, msize) &
+            BIND(C,NAME='h5tget_fields_c')
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER(SIZE_T), INTENT(OUT) :: spos
+         INTEGER(SIZE_T), INTENT(OUT) :: epos
+         INTEGER(SIZE_T), INTENT(OUT) :: esize
+         INTEGER(SIZE_T), INTENT(OUT) :: mpos
+         INTEGER(SIZE_T), INTENT(OUT) :: msize
+       END FUNCTION h5tget_fields_c
+    END INTERFACE
+
+    hdferr = h5tget_fields_c(type_id, spos, epos, esize, mpos, msize)
+  END SUBROUTINE h5tget_fields_f
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Sets locations and sizes of floating point bit fields.
+!!
+!! \param type_id Datatype identifier.
+!! \param spos    Sign bit-position.
+!! \param epos    Exponent bit-position.
+!! \param esize   Size of exponent in bits.
+!! \param mpos    Mantissa position.
+!! \param msize   Size of mantissa in bits.
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Tset_fields()
+!!
+  SUBROUTINE h5tset_fields_f(type_id, spos, epos, esize, mpos, msize, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER(SIZE_T), INTENT(IN) :: spos
+    INTEGER(SIZE_T), INTENT(IN) :: epos
+    INTEGER(SIZE_T), INTENT(IN) :: esize
+    INTEGER(SIZE_T), INTENT(IN) :: mpos
+    INTEGER(SIZE_T), INTENT(IN) :: msize
+    INTEGER, INTENT(OUT) :: hdferr
+
+    INTERFACE
+       INTEGER FUNCTION h5tset_fields_c(type_id, spos, epos, esize, mpos, msize) &
+            BIND(C,NAME='h5tset_fields_c')
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER(SIZE_T), INTENT(IN) :: spos
+         INTEGER(SIZE_T), INTENT(IN) :: epos
+         INTEGER(SIZE_T), INTENT(IN) :: esize
+         INTEGER(SIZE_T), INTENT(IN) :: mpos
+         INTEGER(SIZE_T), INTENT(IN) :: msize
+       END FUNCTION h5tset_fields_c
+    END INTERFACE
+
+    hdferr = h5tset_fields_c(type_id, spos, epos, esize, mpos, msize)
+  END SUBROUTINE h5tset_fields_f
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Retrieves the exponent bias of a floating-point type.
+!!
+!! \param type_id Datatype identifier.
+!! \param ebias   Datatype exponent bias.
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Tget_ebias()
+!!
+  SUBROUTINE h5tget_ebias_f(type_id, ebias, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER(SIZE_T), INTENT(OUT) :: ebias
+    INTEGER, INTENT(OUT) :: hdferr
+
+    INTERFACE
+       INTEGER FUNCTION h5tget_ebias_c(type_id, ebias) BIND(C,NAME='h5tget_ebias_c')
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER(SIZE_T), INTENT(OUT) :: ebias
+       END FUNCTION h5tget_ebias_c
+    END INTERFACE
+
+    hdferr = h5tget_ebias_c(type_id, ebias)
+  END SUBROUTINE h5tget_ebias_f
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Sets the exponent bias of a floating-point type.
+!!
+!! \param type_id Datatype identifier.
+!! \param ebias   Datatype exponent bias.
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Tset_ebias()
+!!
+  SUBROUTINE h5tset_ebias_f(type_id, ebias, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER(SIZE_T), INTENT(IN) :: ebias
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5tset_ebias_c(type_id, ebias) BIND(C,NAME='h5tset_ebias_c')
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER(SIZE_T), INTENT(IN) :: ebias
+       END FUNCTION h5tset_ebias_c
+    END INTERFACE
+
+    hdferr = h5tset_ebias_c(type_id, ebias)
+  END SUBROUTINE h5tset_ebias_f
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Retrieves mantissa normalization of a floating-point datatype.
+!!
+!! \param type_id Datatype identifier.
+!! \param norm    Normalization types, valid values are:
+!!                \li H5T_NORM_IMPLIED_F
+!!                \li H5T_NORM_MSBSET_F
+!!                \li H5T_NORM_NONE_F
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Tget_norm()
+!!
+  SUBROUTINE h5tget_norm_f(type_id, norm, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER, INTENT(OUT) :: norm
+    INTEGER, INTENT(OUT) :: hdferr
+
+    INTERFACE
+       INTEGER FUNCTION h5tget_norm_c(type_id, norm) BIND(C,NAME='h5tget_norm_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER, INTENT(OUT) :: norm
+       END FUNCTION h5tget_norm_c
+    END INTERFACE
+
+    hdferr = h5tget_norm_c(type_id, norm)
+  END SUBROUTINE h5tget_norm_f
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Sets the mantissa normalization of a floating-point datatype.
+!!
+!! \param type_id Datatype identifier.
+!! \param norm    Normalization types, valid values are:
+!!                \li H5T_NORM_IMPLIED_F
+!!                \li H5T_NORM_MSBSET_F
+!!                \li H5T_NORM_NONE_F
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Tset_norm()
+!!
+  SUBROUTINE h5tset_norm_f(type_id, norm, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER, INTENT(IN) :: norm
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5tset_norm_c(type_id, norm) BIND(C,NAME='h5tset_norm_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER, INTENT(IN) :: norm
+       END FUNCTION h5tset_norm_c
+    END INTERFACE
+
+    hdferr = h5tset_norm_c(type_id, norm)
+  END SUBROUTINE h5tset_norm_f
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Retrieves the internal padding type for unused bits in floating-point datatypes.
+!!
+!! \param type_id Datatype identifier.
+!! \param padtype Padding type for unused bits. Possible values are:
+!!                \li H5T_PAD_ZERO_F
+!!                \li H5T_PAD_ONE_F
+!!                \li H5T_PAD_BACKGROUND_F
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Tget_inpad()
+!!
+  SUBROUTINE h5tget_inpad_f(type_id, padtype, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER, INTENT(OUT) :: padtype
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5tget_inpad_c(type_id, padtype) BIND(C,NAME='h5tget_inpad_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER, INTENT(OUT) :: padtype
+       END FUNCTION h5tget_inpad_c
+    END INTERFACE
+
+    hdferr = h5tget_inpad_c(type_id, padtype)
+  END SUBROUTINE h5tget_inpad_f
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Fills unused internal floating point bits.
+!!
+!! \param type_id Datatype identifier.
+!! \param padtype Padding type for unused bits. Possible values are:
+!!                \li H5T_PAD_ZERO_F
+!!                \li H5T_PAD_ONE_F
+!!                \li H5T_PAD_BACKGROUND_F
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Tset_inpad()
+!!
+  SUBROUTINE h5tset_inpad_f(type_id, padtype, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER, INTENT(IN) :: padtype
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5tset_inpad_c(type_id, padtype) BIND(C,NAME='h5tset_inpad_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER, INTENT(IN) :: padtype
+       END FUNCTION h5tset_inpad_c
+    END INTERFACE
+
+    hdferr = h5tset_inpad_c(type_id, padtype)
+  END SUBROUTINE h5tset_inpad_f
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Retrieves the character set type of a string datatype.
+!!
+!! \param type_id Datatype identifier.
+!! \param cset    Character set type of a string datatype. Possible values are:
+!!                \li H5T_CSET_ASCII_F
+!!                \li H5T_CSET_UTF8_F
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Tget_cset()
+!!
+  SUBROUTINE h5tget_cset_f(type_id, cset, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER, INTENT(OUT) :: cset
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5tget_cset_c(type_id, cset) BIND(C,NAME='h5tget_cset_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER, INTENT(OUT) :: cset
+       END FUNCTION h5tget_cset_c
+    END INTERFACE
+
+    hdferr = h5tget_cset_c(type_id, cset)
+  END SUBROUTINE h5tget_cset_f
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Sets character set to be used.
+!!
+!! \param type_id Datatype identifier.
+!! \param cset    Character set type of a string datatype. Possible values are:
+!!                \li H5T_CSET_ASCII_F
+!!                \li H5T_CSET_UTF8_F
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Tset_cset()
+!!
+  SUBROUTINE h5tset_cset_f(type_id, cset, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER, INTENT(IN) :: cset
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5tset_cset_c(type_id, cset) BIND(C,NAME='h5tset_cset_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER, INTENT(IN) :: cset
+       END FUNCTION h5tset_cset_c
+    END INTERFACE
+
+    hdferr = h5tset_cset_c(type_id, cset)
+  END SUBROUTINE h5tset_cset_f
+!>
+!! \ingroup FH5T
+!!
+!! \brief Retrieves the storage mechanism for a string datatype.
+!!
+!! \param type_id Datatype identifier.
+!! \param strpad  Storage method for a string datatype. Possible values are:
+!!                \li H5T_STR_NULLTERM_F
+!!                \li H5T_STR_NULLPAD_F
+!!                \li H5T_STR_SPACEPAD_F
+!!                \li H5T_STR_ERROR_F
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Tget_strpad()
+!!
+  SUBROUTINE h5tget_strpad_f(type_id, strpad, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER, INTENT(OUT) :: strpad
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5tget_strpad_c(type_id, strpad) BIND(C,NAME='h5tget_strpad_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER, INTENT(OUT) :: strpad
+       END FUNCTION h5tget_strpad_c
+    END INTERFACE
+
+    hdferr = h5tget_strpad_c(type_id, strpad)
+  END SUBROUTINE h5tget_strpad_f
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Defines the storage mechanism for character strings.
+!!
+!! \param type_id Datatype identifier.
+!! \param strpad  Storage method for a string datatype. Possible values are:
+!!                \li H5T_STR_NULLTERM_F
+!!                \li H5T_STR_NULLPAD_F
+!!                \li H5T_STR_SPACEPAD_F
+!!                \li H5T_STR_ERROR_F
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Tset_strpad()
+!!
+  SUBROUTINE h5tset_strpad_f(type_id, strpad, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER, INTENT(IN) :: strpad
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5tset_strpad_c(type_id, strpad) BIND(C,NAME='h5tset_strpad_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER, INTENT(IN) :: strpad
+       END FUNCTION h5tset_strpad_c
+    END INTERFACE
+
+    hdferr = h5tset_strpad_c(type_id, strpad)
+  END SUBROUTINE h5tset_strpad_f
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Retrieves the number of fields in a compound datatype.
+!!
+!! \param type_id     Datatype identifier.
+!! \param num_members Number of members.
+!! \param hdferr      \fortran_error
+!!
+!! See C API: @ref H5Tget_nmembers()
+!!
+  SUBROUTINE h5tget_nmembers_f(type_id, num_members, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER, INTENT(OUT) :: num_members
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5tget_nmembers_c(type_id, num_members) BIND(C,NAME='h5tget_nmembers_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER, INTENT(OUT) :: num_members
+       END FUNCTION h5tget_nmembers_c
+    END INTERFACE
+
+    hdferr = h5tget_nmembers_c(type_id, num_members)
+  END SUBROUTINE h5tget_nmembers_f
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Retrieves the name of a field of a compound datatype.
+!!
+!! \param type_id     Datatype identifier.
+!! \param index       Filed index (0-based).
+!! \param member_name Buffer to hold member&apos;s name.
+!! \param namelen     Name length.
+!! \param hdferr      \fortran_error
+!!
+!! See C API: @ref H5Tget_member_name()
+!!
+  SUBROUTINE h5tget_member_name_f(type_id, index, member_name,  namelen, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER, INTENT(IN) :: index
+    CHARACTER(LEN=*), INTENT(OUT) :: member_name
+    INTEGER, INTENT(OUT) :: namelen
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5tget_member_name_c(type_id, index, member_name, namelen) BIND(C,NAME='h5tget_member_name_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER, INTENT(IN) :: index
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(OUT) :: member_name
+         INTEGER, INTENT(OUT) :: namelen
+       END FUNCTION h5tget_member_name_c
+    END INTERFACE
+
+    hdferr = h5tget_member_name_c(type_id, index, member_name, namelen)
+  END SUBROUTINE h5tget_member_name_f
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Retrieves the offset of a field of a compound datatype.
+!!
+!! \param type_id   Datatype identifier.
+!! \param member_no Number of the field.
+!! \param offset    Byte offset of the requested field.
+!! \param hdferr    \fortran_error
+!!
+!! See C API: @ref H5Tget_member_offset()
+!!
+  SUBROUTINE h5tget_member_offset_f(type_id, member_no, offset, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER, INTENT(IN) :: member_no
+    INTEGER(SIZE_T), INTENT(OUT) :: offset
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5tget_member_offset_c(type_id, member_no, offset ) BIND(C,NAME='h5tget_member_offset_c')
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER, INTENT(IN) :: member_no
+         INTEGER(SIZE_T), INTENT(OUT) :: offset
+       END FUNCTION h5tget_member_offset_c
+    END INTERFACE
+
+    hdferr = h5tget_member_offset_c(type_id, member_no, offset )
+  END SUBROUTINE h5tget_member_offset_f
+!>
+!! \ingroup FH5T
+!!
+!! \brief Retrieves the index of a compound or enumeration datatype member.
+!!
+!! \param type_id Datatype identifier.
+!! \param name    Name of the field or member whose index to be retrieved from the datatype.
+!! \param index   Based index of the filed or member (0 to N-1).
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Tget_member_index()
+!!
+  SUBROUTINE h5tget_member_index_f(type_id, name, index, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    INTEGER, INTENT(OUT) :: index
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: namelen          ! Name length
+
+    INTERFACE
+       INTEGER FUNCTION h5tget_member_index_c(type_id, name, namelen, index) BIND(C,NAME='h5tget_member_index_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+         INTEGER, INTENT(IN)  :: namelen
+         INTEGER, INTENT(OUT) :: index
+       END FUNCTION h5tget_member_index_c
+    END INTERFACE
+
+    namelen = LEN(name)
+    hdferr = h5tget_member_index_c(type_id, name, namelen, index)
+  END SUBROUTINE h5tget_member_index_f
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Returns sizes of array dimensions.
+!!
+!! \param type_id Array datatype identifier.
+!! \param dims    Buffer to store array datatype dimensions.
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Tget_array_dims2()
+!!
+  SUBROUTINE h5tget_array_dims_f(type_id, dims, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER(HSIZE_T),DIMENSION(*), INTENT(OUT) :: dims
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5tget_array_dims_c(type_id, dims) BIND(C,NAME='h5tget_array_dims_c')
+         IMPORT :: HID_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER(HSIZE_T),DIMENSION(*), INTENT(OUT) ::  dims
+       END FUNCTION h5tget_array_dims_c
+    END INTERFACE
+
+    hdferr = h5tget_array_dims_c(type_id, dims)
+
+  END SUBROUTINE h5tget_array_dims_f
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Returns the rank of an array datatype.
+!!
+!! \param type_id Array datatype identifier.
+!! \param ndims   Number of array dimensions.
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Tget_array_ndims()
+!!
+  SUBROUTINE h5tget_array_ndims_f(type_id, ndims, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER, INTENT(OUT) :: ndims
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5tget_array_ndims_c(type_id, ndims) BIND(C,NAME='h5tget_array_ndims_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER, INTENT(OUT) ::  ndims
+       END FUNCTION h5tget_array_ndims_c
+    END INTERFACE
+
+    hdferr = h5tget_array_ndims_c(type_id, ndims)
+
+  END SUBROUTINE h5tget_array_ndims_f
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Returns the base datatype from which a datatype is derived.
+!!
+!! \param type_id      Datatype identifier.
+!! \param base_type_id Identifier of the base type.
+!! \param hdferr       \fortran_error
+!!
+!! See C API: @ref H5Tget_super()
+!!
+  SUBROUTINE h5tget_super_f(type_id, base_type_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER(HID_T), INTENT(OUT) :: base_type_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5tget_super_c(type_id, base_type_id) BIND(C,NAME='h5tget_super_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER(HID_T), INTENT(OUT) :: base_type_id
+       END FUNCTION h5tget_super_c
+    END INTERFACE
+
+    hdferr = h5tget_super_c(type_id, base_type_id)
+
+  END SUBROUTINE h5tget_super_f
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Returns the datatype of the specified member.
+!!
+!! \param type_id   Compound datatype identifier.
+!! \param field_idx Field index (0-based).
+!! \param datatype  Identifier of the member&apos;s datatype.
+!! \param hdferr    \fortran_error
+!!
+!! See C API: @ref H5Tget_member_type()
+!!
+  SUBROUTINE h5tget_member_type_f(type_id,  field_idx, datatype, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER, INTENT(IN) :: field_idx
+    INTEGER(HID_T), INTENT(OUT) :: datatype
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5tget_member_type_c(type_id, field_idx , datatype) &
+            BIND(C,NAME='h5tget_member_type_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER, INTENT(IN) :: field_idx
+         INTEGER(HID_T), INTENT(OUT) :: datatype
+       END FUNCTION h5tget_member_type_c
+    END INTERFACE
+
+    hdferr = h5tget_member_type_c(type_id, field_idx , datatype)
+  END SUBROUTINE h5tget_member_type_f
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Creates a new datatype.
+!!
+!! \param class   Datatype class can be one of:
+!!                \li H5T_COMPOUND_F
+!!                \li H5T_ENUM_F
+!!                \li H5T_OPAQUE_F
+!!                \li H5T_STRING_F
+!! \param size    Size of the datatype.
+!! \param type_id Datatype identifier.
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Tcreate()
+!!
+  SUBROUTINE h5tcreate_f(class, size, type_id, hdferr)
+    IMPLICIT NONE
+    INTEGER        , INTENT(IN)  :: class
+    INTEGER(SIZE_T), INTENT(IN)  :: size
+    INTEGER(HID_T) , INTENT(OUT) :: type_id
+    INTEGER        , INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5tcreate_c(class, size, type_id) BIND(C,NAME='h5tcreate_c')
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER, INTENT(IN) :: class
+         INTEGER(SIZE_T), INTENT(IN) :: size
+         INTEGER(HID_T), INTENT(OUT) :: type_id
+       END FUNCTION h5tcreate_c
+    END INTERFACE
+
+    hdferr = h5tcreate_c(class, size, type_id)
+  END SUBROUTINE h5tcreate_f
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Adds a new member to a compound datatype.
+!!
+!! \param type_id  Compound datatype identifier.
+!! \param name     Name of the field to insert.
+!! \param offset   Start of the member in an instance of the compound datatype.
+!! \param field_id Datatype identifier of the field to insert.
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Tinsert()
+!!
+  SUBROUTINE h5tinsert_f(type_id,  name, offset, field_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    INTEGER(SIZE_T), INTENT(IN) :: offset
+    INTEGER(HID_T), INTENT(IN) :: field_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: namelen
+
+    INTERFACE
+       INTEGER FUNCTION h5tinsert_c(type_id, name, namelen, offset, field_id) BIND(C,NAME='h5tinsert_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+         INTEGER(SIZE_T), INTENT(IN) :: offset
+         INTEGER(HID_T), INTENT(IN) :: field_id
+         INTEGER :: namelen
+       END FUNCTION h5tinsert_c
+    END INTERFACE
+
+    namelen = LEN(name)
+    hdferr = h5tinsert_c(type_id, name, namelen, offset, field_id )
+  END SUBROUTINE h5tinsert_f
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Recursively removes padding from within a compound datatype.
+!!
+!! \param type_id Compound datatype identifier.
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Tpack()
+!!
+  SUBROUTINE h5tpack_f(type_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5tpack_c(type_id) BIND(C,NAME='h5tpack_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+       END FUNCTION h5tpack_c
+    END INTERFACE
+
+    hdferr = h5tpack_c(type_id)
+  END SUBROUTINE h5tpack_f
+
+!
+! NAME
+!  h5tinsert_array_f
+!
+! PURPOSE
+!  This function is not available on hdf5-1.4.*
+!
+! INPUTS
+! OUTPUTS
+!            hdferr:            - error code
+!                               Success:  0
+!                               Failure: -1
+!
+! AUTHOR
+!      Elena Pourmal
+!            August 12, 1999
+!
+! HISTORY
+!       Explicit Fortran interfaces were added for
+!                  called C functions (it is needed for Windows
+!                  port).  March 7, 2001
+! SOURCE
+!  SUBROUTINE h5tinsert_array_f(parent_id,name,offset, ndims, dims, member_id, hdferr, perm)
+!  IMPLICIT NONE
+!
+!  INTEGER, EXTERNAL :: h5tinsert_array_c,  h5tinsert_array_c2
+!  namelen = LEN(name)
+!  if (present(perm)) then
+!  hdferr = h5tinsert_array_c(parent_id, name, namelen, offset, ndims,dims, member_id, perm)
+!  else
+!  hdferr = h5tinsert_array_c2(parent_id, name, namelen, offset, ndims,dims, member_id)
+!  end if
+!
+!  END SUBROUTINE h5tinsert_array_f
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Creates an array datatype object.
+!!
+!! \param base_id Datatype identifier for the array base datatype
+!! \param rank    Rank of the array.
+!! \param dims    Array dimension sizes.
+!! \param type_id Array datatype identifier.
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Tarray_create2()
+!!
+  SUBROUTINE h5tarray_create_f(base_id, rank, dims, type_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: base_id
+    INTEGER, INTENT(IN) ::  rank
+    INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: dims
+    INTEGER(HID_T), INTENT(OUT) :: type_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5tarray_create_c(base_id, rank, dims, type_id) BIND(C,NAME='h5tarray_create_c')
+         IMPORT :: HID_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: base_id
+         INTEGER, INTENT(IN) ::  rank
+         INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: dims
+         INTEGER(HID_T), INTENT(OUT) :: type_id
+       END FUNCTION h5tarray_create_c
+    END INTERFACE
+
+    hdferr = h5tarray_create_c(base_id, rank, dims, type_id)
+
+  END SUBROUTINE h5tarray_create_f
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Creates a new enumeration datatype.
+!!
+!! \param parent_id   Datatype identifier for base datatype.
+!! \param new_type_id Datatype identifier for the enumeration datatype.
+!! \param hdferr      \fortran_error
+!!
+!! See C API: @ref H5Tenum_create()
+!!
+  SUBROUTINE h5tenum_create_f(parent_id, new_type_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: parent_id
+    INTEGER(HID_T), INTENT(OUT) :: new_type_id
+    INTEGER, INTENT(OUT) :: hdferr
+
+    INTERFACE
+       INTEGER FUNCTION h5tenum_create_c(parent_id, new_type_id) BIND(C,NAME='h5tenum_create_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: parent_id
+         INTEGER(HID_T), INTENT(OUT) :: new_type_id
+       END FUNCTION h5tenum_create_c
+    END INTERFACE
+
+    hdferr = h5tenum_create_c(parent_id, new_type_id)
+  END SUBROUTINE h5tenum_create_f
+!>
+!! \ingroup FH5T
+!!
+!! \brief Returns the symbol name corresponding to a specified member of an enumeration datatype.
+!!
+!! \param type_id Datatype identifier.
+!! \param value   Value of the enumeration datatype.
+!! \param namelen Name buffer size.
+!! \param name    Buffer to hold symbol name.
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Tenum_nameof()
+!!
+  SUBROUTINE h5tenum_nameof_f(type_id,  value, namelen, name, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    CHARACTER(LEN=*), INTENT(OUT) :: name
+    INTEGER(SIZE_T), INTENT(IN) :: namelen
+    INTEGER, INTENT(IN) :: value
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5tenum_nameof_c(type_id, value, name, namelen) BIND(C,NAME='h5tenum_nameof_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(OUT) :: name
+         INTEGER(SIZE_T), INTENT(IN) :: namelen
+         INTEGER, INTENT(IN) :: value
+       END FUNCTION h5tenum_nameof_c
+    END INTERFACE
+
+    name(1:LEN(name)) = ' '
+
+    hdferr = h5tenum_nameof_c(type_id, value, name, namelen)
+  END SUBROUTINE h5tenum_nameof_f
+!>
+!! \ingroup FH5T
+!!
+!! \brief Returns the value corresponding to a specified member of an enumeration datatype.
+!!
+!! \param type_id Datatype identifier.
+!! \param name    Symbol name.
+!! \param value   Value of the enumeration datatype.
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Tenum_valueof()
+!!
+  SUBROUTINE h5tenum_valueof_f(type_id,  name, value, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    INTEGER, INTENT(OUT) :: value
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: namelen
+
+    INTERFACE
+       INTEGER FUNCTION h5tenum_valueof_c(type_id, name, namelen,  value) &
+            BIND(C,NAME='h5tenum_valueof_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+         INTEGER, INTENT(IN) :: namelen
+         INTEGER, INTENT(OUT) :: value
+       END FUNCTION h5tenum_valueof_c
+    END INTERFACE
+
+    namelen = LEN(name)
+    hdferr = h5tenum_valueof_c(type_id, name, namelen,  value)
+  END SUBROUTINE h5tenum_valueof_f
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Returns the value of an enumeration datatype member.
+!!
+!! \param type_id   Datatype identifier.
+!! \param member_no Number of the enumeration datatype member.
+!! \param value     Value of the enumeration datatype.
+!! \param hdferr    \fortran_error
+!!
+!! See C API: @ref H5Tget_member_value()
+!!
+  SUBROUTINE h5tget_member_value_f(type_id,  member_no, value, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER, INTENT(IN) :: member_no
+    INTEGER, INTENT(OUT) :: value
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5tget_member_value_c(type_id, member_no, value) &
+            BIND(C,NAME='h5tget_member_value_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER, INTENT(IN) :: member_no
+         INTEGER, INTENT(OUT) :: value
+       END FUNCTION h5tget_member_value_c
+    END INTERFACE
+
+    hdferr = h5tget_member_value_c(type_id, member_no, value)
+  END SUBROUTINE h5tget_member_value_f
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Tags an opaque datatype.
+!!
+!! \param type_id Identifier for opaque datatype.
+!! \param tag     Unique ASCII string with which the opaque datatype is to be tagged.
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Tset_tag()
+!!
+  SUBROUTINE h5tset_tag_f(type_id, tag, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    CHARACTER(LEN=*), INTENT(IN) :: tag
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: taglen
+
+    INTERFACE
+       INTEGER FUNCTION h5tset_tag_c(type_id, tag, taglen) BIND(C,NAME='h5tset_tag_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: tag
+         INTEGER :: taglen
+       END FUNCTION h5tset_tag_c
+    END INTERFACE
+
+    taglen = LEN(tag)
+    hdferr = h5tset_tag_c(type_id, tag, taglen)
+  END SUBROUTINE h5tset_tag_f
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Gets the tag associated with an opaque datatype.
+!!
+!! \param type_id Identifier for opaque datatype.
+!! \param tag     Unique ASCII string associated with opaque datatype.
+!! \param taglen  Length of tag.
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Tget_tag()
+!!
+  SUBROUTINE h5tget_tag_f(type_id, tag,taglen, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    CHARACTER(LEN=*), INTENT(OUT) :: tag
+    INTEGER, INTENT(OUT) :: taglen
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(SIZE_T):: tag_size      ! Declared character length of tab
+    INTERFACE
+       INTEGER FUNCTION h5tget_tag_c(type_id, tag, tag_size, taglen) &
+            BIND(C,NAME='h5tget_tag_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(OUT) :: tag
+         INTEGER(SIZE_T), INTENT(IN) :: tag_size
+         INTEGER, INTENT(OUT) :: taglen
+       END FUNCTION h5tget_tag_c
+    END INTERFACE
+
+    tag_size = LEN(tag)
+    hdferr = h5tget_tag_c(type_id, tag, tag_size, taglen )
+  END SUBROUTINE h5tget_tag_f
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Creates a new variable-length datatype.
+!!
+!! \param type_id   Identifier iof base datatype.
+!! \param vltype_id Identifier for VL datatype.
+!! \param hdferr    \fortran_error
+!!
+!! See C API: @ref H5Tvlen_create()
+!!
+  SUBROUTINE h5tvlen_create_f(type_id, vltype_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN)  :: type_id
+    INTEGER(HID_T), INTENT(OUT) :: vltype_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5tvlen_create_c(type_id, vltype_id) BIND(C,NAME='h5tvlen_create_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN)  :: type_id
+         INTEGER(HID_T), INTENT(OUT) :: vltype_id
+       END FUNCTION h5tvlen_create_c
+    END INTERFACE
+
+    hdferr = h5tvlen_create_c(type_id, vltype_id)
+  END SUBROUTINE h5tvlen_create_f
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Determines whether a dattype is a variable string.
+!!
+!! \param type_id Datartpe identifier.
+!! \param status  Flag to indicate if datatype is a variable string ( TRUE or FALSE).
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Tis_variable_str()
+!!
+  SUBROUTINE h5tis_variable_str_f(type_id, status, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    LOGICAL, INTENT(OUT) :: status
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: flag                     ! "TRUE/FALSE/ERROR from C"
+
+    INTERFACE
+       INTEGER FUNCTION h5tis_variable_str_c(type_id, flag) &
+            BIND(C,NAME='h5tis_variable_str_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER :: flag
+       END FUNCTION h5tis_variable_str_c
+    END INTERFACE
+
+    hdferr = h5tis_variable_str_c(type_id, flag)
+    status = .TRUE.
+    IF (flag .EQ. 0) status = .FALSE.
+
+  END SUBROUTINE h5tis_variable_str_f
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Returns datatype class of compound datatype member.
+!!
+!! \param type_id   Datartpe identifier.
+!! \param member_no Index of compound datatype member.
+!! \param class     Class type for compound dadtype member. Valid classes:
+!!                  \li H5T_NO_CLASS_F (error)
+!!                  \li H5T_INTEGER_F
+!!                  \li H5T_FLOAT_F
+!!                  \li H5T_TIME_F
+!!                  \li H5T_STRING_F
+!!                  \li H5T_BITFIELD_F
+!!                  \li H5T_OPAQUE_F
+!!                  \li H5T_COMPOUND_F
+!!                  \li H5T_REFERENCE_F
+!!                  \li H5T_ENUM_F
+!!                  \li H5T_VLEN_F
+!!                  \li H5T_ARRAY_F
+!! \param hdferr    \fortran_error
+!!
+!! See C API: @ref H5Tget_member_class()
+!!
+  SUBROUTINE h5tget_member_class_f(type_id, member_no, class, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER, INTENT(IN)       :: member_no
+    INTEGER, INTENT(OUT)     :: class
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5tget_member_class_c(type_id, member_no, class) &
+            BIND(C,NAME='h5tget_member_class_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER, INTENT(IN)       :: member_no
+         INTEGER, INTENT(OUT)     :: class
+       END FUNCTION h5tget_member_class_c
+    END INTERFACE
+
+    hdferr = h5tget_member_class_c(type_id, member_no, class)
+
+  END SUBROUTINE h5tget_member_class_f
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Commits a transient datatype to a file, creating a new named datatype, but does not link it into the file structure.
+!!
+!! \param loc_id   A file or group identifier specifying the file in which the new named datatype is to be created.
+!! \param dtype_id A datatype identifier.
+!! \param hdferr   \fortran_error
+!! \param tcpl_id  A datatype creation property list identifier (H5P_DEFAULT_F for the default property list.)
+!! \param tapl_id  A datatype access property list identifier should always be passed as the value H5P_DEFAULT_F.
+!!
+!! See C API: @ref H5Tcommit_anon()
+!!
+  SUBROUTINE h5tcommit_anon_f(loc_id, dtype_id, hdferr, tcpl_id, tapl_id)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id
+    INTEGER(HID_T), INTENT(IN) :: dtype_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: tcpl_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: tapl_id
+    INTEGER(HID_T) :: tcpl_id_default
+    INTEGER(HID_T) :: tapl_id_default
+
+    INTERFACE
+       INTEGER FUNCTION h5tcommit_anon_c(loc_id, dtype_id, &
+            tcpl_id_default, tapl_id_default) BIND(C,NAME='h5tcommit_anon_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         INTEGER(HID_T), INTENT(IN) :: dtype_id
+         INTEGER(HID_T) :: tcpl_id_default
+         INTEGER(HID_T) :: tapl_id_default
+       END FUNCTION h5tcommit_anon_c
+    END INTERFACE
+
+    tcpl_id_default = H5P_DEFAULT_F
+    tapl_id_default = H5P_DEFAULT_F
+
+    IF(PRESENT(tcpl_id)) tcpl_id_default = tcpl_id
+    IF(PRESENT(tapl_id)) tapl_id_default = tapl_id
+
+    hdferr = h5tcommit_anon_c(loc_id, dtype_id, &
+         tcpl_id_default, tapl_id_default )
+
+  END SUBROUTINE h5tcommit_anon_f
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Determines whether a datatype is a named type or a transient type.
+!!
+!! \param dtype_id  A datatype identifier.
+!! \param committed .TRUE. if the datatype has been committed, and .FALSE. if the datatype has not been committed.
+!! \param hdferr    \fortran_error
+!!
+!! See C API: @ref H5Tcommitted()
+!!
+  SUBROUTINE h5tcommitted_f(dtype_id, committed, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dtype_id
+    LOGICAL, INTENT(OUT) :: committed
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5tcommitted_c(dtype_id) BIND(C,NAME='h5tcommitted_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: dtype_id
+       END FUNCTION h5tcommitted_c
+    END INTERFACE
+
+    hdferr = h5tcommitted_c(dtype_id)
+
+    IF(hdferr.GT.0)THEN
+       committed = .TRUE.
+       hdferr = 0
+    ELSE IF(hdferr.EQ.0)THEN
+       committed = .FALSE.
+       hdferr = 0
+    ELSE
+       hdferr = -1
+    ENDIF
+
+  END SUBROUTINE h5tcommitted_f
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Decode A binary object description of data type and return a new object handle.
+!!
+!! \param buf    Buffer for the data space object to be decoded.
+!! \param obj_id Object ID.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Tdecode()
+!!
+  SUBROUTINE h5tdecode_f(buf, obj_id, hdferr)
+    IMPLICIT NONE
+    CHARACTER(LEN=*), INTENT(IN) :: buf
+    INTEGER(HID_T), INTENT(OUT) :: obj_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5tdecode_c(buf, obj_id) BIND(C,NAME='h5tdecode_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: buf
+         INTEGER(HID_T), INTENT(OUT) :: obj_id
+       END FUNCTION h5tdecode_c
+    END INTERFACE
+
+    hdferr = h5tdecode_c(buf, obj_id)
+
+  END SUBROUTINE h5tdecode_f
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Encode a data type object description into a binary buffer.
+!!
+!! \param obj_id Identifier of the object to be encoded.
+!! \param buf    Buffer for the object to be encoded into.
+!! \param nalloc If set to zero, returns the size of the buffer needed. Otherwise, it sets the size of \p buf allocated.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Tencode()
+!!
+  SUBROUTINE h5tencode_f(obj_id, buf, nalloc, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: obj_id
+    CHARACTER(LEN=*), INTENT(OUT) :: buf
+    INTEGER(SIZE_T), INTENT(INOUT) :: nalloc
+    INTEGER, INTENT(OUT) :: hdferr
+
+    INTERFACE
+       INTEGER FUNCTION h5tencode_c(buf, obj_id, nalloc) BIND(C,NAME='h5tencode_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: obj_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(OUT) :: buf
+         INTEGER(SIZE_T), INTENT(INOUT) :: nalloc
+       END FUNCTION h5tencode_c
+    END INTERFACE
+
+    hdferr = h5tencode_c(buf, obj_id, nalloc)
+
+  END SUBROUTINE h5tencode_f
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Returns a copy of a datatype creation property list.
+!!
+!! \param dtype_id Datatype identifier.
+!! \param dtpl_id  Datatype property list identifier.
+!! \param hdferr   \fortran_error
+!!
+!! See C API: @ref H5Tget_create_plist()
+!!
+  SUBROUTINE h5tget_create_plist_f(dtype_id, dtpl_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dtype_id
+    INTEGER(HID_T), INTENT(OUT) :: dtpl_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5tget_create_plist_c(dtype_id, dtpl_id) BIND(C,NAME='h5tget_create_plist_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: dtype_id
+         INTEGER(HID_T), INTENT(OUT) :: dtpl_id
+       END FUNCTION h5tget_create_plist_c
+    END INTERFACE
+
+    hdferr = h5tget_create_plist_c(dtype_id, dtpl_id)
+  END SUBROUTINE h5tget_create_plist_f
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Check whether the library’s default conversion is hard conversion.
+!!
+!! \param src_id Identifier for the source datatype.
+!! \param dst_id Identifier for the destination datatype.
+!! \param flag   .TRUE. for compiler conversion, .FALSE. for library conversion.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Tcompiler_conv()
+!!
+  SUBROUTINE h5tcompiler_conv_f(src_id, dst_id, flag, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: src_id
+    INTEGER(HID_T), INTENT(IN) :: dst_id
+    LOGICAL, INTENT(OUT) :: flag
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: c_flag
+
+    INTERFACE
+       INTEGER FUNCTION h5tcompiler_conv_c(src_id, dst_id, c_flag) BIND(C,NAME='h5tcompiler_conv_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: src_id
+         INTEGER(HID_T), INTENT(IN) :: dst_id
+         INTEGER :: c_flag
+       END FUNCTION h5tcompiler_conv_c
+    END INTERFACE
+
+    hdferr = h5tcompiler_conv_c(src_id, dst_id, c_flag)
+
+    flag = .FALSE.
+    IF(c_flag .GT. 0) flag = .TRUE.
+
+  END SUBROUTINE h5tcompiler_conv_f
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Returns the native datatype of a specified datatype.
+!!
+!! \param dtype_id        Datatype identifier for the dataset datatype.
+!! \param direction       Direction of search:
+!!                         H5T_DIR_DEFAULT,   default direction is inscendent,
+!!                         H5T_DIR_ASCEND ,   in inscendent order,
+!!                         H5T_DIR_DESCEND,   in descendent order.
+!!                         * NOTE: In C it is defined as a structure: H5T_direction_t
+!! \param native_dtype_id The native datatype identifier for the specified dataset datatype.
+!! \param hdferr          \fortran_error
+!!
+!! See C API: @ref H5Tget_native_type()
+!!
+  SUBROUTINE h5tget_native_type_f(dtype_id, direction, native_dtype_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dtype_id
+    INTEGER, INTENT(IN) :: direction
+    INTEGER(HID_T), INTENT(OUT) :: native_dtype_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5tget_native_type_c(dtype_id, direction, native_dtype_id) BIND(C,NAME='h5tget_native_type_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: dtype_id
+         INTEGER, INTENT(IN) :: direction
+         INTEGER(HID_T), INTENT(OUT) :: native_dtype_id
+       END FUNCTION h5tget_native_type_c
+    END INTERFACE
+
+    hdferr = h5tget_native_type_c(dtype_id, direction, native_dtype_id)
+  END SUBROUTINE h5tget_native_type_f
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Converts data from between specified datatypes.
+!!
+!! \param src_id     Identifier for the source datatype.
+!! \param dst_id     Identifier for the destination datatype.
+!! \param nelmts     Size of array buf.
+!! \param buf        Array containing pre-conversion values.
+!! \param hdferr     \fortran_error
+!! \param background Background buffer.
+!! \param plist_id   Dataset transfer property list identifier.
+!!
+!! See C API: @ref H5Tconvert()
+!!
+  SUBROUTINE h5tconvert_f(src_id, dst_id, nelmts, buf, hdferr, background, plist_id)
+    IMPLICIT NONE
+    INTEGER(HID_T) , INTENT(IN)               :: src_id
+    INTEGER(HID_T) , INTENT(IN)               :: dst_id
+    INTEGER(SIZE_T), INTENT(IN)               :: nelmts
+    TYPE(C_PTR)    , INTENT(INOUT)            :: buf
+    INTEGER        , INTENT(OUT)              :: hdferr
+    TYPE(C_PTR)    , INTENT(INOUT), OPTIONAL  :: background
+    INTEGER(HID_T) , INTENT(IN)   , OPTIONAL  :: plist_id
+    INTEGER(HID_T) :: plist_id_default
+    TYPE(C_PTR) :: background_default
+
+    INTERFACE
+       INTEGER FUNCTION h5tconvert_c(src_id, dst_id, nelmts, buf, background, plist_id) &
+            BIND(C, NAME='h5tconvert_c')
+         IMPORT :: c_ptr
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T) , INTENT(IN)           :: src_id
+         INTEGER(HID_T) , INTENT(IN)           :: dst_id
+         INTEGER(SIZE_T), INTENT(IN)           :: nelmts
+         TYPE(C_PTR)                , VALUE    :: buf
+         TYPE(C_PTR)                , VALUE    :: background
+         INTEGER(HID_T) , INTENT(IN)           :: plist_id
+       END FUNCTION h5tconvert_c
+    END INTERFACE
+
+    plist_id_default = H5P_DEFAULT_F
+    IF(PRESENT(plist_id)) plist_id_default = plist_id
+
+    background_default = C_NULL_PTR
+    IF(PRESENT(background)) background_default = background
+
+    hdferr = H5Tconvert_c(src_id, dst_id, nelmts, buf, background_default, plist_id_default)
+
+  END SUBROUTINE h5tconvert_f
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Inserts a new enumeration datatype member.
+!!
+!! \attention \fortran_approved
+!!
+!! \param type_id Datatype identifier for the enumeration datatype.
+!! \param name    Datatype identifier.
+!! \param value   Pointer to the value of the new member.
+!! \param hdferr  \fortran_error
+!!
+#ifdef H5_DOXYGEN
+!! See C API: @ref H5Tenum_insert()
+!!
+  SUBROUTINE h5tenum_insert_f(&
+#else
+  SUBROUTINE h5tenum_insert_f03(&
+#endif
+      type_id, name, value, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T)  , INTENT(IN) :: type_id
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    TYPE(C_PTR)     , INTENT(IN) :: value
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: namelen
+
+    INTERFACE
+       INTEGER FUNCTION h5tenum_insert_ptr_c(type_id, name, namelen, value) &
+            BIND(C, NAME='h5tenum_insert_ptr_c')
+         IMPORT :: C_CHAR, C_PTR
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+         INTEGER :: namelen
+         TYPE(C_PTR), VALUE :: value
+       END FUNCTION h5tenum_insert_ptr_c
+    END INTERFACE
+
+    namelen = LEN(name)
+    hdferr = h5tenum_insert_ptr_c(type_id, name, namelen, value)
+#ifdef H5_DOXYGEN
+  END SUBROUTINE h5tenum_insert_f
+#else
+  END SUBROUTINE h5tenum_insert_f03
+#endif
+
+!>
+!! \ingroup FH5T
+!!
+!! \brief Inserts a new enumeration datatype member.
+!!
+!! \attention  \fortran_obsolete
+!!
+!! \param type_id Datatype identifier for the enumeration datatype.
+!! \param name    Datatype identifier.
+!! \param value   Value of the new member.
+!! \param hdferr  \fortran_error
+!!
+#ifdef H5_DOXYGEN
+!! See C API: @ref H5Tenum_insert()
+!!
+  SUBROUTINE h5tenum_insert_f(type_id,  name, value, hdferr)
+#else
+  SUBROUTINE h5tenum_insert_f90(type_id,  name, value, hdferr)
+#endif
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    INTEGER, INTENT(IN) :: value
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: namelen
+    INTERFACE
+       INTEGER FUNCTION h5tenum_insert_c(type_id, name, namelen, value) BIND(C,NAME='h5tenum_insert_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+         INTEGER, INTENT(IN) :: value
+         INTEGER :: namelen
+       END FUNCTION h5tenum_insert_c
+    END INTERFACE
+
+    namelen = LEN(name)
+    hdferr = h5tenum_insert_c(type_id, name, namelen, value)
+#ifdef H5_DOXYGEN
+  END SUBROUTINE h5tenum_insert_f
+#else
+  END SUBROUTINE h5tenum_insert_f90
+#endif
+
+END MODULE H5T
diff --git a/fortran/src/H5Tff.f90 b/fortran/src/H5Tff.f90
deleted file mode 100644
index 4b4c0b6..0000000
--- a/fortran/src/H5Tff.f90
+++ /dev/null
@@ -1,3105 +0,0 @@
-!****h* ROBODoc/H5T
-!
-! NAME
-!  MODULE H5T
-!
-! PURPOSE
-!  This file contains Fortran interfaces for H5T functions. It includes
-!  all the functions that are independent on whether the Fortran 2003 functions
-!  are enabled or disabled.
-!
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! NOTES
-!                         *** IMPORTANT ***
-!  If you add a new H5T function you must add the function name to the
-!  Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
-!  This is needed for Windows based operating systems.
-!
-!*****
-
-MODULE H5T
-
-  USE H5GLOBAL
-
-CONTAINS
-
-!
-!****s* H5T/h5topen_f
-!
-! NAME
-!  h5topen_f
-!
-! PURPOSE
-!  Opens named datatype.
-!
-! INPUTS
-!  loc_id 	 - location identifier
-!  name 	 - a datatype name
-! OUTPUTS
-!  type_id 	 - datatype identifier
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! OPTIONAL PARAMETERS
-!  tapl_id 	 - datatype access property list identifier.
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 7, 2001
-!
-!  Added optional parameter 'tapl_id' for compatability
-!  with H5Topen2. April 9, 2009.
-!
-! SOURCE
-  SUBROUTINE h5topen_f(loc_id, name, type_id, hdferr, tapl_id)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id  ! File or group identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name ! Datatype name within file or group
-    INTEGER(HID_T), INTENT(OUT) :: type_id  ! Datatype identifier
-    INTEGER, INTENT(OUT) :: hdferr ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: tapl_id ! datatype access property list identifier
-!*****
-    INTEGER :: namelen                  ! Name length
-    INTEGER(HID_T) :: tapl_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5topen_c(loc_id, name, namelen, type_id, tapl_id_default)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TOPEN_C'::h5topen_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference ::name
-         INTEGER(HID_T), INTENT(IN) :: loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER :: namelen
-         INTEGER(HID_T), INTENT(OUT) :: type_id
-         INTEGER(HID_T) :: tapl_id_default
-       END FUNCTION h5topen_c
-    END INTERFACE
-
-    namelen = LEN(name)
-
-    tapl_id_default = H5P_DEFAULT_F
-    IF(PRESENT(tapl_id)) tapl_id_default = tapl_id
-
-    hdferr = h5topen_c(loc_id, name, namelen, type_id, tapl_id_default)
-  END SUBROUTINE h5topen_f
-!
-!****s* H5T/h5tcommit_f
-!
-! NAME
-!  h5tcommit_f
-!
-! PURPOSE
-!  Commits a transient datatype to a file, creating a
-!  new named datatype.
-!
-! INPUTS
-!  loc_id 	 - location identifier
-!  name 	 - name of the datatype to be stored
-!                  at the specified location
-!  type_id 	 - identifier of a datatype to be stored
-! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! OPTIONAL PARAMETERS
-!  lcpl_id 	 - Link creation property list
-!  tcpl_id 	 - Datatype creation property list
-!  tapl_id 	 - Datatype access property list
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!   	 - Explicit Fortran interfaces were added for
-!          called C functions (it is needed for Windows
-!          port).  March 7, 2001
-!
-!   	 - Added optional parameters introduced in version 1.8
-!          M. Scot Breitenfeld
-!
-! SOURCE
-  SUBROUTINE h5tcommit_f(loc_id, name, type_id, hdferr, &
-       lcpl_id, tcpl_id, tapl_id  )
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id  ! File or group identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name
-                                  ! Datatype name within file or group
-    INTEGER(HID_T), INTENT(IN) :: type_id  ! Datatype identifier
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lcpl_id ! Link creation property list
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: tcpl_id ! Datatype creation property list
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: tapl_id ! Datatype access property list
-!*****
-
-    INTEGER :: namelen          ! Name length
-
-    INTEGER(HID_T) :: lcpl_id_default
-    INTEGER(HID_T) :: tcpl_id_default
-    INTEGER(HID_T) :: tapl_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5tcommit_c(loc_id, name, namelen, type_id, &
-            lcpl_id_default, tcpl_id_default, tapl_id_default )
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TCOMMIT_C'::h5tcommit_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference ::name
-         INTEGER(HID_T), INTENT(IN) :: loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER :: namelen
-         INTEGER(HID_T), INTENT(IN) :: type_id
-         INTEGER(HID_T) :: lcpl_id_default
-         INTEGER(HID_T) :: tcpl_id_default
-         INTEGER(HID_T) :: tapl_id_default
-       END FUNCTION h5tcommit_c
-    END INTERFACE
-
-    lcpl_id_default = H5P_DEFAULT_F
-    tcpl_id_default = H5P_DEFAULT_F
-    tapl_id_default = H5P_DEFAULT_F
-
-    IF (PRESENT(lcpl_id)) lcpl_id_default = lcpl_id
-    IF (PRESENT(tcpl_id)) tcpl_id_default = tcpl_id
-    IF (PRESENT(tapl_id)) tapl_id_default = tapl_id
-
-    namelen = LEN(name)
-
-    hdferr = h5tcommit_c(loc_id, name, namelen, type_id, &
-         lcpl_id_default, tcpl_id_default, tapl_id_default )
-
-  END SUBROUTINE h5tcommit_f
-!
-!****s* H5T/h5tcopy_f
-!
-! NAME
-!  h5tcopy_f
-!
-! PURPOSE
-!  Creates a copy of exisiting datatype.
-!
-! INPUTS
-!  type_id 	 - datatype identifier
-! OUTPUTS
-!  new_type_id 	 - identifier of datatype's copy
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 7, 2001
-!
-! SOURCE
-  SUBROUTINE h5tcopy_f(type_id, new_type_id, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER(HID_T), INTENT(OUT) :: new_type_id
-                                 ! Identifier of datatype's copy
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-            INTERFACE
-              INTEGER FUNCTION  h5tcopy_c(type_id, new_type_id)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TCOPY_C'::h5tcopy_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER(HID_T), INTENT(OUT) :: new_type_id
-              END FUNCTION h5tcopy_c
-            END INTERFACE
-
-            hdferr = h5tcopy_c(type_id, new_type_id)
-          END SUBROUTINE h5tcopy_f
-!
-!****s* H5T/h5tequal_f
-!
-! NAME
-!  h5tequal_f
-!
-! PURPOSE
-!  Determines whether two datatype identifiers refer
-!  to the same datatype.
-!
-! INPUTS
-!  type1_id 	 - datatype identifier
-!  type2_id 	 - datatype identifier
-! OUTPUTS
-!  flag 	 - TRUE/FALSE flag to indicate
-!                  if two datatypes are equal
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 7, 2001
-! SOURCE
-  SUBROUTINE h5tequal_f(type1_id, type2_id, flag, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type1_id ! Datatype identifier
-            INTEGER(HID_T), INTENT(IN) :: type2_id ! Datatype identifier
-            LOGICAL, INTENT(OUT) :: flag ! TRUE/FALSE flag to indicate if two
-                                         ! datatypes are equal
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-            INTEGER :: c_flag
-            INTERFACE
-              INTEGER FUNCTION h5tequal_c(type1_id, type2_id, c_flag)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TEQUAL_C'::h5tequal_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type1_id
-              INTEGER(HID_T), INTENT(IN) :: type2_id
-              INTEGER :: c_flag
-              END FUNCTION h5tequal_c
-            END INTERFACE
-
-            flag = .FALSE.
-            hdferr = h5tequal_c(type1_id, type2_id, c_flag)
-            if(c_flag .gt. 0) flag = .TRUE.
-          END SUBROUTINE h5tequal_f
-!
-!****s* H5T/h5tclose_f
-!
-! NAME
-!  h5tclose_f
-!
-! PURPOSE
-!  Releases a datatype.
-!
-! INPUTS
-!  type_id 	 - datatype identifier
-! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 7, 2001
-!
-! SOURCE
-  SUBROUTINE h5tclose_f(type_id, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-            INTERFACE
-              INTEGER FUNCTION h5tclose_c(type_id)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TCLOSE_C'::h5tclose_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              END FUNCTION h5tclose_c
-            END INTERFACE
-
-            hdferr = h5tclose_c(type_id)
-          END SUBROUTINE h5tclose_f
-!
-!****s* H5T/h5tget_class_f
-!
-! NAME
-!  h5tget_class_f
-!
-! PURPOSE
-!  Returns the datatype class identifier.
-!
-! INPUTS
-!  type_id - Datatype identifier
-! OUTPUTS
-!  class   - Class, possible values are:
-!            H5T_NO_CLASS_F (-1)
-!            H5T_INTEGER_F  (0)
-!            H5T_FLOAT_F (1)
-!            H5T_TIME_F  (2)
-!            H5T_STRING_F (3)
-!            H5T_BITFIELD_F (4)
-!            H5T_OPAQUE_F (5)
-!            H5T_COMPOUND_F (6)
-!            H5T_REFERENCE_F (7)
-!            H5T_ENUM_F (8)
-!            H5T_VLEN_F (9)
-!            H5T_ARRAY_F (10)  
-!  hdferr  - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 7, 2001
-!
-! SOURCE
-  SUBROUTINE h5tget_class_f(type_id, class, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: type_id
-    INTEGER, INTENT(OUT) :: class         
-    INTEGER, INTENT(OUT) :: hdferr
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5tget_class_c(type_id, class)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_CLASS_C'::h5tget_class_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: type_id
-         INTEGER, INTENT(OUT) :: class
-       END FUNCTION h5tget_class_c
-    END INTERFACE
-
-    hdferr = h5tget_class_c(type_id, class)
-  END SUBROUTINE h5tget_class_f
-!
-!****s* H5T/h5tget_size_f
-!
-! NAME
-!  h5tget_size_f
-!
-! PURPOSE
-!  Returns the size of a datatype.
-!
-! INPUTS
-!  type_id 	 - datatype identifier
-! OUTPUTS
-!  size 	 - datatype size
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 7, 2001
-!
-! SOURCE
-  SUBROUTINE h5tget_size_f(type_id, size, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER(SIZE_T), INTENT(OUT) :: size ! Datatype size
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-            INTERFACE
-              INTEGER FUNCTION h5tget_size_c(type_id, size)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_SIZE_C'::h5tget_size_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER(SIZE_T), INTENT(OUT) :: size
-              END FUNCTION h5tget_size_c
-            END INTERFACE
-
-            hdferr = h5tget_size_c(type_id, size)
-          END SUBROUTINE h5tget_size_f
-
-!
-!****s* H5T/h5tset_size_f
-!
-! NAME
-!  h5tset_size_f
-!
-! PURPOSE
-!  Sets the total size for an atomic datatype.
-!
-! INPUTS
-!  type_id 	 - datatype identifier
-!  size 	 - size of the datatype
-! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 7, 2001
-!
-!
-! SOURCE
-  SUBROUTINE h5tset_size_f(type_id, size, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER(SIZE_T), INTENT(IN) :: size ! Datatype size
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-            INTERFACE
-              INTEGER FUNCTION h5tset_size_c(type_id, size)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TSET_SIZE_C'::h5tset_size_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER(SIZE_T), INTENT(IN) :: size
-              END FUNCTION h5tset_size_c
-            END INTERFACE
-
-            hdferr = h5tset_size_c(type_id, size)
-          END SUBROUTINE h5tset_size_f
-
-!
-!****s* H5T/h5tget_order_f
-!
-! NAME
-!  h5tget_order_f
-!
-! PURPOSE
-!  Returns the byte order of an atomic datatype.
-!
-! INPUTS
-!  type_id 	 - datatype identifier
-! OUTPUTS
-!  order 	 - byte order for the datatype, possible
-!                  values are:
-!                    H5T_ORDER_LE_F
-!                    H5T_ORDER_BE_F
-!                    H5T_ORDER_VAX_F (not implemented yet)
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 7, 2001
-!
-! SOURCE
-  SUBROUTINE h5tget_order_f(type_id, order, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-    INTEGER, INTENT(OUT) :: order
-                                    ! Datatype byte order, possible values are:
-                                    ! H5T_ORDER_LE_F
-                                    ! H5T_ORDER_BE_F
-                                    ! H5T_ORDER_VAX_F
-    INTEGER, INTENT(OUT) :: hdferr  ! Error code
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5tget_order_c(type_id, order)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_ORDER_C'::h5tget_order_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: type_id
-         INTEGER, INTENT(OUT) :: order
-       END FUNCTION h5tget_order_c
-    END INTERFACE
-    
-    hdferr = h5tget_order_c(type_id, order)
-  END SUBROUTINE h5tget_order_f
-!
-!****s* H5T/h5tset_order_f
-!
-! NAME
-!  h5tset_order_f
-!
-! PURPOSE
-!  Sets the byte ordering of an atomic datatype.
-!
-! INPUTS
-!  type_id 	 - datatype identifier
-!  order 	 - datatype byte order Possible values are:
-!                    H5T_ORDER_LE_F
-!                    H5T_ORDER_BE_F
-!                    H5T_ORDER_VAX_F (not implemented yet)
-! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 7, 2001
-!
-! SOURCE
-  SUBROUTINE h5tset_order_f(type_id, order, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-    INTEGER, INTENT(IN) :: order   ! Datatype byte order, possible values
-                                   ! are:
-                                   ! H5T_ORDER_LE_F
-                                   ! H5T_ORDER_BE_F
-                                   ! H5T_ORDER_VAX_F
-    INTEGER, INTENT(OUT) :: hdferr ! Error code
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5tset_order_c(type_id, order)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TSET_ORDER_C'::h5tset_order_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: type_id
-         INTEGER, INTENT(IN) :: order
-       END FUNCTION h5tset_order_c
-    END INTERFACE
-    
-    hdferr = h5tset_order_c(type_id, order)
-  END SUBROUTINE h5tset_order_f
-
-!
-!****s* H5T/h5tget_precision_f
-!
-! NAME
-!  h5tget_precision_f
-!
-! PURPOSE
-!  Returns the precision of an atomic datatype.
-!
-! INPUTS
-!  type_id 	 - datatype identifier
-! OUTPUTS
-!  precision 	 - precision of the datatype
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 7, 2001
-!
-! SOURCE
-  SUBROUTINE h5tget_precision_f(type_id, precision, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER(SIZE_T), INTENT(OUT) :: precision ! Datatype precision
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-            INTERFACE
-              INTEGER FUNCTION h5tget_precision_c (type_id, precision)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_PRECISION_C'::h5tget_precision_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER(SIZE_T), INTENT(OUT) :: precision
-              END FUNCTION h5tget_precision_c
-            END INTERFACE
-
-            hdferr = h5tget_precision_c(type_id, precision)
-          END SUBROUTINE h5tget_precision_f
-
-!
-!****s* H5T/h5tset_precision_f
-!
-! NAME
-!  h5tset_precision_f
-!
-! PURPOSE
-!  Sets the precision of an atomic datatype.
-!
-! INPUTS
-!  type_id 	 - datatype identifier
-!  precision 	 - datatype precision
-! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 7, 2001
-!
-! SOURCE
-  SUBROUTINE h5tset_precision_f(type_id, precision, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER(SIZE_T), INTENT(IN) :: precision ! Datatype precision
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-            INTERFACE
-              INTEGER FUNCTION h5tset_precision_c (type_id, precision)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TSET_PRECISION_C'::h5tset_precision_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER(SIZE_T), INTENT(IN) :: precision
-              END FUNCTION h5tset_precision_c
-            END INTERFACE
-
-            hdferr = h5tset_precision_c(type_id, precision)
-          END SUBROUTINE h5tset_precision_f
-
-!
-!****s* H5T/h5tget_offset_f
-!
-! NAME
-!  h5tget_offset_f
-!
-! PURPOSE
-!  Retrieves the bit offset of the first significant bit.
-!
-! INPUTS
-!  type_id 	 - datatype identifier
-! OUTPUTS
-!  offset 	 - offset value
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 7, 2001
-!
-! SOURCE
-  SUBROUTINE h5tget_offset_f(type_id, offset, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER(SIZE_T), INTENT(OUT) :: offset ! Datatype bit offset of the
-                                           ! first significant bit
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-            INTERFACE
-              INTEGER FUNCTION h5tget_offset_c(type_id, offset)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_OFFSET_C'::h5tget_offset_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER(SIZE_T), INTENT(OUT) :: offset
-              END FUNCTION h5tget_offset_c
-            END INTERFACE
-
-            hdferr = h5tget_offset_c(type_id, offset)
-          END SUBROUTINE h5tget_offset_f
-
-!
-!****s* H5T/h5tset_offset_f
-!
-! NAME
-!  h5tset_offset_f
-!
-! PURPOSE
-!  Sets the bit offset of the first significant bit.
-!
-! INPUTS
-!  type_id 	 - datatype identifier
-!  offset 	 - offset value
-! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 7, 2001
-!
-! SOURCE
-  SUBROUTINE h5tset_offset_f(type_id, offset, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER(SIZE_T), INTENT(IN) :: offset ! Datatype bit offset of the
-                                           ! first significant bit
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-            INTERFACE
-              INTEGER FUNCTION h5tset_offset_c(type_id, offset)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TSET_OFFSET_C'::h5tset_offset_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER(SIZE_T), INTENT(IN) :: offset
-              END FUNCTION h5tset_offset_c
-            END INTERFACE
-
-            hdferr = h5tset_offset_c(type_id, offset)
-          END SUBROUTINE h5tset_offset_f
-
-!
-!****s* H5T/h5tget_pad_f
-!
-! NAME
-!  h5tget_pad_f
-!
-! PURPOSE
-!  Retrieves the padding type of the least and
-!  most 	 -significant bit padding.
-!
-! INPUTS
-!  type_id 	 - datatype identifier
-! OUTPUTS
-!  lsbpad 	 - least-significant bit padding type
-!  msbpad 	 - most-significant bit padding type
-!                  Possible values of padding type are:
-!                    H5T_PAD_ERROR_F      = -1
-!                    H5T_PAD_ZERO_F = 0
-!                    H5T_PAD_ONE_F = 1
-!                    H5T_PAD_BACKGROUND_F = 2
-!                    H5T_PAD_NPAD_F      = 3
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 7, 2001
-! SOURCE
-  SUBROUTINE h5tget_pad_f(type_id, lsbpad, msbpad, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER, INTENT(OUT) :: lsbpad ! padding type of the
-                                           ! least significant bit
-            INTEGER, INTENT(OUT) :: msbpad ! padding type of the
-                                           ! most significant bit
-                                           ! Possible values of padding type are:
-                                           ! H5T__PAD_ZERO_F = 0
-                                           ! H5T__PAD_ONE_F = 1
-                                           ! H5T__PAD_BACKGROUND_F = 2
-                                           ! H5T_PAD_ERROR_F      = -1
-                                           ! H5T_PAD_NPAD_F      = 3
-
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-            INTERFACE
-              INTEGER FUNCTION h5tget_pad_c(type_id, lsbpad, msbpad)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_PAD_C'::h5tget_pad_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER, INTENT(OUT) :: lsbpad
-              INTEGER, INTENT(OUT) :: msbpad
-              END FUNCTION h5tget_pad_c
-            END INTERFACE
-
-            hdferr = h5tget_pad_c(type_id, lsbpad, msbpad)
-          END SUBROUTINE h5tget_pad_f
-
-!
-!****s* H5T/h5tset_pad_f
-!
-! NAME
-!  h5tset_pad_f
-!
-! PURPOSE
-!  Sets the least and most-significant bits padding types.
-!
-! INPUTS
-!  type_id 	 - datatype identifier
-!  lsbpad 	 - least-significant bit padding type
-!  msbpad 	 - most-significant bit padding type
-!                  Possible values of padding type are:
-!                    H5T_PAD_ERROR_F      = -1
-!                    H5T_PAD_ZERO_F = 0
-!                    H5T_PAD_ONE_F = 1
-!                    H5T_PAD_BACKGROUND_F = 2
-!                    H5T_PAD_NPAD_F      = 3
-! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 7, 2001
-! SOURCE
-  SUBROUTINE h5tset_pad_f(type_id, lsbpad, msbpad, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER, INTENT(IN) :: lsbpad ! padding type of the
-                                           ! least significant bit
-            INTEGER, INTENT(IN) :: msbpad ! padding type of the
-                                           ! most significant bit
-                                           ! Possible values of padding type are:
-                                           ! H5T_PAD_ZERO_F = 0
-                                           ! H5T_PAD_ONE_F = 1
-                                           ! H5T_PAD_BACKGROUND_F = 2
-                                           ! H5T_PAD_ERROR_F      = -1
-                                           ! H5T_PAD_NPAD_F      = 3
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-            INTERFACE
-              INTEGER FUNCTION h5tset_pad_c(type_id, lsbpad, msbpad)
-              USE H5GLOBAL
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TSET_PAD_C'::h5tset_pad_c
-              !DEC$ENDIF
-              INTEGER, INTENT(IN) :: lsbpad
-              INTEGER, INTENT(IN) :: msbpad
-              END FUNCTION h5tset_pad_c
-            END INTERFACE
-
-            hdferr = h5tset_pad_c(type_id, lsbpad, msbpad)
-          END SUBROUTINE h5tset_pad_f
-
-!
-!****s* H5T/h5tget_sign_f
-!
-! NAME
-!  h5tget_sign_f
-!
-! PURPOSE
-!  Retrieves the sign type for an integer type.
-!
-! INPUTS
-!  type_id 	 - datatype identifier
-! OUTPUTS
-!  sign 	 - sign type
-!                  Possible values are:
-!                    - Unsigned integer type 
-!                        H5T_SGN_NONE_F = 0
-!                    - Two's complement signed integer type
-!                        H5T_SGN_2_F = 1
-!                    - error value: H5T_SGN_ERROR_F=-1
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 7, 2001
-! SOURCE
-  SUBROUTINE h5tget_sign_f(type_id, sign, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER, INTENT(OUT) :: sign ! sign type for an integer type
-                                         !possible values are:
-                                         !Unsigned integer type H5T_SGN_NONE_F = 0
-                                         !Two's complement signed integer type
-                                         !H5T_SGN_2_F = 1
-                                         !or error value: H5T_SGN_ERROR_F=-1
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-
-            INTERFACE
-              INTEGER FUNCTION h5tget_sign_c(type_id, sign)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_SIGN_C'::h5tget_sign_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER, INTENT(OUT) :: sign
-              END FUNCTION h5tget_sign_c
-            END INTERFACE
-
-            hdferr = h5tget_sign_c(type_id, sign)
-          END SUBROUTINE h5tget_sign_f
-
-!
-!****s* H5T/h5tset_sign_f
-!
-! NAME
-!  h5tset_sign_f
-!
-! PURPOSE
-!  Sets the sign proprety for an integer type.
-!
-! INPUTS
-!  type_id 	 - datatype identifier
-!  sign 	 - sign type
-!                  Possible values are:
-!                    - Unsigned integer type 
-!                        H5T_SGN_NONE_F = 0
-!                    - Two's complement signed integer type
-!                        H5T_SGN_2_F = 1
-!                    - error value: H5T_SGN_ERROR_F=-1
-! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 7, 2001
-! SOURCE
-  SUBROUTINE h5tset_sign_f(type_id, sign, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER, INTENT(IN) :: sign !sign type for an integer type
-                                         !possible values are:
-                                         !Unsigned integer type H5T_SGN_NONE_F = 0
-                                         !Two's complement signed integer type
-                                         !H5T_SGN_2_F = 1
-                                         !or error value: H5T_SGN_ERROR_F=-1
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-
-            INTERFACE
-              INTEGER FUNCTION h5tset_sign_c(type_id, sign)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TSET_SIGN_C'::h5tset_sign_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER, INTENT(IN) :: sign
-              END FUNCTION h5tset_sign_c
-            END INTERFACE
-
-            hdferr = h5tset_sign_c(type_id, sign)
-          END SUBROUTINE h5tset_sign_f
-
-!
-!****s* H5T/h5tget_fields_f
-!
-! NAME
-!  h5tget_fields_f
-!
-! PURPOSE
-!  Retrieves floating point datatype bit field information.
-!
-! INPUTS
-!  type_id 	 - datatype identifier
-! OUTPUTS
-!  spos 	 - sign bit-position
-!  epos 	 - exponent bit-position
-!  esize 	 - size of exponent in bits
-!  mpos 	 - mantissa position
-!  msize 	 - size of mantissa in bits
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 7, 2001
-! SOURCE
-  SUBROUTINE h5tget_fields_f(type_id, spos, epos, esize, mpos, msize, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER(SIZE_T), INTENT(OUT) :: spos   ! sign bit-position
-            INTEGER(SIZE_T), INTENT(OUT) :: epos   ! exponent bit-position
-            INTEGER(SIZE_T), INTENT(OUT) :: esize  ! size of exponent in bits
-            INTEGER(SIZE_T), INTENT(OUT) :: mpos   ! mantissa bit-position
-            INTEGER(SIZE_T), INTENT(OUT) :: msize  ! size of mantissa in bits
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-
-            INTERFACE
-              INTEGER FUNCTION h5tget_fields_c(type_id, spos, epos, esize, mpos, msize)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_FIELDS_C'::h5tget_fields_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER(SIZE_T), INTENT(OUT) :: spos
-              INTEGER(SIZE_T), INTENT(OUT) :: epos
-              INTEGER(SIZE_T), INTENT(OUT) :: esize
-              INTEGER(SIZE_T), INTENT(OUT) :: mpos
-              INTEGER(SIZE_T), INTENT(OUT) :: msize
-              END FUNCTION h5tget_fields_c
-            END INTERFACE
-
-            hdferr = h5tget_fields_c(type_id, spos, epos, esize, mpos, msize)
-          END SUBROUTINE h5tget_fields_f
-
-!
-!****s* H5T/h5tset_fields_f
-!
-! NAME
-!  h5tset_fields_f
-!
-! PURPOSE
-!  Sets locations and sizes of floating point bit fields.
-!
-! INPUTS
-!  type_id 	 - datatype identifier
-!  spos 	 - sign bit-position
-!  epos 	 - exponent bit-position
-!  esize 	 - size of exponent in bits
-!  mpos 	 - mantissa position
-!  msize 	 - size of mantissa in bits
-! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 7, 2001
-! SOURCE
-  SUBROUTINE h5tset_fields_f(type_id, spos, epos, esize, mpos, msize, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER(SIZE_T), INTENT(IN) :: spos   ! sign bit-position
-            INTEGER(SIZE_T), INTENT(IN) :: epos   ! exponent bit-position
-            INTEGER(SIZE_T), INTENT(IN) :: esize  ! size of exponent in bits
-            INTEGER(SIZE_T), INTENT(IN) :: mpos   ! mantissa bit-position
-            INTEGER(SIZE_T), INTENT(IN) :: msize  ! size of mantissa in bits
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-
-            INTERFACE
-              INTEGER FUNCTION h5tset_fields_c(type_id, spos, epos, esize, mpos, msize)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TSET_FIELDS_C'::h5tset_fields_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER(SIZE_T), INTENT(IN) :: spos
-              INTEGER(SIZE_T), INTENT(IN) :: epos
-              INTEGER(SIZE_T), INTENT(IN) :: esize
-              INTEGER(SIZE_T), INTENT(IN) :: mpos
-              INTEGER(SIZE_T), INTENT(IN) :: msize
-              END FUNCTION h5tset_fields_c
-            END INTERFACE
-
-            hdferr = h5tset_fields_c(type_id, spos, epos, esize, mpos, msize)
-          END SUBROUTINE h5tset_fields_f
-
-!
-!****s* H5T/h5tget_ebias_f
-!
-! NAME
-!  h5tget_ebias_f
-!
-! PURPOSE
-!  Retrieves the exponent bias of a floating-point type.
-!
-! INPUTS
-!  type_id 	 - datatype identifier
-! OUTPUTS
-!  ebias 	 - datatype exponent bias
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 7, 2001
-! SOURCE
-  SUBROUTINE h5tget_ebias_f(type_id, ebias, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER(SIZE_T), INTENT(OUT) :: ebias ! Datatype exponent bias of a floating-point type
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-
-            INTERFACE
-              INTEGER FUNCTION h5tget_ebias_c(type_id, ebias)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_EBIAS_C'::h5tget_ebias_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER(SIZE_T), INTENT(OUT) :: ebias
-              END FUNCTION h5tget_ebias_c
-            END INTERFACE
-
-            hdferr = h5tget_ebias_c(type_id, ebias)
-          END SUBROUTINE h5tget_ebias_f
-
-!
-!****s* H5T/h5tset_ebias_f
-!
-! NAME
-!  h5tset_ebias_f
-!
-! PURPOSE
-!  Sets the exponent bias of a floating-point type.
-!
-! INPUTS
-!  type_id 	 - datatype identifier
-!  ebias 	 - datatype exponent bias
-! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 7, 2001
-! SOURCE
-  SUBROUTINE h5tset_ebias_f(type_id, ebias, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER(SIZE_T), INTENT(IN) :: ebias !Datatype exponent bias of a floating-point type
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-
-            INTERFACE
-              INTEGER FUNCTION h5tset_ebias_c(type_id, ebias)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TSET_EBIAS_C'::h5tset_ebias_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER(SIZE_T), INTENT(IN) :: ebias
-              END FUNCTION h5tset_ebias_c
-            END INTERFACE
-
-            hdferr = h5tset_ebias_c(type_id, ebias)
-          END SUBROUTINE h5tset_ebias_f
-
-!
-!****s* H5T/h5tget_norm_f
-!
-! NAME
-!  h5tget_norm_f
-!
-! PURPOSE
-!  Retrieves mantissa normalization of a floating-point
-!  datatype.
-!
-! INPUTS
-!  type_id 	 - datatype identifier
-! OUTPUTS
-!  norm 	 - normalization types, valid values are:
-!                    H5T_NORM_IMPLIED_F(0)
-!                    H5T_NORM_MSBSET_F(1)
-!                    H5T_NORM_NONE_F(2)
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 7, 2001
-! SOURCE
-  SUBROUTINE h5tget_norm_f(type_id, norm, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER, INTENT(OUT) :: norm !mantissa normalization of a floating-point datatype
-                                         !Valid normalization types are:
-                                         !H5T_NORM_IMPLIED_F(0),MSB of mantissa is not
-                                         !stored, always 1,  H5T_NORM_MSBSET_F(1), MSB of
-                                         !mantissa is always 1, H5T_NORM_NONE_F(2)
-                                         !Mantissa is not normalize
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-
-            INTERFACE
-              INTEGER FUNCTION h5tget_norm_c(type_id, norm)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_NORM_C'::h5tget_norm_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER, INTENT(OUT) :: norm
-              END FUNCTION h5tget_norm_c
-            END INTERFACE
-
-            hdferr = h5tget_norm_c(type_id, norm)
-          END SUBROUTINE h5tget_norm_f
-
-!
-!****s* H5T/h5tset_norm_f
-!
-! NAME
-!  h5tset_norm_f
-!
-! PURPOSE
-!  Sets the mantissa normalization of a floating-point datatype.
-!
-! INPUTS
-!  type_id 	 - datatype identifier
-!  norm 	 - normalization types, valid values are:
-!                    H5T_NORM_IMPLIED_F(0)
-!                    H5T_NORM_MSBSET_F(1)
-!                    H5T_NORM_NONE_F(2)
-! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 7, 2001
-!
-! SOURCE
-  SUBROUTINE h5tset_norm_f(type_id, norm, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER, INTENT(IN) :: norm !mantissa normalization of a floating-point datatype
-                                         !Valid normalization types are:
-                                         !H5T_NORM_IMPLIED_F(0),MSB of mantissa is not
-                                         !stored, always 1,  H5T_NORM_MSBSET_F(1), MSB of
-                                         !mantissa is always 1, H5T_NORM_NONE_F(2)
-                                         !Mantissa is not normalize
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-            INTERFACE
-              INTEGER FUNCTION h5tset_norm_c(type_id, norm)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TSET_NORM_C'::h5tset_norm_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER, INTENT(IN) :: norm
-              END FUNCTION h5tset_norm_c
-            END INTERFACE
-
-            hdferr = h5tset_norm_c(type_id, norm)
-          END SUBROUTINE h5tset_norm_f
-
-!
-!****s* H5T/h5tget_inpad_f
-!
-! NAME
-!  h5tget_inpad_f
-!
-! PURPOSE
-!  Retrieves the internal padding type for unused bits
-!  in floating-point datatypes.
-!
-! INPUTS
-!  type_id 	 - datatype identifier
-! OUTPUTS
-!  padtype 	 - padding type for unused bits
-!                  Possible values of padding type are:
-!                    H5T_PAD_ZERO_F = 0
-!                    H5T_PAD_ONE_F = 1
-!                    H5T_PAD_BACKGROUND_F = 2
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 7, 2001
-! SOURCE
-  SUBROUTINE h5tget_inpad_f(type_id, padtype, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER, INTENT(OUT) :: padtype ! padding type for unused bits
-                                            ! in floating-point datatypes.
-                                            ! Possible values of padding type are:
-                                            ! H5T__PAD_ZERO_F = 0
-                                            ! H5T__PAD_ONE_F = 1
-                                            ! H5T__PAD_BACKGROUND_F = 2
-
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-            INTERFACE
-              INTEGER FUNCTION h5tget_inpad_c(type_id, padtype)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_INPAD_C'::h5tget_inpad_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER, INTENT(OUT) :: padtype
-              END FUNCTION h5tget_inpad_c
-            END INTERFACE
-
-            hdferr = h5tget_inpad_c(type_id, padtype)
-          END SUBROUTINE h5tget_inpad_f
-
-!
-!****s* H5T/h5tset_inpad_f
-!
-! NAME
-!  h5tset_inpad_f
-!
-! PURPOSE
-!  Fills unused internal floating point bits.
-!
-! INPUTS
-!  type_id 	 - datatype identifier
-!  padtype 	 - padding type for unused bits
-!                  Possible values of padding type are:
-!                    H5T_PAD_ZERO_F = 0
-!                    H5T_PAD_ONE_F = 1
-!                    H5T_PAD_BACKGROUND_F = 2
-! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 7, 2001
-! SOURCE
-  SUBROUTINE h5tset_inpad_f(type_id, padtype, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER, INTENT(IN) :: padtype ! padding type for unused bits
-                                           ! in floating-point datatypes.
-                                           ! Possible values of padding type are:
-                                           ! H5T__PAD_ZERO_F = 0
-                                           ! H5T__PAD_ONE_F = 1
-                                           ! H5T__PAD_BACKGROUND_F = 2
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-            INTERFACE
-              INTEGER FUNCTION h5tset_inpad_c(type_id, padtype)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TSET_INPAD_C'::h5tset_inpad_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER, INTENT(IN) :: padtype
-              END FUNCTION h5tset_inpad_c
-            END INTERFACE
-
-            hdferr = h5tset_inpad_c(type_id, padtype)
-          END SUBROUTINE h5tset_inpad_f
-
-!
-!****s* H5T/h5tget_cset_f
-!
-! NAME
-!  h5tget_cset_f
-!
-! PURPOSE
-!  Retrieves the character set type of a string datatype.
-!
-! INPUTS
-!  type_id  - Datatype identifier
-! OUTPUTS
-!  cset     - Character set type of a string datatype
-!              Possible values are:
-!              H5T_CSET_ASCII_F = 0
-!              H5T_CSET_UTF8_F
-!  hdferr   - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 7, 2001
-! SOURCE
-  SUBROUTINE h5tget_cset_f(type_id, cset, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER, INTENT(OUT) :: cset   ! character set type of a string datatype
-                                           !  Possible values are:
-                                           !  H5T_CSET_ASCII_F = 0
-                                           !  H5T_CSET_UTF8_F
-            INTEGER, INTENT(OUT) :: hdferr ! Error code
-!*****
-            INTERFACE
-              INTEGER FUNCTION h5tget_cset_c(type_id, cset)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_CSET_C'::h5tget_cset_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER, INTENT(OUT) :: cset
-              END FUNCTION h5tget_cset_c
-            END INTERFACE
-
-            hdferr = h5tget_cset_c(type_id, cset)
-          END SUBROUTINE h5tget_cset_f
-
-!
-!****s* H5T/h5tset_cset_f
-!
-! NAME
-!  h5tset_cset_f
-!
-! PURPOSE
-!  Sets character set to be used.
-!
-! INPUTS
-!  type_id 	 - datatype identifier
-!  cset 	 - character set type of a string datatype
-!                    Possible values are:
-!                     H5T_CSET_ASCII_F = 0
-!                     H5T_CSET_UTF8_F
-! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 7, 2001
-! SOURCE
-  SUBROUTINE h5tset_cset_f(type_id, cset, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER, INTENT(IN) :: cset !character set type of a string datatype
-                                           ! Possible values of padding type are:
-                                           ! H5T_CSET_ASCII_F = 0
-                                           ! H5T_CSET_UTF8_F
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-            INTERFACE
-              INTEGER FUNCTION h5tset_cset_c(type_id, cset)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TSET_CSET_C'::h5tset_cset_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER, INTENT(IN) :: cset
-              END FUNCTION h5tset_cset_c
-            END INTERFACE
-
-            hdferr = h5tset_cset_c(type_id, cset)
-          END SUBROUTINE h5tset_cset_f
-
-!
-!****s* H5T/h5tget_strpad_f
-!
-! NAME
-!  h5tget_strpad_f
-!
-! PURPOSE
-!  Retrieves the storage mechanism for a string datatype.
-!
-! INPUTS
-!  type_id 	 - datatype identifier
-! OUTPUTS
-!  strpad 	 - storage method for a string datatype
-!                  Possible values are:
-!                    H5T_STR_NULLTERM_F,
-!                    H5T_STR_NULLPAD_F,
-!                    H5T_STR_SPACEPAD_F
-!                    H5T_STR_ERROR_F
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 7, 2001
-! SOURCE
-  SUBROUTINE h5tget_strpad_f(type_id, strpad, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER, INTENT(OUT) :: strpad
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-            INTERFACE
-              INTEGER FUNCTION h5tget_strpad_c(type_id, strpad)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_STRPAD_C'::h5tget_strpad_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER, INTENT(OUT) :: strpad
-              END FUNCTION h5tget_strpad_c
-            END INTERFACE
-
-            hdferr = h5tget_strpad_c(type_id, strpad)
-          END SUBROUTINE h5tget_strpad_f
-
-!
-!****s* H5T/h5tset_strpad_f
-!
-! NAME
-!  h5tset_strpad_f
-!
-! PURPOSE
-!  Defines the storage mechanism for character strings.
-!
-! INPUTS
-!  type_id 	 - datatype identifier
-!  strpad 	 - storage method for a string datatype
-!                  Possible values are:
-!                    H5T_STR_NULLTERM_F,
-!                    H5T_STR_NULLPAD_F,
-!                    H5T_STR_SPACEPAD_F
-!                    H5T_STR_ERROR_F
-! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 7, 2001
-! SOURCE
-  SUBROUTINE h5tset_strpad_f(type_id, strpad, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER, INTENT(IN) :: strpad ! string padding method for a string datatype
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-            INTERFACE
-              INTEGER FUNCTION h5tset_strpad_c(type_id, strpad)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TSET_STRPAD_C'::h5tset_strpad_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER, INTENT(IN) :: strpad
-              END FUNCTION h5tset_strpad_c
-            END INTERFACE
-
-            hdferr = h5tset_strpad_c(type_id, strpad)
-          END SUBROUTINE h5tset_strpad_f
-
-!
-!****s* H5T/h5tget_nmembers_f
-!
-! NAME
-!  h5tget_nmembers_f
-!
-! PURPOSE
-!  Retrieves the number of fields in a compound datatype.
-!
-! INPUTS
-!  type_id 	 - datatype identifier
-! OUTPUTS
-!  num_members 	 - number of members
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 7, 2001
-!
-! SOURCE
-  SUBROUTINE h5tget_nmembers_f(type_id, num_members, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER, INTENT(OUT) :: num_members !number of fields in a compound datatype
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-
-            INTERFACE
-              INTEGER FUNCTION h5tget_nmembers_c(type_id, num_members)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_NMEMBERS_C'::h5tget_nmembers_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER, INTENT(OUT) :: num_members
-              END FUNCTION h5tget_nmembers_c
-            END INTERFACE
-
-            hdferr = h5tget_nmembers_c(type_id, num_members)
-          END SUBROUTINE h5tget_nmembers_f
-
-!
-!****s* H5T/h5tget_member_name_f
-!
-! NAME
-!  h5tget_member_name_f
-!
-! PURPOSE
-!  Retrieves the name of a field of a compound datatype.
-!
-! INPUTS
-!  type_id 	 - datatype identifier
-!  index 	 - filed index (0-based)
-! OUTPUTS
-!  member_name 	 - buffer to hold member's name
-!  namelen 	 - name length
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 7, 2001
-! SOURCE
-  SUBROUTINE h5tget_member_name_f(type_id, index, member_name,  namelen, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER, INTENT(IN) :: index !Field index (0-based) of the field name to retrieve
-            CHARACTER(LEN=*), INTENT(OUT) :: member_name !name of a field of
-                                                         !a compound datatype
-            INTEGER, INTENT(OUT) :: namelen ! Length of the name
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-            INTERFACE
-              INTEGER FUNCTION h5tget_member_name_c(type_id, index, member_name, namelen)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_MEMBER_NAME_C'::h5tget_member_name_c
-              !DEC$ENDIF
-              !DEC$ATTRIBUTES reference :: member_name
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER, INTENT(IN) :: index
-              CHARACTER(LEN=*), INTENT(OUT) :: member_name
-              INTEGER, INTENT(OUT) :: namelen
-              END FUNCTION
-            END INTERFACE
-
-            hdferr = h5tget_member_name_c(type_id, index, member_name, namelen)
-          END SUBROUTINE h5tget_member_name_f
-
-!
-!****s* H5T/h5tget_member_offset_f
-!
-! NAME
-!  h5tget_member_offset_f
-!
-! PURPOSE
-!  Retrieves the offset of a field of a compound datatype.
-!
-! INPUTS
-!  type_id 	 - datatype identifier
-!  member_no 	 - number of the field
-! OUTPUTS
-!  offset 	 - byte offset of the requested field
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 7, 2001
-! SOURCE
-  SUBROUTINE h5tget_member_offset_f(type_id, member_no, offset, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER, INTENT(IN) :: member_no !Number of the field
-                                                       !whose offset is requested
-            INTEGER(SIZE_T), INTENT(OUT) :: offset !byte offset of the beginning of the field
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-            INTERFACE
-              INTEGER FUNCTION h5tget_member_offset_c(type_id, member_no, offset )
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_MEMBER_OFFSET_C'::h5tget_member_offset_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER, INTENT(IN) :: member_no
-              INTEGER(SIZE_T), INTENT(OUT) :: offset
-              END FUNCTION h5tget_member_offset_c
-            END INTERFACE
-
-            hdferr = h5tget_member_offset_c(type_id, member_no, offset )
-          END SUBROUTINE h5tget_member_offset_f
-!
-!****s* H5T/h5tget_member_index_f
-!
-! NAME
-!  h5tget_member_index_f
-!
-! PURPOSE
-!  Retrieves the index of a compound or enumeration datatype member.
-!
-! INPUTS
-!  type_id 	 - datatype identifier
-!  name 	 - name of the field or member whose index to
-!  to be retrieved from the datatype.
-! OUTPUTS
-!  index 	 - 0-based index of the filed or member (0 to N-1)
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  September 26, 2002
-!
-! SOURCE
-  SUBROUTINE h5tget_member_index_f(type_id, name, index, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id  ! Datatype identifier
-            CHARACTER(LEN=*), INTENT(IN) :: name   ! Field or member name
-            INTEGER, INTENT(OUT) :: index          ! Field or member index
-            INTEGER, INTENT(OUT) :: hdferr          ! Error code
-!*****
-            INTEGER :: namelen          ! Name length
-
-            INTERFACE
-              INTEGER FUNCTION h5tget_member_index_c(type_id, name, namelen, index)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_MEMBER_INDEX_C'::h5tget_member_index_c
-              !DEC$ENDIF
-              !DEC$ATTRIBUTES reference ::name
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              CHARACTER(LEN=*), INTENT(IN) :: name
-              INTEGER, INTENT(IN)  :: namelen
-              INTEGER, INTENT(OUT) :: index
-              END FUNCTION h5tget_member_index_c
-            END INTERFACE
-
-            namelen = LEN(name)
-            hdferr = h5tget_member_index_c(type_id, name, namelen, index)
-          END SUBROUTINE h5tget_member_index_f
-
-
-!  !$!
-!  !$!****s* H5T/h5tget_member_dim_f
-!  !$!
-!  !$! NAME
-!  !$!		h5tget_member_dim_f
-!  !$!
-!  !$! PURPOSE
-!  !$! 	This function is not supported in hdf5-1.4.*
-!  !$!
-!  !$! INPUTS
-!  !$! OUTPUTS
-!  !$!		hdferr:		- error code
-!  !$!				 	Success:  0
-!  !$!				 	Failure: -1
-!  !$!
-!  !$! AUTHOR
-!  !$!	Elena Pourmal
-!  !$!		August 12, 1999
-!  !$!
-!  !$! HISTORY
-!  !$! 	Explicit Fortran interfaces were added for
-!  !$!			called C functions (it is needed for Windows
-!  !$!			port).  March 7, 2001
-!  !$!
-!  !$! SOURCE
-!  !$!  SUBROUTINE h5tget_member_dims_f(type_id, field_idx,dims, field_dims, perm, hdferr)
-!  !$!
-!  !$!            IMPLICIT NONE
-!  !$!            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-!  !$!            INTEGER, INTENT(IN) :: field_idx !Field index (0-based) of
-!  !$!                                             !field_dims, perm)
-!  !$!            INTEGER, INTENT(OUT) :: dims     !number of dimensions of the field
-!  !$!
-!  !$!            INTEGER(SIZE_T),DIMENSION(*), INTENT(OUT) ::  field_dims !buffer to store the
-!  !$!                                                                      !dimensions of the field
-!  !$!            INTEGER, DIMENSION(*), INTENT(OUT)  ::  perm  !buffer to store the
-!  !$!                                                                   !permutation vector of the field
-!  !$!            INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!  !$!*****!
-!  !$! INTEGER, EXTERNAL :: h5tget_member_dims_c
-!  !$!            hdferr = h5tget_member_dims_c(type_id, field_idx, dims, field_dims, perm)
-!  !$!
-!  !$!          END SUBROUTINE h5tget_member_dims_f
-
-
-!****s* H5T/h5tget_array_dims_f
-!
-! NAME
-!  h5tget_array_dims_f
-!
-! PURPOSE
-!  Returns sizes of array dimensions.
-!
-! INPUTS
-!  type_id 	 - array datatype identifier
-! OUTPUTS
-!  dims 	 - buffer to store array datatype dimensions
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 7, 2001
-! SOURCE
-  SUBROUTINE h5tget_array_dims_f(type_id, dims, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Array datatype identifier
-            INTEGER(HSIZE_T),DIMENSION(*), INTENT(OUT) ::  dims !buffer to store array datatype
-                                                                ! dimensions
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-
-            INTERFACE
-              INTEGER FUNCTION h5tget_array_dims_c(type_id, dims)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_ARRAY_DIMS_C'::h5tget_array_dims_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER(HSIZE_T),DIMENSION(*), INTENT(OUT) ::  dims
-              END FUNCTION h5tget_array_dims_c
-            END INTERFACE
-
-            hdferr = h5tget_array_dims_c(type_id, dims)
-
-          END SUBROUTINE h5tget_array_dims_f
-
-!
-!****s* H5T/h5tget_array_ndims_f
-!
-! NAME
-!  h5tget_array_ndims_f
-!
-! PURPOSE
-!  Returns the rank of an array datatype.
-!
-! INPUTS
-!  type_id 	 - array datatype identifier
-! OUTPUTS
-!  ndims 	 - number of array dimensions
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 7, 2001
-! SOURCE
-  SUBROUTINE h5tget_array_ndims_f(type_id, ndims, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Array datatype identifier
-            INTEGER, INTENT(OUT) ::  ndims ! number of array dimensions
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-            INTERFACE
-              INTEGER FUNCTION h5tget_array_ndims_c(type_id, ndims)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_ARRAY_NDIMS_C'::h5tget_array_ndims_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER, INTENT(OUT) ::  ndims
-              END FUNCTION h5tget_array_ndims_c
-            END INTERFACE
-
-            hdferr = h5tget_array_ndims_c(type_id, ndims)
-
-          END SUBROUTINE h5tget_array_ndims_f
-
-!
-!****s* H5T/h5tget_super_f
-!
-! NAME
-!  h5tget_super_f
-!
-! PURPOSE
-!  Returns the base datatype from which a datatype is derived.
-!
-! INPUTS
-!  type_id 	 - datatype identifier
-! OUTPUTS
-!  base_type_id 	 - identifier of the base type
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 7, 2001
-! SOURCE
-  SUBROUTINE h5tget_super_f(type_id, base_type_id, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! datatype identifier
-            INTEGER(HID_T), INTENT(OUT) :: base_type_id ! identifier of the datatype
-                                           ! from which datatype (type_id) was derived
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-            INTERFACE
-              INTEGER FUNCTION h5tget_super_c(type_id, base_type_id)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_SUPER_C'::h5tget_super_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER(HID_T), INTENT(OUT) :: base_type_id
-              END FUNCTION h5tget_super_c
-            END INTERFACE
-
-            hdferr = h5tget_super_c(type_id, base_type_id)
-
-          END SUBROUTINE h5tget_super_f
-
-!
-!****s* H5T/h5tget_member_type_f
-!
-! NAME
-!  h5tget_member_type_f
-!
-! PURPOSE
-!  Returns the datatype of the specified member.
-!
-! INPUTS
-!  type_id 	 - compound datatype identifier
-!  field_idx 	 - field index (0-based)
-!
-! OUTPUTS
-!  datatype 	 - idnetifier of the member's datatype
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 7, 2001
-! SOURCE
-  SUBROUTINE h5tget_member_type_f(type_id,  field_idx, datatype, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER, INTENT(IN) :: field_idx !Field index (0-based) of the field type to retrieve
-            INTEGER(HID_T), INTENT(OUT) :: datatype !identifier of a copy of
-                                                    !the datatype of the field
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-            INTERFACE
-              INTEGER FUNCTION h5tget_member_type_c(type_id, field_idx , datatype)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_MEMBER_TYPE_C'::h5tget_member_type_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER, INTENT(IN) :: field_idx
-              INTEGER(HID_T), INTENT(OUT) :: datatype
-              END FUNCTION h5tget_member_type_c
-            END INTERFACE
-
-            hdferr = h5tget_member_type_c(type_id, field_idx , datatype)
-          END SUBROUTINE h5tget_member_type_f
-
-!
-!****s* H5T/h5tcreate_f
-!
-! NAME
-!  h5tcreate_f
-!
-! PURPOSE
-!  Creates a new datatype.
-!
-! INPUTS
-!  class   - Datatype class can be one of:
-!             H5T_COMPOUND_F
-!             H5T_ENUM_F
-!             H5T_OPAQUE_F
-!             H5T_STRING_F
-!
-!  size    - Size of the datatype.
-! OUTPUTS
-!  type_id - Datatype identifier.
-!  hdferr  - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 7, 2001
-! SOURCE
-  SUBROUTINE h5tcreate_f(class, size, type_id, hdferr)
-    IMPLICIT NONE
-    INTEGER        , INTENT(IN)  :: class
-    INTEGER(SIZE_T), INTENT(IN)  :: size
-    INTEGER(HID_T) , INTENT(OUT) :: type_id
-    INTEGER        , INTENT(OUT) :: hdferr
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5tcreate_c(class, size, type_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TCREATE_C'::h5tcreate_c
-         !DEC$ENDIF
-         INTEGER, INTENT(IN) :: class
-         INTEGER(SIZE_T), INTENT(IN) :: size
-         INTEGER(HID_T), INTENT(OUT) :: type_id
-       END FUNCTION h5tcreate_c
-    END INTERFACE
-
-    hdferr = h5tcreate_c(class, size, type_id)
-  END SUBROUTINE h5tcreate_f
-
-!
-!****s* H5T/h5tinsert_f
-!
-! NAME
-!  h5tinsert_f
-!
-! PURPOSE
-!  Adds a new member to a compound datatype.
-!
-! INPUTS
-!  type_id 	 - compound dattype identifier
-!  name 	 - name of the field to insert
-!  offset 	 - start of the member in an instance of
-!                  the compound datatype
-!  field_id 	 - datatype identifier of the field to insert
-! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 7, 2001
-! SOURCE
-  SUBROUTINE h5tinsert_f(type_id,  name, offset, field_id, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            CHARACTER(LEN=*), INTENT(IN) :: name !Name of the field to insert
-            INTEGER(SIZE_T), INTENT(IN) :: offset !start of the member in an instance of
-                                                   !the compound datatype
-            INTEGER(HID_T), INTENT(IN) :: field_id !datatype identifier of the new member
-
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-            INTEGER :: namelen
-
-            INTERFACE
-              INTEGER FUNCTION h5tinsert_c(type_id, name, namelen, offset, field_id)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TINSERT_C'::h5tinsert_c
-              !DEC$ENDIF
-              !DEC$ATTRIBUTES reference :: name
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              CHARACTER(LEN=*), INTENT(IN) :: name
-              INTEGER(SIZE_T), INTENT(IN) :: offset
-              INTEGER(HID_T), INTENT(IN) :: field_id
-              INTEGER :: namelen
-              END FUNCTION h5tinsert_c
-            END INTERFACE
-
-            namelen = LEN(name)
-            hdferr = h5tinsert_c(type_id, name, namelen, offset, field_id )
-          END SUBROUTINE h5tinsert_f
-
-!
-!****s* H5T/h5tpack_f
-!
-! NAME
-!  h5tpack_f
-!
-! PURPOSE
-!  Recursively removes padding from within a compound datatype.
-!
-! INPUTS
-!  type_id 	 - compound datatype identifier
-! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 7, 2001
-! SOURCE
-  SUBROUTINE h5tpack_f(type_id, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-
-            INTERFACE
-              INTEGER FUNCTION h5tpack_c(type_id)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TPACK_C'::h5tpack_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              END FUNCTION h5tpack_c
-            END INTERFACE
-
-            hdferr = h5tpack_c(type_id)
-          END SUBROUTINE h5tpack_f
-
-!  !$!
-!  !$!****s* H5T/h5tinsert_array_f
-!  !$!
-!  !$! NAME
-!  !$!		h5tinsert_array_f
-!  !$!
-!  !$! PURPOSE
-!  !$! 	This function is not available on hdf5-1.4.*
-!  !$!
-!  !$! INPUTS
-!  !$! OUTPUTS
-!  !$!		hdferr:		- error code
-!  !$!				 	Success:  0
-!  !$!				 	Failure: -1
-!  !$!
-!  !$! AUTHOR
-!  !$!	Elena Pourmal
-!  !$!		August 12, 1999
-!  !$!
-!  !$! HISTORY
-!  !$! 	Explicit Fortran interfaces were added for
-!  !$!			called C functions (it is needed for Windows
-!  !$!			port).  March 7, 2001
-!  !$! SOURCE
-!  SUBROUTINE h5tinsert_array_f(parent_id,name,offset, ndims, dims, member_id, hdferr, perm)
-!  IMPLICIT NONE
-!  INTEGER(HID_T), INTENT(IN) :: parent_id ! identifier of the parent compound datatype
-!  CHARACTER(LEN=*), INTENT(IN) :: name !Name of the new member
-!  INTEGER(SIZE_T), INTENT(IN) :: offset !Offset to start of new member
-!  !within compound datatype
-!  INTEGER, INTENT(IN) ::  ndims !Dimensionality of new member.
-!  !Valid values are 0 (zero) through 4 (four)
-!  INTEGER(SIZE_T), DIMENSION(*), INTENT(IN) :: dims !Size of new member array
-!  INTEGER(HID_T), INTENT(IN) :: member_id ! identifier of the datatype of the new member
-!  INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!  !*****!
-!  INTEGER, DIMENSION(*), OPTIONAL, INTENT(IN) :: perm
-!  !Pointer to buffer to store
-!  !the permutation vector of the field
-!  INTEGER :: namelen, sizeofperm
-!  INTEGER, EXTERNAL :: h5tinsert_array_c,  h5tinsert_array_c2
-!  namelen = LEN(name)
-!  if (present(perm)) then
-!  hdferr = h5tinsert_array_c(parent_id, name, namelen, offset, ndims,dims, member_id, perm)
-!  else
-!  hdferr = h5tinsert_array_c2(parent_id, name, namelen, offset, ndims,dims, member_id)
-!  end if
-!
-!  END SUBROUTINE h5tinsert_array_f
-
-!
-!****s* H5T/h5tarray_create_f
-!
-! NAME
-!  h5tarray_create_f
-!
-! PURPOSE
-!  Creates an array datatype object.
-!
-! INPUTS
-!  base_id 	 - datatype identifier for the array
-!                  base datatype
-!  rank 	 - rank of the array
-!  dims 	 - array dimension sizes
-! OUTPUTS
-!  type_id 	 - array datatype identifier
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 7, 2001
-! SOURCE
-  SUBROUTINE h5tarray_create_f(base_id, rank, dims, type_id, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: base_id ! identifier of array base datatype
-            INTEGER, INTENT(IN) ::  rank ! Rank of the array
-            INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: dims !Sizes of each array dimension
-            INTEGER(HID_T), INTENT(OUT) :: type_id ! identifier of the array datatype
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-            INTERFACE
-              INTEGER FUNCTION h5tarray_create_c(base_id, rank, dims, type_id)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TARRAY_CREATE_C'::h5tarray_create_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: base_id
-              INTEGER, INTENT(IN) ::  rank
-              INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: dims
-              INTEGER(HID_T), INTENT(OUT) :: type_id
-              END FUNCTION h5tarray_create_c
-            END INTERFACE
-
-            hdferr = h5tarray_create_c(base_id, rank, dims, type_id)
-
-         END SUBROUTINE h5tarray_create_f
-
-!
-!****s* H5T/h5tenum_create_f
-!
-! NAME
-!  h5tenum_create_f
-!
-! PURPOSE
-!  Creates a new enumeration datatype.
-!
-! INPUTS
-!  parent_id 	 - datatype identifier for base datatype
-! OUTPUTS
-!  new_type_id 	 - datatype identifier for the enumeration datatype
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 7, 2001
-! SOURCE
-  SUBROUTINE h5tenum_create_f(parent_id, new_type_id, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: parent_id  ! Datatype identifier for
-                                                     ! the  base datatype
-            INTEGER(HID_T), INTENT(OUT) :: new_type_id
-                                                     !datatype identifier for the
-                                                     ! new enumeration datatype
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-
-            INTERFACE
-              INTEGER FUNCTION h5tenum_create_c(parent_id, new_type_id)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TENUM_CREATE_C'::h5tenum_create_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: parent_id
-              INTEGER(HID_T), INTENT(OUT) :: new_type_id
-              END FUNCTION h5tenum_create_c
-            END INTERFACE
-
-            hdferr = h5tenum_create_c(parent_id, new_type_id)
-          END SUBROUTINE h5tenum_create_f
-!
-!****s* H5T/h5tenum_nameof_f
-!
-! NAME
-!  h5tenum_nameof_f
-!
-! PURPOSE
-!  Returns the symbol name corresponding to a specified
-!  member of an enumeration datatype.
-!
-! INPUTS
-!  type_id 	 - datatype identifier
-!  value 	 - value of the enumeration datatype
-!  namelen 	 - name buffer size
-! OUTPUTS
-!  name 	 - buffer to hold symbol name
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 7, 2001
-!
-! NOTE
-!   According to the standard: Because an INTENT(OUT) variable is considered undefined 
-!   on entry to the procedure, any default initialization specified for its type will 
-!   be applied. So we need to blank out the "name" to be portable and eliminate any 
-!   characters the "name' may contain upon entry, depending on compiler implementation.
-! SOURCE
-  SUBROUTINE h5tenum_nameof_f(type_id,  value, namelen, name, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            CHARACTER(LEN=*), INTENT(OUT) :: name  !Name of the  enumeration datatype.
-            INTEGER(SIZE_T), INTENT(IN) :: namelen !length of the name
-            INTEGER, INTENT(IN) :: value !value of the  enumeration datatype.
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-
-            INTERFACE
-              INTEGER FUNCTION h5tenum_nameof_c(type_id, value, name, namelen)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TENUM_NAMEOF_C'::h5tenum_nameof_c
-              !DEC$ENDIF
-              !DEC$ATTRIBUTES reference :: name
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              CHARACTER(LEN=*), INTENT(OUT) :: name
-              INTEGER(SIZE_T), INTENT(IN) :: namelen
-              INTEGER, INTENT(IN) :: value
-              END FUNCTION h5tenum_nameof_c
-            END INTERFACE
-
-            name(1:LEN(name)) = ' '
-
-            hdferr = h5tenum_nameof_c(type_id, value, name, namelen)
-          END SUBROUTINE h5tenum_nameof_f
-
-!
-!****s* H5T/h5tenum_valuof_f
-!
-! NAME
-!  h5tenum_valuof_f
-!
-! PURPOSE
-!  Returns the value corresponding to a specified
-!  member of an enumeration datatype.
-!
-! INPUTS
-!  type_id 	 - datatype identifier
-!  name 	 - symbol name
-! OUTPUTS
-!  value 	 - value of the enumeration datatype
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 7, 2001
-!
-! SOURCE
-  SUBROUTINE h5tenum_valueof_f(type_id,  name, value, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            CHARACTER(LEN=*), INTENT(IN) :: name  !Name of the  enumeration datatype.
-            INTEGER, INTENT(OUT) :: value !value of the  enumeration datatype.
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-            INTEGER :: namelen
-
-            INTERFACE
-              INTEGER FUNCTION h5tenum_valueof_c(type_id, name, namelen,  value)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TENUM_VALUEOF_C'::h5tenum_valueof_c
-              !DEC$ENDIF
-              !DEC$ATTRIBUTES reference :: name
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              CHARACTER(LEN=*), INTENT(IN) :: name
-              INTEGER, INTENT(IN) :: namelen
-              INTEGER, INTENT(OUT) :: value
-              END FUNCTION h5tenum_valueof_c
-            END INTERFACE
-
-            namelen = LEN(name)
-            hdferr = h5tenum_valueof_c(type_id, name, namelen,  value)
-          END SUBROUTINE h5tenum_valueof_f
-
-!
-!****s* H5T/h5tget_member_value_f
-!
-! NAME
-!  h5tget_member_value_f
-!
-! PURPOSE
-!  Returns the value of an enumeration datatype member.
-!
-! INPUTS
-!  type_id 	 - datatype identifier
-!  member_no 	 - number of the enumeration datatype member
-! OUTPUTS
-!  value 	 - value of the enumeration datatype
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 7, 2001
-! SOURCE
-  SUBROUTINE h5tget_member_value_f(type_id,  member_no, value, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER, INTENT(IN) :: member_no !Number of the enumeration datatype member
-            INTEGER, INTENT(OUT) :: value !value of the  enumeration datatype.
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-
-            INTERFACE
-              INTEGER FUNCTION h5tget_member_value_c(type_id, member_no, value)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_MEMBER_VALUE_C'::h5tget_member_value_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER, INTENT(IN) :: member_no
-              INTEGER, INTENT(OUT) :: value
-              END FUNCTION
-            END INTERFACE
-
-            hdferr = h5tget_member_value_c(type_id, member_no, value)
-          END SUBROUTINE h5tget_member_value_f
-
-!
-!****s* H5T/h5tset_tag_f
-!
-! NAME
-!  h5tset_tag_f
-!
-! PURPOSE
-!  Tags an opaque datatype.
-!
-! INPUTS
-!  type_id 	 - identifier for opaque datatype
-!  tag 	         - unique ASCII string with which the opaque
-!                  datatype is to be tagged.
-! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 7, 2001
-! SOURCE
-  SUBROUTINE h5tset_tag_f(type_id, tag, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            CHARACTER(LEN=*), INTENT(IN) :: tag !Unique ASCII string with which
-                                                !the opaque datatype is to be tagged
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-            INTEGER :: taglen
-
-            INTERFACE
-              INTEGER FUNCTION h5tset_tag_c(type_id, tag, taglen)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TSET_TAG_C'::h5tset_tag_c
-              !DEC$ENDIF
-              !DEC$ATTRIBUTES reference :: tag
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              CHARACTER(LEN=*), INTENT(IN) :: tag
-              INTEGER :: taglen
-              END FUNCTION h5tset_tag_c
-            END INTERFACE
-
-            taglen = LEN(tag)
-            hdferr = h5tset_tag_c(type_id, tag, taglen)
-          END SUBROUTINE h5tset_tag_f
-
-!
-!****s* H5T/h5tget_tag_f
-!
-! NAME
-!  h5tget_tag_f
-!
-! PURPOSE
-!  Gets the tag associated with an opaque datatype.
-!
-! INPUTS
-!  type_id 	 - identifier for opaque datatype
-! OUTPUTS
-!  tag 	         - unique ASCII string associated with opaque
-!                  datatype
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 7, 2001
-! SOURCE
-  SUBROUTINE h5tget_tag_f(type_id, tag,taglen, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            CHARACTER(LEN=*), INTENT(OUT) :: tag  ! Unique ASCII string with which
-                                                  !  the opaque datatype is to be tagged
-            INTEGER, INTENT(OUT) :: taglen        ! Length of tag
-            INTEGER(SIZE_T)      :: tag_size      ! Declared character length of tab 
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-            INTERFACE
-              INTEGER FUNCTION h5tget_tag_c(type_id, tag, tag_size, taglen)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_TAG_C'::h5tget_tag_c
-              !DEC$ENDIF
-              !DEC$ATTRIBUTES reference :: tag
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              CHARACTER(LEN=*), INTENT(OUT) :: tag
-              INTEGER(SIZE_T), INTENT(IN) :: tag_size
-              INTEGER, INTENT(OUT) :: taglen
-              END FUNCTION h5tget_tag_c
-            END INTERFACE
-
-            tag_size = LEN(tag)
-
-            hdferr = h5tget_tag_c(type_id, tag, tag_size, taglen )
-          END SUBROUTINE h5tget_tag_f
-
-!
-!****s* H5T/h5tvlen_create_f
-!
-! NAME
-!  h5tvlen_create_f
-!
-! PURPOSE
-!  Creates a new variable-length datatype.
-!
-! INPUTS
-!  type_id 	 - identifier iof base datatype
-! OUTPUTS
-!  vltype_id 	 - identifier for VL datatype
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  Wednesday, October 23, 2002
-!
-! NOTES
-!  Only basic Fortran base datatypes are supported
-!
-! SOURCE
-  SUBROUTINE h5tvlen_create_f(type_id, vltype_id, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN)  :: type_id    ! Datatype identifier
-            INTEGER(HID_T), INTENT(OUT) :: vltype_id  ! VL datatype identifier
-            INTEGER, INTENT(OUT) :: hdferr            ! Error code
-!*****
-            INTERFACE
-              INTEGER FUNCTION h5tvlen_create_c(type_id, vltype_id)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TVLEN_CREATE_C'::h5tvlen_create_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN)  :: type_id
-              INTEGER(HID_T), INTENT(OUT) :: vltype_id
-              END FUNCTION h5tvlen_create_c
-            END INTERFACE
-
-            hdferr = h5tvlen_create_c(type_id, vltype_id)
-          END SUBROUTINE h5tvlen_create_f
-
-!
-!****s* H5T/h5tis_variable_str_f
-!
-! NAME
-!  h5tis_variable_str_f
-!
-! PURPOSE
-!  Determines whether a dattype is a variable string.
-!
-! INPUTS
-!  type_id 	 - datartpe identifier
-! OUTPUTS
-!  status 	 - flag to indicate if datatype
-!                  is a variable string
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  March 12, 2003
-!
-! SOURCE
-  SUBROUTINE h5tis_variable_str_f(type_id, status, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id  ! Datatype identifier
-            LOGICAL, INTENT(OUT) :: status      ! Flag, idicates if datatype
-                                                ! is a variable string or not ( TRUE or
-                                                ! FALSE)
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code
-!*****
-            INTEGER :: flag                     ! "TRUE/FALSE/ERROR from C"
-
-            INTERFACE
-              INTEGER FUNCTION h5tis_variable_str_c(type_id, flag)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TIS_VARIABLE_STR_C'::h5tis_variable_str_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER :: flag
-              END FUNCTION h5tis_variable_str_c
-            END INTERFACE
-
-            hdferr = h5tis_variable_str_c(type_id, flag)
-            status = .TRUE.
-            if (flag .EQ. 0) status = .FALSE.
-
-          END SUBROUTINE h5tis_variable_str_f
-
-!
-!****s* H5T/h5tget_member_class_f
-!
-! NAME
-!  h5tget_member_class_f
-!
-! PURPOSE
-!  Returns datatype class of compound datatype member.
-!
-! INPUTS
-!  type_id 	 - datartpe identifier
-!  member_no 	 - index of compound datatype member
-! OUTPUTS
-!  class 	 - class type for compound dadtype member
-!                  Valid classes:
-!                    H5T_NO_CLASS_F (error)
-!                    H5T_INTEGER_F
-!                    H5T_FLOAT_F
-!                    H5T_TIME_F
-!                    H5T_STRING_F
-!                    H5T_BITFIELD_F
-!                    H5T_OPAQUE_F
-!                    H5T_COMPOUND_F
-!                    H5T_REFERENCE_F
-!                    H5T_ENUM_F
-!                    H5T_VLEN_F
-!                    H5T_ARRAY_F
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  April 6, 2005
-!
-! SOURCE
-  SUBROUTINE h5tget_member_class_f(type_id, member_no, class, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id  ! Datatype identifier
-            INTEGER, INTENT(IN)       :: member_no  ! Member number
-            INTEGER, INTENT(OUT)     :: class      ! Member class
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code
-!*****
-            INTERFACE
-              INTEGER FUNCTION h5tget_member_class_c(type_id, member_no, class)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_MEMBER_CLASS_C'::h5tget_member_class_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER, INTENT(IN)       :: member_no
-              INTEGER, INTENT(OUT)     :: class
-              END FUNCTION h5tget_member_class_c
-            END INTERFACE
-
-            hdferr = h5tget_member_class_c(type_id, member_no, class)
-
-          END SUBROUTINE h5tget_member_class_f
-
-!
-!****s* H5T/h5tcommit_anon_f
-!
-! NAME
-!  h5tcommit_anon_f
-!
-! PURPOSE
-!  Commits a transient datatype to a file,
-!  creating a new named datatype,
-!  but does not link it into the file structure.
-!
-! INPUTS
-!  loc_id 	 - A file or group identifier specifying the file
-!                  in which the new named datatype is to be created.
-!  dtype_id 	 - A datatype identifier.
-!
-! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! OPTIONAL PARAMETERS
-!  tcpl_id 	 - A datatype creation property list identifier.
-!                  (H5P_DEFAULT_F for the default property list.)
-!  tapl_id 	 - A datatype access property list identifier.
-!                  should always be passed as the value H5P_DEFAULT_F.
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  February 25, 2008
-!
-! SOURCE
-  SUBROUTINE h5tcommit_anon_f(loc_id, dtype_id, hdferr, tcpl_id, tapl_id)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id  ! A file or group identifier specifying
-                                          ! the file in which the new named datatype
-                                          ! is to be created.
-    INTEGER(HID_T), INTENT(IN) :: dtype_id  ! Datatype identifier
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: tcpl_id ! A datatype creation property
-                                                    ! list identifier.
-                                                    ! (H5P_DEFAULT_F for the default property list.)
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: tapl_id ! A datatype access property list identifier.
-                                                    ! should always be passed as the value H5P_DEFAULT_F.
-!*****
-    INTEGER(HID_T) :: tcpl_id_default
-    INTEGER(HID_T) :: tapl_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5tcommit_anon_c(loc_id, dtype_id, &
-            tcpl_id_default, tapl_id_default)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TCOMMIT_ANON_C'::h5tcommit_anon_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: loc_id
-         INTEGER(HID_T), INTENT(IN) :: dtype_id
-         INTEGER(HID_T) :: tcpl_id_default
-         INTEGER(HID_T) :: tapl_id_default
-       END FUNCTION h5tcommit_anon_c
-    END INTERFACE
-
-    tcpl_id_default = H5P_DEFAULT_F
-    tapl_id_default = H5P_DEFAULT_F
-
-    IF(PRESENT(tcpl_id)) tcpl_id_default = tcpl_id
-    IF(PRESENT(tapl_id)) tapl_id_default = tapl_id
-
-    hdferr = h5tcommit_anon_c(loc_id, dtype_id, &
-         tcpl_id_default, tapl_id_default )
-
-  END SUBROUTINE h5tcommit_anon_f
-
-!
-!****s* H5T/h5tcommitted_f
-!
-! NAME
-!  h5tcommitted_f
-!
-! PURPOSE
-!  Determines whether a datatype is a named type or a transient type.
-!
-! INPUTS
-!  dtype_id 	 - A datatype identifier.
-!
-! OUTPUTS
-!  committed 	 - .TRUE., if the datatype has been committed
-!                  .FALSE., if the datatype has not been committed.
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-! AUTHOR
-!  M. Scot Breitenfeld
-!  February 25, 2008
-!
-! SOURCE
-  SUBROUTINE h5tcommitted_f(dtype_id, committed, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dtype_id  ! A datatype identifier
-    LOGICAL, INTENT(OUT) :: committed ! .TRUE., if the datatype has been committed
-                                      !.FALSE., if the datatype has not been committed.
-    INTEGER, INTENT(OUT) :: hdferr     ! Error code:
-!  Success:  0
-!  Failure: -1
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5tcommitted_c(dtype_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TCOMMITTED_C'::h5tcommitted_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dtype_id
-       END FUNCTION h5tcommitted_c
-    END INTERFACE
-
-    hdferr = h5tcommitted_c(dtype_id)
-
-    IF(hdferr.GT.0)THEN
-       committed = .TRUE.
-       hdferr = 0
-    ELSE IF(hdferr.EQ.0)THEN
-       committed = .FALSE.
-       hdferr = 0
-    ELSE
-       hdferr = -1
-    ENDIF
-
-
-  END SUBROUTINE h5tcommitted_f
-
-!
-!****s* H5T/H5Tdecode_f
-!
-! NAME
-!  H5Tdecode_f
-!
-! PURPOSE
-!  Decode a binary object description of data type and return a new object handle.
-! INPUTS
-!  buf 	         -  Buffer for the data space object to be decoded.
-!  obj_id 	 - Object ID
-! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  April 9, 2008
-!
-! SOURCE
-  SUBROUTINE h5tdecode_f(buf, obj_id, hdferr)
-    IMPLICIT NONE
-    CHARACTER(LEN=*), INTENT(IN) :: buf ! Buffer for the data space object to be decoded.
-    INTEGER(HID_T), INTENT(OUT) :: obj_id  ! Object ID
-    INTEGER, INTENT(OUT) :: hdferr     ! Error code
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5tdecode_c(buf, obj_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TDECODE_C'::h5tdecode_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: buf
-         CHARACTER(LEN=*), INTENT(IN) :: buf
-         INTEGER(HID_T), INTENT(OUT) :: obj_id  ! Object ID
-       END FUNCTION h5tdecode_c
-    END INTERFACE
-
-    hdferr = h5tdecode_c(buf, obj_id)
-
-  END SUBROUTINE h5tdecode_f
-
-!
-!****s* H5T/H5Tencode_f
-!
-! NAME
-!  H5Tencode_f
-!
-! PURPOSE
-!  Encode a data type object description into a binary buffer.
-!
-! INPUTS
-!  obj_id 	 - Identifier of the object to be encoded.
-!  buf 	         - Buffer for the object to be encoded into.
-!  nalloc 	 - The size of the allocated buffer.
-! OUTPUTS
-!  nalloc 	 - The size of the buffer needed.
-!  hdferr 	 - Returns 0 if successful and -1 if fails.
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  April 9, 2008
-! SOURCE
-  SUBROUTINE h5tencode_f(obj_id, buf, nalloc, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: obj_id ! Identifier of the object to be encoded.
-    CHARACTER(LEN=*), INTENT(OUT) :: buf ! Buffer for the object to be encoded into.
-    INTEGER(SIZE_T), INTENT(INOUT) :: nalloc ! The size of the allocated buffer.
-    INTEGER, INTENT(OUT) :: hdferr     ! Error code
-!*****
-
-    INTERFACE
-       INTEGER FUNCTION h5tencode_c(buf, obj_id, nalloc)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TENCODE_C'::h5tencode_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: buf
-         INTEGER(HID_T), INTENT(IN) :: obj_id
-         CHARACTER(LEN=*), INTENT(OUT) :: buf
-         INTEGER(SIZE_T), INTENT(INOUT) :: nalloc
-       END FUNCTION h5tencode_c
-    END INTERFACE
-
-    hdferr = h5tencode_c(buf, obj_id, nalloc)
-
-  END SUBROUTINE h5tencode_f
-
-!
-!****s* H5T/h5tget_create_plist_f
-!
-! NAME
-!  h5tget_create_plist_f
-!
-! PURPOSE
-!  Returns a copy of a datatype creation property list.
-!
-! INPUTS
-!  dtype_id 	 - Datatype identifier
-! OUTPUTS
-!  dtpl_id 	 - Datatype property list identifier
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  April 9, 2008
-!
-! SOURCE
-  SUBROUTINE h5tget_create_plist_f(dtype_id, dtpl_id, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dtype_id  ! Datatype identifier
-    INTEGER(HID_T), INTENT(OUT) :: dtpl_id  ! Datatype property list identifier.
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code:
-                                         ! 0 on success and -1 on failure
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5tget_create_plist_c(dtype_id, dtpl_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_CREATE_PLIST_C'::h5tget_create_plist_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dtype_id
-         INTEGER(HID_T), INTENT(OUT) :: dtpl_id
-       END FUNCTION h5tget_create_plist_c
-    END INTERFACE
-
-    hdferr = h5tget_create_plist_c(dtype_id, dtpl_id)
-  END SUBROUTINE h5tget_create_plist_f
-
-!
-!****s* H5T/h5tcompiler_conv_f
-!
-! NAME
-!  h5tcompiler_conv_f
-!
-! PURPOSE
-!  Check whether the library’s default conversion is hard conversion.R
-!
-! INPUTS
-!  src_id 	 - Identifier for the source datatype.
-!  dst_id 	 - Identifier for the destination datatype.
-! OUTPUTS
-!  flag 	 - TRUE for compiler conversion, FALSE for library conversion
-!  hdferr 	 - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  April 9, 2008
-! SOURCE
-  SUBROUTINE h5tcompiler_conv_f( src_id, dst_id, flag, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: src_id ! Identifier for the source datatype.
-    INTEGER(HID_T), INTENT(IN) :: dst_id ! Identifier for the destination datatype.
-    LOGICAL, INTENT(OUT) :: flag  ! .TRUE. for compiler conversion, .FALSE. for library conversion
-    INTEGER, INTENT(OUT) :: hdferr  ! Error code:
-                                    ! 0 on success and -1 on failure
-!*****
-    INTEGER :: c_flag
-
-    INTERFACE
-       INTEGER FUNCTION h5tcompiler_conv_c(src_id, dst_id, c_flag)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TCOMPILER_CONV_C'::h5tcompiler_conv_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: src_id
-         INTEGER(HID_T), INTENT(IN) :: dst_id
-         INTEGER :: c_flag
-       END FUNCTION h5tcompiler_conv_c
-    END INTERFACE
-
-    hdferr = h5tcompiler_conv_c(src_id, dst_id, c_flag)
-
-    flag = .FALSE.
-    IF(c_flag .GT. 0) flag = .TRUE.
-
-  END SUBROUTINE h5tcompiler_conv_f
-
-!
-!****s* H5T/h5tget_native_type_f
-!
-! NAME
-!  h5tget_native_type_f
-!
-! PURPOSE
-!  Returns the native datatype of a specified datatype.
-!
-! INPUTS
-!  dtype_id 	 - Datatype identifier for the dataset datatype.
-!  
-!  direction 	 - Direction of search:
-!                  H5T_DIR_DEFAULT     = 0,    /*default direction is inscendent */
-!                  H5T_DIR_ASCEND      = 1,    /*in inscendent order             */
-!                  H5T_DIR_DESCEND     = 2     /*in descendent order             */
-!  * NOTE: In C it is defined as a structure: H5T_direction_t
-!
-! OUTPUTS
-!  native_dtype_id - The native datatype identifier for the specified dataset datatype
-!  hdferr 	   - Returns 0 if successful and -1 if fails
-! AUTHOR
-!  M. Scot Breitenfeld
-!  June 18, 2008
-! SOURCE
-  SUBROUTINE h5tget_native_type_f(dtype_id, direction, native_dtype_id, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dtype_id  ! Datatype identifier
-    INTEGER, INTENT(IN) :: direction  ! Direction of search:
-                                      ! H5T_DIR_ASCEND_F      = 1  in inscendent order
-                                      ! H5T_DIR_DESCEND_F     = 2  in descendent order
-    INTEGER(HID_T), INTENT(OUT) :: native_dtype_id  ! The native datatype identifier
-    INTEGER, INTENT(OUT) :: hdferr    ! Error code:
-                                      ! 0 on success and -1 on failure
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5tget_native_type_c(dtype_id, direction, native_dtype_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_NATIVE_TYPE_C'::h5tget_native_type_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dtype_id
-         INTEGER, INTENT(IN) :: direction
-         INTEGER(HID_T), INTENT(OUT) :: native_dtype_id
-       END FUNCTION h5tget_native_type_c
-    END INTERFACE
-
-    hdferr = h5tget_native_type_c(dtype_id, direction, native_dtype_id)
-  END SUBROUTINE h5tget_native_type_f
-
-END MODULE H5T
diff --git a/fortran/src/H5Tff_F03.f90 b/fortran/src/H5Tff_F03.f90
deleted file mode 100644
index 2c9f212..0000000
--- a/fortran/src/H5Tff_F03.f90
+++ /dev/null
@@ -1,223 +0,0 @@
-!****h* ROBODoc/H5T (F03)
-!
-! NAME
-!  H5T_PROVISIONAL
-!
-! PURPOSE
-!  This file contains Fortran 90 and Fortran 2003 interfaces for H5T functions.
-!  It contains the same functions as H5Tff_F90.f90 but includes the
-!  Fortran 2003 functions and the interface listings. This file will be compiled
-!  instead of H5Tff_F90.f90 if Fortran 2003 functions are enabled.
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! NOTES
-!                         *** IMPORTANT ***
-!  If you add a new H5T function you must add the function name to the
-!  Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
-!  This is needed for Windows based operating systems.
-!
-!*****
-
-MODULE H5T_PROVISIONAL
-
-  USE H5GLOBAL
-  USE, INTRINSIC :: ISO_C_BINDING
-
-!****t* H5T (F03)/hvl_t
-! Fortran2003 Derived Type:
-  TYPE hvl_t
-     INTEGER(size_t) :: len ! Length of VL data (in base type units)
-     TYPE(C_PTR) :: p       ! Pointer to VL data
-  END TYPE hvl_t
-
-!*****
-
-  INTERFACE h5tenum_insert_f
-     MODULE PROCEDURE h5tenum_insert_f03
-     MODULE PROCEDURE h5tenum_insert_f90
-  END INTERFACE
-
-CONTAINS
-
-!****s* H5T (F03)/H5Tconvert_f_F03
-!
-! NAME
-!  H5Tconvert_f
-!
-! PURPOSE
-!  Converts data from between specified datatypes.
-!
-! Inputs:
-!  src_id     - Identifier for the source datatype.
-!  dst_id     - Identifier for the destination datatype.
-!  nelmts     - Size of array buf.
-!  buf 	      - Array containing pre-conversion values.
-!  background - Optional background buffer.
-!  plist_id   -	Dataset transfer property list identifier.
-!
-! Outputs:
-!  buf 	      - Array containing post-conversion values.
-!  hdferr     - error code:
-!                 0 on success and -1 on failure
-! AUTHOR
-!  M. Scot Breitenfeld
-!  Decemember 8, 2008
-!
-! Fortran2003 Interface:
-  SUBROUTINE h5tconvert_f(src_id, dst_id, nelmts, buf, hdferr, background, plist_id)
-    USE, INTRINSIC :: ISO_C_BINDING
-    IMPLICIT NONE
-    INTEGER(HID_T) , INTENT(IN)               :: src_id
-    INTEGER(HID_T) , INTENT(IN)               :: dst_id
-    INTEGER(SIZE_T), INTENT(IN)               :: nelmts
-    TYPE(C_PTR)    , INTENT(INOUT)            :: buf
-    INTEGER        , INTENT(OUT)              :: hdferr
-    TYPE(C_PTR)    , INTENT(INOUT), OPTIONAL  :: background
-    INTEGER(HID_T) , INTENT(IN)   , OPTIONAL  :: plist_id
-!*****
-    INTEGER(HID_T) :: plist_id_default
-    TYPE(C_PTR) :: background_default
-
-    INTERFACE
-       INTEGER FUNCTION h5tconvert_c(src_id, dst_id, nelmts, buf, background, plist_id) &
-            BIND(C, NAME='h5tconvert_c')
-         USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_ptr
-         USE H5GLOBAL
-         IMPLICIT NONE
-         INTEGER(HID_T) , INTENT(IN)           :: src_id
-         INTEGER(HID_T) , INTENT(IN)           :: dst_id
-         INTEGER(SIZE_T), INTENT(IN)           :: nelmts
-         TYPE(C_PTR)                , VALUE    :: buf
-         TYPE(C_PTR)                , VALUE    :: background
-         INTEGER(HID_T) , INTENT(IN)           :: plist_id
-       END FUNCTION h5tconvert_c
-    END INTERFACE
-
-    plist_id_default = H5P_DEFAULT_F
-    IF(PRESENT(plist_id)) plist_id_default = plist_id
-
-    background_default = C_NULL_PTR
-    IF(PRESENT(background)) background_default = background
-
-    hdferr = H5Tconvert_c(src_id, dst_id, nelmts, buf, background_default, plist_id_default)
-
-  END SUBROUTINE h5tconvert_f
-!
-!****s* (F03) H5T/h5tenum_insert_f90
-!
-! NAME
-!  h5tenum_insert_f
-!
-! PURPOSE
-!  Inserts a new enumeration datatype member.
-!
-! INPUTS
-!  type_id  - Datatype identifier for the enumeration datatype.
-!  name     - Datatype identifier.
-!  value    - Value of the new member.
-! OUTPUTS
-!  hdferr   - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 7, 2001
-! SOURCE
-  SUBROUTINE h5tenum_insert_f90(type_id,  name, value, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name  !Name of  the new member
-    INTEGER, INTENT(IN) :: value ! value of the new member
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-    INTEGER :: namelen
-    INTERFACE
-       INTEGER FUNCTION h5tenum_insert_c(type_id, name, namelen, value)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TENUM_INSERT_C'::h5tenum_insert_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         INTEGER(HID_T), INTENT(IN) :: type_id
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER, INTENT(IN) :: value
-         INTEGER :: namelen
-       END FUNCTION h5tenum_insert_c
-    END INTERFACE
-            
-    namelen = LEN(name)
-    hdferr = h5tenum_insert_c(type_id, name, namelen, value)
-  END SUBROUTINE h5tenum_insert_f90
-
-!
-!****s* (F03) H5T/h5tenum_insert_f03
-!
-! NAME
-!  h5tenum_insert_f
-!
-! PURPOSE
-!  Inserts a new enumeration datatype member.
-!
-! INPUTS
-!  type_id  - Datatype identifier for the enumeration datatype.
-!  name     - Datatype identifier.
-!  value    - Pointer to the value of the new member.
-! OUTPUTS
-!  hdferr   - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  February 6, 2015
-!
-! HISTORY
-!  F2003 implementation of function
-! SOURCE
-  SUBROUTINE h5tenum_insert_f03(type_id, name, value, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_ptr, c_char
-    USE H5GLOBAL
-    IMPLICIT NONE
-    INTEGER(HID_T)  , INTENT(IN) :: type_id
-    CHARACTER(LEN=*), INTENT(IN) :: name
-    TYPE(C_PTR)     , INTENT(IN) :: value
-    INTEGER, INTENT(OUT) :: hdferr
-!*****
-    INTEGER :: namelen
-    
-    INTERFACE
-       INTEGER FUNCTION h5tenum_insert_ptr_c(type_id, name, namelen, value) &
-            BIND(C, NAME='h5tenum_insert_ptr_c')
-         USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_ptr, c_char
-         USE H5GLOBAL
-         IMPLICIT NONE
-         INTEGER(HID_T)  , INTENT(IN) :: type_id
-         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
-         INTEGER :: namelen
-         TYPE(C_PTR), VALUE :: value
-       END FUNCTION h5tenum_insert_ptr_c
-    END INTERFACE
-            
-    namelen = LEN(name)
-    hdferr = h5tenum_insert_ptr_c(type_id, name, namelen, value)
-  END SUBROUTINE h5tenum_insert_f03
-
-END MODULE H5T_PROVISIONAL
-
diff --git a/fortran/src/H5Tff_F90.f90 b/fortran/src/H5Tff_F90.f90
deleted file mode 100644
index 380fbec..0000000
--- a/fortran/src/H5Tff_F90.f90
+++ /dev/null
@@ -1,95 +0,0 @@
-!****h* ROBODoc/H5T (F90)
-!
-! NAME
-!  MODULE H5T_PROVISIONAL
-!
-! PURPOSE
-!  This file contains Fortran 90 interfaces for H5T functions. It contains
-!  the same functions as H5Tff_F03.f90 but excludes the Fortran 2003 functions
-!  and the interface listings. This file will be compiled instead of H5Tff_F03.f90
-!  if Fortran 2003 functions are not enabled.
-!
-! NOTE
-!  Currently contains no functions.
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-!                         *** IMPORTANT ***
-!  If you add a new H5D function you must add the function name to the
-!  Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
-!  This is needed for Windows based operating systems.
-!*****
-
-MODULE H5T_PROVISIONAL
-
-  USE H5GLOBAL
-
-CONTAINS
-
-!
-!****s* H5T/h5tenum_insert_f
-!
-! NAME
-!  h5tenum_insert_f
-!
-! PURPOSE
-!  Inserts a new enumeration datatype member.
-!
-! INPUTS
-!  type_id  - Datatype identifier for the enumeration datatype.
-!  name     - Datatype identifier.
-!  value    - Value of the new member.
-! OUTPUTS
-!  hdferr   - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  March 7, 2001
-! SOURCE
-  SUBROUTINE h5tenum_insert_f(type_id,  name, value, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: type_id
-    CHARACTER(LEN=*), INTENT(IN) :: name
-    INTEGER, INTENT(IN) :: value
-    INTEGER, INTENT(OUT) :: hdferr
-!*****
-    INTEGER :: namelen
-    
-    INTERFACE
-       INTEGER FUNCTION h5tenum_insert_c(type_id, name, namelen, value)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TENUM_INSERT_C'::h5tenum_insert_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         INTEGER(HID_T), INTENT(IN) :: type_id
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER, INTENT(IN) :: value
-         INTEGER :: namelen
-       END FUNCTION h5tenum_insert_c
-    END INTERFACE
-    
-    namelen = LEN(name)
-    hdferr = h5tenum_insert_c(type_id, name, namelen, value)
-  END SUBROUTINE h5tenum_insert_f
-  
-END MODULE H5T_PROVISIONAL
diff --git a/fortran/src/H5VLff.F90 b/fortran/src/H5VLff.F90
new file mode 100644
index 0000000..11ac349
--- /dev/null
+++ b/fortran/src/H5VLff.F90
@@ -0,0 +1,404 @@
+!> @defgroup FH5VL Fortran VOL (H5VL) Interface
+!!
+!! @see H5VL, C-API
+!!
+!! @see @ref H5VL_UG, User Guide
+!!
+
+!> @ingroup FH5VL
+!!
+!! @brief This module contains Fortran interfaces for H5VL (VOL) functions.
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+! NOTES
+!       _____ __  __ _____   ____  _____ _______       _   _ _______
+!      |_   _|  \/  |  __ \ / __ \|  __ \__   __|/\   | \ | |__   __|
+! ****   | | | \  / | |__) | |  | | |__) | | |  /  \  |  \| |  | |    ****
+! ****   | | | |\/| |  ___/| |  | |  _  /  | | / /\ \ | . ` |  | |    ****
+! ****  _| |_| |  | | |    | |__| | | \ \  | |/ ____ \| |\  |  | |    ****
+!      |_____|_|  |_|_|     \____/|_|  \_\ |_/_/    \_\_| \_|  |_|
+!
+!  If you add a new H5VL function you must add the function name to the
+!  Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
+!  This is needed for Windows based operating systems.
+!
+
+MODULE H5VL
+
+  USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR, C_FUNPTR, C_CHAR, C_INT64_T, C_INT
+  USE H5GLOBAL
+  USE H5fortkit
+
+  IMPLICIT NONE
+
+CONTAINS
+
+! H5VLregister_connector
+
+!>
+!! \ingroup FH5VL
+!!
+!! \brief Registers a new VOL connector as a member of the virtual object layer class by name.
+!!
+!! \param name    Connector name.
+!! \param vol_id  VOL connector identifier if successful; otherwise returns H5I_INVALID_HID_F.
+!! \param hdferr  \fortran_error
+!! \param vipl_id VOL initialization property list identifier.
+!!
+!! See C API: @ref H5VLregister_connector_by_name()
+!!
+  SUBROUTINE H5VLregister_connector_by_name_f(name, vol_id, hdferr, vipl_id)
+    IMPLICIT NONE
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    INTEGER(HID_T), INTENT(OUT) :: vol_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: vipl_id
+    CHARACTER(LEN=LEN_TRIM(name)+1,KIND=C_CHAR) :: c_name
+    INTEGER(HID_T) :: vipl_id_default
+
+    INTERFACE
+       INTEGER(HID_T) FUNCTION H5VLregister_connector_by_name(name, vipl_id) &
+            BIND(C,NAME='H5VLregister_connector_by_name')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+         INTEGER(HID_T), INTENT(IN), VALUE :: vipl_id
+       END FUNCTION H5VLregister_connector_by_name
+    END INTERFACE
+
+    vipl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(vipl_id)) vipl_id_default = vipl_id
+
+    c_name = TRIM(name)//C_NULL_CHAR
+    vol_id = H5VLregister_connector_by_name(c_name, vipl_id_default)
+
+    hdferr = 0
+    IF(vol_id.LT.0) hdferr = H5I_INVALID_HID_F
+
+  END SUBROUTINE H5VLregister_connector_by_name_f
+!>
+!! \ingroup FH5VL
+!!
+!! \brief Registers a new VOL connector by value.
+!!
+!! \param connector_value Connector value.
+!! \param vol_id          VOL connector identifier if successful; otherwise returns H5I_INVALID_HID_F.
+!! \param hdferr          \fortran_error
+!! \param vipl_id         VOL initialization property list identifier.
+!!
+!! See C API: @ref H5VLregister_connector_by_value()
+!!
+  SUBROUTINE H5VLregister_connector_by_value_f(connector_value, vol_id, hdferr, vipl_id)
+    IMPLICIT NONE
+    INTEGER, INTENT(IN) :: connector_value
+    INTEGER(HID_T), INTENT(OUT) :: vol_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: vipl_id
+    INTEGER(HID_T) :: vipl_id_default
+
+    INTERFACE
+       INTEGER(HID_T) FUNCTION H5VLregister_connector_by_value(connector_value, vipl_id) &
+            BIND(C,NAME='H5VLregister_connector_by_value')
+         IMPORT :: HID_T
+         IMPORT :: C_INT
+         INTEGER(C_INT), VALUE :: connector_value
+         INTEGER(HID_T), INTENT(IN), VALUE :: vipl_id
+       END FUNCTION H5VLregister_connector_by_value
+    END INTERFACE
+
+    vipl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(vipl_id)) vipl_id_default = vipl_id
+
+    vol_id = H5VLregister_connector_by_value(INT(connector_value,C_INT), vipl_id_default)
+
+    hdferr = 0
+    IF(vol_id.LT.0) hdferr = H5I_INVALID_HID_F
+
+  END SUBROUTINE H5VLregister_connector_by_value_f
+
+!>
+!! \ingroup FH5VL
+!!
+!! \brief Determines whether a VOL class has been registered or not ccording to a specified connector name.
+!!
+!! \param name       Connector name.
+!! \param registered State of VOL class registration.
+!! \param hdferr     \fortran_error
+!!
+!! See C API: @ref H5VLis_connector_registered_by_name()
+!!
+  SUBROUTINE H5VLis_connector_registered_by_name_f(name, registered,  hdferr)
+    IMPLICIT NONE
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    LOGICAL, INTENT(OUT) :: registered
+    INTEGER, INTENT(OUT) :: hdferr
+    CHARACTER(LEN=LEN_TRIM(name)+1,KIND=C_CHAR) :: c_name
+    INTEGER(C_INT) :: registered_c
+
+    INTERFACE
+       INTEGER(C_INT) FUNCTION H5VLis_connector_registered_by_name(name) BIND(C,NAME='H5VLis_connector_registered_by_name')
+         IMPORT :: C_CHAR
+         IMPORT :: C_INT
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+       END FUNCTION H5VLis_connector_registered_by_name
+    END INTERFACE
+
+    c_name = TRIM(name)//C_NULL_CHAR
+    registered_c = H5VLis_connector_registered_by_name(c_name)
+
+    hdferr = 0
+    registered = .FALSE.
+    IF(registered_c .GT. 0) registered = .TRUE.
+    IF(registered_c .LT. 0) hdferr = INT(registered_c)
+
+  END SUBROUTINE H5VLis_connector_registered_by_name_f
+
+!>
+!! \ingroup FH5VL
+!!
+!! \brief Determines whether a VOL class has been registered or not according to a specified connector value (ID).
+!!
+!! \param value ConneConnector value.
+!! \param registered State of VOL class registration.
+!! \param hdferr Retu\fortran_error
+!!
+!! See C API: @ref H5VLis_connector_registered_by_value()
+!!
+  SUBROUTINE H5VLis_connector_registered_by_value_f(value, registered,  hdferr)
+    IMPLICIT NONE
+    INTEGER, INTENT(IN) :: value
+    LOGICAL, INTENT(OUT) :: registered
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(C_INT) :: registered_c
+
+    INTERFACE
+       INTEGER(C_INT) FUNCTION H5VLis_connector_registered_by_value(value) BIND(C,NAME='H5VLis_connector_registered_by_value')
+         IMPORT :: C_INT
+         INTEGER(C_INT), VALUE :: value
+       END FUNCTION H5VLis_connector_registered_by_value
+    END INTERFACE
+
+    registered_c = H5VLis_connector_registered_by_value(INT(value,C_INT))
+
+    hdferr = 0
+    registered = .FALSE.
+    IF(registered_c .GT. 0) registered = .TRUE.
+    IF(registered_c .LT. 0) hdferr = INT(registered_c)
+
+  END SUBROUTINE H5VLis_connector_registered_by_value_f
+
+!>
+!! \ingroup FH5VL
+!!
+!! \brief Retrieves the ID for a registered VOL connector.
+!!
+!! \param obj_id Object id.
+!! \param vol_id Connector id.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5VLget_connector_id()
+!!
+  SUBROUTINE H5VLget_connector_id_f(obj_id, vol_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: obj_id
+    INTEGER(HID_T), INTENT(OUT) :: vol_id
+    INTEGER, INTENT(OUT) :: hdferr
+
+    INTERFACE
+       INTEGER(HID_T) FUNCTION H5VLget_connector_id(obj_id) BIND(C,NAME='H5VLget_connector_id')
+         IMPORT :: HID_T
+         INTEGER(HID_T), INTENT(IN) :: obj_id
+       END FUNCTION H5VLget_connector_id
+    END INTERFACE
+
+    vol_id = H5VLget_connector_id(obj_id)
+
+    IF(vol_id.LT.0)THEN
+       hdferr = -1
+       vol_id = H5I_INVALID_HID_F
+    ENDIF
+
+  END SUBROUTINE H5VLget_connector_id_f
+
+!>
+!! \ingroup FH5VL
+!!
+!! \brief Retrieves the ID for a registered VOL connector.
+!!
+!! \param name   Connector name.
+!! \param vol_id Connector id.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5VLget_connector_id_by_name()
+!!
+  SUBROUTINE H5VLget_connector_id_by_name_f(name, vol_id, hdferr)
+    IMPLICIT NONE
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    INTEGER(HID_T), INTENT(OUT) :: vol_id
+    INTEGER, INTENT(OUT) :: hdferr
+    CHARACTER(LEN=LEN_TRIM(name)+1,KIND=C_CHAR) :: c_name
+
+    INTERFACE
+       INTEGER(HID_T) FUNCTION H5VLget_connector_id_by_name(name) BIND(C,NAME='H5VLget_connector_id_by_name')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+       END FUNCTION H5VLget_connector_id_by_name
+    END INTERFACE
+
+    c_name = TRIM(name)//C_NULL_CHAR
+    vol_id = H5VLget_connector_id_by_name(c_name)
+
+    hdferr = 0
+    IF(vol_id.LT.0)THEN
+       hdferr = -1
+       vol_id = H5I_INVALID_HID_F
+    ENDIF
+
+  END SUBROUTINE H5VLget_connector_id_by_name_f
+
+!>
+!! \ingroup FH5VL
+!!
+!! \brief Retrieves the ID for a registered VOL connector.
+!!
+!! \param value CConnector value.
+!! \param vol_id Connector id.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5VLget_connector_id_by_value()
+!!
+  SUBROUTINE H5VLget_connector_id_by_value_f(value, vol_id, hdferr)
+    IMPLICIT NONE
+    INTEGER, INTENT(IN) :: value
+    INTEGER(HID_T), INTENT(OUT) :: vol_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER(HID_T) FUNCTION H5VLget_connector_id_by_value(value) BIND(C,NAME='H5VLget_connector_id_by_value')
+         IMPORT :: C_INT
+         IMPORT :: HID_T
+         INTEGER(C_INT), VALUE :: value
+       END FUNCTION H5VLget_connector_id_by_value
+    END INTERFACE
+
+    vol_id = H5VLget_connector_id_by_value(INT(value,C_INT))
+
+    hdferr = 0
+    IF(vol_id.LT.0)THEN
+       hdferr = -1
+       vol_id = H5I_INVALID_HID_F
+    ENDIF
+
+  END SUBROUTINE H5VLget_connector_id_by_value_f
+!>
+!! \ingroup FH5VL
+!!
+!! \brief Retrieves a connector name for a VOL.
+!!
+!! \param obj_id   Object identifier or file identifier.
+!! \param name     Connector name.
+!! \param hdferr   \fortran_error
+!! \param name_len Maximum length of the name to retrieve.
+!!
+!! See C API: @ref H5VLget_connector_name()
+!!
+  SUBROUTINE H5VLget_connector_name_f(obj_id, name, hdferr, name_len)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: obj_id
+    CHARACTER(LEN=*), INTENT(OUT) :: name
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(SIZE_T), OPTIONAL     :: name_len
+    CHARACTER(LEN=1,KIND=C_CHAR), DIMENSION(1:LEN(name)+1), TARGET :: c_name
+    INTEGER(SIZE_T) :: l
+
+    INTERFACE
+       INTEGER(SIZE_T) FUNCTION H5VLget_connector_name(obj_id, name, size) BIND(C,NAME='H5VLget_connector_name')
+         IMPORT :: HID_T, SIZE_T, C_PTR, C_CHAR
+         IMPLICIT NONE
+         INTEGER(HID_T) , INTENT(IN), VALUE :: obj_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(OUT) :: name
+         INTEGER(SIZE_T), INTENT(IN), VALUE :: size
+       END FUNCTION H5VLget_connector_name
+    END INTERFACE
+
+    hdferr = 0
+    IF(PRESENT(name_len))THEN
+       c_name(1:1)(1:1) = C_NULL_CHAR
+       name_len = INT(H5VLget_connector_name(obj_id, c_name, 1_SIZE_T), SIZE_T)
+       IF(name_len.LT.0) hdferr = H5I_INVALID_HID_F
+    ELSE
+       l = INT(LEN(name)+1,SIZE_T)
+       IF(INT(H5VLget_connector_name(obj_id, c_name, l), SIZE_T).LT.0)THEN
+          hdferr = H5I_INVALID_HID_F
+       ELSE
+          CALL HD5c2fstring(name,c_name,LEN(name))
+       ENDIF
+    ENDIF
+
+  END SUBROUTINE H5VLget_connector_name_f
+
+!>
+!! \ingroup FH5VL
+!!
+!! \brief Closes a VOL connector ID.
+!!
+!! \param vol_id A valid identifier of the connectory to unregister.
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5VLclose()
+!!
+  SUBROUTINE H5VLclose_f(vol_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: vol_id
+    INTEGER, INTENT(OUT) :: hdferr
+
+    INTERFACE
+       INTEGER FUNCTION H5VLclose(vol_id) BIND(C, NAME='H5VLclose')
+         IMPORT :: HID_T
+         INTEGER(HID_T), INTENT(IN), VALUE :: vol_id
+       END FUNCTION H5VLclose
+    END INTERFACE
+
+    hdferr = INT(H5VLclose(vol_id))
+
+  END SUBROUTINE H5VLclose_f
+
+!>
+!! \ingroup FH5VL
+!!
+!! \brief Removes a VOL connector ID from the library.
+!!
+!! \param plugin_id A valid identifier of the connector to unregister..
+!! \param hdferr Ret\fortran_error
+!!
+!! See C API: @ref H5VLunregister_connector()
+!!
+  SUBROUTINE H5VLunregister_connector_f(plugin_id, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: plugin_id
+    INTEGER, INTENT(OUT) :: hdferr
+
+    INTERFACE
+       INTEGER FUNCTION H5VLunregister_connector(plugin_id) BIND(C, NAME='H5VLunregister_connector')
+         IMPORT :: HID_T
+         INTEGER(HID_T), INTENT(IN), VALUE :: plugin_id
+       END FUNCTION H5VLunregister_connector
+    END INTERFACE
+
+    hdferr = INT(H5VLunregister_connector(plugin_id))
+
+  END SUBROUTINE H5VLunregister_connector_f
+
+END MODULE H5VL
diff --git a/fortran/src/H5Zf.c b/fortran/src/H5Zf.c
index 0427c23..d24d48b 100644
--- a/fortran/src/H5Zf.c
+++ b/fortran/src/H5Zf.c
@@ -1,128 +1,125 @@
 /****h* H5Zf/H5Zf
  * PURPOSE
- *   This file contains C stubs for H5Z Fortran APIs
+ *  This file contains C stubs for H5Z Fortran APIs
  *
  * COPYRIGHT
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  ******
-*/
+ */
 
 #include "H5f90.h"
 
 /****if* H5Zf/h5zunregister_c
  * NAME
- *        h5zunregister_c
+ *  h5zunregister_c
  * PURPOSE
- *     Call H5Zunregister to unregister filter
+ *  Call H5Zunregister to unregister filter
  * INPUTS
- *      filter identifier
+ *  filter identifier
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Wednesday, March 12, 2003
+ *  Wednesday, March 12, 2003
  * HISTORY
  *
  * SOURCE
-*/
+ */
 int_f
-nh5zunregister_c (int_f *filter)
+h5zunregister_c(int_f *filter)
 /******/
 {
-     int ret_value = -1;
-     herr_t status;
-     H5Z_filter_t c_filter;
+    int          ret_value = -1;
+    herr_t       status;
+    H5Z_filter_t c_filter;
 
-     /*
-      * Call H5Zunregister function.
-      */
-     c_filter = (H5Z_filter_t)*filter;
-     printf(" filter # %d \n", (int)c_filter);
-     status = H5Zunregister(c_filter);
-     printf("From C zunregister %d \n", status);
-     if (status < 0) return ret_value;
-     ret_value = 0;
-     return ret_value;
+    /*
+     * Call H5Zunregister function.
+     */
+    c_filter = (H5Z_filter_t)*filter;
+    status   = H5Zunregister(c_filter);
+    if (status < 0)
+        return ret_value;
+    ret_value = 0;
+    return ret_value;
 }
 /****if* H5Zf/h5zfiletr_avail_c
  * NAME
- *        h5zfiletr_avail_c
+ *  h5zfiletr_avail_c
  * PURPOSE
- *     Call H5Zfilter_avail to find if filter is available
+ *  Call H5Zfilter_avail to find if filter is available
  * INPUTS
- *      filter - filter identifier
+ *  filter - filter identifier
  * OUTPUTS
- *     flag - status flag
+ *  flag - status flag
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Wednesday, March 12, 2003
+ *  Wednesday, March 12, 2003
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5zfilter_avail_c ( int_f *filter , int_f *flag )
+h5zfilter_avail_c(int_f *filter, int_f *flag)
 /******/
 {
-  int ret_value = 0;
-  H5Z_filter_t c_filter;
-  htri_t status;
+    int          ret_value = 0;
+    H5Z_filter_t c_filter;
+    htri_t       status;
 
-  c_filter = (H5Z_filter_t)*filter;
-  status = H5Zfilter_avail(c_filter);
-  *flag = (int_f)status;
-  if ( status < 0  ) ret_value = -1;
-  return ret_value;
+    c_filter = (H5Z_filter_t)*filter;
+    status   = H5Zfilter_avail(c_filter);
+    *flag    = (int_f)status;
+    if (status < 0)
+        ret_value = -1;
+    return ret_value;
 }
 
 /****if* H5Zf/h5zget_filter_info_c
  * NAME
- *        h5zget_filter_info_c
+ *  h5zget_filter_info_c
  * PURPOSE
- *     Call H5Zget_filter_info to find if filter has its encoder
- *              and/or its decoder available
+ *  Call H5Zget_filter_info to find if filter has its encoder
+ *  and/or its decoder available
  * INPUTS
- *      filter - filter identifier
+ *  filter - filter identifier
  * OUTPUTS
- *     flag - status flag
+ *  flag - status flag
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Nat Furrer and James Laird
- *              Wednesday, June 16, 2004
+ *  Wednesday, June 16, 2004
  * HISTORY
  *
  * SOURCE
-*/
+ */
 
 int_f
-nh5zget_filter_info_c ( int_f *filter , int_f *flag )
+h5zget_filter_info_c(int_f *filter, int_f *flag)
 /******/
 {
-  int ret_value = 0;
-  H5Z_filter_t c_filter;
-  unsigned int c_flag;
+    int          ret_value = 0;
+    H5Z_filter_t c_filter;
+    unsigned int c_flag;
 
-  c_filter = (H5Z_filter_t)*filter;
-  ret_value = H5Zget_filter_info(c_filter, &c_flag);
-  *flag = (int_f)c_flag;
+    c_filter  = (H5Z_filter_t)*filter;
+    ret_value = H5Zget_filter_info(c_filter, &c_flag);
+    *flag     = (int_f)c_flag;
 
-  return ret_value;
+    return ret_value;
 }
diff --git a/fortran/src/H5Zff.F90 b/fortran/src/H5Zff.F90
new file mode 100644
index 0000000..a31e597
--- /dev/null
+++ b/fortran/src/H5Zff.F90
@@ -0,0 +1,152 @@
+!> @defgroup FH5Z Fortran Filter (H5Z) Interface
+!!
+!! @see H5Z, C-API
+!!
+!! @see @ref H5Z_UG, User Guide
+!!
+
+!> @ingroup FH5Z
+!!
+!! @brief This module contains Fortran interfaces for H5Z functions.
+!
+! COPYRIGHT
+!  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+!  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+! NOTES!
+!       _____ __  __ _____   ____  _____ _______       _   _ _______
+!      |_   _|  \/  |  __ \ / __ \|  __ \__   __|/\   | \ | |__   __|
+! ****   | | | \  / | |__) | |  | | |__) | | |  /  \  |  \| |  | |    ****
+! ****   | | | |\/| |  ___/| |  | |  _  /  | | / /\ \ | . ` |  | |    ****
+! ****  _| |_| |  | | |    | |__| | | \ \  | |/ ____ \| |\  |  | |    ****
+!      |_____|_|  |_|_|     \____/|_|  \_\ |_/_/    \_\_| \_|  |_|
+!
+!  If you add a new H5Z function you must add the function name to the
+!  Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
+!  This is needed for Windows based operating systems.
+!
+
+MODULE H5Z
+
+  USE H5GLOBAL
+
+CONTAINS
+
+!>
+!! \ingroup FH5Z
+!!
+!! \brief Unregisters specified filters.
+!!
+!! \param filter Filter; may have one of the following values:
+!!               \li H5Z_FILTER_DEFLATE_F
+!!               \li H5Z_FILTER_SZIP_F
+!!               \li H5Z_FILTER_NBIT_F
+!!               \li H5Z_FILTER_SCALEOFFSET_F
+!!               \li H5Z_FILTER_SHUFFLE_F
+!!               \li H5Z_FILTER_FLETCHER32_F
+!! \param hdferr \fortran_error
+!!
+!! See C API: @ref H5Zunregister()
+!!
+  SUBROUTINE h5zunregister_f(filter, hdferr)
+    IMPLICIT NONE
+    INTEGER, INTENT(IN)  :: filter
+    INTEGER, INTENT(OUT) :: hdferr
+    INTERFACE
+       INTEGER FUNCTION h5zunregister_c(filter) BIND(C,NAME='h5zunregister_c')
+         INTEGER, INTENT(IN) :: filter
+       END FUNCTION h5zunregister_c
+    END INTERFACE
+    hdferr = h5zunregister_c(filter)
+  END SUBROUTINE h5zunregister_f
+
+!>
+!! \ingroup FH5Z
+!!
+!! \brief Queries if filter is available
+!!
+!! \param filter  Filter; may be one of the following:
+!!                \li H5Z_FILTER_DEFLATE_F
+!!                \li H5Z_FILTER_SZIP_F
+!!                \li H5Z_FILTER_NBIT_F
+!!                \li H5Z_FILTER_SCALEOFFSET_F
+!!                \li H5Z_FILTER_SHUFFLE_F
+!!                \li H5Z_FILTER_FLETCHER32_F
+!! \param status  Flag; .TRUE. if filter is available, .FALSE. otherwise.
+!! \param hdferr  \fortran_error
+!!
+!! See C API: @ref H5Zfilter_avail()
+!!
+  SUBROUTINE h5zfilter_avail_f(filter, status, hdferr)
+    IMPLICIT NONE
+    INTEGER, INTENT(IN)  :: filter
+    LOGICAL, INTENT(OUT) :: status
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER :: flag                     ! "TRUE/FALSE/ERROR from C"
+
+    INTERFACE
+       INTEGER FUNCTION h5zfilter_avail_c(filter, flag) BIND(C,NAME='h5zfilter_avail_c')
+         IMPLICIT NONE
+         INTEGER, INTENT(IN) :: filter
+         INTEGER :: flag
+       END FUNCTION h5zfilter_avail_c
+    END INTERFACE
+
+    hdferr = h5zfilter_avail_c(filter, flag)
+    status = .TRUE.
+    IF (flag .EQ. 0) status = .FALSE.
+
+  END SUBROUTINE h5zfilter_avail_f
+
+!>
+!! \ingroup FH5Z
+!!
+!! \brief Queries if filter has its encoder and/or decoder available.
+!!
+!! \param filter       Filter; may be one of the following:
+!!                     \li H5Z_FILTER_DEFLATE_F
+!!                     \li H5Z_FILTER_SZIP_F
+!!                     \li H5Z_FILTER_NBIT_F
+!!                     \li H5Z_FILTER_SCALEOFFSET_F
+!!                     \li H5Z_FILTER_SHUFFLE_F
+!!                     \li H5Z_FILTER_FLETCHER32_Ffilter
+!! \param config_flags Flag, indicates if filter has its encoder and/or decoder available, possible values:
+!!                     \li H5Z_FILTER_ENCODE_ENABLED_F
+!!                     \li H5Z_FILTER_DECODE_ENABLED_F
+!! \param hdferr       \fortran_error
+!!
+!! See C API: @ref H5Zget_filter_info()
+!!
+  SUBROUTINE h5zget_filter_info_f(filter, config_flags, hdferr)
+    IMPLICIT NONE
+    INTEGER, INTENT(IN)  :: filter
+    INTEGER, INTENT(OUT) :: config_flags
+    INTEGER, INTENT(OUT) :: hdferr
+
+    INTERFACE
+       INTEGER FUNCTION h5zget_filter_info_c(filter, config_flags) BIND(C,NAME='h5zget_filter_info_c')
+         IMPLICIT NONE
+         INTEGER, INTENT(IN) :: filter
+         INTEGER, INTENT(OUT) :: config_flags
+       END FUNCTION h5zget_filter_info_c
+    END INTERFACE
+
+    hdferr = h5zget_filter_info_c(filter, config_flags)
+
+  END SUBROUTINE h5zget_filter_info_f
+
+END MODULE H5Z
+
+
+
+
+
diff --git a/fortran/src/H5Zff.f90 b/fortran/src/H5Zff.f90
deleted file mode 100644
index 7b67b5b..0000000
--- a/fortran/src/H5Zff.f90
+++ /dev/null
@@ -1,198 +0,0 @@
-!****h* ROBODoc/H5Z
-!
-! NAME
-!  MODULE H5Z
-!
-! PURPOSE
-!  This file contains Fortran interfaces for H5Z functions. It includes
-!  all the functions that are independent on whether the Fortran 2003 functions
-!  are enabled or disabled.
-!
-!
-! COPYRIGHT
-!  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!  Copyright by The HDF Group.                                               *
-!  Copyright by the Board of Trustees of the University of Illinois.         *
-!  All rights reserved.                                                      *
-!  *
-!  This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!  terms governing use, modification, and redistribution, is contained in    *
-!  the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!  of the source code distribution tree; Copyright.html can be found at the  *
-!  root level of an installed copy of the electronic HDF5 document set and   *
-!  is linked from the top-level documents page.  It can also be found at     *
-!  http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!  access to either file, you may request a copy from help@hdfgroup.org.     *
-!  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! NOTES
-!                         *** IMPORTANT ***
-!  If you add a new H5Z function you must add the function name to the
-!  Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
-!  This is needed for Windows based operating systems.
-!
-!*****
-
-MODULE H5Z
-
-  USE H5GLOBAL
-
-CONTAINS
-
-!****s* H5Z/h5zunregister_f
-!
-! NAME
-!  h5zunregister_f
-!
-! PURPOSE
-!  Unregisters specified filetr
-!
-! INPUTS
-!  filter - filter; may have one of the following values:
-!            H5Z_FILTER_DEFLATE_F
-!            H5Z_FILTER_SZIP_F
-!            H5Z_FILTER_NBIT_F
-!            H5Z_FILTER_SCALEOFFSET_F
-!            H5Z_FILTER_SHUFFLE_F
-!            H5Z_FILTER_FLETCHER32_F
-!            
-! OUTPUTS
-!  hdferr - error code
-!            Success:  0
-!            Failure: -1
-!
-! AUTHOR
-!  Elena Pourmal
-!  March 12, 2003
-!
-! SOURCE
-  SUBROUTINE h5zunregister_f(filter, hdferr)
-    IMPLICIT NONE
-    INTEGER, INTENT(IN)  :: filter
-    INTEGER, INTENT(OUT) :: hdferr  ! Error code
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5zunregister_c (filter)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5ZUNREGISTER_C':: h5zunregister_c
-         !DEC$ENDIF
-         INTEGER, INTENT(IN) :: filter
-       END FUNCTION h5zunregister_c
-    END INTERFACE
-    hdferr = h5zunregister_c (filter)
-  END SUBROUTINE h5zunregister_f
-
-!****s* H5Z/h5zfilter_avail_f
-! NAME
-!  h5zfilter_avail_f
-!
-! PURPOSE
-!  Queries if filter is available
-!
-! INPUTS
-!  filter 	 - filter
-! OUTPUTS
-!  status 	 - status; .TRUE. if filter is available,
-!                  .FALSE. otherwise
-!  hdferr:	 - error code
-!                   Success:  0
-!                   Failure: -1
-!
-! AUTHOR
-!  Elena Pourmal
-!  March 12, 2003
-!
-! SOURCE
-  SUBROUTINE h5zfilter_avail_f(filter, status, hdferr)
-    IMPLICIT NONE
-    INTEGER, INTENT(IN)  :: filter      ! Filter; may be one of the following:
-                                        !   H5Z_FILTER_DEFLATE_F
-                                        !   H5Z_FILTER_SZIP_F
-                                        !   H5Z_FILTER_NBIT_F
-                                        !   H5Z_FILTER_SCALEOFFSET_F
-                                        !   H5Z_FILTER_SHUFFLE_F
-                                        !   H5Z_FILTER_FLETCHER32_F
-    LOGICAL, INTENT(OUT) :: status      ! Flag, idicates if filter
-                                        ! is availble  not ( TRUE or
-                                        ! FALSE)
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-!*****
-    INTEGER :: flag                     ! "TRUE/FALSE/ERROR from C"
-
-    INTERFACE
-       INTEGER FUNCTION h5zfilter_avail_c(filter, flag)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5ZFILTER_AVAIL_C'::h5zfilter_avail_c
-         !DEC$ENDIF
-         INTEGER, INTENT(IN) :: filter
-         INTEGER :: flag
-       END FUNCTION h5zfilter_avail_c
-    END INTERFACE
-
-    hdferr = h5zfilter_avail_c(filter, flag)
-    status = .TRUE.
-    IF (flag .EQ. 0) status = .FALSE.
-
-  END SUBROUTINE h5zfilter_avail_f
-!****s* H5Z/h5zget_filter_info_f
-!
-! NAME
-!  h5zget_filter_info_f
-!
-! PURPOSE
-!  Queries if filter has its encoder and/or decoder
-!  available
-!
-! INPUTS
-!  filter 	 - filter
-! OUTPUTS
-!  config_flags  - Bit vector possibly containing the
-!                  following values:
-!                     H5Z_FILTER_ENCODE_ENABLED_F
-!                     H5Z_FILTER_DECODE_ENABLED_F
-!  hdferr:	 - error code
-!                   Success:  0
-!                   Failure: -1
-!
-! AUTHOR
-!  Nat Furrer and James Laird
-!  June 16, 2004
-! SOURCE
-  SUBROUTINE h5zget_filter_info_f(filter, config_flags, hdferr)
-    IMPLICIT NONE
-    INTEGER, INTENT(IN)  :: filter      ! Filter; may be one of the following:
-                                        !   H5Z_FILTER_DEFLATE_F
-                                        !   H5Z_FILTER_SZIP_F
-                                        !   H5Z_FILTER_NBIT_F
-                                        !   H5Z_FILTER_SCALEOFFSET_F
-                                        !   H5Z_FILTER_SHUFFLE_F
-                                        !   H5Z_FILTER_FLETCHER32_F
-    INTEGER, INTENT(OUT) :: config_flags! Flag, indicates if filter
-                                        ! has its encoder and/or decoder
-                                        ! available
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-!*****
-
-    INTERFACE
-       INTEGER FUNCTION h5zget_filter_info_c(filter, config_flags)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5ZGET_FILTER_INFO_C'::h5zget_filter_info_c
-         !DEC$ENDIF
-         INTEGER, INTENT(IN) :: filter
-         INTEGER, INTENT(OUT) :: config_flags
-       END FUNCTION h5zget_filter_info_c
-    END INTERFACE
-
-    hdferr = h5zget_filter_info_c(filter, config_flags)
-
-  END SUBROUTINE h5zget_filter_info_f
-
-END MODULE H5Z
-
-
-
-
-
diff --git a/fortran/src/H5_DBLE_InterfaceExclude.f90 b/fortran/src/H5_DBLE_InterfaceExclude.f90
deleted file mode 100644
index 2a3e26f..0000000
--- a/fortran/src/H5_DBLE_InterfaceExclude.f90
+++ /dev/null
@@ -1,39 +0,0 @@
-!****h* fortran/src/H5_DBLE_InterfaceExclude.f90
-!
-! NAME
-!   H5_DBLE_INTERFACE
-!
-! FUNCTION
-!   This module is used for when the default REAL is of type DOUBLE PRECISION.
-!   We do not include the double precision interfaces if the defaut REAL is
-!   DOUBLE PRECISION since this would lead to a non-unique conflict with the
-!   generic interfaces declared as REAL and those declared as DOUBLE PRECISION.
-!
-! NOTES
-!   Empty module.
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!
-!*****
-
-MODULE H5_DBLE_INTERFACE
-
-
-END MODULE H5_DBLE_INTERFACE
diff --git a/fortran/src/H5_DBLE_InterfaceInclude.f90 b/fortran/src/H5_DBLE_InterfaceInclude.f90
deleted file mode 100644
index 11e0a85..0000000
--- a/fortran/src/H5_DBLE_InterfaceInclude.f90
+++ /dev/null
@@ -1,1859 +0,0 @@
-!****h* fortran/src/H5_DBLE_InterfaceInclude.f90
-!
-! NAME
-!   H5_DBLE_INTERFACE
-!
-! FUNCTION
-!   This module is used for when the default REAL is not of the type DOUBLE PRECISION.
-!   We only do not include the double precision interfaces if the defaut REAL is
-!   DOUBLE PRECISION since this would lead to a non-unique conflict with the
-!   generic interfaces declared as REAL. Otherwise it is okay to include the interfaces.
-!
-! NOTES
-!   This module contains all the DOUBLE PRECISION interfaces and corresponding subroutines
-!   from the HDF function catagory H5A, H5D and H5P.
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!
-!*****
-
-MODULE H5_DBLE_INTERFACE
-
-  USE H5GLOBAL
-
-  !
-  ! ----- H5A ----
-  !
-  INTERFACE h5awrite_f
-     MODULE PROCEDURE h5awrite_double_scalar
-     MODULE PROCEDURE h5awrite_double_1
-     MODULE PROCEDURE h5awrite_double_2
-     MODULE PROCEDURE h5awrite_double_3
-     MODULE PROCEDURE h5awrite_double_4
-     MODULE PROCEDURE h5awrite_double_5
-     MODULE PROCEDURE h5awrite_double_6
-     MODULE PROCEDURE h5awrite_double_7
-  END INTERFACE
-
-  INTERFACE h5aread_f
-     MODULE PROCEDURE h5aread_double_scalar
-     MODULE PROCEDURE h5aread_double_1
-     MODULE PROCEDURE h5aread_double_2
-     MODULE PROCEDURE h5aread_double_3
-     MODULE PROCEDURE h5aread_double_4
-     MODULE PROCEDURE h5aread_double_5
-     MODULE PROCEDURE h5aread_double_6
-     MODULE PROCEDURE h5aread_double_7
-  END INTERFACE
-  !
-  ! ----- H5D ----
-  !
-  INTERFACE h5dwrite_f
-     MODULE PROCEDURE h5dwrite_double_scalar
-     MODULE PROCEDURE h5dwrite_double_1
-     MODULE PROCEDURE h5dwrite_double_2
-     MODULE PROCEDURE h5dwrite_double_3
-     MODULE PROCEDURE h5dwrite_double_4
-     MODULE PROCEDURE h5dwrite_double_5
-     MODULE PROCEDURE h5dwrite_double_6
-     MODULE PROCEDURE h5dwrite_double_7
-  END INTERFACE
-
-  INTERFACE h5dread_f
-     MODULE PROCEDURE h5dread_double_scalar
-     MODULE PROCEDURE h5dread_double_1
-     MODULE PROCEDURE h5dread_double_2
-     MODULE PROCEDURE h5dread_double_3
-     MODULE PROCEDURE h5dread_double_4
-     MODULE PROCEDURE h5dread_double_5
-     MODULE PROCEDURE h5dread_double_6
-     MODULE PROCEDURE h5dread_double_7
-  END INTERFACE
-
-  INTERFACE h5dfill_f
-     MODULE PROCEDURE h5dfill_double
-  END INTERFACE
-
-  !
-  ! ----- H5P ----
-  !
-  INTERFACE h5pset_fill_value_f
-     MODULE PROCEDURE h5pset_fill_value_double
-  END INTERFACE
-
-  INTERFACE h5pget_fill_value_f
-     MODULE PROCEDURE h5pget_fill_value_double
-  END INTERFACE
-
-  INTERFACE h5pset_f
-     MODULE PROCEDURE h5pset_double
-  END INTERFACE
-
-  INTERFACE h5pget_f
-     MODULE PROCEDURE h5pget_double
-  END INTERFACE
-
-  INTERFACE h5pregister_f
-     MODULE PROCEDURE h5pregister_double
-  END INTERFACE
-
-  INTERFACE h5pinsert_f
-     MODULE PROCEDURE h5pinsert_double
-  END INTERFACE
-
-CONTAINS
-
-  !
-  ! ----- H5A ----
-  !
-  SUBROUTINE h5awrite_double_scalar(attr_id, memtype_id,  buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                                ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-    DOUBLE PRECISION, INTENT(IN) :: buf     ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-
-    !            INTEGER, EXTERNAL :: h5awrite_double_s_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5awrite_double_s_c(attr_id, memtype_id,  buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_DOUBLE_S_C'::h5awrite_double_s_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         DOUBLE PRECISION, INTENT(IN)::buf
-       END FUNCTION h5awrite_double_s_c
-    END INTERFACE
-
-    hdferr = h5awrite_double_s_c(attr_id, memtype_id,  buf, dims)
-  END SUBROUTINE h5awrite_double_scalar
-
-  SUBROUTINE h5awrite_double_1(attr_id, memtype_id,  buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                                ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-    DOUBLE PRECISION, INTENT(IN), &
-         DIMENSION(dims(1)) :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-
-    !            INTEGER, EXTERNAL :: h5awrite_double_1_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5awrite_double_1_c(attr_id, memtype_id,  buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_DOUBLE_1_C'::h5awrite_double_1_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         DOUBLE PRECISION, INTENT(IN), &
-              DIMENSION(dims(1)) :: buf
-       END FUNCTION h5awrite_double_1_c
-    END INTERFACE
-
-    hdferr = h5awrite_double_1_c(attr_id, memtype_id,  buf, dims)
-  END SUBROUTINE h5awrite_double_1
-
-
-  SUBROUTINE h5awrite_double_2(attr_id, memtype_id,  buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                                ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-    DOUBLE PRECISION, INTENT(IN), &
-         DIMENSION(dims(1),dims(2)) :: buf
-    ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-
-    !            INTEGER, EXTERNAL :: h5awrite_double_2_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5awrite_double_2_c(attr_id, memtype_id,  buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_DOUBLE_2_C'::h5awrite_double_2_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         DOUBLE PRECISION, INTENT(IN), &
-              DIMENSION(dims(1),dims(2)) :: buf
-       END FUNCTION h5awrite_double_2_c
-    END INTERFACE
-
-    hdferr = h5awrite_double_2_c(attr_id, memtype_id,  buf, dims)
-  END SUBROUTINE h5awrite_double_2
-
-
-  SUBROUTINE h5awrite_double_3(attr_id, memtype_id,  buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                                ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-    DOUBLE PRECISION, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3)) :: buf
-    ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-
-    !            INTEGER, EXTERNAL :: h5awrite_double_3_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5awrite_double_3_c(attr_id, memtype_id,  buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_DOUBLE_3_C'::h5awrite_double_3_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         DOUBLE PRECISION, INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3)) :: buf
-       END FUNCTION h5awrite_double_3_c
-    END INTERFACE
-
-    hdferr = h5awrite_double_3_c(attr_id, memtype_id,  buf, dims)
-  END SUBROUTINE h5awrite_double_3
-
-
-  SUBROUTINE h5awrite_double_4(attr_id, memtype_id,  buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                                ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-    DOUBLE PRECISION, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-    ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-
-    !            INTEGER, EXTERNAL :: h5awrite_double_4_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5awrite_double_4_c(attr_id, memtype_id,  buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_DOUBLE_4_C'::h5awrite_double_4_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         DOUBLE PRECISION, INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-       END FUNCTION h5awrite_double_4_c
-    END INTERFACE
-
-    hdferr = h5awrite_double_4_c(attr_id, memtype_id,  buf, dims)
-  END SUBROUTINE h5awrite_double_4
-
-
-  SUBROUTINE h5awrite_double_5(attr_id, memtype_id,  buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                                ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-    DOUBLE PRECISION, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-    ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-
-    !            INTEGER, EXTERNAL :: h5awrite_double_5_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5awrite_double_5_c(attr_id, memtype_id,  buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_DOUBLE_5_C'::h5awrite_double_5_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         DOUBLE PRECISION, INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-       END FUNCTION h5awrite_double_5_c
-    END INTERFACE
-
-    hdferr = h5awrite_double_5_c(attr_id, memtype_id,  buf, dims)
-  END SUBROUTINE h5awrite_double_5
-
-
-  SUBROUTINE h5awrite_double_6(attr_id, memtype_id,  buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                                ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-    DOUBLE PRECISION, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-    ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-
-    !            INTEGER, EXTERNAL :: h5awrite_double_6_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5awrite_double_6_c(attr_id, memtype_id,  buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_DOUBLE_6_C'::h5awrite_double_6_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         DOUBLE PRECISION, INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-       END FUNCTION h5awrite_double_6_c
-    END INTERFACE
-
-    hdferr = h5awrite_double_6_c(attr_id, memtype_id,  buf, dims)
-  END SUBROUTINE h5awrite_double_6
-
-
-  SUBROUTINE h5awrite_double_7(attr_id, memtype_id,  buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                                ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-    DOUBLE PRECISION, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-    ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-
-    !            INTEGER, EXTERNAL :: h5awrite_double_7_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5awrite_double_7_c(attr_id, memtype_id,  buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_DOUBLE_7_C'::h5awrite_double_7_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         DOUBLE PRECISION, INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-       END FUNCTION h5awrite_double_7_c
-    END INTERFACE
-
-    hdferr = h5awrite_double_7_c(attr_id, memtype_id,  buf, dims)
-  END SUBROUTINE h5awrite_double_7
-
-
-  SUBROUTINE h5aread_double_scalar(attr_id, memtype_id,  buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                                ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-    DOUBLE PRECISION, INTENT(INOUT) :: buf    ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-
-    !            INTEGER, EXTERNAL :: h5aread_double_s_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5aread_double_s_c(attr_id, memtype_id,  buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AREAD_DOUBLE_S_C'::h5aread_double_s_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         DOUBLE PRECISION, INTENT(INOUT)::buf
-       END FUNCTION h5aread_double_s_c
-    END INTERFACE
-
-    hdferr = h5aread_double_s_c(attr_id, memtype_id,  buf, dims)
-  END SUBROUTINE h5aread_double_scalar
-
-  SUBROUTINE h5aread_double_1(attr_id, memtype_id,  buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                                ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-    DOUBLE PRECISION, INTENT(INOUT), &
-         DIMENSION(dims(1)) :: buf
-    ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-
-    !            INTEGER, EXTERNAL :: h5aread_double_1_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5aread_double_1_c(attr_id, memtype_id,  buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AREAD_DOUBLE_1_C'::h5aread_double_1_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         DOUBLE PRECISION, INTENT(INOUT), &
-              DIMENSION(dims(1)) :: buf
-       END FUNCTION h5aread_double_1_c
-    END INTERFACE
-
-    hdferr = h5aread_double_1_c(attr_id, memtype_id,  buf, dims)
-  END SUBROUTINE h5aread_double_1
-
-
-  SUBROUTINE h5aread_double_2(attr_id, memtype_id,  buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                                ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-    DOUBLE PRECISION, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2)) :: buf
-    ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-
-    !            INTEGER, EXTERNAL :: h5aread_double_2_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5aread_double_2_c(attr_id, memtype_id,  buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AREAD_DOUBLE_2_C'::h5aread_double_2_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         DOUBLE PRECISION, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2)) :: buf
-       END FUNCTION h5aread_double_2_c
-    END INTERFACE
-
-    hdferr = h5aread_double_2_c(attr_id, memtype_id,  buf, dims)
-  END SUBROUTINE h5aread_double_2
-
-
-  SUBROUTINE h5aread_double_3(attr_id, memtype_id,  buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                                ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-    DOUBLE PRECISION, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3)) :: buf
-    ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-
-    !            INTEGER, EXTERNAL :: h5aread_double_3_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5aread_double_3_c(attr_id, memtype_id,  buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AREAD_DOUBLE_3_C'::h5aread_double_3_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         DOUBLE PRECISION, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3)) :: buf
-       END FUNCTION h5aread_double_3_c
-    END INTERFACE
-
-    hdferr = h5aread_double_3_c(attr_id, memtype_id,  buf, dims)
-  END SUBROUTINE h5aread_double_3
-
-
-  SUBROUTINE h5aread_double_4(attr_id, memtype_id,  buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                                ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-    DOUBLE PRECISION, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-    ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-
-    !            INTEGER, EXTERNAL :: h5aread_double_4_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5aread_double_4_c(attr_id, memtype_id,  buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AREAD_DOUBLE_4_C'::h5aread_double_4_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         DOUBLE PRECISION, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-       END FUNCTION h5aread_double_4_c
-    END INTERFACE
-
-    hdferr = h5aread_double_4_c(attr_id, memtype_id,  buf, dims)
-  END SUBROUTINE h5aread_double_4
-
-
-  SUBROUTINE h5aread_double_5(attr_id, memtype_id,  buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                                ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-    DOUBLE PRECISION, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-    ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-
-    !            INTEGER, EXTERNAL :: h5aread_double_5_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5aread_double_5_c(attr_id, memtype_id,  buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AREAD_DOUBLE_5_C'::h5aread_double_5_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         DOUBLE PRECISION, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-       END FUNCTION h5aread_double_5_c
-    END INTERFACE
-
-    hdferr = h5aread_double_5_c(attr_id, memtype_id,  buf, dims)
-  END SUBROUTINE h5aread_double_5
-
-
-  SUBROUTINE h5aread_double_6(attr_id, memtype_id,  buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                                ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-    DOUBLE PRECISION, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-    ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-
-    !            INTEGER, EXTERNAL :: h5aread_double_6_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5aread_double_6_c(attr_id, memtype_id,  buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AREAD_DOUBLE_6_C'::h5aread_double_6_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         DOUBLE PRECISION, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-       END FUNCTION h5aread_double_6_c
-    END INTERFACE
-
-    hdferr = h5aread_double_6_c(attr_id, memtype_id,  buf, dims)
-  END SUBROUTINE h5aread_double_6
-
-
-  SUBROUTINE h5aread_double_7(attr_id, memtype_id,  buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                                ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-    DOUBLE PRECISION, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-    ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-
-    !            INTEGER, EXTERNAL :: h5aread_double_7_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5aread_double_7_c(attr_id, memtype_id,  buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AREAD_DOUBLE_7_C'::h5aread_double_7_c
-         !DEC$ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         DOUBLE PRECISION, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-       END FUNCTION h5aread_double_7_c
-    END INTERFACE
-
-    hdferr = h5aread_double_7_c(attr_id, memtype_id,  buf, dims)
-  END SUBROUTINE h5aread_double_7
-
-
-  !
-  ! ----- H5D ----
-  !
-  SUBROUTINE h5dwrite_double_scalar(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    DOUBLE PRECISION, INTENT(IN) :: buf ! Data buffer
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
-    ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
-    ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
-    ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    !            INTEGER, EXTERNAL :: h5dwrite_double_s_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5dwrite_double_s_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DWRITE_DOUBLE_S_C'::h5dwrite_double_s_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         DOUBLE PRECISION, INTENT(IN) :: buf
-       END FUNCTION h5dwrite_double_s_c
-    END INTERFACE
-
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    if (present(xfer_prp)) xfer_prp_default = xfer_prp
-    if (present(mem_space_id))  mem_space_id_default = mem_space_id
-    if (present(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dwrite_double_s_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dwrite_double_scalar
-
-  SUBROUTINE h5dwrite_double_1(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    DOUBLE PRECISION, INTENT(IN), &
-         DIMENSION(dims(1)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
-    ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
-    ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
-    ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    !            INTEGER, EXTERNAL :: h5dwrite_double_1_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5dwrite_double_1_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DWRITE_DOUBLE_1_C'::h5dwrite_double_1_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         DOUBLE PRECISION, INTENT(IN), &
-              DIMENSION(dims(1)) :: buf
-       END FUNCTION h5dwrite_double_1_c
-    END INTERFACE
-
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    if (present(xfer_prp)) xfer_prp_default = xfer_prp
-    if (present(mem_space_id))  mem_space_id_default = mem_space_id
-    if (present(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dwrite_double_1_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dwrite_double_1
-
-  SUBROUTINE h5dwrite_double_2(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    DOUBLE PRECISION, INTENT(IN), &
-         DIMENSION(dims(1),dims(2)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
-    ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
-    ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
-    ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    !            INTEGER, EXTERNAL :: h5dwrite_double_2_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5dwrite_double_2_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DWRITE_DOUBLE_2_C'::h5dwrite_double_2_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         DOUBLE PRECISION, INTENT(IN), &
-              DIMENSION(dims(1),dims(2)) :: buf
-       END FUNCTION h5dwrite_double_2_c
-    END INTERFACE
-
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    if (present(xfer_prp)) xfer_prp_default = xfer_prp
-    if (present(mem_space_id))  mem_space_id_default = mem_space_id
-    if (present(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dwrite_double_2_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dwrite_double_2
-
-  SUBROUTINE h5dwrite_double_3(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    DOUBLE PRECISION, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
-    ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
-    ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
-    ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    !            INTEGER, EXTERNAL :: h5dwrite_double_3_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5dwrite_double_3_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DWRITE_DOUBLE_3_C'::h5dwrite_double_3_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         DOUBLE PRECISION, INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3)) :: buf
-       END FUNCTION h5dwrite_double_3_c
-    END INTERFACE
-
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    if (present(xfer_prp)) xfer_prp_default = xfer_prp
-    if (present(mem_space_id))  mem_space_id_default = mem_space_id
-    if (present(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dwrite_double_3_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dwrite_double_3
-
-  SUBROUTINE h5dwrite_double_4(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    DOUBLE PRECISION, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
-    ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
-    ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
-    ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    !            INTEGER, EXTERNAL :: h5dwrite_double_4_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5dwrite_double_4_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DWRITE_DOUBLE_4_C'::h5dwrite_double_4_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         DOUBLE PRECISION, INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-       END FUNCTION h5dwrite_double_4_c
-    END INTERFACE
-
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    if (present(xfer_prp)) xfer_prp_default = xfer_prp
-    if (present(mem_space_id))  mem_space_id_default = mem_space_id
-    if (present(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dwrite_double_4_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dwrite_double_4
-
-  SUBROUTINE h5dwrite_double_5(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    DOUBLE PRECISION, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
-    ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
-    ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
-    ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    !            INTEGER, EXTERNAL :: h5dwrite_double_5_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5dwrite_double_5_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DWRITE_DOUBLE_5_C'::h5dwrite_double_5_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         DOUBLE PRECISION, INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-       END FUNCTION h5dwrite_double_5_c
-    END INTERFACE
-
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    if (present(xfer_prp)) xfer_prp_default = xfer_prp
-    if (present(mem_space_id))  mem_space_id_default = mem_space_id
-    if (present(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dwrite_double_5_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dwrite_double_5
-
-  SUBROUTINE h5dwrite_double_6(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    DOUBLE PRECISION, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-    ! Data buffer
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
-    ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
-    ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
-    ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    !            INTEGER, EXTERNAL :: h5dwrite_double_6_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5dwrite_double_6_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DWRITE_DOUBLE_6_C'::h5dwrite_double_6_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         DOUBLE PRECISION, INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-       END FUNCTION h5dwrite_double_6_c
-    END INTERFACE
-
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    if (present(xfer_prp)) xfer_prp_default = xfer_prp
-    if (present(mem_space_id))  mem_space_id_default = mem_space_id
-    if (present(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dwrite_double_6_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dwrite_double_6
-
-  SUBROUTINE h5dwrite_double_7(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    DOUBLE PRECISION, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-    ! Data buffer
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
-    ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
-    ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
-    ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    !            INTEGER, EXTERNAL :: h5dwrite_double_7_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5dwrite_double_7_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DWRITE_DOUBLE_7_C'::h5dwrite_double_7_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         DOUBLE PRECISION, INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-       END FUNCTION h5dwrite_double_7_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    if (present(xfer_prp)) xfer_prp_default = xfer_prp
-    if (present(mem_space_id))  mem_space_id_default = mem_space_id
-    if (present(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dwrite_double_7_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dwrite_double_7
-
-  SUBROUTINE h5dread_double_scalar(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    DOUBLE PRECISION, INTENT(INOUT) :: buf ! Data buffer
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
-    ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
-    ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
-    ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    !            INTEGER, EXTERNAL :: h5dread_double_s_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5dread_double_s_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DREAD_DOUBLE_S_C'::h5dread_double_s_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         DOUBLE PRECISION, INTENT(OUT) :: buf
-       END FUNCTION h5dread_double_s_c
-    END INTERFACE
-
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    if (present(xfer_prp)) xfer_prp_default = xfer_prp
-    if (present(mem_space_id))  mem_space_id_default = mem_space_id
-    if (present(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dread_double_s_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dread_double_scalar
-
-  SUBROUTINE h5dread_double_1(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    DOUBLE PRECISION, INTENT(INOUT), &
-         DIMENSION(dims(1)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
-    ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
-    ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
-    ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    !            INTEGER, EXTERNAL :: h5dread_double_1_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5dread_double_1_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DREAD_DOUBLE_1_C'::h5dread_double_1_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         DOUBLE PRECISION, INTENT(INOUT), &
-              DIMENSION(dims(1)) :: buf
-       END FUNCTION h5dread_double_1_c
-    END INTERFACE
-
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    if (present(xfer_prp)) xfer_prp_default = xfer_prp
-    if (present(mem_space_id))  mem_space_id_default = mem_space_id
-    if (present(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dread_double_1_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dread_double_1
-
-  SUBROUTINE h5dread_double_2(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    DOUBLE PRECISION, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
-    ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
-    ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
-    ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    !            INTEGER, EXTERNAL :: h5dread_double_2_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5dread_double_2_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DREAD_DOUBLE_2_C'::h5dread_double_2_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         DOUBLE PRECISION, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2)) :: buf
-       END FUNCTION h5dread_double_2_c
-    END INTERFACE
-
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    if (present(xfer_prp)) xfer_prp_default = xfer_prp
-    if (present(mem_space_id))  mem_space_id_default = mem_space_id
-    if (present(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dread_double_2_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dread_double_2
-
-  SUBROUTINE h5dread_double_3(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    DOUBLE PRECISION, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
-    ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
-    ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
-    ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    !            INTEGER, EXTERNAL :: h5dread_double_3_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5dread_double_3_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DREAD_DOUBLE_3_C'::h5dread_double_3_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         DOUBLE PRECISION, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3)) :: buf
-       END FUNCTION h5dread_double_3_c
-    END INTERFACE
-
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    if (present(xfer_prp)) xfer_prp_default = xfer_prp
-    if (present(mem_space_id))  mem_space_id_default = mem_space_id
-    if (present(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dread_double_3_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dread_double_3
-
-  SUBROUTINE h5dread_double_4(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    DOUBLE PRECISION, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-    ! Data buffer
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
-    ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
-    ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
-    ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    !            INTEGER, EXTERNAL :: h5dread_double_4_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5dread_double_4_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DREAD_DOUBLE_4_C'::h5dread_double_4_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         DOUBLE PRECISION, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-       END FUNCTION h5dread_double_4_c
-    END INTERFACE
-
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    if (present(xfer_prp)) xfer_prp_default = xfer_prp
-    if (present(mem_space_id))  mem_space_id_default = mem_space_id
-    if (present(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dread_double_4_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dread_double_4
-
-  SUBROUTINE h5dread_double_5(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    DOUBLE PRECISION, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
-    ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
-    ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
-    ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    !            INTEGER, EXTERNAL :: h5dread_double_5_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5dread_double_5_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DREAD_DOUBLE_5_C'::h5dread_double_5_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         DOUBLE PRECISION, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-       END FUNCTION h5dread_double_5_c
-    END INTERFACE
-
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    if (present(xfer_prp)) xfer_prp_default = xfer_prp
-    if (present(mem_space_id))  mem_space_id_default = mem_space_id
-    if (present(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dread_double_5_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dread_double_5
-
-  SUBROUTINE h5dread_double_6(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    DOUBLE PRECISION, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-    ! Data buffer
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
-    ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
-    ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
-    ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    !            INTEGER, EXTERNAL :: h5dread_double_6_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5dread_double_6_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DREAD_DOUBLE_6_C'::h5dread_double_6_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         DOUBLE PRECISION, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-       END FUNCTION h5dread_double_6_c
-    END INTERFACE
-
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    if (present(xfer_prp)) xfer_prp_default = xfer_prp
-    if (present(mem_space_id))  mem_space_id_default = mem_space_id
-    if (present(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dread_double_6_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dread_double_6
-
-  SUBROUTINE h5dread_double_7(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    DOUBLE PRECISION, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-    ! Data buffer
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
-    ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
-    ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
-    ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    !            INTEGER, EXTERNAL :: h5dread_double_7_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5dread_double_7_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DREAD_DOUBLE_7_C'::h5dread_double_7_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         DOUBLE PRECISION, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-       END FUNCTION h5dread_double_7_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    if (present(xfer_prp)) xfer_prp_default = xfer_prp
-    if (present(mem_space_id))  mem_space_id_default = mem_space_id
-    if (present(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dread_double_7_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dread_double_7
-
-  !----------------------------------------------------------------------
-  ! Name:		h5dfill_double
-  !
-  ! Purpose:      Fills dataspace elements with a fill value in a memory buffer.
-  !               Only INTEGER, CHARACTER, REAL and DOUBLE PRECISION datatypes
-  !               of the fillvalues and buffers are supported. Buffer and fillvalue
-  !               are assumed to have the same datatype.
-  !               Only one-dimesional buffers are supported.
-  !
-  ! Inputs:
-  !		fill_value	- fill value
-  !		space_id	- memory space selection identifier
-  !		buf		- data buffer iin memory ro apply selection to
-  !				- of k-th dimension of the buf array
-  ! Outputs:
-  !		hdferr:		- error code
-  !				 	Success:  0
-  !				 	Failure: -1
-  !
-  ! Programmer:	Elena Pourmal
-  !		March 12, 2003
-  !
-  !----------------------------------------------------------------------
-
-  SUBROUTINE h5dfill_double(fill_value, space_id, buf,  hdferr)
-    IMPLICIT NONE
-    DOUBLE PRECISION, INTENT(IN) :: fill_value  ! Fill value
-    INTEGER(HID_T), INTENT(IN) :: space_id ! Memory dataspace selection identifier
-    DOUBLE PRECISION, INTENT(IN), DIMENSION(*) :: buf ! Memory buffer to fill in
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-
-    INTEGER(HID_T) :: fill_type_id ! Fill value datatype identifier
-    INTEGER(HID_T) :: mem_type_id !  Buffer dadtype identifier
-
-    !            INTEGER, EXTERNAL :: h5dfill_double_c
-    ! MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5dfill_double_c(fill_value, fill_type_id, space_id, &
-            buf, mem_type_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DFILL_DOUBLE_C'::h5dfill_double_c
-         !DEC$ENDIF
-         DOUBLE PRECISION, INTENT(IN) :: fill_value  ! Fill value
-         INTEGER(HID_T) :: fill_type_id ! Fill value datatype identifier
-         INTEGER(HID_T), INTENT(IN) :: space_id ! Memory dataspace selection identifier
-         DOUBLE PRECISION, INTENT(IN), DIMENSION(*) :: buf ! Memory buffer to fill in
-         INTEGER(HID_T) :: mem_type_id !  Buffer dadtype identifier
-       END FUNCTION h5dfill_double_c
-    END INTERFACE
-    fill_type_id = H5T_NATIVE_DOUBLE
-    mem_type_id  = H5T_NATIVE_DOUBLE
-
-    hdferr = h5dfill_double_c(fill_value, fill_type_id, space_id, &
-         buf, mem_type_id)
-
-
-  END SUBROUTINE h5dfill_double
-
-  !
-  ! -- H5P ---
-  !
-
-  SUBROUTINE h5pset_fill_value_double(prp_id, type_id, fillvalue, &
-       hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
-    INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier of
-                                          ! of fillvalue datatype
-                                          ! (in memory)
-    DOUBLE PRECISION, INTENT(IN) :: fillvalue   ! Fillvalue
-    INTEGER, INTENT(OUT) :: hdferr  ! Error code
-
-    INTERFACE
-       INTEGER FUNCTION h5pset_fill_value_double_c(prp_id, type_id, fillvalue)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_FILL_VALUE_DOUBLE_C'::h5pset_fill_value_double_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         INTEGER(HID_T), INTENT(IN) :: type_id
-         DOUBLE PRECISION, INTENT(IN) :: fillvalue
-       END FUNCTION h5pset_fill_value_double_c
-    END INTERFACE
-
-    hdferr = h5pset_fill_value_double_c(prp_id, type_id, fillvalue)
-  END SUBROUTINE h5pset_fill_value_double
-
-  SUBROUTINE h5pget_fill_value_double(prp_id, type_id, fillvalue, &
-       hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
-    INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier of
-                                          ! of fillvalue datatype
-                                          ! (in memory)
-    DOUBLE PRECISION, INTENT(IN) :: fillvalue   ! Fillvalue
-    INTEGER, INTENT(OUT) :: hdferr  ! Error code
-
-    INTERFACE
-       INTEGER FUNCTION h5pget_fill_value_double_c(prp_id, type_id, fillvalue)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_FILL_VALUE_DOUBLE_C'::h5pget_fill_value_double_c
-         !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         INTEGER(HID_T), INTENT(IN) :: type_id
-         DOUBLE PRECISION :: fillvalue
-       END FUNCTION h5pget_fill_value_double_c
-    END INTERFACE
-
-    hdferr = h5pget_fill_value_double_c(prp_id, type_id, fillvalue)
-  END SUBROUTINE h5pget_fill_value_double
-
-!
-!****s* H5P (F90)/h5pset_double
-!
-! NAME
-!  h5pset_double
-!
-! PURPOSE
-!  Sets a property list value
-!
-! INPUTS
-!  prp_id 	 - iproperty list identifier to modify
-!  name 	 - name of property to modify
-!  value 	 - value to set property to
-! OUTPUTS
-!  hdferr:	 - error code
-!                   Success:  0
-!                   Failure: -1
-! AUTHOR
-!  Elena Pourmal
-!  October 9, 2002
-! SOURCE
-  SUBROUTINE h5pset_double(prp_id, name, value, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id    ! Property list identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name    ! Name of property to modify
-    DOUBLE PRECISION,   INTENT(IN) :: value ! Property value
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-!*****
-    INTEGER :: name_len
-
-    INTERFACE
-       INTEGER FUNCTION h5pset_double_c(prp_id, name, name_len, value)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_DOUBLE_C'::h5pset_double_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER, INTENT(IN)         :: name_len
-         DOUBLE PRECISION, INTENT(IN) :: value
-       END FUNCTION h5pset_double_c
-    END INTERFACE
-
-    name_len = LEN(name)
-    hdferr = h5pset_double_c(prp_id, name , name_len, value)
-  END SUBROUTINE h5pset_double
-
-!****s* H5P (F90)/h5pget_double
-!
-! NAME
-!  h5pget_double
-!
-! PURPOSE
-!  Gets a property list value
-!
-! INPUTS
-!  prp_id 	 - iproperty list identifier to modify
-!  name 	 - name of property to modify
-! OUTPUTS
-!  value 	 - value of property
-!  hdferr	 - error code
-!                   Success:  0
-!                   Failure: -1
-! AUTHOR
-!  Elena Pourmal
-!  October 9, 2002
-!
-! SOURCE
-  SUBROUTINE h5pget_double(prp_id, name, value, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id     ! Property list identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name     ! Name of property to modify
-    DOUBLE PRECISION,   INTENT(OUT) :: value ! Property value
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-!*****
-    INTEGER :: name_len
-
-    INTERFACE
-       INTEGER FUNCTION h5pget_double_c(prp_id, name, name_len, value)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_DOUBLE_C'::h5pget_double_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER, INTENT(IN)         :: name_len
-         DOUBLE PRECISION, INTENT(OUT) :: value
-       END FUNCTION h5pget_double_c
-    END INTERFACE
-
-    name_len = LEN(name)
-    hdferr = h5pget_double_c(prp_id, name , name_len, value)
-  END SUBROUTINE h5pget_double
-
-!
-!****s* H5P (F90)/h5pregister_double
-!
-! NAME
-!  h5pregister_double
-!
-! PURPOSE
-!  Registers a permanent property with a property list class.
-!
-! INPUTS
-!  class 	 - property list class to register
-!                  permanent property within
-!  name 	 - name of property to register
-!  size 	 - size of property in bytes
-!  value 	 - default value for property in newly
-!                  created property lists
-! OUTPUTS
-!  hdferr	 - error code
-!                   Success:  0
-!                   Failure: -1
-! AUTHOR
-!  Elena Pourmal
-!  October 10, 2002
-!
-! SOURCE
-  SUBROUTINE h5pregister_double(class, name, size, value, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: class     ! Property list class identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name    ! Name of property to register
-    INTEGER(SIZE_T), INTENT(IN) :: size     ! Size of the property value
-    DOUBLE PRECISION,   INTENT(IN) :: value ! Property value
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-!*****
-    INTEGER :: name_len
-
-    INTERFACE
-       INTEGER FUNCTION h5pregister_double_c(class, name, name_len, size, value)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PREGISTER_DOUBLE_C'::h5pregister_double_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         INTEGER(HID_T), INTENT(IN) :: class
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER, INTENT(IN)         :: name_len
-         INTEGER(SIZE_T), INTENT(IN) :: size
-         DOUBLE PRECISION, INTENT(IN) :: value
-       END FUNCTION h5pregister_double_c
-    END INTERFACE
-
-    name_len = LEN(name)
-    hdferr = h5pregister_double_c(class, name , name_len, size, value)
-  END SUBROUTINE h5pregister_double
-
-!****s* H5P (F90)/h5pinsert_double
-!
-! NAME
-!
-!  h5pinsert_double
-!
-! PURPOSE
-!  Registers a temporary property with a property list class.
-!
-! INPUTS
-!  plist 	 - property list identifier
-!                  permanent property within
-!  name 	 - name of property to insert
-!  size 	 - size of property in bytes
-!  value 	 - initial value for the property
-! OUTPUTS
-!  hdferr	 - error code
-!                   Success:  0
-!                   Failure: -1
-! AUTHOR
-!  Elena Pourmal
-!  October 10, 2002
-! SOURCE
-  SUBROUTINE h5pinsert_double(plist, name, size, value, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: plist   ! Property list identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name  ! Name of property to insert
-    INTEGER(SIZE_T), INTENT(IN) :: size   ! Size of the property value
-    DOUBLE PRECISION, INTENT(IN) :: value ! Property value
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-    INTEGER :: name_len
-
-    INTERFACE
-       INTEGER FUNCTION h5pinsert_double_c(plist, name, name_len, size, value)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PINSERT_DOUBLE_C'::h5pinsert_double_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         INTEGER(HID_T), INTENT(IN) :: plist
-         CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER, INTENT(IN)         :: name_len
-         INTEGER(SIZE_T), INTENT(IN) :: size
-         DOUBLE PRECISION, INTENT(IN) :: value
-       END FUNCTION h5pinsert_double_c
-    END INTERFACE
-
-    name_len = LEN(name)
-    hdferr = h5pinsert_double_c(plist, name , name_len, size, value)
-  END SUBROUTINE h5pinsert_double
-
-END MODULE H5_DBLE_INTERFACE
diff --git a/fortran/src/H5_buildiface.F90 b/fortran/src/H5_buildiface.F90
new file mode 100644
index 0000000..c473e51
--- /dev/null
+++ b/fortran/src/H5_buildiface.F90
@@ -0,0 +1,1076 @@
+!****p* Program/H5_buildiface
+!
+! NAME
+!  Executable: H5_buildiface
+!
+! FILE
+!  fortran/src/H5_buildiface.F90
+!
+! PURPOSE
+!  This stand alone program is used at build time to generate the module
+!  H5_gen (H5_gen.F90). It cycles through all the available KIND parameters for
+!  integers and reals. The appropriate program and subroutines are then generated
+!  depending on which of the KIND values are found.
+!
+! NOTES
+!  This program uses the Fortran 2008 intrinsic function STORAGE_SIZE or SIZEOF
+!  depending on availability.It generates code that makes use of
+!  STORAGE_SIZE/SIZEOF in H5_gen.F90. STORAGE_SIZE is standard
+!  compliant and should always be chosen over SIZEOF.
+!
+!  The availability of STORAGE_SIZE/SIZEOF is checked at configure time and the TRUE/FALSE
+!  condition is set in the configure variable "FORTRAN_HAVE_STORAGE_SIZE" or
+!  "FORTRAN_HAVE_SIZEOF".
+!
+!  The use of C_SIZOF(X) is not used since the argument X must be an interoperable
+!  data entity.
+!
+! COPYRIGHT
+!  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!  Copyright by The HDF Group.                                                 *
+!  All rights reserved.                                                        *
+!                                                                              *
+!  This file is part of HDF5.  The full HDF5 copyright notice, including       *
+!  terms governing use, modification, and redistribution, is contained in      *
+!  the COPYING file, which can be found at the root of the source code         *
+!  distribution tree, or in https://www.hdfgroup.org/licenses.                 *
+!  If you do not have access to either file, you may request a copy from       *
+!  help@hdfgroup.org.                                                          *
+!  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+! AUTHOR
+!  M. Scot Breitenfeld
+!
+!*****
+
+#include <H5config_f.inc>
+
+PROGRAM H5_buildiface
+  USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR, C_CHAR, C_LOC
+  IMPLICIT NONE
+
+! These values are valid REAL KINDs (with corresponding C float) found during configure
+  H5_H5CONFIG_F_NUM_RKIND
+  H5_H5CONFIG_F_RKIND
+! These values are valid INTEGER KINDs (with corresponding C integer) found during configure
+  H5_H5CONFIG_F_NUM_IKIND
+  H5_H5CONFIG_F_IKIND
+
+  INTEGER :: i, j, k
+  CHARACTER(LEN=2) :: chr2
+! subroutine rank of array being passed in
+  CHARACTER(LEN=2), DIMENSION(1:8), PARAMETER :: chr_rank=(/"_0","_1","_2","_3","_4","_5","_6","_7"/)
+! rank definitions
+  CHARACTER(LEN=70), DIMENSION(1:8), PARAMETER :: rank_dim_line=(/ &
+       '                                                                    ', &
+       ', DIMENSION(dims(1))                                                ', &
+       ', DIMENSION(dims(1),dims(2))                                        ', &
+       ', DIMENSION(dims(1),dims(2),dims(3))                                ', &
+       ', DIMENSION(dims(1),dims(2),dims(3),dims(4))                        ', &
+       ', DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5))                ', &
+       ', DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6))        ', &
+       ', DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7))' &
+            /)
+! pointer to the buffer
+  CHARACTER(LEN=37), DIMENSION(1:8), PARAMETER :: f_ptr_line=(/ &
+       '    f_ptr = C_LOC(buf)               ', &
+       '    f_ptr = C_LOC(buf(1))            ', &
+       '    f_ptr = C_LOC(buf(1,1))          ', &
+       '    f_ptr = C_LOC(buf(1,1,1))        ', &
+       '    f_ptr = C_LOC(buf(1,1,1,1))      ', &
+       '    f_ptr = C_LOC(buf(1,1,1,1,1))    ', &
+       '    f_ptr = C_LOC(buf(1,1,1,1,1,1))  ', &
+       '    f_ptr = C_LOC(buf(1,1,1,1,1,1,1))'  &
+            /)
+  CHARACTER(LEN=42), DIMENSION(1:8), PARAMETER :: fchr_ptr_line=(/ &
+       '    f_ptr = C_LOC(buf(1:1))               ', &
+       '    f_ptr = C_LOC(buf(1)(1:1))            ', &
+       '    f_ptr = C_LOC(buf(1,1)(1:1))          ', &
+       '    f_ptr = C_LOC(buf(1,1,1)(1:1))        ', &
+       '    f_ptr = C_LOC(buf(1,1,1,1)(1:1))      ', &
+       '    f_ptr = C_LOC(buf(1,1,1,1,1)(1:1))    ', &
+       '    f_ptr = C_LOC(buf(1,1,1,1,1,1)(1:1))  ', &
+       '    f_ptr = C_LOC(buf(1,1,1,1,1,1,1)(1:1))'  &
+            /)
+
+! (a) Generate Fortran H5* interfaces having multiple KIND interfaces.
+!
+! DEVELOPER'S NOTES:
+!
+! Only interfaces with arrays of rank 7 and less are provided. Even-though, the F2008
+! standard extended the maximum rank to 15, it was decided that user's should use the
+! new APIs to handle those use cases. Handling rank 7 and less is for backward compatibility
+! with the Fortran 90/95 APIs codes which could never handle ranks greater than 7.
+
+  OPEN(11,FILE='H5_gen.F90')
+  WRITE(11,'(40(A,/))') &
+'!****h* ROBODoc/H5_gen.F90',&
+'!',&
+'! NAME',&
+'!  H5_gen',&
+'! ',&
+'! PURPOSE',&
+'!  This module is generated at build by H5_buildiface.F90 to handle all the',&
+'!  detected KINDs for APIs being passed INTEGERs, REALs and CHARACTERs. Currently ',&
+'!  these are H5A, H5D and H5P APIs',&
+'!',&
+'! COPYRIGHT',&
+'! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *',&
+'!   Copyright by The HDF Group.                                               *',&
+'!   All rights reserved.                                                      *',&
+'!                                                                             *',&
+'!   This file is part of HDF5.  The full HDF5 copyright notice, including     *',&
+'!   terms governing use, modification, and redistribution, is contained in    *',&
+'!   the COPYING file, which can be found at the root of the source code       *',&
+'!   distribution tree, or in https://www.hdfgroup.org/licenses.               *',&
+'!   If you do not have access to either file, you may request a copy from     *',&
+'!   help@hdfgroup.org.                                                        *',&
+'! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *',&
+'!',&
+'! AUTHOR',&
+'!  H5_buildiface.F90',&
+'!',&
+'!*****'
+
+  WRITE(11,'(A)') "MODULE H5_GEN"
+
+  WRITE(11,'(2X,A)') 'USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR, C_LOC'
+  WRITE(11,'(2X,A)') 'USE H5GLOBAL'
+
+  WRITE(11,'(2X,A)') 'USE H5A'
+  WRITE(11,'(2X,A)') 'USE H5D'
+  WRITE(11,'(2X,A)') 'USE H5P'
+  WRITE(11,'(2X,A)') 'IMPLICIT NONE'
+
+!******************************
+! DECLARE PRIVATE INTERFACES
+!******************************
+
+  DO i = 1, num_rkinds
+     j = rkind(i)
+     WRITE(chr2,'(I2)') j
+     DO k = 1, 8
+        WRITE(11,'(2X,A)') "PRIVATE h5awrite_rkind_"//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(k)
+     ENDDO
+  END DO
+  DO i = 1, num_ikinds
+     j = ikind(i)
+     WRITE(chr2,'(I2)') j
+     DO k = 1, 8
+        WRITE(11,'(2X,A)') "PRIVATE h5awrite_ikind_"//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(k)
+     ENDDO
+  END DO
+  DO k = 2, 8
+     WRITE(11,'(2X,A)') "PRIVATE h5awrite_ckind_rank"//chr_rank(k)
+  ENDDO
+  DO i = 1, num_rkinds
+     j = rkind(i)
+     WRITE(chr2,'(I2)') j
+     DO k = 1, 8
+        WRITE(11,'(2X,A)') "PRIVATE h5aread_rkind_"//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(k)
+     ENDDO
+  END DO
+  DO i = 1, num_ikinds
+     j = ikind(i)
+     WRITE(chr2,'(I2)') j
+     DO k = 1, 8
+        WRITE(11,'(2X,A)') "PRIVATE h5aread_ikind_"//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(k)
+     ENDDO
+  END DO
+  DO k = 2, 8
+     WRITE(11,'(2X,A)') "PRIVATE h5aread_ckind_rank"//chr_rank(k)
+  ENDDO
+
+  DO i = 1, num_rkinds
+     j = rkind(i)
+     WRITE(chr2,'(I2)') j
+     DO k = 1, 8
+        WRITE(11,'(2X,A)') "PRIVATE h5dwrite_rkind_"//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(k)
+     ENDDO
+  END DO
+  DO i = 1, num_ikinds
+     j = ikind(i)
+     WRITE(chr2,'(I2)') j
+     DO k = 1, 8
+        WRITE(11,'(2X,A)') "PRIVATE h5dwrite_ikind_"//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(k)
+     ENDDO
+  END DO
+  DO k = 2, 8
+     WRITE(11,'(2X,A)') "PRIVATE h5dwrite_ckind_rank"//chr_rank(k)
+  END DO
+  DO i = 1, num_rkinds
+     j = rkind(i)
+     WRITE(chr2,'(I2)') j
+     DO k = 1, 8
+        WRITE(11,'(2X,A)') "PRIVATE h5dread_rkind_"//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(k)
+     ENDDO
+  END DO
+  DO i = 1, num_ikinds
+     j = ikind(i)
+     WRITE(chr2,'(I2)') j
+     DO k = 1, 8
+        WRITE(11,'(2X,A)') "PRIVATE h5dread_ikind_"//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(k)
+     ENDDO
+  END DO
+  DO k = 2, 8
+     WRITE(11,'(2X,A)') "PRIVATE h5dread_ckind_rank"//chr_rank(k)
+  ENDDO
+
+  DO i = 1, num_rkinds
+     j = rkind(i)
+     WRITE(chr2,'(I2)') j
+     WRITE(11,'(2X,A)') "PRIVATE h5pset_fill_value_kind_"//TRIM(ADJUSTL(chr2))
+  END DO
+  DO i = 1, num_rkinds
+     j = rkind(i)
+     WRITE(chr2,'(I2)') j
+     WRITE(11,'(2X,A)') "PRIVATE h5pget_fill_value_kind_"//TRIM(ADJUSTL(chr2))
+  END DO
+  DO i = 1, num_rkinds
+     j = rkind(i)
+     WRITE(chr2,'(I2)') j
+     WRITE(11,'(2X,A)') "PRIVATE h5pset_kind_"//TRIM(ADJUSTL(chr2))
+  END DO
+  DO i = 1, num_rkinds
+     j = rkind(i)
+     WRITE(chr2,'(I2)') j
+     WRITE(11,'(2X,A)') "PRIVATE h5pget_kind_"//TRIM(ADJUSTL(chr2))
+  END DO
+  DO i = 1, num_rkinds
+     j = rkind(i)
+     WRITE(chr2,'(I2)') j
+     WRITE(11,'(2X,A)') "PRIVATE h5pregister_kind_"//TRIM(ADJUSTL(chr2))
+  END DO
+  DO i = 1, num_rkinds
+     j = rkind(i)
+     WRITE(chr2,'(I2)') j
+     WRITE(11,'(2X,A)') "PRIVATE h5pinsert_kind_"//TRIM(ADJUSTL(chr2))
+  END DO
+
+!***************
+! H5A INTERFACES
+!***************
+!
+! H5Awrite_f
+!
+  WRITE(11,'(2X,A)') "INTERFACE h5awrite_f"
+  DO i = 1, num_rkinds
+     j = rkind(i)
+     WRITE(chr2,'(I2)') j
+     DO k = 1, 8
+        WRITE(11,'(5X,A)') "MODULE PROCEDURE h5awrite_rkind_"//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(k)
+     ENDDO
+  END DO
+  DO i = 1, num_ikinds
+     j = ikind(i)
+     WRITE(chr2,'(I2)') j
+     DO k = 1, 8
+        WRITE(11,'(5X,A)') "MODULE PROCEDURE h5awrite_ikind_"//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(k)
+     ENDDO
+  END DO
+  DO k = 2, 8
+     WRITE(11,'(5X,A)') "MODULE PROCEDURE h5awrite_ckind_rank"//chr_rank(k)
+  ENDDO
+  WRITE(11,'(2X,A)') "END INTERFACE"
+
+! H5Aread_f
+  WRITE(11,'(2X,A)') "INTERFACE h5aread_f"
+  DO i = 1, num_rkinds
+     j = rkind(i)
+     WRITE(chr2,'(I2)') j
+     DO k = 1, 8
+        WRITE(11,'(5X,A)') "MODULE PROCEDURE h5aread_rkind_"//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(k)
+     ENDDO
+  END DO
+  DO i = 1, num_ikinds
+     j = ikind(i)
+     WRITE(chr2,'(I2)') j
+     DO k = 1, 8
+        WRITE(11,'(5X,A)') "MODULE PROCEDURE h5aread_ikind_"//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(k)
+     ENDDO
+  END DO
+  DO k = 2, 8
+     WRITE(11,'(5X,A)') "MODULE PROCEDURE h5aread_ckind_rank"//chr_rank(k)
+  ENDDO
+  WRITE(11,'(2X,A)') "END INTERFACE"
+!***************
+! H5D INTERFACES
+!***************
+!
+! H5Dwrite_f
+  WRITE(11,'(2X,A)') "INTERFACE h5dwrite_f"
+  DO i = 1, num_rkinds
+     j = rkind(i)
+     WRITE(chr2,'(I2)') j
+     DO k = 1, 8
+        WRITE(11,'(5X,A)') "MODULE PROCEDURE h5dwrite_rkind_"//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(k)
+     ENDDO
+  END DO
+  DO i = 1, num_ikinds
+     j = ikind(i)
+     WRITE(chr2,'(I2)') j
+     DO k = 1, 8
+        WRITE(11,'(5X,A)') "MODULE PROCEDURE h5dwrite_ikind_"//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(k)
+     ENDDO
+  END DO
+  DO k = 2, 8
+     WRITE(11,'(5X,A)') "MODULE PROCEDURE h5dwrite_ckind_rank"//chr_rank(k)
+  END DO
+  WRITE(11,'(2X,A)') "END INTERFACE"
+
+! H5Dread_f
+  WRITE(11,'(2X,A)') "INTERFACE h5dread_f"
+  DO i = 1, num_rkinds
+     j = rkind(i)
+     WRITE(chr2,'(I2)') j
+     DO k = 1, 8
+        WRITE(11,'(5X,A)') "MODULE PROCEDURE h5dread_rkind_"//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(k)
+     ENDDO
+  END DO
+  DO i = 1, num_ikinds
+     j = ikind(i)
+     WRITE(chr2,'(I2)') j
+     DO k = 1, 8
+        WRITE(11,'(5X,A)') "MODULE PROCEDURE h5dread_ikind_"//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(k)
+     ENDDO
+  END DO
+  DO k = 2, 8
+     WRITE(11,'(5X,A)') "MODULE PROCEDURE h5dread_ckind_rank"//chr_rank(k)
+  ENDDO
+  WRITE(11,'(2X,A)') "END INTERFACE"
+
+!***************
+! H5P INTERFACES
+!***************
+!
+! H5Pset_fill_value_f
+  WRITE(11,'(2X,A)') "INTERFACE h5pset_fill_value_f"
+  DO i = 1, num_rkinds
+     j = rkind(i)
+     WRITE(chr2,'(I2)') j
+     WRITE(11,'(5X,A)') "MODULE PROCEDURE h5pset_fill_value_kind_"//TRIM(ADJUSTL(chr2))
+  END DO
+  WRITE(11,'(2X,A)') "END INTERFACE"
+
+! H5Pget_fill_value_f
+  WRITE(11,'(2X,A)') "INTERFACE h5pget_fill_value_f"
+  DO i = 1, num_rkinds
+     j = rkind(i)
+     WRITE(chr2,'(I2)') j
+     WRITE(11,'(5X,A)') "MODULE PROCEDURE h5pget_fill_value_kind_"//TRIM(ADJUSTL(chr2))
+  END DO
+  WRITE(11,'(2X,A)') "END INTERFACE"
+
+! H5Pset_f
+  WRITE(11,'(2X,A)') "INTERFACE h5pset_f"
+  DO i = 1, num_rkinds
+     j = rkind(i)
+     WRITE(chr2,'(I2)') j
+     WRITE(11,'(5X,A)') "MODULE PROCEDURE h5pset_kind_"//TRIM(ADJUSTL(chr2))
+  END DO
+  WRITE(11,'(2X,A)') "END INTERFACE"
+
+! H5Pget_f
+  WRITE(11,'(2X,A)') "INTERFACE h5pget_f"
+  DO i = 1, num_rkinds
+     j = rkind(i)
+     WRITE(chr2,'(I2)') j
+     WRITE(11,'(5X,A)') "MODULE PROCEDURE h5pget_kind_"//TRIM(ADJUSTL(chr2))
+  END DO
+  WRITE(11,'(2X,A)') "END INTERFACE"
+
+! H5Pregister_f
+  WRITE(11,'(2X,A)') "INTERFACE h5pregister_f"
+  DO i = 1, num_rkinds
+     j = rkind(i)
+     WRITE(chr2,'(I2)') j
+     WRITE(11,'(5X,A)') "MODULE PROCEDURE h5pregister_kind_"//TRIM(ADJUSTL(chr2))
+  END DO
+  WRITE(11,'(2X,A)') "END INTERFACE"
+
+! H5Pinsert_f
+  WRITE(11,'(2X,A)') "INTERFACE h5pinsert_f"
+  DO i = 1, num_rkinds
+     j = rkind(i)
+     WRITE(chr2,'(I2)') j
+     WRITE(11,'(5X,A)') "MODULE PROCEDURE h5pinsert_kind_"//TRIM(ADJUSTL(chr2))
+  END DO
+  WRITE(11,'(2X,A)') "END INTERFACE"
+
+  WRITE(11,'(A)') 'CONTAINS'
+
+!**********************
+! H5A APIs
+!**********************
+!
+! H5Awrite_f
+
+!****s* H5A (F03)/H5Awrite_f_F90
+!
+! NAME
+!  H5Awrite_f_F90
+!
+! PURPOSE
+!  Writes an attribute.
+!
+! Inputs:
+!  attr_id     - Attribute identifier
+!  memtype_id  - Attribute datatype identifier  (in memory)
+!  dims        - Array to hold corresponding dimension sizes of data buffer buf;
+!                dim(k) has value of the k-th dimension of buffer buf;
+!                values are ignored if buf is a scalar
+!  buf 	       - Data buffer; may be a scalar or an array
+!
+! Outputs:
+!  hdferr      - \fortran_error
+!
+! AUTHOR
+!  Elena Pourmal
+!  August 12, 1999
+!
+! HISTORY
+!  Explicit Fortran interfaces are added for
+!  called C functions (it is needed for Windows
+!  port).  February 27, 2001
+!
+!  dims parameter was added to make code portable;
+!  Aprile 4, 2001
+!
+!  Changed buf intent to INOUT to be consistent
+!  with how the C functions handles it. The pg
+!  compiler will return 0 if a buf value is not set.
+!  February, 2008
+!
+! NOTES
+!  This function is overloaded to write INTEGER,
+!  REAL, REAL(KIND=C_DOUBLE) and CHARACTER buffers
+!  up to 7 dimensions.
+!
+! Fortran90 Interface:
+!!  SUBROUTINE H5Awrite_f(attr_id, memtype_id, buf, dims, hdferr)
+!!    INTEGER(HID_T)  , INTENT(IN)               :: attr_id
+!!    INTEGER(HID_T)  , INTENT(IN)               :: memtype_id
+!!    TYPE            , INTENT(IN)               :: buf
+!!    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
+!!    INTEGER         , INTENT(OUT)              :: hdferr
+!*****
+
+  DO i = 1, num_rkinds
+     k = rkind(i)
+     WRITE(chr2,'(I2)') k
+     DO j = 1, 8
+
+! DLL definitions for windows
+        WRITE(11,'(A)') '!DEC$if defined(BUILD_HDF5_DLL)'
+        WRITE(11,'(A)') '!DEC$attributes dllexport :: h5awrite_rkind_'//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(j)
+        WRITE(11,'(A)') '!DEC$endif'
+
+! Subroutine API
+        WRITE(11,'(A)') '  SUBROUTINE h5awrite_rkind_'//TRIM(ADJUSTL(chr2))&
+             &//'_rank'//chr_rank(j)//'(attr_id, memtype_id, buf, dims, hdferr)'
+        WRITE(11,'(A)') '    IMPLICIT NONE'
+        WRITE(11,'(A)') '    INTEGER(HID_T)    , INTENT(IN) :: attr_id'
+        WRITE(11,'(A)') '    INTEGER(HID_T)    , INTENT(IN) :: memtype_id'
+        WRITE(11,'(A)') '    INTEGER(HSIZE_T)  , INTENT(IN), DIMENSION(*) :: dims'
+        WRITE(11,'(A)') '    REAL(KIND='//TRIM(ADJUSTL(chr2))//'),INTENT(IN)'//TRIM(rank_dim_line(j))//', TARGET :: buf'
+        WRITE(11,'(A)') '    INTEGER           , INTENT(OUT) :: hdferr'
+        WRITE(11,'(A)') '    TYPE(C_PTR) :: f_ptr'
+
+        WRITE(11,'(A)') f_ptr_line(j)
+        WRITE(11,'(A)') '    hdferr = H5Awrite_f_c(attr_id, memtype_id, f_ptr)'
+        WRITE(11,'(A)') '  END SUBROUTINE h5awrite_rkind_'//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(j)
+     ENDDO
+  ENDDO
+  DO i = 1, num_ikinds
+     k = ikind(i)
+     WRITE(chr2,'(I2)') k
+     DO j = 1, 8
+
+! DLL definitions for windows
+        WRITE(11,'(A)') '!DEC$if defined(BUILD_HDF5_DLL)'
+        WRITE(11,'(A)') '!DEC$attributes dllexport :: h5awrite_ikind_'//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(j)
+        WRITE(11,'(A)') '!DEC$endif'
+
+! Subroutine API
+        WRITE(11,'(A)') '  SUBROUTINE h5awrite_ikind_'//TRIM(ADJUSTL(chr2))&
+             &//'_rank'//chr_rank(j)//'(attr_id, memtype_id, buf, dims, hdferr)'
+        WRITE(11,'(A)') '    IMPLICIT NONE'
+        WRITE(11,'(A)') '    INTEGER(HID_T)    , INTENT(IN) :: attr_id'
+        WRITE(11,'(A)') '    INTEGER(HID_T)    , INTENT(IN) :: memtype_id'
+        WRITE(11,'(A)') '    INTEGER(HSIZE_T)  , INTENT(IN), DIMENSION(*) :: dims'
+        WRITE(11,'(A)') '    INTEGER(KIND='//TRIM(ADJUSTL(chr2))//'),INTENT(IN)'//TRIM(rank_dim_line(j))//', TARGET :: buf'
+        WRITE(11,'(A)') '    INTEGER           , INTENT(OUT) :: hdferr'
+        WRITE(11,'(A)') '    TYPE(C_PTR) :: f_ptr'
+
+        WRITE(11,'(A)') f_ptr_line(j)
+        WRITE(11,'(A)') '    hdferr = H5Awrite_f_c(attr_id, memtype_id, f_ptr)'
+        WRITE(11,'(A)') '  END SUBROUTINE h5awrite_ikind_'//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(j)
+     ENDDO
+  ENDDO
+  DO j = 2, 8
+
+! DLL definitions for windows
+     WRITE(11,'(A)') '!DEC$if defined(BUILD_HDF5_DLL)'
+     WRITE(11,'(A)') '!DEC$attributes dllexport :: h5awrite_ckind_rank'//chr_rank(j)
+     WRITE(11,'(A)') '!DEC$endif'
+
+! Subroutine API
+     WRITE(11,'(A)') '  SUBROUTINE h5awrite_ckind_rank'//chr_rank(j)//'(attr_id, memtype_id, buf, dims, hdferr)'
+     WRITE(11,'(A)') '    IMPLICIT NONE'
+     WRITE(11,'(A)') '    INTEGER(HID_T)    , INTENT(IN) :: attr_id'
+     WRITE(11,'(A)') '    INTEGER(HID_T)    , INTENT(IN) :: memtype_id'
+     WRITE(11,'(A)') '    INTEGER(HSIZE_T)  , INTENT(IN), DIMENSION(*) :: dims'
+     WRITE(11,'(A)') '    CHARACTER(LEN=*)  , INTENT(IN)'//TRIM(rank_dim_line(j))//', TARGET :: buf'
+     WRITE(11,'(A)') '    INTEGER           , INTENT(OUT) :: hdferr'
+     WRITE(11,'(A)') '    TYPE(C_PTR) :: f_ptr'
+
+     WRITE(11,'(A)') fchr_ptr_line(j)
+     WRITE(11,'(A)') '    hdferr = H5Awrite_f_c(attr_id, memtype_id, f_ptr)'
+     WRITE(11,'(A)') '  END SUBROUTINE h5awrite_ckind_rank'//chr_rank(j)
+  ENDDO
+
+!
+! H5Aread_f
+
+!****s* H5A (F03)/H5Aread_f_F90
+!
+! NAME
+!  H5Aread_f_F90
+!
+! PURPOSE
+!  Reads an attribute.
+!
+! Inputs:
+!  attr_id     - Attribute identifier
+!  memtype_id  - Attribute datatype identifier  (in memory)
+!  dims        - Array to hold corresponding dimension sizes of data buffer buf;
+!                dim(k) has value of the k-th dimension of buffer buf;
+!                values are ignored if buf is a scalar
+!
+! Outputs:
+!  buf 	       - Data buffer; may be a scalar or an array
+!  hdferr      - \fortran_error
+!
+! AUTHOR
+!  Elena Pourmal
+!  August 12, 1999
+!
+! HISTORY
+!  Explicit Fortran interfaces are added for
+!  called C functions (it is needed for Windows
+!  port).  February 27, 2001
+!
+!  dims parameter was added to make code portable;
+!  Aprile 4, 2001
+!
+!  Changed buf intent to INOUT to be consistent
+!  with how the C functions handles it. The pg
+!  compiler will return 0 if a buf value is not set.
+!  February, 2008
+!
+! NOTES
+!  This function is overloaded to write INTEGER,
+!  REAL, REAL(KIND=C_DOUBLE) and CHARACTER buffers
+!  up to 7 dimensions.
+! Fortran90 Interface:
+!!  SUBROUTINE H5Aread_f(attr_id, memtype_id, buf, dims, hdferr)
+!!    INTEGER(HID_T)  , INTENT(IN)               :: attr_id
+!!    INTEGER(HID_T)  , INTENT(IN)               :: memtype_id
+!!    TYPE            , INTENT(INOUT)            :: buf
+!!    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
+!!    INTEGER         , INTENT(OUT)              :: hdferr
+!*****
+  DO i = 1, num_rkinds
+     k = rkind(i)
+     WRITE(chr2,'(I2)') k
+     DO j = 1, 8
+! DLL definitions for windows
+        WRITE(11,'(A)') '!DEC$if defined(BUILD_HDF5_DLL)'
+        WRITE(11,'(A)') '!DEC$attributes dllexport :: h5aread_rkind_'//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(j)
+        WRITE(11,'(A)') '!DEC$endif'
+! Subroutine API
+        WRITE(11,'(A)') '  SUBROUTINE h5aread_rkind_'//TRIM(ADJUSTL(chr2))&
+             &//'_rank'//chr_rank(j)//'(attr_id, memtype_id, buf, dims, hdferr)'
+        WRITE(11,'(A)') '    IMPLICIT NONE'
+        WRITE(11,'(A)') '    INTEGER(HID_T)    , INTENT(IN) :: attr_id'
+        WRITE(11,'(A)') '    INTEGER(HID_T)    , INTENT(IN) :: memtype_id'
+        WRITE(11,'(A)') '    INTEGER(HSIZE_T)  , INTENT(IN), DIMENSION(*) :: dims'
+        WRITE(11,'(A)') '    REAL(KIND='//TRIM(ADJUSTL(chr2))//'),INTENT(INOUT)'//TRIM(rank_dim_line(j))//', TARGET :: buf'
+        WRITE(11,'(A)') '    INTEGER           , INTENT(OUT) :: hdferr'
+        WRITE(11,'(A)') '    TYPE(C_PTR) :: f_ptr'
+
+        WRITE(11,'(A)') f_ptr_line(j)
+        WRITE(11,'(A)') '    hdferr = H5Aread_f_c(attr_id, memtype_id, f_ptr)'
+        WRITE(11,'(A)') '  END SUBROUTINE h5aread_rkind_'//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(j)
+     ENDDO
+  ENDDO
+  DO i = 1, num_ikinds
+     k = ikind(i)
+     WRITE(chr2,'(I2)') k
+     DO j = 1, 8
+! DLL definitions for windows
+        WRITE(11,'(A)') '!DEC$if defined(BUILD_HDF5_DLL)'
+        WRITE(11,'(A)') '!DEC$attributes dllexport :: h5aread_ikind_'//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(j)
+        WRITE(11,'(A)') '!DEC$endif'
+! Subroutine API
+        WRITE(11,'(A)') '  SUBROUTINE h5aread_ikind_'//TRIM(ADJUSTL(chr2))&
+             &//'_rank'//chr_rank(j)//'(attr_id, memtype_id, buf, dims, hdferr)'
+        WRITE(11,'(A)') '    IMPLICIT NONE'
+        WRITE(11,'(A)') '    INTEGER(HID_T)    , INTENT(IN) :: attr_id'
+        WRITE(11,'(A)') '    INTEGER(HID_T)    , INTENT(IN) :: memtype_id'
+        WRITE(11,'(A)') '    INTEGER(HSIZE_T)  , INTENT(IN), DIMENSION(*) :: dims'
+        WRITE(11,'(A)') '    INTEGER(KIND='//TRIM(ADJUSTL(chr2))//'),INTENT(INOUT)'//TRIM(rank_dim_line(j))//', TARGET :: buf'
+        WRITE(11,'(A)') '    INTEGER           , INTENT(OUT) :: hdferr'
+        WRITE(11,'(A)') '    TYPE(C_PTR) :: f_ptr'
+
+        WRITE(11,'(A)') f_ptr_line(j)
+        WRITE(11,'(A)') '    hdferr = H5Aread_f_c(attr_id, memtype_id, f_ptr)'
+        WRITE(11,'(A)') '  END SUBROUTINE h5aread_ikind_'//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(j)
+     ENDDO
+  ENDDO
+  DO j = 2, 8
+! DLL definitions for windows
+     WRITE(11,'(A)') '!DEC$if defined(BUILD_HDF5_DLL)'
+     WRITE(11,'(A)') '!DEC$attributes dllexport :: h5aread_ckind_rank'//chr_rank(j)
+     WRITE(11,'(A)') '!DEC$endif'
+! Subroutine API
+     WRITE(11,'(A)') '  SUBROUTINE h5aread_ckind_rank'//chr_rank(j)//'(attr_id, memtype_id, buf, dims, hdferr)'
+     WRITE(11,'(A)') '    IMPLICIT NONE'
+     WRITE(11,'(A)') '    INTEGER(HID_T)    , INTENT(IN) :: attr_id'
+     WRITE(11,'(A)') '    INTEGER(HID_T)    , INTENT(IN) :: memtype_id'
+     WRITE(11,'(A)') '    INTEGER(HSIZE_T)  , INTENT(IN), DIMENSION(*) :: dims'
+     WRITE(11,'(A)') '    CHARACTER(LEN=*), INTENT(IN)'//TRIM(rank_dim_line(j))//', TARGET :: buf'
+     WRITE(11,'(A)') '    INTEGER           , INTENT(OUT) :: hdferr'
+     WRITE(11,'(A)') '    TYPE(C_PTR) :: f_ptr'
+
+     WRITE(11,'(A)') fchr_ptr_line(j)
+     WRITE(11,'(A)') '    hdferr = H5Aread_f_c(attr_id, memtype_id, f_ptr)'
+     WRITE(11,'(A)') '  END SUBROUTINE h5aread_ckind_rank'//chr_rank(j)
+  ENDDO
+
+!**********************
+! H5D APIs
+!**********************
+!
+! h5dread_f
+
+!
+! NAME
+!  h5dread_f
+!
+! PURPOSE
+!  Reads raw data from the specified dataset into buf,
+!  converting from file datatype and dataspace to memory
+!  datatype and dataspace.
+!
+! Inputs:
+!		dset_id		- dataset identifier
+!		mem_type_id	- memory type identifier
+!		dims		- 1-dim array of size 7; dims(k) has the size
+!				- of k-th dimension of the buf array
+! Outputs:
+!		buf		- buffer to read data in
+!		hdferr:		- error code
+!				 	Success:  0
+!				 	Failure: -1
+! Optional parameters:
+!		mem_space_id	- memory dataspace identifier
+!		file_space_id 	- file dataspace identifier
+!		xfer_prp	- transfer property list identifier
+!
+! AUTHOR
+!  Elena Pourmal
+!  August 12, 1999
+!
+! HISTORY
+!  Explicit Fortran interfaces were added for
+!  called C functions (it is needed for Windows
+!  port).  February 28, 2001
+!
+!  dims parameter was added to make code portable;
+!  n parameter was replaced with dims parameter in
+!  the h5dwrite_reference_obj and h5dwrite_reference_dsetreg
+!  functions.  April 2, 2001
+!
+! NOTES
+!  This function is overloaded to read INTEGER,
+!  REAL, DOUBLE PRECISION and CHARACTER buffers
+!  up to 7 dimensions, and one dimensional buffers
+!  of the TYPE(hobj_ref_t_f) and TYPE(hdset_reg_ref_t_f)
+!  types.
+!
+  DO i = 1, num_rkinds
+     k = rkind(i)
+     WRITE(chr2,'(I2)') k
+     DO j = 1, 8
+! DLL definitions for windows
+        WRITE(11,'(A)') '!DEC$if defined(BUILD_HDF5_DLL)'
+        WRITE(11,'(A)') '!DEC$attributes dllexport :: h5dread_rkind_'//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(j)
+        WRITE(11,'(A)') '!DEC$endif'
+! Subroutine API
+        WRITE(11,'(A)') '  SUBROUTINE h5dread_rkind_'//TRIM(ADJUSTL(chr2))&
+             &//'_rank'//chr_rank(j)//'(dset_id, mem_type_id, buf, dims, hdferr, &'
+        WRITE(11,'(A)') '       mem_space_id, file_space_id, xfer_prp)'
+        WRITE(11,'(A)') '    IMPLICIT NONE'
+        WRITE(11,'(A)') '    INTEGER(HID_T), INTENT(IN) :: dset_id'
+        WRITE(11,'(A)') '    INTEGER(HID_T), INTENT(IN) :: mem_type_id'
+        WRITE(11,'(A)') '    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims'
+        WRITE(11,'(A)') '    REAL(KIND='//TRIM(ADJUSTL(chr2))//'),INTENT(INOUT)'//TRIM(rank_dim_line(j))//', TARGET :: buf'
+        WRITE(11,'(A)') '    INTEGER, INTENT(OUT) :: hdferr'
+        WRITE(11,'(A)') '    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id'
+        WRITE(11,'(A)') '    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id'
+        WRITE(11,'(A)') '    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp'
+        WRITE(11,'(A)') '    INTEGER(HID_T) :: xfer_prp_default'
+        WRITE(11,'(A)') '    INTEGER(HID_T) :: mem_space_id_default'
+        WRITE(11,'(A)') '    INTEGER(HID_T) :: file_space_id_default'
+        WRITE(11,'(A)') '    TYPE(C_PTR) :: f_ptr'
+        WRITE(11,'(A)') '    xfer_prp_default = H5P_DEFAULT_F'
+        WRITE(11,'(A)') '    mem_space_id_default = H5S_ALL_F'
+        WRITE(11,'(A)') '    file_space_id_default = H5S_ALL_F'
+        WRITE(11,'(A)') '    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp'
+        WRITE(11,'(A)') '    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id'
+        WRITE(11,'(A)') '    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id'
+        WRITE(11,'(A)') f_ptr_line(j)
+        WRITE(11,'(A)') '    hdferr = h5dread_f_c(dset_id, mem_type_id, mem_space_id_default, &'
+        WRITE(11,'(A)') '         file_space_id_default, xfer_prp_default, f_ptr)'
+        WRITE(11,'(A)') '  END SUBROUTINE h5dread_rkind_'//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(j)
+
+     ENDDO
+  ENDDO
+
+  DO i = 1, num_ikinds
+     k = ikind(i)
+     WRITE(chr2,'(I2)') k
+     DO j = 1, 8
+! DLL definitions for windows
+        WRITE(11,'(A)') '!DEC$if defined(BUILD_HDF5_DLL)'
+        WRITE(11,'(A)') '!DEC$attributes dllexport :: h5dread_ikind_'//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(j)
+        WRITE(11,'(A)') '!DEC$endif'
+! Subroutine API
+        WRITE(11,'(A)') '  SUBROUTINE h5dread_ikind_'//TRIM(ADJUSTL(chr2))&
+             &//'_rank'//chr_rank(j)//'(dset_id, mem_type_id, buf, dims, hdferr, &'
+        WRITE(11,'(A)') '       mem_space_id, file_space_id, xfer_prp)'
+        WRITE(11,'(A)') '    IMPLICIT NONE'
+        WRITE(11,'(A)') '    INTEGER(HID_T), INTENT(IN) :: dset_id'
+        WRITE(11,'(A)') '    INTEGER(HID_T), INTENT(IN) :: mem_type_id'
+        WRITE(11,'(A)') '    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims'
+        WRITE(11,'(A)') '    INTEGER(KIND='//TRIM(ADJUSTL(chr2))//'),INTENT(INOUT)'//TRIM(rank_dim_line(j))//', TARGET :: buf'
+        WRITE(11,'(A)') '    INTEGER, INTENT(OUT) :: hdferr'
+        WRITE(11,'(A)') '    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id'
+        WRITE(11,'(A)') '    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id'
+        WRITE(11,'(A)') '    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp'
+        WRITE(11,'(A)') '    INTEGER(HID_T) :: xfer_prp_default'
+        WRITE(11,'(A)') '    INTEGER(HID_T) :: mem_space_id_default'
+        WRITE(11,'(A)') '    INTEGER(HID_T) :: file_space_id_default'
+        WRITE(11,'(A)') '    TYPE(C_PTR) :: f_ptr'
+        WRITE(11,'(A)') '    xfer_prp_default = H5P_DEFAULT_F'
+        WRITE(11,'(A)') '    mem_space_id_default = H5S_ALL_F'
+        WRITE(11,'(A)') '    file_space_id_default = H5S_ALL_F'
+        WRITE(11,'(A)') '    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp'
+        WRITE(11,'(A)') '    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id'
+        WRITE(11,'(A)') '    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id'
+        WRITE(11,'(A)') f_ptr_line(j)
+        WRITE(11,'(A)') '    hdferr = h5dread_f_c(dset_id, mem_type_id, mem_space_id_default, &'
+        WRITE(11,'(A)') '         file_space_id_default, xfer_prp_default, f_ptr)'
+        WRITE(11,'(A)') '  END SUBROUTINE h5dread_ikind_'//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(j)
+
+     ENDDO
+  ENDDO
+  DO j = 2, 8
+! DLL definitions for windows
+     WRITE(11,'(A)') '!DEC$if defined(BUILD_HDF5_DLL)'
+     WRITE(11,'(A)') '!DEC$attributes dllexport :: h5dread_ckind_rank'//chr_rank(j)
+     WRITE(11,'(A)') '!DEC$endif'
+! Subroutine API
+     WRITE(11,'(A)') '  SUBROUTINE h5dread_ckind_rank'//chr_rank(j)//'(dset_id, mem_type_id, buf, dims, hdferr, &'
+     WRITE(11,'(A)') '       mem_space_id, file_space_id, xfer_prp)'
+     WRITE(11,'(A)') '    IMPLICIT NONE'
+     WRITE(11,'(A)') '    INTEGER(HID_T), INTENT(IN) :: dset_id'
+     WRITE(11,'(A)') '    INTEGER(HID_T), INTENT(IN) :: mem_type_id'
+     WRITE(11,'(A)') '    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims'
+     WRITE(11,'(A)') '    CHARACTER(LEN=*), INTENT(INOUT)'//TRIM(rank_dim_line(j))//', TARGET :: buf'
+     WRITE(11,'(A)') '    INTEGER, INTENT(OUT) :: hdferr'
+     WRITE(11,'(A)') '    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id'
+     WRITE(11,'(A)') '    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id'
+     WRITE(11,'(A)') '    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp'
+     WRITE(11,'(A)') '    INTEGER(HID_T) :: xfer_prp_default'
+     WRITE(11,'(A)') '    INTEGER(HID_T) :: mem_space_id_default'
+     WRITE(11,'(A)') '    INTEGER(HID_T) :: file_space_id_default'
+     WRITE(11,'(A)') '    TYPE(C_PTR) :: f_ptr'
+     WRITE(11,'(A)') '    xfer_prp_default = H5P_DEFAULT_F'
+     WRITE(11,'(A)') '    mem_space_id_default = H5S_ALL_F'
+     WRITE(11,'(A)') '    file_space_id_default = H5S_ALL_F'
+     WRITE(11,'(A)') '    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp'
+     WRITE(11,'(A)') '    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id'
+     WRITE(11,'(A)') '    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id'
+     WRITE(11,'(A)') fchr_ptr_line(j)
+     WRITE(11,'(A)') '    hdferr = h5dread_f_c(dset_id, mem_type_id, mem_space_id_default, &'
+     WRITE(11,'(A)') '         file_space_id_default, xfer_prp_default, f_ptr)'
+     WRITE(11,'(A)') '  END SUBROUTINE h5dread_ckind_rank'//chr_rank(j)
+  ENDDO
+!**********************
+! h5dwrite_f
+!**********************
+  DO i = 1, num_rkinds
+     k = rkind(i)
+     WRITE(chr2,'(I2)') k
+     DO j = 1, 8
+! DLL definitions for windows
+        WRITE(11,'(A)') '!DEC$if defined(BUILD_HDF5_DLL)'
+        WRITE(11,'(A)') '!DEC$attributes dllexport :: h5dwrite_rkind_'//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(j)
+        WRITE(11,'(A)') '!DEC$endif'
+! Subroutine API
+        WRITE(11,'(A)') '  SUBROUTINE h5dwrite_rkind_'//TRIM(ADJUSTL(chr2))&
+             &//'_rank'//chr_rank(j)//'(dset_id, mem_type_id, buf, dims, hdferr, &'
+        WRITE(11,'(A)') '       mem_space_id, file_space_id, xfer_prp)'
+        WRITE(11,'(A)') '    IMPLICIT NONE'
+        WRITE(11,'(A)') '    INTEGER(HID_T), INTENT(IN) :: dset_id'
+        WRITE(11,'(A)') '    INTEGER(HID_T), INTENT(IN) :: mem_type_id'
+        WRITE(11,'(A)') '    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims'
+        WRITE(11,'(A)') '    REAL(KIND='//TRIM(ADJUSTL(chr2))//'),INTENT(IN)'//TRIM(rank_dim_line(j))//', TARGET :: buf'
+        WRITE(11,'(A)') '    INTEGER, INTENT(OUT) :: hdferr'
+        WRITE(11,'(A)') '    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id'
+        WRITE(11,'(A)') '    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id'
+        WRITE(11,'(A)') '    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp'
+        WRITE(11,'(A)') '    INTEGER(HID_T) :: xfer_prp_default'
+        WRITE(11,'(A)') '    INTEGER(HID_T) :: mem_space_id_default'
+        WRITE(11,'(A)') '    INTEGER(HID_T) :: file_space_id_default'
+        WRITE(11,'(A)') '    TYPE(C_PTR) :: f_ptr'
+        WRITE(11,'(A)') '    xfer_prp_default  = H5P_DEFAULT_F'
+        WRITE(11,'(A)') '    mem_space_id_default = H5S_ALL_F'
+        WRITE(11,'(A)') '    file_space_id_default = H5S_ALL_F'
+        WRITE(11,'(A)') '    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp'
+        WRITE(11,'(A)') '    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id'
+        WRITE(11,'(A)') '    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id'
+        WRITE(11,'(A)') f_ptr_line(j)
+        WRITE(11,'(A)') '    hdferr = h5dwrite_f_c(dset_id, mem_type_id, mem_space_id_default, &'
+        WRITE(11,'(A)') '         file_space_id_default, xfer_prp_default, f_ptr)'
+        WRITE(11,'(A)') '  END SUBROUTINE h5dwrite_rkind_'//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(j)
+     ENDDO
+  ENDDO
+
+  DO i = 1, num_ikinds
+     k = ikind(i)
+     WRITE(chr2,'(I2)') k
+     DO j = 1, 8
+! DLL definitions for windows
+        WRITE(11,'(A)') '!DEC$if defined(BUILD_HDF5_DLL)'
+        WRITE(11,'(A)') '!DEC$attributes dllexport :: h5dwrite_ikind_'//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(j)
+        WRITE(11,'(A)') '!DEC$endif'
+! Subroutine API
+        WRITE(11,'(A)') '  SUBROUTINE h5dwrite_ikind_'//TRIM(ADJUSTL(chr2))&
+             &//'_rank'//chr_rank(j)//'(dset_id, mem_type_id, buf, dims, hdferr, &'
+        WRITE(11,'(A)') '       mem_space_id, file_space_id, xfer_prp)'
+        WRITE(11,'(A)') '    IMPLICIT NONE'
+        WRITE(11,'(A)') '    INTEGER(HID_T), INTENT(IN) :: dset_id'
+        WRITE(11,'(A)') '    INTEGER(HID_T), INTENT(IN) :: mem_type_id'
+        WRITE(11,'(A)') '    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims'
+        WRITE(11,'(A)') '    INTEGER(KIND='//TRIM(ADJUSTL(chr2))//'),INTENT(IN)'//TRIM(rank_dim_line(j))//', TARGET :: buf'
+        WRITE(11,'(A)') '    INTEGER, INTENT(OUT) :: hdferr'
+        WRITE(11,'(A)') '    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id'
+        WRITE(11,'(A)') '    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id'
+        WRITE(11,'(A)') '    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp'
+        WRITE(11,'(A)') '    INTEGER(HID_T) :: xfer_prp_default'
+        WRITE(11,'(A)') '    INTEGER(HID_T) :: mem_space_id_default'
+        WRITE(11,'(A)') '    INTEGER(HID_T) :: file_space_id_default'
+        WRITE(11,'(A)') '    TYPE(C_PTR) :: f_ptr'
+        WRITE(11,'(A)') '    xfer_prp_default  = H5P_DEFAULT_F'
+        WRITE(11,'(A)') '    mem_space_id_default = H5S_ALL_F'
+        WRITE(11,'(A)') '    file_space_id_default = H5S_ALL_F'
+        WRITE(11,'(A)') '    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp'
+        WRITE(11,'(A)') '    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id'
+        WRITE(11,'(A)') '    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id'
+        WRITE(11,'(A)') f_ptr_line(j)
+        WRITE(11,'(A)') '    hdferr = h5dwrite_f_c(dset_id, mem_type_id, mem_space_id_default, &'
+        WRITE(11,'(A)') '         file_space_id_default, xfer_prp_default, f_ptr)'
+        WRITE(11,'(A)') '  END SUBROUTINE h5dwrite_ikind_'//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(j)
+     ENDDO
+  ENDDO
+  DO j = 2, 8
+! DLL definitions for windows
+     WRITE(11,'(A)') '!DEC$if defined(BUILD_HDF5_DLL)'
+     WRITE(11,'(A)') '!DEC$attributes dllexport :: h5dwrite_ckind_rank'//chr_rank(j)
+     WRITE(11,'(A)') '!DEC$endif'
+! Subroutine API
+     WRITE(11,'(A)') '  SUBROUTINE h5dwrite_ckind_rank'//chr_rank(j)//'(dset_id, mem_type_id, buf, dims, hdferr, &'
+     WRITE(11,'(A)') '       mem_space_id, file_space_id, xfer_prp)'
+     WRITE(11,'(A)') '    IMPLICIT NONE'
+     WRITE(11,'(A)') '    INTEGER(HID_T), INTENT(IN) :: dset_id'
+     WRITE(11,'(A)') '    INTEGER(HID_T), INTENT(IN) :: mem_type_id'
+     WRITE(11,'(A)') '    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims'
+     WRITE(11,'(A)') '    CHARACTER(LEN=*),INTENT(IN)'//TRIM(rank_dim_line(j))//', TARGET :: buf'
+     WRITE(11,'(A)') '    INTEGER, INTENT(OUT) :: hdferr'
+     WRITE(11,'(A)') '    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id'
+     WRITE(11,'(A)') '    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id'
+     WRITE(11,'(A)') '    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp'
+     WRITE(11,'(A)') '    INTEGER(HID_T) :: xfer_prp_default'
+     WRITE(11,'(A)') '    INTEGER(HID_T) :: mem_space_id_default'
+     WRITE(11,'(A)') '    INTEGER(HID_T) :: file_space_id_default'
+     WRITE(11,'(A)') '    TYPE(C_PTR) :: f_ptr'
+     WRITE(11,'(A)') '    xfer_prp_default  = H5P_DEFAULT_F'
+     WRITE(11,'(A)') '    mem_space_id_default = H5S_ALL_F'
+     WRITE(11,'(A)') '    file_space_id_default = H5S_ALL_F'
+     WRITE(11,'(A)') '    IF(PRESENT(xfer_prp)) xfer_prp_default = xfer_prp'
+     WRITE(11,'(A)') '    IF(PRESENT(mem_space_id))  mem_space_id_default = mem_space_id'
+     WRITE(11,'(A)') '    IF(PRESENT(file_space_id)) file_space_id_default = file_space_id'
+     WRITE(11,'(A)') fchr_ptr_line(j)
+     WRITE(11,'(A)') '    hdferr = h5dwrite_f_c(dset_id, mem_type_id, mem_space_id_default, &'
+     WRITE(11,'(A)') '         file_space_id_default, xfer_prp_default, f_ptr)'
+     WRITE(11,'(A)') '  END SUBROUTINE h5dwrite_ckind_rank'//chr_rank(j)
+  ENDDO
+
+!**********************
+! H5P APIs
+!**********************
+!
+! H5Pset_fill_value_f
+  DO i = 1, num_rkinds
+     k = rkind(i)
+     WRITE(chr2,'(I2)') k
+! DLL definitions for windows
+     WRITE(11,'(A)') '!DEC$if defined(BUILD_HDF5_DLL)'
+     WRITE(11,'(A)') '!DEC$attributes dllexport :: h5pset_fill_value_kind_'//TRIM(ADJUSTL(chr2))
+     WRITE(11,'(A)') '!DEC$endif'
+! Subroutine API
+     WRITE(11,'(A)') '  SUBROUTINE h5pset_fill_value_kind_'//TRIM(ADJUSTL(chr2))&
+          &//'(prp_id, type_id, fillvalue, hdferr)'
+     WRITE(11,'(A)') '    IMPLICIT NONE'
+     WRITE(11,'(A)') '    INTEGER(HID_T), INTENT(IN) :: prp_id'
+     WRITE(11,'(A)') '    INTEGER(HID_T), INTENT(IN) :: type_id'
+     WRITE(11,'(A)') '    REAL(KIND='//TRIM(ADJUSTL(chr2))//'), INTENT(IN), TARGET :: fillvalue'
+     WRITE(11,'(A)') '    INTEGER, INTENT(OUT) :: hdferr '
+     WRITE(11,'(A)') '    TYPE(C_PTR) :: f_ptr '
+     WRITE(11,'(A)') '    f_ptr = C_LOC(fillvalue)'
+     WRITE(11,'(A)') '    hdferr = h5pset_fill_value_c(prp_id, type_id, f_ptr)'
+     WRITE(11,'(A)') '  END SUBROUTINE h5pset_fill_value_kind_'//TRIM(ADJUSTL(chr2))
+  ENDDO
+
+! H5Pget_fill_value_f
+  DO i = 1, num_rkinds
+     k = rkind(i)
+     WRITE(chr2,'(I2)') k
+! DLL definitions for windows
+     WRITE(11,'(A)') '!DEC$if defined(BUILD_HDF5_DLL)'
+     WRITE(11,'(A)') '!DEC$attributes dllexport :: h5pget_fill_value_kind_'//TRIM(ADJUSTL(chr2))
+     WRITE(11,'(A)') '!DEC$endif'
+! Subroutine API
+     WRITE(11,'(A)') '  SUBROUTINE h5pget_fill_value_kind_'//TRIM(ADJUSTL(chr2))&
+          &//'(prp_id, type_id, fillvalue, hdferr)'
+     WRITE(11,'(A)') '    IMPLICIT NONE'
+     WRITE(11,'(A)') '    INTEGER(HID_T), INTENT(IN) :: prp_id'
+     WRITE(11,'(A)') '    INTEGER(HID_T), INTENT(IN) :: type_id'
+     WRITE(11,'(A)') '    REAL(KIND='//TRIM(ADJUSTL(chr2))//'), INTENT(OUT), TARGET :: fillvalue'
+     WRITE(11,'(A)') '    INTEGER, INTENT(OUT) :: hdferr'
+     WRITE(11,'(A)') '    TYPE(C_PTR) :: f_ptr'
+     WRITE(11,'(A)') '    f_ptr = C_LOC(fillvalue)'
+     WRITE(11,'(A)') '    hdferr = h5pget_fill_value_c(prp_id, type_id, f_ptr)'
+     WRITE(11,'(A)') '  END SUBROUTINE h5pget_fill_value_kind_'//TRIM(ADJUSTL(chr2))
+  ENDDO
+
+! H5Pset_f
+  DO i = 1, num_rkinds
+     k = rkind(i)
+     WRITE(chr2,'(I2)') k
+! DLL definitions for windows
+     WRITE(11,'(A)') '!DEC$if defined(BUILD_HDF5_DLL)'
+     WRITE(11,'(A)') '!DEC$attributes dllexport :: h5pset_kind_'//TRIM(ADJUSTL(chr2))
+     WRITE(11,'(A)') '!DEC$endif'
+! Subroutine API
+     WRITE(11,'(A)') '  SUBROUTINE h5pset_kind_'//TRIM(ADJUSTL(chr2))&
+          &//'(prp_id, name, value, hdferr)'
+     WRITE(11,'(A)') '    IMPLICIT NONE'
+     WRITE(11,'(A)') '    INTEGER(HID_T), INTENT(IN) :: prp_id'
+     WRITE(11,'(A)') '    CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name'
+     WRITE(11,'(A)') '    REAL(KIND='//TRIM(ADJUSTL(chr2))//'), INTENT(IN), TARGET :: value'
+     WRITE(11,'(A)') '    INTEGER, INTENT(OUT) :: hdferr'
+     WRITE(11,'(A)') '    INTEGER :: name_len'
+     WRITE(11,'(A)') '    TYPE(C_PTR) :: f_ptr'
+     WRITE(11,'(A)') '    f_ptr = C_LOC(value)'
+     WRITE(11,'(A)') '    name_len = LEN(name)'
+     WRITE(11,'(A)') '    hdferr = h5pget_c(prp_id, name, name_len, f_ptr)'
+
+     WRITE(11,'(A)') '  END SUBROUTINE h5pset_kind_'//TRIM(ADJUSTL(chr2))
+  ENDDO
+
+! H5Pget_f
+  DO i = 1, num_rkinds
+     k = rkind(i)
+     WRITE(chr2,'(I2)') k
+! DLL definitions for windows
+     WRITE(11,'(A)') '!DEC$if defined(BUILD_HDF5_DLL)'
+     WRITE(11,'(A)') '!DEC$attributes dllexport :: h5pget_kind_'//TRIM(ADJUSTL(chr2))
+     WRITE(11,'(A)') '!DEC$endif'
+! Subroutine API
+     WRITE(11,'(A)') '  SUBROUTINE h5pget_kind_'//TRIM(ADJUSTL(chr2))&
+          &//'(prp_id, name, value, hdferr)'
+     WRITE(11,'(A)') '    IMPLICIT NONE'
+     WRITE(11,'(A)') '    INTEGER(HID_T), INTENT(IN) :: prp_id'
+     WRITE(11,'(A)') '    CHARACTER(LEN=*), INTENT(IN) :: name'
+     WRITE(11,'(A)') '    REAL(KIND='//TRIM(ADJUSTL(chr2))//'),   INTENT(OUT), TARGET :: value'
+     WRITE(11,'(A)') '    INTEGER, INTENT(OUT) :: hdferr'
+     WRITE(11,'(A)') '    INTEGER :: name_len'
+     WRITE(11,'(A)') '    TYPE(C_PTR) :: f_ptr'
+     WRITE(11,'(A)') '    f_ptr = C_LOC(value)'
+     WRITE(11,'(A)') '    name_len = LEN(name)'
+     WRITE(11,'(A)') '    hdferr = h5pget_c(prp_id, name, name_len, f_ptr)'
+     WRITE(11,'(A)') '  END SUBROUTINE h5pget_kind_'//TRIM(ADJUSTL(chr2))
+  ENDDO
+
+! H5Pregister_f
+  DO i = 1, num_rkinds
+     k = rkind(i)
+     WRITE(chr2,'(I2)') k
+! DLL definitions for windows
+     WRITE(11,'(A)') '!DEC$if defined(BUILD_HDF5_DLL)'
+     WRITE(11,'(A)') '!DEC$attributes dllexport :: h5pregister_kind_'//TRIM(ADJUSTL(chr2))
+     WRITE(11,'(A)') '!DEC$endif'
+! Subroutine API
+     WRITE(11,'(A)') 'SUBROUTINE h5pregister_kind_'//TRIM(ADJUSTL(chr2))&
+          &//'(class, name, size, value, hdferr)'
+     WRITE(11,'(A)') '  IMPLICIT NONE'
+     WRITE(11,'(A)') '  INTEGER(HID_T), INTENT(IN) :: class'
+     WRITE(11,'(A)') '  CHARACTER(LEN=*), INTENT(IN) :: name'
+     WRITE(11,'(A)') '  INTEGER(SIZE_T), INTENT(IN) :: size'
+     WRITE(11,'(A)') '  REAL(KIND='//TRIM(ADJUSTL(chr2))//'), INTENT(IN), TARGET :: value'
+     WRITE(11,'(A)') '  INTEGER, INTENT(OUT) :: hdferr'
+     WRITE(11,'(A)') '  INTEGER :: name_len'
+     WRITE(11,'(A)') '  TYPE(C_PTR) :: f_ptr'
+     WRITE(11,'(A)') '  f_ptr = C_LOC(value)'
+     WRITE(11,'(A)') '  name_len = LEN(name)'
+     WRITE(11,'(A)') '  hdferr = h5pregister_c(class, name, name_len, size, f_ptr)'
+     WRITE(11,'(A)') 'END SUBROUTINE h5pregister_kind_'//TRIM(ADJUSTL(chr2))
+  ENDDO
+
+! H5Pinsert_f
+  DO i = 1, num_rkinds
+     k = rkind(i)
+     WRITE(chr2,'(I2)') k
+! DLL definitions for windows
+     WRITE(11,'(A)') '!DEC$if defined(BUILD_HDF5_DLL)'
+     WRITE(11,'(A)') '!DEC$attributes dllexport :: h5pinsert_kind_'//TRIM(ADJUSTL(chr2))
+     WRITE(11,'(A)') '!DEC$endif'
+! Subroutine API
+     WRITE(11,'(A)') '  SUBROUTINE h5pinsert_kind_'//TRIM(ADJUSTL(chr2))&
+          &//'(plist, name, size, value, hdferr)'
+     WRITE(11,'(A)') '    IMPLICIT NONE'
+     WRITE(11,'(A)') '    INTEGER(HID_T), INTENT(IN) :: plist'
+     WRITE(11,'(A)') '    CHARACTER(LEN=*), INTENT(IN) :: name'
+     WRITE(11,'(A)') '    INTEGER(SIZE_T), INTENT(IN) :: size'
+     WRITE(11,'(A)') '    REAL(KIND='//TRIM(ADJUSTL(chr2))//'),   INTENT(IN), TARGET :: value'
+     WRITE(11,'(A)') '    INTEGER, INTENT(OUT) :: hdferr'
+     WRITE(11,'(A)') '    INTEGER :: name_len'
+     WRITE(11,'(A)') '    TYPE(c_ptr) :: f_ptr'
+     WRITE(11,'(A)') '    f_ptr = c_loc(value)'
+     WRITE(11,'(A)') '    name_len = LEN(name)'
+     WRITE(11,'(A)') '    hdferr = h5pinsert_c(plist, name , name_len, size, f_ptr)'
+     WRITE(11,'(A)') '  END SUBROUTINE h5pinsert_kind_'//TRIM(ADJUSTL(chr2))
+  ENDDO
+
+  WRITE(11,'(A)') 'END MODULE H5_gen'
+
+  CLOSE(11)
+
+END PROGRAM H5_buildiface
+
+
+
diff --git a/fortran/src/H5_f.c b/fortran/src/H5_f.c
index a149109..90ca7d6 100644
--- a/fortran/src/H5_f.c
+++ b/fortran/src/H5_f.c
@@ -1,27 +1,27 @@
 /****ih* H5_f/H5_f
  * PURPOSE
- *   This file contains C stubs for H5 Fortran APIs
+ *  This file contains C stubs for H5 Fortran APIs
  *
  * COPYRIGHT
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  ******
-*/
+ */
 
 #include "H5f90.h"
+#include "H5fort_type_defines.h"
+
+int IntKinds_SizeOf[] = H5_FORTRAN_INTEGER_KINDS_SIZEOF;
 
 /****if* H5_f/h5init_types_c
  * NAME
@@ -32,234 +32,283 @@
  *  types - array with the predefined Native Fortran
  *          type, its element and length must be the
  *          same as the types array defined in the
- *          H5f90global.f90
+ *          H5f90global.F90
  *  floatingtypes - array with the predefined Floating Fortran
- *                   type, its element and length must be the
- *                   same as the floatingtypes array defined in the
- *                   H5f90global.f90
+ *                  type, its element and length must be the
+ *                  same as the floatingtypes array defined in the
+ *                  H5f90global.F90
  *  integertypes - array with the predefined Integer Fortran
  *                 type, its element and length must be the
  *                 same as the integertypes array defined in the
- *                 H5f90global.f90
+ *                 H5f90global.F90
  * RETURNS
  *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
  *  Tuesday, August 3, 1999
  * SOURCE
-*/
+ */
 int_f
-nh5init_types_c( hid_t_f * types, hid_t_f * floatingtypes, hid_t_f * integertypes )
+h5init_types_c(hid_t_f *types, hid_t_f *floatingtypes, hid_t_f *integertypes)
 /******/
 {
-    int ret_value = -1;
+    int   ret_value = -1;
     hid_t c_type_id;
-    size_t tmp_val;
+    int   i;
+
+    /* Fortran INTEGER may not be the same as C; do all checking to find
+       an appropriate size
+    */
+
+    /*
+     * Find the HDF5 type of the Fortran Integer KIND.
+     */
+
+    for (i = 0; i < H5_FORTRAN_NUM_INTEGER_KINDS; i++) {
+        if (IntKinds_SizeOf[i] == sizeof(char)) {
+            if ((types[i] = (hid_t_f)H5Tcopy(H5T_NATIVE_CHAR)) < 0)
+                return ret_value;
+        } /*end if */
+        else if (IntKinds_SizeOf[i] == sizeof(short)) {
+            if ((types[i] = (hid_t_f)H5Tcopy(H5T_NATIVE_SHORT)) < 0)
+                return ret_value;
+        } /*end if */
+        else if (IntKinds_SizeOf[i] == sizeof(int)) {
+            if ((types[i] = (hid_t_f)H5Tcopy(H5T_NATIVE_INT)) < 0)
+                return ret_value;
+        } /*end if */
+        else if (IntKinds_SizeOf[i] == sizeof(long long)) {
+            if ((types[i] = (hid_t_f)H5Tcopy(H5T_NATIVE_LLONG)) < 0)
+                return ret_value;
+        } /*end if */
+        else {
+            if ((types[i] = (hid_t_f)H5Tcopy(H5T_NATIVE_INT)) < 0)
+                return ret_value;
+            if (H5Tset_precision(types[i], 128) < 0)
+                return ret_value;
+        } /*end else */
+    }
+
+    /* Initialized missing INTEGER KIND types to default to native integer */
+    for (i = H5_FORTRAN_NUM_INTEGER_KINDS; i < 5; i++) {
+        if ((types[i] = (hid_t_f)H5Tcopy(H5T_NATIVE_INT)) < 0)
+            return ret_value;
+    }
 
-/* Fortran INTEGER is may not be the same as C in; do all checking to find
-   an appropriate size
-*/
     if (sizeof(int_f) == sizeof(int)) {
-    if ((types[0] = (hid_t_f)H5Tcopy(H5T_NATIVE_INT)) < 0) return ret_value;
+        if ((types[5] = (hid_t_f)H5Tcopy(H5T_NATIVE_INT)) < 0)
+            return ret_value;
     } /*end if */
     else if (sizeof(int_f) == sizeof(long)) {
-    if ((types[0] = (hid_t_f)H5Tcopy(H5T_NATIVE_LONG)) < 0) return ret_value;
+        if ((types[5] = (hid_t_f)H5Tcopy(H5T_NATIVE_LONG)) < 0)
+            return ret_value;
     } /*end if */
-    else
-    if (sizeof(int_f) == sizeof(long long)) {
-    if ((types[0] = (hid_t_f)H5Tcopy(H5T_NATIVE_LLONG)) < 0) return ret_value;
+    else if (sizeof(int_f) == sizeof(long long)) {
+        if ((types[5] = (hid_t_f)H5Tcopy(H5T_NATIVE_LLONG)) < 0)
+            return ret_value;
     } /*end else */
 
     /* Find appropriate size to store Fortran REAL */
-    if(sizeof(real_f)==sizeof(float)) {
-        if ((types[1] = (hid_t_f)H5Tcopy(H5T_NATIVE_FLOAT)) < 0) return ret_value;
+    if (sizeof(real_f) == sizeof(float)) {
+        if ((types[6] = (hid_t_f)H5Tcopy(H5T_NATIVE_FLOAT)) < 0)
+            return ret_value;
     } /* end if */
-    else if(sizeof(real_f)==sizeof(double)){
-        if ((types[1] = (hid_t_f)H5Tcopy(H5T_NATIVE_DOUBLE)) < 0) return ret_value;
+    else if (sizeof(real_f) == sizeof(double)) {
+        if ((types[6] = (hid_t_f)H5Tcopy(H5T_NATIVE_DOUBLE)) < 0)
+            return ret_value;
     } /* end if */
-#if H5_SIZEOF_LONG_DOUBLE!=0
     else if (sizeof(real_f) == sizeof(long double)) {
-        if ((types[1] = (hid_t_f)H5Tcopy(H5T_NATIVE_LDOUBLE)) < 0) return ret_value;
+        if ((types[6] = (hid_t_f)H5Tcopy(H5T_NATIVE_LDOUBLE)) < 0)
+            return ret_value;
     } /* end else */
-#endif
 
     /* Find appropriate size to store Fortran DOUBLE */
-    if(sizeof(double_f)==sizeof(double)) {
-       if ((types[2] = (hid_t_f)H5Tcopy(H5T_NATIVE_DOUBLE)) < 0) return ret_value;
-    }/*end if */
-#if H5_SIZEOF_LONG_DOUBLE!=0
-    else if(sizeof(double_f)==sizeof(long double)) {
-       if ((types[2] = (hid_t_f)H5Tcopy(H5T_NATIVE_LDOUBLE)) < 0) return ret_value;
-    }/*end else */
-#endif
-
-/*
-    if ((types[3] = H5Tcopy(H5T_NATIVE_UINT8)) < 0) return ret_value;
-*/
-    if ((c_type_id = H5Tcopy(H5T_FORTRAN_S1)) < 0) return ret_value;
-    tmp_val = 1;
-    if(H5Tset_size(c_type_id, tmp_val) < 0) return ret_value;
-    if(H5Tset_strpad(c_type_id, H5T_STR_SPACEPAD) < 0) return ret_value;
-    types[3] = (hid_t_f)c_type_id;
-
-/*
-    if ((types[3] = H5Tcopy(H5T_C_S1)) < 0) return ret_value;
-    if(H5Tset_strpad(types[3],H5T_STR_NULLTERM) < 0) return ret_value;
-    if(H5Tset_size(types[3],1) < 0) return ret_value;
-*/
-
-
-/*    if ((types[3] = H5Tcopy(H5T_STD_I8BE)) < 0) return ret_value;
-*/
-    if ((types[4] = (hid_t_f)H5Tcopy(H5T_STD_REF_OBJ)) < 0) return ret_value;
-    if ((types[5] = (hid_t_f)H5Tcopy(H5T_STD_REF_DSETREG)) < 0) return ret_value;
-    /*
-     * FIND H5T_NATIVE_INTEGER_1
-     */
-    if (sizeof(int_1_f) == sizeof(char)) {
-      if ((types[6] = (hid_t_f)H5Tcopy(H5T_NATIVE_CHAR)) < 0) return ret_value;
-    } /*end if */
-    else if (sizeof(int_1_f) == sizeof(short)) {
-      if ((types[6] = (hid_t_f)H5Tcopy(H5T_NATIVE_SHORT)) < 0) return ret_value;
-    } /*end if */
-    else if (sizeof(int_1_f) == sizeof(int)) {
-      if ((types[6] = (hid_t_f)H5Tcopy(H5T_NATIVE_INT)) < 0) return ret_value;
+    if (sizeof(double_f) == sizeof(double)) {
+        if ((types[7] = (hid_t_f)H5Tcopy(H5T_NATIVE_DOUBLE)) < 0)
+            return ret_value;
     } /*end if */
-    else if (sizeof(int_1_f) == sizeof(long long)) {
-	if ((types[6] = (hid_t_f)H5Tcopy(H5T_NATIVE_LLONG)) < 0) return ret_value;
+    else if (sizeof(double_f) == sizeof(long double)) {
+        if ((types[7] = (hid_t_f)H5Tcopy(H5T_NATIVE_LDOUBLE)) < 0)
+            return ret_value;
     } /*end else */
-    /*
-     * FIND H5T_NATIVE_INTEGER_2
-     */
-    if (sizeof(int_2_f) == sizeof(char)) {
-      if ((types[7] = (hid_t_f)H5Tcopy(H5T_NATIVE_CHAR)) < 0) return ret_value;
-    } /*end if */
-    else if (sizeof(int_2_f) == sizeof(short)) {
-      if ((types[7] = (hid_t_f)H5Tcopy(H5T_NATIVE_SHORT)) < 0) return ret_value;
-    } /*end if */
-    else if (sizeof(int_2_f) == sizeof(int)) {
-      if ((types[7] = (hid_t_f)H5Tcopy(H5T_NATIVE_INT)) < 0) return ret_value;
-    } /*end if */
-    else if (sizeof(int_2_f) == sizeof(long long)) {
-	if ((types[7] = (hid_t_f)H5Tcopy(H5T_NATIVE_LLONG)) < 0) return ret_value;
+#ifdef H5_HAVE_FLOAT128
+    else if (sizeof(double_f) == sizeof(__float128)) {
+        if ((types[7] = H5Tcopy(H5T_NATIVE_FLOAT)) < 0)
+            return ret_value;
+        if (H5Tset_precision(types[7], 128) < 0)
+            return ret_value;
     } /*end else */
+#endif
+
+    if ((c_type_id = H5Tcopy(H5T_FORTRAN_S1)) < 0)
+        return ret_value;
+    if (H5Tset_size(c_type_id, 1) < 0)
+        return ret_value;
+    if (H5Tset_strpad(c_type_id, H5T_STR_SPACEPAD) < 0)
+        return ret_value;
+    types[8] = (hid_t_f)c_type_id;
+
+    if ((types[9] = (hid_t_f)H5Tcopy(H5T_STD_REF_OBJ)) < 0)
+        return ret_value;
+    if ((types[10] = (hid_t_f)H5Tcopy(H5T_STD_REF_DSETREG)) < 0)
+        return ret_value;
+
     /*
-     * FIND H5T_NATIVE_INTEGER_4
+     * FIND H5T_NATIVE_REAL_C_FLOAT
      */
-    if (sizeof(int_4_f) == sizeof(char)) {
-      if ((types[8] = (hid_t_f)H5Tcopy(H5T_NATIVE_CHAR)) < 0) return ret_value;
+    if (sizeof(real_C_FLOAT_f) == sizeof(float)) {
+        if ((types[11] = (hid_t_f)H5Tcopy(H5T_NATIVE_FLOAT)) < 0)
+            return ret_value;
     } /*end if */
-    else if (sizeof(int_4_f) == sizeof(short)) {
-      if ((types[8] = (hid_t_f)H5Tcopy(H5T_NATIVE_SHORT)) < 0) return ret_value;
+    else if (sizeof(real_C_FLOAT_f) == sizeof(double)) {
+        if ((types[11] = (hid_t_f)H5Tcopy(H5T_NATIVE_DOUBLE)) < 0)
+            return ret_value;
     } /*end if */
-    else if (sizeof(int_4_f) == sizeof(int)) {
-      if ((types[8] = (hid_t_f)H5Tcopy(H5T_NATIVE_INT)) < 0) return ret_value;
-    } /*end if */
-    else if (sizeof(int_4_f) == sizeof(long long)) {
-	if ((types[8] = (hid_t_f)H5Tcopy(H5T_NATIVE_LLONG)) < 0) return ret_value;
+    else if (sizeof(real_C_FLOAT_f) == sizeof(long double)) {
+        if ((types[11] = (hid_t_f)H5Tcopy(H5T_NATIVE_LDOUBLE)) < 0)
+            return ret_value;
     } /*end else */
     /*
-     * FIND H5T_NATIVE_INTEGER_8
+     * FIND H5T_NATIVE_REAL_C_DOUBLE
      */
-    if (sizeof(int_8_f) == sizeof(char)) {
-      if ((types[9] = (hid_t_f)H5Tcopy(H5T_NATIVE_CHAR)) < 0) return ret_value;
-    } /*end if */
-    else if (sizeof(int_8_f) == sizeof(short)) {
-      if ((types[9] = (hid_t_f)H5Tcopy(H5T_NATIVE_SHORT)) < 0) return ret_value;
+    if (sizeof(real_C_DOUBLE_f) == sizeof(float)) {
+        if ((types[12] = (hid_t_f)H5Tcopy(H5T_NATIVE_FLOAT)) < 0)
+            return ret_value;
     } /*end if */
-    else if (sizeof(int_8_f) == sizeof(int)) {
-      if ((types[9] = (hid_t_f)H5Tcopy(H5T_NATIVE_INT)) < 0) return ret_value;
+    else if (sizeof(real_C_DOUBLE_f) == sizeof(double)) {
+        if ((types[12] = (hid_t_f)H5Tcopy(H5T_NATIVE_DOUBLE)) < 0)
+            return ret_value;
     } /*end if */
-    else if (sizeof(int_8_f) == sizeof(long long)) {
-	if ((types[9] = (hid_t_f)H5Tcopy(H5T_NATIVE_LLONG)) < 0) return ret_value;
+    else if (sizeof(real_C_DOUBLE_f) == sizeof(long double)) {
+        if ((types[12] = (hid_t_f)H5Tcopy(H5T_NATIVE_LDOUBLE)) < 0)
+            return ret_value;
     } /*end else */
     /*
-     * FIND H5T_NATIVE_REAL_4
+     * FIND H5T_NATIVE_REAL_C_LONG_DOUBLE
      */
-    if (sizeof(real_4_f) == sizeof(float)) {
-      if ((types[10] = (hid_t_f)H5Tcopy(H5T_NATIVE_FLOAT)) < 0) return ret_value;
+#if H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE != 0
+    if (sizeof(real_C_LONG_DOUBLE_f) == sizeof(float)) {
+        if ((types[13] = (hid_t_f)H5Tcopy(H5T_NATIVE_FLOAT)) < 0)
+            return ret_value;
     } /*end if */
-    else if (sizeof(real_4_f) == sizeof(double)) {
-      if ((types[10] = (hid_t_f)H5Tcopy(H5T_NATIVE_DOUBLE)) < 0) return ret_value;
+    else if (sizeof(real_C_LONG_DOUBLE_f) == sizeof(double)) {
+        if ((types[13] = (hid_t_f)H5Tcopy(H5T_NATIVE_DOUBLE)) < 0)
+            return ret_value;
     } /*end if */
-#if H5_SIZEOF_LONG_DOUBLE!=0
-    else if (sizeof(real_4_f) == sizeof(long double)) {
-	if ((types[10] = (hid_t_f)H5Tcopy(H5T_NATIVE_LDOUBLE)) < 0) return ret_value;
-    } /*end else */
+#if H5_FORTRAN_HAVE_C_LONG_DOUBLE != 0
+    else if (sizeof(real_C_LONG_DOUBLE_f) == sizeof(long double)) {
+        if (H5_PAC_C_MAX_REAL_PRECISION >= H5_PAC_FC_MAX_REAL_PRECISION) {
+            if ((types[13] = (hid_t_f)H5Tcopy(H5T_NATIVE_LDOUBLE)) < 0)
+                return ret_value;
+        }
+        else {
+            if ((types[13] = H5Tcopy(H5T_NATIVE_FLOAT)) < 0)
+                return ret_value;
+            if (H5Tset_precision(types[13], 128) < 0)
+                return ret_value;
+        }
+    }
+#else
+    if ((types[13] = H5Tcopy(H5T_NATIVE_FLOAT)) < 0)
+        return ret_value;
+    if (H5Tset_precision(types[13], 64) < 0)
+        return ret_value;
+#endif
+#else
+    if ((types[13] = H5Tcopy(H5T_NATIVE_DOUBLE)) < 0)
+        return ret_value;
 #endif
     /*
-     * FIND H5T_NATIVE_REAL_8
+     * FIND H5T_NATIVE_B_8
      */
-    if (sizeof(real_8_f) == sizeof(float)) {
-      if ((types[11] = (hid_t_f)H5Tcopy(H5T_NATIVE_FLOAT)) < 0) return ret_value;
-    } /*end if */
-    else if (sizeof(real_8_f) == sizeof(double)) {
-      if ((types[11] = (hid_t_f)H5Tcopy(H5T_NATIVE_DOUBLE)) < 0) return ret_value;
-    } /*end if */
-#if H5_SIZEOF_LONG_DOUBLE!=0
-    else if (sizeof(real_8_f) == sizeof(long double)) {
-	if ((types[11] = (hid_t_f)H5Tcopy(H5T_NATIVE_LDOUBLE)) < 0) return ret_value;
-    } /*end else */
-#endif
+    if ((types[14] = (hid_t_f)H5Tcopy(H5T_NATIVE_B8)) < 0)
+        return ret_value;
+    if ((types[15] = (hid_t_f)H5Tcopy(H5T_NATIVE_B16)) < 0)
+        return ret_value;
+    if ((types[16] = (hid_t_f)H5Tcopy(H5T_NATIVE_B32)) < 0)
+        return ret_value;
+    if ((types[17] = (hid_t_f)H5Tcopy(H5T_NATIVE_B64)) < 0)
+        return ret_value;
+
     /*
-     * FIND H5T_NATIVE_REAL_16
+     * FIND H5T_NATIVE_FLOAT_128
      */
-    if (sizeof(real_16_f) == sizeof(float)) {
-      if ((types[12] = (hid_t_f)H5Tcopy(H5T_NATIVE_FLOAT)) < 0) return ret_value;
-    } /*end if */
-    else if (sizeof(real_16_f) == sizeof(double)) {
-      if ((types[12] = (hid_t_f)H5Tcopy(H5T_NATIVE_DOUBLE)) < 0) return ret_value;
-    } /*end if */
-#if H5_SIZEOF_LONG_DOUBLE!=0
-    else if (sizeof(real_16_f) == sizeof(long double)) {
-	if ((types[12] = (hid_t_f)H5Tcopy(H5T_NATIVE_LDOUBLE)) < 0) return ret_value;
-    } /*end else */
-#endif
+    if ((types[18] = H5Tcopy(H5T_NATIVE_FLOAT)) < 0)
+        return ret_value;
+    if (H5Tset_precision(types[18], 128) < 0)
+        return ret_value;
+
+    /*--------------------------------------------------------------------------------------*/
+
+    if ((floatingtypes[0] = (hid_t_f)H5Tcopy(H5T_IEEE_F32BE)) < 0)
+        return ret_value;
+    if ((floatingtypes[1] = (hid_t_f)H5Tcopy(H5T_IEEE_F32LE)) < 0)
+        return ret_value;
+    if ((floatingtypes[2] = (hid_t_f)H5Tcopy(H5T_IEEE_F64BE)) < 0)
+        return ret_value;
+    if ((floatingtypes[3] = (hid_t_f)H5Tcopy(H5T_IEEE_F64LE)) < 0)
+        return ret_value;
+
+    if ((integertypes[0] = (hid_t_f)H5Tcopy(H5T_STD_I8BE)) < 0)
+        return ret_value;
+    if ((integertypes[1] = (hid_t_f)H5Tcopy(H5T_STD_I8LE)) < 0)
+        return ret_value;
+    if ((integertypes[2] = (hid_t_f)H5Tcopy(H5T_STD_I16BE)) < 0)
+        return ret_value;
+    if ((integertypes[3] = (hid_t_f)H5Tcopy(H5T_STD_I16LE)) < 0)
+        return ret_value;
+    if ((integertypes[4] = (hid_t_f)H5Tcopy(H5T_STD_I32BE)) < 0)
+        return ret_value;
+    if ((integertypes[5] = (hid_t_f)H5Tcopy(H5T_STD_I32LE)) < 0)
+        return ret_value;
+    if ((integertypes[6] = (hid_t_f)H5Tcopy(H5T_STD_I64BE)) < 0)
+        return ret_value;
+    if ((integertypes[7] = (hid_t_f)H5Tcopy(H5T_STD_I64LE)) < 0)
+        return ret_value;
+    if ((integertypes[8] = (hid_t_f)H5Tcopy(H5T_STD_U8BE)) < 0)
+        return ret_value;
+    if ((integertypes[9] = (hid_t_f)H5Tcopy(H5T_STD_U8LE)) < 0)
+        return ret_value;
+    if ((integertypes[10] = (hid_t_f)H5Tcopy(H5T_STD_U16BE)) < 0)
+        return ret_value;
+    if ((integertypes[11] = (hid_t_f)H5Tcopy(H5T_STD_U16LE)) < 0)
+        return ret_value;
+    if ((integertypes[12] = (hid_t_f)H5Tcopy(H5T_STD_U32BE)) < 0)
+        return ret_value;
+    if ((integertypes[13] = (hid_t_f)H5Tcopy(H5T_STD_U32LE)) < 0)
+        return ret_value;
+    if ((integertypes[14] = (hid_t_f)H5Tcopy(H5T_STD_U64BE)) < 0)
+        return ret_value;
+    if ((integertypes[15] = (hid_t_f)H5Tcopy(H5T_STD_U64LE)) < 0)
+        return ret_value;
+    if ((integertypes[17] = (hid_t_f)H5Tcopy(H5T_STD_B8BE)) < 0)
+        return ret_value;
+    if ((integertypes[18] = (hid_t_f)H5Tcopy(H5T_STD_B8LE)) < 0)
+        return ret_value;
+    if ((integertypes[19] = (hid_t_f)H5Tcopy(H5T_STD_B16BE)) < 0)
+        return ret_value;
+    if ((integertypes[20] = (hid_t_f)H5Tcopy(H5T_STD_B16LE)) < 0)
+        return ret_value;
+    if ((integertypes[21] = (hid_t_f)H5Tcopy(H5T_STD_B32BE)) < 0)
+        return ret_value;
+    if ((integertypes[22] = (hid_t_f)H5Tcopy(H5T_STD_B32LE)) < 0)
+        return ret_value;
+    if ((integertypes[23] = (hid_t_f)H5Tcopy(H5T_STD_B64BE)) < 0)
+        return ret_value;
+    if ((integertypes[24] = (hid_t_f)H5Tcopy(H5T_STD_B64LE)) < 0)
+        return ret_value;
+    if ((integertypes[25] = (hid_t_f)H5Tcopy(H5T_FORTRAN_S1)) < 0)
+        return ret_value;
+    if ((integertypes[26] = (hid_t_f)H5Tcopy(H5T_C_S1)) < 0)
+        return ret_value;
+
     /*
-     * FIND H5T_NATIVE_B_8
+     *  Define Fortran H5T_STRING type to store non-fixed size strings
      */
-    if ((types[13] = (hid_t_f)H5Tcopy(H5T_NATIVE_B8))  < 0) return ret_value;
-    if ((types[14] = (hid_t_f)H5Tcopy(H5T_NATIVE_B16)) < 0) return ret_value;
-    if ((types[15] = (hid_t_f)H5Tcopy(H5T_NATIVE_B32)) < 0) return ret_value;
-    if ((types[16] = (hid_t_f)H5Tcopy(H5T_NATIVE_B64)) < 0) return ret_value;  
-
-    if ((floatingtypes[0] = (hid_t_f)H5Tcopy(H5T_IEEE_F32BE)) < 0) return ret_value;
-    if ((floatingtypes[1] = (hid_t_f)H5Tcopy(H5T_IEEE_F32LE)) < 0) return ret_value;
-    if ((floatingtypes[2] = (hid_t_f)H5Tcopy(H5T_IEEE_F64BE)) < 0) return ret_value;
-    if ((floatingtypes[3] = (hid_t_f)H5Tcopy(H5T_IEEE_F64LE)) < 0) return ret_value;
-
-    if ((integertypes[0] = (hid_t_f)H5Tcopy(H5T_STD_I8BE)) < 0) return ret_value;
-    if ((integertypes[1] = (hid_t_f)H5Tcopy(H5T_STD_I8LE)) < 0) return ret_value;
-    if ((integertypes[2] = (hid_t_f)H5Tcopy(H5T_STD_I16BE)) < 0) return ret_value;
-    if ((integertypes[3] = (hid_t_f)H5Tcopy(H5T_STD_I16LE)) < 0) return ret_value;
-    if ((integertypes[4] = (hid_t_f)H5Tcopy(H5T_STD_I32BE)) < 0) return ret_value;
-    if ((integertypes[5] = (hid_t_f)H5Tcopy(H5T_STD_I32LE)) < 0) return ret_value;
-    if ((integertypes[6] = (hid_t_f)H5Tcopy(H5T_STD_I64BE)) < 0) return ret_value;
-    if ((integertypes[7] = (hid_t_f)H5Tcopy(H5T_STD_I64LE)) < 0) return ret_value;
-    if ((integertypes[8] = (hid_t_f)H5Tcopy(H5T_STD_U8BE)) < 0) return ret_value;
-    if ((integertypes[9] = (hid_t_f)H5Tcopy(H5T_STD_U8LE)) < 0) return ret_value;
-    if ((integertypes[10] = (hid_t_f)H5Tcopy(H5T_STD_U16BE)) < 0) return ret_value;
-    if ((integertypes[11] = (hid_t_f)H5Tcopy(H5T_STD_U16LE)) < 0) return ret_value;
-    if ((integertypes[12] = (hid_t_f)H5Tcopy(H5T_STD_U32BE)) < 0) return ret_value;
-    if ((integertypes[13] = (hid_t_f)H5Tcopy(H5T_STD_U32LE)) < 0) return ret_value;
-    if ((integertypes[14] = (hid_t_f)H5Tcopy(H5T_STD_U64BE)) < 0) return ret_value;
-    if ((integertypes[15] = (hid_t_f)H5Tcopy(H5T_STD_U64LE)) < 0) return ret_value;	
-    if ((integertypes[17] = (hid_t_f)H5Tcopy(H5T_STD_B8BE)) < 0) return ret_value;
-    if ((integertypes[18] = (hid_t_f)H5Tcopy(H5T_STD_B8LE)) < 0) return ret_value;
-    if ((integertypes[19] = (hid_t_f)H5Tcopy(H5T_STD_B16BE)) < 0) return ret_value;
-    if ((integertypes[20] = (hid_t_f)H5Tcopy(H5T_STD_B16LE)) < 0) return ret_value;
-    if ((integertypes[21] = (hid_t_f)H5Tcopy(H5T_STD_B32BE)) < 0) return ret_value;
-    if ((integertypes[22] = (hid_t_f)H5Tcopy(H5T_STD_B32LE)) < 0) return ret_value;
-    if ((integertypes[23] = (hid_t_f)H5Tcopy(H5T_STD_B64BE)) < 0) return ret_value;
-    if ((integertypes[24] = (hid_t_f)H5Tcopy(H5T_STD_B64LE)) < 0) return ret_value;
-    if ((integertypes[25] = (hid_t_f)H5Tcopy(H5T_FORTRAN_S1)) < 0) return ret_value;
-    if ((integertypes[26] = (hid_t_f)H5Tcopy(H5T_C_S1)) < 0) return ret_value;
-
-/*
- *  Define Fortran H5T_STRING type to store non-fixed size strings
- */
-    if ((c_type_id = H5Tcopy(H5T_C_S1)) < 0) return ret_value;
-    if(H5Tset_size(c_type_id, H5T_VARIABLE) < 0) return ret_value;
+    if ((c_type_id = H5Tcopy(H5T_C_S1)) < 0)
+        return ret_value;
+    if (H5Tset_size(c_type_id, H5T_VARIABLE) < 0)
+        return ret_value;
     integertypes[16] = c_type_id;
 
     ret_value = 0;
@@ -272,58 +321,61 @@ nh5init_types_c( hid_t_f * types, hid_t_f * floatingtypes, hid_t_f * integertype
  *  Closes predefined datatype in Fortran
  * INPUTS
  *  types         - array with the predefined Native Fortran
- *                  type, its element and length must be the
- *                  same as the types array defined in the
- *                  H5f90global.f90
+ *  type, its element and length must be the
+ *  same as the types array defined in the
+ *                  H5f90global.F90
  *  lentypes      - length of the types array, which must be the
- *                  same as the length of types array defined
- *                  in the H5f90global.f90
+ *  same as the length of types array defined
+ *  in the H5f90global.F90
  *  floatingtypes - array with the predefined Floating Fortran
- *                  type, its element and length must be the
- *                  same as the floatingtypes array defined in the
- *                  H5f90global.f90
+ *  type, its element and length must be the
+ *  same as the floatingtypes array defined in the
+ *                  H5f90global.F90
  *  floatinglen   - length of the floatingtypes array, which must be the
- *                  same as the length of floatingtypes array defined
- *                  in the H5f90global.f90
+ *  same as the length of floatingtypes array defined
+ *  in the H5f90global.F90
  *  integertypes  - array with the predefined Integer Fortran
- *                  type, its element and length must be the
- *                  same as the integertypes array defined in the
- *                  H5f90global.f90
+ *  type, its element and length must be the
+ *  same as the integertypes array defined in the
+ *                  H5f90global.F90
  *  integerlen    - length of the floatingtypes array, which must be the
- *                  same as the length of floatingtypes array defined
- *                  in the H5f90global.f90
+ *  same as the length of floatingtypes array defined
+ *  in the H5f90global.F90
  * RETURNS
- *   0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
- *   Elena Pourmal
- *   Tuesday, August 3, 1999
+ *  Elena Pourmal
+ *  Tuesday, August 3, 1999
  * SOURCE
  */
 int_f
-nh5close_types_c( hid_t_f * types, int_f *lentypes,
-                  hid_t_f * floatingtypes, int_f* floatinglen,
-                  hid_t_f * integertypes,  int_f * integerlen )
+h5close_types_c(hid_t_f *types, int_f *lentypes, hid_t_f *floatingtypes, int_f *floatinglen,
+                hid_t_f *integertypes, int_f *integerlen)
 /******/
 {
-    int ret_value = -1;
+    int   ret_value = -1;
     hid_t c_type_id;
-    int i;
+    int   i;
 
     for (i = 0; i < *lentypes; i++) {
         c_type_id = types[i];
-        if ( H5Tclose(c_type_id) < 0) return ret_value;
+        if (H5Tclose(c_type_id) < 0)
+            return ret_value;
     }
     for (i = 0; i < *floatinglen; i++) {
         c_type_id = floatingtypes[i];
-        if ( H5Tclose(c_type_id) < 0) return ret_value;
+        if (H5Tclose(c_type_id) < 0)
+            return ret_value;
     }
     for (i = 0; i < *integerlen; i++) {
         c_type_id = integertypes[i];
-        if ( H5Tclose(c_type_id) < 0) return ret_value;
+        if (H5Tclose(c_type_id) < 0)
+            return ret_value;
     }
     ret_value = 0;
     return ret_value;
 }
+
 /****if* H5_f/h5init_flags_c
  * NAME
  *  h5init_flags_c
@@ -343,6 +395,7 @@ nh5close_types_c( hid_t_f * types, int_f *lentypes,
  *  h5p_flags_int   - H5P interface flags of type integer
  *  h5r_flags       - H5R interface flags
  *  h5s_flags       - H5S interface flags
+ *  h5s_hid_flags   - H5S interface flags of type hid_t
  *  h5s_hsize_flags - H5S interface flags of type hsize_t
  *  h5t_flags       - H5T interface flags
  *  h5z_flags       - H5Z interface flags
@@ -365,34 +418,34 @@ nh5close_types_c( hid_t_f * types, int_f *lentypes,
  *           MSB, July 9, 2009
  *  Added type h5d_flags of type size_t
  *           MSB, Feb. 28, 2014
+ *  Added type h5s_hid_flags of type hid_t
+ *           MSB, Oct. 10, 2016
  * SOURCE
  */
 int_f
-nh5init_flags_c( int_f *h5d_flags, size_t_f *h5d_size_flags, 
-		 int_f *h5e_flags, hid_t_f *h5e_hid_flags, int_f *h5f_flags,
-                 int_f *h5fd_flags, hid_t_f *h5fd_hid_flags,
-                 int_f *h5g_flags, int_f *h5i_flags, int_f *h5l_flags, int_f *h5o_flags,
-                 hid_t_f *h5p_flags, int_f *h5p_flags_int, int_f *h5r_flags, int_f *h5s_flags,
-		 hsize_t_f *h5s_hsize_flags, int_f *h5t_flags, int_f *h5z_flags, int_f *h5_generic_flags)
+h5init_flags_c(int_f *h5d_flags, size_t_f *h5d_size_flags, int_f *h5e_flags, hid_t_f *h5e_hid_flags,
+               int_f *h5f_flags, int_f *h5fd_flags, hid_t_f *h5fd_hid_flags, int_f *h5g_flags,
+               int_f *h5i_flags, int_f *h5l_flags, int_f *h5o_flags, hid_t_f *h5p_flags, int_f *h5p_flags_int,
+               int_f *h5r_flags, int_f *h5s_flags, hid_t_f *h5s_hid_flags, hsize_t_f *h5s_hsize_flags,
+               int_f *h5t_flags, int_f *h5z_flags, int_f *h5_generic_flags, haddr_t_f *h5_haddr_generic_flags)
 /******/
 {
-    int ret_value = -1;
-/*
- *  H5D flags
- */
+    /*
+     *  H5D flags
+     */
     h5d_size_flags[0] = (size_t_f)H5D_CHUNK_CACHE_NSLOTS_DEFAULT;
     h5d_size_flags[1] = (size_t_f)H5D_CHUNK_CACHE_NBYTES_DEFAULT;
 
-    h5d_flags[0] = (int_f)H5D_COMPACT;
-    h5d_flags[1] = (int_f)H5D_CONTIGUOUS;
-    h5d_flags[2] = (int_f)H5D_CHUNKED;
-    h5d_flags[3] = (int_f)H5D_ALLOC_TIME_ERROR;
-    h5d_flags[4] = (int_f)H5D_ALLOC_TIME_DEFAULT;
-    h5d_flags[5] = (int_f)H5D_ALLOC_TIME_EARLY;
-    h5d_flags[6] = (int_f)H5D_ALLOC_TIME_LATE;
-    h5d_flags[7] = (int_f)H5D_ALLOC_TIME_INCR;
-    h5d_flags[8] = (int_f)H5D_SPACE_STATUS_ERROR;
-    h5d_flags[9] = (int_f)H5D_SPACE_STATUS_NOT_ALLOCATED;
+    h5d_flags[0]  = (int_f)H5D_COMPACT;
+    h5d_flags[1]  = (int_f)H5D_CONTIGUOUS;
+    h5d_flags[2]  = (int_f)H5D_CHUNKED;
+    h5d_flags[3]  = (int_f)H5D_ALLOC_TIME_ERROR;
+    h5d_flags[4]  = (int_f)H5D_ALLOC_TIME_DEFAULT;
+    h5d_flags[5]  = (int_f)H5D_ALLOC_TIME_EARLY;
+    h5d_flags[6]  = (int_f)H5D_ALLOC_TIME_LATE;
+    h5d_flags[7]  = (int_f)H5D_ALLOC_TIME_INCR;
+    h5d_flags[8]  = (int_f)H5D_SPACE_STATUS_ERROR;
+    h5d_flags[9]  = (int_f)H5D_SPACE_STATUS_NOT_ALLOCATED;
     h5d_flags[10] = (int_f)H5D_SPACE_STATUS_PART_ALLOCATED;
     h5d_flags[11] = (int_f)H5D_SPACE_STATUS_ALLOCATED;
     h5d_flags[12] = (int_f)H5D_FILL_TIME_ERROR;
@@ -408,10 +461,14 @@ nh5init_flags_c( int_f *h5d_flags, size_t_f *h5d_size_flags,
     h5d_flags[22] = (int_f)H5D_MPIO_CHUNK_COLLECTIVE;
     h5d_flags[23] = (int_f)H5D_MPIO_CHUNK_MIXED;
     h5d_flags[24] = (int_f)H5D_MPIO_CONTIGUOUS_COLLECTIVE;
+    h5d_flags[25] = (int_f)H5D_VDS_ERROR;
+    h5d_flags[26] = (int_f)H5D_VDS_FIRST_MISSING;
+    h5d_flags[27] = (int_f)H5D_VDS_LAST_AVAILABLE;
+    h5d_flags[28] = (int_f)H5D_VIRTUAL;
 
-/*
- *  H5E flags
- */
+    /*
+     *  H5E flags
+     */
     h5e_hid_flags[0] = (hid_t_f)H5E_DEFAULT;
 
     h5e_flags[0] = (int_f)H5E_MAJOR;
@@ -419,19 +476,24 @@ nh5init_flags_c( int_f *h5d_flags, size_t_f *h5d_size_flags,
     h5e_flags[2] = (int_f)H5E_WALK_UPWARD;
     h5e_flags[3] = (int_f)H5E_WALK_DOWNWARD;
 
-/*
- *  H5F flags
- */
+    /*
+     *  H5F flags
+     *
+     *  Note that H5F_ACC_DEBUG is deprecated (nonfunctional) but retained
+     *  for backward compatibility since it's in the public API.
+     */
     h5f_flags[0] = (int_f)H5F_ACC_RDWR;
     h5f_flags[1] = (int_f)H5F_ACC_RDONLY;
     h5f_flags[2] = (int_f)H5F_ACC_TRUNC;
     h5f_flags[3] = (int_f)H5F_ACC_EXCL;
+#ifndef H5_NO_DEPRECATED_SYMBOLS
     h5f_flags[4] = (int_f)H5F_ACC_DEBUG;
-    h5f_flags[5] = (int_f)H5F_SCOPE_LOCAL;
-    h5f_flags[6] = (int_f)H5F_SCOPE_GLOBAL;
-    h5f_flags[7] = (int_f)H5F_CLOSE_DEFAULT;
-    h5f_flags[8] = (int_f)H5F_CLOSE_WEAK;
-    h5f_flags[9] = (int_f)H5F_CLOSE_SEMI;
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
+    h5f_flags[5]  = (int_f)H5F_SCOPE_LOCAL;
+    h5f_flags[6]  = (int_f)H5F_SCOPE_GLOBAL;
+    h5f_flags[7]  = (int_f)H5F_CLOSE_DEFAULT;
+    h5f_flags[8]  = (int_f)H5F_CLOSE_WEAK;
+    h5f_flags[9]  = (int_f)H5F_CLOSE_SEMI;
     h5f_flags[10] = (int_f)H5F_CLOSE_STRONG;
     h5f_flags[11] = (int_f)H5F_OBJ_FILE;
     h5f_flags[12] = (int_f)H5F_OBJ_DATASET;
@@ -440,26 +502,57 @@ nh5init_flags_c( int_f *h5d_flags, size_t_f *h5d_size_flags,
     h5f_flags[15] = (int_f)H5F_OBJ_ALL;
     h5f_flags[16] = (int_f)H5F_LIBVER_EARLIEST;
     h5f_flags[17] = (int_f)H5F_LIBVER_LATEST;
-    h5f_flags[18] = (int_f)H5F_UNLIMITED;
+    h5f_flags[18] = (int_f)H5F_LIBVER_ERROR;
+    h5f_flags[19] = (int_f)H5F_LIBVER_NBOUNDS;
+    h5f_flags[20] = (int_f)H5F_UNLIMITED;
+    h5f_flags[21] = (int_f)H5F_LIBVER_V18;
+    h5f_flags[22] = (int_f)H5F_LIBVER_V110;
+    h5f_flags[23] = (int_f)H5F_LIBVER_V112;
+    h5f_flags[24] = (int_f)H5F_LIBVER_V114;
 
-/*
- *  H5FD flags
- */
-    h5fd_flags[0] = (int_f)H5FD_MPIO_INDEPENDENT;
-    h5fd_flags[1] = (int_f)H5FD_MPIO_COLLECTIVE;
-    h5fd_flags[2] = (int_f)H5FD_MEM_NOLIST;
-    h5fd_flags[3] = (int_f)H5FD_MEM_DEFAULT;
-    h5fd_flags[4] = (int_f)H5FD_MEM_SUPER;
-    h5fd_flags[5] = (int_f)H5FD_MEM_BTREE;
-    h5fd_flags[6] = (int_f)H5FD_MEM_DRAW;
-    h5fd_flags[7] = (int_f)H5FD_MEM_GHEAP;
-    h5fd_flags[8] = (int_f)H5FD_MEM_LHEAP;
-    h5fd_flags[9] = (int_f)H5FD_MEM_OHDR;
+    /*
+     *  H5FD flags
+     */
+    h5fd_flags[0]  = (int_f)H5FD_MPIO_INDEPENDENT;
+    h5fd_flags[1]  = (int_f)H5FD_MPIO_COLLECTIVE;
+    h5fd_flags[2]  = (int_f)H5FD_MEM_NOLIST;
+    h5fd_flags[3]  = (int_f)H5FD_MEM_DEFAULT;
+    h5fd_flags[4]  = (int_f)H5FD_MEM_SUPER;
+    h5fd_flags[5]  = (int_f)H5FD_MEM_BTREE;
+    h5fd_flags[6]  = (int_f)H5FD_MEM_DRAW;
+    h5fd_flags[7]  = (int_f)H5FD_MEM_GHEAP;
+    h5fd_flags[8]  = (int_f)H5FD_MEM_LHEAP;
+    h5fd_flags[9]  = (int_f)H5FD_MEM_OHDR;
     h5fd_flags[10] = (int_f)H5FD_MEM_NTYPES;
+#ifdef H5_HAVE_SUBFILING_VFD
+    h5fd_flags[11] = (int_f)H5FD_SUBFILING_CURR_FAPL_VERSION;
+    h5fd_flags[12] = (int_f)H5FD_SUBFILING_FAPL_MAGIC;
+    h5fd_flags[13] = (int_f)H5FD_SUBFILING_DEFAULT_STRIPE_COUNT;
+    h5fd_flags[14] = (int_f)H5FD_IOC_FAPL_MAGIC;
+    h5fd_flags[15] = (int_f)H5FD_IOC_CURR_FAPL_VERSION;
+    h5fd_flags[16] = (int_f)H5FD_IOC_DEFAULT_THREAD_POOL_SIZE;
+    h5fd_flags[17] = (int_f)SELECT_IOC_ONE_PER_NODE;
+    h5fd_flags[18] = (int_f)SELECT_IOC_EVERY_NTH_RANK;
+    h5fd_flags[19] = (int_f)SELECT_IOC_WITH_CONFIG;
+    h5fd_flags[20] = (int_f)SELECT_IOC_TOTAL;
+    h5fd_flags[21] = (int_f)ioc_selection_options;
+#else
+    h5fd_flags[11]    = 0;
+    h5fd_flags[12]    = 0;
+    h5fd_flags[13]    = 0;
+    h5fd_flags[14]    = 0;
+    h5fd_flags[15]    = 0;
+    h5fd_flags[16]    = 0;
+    h5fd_flags[17]    = 0;
+    h5fd_flags[18]    = 0;
+    h5fd_flags[19]    = 0;
+    h5fd_flags[20]    = 0;
+    h5fd_flags[21]    = 0;
+#endif
 
-/*
- *  H5FD flags of type hid_t
- */
+    /*
+     *  H5FD flags of type hid_t
+     */
     h5fd_hid_flags[0] = (hid_t_f)H5FD_CORE;
     h5fd_hid_flags[1] = (hid_t_f)H5FD_FAMILY;
     h5fd_hid_flags[2] = (hid_t_f)H5FD_LOG;
@@ -468,373 +561,430 @@ nh5init_flags_c( int_f *h5d_flags, size_t_f *h5d_size_flags,
     h5fd_hid_flags[5] = (hid_t_f)H5FD_SEC2;
     h5fd_hid_flags[6] = (hid_t_f)H5FD_STDIO;
 
-/*
- *  H5G flags
- */
-    h5g_flags[0] = (int_f)H5O_TYPE_UNKNOWN; /* H5G_UNKNOWN is deprecated */
-    h5g_flags[1] = (int_f)H5O_TYPE_GROUP; /* H5G_GROUP is deprecated  */
-    h5g_flags[2] = (int_f)H5O_TYPE_DATASET; /* H5G_DATASET is deprecated  */
+    /* Calling H5FD_subfiling_init here requires the
+       subfiling requirements to be met.  Only set the
+       subfiling if it meets the below conditions */
+
+    h5fd_hid_flags[7] = (hid_t_f)H5I_INVALID_HID;
+
+#ifdef H5_HAVE_PARALLEL
+    int mpi_initialized = 0;
+    int provided        = 0;
+    int mpi_code;
+
+    if (MPI_SUCCESS == (mpi_code = MPI_Initialized(&mpi_initialized))) {
+        if (mpi_initialized) {
+            /* If MPI is initialized, validate that it was initialized with MPI_THREAD_MULTIPLE */
+            if (MPI_SUCCESS == (mpi_code = MPI_Query_thread(&provided))) {
+                if (provided == MPI_THREAD_MULTIPLE) {
+                    h5fd_hid_flags[7] = (hid_t_f)H5FD_SUBFILING;
+                }
+            }
+        }
+    }
+#endif
+#ifdef H5_HAVE_SUBFILING_VFD
+    h5fd_hid_flags[8] = (hid_t_f)H5FD_SUBFILING_DEFAULT_STRIPE_SIZE;
+#else
+    h5fd_hid_flags[8] = 0;
+#endif
+
+    /*
+     *  H5G flags
+     */
+    h5g_flags[0] = (int_f)H5O_TYPE_UNKNOWN;        /* H5G_UNKNOWN is deprecated */
+    h5g_flags[1] = (int_f)H5O_TYPE_GROUP;          /* H5G_GROUP is deprecated  */
+    h5g_flags[2] = (int_f)H5O_TYPE_DATASET;        /* H5G_DATASET is deprecated  */
     h5g_flags[3] = (int_f)H5O_TYPE_NAMED_DATATYPE; /* H5G_TYPE is deprecated  */
     h5g_flags[4] = (int_f)H5L_SAME_LOC;
     h5g_flags[5] = (int_f)H5L_TYPE_ERROR;
     h5g_flags[6] = (int_f)H5L_TYPE_HARD;
     h5g_flags[7] = (int_f)H5L_TYPE_SOFT;
 
-    h5g_flags[8] = (int_f)H5G_STORAGE_TYPE_UNKNOWN;
-    h5g_flags[9] = (int_f)H5G_STORAGE_TYPE_SYMBOL_TABLE;
+    h5g_flags[8]  = (int_f)H5G_STORAGE_TYPE_UNKNOWN;
+    h5g_flags[9]  = (int_f)H5G_STORAGE_TYPE_SYMBOL_TABLE;
     h5g_flags[10] = (int_f)H5G_STORAGE_TYPE_COMPACT;
     h5g_flags[11] = (int_f)H5G_STORAGE_TYPE_DENSE;
 
-/*
- *  H5I flags
- */
-    h5i_flags[0] = (int_f)H5I_FILE;
-    h5i_flags[1] = (int_f)H5I_GROUP;
-    h5i_flags[2] = (int_f)H5I_DATATYPE;
-    h5i_flags[3] = (int_f)H5I_DATASPACE;
-    h5i_flags[4] = (int_f)H5I_DATASET;
-    h5i_flags[5] = (int_f)H5I_ATTR;
-    h5i_flags[6] = (int_f)H5I_BADID;
-/*
- *  H5L flags
- */
+    /*
+     *  H5I flags
+     */
+    h5i_flags[0]  = (int_f)H5I_FILE;
+    h5i_flags[1]  = (int_f)H5I_GROUP;
+    h5i_flags[2]  = (int_f)H5I_DATATYPE;
+    h5i_flags[3]  = (int_f)H5I_DATASPACE;
+    h5i_flags[4]  = (int_f)H5I_DATASET;
+    h5i_flags[5]  = (int_f)H5I_ATTR;
+    h5i_flags[6]  = (int_f)H5I_BADID;
+    h5i_flags[7]  = (int_f)H5I_UNINIT;
+    h5i_flags[8]  = (int_f)H5I_VFL;
+    h5i_flags[9]  = (int_f)H5I_VOL;
+    h5i_flags[10] = (int_f)H5I_GENPROP_CLS;
+    h5i_flags[11] = (int_f)H5I_GENPROP_LST;
+    h5i_flags[12] = (int_f)H5I_ERROR_CLASS;
+    h5i_flags[13] = (int_f)H5I_ERROR_MSG;
+    h5i_flags[14] = (int_f)H5I_ERROR_STACK;
+    h5i_flags[15] = (int_f)H5I_NTYPES;
+    h5i_flags[16] = (int_f)H5I_INVALID_HID;
+    /*
+     *  H5L flags
+     */
     h5l_flags[0] = (int_f)H5L_TYPE_ERROR;
     h5l_flags[1] = (int_f)H5L_TYPE_HARD;
     h5l_flags[2] = (int_f)H5L_TYPE_SOFT;
     h5l_flags[3] = (int_f)H5L_TYPE_EXTERNAL;
-    h5l_flags[4] = (int_f)H5L_SAME_LOC; /* Macro to indicate operation occurs on same location */
+    h5l_flags[4] = (int_f)H5L_SAME_LOC;          /* Macro to indicate operation occurs on same location */
     h5l_flags[5] = (int_f)H5L_LINK_CLASS_T_VERS; /* Current version of the H5L_class_t struct */
 
-/*
- *  H5O flags
- */
+    /*
+     *  H5O flags
+     */
 
-/* Flags for object copy (H5Ocopy) */
+    /* Flags for object copy (H5Ocopy) */
     h5o_flags[0] = (int_f)H5O_COPY_SHALLOW_HIERARCHY_FLAG; /* Copy only immediate members */
-    h5o_flags[1] = (int_f)H5O_COPY_EXPAND_SOFT_LINK_FLAG; /* Expand soft links into new objects */
-    h5o_flags[2] = (int_f)H5O_COPY_EXPAND_EXT_LINK_FLAG; /* Expand external links into new objects */
-    h5o_flags[3] = (int_f)H5O_COPY_EXPAND_REFERENCE_FLAG; /* Copy objects that are pointed by references */
-    h5o_flags[4] = (int_f)H5O_COPY_WITHOUT_ATTR_FLAG; /* Copy object without copying attributes */
-    h5o_flags[5] = (int_f)H5O_COPY_PRESERVE_NULL_FLAG; /* Copy NULL messages (empty space) */
+    h5o_flags[1] = (int_f)H5O_COPY_EXPAND_SOFT_LINK_FLAG;  /* Expand soft links into new objects */
+    h5o_flags[2] = (int_f)H5O_COPY_EXPAND_EXT_LINK_FLAG;   /* Expand external links into new objects */
+    h5o_flags[3] = (int_f)H5O_COPY_EXPAND_REFERENCE_FLAG;  /* Copy objects that are pointed by references */
+    h5o_flags[4] = (int_f)H5O_COPY_WITHOUT_ATTR_FLAG;      /* Copy object without copying attributes */
+    h5o_flags[5] = (int_f)H5O_COPY_PRESERVE_NULL_FLAG;     /* Copy NULL messages (empty space) */
     h5o_flags[6] = (int_f)H5O_COPY_ALL; /* All object copying flags (for internal checking) */
 
-/* Flags for shared message indexes.
- * Pass these flags in using the mesg_type_flags parameter in
- * H5P_set_shared_mesg_index.
- * (Developers: These flags correspond to object header message type IDs,
- * but we need to assign each kind of message to a different bit so that
- * one index can hold multiple types.)
- */
-      h5o_flags[7] = (int_f)H5O_SHMESG_NONE_FLAG;  /* No shared messages */
-      h5o_flags[8] = (int_f)H5O_SHMESG_SDSPACE_FLAG; /* Simple Dataspace Message.  */
-      h5o_flags[9] = (int_f)H5O_SHMESG_DTYPE_FLAG; /* Datatype Message.  */
-      h5o_flags[10] = (int_f)H5O_SHMESG_FILL_FLAG; /* Fill Value Message. */
-      h5o_flags[11] = (int_f)H5O_SHMESG_PLINE_FLAG; /* Filter pipeline message.  */
-      h5o_flags[12] = (int_f)H5O_SHMESG_ATTR_FLAG; /* Attribute Message.  */
-      h5o_flags[13] = (int_f)H5O_SHMESG_ALL_FLAG;
-
-/* Object header status flag definitions */
-      h5o_flags[14] = (int_f)H5O_HDR_CHUNK0_SIZE; /* 2-bit field indicating # of bytes to store the size of chunk 0's data */
-      h5o_flags[15] = (int_f)H5O_HDR_ATTR_CRT_ORDER_TRACKED; /* Attribute creation order is tracked */
-      h5o_flags[16] = (int_f)H5O_HDR_ATTR_CRT_ORDER_INDEXED; /* Attribute creation order has index */
-      h5o_flags[17] = (int_f)H5O_HDR_ATTR_STORE_PHASE_CHANGE; /* Non-default attribute storage phase change values stored */
-      h5o_flags[18] = (int_f)H5O_HDR_STORE_TIMES; /* Store access, modification, change & birth times for object */
-      h5o_flags[19] = (int_f)H5O_HDR_ALL_FLAGS;
-
-/* Maximum shared message values.  Number of indexes is 8 to allow room to add
- * new types of messages.
- */
-      h5o_flags[20] = (int_f)H5O_SHMESG_MAX_NINDEXES;
-      h5o_flags[21] = (int_f)H5O_SHMESG_MAX_LIST_SIZE;
-
-/* Types of objects in file */
-      h5o_flags[22] = (int_f)H5O_TYPE_UNKNOWN;	      /* Unknown object type */
-      h5o_flags[23] = (int_f)H5O_TYPE_GROUP;          /* Object is a group */
-      h5o_flags[24] = (int_f)H5O_TYPE_DATASET;        /* Object is a dataset */
-      h5o_flags[25] = (int_f)H5O_TYPE_NAMED_DATATYPE; /* Object is a named data type */
-      h5o_flags[26] = (int_f)H5O_TYPE_NTYPES;         /* Number of different object types */
-/*
- *  H5P flags
- */
-      h5p_flags[0] = (hid_t_f)H5P_FILE_CREATE;
-      h5p_flags[1] = (hid_t_f)H5P_FILE_ACCESS;
-      h5p_flags[2] = (hid_t_f)H5P_DATASET_CREATE;
-      h5p_flags[3] = (hid_t_f)H5P_DATASET_XFER;
-      h5p_flags[4] = (hid_t_f)H5P_FILE_MOUNT;
-      h5p_flags[5] = (hid_t_f)H5P_DEFAULT;
-      h5p_flags[6] = (hid_t_f)H5P_ROOT;
-      h5p_flags[7] = (hid_t_f)H5P_OBJECT_CREATE;
-      h5p_flags[8] = (hid_t_f)H5P_DATASET_ACCESS;
-      h5p_flags[9] = (hid_t_f)H5P_GROUP_CREATE;
-      h5p_flags[10] = (hid_t_f)H5P_GROUP_ACCESS;
-      h5p_flags[11] = (hid_t_f)H5P_DATATYPE_CREATE;
-      h5p_flags[12] = (hid_t_f)H5P_DATATYPE_ACCESS;
-      h5p_flags[13] = (hid_t_f)H5P_STRING_CREATE;
-      h5p_flags[14] = (hid_t_f)H5P_ATTRIBUTE_CREATE;
-      h5p_flags[15] = (hid_t_f)H5P_OBJECT_COPY;
-      h5p_flags[16] = (hid_t_f)H5P_LINK_CREATE;
-      h5p_flags[17] = (hid_t_f)H5P_LINK_ACCESS;
-
-
-/*
- *  H5P integer flags
- */
-      h5p_flags_int[0] = (int_f)H5P_CRT_ORDER_INDEXED;
-      h5p_flags_int[1] = (int_f)H5P_CRT_ORDER_TRACKED;
+    /* Flags for shared message indexes.
+     *  Pass these flags in using the mesg_type_flags parameter in
+     * H5P_set_shared_mesg_index.
+     * (Developers: These flags correspond to object header message type IDs,
+     *  but we need to assign each kind of message to a different bit so that
+     *  one index can hold multiple types.)
+     */
+    h5o_flags[7]  = (int_f)H5O_SHMESG_NONE_FLAG;    /* No shared messages */
+    h5o_flags[8]  = (int_f)H5O_SHMESG_SDSPACE_FLAG; /* Simple Dataspace Message.  */
+    h5o_flags[9]  = (int_f)H5O_SHMESG_DTYPE_FLAG;   /* Datatype Message.  */
+    h5o_flags[10] = (int_f)H5O_SHMESG_FILL_FLAG;    /* Fill Value Message. */
+    h5o_flags[11] = (int_f)H5O_SHMESG_PLINE_FLAG;   /* Filter pipeline message.  */
+    h5o_flags[12] = (int_f)H5O_SHMESG_ATTR_FLAG;    /* Attribute Message.  */
+    h5o_flags[13] = (int_f)H5O_SHMESG_ALL_FLAG;
+
+    /* Object header status flag definitions */
+    h5o_flags[14] = (int_f)
+        H5O_HDR_CHUNK0_SIZE; /* 2-bit field indicating # of bytes to store the size of chunk 0's data */
+    h5o_flags[15] = (int_f)H5O_HDR_ATTR_CRT_ORDER_TRACKED; /* Attribute creation order is tracked */
+    h5o_flags[16] = (int_f)H5O_HDR_ATTR_CRT_ORDER_INDEXED; /* Attribute creation order has index */
+    h5o_flags[17] =
+        (int_f)H5O_HDR_ATTR_STORE_PHASE_CHANGE; /* Non-default attribute storage phase change values stored */
+    h5o_flags[18] =
+        (int_f)H5O_HDR_STORE_TIMES; /* Store access, modification, change & birth times for object */
+    h5o_flags[19] = (int_f)H5O_HDR_ALL_FLAGS;
+
+    /* Maximum shared message values.  Number of indexes is 8 to allow room to add
+     *  new types of messages.
+     */
+    h5o_flags[20] = (int_f)H5O_SHMESG_MAX_NINDEXES;
+    h5o_flags[21] = (int_f)H5O_SHMESG_MAX_LIST_SIZE;
+
+    /* Types of objects in file */
+    h5o_flags[22] = (int_f)H5O_TYPE_UNKNOWN;        /* Unknown object type */
+    h5o_flags[23] = (int_f)H5O_TYPE_GROUP;          /* Object is a group */
+    h5o_flags[24] = (int_f)H5O_TYPE_DATASET;        /* Object is a dataset */
+    h5o_flags[25] = (int_f)H5O_TYPE_NAMED_DATATYPE; /* Object is a named data type */
+    h5o_flags[26] = (int_f)H5O_TYPE_NTYPES;         /* Number of different object types */
+
+    /* Flags for H5Oget_info.
+     * These flags determine which fields will be filled in in the H5O_info_t
+     * struct.
+     */
+    h5o_flags[27] = (int_f)H5O_INFO_ALL;       /* (H5O_INFO_BASIC|H5O_INFO_TIME|H5O_INFO_NUM_ATTRS) */
+    h5o_flags[28] = (int_f)H5O_INFO_BASIC;     /* Fill in the fileno, addr, type, and rc fields */
+    h5o_flags[29] = (int_f)H5O_INFO_TIME;      /* Fill in the atime, mtime, ctime, and btime fields */
+    h5o_flags[30] = (int_f)H5O_INFO_NUM_ATTRS; /* Fill in the num_attrs field */
+
+    /* Flags for H5Oget_native_info.
+     * These flags determine which fields will be filled in in the H5O_native_info_t
+     * struct.
+     */
+    h5o_flags[31] = (int_f)H5O_NATIVE_INFO_ALL;       /* (H5O_NATIVE_INFO_HDR|H5O_NATIVE_INFO_META_SIZE) */
+    h5o_flags[32] = (int_f)H5O_NATIVE_INFO_HDR;       /* Fill in the hdr field */
+    h5o_flags[33] = (int_f)H5O_NATIVE_INFO_META_SIZE; /* Fill in the meta_size field */
+                                                      /*
+                                                       *  H5P flags
+                                                       */
+    h5p_flags[0]  = (hid_t_f)H5P_FILE_CREATE;
+    h5p_flags[1]  = (hid_t_f)H5P_FILE_ACCESS;
+    h5p_flags[2]  = (hid_t_f)H5P_DATASET_CREATE;
+    h5p_flags[3]  = (hid_t_f)H5P_DATASET_XFER;
+    h5p_flags[4]  = (hid_t_f)H5P_FILE_MOUNT;
+    h5p_flags[5]  = (hid_t_f)H5P_DEFAULT;
+    h5p_flags[6]  = (hid_t_f)H5P_ROOT;
+    h5p_flags[7]  = (hid_t_f)H5P_OBJECT_CREATE;
+    h5p_flags[8]  = (hid_t_f)H5P_DATASET_ACCESS;
+    h5p_flags[9]  = (hid_t_f)H5P_GROUP_CREATE;
+    h5p_flags[10] = (hid_t_f)H5P_GROUP_ACCESS;
+    h5p_flags[11] = (hid_t_f)H5P_DATATYPE_CREATE;
+    h5p_flags[12] = (hid_t_f)H5P_DATATYPE_ACCESS;
+    h5p_flags[13] = (hid_t_f)H5P_STRING_CREATE;
+    h5p_flags[14] = (hid_t_f)H5P_ATTRIBUTE_CREATE;
+    h5p_flags[15] = (hid_t_f)H5P_OBJECT_COPY;
+    h5p_flags[16] = (hid_t_f)H5P_LINK_CREATE;
+    h5p_flags[17] = (hid_t_f)H5P_LINK_ACCESS;
 
-/*
- *  H5R flags
- */
+    /*
+     *  H5P integer flags
+     */
+    h5p_flags_int[0] = (int_f)H5P_CRT_ORDER_INDEXED;
+    h5p_flags_int[1] = (int_f)H5P_CRT_ORDER_TRACKED;
 
-      h5r_flags[0] = (int_f)H5R_OBJECT;
-      h5r_flags[1] = (int_f)H5R_DATASET_REGION;
+    /*
+     *  H5R flags
+     */
+    h5r_flags[0] = (int_f)H5R_OBJECT;
+    h5r_flags[1] = (int_f)H5R_DATASET_REGION;
 
-/*
- *  H5S flags
- */
-      h5s_flags[0] = (int_f)H5S_SCALAR;
-      h5s_flags[1] = (int_f)H5S_SIMPLE;
-      h5s_flags[2] = (int_f)H5S_NULL;
-      h5s_flags[3] = (int_f)H5S_SELECT_SET;
-      h5s_flags[4] = (int_f)H5S_SELECT_OR;
-      h5s_flags[5] = (int_f)H5S_ALL;
-
-      h5s_flags[6] = (int_f)H5S_SELECT_NOOP;
-      h5s_flags[7] = (int_f)H5S_SELECT_AND;
-      h5s_flags[8] = (int_f)H5S_SELECT_XOR;
-      h5s_flags[9] = (int_f)H5S_SELECT_NOTB;
-      h5s_flags[10] = (int_f)H5S_SELECT_NOTA;
-      h5s_flags[11] = (int_f)H5S_SELECT_APPEND;
-      h5s_flags[12] = (int_f)H5S_SELECT_PREPEND;
-      h5s_flags[13] = (int_f)H5S_SELECT_INVALID;
-
-      h5s_flags[14] = (int_f)H5S_SEL_ERROR;
-      h5s_flags[15] = (int_f)H5S_SEL_NONE;
-      h5s_flags[16] = (int_f)H5S_SEL_POINTS;
-      h5s_flags[17] = (int_f)H5S_SEL_HYPERSLABS;
-      h5s_flags[18] = (int_f)H5S_SEL_ALL;
-
-      h5s_hsize_flags[0] = (hsize_t_f)H5S_UNLIMITED;
-
-/*
- *  H5T flags
- */
-      h5t_flags[0] = (int_f)H5T_NO_CLASS;
-      h5t_flags[1] = (int_f)H5T_INTEGER;
-      h5t_flags[2] = (int_f)H5T_FLOAT;
-      h5t_flags[3] = (int_f)H5T_TIME;
-      h5t_flags[4] = (int_f)H5T_STRING;
-      h5t_flags[5] = (int_f)H5T_BITFIELD;
-      h5t_flags[6] = (int_f)H5T_OPAQUE;
-      h5t_flags[7] = (int_f)H5T_COMPOUND;
-      h5t_flags[8] = (int_f)H5T_REFERENCE;
-      h5t_flags[9] = (int_f)H5T_ENUM;
-      h5t_flags[10] = (int_f)H5T_ORDER_LE;
-      h5t_flags[11] = (int_f)H5T_ORDER_BE;
-      h5t_flags[12] = (int_f)H5T_ORDER_MIXED;
-      h5t_flags[13] = (int_f)H5T_ORDER_VAX;
-      h5t_flags[14] = (int_f)H5T_ORDER_NONE;
-      h5t_flags[15] = (int_f)H5T_PAD_ZERO;
-      h5t_flags[16] = (int_f)H5T_PAD_ONE;
-      h5t_flags[17] = (int_f)H5T_PAD_BACKGROUND;
-      h5t_flags[18] = (int_f)H5T_PAD_ERROR;
-      h5t_flags[19] = (int_f)H5T_SGN_NONE;
-      h5t_flags[20] = (int_f)H5T_SGN_2;
-      h5t_flags[21] = (int_f)H5T_SGN_ERROR;
-      h5t_flags[22] = (int_f)H5T_NORM_IMPLIED;
-      h5t_flags[23] = (int_f)H5T_NORM_MSBSET;
-      h5t_flags[24] = (int_f)H5T_NORM_NONE;
-      h5t_flags[25] = (int_f)H5T_CSET_ASCII;
-      h5t_flags[26] = (int_f)H5T_CSET_UTF8;
-      h5t_flags[27] = (int_f)H5T_STR_NULLTERM;
-      h5t_flags[28] = (int_f)H5T_STR_NULLPAD;
-      h5t_flags[29] = (int_f)H5T_STR_SPACEPAD;
-      h5t_flags[30] = (int_f)H5T_STR_ERROR;
-      h5t_flags[31] = (int_f)H5T_VLEN;
-      h5t_flags[32] = (int_f)H5T_ARRAY;
-      h5t_flags[33] = (int_f)H5T_DIR_ASCEND;
-      h5t_flags[34] = (int_f)H5T_DIR_DESCEND;
-
-/*
- *  H5Z flags
- */
-      h5z_flags[0] = (int_f)H5Z_FILTER_ERROR;
-      h5z_flags[1] = (int_f)H5Z_FILTER_NONE;
-      h5z_flags[2] = (int_f)H5Z_FILTER_DEFLATE;
-      h5z_flags[3] = (int_f)H5Z_FILTER_SHUFFLE;
-      h5z_flags[4] = (int_f)H5Z_FILTER_FLETCHER32;
-      h5z_flags[5] = (int_f)H5Z_ERROR_EDC;
-      h5z_flags[6] = (int_f)H5Z_DISABLE_EDC;
-      h5z_flags[7] = (int_f)H5Z_ENABLE_EDC;
-      h5z_flags[8] = (int_f)H5Z_NO_EDC;
-      h5z_flags[9] = (int_f)H5Z_FILTER_SZIP;
-      h5z_flags[10] = (int_f)H5Z_FLAG_OPTIONAL;
-      h5z_flags[11] = (int_f)H5Z_FILTER_CONFIG_ENCODE_ENABLED;
-      h5z_flags[12] = (int_f)H5Z_FILTER_CONFIG_DECODE_ENABLED;
-      h5z_flags[13] = (int_f)H5Z_FILTER_ALL;
-      h5z_flags[14] = (int_f)H5Z_FILTER_NBIT;
-      h5z_flags[15] = (int_f)H5Z_FILTER_SCALEOFFSET;
-      h5z_flags[16] = (int_f)H5Z_SO_FLOAT_DSCALE;
-      h5z_flags[17] = (int_f)H5Z_SO_FLOAT_ESCALE;
-      h5z_flags[18] = (int_f)H5Z_SO_INT;
-      h5z_flags[19] = (int_f)H5Z_SO_INT_MINBITS_DEFAULT;
-/*
- *  H5A flags
- */
+    /*
+     *  H5S flags
+     */
+    h5s_hid_flags[0] = (hid_t_f)H5S_ALL;
 
+    h5s_hsize_flags[0] = (hsize_t_f)H5S_UNLIMITED;
 
-/*
- *  H5 Generic flags introduced in version 1.8 -MSB-
- */
+    h5s_flags[0] = (int_f)H5S_SCALAR;
+    h5s_flags[1] = (int_f)H5S_SIMPLE;
+    h5s_flags[2] = (int_f)H5S_NULL;
+    h5s_flags[3] = (int_f)H5S_SELECT_SET;
+    h5s_flags[4] = (int_f)H5S_SELECT_OR;
 
-      /* H5_index_t enum struct */
+    h5s_flags[5] = (int_f)H5S_SELECT_NOOP;
+    h5s_flags[6] = (int_f)H5S_SELECT_AND;
+    h5s_flags[7] = (int_f)H5S_SELECT_XOR;
+    h5s_flags[8] = (int_f)H5S_SELECT_NOTB;
+    h5s_flags[9] = (int_f)H5S_SELECT_NOTA;
 
-      h5_generic_flags[0] = (int_f)H5_INDEX_UNKNOWN;   /* Unknown index type			*/
-      h5_generic_flags[1] = (int_f)H5_INDEX_NAME;      /* Index on names 			*/
-      h5_generic_flags[2] = (int_f)H5_INDEX_CRT_ORDER; /* Index on creation order 		*/
-      h5_generic_flags[3] = (int_f)H5_INDEX_N;         /* Index on creation order 		*/
+    h5s_flags[10] = (int_f)H5S_SELECT_APPEND;
+    h5s_flags[11] = (int_f)H5S_SELECT_PREPEND;
+    h5s_flags[12] = (int_f)H5S_SELECT_INVALID;
+    h5s_flags[13] = (int_f)H5S_SEL_ERROR;
+    h5s_flags[14] = (int_f)H5S_SEL_NONE;
 
+    h5s_flags[15] = (int_f)H5S_SEL_POINTS;
+    h5s_flags[16] = (int_f)H5S_SEL_HYPERSLABS;
+    h5s_flags[17] = (int_f)H5S_SEL_ALL;
 
-      /* H5_iter_order_t enum struct */
+    /*
+     *  H5T flags
+     */
+    h5t_flags[0]  = (int_f)H5T_NO_CLASS;
+    h5t_flags[1]  = (int_f)H5T_INTEGER;
+    h5t_flags[2]  = (int_f)H5T_FLOAT;
+    h5t_flags[3]  = (int_f)H5T_TIME;
+    h5t_flags[4]  = (int_f)H5T_STRING;
+    h5t_flags[5]  = (int_f)H5T_BITFIELD;
+    h5t_flags[6]  = (int_f)H5T_OPAQUE;
+    h5t_flags[7]  = (int_f)H5T_COMPOUND;
+    h5t_flags[8]  = (int_f)H5T_REFERENCE;
+    h5t_flags[9]  = (int_f)H5T_ENUM;
+    h5t_flags[10] = (int_f)H5T_ORDER_LE;
+    h5t_flags[11] = (int_f)H5T_ORDER_BE;
+    h5t_flags[12] = (int_f)H5T_ORDER_MIXED;
+    h5t_flags[13] = (int_f)H5T_ORDER_VAX;
+    h5t_flags[14] = (int_f)H5T_ORDER_NONE;
+    h5t_flags[15] = (int_f)H5T_PAD_ZERO;
+    h5t_flags[16] = (int_f)H5T_PAD_ONE;
+    h5t_flags[17] = (int_f)H5T_PAD_BACKGROUND;
+    h5t_flags[18] = (int_f)H5T_PAD_ERROR;
+    h5t_flags[19] = (int_f)H5T_SGN_NONE;
+    h5t_flags[20] = (int_f)H5T_SGN_2;
+    h5t_flags[21] = (int_f)H5T_SGN_ERROR;
+    h5t_flags[22] = (int_f)H5T_NORM_IMPLIED;
+    h5t_flags[23] = (int_f)H5T_NORM_MSBSET;
+    h5t_flags[24] = (int_f)H5T_NORM_NONE;
+    h5t_flags[25] = (int_f)H5T_CSET_ASCII;
+    h5t_flags[26] = (int_f)H5T_CSET_UTF8;
+    h5t_flags[27] = (int_f)H5T_STR_NULLTERM;
+    h5t_flags[28] = (int_f)H5T_STR_NULLPAD;
+    h5t_flags[29] = (int_f)H5T_STR_SPACEPAD;
+    h5t_flags[30] = (int_f)H5T_STR_ERROR;
+    h5t_flags[31] = (int_f)H5T_VLEN;
+    h5t_flags[32] = (int_f)H5T_ARRAY;
+    h5t_flags[33] = (int_f)H5T_DIR_ASCEND;
+    h5t_flags[34] = (int_f)H5T_DIR_DESCEND;
 
-      h5_generic_flags[4] = (int_f)H5_ITER_UNKNOWN;       /* Unknown order */
-      h5_generic_flags[5] = (int_f)H5_ITER_INC;           /* Increasing order */
-      h5_generic_flags[6] = (int_f)H5_ITER_DEC;           /* Decreasing order */
-      h5_generic_flags[7] = (int_f)H5_ITER_NATIVE;        /* No particular order, whatever is fastest */
-      h5_generic_flags[8] = (int_f)H5_ITER_N;		   /* Number of iteration orders */
+    /*
+     *  H5Z flags
+     */
+    h5z_flags[0]  = (int_f)H5Z_FILTER_ERROR;
+    h5z_flags[1]  = (int_f)H5Z_FILTER_NONE;
+    h5z_flags[2]  = (int_f)H5Z_FILTER_DEFLATE;
+    h5z_flags[3]  = (int_f)H5Z_FILTER_SHUFFLE;
+    h5z_flags[4]  = (int_f)H5Z_FILTER_FLETCHER32;
+    h5z_flags[5]  = (int_f)H5Z_ERROR_EDC;
+    h5z_flags[6]  = (int_f)H5Z_DISABLE_EDC;
+    h5z_flags[7]  = (int_f)H5Z_ENABLE_EDC;
+    h5z_flags[8]  = (int_f)H5Z_NO_EDC;
+    h5z_flags[9]  = (int_f)H5Z_FILTER_SZIP;
+    h5z_flags[10] = (int_f)H5Z_FLAG_OPTIONAL;
+    h5z_flags[11] = (int_f)H5Z_FILTER_CONFIG_ENCODE_ENABLED;
+    h5z_flags[12] = (int_f)H5Z_FILTER_CONFIG_DECODE_ENABLED;
+    h5z_flags[13] = (int_f)H5Z_FILTER_ALL;
+    h5z_flags[14] = (int_f)H5Z_FILTER_NBIT;
+    h5z_flags[15] = (int_f)H5Z_FILTER_SCALEOFFSET;
+    h5z_flags[16] = (int_f)H5Z_SO_FLOAT_DSCALE;
+    h5z_flags[17] = (int_f)H5Z_SO_FLOAT_ESCALE;
+    h5z_flags[18] = (int_f)H5Z_SO_INT;
+    h5z_flags[19] = (int_f)H5Z_SO_INT_MINBITS_DEFAULT;
 
-    ret_value = 0;
-    return ret_value;
+    /*
+     *  H5 Generic flags introduced in version 1.8
+     */
+
+    /* H5_index_t enum struct */
+
+    h5_generic_flags[0] = (int_f)H5_INDEX_UNKNOWN;   /* Unknown index type			*/
+    h5_generic_flags[1] = (int_f)H5_INDEX_NAME;      /* Index on names 			*/
+    h5_generic_flags[2] = (int_f)H5_INDEX_CRT_ORDER; /* Index on creation order 		*/
+    h5_generic_flags[3] = (int_f)H5_INDEX_N;         /* Index on creation order 		*/
+
+    /* H5_iter_order_t enum struct */
+
+    h5_generic_flags[4] = (int_f)H5_ITER_UNKNOWN; /* Unknown order */
+    h5_generic_flags[5] = (int_f)H5_ITER_INC;     /* Increasing order */
+    h5_generic_flags[6] = (int_f)H5_ITER_DEC;     /* Decreasing order */
+    h5_generic_flags[7] = (int_f)H5_ITER_NATIVE;  /* No particular order, whatever is fastest */
+    h5_generic_flags[8] = (int_f)H5_ITER_N;       /* Number of iteration orders */
+
+    h5_haddr_generic_flags[0] = (haddr_t_f)HADDR_UNDEF; /* undefined address */
+
+    return 0;
 }
 
 int_f
-nh5init1_flags_c(int_f *h5lib_flags)
+h5init1_flags_c(int_f *h5lib_flags)
 /******/
 {
-    int ret_value = -1;
-    unsigned prm_1 = H5_SZIP_EC_OPTION_MASK;
-    unsigned prm_2 = H5_SZIP_NN_OPTION_MASK;
-    h5lib_flags[0] = (int_f)prm_1;
-    h5lib_flags[1] = (int_f)prm_2;
-    ret_value = 0;
+    int      ret_value = -1;
+    unsigned prm_1     = H5_SZIP_EC_OPTION_MASK;
+    unsigned prm_2     = H5_SZIP_NN_OPTION_MASK;
+    h5lib_flags[0]     = (int_f)prm_1;
+    h5lib_flags[1]     = (int_f)prm_2;
+    ret_value          = 0;
     return ret_value;
 }
 
 /****if* H5_f/h5open_c
  * NAME
- *              h5open_c
+ *  h5open_c
  * PURPOSE
- *           Calls H5open call to initialize C HDF5 library
+ *  Calls H5open call to initialize C HDF5 library
  * RETURNS
- *           0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
- *        Elena Pourmal
- *        Friday, November 17, 2000
+ *  Elena Pourmal
+ *  Friday, November 17, 2000
  *
  * SOURCE
  */
 int_f
-nh5open_c(void)
+h5open_c(void)
 /******/
 {
     int ret_value = -1;
 
-    if (H5open() < 0) return ret_value;
+    if (H5open() < 0)
+        return ret_value;
     ret_value = 0;
     return ret_value;
 }
 /****if* H5_f/h5close_c
  * NAME
- *              h5close_c
+ *  h5close_c
  * PURPOSE
- *           Calls H5close call to close C HDF5 library
+ *  Calls H5close call to close C HDF5 library
  * RETURNS
- *           0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
- *        Elena Pourmal
+ *  Elena Pourmal
  * SOURCE
  */
 int_f
-nh5close_c(void)
+h5close_c(void)
 /******/
 {
     int ret_value = -1;
 
-    if (H5close() < 0) return ret_value;
+    if (H5close() < 0)
+        return ret_value;
     ret_value = 0;
     return ret_value;
 }
 
 /****if* H5_f/h5get_libversion_c
  * NAME
- *              h5get_libversion_c
+ *  h5get_libversion_c
  * PURPOSE
- *           Calls H5get_libversion function
+ *  Calls H5get_libversion function
  *		      to retrieve library version info.
  * INPUTS
  *
- *                    None
+ *  None
  * OUTPUTS
  *
- *                    majnum - the major version of the library
- *                    minnum - the minor version of the library
- *                    relnum - the release version of the library
+ *  majnum - the major version of the library
+ *  minnum - the minor version of the library
+ *  relnum - the release version of the library
  * RETURNS
- *           0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
- *        Elena Pourmal
- *                    Tuesday, September 24, 2002
+ *  Elena Pourmal
+ *  Tuesday, September 24, 2002
  * SOURCE
  *
  */
 int_f
-nh5get_libversion_c(int_f *majnum, int_f *minnum, int_f *relnum)
+h5get_libversion_c(int_f *majnum, int_f *minnum, int_f *relnum)
 /******/
 {
 
-    int ret_value = -1;
+    int      ret_value = -1;
     unsigned c_majnum, c_minnum, c_relnum;
 
-    if (H5get_libversion(&c_majnum, &c_minnum, &c_relnum) < 0) return ret_value;
+    if (H5get_libversion(&c_majnum, &c_minnum, &c_relnum) < 0)
+        return ret_value;
 
-    *majnum = (int_f)c_majnum;
-    *minnum = (int_f)c_minnum;
-    *relnum = (int_f)c_relnum;
+    *majnum   = (int_f)c_majnum;
+    *minnum   = (int_f)c_minnum;
+    *relnum   = (int_f)c_relnum;
     ret_value = 0;
     return ret_value;
 }
 
 /****if* H5_f/h5check_version_c
  * NAME
- *              h5check_version_c
+ *  h5check_version_c
  * PURPOSE
- *           Calls H5check_version function
+ *  Calls H5check_version function
  *		      to verify library version info.
  * INPUTS
  *
- *                    majnum - the major version of the library
- *                    minnum - the minor version of the library
- *                    relnum - the release version of the library
+ *  majnum - the major version of the library
+ *  minnum - the minor version of the library
+ *  relnum - the release version of the library
  * OUTPUTS
  *
- *                    None
+ *  None
  * RETURNS
- *           0 on success, aborts on failure
+ *  0 on success, aborts on failure
  * AUTHOR
- *        Elena Pourmal
- *                    Tuesday, September 24, 2002
+ *  Elena Pourmal
+ *  Tuesday, September 24, 2002
  * SOURCE
  */
 int_f
-nh5check_version_c(int_f *majnum, int_f *minnum, int_f *relnum)
+h5check_version_c(int_f *majnum, int_f *minnum, int_f *relnum)
 /******/
 {
-    int ret_value = -1;
+    int      ret_value = -1;
     unsigned c_majnum, c_minnum, c_relnum;
 
-    c_majnum = (unsigned) *majnum;
-    c_minnum = (unsigned) *minnum;
-    c_relnum = (unsigned) *relnum;
+    c_majnum = (unsigned)*majnum;
+    c_minnum = (unsigned)*minnum;
+    c_relnum = (unsigned)*relnum;
 
     H5check_version(c_majnum, c_minnum, c_relnum);
 
@@ -844,47 +994,48 @@ nh5check_version_c(int_f *majnum, int_f *minnum, int_f *relnum)
 
 /****if* H5_f/h5garbage_collect_c
  * NAME
- *              h5garbage_collect_c
+ *  h5garbage_collect_c
  * PURPOSE
- *           Calls H5garbage_collect to collect on all free-lists of all types
+ *  Calls H5garbage_collect to collect on all free-lists of all types
  * RETURNS
- *           0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
- *        Elena Pourmal
- *                    Tuesday, September 24, 2002
+ *  Elena Pourmal
+ *  Tuesday, September 24, 2002
  * SOURCE
  */
 int_f
-nh5garbage_collect_c(void)
+h5garbage_collect_c(void)
 /******/
 {
     int ret_value = -1;
 
-    if (H5garbage_collect() < 0) return ret_value;
+    if (H5garbage_collect() < 0)
+        return ret_value;
     ret_value = 0;
     return ret_value;
 }
 
 /****if* H5_f/h5dont_atexit_c
  * NAME
- *              h5dont_atexit_c
+ *  h5dont_atexit_c
  * PURPOSE
- *           Calls H5dont_atexit not to install atexit cleanup routine
+ *  Calls H5dont_atexit not to install atexit cleanup routine
  * RETURNS
- *           0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
- *        Elena Pourmal
- *                    Tuesday, September 24, 2002
+ *  Elena Pourmal
+ *  Tuesday, September 24, 2002
  * SOURCE
  */
 int_f
-nh5dont_atexit_c(void)
+h5dont_atexit_c(void)
 /******/
 {
     int ret_value = -1;
 
-    if (H5dont_atexit() < 0) return ret_value;
+    if (H5dont_atexit() < 0)
+        return ret_value;
     ret_value = 0;
     return ret_value;
 }
-
diff --git a/fortran/src/H5_ff.F90 b/fortran/src/H5_ff.F90
new file mode 100644
index 0000000..31e0d28
--- /dev/null
+++ b/fortran/src/H5_ff.F90
@@ -0,0 +1,905 @@
+!> @defgroup FH5 Fortran Library (H5) Interface
+!!
+!! @see H5, C-API
+!!
+!! @see @ref H5_UG, User Guide
+!!
+
+!> @ingroup FH5
+!!
+!! @brief This module provides fortran specific helper functions for the HDF library.
+!
+! PURPOSE
+!  This module is used to pass C stubs for H5 Fortran APIs. The C stubs are
+!  packed into arrays in H5_f.c and these arrays are then passed to Fortran.
+!  This module then uses EQUIVALENCE to assign elements of the arrays to
+!  Fortran equivalent C stubs.
+!
+! NOTES
+!  The size of the C arrays in H5_f.c has to match the values of the variables
+!  declared as PARAMETER, hence if the size of an array in H5_f.c is changed
+!  then the PARAMETER of that corresponding array in Fortran must also be changed.
+!
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+! NOTES
+!       _____ __  __ _____   ____  _____ _______       _   _ _______
+!      |_   _|  \/  |  __ \ / __ \|  __ \__   __|/\   | \ | |__   __|
+! ****   | | | \  / | |__) | |  | | |__) | | |  /  \  |  \| |  | |    ****
+! ****   | | | |\/| |  ___/| |  | |  _  /  | | / /\ \ | . ` |  | |    ****
+! ****  _| |_| |  | | |    | |__| | | \ \  | |/ ____ \| |\  |  | |    ****
+!      |_____|_|  |_|_|     \____/|_|  \_\ |_/_/    \_\_| \_|  |_|
+!
+!  If you add a new function you must add the function name to the
+!  Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
+!  This is needed for Windows based operating systems.
+!
+
+#include <H5config_f.inc>
+
+MODULE H5LIB
+
+  USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR, C_INTPTR_T
+  USE H5GLOBAL
+  IMPLICIT NONE
+
+  PRIVATE
+  !
+  ! H5F flags declaration
+  !
+  INTEGER, PARAMETER :: H5F_FLAGS_LEN = 25
+  INTEGER, DIMENSION(1:H5F_FLAGS_LEN) :: H5F_flags
+  !
+  ! H5generic flags declaration
+  !
+  INTEGER, PARAMETER :: H5generic_FLAGS_LEN = 9
+  INTEGER, DIMENSION(1:H5generic_FLAGS_LEN) :: H5generic_flags
+
+  INTEGER, PARAMETER :: H5generic_haddr_FLAGS_LEN = 1
+  INTEGER(HADDR_T), DIMENSION(1:H5generic_haddr_FLAGS_LEN) :: H5generic_haddr_flags
+  !
+  ! H5G flags declaration
+  !
+  INTEGER, PARAMETER :: H5G_FLAGS_LEN = 12
+  INTEGER, DIMENSION(1:H5G_FLAGS_LEN) :: H5G_flags
+  !
+  ! H5D flags declaration
+  !
+  INTEGER, PARAMETER :: H5D_FLAGS_LEN = 29
+  INTEGER, DIMENSION(1:H5D_FLAGS_LEN) :: H5D_flags
+  INTEGER, PARAMETER :: H5D_SIZE_FLAGS_LEN = 2
+  INTEGER(SIZE_T), DIMENSION(1:H5D_SIZE_FLAGS_LEN) :: H5D_size_flags
+  !
+  ! H5E flags declaration
+  !
+  INTEGER, PARAMETER :: H5E_FLAGS_LEN = 4
+  INTEGER, DIMENSION(1:H5E_FLAGS_LEN) :: H5E_flags
+  INTEGER, PARAMETER :: H5E_HID_FLAGS_LEN = 1
+  INTEGER(HID_T), DIMENSION(1:H5E_HID_FLAGS_LEN) :: H5E_hid_flags
+  !
+  ! H5FD flags declaration
+  !
+  INTEGER, PARAMETER :: H5FD_FLAGS_LEN = 22
+  INTEGER, DIMENSION(1:H5FD_FLAGS_LEN) :: H5FD_flags
+  !
+  ! H5FD file drivers flags declaration
+  !
+  INTEGER, PARAMETER :: H5FD_HID_FLAGS_LEN = 9
+  INTEGER(HID_T), DIMENSION(1:H5FD_HID_FLAGS_LEN) :: H5FD_hid_flags
+  !
+  ! H5I flags declaration
+  !
+  INTEGER, PARAMETER :: H5I_FLAGS_LEN = 17
+  INTEGER, DIMENSION(1:H5I_FLAGS_LEN) :: H5I_flags
+  !
+  ! H5L flags declaration
+  !
+  INTEGER, PARAMETER :: H5L_FLAGS_LEN = 6
+  INTEGER, DIMENSION(1:H5L_FLAGS_LEN) :: H5L_flags
+  !
+  ! H5O flags declaration
+  !
+  INTEGER, PARAMETER :: H5O_FLAGS_LEN = 33
+  INTEGER, DIMENSION(1:H5O_FLAGS_LEN) :: H5O_flags
+  !
+  ! H5P flags declaration
+  !
+  INTEGER, PARAMETER :: H5P_FLAGS_LEN = 18
+  INTEGER(HID_T), DIMENSION(1:H5P_FLAGS_LEN) :: H5P_flags
+  !
+  ! H5P integers flags declaration
+  !
+  INTEGER, PARAMETER :: H5P_FLAGS_INT_LEN = 2
+  INTEGER, DIMENSION(1:H5P_FLAGS_INT_LEN) :: H5P_flags_int
+  !
+  ! H5R flags declaration
+  !
+  INTEGER, PARAMETER :: H5R_FLAGS_LEN = 2
+  INTEGER, DIMENSION(1:H5R_FLAGS_LEN) :: H5R_flags
+  !
+  ! H5S flags declaration
+  !
+  INTEGER, PARAMETER :: H5S_FLAGS_LEN = 18
+  INTEGER, DIMENSION(1:H5S_FLAGS_LEN) :: H5S_flags
+  INTEGER, PARAMETER :: H5S_HSIZE_FLAGS_LEN = 1
+  INTEGER(HSIZE_T), DIMENSION(1:H5S_HSIZE_FLAGS_LEN) :: H5S_hsize_flags
+  INTEGER, PARAMETER :: H5S_HID_FLAGS_LEN = 1
+  INTEGER(HSIZE_T), DIMENSION(1:H5S_HID_FLAGS_LEN)   :: H5S_hid_flags
+  !
+  ! H5T flags declaration
+  !
+  INTEGER, PARAMETER :: H5T_FLAGS_LEN = 35
+  INTEGER, DIMENSION(1:H5T_FLAGS_LEN) :: H5T_flags
+
+  !
+  ! H5Z flags declaration
+  !
+  INTEGER, PARAMETER :: H5Z_FLAGS_LEN = 20
+  INTEGER, DIMENSION(1:H5Z_FLAGS_LEN) :: H5Z_flags
+  !
+  ! H5 Library flags declaration
+  !
+  INTEGER, PARAMETER :: H5LIB_FLAGS_LEN =  2
+  INTEGER, DIMENSION(1:H5LIB_FLAGS_LEN) :: H5LIB_flags
+
+  PUBLIC :: h5open_f, h5close_f, h5get_libversion_f, h5dont_atexit_f, h5kind_to_type, h5offsetof, h5gmtime
+  PUBLIC :: h5garbage_collect_f, h5check_version_f
+
+CONTAINS
+!>
+!! \ingroup FH5
+!!
+!! \brief Initializes HDF5 Fortran interface.
+!!
+!! \param error \fortran_error
+!!
+  SUBROUTINE h5open_f(error)
+    USE H5F, ONLY : h5fget_obj_count_f, H5OPEN_NUM_OBJ
+    IMPLICIT NONE
+    INTEGER, INTENT(OUT) :: error
+    INTEGER(SIZE_T) :: H5OPEN_NUM_OBJ_LOC = 0
+    INTERFACE
+
+       INTEGER FUNCTION h5init_types_c(p_types, f_types, i_types) &
+            BIND(C,NAME='h5init_types_c')
+         IMPORT :: HID_T
+         IMPORT :: PREDEF_TYPES_LEN, FLOATING_TYPES_LEN, INTEGER_TYPES_LEN
+         IMPLICIT NONE
+         INTEGER(HID_T), DIMENSION(1:PREDEF_TYPES_LEN)   :: p_types
+         INTEGER(HID_T), DIMENSION(1:FLOATING_TYPES_LEN) :: f_types
+         INTEGER(HID_T), DIMENSION(1:INTEGER_TYPES_LEN)  :: i_types
+       END FUNCTION h5init_types_c
+
+       INTEGER FUNCTION h5init_flags_c(i_H5D_flags, &
+            i_H5D_size_flags,&
+            i_H5E_flags, &
+            i_H5E_hid_flags, &
+            i_H5F_flags, &
+            i_H5FD_flags, &
+            i_H5FD_hid_flags, &
+            i_H5G_flags, &
+            i_H5I_flags, &
+            i_H5L_flags, &
+            i_H5O_flags, &
+            i_H5P_flags, &
+            i_H5P_flags_int, &
+            i_H5R_flags, &
+            i_H5S_flags, &
+            i_H5S_hid_flags, &
+            i_H5S_hsize_flags, &
+            i_H5T_flags, &
+            i_H5Z_flags, &
+            i_H5generic_flags, &
+            i_H5generic_haddr_flags) &
+            BIND(C,NAME='h5init_flags_c')
+         IMPORT :: HID_T, SIZE_T, HSIZE_T, HADDR_T
+         IMPORT :: H5D_FLAGS_LEN, H5D_SIZE_FLAGS_LEN, &
+              H5E_FLAGS_LEN, H5E_HID_FLAGS_LEN, &
+              H5F_FLAGS_LEN, H5G_FLAGS_LEN, H5FD_FLAGS_LEN, &
+              H5FD_HID_FLAGS_LEN, H5I_FLAGS_LEN, H5L_FLAGS_LEN, &
+              H5O_FLAGS_LEN, H5P_FLAGS_LEN, H5P_FLAGS_INT_LEN, &
+              H5R_FLAGS_LEN, H5S_FLAGS_LEN, H5S_HID_FLAGS_LEN, H5S_HSIZE_FLAGS_LEN, &
+              H5T_FLAGS_LEN, H5Z_FLAGS_LEN, H5generic_FLAGS_LEN, H5generic_haddr_FLAGS_LEN
+         IMPLICIT NONE
+         INTEGER         , DIMENSION(1:H5D_FLAGS_LEN)             :: i_H5D_flags
+         INTEGER(SIZE_T) , DIMENSION(1:H5D_SIZE_FLAGS_LEN)        :: i_H5D_size_flags
+         INTEGER         , DIMENSION(1:H5E_FLAGS_LEN)             :: i_H5E_flags
+         INTEGER(HID_T)  , DIMENSION(1:H5E_HID_FLAGS_LEN)         :: i_H5E_hid_flags
+         INTEGER         , DIMENSION(1:H5F_FLAGS_LEN)             :: i_H5F_flags
+         INTEGER         , DIMENSION(1:H5G_FLAGS_LEN)             :: i_H5G_flags
+         INTEGER         , DIMENSION(1:H5FD_FLAGS_LEN)            :: i_H5FD_flags
+         INTEGER(HID_T)  , DIMENSION(1:H5FD_HID_FLAGS_LEN)        :: i_H5FD_hid_flags
+         INTEGER         , DIMENSION(1:H5I_FLAGS_LEN)             :: i_H5I_flags
+         INTEGER         , DIMENSION(1:H5L_FLAGS_LEN)             :: i_H5L_flags
+         INTEGER         , DIMENSION(1:H5O_FLAGS_LEN)             :: i_H5O_flags
+         INTEGER(HID_T)  , DIMENSION(1:H5P_FLAGS_LEN)             :: i_H5P_flags
+         INTEGER         , DIMENSION(1:H5P_FLAGS_INT_LEN)         :: i_H5P_flags_int
+         INTEGER         , DIMENSION(1:H5R_FLAGS_LEN)             :: i_H5R_flags
+         INTEGER         , DIMENSION(1:H5S_FLAGS_LEN)             :: i_H5S_flags
+         INTEGER(HID_T)  , DIMENSION(1:H5S_HID_FLAGS_LEN)         :: i_H5S_hid_flags
+         INTEGER(HSIZE_T), DIMENSION(1:H5S_HSIZE_FLAGS_LEN)       :: i_H5S_hsize_flags
+         INTEGER         , DIMENSION(1:H5T_FLAGS_LEN)             :: i_H5T_flags
+         INTEGER         , DIMENSION(1:H5Z_FLAGS_LEN)             :: i_H5Z_flags
+         INTEGER         , DIMENSION(1:H5generic_FLAGS_LEN)       :: i_H5generic_flags
+         INTEGER(HADDR_T), DIMENSION(1:H5generic_haddr_FLAGS_LEN) :: i_H5generic_haddr_flags
+       END FUNCTION h5init_flags_c
+
+       INTEGER FUNCTION h5init1_flags_c( i_H5LIB_flags ) &
+            BIND(C,NAME='h5init1_flags_c')
+         IMPORT :: H5LIB_FLAGS_LEN
+         IMPLICIT NONE
+         INTEGER, DIMENSION(1:H5LIB_FLAGS_LEN) :: i_H5LIB_flags
+       END FUNCTION h5init1_flags_c
+
+    END INTERFACE
+
+    ! Check if H5open_f has already been called. If so, skip doing it again.
+    IF(H5OPEN_NUM_OBJ .NE. 0) RETURN
+
+    error = h5init_types_c(predef_types, floating_types, integer_types)
+
+    H5T_NATIVE_INTEGER_KIND(1:5)  = predef_types(1:5)
+    H5T_NATIVE_INTEGER            = predef_types(6)
+    H5T_NATIVE_REAL               = predef_types(7)
+    H5T_NATIVE_DOUBLE             = predef_types(8)
+    H5T_NATIVE_CHARACTER          = predef_types(9)
+    H5T_STD_REF_OBJ               = predef_types(10)
+    H5T_STD_REF_DSETREG           = predef_types(11)
+    H5T_NATIVE_REAL_C_FLOAT       = predef_types(12)
+    H5T_NATIVE_REAL_C_DOUBLE      = predef_types(13)
+    H5T_NATIVE_REAL_C_LONG_DOUBLE = predef_types(14)
+    H5T_NATIVE_B8                 = predef_types(15)
+    H5T_NATIVE_B16                = predef_types(16)
+    H5T_NATIVE_B32                = predef_types(17)
+    H5T_NATIVE_B64                = predef_types(18)
+    H5T_NATIVE_FLOAT_128          = predef_types(19)
+
+    H5T_IEEE_F32BE = floating_types(1)
+    H5T_IEEE_F32LE = floating_types(2)
+    H5T_IEEE_F64BE = floating_types(3)
+    H5T_IEEE_F64LE = floating_types(4)
+
+    H5T_STD_I8BE   = integer_types(1)
+    H5T_STD_I8LE   = integer_types(2)
+    H5T_STD_I16BE  = integer_types(3)
+    H5T_STD_I16LE  = integer_types(4)
+    H5T_STD_I32BE  = integer_types(5)
+    H5T_STD_I32LE  = integer_types(6)
+    H5T_STD_I64BE  = integer_types(7)
+    H5T_STD_I64LE  = integer_types(8)
+    H5T_STD_U8BE   = integer_types(9)
+    H5T_STD_U8LE   = integer_types(10)
+    H5T_STD_U16BE  = integer_types(11)
+    H5T_STD_U16LE  = integer_types(12)
+    H5T_STD_U32BE  = integer_types(13)
+    H5T_STD_U32LE  = integer_types(14)
+    H5T_STD_U64BE  = integer_types(15)
+    H5T_STD_U64LE  = integer_types(16)
+    H5T_STRING     = integer_types(17)
+    H5T_STD_B8BE   = integer_types(18)
+    H5T_STD_B8LE   = integer_types(19)
+    H5T_STD_B16BE  = integer_types(20)
+    H5T_STD_B16LE  = integer_types(21)
+    H5T_STD_B32BE  = integer_types(22)
+    H5T_STD_B32LE  = integer_types(23)
+    H5T_STD_B64BE  = integer_types(24)
+    H5T_STD_B64LE  = integer_types(25)
+    H5T_FORTRAN_S1 = integer_types(26)
+    H5T_C_S1       = integer_types(27)
+
+    error = error + h5init_flags_c(H5D_flags, &
+         H5D_size_flags, &
+         H5E_flags, &
+         H5E_hid_flags, &
+         H5F_flags, &
+         H5FD_flags, &
+         H5FD_hid_flags, &
+         H5G_flags, &
+         H5I_flags, &
+         H5L_flags, &
+         H5O_flags, &
+         H5P_flags, &
+         H5P_flags_int, &
+         H5R_flags, &
+         H5S_flags, &
+         H5S_hid_flags, &
+         H5S_hsize_flags, &
+         H5T_flags, &
+         H5Z_flags, &
+         H5generic_flags,&
+         H5generic_haddr_flags)
+    !
+    ! H5F flags
+    !
+    H5F_ACC_RDWR_F        = H5F_flags(1)
+    H5F_ACC_RDONLY_F      = H5F_flags(2)
+    H5F_ACC_TRUNC_F       = H5F_flags(3)
+    H5F_ACC_EXCL_F        = H5F_flags(4)
+    H5F_ACC_DEBUG_F       = H5F_flags(5)
+    H5F_SCOPE_LOCAL_F     = H5F_flags(6)
+    H5F_SCOPE_GLOBAL_F    = H5F_flags(7)
+    H5F_CLOSE_DEFAULT_F   = H5F_flags(8)
+    H5F_CLOSE_WEAK_F      = H5F_flags(9)
+    H5F_CLOSE_SEMI_F      = H5F_flags(10)
+    H5F_CLOSE_STRONG_F    = H5F_flags(11)
+    H5F_OBJ_FILE_F        = H5F_flags(12)
+    H5F_OBJ_DATASET_F     = H5F_flags(13)
+    H5F_OBJ_GROUP_F       = H5F_flags(14)
+    H5F_OBJ_DATATYPE_F    = H5F_flags(15)
+    H5F_OBJ_ALL_F         = H5F_flags(16)
+    H5F_LIBVER_EARLIEST_F = H5F_flags(17)
+    H5F_LIBVER_LATEST_F   = H5F_flags(18)
+    H5F_LIBVER_ERROR_F    = H5F_flags(19)
+    H5F_LIBVER_NBOUNDS_F  = H5F_flags(20)
+    H5F_UNLIMITED_F       = H5F_flags(21)
+    H5F_LIBVER_V18_F      = H5F_flags(22)
+    H5F_LIBVER_V110_F     = H5F_flags(23)
+    H5F_LIBVER_V112_F     = H5F_flags(24)
+    H5F_LIBVER_V114_F     = H5F_flags(25)
+    !
+    ! H5generic flags
+    !
+    H5_INDEX_UNKNOWN_F   = H5generic_flags(1)
+    H5_INDEX_NAME_F      = H5generic_flags(2)
+    H5_INDEX_CRT_ORDER_F = H5generic_flags(3)
+    H5_INDEX_N_F         = H5generic_flags(4)
+    H5_ITER_UNKNOWN_F    = H5generic_flags(5)
+    H5_ITER_INC_F        = H5generic_flags(6)
+    H5_ITER_DEC_F        = H5generic_flags(7)
+    H5_ITER_NATIVE_F     = H5generic_flags(8)
+    H5_ITER_N_F          = H5generic_flags(9)
+
+    HADDR_UNDEF_F = H5generic_haddr_flags(1)
+    !
+    ! H5G flags
+    !
+    H5G_UNKNOWN_F                   = H5G_flags(1)
+    H5G_GROUP_F                     = H5G_flags(2)
+    H5G_DATASET_F                   = H5G_flags(3)
+    H5G_TYPE_F                      = H5G_flags(4)
+    H5G_SAME_LOC_F                  = H5G_flags(5)
+    H5G_LINK_ERROR_F                = H5G_flags(6)
+    H5G_LINK_HARD_F                 = H5G_flags(7)
+    H5G_LINK_SOFT_F                 = H5G_flags(8)
+    H5G_STORAGE_TYPE_UNKNOWN_F      = H5G_flags(9)
+    H5G_STORAGE_TYPE_SYMBOL_TABLE_F = H5G_flags(10)
+    H5G_STORAGE_TYPE_COMPACT_F      = H5G_flags(11)
+    H5G_STORAGE_TYPE_DENSE_F        = H5G_flags(12)
+    !
+    ! H5D flags
+    !
+    H5D_COMPACT_F                  = H5D_flags(1)
+    H5D_CONTIGUOUS_F               = H5D_flags(2)
+    H5D_CHUNKED_F                  = H5D_flags(3)
+    H5D_ALLOC_TIME_ERROR_F         = H5D_flags(4)
+    H5D_ALLOC_TIME_DEFAULT_F       = H5D_flags(5)
+    H5D_ALLOC_TIME_EARLY_F         = H5D_flags(6)
+    H5D_ALLOC_TIME_LATE_F          = H5D_flags(7)
+    H5D_ALLOC_TIME_INCR_F          = H5D_flags(8)
+    H5D_SPACE_STS_ERROR_F          = H5D_flags(9)
+    H5D_SPACE_STS_NOT_ALLOCATED_F  = H5D_flags(10)
+    H5D_SPACE_STS_PART_ALLOCATED_F = H5D_flags(11)
+    H5D_SPACE_STS_ALLOCATED_F      = H5D_flags(12)
+    H5D_FILL_TIME_ERROR_F          = H5D_flags(13)
+    H5D_FILL_TIME_ALLOC_F          = H5D_flags(14)
+    H5D_FILL_TIME_NEVER_F          = H5D_flags(15)
+    H5D_FILL_VALUE_ERROR_F         = H5D_flags(16)
+    H5D_FILL_VALUE_UNDEFINED_F     = H5D_flags(17)
+    H5D_FILL_VALUE_DEFAULT_F       = H5D_flags(18)
+    H5D_FILL_VALUE_USER_DEFINED_F  = H5D_flags(19)
+    H5D_CHUNK_CACHE_W0_DFLT_F      = H5D_flags(20)
+    H5D_MPIO_NO_COLLECTIVE_F       = H5D_flags(21)
+    H5D_MPIO_CHUNK_INDEPENDENT_F   = H5D_flags(22)
+    H5D_MPIO_CHUNK_COLLECTIVE_F    = H5D_flags(23)
+    H5D_MPIO_CHUNK_MIXED_F         = H5D_flags(24)
+    H5D_MPIO_CONTIG_COLLECTIVE_F   = H5D_flags(25)
+    H5D_VDS_ERROR_F                = H5D_flags(26)
+    H5D_VDS_FIRST_MISSING_F        = H5D_flags(27)
+    H5D_VDS_LAST_AVAILABLE_F       = H5D_flags(28)
+    H5D_VIRTUAL_F                  = H5D_flags(29)
+
+    H5D_CHUNK_CACHE_NSLOTS_DFLT_F = H5D_size_flags(1)
+    H5D_CHUNK_CACHE_NBYTES_DFLT_F = H5D_size_flags(2)
+    !
+    ! H5E flags
+    !
+    H5E_DEFAULT_F = H5E_hid_flags(1)
+
+    H5E_MAJOR_F         = H5E_flags(1)
+    H5E_MINOR_F         = H5E_flags(2)
+    H5E_WALK_UPWARD_F   = H5E_flags(3)
+    H5E_WALK_DOWNWARD_F = H5E_flags(4)
+    !
+    ! H5FD flags
+    !
+    H5FD_MPIO_INDEPENDENT_F = H5FD_flags(1)
+    H5FD_MPIO_COLLECTIVE_F  = H5FD_flags(2)
+    H5FD_MEM_NOLIST_F       = H5FD_flags(3)
+    H5FD_MEM_DEFAULT_F      = H5FD_flags(4)
+    H5FD_MEM_SUPER_F        = H5FD_flags(5)
+    H5FD_MEM_BTREE_F        = H5FD_flags(6)
+    H5FD_MEM_DRAW_F         = H5FD_flags(7)
+    H5FD_MEM_GHEAP_F        = H5FD_flags(8)
+    H5FD_MEM_LHEAP_F        = H5FD_flags(9)
+    H5FD_MEM_OHDR_F         = H5FD_flags(10)
+    H5FD_MEM_NTYPES_F       = H5FD_flags(11)
+    H5FD_SUBFILING_CURR_FAPL_VERSION_F    = H5FD_flags(12)
+    H5FD_SUBFILING_FAPL_MAGIC_F           = H5FD_flags(13)
+    H5FD_SUBFILING_DEFAULT_STRIPE_COUNT_F = H5FD_flags(14)
+    H5FD_IOC_FAPL_MAGIC_F                 = H5FD_flags(15)
+    H5FD_IOC_CURR_FAPL_VERSION_F          = H5FD_flags(16)
+    H5FD_IOC_DEFAULT_THREAD_POOL_SIZE_F   = H5FD_flags(17)
+    SELECT_IOC_ONE_PER_NODE_F    = H5FD_flags(18)
+    SELECT_IOC_EVERY_NTH_RANK_F  = H5FD_flags(19)
+    SELECT_IOC_WITH_CONFIG_F     = H5FD_flags(20)
+    SELECT_IOC_TOTAL_F           = H5FD_flags(21)
+    IOC_SELECTION_OPTIONS_F      = H5FD_flags(22)
+
+    !
+    ! H5FD file driver flags
+    !
+    H5FD_CORE_F      = H5FD_hid_flags(1)
+    H5FD_FAMILY_F    = H5FD_hid_flags(2)
+    H5FD_LOG_F       = H5FD_hid_flags(3)
+    H5FD_MPIO_F      = H5FD_hid_flags(4)
+    H5FD_MULTI_F     = H5FD_hid_flags(5)
+    H5FD_SEC2_F      = H5FD_hid_flags(6)
+    H5FD_STDIO_F     = H5FD_hid_flags(7)
+    H5FD_SUBFILING_F = H5FD_hid_flags(8)
+    H5FD_SUBFILING_DEFAULT_STRIPE_SIZE_F = H5FD_hid_flags(9)
+    !
+    ! H5I flags declaration
+    !
+    H5I_FILE_F        = H5I_flags(1)
+    H5I_GROUP_F       = H5I_flags(2)
+    H5I_DATATYPE_F    = H5I_flags(3)
+    H5I_DATASPACE_F   = H5I_flags(4)
+    H5I_DATASET_F     = H5I_flags(5)
+    H5I_ATTR_F        = H5I_flags(6)
+    H5I_BADID_F       = H5I_flags(7)
+    H5I_UNINIT_F      = H5I_flags(8)
+    H5I_VFL_F         = H5I_flags(9)
+    H5I_VOL_F         = H5I_flags(10)
+    H5I_GENPROP_CLS_F = H5I_flags(11)
+    H5I_GENPROP_LST_F = H5I_flags(12)
+    H5I_ERROR_CLASS_F = H5I_flags(13)
+    H5I_ERROR_MSG_F   = H5I_flags(14)
+    H5I_ERROR_STACK_F = H5I_flags(15)
+    H5I_NTYPES_F      = H5I_flags(16)
+    H5I_INVALID_HID_F = H5I_flags(17)
+    !
+    ! H5L flags
+    !
+    H5L_TYPE_ERROR_F        = H5L_flags(1)
+    H5L_TYPE_HARD_F         = H5L_flags(2)
+    H5L_TYPE_SOFT_F         = H5L_flags(3)
+    H5L_TYPE_EXTERNAL_F     = H5L_flags(4)
+    H5L_SAME_LOC_F          = H5L_flags(5)
+    H5L_LINK_CLASS_T_VERS_F = H5L_flags(6)
+    !
+    ! H5O flags
+    !
+    H5O_COPY_SHALLOW_HIERARCHY_F   = h5o_flags(1)
+    H5O_COPY_EXPAND_SOFT_LINK_F    = h5o_flags(2)
+    H5O_COPY_EXPAND_EXT_LINK_F     = h5o_flags(3)
+    H5O_COPY_EXPAND_REFERENCE_F    = h5o_flags(4)
+    H5O_COPY_WITHOUT_ATTR_FLAG_F   = h5o_flags(5)
+    H5O_COPY_PRESERVE_NULL_FLAG_F  = h5o_flags(6)
+    H5O_COPY_ALL_F                 = h5o_flags(7)
+    H5O_SHMESG_NONE_FLAG_F         = h5o_flags(8)
+    H5O_SHMESG_SDSPACE_FLAG_F      = h5o_flags(9)
+    H5O_SHMESG_DTYPE_FLAG_F        = h5o_flags(10)
+    H5O_SHMESG_FILL_FLAG_F         = h5o_flags(11)
+    H5O_SHMESG_PLINE_FLAG_F        = h5o_flags(12)
+    H5O_SHMESG_ATTR_FLAG_F         = h5o_flags(13)
+    H5O_SHMESG_ALL_FLAG_F          = h5o_flags(14)
+    H5O_HDR_CHUNK0_SIZE_F          = h5o_flags(15)
+    H5O_HDR_ATTR_CRT_ORDER_TRACK_F = h5o_flags(16)
+    H5O_HDR_ATTR_CRT_ORDER_INDEX_F = h5o_flags(17)
+    H5O_HDR_ATTR_STORE_PHASE_CHA_F = h5o_flags(18)
+    H5O_HDR_STORE_TIMES_F          = h5o_flags(19)
+    H5O_HDR_ALL_FLAGS_F            = h5o_flags(20)
+    H5O_SHMESG_MAX_NINDEXES_F      = h5o_flags(21)
+    H5O_SHMESG_MAX_LIST_SIZE_F     = h5o_flags(22)
+    H5O_TYPE_UNKNOWN_F             = h5o_flags(23)
+    H5O_TYPE_GROUP_F               = h5o_flags(24)
+    H5O_TYPE_DATASET_F             = h5o_flags(25)
+    H5O_TYPE_NAMED_DATATYPE_F      = h5o_flags(26)
+    H5O_TYPE_NTYPES_F              = h5o_flags(27)
+    H5O_INFO_ALL_F                 = h5o_flags(28)
+    H5O_INFO_BASIC_F               = h5o_flags(29)
+    H5O_INFO_TIME_F                = h5o_flags(30)
+    H5O_INFO_NUM_ATTRS_F           = h5o_flags(31)
+    H5O_INFO_HDR_F                 = h5o_flags(32)
+    H5O_INFO_META_SIZE_F           = h5o_flags(33)
+    !
+    ! H5P flags
+    !
+    H5P_FILE_CREATE_F      = H5P_flags(1)
+    H5P_FILE_ACCESS_F      = H5P_flags(2)
+    H5P_DATASET_CREATE_F   = H5P_flags(3)
+    H5P_DATASET_XFER_F     = H5P_flags(4)
+    H5P_FILE_MOUNT_F       = H5P_flags(5)
+    H5P_DEFAULT_F          = H5P_flags(6)
+    H5P_ROOT_F             = H5P_flags(7)
+    H5P_OBJECT_CREATE_F    = H5P_flags(8)
+    H5P_DATASET_ACCESS_F   = H5P_flags(9)
+    H5P_GROUP_CREATE_F     = H5P_flags(10)
+    H5P_GROUP_ACCESS_F     = H5P_flags(11)
+    H5P_DATATYPE_CREATE_F  = H5P_flags(12)
+    H5P_DATATYPE_ACCESS_F  = H5P_flags(13)
+    H5P_STRING_CREATE_F    = H5P_flags(14)
+    H5P_ATTRIBUTE_CREATE_F = H5P_flags(15)
+    H5P_OBJECT_COPY_F      = H5P_flags(16)
+    H5P_LINK_CREATE_F      = H5P_flags(17)
+    H5P_LINK_ACCESS_F      = H5P_flags(18)
+    !
+    ! H5P integers flags
+    !
+    H5P_CRT_ORDER_INDEXED_F = H5P_flags_int(1)
+    H5P_CRT_ORDER_TRACKED_F = H5P_flags_int(2)
+    !
+    ! H5R flags
+    !
+    H5R_OBJECT_F         = H5R_flags(1)
+    H5R_DATASET_REGION_F = H5R_flags(2)
+    !
+    ! H5S flags
+    !
+    H5S_ALL_F = H5S_hid_flags(1)
+
+    H5S_UNLIMITED_F = H5S_hsize_flags(1)
+
+    H5S_SCALAR_F         = H5S_flags(1)
+    H5S_SIMPLE_F         = H5S_flags(2)
+    H5S_NULL_F           = H5S_flags(3)
+    H5S_SELECT_SET_F     = H5S_flags(4)
+    H5S_SELECT_OR_F      = H5S_flags(5)
+    H5S_SELECT_NOOP_F    = H5S_flags(6)
+    H5S_SELECT_AND_F     = H5S_flags(7)
+    H5S_SELECT_XOR_F     = H5S_flags(8)
+    H5S_SELECT_NOTB_F    = H5S_flags(9)
+    H5S_SELECT_NOTA_F    = H5S_flags(10)
+    H5S_SELECT_APPEND_F  = H5S_flags(11)
+    H5S_SELECT_PREPEND_F = H5S_flags(12)
+    H5S_SELECT_INVALID_F = H5S_flags(13)
+    H5S_SEL_ERROR_F      = H5S_flags(14)
+    H5S_SEL_NONE_F       = H5S_flags(15)
+    H5S_SEL_POINTS_F     = H5S_flags(16)
+    H5S_SEL_HYPERSLABS_F = H5S_flags(17)
+    H5S_SEL_ALL_F        = H5S_flags(18)
+    !
+    ! H5T flags declaration
+    !
+    H5T_NO_CLASS_F       = H5T_flags(1)
+    H5T_INTEGER_F        = H5T_flags(2)
+    H5T_FLOAT_F          = H5T_flags(3)
+    H5T_TIME_F           = H5T_flags(4)
+    H5T_STRING_F         = H5T_flags(5)
+    H5T_BITFIELD_F       = H5T_flags(6)
+    H5T_OPAQUE_F         = H5T_flags(7)
+    H5T_COMPOUND_F       = H5T_flags(8)
+    H5T_REFERENCE_F      = H5T_flags(9)
+    H5T_ENUM_F           = H5T_flags(10)
+    H5T_ORDER_LE_F       = H5T_flags(11)
+    H5T_ORDER_BE_F       = H5T_flags(12)
+    H5T_ORDER_MIXED_F    = H5T_flags(13)
+    H5T_ORDER_VAX_F      = H5T_flags(14)
+    H5T_ORDER_NONE_F     = H5T_flags(15)
+    H5T_PAD_ZERO_F       = H5T_flags(16)
+    H5T_PAD_ONE_F        = H5T_flags(17)
+    H5T_PAD_BACKGROUND_F = H5T_flags(18)
+    H5T_PAD_ERROR_F      = H5T_flags(19)
+    H5T_SGN_NONE_F       = H5T_flags(20)
+    H5T_SGN_2_F          = H5T_flags(21)
+    H5T_SGN_ERROR_F      = H5T_flags(22)
+    H5T_NORM_IMPLIED_F   = H5T_flags(23)
+    H5T_NORM_MSBSET_F    = H5T_flags(24)
+    H5T_NORM_NONE_F      = H5T_flags(25)
+    H5T_CSET_ASCII_F     = H5T_flags(26)
+    H5T_CSET_UTF8_F      = H5T_flags(27)
+    H5T_STR_NULLTERM_F   = H5T_flags(28)
+    H5T_STR_NULLPAD_F    = H5T_flags(29)
+    H5T_STR_SPACEPAD_F   = H5T_flags(30)
+    H5T_STR_ERROR_F      = H5T_flags(31)
+    H5T_VLEN_F           = H5T_flags(32)
+    H5T_ARRAY_F          = H5T_flags(33)
+    H5T_DIR_ASCEND_F     = H5T_flags(34)
+    H5T_DIR_DESCEND_F    = H5T_flags(35)
+    !
+    ! H5Z flags
+    !
+    H5Z_FILTER_ERROR_F           = H5Z_flags(1)
+    H5Z_FILTER_NONE_F            = H5Z_flags(2)
+    H5Z_FILTER_DEFLATE_F         = H5Z_flags(3)
+    H5Z_FILTER_SHUFFLE_F         = H5Z_flags(4)
+    H5Z_FILTER_FLETCHER32_F      = H5Z_flags(5)
+    H5Z_ERROR_EDC_F              = H5Z_flags(6)
+    H5Z_DISABLE_EDC_F            = H5Z_flags(7)
+    H5Z_ENABLE_EDC_F             = H5Z_flags(8)
+    H5Z_NO_EDC_F                 = H5Z_flags(9)
+    H5Z_FILTER_SZIP_F            = H5Z_flags(10)
+    H5Z_FLAG_OPTIONAL_F          = H5Z_flags(11)
+    H5Z_FILTER_ENCODE_ENABLED_F  = H5Z_flags(12)
+    H5Z_FILTER_DECODE_ENABLED_F  = H5Z_flags(13)
+    H5Z_FILTER_ALL_F             = H5Z_flags(14)
+    H5Z_FILTER_NBIT_F            = H5Z_flags(15)
+    H5Z_FILTER_SCALEOFFSET_F     = H5Z_flags(16)
+    H5Z_SO_FLOAT_DSCALE_F        = H5Z_flags(17)
+    H5Z_SO_FLOAT_ESCALE_F        = H5Z_flags(18)
+    H5Z_SO_INT_F                 = H5Z_flags(19)
+    H5Z_SO_INT_MINBITS_DEFAULT_F = H5Z_flags(20)
+
+    error = error + h5init1_flags_c(H5LIB_flags)
+    !
+    ! H5 Library flags
+    !
+    H5_SZIP_EC_OM_F = H5LIB_flags(1)
+    H5_SZIP_NN_OM_F = H5LIB_flags(2)
+
+    CALL h5fget_obj_count_f(INT(H5F_OBJ_ALL_F,HID_T), H5F_OBJ_ALL_F, H5OPEN_NUM_OBJ_LOC,  error)
+
+    H5OPEN_NUM_OBJ = H5OPEN_NUM_OBJ_LOC
+
+  END SUBROUTINE h5open_f
+
+!>
+!! \ingroup FH5
+!!
+!! \brief Closes HDF5 Fortran interface.
+!!
+!! \param error \fortran_error
+!!
+  SUBROUTINE h5close_f(error)
+    USE H5F, ONLY : h5fget_obj_count_f, H5OPEN_NUM_OBJ
+    IMPLICIT NONE
+    INTEGER, INTENT(OUT) :: error
+    INTERFACE
+       INTEGER FUNCTION h5close_types_c(p_types, P_TYPES_LEN, &
+            f_types, F_TYPES_LEN, &
+            i_types, I_TYPES_LEN ) &
+            BIND(C,NAME='h5close_types_c')
+         IMPORT :: HID_T
+         INTEGER :: P_TYPES_LEN
+         INTEGER :: F_TYPES_LEN
+         INTEGER :: I_TYPES_LEN
+         INTEGER(HID_T), DIMENSION(1:P_TYPES_LEN) :: p_types
+         INTEGER(HID_T), DIMENSION(1:F_TYPES_LEN) :: f_types
+         INTEGER(HID_T), DIMENSION(1:I_TYPES_LEN) :: i_types
+       END FUNCTION h5close_types_c
+    END INTERFACE
+
+    ! Check if h5close_f has already been called. Skip doing it again.
+    IF(H5OPEN_NUM_OBJ .EQ. 0) RETURN
+
+    error = h5close_types_c(predef_types, PREDEF_TYPES_LEN, &
+         floating_types, FLOATING_TYPES_LEN, &
+         integer_types, INTEGER_TYPES_LEN )
+
+    ! Reset the number of open objects from h5open_f to zero
+    CALL h5fget_obj_count_f(INT(H5F_OBJ_ALL_F,HID_T), H5F_OBJ_ALL_F, H5OPEN_NUM_OBJ,  error)
+
+  END SUBROUTINE h5close_f
+
+!>
+!! \ingroup FH5
+!!
+!! \brief Returns the HDF5 LIbrary release number
+!!
+!! \param majnum  Major version of the library.
+!! \param minnum  Minor version of the library.
+!! \param relnum  Release version of the library.
+!! \param error   \fortran_error
+!!
+  SUBROUTINE h5get_libversion_f(majnum, minnum, relnum, error)
+    IMPLICIT NONE
+    INTEGER, INTENT(OUT) :: majnum, minnum, relnum, error
+    INTERFACE
+       INTEGER FUNCTION h5get_libversion_c(majnum, minnum, relnum) &
+            BIND(C,NAME='h5get_libversion_c')
+         IMPLICIT NONE
+         INTEGER, INTENT(OUT) :: majnum, minnum, relnum
+       END FUNCTION h5get_libversion_c
+    END INTERFACE
+
+    error = h5get_libversion_c(majnum, minnum, relnum)
+
+  END SUBROUTINE h5get_libversion_f
+
+!>
+!! \ingroup FH5
+!!
+!! \brief Verifies that library versions are consistent.
+!!
+!! \param majnum Major version of the library.
+!! \param minnum Minor version of the library.
+!! \param relnum Release version of the library.
+!! \param error  \fortran_error
+!!
+  SUBROUTINE h5check_version_f(majnum, minnum, relnum, error)
+    IMPLICIT NONE
+    INTEGER, INTENT(IN)  :: majnum, minnum, relnum
+    INTEGER, INTENT(OUT) :: error
+    INTERFACE
+       INTEGER FUNCTION h5check_version_c(majnum, minnum, relnum) &
+            BIND(C,NAME='h5check_version_c')
+         IMPLICIT NONE
+         INTEGER, INTENT(IN) :: majnum, minnum, relnum
+       END FUNCTION h5check_version_c
+    END INTERFACE
+
+    error = h5check_version_c(majnum, minnum, relnum)
+
+  END SUBROUTINE h5check_version_f
+!>
+!! \ingroup FH5
+!!
+!! \brief Garbage collects on all free-lists of all types.
+!!
+!! \param error \fortran_error
+!!
+  SUBROUTINE h5garbage_collect_f(error)
+    IMPLICIT NONE
+    INTEGER, INTENT(OUT) :: error
+    INTERFACE
+       INTEGER FUNCTION h5garbage_collect_c() BIND(C,NAME='h5garbage_collect_c')
+         IMPLICIT NONE
+       END FUNCTION h5garbage_collect_c
+    END INTERFACE
+
+    error = h5garbage_collect_c()
+
+  END SUBROUTINE h5garbage_collect_f
+!>
+!! \ingroup FH5
+!!
+!! \brief Instructs library not to install atexit cleanup routine.
+!!
+!! \param error \fortran_error
+!!
+  SUBROUTINE h5dont_atexit_f(error)
+    IMPLICIT NONE
+    INTEGER, INTENT(OUT) :: error
+    INTERFACE
+       INTEGER FUNCTION h5dont_atexit_c() BIND(C,NAME='h5dont_atexit_c')
+         IMPLICIT NONE
+       END FUNCTION h5dont_atexit_c
+    END INTERFACE
+
+    error = h5dont_atexit_c()
+
+  END SUBROUTINE h5dont_atexit_f
+
+!>
+!! \ingroup FH5
+!!
+!! \brief Converts the KIND to the correct HDF type
+!!
+!! \param ikind Fortran KIND parameter
+!! \param flag Whether KIND is of type INTEGER or REAL:
+!!             \li H5_INTEGER_KIND - integer
+!!             \li H5_REAL_KIND    - real
+!! \result h5_type Returns the type.
+!!
+  INTEGER(HID_T) FUNCTION h5kind_to_type(ikind, flag) RESULT(h5_type)
+    USE ISO_C_BINDING
+    IMPLICIT NONE
+    INTEGER, INTENT(IN) :: ikind
+    INTEGER, INTENT(IN) :: flag
+    INTEGER :: i
+
+!#if H5_HAVE_Fortran_INTEGER_SIZEOF_16!=0
+!    ! (1) The array index assumes INTEGER*16 the last integer in the series, and
+!    ! (2) it should map to INTEGER*16 on most modern processors
+!    H5T_NATIVE_INTEGER_KIND(H5_FORTRAN_NUM_INTEGER_KINDS)=SELECTED_INT_KIND(36)
+!#endif
+
+    h5_type = -1
+    IF(flag.EQ.H5_INTEGER_KIND)THEN
+       do_kind: DO i = 1, H5_FORTRAN_NUM_INTEGER_KINDS
+          IF(ikind.EQ.Fortran_INTEGER_AVAIL_KINDS(i))THEN
+             h5_type = H5T_NATIVE_INTEGER_KIND(i)
+             EXIT do_kind
+          ENDIF
+       END DO do_kind
+    ELSE IF(flag.EQ.H5_REAL_KIND)THEN
+       IF(ikind.EQ.KIND(1.0_C_FLOAT))THEN
+          h5_type = H5T_NATIVE_REAL_C_FLOAT
+       ELSE IF(ikind.EQ.KIND(1.0_C_DOUBLE))THEN
+          h5_type = H5T_NATIVE_REAL_C_DOUBLE
+#if H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE!=0
+       ELSE IF(ikind.EQ.KIND(1.0_C_LONG_DOUBLE))THEN
+          h5_type = H5T_NATIVE_REAL_C_LONG_DOUBLE
+#endif
+#if H5_PAC_FC_MAX_REAL_PRECISION > 28
+#if H5_HAVE_FLOAT128 == 1
+       ELSE
+          h5_type = H5T_NATIVE_FLOAT_128
+#endif
+#endif
+       ENDIF
+    ENDIF
+
+  END FUNCTION h5kind_to_type
+
+!>
+!! \ingroup FH5
+!!
+!! \brief Computes the offset in memory
+!!
+!! \param start  Starting pointer address
+!! \param end    Ending pointer address
+!!
+!! \result offset Offset of a member within the derived type.
+!!
+  FUNCTION h5offsetof(start,end) RESULT(offset)
+    IMPLICIT NONE
+    INTEGER(SIZE_T) :: offset
+    TYPE(C_PTR), VALUE, INTENT(IN) :: start, end
+    INTEGER(C_INTPTR_T) :: int_address_start, int_address_end
+    int_address_start = TRANSFER(start, int_address_start)
+    int_address_end   = TRANSFER(end  , int_address_end  )
+
+    offset = int_address_end - int_address_start
+
+  END FUNCTION h5offsetof
+
+!>
+!! \ingroup FH5
+!!
+!! \brief Convert time_t structure (C) to Fortran DATE AND TIME storage format.
+!!
+!! \param stdtime_t Object of type time_t that contains a time value
+!! \result datetime  A date/time array using Fortran conventions:
+!!                  \li datetime(1) = year
+!!                  \li datetime(2) = month
+!!                  \li datetime(3) = day
+!!                  \li datetime(4) = 0 ! time is expressed as UTC (or GMT timezone)
+!!                  \li datetime(5) = hour
+!!                  \li datetime(6) = minute
+!!                  \li datetime(7) = second
+!!                  \li datetime(8) = millisecond -- not available, assigned - HUGE(0)
+!!
+  FUNCTION h5gmtime(stdtime_t) RESULT(datetime)
+    IMPLICIT NONE
+    INTEGER(KIND=TIME_T), INTENT(IN) :: stdtime_t
+    INTEGER, DIMENSION(1:8) :: datetime
+    TYPE(C_PTR) :: cptr
+    INTEGER(C_INT), DIMENSION(:), POINTER :: c_time
+
+    INTERFACE
+       FUNCTION gmtime(stdtime_t) BIND(C, NAME='gmtime')
+         IMPORT :: TIME_T, C_PTR
+         IMPLICIT NONE
+         INTEGER(KIND=TIME_T) :: stdtime_t
+         TYPE(C_PTR) :: gmtime
+       END FUNCTION gmtime
+    END INTERFACE
+
+    cptr = gmtime(stdtime_t)
+    CALL C_F_POINTER(cptr, c_time, [9])
+
+    datetime(1) = INT(c_time(6)+1900) ! year starts at 1900
+    datetime(2) = INT(c_time(5)+1)    ! month starts at 0 in C
+    datetime(3) = INT(c_time(4))      ! day
+    datetime(4) = 0                   ! time is expressed as UTC (or GMT timezone)
+    datetime(5) = INT(c_time(3))      ! hour
+    datetime(6) = INT(c_time(2))      ! minute
+    datetime(7) = INT(c_time(1))      ! second
+    datetime(8) = -32767              ! millisecond is not available, assign it -HUGE(0)
+
+  END FUNCTION h5gmtime
+
+END MODULE H5LIB
diff --git a/fortran/src/H5_ff.f90 b/fortran/src/H5_ff.f90
deleted file mode 100644
index 49e64a3..0000000
--- a/fortran/src/H5_ff.f90
+++ /dev/null
@@ -1,409 +0,0 @@
-!****h* ROBODoc/H5LIB
-!
-! NAME
-!  MODULE H5LIB
-!
-! PURPOSE
-!  This module provides fortran specific helper functions for the HDF library
-!
-! USES
-!  H5LIB_PROVISIONAL - This module provides helper functions for Fortran 2003
-!                      only features. If Fortran 2003 functions are enabled then
-!                      H5_ff_F03.f90 is compiled, else H5_ff_F90.f90,
-!                      which is just a place holder blank module, is compiled.
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! NOTES
-!                         *** IMPORTANT ***
-!  If you add a new function you must add the function name to the
-!  Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
-!  This is needed for Windows based operating systems.
-!
-!*****
-
-MODULE H5LIB
-
-  USE H5LIB_PROVISIONAL  ! helper functions for Fortran 2003 features:
-                         !       pre-Fortran 2003 - empty module
-                         !       Forttran 2003    - contains functions
-  USE H5GLOBAL
-
-CONTAINS
-!****s* H5LIB/h5open_f
-!
-! NAME
-!  h5open_f
-!
-! PURPOSE
-!  Initializes HDF5 Fortran interface.
-!
-! Outputs:
-!  error - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  February 28, 2001
-!
-! Removed call to h5open_c since this may cause a problem for an
-! application that uses HDF5 library outside HDF5 Fortran APIs.
-!          October 13, 2011
-! Fortran90 Interface:
-  SUBROUTINE h5open_f(error)
-    USE H5GLOBAL
-    IMPLICIT NONE
-    INTEGER, INTENT(OUT) :: error
-!*****
-    INTEGER ::  error_1, error_2, error_3
-
-    INTERFACE
-       INTEGER FUNCTION h5init_types_c(p_types, f_types, i_types)
-         USE H5GLOBAL
-         INTEGER(HID_T), DIMENSION(PREDEF_TYPES_LEN) :: p_types
-         INTEGER(HID_T), DIMENSION(FLOATING_TYPES_LEN) :: f_types
-         INTEGER(HID_T), DIMENSION(INTEGER_TYPES_LEN) :: i_types
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5INIT_TYPES_C'::h5init_types_c
-         !DEC$ENDIF
-       END FUNCTION h5init_types_c
-    END INTERFACE
-    INTERFACE
-       INTEGER FUNCTION h5init_flags_c(i_H5D_flags, &
-            i_H5D_size_flags,&
-            i_H5E_flags, &
-            i_H5E_hid_flags, &
-            i_H5F_flags, &
-            i_H5FD_flags, &
-            i_H5FD_hid_flags, &
-            i_H5G_flags, &
-            i_H5I_flags, &
-            i_H5L_flags, &
-            i_H5O_flags, &
-            i_H5P_flags, &
-            i_H5P_flags_int, &
-            i_H5R_flags, &
-            i_H5S_flags, &
-            i_H5S_hsize_flags, &
-            i_H5T_flags, &
-            i_H5Z_flags, &
-            i_H5generic_flags)
-         USE H5GLOBAL
-         INTEGER i_H5D_flags(H5D_FLAGS_LEN)
-         INTEGER(SIZE_T) i_H5D_size_flags(H5D_SIZE_FLAGS_LEN)
-         INTEGER i_H5E_flags(H5E_FLAGS_LEN)
-         INTEGER(HID_T) i_H5E_hid_flags(H5E_HID_FLAGS_LEN)
-         INTEGER i_H5F_flags(H5F_FLAGS_LEN)
-         INTEGER i_H5G_flags(H5G_FLAGS_LEN)
-         INTEGER i_H5FD_flags(H5FD_FLAGS_LEN)
-         INTEGER(HID_T) i_H5FD_hid_flags(H5FD_HID_FLAGS_LEN)
-         INTEGER i_H5I_flags(H5I_FLAGS_LEN)
-         INTEGER i_H5L_flags(H5L_FLAGS_LEN)
-         INTEGER i_H5O_flags(H5O_FLAGS_LEN)
-         INTEGER(HID_T) i_H5P_flags(H5P_FLAGS_LEN)
-         INTEGER i_H5P_flags_int(H5P_FLAGS_INT_LEN)
-         INTEGER i_H5R_flags(H5R_FLAGS_LEN)
-         INTEGER i_H5S_flags(H5S_FLAGS_LEN)
-         INTEGER(HSIZE_T) i_H5S_hsize_flags(H5S_HSIZE_FLAGS_LEN)
-         INTEGER i_H5T_flags(H5T_FLAGS_LEN)
-         INTEGER i_H5Z_flags(H5Z_FLAGS_LEN)
-         INTEGER i_H5generic_flags(H5generic_FLAGS_LEN)
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5INIT_FLAGS_C'::h5init_flags_c
-         !DEC$ENDIF
-       END FUNCTION h5init_flags_c
-    END INTERFACE
-    INTERFACE
-       INTEGER FUNCTION h5init1_flags_c( i_H5LIB_flags )
-         USE H5GLOBAL
-         INTEGER i_H5LIB_flags(H5LIB_FLAGS_LEN)
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5INIT1_FLAGS_C'::h5init1_flags_c
-         !DEC$ENDIF
-       END FUNCTION h5init1_flags_c
-    END INTERFACE
-    error_1 = h5init_types_c(predef_types, floating_types, integer_types)
-    error_2 = h5init_flags_c(H5D_flags, &
-         H5D_size_flags, &
-         H5E_flags, &
-         H5E_hid_flags, &
-         H5F_flags, &
-         H5FD_flags, &
-         H5FD_hid_flags, &
-         H5G_flags, &
-         H5I_flags, &
-         H5L_flags, &
-         H5O_flags, &
-         H5P_flags, &
-         H5P_flags_int, &
-         H5R_flags, &
-         H5S_flags, &
-         H5S_hsize_flags, &
-         H5T_flags, &
-         H5Z_flags, &
-         H5generic_flags)
-    error_3 = h5init1_flags_c(H5LIB_flags )
-    error = error_1 + error_2 + error_3
-  END SUBROUTINE h5open_f
-
-!****s* H5LIB/h5close_f
-!
-! NAME
-!  h5close_f
-!
-! PURPOSE
-!  Closes HDF5 Fortran interface.
-!
-! Outputs:
-!  error - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  August 12, 1999
-!
-! HISTORY
-!  Explicit Fortran interfaces were added for
-!  called C functions (it is needed for Windows
-!  port).  February 28, 2001
-!
-! Removed call to h5close_c since this may cause a problem for an
-! application that uses HDF5 library outside HDF5 Fortran APIs.
-!          October 13, 2011
-! Fortran90 Interface:
-  SUBROUTINE h5close_f(error)
-    USE H5GLOBAL
-    IMPLICIT NONE
-    INTEGER, INTENT(OUT) :: error
-!*****
-    INTEGER :: error_1
-    INTERFACE
-       INTEGER FUNCTION h5close_types_c(p_types, P_TYPES_LEN, &
-            f_types, F_TYPES_LEN, &
-            i_types, I_TYPES_LEN )
-         USE H5GLOBAL
-         INTEGER P_TYPES_LEN
-         INTEGER F_TYPES_LEN
-         INTEGER I_TYPES_LEN
-         INTEGER(HID_T), DIMENSION(P_TYPES_LEN) :: p_types
-         INTEGER(HID_T), DIMENSION(F_TYPES_LEN) :: f_types
-         INTEGER(HID_T), DIMENSION(I_TYPES_LEN) :: i_types
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5CLOSE_TYPES_C'::h5close_types_c
-         !DEC$ENDIF
-       END FUNCTION h5close_types_c
-    END INTERFACE
-    error_1 = h5close_types_c(predef_types, PREDEF_TYPES_LEN, &
-         floating_types, FLOATING_TYPES_LEN, &
-         integer_types, INTEGER_TYPES_LEN )
-    error = error_1
-
-  END SUBROUTINE h5close_f
-
-!****s* H5LIB/h5get_libversion_f
-!
-! NAME
-!  h5get_libversion_f
-!
-! PURPOSE
-!  Returns the HDF5 LIbrary release number
-!
-! Outputs:
-!  majnum - major version of the library
-!  minum  - minor version of the library
-!  relnum - release version of the library
-!  error  - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  September 24, 2002
-!
-! Fortran90 Interface:
-  SUBROUTINE h5get_libversion_f(majnum, minnum, relnum, error)
-    USE H5GLOBAL
-    IMPLICIT NONE
-    INTEGER, INTENT(OUT) :: majnum, minnum, relnum, error
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5get_libversion_c(majnum, minnum, relnum)
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5GET_LIBVERSION_C'::h5get_libversion_c
-         !DEC$ENDIF
-         INTEGER, INTENT(OUT) :: majnum, minnum, relnum
-       END FUNCTION h5get_libversion_c
-    END INTERFACE
-
-    error = h5get_libversion_c(majnum, minnum, relnum)
-
-  END SUBROUTINE h5get_libversion_f
-
-!****s* H5LIB/h5check_version_f
-!
-! NAME
-!  h5check_version_f
-!
-! PURPOSE
-!  Verifies that library versions are consistent.
-!
-! Inputs:
-!  majnum - major version of the library
-!  minum  - minor version of the library
-!  relnum - release version of the library
-!
-! Outputs:
-!  error - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  September 24, 2002
-!
-! Fortran90 Interface:
-  SUBROUTINE h5check_version_f(majnum, minnum, relnum, error)
-    USE H5GLOBAL
-    IMPLICIT NONE
-    INTEGER, INTENT(IN)  :: majnum, minnum, relnum
-    INTEGER, INTENT(OUT) :: error
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5check_version_c(majnum, minnum, relnum)
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5CHECK_VERSION_C'::h5check_version_c
-         !DEC$ENDIF
-         INTEGER, INTENT(IN) :: majnum, minnum, relnum
-       END FUNCTION h5check_version_c
-    END INTERFACE
-
-    error = h5check_version_c(majnum, minnum, relnum)
-
-  END SUBROUTINE h5check_version_f
-!****s* H5LIB/h5garbage_collect_f
-!
-! NAME
-!  h5garbage_collect_f
-!
-! PURPOSE
-!  Garbage collects on all free-lists of all types.
-!
-! Outputs:
-!  error - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  September 24, 2002
-!
-! Fortran90 Interface:
-  SUBROUTINE h5garbage_collect_f(error)
-    USE H5GLOBAL
-    IMPLICIT NONE
-    INTEGER, INTENT(OUT) :: error
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5garbage_collect_c()
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5GARBAGE_COLLECT_C'::h5garbage_collect_c
-         !DEC$ENDIF
-       END FUNCTION h5garbage_collect_c
-    END INTERFACE
-
-    error = h5garbage_collect_c()
-
-  END SUBROUTINE h5garbage_collect_f
-!****s* H5LIB/h5dont_atexit_f
-!
-! NAME
-!  h5dont_atexit_f
-!
-! PURPOSE
-!  Instructs library not to install atexit cleanup routine.
-!
-! Outputs:
-!  error - Returns 0 if successful and -1 if fails
-!
-! AUTHOR
-!  Elena Pourmal
-!  September 24, 2002
-!
-! Fortran90 Interface:
-  SUBROUTINE h5dont_atexit_f(error)
-    USE H5GLOBAL
-    IMPLICIT NONE
-    INTEGER, INTENT(OUT) :: error
-!*****
-    INTERFACE
-       INTEGER FUNCTION h5dont_atexit_c()
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DONT_ATEXIT_C'::h5dont_atexit_c
-         !DEC$ENDIF
-       END FUNCTION h5dont_atexit_c
-    END INTERFACE
-
-    error = h5dont_atexit_c()
-
-  END SUBROUTINE h5dont_atexit_f
-
-!****f* H5LIB/h5kind_to_type
-!
-! NAME
-!  h5kind_to_type
-!
-! PURPOSE
-!  Converts the KIND to the correct HDF type
-!
-! Inputs:
-!  kind    - Fortran KIND parameter
-!  flag    - Whether KIND is of type INTEGER or REAL:
-!              H5_INTEGER_KIND - integer
-!              H5_REAL_KIND    - real
-! Outputs:
-!  h5_type - Returns the type
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  August 25, 2008
-!
-! Fortran90 Interface:
-  INTEGER(HID_T) FUNCTION h5kind_to_type(kind, flag) RESULT(h5_type)
-    USE H5GLOBAL
-    IMPLICIT NONE
-    INTEGER, INTENT(IN) :: kind
-    INTEGER, INTENT(IN) :: flag
-!*****
-    IF(flag.EQ.H5_INTEGER_KIND)THEN
-       IF(kind.EQ.Fortran_INTEGER_1)THEN
-          h5_type = H5T_NATIVE_INTEGER_1
-       ELSE IF(kind.EQ.Fortran_INTEGER_2)THEN
-          h5_type = H5T_NATIVE_INTEGER_2
-       ELSE IF(kind.EQ.Fortran_INTEGER_4)THEN
-          h5_type = H5T_NATIVE_INTEGER_4
-       ELSE IF(kind.EQ.Fortran_INTEGER_8)THEN
-          h5_type = H5T_NATIVE_INTEGER_8
-       ENDIF
-    ELSE IF(flag.EQ.H5_REAL_KIND)THEN
-       IF(kind.EQ.Fortran_REAL_4)THEN
-          h5_type = H5T_NATIVE_REAL_4
-       ELSE IF(kind.EQ.Fortran_REAL_8)THEN
-          h5_type = H5T_NATIVE_REAL_8
-       ELSE IF(kind.EQ.Fortran_REAL_16)THEN
-          h5_type = H5T_NATIVE_REAL_16
-       ENDIF
-    ENDIF
-
-  END FUNCTION h5kind_to_type
-
-END MODULE H5LIB
diff --git a/fortran/src/H5_ff_F03.f90 b/fortran/src/H5_ff_F03.f90
deleted file mode 100644
index d418ed5..0000000
--- a/fortran/src/H5_ff_F03.f90
+++ /dev/null
@@ -1,75 +0,0 @@
-!****h* ROBODoc/H5LIB_PROVISIONAL
-!
-! NAME
-!  MODULE H5LIB_PROVISIONAL
-!
-! PURPOSE
-!  This file contains helper functions for Fortran 2003 features and is
-!  only compiled when Fortran 2003 features are enabled, otherwise
-!  the file H5_ff_F90.f90 is compiled.
-!
-! COPYRIGHT
-!  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!  Copyright by The HDF Group.                                               *
-!  Copyright by the Board of Trustees of the University of Illinois.         *
-!  All rights reserved.                                                      *
-!  *
-!  This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!  terms governing use, modification, and redistribution, is contained in    *
-!  the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!  of the source code distribution tree; Copyright.html can be found at the  *
-!  root level of an installed copy of the electronic HDF5 document set and   *
-!  is linked from the top-level documents page.  It can also be found at     *
-!  http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!  access to either file, you may request a copy from help@hdfgroup.org.     *
-!  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! NOTES
-!                         *** IMPORTANT ***
-!  If you add a new function you must add the function name to the
-!  Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
-!  This is needed for Windows based operating systems.
-!*****
-
-MODULE H5LIB_PROVISIONAL
-
-CONTAINS
-!****f* H5LIB_PROVISIONAL/h5offsetof
-!
-! NAME
-!  h5offsetof
-!
-! PURPOSE
-!  Computes the offset in memory
-!
-! Inputs:
-!  start - starting pointer address
-!  end 	 - ending pointer address
-!
-! Outputs:
-!  offset - offset of a member within the derived type
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!  Augest 25, 2008
-!
-! ACKNOWLEDGEMENTS
-!  Joe Krahn
-!
-! Fortran2003 Interface:
-  FUNCTION h5offsetof(start,end) RESULT(offset)
-    USE, INTRINSIC :: ISO_C_BINDING
-    USE H5GLOBAL
-    IMPLICIT NONE
-    INTEGER(SIZE_T) :: offset
-    TYPE(C_PTR), VALUE, INTENT(IN) :: start, end
-!*****
-    INTEGER(C_INTPTR_T) :: int_address_start, int_address_end
-    int_address_start = TRANSFER(start, int_address_start)
-    int_address_end   = TRANSFER(end  , int_address_end  )
-
-    offset = int_address_end - int_address_start
-
-  END FUNCTION h5offsetof
-
-END MODULE H5LIB_PROVISIONAL
diff --git a/fortran/src/H5_ff_F90.f90 b/fortran/src/H5_ff_F90.f90
deleted file mode 100644
index a5d303a..0000000
--- a/fortran/src/H5_ff_F90.f90
+++ /dev/null
@@ -1,34 +0,0 @@
-!****h* ROBODoc/H5LIB_PROVISIONAL (F90)
-!
-! NAME
-!  MODULE H5LIB_PROVISIONAL
-!
-! FILE
-!  fortran/src/H5_ff_F90.f90
-!
-! PURPOSE
-!  This file is a dummy module for when Fortran 2003 features are not enabled.
-!  It is compiled in place of H5_ff_F03.f90 and is empty.
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-!*****
-
-MODULE H5LIB_PROVISIONAL
-
-
-END MODULE H5LIB_PROVISIONAL
diff --git a/fortran/src/H5config_f.inc.cmake b/fortran/src/H5config_f.inc.cmake
new file mode 100644
index 0000000..46dfb69
--- /dev/null
+++ b/fortran/src/H5config_f.inc.cmake
@@ -0,0 +1,78 @@
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+! fortran/src/H5config_f.inc. Generated from fortran/src/H5config_f.inc.in by configure
+
+! Define if there is parallel support
+#cmakedefine01 H5_HAVE_PARALLEL
+#if H5_HAVE_PARALLEL == 0
+#undef H5_HAVE_PARALLEL
+#endif
+
+! Define if there is subfiling support
+#cmakedefine01 H5_HAVE_SUBFILING_VFD
+#if H5_HAVE_SUBFILING_VFD == 0
+#undef H5_HAVE_SUBFILING_VFD
+#endif
+
+! Define if the intrinsic function STORAGE_SIZE exists
+#define H5_FORTRAN_HAVE_STORAGE_SIZE @H5_FORTRAN_HAVE_STORAGE_SIZE@
+
+! Define if the intrinsic function SIZEOF exists
+#define H5_FORTRAN_HAVE_SIZEOF @H5_FORTRAN_HAVE_SIZEOF@
+
+! Define if the intrinsic function C_SIZEOF exists
+#define H5_FORTRAN_HAVE_C_SIZEOF @H5_FORTRAN_HAVE_C_SIZEOF@
+
+! Define if the intrinsic C_LONG_DOUBLE exists
+#define H5_FORTRAN_HAVE_C_LONG_DOUBLE @H5_FORTRAN_HAVE_C_LONG_DOUBLE@
+
+! Define if Fortran C_LONG_DOUBLE is different from C_DOUBLE
+#define H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE @H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE@
+
+! Define if the intrinsic module ISO_FORTRAN_ENV exists
+#define H5_HAVE_ISO_FORTRAN_ENV @H5_HAVE_ISO_FORTRAN_ENV@
+
+! should this be ${HDF_PREFIX} instead of H5 MSB
+#define H5_SIZEOF_DOUBLE @H5_SIZEOF_DOUBLE@
+
+! should this be ${HDF_PREFIX} instead of H5 MSB
+#define H5_SIZEOF_LONG_DOUBLE @H5_SIZEOF_LONG_DOUBLE@
+
+! Define the maximum decimal precision for reals
+#define H5_PAC_FC_MAX_REAL_PRECISION @H5_PAC_FC_MAX_REAL_PRECISION@
+
+! If C has quad precision
+#define H5_HAVE_FLOAT128 @H5_HAVE_FLOAT128@
+
+! Define if INTEGER*16 is available
+#define H5_HAVE_Fortran_INTEGER_SIZEOF_16 @H5_HAVE_Fortran_INTEGER_SIZEOF_16@
+
+! Maximum decimal precision for C
+#define H5_PAC_C_MAX_REAL_PRECISION @H5_PAC_C_MAX_REAL_PRECISION@
+
+! number of valid REAL KINDs
+#define H5_H5CONFIG_F_NUM_RKIND @H5_H5CONFIG_F_NUM_RKIND@
+
+! valid REAL KINDs (need to have a matching C counter-part)
+#define H5_H5CONFIG_F_RKIND @H5_H5CONFIG_F_RKIND@
+
+! valid REAL KINDs (need to have a matching C counter-part)
+#define H5_H5CONFIG_F_RKIND_SIZEOF @H5_H5CONFIG_F_RKIND_SIZEOF@
+
+! number of valid INTEGER KINDs
+#define H5_H5CONFIG_F_NUM_IKIND @H5_H5CONFIG_F_NUM_IKIND@
+
+! valid INTEGER KINDs (need to have a matching C counter-part)
+#define H5_H5CONFIG_F_IKIND @H5_H5CONFIG_F_IKIND@
+
+! Fortran compiler id
+#define H5_Fortran_COMPILER_ID @CMAKE_Fortran_COMPILER_ID@
diff --git a/fortran/src/H5config_f.inc.in b/fortran/src/H5config_f.inc.in
new file mode 100644
index 0000000..0ce33ec
--- /dev/null
+++ b/fortran/src/H5config_f.inc.in
@@ -0,0 +1,76 @@
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+! fortran/src/H5config_f.inc. Generated from fortran/src/H5config_f.inc.in by configure
+
+! The script to replace the defines in H5config_f.inc.in is
+! located in configure.ac in the Fortran section.
+
+! Define if we have parallel support
+#undef HAVE_PARALLEL
+
+! Define if we have subfiling support
+#undef HAVE_SUBFILING_VFD
+
+! Define if the intrinsic function STORAGE_SIZE exists
+#undef FORTRAN_HAVE_STORAGE_SIZE
+
+! Define if the intrinsic function SIZEOF exists
+#undef FORTRAN_HAVE_SIZEOF
+
+! Define if the intrinsic function C_SIZEOF exists
+#undef FORTRAN_HAVE_C_SIZEOF
+
+! Define if the intrinsic function C_LONG_DOUBLE exists
+#undef FORTRAN_HAVE_C_LONG_DOUBLE
+
+! Define if Fortran C_LONG_DOUBLE is different from C_DOUBLE
+#undef FORTRAN_C_LONG_DOUBLE_IS_UNIQUE
+
+! Define if the intrinsic module ISO_FORTRAN_ENV exists
+#undef HAVE_ISO_FORTRAN_ENV
+
+! Define the size of C's long double
+#undef SIZEOF_DOUBLE
+
+! Define the size of C's long double
+#undef SIZEOF_LONG_DOUBLE
+
+! Define the maximum decimal precision for reals
+#undef PAC_FC_MAX_REAL_PRECISION
+
+! If C has quad precision
+#undef HAVE_FLOAT128
+
+! Define if INTEGER*16 is available
+#undef HAVE_Fortran_INTEGER_SIZEOF_16
+
+! Maximum decimal precision for C
+#undef PAC_C_MAX_REAL_PRECISION
+
+! number of valid REAL KINDs
+#undef H5CONFIG_F_NUM_RKIND
+
+! valid REAL KINDs (need to have a matching C counter-part)
+#undef H5CONFIG_F_RKIND
+
+! valid REAL KINDs (need to have a matching C counter-part)
+#undef H5CONFIG_F_RKIND_SIZEOF
+
+! number of valid INTEGER KINDs
+#undef H5CONFIG_F_NUM_IKIND
+
+! valid INTEGER KINDs (need to have a matching C counter-part)
+#undef H5CONFIG_F_IKIND
+
+! Fortran compiler name
+#undef Fortran_COMPILER_ID
+
diff --git a/fortran/src/H5f90.h b/fortran/src/H5f90.h
index c45cfcb..513b309 100644
--- a/fortran/src/H5f90.h
+++ b/fortran/src/H5f90.h
@@ -1,31 +1,29 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-
-#ifndef _H5f90_H
-#define _H5f90_H
+#ifndef H5f90_H
+#define H5f90_H
 
 #include "hdf5.h"
 #include "H5private.h"
 #include "H5f90i.h"
 #include "H5f90proto.h"
 
-/* Constants used in H5Rff.f90 and H5Rf.c files */
-#define REF_REG_BUF_LEN_F    3
+/* Constants used in H5Rff.F90 and H5Rf.c files */
+#define REF_REG_BUF_LEN_F 3
 
 /* Constants used in H5Gf.c files */
 #define OBJECT_NAMELEN_DEFAULT_F -1
-#define H5_MAX(a,b)            (((a)>(b)) ? (a) : (b))
-#endif /* _H5f90_H */
+
+#define H5_MAX(a, b) (((a) > (b)) ? (a) : (b))
+
+#endif /* H5f90_H */
diff --git a/fortran/src/H5f90global.F90 b/fortran/src/H5f90global.F90
new file mode 100644
index 0000000..30bab33
--- /dev/null
+++ b/fortran/src/H5f90global.F90
@@ -0,0 +1,862 @@
+! PURPOSE
+!
+! This module contains Fortran datatypes and flags.
+!
+! USES
+!  H5FORTRAN_TYPES - H5FORTRAN_TYPES is generated at run time by H5match_types.c
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+! AUTHOR
+!  Elena Pourmal
+!
+!*****
+
+MODULE H5GLOBAL
+  USE H5FORTRAN_TYPES
+
+  IMPLICIT NONE
+
+  ! Enumerate data type that is interoperable with C.
+  ENUM, BIND(C)
+    ENUMERATOR :: enum_dtype
+  END ENUM
+
+!> \addtogroup FH5
+!> @{
+  INTEGER, PARAMETER :: ENUM_T = KIND(enum_dtype)  !< Enumerate data type that is interoperable with C.
+
+  ! Parameters used in the function 'h5kind_to_type' located in H5_ff.F90.
+  ! The flag is used to tell the function whether the kind input variable
+  ! is for a REAL or INTEGER data type.
+  INTEGER, PARAMETER :: H5_REAL_KIND = 1    !< Used in the function h5kind_to_type()
+  INTEGER, PARAMETER :: H5_INTEGER_KIND = 0 !< Used in the function h5kind_to_type()
+!> @}
+
+  ! Definitions for reference datatypes.
+  ! If you change the value of these parameters, do not forget to change corresponding
+  ! values in the H5f90.h file.
+  INTEGER, PARAMETER :: REF_REG_BUF_LEN = 3
+  INTEGER, PARAMETER :: H5O_TOKEN_BUF_LEN = 16 ! Matches C defined value in H5public.h
+
+!> \addtogroup FH5R
+!> @{
+!> @brief hobj_ref_t_f derived type
+  TYPE :: hobj_ref_t_f
+     INTEGER(HADDR_T) ref
+  END TYPE hobj_ref_t_f
+
+!> @brief hdset_reg_ref_t_f derived type
+  TYPE :: hdset_reg_ref_t_f
+     INTEGER, DIMENSION(1:REF_REG_BUF_LEN) :: ref
+  END TYPE hdset_reg_ref_t_f
+!> @}
+
+  ! Do not forget to change these values when new predefined
+  ! datatypes are added
+  INTEGER, PARAMETER :: PREDEF_TYPES_LEN = 19
+  INTEGER, PARAMETER :: FLOATING_TYPES_LEN = 4
+  INTEGER, PARAMETER :: INTEGER_TYPES_LEN = 27
+
+  ! These arrays need to be global because they are used in
+  ! both h5open_f and in h5close_f; initialize to fix linking issues
+  ! on OSX and Intel compilers.
+  INTEGER(HID_T), DIMENSION(1:PREDEF_TYPES_LEN)   :: predef_types = -1
+  INTEGER(HID_T), DIMENSION(1:FLOATING_TYPES_LEN) :: floating_types = -1
+  INTEGER(HID_T), DIMENSION(1:INTEGER_TYPES_LEN)  :: integer_types = -1
+
+  !DEC$if defined(BUILD_HDF5_DLL)
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_NATIVE_REAL_C_FLOAT
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_NATIVE_REAL_C_DOUBLE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_NATIVE_REAL_C_LONG_DOUBLE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_NATIVE_INTEGER
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_NATIVE_REAL
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_NATIVE_DOUBLE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_NATIVE_CHARACTER
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_REF_OBJ
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_REF_DSETREG
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_IEEE_F32BE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_IEEE_F32LE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_IEEE_F64BE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_IEEE_F64LE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_I8BE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_I8LE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_I16BE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_I16LE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_I32BE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_I32LE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_I64BE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_I64LE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_U8BE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_U8LE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_U16BE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_U16LE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_U32BE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_U32LE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_U64BE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_U64LE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STRING
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_B8BE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_B8LE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_B16BE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_B16LE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_B32BE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_B32LE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_B64BE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_B64LE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_NATIVE_B8
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_NATIVE_B16
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_NATIVE_B32
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_NATIVE_B64
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_FORTRAN_S1
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_C_S1
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_NATIVE_INTEGER_KIND
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_NATIVE_FLOAT_128
+  !DEC$endif
+!> \addtogroup FH5T
+!> @{
+  INTEGER(HID_T) :: H5T_NATIVE_REAL_C_FLOAT       !< H5T_NATIVE_REAL_C_FLOAT
+  INTEGER(HID_T) :: H5T_NATIVE_REAL_C_DOUBLE      !< H5T_NATIVE_REAL_C_DOUBLE
+  INTEGER(HID_T) :: H5T_NATIVE_REAL_C_LONG_DOUBLE !< H5T_NATIVE_REAL_C_LONG_DOUBLE
+  INTEGER(HID_T) :: H5T_NATIVE_INTEGER            !< H5T_NATIVE_INTEGER
+  INTEGER(HID_T) :: H5T_NATIVE_REAL      !< H5T_NATIVE_REAL
+  INTEGER(HID_T) :: H5T_NATIVE_DOUBLE    !< H5T_NATIVE_DOUBLE
+  INTEGER(HID_T) :: H5T_NATIVE_CHARACTER !< H5T_NATIVE_CHARACTER
+  INTEGER(HID_T) :: H5T_STD_REF_OBJ      !< H5T_STD_REF_OBJ
+  INTEGER(HID_T) :: H5T_STD_REF_DSETREG  !< H5T_STD_REF_DSETREG
+  INTEGER(HID_T) :: H5T_IEEE_F32BE  !< H5T_IEEE_F32BE
+  INTEGER(HID_T) :: H5T_IEEE_F32LE  !< H5T_IEEE_F32LE
+  INTEGER(HID_T) :: H5T_IEEE_F64BE  !< H5T_IEEE_F64BE
+  INTEGER(HID_T) :: H5T_IEEE_F64LE  !< H5T_IEEE_F64LE
+  INTEGER(HID_T) :: H5T_STD_I8BE  !< H5T_STD_I8BE
+  INTEGER(HID_T) :: H5T_STD_I8LE  !< H5T_STD_I8LE
+  INTEGER(HID_T) :: H5T_STD_I16BE  !< H5T_STD_I16BE
+  INTEGER(HID_T) :: H5T_STD_I16LE  !< H5T_STD_I16LE
+  INTEGER(HID_T) :: H5T_STD_I32BE  !< H5T_STD_I32BE
+  INTEGER(HID_T) :: H5T_STD_I32LE  !< H5T_STD_I32LE
+  INTEGER(HID_T) :: H5T_STD_I64BE  !< H5T_STD_I64BE
+  INTEGER(HID_T) :: H5T_STD_I64LE  !< H5T_STD_I64LE
+  INTEGER(HID_T) :: H5T_STD_U8BE  !< H5T_STD_U8BE
+  INTEGER(HID_T) :: H5T_STD_U8LE  !< H5T_STD_U8LE
+  INTEGER(HID_T) :: H5T_STD_U16BE  !< H5T_STD_U16BE
+  INTEGER(HID_T) :: H5T_STD_U16LE  !< H5T_STD_U16LE
+  INTEGER(HID_T) :: H5T_STD_U32BE  !< H5T_STD_U32BE
+  INTEGER(HID_T) :: H5T_STD_U32LE  !< H5T_STD_U32LE
+  INTEGER(HID_T) :: H5T_STD_U64BE  !< H5T_STD_U64BE
+  INTEGER(HID_T) :: H5T_STD_U64LE  !< H5T_STD_U64LE
+  INTEGER(HID_T) :: H5T_STRING  !< H5T_STRING
+  INTEGER(HID_T) :: H5T_STD_B8BE  !< H5T_STD_B8BE
+  INTEGER(HID_T) :: H5T_STD_B8LE  !< H5T_STD_B8LE
+  INTEGER(HID_T) :: H5T_STD_B16BE  !< H5T_STD_B16BE
+  INTEGER(HID_T) :: H5T_STD_B16LE  !< H5T_STD_B16LE
+  INTEGER(HID_T) :: H5T_STD_B32BE  !< H5T_STD_B32BE
+  INTEGER(HID_T) :: H5T_STD_B32LE  !< H5T_STD_B32LE
+  INTEGER(HID_T) :: H5T_STD_B64BE  !< H5T_STD_B64BE
+  INTEGER(HID_T) :: H5T_STD_B64LE  !< H5T_STD_B64LE
+  INTEGER(HID_T) :: H5T_NATIVE_B8  !< H5T_NATIVE_B8
+  INTEGER(HID_T) :: H5T_NATIVE_B16  !< H5T_NATIVE_B16
+  INTEGER(HID_T) :: H5T_NATIVE_B32  !< H5T_NATIVE_B32
+  INTEGER(HID_T) :: H5T_NATIVE_B64  !< H5T_NATIVE_B64
+  INTEGER(HID_T) :: H5T_FORTRAN_S1  !< H5T_FORTRAN_S1
+  INTEGER(HID_T) :: H5T_C_S1     !< H5T_C_S1
+
+#ifndef H5_DOXYGEN
+  INTEGER, PARAMETER :: NUM_NATIVE_INTEGER_KIND = 5
+  ! INTEGER*1, INTEGER*2, INTEGER*4, INTEGER*8, INTEGER*16
+  INTEGER(HID_T), DIMENSION(1:NUM_NATIVE_INTEGER_KIND) :: H5T_NATIVE_INTEGER_KIND
+#endif
+  ! NEED IFDEF -MSB-
+  INTEGER(HID_T) :: H5T_NATIVE_FLOAT_128 !< Quadruple-precision floating-point
+!> @}
+  !
+  ! H5generic flags declaration
+  !
+  !DEC$if defined(BUILD_HDF5_DLL)
+  !DEC$ATTRIBUTES DLLEXPORT :: H5_INDEX_UNKNOWN_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5_INDEX_NAME_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5_INDEX_CRT_ORDER_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5_INDEX_N_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5_ITER_UNKNOWN_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5_ITER_INC_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5_ITER_DEC_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5_ITER_NATIVE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5_ITER_N_F
+  !DEC$ATTRIBUTES DLLEXPORT :: HADDR_UNDEF_F
+  !DEC$endif
+!> \addtogroup FH5
+!> @{
+  INTEGER :: H5_INDEX_UNKNOWN_F   !< H5_INDEX_UNKNOWN
+  INTEGER :: H5_INDEX_NAME_F      !< H5_INDEX_NAME
+  INTEGER :: H5_INDEX_CRT_ORDER_F !< H5_INDEX_CRT_ORDER
+  INTEGER :: H5_INDEX_N_F         !< H5_INDEX_N
+  INTEGER :: H5_ITER_UNKNOWN_F    !< H5_ITER_UNKNOWN
+  INTEGER :: H5_ITER_INC_F        !< H5_ITER_INC
+  INTEGER :: H5_ITER_DEC_F        !< H5_ITER_DEC
+  INTEGER :: H5_ITER_NATIVE_F     !< H5_ITER_NATIVE
+  INTEGER :: H5_ITER_N_F          !< H5_ITER_N
+
+  INTEGER(HADDR_T) :: HADDR_UNDEF_F  !< HADDR_UNDEF
+!> @}
+  !
+  ! H5F flags declaration
+  !
+  !DEC$if defined(BUILD_HDF5_DLL)
+  !DEC$ATTRIBUTES DLLEXPORT :: H5F_ACC_RDWR_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5F_ACC_RDONLY_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5F_ACC_TRUNC_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5F_ACC_EXCL_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5F_ACC_DEBUG_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5F_SCOPE_LOCAL_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5F_SCOPE_GLOBAL_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5F_CLOSE_DEFAULT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5F_CLOSE_WEAK_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5F_CLOSE_SEMI_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5F_CLOSE_STRONG_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5F_OBJ_FILE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5F_OBJ_DATASET_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5F_OBJ_GROUP_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5F_OBJ_DATATYPE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5F_OBJ_ALL_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5F_LIBVER_EARLIEST_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5F_LIBVER_LATEST_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5F_UNLIMITED_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5F_LIBVER_ERROR_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5F_LIBVER_NBOUNDS_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5F_LIBVER_V18_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5F_LIBVER_V110_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5F_LIBVER_V112_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5F_LIBVER_V114_F
+  !DEC$endif
+!> \addtogroup FH5F
+!> @{
+  INTEGER :: H5F_ACC_RDWR_F        !< H5F_ACC_RDWR
+  INTEGER :: H5F_ACC_RDONLY_F      !< H5F_ACC_RDONLY
+  INTEGER :: H5F_ACC_TRUNC_F       !< H5F_ACC_TRUNC
+  INTEGER :: H5F_ACC_EXCL_F        !< H5F_ACC_EXCL
+  INTEGER :: H5F_ACC_DEBUG_F       !< H5F_ACC_DEBUG
+  INTEGER :: H5F_SCOPE_LOCAL_F     !< H5F_SCOPE_LOCAL
+  INTEGER :: H5F_SCOPE_GLOBAL_F    !< H5F_SCOPE_GLOBAL
+  INTEGER :: H5F_CLOSE_DEFAULT_F   !< H5F_CLOSE_DEFAULT
+  INTEGER :: H5F_CLOSE_WEAK_F      !< H5F_CLOSE_WEAK
+  INTEGER :: H5F_CLOSE_SEMI_F      !< H5F_CLOSE_SEMI
+  INTEGER :: H5F_CLOSE_STRONG_F    !< H5F_CLOSE_STRONG
+  INTEGER :: H5F_OBJ_FILE_F        !< H5F_OBJ_FILE
+  INTEGER :: H5F_OBJ_DATASET_F     !< H5F_OBJ_DATASET
+  INTEGER :: H5F_OBJ_GROUP_F       !< H5F_OBJ_GROUP
+  INTEGER :: H5F_OBJ_DATATYPE_F    !< H5F_OBJ_DATATYPE
+  INTEGER :: H5F_OBJ_ALL_F         !< H5F_OBJ_ALL
+  INTEGER :: H5F_LIBVER_EARLIEST_F !< H5F_LIBVER_EARLIEST
+  INTEGER :: H5F_LIBVER_LATEST_F   !< H5F_LIBVER_LATEST
+  INTEGER :: H5F_UNLIMITED_F       !< H5F_UNLIMITED
+  INTEGER :: H5F_LIBVER_ERROR_F    !< H5F_LIBVER_ERROR
+  INTEGER :: H5F_LIBVER_NBOUNDS_F  !< H5F_LIBVER_NBOUNDS
+  INTEGER :: H5F_LIBVER_V18_F      !< H5F_LIBVER_V18
+  INTEGER :: H5F_LIBVER_V110_F     !< H5F_LIBVER_V110
+  INTEGER :: H5F_LIBVER_V112_F     !< H5F_LIBVER_V112
+  INTEGER :: H5F_LIBVER_V114_F     !< H5F_LIBVER_V114
+!> @}
+  !
+  ! H5G flags declaration
+  !
+  !DEC$if defined(BUILD_HDF5_DLL)
+  !DEC$ATTRIBUTES DLLEXPORT :: H5G_UNKNOWN_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5G_GROUP_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5G_DATASET_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5G_TYPE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5G_LINK_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5G_UDLINK_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5G_SAME_LOC_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5G_LINK_ERROR_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5G_LINK_HARD_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5G_LINK_SOFT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5G_STORAGE_TYPE_UNKNOWN_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5G_STORAGE_TYPE_SYMBOL_TABLE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5G_STORAGE_TYPE_COMPACT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5G_STORAGE_TYPE_DENSE_F
+  !DEC$endif
+!> \addtogroup FH5G
+!> @{
+  INTEGER :: H5G_UNKNOWN_F      !< H5G_UNKNOWN
+  INTEGER :: H5G_GROUP_F        !< H5G_GROUP
+  INTEGER :: H5G_DATASET_F      !< H5G_DATASET
+  INTEGER :: H5G_TYPE_F         !< H5G_TYPE
+  INTEGER :: H5G_LINK_F         !< H5G_LINK
+  INTEGER :: H5G_UDLINK_F       !< H5G_UDLINK
+  INTEGER :: H5G_SAME_LOC_F     !< H5G_SAME_LOC
+  INTEGER :: H5G_LINK_ERROR_F   !< H5G_LINK_ERROR
+  INTEGER :: H5G_LINK_HARD_F    !< H5G_LINK_HARD
+  INTEGER :: H5G_LINK_SOFT_F    !< H5G_LINK_SOFT
+  INTEGER :: H5G_STORAGE_TYPE_UNKNOWN_F      !< H5G_STORAGE_TYPE_UNKNOWN
+  INTEGER :: H5G_STORAGE_TYPE_SYMBOL_TABLE_F !< H5G_STORAGE_TYPE_SYMBOL_TABLE
+  INTEGER :: H5G_STORAGE_TYPE_COMPACT_F      !< H5G_STORAGE_TYPE_COMPACT
+  INTEGER :: H5G_STORAGE_TYPE_DENSE_F        !< H5G_STORAGE_TYPE_DENSE
+!> @}
+  !
+  ! H5D flags declaration
+  !
+  !DEC$if defined(BUILD_HDF5_DLL)
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_COMPACT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_CONTIGUOUS_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_CHUNKED_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_ALLOC_TIME_ERROR_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_ALLOC_TIME_DEFAULT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_ALLOC_TIME_EARLY_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_ALLOC_TIME_LATE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_ALLOC_TIME_INCR_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_SPACE_STS_ERROR_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_SPACE_STS_NOT_ALLOCATED_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_SPACE_STS_PART_ALLOCATED_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_SPACE_STS_ALLOCATED_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_FILL_TIME_ERROR_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_FILL_TIME_ALLOC_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_FILL_TIME_NEVER_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_FILL_VALUE_ERROR_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_FILL_VALUE_UNDEFINED_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_FILL_VALUE_DEFAULT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_FILL_VALUE_USER_DEFINED_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_CHUNK_CACHE_NSLOTS_DFLT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_CHUNK_CACHE_NBYTES_DFLT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_CHUNK_CACHE_W0_DFLT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_MPIO_NO_COLLECTIVE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_MPIO_CHUNK_INDEPENDENT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_MPIO_CHUNK_COLLECTIVE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_MPIO_CHUNK_MIXED_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_MPIO_CONTIG_COLLECTIVE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_VDS_ERROR_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_VDS_FIRST_MISSING_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_VDS_LAST_AVAILABLE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_VIRTUAL_F
+  !DEC$endif
+!> \addtogroup FH5D
+!> @{
+  INTEGER :: H5D_COMPACT_F  !< H5D_COMPACT
+  INTEGER :: H5D_CONTIGUOUS_F  !< H5D_CONTIGUOUS
+  INTEGER :: H5D_CHUNKED_F  !< H5D_CHUNKED
+
+  INTEGER :: H5D_ALLOC_TIME_ERROR_F  !< H5D_ALLOC_TIME_ERROR
+  INTEGER :: H5D_ALLOC_TIME_DEFAULT_F  !< H5D_ALLOC_TIME_DEFAULT
+  INTEGER :: H5D_ALLOC_TIME_EARLY_F  !< H5D_ALLOC_TIME_EARLY
+  INTEGER :: H5D_ALLOC_TIME_LATE_F  !< H5D_ALLOC_TIME_LATE
+  INTEGER :: H5D_ALLOC_TIME_INCR_F  !< H5D_ALLOC_TIME_INCR
+
+  INTEGER :: H5D_SPACE_STS_ERROR_F  !< H5D_SPACE_STS_ERROR
+  INTEGER :: H5D_SPACE_STS_NOT_ALLOCATED_F  !< H5D_SPACE_STS_NOT_ALLOCATED
+  INTEGER :: H5D_SPACE_STS_PART_ALLOCATED_F  !< H5D_SPACE_STS_PART_ALLOCATED
+  INTEGER :: H5D_SPACE_STS_ALLOCATED_F  !< H5D_SPACE_STS_ALLOCATED
+
+  INTEGER :: H5D_FILL_TIME_ERROR_F  !< H5D_FILL_TIME_ERROR
+  INTEGER :: H5D_FILL_TIME_ALLOC_F  !< H5D_FILL_TIME_ALLOC
+  INTEGER :: H5D_FILL_TIME_NEVER_F  !< H5D_FILL_TIME_NEVER
+
+  INTEGER :: H5D_FILL_VALUE_ERROR_F  !< H5D_FILL_VALUE_ERROR
+  INTEGER :: H5D_FILL_VALUE_UNDEFINED_F  !< H5D_FILL_VALUE_UNDEFINED
+  INTEGER :: H5D_FILL_VALUE_DEFAULT_F  !< H5D_FILL_VALUE_DEFAULT
+  INTEGER :: H5D_FILL_VALUE_USER_DEFINED_F  !< H5D_FILL_VALUE_USER_DEFINED
+
+  ! shortened "_DEFAULT" to "_DFLT" to satisfy the limit of 31 (F95)
+  ! characters for variable names in Fortran.
+  ! shortened "_CONTIGUOUS" to "_CONTIG" to satisfy the limit of 31 (F95)
+  ! characters for variable names in Fortran.
+
+  INTEGER(SIZE_T) :: H5D_CHUNK_CACHE_NSLOTS_DFLT_F  !< H5D_CHUNK_CACHE_NSLOTS_DEFAULT
+  INTEGER(SIZE_T) :: H5D_CHUNK_CACHE_NBYTES_DFLT_F  !< H5D_CHUNK_CACHE_NBYTES_DEFAULT
+
+  INTEGER :: H5D_CHUNK_CACHE_W0_DFLT_F    !< H5D_CHUNK_CACHE_W0_DEFAULT
+  INTEGER :: H5D_MPIO_NO_COLLECTIVE_F     !< H5D_MPIO_NO_COLLECTIVE
+  INTEGER :: H5D_MPIO_CHUNK_INDEPENDENT_F !< H5D_MPIO_CHUNK_INDEPENDENT
+  INTEGER :: H5D_MPIO_CHUNK_COLLECTIVE_F  !< H5D_MPIO_CHUNK_COLLECTIVE
+  INTEGER :: H5D_MPIO_CHUNK_MIXED_F       !< H5D_MPIO_CHUNK_MIXED
+  INTEGER :: H5D_MPIO_CONTIG_COLLECTIVE_F !< H5D_MPIO_CONTIGUOUS_COLLECTIVE
+  INTEGER :: H5D_VDS_ERROR_F              !< H5D_VDS_ERROR
+  INTEGER :: H5D_VDS_FIRST_MISSING_F      !< H5D_VDS_FIRST_MISSING
+  INTEGER :: H5D_VDS_LAST_AVAILABLE_F     !< H5D_VDS_LAST_AVAILABLE
+  INTEGER :: H5D_VIRTUAL_F                !< H5D_VIRTUAL
+!> @}
+  !
+  ! H5E flags declaration
+  !
+  !DEC$if defined(BUILD_HDF5_DLL)
+  !DEC$ATTRIBUTES DLLEXPORT :: H5E_DEFAULT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5E_MAJOR_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5E_MINOR_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5E_WALK_UPWARD_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5E_WALK_DOWNWARD_F
+  !DEC$endif
+!> \addtogroup FH5E
+!> @{
+  INTEGER(HID_T) :: H5E_DEFAULT_F !< H5E_DEFAULT
+  INTEGER :: H5E_MAJOR_F          !< H5E_MAJOR
+  INTEGER :: H5E_MINOR_F          !< H5E_MINOR
+  INTEGER :: H5E_WALK_UPWARD_F    !< H5E_WALK_UPWARD
+  INTEGER :: H5E_WALK_DOWNWARD_F  !< H5E_WALK_DOWNWARD
+!> @}
+  !
+  ! H5FD file drivers flags declaration
+  !
+  !DEC$if defined(BUILD_HDF5_DLL)
+  !DEC$ATTRIBUTES DLLEXPORT :: H5FD_MPIO_INDEPENDENT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5FD_MPIO_COLLECTIVE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5FD_MEM_NOLIST_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5FD_MEM_DEFAULT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5FD_MEM_SUPER_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5FD_MEM_BTREE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5FD_MEM_DRAW_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5FD_MEM_GHEAP_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5FD_MEM_LHEAP_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5FD_MEM_OHDR_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5FD_MEM_NTYPES_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5FD_CORE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5FD_FAMILY_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5FD_LOG_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5FD_MPIO_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5FD_MULTI_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5FD_SEC2_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5FD_STDIO_F
+  !DEC$endif
+!> \addtogroup FH5P
+!> @{
+  INTEGER :: H5FD_MPIO_INDEPENDENT_F !< H5FD_MPIO_INDEPENDENT
+  INTEGER :: H5FD_MPIO_COLLECTIVE_F  !< H5FD_MPIO_COLLECTIVE
+  INTEGER :: H5FD_MEM_NOLIST_F       !< H5FD_MEM_NOLIST
+  INTEGER :: H5FD_MEM_DEFAULT_F      !< H5FD_MEM_DEFAULT
+  INTEGER :: H5FD_MEM_SUPER_F        !< H5FD_MEM_SUPER
+  INTEGER :: H5FD_MEM_BTREE_F        !< H5FD_MEM_BTREE
+  INTEGER :: H5FD_MEM_DRAW_F         !< H5FD_MEM_DRAW
+  INTEGER :: H5FD_MEM_GHEAP_F        !< H5FD_MEM_GHEAP
+  INTEGER :: H5FD_MEM_LHEAP_F        !< H5FD_MEM_LHEAP
+  INTEGER :: H5FD_MEM_OHDR_F         !< H5FD_MEM_OHDR
+  INTEGER :: H5FD_MEM_NTYPES_F       !< H5FD_MEM_NTYPES
+  INTEGER :: H5FD_SUBFILING_CURR_FAPL_VERSION_F    !< H5FD_SUBFILING_CURR_FAPL_VERSION
+  INTEGER :: H5FD_SUBFILING_FAPL_MAGIC_F           !< H5FD_SUBFILING_FAPL_MAGIC
+  INTEGER :: H5FD_SUBFILING_DEFAULT_STRIPE_COUNT_F !< H5FD_SUBFILING_DEFAULT_STRIPE_COUNT
+  INTEGER :: H5FD_IOC_CURR_FAPL_VERSION_F          !< H5FD_IOC_CURR_FAPL_VERSION
+  INTEGER :: H5FD_IOC_FAPL_MAGIC_F                 !< H5FD_IOC_FAPL_MAGIC
+  INTEGER :: H5FD_IOC_DEFAULT_THREAD_POOL_SIZE_F   !< H5FD_IOC_DEFAULT_THREAD_POOL_SIZE
+  INTEGER :: SELECT_IOC_ONE_PER_NODE_F    !< Default, SELECT_IOC_ONE_PER_NODE
+  INTEGER :: SELECT_IOC_EVERY_NTH_RANK_F  !< Starting at rank 0, select-next += N, SELECT_IOC_EVERY_NTH_RANK
+  INTEGER :: SELECT_IOC_WITH_CONFIG_F     !< NOT IMPLEMENTED: Read-from-file, SELECT_IOC_WITH_CONFIG
+  INTEGER :: SELECT_IOC_TOTAL_F           !< Starting at rank 0, mpi_size / total, SELECT_IOC_TOTAL
+  INTEGER :: IOC_SELECTION_OPTIONS_F      !< Sentinel value, IOC_SELECTION_OPTIONS
+
+  INTEGER(HID_T) :: H5FD_CORE_F      !< H5FD_CORE
+  INTEGER(HID_T) :: H5FD_FAMILY_F    !< H5FD_FAMILY
+  INTEGER(HID_T) :: H5FD_LOG_F       !< H5FD_LOG
+  INTEGER(HID_T) :: H5FD_MPIO_F      !< H5FD_MPIO
+  INTEGER(HID_T) :: H5FD_MULTI_F     !< H5FD_MULTI
+  INTEGER(HID_T) :: H5FD_SEC2_F      !< H5FD_SEC2
+  INTEGER(HID_T) :: H5FD_STDIO_F     !< H5FD_STDIO
+  INTEGER(HID_T) :: H5FD_SUBFILING_F !< H5FD_SUBFILING
+  INTEGER(HID_T) :: H5FD_SUBFILING_DEFAULT_STRIPE_SIZE_F !< H5FD_SUBFILING_DEFAULT_STRIPE_SIZE
+
+!> @}
+  !
+  ! H5I flags declaration
+  !
+  !DEC$if defined(BUILD_HDF5_DLL)
+  !DEC$ATTRIBUTES DLLEXPORT :: H5I_FILE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5I_GROUP_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5I_DATATYPE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5I_DATASPACE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5I_DATASET_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5I_ATTR_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5I_BADID_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5I_UNINIT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5I_VFL_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5I_VOL_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5I_GENPROP_CLS_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5I_GENPROP_LST_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5I_ERROR_CLASS_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5I_ERROR_MSG_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5I_ERROR_STACK_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5I_NTYPES_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5I_INVALID_HID_F
+  !DEC$endif
+!> \addtogroup FH5I
+!> @{
+  INTEGER :: H5I_FILE_F  !< H5I_FILE
+  INTEGER :: H5I_GROUP_F  !< H5I_GROUP
+  INTEGER :: H5I_DATATYPE_F  !< H5I_DATATYPE
+  INTEGER :: H5I_DATASPACE_F  !< H5I_DATASPACE
+  INTEGER :: H5I_DATASET_F  !< H5I_DATASET
+  INTEGER :: H5I_ATTR_F  !< H5I_ATTR
+  INTEGER :: H5I_BADID_F  !< H5I_BADID
+  INTEGER :: H5I_UNINIT_F  !< H5I_UNINIT
+  INTEGER :: H5I_VFL_F  !< H5I_VFL
+  INTEGER :: H5I_VOL_F  !< H5I_VOL
+  INTEGER :: H5I_GENPROP_CLS_F  !< H5I_GENPROP_CLS
+  INTEGER :: H5I_GENPROP_LST_F  !< H5I_GENPROP_LST
+  INTEGER :: H5I_ERROR_CLASS_F  !< H5I_ERROR_CLASS
+  INTEGER :: H5I_ERROR_MSG_F  !< H5I_ERROR_MSG
+  INTEGER :: H5I_ERROR_STACK_F  !< H5I_ERROR_STACK
+  INTEGER :: H5I_NTYPES_F  !< H5I_NTYPES
+  INTEGER :: H5I_INVALID_HID_F  !< H5I_INVALID_HID
+!> @}
+
+  !
+  ! H5L flags declaration
+  !
+  !DEC$if defined(BUILD_HDF5_DLL)
+  !DEC$ATTRIBUTES DLLEXPORT :: H5L_TYPE_ERROR_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5L_TYPE_HARD_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5L_TYPE_SOFT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5L_TYPE_EXTERNAL_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5L_SAME_LOC_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5L_LINK_CLASS_T_VERS_F
+  !DEC$endif
+!> \addtogroup FH5L
+!> @{
+  INTEGER :: H5L_TYPE_ERROR_F  !< H5L_TYPE_ERROR
+  INTEGER :: H5L_TYPE_HARD_F  !< H5L_TYPE_HARD
+  INTEGER :: H5L_TYPE_SOFT_F  !< H5L_TYPE_SOFT
+  INTEGER :: H5L_TYPE_EXTERNAL_F  !< H5L_TYPE_EXTERNAL
+  INTEGER :: H5L_SAME_LOC_F  !< H5L_SAME_LOC
+  INTEGER :: H5L_LINK_CLASS_T_VERS_F  !< H5L_LINK_CLASS_T_VERS
+!> @}
+  !
+  ! H5O flags declaration
+  !
+  !DEC$if defined(BUILD_HDF5_DLL)
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_COPY_SHALLOW_HIERARCHY_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_COPY_EXPAND_SOFT_LINK_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_COPY_EXPAND_EXT_LINK_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_COPY_EXPAND_REFERENCE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_COPY_WITHOUT_ATTR_FLAG_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_COPY_PRESERVE_NULL_FLAG_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_COPY_ALL_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_SHMESG_NONE_FLAG_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_SHMESG_SDSPACE_FLAG_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_SHMESG_DTYPE_FLAG_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_SHMESG_FILL_FLAG_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_SHMESG_PLINE_FLAG_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_SHMESG_ATTR_FLAG_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_SHMESG_ALL_FLAG_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_HDR_CHUNK0_SIZE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_HDR_ATTR_CRT_ORDER_TRACK_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_HDR_ATTR_CRT_ORDER_INDEX_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_HDR_ATTR_STORE_PHASE_CHA_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_HDR_STORE_TIMES_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_HDR_ALL_FLAGS_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_SHMESG_MAX_NINDEXES_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_SHMESG_MAX_LIST_SIZE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_TYPE_UNKNOWN_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_TYPE_GROUP_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_TYPE_DATASET_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_TYPE_NAMED_DATATYPE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_TYPE_NTYPES_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_INFO_ALL_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_INFO_BASIC_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_INFO_TIME_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_INFO_NUM_ATTRS_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_INFO_HDR_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_INFO_META_SIZE_F
+  !
+  !DEC$endif
+
+!> \addtogroup FH5O
+!> @{
+!> @brief h5o_token_t_f derived type
+  TYPE, BIND(C) :: h5o_token_t_f
+     INTEGER(C_INT8_T), DIMENSION(1:H5O_TOKEN_BUF_LEN) :: token
+  END TYPE h5o_token_t_f
+
+  ! *** THESE VARIABLES DO NOT MATCH THE C VARIABLE IN ORDER TO STAY UNDER THE 31 Character Limit (F95) ***
+  INTEGER :: H5O_COPY_SHALLOW_HIERARCHY_F !< H5O_COPY_SHALLOW_HIERARCHY_FLAG
+  INTEGER :: H5O_COPY_EXPAND_SOFT_LINK_F  !< H5O_COPY_EXPAND_SOFT_LINK_FLAG
+  INTEGER :: H5O_COPY_EXPAND_EXT_LINK_F   !< H5O_COPY_EXPAND_EXT_LINK_FLAG
+  INTEGER :: H5O_COPY_EXPAND_REFERENCE_F  !< H5O_COPY_EXPAND_REFERENCE_FLAG
+  !                             ***
+  INTEGER :: H5O_COPY_WITHOUT_ATTR_FLAG_F   !< H5O_COPY_WITHOUT_ATTR_FLAG
+  INTEGER :: H5O_COPY_PRESERVE_NULL_FLAG_F  !< H5O_COPY_PRESERVE_NULL_FLAG
+  INTEGER :: H5O_COPY_ALL_F !< H5O_COPY_ALL
+  INTEGER :: H5O_SHMESG_NONE_FLAG_F  !< H5O_SHMESG_NONE_FLAG
+  INTEGER :: H5O_SHMESG_SDSPACE_FLAG_F  !< H5O_SHMESG_SDSPACE_FLAG
+  INTEGER :: H5O_SHMESG_DTYPE_FLAG_F  !< H5O_SHMESG_DTYPE_FLAG
+  INTEGER :: H5O_SHMESG_FILL_FLAG_F  !< H5O_SHMESG_FILL_FLAG
+  INTEGER :: H5O_SHMESG_PLINE_FLAG_F  !< H5O_SHMESG_PLINE_FLAG
+  INTEGER :: H5O_SHMESG_ATTR_FLAG_F  !< H5O_SHMESG_ATTR_FLAG
+  INTEGER :: H5O_SHMESG_ALL_FLAG_F  !< H5O_SHMESG_ALL_FLAG
+  INTEGER :: H5O_HDR_CHUNK0_SIZE_F  !< H5O_HDR_CHUNK0_SIZE
+  INTEGER :: H5O_HDR_ATTR_CRT_ORDER_TRACK_F ! 32 CHARACTER
+  INTEGER :: H5O_HDR_ATTR_CRT_ORDER_INDEX_F ! VARIABLE
+  INTEGER :: H5O_HDR_ATTR_STORE_PHASE_CHA_F ! LENGTH ***
+  INTEGER :: H5O_HDR_STORE_TIMES_F  !< H5O_HDR_STORE_TIMES
+  INTEGER :: H5O_HDR_ALL_FLAGS_F  !< H5O_HDR_ALL_FLAGS
+  INTEGER :: H5O_SHMESG_MAX_NINDEXES_F  !< H5O_SHMESG_MAX_NINDEXES
+  INTEGER :: H5O_SHMESG_MAX_LIST_SIZE_F  !< H5O_SHMESG_MAX_LIST_SIZE
+  INTEGER :: H5O_TYPE_UNKNOWN_F  !< H5O_TYPE_UNKNOWN
+  INTEGER :: H5O_TYPE_GROUP_F  !< H5O_TYPE_GROUP
+  INTEGER :: H5O_TYPE_DATASET_F  !< H5O_TYPE_DATASET
+  INTEGER :: H5O_TYPE_NAMED_DATATYPE_F  !< H5O_TYPE_NAMED_DATATYPE
+  INTEGER :: H5O_TYPE_NTYPES_F  !< H5O_TYPE_NTYPES
+  INTEGER :: H5O_INFO_ALL_F  !< H5O_INFO_ALL
+  INTEGER :: H5O_INFO_BASIC_F  !< H5O_INFO_BASIC
+  INTEGER :: H5O_INFO_TIME_F  !< H5O_INFO_TIME
+  INTEGER :: H5O_INFO_NUM_ATTRS_F  !< H5O_INFO_NUM_ATTRS
+  INTEGER :: H5O_INFO_HDR_F  !< H5O_INFO_HDR
+  INTEGER :: H5O_INFO_META_SIZE_F  !< H5O_INFO_META_SIZE
+!> @}
+  !
+  ! H5P flags declaration
+  !
+  !DEC$if defined(BUILD_HDF5_DLL)
+  !DEC$ATTRIBUTES DLLEXPORT :: H5P_FILE_CREATE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5P_FILE_ACCESS_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5P_DATASET_CREATE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5P_DATASET_XFER_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5P_FILE_MOUNT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5P_DEFAULT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5P_ROOT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5P_OBJECT_CREATE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5P_DATASET_ACCESS_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5P_GROUP_CREATE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5P_GROUP_ACCESS_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5P_DATATYPE_CREATE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5P_DATATYPE_ACCESS_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5P_STRING_CREATE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5P_ATTRIBUTE_CREATE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5P_OBJECT_COPY_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5P_LINK_CREATE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5P_LINK_ACCESS_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5P_CRT_ORDER_INDEXED_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5P_CRT_ORDER_TRACKED_F
+  !DEC$endif
+!> \addtogroup FH5P
+!> @{
+  INTEGER(HID_T) :: H5P_FILE_CREATE_F  !< H5P_FILE_CREATE
+  INTEGER(HID_T) :: H5P_FILE_ACCESS_F  !< H5P_FILE_ACCESS
+  INTEGER(HID_T) :: H5P_DATASET_CREATE_F  !< H5P_DATASET_CREATE
+  INTEGER(HID_T) :: H5P_DATASET_XFER_F  !< H5P_DATASET_XFER
+  INTEGER(HID_T) :: H5P_FILE_MOUNT_F  !< H5P_FILE_MOUNT
+  INTEGER(HID_T) :: H5P_DEFAULT_F  !< H5P_DEFAULT
+  INTEGER(HID_T) :: H5P_ROOT_F  !< H5P_ROOT
+  INTEGER(HID_T) :: H5P_OBJECT_CREATE_F  !< H5P_OBJECT_CREATE
+  INTEGER(HID_T) :: H5P_DATASET_ACCESS_F  !< H5P_DATASET_ACCESS
+  INTEGER(HID_T) :: H5P_GROUP_CREATE_F  !< H5P_GROUP_CREATE
+  INTEGER(HID_T) :: H5P_GROUP_ACCESS_F  !< H5P_GROUP_ACCESS
+  INTEGER(HID_T) :: H5P_DATATYPE_CREATE_F  !< H5P_DATATYPE_CREATE
+  INTEGER(HID_T) :: H5P_DATATYPE_ACCESS_F  !< H5P_DATATYPE_ACCESS
+  INTEGER(HID_T) :: H5P_STRING_CREATE_F  !< H5P_STRING_CREATE
+  INTEGER(HID_T) :: H5P_ATTRIBUTE_CREATE_F  !< H5P_ATTRIBUTE_CREATE
+  INTEGER(HID_T) :: H5P_OBJECT_COPY_F  !< H5P_OBJECT_COPY
+  INTEGER(HID_T) :: H5P_LINK_CREATE_F  !< H5P_LINK_CREATE
+  INTEGER(HID_T) :: H5P_LINK_ACCESS_F  !< H5P_LINK_ACCESS
+
+  INTEGER :: H5P_CRT_ORDER_INDEXED_F  !< H5P_CRT_ORDER_INDEXED
+  INTEGER :: H5P_CRT_ORDER_TRACKED_F  !< H5P_CRT_ORDER_TRACKED
+!> @}
+  !
+  ! H5R flags declaration
+  !
+  !DEC$if defined(BUILD_HDF5_DLL)
+  !DEC$ATTRIBUTES DLLEXPORT :: H5R_OBJECT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5R_DATASET_REGION_F
+  !DEC$endif
+!> \addtogroup FH5R
+!> @{
+  INTEGER :: H5R_OBJECT_F  !< H5R_OBJECT
+  INTEGER :: H5R_DATASET_REGION_F  !< H5R_DATASET_REGION
+!> @}
+  !
+  ! H5S flags declaration
+  !
+  !DEC$if defined(BUILD_HDF5_DLL)
+  !DEC$ATTRIBUTES DLLEXPORT :: H5S_UNLIMITED_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5S_ALL_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5S_SCALAR_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5S_SIMPLE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5S_NULL_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5S_SELECT_NOOP_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5S_SELECT_SET_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5S_SELECT_OR_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5S_SELECT_AND_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5S_SELECT_XOR_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5S_SELECT_NOTB_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5S_SELECT_NOTA_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5S_SELECT_APPEND_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5S_SELECT_PREPEND_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5S_SELECT_INVALID_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5S_SEL_ERROR_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5S_SEL_NONE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5S_SEL_POINTS_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5S_SEL_HYPERSLABS_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5S_SEL_ALL_F
+  !DEC$endif
+!> \addtogroup FH5S
+!> @{
+  INTEGER(HSIZE_T) :: H5S_UNLIMITED_F  !< H5S_UNLIMITED
+
+  INTEGER(HID_T) :: H5S_ALL_F  !< H5S_ALL
+
+  INTEGER :: H5S_SCALAR_F  !< H5S_SCALAR
+  INTEGER :: H5S_SIMPLE_F  !< H5S_SIMPLE
+  INTEGER :: H5S_NULL_F  !< H5S_NULL
+
+  INTEGER :: H5S_SELECT_NOOP_F  !< H5S_SELECT_NOOP
+  INTEGER :: H5S_SELECT_SET_F  !< H5S_SELECT_SET
+  INTEGER :: H5S_SELECT_OR_F  !< H5S_SELECT_OR
+  INTEGER :: H5S_SELECT_AND_F  !< H5S_SELECT_AND
+  INTEGER :: H5S_SELECT_XOR_F  !< H5S_SELECT_XOR
+  INTEGER :: H5S_SELECT_NOTB_F  !< H5S_SELECT_NOTB
+  INTEGER :: H5S_SELECT_NOTA_F  !< H5S_SELECT_NOTA
+  INTEGER :: H5S_SELECT_APPEND_F  !< H5S_SELECT_APPEND
+  INTEGER :: H5S_SELECT_PREPEND_F  !< H5S_SELECT_PREPEND
+  INTEGER :: H5S_SELECT_INVALID_F  !< H5S_SELECT_INVALID
+
+  INTEGER :: H5S_SEL_ERROR_F  !< H5S_SEL_ERROR
+  INTEGER :: H5S_SEL_NONE_F  !< H5S_SEL_NONE
+  INTEGER :: H5S_SEL_POINTS_F  !< H5S_SEL_POINTS
+  INTEGER :: H5S_SEL_HYPERSLABS_F  !< H5S_SEL_HYPERSLABS
+  INTEGER :: H5S_SEL_ALL_F  !< H5S_SEL_ALL
+!> @}
+  !
+  ! H5T flags declaration
+  !
+  !DEC$if defined(BUILD_HDF5_DLL)
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_NO_CLASS_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_INTEGER_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_FLOAT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_TIME_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STRING_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_BITFIELD_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_OPAQUE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_COMPOUND_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_REFERENCE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_ENUM_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_VLEN_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_ARRAY_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_ORDER_LE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_ORDER_BE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_ORDER_VAX_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_ORDER_NONE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_ORDER_MIXED_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_PAD_ZERO_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_PAD_ONE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_PAD_BACKGROUND_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_PAD_ERROR_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_SGN_NONE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_SGN_2_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_SGN_ERROR_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_NORM_IMPLIED_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_NORM_MSBSET_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_NORM_NONE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_CSET_ASCII_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_CSET_UTF8_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STR_NULLTERM_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STR_NULLPAD_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STR_SPACEPAD_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STR_ERROR_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_DIR_ASCEND_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_DIR_DESCEND_F
+  !DEC$endif
+!> \addtogroup FH5T
+!> @{
+  INTEGER :: H5T_NO_CLASS_F  !< H5T_NO_CLASS
+  INTEGER :: H5T_INTEGER_F  !< H5T_INTEGER
+  INTEGER :: H5T_FLOAT_F  !< H5T_FLOAT
+  INTEGER :: H5T_TIME_F  !< H5T_TIME
+  INTEGER :: H5T_STRING_F  !< H5T_STRING
+  INTEGER :: H5T_BITFIELD_F  !< H5T_BITFIELD
+  INTEGER :: H5T_OPAQUE_F  !< H5T_OPAQUE
+  INTEGER :: H5T_COMPOUND_F  !< H5T_COMPOUND
+  INTEGER :: H5T_REFERENCE_F  !< H5T_REFERENCE
+  INTEGER :: H5T_ENUM_F  !< H5T_ENUM
+  INTEGER :: H5T_VLEN_F  !< H5T_VLEN
+  INTEGER :: H5T_ARRAY_F  !< H5T_ARRAY
+  INTEGER :: H5T_ORDER_LE_F  !< H5T_ORDER_LE
+  INTEGER :: H5T_ORDER_BE_F  !< H5T_ORDER_BE
+  INTEGER :: H5T_ORDER_VAX_F  !< H5T_ORDER_VAX
+  INTEGER :: H5T_ORDER_NONE_F  !< H5T_ORDER_NONE
+  INTEGER :: H5T_ORDER_MIXED_F  !< H5T_ORDER_MIXED
+  INTEGER :: H5T_PAD_ZERO_F  !< H5T_PAD_ZERO
+  INTEGER :: H5T_PAD_ONE_F  !< H5T_PAD_ONE
+  INTEGER :: H5T_PAD_BACKGROUND_F  !< H5T_PAD_BACKGROUND
+  INTEGER :: H5T_PAD_ERROR_F  !< H5T_PAD_ERROR
+  INTEGER :: H5T_SGN_NONE_F  !< H5T_SGN_NONE
+  INTEGER :: H5T_SGN_2_F  !< H5T_SGN_2
+  INTEGER :: H5T_SGN_ERROR_F  !< H5T_SGN_ERROR
+  INTEGER :: H5T_NORM_IMPLIED_F  !< H5T_NORM_IMPLIED
+  INTEGER :: H5T_NORM_MSBSET_F  !< H5T_NORM_MSBSET
+  INTEGER :: H5T_NORM_NONE_F  !< H5T_NORM_NONE
+  INTEGER :: H5T_CSET_ASCII_F  !< H5T_CSET_ASCII
+  INTEGER :: H5T_CSET_UTF8_F  !< H5T_CSET_UTF8
+  INTEGER :: H5T_STR_NULLTERM_F  !< H5T_STR_NULLTERM
+  INTEGER :: H5T_STR_NULLPAD_F  !< H5T_STR_NULLPAD
+  INTEGER :: H5T_STR_SPACEPAD_F  !< H5T_STR_SPACEPAD
+  INTEGER :: H5T_STR_ERROR_F  !< H5T_STR_ERROR
+  INTEGER :: H5T_DIR_ASCEND_F  !< H5T_DIR_ASCEND
+  INTEGER :: H5T_DIR_DESCEND_F  !< H5T_DIR_DESCEND
+!> @}
+  !
+  ! H5Z flags declaration
+  !
+  !DEC$if defined(BUILD_HDF5_DLL)
+  !DEC$ATTRIBUTES DLLEXPORT :: H5Z_FILTER_ERROR_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5Z_FILTER_NONE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5Z_FILTER_ALL_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5Z_FILTER_DEFLATE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5Z_FILTER_SHUFFLE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5Z_FILTER_FLETCHER32_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5Z_FILTER_SZIP_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5Z_ERROR_EDC_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5Z_DISABLE_EDC_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5Z_ENABLE_EDC_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5Z_NO_EDC_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5Z_FLAG_OPTIONAL_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5Z_FILTER_ENCODE_ENABLED_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5Z_FILTER_DECODE_ENABLED_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5Z_FILTER_NBIT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5Z_FILTER_SCALEOFFSET_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5Z_SO_FLOAT_DSCALE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5Z_SO_FLOAT_ESCALE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5Z_SO_INT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5Z_SO_INT_MINBITS_DEFAULT_F
+  !DEC$endif
+!> \addtogroup FH5Z
+!> @{
+  INTEGER :: H5Z_FILTER_ERROR_F  !< H5Z_FILTER_ERROR
+  INTEGER :: H5Z_FILTER_NONE_F  !< H5Z_FILTER_NONE
+  INTEGER :: H5Z_FILTER_ALL_F  !< H5Z_FILTER_ALL
+  INTEGER :: H5Z_FILTER_DEFLATE_F  !< H5Z_FILTER_DEFLATE
+  INTEGER :: H5Z_FILTER_SHUFFLE_F  !< H5Z_FILTER_SHUFFLE
+  INTEGER :: H5Z_FILTER_FLETCHER32_F  !< H5Z_FILTER_FLETCHER32
+  INTEGER :: H5Z_FILTER_SZIP_F  !< H5Z_FILTER_SZIP
+  INTEGER :: H5Z_ERROR_EDC_F  !< H5Z_ERROR_EDC
+  INTEGER :: H5Z_DISABLE_EDC_F  !< H5Z_DISABLE_EDC
+  INTEGER :: H5Z_ENABLE_EDC_F  !< H5Z_ENABLE_EDC
+  INTEGER :: H5Z_NO_EDC_F  !< H5Z_NO_EDC
+  INTEGER :: H5Z_FLAG_OPTIONAL_F  !< H5Z_FLAG_OPTIONAL
+  INTEGER :: H5Z_FILTER_ENCODE_ENABLED_F  !< H5Z_FILTER_ENCODE_ENABLED
+  INTEGER :: H5Z_FILTER_DECODE_ENABLED_F  !< H5Z_FILTER_DECODE_ENABLED
+  INTEGER :: H5Z_FILTER_NBIT_F  !< H5Z_FILTER_NBIT
+  INTEGER :: H5Z_FILTER_SCALEOFFSET_F  !< H5Z_FILTER_SCALEOFFSET
+  INTEGER :: H5Z_SO_FLOAT_DSCALE_F  !< H5Z_SO_FLOAT_DSCALE
+  INTEGER :: H5Z_SO_FLOAT_ESCALE_F  !< H5Z_SO_FLOAT_ESCALE
+  INTEGER :: H5Z_SO_INT_F  !< H5Z_SO_INT
+  INTEGER :: H5Z_SO_INT_MINBITS_DEFAULT_F  !< H5Z_SO_INT_MINBITS_DEFAULT
+!> @}
+  !
+  ! H5 Library flags declaration
+  !
+  !DEC$if defined(BUILD_HDF5_DLL)
+  !DEC$ATTRIBUTES DLLEXPORT :: H5_SZIP_EC_OM_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5_SZIP_NN_OM_F
+  !DEC$endif
+!> \addtogroup FH5
+!> @{
+  INTEGER :: H5_SZIP_EC_OM_F  !< H5_SZIP_EC_OM
+  INTEGER :: H5_SZIP_NN_OM_F  !< H5_SZIP_NN_OM
+!> @}
+
+END MODULE H5GLOBAL
+
diff --git a/fortran/src/H5f90global.f90 b/fortran/src/H5f90global.f90
deleted file mode 100644
index ca50e20..0000000
--- a/fortran/src/H5f90global.f90
+++ /dev/null
@@ -1,944 +0,0 @@
-!****h* ROBODoc/H5GLOBAL
-!
-! NAME
-!  MODULE H5GLOBAL
-!
-! FILE
-!  src/fortran/H5f90global.f90
-!
-! PURPOSE
-!  This module is used to pass C stubs for H5 Fortran APIs. The C stubs are
-!  packed into arrays in H5_f.c and these arrays are then passed to Fortran.
-!  This module then uses EQUIVALENCE to assign elements of the arrays to
-!  Fortran equivalent C stubs.
-!
-! NOTES
-!  The size of the C arrays in H5_f.c has to match the values of the variables
-!  declared as PARAMETER, hence if the size of an array in H5_f.c is changed
-!  then the PARAMETER of that corresponding array in Fortran must also be changed.
-!
-! USES
-!  H5FORTRAN_TYPES 	 - This module is generated at run time. See
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! AUTHOR
-!  Elena Pourmal
-!
-!*****
-
-MODULE H5GLOBAL
-  USE H5FORTRAN_TYPES
-
-  IMPLICIT NONE
-
-  ! Definitions for reference datatypes.
-  ! If you change the value of these parameters, do not forget to change corresponding
-  ! values in the H5f90.h file.
-  INTEGER, PARAMETER :: REF_REG_BUF_LEN = 3
-
-  ! Parameters used in the function 'h5kind_to_type' located in H5_ff.f90.
-  ! The flag is used to tell the function whether the kind input variable
-  ! is for a REAL or INTEGER data type.
-
-  INTEGER, PARAMETER :: H5_REAL_KIND = 1
-  INTEGER, PARAMETER :: H5_INTEGER_KIND = 0
-
-  TYPE :: hobj_ref_t_f
-     INTEGER(HADDR_T) ref
-  END TYPE hobj_ref_t_f
-
-  TYPE :: hdset_reg_ref_t_f
-     INTEGER, DIMENSION(1:REF_REG_BUF_LEN) :: ref
-  END TYPE hdset_reg_ref_t_f
-
-  INTEGER, PARAMETER :: PREDEF_TYPES_LEN = 17 ! Do not forget to change this
-                                              ! value when new predefined
-                                              ! datatypes are added
-
-  ! Do not forget to change the following line when new predefined
-  ! floating data types are added
-  INTEGER, PARAMETER :: FLOATING_TYPES_LEN = 4
-
-  ! Do not forget to change the following line when new predefined
-  ! integer data types are added
-  INTEGER, PARAMETER :: INTEGER_TYPES_LEN = 27
-
-  INTEGER(HID_T) :: H5T_NATIVE_INTEGER_1, &
-       H5T_NATIVE_INTEGER_2, &
-       H5T_NATIVE_INTEGER_4, &
-       H5T_NATIVE_INTEGER_8, &
-       H5T_NATIVE_REAL_4, &
-       H5T_NATIVE_REAL_8, &
-       H5T_NATIVE_REAL_16, &
-       H5T_NATIVE_INTEGER, &
-       H5T_NATIVE_REAL, &
-       H5T_NATIVE_DOUBLE, &
-       H5T_NATIVE_CHARACTER , &
-       H5T_STD_REF_OBJ,      &
-       H5T_STD_REF_DSETREG, &
-       H5T_IEEE_F32BE,  &
-       H5T_IEEE_F32LE,  &
-       H5T_IEEE_F64BE,  &
-       H5T_IEEE_F64LE,  &
-       H5T_STD_I8BE,    &
-       H5T_STD_I8LE,    &
-       H5T_STD_I16BE,   &
-       H5T_STD_I16LE,   &
-       H5T_STD_I32BE,   &
-       H5T_STD_I32LE,   &
-       H5T_STD_I64BE,   &
-       H5T_STD_I64LE,   &
-       H5T_STD_U8BE,    &
-       H5T_STD_U8LE,    &
-       H5T_STD_U16BE,   &
-       H5T_STD_U16LE,   &
-       H5T_STD_U32BE
-
-! NOTE: Splitting the line since the Fortran 95 standard limits the number of 
-!       continuation lines to 39; the F03/F08 standard limits the number 
-!       to 255 lines.
-
-  INTEGER(HID_T) :: H5T_STD_U32LE,   &
-       H5T_STD_U64BE,   &
-       H5T_STD_U64LE,   &
-       H5T_STRING,      &
-       H5T_STD_B8BE,    &
-       H5T_STD_B8LE,    &
-       H5T_STD_B16BE,   &
-       H5T_STD_B16LE,   &
-       H5T_STD_B32BE,   &
-       H5T_STD_B32LE,   &
-       H5T_STD_B64BE,   &
-       H5T_STD_B64LE,   &
-       H5T_NATIVE_B8,   &
-       H5T_NATIVE_B16,  &
-       H5T_NATIVE_B32,  &
-       H5T_NATIVE_B64,  &
-       H5T_FORTRAN_S1,  &
-       H5T_C_S1
-
-
-  INTEGER(HID_T), DIMENSION(PREDEF_TYPES_LEN) :: predef_types
-  EQUIVALENCE (predef_types(1), H5T_NATIVE_INTEGER)
-  EQUIVALENCE (predef_types(2), H5T_NATIVE_REAL)
-  EQUIVALENCE (predef_types(3), H5T_NATIVE_DOUBLE)
-  EQUIVALENCE (predef_types(4), H5T_NATIVE_CHARACTER)
-  EQUIVALENCE (predef_types(5), H5T_STD_REF_OBJ)
-  EQUIVALENCE (predef_types(6), H5T_STD_REF_DSETREG)
-  EQUIVALENCE (predef_types(7), H5T_NATIVE_INTEGER_1)
-  EQUIVALENCE (predef_types(8), H5T_NATIVE_INTEGER_2)
-  EQUIVALENCE (predef_types(9), H5T_NATIVE_INTEGER_4)
-  EQUIVALENCE (predef_types(10), H5T_NATIVE_INTEGER_8)
-  EQUIVALENCE (predef_types(11), H5T_NATIVE_REAL_4)
-  EQUIVALENCE (predef_types(12), H5T_NATIVE_REAL_8)
-  EQUIVALENCE (predef_types(13), H5T_NATIVE_REAL_16)
-  EQUIVALENCE (predef_types(14), H5T_NATIVE_B8 )
-  EQUIVALENCE (predef_types(15), H5T_NATIVE_B16)
-  EQUIVALENCE (predef_types(16), H5T_NATIVE_B32)
-  EQUIVALENCE (predef_types(17), H5T_NATIVE_B64)  
-
-  INTEGER(HID_T), DIMENSION(FLOATING_TYPES_LEN) :: floating_types
-  EQUIVALENCE (floating_types(1), H5T_IEEE_F32BE )
-  EQUIVALENCE (floating_types(2), H5T_IEEE_F32LE)
-  EQUIVALENCE (floating_types(3), H5T_IEEE_F64BE)
-  EQUIVALENCE (floating_types(4), H5T_IEEE_F64LE)
-
-  INTEGER(HID_T), DIMENSION(INTEGER_TYPES_LEN) :: integer_types
-  EQUIVALENCE (integer_types(1), H5T_STD_I8BE )
-  EQUIVALENCE (integer_types(2), H5T_STD_I8LE)
-  EQUIVALENCE (integer_types(3), H5T_STD_I16BE)
-  EQUIVALENCE (integer_types(4), H5T_STD_I16LE)
-  EQUIVALENCE (integer_types(5), H5T_STD_I32BE)
-  EQUIVALENCE (integer_types(6), H5T_STD_I32LE)
-  EQUIVALENCE (integer_types(7), H5T_STD_I64BE)
-  EQUIVALENCE (integer_types(8), H5T_STD_I64LE)
-  EQUIVALENCE (integer_types(9), H5T_STD_U8BE)
-  EQUIVALENCE (integer_types(10), H5T_STD_U8LE)
-  EQUIVALENCE (integer_types(11), H5T_STD_U16BE)
-  EQUIVALENCE (integer_types(12), H5T_STD_U16LE)
-  EQUIVALENCE (integer_types(13), H5T_STD_U32BE)
-  EQUIVALENCE (integer_types(14), H5T_STD_U32LE)
-  EQUIVALENCE (integer_types(15), H5T_STD_U64BE)
-  EQUIVALENCE (integer_types(16), H5T_STD_U64LE)
-  EQUIVALENCE (integer_types(17), H5T_STRING)
-  EQUIVALENCE (integer_types(18), H5T_STD_B8BE)
-  EQUIVALENCE (integer_types(19), H5T_STD_B8LE)
-  EQUIVALENCE (integer_types(20), H5T_STD_B16BE)
-  EQUIVALENCE (integer_types(21), H5T_STD_B16LE)
-  EQUIVALENCE (integer_types(22), H5T_STD_B32BE)
-  EQUIVALENCE (integer_types(23), H5T_STD_B32LE)
-  EQUIVALENCE (integer_types(24), H5T_STD_B64BE)
-  EQUIVALENCE (integer_types(25), H5T_STD_B64LE)
-  EQUIVALENCE (integer_types(26), H5T_FORTRAN_S1)
-  EQUIVALENCE (integer_types(27), H5T_C_S1)
-
-
-  !      COMMON /PREDEFINED_TYPES/ H5T_NATIVE_INTEGER, &
-  !                                H5T_NATIVE_REAL, &
-  !                                H5T_NATIVE_DOUBLE, &
-  !                                H5T_NATIVE_CHARACTER, &
-  !                                H5T_STD_REF_OBJ, &
-  !                                H5T_STD_REF_DSETREG
-  !DEC$if defined(BUILD_HDF5_DLL)
-  !DEC$ATTRIBUTES DLLEXPORT :: /PREDEFINED_TYPES/
-  !DEC$endif
-  COMMON /PREDEFINED_TYPES/  predef_types
-
-  !      COMMON /FLOATING_TYPES/ H5T_IEEE_F32BE,  &
-  !                              H5T_IEEE_F32LE,  &
-  !                              H5T_IEEE_F64BE,  &
-  !                              H5T_IEEE_F64LE
-  !DEC$if defined(BUILD_HDF5_DLL)
-  !DEC$ATTRIBUTES DLLEXPORT :: /FLOATING_TYPES/
-  !DEC$endif
-  COMMON /FLOATING_TYPES/ floating_types
-  !
-  !      COMMON /INTEGER_TYPES/ H5T_STD_I8BE,  &
-  !                             H5T_STD_I8LE,    &
-  !                             H5T_STD_I16BE,   &
-  !                             H5T_STD_I16LE,   &
-  !                             H5T_STD_I32BE,   &
-  !                             H5T_STD_I32LE,   &
-  !                             H5T_STD_I64BE,   &
-  !                             H5T_STD_I64LE,   &
-  !                             H5T_STD_U8BE,    &
-  !                             H5T_STD_U8LE,    &
-  !                             H5T_STD_U16BE,   &
-  !                             H5T_STD_U16LE,   &
-  !                             H5T_STD_U32BE,   &
-  !                             H5T_STD_U32LE,   &
-  !                             H5T_STD_U64BE,   &
-  !                             H5T_STD_U64LE
-  !DEC$if defined(BUILD_HDF5_DLL)
-  !DEC$ATTRIBUTES DLLEXPORT :: /INTEGER_TYPES/
-  !DEC$endif
-  COMMON /INTEGER_TYPES/ integer_types
-  !
-  ! Fortran flags
-  !
-  !
-  ! H5F flags (DO NOT FORGET TO UPDATE WHEN NEW FLAGS ARE ADDED !)
-  !
-  ! H5F flags declaration
-  !
-  INTEGER, PARAMETER :: H5F_FLAGS_LEN = 19
-  INTEGER :: H5F_flags(H5F_FLAGS_LEN)
-  !DEC$if defined(BUILD_HDF5_DLL)
-  !DEC$ATTRIBUTES DLLEXPORT :: /H5F_FLAGS/
-  !DEC$endif
-  COMMON /H5F_FLAGS/ H5F_flags
-
-  INTEGER :: H5F_ACC_RDWR_F
-  INTEGER :: H5F_ACC_RDONLY_F
-  INTEGER :: H5F_ACC_TRUNC_F
-  INTEGER :: H5F_ACC_EXCL_F
-  INTEGER :: H5F_ACC_DEBUG_F
-  INTEGER :: H5F_SCOPE_LOCAL_F
-  INTEGER :: H5F_SCOPE_GLOBAL_F
-  INTEGER :: H5F_CLOSE_DEFAULT_F
-  INTEGER :: H5F_CLOSE_WEAK_F
-  INTEGER :: H5F_CLOSE_SEMI_F
-  INTEGER :: H5F_CLOSE_STRONG_F
-  INTEGER :: H5F_OBJ_FILE_F
-  INTEGER :: H5F_OBJ_DATASET_F
-  INTEGER :: H5F_OBJ_GROUP_F
-  INTEGER :: H5F_OBJ_DATATYPE_F
-  INTEGER :: H5F_OBJ_ALL_F
-  INTEGER :: H5F_LIBVER_EARLIEST_F
-  INTEGER :: H5F_LIBVER_LATEST_F
-  INTEGER :: H5F_UNLIMITED_F
-
-  EQUIVALENCE(H5F_flags(1), H5F_ACC_RDWR_F)
-  EQUIVALENCE(H5F_flags(2), H5F_ACC_RDONLY_F)
-  EQUIVALENCE(H5F_flags(3), H5F_ACC_TRUNC_F)
-  EQUIVALENCE(H5F_flags(4), H5F_ACC_EXCL_F)
-  EQUIVALENCE(H5F_flags(5), H5F_ACC_DEBUG_F)
-  EQUIVALENCE(H5F_flags(6), H5F_SCOPE_LOCAL_F)
-  EQUIVALENCE(H5F_flags(7), H5F_SCOPE_GLOBAL_F)
-  EQUIVALENCE(H5F_flags(8), H5F_CLOSE_DEFAULT_F)
-  EQUIVALENCE(H5F_flags(9), H5F_CLOSE_WEAK_F)
-  EQUIVALENCE(H5F_flags(10), H5F_CLOSE_SEMI_F)
-  EQUIVALENCE(H5F_flags(11), H5F_CLOSE_STRONG_F)
-  EQUIVALENCE(H5F_flags(12), H5F_OBJ_FILE_F)
-  EQUIVALENCE(H5F_flags(13), H5F_OBJ_DATASET_F)
-  EQUIVALENCE(H5F_flags(14), H5F_OBJ_GROUP_F)
-  EQUIVALENCE(H5F_flags(15), H5F_OBJ_DATATYPE_F)
-  EQUIVALENCE(H5F_flags(16), H5F_OBJ_ALL_F)
-  EQUIVALENCE(H5F_flags(17), H5F_LIBVER_EARLIEST_F)
-  EQUIVALENCE(H5F_flags(18), H5F_LIBVER_LATEST_F)
-  EQUIVALENCE(H5F_flags(19), H5F_UNLIMITED_F)
-  !
-  ! H5generic flags declaration
-  !
-  INTEGER, PARAMETER :: H5generic_FLAGS_LEN = 9
-  INTEGER :: H5generic_flags(H5generic_FLAGS_LEN)
-  !DEC$if defined(BUILD_HDF5_DLL)
-  !DEC$ATTRIBUTES DLLEXPORT :: /H5generic_FLAGS/
-  !DEC$endif
-  COMMON /H5generic_FLAGS/ H5generic_flags
-
-  INTEGER :: H5_INDEX_UNKNOWN_F
-  INTEGER :: H5_INDEX_NAME_F
-  INTEGER :: H5_INDEX_CRT_ORDER_F
-  INTEGER :: H5_INDEX_N_F
-  INTEGER :: H5_ITER_UNKNOWN_F
-  INTEGER :: H5_ITER_INC_F
-  INTEGER :: H5_ITER_DEC_F
-  INTEGER :: H5_ITER_NATIVE_F
-  INTEGER :: H5_ITER_N_F
-
-  EQUIVALENCE(H5generic_flags(1), H5_INDEX_UNKNOWN_F)
-  EQUIVALENCE(H5generic_flags(2), H5_INDEX_NAME_F)
-  EQUIVALENCE(H5generic_flags(3), H5_INDEX_CRT_ORDER_F)
-  EQUIVALENCE(H5generic_flags(4), H5_INDEX_N_F)
-  EQUIVALENCE(H5generic_flags(5), H5_ITER_UNKNOWN_F)
-  EQUIVALENCE(H5generic_flags(6), H5_ITER_INC_F)
-  EQUIVALENCE(H5generic_flags(7), H5_ITER_DEC_F)
-  EQUIVALENCE(H5generic_flags(8), H5_ITER_NATIVE_F)
-  EQUIVALENCE(H5generic_flags(9), H5_ITER_N_F)
-  !
-  ! H5G flags declaration
-  !
-  INTEGER, PARAMETER :: H5G_FLAGS_LEN = 12
-  INTEGER :: H5G_flags(H5G_FLAGS_LEN)
-  !DEC$if defined(BUILD_HDF5_DLL)
-  !DEC$ATTRIBUTES DLLEXPORT :: /H5G_FLAGS/
-  !DEC$endif
-  COMMON /H5G_FLAGS/ H5G_flags
-
-  INTEGER :: H5G_UNKNOWN_F
-  INTEGER :: H5G_GROUP_F
-  INTEGER :: H5G_DATASET_F
-  INTEGER :: H5G_TYPE_F
-  INTEGER :: H5G_LINK_F
-  INTEGER :: H5G_UDLINK_F
-  INTEGER :: H5G_SAME_LOC_F
-  INTEGER :: H5G_LINK_ERROR_F
-  INTEGER :: H5G_LINK_HARD_F
-  INTEGER :: H5G_LINK_SOFT_F
-  INTEGER :: H5G_STORAGE_TYPE_UNKNOWN_F
-  INTEGER :: H5G_STORAGE_TYPE_SYMBOL_TABLE_F
-  INTEGER :: H5G_STORAGE_TYPE_COMPACT_F
-  INTEGER :: H5G_STORAGE_TYPE_DENSE_F
-
-  EQUIVALENCE(H5G_flags(1), H5G_UNKNOWN_F) ! Unknown object type
-  EQUIVALENCE(H5G_flags(2), H5G_GROUP_F)   ! Object is a group
-  EQUIVALENCE(H5G_flags(3), H5G_DATASET_F) ! Object is a dataset
-  EQUIVALENCE(H5G_flags(4), H5G_TYPE_F)    ! Object is a named data type
-  EQUIVALENCE(H5G_flags(5), H5G_SAME_LOC_F)
-  EQUIVALENCE(H5G_flags(6), H5G_LINK_ERROR_F)
-  EQUIVALENCE(H5G_flags(7), H5G_LINK_HARD_F)
-  EQUIVALENCE(H5G_flags(8), H5G_LINK_SOFT_F)
-
-  EQUIVALENCE(H5G_flags(9), H5G_STORAGE_TYPE_UNKNOWN_F )
-  EQUIVALENCE(H5G_flags(10), H5G_STORAGE_TYPE_SYMBOL_TABLE_F)
-  EQUIVALENCE(H5G_flags(11), H5G_STORAGE_TYPE_COMPACT_F)
-  EQUIVALENCE(H5G_flags(12), H5G_STORAGE_TYPE_DENSE_F)
-  !
-  ! H5D flags declaration
-  !
-
-  INTEGER, PARAMETER :: H5D_FLAGS_LEN = 25
-  INTEGER :: H5D_flags(H5D_FLAGS_LEN)
-  INTEGER, PARAMETER :: H5D_SIZE_FLAGS_LEN = 2
-  INTEGER(SIZE_T) :: H5D_size_flags(H5D_SIZE_FLAGS_LEN)
-  !DEC$if defined(BUILD_HDF5_DLL)
-  !DEC$ATTRIBUTES DLLEXPORT :: /H5D_FLAGS/
-  !DEC$ATTRIBUTES DLLEXPORT :: /H5D_SIZE_FLAGS/
-  !DEC$endif
-  COMMON /H5D_FLAGS/ H5D_flags
-  COMMON /H5D_SIZE_FLAGS/ H5D_size_flags
-
-  INTEGER :: H5D_COMPACT_F
-  INTEGER :: H5D_CONTIGUOUS_F
-  INTEGER :: H5D_CHUNKED_F
-
-  INTEGER :: H5D_ALLOC_TIME_ERROR_F
-  INTEGER :: H5D_ALLOC_TIME_DEFAULT_F
-  INTEGER :: H5D_ALLOC_TIME_EARLY_F
-  INTEGER :: H5D_ALLOC_TIME_LATE_F
-  INTEGER :: H5D_ALLOC_TIME_INCR_F
-
-  INTEGER :: H5D_SPACE_STS_ERROR_F
-  INTEGER :: H5D_SPACE_STS_NOT_ALLOCATED_F
-  INTEGER :: H5D_SPACE_STS_PART_ALLOCATED_F
-  INTEGER :: H5D_SPACE_STS_ALLOCATED_F
-
-  INTEGER :: H5D_FILL_TIME_ERROR_F
-  INTEGER :: H5D_FILL_TIME_ALLOC_F
-  INTEGER :: H5D_FILL_TIME_NEVER_F
-
-  INTEGER :: H5D_FILL_VALUE_ERROR_F
-  INTEGER :: H5D_FILL_VALUE_UNDEFINED_F
-  INTEGER :: H5D_FILL_VALUE_DEFAULT_F
-  INTEGER :: H5D_FILL_VALUE_USER_DEFINED_F
-
-! shortened "_DEFAULT" to "_DFLT" to satisfy the limit of 31
-! characters for variable names in Fortran.
-! shortened "_CONTIGUOUS" to "_CONTIG" to satisfy the limit of 31
-! characters for variable names in Fortran.
-
-  INTEGER(SIZE_T) :: H5D_CHUNK_CACHE_NSLOTS_DFLT_F
-  INTEGER(SIZE_T) :: H5D_CHUNK_CACHE_NBYTES_DFLT_F
-  INTEGER :: H5D_CHUNK_CACHE_W0_DFLT_F
-  INTEGER :: H5D_MPIO_NO_COLLECTIVE_F
-  INTEGER :: H5D_MPIO_CHUNK_INDEPENDENT_F
-  INTEGER :: H5D_MPIO_CHUNK_COLLECTIVE_F
-  INTEGER :: H5D_MPIO_CHUNK_MIXED_F
-  INTEGER :: H5D_MPIO_CONTIG_COLLECTIVE_F
-
-  EQUIVALENCE(H5D_flags(1), H5D_COMPACT_F)
-  EQUIVALENCE(H5D_flags(2), H5D_CONTIGUOUS_F)
-  EQUIVALENCE(H5D_flags(3), H5D_CHUNKED_F)
-
-  EQUIVALENCE(H5D_flags(4), H5D_ALLOC_TIME_ERROR_F)
-  EQUIVALENCE(H5D_flags(5), H5D_ALLOC_TIME_DEFAULT_F)
-  EQUIVALENCE(H5D_flags(6), H5D_ALLOC_TIME_EARLY_F)
-  EQUIVALENCE(H5D_flags(7), H5D_ALLOC_TIME_LATE_F)
-  EQUIVALENCE(H5D_flags(8), H5D_ALLOC_TIME_INCR_F)
-
-  EQUIVALENCE(H5D_flags(9), H5D_SPACE_STS_ERROR_F)
-  EQUIVALENCE(H5D_flags(10), H5D_SPACE_STS_NOT_ALLOCATED_F)
-  EQUIVALENCE(H5D_flags(11), H5D_SPACE_STS_PART_ALLOCATED_F)
-  EQUIVALENCE(H5D_flags(12), H5D_SPACE_STS_ALLOCATED_F)
-
-  EQUIVALENCE(H5D_flags(13), H5D_FILL_TIME_ERROR_F)
-  EQUIVALENCE(H5D_flags(14), H5D_FILL_TIME_ALLOC_F)
-  EQUIVALENCE(H5D_flags(15), H5D_FILL_TIME_NEVER_F)
-
-  EQUIVALENCE(H5D_flags(16), H5D_FILL_VALUE_ERROR_F)
-  EQUIVALENCE(H5D_flags(17), H5D_FILL_VALUE_UNDEFINED_F)
-  EQUIVALENCE(H5D_flags(18), H5D_FILL_VALUE_DEFAULT_F)
-  EQUIVALENCE(H5D_flags(19), H5D_FILL_VALUE_USER_DEFINED_F)
-
-  EQUIVALENCE(H5D_flags(20), H5D_CHUNK_CACHE_W0_DFLT_F)
-  EQUIVALENCE(H5D_flags(21), H5D_MPIO_NO_COLLECTIVE_F)
-  EQUIVALENCE(H5D_flags(22), H5D_MPIO_CHUNK_INDEPENDENT_F)
-  EQUIVALENCE(H5D_flags(23), H5D_MPIO_CHUNK_COLLECTIVE_F)
-  EQUIVALENCE(H5D_flags(24), H5D_MPIO_CHUNK_MIXED_F)
-  EQUIVALENCE(H5D_flags(25), H5D_MPIO_CONTIG_COLLECTIVE_F)
-
-  EQUIVALENCE(H5D_size_flags(1), H5D_CHUNK_CACHE_NSLOTS_DFLT_F)
-  EQUIVALENCE(H5D_size_flags(2), H5D_CHUNK_CACHE_NBYTES_DFLT_F)
-
-  !
-  ! H5E flags declaration
-  !
-  INTEGER, PARAMETER :: H5E_FLAGS_LEN = 4
-  INTEGER :: H5E_flags(H5E_FLAGS_LEN)
-  INTEGER, PARAMETER :: H5E_HID_FLAGS_LEN = 1
-  INTEGER(HID_T) :: H5E_hid_flags(H5E_HID_FLAGS_LEN)
-  !DEC$if defined(BUILD_HDF5_DLL)
-  !DEC$ATTRIBUTES DLLEXPORT :: /H5E_FLAGS/
-  !DEC$ATTRIBUTES DLLEXPORT :: /H5E_HID_FLAGS/
-  !DEC$endif
-  COMMON /H5E_FLAGS/ H5E_flags
-  COMMON /H5E_HID_FLAGS/ H5E_hid_flags
-
-  INTEGER(HID_T) :: H5E_DEFAULT_F
-  INTEGER :: H5E_MAJOR_F
-  INTEGER :: H5E_MINOR_F
-  INTEGER :: H5E_WALK_UPWARD_F
-  INTEGER :: H5E_WALK_DOWNWARD_F
-
-  EQUIVALENCE(H5E_hid_flags(1), H5E_DEFAULT_F)
-  EQUIVALENCE(H5E_flags(1)    , H5E_MAJOR_F)
-  EQUIVALENCE(H5E_flags(2)    , H5E_MINOR_F)
-  EQUIVALENCE(H5E_flags(3)    , H5E_WALK_UPWARD_F)
-  EQUIVALENCE(H5E_flags(4)    , H5E_WALK_DOWNWARD_F)
-
-  !
-  ! H5FD flags declaration
-  !
-  INTEGER, PARAMETER :: H5FD_FLAGS_LEN = 11
-  INTEGER :: H5FD_flags(H5FD_FLAGS_LEN)
-  !DEC$if defined(BUILD_HDF5_DLL)
-  !DEC$ATTRIBUTES DLLEXPORT :: /H5FD_FLAGS/
-  !DEC$endif
-  COMMON /H5FD_FLAGS/ H5FD_flags
-
-  INTEGER :: H5FD_MPIO_INDEPENDENT_F
-  INTEGER :: H5FD_MPIO_COLLECTIVE_F
-  INTEGER :: H5FD_MEM_NOLIST_F
-  INTEGER :: H5FD_MEM_DEFAULT_F
-  INTEGER :: H5FD_MEM_SUPER_F
-  INTEGER :: H5FD_MEM_BTREE_F
-  INTEGER :: H5FD_MEM_DRAW_F
-  INTEGER :: H5FD_MEM_GHEAP_F
-  INTEGER :: H5FD_MEM_LHEAP_F
-  INTEGER :: H5FD_MEM_OHDR_F
-  INTEGER :: H5FD_MEM_NTYPES_F
-
-  EQUIVALENCE(H5FD_flags(1), H5FD_MPIO_INDEPENDENT_F)
-  EQUIVALENCE(H5FD_flags(2), H5FD_MPIO_COLLECTIVE_F)
-  EQUIVALENCE(H5FD_flags(3), H5FD_MEM_NOLIST_F)
-  EQUIVALENCE(H5FD_flags(4), H5FD_MEM_DEFAULT_F)
-  EQUIVALENCE(H5FD_flags(5), H5FD_MEM_SUPER_F)
-  EQUIVALENCE(H5FD_flags(6), H5FD_MEM_BTREE_F)
-  EQUIVALENCE(H5FD_flags(7), H5FD_MEM_DRAW_F)
-  EQUIVALENCE(H5FD_flags(8), H5FD_MEM_GHEAP_F)
-  EQUIVALENCE(H5FD_flags(9), H5FD_MEM_LHEAP_F)
-  EQUIVALENCE(H5FD_flags(10), H5FD_MEM_OHDR_F)
-  EQUIVALENCE(H5FD_flags(11), H5FD_MEM_NTYPES_F)
-  !
-  ! H5FD file drivers flags declaration
-  !
-  INTEGER, PARAMETER :: H5FD_HID_FLAGS_LEN = 7
-  INTEGER(HID_T) :: H5FD_hid_flags(H5FD_HID_FLAGS_LEN)
-  !DEC$if defined(BUILD_HDF5_DLL)
-  !DEC$ATTRIBUTES DLLEXPORT :: /H5FD_HID_FLAGS/
-  !DEC$endif
-  COMMON /H5FD_HID_FLAGS/ H5FD_hid_flags
-
-  INTEGER(HID_T) :: H5FD_CORE_F
-  INTEGER(HID_T) :: H5FD_FAMILY_F
-  INTEGER(HID_T) :: H5FD_LOG_F
-  INTEGER(HID_T) :: H5FD_MPIO_F
-  INTEGER(HID_T) :: H5FD_MULTI_F
-  INTEGER(HID_T) :: H5FD_SEC2_F
-  INTEGER(HID_T) :: H5FD_STDIO_F
-
-  EQUIVALENCE(H5FD_hid_flags(1), H5FD_CORE_F)
-  EQUIVALENCE(H5FD_hid_flags(2), H5FD_FAMILY_F)
-  EQUIVALENCE(H5FD_hid_flags(3), H5FD_LOG_F)
-  EQUIVALENCE(H5FD_hid_flags(4), H5FD_MPIO_F)
-  EQUIVALENCE(H5FD_hid_flags(5), H5FD_MULTI_F)
-  EQUIVALENCE(H5FD_hid_flags(6), H5FD_SEC2_F)
-  EQUIVALENCE(H5FD_hid_flags(7), H5FD_STDIO_F)
-
-  !
-  ! H5I flags declaration
-  !
-  INTEGER, PARAMETER :: H5I_FLAGS_LEN = 7
-  INTEGER :: H5I_flags(H5I_FLAGS_LEN)
-  !DEC$if defined(BUILD_HDF5_DLL)
-  !DEC$ATTRIBUTES DLLEXPORT :: /H5I_FLAGS/
-  !DEC$endif
-  COMMON /H5I_FLAGS/ H5I_flags
-
-  INTEGER ::  H5I_FILE_F
-  INTEGER ::  H5I_GROUP_F
-  INTEGER ::  H5I_DATATYPE_F
-  INTEGER ::  H5I_DATASPACE_F
-  INTEGER ::  H5I_DATASET_F
-  INTEGER ::  H5I_ATTR_F
-  INTEGER ::  H5I_BADID_F
-
-  EQUIVALENCE(H5I_flags(1), H5I_FILE_F)
-  EQUIVALENCE(H5I_flags(2), H5I_GROUP_F)
-  EQUIVALENCE(H5I_flags(3), H5I_DATATYPE_F)
-  EQUIVALENCE(H5I_flags(4), H5I_DATASPACE_F)
-  EQUIVALENCE(H5I_flags(5), H5I_DATASET_F)
-  EQUIVALENCE(H5I_flags(6), H5I_ATTR_F)
-  EQUIVALENCE(H5I_flags(7), H5I_BADID_F)
-  !
-  ! H5L flags declaration
-  !
-  INTEGER, PARAMETER :: H5L_FLAGS_LEN = 6
-  INTEGER :: H5L_flags(H5L_FLAGS_LEN)
-
-  INTEGER :: H5L_TYPE_ERROR_F
-  INTEGER :: H5L_TYPE_HARD_F
-  INTEGER :: H5L_TYPE_SOFT_F
-  INTEGER :: H5L_TYPE_EXTERNAL_F
-  INTEGER :: H5L_SAME_LOC_F
-  INTEGER :: H5L_LINK_CLASS_T_VERS_F
-
-  !DEC$if defined(BUILD_HDF5_DLL)
-  !DEC$ATTRIBUTES DLLEXPORT :: /H5L_FLAGS/
-  !DEC$endif
-  COMMON /H5L_FLAGS/ H5L_flags
-
-  EQUIVALENCE(H5L_flags(1), H5L_TYPE_ERROR_F)
-  EQUIVALENCE(H5L_flags(2), H5L_TYPE_HARD_F)
-  EQUIVALENCE(H5L_flags(3), H5L_TYPE_SOFT_F)
-  EQUIVALENCE(H5L_flags(4), H5L_TYPE_EXTERNAL_F)
-  EQUIVALENCE(H5L_flags(5), H5L_SAME_LOC_F)
-  EQUIVALENCE(H5L_flags(6), H5L_LINK_CLASS_T_VERS_F)
-  !
-  ! H5O flags declaration
-  !
-  INTEGER, PARAMETER :: H5O_FLAGS_LEN = 27
-  INTEGER :: H5o_flags(H5O_FLAGS_LEN)
-  !DEC$if defined(BUILD_HDF5_DLL)
-  !DEC$ATTRIBUTES DLLEXPORT :: /H5O_FLAGS/
-  !DEC$endif
-  COMMON /H5O_FLAGS/ H5O_flags
-
-  INTEGER :: H5O_COPY_SHALLOW_HIERARCHY_F ! *** THESE VARIABLES DO
-  INTEGER :: H5O_COPY_EXPAND_SOFT_LINK_F  ! NOT MATCH THE C VARIABLE
-  INTEGER :: H5O_COPY_EXPAND_EXT_LINK_F   ! IN ORDER
-  INTEGER :: H5O_COPY_EXPAND_REFERENCE_F  ! TO STAY UNDER THE
-  INTEGER :: H5O_COPY_WITHOUT_ATTR_FLAG_F
-  INTEGER :: H5O_COPY_PRESERVE_NULL_FLAG_F
-  INTEGER :: H5O_COPY_ALL_F
-  INTEGER :: H5O_SHMESG_NONE_FLAG_F
-  INTEGER :: H5O_SHMESG_SDSPACE_FLAG_F
-  INTEGER :: H5O_SHMESG_DTYPE_FLAG_F
-  INTEGER :: H5O_SHMESG_FILL_FLAG_F
-  INTEGER :: H5O_SHMESG_PLINE_FLAG_F
-  INTEGER :: H5O_SHMESG_ATTR_FLAG_F
-  INTEGER :: H5O_SHMESG_ALL_FLAG_F
-  INTEGER :: H5O_HDR_CHUNK0_SIZE_F
-  INTEGER :: H5O_HDR_ATTR_CRT_ORDER_TRACK_F ! 32 CHARACTER
-  INTEGER :: H5O_HDR_ATTR_CRT_ORDER_INDEX_F ! VARIABLE
-  INTEGER :: H5O_HDR_ATTR_STORE_PHASE_CHA_F ! LENGTH ***
-  INTEGER :: H5O_HDR_STORE_TIMES_F
-  INTEGER :: H5O_HDR_ALL_FLAGS_F
-  INTEGER :: H5O_SHMESG_MAX_NINDEXES_F
-  INTEGER :: H5O_SHMESG_MAX_LIST_SIZE_F
-  INTEGER :: H5O_TYPE_UNKNOWN_F
-  INTEGER :: H5O_TYPE_GROUP_F
-  INTEGER :: H5O_TYPE_DATASET_F
-  INTEGER :: H5O_TYPE_NAMED_DATATYPE_F
-  INTEGER :: H5O_TYPE_NTYPES_F
-
-  EQUIVALENCE(h5o_flags(1) , H5O_COPY_SHALLOW_HIERARCHY_F)
-  EQUIVALENCE(h5o_flags(2) , H5O_COPY_EXPAND_SOFT_LINK_F)
-  EQUIVALENCE(h5o_flags(3) , H5O_COPY_EXPAND_EXT_LINK_F)
-  EQUIVALENCE(h5o_flags(4) , H5O_COPY_EXPAND_REFERENCE_F)
-  EQUIVALENCE(h5o_flags(5) , H5O_COPY_WITHOUT_ATTR_FLAG_F)
-  EQUIVALENCE(h5o_flags(6) , H5O_COPY_PRESERVE_NULL_FLAG_F)
-  EQUIVALENCE(h5o_flags(7) , H5O_COPY_ALL_F)
-  EQUIVALENCE(h5o_flags(8) , H5O_SHMESG_NONE_FLAG_F)
-  EQUIVALENCE(h5o_flags(9) , H5O_SHMESG_SDSPACE_FLAG_F)
-  EQUIVALENCE(h5o_flags(10) , H5O_SHMESG_DTYPE_FLAG_F)
-  EQUIVALENCE(h5o_flags(11) , H5O_SHMESG_FILL_FLAG_F)
-  EQUIVALENCE(h5o_flags(12) , H5O_SHMESG_PLINE_FLAG_F)
-  EQUIVALENCE(h5o_flags(13) , H5O_SHMESG_ATTR_FLAG_F)
-  EQUIVALENCE(h5o_flags(14) , H5O_SHMESG_ALL_FLAG_F)
-  EQUIVALENCE(h5o_flags(15) , H5O_HDR_CHUNK0_SIZE_F)
-  EQUIVALENCE(h5o_flags(16) , H5O_HDR_ATTR_CRT_ORDER_TRACK_F)
-  EQUIVALENCE(h5o_flags(17) , H5O_HDR_ATTR_CRT_ORDER_INDEX_F)
-  EQUIVALENCE(h5o_flags(18) , H5O_HDR_ATTR_STORE_PHASE_CHA_F)
-  EQUIVALENCE(h5o_flags(19) , H5O_HDR_STORE_TIMES_F)
-  EQUIVALENCE(h5o_flags(20) , H5O_HDR_ALL_FLAGS_F)
-  EQUIVALENCE(h5o_flags(21) , H5O_SHMESG_MAX_NINDEXES_F)
-  EQUIVALENCE(h5o_flags(22) , H5O_SHMESG_MAX_LIST_SIZE_F)
-  EQUIVALENCE(h5o_flags(23) , H5O_TYPE_UNKNOWN_F)
-  EQUIVALENCE(h5o_flags(24) , H5O_TYPE_GROUP_F)
-  EQUIVALENCE(h5o_flags(25) , H5O_TYPE_DATASET_F)
-  EQUIVALENCE(h5o_flags(26) , H5O_TYPE_NAMED_DATATYPE_F)
-  EQUIVALENCE(h5o_flags(27) , H5O_TYPE_NTYPES_F)
-
-  !
-  ! H5P flags declaration
-  !
-  INTEGER, PARAMETER :: H5P_FLAGS_LEN = 18
-  INTEGER(HID_T) H5P_flags(H5P_FLAGS_LEN)
-  !DEC$if defined(BUILD_HDF5_DLL)
-  !DEC$ATTRIBUTES DLLEXPORT :: /H5P_FLAGS/
-  !DEC$endif
-  COMMON /H5P_FLAGS/ H5P_flags
-
-  INTEGER(HID_T) :: H5P_FILE_CREATE_F
-  INTEGER(HID_T) :: H5P_FILE_ACCESS_F
-  INTEGER(HID_T) :: H5P_DATASET_CREATE_F
-  INTEGER(HID_T) :: H5P_DATASET_XFER_F
-  INTEGER(HID_T) :: H5P_FILE_MOUNT_F
-  INTEGER(HID_T) :: H5P_DEFAULT_F
-  INTEGER(HID_T) :: H5P_ROOT_F
-  INTEGER(HID_T) :: H5P_OBJECT_CREATE_F
-  INTEGER(HID_T) :: H5P_DATASET_ACCESS_F
-  INTEGER(HID_T) :: H5P_GROUP_CREATE_F
-  INTEGER(HID_T) :: H5P_GROUP_ACCESS_F
-  INTEGER(HID_T) :: H5P_DATATYPE_CREATE_F
-  INTEGER(HID_T) :: H5P_DATATYPE_ACCESS_F
-  INTEGER(HID_T) :: H5P_STRING_CREATE_F
-  INTEGER(HID_T) :: H5P_ATTRIBUTE_CREATE_F
-  INTEGER(HID_T) :: H5P_OBJECT_COPY_F
-  INTEGER(HID_T) :: H5P_LINK_CREATE_F
-  INTEGER(HID_T) :: H5P_LINK_ACCESS_F
-
-  EQUIVALENCE(H5P_flags(1), H5P_FILE_CREATE_F)
-  EQUIVALENCE(H5P_flags(2), H5P_FILE_ACCESS_F)
-  EQUIVALENCE(H5P_flags(3), H5P_DATASET_CREATE_F)
-  EQUIVALENCE(H5P_flags(4), H5P_DATASET_XFER_F)
-  EQUIVALENCE(H5P_flags(5), H5P_FILE_MOUNT_F)
-  EQUIVALENCE(H5P_flags(6), H5P_DEFAULT_F)
-  EQUIVALENCE(H5P_flags(7), H5P_ROOT_F)
-  EQUIVALENCE(H5P_flags(8), H5P_OBJECT_CREATE_F)
-  EQUIVALENCE(H5P_flags(9), H5P_DATASET_ACCESS_F)
-  EQUIVALENCE(H5P_flags(10), H5P_GROUP_CREATE_F)
-  EQUIVALENCE(H5P_flags(11), H5P_GROUP_ACCESS_F)
-  EQUIVALENCE(H5P_flags(12), H5P_DATATYPE_CREATE_F)
-  EQUIVALENCE(H5P_flags(13), H5P_DATATYPE_ACCESS_F)
-  EQUIVALENCE(H5P_flags(14), H5P_STRING_CREATE_F)
-  EQUIVALENCE(H5P_flags(15), H5P_ATTRIBUTE_CREATE_F)
-  EQUIVALENCE(H5P_flags(16), H5P_OBJECT_COPY_F)
-  EQUIVALENCE(H5P_flags(17), H5P_LINK_CREATE_F)
-  EQUIVALENCE(H5P_flags(18), H5P_LINK_ACCESS_F)
-
-  !
-  ! H5P integers flags declaration
-  !
-  INTEGER, PARAMETER :: H5P_FLAGS_INT_LEN = 2
-  INTEGER :: H5P_flags_int(H5P_FLAGS_INT_LEN)
-  !DEC$if defined(BUILD_HDF5_DLL)
-  !DEC$ATTRIBUTES DLLEXPORT :: /H5P_FLAGS_INT/
-  !DEC$endif
-  COMMON /H5P_FLAGS_INT/ H5P_flags_int
-  INTEGER :: H5P_CRT_ORDER_INDEXED_F
-  INTEGER :: H5P_CRT_ORDER_TRACKED_F
-  EQUIVALENCE(H5P_flags_int(1), H5P_CRT_ORDER_INDEXED_F)
-  EQUIVALENCE(H5P_flags_int(2), H5P_CRT_ORDER_TRACKED_F)
-  !
-  ! H5R flags declaration
-  !
-  INTEGER, PARAMETER :: H5R_FLAGS_LEN = 2
-  INTEGER :: H5R_flags(H5R_FLAGS_LEN)
-  !DEC$if defined(BUILD_HDF5_DLL)
-  !DEC$ATTRIBUTES DLLEXPORT :: /H5R_FLAGS/
-  !DEC$endif
-  COMMON /H5R_FLAGS/ H5R_flags
-
-  INTEGER :: H5R_OBJECT_F
-  INTEGER :: H5R_DATASET_REGION_F
-
-  EQUIVALENCE(H5R_flags(1), H5R_OBJECT_F)
-  EQUIVALENCE(H5R_flags(2), H5R_DATASET_REGION_F)
-
-  !
-  ! H5S flags declaration
-  !
-  INTEGER, PARAMETER :: H5S_FLAGS_LEN = 19
-  INTEGER :: H5S_flags(H5S_FLAGS_LEN)
-  INTEGER, PARAMETER :: H5S_HSIZE_FLAGS_LEN = 1
-  INTEGER(HSIZE_T) H5S_hsize_flags(H5S_HSIZE_FLAGS_LEN)
-  !DEC$if defined(BUILD_HDF5_DLL)
-  !DEC$ATTRIBUTES DLLEXPORT :: /H5S_FLAGS/
-  !DEC$ATTRIBUTES DLLEXPORT :: /H5S_HSIZE_FLAGS/
-  !DEC$endif
-  COMMON /H5S_FLAGS/ H5S_flags
-  COMMON /H5S_HSIZE_FLAGS/ H5S_hsize_flags
-
-  INTEGER(HSIZE_T) :: H5S_UNLIMITED_F
-
-  INTEGER :: H5S_SCALAR_F
-  INTEGER :: H5S_SIMPLE_F
-  INTEGER :: H5S_NULL_F
-
-  INTEGER :: H5S_ALL_F
-
-  INTEGER :: H5S_SELECT_NOOP_F
-  INTEGER :: H5S_SELECT_SET_F
-  INTEGER :: H5S_SELECT_OR_F
-  INTEGER :: H5S_SELECT_AND_F
-  INTEGER :: H5S_SELECT_XOR_F
-  INTEGER :: H5S_SELECT_NOTB_F
-  INTEGER :: H5S_SELECT_NOTA_F
-  INTEGER :: H5S_SELECT_APPEND_F
-  INTEGER :: H5S_SELECT_PREPEND_F
-  INTEGER :: H5S_SELECT_INVALID_F
-
-  INTEGER :: H5S_SEL_ERROR_F
-  INTEGER :: H5S_SEL_NONE_F
-  INTEGER :: H5S_SEL_POINTS_F
-  INTEGER :: H5S_SEL_HYPERSLABS_F
-  INTEGER :: H5S_SEL_ALL_F
-
-  EQUIVALENCE(H5S_hsize_flags(1), H5S_UNLIMITED_F)
-  EQUIVALENCE(H5S_flags(1), H5S_SCALAR_F)
-  EQUIVALENCE(H5S_flags(2), H5S_SIMPLE_F)
-  EQUIVALENCE(H5S_flags(3), H5S_NULL_F)
-  EQUIVALENCE(H5S_flags(4), H5S_SELECT_SET_F)
-  EQUIVALENCE(H5S_flags(5), H5S_SELECT_OR_F)
-  EQUIVALENCE(H5S_flags(6), H5S_ALL_F)
-
-  EQUIVALENCE(H5S_flags(7), H5S_SELECT_NOOP_F)
-  EQUIVALENCE(H5S_flags(8), H5S_SELECT_AND_F)
-  EQUIVALENCE(H5S_flags(9), H5S_SELECT_XOR_F)
-  EQUIVALENCE(H5S_flags(10), H5S_SELECT_NOTB_F)
-  EQUIVALENCE(H5S_flags(11), H5S_SELECT_NOTA_F)
-  EQUIVALENCE(H5S_flags(12), H5S_SELECT_APPEND_F)
-  EQUIVALENCE(H5S_flags(13), H5S_SELECT_PREPEND_F)
-  EQUIVALENCE(H5S_flags(14), H5S_SELECT_INVALID_F)
-
-
-  EQUIVALENCE(H5S_flags(15), H5S_SEL_ERROR_F)
-  EQUIVALENCE(H5S_flags(16), H5S_SEL_NONE_F)
-  EQUIVALENCE(H5S_flags(17), H5S_SEL_POINTS_F)
-  EQUIVALENCE(H5S_flags(18), H5S_SEL_HYPERSLABS_F)
-  EQUIVALENCE(H5S_flags(19), H5S_SEL_ALL_F)
-
-  !
-  ! H5T flags declaration
-  !
-  INTEGER, PARAMETER :: H5T_FLAGS_LEN = 35
-  INTEGER :: H5T_flags(H5T_FLAGS_LEN)
-  !DEC$if defined(BUILD_HDF5_DLL)
-  !DEC$ATTRIBUTES DLLEXPORT :: /H5T_FLAGS/
-  !DEC$endif
-  COMMON /H5T_FLAGS/ H5T_flags
-
-  INTEGER :: H5T_NO_CLASS_F
-  INTEGER :: H5T_INTEGER_F
-  INTEGER :: H5T_FLOAT_F
-  INTEGER :: H5T_TIME_F
-  INTEGER :: H5T_STRING_F
-  INTEGER :: H5T_BITFIELD_F
-  INTEGER :: H5T_OPAQUE_F
-  INTEGER :: H5T_COMPOUND_F
-  INTEGER :: H5T_REFERENCE_F
-  INTEGER :: H5T_ENUM_F
-  INTEGER :: H5T_VLEN_F
-  INTEGER :: H5T_ARRAY_F
-  INTEGER :: H5T_ORDER_LE_F
-  INTEGER :: H5T_ORDER_BE_F
-  INTEGER :: H5T_ORDER_VAX_F
-  INTEGER :: H5T_ORDER_NONE_F
-  INTEGER :: H5T_ORDER_MIXED_F
-  INTEGER :: H5T_PAD_ZERO_F
-  INTEGER :: H5T_PAD_ONE_F
-  INTEGER :: H5T_PAD_BACKGROUND_F
-  INTEGER :: H5T_PAD_ERROR_F
-  INTEGER :: H5T_SGN_NONE_F
-  INTEGER :: H5T_SGN_2_F
-  INTEGER :: H5T_SGN_ERROR_F
-  INTEGER :: H5T_NORM_IMPLIED_F
-  INTEGER :: H5T_NORM_MSBSET_F
-  INTEGER :: H5T_NORM_NONE_F
-  INTEGER :: H5T_CSET_ASCII_F
-  INTEGER :: H5T_CSET_UTF8_F
-  INTEGER :: H5T_STR_NULLTERM_F
-  INTEGER :: H5T_STR_NULLPAD_F
-  INTEGER :: H5T_STR_SPACEPAD_F
-  INTEGER :: H5T_STR_ERROR_F
-  INTEGER :: H5T_DIR_ASCEND_F
-  INTEGER :: H5T_DIR_DESCEND_F
-
-  EQUIVALENCE(H5T_flags(1), H5T_NO_CLASS_F)
-  EQUIVALENCE(H5T_flags(2), H5T_INTEGER_F)
-  EQUIVALENCE(H5T_flags(3), H5T_FLOAT_F)
-  EQUIVALENCE(H5T_flags(4), H5T_TIME_F)
-  EQUIVALENCE(H5T_flags(5), H5T_STRING_F)
-  EQUIVALENCE(H5T_flags(6), H5T_BITFIELD_F)
-  EQUIVALENCE(H5T_flags(7), H5T_OPAQUE_F)
-  EQUIVALENCE(H5T_flags(8), H5T_COMPOUND_F)
-  EQUIVALENCE(H5T_flags(9), H5T_REFERENCE_F)
-  EQUIVALENCE(H5T_flags(10), H5T_ENUM_F)
-  EQUIVALENCE(H5T_flags(11), H5T_ORDER_LE_F)
-  EQUIVALENCE(H5T_flags(12), H5T_ORDER_BE_F)
-  EQUIVALENCE(H5T_flags(13), H5T_ORDER_MIXED_F)
-  EQUIVALENCE(H5T_flags(14), H5T_ORDER_VAX_F)
-  EQUIVALENCE(H5T_flags(15), H5T_ORDER_NONE_F)
-  EQUIVALENCE(H5T_flags(16), H5T_PAD_ZERO_F)
-  EQUIVALENCE(H5T_flags(17), H5T_PAD_ONE_F)
-  EQUIVALENCE(H5T_flags(18), H5T_PAD_BACKGROUND_F)
-  EQUIVALENCE(H5T_flags(19), H5T_PAD_ERROR_F)
-  EQUIVALENCE(H5T_flags(20), H5T_SGN_NONE_F)
-  EQUIVALENCE(H5T_flags(21), H5T_SGN_2_F)
-  EQUIVALENCE(H5T_flags(22), H5T_SGN_ERROR_F)
-  EQUIVALENCE(H5T_flags(23), H5T_NORM_IMPLIED_F)
-  EQUIVALENCE(H5T_flags(24), H5T_NORM_MSBSET_F)
-  EQUIVALENCE(H5T_flags(25), H5T_NORM_NONE_F)
-  EQUIVALENCE(H5T_flags(26), H5T_CSET_ASCII_F)
-  EQUIVALENCE(H5T_flags(27), H5T_CSET_UTF8_F)
-  EQUIVALENCE(H5T_flags(28), H5T_STR_NULLTERM_F)
-  EQUIVALENCE(H5T_flags(29), H5T_STR_NULLPAD_F)
-  EQUIVALENCE(H5T_flags(30), H5T_STR_SPACEPAD_F)
-  EQUIVALENCE(H5T_flags(31), H5T_STR_ERROR_F)
-  EQUIVALENCE(H5T_flags(32), H5T_VLEN_F)
-  EQUIVALENCE(H5T_flags(33), H5T_ARRAY_F)
-  EQUIVALENCE(H5T_flags(34), H5T_DIR_ASCEND_F)
-  EQUIVALENCE(H5T_flags(35), H5T_DIR_DESCEND_F)
-  !
-  ! H5Z flags declaration
-  !
-  INTEGER, PARAMETER :: H5Z_FLAGS_LEN = 20
-  INTEGER :: H5Z_flags(H5Z_FLAGS_LEN)
-  !DEC$if defined(BUILD_HDF5_DLL)
-  !DEC$ATTRIBUTES DLLEXPORT :: /H5Z_FLAGS/
-  !DEC$endif
-  COMMON /H5Z_FLAGS/ H5Z_flags
-
-  INTEGER :: H5Z_FILTER_ERROR_F
-  INTEGER :: H5Z_FILTER_NONE_F
-  INTEGER :: H5Z_FILTER_ALL_F
-  INTEGER :: H5Z_FILTER_DEFLATE_F
-  INTEGER :: H5Z_FILTER_SHUFFLE_F
-  INTEGER :: H5Z_FILTER_FLETCHER32_F
-  INTEGER :: H5Z_FILTER_SZIP_F
-  INTEGER :: H5Z_ERROR_EDC_F
-  INTEGER :: H5Z_DISABLE_EDC_F
-  INTEGER :: H5Z_ENABLE_EDC_F
-  INTEGER :: H5Z_NO_EDC_F
-  INTEGER :: H5Z_FLAG_OPTIONAL_F
-  INTEGER :: H5Z_FILTER_ENCODE_ENABLED_F
-  INTEGER :: H5Z_FILTER_DECODE_ENABLED_F
-  INTEGER :: H5Z_FILTER_NBIT_F
-  INTEGER :: H5Z_FILTER_SCALEOFFSET_F
-  INTEGER :: H5Z_SO_FLOAT_DSCALE_F
-  INTEGER :: H5Z_SO_FLOAT_ESCALE_F
-  INTEGER :: H5Z_SO_INT_F
-  INTEGER :: H5Z_SO_INT_MINBITS_DEFAULT_F
-
-  EQUIVALENCE(H5Z_flags(1), H5Z_FILTER_ERROR_F)
-  EQUIVALENCE(H5Z_flags(2), H5Z_FILTER_NONE_F)
-  EQUIVALENCE(H5Z_flags(3), H5Z_FILTER_DEFLATE_F)
-  EQUIVALENCE(H5Z_flags(4), H5Z_FILTER_SHUFFLE_F)
-  EQUIVALENCE(H5Z_flags(5), H5Z_FILTER_FLETCHER32_F)
-  EQUIVALENCE(H5Z_flags(6), H5Z_ERROR_EDC_F)
-  EQUIVALENCE(H5Z_flags(7), H5Z_DISABLE_EDC_F)
-  EQUIVALENCE(H5Z_flags(8), H5Z_ENABLE_EDC_F)
-  EQUIVALENCE(H5Z_flags(9), H5Z_NO_EDC_F)
-  EQUIVALENCE(H5Z_flags(10), H5Z_FILTER_SZIP_F)
-  EQUIVALENCE(H5Z_flags(11), H5Z_FLAG_OPTIONAL_F)
-  EQUIVALENCE(H5Z_flags(12), H5Z_FILTER_ENCODE_ENABLED_F)
-  EQUIVALENCE(H5Z_flags(13), H5Z_FILTER_DECODE_ENABLED_F)
-  EQUIVALENCE(H5Z_flags(14), H5Z_FILTER_ALL_F)
-  EQUIVALENCE(H5Z_flags(15), H5Z_FILTER_NBIT_F)
-  EQUIVALENCE(H5Z_flags(16), H5Z_FILTER_SCALEOFFSET_F)
-  EQUIVALENCE(H5Z_flags(17), H5Z_SO_FLOAT_DSCALE_F)
-  EQUIVALENCE(H5Z_flags(18), H5Z_SO_FLOAT_ESCALE_F)
-  EQUIVALENCE(H5Z_flags(19), H5Z_SO_INT_F)
-  EQUIVALENCE(H5Z_flags(20), H5Z_SO_INT_MINBITS_DEFAULT_F)
-
-  !
-  ! H5 Library flags declaration
-  !
-  INTEGER, PARAMETER :: H5LIB_FLAGS_LEN =  2
-  INTEGER :: H5LIB_flags(H5LIB_FLAGS_LEN)
-  !DEC$if defined(BUILD_HDF5_DLL)
-  !DEC$ATTRIBUTES DLLEXPORT :: /H5LIB_FLAGS/
-  !DEC$endif
-  COMMON /H5LIB_FLAGS/ H5LIB_flags
-  INTEGER :: H5_SZIP_EC_OM_F
-  INTEGER :: H5_SZIP_NN_OM_F
-  !
-  EQUIVALENCE(H5LIB_flags(1), H5_SZIP_EC_OM_F)
-  EQUIVALENCE(H5LIB_flags(2), H5_SZIP_NN_OM_F)
-
-
-  ! General H5 flags declarations
-  !
-!!$      INTEGER, PARAMETER :: H5_FLAGS_LEN = 2
-!!$      INTEGER H5_flags(H5_FLAGS_LEN)
-!!$!DEC$if defined(BUILD_HDF5_DLL)
-!!$!DEC$ATTRIBUTES DLLEXPORT :: /H5_FLAGS/
-!!$!DEC$endif
-!!$      COMMON /H5_FLAGS/ H5_flags
-!!$
-!!$      INTEGER :: _F
-!!$      INTEGER :: H5F_SCOPE_LOCAL_F
-!!$
-!!$      EQUIVALENCE(H5F_flags(1), H5F_SCOPE_GLOBAL_F)
-!!$      EQUIVALENCE(H5F_flags(2), H5F_SCOPE_LOCAL_F)
-
-END MODULE H5GLOBAL
-
diff --git a/fortran/src/H5f90i.h b/fortran/src/H5f90i.h
index f3c0160..9f7433a 100644
--- a/fortran/src/H5f90i.h
+++ b/fortran/src/H5f90i.h
@@ -1,21 +1,17 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-
-#ifndef _H5f90i_H
-#define _H5f90i_H
+#ifndef H5f90i_H
+#define H5f90i_H
 
 /*
  * Include generated header.  This header defines integer types,
@@ -23,12 +19,11 @@
  */
 #include "H5f90i_gen.h"
 
-/* Define _fcd.  These are the same on every system
- * but UNICOS.
+/* Define _fcd.  These are the same on every system but UNICOS.
  */
 #define _fcdtocp(desc) (desc)
 
-#if (defined (UNICOS) || defined (_UNICOS)) && !defined(__crayx1)
+#if (defined(UNICOS) || defined(_UNICOS)) && !defined(__crayx1)
 
 #include <fortran.h>
 
@@ -36,8 +31,8 @@
 
 #else
 
-typedef char              *_fcd;
+typedef char *_fcd;
 
 #endif
 
-#endif /* _H5f90i_H */
+#endif /* H5f90i_H */
diff --git a/fortran/src/H5f90kit.c b/fortran/src/H5f90kit.c
index 0bc721f..dc2fa19 100644
--- a/fortran/src/H5f90kit.c
+++ b/fortran/src/H5f90kit.c
@@ -1,6 +1,6 @@
 /****h* H5f90kit/H5f90kit
  * PURPOSE
- *   Routines from HDF4 to deal with C-FORTRAN issues:
+ *  Routines from HDF4 to deal with C-FORTRAN issues:
  *
  *   HD5f2cstring   -- convert a Fortran string to a C string
  *   HD5packFstring -- convert a C string into a Fortran string
@@ -8,21 +8,18 @@
  * COPYRIGHT
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  ******
-*/
+ */
 
 #include <ctype.h>
 #include <stddef.h>
@@ -31,33 +28,33 @@
 /****if* H5f90kit/HDf2cstring
  * NAME
  *   HD5f2cstring -- convert a Fortran string to a C string
- *   char * HDf2cstring(fdesc, len)
+ *  char * HDf2cstring(fdesc, len)
  * INPUTS
  *   _fcd  fdesc;    IN: Fortran string descriptor
- *   int  len;       IN: length of Fortran string
+ *  int  len;       IN: length of Fortran string
  * RETURNS
- *   Pointer to the C string if success, else NULL
+ *  Pointer to the C string if success, else NULL
  * PURPOSE
- *   Chop off trailing blanks off of a Fortran string and
- *   move it into a newly allocated C string.  It is up
- *   to the user to free this string.
+ *  Chop off trailing blanks off of a Fortran string and
+ *  move it into a newly allocated C string.  It is up
+ *  to the user to free this string.
  * SOURCE
  */
 char *
 HD5f2cstring(_fcd fdesc, size_t len)
 /******/
 {
-    char       *cstr;   /* C string to return */
-    char       *str;    /* Pointer to FORTRAN string */
-    int         i;      /* Local index variable */
+    char *cstr; /* C string to return */
+    char *str;  /* Pointer to FORTRAN string */
+    int   i;    /* Local index variable */
 
     /* Search for the end of the string */
     str = _fcdtocp(fdesc);
-    for(i = (int)len - 1; i >= 0 && HDisspace((int)str[i]) && str[i] == ' '; i--)
+    for (i = (int)len - 1; i >= 0 && HDisspace((int)str[i]) && str[i] == ' '; i--)
         /*EMPTY*/;
 
     /* Allocate C string */
-    if(NULL == (cstr = (char *)HDmalloc((size_t)(i + 2))))
+    if (NULL == (cstr = (char *)HDmalloc((size_t)(i + 2))))
         return NULL;
 
     /* Copy text from FORTRAN to C string */
@@ -67,41 +64,40 @@ HD5f2cstring(_fcd fdesc, size_t len)
     cstr[i + 1] = '\0';
 
     return cstr;
-}   /* HD5f2cstring */
+} /* HD5f2cstring */
 
 /****if* H5f90kit/HD5packFstring
  * NAME
  *   HD5packFstring -- convert a C string into a Fortran string
- *   int HD5packFstring(src, dest, len)
+ *  int HD5packFstring(src, dest, len)
  * INPUTS
- *   char * src;         IN:  source string
- *   int   len;          IN:  length of string
+ *  char * src;         IN:  source string
+ *  int   len;          IN:  length of string
  * OUTPUTS
- *   char * dest;       OUT: destination
+ *  char * dest;       OUT: destination
  * RETURNS
  *   SUCCEED / FAIL
  * PURPOSE
- *   given a NULL terminated C string 'src' convert it to
- *   a space padded Fortran string 'dest' of length 'len'
+ *  given a NULL terminated C string 'src' convert it to
+ *  a space padded Fortran string 'dest' of length 'len'
  *
- *   This is very similar to HDc2fstr except that function does
- *   it in place and this one copies.  We should probably only
- *   support one of these.
+ *  This is very similar to HDc2fstr except that function does
+ *  it in place and this one copies.  We should probably only
+ *  support one of these.
  * SOURCE
  */
 void
 HD5packFstring(char *src, char *dest, size_t dst_len)
 /******/
 {
-    size_t src_len=HDstrlen(src);
+    size_t src_len = HDstrlen(src);
 
     /* Copy over the string information, up to the length of the src */
     /* (Don't copy the NUL terminator from the C string to the FORTRAN string */
-    HDmemcpy(dest,src,MIN(src_len,dst_len));
+    HDmemcpy(dest, src, MIN(src_len, dst_len));
 
     /* Pad out any remaining space in the FORTRAN string with ' 's */
-    if(src_len<dst_len)
-        HDmemset(&dest[src_len],' ',dst_len-src_len);
-
-}   /* HD5packFstring */
+    if (src_len < dst_len)
+        HDmemset(&dest[src_len], ' ', dst_len - src_len);
 
+} /* HD5packFstring */
diff --git a/fortran/src/H5f90proto.h b/fortran/src/H5f90proto.h
index 6bde877..f2a8419 100644
--- a/fortran/src/H5f90proto.h
+++ b/fortran/src/H5f90proto.h
@@ -1,1319 +1,643 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-
-#ifndef _H5f90proto_H
-#define _H5f90proto_H
+#ifndef H5f90proto_H
+#define H5f90proto_H
 
 #include "H5public.h"
+#include "H5f90.h"
 
-H5_FCDLL char * HD5f2cstring (_fcd fdesc, size_t len);
-H5_FCDLL void HD5packFstring(char *src, char *dest, size_t len);
-
-#ifdef H5_VMS
-#define H5_FC_FUNC_(name, NAME) NAME
-#endif /*H5_VMS*/
+H5_FCDLL char *HD5f2cstring(_fcd fdesc, size_t len);
+H5_FCDLL void  HD5packFstring(char *src, char *dest, size_t len);
 
 /*
- * Storage info struct used by H5O_info_t and H5F_info_t 
+ * Storage info struct used by H5O_info_t and H5F_info_t
  * interoperable with Fortran.
  */
 typedef struct H5_ih_info_t_f {
-    hsize_t     index_size;     /* btree and/or list */
-    hsize_t     heap_size;
+    hsize_t index_size; /* btree and/or list */
+    hsize_t heap_size;
 } H5_ih_info_t_f;
 
-/* Information struct for object header metadata (for H5Oget_info/H5Oget_info_by_name/H5Oget_info_by_idx) 
+/* Information struct for object header metadata (for H5Oget_info/H5Oget_info_by_name/H5Oget_info_by_idx)
  *  interoperable with Fortran.
  */
 typedef struct H5O_hdr_info_t_f {
-    int_f version;		/* Version number of header format in file */
-    int_f nmesgs;		/* Number of object header messages */
-    int_f nchunks;		/* Number of object header chunks */
-    int_f flags;                /* Object header status flags */
+    int_f version; /* Version number of header format in file */
+    int_f nmesgs;  /* Number of object header messages */
+    int_f nchunks; /* Number of object header chunks */
+    int_f flags;   /* Object header status flags */
     struct {
-        hsize_t total;		/* Total space for storing object header in file */
-        hsize_t meta;		/* Space within header for object header metadata information */
-        hsize_t mesg;		/* Space within header for actual message information */
-        hsize_t free;		/* Free space within object header */
+        hsize_t total; /* Total space for storing object header in file */
+        hsize_t meta;  /* Space within header for object header metadata information */
+        hsize_t mesg;  /* Space within header for actual message information */
+        hsize_t free;  /* Free space within object header */
     } space;
     struct {
-        uint64_t present;	/* Flags to indicate presence of message type in header */
-        uint64_t shared;	/* Flags to indicate message type is shared in header */
+        uint64_t present; /* Flags to indicate presence of message type in header */
+        uint64_t shared;  /* Flags to indicate message type is shared in header */
     } mesg;
 } H5O_hdr_info_t_f;
 
-/* Information struct for object (for H5Oget_info/H5Oget_info_by_name/H5Oget_info_by_idx) 
- *  interoperable with Fortran.
+/* Information struct for object (for H5Oget_info/H5Oget_info_by_name/H5Oget_info_by_idx)
  */
 typedef struct H5O_info_t_f {
-    unsigned long 	fileno;		/* File number that object is located in */
-    haddr_t_f 		addr;		/* Object address in file	*/
-    int 		type;		/* Basic object type (group, dataset, etc.) */
-    int_f 		rc;		/* Reference count of object    */
-    int_f	        atime[8];	/* Access time			*/
-    int_f		mtime[8];	/* Modification time		*/
-    int_f		ctime[8];	/* Change time			*/
-    int_f		btime[8];	/* Birth time			*/
-    hsize_t 		num_attrs;	/* # of attributes attached to object */
-    H5O_hdr_info_t_f    hdr;            /* Object header information */
+    unsigned long fileno;    /* File number that object is located in */
+    H5O_token_t   token;     /* Token of object in file	*/
+    int           type;      /* Basic object type (group, dataset, etc.) */
+    int_f         rc;        /* Reference count of object    */
+    int_f         atime[8];  /* Access time			*/
+    int_f         mtime[8];  /* Modification time		*/
+    int_f         ctime[8];  /* Change time			*/
+    int_f         btime[8];  /* Birth time			*/
+    hsize_t       num_attrs; /* # of attributes attached to object */
+} H5O_info_t_f;
+
+/* Information struct for native object (for
+ * H5Oget_native_info/H5Oget_native_info_by_name/H5Oget_native_info_by_idx)
+ */
+typedef struct H5O_native_info_t_f {
+    H5O_hdr_info_t_f hdr; /* Object header information */
     /* Extra metadata storage for obj & attributes */
     struct {
-        H5_ih_info_t_f   obj;             /* v1/v2 B-tree & local/fractal heap for groups, B-tree for chunked datasets */
-        H5_ih_info_t_f   attr;            /* v2 B-tree & heap for attributes */
+        H5_ih_info_t_f obj;  /* v1/v2 B-tree & local/fractal heap for groups, B-tree for chunked datasets */
+        H5_ih_info_t_f attr; /* v2 B-tree & heap for attributes */
     } meta_size;
-} H5O_info_t_f;
-
+} H5O_native_info_t_f;
 
 /*
  *  Functions from H5Ff.c
  */
-#define nh5fcreate_c              H5_FC_FUNC_(h5fcreate_c, H5FCREATE_C)
-#define nh5fflush_c               H5_FC_FUNC_(h5fflush_c, H5FFLUSH_C)
-#define nh5fclose_c               H5_FC_FUNC_(h5fclose_c, H5FCLOSE_C)
-#define nh5fopen_c                H5_FC_FUNC_(h5fopen_c, H5FOPEN_C)
-#define nh5fis_hdf5_c             H5_FC_FUNC_(h5fis_hdf5_c, H5FIS_HDF5_C)
-#define nh5fmount_c               H5_FC_FUNC_(h5fmount_c, H5FMOUNT_C)
-#define nh5funmount_c             H5_FC_FUNC_(h5funmount_c, H5FUNMOUNT_C)
-#define nh5freopen_c              H5_FC_FUNC_(h5freopen_c, H5FREOPEN_C)
-#define nh5fget_create_plist_c    H5_FC_FUNC_(h5fget_create_plist_c, H5FGET_CREATE_PLIST_C)
-#define nh5fget_access_plist_c    H5_FC_FUNC_(h5fget_access_plist_c, H5FGET_ACCESS_PLIST_C)
-#define nh5fget_obj_count_c       H5_FC_FUNC_(h5fget_obj_count_c, H5FGET_OBJ_COUNT_C)
-#define nh5fget_obj_ids_c         H5_FC_FUNC_(h5fget_obj_ids_c, H5FGET_OBJ_IDS_C)
-#define nh5fget_freespace_c       H5_FC_FUNC_(h5fget_freespace_c, H5FGET_FREESPACE_C)
-#define nh5fget_name_c            H5_FC_FUNC_(h5fget_name_c, H5FGET_NAME_C)
-#define nh5fget_filesize_c        H5_FC_FUNC_(h5fget_filesize_c, H5FGET_FILESIZE_C)
-
-H5_FCDLL int_f nh5fcreate_c (_fcd name, int_f *namelen, int_f *access_flags, hid_t_f *crt_prp, hid_t_f *acc_prp, hid_t_f *file_id);
-H5_FCDLL int_f nh5fopen_c (_fcd name, int_f *namelen, int_f *access_flags, hid_t_f *acc_prp, hid_t_f *file_id);
-H5_FCDLL int_f nh5fis_hdf5_c (_fcd name, int_f *namelen, int_f *flag);
-H5_FCDLL int_f nh5fclose_c (hid_t_f *file_id);
-H5_FCDLL int_f nh5fmount_c (hid_t_f *loc_id, _fcd dsetname, int_f *namelen, hid_t_f *file_id, hid_t_f *acc_prp);
-H5_FCDLL int_f nh5funmount_c (hid_t_f *loc_id, _fcd dsetname, int_f *namelen);
-H5_FCDLL int_f nh5freopen_c (hid_t_f *file_id1, hid_t_f *file_id2);
-H5_FCDLL int_f nh5fget_create_plist_c (hid_t_f *file_id, hid_t_f *prop_id);
-H5_FCDLL int_f nh5fget_access_plist_c (hid_t_f *file_id, hid_t_f *access_id);
-H5_FCDLL int_f nh5fget_obj_count_c (hid_t_f *file_id, int_f *obj_type, size_t_f *obj_count);
-H5_FCDLL int_f nh5fget_obj_ids_c (hid_t_f *file_id, int_f *obj_type, size_t_f *max_objs, hid_t_f *obj_ids, size_t_f *num_objs);
-H5_FCDLL int_f nh5fget_freespace_c (hid_t_f *file_id, hssize_t_f *free_space);
+H5_FCDLL int_f h5fcreate_c(_fcd name, int_f *namelen, int_f *access_flags, hid_t_f *crt_prp, hid_t_f *acc_prp,
+                           hid_t_f *file_id);
+H5_FCDLL int_f h5fopen_c(_fcd name, int_f *namelen, int_f *access_flags, hid_t_f *acc_prp, hid_t_f *file_id);
+H5_FCDLL int_f h5fclose_c(hid_t_f *file_id);
+H5_FCDLL int_f h5fmount_c(hid_t_f *loc_id, _fcd dsetname, int_f *namelen, hid_t_f *file_id, hid_t_f *acc_prp);
+H5_FCDLL int_f h5funmount_c(hid_t_f *loc_id, _fcd dsetname, int_f *namelen);
+H5_FCDLL int_f h5freopen_c(hid_t_f *file_id1, hid_t_f *file_id2);
+H5_FCDLL int_f h5fget_create_plist_c(hid_t_f *file_id, hid_t_f *prop_id);
+H5_FCDLL int_f h5fget_access_plist_c(hid_t_f *file_id, hid_t_f *access_id);
+H5_FCDLL int_f h5fget_obj_count_c(hid_t_f *file_id, int_f *obj_type, size_t_f *obj_count);
+H5_FCDLL int_f h5fget_obj_ids_c(hid_t_f *file_id, int_f *obj_type, size_t_f *max_objs, hid_t_f *obj_ids,
+                                size_t_f *num_objs);
+H5_FCDLL int_f h5fget_freespace_c(hid_t_f *file_id, hssize_t_f *free_space);
 H5_FCDLL int_f h5fget_file_image_c(hid_t_f *file_id, void *buf_ptr, size_t_f *buf_len, size_t_f *buf_req);
-H5_FCDLL int_f nh5fflush_c (hid_t_f *obj_id, int_f *scope);
-H5_FCDLL int_f nh5fget_name_c(hid_t_f *obj_id, size_t_f *size, _fcd buf, size_t_f *buflen);
-H5_FCDLL int_f nh5fget_filesize_c(hid_t_f *file_id, hsize_t_f *size);
+H5_FCDLL int_f h5fflush_c(hid_t_f *obj_id, int_f *scope);
+H5_FCDLL int_f h5fget_name_c(hid_t_f *obj_id, size_t_f *size, _fcd buf, size_t_f *buflen);
+H5_FCDLL int_f h5fget_filesize_c(hid_t_f *file_id, hsize_t_f *size);
+H5_FCDLL int_f h5fget_fileno_c(hid_t_f *file_id, int_f *fileno);
 
 /*
  * Functions from H5Sf.c
  */
-#define nh5screate_simple_c      H5_FC_FUNC_(h5screate_simple_c, H5SCREATE_SIMPLE_C)
-#define nh5sclose_c              H5_FC_FUNC_(h5sclose_c, H5SCLOSE_C)
-#define nh5screate_c             H5_FC_FUNC_(h5screate_c, H5SCREATE_C)
-#define nh5scopy_c               H5_FC_FUNC_(h5scopy_c, H5SCOPY_C)
-#define nh5sget_select_hyper_nblocks_c H5_FC_FUNC_(h5sget_select_hyper_nblocks_c, H5SGET_SELECT_HYPER_NBLOCKS_C)
-#define nh5sget_select_hyper_blocklist_c H5_FC_FUNC_(h5sget_select_hyper_blocklist_c, H5SGET_SELECT_HYPER_BLOCKLIST_C)
-#define nh5sget_select_elem_npoints_c H5_FC_FUNC_(h5sget_select_elem_npoints_c, H5SGET_SELECT_ELEM_NPOINTS_C)
-#define nh5sget_select_elem_pointlist_c H5_FC_FUNC_(h5sget_select_elem_pointlist_c, H5SGET_SELECT_ELEM_POINTLIST_C)
-#define nh5sget_select_bounds_c  H5_FC_FUNC_(h5sget_select_bounds_c, H5SGET_SELECT_BOUNDS_C)
-#define nh5sselect_all_c         H5_FC_FUNC_(h5sselect_all_c, H5SSELECT_ALL_C)
-#define nh5sselect_none_c        H5_FC_FUNC_(h5sselect_none_c, H5SSELECT_NONE_C)
-#define nh5sselect_valid_c       H5_FC_FUNC_(h5sselect_valid_c, H5SSELECT_VALID_C)
-#define nh5sget_simple_extent_npoints_c H5_FC_FUNC_(h5sget_simple_extent_npoints_c, H5SGET_SIMPLE_EXTENT_NPOINTS_C)
-#define nh5sget_select_npoints_c H5_FC_FUNC_(h5sget_select_npoints_c, H5SGET_SELECT_NPOINTS_C)
-#define nh5sget_simple_extent_ndims_c H5_FC_FUNC_(h5sget_simple_extent_ndims_c, H5SGET_SIMPLE_EXTENT_NDIMS_C)
-#define nh5sget_simple_extent_type_c  H5_FC_FUNC_(h5sget_simple_extent_type_c, H5SGET_SIMPLE_EXTENT_TYPE_C)
-#define nh5soffset_simple_c      H5_FC_FUNC_(h5soffset_simple_c, H5SOFFSET_SIMPLE_C)
-#define nh5sset_extent_simple_c  H5_FC_FUNC_(h5sset_extent_simple_c, H5SSET_EXTENT_SIMPLE_C)
-#define nh5sis_simple_c          H5_FC_FUNC_(h5sis_simple_c, H5SIS_SIMPLE_C)
-#define nh5sextent_class_c       H5_FC_FUNC_(h5sextent_class_c, H5SEXTENT_CLASS_C)
-#define nh5sget_simple_extent_dims_c H5_FC_FUNC_(h5sget_simple_extent_dims_c, H5SGET_SIMPLE_EXTENT_DIMS_C)
-#define nh5sextent_copy_c        H5_FC_FUNC_(h5sextent_copy_c, H5SEXTENT_COPY_C)
-#define nh5sset_extent_none_c    H5_FC_FUNC_(h5sset_extent_none_c, H5SSET_EXTENT_NONE_C)
-#define nh5sselect_hyperslab_c   H5_FC_FUNC_(h5sselect_hyperslab_c, H5SSELECT_HYPERSLAB_C)
-#define nh5scombine_hyperslab_c   H5_FC_FUNC_(h5scombine_hyperslab_c, H5SCOMBINE_HYPERSLAB_C)
-#define nh5scombine_select_c   H5_FC_FUNC_(h5scombine_select_c, H5SCOMBINE_SELECT_C)
-#define nh5sselect_select_c   H5_FC_FUNC_(h5sselect_select_c, H5SSELECT_SELECT_C)
-#define nh5sget_select_type_c   H5_FC_FUNC_(h5sget_select_type_c, H5SGET_SELECT_TYPE_C)
-#define nh5sselect_elements_c    H5_FC_FUNC_(h5sselect_elements_c, H5SSELECT_ELEMENTS_C)
-#define nh5sdecode_c    H5_FC_FUNC_(h5sdecode_c, H5SDECODE_C)
-#define nh5sencode_c    H5_FC_FUNC_(h5sencode_c, H5SENCODE_C)
-#define nh5sextent_equal_c    H5_FC_FUNC_(h5sextent_equal_c, H5SEXTENT_EQUAL_C)
-
-H5_FCDLL int_f nh5screate_simple_c ( int_f *rank, hsize_t_f *dims, hsize_t_f *maxdims, hid_t_f *space_id );
-H5_FCDLL int_f nh5sclose_c ( hid_t_f *space_id );
-H5_FCDLL int_f nh5screate_c ( int_f *classtype, hid_t_f *space_id );
-H5_FCDLL int_f nh5scopy_c ( hid_t_f *space_id , hid_t_f *new_space_id);
-H5_FCDLL int_f nh5sget_select_hyper_nblocks_c( hid_t_f *space_id , hssize_t_f * num_blocks);
-H5_FCDLL int_f nh5sget_select_hyper_blocklist_c( hid_t_f *space_id ,hsize_t_f * startblock, hsize_t_f * num_blocks, hsize_t_f * buf);
-H5_FCDLL int_f nh5sget_select_bounds_c( hid_t_f *space_id , hsize_t_f * start, hsize_t_f * end);
-H5_FCDLL int_f nh5sget_select_elem_npoints_c( hid_t_f *space_id , hssize_t_f * num_points);
-H5_FCDLL int_f nh5sget_select_elem_pointlist_c( hid_t_f *space_id ,hsize_t_f * startpoint, hsize_t_f * numpoints, hsize_t_f * buf);
-H5_FCDLL int_f nh5sselect_all_c ( hid_t_f *space_id );
-H5_FCDLL int_f nh5sselect_none_c ( hid_t_f *space_id );
-H5_FCDLL int_f nh5sselect_valid_c ( hid_t_f *space_id , int_f *flag );
-H5_FCDLL int_f nh5sget_simple_extent_npoints_c ( hid_t_f *space_id , hsize_t_f *npoints );
-H5_FCDLL int_f nh5sget_select_npoints_c ( hid_t_f *space_id , hssize_t_f *npoints );
-H5_FCDLL int_f nh5sget_simple_extent_ndims_c ( hid_t_f *space_id , int_f *ndims );
-H5_FCDLL int_f nh5sget_simple_extent_type_c ( hid_t_f *space_id , int_f *classtype);
-H5_FCDLL int_f nh5soffset_simple_c ( hid_t_f *space_id , hssize_t_f *offset);
-H5_FCDLL int_f nh5sset_extent_simple_c ( hid_t_f *space_id , int_f *rank, hsize_t_f * current_size, hsize_t_f *maximum_size);
-H5_FCDLL int_f nh5sis_simple_c ( hid_t_f *space_id , int_f *flag );
-H5_FCDLL int_f nh5sextent_class_c ( hid_t_f *space_id , int_f *classtype);
-H5_FCDLL int_f nh5sget_simple_extent_dims_c ( hid_t_f *space_id , hsize_t_f *dims, hsize_t_f *maxdims);
-H5_FCDLL int_f nh5sextent_copy_c ( hid_t_f *dest_space_id , hid_t_f *source_space_id);
-H5_FCDLL int_f nh5sset_extent_none_c ( hid_t_f *space_id );
-H5_FCDLL int_f nh5sselect_hyperslab_c ( hid_t_f *space_id , int_f *op, hsize_t_f *start, hsize_t_f *count, hsize_t_f *stride, hsize_t_f *block);
-H5_FCDLL int_f nh5sget_select_type_c ( hid_t_f *space_id , int_f *op);
-H5_FCDLL int_f nh5sselect_elements_c ( hid_t_f *space_id , int_f *op, size_t_f *nelements, hsize_t_f *coord);
-H5_FCDLL int_f nh5scombine_hyperslab_c ( hid_t_f *space_id , int_f *op, hsize_t_f *start, hsize_t_f *count, hsize_t_f *stride, hsize_t_f *block, hid_t_f *hyper_id);
-H5_FCDLL int_f nh5scombine_select_c ( hid_t_f *space1_id , int_f *op, hid_t_f *space2_id, hid_t_f *ds_id);
-H5_FCDLL int_f nh5sselect_select_c ( hid_t_f *space1_id , int_f *op, hid_t_f *space2_id);
-H5_FCDLL int_f nh5sdecode_c ( _fcd buf, hid_t_f *obj_id );
-H5_FCDLL int_f nh5sencode_c (_fcd buf, hid_t_f *obj_id, size_t_f *nalloc );
-H5_FCDLL int_f nh5sextent_equal_c ( hid_t_f * space1_id, hid_t_f *space2_id, hid_t_f *c_equal);
+H5_FCDLL int_f h5screate_simple_c(int_f *rank, hsize_t_f *dims, hsize_t_f *maxdims, hid_t_f *space_id);
+H5_FCDLL int_f h5sclose_c(hid_t_f *space_id);
+H5_FCDLL int_f h5screate_c(int_f *classtype, hid_t_f *space_id);
+H5_FCDLL int_f h5scopy_c(hid_t_f *space_id, hid_t_f *new_space_id);
+H5_FCDLL int_f h5sget_select_hyper_nblocks_c(hid_t_f *space_id, hssize_t_f *num_blocks);
+H5_FCDLL int_f h5sget_select_hyper_blocklist_c(hid_t_f *space_id, hsize_t_f *startblock,
+                                               hsize_t_f *num_blocks, hsize_t_f *buf);
+H5_FCDLL int_f h5sget_select_bounds_c(hid_t_f *space_id, hsize_t_f *start, hsize_t_f *end);
+H5_FCDLL int_f h5sget_select_elem_npoints_c(hid_t_f *space_id, hssize_t_f *num_points);
+H5_FCDLL int_f h5sget_select_elem_pointlist_c(hid_t_f *space_id, hsize_t_f *startpoint, hsize_t_f *numpoints,
+                                              hsize_t_f *buf);
+H5_FCDLL int_f h5sselect_all_c(hid_t_f *space_id);
+H5_FCDLL int_f h5sselect_none_c(hid_t_f *space_id);
+H5_FCDLL int_f h5sselect_valid_c(hid_t_f *space_id, int_f *flag);
+H5_FCDLL int_f h5sget_simple_extent_npoints_c(hid_t_f *space_id, hsize_t_f *npoints);
+H5_FCDLL int_f h5sget_select_npoints_c(hid_t_f *space_id, hssize_t_f *npoints);
+H5_FCDLL int_f h5sget_simple_extent_ndims_c(hid_t_f *space_id, int_f *ndims);
+H5_FCDLL int_f h5sget_simple_extent_type_c(hid_t_f *space_id, int_f *classtype);
+H5_FCDLL int_f h5soffset_simple_c(hid_t_f *space_id, hssize_t_f *offset);
+H5_FCDLL int_f h5sset_extent_simple_c(hid_t_f *space_id, int_f *rank, hsize_t_f *current_size,
+                                      hsize_t_f *maximum_size);
+H5_FCDLL int_f h5sis_simple_c(hid_t_f *space_id, int_f *flag);
+H5_FCDLL int_f h5sget_simple_extent_dims_c(hid_t_f *space_id, hsize_t_f *dims, hsize_t_f *maxdims);
+H5_FCDLL int_f h5sextent_copy_c(hid_t_f *dest_space_id, hid_t_f *source_space_id);
+H5_FCDLL int_f h5sset_extent_none_c(hid_t_f *space_id);
+H5_FCDLL int_f h5sselect_hyperslab_c(hid_t_f *space_id, int_f *op, hsize_t_f *start, hsize_t_f *count,
+                                     hsize_t_f *stride, hsize_t_f *block);
+H5_FCDLL int_f h5sget_select_type_c(hid_t_f *space_id, int_f *op);
+H5_FCDLL int_f h5sselect_elements_c(hid_t_f *space_id, int_f *op, size_t_f *nelements, hsize_t_f *coord);
+H5_FCDLL int_f h5scombine_hyperslab_c(hid_t_f *space_id, int_f *op, hsize_t_f *start, hsize_t_f *count,
+                                      hsize_t_f *stride, hsize_t_f *block, hid_t_f *hyper_id);
+H5_FCDLL int_f h5scombine_select_c(hid_t_f *space1_id, int_f *op, hid_t_f *space2_id, hid_t_f *ds_id);
+H5_FCDLL int_f h5smodify_select_c(hid_t_f *space1_id, int_f *op, hid_t_f *space2_id);
+H5_FCDLL int_f h5sdecode_c(_fcd buf, hid_t_f *obj_id);
+H5_FCDLL int_f h5sencode_c(_fcd buf, hid_t_f *obj_id, size_t_f *nalloc, hid_t_f *fapl_id);
+H5_FCDLL int_f h5sextent_equal_c(hid_t_f *space1_id, hid_t_f *space2_id, hid_t_f *c_equal);
 
 /*
  * Functions from H5Df.c
  */
-#define nh5dcreate_c                H5_FC_FUNC_(h5dcreate_c, H5DCREATE_C)
-#define nh5dclose_c                 H5_FC_FUNC_(h5dclose_c, H5DCLOSE_C)
-#define nh5dopen_c                  H5_FC_FUNC_(h5dopen_c, H5DOPEN_C)
-#define nh5dwrite_c                 H5_FC_FUNC_(h5dwrite_c, H5DWRITE_C)
-#define nh5dwrite_integer_s_c       H5_FC_FUNC_(h5dwrite_integer_s_c, H5DWRITE_INTEGER_S_C)
-#define nh5dwrite_integer_1_c       H5_FC_FUNC_(h5dwrite_integer_1_c, H5DWRITE_INTEGER_1_C)
-#define nh5dwrite_integer_2_c       H5_FC_FUNC_(h5dwrite_integer_2_c, H5DWRITE_INTEGER_2_C)
-#define nh5dwrite_integer_3_c       H5_FC_FUNC_(h5dwrite_integer_3_c, H5DWRITE_INTEGER_3_C)
-#define nh5dwrite_integer_4_c       H5_FC_FUNC_(h5dwrite_integer_4_c, H5DWRITE_INTEGER_4_C)
-#define nh5dwrite_integer_5_c       H5_FC_FUNC_(h5dwrite_integer_5_c, H5DWRITE_INTEGER_5_C)
-#define nh5dwrite_integer_6_c       H5_FC_FUNC_(h5dwrite_integer_6_c, H5DWRITE_INTEGER_6_C)
-#define nh5dwrite_integer_7_c       H5_FC_FUNC_(h5dwrite_integer_7_c, H5DWRITE_INTEGER_7_C)
-#define nh5dwrite_real_s_c          H5_FC_FUNC_(h5dwrite_real_s_c, H5DWRITE_REAL_S_C)
-#define nh5dwrite_real_1_c          H5_FC_FUNC_(h5dwrite_real_1_c, H5DWRITE_REAL_1_C)
-#define nh5dwrite_real_2_c          H5_FC_FUNC_(h5dwrite_real_2_c, H5DWRITE_REAL_2_C)
-#define nh5dwrite_real_3_c          H5_FC_FUNC_(h5dwrite_real_3_c, H5DWRITE_REAL_3_C)
-#define nh5dwrite_real_4_c          H5_FC_FUNC_(h5dwrite_real_4_c, H5DWRITE_REAL_4_C)
-#define nh5dwrite_real_5_c          H5_FC_FUNC_(h5dwrite_real_5_c, H5DWRITE_REAL_5_C)
-#define nh5dwrite_real_6_c          H5_FC_FUNC_(h5dwrite_real_6_c, H5DWRITE_REAL_6_C)
-#define nh5dwrite_real_7_c          H5_FC_FUNC_(h5dwrite_real_7_c, H5DWRITE_REAL_7_C)
-#define nh5dwrite_double_s_c        H5_FC_FUNC_(h5dwrite_double_s_c, H5DWRITE_DOUBLE_S_C)
-#define nh5dwrite_double_1_c        H5_FC_FUNC_(h5dwrite_double_1_c, H5DWRITE_DOUBLE_1_C)
-#define nh5dwrite_double_2_c        H5_FC_FUNC_(h5dwrite_double_2_c, H5DWRITE_DOUBLE_2_C)
-#define nh5dwrite_double_3_c        H5_FC_FUNC_(h5dwrite_double_3_c, H5DWRITE_DOUBLE_3_C)
-#define nh5dwrite_double_4_c        H5_FC_FUNC_(h5dwrite_double_4_c, H5DWRITE_DOUBLE_4_C)
-#define nh5dwrite_double_5_c        H5_FC_FUNC_(h5dwrite_double_5_c, H5DWRITE_DOUBLE_5_C)
-#define nh5dwrite_double_6_c        H5_FC_FUNC_(h5dwrite_double_6_c, H5DWRITE_DOUBLE_6_C)
-#define nh5dwrite_double_7_c        H5_FC_FUNC_(h5dwrite_double_7_c, H5DWRITE_DOUBLE_7_C)
-#define nh5dwrite_ref_obj_c         H5_FC_FUNC_(h5dwrite_ref_obj_c, H5DWRITE_REF_OBJ_C)
-#define nh5dwrite_ref_reg_c         H5_FC_FUNC_(h5dwrite_ref_reg_c, H5DWRITE_REF_REG_C)
-#define nh5dwritec_c                H5_FC_FUNC_(h5dwritec_c, H5DWRITEC_C)
-#define nh5dwritec_s_c                H5_FC_FUNC_(h5dwritec_s_c, H5DWRITEC_S_C)
-#define nh5dwritec_1_c                H5_FC_FUNC_(h5dwritec_1_c, H5DWRITEC_1_C)
-#define nh5dwritec_2_c                H5_FC_FUNC_(h5dwritec_2_c, H5DWRITEC_2_C)
-#define nh5dwritec_3_c                H5_FC_FUNC_(h5dwritec_3_c, H5DWRITEC_3_C)
-#define nh5dwritec_4_c                H5_FC_FUNC_(h5dwritec_4_c, H5DWRITEC_4_C)
-#define nh5dwritec_5_c                H5_FC_FUNC_(h5dwritec_5_c, H5DWRITEC_5_C)
-#define nh5dwritec_6_c                H5_FC_FUNC_(h5dwritec_6_c, H5DWRITEC_6_C)
-#define nh5dwritec_7_c                H5_FC_FUNC_(h5dwritec_7_c, H5DWRITEC_7_C)
-#define nh5dread_c                  H5_FC_FUNC_(h5dread_c, H5DREAD_C)
-#define nh5dread_integer_s_c                 H5_FC_FUNC_(h5dread_integer_s_c, H5DREAD_INTEGER_S_C)
-#define nh5dread_integer_1_c                 H5_FC_FUNC_(h5dread_integer_1_c, H5DREAD_INTEGER_1_C)
-#define nh5dread_integer_2_c                 H5_FC_FUNC_(h5dread_integer_2_c, H5DREAD_INTEGER_2_C)
-#define nh5dread_integer_3_c                 H5_FC_FUNC_(h5dread_integer_3_c, H5DREAD_INTEGER_3_C)
-#define nh5dread_integer_4_c                 H5_FC_FUNC_(h5dread_integer_4_c, H5DREAD_INTEGER_4_C)
-#define nh5dread_integer_5_c                 H5_FC_FUNC_(h5dread_integer_5_c, H5DREAD_INTEGER_5_C)
-#define nh5dread_integer_6_c                 H5_FC_FUNC_(h5dread_integer_6_c, H5DREAD_INTEGER_6_C)
-#define nh5dread_integer_7_c                 H5_FC_FUNC_(h5dread_integer_7_c, H5DREAD_INTEGER_7_C)
-#define nh5dread_real_s_c                 H5_FC_FUNC_(h5dread_real_s_c, H5DREAD_REAL_S_C)
-#define nh5dread_real_1_c                 H5_FC_FUNC_(h5dread_real_1_c, H5DREAD_REAL_1_C)
-#define nh5dread_real_2_c                 H5_FC_FUNC_(h5dread_real_2_c, H5DREAD_REAL_2_C)
-#define nh5dread_real_3_c                 H5_FC_FUNC_(h5dread_real_3_c, H5DREAD_REAL_3_C)
-#define nh5dread_real_4_c                 H5_FC_FUNC_(h5dread_real_4_c, H5DREAD_REAL_4_C)
-#define nh5dread_real_5_c                 H5_FC_FUNC_(h5dread_real_5_c, H5DREAD_REAL_5_C)
-#define nh5dread_real_6_c                 H5_FC_FUNC_(h5dread_real_6_c, H5DREAD_REAL_6_C)
-#define nh5dread_real_7_c                 H5_FC_FUNC_(h5dread_real_7_c, H5DREAD_REAL_7_C)
-#define nh5dread_double_s_c                 H5_FC_FUNC_(h5dread_double_s_c, H5DREAD_DOUBLE_S_C)
-#define nh5dread_double_1_c                 H5_FC_FUNC_(h5dread_double_1_c, H5DREAD_DOUBLE_1_C)
-#define nh5dread_double_2_c                 H5_FC_FUNC_(h5dread_double_2_c, H5DREAD_DOUBLE_2_C)
-#define nh5dread_double_3_c                 H5_FC_FUNC_(h5dread_double_3_c, H5DREAD_DOUBLE_3_C)
-#define nh5dread_double_4_c                 H5_FC_FUNC_(h5dread_double_4_c, H5DREAD_DOUBLE_4_C)
-#define nh5dread_double_5_c                 H5_FC_FUNC_(h5dread_double_5_c, H5DREAD_DOUBLE_5_C)
-#define nh5dread_double_6_c                 H5_FC_FUNC_(h5dread_double_6_c, H5DREAD_DOUBLE_6_C)
-#define nh5dread_double_7_c                 H5_FC_FUNC_(h5dread_double_7_c, H5DREAD_DOUBLE_7_C)
-#define nh5dread_c_b                H5_FC_FUNC_(h5dread_c_b, H5DREAD_C_B)
-#define nh5dread_ref_reg_c          H5_FC_FUNC_(h5dread_ref_reg_c, H5DREAD_REF_REG_C)
-#define nh5dread_ref_obj_c          H5_FC_FUNC_(h5dread_ref_obj_c, H5DREAD_REF_OBJ_C)
-#define nh5dreadc_c                 H5_FC_FUNC_(h5dreadc_c, H5DREADC_C)
-#define nh5dreadc_s_c                 H5_FC_FUNC_(h5dreadc_s_c, H5DREADC_S_C)
-#define nh5dreadc_1_c                 H5_FC_FUNC_(h5dreadc_1_c, H5DREADC_1_C)
-#define nh5dreadc_2_c                 H5_FC_FUNC_(h5dreadc_2_c, H5DREADC_2_C)
-#define nh5dreadc_3_c                 H5_FC_FUNC_(h5dreadc_3_c, H5DREADC_3_C)
-#define nh5dreadc_4_c                 H5_FC_FUNC_(h5dreadc_4_c, H5DREADC_4_C)
-#define nh5dreadc_5_c                 H5_FC_FUNC_(h5dreadc_5_c, H5DREADC_5_C)
-#define nh5dreadc_6_c                 H5_FC_FUNC_(h5dreadc_6_c, H5DREADC_6_C)
-#define nh5dreadc_7_c                 H5_FC_FUNC_(h5dreadc_7_c, H5DREADC_7_C)
-#define nh5dreadc_c_b               H5_FC_FUNC_(h5dreadc_c_b, H5DREADC_C_B)
-#define nh5dget_space_c             H5_FC_FUNC_(h5dget_space_c, H5DGET_SPACE_C)
-#define nh5dget_type_c              H5_FC_FUNC_(h5dget_type_c, H5DGET_TYPE_C)
-#define nh5dget_create_plist_c      H5_FC_FUNC_(h5dget_create_plist_c, H5DGET_CREATE_PLIST_C)
-#define nh5dset_extent_c            H5_FC_FUNC_(h5dset_extent_c, H5DSET_EXTENT_C)
-#define nh5dget_storage_size_c      H5_FC_FUNC_(h5dget_storage_size_c, H5DGET_STORAGE_SIZE_C)
-#define nh5dvlen_get_max_len_c      H5_FC_FUNC_(h5dvlen_get_max_len_c, H5DVLEN_GET_MAX_LEN_C)
-#define nh5dwrite_vl_integer_c      H5_FC_FUNC_(h5dwrite_vl_integer_c, H5DWRITE_VL_INTEGER_C)
-#define nh5dread_vl_integer_c       H5_FC_FUNC_(h5dread_vl_integer_c, H5DREAD_VL_INTEGER_C)
-#define nh5dwrite_vl_real_c         H5_FC_FUNC_(h5dwrite_vl_real_c, H5DWRITE_VL_REAL_C)
-#define nh5dread_vl_real_c          H5_FC_FUNC_(h5dread_vl_real_c, H5DREAD_VL_REAL_C)
-#define nh5dwrite_vl_string_c       H5_FC_FUNC_(h5dwrite_vl_string_c, H5DWRITE_VL_STRING_C)
-#define nh5dread_vl_string_c        H5_FC_FUNC_(h5dread_vl_string_c, H5DREAD_VL_STRING_C)
-#define nh5dfillc_c                 H5_FC_FUNC_(h5dfillc_c, H5DFILLC_C)
-#define nh5dfill_integer_c                  H5_FC_FUNC_(h5dfill_integer_c, H5DFILL_INTEGER_C)
-#define nh5dfill_real_c                  H5_FC_FUNC_(h5dfill_real_c, H5DFILL_REAL_C)
-#define nh5dfill_double_c                  H5_FC_FUNC_(h5dfill_double_c, H5DFILL_DOUBLE_C)
-#define nh5dget_space_status_c    H5_FC_FUNC_(h5dget_space_status_c, H5DGET_SPACE_STATUS_C)
-#define nh5dcreate_anon_c         H5_FC_FUNC_(h5dcreate_anon_c, H5DCREATE_ANON_C)
-#define nh5dget_access_plist_c    H5_FC_FUNC_(h5dget_access_plist_c, H5DGET_ACCESS_PLIST_C)
-
-
-H5_FCDLL int_f nh5dcreate_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id, hid_t_f *space_id,
-			     hid_t_f *lcpl_id, hid_t_f *dcpl_id, hid_t_f *dapl_id, hid_t_f *dset_id);
-H5_FCDLL int_f nh5dopen_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *dapl_id, hid_t_f *dset_id);
-H5_FCDLL int_f nh5dclose_c ( hid_t_f *dset_id );
-H5_FCDLL int_f nh5dwrite_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dwrite_integer_s_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dwrite_integer_1_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dwrite_integer_2_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dwrite_integer_3_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dwrite_integer_4_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dwrite_integer_5_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dwrite_integer_6_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dwrite_integer_7_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-
-H5_FCDLL int_f nh5dwrite_real_s_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dwrite_real_1_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dwrite_real_2_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dwrite_real_3_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dwrite_real_4_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dwrite_real_5_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dwrite_real_6_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dwrite_real_7_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-
-H5_FCDLL int_f nh5dwrite_double_s_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dwrite_double_1_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dwrite_double_2_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dwrite_double_3_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dwrite_double_4_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dwrite_double_5_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dwrite_double_6_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dwrite_double_7_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-
-H5_FCDLL int_f nh5dwrite_vl_integer_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, int_f *buf, hsize_t_f *dims, size_t_f *len);
-H5_FCDLL int_f nh5dwrite_vl_real_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, real_f *buf, hsize_t_f *dims, size_t_f *len);
-H5_FCDLL int_f nh5dwrite_vl_string_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims, size_t_f *len);
-H5_FCDLL int_f nh5dwrite_ref_obj_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, haddr_t_f *buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dwrite_ref_reg_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, int_f *buf, hsize_t_f *dims);
-
-H5_FCDLL int_f nh5dwritec_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims);
-
-H5_FCDLL int_f nh5dwritec_s_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dwritec_1_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dwritec_2_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dwritec_3_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dwritec_4_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dwritec_5_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dwritec_6_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dwritec_7_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims);
-
-H5_FCDLL int_f nh5dread_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-
-H5_FCDLL int_f nh5dread_integer_s_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dread_integer_1_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dread_integer_2_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dread_integer_3_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dread_integer_4_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dread_integer_5_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dread_integer_6_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dread_integer_7_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-
-H5_FCDLL int_f nh5dread_real_s_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dread_real_1_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dread_real_2_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dread_real_3_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dread_real_4_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dread_real_5_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dread_real_6_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dread_real_7_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-
-H5_FCDLL int_f nh5dread_double_s_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dread_double_1_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dread_double_2_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dread_double_3_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dread_double_4_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dread_double_5_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dread_double_6_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dread_double_7_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
 
-H5_FCDLL int_f nh5dread_vl_integer_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, int_f *buf, hsize_t_f *dims, size_t_f *len);
-H5_FCDLL int_f nh5dread_vl_real_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, real_f *buf, hsize_t_f *dims, size_t_f *len);
-H5_FCDLL int_f nh5dread_vl_string_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims, size_t_f *len);
-H5_FCDLL int_f nh5dread_ref_obj_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, haddr_t_f * buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dread_ref_reg_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, int_f * buf, hsize_t_f *dims);
+H5_FCDLL int_f h5dcreate_c(hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id, hid_t_f *space_id,
+                           hid_t_f *lcpl_id, hid_t_f *dcpl_id, hid_t_f *dapl_id, hid_t_f *dset_id);
+H5_FCDLL int_f h5dopen_c(hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *dapl_id, hid_t_f *dset_id);
+H5_FCDLL int_f h5dclose_c(hid_t_f *dset_id);
+
+H5_FCDLL int_f h5dwrite_vl_integer_c(hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id,
+                                     hid_t_f *file_space_id, hid_t_f *xfer_prp, int_f *buf, hsize_t_f *dims,
+                                     size_t_f *len);
+H5_FCDLL int_f h5dwrite_vl_real_c(hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id,
+                                  hid_t_f *file_space_id, hid_t_f *xfer_prp, real_f *buf, hsize_t_f *dims,
+                                  size_t_f *len);
+H5_FCDLL int_f h5dwrite_vl_string_c(hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id,
+                                    hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims,
+                                    size_t_f *len);
+H5_FCDLL int_f h5dwrite_ref_reg_c(hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id,
+                                  hid_t_f *file_space_id, hid_t_f *xfer_prp, int_f *buf, hsize_t_f *dims);
+H5_FCDLL int_f h5dread_vl_integer_c(hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id,
+                                    hid_t_f *file_space_id, hid_t_f *xfer_prp, int_f *buf, hsize_t_f *dims,
+                                    size_t_f *len);
+H5_FCDLL int_f h5dread_vl_real_c(hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id,
+                                 hid_t_f *file_space_id, hid_t_f *xfer_prp, real_f *buf, hsize_t_f *dims,
+                                 size_t_f *len);
+H5_FCDLL int_f h5dread_vl_string_c(hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id,
+                                   hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims,
+                                   size_t_f *len);
+H5_FCDLL int_f h5dread_ref_reg_c(hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id,
+                                 hid_t_f *file_space_id, hid_t_f *xfer_prp, int_f *buf, hsize_t_f *dims);
+H5_FCDLL int_f h5dget_access_plist_c(hid_t_f *dset_id, hid_t_f *plist_id);
+H5_FCDLL int_f h5dget_space_c(hid_t_f *dset_id, hid_t_f *space_id);
+H5_FCDLL int_f h5dget_type_c(hid_t_f *dset_id, hid_t_f *type_id);
+H5_FCDLL int_f h5dget_create_plist_c(hid_t_f *dset_id, hid_t_f *plist_id);
+H5_FCDLL int_f h5dset_extent_c(hid_t_f *dset_id, hsize_t_f *dims);
+H5_FCDLL int_f h5dvlen_get_max_len_c(hid_t_f *dataset_id, hid_t_f *type_id, hid_t_f *space_id, size_t_f *len);
+H5_FCDLL int_f h5dget_storage_size_c(hid_t_f *dataset_id, hsize_t_f *size);
+H5_FCDLL int_f h5dget_space_status_c(hid_t_f *dset_id, int_f *flag);
+H5_FCDLL int_f h5dcreate_anon_c(hid_t_f *loc_id, hid_t_f *type_id, hid_t_f *space_id, hid_t_f *dcpl_id,
+                                hid_t_f *dapl_id, hid_t_f *dset_id);
+H5_FCDLL int_f h5dwrite_f_c(hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id,
+                            hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf);
+H5_FCDLL int_f h5dread_f_c(hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id,
+                           hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf);
+H5_FCDLL int_f h5dvlen_reclaim_c(hid_t_f *type_id, hid_t_f *space_id, hid_t_f *plist_id, void *buf);
 
-H5_FCDLL int_f nh5dreadc_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims);
-
-H5_FCDLL int_f nh5dreadc_s_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dreadc_1_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dreadc_2_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dreadc_3_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dreadc_4_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dreadc_5_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dreadc_6_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dreadc_7_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims);
-H5_FCDLL int_f nh5dget_access_plist_c (hid_t_f *dset_id, hid_t_f *plist_id);
-
-
-H5_FCDLL int_f nh5dget_space_c ( hid_t_f *dset_id , hid_t_f *space_id);
-H5_FCDLL int_f nh5dget_type_c ( hid_t_f *dset_id , hid_t_f *type_id);
-H5_FCDLL int_f nh5dget_create_plist_c ( hid_t_f *dset_id , hid_t_f *plist_id);
-H5_FCDLL int_f nh5dset_extent_c ( hid_t_f *dset_id , hsize_t_f *dims);
-H5_FCDLL int_f nh5dvlen_get_max_len_c(hid_t_f *dataset_id, hid_t_f *type_id, hid_t_f *space_id, size_t_f *len);
-H5_FCDLL int_f nh5dget_storage_size_c(hid_t_f *dataset_id, hsize_t_f *size);
-H5_FCDLL int_f nh5dfillc_c(_fcd fill_value, hid_t_f *fill_type_id, hid_t_f *space_id, _fcd buf, hid_t_f *mem_type_id);
-H5_FCDLL int_f h5dfill_c(void * fill_value, hid_t_f *fill_type_id, hid_t_f *space_id, void * buf, hid_t_f *mem_type_id);
-H5_FCDLL int_f nh5dfill_integer_c(void * fill_value, hid_t_f *fill_type_id, hid_t_f *space_id, void * buf, hid_t_f *mem_type_id);
-H5_FCDLL int_f nh5dfill_real_c(void * fill_value, hid_t_f *fill_type_id, hid_t_f *space_id, void * buf, hid_t_f *mem_type_id);
-H5_FCDLL int_f nh5dfill_double_c(void * fill_value, hid_t_f *fill_type_id, hid_t_f *space_id, void * buf, hid_t_f *mem_type_id);
-H5_FCDLL int_f nh5dget_space_status_c ( hid_t_f *dset_id, int_f *flag);
-H5_FCDLL int_f nh5dcreate_anon_c (hid_t_f *loc_id, hid_t_f *type_id, hid_t_f *space_id,
-				  hid_t_f *dcpl_id, hid_t_f *dapl_id, hid_t_f *dset_id);
-H5_FCDLL int_f h5dwrite_f_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, 
-				   hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf);
-H5_FCDLL int_f h5dread_f_c ( hid_t_f *dset_id ,  hid_t_f *mem_type_id, hid_t_f *mem_space_id, 
-				   hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf);
-H5_FCDLL int_f h5dvlen_reclaim_c (hid_t_f *type_id ,  hid_t_f *space_id, hid_t_f *plist_id, void *buf);
 /*
  * Functions from H5Gf.c
  */
-#define nh5gcreate_c      H5_FC_FUNC_(h5gcreate_c, H5GCREATE_C)
-#define nh5gclose_c       H5_FC_FUNC_(h5gclose_c, H5GCLOSE_C)
-#define nh5gopen_c        H5_FC_FUNC_(h5gopen_c, H5GOPEN_C)
-#define nh5gget_obj_info_idx_c H5_FC_FUNC_(h5gget_obj_info_idx_c, H5GGET_OBJ_INFO_IDX_C)
-#define nh5gn_members_c   H5_FC_FUNC_(h5gn_members_c, H5GN_MEMBERS_C)
-#define nh5glink_c        H5_FC_FUNC_(h5glink_c, H5GLINK_C)
-#define nh5glink2_c        H5_FC_FUNC_(h5glink2_c, H5GLINK2_C)
-#define nh5gunlink_c      H5_FC_FUNC_(h5gunlink_c, H5GUNLINK_C)
-#define nh5gmove_c        H5_FC_FUNC_(h5gmove_c, H5GMOVE_C)
-#define nh5gmove2_c        H5_FC_FUNC_(h5gmove2_c, H5GMOVE2_C)
-#define nh5gget_linkval_c   H5_FC_FUNC_(h5gget_linkval_c, H5GGET_LINKVAL_C)
-#define nh5gset_comment_c   H5_FC_FUNC_(h5gset_comment_c, H5GSET_COMMENT_C)
-#define nh5gget_comment_c   H5_FC_FUNC_(h5gget_comment_c, H5GGET_COMMENT_C)
-#define nh5gcreate_anon_c      H5_FC_FUNC_(h5gcreate_anon_c, H5GCREATE_ANON_C)
-#define nh5gget_create_plist_c H5_FC_FUNC_(h5gget_create_plist_c, H5GGET_CREATE_PLIST_C)
-#define nh5gget_info_c  H5_FC_FUNC_(h5gget_info_c, H5GGET_INFO_C)
-#define nh5gget_info_by_idx_c  H5_FC_FUNC_(h5gget_info_by_idx_c, H5GGET_INFO_BY_IDX_C)
-#define nh5gget_info_by_name_c  H5_FC_FUNC_(h5gget_info_by_name_c, H5GGET_INFO_BY_NAME_C)
-
-
-H5_FCDLL int_f nh5gcreate_c (hid_t_f *loc_id, _fcd name, int_f *namelen, size_t_f *size_hint,  hid_t_f *grp_id,
-			     hid_t_f *lcpl_id, hid_t_f *gcpl_id, hid_t_f *gapl_id);
-H5_FCDLL int_f nh5gopen_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *gapl_id, hid_t_f *grp_id);
-H5_FCDLL int_f nh5gclose_c ( hid_t_f *grp_id );
-H5_FCDLL int_f nh5gget_obj_info_idx_c (hid_t_f *loc_id, _fcd name, int_f *namelen, int_f *idx, _fcd obj_name, int_f *obj_namelen, int_f *obj_type);
-H5_FCDLL int_f nh5gn_members_c (hid_t_f *loc_id, _fcd name, int_f *namelen, int_f *nmembers);
-H5_FCDLL int_f nh5glink_c (hid_t_f *loc_id, int_f *link_type, _fcd current_name, int_f *current_namelen, _fcd new_name, int_f *new_namelen);
-H5_FCDLL int_f nh5glink2_c (hid_t_f *cur_loc_id, _fcd cur_name, int_f *cur_namelen, int_f *link_type, hid_t_f *new_loc_id, _fcd new_name, int_f *new_namelen);
-H5_FCDLL int_f nh5gunlink_c (hid_t_f *loc_id, _fcd name, int_f *namelen);
-H5_FCDLL int_f nh5gmove_c (hid_t_f *loc_id, _fcd src_name, int_f *src_namelen, _fcd dst_name, int_f *dst_namelen);
-H5_FCDLL int_f nh5gmove2_c (hid_t_f *src_loc_id, _fcd src_name, int_f *src_namelen, hid_t_f *dst_loc_id,_fcd dst_name, int_f *dst_namelen);
-H5_FCDLL int_f nh5gget_linkval_c (hid_t_f *loc_id, _fcd name, int_f *namelen, size_t_f *size, _fcd value );
-H5_FCDLL int_f nh5gset_comment_c (hid_t_f *loc_id, _fcd name, int_f *namelen, _fcd comment, int_f *commentlen);
-H5_FCDLL int_f nh5gget_comment_c (hid_t_f *loc_id, _fcd name, int_f *namelen, size_t_f *bufsize, _fcd comment);
-H5_FCDLL int_f nh5gcreate_anon_c (hid_t_f *loc_id, hid_t_f *gcpl_id, hid_t_f *gapl_id, hid_t_f *grp_id);
-H5_FCDLL int_f nh5gget_create_plist_c(hid_t_f *grp_id, hid_t_f *gcpl_id );
-H5_FCDLL int_f nh5gget_info_c (hid_t_f *group_id, int_f *storage_type, int_f *nlinks, int_f *max_corder, int_f *mounted);
-H5_FCDLL int_f nh5gget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
-				     int_f *index_type, int_f *order, hsize_t_f *n, hid_t_f *lapl_id,
-				     int_f *storage_type, int_f *nlinks, int_f *max_corder, int_f *mounted);
-H5_FCDLL int_f nh5gget_info_by_name_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, hid_t_f *lapl_id,
-				      int_f *storage_type, int_f *nlinks, int_f *max_corder, int_f *mounted);
+H5_FCDLL int_f h5gcreate_c(hid_t_f *loc_id, _fcd name, int_f *namelen, size_t_f *size_hint, hid_t_f *grp_id,
+                           hid_t_f *lcpl_id, hid_t_f *gcpl_id, hid_t_f *gapl_id);
+H5_FCDLL int_f h5gopen_c(hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *gapl_id, hid_t_f *grp_id);
+H5_FCDLL int_f h5gclose_c(hid_t_f *grp_id);
+H5_FCDLL int_f h5gget_obj_info_idx_c(hid_t_f *loc_id, _fcd name, int_f *namelen, int_f *idx, _fcd obj_name,
+                                     int_f *obj_namelen, int_f *obj_type);
+H5_FCDLL int_f h5gn_members_c(hid_t_f *loc_id, _fcd name, int_f *namelen, int_f *nmembers);
+H5_FCDLL int_f h5glink_c(hid_t_f *loc_id, int_f *link_type, _fcd current_name, int_f *current_namelen,
+                         _fcd new_name, int_f *new_namelen);
+H5_FCDLL int_f h5glink2_c(hid_t_f *cur_loc_id, _fcd cur_name, int_f *cur_namelen, int_f *link_type,
+                          hid_t_f *new_loc_id, _fcd new_name, int_f *new_namelen);
+H5_FCDLL int_f h5gunlink_c(hid_t_f *loc_id, _fcd name, int_f *namelen);
+H5_FCDLL int_f h5gmove_c(hid_t_f *loc_id, _fcd src_name, int_f *src_namelen, _fcd dst_name,
+                         int_f *dst_namelen);
+H5_FCDLL int_f h5gmove2_c(hid_t_f *src_loc_id, _fcd src_name, int_f *src_namelen, hid_t_f *dst_loc_id,
+                          _fcd dst_name, int_f *dst_namelen);
+H5_FCDLL int_f h5gget_linkval_c(hid_t_f *loc_id, _fcd name, int_f *namelen, size_t_f *size, _fcd value);
+H5_FCDLL int_f h5gset_comment_c(hid_t_f *loc_id, _fcd name, int_f *namelen, _fcd comment, int_f *commentlen);
+H5_FCDLL int_f h5gget_comment_c(hid_t_f *loc_id, _fcd name, int_f *namelen, size_t_f *bufsize, _fcd comment);
+H5_FCDLL int_f h5gcreate_anon_c(hid_t_f *loc_id, hid_t_f *gcpl_id, hid_t_f *gapl_id, hid_t_f *grp_id);
+H5_FCDLL int_f h5gget_create_plist_c(hid_t_f *grp_id, hid_t_f *gcpl_id);
+H5_FCDLL int_f h5gget_info_c(hid_t_f *group_id, int_f *storage_type, int_f *nlinks, int_f *max_corder,
+                             int_f *mounted);
+H5_FCDLL int_f h5gget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
+                                    int_f *index_type, int_f *order, hsize_t_f *n, hid_t_f *lapl_id,
+                                    int_f *storage_type, int_f *nlinks, int_f *max_corder, int_f *mounted);
+H5_FCDLL int_f h5gget_info_by_name_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
+                                     hid_t_f *lapl_id, int_f *storage_type, int_f *nlinks, int_f *max_corder,
+                                     int_f *mounted);
 
 /*
  * Functions from H5Af.c
  */
-#define nh5acreate_c      H5_FC_FUNC_(h5acreate_c, H5ACREATE_C)
-#define nh5aclose_c       H5_FC_FUNC_(h5aclose_c, H5ACLOSE_C)
-#define nh5aopen_name_c   H5_FC_FUNC_(h5aopen_name_c, H5AOPEN_NAME_C)
-#define nh5awrite_c       H5_FC_FUNC_(h5awrite_c, H5AWRITE_C)
-#define nh5awrite_integer_s_c       H5_FC_FUNC_(h5awrite_integer_s_c, H5AWRITE_INTEGER_S_C)
-#define nh5awrite_integer_1_c       H5_FC_FUNC_(h5awrite_integer_1_c, H5AWRITE_INTEGER_1_C)
-#define nh5awrite_integer_2_c       H5_FC_FUNC_(h5awrite_integer_2_c, H5AWRITE_INTEGER_2_C)
-#define nh5awrite_integer_3_c       H5_FC_FUNC_(h5awrite_integer_3_c, H5AWRITE_INTEGER_3_C)
-#define nh5awrite_integer_4_c       H5_FC_FUNC_(h5awrite_integer_4_c, H5AWRITE_INTEGER_4_C)
-#define nh5awrite_integer_5_c       H5_FC_FUNC_(h5awrite_integer_5_c, H5AWRITE_INTEGER_5_C)
-#define nh5awrite_integer_6_c       H5_FC_FUNC_(h5awrite_integer_6_c, H5AWRITE_INTEGER_6_C)
-#define nh5awrite_integer_7_c       H5_FC_FUNC_(h5awrite_integer_7_c, H5AWRITE_INTEGER_7_C)
-#define nh5awrite_real_s_c       H5_FC_FUNC_(h5awrite_real_s_c, H5AWRITE_REAL_S_C)
-#define nh5awrite_real_1_c       H5_FC_FUNC_(h5awrite_real_1_c, H5AWRITE_REAL_1_C)
-#define nh5awrite_real_2_c       H5_FC_FUNC_(h5awrite_real_2_c, H5AWRITE_REAL_2_C)
-#define nh5awrite_real_3_c       H5_FC_FUNC_(h5awrite_real_3_c, H5AWRITE_REAL_3_C)
-#define nh5awrite_real_4_c       H5_FC_FUNC_(h5awrite_real_4_c, H5AWRITE_REAL_4_C)
-#define nh5awrite_real_5_c       H5_FC_FUNC_(h5awrite_real_5_c, H5AWRITE_REAL_5_C)
-#define nh5awrite_real_6_c       H5_FC_FUNC_(h5awrite_real_6_c, H5AWRITE_REAL_6_C)
-#define nh5awrite_real_7_c       H5_FC_FUNC_(h5awrite_real_7_c, H5AWRITE_REAL_7_C)
-#define nh5awrite_double_s_c       H5_FC_FUNC_(h5awrite_double_s_c, H5AWRITE_DOUBLE_S_C)
-#define nh5awrite_double_1_c       H5_FC_FUNC_(h5awrite_double_1_c, H5AWRITE_DOUBLE_1_C)
-#define nh5awrite_double_2_c       H5_FC_FUNC_(h5awrite_double_2_c, H5AWRITE_DOUBLE_2_C)
-#define nh5awrite_double_3_c       H5_FC_FUNC_(h5awrite_double_3_c, H5AWRITE_DOUBLE_3_C)
-#define nh5awrite_double_4_c       H5_FC_FUNC_(h5awrite_double_4_c, H5AWRITE_DOUBLE_4_C)
-#define nh5awrite_double_5_c       H5_FC_FUNC_(h5awrite_double_5_c, H5AWRITE_DOUBLE_5_C)
-#define nh5awrite_double_6_c       H5_FC_FUNC_(h5awrite_double_6_c, H5AWRITE_DOUBLE_6_C)
-#define nh5awrite_double_7_c       H5_FC_FUNC_(h5awrite_double_7_c, H5AWRITE_DOUBLE_7_C)
-#define nh5awritec_c        H5_FC_FUNC_(h5awritec_c, H5AWRITEC_C)
-#define nh5awritec_s_c      H5_FC_FUNC_(h5awritec_s_c, H5AWRITEC_S_C)
-#define nh5awritec_1_c      H5_FC_FUNC_(h5awritec_1_c, H5AWRITEC_1_C)
-#define nh5awritec_2_c      H5_FC_FUNC_(h5awritec_2_c, H5AWRITEC_2_C)
-#define nh5awritec_3_c      H5_FC_FUNC_(h5awritec_3_c, H5AWRITEC_3_C)
-#define nh5awritec_4_c      H5_FC_FUNC_(h5awritec_4_c, H5AWRITEC_4_C)
-#define nh5awritec_5_c      H5_FC_FUNC_(h5awritec_5_c, H5AWRITEC_5_C)
-#define nh5awritec_6_c      H5_FC_FUNC_(h5awritec_6_c, H5AWRITEC_6_C)
-#define nh5awritec_7_c      H5_FC_FUNC_(h5awritec_7_c, H5AWRITEC_7_C)
-#define nh5aread_c                 H5_FC_FUNC_(h5aread_c, H5AREAD_C)
-#define nh5aread_integer_s_c        H5_FC_FUNC_(h5aread_integer_s_c, H5AREAD_INTEGER_S_C)
-#define nh5aread_integer_1_c        H5_FC_FUNC_(h5aread_integer_1_c, H5AREAD_INTEGER_1_C)
-#define nh5aread_integer_2_c        H5_FC_FUNC_(h5aread_integer_2_c, H5AREAD_INTEGER_2_C)
-#define nh5aread_integer_3_c        H5_FC_FUNC_(h5aread_integer_3_c, H5AREAD_INTEGER_3_C)
-#define nh5aread_integer_4_c        H5_FC_FUNC_(h5aread_integer_4_c, H5AREAD_INTEGER_4_C)
-#define nh5aread_integer_5_c        H5_FC_FUNC_(h5aread_integer_5_c, H5AREAD_INTEGER_5_C)
-#define nh5aread_integer_6_c        H5_FC_FUNC_(h5aread_integer_6_c, H5AREAD_INTEGER_6_C)
-#define nh5aread_integer_7_c        H5_FC_FUNC_(h5aread_integer_7_c, H5AREAD_INTEGER_7_C)
-#define nh5aread_real_s_c        H5_FC_FUNC_(h5aread_real_s_c, H5AREAD_REAL_S_C)
-#define nh5aread_real_1_c        H5_FC_FUNC_(h5aread_real_1_c, H5AREAD_REAL_1_C)
-#define nh5aread_real_2_c        H5_FC_FUNC_(h5aread_real_2_c, H5AREAD_REAL_2_C)
-#define nh5aread_real_3_c        H5_FC_FUNC_(h5aread_real_3_c, H5AREAD_REAL_3_C)
-#define nh5aread_real_4_c        H5_FC_FUNC_(h5aread_real_4_c, H5AREAD_REAL_4_C)
-#define nh5aread_real_5_c        H5_FC_FUNC_(h5aread_real_5_c, H5AREAD_REAL_5_C)
-#define nh5aread_real_6_c        H5_FC_FUNC_(h5aread_real_6_c, H5AREAD_REAL_6_C)
-#define nh5aread_real_7_c        H5_FC_FUNC_(h5aread_real_7_c, H5AREAD_REAL_7_C)
-#define nh5aread_double_s_c        H5_FC_FUNC_(h5aread_double_s_c, H5AREAD_DOUBLE_S_C)
-#define nh5aread_double_1_c        H5_FC_FUNC_(h5aread_double_1_c, H5AREAD_DOUBLE_1_C)
-#define nh5aread_double_2_c        H5_FC_FUNC_(h5aread_double_2_c, H5AREAD_DOUBLE_2_C)
-#define nh5aread_double_3_c        H5_FC_FUNC_(h5aread_double_3_c, H5AREAD_DOUBLE_3_C)
-#define nh5aread_double_4_c        H5_FC_FUNC_(h5aread_double_4_c, H5AREAD_DOUBLE_4_C)
-#define nh5aread_double_5_c        H5_FC_FUNC_(h5aread_double_5_c, H5AREAD_DOUBLE_5_C)
-#define nh5aread_double_6_c        H5_FC_FUNC_(h5aread_double_6_c, H5AREAD_DOUBLE_6_C)
-#define nh5aread_double_7_c        H5_FC_FUNC_(h5aread_double_7_c, H5AREAD_DOUBLE_7_C)
-#define nh5areadc_c       H5_FC_FUNC_(h5areadc_c, H5AREADC_C)
-#define nh5areadc_s_c       H5_FC_FUNC_(h5areadc_s_c, H5AREADC_S_C)
-#define nh5areadc_1_c       H5_FC_FUNC_(h5areadc_1_c, H5AREADC_1_C)
-#define nh5areadc_2_c       H5_FC_FUNC_(h5areadc_2_c, H5AREADC_2_C)
-#define nh5areadc_3_c       H5_FC_FUNC_(h5areadc_3_c, H5AREADC_3_C)
-#define nh5areadc_4_c       H5_FC_FUNC_(h5areadc_4_c, H5AREADC_4_C)
-#define nh5areadc_5_c       H5_FC_FUNC_(h5areadc_5_c, H5AREADC_5_C)
-#define nh5areadc_6_c       H5_FC_FUNC_(h5areadc_6_c, H5AREADC_6_C)
-#define nh5areadc_7_c       H5_FC_FUNC_(h5areadc_7_c, H5AREADC_7_C)
-#define nh5aget_name_c    H5_FC_FUNC_(h5aget_name_c, H5AGET_NAME_C)
-#define nh5aopen_idx_c    H5_FC_FUNC_(h5aopen_idx_c, H5AOPEN_IDX_C)
-#define nh5aget_space_c   H5_FC_FUNC_(h5aget_space_c, H5AGET_SPACE_C)
-#define nh5aget_type_c    H5_FC_FUNC_(h5aget_type_c, H5AGET_TYPE_C)
-#define nh5aget_num_attrs_c H5_FC_FUNC_(h5aget_num_attrs_c, H5AGET_NUM_ATTRS_C)
-#define nh5adelete_c      H5_FC_FUNC_(h5adelete_c, H5ADELETE_C)
-#define nh5aget_storage_size_c H5_FC_FUNC_(h5aget_storage_size_c, H5AGET_STORAGE_SIZE_C)
-#define nh5arename_by_name_c H5_FC_FUNC_(h5arename_by_name_c, H5ARENAME_BY_NAME_C)
-#define nh5aopen_c H5_FC_FUNC_(h5aopen_c, H5AOPEN_C)
-#define nh5adelete_by_name_c H5_FC_FUNC_(h5adelete_by_name_c,H5ADELETE_BY_NAME_C)
-#define nh5adelete_by_idx_c H5_FC_FUNC_(h5adelete_by_idx_c,H5ADELETE_BY_IDX_C)
-#define nh5aget_name_by_idx_c H5_FC_FUNC_(h5aget_name_by_idx_c,H5AGET_NAME_BY_IDX_C)
-#define nh5aget_create_plist_c H5_FC_FUNC_(h5aget_create_plist_c,H5AGET_CREATE_PLIST_C)
-#define nh5aopen_by_idx_c H5_FC_FUNC_(h5aopen_by_idx_c,H5AOPEN_BY_IDX_C)
-#define nh5aget_info_c H5_FC_FUNC_(h5aget_info_c,H5AGET_INFO_C)
-#define nh5aget_info_by_idx_c H5_FC_FUNC_(h5aget_info_by_idx_c,H5AGET_INFO_BY_IDX_C)
-#define nh5aget_info_by_name_c H5_FC_FUNC_(h5aget_info_by_name_c,H5AGET_INFO_BY_NAME_C)
-#define nh5aget_info_by_name_c H5_FC_FUNC_(h5aget_info_by_name_c,H5AGET_INFO_BY_NAME_C)
-#define nh5acreate_by_name_c H5_FC_FUNC_(h5acreate_by_name_c,H5ACREATE_BY_NAME_C)
-#define nh5aexists_c H5_FC_FUNC_(h5aexists_c,H5AEXISTS_C)
-#define nh5aexists_by_name_c H5_FC_FUNC_(h5aexists_by_name_c,H5AEXISTS_BY_NAME_C)
-#define nh5aopen_by_name_c H5_FC_FUNC_(h5aopen_by_name_c,H5AOPEN_BY_NAME_C)
-#define nh5arename_c H5_FC_FUNC_(h5arename_c,H5ARENAME_C)
 
-H5_FCDLL int_f nh5acreate_c (hid_t_f *obj_id, _fcd name, size_t_f *namelen, hid_t_f *type_id, hid_t_f *space_id, hid_t_f *crt_prp, hid_t_f *aapl,  hid_t_f *attr_id);
-H5_FCDLL int_f nh5aopen_name_c (hid_t_f *obj_id, _fcd name, size_t_f *namelen, hid_t_f *attr_id);
-H5_FCDLL int_f nh5awritec_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims);
-H5_FCDLL int_f nh5awritec_s_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims);
-H5_FCDLL int_f nh5awritec_1_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims);
-H5_FCDLL int_f nh5awritec_2_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims);
-H5_FCDLL int_f nh5awritec_3_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims);
-H5_FCDLL int_f nh5awritec_4_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims);
-H5_FCDLL int_f nh5awritec_5_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims);
-H5_FCDLL int_f nh5awritec_6_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims);
-H5_FCDLL int_f nh5awritec_7_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims);
-H5_FCDLL int_f nh5awrite_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5awrite_integer_s_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5awrite_integer_1_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5awrite_integer_2_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5awrite_integer_3_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5awrite_integer_4_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5awrite_integer_5_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5awrite_integer_6_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5awrite_integer_7_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5awrite_real_s_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5awrite_real_1_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5awrite_real_2_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5awrite_real_3_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5awrite_real_4_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5awrite_real_5_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5awrite_real_6_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5awrite_real_7_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5awrite_double_s_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5awrite_double_1_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5awrite_double_2_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5awrite_double_3_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5awrite_double_4_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5awrite_double_5_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5awrite_double_6_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5awrite_double_7_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5awrite_f_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf);
-H5_FCDLL int_f nh5areadc_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims);
-H5_FCDLL int_f nh5areadc_s_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims);
-H5_FCDLL int_f nh5areadc_1_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims);
-H5_FCDLL int_f nh5areadc_2_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims);
-H5_FCDLL int_f nh5areadc_3_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims);
-H5_FCDLL int_f nh5areadc_4_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims);
-H5_FCDLL int_f nh5areadc_5_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims);
-H5_FCDLL int_f nh5areadc_6_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims);
-H5_FCDLL int_f nh5areadc_7_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims);
-H5_FCDLL int_f nh5aread_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5aread_integer_s_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5aread_integer_1_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5aread_integer_2_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5aread_integer_3_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5aread_integer_4_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5aread_integer_5_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5aread_integer_6_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5aread_integer_7_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5aread_real_s_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5aread_real_1_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5aread_real_2_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5aread_real_3_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5aread_real_4_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5aread_real_5_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5aread_real_6_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5aread_real_7_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5aread_double_s_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5aread_double_1_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5aread_double_2_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5aread_double_3_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5aread_double_4_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5aread_double_5_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5aread_double_6_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5aread_double_7_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5aread_f_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf);
-H5_FCDLL int_f nh5aclose_c ( hid_t_f *attr_id );
-H5_FCDLL int_f nh5adelete_c (hid_t_f *obj_id, _fcd name, size_t_f *namelen);
-H5_FCDLL int_f nh5aopen_idx_c (hid_t_f *obj_id, int_f *idx, hid_t_f *attr_id);
-H5_FCDLL int_f nh5aget_space_c (hid_t_f *attr_id, hid_t_f *space_id);
-H5_FCDLL int_f nh5aget_type_c (hid_t_f *attr_id, hid_t_f *type_id);
-H5_FCDLL int_f nh5aget_num_attrs_c (hid_t_f *obj_id, int_f *attr_num);
-H5_FCDLL int_f nh5aget_name_c(hid_t_f *attr_id, size_t_f *size, _fcd buf);
-H5_FCDLL int_f nh5aget_storage_size_c ( hid_t_f *attr_id, hsize_t_f *size );
-H5_FCDLL int_f nh5arename_by_name_c ( hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
-				      _fcd old_attr_name, size_t_f *old_attr_namelen,
-				      _fcd new_attr_name, size_t_f *new_attr_namelen,
-				      hid_t_f *lapl_id );
-H5_FCDLL int_f nh5aopen_c ( hid_t_f *obj_id, _fcd attr_name, size_t_f *attr_namelen,
-			    hid_t_f *aapl_id, hid_t_f *attr_id);
-H5_FCDLL int_f nh5adelete_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
-				     _fcd attr_name, size_t_f *attr_namelen, hid_t_f *lapl_id);
-H5_FCDLL int_f nh5adelete_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
-				    int_f *idx_type, int_f *order, hsize_t_f *n, hid_t_f *lapl_id);
-H5_FCDLL int_f nh5aget_name_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
-				      int_f *idx_type, int_f *order, hsize_t_f *n, _fcd name,
-				      size_t_f *size, hid_t_f *lapl_id);
-H5_FCDLL int_f nh5aget_create_plist_c ( hid_t_f *attr_id, hid_t_f *creation_prop_id );
-H5_FCDLL int_f nh5aopen_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
-		     int_f *idx_type, int_f *order, hsize_t_f *n, hid_t_f *aapl_id, hid_t_f *lapl_id, hid_t_f *attr_id);
-H5_FCDLL int_f nh5aget_info_c (hid_t_f *loc_id, int_f *corder_valid, int_f *corder,
-			       int_f *cset, hsize_t_f *data_size );
-H5_FCDLL int_f nh5aget_info_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
-				      int_f *idx_type, int_f *order, hsize_t_f *n, hid_t_f *lapl_id,
-				      int_f *corder_valid, int_f *corder,
-				      int_f *cset, hsize_t_f *data_size );
-H5_FCDLL int_f nh5aget_info_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
-				       _fcd attr_name, size_t_f *attr_namelen, hid_t_f *lapl_id,
-				       int_f *corder_valid, int_f *corder,
-				       int_f *cset, hsize_t_f *data_size );
-H5_FCDLL int_f nh5acreate_by_name_c(hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
-				    _fcd attr_name, size_t_f *attr_namelen,  hid_t_f *type_id,
-				    hid_t_f *space_id, hid_t_f *acpl_id, hid_t_f *aapl_id,
-				    hid_t_f *lapl_id, hid_t_f *attr_id );
-H5_FCDLL int_f nh5aexists_c (hid_t_f *obj_id, _fcd name, size_t_f *namelen, hid_t_f *attr_exists);
-H5_FCDLL int_f nh5aexists_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fcd attr_name, size_t_f *attr_namelen,
-		      hid_t_f *lapl_id, int_f *attr_exists);
-H5_FCDLL int_f nh5aopen_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fcd attr_name, size_t_f *attr_namelen,
-				   hid_t_f *aapl_id, hid_t_f *lapl_id, hid_t_f *attr_id);
-H5_FCDLL int_f nh5arename_c( hid_t_f *loc_id,
-		      _fcd old_attr_name, size_t_f *old_attr_namelen,
-		      _fcd new_attr_name, size_t_f *new_attr_namelen);
+H5_FCDLL int_f h5awrite_f_c(hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf);
+H5_FCDLL int_f h5aread_f_c(hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf);
+H5_FCDLL int_f h5acreate_c(hid_t_f *obj_id, _fcd name, size_t_f *namelen, hid_t_f *type_id, hid_t_f *space_id,
+                           hid_t_f *crt_prp, hid_t_f *aapl, hid_t_f *attr_id);
+H5_FCDLL int_f h5adelete_c(hid_t_f *obj_id, _fcd name, size_t_f *namelen);
+H5_FCDLL int_f h5aget_num_attrs_c(hid_t_f *obj_id, int_f *attr_num);
+H5_FCDLL int_f h5aget_name_c(hid_t_f *attr_id, size_t_f *size, _fcd buf);
+H5_FCDLL int_f h5arename_by_name_c(hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fcd old_attr_name,
+                                   size_t_f *old_attr_namelen, _fcd new_attr_name, size_t_f *new_attr_namelen,
+                                   hid_t_f *lapl_id);
+H5_FCDLL int_f h5aopen_c(hid_t_f *obj_id, _fcd attr_name, size_t_f *attr_namelen, hid_t_f *aapl_id,
+                         hid_t_f *attr_id);
+H5_FCDLL int_f h5adelete_by_name_c(hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fcd attr_name,
+                                   size_t_f *attr_namelen, hid_t_f *lapl_id);
+H5_FCDLL int_f h5adelete_by_idx_c(hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, int_f *idx_type,
+                                  int_f *order, hsize_t_f *n, hid_t_f *lapl_id);
+H5_FCDLL int_f h5aget_name_by_idx_c(hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, int_f *idx_type,
+                                    int_f *order, hsize_t_f *n, _fcd name, size_t_f *size, hid_t_f *lapl_id);
+H5_FCDLL int_f h5aopen_by_idx_c(hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, int_f *idx_type,
+                                int_f *order, hsize_t_f *n, hid_t_f *aapl_id, hid_t_f *lapl_id,
+                                hid_t_f *attr_id);
+H5_FCDLL int_f h5aget_info_c(hid_t_f *loc_id, int_f *corder_valid, int_f *corder, int_f *cset,
+                             hsize_t_f *data_size);
+H5_FCDLL int_f h5aget_info_by_idx_c(hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, int_f *idx_type,
+                                    int_f *order, hsize_t_f *n, hid_t_f *lapl_id, int_f *corder_valid,
+                                    int_f *corder, int_f *cset, hsize_t_f *data_size);
+H5_FCDLL int_f h5aget_info_by_name_c(hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fcd attr_name,
+                                     size_t_f *attr_namelen, hid_t_f *lapl_id, int_f *corder_valid,
+                                     int_f *corder, int_f *cset, hsize_t_f *data_size);
+H5_FCDLL int_f h5acreate_by_name_c(hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fcd attr_name,
+                                   size_t_f *attr_namelen, hid_t_f *type_id, hid_t_f *space_id,
+                                   hid_t_f *acpl_id, hid_t_f *aapl_id, hid_t_f *lapl_id, hid_t_f *attr_id);
+H5_FCDLL int_f h5aexists_c(hid_t_f *obj_id, _fcd name, size_t_f *namelen, hid_t_f *attr_exists);
+H5_FCDLL int_f h5aexists_by_name_c(hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fcd attr_name,
+                                   size_t_f *attr_namelen, hid_t_f *lapl_id, int_f *attr_exists);
+H5_FCDLL int_f h5aopen_by_name_c(hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fcd attr_name,
+                                 size_t_f *attr_namelen, hid_t_f *aapl_id, hid_t_f *lapl_id,
+                                 hid_t_f *attr_id);
+H5_FCDLL int_f h5arename_c(hid_t_f *loc_id, _fcd old_attr_name, size_t_f *old_attr_namelen,
+                           _fcd new_attr_name, size_t_f *new_attr_namelen);
 
 /*
  * Functions form H5Tf.c file
  */
-#define nh5topen_c         H5_FC_FUNC_(h5topen_c, H5TOPEN_C)
-#define nh5tcommit_c       H5_FC_FUNC_(h5tcommit_c, H5TCOMMIT_C)
-#define nh5tcommitted_c    H5_FC_FUNC_(h5tcommitted_c, H5TCOMMITTED_C)
-#define nh5tclose_c        H5_FC_FUNC_(h5tclose_c, H5TCLOSE_C)
-#define nh5tcopy_c         H5_FC_FUNC_(h5tcopy_c, H5TCOPY_C)
-#define nh5tequal_c        H5_FC_FUNC_(h5tequal_c, H5TEQUAL_C)
-#define nh5tget_class_c    H5_FC_FUNC_(h5tget_class_c, H5TGET_CLASS_C)
-#define nh5tget_order_c    H5_FC_FUNC_(h5tget_order_c, H5TGET_ORDER_C)
-#define nh5tset_order_c    H5_FC_FUNC_(h5tset_order_c, H5TSET_ORDER_C)
-#define nh5tget_size_c     H5_FC_FUNC_(h5tget_size_c, H5TGET_SIZE_C)
-#define nh5tset_size_c     H5_FC_FUNC_(h5tset_size_c, H5TSET_SIZE_C)
-#define nh5tget_precision_c     H5_FC_FUNC_(h5tget_precision_c, H5TGET_PRECISION_C)
-#define nh5tset_precision_c     H5_FC_FUNC_(h5tset_precision_c, H5TSET_PRECISION_C)
-#define nh5tget_offset_c        H5_FC_FUNC_(h5tget_offset_c, H5TGET_OFFSET_C)
-#define nh5tset_offset_c        H5_FC_FUNC_(h5tset_offset_c, H5TSET_OFFSET_C)
-#define nh5tget_pad_c        H5_FC_FUNC_(h5tget_pad_c, H5TGET_PAD_C)
-#define nh5tset_pad_c        H5_FC_FUNC_(h5tset_pad_c, H5TSET_PAD_C)
-#define nh5tget_sign_c       H5_FC_FUNC_(h5tget_sign_c, H5TGET_SIGN_C)
-#define nh5tset_sign_c       H5_FC_FUNC_(h5tset_sign_c, H5TSET_SIGN_C)
-#define nh5tget_fields_c       H5_FC_FUNC_(h5tget_fields_c, H5TGET_FIELDS_C)
-#define nh5tset_fields_c       H5_FC_FUNC_(h5tset_fields_c, H5TSET_FIELDS_C)
-#define nh5tget_ebias_c     H5_FC_FUNC_(h5tget_ebias_c, H5TGET_EBIAS_C)
-#define nh5tset_ebias_c     H5_FC_FUNC_(h5tset_ebias_c, H5TSET_EBIAS_C)
-#define nh5tget_norm_c     H5_FC_FUNC_(h5tget_norm_c, H5TGET_NORM_C)
-#define nh5tset_norm_c     H5_FC_FUNC_(h5tset_norm_c, H5TSET_NORM_C)
-#define nh5tget_inpad_c        H5_FC_FUNC_(h5tget_inpad_c, H5TGET_INPAD_C)
-#define nh5tset_inpad_c        H5_FC_FUNC_(h5tset_inpad_c, H5TSET_INPAD_C)
-#define nh5tget_cset_c        H5_FC_FUNC_(h5tget_cset_c, H5TGET_CSET_C)
-#define nh5tset_cset_c        H5_FC_FUNC_(h5tset_cset_c, H5TSET_CSET_C)
-#define nh5tget_strpad_c        H5_FC_FUNC_(h5tget_strpad_c, H5TGET_STRPAD_C)
-#define nh5tset_strpad_c        H5_FC_FUNC_(h5tset_strpad_c, H5TSET_STRPAD_C)
-#define nh5tget_nmembers_c        H5_FC_FUNC_(h5tget_nmembers_c, H5TGET_NMEMBERS_C)
-#define nh5tget_member_name_c        H5_FC_FUNC_(h5tget_member_name_c, H5TGET_MEMBER_NAME_C)
-#define nh5tget_member_offset_c        H5_FC_FUNC_(h5tget_member_offset_c, H5TGET_MEMBER_OFFSET_C)
-#define nh5tget_member_dims_c        H5_FC_FUNC_(h5tget_member_dims_c, H5TGET_MEMBER_DIMS_C)
-#define nh5tget_member_type_c        H5_FC_FUNC_(h5tget_member_type_c, H5TGET_MEMBER_TYPE_C)
-#define nh5tget_member_index_c        H5_FC_FUNC_(h5tget_member_index_c, H5TGET_MEMBER_INDEX_C)
-#define nh5tinsert_c        H5_FC_FUNC_(h5tinsert_c, H5TINSERT_C)
-#define nh5tcreate_c        H5_FC_FUNC_(h5tcreate_c, H5TCREATE_C)
-#define nh5tpack_c                   H5_FC_FUNC_(h5tpack_c, H5TPACK_C)
-#define nh5tinsert_array_c           H5_FC_FUNC_(h5tinsert_array_c, H5TINSERT_ARRAY_C)
-#define nh5tinsert_array_c2           H5_FC_FUNC_(h5tinsert_array_c2, H5TINSERT_ARRAY_C2)
-#define nh5tenum_create_c             H5_FC_FUNC_(h5tenum_create_c, H5TENUM_CREATE_C)
-#define nh5tenum_insert_c             H5_FC_FUNC_(h5tenum_insert_c, H5TENUM_INSERT_C)
-#define nh5tenum_nameof_c             H5_FC_FUNC_(h5tenum_nameof_c, H5TENUM_NAMEOF_C)
-#define nh5tenum_valueof_c             H5_FC_FUNC_(h5tenum_valueof_c, H5TENUM_VALUEOF_C)
-#define nh5tget_member_value_c         H5_FC_FUNC_(h5tget_member_value_c, H5TGET_MEMBER_VALUE_C)
-#define nh5tset_tag_c                  H5_FC_FUNC_(h5tset_tag_c, H5TSET_TAG_C)
-#define nh5tget_tag_c                  H5_FC_FUNC_(h5tget_tag_c, H5TGET_TAG_C)
-#define nh5tarray_create_c             H5_FC_FUNC_(h5tarray_create_c, H5TARRAY_CREATE_C)
-#define nh5tget_array_ndims_c          H5_FC_FUNC_(h5tget_array_ndims_c, H5TGET_ARRAY_NDIMS_C)
-#define nh5tget_array_dims_c          H5_FC_FUNC_(h5tget_array_dims_c, H5TGET_ARRAY_DIMS_C)
-#define nh5tget_super_c               H5_FC_FUNC_(h5tget_super_c, H5TGET_SUPER_C)
-#define nh5tvlen_create_c               H5_FC_FUNC_(h5tvlen_create_c, H5TVLEN_CREATE_C)
-#define nh5tis_variable_str_c         H5_FC_FUNC_(h5tis_variable_str_c, H5TIS_VARIABLE_STR_C)
-#define nh5tget_member_class_c         H5_FC_FUNC_(h5tget_member_class_c, H5TGET_MEMBER_CLASS_C)
-#define nh5tcommit_anon_c       H5_FC_FUNC_(h5tcommit_anon_c, H5TCOMMIT_ANON_C)
-#define nh5tdecode_c    H5_FC_FUNC_(h5tdecode_c, H5TDECODE_C)
-#define nh5tencode_c    H5_FC_FUNC_(h5tencode_c, H5TENCODE_C)
-#define nh5tget_create_plist_c H5_FC_FUNC_(h5tget_create_plist_c, H5TGET_CREATE_PLIST_C)
-#define nh5tcompiler_conv_c H5_FC_FUNC_(h5tcompiler_conv_c, H5TCOMPILER_CONV_C)
-#define nh5tget_native_type_c H5_FC_FUNC_(h5tget_native_type_c, H5TGET_NATIVE_TYPE_C )
-
-H5_FCDLL int_f nh5tcreate_c(int_f *cls, size_t_f *size, hid_t_f *type_id);
-H5_FCDLL int_f nh5topen_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id, hid_t_f *tapl_id );
-H5_FCDLL int_f nh5tcommit_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id, hid_t_f *lcpl_id, hid_t_f *tcpl_id, hid_t_f *tapl_id);
-H5_FCDLL int_f nh5tclose_c ( hid_t_f *type_id );
-H5_FCDLL int_f nh5tequal_c ( hid_t_f *type1_id , hid_t_f *type2_id, int_f *c_flag);
-H5_FCDLL int_f nh5tcopy_c ( hid_t_f *type_id , hid_t_f *new_type_id);
-H5_FCDLL int_f nh5tget_class_c ( hid_t_f *type_id , int_f *classtype);
-H5_FCDLL int_f nh5tget_order_c ( hid_t_f *type_id , int_f *order);
-H5_FCDLL int_f nh5tset_order_c ( hid_t_f *type_id , int_f *order);
-H5_FCDLL int_f nh5tget_size_c ( hid_t_f *type_id , size_t_f *size);
-H5_FCDLL int_f nh5tset_size_c ( hid_t_f *type_id , size_t_f *size);
-H5_FCDLL int_f nh5tcommitted_c (hid_t_f *dtype_id);
-H5_FCDLL int_f nh5tget_precision_c ( hid_t_f *type_id , size_t_f *precision);
-H5_FCDLL int_f nh5tset_precision_c ( hid_t_f *type_id , size_t_f *precision);
-H5_FCDLL int_f nh5tget_offset_c ( hid_t_f *type_id , size_t_f *offset);
-H5_FCDLL int_f nh5tset_offset_c ( hid_t_f *type_id , size_t_f *offset);
-H5_FCDLL int_f nh5tget_pad_c ( hid_t_f *type_id , int_f * lsbpad, int_f * msbpad);
-H5_FCDLL int_f nh5tset_pad_c ( hid_t_f *type_id, int_f * lsbpad, int_f * msbpad );
-H5_FCDLL int_f nh5tget_sign_c ( hid_t_f *type_id , int_f* sign);
-H5_FCDLL int_f nh5tset_sign_c ( hid_t_f *type_id , int_f *sign);
-H5_FCDLL int_f nh5tget_fields_c ( hid_t_f *type_id, size_t_f *spos, size_t_f *epos, size_t_f* esize, size_t_f* mpos, size_t_f* msize);
-H5_FCDLL int_f nh5tset_fields_c ( hid_t_f *type_id, size_t_f *spos, size_t_f *epos, size_t_f* esize, size_t_f* mpos, size_t_f* msize);
-H5_FCDLL int_f nh5tget_ebias_c ( hid_t_f *type_id , size_t_f *ebias);
-H5_FCDLL int_f nh5tset_ebias_c ( hid_t_f *type_id , size_t_f *ebias);
-H5_FCDLL int_f nh5tget_norm_c ( hid_t_f *type_id , int_f *norm);
-H5_FCDLL int_f nh5tset_norm_c ( hid_t_f *type_id , int_f *norm);
-H5_FCDLL int_f nh5tget_inpad_c ( hid_t_f *type_id, int_f * padtype);
-H5_FCDLL int_f nh5tset_inpad_c ( hid_t_f *type_id, int_f * padtype);
-H5_FCDLL int_f nh5tget_cset_c ( hid_t_f *type_id, int_f * cset);
-H5_FCDLL int_f nh5tset_cset_c ( hid_t_f *type_id, int_f * cset);
-H5_FCDLL int_f nh5tget_strpad_c ( hid_t_f *type_id, int_f * strpad);
-H5_FCDLL int_f nh5tset_strpad_c ( hid_t_f *type_id, int_f * strpad);
-H5_FCDLL int_f nh5tget_nmembers_c ( hid_t_f *type_id , int_f * num_members);
-H5_FCDLL int_f nh5tget_member_name_c ( hid_t_f *type_id ,int_f* idx, _fcd member_name, int_f *namelen);
-H5_FCDLL int_f nh5tget_member_dims_c ( hid_t_f *type_id ,int_f* field_idx, int_f * dims, size_t_f * field_dims, int_f * perm );
-H5_FCDLL int_f nh5tget_member_offset_c ( hid_t_f *type_id ,int_f* member_no, size_t_f* offset);
-H5_FCDLL int_f nh5tget_member_type_c ( hid_t_f *type_id ,int_f* field_idx, hid_t_f * datatype);
-H5_FCDLL int_f nh5tget_member_index_c ( hid_t_f *type_id ,_fcd name, int_f* namelen, int_f *idx);
-H5_FCDLL int_f nh5tinsert_c(hid_t_f *type_id, _fcd name, int_f* namelen, size_t_f *offset, hid_t_f * field_id);
-H5_FCDLL int_f nh5tpack_c(hid_t_f * type_id);
-H5_FCDLL int_f nh5tinsert_array_c(hid_t_f * parent_id, _fcd name, int_f* namelen, size_t_f* offset, int_f* ndims, size_t_f* dims, hid_t_f* member_id, int_f* perm );
-H5_FCDLL int_f nh5tinsert_array_c2(hid_t_f * parent_id, _fcd name, int_f* namelen, size_t_f* offset, int_f* ndims, size_t_f* dims, hid_t_f* member_id);
-H5_FCDLL int_f nh5tenum_create_c ( hid_t_f *parent_id , hid_t_f *new_type_id);
-H5_FCDLL int_f nh5tenum_insert_c(hid_t_f *type_id, _fcd name, int_f* namelen, int_f* value);
-H5_FCDLL int_f h5tenum_insert_ptr_c(hid_t_f *type_id, _fcd name, int_f* namelen, void *value);
-H5_FCDLL int_f nh5tenum_nameof_c(hid_t_f *type_id, int_f* value, _fcd name, size_t_f* namelen);
-H5_FCDLL int_f nh5tenum_valueof_c(hid_t_f *type_id, _fcd name, int_f* namelen, int_f* value);
-H5_FCDLL int_f nh5tget_member_value_c(hid_t_f *type_id, int_f* member_no, int_f* value);
-H5_FCDLL int_f nh5tset_tag_c(hid_t_f* type_id, _fcd tag, int_f* namelen);
-H5_FCDLL int_f nh5tget_tag_c(hid_t_f* type_id, _fcd tag, size_t_f* tag_size, int_f* namelen);
-H5_FCDLL int_f nh5tarray_create_c(hid_t_f * base_id, int_f *rank, hsize_t_f* dims, hid_t_f* type_id);
-H5_FCDLL int_f nh5tget_array_dims_c ( hid_t_f *type_id , hsize_t_f * dims);
-H5_FCDLL int_f nh5tget_array_ndims_c ( hid_t_f *type_id , int_f * ndims);
-H5_FCDLL int_f nh5tget_super_c ( hid_t_f *type_id , hid_t_f *base_type_id);
-H5_FCDLL int_f nh5tvlen_create_c ( hid_t_f *type_id , hid_t_f *vltype_id);
-H5_FCDLL int_f nh5tis_variable_str_c ( hid_t_f *type_id , int_f *flag );
-H5_FCDLL int_f nh5tget_member_class_c ( hid_t_f *type_id ,  int_f *member_no, int_f *cls );
-H5_FCDLL int_f nh5tcommit_anon_c(hid_t_f *loc_id, hid_t_f *dtype_id, hid_t_f *tcpl_id, hid_t_f *tapl_id);
-H5_FCDLL int_f nh5tdecode_c ( _fcd buf, hid_t_f *obj_id );
-H5_FCDLL int_f nh5tencode_c (_fcd buf, hid_t_f *obj_id, size_t_f *nalloc );
-H5_FCDLL int_f nh5tget_create_plist_c ( hid_t_f *dtype_id,  hid_t_f *dtpl_id);
-H5_FCDLL int_f nh5tcompiler_conv_c ( hid_t_f *src_id, hid_t_f *dst_id, int_f *c_flag);
-H5_FCDLL int_f nh5tget_native_type_c(hid_t_f *dtype_id, int_f *direction, hid_t_f *native_dtype_id);
-H5_FCDLL int_f h5tconvert_c(hid_t_f *src_id, hid_t_f *dst_id, size_t_f *nelmts, void *buf, void *background, hid_t_f *plist_id);
 
+H5_FCDLL int_f h5tcreate_c(int_f *cls, size_t_f *size, hid_t_f *type_id);
+H5_FCDLL int_f h5topen_c(hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id, hid_t_f *tapl_id);
+H5_FCDLL int_f h5tcommit_c(hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id, hid_t_f *lcpl_id,
+                           hid_t_f *tcpl_id, hid_t_f *tapl_id);
+H5_FCDLL int_f h5tclose_c(hid_t_f *type_id);
+H5_FCDLL int_f h5tequal_c(hid_t_f *type1_id, hid_t_f *type2_id, int_f *c_flag);
+H5_FCDLL int_f h5tcopy_c(hid_t_f *type_id, hid_t_f *new_type_id);
+H5_FCDLL int_f h5tget_class_c(hid_t_f *type_id, int_f *classtype);
+H5_FCDLL int_f h5tget_order_c(hid_t_f *type_id, int_f *order);
+H5_FCDLL int_f h5tset_order_c(hid_t_f *type_id, int_f *order);
+H5_FCDLL int_f h5tget_size_c(hid_t_f *type_id, size_t_f *size);
+H5_FCDLL int_f h5tset_size_c(hid_t_f *type_id, size_t_f *size);
+H5_FCDLL int_f h5tcommitted_c(hid_t_f *dtype_id);
+H5_FCDLL int_f h5tget_precision_c(hid_t_f *type_id, size_t_f *precision);
+H5_FCDLL int_f h5tset_precision_c(hid_t_f *type_id, size_t_f *precision);
+H5_FCDLL int_f h5tget_offset_c(hid_t_f *type_id, size_t_f *offset);
+H5_FCDLL int_f h5tset_offset_c(hid_t_f *type_id, size_t_f *offset);
+H5_FCDLL int_f h5tget_pad_c(hid_t_f *type_id, int_f *lsbpad, int_f *msbpad);
+H5_FCDLL int_f h5tset_pad_c(hid_t_f *type_id, int_f *lsbpad, int_f *msbpad);
+H5_FCDLL int_f h5tget_sign_c(hid_t_f *type_id, int_f *sign);
+H5_FCDLL int_f h5tset_sign_c(hid_t_f *type_id, int_f *sign);
+H5_FCDLL int_f h5tget_fields_c(hid_t_f *type_id, size_t_f *spos, size_t_f *epos, size_t_f *esize,
+                               size_t_f *mpos, size_t_f *msize);
+H5_FCDLL int_f h5tset_fields_c(hid_t_f *type_id, size_t_f *spos, size_t_f *epos, size_t_f *esize,
+                               size_t_f *mpos, size_t_f *msize);
+H5_FCDLL int_f h5tget_ebias_c(hid_t_f *type_id, size_t_f *ebias);
+H5_FCDLL int_f h5tset_ebias_c(hid_t_f *type_id, size_t_f *ebias);
+H5_FCDLL int_f h5tget_norm_c(hid_t_f *type_id, int_f *norm);
+H5_FCDLL int_f h5tset_norm_c(hid_t_f *type_id, int_f *norm);
+H5_FCDLL int_f h5tget_inpad_c(hid_t_f *type_id, int_f *padtype);
+H5_FCDLL int_f h5tset_inpad_c(hid_t_f *type_id, int_f *padtype);
+H5_FCDLL int_f h5tget_cset_c(hid_t_f *type_id, int_f *cset);
+H5_FCDLL int_f h5tset_cset_c(hid_t_f *type_id, int_f *cset);
+H5_FCDLL int_f h5tget_strpad_c(hid_t_f *type_id, int_f *strpad);
+H5_FCDLL int_f h5tset_strpad_c(hid_t_f *type_id, int_f *strpad);
+H5_FCDLL int_f h5tget_nmembers_c(hid_t_f *type_id, int_f *num_members);
+H5_FCDLL int_f h5tget_member_name_c(hid_t_f *type_id, int_f *idx, _fcd member_name, int_f *namelen);
+H5_FCDLL int_f h5tget_member_offset_c(hid_t_f *type_id, int_f *member_no, size_t_f *offset);
+H5_FCDLL int_f h5tget_member_type_c(hid_t_f *type_id, int_f *field_idx, hid_t_f *datatype);
+H5_FCDLL int_f h5tget_member_index_c(hid_t_f *type_id, _fcd name, int_f *namelen, int_f *idx);
+H5_FCDLL int_f h5tinsert_c(hid_t_f *type_id, _fcd name, int_f *namelen, size_t_f *offset, hid_t_f *field_id);
+H5_FCDLL int_f h5tpack_c(hid_t_f *type_id);
+H5_FCDLL int_f h5tinsert_array_c(hid_t_f *parent_id, _fcd name, int_f *namelen, size_t_f *offset,
+                                 int_f *ndims, size_t_f *dims, hid_t_f *member_id, int_f *perm);
+H5_FCDLL int_f h5tinsert_array_c2(hid_t_f *parent_id, _fcd name, int_f *namelen, size_t_f *offset,
+                                  int_f *ndims, size_t_f *dims, hid_t_f *member_id);
+H5_FCDLL int_f h5tenum_create_c(hid_t_f *parent_id, hid_t_f *new_type_id);
+H5_FCDLL int_f h5tenum_insert_c(hid_t_f *type_id, _fcd name, int_f *namelen, int_f *value);
+H5_FCDLL int_f h5tenum_insert_ptr_c(hid_t_f *type_id, _fcd name, int_f *namelen, void *value);
+H5_FCDLL int_f h5tenum_nameof_c(hid_t_f *type_id, int_f *value, _fcd name, size_t_f *namelen);
+H5_FCDLL int_f h5tenum_valueof_c(hid_t_f *type_id, _fcd name, int_f *namelen, int_f *value);
+H5_FCDLL int_f h5tget_member_value_c(hid_t_f *type_id, int_f *member_no, int_f *value);
+H5_FCDLL int_f h5tset_tag_c(hid_t_f *type_id, _fcd tag, int_f *namelen);
+H5_FCDLL int_f h5tget_tag_c(hid_t_f *type_id, _fcd tag, size_t_f *tag_size, int_f *namelen);
+H5_FCDLL int_f h5tarray_create_c(hid_t_f *base_id, int_f *rank, hsize_t_f *dims, hid_t_f *type_id);
+H5_FCDLL int_f h5tget_array_dims_c(hid_t_f *type_id, hsize_t_f *dims);
+H5_FCDLL int_f h5tget_array_ndims_c(hid_t_f *type_id, int_f *ndims);
+H5_FCDLL int_f h5tget_super_c(hid_t_f *type_id, hid_t_f *base_type_id);
+H5_FCDLL int_f h5tvlen_create_c(hid_t_f *type_id, hid_t_f *vltype_id);
+H5_FCDLL int_f h5tis_variable_str_c(hid_t_f *type_id, int_f *flag);
+H5_FCDLL int_f h5tget_member_class_c(hid_t_f *type_id, int_f *member_no, int_f *cls);
+H5_FCDLL int_f h5tcommit_anon_c(hid_t_f *loc_id, hid_t_f *dtype_id, hid_t_f *tcpl_id, hid_t_f *tapl_id);
+H5_FCDLL int_f h5tdecode_c(_fcd buf, hid_t_f *obj_id);
+H5_FCDLL int_f h5tencode_c(_fcd buf, hid_t_f *obj_id, size_t_f *nalloc);
+H5_FCDLL int_f h5tget_create_plist_c(hid_t_f *dtype_id, hid_t_f *dtpl_id);
+H5_FCDLL int_f h5tcompiler_conv_c(hid_t_f *src_id, hid_t_f *dst_id, int_f *c_flag);
+H5_FCDLL int_f h5tget_native_type_c(hid_t_f *dtype_id, int_f *direction, hid_t_f *native_dtype_id);
+H5_FCDLL int_f h5tconvert_c(hid_t_f *src_id, hid_t_f *dst_id, size_t_f *nelmts, void *buf, void *background,
+                            hid_t_f *plist_id);
 
 /*
  * Functions from H5Of.c
  */
 
-#define nh5olink_c       H5_FC_FUNC_(h5olink_c, H5OLINK_C)
-#define nh5oopen_c       H5_FC_FUNC_(h5oopen_c, H5OOPEN_C)
-#define nh5oclose_c      H5_FC_FUNC_(h5oclose_c, H5OCLOSE_C)
-#define nh5oopen_by_addr_c H5_FC_FUNC_(h5oopen_by_addr_c, H5OOPEN_BY_ADDR_C)
-#define nh5ocopy_c         H5_FC_FUNC_(h5ocopy_c, H5OCOPY_C)
-#define nh5odecr_refcount_c H5_FC_FUNC_(h5odecr_refcount_c, H5ODECR_REFCOUNT_C)
-#define nh5oincr_refcount_c H5_FC_FUNC_(h5oincr_refcount_c, H5OINCR_REFCOUNT_C)
-#define nh5oexists_by_name_c H5_FC_FUNC_(h5oexists_by_name_c, H5OEXISTS_BY_NAME_C)
-#define nh5oset_comment_c H5_FC_FUNC_(h5oset_comment_c, H5OSET_COMMENT_C)
-#define nh5oset_comment_by_name_c H5_FC_FUNC_(h5oset_comment_by_name_c, H5OSET_COMMENT_BY_NAME_C)
-#define nh5oopen_by_idx_c H5_FC_FUNC_(h5oopen_by_idx_c, H5OOPEN_BY_IDX_C)
-#define nh5oget_comment_c H5_FC_FUNC_(h5oget_comment_c, H5OGET_COMMENT_C)
-#define nh5oget_comment_by_name_c H5_FC_FUNC_(h5oget_comment_by_name_c, H5OGET_COMMENT_BY_NAME_C)
-
-H5_FCDLL int_f nh5oopen_c (hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *lapl_id, hid_t_f *obj_id);
-H5_FCDLL int_f nh5oclose_c (hid_t_f *object_id );
-H5_FCDLL int_f nh5oopen_by_addr_c (hid_t_f *loc_id, haddr_t_f *addr, hid_t_f *obj_id);
-H5_FCDLL int_f nh5olink_c (hid_t_f *object_id, hid_t_f *new_loc_id, _fcd name, size_t_f *namelen,
-			   hid_t_f *lcpl_id, hid_t_f *lapl_id);
-H5_FCDLL int_f h5ovisit_c (hid_t_f *group_id, int_f *index_type, int_f *order, H5O_iterate_t op, void *op_data);
-H5_FCDLL int_f h5ovisit_by_name_c(hid_t_f *loc_id,  _fcd object_name, size_t_f *namelen, int_f *index_type, int_f *order,
-				   H5O_iterate_t op, void *op_data, hid_t_f *lapl_id );
-H5_FCDLL int_f h5oget_info_c (hid_t_f *object_id, H5O_info_t_f *object_info);
-H5_FCDLL int_f h5oget_info_by_idx_c (hid_t_f *loc_id, _fcd  group_name, size_t_f *namelen, 
-				      int_f *index_field, int_f *order, hsize_t_f *n, hid_t_f *lapl_id, H5O_info_t_f *object_info);
-H5_FCDLL int_f h5oget_info_by_name_c (hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *lapl_id,
-				       H5O_info_t_f *object_info);
-H5_FCDLL int_f nh5ocopy_c (hid_t_f *src_loc_id, _fcd src_name, size_t_f *src_name_len,
-			   hid_t_f *dst_loc_id, _fcd dst_name, size_t_f *dst_name_len, 
-			   hid_t_f *ocpypl_id, hid_t_f *lcpl_id );
-H5_FCDLL int_f nh5odecr_refcount_c (hid_t_f *object_id);
-H5_FCDLL int_f nh5oincr_refcount_c (hid_t_f *object_id);
-H5_FCDLL int_f nh5oexists_by_name_c (hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *lapl_id);
-H5_FCDLL int_f nh5oset_comment_c (hid_t_f *object_id, _fcd comment, size_t_f *commentlen);
-H5_FCDLL int_f nh5oset_comment_by_name_c (hid_t_f *object_id, _fcd name, size_t_f *namelen,  _fcd comment, size_t_f *commentlen, hid_t_f *lapl_id);
-H5_FCDLL int_f nh5oopen_by_idx_c (hid_t_f *loc_id, _fcd  group_name, size_t_f *group_namelen, 
-				      int_f *index_type, int_f *order, hsize_t_f *n, hid_t_f *obj_id, hid_t_f *lapl_id);
-H5_FCDLL int_f nh5oget_comment_c (hid_t_f *object_id, _fcd comment, size_t_f *commentsize, hssize_t_f *bufsize);
-H5_FCDLL int_f nh5oget_comment_by_name_c (hid_t_f *loc_id, _fcd name, size_t_f *name_size, 
-					  _fcd comment, size_t_f *commentsize, size_t_f *bufsize, hid_t_f *lapl_id);
+H5_FCDLL int_f h5oopen_c(hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *lapl_id, hid_t_f *obj_id);
+H5_FCDLL int_f h5oclose_c(hid_t_f *object_id);
+H5_FCDLL int_f h5oopen_by_token_c(hid_t_f *loc_id, H5O_token_t *token, hid_t_f *obj_id);
+H5_FCDLL int_f h5olink_c(hid_t_f *object_id, hid_t_f *new_loc_id, _fcd name, size_t_f *namelen,
+                         hid_t_f *lcpl_id, hid_t_f *lapl_id);
+H5_FCDLL int_f h5ovisit_c(hid_t_f *group_id, int_f *index_type, int_f *order, H5O_iterate2_t op,
+                          void *op_data, int_f *fields);
+H5_FCDLL int_f h5ovisit_by_name_c(hid_t_f *loc_id, _fcd object_name, size_t_f *namelen, int_f *index_type,
+                                  int_f *order, H5O_iterate2_t op, void *op_data, hid_t_f *lapl_id,
+                                  int_f *fields);
+H5_FCDLL int_f h5oget_info_c(hid_t_f *object_id, H5O_info_t_f *object_info, int_f *fields);
+H5_FCDLL int_f h5oget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *namelen, int_f *index_field,
+                                    int_f *order, hsize_t_f *n, hid_t_f *lapl_id, H5O_info_t_f *object_info,
+                                    int_f *fields);
+H5_FCDLL int_f h5oget_info_by_name_c(hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *lapl_id,
+                                     H5O_info_t_f *object_info, int_f *fields);
+H5_FCDLL int_f h5ocopy_c(hid_t_f *src_loc_id, _fcd src_name, size_t_f *src_name_len, hid_t_f *dst_loc_id,
+                         _fcd dst_name, size_t_f *dst_name_len, hid_t_f *ocpypl_id, hid_t_f *lcpl_id);
+H5_FCDLL int_f h5odecr_refcount_c(hid_t_f *object_id);
+H5_FCDLL int_f h5oincr_refcount_c(hid_t_f *object_id);
+H5_FCDLL int_f h5oexists_by_name_c(hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *lapl_id);
+H5_FCDLL int_f h5oset_comment_c(hid_t_f *object_id, _fcd comment, size_t_f *commentlen);
+H5_FCDLL int_f h5oset_comment_by_name_c(hid_t_f *object_id, _fcd name, size_t_f *namelen, _fcd comment,
+                                        size_t_f *commentlen, hid_t_f *lapl_id);
+H5_FCDLL int_f h5oopen_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, int_f *index_type,
+                                int_f *order, hsize_t_f *n, hid_t_f *obj_id, hid_t_f *lapl_id);
+H5_FCDLL int_f h5oget_comment_c(hid_t_f *object_id, _fcd comment, size_t_f *commentsize, hssize_t_f *bufsize);
+H5_FCDLL int_f h5oget_comment_by_name_c(hid_t_f *loc_id, _fcd name, size_t_f *name_size, _fcd comment,
+                                        size_t_f *commentsize, size_t_f *bufsize, hid_t_f *lapl_id);
+H5_FCDLL int_f h5otoken_cmp_c(hid_t_f *loc_id, H5O_token_t *token1, H5O_token_t *token2, int_f *cmp_value);
 /*
  * Functions from H5Pf.c
  */
-#define nh5pcreate_c       H5_FC_FUNC_(h5pcreate_c, H5PCREATE_C)
-#define nh5pclose_c        H5_FC_FUNC_(h5pclose_c, H5PCLOSE_C)
-#define nh5pcopy_c         H5_FC_FUNC_(h5pcopy_c, H5PCOPY_C)
-#define nh5pcreate_class_f90_c H5_FC_FUNC_(h5pcreate_class_f90_c, H5PCREATE_CLASS_F90_C)
-#define nh5pequal_c         H5_FC_FUNC_(h5pequal_c, H5PEQUAL_C)
-#define nh5pget_class_c    H5_FC_FUNC_(h5pget_class_c, H5PGET_CLASS_C)
-#define nh5pset_deflate_c  H5_FC_FUNC_(h5pset_deflate_c, H5PSET_DEFLATE_C)
-#define nh5pset_preserve_c  H5_FC_FUNC_(h5pset_preserve_c, H5PSET_PRESERVE_C)
-#define nh5pget_preserve_c  H5_FC_FUNC_(h5pget_preserve_c, H5PGET_PRESERVE_C)
-#define nh5pset_chunk_c    H5_FC_FUNC_(h5pset_chunk_c, H5PSET_CHUNK_C)
-#define nh5pget_chunk_c    H5_FC_FUNC_(h5pget_chunk_c, H5PGET_CHUNK_C)
-#define nh5pset_fill_valuec_c        H5_FC_FUNC_(h5pset_fill_valuec_c, H5PSET_FILL_VALUEC_C)
-#define nh5pset_fill_value_integer_c H5_FC_FUNC_(h5pset_fill_value_integer_c, H5PSET_FILL_VALUE_INTEGER_C)
-#define nh5pset_fill_value_real_c    H5_FC_FUNC_(h5pset_fill_value_real_c, H5PSET_FILL_VALUE_REAL_C)
-#define nh5pset_fill_value_double_c  H5_FC_FUNC_(h5pset_fill_value_double_c, H5PSET_FILL_VALUE_DOUBLE_C)
-#define nh5pget_fill_valuec_c        H5_FC_FUNC_(h5pget_fill_valuec_c, H5PGET_FILL_VALUEC_C)
-#define nh5pget_fill_value_integer_c H5_FC_FUNC_(h5pget_fill_value_integer_c, H5PGET_FILL_VALUE_INTEGER_C)
-#define nh5pget_fill_value_real_c    H5_FC_FUNC_(h5pget_fill_value_real_c, H5PGET_FILL_VALUE_REAL_C)
-#define nh5pget_fill_value_double_c  H5_FC_FUNC_(h5pget_fill_value_double_c, H5PGET_FILL_VALUE_DOUBLE_C)
-#define nh5pget_version_c    H5_FC_FUNC_(h5pget_version_c, H5PGET_VERSION_C)
-#define nh5pget_userblock_c    H5_FC_FUNC_(h5pget_userblock_c, H5PGET_USERBLOCK_C)
-#define nh5pset_userblock_c    H5_FC_FUNC_(h5pset_userblock_c, H5PSET_USERBLOCK_C)
-#define nh5pset_sizes_c        H5_FC_FUNC_(h5pset_sizes_c, H5PSET_SIZES_C)
-#define nh5pget_sizes_c         H5_FC_FUNC_(h5pget_sizes_c, H5PGET_SIZES_C)
-#define nh5pget_sym_k_c         H5_FC_FUNC_(h5pget_sym_k_c, H5PGET_SYM_K_C)
-#define nh5pset_sym_k_c         H5_FC_FUNC_(h5pset_sym_k_c, H5PSET_SYM_K_C)
-#define nh5pget_istore_k_c         H5_FC_FUNC_(h5pget_istore_k_c, H5PGET_ISTORE_K_C)
-#define nh5pset_istore_k_c         H5_FC_FUNC_(h5pset_istore_k_c, H5PSET_ISTORE_K_C)
-#define nh5pget_driver_c         H5_FC_FUNC_(h5pget_driver_c, H5PGET_DRIVER_C)
-#define nh5pset_fapl_stdio_c         H5_FC_FUNC_(h5pset_fapl_stdio_c, H5PSET_FAPL_STDIO_C)
-#define nh5pget_fapl_stdio_c         H5_FC_FUNC_(h5pget_fapl_stdio_c, H5PGET_FAPL_STDIO_C)
-#define nh5pset_fapl_sec2_c         H5_FC_FUNC_(h5pset_fapl_sec2_c, H5PSET_FAPL_SEC2_C)
-#define nh5pget_fapl_sec2_c         H5_FC_FUNC_(h5pget_fapl_sec2_c, H5PGET_FAPL_SEC2_C)
-#define nh5pset_alignment_c         H5_FC_FUNC_(h5pset_alignment_c, H5PSET_ALIGNMENT_C)
-#define nh5pget_alignment_c         H5_FC_FUNC_(h5pget_alignment_c, H5PGET_ALIGNMENT_C)
-#define nh5pset_fapl_core_c         H5_FC_FUNC_(h5pset_fapl_core_c, H5PSET_FAPL_CORE_C)
-#define nh5pget_fapl_core_c         H5_FC_FUNC_(h5pget_fapl_core_c, H5PGET_FAPL_CORE_C)
-#define nh5pset_fapl_family_c         H5_FC_FUNC_(h5pset_fapl_family_c, H5PSET_FAPL_FAMILY_C)
-#define nh5pget_fapl_family_c         H5_FC_FUNC_(h5pget_fapl_family_c, H5PGET_FAPL_FAMILY_C)
-#define nh5pset_cache_c         H5_FC_FUNC_(h5pset_cache_c, H5PSET_CACHE_C)
-#define nh5pget_cache_c         H5_FC_FUNC_(h5pget_cache_c, H5PGET_CACHE_C)
-#define nh5pset_fapl_split_c         H5_FC_FUNC_(h5pset_fapl_split_c, H5PSET_FAPL_SPLIT_C)
-#define nh5pget_fapl_split_c         H5_FC_FUNC_(h5pget_fapl_split_c, H5PGET_FAPL_SPLIT_C)
-#define nh5pset_gc_references_c         H5_FC_FUNC_(h5pset_gc_references_c, H5PSET_GC_REFERENCES_C)
-#define nh5pget_gc_references_c         H5_FC_FUNC_(h5pget_gc_references_c, H5PGET_GC_REFERENCES_C)
-#define nh5pset_layout_c         H5_FC_FUNC_(h5pset_layout_c, H5PSET_LAYOUT_C)
-#define nh5pget_layout_c         H5_FC_FUNC_(h5pget_layout_c, H5PGET_LAYOUT_C)
-#define nh5pset_filter_c         H5_FC_FUNC_(h5pset_filter_c, H5PSET_FILTER_C)
-#define nh5premove_filter_c         H5_FC_FUNC_(h5premove_filter_c, H5PREMOVE_FILTER_C)
-#define nh5pmodify_filter_c         H5_FC_FUNC_(h5pmodify_filter_c, H5PMODIFY_FILTER_C)
-#define nh5pget_nfilters_c         H5_FC_FUNC_(h5pget_nfilters_c, H5PGET_NFILTERS_C)
-#define nh5pget_filter_c         H5_FC_FUNC_(h5pget_filter_c, H5PGET_FILTER_C)
-#define nh5pget_filter_by_id_c         H5_FC_FUNC_(h5pget_filter_by_id_c, H5PGET_FILTER_BY_ID_C)
-#define nh5pset_external_c         H5_FC_FUNC_(h5pset_external_c, H5PSET_EXTERNAL_C)
-#define nh5pget_external_count_c         H5_FC_FUNC_(h5pget_external_count_c, H5PGET_EXTERNAL_COUNT_C)
-#define nh5pget_external_c         H5_FC_FUNC_(h5pget_external_c, H5PGET_EXTERNAL_C)
-#define nh5pget_btree_ratios_c         H5_FC_FUNC_(h5pget_btree_ratios_c, H5PGET_BTREE_RATIOS_C)
-#define nh5pset_btree_ratios_c         H5_FC_FUNC_(h5pset_btree_ratios_c, H5PSET_BTREE_RATIOS_C)
-#define nh5pset_fapl_mpio_c         H5_FC_FUNC_(h5pset_fapl_mpio_c, H5PSET_FAPL_MPIO_C)
-#define nh5pget_fapl_mpio_c         H5_FC_FUNC_(h5pget_fapl_mpio_c, H5PGET_FAPL_MPIO_C)
-#define nh5pset_dxpl_mpio_c        H5_FC_FUNC_(h5pset_dxpl_mpio_c, H5PSET_DXPL_MPIO_C)
-#define nh5pget_dxpl_mpio_c        H5_FC_FUNC_(h5pget_dxpl_mpio_c, H5PGET_DXPL_MPIO_C)
-#define nh5pget_fclose_degree_c    H5_FC_FUNC_(h5pget_fclose_degree_c, H5PGET_FCLOSE_DEGREE_C)
-#define nh5pset_fclose_degree_c    H5_FC_FUNC_(h5pset_fclose_degree_c, H5PSET_FCLOSE_DEGREE_C)
-#define nh5pset_buffer_c    H5_FC_FUNC_(h5pset_buffer_c, H5PSET_BUFFER_C)
-#define nh5pget_buffer_c    H5_FC_FUNC_(h5pget_buffer_c, H5PGET_BUFFER_C)
-#define nh5pfill_value_defined_c    H5_FC_FUNC_(h5pfill_value_defined_c, H5PFILL_VALUE_DEFINED_C)
-#define nh5pset_alloc_time_c    H5_FC_FUNC_(h5pset_alloc_time_c, H5PSET_ALLOC_TIME_C)
-#define nh5pget_alloc_time_c    H5_FC_FUNC_(h5pget_alloc_time_c, H5PGET_ALLOC_TIME_C)
-#define nh5pset_fill_time_c    H5_FC_FUNC_(h5pset_fill_time_c, H5PSET_FILL_TIME_C)
-#define nh5pget_fill_time_c    H5_FC_FUNC_(h5pget_fill_time_c, H5PGET_FILL_TIME_C)
-#define nh5pset_meta_block_size_c    H5_FC_FUNC_(h5pset_meta_block_size_c, H5PSET_META_BLOCK_SIZE_C)
-#define nh5pget_meta_block_size_c    H5_FC_FUNC_(h5pget_meta_block_size_c, H5PGET_META_BLOCK_SIZE_C)
-#define nh5pset_sieve_buf_size_c    H5_FC_FUNC_(h5pset_sieve_buf_size_c, H5PSET_SIEVE_BUF_SIZE_C)
-#define nh5pget_sieve_buf_size_c    H5_FC_FUNC_(h5pget_sieve_buf_size_c, H5PGET_SIEVE_BUF_SIZE_C)
-#define nh5pset_hyper_vector_size_c    H5_FC_FUNC_(h5pset_hyper_vector_size_c, H5PSET_HYPER_VECTOR_SIZE_C)
-#define nh5pget_hyper_vector_size_c    H5_FC_FUNC_(h5pget_hyper_vector_size_c, H5PGET_HYPER_VECTOR_SIZE_C)
-#define nh5pset_small_data_block_size_c    H5_FC_FUNC_(h5pset_small_data_block_size_c, H5PSET_SMALL_DATA_BLOCK_SIZE_C)
-#define nh5pget_small_data_block_size_c    H5_FC_FUNC_(h5pget_small_data_block_size_c, H5PGET_SMALL_DATA_BLOCK_SIZE_C)
-#define nh5pregister_integer_c                 H5_FC_FUNC_(h5pregister_integer_c, H5PREGISTER_INTEGER_C)
-#define nh5pregister_real_c                    H5_FC_FUNC_(h5pregister_real_c, H5PREGISTER_REAL_C)
-#define nh5pregister_double_c                  H5_FC_FUNC_(h5pregister_double_c, H5PREGISTER_DOUBLE_C)
-#define nh5pregisterc_c                H5_FC_FUNC_(h5pregisterc_c, H5PREGISTERC_C)
-#define nh5pinsert_integer_c                   H5_FC_FUNC_(h5pinsert_integer_c, H5PINSERT_INTEGER_C)
-#define nh5pinsert_real_c                   H5_FC_FUNC_(h5pinsert_real_c, H5PINSERT_REAL_C)
-#define nh5pinsert_double_c                   H5_FC_FUNC_(h5pinsert_double_c, H5PINSERT_DOUBLE_C)
-#define nh5pinsertc_c                  H5_FC_FUNC_(h5pinsertc_c, H5PINSERTC_C)
-#define nh5pset_integer_c                      H5_FC_FUNC_(h5pset_integer_c, H5PSET_INTEGER_C)
-#define nh5pset_real_c                         H5_FC_FUNC_(h5pset_real_c, H5PSET_REAL_C)
-#define nh5pset_double_c                       H5_FC_FUNC_(h5pset_double_c, H5PSET_DOUBLE_C)
-#define nh5psetc_c                     H5_FC_FUNC_(h5psetc_c, H5PSETC_C)
-#define nh5pget_integer_c                      H5_FC_FUNC_(h5pget_integer_c, H5PGET_INTEGER_C)
-#define nh5pget_real_c                         H5_FC_FUNC_(h5pget_real_c, H5PGET_REAL_C)
-#define nh5pget_double_c                       H5_FC_FUNC_(h5pget_double_c, H5PGET_DOUBLE_C)
-#define nh5pgetc_c                     H5_FC_FUNC_(h5pgetc_c, H5PGETC_C)
-#define nh5pexist_c                    H5_FC_FUNC_(h5pexist_c, H5PEXIST_C)
-#define nh5pget_size_c                 H5_FC_FUNC_(h5pget_size_c, H5PGET_SIZE_C)
-#define nh5pget_nprops_c               H5_FC_FUNC_(h5pget_nprops_c, H5PGET_NPROPS_C)
-#define nh5pget_class_parent_c         H5_FC_FUNC_(h5pget_class_parent_c, H5PGET_CLASS_PARENT_C)
-#define nh5pisa_class_c                H5_FC_FUNC_(h5pisa_class_c, H5PISA_CLASS_C)
-#define nh5pcopy_prop_c                H5_FC_FUNC_(h5pcopy_prop_c, H5PCOPY_PROP_C)
-#define nh5premove_c                   H5_FC_FUNC_(h5premove_c, H5PREMOVE_C)
-#define nh5punregister_c               H5_FC_FUNC_(h5punregister_c, H5PUNREGISTER_C)
-#define nh5pclose_class_c              H5_FC_FUNC_(h5pclose_class_c, H5PCLOSE_CLASS_C)
-#define nh5pget_class_name_c           H5_FC_FUNC_(h5pget_class_name_c, H5PGET_CLASS_NAME_C)
-#define nh5pset_shuffle_c               H5_FC_FUNC_(h5pset_shuffle_c, H5PSET_SHUFFLE_C)
-#define nh5pset_fletcher32_c           H5_FC_FUNC_(h5pset_fletcher32_c, H5PSET_FLETCHER32_C)
-#define nh5pset_edc_check_c            H5_FC_FUNC_(h5pset_edc_check_c, H5PSET_EDC_CHECK_C)
-#define nh5pget_edc_check_c            H5_FC_FUNC_(h5pget_edc_check_c, H5PGET_EDC_CHECK_C)
-#define nh5pset_family_offset_c       H5_FC_FUNC_(h5pset_family_offset_c, H5PSET_FAMILY_OFFSET_C)
-#define nh5pget_fapl_multi_c          H5_FC_FUNC_(h5pget_fapl_multi_c, H5PGET_FAPL_MULTI_C)
-#define nh5pset_fapl_multi_c          H5_FC_FUNC_(h5pset_fapl_multi_c, H5PSET_FAPL_MULTI_C)
-#define nh5pset_fapl_multi_sc          H5_FC_FUNC_(h5pset_fapl_multi_sc, H5PSET_FAPL_MULTI_SC)
-#define nh5pset_szip_c                 H5_FC_FUNC_(h5pset_szip_c, H5PSET_SZIP_C)
-#define nh5pall_filters_avail_c        H5_FC_FUNC_(h5pall_filters_avail_c, H5PALL_FILTERS_AVAIL_C)
-#define nh5pget_attr_phase_change_c    H5_FC_FUNC_(h5pget_attr_phase_change_c, H5PGET_ATTR_PHASE_CHANGE_C)
-#define nh5pset_attr_creation_order_c  H5_FC_FUNC_(h5pset_attr_creation_order_c, H5PSET_ATTR_CREATION_ORDER_C)
-#define nh5pset_shared_mesg_nindexes_c  H5_FC_FUNC_(h5pset_shared_mesg_nindexes_c, H5PSET_SHARED_MESG_NINDEXES_C)
-#define nh5pset_shared_mesg_index_c  H5_FC_FUNC_(h5pset_shared_mesg_index_c,H5PSET_SHARED_MESG_INDEX_C)
-#define nh5pget_attr_creation_order_c  H5_FC_FUNC_(h5pget_attr_creation_order_c,H5PGET_ATTR_CREATION_ORDER_C)
-#define nh5pset_libver_bounds_c H5_FC_FUNC_(h5pset_libver_bounds_c,H5PSET_LIBVER_BOUNDS_C)
-#define nh5pset_link_creation_order_c H5_FC_FUNC_(h5pset_link_creation_order_c, H5PSET_LINK_CREATION_ORDER_C)
-#define nh5pget_link_phase_change_c H5_FC_FUNC_(h5pget_link_phase_change_c, H5PGET_LINK_PHASE_CHANGE_C)
-#define nh5pget_obj_track_times_c H5_FC_FUNC_(h5pget_obj_track_times_c, H5PGET_OBJ_TRACK_TIMES_C)
-#define nh5pset_obj_track_times_c H5_FC_FUNC_(h5pset_obj_track_times_c, H5PSET_OBJ_TRACK_TIMES_C)
-#define nh5pset_create_inter_group_c H5_FC_FUNC_(h5pset_create_inter_group_c,H5PSET_CREATE_INTER_GROUP_C)
-#define nh5pget_create_inter_group_c H5_FC_FUNC_(h5pget_create_inter_group_c,H5PGET_CREATE_INTER_GROUP_C)
-#define nh5pget_link_creation_order_c H5_FC_FUNC_(h5pget_link_creation_order_c,H5PGET_LINK_CREATION_ORDER_C)
-#define nh5pset_char_encoding_c H5_FC_FUNC_(h5pset_char_encoding_c, H5PSET_CHAR_ENCODING_C)
-#define nh5pget_char_encoding_c H5_FC_FUNC_(h5pget_char_encoding_c, H5PGET_CHAR_ENCODING_C)
-#define nh5pset_copy_object_c H5_FC_FUNC_(h5pset_copy_object_c, H5PSET_COPY_OBJECT_C)
-#define nh5pget_copy_object_c H5_FC_FUNC_(h5pget_copy_object_c, H5PGET_COPY_OBJECT_C)
-#define nh5pget_data_transform_c H5_FC_FUNC_(h5pget_data_transform_c, H5PGET_DATA_TRANSFORM_C)
-#define nh5pset_data_transform_c H5_FC_FUNC_(h5pset_data_transform_c, H5PSET_DATA_TRANSFORM_C)
-#define nh5pget_local_heap_size_hint_c H5_FC_FUNC_(h5pget_local_heap_size_hint_c, H5PGET_LOCAL_HEAP_SIZE_HINT_C)
-#define nh5pget_est_link_info_c H5_FC_FUNC_(h5pget_est_link_info_c,H5PGET_EST_LINK_INFO_C)
-#define nh5pset_est_link_info_c H5_FC_FUNC_(h5pset_est_link_info_c,H5PSET_EST_LINK_INFO_C)
-#define nh5pset_local_heap_size_hint_c H5_FC_FUNC_(h5pset_local_heap_size_hint_c, H5PSET_LOCAL_HEAP_SIZE_HINT_C)
-#define nh5pset_link_phase_change_c H5_FC_FUNC_(h5pset_link_phase_change_c, H5PSET_LINK_PHASE_CHANGE_C)
-#define nh5pset_fapl_direct_c H5_FC_FUNC_(h5pset_fapl_direct_c, H5PSET_FAPL_DIRECT_C)
-#define nh5pget_fapl_direct_c H5_FC_FUNC_(h5pget_fapl_direct_c, H5PGET_FAPL_DIRECT_C)
-#define nh5pset_attr_phase_change_c H5_FC_FUNC_(h5pset_attr_phase_change_c, H5PSET_ATTR_PHASE_CHANGE_C)
-#define nh5pset_nbit_c H5_FC_FUNC_(h5pset_nbit_c, H5PSET_NBIT_C)
-#define nh5pset_scaleoffset_c H5_FC_FUNC_(h5pset_scaleoffset_c, H5PSET_SCALEOFFSET_C)
-#define nh5pset_nlinks_c H5_FC_FUNC_(h5pset_nlinks_c, H5PSET_NLINKS_C)
-#define nh5pget_nlinks_c H5_FC_FUNC_(h5pget_nlinks_c, H5PGET_NLINKS_C)
-#define nh5pset_chunk_cache_c H5_FC_FUNC_(h5pset_chunk_cache_c, H5PSET_CHUNK_CACHE_C)
-#define nh5pget_chunk_cache_c H5_FC_FUNC_(h5pget_chunk_cache_c, H5PGET_CHUNK_CACHE_C)
-#define nh5pget_mpio_actual_io_mode_c H5_FC_FUNC_(h5pget_mpio_actual_io_mode_c, H5PGET_MPIO_ACTUAL_IO_MODE_C)
-
-H5_FCDLL int_f nh5pcreate_c ( hid_t_f *cls, hid_t_f *prp_id );
-H5_FCDLL int_f nh5pclose_c ( hid_t_f *prp_id );
-H5_FCDLL int_f nh5pcopy_c ( hid_t_f *prp_id , hid_t_f *new_prp_id);
-H5_FCDLL int_f nh5pequal_c ( hid_t_f *plist1_id , hid_t_f *plist2_id, int_f *c_flag);
-H5_FCDLL int_f nh5pget_class_c ( hid_t_f *prp_id , hid_t_f *classtype);
-H5_FCDLL int_f nh5pset_deflate_c ( hid_t_f *prp_id , int_f *level);
-H5_FCDLL int_f nh5pset_chunk_c ( hid_t_f *prp_id, int_f *rank, hsize_t_f *dims );
-H5_FCDLL int_f nh5pget_chunk_c ( hid_t_f *prp_id, int_f *max_rank, hsize_t_f *dims );
-H5_FCDLL int_f h5pset_file_image_c (hid_t_f *fapl_id, void *buf_ptr, size_t_f *buf_len);
-H5_FCDLL int_f nh5pset_fill_valuec_c (hid_t_f *prp_id, hid_t_f *type_id, _fcd fillvalue);
-H5_FCDLL int_f h5pset_fill_value_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue);
-H5_FCDLL int_f nh5pset_fill_value_integer_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue);
-H5_FCDLL int_f nh5pset_fill_value_real_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue);
-H5_FCDLL int_f nh5pset_fill_value_double_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue);
-H5_FCDLL int_f h5pget_file_image_c (hid_t_f *fapl_id, void **buf_ptr, size_t_f *buf_len);
-H5_FCDLL int_f nh5pget_fill_valuec_c (hid_t_f *prp_id, hid_t_f *type_id, _fcd fillvalue);
-H5_FCDLL int_f h5pget_fill_value_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue);
-H5_FCDLL int_f nh5pget_fill_value_integer_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue);
-H5_FCDLL int_f nh5pget_fill_value_real_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue);
-H5_FCDLL int_f nh5pget_fill_value_double_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue);
-H5_FCDLL int_f nh5pset_preserve_c ( hid_t_f *prp_id , int_f *flag);
-H5_FCDLL int_f nh5pget_preserve_c ( hid_t_f *prp_id , int_f *flag);
-H5_FCDLL int_f nh5pget_version_c (hid_t_f *prp_id, int_f * boot,int_f * freelist, int_f * stab, int_f *shhdr);
-H5_FCDLL int_f nh5pset_userblock_c (hid_t_f *prp_id, hsize_t_f * size);
-H5_FCDLL int_f nh5pget_userblock_c (hid_t_f *prp_id, hsize_t_f * size);
-H5_FCDLL int_f nh5pget_sizes_c (hid_t_f *prp_id, size_t_f * sizeof_addr, size_t_f * sizeof_size);
-H5_FCDLL int_f nh5pset_sizes_c (hid_t_f *prp_id, size_t_f * sizeof_addr, size_t_f * sizeof_size);
-H5_FCDLL int_f nh5pset_sym_k_c (hid_t_f *prp_id, int_f* ik, int_f* lk);
-H5_FCDLL int_f nh5pget_sym_k_c (hid_t_f *prp_id, int_f* ik, int_f* lk);
-H5_FCDLL int_f nh5pset_istore_k_c (hid_t_f *prp_id, int_f* ik);
-H5_FCDLL int_f nh5pget_istore_k_c (hid_t_f *prp_id, int_f* ik);
-H5_FCDLL int_f nh5pget_driver_c (hid_t_f *prp_id, hid_t_f*driver);
-H5_FCDLL int_f nh5pset_fapl_stdio_c (hid_t_f *prp_id);
-H5_FCDLL int_f nh5pget_fapl_stdio_c (hid_t_f *prp_id, int_f* io);
-H5_FCDLL int_f nh5pset_fapl_sec2_c (hid_t_f *prp_id);
-H5_FCDLL int_f nh5pget_fapl_sec2_c (hid_t_f *prp_id, int_f* sec2);
-H5_FCDLL int_f nh5pset_alignment_c(hid_t_f *prp_id, hsize_t_f* threshold, hsize_t_f* alignment);
-H5_FCDLL int_f nh5pget_alignment_c(hid_t_f *prp_id, hsize_t_f* threshold, hsize_t_f* alignment);
-H5_FCDLL int_f nh5pget_fapl_core_c (hid_t_f *prp_id, size_t_f* increment, int_f *flag);
-H5_FCDLL int_f nh5pset_fapl_core_c (hid_t_f *prp_id, size_t_f* increment, int_f *flag);
-H5_FCDLL int_f nh5pset_fapl_family_c (hid_t_f *prp_id, hsize_t_f* memb_size, hid_t_f* memb_plist );
-H5_FCDLL int_f nh5pget_fapl_family_c (hid_t_f *prp_id, hsize_t_f* memb_size, hid_t_f* memb_plist );
-H5_FCDLL int_f nh5pset_cache_c(hid_t_f *prp_id, int_f* mdc_nelmts, size_t_f* rdcc_nelmts, size_t_f* rdcc_nbytes, real_f* rdcc_w0);
-H5_FCDLL int_f nh5pget_cache_c(hid_t_f *prp_id, int_f* mdc_nelmts, size_t_f* rdcc_nelmts, size_t_f* rdcc_nbytes, real_f* rdcc_w0);
-H5_FCDLL int_f nh5pget_fapl_split_c(hid_t_f *prp_id, size_t_f* meta_ext_size , _fcd meta_ext, hid_t_f* meta_plist, size_t_f* raw_ext_size, _fcd raw_ext, hid_t_f * raw_plist);
-H5_FCDLL int_f nh5pset_fapl_split_c(hid_t_f *prp_id, int_f* meta_len, _fcd meta_ext, hid_t_f* meta_plist, int_f* raw_len, _fcd raw_ext, hid_t_f * raw_plist);
-H5_FCDLL int_f nh5pset_gc_references_c(hid_t_f *prp_id, int_f* gc_references);
-H5_FCDLL int_f nh5pget_gc_references_c(hid_t_f *prp_id, int_f* gc_references);
-H5_FCDLL int_f nh5pset_layout_c (hid_t_f *prp_id, int_f* layout);
-H5_FCDLL int_f nh5pget_layout_c (hid_t_f *prp_id, int_f* layout);
-H5_FCDLL int_f nh5pset_filter_c (hid_t_f *prp_id, int_f* filter, int_f* flags, size_t_f* cd_nelmts, int_f* cd_values );
-H5_FCDLL int_f nh5premove_filter_c (hid_t_f *prp_id, int_f* filter);
-H5_FCDLL int_f nh5pmodify_filter_c (hid_t_f *prp_id, int_f* filter, int_f* flags, size_t_f* cd_nelmts, int_f* cd_values );
-H5_FCDLL int_f nh5pget_nfilters_c (hid_t_f *prp_id, int_f* nfilters);
-H5_FCDLL int_f nh5pget_filter_c(hid_t_f *prp_id, int_f* filter_number, int_f* flags, size_t_f* cd_nelmts, int_f* cd_values, size_t_f *namelen, _fcd name, int_f* filter_id);
-H5_FCDLL int_f nh5pget_filter_by_id_c(hid_t_f *prp_id, int_f* filter_id, int_f* flags, size_t_f* cd_nelmts, int_f* cd_values, size_t_f *namelen, _fcd name);
-H5_FCDLL int_f nh5pset_external_c (hid_t_f *prp_id, _fcd name, int_f* namelen, off_t_f* offset, hsize_t_f*bytes);
-H5_FCDLL int_f nh5pget_external_count_c (hid_t_f *prp_id, int_f* count);
-H5_FCDLL int_f nh5pget_external_c(hid_t_f *prp_id, int_f *idx, size_t_f* name_size, _fcd name, off_t_f* offset, hsize_t_f*bytes);
-H5_FCDLL int_f nh5pget_btree_ratios_c(hid_t_f *prp_id, real_f* left, real_f* middle, real_f* right);
-H5_FCDLL int_f nh5pset_btree_ratios_c(hid_t_f *prp_id, real_f* left, real_f* middle, real_f* right);
-H5_FCDLL int_f nh5pget_fapl_mpio_c(hid_t_f *prp_id, int_f* comm, int_f* info);
-H5_FCDLL int_f nh5pset_fapl_mpio_c(hid_t_f *prp_id, int_f* comm, int_f* info);
-H5_FCDLL int_f nh5pget_dxpl_mpio_c(hid_t_f *prp_id, int_f* data_xfer_mode);
-H5_FCDLL int_f nh5pset_dxpl_mpio_c(hid_t_f *prp_id, int_f* data_xfer_mode);
-H5_FCDLL int_f nh5pset_fclose_degree_c(hid_t_f *fapl, int_f *degree);
-H5_FCDLL int_f nh5pget_fclose_degree_c(hid_t_f *fapl, int_f *degree);
-H5_FCDLL int_f nh5pget_buffer_c(hid_t_f *plist, hsize_t_f *size);
-H5_FCDLL int_f nh5pset_buffer_c(hid_t_f *plist, hsize_t_f *size);
-H5_FCDLL int_f nh5pset_alloc_time_c(hid_t_f *plist, int_f *flag);
-H5_FCDLL int_f nh5pget_alloc_time_c(hid_t_f *plist, int_f *flag);
-H5_FCDLL int_f nh5pset_fill_time_c(hid_t_f *plist, int_f *flag);
-H5_FCDLL int_f nh5pget_fill_time_c(hid_t_f *plist, int_f *flag);
-H5_FCDLL int_f nh5pset_meta_block_size_c(hid_t_f *plist, hsize_t_f *size);
-H5_FCDLL int_f nh5pget_meta_block_size_c(hid_t_f *plist, hsize_t_f *size);
-H5_FCDLL int_f nh5pset_sieve_buf_size_c(hid_t_f *plist, size_t_f *size);
-H5_FCDLL int_f nh5pget_sieve_buf_size_c(hid_t_f *plist, size_t_f *size);
-H5_FCDLL int_f nh5pset_small_data_block_size_c(hid_t_f *plist, hsize_t_f *size);
-H5_FCDLL int_f nh5pget_small_data_block_size_c(hid_t_f *plist, hsize_t_f *size);
-H5_FCDLL int_f nh5pset_hyper_vector_size_c(hid_t_f *plist, size_t_f *size);
-H5_FCDLL int_f nh5pget_hyper_vector_size_c(hid_t_f *plist, size_t_f *size);
+H5_FCDLL int_f h5pcreate_c(hid_t_f *cls, hid_t_f *prp_id);
+H5_FCDLL int_f h5pclose_c(hid_t_f *prp_id);
+H5_FCDLL int_f h5pcopy_c(hid_t_f *prp_id, hid_t_f *new_prp_id);
+H5_FCDLL int_f h5pequal_c(hid_t_f *plist1_id, hid_t_f *plist2_id, int_f *c_flag);
+H5_FCDLL int_f h5pget_class_c(hid_t_f *prp_id, hid_t_f *classtype);
+H5_FCDLL int_f h5pset_deflate_c(hid_t_f *prp_id, int_f *level);
+H5_FCDLL int_f h5pset_chunk_c(hid_t_f *prp_id, int_f *rank, hsize_t_f *dims);
+H5_FCDLL int_f h5pget_chunk_c(hid_t_f *prp_id, int_f *max_rank, hsize_t_f *dims);
+H5_FCDLL int_f h5pset_file_image_c(hid_t_f *fapl_id, void *buf_ptr, size_t_f *buf_len);
+H5_FCDLL int_f h5pset_fill_value_c(hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue);
+H5_FCDLL int_f h5pget_file_image_c(hid_t_f *fapl_id, void **buf_ptr, size_t_f *buf_len);
+H5_FCDLL int_f h5pget_fill_value_c(hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue);
+H5_FCDLL int_f h5pset_preserve_c(hid_t_f *prp_id, int_f *flag);
+H5_FCDLL int_f h5pget_preserve_c(hid_t_f *prp_id, int_f *flag);
+H5_FCDLL int_f h5pget_version_c(hid_t_f *prp_id, int_f *boot, int_f *freelist, int_f *stab, int_f *shhdr);
+H5_FCDLL int_f h5pset_userblock_c(hid_t_f *prp_id, hsize_t_f *size);
+H5_FCDLL int_f h5pget_userblock_c(hid_t_f *prp_id, hsize_t_f *size);
+H5_FCDLL int_f h5pget_sizes_c(hid_t_f *prp_id, size_t_f *sizeof_addr, size_t_f *sizeof_size);
+H5_FCDLL int_f h5pset_sizes_c(hid_t_f *prp_id, size_t_f *sizeof_addr, size_t_f *sizeof_size);
+H5_FCDLL int_f h5pset_sym_k_c(hid_t_f *prp_id, int_f *ik, int_f *lk);
+H5_FCDLL int_f h5pget_sym_k_c(hid_t_f *prp_id, int_f *ik, int_f *lk);
+H5_FCDLL int_f h5pset_istore_k_c(hid_t_f *prp_id, int_f *ik);
+H5_FCDLL int_f h5pget_istore_k_c(hid_t_f *prp_id, int_f *ik);
+H5_FCDLL int_f h5pget_driver_c(hid_t_f *prp_id, hid_t_f *driver);
+H5_FCDLL int_f h5pset_fapl_stdio_c(hid_t_f *prp_id);
+#ifdef NO_SUCH_F90_FUNCTION
+H5_FCDLL int_f h5pget_fapl_stdio_c(hid_t_f *prp_id, int_f *io);
+#endif
+H5_FCDLL int_f h5pset_fapl_sec2_c(hid_t_f *prp_id);
+#ifdef NO_SUCH_F90_FUNCTION
+H5_FCDLL int_f h5pget_fapl_sec2_c(hid_t_f *prp_id, int_f *sec2);
+#endif
+H5_FCDLL int_f h5pset_alignment_c(hid_t_f *prp_id, hsize_t_f *threshold, hsize_t_f *alignment);
+H5_FCDLL int_f h5pget_alignment_c(hid_t_f *prp_id, hsize_t_f *threshold, hsize_t_f *alignment);
+H5_FCDLL int_f h5pget_fapl_core_c(hid_t_f *prp_id, size_t_f *increment, int_f *flag);
+H5_FCDLL int_f h5pset_fapl_core_c(hid_t_f *prp_id, size_t_f *increment, int_f *flag);
+H5_FCDLL int_f h5pset_fapl_family_c(hid_t_f *prp_id, hsize_t_f *memb_size, hid_t_f *memb_plist);
+H5_FCDLL int_f h5pget_fapl_family_c(hid_t_f *prp_id, hsize_t_f *memb_size, hid_t_f *memb_plist);
+H5_FCDLL int_f h5pset_cache_c(hid_t_f *prp_id, int_f *mdc_nelmts, size_t_f *rdcc_nelmts,
+                              size_t_f *rdcc_nbytes, real_f *rdcc_w0);
+H5_FCDLL int_f h5pget_cache_c(hid_t_f *prp_id, int_f *mdc_nelmts, size_t_f *rdcc_nelmts,
+                              size_t_f *rdcc_nbytes, real_f *rdcc_w0);
+#ifdef NO_SUCH_F90_FUNCTION
+H5_FCDLL int_f h5pget_fapl_split_c(hid_t_f *prp_id, size_t_f *meta_ext_size, _fcd meta_ext,
+                                   hid_t_f *meta_plist, size_t_f *raw_ext_size, _fcd raw_ext,
+                                   hid_t_f *raw_plist);
+#endif
+H5_FCDLL int_f h5pset_fapl_split_c(hid_t_f *prp_id, int_f *meta_len, _fcd meta_ext, hid_t_f *meta_plist,
+                                   int_f *raw_len, _fcd raw_ext, hid_t_f *raw_plist);
+H5_FCDLL int_f h5pset_gc_references_c(hid_t_f *prp_id, int_f *gc_references);
+H5_FCDLL int_f h5pget_gc_references_c(hid_t_f *prp_id, int_f *gc_references);
+H5_FCDLL int_f h5pset_layout_c(hid_t_f *prp_id, int_f *layout);
+H5_FCDLL int_f h5pget_layout_c(hid_t_f *prp_id, int_f *layout);
+H5_FCDLL int_f h5pset_filter_c(hid_t_f *prp_id, int_f *filter, int_f *flags, size_t_f *cd_nelmts,
+                               int_f *cd_values);
+H5_FCDLL int_f h5premove_filter_c(hid_t_f *prp_id, int_f *filter);
+H5_FCDLL int_f h5pmodify_filter_c(hid_t_f *prp_id, int_f *filter, int_f *flags, size_t_f *cd_nelmts,
+                                  int_f *cd_values);
+H5_FCDLL int_f h5pget_nfilters_c(hid_t_f *prp_id, int_f *nfilters);
+H5_FCDLL int_f h5pget_filter_c(hid_t_f *prp_id, int_f *filter_number, int_f *flags, size_t_f *cd_nelmts,
+                               int_f *cd_values, size_t_f *namelen, _fcd name, int_f *filter_id);
+H5_FCDLL int_f h5pget_filter_by_id_c(hid_t_f *prp_id, int_f *filter_id, int_f *flags, size_t_f *cd_nelmts,
+                                     int_f *cd_values, size_t_f *namelen, _fcd name);
+H5_FCDLL int_f h5pset_external_c(hid_t_f *prp_id, _fcd name, int_f *namelen, off_t_f *offset,
+                                 hsize_t_f *bytes);
+H5_FCDLL int_f h5pget_external_count_c(hid_t_f *prp_id, int_f *count);
+H5_FCDLL int_f h5pget_external_c(hid_t_f *prp_id, int_f *idx, size_t_f *name_size, _fcd name, off_t_f *offset,
+                                 hsize_t_f *bytes);
+H5_FCDLL int_f h5pget_btree_ratios_c(hid_t_f *prp_id, real_f *left, real_f *middle, real_f *right);
+H5_FCDLL int_f h5pset_btree_ratios_c(hid_t_f *prp_id, real_f *left, real_f *middle, real_f *right);
+H5_FCDLL int_f h5pset_fclose_degree_c(hid_t_f *fapl, int_f *degree);
+H5_FCDLL int_f h5pget_fclose_degree_c(hid_t_f *fapl, int_f *degree);
+H5_FCDLL int_f h5pget_buffer_c(hid_t_f *plist, hsize_t_f *size);
+H5_FCDLL int_f h5pset_buffer_c(hid_t_f *plist, hsize_t_f *size);
+H5_FCDLL int_f h5pset_alloc_time_c(hid_t_f *plist, int_f *flag);
+H5_FCDLL int_f h5pget_alloc_time_c(hid_t_f *plist, int_f *flag);
+H5_FCDLL int_f h5pset_fill_time_c(hid_t_f *plist, int_f *flag);
+H5_FCDLL int_f h5pget_fill_time_c(hid_t_f *plist, int_f *flag);
+H5_FCDLL int_f h5pset_meta_block_size_c(hid_t_f *plist, hsize_t_f *size);
+H5_FCDLL int_f h5pget_meta_block_size_c(hid_t_f *plist, hsize_t_f *size);
+H5_FCDLL int_f h5pset_sieve_buf_size_c(hid_t_f *plist, size_t_f *size);
+H5_FCDLL int_f h5pget_sieve_buf_size_c(hid_t_f *plist, size_t_f *size);
+H5_FCDLL int_f h5pset_small_data_block_size_c(hid_t_f *plist, hsize_t_f *size);
+H5_FCDLL int_f h5pget_small_data_block_size_c(hid_t_f *plist, hsize_t_f *size);
+H5_FCDLL int_f h5pset_hyper_vector_size_c(hid_t_f *plist, size_t_f *size);
+H5_FCDLL int_f h5pget_hyper_vector_size_c(hid_t_f *plist, size_t_f *size);
 H5_FCDLL int_f h5pcreate_class_c(hid_t_f *parent, _fcd name, int_f *name_len, hid_t_f *cls,
-				  H5P_cls_create_func_t create, void *create_data,
-				  H5P_cls_copy_func_t copy, void *copy_data,
-				  H5P_cls_close_func_t close, void *close_data);
-H5_FCDLL int_f nh5pcreate_class_f90_c(hid_t_f *parent, _fcd name, int_f *name_len, hid_t_f *cls);
-H5_FCDLL int_f h5pregister_c(hid_t_f *cls, _fcd name, int_f * name_len, size_t_f *size, void *value);
-H5_FCDLL int_f nh5pregister_integer_c(hid_t_f *cls, _fcd name, int_f * name_len, size_t_f *size, void *value);
-H5_FCDLL int_f nh5pregister_real_c(hid_t_f *cls, _fcd name, int_f * name_len, size_t_f *size, void *value);
-H5_FCDLL int_f nh5pregister_double_c(hid_t_f *cls, _fcd name, int_f * name_len, size_t_f *size, void *value);
-H5_FCDLL int_f nh5pregisterc_c(hid_t_f *cls, _fcd name, int_f * name_len, size_t_f *size, _fcd value, int_f *value_len);
-H5_FCDLL int_f h5pinsert_c(hid_t_f  *plist, _fcd name, int_f *name_len, size_t_f *size, void *value);
-H5_FCDLL int_f nh5pinsert_integer_c(hid_t_f  *plist, _fcd name, int_f *name_len, size_t_f *size, void *value);
-H5_FCDLL int_f nh5pinsert_real_c(hid_t_f  *plist, _fcd name, int_f *name_len, size_t_f *size, void *value);
-H5_FCDLL int_f nh5pinsert_double_c(hid_t_f  *plist, _fcd name, int_f *name_len, size_t_f *size, void *value);
-H5_FCDLL int_f nh5pinsertc_c(hid_t_f  *plist, _fcd name, int_f *name_len, size_t_f *size, _fcd value, int_f *value_len);
+                                 H5P_cls_create_func_t create, void *create_data, H5P_cls_copy_func_t copy,
+                                 void *copy_data, H5P_cls_close_func_t close, void *close_data);
+H5_FCDLL int_f h5pregister_c(hid_t_f *cls, _fcd name, int_f *name_len, size_t_f *size, void *value);
+H5_FCDLL int_f h5pinsert_c(hid_t_f *plist, _fcd name, int_f *name_len, size_t_f *size, void *value);
 H5_FCDLL int_f h5pset_c(hid_t_f *prp_id, _fcd name, int_f *name_len, void *value);
-H5_FCDLL int_f nh5pset_integer_c(hid_t_f *prp_id, _fcd name, int_f *name_len, void *value);
-H5_FCDLL int_f nh5pset_real_c(hid_t_f *prp_id, _fcd name, int_f *name_len, void *value);
-H5_FCDLL int_f nh5pset_double_c(hid_t_f *prp_id, _fcd name, int_f *name_len, void *value);
-H5_FCDLL int_f nh5psetc_c(hid_t_f *prp_id, _fcd name, int_f *name_len, _fcd value, int_f *value_len);
 H5_FCDLL int_f h5pget_c(hid_t_f *prp_id, _fcd name, int_f *name_len, void *value);
-H5_FCDLL int_f nh5pget_double_c(hid_t_f *prp_id, _fcd name, int_f *name_len, void *value);
-H5_FCDLL int_f nh5pget_integer_c(hid_t_f *prp_id, _fcd name, int_f *name_len, void *value);
-H5_FCDLL int_f nh5pget_real_c(hid_t_f *prp_id, _fcd name, int_f *name_len, void *value);
-H5_FCDLL int_f nh5pgetc_c(hid_t_f *prp_id, _fcd name, int_f *name_len, _fcd value, int_f *value_len);
-H5_FCDLL int_f nh5pexist_c(hid_t_f *prp_id, _fcd name, int_f *name_len);
-H5_FCDLL int_f nh5pget_size_c(hid_t_f *prp_id, _fcd name, int_f *name_len, size_t_f *size);
-H5_FCDLL int_f nh5pget_nprops_c(hid_t_f *prp_id, size_t_f *nprops);
-H5_FCDLL int_f nh5pget_class_parent_c(hid_t_f *prp_id, hid_t_f *parent_id);
-H5_FCDLL int_f nh5pisa_class_c(hid_t_f *plist, hid_t_f *pclass);
-H5_FCDLL int_f nh5pcopy_prop_c(hid_t_f *dst_id, hid_t_f *src_id, _fcd name, int_f *name_len);
-H5_FCDLL int_f nh5premove_c(hid_t_f *plid, _fcd name, int_f *name_len);
-H5_FCDLL int_f nh5punregister_c(hid_t_f *cls, _fcd name, int_f *name_len);
-H5_FCDLL int_f nh5pclose_class_c(hid_t_f * cls);
-H5_FCDLL int_f nh5pget_class_name_c(hid_t_f *prp_id, _fcd name, int_f *name_len);
-H5_FCDLL int_f nh5pset_shuffle_c ( hid_t_f *prp_id);
-H5_FCDLL int_f nh5pset_fletcher32_c ( hid_t_f *prp_id );
-H5_FCDLL int_f nh5pset_edc_check_c ( hid_t_f *prp_id, int_f *flag );
-H5_FCDLL int_f nh5pget_edc_check_c ( hid_t_f *prp_id, int_f *flag );
-H5_FCDLL int_f nh5pset_family_offset_c ( hid_t_f *prp_id , hsize_t_f *offset);
-H5_FCDLL int_f nh5pget_fapl_multi_c ( hid_t_f *prp_id , int_f *mem_map, hid_t_f *memb_fapl, _fcd memb_name, int_f *len, int_f *lenmax, real_f *memb_addr, int_f *flag, int_f *maxlen_out);
-H5_FCDLL int_f nh5pset_fapl_multi_c ( hid_t_f *prp_id , int_f *mem_map, hid_t_f *memb_fapl, _fcd memb_name, int_f *len, int_f *lenmax, real_f *memb_addr, int_f *flag);
-H5_FCDLL int_f nh5pset_fapl_multi_sc ( hid_t_f *prp_id , int_f *flag);
-H5_FCDLL int_f nh5pset_szip_c ( hid_t_f *prp_id , int_f *options_mask, int_f *pixels_per_block);
-H5_FCDLL int_f nh5pall_filters_avail_c ( hid_t_f *prp_id , int_f *status);
-H5_FCDLL int_f nh5pfill_value_defined_c ( hid_t_f *prp_id , int_f *flag);
-H5_FCDLL int_f nh5pget_attr_phase_change_c (hid_t_f *ocpl_id, int_f *max_compact, int_f *min_dense );
-H5_FCDLL int_f nh5pset_attr_creation_order_c(hid_t_f *ocpl_id, int_f *crt_order_flags );
-H5_FCDLL int_f nh5pset_shared_mesg_nindexes_c(hid_t_f *plist_id, int_f *nindexes );
-H5_FCDLL int_f nh5pset_shared_mesg_index_c(hid_t_f *fcpl_id, int_f *index_num, int_f *mesg_type_flags, int_f *min_mesg_size);
-H5_FCDLL int_f nh5pget_attr_creation_order_c(hid_t_f *ocpl_id, int_f *crt_order_flags);
-H5_FCDLL int_f nh5pset_libver_bounds_c(hid_t_f *fapl_id, int_f *low, int_f *high);
-H5_FCDLL int_f nh5pset_link_creation_order_c(hid_t_f *gcpl_id, int_f *crt_order_flags);
-H5_FCDLL int_f nh5pget_link_phase_change_c(hid_t_f *gcpl_id, int_f *max_compact, int_f *min_dense );
-H5_FCDLL int_f nh5pget_obj_track_times_c(hid_t_f *plist_id, int_f *flag);
-H5_FCDLL int_f nh5pset_obj_track_times_c(hid_t_f *plist_id, int_f *flag);
-H5_FCDLL int_f nh5pset_create_inter_group_c(hid_t_f *lcpl_id, int_f *crt_intermed_group);
-H5_FCDLL int_f nh5pget_create_inter_group_c(hid_t_f *lcpl_id, int_f *crt_intermed_group);
-H5_FCDLL int_f nh5pget_link_creation_order_c(hid_t_f *gcpl_id, int_f *crt_order_flags);
-H5_FCDLL int_f nh5pset_char_encoding_c(hid_t_f *plist_id, int_f *encoding);
-H5_FCDLL int_f nh5pget_char_encoding_c(hid_t_f *plist_id, int_f *encoding);
-H5_FCDLL int_f nh5pset_copy_object_c(hid_t_f *ocp_plist_id, int_f *copy_options);
-H5_FCDLL int_f nh5pget_copy_object_c(hid_t_f *ocp_plist_id, int_f *copy_options);
-H5_FCDLL int_f nh5pget_data_transform_c(hid_t_f *plist_id, _fcd expression, int_f *expression_len, size_t_f *size);
-H5_FCDLL int_f nh5pset_data_transform_c(hid_t_f *plist_id, _fcd expression, int_f *expression_len);
-H5_FCDLL int_f nh5pget_local_heap_size_hint_c(hid_t_f *gcpl_id, size_t_f *size_hint);
-H5_FCDLL int_f nh5pget_est_link_info_c(hid_t_f *gcpl_id, int_f *est_num_entries, int_f *est_name_len);
-H5_FCDLL int_f nh5pset_local_heap_size_hint_c(hid_t_f *gcpl_id, size_t_f *size_hint);
-H5_FCDLL int_f nh5pset_est_link_info_c(hid_t_f *gcpl_id, int_f *est_num_entries, int_f *est_name_len);
-H5_FCDLL int_f nh5pset_link_phase_change_c(hid_t_f *gcpl_id, int_f *max_compact, int_f *min_dense );
-H5_FCDLL int_f nh5pset_fapl_direct_c(hid_t_f *fapl_id, size_t_f *alignment, size_t_f *block_size, size_t_f *cbuf_size );
-H5_FCDLL int_f nh5pget_fapl_direct_c(hid_t_f *fapl_id, size_t_f *alignment, size_t_f *block_size, size_t_f *cbuf_size );
-H5_FCDLL int_f nh5pset_attr_phase_change_c (hid_t_f *ocpl_id, int_f *max_compact, int_f *min_dense );
-H5_FCDLL int_f nh5pset_nbit_c(hid_t_f *plist_id );
-H5_FCDLL int_f nh5pset_scaleoffset_c(hid_t_f *plist_id, int_f *scale_type, int_f *scale_factor );
-H5_FCDLL int_f nh5pset_nlinks_c(hid_t_f *lapl_id, size_t_f *nlinks);
-H5_FCDLL int_f nh5pget_nlinks_c(hid_t_f *lapl_id, size_t_f *nlinks);
-H5_FCDLL int_f nh5pset_chunk_cache_c(hid_t_f *dapl_id, size_t_f *rdcc_nslots, size_t_f *rdcc_nbytes, real_f *rdcc_w0);
-H5_FCDLL int_f nh5pget_chunk_cache_c(hid_t_f *dapl_id, size_t_f *rdcc_nslots, size_t_f *rdcc_nbytes, real_f *rdcc_w0);
-H5_FCDLL int_f nh5pget_mpio_actual_io_mode_c(hid_t_f *dxpl_id, int_f *actual_io_mode);
+H5_FCDLL int_f h5pexist_c(hid_t_f *prp_id, _fcd name, int_f *name_len);
+H5_FCDLL int_f h5pget_size_c(hid_t_f *prp_id, _fcd name, int_f *name_len, size_t_f *size);
+H5_FCDLL int_f h5pget_nprops_c(hid_t_f *prp_id, size_t_f *nprops);
+H5_FCDLL int_f h5pget_class_parent_c(hid_t_f *prp_id, hid_t_f *parent_id);
+H5_FCDLL int_f h5pisa_class_c(hid_t_f *plist, hid_t_f *pclass);
+H5_FCDLL int_f h5pcopy_prop_c(hid_t_f *dst_id, hid_t_f *src_id, _fcd name, int_f *name_len);
+H5_FCDLL int_f h5premove_c(hid_t_f *plid, _fcd name, int_f *name_len);
+H5_FCDLL int_f h5punregister_c(hid_t_f *cls, _fcd name, int_f *name_len);
+H5_FCDLL int_f h5pclose_class_c(hid_t_f *cls);
+H5_FCDLL int_f h5pget_class_name_c(hid_t_f *prp_id, _fcd name, int_f *name_len);
+H5_FCDLL int_f h5pset_shuffle_c(hid_t_f *prp_id);
+H5_FCDLL int_f h5pset_fletcher32_c(hid_t_f *prp_id);
+H5_FCDLL int_f h5pset_edc_check_c(hid_t_f *prp_id, int_f *flag);
+H5_FCDLL int_f h5pget_edc_check_c(hid_t_f *prp_id, int_f *flag);
+H5_FCDLL int_f h5pset_family_offset_c(hid_t_f *prp_id, hsize_t_f *offset);
+H5_FCDLL int_f h5pget_fapl_multi_c(hid_t_f *prp_id, int_f *mem_map, hid_t_f *memb_fapl, _fcd memb_name,
+                                   int_f *len, int_f *lenmax, real_f *memb_addr, int_f *flag,
+                                   int_f *maxlen_out);
+H5_FCDLL int_f h5pset_fapl_multi_c(hid_t_f *prp_id, int_f *mem_map, hid_t_f *memb_fapl, _fcd memb_name,
+                                   int_f *len, int_f *lenmax, real_f *memb_addr, int_f *flag);
+H5_FCDLL int_f h5pset_fapl_multi_sc(hid_t_f *prp_id, int_f *flag);
+H5_FCDLL int_f h5pset_szip_c(hid_t_f *prp_id, int_f *options_mask, int_f *pixels_per_block);
+H5_FCDLL int_f h5pall_filters_avail_c(hid_t_f *prp_id, int_f *status);
+H5_FCDLL int_f h5pfill_value_defined_c(hid_t_f *prp_id, int_f *flag);
+H5_FCDLL int_f h5pget_attr_phase_change_c(hid_t_f *ocpl_id, int_f *max_compact, int_f *min_dense);
+H5_FCDLL int_f h5pset_attr_creation_order_c(hid_t_f *ocpl_id, int_f *crt_order_flags);
+H5_FCDLL int_f h5pset_shared_mesg_nindexes_c(hid_t_f *plist_id, int_f *nindexes);
+H5_FCDLL int_f h5pset_shared_mesg_index_c(hid_t_f *fcpl_id, int_f *index_num, int_f *mesg_type_flags,
+                                          int_f *min_mesg_size);
+H5_FCDLL int_f h5pget_attr_creation_order_c(hid_t_f *ocpl_id, int_f *crt_order_flags);
+H5_FCDLL int_f h5pset_link_creation_order_c(hid_t_f *gcpl_id, int_f *crt_order_flags);
+H5_FCDLL int_f h5pget_link_phase_change_c(hid_t_f *gcpl_id, int_f *max_compact, int_f *min_dense);
+H5_FCDLL int_f h5pget_obj_track_times_c(hid_t_f *plist_id, int_f *flag);
+H5_FCDLL int_f h5pset_obj_track_times_c(hid_t_f *plist_id, int_f *flag);
+H5_FCDLL int_f h5pset_create_inter_group_c(hid_t_f *lcpl_id, int_f *crt_intermed_group);
+H5_FCDLL int_f h5pget_create_inter_group_c(hid_t_f *lcpl_id, int_f *crt_intermed_group);
+H5_FCDLL int_f h5pget_link_creation_order_c(hid_t_f *gcpl_id, int_f *crt_order_flags);
+H5_FCDLL int_f h5pset_char_encoding_c(hid_t_f *plist_id, int_f *encoding);
+H5_FCDLL int_f h5pget_char_encoding_c(hid_t_f *plist_id, int_f *encoding);
+H5_FCDLL int_f h5pset_copy_object_c(hid_t_f *ocp_plist_id, int_f *copy_options);
+H5_FCDLL int_f h5pget_copy_object_c(hid_t_f *ocp_plist_id, int_f *copy_options);
+H5_FCDLL int_f h5pget_data_transform_c(hid_t_f *plist_id, _fcd expression, int_f *expression_len,
+                                       size_t_f *size);
+H5_FCDLL int_f h5pset_data_transform_c(hid_t_f *plist_id, _fcd expression, int_f *expression_len);
+H5_FCDLL int_f h5pget_local_heap_size_hint_c(hid_t_f *gcpl_id, size_t_f *size_hint);
+H5_FCDLL int_f h5pget_est_link_info_c(hid_t_f *gcpl_id, int_f *est_num_entries, int_f *est_name_len);
+H5_FCDLL int_f h5pset_local_heap_size_hint_c(hid_t_f *gcpl_id, size_t_f *size_hint);
+H5_FCDLL int_f h5pset_est_link_info_c(hid_t_f *gcpl_id, int_f *est_num_entries, int_f *est_name_len);
+H5_FCDLL int_f h5pset_link_phase_change_c(hid_t_f *gcpl_id, int_f *max_compact, int_f *min_dense);
+H5_FCDLL int_f h5pset_fapl_direct_c(hid_t_f *fapl_id, size_t_f *alignment, size_t_f *block_size,
+                                    size_t_f *cbuf_size);
+H5_FCDLL int_f h5pget_fapl_direct_c(hid_t_f *fapl_id, size_t_f *alignment, size_t_f *block_size,
+                                    size_t_f *cbuf_size);
+H5_FCDLL int_f h5pset_attr_phase_change_c(hid_t_f *ocpl_id, int_f *max_compact, int_f *min_dense);
+H5_FCDLL int_f h5pset_nbit_c(hid_t_f *plist_id);
+H5_FCDLL int_f h5pset_scaleoffset_c(hid_t_f *plist_id, int_f *scale_type, int_f *scale_factor);
+H5_FCDLL int_f h5pset_nlinks_c(hid_t_f *lapl_id, size_t_f *nlinks);
+H5_FCDLL int_f h5pget_nlinks_c(hid_t_f *lapl_id, size_t_f *nlinks);
+H5_FCDLL int_f h5pset_chunk_cache_c(hid_t_f *dapl_id, size_t_f *rdcc_nslots, size_t_f *rdcc_nbytes,
+                                    real_f *rdcc_w0);
+H5_FCDLL int_f h5pget_chunk_cache_c(hid_t_f *dapl_id, size_t_f *rdcc_nslots, size_t_f *rdcc_nbytes,
+                                    real_f *rdcc_w0);
+#ifdef H5_HAVE_PARALLEL
+H5_FCDLL int_f h5pget_mpio_actual_io_mode_c(hid_t_f *dxpl_id, int_f *actual_io_mode);
+H5_FCDLL int_f h5pget_fapl_mpio_c(hid_t_f *prp_id, int_f *comm, int_f *info);
+H5_FCDLL int_f h5pset_fapl_mpio_c(hid_t_f *prp_id, int_f *comm, int_f *info);
+H5_FCDLL int_f h5pget_mpi_params_c(hid_t_f *prp_id, int_f *comm, int_f *info);
+H5_FCDLL int_f h5pset_mpi_params_c(hid_t_f *prp_id, int_f *comm, int_f *info);
+H5_FCDLL int_f h5pget_dxpl_mpio_c(hid_t_f *prp_id, int_f *data_xfer_mode);
+H5_FCDLL int_f h5pset_dxpl_mpio_c(hid_t_f *prp_id, int_f *data_xfer_mode);
+#endif
 /*
- * Functions frome H5Rf.c
+ * Functions from H5Rf.c
  */
-#define nh5rcreate_object_c     H5_FC_FUNC_(h5rcreate_object_c, H5RCREATE_OBJECT_C)
-#define nh5rcreate_region_c     H5_FC_FUNC_(h5rcreate_region_c, H5RCREATE_REGION_C)
-#define nh5rdereference_region_c H5_FC_FUNC_(h5rdereference_region_c, H5RDEREFERENCE_REGION_C)
-#define nh5rdereference_object_c H5_FC_FUNC_(h5rdereference_object_c, H5RDEREFERENCE_OBJECT_C)
-#define nh5rget_region_region_c H5_FC_FUNC_(h5rget_region_region_c, H5RGET_REGION_REGION_C)
-#define nh5rget_object_type_obj_c H5_FC_FUNC_(h5rget_object_type_obj_c, H5RGET_OBJECT_TYPE_OBJ_C)
-#define nh5rget_name_object_c H5_FC_FUNC_(h5rget_name_object_c, H5RGET_NAME_OBJECT_C)
-#define nh5rget_name_region_c H5_FC_FUNC_(h5rget_name_region_c, H5RGET_NAME_REGION_C)
-
-
-H5_FCDLL int_f nh5rcreate_object_c (haddr_t_f *ref, hid_t_f *loc_id, _fcd name, int_f *namelen);
-H5_FCDLL int_f nh5rcreate_region_c (int_f *ref, hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *space_id);
-H5_FCDLL int_f h5rcreate_ptr_c (void *ref, hid_t_f *loc_id, _fcd name, int_f *namelen, int_f *ref_type, hid_t_f *space_id);
-H5_FCDLL int_f nh5rdereference_region_c (hid_t_f *dset_id, int_f *ref, hid_t_f *obj_id);
-H5_FCDLL int_f nh5rdereference_object_c (hid_t_f *dset_id, haddr_t_f *ref, hid_t_f *obj_id);
-H5_FCDLL int_f h5rdereference_ptr_c (hid_t_f *obj_id, int_f *ref_type, void *ref, hid_t_f *ref_obj_id);
-H5_FCDLL int_f nh5rget_region_region_c (hid_t_f *dset_id, int_f *ref, hid_t_f *space_id);
+H5_FCDLL int_f h5rcreate_region_c(int_f *ref, hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *space_id);
+H5_FCDLL int_f h5rcreate_ptr_c(void *ref, hid_t_f *loc_id, _fcd name, int_f *namelen, int_f *ref_type,
+                               hid_t_f *space_id);
+H5_FCDLL int_f h5rdereference_ptr_c(hid_t_f *obj_id, int_f *ref_type, void *ref, hid_t_f *ref_obj_id);
+H5_FCDLL int_f h5rget_region_region_c(hid_t_f *dset_id, int_f *ref, hid_t_f *space_id);
 H5_FCDLL int_f h5rget_region_ptr_c(hid_t_f *dset_id, void *ref, hid_t_f *space_id);
-H5_FCDLL int_f nh5rget_object_type_obj_c (hid_t_f *dset_id, haddr_t_f *ref, int_f *obj_type);
-H5_FCDLL int_f nh5rget_name_object_c (hid_t_f *loc_id, haddr_t_f *ref, _fcd name, size_t_f *name_len, size_t_f *size_default);
-H5_FCDLL int_f nh5rget_name_region_c (hid_t_f *loc_id, int_f *ref, _fcd name, size_t_f *name_len, size_t_f *size_default);
-H5_FCDLL int_f h5rget_name_ptr_c (hid_t_f *loc_id, int_f *ref_type, void *ref, _fcd name, size_t_f *name_len, size_t_f *size_default);
-H5_FCDLL int_f h5rget_obj_type_c (hid_t_f *loc_id, int_f *ref_type, void *ref, int_f *obj_type);
+H5_FCDLL int_f h5rget_object_type_obj_c(hid_t_f *dset_id, haddr_t_f *ref, int_f *obj_type);
+H5_FCDLL int_f h5rget_name_ptr_c(hid_t_f *loc_id, int_f *ref_type, void *ref, _fcd name, size_t_f *name_len,
+                                 size_t_f *size_default);
+H5_FCDLL int_f h5rget_obj_type_c(hid_t_f *loc_id, int_f *ref_type, void *ref, int_f *obj_type);
 /*
  * Functions from H5If.c
  */
-#define nh5iget_type_c    H5_FC_FUNC_(h5iget_type_c, H5IGET_TYPE_C)
-#define nh5iget_name_c    H5_FC_FUNC_(h5iget_name_c, H5IGET_NAME_C)
-#define nh5iinc_ref_c     H5_FC_FUNC_(h5iinc_ref_c, H5IINC_REF_C)
-#define nh5idec_ref_c     H5_FC_FUNC_(h5idec_ref_c, H5IDEC_REF_C)
-#define nh5iget_ref_c     H5_FC_FUNC_(h5iget_ref_c, H5IGET_REF_C)
-#define nh5iget_file_id_c H5_FC_FUNC_(h5iget_file_id_c, H5IGET_FILE_ID_C)
-#define nh5iis_valid_c    H5_FC_FUNC_(h5iis_valid_c, H5IIS_VALID_C)
-
-H5_FCDLL int_f nh5iget_type_c(hid_t_f *obj_id, int_f *type);
-H5_FCDLL int_f nh5iget_name_c(hid_t_f *obj_id, _fcd buf, size_t_f *buf_size, size_t_f *name_size);
-H5_FCDLL int_f nh5iinc_ref_c(hid_t_f *obj_id, int_f *ref_count);
-H5_FCDLL int_f nh5idec_ref_c(hid_t_f *obj_id, int_f *ref_count);
-H5_FCDLL int_f nh5iget_ref_c(hid_t_f *obj_id, int_f *ref_count);
-H5_FCDLL int_f nh5iget_file_id_c(hid_t_f *obj_id, hid_t_f *file_id);
-H5_FCDLL int_f nh5iis_valid_c(hid_t_f *obj_id, int_f *c_valid);
+H5_FCDLL int_f h5iget_type_c(hid_t_f *obj_id, int_f *type);
+H5_FCDLL int_f h5iget_name_c(hid_t_f *obj_id, _fcd buf, size_t_f *buf_size, size_t_f *name_size);
+H5_FCDLL int_f h5iinc_ref_c(hid_t_f *obj_id, int_f *ref_count);
+H5_FCDLL int_f h5idec_ref_c(hid_t_f *obj_id, int_f *ref_count);
+H5_FCDLL int_f h5iget_ref_c(hid_t_f *obj_id, int_f *ref_count);
+H5_FCDLL int_f h5iget_file_id_c(hid_t_f *obj_id, hid_t_f *file_id);
+H5_FCDLL int_f h5iis_valid_c(hid_t_f *obj_id, int_f *c_valid);
 
 /*
  * Functions from H5Ef.c
  */
-#define nh5eclear_c     H5_FC_FUNC_(h5eclear_c, H5ECLEAR_C)
-#define nh5eprint_c1    H5_FC_FUNC_(h5eprint_c1, H5EPRINT_C1)
-#define nh5eprint_c2    H5_FC_FUNC_(h5eprint_c2, H5EPRINT_C2)
-#define nh5eget_major_c H5_FC_FUNC_(h5eget_major_c, H5EGET_MAJOR_C)
-#define nh5eget_minor_c H5_FC_FUNC_(h5eget_minor_c, H5EGET_MINOR_C)
-#define nh5eset_auto_c  H5_FC_FUNC_(h5eset_auto_c, H5ESET_AUTO_C)
-#define nprocess_buffer  H5_FC_FUNC_(process_buffer, PROCESS_BUFFER)
-
 
-H5_FCDLL int_f nh5eclear_c(hid_t_f *estack_id);
-H5_FCDLL int_f nh5eprint_c1(_fcd name, int_f* namelen);
-H5_FCDLL int_f nh5eprint_c2(void);
-H5_FCDLL int_f nh5eget_major_c(int_f* error_no, _fcd name, size_t_f* namelen);
-H5_FCDLL int_f nh5eget_minor_c(int_f* error_no, _fcd name, size_t_f* namelen);
-H5_FCDLL int_f nh5eset_auto_c(int_f* printflag);
-H5_FCDLL int_f h5eset_auto2_c(int_f* printflag, hid_t_f *estack_id, H5E_auto2_t func, void *client_data);
-H5_FCDLL int_f nprocess_buffer(hid_t_f *estack_id,void **buffer);
+H5_FCDLL int_f h5eclear_c(hid_t_f *estack_id);
+H5_FCDLL int_f h5eprint_c1(_fcd name, int_f *namelen);
+H5_FCDLL int_f h5eprint_c2(void);
+H5_FCDLL int_f h5eget_major_c(int_f *error_no, _fcd name, size_t_f *namelen);
+H5_FCDLL int_f h5eget_minor_c(int_f *error_no, _fcd name, size_t_f *namelen);
+H5_FCDLL int_f h5eset_auto2_c(int_f *printflag, hid_t_f *estack_id, H5E_auto2_t func, void *client_data);
 
 /*
  * Functions from H5f.c
  */
-#define nh5open_c            H5_FC_FUNC_(h5open_c, H5OPEN_C)
-#define nh5close_c           H5_FC_FUNC_(h5close_c, H5CLOSE_C)
-#define nh5init_types_c      H5_FC_FUNC_(h5init_types_c, H5INIT_TYPES_C)
-#define nh5close_types_c     H5_FC_FUNC_(h5close_types_c, H5CLOSE_TYPES_C)
-#define nh5init_flags_c      H5_FC_FUNC_(h5init_flags_c, H5INIT_FLAGS_C)
-#define nh5init1_flags_c     H5_FC_FUNC_(h5init1_flags_c, H5INIT1_FLAGS_C)
-#define nh5get_libversion_c  H5_FC_FUNC_(h5get_libversion_c, H5GET_LIBVERSION_C)
-#define nh5check_version_c   H5_FC_FUNC_(h5check_version_c, H5CHECK_VERSION_C)
-#define nh5garbage_collect_c H5_FC_FUNC_(h5garbage_collect_c, H5GARBAGE_COLLECT_C)
-#define nh5dont_atexit_c     H5_FC_FUNC_(h5dont_atexit_c, H5DONT_ATEXIT_C)
-
-
-H5_FCDLL int_f nh5open_c(void);
-H5_FCDLL int_f nh5close_c(void);
-H5_FCDLL int_f nh5init_types_c(hid_t_f *types, hid_t_f *floatingtypes, hid_t_f *integertypes);
-H5_FCDLL int_f nh5close_types_c(hid_t_f *types, int_f *lentypes, hid_t_f *floatingtypes, int_f *floatinglen, hid_t_f *integertypes, int_f *integerlen);
-H5_FCDLL int_f nh5init_flags_c(int_f *h5d_flags, size_t_f *h5d_size_flags, int_f *h5e_flags, hid_t_f *h5e_hid_flags, int_f *h5f_flags,
-			       int_f *h5fd_flags, hid_t_f *h5fd_hid_flags,
-			       int_f *h5g_flags, int_f *h5i_flags, int_f *h5l_flags, int_f *h5o_flags,
-			       hid_t_f *h5p_flags, int_f *h5p_flags_int, int_f *h5r_flags, int_f *h5s_flags,
-			       hsize_t_f *h5s_hsize_flags, int_f *h5t_flags, int_f *h5z_flags, int_f *h5_generic_flags);
-H5_FCDLL int_f nh5init1_flags_c(int_f *h5lib_flags);
-H5_FCDLL int_f nh5get_libversion_c(int_f *majnum, int_f *minnum, int_f *relnum);
-H5_FCDLL int_f nh5check_version_c(int_f *majnum, int_f *minnum, int_f *relnum);
-H5_FCDLL int_f nh5garbage_collect_c(void);
-H5_FCDLL int_f nh5dont_atexit_c(void);
+H5_FCDLL int_f h5open_c(void);
+H5_FCDLL int_f h5close_c(void);
+H5_FCDLL int_f h5init_types_c(hid_t_f *types, hid_t_f *floatingtypes, hid_t_f *integertypes);
+H5_FCDLL int_f h5close_types_c(hid_t_f *types, int_f *lentypes, hid_t_f *floatingtypes, int_f *floatinglen,
+                               hid_t_f *integertypes, int_f *integerlen);
+H5_FCDLL int_f h5init_flags_c(int_f *h5d_flags, size_t_f *h5d_size_flags, int_f *h5e_flags,
+                              hid_t_f *h5e_hid_flags, int_f *h5f_flags, int_f *h5fd_flags,
+                              hid_t_f *h5fd_hid_flags, int_f *h5g_flags, int_f *h5i_flags, int_f *h5l_flags,
+                              int_f *h5o_flags, hid_t_f *h5p_flags, int_f *h5p_flags_int, int_f *h5r_flags,
+                              int_f *h5s_flags, hid_t_f *h5s_hid_flags, hsize_t_f *h5s_hsize_flags,
+                              int_f *h5t_flags, int_f *h5z_flags, int_f *h5_generic_flags,
+                              haddr_t_f *h5_haddr_generic_flags);
+H5_FCDLL int_f h5init1_flags_c(int_f *h5lib_flags);
+H5_FCDLL int_f h5get_libversion_c(int_f *majnum, int_f *minnum, int_f *relnum);
+H5_FCDLL int_f h5check_version_c(int_f *majnum, int_f *minnum, int_f *relnum);
+H5_FCDLL int_f h5garbage_collect_c(void);
+H5_FCDLL int_f h5dont_atexit_c(void);
 
 /*
  * Functions from H5Zf.c
  */
-#define nh5zunregister_c    H5_FC_FUNC_(h5zunregister_c, H5ZUNREGISTER_C)
-#define nh5zfilter_avail_c  H5_FC_FUNC_(h5zfilter_avail_c, H5ZFILTER_AVAIL_C)
-#define nh5zget_filter_info_c H5_FC_FUNC_(h5zget_filter_info_c, H5ZGET_FILTER_INFO_C)
-
-
-H5_FCDLL int_f nh5zunregister_c (int_f *filter);
-H5_FCDLL int_f nh5zfilter_avail_c (int_f *filter, int_f *flag);
-H5_FCDLL int_f nh5zget_filter_info_c (int_f *filter, int_f *flag);
-
+H5_FCDLL int_f h5zunregister_c(int_f *filter);
+H5_FCDLL int_f h5zfilter_avail_c(int_f *filter, int_f *flag);
+H5_FCDLL int_f h5zget_filter_info_c(int_f *filter, int_f *flag);
 
 /*
  * Functions from H5Lf.c
  */
-#define nh5lcopy_c H5_FC_FUNC_(h5lcopy_c, H5LCOPY_C)
-#define nh5lcreate_external_c H5_FC_FUNC_(h5lcreate_external_c, H5LCREATE_EXTERNAL_C)
-#define nh5lcreate_hard_c H5_FC_FUNC_(h5lcreate_hard_c, H5LCREATE_HARD_C)
-#define nh5lcreate_soft_c H5_FC_FUNC_(h5lcreate_soft_c, H5LCREATE_SOFT_C)
-#define nh5ldelete_c H5_FC_FUNC_(h5ldelete_c, H5LDELETE_C)
-#define nh5ldelete_by_idx_c H5_FC_FUNC_(h5ldelete_by_idx_c, H5LDELETE_BY_IDX_C)
-#define nh5lexists_c H5_FC_FUNC_(h5lexists_c, H5LEXISTS_C)
-#define nh5lget_info_c H5_FC_FUNC_(h5lget_info_c, H5LGET_INFO_C)
-#define nh5lget_info_by_idx_c H5_FC_FUNC_(h5lget_info_by_idx_c, H5LGET_INFO_BY_IDX_C)
-#define nh5lis_registered_c H5_FC_FUNC_(h5lis_registered_c, H5LIS_REGISTERED_C)
-#define nh5lmove_c H5_FC_FUNC_(h5lmove_c, H5LMOVE_C)
-#define nh5lget_name_by_idx_c H5_FC_FUNC_(h5lget_name_by_idx_c, H5LGET_NAME_BY_IDX_C)
-#define nh5lget_val_c H5_FC_FUNC_(h5lget_val_c, H5LGET_VAL_C)
-
-H5_FCDLL int_f nh5lcopy_c(hid_t_f *src_loc_id, _fcd src_name, size_t_f *src_namelen, hid_t_f *dest_loc_id,
-			  _fcd dest_name, size_t_f *dest_namelen,
-			  hid_t_f *lcpl_id, hid_t_f *lapl_id);
-H5_FCDLL int_f nh5lcreate_external_c(_fcd file_name, size_t_f *file_namelen, _fcd obj_name, size_t_f *obj_namelen,
-				     hid_t_f *link_loc_id, _fcd link_name, size_t_f *link_namelen,
-				     hid_t_f *lcpl_id, hid_t_f *lapl_id);
-H5_FCDLL int_f nh5lcreate_hard_c(hid_t_f *obj_loc_id, _fcd obj_name, size_t_f *obj_namelen,
-				 hid_t_f *link_loc_id,
-				 _fcd link_name, size_t_f *link_namelen,
-				 hid_t_f *lcpl_id, hid_t_f *lapl_id );
-H5_FCDLL int_f nh5lcreate_soft_c(_fcd target_path, size_t_f *target_path_len,
-				 hid_t_f *link_loc_id,
-				 _fcd link_name, size_t_f *link_name_len,
-				 hid_t_f *lcpl_id, hid_t_f *lapl_id );
-H5_FCDLL int_f nh5ldelete_c( hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *lapl_id );
-H5_FCDLL int_f nh5ldelete_by_idx_c (hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
-				    int_f *index_field, int_f *order, hsize_t_f *n, hid_t_f *lapl_id);
-H5_FCDLL int_f nh5lexists_c (hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *lapl_id, int_f *link_exists);
-H5_FCDLL int_f nh5lget_info_c (hid_t_f *link_loc_id, _fcd link_name, size_t_f *link_namelen,
-			       int_f *cset, int_f *corder, int_f *corder_valid, int_f *link_type,
-			       haddr_t_f *address, size_t_f *val_size,
-			       hid_t_f *lapl_id);
-H5_FCDLL int_f nh5lget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
-		      int_f *index_field, int_f *order, hsize_t_f *n,
-		      int_f *link_type, int_f *corder_valid, int_f *corder, int_f *cset, haddr_t_f *address, size_t_f *val_size, hid_t_f *lapl_id);
-H5_FCDLL int_f nh5lis_registered_c(int_f *link_cls_id);
-H5_FCDLL int_f nh5lmove_c(hid_t_f *src_loc_id, _fcd src_name, size_t_f *src_namelen, hid_t_f *dest_loc_id,
-			  _fcd dest_name, size_t_f *dest_namelen, hid_t_f *lcpl_id, hid_t_f *lapl_id);
-H5_FCDLL int_f nh5lget_name_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
-				     int_f *index_field, int_f *order, hsize_t_f *n,
-				     size_t_f *size, _fcd name, hid_t_f *lapl_id);
-H5_FCDLL int_f nh5lget_val_c(hid_t_f *link_loc_id, _fcd link_name, size_t_f *link_namelen, size_t_f *size,
-			     void *linkval_buff, hid_t_f *lapl_id) ;
-
-H5_FCDLL int_f h5literate_c(hid_t_f *group_id, int_f *index_type, int_f *order, hsize_t_f *idx, H5L_iterate_t op, void *op_data );
-H5_FCDLL int_f h5literate_by_name_c(hid_t_f *loc_id, _fcd name, size_t_f *namelen, int_f *index_type, int_f *order, hsize_t_f *idx, H5L_iterate_t op, void *op_data, hid_t_f *lapl_id);
-
 
-#endif /* _H5f90proto_H */
+H5_FCDLL int_f h5lcopy_c(hid_t_f *src_loc_id, _fcd src_name, size_t_f *src_namelen, hid_t_f *dest_loc_id,
+                         _fcd dest_name, size_t_f *dest_namelen, hid_t_f *lcpl_id, hid_t_f *lapl_id);
+H5_FCDLL int_f h5lcreate_external_c(_fcd file_name, size_t_f *file_namelen, _fcd obj_name,
+                                    size_t_f *obj_namelen, hid_t_f *link_loc_id, _fcd link_name,
+                                    size_t_f *link_namelen, hid_t_f *lcpl_id, hid_t_f *lapl_id);
+H5_FCDLL int_f h5lcreate_hard_c(hid_t_f *obj_loc_id, _fcd obj_name, size_t_f *obj_namelen,
+                                hid_t_f *link_loc_id, _fcd link_name, size_t_f *link_namelen,
+                                hid_t_f *lcpl_id, hid_t_f *lapl_id);
+H5_FCDLL int_f h5lcreate_soft_c(_fcd target_path, size_t_f *target_path_len, hid_t_f *link_loc_id,
+                                _fcd link_name, size_t_f *link_name_len, hid_t_f *lcpl_id, hid_t_f *lapl_id);
+H5_FCDLL int_f h5ldelete_c(hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *lapl_id);
+H5_FCDLL int_f h5ldelete_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
+                                  int_f *index_field, int_f *order, hsize_t_f *n, hid_t_f *lapl_id);
+H5_FCDLL int_f h5lexists_c(hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *lapl_id,
+                           int_f *link_exists);
+H5_FCDLL int_f h5lget_info_c(hid_t_f *link_loc_id, _fcd link_name, size_t_f *link_namelen, int_f *cset,
+                             int_f *corder, int_f *corder_valid, int_f *link_type, H5O_token_t *token,
+                             size_t_f *val_size, hid_t_f *lapl_id);
+H5_FCDLL int_f h5lget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
+                                    int_f *index_field, int_f *order, hsize_t_f *n, int_f *link_type,
+                                    int_f *corder_valid, int_f *corder, int_f *cset, H5O_token_t *token,
+                                    size_t_f *val_size, hid_t_f *lapl_id);
+H5_FCDLL int_f h5lis_registered_c(int_f *link_cls_id);
+H5_FCDLL int_f h5lmove_c(hid_t_f *src_loc_id, _fcd src_name, size_t_f *src_namelen, hid_t_f *dest_loc_id,
+                         _fcd dest_name, size_t_f *dest_namelen, hid_t_f *lcpl_id, hid_t_f *lapl_id);
+H5_FCDLL int_f h5lget_name_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
+                                    int_f *index_field, int_f *order, hsize_t_f *n, size_t_f *size, _fcd name,
+                                    hid_t_f *lapl_id);
+H5_FCDLL int_f h5lget_val_c(hid_t_f *link_loc_id, _fcd link_name, size_t_f *link_namelen, size_t_f *size,
+                            void *linkval_buff, hid_t_f *lapl_id);
+
+H5_FCDLL int_f h5literate_c(hid_t_f *group_id, int_f *index_type, int_f *order, hsize_t_f *idx,
+                            H5L_iterate2_t op, void *op_data);
+H5_FCDLL int_f h5literate_by_name_c(hid_t_f *loc_id, _fcd name, size_t_f *namelen, int_f *index_type,
+                                    int_f *order, hsize_t_f *idx, H5L_iterate2_t op, void *op_data,
+                                    hid_t_f *lapl_id);
+
+#endif /* H5f90proto_H */
diff --git a/fortran/src/H5fort_type_defines.h.cmake b/fortran/src/H5fort_type_defines.h.cmake
new file mode 100644
index 0000000..f2f6af6
--- /dev/null
+++ b/fortran/src/H5fort_type_defines.h.cmake
@@ -0,0 +1,28 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/* If you are reading this file and it has a '.h' suffix, it was automatically
+ * generated from the '.in' version.  Make changes there.
+ */
+#define H5_FORTRAN_NATIVE_INTEGER_KIND @PAC_FORTRAN_NATIVE_INTEGER_KIND@
+#define H5_FORTRAN_NATIVE_INTEGER_SIZEOF @PAC_FORTRAN_NATIVE_INTEGER_SIZEOF@
+#define H5_FORTRAN_NATIVE_REAL_KIND @PAC_FORTRAN_NATIVE_REAL_KIND@
+#define H5_FORTRAN_NATIVE_REAL_SIZEOF @PAC_FORTRAN_NATIVE_REAL_SIZEOF@
+#define H5_FORTRAN_NATIVE_DOUBLE_KIND @PAC_FORTRAN_NATIVE_DOUBLE_KIND@
+#define H5_FORTRAN_NATIVE_DOUBLE_SIZEOF @PAC_FORTRAN_NATIVE_DOUBLE_SIZEOF@
+#define H5_FORTRAN_NUM_INTEGER_KINDS @PAC_FORTRAN_NUM_INTEGER_KINDS@
+#define H5_FORTRAN_INTEGER_KINDS @PAC_FC_ALL_INTEGER_KINDS@
+#define H5_FORTRAN_INTEGER_KINDS_SIZEOF @PAC_FC_ALL_INTEGER_KINDS_SIZEOF@
+#define H5_FORTRAN_REAL_KINDS @PAC_FC_ALL_REAL_KINDS@
+#define H5_FORTRAN_REAL_KINDS_SIZEOF @PAC_FC_ALL_REAL_KINDS_SIZEOF@
+#define H5_HAVE_Fortran_INTEGER_SIZEOF_16 @H5_HAVE_Fortran_INTEGER_SIZEOF_16@
+#define H5_FORTRAN_HAVE_C_LONG_DOUBLE @H5_FORTRAN_HAVE_C_LONG_DOUBLE@
+#define H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE @H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE@
diff --git a/fortran/src/H5fort_type_defines.h.in b/fortran/src/H5fort_type_defines.h.in
new file mode 100644
index 0000000..989be54
--- /dev/null
+++ b/fortran/src/H5fort_type_defines.h.in
@@ -0,0 +1,28 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/* If you are reading this file and it has a '.h' suffix, it was automatically
+ * generated from the '.in' version.  Make changes there.
+ */
+#define H5_FORTRAN_NATIVE_INTEGER_KIND @PAC_FORTRAN_NATIVE_INTEGER_KIND@
+#define H5_FORTRAN_NATIVE_INTEGER_SIZEOF @PAC_FORTRAN_NATIVE_INTEGER_SIZEOF@
+#define H5_FORTRAN_NATIVE_REAL_KIND @PAC_FORTRAN_NATIVE_REAL_KIND@
+#define H5_FORTRAN_NATIVE_REAL_SIZEOF @PAC_FORTRAN_NATIVE_REAL_SIZEOF@
+#define H5_FORTRAN_NATIVE_DOUBLE_KIND @PAC_FORTRAN_NATIVE_DOUBLE_KIND@
+#define H5_FORTRAN_NATIVE_DOUBLE_SIZEOF @PAC_FORTRAN_NATIVE_DOUBLE_SIZEOF@
+#define H5_FORTRAN_NUM_INTEGER_KINDS @PAC_FORTRAN_NUM_INTEGER_KINDS@
+#define H5_FORTRAN_INTEGER_KINDS @PAC_FC_ALL_INTEGER_KINDS@
+#define H5_FORTRAN_INTEGER_KINDS_SIZEOF @PAC_FC_ALL_INTEGER_KINDS_SIZEOF@
+#define H5_FORTRAN_REAL_KINDS @PAC_FC_ALL_REAL_KINDS@
+#define H5_FORTRAN_REAL_KINDS_SIZEOF @PAC_FC_ALL_REAL_KINDS_SIZEOF@
+#define H5_HAVE_Fortran_INTEGER_SIZEOF_16 @HAVE_Fortran_INTEGER_SIZEOF_16@
+#define H5_FORTRAN_HAVE_C_LONG_DOUBLE @FORTRAN_HAVE_C_LONG_DOUBLE@
+#define H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE @FORTRAN_C_LONG_DOUBLE_IS_UNIQUE@
diff --git a/fortran/src/H5fortkit.F90 b/fortran/src/H5fortkit.F90
new file mode 100644
index 0000000..b745c22
--- /dev/null
+++ b/fortran/src/H5fortkit.F90
@@ -0,0 +1,63 @@
+!****h* ROBODoc/H5fortkit
+!
+! NAME
+!  MODULE H5fortkit
+!
+! FILE
+!  fortran/src/H5fortkit.F90
+!
+! PURPOSE
+!  Routines to deal with C-FORTRAN issues.
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+!*****
+MODULE H5fortkit
+
+CONTAINS
+
+!****if* H5fortkit/HD5c2fstring
+! NAME
+!  HD5c2fstring
+! INPUTS
+!  cstring  -  C string stored as a string array of size 'len' of string size LEN=1
+!  len      -  length of Fortran string
+! OUTPUT
+!   fstring -  Fortran string array of LEN=1
+! PURPOSE
+!   Copies a Fortran array of strings having a length of one to a fortran string and removes the C Null
+!   terminator. The Null terminator is returned from C when calling the C APIs directly.
+!
+!   The fortran standard does not allow C_LOC to be used on a character string of
+!   length greater than one, which is why we use the array of characters instead.
+!
+! SOURCE
+  SUBROUTINE HD5c2fstring(fstring,cstring,len)
+!*****
+    IMPLICIT NONE
+
+    INTEGER :: i
+    INTEGER :: len
+    CHARACTER(LEN=len) :: fstring
+    CHARACTER(LEN=1), DIMENSION(1:len) :: cstring
+
+    fstring = ''
+    DO i = 1, len
+       IF (cstring(i)(1:1)==CHAR(0)) EXIT
+       fstring(i:i) = cstring(i)(1:1)
+    END DO
+
+  END SUBROUTINE HD5c2fstring
+
+END MODULE H5fortkit
diff --git a/fortran/src/H5match_types.c b/fortran/src/H5match_types.c
index c4b7f73..40d21e9 100644
--- a/fortran/src/H5match_types.c
+++ b/fortran/src/H5match_types.c
@@ -9,28 +9,26 @@
  * PURPOSE
  *  C Program to match C types to Fortran types.
  *  Creates the files H5f90i_gen.h for the C code and
- *  H5fortran_types.f90 for the Fortran code.
+ *  H5fortran_types.F90 for the Fortran code.
  *
  * COPYRIGHT
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  ******
-*/
+ */
 
 #include <stdio.h>
+#include <string.h>
 #include <assert.h>
 
 #include "H5public.h"
@@ -41,38 +39,37 @@
 #include "H5fort_type_defines.h"
 
 /* File pointers for files */
-FILE * c_header;
-FILE * fort_header;
+FILE *c_header;
+FILE *fort_header;
 
 #define CFILE "H5f90i_gen.h"
-#define FFILE "H5fortran_types.f90"
+#define FFILE "H5fortran_types.F90"
 
 /* Prototypes for the write routines */
-void writeTypedef(const char* c_typedef, const char* c_type, unsigned int size);
-void writeTypedefDefault(const char* c_typedef, unsigned int size);
-void writeToFiles(const char* c_typedef, const char* fortran_type, const char* c_type, int size, unsigned int kind);
+void writeTypedef(const char *c_typedef, const char *c_type, int size);
+void writeTypedefDefault(const char *c_typedef, int size);
+void writeToFiles(const char *c_typedef, const char *fortran_type, const char *c_type, int kind);
+void writeToCFileOnly(const char *c_typedef, const char *fortran_type, const char *c_type, int size);
+void writeToFilesChr(const char *c_typedef, const char *fortran_type, const char *c_type, int size,
+                     const char *kind);
 
 static void
 initCfile(void)
 {
-  fprintf(c_header,
- "/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\n\
+    fprintf(c_header, "/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\n\
  * Copyright by The HDF Group.                                               *\n\
- * Copyright by the Board of Trustees of the University of Illinois.         *\n\
  * All rights reserved.                                                      *\n\
  *                                                                           *\n\
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *\n\
  * terms governing use, modification, and redistribution, is contained in    *\n\
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *\n\
- * of the source code distribution tree; Copyright.html can be found at the  *\n\
- * root level of an installed copy of the electronic HDF5 document set and   *\n\
- * is linked from the top-level documents page.  It can also be found at     *\n\
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *\n\
- * access to either file, you may request a copy from help@hdfgroup.org.     *\n\
+ * the COPYING file, which can be found at the root of the source code       *\n\
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *\n\
+ * If you do not have access to either file, you may request a copy from     *\n\
+ * help@hdfgroup.org.                                                        *\n\
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */\n\
 \n\n\
-#ifndef _H5f90i_gen_H\n\
-#define _H5f90i_gen_H\n\
+#ifndef H5f90i_gen_H\n\
+#define H5f90i_gen_H\n\
 \n\
 /* This file is automatically generated by H5match_types.c at build time. */\n\
 \n\
@@ -82,504 +79,377 @@ initCfile(void)
 static void
 initFfile(void)
 {
-  fprintf(fort_header,
-    "! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * \n\
+    fprintf(fort_header, "! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * \n\
 !   Copyright by The HDF Group.                                               *\n\
-!   Copyright by the Board of Trustees of the University of Illinois.         *\n\
 !   All rights reserved.                                                      *\n\
 !                                                                             *\n\
 !   This file is part of HDF5.  The full HDF5 copyright notice, including     *\n\
 !   terms governing use, modification, and redistribution, is contained in    *\n\
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *\n\
-!   of the source code distribution tree; Copyright.html can be found at the  *\n\
-!   root level of an installed copy of the electronic HDF5 document set and   *\n\
-!   is linked from the top-level documents page.  It can also be found at     *\n\
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *\n\
-!   access to either file, you may request a copy from help@hdfgroup.org.     *\n\
+!   the COPYING file, which can be found at the root of the source code       *\n\
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *\n\
+!   If you do not have access to either file, you may request a copy from     *\n\
+!   help@hdfgroup.org.                                                        *\n\
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\n\
 !\n!\n\
-! This file is automatically generated and contains HDF5 Fortran90 type definitions.\n!\n\
+! This file is automatically generated by H5match_types.c and contains HDF5 Fortran90 type definitions.\n!\n\
        MODULE H5FORTRAN_TYPES\n\
+         USE ISO_C_BINDING\n\
          !\n\
          !  HDF5 integers\n\
          !\n");
-
 }
 
 static void
 endCfile(void)
 {
-  fprintf(c_header, "\n#endif /* _H5f90i_gen_H */\n");
+    fprintf(c_header, "\n#endif /* _H5f90i_gen_H */\n");
 }
 static void
 endFfile(void)
 {
-  fprintf(fort_header, "\n        INTEGER(SIZE_T), PARAMETER :: OBJECT_NAMELEN_DEFAULT_F = -1\n\n");
-  fprintf(fort_header, "        END MODULE H5FORTRAN_TYPES\n");
+    fprintf(fort_header, "\n        INTEGER(SIZE_T), PARAMETER :: OBJECT_NAMELEN_DEFAULT_F = -1\n\n");
+    fprintf(fort_header, "        END MODULE H5FORTRAN_TYPES\n");
 }
 
 /* Define a c_int_x type in the C header */
-void writeTypedef(const char* c_typedef, const char* c_type, unsigned int size)
+void
+writeTypedef(const char *c_typedef, const char *c_type, int size)
 {
-  fprintf(c_header, "#define c_%s_%u %s\n", c_typedef, size, c_type);
+    fprintf(c_header, "#define c_%s_%u %s\n", c_typedef, size, c_type);
 }
 
 /* Call this function if there is no matching C type for sizes > 1 */
-void writeTypedefDefault(const char* c_typedef, unsigned int size)
+void
+writeTypedefDefault(const char *c_typedef, int size)
 {
-  assert(size %2 == 0);
-  fprintf(c_header, "typedef struct {c_%s_%u a; c_%s_%u b;} c_%s_%u\n", c_typedef, size / 2, c_typedef, size / 2, c_typedef, size);
+    assert(size % 2 == 0);
+    fprintf(c_header, "typedef struct {c_%s_%u a; c_%s_%u b;} c_%s_%u;\n", c_typedef, size / 2, c_typedef,
+            size / 2, c_typedef, size);
 }
 
 /* Create matching Fortran and C types by writing to both files */
-void writeToFiles(const char* c_typedef, const char* fortran_type, const char* c_type, int size, unsigned int kind)
+void
+writeToFiles(const char *c_typedef, const char *fortran_type, const char *c_type, int kind)
 {
-  fprintf(fort_header, "        INTEGER, PARAMETER :: %s = %u\n", fortran_type, kind);
-  fprintf(c_header, "typedef c_%s_%d %s;\n", c_typedef, size, c_type);
+    fprintf(fort_header, "        INTEGER, PARAMETER :: %s = %u\n", fortran_type, kind);
+    fprintf(c_header, "typedef c_%s_%d %s;\n", c_typedef, kind, c_type);
 }
-
-int main(void)
+void
+writeToFilesChr(const char *c_typedef, const char *fortran_type, const char *c_type, int size,
+                const char *kind)
 {
-  int FoundIntSize[4];
-  unsigned FoundIntSizeKind[4];
-  int FoundRealSize[3];
-  unsigned FoundRealSizeKind[3];
-  int i,j,flag;
-  char chrA[20],chrB[20];
-  int H5_C_HAS_REAL_NATIVE_16;
-
-  /* Open target files */
-  c_header = fopen(CFILE, "w");
-  fort_header = fopen(FFILE, "w");
-
-  /* Default is C has 16 byte float */
-  H5_C_HAS_REAL_NATIVE_16 = 1;
-
-  /* Write copyright, boilerplate to both files */
-  initCfile();
-  initFfile();
-
-  /* First, define c_int_x */
-
-#if defined H5_FORTRAN_HAS_INTEGER_1_KIND
-  if(sizeof(long long) == 1)
-    writeTypedef("int", "long long", 1);
-  else if(sizeof(long) == 1)
-    writeTypedef("int", "long", 1);
-  else if(sizeof(int) == 1)
-    writeTypedef("int", "int", 1);
-  else if(sizeof(short) == 1)
-    writeTypedef("int", "short", 1);
-  else
-    writeTypedef("int", "char", 1);
-  /* Actually, char is not necessarily one byte.
-   * But if char isn't, then nothing is, so this
-   * is as close as we can get. */
-  if(sizeof(size_t) == 1)
-    writeTypedef("size_t", "size_t", 1);
-  if(sizeof(hsize_t) == 1)
-    writeTypedef("hsize_t", "hsize_t", 1);
-#endif /*H5_FORTRAN_HAS_INTEGER_1_KIND*/
-
-#if defined H5_FORTRAN_HAS_INTEGER_2_KIND
-  if(sizeof(long long) == 2)
-    writeTypedef("int", "long long", 2);
-  else if(sizeof(long) == 2)
-    writeTypedef("int", "long", 2);
-  else if(sizeof(int) == 2)
-    writeTypedef("int", "int", 2);
-  else if(sizeof(short) == 2)
-    writeTypedef("int", "short", 2);
-  else
-    writeTypedefDefault("int",2);
-
-  if(sizeof(size_t) == 2)
-    writeTypedef("size_t", "size_t", 2);
-  if(sizeof(hsize_t) == 2)
-    writeTypedef("hsize_t", "hsize_t", 2);
-#endif /*H5_FORTRAN_HAS_INTEGER_2_KIND*/
-
-#if defined H5_FORTRAN_HAS_INTEGER_4_KIND
-  if(sizeof(long long) == 4)
-    writeTypedef("int", "long long", 4);
-  else if(sizeof(long) == 4)
-    writeTypedef("int", "long", 4);
-  else if(sizeof(int) == 4)
-    writeTypedef("int", "int", 4);
-  else if(sizeof(short) == 4)
-    writeTypedef("int", "short", 4);
-  else
-    writeTypedefDefault("int",4);
-
-  if(sizeof(size_t) == 4)
-    writeTypedef("size_t", "size_t", 4);
-  if(sizeof(hsize_t) == 4)
-    writeTypedef("hsize_t", "hsize_t", 4);
-    
-#endif /*H5_FORTRAN_HAS_INTEGER_4_KIND*/
-
-#if defined H5_FORTRAN_HAS_INTEGER_8_KIND
-  if(sizeof(long long) == 8)
-    writeTypedef("int", "long long", 8);
-  else if(sizeof(long) == 8)
-    writeTypedef("int", "long", 8);
-  else if(sizeof(int) == 8)
-    writeTypedef("int", "int", 8);
-  else if(sizeof(short) == 8)
-    writeTypedef("int", "short", 8);
-  else
-    writeTypedefDefault("int",8);
-
-  if(sizeof(size_t) == 8)
-    writeTypedef("size_t", "size_t",  8);
-  if(sizeof(hsize_t) == 8)
-    writeTypedef("hsize_t", "hsize_t", 8);
-
-#endif /*H5_FORTRAN_HAS_INTEGER_8_KIND*/
-
-  /* Define c_float_x */
-
-#if defined H5_FORTRAN_HAS_REAL_NATIVE_4_KIND || defined H5_FORTRAN_HAS_REAL_4_KIND
-  if(sizeof(long double) == 4)
-    writeTypedef("float", "long double", 4);
-  else if(sizeof(double) == 4)
-   writeTypedef("float", "double", 4);
-  else if(sizeof(float) == 4)
-   writeTypedef("float", "float", 4);
-  else
-   { printf("Fortran REAL is 4 bytes, no corresponding C floating type\n");
-     printf("Quitting....\n");
-     return -1;
-   }
-#endif /*H5_FORTRAN_HAS_REAL_NATIVE_4_KIND*/
-
-#if defined H5_FORTRAN_HAS_REAL_NATIVE_8_KIND || defined H5_FORTRAN_HAS_REAL_8_KIND
-  if(sizeof(long double) == 8)
-    writeTypedef("float", "long double", 8);
-  else if(sizeof(double) == 8)
-   writeTypedef("float", "double", 8);
-  else if(sizeof(float) == 8)
-   writeTypedef("float", "float", 8);
-  else
-   { printf("Fortran REAL is 16 bytes, no corresponding C floating type\n");
-     printf("Quitting....\n");
-     return -1;
-   }
-#endif /*H5_FORTRAN_HAS_REAL_NATIVE_8_KIND*/
-
-#if defined H5_FORTRAN_HAS_REAL_NATIVE_16_KIND || defined H5_FORTRAN_HAS_REAL_16_KIND
-  if(sizeof(long double) == 16)
-    writeTypedef("float", "long double", 16);
-  else if(sizeof(double) == 16)
-   writeTypedef("float", "double", 16);
-  else if(sizeof(float) == 16)
-   writeTypedef("float", "float", 16);
-  else /*C has no 16 byte float so disable it in Fortran*/
-   { printf("warning: Fortran REAL is 16 bytes, no corresponding C floating type\n");
-     printf("         Disabling Fortran 16 byte REALs\n");
-     H5_C_HAS_REAL_NATIVE_16 = 0;
-   }
-#endif /*H5_FORTRAN_HAS_REAL_NATIVE_16_KIND*/
-
-  /* Now begin defining fortran types. */
-  fprintf(c_header, "\n");
-  /* haddr_t */
-#if defined H5_FORTRAN_HAS_INTEGER_8_KIND && H5_SIZEOF_HADDR_T >= 8
-  writeToFiles("int","HADDR_T", "haddr_t_f", 8, H5_FORTRAN_HAS_INTEGER_8_KIND);
-#elif defined H5_FORTRAN_HAS_INTEGER_4_KIND && H5_SIZEOF_HADDR_T >= 4
-  writeToFiles("int","HADDR_T", "haddr_t_f", 4, H5_FORTRAN_HAS_INTEGER_4_KIND);
-#elif defined H5_FORTRAN_HAS_INTEGER_2_KIND && H5_SIZEOF_HADDR_T >= 2
-  writeToFiles("int","HADDR_T", "haddr_t_f", 2, H5_FORTRAN_HAS_INTEGER_2_KIND);
-#elif defined H5_FORTRAN_HAS_INTEGER_1_KIND && H5_SIZEOF_HADDR_T >= 1
-  writeToFiles("int","HADDR_T", "haddr_t_f", 1, H5_FORTRAN_HAS_INTEGER_1_KIND);
-#else
-    /* Error: couldn't find a size for haddr_t */
-    return -1;
+    fprintf(fort_header, "        INTEGER, PARAMETER :: %s = %s\n", fortran_type, kind);
+    fprintf(c_header, "typedef c_%s_%d %s;\n", c_typedef, size, c_type);
+}
+int
+main(void)
+{
+    int  i;
+    char chrA[64], chrB[64];
+
+    int  IntKinds[]         = H5_FORTRAN_INTEGER_KINDS;
+    int  IntKinds_SizeOf[]  = H5_FORTRAN_INTEGER_KINDS_SIZEOF;
+    int  RealKinds[]        = H5_FORTRAN_REAL_KINDS;
+    int  RealKinds_SizeOf[] = H5_FORTRAN_REAL_KINDS_SIZEOF;
+    char Real_C_TYPES[10][32];
+
+    int FORTRAN_NUM_INTEGER_KINDS = H5_FORTRAN_NUM_INTEGER_KINDS;
+    int H5_FORTRAN_NUM_REAL_KINDS;
+#if H5_FORTRAN_HAVE_C_LONG_DOUBLE != 0
+    int found_long_double = 0;
 #endif
 
-  /* hsize_t */
-#if defined H5_FORTRAN_HAS_INTEGER_8_KIND && H5_SIZEOF_HSIZE_T >= 8
-    writeToFiles("hsize_t","HSIZE_T", "hsize_t_f", 8, H5_FORTRAN_HAS_INTEGER_8_KIND);
-#elif defined H5_FORTRAN_HAS_INTEGER_4_KIND && H5_SIZEOF_HSIZE_T >= 4
-    writeToFiles("hsize_t","HSIZE_T", "hsize_t_f", 4, H5_FORTRAN_HAS_INTEGER_4_KIND);
-#elif defined H5_FORTRAN_HAS_INTEGER_2_KIND && H5_SIZEOF_HSIZE_T >= 2
-    writeToFiles("hsize_t","HSIZE_T", "hsize_t_f", 2, H5_FORTRAN_HAS_INTEGER_2_KIND);
-#elif defined H5_FORTRAN_HAS_INTEGER_1_KIND && H5_SIZEOF_HSIZE_T >= 1
-    writeToFiles("hsize_t","HSIZE_T", "hsize_t_f", 1, H5_FORTRAN_HAS_INTEGER_1_KIND);
-#else
-    /* Error: couldn't find a size for hsize_t */
-    return -1;
-#endif
+    /* Open target files */
+    c_header    = fopen(CFILE, "w");
+    fort_header = fopen(FFILE, "w");
+
+    /* Write copyright, boilerplate to both files */
+    initCfile();
+    initFfile();
+
+    /* (a) define c_int_x */
+
+    FORTRAN_NUM_INTEGER_KINDS = (int)(sizeof(IntKinds) / sizeof(IntKinds[0]));
+    H5_FORTRAN_NUM_REAL_KINDS = (int)(sizeof(RealKinds) / sizeof(RealKinds[0]));
+
+    fprintf(fort_header, "        INTEGER, PARAMETER :: H5_FORTRAN_NUM_INTEGER_KINDS = %d\n",
+            FORTRAN_NUM_INTEGER_KINDS);
+
+    for (i = 0; i < FORTRAN_NUM_INTEGER_KINDS; i++) {
+        if (sizeof(long long) == IntKinds_SizeOf[i])
+            writeTypedef("int", "long long", IntKinds[i]);
+        else if (sizeof(long) == IntKinds[i])
+            writeTypedef("int", "long", IntKinds[i]);
+        else if (sizeof(int) == IntKinds_SizeOf[i])
+            writeTypedef("int", "int", IntKinds[i]);
+        else if (sizeof(short) == IntKinds_SizeOf[i])
+            writeTypedef("int", "short", IntKinds[i]);
+        else if (IntKinds_SizeOf[i] == 1) {
+            writeTypedef("int", "char", IntKinds[i]);
+            /* Actually, char is not necessarily one byte.
+             * But if char isn't, then nothing is, so this
+             * is as close as we can get. */
+        }
+        else {
+            writeTypedefDefault("int", IntKinds[i]);
+        }
+        if (sizeof(size_t) == IntKinds_SizeOf[i])
+            writeTypedef("size_t", "size_t", IntKinds[i]);
+        if (sizeof(time_t) == IntKinds_SizeOf[i])
+            writeTypedef("time_t", "time_t", IntKinds[i]);
+        if (sizeof(hsize_t) == IntKinds_SizeOf[i])
+            writeTypedef("hsize_t", "hsize_t", IntKinds[i]);
+    }
 
-  /* hssize_t */
-#if defined H5_FORTRAN_HAS_INTEGER_8_KIND && H5_SIZEOF_HSSIZE_T >= 8
-    writeToFiles("int","HSSIZE_T", "hssize_t_f", 8, H5_FORTRAN_HAS_INTEGER_8_KIND);
-#elif defined H5_FORTRAN_HAS_INTEGER_4_KIND && H5_SIZEOF_HSSIZE_T >= 4
-    writeToFiles("int","HSSIZE_T", "hssize_t_f", 4, H5_FORTRAN_HAS_INTEGER_4_KIND);
-#elif defined H5_FORTRAN_HAS_INTEGER_2_KIND && H5_SIZEOF_HSSIZE_T >= 2
-    writeToFiles("int","HSSIZE_T", "hssize_t_f", 2, H5_FORTRAN_HAS_INTEGER_2_KIND);
-#elif defined H5_FORTRAN_HAS_INTEGER_1_KIND && H5_SIZEOF_HSSIZE_T >= 1
-    writeToFiles("int","HSSIZE_T", "hssize_t_f", 1, H5_FORTRAN_HAS_INTEGER_1_KIND);
+    /* (b) Define c_float_x */
+
+    for (i = 0; i < H5_FORTRAN_NUM_REAL_KINDS; i++) {
+        if (sizeof(float) == RealKinds_SizeOf[i]) {
+            writeTypedef("float", "float", RealKinds[i]);
+            strcpy(Real_C_TYPES[i], "C_FLOAT");
+        }
+        else if (sizeof(double) == RealKinds_SizeOf[i]) {
+            writeTypedef("float", "double", RealKinds[i]);
+            strcpy(Real_C_TYPES[i], "C_DOUBLE");
+        }
+#if H5_FORTRAN_HAVE_C_LONG_DOUBLE != 0
+        else if (sizeof(long double) == RealKinds_SizeOf[i] && found_long_double == 0) {
+            writeTypedef("float", "long double", RealKinds[i]);
+            strcpy(Real_C_TYPES[i], "C_LONG_DOUBLE");
+            found_long_double = 1;
+        }
+#ifdef H5_HAVE_FLOAT128
+        /* Don't select a higher precision than Fortran can support */
+        else if (sizeof(__float128) == RealKinds_SizeOf[i] && found_long_double == 1 &&
+                 H5_PAC_FC_MAX_REAL_PRECISION > 28) {
+            writeTypedef("float", "__float128", RealKinds[i]);
+            strcpy(Real_C_TYPES[i], "C_FLOAT128");
+        }
 #else
-    /* Error: couldn't find a size for hssize_t */
-    return -1;
+        else if (sizeof(long double) == RealKinds_SizeOf[i] && found_long_double == 1 &&
+                 H5_PAC_FC_MAX_REAL_PRECISION > 28) {
+            writeTypedef("float", "long double", RealKinds[i]);
+            strcpy(Real_C_TYPES[i], "C_FLOAT128");
+        }
 #endif
-
-  /* off_t */
-#if defined H5_FORTRAN_HAS_INTEGER_8_KIND && H5_SIZEOF_OFF_T >= 8
-    writeToFiles("int","OFF_T", "off_t_f", 8, H5_FORTRAN_HAS_INTEGER_8_KIND);
-#elif defined H5_FORTRAN_HAS_INTEGER_4_KIND && H5_SIZEOF_OFF_T >= 4
-    writeToFiles("int","OFF_T", "off_t_f", 4, H5_FORTRAN_HAS_INTEGER_4_KIND);
-#elif defined H5_FORTRAN_HAS_INTEGER_2_KIND && H5_SIZEOF_OFF_T >= 2
-    writeToFiles("int","OFF_T", "off_t_f", 2, H5_FORTRAN_HAS_INTEGER_2_KIND);
-#elif defined H5_FORTRAN_HAS_INTEGER_1_KIND && H5_SIZEOF_OFF_T >= 1
-    writeToFiles("int","OFF_T", "off_t_f", 1, H5_FORTRAN_HAS_INTEGER_1_KIND);
+#else /* There is no C_LONG_DOUBLE intrinsic */
+#ifdef H5_HAVE_FLOAT128
+        /* Don't select a higher precision than Fortran can support */
+        else if (sizeof(__float128) == RealKinds_SizeOf[i]) {
+            writeTypedef("float", "__float128", RealKinds[i]);
+            strcpy(Real_C_TYPES[i], "C_FLOAT128");
+        }
 #else
-    /* Error: couldn't find a size for off_t */
-    return -1;
+        else if (sizeof(long double) == RealKinds_SizeOf[i]) {
+            writeTypedef("float", "long double", RealKinds[i]);
+            strcpy(Real_C_TYPES[i], "C_FLOAT128");
+        }
 #endif
-
-  /* size_t */
-#if defined H5_FORTRAN_HAS_INTEGER_8_KIND && H5_SIZEOF_SIZE_T >= 8
-    writeToFiles("size_t","SIZE_T", "size_t_f", 8, H5_FORTRAN_HAS_INTEGER_8_KIND);
-#elif defined H5_FORTRAN_HAS_INTEGER_4_KIND && H5_SIZEOF_SIZE_T >= 4
-    writeToFiles("size_t","SIZE_T", "size_t_f", 4, H5_FORTRAN_HAS_INTEGER_4_KIND);
-#elif defined H5_FORTRAN_HAS_INTEGER_2_KIND && H5_SIZEOF_SIZE_T >= 2
-    writeToFiles("size_t","SIZE_T", "size_t_f", 2, H5_FORTRAN_HAS_INTEGER_2_KIND);
-#elif defined H5_FORTRAN_HAS_INTEGER_1_KIND && H5_SIZEOF_SIZE_T >= 1
-    writeToFiles("size_t","SIZE_T", "size_t_f", 1, H5_FORTRAN_HAS_INTEGER_1_KIND);
-#else
-    /* Error: couldn't find a size for size_t */
-    return -1;
 #endif
+        else {
+            printf("\n                      **** HDF5 WARNING ****\n");
+            printf(
+                "Fortran REAL(KIND=%d) is %d Bytes, but no corresponding C float type exists of that size\n",
+                RealKinds[i], RealKinds_SizeOf[i]);
+            printf("     !!! Fortran interfaces will not be generated for REAL(KIND=%d) !!!\n\n",
+                   RealKinds[i]);
+
+            RealKinds_SizeOf[i] = -1;
+            RealKinds[i]        = -1;
+        }
+    }
 
-  /* int */
-#if defined H5_FORTRAN_HAS_NATIVE_8_KIND
-    writeToFiles("int","Fortran_INTEGER", "int_f", 8, H5_FORTRAN_HAS_NATIVE_8_KIND);
-#elif defined H5_FORTRAN_HAS_NATIVE_4_KIND
-    writeToFiles("int","Fortran_INTEGER", "int_f", 4, H5_FORTRAN_HAS_NATIVE_4_KIND);
-#elif defined H5_FORTRAN_HAS_NATIVE_2_KIND
-    writeToFiles("int","Fortran_INTEGER", "int_f", 2, H5_FORTRAN_HAS_NATIVE_2_KIND);
-#elif defined H5_FORTRAN_HAS_NATIVE_1_KIND
-    writeToFiles("int","Fortran_INTEGER", "int_f", 1, H5_FORTRAN_HAS_NATIVE_1_KIND);
-#else
-    /* Error: couldn't find a size for int */
-    return -1;
-#endif
+    /* Now begin defining fortran types. */
+    fprintf(c_header, "\n");
+
+    /* haddr_t */
+    for (i = 0; i < FORTRAN_NUM_INTEGER_KINDS; i++) {
+        if (IntKinds_SizeOf[i] == H5_SIZEOF_HADDR_T) {
+            writeToFiles("int", "HADDR_T", "haddr_t_f", IntKinds[i]);
+            break;
+        }
+        if (i == (FORTRAN_NUM_INTEGER_KINDS - 1))
+            /* Error: couldn't find a size for haddr_t */
+            return -1;
+    }
 
-  /* int_1, int_2, int_4, int_8 */
+    /* hsize_t */
+    for (i = 0; i < FORTRAN_NUM_INTEGER_KINDS; i++) {
+        if (IntKinds_SizeOf[i] == H5_SIZEOF_HSIZE_T) {
+            writeToFiles("hsize_t", "HSIZE_T", "hsize_t_f", IntKinds[i]);
+            break;
+        }
+        if (i == (FORTRAN_NUM_INTEGER_KINDS - 1))
+            /* Error: couldn't find a size for hsize_t */
+            return -1;
+    }
 
-/* Defined different KINDs of integers:                       */
-/* if the integer kind is not available then we assign        */
-/* it a value of the next larger one, but if the next         */
-/* higher one is not available we assigned it the next lowest */
+    /* hssize_t */
+    for (i = 0; i < FORTRAN_NUM_INTEGER_KINDS; i++) {
+        if (IntKinds_SizeOf[i] == H5_SIZEOF_HSSIZE_T) {
+            writeToFiles("int", "HSSIZE_T", "hssize_t_f", IntKinds[i]);
+            break;
+        }
+        if (i == (FORTRAN_NUM_INTEGER_KINDS - 1))
+            /* Error: couldn't find a size for hssize_t */
+            return -1;
+    }
 
-    FoundIntSize[0] = -1;
-    FoundIntSize[1] = -2;
-    FoundIntSize[2] = -4;
-    FoundIntSize[3] = -8;
+    /* off_t */
+    for (i = 0; i < FORTRAN_NUM_INTEGER_KINDS; i++) {
+        if (IntKinds_SizeOf[i] == H5_SIZEOF_OFF_T) {
+            writeToFiles("int", "OFF_T", "off_t_f", IntKinds[i]);
+            break;
+        }
+        if (i == (FORTRAN_NUM_INTEGER_KINDS - 1))
+            /* Error: couldn't find a size for off_t */
+            return -1;
+    }
 
-#if defined H5_FORTRAN_HAS_INTEGER_1_KIND
-    FoundIntSize[0] = 1;
-    FoundIntSizeKind[0] = H5_FORTRAN_HAS_INTEGER_1_KIND;
-#endif
-#if defined H5_FORTRAN_HAS_INTEGER_2_KIND
-    FoundIntSize[1] = 2;
-    FoundIntSizeKind[1] = H5_FORTRAN_HAS_INTEGER_2_KIND;
-#endif
-#if defined H5_FORTRAN_HAS_INTEGER_4_KIND
-    FoundIntSize[2] = 4;
-    FoundIntSizeKind[2] = H5_FORTRAN_HAS_INTEGER_4_KIND;
-#endif
-#if defined H5_FORTRAN_HAS_INTEGER_8_KIND
-    FoundIntSize[3] = 8;
-    FoundIntSizeKind[3] = H5_FORTRAN_HAS_INTEGER_8_KIND ;
-#endif
+    /* size_t */
+    for (i = 0; i < FORTRAN_NUM_INTEGER_KINDS; i++) {
+        if (IntKinds_SizeOf[i] == H5_SIZEOF_SIZE_T) {
+            writeToFiles("size_t", "SIZE_T", "size_t_f", IntKinds[i]);
+            break;
+        }
+        if (i == (FORTRAN_NUM_INTEGER_KINDS - 1))
+            /* Error: couldn't find a size for size_t */
+            return -1;
+    }
 
-    for(i=0;i<4;i++) {
-      if( FoundIntSize[i] > 0) /* Found the integer type */
-	{
-	  sprintf(chrA, "Fortran_INTEGER_%d", FoundIntSize[i]);
-	  sprintf(chrB, "int_%d_f", FoundIntSize[i]);
-	  writeToFiles("int",chrA, chrB, FoundIntSize[i], FoundIntSizeKind[i]);
-	}
-      else  /* Did not find the integer type */
-	{
-	  flag = 0; /* flag indicating if found the next highest */
-	  for(j=i+1;j<4;j++)  /* search for next highest */
-	    {
-	      if( FoundIntSize[j] > 0) /* Found the next highest */
-		{
-		  sprintf(chrA, "Fortran_INTEGER_%d", (-1)*FoundIntSize[i]);
-		  sprintf(chrB, "int_%d_f", (-1)*FoundIntSize[i]);
-		  writeToFiles("int",chrA, chrB, FoundIntSize[j], FoundIntSizeKind[j]);
-		  flag = 1;
-		  break;
-		}
-	    }
-	  if(flag == 0) /* No higher one found, so find next lowest */
-	    {
-	      for(j=2;j>-1;j--)  /* Search for next lowest */
-		{
-		  if( FoundIntSize[j] > 0) /* Found the next lowest */
-		    {
-		      sprintf(chrA, "Fortran_INTEGER_%d", (-1)*FoundIntSize[i]);
-		      sprintf(chrB, "int_%d_f", (-1)*FoundIntSize[i]);
-		      writeToFiles("int",chrA, chrB, FoundIntSize[j], FoundIntSizeKind[j]);
-		      flag = 1;
-		      break;
-		    }
-		}
-	    }
-	  if(flag == 0) /* No higher or lower one found, indicating an error */
-	     return -1;
-	}
+    /* time_t */
+    for (i = 0; i < FORTRAN_NUM_INTEGER_KINDS; i++) {
+        if (IntKinds_SizeOf[i] == H5_SIZEOF_TIME_T) {
+            writeToFiles("time_t", "TIME_T", "time_t_f", IntKinds[i]);
+            break;
+        }
+        if (i == (FORTRAN_NUM_INTEGER_KINDS - 1))
+            /* Error: couldn't find a size for time_t */
+            return -1;
     }
 
-  /* real_4, real_8, real_16 */
+    /* int */
+    writeToFiles("int", "Fortran_INTEGER", "int_f", H5_FORTRAN_NATIVE_INTEGER_KIND);
 
-/* Defined different KINDs of reals:                          */
-/* if the REAL kind is not available then we assign           */
-/* it a value of the next larger one, but if the next         */
-/* higher one is not available we assigned it the next lowest */
+    /* int_1, int_2, int_4, int_8 */
 
-    FoundRealSize[0] = -4;
-    FoundRealSize[1] = -8;
-    FoundRealSize[2] = -16;
+    /* Defined different KINDs of integers */
 
-#if defined H5_FORTRAN_HAS_REAL_4_KIND
-    FoundRealSize[0] = 4;
-    FoundRealSizeKind[0] = H5_FORTRAN_HAS_REAL_4_KIND;
-#endif
-#if defined H5_FORTRAN_HAS_REAL_8_KIND
-    FoundRealSize[1] = 8;
-    FoundRealSizeKind[1] = H5_FORTRAN_HAS_REAL_8_KIND;
-#endif
+    fprintf(fort_header, "        INTEGER, DIMENSION(1:%d), PARAMETER :: Fortran_INTEGER_AVAIL_KINDS = (/",
+            FORTRAN_NUM_INTEGER_KINDS);
 
-#if defined H5_FORTRAN_HAS_REAL_16_KIND
-    if(H5_C_HAS_REAL_NATIVE_16 != 0) {
-      FoundRealSize[2] = 16;
-      FoundRealSizeKind[2] = H5_FORTRAN_HAS_REAL_16_KIND;
+    for (i = 0; i < FORTRAN_NUM_INTEGER_KINDS; i++) {
+        fprintf(fort_header, "%d", (int)IntKinds[i]);
+        if (i == FORTRAN_NUM_INTEGER_KINDS - 1) {
+            fprintf(fort_header, "/)\n");
+        }
+        else {
+            fprintf(fort_header, ",");
+        }
     }
-#endif
 
-    for(i=0;i<3;i++) {
-      if( FoundRealSize[i] > 0) /* Found the real type */
-	{
-	  sprintf(chrA, "Fortran_REAL_%d", FoundRealSize[i]);
-	  sprintf(chrB, "real_%d_f", FoundRealSize[i]);
-	  writeToFiles("float",chrA, chrB, FoundRealSize[i], FoundRealSizeKind[i]);
-	}
-      else  /* Did not find the real type */
-	{
-	  flag = 0; /* flag indicating if found the next highest */
-	  for(j=i+1;j<3;j++)  /* search for next highest */
-	    {
-	      if( FoundRealSize[j] > 0) /* Found the next highest */
-		{
-		  sprintf(chrA, "Fortran_REAL_%d", (-1)*FoundRealSize[i]);
-		  sprintf(chrB, "real_%d_f", (-1)*FoundRealSize[i]);
-		  if(FoundRealSize[j]>4) {
-		    writeToFiles("float",chrA, chrB,  FoundRealSize[j], FoundRealSizeKind[j]);
-		    flag = 1;
-		  }
-		/*   else { */
-/* 		    writeToFiles("float", chrA, chrB, FoundRealSize[j]); */
-/* 		  } */
-		  flag = 1;
-		  break;
-		}
-	    }
-	  if(flag == 0) /* No higher one found, so find next lowest */
-	    {
-	      for(j=1;j>-1;j--)  /* Search for next lowest */
-		{
-		  if( FoundRealSize[j] > 0) /* Found the next lowest */
-		    {
-		      sprintf(chrA, "Fortran_REAL_%d", (-1)*FoundRealSize[i]);
-		      sprintf(chrB, "real_%d_f", (-1)*FoundRealSize[i]);
-		      if(FoundRealSize[j]>4)
-			writeToFiles("float",chrA, chrB,  FoundRealSize[j], FoundRealSizeKind[j]);
-		     /*  else { */
-/* 			writeToFiles("float", chrA, chrB, FoundRealSize[j]); */
-/* 		      } */
-		      flag = 1;
-		      break;
-		    }
-		}
-	    }
-	  if(flag == 0) /* No higher or lower one found, indicating an error */
-	     return -1;
-	}
+    /* real_4, real_8, real_16 */
+
+    /* Defined different KINDs of reals:                          */
+    /* if the REAL kind is not available then we assign           */
+    /* it a value of the next larger one, but if the next         */
+    /* higher one is not available we assigned it the next lowest */
+
+    for (i = 0; i < H5_FORTRAN_NUM_REAL_KINDS; i++) {
+        if (RealKinds[i] > 0) {
+            snprintf(chrA, sizeof(chrA), "Fortran_REAL_%s", Real_C_TYPES[i]);
+            snprintf(chrB, sizeof(chrB), "real_%s_f", Real_C_TYPES[i]);
+            writeToFiles("float", chrA, chrB, RealKinds[i]);
+        }
     }
 
-  /* hid_t */
-#if defined H5_FORTRAN_HAS_INTEGER_8_KIND && H5_SIZEOF_HID_T >= 8
-    writeToFiles("int","HID_T", "hid_t_f", 8, H5_FORTRAN_HAS_INTEGER_8_KIND);
-#elif defined H5_FORTRAN_HAS_INTEGER_4_KIND && H5_SIZEOF_HID_T >= 4
-    writeToFiles("int","HID_T", "hid_t_f", 4, H5_FORTRAN_HAS_INTEGER_4_KIND);
-#elif defined H5_FORTRAN_HAS_INTEGER_2_KIND && H5_SIZEOF_HID_T >= 2
-    writeToFiles("int","HID_T", "hid_t_f", 2, H5_FORTRAN_HAS_INTEGER_2_KIND);
-#elif defined H5_FORTRAN_HAS_INTEGER_1_KIND && H5_SIZEOF_HID_T >= 1
-    writeToFiles("int","HID_T", "hid_t_f", 1, H5_FORTRAN_HAS_INTEGER_1_KIND);
-#elif defined H5_FORTRAN_HAS_INTEGER_8_KIND && H5_SIZEOF_HID_T >= 4
-    writeToFiles("int","HID_T", "hid_t_f", 8, H5_FORTRAN_HAS_INTEGER_8_KIND);
-#else
-    /* Error: couldn't find a size for hid_t */
-    return -1;
+    /* hid_t */
+    for (i = 0; i < FORTRAN_NUM_INTEGER_KINDS; i++) {
+        if (IntKinds_SizeOf[i] == H5_SIZEOF_HID_T) {
+            writeToFiles("int", "HID_T", "hid_t_f", IntKinds[i]);
+            break;
+        }
+        if (i == (FORTRAN_NUM_INTEGER_KINDS - 1))
+            /* Error: couldn't find a size for hid_t */
+            return -1;
+    }
+    /* real_f */
+#if H5_FORTRAN_HAVE_C_LONG_DOUBLE != 0
+    if (H5_FORTRAN_NATIVE_REAL_SIZEOF == sizeof(long double)) {
+        writeToFilesChr("float", "Fortran_REAL", "real_f", H5_FORTRAN_NATIVE_REAL_KIND, "C_LONG_DOUBLE");
+    }
+    else
 #endif
+        if (H5_FORTRAN_NATIVE_REAL_SIZEOF == sizeof(double)) {
+        writeToFilesChr("float", "Fortran_REAL", "real_f", H5_FORTRAN_NATIVE_REAL_KIND, "C_DOUBLE");
+    }
+    else if (H5_FORTRAN_NATIVE_REAL_SIZEOF == sizeof(float))
+        writeToFilesChr("float", "Fortran_REAL", "real_f", H5_FORTRAN_NATIVE_REAL_KIND, "C_FLOAT");
+    else {
+        /* No exact match, choose the next highest */
+        if (H5_FORTRAN_NATIVE_REAL_SIZEOF > sizeof(long double))
+            writeToFilesChr("float", "Fortran_REAL", "real_f", H5_FORTRAN_NATIVE_REAL_KIND, "C_LONG_DOUBLE");
+        else if (H5_FORTRAN_NATIVE_REAL_SIZEOF > sizeof(double))
+            writeToFilesChr("float", "Fortran_REAL", "real_f", H5_FORTRAN_NATIVE_REAL_KIND, "C_DOUBLE");
+        else if (H5_FORTRAN_NATIVE_REAL_SIZEOF > sizeof(float))
+            writeToFilesChr("float", "Fortran_REAL", "real_f", H5_FORTRAN_NATIVE_REAL_KIND, "C_FLOAT");
+        else {
+            /* Error: couldn't find a size for real_f */
+            printf("Error: couldn't find a size for real_f \n");
+            return -1;
+        }
+    }
 
-  /* real_f */
-#if defined H5_FORTRAN_HAS_REAL_NATIVE_16_KIND
-    if(H5_C_HAS_REAL_NATIVE_16 != 0) {
-      writeToFiles("float","Fortran_REAL", "real_f", 16, H5_FORTRAN_HAS_REAL_NATIVE_16_KIND);
+    /* double_f */
+#if H5_FORTRAN_HAVE_C_LONG_DOUBLE != 0
+    if (H5_FORTRAN_NATIVE_DOUBLE_SIZEOF == sizeof(long double)) {
+        writeToFilesChr("float", "Fortran_DOUBLE", "double_f", H5_FORTRAN_NATIVE_DOUBLE_KIND,
+                        "C_LONG_DOUBLE");
     }
-#elif defined H5_FORTRAN_HAS_REAL_NATIVE_8_KIND
-    writeToFiles("float", "Fortran_REAL", "real_f", 8, H5_FORTRAN_HAS_REAL_NATIVE_8_KIND);
-#elif defined H5_FORTRAN_HAS_REAL_NATIVE_4_KIND
-    writeToFiles("float", "Fortran_REAL", "real_f", 4, H5_FORTRAN_HAS_REAL_NATIVE_4_KIND);
-#else
-    /* Error: couldn't find a size for real_f */
-    return -1;
+    else
 #endif
-
-  /* double_f */
-#if defined H5_FORTRAN_HAS_DOUBLE_NATIVE_16_KIND
-    if(H5_C_HAS_REAL_NATIVE_16 != 0) { /* Check if C has 16 byte floats */
-      writeToFiles("float", "Fortran_DOUBLE", "double_f", 16, H5_FORTRAN_HAS_DOUBLE_NATIVE_16_KIND);
-    } else {
-#if defined H5_FORTRAN_HAS_REAL_NATIVE_8_KIND /* Fall back to 8 byte floats */
-    writeToFiles("float", "Fortran_DOUBLE", "double_f", 8, H5_FORTRAN_HAS_REAL_NATIVE_8_KIND);
+        if (H5_FORTRAN_NATIVE_DOUBLE_SIZEOF == sizeof(double)) {
+        writeToFilesChr("float", "Fortran_DOUBLE", "double_f", H5_FORTRAN_NATIVE_DOUBLE_KIND, "C_DOUBLE");
     }
-#elif defined H5_FORTRAN_HAS_REAL_NATIVE_4_KIND  /* Fall back to 4 byte floats */
-    writeToFiles("float", "Fortran_DOUBLE", "double_f", 4, H5_FORTRAN_HAS_REAL_NATIVE_4_KIND);
+    else if (H5_FORTRAN_NATIVE_DOUBLE_SIZEOF == sizeof(float))
+        writeToFilesChr("float", "Fortran_DOUBLE", "double_f", H5_FORTRAN_NATIVE_DOUBLE_KIND, "C_FLOAT");
+#ifdef H5_HAVE_FLOAT128
+    /* Don't select a higher precision than Fortran can support */
+    else if (sizeof(__float128) == H5_FORTRAN_NATIVE_DOUBLE_SIZEOF && H5_PAC_FC_MAX_REAL_PRECISION > 28) {
+        writeToFilesChr("float", "Fortran_DOUBLE", "double_f", H5_FORTRAN_NATIVE_DOUBLE_KIND,
+                        "Fortran_REAL_C_FLOAT128");
     }
 #else
-    /* Error: couldn't find a size for double_f when fortran has 16 byte reals */
-    return -1;
+    else if (sizeof(long double) == H5_FORTRAN_NATIVE_DOUBLE_SIZEOF && H5_PAC_FC_MAX_REAL_PRECISION > 28) {
+        writeToFilesChr("float", "Fortran_DOUBLE", "double_f", H5_FORTRAN_NATIVE_DOUBLE_KIND,
+                        "Fortran_REAL_C_FLOAT128");
     }
 #endif
+    else {
+        /* Error: couldn't find a size for double_f */
+        printf("Error: couldn't find a size for double_f \n");
+        return -1;
+    }
 
-#elif defined H5_FORTRAN_HAS_DOUBLE_NATIVE_8_KIND
-    writeToFiles("float", "Fortran_DOUBLE", "double_f", 8, H5_FORTRAN_HAS_DOUBLE_NATIVE_8_KIND);
-#else
-    /* Error: couldn't find a size for real_f */
-    return -1;
-#endif
+    /* Need the buffer size for the fortran derived type 'hdset_reg_ref_t_f03'
+     * in order to be interoperable with C's structure, the C buffer size
+     * H5R_DSET_REG_REF_BUF_SIZE is (sizeof(haddr_t)+4)
+     */
 
-  /* Need the buffer size for the fortran derive type 'hdset_reg_ref_t_f03'
-   * in order to be interoperable with C's structure, the C buffer size
-   * H5R_DSET_REG_REF_BUF_SIZE is (sizeof(haddr_t)+4)
-   */
-    
-    fprintf(fort_header, "        INTEGER, PARAMETER :: H5R_DSET_REG_REF_BUF_SIZE_F = %u\n", H5_SIZEOF_HADDR_T + 4 );
+    fprintf(fort_header, "        INTEGER, PARAMETER :: H5R_DSET_REG_REF_BUF_SIZE_F = %u\n",
+            H5_SIZEOF_HADDR_T + 4);
 
+    /* Need the buffer size for the fortran derived type 'h5o_token_t'
+     * in order to be interoperable with C's structure.
+     */
 
-  /* Close files */
-  endCfile();
-  endFfile();
-  fclose(c_header);
-  fclose(fort_header);
-  return 0;
-}
+    fprintf(fort_header, "        INTEGER, PARAMETER :: H5O_MAX_TOKEN_SIZE_F = %u\n", H5O_MAX_TOKEN_SIZE);
 
+    /* Close files */
+    endCfile();
+    endFfile();
+    fclose(c_header);
+    fclose(fort_header);
+
+    return 0;
+}
diff --git a/fortran/src/H5test_kind.f90 b/fortran/src/H5test_kind.f90
deleted file mode 100644
index 1a1a0ec..0000000
--- a/fortran/src/H5test_kind.f90
+++ /dev/null
@@ -1,269 +0,0 @@
-!****p* Program/H5test_kind
-!
-! NAME
-!  Executable: H5test_kind
-!
-! FILE
-!  fortran/src/H5test_kind.f90
-!
-! PURPOSE
-!  This stand alone program is used at build time to generate the program
-!  H5fortran_detect.f90. It cycles through all the available KIND parameters for
-!  integers and reals. The appropriate program and subroutines are then generated
-!  depending on which of the KIND values are found.
-!
-! NOTES
-!  This program is depreciated in favor of H5test_kind_SIZEOF.f90 and is only
-!  used when the Fortran intrinsic function SIZEOF is not available. It generates
-!  code that does not make use of SIZEOF in H5fortran_detect.f90 which is less
-!  portable in comparison to using SIZEOF.
-!
-!  The availability of SIZEOF is checked at configure time and the TRUE/FALSE
-!  condition is set in the configure variable "FORTRAN_HAVE_SIZEOF".
-!
-! COPYRIGHT
-!  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!  Copyright by The HDF Group.                                                 *
-!  Copyright by the Board of Trustees of the University of Illinois.           *
-!  All rights reserved.                                                        *
-!                                                                              *
-!  This file is part of HDF5.  The full HDF5 copyright notice, including       *
-!  terms governing use, modification, and redistribution, is contained in      *
-!  the files COPYING and Copyright.html.  COPYING can be found at the root     *
-!  of the source code distribution tree; Copyright.html can be found at the    *
-!  root level of an installed copy of the electronic HDF5 document set and     *
-!  is linked from the top-level documents page.  It can also be found at       *
-!  http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have            *
-!  access to either file, you may request a copy from help@hdfgroup.org.       *
-!  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! AUTHOR
-!  Elena Pourma
-!
-!*****
-
-PROGRAM test_kind
-  IMPLICIT NONE
-  INTEGER :: i, j, ii, ir, last, ikind_numbers(10), rkind_numbers(10)
-  INTEGER :: ji, jr, jd
-  last = -1
-  ii = 0
-  j = SELECTED_INT_KIND(18)
-  DO i = 1,100
-     j = SELECTED_INT_KIND(i)
-     IF(j .NE. last) THEN
-        IF(last .NE. -1) THEN
-           ii = ii + 1
-           ikind_numbers(ii) = last
-        ENDIF
-        last = j
-        IF(j .EQ. -1) EXIT
-     ENDIF
-  ENDDO
-
-  last = -1
-  ir = 0
-  DO i = 1,100
-     j = SELECTED_REAL_KIND(i)
-     IF(j .NE. last) THEN
-        IF(last .NE. -1) THEN
-           ir = ir + 1
-           rkind_numbers(ir) = last
-        ENDIF
-        last = j
-        IF(j .EQ. -1) EXIT
-     ENDIF
-  ENDDO
-
-!  Generate program information:
-
-WRITE(*,'(40(A,/))') &
-'!****h* ROBODoc/H5fortran_detect.f90',&
-'!',&
-'! NAME',&
-'!  H5fortran_detect',&
-'! ',&
-'! PURPOSE',&
-'!  This stand alone program is used at build time to generate the header file',&
-'!  H5fort_type_defines.h. The source code itself was automatically generated by',&
-'!  the program H5test_kind.f90',&
-'!',&
-'! NOTES',&
-'!  This source code does not make use of the Fortran intrinsic function SIZEOF because',&
-'!  the availability of the intrinsic function was determined to be not available at',&
-'!  configure time',&
-'!',&
-'! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *',&
-'!   Copyright by The HDF Group.                                               *',&
-'!   Copyright by the Board of Trustees of the University of Illinois.         *',&
-'!   All rights reserved.                                                      *',&
-'!                                                                             *',&
-'!   This file is part of HDF5.  The full HDF5 copyright notice, including     *',&
-'!   terms governing use, modification, and redistribution, is contained in    *',&
-'!   the files COPYING and Copyright.html.  COPYING can be found at the root   *',&
-'!   of the source code distribution tree; Copyright.html can be found at the  *',&
-'!   root level of an installed copy of the electronic HDF5 document set and   *',&
-'!   is linked from the top-level documents page.  It can also be found at     *',&
-'!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *',&
-'!   access to either file, you may request a copy from help@hdfgroup.org.     *',&
-'! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *',&
-'!',&
-'! AUTHOR',&
-'!  H5test_kind.f90',&
-'!',&
-'!*****'
-
-!  Generate a program
-
-  WRITE(*,*) "PROGRAM int_kind"
-  WRITE(*,*) "WRITE(*,*) "" /*generating header file*/ """
-  ji = 0
-  WRITE(*, "("" CALL i"", i2.2,""()"")") ji
-  jr = 0
-  WRITE(*, "("" CALL r"", i2.2,""()"")") jr
-  jd = 0
-  WRITE(*, "("" CALL d"", i2.2,""()"")") jd
-  DO i = 1, ii
-     j = ikind_numbers(i)
-     WRITE(*, "("" CALL i"", i2.2,""()"")") j
-  ENDDO
-  DO i = 1, ir
-     j = rkind_numbers(i)
-     WRITE(*, "("" CALL r"", i2.2,""()"")") j
-  ENDDO
-  WRITE(*,*) "END PROGRAM int_kind"
-  j = 0
-  ji = KIND(1)
-  WRITE(*, "("" SUBROUTINE i"", i2.2,""()"")") j
-  WRITE(*,*)"   IMPLICIT NONE"
-  WRITE(*,*)"   INTEGER :: a = 0"
-  WRITE(*,*)"   INTEGER :: a_size"
-  WRITE(*,*)"   CHARACTER(LEN=2) :: jchr2"
-  WRITE(*,*)"   a_size = BIT_SIZE(a)"
-  WRITE(*,*)"   IF (a_size .EQ. 8) THEN"
-  WRITE(*,*)"       WRITE(jchr2,'(I2)')",ji
-  WRITE(*,'(A)')'       WRITE(*,*) "#define H5_FORTRAN_HAS_NATIVE_1_KIND "'//"//ADJUSTL(jchr2)"
-  WRITE(*,*)"   endif"
-  WRITE(*,*)"   IF (a_size .EQ. 16) THEN"
-  WRITE(*,*)"       WRITE(jchr2,'(I2)')",ji
-  WRITE(*,'(A)')'       WRITE(*,*) "#define H5_FORTRAN_HAS_NATIVE_2_KIND "'//"//ADJUSTL(jchr2)"
-  WRITE(*,*)"   endif"
-  WRITE(*,*)"   IF (a_size .EQ. 32) THEN"
-  WRITE(*,*)"       WRITE(jchr2,'(I2)')",ji
-  WRITE(*,'(A)')'       WRITE(*,*) "#define H5_FORTRAN_HAS_NATIVE_4_KIND "'//"//ADJUSTL(jchr2)"
-  WRITE(*,*)"   ENDIF"
-  WRITE(*,*)"   IF (a_size .EQ. 64) THEN"
-  WRITE(*,*)"       WRITE(jchr2,'(I2)')",ji
-  WRITE(*,'(A)')'       WRITE(*,*) "#define H5_FORTRAN_HAS_NATIVE_8_KIND "'//"//ADJUSTL(jchr2)"
-  WRITE(*,*)"   ENDIF"
-  WRITE(*,*)"   IF (a_size .EQ. 128) THEN"
-  WRITE(*,*)"       WRITE(jchr2,'(I2)')",ji
-  WRITE(*,'(A)')'       WRITE(*,*) "#define H5_FORTRAN_HAS_NATIVE_16_KIND "'//"//ADJUSTL(jchr2)"
-  WRITE(*,*)"   ENDIF"
-  WRITE(*,*)"   RETURN"
-  WRITE(*,*)"END SUBROUTINE"
-  jr = KIND(1.0)
-  WRITE(*, "("" SUBROUTINE r"", i2.2,""()"")") j
-  WRITE(*,*)"   IMPLICIT NONE"
-  WRITE(*,*)"   REAL :: b(32)"
-  WRITE(*,*)"   INTEGER :: a(1)"
-  WRITE(*,*)"   INTEGER :: a_size"
-  WRITE(*,*)"   INTEGER :: real_size"
-  WRITE(*,*)"   CHARACTER(LEN=2) :: jchr2"
-  WRITE(*,*)"   a_size = BIT_SIZE(a(1)) ! Size in bits for integer"
-  WRITE(*,*)"   real_size = (SIZE(TRANSFER(b,a))*a_size)/SIZE(b)"
-  WRITE(*,*)"   IF (real_size .EQ. 32) THEN"
-  WRITE(*,*)"       WRITE(jchr2,'(I2)')",jr
-  WRITE(*,'(A)')'       WRITE(*,*) "#define H5_FORTRAN_HAS_REAL_NATIVE_4_KIND "'//"//ADJUSTL(jchr2)"
-  WRITE(*,*)"   ENDIF"
-  WRITE(*,*)"   IF (real_size .EQ. 64) THEN"
-  WRITE(*,*)"       WRITE(jchr2,'(I2)')",jr
-  WRITE(*,'(A)')'       WRITE(*,*) "#define H5_FORTRAN_HAS_REAL_NATIVE_8_KIND "'//"//ADJUSTL(jchr2)"
-  WRITE(*,*)"   ENDIF"
-  WRITE(*,*)"   IF (real_size .EQ. 128) THEN"
-  WRITE(*,*)"       WRITE(jchr2,'(I2)')",jr
-  WRITE(*,'(A)')'       WRITE(*,*) "#define H5_FORTRAN_HAS_REAL_NATIVE_16_KIND "'//"//ADJUSTL(jchr2)"
-  WRITE(*,*)"   ENDIF"
-  WRITE(*,*)"   RETURN"
-  WRITE(*,*)"END SUBROUTINE"
-  jd = KIND(1.d0)
-  WRITE(*, "("" SUBROUTINE d"", i2.2,""()"")") j
-  WRITE(*,*)"   IMPLICIT NONE"
-  WRITE(*,*)"   DOUBLE PRECISION :: b=0"
-  WRITE(*,*)"   INTEGER :: a(8)=0"
-  WRITE(*,*)"   INTEGER :: a_size"
-  WRITE(*,*)"   INTEGER :: b_size"
-  WRITE(*,*)"   CHARACTER(LEN=2) :: jchr2"
-  WRITE(*,*)"   a_size = BIT_SIZE(a(1))"
-  WRITE(*,*)"   b_size = SIZE(transfer(b,a))*a_size"
-  WRITE(*,*)"   IF (b_size .EQ. 64) THEN"
-  WRITE(*,*)"       WRITE(jchr2,'(I2)')",jd
-  WRITE(*,'(A)')'       WRITE(*,*) "#define H5_FORTRAN_HAS_DOUBLE_NATIVE_8_KIND "'//"//ADJUSTL(jchr2)"
-  WRITE(*,*)"   ENDIF"
-  WRITE(*,*)"   IF (b_size .EQ. 128) THEN"
-  WRITE(*,*)"       WRITE(jchr2,'(I2)')",jd
-  WRITE(*,'(A)')'       WRITE(*,*) "#define H5_FORTRAN_HAS_DOUBLE_NATIVE_16_KIND "'//"//ADJUSTL(jchr2)"
-  WRITE(*,*)"   ENDIF"
-  WRITE(*,*)"   RETURN"
-  WRITE(*,*)"END SUBROUTINE"
-  DO i = 1, ii
-     j = ikind_numbers(i)
-     WRITE(*, "("" SUBROUTINE i"", i2.2,""()"")") j
-     WRITE(*,*)"   IMPLICIT NONE"
-     WRITE(*,*)"   INTEGER(",j,") :: a = 0"
-     WRITE(*,*)"   INTEGER :: a_size"
-     WRITE(*,*)"   CHARACTER(LEN=2) :: jchr2"
-     WRITE(*,*)"   a_size = BIT_SIZE(a)"
-     WRITE(*,*)"   IF (a_size .EQ. 8) THEN"
-     WRITE(*,*)"       WRITE(jchr2,'(I2)')",j
-     WRITE(*,'(A)')'       WRITE(*,*) "#define H5_FORTRAN_HAS_INTEGER_1_KIND "'//"//ADJUSTL(jchr2)"
-     WRITE(*,*)"   ENDIF"
-     WRITE(*,*)"   IF (a_size .EQ. 16) THEN"
-     WRITE(*,*)"       WRITE(jchr2,'(I2)')",j
-     WRITE(*,'(A)')'       WRITE(*,*) "#define H5_FORTRAN_HAS_INTEGER_2_KIND "'//"//ADJUSTL(jchr2)"
-     WRITE(*,*)"   ENDIF"
-     WRITE(*,*)"   IF (a_size .EQ. 32) THEN"
-     WRITE(*,*)"       WRITE(jchr2,'(I2)')",j
-     WRITE(*,'(A)')'       WRITE(*,*) "#define H5_FORTRAN_HAS_INTEGER_4_KIND "'//"//ADJUSTL(jchr2)"
-     WRITE(*,*)"   ENDIF"
-     WRITE(*,*)"   IF (a_size .EQ. 64) THEN"
-     WRITE(*,*)"       WRITE(jchr2,'(I2)')",j
-     WRITE(*,'(A)')'       WRITE(*,*) "#define H5_FORTRAN_HAS_INTEGER_8_KIND "'//"//ADJUSTL(jchr2)"
-     WRITE(*,*)"   ENDIF"
-     WRITE(*,*)"   IF (a_size .EQ. 128) THEN"
-     WRITE(*,*)"       WRITE(jchr2,'(I2)')",j
-     WRITE(*,'(A)')'       WRITE(*,*) "#define H5_FORTRAN_HAS_INTEGER_16_KIND "'//"//ADJUSTL(jchr2)"
-     WRITE(*,*)"   ENDIF"
-     WRITE(*,*)"   RETURN"
-     WRITE(*,*)"   END SUBROUTINE"
-  ENDDO
-  DO i = 1, ir
-     j = rkind_numbers(i)
-     WRITE(*, "("" SUBROUTINE r"", i2.2,""()"")") j
-     WRITE(*,*)"   IMPLICIT NONE"
-     WRITE(*,*)"   REAL(KIND=",j,") :: b(32)"
-     WRITE(*,*)"   INTEGER :: a(1)"
-     WRITE(*,*)"   INTEGER :: a_size"
-     WRITE(*,*)"   INTEGER :: real_size"
-     WRITE(*,*)"   CHARACTER(LEN=2) :: jchr2"
-     WRITE(*,*)"   a_size = BIT_SIZE(a(1)) ! Size in bits for integer"
-     WRITE(*,*)"   real_size = (SIZE(TRANSFER(b,a))*a_size)/SIZE(b)"
-     WRITE(*,*)"   IF (real_size .EQ. 32) THEN"
-     WRITE(*,*)"       WRITE(jchr2,'(I2)')",j
-     WRITE(*,'(A)')'       WRITE(*,*) "#define H5_FORTRAN_HAS_REAL_4_KIND "'//"//ADJUSTL(jchr2)"
-     WRITE(*,*)"   ENDIF"
-     WRITE(*,*)"   IF (real_size .EQ. 64) THEN"
-     WRITE(*,*)"       WRITE(jchr2,'(I2)')",j
-     WRITE(*,*)'       WRITE(*,*) "#define H5_FORTRAN_HAS_REAL_8_KIND "'//"//ADJUSTL(jchr2)"
-     WRITE(*,*)"   endif"
-     WRITE(*,*)"   IF (real_size .EQ. 128) THEN"
-     WRITE(*,*)"       WRITE(jchr2,'(I2)')",j
-     WRITE(*,'(A)')'       WRITE(*,*) "#define H5_FORTRAN_HAS_REAL_16_KIND "'//"//ADJUSTL(jchr2)"
-     WRITE(*,*)"   ENDIF"
-     WRITE(*,*)"   RETURN"
-     WRITE(*,*)"   END SUBROUTINE"
-  ENDDO
-END PROGRAM test_kind
-
-
-
diff --git a/fortran/src/H5test_kind_SIZEOF.f90 b/fortran/src/H5test_kind_SIZEOF.f90
deleted file mode 100644
index 468086a..0000000
--- a/fortran/src/H5test_kind_SIZEOF.f90
+++ /dev/null
@@ -1,228 +0,0 @@
-!****p* Program/H5test_kind_SIZEOF
-!
-! NAME
-!  Executable: H5test_kind
-!
-! FILE
-!  fortran/src/H5test_kind_SIZEOF.f90
-!
-! PURPOSE
-!  This stand alone program is used at build time to generate the program
-!  H5fortran_detect.f90. It cycles through all the available KIND parameters for
-!  integers and reals. The appropriate program and subroutines are then generated
-!  depending on which of the KIND values are found.
-!
-! NOTES
-!  This program is used in place of H5test_kind.f90 when the Fortran intrinsic
-!  function SIZEOF is available. It generates code that makes use of SIZEOF in
-!  H5fortran_detect.f90 which is a portable solution but is not standard
-!  compliant. The program H5test_kind_C_SIZEOF uses F2008 standard intrinsic
-!  function instead, which is the preferred method. 
-!
-!  The availability of SIZEOF is checked at configure time and the TRUE/FALSE
-!  condition is set in the configure variable "FORTRAN_HAVE_SIZEOF".
-!
-! COPYRIGHT
-!  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!  Copyright by The HDF Group.                                                 *
-!  Copyright by the Board of Trustees of the University of Illinois.           *
-!  All rights reserved.                                                        *
-!                                                                              *
-!  This file is part of HDF5.  The full HDF5 copyright notice, including       *
-!  terms governing use, modification, and redistribution, is contained in      *
-!  the files COPYING and Copyright.html.  COPYING can be found at the root     *
-!  of the source code distribution tree; Copyright.html can be found at the    *
-!  root level of an installed copy of the electronic HDF5 document set and     *
-!  is linked from the top-level documents page.  It can also be found at       *
-!  http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have            *
-!  access to either file, you may request a copy from help@hdfgroup.org.       *
-!  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!
-!*****
-
-PROGRAM test_kind
-  IMPLICIT NONE
-  INTEGER :: i, j, ii, ir, last, ikind_numbers(10), rkind_numbers(10)
-  INTEGER :: ji, jr, jd
-  last = -1
-  ii = 0
-
-  ikind_numbers = 0
-  rkind_numbers = 0
-
-  DO i = 1,100
-     j = SELECTED_INT_KIND(i)
-     IF(j .NE. last) THEN
-        IF(last .NE. -1) THEN
-           ii = ii + 1
-           ikind_numbers(ii) = last
-        ENDIF
-        last = j
-        IF(j .EQ. -1) EXIT
-     ENDIF
-  ENDDO
-
-  last = -1
-  ir = 0
-  DO i = 1,100
-     j = SELECTED_REAL_KIND(i)
-     IF(j .NE. last) THEN
-        IF(last .NE. -1) THEN
-           ir = ir + 1
-           rkind_numbers(ir) = last
-        ENDIF
-        last = j
-        IF(j .EQ. -1) EXIT
-     ENDIF
-  ENDDO
-
-!  Generate program information:
-
-WRITE(*,'(40(A,/))') &
-'!****h* ROBODoc/H5fortran_detect.f90',&
-'!',&
-'! NAME',&
-'!  H5fortran_detect',&
-'! ',&
-'! PURPOSE',&
-'!  This stand alone program is used at build time to generate the header file',&
-'!  H5fort_type_defines.h. The source code itself was automatically generated by',&
-'!  the program H5test_kind_SIZEOF.f90',&
-'!',&
-'! NOTES',&
-'!  This source code makes use of the Fortran intrinsic function SIZEOF because',&
-'!  the availability of the intrinsic function was determined to be available at',&
-'!  configure time',&
-'!',&
-'! COPYRIGHT',&
-'! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *',&
-'!   Copyright by The HDF Group.                                               *',&
-'!   Copyright by the Board of Trustees of the University of Illinois.         *',&
-'!   All rights reserved.                                                      *',&
-'!                                                                             *',&
-'!   This file is part of HDF5.  The full HDF5 copyright notice, including     *',&
-'!   terms governing use, modification, and redistribution, is contained in    *',&
-'!   the files COPYING and Copyright.html.  COPYING can be found at the root   *',&
-'!   of the source code distribution tree; Copyright.html can be found at the  *',&
-'!   root level of an installed copy of the electronic HDF5 document set and   *',&
-'!   is linked from the top-level documents page.  It can also be found at     *',&
-'!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *',&
-'!   access to either file, you may request a copy from help@hdfgroup.org.     *',&
-'! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *',&
-'!',&
-'! AUTHOR',&
-'!  H5test_kind_SIZEOF.f90',&
-'!',&
-'!*****'
-
-! GENERATE A PROGRAM
-!
-! (a) Generate the module
-
-  WRITE(*,*) "MODULE H5test_kind_SIZEOF_mod"
-  WRITE(*,*) "USE ISO_C_BINDING"
-  WRITE(*,*) "IMPLICIT NONE"
-  WRITE(*,*) "CONTAINS"
-  j = 0
-  ji = KIND(1)
-  WRITE(*, "("" SUBROUTINE i"", i2.2,""()"")") j
-  WRITE(*,*)"   IMPLICIT NONE"
-  WRITE(*,*)"   INTEGER :: a"
-  WRITE(*,*)"   INTEGER(C_SIZE_T) :: a_size"
-  WRITE(*,*)"   CHARACTER(LEN=2) :: ichr2, jchr2"
-  WRITE(*,*)"   a_size = SIZEOF(a)"
-  WRITE(*,*)"   WRITE(ichr2,'(I2)') a_size"
-  WRITE(*,'(A,I0)')"    WRITE(jchr2,'(I2)') ",ji
-  WRITE(*,'(A)')'    WRITE(*,*) "#define H5_FORTRAN_HAS_NATIVE_"'//  &
-       "//TRIM(ADJUSTL(ichr2))//"//'"_KIND "'//"//ADJUSTL(jchr2)"
-  WRITE(*,*)"   RETURN"
-  WRITE(*,*)"END SUBROUTINE"
-  jr = 0
-  j = KIND(1.0)
-  WRITE(*, "("" SUBROUTINE r"", i2.2,""()"")") jr
-  WRITE(*,*)"   IMPLICIT NONE"
-  WRITE(*,*)"   REAL :: a"
-  WRITE(*,*)"   INTEGER(C_SIZE_T) :: a_size"
-  WRITE(*,*)"   CHARACTER(LEN=2) :: ichr2, jchr2"
-  WRITE(*,*)"   a_size = SIZEOF(a)"
-  WRITE(*,*)"   WRITE(ichr2,'(I2)') a_size"
-  WRITE(*,'(A,I0)')"    WRITE(jchr2,'(I2)') ",j
-  WRITE(*,'(A)')'    WRITE(*,*) "#define H5_FORTRAN_HAS_REAL_NATIVE_"'//  &
-       "//TRIM(ADJUSTL(ichr2))//"//'"_KIND "'//"//ADJUSTL(jchr2)"
-  WRITE(*,*)"   RETURN"
-  WRITE(*,*)"END SUBROUTINE"
-  jd = 0
-  j = KIND(1.d0)
-  WRITE(*, "("" SUBROUTINE d"", i2.2,""()"")") jd
-  WRITE(*,*)"   IMPLICIT NONE"
-  WRITE(*,*)"   DOUBLE PRECISION :: a"
-  WRITE(*,*)"   INTEGER(C_SIZE_T) :: a_size"
-  WRITE(*,*)"   CHARACTER(LEN=2) :: ichr2, jchr2"
-  WRITE(*,*)"   a_size = SIZEOF(a)"
-  WRITE(*,*)"   WRITE(ichr2,'(I2)') a_size"
-  WRITE(*,'(A,I0)')"    WRITE(jchr2,'(I2)') ",j
-  WRITE(*,'(A)')'    WRITE(*,*) "#define H5_FORTRAN_HAS_DOUBLE_NATIVE_"'//  &
-       "//TRIM(ADJUSTL(ichr2))//"//'"_KIND "'//"//ADJUSTL(jchr2)"
-  WRITE(*,*)"   RETURN"
-  WRITE(*,*)"END SUBROUTINE"
-  DO i = 1, ii
-     j = ikind_numbers(i)
-     WRITE(*, "("" SUBROUTINE i"", i2.2,""()"")") j
-     WRITE(*,*)"   IMPLICIT NONE"
-     WRITE(*,'(A,I0,A)')"   INTEGER(KIND=",j,") :: a"
-     WRITE(*,*)"   INTEGER(C_SIZE_T) :: a_size"
-     WRITE(*,*)"   CHARACTER(LEN=2) :: ichr2, jchr2"
-     WRITE(*,*)"   a_size = SIZEOF(a)"
-     WRITE(*,*)"   WRITE(ichr2,'(I2)') a_size"
-     WRITE(*,'(A,I0)')"    WRITE(jchr2,'(I2)') ",j
-     WRITE(*,'(A)')'    WRITE(*,*) "#define H5_FORTRAN_HAS_INTEGER_"'//  &
-          "//TRIM(ADJUSTL(ichr2))//"//'"_KIND "'//"//ADJUSTL(jchr2)"
-     WRITE(*,*)"   RETURN"
-     WRITE(*,*)"END SUBROUTINE"
-  ENDDO
-  DO i = 1, ir
-     j = rkind_numbers(i)
-     WRITE(*, "("" SUBROUTINE r"", i2.2,""()"")") j
-     WRITE(*,*)"   IMPLICIT NONE"
-     WRITE(*,'(A,I0,A)')"    REAL(KIND= ",j,") :: a"
-     WRITE(*,*)"   INTEGER(C_SIZE_T) :: a_size"
-     WRITE(*,*)"   CHARACTER(LEN=2) :: ichr2, jchr2"
-     WRITE(*,*)"   a_size = SIZEOF(a)"
-     WRITE(*,*)"   WRITE(ichr2,'(I2)') a_size"
-     WRITE(*,'(A,I0)')"    WRITE(jchr2,'(I2)') ", j
-     WRITE(*,'(A)')'    WRITE(*,*) "#define H5_FORTRAN_HAS_REAL_"'//  &
-          "//TRIM(ADJUSTL(ichr2))//"//'"_KIND "'//"//ADJUSTL(jchr2)"
-     WRITE(*,*)"   RETURN"
-     WRITE(*,*)"END SUBROUTINE"
-  ENDDO
-  WRITE(*,*) "END MODULE H5test_kind_SIZEOF_mod"
-  WRITE(*,*) ""
-
-  ! (b) generate the main program
-
-  WRITE(*,*) "PROGRAM H5test_kind_SIZEOF"
-  WRITE(*,*) "USE H5test_kind_SIZEOF_mod"
-  WRITE(*,*) "WRITE(*,*) "" /*generating header file*/ """
-  ji = 0
-  WRITE(*, "("" CALL i"", i2.2,""()"")") ji
-  jr = 0
-  WRITE(*, "("" CALL r"", i2.2,""()"")") jr
-  jd = 0
-  WRITE(*, "("" CALL d"", i2.2,""()"")") jd
-  DO i = 1, ii
-     j = ikind_numbers(i)
-     WRITE(*, "("" CALL i"", i2.2,""()"")") j
-  ENDDO
-  DO i = 1, ir
-     j = rkind_numbers(i)
-     WRITE(*, "("" CALL r"", i2.2,""()"")") j
-  ENDDO
-  WRITE(*,*) "END PROGRAM H5test_kind_SIZEOF"
-
-END PROGRAM test_kind
-
-
-
diff --git a/fortran/src/H5test_kind_STORAGE_SIZE.f90 b/fortran/src/H5test_kind_STORAGE_SIZE.f90
deleted file mode 100644
index 89c904c..0000000
--- a/fortran/src/H5test_kind_STORAGE_SIZE.f90
+++ /dev/null
@@ -1,230 +0,0 @@
-!****p* Program/H5test_kind_STORAGE_SIZE
-!
-! NAME
-!  Executable: H5test_kind
-!
-! FILE
-!  fortran/src/H5test_kind_STORAGE_SIZE.f90
-!
-! PURPOSE
-!  This stand alone program is used at build time to generate the program
-!  H5fortran_detect.f90. It cycles through all the available KIND parameters for
-!  integers and reals. The appropriate program and subroutines are then generated
-!  depending on which of the KIND values are found.
-!
-! NOTES
-!  This program is used in place of H5test_kind.f90 or H5test_kind_SIZEOF.f90 when 
-!  the Fortran 2008 intrinsic function STORAGE_SIZE is available. It generates code 
-!  that makes use of STORAGE_SIZE in H5fortran_detect.f90, which will be standard
-!  compliant. This program is the preferred method. 
-!
-!  The availability of STORAGE_SIZE is checked at configure time and the TRUE/FALSE
-!  condition is set in the configure variable "FORTRAN_HAVE_STORAGE_SIZE".
-!
-!  The use of C_SIZOF(X) is not used since the argument X must be an interoperable
-!  data entity.
-!
-! COPYRIGHT
-!  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!  Copyright by The HDF Group.                                                 *
-!  Copyright by the Board of Trustees of the University of Illinois.           *
-!  All rights reserved.                                                        *
-!                                                                              *
-!  This file is part of HDF5.  The full HDF5 copyright notice, including       *
-!  terms governing use, modification, and redistribution, is contained in      *
-!  the files COPYING and Copyright.html.  COPYING can be found at the root     *
-!  of the source code distribution tree; Copyright.html can be found at the    *
-!  root level of an installed copy of the electronic HDF5 document set and     *
-!  is linked from the top-level documents page.  It can also be found at       *
-!  http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have            *
-!  access to either file, you may request a copy from help@hdfgroup.org.       *
-!  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!
-!*****
-
-PROGRAM test_kind
-  IMPLICIT NONE
-  INTEGER :: i, j, ii, ir, last, ikind_numbers(10), rkind_numbers(10)
-  INTEGER :: ji, jr, jd
-  last = -1
-  ii = 0
-
-  ikind_numbers = 0
-  rkind_numbers = 0
-
-  DO i = 1,100
-     j = SELECTED_INT_KIND(i)
-     IF(j .NE. last) THEN
-        IF(last .NE. -1) THEN
-           ii = ii + 1
-           ikind_numbers(ii) = last
-        ENDIF
-        last = j
-        IF(j .EQ. -1) EXIT
-     ENDIF
-  ENDDO
-
-  last = -1
-  ir = 0
-  DO i = 1,100
-     j = SELECTED_REAL_KIND(i)
-     IF(j .NE. last) THEN
-        IF(last .NE. -1) THEN
-           ir = ir + 1
-           rkind_numbers(ir) = last
-        ENDIF
-        last = j
-        IF(j .EQ. -1) EXIT
-     ENDIF
-  ENDDO
-
-!  Generate program information:
-
-WRITE(*,'(40(A,/))') &
-'!****h* ROBODoc/H5fortran_detect.f90',&
-'!',&
-'! NAME',&
-'!  H5fortran_detect',&
-'! ',&
-'! PURPOSE',&
-'!  This stand alone program is used at build time to generate the header file',&
-'!  H5fort_type_defines.h. The source code itself was automatically generated by',&
-'!  the program H5test_kind_STORAGE_SIZE.f90',&
-'!',&
-'! NOTES',&
-'!  This source code makes use of the Fortran intrinsic function STORAGE_SIZE because',&
-'!  the availability of the intrinsic function was determined to be available at',&
-'!  configure time',&
-'!',&
-'! COPYRIGHT',&
-'! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *',&
-'!   Copyright by The HDF Group.                                               *',&
-'!   Copyright by the Board of Trustees of the University of Illinois.         *',&
-'!   All rights reserved.                                                      *',&
-'!                                                                             *',&
-'!   This file is part of HDF5.  The full HDF5 copyright notice, including     *',&
-'!   terms governing use, modification, and redistribution, is contained in    *',&
-'!   the files COPYING and Copyright.html.  COPYING can be found at the root   *',&
-'!   of the source code distribution tree; Copyright.html can be found at the  *',&
-'!   root level of an installed copy of the electronic HDF5 document set and   *',&
-'!   is linked from the top-level documents page.  It can also be found at     *',&
-'!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *',&
-'!   access to either file, you may request a copy from help@hdfgroup.org.     *',&
-'! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *',&
-'!',&
-'! AUTHOR',&
-'!  H5test_kind_C_SIZEOF.f90',&
-'!',&
-'!*****'
-
-! GENERATE A PROGRAM
-!
-! (a) Generate the module
-
-  WRITE(*,*) "MODULE H5test_kind_STORAGE_SIZE_mod"
-  WRITE(*,*) "USE ISO_C_BINDING"
-  WRITE(*,*) "IMPLICIT NONE"
-  WRITE(*,*) "CONTAINS"
-  j = 0
-  ji = KIND(1)
-  WRITE(*, "("" SUBROUTINE i"", i2.2,""()"")") j
-  WRITE(*,*)"   IMPLICIT NONE"
-  WRITE(*,*)"   INTEGER :: a"
-  WRITE(*,*)"   INTEGER(C_SIZE_T) :: a_size"
-  WRITE(*,*)"   CHARACTER(LEN=2) :: ichr2, jchr2"
-  WRITE(*,*)"   a_size = STORAGE_SIZE(a, c_size_t)/STORAGE_SIZE(c_char_'a',c_size_t)"
-  WRITE(*,*)"   WRITE(ichr2,'(I2)') a_size"
-  WRITE(*,'(A,I0)')"    WRITE(jchr2,'(I2)') ",ji
-  WRITE(*,'(A)')'    WRITE(*,*) "#define H5_FORTRAN_HAS_NATIVE_"'//  &
-       "//TRIM(ADJUSTL(ichr2))//"//'"_KIND "'//"//ADJUSTL(jchr2)"
-  WRITE(*,*)"   RETURN"
-  WRITE(*,*)"END SUBROUTINE"
-  jr = 0
-  j = KIND(1.0)
-  WRITE(*, "("" SUBROUTINE r"", i2.2,""()"")") jr
-  WRITE(*,*)"   IMPLICIT NONE"
-  WRITE(*,*)"   REAL :: a"
-  WRITE(*,*)"   INTEGER(C_SIZE_T) :: a_size"
-  WRITE(*,*)"   CHARACTER(LEN=2) :: ichr2, jchr2"
-  WRITE(*,*)"   a_size = STORAGE_SIZE(a, c_size_t)/STORAGE_SIZE(c_char_'a',c_size_t)"
-  WRITE(*,*)"   WRITE(ichr2,'(I2)') a_size"
-  WRITE(*,'(A,I0)')"    WRITE(jchr2,'(I2)') ",j
-  WRITE(*,'(A)')'    WRITE(*,*) "#define H5_FORTRAN_HAS_REAL_NATIVE_"'//  &
-       "//TRIM(ADJUSTL(ichr2))//"//'"_KIND "'//"//ADJUSTL(jchr2)"
-  WRITE(*,*)"   RETURN"
-  WRITE(*,*)"END SUBROUTINE"
-  jd = 0
-  j = KIND(1.d0)
-  WRITE(*, "("" SUBROUTINE d"", i2.2,""()"")") jd
-  WRITE(*,*)"   IMPLICIT NONE"
-  WRITE(*,*)"   DOUBLE PRECISION :: a"
-  WRITE(*,*)"   INTEGER(C_SIZE_T) :: a_size"
-  WRITE(*,*)"   CHARACTER(LEN=2) :: ichr2, jchr2"
-  WRITE(*,*)"   a_size = STORAGE_SIZE(a, c_size_t)/STORAGE_SIZE(c_char_'a',c_size_t)"
-  WRITE(*,*)"   WRITE(ichr2,'(I2)') a_size"
-  WRITE(*,'(A,I0)')"    WRITE(jchr2,'(I2)') ",j
-  WRITE(*,'(A)')'    WRITE(*,*) "#define H5_FORTRAN_HAS_DOUBLE_NATIVE_"'//  &
-       "//TRIM(ADJUSTL(ichr2))//"//'"_KIND "'//"//ADJUSTL(jchr2)"
-  WRITE(*,*)"   RETURN"
-  WRITE(*,*)"END SUBROUTINE"
-  DO i = 1, ii
-     j = ikind_numbers(i)
-     WRITE(*, "("" SUBROUTINE i"", i2.2,""()"")") j
-     WRITE(*,*)"   IMPLICIT NONE"
-     WRITE(*,'(A,I0,A)')"   INTEGER(KIND=",j,") :: a"
-     WRITE(*,*)"   INTEGER(C_SIZE_T) :: a_size"
-     WRITE(*,*)"   CHARACTER(LEN=2) :: ichr2, jchr2"
-     WRITE(*,*)"   a_size = STORAGE_SIZE(a, c_size_t)/STORAGE_SIZE(c_char_'a',c_size_t)"
-     WRITE(*,*)"   WRITE(ichr2,'(I2)') a_size"
-     WRITE(*,'(A,I0)')"    WRITE(jchr2,'(I2)') ",j
-     WRITE(*,'(A)')'    WRITE(*,*) "#define H5_FORTRAN_HAS_INTEGER_"'//  &
-          "//TRIM(ADJUSTL(ichr2))//"//'"_KIND "'//"//ADJUSTL(jchr2)"
-     WRITE(*,*)"   RETURN"
-     WRITE(*,*)"END SUBROUTINE"
-  ENDDO
-  DO i = 1, ir
-     j = rkind_numbers(i)
-     WRITE(*, "("" SUBROUTINE r"", i2.2,""()"")") j
-     WRITE(*,*)"   IMPLICIT NONE"
-     WRITE(*,'(A,I0,A)')"    REAL(KIND= ",j,") :: a"
-     WRITE(*,*)"   INTEGER(C_SIZE_T) :: a_size"
-     WRITE(*,*)"   CHARACTER(LEN=2) :: ichr2, jchr2"
-     WRITE(*,*)"   a_size = STORAGE_SIZE(a, c_size_t)/STORAGE_SIZE(c_char_'a',c_size_t)"
-     WRITE(*,*)"   WRITE(ichr2,'(I2)') a_size"
-     WRITE(*,'(A,I0)')"    WRITE(jchr2,'(I2)') ", j
-     WRITE(*,'(A)')'    WRITE(*,*) "#define H5_FORTRAN_HAS_REAL_"'//  &
-          "//TRIM(ADJUSTL(ichr2))//"//'"_KIND "'//"//ADJUSTL(jchr2)"
-     WRITE(*,*)"   RETURN"
-     WRITE(*,*)"END SUBROUTINE"
-  ENDDO
-  WRITE(*,*) "END MODULE H5test_kind_STORAGE_SIZE_mod"
-  WRITE(*,*) ""
-
-  ! (b) generate the main program
-
-  WRITE(*,*) "PROGRAM H5test_kind_STORAGE_SIZE"
-  WRITE(*,*) "USE H5test_kind_STORAGE_SIZE_mod"
-  WRITE(*,*) "WRITE(*,*) "" /*generating header file*/ """
-  ji = 0
-  WRITE(*, "("" CALL i"", i2.2,""()"")") ji
-  jr = 0
-  WRITE(*, "("" CALL r"", i2.2,""()"")") jr
-  jd = 0
-  WRITE(*, "("" CALL d"", i2.2,""()"")") jd
-  DO i = 1, ii
-     j = ikind_numbers(i)
-     WRITE(*, "("" CALL i"", i2.2,""()"")") j
-  ENDDO
-  DO i = 1, ir
-     j = rkind_numbers(i)
-     WRITE(*, "("" CALL r"", i2.2,""()"")") j
-  ENDDO
-  WRITE(*,*) "END PROGRAM H5test_kind_STORAGE_SIZE"
-
-END PROGRAM test_kind
-
-
-
diff --git a/fortran/src/HDF5.F90 b/fortran/src/HDF5.F90
new file mode 100644
index 0000000..9fe6e19
--- /dev/null
+++ b/fortran/src/HDF5.F90
@@ -0,0 +1,44 @@
+!****h* ROBODoc/HDF5
+!
+! NAME
+!  MODULE HDF5
+!
+! FILE
+!  src/fortran/src/HDF5.F90
+!
+! PURPOSE
+!  This is the main module used for linking to the Fortran HDF library.
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+!*****
+MODULE HDF5
+  USE H5GLOBAL
+  USE H5F
+  USE H5G
+  USE H5E
+  USE H5I
+  USE H5L
+  USE H5S
+  USE H5D
+  USE H5A
+  USE H5T
+  USE H5O
+  USE H5P
+  USE H5R
+  USE H5VL
+  USE H5Z
+  USE H5_gen
+  USE H5LIB
+END MODULE HDF5
diff --git a/fortran/src/HDF5.f90 b/fortran/src/HDF5.f90
deleted file mode 100644
index 75af333..0000000
--- a/fortran/src/HDF5.f90
+++ /dev/null
@@ -1,56 +0,0 @@
-!****h* ROBODoc/HDF5
-!
-! NAME
-!  MODULE HDF5
-!
-! FILE
-!  src/fortran/src/HDF5.f90
-!
-! PURPOSE
-!  This is the main module used for linking to the Fortran HDF library.
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-!*****
-
-MODULE HDF5
-  USE H5GLOBAL
-  USE H5F
-  USE H5F_PROVISIONAL
-  USE H5G
-  USE H5E
-  USE H5E_PROVISIONAL
-  USE H5I
-  USE H5L
-  USE H5L_PROVISIONAL
-  USE H5S
-  USE H5D
-  USE H5D_PROVISIONAL
-  USE H5A
-  USE H5A_PROVISIONAL
-  USE H5T
-  USE H5T_PROVISIONAL
-  USE H5O
-  USE H5O_PROVISIONAL
-  USE H5P
-  USE H5P_PROVISIONAL
-  USE H5R
-  USE H5R_PROVISIONAL
-  USE H5Z
-  USE H5_DBLE_INTERFACE
-  USE H5LIB
-END MODULE HDF5
diff --git a/fortran/src/HDF5mpio.f90 b/fortran/src/HDF5mpio.f90
deleted file mode 100644
index b8fb645..0000000
--- a/fortran/src/HDF5mpio.f90
+++ /dev/null
@@ -1,55 +0,0 @@
-!****h* ROBODoc/HDF5 (mpio)
-!
-! NAME
-!  HDF5
-!
-! PURPOSE
-!  This is the main module used for linking to the Fortran parallel HDF library.
-!  This file replaces HDF5.f90 when compiling the parallel library.
-!
-! COPYRIGHT
-!  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!  Copyright by The HDF Group.                                                 *
-!  Copyright by the Board of Trustees of the University of Illinois.           *
-!  All rights reserved.                                                        *
-!                                                                              *
-!  This file is part of HDF5.  The full HDF5 copyright notice, including       *
-!  terms governing use, modification, and redistribution, is contained in      *
-!  the files COPYING and Copyright.html.  COPYING can be found at the root     *
-!  of the source code distribution tree; Copyright.html can be found at the    *
-!  root level of an installed copy of the electronic HDF5 document set and     *
-!  is linked from the top-level documents page.  It can also be found at       *
-!  http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have            *
-!  access to either file, you may request a copy from help@hdfgroup.org.       *
-!  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-!*****
-
-MODULE HDF5
-  USE H5GLOBAL
-  USE H5F
-  USE H5F_PROVISIONAL
-  USE H5G
-  USE H5E
-  USE H5E_PROVISIONAL
-  USE H5I
-  USE H5L
-  USE H5L_PROVISIONAL
-  USE H5S
-  USE H5D
-  USE H5D_PROVISIONAL
-  USE H5A
-  USE H5A_PROVISIONAL
-  USE H5T
-  USE H5T_PROVISIONAL
-  USE H5O
-  USE H5O_PROVISIONAL
-  USE H5P
-  USE H5P_PROVISIONAL
-  USE H5FDMPIO
-  USE H5R
-  USE H5R_PROVISIONAL
-  USE H5Z
-  USE H5_DBLE_INTERFACE
-  USE H5LIB
-END MODULE HDF5
diff --git a/fortran/src/Makefile.am b/fortran/src/Makefile.am
index a4b3843..7d4154e 100644
--- a/fortran/src/Makefile.am
+++ b/fortran/src/Makefile.am
@@ -1,16 +1,13 @@
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 ##
 ## Makefile.am
 ## Run automake to generate a Makefile.in from this file.
@@ -32,7 +29,7 @@ AM_FCLIBS=$(LIBHDF5)
 lib_LTLIBRARIES=libhdf5_fortran.la
 
 # Add libtool numbers to the HDF5 Fortran library (from config/lt_vers.am)
-libhdf5_fortran_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
+libhdf5_fortran_la_LDFLAGS= -version-info $(LT_F_VERS_INTERFACE):$(LT_F_VERS_REVISION):$(LT_F_VERS_AGE) $(AM_LDFLAGS)
 
 # Some Fortran compilers can't build shared libraries, so sometimes we
 # want to build a shared C library and a static Fortran library.  If so,
@@ -42,55 +39,24 @@ else
    AM_LDFLAGS+=-static
 endif
 
-# Include HDF5.f90 if parallel is disabled, HDF5mpiof*  if parallel is enabled
-if BUILD_PARALLEL_CONDITIONAL
-   PARALLEL_COND_SRC = H5FDmpiof.c HDF5mpio.f90 H5FDmpioff.f90
-else
-   PARALLEL_COND_SRC = HDF5.f90
-endif
-
-# Check if the compiler supports the Fortran 2003 standard
-# which should include the intrinsic module iso_c_binding
-if FORTRAN_2003_CONDITIONAL_F
-   F_STATUS = _F03
-else
-   F_STATUS = _F90
-endif
-
-#   Condition for including/excluding the DBLE interfaces for when the 
-#   default REAL is of type DOUBLE PRECISION.
-#   We do not include the double precision interfaces if the defaut REAL is
-#   DOUBLE PRECISION since this would lead to a non-unique conflict with the
-#   generic interfaces declared as REAL.
-if FORTRAN_DEFAULT_REALisDBLE_F
-   F_DBLE = Exclude
-else
-   F_DBLE = Include
-endif
-
 # Source files for the library.
-libhdf5_fortran_la_SOURCES=H5f90global.f90 \
-          H5fortran_types.f90 H5_ff$(F_STATUS).f90 H5_ff.f90 H5Aff.f90 H5Dff.f90 H5Eff.f90    \
-          H5Fff.f90 H5Gff.f90 H5Iff.f90 H5Lff.f90 H5Off.f90 H5Pff.f90 H5Rff.f90 H5Sff.f90    \
-          H5Tff.f90 H5Zff.f90                                            \
-	  H5_DBLE_Interface$(F_DBLE).f90 \
+libhdf5_fortran_la_SOURCES=H5fortran_types.F90 H5f90global.F90 \
+	  H5_ff.F90 H5Aff.F90 H5Dff.F90 H5Eff.F90    \
+          H5Fff.F90 H5Gff.F90 H5Iff.F90 H5Lff.F90 H5Off.F90 H5Pff.F90 H5Rff.F90 H5Sff.F90    \
+          H5Tff.F90 H5VLff.F90 H5Zff.F90 H5_gen.F90 H5fortkit.F90 \
           H5f90kit.c H5_f.c H5Af.c H5Df.c H5Ef.c H5Ff.c H5Gf.c           \
-          H5If.c H5Lf.c H5Of.c H5Pf.c H5Rf.c H5Sf.c H5Tf.c H5Zf.c        \
-	  H5Aff$(F_STATUS).f90 H5Dff$(F_STATUS).f90 H5Eff$(F_STATUS).f90 H5Fff$(F_STATUS).f90 H5Lff$(F_STATUS).f90 \
-	  H5Off$(F_STATUS).f90 H5Pff$(F_STATUS).f90 H5Rff$(F_STATUS).f90 H5Tff$(F_STATUS).f90 $(PARALLEL_COND_SRC)
+          H5If.c H5Lf.c H5Of.c H5Pf.c H5Rf.c H5Sf.c H5Tf.c H5Zf.c HDF5.F90
 
-# HDF5 Fortran library depends on HDF5 Library. 
+# HDF5 Fortran library depends on HDF5 Library.
 libhdf5_fortran_la_LIBADD=$(LIBHDF5)
 
 # h5fc is generated during configure.
 # Remove it only when distclean.
 DISTCLEANFILES=h5fc
 
-# H5fortran_types.f90 and H5f90i.h are automatically generaed by
-# H5match_types, and must be cleaned explicitly.  H5fort_type_defines.h
-# is generated by H5fortran_detect
-MOSTLYCLEANFILES=H5fortran_types.f90 H5f90i_gen.h H5fort_type_defines.h \
-         H5fortran_detect.f90
+# H5fortran_types.F90 and H5f90i.h are automatically generated by
+# H5match_types, and must be cleaned explicitly.
+MOSTLYCLEANFILES=H5fortran_types.F90 H5f90i_gen.h H5_gen.F90
 
 # Fortran module files can have different extensions and different names
 # (e.g., different capitalizations) on different platforms.  Write rules
@@ -105,15 +71,15 @@ clean-local:
 
 install-data-local:
 	@if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \
-	  $(CP) $(top_builddir)/$(subdir)/*.$(F9XMODEXT) $(DESTDIR)$(includedir)/. ; \
+	  $(CP) $(top_builddir)/$(subdir)/*.$(F9XMODEXT) $(DESTDIR)$(fmoddir)/. ; \
 	fi
 	$(CP) $(top_builddir)/$(subdir)/H5f90i_gen.h $(DESTDIR)$(includedir)/.
 	$(CP) $(top_srcdir)/fortran/src/H5f90i.h $(DESTDIR)$(includedir)/.
 
 uninstall-local:
 	@if test -n "$(F9XMODEXT)" -a "X$(F9XMODEXT)" != "Xo"; then      \
-	  if test -f "$(includedir)/hdf5.$(F9XMODEXT)" -o -f "$(includedir)/HDF5.$(F9XMODEXT)"; then \
-	    set -x; $(RM) $(DESTDIR)$(includedir)/*.$(F9XMODEXT);                 \
+	  if test -f "$(fmoddir)/hdf5.$(F9XMODEXT)" -o -f "$(fmoddir)/HDF5.$(F9XMODEXT)"; then \
+	    set -x; $(RM) $(DESTDIR)$(fmoddir)/*.$(F9XMODEXT);                 \
 	  fi;                                                           \
 	fi;								\
 	$(RM) $(DESTDIR)$(bindir)/$(H5FC_NAME)
@@ -136,55 +102,35 @@ endif
 # programs.
 # It's a bit tricky to make sure that Automake builds things in the right
 # order (especially when using 'gmake -j ...')
-# H5test_kind is compiled and run to produce H5fortran_detect.f90.
-# H5fortran_detect is compiled and run to produce H5fort_type_defines.h.
-# H5match_types.c then includes this file and can be compiled into
+# H5_buildiface is compiled and run to produce H5_gen.F90.
+# H5match_types.c then includes H5fort_type_defines.h and can be compiled into
 # H5match_types.  When H5match_types is run, it creates H5f90i_gen.h
-# and H5fortran_types.f90, which are included in the Fortran library.
+# and H5fortran_types.F90, which are included in the Fortran library.
 
 # These are the helper programs we need to build.
-noinst_PROGRAMS = H5match_types H5fortran_detect H5test_kind
+noinst_PROGRAMS = H5match_types H5_buildiface
 
 # Tell Automake to create H5f90i_gen.h before it builds the library
 # sources.  When it creates H5f90i_gen.h, it will create
-# H5fortran_types.f90 as a side effect.
+# H5fortran_types.F90 as a side effect.
 BUILT_SOURCES = H5f90i_gen.h
 
 #Specify what Automake needs to create: first the H5fort_type_defines.h
 # header, then H5match_types which includes that header, then
 # it needs to run H5match_types.
-H5fortran_types.f90 H5f90i_gen.h: H5match_types$(EXEEXT)
+H5fortran_types.F90 H5f90i_gen.h: H5match_types$(EXEEXT)
 	$(RUNSERIAL) ./H5match_types$(EXEEXT)
 
-# H5fort_type_defines.h is created by running H5fortran_detect.
-# Obviously, H5fortran_detect needs to be built first.
-H5fort_type_defines.h: H5fortran_detect$(EXEEXT)
-	$(RUNSERIAL) ./H5fortran_detect$(EXEEXT) > H5fort_type_defines.h
-
-H5match_types.$(OBJEXT): H5fort_type_defines.h
-
-# Automake knows how to build fortran programs if we tell it the source
-# files.
-H5fortran_detect_SOURCES = H5fortran_detect.f90
+# H5_buildiface.F90 generates all the APIs that have a KIND type associated
+# with them.
 
-# H5test_kind.f90 generates H5Fortran_detect.f90 depending on if 
-# intrinsic function SIZEOF is available.
+H5_gen.F90: H5_buildiface$(EXEEXT)
+	$(RUNSERIAL) ./H5_buildiface$(EXEEXT)
 
-H5fortran_detect.f90: H5test_kind$(EXEEXT)
-	$(RUNSERIAL) ./H5test_kind$(EXEEXT) > H5fortran_detect.f90
-
-# H5test_kind.f90 is included in the distribution, and Automake knows
+# H5_buildiface.F90 is included in the distribution, and Automake knows
 # how to compile a fortran program given its sources.
 
-if FORTRAN_HAVE_STORAGE_SIZE
-  H5test_kind_SOURCES = H5test_kind_STORAGE_SIZE.f90
-else 
-if FORTRAN_HAVE_SIZEOF
-  H5test_kind_SOURCES = H5test_kind_SIZEOF.f90
-else
-  H5test_kind_SOURCES = H5test_kind.f90
-endif
-endif
+H5_buildiface_SOURCES = H5_buildiface.F90
 
 # Mark this directory as part of the Fortran API
 FORTRAN_API=yes
@@ -193,51 +139,29 @@ FORTRAN_API=yes
 # determining this automagically (like we do with the C files). So, when
 # doing a parallel make, some modules could be made way before the
 # modules they depend upon are actually made. *sigh*
-H5f90global.lo:      $(srcdir)/H5f90global.f90 H5fortran_types.lo
-H5fortran_types.lo:  H5fortran_types.f90
-H5fortran_detect.lo: H5fortran_detect.f90
-H5test_kind.lo:      $(srcdir)/H5test_kind.f90
-H5test_kind_SIZEOF.lo: $(srcdir)/H5test_kind_SIZEOF.f90
-H5_ff$(F_STATUS).lo: $(srcdir)/H5_ff$(F_STATUS).f90 H5f90global.lo
-H5_ff.lo:            $(srcdir)/H5_ff.f90 H5f90global.lo H5_ff$(F_STATUS).lo
-H5Aff.lo:            $(srcdir)/H5Aff.f90 H5f90global.lo
-H5Dff.lo:            $(srcdir)/H5Dff.f90 H5f90global.lo
-H5Aff$(F_STATUS).lo:  $(srcdir)/H5Aff$(F_STATUS).f90 H5f90global.lo
-H5Dff$(F_STATUS).lo:  $(srcdir)/H5Dff$(F_STATUS).f90 H5f90global.lo
-H5Eff$(F_STATUS).lo:  $(srcdir)/H5Eff$(F_STATUS).f90 H5f90global.lo
-H5Fff$(F_STATUS).lo:  $(srcdir)/H5Fff$(F_STATUS).f90 H5f90global.lo
-H5Lff$(F_STATUS).lo:  $(srcdir)/H5Lff$(F_STATUS).f90 H5f90global.lo
-H5Off$(F_STATUS).lo:  $(srcdir)/H5Off$(F_STATUS).f90 H5f90global.lo
-H5Pff$(F_STATUS).lo:  $(srcdir)/H5Pff$(F_STATUS).f90 H5f90global.lo
-H5Rff$(F_STATUS).lo:  $(srcdir)/H5Rff$(F_STATUS).f90 H5f90global.lo
-H5Tff$(F_STATUS).lo:  $(srcdir)/H5Tff$(F_STATUS).f90 H5f90global.lo
-H5Eff.lo:            $(srcdir)/H5Eff.f90 H5f90global.lo
-H5Fff.lo:            $(srcdir)/H5Fff.f90 H5f90global.lo
-H5Gff.lo:            $(srcdir)/H5Gff.f90 H5f90global.lo
-H5Iff.lo:            $(srcdir)/H5Iff.f90 H5f90global.lo
-H5Lff.lo:            $(srcdir)/H5Lff.f90 H5f90global.lo
-H5Off.lo:            $(srcdir)/H5Off.f90 H5f90global.lo
-H5Pff.lo:            $(srcdir)/H5Pff.f90 H5f90global.lo
-H5Rff.lo:            $(srcdir)/H5Rff.f90 H5f90global.lo
-H5Sff.lo:            $(srcdir)/H5Sff.f90 H5f90global.lo
-H5Tff.lo:            $(srcdir)/H5Tff.f90 H5f90global.lo
-H5Zff.lo:            $(srcdir)/H5Zff.f90 H5f90global.lo
-H5_DBLE_Interface$(F_DBLE).lo:  $(srcdir)/H5_DBLE_Interface$(F_DBLE).f90 H5Aff$(F_STATUS).lo H5Dff$(F_STATUS).lo H5Fff$(F_STATUS).lo H5Eff$(F_STATUS).lo H5Pff$(F_STATUS).lo
-HDF5.lo:             $(srcdir)/HDF5.f90 H5f90global.lo H5_ff$(F_STATUS).lo H5_ff.lo H5Aff.lo H5Aff$(F_STATUS).lo \
-                     H5Dff.lo H5Dff$(F_STATUS).lo  \
-                     H5Eff.lo H5Eff$(F_STATUS).lo \
-		     H5Fff.lo H5Fff$(F_STATUS).lo H5Gff.lo H5Iff.lo H5Lff.lo H5Lff$(F_STATUS).lo \
-	             H5Off.lo H5Off$(F_STATUS).lo H5Pff.lo H5Pff$(F_STATUS).lo H5Rff$(F_STATUS).lo H5Rff.lo \
-                     H5Sff.lo H5Tff.lo H5Tff$(F_STATUS).lo H5Zff.lo \
-                     H5_DBLE_Interface$(F_DBLE).lo 
-H5FDmpioff.lo:       $(srcdir)/H5FDmpioff.f90 H5f90global.lo
-HDF5mpio.lo:         $(srcdir)/H5FDmpioff.f90 H5f90global.lo H5_ff$(F_STATUS).lo H5_ff.lo \
-		     H5Aff.lo H5Aff$(F_STATUS).lo \
-                     H5Dff.lo H5Dff$(F_STATUS).lo \
-		     H5Eff.lo H5Eff$(F_STATUS).lo \
-                     H5Fff.lo H5Fff$(F_STATUS).lo H5Gff.lo H5Iff.lo H5Lff.lo H5Lff$(F_STATUS).lo \
-		     H5Off.lo H5Off$(F_STATUS).lo H5Pff.lo H5Pff$(F_STATUS).lo H5Rff$(F_STATUS).lo H5Rff.lo \
-                     H5Sff.lo H5Tff.lo H5Tff$(F_STATUS).lo H5Zff.lo \
-	             H5_DBLE_Interface$(F_DBLE).lo H5FDmpioff.lo
-
-include $(top_srcdir)/config/conclude.am
+H5f90global.lo:      $(srcdir)/H5f90global.F90 H5fortran_types.lo
+H5_buildiface.lo:    $(srcdir)/H5_buildiface.F90
+H5_ff.lo:            $(srcdir)/H5_ff.F90 H5Fff.lo H5f90global.lo
+H5Aff.lo:            $(srcdir)/H5Aff.F90 H5f90global.lo
+H5Dff.lo:            $(srcdir)/H5Dff.F90 H5f90global.lo H5_ff.lo
+H5Eff.lo:            $(srcdir)/H5Eff.F90 H5f90global.lo
+H5Fff.lo:            $(srcdir)/H5Fff.F90 H5f90global.lo
+H5Gff.lo:            $(srcdir)/H5Gff.F90 H5f90global.lo
+H5Iff.lo:            $(srcdir)/H5Iff.F90 H5f90global.lo
+H5Lff.lo:            $(srcdir)/H5Lff.F90 H5f90global.lo
+H5Off.lo:            $(srcdir)/H5Off.F90 H5f90global.lo
+H5Pff.lo:            $(srcdir)/H5Pff.F90 H5f90global.lo H5fortkit.lo
+H5Rff.lo:            $(srcdir)/H5Rff.F90 H5f90global.lo
+H5Sff.lo:            $(srcdir)/H5Sff.F90 H5f90global.lo
+H5Tff.lo:            $(srcdir)/H5Tff.F90 H5f90global.lo
+H5VLff.lo:           $(srcdir)/H5VLff.F90 H5f90global.lo H5fortkit.lo
+H5Zff.lo:            $(srcdir)/H5Zff.F90 H5f90global.lo
+H5_gen.lo:           H5_gen.F90 H5f90global.lo H5Aff.lo H5Dff.lo H5Pff.lo
+HDF5.lo:             $(srcdir)/HDF5.F90 H5f90global.lo H5_ff.lo H5Aff.lo  \
+                     H5Dff.lo \
+                     H5Eff.lo \
+		     H5Fff.lo H5Gff.lo H5Iff.lo H5Lff.lo \
+	             H5Off.lo H5Pff.lo H5Rff.lo \
+                     H5Sff.lo H5Tff.lo H5Zff.lo H5_gen.lo
+
+include $(top_srcdir)/config/conclude_fc.am
diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in
deleted file mode 100644
index 799e654..0000000
--- a/fortran/src/Makefile.in
+++ /dev/null
@@ -1,1671 +0,0 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-#
-# HDF5 Fortran Library Makefile(.in)
-#
-
-
-VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-DIST_COMMON = $(top_srcdir)/config/commence.am \
-	$(top_srcdir)/config/lt_vers.am \
-	$(top_srcdir)/config/conclude.am $(srcdir)/Makefile.in \
-	$(srcdir)/Makefile.am $(top_srcdir)/bin/mkinstalldirs \
-	$(srcdir)/h5fc.in $(top_srcdir)/bin/depcomp \
-	$(top_srcdir)/bin/test-driver README
-
-# Some Fortran compilers can't build shared libraries, so sometimes we
-# want to build a shared C library and a static Fortran library.  If so,
-# pass the -static flag to the library linker.
-@FORTRAN_SHARED_CONDITIONAL_FALSE@am__append_1 = -static
-noinst_PROGRAMS = H5match_types$(EXEEXT) H5fortran_detect$(EXEEXT) \
-	H5test_kind$(EXEEXT)
-TESTS =
-subdir = fortran/src
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/aclocal_cxx.m4 \
-	$(top_srcdir)/m4/aclocal_fc.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/src/H5config.h
-CONFIG_CLEAN_FILES = h5fc
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(libdir)"
-LTLIBRARIES = $(lib_LTLIBRARIES)
-libhdf5_fortran_la_DEPENDENCIES = $(LIBHDF5)
-am__libhdf5_fortran_la_SOURCES_DIST = H5f90global.f90 \
-	H5fortran_types.f90 H5_ff$(F_STATUS).f90 H5_ff.f90 H5Aff.f90 \
-	H5Dff.f90 H5Eff.f90 H5Fff.f90 H5Gff.f90 H5Iff.f90 H5Lff.f90 \
-	H5Off.f90 H5Pff.f90 H5Rff.f90 H5Sff.f90 H5Tff.f90 H5Zff.f90 \
-	H5_DBLE_Interface$(F_DBLE).f90 H5f90kit.c H5_f.c H5Af.c H5Df.c \
-	H5Ef.c H5Ff.c H5Gf.c H5If.c H5Lf.c H5Of.c H5Pf.c H5Rf.c H5Sf.c \
-	H5Tf.c H5Zf.c H5Aff$(F_STATUS).f90 H5Dff$(F_STATUS).f90 \
-	H5Eff$(F_STATUS).f90 H5Fff$(F_STATUS).f90 H5Lff$(F_STATUS).f90 \
-	H5Off$(F_STATUS).f90 H5Pff$(F_STATUS).f90 H5Rff$(F_STATUS).f90 \
-	H5Tff$(F_STATUS).f90 HDF5.f90 H5FDmpiof.c HDF5mpio.f90 \
-	H5FDmpioff.f90
-@BUILD_PARALLEL_CONDITIONAL_FALSE@am__objects_1 = HDF5.lo
-@BUILD_PARALLEL_CONDITIONAL_TRUE@am__objects_1 = H5FDmpiof.lo \
-@BUILD_PARALLEL_CONDITIONAL_TRUE@	HDF5mpio.lo H5FDmpioff.lo
-am_libhdf5_fortran_la_OBJECTS = H5f90global.lo H5fortran_types.lo \
-	H5_ff$(F_STATUS).lo H5_ff.lo H5Aff.lo H5Dff.lo H5Eff.lo \
-	H5Fff.lo H5Gff.lo H5Iff.lo H5Lff.lo H5Off.lo H5Pff.lo H5Rff.lo \
-	H5Sff.lo H5Tff.lo H5Zff.lo H5_DBLE_Interface$(F_DBLE).lo \
-	H5f90kit.lo H5_f.lo H5Af.lo H5Df.lo H5Ef.lo H5Ff.lo H5Gf.lo \
-	H5If.lo H5Lf.lo H5Of.lo H5Pf.lo H5Rf.lo H5Sf.lo H5Tf.lo \
-	H5Zf.lo H5Aff$(F_STATUS).lo H5Dff$(F_STATUS).lo \
-	H5Eff$(F_STATUS).lo H5Fff$(F_STATUS).lo H5Lff$(F_STATUS).lo \
-	H5Off$(F_STATUS).lo H5Pff$(F_STATUS).lo H5Rff$(F_STATUS).lo \
-	H5Tff$(F_STATUS).lo $(am__objects_1)
-libhdf5_fortran_la_OBJECTS = $(am_libhdf5_fortran_la_OBJECTS)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 = 
-libhdf5_fortran_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=FC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(FCLD) \
-	$(AM_FCFLAGS) $(FCFLAGS) $(libhdf5_fortran_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
-PROGRAMS = $(noinst_PROGRAMS)
-am_H5fortran_detect_OBJECTS = H5fortran_detect.$(OBJEXT)
-H5fortran_detect_OBJECTS = $(am_H5fortran_detect_OBJECTS)
-H5fortran_detect_LDADD = $(LDADD)
-H5match_types_SOURCES = H5match_types.c
-H5match_types_OBJECTS = H5match_types.$(OBJEXT)
-H5match_types_LDADD = $(LDADD)
-am__H5test_kind_SOURCES_DIST = H5test_kind.f90 H5test_kind_SIZEOF.f90 \
-	H5test_kind_STORAGE_SIZE.f90
-@FORTRAN_HAVE_SIZEOF_FALSE@@FORTRAN_HAVE_STORAGE_SIZE_FALSE@am_H5test_kind_OBJECTS = H5test_kind.$(OBJEXT)
-@FORTRAN_HAVE_SIZEOF_TRUE@@FORTRAN_HAVE_STORAGE_SIZE_FALSE@am_H5test_kind_OBJECTS = H5test_kind_SIZEOF.$(OBJEXT)
-@FORTRAN_HAVE_STORAGE_SIZE_TRUE@am_H5test_kind_OBJECTS = H5test_kind_STORAGE_SIZE.$(OBJEXT)
-H5test_kind_OBJECTS = $(am_H5test_kind_OBJECTS)
-H5test_kind_LDADD = $(LDADD)
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
-depcomp = $(SHELL) $(top_srcdir)/bin/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC      " $@;
-am__v_CC_1 = 
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD    " $@;
-am__v_CCLD_1 = 
-FCCOMPILE = $(FC) $(AM_FCFLAGS) $(FCFLAGS)
-LTFCCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=FC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(FC) $(AM_FCFLAGS) $(FCFLAGS)
-AM_V_FC = $(am__v_FC_@AM_V@)
-am__v_FC_ = $(am__v_FC_@AM_DEFAULT_V@)
-am__v_FC_0 = @echo "  FC      " $@;
-am__v_FC_1 = 
-FCLD = $(FC)
-FCLINK = $(LIBTOOL) $(AM_V_lt) --tag=FC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(FCLD) $(AM_FCFLAGS) $(FCFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_FCLD = $(am__v_FCLD_@AM_V@)
-am__v_FCLD_ = $(am__v_FCLD_@AM_DEFAULT_V@)
-am__v_FCLD_0 = @echo "  FCLD    " $@;
-am__v_FCLD_1 = 
-SOURCES = $(libhdf5_fortran_la_SOURCES) $(H5fortran_detect_SOURCES) \
-	H5match_types.c $(H5test_kind_SOURCES)
-DIST_SOURCES = $(am__libhdf5_fortran_la_SOURCES_DIST) \
-	$(H5fortran_detect_SOURCES) H5match_types.c \
-	$(am__H5test_kind_SOURCES_DIST)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-am__tty_colors_dummy = \
-  mgn= red= grn= lgn= blu= brg= std=; \
-  am__color_tests=no
-am__tty_colors = { \
-  $(am__tty_colors_dummy); \
-  if test "X$(AM_COLOR_TESTS)" = Xno; then \
-    am__color_tests=no; \
-  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
-    am__color_tests=yes; \
-  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
-    am__color_tests=yes; \
-  fi; \
-  if test $$am__color_tests = yes; then \
-    red='[0;31m'; \
-    grn='[0;32m'; \
-    lgn='[1;32m'; \
-    blu='[1;34m'; \
-    mgn='[0;35m'; \
-    brg='[1m'; \
-    std='[m'; \
-  fi; \
-}
-am__recheck_rx = ^[ 	]*:recheck:[ 	]*
-am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
-am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
-# A command that, given a newline-separated list of test names on the
-# standard input, print the name of the tests that are to be re-run
-# upon "make recheck".
-am__list_recheck_tests = $(AWK) '{ \
-  recheck = 1; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-        { \
-          if ((getline line2 < ($$0 ".log")) < 0) \
-	    recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
-        { \
-          recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
-        { \
-          break; \
-        } \
-    }; \
-  if (recheck) \
-    print $$0; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# A command that, given a newline-separated list of test names on the
-# standard input, create the global log from their .trs and .log files.
-am__create_global_log = $(AWK) ' \
-function fatal(msg) \
-{ \
-  print "fatal: making $@: " msg | "cat >&2"; \
-  exit 1; \
-} \
-function rst_section(header) \
-{ \
-  print header; \
-  len = length(header); \
-  for (i = 1; i <= len; i = i + 1) \
-    printf "="; \
-  printf "\n\n"; \
-} \
-{ \
-  copy_in_global_log = 1; \
-  global_test_result = "RUN"; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-         fatal("failed to read from " $$0 ".trs"); \
-      if (line ~ /$(am__global_test_result_rx)/) \
-        { \
-          sub("$(am__global_test_result_rx)", "", line); \
-          sub("[ 	]*$$", "", line); \
-          global_test_result = line; \
-        } \
-      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
-        copy_in_global_log = 0; \
-    }; \
-  if (copy_in_global_log) \
-    { \
-      rst_section(global_test_result ": " $$0); \
-      while ((rc = (getline line < ($$0 ".log"))) != 0) \
-      { \
-        if (rc < 0) \
-          fatal("failed to read from " $$0 ".log"); \
-        print line; \
-      }; \
-      printf "\n"; \
-    }; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# Restructured Text title.
-am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
-# Solaris 10 'make', and several other traditional 'make' implementations,
-# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
-# by disabling -e (using the XSI extension "set +e") if it's set.
-am__sh_e_setup = case $$- in *e*) set +e;; esac
-# Default flags passed to test drivers.
-am__common_driver_flags = \
-  --color-tests "$$am__color_tests" \
-  --enable-hard-errors "$$am__enable_hard_errors" \
-  --expect-failure "$$am__expect_failure"
-# To be inserted before the command running the test.  Creates the
-# directory for the log if needed.  Stores in $dir the directory
-# containing $f, in $tst the test, in $log the log.  Executes the
-# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
-# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
-# will run the test scripts (or their associated LOG_COMPILER, if
-# thy have one).
-am__check_pre = \
-$(am__sh_e_setup);					\
-$(am__vpath_adj_setup) $(am__vpath_adj)			\
-$(am__tty_colors);					\
-srcdir=$(srcdir); export srcdir;			\
-case "$@" in						\
-  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
-    *) am__odir=.;; 					\
-esac;							\
-test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
-  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
-if test -f "./$$f"; then dir=./;			\
-elif test -f "$$f"; then dir=;				\
-else dir="$(srcdir)/"; fi;				\
-tst=$$dir$$f; log='$@'; 				\
-if test -n '$(DISABLE_HARD_ERRORS)'; then		\
-  am__enable_hard_errors=no; 				\
-else							\
-  am__enable_hard_errors=yes; 				\
-fi; 							\
-case " $(XFAIL_TESTS) " in				\
-  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
-    am__expect_failure=yes;;				\
-  *)							\
-    am__expect_failure=no;;				\
-esac; 							\
-$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
-# A shell command to get the names of the tests scripts with any registered
-# extension removed (i.e., equivalently, the names of the test logs, with
-# the '.log' extension removed).  The result is saved in the shell variable
-# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
-# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
-# since that might cause problem with VPATH rewrites for suffix-less tests.
-# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
-am__set_TESTS_bases = \
-  bases='$(TEST_LOGS)'; \
-  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
-  bases=`echo $$bases`
-RECHECK_LOGS = $(TEST_LOGS)
-AM_RECURSIVE_TARGETS = check recheck
-TEST_SUITE_LOG = test-suite.log
-am__test_logs1 = $(TESTS:=.log)
-am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
-TEST_LOGS = $(am__test_logs2:.sh.log=.log)
-SH_LOG_DRIVER = $(SHELL) $(top_srcdir)/bin/test-driver
-SH_LOG_COMPILE = $(SH_LOG_COMPILER) $(AM_SH_LOG_FLAGS) $(SH_LOG_FLAGS)
-am__set_b = \
-  case '$@' in \
-    */*) \
-      case '$*' in \
-        */*) b='$*';; \
-          *) b=`echo '$@' | sed 's/\.log$$//'`; \
-       esac;; \
-    *) \
-      b='$*';; \
-  esac
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
-AMTAR = @AMTAR@
-
-# H5_CFLAGS holds flags that should be used when building hdf5,
-# but which should not be exported to h5cc for building other programs.
-# AM_CFLAGS is an automake construct which should be used by Makefiles 
-# instead of CFLAGS, as CFLAGS is reserved solely for the user to define.
-# This applies to FCFLAGS, CXXFLAGS, CPPFLAGS, and LDFLAGS as well.
-AM_CFLAGS = @AM_CFLAGS@ @H5_CFLAGS@
-
-# Include src directory in both Fortran and C flags (C compiler is used
-# for linking).
-AM_CPPFLAGS = @AM_CPPFLAGS@ @H5_CPPFLAGS@ -I$(top_srcdir)/src
-AM_CXXFLAGS = @AM_CXXFLAGS@ @H5_CXXFLAGS@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@ -I$(top_srcdir)/src \
-	-I$(top_srcdir)/fortran/src
-AM_LDFLAGS = @AM_LDFLAGS@ @H5_LDFLAGS@ $(am__append_1)
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BYTESEX = @BYTESEX@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CC_VERSION = @CC_VERSION@
-CFLAGS = @CFLAGS@
-CLEARFILEBUF = @CLEARFILEBUF@
-CODESTACK = @CODESTACK@
-CONFIG_DATE = @CONFIG_DATE@
-CONFIG_MODE = @CONFIG_MODE@
-CONFIG_USER = @CONFIG_USER@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CXX_VERSION = @CXX_VERSION@
-CYGPATH_W = @CYGPATH_W@
-DEBUG_PKG = @DEBUG_PKG@
-DEFAULT_API_VERSION = @DEFAULT_API_VERSION@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
-DIRECT_VFD = @DIRECT_VFD@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-EXTERNAL_FILTERS = @EXTERNAL_FILTERS@
-
-# Make sure that these variables are exported to the Makefiles
-F9XMODEXT = @F9XMODEXT@
-F9XMODFLAG = @F9XMODFLAG@
-F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
-FC = @FC@
-FC2003 = @FC2003@
-FCFLAGS = @FCFLAGS@
-FCFLAGS_f90 = @FCFLAGS_f90@
-FCLIBS = @FCLIBS@
-FC_VERSION = @FC_VERSION@
-FGREP = @FGREP@
-FSEARCH_DIRS = @FSEARCH_DIRS@
-GREP = @GREP@
-H5_CFLAGS = @H5_CFLAGS@
-H5_CPPFLAGS = @H5_CPPFLAGS@
-H5_CXXFLAGS = @H5_CXXFLAGS@
-H5_CXX_SHARED = @H5_CXX_SHARED@
-H5_FCFLAGS = @H5_FCFLAGS@
-H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@
-H5_LDFLAGS = @H5_LDFLAGS@
-H5_LONE_COLON = @H5_LONE_COLON@
-H5_VERSION = @H5_VERSION@
-HADDR_T = @HADDR_T@
-HAVE_DMALLOC = @HAVE_DMALLOC@
-HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@
-HAVE_PTHREAD = @HAVE_PTHREAD@
-HDF5_HL = @HDF5_HL@
-HDF5_INTERFACES = @HDF5_INTERFACES@
-HDF_CXX = @HDF_CXX@
-HDF_FORTRAN = @HDF_FORTRAN@
-HDF_FORTRAN2003 = @HDF_FORTRAN2003@
-HID_T = @HID_T@
-HL = @HL@
-HL_FOR = @HL_FOR@
-HSIZE_T = @HSIZE_T@
-HSSIZE_T = @HSSIZE_T@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTRUMENT = @INSTRUMENT@
-INSTRUMENT_LIBRARY = @INSTRUMENT_LIBRARY@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LL_PATH = @LL_PATH@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_STATIC_EXEC = @LT_STATIC_EXEC@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MPE = @MPE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJECT_NAMELEN_DEFAULT_F = @OBJECT_NAMELEN_DEFAULT_F@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PARALLEL = @PARALLEL@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-RANLIB = @RANLIB@
-ROOT = @ROOT@
-RUNPARALLEL = @RUNPARALLEL@
-RUNSERIAL = @RUNSERIAL@
-R_INTEGER = @R_INTEGER@
-R_LARGE = @R_LARGE@
-SEARCH = @SEARCH@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SIZE_T = @SIZE_T@
-STATIC_EXEC = @STATIC_EXEC@
-STATIC_SHARED = @STATIC_SHARED@
-STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@
-STRIP = @STRIP@
-TESTPARALLEL = @TESTPARALLEL@
-THREADSAFE = @THREADSAFE@
-TIME = @TIME@
-TR = @TR@
-TRACE_API = @TRACE_API@
-UNAME_INFO = @UNAME_INFO@
-USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
-USE_FILTER_SZIP = @USE_FILTER_SZIP@
-USINGMEMCHECKER = @USINGMEMCHECKER@
-VERSION = @VERSION@
-WORDS_BIGENDIAN = @WORDS_BIGENDIAN@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_FC = @ac_ct_FC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-
-# Install directories that automake doesn't know about
-docdir = $(exec_prefix)/doc
-dvidir = @dvidir@
-enable_shared = @enable_shared@
-enable_static = @enable_static@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-
-# Shell commands used in Makefiles
-RM = rm -f
-CP = cp
-
-# Some machines need a command to run executables; this is that command
-# so that our tests will run.
-# We use RUNEXEC instead of RUNSERIAL directly because it may be that
-# some tests need to be run with a different command.  Older versions
-# of the makefiles used the command
-# $(LIBTOOL) --mode=execute
-# in some directories, for instance.
-RUNEXEC = $(RUNSERIAL)
-
-# Libraries to link to while building
-LIBHDF5 = $(top_builddir)/src/libhdf5.la
-LIBH5TEST = $(top_builddir)/test/libh5test.la
-LIBH5F = $(top_builddir)/fortran/src/libhdf5_fortran.la
-LIBH5FTEST = $(top_builddir)/fortran/test/libh5test_fortran.la
-LIBH5CPP = $(top_builddir)/c++/src/libhdf5_cpp.la
-LIBH5TOOLS = $(top_builddir)/tools/lib/libh5tools.la
-LIBH5_HL = $(top_builddir)/hl/src/libhdf5_hl.la
-LIBH5F_HL = $(top_builddir)/hl/fortran/src/libhdf5hl_fortran.la
-LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
-
-# Note that in svn revision 19400 the '/' after DESTDIR in H5* variables below  
-# has been removed. According to the official description of DESTDIR by Gnu at 
-# http://www.gnu.org/prep/standards/html_node/DESTDIR.html, DESTDIR is 
-# prepended to the normal and complete install path that it precedes for the 
-# purpose of installing in a temporary directory which is useful for building 
-# rpms and other packages.  The '/' after ${DESTDIR} will be followed by another 
-# '/' at the beginning of the normal install path.  When DESTDIR is empty the  
-# path then begins with '//', which is incorrect and causes problems at least for 
-# Cygwin.   
-
-# Scripts used to build examples
-# If only shared libraries have been installed, have h5cc build examples with
-# shared libraries instead of static libraries
-H5CC = ${DESTDIR}$(bindir)/h5cc
-H5CC_PP = ${DESTDIR}$(bindir)/h5pcc
-H5FC = ${DESTDIR}$(bindir)/h5fc
-H5FC_PP = ${DESTDIR}$(bindir)/h5pfc
-H5CPP = ${DESTDIR}$(bindir)/h5c++
-ACLOCAL_AMFLAGS = "-I m4"
-
-# The trace script; this is used on source files from the C library to
-# insert tracing macros.
-TRACE = perl $(top_srcdir)/bin/trace
-
-# .chkexe files are used to mark tests that have run successfully.
-# .chklog files are output from those tests.
-# *.clog and *.clog2 are from the MPE option.
-CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2
-
-# Add libtool shared library version numbers to the HDF5 library
-# See libtool versioning documentation online.
-# After making changes, run bin/reconfigure to update other configure related
-# files like Makefile.in.
-LT_VERS_INTERFACE = 6
-LT_VERS_REVISION = 206
-LT_VERS_AGE = 0
-AM_FCLIBS = $(LIBHDF5)
-
-# This is our main target, the fortran library
-lib_LTLIBRARIES = libhdf5_fortran.la
-
-# Add libtool numbers to the HDF5 Fortran library (from config/lt_vers.am)
-libhdf5_fortran_la_LDFLAGS = -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
-@BUILD_PARALLEL_CONDITIONAL_FALSE@PARALLEL_COND_SRC = HDF5.f90
-
-# Include HDF5.f90 if parallel is disabled, HDF5mpiof*  if parallel is enabled
-@BUILD_PARALLEL_CONDITIONAL_TRUE@PARALLEL_COND_SRC = H5FDmpiof.c HDF5mpio.f90 H5FDmpioff.f90
-@FORTRAN_2003_CONDITIONAL_F_FALSE@F_STATUS = _F90
-
-# Check if the compiler supports the Fortran 2003 standard
-# which should include the intrinsic module iso_c_binding
-@FORTRAN_2003_CONDITIONAL_F_TRUE@F_STATUS = _F03
-@FORTRAN_DEFAULT_REALisDBLE_F_FALSE@F_DBLE = Include
-
-#   Condition for including/excluding the DBLE interfaces for when the 
-#   default REAL is of type DOUBLE PRECISION.
-#   We do not include the double precision interfaces if the defaut REAL is
-#   DOUBLE PRECISION since this would lead to a non-unique conflict with the
-#   generic interfaces declared as REAL.
-@FORTRAN_DEFAULT_REALisDBLE_F_TRUE@F_DBLE = Exclude
-
-# Source files for the library.
-libhdf5_fortran_la_SOURCES = H5f90global.f90 \
-          H5fortran_types.f90 H5_ff$(F_STATUS).f90 H5_ff.f90 H5Aff.f90 H5Dff.f90 H5Eff.f90    \
-          H5Fff.f90 H5Gff.f90 H5Iff.f90 H5Lff.f90 H5Off.f90 H5Pff.f90 H5Rff.f90 H5Sff.f90    \
-          H5Tff.f90 H5Zff.f90                                            \
-	  H5_DBLE_Interface$(F_DBLE).f90 \
-          H5f90kit.c H5_f.c H5Af.c H5Df.c H5Ef.c H5Ff.c H5Gf.c           \
-          H5If.c H5Lf.c H5Of.c H5Pf.c H5Rf.c H5Sf.c H5Tf.c H5Zf.c        \
-	  H5Aff$(F_STATUS).f90 H5Dff$(F_STATUS).f90 H5Eff$(F_STATUS).f90 H5Fff$(F_STATUS).f90 H5Lff$(F_STATUS).f90 \
-	  H5Off$(F_STATUS).f90 H5Pff$(F_STATUS).f90 H5Rff$(F_STATUS).f90 H5Tff$(F_STATUS).f90 $(PARALLEL_COND_SRC)
-
-
-# HDF5 Fortran library depends on HDF5 Library. 
-libhdf5_fortran_la_LIBADD = $(LIBHDF5)
-
-# h5fc is generated during configure.
-# Remove it only when distclean.
-DISTCLEANFILES = h5fc
-
-# H5fortran_types.f90 and H5f90i.h are automatically generaed by
-# H5match_types, and must be cleaned explicitly.  H5fort_type_defines.h
-# is generated by H5fortran_detect
-MOSTLYCLEANFILES = H5fortran_types.f90 H5f90i_gen.h H5fort_type_defines.h \
-         H5fortran_detect.f90
-
-@BUILD_PARALLEL_CONDITIONAL_FALSE@H5FC_NAME = h5fc
-
-# Custom rule for installing h5fc, since it will be named h5pfc if hdf5
-# is configured for parallel mode
-@BUILD_PARALLEL_CONDITIONAL_TRUE@H5FC_NAME = h5pfc
-
-# Tell Automake to create H5f90i_gen.h before it builds the library
-# sources.  When it creates H5f90i_gen.h, it will create
-# H5fortran_types.f90 as a side effect.
-BUILT_SOURCES = H5f90i_gen.h
-
-# Automake knows how to build fortran programs if we tell it the source
-# files.
-H5fortran_detect_SOURCES = H5fortran_detect.f90
-@FORTRAN_HAVE_SIZEOF_FALSE@@FORTRAN_HAVE_STORAGE_SIZE_FALSE@H5test_kind_SOURCES = H5test_kind.f90
-@FORTRAN_HAVE_SIZEOF_TRUE@@FORTRAN_HAVE_STORAGE_SIZE_FALSE@H5test_kind_SOURCES = H5test_kind_SIZEOF.f90
-
-# H5test_kind.f90 is included in the distribution, and Automake knows
-# how to compile a fortran program given its sources.
-@FORTRAN_HAVE_STORAGE_SIZE_TRUE@H5test_kind_SOURCES = H5test_kind_STORAGE_SIZE.f90
-
-# Mark this directory as part of the Fortran API
-FORTRAN_API = yes
-
-# Automake needs to be taught how to build lib, progs, and tests targets.
-# These will be filled in automatically for the most part (e.g.,
-# lib_LIBRARIES are built for lib target), but EXTRA_LIB, EXTRA_PROG, and
-# EXTRA_TEST variables are supplied to allow the user to force targets to
-# be built at certain times. 
-LIB = $(lib_LIBRARIES) $(lib_LTLIBRARIES) $(noinst_LIBRARIES)                 \
-      $(noinst_LTLIBRARIES) $(check_LIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LIB)
-
-PROGS = $(bin_PROGRAMS) $(bin_SCRIPTS) $(noinst_PROGRAMS) $(noinst_SCRIPTS)   \
-        $(EXTRA_PROG)
-
-chk_TESTS = $(check_PROGRAMS) $(check_SCRIPTS) $(EXTRA_TEST) 
-TEST_EXTENSIONS = .sh
-SH_LOG_COMPILER = $(SHELL)
-AM_SH_LOG_FLAGS = 
-TEST_PROG_CHKEXE = $(TEST_PROG:=.chkexe_)
-TEST_PROG_PARA_CHKEXE = $(TEST_PROG_PARA:=.chkexe_)
-TEST_SCRIPT_CHKSH = $(TEST_SCRIPT:=.chkexe_)
-TEST_SCRIPT_PARA_CHKSH = $(TEST_SCRIPT_PARA:=.chkexe_)
-all: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .f90 .lo .log .o .obj .sh .sh$(EXEEXT) .trs
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/lt_vers.am $(top_srcdir)/config/conclude.am $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign fortran/src/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign fortran/src/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-$(top_srcdir)/config/commence.am $(top_srcdir)/config/lt_vers.am $(top_srcdir)/config/conclude.am:
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-h5fc: $(top_builddir)/config.status $(srcdir)/h5fc.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
-	}
-
-uninstall-libLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
-	done
-
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; \
-	locs=`for p in $$list; do echo $$p; done | \
-	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
-	      sort -u`; \
-	test -z "$$locs" || { \
-	  echo rm -f $${locs}; \
-	  rm -f $${locs}; \
-	}
-
-libhdf5_fortran.la: $(libhdf5_fortran_la_OBJECTS) $(libhdf5_fortran_la_DEPENDENCIES) $(EXTRA_libhdf5_fortran_la_DEPENDENCIES) 
-	$(AM_V_FCLD)$(libhdf5_fortran_la_LINK) -rpath $(libdir) $(libhdf5_fortran_la_OBJECTS) $(libhdf5_fortran_la_LIBADD) $(LIBS)
-
-clean-noinstPROGRAMS:
-	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-
-H5fortran_detect$(EXEEXT): $(H5fortran_detect_OBJECTS) $(H5fortran_detect_DEPENDENCIES) $(EXTRA_H5fortran_detect_DEPENDENCIES) 
-	@rm -f H5fortran_detect$(EXEEXT)
-	$(AM_V_FCLD)$(FCLINK) $(H5fortran_detect_OBJECTS) $(H5fortran_detect_LDADD) $(LIBS)
-
-H5match_types$(EXEEXT): $(H5match_types_OBJECTS) $(H5match_types_DEPENDENCIES) $(EXTRA_H5match_types_DEPENDENCIES) 
-	@rm -f H5match_types$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(H5match_types_OBJECTS) $(H5match_types_LDADD) $(LIBS)
-
-H5test_kind$(EXEEXT): $(H5test_kind_OBJECTS) $(H5test_kind_DEPENDENCIES) $(EXTRA_H5test_kind_DEPENDENCIES) 
-	@rm -f H5test_kind$(EXEEXT)
-	$(AM_V_FCLD)$(FCLINK) $(H5test_kind_OBJECTS) $(H5test_kind_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Af.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Df.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Ef.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FDmpiof.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Ff.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Gf.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5If.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Lf.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Of.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Pf.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Rf.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Sf.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Tf.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Zf.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5_f.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5f90kit.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5match_types.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
-
-.f90.o:
-	$(AM_V_FC)$(FCCOMPILE) -c -o $@ $(FCFLAGS_f90) $<
-
-.f90.obj:
-	$(AM_V_FC)$(FCCOMPILE) -c -o $@ $(FCFLAGS_f90) `$(CYGPATH_W) '$<'`
-
-.f90.lo:
-	$(AM_V_FC)$(LTFCCOMPILE) -c -o $@ $(FCFLAGS_f90) $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: ctags-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-# Recover from deleted '.trs' file; this should ensure that
-# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
-# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
-# to avoid problems with "make -n".
-.log.trs:
-	rm -f $< $@
-	$(MAKE) $(AM_MAKEFLAGS) $<
-
-# Leading 'am--fnord' is there to ensure the list of targets does not
-# expand to empty, as could happen e.g. with make check TESTS=''.
-am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
-am--force-recheck:
-	@:
-
-$(TEST_SUITE_LOG): $(TEST_LOGS)
-	@$(am__set_TESTS_bases); \
-	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
-	redo_bases=`for i in $$bases; do \
-	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
-	            done`; \
-	if test -n "$$redo_bases"; then \
-	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
-	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
-	  if $(am__make_dryrun); then :; else \
-	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
-	  fi; \
-	fi; \
-	if test -n "$$am__remaking_logs"; then \
-	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
-	       "recursion detected" >&2; \
-	else \
-	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
-	fi; \
-	if $(am__make_dryrun); then :; else \
-	  st=0;  \
-	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
-	  for i in $$redo_bases; do \
-	    test -f $$i.trs && test -r $$i.trs \
-	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
-	    test -f $$i.log && test -r $$i.log \
-	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
-	  done; \
-	  test $$st -eq 0 || exit 1; \
-	fi
-	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
-	ws='[ 	]'; \
-	results=`for b in $$bases; do echo $$b.trs; done`; \
-	test -n "$$results" || results=/dev/null; \
-	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
-	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
-	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
-	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
-	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
-	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
-	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
-	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
-	  success=true; \
-	else \
-	  success=false; \
-	fi; \
-	br='==================='; br=$$br$$br$$br$$br; \
-	result_count () \
-	{ \
-	    if test x"$$1" = x"--maybe-color"; then \
-	      maybe_colorize=yes; \
-	    elif test x"$$1" = x"--no-color"; then \
-	      maybe_colorize=no; \
-	    else \
-	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
-	    fi; \
-	    shift; \
-	    desc=$$1 count=$$2; \
-	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
-	      color_start=$$3 color_end=$$std; \
-	    else \
-	      color_start= color_end=; \
-	    fi; \
-	    echo "$${color_start}# $$desc $$count$${color_end}"; \
-	}; \
-	create_testsuite_report () \
-	{ \
-	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
-	  result_count $$1 "PASS: " $$pass  "$$grn"; \
-	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
-	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
-	  result_count $$1 "FAIL: " $$fail  "$$red"; \
-	  result_count $$1 "XPASS:" $$xpass "$$red"; \
-	  result_count $$1 "ERROR:" $$error "$$mgn"; \
-	}; \
-	{								\
-	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
-	    $(am__rst_title);						\
-	  create_testsuite_report --no-color;				\
-	  echo;								\
-	  echo ".. contents:: :depth: 2";				\
-	  echo;								\
-	  for b in $$bases; do echo $$b; done				\
-	    | $(am__create_global_log);					\
-	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
-	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
-	if $$success; then						\
-	  col="$$grn";							\
-	 else								\
-	  col="$$red";							\
-	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
-	fi;								\
-	echo "$${col}$$br$${std}"; 					\
-	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
-	echo "$${col}$$br$${std}"; 					\
-	create_testsuite_report --maybe-color;				\
-	echo "$$col$$br$$std";						\
-	if $$success; then :; else					\
-	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
-	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
-	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
-	  fi;								\
-	  echo "$$col$$br$$std";					\
-	fi;								\
-	$$success || exit 1
-recheck: all 
-	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-	@set +e; $(am__set_TESTS_bases); \
-	bases=`for i in $$bases; do echo $$i; done \
-	         | $(am__list_recheck_tests)` || exit 1; \
-	log_list=`for i in $$bases; do echo $$i.log; done`; \
-	log_list=`echo $$log_list`; \
-	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
-	        am__force_recheck=am--force-recheck \
-	        TEST_LOGS="$$log_list"; \
-	exit $$?
-.sh.log:
-	@p='$<'; \
-	$(am__set_b); \
-	$(am__check_pre) $(SH_LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_SH_LOG_DRIVER_FLAGS) $(SH_LOG_DRIVER_FLAGS) -- $(SH_LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-@am__EXEEXT_TRUE@.sh$(EXEEXT).log:
-@am__EXEEXT_TRUE@	@p='$<'; \
-@am__EXEEXT_TRUE@	$(am__set_b); \
-@am__EXEEXT_TRUE@	$(am__check_pre) $(SH_LOG_DRIVER) --test-name "$$f" \
-@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
-@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_SH_LOG_DRIVER_FLAGS) $(SH_LOG_DRIVER_FLAGS) -- $(SH_LOG_COMPILE) \
-@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
-check: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) check-am
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) all-local
-installdirs:
-	for dir in "$(DESTDIR)$(libdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
-	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
-	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
-	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-clean: clean-am
-
-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool clean-local \
-	clean-noinstPROGRAMS mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-local distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-data-local
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-exec-local install-libLTLIBRARIES
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic \
-	maintainer-clean-local
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-local
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-libLTLIBRARIES uninstall-local
-
-.MAKE: all check check-am install install-am install-strip
-
-.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-TESTS \
-	check-am clean clean-generic clean-libLTLIBRARIES \
-	clean-libtool clean-local clean-noinstPROGRAMS cscopelist-am \
-	ctags ctags-am distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-local distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-data-local install-dvi \
-	install-dvi-am install-exec install-exec-am install-exec-local \
-	install-html install-html-am install-info install-info-am \
-	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic maintainer-clean-local mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	mostlyclean-local pdf pdf-am ps ps-am recheck tags tags-am \
-	uninstall uninstall-am uninstall-libLTLIBRARIES \
-	uninstall-local
-
-
-# List all build rules defined by HDF5 Makefiles as "PHONY" targets here.
-# This tells the Makefiles that these targets are not files to be built but
-# commands that should be executed even if a file with the same name already
-# exists.
-.PHONY: build-check-clean build-check-p build-check-s build-lib build-progs \
-        build-tests check-clean check-install check-p check-s check-vfd \
-        install-doc lib progs tests uninstall-doc _exec_check-s _test help
-
-help:
-	@$(top_srcdir)/bin/makehelp
-
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-
-# Fortran module files can have different extensions and different names
-# (e.g., different capitalizations) on different platforms.  Write rules
-# for them explicitly rather than trying to teach automake about them.
-# They should be installed as headers and removed during clean.
-maintainer-clean-local: clean-local
-distclean-local: clean-local
-clean-local:
-	@if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \
-	  $(RM) *.$(F9XMODEXT);                                         \
-	fi
-
-install-data-local:
-	@if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \
-	  $(CP) $(top_builddir)/$(subdir)/*.$(F9XMODEXT) $(DESTDIR)$(includedir)/. ; \
-	fi
-	$(CP) $(top_builddir)/$(subdir)/H5f90i_gen.h $(DESTDIR)$(includedir)/.
-	$(CP) $(top_srcdir)/fortran/src/H5f90i.h $(DESTDIR)$(includedir)/.
-
-uninstall-local:
-	@if test -n "$(F9XMODEXT)" -a "X$(F9XMODEXT)" != "Xo"; then      \
-	  if test -f "$(includedir)/hdf5.$(F9XMODEXT)" -o -f "$(includedir)/HDF5.$(F9XMODEXT)"; then \
-	    set -x; $(RM) $(DESTDIR)$(includedir)/*.$(F9XMODEXT);                 \
-	  fi;                                                           \
-	fi;								\
-	$(RM) $(DESTDIR)$(bindir)/$(H5FC_NAME)
-	$(RM) $(DESTDIR)$(includedir)/H5f90i*.h
-
-# Also install and uninstall (uninstall-local above) h5fc script
-install-exec-local:
-	@$(INSTALL) h5fc $(DESTDIR)$(bindir)/$(H5FC_NAME)
-
-#Specify what Automake needs to create: first the H5fort_type_defines.h
-# header, then H5match_types which includes that header, then
-# it needs to run H5match_types.
-H5fortran_types.f90 H5f90i_gen.h: H5match_types$(EXEEXT)
-	$(RUNSERIAL) ./H5match_types$(EXEEXT)
-
-# H5fort_type_defines.h is created by running H5fortran_detect.
-# Obviously, H5fortran_detect needs to be built first.
-H5fort_type_defines.h: H5fortran_detect$(EXEEXT)
-	$(RUNSERIAL) ./H5fortran_detect$(EXEEXT) > H5fort_type_defines.h
-
-H5match_types.$(OBJEXT): H5fort_type_defines.h
-
-# H5test_kind.f90 generates H5Fortran_detect.f90 depending on if 
-# intrinsic function SIZEOF is available.
-
-H5fortran_detect.f90: H5test_kind$(EXEEXT)
-	$(RUNSERIAL) ./H5test_kind$(EXEEXT) > H5fortran_detect.f90
-
-# Hardcode the dependencies of these files. There isn't a known way of
-# determining this automagically (like we do with the C files). So, when
-# doing a parallel make, some modules could be made way before the
-# modules they depend upon are actually made. *sigh*
-H5f90global.lo:      $(srcdir)/H5f90global.f90 H5fortran_types.lo
-H5fortran_types.lo:  H5fortran_types.f90
-H5fortran_detect.lo: H5fortran_detect.f90
-H5test_kind.lo:      $(srcdir)/H5test_kind.f90
-H5test_kind_SIZEOF.lo: $(srcdir)/H5test_kind_SIZEOF.f90
-H5_ff$(F_STATUS).lo: $(srcdir)/H5_ff$(F_STATUS).f90 H5f90global.lo
-H5_ff.lo:            $(srcdir)/H5_ff.f90 H5f90global.lo H5_ff$(F_STATUS).lo
-H5Aff.lo:            $(srcdir)/H5Aff.f90 H5f90global.lo
-H5Dff.lo:            $(srcdir)/H5Dff.f90 H5f90global.lo
-H5Aff$(F_STATUS).lo:  $(srcdir)/H5Aff$(F_STATUS).f90 H5f90global.lo
-H5Dff$(F_STATUS).lo:  $(srcdir)/H5Dff$(F_STATUS).f90 H5f90global.lo
-H5Eff$(F_STATUS).lo:  $(srcdir)/H5Eff$(F_STATUS).f90 H5f90global.lo
-H5Fff$(F_STATUS).lo:  $(srcdir)/H5Fff$(F_STATUS).f90 H5f90global.lo
-H5Lff$(F_STATUS).lo:  $(srcdir)/H5Lff$(F_STATUS).f90 H5f90global.lo
-H5Off$(F_STATUS).lo:  $(srcdir)/H5Off$(F_STATUS).f90 H5f90global.lo
-H5Pff$(F_STATUS).lo:  $(srcdir)/H5Pff$(F_STATUS).f90 H5f90global.lo
-H5Rff$(F_STATUS).lo:  $(srcdir)/H5Rff$(F_STATUS).f90 H5f90global.lo
-H5Tff$(F_STATUS).lo:  $(srcdir)/H5Tff$(F_STATUS).f90 H5f90global.lo
-H5Eff.lo:            $(srcdir)/H5Eff.f90 H5f90global.lo
-H5Fff.lo:            $(srcdir)/H5Fff.f90 H5f90global.lo
-H5Gff.lo:            $(srcdir)/H5Gff.f90 H5f90global.lo
-H5Iff.lo:            $(srcdir)/H5Iff.f90 H5f90global.lo
-H5Lff.lo:            $(srcdir)/H5Lff.f90 H5f90global.lo
-H5Off.lo:            $(srcdir)/H5Off.f90 H5f90global.lo
-H5Pff.lo:            $(srcdir)/H5Pff.f90 H5f90global.lo
-H5Rff.lo:            $(srcdir)/H5Rff.f90 H5f90global.lo
-H5Sff.lo:            $(srcdir)/H5Sff.f90 H5f90global.lo
-H5Tff.lo:            $(srcdir)/H5Tff.f90 H5f90global.lo
-H5Zff.lo:            $(srcdir)/H5Zff.f90 H5f90global.lo
-H5_DBLE_Interface$(F_DBLE).lo:  $(srcdir)/H5_DBLE_Interface$(F_DBLE).f90 H5Aff$(F_STATUS).lo H5Dff$(F_STATUS).lo H5Fff$(F_STATUS).lo H5Eff$(F_STATUS).lo H5Pff$(F_STATUS).lo
-HDF5.lo:             $(srcdir)/HDF5.f90 H5f90global.lo H5_ff$(F_STATUS).lo H5_ff.lo H5Aff.lo H5Aff$(F_STATUS).lo \
-                     H5Dff.lo H5Dff$(F_STATUS).lo  \
-                     H5Eff.lo H5Eff$(F_STATUS).lo \
-		     H5Fff.lo H5Fff$(F_STATUS).lo H5Gff.lo H5Iff.lo H5Lff.lo H5Lff$(F_STATUS).lo \
-	             H5Off.lo H5Off$(F_STATUS).lo H5Pff.lo H5Pff$(F_STATUS).lo H5Rff$(F_STATUS).lo H5Rff.lo \
-                     H5Sff.lo H5Tff.lo H5Tff$(F_STATUS).lo H5Zff.lo \
-                     H5_DBLE_Interface$(F_DBLE).lo 
-H5FDmpioff.lo:       $(srcdir)/H5FDmpioff.f90 H5f90global.lo
-HDF5mpio.lo:         $(srcdir)/H5FDmpioff.f90 H5f90global.lo H5_ff$(F_STATUS).lo H5_ff.lo \
-		     H5Aff.lo H5Aff$(F_STATUS).lo \
-                     H5Dff.lo H5Dff$(F_STATUS).lo \
-		     H5Eff.lo H5Eff$(F_STATUS).lo \
-                     H5Fff.lo H5Fff$(F_STATUS).lo H5Gff.lo H5Iff.lo H5Lff.lo H5Lff$(F_STATUS).lo \
-		     H5Off.lo H5Off$(F_STATUS).lo H5Pff.lo H5Pff$(F_STATUS).lo H5Rff$(F_STATUS).lo H5Rff.lo \
-                     H5Sff.lo H5Tff.lo H5Tff$(F_STATUS).lo H5Zff.lo \
-	             H5_DBLE_Interface$(F_DBLE).lo H5FDmpioff.lo
-
-# lib/progs/tests targets recurse into subdirectories. build-* targets
-# build files in this directory.
-build-lib: $(LIB)
-build-progs: $(LIB) $(PROGS)
-build-tests: $(LIB) $(PROGS) $(chk_TESTS)
-
-# General rule for recursive building targets.
-# BUILT_SOURCES contain targets that need to be built before anything else
-# in the directory (e.g., for Fortran type detection)
-lib progs tests check-s check-p :: $(BUILT_SOURCES)
-	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
-	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X && test $$d != .; then                           \
-	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
-	    fi;                                                               \
-	done
-
-# General rule for recursive cleaning targets.  Like the rule above,
-# but doesn't require building BUILT_SOURCES.
-check-clean ::
-	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
-	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X && test $$d != .; then                           \
-	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
-	    fi;                                                               \
-	done
-
-# Tell Automake to build tests when the user types `make all' (this is
-# not its default behavior).  Also build EXTRA_LIB and EXTRA_PROG since
-# Automake won't build them automatically, either.
-all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(chk_TESTS)
-
-# make install-doc doesn't do anything outside of doc directory, but
-# Makefiles should recognize it.
-# UPDATE: docs no longer reside in this build tree, so this target
-# is depreciated.
-install-doc uninstall-doc:
-	@echo "Nothing to be done."
-
-# clean up files generated by tests so they can be re-run.
-build-check-clean:
-	$(RM) -rf $(CHECK_CLEANFILES)
-
-# run check-clean whenever mostlyclean is run
-mostlyclean-local: build-check-clean
-
-# check-install is just a synonym for installcheck
-check-install: installcheck
-
-# Run each test in order, passing $(TEST_FLAGS) to the program.
-# Since tests are done in a shell loop, "make -i" does apply inside it.
-# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
-# The timestamps give a rough idea how much time the tests use.
-#
-# Note that targets in chk_TESTS (defined above) will be built when the user
-# types 'make tests' or 'make check', but only programs in TEST_PROG,
-# TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
-check-TESTS: test
-
-test _test:
-	@$(MAKE) build-check-s
-	@$(MAKE) build-check-p
-
-# Actual execution of check-s.
-build-check-s: $(LIB) $(PROGS) $(chk_TESTS)
-	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
-	   echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
-	fi
-	@$(MAKE) $(AM_MAKEFLAGS) _exec_check-s
-	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
-	    echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
-	fi
-
-_exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH)
-
-# The dummy.chkexe here prevents the target from being
-# empty if there are no tests in the current directory.
-# $${log} is the log file.
-# $${tname} is the name of test.
-$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
-	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \
-	   tname=$(@:.chkexe_=)$(EXEEXT);\
-	   log=$(@:.chkexe_=.chklog); \
-	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \
-	      echo "No need to test $${tname} again."; \
-	   else \
-	      echo "============================" > $${log}; \
-	      if test "X$(FORTRAN_API)" = "Xyes"; then \
-	         echo "Fortran API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "Fortran API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(CXX_API)" = "Xyes"; then \
-	         echo "C++ API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "C++ API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log};\
-	      else \
-	         echo "Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "$(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      fi; \
-	      echo "============================" >> $${log}; \
-	      srcdir="$(srcdir)" \
-	         $(TIME) $(RUNEXEC) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \
-	         && touch $(@:.chkexe_=.chkexe) || \
-	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	         (cat $${log} && false) || exit 1; \
-	      echo "" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
-	      echo "============================" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
-	      cat $${log}; \
-	   fi; \
-	fi
-
-# The dummysh.chkexe here prevents the target from being
-# empty if there are no tests in the current directory.
-# $${log} is the log file.
-# $${tname} is the name of test.
-$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
-	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummysh.chkexe_"; then \
-	   cmd=$(@:.chkexe_=);\
-	   tname=`basename $$cmd`;\
-	   chkname=`basename $(@:.chkexe_=.chkexe)`;\
-	   log=`basename $(@:.chkexe_=.chklog)`; \
-	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer $${chkname} $$cmd $(SCRIPT_DEPEND); then \
-	      echo "No need to test $${tname} again."; \
-	   else \
-	      echo "============================" > $${log}; \
-	      if test "X$(FORTRAN_API)" = "Xyes"; then \
-	         echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(CXX_API)" = "Xyes"; then \
-	         echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      else \
-	         echo "Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      fi; \
-	      echo "============================" >> $${log}; \
-	      RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
-	      srcdir="$(srcdir)" \
-	         $(TIME) $(SHELL) $$cmd $(TEST_FLAGS) >> $${log} 2>&1 \
-	         && touch $${chkname} || \
-	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	         (cat $${log} && false) || exit 1; \
-	      echo "" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
-	      echo "============================" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
-	      cat $${log}; \
-	   fi; \
-	   echo "============================"; \
-	fi
-
-# Actual execution of check-p.
-build-check-p: $(LIB) $(PROGS) $(chk_TESTS)
-	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
-	   echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
-	fi
-	@if test -n "$(TEST_PROG_PARA)"; then                                \
-	    echo "**** Hint ****";                                            \
-	    echo "Parallel test files reside in the current directory"        \
-	         "by default.";                                               \
-	    echo "Set HDF5_PARAPREFIX to use another directory. E.g.,";       \
-	    echo "    HDF5_PARAPREFIX=/PFS/user/me";                          \
-	    echo "    export HDF5_PARAPREFIX";                                \
-	    echo "    make check";                                            \
-	    echo "**** end of Hint ****";                                     \
-	fi
-	@for test in $(TEST_PROG_PARA) dummy; do                             \
-	   if test $$test != dummy; then                                      \
-	      $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ \
-	      RUNEXEC="$(RUNPARALLEL)" || exit 1; \
-	   fi;                                                                \
-	done
-	@for test in $(TEST_SCRIPT_PARA) dummy; do                           \
-	  if test $$test != dummy; then                                      \
-	    $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ || exit 1; \
-	  fi;                                                                 \
-	done
-	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
-	    echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
-	fi
-
-# Run test with different Virtual File Driver
-check-vfd: $(LIB) $(PROGS) $(chk_TESTS)
-	@for vfd in $(VFD_LIST) dummy; do                                     \
-	    if test $$vfd != dummy; then                                      \
-	        echo "============================";                          \
-	        echo "Testing Virtual File Driver $$vfd";                     \
-	        echo "============================";                          \
-	        $(MAKE) $(AM_MAKEFLAGS) check-clean || exit 1;                \
-	        HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check || exit 1;    \
-	    fi;                                                               \
-	done
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/fortran/src/README b/fortran/src/README
index 7af5df3..f9316b5 100644
--- a/fortran/src/README
+++ b/fortran/src/README
@@ -1,122 +1,18 @@
+===================================
+README for the Fortran APIs to HDF5
+===================================
 
-          README for the FORTRAN90 Prototype APIs to HDF5
-
-
-This distribution contains the HDF5 FORTRAN90 APIs source code (prototype) 
-based on the HDF5 1.2.2 release (ftp://ftp.ncsa.uiuc.edu/HDF/HDF5/current), 
-tests and examples.
-
-This prototype supports a selected subset of the HDF5 Library functionality. 
-A complete list of the Fortran subroutines can be found in the HDF5 
-Reference Manual provided with this release.
-Check the online documentation at http://hdf.ncsa.uiuc.edu/HDF5/doc (select 
-the "HDF5 Fortran90 Docs" link at the bottom of the left-hand column) or 
-H5_F90.R1.2.2.RefMan.tar at ftp://hdf.ncsa.uiuc.edu/HDF5/fortran .
-
-Changes since last release (October 1999)
-=========================================
-* Support for Linux 
-* Support for parallel features (tested on O2K platform only)
-* Most of the functions from the H5R, H5P, H5T, H5E and H5I interfaces were 
-  implemented. See Reference Manual for complete list. The new functions  
-  include support for object and dataset region references, and for 
-  compound datatypes.
-* This prototype supports more predefined types. See list below in 
-  the "About the Fortran APIs" section.
-* This prototype supports T3E and T3E with mpt 1.3. One has to modify
-  H5Dff.f90, H5Aff.f90, H5Pff.f90 to comment lines with the module procedures for
-  double precision datatypes. See source code.
-
-Supported platforms
-===================
-The FORTRAN90 APIs provided here are known to work with the
-following platforms and compilers:
-
-     *  SunOS 5.6  with  WorkshopCompilers 4.2 Fortran 90 1.2
-     *  SunOS 5.7  with  WorkshopCompilers 5.0 Fortran 90 2.0 
-     *  OSF1 V4.0  with  Digital Fortran 90 4.1 
-     *  Linux RedHat 6.1, Kernel 2.2.12 with PGF90
-     *  T3E with Cray Fortran: Version 3.4.0.0
-            with mpt 1.3
-
-Compilation
-===========
-
-1. Install HDF5 Release 1.2.2 on your system
-   (ftp://ftp.ncsa.uiuc.edu/HDF/HDF5/current).  If you are using a
-   binary distribution provided by the HDF group, make sure that a GZIP 
-   library is installed on your system. If you do not have a GZIP library,
-   you may copy it from the HDF FTP server.
-
-2. In the src directory copy H5fortran_types.f90_<system> to 
-   H5fortran_types.f90, where <system> is one of the following:
-
-     solaris
-     digunix
-     linux
-
-   Example: On Digital Unix systems use the following command
-            cp H5fortran_types.f90_digunix H5fortran_types.f90
-
-3. Edit Makefile_<system >in the src/, test/ and examples/ directories
-   to specify the locations of the HDF5 C Library, the GZIP Library, and the 
-   corresponding include files on your system.
-
-4. In the src directory, run make to create the HDF5 FORTRAN90 library 
-   hdf5_fortran.a
-             make -f Makefile_<system>
-             
-   Example: On Solaris run
-            make -f Makefile_solaris
-
-   The Fortran library hdf5_fortran.a will be created.
-
-5. In the test directory, build tests by running  
-            make -f Makefile_<system>
-   This command will build fortranlib_test, fflush1 and fflush2 executables.
-   Run those executables to make sure that the library works on your system.
-
-6. In the examples directory, run
-            make -f Makefile_<system>
-   to build the following examples:
-   
-   fileexample       - creates an HDF5 file
-   dsetexample       - creates an empty dataset of integers
-   rwdsetexample     - writes and reads to the dataset created by dsetexample
-   groupexample      - creates a group in the file
-   grpsexample       - creates groups using absolute and relative names
-   grpdsetexample    - creates datasets in the groups
-   hyperslabexample  - writes and reads a hyperslab
-   selectele         - writes element selections
-   attrexample       - creates and writes a dataset attribute
-   compound          - creates, writes and reads one dim array of structures
-   mountexample      - shows how to use mounting files to access a dataset
-   refobjexample     - creates and stores references to the objects
-   refregexample     - creates and stores references to the dataset regions
-
-   The script run_example.sh runs the examples in the appropriate order. 
-
-   Use the HDF5 utility, h5dump, to see the content of the created HDF5 files.
-
-7. Install the HDF5 Reference Manual (in HTML format).  The manual
-   can be found in the Unix tar file H5_F90.R1.2.2.RefMan.tar
-   on the ftp server and is served over the Web from
-   http://hdf.ncsa.uiuc.edu/HDF5/doc/ (select the "HDF5 Fortran90 Docs" 
-   link at the bottom of the left-hand column).
-
-
-8. Send bug reports and comments to hdfhelp@ncsa.uiuc.edu
-
-User's Guide Notes
-+++++++++++++++++++
+This directory contains Fortran APIs for HDF5 Library functionality.
+A complete list of implemented Fortran subroutines can be found in the HDF5 
+Reference Manual.
 
 About the source code organization
 ==================================
 
 The Fortran APIs are organized in modules parallel to the HDF5 Interfaces.
-Each module is in a separate file with the name H5*ff.f.  Corresponding C
+Each module is in a separate file with the name H5*ff.F90.  Corresponding C
 stubs are in the H5*f.c files.  For example, the Fortran File APIs are in 
-the file H5Fff.f and the corresponding C stubs are in the file H5Ff.c. 
+the file H5Fff.F90 and the corresponding C stubs are in the file H5Ff.c. 
 
 Each module contains Fortran definitions of the constants, interfaces to 
 the subroutines if needed, and the subroutines themselves.  
@@ -124,31 +20,29 @@ the subroutines if needed, and the subroutines themselves.
 Users must use constant names in their programs instead of the numerical 
 values, as the numerical values are subject to change without notice. 
 
-About the Fortran APIs 
-=======================
+Quick overview of the Fortran APIs 
+==============================================
+ 
+*  An in-depth description of each Fortran API and its parameters can 
+   be found in the HDF5 Reference Manual.
 
 *  The Fortran APIs come in the form of Fortran subroutines.
 
 *  Each Fortran subroutine name is derived from the corresponding C function
    name by adding "_f" to the name.  For example, the name of the C function 
    to create an HDF5 file is H5Fcreate;  the corresponding Fortran subroutine 
-   is h5fcreate_f. 
+   is h5fcreate_f.
 
-*  A description of each Fortran subroutine and its parameters can be found 
-   following the description of the corresponding C function in the 
-   Reference Manual provided with this release.  The manual can be found in 
-   the Unix tar file H5_F90.R1.2.2.tar in this directory and
-   is served over the Web from http://hdf.ncsa.uiuc.edu/HDF5/doc/ (select 
-   the "HDF5 Fortran90 Docs" link at the bottom of the left-hand column).
-
-*  The parameter list for each Fortran subroutine has two more parameters
-   than the corresponding C function.  These additional parameters hold 
+*  The parameter list for each Fortran subroutine usually has two more parameters
+   than the corresponding C function.  These additional parameters typically hold 
    the return value and an error code.  The order of the Fortran subroutine 
-   parameters may differ from the order of the C function parameters. 
-   The Fortran subroutine parameters are listed in the following order: 
+   parameters may differ from the order of the C function parameters.
+ 
+   The Fortran subroutine parameters are usually listed in the following order: 
       -- required input parameters,
       -- output parameters, including return value and error code, and 
-      -- optional input parameters.
+         optional input parameters.
+
    For example, the C function to create a dataset has the following 
    prototype:
 
@@ -158,81 +52,83 @@ About the Fortran APIs
    
    The corresponding Fortran subroutine has the following form:
    
-       SUBROUTINE h5dcreate_f(loc_id, name, type_id, space_id, dset_id, 
-             hdferr, creation_prp)
-  
+       SUBROUTINE h5dcreate_f(loc_id, name, type_id, space_id, dset_id, &
+       hdferr, dset_creation_prp, link_creation_prp, dset_access_prop)
+
    The first four parameters of the Fortran subroutine correspond to the 
    C function parameters.  The fifth parameter dset_id is an output 
    parameter and contains a valid dataset identifier if the value of the 
-   sixth output parameter hdferr indicates successful completion. 
+   sixth output parameter, hdferr, indicates successful completion. 
    (Error code descriptions are provided with the subroutine descriptions 
-   in the Reference Manual.)  The seventh input parameter creation_prp 
-   is optional, and may be omitted when the default creation property 
-   list is used.
-   (XXX: Update this! - QAK)
-
-*  Parameters to the Fortran subroutines have one of the following 
-   predefined datatypes (see the file H5fortran_types.f90 for KIND 
-   definitions):
+   in the Reference Manual.)  The last three input parameters are optional 
+   and may be omitted, resulting in default values being used.
+
+*  Parameters to the Fortran subroutines typically include 
+   predefined datatypes (see the build-time generated file 
+   H5fortran_types.F90 for a complete listing):
    
         INTEGER(HID_T)      compares with hid_t type in HDF5 C APIs
         INTEGER(HSIZE_T)    compares with hsize_t in HDF5 C APIs
         INTEGER(HSSIZE_T)   compares with hssize_t in HDF5 C APIs
         INTEGER(SIZE_T)     compares with the C size_t type
+
    These integer types usually correspond to 4 or 8 byte integers, 
-   depending on the FORTRAN90 compiler and corresponding HDF5 
+   depending on the Fortran compiler and corresponding HDF5 
    C library definitions.
    
-   The H5R module defines two types: 
-        TYPE(HOBJ_REF_T_F)  compares to the hobj_ref_t in HDF5 C API
-        TYPE(HDSET_REG_REF_T_F) compares to hdset_reg_ref_t in HDF5 C API
-   These types are represented by character arrays now. 
-   The internal representation can be changed in the future.
-
-*  Each Fortran application must call the h5init_types subroutine to 
+*  Each Fortran application must call the h5open_f subroutine to 
    initialize the Fortran predefined datatypes before calling the HDF5 Fortran 
-   subroutines.  The application must call the h5close_types subroutine 
-   after all calls to the HDF5 Fortran Library. 
-
-*  The following predefined types are implemented in this prototype: 
-
-                                H5T_NATIVE_INTEGER
-                                H5T_NATIVE_REAL
-                                H5T_NATIVE_DOUBLE
-                                H5T_NATIVE_CHARACTER
-                                H5T_STD_REF_OBJ
-                                H5T_STD_REF_DSETREG
-                                H5T_IEEE_F32BE
-                                H5T_IEEE_F32LE
-                                H5T_IEEE_F64BE
-                                H5T_IEEE_F64LE
-                                H5T_STD_I8BE
-                                H5T_STD_I8LE
-                                H5T_STD_I16BE
-                                H5T_STD_I16LE
-                                H5T_STD_I32BE
-                                H5T_STD_I32LE
-                                H5T_STD_I64BE
-                                H5T_STD_I64LE
-                                H5T_STD_U8BE
-                                H5T_STD_U8LE
-                                H5T_STD_U16BE
-                                H5T_STD_U16LE
-                                H5T_STD_U32BE
-                                H5T_STD_U32LE
-                                H5T_STD_U64BE
-                                H5T_STD_U64LE
-                                
-    
+   subroutines.  The application should call the h5close_f subroutine 
+   after all calls to the HDF5 Fortran Library.
+
 *  When a C application reads data stored from a Fortran program, the data 
    will appear to be transposed due to the difference in the C - Fortran 
    storage order.  For example, if Fortran writes a 4x6 two-dimensional dataset 
    to the file, a C program will read it as a 6x4 two-dimensional dataset into 
    memory.  The HDF5 C utilities h5dump and h5ls display transposed data, if
    data is written from a Fortran program.
- 
+
 *  Fortran indices are 1 based.
 
-*  Compound datatype datasets can be written or read by atomic fields only.
+============================
+FOR DEVELOPERS
+============================
+
+Procedure to add a new function
+----------------------------------
+
+(1) Edit the fortran/src/H5*ff.F90 file
+(2) Edit the fortran/src/H5*f.c file
+(3) Edit the fortran/src/H5f90proto.h file
+(4) Add the new function to fortran/src/hdf5_fortrandll.def.in
+
+Procedure for passing C variables to Fortran
+---------------------------------------------
+
+(1) Find the C struct name you are interested in:
+	(a) src/H5public.h if it is a generic type, i.e. H5_*
+            or
+        (b) src/H5*public.h if is a specific type, i.e. H5*_
+
+(2) Put that structure into an array that will be passed to fortran in:
+        (a) fortran/src/H5_f.c (add to nh5init_flags_c subroutine)
+        (b) edit fortran/src/H5f90proto.h and edit nh5init_flags_c interface call
+
+(3) Edit the function call in fortran/src/H5_ff.F90
+        (a) edit the call:  FUNCTION h5init_flags_c
+        (b) edit h5init_flags_c call in h5open_f to match the number of arguments passing
+
+(4) add the size of the array and array to fortran/src/H5f90global.F90
+         - must match the size found it H5_f.c
+
+NOTE: To just add a default C value argument, do steps (2a) and (4)
+
+
+Procedure for adding a new file to the repository
+--------------------------------------------------
+
+Add the name of the file to the:
+    (1) Makefile.am located in the same directory as the newfile
+    (2) CMakeLists.txt located in the same directory as the newfile
+    (3) MANIFEST located in the top level directory
 
-Not all of the APIs provided with this prototype have been fully tested. 
diff --git a/fortran/src/README_DEVELOPEMENT b/fortran/src/README_DEVELOPEMENT
deleted file mode 100644
index 43982e1..0000000
--- a/fortran/src/README_DEVELOPEMENT
+++ /dev/null
@@ -1,38 +0,0 @@
-Procedure to add a new function
----------------------------------
-
-(1) Edit the fortran/src/H5*ff.f90 file
-(2) Edit the fortran/src/H5*f.c file
-(3) Edit the fortran/src/H5f90proto.h file
-(4) Add the new function to fortran/src/hdf5_fortrandll.def.in
-
-Procedure for passing C variables to Fortran
----------------------------------------------
-
-(1) Find the C struct name you are interested in: 
-	(a) src/H5public.h if it is a generic type, i.e. H5_*
-            or
-        (b) src/H5*public.h if is a specific type, i.e. H5*_ 
-                            
-(2) Put that structure into an array that will be passed to fortran in:
-        (a) fortran/src/H5_f.c (add to nh5init_flags_c subroutine)
-        (b) edit fortran/src/H5f90proto.h and edit nh5init_flags_c interface call
-                         
-(3) Edit the function call in fortran/src/H5_ff.f90
-        (a) edit the call:  FUNCTION h5init_flags_c 
-        (b) edit h5init_flags_c call in h5open_f to match the number of arguments passing
-                             
-(4) add the size of the array and array to fortran/src/H5f90global.f90 
-         - must match the size found it H5_f.c
-
-NOTE: To just add a default C value argument, do steps (2a) and (4) 
-
-
-Procedure for adding a new file to the repository
---------------------------------------------------
-
-Add the name of the file to the: 
-    (1) Makefile.am located in the same directory as the newfile
-    (2) CMakeLists.txt located in the same directory as the newfile
-    (3) MANIFEST located in the top level directory
-
diff --git a/fortran/src/h5fc.in b/fortran/src/h5fc.in
index 6e2c9d3..b793648 100644
--- a/fortran/src/h5fc.in
+++ b/fortran/src/h5fc.in
@@ -1,17 +1,14 @@
 #! /bin/sh
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 #
 
 ############################################################################
@@ -28,6 +25,7 @@ prefix="@prefix@"
 exec_prefix="@exec_prefix@"
 libdir="@libdir@"
 includedir="@includedir@"
+fmoddir="@fmoddir@"
 HL="@HL@"
 
 ############################################################################
@@ -40,7 +38,7 @@ HL="@HL@"
 ##    $FLINKER $FCFLAGS $H5BLD_FCFLAGS $F9XSUFFIXFLAG $LDFLAGS $LIBS      ##
 ##    $fmodules $link_objs $link_args $shared_link                        ##
 ##                                                                        ##
-## These settings can be overriden by setting HDF5_FCFLAGS,               ##
+## These settings can be overridden by setting HDF5_FCFLAGS,              ##
 ## HDF5_LDFLAGS, or HDF5_LIBS in the environment.                         ##
 ##                                                                        ##
 ############################################################################
@@ -77,12 +75,12 @@ SHOW="eval"
 FCBASE="@FC@"
 FLINKERBASE="@FC@"
 
-# FCFLAGS and LDFLAGS are reserved for use by the script user.  
+# FCFLAGS and LDFLAGS are reserved for use by the script user.
 # FLAGS brought from the hdf5 build are put in H5BLD_*FLAGS.
 
-# User's FCFLAGS come after their H5BLD counterparts. User's LDFLAGS come just 
-# before clibpath, user's LIBS come after $link_objs and before the hdf5 
-# libraries in $link_args, followed by any external library paths and libraries 
+# User's FCFLAGS come after their H5BLD counterparts. User's LDFLAGS come just
+# before clibpath, user's LIBS come after $link_objs and before the hdf5
+# libraries in $link_args, followed by any external library paths and libraries
 # from AM_LDFLAGS, LDFLAGS, AM_LIBS or LIBS carried in from the hdf5 build.
 # The order of the flags is intended to give precedence to the user's flags.
 H5BLD_FCFLAGS="@AM_FCFLAGS@ @FCFLAGS@"
@@ -138,7 +136,7 @@ usage() {
   echo "                                           shared libraries]"
   echo " "
   echo " You can also add or change paths and flags to the compile line using"
-  echo " the following environment varibles or by assigning them to their counterparts"
+  echo " the following environment variables or by assigning them to their counterparts"
   echo " in the 'Things You Can Modify to Override...'" section of $prog_name
   echo " "
   echo "  Variable              Current value to be replaced"
@@ -182,7 +180,7 @@ for arg in $@ ; do
       compile_args="$compile_args $arg"
 
       if test "x$do_link" = "xyes" -a -n "$output_file"; then
-        compile_args="$compile_args -o $outputfile"
+        compile_args="$compile_args -o $output_file"
       fi
 
       do_link="no"
@@ -280,7 +278,7 @@ done
 # It's possible that there isn't a modules flag...
   fmodules=""
   if test -n "$F9XMODFLAG"; then
-    fmodules="${F9XMODFLAG}${includedir}"
+    fmodules="${F9XMODFLAG}${fmoddir}"
   fi
 
 if test "x$do_compile" = "xyes"; then
@@ -300,7 +298,7 @@ fi
 
 if test "x$do_link" = "xyes"; then
   shared_link=""
-# conditionnaly link with the hl library
+# conditionally link with the hl library
   if test "X$HL" = "Xhl"; then
    libraries=" $libraries -lhdf5hl_fortran -lhdf5_hl -lhdf5_fortran -lhdf5 "
   else
@@ -309,7 +307,7 @@ if test "x$do_link" = "xyes"; then
   link_args="$link_args -L${libdir}"
 
   case "$host_os" in
-    linux*)               flag="-Wl,-rpath -Wl," ;;
+    linux*)               flag="@fortran_linux_linker_option@-rpath -Wl," ;;
     hpux*)                flag="-Wl,+b -Wl," ;;
     freebsd*|solaris*)    flag="-R" ;;
     rs6000*|aix*)         flag="-L" ;;
@@ -360,9 +358,9 @@ if test "x$do_link" = "xyes"; then
   # module. It's okay if they're included twice in the compile line.
   link_args="$link_args $H5BLD_LDFLAGS $H5BLD_LIBS"
 
-  # User's FCFLAGS come after their H5BLD counterparts. User's LDFLAGS come just 
-  # before clibpath, user's LIBS come after $link_objs and before the hdf5 
-  # libraries in $link_args, followed by any external library paths and libraries 
+  # User's FCFLAGS come after their H5BLD counterparts. User's LDFLAGS come just
+  # before clibpath, user's LIBS come after $link_objs and before the hdf5
+  # libraries in $link_args, followed by any external library paths and libraries
   # from AM_LDFLAGS, LDFLAGS, AM_LIBS or LIBS carried in from the hdf5 build.
   # The order of the flags is intended to give precedence to the user's flags.
   $SHOW $FLINKER $FCFLAGS $H5BLD_FCFLAGS $F9XSUFFIXFLAG $LDFLAGS $fmodules $link_objs $LIBS $link_args $shared_link
diff --git a/fortran/src/hdf5_fortrandll.def.in b/fortran/src/hdf5_fortrandll.def.in
index 48fb343..4fa6f6a 100644
--- a/fortran/src/hdf5_fortrandll.def.in
+++ b/fortran/src/hdf5_fortrandll.def.in
@@ -7,99 +7,14 @@ H5LIB_mp_H5CHECK_VERSION_F
 H5LIB_mp_H5GARBAGE_COLLECT_F
 H5LIB_mp_H5DONT_ATEXIT_F
 H5LIB_mp_H5KIND_TO_TYPE
-@H5_NOF03EXP@H5LIB_PROVISIONAL_mp_H5OFFSETOF
-; H5_DBLE_INTERFACE
-H5_DBLE_INTERFACE_mp_H5AREAD_DOUBLE_SCALAR
-H5_DBLE_INTERFACE_mp_H5AREAD_DOUBLE_1
-H5_DBLE_INTERFACE_mp_H5AREAD_DOUBLE_2
-H5_DBLE_INTERFACE_mp_H5AREAD_DOUBLE_3
-H5_DBLE_INTERFACE_mp_H5AREAD_DOUBLE_4
-H5_DBLE_INTERFACE_mp_H5AREAD_DOUBLE_5
-H5_DBLE_INTERFACE_mp_H5AREAD_DOUBLE_6
-H5_DBLE_INTERFACE_mp_H5AREAD_DOUBLE_7
-H5_DBLE_INTERFACE_mp_H5AWRITE_DOUBLE_SCALAR
-H5_DBLE_INTERFACE_mp_H5AWRITE_DOUBLE_1
-H5_DBLE_INTERFACE_mp_H5AWRITE_DOUBLE_2
-H5_DBLE_INTERFACE_mp_H5AWRITE_DOUBLE_3
-H5_DBLE_INTERFACE_mp_H5AWRITE_DOUBLE_4
-H5_DBLE_INTERFACE_mp_H5AWRITE_DOUBLE_5
-H5_DBLE_INTERFACE_mp_H5AWRITE_DOUBLE_6
-H5_DBLE_INTERFACE_mp_H5AWRITE_DOUBLE_7
-H5_DBLE_INTERFACE_mp_H5DFILL_DOUBLE
-H5_DBLE_INTERFACE_mp_H5DREAD_DOUBLE_SCALAR
-H5_DBLE_INTERFACE_mp_H5DREAD_DOUBLE_1
-H5_DBLE_INTERFACE_mp_H5DREAD_DOUBLE_2
-H5_DBLE_INTERFACE_mp_H5DREAD_DOUBLE_3
-H5_DBLE_INTERFACE_mp_H5DREAD_DOUBLE_4
-H5_DBLE_INTERFACE_mp_H5DREAD_DOUBLE_5
-H5_DBLE_INTERFACE_mp_H5DREAD_DOUBLE_6
-H5_DBLE_INTERFACE_mp_H5DREAD_DOUBLE_7
-H5_DBLE_INTERFACE_mp_H5DWRITE_DOUBLE_SCALAR
-H5_DBLE_INTERFACE_mp_H5DWRITE_DOUBLE_1
-H5_DBLE_INTERFACE_mp_H5DWRITE_DOUBLE_2
-H5_DBLE_INTERFACE_mp_H5DWRITE_DOUBLE_3
-H5_DBLE_INTERFACE_mp_H5DWRITE_DOUBLE_4
-H5_DBLE_INTERFACE_mp_H5DWRITE_DOUBLE_5
-H5_DBLE_INTERFACE_mp_H5DWRITE_DOUBLE_6
-H5_DBLE_INTERFACE_mp_H5DWRITE_DOUBLE_7
-H5_DBLE_INTERFACE_mp_H5PGET_DOUBLE
-H5_DBLE_INTERFACE_mp_H5PSET_DOUBLE
-H5_DBLE_INTERFACE_mp_H5PSET_FILL_VALUE_DOUBLE
-H5_DBLE_INTERFACE_mp_H5PGET_FILL_VALUE_DOUBLE
-H5_DBLE_INTERFACE_mp_H5PINSERT_DOUBLE
-H5_DBLE_INTERFACE_mp_H5PREGISTER_DOUBLE
+H5LIB_mp_H5OFFSETOF
+H5LIB_mp_H5GMTIME
 ; H5A
+H5A_mp_H5AWRITE_CHAR_SCALAR
+H5A_mp_H5AREAD_CHAR_SCALAR
 H5A_mp_H5ACREATE_F
 H5A_mp_H5AOPEN_NAME_F
 H5A_mp_H5AOPEN_IDX_F
-H5A_PROVISIONAL_mp_H5AWRITE_INTEGER_SCALAR
-H5A_PROVISIONAL_mp_H5AWRITE_INTEGER_1
-H5A_PROVISIONAL_mp_H5AWRITE_INTEGER_2
-H5A_PROVISIONAL_mp_H5AWRITE_INTEGER_3
-H5A_PROVISIONAL_mp_H5AWRITE_INTEGER_4
-H5A_PROVISIONAL_mp_H5AWRITE_INTEGER_5
-H5A_PROVISIONAL_mp_H5AWRITE_INTEGER_6
-H5A_PROVISIONAL_mp_H5AWRITE_INTEGER_7
-H5A_PROVISIONAL_mp_H5AWRITE_REAL_SCALAR
-H5A_PROVISIONAL_mp_H5AWRITE_REAL_1
-H5A_PROVISIONAL_mp_H5AWRITE_REAL_2
-H5A_PROVISIONAL_mp_H5AWRITE_REAL_3
-H5A_PROVISIONAL_mp_H5AWRITE_REAL_4
-H5A_PROVISIONAL_mp_H5AWRITE_REAL_5
-H5A_PROVISIONAL_mp_H5AWRITE_REAL_6
-H5A_PROVISIONAL_mp_H5AWRITE_REAL_7
-H5A_PROVISIONAL_mp_H5AWRITE_CHAR_SCALAR
-H5A_PROVISIONAL_mp_H5AWRITE_CHAR_1
-H5A_PROVISIONAL_mp_H5AWRITE_CHAR_2
-H5A_PROVISIONAL_mp_H5AWRITE_CHAR_3
-H5A_PROVISIONAL_mp_H5AWRITE_CHAR_4
-H5A_PROVISIONAL_mp_H5AWRITE_CHAR_5
-H5A_PROVISIONAL_mp_H5AWRITE_CHAR_6
-H5A_PROVISIONAL_mp_H5AWRITE_CHAR_7
-H5A_PROVISIONAL_mp_H5AREAD_INTEGER_SCALAR
-H5A_PROVISIONAL_mp_H5AREAD_INTEGER_1
-H5A_PROVISIONAL_mp_H5AREAD_INTEGER_2
-H5A_PROVISIONAL_mp_H5AREAD_INTEGER_3
-H5A_PROVISIONAL_mp_H5AREAD_INTEGER_4
-H5A_PROVISIONAL_mp_H5AREAD_INTEGER_5
-H5A_PROVISIONAL_mp_H5AREAD_INTEGER_6
-H5A_PROVISIONAL_mp_H5AREAD_INTEGER_7
-H5A_PROVISIONAL_mp_H5AREAD_REAL_SCALAR
-H5A_PROVISIONAL_mp_H5AREAD_REAL_1
-H5A_PROVISIONAL_mp_H5AREAD_REAL_2
-H5A_PROVISIONAL_mp_H5AREAD_REAL_3
-H5A_PROVISIONAL_mp_H5AREAD_REAL_4
-H5A_PROVISIONAL_mp_H5AREAD_REAL_5
-H5A_PROVISIONAL_mp_H5AREAD_REAL_6
-H5A_PROVISIONAL_mp_H5AREAD_REAL_7
-H5A_PROVISIONAL_mp_H5AREAD_CHAR_SCALAR
-H5A_PROVISIONAL_mp_H5AREAD_CHAR_1
-H5A_PROVISIONAL_mp_H5AREAD_CHAR_2
-H5A_PROVISIONAL_mp_H5AREAD_CHAR_3
-H5A_PROVISIONAL_mp_H5AREAD_CHAR_4
-H5A_PROVISIONAL_mp_H5AREAD_CHAR_5
-H5A_PROVISIONAL_mp_H5AREAD_CHAR_6
-H5A_PROVISIONAL_mp_H5AREAD_CHAR_7
 H5A_mp_H5AGET_SPACE_F
 H5A_mp_H5AGET_TYPE_F
 H5A_mp_H5AGET_NAME_F
@@ -121,65 +36,19 @@ H5A_mp_H5ACREATE_BY_NAME_F
 H5A_mp_H5AEXISTS_F
 H5A_mp_H5AEXISTS_BY_NAME_F
 H5A_mp_H5AOPEN_BY_NAME_F
+H5A_mp_H5AWRITE_PTR
+H5A_mp_H5AREAD_PTR
 H5A_mp_H5ARENAME_F
-@H5_NOF03EXP@H5A_PROVISIONAL_mp_H5AWRITE_PTR
-@H5_NOF03EXP@H5A_PROVISIONAL_mp_H5AREAD_PTR
 ; H5D
 H5D_mp_H5DCREATE_F
 H5D_mp_H5DOPEN_F
 H5D_mp_H5DCLOSE_F
-H5D_PROVISIONAL_mp_H5DWRITE_REFERENCE_OBJ
-H5D_PROVISIONAL_mp_H5DWRITE_REFERENCE_DSETREG
-H5D_PROVISIONAL_mp_H5DWRITE_INTEGER_SCALAR
-H5D_PROVISIONAL_mp_H5DWRITE_INTEGER_1
-H5D_PROVISIONAL_mp_H5DWRITE_INTEGER_2
-H5D_PROVISIONAL_mp_H5DWRITE_INTEGER_3
-H5D_PROVISIONAL_mp_H5DWRITE_INTEGER_4
-H5D_PROVISIONAL_mp_H5DWRITE_INTEGER_5
-H5D_PROVISIONAL_mp_H5DWRITE_INTEGER_6
-H5D_PROVISIONAL_mp_H5DWRITE_INTEGER_7
-H5D_PROVISIONAL_mp_H5DWRITE_CHAR_SCALAR
-H5D_PROVISIONAL_mp_H5DWRITE_CHAR_1
-H5D_PROVISIONAL_mp_H5DWRITE_CHAR_2
-H5D_PROVISIONAL_mp_H5DWRITE_CHAR_3
-H5D_PROVISIONAL_mp_H5DWRITE_CHAR_4
-H5D_PROVISIONAL_mp_H5DWRITE_CHAR_5
-H5D_PROVISIONAL_mp_H5DWRITE_CHAR_6
-H5D_PROVISIONAL_mp_H5DWRITE_CHAR_7
-H5D_PROVISIONAL_mp_H5DWRITE_REAL_SCALAR
-H5D_PROVISIONAL_mp_H5DWRITE_REAL_1
-H5D_PROVISIONAL_mp_H5DWRITE_REAL_2
-H5D_PROVISIONAL_mp_H5DWRITE_REAL_3
-H5D_PROVISIONAL_mp_H5DWRITE_REAL_4
-H5D_PROVISIONAL_mp_H5DWRITE_REAL_5
-H5D_PROVISIONAL_mp_H5DWRITE_REAL_6
-H5D_PROVISIONAL_mp_H5DWRITE_REAL_7
-H5D_PROVISIONAL_mp_H5DREAD_REFERENCE_OBJ
-H5D_PROVISIONAL_mp_H5DREAD_REFERENCE_DSETREG
-H5D_PROVISIONAL_mp_H5DREAD_INTEGER_SCALAR
-H5D_PROVISIONAL_mp_H5DREAD_INTEGER_1
-H5D_PROVISIONAL_mp_H5DREAD_INTEGER_2
-H5D_PROVISIONAL_mp_H5DREAD_INTEGER_3
-H5D_PROVISIONAL_mp_H5DREAD_INTEGER_4
-H5D_PROVISIONAL_mp_H5DREAD_INTEGER_5
-H5D_PROVISIONAL_mp_H5DREAD_INTEGER_6
-H5D_PROVISIONAL_mp_H5DREAD_INTEGER_7
-H5D_PROVISIONAL_mp_H5DREAD_CHAR_SCALAR
-H5D_PROVISIONAL_mp_H5DREAD_CHAR_1
-H5D_PROVISIONAL_mp_H5DREAD_CHAR_2
-H5D_PROVISIONAL_mp_H5DREAD_CHAR_3
-H5D_PROVISIONAL_mp_H5DREAD_CHAR_4
-H5D_PROVISIONAL_mp_H5DREAD_CHAR_5
-H5D_PROVISIONAL_mp_H5DREAD_CHAR_6
-H5D_PROVISIONAL_mp_H5DREAD_CHAR_7
-H5D_PROVISIONAL_mp_H5DREAD_REAL_SCALAR
-H5D_PROVISIONAL_mp_H5DREAD_REAL_1
-H5D_PROVISIONAL_mp_H5DREAD_REAL_2
-H5D_PROVISIONAL_mp_H5DREAD_REAL_3
-H5D_PROVISIONAL_mp_H5DREAD_REAL_4
-H5D_PROVISIONAL_mp_H5DREAD_REAL_5
-H5D_PROVISIONAL_mp_H5DREAD_REAL_6
-H5D_PROVISIONAL_mp_H5DREAD_REAL_7
+H5D_mp_H5DWRITE_REFERENCE_OBJ
+H5D_mp_H5DWRITE_REFERENCE_DSETREG
+H5D_mp_H5DWRITE_CHAR_SCALAR
+H5D_mp_H5DREAD_REFERENCE_OBJ
+H5D_mp_H5DREAD_REFERENCE_DSETREG
+H5D_mp_H5DREAD_CHAR_SCALAR
 H5D_mp_H5DGET_SPACE_F
 H5D_mp_H5DGET_TYPE_F
 H5D_mp_H5DSET_EXTENT_F
@@ -192,11 +61,15 @@ H5D_mp_H5DWRITE_VL_REAL
 H5D_mp_H5DREAD_VL_REAL
 H5D_mp_H5DWRITE_VL_STRING
 H5D_mp_H5DREAD_VL_STRING
-H5D_PROVISIONAL_mp_H5DFILL_INTEGER
-H5D_PROVISIONAL_mp_H5DFILL_REAL
-H5D_PROVISIONAL_mp_H5DFILL_CHAR
+H5D_mp_H5DFILL_PTR
+H5D_mp_H5DFILL_INTEGER
+H5D_mp_H5DFILL_C_FLOAT
+H5D_mp_H5DFILL_C_DOUBLE
+@H5_DBL_NOT_UNIQUE_EXP@H5D_mp_H5DFILL_C_LONG_DOUBLE
+H5D_mp_H5DFILL_CHAR
 H5D_mp_H5DGET_SPACE_STATUS_F
 H5D_mp_H5DCREATE_ANON_F
+H5D_mp_H5DGET_OFFSET_F
 H5D_mp_H5DGET_SPACE_F
 H5D_mp_H5DGET_TYPE_F
 H5D_mp_H5DSET_EXTENT_F
@@ -204,15 +77,17 @@ H5D_mp_H5DGET_CREATE_PLIST_F
 H5D_mp_H5DGET_STORAGE_SIZE_F
 H5D_mp_H5DVLEN_GET_MAX_LEN_F
 H5D_mp_H5DGET_ACCESS_PLIST_F
-@H5_NOF03EXP@H5D_PROVISIONAL_mp_H5DWRITE_PTR
-@H5_NOF03EXP@H5D_PROVISIONAL_mp_H5DREAD_PTR
-@H5_NOF03EXP@H5D_PROVISIONAL_mp_H5DVLEN_RECLAIM_F
+H5D_mp_H5DWRITE_PTR
+H5D_mp_H5DREAD_PTR
+H5D_mp_H5DVLEN_RECLAIM_F
+H5D_mp_H5DREAD_MULTI_F
+H5D_mp_H5DWRITE_MULTI_F
 ; H5E
 H5E_mp_H5ECLEAR_F
 H5E_mp_H5EPRINT_F
 H5E_mp_H5EGET_MAJOR_F
 H5E_mp_H5EGET_MINOR_F
-H5E_PROVISIONAL_mp_H5ESET_AUTO_F
+H5E_mp_H5ESET_AUTO_F
 ; H5F
 H5F_mp_H5FCREATE_F
 H5F_mp_H5FFLUSH_F
@@ -226,10 +101,14 @@ H5F_mp_H5FOPEN_F
 H5F_mp_H5FREOPEN_F
 H5F_mp_H5FGET_CREATE_PLIST_F
 H5F_mp_H5FGET_ACCESS_PLIST_F
+H5F_mp_H5FIS_ACCESSIBLE_F
 H5F_mp_H5FIS_HDF5_F
 H5F_mp_H5FGET_NAME_F
+H5F_mp_H5FGET_FILENO_F
 H5F_mp_H5FGET_FILESIZE_F
-@H5_NOF03EXP@H5F_PROVISIONAL_mp_H5FGET_FILE_IMAGE_F
+H5F_mp_H5FGET_FILE_IMAGE_F
+H5F_mp_H5FGET_DSET_NO_ATTRS_HINT_F
+H5F_mp_H5FSET_DSET_NO_ATTRS_HINT_F
 ; H5G
 H5G_mp_H5GOPEN_F
 H5G_mp_H5GCREATE_F
@@ -291,8 +170,8 @@ H5L_mp_H5LGET_INFO_BY_IDX_F
 H5L_mp_H5LIS_REGISTERED_F
 H5L_mp_H5LMOVE_F
 H5L_mp_H5LGET_NAME_BY_IDX_F
-@H5_NOF03EXP@H5L_PROVISIONAL_mp_H5LITERATE_F
-@H5_NOF03EXP@H5L_PROVISIONAL_mp_H5LITERATE_BY_NAME_F
+H5L_mp_H5LITERATE_F
+H5L_mp_H5LITERATE_BY_NAME_F
 ; H5O
 H5O_mp_H5OCLOSE_F
 H5O_mp_H5OCOPY_F
@@ -302,16 +181,17 @@ H5O_mp_H5OGET_COMMENT_F
 H5O_mp_H5OGET_COMMENT_BY_NAME_F
 H5O_mp_H5OINCR_REFCOUNT_F
 H5O_mp_H5OLINK_F
-H5O_mp_H5OOPEN_BY_ADDR_F
+H5O_mp_H5OOPEN_BY_TOKEN_F
 H5O_mp_H5OOPEN_BY_IDX_F
 H5O_mp_H5OOPEN_F
 H5O_mp_H5OSET_COMMENT_F
 H5O_mp_H5OSET_COMMENT_BY_NAME_F
-@H5_NOF03EXP@H5O_PROVISIONAL_mp_H5OGET_INFO_BY_IDX_F
-@H5_NOF03EXP@H5O_PROVISIONAL_mp_H5OGET_INFO_BY_NAME_F
-@H5_NOF03EXP@H5O_PROVISIONAL_mp_H5OGET_INFO_F
-@H5_NOF03EXP@H5O_PROVISIONAL_mp_H5OVISIT_BY_NAME_F
-@H5_NOF03EXP@H5O_PROVISIONAL_mp_H5OVISIT_F
+H5O_mp_H5OGET_INFO_BY_IDX_F
+H5O_mp_H5OGET_INFO_BY_NAME_F
+H5O_mp_H5OGET_INFO_F
+H5O_mp_H5OVISIT_BY_NAME_F
+H5O_mp_H5OVISIT_F
+H5O_mp_H5OTOKEN_CMP_F
 ; H5P
 H5P_mp_H5PCREATE_F
 H5P_mp_H5PSET_PRESERVE_F
@@ -322,12 +202,10 @@ H5P_mp_H5PCLOSE_F
 H5P_mp_H5PSET_CHUNK_F
 H5P_mp_H5PGET_CHUNK_F
 H5P_mp_H5PSET_DEFLATE_F
-H5P_PROVISIONAL_mp_H5PSET_FILL_VALUE_INTEGER
-H5P_PROVISIONAL_mp_H5PGET_FILL_VALUE_INTEGER
-H5P_PROVISIONAL_mp_H5PSET_FILL_VALUE_REAL
-H5P_PROVISIONAL_mp_H5PGET_FILL_VALUE_REAL
-H5P_PROVISIONAL_mp_H5PSET_FILL_VALUE_CHAR
-H5P_PROVISIONAL_mp_H5PGET_FILL_VALUE_CHAR
+H5P_mp_H5PSET_FILL_VALUE_CHAR
+H5P_mp_H5PGET_FILL_VALUE_CHAR
+H5P_mp_H5PSET_FILL_VALUE_INTEGER
+H5P_mp_H5PGET_FILL_VALUE_INTEGER
 H5P_mp_H5PGET_VERSION_F
 H5P_mp_H5PSET_USERBLOCK_F
 H5P_mp_H5PGET_USERBLOCK_F
@@ -379,12 +257,10 @@ H5P_mp_H5PSET_SMALL_DATA_BLOCK_SIZE_F
 H5P_mp_H5PGET_SMALL_DATA_BLOCK_SIZE_F
 H5P_mp_H5PSET_HYPER_VECTOR_SIZE_F
 H5P_mp_H5PGET_HYPER_VECTOR_SIZE_F
-H5P_PROVISIONAL_mp_H5PSET_INTEGER
-H5P_PROVISIONAL_mp_H5PSET_REAL
-H5P_PROVISIONAL_mp_H5PSET_CHAR
-H5P_PROVISIONAL_mp_H5PGET_INTEGER
-H5P_PROVISIONAL_mp_H5PGET_REAL
-H5P_PROVISIONAL_mp_H5PGET_CHAR
+H5P_mp_H5PSET_CHAR
+H5P_mp_H5PSET_INTEGER
+H5P_mp_H5PGET_CHAR
+H5P_mp_H5PGET_INTEGER
 H5P_mp_H5PEXIST_F
 H5P_mp_H5PGET_SIZE_F
 H5P_mp_H5PGET_NPROPS_F
@@ -395,13 +271,11 @@ H5P_mp_H5PCOPY_PROP_F
 H5P_mp_H5PREMOVE_F
 H5P_mp_H5PUNREGISTER_F
 H5P_mp_H5PCLOSE_CLASS_F
-H5P_PROVISIONAL_mp_H5PCREATE_CLASS_F
-H5P_PROVISIONAL_mp_H5PREGISTER_INTEGER
-H5P_PROVISIONAL_mp_H5PREGISTER_REAL
-H5P_PROVISIONAL_mp_H5PREGISTER_CHAR
-H5P_PROVISIONAL_mp_H5PINSERT_INTEGER
-H5P_PROVISIONAL_mp_H5PINSERT_REAL
-H5P_PROVISIONAL_mp_H5PINSERT_CHAR
+H5P_mp_H5PCREATE_CLASS_F
+H5P_mp_H5PREGISTER_INTEGER
+H5P_mp_H5PREGISTER_CHAR
+H5P_mp_H5PINSERT_CHAR
+H5P_mp_H5PINSERT_INTEGER
 H5P_mp_H5PSET_SHUFFLE_F
 H5P_mp_H5PSET_EDC_CHECK_F
 H5P_mp_H5PGET_EDC_CHECK_F
@@ -420,6 +294,7 @@ H5P_mp_H5PSET_ATTR_CREATION_ORDER_F
 H5P_mp_H5PSET_SHARED_MESG_NINDEXES_F
 H5P_mp_H5PSET_SHARED_MESG_INDEX_F
 H5P_mp_H5PGET_ATTR_CREATION_ORDER_F
+H5P_mp_H5PGET_LIBVER_BOUNDS_F
 H5P_mp_H5PSET_LIBVER_BOUNDS_F
 H5P_mp_H5PSET_LINK_CREATION_ORDER_F
 H5P_mp_H5PGET_LINK_PHASE_CHANGE_F
@@ -448,28 +323,60 @@ H5P_mp_H5PGET_NLINKS_F
 H5P_mp_H5PGET_CREATE_INTER_GROUP_F
 H5P_mp_H5PSET_CHUNK_CACHE_F
 H5P_mp_H5PGET_CHUNK_CACHE_F
-@H5_NOF03EXP@H5P_PROVISIONAL_mp_H5PSET_FILL_VALUE_PTR
-@H5_NOF03EXP@H5P_PROVISIONAL_mp_H5PGET_FILL_VALUE_PTR
-@H5_NOF03EXP@H5P_PROVISIONAL_mp_H5PSET_PTR
-@H5_NOF03EXP@H5P_PROVISIONAL_mp_H5PGET_PTR
-@H5_NOF03EXP@H5P_PROVISIONAL_mp_H5PREGISTER_PTR
-@H5_NOF03EXP@H5P_PROVISIONAL_mp_H5PINSERT_PTR
-@H5_NOF03EXP@H5P_PROVISIONAL_mp_H5PGET_FILE_IMAGE_F
-@H5_NOF03EXP@H5P_PROVISIONAL_mp_H5PSET_FILE_IMAGE_F
+H5P_mp_H5PSET_FILL_VALUE_PTR
+H5P_mp_H5PGET_FILL_VALUE_PTR
+H5P_mp_H5PSET_PTR
+H5P_mp_H5PGET_PTR
+H5P_mp_H5PREGISTER_PTR
+H5P_mp_H5PINSERT_PTR
+H5P_mp_H5PGET_FILE_IMAGE_F
+H5P_mp_H5PSET_FILE_IMAGE_F
+H5P_mp_H5PSET_VIRTUAL_VIEW_F
+H5P_mp_H5PGET_VIRTUAL_VIEW_F
+H5P_mp_H5PSET_VIRTUAL_PRINTF_GAP_F
+H5P_mp_H5PGET_VIRTUAL_PRINTF_GAP_F
+H5P_mp_H5PSET_VIRTUAL_F
+H5P_mp_H5PGET_VIRTUAL_COUNT_F
+H5P_mp_H5PGET_VIRTUAL_VSPACE_F
+H5P_mp_H5PGET_VIRTUAL_SRCSPACE_F
+H5P_mp_H5PGET_VIRTUAL_FILENAME_F
+H5P_mp_H5PGET_VIRTUAL_DSETNAME_F
+H5P_mp_H5PGET_DSET_NO_ATTRS_HINT_F
+H5P_mp_H5PSET_DSET_NO_ATTRS_HINT_F
+H5P_mp_H5PSET_VOL_F
+H5P_mp_H5PGET_VOL_ID_F
+H5P_mp_H5PSET_FILE_LOCKING_F
+H5P_mp_H5PGET_FILE_LOCKING_F
+; Parallel
+@H5_NOPAREXP@H5P_mp_H5PSET_FAPL_MPIO_F
+@H5_NOPAREXP@H5P_mp_H5PGET_FAPL_MPIO_F
+@H5_NOPAREXP@H5P_mp_H5PSET_FAPL_SUBFILING_F
+@H5_NOPAREXP@H5P_mp_H5PGET_FAPL_SUBFILING_F
+@H5_NOPAREXP@H5P_mp_H5PSET_FAPL_IOC_F
+@H5_NOPAREXP@H5P_mp_H5PGET_FAPL_IOC_F
+@H5_NOPAREXP@H5P_mp_H5PSET_MPI_PARAMS_F
+@H5_NOPAREXP@H5P_mp_H5PGET_MPI_PARAMS_F
+@H5_NOPAREXP@H5P_mp_H5PSET_DXPL_MPIO_F
+@H5_NOPAREXP@H5P_mp_H5PGET_DXPL_MPIO_F
+@H5_NOPAREXP@H5P_mp_H5PGET_MPIO_ACTUAL_IO_MODE_F
+@H5_NOPAREXP@H5P_mp_H5PSET_ALL_COLL_METADATA_OPS_F
+@H5_NOPAREXP@H5P_mp_H5PGET_ALL_COLL_METADATA_OPS_F
+@H5_NOPAREXP@H5P_mp_H5PSET_COLL_METADATA_WRITE_F
+@H5_NOPAREXP@H5P_mp_H5PGET_COLL_METADATA_WRITE_F
 ; H5R
-H5R_PROVISIONAL_mp_H5RCREATE_OBJECT_F
-H5R_PROVISIONAL_mp_H5RCREATE_REGION_F
-H5R_PROVISIONAL_mp_H5RDEREFERENCE_OBJECT_F
-H5R_PROVISIONAL_mp_H5RDEREFERENCE_REGION_F
-H5R_PROVISIONAL_mp_H5RGET_REGION_REGION_F
+H5R_mp_H5RCREATE_OBJECT_F
+H5R_mp_H5RCREATE_REGION_F
+H5R_mp_H5RDEREFERENCE_OBJECT_F
+H5R_mp_H5RDEREFERENCE_REGION_F
+H5R_mp_H5RGET_REGION_REGION_F
 H5R_mp_H5RGET_OBJECT_TYPE_OBJ_F
-H5R_PROVISIONAL_mp_H5RGET_NAME_OBJECT_F
-H5R_PROVISIONAL_mp_H5RGET_NAME_REGION_F
-@H5_NOF03EXP@H5R_PROVISIONAL_mp_H5RGET_REGION_PTR_F
-@H5_NOF03EXP@H5R_PROVISIONAL_mp_H5RCREATE_PTR_F
-@H5_NOF03EXP@H5R_PROVISIONAL_mp_H5RDEREFERENCE_PTR_F
-@H5_NOF03EXP@H5R_PROVISIONAL_mp_H5RGET_NAME_PTR_F
-@H5_NOF03EXP@H5R_PROVISIONAL_mp_H5RGET_OBJ_TYPE_F
+H5R_mp_H5RGET_NAME_OBJECT_F
+H5R_mp_H5RGET_NAME_REGION_F
+H5R_mp_H5RGET_REGION_PTR_F
+H5R_mp_H5RCREATE_PTR_F
+H5R_mp_H5RDEREFERENCE_PTR_F
+H5R_mp_H5RGET_NAME_PTR_F
+H5R_mp_H5RGET_OBJ_TYPE_F
 ; H5S
 H5S_mp_H5SCREATE_SIMPLE_F
 H5S_mp_H5SCLOSE_F
@@ -499,6 +406,8 @@ H5S_mp_H5SGET_SELECT_TYPE_F
 H5S_mp_H5SDECODE_F
 H5S_mp_H5SENCODE_F
 H5S_mp_H5SEXTENT_EQUAL_F
+H5S_mp_H5SGET_REGULAR_HYPERSLAB_F
+H5S_mp_H5SIS_REGULAR_HYPERSLAB_F
 ; H5T
 H5T_mp_H5TOPEN_F
 H5T_mp_H5TCOMMIT_F
@@ -558,17 +467,21 @@ H5T_mp_H5TENCODE_F
 H5T_mp_H5TGET_CREATE_PLIST_F
 H5T_mp_H5TCOMPILER_CONV_F
 H5T_mp_H5TGET_NATIVE_TYPE_F
-@H5_NOF03EXP@H5T_PROVISIONAL_mp_H5TCONVERT_F
-@H5_F03EXP@H5T_PROVISIONAL_mp_H5TENUM_INSERT_F
-@H5_NOF03EXP@H5T_PROVISIONAL_mp_H5TENUM_INSERT_F90
-@H5_NOF03EXP@H5T_PROVISIONAL_mp_H5TENUM_INSERT_F03
+H5T_mp_H5TCONVERT_F
+H5T_mp_H5TENUM_INSERT_F90
+H5T_mp_H5TENUM_INSERT_F03
+; H5VL
+H5VL_mp_H5VLREGISTER_CONNECTOR_BY_NAME_F
+H5VL_mp_H5VLREGISTER_CONNECTOR_BY_VALUE_F
+H5VL_mp_H5VLIS_CONNECTOR_REGISTERED_BY_NAME_F
+H5VL_mp_H5VLIS_CONNECTOR_REGISTERED_BY_VALUE_F
+H5VL_mp_H5VLGET_CONNECTOR_ID_F
+H5VL_mp_H5VLGET_CONNECTOR_ID_BY_NAME_F
+H5VL_mp_H5VLGET_CONNECTOR_ID_BY_VALUE_F
+H5VL_mp_H5VLGET_CONNECTOR_NAME_F
+H5VL_mp_H5VLCLOSE_F
+H5VL_mp_H5VLUNREGISTER_CONNECTOR_F
 ; H5Z
 H5Z_mp_H5ZUNREGISTER_F
 H5Z_mp_H5ZFILTER_AVAIL_F
 H5Z_mp_H5ZGET_FILTER_INFO_F
-; Parallel
-@H5_NOPAREXP@H5FDMPIO_mp_H5PSET_FAPL_MPIO_F
-@H5_NOPAREXP@H5FDMPIO_mp_H5PGET_FAPL_MPIO_F
-@H5_NOPAREXP@H5FDMPIO_mp_H5PSET_DXPL_MPIO_F
-@H5_NOPAREXP@H5FDMPIO_mp_H5PGET_DXPL_MPIO_F
-@H5_NOPAREXP@H5FDMPIO_mp_H5PGET_MPIO_ACTUAL_IO_MODE_F
diff --git a/fortran/test/CMakeLists.txt b/fortran/test/CMakeLists.txt
index 2893156..e885427 100644
--- a/fortran/test/CMakeLists.txt
+++ b/fortran/test/CMakeLists.txt
@@ -1,196 +1,423 @@
-cmake_minimum_required (VERSION 3.1.0)
-PROJECT (HDF5_FORTRAN_TESTS C CXX Fortran)
+cmake_minimum_required (VERSION 3.18)
+project (HDF5_FORTRAN_TESTS C Fortran)
 
 #-----------------------------------------------------------------------------
-# Setup include Directories
+# Setup the Fortran auto-detection utilities
+# H5_test_buildiface.F90         used to generate various KIND test interfaces
 #-----------------------------------------------------------------------------
-INCLUDE_DIRECTORIES (${HDF5_F90_BINARY_DIR} ${HDF5_F90_SRC_DIR}/src)
 
-#-----------------------------------------------------------------------------
-# Add Test Lib
-#-----------------------------------------------------------------------------
-add_library (${HDF5_F90_C_TEST_LIB_TARGET} ${LIB_TYPE} t.c)
-set_source_files_properties (t.c PROPERTIES LANGUAGE C)
-TARGET_C_PROPERTIES (${HDF5_F90_C_TEST_LIB_TARGET} ${LIB_TYPE} " " " ")
-target_link_libraries (${HDF5_F90_C_TEST_LIB_TARGET}
-    ${HDF5_F90_C_LIB_TARGET}
-    ${HDF5_TEST_LIB_TARGET}
-)
-H5_SET_LIB_OPTIONS (${HDF5_F90_C_TEST_LIB_TARGET} ${HDF5_F90_C_TEST_LIB_NAME} ${LIB_TYPE})
-set_target_properties (${HDF5_F90_C_TEST_LIB_TARGET} PROPERTIES
-    FOLDER libraries/test/fortran
-    LINKER_LANGUAGE C
-    INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
-)
-
-# See if the F2008 intrinsic STORAGE_SIZE and C_SIZEOF are supported. If not then
-# fall back to F2003. If F2003 not supported then use F90 for the tests.
-
-set_source_files_properties (tf_F90.f90 tf_F03.f90 tf_F08.f90 tf.f90 PROPERTIES LANGUAGE Fortran)
-if (FORTRAN_HAVE_STORAGE_SIZE AND FORTRAN_HAVE_C_SIZEOF)
- add_library (${HDF5_F90_TEST_LIB_TARGET} ${LIB_TYPE} tf_F08.f90 tf.f90)
-elseif (HDF5_ENABLE_F2003)
- add_library (${HDF5_F90_TEST_LIB_TARGET} ${LIB_TYPE} tf_F03.f90 tf.f90)
-else (FORTRAN_HAVE_STORAGE_SIZE AND FORTRAN_HAVE_C_SIZEOF)
- add_library (${HDF5_F90_TEST_LIB_TARGET} ${LIB_TYPE} tf_F90.f90 tf.f90) 
-endif (FORTRAN_HAVE_STORAGE_SIZE AND FORTRAN_HAVE_C_SIZEOF)
-
-
-set (SHARED_LINK_FLAGS " ")
-if (WIN32)
-  if (BUILD_SHARED_LIBS)
-    set_property (TARGET ${HDF5_F90_TEST_LIB_TARGET} APPEND PROPERTY COMPILE_DEFINITIONS BUILD_HDF5_TEST_DLL)
-    if (MSVC)
-      set (SHARED_LINK_FLAGS "/DLL")
-    endif (MSVC)
-  endif (BUILD_SHARED_LIBS)
-  set_property (TARGET ${HDF5_F90_TEST_LIB_TARGET} APPEND PROPERTY COMPILE_DEFINITIONS HDF5F90_WINDOWS)
-endif (WIN32)
-TARGET_FORTRAN_PROPERTIES (${HDF5_F90_TEST_LIB_TARGET} ${LIB_TYPE} " " ${SHARED_LINK_FLAGS})
-target_link_libraries (${HDF5_F90_TEST_LIB_TARGET}
-    ${HDF5_F90_C_TEST_LIB_TARGET}
-    ${HDF5_F90_LIB_TARGET}
-    ${HDF5_LIB_TARGET}
+add_executable (H5_test_buildiface ${HDF5_F90_SRC_DIR}/test/H5_test_buildiface.F90)
+target_include_directories (H5_test_buildiface
+    PRIVATE
+        ${HDF5_SRC_BINARY_DIR} ${HDF5_F90_BINARY_DIR}
 )
-H5_SET_LIB_OPTIONS (${HDF5_F90_TEST_LIB_TARGET} ${HDF5_F90_TEST_LIB_NAME} ${LIB_TYPE})
-set_target_properties (${HDF5_F90_TEST_LIB_TARGET} PROPERTIES
-    FOLDER libraries/test/fortran
+#if (BUILD_SHARED_LIBS)
+#  target_compile_definitions(H5_test_buildiface
+#      PRIVATE $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:/MT>
+#  )
+#endif ()
+if(MSVC)
+  set_property(TARGET H5_test_buildiface PROPERTY COMPILE_FLAGS "/MT")
+endif()
+#set_property(TARGET H5_test_buildiface APPEND PROPERTY
+#    LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"-SUBSYSTEM:CONSOLE">
+#)
+if(MSVC)
+  set_property(TARGET H5_test_buildiface PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE")
+endif()
+set_target_properties (H5_test_buildiface PROPERTIES
     LINKER_LANGUAGE Fortran
-    INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
     Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}
 )
 
+if (NOT BUILD_SHARED_LIBS)
+  file (MAKE_DIRECTORY "${HDF5_FORTRAN_TESTS_BINARY_DIR}/static")
+  set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static/${HDF_CFG_BUILD_TYPE})
+else ()
+  file (MAKE_DIRECTORY "${HDF5_FORTRAN_TESTS_BINARY_DIR}/shared")
+  set (MODSH_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/shared/${HDF_CFG_BUILD_TYPE})
+endif ()
+
+#-----------------------------------------------------------------------------
+# Add Test Lib
+#-----------------------------------------------------------------------------
+if (NOT BUILD_SHARED_LIBS)
+  add_library (${HDF5_F90_C_TEST_LIB_TARGET} STATIC t.c t.h)
+  set_source_files_properties (t.c PROPERTIES LANGUAGE C)
+  target_include_directories (${HDF5_F90_C_TEST_LIB_TARGET}
+      PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};${HDF5_F90_BINARY_DIR};${HDF5_F90_BINARY_DIR}/static;$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
+      INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
+  )
+  target_compile_options(${HDF5_F90_C_TEST_LIB_TARGET} PRIVATE "${HDF5_CMAKE_C_FLAGS}")
+  TARGET_C_PROPERTIES (${HDF5_F90_C_TEST_LIB_TARGET} STATIC)
+  target_link_libraries (${HDF5_F90_C_TEST_LIB_TARGET}
+      PRIVATE ${HDF5_F90_C_LIB_TARGET}
+      PUBLIC ${HDF5_TEST_LIB_TARGET}
+  )
+  H5_SET_LIB_OPTIONS (${HDF5_F90_C_TEST_LIB_TARGET} ${HDF5_F90_C_TEST_LIB_NAME} STATIC 0)
+  set_target_properties (${HDF5_F90_C_TEST_LIB_TARGET} PROPERTIES
+      FOLDER libraries/test/fortran
+      LINKER_LANGUAGE C
+  )
+else ()
+  add_library (${HDF5_F90_C_TEST_LIBSH_TARGET} SHARED t.c t.h)
+  target_include_directories (${HDF5_F90_C_TEST_LIBSH_TARGET}
+      PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};${HDF5_F90_BINARY_DIR};${HDF5_F90_BINARY_DIR}/shared;$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
+      INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
+  )
+  target_compile_options(${HDF5_F90_C_TEST_LIBSH_TARGET} PRIVATE "${HDF5_CMAKE_C_FLAGS}")
+  target_compile_definitions(${HDF5_F90_C_TEST_LIBSH_TARGET} PUBLIC "H5_BUILT_AS_DYNAMIC_LIB")
+  TARGET_C_PROPERTIES (${HDF5_F90_C_TEST_LIBSH_TARGET} SHARED)
+  target_link_libraries (${HDF5_F90_C_TEST_LIBSH_TARGET}
+      PRIVATE ${HDF5_F90_C_LIBSH_TARGET}
+      PUBLIC ${HDF5_TEST_LIBSH_TARGET}
+  )
+  H5_SET_LIB_OPTIONS (${HDF5_F90_C_TEST_LIBSH_TARGET} ${HDF5_F90_C_TEST_LIB_NAME} SHARED "F")
+  set_target_properties (${HDF5_F90_C_TEST_LIBSH_TARGET} PROPERTIES
+      FOLDER libraries/test/fortran
+      LINKER_LANGUAGE C
+  )
+endif ()
+
+#-----------------------------------------------------------------------------
+# Add Target to clang-format
+#-----------------------------------------------------------------------------
+if (HDF5_ENABLE_FORMATTERS)
+  if (NOT BUILD_SHARED_LIBS)
+    clang_format (HDF5_FORTRAN_TESTS_FORMAT ${HDF5_F90_C_TEST_LIB_TARGET})
+  else ()
+    clang_format (HDF5_FORTRAN_TESTS_FORMAT ${HDF5_F90_C_TEST_LIBSH_TARGET})
+  endif ()
+endif ()
+
+if (NOT BUILD_SHARED_LIBS)
+  add_custom_command (TARGET H5_test_buildiface POST_BUILD
+      BYPRODUCTS ${HDF5_FORTRAN_TESTS_BINARY_DIR}/static/tf_gen.F90
+      COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:H5_test_buildiface>
+      WORKING_DIRECTORY ${HDF5_FORTRAN_TESTS_BINARY_DIR}/static
+      DEPENDS H5_test_buildiface
+      COMMENT "Generating the tf_gen.F90 static file"
+  )
+  add_custom_target (H5testgen ALL
+      DEPENDS H5_test_buildiface ${HDF5_FORTRAN_TESTS_BINARY_DIR}/static/tf_gen.F90
+  )
+  set_source_files_properties (${HDF5_FORTRAN_TESTS_BINARY_DIR}/static/tf_gen.F90 PROPERTIES GENERATED TRUE)
+else ()
+  add_custom_command (TARGET H5_test_buildiface POST_BUILD
+      BYPRODUCTS ${HDF5_FORTRAN_TESTS_BINARY_DIR}/shared/tf_gen.F90
+      COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:H5_test_buildiface>
+      WORKING_DIRECTORY ${HDF5_FORTRAN_TESTS_BINARY_DIR}/shared
+      DEPENDS H5_test_buildiface
+      COMMENT "Generating the tf_gen.F90 shared file"
+  )
+  add_custom_target (H5testgenSH ALL
+      DEPENDS H5_test_buildiface ${HDF5_FORTRAN_TESTS_BINARY_DIR}/shared/tf_gen.F90
+  )
+  set_source_files_properties (${HDF5_FORTRAN_TESTS_BINARY_DIR}/shared/tf_gen.F90 PROPERTIES GENERATED TRUE)
+endif ()
+
+if (NOT BUILD_SHARED_LIBS)
+  set (HDF5_F90_TF_SOURCES
+      # generated files
+      ${HDF5_FORTRAN_TESTS_BINARY_DIR}/static/tf_gen.F90
+
+      # normal distribution
+      tf.F90
+  )
+  set_source_files_properties (${HDF5_F90_TF_SOURCES} PROPERTIES LANGUAGE Fortran)
+else ()
+  set (HDF5_F90_TF_SOURCES_SHARED
+      # generated file
+      ${HDF5_FORTRAN_TESTS_BINARY_DIR}/shared/tf_gen.F90
+
+      # normal distribution
+      tf.F90
+  )
+  set_source_files_properties (${HDF5_F90_TF_SOURCES_SHARED} PROPERTIES LANGUAGE Fortran)
+endif ()
+
+if (NOT BUILD_SHARED_LIBS)
+  add_library (${HDF5_F90_TEST_LIB_TARGET} STATIC ${HDF5_F90_TF_SOURCES})
+  target_include_directories (${HDF5_F90_TEST_LIB_TARGET}
+      PRIVATE "${CMAKE_Fortran_MODULE_DIRECTORY}/static;${HDF5_F90_BINARY_DIR};${HDF5_F90_BINARY_DIR}/static"
+      INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include/static>"
+  )
+  target_compile_options(${HDF5_F90_TEST_LIB_TARGET} PRIVATE "${HDF5_CMAKE_Fortran_FLAGS}")
+  target_compile_definitions(${HDF5_F90_TEST_LIB_TARGET}
+      PRIVATE
+          $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:HDF5F90_WINDOWS>
+          $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_COMPILE_FLAGS}>
+  )
+  target_link_libraries (${HDF5_F90_TEST_LIB_TARGET} PUBLIC ${HDF5_F90_C_TEST_LIB_TARGET} ${HDF5_F90_LIB_TARGET} ${HDF5_LIB_TARGET})
+#  set_property(TARGET ${HDF5_F90_TEST_LIB_TARGET} APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"-SUBSYSTEM:CONSOLE">)
+#  set_property(TARGET ${HDF5_F90_TEST_LIB_TARGET} APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_LINK_FLAGS}>)
+  if(MSVC)
+    set_property(TARGET ${HDF5_F90_TEST_LIB_TARGET} PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE ${WIN_LINK_FLAGS}")
+  endif()
+  set_target_properties (${HDF5_F90_TEST_LIB_TARGET} PROPERTIES
+      FOLDER libraries/test/fortran
+      LINKER_LANGUAGE Fortran
+      Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/static
+  )
+  H5_SET_LIB_OPTIONS (${HDF5_F90_TEST_LIB_TARGET} ${HDF5_F90_TEST_LIB_NAME} STATIC 0)
+  add_dependencies(${HDF5_F90_TEST_LIB_TARGET} H5testgen)
+else ()
+  add_library (${HDF5_F90_TEST_LIBSH_TARGET} SHARED ${HDF5_F90_TF_SOURCES_SHARED})
+  target_include_directories (${HDF5_F90_TEST_LIBSH_TARGET}
+      PRIVATE "${CMAKE_Fortran_MODULE_DIRECTORY}/shared;${HDF5_F90_BINARY_DIR};${HDF5_F90_BINARY_DIR}/shared"
+      INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include/shared>"
+  )
+  target_compile_options(${HDF5_F90_TEST_LIBSH_TARGET} PRIVATE "${HDF5_CMAKE_Fortran_FLAGS}")
+  target_compile_definitions(${HDF5_F90_TEST_LIBSH_TARGET}
+      PUBLIC "H5_BUILT_AS_DYNAMIC_LIB"
+      PRIVATE
+          $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:BUILD_HDF5_TEST_DLL;HDF5F90_WINDOWS>
+          $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_COMPILE_FLAGS}>
+  )
+  target_link_libraries (${HDF5_F90_TEST_LIBSH_TARGET} PUBLIC ${HDF5_F90_C_TEST_LIBSH_TARGET} ${HDF5_F90_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
+#  set_property(TARGET ${HDF5_F90_TEST_LIBSH_TARGET} APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"-SUBSYSTEM:CONSOLE">)
+#  set_property(TARGET ${HDF5_F90_TEST_LIBSH_TARGET} APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_LINK_FLAGS}>)
+#  set_property(TARGET ${HDF5_F90_TEST_LIBSH_TARGET} APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"-DLL">)
+  if(MSVC)
+    set_property(TARGET ${HDF5_F90_TEST_LIBSH_TARGET} PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE ${WIN_LINK_FLAGS} -DLL")
+  endif()
+  set_target_properties (${HDF5_F90_TEST_LIBSH_TARGET} PROPERTIES
+      FOLDER libraries/test/fortran
+      LINKER_LANGUAGE Fortran
+      Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/shared
+  )
+  H5_SET_LIB_OPTIONS (${HDF5_F90_TEST_LIBSH_TARGET} ${HDF5_F90_TEST_LIB_NAME} SHARED "F")
+  add_dependencies(${HDF5_F90_TEST_LIBSH_TARGET} H5testgenSH)
+endif ()
+
 #-----------------------------------------------------------------------------
 # Add Tests
 #-----------------------------------------------------------------------------
 
 #-- Adding test for testhdf5_fortran
 add_executable (testhdf5_fortran
-    fortranlib_test.f90
-    tH5A.f90
-    tH5D.f90
-    tH5E.f90
-    tH5F.f90
-    tH5G.f90
-    tH5I.f90
-    tH5P.f90
-    tH5R.f90
-    tH5S.f90
-    tH5Sselect.f90
-    tH5T.f90
-    tH5VL.f90
-    tH5Z.f90
-    tHDF5.f90
+    fortranlib_test.F90
+    tH5A.F90
+    tH5D.F90
+    tH5E.F90
+    tH5F.F90
+    tH5G.F90
+    tH5I.F90
+    tH5P.F90
+    tH5R.F90
+    tH5S.F90
+    tH5Sselect.F90
+    tH5T.F90
+    tH5VL.F90
+    tH5Z.F90
+    tHDF5.F90
 )
-TARGET_NAMING (testhdf5_fortran ${LIB_TYPE})
-TARGET_FORTRAN_PROPERTIES (testhdf5_fortran ${LIB_TYPE} " " " ")
-target_link_libraries (testhdf5_fortran 
-    ${HDF5_F90_TEST_LIB_TARGET}
-    ${HDF5_F90_LIB_TARGET}
-    ${HDF5_LIB_TARGET}
-)
-if (WIN32 AND MSVC)
-  target_link_libraries (testhdf5_fortran "ws2_32.lib")
-endif (WIN32 AND MSVC)
-target_include_directories (testhdf5_fortran PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY}/static)
-set_target_properties (testhdf5_fortran PROPERTIES
-    LINKER_LANGUAGE Fortran
-    FOLDER test/fortran
-    Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}
+target_compile_options(testhdf5_fortran
+    PRIVATE
+        "${HDF5_CMAKE_Fortran_FLAGS}"
+        $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_COMPILE_FLAGS}>
 )
+#set_property(TARGET testhdf5_fortran APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"-SUBSYSTEM:CONSOLE">)
+#set_property(TARGET testhdf5_fortran APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_LINK_FLAGS}>)
+if(MSVC)
+  set_property(TARGET testhdf5_fortran  PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE ${WIN_LINK_FLAGS}")
+endif()
+if (NOT BUILD_SHARED_LIBS)
+  target_include_directories (testhdf5_fortran PRIVATE "${CMAKE_Fortran_MODULE_DIRECTORY}/static;${HDF5_F90_BINARY_DIR};${HDF5_F90_BINARY_DIR}/static")
+  target_link_libraries (testhdf5_fortran PRIVATE ${HDF5_F90_TEST_LIB_TARGET} ${HDF5_F90_LIB_TARGET} ${HDF5_LIB_TARGET} $<$<PLATFORM_ID:Windows>:ws2_32.lib>)
+  set_target_properties (testhdf5_fortran PROPERTIES
+      LINKER_LANGUAGE Fortran
+      FOLDER test/fortran
+      Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/static
+  )
+  add_dependencies (testhdf5_fortran ${HDF5_F90_TEST_LIB_TARGET})
+else ()
+  target_include_directories (testhdf5_fortran PRIVATE "${CMAKE_Fortran_MODULE_DIRECTORY}/shared;${HDF5_F90_BINARY_DIR};${HDF5_F90_BINARY_DIR}/shared")
+  target_link_libraries (testhdf5_fortran PRIVATE ${HDF5_F90_TEST_LIBSH_TARGET} ${HDF5_F90_LIBSH_TARGET} ${HDF5_LIBSH_TARGET} $<$<PLATFORM_ID:Windows>:ws2_32.lib>)
+  set_target_properties (testhdf5_fortran PROPERTIES
+      LINKER_LANGUAGE Fortran
+      FOLDER test/fortran
+      Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/shared
+  )
+  add_dependencies (testhdf5_fortran ${HDF5_F90_TEST_LIBSH_TARGET})
+endif ()
 
 #-- Adding test for testhdf5_fortran_1_8
 add_executable (testhdf5_fortran_1_8
-    fortranlib_test_1_8.f90
-    tH5O.f90
-    tH5A_1_8.f90
-    tH5G_1_8.f90
-    tH5MISC_1_8.f90
-    tHDF5_1_8.f90
+    fortranlib_test_1_8.F90
+    tH5O.F90
+    tH5A_1_8.F90
+    tH5G_1_8.F90
+    tH5MISC_1_8.F90
+    tHDF5_1_8.F90
 )
-TARGET_NAMING (testhdf5_fortran_1_8 ${LIB_TYPE})
-TARGET_FORTRAN_PROPERTIES (testhdf5_fortran_1_8 ${LIB_TYPE} " " " ")
-target_link_libraries (testhdf5_fortran_1_8 
-    ${HDF5_F90_TEST_LIB_TARGET}
-    ${HDF5_F90_LIB_TARGET}
-    ${HDF5_LIB_TARGET}
-)
-if (WIN32 AND MSVC)
-  target_link_libraries (testhdf5_fortran_1_8 "ws2_32.lib")
-endif (WIN32 AND MSVC)
-target_include_directories (testhdf5_fortran_1_8 PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY}/static)
-set_target_properties (testhdf5_fortran_1_8 PROPERTIES
-    LINKER_LANGUAGE Fortran
-    FOLDER test/fortran
-    Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}
+target_compile_options(testhdf5_fortran_1_8
+    PRIVATE
+        "${HDF5_CMAKE_Fortran_FLAGS}"
+        $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_COMPILE_FLAGS}>
 )
+#set_property(TARGET testhdf5_fortran_1_8 APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"-SUBSYSTEM:CONSOLE">)
+#set_property(TARGET testhdf5_fortran_1_8 APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_LINK_FLAGS}>)
+if(MSVC)
+  set_property(TARGET testhdf5_fortran_1_8 PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE ${WIN_LINK_FLAGS}")
+endif()
+if (NOT BUILD_SHARED_LIBS)
+  target_include_directories (testhdf5_fortran_1_8 PRIVATE "${CMAKE_Fortran_MODULE_DIRECTORY}/static;${HDF5_F90_BINARY_DIR};${HDF5_F90_BINARY_DIR}/static")
+  target_link_libraries (testhdf5_fortran_1_8 PRIVATE ${HDF5_F90_TEST_LIB_TARGET} ${HDF5_F90_LIB_TARGET} ${HDF5_LIB_TARGET} $<$<PLATFORM_ID:Windows>:ws2_32.lib>)
+  set_target_properties (testhdf5_fortran_1_8 PROPERTIES
+      LINKER_LANGUAGE Fortran
+      FOLDER test/fortran
+      Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/static
+  )
+  add_dependencies (testhdf5_fortran_1_8 ${HDF5_F90_TEST_LIB_TARGET})
+else ()
+  target_include_directories (testhdf5_fortran_1_8 PRIVATE "${CMAKE_Fortran_MODULE_DIRECTORY}/shared;${HDF5_F90_BINARY_DIR};${HDF5_F90_BINARY_DIR}/shared")
+  target_link_libraries (testhdf5_fortran_1_8 PRIVATE ${HDF5_F90_TEST_LIBSH_TARGET} ${HDF5_F90_LIBSH_TARGET} ${HDF5_LIBSH_TARGET} $<$<PLATFORM_ID:Windows>:ws2_32.lib>)
+  set_target_properties (testhdf5_fortran_1_8 PROPERTIES
+      LINKER_LANGUAGE Fortran
+      FOLDER test/fortran
+      Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/shared
+  )
+  add_dependencies (testhdf5_fortran_1_8 ${HDF5_F90_TEST_LIBSH_TARGET})
+endif ()
 
 #-- Adding test for fortranlib_test_F03
-if (HDF5_ENABLE_F2003)
-  add_executable (fortranlib_test_F03
-      fortranlib_test_F03.f90
-      tH5E_F03.f90
-      tH5F_F03.f90
-      tH5L_F03.f90
-      tH5O_F03.f90
-      tH5P_F03.f90
-      tH5T_F03.f90
-      tHDF5_F03.f90
-  )
-  TARGET_NAMING (fortranlib_test_F03 ${LIB_TYPE})
-  TARGET_FORTRAN_PROPERTIES (fortranlib_test_F03 ${LIB_TYPE} " " " ")
-  target_link_libraries (fortranlib_test_F03 
-      ${HDF5_F90_TEST_LIB_TARGET}
-      ${HDF5_F90_LIB_TARGET}
-      ${HDF5_LIB_TARGET}
-  )
-  if (WIN32 AND MSVC)
-    target_link_libraries (fortranlib_test_F03 "ws2_32.lib")
-  endif (WIN32 AND MSVC)
-  target_include_directories (fortranlib_test_F03 PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY}/static)
+add_executable (fortranlib_test_F03
+    fortranlib_test_F03.F90
+    tH5E_F03.F90
+    tH5F_F03.F90
+    tH5L_F03.F90
+    tH5O_F03.F90
+    tH5P_F03.F90
+    tH5T_F03.F90
+    tHDF5_F03.F90
+)
+target_compile_options(fortranlib_test_F03
+    PRIVATE
+        "${HDF5_CMAKE_Fortran_FLAGS}"
+        $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_COMPILE_FLAGS}>
+)
+#set_property(TARGET fortranlib_test_F03 APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"-SUBSYSTEM:CONSOLE">)
+#set_property(TARGET fortranlib_test_F03 APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_LINK_FLAGS}>)
+if(MSVC)
+  set_property(TARGET fortranlib_test_F03 PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE ${WIN_LINK_FLAGS}")
+endif()
+if (NOT BUILD_SHARED_LIBS)
+  target_include_directories (fortranlib_test_F03 PRIVATE "${CMAKE_Fortran_MODULE_DIRECTORY}/static;${HDF5_F90_BINARY_DIR};${HDF5_F90_BINARY_DIR}/static")
+  target_link_libraries (fortranlib_test_F03 PRIVATE ${HDF5_F90_TEST_LIB_TARGET} ${HDF5_F90_LIB_TARGET} ${HDF5_LIB_TARGET} $<$<PLATFORM_ID:Windows>:ws2_32.lib>)
   set_target_properties (fortranlib_test_F03 PROPERTIES
       LINKER_LANGUAGE Fortran
       FOLDER test/fortran
-      Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}
+      Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/static
   )
-endif (HDF5_ENABLE_F2003)
+  add_dependencies (fortranlib_test_F03 ${HDF5_F90_TEST_LIB_TARGET})
+else ()
+  target_include_directories (fortranlib_test_F03 PRIVATE "${CMAKE_Fortran_MODULE_DIRECTORY}/shared;${HDF5_F90_BINARY_DIR};${HDF5_F90_BINARY_DIR}/shared")
+  target_link_libraries (fortranlib_test_F03 PRIVATE ${HDF5_F90_TEST_LIBSH_TARGET} ${HDF5_F90_LIBSH_TARGET} ${HDF5_LIBSH_TARGET} $<$<PLATFORM_ID:Windows>:ws2_32.lib>)
+  set_target_properties (fortranlib_test_F03 PROPERTIES
+      LINKER_LANGUAGE Fortran
+      FOLDER test/fortran
+      Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/shared
+  )
+  add_dependencies (fortranlib_test_F03 ${HDF5_F90_TEST_LIBSH_TARGET})
+endif ()
 
 #-- Adding test for fflush1
-add_executable (fflush1 fflush1.f90)
-TARGET_NAMING (fflush1 ${LIB_TYPE})
-TARGET_FORTRAN_PROPERTIES (fflush1 ${LIB_TYPE} " " " ")
-target_link_libraries (fflush1 
-    ${HDF5_F90_LIB_TARGET}
-    ${HDF5_F90_TEST_LIB_TARGET}
-    ${HDF5_LIB_TARGET}
-)
-if (WIN32 AND MSVC)
-  target_link_libraries (fflush1 "ws2_32.lib")
-endif (WIN32 AND MSVC)
-target_include_directories (fflush1 PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY}/static)
-set_target_properties (fflush1 PROPERTIES
-    LINKER_LANGUAGE Fortran
-    FOLDER test/fortran
-    Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}
+add_executable (fflush1 fflush1.F90)
+target_compile_options(fflush1
+    PRIVATE
+        "${HDF5_CMAKE_Fortran_FLAGS}"
+        $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_COMPILE_FLAGS}>
 )
+#set_property(TARGET fflush1 APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"-SUBSYSTEM:CONSOLE">)
+#set_property(TARGET fflush1 APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_LINK_FLAGS}>)
+if(MSVC)
+  set_property(TARGET fflush1 PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE ${WIN_LINK_FLAGS}")
+endif()
+if (NOT BUILD_SHARED_LIBS)
+  target_include_directories (fflush1 PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY}/static)
+  target_link_libraries (fflush1 PRIVATE ${HDF5_F90_LIB_TARGET} ${HDF5_F90_TEST_LIB_TARGET} ${HDF5_LIB_TARGET} $<$<PLATFORM_ID:Windows>:ws2_32.lib>)
+  set_target_properties (fflush1 PROPERTIES
+      LINKER_LANGUAGE Fortran
+      FOLDER test/fortran
+      Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/static
+  )
+  add_dependencies (fflush1 ${HDF5_F90_TEST_LIB_TARGET})
+else ()
+  target_include_directories (fflush1 PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY}/shared)
+  target_link_libraries (fflush1 PRIVATE ${HDF5_F90_LIBSH_TARGET} ${HDF5_F90_TEST_LIBSH_TARGET} ${HDF5_LIBSH_TARGET} $<$<PLATFORM_ID:Windows>:ws2_32.lib>)
+  set_target_properties (fflush1 PROPERTIES
+      LINKER_LANGUAGE Fortran
+      FOLDER test/fortran
+      Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/shared
+  )
+  add_dependencies (fflush1 ${HDF5_F90_TEST_LIBSH_TARGET})
+endif ()
 
 #-- Adding test for fflush2
-add_executable (fflush2 fflush2.f90)
-TARGET_NAMING (fflush2 ${LIB_TYPE})
-TARGET_FORTRAN_PROPERTIES (fflush2 ${LIB_TYPE} " " " ")
-target_link_libraries (fflush2 
-    ${HDF5_F90_TEST_LIB_TARGET}
-    ${HDF5_F90_LIB_TARGET}
-    ${HDF5_LIB_TARGET}
+add_executable (fflush2 fflush2.F90)
+target_compile_options (fflush2
+    PRIVATE
+        "${HDF5_CMAKE_Fortran_FLAGS}"
+        $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_COMPILE_FLAGS}>
 )
-if (WIN32 AND MSVC)
-  target_link_libraries (fflush2 "ws2_32.lib")
-endif (WIN32 AND MSVC)
-target_include_directories (fflush2 PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY}/static)
-set_target_properties (fflush2 PROPERTIES
-    LINKER_LANGUAGE Fortran
-    FOLDER test/fortran
-    Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}
+#set_property(TARGET fflush2 APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"-SUBSYSTEM:CONSOLE">)
+#set_property(TARGET fflush2 APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_LINK_FLAGS}>)
+if(MSVC)
+  set_property(TARGET fflush2 PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE ${WIN_LINK_FLAGS}")
+endif()
+if (NOT BUILD_SHARED_LIBS)
+  target_include_directories (fflush2 PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY}/static)
+  target_link_libraries (fflush2 PRIVATE ${HDF5_F90_TEST_LIB_TARGET} ${HDF5_F90_LIB_TARGET} ${HDF5_LIB_TARGET} $<$<PLATFORM_ID:Windows>:ws2_32.lib>)
+  set_target_properties (fflush2 PROPERTIES
+      LINKER_LANGUAGE Fortran
+      FOLDER test/fortran
+      Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/static
+  )
+  add_dependencies (fflush2 ${HDF5_F90_TEST_LIB_TARGET})
+else ()
+  target_include_directories (fflush2 PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY}/shared)
+  target_link_libraries (fflush2 PRIVATE ${HDF5_F90_TEST_LIBSH_TARGET} ${HDF5_F90_LIBSH_TARGET} ${HDF5_LIBSH_TARGET} $<$<PLATFORM_ID:Windows>:ws2_32.lib>)
+  set_target_properties (fflush2 PROPERTIES
+      LINKER_LANGUAGE Fortran
+      FOLDER test/fortran
+      Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/shared
+  )
+  add_dependencies (fflush2 ${HDF5_F90_TEST_LIBSH_TARGET})
+endif ()
+
+#-- Adding test for vol_connector
+add_executable (vol_connector vol_connector.F90)
+target_compile_options(vol_connector
+    PRIVATE
+        "${HDF5_CMAKE_Fortran_FLAGS}"
+        $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_COMPILE_FLAGS}>
 )
+#set_property(TARGET vol_connector APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"-SUBSYSTEM:CONSOLE">)
+#set_property(TARGET vol_connector APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_LINK_FLAGS}>)
+if(MSVC)
+  set_property(TARGET vol_connector PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE ${WIN_LINK_FLAGS}")
+endif()
+if (NOT BUILD_SHARED_LIBS)
+  target_include_directories (vol_connector PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY}/static)
+  target_link_libraries (vol_connector PRIVATE ${HDF5_F90_LIB_TARGET} ${HDF5_F90_TEST_LIB_TARGET} ${HDF5_LIB_TARGET} $<$<PLATFORM_ID:Windows>:ws2_32.lib>)
+  set_target_properties (vol_connector PROPERTIES
+      LINKER_LANGUAGE Fortran
+      FOLDER test/fortran
+      Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/static
+  )
+  add_dependencies (vol_connector ${HDF5_F90_TEST_LIB_TARGET})
+else ()
+  target_include_directories (vol_connector PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY}/shared)
+  target_link_libraries (vol_connector PRIVATE ${HDF5_F90_LIBSH_TARGET} ${HDF5_F90_TEST_LIBSH_TARGET} ${HDF5_LIBSH_TARGET} $<$<PLATFORM_ID:Windows>:ws2_32.lib>)
+  set_target_properties (vol_connector PROPERTIES
+      LINKER_LANGUAGE Fortran
+      FOLDER test/fortran
+      Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/shared
+  )
+  add_dependencies (vol_connector ${HDF5_F90_TEST_LIBSH_TARGET})
+endif ()
 
-include (CMakeTests.cmake)
+if (HDF5_TEST_FORTRAN AND HDF5_TEST_SERIAL)
+  include (CMakeTests.cmake)
+endif ()
diff --git a/fortran/test/CMakeTests.cmake b/fortran/test/CMakeTests.cmake
index 4df50ad..02c23bb 100644
--- a/fortran/test/CMakeTests.cmake
+++ b/fortran/test/CMakeTests.cmake
@@ -1,3 +1,14 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
 
 ##############################################################################
 ##############################################################################
@@ -5,24 +16,180 @@
 ##############################################################################
 ##############################################################################
 
-add_test (NAME FORTRAN_testhdf5_fortran COMMAND $<TARGET_FILE:testhdf5_fortran>)
-set_tests_properties (FORTRAN_testhdf5_fortran PROPERTIES PASS_REGULAR_EXPRESSION "[ ]*0 error.s")
+set (testhdf5_fortran_CLEANFILES
+          a.h5
+          b.h5
+          c.h5
+          d.h5
+          dsetf_F03.h5
+          enum1.h5
+          extern_1a.raw
+          extern_2a.raw
+          extern_3a.raw
+          extern_4a.raw
+          extern_raw.h5
+          get_info.h5
+          nbit.h5
+          t_array_F03.h5
+          t_bit_F03.h5
+          t_controlchar.h5
+          t_controlchar_F03.h5
+          t_enum_F03.h5
+          t_objref_F03.h5
+          t_opaque_F03.h5
+          t_regref_F03.h5
+          t_string_F03.h5
+          t_vlen_F03.h5
+          t_vlstring.h5
+          t_vlstring_F03.h5
+          t_vlstringrw_F03.h5
+          tarray1.h5
+          tarray2.h5
+          tarray3.h5
+          test_create.h5
+          tget_file_image.h5
+          th5o_ref.h5
+          titerate.h5
+          vds.h5
+          visit.h5
+          voltest.h5
+)
+
+# Remove any output file left over from previous test run
+add_test (
+    NAME FORTRAN_testhdf5-clear-objects
+    COMMAND ${CMAKE_COMMAND} -E remove ${testhdf5_fortran_CLEANFILES}
+)
+set_tests_properties (FORTRAN_testhdf5-clear-objects PROPERTIES
+    FIXTURES_SETUP clear_testhdf5_fortran
+    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+)
+add_test (
+    NAME FORTRAN_testhdf5-clean-objects
+    COMMAND ${CMAKE_COMMAND} -E remove ${testhdf5_fortran_CLEANFILES}
+)
+set_tests_properties (FORTRAN_testhdf5-clean-objects PROPERTIES
+    FIXTURES_CLEANUP clear_testhdf5_fortran
+    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+)
+
+if (HDF5_ENABLE_USING_MEMCHECKER)
+  add_test (NAME FORTRAN_testhdf5_fortran COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:testhdf5_fortran>)
+else ()
+  add_test (NAME FORTRAN_testhdf5_fortran COMMAND "${CMAKE_COMMAND}"
+      -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
+      -D "TEST_PROGRAM=$<TARGET_FILE:testhdf5_fortran>"
+      -D "TEST_ARGS:STRING="
+      -D "TEST_EXPECT=0"
+      -D "TEST_SKIP_COMPARE=TRUE"
+      -D "TEST_REGEX= 0 error.s."
+      -D "TEST_MATCH= 0 error(s)"
+      -D "TEST_OUTPUT=testhdf5_fortran.txt"
+      #-D "TEST_REFERENCE=testhdf5_fortran.out"
+      -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+      -P "${HDF_RESOURCES_DIR}/runTest.cmake"
+  )
+endif ()
+#set_tests_properties (FORTRAN_testhdf5_fortran PROPERTIES PASS_REGULAR_EXPRESSION "[ ]*0 error.s")
+set_tests_properties (FORTRAN_testhdf5_fortran PROPERTIES
+    FIXTURES_REQUIRED clear_testhdf5_fortran
+)
 
 #-- Adding test for testhdf5_fortran_1_8
-add_test (NAME FORTRAN_testhdf5_fortran_1_8 COMMAND $<TARGET_FILE:testhdf5_fortran_1_8>)
-set_tests_properties (FORTRAN_testhdf5_fortran_1_8 PROPERTIES PASS_REGULAR_EXPRESSION "[ ]*0 error.s")
-set_tests_properties (FORTRAN_testhdf5_fortran_1_8 PROPERTIES DEPENDS FORTRAN_testhdf5_fortran)
+if (HDF5_ENABLE_USING_MEMCHECKER)
+  add_test (NAME FORTRAN_testhdf5_fortran_1_8 COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:testhdf5_fortran_1_8>)
+else ()
+  add_test (NAME FORTRAN_testhdf5_fortran_1_8 COMMAND "${CMAKE_COMMAND}"
+      -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
+      -D "TEST_PROGRAM=$<TARGET_FILE:testhdf5_fortran_1_8>"
+      -D "TEST_ARGS:STRING="
+      -D "TEST_EXPECT=0"
+      -D "TEST_SKIP_COMPARE=TRUE"
+      -D "TEST_REGEX= 0 error.s."
+      -D "TEST_MATCH= 0 error(s)"
+      -D "TEST_OUTPUT=testhdf5_fortran_1_8.txt"
+      #-D "TEST_REFERENCE=testhdf5_fortran_1_8.out"
+      -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+      -P "${HDF_RESOURCES_DIR}/runTest.cmake"
+  )
+endif ()
+#set_tests_properties (FORTRAN_testhdf5_fortran_1_8 PROPERTIES PASS_REGULAR_EXPRESSION "[ ]*0 error.s")
+set_tests_properties (FORTRAN_testhdf5_fortran_1_8 PROPERTIES
+    DEPENDS FORTRAN_testhdf5_fortran
+    FIXTURES_REQUIRED clear_testhdf5_fortran
+)
 
 #-- Adding test for fortranlib_test_F03
-if (HDF5_ENABLE_F2003)
-  add_test (NAME FORTRAN_fortranlib_test_F03 COMMAND $<TARGET_FILE:fortranlib_test_F03>)
-  set_tests_properties (FORTRAN_fortranlib_test_F03 PROPERTIES PASS_REGULAR_EXPRESSION "[ ]*0 error.s")
-  set_tests_properties (FORTRAN_fortranlib_test_F03 PROPERTIES DEPENDS FORTRAN_testhdf5_fortran_1_8)
-endif (HDF5_ENABLE_F2003)
+if (HDF5_ENABLE_USING_MEMCHECKER)
+  add_test (NAME FORTRAN_fortranlib_test_F03 COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:fortranlib_test_F03>)
+else ()
+  add_test (NAME FORTRAN_fortranlib_test_F03 COMMAND "${CMAKE_COMMAND}"
+      -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
+      -D "TEST_PROGRAM=$<TARGET_FILE:fortranlib_test_F03>"
+      -D "TEST_ARGS:STRING="
+      -D "TEST_EXPECT=0"
+      -D "TEST_SKIP_COMPARE=TRUE"
+      -D "TEST_REGEX= 0 error.s."
+      -D "TEST_MATCH= 0 error(s)"
+      -D "TEST_OUTPUT=fortranlib_test_F03.txt"
+      #-D "TEST_REFERENCE=fortranlib_test_F03.out"
+      -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+      -P "${HDF_RESOURCES_DIR}/runTest.cmake"
+  )
+endif ()
+#  set_tests_properties (FORTRAN_fortranlib_test_F03 PROPERTIES PASS_REGULAR_EXPRESSION "[ ]*0 error.s")
+set_tests_properties (FORTRAN_fortranlib_test_F03 PROPERTIES
+    DEPENDS FORTRAN_testhdf5_fortran_1_8
+    FIXTURES_REQUIRED clear_testhdf5_fortran
+)
+
+#-- Adding test for vol_connector
+if (HDF5_ENABLE_USING_MEMCHECKER)
+  add_test (NAME FORTRAN_vol_connector COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:vol_connector>)
+else ()
+  add_test (NAME FORTRAN_vol_connector COMMAND "${CMAKE_COMMAND}"
+      -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
+      -D "TEST_PROGRAM=$<TARGET_FILE:vol_connector>"
+      -D "TEST_ARGS:STRING="
+      -D "TEST_EXPECT=0"
+      -D "TEST_SKIP_COMPARE=TRUE"
+      -D "TEST_REGEX= 0 error.s."
+      -D "TEST_MATCH= 0 error(s)"
+      -D "TEST_OUTPUT=vol_connector.txt"
+      #-D "TEST_REFERENCE=vol_connector.out"
+      -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+      -P "${HDF_RESOURCES_DIR}/runTest.cmake"
+  )
+endif ()
+set_tests_properties (FORTRAN_vol_connector PROPERTIES
+    FIXTURES_REQUIRED clear_testhdf5_fortran
+)
 
 #-- Adding test for fflush1
-add_test (NAME FORTRAN_fflush1 COMMAND $<TARGET_FILE:fflush1>)
+add_test (
+    NAME FORTRAN_flush1-clear-objects
+    COMMAND ${CMAKE_COMMAND} -E remove flush.h5
+)
+add_test (
+    NAME FORTRAN_fflush1
+    COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:fflush1>
+)
+set_tests_properties (FORTRAN_fflush1 PROPERTIES
+    DEPENDS FORTRAN_flush1-clear-objects
+)
 
 #-- Adding test for fflush2
-add_test (NAME FORTRAN_fflush2 COMMAND $<TARGET_FILE:fflush2>)
-set_tests_properties (FORTRAN_fflush2 PROPERTIES DEPENDS FORTRAN_fflush1)
+add_test (
+    NAME FORTRAN_fflush2
+    COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:fflush2>
+)
+set_tests_properties (FORTRAN_fflush2 PROPERTIES
+    DEPENDS FORTRAN_fflush1
+)
+add_test (
+    NAME FORTRAN_flush1-clean-objects
+    COMMAND ${CMAKE_COMMAND} -E remove flush.h5
+)
+set_tests_properties (FORTRAN_flush1-clean-objects PROPERTIES
+    DEPENDS FORTRAN_fflush2
+)
diff --git a/fortran/test/H5_test_buildiface.F90 b/fortran/test/H5_test_buildiface.F90
new file mode 100644
index 0000000..0ea3852
--- /dev/null
+++ b/fortran/test/H5_test_buildiface.F90
@@ -0,0 +1,270 @@
+!****p* Program/H5_test_buildiface
+!
+! NAME
+!  Executable: H5_test_buildiface
+!
+! FILE
+!  fortran/src/H5_test_buildiface.F90
+!
+! PURPOSE
+!  This stand alone program is used at build time to generate the program
+!  H5fortran_detect.f90. It cycles through all the available KIND parameters for
+!  integers and reals. The appropriate program and subroutines are then generated
+!  depending on which of the KIND values are found.
+!
+! NOTES
+!  This program uses the Fortran 2008 intrinsic function STORAGE_SIZE or SIZEOF
+!  depending on availability.It generates code that makes use of
+!  STORAGE_SIZE/SIZEOF in H5fortran_detect.f90. STORAGE_SIZE is standard
+!  compliant and should always be chosen over SIZEOF.
+!
+!  The availability of STORAGE_SIZE/SIZEOF is checked at configure time and the TRUE/FALSE
+!  condition is set in the configure variable "FORTRAN_HAVE_STORAGE_SIZE" or
+!  "FORTRAN_HAVE_SIZEOF".
+!
+!  The use of C_SIZOF(X) is not used since the argument X must be an interoperable
+!  data entity.
+!
+! COPYRIGHT
+!  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!  Copyright by The HDF Group.                                                 *
+!  All rights reserved.                                                        *
+!                                                                              *
+!  This file is part of HDF5.  The full HDF5 copyright notice, including       *
+!  terms governing use, modification, and redistribution, is contained in      *
+!  the COPYING file, which can be found at the root of the source code         *
+!  distribution tree, or in https://www.hdfgroup.org/licenses.                 *
+!  If you do not have access to either file, you may request a copy from       *
+!  help@hdfgroup.org.                                                          *
+!  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+! AUTHOR
+!  M. Scot Breitenfeld
+!
+!*****
+
+#include <H5config_f.inc>
+
+PROGRAM H5_test_buildiface
+  USE, INTRINSIC :: ISO_C_BINDING
+  IMPLICIT NONE
+
+! These values are valid REAL KINDs (with corresponding C float) found during configure
+  H5_H5CONFIG_F_NUM_RKIND
+  H5_H5CONFIG_F_RKIND
+! These values are valid INTEGER KINDs (with corresponding C integer) found during configure
+  H5_H5CONFIG_F_NUM_IKIND
+  H5_H5CONFIG_F_IKIND
+
+  INTEGER :: i, j, k
+  CHARACTER(LEN=2) :: chr2
+
+! Generate Fortran Check routines for the tests KIND interfaces.
+
+  OPEN(11,FILE='tf_gen.F90')
+  WRITE(11,'(40(A,/))') &
+'!****h* ROBODoc/TH5_MISC_gen.F90',&
+'!',&
+'! NAME',&
+'!  TH5_MISC_gen',&
+'! ',&
+'! PURPOSE',&
+'!  This module is generated at build by H5_test_buildiface.F90 to handle checking ',&
+'!  in the tests all the detected KINDs.',&
+'!',&
+'! COPYRIGHT',&
+'! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *',&
+'!   Copyright by The HDF Group.                                               *',&
+'!   All rights reserved.                                                      *',&
+'!                                                                             *',&
+'!   This file is part of HDF5.  The full HDF5 copyright notice, including     *',&
+'!   terms governing use, modification, and redistribution, is contained in    *',&
+'!   the COPYING file, which can be found at the root of the source code       *',&
+'!   distribution tree, or in https://www.hdfgroup.org/licenses.               *',&
+'!   If you do not have access to either file, you may request a copy from     *',&
+'!   help@hdfgroup.org.                                                        *',&
+'! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *',&
+'!',&
+'! AUTHOR',&
+'!  H5_test_buildiface.F90',&
+'!',&
+'!*****'
+
+  WRITE(11,'(a)') "MODULE TH5_MISC_gen"
+
+  WRITE(11,'(A)') '  USE, INTRINSIC :: ISO_C_BINDING'
+
+! Interfaces for validating REALs, INTEGERs, CHARACTERs, LOGICALs
+
+  WRITE(11,'(A)') '  INTERFACE verify'
+  DO i = 1, num_rkinds
+     j = rkind(i)
+     WRITE(chr2,'(I2)') j
+     WRITE(11,'(A)') "     MODULE PROCEDURE verify_real_kind_"//TRIM(ADJUSTL(chr2))
+  END DO
+  DO i = 1, num_ikinds
+     j = ikind(i)
+     WRITE(chr2,'(I2)') j
+     WRITE(11,'(A)') "     MODULE PROCEDURE verify_integer_kind_"//TRIM(ADJUSTL(chr2))
+  END DO
+  WRITE(11,'(A)') "     MODULE PROCEDURE verify_character"
+  WRITE(11,'(A)') "     MODULE PROCEDURE verify_logical"
+  WRITE(11,'(A)') "  END INTERFACE"
+
+  WRITE(11,'(A)') '  INTERFACE check_real_eq'
+  DO i = 1, num_rkinds
+     j = rkind(i)
+     WRITE(chr2,'(I2)') j
+     WRITE(11,'(A)') "     MODULE PROCEDURE real_eq_kind_"//TRIM(ADJUSTL(chr2))
+  END DO
+  WRITE(11,'(A)') "  END INTERFACE"
+
+  WRITE(11,'(A)') 'CONTAINS'
+
+! ***************************
+! VALIDATE INTEGERS
+! ***************************
+  DO i = 1, num_ikinds
+     k = ikind(i)
+     WRITE(chr2,'(I2)') k
+! DLL definitions for windows
+     WRITE(11,'(A)') '!DEC$if defined(BUILD_HDF5_TEST_DLL)'
+     WRITE(11,'(A)') '!DEC$attributes dllexport :: verify_integer_kind_'//TRIM(ADJUSTL(chr2))
+     WRITE(11,'(A)') '!DEC$endif'
+
+! Subroutine API
+     WRITE(11,'(A)') '  SUBROUTINE verify_integer_kind_'//TRIM(ADJUSTL(chr2))//'(string,value,correct_value,total_error)'
+     WRITE(11,'(A)') '    IMPLICIT NONE'
+     WRITE(11,'(A)') '    CHARACTER(LEN=*) :: string'
+     WRITE(11,'(A)') '    INTEGER(KIND='//TRIM(ADJUSTL(chr2))//') :: value, correct_value'
+     WRITE(11,'(A)') '    INTEGER :: total_error'
+     WRITE(11,'(A)') '    IF (value .NE. correct_value) THEN'
+     WRITE(11,'(A)') '       total_error=total_error+1'
+     WRITE(11,'(A)') '       WRITE(*,*) "ERROR: INCORRECT INTEGER VALIDATION ", string'
+     WRITE(11,'(A)') '    ENDIF'
+     WRITE(11,'(A)') '  END SUBROUTINE verify_integer_kind_'//TRIM(ADJUSTL(chr2))
+ ENDDO
+
+! ***************************
+! VALIDATE REALS
+! ***************************
+  DO i = 1, num_rkinds
+     k = rkind(i)
+     WRITE(chr2,'(I2)') k
+! DLL definitions for windows
+     WRITE(11,'(A)') '!DEC$if defined(BUILD_HDF5_TEST_DLL)'
+     WRITE(11,'(A)') '!DEC$attributes dllexport :: verify_real_kind_'//TRIM(ADJUSTL(chr2))
+     WRITE(11,'(A)') '!DEC$endif'
+
+! Subroutine API
+     WRITE(11,'(A)') '  SUBROUTINE verify_real_kind_'//TRIM(ADJUSTL(chr2))//'(string,value,correct_value,total_error)'
+     WRITE(11,'(A)') '    IMPLICIT NONE'
+     WRITE(11,'(A)') '    CHARACTER(LEN=*) :: string'
+     WRITE(11,'(A)') '    REAL(KIND='//TRIM(ADJUSTL(chr2))//') :: value, correct_value'
+     WRITE(11,'(A)') '    INTEGER :: total_error'
+     WRITE(11,'(A)') '    IF (.NOT.real_eq_kind_'//TRIM(ADJUSTL(chr2))//'( value, correct_value) ) THEN'
+     WRITE(11,'(A)') '       total_error=total_error+1'
+     WRITE(11,'(A)') '       WRITE(*,*) "ERROR: INCORRECT REAL VALIDATION ", string'
+     WRITE(11,'(A)') '    ENDIF'
+     WRITE(11,'(A)') '  END SUBROUTINE verify_real_kind_'//TRIM(ADJUSTL(chr2))
+
+
+! ***********************************
+! TEST IF TWO REAL NUMBERS ARE EQUAL
+! ***********************************
+
+!   [1] The test performed is
+!
+!         ABS( x - y ) < ( ULP * SPACING( MAX(ABS(x),ABS(y)) ) )
+!
+!       The numbers are considered equal if true
+!
+!       The intrinsic function SPACING(x) returns the absolute spacing of numbers
+!       near the value of x,
+!
+!                      {     EXPONENT(x)-DIGITS(x)
+!                      {  2.0                        for x /= 0
+!         SPACING(x) = {
+!                      {
+!                      {  TINY(x)                    for x == 0
+!
+!       The ULP optional argument scales the comparison:
+!
+!         Unit of data precision. The acronym stands for "unit in
+!         the last place," the smallest possible increment or decrement
+!         that can be made using a machine's floating point arithmetic.
+!         A 0.5 ulp maximum error is the best you could hope for, since
+!         this corresponds to always rounding to the nearest representable
+!         floating-point number. Value must be positive - if a negative
+!         value is supplied, the absolute value is used.
+!         If not specified, the default value is 1.
+!
+!       James Van Buskirk and James Giles suggested this method for floating
+!       point comparisons in the comp.lang.fortran newsgroup.
+!
+!       Reference: [1] Paul van Delst,  paul.vandelst@ssec.wisc.edu
+
+     WRITE(11,'(A)') '!DEC$if defined(BUILD_HDF5_TEST_DLL)'
+     WRITE(11,'(A)') '!DEC$attributes dllexport :: real_eq_kind_'//TRIM(ADJUSTL(chr2))
+     WRITE(11,'(A)') '!DEC$endif'
+     WRITE(11,'(A)') '  LOGICAL FUNCTION real_eq_kind_'//TRIM(ADJUSTL(chr2))//'(a,b,ulp)'
+     WRITE(11,'(A)') '    IMPLICIT NONE'
+     WRITE(11,'(A)') '    REAL(KIND='//TRIM(ADJUSTL(chr2))//'), INTENT (in):: a,b'
+     WRITE(11,'(A)') '    REAL(KIND='//TRIM(ADJUSTL(chr2))//') :: Rel'
+     WRITE(11,'(A)') '    INTEGER,        OPTIONAL, INTENT( IN )  :: ulp'
+     WRITE(11,'(A)') '    IF ( PRESENT( ulp ) )  Rel = REAL( ABS(ulp), '//TRIM(ADJUSTL(chr2))//')'
+     WRITE(11,'(A)') '    Rel = 1.0_'//TRIM(ADJUSTL(chr2))
+     WRITE(11,'(A)') '    real_eq_kind_'//TRIM(ADJUSTL(chr2))//' = ABS( a - b ) < ( Rel * SPACING( MAX(ABS(a),ABS(b)) ) )'
+     WRITE(11,'(A)') '  END FUNCTION real_eq_kind_'//TRIM(ADJUSTL(chr2))
+  ENDDO
+
+! ***************************
+! VALIDATE CHARACTER STRINGS
+! ***************************
+
+! DLL definitions for windows
+  WRITE(11,'(A)') '!DEC$if defined(BUILD_HDF5_TEST_DLL)'
+  WRITE(11,'(A)') '!DEC$attributes dllexport :: verify_character'
+  WRITE(11,'(A)') '!DEC$endif'
+
+! Subroutine API
+  WRITE(11,'(A)') '  SUBROUTINE verify_character(string,value,correct_value,total_error)'
+  WRITE(11,'(A)') '    IMPLICIT NONE'
+  WRITE(11,'(A)') '    CHARACTER*(*) :: string'
+  WRITE(11,'(A)') '    CHARACTER*(*) :: value, correct_value'
+  WRITE(11,'(A)') '    INTEGER :: total_error'
+  WRITE(11,'(A)') '    IF (TRIM(value) .NE. TRIM(correct_value)) THEN'
+  WRITE(11,'(A)') '       total_error = total_error + 1'
+  WRITE(11,'(A)') '       WRITE(*,*) "ERROR: INCORRECT VALIDATION ", string'
+  WRITE(11,'(A)') '    ENDIF'
+  WRITE(11,'(A)') '  END SUBROUTINE verify_character'
+
+! ***************************
+! VALIDATE LOGICAL
+! ***************************
+
+! DLL definitions for windows
+  WRITE(11,'(A)') '!DEC$if defined(BUILD_HDF5_TEST_DLL)'
+  WRITE(11,'(A)') '!DEC$attributes dllexport :: verify_logical'
+  WRITE(11,'(A)') '!DEC$endif'
+! Subroutine API
+  WRITE(11,'(A)') '  SUBROUTINE verify_logical(string,value,correct_value,total_error)'
+  WRITE(11,'(A)') '    IMPLICIT NONE'
+  WRITE(11,'(A)') '    CHARACTER(LEN=*) :: string'
+  WRITE(11,'(A)') '    LOGICAL :: value, correct_value'
+  WRITE(11,'(A)') '    INTEGER :: total_error'
+  WRITE(11,'(A)') '    IF (value .NEQV. correct_value) THEN'
+  WRITE(11,'(A)') '       total_error = total_error + 1'
+  WRITE(11,'(A)') '       WRITE(*,*) "ERROR: INCORRECT VALIDATION ", string'
+  WRITE(11,'(A)') '    ENDIF'
+
+  WRITE(11,'(A)') '  END SUBROUTINE verify_logical'
+
+  WRITE(11,'(A)') "END MODULE TH5_MISC_gen"
+
+  CLOSE(11)
+
+END PROGRAM H5_test_buildiface
+
+
+
diff --git a/fortran/test/Makefile.am b/fortran/test/Makefile.am
index 735ab7a..7d85a27 100644
--- a/fortran/test/Makefile.am
+++ b/fortran/test/Makefile.am
@@ -1,16 +1,13 @@
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 ##
 ## Makefile.am
 ## Run automake to generate a Makefile.in from this file.
@@ -36,60 +33,26 @@ else
    AM_LDFLAGS+=-static
 endif
 
-# Check if the compiler supports the Fortran 2003 standard
-# which should include the intrinsic module iso_c_binding
-if FORTRAN_2003_CONDITIONAL_F
-   ff_PREFIX = F03
-else
-   ff_PREFIX = F90
-endif
-
 # Our main targets, the tests themselves
-TEST_PROG=fortranlib_test fflush1 fflush2 fortranlib_test_1_8
-
-if FORTRAN_2003_CONDITIONAL_F
-   TEST_PROG += fortranlib_test_F03
-endif
+TEST_PROG=fortranlib_test fflush1 fflush2 fortranlib_test_1_8 fortranlib_test_F03 vol_connector
 
 check_PROGRAMS=$(TEST_PROG)
 
-if FORTRAN_HAVE_STORAGE_SIZE
-if FORTRAN_HAVE_C_SIZEOF
-    libh5test_fortran_la_SOURCES = tf_F08.f90
-else
-    libh5test_fortran_la_SOURCES = tf_F03.f90
-endif
-else
-if FORTRAN_2003_CONDITIONAL_F
-  libh5test_fortran_la_SOURCES = tf_F03.f90
-else
-  libh5test_fortran_la_SOURCES = tf_F90.f90
-endif
-endif
+libh5test_fortran_la_SOURCES = tf_gen.F90 tf.F90  t.c
 
-# tf.f90 depends on either tf_F08.f90 or tf_F03.f90 so they need to be
-# compiled first
-libh5test_fortran_la_SOURCES += tf.f90 t.c
+fortranlib_test_SOURCES = tH5F.F90 tH5D.F90 tH5R.F90 tH5S.F90 tH5T.F90 tH5VL.F90 tH5Z.F90 \
+        tH5Sselect.F90 tH5P.F90 tH5A.F90 tH5I.F90 tH5G.F90 tH5E.F90 tHDF5.F90 fortranlib_test.F90
 
-# Source files are used for both the library and fortranlib_test.
-# Automake will complain about this without the following workaround.
-fortranlib_test_FCFLAGS=$(AM_FCFLAGS)
-fortranlib_test_CFLAGS=$(AM_CFLAGS)
+fortranlib_test_1_8_SOURCES = tH5O.F90 tH5A_1_8.F90 tH5G_1_8.F90 tH5MISC_1_8.F90 tHDF5_1_8.F90 \
+        fortranlib_test_1_8.F90
 
-fortranlib_test_SOURCES = tH5F.f90 tH5D.f90 tH5R.f90 tH5S.f90 tH5T.f90 tH5VL.f90 tH5Z.f90 \
-        tH5Sselect.f90 tH5P.f90 tH5A.f90 tH5I.f90 tH5G.f90 tH5E.f90 tHDF5.f90 fortranlib_test.f90
+fortranlib_test_F03_SOURCES = tH5E_F03.F90 tH5F_F03.F90 tH5L_F03.F90 \
+        tH5O_F03.F90 tH5P_F03.F90 tH5T_F03.F90 tHDF5_F03.F90 fortranlib_test_F03.F90
 
-fortranlib_test_1_8_SOURCES = tH5O.f90 tH5A_1_8.f90 tH5G_1_8.f90 tH5MISC_1_8.f90 tHDF5_1_8.f90\
-        fortranlib_test_1_8.f90
+vol_connector_SOURCES=vol_connector.F90
 
-if FORTRAN_2003_CONDITIONAL_F
-   fortranlib_test_F03_SOURCES = tH5E_F03.f90 tH5F_F03.f90 tH5L_F03.f90 \
-        tH5O_F03.f90 tH5P_F03.f90 tH5T_F03.f90 tHDF5_F03.f90 fortranlib_test_F03.f90
-endif
-
-
-fflush1_SOURCES=fflush1.f90
-fflush2_SOURCES=fflush2.f90
+fflush1_SOURCES=fflush1.F90
+fflush2_SOURCES=fflush2.F90
 
 # The tests depend on both fortran libraries and both main libraries.
 LDADD=libh5test_fortran.la $(LIBH5TEST) $(LIBH5F) $(LIBHDF5)
@@ -106,15 +69,34 @@ maintainer-clean-local: clean-local
 distclean-local: clean-local
 clean-local:
 	@if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \
-	  $(RM) *.$(F9XMODEXT);                                         \
+	  $(RM) *.$(F9XMODEXT) tf_gen.F90;                                         \
 	fi
 
 # Mark this directory as part of the Fortran API (this affects output
 # from tests in conclude.am)
 FORTRAN_API=yes
 
+# helper program we need to build.
+noinst_PROGRAMS = H5_test_buildiface
+
+# H5_test_buildiface.F90 generates all the test APIs that have a KIND type associated
+# with them.
+
+tf_gen.F90: H5_test_buildiface$(EXEEXT)
+	$(RUNSERIAL) ./H5_test_buildiface$(EXEEXT)
+
+# H5_test_buildiface.F90 is included in the distribution, and Automake knows
+# how to compile a fortran program given its sources.
+
+H5_test_buildiface_SOURCES = H5_test_buildiface.F90
+
+# The build of the H5_test_buildiface does not depend on any libraries, so set it
+# to nothing.
+
+H5_test_buildiface_LDADD =
+
 # fflush2 depends on files created by fflush1
 fflush2.chkexe_: fflush1.chkexe_
 
 
-include $(top_srcdir)/config/conclude.am
+include $(top_srcdir)/config/conclude_fc.am
diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in
deleted file mode 100644
index 445e75d..0000000
--- a/fortran/test/Makefile.in
+++ /dev/null
@@ -1,1662 +0,0 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-DIST_COMMON = $(top_srcdir)/config/commence.am \
-	$(top_srcdir)/config/conclude.am $(srcdir)/Makefile.in \
-	$(srcdir)/Makefile.am $(top_srcdir)/bin/mkinstalldirs \
-	$(top_srcdir)/bin/depcomp $(top_srcdir)/bin/test-driver
-
-# Some Fortran compilers can't build shared libraries, so sometimes we
-# want to build a shared C library and a static Fortran library.  If so,
-# pass the -static flag to the library linker.
-@FORTRAN_SHARED_CONDITIONAL_FALSE@am__append_1 = -static
-@FORTRAN_2003_CONDITIONAL_F_TRUE@am__append_2 = fortranlib_test_F03
-check_PROGRAMS = $(am__EXEEXT_2)
-TESTS = $(am__EXEEXT_2)
-subdir = fortran/test
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/aclocal_cxx.m4 \
-	$(top_srcdir)/m4/aclocal_fc.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/src/H5config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
-libh5test_fortran_la_LIBADD =
-am__libh5test_fortran_la_SOURCES_DIST = tf_F90.f90 tf.f90 t.c \
-	tf_F03.f90 tf_F08.f90
-@FORTRAN_2003_CONDITIONAL_F_FALSE@@FORTRAN_HAVE_STORAGE_SIZE_FALSE@am_libh5test_fortran_la_OBJECTS = tf_F90.lo \
-@FORTRAN_2003_CONDITIONAL_F_FALSE@@FORTRAN_HAVE_STORAGE_SIZE_FALSE@	tf.lo \
-@FORTRAN_2003_CONDITIONAL_F_FALSE@@FORTRAN_HAVE_STORAGE_SIZE_FALSE@	t.lo
-@FORTRAN_2003_CONDITIONAL_F_TRUE@@FORTRAN_HAVE_STORAGE_SIZE_FALSE@am_libh5test_fortran_la_OBJECTS = tf_F03.lo \
-@FORTRAN_2003_CONDITIONAL_F_TRUE@@FORTRAN_HAVE_STORAGE_SIZE_FALSE@	tf.lo \
-@FORTRAN_2003_CONDITIONAL_F_TRUE@@FORTRAN_HAVE_STORAGE_SIZE_FALSE@	t.lo
-@FORTRAN_HAVE_C_SIZEOF_FALSE@@FORTRAN_HAVE_STORAGE_SIZE_TRUE@am_libh5test_fortran_la_OBJECTS = tf_F03.lo \
-@FORTRAN_HAVE_C_SIZEOF_FALSE@@FORTRAN_HAVE_STORAGE_SIZE_TRUE@	tf.lo \
-@FORTRAN_HAVE_C_SIZEOF_FALSE@@FORTRAN_HAVE_STORAGE_SIZE_TRUE@	t.lo
-@FORTRAN_HAVE_C_SIZEOF_TRUE@@FORTRAN_HAVE_STORAGE_SIZE_TRUE@am_libh5test_fortran_la_OBJECTS = tf_F08.lo \
-@FORTRAN_HAVE_C_SIZEOF_TRUE@@FORTRAN_HAVE_STORAGE_SIZE_TRUE@	tf.lo \
-@FORTRAN_HAVE_C_SIZEOF_TRUE@@FORTRAN_HAVE_STORAGE_SIZE_TRUE@	t.lo
-libh5test_fortran_la_OBJECTS = $(am_libh5test_fortran_la_OBJECTS)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 = 
-@FORTRAN_2003_CONDITIONAL_F_TRUE@am__EXEEXT_1 =  \
-@FORTRAN_2003_CONDITIONAL_F_TRUE@	fortranlib_test_F03$(EXEEXT)
-am__EXEEXT_2 = fortranlib_test$(EXEEXT) fflush1$(EXEEXT) \
-	fflush2$(EXEEXT) fortranlib_test_1_8$(EXEEXT) $(am__EXEEXT_1)
-am_fflush1_OBJECTS = fflush1.$(OBJEXT)
-fflush1_OBJECTS = $(am_fflush1_OBJECTS)
-fflush1_LDADD = $(LDADD)
-fflush1_DEPENDENCIES = libh5test_fortran.la $(LIBH5TEST) $(LIBH5F) \
-	$(LIBHDF5)
-am_fflush2_OBJECTS = fflush2.$(OBJEXT)
-fflush2_OBJECTS = $(am_fflush2_OBJECTS)
-fflush2_LDADD = $(LDADD)
-fflush2_DEPENDENCIES = libh5test_fortran.la $(LIBH5TEST) $(LIBH5F) \
-	$(LIBHDF5)
-am_fortranlib_test_OBJECTS = fortranlib_test-tH5F.$(OBJEXT) \
-	fortranlib_test-tH5D.$(OBJEXT) fortranlib_test-tH5R.$(OBJEXT) \
-	fortranlib_test-tH5S.$(OBJEXT) fortranlib_test-tH5T.$(OBJEXT) \
-	fortranlib_test-tH5VL.$(OBJEXT) fortranlib_test-tH5Z.$(OBJEXT) \
-	fortranlib_test-tH5Sselect.$(OBJEXT) \
-	fortranlib_test-tH5P.$(OBJEXT) fortranlib_test-tH5A.$(OBJEXT) \
-	fortranlib_test-tH5I.$(OBJEXT) fortranlib_test-tH5G.$(OBJEXT) \
-	fortranlib_test-tH5E.$(OBJEXT) fortranlib_test-tHDF5.$(OBJEXT) \
-	fortranlib_test-fortranlib_test.$(OBJEXT)
-fortranlib_test_OBJECTS = $(am_fortranlib_test_OBJECTS)
-fortranlib_test_LDADD = $(LDADD)
-fortranlib_test_DEPENDENCIES = libh5test_fortran.la $(LIBH5TEST) \
-	$(LIBH5F) $(LIBHDF5)
-fortranlib_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=FC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(FCLD) \
-	$(fortranlib_test_FCFLAGS) $(FCFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-	-o $@
-am_fortranlib_test_1_8_OBJECTS = tH5O.$(OBJEXT) tH5A_1_8.$(OBJEXT) \
-	tH5G_1_8.$(OBJEXT) tH5MISC_1_8.$(OBJEXT) tHDF5_1_8.$(OBJEXT) \
-	fortranlib_test_1_8.$(OBJEXT)
-fortranlib_test_1_8_OBJECTS = $(am_fortranlib_test_1_8_OBJECTS)
-fortranlib_test_1_8_LDADD = $(LDADD)
-fortranlib_test_1_8_DEPENDENCIES = libh5test_fortran.la $(LIBH5TEST) \
-	$(LIBH5F) $(LIBHDF5)
-am__fortranlib_test_F03_SOURCES_DIST = tH5E_F03.f90 tH5F_F03.f90 \
-	tH5L_F03.f90 tH5O_F03.f90 tH5P_F03.f90 tH5T_F03.f90 \
-	tHDF5_F03.f90 fortranlib_test_F03.f90
-@FORTRAN_2003_CONDITIONAL_F_TRUE@am_fortranlib_test_F03_OBJECTS =  \
-@FORTRAN_2003_CONDITIONAL_F_TRUE@	tH5E_F03.$(OBJEXT) \
-@FORTRAN_2003_CONDITIONAL_F_TRUE@	tH5F_F03.$(OBJEXT) \
-@FORTRAN_2003_CONDITIONAL_F_TRUE@	tH5L_F03.$(OBJEXT) \
-@FORTRAN_2003_CONDITIONAL_F_TRUE@	tH5O_F03.$(OBJEXT) \
-@FORTRAN_2003_CONDITIONAL_F_TRUE@	tH5P_F03.$(OBJEXT) \
-@FORTRAN_2003_CONDITIONAL_F_TRUE@	tH5T_F03.$(OBJEXT) \
-@FORTRAN_2003_CONDITIONAL_F_TRUE@	tHDF5_F03.$(OBJEXT) \
-@FORTRAN_2003_CONDITIONAL_F_TRUE@	fortranlib_test_F03.$(OBJEXT)
-fortranlib_test_F03_OBJECTS = $(am_fortranlib_test_F03_OBJECTS)
-fortranlib_test_F03_LDADD = $(LDADD)
-fortranlib_test_F03_DEPENDENCIES = libh5test_fortran.la $(LIBH5TEST) \
-	$(LIBH5F) $(LIBHDF5)
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
-depcomp = $(SHELL) $(top_srcdir)/bin/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC      " $@;
-am__v_CC_1 = 
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD    " $@;
-am__v_CCLD_1 = 
-FCCOMPILE = $(FC) $(AM_FCFLAGS) $(FCFLAGS)
-LTFCCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=FC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(FC) $(AM_FCFLAGS) $(FCFLAGS)
-AM_V_FC = $(am__v_FC_@AM_V@)
-am__v_FC_ = $(am__v_FC_@AM_DEFAULT_V@)
-am__v_FC_0 = @echo "  FC      " $@;
-am__v_FC_1 = 
-FCLD = $(FC)
-FCLINK = $(LIBTOOL) $(AM_V_lt) --tag=FC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(FCLD) $(AM_FCFLAGS) $(FCFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_FCLD = $(am__v_FCLD_@AM_V@)
-am__v_FCLD_ = $(am__v_FCLD_@AM_DEFAULT_V@)
-am__v_FCLD_0 = @echo "  FCLD    " $@;
-am__v_FCLD_1 = 
-SOURCES = $(libh5test_fortran_la_SOURCES) $(fflush1_SOURCES) \
-	$(fflush2_SOURCES) $(fortranlib_test_SOURCES) \
-	$(fortranlib_test_1_8_SOURCES) $(fortranlib_test_F03_SOURCES)
-DIST_SOURCES = $(am__libh5test_fortran_la_SOURCES_DIST) \
-	$(fflush1_SOURCES) $(fflush2_SOURCES) \
-	$(fortranlib_test_SOURCES) $(fortranlib_test_1_8_SOURCES) \
-	$(am__fortranlib_test_F03_SOURCES_DIST)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-am__tty_colors_dummy = \
-  mgn= red= grn= lgn= blu= brg= std=; \
-  am__color_tests=no
-am__tty_colors = { \
-  $(am__tty_colors_dummy); \
-  if test "X$(AM_COLOR_TESTS)" = Xno; then \
-    am__color_tests=no; \
-  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
-    am__color_tests=yes; \
-  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
-    am__color_tests=yes; \
-  fi; \
-  if test $$am__color_tests = yes; then \
-    red='[0;31m'; \
-    grn='[0;32m'; \
-    lgn='[1;32m'; \
-    blu='[1;34m'; \
-    mgn='[0;35m'; \
-    brg='[1m'; \
-    std='[m'; \
-  fi; \
-}
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__recheck_rx = ^[ 	]*:recheck:[ 	]*
-am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
-am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
-# A command that, given a newline-separated list of test names on the
-# standard input, print the name of the tests that are to be re-run
-# upon "make recheck".
-am__list_recheck_tests = $(AWK) '{ \
-  recheck = 1; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-        { \
-          if ((getline line2 < ($$0 ".log")) < 0) \
-	    recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
-        { \
-          recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
-        { \
-          break; \
-        } \
-    }; \
-  if (recheck) \
-    print $$0; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# A command that, given a newline-separated list of test names on the
-# standard input, create the global log from their .trs and .log files.
-am__create_global_log = $(AWK) ' \
-function fatal(msg) \
-{ \
-  print "fatal: making $@: " msg | "cat >&2"; \
-  exit 1; \
-} \
-function rst_section(header) \
-{ \
-  print header; \
-  len = length(header); \
-  for (i = 1; i <= len; i = i + 1) \
-    printf "="; \
-  printf "\n\n"; \
-} \
-{ \
-  copy_in_global_log = 1; \
-  global_test_result = "RUN"; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-         fatal("failed to read from " $$0 ".trs"); \
-      if (line ~ /$(am__global_test_result_rx)/) \
-        { \
-          sub("$(am__global_test_result_rx)", "", line); \
-          sub("[ 	]*$$", "", line); \
-          global_test_result = line; \
-        } \
-      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
-        copy_in_global_log = 0; \
-    }; \
-  if (copy_in_global_log) \
-    { \
-      rst_section(global_test_result ": " $$0); \
-      while ((rc = (getline line < ($$0 ".log"))) != 0) \
-      { \
-        if (rc < 0) \
-          fatal("failed to read from " $$0 ".log"); \
-        print line; \
-      }; \
-      printf "\n"; \
-    }; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# Restructured Text title.
-am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
-# Solaris 10 'make', and several other traditional 'make' implementations,
-# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
-# by disabling -e (using the XSI extension "set +e") if it's set.
-am__sh_e_setup = case $$- in *e*) set +e;; esac
-# Default flags passed to test drivers.
-am__common_driver_flags = \
-  --color-tests "$$am__color_tests" \
-  --enable-hard-errors "$$am__enable_hard_errors" \
-  --expect-failure "$$am__expect_failure"
-# To be inserted before the command running the test.  Creates the
-# directory for the log if needed.  Stores in $dir the directory
-# containing $f, in $tst the test, in $log the log.  Executes the
-# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
-# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
-# will run the test scripts (or their associated LOG_COMPILER, if
-# thy have one).
-am__check_pre = \
-$(am__sh_e_setup);					\
-$(am__vpath_adj_setup) $(am__vpath_adj)			\
-$(am__tty_colors);					\
-srcdir=$(srcdir); export srcdir;			\
-case "$@" in						\
-  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
-    *) am__odir=.;; 					\
-esac;							\
-test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
-  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
-if test -f "./$$f"; then dir=./;			\
-elif test -f "$$f"; then dir=;				\
-else dir="$(srcdir)/"; fi;				\
-tst=$$dir$$f; log='$@'; 				\
-if test -n '$(DISABLE_HARD_ERRORS)'; then		\
-  am__enable_hard_errors=no; 				\
-else							\
-  am__enable_hard_errors=yes; 				\
-fi; 							\
-case " $(XFAIL_TESTS) " in				\
-  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
-    am__expect_failure=yes;;				\
-  *)							\
-    am__expect_failure=no;;				\
-esac; 							\
-$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
-# A shell command to get the names of the tests scripts with any registered
-# extension removed (i.e., equivalently, the names of the test logs, with
-# the '.log' extension removed).  The result is saved in the shell variable
-# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
-# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
-# since that might cause problem with VPATH rewrites for suffix-less tests.
-# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
-am__set_TESTS_bases = \
-  bases='$(TEST_LOGS)'; \
-  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
-  bases=`echo $$bases`
-RECHECK_LOGS = $(TEST_LOGS)
-AM_RECURSIVE_TARGETS = check recheck
-TEST_SUITE_LOG = test-suite.log
-LOG_DRIVER = $(SHELL) $(top_srcdir)/bin/test-driver
-LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
-am__set_b = \
-  case '$@' in \
-    */*) \
-      case '$*' in \
-        */*) b='$*';; \
-          *) b=`echo '$@' | sed 's/\.log$$//'`; \
-       esac;; \
-    *) \
-      b='$*';; \
-  esac
-am__test_logs1 = $(TESTS:=.log)
-am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
-TEST_LOGS = $(am__test_logs2:.sh.log=.log)
-SH_LOG_DRIVER = $(SHELL) $(top_srcdir)/bin/test-driver
-SH_LOG_COMPILE = $(SH_LOG_COMPILER) $(AM_SH_LOG_FLAGS) $(SH_LOG_FLAGS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
-AMTAR = @AMTAR@
-
-# H5_CFLAGS holds flags that should be used when building hdf5,
-# but which should not be exported to h5cc for building other programs.
-# AM_CFLAGS is an automake construct which should be used by Makefiles 
-# instead of CFLAGS, as CFLAGS is reserved solely for the user to define.
-# This applies to FCFLAGS, CXXFLAGS, CPPFLAGS, and LDFLAGS as well.
-AM_CFLAGS = @AM_CFLAGS@ @H5_CFLAGS@
-AM_CPPFLAGS = @AM_CPPFLAGS@ @H5_CPPFLAGS@ -I$(top_srcdir)/src \
-	-I$(top_builddir)/fortran/src
-AM_CXXFLAGS = @AM_CXXFLAGS@ @H5_CXXFLAGS@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-
-# Include files
-AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@ -I$(top_builddir)/fortran/src \
-	$(F9XMODFLAG)$(top_builddir)/fortran/src
-AM_LDFLAGS = @AM_LDFLAGS@ @H5_LDFLAGS@ $(am__append_1)
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BYTESEX = @BYTESEX@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CC_VERSION = @CC_VERSION@
-CFLAGS = @CFLAGS@
-CLEARFILEBUF = @CLEARFILEBUF@
-CODESTACK = @CODESTACK@
-CONFIG_DATE = @CONFIG_DATE@
-CONFIG_MODE = @CONFIG_MODE@
-CONFIG_USER = @CONFIG_USER@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CXX_VERSION = @CXX_VERSION@
-CYGPATH_W = @CYGPATH_W@
-DEBUG_PKG = @DEBUG_PKG@
-DEFAULT_API_VERSION = @DEFAULT_API_VERSION@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
-DIRECT_VFD = @DIRECT_VFD@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-EXTERNAL_FILTERS = @EXTERNAL_FILTERS@
-
-# Make sure that these variables are exported to the Makefiles
-F9XMODEXT = @F9XMODEXT@
-F9XMODFLAG = @F9XMODFLAG@
-F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
-FC = @FC@
-FC2003 = @FC2003@
-FCFLAGS = @FCFLAGS@
-FCFLAGS_f90 = @FCFLAGS_f90@
-FCLIBS = @FCLIBS@
-FC_VERSION = @FC_VERSION@
-FGREP = @FGREP@
-FSEARCH_DIRS = @FSEARCH_DIRS@
-GREP = @GREP@
-H5_CFLAGS = @H5_CFLAGS@
-H5_CPPFLAGS = @H5_CPPFLAGS@
-H5_CXXFLAGS = @H5_CXXFLAGS@
-H5_CXX_SHARED = @H5_CXX_SHARED@
-H5_FCFLAGS = @H5_FCFLAGS@
-H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@
-H5_LDFLAGS = @H5_LDFLAGS@
-H5_LONE_COLON = @H5_LONE_COLON@
-H5_VERSION = @H5_VERSION@
-HADDR_T = @HADDR_T@
-HAVE_DMALLOC = @HAVE_DMALLOC@
-HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@
-HAVE_PTHREAD = @HAVE_PTHREAD@
-HDF5_HL = @HDF5_HL@
-HDF5_INTERFACES = @HDF5_INTERFACES@
-HDF_CXX = @HDF_CXX@
-HDF_FORTRAN = @HDF_FORTRAN@
-HDF_FORTRAN2003 = @HDF_FORTRAN2003@
-HID_T = @HID_T@
-HL = @HL@
-HL_FOR = @HL_FOR@
-HSIZE_T = @HSIZE_T@
-HSSIZE_T = @HSSIZE_T@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTRUMENT = @INSTRUMENT@
-INSTRUMENT_LIBRARY = @INSTRUMENT_LIBRARY@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LL_PATH = @LL_PATH@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_STATIC_EXEC = @LT_STATIC_EXEC@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MPE = @MPE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJECT_NAMELEN_DEFAULT_F = @OBJECT_NAMELEN_DEFAULT_F@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PARALLEL = @PARALLEL@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-RANLIB = @RANLIB@
-ROOT = @ROOT@
-RUNPARALLEL = @RUNPARALLEL@
-RUNSERIAL = @RUNSERIAL@
-R_INTEGER = @R_INTEGER@
-R_LARGE = @R_LARGE@
-SEARCH = @SEARCH@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SIZE_T = @SIZE_T@
-STATIC_EXEC = @STATIC_EXEC@
-STATIC_SHARED = @STATIC_SHARED@
-STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@
-STRIP = @STRIP@
-TESTPARALLEL = @TESTPARALLEL@
-THREADSAFE = @THREADSAFE@
-TIME = @TIME@
-TR = @TR@
-TRACE_API = @TRACE_API@
-UNAME_INFO = @UNAME_INFO@
-USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
-USE_FILTER_SZIP = @USE_FILTER_SZIP@
-USINGMEMCHECKER = @USINGMEMCHECKER@
-VERSION = @VERSION@
-WORDS_BIGENDIAN = @WORDS_BIGENDIAN@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_FC = @ac_ct_FC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-
-# Install directories that automake doesn't know about
-docdir = $(exec_prefix)/doc
-dvidir = @dvidir@
-enable_shared = @enable_shared@
-enable_static = @enable_static@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-
-# Shell commands used in Makefiles
-RM = rm -f
-CP = cp
-
-# Some machines need a command to run executables; this is that command
-# so that our tests will run.
-# We use RUNEXEC instead of RUNSERIAL directly because it may be that
-# some tests need to be run with a different command.  Older versions
-# of the makefiles used the command
-# $(LIBTOOL) --mode=execute
-# in some directories, for instance.
-RUNEXEC = $(RUNSERIAL)
-
-# Libraries to link to while building
-LIBHDF5 = $(top_builddir)/src/libhdf5.la
-LIBH5TEST = $(top_builddir)/test/libh5test.la
-LIBH5F = $(top_builddir)/fortran/src/libhdf5_fortran.la
-LIBH5FTEST = $(top_builddir)/fortran/test/libh5test_fortran.la
-LIBH5CPP = $(top_builddir)/c++/src/libhdf5_cpp.la
-LIBH5TOOLS = $(top_builddir)/tools/lib/libh5tools.la
-LIBH5_HL = $(top_builddir)/hl/src/libhdf5_hl.la
-LIBH5F_HL = $(top_builddir)/hl/fortran/src/libhdf5hl_fortran.la
-LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
-
-# Note that in svn revision 19400 the '/' after DESTDIR in H5* variables below  
-# has been removed. According to the official description of DESTDIR by Gnu at 
-# http://www.gnu.org/prep/standards/html_node/DESTDIR.html, DESTDIR is 
-# prepended to the normal and complete install path that it precedes for the 
-# purpose of installing in a temporary directory which is useful for building 
-# rpms and other packages.  The '/' after ${DESTDIR} will be followed by another 
-# '/' at the beginning of the normal install path.  When DESTDIR is empty the  
-# path then begins with '//', which is incorrect and causes problems at least for 
-# Cygwin.   
-
-# Scripts used to build examples
-# If only shared libraries have been installed, have h5cc build examples with
-# shared libraries instead of static libraries
-H5CC = ${DESTDIR}$(bindir)/h5cc
-H5CC_PP = ${DESTDIR}$(bindir)/h5pcc
-H5FC = ${DESTDIR}$(bindir)/h5fc
-H5FC_PP = ${DESTDIR}$(bindir)/h5pfc
-H5CPP = ${DESTDIR}$(bindir)/h5c++
-ACLOCAL_AMFLAGS = "-I m4"
-
-# The trace script; this is used on source files from the C library to
-# insert tracing macros.
-TRACE = perl $(top_srcdir)/bin/trace
-
-# .chkexe files are used to mark tests that have run successfully.
-# .chklog files are output from those tests.
-# *.clog and *.clog2 are from the MPE option.
-
-# Temporary files
-CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5 *.raw
-
-# The Fortran test library
-noinst_LTLIBRARIES = libh5test_fortran.la
-@FORTRAN_2003_CONDITIONAL_F_FALSE@ff_PREFIX = F90
-
-# Check if the compiler supports the Fortran 2003 standard
-# which should include the intrinsic module iso_c_binding
-@FORTRAN_2003_CONDITIONAL_F_TRUE@ff_PREFIX = F03
-
-# Our main targets, the tests themselves
-TEST_PROG = fortranlib_test fflush1 fflush2 fortranlib_test_1_8 \
-	$(am__append_2)
-
-# tf.f90 depends on either tf_F08.f90 or tf_F03.f90 so they need to be
-# compiled first
-@FORTRAN_2003_CONDITIONAL_F_FALSE@@FORTRAN_HAVE_STORAGE_SIZE_FALSE@libh5test_fortran_la_SOURCES = tf_F90.f90 \
-@FORTRAN_2003_CONDITIONAL_F_FALSE@@FORTRAN_HAVE_STORAGE_SIZE_FALSE@	tf.f90 \
-@FORTRAN_2003_CONDITIONAL_F_FALSE@@FORTRAN_HAVE_STORAGE_SIZE_FALSE@	t.c
-
-# tf.f90 depends on either tf_F08.f90 or tf_F03.f90 so they need to be
-# compiled first
-@FORTRAN_2003_CONDITIONAL_F_TRUE@@FORTRAN_HAVE_STORAGE_SIZE_FALSE@libh5test_fortran_la_SOURCES = tf_F03.f90 \
-@FORTRAN_2003_CONDITIONAL_F_TRUE@@FORTRAN_HAVE_STORAGE_SIZE_FALSE@	tf.f90 \
-@FORTRAN_2003_CONDITIONAL_F_TRUE@@FORTRAN_HAVE_STORAGE_SIZE_FALSE@	t.c
-
-# tf.f90 depends on either tf_F08.f90 or tf_F03.f90 so they need to be
-# compiled first
-@FORTRAN_HAVE_C_SIZEOF_FALSE@@FORTRAN_HAVE_STORAGE_SIZE_TRUE@libh5test_fortran_la_SOURCES = tf_F03.f90 \
-@FORTRAN_HAVE_C_SIZEOF_FALSE@@FORTRAN_HAVE_STORAGE_SIZE_TRUE@	tf.f90 \
-@FORTRAN_HAVE_C_SIZEOF_FALSE@@FORTRAN_HAVE_STORAGE_SIZE_TRUE@	t.c
-
-# tf.f90 depends on either tf_F08.f90 or tf_F03.f90 so they need to be
-# compiled first
-@FORTRAN_HAVE_C_SIZEOF_TRUE@@FORTRAN_HAVE_STORAGE_SIZE_TRUE@libh5test_fortran_la_SOURCES = tf_F08.f90 \
-@FORTRAN_HAVE_C_SIZEOF_TRUE@@FORTRAN_HAVE_STORAGE_SIZE_TRUE@	tf.f90 \
-@FORTRAN_HAVE_C_SIZEOF_TRUE@@FORTRAN_HAVE_STORAGE_SIZE_TRUE@	t.c
-
-# Source files are used for both the library and fortranlib_test.
-# Automake will complain about this without the following workaround.
-fortranlib_test_FCFLAGS = $(AM_FCFLAGS)
-fortranlib_test_CFLAGS = $(AM_CFLAGS)
-fortranlib_test_SOURCES = tH5F.f90 tH5D.f90 tH5R.f90 tH5S.f90 tH5T.f90 tH5VL.f90 tH5Z.f90 \
-        tH5Sselect.f90 tH5P.f90 tH5A.f90 tH5I.f90 tH5G.f90 tH5E.f90 tHDF5.f90 fortranlib_test.f90
-
-fortranlib_test_1_8_SOURCES = tH5O.f90 tH5A_1_8.f90 tH5G_1_8.f90 tH5MISC_1_8.f90 tHDF5_1_8.f90\
-        fortranlib_test_1_8.f90
-
-@FORTRAN_2003_CONDITIONAL_F_TRUE@fortranlib_test_F03_SOURCES = tH5E_F03.f90 tH5F_F03.f90 tH5L_F03.f90 \
-@FORTRAN_2003_CONDITIONAL_F_TRUE@        tH5O_F03.f90 tH5P_F03.f90 tH5T_F03.f90 tHDF5_F03.f90 fortranlib_test_F03.f90
-
-fflush1_SOURCES = fflush1.f90
-fflush2_SOURCES = fflush2.f90
-
-# The tests depend on both fortran libraries and both main libraries.
-LDADD = libh5test_fortran.la $(LIBH5TEST) $(LIBH5F) $(LIBHDF5)
-MOSTLYCLEANFILES = *.tmp
-
-# Mark this directory as part of the Fortran API (this affects output
-# from tests in conclude.am)
-FORTRAN_API = yes
-
-# Automake needs to be taught how to build lib, progs, and tests targets.
-# These will be filled in automatically for the most part (e.g.,
-# lib_LIBRARIES are built for lib target), but EXTRA_LIB, EXTRA_PROG, and
-# EXTRA_TEST variables are supplied to allow the user to force targets to
-# be built at certain times. 
-LIB = $(lib_LIBRARIES) $(lib_LTLIBRARIES) $(noinst_LIBRARIES)                 \
-      $(noinst_LTLIBRARIES) $(check_LIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LIB)
-
-PROGS = $(bin_PROGRAMS) $(bin_SCRIPTS) $(noinst_PROGRAMS) $(noinst_SCRIPTS)   \
-        $(EXTRA_PROG)
-
-chk_TESTS = $(check_PROGRAMS) $(check_SCRIPTS) $(EXTRA_TEST) 
-TEST_EXTENSIONS = .sh
-SH_LOG_COMPILER = $(SHELL)
-AM_SH_LOG_FLAGS = 
-TEST_PROG_CHKEXE = $(TEST_PROG:=.chkexe_)
-TEST_PROG_PARA_CHKEXE = $(TEST_PROG_PARA:=.chkexe_)
-TEST_SCRIPT_CHKSH = $(TEST_SCRIPT:=.chkexe_)
-TEST_SCRIPT_PARA_CHKSH = $(TEST_SCRIPT_PARA:=.chkexe_)
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .f90 .lo .log .o .obj .sh .sh$(EXEEXT) .trs
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign fortran/test/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign fortran/test/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-$(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am:
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; \
-	locs=`for p in $$list; do echo $$p; done | \
-	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
-	      sort -u`; \
-	test -z "$$locs" || { \
-	  echo rm -f $${locs}; \
-	  rm -f $${locs}; \
-	}
-
-libh5test_fortran.la: $(libh5test_fortran_la_OBJECTS) $(libh5test_fortran_la_DEPENDENCIES) $(EXTRA_libh5test_fortran_la_DEPENDENCIES) 
-	$(AM_V_FCLD)$(FCLINK)  $(libh5test_fortran_la_OBJECTS) $(libh5test_fortran_la_LIBADD) $(LIBS)
-
-clean-checkPROGRAMS:
-	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-
-fflush1$(EXEEXT): $(fflush1_OBJECTS) $(fflush1_DEPENDENCIES) $(EXTRA_fflush1_DEPENDENCIES) 
-	@rm -f fflush1$(EXEEXT)
-	$(AM_V_FCLD)$(FCLINK) $(fflush1_OBJECTS) $(fflush1_LDADD) $(LIBS)
-
-fflush2$(EXEEXT): $(fflush2_OBJECTS) $(fflush2_DEPENDENCIES) $(EXTRA_fflush2_DEPENDENCIES) 
-	@rm -f fflush2$(EXEEXT)
-	$(AM_V_FCLD)$(FCLINK) $(fflush2_OBJECTS) $(fflush2_LDADD) $(LIBS)
-
-fortranlib_test$(EXEEXT): $(fortranlib_test_OBJECTS) $(fortranlib_test_DEPENDENCIES) $(EXTRA_fortranlib_test_DEPENDENCIES) 
-	@rm -f fortranlib_test$(EXEEXT)
-	$(AM_V_FCLD)$(fortranlib_test_LINK) $(fortranlib_test_OBJECTS) $(fortranlib_test_LDADD) $(LIBS)
-
-fortranlib_test_1_8$(EXEEXT): $(fortranlib_test_1_8_OBJECTS) $(fortranlib_test_1_8_DEPENDENCIES) $(EXTRA_fortranlib_test_1_8_DEPENDENCIES) 
-	@rm -f fortranlib_test_1_8$(EXEEXT)
-	$(AM_V_FCLD)$(FCLINK) $(fortranlib_test_1_8_OBJECTS) $(fortranlib_test_1_8_LDADD) $(LIBS)
-
-fortranlib_test_F03$(EXEEXT): $(fortranlib_test_F03_OBJECTS) $(fortranlib_test_F03_DEPENDENCIES) $(EXTRA_fortranlib_test_F03_DEPENDENCIES) 
-	@rm -f fortranlib_test_F03$(EXEEXT)
-	$(AM_V_FCLD)$(FCLINK) $(fortranlib_test_F03_OBJECTS) $(fortranlib_test_F03_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
-
-.f90.o:
-	$(AM_V_FC)$(FCCOMPILE) -c -o $@ $(FCFLAGS_f90) $<
-
-.f90.obj:
-	$(AM_V_FC)$(FCCOMPILE) -c -o $@ $(FCFLAGS_f90) `$(CYGPATH_W) '$<'`
-
-.f90.lo:
-	$(AM_V_FC)$(LTFCCOMPILE) -c -o $@ $(FCFLAGS_f90) $<
-
-fortranlib_test-tH5F.o: tH5F.f90
-	$(AM_V_FC)$(FC) $(fortranlib_test_FCFLAGS) $(FCFLAGS) -c -o fortranlib_test-tH5F.o $(FCFLAGS_f90) `test -f 'tH5F.f90' || echo '$(srcdir)/'`tH5F.f90
-
-fortranlib_test-tH5F.obj: tH5F.f90
-	$(AM_V_FC)$(FC) $(fortranlib_test_FCFLAGS) $(FCFLAGS) -c -o fortranlib_test-tH5F.obj $(FCFLAGS_f90) `if test -f 'tH5F.f90'; then $(CYGPATH_W) 'tH5F.f90'; else $(CYGPATH_W) '$(srcdir)/tH5F.f90'; fi`
-
-fortranlib_test-tH5D.o: tH5D.f90
-	$(AM_V_FC)$(FC) $(fortranlib_test_FCFLAGS) $(FCFLAGS) -c -o fortranlib_test-tH5D.o $(FCFLAGS_f90) `test -f 'tH5D.f90' || echo '$(srcdir)/'`tH5D.f90
-
-fortranlib_test-tH5D.obj: tH5D.f90
-	$(AM_V_FC)$(FC) $(fortranlib_test_FCFLAGS) $(FCFLAGS) -c -o fortranlib_test-tH5D.obj $(FCFLAGS_f90) `if test -f 'tH5D.f90'; then $(CYGPATH_W) 'tH5D.f90'; else $(CYGPATH_W) '$(srcdir)/tH5D.f90'; fi`
-
-fortranlib_test-tH5R.o: tH5R.f90
-	$(AM_V_FC)$(FC) $(fortranlib_test_FCFLAGS) $(FCFLAGS) -c -o fortranlib_test-tH5R.o $(FCFLAGS_f90) `test -f 'tH5R.f90' || echo '$(srcdir)/'`tH5R.f90
-
-fortranlib_test-tH5R.obj: tH5R.f90
-	$(AM_V_FC)$(FC) $(fortranlib_test_FCFLAGS) $(FCFLAGS) -c -o fortranlib_test-tH5R.obj $(FCFLAGS_f90) `if test -f 'tH5R.f90'; then $(CYGPATH_W) 'tH5R.f90'; else $(CYGPATH_W) '$(srcdir)/tH5R.f90'; fi`
-
-fortranlib_test-tH5S.o: tH5S.f90
-	$(AM_V_FC)$(FC) $(fortranlib_test_FCFLAGS) $(FCFLAGS) -c -o fortranlib_test-tH5S.o $(FCFLAGS_f90) `test -f 'tH5S.f90' || echo '$(srcdir)/'`tH5S.f90
-
-fortranlib_test-tH5S.obj: tH5S.f90
-	$(AM_V_FC)$(FC) $(fortranlib_test_FCFLAGS) $(FCFLAGS) -c -o fortranlib_test-tH5S.obj $(FCFLAGS_f90) `if test -f 'tH5S.f90'; then $(CYGPATH_W) 'tH5S.f90'; else $(CYGPATH_W) '$(srcdir)/tH5S.f90'; fi`
-
-fortranlib_test-tH5T.o: tH5T.f90
-	$(AM_V_FC)$(FC) $(fortranlib_test_FCFLAGS) $(FCFLAGS) -c -o fortranlib_test-tH5T.o $(FCFLAGS_f90) `test -f 'tH5T.f90' || echo '$(srcdir)/'`tH5T.f90
-
-fortranlib_test-tH5T.obj: tH5T.f90
-	$(AM_V_FC)$(FC) $(fortranlib_test_FCFLAGS) $(FCFLAGS) -c -o fortranlib_test-tH5T.obj $(FCFLAGS_f90) `if test -f 'tH5T.f90'; then $(CYGPATH_W) 'tH5T.f90'; else $(CYGPATH_W) '$(srcdir)/tH5T.f90'; fi`
-
-fortranlib_test-tH5VL.o: tH5VL.f90
-	$(AM_V_FC)$(FC) $(fortranlib_test_FCFLAGS) $(FCFLAGS) -c -o fortranlib_test-tH5VL.o $(FCFLAGS_f90) `test -f 'tH5VL.f90' || echo '$(srcdir)/'`tH5VL.f90
-
-fortranlib_test-tH5VL.obj: tH5VL.f90
-	$(AM_V_FC)$(FC) $(fortranlib_test_FCFLAGS) $(FCFLAGS) -c -o fortranlib_test-tH5VL.obj $(FCFLAGS_f90) `if test -f 'tH5VL.f90'; then $(CYGPATH_W) 'tH5VL.f90'; else $(CYGPATH_W) '$(srcdir)/tH5VL.f90'; fi`
-
-fortranlib_test-tH5Z.o: tH5Z.f90
-	$(AM_V_FC)$(FC) $(fortranlib_test_FCFLAGS) $(FCFLAGS) -c -o fortranlib_test-tH5Z.o $(FCFLAGS_f90) `test -f 'tH5Z.f90' || echo '$(srcdir)/'`tH5Z.f90
-
-fortranlib_test-tH5Z.obj: tH5Z.f90
-	$(AM_V_FC)$(FC) $(fortranlib_test_FCFLAGS) $(FCFLAGS) -c -o fortranlib_test-tH5Z.obj $(FCFLAGS_f90) `if test -f 'tH5Z.f90'; then $(CYGPATH_W) 'tH5Z.f90'; else $(CYGPATH_W) '$(srcdir)/tH5Z.f90'; fi`
-
-fortranlib_test-tH5Sselect.o: tH5Sselect.f90
-	$(AM_V_FC)$(FC) $(fortranlib_test_FCFLAGS) $(FCFLAGS) -c -o fortranlib_test-tH5Sselect.o $(FCFLAGS_f90) `test -f 'tH5Sselect.f90' || echo '$(srcdir)/'`tH5Sselect.f90
-
-fortranlib_test-tH5Sselect.obj: tH5Sselect.f90
-	$(AM_V_FC)$(FC) $(fortranlib_test_FCFLAGS) $(FCFLAGS) -c -o fortranlib_test-tH5Sselect.obj $(FCFLAGS_f90) `if test -f 'tH5Sselect.f90'; then $(CYGPATH_W) 'tH5Sselect.f90'; else $(CYGPATH_W) '$(srcdir)/tH5Sselect.f90'; fi`
-
-fortranlib_test-tH5P.o: tH5P.f90
-	$(AM_V_FC)$(FC) $(fortranlib_test_FCFLAGS) $(FCFLAGS) -c -o fortranlib_test-tH5P.o $(FCFLAGS_f90) `test -f 'tH5P.f90' || echo '$(srcdir)/'`tH5P.f90
-
-fortranlib_test-tH5P.obj: tH5P.f90
-	$(AM_V_FC)$(FC) $(fortranlib_test_FCFLAGS) $(FCFLAGS) -c -o fortranlib_test-tH5P.obj $(FCFLAGS_f90) `if test -f 'tH5P.f90'; then $(CYGPATH_W) 'tH5P.f90'; else $(CYGPATH_W) '$(srcdir)/tH5P.f90'; fi`
-
-fortranlib_test-tH5A.o: tH5A.f90
-	$(AM_V_FC)$(FC) $(fortranlib_test_FCFLAGS) $(FCFLAGS) -c -o fortranlib_test-tH5A.o $(FCFLAGS_f90) `test -f 'tH5A.f90' || echo '$(srcdir)/'`tH5A.f90
-
-fortranlib_test-tH5A.obj: tH5A.f90
-	$(AM_V_FC)$(FC) $(fortranlib_test_FCFLAGS) $(FCFLAGS) -c -o fortranlib_test-tH5A.obj $(FCFLAGS_f90) `if test -f 'tH5A.f90'; then $(CYGPATH_W) 'tH5A.f90'; else $(CYGPATH_W) '$(srcdir)/tH5A.f90'; fi`
-
-fortranlib_test-tH5I.o: tH5I.f90
-	$(AM_V_FC)$(FC) $(fortranlib_test_FCFLAGS) $(FCFLAGS) -c -o fortranlib_test-tH5I.o $(FCFLAGS_f90) `test -f 'tH5I.f90' || echo '$(srcdir)/'`tH5I.f90
-
-fortranlib_test-tH5I.obj: tH5I.f90
-	$(AM_V_FC)$(FC) $(fortranlib_test_FCFLAGS) $(FCFLAGS) -c -o fortranlib_test-tH5I.obj $(FCFLAGS_f90) `if test -f 'tH5I.f90'; then $(CYGPATH_W) 'tH5I.f90'; else $(CYGPATH_W) '$(srcdir)/tH5I.f90'; fi`
-
-fortranlib_test-tH5G.o: tH5G.f90
-	$(AM_V_FC)$(FC) $(fortranlib_test_FCFLAGS) $(FCFLAGS) -c -o fortranlib_test-tH5G.o $(FCFLAGS_f90) `test -f 'tH5G.f90' || echo '$(srcdir)/'`tH5G.f90
-
-fortranlib_test-tH5G.obj: tH5G.f90
-	$(AM_V_FC)$(FC) $(fortranlib_test_FCFLAGS) $(FCFLAGS) -c -o fortranlib_test-tH5G.obj $(FCFLAGS_f90) `if test -f 'tH5G.f90'; then $(CYGPATH_W) 'tH5G.f90'; else $(CYGPATH_W) '$(srcdir)/tH5G.f90'; fi`
-
-fortranlib_test-tH5E.o: tH5E.f90
-	$(AM_V_FC)$(FC) $(fortranlib_test_FCFLAGS) $(FCFLAGS) -c -o fortranlib_test-tH5E.o $(FCFLAGS_f90) `test -f 'tH5E.f90' || echo '$(srcdir)/'`tH5E.f90
-
-fortranlib_test-tH5E.obj: tH5E.f90
-	$(AM_V_FC)$(FC) $(fortranlib_test_FCFLAGS) $(FCFLAGS) -c -o fortranlib_test-tH5E.obj $(FCFLAGS_f90) `if test -f 'tH5E.f90'; then $(CYGPATH_W) 'tH5E.f90'; else $(CYGPATH_W) '$(srcdir)/tH5E.f90'; fi`
-
-fortranlib_test-tHDF5.o: tHDF5.f90
-	$(AM_V_FC)$(FC) $(fortranlib_test_FCFLAGS) $(FCFLAGS) -c -o fortranlib_test-tHDF5.o $(FCFLAGS_f90) `test -f 'tHDF5.f90' || echo '$(srcdir)/'`tHDF5.f90
-
-fortranlib_test-tHDF5.obj: tHDF5.f90
-	$(AM_V_FC)$(FC) $(fortranlib_test_FCFLAGS) $(FCFLAGS) -c -o fortranlib_test-tHDF5.obj $(FCFLAGS_f90) `if test -f 'tHDF5.f90'; then $(CYGPATH_W) 'tHDF5.f90'; else $(CYGPATH_W) '$(srcdir)/tHDF5.f90'; fi`
-
-fortranlib_test-fortranlib_test.o: fortranlib_test.f90
-	$(AM_V_FC)$(FC) $(fortranlib_test_FCFLAGS) $(FCFLAGS) -c -o fortranlib_test-fortranlib_test.o $(FCFLAGS_f90) `test -f 'fortranlib_test.f90' || echo '$(srcdir)/'`fortranlib_test.f90
-
-fortranlib_test-fortranlib_test.obj: fortranlib_test.f90
-	$(AM_V_FC)$(FC) $(fortranlib_test_FCFLAGS) $(FCFLAGS) -c -o fortranlib_test-fortranlib_test.obj $(FCFLAGS_f90) `if test -f 'fortranlib_test.f90'; then $(CYGPATH_W) 'fortranlib_test.f90'; else $(CYGPATH_W) '$(srcdir)/fortranlib_test.f90'; fi`
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: ctags-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-# Recover from deleted '.trs' file; this should ensure that
-# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
-# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
-# to avoid problems with "make -n".
-.log.trs:
-	rm -f $< $@
-	$(MAKE) $(AM_MAKEFLAGS) $<
-
-# Leading 'am--fnord' is there to ensure the list of targets does not
-# expand to empty, as could happen e.g. with make check TESTS=''.
-am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
-am--force-recheck:
-	@:
-
-$(TEST_SUITE_LOG): $(TEST_LOGS)
-	@$(am__set_TESTS_bases); \
-	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
-	redo_bases=`for i in $$bases; do \
-	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
-	            done`; \
-	if test -n "$$redo_bases"; then \
-	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
-	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
-	  if $(am__make_dryrun); then :; else \
-	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
-	  fi; \
-	fi; \
-	if test -n "$$am__remaking_logs"; then \
-	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
-	       "recursion detected" >&2; \
-	else \
-	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
-	fi; \
-	if $(am__make_dryrun); then :; else \
-	  st=0;  \
-	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
-	  for i in $$redo_bases; do \
-	    test -f $$i.trs && test -r $$i.trs \
-	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
-	    test -f $$i.log && test -r $$i.log \
-	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
-	  done; \
-	  test $$st -eq 0 || exit 1; \
-	fi
-	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
-	ws='[ 	]'; \
-	results=`for b in $$bases; do echo $$b.trs; done`; \
-	test -n "$$results" || results=/dev/null; \
-	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
-	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
-	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
-	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
-	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
-	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
-	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
-	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
-	  success=true; \
-	else \
-	  success=false; \
-	fi; \
-	br='==================='; br=$$br$$br$$br$$br; \
-	result_count () \
-	{ \
-	    if test x"$$1" = x"--maybe-color"; then \
-	      maybe_colorize=yes; \
-	    elif test x"$$1" = x"--no-color"; then \
-	      maybe_colorize=no; \
-	    else \
-	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
-	    fi; \
-	    shift; \
-	    desc=$$1 count=$$2; \
-	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
-	      color_start=$$3 color_end=$$std; \
-	    else \
-	      color_start= color_end=; \
-	    fi; \
-	    echo "$${color_start}# $$desc $$count$${color_end}"; \
-	}; \
-	create_testsuite_report () \
-	{ \
-	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
-	  result_count $$1 "PASS: " $$pass  "$$grn"; \
-	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
-	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
-	  result_count $$1 "FAIL: " $$fail  "$$red"; \
-	  result_count $$1 "XPASS:" $$xpass "$$red"; \
-	  result_count $$1 "ERROR:" $$error "$$mgn"; \
-	}; \
-	{								\
-	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
-	    $(am__rst_title);						\
-	  create_testsuite_report --no-color;				\
-	  echo;								\
-	  echo ".. contents:: :depth: 2";				\
-	  echo;								\
-	  for b in $$bases; do echo $$b; done				\
-	    | $(am__create_global_log);					\
-	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
-	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
-	if $$success; then						\
-	  col="$$grn";							\
-	 else								\
-	  col="$$red";							\
-	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
-	fi;								\
-	echo "$${col}$$br$${std}"; 					\
-	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
-	echo "$${col}$$br$${std}"; 					\
-	create_testsuite_report --maybe-color;				\
-	echo "$$col$$br$$std";						\
-	if $$success; then :; else					\
-	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
-	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
-	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
-	  fi;								\
-	  echo "$$col$$br$$std";					\
-	fi;								\
-	$$success || exit 1
-recheck: all $(check_PROGRAMS)
-	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-	@set +e; $(am__set_TESTS_bases); \
-	bases=`for i in $$bases; do echo $$i; done \
-	         | $(am__list_recheck_tests)` || exit 1; \
-	log_list=`for i in $$bases; do echo $$i.log; done`; \
-	log_list=`echo $$log_list`; \
-	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
-	        am__force_recheck=am--force-recheck \
-	        TEST_LOGS="$$log_list"; \
-	exit $$?
-fortranlib_test.log: fortranlib_test$(EXEEXT)
-	@p='fortranlib_test$(EXEEXT)'; \
-	b='fortranlib_test'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-fflush1.log: fflush1$(EXEEXT)
-	@p='fflush1$(EXEEXT)'; \
-	b='fflush1'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-fflush2.log: fflush2$(EXEEXT)
-	@p='fflush2$(EXEEXT)'; \
-	b='fflush2'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-fortranlib_test_1_8.log: fortranlib_test_1_8$(EXEEXT)
-	@p='fortranlib_test_1_8$(EXEEXT)'; \
-	b='fortranlib_test_1_8'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-fortranlib_test_F03.log: fortranlib_test_F03$(EXEEXT)
-	@p='fortranlib_test_F03$(EXEEXT)'; \
-	b='fortranlib_test_F03'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-.sh.log:
-	@p='$<'; \
-	$(am__set_b); \
-	$(am__check_pre) $(SH_LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_SH_LOG_DRIVER_FLAGS) $(SH_LOG_DRIVER_FLAGS) -- $(SH_LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-@am__EXEEXT_TRUE@.sh$(EXEEXT).log:
-@am__EXEEXT_TRUE@	@p='$<'; \
-@am__EXEEXT_TRUE@	$(am__set_b); \
-@am__EXEEXT_TRUE@	$(am__check_pre) $(SH_LOG_DRIVER) --test-name "$$f" \
-@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
-@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_SH_LOG_DRIVER_FLAGS) $(SH_LOG_DRIVER_FLAGS) -- $(SH_LOG_COMPILE) \
-@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
-	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
-check: check-am
-all-am: Makefile $(LTLIBRARIES) all-local
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
-	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
-	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
-	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-checkPROGRAMS clean-generic clean-libtool clean-local \
-	clean-noinstLTLIBRARIES mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-local distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic \
-	maintainer-clean-local
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-local
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: check-am install-am install-strip
-
-.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-TESTS \
-	check-am clean clean-checkPROGRAMS clean-generic clean-libtool \
-	clean-local clean-noinstLTLIBRARIES cscopelist-am ctags \
-	ctags-am distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-local distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic maintainer-clean-local mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	mostlyclean-local pdf pdf-am ps ps-am recheck tags tags-am \
-	uninstall uninstall-am
-
-
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-#
-# HDF5-Fortran test/Makefile(.in)
-#
-# Autoconf cannot figure out dependencies between modules; disable parallel make
-.NOTPARALLEL:
-
-# List all build rules defined by HDF5 Makefiles as "PHONY" targets here.
-# This tells the Makefiles that these targets are not files to be built but
-# commands that should be executed even if a file with the same name already
-# exists.
-.PHONY: build-check-clean build-check-p build-check-s build-lib build-progs \
-        build-tests check-clean check-install check-p check-s check-vfd \
-        install-doc lib progs tests uninstall-doc _exec_check-s _test help
-
-help:
-	@$(top_srcdir)/bin/makehelp
-
-# Fortran module files can have different extensions and different names
-# (e.g., different capitalizations) on different platforms.  Write rules
-# for them explicitly rather than trying to teach automake about them.
-# They should be installed as headers and removed during clean.
-maintainer-clean-local: clean-local
-distclean-local: clean-local
-clean-local:
-	@if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \
-	  $(RM) *.$(F9XMODEXT);                                         \
-	fi
-
-# fflush2 depends on files created by fflush1
-fflush2.chkexe_: fflush1.chkexe_
-
-# lib/progs/tests targets recurse into subdirectories. build-* targets
-# build files in this directory.
-build-lib: $(LIB)
-build-progs: $(LIB) $(PROGS)
-build-tests: $(LIB) $(PROGS) $(chk_TESTS)
-
-# General rule for recursive building targets.
-# BUILT_SOURCES contain targets that need to be built before anything else
-# in the directory (e.g., for Fortran type detection)
-lib progs tests check-s check-p :: $(BUILT_SOURCES)
-	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
-	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X && test $$d != .; then                           \
-	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
-	    fi;                                                               \
-	done
-
-# General rule for recursive cleaning targets.  Like the rule above,
-# but doesn't require building BUILT_SOURCES.
-check-clean ::
-	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
-	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X && test $$d != .; then                           \
-	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
-	    fi;                                                               \
-	done
-
-# Tell Automake to build tests when the user types `make all' (this is
-# not its default behavior).  Also build EXTRA_LIB and EXTRA_PROG since
-# Automake won't build them automatically, either.
-all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(chk_TESTS)
-
-# make install-doc doesn't do anything outside of doc directory, but
-# Makefiles should recognize it.
-# UPDATE: docs no longer reside in this build tree, so this target
-# is depreciated.
-install-doc uninstall-doc:
-	@echo "Nothing to be done."
-
-# clean up files generated by tests so they can be re-run.
-build-check-clean:
-	$(RM) -rf $(CHECK_CLEANFILES)
-
-# run check-clean whenever mostlyclean is run
-mostlyclean-local: build-check-clean
-
-# check-install is just a synonym for installcheck
-check-install: installcheck
-
-# Run each test in order, passing $(TEST_FLAGS) to the program.
-# Since tests are done in a shell loop, "make -i" does apply inside it.
-# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
-# The timestamps give a rough idea how much time the tests use.
-#
-# Note that targets in chk_TESTS (defined above) will be built when the user
-# types 'make tests' or 'make check', but only programs in TEST_PROG,
-# TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
-check-TESTS: test
-
-test _test:
-	@$(MAKE) build-check-s
-	@$(MAKE) build-check-p
-
-# Actual execution of check-s.
-build-check-s: $(LIB) $(PROGS) $(chk_TESTS)
-	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
-	   echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
-	fi
-	@$(MAKE) $(AM_MAKEFLAGS) _exec_check-s
-	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
-	    echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
-	fi
-
-_exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH)
-
-# The dummy.chkexe here prevents the target from being
-# empty if there are no tests in the current directory.
-# $${log} is the log file.
-# $${tname} is the name of test.
-$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
-	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \
-	   tname=$(@:.chkexe_=)$(EXEEXT);\
-	   log=$(@:.chkexe_=.chklog); \
-	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \
-	      echo "No need to test $${tname} again."; \
-	   else \
-	      echo "============================" > $${log}; \
-	      if test "X$(FORTRAN_API)" = "Xyes"; then \
-	         echo "Fortran API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "Fortran API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(CXX_API)" = "Xyes"; then \
-	         echo "C++ API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "C++ API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log};\
-	      else \
-	         echo "Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "$(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      fi; \
-	      echo "============================" >> $${log}; \
-	      srcdir="$(srcdir)" \
-	         $(TIME) $(RUNEXEC) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \
-	         && touch $(@:.chkexe_=.chkexe) || \
-	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	         (cat $${log} && false) || exit 1; \
-	      echo "" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
-	      echo "============================" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
-	      cat $${log}; \
-	   fi; \
-	fi
-
-# The dummysh.chkexe here prevents the target from being
-# empty if there are no tests in the current directory.
-# $${log} is the log file.
-# $${tname} is the name of test.
-$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
-	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummysh.chkexe_"; then \
-	   cmd=$(@:.chkexe_=);\
-	   tname=`basename $$cmd`;\
-	   chkname=`basename $(@:.chkexe_=.chkexe)`;\
-	   log=`basename $(@:.chkexe_=.chklog)`; \
-	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer $${chkname} $$cmd $(SCRIPT_DEPEND); then \
-	      echo "No need to test $${tname} again."; \
-	   else \
-	      echo "============================" > $${log}; \
-	      if test "X$(FORTRAN_API)" = "Xyes"; then \
-	         echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(CXX_API)" = "Xyes"; then \
-	         echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      else \
-	         echo "Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      fi; \
-	      echo "============================" >> $${log}; \
-	      RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
-	      srcdir="$(srcdir)" \
-	         $(TIME) $(SHELL) $$cmd $(TEST_FLAGS) >> $${log} 2>&1 \
-	         && touch $${chkname} || \
-	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	         (cat $${log} && false) || exit 1; \
-	      echo "" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
-	      echo "============================" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
-	      cat $${log}; \
-	   fi; \
-	   echo "============================"; \
-	fi
-
-# Actual execution of check-p.
-build-check-p: $(LIB) $(PROGS) $(chk_TESTS)
-	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
-	   echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
-	fi
-	@if test -n "$(TEST_PROG_PARA)"; then                                \
-	    echo "**** Hint ****";                                            \
-	    echo "Parallel test files reside in the current directory"        \
-	         "by default.";                                               \
-	    echo "Set HDF5_PARAPREFIX to use another directory. E.g.,";       \
-	    echo "    HDF5_PARAPREFIX=/PFS/user/me";                          \
-	    echo "    export HDF5_PARAPREFIX";                                \
-	    echo "    make check";                                            \
-	    echo "**** end of Hint ****";                                     \
-	fi
-	@for test in $(TEST_PROG_PARA) dummy; do                             \
-	   if test $$test != dummy; then                                      \
-	      $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ \
-	      RUNEXEC="$(RUNPARALLEL)" || exit 1; \
-	   fi;                                                                \
-	done
-	@for test in $(TEST_SCRIPT_PARA) dummy; do                           \
-	  if test $$test != dummy; then                                      \
-	    $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ || exit 1; \
-	  fi;                                                                 \
-	done
-	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
-	    echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
-	fi
-
-# Run test with different Virtual File Driver
-check-vfd: $(LIB) $(PROGS) $(chk_TESTS)
-	@for vfd in $(VFD_LIST) dummy; do                                     \
-	    if test $$vfd != dummy; then                                      \
-	        echo "============================";                          \
-	        echo "Testing Virtual File Driver $$vfd";                     \
-	        echo "============================";                          \
-	        $(MAKE) $(AM_MAKEFLAGS) check-clean || exit 1;                \
-	        HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check || exit 1;    \
-	    fi;                                                               \
-	done
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/fortran/test/fflush1.F90 b/fortran/test/fflush1.F90
new file mode 100644
index 0000000..5e3234d
--- /dev/null
+++ b/fortran/test/fflush1.F90
@@ -0,0 +1,154 @@
+!****h* root/fortran/test/fflush1.f90
+!
+! NAME
+!  FFLUSH1EXAMPLE
+!
+! FUNCTION
+!  This is the first half of a two-part test that makes sure
+!  that a file can be read after an application crashes as long
+!  as the file was flushed first.  We simulate by exit the
+!  the program using stop statement
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+!*****
+
+     PROGRAM FFLUSH1EXAMPLE
+
+     USE HDF5 ! This module contains all necessary modules
+     USE TH5_MISC
+
+     IMPLICIT NONE
+
+     !
+     !the respective filename is "fflush1.h5"
+     !
+     CHARACTER(LEN=7), PARAMETER :: filename = "fflush1"
+     CHARACTER(LEN=80) :: fix_filename
+
+     !
+     !data space rank and dimensions
+     !
+     INTEGER, PARAMETER :: RANK = 2
+     INTEGER, PARAMETER :: NX = 4
+     INTEGER, PARAMETER :: NY = 5
+
+     !
+     ! File identifiers
+     !
+     INTEGER(HID_T) :: file_id
+
+     !
+     ! Group identifier
+     !
+     INTEGER(HID_T) :: gid
+
+     !
+     ! dataset identifier
+     !
+     INTEGER(HID_T) :: dset_id
+
+     !
+     ! data space identifier
+     !
+     INTEGER(HID_T) :: dataspace
+     !
+     !The dimensions for the dataset.
+     !
+     INTEGER(HSIZE_T), DIMENSION(2) :: dims = (/NX,NY/)
+
+     !
+     !flag to check operation success
+     !
+     INTEGER     ::   error
+
+     !
+     !general purpose integer
+     !
+     INTEGER     ::   i, j, total_error = 0
+
+     !
+     !data buffers
+     !
+     INTEGER, DIMENSION(NX,NY) :: data_in
+     INTEGER(HSIZE_T), DIMENSION(2) :: data_dims
+     data_dims(1) = NX
+     data_dims(2) = NY
+
+     !
+     !Initialize FORTRAN predefined datatypes
+     !
+     CALL h5open_f(error)
+          CALL check("h5open_f",error,total_error)
+
+     !
+     !Initialize data_in buffer
+     !
+     do i = 1, NX
+          do j = 1, NY
+               data_in(i,j) =  (i-1) + (j-1)
+          end do
+     end do
+
+     !
+     !Create file "fflush1.h5" using default properties.
+     !
+          CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
+          if (error .ne. 0) then
+              write(*,*) "Cannot modify filename"
+              CALL h5_exit_f (1)
+          endif
+     CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
+          CALL check("h5fcreate_f",error,total_error)
+
+     !
+     !Create group "/G" inside file "fflush1.h5".
+     !
+     CALL h5gcreate_f(file_id, "/G", gid, error)
+          CALL check("h5gcreate_f",error,total_error)
+
+     !
+     !Create data space for the dataset.
+     !
+     CALL h5screate_simple_f(RANK, dims, dataspace, error)
+          CALL check("h5screate_simple_f",error,total_error)
+
+     !
+     !Create dataset "/D" inside file "fflush1.h5".
+     !
+     CALL h5dcreate_f(file_id, "/D", H5T_NATIVE_INTEGER, dataspace, &
+                      dset_id, error)
+          CALL check("h5dcreate_f",error,total_error)
+
+     !
+     ! Write data_in to the dataset
+     !
+     CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, data_in, data_dims, error)
+          CALL check("h5dwrite_f",error,total_error)
+
+     !
+     !flush and exit without closing the library
+     !
+     CALL H5fflush_f(file_id, H5F_SCOPE_GLOBAL_F, error)
+          CALL check("h5fflush_f",error,total_error)
+
+     ! if errors detected, exit with non-zero code.
+     IF (total_error .ne. 0) CALL h5_exit_f (1)
+
+
+     STOP
+
+
+     END PROGRAM FFLUSH1EXAMPLE
+
diff --git a/fortran/test/fflush1.f90 b/fortran/test/fflush1.f90
deleted file mode 100644
index ca2550f..0000000
--- a/fortran/test/fflush1.f90
+++ /dev/null
@@ -1,157 +0,0 @@
-!****h* root/fortran/test/fflush1.f90
-!
-! NAME
-!  FFLUSH1EXAMPLE
-!
-! FUNCTION
-!  This is the first half of a two-part test that makes sure
-!  that a file can be read after an application crashes as long
-!  as the file was flushed first.  We simulate by exit the 
-!  the program using stop statement
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-!*****
-
-     PROGRAM FFLUSH1EXAMPLE
-
-     USE HDF5 ! This module contains all necessary modules
-     USE TH5_MISC
-
-     IMPLICIT NONE
-
-     !
-     !the respective filename is "fflush1.h5"
-     !
-     CHARACTER(LEN=7), PARAMETER :: filename = "fflush1"
-     CHARACTER(LEN=80) :: fix_filename
-
-     !
-     !data space rank and dimensions
-     !
-     INTEGER, PARAMETER :: RANK = 2
-     INTEGER, PARAMETER :: NX = 4
-     INTEGER, PARAMETER :: NY = 5
-
-     !
-     ! File identifiers
-     !
-     INTEGER(HID_T) :: file_id
-
-     !
-     ! Group identifier
-     !
-     INTEGER(HID_T) :: gid
-
-     !
-     ! dataset identifier
-     !
-     INTEGER(HID_T) :: dset_id
-
-     !
-     ! data space identifier
-     !
-     INTEGER(HID_T) :: dataspace
-     !
-     !The dimensions for the dataset.
-     !
-     INTEGER(HSIZE_T), DIMENSION(2) :: dims = (/NX,NY/)
-
-     !
-     !flag to check operation success
-     !
-     INTEGER     ::   error
-
-     !
-     !general purpose integer
-     !
-     INTEGER     ::   i, j, total_error = 0
-
-     !
-     !data buffers
-     !
-     INTEGER, DIMENSION(NX,NY) :: data_in
-     INTEGER(HSIZE_T), DIMENSION(2) :: data_dims
-     data_dims(1) = NX
-     data_dims(2) = NY
-
-     !
-     !Initialize FORTRAN predifined datatypes
-     !
-     CALL h5open_f(error)
-          CALL check("h5open_f",error,total_error)
-
-     !
-     !Initialize data_in buffer
-     !
-     do i = 1, NX
-          do j = 1, NY
-               data_in(i,j) =  (i-1) + (j-1)
-          end do
-     end do
-
-     !
-     !Create file "fflush1.h5" using default properties.
-     !
-          CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
-          if (error .ne. 0) then
-              write(*,*) "Cannot modify filename"
-              CALL h5_exit_f (1)
-          endif
-     CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
-          CALL check("h5fcreate_f",error,total_error)
-
-     !
-     !Create group "/G" inside file "fflush1.h5".
-     !
-     CALL h5gcreate_f(file_id, "/G", gid, error)
-          CALL check("h5gcreate_f",error,total_error)
-
-     !
-     !Create data space for the dataset.
-     !
-     CALL h5screate_simple_f(RANK, dims, dataspace, error)
-          CALL check("h5screate_simple_f",error,total_error)
-
-     !
-     !Create dataset "/D" inside file "fflush1.h5".
-     !
-     CALL h5dcreate_f(file_id, "/D", H5T_NATIVE_INTEGER, dataspace, &
-                      dset_id, error)
-          CALL check("h5dcreate_f",error,total_error)
-
-     !
-     ! Write data_in to the dataset
-     !
-     CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, data_in, data_dims, error)
-          CALL check("h5dwrite_f",error,total_error)
-
-     !
-     !flush and exit without closing the library
-     !
-     CALL H5fflush_f(file_id, H5F_SCOPE_GLOBAL_F, error)
-          CALL check("h5fflush_f",error,total_error)
-
-     ! if errors detected, exit with non-zero code.
-     IF (total_error .ne. 0) CALL h5_exit_f (1)
-
-
-     STOP
-
-
-     END PROGRAM FFLUSH1EXAMPLE
-
diff --git a/fortran/test/fflush2.F90 b/fortran/test/fflush2.F90
new file mode 100644
index 0000000..e05908a
--- /dev/null
+++ b/fortran/test/fflush2.F90
@@ -0,0 +1,174 @@
+!****h* root/fortran/test/fflush2.f90
+!
+! NAME
+!  fflush2.f90
+!
+! FUNCTION
+!  This is the second half of a two-part test that makes sure
+!  that a file can be read after an application crashes as long
+!  as the file was flushed first.  This half tries to read the
+!  file created by the first half.
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+!*****
+
+PROGRAM FFLUSH2EXAMPLE
+
+  USE HDF5 ! This module contains all necessary modules
+  USE TH5_MISC
+
+  IMPLICIT NONE
+
+  CHARACTER(LEN=7), PARAMETER :: filename = "fflush1"
+  CHARACTER(LEN=80) :: fix_filename
+
+  !
+  !data space rank and dimensions
+  !
+  INTEGER, PARAMETER :: NX = 4
+  INTEGER, PARAMETER :: NY = 5
+
+  !
+  ! File identifiers
+  !
+  INTEGER(HID_T) :: file_id
+
+  !
+  ! Group identifier
+  !
+  INTEGER(HID_T) :: gid
+
+  !
+  ! dataset identifier
+  !
+  INTEGER(HID_T) :: dset_id
+
+
+  !
+  ! data type identifier
+  !
+  INTEGER(HID_T) :: dtype_id
+
+  !
+  !flag to check operation success
+  !
+  INTEGER     ::   error
+
+  !
+  !general purpose integer
+  !
+  INTEGER     ::   i, j, total_error = 0
+
+  !
+  !data buffers
+  !
+  INTEGER, DIMENSION(NX,NY) :: data_out
+  INTEGER(HSIZE_T), DIMENSION(2) :: data_dims
+  data_dims(1) = NX
+  data_dims(2) = NY
+
+  !
+  !Initialize FORTRAN predefined datatypes
+  !
+  CALL h5open_f(error)
+  CALL check("h5open_f",error,total_error)
+
+  !
+  !Open the file.
+  !
+  CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
+  IF (error .NE. 0) THEN
+     WRITE(*,*) "Cannot modify filename"
+     CALL h5_exit_f (1)
+  ENDIF
+  CALL h5fopen_f(fix_filename, H5F_ACC_RDONLY_F, file_id, error)
+  CALL check("h5fopen_f",error,total_error)
+
+  !
+  !Open the dataset
+  !
+  CALL h5dopen_f(file_id, "/D", dset_id, error)
+  CALL check("h5dopen_f",error,total_error)
+
+  !
+  !Get dataset's data type.
+  !
+  CALL h5dget_type_f(dset_id, dtype_id, error)
+  CALL check("h5dget_type_f",error,total_error)
+  !
+  !Read the dataset.
+  !
+  CALL h5dread_f(dset_id, dtype_id, data_out, data_dims, error)
+  CALL check("h5dread_f",error,total_error)
+
+  !
+  !Print the dataset.
+  !
+  DO i = 1, NX
+     WRITE(*,*) (data_out(i,j), j = 1, NY)
+  END DO
+  !
+  !result of the print statement
+  !
+  ! 0,  1,  2,  3,  4
+  ! 1,  2,  3,  4,  5
+  ! 2,  3,  4,  5,  6
+  ! 3,  4,  5,  6,  7
+
+  !
+  !Open the group.
+  !
+  CALL h5gopen_f(file_id, "G", gid, error)
+  CALL check("h5gopen_f",error,total_error)
+
+  !
+  !In case error happens, exit.
+  !
+  IF (error == -1) CALL h5_exit_f (1)
+  !
+  !Close the datatype
+  !
+  CALL h5tclose_f(dtype_id, error)
+  CALL check("h5tclose_f",error,total_error)
+
+  !
+  !Close the dataset.
+  !
+  CALL h5dclose_f(dset_id, error)
+  CALL check("h5dclose_f",error,total_error)
+
+  !
+  !Close the group.
+  !
+  CALL h5gclose_f(gid, error)
+  CALL check("h5gclose_f",error,total_error)
+
+  !
+  !Close the file.
+  !
+  CALL h5fclose_f(file_id, error)
+  CALL check("h5fclose_f",error,total_error)
+
+  !
+  !Close FORTRAN predefined datatypes
+  !
+  CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
+  CALL h5close_f(error)
+  CALL check("h5close_types_f",error,total_error)
+
+  ! if errors detected, exit with non-zero code.
+  IF (total_error .ne. 0) CALL h5_exit_f (1)
+
+END PROGRAM FFLUSH2EXAMPLE
diff --git a/fortran/test/fflush2.f90 b/fortran/test/fflush2.f90
deleted file mode 100644
index 04ce439..0000000
--- a/fortran/test/fflush2.f90
+++ /dev/null
@@ -1,178 +0,0 @@
-!****h* root/fortran/test/fflush2.f90
-!
-! NAME
-!  fflush2.f90
-!
-! FUNCTION
-!  This is the second half of a two-part test that makes sure
-!  that a file can be read after an application crashes as long
-!  as the file was flushed first.  This half tries to read the
-!  file created by the first half.
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-!*****
-
-     PROGRAM FFLUSH2EXAMPLE
-
-     USE HDF5 ! This module contains all necessary modules
-     USE TH5_MISC
-
-     IMPLICIT NONE
-
-     CHARACTER(LEN=7), PARAMETER :: filename = "fflush1"
-     CHARACTER(LEN=80) :: fix_filename
-
-     !
-     !data space rank and dimensions
-     !
-     INTEGER, PARAMETER :: NX = 4
-     INTEGER, PARAMETER :: NY = 5
-
-     !
-     ! File identifiers
-     !
-     INTEGER(HID_T) :: file_id
-
-     !
-     ! Group identifier
-     !
-     INTEGER(HID_T) :: gid
-
-     !
-     ! dataset identifier
-     !
-     INTEGER(HID_T) :: dset_id
-
-
-     !
-     ! data type identifier
-     !
-     INTEGER(HID_T) :: dtype_id
-
-     !
-     !flag to check operation success
-     !
-     INTEGER     ::   error
-
-     !
-     !general purpose integer
-     !
-     INTEGER     ::   i, j, total_error = 0
-
-     !
-     !data buffers
-     !
-     INTEGER, DIMENSION(NX,NY) :: data_out
-     INTEGER(HSIZE_T), DIMENSION(2) :: data_dims
-     data_dims(1) = NX
-     data_dims(2) = NY
-
-     !
-     !Initialize FORTRAN predifined datatypes
-     !
-     CALL h5open_f(error)
-          CALL check("h5open_f",error,total_error)
-
-     !
-     !Open the file.
-     !
-          CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
-          if (error .ne. 0) then
-              write(*,*) "Cannot modify filename"
-              CALL h5_exit_f (1)
-          endif
-     CALL h5fopen_f(fix_filename, H5F_ACC_RDONLY_F, file_id, error)
-          CALL check("h5fopen_f",error,total_error)
-
-     !
-     !Open the dataset
-     !
-     CALL h5dopen_f(file_id, "/D", dset_id, error)
-          CALL check("h5dopen_f",error,total_error)
-
-     !
-     !Get dataset's data type.
-     !
-     CALL h5dget_type_f(dset_id, dtype_id, error)
-          CALL check("h5dget_type_f",error,total_error)
-
-     !
-     !Read the dataset.
-     !
-     CALL h5dread_f(dset_id, dtype_id, data_out, data_dims, error)
-          CALL check("h5dread_f",error,total_error)
-
-     !
-     !Print the dataset.
-     !
-     do i = 1, NX
-          write(*,*) (data_out(i,j), j = 1, NY)
-     end do
-!
-!result of the print statement
-!
-! 0,  1,  2,  3,  4
-! 1,  2,  3,  4,  5
-! 2,  3,  4,  5,  6
-! 3,  4,  5,  6,  7
-
-     !
-     !Open the group.
-     !
-     CALL h5gopen_f(file_id, "G", gid, error)
-          CALL check("h5gopen_f",error,total_error)
-
-     !
-     !In case error happens, exit.
-     !
-     IF (error == -1) CALL h5_exit_f (1)
-     !
-     !Close the datatype
-     !
-     CALL h5tclose_f(dtype_id, error)
-          CALL check("h5tclose_f",error,total_error)
-
-     !
-     !Close the dataset.
-     !
-     CALL h5dclose_f(dset_id, error)
-          CALL check("h5dclose_f",error,total_error)
-
-     !
-     !Close the group.
-     !
-     CALL h5gclose_f(gid, error)
-          CALL check("h5gclose_f",error,total_error)
-
-     !
-     !Close the file.
-     !
-     CALL h5fclose_f(file_id, error)
-          CALL check("h5fclose_f",error,total_error)
-
-     !
-     !Close FORTRAN predifined datatypes
-      !
-     CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
-     CALL h5close_f(error)
-         CALL check("h5close_types_f",error,total_error)
-
-     ! if errors detected, exit with non-zero code.
-     IF (total_error .ne. 0) CALL h5_exit_f (1)
-
-     END PROGRAM FFLUSH2EXAMPLE
diff --git a/fortran/test/fortranlib_test.F90 b/fortran/test/fortranlib_test.F90
new file mode 100644
index 0000000..d7fca7d
--- /dev/null
+++ b/fortran/test/fortranlib_test.F90
@@ -0,0 +1,273 @@
+!****h* root/fortran/test/fortranlib_test.f90
+!
+! NAME
+!  fortranlib_test.f90
+!
+! FUNCTION
+!  Basic testing of Fortran API's functionality.
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+!*****
+
+!#include <H5config_f.inc>
+
+PROGRAM fortranlibtest
+
+  USE HDF5
+  USE THDF5
+
+  IMPLICIT NONE
+  INTEGER :: total_error = 0
+  INTEGER :: error
+  INTEGER :: majnum, minnum, relnum
+  LOGICAL :: szip_flag
+  INTEGER :: ret_total_error
+  LOGICAL :: cleanup, status
+
+  WRITE(*,*) '                       ==========================                            '
+  WRITE(*,*) '                              FORTRAN tests '
+  WRITE(*,*) '                       ==========================                            '
+
+  ret_total_error = 0
+  CALL h5openclose(ret_total_error)
+  CALL write_test_status(ret_total_error, ' h5open/h5close test', total_error)
+
+  CALL h5open_f(error)
+  CALL check("h5open_f",error,total_error)
+
+  cleanup = .TRUE.
+  CALL h5_env_nocleanup_f(status)
+  IF(status) cleanup=.FALSE.
+
+
+  ret_total_error = 0
+  CALL h5get_libversion_f(majnum, minnum, relnum, ret_total_error)
+  IF(ret_total_error .EQ. 0) THEN
+
+     WRITE(*, '(/," FORTRANLIB_TEST is linked with HDF5 Library version ")', advance="NO")
+     WRITE(*, '(I0)', advance="NO") majnum
+     WRITE(*, '(".")', advance="NO")
+     WRITE(*, '(I0)', advance="NO") minnum
+     WRITE(*, '(" release ")', advance="NO")
+     WRITE(*, '(I0)') relnum
+  ELSE
+     total_error = total_error + 1
+  ENDIF
+  WRITE(*,*)
+
+!      CALL h5check_version_f(1,4,4,total_error)
+!      '========================================='
+!      'Testing FILE Interface                   '
+!      '========================================='
+
+  ret_total_error = 0
+  CALL mountingtest(cleanup, ret_total_error)
+  CALL write_test_status(ret_total_error, ' Mounting test', total_error)
+
+  ret_total_error = 0
+  CALL reopentest(cleanup, ret_total_error)
+  CALL write_test_status(ret_total_error, ' Reopen test', total_error)
+
+  ret_total_error = 0
+  CALL get_name_test(cleanup, ret_total_error)
+  CALL write_test_status(ret_total_error, ' Get name test', total_error)
+
+  ret_total_error = 0
+  CALL file_close(cleanup, ret_total_error)
+  CALL write_test_status(ret_total_error, ' File open/close test', total_error)
+
+  ret_total_error = 0
+  CALL file_space("file_space",cleanup, ret_total_error)
+  CALL write_test_status(ret_total_error, ' File free space test', total_error)
+
+!
+!      '========================================='
+!      'Testing DATASET Interface                '
+!      '========================================='
+
+  ret_total_error = 0
+  CALL datasettest(cleanup, ret_total_error)
+  CALL write_test_status(ret_total_error, ' Dataset test', total_error)
+
+  ret_total_error = 0
+  CALL extenddsettest(cleanup, ret_total_error)
+  CALL write_test_status(ret_total_error, ' Extendible dataset test', total_error)
+
+  ret_total_error = 0
+  CALL test_userblock_offset(cleanup, ret_total_error)
+  CALL write_test_status(ret_total_error, ' Dataset offset with user block', total_error)
+
+  ! Test filling dataspace elements
+  ret_total_error = 0
+  CALL test_dset_fill(cleanup, ret_total_error)
+  CALL write_test_status(ret_total_error, ' Filling dataspace elements', total_error)
+
+!
+!      '========================================='
+!      'Testing DATASPACE Interface             '
+!      '========================================='
+
+  ret_total_error = 0
+  CALL dataspace_basic_test(cleanup, ret_total_error)
+  CALL write_test_status(ret_total_error, ' Basic dataspace test', total_error)
+
+!
+!      '========================================='
+!      'Testing REFERENCE Interface              '
+!      '========================================='
+
+  ret_total_error = 0
+  CALL refobjtest(cleanup, ret_total_error)
+  CALL write_test_status(ret_total_error, ' Reference to object test', total_error)
+
+  ret_total_error = 0
+  CALL refregtest(cleanup, ret_total_error)
+  CALL write_test_status(ret_total_error, ' Reference to dataset region test', total_error)
+
+!
+!      '========================================='
+!      'Testing selection functionalities        '
+!      '========================================='
+
+  ret_total_error = 0
+  CALL test_basic_select(cleanup, ret_total_error)
+  CALL write_test_status(ret_total_error, ' Basic selection test', total_error)
+
+
+  ret_total_error = 0
+  CALL test_select_hyperslab( cleanup, ret_total_error)
+  CALL write_test_status(ret_total_error, ' Hyperslab selection test', total_error)
+
+  ret_total_error = 0
+  CALL test_select_element(cleanup, ret_total_error)
+  CALL write_test_status(ret_total_error, ' Element selection test', total_error)
+
+  ret_total_error = 0
+  CALL test_select_point(cleanup, ret_total_error)
+  CALL write_test_status(ret_total_error, ' Element selection functions test ', total_error)
+
+  ret_total_error = 0
+  CALL test_select_combine(ret_total_error)
+  CALL write_test_status(ret_total_error, ' Selection combinations test ', total_error)
+
+  ret_total_error = 0
+  CALL test_select_bounds(ret_total_error)
+  CALL write_test_status(ret_total_error, ' Selection bounds test ', total_error)
+
+!
+!      '========================================='
+!      'Testing DATATYPE interface               '
+!      '========================================='
+  ret_total_error = 0
+  CALL basic_data_type_test(ret_total_error)
+  CALL write_test_status(ret_total_error, ' Basic datatype test', total_error)
+
+  ret_total_error = 0
+  CALL compoundtest(cleanup, ret_total_error)
+  CALL write_test_status(ret_total_error, ' Compound datatype test', total_error)
+
+  ret_total_error = 0
+  CALL enumtest(cleanup, ret_total_error)
+  CALL write_test_status(ret_total_error, ' Enum datatype test', total_error)
+
+  ret_total_error = 0
+  CALL test_derived_flt(cleanup, ret_total_error)
+  CALL write_test_status(ret_total_error, ' Derived float datatype test', total_error)
+
+!
+!      '========================================='
+!      'Testing PROPERTY interface               '
+!      '========================================='
+
+  ret_total_error = 0
+  CALL external_test(cleanup, ret_total_error)
+  CALL write_test_status(ret_total_error, ' External dataset test', total_error)
+
+  ret_total_error = 0
+  CALL multi_file_test(cleanup, ret_total_error)
+  CALL write_test_status(ret_total_error, ' Multi file driver test', total_error)
+
+  ret_total_error = 0
+  CALL test_chunk_cache(cleanup, ret_total_error)
+  CALL write_test_status(ret_total_error, ' Dataset chunk cache configuration', total_error)
+
+  ret_total_error = 0
+  CALL test_misc_properties(cleanup, ret_total_error)
+  CALL write_test_status(ret_total_error, ' Miscellaneous properties', total_error)
+
+!
+!      '========================================='
+!      'Testing ATTRIBUTE interface              '
+!      '========================================='
+
+  ret_total_error = 0
+  CALL attribute_test(cleanup, ret_total_error)
+  CALL write_test_status(ret_total_error, ' Attribute test', total_error)
+
+!
+!      '========================================='
+!      'Testing IDENTIFIER interface             '
+!      '========================================='
+
+  ret_total_error = 0
+  CALL identifier_test(cleanup, ret_total_error)
+  CALL write_test_status(ret_total_error, ' Identifier test', total_error)
+
+  ret_total_error = 0
+  CALL filters_test(ret_total_error)
+  CALL write_test_status(ret_total_error, ' Filters test', total_error)
+
+  ret_total_error = 0
+  CALL szip_test(szip_flag, cleanup, ret_total_error)
+
+  IF (.NOT. szip_flag) THEN ! test not available
+     CALL write_test_status(-1, ' SZIP filter test', total_error)
+  ELSE
+     CALL write_test_status(ret_total_error, ' SZIP filter test', total_error)
+  ENDIF
+
+!
+!      '========================================='
+!      'Testing GROUP interface                  '
+!      '========================================='
+
+  ret_total_error = 0
+  CALL group_test(cleanup, ret_total_error)
+  CALL write_test_status(ret_total_error, ' Group test', total_error)
+
+  ret_total_error = 0
+  CALL error_report_test(cleanup, ret_total_error)
+  CALL write_test_status(ret_total_error, ' Error test', total_error)
+
+  ret_total_error = 0
+  CALL vl_test_integer(cleanup, ret_total_error)
+  CALL vl_test_real(cleanup, ret_total_error)
+  CALL vl_test_string(cleanup, ret_total_error)
+  CALL write_test_status(ret_total_error, ' VL test', total_error)
+
+  WRITE(*,*)
+
+  WRITE(*,*) '                  ============================================  '
+  WRITE(*, fmt = '(19x, 27a)', advance='NO') ' FORTRAN tests completed with '
+  WRITE(*, fmt = '(i4)', advance='NO') total_error
+  WRITE(*, fmt = '(12a)' ) ' error(s) ! '
+  WRITE(*,*) '                  ============================================  '
+
+  CALL h5close_f(error)
+
+  ! if errors detected, exit with non-zero code.
+  IF (total_error .NE. 0) CALL h5_exit_f (1)
+
+END PROGRAM fortranlibtest
diff --git a/fortran/test/fortranlib_test.f90 b/fortran/test/fortranlib_test.f90
deleted file mode 100644
index 79ff161..0000000
--- a/fortran/test/fortranlib_test.f90
+++ /dev/null
@@ -1,249 +0,0 @@
-!****h* root/fortran/test/fortranlib_test.f90
-!
-! NAME
-!  fortranlib_test.f90
-!
-! FUNCTION
-!  Basic testing of Fortran API's functionality.
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-!*****
-
-PROGRAM fortranlibtest
-
-  USE HDF5
-  USE THDF5
-
-  IMPLICIT NONE
-  INTEGER :: total_error = 0
-  INTEGER :: error
-  INTEGER :: majnum, minnum, relnum
-  LOGICAL :: szip_flag
-  INTEGER :: ret_total_error
-  LOGICAL :: cleanup, status
-
-  CALL h5open_f(error)
-
-  cleanup = .TRUE.
-  CALL h5_env_nocleanup_f(status)
-  IF(status) cleanup=.FALSE.
-
-  WRITE(*,*) '                       ==========================                            '
-  WRITE(*,*) '                              FORTRAN tests '
-  WRITE(*,*) '                       ==========================                            '
-  CALL h5get_libversion_f(majnum, minnum, relnum, total_error)
-  IF(total_error .EQ. 0) THEN
-
-     WRITE(*, '(" FORTRANLIB_TEST is linked with HDF5 Library version ")', advance="NO")
-     WRITE(*, '(I1)', advance="NO") majnum
-     WRITE(*, '(".")', advance="NO")
-     WRITE(*, '(I1)', advance="NO") minnum
-     WRITE(*, '(" release ")', advance="NO")
-     WRITE(*, '(I3)') relnum
-  ELSE
-     total_error = total_error + 1
-  ENDIF
-  WRITE(*,*)
-
-!     CALL h5check_version_f(1,4,4,total_error)
-!     write(*,*) '========================================='
-!     write(*,*) 'Testing FILE Interface                   '
-!     write(*,*) '========================================='
-
-  ret_total_error = 0
-  CALL mountingtest(cleanup, ret_total_error)
-  CALL write_test_status(ret_total_error, ' Mounting test', total_error)
-
-  ret_total_error = 0
-  CALL reopentest(cleanup, ret_total_error)
-  CALL write_test_status(ret_total_error, ' Reopen test', total_error)
-
-  ret_total_error = 0
-  CALL file_close(cleanup, ret_total_error)
-  CALL write_test_status(ret_total_error, ' File open/close test', total_error)
-
-  ret_total_error = 0
-  CALL file_space("file_space",cleanup, ret_total_error)
-  CALL write_test_status(ret_total_error, ' File free space test', total_error)
-
-!     write(*,*)
-!     write(*,*) '========================================='
-!     write(*,*) 'Testing DATASET Interface                '
-!     write(*,*) '========================================='
-
-  ret_total_error = 0
-  CALL datasettest(cleanup, ret_total_error)
-  CALL write_test_status(ret_total_error, ' Dataset test', total_error)
-
-  ret_total_error = 0
-  CALL extenddsettest(cleanup, ret_total_error)
-  CALL write_test_status(ret_total_error, ' Extendible dataset test', total_error)
-
-!     write(*,*)
-!     write(*,*) '========================================='
-!     write(*,*) 'Testing DATASPACE Interface             '
-!     write(*,*) '========================================='
-
-  ret_total_error = 0
-  CALL dataspace_basic_test(cleanup, ret_total_error)
-  CALL write_test_status(ret_total_error, ' Basic dataspace test', total_error)
-
-!     write(*,*)
-!     write(*,*) '========================================='
-!     write(*,*) 'Testing REFERENCE Interface              '
-!     write(*,*) '========================================='
-
-  ret_total_error = 0
-  CALL refobjtest(cleanup, ret_total_error)
-  CALL write_test_status(ret_total_error, ' Reference to object test', total_error)
-
-  ret_total_error = 0
-  CALL refregtest(cleanup, ret_total_error)
-  CALL write_test_status(ret_total_error, ' Reference to dataset region test', total_error)
-
-!     write(*,*)
-!     write(*,*) '========================================='
-!     write(*,*) 'Testing selection functionalities        '
-!     write(*,*) '========================================='
-
-  ret_total_error = 0
-  CALL test_basic_select(cleanup, ret_total_error)
-  CALL write_test_status(ret_total_error, ' Basic selection test', total_error)
-
-
-  ret_total_error = 0
-  CALL test_select_hyperslab( cleanup, ret_total_error)
-  CALL write_test_status(ret_total_error, ' Hyperslab selection test', total_error)
-
-  ret_total_error = 0
-  CALL test_select_element(cleanup, ret_total_error)
-  CALL write_test_status(ret_total_error, ' Element selection test', total_error)
-
-  ret_total_error = 0
-  CALL test_select_point(cleanup, ret_total_error)
-  CALL write_test_status(ret_total_error, ' Element selection functions test ', total_error)
-
-  ret_total_error = 0
-  CALL test_select_combine(ret_total_error)
-  CALL write_test_status(ret_total_error, ' Selection combinations test ', total_error)
-
-  ret_total_error = 0
-  CALL test_select_bounds(ret_total_error)
-  CALL write_test_status(ret_total_error, ' Selection bounds test ', total_error)
-  
-!     write(*,*)
-!     write(*,*) '========================================='
-!     write(*,*) 'Testing DATATYPE interface               '
-!     write(*,*) '========================================='
-  ret_total_error = 0
-  CALL basic_data_type_test(ret_total_error)
-  CALL write_test_status(ret_total_error, ' Basic datatype test', total_error)
-
-  ret_total_error = 0
-  CALL compoundtest(cleanup, ret_total_error)
-  CALL write_test_status(ret_total_error, ' Compound datatype test', total_error)
-
-  ret_total_error = 0
-  CALL enumtest(cleanup, ret_total_error)
-  CALL write_test_status(ret_total_error, ' Enum datatype test', total_error)
-
-  ret_total_error = 0
-  CALL test_derived_flt(cleanup, ret_total_error)
-  CALL write_test_status(ret_total_error, ' Derived float datatype test', total_error)
-
-!     write(*,*)
-!     write(*,*) '========================================='
-!     write(*,*) 'Testing PROPERTY interface               '
-!     write(*,*) '========================================='
-
-  ret_total_error = 0
-  CALL external_test(cleanup, ret_total_error)
-  CALL write_test_status(ret_total_error, ' External dataset test', total_error)
-
-  ret_total_error = 0
-  CALL multi_file_test(cleanup, ret_total_error)
-  CALL write_test_status(ret_total_error, ' Multi file driver test', total_error)
-
-  ret_total_error = 0
-  CALL test_chunk_cache (cleanup, ret_total_error)
-  CALL write_test_status(ret_total_error, ' Dataset chunk cache configuration', total_error)
-
-!     write(*,*)
-!     write(*,*) '========================================='
-!     write(*,*) 'Testing ATTRIBUTE interface              '
-!     write(*,*) '========================================='
-
-  ret_total_error = 0
-  CALL attribute_test(cleanup, ret_total_error)
-  CALL write_test_status(ret_total_error, ' Attribute test', total_error)
-
-!     write(*,*)
-!     write(*,*) '========================================='
-!     write(*,*) 'Testing IDENTIFIER interface             '
-!     write(*,*) '========================================='
-
-  ret_total_error = 0
-  CALL identifier_test(cleanup, ret_total_error)
-  CALL write_test_status(ret_total_error, ' Identifier test', total_error)
-
-  ret_total_error = 0
-  CALL filters_test(ret_total_error)
-  CALL write_test_status(ret_total_error, ' Filters test', total_error)
-
-  ret_total_error = 0
-  CALL szip_test(szip_flag, cleanup, ret_total_error)
-
-  IF (.NOT. szip_flag) THEN ! test not available
-     CALL write_test_status(-1, ' SZIP filter test', total_error)
-  ELSE
-     CALL write_test_status(ret_total_error, ' SZIP filter test', total_error)
-  ENDIF
-
-!     write(*,*)
-!     write(*,*) '========================================='
-!     write(*,*) 'Testing GROUP interface             '
-!     write(*,*) '========================================='
-
-  ret_total_error = 0
-  CALL group_test(cleanup, ret_total_error)
-  CALL write_test_status(ret_total_error, ' Group test', total_error)
-
-  ret_total_error = 0
-  CALL error_report_test(cleanup, ret_total_error)
-  CALL write_test_status(ret_total_error, ' Error test', total_error)
-
-  ret_total_error = 0
-  CALL vl_test_integer(cleanup, ret_total_error)
-  CALL vl_test_real(cleanup, ret_total_error)
-  CALL vl_test_string(cleanup, ret_total_error)
-  CALL write_test_status(ret_total_error, ' VL test', total_error)
-
-  WRITE(*,*)
-
-  WRITE(*,*) '                  ============================================  '
-  WRITE(*, fmt = '(19x, 27a)', advance='NO') ' FORTRAN tests completed with '
-  WRITE(*, fmt = '(i4)', advance='NO') total_error
-  WRITE(*, fmt = '(12a)' ) ' error(s) ! '
-  WRITE(*,*) '                  ============================================  '
-
-  CALL h5close_f(error)
-
-  ! if errors detected, exit with non-zero code.
-  IF (total_error .NE. 0) CALL h5_exit_f (1)
-
-END PROGRAM fortranlibtest
diff --git a/fortran/test/fortranlib_test_1_8.F90 b/fortran/test/fortranlib_test_1_8.F90
new file mode 100644
index 0000000..fde3faa
--- /dev/null
+++ b/fortran/test/fortranlib_test_1_8.F90
@@ -0,0 +1,119 @@
+!****h* root/fortran/test/fortranlib_test_1_8.f90
+!
+! NAME
+!  fortranlib_test_1_8.f90
+!
+! FUNCTION
+!  Basic testing of Fortran API's introduced in 1.8 release.
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+!*****
+
+PROGRAM fortranlibtest
+
+  USE HDF5
+  USE THDF5_1_8
+  USE TH5_MISC
+  IMPLICIT NONE
+  INTEGER :: total_error = 0
+  INTEGER :: error
+  INTEGER :: ret_total_error
+  INTEGER :: majnum, minnum, relnum
+  LOGICAL :: cleanup, status
+
+  CALL h5open_f(error)
+
+  cleanup = .TRUE.
+  CALL h5_env_nocleanup_f(status)
+  IF(status) cleanup=.FALSE.
+
+  WRITE(*,*) '                       ==========================                            '
+  WRITE(*,*) '                              FORTRAN 1.8 tests '
+  WRITE(*,*) '                       ==========================                            '
+  CALL h5get_libversion_f(majnum, minnum, relnum, total_error)
+  IF(total_error .EQ. 0) THEN
+     WRITE(*, '(" FORTRANLIB_TEST is linked with HDF5 Library version ")', advance="NO")
+     WRITE(*, '(I0)', advance="NO") majnum
+     WRITE(*, '(".")', advance="NO")
+     WRITE(*, '(I0)', advance="NO") minnum
+     WRITE(*, '(" release ")', advance="NO")
+     WRITE(*, '(I0)') relnum
+  ELSE
+     total_error = total_error + 1
+  ENDIF
+  WRITE(*,*)
+
+  CALL h5eset_auto_f(0, ret_total_error)
+  IF(ret_total_error.NE.0) &
+       CALL write_test_status(ret_total_error, &
+       ' h5eset_auto_f', &
+       total_error)
+
+  ret_total_error = 0
+  CALL attribute_test_1_8(cleanup, ret_total_error)
+  CALL write_test_status(ret_total_error, &
+       ' Testing attributes', &
+       total_error)
+
+  ret_total_error = 0
+  CALL group_test(cleanup, ret_total_error)
+  CALL write_test_status(ret_total_error, &
+       ' Testing groups', &
+       total_error)
+
+  ret_total_error = 0
+  CALL test_h5o(cleanup, ret_total_error)
+  CALL write_test_status(ret_total_error, &
+       ' Testing object interface', &
+       total_error)
+
+  ret_total_error = 0
+  CALL dtransform(cleanup, ret_total_error)
+  CALL write_test_status(ret_total_error, &
+       ' Testing data transform', &
+       total_error)
+
+  ret_total_error = 0
+  CALL test_h5s_encode(ret_total_error)
+  CALL write_test_status(ret_total_error, &
+       ' Testing dataspace encoding and decoding', &
+       total_error)
+
+  ret_total_error = 0
+  CALL test_scaleoffset(cleanup, ret_total_error )
+  CALL write_test_status(ret_total_error, &
+       ' Testing scaleoffset filter', &
+       total_error)
+
+  ret_total_error = 0
+  CALL test_genprop_basic_class(ret_total_error )
+  CALL write_test_status(ret_total_error, &
+       ' Testing basic generic property list class creation functionality', &
+       total_error)
+
+  WRITE(*,*)
+
+  WRITE(*,*) '                  ============================================  '
+  WRITE(*, fmt = '(19x, 27a)', advance='NO') ' FORTRAN tests completed with '
+  WRITE(*, fmt = '(i4)', advance='NO') total_error
+  WRITE(*, fmt = '(12a)' ) ' error(s) ! '
+  WRITE(*,*) '                  ============================================  '
+
+  CALL h5close_f(error)
+
+  ! if errors detected, exit with non-zero code.
+  IF (total_error .NE. 0) CALL h5_exit_f (1)
+
+END PROGRAM fortranlibtest
diff --git a/fortran/test/fortranlib_test_1_8.f90 b/fortran/test/fortranlib_test_1_8.f90
deleted file mode 100644
index 320d661..0000000
--- a/fortran/test/fortranlib_test_1_8.f90
+++ /dev/null
@@ -1,122 +0,0 @@
-!****h* root/fortran/test/fortranlib_test_1_8.f90
-!
-! NAME
-!  fortranlib_test_1_8.f90
-!
-! FUNCTION
-!  Basic testing of Fortran API's introduced in 1.8 release.
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-!*****
-
-PROGRAM fortranlibtest
-
-  USE HDF5
-  USE THDF5_1_8
-  USE TH5_MISC
-  IMPLICIT NONE
-  INTEGER :: total_error = 0
-  INTEGER :: error
-  INTEGER :: ret_total_error
-  INTEGER :: majnum, minnum, relnum
-  LOGICAL :: cleanup, status
-
-  CALL h5open_f(error)
-
-  cleanup = .TRUE.
-  CALL h5_env_nocleanup_f(status)
-  IF(status) cleanup=.FALSE.
-
-  WRITE(*,*) '                       ==========================                            '
-  WRITE(*,*) '                              FORTRAN 1.8 tests '
-  WRITE(*,*) '                       ==========================                            '
-  CALL h5get_libversion_f(majnum, minnum, relnum, total_error)
-  IF(total_error .EQ. 0) THEN
-     WRITE(*, '(" FORTRANLIB_TEST is linked with HDF5 Library version ")', advance="NO")
-     WRITE(*, '(I1)', advance="NO") majnum
-     WRITE(*, '(".")', advance="NO")
-     WRITE(*, '(I1)', advance="NO") minnum
-     WRITE(*, '(" release ")', advance="NO")
-     WRITE(*, '(I3)') relnum
-  ELSE
-     total_error = total_error + 1
-  ENDIF
-  WRITE(*,*)
-
-  CALL h5eset_auto_f(0, ret_total_error)
-  IF(ret_total_error.NE.0) &
-       CALL write_test_status(ret_total_error, &
-       ' h5eset_auto_f', &
-       total_error)
-
-  ret_total_error = 0
-  CALL attribute_test_1_8(cleanup, ret_total_error)
-  CALL write_test_status(ret_total_error, &
-       ' Testing attributes', &
-       total_error)
-
-  ret_total_error = 0
-  CALL group_test(cleanup, ret_total_error)
-  CALL write_test_status(ret_total_error, &
-       ' Testing groups', &
-       total_error)
-
-  ret_total_error = 0
-  CALL test_h5o(cleanup, ret_total_error)
-  CALL write_test_status(ret_total_error, &
-       ' Testing object interface', &
-       total_error)
-
-  ret_total_error = 0
-  CALL dtransform(cleanup, ret_total_error)
-  CALL write_test_status(ret_total_error, &
-       ' Testing data transform', &
-       total_error)
-
-  ret_total_error = 0
-  CALL test_h5s_encode(ret_total_error)
-  CALL write_test_status(ret_total_error, &
-       ' Testing dataspace encoding and decoding', &
-       total_error)
-
-  ret_total_error = 0
-  CALL test_scaleoffset(cleanup, ret_total_error )
-  CALL write_test_status(ret_total_error, &
-       ' Testing scaleoffset filter', &
-       total_error)
-
-  ret_total_error = 0
-  CALL test_genprop_basic_class(ret_total_error )
-  CALL write_test_status(ret_total_error, &
-       ' Testing basic generic property list class creation functionality', &
-       total_error)
-
-  WRITE(*,*)
-
-  WRITE(*,*) '                  ============================================  '
-  WRITE(*, fmt = '(19x, 27a)', advance='NO') ' FORTRAN tests completed with '
-  WRITE(*, fmt = '(i4)', advance='NO') total_error
-  WRITE(*, fmt = '(12a)' ) ' error(s) ! '
-  WRITE(*,*) '                  ============================================  '
-
-  CALL h5close_f(error)
-
-  ! if errors detected, exit with non-zero code.
-  IF (total_error .NE. 0) CALL h5_exit_f (1)
-
-END PROGRAM fortranlibtest
diff --git a/fortran/test/fortranlib_test_F03.F90 b/fortran/test/fortranlib_test_F03.F90
new file mode 100644
index 0000000..6c53cc0
--- /dev/null
+++ b/fortran/test/fortranlib_test_F03.F90
@@ -0,0 +1,202 @@
+!****h* root/fortran/test/fortranlib_test_F03.f90
+!
+! NAME
+!  fortranlib_test_F03.f90
+!
+! FUNCTION
+!  Basic testing of Fortran API's requiring Fortran 2003
+!  compliance.
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+!*****
+
+PROGRAM fortranlibtest_F03
+
+  USE HDF5
+  USE THDF5_F03
+
+  IMPLICIT NONE
+  INTEGER :: total_error = 0
+  INTEGER :: error
+  INTEGER :: majnum, minnum, relnum
+  INTEGER :: ret_total_error
+  LOGICAL :: cleanup, status
+
+  CALL h5open_f(error)
+
+  cleanup = .TRUE.
+  CALL h5_env_nocleanup_f(status)
+  IF(status) cleanup=.FALSE.
+
+  WRITE(*,'(24X,A)') '=============================='
+  WRITE(*,'(24X,A)') '      FORTRAN 2003 tests      '
+  WRITE(*,'(24X,A)') '=============================='
+  CALL h5get_libversion_f(majnum, minnum, relnum, total_error)
+  IF(total_error .EQ. 0) THEN
+     WRITE(*, '(" FORTRANLIB_TEST is linked with HDF5 Library version ")', advance="NO")
+     WRITE(*, '(I0)', advance="NO") majnum
+     WRITE(*, '(".")', advance="NO")
+     WRITE(*, '(I0)', advance="NO") minnum
+     WRITE(*, '(" release ")', advance="NO")
+     WRITE(*, '(I0)') relnum
+  ELSE
+     total_error = total_error + 1
+  ENDIF
+
+  ret_total_error = 0
+!  PROBLEMS with C
+!  CALL test_error(ret_total_error)
+!  CALL write_test_status(ret_total_error, ' Test error API based on data I/O', total_error)
+
+  WRITE(*,*)
+
+  ret_total_error = 0
+  CALL test_array_compound_atomic(ret_total_error)
+  CALL write_test_status(ret_total_error, ' Testing 1-D Array of Compound Datatypes Functionality', total_error)
+
+  ret_total_error = 0
+  CALL test_array_compound_array(ret_total_error)
+  CALL write_test_status(ret_total_error, ' Testing 1-D Array of Compound Array Datatypes Functionality', total_error)
+
+  ret_total_error = 0
+  CALL t_array(ret_total_error)
+  CALL write_test_status(ret_total_error, ' Testing 3-D array by dataset, using C_LOC', total_error)
+
+  ret_total_error = 0
+  CALL t_enum(ret_total_error)
+  CALL write_test_status(ret_total_error, ' Testing writing/reading enum dataset, using C_LOC', total_error)
+
+  ret_total_error = 0
+  CALL t_enum_conv(ret_total_error)
+  CALL write_test_status(ret_total_error, ' Testing enumeration conversions', total_error)
+
+  ret_total_error = 0
+  CALL t_bit(ret_total_error)
+  CALL write_test_status(ret_total_error, ' Testing writing/reading bitfield dataset, using C_LOC', total_error)
+
+  ret_total_error = 0
+  CALL t_opaque(ret_total_error)
+  CALL write_test_status(ret_total_error, ' Testing writing/reading opaque datatypes, using C_LOC', total_error)
+
+  ret_total_error = 0
+  CALL t_objref(ret_total_error)
+  CALL write_test_status(ret_total_error, ' Testing writing/reading object references, using C_LOC', total_error)
+
+  ret_total_error = 0
+  CALL t_regref(ret_total_error)
+  CALL write_test_status(ret_total_error, ' Testing writing/reading region references, using C_LOC', total_error)
+
+  ret_total_error = 0
+  CALL t_vlen(ret_total_error)
+  CALL write_test_status(ret_total_error, ' Testing writing/reading variable-length datatypes, using C_LOC', total_error)
+
+  ret_total_error = 0
+  CALL t_vlstring(ret_total_error)
+  CALL write_test_status(ret_total_error, ' Testing writing/reading variable-string datatypes, using C_LOC', total_error)
+
+  ret_total_error = 0
+  CALL t_vlstring_readwrite(ret_total_error)
+  CALL write_test_status(ret_total_error, ' Testing variable-string write/read, using h5dwrite_f/h5dread_f', total_error)
+
+  ret_total_error = 0
+  CALL t_string(ret_total_error)
+  CALL write_test_status(ret_total_error, ' Testing writing/reading string datatypes, using C_LOC', total_error)
+
+  ret_total_error = 0
+  CALL vl_test_special_char(ret_total_error)
+  CALL write_test_status(ret_total_error, ' Testing string datatypes containing control characters', total_error)
+
+  ret_total_error = 0
+  CALL test_create(ret_total_error)
+  CALL write_test_status(ret_total_error, ' Testing filling functions', total_error)
+
+  ret_total_error = 0
+  CALL test_h5kind_to_type(total_error)
+  CALL write_test_status(ret_total_error, ' Test function h5kind_to_type', total_error)
+
+  ret_total_error = 0
+  CALL test_array_bkg(ret_total_error)
+  CALL write_test_status(ret_total_error, ' Testing Partial I/O of Array Fields in Compound Datatype Functionality', total_error)
+
+  ret_total_error = 0
+  CALL test_genprop_class_callback(ret_total_error)
+  CALL write_test_status(ret_total_error, ' Test basic generic property list callback functionality', total_error)
+
+  ret_total_error = 0
+  CALL test_iter_group(ret_total_error)
+  CALL write_test_status(ret_total_error, ' Testing group iteration functionality', total_error)
+
+  ret_total_error = 0
+  CALL test_nbit(ret_total_error)
+  CALL write_test_status(ret_total_error, ' Testing nbit filter', total_error)
+
+  ret_total_error = 0
+  CALL external_test_offset(cleanup, ret_total_error)
+  CALL write_test_status(ret_total_error, ' Testing external dataset with offset', total_error)
+
+  ret_total_error = 0
+  CALL test_h5p_file_image(ret_total_error)
+  CALL write_test_status(ret_total_error, ' Testing h5pset/get file image', total_error)
+
+  ret_total_error = 0
+  CALL multiple_dset_rw(ret_total_error)
+  CALL write_test_status(ret_total_error, ' Testing multi-dataset reads and writes', total_error)
+
+!     write(*,*)
+!     write(*,*) '========================================='
+!     write(*,*) 'Testing OBJECT interface                 '
+!     write(*,*) '========================================='
+
+  ret_total_error = 0
+  CALL test_h5o_refcount(ret_total_error)
+  CALL write_test_status(ret_total_error, ' Testing object functions ', total_error)
+
+  ret_total_error = 0
+  CALL test_obj_visit(ret_total_error)
+  CALL write_test_status(ret_total_error, ' Testing object visiting functions ', total_error)
+
+  ret_total_error = 0
+  CALL test_obj_info(ret_total_error)
+  CALL write_test_status(ret_total_error, ' Testing object info functions ', total_error)
+
+  ret_total_error = 0
+  CALL test_get_file_image(ret_total_error)
+  CALL write_test_status(ret_total_error, ' Testing get file image ', total_error)
+
+!     write(*,*)
+!     write(*,*) '========================================='
+!     write(*,*) 'Testing VDS                              '
+!     write(*,*) '========================================='
+
+  ret_total_error = 0
+  CALL test_vds(ret_total_error)
+  CALL write_test_status(ret_total_error, ' Testing vds ', total_error)
+
+  WRITE(*,*)
+
+  WRITE(*,*) '                  ============================================  '
+  WRITE(*, fmt = '(19x, 27a)', advance='NO') ' FORTRAN tests completed with '
+  WRITE(*, fmt = '(i4)', advance='NO') total_error
+  WRITE(*, fmt = '(12a)' ) ' error(s) ! '
+  WRITE(*,*) '                  ============================================  '
+
+  CALL h5close_f(error)
+
+  ! if errors detected, exit with non-zero code.
+  IF (total_error .NE. 0) CALL h5_exit_f(1)
+
+END PROGRAM fortranlibtest_F03
+
+
diff --git a/fortran/test/fortranlib_test_F03.f90 b/fortran/test/fortranlib_test_F03.f90
deleted file mode 100644
index 5b386b9..0000000
--- a/fortran/test/fortranlib_test_F03.f90
+++ /dev/null
@@ -1,193 +0,0 @@
-!****h* root/fortran/test/fortranlib_test_F03.f90
-!
-! NAME
-!  fortranlib_test_F03.f90
-!
-! FUNCTION
-!  Basic testing of Fortran API's requiring Fortran 2003
-!  compliance.
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-!*****
-
-PROGRAM fortranlibtest_F03
-  
-  USE HDF5
-  USE THDF5_F03
-
-  IMPLICIT NONE
-  INTEGER :: total_error = 0
-  INTEGER :: error
-  INTEGER :: majnum, minnum, relnum
-  INTEGER :: ret_total_error
-  LOGICAL :: cleanup, status
-
-  CALL h5open_f(error)
-
-  cleanup = .TRUE.
-  CALL h5_env_nocleanup_f(status)
-  IF(status) cleanup=.FALSE.
-
-  WRITE(*,'(24X,A)') '=============================='
-  WRITE(*,'(24X,A)') '      FORTRAN 2003 tests      '
-  WRITE(*,'(24X,A)') '=============================='
-  CALL h5get_libversion_f(majnum, minnum, relnum, total_error)
-  IF(total_error .EQ. 0) THEN
-     WRITE(*, '(" FORTRANLIB_TEST is linked with HDF5 Library version ")', advance="NO")
-     WRITE(*, '(I1)', advance="NO") majnum
-     WRITE(*, '(".")', advance="NO") 
-     WRITE(*, '(I1)', advance="NO") minnum
-     WRITE(*, '(" release ")', advance="NO")
-     WRITE(*, '(I3)') relnum
-  ELSE
-     total_error = total_error + 1
-  ENDIF
-
-  ret_total_error = 0
-!  PROBLEMS with C
-!  CALL test_error(ret_total_error)
-!  CALL write_test_status(ret_total_error, ' Test error API based on data I/O', total_error)
-
-  WRITE(*,*)
-
-  ret_total_error = 0
-  CALL test_array_compound_atomic(ret_total_error)
-  CALL write_test_status(ret_total_error, ' Testing 1-D Array of Compound Datatypes Functionality', total_error)
-
-  ret_total_error = 0
-  CALL test_array_compound_array(ret_total_error)
-  CALL write_test_status(ret_total_error, ' Testing 1-D Array of Compound Array Datatypes Functionality', total_error)
-
-  ret_total_error = 0
-  CALL t_array(ret_total_error)
-  CALL write_test_status(ret_total_error, ' Testing 3-D array by dataset, using C_LOC', total_error)
-
-  ret_total_error = 0
-  CALL t_enum(ret_total_error)
-  CALL write_test_status(ret_total_error, ' Testing writing/reading enum dataset, using C_LOC', total_error)  
-
-  ret_total_error = 0
-  CALL t_enum_conv(ret_total_error)
-  CALL write_test_status(ret_total_error, ' Testing enumeration conversions', total_error)  
-
-  ret_total_error = 0
-  CALL t_bit(ret_total_error)
-  CALL write_test_status(ret_total_error, ' Testing writing/reading bitfield dataset, using C_LOC', total_error)
-
-  ret_total_error = 0
-  CALL t_opaque(ret_total_error)
-  CALL write_test_status(ret_total_error, ' Testing writing/reading opaque datatypes, using C_LOC', total_error) 
-
-  ret_total_error = 0
-  CALL t_objref(ret_total_error)
-  CALL write_test_status(ret_total_error, ' Testing writing/reading object references, using C_LOC', total_error)
-
-  ret_total_error = 0
-  CALL t_regref(ret_total_error)
-  CALL write_test_status(ret_total_error, ' Testing writing/reading region references, using C_LOC', total_error)  
-
-  ret_total_error = 0
-  CALL t_vlen(ret_total_error)
-  CALL write_test_status(ret_total_error, ' Testing writing/reading variable-length datatypes, using C_LOC', total_error)
-
-  ret_total_error = 0
-  CALL t_vlstring(ret_total_error)
-  CALL write_test_status(ret_total_error, ' Testing writing/reading variable-string datatypes, using C_LOC', total_error)
-
-  ret_total_error = 0
-  CALL t_vlstring_readwrite(ret_total_error)
-  CALL write_test_status(ret_total_error, ' Testing variable-string write/read, using h5dwrite_f/h5dread_f', total_error)
-
-  ret_total_error = 0
-  CALL t_string(ret_total_error)
-  CALL write_test_status(ret_total_error, ' Testing writing/reading string datatypes, using C_LOC', total_error)
-
-  ret_total_error = 0
-  CALL vl_test_special_char(ret_total_error)
-  CALL write_test_status(ret_total_error, ' Testing string datatypes containing control characters', total_error)
-
-  ret_total_error = 0
-  CALL test_create(ret_total_error)
-  CALL write_test_status(ret_total_error, ' Testing filling functions', total_error)
-
-  ret_total_error = 0
-  CALL test_h5kind_to_type(total_error)
-  CALL write_test_status(ret_total_error, ' Test function h5kind_to_type', total_error)
-
-  ret_total_error = 0
-  CALL test_array_bkg(ret_total_error)
-  CALL write_test_status(ret_total_error, ' Testing Partial I/O of Array Fields in Compound Datatype FunctionalityT', total_error)
-
-  ret_total_error = 0
-  CALL test_genprop_class_callback(ret_total_error)
-  CALL write_test_status(ret_total_error, ' Test basic generic property list callback functionality', total_error)
-
-  ret_total_error = 0
-  CALL test_iter_group(ret_total_error)
-  CALL write_test_status(ret_total_error, ' Testing group iteration functionality', total_error)
-
-  ret_total_error = 0
-  CALL test_nbit(ret_total_error)
-  CALL write_test_status(ret_total_error, ' Testing nbit filter', total_error)
-
-  ret_total_error = 0
-  CALL external_test_offset(cleanup, ret_total_error)
-  CALL write_test_status(ret_total_error, ' Testing external dataset with offset', total_error)
-
-  ret_total_error = 0
-  CALL test_h5p_file_image(ret_total_error)
-  CALL write_test_status(ret_total_error, ' Testing h5pset/get file image', total_error)
-  
-!     write(*,*)
-!     write(*,*) '========================================='
-!     write(*,*) 'Testing GROUP interface             '
-!     write(*,*) '========================================='
-
-  ret_total_error = 0
-  CALL test_h5o_refcount(ret_total_error)
-  CALL write_test_status(ret_total_error, ' Testing object functions ', total_error)
-
-  ret_total_error = 0
-  CALL obj_visit(ret_total_error)
-  CALL write_test_status(ret_total_error, ' Testing object visiting functions ', total_error)
-
-  ret_total_error = 0
-  CALL obj_info(ret_total_error)
-  CALL write_test_status(ret_total_error, ' Testing object info functions ', total_error)
-
-  ret_total_error = 0
-  CALL test_get_file_image(ret_total_error)
-  CALL write_test_status(ret_total_error, ' Testing get file image ', total_error)
-
-
-  WRITE(*,*)
-
-  WRITE(*,*) '                  ============================================  '
-  WRITE(*, fmt = '(19x, 27a)', advance='NO') ' FORTRAN tests completed with '
-  WRITE(*, fmt = '(i4)', advance='NO') total_error
-  WRITE(*, fmt = '(12a)' ) ' error(s) ! '
-  WRITE(*,*) '                  ============================================  '
-  
-  CALL h5close_f(error)
-
-  ! if errors detected, exit with non-zero code.
-  IF (total_error .NE. 0) CALL h5_exit_f(1)
-
-END PROGRAM fortranlibtest_F03
-
-
diff --git a/fortran/test/t.c b/fortran/test/t.c
index fe69143..f6bc0f9 100644
--- a/fortran/test/t.c
+++ b/fortran/test/t.c
@@ -9,21 +9,18 @@
  * COPYRIGHT
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  ******
-*/
+ */
 
 #include "t.h"
 #include "H5Eprivate.h"
@@ -42,34 +39,34 @@
  * Modifications:
  *---------------------------------------------------------------------------*/
 int_f
-nh5_fixname_c(_fcd base_name, size_t_f *base_namelen, hid_t_f* fapl, _fcd full_name, size_t_f *full_namelen)
+nh5_fixname_c(_fcd base_name, size_t_f *base_namelen, hid_t_f *fapl, _fcd full_name, size_t_f *full_namelen)
 {
-     char *c_base_name = NULL;
-     char *c_full_name = NULL;
-     int_f ret_value = 0;
+    char *c_base_name = NULL;
+    char *c_full_name = NULL;
+    int_f ret_value   = 0;
 
-     /*
-      * Convert FORTRAN name to C name
-      */
-     if(NULL == (c_base_name = (char *)HD5f2cstring(base_name, (size_t)*base_namelen)))
-         HGOTO_DONE(FAIL)
-     if(NULL == (c_full_name = (char *)HDmalloc((size_t)*full_namelen + 1)))
-         HGOTO_DONE(FAIL)
+    /*
+     * Convert FORTRAN name to C name
+     */
+    if (NULL == (c_base_name = (char *)HD5f2cstring(base_name, (size_t)*base_namelen)))
+        HGOTO_DONE(FAIL)
+    if (NULL == (c_full_name = (char *)HDmalloc((size_t)*full_namelen + 1)))
+        HGOTO_DONE(FAIL)
 
-     /*
-      * Call h5_fixname function.
-      */
-     if(NULL == h5_fixname(c_base_name, (hid_t)*fapl, c_full_name, (size_t)*full_namelen + 1))
-         HGOTO_DONE(FAIL)
-     HD5packFstring(c_full_name, _fcdtocp(full_name), (size_t)*full_namelen);
+    /*
+     * Call h5_fixname function.
+     */
+    if (NULL == h5_fixname(c_base_name, (hid_t)*fapl, c_full_name, (size_t)*full_namelen + 1))
+        HGOTO_DONE(FAIL)
+    HD5packFstring(c_full_name, _fcdtocp(full_name), (size_t)*full_namelen);
 
 done:
-     if(c_base_name)
+    if (c_base_name)
         HDfree(c_base_name);
-     if(c_full_name)
+    if (c_full_name)
         HDfree(c_full_name);
 
-     return ret_value;
+    return ret_value;
 }
 
 /*----------------------------------------------------------------------------
@@ -84,40 +81,41 @@ done:
  * Modifications:
  *---------------------------------------------------------------------------*/
 int_f
-nh5_cleanup_c(_fcd base_name, size_t_f *base_namelen, hid_t_f* fapl)
+nh5_cleanup_c(_fcd base_name, size_t_f *base_namelen, hid_t_f *fapl)
 {
-     char filename[1024];
-     int ret_value = -1;
-     char *c_base_name[1];
-     hid_t c_fapl;
+    char  filename[1024];
+    int   ret_value = -1;
+    char *c_base_name[1];
+    hid_t c_fapl;
 
-     /*
-      * Define ifile access property list
-      */
-     c_fapl = (hid_t)*fapl;
-     /*c_fapl = H5Pcreate(H5P_FILE_ACCESS);*/
-     /*
-      * Convert FORTRAN name to C name
-      */
-     c_base_name[0] = (char *)HD5f2cstring(base_name, (size_t)*base_namelen);
-     if (c_base_name[0] == NULL) goto DONE;
+    /*
+     * Define ifile access property list
+     */
+    c_fapl = (hid_t)*fapl;
+    /*c_fapl = H5Pcreate(H5P_FILE_ACCESS);*/
+    /*
+     * Convert FORTRAN name to C name
+     */
+    c_base_name[0] = (char *)HD5f2cstring(base_name, (size_t)*base_namelen);
+    if (c_base_name[0] == NULL)
+        goto DONE;
 
-     /*
-      * Call h5_cleanup function.
-      */
-     /*if (h5_cleanup(c_base_name, c_fapl) != 0) {
-     ret_value = 0;
-     goto DONE;
-     }
+    /*
+     * Call h5_cleanup function.
+     */
+    /*if (h5_cleanup(c_base_name, c_fapl) != 0) {
+    ret_value = 0;
+    goto DONE;
+    }
 */
-     h5_fixname(c_base_name[0], c_fapl, filename, sizeof(filename));
-     HDremove(filename);
-     ret_value =0;
+    h5_fixname(c_base_name[0], c_fapl, filename, sizeof(filename));
+    HDremove(filename);
+    ret_value = 0;
 
 DONE:
-     if (NULL != c_base_name[0]) HDfree(c_base_name[0]);
-     return ret_value;
-
+    if (NULL != c_base_name[0])
+        HDfree(c_base_name[0]);
+    return ret_value;
 }
 
 /*----------------------------------------------------------------------------
@@ -136,7 +134,7 @@ void
 nh5_exit_c(int_f *status)
 {
     HDexit((int)*status);
-}   /* h5_exit_c */
+} /* h5_exit_c */
 
 /*----------------------------------------------------------------------------
  * Name:        h5_env_nocleanup_c
@@ -152,8 +150,7 @@ nh5_exit_c(int_f *status)
 void
 nh5_env_nocleanup_c(int_f *status)
 {
-  *status = (int_f)0;
-  if (HDgetenv("HDF5_NOCLEANUP"))
-    *status = (int_f)1;
-}   /* h5_env_nocleanup_c */
-
+    *status = (int_f)0;
+    if (HDgetenv(HDF5_NOCLEANUP))
+        *status = (int_f)1;
+} /* h5_env_nocleanup_c */
diff --git a/fortran/test/t.h b/fortran/test/t.h
index 6d6af52..af8940f 100644
--- a/fortran/test/t.h
+++ b/fortran/test/t.h
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "hdf5.h"
@@ -23,20 +20,16 @@ char *h5_fixname(const char *base_name, hid_t fapl, char *fullname, size_t size)
 /*
  *  Functions from t.c
  */
-#   define nh5_fixname_c              H5_FC_FUNC_(h5_fixname_c, H5_FIXNAME_C)
-#   define nh5_cleanup_c              H5_FC_FUNC_(h5_cleanup_c, H5_CLEANUP_C)
-#   define nh5_exit_c                 H5_FC_FUNC_(h5_exit_c, H5_EXIT_C)
-#   define nh5_env_nocleanup_c        H5_FC_FUNC_(h5_env_nocleanup_c, H5_ENV_NOCLEANUP_C)
+#define nh5_fixname_c       H5_FC_FUNC_(h5_fixname_c, H5_FIXNAME_C)
+#define nh5_cleanup_c       H5_FC_FUNC_(h5_cleanup_c, H5_CLEANUP_C)
+#define nh5_exit_c          H5_FC_FUNC_(h5_exit_c, H5_EXIT_C)
+#define nh5_env_nocleanup_c H5_FC_FUNC_(h5_env_nocleanup_c, H5_ENV_NOCLEANUP_C)
 
-H5_FCTESTDLL int_f nh5_fixname_c
-(_fcd base_name, size_t_f *base_namelen, hid_t_f *fapl, _fcd full_name, size_t_f *full_namelen);
+H5_FCTESTDLL int_f nh5_fixname_c(_fcd base_name, size_t_f *base_namelen, hid_t_f *fapl, _fcd full_name,
+                                 size_t_f *full_namelen);
 
-H5_FCTESTDLL int_f nh5_cleanup_c
-(_fcd base_name, size_t_f *base_namelen, hid_t_f *fapl);
+H5_FCTESTDLL int_f nh5_cleanup_c(_fcd base_name, size_t_f *base_namelen, hid_t_f *fapl);
 
-H5_FCTESTDLL NORETURN void nh5_exit_c
-(int_f *status);
-
-H5_FCTESTDLL void nh5_env_nocleanup_c
-(int_f *status);
+H5_FCTESTDLL H5_ATTR_NORETURN void nh5_exit_c(int_f *status);
 
+H5_FCTESTDLL void nh5_env_nocleanup_c(int_f *status);
diff --git a/fortran/test/tH5A.F90 b/fortran/test/tH5A.F90
new file mode 100644
index 0000000..23b1add
--- /dev/null
+++ b/fortran/test/tH5A.F90
@@ -0,0 +1,621 @@
+!****h* root/fortran/test/tH5A.f90
+!
+! NAME
+!  tH5A.f90
+!
+! FUNCTION
+!  Basic testing of Fortran H5A APIs.
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+! CONTAINS SUBROUTINES
+!  attribute_test
+!
+!
+!*****
+MODULE TH5A
+
+     USE HDF5 ! This module contains all necessary modules
+     USE TH5_MISC
+     USE TH5_MISC_GEN
+
+CONTAINS
+    SUBROUTINE attribute_test(cleanup, total_error)
+
+!   This subroutine tests following functionalities:
+!   h5acreate_f,  h5awrite_f, h5aclose_f,h5aread_f, h5aopen_name_f,
+!   h5aget_name_f,h5aget_space_f, h5aget_type_f,
+!
+     IMPLICIT NONE
+     LOGICAL, INTENT(IN)  :: cleanup
+     INTEGER, INTENT(INOUT) :: total_error
+
+     CHARACTER(LEN=5), PARAMETER :: filename = "atest"    !File name
+     CHARACTER(LEN=80) :: fix_filename
+     CHARACTER(LEN=9), PARAMETER :: dsetname = "atestdset"        !Dataset name
+     CHARACTER(LEN=11), PARAMETER :: aname = "attr_string"   !String Attribute name
+     CHARACTER(LEN=14), PARAMETER :: aname2 = "attr_character"!Character Attribute name
+     CHARACTER(LEN=11), PARAMETER :: aname3 = "attr_double"   !DOuble Attribute name
+     CHARACTER(LEN=9), PARAMETER :: aname4 = "attr_real"      !Real Attribute name
+     CHARACTER(LEN=12), PARAMETER :: aname5 = "attr_integer"  !Integer Attribute name
+     CHARACTER(LEN=9), PARAMETER :: aname6 = "attr_null"     !Null Attribute name
+
+     !
+     !data space rank and dimensions
+     !
+     INTEGER, PARAMETER :: RANK = 2
+     INTEGER, PARAMETER :: NX = 4
+     INTEGER, PARAMETER :: NY = 5
+
+
+
+     INTEGER(HID_T) :: file_id       ! File identifier
+     INTEGER(HID_T) :: dset_id       ! Dataset identifier
+     INTEGER(HID_T) :: dataspace     ! Dataspace identifier for dataset
+
+     INTEGER(HID_T) :: attr_id        !String Attribute identifier
+     INTEGER(HID_T) :: attr2_id       !Character Attribute identifier
+     INTEGER(HID_T) :: attr3_id       !Double Attribute identifier
+     INTEGER(HID_T) :: attr4_id       !Real Attribute identifier
+     INTEGER(HID_T) :: attr5_id       !Integer Attribute identifier
+     INTEGER(HID_T) :: attr6_id       !Null Attribute identifier
+     INTEGER(HID_T) :: aspace_id      !String Attribute Dataspace identifier
+     INTEGER(HID_T) :: aspace2_id     !Character Attribute Dataspace identifier
+     INTEGER(HID_T) :: aspace6_id     !Null Attribute Dataspace identifier
+     INTEGER(HID_T) :: atype_id       !String Attribute Datatype identifier
+     INTEGER(HID_T) :: atype2_id      !Character Attribute Datatype identifier
+     INTEGER(HID_T) :: atype3_id      !Double Attribute Datatype identifier
+     INTEGER(HID_T) :: atype4_id      !Real Attribute Datatype identifier
+     INTEGER(HID_T) :: atype5_id      !Integer Attribute Datatype identifier
+     INTEGER(HSIZE_T), DIMENSION(1) :: adims = (/2/) ! Attribute dimension
+     INTEGER(HSIZE_T), DIMENSION(1) :: adims2 = (/1/) ! Attribute dimension
+     INTEGER     ::   arank = 1                      ! Attribute rank
+     INTEGER(SIZE_T) :: attrlen    ! Length of the attribute string
+
+     INTEGER(HID_T) :: attr_space     !Returned String Attribute Space identifier
+     INTEGER(HID_T) :: attr2_space    !Returned other Attribute Space identifier
+     INTEGER(HID_T) :: attr_type      !Returned Attribute Datatype identifier
+     INTEGER(HID_T) :: attr2_type      !Returned CHARACTER Attribute Datatype identifier
+     INTEGER(HID_T) :: attr3_type      !Returned DOUBLE Attribute Datatype identifier
+     INTEGER(HID_T) :: attr4_type      !Returned REAL Attribute Datatype identifier
+     INTEGER(HID_T) :: attr5_type      !Returned INTEGER Attribute Datatype identifier
+     INTEGER(HID_T) :: attr6_type      !Returned NULL Attribute Datatype identifier
+     INTEGER        :: num_attrs      !number of attributes
+     INTEGER(HSIZE_T) :: attr_storage   ! attributes storage requirements .MSB.
+     CHARACTER(LEN=256) :: attr_name    !buffer to put attr_name
+     INTEGER(SIZE_T)    ::  name_size = 80 !attribute name length
+
+     CHARACTER(LEN=35), DIMENSION(2) ::  attr_data  ! String attribute data
+     CHARACTER(LEN=35), DIMENSION(2) ::  aread_data ! Buffer to put read back
+                                               ! string attr data
+     CHARACTER ::  attr_character_data = 'A'
+     REAL(KIND=Fortran_DOUBLE),  DIMENSION(1) ::  attr_double_data = 3.459D0
+     REAL,         DIMENSION(1) ::  attr_real_data = 4.0
+     INTEGER,      DIMENSION(1) ::  attr_integer_data = 5
+     INTEGER(HSIZE_T), DIMENSION(7) :: data_dims
+
+
+     CHARACTER :: aread_character_data ! variable to put read back Character attr data
+     INTEGER, DIMENSION(1)  :: aread_integer_data ! variable to put read back integer attr data
+     INTEGER, DIMENSION(1)  :: aread_null_data = 7 ! variable to put read back null attr data
+     REAL(KIND=Fortran_DOUBLE), DIMENSION(1)   :: aread_double_data ! variable to put read back double attr data
+     REAL, DIMENSION(1)  :: aread_real_data ! variable to put read back real attr data
+
+     !
+     !general purpose integer
+     !
+     INTEGER     ::   i, j
+     INTEGER     ::   error ! Error flag
+
+     !
+     !The dimensions for the dataset.
+     !
+     INTEGER(HSIZE_T), DIMENSION(2) :: dims = (/NX,NY/)
+
+     !
+     !data buffers
+     !
+     INTEGER, DIMENSION(NX,NY) :: data_in
+
+     !
+     !Initialize data_in buffer
+     !
+     DO i = 1, NX
+        DO j = 1, NY
+           data_in(i,j) =  (i-1) + (j-1)
+        END DO
+     END DO
+     !
+     ! Initialize attribute's data
+     !
+     attr_data(1) = 'Dataset character attribute'
+     attr_data(2) = 'Some other string here     '
+     attrlen = LEN(attr_data(1))
+
+     !
+     ! Create the file.
+     !
+          CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
+          IF (error .NE. 0) THEN
+              WRITE(*,*) "Cannot modify file name"
+              STOP
+          ENDIF
+     CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
+     CALL check("h5fcreate_f",error,total_error)
+
+     !
+     !Create data space for the dataset.
+     !
+     CALL h5screate_simple_f(RANK, dims, dataspace, error)
+     CALL check("h5screate_simple_f",error,total_error)
+
+     !
+     ! create dataset in the file.
+     !
+     CALL h5dcreate_f(file_id, dsetname, H5T_NATIVE_INTEGER, dataspace, &
+               dset_id, error)
+     CALL check("h5dcreate_f",error,total_error)
+
+     !
+     ! Write data_in to the dataset
+     !
+     data_dims(1) = NX
+     data_dims(2) = NY
+     CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, data_in, data_dims, error)
+     CALL check("h5dwrite_f",error,total_error)
+
+     !
+     ! Create scalar data space for the String attribute.
+     !
+     CALL h5screate_simple_f(arank, adims, aspace_id, error)
+     CALL check("h5screate_simple_f",error,total_error)
+     !
+     ! Create scalar data space for all other attributes.
+     !
+     CALL h5screate_simple_f(arank, adims2, aspace2_id, error)
+     CALL check("h5screate_simple_f",error,total_error)
+     !
+     ! Create null data space for null attributes.
+     !
+     CALL h5screate_f(H5S_NULL_F, aspace6_id, error)
+     CALL check("h5screate_f",error,total_error)
+
+     !
+     ! Create datatype for the String attribute.
+     !
+     CALL h5tcopy_f(H5T_NATIVE_CHARACTER, atype_id, error)
+     CALL check("h5tcopy_f",error,total_error)
+
+     CALL h5tset_size_f(atype_id, attrlen, error)
+     CALL check("h5tset_size_f",error,total_error)
+
+     !
+     ! Create datatype for the Character attribute.
+     !
+     CALL h5tcopy_f(H5T_NATIVE_CHARACTER, atype2_id, error)
+     CALL check("h5tcopy_f",error,total_error)
+     !
+     ! Create datatype for the Double attribute.
+     !
+     CALL h5tcopy_f(H5T_NATIVE_DOUBLE, atype3_id, error)
+     CALL check("h5tcopy_f",error,total_error)
+     !
+     ! Create datatype for the Real attribute.
+     !
+     CALL h5tcopy_f(H5T_NATIVE_REAL, atype4_id, error)
+     CALL check("h5tcopy_f",error,total_error)
+     !
+     ! Create datatype for the Integer attribute.
+     !
+     CALL h5tcopy_f(H5T_NATIVE_INTEGER, atype5_id, error)
+     CALL check("h5tcopy_f",error,total_error)
+
+
+     !
+     ! Create dataset String attribute.
+     !
+     CALL h5acreate_f(dset_id, aname, atype_id, aspace_id, &
+                      attr_id, error)
+     CALL check("h5acreate_f",error,total_error)
+
+
+     !
+     ! Create dataset CHARACTER attribute.
+     !
+     CALL h5acreate_f(dset_id, aname2, atype2_id, aspace2_id, &
+                      attr2_id, error)
+     CALL check("h5acreate_f",error,total_error)
+
+
+     !
+     ! Create dataset DOUBLE attribute.
+     !
+     CALL h5acreate_f(dset_id, aname3, atype3_id, aspace2_id, &
+                      attr3_id, error)
+     CALL check("h5acreate_f",error,total_error)
+     !
+     ! Create dataset REAL attribute.
+     !
+     CALL h5acreate_f(dset_id, aname4, atype4_id, aspace2_id, &
+                      attr4_id, error)
+     CALL check("h5acreate_f",error,total_error)
+     !
+     ! Create dataset INTEGER attribute.
+     !
+     CALL h5acreate_f(dset_id, aname5, atype5_id, aspace2_id, &
+                      attr5_id, error)
+     CALL check("h5acreate_f",error,total_error)
+     !
+     ! Create dataset NULL attribute of INTEGER.
+     !
+
+     CALL h5acreate_f(dset_id, aname6, atype5_id, aspace6_id, &
+                      attr6_id, error)
+
+     CALL check("h5acreate_f",error,total_error)
+
+     !
+     ! Write the String attribute data.
+     !
+     data_dims(1) = 2
+     CALL h5awrite_f(attr_id, atype_id, attr_data, data_dims, error)
+     CALL check("h5awrite_f",error,total_error)
+      !
+     ! Write the Character attribute data.
+     !
+     CALL h5awrite_f(attr2_id, atype2_id, attr_character_data, data_dims, error)
+     CALL check("h5awrite_f",error,total_error)
+     !
+     ! Write the DOUBLE attribute data.
+     !
+     data_dims(1) = 1
+     CALL h5awrite_f(attr3_id, atype3_id, attr_double_data, data_dims, error)
+     CALL check("h5awrite_f",error,total_error)
+     !
+     ! Write the Real attribute data.
+     !
+     data_dims(1) = 1
+     CALL h5awrite_f(attr4_id, atype4_id, attr_real_data, data_dims, error)
+     CALL check("h5awrite_f",error,total_error)
+
+     !
+     ! Write the Integer attribute data.
+     !
+     data_dims(1) = 1
+     CALL h5awrite_f(attr5_id, atype5_id, attr_integer_data, data_dims, error)
+     CALL check("h5awrite_f",error,total_error)
+
+     !
+     ! Write the NULL attribute data(nothing can be written).
+     !
+     CALL h5awrite_f(attr6_id, atype5_id, attr_integer_data, data_dims, error)
+     CALL check("h5awrite_f",error,total_error)
+
+     !
+     ! check the amount of storage that is required for the specified attribute .MSB.
+     !
+     CALL h5aget_storage_size_f(attr_id, attr_storage, error)
+     CALL check("h5aget_storage_size_f",error,total_error)
+!     CALL verify("h5aget_storage_size_f",attr_storage,*SizeOf(attr_storage),total_error)
+     CALL h5aget_storage_size_f(attr2_id, attr_storage, error)
+     CALL check("h5aget_storage_size_f",error,total_error)
+!     CALL verify("h5aget_storage_size_f",attr_storage,1,total_error)
+     CALL h5aget_storage_size_f(attr3_id, attr_storage, error)
+     CALL check("h5aget_storage_size_f",error,total_error)
+!     CALL verify("h5aget_storage_size_f",attr_storage,8,total_error)
+     CALL h5aget_storage_size_f(attr4_id, attr_storage, error)
+     CALL check("h5aget_storage_size_f",error,total_error)
+!     CALL verify("h5aget_storage_size_f",attr_storage,4,total_error)
+     CALL h5aget_storage_size_f(attr5_id, attr_storage, error)
+     CALL check("h5aget_storage_size_f",error,total_error)
+!     CALL verify("h5aget_storage_size_f",attr_storage,4,total_error)
+     CALL h5aget_storage_size_f(attr6_id, attr_storage, error)
+     CALL check("h5aget_storage_size_f",error,total_error)
+!     CALL verify("h5aget_storage_size_f",attr_storage,0,total_error)
+
+
+     !
+     ! Close the attribute.
+     !
+     CALL h5aclose_f(attr_id, error)
+     CALL check("h5aclose_f",error,total_error)
+     CALL h5aclose_f(attr2_id, error)
+     CALL check("h5aclose_f",error,total_error)
+     CALL h5aclose_f(attr3_id, error)
+     CALL check("h5aclose_f",error,total_error)
+     CALL h5aclose_f(attr4_id, error)
+     CALL check("h5aclose_f",error,total_error)
+     CALL h5aclose_f(attr5_id, error)
+     CALL check("h5aclose_f",error,total_error)
+     CALL h5aclose_f(attr6_id, error)
+     CALL check("h5aclose_f",error,total_error)
+
+     CALL h5tclose_f(atype_id, error)
+     CALL check("h5tclose_f",error,total_error)
+     CALL h5tclose_f(atype2_id, error)
+     CALL check("h5tclose_f",error,total_error)
+     CALL h5tclose_f(atype3_id, error)
+     CALL check("h5tclose_f",error,total_error)
+     CALL h5tclose_f(atype4_id, error)
+     CALL check("h5tclose_f",error,total_error)
+     CALL h5tclose_f(atype5_id, error)
+     CALL check("h5tclose_f",error,total_error)
+
+     !
+     ! Terminate access to the data space.
+     !
+     CALL h5sclose_f(aspace_id, error)
+     CALL check("h5sclose_f",error,total_error)
+     CALL h5sclose_f(aspace2_id, error)
+     CALL check("h5sclose_f",error,total_error)
+     CALL h5sclose_f(aspace6_id, error)
+     CALL check("h5sclose_f",error,total_error)
+     !
+     ! Terminate access to the dataset.
+     !
+     CALL h5dclose_f(dset_id, error)
+     CALL check("h5dclose_f",error,total_error)
+     !
+     ! Terminate access to the file.
+     !
+     CALL h5fclose_f(file_id, error)
+     CALL check("h5fclose_f",error,total_error)
+     !
+     ! Open file
+     !
+     CALL h5fopen_f(fix_filename, H5F_ACC_RDWR_F, file_id, error)
+     CALL check("h5fopen_f",error,total_error)
+     !
+     ! Reopen dataset
+     !
+     CALL h5dopen_f(file_id, dsetname, dset_id, error)
+     CALL check("h5dopen_f",error,total_error)
+     !
+     !open the String attribute by name
+     !
+     CALL h5aopen_name_f(dset_id, aname, attr_id, error)
+     CALL check("h5aopen_name_f",error,total_error)
+
+     !
+     !open the CHARACTER attribute by name
+     !
+     CALL h5aopen_name_f(dset_id, aname2, attr2_id, error)
+     CALL check("h5aopen_name_f",error,total_error)
+      !
+     !open the DOUBLE attribute by name
+     !
+     CALL h5aopen_name_f(dset_id, aname3, attr3_id, error)
+     CALL check("h5aopen_name_f",error,total_error)
+     !
+     !open the REAL attribute by name
+     !
+     CALL h5aopen_name_f(dset_id, aname4, attr4_id, error)
+     CALL check("h5aopen_name_f",error,total_error)
+
+     !
+     !open the INTEGER attribute by name
+     !
+     CALL h5aopen_name_f(dset_id, aname5, attr5_id, error)
+     CALL check("h5aopen_name_f",error,total_error)
+
+     !
+     !open the NULL attribute by name
+     !
+     CALL h5aopen_name_f(dset_id, aname6, attr6_id, error)
+     CALL check("h5aopen_name_f",error,total_error)
+
+     !
+     !get the attribute name
+     !
+     CALL h5aget_name_f(attr5_id, name_size, attr_name, error)
+     CALL check("h5aget_name_f",error,total_error)
+     IF (attr_name(1:12) .NE. aname5) THEN
+       total_error = total_error + 1
+     END IF
+     IF (error .NE. 12) THEN
+       total_error = total_error + 1
+     END IF
+
+     !
+     !get the STRING attribute space
+     !
+     CALL h5aget_space_f(attr_id, attr_space, error)
+     CALL check("h5aget_space_f",error,total_error)
+     !
+     !get other attribute space
+     !
+     CALL h5aget_space_f(attr2_id, attr2_space, error)
+     CALL check("h5aget_space_f",error,total_error)
+     !
+     !get the string attribute datatype
+     !
+     CALL h5aget_type_f(attr_id, attr_type, error)
+     CALL check("h5aget_type_f",error,total_error)
+     !
+     !get the character attribute datatype
+     !
+     CALL h5aget_type_f(attr2_id, attr2_type, error)
+     CALL check("h5aget_type_f",error,total_error)
+     !
+     !get the double attribute datatype
+     !
+     CALL h5aget_type_f(attr3_id, attr3_type, error)
+     CALL check("h5aget_type_f",error,total_error)
+     !
+     !get the real attribute datatype
+     !
+     CALL h5aget_type_f(attr4_id, attr4_type, error)
+     CALL check("h5aget_type_f",error,total_error)
+
+     !
+     !get the integer attribute datatype
+     !
+     CALL h5aget_type_f(attr5_id, attr5_type, error)
+     CALL check("h5aget_type_f",error,total_error)
+
+     !
+     !get the null attribute datatype
+     !
+     CALL h5aget_type_f(attr6_id, attr6_type, error)
+     CALL check("h5aget_type_f",error,total_error)
+
+     !
+     !get number of attributes
+     !
+     CALL h5aget_num_attrs_f(dset_id, num_attrs, error)
+     CALL check("h5aget_num_attrs_f",error,total_error)
+     IF (num_attrs .NE. 6) THEN
+       WRITE(*,*) "got number of attributes wrong", num_attrs
+       total_error = total_error +1
+     END IF
+
+     !
+     !set the read back data type's size
+     !
+     CALL h5tcopy_f(H5T_NATIVE_CHARACTER, atype_id, error)
+     CALL check("h5tcopy_f",error,total_error)
+
+     CALL h5tset_size_f(atype_id, attrlen, error)
+     CALL check("h5tset_size_f",error,total_error)
+     !
+     !read the string attribute data back to memory
+     !
+     data_dims(1) = 2
+     CALL h5aread_f(attr_id, atype_id, aread_data, data_dims, error)
+     CALL check("h5aread_f",error,total_error)
+
+     IF ( (aread_data(1) .NE. attr_data(1)) .OR. (aread_data(2) .NE. attr_data(2)) ) THEN
+         WRITE(*,*) "Read back string attribute is wrong", aread_data(1), aread_data(2)
+         total_error = total_error + 1
+     END IF
+
+     !
+     !read the CHARACTER attribute data back to memory
+     !
+     CALL h5aread_f(attr2_id, H5T_NATIVE_CHARACTER, aread_character_data, data_dims, error)
+     CALL check("h5aread_f",error,total_error)
+     IF (aread_character_data .NE. 'A' ) THEN
+         WRITE(*,*) "Read back character attribute is wrong ",aread_character_data
+         total_error = total_error + 1
+     END IF
+     !
+     !read the double attribute data back to memory
+     !
+     data_dims(1) = 1
+     CALL h5aread_f(attr3_id, H5T_NATIVE_DOUBLE, aread_double_data, data_dims, error)
+     CALL check("h5aread_f",error,total_error)
+     CALL VERIFY("Read back double attribute is wrong", aread_double_data(1),3.459_Fortran_DOUBLE,total_error)
+
+     !
+     !read the real attribute data back to memory
+     !
+     data_dims(1) = 1
+     CALL h5aread_f(attr4_id, H5T_NATIVE_REAL, aread_real_data, data_dims, error)
+     CALL check("h5aread_f",error,total_error)
+     CALL VERIFY("Read back real attribute is wrong", aread_real_data(1),4.0,total_error)
+     !
+     !read the Integer attribute data back to memory
+     !
+     data_dims(1) = 1
+     CALL h5aread_f(attr5_id, H5T_NATIVE_INTEGER, aread_integer_data, data_dims, error)
+     CALL check("h5aread_f",error,total_error)
+     IF (aread_integer_data(1) .NE. 5 ) THEN
+         WRITE(*,*) "Read back integer attribute is wrong ", aread_integer_data
+         total_error = total_error + 1
+     END IF
+     !
+     !read the null attribute data. nothing can be read.
+     !
+     data_dims(1) = 1
+     CALL h5aread_f(attr6_id, H5T_NATIVE_INTEGER, aread_null_data, data_dims, error)
+     CALL check("h5aread_f",error,total_error)
+     IF (aread_null_data(1) .NE. 7 ) THEN
+         WRITE(*,*) "Read back null attribute is wrong ", aread_null_data
+         total_error = total_error + 1
+     END IF
+
+     !
+     ! Close the attribute.
+     !
+     CALL h5aclose_f(attr_id, error)
+     CALL check("h5aclose_f",error,total_error)
+     CALL h5aclose_f(attr2_id, error)
+     CALL check("h5aclose_f",error,total_error)
+     CALL h5aclose_f(attr3_id, error)
+     CALL check("h5aclose_f",error,total_error)
+     CALL h5aclose_f(attr4_id, error)
+     CALL check("h5aclose_f",error,total_error)
+     CALL h5aclose_f(attr5_id, error)
+     CALL check("h5aclose_f",error,total_error)
+     CALL h5aclose_f(attr6_id, error)
+     CALL check("h5aclose_f",error,total_error)
+
+     !
+     ! Delete the attribute from the Dataset.
+     !
+     CALL h5adelete_f(dset_id, aname, error)
+     CALL check("h5adelete_f",error,total_error)
+
+     !
+     !get number of attributes
+     !
+     CALL h5aget_num_attrs_f(dset_id, num_attrs, error)
+     CALL check("h5aget_num_attrs_f",error,total_error)
+     IF (num_attrs .NE. 5) THEN
+       WRITE(*,*) "got number of attributes wrong", num_attrs
+       total_error = total_error +1
+     END IF
+
+
+
+     CALL h5sclose_f(attr_space, error)
+     CALL check("h5sclose_f",error,total_error)
+     CALL h5sclose_f(attr2_space, error)
+     CALL check("h5sclose_f",error,total_error)
+
+     !
+     ! Terminate access to the data type.
+     !
+     CALL h5tclose_f(attr_type, error)
+     CALL check("h5tclose_f",error,total_error)
+     CALL h5tclose_f(attr2_type, error)
+     CALL check("h5tclose_f",error,total_error)
+     CALL h5tclose_f(attr3_type, error)
+     CALL check("h5tclose_f",error,total_error)
+     CALL h5tclose_f(attr4_type, error)
+     CALL check("h5tclose_f",error,total_error)
+     CALL h5tclose_f(attr5_type, error)
+     CALL check("h5tclose_f",error,total_error)
+     CALL h5tclose_f(attr6_type, error)
+     CALL check("h5tclose_f",error,total_error)
+
+     !
+     ! End access to the dataset and release resources used by it.
+     !
+     CALL h5dclose_f(dset_id, error)
+     CALL check("h5dclose_f",error,total_error)
+
+     !
+     ! Close the file.
+     !
+     CALL h5fclose_f(file_id, error)
+     CALL check("h5fclose_f",error,total_error)
+     !
+     ! Remove the file
+     !
+     IF (cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
+
+     RETURN
+     END SUBROUTINE attribute_test
+END MODULE TH5A
diff --git a/fortran/test/tH5A.f90 b/fortran/test/tH5A.f90
deleted file mode 100644
index e3b3b2a..0000000
--- a/fortran/test/tH5A.f90
+++ /dev/null
@@ -1,629 +0,0 @@
-!****h* root/fortran/test/tH5A.f90
-!
-! NAME
-!  tH5A.f90
-!
-! FUNCTION
-!  Basic testing of Fortran H5A APIs.
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! CONTAINS SUBROUTINES
-!  attribute_test 
-!
-!
-!*****
-MODULE TH5A
-
-CONTAINS
-    SUBROUTINE attribute_test(cleanup, total_error)
-
-!   This subroutine tests following functionalities:
-!   h5acreate_f,  h5awrite_f, h5aclose_f,h5aread_f, h5aopen_name_f,
-!   h5aget_name_f,h5aget_space_f, h5aget_type_f,
-!
-
-     USE HDF5 ! This module contains all necessary modules
-     USE TH5_MISC
-     IMPLICIT NONE
-     LOGICAL, INTENT(IN)  :: cleanup
-     INTEGER, INTENT(INOUT) :: total_error
-
-     CHARACTER(LEN=5), PARAMETER :: filename = "atest"    !File name
-     CHARACTER(LEN=80) :: fix_filename
-     CHARACTER(LEN=9), PARAMETER :: dsetname = "atestdset"        !Dataset name
-     CHARACTER(LEN=11), PARAMETER :: aname = "attr_string"   !String Attribute name
-     CHARACTER(LEN=14), PARAMETER :: aname2 = "attr_character"!Character Attribute name
-     CHARACTER(LEN=11), PARAMETER :: aname3 = "attr_double"   !DOuble Attribute name
-     CHARACTER(LEN=9), PARAMETER :: aname4 = "attr_real"      !Real Attribute name
-     CHARACTER(LEN=12), PARAMETER :: aname5 = "attr_integer"  !Integer Attribute name
-     CHARACTER(LEN=9), PARAMETER :: aname6 = "attr_null"     !Null Attribute name
-
-     !
-     !data space rank and dimensions
-     !
-     INTEGER, PARAMETER :: RANK = 2
-     INTEGER, PARAMETER :: NX = 4
-     INTEGER, PARAMETER :: NY = 5
-
-
-
-     INTEGER(HID_T) :: file_id       ! File identifier
-     INTEGER(HID_T) :: dset_id       ! Dataset identifier
-     INTEGER(HID_T) :: dataspace     ! Dataspace identifier for dataset
-
-     INTEGER(HID_T) :: attr_id        !String Attribute identifier
-     INTEGER(HID_T) :: attr2_id       !Character Attribute identifier
-     INTEGER(HID_T) :: attr3_id       !Double Attribute identifier
-     INTEGER(HID_T) :: attr4_id       !Real Attribute identifier
-     INTEGER(HID_T) :: attr5_id       !Integer Attribute identifier
-     INTEGER(HID_T) :: attr6_id       !Null Attribute identifier
-     INTEGER(HID_T) :: aspace_id      !String Attribute Dataspace identifier
-     INTEGER(HID_T) :: aspace2_id     !Character Attribute Dataspace identifier
-     INTEGER(HID_T) :: aspace6_id     !Null Attribute Dataspace identifier
-     INTEGER(HID_T) :: atype_id       !String Attribute Datatype identifier
-     INTEGER(HID_T) :: atype2_id      !Character Attribute Datatype identifier
-     INTEGER(HID_T) :: atype3_id      !Double Attribute Datatype identifier
-     INTEGER(HID_T) :: atype4_id      !Real Attribute Datatype identifier
-     INTEGER(HID_T) :: atype5_id      !Integer Attribute Datatype identifier
-     INTEGER(HSIZE_T), DIMENSION(1) :: adims = (/2/) ! Attribute dimension
-     INTEGER(HSIZE_T), DIMENSION(1) :: adims2 = (/1/) ! Attribute dimension
-     INTEGER     ::   arank = 1                      ! Attribure rank
-     INTEGER(SIZE_T) :: attrlen    ! Length of the attribute string
-
-     INTEGER(HID_T) :: attr_space     !Returned String Attribute Space identifier
-     INTEGER(HID_T) :: attr2_space    !Returned other Attribute Space identifier
-     INTEGER(HID_T) :: attr_type      !Returned Attribute Datatype identifier
-     INTEGER(HID_T) :: attr2_type      !Returned CHARACTER Attribute Datatype identifier
-     INTEGER(HID_T) :: attr3_type      !Returned DOUBLE Attribute Datatype identifier
-     INTEGER(HID_T) :: attr4_type      !Returned REAL Attribute Datatype identifier
-     INTEGER(HID_T) :: attr5_type      !Returned INTEGER Attribute Datatype identifier
-     INTEGER(HID_T) :: attr6_type      !Returned NULL Attribute Datatype identifier
-     INTEGER        :: num_attrs      !number of attributes
-     INTEGER(HSIZE_T) :: attr_storage   ! attributes storage requirements .MSB.
-     CHARACTER(LEN=256) :: attr_name    !buffer to put attr_name
-     INTEGER(SIZE_T)    ::  name_size = 80 !attribute name length
-
-     CHARACTER(LEN=35), DIMENSION(2) ::  attr_data  ! String attribute data
-     CHARACTER(LEN=35), DIMENSION(2) ::  aread_data ! Buffer to put read back
-                                               ! string attr data
-     CHARACTER ::  attr_character_data = 'A'
-     REAL(KIND=Fortran_DOUBLE),  DIMENSION(1) ::  attr_double_data = 3.459D0
-     REAL,         DIMENSION(1) ::  attr_real_data = 4.0
-     INTEGER,      DIMENSION(1) ::  attr_integer_data = 5
-     INTEGER(HSIZE_T), DIMENSION(7) :: data_dims
-
-
-     CHARACTER :: aread_character_data ! variable to put read back Character attr data
-     INTEGER, DIMENSION(1)  :: aread_integer_data ! variable to put read back integer attr data
-     INTEGER, DIMENSION(1)  :: aread_null_data = 7 ! variable to put read back null attr data
-     REAL(KIND=Fortran_DOUBLE), DIMENSION(1)   :: aread_double_data ! variable to put read back double attr data
-     REAL, DIMENSION(1)  :: aread_real_data ! variable to put read back real attr data
-
-     !
-     !general purpose integer
-     !
-     INTEGER     ::   i, j
-     INTEGER     ::   error ! Error flag
-
-     !
-     !The dimensions for the dataset.
-     !
-     INTEGER(HSIZE_T), DIMENSION(2) :: dims = (/NX,NY/)
-
-     !
-     !data buffers
-     !
-     INTEGER, DIMENSION(NX,NY) :: data_in
-
-     !
-     !Initialize data_in buffer
-     !
-     DO i = 1, NX
-        DO j = 1, NY
-           data_in(i,j) =  (i-1) + (j-1)
-        END DO
-     END DO
-     !
-     ! Initialize attribute's data
-     !
-     attr_data(1) = 'Dataset character attribute'
-     attr_data(2) = 'Some other string here     '
-     attrlen = LEN(attr_data(1))
-
-     !
-     ! Create the file.
-     !
-          CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
-          IF (error .NE. 0) THEN
-              WRITE(*,*) "Cannot modify file name"
-              STOP
-          ENDIF
-     CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
-     CALL check("h5fcreate_f",error,total_error)
-
-     !
-     !Create data space for the dataset.
-     !
-     CALL h5screate_simple_f(RANK, dims, dataspace, error)
-     CALL check("h5screate_simple_f",error,total_error)
-
-     !
-     ! create dataset in the file.
-     !
-     CALL h5dcreate_f(file_id, dsetname, H5T_NATIVE_INTEGER, dataspace, &
-               dset_id, error)
-     CALL check("h5dcreate_f",error,total_error)
-
-     !
-     ! Write data_in to the dataset
-     !
-     data_dims(1) = NX
-     data_dims(2) = NY
-     CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, data_in, data_dims, error)
-     CALL check("h5dwrite_f",error,total_error)
-
-     !
-     ! Create scalar data space for the String attribute.
-     !
-     CALL h5screate_simple_f(arank, adims, aspace_id, error)
-     CALL check("h5screate_simple_f",error,total_error)
-     !
-     ! Create scalar data space for all other attributes.
-     !
-     CALL h5screate_simple_f(arank, adims2, aspace2_id, error)
-     CALL check("h5screate_simple_f",error,total_error)
-     !
-     ! Create null data space for null attributes.
-     !
-     CALL h5screate_f(H5S_NULL_F, aspace6_id, error)
-     CALL check("h5screate_f",error,total_error)
-
-     !
-     ! Create datatype for the String attribute.
-     !
-     CALL h5tcopy_f(H5T_NATIVE_CHARACTER, atype_id, error)
-     CALL check("h5tcopy_f",error,total_error)
-
-     CALL h5tset_size_f(atype_id, attrlen, error)
-     CALL check("h5tset_size_f",error,total_error)
-
-     !
-     ! Create datatype for the Character attribute.
-     !
-     CALL h5tcopy_f(H5T_NATIVE_CHARACTER, atype2_id, error)
-     CALL check("h5tcopy_f",error,total_error)
-     !
-     ! Create datatype for the Double attribute.
-     !
-     CALL h5tcopy_f(H5T_NATIVE_DOUBLE, atype3_id, error)
-     CALL check("h5tcopy_f",error,total_error)
-     !
-     ! Create datatype for the Real attribute.
-     !
-     CALL h5tcopy_f(H5T_NATIVE_REAL, atype4_id, error)
-     CALL check("h5tcopy_f",error,total_error)
-     !
-     ! Create datatype for the Integer attribute.
-     !
-     CALL h5tcopy_f(H5T_NATIVE_INTEGER, atype5_id, error)
-     CALL check("h5tcopy_f",error,total_error)
-
-
-     !
-     ! Create dataset String attribute.
-     !
-     CALL h5acreate_f(dset_id, aname, atype_id, aspace_id, &
-                      attr_id, error)
-     CALL check("h5acreate_f",error,total_error)
-
-
-     !
-     ! Create dataset CHARACTER attribute.
-     !
-     CALL h5acreate_f(dset_id, aname2, atype2_id, aspace2_id, &
-                      attr2_id, error)
-     CALL check("h5acreate_f",error,total_error)
-
-
-     !
-     ! Create dataset DOUBLE attribute.
-     !
-     CALL h5acreate_f(dset_id, aname3, atype3_id, aspace2_id, &
-                      attr3_id, error)
-     CALL check("h5acreate_f",error,total_error)
-     !
-     ! Create dataset REAL attribute.
-     !
-     CALL h5acreate_f(dset_id, aname4, atype4_id, aspace2_id, &
-                      attr4_id, error)
-     CALL check("h5acreate_f",error,total_error)
-     !
-     ! Create dataset INTEGER attribute.
-     !
-     CALL h5acreate_f(dset_id, aname5, atype5_id, aspace2_id, &
-                      attr5_id, error)
-     CALL check("h5acreate_f",error,total_error)
-     !
-     ! Create dataset NULL attribute of INTEGER.
-     !
-
-     CALL h5acreate_f(dset_id, aname6, atype5_id, aspace6_id, &
-                      attr6_id, error)
-
-     CALL check("h5acreate_f",error,total_error)
-
-     !
-     ! Write the String attribute data.
-     !
-     data_dims(1) = 2
-     CALL h5awrite_f(attr_id, atype_id, attr_data, data_dims, error)
-     CALL check("h5awrite_f",error,total_error)
-      !
-     ! Write the Character attribute data.
-     !
-     CALL h5awrite_f(attr2_id, atype2_id, attr_character_data, data_dims, error)
-     CALL check("h5awrite_f",error,total_error)
-     !
-     ! Write the DOUBLE attribute data.
-     !
-     data_dims(1) = 1
-     CALL h5awrite_f(attr3_id, atype3_id, attr_double_data, data_dims, error)
-     CALL check("h5awrite_f",error,total_error)
-     !
-     ! Write the Real attribute data.
-     !
-     data_dims(1) = 1
-     CALL h5awrite_f(attr4_id, atype4_id, attr_real_data, data_dims, error)
-     CALL check("h5awrite_f",error,total_error)
-
-     !
-     ! Write the Integer attribute data.
-     !
-     data_dims(1) = 1
-     CALL h5awrite_f(attr5_id, atype5_id, attr_integer_data, data_dims, error)
-     CALL check("h5awrite_f",error,total_error)
-
-     !
-     ! Write the NULL attribute data(nothing can be written).
-     !
-     CALL h5awrite_f(attr6_id, atype5_id, attr_integer_data, data_dims, error)
-     CALL check("h5awrite_f",error,total_error)
-
-     !
-     ! check the amount of storage that is required for the specified attribute .MSB.
-     !
-     CALL h5aget_storage_size_f(attr_id, attr_storage, error)
-     CALL check("h5aget_storage_size_f",error,total_error)
-!     CALL VERIFY("h5aget_storage_size_f",attr_storage,*SizeOf(attr_storage),total_error)
-     CALL h5aget_storage_size_f(attr2_id, attr_storage, error)
-     CALL check("h5aget_storage_size_f",error,total_error)
-!     CALL verify("h5aget_storage_size_f",attr_storage,1,total_error)
-     CALL h5aget_storage_size_f(attr3_id, attr_storage, error)
-     CALL check("h5aget_storage_size_f",error,total_error)
-!     CALL verify("h5aget_storage_size_f",attr_storage,8,total_error)
-     CALL h5aget_storage_size_f(attr4_id, attr_storage, error)
-     CALL check("h5aget_storage_size_f",error,total_error)
-!     CALL verify("h5aget_storage_size_f",attr_storage,4,total_error)
-     CALL h5aget_storage_size_f(attr5_id, attr_storage, error)
-     CALL check("h5aget_storage_size_f",error,total_error)
-!     CALL verify("h5aget_storage_size_f",attr_storage,4,total_error)
-     CALL h5aget_storage_size_f(attr6_id, attr_storage, error)
-     CALL check("h5aget_storage_size_f",error,total_error)
-!     CALL verify("h5aget_storage_size_f",attr_storage,0,total_error)
-
-
-     !
-     ! Close the attribute.
-     !
-     CALL h5aclose_f(attr_id, error)
-     CALL check("h5aclose_f",error,total_error)
-     CALL h5aclose_f(attr2_id, error)
-     CALL check("h5aclose_f",error,total_error)
-     CALL h5aclose_f(attr3_id, error)
-     CALL check("h5aclose_f",error,total_error)
-     CALL h5aclose_f(attr4_id, error)
-     CALL check("h5aclose_f",error,total_error)
-     CALL h5aclose_f(attr5_id, error)
-     CALL check("h5aclose_f",error,total_error)
-     CALL h5aclose_f(attr6_id, error)
-     CALL check("h5aclose_f",error,total_error)
-
-     CALL h5tclose_f(atype_id, error)
-     CALL check("h5tclose_f",error,total_error)
-     CALL h5tclose_f(atype2_id, error)
-     CALL check("h5tclose_f",error,total_error)
-     CALL h5tclose_f(atype3_id, error)
-     CALL check("h5tclose_f",error,total_error)
-     CALL h5tclose_f(atype4_id, error)
-     CALL check("h5tclose_f",error,total_error)
-     CALL h5tclose_f(atype5_id, error)
-     CALL check("h5tclose_f",error,total_error)
-
-     !
-     ! Terminate access to the data space.
-     !
-     CALL h5sclose_f(aspace_id, error)
-     CALL check("h5sclose_f",error,total_error)
-     CALL h5sclose_f(aspace2_id, error)
-     CALL check("h5sclose_f",error,total_error)
-     CALL h5sclose_f(aspace6_id, error)
-     CALL check("h5sclose_f",error,total_error)
-     !
-     ! Terminate access to the dataset.
-     !
-     CALL h5dclose_f(dset_id, error)
-     CALL check("h5dclose_f",error,total_error)
-     !
-     ! Terminate access to the file.
-     !
-     CALL h5fclose_f(file_id, error)
-     CALL check("h5fclose_f",error,total_error)
-     !
-     ! Open file
-     !
-     CALL h5fopen_f(fix_filename, H5F_ACC_RDWR_F, file_id, error)
-     CALL check("h5open_f",error,total_error)
-     !
-     ! Reopen dataset
-     !
-     CALL h5dopen_f(file_id, dsetname, dset_id, error)
-     CALL check("h5dopen_f",error,total_error)
-     !
-     !open the String attrbute by name
-     !
-     CALL h5aopen_name_f(dset_id, aname, attr_id, error)
-     CALL check("h5aopen_name_f",error,total_error)
-
-     !
-     !open the CHARACTER attrbute by name
-     !
-     CALL h5aopen_name_f(dset_id, aname2, attr2_id, error)
-     CALL check("h5aopen_name_f",error,total_error)
-      !
-     !open the DOUBLE attrbute by name
-     !
-     CALL h5aopen_name_f(dset_id, aname3, attr3_id, error)
-     CALL check("h5aopen_name_f",error,total_error)
-     !
-     !open the REAL attrbute by name
-     !
-     CALL h5aopen_name_f(dset_id, aname4, attr4_id, error)
-     CALL check("h5aopen_name_f",error,total_error)
-
-     !
-     !open the INTEGER attrbute by name
-     !
-     CALL h5aopen_name_f(dset_id, aname5, attr5_id, error)
-     CALL check("h5aopen_idx_f",error,total_error)
-
-     !
-     !open the NULL attrbute by name
-     !
-     CALL h5aopen_name_f(dset_id, aname6, attr6_id, error)
-     CALL check("h5aopen_idx_f",error,total_error)
-
-     !
-     !get the attrbute name
-     !
-     CALL h5aget_name_f(attr5_id, name_size, attr_name, error)
-     CALL check("h5aget_name_f",error,total_error)
-     IF (attr_name(1:12) .NE. aname5) THEN
-       total_error = total_error + 1
-     END IF
-     IF (error .NE. 12) THEN
-       total_error = total_error + 1
-     END IF
-
-     !
-     !get the STRING attrbute space
-     !
-     CALL h5aget_space_f(attr_id, attr_space, error)
-     CALL check("h5aget_space_f",error,total_error)
-     !
-     !get other attrbute space
-     !
-     CALL h5aget_space_f(attr2_id, attr2_space, error)
-     CALL check("h5aget_space_f",error,total_error)
-     !
-     !get the string attrbute datatype
-     !
-     CALL h5aget_type_f(attr_id, attr_type, error)
-     CALL check("h5aget_type_f",error,total_error)
-     !
-     !get the character attrbute datatype
-     !
-     CALL h5aget_type_f(attr2_id, attr2_type, error)
-     CALL check("h5aget_type_f",error,total_error)
-     !
-     !get the double attrbute datatype
-     !
-     CALL h5aget_type_f(attr3_id, attr3_type, error)
-     CALL check("h5aget_type_f",error,total_error)
-     !
-     !get the real attrbute datatype
-     !
-     CALL h5aget_type_f(attr4_id, attr4_type, error)
-     CALL check("h5aget_type_f",error,total_error)
-
-     !
-     !get the integer attrbute datatype
-     !
-     CALL h5aget_type_f(attr5_id, attr5_type, error)
-     CALL check("h5aget_type_f",error,total_error)
-
-     !
-     !get the null attrbute datatype
-     !
-     CALL h5aget_type_f(attr6_id, attr6_type, error)
-     CALL check("h5aget_type_f",error,total_error)
-
-     !
-     !get number of attributes
-     !
-     CALL h5aget_num_attrs_f(dset_id, num_attrs, error)
-     CALL check("h5aget_num_attrs_f",error,total_error)
-     IF (num_attrs .NE. 6) THEN
-       WRITE(*,*) "got number of attributes wrong", num_attrs
-       total_error = total_error +1
-     END IF
-
-     !
-     !set the read back data type's size
-     !
-     CALL h5tcopy_f(H5T_NATIVE_CHARACTER, atype_id, error)
-     CALL check("h5tcopy_f",error,total_error)
-
-     CALL h5tset_size_f(atype_id, attrlen, error)
-     CALL check("h5tset_size_f",error,total_error)
-     !
-     !read the string attribute data back to memory
-     !
-     data_dims(1) = 2
-     CALL h5aread_f(attr_id, atype_id, aread_data, data_dims, error)
-     CALL check("h5aread_f",error,total_error)
-
-     IF ( (aread_data(1) .NE. attr_data(1)) .OR. (aread_data(2) .NE. attr_data(2)) ) THEN
-         WRITE(*,*) "Read back string attrbute is wrong", aread_data(1), aread_data(2)
-         total_error = total_error + 1
-     END IF
-
-     !
-     !read the CHARACTER attribute data back to memory
-     !
-     CALL h5aread_f(attr2_id, H5T_NATIVE_CHARACTER, aread_character_data, data_dims, error)
-     CALL check("h5aread_f",error,total_error)
-     IF (aread_character_data .NE. 'A' ) THEN
-         WRITE(*,*) "Read back character attrbute is wrong ",aread_character_data
-         total_error = total_error + 1
-     END IF
-     !
-     !read the double attribute data back to memory
-     !
-     data_dims(1) = 1
-     CALL h5aread_f(attr3_id, H5T_NATIVE_DOUBLE, aread_double_data, data_dims, error)
-     CALL check("h5aread_f",error,total_error)
-
-     IF( .NOT.dreal_eq( REAL(aread_double_data(1),dp), 3.459_dp) )THEN
-        WRITE(*,*) "Read back double attrbute is wrong", aread_double_data(1)
-        total_error = total_error + 1
-     ENDIF
-     !
-     !read the real attribute data back to memory
-     !
-     data_dims(1) = 1
-     CALL h5aread_f(attr4_id, H5T_NATIVE_REAL, aread_real_data, data_dims, error)
-     CALL check("h5aread_f",error,total_error)
-     IF( .NOT.dreal_eq( REAL(aread_real_data(1),dp), 4.0_dp) )THEN
-        WRITE(*,*) "Read back real attrbute is wrong", aread_real_data(1)
-        total_error = total_error + 1
-     ENDIF
-     !
-     !read the Integer attribute data back to memory
-     !
-     data_dims(1) = 1
-     CALL h5aread_f(attr5_id, H5T_NATIVE_INTEGER, aread_integer_data, data_dims, error)
-     CALL check("h5aread_f",error,total_error)
-     IF (aread_integer_data(1) .NE. 5 ) THEN
-         WRITE(*,*) "Read back integer attrbute is wrong ", aread_integer_data
-         total_error = total_error + 1
-     END IF
-     !
-     !read the null attribute data. nothing can be read.
-     !
-     data_dims(1) = 1
-     CALL h5aread_f(attr6_id, H5T_NATIVE_INTEGER, aread_null_data, data_dims, error)
-     CALL check("h5aread_f",error,total_error)
-     IF (aread_null_data(1) .NE. 7 ) THEN
-         WRITE(*,*) "Read back null attrbute is wrong ", aread_null_data
-         total_error = total_error + 1
-     END IF
-
-     !
-     ! Close the attribute.
-     !
-     CALL h5aclose_f(attr_id, error)
-     CALL check("h5aclose_f",error,total_error)
-     CALL h5aclose_f(attr2_id, error)
-     CALL check("h5aclose_f",error,total_error)
-     CALL h5aclose_f(attr3_id, error)
-     CALL check("h5aclose_f",error,total_error)
-     CALL h5aclose_f(attr4_id, error)
-     CALL check("h5aclose_f",error,total_error)
-     CALL h5aclose_f(attr5_id, error)
-     CALL check("h5aclose_f",error,total_error)
-     CALL h5aclose_f(attr6_id, error)
-     CALL check("h5aclose_f",error,total_error)
-
-     !
-     ! Delete the attribute from the Dataset.
-     !
-     CALL h5adelete_f(dset_id, aname, error)
-     CALL check("h5adelete_f",error,total_error)
-
-     !
-     !get number of attributes
-     !
-     CALL h5aget_num_attrs_f(dset_id, num_attrs, error)
-     CALL check("h5aget_num_attrs_f",error,total_error)
-     IF (num_attrs .NE. 5) THEN
-       WRITE(*,*) "got number of attributes wrong", num_attrs
-       total_error = total_error +1
-     END IF
-
-
-
-     CALL h5sclose_f(attr_space, error)
-     CALL check("h5sclose_f",error,total_error)
-     CALL h5sclose_f(attr2_space, error)
-     CALL check("h5sclose_f",error,total_error)
-
-     !
-     ! Terminate access to the data type.
-     !
-     CALL h5tclose_f(attr_type, error)
-     CALL check("h5tclose_f",error,total_error)
-     CALL h5tclose_f(attr2_type, error)
-     CALL check("h5tclose_f",error,total_error)
-     CALL h5tclose_f(attr3_type, error)
-     CALL check("h5tclose_f",error,total_error)
-     CALL h5tclose_f(attr4_type, error)
-     CALL check("h5tclose_f",error,total_error)
-     CALL h5tclose_f(attr5_type, error)
-     CALL check("h5tclose_f",error,total_error)
-     CALL h5tclose_f(attr6_type, error)
-     CALL check("h5tclose_f",error,total_error)
-
-     !
-     ! End access to the dataset and release resources used by it.
-     !
-     CALL h5dclose_f(dset_id, error)
-     CALL check("h5dclose_f",error,total_error)
-
-     !
-     ! Close the file.
-     !
-     CALL h5fclose_f(file_id, error)
-     CALL check("h5fclose_f",error,total_error)
-     !
-     ! Remove the file
-     !
-     IF (cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
-
-     RETURN
-     END SUBROUTINE attribute_test
-END MODULE TH5A
diff --git a/fortran/test/tH5A_1_8.F90 b/fortran/test/tH5A_1_8.F90
new file mode 100644
index 0000000..5344f4b
--- /dev/null
+++ b/fortran/test/tH5A_1_8.F90
@@ -0,0 +1,2771 @@
+!****h* root/fortran/test/tH5A_1_8.f90
+!
+! NAME
+!  tH5A_1_8.f90
+!
+! FUNCTION
+!  Basic testing of Fortran H5A APIs introduced in 1.8.
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+! CONTAINS SUBROUTINES
+!  attribute_test_1_8, test_attr_corder_create_compact, test_attr_null_space,
+!  test_attr_create_by_name, test_attr_info_by_idx, attr_info_by_idx_check,
+!  test_attr_shared_rename, test_attr_delete_by_idx, test_attr_shared_delete,
+!  test_attr_dense_open, test_attr_dense_verify, test_attr_corder_create_basic,
+!  test_attr_basic_write, test_attr_many, attr_open_check,
+!
+!*****
+MODULE TH5A_1_8
+
+  USE HDF5 ! This module contains all necessary modules
+  USE TH5_MISC
+  USE TH5_MISC_GEN
+
+CONTAINS
+SUBROUTINE attribute_test_1_8(cleanup, total_error)
+
+!   This subroutine tests following 1.8 functionalities:
+!   h5acreate_f,  h5awrite_f, h5aclose_f,h5aread_f, h5aopen_name_f,
+!   h5aget_name_f,h5aget_space_f, h5aget_type_f, H5Pset_shared_mesg_nindexes_f,
+!   H5Pset_shared_mesg_index_f
+!
+
+
+  IMPLICIT NONE
+  LOGICAL, INTENT(IN)  :: cleanup
+  INTEGER, INTENT(INOUT) :: total_error
+
+  !
+  !general purpose integer
+  !
+  INTEGER     ::   i, j
+  INTEGER     ::   error ! Error flag
+
+  ! NEW STARTS HERE
+  INTEGER(HID_T) :: fapl = -1, fapl2 = -1
+  INTEGER(HID_T) :: fcpl = -1, fcpl2 = -1
+  INTEGER(HID_T) :: my_fapl, my_fcpl
+  LOGICAL, DIMENSION(1:2) :: new_format = (/.TRUE.,.FALSE./)
+  LOGICAL, DIMENSION(1:2) :: use_shared = (/.TRUE.,.FALSE./)
+
+  INTEGER :: ret_total_error
+
+! ********************
+! test_attr equivalent
+! ********************
+
+!  WRITE(*,*) "TESTING ATTRIBUTES"
+
+  CALL H5Pcreate_f(H5P_FILE_ACCESS_F,fapl,error)
+  CALL check("h5Pcreate_f",error,total_error)
+  CALL h5pcopy_f(fapl, fapl2, error)
+  CALL check("h5pcopy_f",error,total_error)
+
+  CALL H5Pcreate_f(H5P_FILE_CREATE_F,fcpl,error)
+  CALL check("h5Pcreate_f",error,total_error)
+
+  CALL h5pcopy_f(fcpl, fcpl2, error)
+  CALL check("h5pcopy_f",error,total_error)
+
+  CALL H5Pset_shared_mesg_nindexes_f(fcpl2,1,error)
+  CALL check("H5Pset_shared_mesg_nindexes_f",error, total_error)
+
+  CALL H5Pset_shared_mesg_index_f(fcpl2, 0, H5O_SHMESG_ATTR_FLAG_F, 1, error)
+  CALL check(" H5Pset_shared_mesg_index_f",error, total_error)
+
+  DO i = 1, 2
+
+     IF (new_format(i)) THEN
+        WRITE(*,'(1X,A)') "Testing with new file format:"
+        my_fapl = fapl2
+     ELSE
+        WRITE(*,'(1X,A)') "Testing with old file format:"
+        my_fapl = fapl
+     END IF
+     ret_total_error = 0
+     CALL test_attr_basic_write(my_fapl, ret_total_error)
+     CALL write_test_status(ret_total_error, &
+          '  - Tests INT attributes on both datasets and groups', &
+          total_error)
+
+     IF(new_format(i)) THEN
+        DO j = 1, 2
+           IF (use_shared(j)) THEN
+              WRITE(*,*) " - Testing with shared attributes:"
+              my_fcpl = fcpl2
+           ELSE
+              WRITE(*,*) " - Testing without shared attributes:"
+              my_fcpl = fcpl
+           END IF
+
+           ret_total_error = 0
+           CALL test_attr_dense_open(my_fcpl, my_fapl, ret_total_error)
+           CALL write_test_status(ret_total_error, &
+                '   - Testing INT attributes on both datasets and groups', &
+                total_error)
+
+           ret_total_error = 0
+           CALL test_attr_null_space(my_fcpl, my_fapl, ret_total_error)
+           CALL write_test_status(ret_total_error, &
+                '   - Testing storing attribute with "null" dataspace', &
+                total_error)
+           ret_total_error = 0
+           CALL test_attr_many(new_format(i), my_fcpl, my_fapl, ret_total_error)
+           CALL write_test_status(ret_total_error, &
+                '   - Testing storing lots of attributes', &
+                total_error)
+
+           ret_total_error = 0
+           CALL test_attr_corder_create_basic(my_fcpl, my_fapl, ret_total_error)
+           CALL write_test_status(ret_total_error, &
+                '   - Testing creating objects with attribute creation order', &
+                total_error)
+
+           ret_total_error = 0
+           CALL test_attr_corder_create_compact(my_fcpl, my_fapl, ret_total_error)
+           CALL write_test_status(ret_total_error, &
+                '   - Testing compact storage on objects with attribute creation order', &
+                total_error)
+           ret_total_error = 0
+           CALL test_attr_info_by_idx(new_format(i), my_fcpl, my_fapl, ret_total_error)
+           CALL write_test_status(ret_total_error, &
+                '   - Testing querying attribute info by index', &
+                total_error)
+
+           ret_total_error = 0
+           CALL test_attr_delete_by_idx(new_format(i), my_fcpl, my_fapl, ret_total_error)
+           CALL write_test_status(ret_total_error, &
+                '   - Testing deleting attribute by index', &
+                total_error)
+
+           ret_total_error = 0
+           CALL test_attr_create_by_name(new_format(i), my_fcpl, my_fapl, ret_total_error)
+           CALL write_test_status(ret_total_error, &
+                '   - Testing creating attributes by name', &
+                total_error)
+
+             !  More complex tests with both "new format" and "shared" attributes
+           IF( use_shared(j) ) THEN
+              ret_total_error = 0
+              CALL test_attr_shared_rename(my_fcpl, my_fapl, ret_total_error)
+              CALL write_test_status(ret_total_error,&
+                   '   - Testing renaming shared attributes in "compact" & "dense" storage', &
+                   total_error)
+
+              ret_total_error = 0
+              CALL test_attr_shared_delete(my_fcpl, my_fapl, ret_total_error)
+              CALL write_test_status(ret_total_error,&
+                   '   - Testing deleting shared attributes in "compact" & "dense" storage', &
+                   total_error)
+
+           END IF
+        END DO
+     END IF
+  ENDDO
+
+  CALL H5Pclose_f(fcpl, error)
+  CALL CHECK("H5Pclose", error,total_error)
+  CALL H5Pclose_f(fcpl2, error)
+  CALL CHECK("H5Pclose", error,total_error)
+
+  IF(cleanup) CALL h5_cleanup_f("tattr", H5P_DEFAULT_F, error)
+  CALL check("h5_cleanup_f", error, total_error)
+
+
+  RETURN
+END SUBROUTINE attribute_test_1_8
+
+SUBROUTINE test_attr_corder_create_compact(fcpl,fapl, total_error)
+
+!***************************************************************
+!**
+!**  test_attr_corder_create_compact(): Test basic H5A (attribute) code.
+!**      Tests compact attribute storage on objects with attribute creation order info
+!**
+!***************************************************************
+
+! Needed for get_info_by_name
+
+
+  IMPLICIT NONE
+
+! - - - arg types - - -
+
+  INTEGER(HID_T), INTENT(IN) :: fcpl
+  INTEGER(HID_T), INTENT(IN) :: fapl
+
+  CHARACTER(LEN=8) :: FileName = "tattr.h5"
+  INTEGER(HID_T) :: fid
+  INTEGER(HID_T) :: dcpl
+  INTEGER(HID_T) :: sid
+
+  INTEGER :: error
+  INTEGER, INTENT(INOUT) :: total_error
+
+  CHARACTER(LEN=8) :: DSET1_NAME = "Dataset1"
+  CHARACTER(LEN=8) :: DSET2_NAME = "Dataset2"
+  CHARACTER(LEN=8) :: DSET3_NAME = "Dataset3"
+  INTEGER, PARAMETER :: NUM_DSETS = 3
+
+  INTEGER :: curr_dset
+
+  INTEGER(HID_T) :: dset1, dset2, dset3
+  INTEGER(HID_T) :: my_dataset
+
+  INTEGER :: u
+
+  INTEGER :: max_compact ! Maximum # of links to store in group compactly
+  INTEGER :: min_dense   ! Minimum # of links to store in group "densely"
+
+  CHARACTER(LEN=7) :: attrname
+  CHARACTER(LEN=2) :: chr2
+  INTEGER(HID_T) :: attr        !String Attribute identifier
+  INTEGER(HSIZE_T), DIMENSION(7) :: data_dims
+
+  LOGICAL :: f_corder_valid ! Indicates whether the the creation order data is valid for this attribute
+  INTEGER :: corder ! Is a positive integer containing the creation order of the attribute
+  INTEGER :: cset ! Indicates the character set used for the attribute’s name
+  INTEGER(HSIZE_T) :: data_size   ! indicates the size, in the number of characters
+
+  data_dims = 0
+
+!  WRITE(*,*) "     - Testing Compact Storage of Attributes with Creation Order Info"
+  !  Create file
+  CALL h5fcreate_f(FileName, H5F_ACC_TRUNC_F, fid, error, fcpl, fapl)
+  CALL check("h5fcreate_f",error,total_error)
+  !  Create dataset creation property list
+  CALL H5Pcreate_f(H5P_DATASET_CREATE_F,dcpl,error)
+  CALL check("h5Pcreate_f",error,total_error)
+
+  CALL H5Pset_attr_creation_order_f(dcpl, IOR(H5P_CRT_ORDER_TRACKED_F, H5P_CRT_ORDER_INDEXED_F), error)
+  CALL check("H5Pset_attr_creation_order",error,total_error)
+
+  !  Query the attribute creation properties
+  CALL H5Pget_attr_phase_change_f(dcpl, max_compact, min_dense, error)
+  CALL check("H5Pget_attr_phase_change_f",error,total_error)
+
+  CALL h5screate_f(H5S_SCALAR_F, sid, error)
+  CALL check("h5screate_f",error,total_error)
+
+  CALL h5dcreate_f(fid, DSET1_NAME, H5T_NATIVE_CHARACTER, sid, dset1, error, dcpl_id=dcpl )
+  CALL check("h5dcreate_f",error,total_error)
+
+  CALL h5dcreate_f(fid, DSET2_NAME, H5T_NATIVE_CHARACTER, sid, dset2, error, dcpl )
+  CALL check("h5dcreate_f",error,total_error)
+
+  CALL h5dcreate_f(fid, DSET3_NAME, H5T_NATIVE_CHARACTER, sid, dset3, error, dcpl_id=dcpl )
+  CALL check("h5dcreate_f",error,total_error)
+
+  DO curr_dset = 0,NUM_DSETS-1
+     SELECT CASE (curr_dset)
+     CASE (0)
+        my_dataset = dset1
+     CASE (1)
+        my_dataset = dset2
+     CASE (2)
+        my_dataset = dset3
+     END SELECT
+    DO u = 0, max_compact - 1
+       !  Create attribute
+       WRITE(chr2,'(I2.2)') u
+       attrname = 'attr '//chr2
+
+       CALL h5acreate_f(my_dataset, attrname, H5T_NATIVE_INTEGER, sid, attr, error)
+       CALL check("h5acreate_f",error,total_error)
+
+       data_dims(1) = 1
+       CALL h5awrite_f(attr, H5T_NATIVE_INTEGER, u, data_dims, error)
+       CALL check("h5awrite_f",error,total_error)
+
+       CALL h5aclose_f(attr, error)
+       CALL check("h5aclose_f",error,total_error)
+
+    END DO
+  END DO
+
+  !   Close Datasets
+  CALL h5dclose_f(dset1, error)
+  CALL check("h5dclose_f",error,total_error)
+  CALL h5dclose_f(dset2, error)
+  CALL check("h5dclose_f",error,total_error)
+  CALL h5dclose_f(dset3, error)
+  CALL check("h5dclose_f",error,total_error)
+
+  !    Close file
+  CALL h5fclose_f(fid, error)
+  CALL check("h5fclose_f",error,total_error)
+
+  !  Close dataspace
+  CALL h5sclose_f(sid, error)
+  CALL check("h5sclose_f",error,total_error)
+
+  !  Close property list
+  CALL h5pclose_f(dcpl, error)
+  CALL check("h5pclose_f",error,total_error)
+
+  CALL h5fopen_f(FileName, H5F_ACC_RDWR_F, fid, error, fapl)
+  CALL check("h5fopen_f",error,total_error)
+
+  CALL h5dopen_f(fid, DSET1_NAME, dset1, error)
+  CALL check("h5dopen_f",error,total_error)
+  CALL h5dopen_f(fid, DSET2_NAME, dset2, error)
+  CALL check("h5dopen_f",error,total_error)
+  CALL h5dopen_f(fid, DSET3_NAME, dset3, error)
+  CALL check("h5dopen_f",error,total_error)
+  DO curr_dset = 0,NUM_DSETS-1
+     SELECT CASE (curr_dset)
+     CASE (0)
+        my_dataset = dset1
+     CASE (1)
+        my_dataset = dset2
+     CASE (2)
+        my_dataset = dset3
+     CASE DEFAULT
+        WRITE(*,*) " WARNING: To many data sets! "
+     END SELECT
+     DO u = 0,max_compact-1
+        WRITE(chr2,'(I2.2)') u
+        attrname = 'attr '//chr2
+        !  Retrieve information for attribute
+
+        CALL H5Aget_info_by_name_f(my_dataset, ".", attrname, &
+             f_corder_valid, corder, cset, data_size, error, lapl_id = H5P_DEFAULT_F ) !with optional
+
+        CALL check("H5Aget_info_by_name_f", error, total_error)
+
+        !  Verify creation order of attribute
+
+        CALL verify("H5Aget_info_by_name_f", f_corder_valid, .TRUE., total_error)
+        CALL verify("H5Aget_info_by_name_f", corder, u, total_error)
+
+
+        !  Retrieve information for attribute
+
+        CALL H5Aget_info_by_name_f(my_dataset, ".", attrname, &
+             f_corder_valid, corder, cset, data_size, error) ! without optional
+
+        CALL check("H5Aget_info_by_name_f", error, total_error)
+
+        !  Verify creation order of attribute
+
+        CALL verify("H5Aget_info_by_name_f", f_corder_valid, .TRUE., total_error)
+        CALL verify("H5Aget_info_by_name_f", corder, u, total_error)
+
+     END DO
+  END DO
+  !   Close Datasets
+  CALL h5dclose_f(dset1, error)
+  CALL check("h5dclose_f",error,total_error)
+  CALL h5dclose_f(dset2, error)
+  CALL check("h5dclose_f",error,total_error)
+  CALL h5dclose_f(dset3, error)
+  CALL check("h5dclose_f",error,total_error)
+
+  !    Close file
+  CALL h5fclose_f(fid, error)
+  CALL check("h5fclose_f",error,total_error)
+
+END SUBROUTINE test_attr_corder_create_compact
+
+SUBROUTINE test_attr_null_space(fcpl, fapl, total_error)
+!***************************************************************
+!**
+!**  test_attr_null_space(): Test basic H5A (attribute) code.
+!**      Tests storing attribute with "null" dataspace
+!**
+!***************************************************************
+
+
+  IMPLICIT NONE
+
+  INTEGER(HID_T), INTENT(IN) :: fcpl
+  INTEGER(HID_T), INTENT(IN) :: fapl
+  INTEGER, INTENT(INOUT) :: total_error
+
+  CHARACTER(LEN=8) :: FileName = "tattr.h5"
+  INTEGER(HID_T) :: fid
+  INTEGER(HID_T) :: sid, null_sid
+  INTEGER(HID_T) :: dataset
+
+  CHARACTER(LEN=8) :: DSET1_NAME = "Dataset1"
+
+  INTEGER :: error
+
+  INTEGER :: value_scalar
+  INTEGER, DIMENSION(1) :: value
+  INTEGER(HID_T) :: attr        !String Attribute identifier
+  INTEGER(HID_T) :: attr_sid
+  INTEGER(HSIZE_T), DIMENSION(7) :: data_dims
+
+  INTEGER(HSIZE_T) :: storage_size   ! attributes storage requirements
+
+  LOGICAL :: f_corder_valid ! Indicates whether the the creation order data is valid for this attribute
+  INTEGER :: corder ! Is a positive integer containing the creation order of the attribute
+  INTEGER :: cset ! Indicates the character set used for the attribute’s name
+  INTEGER(HSIZE_T) :: data_size   ! indicates the size, in the number of characters
+
+  LOGICAL :: equal
+
+  ! test: H5Sextent_equal_f
+
+  data_dims = 0
+
+  !  Create file
+  CALL h5fcreate_f(FileName, H5F_ACC_TRUNC_F, fid, error, fcpl, fapl)
+  CALL check("h5fcreate_f",error,total_error)
+  !  Close file
+  CALL h5fclose_f(fid, error)
+  CALL check("h5fclose_f",error,total_error)
+
+  !  Re-open file
+  CALL h5fopen_f(FileName, H5F_ACC_RDWR_F, fid, error)
+  CALL check("h5fopen_f",error,total_error)
+  !  Create dataspace for dataset attributes
+  CALL h5screate_f(H5S_SCALAR_F, sid, error)
+  CALL check("h5screate_f",error,total_error)
+  !  Create "null" dataspace for attribute
+  CALL h5screate_f(H5S_NULL_F, null_sid, error)
+  CALL check("h5screate_f",error,total_error)
+  !  Create a dataset
+  CALL h5dcreate_f(fid, DSET1_NAME, H5T_NATIVE_CHARACTER, sid, dataset, error)
+  CALL check("h5dcreate_f",error,total_error)
+  !  Add attribute with 'null' dataspace
+
+  !  Create attribute
+  CALL h5acreate_f(dataset, "null attr", H5T_NATIVE_INTEGER, null_sid, attr, error)
+  CALL check("h5acreate_f",error,total_error)
+
+  !  Try to read data from the attribute
+  !  (shouldn't fail, but should leave buffer alone)
+  value(1) = 103
+  data_dims(1) = 1
+  CALL h5aread_f(attr, H5T_NATIVE_INTEGER, value, data_dims, error)
+  CALL check("h5aread_f",error,total_error)
+  CALL verify("h5aread_f",value(1),103,total_error)
+
+!  Try to read data from the attribute again but
+!  for a scalar
+
+  value_scalar = 104
+  data_dims(1) = 1
+  CALL h5aread_f(attr, H5T_NATIVE_INTEGER, value_scalar, data_dims, error)
+  CALL check("h5aread_f",error,total_error)
+  CALL verify("h5aread_f",value_scalar,104,total_error)
+
+  CALL h5aget_space_f(attr, attr_sid, error)
+  CALL check("h5aget_space_f",error,total_error)
+
+  CALL H5Sextent_equal_f(attr_sid, null_sid, equal, error)
+  CALL check("H5Sextent_equal_f",error,total_error)
+  CALL verify("H5Sextent_equal_f",equal,.TRUE.,total_error)
+
+  CALL h5aget_storage_size_f(attr, storage_size, error)
+  CALL check("h5aget_storage_size_f",error,total_error)
+  CALL verify("h5aget_storage_size_f",INT(storage_size),0,total_error)
+
+  CALL h5aget_info_f(attr, f_corder_valid, corder, cset, data_size,  error)
+  CALL check("h5aget_info_f", error, total_error)
+
+  !  Check the attribute's information
+  CALL verify("h5aget_info_f.corder",corder,0,total_error)
+
+  CALL verify("h5aget_info_f.cset", cset, H5T_CSET_ASCII_F, total_error)
+  CALL h5aget_storage_size_f(attr, storage_size, error)
+  CALL check("h5aget_storage_size_f",error,total_error)
+  CALL verify("h5aget_info_f.data_size", INT(data_size), INT(storage_size), total_error)
+  CALL h5aclose_f(attr,error)
+  CALL check("h5aclose_f",error,total_error)
+
+  CALL H5Sclose_f(attr_sid, error)
+  CALL check("H5Sclose_f",error,total_error)
+
+  CALL H5Dclose_f(dataset, error)
+  CALL check("H5Dclose_f", error,total_error)
+
+
+  CALL H5Fclose_f(fid, error)
+  CALL check("H5Fclose_f", error,total_error)
+
+  CALL H5Sclose_f(sid, error)
+  CALL check("H5Sclose_f", error,total_error)
+
+  CALL H5Sclose_f(null_sid, error)
+  CALL check("H5Sclose_f", error,total_error)
+
+END SUBROUTINE test_attr_null_space
+
+
+SUBROUTINE test_attr_create_by_name(new_format,fcpl,fapl, total_error)
+
+!***************************************************************
+!**
+!**  test_attr_create_by_name(): Test basic H5A (attribute) code.
+!**      Tests creating attributes by name
+!**
+!***************************************************************
+
+  IMPLICIT NONE
+
+  INTEGER(SIZE_T), PARAMETER :: NAME_BUF_SIZE = 7
+  LOGICAL :: new_format
+  INTEGER(HID_T), INTENT(IN) :: fcpl
+  INTEGER(HID_T), INTENT(IN) :: fapl
+  INTEGER, INTENT(INOUT) :: total_error
+
+  INTEGER :: max_compact,min_dense,u
+  CHARACTER (LEN=NAME_BUF_SIZE) :: attrname
+  CHARACTER(LEN=8) :: dsetname
+
+  CHARACTER(LEN=8) :: FileName = "tattr.h5"
+  INTEGER(HID_T) :: fid
+  INTEGER(HID_T) :: dcpl
+  INTEGER(HID_T) :: sid
+
+  CHARACTER(LEN=8) :: DSET1_NAME = "Dataset1"
+  CHARACTER(LEN=8) :: DSET2_NAME = "Dataset2"
+  CHARACTER(LEN=8) :: DSET3_NAME = "Dataset3"
+  INTEGER, PARAMETER :: NUM_DSETS = 3
+
+  INTEGER :: curr_dset
+
+  INTEGER(HID_T) :: dset1, dset2, dset3
+  INTEGER(HID_T) :: my_dataset
+  INTEGER :: error
+
+  INTEGER(HID_T) :: attr        !String Attribute identifier
+  INTEGER(HSIZE_T), DIMENSION(7) :: data_dims
+
+
+  CHARACTER(LEN=2) :: chr2
+  LOGICAL, DIMENSION(1:2) :: use_index = (/.FALSE.,.TRUE./)
+  INTEGER :: Input1
+  INTEGER :: i
+
+  data_dims = 0
+
+
+  !  Create dataspace for dataset & attributes
+  CALL h5screate_f(H5S_SCALAR_F, sid, error)
+  CALL check("h5screate_f",error,total_error)
+
+  !  Create dataset creation property list
+  CALL H5Pcreate_f(H5P_DATASET_CREATE_F,dcpl,error)
+  CALL check("h5Pcreate_f",error,total_error)
+
+  !  Query the attribute creation properties
+
+  CALL H5Pget_attr_phase_change_f(dcpl, max_compact, min_dense, error)
+  CALL check("H5Pget_attr_phase_change_f",error,total_error)
+
+  !  Loop over using index for creation order value
+  DO i = 1, 2
+     !  Print appropriate test message
+     IF(use_index(i))THEN
+        WRITE(*,*) "   - Testing Creating Attributes By Name w/Creation Order Index"
+     ELSE
+        WRITE(*,*) "   - Testing Creating Attributes By Name w/o Creation Order Index"
+     ENDIF
+     !  Create file
+     CALL h5fcreate_f(FileName, H5F_ACC_TRUNC_F, fid, error, fcpl, fapl)
+     CALL check("h5fcreate_f",error,total_error)
+
+     !  Set attribute creation order tracking & indexing for object
+     IF(new_format)THEN
+
+        IF(use_index(i))THEN
+           Input1 = H5P_CRT_ORDER_INDEXED_F
+        ELSE
+           Input1 = 0
+        ENDIF
+
+        CALL H5Pset_attr_creation_order_f(dcpl, IOR(H5P_CRT_ORDER_TRACKED_F, Input1), error)
+        CALL check("H5Pset_attr_creation_order",error,total_error)
+
+     ENDIF
+
+     !  Create datasets
+
+     CALL h5dcreate_f(fid, DSET1_NAME, H5T_NATIVE_CHARACTER, sid, dset1, error, dcpl_id=dcpl )
+     CALL check("h5dcreate_f2",error,total_error)
+
+     CALL h5dcreate_f(fid, DSET2_NAME, H5T_NATIVE_CHARACTER, sid, dset2, error, dcpl_id=dcpl )
+     CALL check("h5dcreate_f3",error,total_error)
+
+     CALL h5dcreate_f(fid, DSET3_NAME, H5T_NATIVE_CHARACTER, sid, dset3, error, dcpl_id=dcpl )
+     CALL check("h5dcreate_f4",error,total_error)
+
+
+     !  Work on all the datasets
+
+     DO curr_dset = 0,NUM_DSETS-1
+        SELECT CASE (curr_dset)
+        CASE (0)
+           my_dataset = dset1
+           dsetname = DSET1_NAME
+        CASE (1)
+           my_dataset = dset2
+           dsetname = DSET2_NAME
+        CASE (2)
+           my_dataset = dset3
+           dsetname = DSET3_NAME
+           !     CASE DEFAULT
+           !        CALL HDassert(0.AND."Toomanydatasets!")
+        END SELECT
+
+
+        ! Create attributes, up to limit of compact form
+
+        DO u = 0, max_compact - 1
+           !  Create attribute
+           WRITE(chr2,'(I2.2)') u
+           attrname = 'attr '//chr2
+           CALL H5Acreate_by_name_f(fid, dsetname, attrname, H5T_NATIVE_INTEGER, sid, &
+                attr, error, lapl_id=H5P_DEFAULT_F, acpl_id=H5P_DEFAULT_F, aapl_id=H5P_DEFAULT_F)
+           CALL check("H5Acreate_by_name_f",error,total_error)
+
+           !  Write data into the attribute
+
+           data_dims(1) = 1
+           CALL h5awrite_f(attr, H5T_NATIVE_INTEGER, u, data_dims, error)
+           CALL check("h5awrite_f",error,total_error)
+
+           !  Close attribute
+           CALL h5aclose_f(attr, error)
+           CALL check("h5aclose_f",error,total_error)
+
+           !  Verify information for NEW attribute
+           CALL attr_info_by_idx_check(my_dataset, attrname, INT(u,HSIZE_T), use_index(i), total_error)
+         !   CALL check("FAILED IN attr_info_by_idx_check",total_error)
+        ENDDO
+
+        !  Test opening attributes stored compactly
+
+        CALL attr_open_check(fid, dsetname, my_dataset, u, total_error)
+
+     ENDDO
+
+
+     !  Work on all the datasets
+     DO curr_dset = 0,NUM_DSETS-1
+        SELECT CASE (curr_dset)
+        CASE (0)
+           my_dataset = dset1
+           dsetname = DSET1_NAME
+        CASE (1)
+           my_dataset = dset2
+           dsetname = DSET2_NAME
+        CASE (2)
+           my_dataset = dset3
+           dsetname = DSET3_NAME
+        END SELECT
+
+        !  Create more attributes, to push into dense form
+        DO u = max_compact, max_compact* 2 - 1
+
+           WRITE(chr2,'(I2.2)') u
+           attrname = 'attr '//chr2
+
+           CALL H5Acreate_by_name_f(fid, dsetname, attrname, H5T_NATIVE_INTEGER, sid, &
+                attr, error, lapl_id=H5P_DEFAULT_F)
+           CALL check("H5Acreate_by_name",error,total_error)
+
+           !  Write data into the attribute
+           data_dims(1) = 1
+           CALL h5awrite_f(attr, H5T_NATIVE_INTEGER, u, data_dims, error)
+           CALL check("h5awrite_f",error,total_error)
+
+           !  Close attribute
+           CALL h5aclose_f(attr, error)
+           CALL check("h5aclose_f",error,total_error)
+
+        ENDDO
+
+     ENDDO
+
+     !  Close Datasets
+     CALL h5dclose_f(dset1, error)
+     CALL check("h5dclose_f",error,total_error)
+     CALL h5dclose_f(dset2, error)
+     CALL check("h5dclose_f",error,total_error)
+     CALL h5dclose_f(dset3, error)
+     CALL check("h5dclose_f",error,total_error)
+
+
+     !  Close file
+     CALL h5fclose_f(fid, error)
+     CALL check("h5fclose_f",error,total_error)
+  ENDDO
+
+  !  Close property list
+  CALL h5pclose_f(dcpl, error)
+  CALL check("h5pclose_f",error,total_error)
+
+  !  Close dataspace
+  CALL h5sclose_f(sid, error)
+  CALL check("h5sclose_f",error,total_error)
+
+END SUBROUTINE test_attr_create_by_name
+
+
+SUBROUTINE test_attr_info_by_idx(new_format, fcpl, fapl, total_error)
+
+!***************************************************************
+!**
+!**  test_attr_info_by_idx(): Test basic H5A (attribute) code.
+!**      Tests querying attribute info by index
+!**
+!***************************************************************
+
+  IMPLICIT NONE
+
+  LOGICAL :: new_format
+  INTEGER(HID_T), INTENT(IN) :: fcpl
+  INTEGER(HID_T), INTENT(IN) :: fapl
+  INTEGER, INTENT(INOUT) :: total_error
+  CHARACTER(LEN=8) :: FileName = "tattr.h5"
+  INTEGER(HID_T) :: fid
+  INTEGER(HID_T) :: dcpl
+  INTEGER(HID_T) :: sid
+
+  CHARACTER(LEN=8) :: DSET1_NAME = "Dataset1"
+  CHARACTER(LEN=8) :: DSET2_NAME = "Dataset2"
+  CHARACTER(LEN=8) :: DSET3_NAME = "Dataset3"
+  INTEGER, PARAMETER :: NUM_DSETS = 3
+
+  INTEGER :: curr_dset
+
+  INTEGER(HID_T) :: dset1, dset2, dset3
+  INTEGER(HID_T) :: my_dataset
+  INTEGER :: error
+
+  INTEGER(HID_T) :: attr        !String Attribute identifier
+  INTEGER(HSIZE_T), DIMENSION(7) :: data_dims
+
+  LOGICAL :: f_corder_valid ! Indicates whether the the creation order data is valid for this attribute
+  INTEGER :: corder ! Is a positive integer containing the creation order of the attribute
+  INTEGER :: cset ! Indicates the character set used for the attribute’s name
+  INTEGER(HSIZE_T) :: data_size   ! indicates the size, in the number of characters
+  INTEGER(HSIZE_T) :: n
+  LOGICAL, DIMENSION(1:2) :: use_index = (/.FALSE.,.TRUE./)
+
+  INTEGER :: max_compact ! Maximum # of links to store in group compactly
+  INTEGER :: min_dense   ! Minimum # of links to store in group "densely"
+
+  CHARACTER(LEN=2) :: chr2
+
+  INTEGER :: i, j
+
+  INTEGER, DIMENSION(1) ::  attr_integer_data
+  CHARACTER(LEN=7) :: attrname
+
+  INTEGER(SIZE_T) :: size
+  CHARACTER(LEN=80) :: tmpname
+
+  INTEGER :: Input1
+  INTEGER(HSIZE_T) :: hzero = 0_HSIZE_T
+  INTEGER, PARAMETER :: minusone = -1
+
+  data_dims = 0
+
+  !  Create dataspace for dataset & attributes
+
+  CALL h5screate_f(H5S_SCALAR_F, sid, error)
+  CALL check("h5screate_f",error,total_error)
+
+
+  !  Create dataset creation property list
+
+  CALL H5Pcreate_f(H5P_DATASET_CREATE_F,dcpl,error)
+  CALL check("h5Pcreate_f",error,total_error)
+
+
+  !  Query the attribute creation properties
+  CALL H5Pget_attr_phase_change_f(dcpl, max_compact, min_dense, error)
+  CALL check("H5Pget_attr_phase_change_f",error,total_error)
+
+  !   Loop over using index for creation order value
+
+  DO i = 1, 2
+
+     !  Create file
+     CALL h5fcreate_f(FileName, H5F_ACC_TRUNC_F, fid, error, fcpl, fapl)
+     CALL check("h5fcreate_f",error,total_error)
+
+     !  Set attribute creation order tracking & indexing for object
+     IF(new_format)THEN
+        IF(use_index(i))THEN
+           Input1 = H5P_CRT_ORDER_INDEXED_F
+        ELSE
+           Input1 = 0
+        ENDIF
+        CALL H5Pset_attr_creation_order_f(dcpl, IOR(H5P_CRT_ORDER_TRACKED_F, Input1), error)
+        CALL check("H5Pset_attr_creation_order",error,total_error)
+     ENDIF
+
+     !  Create datasets
+
+     CALL h5dcreate_f(fid, DSET1_NAME, H5T_NATIVE_CHARACTER, sid, dset1, error )
+     CALL check("h5dcreate_f",error,total_error)
+
+     CALL h5dcreate_f(fid, DSET2_NAME, H5T_NATIVE_CHARACTER, sid, dset2, error )
+     CALL check("h5dcreate_f",error,total_error)
+
+     CALL h5dcreate_f(fid, DSET3_NAME, H5T_NATIVE_CHARACTER, sid, dset3, error )
+     CALL check("h5dcreate_f",error,total_error)
+
+     !  Work on all the datasets
+
+     DO curr_dset = 0,NUM_DSETS-1
+
+        SELECT CASE (curr_dset)
+        CASE (0)
+           my_dataset = dset1
+        CASE (1)
+           my_dataset = dset2
+        CASE (2)
+           my_dataset = dset3
+        END SELECT
+
+        ! -- CHECK PASSING AN INTEGER CONSTANT IN DIFFERENT FORMS --
+
+        ! 1) call by passing an integer with the _hsize_t declaration
+
+        CALL h5aget_info_by_idx_f(my_dataset, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_INC_F, 0_hsize_t, &
+             f_corder_valid, corder, cset, data_size, error, lapl_id=H5P_DEFAULT_F)
+        CALL verify("h5aget_info_by_idx_f",error,minusone,total_error)
+
+        ! 2) call by passing an integer with the INT(,hsize_t) declaration
+
+        CALL h5aget_info_by_idx_f(my_dataset, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_INC_F, INT(0,hsize_t), &
+             f_corder_valid, corder, cset, data_size, error, lapl_id=H5P_DEFAULT_F)
+        CALL verify("h5aget_info_by_idx_f",error,minusone,total_error)
+
+
+        ! 3) call by passing a variable with the attribute hsize_t
+
+        CALL h5aget_info_by_idx_f(my_dataset, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_INC_F, hzero, &
+             f_corder_valid, corder, cset, data_size, error, lapl_id=H5P_DEFAULT_F)
+        CALL verify("h5aget_info_by_idx_f",error,minusone,total_error)
+
+        CALL h5aget_name_by_idx_f(my_dataset, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_INC_F, &
+             hzero, tmpname,  error, size, lapl_id=H5P_DEFAULT_F)
+        CALL verify("h5aget_name_by_idx_f",error,minusone,total_error)
+
+
+        !  Create attributes, up to limit of compact form
+
+        DO j = 0, max_compact-1
+           !  Create attribute
+           WRITE(chr2,'(I2.2)') j
+           attrname = 'attr '//chr2
+
+           ! check with the optional information create2 specs.
+           CALL h5acreate_f(my_dataset, attrname, H5T_NATIVE_INTEGER, sid, attr, error, H5P_DEFAULT_F, H5P_DEFAULT_F)
+           CALL check("h5acreate_f",error,total_error)
+
+           !  Write data into the attribute
+
+           attr_integer_data(1) = j
+           data_dims(1) = 1
+           CALL h5awrite_f(attr, H5T_NATIVE_INTEGER, attr_integer_data, data_dims, error)
+           CALL check("h5awrite_f",error,total_error)
+
+           !  Close attribute
+
+           CALL h5aclose_f(attr, error)
+           CALL check("h5aclose_f",error,total_error)
+
+           !  Verify information for new attribute
+
+!EP        CALL attr_info_by_idx_check(my_dataset, attrname, INT(j,HSIZE_T), use_index(i), total_error )
+           n = INT(j, HSIZE_T)
+           CALL attr_info_by_idx_check(my_dataset, attrname, n, use_index(i), total_error )
+
+           !CHECK(ret, FAIL, "attr_info_by_idx_check");
+        ENDDO
+
+     ENDDO
+
+
+     !   Close Datasets
+     CALL h5dclose_f(dset1, error)
+     CALL check("h5dclose_f",error,total_error)
+     CALL h5dclose_f(dset2, error)
+     CALL check("h5dclose_f",error,total_error)
+     CALL h5dclose_f(dset3, error)
+     CALL check("h5dclose_f",error,total_error)
+
+     !    Close file
+     CALL h5fclose_f(fid, error)
+     CALL check("h5fclose_f",error,total_error)
+
+  END DO
+
+  !  Close property list
+  CALL h5pclose_f(dcpl,error)
+  CALL check("h5pclose_f", error, total_error)
+
+  !  Close dataspace
+  CALL h5sclose_f(sid, error)
+  CALL check("h5sclose_f",error,total_error)
+
+END SUBROUTINE test_attr_info_by_idx
+
+
+SUBROUTINE attr_info_by_idx_check(obj_id, attrname, n, use_index, total_error )
+
+  IMPLICIT NONE
+
+  INTEGER :: error, total_error
+
+  INTEGER(HID_T) :: obj_id
+  CHARACTER(LEN=*) :: attrname
+  INTEGER(HSIZE_T) :: n
+  LOGICAL :: use_index
+  LOGICAL :: f_corder_valid ! Indicates whether the the creation order data is valid for this attribute
+  INTEGER :: corder ! Is a positive integer containing the creation order of the attribute
+  INTEGER :: cset ! Indicates the character set used for the attribute’s name
+  INTEGER(HSIZE_T) :: data_size   ! indicates the size, in the number of characters
+
+  INTEGER(SIZE_T) :: NAME_BUF_SIZE = 7
+  CHARACTER(LEN=7) :: tmpname
+  INTEGER(HSIZE_T) :: hzero = 0_HSIZE_T
+
+
+  !  Verify the information for first attribute, in increasing creation order
+  CALL h5aget_info_by_idx_f(obj_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_INC_F, hzero, &
+       f_corder_valid, corder, cset, data_size, error)
+
+  CALL check("h5aget_info_by_idx_f",error,total_error)
+  CALL verify("h5aget_info_by_idx_f",corder,0,total_error)
+  !  Verify the information for new attribute, in increasing creation order
+
+  CALL h5aget_info_by_idx_f(obj_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_INC_F, n, &
+       f_corder_valid, corder, cset, data_size, error)
+
+  CALL check("h5aget_info_by_idx_f",error,total_error)
+  CALL verify("h5aget_info_by_idx_f",corder,INT(n),total_error)
+
+  !  Verify the name for new link, in increasing creation order
+
+  ! Try with the correct buffer size
+
+  CALL h5aget_name_by_idx_f(obj_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_INC_F, &
+       n, tmpname, error, NAME_BUF_SIZE)
+  CALL check("h5aget_name_by_idx_f",error,total_error)
+  CALL verify("h5aget_name_by_idx_f", INT(NAME_BUF_SIZE), 7, error)
+
+  IF(attrname.NE.tmpname)THEN
+     error = -1
+  ENDIF
+  CALL verify("h5aget_name_by_idx_f",error,0,total_error)
+
+  !   Don't test "native" order if there is no creation order index, since
+  !   *  there's not a good way to easily predict the attribute's order in the name
+  !   *  index.
+  !
+  IF (use_index) THEN
+     !  Verify the information for first attribute, in native creation order
+     CALL h5aget_info_by_idx_f(obj_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_NATIVE_F, hzero, &
+          f_corder_valid, corder, cset, data_size, error)
+     CALL check("h5aget_info_by_idx_f",error,total_error)
+     CALL verify("h5aget_info_by_idx_f",corder,0,total_error)
+
+     !  Verify the information for new attribute, in native creation order
+     CALL h5aget_info_by_idx_f(obj_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_NATIVE_F, n, &
+          f_corder_valid, corder, cset, data_size, error)
+     CALL check("h5aget_info_by_idx_f",error,total_error)
+     CALL verify("h5aget_info_by_idx_f",corder,INT(n),total_error)
+
+   !  Verify the name for new link, in increasing native order
+     CALL h5aget_name_by_idx_f(obj_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_NATIVE_F, &
+          n, tmpname, error) ! check with no optional parameters
+     CALL check("h5aget_name_by_idx_f",error,total_error)
+     IF(TRIM(attrname).NE.TRIM(tmpname))THEN
+        WRITE(*,*) "ERROR: attribute name size wrong!"
+        error = -1
+     ENDIF
+     CALL verify("h5aget_name_by_idx_f",error,0,total_error)
+  END IF
+
+
+  CALL h5aget_info_by_idx_f(obj_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_DEC_F, n, &
+       f_corder_valid, corder, cset, data_size, error)
+  CALL check("h5aget_info_by_idx_f",error,total_error)
+  CALL verify("h5aget_info_by_idx_f",corder,0,total_error)
+
+!EP  CALL h5aget_info_by_idx_f(obj_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_DEC_F, 0_HSIZE_T, &
+
+  ! -- CHECK PASSING AN INTEGER CONSTANT IN DIFFERENT FORMS --
+
+  ! 1) call by passing an integer with the _hsize_t declaration
+
+  CALL h5aget_info_by_idx_f(obj_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_DEC_F, 0_HSIZE_T, &
+       f_corder_valid, corder, cset, data_size, error)
+  CALL check("h5aget_info_by_idx_f",error,total_error)
+  CALL verify("h5aget_info_by_idx_f",corder,INT(n),total_error)
+
+  ! 2) call by passing an integer with the INT(,hsize_t) declaration
+
+  CALL h5aget_info_by_idx_f(obj_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_DEC_F, INT(0,HSIZE_T), &
+       f_corder_valid, corder, cset, data_size, error)
+  CALL check("h5aget_info_by_idx_f",error,total_error)
+  CALL verify("h5aget_info_by_idx_f",corder,INT(n),total_error)
+
+  ! 3) call by passing a variable with the attribute hsize_t
+
+  CALL h5aget_info_by_idx_f(obj_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_DEC_F, hzero, &
+       f_corder_valid, corder, cset, data_size, error)
+  CALL check("h5aget_info_by_idx_f",error,total_error)
+  CALL verify("h5aget_info_by_idx_f",corder,INT(n),total_error)
+
+!EP  CALL h5aget_info_by_idx_f(obj_id, ".", H5_INDEX_NAME_F, H5_ITER_INC_F, 0_HSIZE_T, &
+  CALL h5aget_info_by_idx_f(obj_id, ".", H5_INDEX_NAME_F, H5_ITER_INC_F, hzero, &
+       f_corder_valid, corder, cset, data_size, error)
+  CALL check("h5aget_info_by_idx_f",error,total_error)
+  CALL verify("h5aget_info_by_idx_f",corder,0,total_error)
+  CALL h5aget_info_by_idx_f(obj_id, ".", H5_INDEX_NAME_F, H5_ITER_INC_F, n, &
+       f_corder_valid, corder, cset, data_size, error)
+  CALL check("h5aget_info_by_idx_f",error,total_error)
+  CALL verify("h5aget_info_by_idx_f",corder,INT(n),total_error)
+
+  CALL h5aget_info_by_idx_f(obj_id, ".", H5_INDEX_NAME_F, H5_ITER_DEC_F, n, &
+       f_corder_valid, corder, cset, data_size, error)
+  CALL check("h5aget_info_by_idx_f",error,total_error)
+  CALL verify("h5aget_info_by_idx_f",corder,0,total_error)
+!EP  CALL h5aget_info_by_idx_f(obj_id, ".", H5_INDEX_NAME_F, H5_ITER_DEC_F, 0_HSIZE_T, &
+  CALL h5aget_info_by_idx_f(obj_id, ".", H5_INDEX_NAME_F, H5_ITER_DEC_F, hzero, &
+       f_corder_valid, corder, cset, data_size, error)
+  CALL check("h5aget_info_by_idx_f",error,total_error)
+  CALL verify("h5aget_info_by_idx_f",corder,INT(n),total_error)
+
+
+END SUBROUTINE attr_info_by_idx_check
+
+
+SUBROUTINE test_attr_shared_rename( fcpl, fapl, total_error)
+
+!***************************************************************
+!**
+!**  test_attr_shared_rename(): Test basic H5A (attribute) code.
+!**      Tests renaming shared attributes in "compact" & "dense" storage
+!**
+!***************************************************************
+
+  IMPLICIT NONE
+
+  INTEGER(HID_T), INTENT(IN) :: fcpl
+  INTEGER(HID_T), INTENT(IN) :: fapl
+  INTEGER, INTENT(INOUT) :: total_error
+
+    CHARACTER(LEN=8) :: FileName = "tattr.h5"
+  INTEGER(HID_T) :: fid
+  INTEGER(HID_T) :: dcpl
+  INTEGER(HID_T) :: sid, big_sid
+
+  CHARACTER(LEN=8) :: DSET1_NAME = "Dataset1"
+  CHARACTER(LEN=8) :: DSET2_NAME = "Dataset2"
+
+
+  INTEGER(HID_T) :: dataset, dataset2
+
+  INTEGER :: error
+
+  INTEGER(HID_T) :: attr        !String Attribute identifier
+  INTEGER(HID_T) :: attr_tid
+  INTEGER(HSIZE_T), DIMENSION(7) :: data_dims
+
+
+  INTEGER :: max_compact ! Maximum # of links to store in group compactly
+  INTEGER :: min_dense   ! Minimum # of links to store in group "densely"
+
+  CHARACTER(LEN=2) :: chr2
+
+
+  INTEGER, DIMENSION(1) ::  attr_integer_data
+  CHARACTER(LEN=7) :: attrname
+  CHARACTER(LEN=11) :: attrname2
+
+  INTEGER :: u
+  INTEGER(HID_T) :: my_fcpl
+
+  CHARACTER(LEN=5), PARAMETER :: TYPE1_NAME = "/Type"
+
+  INTEGER :: test_shared
+  INTEGER(HSIZE_T), DIMENSION(1) :: adims2 = (/1/) ! Attribute dimension
+  INTEGER     ::   arank = 1                      ! Attribute rank
+
+  !  Initialize "big" attribute data
+
+  !  Create dataspace for dataset
+  CALL h5screate_f(H5S_SCALAR_F, sid, error)
+  CALL check("h5screate_f",error,total_error)
+
+  !  Create "big" dataspace for "large" attributes
+
+  CALL h5screate_simple_f(arank, adims2, big_sid, error)
+  CALL check("h5screate_simple_f",error,total_error)
+
+  !  Loop over type of shared components
+  DO test_shared = 0, 2
+     !  Make copy of file creation property list
+     CALL H5Pcopy_f(fcpl, my_fcpl, error)
+     CALL check("H5Pcopy",error,total_error)
+
+     !  Set up datatype for attributes
+
+     CALL H5Tcopy_f(H5T_NATIVE_INTEGER, attr_tid, error)
+     CALL check("H5Tcopy",error,total_error)
+
+     !  Special setup for each type of shared components
+
+     IF( test_shared .EQ. 0) THEN
+        !  Make attributes > 500 bytes shared
+        CALL H5Pset_shared_mesg_nindexes_f(my_fcpl,1,error)
+        CALL check("H5Pset_shared_mesg_nindexes_f",error, total_error)
+        CALL H5Pset_shared_mesg_index_f(my_fcpl, 0, H5O_SHMESG_ATTR_FLAG_F, 500,error)
+        CALL check(" H5Pset_shared_mesg_index_f",error, total_error)
+
+     ELSE
+        !  Set up copy of file creation property list
+        CALL H5Pset_shared_mesg_nindexes_f(my_fcpl,3,error)
+
+        !  Make attributes > 500 bytes shared
+        CALL H5Pset_shared_mesg_index_f(my_fcpl, 0, H5O_SHMESG_ATTR_FLAG_F, 500,error)
+        !  Make datatypes & dataspaces > 1 byte shared (i.e. all of them :-)
+        CALL H5Pset_shared_mesg_index_f(my_fcpl, 1, H5O_SHMESG_DTYPE_FLAG_F, 1,error)
+        CALL H5Pset_shared_mesg_index_f(my_fcpl, 2,  H5O_SHMESG_SDSPACE_FLAG_F, 1,error)
+     ENDIF
+
+     !  Create file
+     CALL h5fcreate_f(FileName, H5F_ACC_TRUNC_F, fid, error, my_fcpl, fapl)
+     CALL check("h5fcreate_f",error,total_error)
+
+     !  Close FCPL copy
+     CALL h5pclose_f(my_fcpl, error)
+     CALL check("h5pclose_f", error, total_error)
+     !  Close file
+     CALL h5fclose_f(fid, error)
+     CALL check("h5fclose_f",error,total_error)
+
+     !  Re-open file
+     CALL h5fopen_f(FileName, H5F_ACC_RDWR_F, fid, error,fapl)
+     CALL check("h5fopen_f",error,total_error)
+
+     !  Commit datatype to file
+     IF(test_shared.EQ.2) THEN
+        CALL H5Tcommit_f(fid, TYPE1_NAME, attr_tid, error, H5P_DEFAULT_F, H5P_DEFAULT_F, H5P_DEFAULT_F)
+        CALL check("H5Tcommit",error,total_error)
+     ENDIF
+
+     !  Set up to query the object creation properties
+     CALL H5Pcreate_f(H5P_DATASET_CREATE_F,dcpl,error)
+     CALL check("h5Pcreate_f",error,total_error)
+
+     !  Create datasets
+     CALL h5dcreate_f(fid, DSET1_NAME, H5T_NATIVE_CHARACTER, sid, dataset, error, dcpl_id=dcpl )
+     CALL check("h5dcreate_f",error,total_error)
+     CALL h5dcreate_f(fid, DSET2_NAME, H5T_NATIVE_CHARACTER, sid, dataset2, error, dcpl_id=dcpl )
+     CALL check("h5dcreate_f",error,total_error)
+
+     !  Retrieve limits for compact/dense attribute storage
+     CALL H5Pget_attr_phase_change_f(dcpl, max_compact, min_dense, error)
+     CALL check("H5Pget_attr_phase_change_f",error,total_error)
+
+     !  Close property list
+     CALL h5pclose_f(dcpl,error)
+     CALL check("h5pclose_f", error, total_error)
+
+     !  Add attributes to each dataset, until after converting to dense storage
+     DO u = 0, (max_compact * 2) - 1
+
+        !  Create attribute name
+        WRITE(chr2,'(I2.2)') u
+        attrname = 'attr '//chr2
+
+        !  Alternate between creating "small" & "big" attributes
+
+        IF(MOD(u+1,2).EQ.0)THEN
+           !  Create "small" attribute on first dataset
+
+           CALL h5acreate_f(dataset, attrname, attr_tid, sid, attr, error, H5P_DEFAULT_F, H5P_DEFAULT_F)
+           CALL check("h5acreate_f",error,total_error)
+
+           !  Write data into the attribute
+           attr_integer_data(1) = u + 1
+           data_dims(1) = 1
+           CALL h5awrite_f(attr, attr_tid, attr_integer_data, data_dims, error)
+           CALL check("h5awrite_f",error,total_error)
+        ELSE
+           !  Create "big" attribute on first dataset
+
+           CALL h5acreate_f(dataset, attrname, attr_tid, big_sid, attr, error, H5P_DEFAULT_F, H5P_DEFAULT_F)
+           CALL check("h5acreate_f",error,total_error)
+
+           !  Write data into the attribute
+
+           data_dims(1) = 1
+           attr_integer_data(1) = u + 1
+           CALL h5awrite_f(attr, attr_tid, attr_integer_data, data_dims, error)
+           CALL check("h5awrite_f",error,total_error)
+
+        ENDIF
+
+        !  Close attribute
+        CALL h5aclose_f(attr, error)
+        CALL check("h5aclose_f",error,total_error)
+
+        !  Alternate between creating "small" & "big" attributes
+        IF(MOD(u+1,2).EQ.0)THEN
+
+           !   Create "small" attribute on second dataset
+
+           CALL h5acreate_f(dataset2, attrname, attr_tid, sid, attr, error, H5P_DEFAULT_F, H5P_DEFAULT_F)
+           CALL check("h5acreate_f",error,total_error)
+
+           !  Write data into the attribute
+
+           attr_integer_data(1) = u + 1
+           data_dims(1) = 1
+           CALL h5awrite_f(attr, attr_tid, attr_integer_data, data_dims, error)
+           CALL check("h5awrite_f",error,total_error)
+        ELSE
+
+           !  Create "big" attribute on second dataset
+
+           CALL h5acreate_f(dataset2, attrname, attr_tid, big_sid, attr, error, H5P_DEFAULT_F, H5P_DEFAULT_F)
+           CALL check("h5acreate_f",error,total_error)
+
+!  Write data into the attribute
+
+
+           attr_integer_data(1) = u + 1
+           data_dims(1) = 1
+!           CALL h5awrite_f(attr,  attr_tid, attr_integer_data, data_dims, error)
+!           CALL check("h5awrite_f",error,total_error)
+
+
+!  Check refcount for attribute
+        ENDIF
+        !  Close attribute
+        CALL h5aclose_f(attr, error)
+        CALL check("h5aclose_f",error,total_error)
+
+        !  Create new attribute name
+
+        WRITE(chr2,'(I2.2)') u
+        attrname2 = 'new attr '//chr2
+
+
+        !  Change second dataset's attribute's name
+
+        CALL H5Arename_by_name_f(fid, DSET2_NAME, attrname, attrname2, error, lapl_id=H5P_DEFAULT_F)
+        CALL check("H5Arename_by_name_f",error,total_error)
+
+        !  Check refcount on attributes now
+
+        !  Check refcount on renamed attribute
+
+        CALL H5Aopen_f(dataset2, attrname2, attr, error, aapl_id=H5P_DEFAULT_F)
+        CALL check("H5Aopen_f",error,total_error)
+
+        !  Close attribute
+        CALL h5aclose_f(attr, error)
+        CALL check("h5aclose_f",error,total_error)
+
+        !  Check refcount on original attribute
+        CALL H5Aopen_f(dataset, attrname, attr, error)
+        CALL check("H5Aopen",error,total_error)
+
+        !  Close attribute
+        CALL h5aclose_f(attr, error)
+        CALL check("h5aclose_f",error,total_error)
+
+
+        !  Change second dataset's attribute's name back to original
+
+        CALL H5Arename_by_name_f(fid, DSET2_NAME, attrname2, attrname, error)
+        CALL check("H5Arename_by_name_f",error,total_error)
+
+        !  Check refcount on attributes now
+
+        !  Check refcount on renamed attribute
+        CALL H5Aopen_f(dataset2, attrname, attr, error)
+        CALL check("H5Aopen",error,total_error)
+
+        !  Close attribute
+        CALL h5aclose_f(attr, error)
+        CALL check("h5aclose_f",error,total_error)
+
+        !  Check refcount on original attribute
+
+        !  Check refcount on renamed attribute
+        CALL H5Aopen_f(dataset, attrname, attr, error)
+        CALL check("H5Aopen",error,total_error)
+
+        !  Close attribute
+        CALL h5aclose_f(attr, error)
+        CALL check("h5aclose_f",error,total_error)
+
+     ENDDO
+
+     !  Close attribute's datatype
+     CALL h5tclose_f(attr_tid, error)
+     CALL check("h5tclose_f",error,total_error)
+
+     !  Close attribute's datatype
+     CALL h5dclose_f(dataset, error)
+     CALL check("h5dclose_f",error,total_error)
+     CALL h5dclose_f(dataset2, error)
+     CALL check("h5dclose_f",error,total_error)
+
+
+     !  Unlink datasets with attributes
+     CALL H5Ldelete_f(fid, DSET1_NAME, error, H5P_DEFAULT_F)
+     CALL check("HLdelete",error,total_error)
+     CALL H5Ldelete_f(fid, DSET2_NAME, error)
+     CALL check("HLdelete",error,total_error)
+
+     ! Unlink committed datatype
+     IF(test_shared == 2)THEN
+        CALL H5Ldelete_f(fid, TYPE1_NAME, error)
+        CALL check("HLdelete_f",error,total_error)
+     ENDIF
+
+     !  Close file
+     CALL h5fclose_f(fid, error)
+     CALL check("h5fclose_f",error,total_error)
+
+     !  Check size of file
+     !filesize = h5_get_file_size(FILENAME);
+     !verify(filesize, empty_filesize, "h5_get_file_size");
+  ENDDO
+
+  !  Close dataspaces
+  CALL h5sclose_f(sid, error)
+  CALL check("h5sclose_f",error,total_error)
+  CALL h5sclose_f(big_sid, error)
+  CALL check("h5sclose_f",error,total_error)
+
+END SUBROUTINE test_attr_shared_rename
+
+
+SUBROUTINE test_attr_delete_by_idx(new_format, fcpl, fapl, total_error)
+
+!***************************************************************
+!**
+!**  test_attr_delete_by_idx(): Test basic H5A (attribute) code.
+!**      Tests deleting attribute by index
+!**
+!***************************************************************
+
+  IMPLICIT NONE
+
+  LOGICAL, INTENT(IN) :: new_format
+  INTEGER(HID_T), INTENT(IN) :: fcpl
+  INTEGER(HID_T), INTENT(IN) :: fapl
+  INTEGER, INTENT(INOUT) :: total_error
+  CHARACTER(LEN=8) :: FileName = "tattr.h5"
+  INTEGER(HID_T) :: fid !  HDF5 File ID
+  INTEGER(HID_T) :: dcpl !  Dataset creation property list ID
+  INTEGER(HID_T) :: sid !  Dataspace ID
+
+  CHARACTER(LEN=8) :: DSET1_NAME = "Dataset1"
+  CHARACTER(LEN=8) :: DSET2_NAME = "Dataset2"
+  CHARACTER(LEN=8) :: DSET3_NAME = "Dataset3"
+  INTEGER, PARAMETER :: NUM_DSETS = 3
+
+  INTEGER :: curr_dset
+
+  INTEGER(HID_T) :: dset1, dset2, dset3
+  INTEGER(HID_T) :: my_dataset
+
+  INTEGER :: error
+
+  INTEGER(HID_T) :: attr        !String Attribute identifier
+  INTEGER(HSIZE_T), DIMENSION(7) :: data_dims
+
+  LOGICAL :: f_corder_valid ! Indicates whether the the creation order data is valid for this attribute
+  INTEGER :: corder ! Is a positive integer containing the creation order of the attribute
+  INTEGER :: cset ! Indicates the character set used for the attribute’s name
+  INTEGER(HSIZE_T) :: data_size   ! indicates the size, in the number of characters
+  LOGICAL, DIMENSION(1:2) :: use_index = (/.FALSE.,.TRUE./)
+
+  INTEGER :: max_compact ! Maximum # of links to store in group compactly
+  INTEGER :: min_dense   ! Minimum # of links to store in group "densely"
+
+  CHARACTER(LEN=2) :: chr2
+
+  INTEGER :: i
+
+  INTEGER, DIMENSION(1) ::  attr_integer_data
+  CHARACTER(LEN=7) :: attrname
+
+  INTEGER(SIZE_T) :: size
+  CHARACTER(LEN=8) :: tmpname
+
+  INTEGER :: idx_type
+  INTEGER :: order
+  INTEGER :: u     !  Local index variable
+  INTEGER :: Input1
+  INTEGER(HSIZE_T) :: hzero = 0_HSIZE_T
+  INTEGER, PARAMETER :: minusone = -1
+
+  data_dims = 0
+
+  !  Create dataspace for dataset & attributes
+  CALL h5screate_f(H5S_SCALAR_F, sid, error)
+  CALL check("h5screate_f",error,total_error)
+
+  !     Create dataset creation property list
+  CALL H5Pcreate_f(H5P_DATASET_CREATE_F,dcpl,error)
+  CALL check("h5Pcreate_f",error,total_error)
+
+  !  Query the attribute creation properties
+  CALL H5Pget_attr_phase_change_f(dcpl, max_compact, min_dense, error)
+  CALL check("H5Pget_attr_phase_change_f",error,total_error)
+
+
+  ! Loop over operating on different indices on link fields
+  DO idx_type = H5_INDEX_NAME_F, H5_INDEX_CRT_ORDER_F
+
+     !  Loop over operating in different orders
+     DO order = H5_ITER_INC_F, H5_ITER_DEC_F
+
+        !  Loop over using index for creation order value
+        DO i = 1, 2
+
+           !  Create file
+           CALL h5fcreate_f(FileName, H5F_ACC_TRUNC_F, fid, error, fcpl, fapl)
+           CALL check("h5fcreate_f",error,total_error)
+
+           !   Set attribute creation order tracking & indexing for object
+           IF(new_format)THEN
+
+              IF(use_index(i))THEN
+                 Input1 = H5P_CRT_ORDER_INDEXED_F
+              ELSE
+                 Input1 = 0
+              ENDIF
+
+              CALL H5Pset_attr_creation_order_f(dcpl, IOR(H5P_CRT_ORDER_TRACKED_F, Input1), error)
+              CALL check("H5Pset_attr_creation_order",error,total_error)
+
+           ENDIF
+
+           !  Create datasets
+
+           CALL h5dcreate_f(fid, DSET1_NAME, H5T_NATIVE_CHARACTER, sid, dset1, error, dcpl )
+           CALL check("h5dcreate_f2",error,total_error)
+
+           CALL h5dcreate_f(fid, DSET2_NAME, H5T_NATIVE_CHARACTER, sid, dset2, error, dcpl )
+           CALL check("h5dcreate_f3",error,total_error)
+
+           CALL h5dcreate_f(fid, DSET3_NAME, H5T_NATIVE_CHARACTER, sid, dset3, error, dcpl )
+           CALL check("h5dcreate_f4",error,total_error)
+
+           !    Work on all the datasets
+
+           DO curr_dset = 0,NUM_DSETS-1
+              SELECT CASE (curr_dset)
+              CASE (0)
+                 my_dataset = dset1
+              CASE (1)
+                 my_dataset = dset2
+              CASE (2)
+                 my_dataset = dset3
+                 !     CASE DEFAULT
+                 !        CALL HDassert(0.AND."Toomanydatasets!")
+              END SELECT
+
+
+              !  Check for deleting non-existent attribute
+!EP              CALL H5Adelete_by_idx_f(my_dataset, '.', idx_type, order, 0_HSIZE_T,error, lapl_id=H5P_DEFAULT_F)
+              CALL H5Adelete_by_idx_f(my_dataset, '.', idx_type, order, hzero,error, lapl_id=H5P_DEFAULT_F)
+              CALL verify("H5Adelete_by_idx_f",error,minusone,total_error)
+
+              !     Create attributes, up to limit of compact form
+              DO u = 0, max_compact - 1
+                 !  Create attribute
+                 WRITE(chr2,'(I2.2)') u
+                 attrname = 'attr '//chr2
+
+                 CALL h5acreate_f(my_dataset, attrname, H5T_NATIVE_INTEGER, sid, attr, error, H5P_DEFAULT_F, H5P_DEFAULT_F)
+                 CALL check("h5acreate_f",error,total_error)
+
+                 !  Write data into the attribute
+                 attr_integer_data(1) = u
+                 data_dims(1) = 1
+                 CALL h5awrite_f(attr, H5T_NATIVE_INTEGER, attr_integer_data, data_dims, error)
+                 CALL check("h5awrite_f",error,total_error)
+
+                 !  Close attribute
+                 CALL h5aclose_f(attr, error)
+                 CALL check("h5aclose_f",error,total_error)
+
+                 !  Verify information for new attribute
+                 CALL attr_info_by_idx_check(my_dataset, attrname, INT(u,HSIZE_T), use_index(i), total_error )
+
+              ENDDO
+
+              ! Check for out of bound deletions
+              CALL H5Adelete_by_idx_f(my_dataset, ".", idx_type, order, INT(u,HSIZE_T), error, lapl_id=H5P_DEFAULT_F)
+              CALL verify("H5Adelete_by_idx_f",error,minusone,total_error)
+
+           ENDDO
+
+
+           DO curr_dset = 0, NUM_DSETS-1
+              SELECT CASE (curr_dset)
+              CASE (0)
+                 my_dataset = dset1
+              CASE (1)
+                 my_dataset = dset2
+              CASE (2)
+                 my_dataset = dset3
+                 !     CASE DEFAULT
+                 !        CALL HDassert(0.AND."Toomanydatasets!")
+              END SELECT
+
+              !  Delete attributes from compact storage
+
+              DO u = 0, max_compact - 2
+
+                 !  Delete first attribute in appropriate order
+
+
+!EP                 CALL H5Adelete_by_idx_f(my_dataset, ".", idx_type, order, 0_HSIZE_T, error)
+                 CALL H5Adelete_by_idx_f(my_dataset, ".", idx_type, order, hzero, error)
+                 CALL check("H5Adelete_by_idx_f",error,total_error)
+
+
+                 !  Verify the attribute information for first attribute in appropriate order
+                 ! HDmemset(&ainfo, 0, sizeof(ainfo));
+
+!EP                 CALL h5aget_info_by_idx_f(my_dataset, ".", idx_type, order, 0_HSIZE_T, &
+                 CALL h5aget_info_by_idx_f(my_dataset, ".", idx_type, order, hzero, &
+                      f_corder_valid, corder, cset, data_size, error)
+
+                 IF(new_format)THEN
+                    IF(order.EQ.H5_ITER_INC_F)THEN
+                       CALL verify("H5Aget_info_by_idx_f",corder,u + 1,total_error)
+                    ENDIF
+                 ELSE
+                    CALL verify("H5Aget_info_by_idx_f",corder, max_compact-(u + 2),total_error)
+                 ENDIF
+
+                   !  Verify the name for first attribute in appropriate order
+
+                 size = 7 ! *CHECK* IF NOT THE SAME SIZE
+                 CALL h5aget_name_by_idx_f(my_dataset, ".", idx_type, order,INT(0,hsize_t), &
+                      tmpname, error, lapl_id=H5P_DEFAULT_F, size=size)
+                 CALL check('h5aget_name_by_idx_f',error,total_error)
+                 IF(order .EQ. H5_ITER_INC_F)THEN
+                    WRITE(chr2,'(I2.2)') u + 1
+                    attrname = 'attr '//chr2
+                 ELSE
+                    WRITE(chr2,'(I2.2)') max_compact - (u + 2)
+                    attrname = 'attr '//chr2
+                 ENDIF
+                 IF(TRIM(attrname).NE.TRIM(tmpname)) error = -1
+                 CALL verify("h5aget_name_by_idx_f",error,0,total_error)
+              ENDDO
+
+              !  Delete last attribute
+
+!EP              CALL H5Adelete_by_idx_f(my_dataset, ".", idx_type, order, 0_HSIZE_T, error)
+              CALL H5Adelete_by_idx_f(my_dataset, ".", idx_type, order, hzero, error)
+              CALL check("H5Adelete_by_idx_f",error,total_error)
+
+           ENDDO
+
+!    Work on all the datasets
+
+           DO curr_dset = 0,NUM_DSETS-1
+              SELECT CASE (curr_dset)
+              CASE (0)
+                 my_dataset = dset1
+              CASE (1)
+                 my_dataset = dset2
+              CASE (2)
+                 my_dataset = dset3
+                 !     CASE DEFAULT
+                 !        CALL HDassert(0.AND."Toomanydatasets!")
+              END SELECT
+
+              !  Create more attributes, to push into dense form
+
+              DO u = 0, (max_compact * 2) - 1
+
+                 !  Create attribute
+                 WRITE(chr2,'(I2.2)') u
+                 attrname = 'attr '//chr2
+
+                 CALL h5acreate_f(my_dataset, attrname, H5T_NATIVE_INTEGER, sid, attr, error, H5P_DEFAULT_F, H5P_DEFAULT_F)
+                 CALL check("h5acreate_f",error,total_error)
+
+
+                 !  Write data into the attribute
+                 attr_integer_data(1) = u
+                 data_dims(1) = 1
+                 CALL h5awrite_f(attr, H5T_NATIVE_INTEGER, attr_integer_data, data_dims, error)
+                 CALL check("h5awrite_f",error,total_error)
+
+                 !  Close attribute
+                 CALL h5aclose_f(attr, error)
+                 CALL check("h5aclose_f",error,total_error)
+
+
+              ENDDO
+              !  Check for out of bound deletion
+              CALL H5Adelete_by_idx_f(my_dataset, ".", idx_type, order, INT(u,HSIZE_T), error)
+              CALL verify("H5Adelete_by_idx_f",error,minusone,total_error)
+           ENDDO
+
+           !  Work on all the datasets
+
+           DO curr_dset = 0,NUM_DSETS-1
+              SELECT CASE (curr_dset)
+              CASE (0)
+                 my_dataset = dset1
+              CASE (1)
+                 my_dataset = dset2
+              CASE (2)
+                 my_dataset = dset3
+              END SELECT
+
+              !  Delete attributes from dense storage
+
+              DO u = 0, (max_compact * 2) - 1 - 1
+
+                 !  Delete first attribute in appropriate order
+
+                 CALL H5Adelete_by_idx_f(my_dataset, ".", idx_type, order, INT(0,HSIZE_T), error)
+                 CALL check("H5Adelete_by_idx_f",error,total_error)
+                 !  Verify the attribute information for first attribute in appropriate order
+
+                 CALL h5aget_info_by_idx_f(my_dataset, ".", idx_type, order, INT(0,HSIZE_T), &
+                      f_corder_valid, corder, cset, data_size, error)
+                 IF(new_format)THEN
+                    IF(order.EQ.H5_ITER_INC_F)THEN
+                       CALL verify("H5Aget_info_by_idx_f",corder,u + 1,total_error)
+                    ENDIF
+                 ELSE
+                    CALL verify("H5Aget_info_by_idx_f",corder, ((max_compact * 2) - (u + 2)), total_error)
+                 ENDIF
+
+                 !  Verify the name for first attribute in appropriate order
+                 ! HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE);
+
+                 size = 7 ! *CHECK* if not the correct size
+                 CALL h5aget_name_by_idx_f(my_dataset, ".", idx_type, order,INT(0,hsize_t), &
+                      tmpname, error, size)
+
+                 IF(order .EQ. H5_ITER_INC_F)THEN
+                    WRITE(chr2,'(I2.2)') u + 1
+                    attrname = 'attr '//chr2
+                 ELSE
+                    WRITE(chr2,'(I2.2)') max_compact * 2 - (u + 2)
+                    attrname = 'attr '//chr2
+                 ENDIF
+                 IF(TRIM(attrname).NE.TRIM(tmpname)) error = -1
+                 CALL verify("h5aget_name_by_idx_f",error,0,total_error)
+
+
+              ENDDO
+              !  Delete last attribute
+
+              CALL H5Adelete_by_idx_f(my_dataset, ".", idx_type, order, INT(0,HSIZE_T), error, lapl_id=H5P_DEFAULT_F)
+              CALL check("H5Adelete_by_idx_f",error,total_error)
+
+              ! Check for deletion on empty attribute storage again
+              CALL H5Adelete_by_idx_f(my_dataset, ".", idx_type, order, INT(0,HSIZE_T), error)
+              CALL verify("H5Adelete_by_idx_f",error,minusone,total_error)
+           ENDDO
+
+           !   Close Datasets
+           CALL h5dclose_f(dset1, error)
+           CALL check("h5dclose_f",error,total_error)
+           CALL h5dclose_f(dset2, error)
+           CALL check("h5dclose_f",error,total_error)
+           CALL h5dclose_f(dset3, error)
+           CALL check("h5dclose_f",error,total_error)
+
+           !    Close file
+           CALL h5fclose_f(fid, error)
+           CALL check("h5fclose_f",error,total_error)
+        ENDDO
+     ENDDO
+  ENDDO
+
+  !  Close property list
+  CALL h5pclose_f(dcpl,error)
+  CALL check("h5pclose_f", error, total_error)
+
+  !  Close dataspace
+  CALL h5sclose_f(sid, error)
+  CALL check("h5sclose_f",error,total_error)
+
+END SUBROUTINE test_attr_delete_by_idx
+
+SUBROUTINE test_attr_shared_delete(fcpl, fapl, total_error)
+
+!***************************************************************
+!**
+!**  test_attr_shared_delete(): Test basic H5A (attribute) code.
+!**      Tests deleting shared attributes in "compact" & "dense" storage
+!**
+!***************************************************************
+
+  IMPLICIT NONE
+
+  INTEGER(HID_T), INTENT(IN) :: fcpl
+  INTEGER(HID_T), INTENT(IN) :: fapl
+  INTEGER, INTENT(INOUT) :: total_error
+  CHARACTER(LEN=8) :: FileName = "tattr.h5"
+  INTEGER(HID_T) :: fid
+  INTEGER(HID_T) :: dcpl
+  INTEGER(HID_T) :: sid, big_sid
+
+  CHARACTER(LEN=8) :: DSET1_NAME = "Dataset1"
+  CHARACTER(LEN=8) :: DSET2_NAME = "Dataset2"
+
+
+  INTEGER(HID_T) :: dataset, dataset2
+
+  INTEGER :: error
+
+  INTEGER(HID_T) :: attr        !String Attribute identifier
+  INTEGER(HID_T) :: attr_tid
+  INTEGER(HSIZE_T), DIMENSION(7) :: data_dims
+
+
+  INTEGER :: max_compact ! Maximum # of links to store in group compactly
+  INTEGER :: min_dense   ! Minimum # of links to store in group "densely"
+
+  CHARACTER(LEN=2) :: chr2
+
+  INTEGER, DIMENSION(1) ::  attr_integer_data
+  CHARACTER(LEN=7) :: attrname
+
+  INTEGER :: u
+  INTEGER(HID_T) :: my_fcpl
+
+  CHARACTER(LEN=5), PARAMETER :: TYPE1_NAME = "/Type"
+
+  INTEGER :: test_shared
+  INTEGER(HSIZE_T), DIMENSION(1) :: adims2 = (/1/) ! Attribute dimension
+  INTEGER     ::   arank = 1                      ! Attribute rank
+
+  !  Output message about test being performed
+
+  !  Initialize "big" attribute DATA
+  !     Create dataspace for dataset
+  CALL h5screate_f(H5S_SCALAR_F, sid, error)
+  CALL check("h5screate_f",error,total_error)
+
+  ! Create "big" dataspace for "large" attributes
+
+  CALL h5screate_simple_f(arank, adims2, big_sid, error)
+  CALL check("h5screate_simple_f",error,total_error)
+
+  !  Loop over type of shared components
+
+  DO test_shared = 0, 2
+
+     !  Make copy of file creation property list
+
+     CALL H5Pcopy_f(fcpl, my_fcpl, error)
+     CALL check("H5Pcopy",error,total_error)
+
+     !  Set up datatype for attributes
+
+     CALL H5Tcopy_f(H5T_NATIVE_INTEGER, attr_tid, error)
+     CALL check("H5Tcopy",error,total_error)
+
+     !  Special setup for each type of shared components
+     IF( test_shared .EQ. 0) THEN
+        !  Make attributes > 500 bytes shared
+        CALL H5Pset_shared_mesg_nindexes_f(my_fcpl,1,error)
+        CALL check("H5Pset_shared_mesg_nindexes_f",error, total_error)
+        CALL H5Pset_shared_mesg_index_f(my_fcpl, 0, H5O_SHMESG_ATTR_FLAG_F, 500,error)
+        CALL check(" H5Pset_shared_mesg_index_f",error, total_error)
+
+     ELSE
+        !  Set up copy of file creation property list
+        CALL H5Pset_shared_mesg_nindexes_f(my_fcpl,3,error)
+        !  Make attributes > 500 bytes shared
+        CALL H5Pset_shared_mesg_index_f(my_fcpl, 0, H5O_SHMESG_ATTR_FLAG_F, 500,error)
+        !  Make datatypes & dataspaces > 1 byte shared (i.e. all of them :-)
+        CALL H5Pset_shared_mesg_index_f(my_fcpl, 1, H5O_SHMESG_DTYPE_FLAG_F, 1,error)
+        CALL H5Pset_shared_mesg_index_f(my_fcpl, 2,  H5O_SHMESG_SDSPACE_FLAG_F, 1,error)
+     ENDIF
+
+     !  Create file
+     CALL h5fcreate_f(FileName, H5F_ACC_TRUNC_F, fid, error, my_fcpl, fapl)
+     CALL check("h5fcreate_f",error,total_error)
+
+     !  Close FCPL copy
+     CALL h5pclose_f(my_fcpl, error)
+     CALL check("h5pclose_f", error, total_error)
+     !  Close file
+     CALL h5fclose_f(fid, error)
+     CALL check("h5fclose_f",error,total_error)
+
+     !  Re-open file
+     CALL h5fopen_f(FileName, H5F_ACC_RDWR_F, fid, error,fapl)
+     CALL check("h5fopen_f",error,total_error)
+
+     !  Commit datatype to file
+
+     IF(test_shared.EQ.2) THEN
+        CALL H5Tcommit_f(fid, TYPE1_NAME, attr_tid, error, H5P_DEFAULT_F, H5P_DEFAULT_F, H5P_DEFAULT_F)
+        CALL check("H5Tcommit",error,total_error)
+     ENDIF
+
+     !  Set up to query the object creation properties
+     CALL H5Pcreate_f(H5P_DATASET_CREATE_F,dcpl,error)
+     CALL check("h5Pcreate_f",error,total_error)
+
+     !  Create datasets
+
+     CALL h5dcreate_f(fid, DSET1_NAME, H5T_NATIVE_CHARACTER, sid, dataset, error, dcpl_id=dcpl )
+     CALL check("h5dcreate_f",error,total_error)
+
+     CALL h5dcreate_f(fid, DSET2_NAME, H5T_NATIVE_CHARACTER, sid, dataset2, error, dcpl_id=dcpl )
+     CALL check("h5dcreate_f",error,total_error)
+
+     !  Retrieve limits for compact/dense attribute storage
+     CALL H5Pget_attr_phase_change_f(dcpl, max_compact, min_dense, error)
+     CALL check("H5Pget_attr_phase_change_f",error,total_error)
+
+     !  Close property list
+     CALL h5pclose_f(dcpl,error)
+     CALL check("h5pclose_f", error, total_error)
+
+     !  Add attributes to each dataset, until after converting to dense storage
+
+     DO u = 0, (max_compact * 2) - 1
+
+        !  Create attribute name
+        WRITE(chr2,'(I2.2)') u
+        attrname = 'attr '//chr2
+
+        !  Alternate between creating "small" & "big" attributes
+
+        IF(MOD(u+1,2).EQ.0)THEN
+           !  Create "small" attribute on first dataset
+
+           CALL h5acreate_f(dataset, attrname, attr_tid, sid, attr, error, H5P_DEFAULT_F, H5P_DEFAULT_F)
+           CALL check("h5acreate_f",error,total_error)
+
+           !  Write data into the attribute
+           attr_integer_data(1) = u + 1
+           data_dims(1) = 1
+           CALL h5awrite_f(attr, attr_tid, attr_integer_data, data_dims, error)
+           CALL check("h5awrite_f",error,total_error)
+        ELSE
+           !  Create "big" attribute on first dataset
+
+           CALL h5acreate_f(dataset, attrname, attr_tid, big_sid, attr, error)
+           CALL check("h5acreate_f",error,total_error)
+
+           !  Write data into the attribute
+
+           attr_integer_data(1) = u + 1
+           data_dims(1) = 1
+           CALL h5awrite_f(attr,  attr_tid, attr_integer_data, data_dims, error)
+           CALL check("h5awrite_f",error,total_error)
+
+        ENDIF
+
+        !  Close attribute
+        CALL h5aclose_f(attr, error)
+        CALL check("h5aclose_f",error,total_error)
+
+        !  Alternate between creating "small" & "big" attributes
+        IF(MOD(u+1,2).EQ.0)THEN
+
+           !   Create "small" attribute on second dataset
+
+           CALL h5acreate_f(dataset2, attrname, attr_tid, sid, attr, error)
+           CALL check("h5acreate_f",error,total_error)
+
+           !  Write data into the attribute
+           attr_integer_data(1) = u + 1
+           data_dims(1) = 1
+           CALL h5awrite_f(attr, attr_tid, attr_integer_data, data_dims, error)
+           CALL check("h5awrite_f",error,total_error)
+        ELSE
+
+           !  Create "big" attribute on second dataset
+
+           CALL h5acreate_f(dataset2, attrname, attr_tid, big_sid, attr, error, acpl_id=H5P_DEFAULT_F, aapl_id=H5P_DEFAULT_F)
+           CALL check("h5acreate_f",error,total_error)
+
+!  Write data into the attribute
+
+
+           attr_integer_data(1) = u + 1
+           data_dims(1) = 1
+           CALL h5awrite_f(attr,  attr_tid, attr_integer_data, data_dims, error)
+           CALL check("h5awrite_f",error,total_error)
+
+        ENDIF
+        !  Close attribute
+        CALL h5aclose_f(attr, error)
+        CALL check("h5aclose_f",error,total_error)
+
+     ENDDO
+
+     !  Delete attributes from second dataset
+
+     DO u = 0, max_compact*2-1
+
+        !  Create attribute name
+        WRITE(chr2,'(I2.2)') u
+        attrname = 'attr '//chr2
+
+        !  Delete second dataset's attribute
+        CALL H5Adelete_by_name_f(fid, DSET2_NAME, attrname,error,lapl_id=H5P_DEFAULT_F)
+        CALL check("H5Adelete_by_name", error, total_error)
+
+        CALL h5aopen_f(dataset, attrname, attr, error, aapl_id=H5P_DEFAULT_F)
+        CALL check("h5aopen_f",error,total_error)
+
+
+        !  Close attribute
+        CALL h5aclose_f(attr, error)
+        CALL check("h5aclose_f",error,total_error)
+     ENDDO
+
+     !  Close attribute's datatype
+
+     CALL h5tclose_f(attr_tid, error)
+     CALL check("h5tclose_f",error,total_error)
+
+     !  Close Datasets
+
+     CALL h5dclose_f(dataset, error)
+     CALL check("h5dclose_f",error,total_error)
+     CALL h5dclose_f(dataset2, error)
+     CALL check("h5dclose_f",error,total_error)
+
+     !  Unlink datasets WITH attributes
+
+     CALL h5ldelete_f(fid, DSET1_NAME, error, H5P_DEFAULT_F)
+     CALL check("H5Ldelete_f", error, total_error)
+     CALL h5ldelete_f(fid, DSET2_NAME, error)
+     CALL check("H5Ldelete_f", error, total_error)
+
+     !  Unlink committed datatype
+
+     IF( test_shared == 2) THEN
+        CALL h5ldelete_f(fid, TYPE1_NAME, error)
+        CALL check("H5Ldelete_f", error, total_error)
+     ENDIF
+
+
+     !  Close file
+     CALL h5fclose_f(fid, error)
+     CALL check("h5fclose_f",error,total_error)
+
+  ENDDO
+
+  !  Close dataspaces
+  CALL h5sclose_f(sid, error)
+  CALL check("h5sclose_f",error,total_error)
+  CALL h5sclose_f(big_sid, error)
+  CALL check("h5sclose_f",error,total_error)
+
+END SUBROUTINE test_attr_shared_delete
+
+
+
+SUBROUTINE test_attr_dense_open( fcpl, fapl, total_error)
+
+!***************************************************************
+!**
+!**  test_attr_dense_open(): Test basic H5A (attribute) code.
+!**      Tests opening attributes in "dense" storage
+!**
+!***************************************************************
+
+  IMPLICIT NONE
+
+  INTEGER(HID_T), INTENT(IN) :: fcpl
+  INTEGER(HID_T), INTENT(IN) :: fapl
+  INTEGER, INTENT(INOUT) :: total_error
+  CHARACTER(LEN=8) :: FileName = "tattr.h5"
+  INTEGER(HID_T) :: fid
+  INTEGER(HID_T) :: dcpl
+  INTEGER(HID_T) :: sid
+
+  CHARACTER(LEN=8) :: DSET1_NAME = "Dataset1"
+
+  INTEGER :: error
+  INTEGER(HID_T) :: attr        !String Attribute identifier
+  INTEGER(HSIZE_T), DIMENSION(7) :: data_dims
+
+
+  INTEGER :: max_compact ! Maximum # of links to store in group compactly
+  INTEGER :: min_dense   ! Minimum # of links to store in group "densely"
+
+  CHARACTER(LEN=2) :: chr2
+
+
+  CHARACTER(LEN=7) :: attrname
+
+  INTEGER(HID_T) :: dataset
+  INTEGER :: u
+
+  data_dims = 0
+
+
+  !  Create file
+
+  CALL h5fcreate_f(FileName, H5F_ACC_TRUNC_F, fid, error, fcpl, fapl)
+  CALL check("h5fcreate_f",error,total_error)
+
+  !  Close file
+  CALL h5fclose_f(fid, error)
+  CALL check("h5fclose_f",error,total_error)
+
+
+
+  !  Re-open file
+  CALL h5fopen_f(FileName, H5F_ACC_RDWR_F, fid, error, fapl)
+  CALL check("h5fopen_f",error,total_error)
+
+  !  Create dataspace for dataset
+  CALL h5screate_f(H5S_SCALAR_F, sid, error)
+  CALL check("h5screate_f",error,total_error)
+
+  !  Query the group creation properties
+  CALL H5Pcreate_f(H5P_DATASET_CREATE_F,dcpl,error)
+  CALL check("h5Pcreate_f",error,total_error)
+
+  !  Enable creation order tracking on attributes, so creation order tests work
+  CALL H5Pset_attr_creation_order_f(dcpl, H5P_CRT_ORDER_TRACKED_F, error)
+  CALL check("H5Pset_attr_creation_order",error,total_error)
+
+  !  Create a dataset
+
+  CALL h5dcreate_f(fid, DSET1_NAME, H5T_NATIVE_CHARACTER, sid, dataset, error, &
+       lcpl_id=H5P_DEFAULT_F, dcpl_id=dcpl, dapl_id=H5P_DEFAULT_F)
+  CALL check("h5dcreate_f",error,total_error)
+
+  !  Retrieve limits for compact/dense attribute storage
+  CALL H5Pget_attr_phase_change_f(dcpl, max_compact, min_dense, error)
+  CALL check("H5Pget_attr_phase_change_f",error,total_error)
+
+  !  Close property list
+  CALL h5pclose_f(dcpl, error)
+  CALL check("h5pclose_f",error,total_error)
+
+  !  Add attributes, until just before converting to dense storage
+
+  DO u = 0, max_compact - 1
+     !  Create attribute
+     WRITE(chr2,'(I2.2)') u
+     attrname = 'attr '//chr2
+
+     CALL h5acreate_f(dataset, attrname, H5T_NATIVE_INTEGER, sid, attr, error, aapl_id=H5P_DEFAULT_F)
+     CALL check("h5acreate_f",error,total_error)
+
+     !  Write data into the attribute
+
+     data_dims(1) = 1
+     CALL h5awrite_f(attr, H5T_NATIVE_INTEGER, u, data_dims, error)
+     CALL check("h5awrite_f",error,total_error)
+
+     !  Close attribute
+     CALL h5aclose_f(attr, error)
+     CALL check("h5aclose_f",error,total_error)
+
+     !  Verify attributes written so far
+     CALL test_attr_dense_verify(dataset, u, total_error)
+  ENDDO
+!
+!     Add one more attribute, to push into "dense" storage
+!     Create attribute
+
+  WRITE(chr2,'(I2.2)') u
+  attrname = 'attr '//chr2
+
+  CALL h5acreate_f(dataset, attrname, H5T_NATIVE_INTEGER, sid, attr, error, aapl_id=H5P_DEFAULT_F)
+  CALL check("h5acreate_f",error,total_error)
+
+  !  Write data into the attribute
+  data_dims(1) = 1
+  CALL h5awrite_f(attr, H5T_NATIVE_INTEGER, u, data_dims, error)
+  CALL check("h5awrite_f",error,total_error)
+
+  !  Close attribute
+  CALL h5aclose_f(attr, error)
+  CALL check("h5aclose_f",error,total_error)
+
+  !  Close dataspace
+  CALL h5sclose_f(sid, error)
+  CALL check("h5sclose_f",error,total_error)
+
+  !  Verify all the attributes written
+  !  ret = test_attr_dense_verify(dataset, (u + 1));
+  !  CHECK(ret, FAIL, "test_attr_dense_verify");
+
+  !  CLOSE Dataset
+  CALL h5dclose_f(dataset, error)
+  CALL check("h5dclose_f",error,total_error)
+
+  !  Unlink dataset with attributes
+  CALL h5ldelete_f(fid, DSET1_NAME, error, H5P_DEFAULT_F)
+  CALL check("H5Ldelete_f", error, total_error)
+
+  !  Close file
+  CALL h5fclose_f(fid, error)
+  CALL check("h5fclose_f",error,total_error)
+
+  !  Check size of file
+  !  filesize = h5_get_file_size(FILENAME);
+  !  verify(filesize, empty_filesize, "h5_get_file_size")
+
+END SUBROUTINE test_attr_dense_open
+
+!***************************************************************
+!**
+!**  test_attr_dense_verify(): Test basic H5A (attribute) code.
+!**      Verify attributes on object
+!**
+!***************************************************************
+
+SUBROUTINE test_attr_dense_verify(loc_id, max_attr, total_error)
+
+  IMPLICIT NONE
+
+  INTEGER(HID_T), INTENT(IN) :: loc_id
+  INTEGER, INTENT(IN) :: max_attr
+  INTEGER, INTENT(INOUT) :: total_error
+
+  INTEGER(SIZE_T), PARAMETER :: ATTR_NAME_LEN = 8 ! FIX, why if 7 does not work?
+
+  INTEGER :: u
+  CHARACTER(LEN=2) :: chr2
+  CHARACTER(LEN=ATTR_NAME_LEN) :: attrname
+  CHARACTER(LEN=ATTR_NAME_LEN) :: check_name
+  INTEGER(HSIZE_T), DIMENSION(7) :: data_dims
+
+  INTEGER(HID_T) :: attr        !String Attribute identifier
+  INTEGER :: error
+  INTEGER :: value
+
+  data_dims = 0
+
+
+    !  Retrieve the current # of reported errors
+    ! old_nerrs = GetTestNumErrs();
+
+    !  Re-open all the attributes by name and verify the data
+
+  DO u = 0, max_attr -1
+
+     !  Open attribute
+     WRITE(chr2,'(I2.2)') u
+     attrname = 'attr '//chr2
+
+     CALL h5aopen_f(loc_id, attrname, attr, error)
+     CALL check("h5aopen_f",error,total_error)
+
+     !  Read data from the attribute
+
+!     value = 103
+     data_dims(1) = 1
+     CALL h5aread_f(attr, H5T_NATIVE_INTEGER, value, data_dims, error)
+
+     CALL CHECK("H5Aread_F", error, total_error)
+     CALL verify("H5Aread_F", value, u, total_error)
+
+     !  Close attribute
+     CALL h5aclose_f(attr, error)
+     CALL check("h5aclose_f",error,total_error)
+  ENDDO
+
+  !  Re-open all the attributes by index and verify the data
+
+  DO u=0, max_attr-1
+
+
+     !  Open attribute
+
+     CALL H5Aopen_by_idx_f(loc_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_INC_F, INT(u,HSIZE_T), &
+          attr, error, aapl_id=H5P_DEFAULT_F)
+
+     !  Verify Name
+
+     WRITE(chr2,'(I2.2)') u
+     attrname = 'attr '//chr2
+
+     CALL H5Aget_name_f(attr, ATTR_NAME_LEN, check_name, error)
+     CALL check('H5Aget_name',error,total_error)
+     IF(check_name.NE.attrname) THEN
+        WRITE(*,*) 'ERROR: attribute name different: attr_name = ',check_name, ', should be ', attrname
+        total_error = total_error + 1
+     ENDIF
+     !  Read data from the attribute
+     data_dims(1) = 1
+     CALL h5aread_f(attr, H5T_NATIVE_INTEGER, value, data_dims, error)
+     CALL CHECK("H5Aread_f", error, total_error)
+     CALL verify("H5Aread_f", value, u, total_error)
+
+
+     !  Close attribute
+     CALL h5aclose_f(attr, error)
+     CALL check("h5aclose_f",error,total_error)
+  ENDDO
+
+END SUBROUTINE test_attr_dense_verify
+
+!***************************************************************
+!**
+!**  test_attr_corder_create_empty(): Test basic H5A (attribute) code.
+!**      Tests basic code to create objects with attribute creation order info
+!**
+!***************************************************************
+
+SUBROUTINE test_attr_corder_create_basic( fcpl, fapl, total_error )
+
+  IMPLICIT NONE
+
+  INTEGER(HID_T), INTENT(IN) :: fcpl
+  INTEGER(HID_T), INTENT(IN) :: fapl
+  INTEGER, INTENT(INOUT) :: total_error
+  CHARACTER(LEN=8) :: FileName = "tattr.h5"
+  INTEGER(HID_T) :: fid
+  INTEGER(HID_T) :: dcpl
+  INTEGER(HID_T) :: sid
+
+  CHARACTER(LEN=8) :: DSET1_NAME = "Dataset1"
+
+  INTEGER(HID_T) :: dataset
+
+  INTEGER :: error
+
+  INTEGER :: crt_order_flags
+  INTEGER, PARAMETER :: minusone = -1
+
+  !  Output message about test being performed
+!  WRITE(*,*) "     - Testing Basic Code for Attributes with Creation Order Info"
+
+  !  Create file
+  CALL h5fcreate_f(FileName, H5F_ACC_TRUNC_F, fid, error, fcpl, fapl)
+  CALL check("h5fcreate_f",error,total_error)
+
+  !  Create dataset creation property list
+  CALL H5Pcreate_f(H5P_DATASET_CREATE_F,dcpl,error)
+  CALL check("h5Pcreate_f",error,total_error)
+
+  !  Get creation order indexing on object
+  CALL H5Pget_attr_creation_order_f(dcpl, crt_order_flags, error)
+  CALL check("H5Pget_attr_creation_order_f",error,total_error)
+  CALL verify("H5Pget_attr_creation_order_f",crt_order_flags , 0, total_error)
+
+  !  Setting invalid combination of a attribute order creation order indexing on should fail
+  CALL H5Pset_attr_creation_order_f(dcpl, H5P_CRT_ORDER_INDEXED_F, error)
+  CALL verify("H5Pset_attr_creation_order_f",error , minusone, total_error)
+  CALL H5Pget_attr_creation_order_f(dcpl, crt_order_flags, error)
+  CALL check("H5Pget_attr_creation_order_f",error,total_error)
+  CALL verify("H5Pget_attr_creation_order_f",crt_order_flags , 0, total_error)
+
+  !  Set attribute creation order tracking & indexing for object
+  CALL h5pset_attr_creation_order_f(dcpl, IOR(H5P_CRT_ORDER_TRACKED_F, H5P_CRT_ORDER_INDEXED_F), error)
+  CALL check("H5Pset_attr_creation_order_f",error,total_error)
+
+  CALL H5Pget_attr_creation_order_f(dcpl, crt_order_flags, error)
+  CALL check("H5Pget_attr_creation_order_f",error,total_error)
+  CALL verify("H5Pget_attr_creation_order_f",crt_order_flags , &
+       IOR(H5P_CRT_ORDER_TRACKED_F, H5P_CRT_ORDER_INDEXED_F), total_error)
+
+  !  Create dataspace for dataset
+  CALL h5screate_f(H5S_SCALAR_F, sid, error)
+  CALL check("h5screate_f",error,total_error)
+
+  !  Create a dataset
+  CALL h5dcreate_f(fid, DSET1_NAME, H5T_NATIVE_CHARACTER, sid, dataset, error, &
+       lcpl_id=H5P_DEFAULT_F, dapl_id=H5P_DEFAULT_F, dcpl_id=dcpl)
+  CALL check("h5dcreate_f",error,total_error)
+
+  !  Close dataspace
+  CALL h5sclose_f(sid, error)
+  CALL check("h5sclose_f",error,total_error)
+
+
+  !  Close Dataset
+  CALL h5dclose_f(dataset, error)
+  CALL check("h5dclose_f",error,total_error)
+
+  !  Close property list
+  CALL h5pclose_f(dcpl, error)
+  CALL check("h5pclose_f",error,total_error)
+
+  !  Close file
+  CALL h5fclose_f(fid, error)
+  CALL check("h5fclose_f",error,total_error)
+
+  !  Re-open file
+  CALL h5fopen_f(FileName, H5F_ACC_RDWR_F, fid, error, fapl)
+  CALL check("h5fopen_f",error,total_error)
+
+  !  Open dataset created
+  CALL h5dopen_f(fid, DSET1_NAME, dataset, error, H5P_DEFAULT_F )
+  CALL check("h5dopen_f",error,total_error)
+
+
+  !  Retrieve dataset creation property list for group
+  CALL H5Dget_create_plist_f(dataset, dcpl, error)
+  CALL check("H5Dget_create_plist_f",error,total_error)
+
+  !  Query the attribute creation properties
+  CALL H5Pget_attr_creation_order_f(dcpl, crt_order_flags, error)
+  CALL check("H5Pget_attr_creation_order_f",error,total_error)
+  CALL verify("H5Pget_attr_creation_order_f",crt_order_flags , &
+       IOR(H5P_CRT_ORDER_TRACKED_F, H5P_CRT_ORDER_INDEXED_F), total_error )
+
+  !  Close property list
+  CALL h5pclose_f(dcpl, error)
+  CALL check("h5pclose_f",error,total_error)
+
+  !  Close Dataset
+  CALL h5dclose_f(dataset, error)
+  CALL check("h5dclose_f",error,total_error)
+
+  !  Close file
+  CALL h5fclose_f(fid, error)
+  CALL check("h5fclose_f",error,total_error)
+
+
+END SUBROUTINE test_attr_corder_create_basic
+
+!***************************************************************
+!**
+!**  test_attr_basic_write(): Test basic H5A (attribute) code.
+!**      Tests integer attributes on both datasets and groups
+!**
+!***************************************************************
+
+SUBROUTINE test_attr_basic_write(fapl, total_error)
+
+  IMPLICIT NONE
+
+  INTEGER(HID_T), INTENT(IN) :: fapl
+  INTEGER, INTENT(INOUT) :: total_error
+  CHARACTER(LEN=8) :: FileName = "tattr.h5"
+  INTEGER(HID_T) :: fid1
+  INTEGER(HID_T) :: sid1, sid2
+
+  CHARACTER(LEN=8) :: DSET1_NAME = "Dataset1"
+
+  INTEGER(HID_T) :: dataset
+  INTEGER :: i
+  INTEGER :: error
+
+  INTEGER(HID_T) :: attr,attr2        !String Attribute identifier
+  INTEGER(HID_T) :: group
+
+  CHARACTER(LEN=25) :: check_name
+  CHARACTER(LEN=18) :: chr_exact_size
+
+  CHARACTER(LEN=5), PARAMETER ::  ATTR1_NAME="Attr1"
+  INTEGER, PARAMETER :: ATTR1_RANK = 1
+  INTEGER, PARAMETER ::  ATTR1_DIM1 = 3
+  CHARACTER(LEN=7), PARAMETER :: ATTR1A_NAME ="Attr1_a"
+  CHARACTER(LEN=18), PARAMETER :: ATTR_TMP_NAME = "Attr1_a-1234567890"
+  INTEGER, DIMENSION(ATTR1_DIM1) :: attr_data1
+  INTEGER, DIMENSION(ATTR1_DIM1) :: attr_data1a
+  INTEGER, DIMENSION(ATTR1_DIM1) :: read_data1
+  INTEGER(HSIZE_T) :: attr_size   ! attributes storage requirements .MSB.
+  INTEGER(HSIZE_T), DIMENSION(1) :: dimsa = (/3/) ! Dataset dimensions
+
+  INTEGER     ::   rank1 = 2               ! Dataspace1 rank
+  INTEGER(HSIZE_T), DIMENSION(2) :: dims1 = (/4,6/) ! Dataset dimensions
+  INTEGER(HSIZE_T), DIMENSION(2) :: maxdims1 = (/4,6/) ! maximum dimensions
+
+  INTEGER(SIZE_T) :: size
+
+!! Initialize attribute data
+  attr_data1(1) = 258
+  attr_data1(2) = 9987
+  attr_data1(3) = -99890
+
+  attr_data1a(1) = 258
+  attr_data1a(2) = 1087
+  attr_data1a(3) = -99890
+
+
+  !  Create file
+  CALL h5fcreate_f(FileName, H5F_ACC_TRUNC_F, fid1, error, H5P_DEFAULT_F, fapl)
+  CALL check("h5fcreate_f",error,total_error)
+
+  !  Create dataspace for dataset
+  CALL h5screate_simple_f(rank1, dims1, sid1, error, maxdims1)
+  CALL check("h5screate_simple_f",error,total_error)
+
+  !  Create a dataset
+  CALL h5dcreate_f(fid1, DSET1_NAME, H5T_NATIVE_CHARACTER, sid1, dataset, error, H5P_DEFAULT_F, H5P_DEFAULT_F, H5P_DEFAULT_F )
+  CALL check("h5dcreate_f",error,total_error)
+
+  !  Create dataspace for attribute
+  CALL h5screate_simple_f(ATTR1_RANK, dimsa, sid2, error)
+  CALL check("h5screate_simple_f",error,total_error)
+
+  !  Try to create an attribute on the file (should create an attribute on root group)
+  CALL h5acreate_f(fid1, ATTR1_NAME, H5T_NATIVE_INTEGER, sid2, attr, error, aapl_id=H5P_DEFAULT_F, acpl_id=H5P_DEFAULT_F)
+  CALL check("h5acreate_f",error,total_error)
+
+  !   Close attribute
+  CALL h5aclose_f(attr, error)
+  CALL check("h5aclose_f",error,total_error)
+
+  !  Open the root group
+  CALL H5Gopen_f(fid1, "/", group, error, H5P_DEFAULT_F)
+  CALL check("H5Gopen_f",error,total_error)
+
+  !  Open attribute again
+  CALL h5aopen_f(group,  ATTR1_NAME, attr, error)
+  CALL check("h5aopen_f",error,total_error)
+
+  !  Close attribute
+  CALL h5aclose_f(attr, error)
+  CALL check("h5aclose_f",error,total_error)
+
+  !  Close root group
+  CALL  H5Gclose_f(group, error)
+  CALL check("h5gclose_f",error,total_error)
+
+  !  Create an attribute for the dataset
+  CALL h5acreate_f(dataset, ATTR1_NAME, H5T_NATIVE_INTEGER, sid2, attr, error, H5P_DEFAULT_F, H5P_DEFAULT_F)
+  CALL check("h5acreate_f",error,total_error)
+
+  !  Write attribute information
+
+  CALL h5awrite_f(attr, H5T_NATIVE_INTEGER, attr_data1, dimsa, error)
+  CALL check("h5awrite_f",error,total_error)
+
+  !  Create an another attribute for the dataset
+  CALL h5acreate_f(dataset, ATTR1A_NAME, H5T_NATIVE_INTEGER, sid2, attr2, error, H5P_DEFAULT_F, H5P_DEFAULT_F)
+  CALL check("h5acreate_f",error,total_error)
+
+  !  Write attribute information
+  CALL h5awrite_f(attr2, H5T_NATIVE_INTEGER, attr_data1a, dimsa, error)
+  CALL check("h5awrite_f",error,total_error)
+
+  !  Check storage size for attribute
+
+  CALL h5aget_storage_size_f(attr, attr_size, error)
+  CALL check("h5aget_storage_size_f",error,total_error)
+!EP  CALL verify("h5aget_storage_size_f", INT(attr_size), 2*HSIZE_T, total_error)
+
+
+  !  Read attribute information immediately, without closing attribute
+  CALL h5aread_f(attr, H5T_NATIVE_INTEGER, read_data1, dimsa, error)
+  CALL check("h5aread_f",error,total_error)
+
+  !  Verify values read in
+  DO i = 1, ATTR1_DIM1
+     CALL verify('h5aread_f',attr_data1(i),read_data1(i), total_error)
+  ENDDO
+
+  !  CLOSE attribute
+  CALL h5aclose_f(attr, error)
+  CALL check("h5aclose_f",error,total_error)
+
+  !  Close attribute
+  CALL h5aclose_f(attr2, error)
+  CALL check("h5aclose_f",error,total_error)
+
+  !  change attribute name
+  CALL H5Arename_f(dataset, ATTR1_NAME, ATTR_TMP_NAME, error)
+  CALL check("H5Arename_f", error, total_error)
+
+  !  Open attribute again
+
+  CALL h5aopen_f(dataset,  ATTR_TMP_NAME, attr, error)
+  CALL check("h5aopen_f",error,total_error)
+
+  !  Verify new attribute name
+  ! Set a deliberately small size
+
+  check_name = '                         ' ! need to initialize or does not pass test
+
+  size = 1
+  CALL H5Aget_name_f(attr, size, check_name, error)
+  CALL check('H5Aget_name',error,total_error)
+
+  ! Now enter with the corrected size
+  IF(error.NE.size)THEN
+     size = error
+     CALL H5Aget_name_f(attr, size, check_name, error)
+     CALL check('H5Aget_name',error,total_error)
+  ENDIF
+
+  IF(TRIM(ADJUSTL(check_name)).NE.TRIM(ADJUSTL(ATTR_TMP_NAME))) THEN
+     PRINT*,'.'//TRIM(check_name)//'.',LEN_TRIM(check_name)
+     PRINT*,'.'//TRIM(ATTR_TMP_NAME)//'.',LEN_TRIM(ATTR_TMP_NAME)
+     WRITE(*,*) 'ERROR: attribute name different: attr_name ='//TRIM(check_name)//'.'
+     WRITE(*,*) '                                 should be ='//TRIM(ATTR_TMP_NAME)//'.'
+     total_error = total_error + 1
+     stop
+  ENDIF
+
+  ! Try with a string buffer that is exactly the correct size
+  size = 18
+  CALL H5Aget_name_f(attr, size, chr_exact_size, error)
+  CALL check('H5Aget_name_f',error,total_error)
+  CALL verify('H5Aget_name_f',chr_exact_size,ATTR_TMP_NAME, total_error)
+
+  !  Close attribute
+  CALL h5aclose_f(attr, error)
+  CALL check("h5aclose_f",error,total_error)
+
+  CALL h5sclose_f(sid1, error)
+  CALL check("h5sclose_f",error,total_error)
+  CALL h5sclose_f(sid2, error)
+  CALL check("h5sclose_f",error,total_error)
+  ! Close Dataset
+  CALL h5dclose_f(dataset, error)
+  CALL check("h5dclose_f",error,total_error)
+
+  !  Close file
+  CALL h5fclose_f(fid1, error)
+  CALL check("h5fclose_f",error,total_error)
+
+END SUBROUTINE test_attr_basic_write
+
+!***************************************************************
+!**
+!**  test_attr_many(): Test basic H5A (attribute) code.
+!**      Tests storing lots of attributes
+!**
+!***************************************************************
+
+SUBROUTINE test_attr_many(new_format, fcpl, fapl, total_error)
+
+  IMPLICIT NONE
+
+  LOGICAL, INTENT(IN) :: new_format
+  INTEGER(HID_T), INTENT(IN) :: fcpl
+  INTEGER(HID_T), INTENT(IN) :: fapl
+  INTEGER, INTENT(INOUT) :: total_error
+  CHARACTER(LEN=8) :: FileName = "tattr.h5"
+  INTEGER(HID_T) :: fid
+  INTEGER(HID_T) :: sid
+  INTEGER(HID_T) :: gid
+  INTEGER(HID_T) :: aid
+  INTEGER :: error
+
+  INTEGER(HSIZE_T), DIMENSION(7) :: data_dims
+  CHARACTER(LEN=5) :: chr5
+
+
+  CHARACTER(LEN=11) :: attrname
+  CHARACTER(LEN=8), PARAMETER :: GROUP1_NAME="/Group1"
+
+  INTEGER :: u
+  INTEGER :: nattr
+  LOGICAL :: exists
+  INTEGER, DIMENSION(1) ::  attr_data1
+
+  data_dims = 0
+
+
+  ! Create file
+  CALL h5fcreate_f(FileName, H5F_ACC_TRUNC_F, fid, error, fcpl, fapl)
+  CALL check("h5fcreate_f",error,total_error)
+
+  !  Create dataspace for attribute
+  CALL h5screate_f(H5S_SCALAR_F, sid, error)
+  CALL check("h5screate_f",error,total_error)
+
+  !  Create group for attributes
+
+  CALL H5Gcreate_f(fid, GROUP1_NAME, gid, error)
+  CALL check("H5Gcreate_f", error, total_error)
+
+  !  Create many attributes
+
+  IF(new_format)THEN
+     nattr = 250
+  ELSE
+     nattr = 2
+  ENDIF
+
+  DO u = 0, nattr - 1
+
+     WRITE(chr5,'(I5.5)') u
+     attrname = 'attr '//chr5
+     CALL H5Aexists_f( gid, attrname, exists, error)
+     CALL verify("H5Aexists",exists,.FALSE.,total_error )
+
+     CALL H5Aexists_by_name_f(fid, GROUP1_NAME, attrname,  exists, error, lapl_id = H5P_DEFAULT_F)
+     CALL verify("H5Aexists_by_name_f",exists,.FALSE.,total_error )
+
+     CALL h5acreate_f(gid, attrname, H5T_NATIVE_INTEGER, sid, aid, error, H5P_DEFAULT_F, H5P_DEFAULT_F)
+     CALL check("h5acreate_f",error,total_error)
+
+     CALL H5Aexists_f(gid, attrname, exists, error)
+     CALL verify("H5Aexists",exists,.TRUE.,total_error )
+
+     CALL H5Aexists_by_name_f(fid, GROUP1_NAME, attrname, exists, error)
+     CALL verify("H5Aexists_by_name_f",exists,.TRUE.,total_error )
+
+     attr_data1(1) = u
+     data_dims(1) = 1
+
+     CALL h5awrite_f(aid, H5T_NATIVE_INTEGER, attr_data1, data_dims, error)
+     CALL check("h5awrite_f",error,total_error)
+
+     CALL h5aclose_f(aid, error)
+     CALL check("h5aclose_f",error,total_error)
+
+     CALL H5Aexists_f(gid, attrname, exists, error)
+     CALL verify("H5Aexists",exists,.TRUE.,total_error )
+
+     CALL H5Aexists_by_name_f(fid, GROUP1_NAME, attrname, exists, error)
+     CALL verify("H5Aexists_by_name_f",exists,.TRUE.,total_error )
+
+  ENDDO
+
+  !  Close group
+  CALL  H5Gclose_f(gid, error)
+  CALL check("h5gclose_f",error,total_error)
+
+  !  Close file
+  CALL h5fclose_f(fid, error)
+  CALL check("h5fclose_f",error,total_error)
+
+  !  Close dataspaces
+  CALL h5sclose_f(sid, error)
+  CALL check("h5sclose_f",error,total_error)
+
+END SUBROUTINE test_attr_many
+
+!-------------------------------------------------------------------------
+! * Function:    attr_open_check
+! *
+! * Purpose:     Check opening attribute on an object
+! *
+! * Return:      Success:        0
+! *              Failure:        -1
+! *
+! * Programmer:  Fortran version (M.S. Breitenfeld)
+! *              March 21, 2008
+! *
+! *-------------------------------------------------------------------------
+!
+
+SUBROUTINE attr_open_check(fid, dsetname, obj_id, max_attrs, total_error )
+
+  IMPLICIT NONE
+  INTEGER(HID_T), INTENT(IN) :: fid
+  CHARACTER(LEN=*), INTENT(IN) :: dsetname
+  INTEGER(HID_T), INTENT(IN) :: obj_id
+  INTEGER, INTENT(IN) :: max_attrs
+  INTEGER, INTENT(INOUT) :: total_error
+
+  INTEGER :: u
+  CHARACTER (LEN=8) :: attrname
+  INTEGER :: error
+  LOGICAL :: f_corder_valid ! Indicates whether the the creation order data is valid for this attribute
+  INTEGER :: corder ! Is a positive integer containing the creation order of the attribute
+  INTEGER :: cset ! Indicates the character set used for the attribute’s name
+  INTEGER(HSIZE_T) :: data_size   ! indicates the size, in the number of characters
+
+  INTEGER(HSIZE_T) :: storage_size   ! attributes storage requirements
+  CHARACTER(LEN=2) :: chr2
+  INTEGER(HID_T) attr_id
+  !  Open each attribute on object by index and check that it's the correct one
+
+  DO u = 0, max_attrs-1
+     !  Open the attribute
+
+     WRITE(chr2,'(I2.2)') u
+     attrname = 'attr '//chr2
+
+
+     CALL h5aopen_f(obj_id, attrname, attr_id, error)
+     CALL check("h5aopen_f",error,total_error)
+
+
+     !  Get the attribute's information
+
+     CALL h5aget_info_f(attr_id, f_corder_valid, corder, cset, data_size,  error)
+     CALL check("h5aget_info_f",error,total_error)
+
+     !  Check that the object's attributes are correct
+     CALL verify("h5aget_info_f.corder",corder,u,total_error)
+     CALL verify("h5aget_info_f.corder_valid",f_corder_valid,.TRUE.,total_error)
+     CALL verify("h5aget_info_f.cset", cset, H5T_CSET_ASCII_F, total_error)
+     CALL h5aget_storage_size_f(attr_id, storage_size, error)
+     CALL check("h5aget_storage_size_f",error,total_error)
+
+     CALL verify("h5aget_info_f.data_size", INT(data_size), INT(storage_size), total_error)
+
+
+     !  Close attribute
+     CALL h5aclose_f(attr_id, error)
+     CALL check("h5aclose_f",error,total_error)
+
+     !  Open the attribute
+
+     CALL H5Aopen_by_name_f(obj_id, ".", attrname, attr_id, error, lapl_id=H5P_DEFAULT_F, aapl_id=H5P_DEFAULT_F)
+     CALL check("H5Aopen_by_name_f", error, total_error)
+
+     CALL h5aget_info_f(attr_id, f_corder_valid, corder, cset, data_size,  error)
+     CALL check("h5aget_info_f",error,total_error)
+     !  Check the attribute's information
+     CALL verify("h5aget_info_f",corder,u,total_error)
+     CALL verify("h5aget_info_f",f_corder_valid,.TRUE.,total_error)
+     CALL verify("h5aget_info_f", cset, H5T_CSET_ASCII_F, total_error)
+     CALL h5aget_storage_size_f(attr_id, storage_size, error)
+     CALL check("h5aget_storage_size_f",error,total_error)
+     CALL verify("h5aget_info_f", INT(data_size), INT(storage_size), total_error)
+
+     !  Close attribute
+     CALL h5aclose_f(attr_id, error)
+     CALL check("h5aclose_f",error,total_error)
+
+
+     !  Open the attribute
+     CALL H5Aopen_by_name_f(fid, dsetname, attrname, attr_id, error)
+     CALL check("H5Aopen_by_name_f", error, total_error)
+
+
+     !  Get the attribute's information
+     CALL h5aget_info_f(attr_id, f_corder_valid, corder, cset, data_size,  error)
+     CALL check("h5aget_info_f",error,total_error)
+
+     !  Check the attribute's information
+     CALL verify("h5aget_info_f",corder,u,total_error)
+     CALL verify("h5aget_info_f",f_corder_valid,.TRUE.,total_error)
+     CALL verify("h5aget_info_f", cset, H5T_CSET_ASCII_F, total_error)
+     CALL h5aget_storage_size_f(attr_id, storage_size, error)
+     CALL check("h5aget_storage_size_f",error,total_error)
+     CALL verify("h5aget_info_f", INT(data_size), INT(storage_size), total_error)
+
+     !  Close attribute
+     CALL h5aclose_f(attr_id, error)
+     CALL check("h5aclose_f",error,total_error)
+  ENDDO
+
+END SUBROUTINE attr_open_check
+END MODULE TH5A_1_8
diff --git a/fortran/test/tH5A_1_8.f90 b/fortran/test/tH5A_1_8.f90
deleted file mode 100644
index 8e20100..0000000
--- a/fortran/test/tH5A_1_8.f90
+++ /dev/null
@@ -1,2816 +0,0 @@
-!****h* root/fortran/test/tH5A_1_8.f90
-!
-! NAME
-!  tH5A_1_8.f90
-!
-! FUNCTION
-!  Basic testing of Fortran H5A APIs introduced in 1.8.
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! CONTAINS SUBROUTINES
-!  attribute_test_1_8, test_attr_corder_create_compact, test_attr_null_space,
-!  test_attr_create_by_name, test_attr_info_by_idx, attr_info_by_idx_check,
-!  test_attr_shared_rename, test_attr_delete_by_idx, test_attr_shared_delete,
-!  test_attr_dense_open, test_attr_dense_verify, test_attr_corder_create_basic,
-!  test_attr_basic_write, test_attr_many, attr_open_check, 
-!
-!*****
-MODULE TH5A_1_8
-
-CONTAINS
-SUBROUTINE attribute_test_1_8(cleanup, total_error)
-
-!   This subroutine tests following 1.8 functionalities:
-!   h5acreate_f,  h5awrite_f, h5aclose_f,h5aread_f, h5aopen_name_f,
-!   h5aget_name_f,h5aget_space_f, h5aget_type_f, H5Pset_shared_mesg_nindexes_f,
-!   H5Pset_shared_mesg_index_f
-!
-
-  USE HDF5 ! This module contains all necessary modules
-  USE TH5_MISC
-
-  IMPLICIT NONE
-  LOGICAL, INTENT(IN)  :: cleanup
-  INTEGER, INTENT(INOUT) :: total_error
-
-  !
-  !general purpose integer
-  !
-  INTEGER     ::   i, j
-  INTEGER     ::   error ! Error flag
-
-  ! NEW STARTS HERE
-  INTEGER(HID_T) :: fapl = -1, fapl2 = -1
-  INTEGER(HID_T) :: fcpl = -1, fcpl2 = -1
-  INTEGER(HID_T) :: my_fapl, my_fcpl
-  LOGICAL, DIMENSION(1:2) :: new_format = (/.TRUE.,.FALSE./)
-  LOGICAL, DIMENSION(1:2) :: use_shared = (/.TRUE.,.FALSE./)
-
-  INTEGER :: ret_total_error
-
-! ********************
-! test_attr equivelent
-! ********************
-
-!  WRITE(*,*) "TESTING ATTRIBUTES"
-
-  CALL H5Pcreate_f(H5P_FILE_ACCESS_F,fapl,error)
-  CALL check("h5Pcreate_f",error,total_error)
-  CALL h5pcopy_f(fapl, fapl2, error)
-  CALL check("h5pcopy_f",error,total_error)
-
-  CALL H5Pcreate_f(H5P_FILE_CREATE_F,fcpl,error)
-  CALL check("h5Pcreate_f",error,total_error)
-
-  CALL h5pcopy_f(fcpl, fcpl2, error)
-  CALL check("h5pcopy_f",error,total_error)
-
-  CALL H5Pset_shared_mesg_nindexes_f(fcpl2,1,error)
-  CALL check("H5Pset_shared_mesg_nindexes_f",error, total_error)
-
-  CALL H5Pset_shared_mesg_index_f(fcpl2, 0, H5O_SHMESG_ATTR_FLAG_F, 1, error)
-  CALL check(" H5Pset_shared_mesg_index_f",error, total_error)
-
-  DO i = 1, 2
-
-     IF (new_format(i)) THEN
-        WRITE(*,'(1X,A)') "Testing with new file format:"
-        my_fapl = fapl2
-     ELSE
-        WRITE(*,'(1X,A)') "Testing with old file format:"
-        my_fapl = fapl
-     END IF
-     ret_total_error = 0
-     CALL test_attr_basic_write(my_fapl, ret_total_error)
-     CALL write_test_status(ret_total_error, &
-          '  - Tests INT attributes on both datasets and groups', &
-          total_error)
-
-     IF(new_format(i)) THEN
-        DO j = 1, 2
-           IF (use_shared(j)) THEN
-              WRITE(*,*) " - Testing with shared attributes:"
-              my_fcpl = fcpl2
-           ELSE
-              WRITE(*,*) " - Testing without shared attributes:"
-              my_fcpl = fcpl
-           END IF
-
-           ret_total_error = 0
-           CALL test_attr_dense_open(my_fcpl, my_fapl, ret_total_error)
-           CALL write_test_status(ret_total_error, &
-                '   - Testing INT attributes on both datasets and groups', &
-                total_error)
-
-           ret_total_error = 0
-           CALL test_attr_null_space(my_fcpl, my_fapl, ret_total_error)
-           CALL write_test_status(ret_total_error, &
-                '   - Testing storing attribute with "null" dataspace', &
-                total_error)
-           ret_total_error = 0
-           CALL test_attr_many(new_format(i), my_fcpl, my_fapl, ret_total_error)
-           CALL write_test_status(ret_total_error, &
-                '   - Testing storing lots of attributes', &
-                total_error)
-
-           ret_total_error = 0
-           CALL test_attr_corder_create_basic(my_fcpl, my_fapl, ret_total_error)
-           CALL write_test_status(ret_total_error, &
-                '   - Testing creating objects with attribute creation order', &
-                total_error)
-
-           ret_total_error = 0
-           CALL test_attr_corder_create_compact(my_fcpl, my_fapl, ret_total_error)
-           CALL write_test_status(ret_total_error, &
-                '   - Testing compact storage on objects with attribute creation order', &
-                total_error)
-           ret_total_error = 0
-           CALL test_attr_info_by_idx(new_format(i), my_fcpl, my_fapl, ret_total_error)
-           CALL write_test_status(ret_total_error, &
-                '   - Testing querying attribute info by index', &
-                total_error)
-
-           ret_total_error = 0
-           CALL test_attr_delete_by_idx(new_format(i), my_fcpl, my_fapl, ret_total_error)
-           CALL write_test_status(ret_total_error, &
-                '   - Testing deleting attribute by index', &
-                total_error)
-
-           ret_total_error = 0
-           CALL test_attr_create_by_name(new_format(i), my_fcpl, my_fapl, ret_total_error)
-           CALL write_test_status(ret_total_error, &
-                '   - Testing creating attributes by name', &
-                total_error)
-
-             !  More complex tests with both "new format" and "shared" attributes 
-           IF( use_shared(j) ) THEN
-              ret_total_error = 0
-              CALL test_attr_shared_rename(my_fcpl, my_fapl, ret_total_error)
-              CALL write_test_status(ret_total_error,&
-                   '   - Testing renaming shared attributes in "compact" & "dense" storage', &
-                   total_error)
-
-              ret_total_error = 0
-              CALL test_attr_shared_delete(my_fcpl, my_fapl, ret_total_error)
-              CALL write_test_status(ret_total_error,&
-                   '   - Testing deleting shared attributes in "compact" & "dense" storage', &
-                   total_error)
-
-           END IF
-        END DO
-     END IF
-  ENDDO
-
-  CALL H5Pclose_f(fcpl, error)
-  CALL CHECK("H5Pclose", error,total_error)
-  CALL H5Pclose_f(fcpl2, error)
-  CALL CHECK("H5Pclose", error,total_error)
-
-  IF(cleanup) CALL h5_cleanup_f("tattr", H5P_DEFAULT_F, error)
-  CALL check("h5_cleanup_f", error, total_error)
-
-
-  RETURN
-END SUBROUTINE attribute_test_1_8
-
-SUBROUTINE test_attr_corder_create_compact(fcpl,fapl, total_error)
-
-!***************************************************************
-!**
-!**  test_attr_corder_create_compact(): Test basic H5A (attribute) code.
-!**      Tests compact attribute storage on objects with attribute creation order info
-!**
-!***************************************************************
-
-! Needed for get_info_by_name
-
-  USE HDF5 ! This module contains all necessary modules
-  USE TH5_MISC
-
-  IMPLICIT NONE
-
-! - - - arg types - - -
-
-  INTEGER(HID_T), INTENT(IN) :: fcpl
-  INTEGER(HID_T), INTENT(IN) :: fapl
-
-  CHARACTER(LEN=8) :: FileName = "tattr.h5"
-  INTEGER(HID_T) :: fid
-  INTEGER(HID_T) :: dcpl
-  INTEGER(HID_T) :: sid
-
-  INTEGER :: error
-  INTEGER, INTENT(INOUT) :: total_error
-
-  CHARACTER(LEN=8) :: DSET1_NAME = "Dataset1"
-  CHARACTER(LEN=8) :: DSET2_NAME = "Dataset2"
-  CHARACTER(LEN=8) :: DSET3_NAME = "Dataset3"
-  INTEGER, PARAMETER :: NUM_DSETS = 3
-
-  INTEGER :: curr_dset
-
-  INTEGER(HID_T) :: dset1, dset2, dset3
-  INTEGER(HID_T) :: my_dataset
-
-  INTEGER :: u
-
-  INTEGER :: max_compact ! Maximum # of links to store in group compactly
-  INTEGER :: min_dense   ! Minimum # of links to store in group "densely"
-
-  CHARACTER(LEN=7) :: attrname
-  CHARACTER(LEN=2) :: chr2
-  INTEGER(HID_T) :: attr        !String Attribute identifier
-  INTEGER(HSIZE_T), DIMENSION(7) :: data_dims
-
-  LOGICAL :: f_corder_valid ! Indicates whether the the creation order data is valid for this attribute
-  INTEGER :: corder ! Is a positive integer containing the creation order of the attribute
-  INTEGER :: cset ! Indicates the character set used for the attribute’s name
-  INTEGER(HSIZE_T) :: data_size   ! indicates the size, in the number of characters
-
-  data_dims = 0
-
-!  WRITE(*,*) "     - Testing Compact Storage of Attributes with Creation Order Info"
-  !  Create file 
-  CALL h5fcreate_f(FileName, H5F_ACC_TRUNC_F, fid, error, fcpl, fapl)
-  CALL check("h5fcreate_f",error,total_error)
-  !  Create dataset creation property list 
-  CALL H5Pcreate_f(H5P_DATASET_CREATE_F,dcpl,error)
-  CALL check("h5Pcreate_f",error,total_error)
-
-  CALL H5Pset_attr_creation_order_f(dcpl, IOR(H5P_CRT_ORDER_TRACKED_F, H5P_CRT_ORDER_INDEXED_F), error)
-  CALL check("H5Pset_attr_creation_order",error,total_error)
-
-  !  Query the attribute creation properties 
-  CALL H5Pget_attr_phase_change_f(dcpl, max_compact, min_dense, error)
-  CALL check("H5Pget_attr_phase_change_f",error,total_error)
-
-  CALL h5screate_f(H5S_SCALAR_F, sid, error)
-  CALL check("h5screate_f",error,total_error)
-
-  CALL h5dcreate_f(fid, DSET1_NAME, H5T_NATIVE_CHARACTER, sid, dset1, error, dcpl_id=dcpl )
-  CALL check("h5dcreate_f",error,total_error)
-
-  CALL h5dcreate_f(fid, DSET2_NAME, H5T_NATIVE_CHARACTER, sid, dset2, error, dcpl )
-  CALL check("h5dcreate_f",error,total_error)
-
-  CALL h5dcreate_f(fid, DSET3_NAME, H5T_NATIVE_CHARACTER, sid, dset3, error, dcpl_id=dcpl )
-  CALL check("h5dcreate_f",error,total_error)
-
-  DO curr_dset = 0,NUM_DSETS-1
-     SELECT CASE (curr_dset)
-     CASE (0)
-        my_dataset = dset1
-     CASE (1)
-        my_dataset = dset2
-     CASE (2)
-        my_dataset = dset3
-     END SELECT
-    DO u = 0, max_compact - 1
-       !  Create attribute 
-       WRITE(chr2,'(I2.2)') u
-       attrname = 'attr '//chr2
-
-       CALL h5acreate_f(my_dataset, attrname, H5T_NATIVE_INTEGER, sid, attr, error)
-       CALL check("h5acreate_f",error,total_error)
-
-       data_dims(1) = 1
-       CALL h5awrite_f(attr, H5T_NATIVE_INTEGER, u, data_dims, error)
-       CALL check("h5awrite_f",error,total_error)
-
-       CALL h5aclose_f(attr, error)
-       CALL check("h5aclose_f",error,total_error)
-
-    END DO
-  END DO
-
-  !   Close Datasets 
-  CALL h5dclose_f(dset1, error)
-  CALL check("h5dclose_f",error,total_error)
-  CALL h5dclose_f(dset2, error)
-  CALL check("h5dclose_f",error,total_error)
-  CALL h5dclose_f(dset3, error)
-  CALL check("h5dclose_f",error,total_error)
-
-  !    Close file 
-  CALL h5fclose_f(fid, error)
-  CALL check("h5fclose_f",error,total_error)
-
-  !  Close dataspace 
-  CALL h5sclose_f(sid, error)
-  CALL check("h5sclose_f",error,total_error)
-
-  !  Close property list 
-  CALL h5pclose_f(dcpl, error)
-  CALL check("h5pclose_f",error,total_error)
-
-  CALL h5fopen_f(FileName, H5F_ACC_RDWR_F, fid, error, fapl)
-  CALL check("h5open_f",error,total_error)
-
-  CALL h5dopen_f(fid, DSET1_NAME, dset1, error)
-  CALL check("h5dopen_f",error,total_error)
-  CALL h5dopen_f(fid, DSET2_NAME, dset2, error)
-  CALL check("h5dopen_f",error,total_error)
-  CALL h5dopen_f(fid, DSET3_NAME, dset3, error)
-  CALL check("h5dopen_f",error,total_error)
-  DO curr_dset = 0,NUM_DSETS-1
-     SELECT CASE (curr_dset)
-     CASE (0)
-        my_dataset = dset1
-     CASE (1)
-        my_dataset = dset2
-     CASE (2)
-        my_dataset = dset3
-     CASE DEFAULT
-        WRITE(*,*) " WARNING: To many data sets! "
-     END SELECT
-     DO u = 0,max_compact-1
-        WRITE(chr2,'(I2.2)') u
-        attrname = 'attr '//chr2
-        !  Retrieve information for attribute 
-
-        CALL H5Aget_info_by_name_f(my_dataset, ".", attrname, &
-             f_corder_valid, corder, cset, data_size, error, lapl_id = H5P_DEFAULT_F ) !with optional
-
-        CALL check("H5Aget_info_by_name_f", error, total_error)
-
-        !  Verify creation order of attribute 
-
-        CALL verifyLogical("H5Aget_info_by_name_f", f_corder_valid, .TRUE., total_error)
-        CALL verify("H5Aget_info_by_name_f", corder, u, total_error)
-
-
-        !  Retrieve information for attribute 
-
-        CALL H5Aget_info_by_name_f(my_dataset, ".", attrname, &
-             f_corder_valid, corder, cset, data_size, error) ! without optional
-
-        CALL check("H5Aget_info_by_name_f", error, total_error)
-
-        !  Verify creation order of attribute 
-
-        CALL verifyLogical("H5Aget_info_by_name_f", f_corder_valid, .TRUE., total_error)
-        CALL verify("H5Aget_info_by_name_f", corder, u, total_error)
-
-     END DO
-  END DO
-  !   Close Datasets 
-  CALL h5dclose_f(dset1, error)
-  CALL check("h5dclose_f",error,total_error)
-  CALL h5dclose_f(dset2, error)
-  CALL check("h5dclose_f",error,total_error)
-  CALL h5dclose_f(dset3, error)
-  CALL check("h5dclose_f",error,total_error)
-
-  !    Close file 
-  CALL h5fclose_f(fid, error)
-  CALL check("h5fclose_f",error,total_error)
-
-END SUBROUTINE test_attr_corder_create_compact
-
-SUBROUTINE test_attr_null_space(fcpl, fapl, total_error)
-!***************************************************************
-!**
-!**  test_attr_null_space(): Test basic H5A (attribute) code.
-!**      Tests storing attribute with "null" dataspace
-!**
-!***************************************************************
-  USE HDF5
-  USE TH5_MISC
-
-  IMPLICIT NONE
-
-  INTEGER(HID_T), INTENT(IN) :: fcpl
-  INTEGER(HID_T), INTENT(IN) :: fapl
-  INTEGER, INTENT(INOUT) :: total_error
-
-  CHARACTER(LEN=8) :: FileName = "tattr.h5"
-  INTEGER(HID_T) :: fid
-  INTEGER(HID_T) :: sid, null_sid
-  INTEGER(HID_T) :: dataset
-
-  CHARACTER(LEN=8) :: DSET1_NAME = "Dataset1"
-
-  INTEGER :: error
-
-  INTEGER :: value_scalar
-  INTEGER, DIMENSION(1) :: value
-  INTEGER(HID_T) :: attr        !String Attribute identifier
-  INTEGER(HID_T) :: attr_sid
-  INTEGER(HSIZE_T), DIMENSION(7) :: data_dims
-
-  INTEGER(HSIZE_T) :: storage_size   ! attributes storage requirements
-
-  LOGICAL :: f_corder_valid ! Indicates whether the the creation order data is valid for this attribute
-  INTEGER :: corder ! Is a positive integer containing the creation order of the attribute
-  INTEGER :: cset ! Indicates the character set used for the attribute’s name
-  INTEGER(HSIZE_T) :: data_size   ! indicates the size, in the number of characters
-
-  LOGICAL :: equal
-
-  ! test: H5Sextent_equal_f
-
-  data_dims = 0
-
-  !  Create file 
-  CALL h5fcreate_f(FileName, H5F_ACC_TRUNC_F, fid, error, fcpl, fapl)
-  CALL check("h5fcreate_f",error,total_error)
-  !  Close file 
-  CALL h5fclose_f(fid, error)
-  CALL check("h5fclose_f",error,total_error)
-
-  !  Re-open file 
-  CALL h5fopen_f(FileName, H5F_ACC_RDWR_F, fid, error)
-  CALL check("h5open_f",error,total_error)
-  !  Create dataspace for dataset attributes 
-  CALL h5screate_f(H5S_SCALAR_F, sid, error)
-  CALL check("h5screate_f",error,total_error)
-  !  Create "null" dataspace for attribute 
-  CALL h5screate_f(H5S_NULL_F, null_sid, error)
-  CALL check("h5screate_f",error,total_error)
-  !  Create a dataset 
-  CALL h5dcreate_f(fid, DSET1_NAME, H5T_NATIVE_CHARACTER, sid, dataset, error)
-  CALL check("h5dcreate_f",error,total_error)
-  !  Add attribute with 'null' dataspace 
-
-  !  Create attribute 
-  CALL h5acreate_f(dataset, "null attr", H5T_NATIVE_INTEGER, null_sid, attr, error)
-  CALL check("h5acreate_f",error,total_error)
-
-  !  Try to read data from the attribute 
-  !  (shouldn't fail, but should leave buffer alone) 
-  value(1) = 103
-  data_dims(1) = 1
-  CALL h5aread_f(attr, H5T_NATIVE_INTEGER, value, data_dims, error)
-  CALL check("h5aread_f",error,total_error)
-  CALL verify("h5aread_f",value(1),103,total_error)
-
-!  Try to read data from the attribute again but
-!  for a scalar 
-
-  value_scalar = 104
-  data_dims(1) = 1
-  CALL h5aread_f(attr, H5T_NATIVE_INTEGER, value_scalar, data_dims, error)
-  CALL check("h5aread_f",error,total_error)
-  CALL verify("h5aread_f",value_scalar,104,total_error)
-
-  CALL h5aget_space_f(attr, attr_sid, error)
-  CALL check("h5aget_space_f",error,total_error)
-
-  CALL H5Sextent_equal_f(attr_sid, null_sid, equal, error)
-  CALL check("H5Sextent_equal_f",error,total_error)
-  CALL Verifylogical("H5Sextent_equal_f",equal,.TRUE.,total_error)
-
-  CALL h5aget_storage_size_f(attr, storage_size, error)
-  CALL check("h5aget_storage_size_f",error,total_error)
-  CALL VERIFY("h5aget_storage_size_f",INT(storage_size),0,total_error)
-
-  CALL h5aget_info_f(attr, f_corder_valid, corder, cset, data_size,  error)
-  CALL check("h5aget_info_f", error, total_error)
-
-  !  Check the attribute's information 
-  CALL VERIFY("h5aget_info_f.corder",corder,0,total_error)
-
-  CALL VERIFY("h5aget_info_f.cset", cset, H5T_CSET_ASCII_F, total_error)
-  CALL h5aget_storage_size_f(attr, storage_size, error)
-  CALL check("h5aget_storage_size_f",error,total_error)
-  CALL VERIFY("h5aget_info_f.data_size", INT(data_size), INT(storage_size), total_error)
-  CALL h5aclose_f(attr,error)
-  CALL check("h5aclose_f",error,total_error)
-
-  CALL H5Sclose_f(attr_sid, error)
-  CALL check("H5Sclose_f",error,total_error)
-
-  CALL H5Dclose_f(dataset, error)
-  CALL check("H5Dclose_f", error,total_error)
-
-
-  CALL H5Fclose_f(fid, error)
-  CALL check("H5Fclose_f", error,total_error)
-
-  CALL H5Sclose_f(sid, error)
-  CALL check("H5Sclose_f", error,total_error)
-
-  CALL H5Sclose_f(null_sid, error)
-  CALL check("H5Sclose_f", error,total_error)
-
-END SUBROUTINE test_attr_null_space
-
-
-SUBROUTINE test_attr_create_by_name(new_format,fcpl,fapl, total_error)
-
-!***************************************************************
-!**
-!**  test_attr_create_by_name(): Test basic H5A (attribute) code.
-!**      Tests creating attributes by name
-!**
-!***************************************************************
-
-  USE HDF5
-  USE TH5_MISC
-
-  IMPLICIT NONE
-
-  INTEGER(SIZE_T), PARAMETER :: NAME_BUF_SIZE = 7
-  LOGICAL :: new_format
-  INTEGER(HID_T), INTENT(IN) :: fcpl
-  INTEGER(HID_T), INTENT(IN) :: fapl
-  INTEGER, INTENT(INOUT) :: total_error
-
-  INTEGER :: max_compact,min_dense,u
-  CHARACTER (LEN=NAME_BUF_SIZE) :: attrname
-  CHARACTER(LEN=8) :: dsetname
-
-  CHARACTER(LEN=8) :: FileName = "tattr.h5"
-  INTEGER(HID_T) :: fid
-  INTEGER(HID_T) :: dcpl
-  INTEGER(HID_T) :: sid
-
-  CHARACTER(LEN=8) :: DSET1_NAME = "Dataset1"
-  CHARACTER(LEN=8) :: DSET2_NAME = "Dataset2"
-  CHARACTER(LEN=8) :: DSET3_NAME = "Dataset3"
-  INTEGER, PARAMETER :: NUM_DSETS = 3
-
-  INTEGER :: curr_dset
-
-  INTEGER(HID_T) :: dset1, dset2, dset3
-  INTEGER(HID_T) :: my_dataset
-  INTEGER :: error
-
-  INTEGER(HID_T) :: attr        !String Attribute identifier
-  INTEGER(HSIZE_T), DIMENSION(7) :: data_dims
-
-
-  CHARACTER(LEN=2) :: chr2
-  LOGICAL, DIMENSION(1:2) :: use_index = (/.FALSE.,.TRUE./)
-  INTEGER :: Input1
-  INTEGER :: i
-
-  data_dims = 0
-
-
-  !  Create dataspace for dataset & attributes 
-  CALL h5screate_f(H5S_SCALAR_F, sid, error)
-  CALL check("h5screate_f",error,total_error)
-
-  !  Create dataset creation property list 
-  CALL H5Pcreate_f(H5P_DATASET_CREATE_F,dcpl,error)
-  CALL check("h5Pcreate_f",error,total_error)
-
-  !  Query the attribute creation properties 
-
-  CALL H5Pget_attr_phase_change_f(dcpl, max_compact, min_dense, error)
-  CALL check("H5Pget_attr_phase_change_f",error,total_error)
-
-  !  Loop over using index for creation order value 
-  DO i = 1, 2
-     !  Print appropriate test message 
-     IF(use_index(i))THEN
-        WRITE(*,*) "   - Testing Creating Attributes By Name w/Creation Order Index"
-     ELSE
-        WRITE(*,*) "   - Testing Creating Attributes By Name w/o Creation Order Index"
-     ENDIF
-     !  Create file 
-     CALL h5fcreate_f(FileName, H5F_ACC_TRUNC_F, fid, error, fcpl, fapl)
-     CALL check("h5fcreate_f",error,total_error)
-
-     !  Set attribute creation order tracking & indexing for object 
-     IF(new_format)THEN
-
-        IF(use_index(i))THEN
-           Input1 = H5P_CRT_ORDER_INDEXED_F
-        ELSE
-           Input1 = 0
-        ENDIF
-
-        CALL H5Pset_attr_creation_order_f(dcpl, IOR(H5P_CRT_ORDER_TRACKED_F, Input1), error)
-        CALL check("H5Pset_attr_creation_order",error,total_error)
-
-     ENDIF
-
-     !  Create datasets 
-
-     CALL h5dcreate_f(fid, DSET1_NAME, H5T_NATIVE_CHARACTER, sid, dset1, error, dcpl_id=dcpl )
-     CALL check("h5dcreate_f2",error,total_error)
-
-     CALL h5dcreate_f(fid, DSET2_NAME, H5T_NATIVE_CHARACTER, sid, dset2, error, dcpl_id=dcpl )
-     CALL check("h5dcreate_f3",error,total_error)
-
-     CALL h5dcreate_f(fid, DSET3_NAME, H5T_NATIVE_CHARACTER, sid, dset3, error, dcpl_id=dcpl )
-     CALL check("h5dcreate_f4",error,total_error)
-
-
-     !  Work on all the datasets 
-
-     DO curr_dset = 0,NUM_DSETS-1
-        SELECT CASE (curr_dset)
-        CASE (0)
-           my_dataset = dset1
-           dsetname = DSET1_NAME
-        CASE (1)
-           my_dataset = dset2
-           dsetname = DSET2_NAME
-        CASE (2)
-           my_dataset = dset3
-           dsetname = DSET3_NAME
-           !     CASE DEFAULT
-           !        CALL HDassert(0.AND."Toomanydatasets!")
-        END SELECT
-
-
-        ! Create attributes, up to limit of compact form 
-
-        DO u = 0, max_compact - 1
-           !  Create attribute 
-           WRITE(chr2,'(I2.2)') u
-           attrname = 'attr '//chr2
-           CALL H5Acreate_by_name_f(fid, dsetname, attrname, H5T_NATIVE_INTEGER, sid, &
-                attr, error, lapl_id=H5P_DEFAULT_F, acpl_id=H5P_DEFAULT_F, aapl_id=H5P_DEFAULT_F)
-           CALL check("H5Acreate_by_name_f",error,total_error)
-
-           !  Write data into the attribute 
-
-           data_dims(1) = 1
-           CALL h5awrite_f(attr, H5T_NATIVE_INTEGER, u, data_dims, error)
-           CALL check("h5awrite_f",error,total_error)
-
-           !  Close attribute 
-           CALL h5aclose_f(attr, error)
-           CALL check("h5aclose_f",error,total_error)
-
-           !  Verify information for NEW attribute 
-           CALL attr_info_by_idx_check(my_dataset, attrname, INT(u,HSIZE_T), use_index(i), total_error)
-         !   CALL check("FAILED IN attr_info_by_idx_check",total_error)
-        ENDDO
-
-        !  Test opening attributes stored compactly 
-
-        CALL attr_open_check(fid, dsetname, my_dataset, u, total_error)
-
-     ENDDO
-
-
-     !  Work on all the datasets 
-     DO curr_dset = 0,NUM_DSETS-1
-        SELECT CASE (curr_dset)
-        CASE (0)
-           my_dataset = dset1
-           dsetname = DSET1_NAME
-        CASE (1)
-           my_dataset = dset2
-           dsetname = DSET2_NAME
-        CASE (2)
-           my_dataset = dset3
-           dsetname = DSET3_NAME
-        END SELECT
-
-        !  Create more attributes, to push into dense form 
-        DO u = max_compact, max_compact* 2 - 1
-
-           WRITE(chr2,'(I2.2)') u
-           attrname = 'attr '//chr2
-
-           CALL H5Acreate_by_name_f(fid, dsetname, attrname, H5T_NATIVE_INTEGER, sid, &
-                attr, error, lapl_id=H5P_DEFAULT_F)
-           CALL check("H5Acreate_by_name",error,total_error)
-
-           !  Write data into the attribute 
-           data_dims(1) = 1
-           CALL h5awrite_f(attr, H5T_NATIVE_INTEGER, u, data_dims, error)
-           CALL check("h5awrite_f",error,total_error)
-
-           !  Close attribute 
-           CALL h5aclose_f(attr, error)
-           CALL check("h5aclose_f",error,total_error)
-
-        ENDDO
-
-     ENDDO
-
-     !  Close Datasets 
-     CALL h5dclose_f(dset1, error)
-     CALL check("h5dclose_f",error,total_error)
-     CALL h5dclose_f(dset2, error)
-     CALL check("h5dclose_f",error,total_error)
-     CALL h5dclose_f(dset3, error)
-     CALL check("h5dclose_f",error,total_error)
-
-
-     !  Close file 
-     CALL h5fclose_f(fid, error)
-     CALL check("h5fclose_f",error,total_error)
-  ENDDO
-
-  !  Close property list 
-  CALL h5pclose_f(dcpl, error)
-  CALL check("h5pclose_f",error,total_error)
-
-  !  Close dataspace 
-  CALL h5sclose_f(sid, error)
-  CALL check("h5sclose_f",error,total_error)
-
-END SUBROUTINE test_attr_create_by_name
-
-
-SUBROUTINE test_attr_info_by_idx(new_format, fcpl, fapl, total_error)
-
-!***************************************************************
-!**
-!**  test_attr_info_by_idx(): Test basic H5A (attribute) code.
-!**      Tests querying attribute info by index
-!**
-!***************************************************************
-
-  USE HDF5
-  USE TH5_MISC
-
-  IMPLICIT NONE
-
-  LOGICAL :: new_format
-  INTEGER(HID_T), INTENT(IN) :: fcpl
-  INTEGER(HID_T), INTENT(IN) :: fapl
-  INTEGER, INTENT(INOUT) :: total_error
-  CHARACTER(LEN=8) :: FileName = "tattr.h5"
-  INTEGER(HID_T) :: fid
-  INTEGER(HID_T) :: dcpl
-  INTEGER(HID_T) :: sid
-
-  CHARACTER(LEN=8) :: DSET1_NAME = "Dataset1"
-  CHARACTER(LEN=8) :: DSET2_NAME = "Dataset2"
-  CHARACTER(LEN=8) :: DSET3_NAME = "Dataset3"
-  INTEGER, PARAMETER :: NUM_DSETS = 3
-
-  INTEGER :: curr_dset
-
-  INTEGER(HID_T) :: dset1, dset2, dset3
-  INTEGER(HID_T) :: my_dataset
-  INTEGER :: error
-
-  INTEGER(HID_T) :: attr        !String Attribute identifier
-  INTEGER(HSIZE_T), DIMENSION(7) :: data_dims
-
-  LOGICAL :: f_corder_valid ! Indicates whether the the creation order data is valid for this attribute
-  INTEGER :: corder ! Is a positive integer containing the creation order of the attribute
-  INTEGER :: cset ! Indicates the character set used for the attribute’s name
-  INTEGER(HSIZE_T) :: data_size   ! indicates the size, in the number of characters
-  INTEGER(HSIZE_T) :: n
-  LOGICAL, DIMENSION(1:2) :: use_index = (/.FALSE.,.TRUE./)
-
-  INTEGER :: max_compact ! Maximum # of links to store in group compactly
-  INTEGER :: min_dense   ! Minimum # of links to store in group "densely"
-
-  CHARACTER(LEN=2) :: chr2
-
-  INTEGER :: i, j
-
-  INTEGER, DIMENSION(1) ::  attr_integer_data
-  CHARACTER(LEN=7) :: attrname
-
-  INTEGER(SIZE_T) :: size
-  CHARACTER(LEN=80) :: tmpname
-
-  INTEGER :: Input1
-  INTEGER(HSIZE_T) :: hzero = 0_HSIZE_T
-  INTEGER :: minusone = -1
-  INTEGER(HSIZE_T) :: htmp
-
-  data_dims = 0
-
-  !  Create dataspace for dataset & attributes 
-
-  CALL h5screate_f(H5S_SCALAR_F, sid, error)
-  CALL check("h5screate_f",error,total_error)
-
-
-  !  Create dataset creation property list 
-
-  CALL H5Pcreate_f(H5P_DATASET_CREATE_F,dcpl,error)
-  CALL check("h5Pcreate_f",error,total_error)
-
-
-  !  Query the attribute creation properties 
-  CALL H5Pget_attr_phase_change_f(dcpl, max_compact, min_dense, error)
-  CALL check("H5Pget_attr_phase_change_f",error,total_error)
-
-  !   Loop over using index for creation order value 
-
-  DO i = 1, 2
-
-     !  Create file 
-     CALL h5fcreate_f(FileName, H5F_ACC_TRUNC_F, fid, error, fcpl, fapl)
-     CALL check("h5fcreate_f",error,total_error)
-
-     !  Set attribute creation order tracking & indexing for object 
-     IF(new_format)THEN
-        IF(use_index(i))THEN
-           Input1 = H5P_CRT_ORDER_INDEXED_F
-        ELSE
-           Input1 = 0
-        ENDIF
-        CALL H5Pset_attr_creation_order_f(dcpl, IOR(H5P_CRT_ORDER_TRACKED_F, Input1), error)
-        CALL check("H5Pset_attr_creation_order",error,total_error)
-     ENDIF
-
-     !  Create datasets 
-
-     CALL h5dcreate_f(fid, DSET1_NAME, H5T_NATIVE_CHARACTER, sid, dset1, error )
-     CALL check("h5dcreate_f",error,total_error)
-
-     CALL h5dcreate_f(fid, DSET2_NAME, H5T_NATIVE_CHARACTER, sid, dset2, error )
-     CALL check("h5dcreate_f",error,total_error)
-
-     CALL h5dcreate_f(fid, DSET3_NAME, H5T_NATIVE_CHARACTER, sid, dset3, error )
-     CALL check("h5dcreate_f",error,total_error)
-
-     !  Work on all the datasets 
-
-     DO curr_dset = 0,NUM_DSETS-1
-
-        SELECT CASE (curr_dset)
-        CASE (0)
-           my_dataset = dset1
-        CASE (1)
-           my_dataset = dset2
-        CASE (2)
-           my_dataset = dset3
-        END SELECT
-
-        !  Check for query on non-existant attribute 
-
-        n = 0
-
-        ! -- CHECK PASSING AN INTEGER CONSTANT IN DIFFERENT FORMS --
-
-        ! 1) call by passing an integer with the _hsize_t declaration
-
-        CALL h5aget_info_by_idx_f(my_dataset, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_INC_F, 0_hsize_t, &
-             f_corder_valid, corder, cset, data_size, error, lapl_id=H5P_DEFAULT_F)
-        CALL VERIFY("h5aget_info_by_idx_f",error,minusone,total_error)
-
-        ! 2) call by passing an integer with the INT(,hsize_t) declaration
-
-        CALL h5aget_info_by_idx_f(my_dataset, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_INC_F, INT(0,hsize_t), &
-             f_corder_valid, corder, cset, data_size, error, lapl_id=H5P_DEFAULT_F)
-        CALL VERIFY("h5aget_info_by_idx_f",error,minusone,total_error)
-
-
-        ! 3) call by passing a variable with the attribute hsize_t
-
-        CALL h5aget_info_by_idx_f(my_dataset, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_INC_F, hzero, &
-             f_corder_valid, corder, cset, data_size, error, lapl_id=H5P_DEFAULT_F)
-        CALL VERIFY("h5aget_info_by_idx_f",error,minusone,total_error)
-
-        CALL h5aget_name_by_idx_f(my_dataset, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_INC_F, &
-             hzero, tmpname,  error, size, lapl_id=H5P_DEFAULT_F)
-        CALL VERIFY("h5aget_name_by_idx_f",error,minusone,total_error)
-
-
-        !  Create attributes, up to limit of compact form 
-
-        DO j = 0, max_compact-1
-           !  Create attribute 
-           WRITE(chr2,'(I2.2)') j
-           attrname = 'attr '//chr2
-
-           ! check with the optional information create2 specs.
-           CALL h5acreate_f(my_dataset, attrname, H5T_NATIVE_INTEGER, sid, attr, error, H5P_DEFAULT_F, H5P_DEFAULT_F)
-           CALL check("h5acreate_f",error,total_error)
-
-           !  Write data into the attribute 
-
-           attr_integer_data(1) = j
-           data_dims(1) = 1
-           CALL h5awrite_f(attr, H5T_NATIVE_INTEGER, attr_integer_data, data_dims, error)
-           CALL check("h5awrite_f",error,total_error)
-
-           !  Close attribute 
-
-           CALL h5aclose_f(attr, error)
-           CALL check("h5aclose_f",error,total_error)
-
-           !  Verify information for new attribute 
-
-!EP        CALL attr_info_by_idx_check(my_dataset, attrname, INT(j,HSIZE_T), use_index(i), total_error )
-           htmp = j
-           CALL attr_info_by_idx_check(my_dataset, attrname, htmp, use_index(i), total_error )
-
-           !CHECK(ret, FAIL, "attr_info_by_idx_check");
-        ENDDO
-
-     ENDDO
-
-
-     !   Close Datasets 
-     CALL h5dclose_f(dset1, error)
-     CALL check("h5dclose_f",error,total_error)
-     CALL h5dclose_f(dset2, error)
-     CALL check("h5dclose_f",error,total_error)
-     CALL h5dclose_f(dset3, error)
-     CALL check("h5dclose_f",error,total_error)
-
-     !    Close file 
-     CALL h5fclose_f(fid, error)
-     CALL check("h5fclose_f",error,total_error)
-
-  END DO
-
-  !  Close property list 
-  CALL h5pclose_f(dcpl,error)
-  CALL check("h5pclose_f", error, total_error)
-
-  !  Close dataspace 
-  CALL h5sclose_f(sid, error)
-  CALL check("h5sclose_f",error,total_error)
-
-END SUBROUTINE test_attr_info_by_idx
-
-
-SUBROUTINE attr_info_by_idx_check(obj_id, attrname, n, use_index, total_error )
-
-  USE HDF5
-  USE TH5_MISC
-
-  IMPLICIT NONE
-
-  INTEGER :: error, total_error
-
-  INTEGER(HID_T) :: obj_id
-  CHARACTER(LEN=*) :: attrname
-  INTEGER(HSIZE_T) :: n
-  LOGICAL :: use_index
-  LOGICAL :: f_corder_valid ! Indicates whether the the creation order data is valid for this attribute
-  INTEGER :: corder ! Is a positive integer containing the creation order of the attribute
-  INTEGER :: cset ! Indicates the character set used for the attribute’s name
-  INTEGER(HSIZE_T) :: data_size   ! indicates the size, in the number of characters
-
-  INTEGER(SIZE_T) :: NAME_BUF_SIZE = 7
-  CHARACTER(LEN=7) :: tmpname
-  INTEGER(HSIZE_T) :: hzero = 0_HSIZE_T
-
-
-  !  Verify the information for first attribute, in increasing creation order 
-  CALL h5aget_info_by_idx_f(obj_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_INC_F, hzero, &
-       f_corder_valid, corder, cset, data_size, error)
-
-  CALL check("h5aget_info_by_idx_f",error,total_error)
-  CALL verify("h5aget_info_by_idx_f",corder,0,total_error)
-  !  Verify the information for new attribute, in increasing creation order 
-
-  CALL h5aget_info_by_idx_f(obj_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_INC_F, n, &
-       f_corder_valid, corder, cset, data_size, error)
-
-  CALL check("h5aget_info_by_idx_f",error,total_error)
-  CALL VERIFY("h5aget_info_by_idx_f",corder,INT(n),total_error)
-
-  !  Verify the name for new link, in increasing creation order 
-
-  ! Try with the correct buffer size
-
-  CALL h5aget_name_by_idx_f(obj_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_INC_F, &
-       n, tmpname, error, NAME_BUF_SIZE)
-  CALL check("h5aget_name_by_idx_f",error,total_error)
-  CALL VERIFY("h5aget_name_by_idx_f", INT(NAME_BUF_SIZE), 7, error)
-
-  IF(attrname.NE.tmpname)THEN
-     error = -1
-  ENDIF
-  CALL VERIFY("h5aget_name_by_idx_f",error,0,total_error)
-
-  !   Don't test "native" order if there is no creation order index, since
-  !   *  there's not a good way to easily predict the attribute's order in the name
-  !   *  index.
-  !   
-  IF (use_index) THEN
-     !  Verify the information for first attribute, in native creation order 
-     CALL h5aget_info_by_idx_f(obj_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_NATIVE_F, hzero, &
-          f_corder_valid, corder, cset, data_size, error)
-     CALL check("h5aget_info_by_idx_f",error,total_error)
-     CALL VERIFY("h5aget_info_by_idx_f",corder,0,total_error)
-
-     !  Verify the information for new attribute, in native creation order 
-     CALL h5aget_info_by_idx_f(obj_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_NATIVE_F, n, &
-          f_corder_valid, corder, cset, data_size, error)
-     CALL check("h5aget_info_by_idx_f",error,total_error)
-     CALL VERIFY("h5aget_info_by_idx_f",corder,INT(n),total_error)
-
-   !  Verify the name for new link, in increasing native order 
-     CALL h5aget_name_by_idx_f(obj_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_NATIVE_F, &
-          n, tmpname, error) ! check with no optional parameters
-     CALL check("h5aget_name_by_idx_f",error,total_error)
-     IF(TRIM(attrname).NE.TRIM(tmpname))THEN
-        WRITE(*,*) "ERROR: attribute name size wrong!"
-        error = -1
-     ENDIF
-     CALL VERIFY("h5aget_name_by_idx_f",error,0,total_error)
-  END IF
-
-
-  CALL h5aget_info_by_idx_f(obj_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_DEC_F, n, &
-       f_corder_valid, corder, cset, data_size, error)
-  CALL check("h5aget_info_by_idx_f",error,total_error)
-  CALL VERIFY("h5aget_info_by_idx_f",corder,0,total_error)
-
-!EP  CALL h5aget_info_by_idx_f(obj_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_DEC_F, 0_HSIZE_T, &
-
-  ! -- CHECK PASSING AN INTEGER CONSTANT IN DIFFERENT FORMS --
-
-  ! 1) call by passing an integer with the _hsize_t declaration
-
-  CALL h5aget_info_by_idx_f(obj_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_DEC_F, 0_HSIZE_T, &
-       f_corder_valid, corder, cset, data_size, error)
-  CALL check("h5aget_info_by_idx_f",error,total_error)
-  CALL VERIFY("h5aget_info_by_idx_f",corder,INT(n),total_error)
-
-  ! 2) call by passing an integer with the INT(,hsize_t) declaration
-
-  CALL h5aget_info_by_idx_f(obj_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_DEC_F, INT(0,HSIZE_T), &
-       f_corder_valid, corder, cset, data_size, error)
-  CALL check("h5aget_info_by_idx_f",error,total_error)
-  CALL VERIFY("h5aget_info_by_idx_f",corder,INT(n),total_error)
-
-  ! 3) call by passing a variable with the attribute hsize_t
-
-  CALL h5aget_info_by_idx_f(obj_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_DEC_F, hzero, &
-       f_corder_valid, corder, cset, data_size, error)
-  CALL check("h5aget_info_by_idx_f",error,total_error)
-  CALL VERIFY("h5aget_info_by_idx_f",corder,INT(n),total_error)
-
-!EP  CALL h5aget_info_by_idx_f(obj_id, ".", H5_INDEX_NAME_F, H5_ITER_INC_F, 0_HSIZE_T, &
-  CALL h5aget_info_by_idx_f(obj_id, ".", H5_INDEX_NAME_F, H5_ITER_INC_F, hzero, &
-       f_corder_valid, corder, cset, data_size, error)
-  CALL check("h5aget_info_by_idx_f",error,total_error)
-  CALL VERIFY("h5aget_info_by_idx_f",corder,0,total_error)
-  CALL h5aget_info_by_idx_f(obj_id, ".", H5_INDEX_NAME_F, H5_ITER_INC_F, n, &
-       f_corder_valid, corder, cset, data_size, error)
-  CALL check("h5aget_info_by_idx_f",error,total_error)
-  CALL VERIFY("h5aget_info_by_idx_f",corder,INT(n),total_error)
-
-  CALL h5aget_info_by_idx_f(obj_id, ".", H5_INDEX_NAME_F, H5_ITER_DEC_F, n, &
-       f_corder_valid, corder, cset, data_size, error)
-  CALL check("h5aget_info_by_idx_f",error,total_error)
-  CALL VERIFY("h5aget_info_by_idx_f",corder,0,total_error)
-!EP  CALL h5aget_info_by_idx_f(obj_id, ".", H5_INDEX_NAME_F, H5_ITER_DEC_F, 0_HSIZE_T, &
-  CALL h5aget_info_by_idx_f(obj_id, ".", H5_INDEX_NAME_F, H5_ITER_DEC_F, hzero, &
-       f_corder_valid, corder, cset, data_size, error)
-  CALL check("h5aget_info_by_idx_f",error,total_error)
-  CALL VERIFY("h5aget_info_by_idx_f",corder,INT(n),total_error)
-
-
-END SUBROUTINE attr_info_by_idx_check
-
-
-SUBROUTINE test_attr_shared_rename( fcpl, fapl, total_error)
-
-!***************************************************************
-!**
-!**  test_attr_shared_rename(): Test basic H5A (attribute) code.
-!**      Tests renaming shared attributes in "compact" & "dense" storage
-!**
-!***************************************************************
-
-  USE HDF5
-  USE TH5_MISC
-
-  IMPLICIT NONE
-
-  INTEGER(HID_T), INTENT(IN) :: fcpl
-  INTEGER(HID_T), INTENT(IN) :: fapl
-  INTEGER, INTENT(INOUT) :: total_error
-
-    CHARACTER(LEN=8) :: FileName = "tattr.h5"
-  INTEGER(HID_T) :: fid
-  INTEGER(HID_T) :: dcpl
-  INTEGER(HID_T) :: sid, big_sid
-
-  CHARACTER(LEN=8) :: DSET1_NAME = "Dataset1"
-  CHARACTER(LEN=8) :: DSET2_NAME = "Dataset2"
-
-
-  INTEGER(HID_T) :: dataset, dataset2
-
-  INTEGER :: error
-
-  INTEGER(HID_T) :: attr        !String Attribute identifier
-  INTEGER(HID_T) :: attr_tid
-  INTEGER(HSIZE_T), DIMENSION(7) :: data_dims
-
-
-  INTEGER :: max_compact ! Maximum # of links to store in group compactly
-  INTEGER :: min_dense   ! Minimum # of links to store in group "densely"
-
-  CHARACTER(LEN=2) :: chr2
-
-
-  INTEGER, DIMENSION(1) ::  attr_integer_data
-  CHARACTER(LEN=7) :: attrname
-  CHARACTER(LEN=11) :: attrname2
-
-  INTEGER :: u
-  INTEGER(HID_T) :: my_fcpl
-
-  CHARACTER(LEN=5), PARAMETER :: TYPE1_NAME = "/Type"
-
-  INTEGER :: test_shared
-  INTEGER(HSIZE_T), DIMENSION(1) :: adims2 = (/1/) ! Attribute dimension
-  INTEGER     ::   arank = 1                      ! Attribure rank
-
-  !  Initialize "big" attribute data 
-
-  !  Create dataspace for dataset 
-  CALL h5screate_f(H5S_SCALAR_F, sid, error)
-  CALL check("h5screate_f",error,total_error)
-
-  !  Create "big" dataspace for "large" attributes 
-
-  CALL h5screate_simple_f(arank, adims2, big_sid, error)
-  CALL check("h5screate_simple_f",error,total_error)
-
-  !  Loop over type of shared components 
-  DO test_shared = 0, 2
-     !  Make copy of file creation property list 
-     CALL H5Pcopy_f(fcpl, my_fcpl, error)
-     CALL check("H5Pcopy",error,total_error)
-
-     !  Set up datatype for attributes 
-
-     CALL H5Tcopy_f(H5T_NATIVE_INTEGER, attr_tid, error)
-     CALL check("H5Tcopy",error,total_error)
-
-     !  Special setup for each type of shared components 
-
-     IF( test_shared .EQ. 0) THEN
-        !  Make attributes > 500 bytes shared 
-        CALL H5Pset_shared_mesg_nindexes_f(my_fcpl,1,error)
-        CALL check("H5Pset_shared_mesg_nindexes_f",error, total_error)
-        CALL H5Pset_shared_mesg_index_f(my_fcpl, 0, H5O_SHMESG_ATTR_FLAG_F, 500,error)
-        CALL check(" H5Pset_shared_mesg_index_f",error, total_error)
-
-     ELSE
-        !  Set up copy of file creation property list 
-        CALL H5Pset_shared_mesg_nindexes_f(my_fcpl,3,error)
-
-        !  Make attributes > 500 bytes shared 
-        CALL H5Pset_shared_mesg_index_f(my_fcpl, 0, H5O_SHMESG_ATTR_FLAG_F, 500,error)
-        !  Make datatypes & dataspaces > 1 byte shared (i.e. all of them :-) 
-        CALL H5Pset_shared_mesg_index_f(my_fcpl, 1, H5O_SHMESG_DTYPE_FLAG_F, 1,error)
-        CALL H5Pset_shared_mesg_index_f(my_fcpl, 2,  H5O_SHMESG_SDSPACE_FLAG_F, 1,error)
-     ENDIF
-
-     !  Create file 
-     CALL h5fcreate_f(FileName, H5F_ACC_TRUNC_F, fid, error, my_fcpl, fapl)
-     CALL check("h5fcreate_f",error,total_error)
-
-     !  Close FCPL copy 
-     CALL h5pclose_f(my_fcpl, error)
-     CALL check("h5pclose_f", error, total_error)
-     !  Close file 
-     CALL h5fclose_f(fid, error)
-     CALL check("h5fclose_f",error,total_error)
-
-     !  Re-open file 
-     CALL h5fopen_f(FileName, H5F_ACC_RDWR_F, fid, error,fapl)
-     CALL check("h5open_f",error,total_error)
-
-     !  Commit datatype to file 
-     IF(test_shared.EQ.2) THEN
-        CALL H5Tcommit_f(fid, TYPE1_NAME, attr_tid, error, H5P_DEFAULT_F, H5P_DEFAULT_F, H5P_DEFAULT_F)
-        CALL check("H5Tcommit",error,total_error)
-     ENDIF
-
-     !  Set up to query the object creation properties 
-     CALL H5Pcreate_f(H5P_DATASET_CREATE_F,dcpl,error)
-     CALL check("h5Pcreate_f",error,total_error)
-
-     !  Create datasets 
-     CALL h5dcreate_f(fid, DSET1_NAME, H5T_NATIVE_CHARACTER, sid, dataset, error, dcpl_id=dcpl )
-     CALL check("h5dcreate_f",error,total_error)
-     CALL h5dcreate_f(fid, DSET2_NAME, H5T_NATIVE_CHARACTER, sid, dataset2, error, dcpl_id=dcpl )
-     CALL check("h5dcreate_f",error,total_error)
-
-     !  Retrieve limits for compact/dense attribute storage 
-     CALL H5Pget_attr_phase_change_f(dcpl, max_compact, min_dense, error)
-     CALL check("H5Pget_attr_phase_change_f",error,total_error)
-
-     !  Close property list 
-     CALL h5pclose_f(dcpl,error)
-     CALL check("h5pclose_f", error, total_error)
-
-     !  Add attributes to each dataset, until after converting to dense storage 
-     DO u = 0, (max_compact * 2) - 1
-
-        !  Create attribute name 
-        WRITE(chr2,'(I2.2)') u
-        attrname = 'attr '//chr2
-
-        !  Alternate between creating "small" & "big" attributes 
-
-        IF(MOD(u+1,2).EQ.0)THEN
-           !  Create "small" attribute on first dataset 
-
-           CALL h5acreate_f(dataset, attrname, attr_tid, sid, attr, error, H5P_DEFAULT_F, H5P_DEFAULT_F)
-           CALL check("h5acreate_f",error,total_error)
-
-           !  Write data into the attribute 
-           attr_integer_data(1) = u + 1
-           data_dims(1) = 1
-           CALL h5awrite_f(attr, attr_tid, attr_integer_data, data_dims, error)
-           CALL check("h5awrite_f",error,total_error)
-        ELSE
-           !  Create "big" attribute on first dataset 
-
-           CALL h5acreate_f(dataset, attrname, attr_tid, big_sid, attr, error, H5P_DEFAULT_F, H5P_DEFAULT_F)
-           CALL check("h5acreate_f",error,total_error)
-
-           !  Write data into the attribute 
-
-           data_dims(1) = 1
-           attr_integer_data(1) = u + 1
-           CALL h5awrite_f(attr, attr_tid, attr_integer_data, data_dims, error)
-           CALL check("h5awrite_f",error,total_error)
-
-        ENDIF
-
-        !  Close attribute 
-        CALL h5aclose_f(attr, error)
-        CALL check("h5aclose_f",error,total_error)
-
-        !  Alternate between creating "small" & "big" attributes 
-        IF(MOD(u+1,2).EQ.0)THEN
-
-           !   Create "small" attribute on second dataset 
-
-           CALL h5acreate_f(dataset2, attrname, attr_tid, sid, attr, error, H5P_DEFAULT_F, H5P_DEFAULT_F)
-           CALL check("h5acreate_f",error,total_error)
-
-           !  Write data into the attribute 
-
-           attr_integer_data(1) = u + 1
-           data_dims(1) = 1
-           CALL h5awrite_f(attr, attr_tid, attr_integer_data, data_dims, error)
-           CALL check("h5awrite_f",error,total_error)
-        ELSE
-
-           !  Create "big" attribute on second dataset 
-
-           CALL h5acreate_f(dataset2, attrname, attr_tid, big_sid, attr, error, H5P_DEFAULT_F, H5P_DEFAULT_F)
-           CALL check("h5acreate_f",error,total_error)
-
-!  Write data into the attribute 
-
-
-           attr_integer_data(1) = u + 1
-           data_dims(1) = 1
-!           CALL h5awrite_f(attr,  attr_tid, attr_integer_data, data_dims, error)
-!           CALL check("h5awrite_f",error,total_error)
-
-
-!  Check refcount for attribute 
-        ENDIF
-        !  Close attribute 
-        CALL h5aclose_f(attr, error)
-        CALL check("h5aclose_f",error,total_error)
-
-        !  Create new attribute name 
-
-        WRITE(chr2,'(I2.2)') u
-        attrname2 = 'new attr '//chr2
-
-
-        !  Change second dataset's attribute's name 
-
-        CALL H5Arename_by_name_f(fid, DSET2_NAME, attrname, attrname2, error, lapl_id=H5P_DEFAULT_F)
-        CALL check("H5Arename_by_name_f",error,total_error)
-
-        !  Check refcount on attributes now 
-
-        !  Check refcount on renamed attribute 
-
-        CALL H5Aopen_f(dataset2, attrname2, attr, error, aapl_id=H5P_DEFAULT_F)
-        CALL check("H5Aopen_f",error,total_error)
-
-        !  Close attribute 
-        CALL h5aclose_f(attr, error)
-        CALL check("h5aclose_f",error,total_error)
-
-        !  Check refcount on original attribute 
-        CALL H5Aopen_f(dataset, attrname, attr, error)
-        CALL check("H5Aopen",error,total_error)
-
-        !  Close attribute 
-        CALL h5aclose_f(attr, error)
-        CALL check("h5aclose_f",error,total_error)
-
-
-        !  Change second dataset's attribute's name back to original 
-
-        CALL H5Arename_by_name_f(fid, DSET2_NAME, attrname2, attrname, error)
-        CALL check("H5Arename_by_name_f",error,total_error)
-
-        !  Check refcount on attributes now 
-
-        !  Check refcount on renamed attribute 
-        CALL H5Aopen_f(dataset2, attrname, attr, error)
-        CALL check("H5Aopen",error,total_error)
-
-        !  Close attribute 
-        CALL h5aclose_f(attr, error)
-        CALL check("h5aclose_f",error,total_error)
-
-        !  Check refcount on original attribute 
-
-        !  Check refcount on renamed attribute 
-        CALL H5Aopen_f(dataset, attrname, attr, error)
-        CALL check("H5Aopen",error,total_error)
-
-        !  Close attribute 
-        CALL h5aclose_f(attr, error)
-        CALL check("h5aclose_f",error,total_error)
-
-     ENDDO
-
-     !  Close attribute's datatype 
-     CALL h5tclose_f(attr_tid, error)
-     CALL check("h5tclose_f",error,total_error)
-
-     !  Close attribute's datatype 
-     CALL h5dclose_f(dataset, error)
-     CALL check("h5dclose_f",error,total_error)
-     CALL h5dclose_f(dataset2, error)
-     CALL check("h5dclose_f",error,total_error)
-
-
-     !  Unlink datasets with attributes 
-     CALL H5Ldelete_f(fid, DSET1_NAME, error, H5P_DEFAULT_F)
-     CALL check("HLdelete",error,total_error)
-     CALL H5Ldelete_f(fid, DSET2_NAME, error)
-     CALL check("HLdelete",error,total_error)
-
-     ! Unlink committed datatype 
-     IF(test_shared == 2)THEN
-        CALL H5Ldelete_f(fid, TYPE1_NAME, error)
-        CALL check("HLdelete_f",error,total_error)
-     ENDIF
-
-     !  Close file 
-     CALL h5fclose_f(fid, error)
-     CALL check("h5fclose_f",error,total_error)
-
-     !  Check size of file 
-     !filesize = h5_get_file_size(FILENAME);
-     !VERIFY(filesize, empty_filesize, "h5_get_file_size");
-  ENDDO
-
-  !  Close dataspaces 
-  CALL h5sclose_f(sid, error)
-  CALL check("h5sclose_f",error,total_error)
-  CALL h5sclose_f(big_sid, error)
-  CALL check("h5sclose_f",error,total_error)
-
-END SUBROUTINE test_attr_shared_rename
-
-
-SUBROUTINE test_attr_delete_by_idx(new_format, fcpl, fapl, total_error)
-
-!***************************************************************
-!**
-!**  test_attr_delete_by_idx(): Test basic H5A (attribute) code.
-!**      Tests deleting attribute by index
-!**
-!***************************************************************
-
-  USE HDF5
-  USE TH5_MISC
-
-  IMPLICIT NONE
-
-  LOGICAL, INTENT(IN) :: new_format
-  INTEGER(HID_T), INTENT(IN) :: fcpl
-  INTEGER(HID_T), INTENT(IN) :: fapl
-  INTEGER, INTENT(INOUT) :: total_error
-  CHARACTER(LEN=8) :: FileName = "tattr.h5"
-  INTEGER(HID_T) :: fid !  HDF5 File ID			
-  INTEGER(HID_T) :: dcpl !  Dataset creation property list ID 
-  INTEGER(HID_T) :: sid !  Dataspace ID			
-
-  CHARACTER(LEN=8) :: DSET1_NAME = "Dataset1"
-  CHARACTER(LEN=8) :: DSET2_NAME = "Dataset2"
-  CHARACTER(LEN=8) :: DSET3_NAME = "Dataset3"
-  INTEGER, PARAMETER :: NUM_DSETS = 3
-
-  INTEGER :: curr_dset
-
-  INTEGER(HID_T) :: dset1, dset2, dset3
-  INTEGER(HID_T) :: my_dataset
-
-  INTEGER :: error
-
-  INTEGER(HID_T) :: attr        !String Attribute identifier
-  INTEGER(HSIZE_T), DIMENSION(7) :: data_dims
-
-  LOGICAL :: f_corder_valid ! Indicates whether the the creation order data is valid for this attribute
-  INTEGER :: corder ! Is a positive integer containing the creation order of the attribute
-  INTEGER :: cset ! Indicates the character set used for the attribute’s name
-  INTEGER(HSIZE_T) :: data_size   ! indicates the size, in the number of characters
-  LOGICAL, DIMENSION(1:2) :: use_index = (/.FALSE.,.TRUE./)
-
-  INTEGER :: max_compact ! Maximum # of links to store in group compactly
-  INTEGER :: min_dense   ! Minimum # of links to store in group "densely"
-
-  CHARACTER(LEN=2) :: chr2
-
-  INTEGER :: i
-
-  INTEGER, DIMENSION(1) ::  attr_integer_data
-  CHARACTER(LEN=7) :: attrname
-
-  INTEGER(SIZE_T) :: size
-  CHARACTER(LEN=8) :: tmpname
-
-  INTEGER :: idx_type
-  INTEGER :: order
-  INTEGER :: u     !  Local index variable 
-  INTEGER :: Input1
-  INTEGER(HSIZE_T) :: hzero = 0_HSIZE_T
-  INTEGER :: minusone = -1
-
-  data_dims = 0
-
-  !  Create dataspace for dataset & attributes 
-  CALL h5screate_f(H5S_SCALAR_F, sid, error)
-  CALL check("h5screate_f",error,total_error)
-
-  !     Create dataset creation property list 
-  CALL H5Pcreate_f(H5P_DATASET_CREATE_F,dcpl,error)
-  CALL check("h5Pcreate_f",error,total_error)
-
-  !  Query the attribute creation properties 
-  CALL H5Pget_attr_phase_change_f(dcpl, max_compact, min_dense, error)
-  CALL check("H5Pget_attr_phase_change_f",error,total_error)
-
-
-  ! Loop over operating on different indices on link fields 
-  DO idx_type = H5_INDEX_NAME_F, H5_INDEX_CRT_ORDER_F
-
-     !  Loop over operating in different orders 
-     DO order = H5_ITER_INC_F, H5_ITER_DEC_F
-
-        !  Loop over using index for creation order value 
-        DO i = 1, 2
-
-           !  Create file 
-           CALL h5fcreate_f(FileName, H5F_ACC_TRUNC_F, fid, error, fcpl, fapl)
-           CALL check("h5fcreate_f",error,total_error)
-
-           !   Set attribute creation order tracking & indexing for object 
-           IF(new_format)THEN
-
-              IF(use_index(i))THEN
-                 Input1 = H5P_CRT_ORDER_INDEXED_F
-              ELSE
-                 Input1 = 0
-              ENDIF
-
-              CALL H5Pset_attr_creation_order_f(dcpl, IOR(H5P_CRT_ORDER_TRACKED_F, Input1), error)
-              CALL check("H5Pset_attr_creation_order",error,total_error)
-
-           ENDIF
-
-           !  Create datasets 
-
-           CALL h5dcreate_f(fid, DSET1_NAME, H5T_NATIVE_CHARACTER, sid, dset1, error, dcpl )
-           CALL check("h5dcreate_f2",error,total_error)
-
-           CALL h5dcreate_f(fid, DSET2_NAME, H5T_NATIVE_CHARACTER, sid, dset2, error, dcpl )
-           CALL check("h5dcreate_f3",error,total_error)
-
-           CALL h5dcreate_f(fid, DSET3_NAME, H5T_NATIVE_CHARACTER, sid, dset3, error, dcpl )
-           CALL check("h5dcreate_f4",error,total_error)
-
-           !    Work on all the datasets 
-
-           DO curr_dset = 0,NUM_DSETS-1
-              SELECT CASE (curr_dset)
-              CASE (0)
-                 my_dataset = dset1
-              CASE (1)
-                 my_dataset = dset2
-              CASE (2)
-                 my_dataset = dset3
-                 !     CASE DEFAULT
-                 !        CALL HDassert(0.AND."Toomanydatasets!")
-              END SELECT
-
-
-              !  Check for deleting non-existant attribute 
-!EP              CALL H5Adelete_by_idx_f(my_dataset, '.', idx_type, order, 0_HSIZE_T,error, lapl_id=H5P_DEFAULT_F)
-              CALL H5Adelete_by_idx_f(my_dataset, '.', idx_type, order, hzero,error, lapl_id=H5P_DEFAULT_F)
-              CALL VERIFY("H5Adelete_by_idx_f",error,minusone,total_error)
-
-              !     Create attributes, up to limit of compact form 
-              DO u = 0, max_compact - 1
-                 !  Create attribute 
-                 WRITE(chr2,'(I2.2)') u
-                 attrname = 'attr '//chr2
-
-                 CALL h5acreate_f(my_dataset, attrname, H5T_NATIVE_INTEGER, sid, attr, error, H5P_DEFAULT_F, H5P_DEFAULT_F)
-                 CALL check("h5acreate_f",error,total_error)
-
-                 !  Write data into the attribute 
-                 attr_integer_data(1) = u
-                 data_dims(1) = 1
-                 CALL h5awrite_f(attr, H5T_NATIVE_INTEGER, attr_integer_data, data_dims, error)
-                 CALL check("h5awrite_f",error,total_error)
-
-                 !  Close attribute 
-                 CALL h5aclose_f(attr, error)
-                 CALL check("h5aclose_f",error,total_error)
-
-                 !  Verify information for new attribute 
-                 CALL attr_info_by_idx_check(my_dataset, attrname, INT(u,HSIZE_T), use_index(i), total_error )
-
-              ENDDO
-
-              ! Check for out of bound deletions 
-              CALL H5Adelete_by_idx_f(my_dataset, ".", idx_type, order, INT(u,HSIZE_T), error, lapl_id=H5P_DEFAULT_F)
-              CALL VERIFY("H5Adelete_by_idx_f",error,minusone,total_error)
-
-           ENDDO
-
-
-           DO curr_dset = 0, NUM_DSETS-1
-              SELECT CASE (curr_dset)
-              CASE (0)
-                 my_dataset = dset1
-              CASE (1)
-                 my_dataset = dset2
-              CASE (2)
-                 my_dataset = dset3
-                 !     CASE DEFAULT
-                 !        CALL HDassert(0.AND."Toomanydatasets!")
-              END SELECT
-
-              !  Delete attributes from compact storage 
-
-              DO u = 0, max_compact - 2
-
-                 !  Delete first attribute in appropriate order 
-
-
-!EP                 CALL H5Adelete_by_idx_f(my_dataset, ".", idx_type, order, 0_HSIZE_T, error)
-                 CALL H5Adelete_by_idx_f(my_dataset, ".", idx_type, order, hzero, error)
-                 CALL check("H5Adelete_by_idx_f",error,total_error)
-
-
-                 !  Verify the attribute information for first attribute in appropriate order 
-                 ! HDmemset(&ainfo, 0, sizeof(ainfo));
-
-!EP                 CALL h5aget_info_by_idx_f(my_dataset, ".", idx_type, order, 0_HSIZE_T, &
-                 CALL h5aget_info_by_idx_f(my_dataset, ".", idx_type, order, hzero, &
-                      f_corder_valid, corder, cset, data_size, error)
-
-                 IF(new_format)THEN
-                    IF(order.EQ.H5_ITER_INC_F)THEN
-                       CALL VERIFY("H5Aget_info_by_idx_f",corder,u + 1,total_error)
-                    ENDIF
-                 ELSE
-                    CALL VERIFY("H5Aget_info_by_idx_f",corder, max_compact-(u + 2),total_error)
-                 ENDIF
-
-                   !  Verify the name for first attribute in appropriate order 
-
-                 size = 7 ! *CHECK* IF NOT THE SAME SIZE
-                 CALL h5aget_name_by_idx_f(my_dataset, ".", idx_type, order,INT(0,hsize_t), &
-                      tmpname, error, lapl_id=H5P_DEFAULT_F, size=size)
-                 CALL check('h5aget_name_by_idx_f',error,total_error)
-                 IF(order .EQ. H5_ITER_INC_F)THEN
-                    WRITE(chr2,'(I2.2)') u + 1
-                    attrname = 'attr '//chr2
-                 ELSE
-                    WRITE(chr2,'(I2.2)') max_compact - (u + 2)
-                    attrname = 'attr '//chr2
-                 ENDIF
-                 IF(TRIM(attrname).NE.TRIM(tmpname)) error = -1
-                 CALL VERIFY("h5aget_name_by_idx_f",error,0,total_error)
-              ENDDO
-
-              !  Delete last attribute 
-
-!EP              CALL H5Adelete_by_idx_f(my_dataset, ".", idx_type, order, 0_HSIZE_T, error)
-              CALL H5Adelete_by_idx_f(my_dataset, ".", idx_type, order, hzero, error)
-              CALL check("H5Adelete_by_idx_f",error,total_error)
-
-           ENDDO
-
-!    Work on all the datasets 
-
-           DO curr_dset = 0,NUM_DSETS-1
-              SELECT CASE (curr_dset)
-              CASE (0)
-                 my_dataset = dset1
-              CASE (1)
-                 my_dataset = dset2
-              CASE (2)
-                 my_dataset = dset3
-                 !     CASE DEFAULT
-                 !        CALL HDassert(0.AND."Toomanydatasets!")
-              END SELECT
-
-              !  Create more attributes, to push into dense form 
-
-              DO u = 0, (max_compact * 2) - 1
-
-                 !  Create attribute 
-                 WRITE(chr2,'(I2.2)') u
-                 attrname = 'attr '//chr2
-
-                 CALL h5acreate_f(my_dataset, attrname, H5T_NATIVE_INTEGER, sid, attr, error, H5P_DEFAULT_F, H5P_DEFAULT_F)
-                 CALL check("h5acreate_f",error,total_error)
-
-
-                 !  Write data into the attribute 
-                 attr_integer_data(1) = u
-                 data_dims(1) = 1
-                 CALL h5awrite_f(attr, H5T_NATIVE_INTEGER, attr_integer_data, data_dims, error)
-                 CALL check("h5awrite_f",error,total_error)
-
-                 !  Close attribute 
-                 CALL h5aclose_f(attr, error)
-                 CALL check("h5aclose_f",error,total_error)
-
-
-              ENDDO
-              !  Check for out of bound deletion 
-              CALL H5Adelete_by_idx_f(my_dataset, ".", idx_type, order, INT(u,HSIZE_T), error)
-              CALL VERIFY("H5Adelete_by_idx_f",error,minusone,total_error)
-           ENDDO
-
-           !  Work on all the datasets 
-
-           DO curr_dset = 0,NUM_DSETS-1
-              SELECT CASE (curr_dset)
-              CASE (0)
-                 my_dataset = dset1
-              CASE (1)
-                 my_dataset = dset2
-              CASE (2)
-                 my_dataset = dset3
-              END SELECT
-
-              !  Delete attributes from dense storage 
-
-              DO u = 0, (max_compact * 2) - 1 - 1
-
-                 !  Delete first attribute in appropriate order 
-
-                 CALL H5Adelete_by_idx_f(my_dataset, ".", idx_type, order, INT(0,HSIZE_T), error)
-                 CALL check("H5Adelete_by_idx_f",error,total_error)
-                 !  Verify the attribute information for first attribute in appropriate order 
-
-                 CALL h5aget_info_by_idx_f(my_dataset, ".", idx_type, order, INT(0,HSIZE_T), &
-                      f_corder_valid, corder, cset, data_size, error)
-                 IF(new_format)THEN
-                    IF(order.EQ.H5_ITER_INC_F)THEN
-                       CALL VERIFY("H5Aget_info_by_idx_f",corder,u + 1,total_error)
-                    ENDIF
-                 ELSE
-                    CALL VERIFY("H5Aget_info_by_idx_f",corder, ((max_compact * 2) - (u + 2)), total_error)
-                 ENDIF
-
-                 !  Verify the name for first attribute in appropriate order 
-                 ! HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE);
-
-                 size = 7 ! *CHECK* if not the correct size
-                 CALL h5aget_name_by_idx_f(my_dataset, ".", idx_type, order,INT(0,hsize_t), &
-                      tmpname, error, size)
-
-                 IF(order .EQ. H5_ITER_INC_F)THEN
-                    WRITE(chr2,'(I2.2)') u + 1
-                    attrname = 'attr '//chr2
-                 ELSE
-                    WRITE(chr2,'(I2.2)') max_compact * 2 - (u + 2)
-                    attrname = 'attr '//chr2
-                 ENDIF
-                 IF(TRIM(attrname).NE.TRIM(tmpname)) error = -1
-                 CALL VERIFY("h5aget_name_by_idx_f",error,0,total_error)
-
-
-              ENDDO
-              !  Delete last attribute 
-
-              CALL H5Adelete_by_idx_f(my_dataset, ".", idx_type, order, INT(0,HSIZE_T), error, lapl_id=H5P_DEFAULT_F)
-              CALL check("H5Adelete_by_idx_f",error,total_error)
-
-              ! Check for deletion on empty attribute storage again 
-              CALL H5Adelete_by_idx_f(my_dataset, ".", idx_type, order, INT(0,HSIZE_T), error)
-              CALL VERIFY("H5Adelete_by_idx_f",error,minusone,total_error)
-           ENDDO
-
-           !   Close Datasets 
-           CALL h5dclose_f(dset1, error)
-           CALL check("h5dclose_f",error,total_error)
-           CALL h5dclose_f(dset2, error)
-           CALL check("h5dclose_f",error,total_error)
-           CALL h5dclose_f(dset3, error)
-           CALL check("h5dclose_f",error,total_error)
-
-           !    Close file 
-           CALL h5fclose_f(fid, error)
-           CALL check("h5fclose_f",error,total_error)
-        ENDDO
-     ENDDO
-  ENDDO
-
-  !  Close property list 
-  CALL h5pclose_f(dcpl,error)
-  CALL check("h5pclose_f", error, total_error)
-
-  !  Close dataspace 
-  CALL h5sclose_f(sid, error)
-  CALL check("h5sclose_f",error,total_error)
-
-END SUBROUTINE test_attr_delete_by_idx
-
-SUBROUTINE test_attr_shared_delete(fcpl, fapl, total_error)
-
-!***************************************************************
-!**
-!**  test_attr_shared_delete(): Test basic H5A (attribute) code.
-!**      Tests deleting shared attributes in "compact" & "dense" storage
-!**
-!***************************************************************
-
-  USE HDF5
-  USE TH5_MISC
-
-  IMPLICIT NONE
-
-  INTEGER(HID_T), INTENT(IN) :: fcpl
-  INTEGER(HID_T), INTENT(IN) :: fapl
-  INTEGER, INTENT(INOUT) :: total_error
-  CHARACTER(LEN=8) :: FileName = "tattr.h5"
-  INTEGER(HID_T) :: fid
-  INTEGER(HID_T) :: dcpl
-  INTEGER(HID_T) :: sid, big_sid
-
-  CHARACTER(LEN=8) :: DSET1_NAME = "Dataset1"
-  CHARACTER(LEN=8) :: DSET2_NAME = "Dataset2"
-
-
-  INTEGER(HID_T) :: dataset, dataset2
-
-  INTEGER :: error
-
-  INTEGER(HID_T) :: attr        !String Attribute identifier
-  INTEGER(HID_T) :: attr_tid
-  INTEGER(HSIZE_T), DIMENSION(7) :: data_dims
-
-
-  INTEGER :: max_compact ! Maximum # of links to store in group compactly
-  INTEGER :: min_dense   ! Minimum # of links to store in group "densely"
-
-  CHARACTER(LEN=2) :: chr2
-
-  INTEGER, DIMENSION(1) ::  attr_integer_data
-  CHARACTER(LEN=7) :: attrname
-
-  INTEGER :: u
-  INTEGER(HID_T) :: my_fcpl
-
-  CHARACTER(LEN=5), PARAMETER :: TYPE1_NAME = "/Type"
-
-  INTEGER :: test_shared
-  INTEGER(HSIZE_T), DIMENSION(1) :: adims2 = (/1/) ! Attribute dimension
-  INTEGER     ::   arank = 1                      ! Attribure rank
-
-  !  Output message about test being performed 
-
-  !  Initialize "big" attribute DATA 
-  !     Create dataspace for dataset 
-  CALL h5screate_f(H5S_SCALAR_F, sid, error)
-  CALL check("h5screate_f",error,total_error)
-
-  ! Create "big" dataspace for "large" attributes 
-
-  CALL h5screate_simple_f(arank, adims2, big_sid, error)
-  CALL check("h5screate_simple_f",error,total_error)
-
-  !  Loop over type of shared components 
-
-  DO test_shared = 0, 2
-
-     !  Make copy of file creation property list 
-
-     CALL H5Pcopy_f(fcpl, my_fcpl, error)
-     CALL check("H5Pcopy",error,total_error)
-
-     !  Set up datatype for attributes 
-
-     CALL H5Tcopy_f(H5T_NATIVE_INTEGER, attr_tid, error)
-     CALL check("H5Tcopy",error,total_error)
-
-     !  Special setup for each type of shared components 
-     IF( test_shared .EQ. 0) THEN
-        !  Make attributes > 500 bytes shared 
-        CALL H5Pset_shared_mesg_nindexes_f(my_fcpl,1,error)
-        CALL check("H5Pset_shared_mesg_nindexes_f",error, total_error)
-        CALL H5Pset_shared_mesg_index_f(my_fcpl, 0, H5O_SHMESG_ATTR_FLAG_F, 500,error)
-        CALL check(" H5Pset_shared_mesg_index_f",error, total_error)
-
-     ELSE
-        !  Set up copy of file creation property list 
-        CALL H5Pset_shared_mesg_nindexes_f(my_fcpl,3,error)
-        !  Make attributes > 500 bytes shared 
-        CALL H5Pset_shared_mesg_index_f(my_fcpl, 0, H5O_SHMESG_ATTR_FLAG_F, 500,error)
-        !  Make datatypes & dataspaces > 1 byte shared (i.e. all of them :-) 
-        CALL H5Pset_shared_mesg_index_f(my_fcpl, 1, H5O_SHMESG_DTYPE_FLAG_F, 1,error)
-        CALL H5Pset_shared_mesg_index_f(my_fcpl, 2,  H5O_SHMESG_SDSPACE_FLAG_F, 1,error)
-     ENDIF
-
-     !  Create file 
-     CALL h5fcreate_f(FileName, H5F_ACC_TRUNC_F, fid, error, my_fcpl, fapl)
-     CALL check("h5fcreate_f",error,total_error)
-
-     !  Close FCPL copy 
-     CALL h5pclose_f(my_fcpl, error)
-     CALL check("h5pclose_f", error, total_error)
-     !  Close file 
-     CALL h5fclose_f(fid, error)
-     CALL check("h5fclose_f",error,total_error)
-
-     !  Re-open file 
-     CALL h5fopen_f(FileName, H5F_ACC_RDWR_F, fid, error,fapl)
-     CALL check("h5open_f",error,total_error)
-
-     !  Commit datatype to file 
-
-     IF(test_shared.EQ.2) THEN
-        CALL H5Tcommit_f(fid, TYPE1_NAME, attr_tid, error, H5P_DEFAULT_F, H5P_DEFAULT_F, H5P_DEFAULT_F)
-        CALL check("H5Tcommit",error,total_error)
-     ENDIF
-
-     !  Set up to query the object creation properties 
-     CALL H5Pcreate_f(H5P_DATASET_CREATE_F,dcpl,error)
-     CALL check("h5Pcreate_f",error,total_error)
-
-     !  Create datasets 
-
-     CALL h5dcreate_f(fid, DSET1_NAME, H5T_NATIVE_CHARACTER, sid, dataset, error, dcpl_id=dcpl )
-     CALL check("h5dcreate_f",error,total_error)
-
-     CALL h5dcreate_f(fid, DSET2_NAME, H5T_NATIVE_CHARACTER, sid, dataset2, error, dcpl_id=dcpl )
-     CALL check("h5dcreate_f",error,total_error)
-
-     !  Retrieve limits for compact/dense attribute storage 
-     CALL H5Pget_attr_phase_change_f(dcpl, max_compact, min_dense, error)
-     CALL check("H5Pget_attr_phase_change_f",error,total_error)
-
-     !  Close property list 
-     CALL h5pclose_f(dcpl,error)
-     CALL check("h5pclose_f", error, total_error)
-
-     !  Add attributes to each dataset, until after converting to dense storage 
-
-     DO u = 0, (max_compact * 2) - 1
-
-        !  Create attribute name 
-        WRITE(chr2,'(I2.2)') u
-        attrname = 'attr '//chr2
-
-        !  Alternate between creating "small" & "big" attributes 
-
-        IF(MOD(u+1,2).EQ.0)THEN
-           !  Create "small" attribute on first dataset 
-
-           CALL h5acreate_f(dataset, attrname, attr_tid, sid, attr, error, H5P_DEFAULT_F, H5P_DEFAULT_F)
-           CALL check("h5acreate_f",error,total_error)
-
-           !  Write data into the attribute 
-           attr_integer_data(1) = u + 1
-           data_dims(1) = 1
-           CALL h5awrite_f(attr, attr_tid, attr_integer_data, data_dims, error)
-           CALL check("h5awrite_f",error,total_error)
-        ELSE
-           !  Create "big" attribute on first dataset 
-
-           CALL h5acreate_f(dataset, attrname, attr_tid, big_sid, attr, error)
-           CALL check("h5acreate_f",error,total_error)
-
-           !  Write data into the attribute 
-
-           attr_integer_data(1) = u + 1
-           data_dims(1) = 1
-           CALL h5awrite_f(attr,  attr_tid, attr_integer_data, data_dims, error)
-           CALL check("h5awrite_f",error,total_error)
-
-        ENDIF
-
-        !  Close attribute 
-        CALL h5aclose_f(attr, error)
-        CALL check("h5aclose_f",error,total_error)
-
-        !  Alternate between creating "small" & "big" attributes 
-        IF(MOD(u+1,2).EQ.0)THEN
-
-           !   Create "small" attribute on second dataset 
-
-           CALL h5acreate_f(dataset2, attrname, attr_tid, sid, attr, error)
-           CALL check("h5acreate_f",error,total_error)
-
-           !  Write data into the attribute 
-           attr_integer_data(1) = u + 1
-           data_dims(1) = 1
-           CALL h5awrite_f(attr, attr_tid, attr_integer_data, data_dims, error)
-           CALL check("h5awrite_f",error,total_error)
-        ELSE
-
-           !  Create "big" attribute on second dataset 
-
-           CALL h5acreate_f(dataset2, attrname, attr_tid, big_sid, attr, error, acpl_id=H5P_DEFAULT_F, aapl_id=H5P_DEFAULT_F)
-           CALL check("h5acreate_f",error,total_error)
-
-!  Write data into the attribute 
-
-
-           attr_integer_data(1) = u + 1
-           data_dims(1) = 1
-           CALL h5awrite_f(attr,  attr_tid, attr_integer_data, data_dims, error)
-           CALL check("h5awrite_f",error,total_error)
-
-        ENDIF
-        !  Close attribute 
-        CALL h5aclose_f(attr, error)
-        CALL check("h5aclose_f",error,total_error)
-
-     ENDDO
-
-     !  Delete attributes from second dataset 
-
-     DO u = 0, max_compact*2-1
-
-        !  Create attribute name 
-        WRITE(chr2,'(I2.2)') u
-        attrname = 'attr '//chr2
-
-        !  Delete second dataset's attribute 
-        CALL H5Adelete_by_name_f(fid, DSET2_NAME, attrname,error,lapl_id=H5P_DEFAULT_F)
-        CALL check("H5Adelete_by_name", error, total_error)
-
-        CALL h5aopen_f(dataset, attrname, attr, error, aapl_id=H5P_DEFAULT_F)
-        CALL check("h5aopen_f",error,total_error)
-
-
-        !  Close attribute 
-        CALL h5aclose_f(attr, error)
-        CALL check("h5aclose_f",error,total_error)
-     ENDDO
-
-     !  Close attribute's datatype 
-
-     CALL h5tclose_f(attr_tid, error)
-     CALL check("h5tclose_f",error,total_error)
-
-     !  Close Datasets 
-
-     CALL h5dclose_f(dataset, error)
-     CALL check("h5dclose_f",error,total_error)
-     CALL h5dclose_f(dataset2, error)
-     CALL check("h5dclose_f",error,total_error)
-
-     !  Unlink datasets WITH attributes 
-
-     CALL h5ldelete_f(fid, DSET1_NAME, error, H5P_DEFAULT_F)
-     CALL check("H5Ldelete_f", error, total_error)
-     CALL h5ldelete_f(fid, DSET2_NAME, error)
-     CALL check("H5Ldelete_f", error, total_error)
-
-     !  Unlink committed datatype 
-
-     IF( test_shared == 2) THEN
-        CALL h5ldelete_f(fid, TYPE1_NAME, error)
-        CALL check("H5Ldelete_f", error, total_error)
-     ENDIF
-
-
-     !  Close file 
-     CALL h5fclose_f(fid, error)
-     CALL check("h5fclose_f",error,total_error)
-
-  ENDDO
-
-  !  Close dataspaces 
-  CALL h5sclose_f(sid, error)
-  CALL check("h5sclose_f",error,total_error)
-  CALL h5sclose_f(big_sid, error)
-  CALL check("h5sclose_f",error,total_error)
-
-END SUBROUTINE test_attr_shared_delete
-
-
-
-SUBROUTINE test_attr_dense_open( fcpl, fapl, total_error)
-
-!***************************************************************
-!**
-!**  test_attr_dense_open(): Test basic H5A (attribute) code.
-!**      Tests opening attributes in "dense" storage
-!**
-!***************************************************************
-
-  USE HDF5
-  USE TH5_MISC
-
-  IMPLICIT NONE
-
-  INTEGER(HID_T), INTENT(IN) :: fcpl
-  INTEGER(HID_T), INTENT(IN) :: fapl
-  INTEGER, INTENT(INOUT) :: total_error
-  CHARACTER(LEN=8) :: FileName = "tattr.h5"
-  INTEGER(HID_T) :: fid
-  INTEGER(HID_T) :: dcpl
-  INTEGER(HID_T) :: sid
-
-  CHARACTER(LEN=8) :: DSET1_NAME = "Dataset1"
-
-  INTEGER :: error
-  INTEGER(HID_T) :: attr        !String Attribute identifier
-  INTEGER(HSIZE_T), DIMENSION(7) :: data_dims
-
-
-  INTEGER :: max_compact ! Maximum # of links to store in group compactly
-  INTEGER :: min_dense   ! Minimum # of links to store in group "densely"
-
-  CHARACTER(LEN=2) :: chr2
-
-
-  CHARACTER(LEN=7) :: attrname
-
-  INTEGER(HID_T) :: dataset
-  INTEGER :: u
-
-  data_dims = 0
-
-
-  !  Create file 
-
-  CALL h5fcreate_f(FileName, H5F_ACC_TRUNC_F, fid, error, fcpl, fapl)
-  CALL check("h5fcreate_f",error,total_error)
-
-  !  Close file 
-  CALL h5fclose_f(fid, error)
-  CALL check("h5fclose_f",error,total_error)
-
-
-
-  !  Re-open file 
-  CALL h5fopen_f(FileName, H5F_ACC_RDWR_F, fid, error, fapl)
-  CALL check("h5open_f",error,total_error)
-
-  !  Create dataspace for dataset 
-  CALL h5screate_f(H5S_SCALAR_F, sid, error)
-  CALL check("h5screate_f",error,total_error)
-
-  !  Query the group creation properties 
-  CALL H5Pcreate_f(H5P_DATASET_CREATE_F,dcpl,error)
-  CALL check("h5Pcreate_f",error,total_error)
-
-  !  Enable creation order tracking on attributes, so creation order tests work 
-  CALL H5Pset_attr_creation_order_f(dcpl, H5P_CRT_ORDER_TRACKED_F, error)
-  CALL check("H5Pset_attr_creation_order",error,total_error)
-
-  !  Create a dataset 
-
-  CALL h5dcreate_f(fid, DSET1_NAME, H5T_NATIVE_CHARACTER, sid, dataset, error, &
-       lcpl_id=H5P_DEFAULT_F, dcpl_id=dcpl, dapl_id=H5P_DEFAULT_F)
-  CALL check("h5dcreate_f",error,total_error)
-
-  !  Retrieve limits for compact/dense attribute storage 
-  CALL H5Pget_attr_phase_change_f(dcpl, max_compact, min_dense, error)
-  CALL check("H5Pget_attr_phase_change_f",error,total_error)
-
-  !  Close property list 
-  CALL h5pclose_f(dcpl, error)
-  CALL check("h5pclose_f",error,total_error)
-
-  !  Add attributes, until just before converting to dense storage 
-
-  DO u = 0, max_compact - 1
-     !  Create attribute 
-     WRITE(chr2,'(I2.2)') u
-     attrname = 'attr '//chr2
-
-     CALL h5acreate_f(dataset, attrname, H5T_NATIVE_INTEGER, sid, attr, error, aapl_id=H5P_DEFAULT_F)
-     CALL check("h5acreate_f",error,total_error)
-
-     !  Write data into the attribute 
-
-     data_dims(1) = 1
-     CALL h5awrite_f(attr, H5T_NATIVE_INTEGER, u, data_dims, error)
-     CALL check("h5awrite_f",error,total_error)
-
-     !  Close attribute 
-     CALL h5aclose_f(attr, error)
-     CALL check("h5aclose_f",error,total_error)
-
-     !  Verify attributes written so far 
-     CALL test_attr_dense_verify(dataset, u, total_error)
-  ENDDO
-!
-!     Add one more attribute, to push into "dense" storage 
-!     Create attribute 
-
-  WRITE(chr2,'(I2.2)') u
-  attrname = 'attr '//chr2
-
-  CALL h5acreate_f(dataset, attrname, H5T_NATIVE_INTEGER, sid, attr, error, aapl_id=H5P_DEFAULT_F)
-  CALL check("h5acreate_f",error,total_error)
-
-  !  Write data into the attribute 
-  data_dims(1) = 1
-  CALL h5awrite_f(attr, H5T_NATIVE_INTEGER, u, data_dims, error)
-  CALL check("h5awrite_f",error,total_error)
-
-  !  Close attribute 
-  CALL h5aclose_f(attr, error)
-  CALL check("h5aclose_f",error,total_error)
-
-  !  Close dataspace 
-  CALL h5sclose_f(sid, error)
-  CALL check("h5sclose_f",error,total_error)
-
-  !  Verify all the attributes written 
-  !  ret = test_attr_dense_verify(dataset, (u + 1));
-  !  CHECK(ret, FAIL, "test_attr_dense_verify");
-
-  !  CLOSE Dataset 
-  CALL h5dclose_f(dataset, error)
-  CALL check("h5dclose_f",error,total_error)
-
-  !  Unlink dataset with attributes 
-  CALL h5ldelete_f(fid, DSET1_NAME, error, H5P_DEFAULT_F)
-  CALL check("H5Ldelete_f", error, total_error)
-
-  !  Close file 
-  CALL h5fclose_f(fid, error)
-  CALL check("h5fclose_f",error,total_error)
-
-  !  Check size of file 
-  !  filesize = h5_get_file_size(FILENAME);
-  !  VERIFY(filesize, empty_filesize, "h5_get_file_size")
-
-END SUBROUTINE test_attr_dense_open
-
-!***************************************************************
-!**
-!**  test_attr_dense_verify(): Test basic H5A (attribute) code.
-!**      Verify attributes on object
-!**
-!***************************************************************
-
-SUBROUTINE test_attr_dense_verify(loc_id, max_attr, total_error)
-
-  USE HDF5
-  USE TH5_MISC
-
-  IMPLICIT NONE
-
-  INTEGER(HID_T), INTENT(IN) :: loc_id
-  INTEGER, INTENT(IN) :: max_attr
-  INTEGER, INTENT(INOUT) :: total_error
-
-  INTEGER(SIZE_T), PARAMETER :: ATTR_NAME_LEN = 8 ! FIX, why if 7 does not work?
-
-  INTEGER :: u
-  CHARACTER(LEN=2) :: chr2
-  CHARACTER(LEN=ATTR_NAME_LEN) :: attrname
-  CHARACTER(LEN=ATTR_NAME_LEN) :: check_name
-  INTEGER(HSIZE_T), DIMENSION(7) :: data_dims
-
-  INTEGER(HID_T) :: attr        !String Attribute identifier
-  INTEGER :: error
-  INTEGER :: value
-
-  data_dims = 0
-
-
-    !  Retrieve the current # of reported errors 
-    ! old_nerrs = GetTestNumErrs();
-
-    !  Re-open all the attributes by name and verify the data 
-
-  DO u = 0, max_attr -1
-
-     !  Open attribute 
-     WRITE(chr2,'(I2.2)') u
-     attrname = 'attr '//chr2
-
-     CALL h5aopen_f(loc_id, attrname, attr, error)
-     CALL check("h5aopen_f",error,total_error)
-
-     !  Read data from the attribute 
-
-!     value = 103
-     data_dims(1) = 1
-     CALL h5aread_f(attr, H5T_NATIVE_INTEGER, value, data_dims, error)
-
-     CALL CHECK("H5Aread_F", error, total_error)
-     CALL VERIFY("H5Aread_F", value, u, total_error)
-
-     !  Close attribute 
-     CALL h5aclose_f(attr, error)
-     CALL check("h5aclose_f",error,total_error)
-  ENDDO
-
-  !  Re-open all the attributes by index and verify the data 
-
-  DO u=0, max_attr-1
-
-
-     !  Open attribute 
-
-     CALL H5Aopen_by_idx_f(loc_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_INC_F, INT(u,HSIZE_T), &
-          attr, error, aapl_id=H5P_DEFAULT_F)
-
-     !  Verify Name 
-
-     WRITE(chr2,'(I2.2)') u
-     attrname = 'attr '//chr2
-
-     CALL H5Aget_name_f(attr, ATTR_NAME_LEN, check_name, error)
-     CALL check('H5Aget_name',error,total_error)
-     IF(check_name.NE.attrname) THEN
-        WRITE(*,*) 'ERROR: attribute name different: attr_name = ',check_name, ', should be ', attrname
-        total_error = total_error + 1
-     ENDIF
-     !  Read data from the attribute 
-     data_dims(1) = 1
-     CALL h5aread_f(attr, H5T_NATIVE_INTEGER, value, data_dims, error)
-     CALL CHECK("H5Aread_f", error, total_error)
-     CALL VERIFY("H5Aread_f", value, u, total_error)
-
-
-     !  Close attribute 
-     CALL h5aclose_f(attr, error)
-     CALL check("h5aclose_f",error,total_error)
-  ENDDO
-
-END SUBROUTINE test_attr_dense_verify
-
-!***************************************************************
-!**
-!**  test_attr_corder_create_empty(): Test basic H5A (attribute) code.
-!**      Tests basic code to create objects with attribute creation order info
-!**
-!***************************************************************
-
-SUBROUTINE test_attr_corder_create_basic( fcpl, fapl, total_error )
-
-  USE HDF5
-  USE TH5_MISC
-
-  IMPLICIT NONE
-
-  INTEGER(HID_T), INTENT(IN) :: fcpl
-  INTEGER(HID_T), INTENT(IN) :: fapl
-  INTEGER, INTENT(INOUT) :: total_error
-  CHARACTER(LEN=8) :: FileName = "tattr.h5"
-  INTEGER(HID_T) :: fid
-  INTEGER(HID_T) :: dcpl
-  INTEGER(HID_T) :: sid
-
-  CHARACTER(LEN=8) :: DSET1_NAME = "Dataset1"
-
-  INTEGER(HID_T) :: dataset
-
-  INTEGER :: error
-
-  INTEGER :: crt_order_flags
-  INTEGER :: minusone = -1
-
-  !  Output message about test being performed 
-!  WRITE(*,*) "     - Testing Basic Code for Attributes with Creation Order Info"
-
-  !  Create file 
-  CALL h5fcreate_f(FileName, H5F_ACC_TRUNC_F, fid, error, fcpl, fapl)
-  CALL check("h5fcreate_f",error,total_error)
-
-  !  Create dataset creation property list 
-  CALL H5Pcreate_f(H5P_DATASET_CREATE_F,dcpl,error)
-  CALL check("h5Pcreate_f",error,total_error)
-
-  !  Get creation order indexing on object 
-  CALL H5Pget_attr_creation_order_f(dcpl, crt_order_flags, error)
-  CALL check("H5Pget_attr_creation_order_f",error,total_error)
-  CALL VERIFY("H5Pget_attr_creation_order_f",crt_order_flags , 0, total_error)
-
-  !  Setting invalid combination of a attribute order creation order indexing on should fail 
-  CALL H5Pset_attr_creation_order_f(dcpl, H5P_CRT_ORDER_INDEXED_F, error)
-  CALL VERIFY("H5Pset_attr_creation_order_f",error , minusone, total_error)
-  CALL H5Pget_attr_creation_order_f(dcpl, crt_order_flags, error)
-  CALL check("H5Pget_attr_creation_order_f",error,total_error)
-  CALL VERIFY("H5Pget_attr_creation_order_f",crt_order_flags , 0, total_error)
-
-  !  Set attribute creation order tracking & indexing for object 
-  CALL h5pset_attr_creation_order_f(dcpl, IOR(H5P_CRT_ORDER_TRACKED_F, H5P_CRT_ORDER_INDEXED_F), error)
-  CALL check("H5Pset_attr_creation_order_f",error,total_error)
-
-  CALL H5Pget_attr_creation_order_f(dcpl, crt_order_flags, error)
-  CALL check("H5Pget_attr_creation_order_f",error,total_error)
-  CALL VERIFY("H5Pget_attr_creation_order_f",crt_order_flags , &
-       IOR(H5P_CRT_ORDER_TRACKED_F, H5P_CRT_ORDER_INDEXED_F), total_error)
-
-  !  Create dataspace for dataset 
-  CALL h5screate_f(H5S_SCALAR_F, sid, error)
-  CALL check("h5screate_f",error,total_error)
-
-  !  Create a dataset 
-  CALL h5dcreate_f(fid, DSET1_NAME, H5T_NATIVE_CHARACTER, sid, dataset, error, &
-       lcpl_id=H5P_DEFAULT_F, dapl_id=H5P_DEFAULT_F, dcpl_id=dcpl)
-  CALL check("h5dcreate_f",error,total_error)
-
-  !  Close dataspace 
-  CALL h5sclose_f(sid, error)
-  CALL check("h5sclose_f",error,total_error)
-
-
-  !  Close Dataset 
-  CALL h5dclose_f(dataset, error)
-  CALL check("h5dclose_f",error,total_error)
-
-  !  Close property list 
-  CALL h5pclose_f(dcpl, error)
-  CALL check("h5pclose_f",error,total_error)
-
-  !  Close file 
-  CALL h5fclose_f(fid, error)
-  CALL check("h5fclose_f",error,total_error)
-
-  !  Re-open file 
-  CALL h5fopen_f(FileName, H5F_ACC_RDWR_F, fid, error, fapl)
-  CALL check("h5open_f",error,total_error)
-
-  !  Open dataset created 
-  CALL h5dopen_f(fid, DSET1_NAME, dataset, error, H5P_DEFAULT_F )
-  CALL check("h5dopen_f",error,total_error)
-
-
-  !  Retrieve dataset creation property list for group 
-  CALL H5Dget_create_plist_f(dataset, dcpl, error)
-  CALL check("H5Dget_create_plist_f",error,total_error)
-
-  !  Query the attribute creation properties 
-  CALL H5Pget_attr_creation_order_f(dcpl, crt_order_flags, error)
-  CALL check("H5Pget_attr_creation_order_f",error,total_error)
-  CALL VERIFY("H5Pget_attr_creation_order_f",crt_order_flags , &
-       IOR(H5P_CRT_ORDER_TRACKED_F, H5P_CRT_ORDER_INDEXED_F), total_error )
-
-  !  Close property list 
-  CALL h5pclose_f(dcpl, error)
-  CALL check("h5pclose_f",error,total_error)
-
-  !  Close Dataset 
-  CALL h5dclose_f(dataset, error)
-  CALL check("h5dclose_f",error,total_error)
-
-  !  Close file 
-  CALL h5fclose_f(fid, error)
-  CALL check("h5fclose_f",error,total_error)
-
-
-END SUBROUTINE test_attr_corder_create_basic
-
-!***************************************************************
-!**
-!**  test_attr_basic_write(): Test basic H5A (attribute) code.
-!**      Tests integer attributes on both datasets and groups
-!**
-!***************************************************************
-
-SUBROUTINE test_attr_basic_write(fapl, total_error)
-
-  USE HDF5
-  USE TH5_MISC
-
-  IMPLICIT NONE
-
-  INTEGER(HID_T), INTENT(IN) :: fapl
-  INTEGER, INTENT(INOUT) :: total_error
-  CHARACTER(LEN=8) :: FileName = "tattr.h5"
-  INTEGER(HID_T) :: fid1
-  INTEGER(HID_T) :: sid1, sid2
-
-  CHARACTER(LEN=8) :: DSET1_NAME = "Dataset1"
-
-  INTEGER(HID_T) :: dataset
-  INTEGER :: i
-  INTEGER :: error
-
-  INTEGER(HID_T) :: attr,attr2        !String Attribute identifier
-  INTEGER(HID_T) :: group
-
-  CHARACTER(LEN=25) :: check_name
-  CHARACTER(LEN=18) :: chr_exact_size
-
-  CHARACTER(LEN=5), PARAMETER ::  ATTR1_NAME="Attr1"
-  INTEGER, PARAMETER :: ATTR1_RANK = 1
-  INTEGER, PARAMETER ::  ATTR1_DIM1 = 3
-  CHARACTER(LEN=7), PARAMETER :: ATTR1A_NAME ="Attr1_a"
-  CHARACTER(LEN=18), PARAMETER :: ATTR_TMP_NAME = "Attr1_a-1234567890"
-  INTEGER, DIMENSION(ATTR1_DIM1) :: attr_data1
-  INTEGER, DIMENSION(ATTR1_DIM1) :: attr_data1a
-  INTEGER, DIMENSION(ATTR1_DIM1) :: read_data1
-  INTEGER(HSIZE_T) :: attr_size   ! attributes storage requirements .MSB.
-  INTEGER(HSIZE_T), DIMENSION(1) :: dimsa = (/3/) ! Dataset dimensions
-
-  INTEGER     ::   rank1 = 2               ! Dataspace1 rank
-  INTEGER(HSIZE_T), DIMENSION(2) :: dims1 = (/4,6/) ! Dataset dimensions
-  INTEGER(HSIZE_T), DIMENSION(2) :: maxdims1 = (/4,6/) ! maximum dimensions
-
-  INTEGER(SIZE_T) :: size
-
-!! Initialize attribute data
-  attr_data1(1) = 258
-  attr_data1(2) = 9987
-  attr_data1(3) = -99890
-
-  attr_data1a(1) = 258
-  attr_data1a(2) = 1087
-  attr_data1a(3) = -99890
-
-
-  !  Create file 
-  CALL h5fcreate_f(FileName, H5F_ACC_TRUNC_F, fid1, error, H5P_DEFAULT_F, fapl)
-  CALL check("h5fcreate_f",error,total_error)
-
-  !  Create dataspace for dataset 
-  CALL h5screate_simple_f(rank1, dims1, sid1, error, maxdims1)
-  CALL check("h5screate_simple_f",error,total_error)
-
-  !  Create a dataset 
-  CALL h5dcreate_f(fid1, DSET1_NAME, H5T_NATIVE_CHARACTER, sid1, dataset, error, H5P_DEFAULT_F, H5P_DEFAULT_F, H5P_DEFAULT_F )
-  CALL check("h5dcreate_f",error,total_error)
-
-  !  Create dataspace for attribute 
-  CALL h5screate_simple_f(ATTR1_RANK, dimsa, sid2, error)
-  CALL check("h5screate_simple_f",error,total_error)
-
-  !  Try to create an attribute on the file (should create an attribute on root group) 
-  CALL h5acreate_f(fid1, ATTR1_NAME, H5T_NATIVE_INTEGER, sid2, attr, error, aapl_id=H5P_DEFAULT_F, acpl_id=H5P_DEFAULT_F)
-  CALL check("h5acreate_f",error,total_error)
-
-  !   Close attribute 
-  CALL h5aclose_f(attr, error)
-  CALL check("h5aclose_f",error,total_error)
-
-  !  Open the root group 
-  CALL H5Gopen_f(fid1, "/", group, error, H5P_DEFAULT_F)
-  CALL check("H5Gopen_f",error,total_error)
-
-  !  Open attribute again 
-  CALL h5aopen_f(group,  ATTR1_NAME, attr, error)
-  CALL check("h5aopen_f",error,total_error)
-
-  !  Close attribute 
-  CALL h5aclose_f(attr, error)
-  CALL check("h5aclose_f",error,total_error)
-
-  !  Close root group 
-  CALL  H5Gclose_f(group, error)
-  CALL check("h5gclose_f",error,total_error)
-
-  !  Create an attribute for the dataset 
-  CALL h5acreate_f(dataset, ATTR1_NAME, H5T_NATIVE_INTEGER, sid2, attr, error, H5P_DEFAULT_F, H5P_DEFAULT_F)
-  CALL check("h5acreate_f",error,total_error)
-
-  !  Write attribute information 
-
-  CALL h5awrite_f(attr, H5T_NATIVE_INTEGER, attr_data1, dimsa, error)
-  CALL check("h5awrite_f",error,total_error)
-
-  !  Create an another attribute for the dataset 
-  CALL h5acreate_f(dataset, ATTR1A_NAME, H5T_NATIVE_INTEGER, sid2, attr2, error, H5P_DEFAULT_F, H5P_DEFAULT_F)
-  CALL check("h5acreate_f",error,total_error)
-
-  !  Write attribute information 
-  CALL h5awrite_f(attr2, H5T_NATIVE_INTEGER, attr_data1a, dimsa, error)
-  CALL check("h5awrite_f",error,total_error)
-
-  !  Check storage size for attribute 
-
-  CALL h5aget_storage_size_f(attr, attr_size, error)
-  CALL check("h5aget_storage_size_f",error,total_error)
-!EP  CALL VERIFY("h5aget_storage_size_f", INT(attr_size), 2*HSIZE_T, total_error)
-
-
-  !  Read attribute information immediately, without closing attribute 
-  CALL h5aread_f(attr, H5T_NATIVE_INTEGER, read_data1, dimsa, error)
-  CALL check("h5aread_f",error,total_error)
-
-  !  Verify values read in 
-  DO i = 1, ATTR1_DIM1
-     CALL VERIFY('h5aread_f',attr_data1(i),read_data1(i), total_error)
-  ENDDO
-
-  !  CLOSE attribute 
-  CALL h5aclose_f(attr, error)
-  CALL check("h5aclose_f",error,total_error)
-
-  !  Close attribute 
-  CALL h5aclose_f(attr2, error)
-  CALL check("h5aclose_f",error,total_error)
-
-  !  change attribute name 
-  CALL H5Arename_f(dataset, ATTR1_NAME, ATTR_TMP_NAME, error)
-  CALL check("H5Arename_f", error, total_error)
-
-  !  Open attribute again 
-
-  CALL h5aopen_f(dataset,  ATTR_TMP_NAME, attr, error)
-  CALL check("h5aopen_f",error,total_error)
-
-  !  Verify new attribute name 
-  ! Set a deliberately small size
-
-  check_name = '                         ' ! need to initialize or does not pass test
-
-  size = 1
-  CALL H5Aget_name_f(attr, size, check_name, error)
-  CALL check('H5Aget_name',error,total_error)
-
-  ! Now enter with the corrected size
-  IF(error.NE.size)THEN
-     size = error
-     CALL H5Aget_name_f(attr, size, check_name, error)
-     CALL check('H5Aget_name',error,total_error)
-  ENDIF
-
-  IF(TRIM(ADJUSTL(check_name)).NE.TRIM(ADJUSTL(ATTR_TMP_NAME))) THEN
-     PRINT*,'.'//TRIM(check_name)//'.',LEN_TRIM(check_name)
-     PRINT*,'.'//TRIM(ATTR_TMP_NAME)//'.',LEN_TRIM(ATTR_TMP_NAME)
-     WRITE(*,*) 'ERROR: attribute name different: attr_name ='//TRIM(check_name)//'.'
-     WRITE(*,*) '                                 should be ='//TRIM(ATTR_TMP_NAME)//'.'
-     total_error = total_error + 1
-     stop
-  ENDIF
-
-  ! Try with a string buffer that is exactly the correct size
-  size = 18
-  CALL H5Aget_name_f(attr, size, chr_exact_size, error)
-  CALL check('H5Aget_name_f',error,total_error)
-  CALL VerifyString('H5Aget_name_f',chr_exact_size,ATTR_TMP_NAME, total_error)
-
-  !  Close attribute 
-  CALL h5aclose_f(attr, error)
-  CALL check("h5aclose_f",error,total_error)
-
-  CALL h5sclose_f(sid1, error)
-  CALL check("h5sclose_f",error,total_error)
-  CALL h5sclose_f(sid2, error)
-  CALL check("h5sclose_f",error,total_error)
-  ! Close Dataset 
-  CALL h5dclose_f(dataset, error)
-  CALL check("h5dclose_f",error,total_error)
-
-  !  Close file 
-  CALL h5fclose_f(fid1, error)
-  CALL check("h5fclose_f",error,total_error)
-
-END SUBROUTINE test_attr_basic_write
-
-!***************************************************************
-!**
-!**  test_attr_many(): Test basic H5A (attribute) code.
-!**      Tests storing lots of attributes
-!**
-!***************************************************************
-
-SUBROUTINE test_attr_many(new_format, fcpl, fapl, total_error)
-
-  USE HDF5
-  USE TH5_MISC
-
-  IMPLICIT NONE
-
-  LOGICAL, INTENT(IN) :: new_format
-  INTEGER(HID_T), INTENT(IN) :: fcpl
-  INTEGER(HID_T), INTENT(IN) :: fapl
-  INTEGER, INTENT(INOUT) :: total_error
-  CHARACTER(LEN=8) :: FileName = "tattr.h5"
-  INTEGER(HID_T) :: fid
-  INTEGER(HID_T) :: sid
-  INTEGER(HID_T) :: gid
-  INTEGER(HID_T) :: aid
-  INTEGER :: error
-
-  INTEGER(HSIZE_T), DIMENSION(7) :: data_dims
-  CHARACTER(LEN=5) :: chr5
-
-
-  CHARACTER(LEN=11) :: attrname
-  CHARACTER(LEN=8), PARAMETER :: GROUP1_NAME="/Group1"
-
-  INTEGER :: u
-  INTEGER :: nattr
-  LOGICAL :: exists
-  INTEGER, DIMENSION(1) ::  attr_data1
-
-  data_dims = 0
-
-
-  ! Create file 
-  CALL h5fcreate_f(FileName, H5F_ACC_TRUNC_F, fid, error, fcpl, fapl)
-  CALL check("h5fcreate_f",error,total_error)
-
-  !  Create dataspace for attribute 
-  CALL h5screate_f(H5S_SCALAR_F, sid, error)
-  CALL check("h5screate_f",error,total_error)
-
-  !  Create group for attributes 
-
-  CALL H5Gcreate_f(fid, GROUP1_NAME, gid, error)
-  CALL check("H5Gcreate_f", error, total_error)
-
-  !  Create many attributes 
-
-  IF(new_format)THEN
-     nattr = 250
-  ELSE
-     nattr = 2
-  ENDIF
-
-  DO u = 0, nattr - 1
-
-     WRITE(chr5,'(I5.5)') u
-     attrname = 'attr '//chr5
-     CALL H5Aexists_f( gid, attrname, exists, error)
-     CALL VerifyLogical("H5Aexists",exists,.FALSE.,total_error )
-
-     CALL H5Aexists_by_name_f(fid, GROUP1_NAME, attrname,  exists, error, lapl_id = H5P_DEFAULT_F)
-     CALL VerifyLogical("H5Aexists_by_name_f",exists,.FALSE.,total_error )
-
-     CALL h5acreate_f(gid, attrname, H5T_NATIVE_INTEGER, sid, aid, error, H5P_DEFAULT_F, H5P_DEFAULT_F)
-     CALL check("h5acreate_f",error,total_error)
-
-     CALL H5Aexists_f(gid, attrname, exists, error)
-     CALL VerifyLogical("H5Aexists",exists,.TRUE.,total_error )
-
-     CALL H5Aexists_by_name_f(fid, GROUP1_NAME, attrname, exists, error)
-     CALL VerifyLogical("H5Aexists_by_name_f",exists,.TRUE.,total_error )
-
-     attr_data1(1) = u
-     data_dims(1) = 1
-
-     CALL h5awrite_f(aid, H5T_NATIVE_INTEGER, attr_data1, data_dims, error)
-     CALL check("h5awrite_f",error,total_error)
-
-     CALL h5aclose_f(aid, error)
-     CALL check("h5aclose_f",error,total_error)
-
-     CALL H5Aexists_f(gid, attrname, exists, error)
-     CALL VerifyLogical("H5Aexists",exists,.TRUE.,total_error )
-
-     CALL H5Aexists_by_name_f(fid, GROUP1_NAME, attrname, exists, error)
-     CALL VerifyLogical("H5Aexists_by_name_f",exists,.TRUE.,total_error )
-
-  ENDDO
-
-  !  Close group 
-  CALL  H5Gclose_f(gid, error)
-  CALL check("h5gclose_f",error,total_error)
-
-  !  Close file 
-  CALL h5fclose_f(fid, error)
-  CALL check("h5fclose_f",error,total_error)
-
-  !  Close dataspaces 
-  CALL h5sclose_f(sid, error)
-  CALL check("h5sclose_f",error,total_error)
-
-END SUBROUTINE test_attr_many
-
-!-------------------------------------------------------------------------
-! * Function:    attr_open_check
-! *
-! * Purpose:     Check opening attribute on an object
-! *
-! * Return:      Success:        0
-! *              Failure:        -1
-! *
-! * Programmer:  Fortran version (M.S. Breitenfeld)
-! *              March 21, 2008
-! *
-! *-------------------------------------------------------------------------
-! 
-
-SUBROUTINE attr_open_check(fid, dsetname, obj_id, max_attrs, total_error )
-
-  USE HDF5
-  USE TH5_MISC
-
-  IMPLICIT NONE
-  INTEGER(HID_T), INTENT(IN) :: fid
-  CHARACTER(LEN=*), INTENT(IN) :: dsetname
-  INTEGER(HID_T), INTENT(IN) :: obj_id
-  INTEGER, INTENT(IN) :: max_attrs
-  INTEGER, INTENT(INOUT) :: total_error
-
-  INTEGER :: u
-  CHARACTER (LEN=8) :: attrname
-  INTEGER :: error
-  LOGICAL :: f_corder_valid ! Indicates whether the the creation order data is valid for this attribute
-  INTEGER :: corder ! Is a positive integer containing the creation order of the attribute
-  INTEGER :: cset ! Indicates the character set used for the attribute’s name
-  INTEGER(HSIZE_T) :: data_size   ! indicates the size, in the number of characters
-
-  INTEGER(HSIZE_T) :: storage_size   ! attributes storage requirements
-  CHARACTER(LEN=2) :: chr2
-  INTEGER(HID_T) attr_id
-  !  Open each attribute on object by index and check that it's the correct one 
-
-  DO u = 0, max_attrs-1
-     !  Open the attribute 
-
-     WRITE(chr2,'(I2.2)') u
-     attrname = 'attr '//chr2
-
-
-     CALL h5aopen_f(obj_id, attrname, attr_id, error)
-     CALL check("h5aopen_f",error,total_error)
-
-
-     !  Get the attribute's information 
-
-     CALL h5aget_info_f(attr_id, f_corder_valid, corder, cset, data_size,  error)
-     CALL check("h5aget_info_f",error,total_error)
-
-     !  Check that the object's attributes are correct 
-     CALL VERIFY("h5aget_info_f.corder",corder,u,total_error)
-     CALL Verifylogical("h5aget_info_f.corder_valid",f_corder_valid,.TRUE.,total_error)
-     CALL VERIFY("h5aget_info_f.cset", cset, H5T_CSET_ASCII_F, total_error)
-     CALL h5aget_storage_size_f(attr_id, storage_size, error)
-     CALL check("h5aget_storage_size_f",error,total_error)
-
-     CALL VERIFY("h5aget_info_f.data_size", INT(data_size), INT(storage_size), total_error)
-
-
-     !  Close attribute 
-     CALL h5aclose_f(attr_id, error)
-     CALL check("h5aclose_f",error,total_error)
-
-     !  Open the attribute 
-
-     CALL H5Aopen_by_name_f(obj_id, ".", attrname, attr_id, error, lapl_id=H5P_DEFAULT_F, aapl_id=H5P_DEFAULT_F)
-     CALL check("H5Aopen_by_name_f", error, total_error)
-
-     CALL h5aget_info_f(attr_id, f_corder_valid, corder, cset, data_size,  error)
-     CALL check("h5aget_info_f",error,total_error)
-     !  Check the attribute's information 
-     CALL VERIFY("h5aget_info_f",corder,u,total_error)
-     CALL Verifylogical("h5aget_info_f",f_corder_valid,.TRUE.,total_error)
-     CALL VERIFY("h5aget_info_f", cset, H5T_CSET_ASCII_F, total_error)
-     CALL h5aget_storage_size_f(attr_id, storage_size, error)
-     CALL check("h5aget_storage_size_f",error,total_error)
-     CALL VERIFY("h5aget_info_f", INT(data_size), INT(storage_size), total_error)
-
-     !  Close attribute 
-     CALL h5aclose_f(attr_id, error)
-     CALL check("h5aclose_f",error,total_error)
-
-
-     !  Open the attribute 
-     CALL H5Aopen_by_name_f(fid, dsetname, attrname, attr_id, error)
-     CALL check("H5Aopen_by_name_f", error, total_error)
-
-
-     !  Get the attribute's information 
-     CALL h5aget_info_f(attr_id, f_corder_valid, corder, cset, data_size,  error)
-     CALL check("h5aget_info_f",error,total_error)
-
-     !  Check the attribute's information 
-     CALL VERIFY("h5aget_info_f",corder,u,total_error)
-     CALL Verifylogical("h5aget_info_f",f_corder_valid,.TRUE.,total_error)
-     CALL VERIFY("h5aget_info_f", cset, H5T_CSET_ASCII_F, total_error)
-     CALL h5aget_storage_size_f(attr_id, storage_size, error)
-     CALL check("h5aget_storage_size_f",error,total_error)
-     CALL VERIFY("h5aget_info_f", INT(data_size), INT(storage_size), total_error)
-
-     !  Close attribute 
-     CALL h5aclose_f(attr_id, error)
-     CALL check("h5aclose_f",error,total_error)
-  ENDDO
-
-END SUBROUTINE attr_open_check
-END MODULE TH5A_1_8
diff --git a/fortran/test/tH5D.F90 b/fortran/test/tH5D.F90
new file mode 100644
index 0000000..b5ad6e8
--- /dev/null
+++ b/fortran/test/tH5D.F90
@@ -0,0 +1,997 @@
+!****h* root/fortran/test/tH5D.f90
+!
+! NAME
+!  tH5D.f90
+!
+! FUNCTION
+!  Basic testing of Fortran H5D APIs.
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+! NOTES
+!  Tests the H5D APIs functionalities of:
+!   h5dcreate_f, h5dopen_f, h5dclose_f, h5dget_space_f, h5dget_type_f,
+!   h5dread_f, and h5dwrite_f, h5dget_space_status_f
+!
+!
+! CONTAINS SUBROUTINES
+!  datasettest, extenddsettest
+!
+!*****
+
+#include <H5config_f.inc>
+
+!
+MODULE TH5D
+
+  USE HDF5 ! This module contains all necessary modules
+  USE TH5_MISC
+  USE TH5_MISC_GEN
+
+CONTAINS
+  SUBROUTINE datasettest(cleanup, total_error)
+
+    IMPLICIT NONE
+    LOGICAL, INTENT(IN) :: cleanup
+    INTEGER, INTENT(OUT) :: total_error
+
+    CHARACTER(LEN=5), PARAMETER :: filename = "dsetf" ! File name
+    CHARACTER(LEN=80) :: fix_filename
+    CHARACTER(LEN=4), PARAMETER :: dsetname = "dset"     ! Dataset name
+    CHARACTER(LEN=9), PARAMETER :: null_dsetname = "null_dset"     ! Dataset name
+
+    INTEGER(HID_T) :: file_id       ! File identifier
+    INTEGER(HID_T) :: dset_id       ! Dataset identifier
+    INTEGER(HID_T) :: null_dset     ! Null dataset identifier
+    INTEGER(HID_T) :: dspace_id     ! Dataspace identifier
+    INTEGER(HID_T) :: null_dspace   ! Null dataspace identifier
+    INTEGER(HID_T) :: dtype_id      ! Datatype identifier
+
+    INTEGER(HSIZE_T), DIMENSION(2) :: dims = (/4,6/) ! Dataset dimensions
+    INTEGER     ::   rank = 2                        ! Dataset rank
+
+    INTEGER, DIMENSION(4,6) :: dset_data, data_out ! Data buffers
+    INTEGER     ::   error ! Error flag
+
+    INTEGER     :: i, j    !general purpose integers
+    INTEGER(HSIZE_T), DIMENSION(2) :: data_dims
+    INTEGER(HSIZE_T), DIMENSION(1) :: null_data_dim
+    INTEGER     ::   null_dset_data = 1              ! null data
+    INTEGER :: flag ! Space allocation status
+
+    !
+    ! Initialize the dset_data array.
+    !
+    DO i = 1, 4
+       DO j = 1, 6
+          dset_data(i,j) = (i-1)*6 + j;
+       END DO
+    END DO
+    !
+    ! Create a new file using default properties.
+    !
+    CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
+    IF (error .NE. 0) THEN
+       WRITE(*,*) "Cannot modify filename"
+       STOP
+    ENDIF
+    CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
+    CALL check("h5fcreate_f", error, total_error)
+    !
+    ! Create the dataspace.
+    !
+    CALL h5screate_simple_f(rank, dims, dspace_id, error)
+    CALL check("h5screate_simple_f", error, total_error)
+    !
+    ! Create null dataspace.
+    !
+    CALL h5screate_f(H5S_NULL_F, null_dspace, error)
+    CALL check("h5screate_simple_f", error, total_error)
+    !
+    ! Create the dataset with default properties.
+    !
+    CALL h5dcreate_f(file_id, dsetname, H5T_NATIVE_INTEGER, dspace_id, &
+         dset_id, error)
+    CALL check("h5dcreate_f", error, total_error)
+    !
+    ! Create the null dataset.
+    !
+    CALL h5dcreate_f(file_id, null_dsetname, H5T_NATIVE_INTEGER, null_dspace, null_dset, error)
+    CALL check("h5dcreate_f", error, total_error)
+    !
+    ! Write the dataset.
+    !
+    data_dims(1) = 4
+    data_dims(2) = 6
+    CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, dset_data, data_dims, error)
+    CALL check("h5dwrite_f", error, total_error)
+    !
+    ! Write null dataset.  Nothing can be written.
+    !
+    null_data_dim(1) = 1
+    CALL h5dwrite_f(null_dset, H5T_NATIVE_INTEGER, null_dset_data, null_data_dim, error)
+    CALL check("h5dwrite_f", error, total_error)
+    !
+    ! End access to the dataset and release resources used by it.
+    !
+    CALL h5dclose_f(dset_id, error)
+    CALL check("h5dclose_f", error, total_error)
+    CALL h5dclose_f(null_dset, error)
+    CALL check("h5dclose_f", error, total_error)
+    !
+    ! Terminate access to the data space.
+    !
+    CALL h5sclose_f(dspace_id, error)
+    CALL check("h5sclose_f", error, total_error)
+    CALL h5sclose_f(null_dspace, error)
+    CALL check("h5sclose_f", error, total_error)
+    !
+    ! Close the file.
+    !
+    CALL h5fclose_f(file_id, error)
+    CALL check("h5fclose_f", error, total_error)
+    !
+    ! Open the existing file.
+    !
+    CALL h5fopen_f (fix_filename, H5F_ACC_RDWR_F, file_id, error)
+    CALL check("h5fopen_f", error, total_error)
+    !
+    ! Open the existing dataset.
+    !
+    CALL h5dopen_f(file_id, dsetname, dset_id, error)
+    CALL check("h5dopen_f", error, total_error)
+    CALL h5dopen_f(file_id, null_dsetname, null_dset, error)
+    CALL check("h5dopen_f", error, total_error)
+
+    ! Test whether space has been allocated for a dataset
+    CALL h5dget_space_status_f(dset_id, flag, error)
+    CALL check("h5dget_space_status_f",error, total_error)
+    CALL VERIFY("h5dget_space_status_f", flag, H5D_SPACE_STS_ALLOCATED_F, total_error)
+
+    CALL h5dget_space_status_f(null_dset, flag, error)
+    CALL check("h5dget_space_status_f",error, total_error)
+    CALL VERIFY("h5dget_space_status_f", flag, H5D_SPACE_STS_NOT_ALLOCATED_F, total_error)
+    !
+    ! Get the dataset type.
+    !
+    CALL h5dget_type_f(dset_id, dtype_id, error)
+    CALL check("h5dget_type_f", error, total_error)
+    !
+    ! Get the data space.
+    !
+    CALL h5dget_space_f(dset_id, dspace_id, error)
+    CALL check("h5dget_space_f", error, total_error)
+    !
+    ! Read the dataset.
+    !
+    CALL h5dread_f(dset_id, H5T_NATIVE_INTEGER, data_out, data_dims, error)
+    CALL check("h5dread_f", error, total_error)
+    !
+    ! Read the null dataset.  Nothing should be read.
+    !
+    CALL h5dread_f(null_dset, H5T_NATIVE_INTEGER, null_dset_data, null_data_dim, error)
+    CALL check("h5dread_f", error, total_error)
+    !
+    !Compare the data.
+    !
+    DO i = 1, 4
+       DO j = 1, 6
+          IF (data_out(i,j) .NE. dset_data(i, j)) THEN
+             WRITE(*, *) "dataset test error occurred"
+             WRITE(*,*) "data read is not the same as the data written"
+          END IF
+       END DO
+    END DO
+    !
+    ! Check if no change to null_dset_data
+    !
+    IF (null_dset_data .NE. 1) THEN
+       WRITE(*, *) "null dataset test error occurred"
+    END IF
+    !
+    ! End access to the dataset and release resources used by it.
+    !
+    CALL h5dclose_f(dset_id, error)
+    CALL check("h5dclose_f", error, total_error)
+    CALL h5dclose_f(null_dset, error)
+    CALL check("h5dclose_f", error, total_error)
+    !
+    ! Terminate access to the data space.
+    !
+    CALL h5sclose_f(dspace_id, error)
+    CALL check("h5sclose_f", error, total_error)
+
+    !
+    ! Terminate access to the data type.
+    !
+    CALL h5tclose_f(dtype_id, error)
+    CALL check("h5tclose_f", error, total_error)
+    !
+    ! Close the file.
+    !
+    CALL h5fclose_f(file_id, error)
+    CALL check("h5fclose_f", error, total_error)
+    IF(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
+    CALL check("h5_cleanup_f", error, total_error)
+
+    RETURN
+  END SUBROUTINE datasettest
+
+!
+!the following subroutine tests h5dextend_f functionality
+!
+
+  SUBROUTINE extenddsettest(cleanup, total_error)
+
+    IMPLICIT NONE
+
+    LOGICAL, INTENT(IN)  :: cleanup
+    INTEGER, INTENT(OUT) :: total_error
+
+    !
+    !the dataset is stored in file "extf.h5"
+    !
+    CHARACTER(LEN=4), PARAMETER :: filename = "extf"
+    CHARACTER(LEN=80) :: fix_filename
+
+    !
+    !dataset name is "ExtendibleArray"
+    !
+    CHARACTER(LEN=15), PARAMETER :: dsetname = "ExtendibleArray"
+
+    !
+    !dataset rank is 2
+    !
+    INTEGER :: RANK = 2
+
+    INTEGER(HID_T) :: file_id       ! File identifier
+    INTEGER(HID_T) :: dset_id       ! Dataset identifier
+    INTEGER(HID_T) :: dataspace     ! Dataspace identifier
+    INTEGER(HID_T) :: memspace      ! memory Dataspace identifier
+    INTEGER(HID_T) :: crp_list        ! dataset creation property identifier
+
+    !
+    !dataset dimensions at creation time
+    !
+    INTEGER(HSIZE_T), DIMENSION(2) :: dims = (/3,3/)
+
+    !
+    !data dimensions
+    !
+    INTEGER(HSIZE_T), DIMENSION(2) :: dims1 = (/10,3/)
+
+    !
+    !Maximum dimensions
+    !
+    INTEGER(HSIZE_T), DIMENSION(2) :: maxdims
+
+    !
+    !data arrays for reading and writing
+    !
+    INTEGER, DIMENSION(10,3) :: data_in, data_out
+
+    !
+    !Size of data in the file
+    !
+    INTEGER(HSIZE_T), DIMENSION(2) :: size
+
+    !
+    !general purpose integer
+    !
+    INTEGER :: i, j
+    INTEGER(HSIZE_T) :: ih, jh
+
+    !
+    !flag to check operation success
+    !
+    INTEGER :: error
+
+    !
+    !Variables used in reading data back
+    !
+    INTEGER(HSIZE_T), DIMENSION(2) :: dimsr, maxdimsr
+    INTEGER :: rankr
+    INTEGER(HSIZE_T), DIMENSION(2) :: data_dims
+
+    !
+    !data initialization
+    !
+    DO i = 1, 10
+       DO j = 1, 3
+          data_in(i,j) = 2
+       END DO
+    END DO
+
+    !
+    !Initialize FORTRAN predefined datatypes
+    !
+!          CALL h5init_types_f(error)
+!               CALL check("h5init_types_f",error,total_error)
+
+    !
+    !Create a new file using default properties.
+    !
+    CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
+    IF (error .NE. 0) THEN
+       WRITE(*,*) "Cannot modify filename"
+       STOP
+    ENDIF
+    CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
+    CALL check("h5fcreate_f",error,total_error)
+
+    !
+    !Create the data space with unlimited dimensions.
+    !
+    maxdims(1:2) = H5S_UNLIMITED_F
+
+    CALL h5screate_simple_f(RANK, dims, dataspace, error, maxdims)
+    CALL check("h5screate_simple_f",error,total_error)
+
+    !
+    !Modify dataset creation properties, i.e. enable chunking
+    !
+    CALL h5pcreate_f(H5P_DATASET_CREATE_F, crp_list, error)
+    CALL check("h5pcreate_f",error,total_error)
+
+    CALL h5pset_chunk_f(crp_list, RANK, dims1, error)
+    CALL check("h5pset_chunk_f",error,total_error)
+
+    !
+    !Create a dataset with 3X3 dimensions using cparms creation properties.
+    !
+    CALL h5dcreate_f(file_id, dsetname, H5T_NATIVE_INTEGER, dataspace, dset_id, error, crp_list )
+    CALL check("h5dcreate_f",error,total_error)
+
+    !
+    !Extend the dataset. This call assures that dataset is 3 x 3.
+    !
+    SIZE(1) = 3
+    SIZE(2) = 3
+    CALL h5dextend_f(dset_id, size, error)
+    CALL check("h5dextend_f",error,total_error)
+
+
+    !
+    !Extend the dataset. Dataset becomes 10 x 3.
+    !
+    SIZE(1)   = 10;
+    SIZE(2)   = 3;
+    CALL h5dextend_f(dset_id, size, error)
+    CALL check("h5dextend_f",error,total_error)
+
+    !
+    !Write the data of size 10X3 to the extended dataset.
+    !
+    data_dims(1) = 10
+    data_dims(2) = 3
+    CALL H5dwrite_f(dset_id, H5T_NATIVE_INTEGER, data_in, data_dims, error)
+    CALL check("h5dwrite_f",error,total_error)
+
+    !
+    !Close the dataspace for the dataset.
+    !
+    CALL h5sclose_f(dataspace, error)
+    CALL check("h5sclose_f",error,total_error)
+
+    !
+    !Close the property list.
+    !
+    CALL h5pclose_f(crp_list, error)
+    CALL check("h5pclose_f",error,total_error)
+    !
+    !Close the dataset.
+    !
+    CALL h5dclose_f(dset_id, error)
+    CALL check("h5dclose_f",error,total_error)
+
+    !
+    !Close the file.
+    !
+    CALL h5fclose_f(file_id, error)
+    CALL check("h5fclose_f",error,total_error)
+
+    !
+    !read the data back
+    !
+    !Open the file.
+    !
+    CALL h5fopen_f (fix_filename, H5F_ACC_RDONLY_F, file_id, error)
+    CALL check("hfopen_f",error,total_error)
+
+    !
+    !Open the  dataset.
+    !
+    CALL h5dopen_f(file_id, dsetname, dset_id, error)
+    CALL check("h5dopen_f",error,total_error)
+
+    !
+    !Get dataset's dataspace handle.
+    !
+    CALL h5dget_space_f(dset_id, dataspace, error)
+    CALL check("h5dget_space_f",error,total_error)
+
+    !
+    !Get dataspace's rank.
+    !
+    CALL h5sget_simple_extent_ndims_f(dataspace, rankr, error)
+    CALL check("h5sget_simple_extent_ndims_f",error,total_error)
+    IF (rankr .NE. RANK) THEN
+       WRITE(*,*) "dataset rank error occurred"
+       STOP
+    END IF
+
+    !
+    !Get dataspace's dimensinons.
+    !
+    CALL h5sget_simple_extent_dims_f(dataspace, dimsr, maxdimsr, error)
+    CALL check("h5sget_simple_extent_dims_f",error,total_error)
+    IF ((dimsr(1) .NE. dims1(1)) .OR. (dimsr(2) .NE. dims1(2))) THEN
+       WRITE(*,*) "dataset dimensions error occurred"
+       STOP
+    END IF
+
+    !
+    !Get creation property list.
+    !
+    CALL h5dget_create_plist_f(dset_id, crp_list, error)
+    CALL check("h5dget_create_plist_f",error,total_error)
+
+
+    !
+    !create memory dataspace.
+    !
+    CALL h5screate_simple_f(rankr, dimsr, memspace, error)
+    CALL check("h5screate_simple_f",error,total_error)
+
+    !
+    !Read data
+    !
+    CALL H5dread_f(dset_id, H5T_NATIVE_INTEGER, data_out, data_dims, error, memspace, dataspace)
+    CALL check("h5dread_f",error,total_error)
+
+
+    !
+    !Compare the data.
+    !
+    DO ih = 1, dims1(1)
+       DO jh = 1, dims1(2)
+          IF (data_out(ih,jh) .NE. data_in(ih, jh)) THEN
+             WRITE(*, *) "extend dataset test error occurred"
+             WRITE(*, *) "read value is not the same as the written values"
+          END IF
+       END DO
+    END DO
+
+    !
+    !Close the dataspace for the dataset.
+    !
+    CALL h5sclose_f(dataspace, error)
+    CALL check("h5sclose_f",error,total_error)
+
+    !
+    !Close the memspace for the dataset.
+    !
+    CALL h5sclose_f(memspace, error)
+    CALL check("h5sclose_f",error,total_error)
+
+    !
+    !Close the property list.
+    !
+    CALL h5pclose_f(crp_list, error)
+    CALL check("h5pclose_f",error,total_error)
+
+    !
+    !Close the dataset.
+    !
+    CALL h5dclose_f(dset_id, error)
+    CALL check("h5dclose_f",error,total_error)
+
+    !
+    !Close the file.
+    !
+    CALL h5fclose_f(file_id, error)
+    CALL check("h5fclose_f",error,total_error)
+    IF(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
+    CALL check("h5_cleanup_f", error, total_error)
+
+    RETURN
+  END SUBROUTINE extenddsettest
+
+!
+! The following subroutine tests h5dget_offset_f functionality
+!
+
+  SUBROUTINE test_userblock_offset(cleanup, total_error)
+
+    USE ISO_C_BINDING
+
+    IMPLICIT NONE
+    LOGICAL, INTENT(IN) :: cleanup
+    INTEGER, INTENT(OUT) :: total_error
+    !
+    !the dataset is stored in file "offset.h5"
+    !
+    INTEGER, PARAMETER :: dset_dim1=2, dset_dim2=10
+    CHARACTER(LEN=6), PARAMETER :: filename = "offset"
+    CHARACTER(LEN=80) :: fix_filename
+
+    INTEGER(hid_t) :: file, fcpl, dataset, space
+    INTEGER :: i, j, n, ios
+    INTEGER(hsize_t), DIMENSION(1:2) :: dims
+    INTEGER(haddr_t) :: offset
+    INTEGER, DIMENSION(1:dset_dim1,1:dset_dim2), TARGET :: rdata, data_in
+    INTEGER :: error
+    TYPE(C_PTR) :: f_ptr
+    !
+    !Create a new file using default properties.
+    !
+    CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
+    IF (error .NE. 0) THEN
+       WRITE(*,*) "Cannot modify filename"
+       STOP
+    ENDIF
+
+    CALL h5pcreate_f(H5P_FILE_CREATE_F, fcpl, error)
+    CALL check("h5pcreate_f",error,total_error)
+
+    ! Initialize the dataset
+    n = 0
+    DO i = 1, dset_dim1
+       DO j = 1, dset_dim2
+          n = n + 1
+          data_in(i,j) = n
+       END DO
+    END DO
+    CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file, error, fcpl)
+    CALL check("h5fcreate_f",error,total_error)
+
+    ! Create the data space
+    dims(1:2) = (/dset_dim1,dset_dim2/)
+
+    CALL h5screate_simple_f(2, dims, space, error)
+    CALL check("h5screate_simple_f",error,total_error)
+
+    ! Create the dataset
+    CALL h5dcreate_f(file, "dset1", H5T_NATIVE_INTEGER, space, dataset, error)
+    CALL check("h5dcreate_f", error, total_error)
+
+    ! Test dataset address.  Should be undefined.
+    CALL h5dget_offset_f(dataset, offset, error)
+    CALL VERIFY("h5dget_offset_f",offset, HADDR_UNDEF_F, total_error)
+
+    ! Write the data to the dataset
+    f_ptr = C_LOC(data_in(1,1))
+    CALL h5dwrite_f(dataset, H5T_NATIVE_INTEGER, f_ptr, error)
+    CALL check("h5dwrite_f", error, total_error)
+
+    ! Test dataset address in file. Open the same file as a C file, seek
+    ! the data position as H5Dget_offset points to, read the dataset, and
+    ! compare it with the data written in.
+    CALL h5dget_offset_f(dataset, offset, error)
+    CALL check("h5dget_offset_f", error, total_error)
+    IF(offset.EQ.HADDR_UNDEF_F)THEN
+       total_error = total_error + 1
+    ENDIF
+
+    CALL h5dclose_f(dataset, error)
+    CALL check("h5dclose_f", error, total_error)
+    CALL h5fclose_f(file, error)
+    CALL check("h5fclose_f", error, total_error)
+
+    IF(total_error.NE.0) RETURN
+
+    OPEN(10,FILE=fix_filename, ACCESS="STREAM", IOSTAT=ios)
+    IF(ios.NE.0)THEN
+       WRITE(*,'(A)') "Failed to open file "//TRIM(fix_filename)
+       total_error = total_error + 1
+       RETURN
+    ENDIF
+    ! The pos= specifier illustrates that positions are in bytes,
+    ! starting from byte 1 (as opposed to C, where they start from byte 0)
+    READ(10, POS=offset+1, IOSTAT=ios) rdata
+    IF(ios.NE.0)THEN
+       WRITE(*,'(A)') "Failed to read data from stream I/O "
+       total_error = total_error + 1
+       CLOSE(10)
+       RETURN
+    ENDIF
+
+    ! Check that the values read are the same as the values written
+    DO i = 1, dset_dim1
+       DO j = 1, dset_dim2
+          CALL VERIFY("h5dget_offset_f",rdata(i,j), data_in(i,j), total_error)
+          IF(total_error.NE.0)THEN
+             WRITE(*,'(A)') "    Read different values than written."
+             WRITE(*,'(2(A,I0))') "    At index ",i,",",j
+             CLOSE(10)
+             RETURN
+          ENDIF
+       END DO
+    END DO
+
+    CLOSE(10)
+
+    IF(cleanup) CALL h5_cleanup_f(fix_filename, H5P_DEFAULT_F, error)
+    CALL check("h5_cleanup_f", error, total_error)
+    IF(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
+    CALL check("h5_cleanup_f", error, total_error)
+
+  END SUBROUTINE test_userblock_offset
+
+  SUBROUTINE test_dset_fill(cleanup, total_error)
+
+    USE ISO_C_BINDING
+
+    IMPLICIT NONE
+    LOGICAL, INTENT(IN) :: cleanup
+    INTEGER, INTENT(OUT) :: total_error
+
+    INTEGER, PARAMETER :: DIM0=10
+    INTEGER, PARAMETER :: int_kind_1  = SELECTED_INT_KIND(2)  !should map to INTEGER*1 on most modern processors
+    INTEGER, PARAMETER :: int_kind_4  = SELECTED_INT_KIND(4)  !should map to INTEGER*2 on most modern processors
+    INTEGER, PARAMETER :: int_kind_8  = SELECTED_INT_KIND(9)  !should map to INTEGER*4 on most modern processors
+    INTEGER, PARAMETER :: int_kind_16 = SELECTED_INT_KIND(18) !should map to INTEGER*8 on most modern processors
+    INTEGER(KIND=int_kind_1) , DIMENSION(1:DIM0), TARGET :: data_i1
+    INTEGER(KIND=int_kind_4) , DIMENSION(1:DIM0), TARGET :: data_i4
+    INTEGER(KIND=int_kind_8) , DIMENSION(1:DIM0), TARGET :: data_i8
+    INTEGER(KIND=int_kind_16), DIMENSION(1:DIM0), TARGET :: data_i16
+    INTEGER(KIND=int_kind_1) , TARGET :: data0_i1 = 4
+    INTEGER(KIND=int_kind_4) , TARGET :: data0_i4 = 4
+    INTEGER(KIND=int_kind_16), TARGET :: data0_i16 = 4
+    INTEGER, DIMENSION(1:DIM0) :: data_int
+    INTEGER, TARGET :: data0_int = 4
+#if H5_HAVE_Fortran_INTEGER_SIZEOF_16!=0
+    INTEGER, PARAMETER :: int_kind_32 = SELECTED_INT_KIND(36) !should map to INTEGER*16 on most modern processors
+    INTEGER(KIND=int_kind_32), DIMENSION(1:DIM0), TARGET :: data_i32
+    INTEGER(KIND=int_kind_32), TARGET :: data0_i32 = 4
+#endif
+    INTEGER, PARAMETER :: real_kind_4  = C_FLOAT
+    INTEGER, PARAMETER :: real_kind_8 = C_DOUBLE
+    REAL(KIND=real_kind_4) , DIMENSION(1:DIM0), TARGET :: data_r4
+    REAL(KIND=real_kind_8), DIMENSION(1:DIM0), TARGET :: data_r8
+    REAL(KIND=real_kind_4) , TARGET :: data0_r4 = 4.0
+    REAL(KIND=real_kind_8), TARGET :: data0_r8 = 4.0
+#if H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE!=0
+    INTEGER, PARAMETER :: real_kind_16 = C_LONG_DOUBLE
+    REAL(KIND=real_kind_16) , DIMENSION(1:DIM0), TARGET :: data_r16
+    REAL(KIND=real_kind_16) , TARGET :: data0_r16 = 4.0
+#endif
+
+    INTEGER :: i
+    CHARACTER       , DIMENSION(1:DIM0), TARGET :: data_chr
+    CHARACTER       , TARGET :: data0_chr = "h"
+    INTEGER(hsize_t), DIMENSION(1:1) :: dims
+    INTEGER(HID_T) :: space_id
+    INTEGER(HID_T) :: fill_type_id
+    INTEGER(HID_T) :: buf_type_id
+    INTEGER(hssize_t), DIMENSION(1:1) :: ioffset
+    INTEGER(hsize_t), DIMENSION(1:1) ::  icount
+    INTEGER :: error
+    TYPE(C_PTR) :: f_ptr1, f_ptr2
+
+    ! Initialize memory buffer
+    data_i1  = -2
+    data_i4  = -2
+    data_i8  = -2
+    data_i16 = -2
+    data_int = -2
+#if H5_HAVE_Fortran_INTEGER_SIZEOF_16!=0
+    data_i32 = -2
+#endif
+    data_r4  = -2.0_real_kind_4
+    data_r8 = -2.0_real_kind_8
+#if H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE!=0
+    data_r16 = -2.0_real_kind_16
+#endif
+    data_chr = "H"
+
+    dims(1) = DIM0
+    ioffset(1) = 0
+    icount(1) = DIM0/2
+
+    CALL h5screate_simple_f(1, dims, space_id, error)
+    CALL check("h5screate_simple_f",error,total_error)
+
+    CALL h5sselect_hyperslab_f(space_id, H5S_SELECT_SET_F, ioffset, icount, error)
+    CALL check("h5sselect_hyperslab_f", error, total_error)
+
+    !*********************************************************
+    ! TEST LEGACY H5Dfill_f APIs
+    !*********************************************************
+
+    CALL h5dfill_f(data0_int, space_id, data_int, error)
+    CALL check("h5dfill_f", error, total_error)
+
+    DO i = 1, DIM0
+       IF(i.LE. DIM0/2)THEN
+          CALL VERIFY("h5dfill_f", data0_int, data_int(i), total_error)
+       ELSE
+          CALL VERIFY("h5dfill_f", -2, data_int(i), total_error)
+       ENDIF
+       IF(total_error.NE.0)THEN
+          WRITE(*,'(A)')    "    Incorrect h5dfill value (INT)."
+          WRITE(*,'(A,I0)') "    At index ",i
+          RETURN
+       ENDIF
+    ENDDO
+
+    CALL h5dfill_f(data0_r4, space_id, data_r4, error)
+    CALL check("h5dfill_f", error, total_error)
+
+    DO i = 1, DIM0
+       IF(i.LE. DIM0/2)THEN
+          CALL VERIFY("h5dfill_f", data0_r4, data_r4(i), total_error)
+       ELSE
+          CALL VERIFY("h5dfill_f", -2.0_real_kind_4, data_r4(i), total_error)
+       ENDIF
+       IF(total_error.NE.0)THEN
+          WRITE(*,'(A)')    "    Incorrect h5dfill value (R4)."
+          WRITE(*,'(A,I0)') "    At index ",i
+          RETURN
+       ENDIF
+    ENDDO
+
+    CALL h5dfill_f(data0_r8, space_id, data_r8, error)
+    CALL check("h5dfill_f", error, total_error)
+
+    DO i = 1, DIM0
+       IF(i.LE. DIM0/2)THEN
+          CALL VERIFY("h5dfill_f", data0_r8, data_r8(i), total_error)
+       ELSE
+          CALL VERIFY("h5dfill_f", -2.0_real_kind_8, data_r8(i), total_error)
+       ENDIF
+       IF(total_error.NE.0)THEN
+          WRITE(*,'(A)')    "    Incorrect h5dfill value (R4)."
+          WRITE(*,'(A,I0)') "    At index ",i
+          RETURN
+       ENDIF
+    ENDDO
+
+    CALL h5dfill_f(data0_chr, space_id, data_chr, error)
+    CALL check("h5dfill_f", error, total_error)
+
+    DO i = 1, DIM0
+       IF(i.LE. DIM0/2)THEN
+          CALL VERIFY("h5dfill_f", data0_chr, data_chr(i), total_error)
+       ELSE
+          CALL VERIFY("h5dfill_f", "H", data_chr(i), total_error)
+       ENDIF
+       IF(total_error.NE.0)THEN
+          WRITE(*,'(A)')    "    Incorrect h5dfill value (CHR)."
+          WRITE(*,'(A,I0)') "    At index ",i
+          RETURN
+       ENDIF
+    ENDDO
+
+#if H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE!=0
+    CALL h5dfill_f(data0_r16, space_id, data_r16, error)
+    CALL check("h5dfill_f", error, total_error)
+    DO i = 1, DIM0
+       IF(i.LE. DIM0/2)THEN
+          CALL VERIFY("h5dfill_f", data0_r16, data_r16(i), total_error)
+       ELSE
+          CALL VERIFY("h5dfill_f", -2.0_real_kind_16, data_r16(i), total_error)
+       ENDIF
+       IF(total_error.NE.0)THEN
+          WRITE(*,'(A)')    "    Incorrect h5dfill value (R16)."
+          WRITE(*,'(A,I0)') "    At index ",i
+          RETURN
+       ENDIF
+    ENDDO
+#endif
+
+    !*********************************************************
+    ! TEST MODERN H5Dfill_f APIs
+    !*********************************************************
+
+    ! Initialize memory buffer
+    data_i1  = -2
+    data_i4  = -2
+    data_i8  = -2
+    data_i16 = -2
+#if H5_HAVE_Fortran_INTEGER_SIZEOF_16!=0
+    data_i32 = -2
+#endif
+    data_r4  = -2.0_real_kind_4
+    data_r8 = -2.0_real_kind_8
+    data_chr = "H"
+
+    ! Test spectrum of datatype types
+
+    f_ptr1 = C_LOC(data0_i1)
+    f_ptr2 = C_LOC(data_i1(1))
+
+    fill_type_id = h5kind_to_type(KIND(data0_i1), H5_INTEGER_KIND)
+    buf_type_id  = fill_type_id
+
+    CALL h5dfill_f(f_ptr1, fill_type_id, f_ptr2, buf_type_id, space_id, error)
+    CALL check("h5dfill_f", error, total_error)
+
+    DO i = 1, DIM0
+       IF(i.LE. DIM0/2)THEN
+          CALL VERIFY("h5dfill_f", data0_i1, data_i1(i), total_error)
+       ELSE
+          CALL VERIFY("h5dfill_f", -2_int_kind_1, data_i1(i), total_error)
+       ENDIF
+       IF(total_error.NE.0)THEN
+          WRITE(*,'(A)')    "    Incorrect h5dfill value (I1)."
+          WRITE(*,'(A,I0)') "    At index ",i
+          RETURN
+       ENDIF
+    ENDDO
+
+    f_ptr1 = C_LOC(data0_i4)
+    f_ptr2 = C_LOC(data_i4(1))
+
+    fill_type_id = h5kind_to_type(KIND(data0_i4), H5_INTEGER_KIND)
+    buf_type_id  = fill_type_id
+
+    CALL h5dfill_f(f_ptr1, fill_type_id, f_ptr2, buf_type_id, space_id, error)
+    CALL check("h5dfill_f", error, total_error)
+
+    DO i = 1, DIM0
+       IF(i.LE. DIM0/2)THEN
+          CALL VERIFY("h5dfill_f", data0_i4, data_i4(i), total_error)
+       ELSE
+          CALL VERIFY("h5dfill_f", -2_int_kind_4, data_i4(i), total_error)
+       ENDIF
+       IF(total_error.NE.0)THEN
+          WRITE(*,'(A)')    "    Incorrect h5dfill value (I4)."
+          WRITE(*,'(A,I0)') "    At index ",i
+          RETURN
+       ENDIF
+    ENDDO
+
+    f_ptr1 = C_LOC(data0_i16)
+    f_ptr2 = C_LOC(data_i16(1))
+
+    fill_type_id = h5kind_to_type(KIND(data0_i16), H5_INTEGER_KIND)
+    buf_type_id  = fill_type_id
+
+    CALL h5dfill_f(f_ptr1, fill_type_id, f_ptr2, buf_type_id, space_id, error)
+    CALL check("h5dfill_f", error, total_error)
+
+    DO i = 1, DIM0
+       IF(i.LE. DIM0/2)THEN
+          CALL VERIFY("h5dfill_f", data0_i16, data_i16(i), total_error)
+       ELSE
+          CALL VERIFY("h5dfill_f", -2_int_kind_16, data_i16(i), total_error)
+       ENDIF
+       IF(total_error.NE.0)THEN
+          WRITE(*,'(A)')    "    Incorrect h5dfill value (I16)."
+          WRITE(*,'(A,I0)') "    At index ",i
+          RETURN
+       ENDIF
+    ENDDO
+
+#if H5_HAVE_Fortran_INTEGER_SIZEOF_16!=0
+
+    f_ptr1 = C_LOC(data0_i32)
+    f_ptr2 = C_LOC(data_i32(1))
+
+    fill_type_id = h5kind_to_type(KIND(data0_i32), H5_INTEGER_KIND)
+    buf_type_id  = fill_type_id
+
+    CALL h5dfill_f(f_ptr1, fill_type_id, f_ptr2, buf_type_id, space_id, error)
+    CALL check("h5dfill_f", error, total_error)
+
+    DO i = 1, DIM0
+       IF(i.LE. DIM0/2)THEN
+          CALL VERIFY("h5dfill_f", data0_i32, data_i32(i), total_error)
+       ELSE
+          CALL VERIFY("h5dfill_f", -2_int_kind_32, data_i32(i), total_error)
+       ENDIF
+       IF(total_error.NE.0)THEN
+          WRITE(*,'(A)')    "    Incorrect h5dfill value (I32)."
+          WRITE(*,'(A,I0)') "    At index ",i
+          RETURN
+       ENDIF
+    ENDDO
+#endif
+
+    f_ptr1 = C_LOC(data0_r4)
+    f_ptr2 = C_LOC(data_r4(1))
+
+    fill_type_id = h5kind_to_type(KIND(data0_r4), H5_REAL_KIND)
+    buf_type_id  = fill_type_id
+
+    CALL h5dfill_f(f_ptr1, fill_type_id, f_ptr2, buf_type_id, space_id, error)
+    CALL check("h5dfill_f", error, total_error)
+
+    DO i = 1, DIM0
+       IF(i.LE. DIM0/2)THEN
+          CALL VERIFY("h5dfill_f", data0_r4, data_r4(i), total_error)
+       ELSE
+          CALL VERIFY("h5dfill_f", -2.0_real_kind_4, data_r4(i), total_error)
+       ENDIF
+       IF(total_error.NE.0)THEN
+          WRITE(*,'(A)')    "    Incorrect h5dfill value (R4)."
+          WRITE(*,'(A,I0)') "    At index ",i
+          RETURN
+       ENDIF
+    ENDDO
+
+    f_ptr1 = C_LOC(data0_r8)
+    f_ptr2 = C_LOC(data_r8(1))
+
+    fill_type_id = h5kind_to_type(KIND(data0_r8), H5_REAL_KIND)
+    buf_type_id  = fill_type_id
+
+    CALL h5dfill_f(f_ptr1, fill_type_id, f_ptr2, buf_type_id, space_id, error)
+    CALL check("h5dfill_f", error, total_error)
+
+    DO i = 1, DIM0
+       IF(i.LE. DIM0/2)THEN
+          CALL VERIFY("h5dfill_f", data0_r8, data_r8(i), total_error)
+       ELSE
+          CALL VERIFY("h5dfill_f", -2.0_real_kind_8, data_r8(i), total_error)
+       ENDIF
+       IF(total_error.NE.0)THEN
+          WRITE(*,'(A)')    "    Incorrect h5dfill value (R8)."
+          WRITE(*,'(A,I0)') "    At index ",i
+          RETURN
+       ENDIF
+    ENDDO
+
+#if H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE!=0
+    f_ptr1 = C_LOC(data0_r16)
+    f_ptr2 = C_LOC(data_r16(1))
+
+    fill_type_id = h5kind_to_type(KIND(data0_r16), H5_REAL_KIND)
+    buf_type_id  = fill_type_id
+
+    CALL h5dfill_f(f_ptr1, fill_type_id, f_ptr2, buf_type_id, space_id, error)
+    CALL check("h5dfill_f", error, total_error)
+
+    DO i = 1, DIM0
+       IF(i.LE. DIM0/2)THEN
+          CALL VERIFY("h5dfill_f", data0_r16, data_r16(i), total_error)
+       ELSE
+          CALL VERIFY("h5dfill_f", -2.0_real_kind_16, data_r16(i), total_error)
+       ENDIF
+       IF(total_error.NE.0)THEN
+          WRITE(*,'(A)')    "    Incorrect h5dfill value (R16)."
+          WRITE(*,'(A,I0)') "    At index ",i
+          RETURN
+       ENDIF
+    ENDDO
+#endif
+
+    f_ptr1 = C_LOC(data0_chr)
+    f_ptr2 = C_LOC(data_chr(1))
+
+    fill_type_id = H5T_NATIVE_CHARACTER
+    buf_type_id  = fill_type_id
+
+    CALL h5dfill_f(f_ptr1, fill_type_id, f_ptr2, buf_type_id, space_id, error)
+    CALL check("h5dfill_f", error, total_error)
+
+    DO i = 1, DIM0
+       IF(i.LE. DIM0/2)THEN
+          CALL VERIFY("h5dfill_f", data0_chr, data_chr(i), total_error)
+       ELSE
+          CALL VERIFY("h5dfill_f", "H", data_chr(i), total_error)
+       ENDIF
+       IF(total_error.NE.0)THEN
+          WRITE(*,'(A)')    "    Incorrect h5dfill value (CHR)."
+          WRITE(*,'(A,I0)') "    At index ",i
+          RETURN
+       ENDIF
+    ENDDO
+
+
+  END SUBROUTINE test_dset_fill
+
+END MODULE TH5D
+
diff --git a/fortran/test/tH5D.f90 b/fortran/test/tH5D.f90
deleted file mode 100644
index c0eb8f9..0000000
--- a/fortran/test/tH5D.f90
+++ /dev/null
@@ -1,538 +0,0 @@
-!****h* root/fortran/test/tH5D.f90
-!
-! NAME
-!  tH5D.f90
-!
-! FUNCTION
-!  Basic testing of Fortran H5D APIs.
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! NOTES
-!  Tests the H5D APIs functionalities of:
-!   h5dcreate_f, h5dopen_f, h5dclose_f, h5dget_space_f, h5dget_type_f,
-!   h5dread_f, and h5dwrite_f, h5dget_space_status_f
-!
-!
-! CONTAINS SUBROUTINES
-!  datasettest, extenddsettest
-!
-!*****
-
-!
-MODULE TH5D
-
-CONTAINS
-        SUBROUTINE datasettest(cleanup, total_error)
-        USE HDF5 ! This module contains all necessary modules
-        USE TH5_MISC
-
-          IMPLICIT NONE
-          LOGICAL, INTENT(IN) :: cleanup
-          INTEGER, INTENT(OUT) :: total_error
-
-          CHARACTER(LEN=5), PARAMETER :: filename = "dsetf" ! File name
-          CHARACTER(LEN=80) :: fix_filename
-          CHARACTER(LEN=4), PARAMETER :: dsetname = "dset"     ! Dataset name
-          CHARACTER(LEN=9), PARAMETER :: null_dsetname = "null_dset"     ! Dataset name
-
-          INTEGER(HID_T) :: file_id       ! File identifier
-          INTEGER(HID_T) :: dset_id       ! Dataset identifier
-          INTEGER(HID_T) :: null_dset     ! Null dataset identifier
-          INTEGER(HID_T) :: dspace_id     ! Dataspace identifier
-          INTEGER(HID_T) :: null_dspace   ! Null dataspace identifier
-          INTEGER(HID_T) :: dtype_id      ! Datatype identifier
-
-
-          INTEGER(HSIZE_T), DIMENSION(2) :: dims = (/4,6/) ! Dataset dimensions
-          INTEGER     ::   rank = 2                        ! Dataset rank
-
-          INTEGER, DIMENSION(4,6) :: dset_data, data_out ! Data buffers
-          INTEGER     ::   error ! Error flag
-
-          INTEGER     :: i, j    !general purpose integers
-          INTEGER(HSIZE_T), DIMENSION(2) :: data_dims
-          INTEGER(HSIZE_T), DIMENSION(1) :: null_data_dim
-          INTEGER     ::   null_dset_data = 1              ! null data
-          INTEGER :: flag ! Space allocation status
-
-          !
-          ! Initialize the dset_data array.
-          !
-          do i = 1, 4
-             do j = 1, 6
-                dset_data(i,j) = (i-1)*6 + j;
-             end do
-          end do
-
-
-          !
-          ! Create a new file using default properties.
-          !
-          CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
-          if (error .ne. 0) then
-              write(*,*) "Cannot modify filename"
-              stop
-          endif
-          CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
-              CALL check("h5fcreate_f", error, total_error)
-
-
-          !
-          ! Create the dataspace.
-          !
-          CALL h5screate_simple_f(rank, dims, dspace_id, error)
-              CALL check("h5screate_simple_f", error, total_error)
-          !
-          ! Create null dataspace.
-          !
-          CALL h5screate_f(H5S_NULL_F, null_dspace, error)
-              CALL check("h5screate_simple_f", error, total_error)
-
-
-          !
-          ! Create the dataset with default properties.
-          !
-          CALL h5dcreate_f(file_id, dsetname, H5T_NATIVE_INTEGER, dspace_id, &
-                           dset_id, error)
-              CALL check("h5dcreate_f", error, total_error)
-          !
-          ! Create the null dataset.
-          !
-          CALL h5dcreate_f(file_id, null_dsetname, H5T_NATIVE_INTEGER, null_dspace, &
-                           null_dset, error)
-              CALL check("h5dcreate_f", error, total_error)
-
-          !
-          ! Write the dataset.
-          !
-          data_dims(1) = 4
-          data_dims(2) = 6
-          CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, dset_data, data_dims, error)
-              CALL check("h5dwrite_f", error, total_error)
-          !
-          ! Write null dataset.  Nothing can be written.
-          !
-          null_data_dim(1) = 1
-          CALL h5dwrite_f(null_dset, H5T_NATIVE_INTEGER, null_dset_data, null_data_dim, error)
-              CALL check("h5dwrite_f", error, total_error)
-
-
-          !
-          ! End access to the dataset and release resources used by it.
-          !
-          CALL h5dclose_f(dset_id, error)
-              CALL check("h5dclose_f", error, total_error)
-          CALL h5dclose_f(null_dset, error)
-              CALL check("h5dclose_f", error, total_error)
-
-          !
-          ! Terminate access to the data space.
-          !
-          CALL h5sclose_f(dspace_id, error)
-              CALL check("h5sclose_f", error, total_error)
-          CALL h5sclose_f(null_dspace, error)
-              CALL check("h5sclose_f", error, total_error)
-
-          !
-          ! Close the file.
-          !
-          CALL h5fclose_f(file_id, error)
-              CALL check("h5fclose_f", error, total_error)
-
-          !
-          ! Open the existing file.
-          !
-          CALL h5fopen_f (fix_filename, H5F_ACC_RDWR_F, file_id, error)
-              CALL check("h5fopen_f", error, total_error)
-
-          !
-          ! Open the existing dataset.
-          !
-          CALL h5dopen_f(file_id, dsetname, dset_id, error)
-              CALL check("h5dopen_f", error, total_error)
-          CALL h5dopen_f(file_id, null_dsetname, null_dset, error)
-              CALL check("h5dopen_f", error, total_error)
-
-          ! Test whether space has been allocated for a dataset
-          CALL h5dget_space_status_f(dset_id, flag, error)
-          CALL check("h5dget_space_status_f",error, total_error)
-          CALL verify("h5dget_space_status_f", flag, H5D_SPACE_STS_ALLOCATED_F, total_error)
-
-          CALL h5dget_space_status_f(null_dset, flag, error)
-          CALL check("h5dget_space_status_f",error, total_error)
-          CALL verify("h5dget_space_status_f", flag, H5D_SPACE_STS_NOT_ALLOCATED_F, total_error)
-
-
-          !
-          ! Get the dataset type.
-          !
-          CALL h5dget_type_f(dset_id, dtype_id, error)
-              CALL check("h5dget_type_f", error, total_error)
-
-          !
-          ! Get the data space.
-          !
-          CALL h5dget_space_f(dset_id, dspace_id, error)
-              CALL check("h5dget_space_f", error, total_error)
-
-          !
-          ! Read the dataset.
-          !
-          CALL h5dread_f(dset_id, H5T_NATIVE_INTEGER, data_out, data_dims, error)
-              CALL check("h5dread_f", error, total_error)
-          !
-          ! Read the null dataset.  Nothing should be read.
-          !
-          CALL h5dread_f(null_dset, H5T_NATIVE_INTEGER, null_dset_data, null_data_dim, error)
-              CALL check("h5dread_f", error, total_error)
-
-          !
-          !Compare the data.
-          !
-          do i = 1, 4
-              do j = 1, 6
-                  IF (data_out(i,j) .NE. dset_data(i, j)) THEN
-                      write(*, *) "dataset test error occured"
-                      write(*,*) "data read is not the same as the data written"
-                  END IF
-              end do
-          end do
-
-          !
-          ! Check if no change to null_dset_data
-          !
-          IF (null_dset_data .NE. 1) THEN
-              write(*, *) "null dataset test error occured"
-          END IF
-
-          !
-          ! End access to the dataset and release resources used by it.
-          !
-          CALL h5dclose_f(dset_id, error)
-              CALL check("h5dclose_f", error, total_error)
-          CALL h5dclose_f(null_dset, error)
-              CALL check("h5dclose_f", error, total_error)
-
-          !
-          ! Terminate access to the data space.
-          !
-          CALL h5sclose_f(dspace_id, error)
-              CALL check("h5sclose_f", error, total_error)
-
-          !
-          ! Terminate access to the data type.
-          !
-          CALL h5tclose_f(dtype_id, error)
-              CALL check("h5tclose_f", error, total_error)
-          !
-          ! Close the file.
-          !
-          CALL h5fclose_f(file_id, error)
-              CALL check("h5fclose_f", error, total_error)
-          if(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
-              CALL check("h5_cleanup_f", error, total_error)
-
-          RETURN
-        END SUBROUTINE datasettest
-
-!
-!the following subroutine tests h5dextend_f functionality
-!
-
-        SUBROUTINE extenddsettest(cleanup, total_error)
-        USE HDF5 ! This module contains all necessary modules
-        USE TH5_MISC
-
-          IMPLICIT NONE
-
-          LOGICAL, INTENT(IN)  :: cleanup
-          INTEGER, INTENT(OUT) :: total_error
-
-          !
-          !the dataset is stored in file "extf.h5"
-          !
-          CHARACTER(LEN=4), PARAMETER :: filename = "extf"
-          CHARACTER(LEN=80) :: fix_filename
-
-          !
-          !dataset name is "ExtendibleArray"
-          !
-          CHARACTER(LEN=15), PARAMETER :: dsetname = "ExtendibleArray"
-
-          !
-          !dataset rank is 2
-          !
-          INTEGER :: RANK = 2
-
-          INTEGER(HID_T) :: file_id       ! File identifier
-          INTEGER(HID_T) :: dset_id       ! Dataset identifier
-          INTEGER(HID_T) :: dataspace     ! Dataspace identifier
-          INTEGER(HID_T) :: memspace      ! memory Dataspace identifier
-          INTEGER(HID_T) :: crp_list        ! dataset creatation property identifier
-
-          !
-          !dataset dimensions at creation time
-          !
-          INTEGER(HSIZE_T), DIMENSION(2) :: dims = (/3,3/)
-
-          !
-          !data dimensions
-          !
-          INTEGER(HSIZE_T), DIMENSION(2) :: dims1 = (/10,3/)
-
-          !
-          !Maximum dimensions
-          !
-          INTEGER(HSIZE_T), DIMENSION(2) :: maxdims
-
-          !
-          !data arrays for reading and writing
-          !
-          INTEGER, DIMENSION(10,3) :: data_in, data_out
-
-          !
-          !Size of data in the file
-          !
-          INTEGER(HSIZE_T), DIMENSION(2) :: size
-
-          !
-          !general purpose integer
-          !
-          INTEGER :: i, j
-          INTEGER(HSIZE_T) :: ih, jh
-
-          !
-          !flag to check operation success
-          !
-          INTEGER :: error
-
-          !
-          !Variables used in reading data back
-          !
-          INTEGER(HSIZE_T), DIMENSION(2) :: dimsr, maxdimsr
-          INTEGER :: rankr
-          INTEGER(HSIZE_T), DIMENSION(2) :: data_dims
-
-          !
-          !data initialization
-          !
-          do i = 1, 10
-             do j = 1, 3
-                data_in(i,j) = 2
-             end do
-          end do
-
-          !
-          !Initialize FORTRAN predifined datatypes
-          !
-!          CALL h5init_types_f(error)
-!               CALL check("h5init_types_f",error,total_error)
-
-          !
-          !Create a new file using default properties.
-          !
-          CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
-          if (error .ne. 0) then
-              write(*,*) "Cannot modify filename"
-              stop
-          endif
-          CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
-               CALL check("h5fcreate_f",error,total_error)
-
-
-          !
-          !Create the data space with unlimited dimensions.
-          !
-          maxdims = (/H5S_UNLIMITED_F, H5S_UNLIMITED_F/)
-
-          CALL h5screate_simple_f(RANK, dims, dataspace, error, maxdims)
-               CALL check("h5screate_simple_f",error,total_error)
-
-          !
-          !Modify dataset creation properties, i.e. enable chunking
-          !
-          CALL h5pcreate_f(H5P_DATASET_CREATE_F, crp_list, error)
-              CALL check("h5pcreat_f",error,total_error)
-
-          CALL h5pset_chunk_f(crp_list, RANK, dims1, error)
-              CALL check("h5pset_chunk_f",error,total_error)
-
-          !
-          !Create a dataset with 3X3 dimensions using cparms creation propertie .
-          !
-          CALL h5dcreate_f(file_id, dsetname, H5T_NATIVE_INTEGER, dataspace, &
-                           dset_id, error, crp_list )
-              CALL check("h5dcreate_f",error,total_error)
-
-          !
-          !Extend the dataset. This call assures that dataset is 3 x 3.
-          !
-          size(1) = 3
-          size(2) = 3
-          CALL h5dextend_f(dset_id, size, error)
-              CALL check("h5dextend_f",error,total_error)
-
-
-          !
-          !Extend the dataset. Dataset becomes 10 x 3.
-          !
-          size(1)   = 10;
-          size(2)   = 3;
-          CALL h5dextend_f(dset_id, size, error)
-              CALL check("h5dextend_f",error,total_error)
-
-          !
-          !Write the data of size 10X3 to the extended dataset.
-          !
-          data_dims(1) = 10
-          data_dims(2) = 3
-          CALL H5dwrite_f(dset_id, H5T_NATIVE_INTEGER, data_in, data_dims, error)
-               CALL check("h5dwrite_f",error,total_error)
-
-          !
-          !Close the dataspace for the dataset.
-          !
-          CALL h5sclose_f(dataspace, error)
-              CALL check("h5sclose_f",error,total_error)
-
-          !
-          !Close the property list.
-          !
-          CALL h5pclose_f(crp_list, error)
-              CALL check("h5pclose_f",error,total_error)
-          !
-          !Close the dataset.
-          !
-          CALL h5dclose_f(dset_id, error)
-              CALL check("h5dclose_f",error,total_error)
-
-          !
-          !Close the file.
-          !
-          CALL h5fclose_f(file_id, error)
-              CALL check("h5fclose_f",error,total_error)
-
-          !
-          !read the data back
-          !
-          !Open the file.
-          !
-          CALL h5fopen_f (fix_filename, H5F_ACC_RDONLY_F, file_id, error)
-              CALL check("hfopen_f",error,total_error)
-
-          !
-          !Open the  dataset.
-          !
-          CALL h5dopen_f(file_id, dsetname, dset_id, error)
-              CALL check("h5dopen_f",error,total_error)
-
-          !
-          !Get dataset's dataspace handle.
-          !
-          CALL h5dget_space_f(dset_id, dataspace, error)
-              CALL check("h5dget_space_f",error,total_error)
-
-          !
-          !Get dataspace's rank.
-          !
-          CALL h5sget_simple_extent_ndims_f(dataspace, rankr, error)
-              CALL check("h5sget_simple_extent_ndims_f",error,total_error)
-          IF (rankr .NE. RANK) then
-              write(*,*) "dataset rank error occured"
-              stop
-          END IF
-
-          !
-          !Get dataspace's dimensinons.
-          !
-          CALL h5sget_simple_extent_dims_f(dataspace, dimsr, maxdimsr, error)
-              CALL check("h5sget_simple_extent_dims_f",error,total_error)
-          IF ((dimsr(1) .NE. dims1(1)) .OR. (dimsr(2) .NE. dims1(2))) THEN
-              write(*,*) "dataset dimensions error occured"
-              stop
-          END IF
-
-          !
-          !Get creation property list.
-          !
-          CALL h5dget_create_plist_f(dset_id, crp_list, error)
-              CALL check("h5dget_create_plist_f",error,total_error)
-
-
-          !
-          !create memory dataspace.
-          !
-          CALL h5screate_simple_f(rankr, dimsr, memspace, error)
-              CALL check("h5screate_simple_f",error,total_error)
-
-          !
-          !Read data
-          !
-          CALL H5dread_f(dset_id, H5T_NATIVE_INTEGER, data_out, data_dims, error, &
-                    memspace, dataspace)
-              CALL check("h5dread_f",error,total_error)
-
-
-          !
-          !Compare the data.
-          !
-          do ih = 1, dims1(1)
-              do jh = 1, dims1(2)
-                  IF (data_out(ih,jh) .NE. data_in(ih, jh)) THEN
-                      write(*, *) "extend dataset test error occured"
-                      write(*, *) "read value is not the same as the written values"
-                  END IF
-              end do
-          end do
-
-          !
-          !Close the dataspace for the dataset.
-          !
-          CALL h5sclose_f(dataspace, error)
-              CALL check("h5sclose_f",error,total_error)
-
-          !
-          !Close the memspace for the dataset.
-          !
-          CALL h5sclose_f(memspace, error)
-              CALL check("h5sclose_f",error,total_error)
-
-          !
-          !Close the property list.
-          !
-          CALL h5pclose_f(crp_list, error)
-              CALL check("h5pclose_f",error,total_error)
-
-          !
-          !Close the dataset.
-          !
-          CALL h5dclose_f(dset_id, error)
-              CALL check("h5dclose_f",error,total_error)
-
-          !
-          !Close the file.
-          !
-          CALL h5fclose_f(file_id, error)
-              CALL check("h5fclose_f",error,total_error)
-          if(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
-              CALL check("h5_cleanup_f", error, total_error)
-
-          RETURN
-        END SUBROUTINE extenddsettest
-END MODULE TH5D
-
diff --git a/fortran/test/tH5E.F90 b/fortran/test/tH5E.F90
new file mode 100644
index 0000000..0550bc8
--- /dev/null
+++ b/fortran/test/tH5E.F90
@@ -0,0 +1,99 @@
+!****h* root/fortran/test/tH5E.f90
+!
+! NAME
+!  tH5E.f90
+!
+! FUNCTION
+!  Basic testing of Fortran H5E APIs.
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+! NOTES
+!  Tests the H5D APIs functionalities of:
+!   h5eprint_f
+!
+! CONTAINS SUBROUTINES
+!  error_report_test
+!
+!*****
+!
+MODULE TH5E
+
+CONTAINS
+
+    SUBROUTINE error_report_test(cleanup, total_error)
+
+!   This subroutine tests following functionalities: h5eprint_f
+
+   USE HDF5 ! This module contains all necessary modules
+   USE TH5_MISC
+
+     IMPLICIT NONE
+     LOGICAL, INTENT(IN)  :: cleanup
+     INTEGER, INTENT(INOUT) :: total_error
+
+     CHARACTER(LEN=6), PARAMETER :: filename = "etestf" ! File name
+     CHARACTER(LEN=80) :: fix_filename
+     CHARACTER(LEN=8), PARAMETER :: err_filename = "err_file"! Error output file
+     CHARACTER(LEN=80)  :: fix_err_filename
+
+
+
+     INTEGER(HID_T) :: file_id       ! File identifier
+     INTEGER(HID_T) :: grp_id        ! Group identifier
+     INTEGER :: error, tmp_error, err_flag
+
+     err_flag = 0
+     CALL h5eset_auto_f(err_flag, error)
+     CALL check("h5eprint_f",error, total_error)
+     !
+     ! Create a new file using default properties.
+     !
+          CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
+          if (error .ne. 0) then
+              write(*,*) "Cannot modify filename"
+              stop
+          endif
+     CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
+     CALL check("h5fcreate_f",error,total_error)
+
+     !
+     ! Try to open non-existing group in the file.
+     ! Error message should go to the err_file_name file.
+     !
+     CALL h5gopen_f(file_id, "Doesnotexist1", grp_id, tmp_error)
+          CALL h5_fixname_f(err_filename, fix_err_filename, H5P_DEFAULT_F, error)
+          if (error .ne. 0) then
+              write(*,*) "Cannot modify filename"
+              stop
+          endif
+     CALL h5eprint_f(error, fix_err_filename)
+     CALL h5gopen_f(file_id, "Doesnotexist2", grp_id, tmp_error)
+     CALL h5eprint_f(error, fix_err_filename)
+
+     !
+     ! Close the file.
+     !
+     CALL h5fclose_f(file_id, error)
+     CALL check("h5fclose_f",error,total_error)
+
+          if(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
+              CALL check("h5_cleanup_f", error, total_error)
+          if(cleanup) CALL h5_cleanup_f(err_filename, H5P_DEFAULT_F, error)
+              CALL check("h5_cleanup_f", error, total_error)
+     RETURN
+     END SUBROUTINE error_report_test
+
+END MODULE TH5E
+
diff --git a/fortran/test/tH5E.f90 b/fortran/test/tH5E.f90
deleted file mode 100644
index 10ecaf6..0000000
--- a/fortran/test/tH5E.f90
+++ /dev/null
@@ -1,102 +0,0 @@
-!****h* root/fortran/test/tH5E.f90
-!
-! NAME
-!  tH5E.f90
-!
-! FUNCTION
-!  Basic testing of Fortran H5E APIs.
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! NOTES
-!  Tests the H5D APIs functionalities of:
-!   h5eprint_f
-!
-! CONTAINS SUBROUTINES
-!  error_report_test
-!
-!*****
-!
-MODULE TH5E
-
-CONTAINS
-
-    SUBROUTINE error_report_test(cleanup, total_error)
-
-!   This subroutine tests following functionalities: h5eprint_f
-
-   USE HDF5 ! This module contains all necessary modules
-   USE TH5_MISC
-
-     IMPLICIT NONE
-     LOGICAL, INTENT(IN)  :: cleanup
-     INTEGER, INTENT(INOUT) :: total_error
-
-     CHARACTER(LEN=6), PARAMETER :: filename = "etestf" ! File name
-     CHARACTER(LEN=80) :: fix_filename
-     CHARACTER(LEN=8), PARAMETER :: err_filename = "err_file"! Error output file
-     CHARACTER(LEN=80)  :: fix_err_filename
-
-
-
-     INTEGER(HID_T) :: file_id       ! File identifier
-     INTEGER(HID_T) :: grp_id        ! Group identifier
-     INTEGER :: error, tmp_error, err_flag
-
-     err_flag = 0
-     CALL h5eset_auto_f(err_flag, error)
-     CALL check("h5eprint_f",error, total_error)
-     !
-     ! Create a new file using default properties.
-     !
-          CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
-          if (error .ne. 0) then
-              write(*,*) "Cannot modify filename"
-              stop
-          endif
-     CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
-     CALL check("h5fcreate_f",error,total_error)
-
-     !
-     ! Try to open non-existing group in the file.
-     ! Error message should go to the err_file_name file.
-     !
-     CALL h5gopen_f(file_id, "Doesnotexist1", grp_id, tmp_error)
-          CALL h5_fixname_f(err_filename, fix_err_filename, H5P_DEFAULT_F, error)
-          if (error .ne. 0) then
-              write(*,*) "Cannot modify filename"
-              stop
-          endif
-     CALL h5eprint_f(error, fix_err_filename)
-     CALL h5gopen_f(file_id, "Doesnotexist2", grp_id, tmp_error)
-     CALL h5eprint_f(error, fix_err_filename)
-
-     !
-     ! Close the file.
-     !
-     CALL h5fclose_f(file_id, error)
-     CALL check("h5fclose_f",error,total_error)
-
-          if(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
-              CALL check("h5_cleanup_f", error, total_error)
-          if(cleanup) CALL h5_cleanup_f(err_filename, H5P_DEFAULT_F, error)
-              CALL check("h5_cleanup_f", error, total_error)
-     RETURN
-     END SUBROUTINE error_report_test
-
-END MODULE TH5E
-
diff --git a/fortran/test/tH5E_F03.F90 b/fortran/test/tH5E_F03.F90
new file mode 100644
index 0000000..2d8dd33
--- /dev/null
+++ b/fortran/test/tH5E_F03.F90
@@ -0,0 +1,202 @@
+!****h* root/fortran/test/tH5E_F03.f90
+!
+! NAME
+!  tH5E_F03.f90
+!
+! FUNCTION
+!  Test FORTRAN HDF5 H5E APIs which are dependent on FORTRAN 2003
+!  features.
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+! USES
+!  liter_cb_mod
+!
+! CONTAINS SUBROUTINES
+!  test_error
+!
+!*****
+
+#include <H5config_f.inc>
+
+! *****************************************
+! ***        H 5 E   T E S T S
+! *****************************************
+MODULE test_my_hdf5_error_handler
+
+  USE HDF5
+  USE TH5_MISC
+  USE TH5_MISC_GEN
+
+CONTAINS
+
+!***************************************************************
+!**
+!**  my_hdf5_error_handler: Custom error callback routine.
+!**
+!***************************************************************
+
+    INTEGER FUNCTION my_hdf5_error_handler(estack_id, data_inout) bind(C)
+
+    ! This error function handle works with only version 2 error stack
+
+    IMPLICIT NONE
+
+    ! estack_id is always passed from C as: H5E_DEFAULT
+    INTEGER(HID_T) :: estack_id
+    ! data that was registered with H5Eset_auto_f
+    INTEGER :: data_inout
+
+    PRINT*, " "
+    PRINT*, " Subtest: H5Eset_auto_f custom error message with callback, WITH DATA"
+    PRINT*, "         -This message should be written to standard out-  "
+    PRINT*, "          Data Values Passed In =", data_inout
+    PRINT*, " "
+
+    data_inout = 10*data_inout
+
+    my_hdf5_error_handler = 1 ! this is not used by the C routine
+
+  END FUNCTION my_hdf5_error_handler
+
+  INTEGER FUNCTION my_hdf5_error_handler_nodata(estack_id, data_inout) bind(C)
+
+    ! This error function handle works with only version 2 error stack
+
+    IMPLICIT NONE
+
+    ! estack_id is always passed from C as: H5E_DEFAULT
+    INTEGER(HID_T) :: estack_id
+    ! data that was registered with H5Eset_auto_f
+    TYPE(C_PTR) :: data_inout
+
+    PRINT*, " "
+    PRINT*, " Subtest: H5Eset_auto_f custom error message with callback, NO DATA"
+    PRINT*, "         -This message should be written to standard out-  "
+    PRINT*, " "
+
+    my_hdf5_error_handler_nodata = 1 ! this is not used by the C routine
+
+  END FUNCTION my_hdf5_error_handler_nodata
+
+END MODULE test_my_hdf5_error_handler
+
+
+
+MODULE TH5E_F03
+
+CONTAINS
+
+SUBROUTINE test_error(total_error)
+
+  USE ISO_C_BINDING
+  USE test_my_hdf5_error_handler
+
+  IMPLICIT NONE
+
+  INTEGER(hid_t), PARAMETER :: FAKE_ID = -1
+  INTEGER :: total_error
+  INTEGER(hid_t) :: file
+  INTEGER(hid_t) :: dataset, space
+  INTEGER(hsize_t), DIMENSION(1:2) :: dims
+  INTEGER :: error
+  INTEGER, DIMENSION(:), POINTER :: ptr_data
+  INTEGER, TARGET :: my_hdf5_error_handler_data
+  TYPE(C_PTR) :: f_ptr
+  TYPE(C_FUNPTR) :: func
+
+  TYPE(C_PTR), TARGET :: f_ptr1
+
+  INTEGER, DIMENSION(1:1) :: array_shape
+
+  my_hdf5_error_handler_data = 99
+  CALL h5fcreate_f("terror.h5", H5F_ACC_TRUNC_F, file, error)
+  CALL check("h5fcreate_f", error, total_error)
+
+  ! Create the data space
+  dims(1) = 10
+  dims(2) = 20
+  CALL H5Screate_simple_f(2, dims, space, error)
+  CALL check("h5screate_simple_f", error, total_error)
+
+  ! ** SET THE CUSTOMIZED PRINTING OF ERROR STACK **
+
+  ! set the customized error handling routine
+  func = c_funloc(my_hdf5_error_handler)
+
+  ! set the data sent to the customized routine
+  f_ptr = c_loc(my_hdf5_error_handler_data)
+
+  ! turn on automatic printing, and use a custom error routine with input data
+  CALL H5Eset_auto_f(1, error, H5E_DEFAULT_F, func, f_ptr)
+
+  ! Create the erring dataset
+  CALL h5dcreate_f(FAKE_ID,"a_dataset",H5T_NATIVE_INTEGER, space, dataset, error)
+  CALL verify("h5dcreate_f", error, -1, total_error)
+
+!!$    CALL verify("H5Eset_auto_f",my_hdf5_error_handler_data(1),10, total_error)
+!!$    CALL verify("H5Eset_auto_f",my_hdf5_error_handler_data(2),20, total_error)
+
+!!$  ! Test enabling and disabling default printing
+!!$
+!!$  CALL H5Eget_auto_f(H5E_DEFAULT_F, func1, f_ptr1, error)
+!!$  CALL verify("H5Eget_auto_f", error, 0, total_error)
+
+  !    PRINT*,c_associated(f_ptr1)
+
+  ALLOCATE(ptr_data(1:2))
+  ptr_data = 0
+  array_shape(1) = 2
+  CALL C_F_POINTER(f_ptr1, ptr_data, array_shape)
+
+  !    ptr_data => f_ptr1(1)
+
+  !    PRINT*,ptr_data(1)
+
+!!$    if(old_data != NULL)
+!!$	TEST_ERROR;
+!!$#ifdef H5_USE_16_API
+!!$    if (old_func != (H5E_auto_t)H5Eprint)
+!!$	TEST_ERROR;
+!!$#else  H5_USE_16_API
+!!$    if (old_func != (H5E_auto2_t)H5Eprint2)
+!!$	TEST_ERROR;
+!!$#endif  H5_USE_16_API
+
+
+  ! set the customized error handling routine
+  func = c_funloc(my_hdf5_error_handler_nodata)
+  ! set the data sent to the customized routine as null
+  f_ptr = C_NULL_PTR
+  ! turn on automatic printing, and use a custom error routine with no input data
+  CALL H5Eset_auto_f(1, error, H5E_DEFAULT_F, func, f_ptr)
+
+  CALL h5dcreate_f(FAKE_ID,"a_dataset",H5T_NATIVE_INTEGER, space, dataset, error)
+  CALL verify("h5dcreate_f", error, -1, total_error)
+
+
+  ! turn on automatic printing with h5eprint_f which prints an error stack in the default manner.
+
+  !    func = c_funloc(h5eprint_f)
+  !    CALL H5Eset_auto_f(0, error, H5E_DEFAULT_F, func, C_NULL_PTR)
+
+  CALL H5Eset_auto_f(0, error)
+  CALL h5dcreate_f(FAKE_ID,"a_dataset",H5T_NATIVE_INTEGER, space, dataset, error)
+
+  CALL H5Eset_auto_f(1, error)
+  CALL h5dcreate_f(FAKE_ID,"a_dataset",H5T_NATIVE_INTEGER, space, dataset, error)
+
+END SUBROUTINE test_error
+
+END MODULE TH5E_F03
diff --git a/fortran/test/tH5E_F03.f90 b/fortran/test/tH5E_F03.f90
deleted file mode 100644
index a7d45f2..0000000
--- a/fortran/test/tH5E_F03.f90
+++ /dev/null
@@ -1,206 +0,0 @@
-!****h* root/fortran/test/tH5E_F03.f90
-!
-! NAME
-!  tH5E_F03.f90
-!
-! FUNCTION
-!  Test FORTRAN HDF5 H5E APIs which are dependent on FORTRAN 2003
-!  features. 
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! USES
-!  liter_cb_mod
-!
-! CONTAINS SUBROUTINES
-!  test_error
-!
-!*****
-
-! *****************************************
-! ***        H 5 E   T E S T S
-! *****************************************
-MODULE test_my_hdf5_error_handler
-
-
-CONTAINS
-
-!***************************************************************
-!**
-!**  my_hdf5_error_handler: Custom error callback routine.
-!**
-!***************************************************************
-
-    INTEGER FUNCTION my_hdf5_error_handler(estack_id, data_inout) bind(C)
-
-    ! This error function handle works with only version 2 error stack
-
-    USE HDF5
-    USE ISO_C_BINDING
-    IMPLICIT NONE
-
-    ! estack_id is always passed from C as: H5E_DEFAULT
-    INTEGER(HID_T) :: estack_id
-    ! data that was registered with H5Eset_auto_f
-    INTEGER :: data_inout
-
-    PRINT*, " "
-    PRINT*, " Subtest: H5Eset_auto_f custom error message with callback, WITH DATA"
-    PRINT*, "         -This message should be written to standard out-  "
-    PRINT*, "          Data Values Passed In =", data_inout
-    PRINT*, " "
-
-    data_inout = 10*data_inout
-
-    my_hdf5_error_handler = 1 ! this is not used by the C routine
-
-  END FUNCTION my_hdf5_error_handler
-
-  INTEGER FUNCTION my_hdf5_error_handler_nodata(estack_id, data_inout) bind(C)
-
-    ! This error function handle works with only version 2 error stack
-
-    USE HDF5
-    USE ISO_C_BINDING
-    IMPLICIT NONE
-
-    ! estack_id is always passed from C as: H5E_DEFAULT
-    INTEGER(HID_T) :: estack_id
-    ! data that was registered with H5Eset_auto_f
-    TYPE(C_PTR) :: data_inout
-
-    PRINT*, " "
-    PRINT*, " Subtest: H5Eset_auto_f custom error message with callback, NO DATA"
-    PRINT*, "         -This message should be written to standard out-  "
-    PRINT*, " "
-
-    my_hdf5_error_handler_nodata = 1 ! this is not used by the C routine
-
-  END FUNCTION my_hdf5_error_handler_nodata
-
-END MODULE test_my_hdf5_error_handler
-
-
-
-MODULE TH5E_F03
-
-CONTAINS
-
-SUBROUTINE test_error(total_error)
-
-  USE HDF5 
-  USE TH5_MISC
-  USE ISO_C_BINDING
-  USE test_my_hdf5_error_handler
-
-  IMPLICIT NONE
-
-  INTEGER(hid_t), PARAMETER :: FAKE_ID = -1
-  INTEGER :: total_error
-  INTEGER(hid_t) :: file
-  INTEGER(hid_t) :: dataset, space
-  INTEGER(hsize_t), DIMENSION(1:2) :: dims
-  INTEGER :: error
-  INTEGER, DIMENSION(:), POINTER :: ptr_data
-  INTEGER, TARGET :: my_hdf5_error_handler_data
-  TYPE(C_PTR) :: f_ptr
-  TYPE(C_FUNPTR) :: func
-
-  TYPE(C_PTR), TARGET :: f_ptr1
-
-  INTEGER, DIMENSION(1:1) :: array_shape
-
-  my_hdf5_error_handler_data = 99
-  CALL h5fcreate_f("terror.h5", H5F_ACC_TRUNC_F, file, error)
-  CALL check("h5fcreate_f", error, total_error)
-
-  ! Create the data space
-  dims(1) = 10
-  dims(2) = 20
-  CALL H5Screate_simple_f(2, dims, space, error)
-  CALL check("h5screate_simple_f", error, total_error)
-
-  ! ** SET THE CUSTOMIZED PRINTING OF ERROR STACK **
-
-  ! set the customized error handling routine
-  func = c_funloc(my_hdf5_error_handler)
-
-  ! set the data sent to the customized routine
-  f_ptr = c_loc(my_hdf5_error_handler_data)
-
-  ! turn on automatic printing, and use a custom error routine with input data
-  CALL H5Eset_auto_f(1, error, H5E_DEFAULT_F, func, f_ptr)
-
-  ! Create the erring dataset
-  CALL h5dcreate_f(FAKE_ID,"a_dataset",H5T_NATIVE_INTEGER, space, dataset, error)
-  CALL VERIFY("h5dcreate_f", error, -1, total_error)
-
-!!$    CALL VERIFY("H5Eset_auto_f",my_hdf5_error_handler_data(1),10, total_error)
-!!$    CALL VERIFY("H5Eset_auto_f",my_hdf5_error_handler_data(2),20, total_error)
-
-!!$  ! Test enabling and disabling default printing
-!!$
-!!$  CALL H5Eget_auto_f(H5E_DEFAULT_F, func1, f_ptr1, error)
-!!$  CALL VERIFY("H5Eget_auto_f", error, 0, total_error)
-
-  !    PRINT*,c_associated(f_ptr1)
-
-  ALLOCATE(ptr_data(1:2))
-  ptr_data = 0
-  array_shape(1) = 2
-  CALL C_F_POINTER(f_ptr1, ptr_data, array_shape)
-
-  !    ptr_data => f_ptr1(1)
-
-  !    PRINT*,ptr_data(1)
-
-!!$    if(old_data != NULL)
-!!$	TEST_ERROR;
-!!$#ifdef H5_USE_16_API
-!!$    if (old_func != (H5E_auto_t)H5Eprint)
-!!$	TEST_ERROR;
-!!$#else  H5_USE_16_API 
-!!$    if (old_func != (H5E_auto2_t)H5Eprint2)
-!!$	TEST_ERROR;
-!!$#endif  H5_USE_16_API 
-
-
-  ! set the customized error handling routine
-  func = c_funloc(my_hdf5_error_handler_nodata)
-  ! set the data sent to the customized routine as null
-  f_ptr = C_NULL_PTR
-  ! turn on automatic printing, and use a custom error routine with no input data
-  CALL H5Eset_auto_f(1, error, H5E_DEFAULT_F, func, f_ptr)
-
-  CALL h5dcreate_f(FAKE_ID,"a_dataset",H5T_NATIVE_INTEGER, space, dataset, error)
-  CALL VERIFY("h5dcreate_f", error, -1, total_error)
-
-
-  ! turn on automatic printing with h5eprint_f which prints an error stack in the default manner.
-
-  !    func = c_funloc(h5eprint_f)
-  !    CALL H5Eset_auto_f(0, error, H5E_DEFAULT_F, func, C_NULL_PTR)
-
-  CALL H5Eset_auto_f(0, error)
-  CALL h5dcreate_f(FAKE_ID,"a_dataset",H5T_NATIVE_INTEGER, space, dataset, error)
-
-  CALL H5Eset_auto_f(1, error)
-  CALL h5dcreate_f(FAKE_ID,"a_dataset",H5T_NATIVE_INTEGER, space, dataset, error)
-
-END SUBROUTINE test_error
-
-END MODULE TH5E_F03
diff --git a/fortran/test/tH5F.F90 b/fortran/test/tH5F.F90
new file mode 100644
index 0000000..c255755
--- /dev/null
+++ b/fortran/test/tH5F.F90
@@ -0,0 +1,1138 @@
+!***rh* root/fortran/test/tH5F.f90
+!
+! NAME
+!  tH5F.f90
+!
+! FUNCTION
+!  Basic testing of Fortran H5F APIs.
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+! CONTAINS SUBROUTINES
+!  mountingtest, reopentest, get_name_test, plisttest, 
+!  file_close, file_space, h5openclose
+!
+!*****
+!
+!  In the mountingtest subroutine we create one file with a group in it,
+!  and another file with a dataset. Mounting is used to
+!  access the dataset from the second file as a member of a group
+!  in the first file.
+
+MODULE TH5F
+
+CONTAINS
+
+  SUBROUTINE h5openclose(total_error)
+    USE HDF5  ! This module contains all necessary modules
+    USE TH5_MISC
+    IMPLICIT NONE
+    INTEGER, INTENT(INOUT) :: total_error
+
+    !
+    ! flag to check operation success
+    !
+    INTEGER :: error
+    INTEGER(SIZE_T) :: obj_count ! open object count
+    INTEGER, DIMENSION(1:5) :: obj_type ! open object type to check
+    INTEGER :: i, j
+
+    DO j = 1, 2
+       CALL h5open_f(error)
+       CALL check("h5open_f",error,total_error)
+
+       obj_type(1) = H5F_OBJ_ALL_F
+       obj_type(2) = H5F_OBJ_FILE_F
+       obj_type(3) = H5F_OBJ_GROUP_F
+       obj_type(4) = H5F_OBJ_DATASET_F
+       obj_type(5) = H5F_OBJ_DATATYPE_F
+
+       CALL h5close_f(error)
+       CALL check("h5close_f",error,total_error)
+       ! Check all the datatypes created during h5open_f are closed in h5close_f
+       DO i = 1, 5
+          CALL h5fget_obj_count_f(INT(H5F_OBJ_ALL_F,HID_T), obj_type(i), obj_count, error)
+          CALL check("h5fget_obj_count_f",error,total_error)
+          IF(obj_count.NE.0)THEN
+             total_error = total_error + 1
+          ENDIF
+       ENDDO
+    ENDDO
+
+    ! Test calling h5open_f multiple times without calling h5close_f
+    DO j = 1, 4
+       CALL h5open_f(error)
+       CALL check("h5open_f",error,total_error)
+    ENDDO
+
+    CALL h5close_f(error)
+    CALL check("h5close_f",error,total_error)
+    ! Check all the datatypes created during h5open_f are closed in h5close_f
+    DO i = 1, 5
+       CALL h5fget_obj_count_f(INT(H5F_OBJ_ALL_F,HID_T), obj_type(i), obj_count, error)
+       CALL check("h5fget_obj_count_f",error,total_error)
+       IF(obj_count.NE.0)THEN
+          total_error = total_error + 1
+       ENDIF
+    ENDDO
+
+    ! Test calling h5open_f multiple times with a h5close_f in the series of h5open_f
+    DO j = 1, 5
+       CALL h5open_f(error)
+       CALL check("h5open_f",error,total_error)
+       IF(j.EQ.3)THEN
+          CALL h5close_f(error)
+          CALL check("h5close_f",error,total_error)
+          ! Check all the datatypes created during h5open_f are closed in h5close_f
+          DO i = 1, 5
+             CALL h5fget_obj_count_f(INT(H5F_OBJ_ALL_F,HID_T), obj_type(i), obj_count, error)
+             CALL check("h5fget_obj_count_f",error,total_error)
+             IF(obj_count.NE.0)THEN
+                total_error = total_error + 1
+             ENDIF
+          ENDDO
+       ENDIF
+    ENDDO
+
+    CALL h5close_f(error)
+    CALL check("h5close_f",error,total_error)
+    ! Check all the datatypes created during h5open_f are closed in h5close_f
+    DO i = 1, 5
+       CALL h5fget_obj_count_f(INT(H5F_OBJ_ALL_F,HID_T), obj_type(i), obj_count, error)
+       CALL check("h5fget_obj_count_f",error,total_error)
+       IF(obj_count.NE.0)THEN
+          total_error = total_error + 1
+       ENDIF
+    ENDDO
+
+    ! Check calling h5close_f after already calling h5close_f
+    CALL h5close_f(error)
+    CALL check("h5close_f",error,total_error)
+    ! Check all the datatypes created during h5open_f are closed in h5close_f
+    DO i = 1, 5
+       CALL h5fget_obj_count_f(INT(H5F_OBJ_ALL_F,HID_T), obj_type(i), obj_count, error)
+       CALL check("h5fget_obj_count_f",error,total_error)
+       IF(obj_count.NE.0)THEN
+          total_error = total_error + 1
+       ENDIF
+    ENDDO
+
+    RETURN
+  END SUBROUTINE h5openclose
+
+        SUBROUTINE mountingtest(cleanup, total_error)
+        USE HDF5  ! This module contains all necessary modules
+        USE TH5_MISC
+          IMPLICIT NONE
+          LOGICAL, INTENT(IN)  :: cleanup
+          INTEGER, INTENT(INOUT) :: total_error
+
+          !
+          !the respective filename is "mount1.h5" and "mount2.h5"
+          !
+          CHARACTER(LEN=6)  :: filename1
+          CHARACTER(LEN=6)  :: filename2
+          CHARACTER(LEN=80) :: fix_filename1
+          CHARACTER(LEN=80) :: fix_filename2
+
+          !
+          !data space rank and dimensions
+          !
+          INTEGER, PARAMETER :: RANK = 2
+          INTEGER, PARAMETER :: NX = 4
+          INTEGER, PARAMETER :: NY = 5
+
+          !
+          ! File identifiers
+          !
+          INTEGER(HID_T) :: file1_id, file2_id
+
+          !
+          ! Group identifier
+          !
+          INTEGER(HID_T) :: gid
+
+          !
+          ! dataset identifier
+          !
+          INTEGER(HID_T) :: dset_id
+
+          !
+          ! data space identifier
+          !
+          INTEGER(HID_T) :: dataspace
+
+          !
+          ! data type identifier
+          !
+          INTEGER(HID_T) :: dtype_id
+
+          !
+          !The dimensions for the dataset.
+          !
+          INTEGER(HSIZE_T), DIMENSION(2) :: dims = (/NX,NY/)
+
+          !
+          !return value for testing whether a file is in hdf5 format
+          !
+          LOGICAL     ::  status
+
+          !
+          !flag to check operation success
+          !
+          INTEGER     ::   error
+
+          !
+          !general purpose integer
+          !
+          INTEGER     ::   i, j
+
+          !number of objects
+          INTEGER(SIZE_T) :: obj_count
+          INTEGER(HID_T) :: t1, t2, t3, t4
+
+          ! File numbers
+          INTEGER  :: file_num1
+          INTEGER  :: file_num2
+
+          !
+          !data buffers
+          !
+          INTEGER, DIMENSION(NX,NY) :: data_in, data_out
+
+          INTEGER(HSIZE_T), DIMENSION(2) :: data_dims
+          filename1 = "mount1"
+          filename2 = "mount2"
+
+          do i = 1,80
+             fix_filename1(i:i) = " "
+             fix_filename2(i:i) = " "
+          enddo
+          !
+          !Initialize data_in buffer
+          !
+          do j = 1, NY
+             do i = 1, NX
+                data_in(i,j) =  (i-1) + (j-1)
+             end do
+          end do
+
+          !
+          ! Fix names of the files
+          !
+          CALL h5_fixname_f(filename1, fix_filename1, H5P_DEFAULT_F, error)
+          if(error .ne. 0) stop
+          CALL h5_fixname_f(filename2, fix_filename2, H5P_DEFAULT_F, error)
+          if(error .ne. 0) stop
+
+          ! Test object counts
+          CALL h5tcopy_f(H5T_NATIVE_CHARACTER, t1, error)
+          CALL check(" h5tcopy_f",error,total_error)
+          CALL h5tcopy_f(H5T_NATIVE_CHARACTER, t2, error)
+          CALL check(" h5tcopy_f",error,total_error)
+          CALL h5tcopy_f(H5T_NATIVE_CHARACTER, t3, error)
+          CALL check(" h5tcopy_f",error,total_error)
+          CALL h5tcopy_f(H5T_NATIVE_CHARACTER, t4, error)
+          CALL check(" h5tcopy_f",error,total_error)
+
+          CALL h5fget_obj_count_f(INT(H5F_OBJ_ALL_F,HID_T), H5F_OBJ_ALL_F, obj_count,  error)
+          CALL check(" h5fget_obj_count_f",error,total_error)
+
+          IF(obj_count.NE.4)THEN
+             total_error = total_error + 1
+          ENDIF
+
+          !
+          !Create first file "mount1.h5" using default properties.
+          !
+          CALL h5fcreate_f(fix_filename1, H5F_ACC_TRUNC_F, file1_id, error)
+          CALL check("h5fcreate_f",error,total_error)
+
+          CALL h5fget_obj_count_f(INT(H5F_OBJ_ALL_F,HID_T), H5F_OBJ_ALL_F, obj_count,  error)
+          CALL check(" h5fget_obj_count_f",error,total_error)
+
+          IF(obj_count.NE.5)THEN
+             total_error = total_error + 1
+          ENDIF
+
+          CALL h5tclose_f(t1, error)
+          CALL check("h5tclose_f",error,total_error)
+          CALL h5tclose_f(t2, error)
+          CALL check("h5tclose_f",error,total_error)
+          CALL h5tclose_f(t3, error)
+          CALL check("h5tclose_f",error,total_error)
+          CALL h5tclose_f(t4, error)
+          CALL check("h5tclose_f",error,total_error)
+
+          CALL h5fget_obj_count_f(INT(H5F_OBJ_ALL_F,HID_T), H5F_OBJ_ALL_F, obj_count,  error)
+          CALL check(" h5fget_obj_count_f",error,total_error)
+
+          IF(obj_count.NE.1)THEN
+             total_error = total_error + 1
+          ENDIF
+
+          !
+          !Create group "/G" inside file "mount1.h5".
+          !
+          CALL h5gcreate_f(file1_id, "/G", gid, error)
+               CALL check("h5gcreate_f",error,total_error)
+          !
+          !close file and group identifiers.
+          !
+          CALL h5gclose_f(gid, error)
+               CALL check("h5gclose_f",error,total_error)
+          CALL h5fclose_f(file1_id, error)
+               CALL check("h5fclose_f",error,total_error)
+
+          !
+          !Create second file "mount2.h5" using default properties.
+          !
+          CALL h5fcreate_f(fix_filename2, H5F_ACC_TRUNC_F, file2_id, error)
+               CALL check("h5fcreate_f",error,total_error)
+
+          !
+          !Create data space for the dataset.
+          !
+          CALL h5screate_simple_f(RANK, dims, dataspace, error)
+               CALL check("h5screate_simple_f",error,total_error)
+
+          !
+          !Create dataset "/D" inside file "mount2.h5".
+          !
+          CALL h5dcreate_f(file2_id, "/D", H5T_NATIVE_INTEGER, dataspace, &
+               dset_id, error)
+              CALL check("h5dcreate_f",error,total_error)
+
+          !
+          ! Write data_in to the dataset
+          !
+          data_dims(1) = NX
+          data_dims(2) = NY
+          CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, data_in, data_dims, error)
+               CALL check("h5dwrite_f",error,total_error)
+
+          !
+          !close file, dataset and dataspace identifiers.
+          !
+          CALL h5sclose_f(dataspace, error)
+              CALL check("h5sclose_f",error,total_error)
+          CALL h5dclose_f(dset_id, error)
+              CALL check("h5dclose_f",error,total_error)
+          CALL h5fclose_f(file2_id, error)
+              CALL check("h5fclose_f",error,total_error)
+
+          !
+          !test whether files are accessible as HDF5 (new, VOL-safe, way)
+          !
+          CALL h5fis_accessible_f(fix_filename1, status, error)
+               CALL check("h5fis_accessible_f",error,total_error)
+          IF ( .NOT. status ) THEN
+              write(*,*) "File ", fix_filename1, " is not accessible as hdf5"
+              stop
+          END IF
+
+          CALL h5fis_accessible_f(fix_filename2, status, error)
+               CALL check("h5fis_accessible_f",error,total_error)
+          IF ( .NOT. status ) THEN
+              write(*,*) "File ", fix_filename2, " is not accessible as hdf5"
+              stop
+          END IF
+
+          !
+          !test whether files are in hdf5 format (old way)
+          !
+          CALL h5fis_hdf5_f(fix_filename1, status, error)
+               CALL check("h5fis_hdf5_f",error,total_error)
+          IF ( .NOT. status ) THEN
+              write(*,*) "File ", fix_filename1, " is not in hdf5 format"
+              stop
+          END IF
+
+          CALL h5fis_hdf5_f(fix_filename2, status, error)
+               CALL check("h5fis_hdf5_f",error,total_error)
+          IF ( .NOT. status ) THEN
+              write(*,*) "File ", fix_filename2, " is not in hdf5 format"
+              stop
+          END IF
+
+          !
+          !reopen both files.
+          !
+          CALL h5fopen_f (fix_filename1, H5F_ACC_RDWR_F, file1_id, error)
+              CALL check("hfopen_f",error,total_error)
+
+          CALL h5fget_obj_count_f(INT(H5F_OBJ_ALL_F,HID_T), H5F_OBJ_ALL_F, obj_count,  error)
+          CALL check(" h5fget_obj_count_f",error,total_error)
+
+          IF(obj_count.NE.1)THEN
+             total_error = total_error + 1
+          ENDIF
+
+          CALL h5fopen_f (fix_filename2, H5F_ACC_RDWR_F, file2_id, error)
+              CALL check("h5fopen_f",error,total_error)
+
+          CALL h5fget_obj_count_f(INT(H5F_OBJ_ALL_F,HID_T), H5F_OBJ_ALL_F, obj_count,  error)
+          CALL check(" h5fget_obj_count_f",error,total_error)
+
+          IF(obj_count.NE.2)THEN
+             total_error = total_error + 1
+          ENDIF
+
+          !
+          !Check file numbers
+          !
+          CALL h5fget_fileno_f(file1_id, file_num1, error)
+               CALL check("h5fget_fileno_f",error,total_error)
+          CALL h5fget_fileno_f(file2_id, file_num2, error)
+               CALL check("h5fget_fileno_f",error,total_error)
+          IF(file_num1 .EQ. file_num2) THEN
+               write(*,*) "file numbers aren't supposed to match"
+          END IF
+
+          !
+          !mount the second file under the first file's "/G" group.
+          !
+          CALL h5fmount_f (file1_id, "/G", file2_id, error)
+              CALL check("h5fmount_f",error,total_error)
+
+
+          !
+          !Access dataset D in the first file under /G/D name.
+          !
+          CALL h5dopen_f(file1_id, "/G/D", dset_id, error)
+              CALL check("h5dopen_f",error,total_error)
+
+          !
+          !Get dataset's data type.
+          !
+          CALL h5dget_type_f(dset_id, dtype_id, error)
+              CALL check("h5dget_type_f",error,total_error)
+
+          !
+          !Read the dataset.
+          !
+          CALL h5dread_f(dset_id, dtype_id, data_out, data_dims, error)
+              CALL check("h5dread_f",error,total_error)
+
+          !
+          !Compare the data.
+          !
+          do i = 1, NX
+              do j = 1, NY
+                  IF (data_out(i,j) .NE. data_in(i, j)) THEN
+                     total_error = total_error + 1
+                  END IF
+              end do
+          end do
+
+
+          !
+          !Close dset_id and dtype_id.
+          !
+          CALL h5dclose_f(dset_id, error)
+              CALL check("h5dclose_f",error,total_error)
+          CALL h5tclose_f(dtype_id, error)
+              CALL check("h5tclose_f",error,total_error)
+
+          !
+          !unmount the second file.
+          !
+          CALL h5funmount_f(file1_id, "/G", error);
+              CALL check("h5funmount_f",error,total_error)
+
+          !
+          !Close both files.
+          !
+
+          CALL h5fget_obj_count_f(INT(H5F_OBJ_ALL_F,HID_T), H5F_OBJ_ALL_F, obj_count,  error)
+          CALL check(" h5fget_obj_count_f",error,total_error)
+
+          IF(obj_count.NE.2)THEN
+             total_error = total_error + 1
+          ENDIF
+
+          CALL h5fclose_f(file1_id, error)
+              CALL check("h5fclose_f",error,total_error)
+          CALL h5fclose_f(file2_id, error)
+              CALL check("h5fclose_f",error,total_error)
+
+          CALL h5fget_obj_count_f(INT(H5F_OBJ_ALL_F,HID_T), H5F_OBJ_ALL_F, obj_count,  error)
+          CALL check(" h5fget_obj_count_f",error,total_error)
+
+          IF(obj_count.NE.0)THEN
+             total_error = total_error + 1
+          ENDIF
+
+          if(cleanup) CALL h5_cleanup_f(filename1, H5P_DEFAULT_F, error)
+              CALL check("h5_cleanup_f", error, total_error)
+          if(cleanup) CALL h5_cleanup_f(filename2, H5P_DEFAULT_F, error)
+              CALL check("h5_cleanup_f", error, total_error)
+          RETURN
+        END SUBROUTINE mountingtest
+
+!
+!    The following subroutine tests h5freopen_f.
+!    It creates the file which has name "reopen.h5" and
+!    the "/dset" dataset inside the file.
+!    writes the data to the file, close the dataset.
+!    Reopen the file based upon the file_id, open the
+!    dataset use the reopen_id then reads the
+!    dataset back to memory to test whether the data
+!    read is identical to the data written
+!
+
+        SUBROUTINE reopentest(cleanup, total_error)
+        USE HDF5  ! This module contains all necessary modules
+        USE TH5_MISC
+          IMPLICIT NONE
+          LOGICAL, INTENT(IN) :: cleanup
+          INTEGER, INTENT(INOUT) :: total_error
+
+          !
+          CHARACTER(LEN=6), PARAMETER :: filename = "reopen"
+          CHARACTER(LEN=80)  :: fix_filename
+
+          INTEGER(HID_T) :: file_id, reopen_id  ! File identifiers
+          INTEGER(HID_T) :: dset_id             ! Dataset identifier
+
+          !
+          !dataset name is "dset"
+          !
+          CHARACTER(LEN=4), PARAMETER :: dsetname = "dset"
+
+          !
+          !data space rank and dimensions
+          !
+          INTEGER, PARAMETER :: RANK = 2
+          INTEGER, PARAMETER :: NX = 4
+          INTEGER, PARAMETER :: NY = 6
+
+          !
+          ! data space identifier
+          !
+          INTEGER(HID_T) :: dataspace
+
+          !
+          !The dimensions for the dataset.
+          !
+          INTEGER(HSIZE_T), DIMENSION(2) :: dims = (/NX,NY/)
+
+          !
+          !flag to check operation success
+          !
+          INTEGER     ::   error
+
+          !
+          !general purpose integer
+          !
+          INTEGER     ::  i, j
+
+          !
+          !array to store data
+          !
+          INTEGER, DIMENSION(4,6) :: dset_data, data_out
+          INTEGER(HSIZE_T), DIMENSION(2) :: data_dims
+          INTEGER(HSIZE_T)  :: file_size
+          INTEGER  :: file_num1
+          INTEGER  :: file_num2
+          CHARACTER(LEN=80) :: file_name
+          INTEGER(SIZE_T) :: name_size
+
+          !
+          !initialize the dset_data array which will be written to the "/dset"
+          !
+          do j = 1, NY
+               do i = 1, NX
+                    dset_data(i,j) = (i-1)*6 + j;
+               end do
+          end do
+
+          !
+          !Create file "reopen.h5" using default properties.
+          !
+          CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
+          if (error .ne. 0) then
+              write(*,*) "Cannot modify filename"
+              stop
+          endif
+          CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
+               CALL check("h5fcreate_f",error,total_error)
+
+          !
+          !Create data space for the dataset.
+          !
+          CALL h5screate_simple_f(RANK, dims, dataspace, error)
+               CALL check("h5screate_simple_f",error,total_error)
+
+          !
+          !Create dataset "/dset" inside the file .
+          !
+          CALL h5dcreate_f(file_id, dsetname, H5T_NATIVE_INTEGER, dataspace, &
+               dset_id, error)
+              CALL check("h5dcreate_f",error,total_error)
+
+         !
+         !Write the dataset.
+         !
+         data_dims(1) = NX
+         data_dims(2) = NY
+         CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, dset_data, data_dims, error)
+              CALL check("h5dwrite_f",error,total_error)
+
+         !
+         !close the dataset.
+         !
+         CALL h5dclose_f(dset_id, error)
+              CALL check("h5dclose_f",error,total_error)
+
+         !
+         !close the dataspace.
+         !
+         CALL h5sclose_f(dataspace, error)
+              CALL check("h5sclose_f",error,total_error)
+
+         !
+         !Reopen file dsetf.h5.
+         !
+         CALL h5freopen_f(file_id, reopen_id, error)
+              CALL check("h5freopen_f",error,total_error)
+         !
+         !Check file size
+         !
+         CALL h5fget_filesize_f(file_id, file_size, error)
+              CALL check("h5fget_filesize_f",error,total_error)
+
+         !
+         !Check file numbers
+         !
+         CALL h5fget_fileno_f(file_id, file_num1, error)
+              CALL check("h5fget_fileno_f",error,total_error)
+         CALL h5fget_fileno_f(reopen_id, file_num2, error)
+              CALL check("h5fget_fileno_f",error,total_error)
+         IF(file_num1 .NE. file_num2) THEN
+              write(*,*) "file numbers don't match"
+         END IF
+
+         !
+         !Open the dataset based on the reopen_id.
+         !
+         CALL h5dopen_f(reopen_id, dsetname, dset_id, error)
+              CALL check("h5dopen_f",error,total_error)
+         !
+         !Get file name from the dataset identifier
+         !
+         CALL h5fget_name_f(dset_id, file_name, name_size, error)
+              CALL check("h5fget_name_f",error,total_error)
+              IF(file_name(1:name_size) .NE. fix_filename(1:name_size)) THEN
+                 write(*,*) "file name obtained from the dataset id is incorrect"
+              END IF
+
+         !
+         !Read the dataset.
+         !
+         CALL h5dread_f(dset_id, H5T_NATIVE_INTEGER, data_out, data_dims, error)
+              CALL check("h5dread_f",error,total_error)
+
+          !
+          !Compare the data.
+          !
+          do i = 1, NX
+              do j = 1, NY
+                  IF (data_out(i,j) .NE. dset_data(i, j)) THEN
+                      write(*, *) "reopen test error occurred"
+                  END IF
+              end do
+          end do
+
+
+         !
+         !Close the dataset.
+         !
+         CALL h5dclose_f(dset_id, error)
+              CALL check("h5dclose_f",error,total_error)
+
+         !
+         !Close the file identifiers.
+         !
+         CALL h5fclose_f(file_id, error)
+              CALL check("h5fclose_f",error,total_error)
+         CALL h5fclose_f(reopen_id, error)
+              CALL check("h5fclose_f",error,total_error)
+
+
+          if(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
+              CALL check("h5_cleanup_f", error, total_error)
+          RETURN
+
+        END SUBROUTINE reopentest
+
+!    The following subroutine checks that h5fget_name_f produces
+!    correct output for a given obj_id and filename.
+!
+        SUBROUTINE check_get_name(obj_id, fix_filename, len_filename, total_error)
+          USE HDF5  ! This module contains all necessary modules
+          USE TH5_MISC
+          IMPLICIT NONE
+          INTEGER(HID_T) :: obj_id                          ! Object identifier
+          CHARACTER(LEN=80), INTENT(IN) :: fix_filename     ! Expected filename
+          INTEGER, INTENT(IN) :: len_filename               ! The length of the filename
+          INTEGER, INTENT(INOUT) :: total_error             ! Error count
+
+          CHARACTER(LEN=80):: file_name  ! Filename buffer
+          INTEGER:: error                ! HDF5 error code
+          INTEGER(SIZE_T):: name_size    ! Filename length
+
+          INTEGER, PARAMETER :: sm_len = 2
+          CHARACTER(LEN=len_filename) :: filename_exact
+          CHARACTER(LEN=len_filename-sm_len) :: filename_sm
+
+          !
+          !Get file name from the dataset identifier
+          !
+
+          ! Use an uninitialized buffer
+          CALL h5fget_name_f(obj_id, file_name, name_size, error)
+          CALL check("h5fget_name_f",error,total_error)
+          IF(name_size .NE. LEN_TRIM(fix_filename))THEN
+             WRITE(*,*) "  file name size obtained from the object id is incorrect"
+             total_error = total_error + 1
+          ENDIF
+          IF(file_name(1:name_size) .NE. TRIM(fix_filename)) THEN
+             WRITE(*,*) "  file name obtained from the object id is incorrect"
+             total_error = total_error + 1
+          END IF
+
+         ! Use a buffer initialized with spaces
+         file_name(:) = " "
+         CALL h5fget_name_f(obj_id, file_name, name_size, error)
+         CALL check("h5fget_name_f",error,total_error)
+         IF(name_size .NE. LEN_TRIM(fix_filename))THEN
+            WRITE(*,*) "  file name size obtained from the object id is incorrect"
+            total_error = total_error + 1
+         ENDIF
+         IF(file_name(1:name_size) .NE. TRIM(fix_filename)) THEN
+            WRITE(*,*) "  file name obtained from the object id is incorrect"
+            total_error = total_error + 1
+         END IF
+
+         ! Use a buffer initialized with non-whitespace characters
+         file_name(:) = "a"
+         CALL h5fget_name_f(obj_id, file_name, name_size, error)
+         CALL check("h5fget_name_f",error,total_error)
+         IF(name_size .NE. LEN_TRIM(fix_filename))THEN
+            WRITE(*,*) "  file name size obtained from the object id is incorrect"
+            total_error = total_error + 1
+         ENDIF
+         IF(file_name(1:name_size) .NE. TRIM(fix_filename)) THEN
+            WRITE(*,*) "  file name obtained from the object id is incorrect"
+            total_error = total_error + 1
+         END IF
+
+         ! Use a buffer which is the exact size needed to hold the filename
+         CALL h5fget_name_f(obj_id, filename_exact, name_size, error)
+         CALL check("h5fget_name_f",error,total_error)
+         IF(name_size .NE. len_filename)THEN
+            WRITE(*,*) "  file name size obtained from the object id is incorrect"
+            total_error = total_error + 1
+         ENDIF
+         IF(filename_exact .NE. TRIM(fix_filename)) THEN
+            WRITE(*,*) "  file name obtained from the object id is incorrect"
+            total_error = total_error + 1
+         END IF
+
+         ! Use a buffer which is smaller than needed to hold the filename
+         CALL h5fget_name_f(obj_id, filename_sm, name_size, error)
+         CALL check("h5fget_name_f",error,total_error)
+         IF(name_size .NE. len_filename)THEN
+            WRITE(*,*) "  file name size obtained from the object id is incorrect"
+            total_error = total_error + 1
+         ENDIF
+         IF(filename_sm(1:len_filename-sm_len) .NE. fix_filename(1:len_filename-sm_len)) THEN
+            WRITE(*,*) "  file name obtained from the object id is incorrect"
+            total_error = total_error + 1
+         END IF
+
+        END SUBROUTINE check_get_name
+
+!    The following subroutine tests h5fget_name_f.
+!    It creates the file which has name "filename.h5" and
+!    tests that h5fget_name_f also returns the name "filename.h5"
+!
+
+        SUBROUTINE get_name_test(cleanup, total_error)
+          USE HDF5  ! This module contains all necessary modules
+          USE TH5_MISC
+          IMPLICIT NONE
+          LOGICAL, INTENT(IN) :: cleanup
+          INTEGER, INTENT(INOUT) :: total_error
+
+          CHARACTER(LEN=*), PARAMETER :: filename = "filename"
+          CHARACTER(LEN=80)  :: fix_filename
+          INTEGER :: len_filename
+
+          INTEGER(HID_T) :: file_id          ! File identifier
+          INTEGER(HID_T) :: g_id             ! Group identifier
+
+          !
+          ! Flag to check operation success
+          !
+          INTEGER :: error
+
+          !
+          ! Create file "filename.h5" using default properties.
+          !
+          CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
+          IF (error .NE. 0) THEN
+             WRITE(*,*) "Cannot modify filename"
+             STOP
+          ENDIF
+          CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
+          CALL check("h5fcreate_f",error,total_error)
+
+          !
+          ! Create group.
+          !
+          CALL h5gopen_f(file_id,"/",g_id, error)
+          CALL check("h5gopen_f",error,total_error)
+
+          len_filename = LEN_TRIM(fix_filename)
+          CALL check_get_name(file_id, fix_filename, len_filename, total_error)
+          CALL check_get_name(g_id, fix_filename, len_filename, total_error)
+
+          ! Close the group.
+          !
+          CALL h5gclose_f(g_id, error)
+          CALL check("h5gclose_f",error,total_error)
+
+          !
+          ! Close the file identifiers.
+          !
+          CALL h5fclose_f(file_id, error)
+          CALL check("h5fclose_f",error,total_error)
+
+          IF(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
+          CALL check("h5_cleanup_f", error, total_error)
+          RETURN
+
+        END SUBROUTINE get_name_test
+
+
+!
+!    The following example demonstrates how to get creation property list,
+!    and access property list.
+!    We first create a file using the default creation and access property
+!    list. Then, the file was closed and reopened. We then get the
+!    creation and access property lists of the first file. The second file is
+!    created using the got property lists
+
+        SUBROUTINE plisttest(cleanup, total_error)
+         USE HDF5  ! This module contains all necessary modules
+         USE TH5_MISC
+          IMPLICIT NONE
+          LOGICAL, INTENT(IN)  :: cleanup
+          INTEGER, INTENT(INOUT) :: total_error
+
+          !
+          !file names are "plist1.h5" and "plist2.h5"
+          !
+          CHARACTER(LEN=6), PARAMETER :: filename1 = "plist1"
+          CHARACTER(LEN=80) :: fix_filename1
+          CHARACTER(LEN=6), PARAMETER :: filename2 = "plist2"
+          CHARACTER(LEN=80) :: fix_filename2
+
+          INTEGER(HID_T) :: file1_id, file2_id   ! File identifiers
+          INTEGER(HID_T) :: prop_id    ! File creation property list identifier
+          INTEGER(HID_T) :: access_id  ! File Access property list identifier
+
+          !flag to check operation success
+          INTEGER     ::   error
+
+          !
+          !Create a file1 using default properties.
+          !
+          CALL h5_fixname_f(filename1, fix_filename1, H5P_DEFAULT_F, error)
+          if (error .ne. 0) then
+              write(*,*) "Cannot modify file name"
+              stop
+          endif
+          CALL h5fcreate_f(fix_filename1, H5F_ACC_TRUNC_F, file1_id, error)
+              CALL check("h5fcreate_f",error,total_error)
+
+          !
+          !Terminate access to the file.
+          !
+          CALL h5fclose_f(file1_id, error)
+              CALL check("h5fclose_f",error,total_error)
+
+          !
+          !Open an existing file.
+          !
+          CALL h5fopen_f (fix_filename1, H5F_ACC_RDWR_F, file1_id, error)
+              CALL check("h5fopen_f",error,total_error)
+
+          !
+          !get the creation property list.
+          !
+          CALL h5fget_create_plist_f(file1_id, prop_id, error)
+              CALL check("h5fget_create_plist_f",error,total_error)
+
+          !
+          !get the access property list.
+          !
+          CALL h5fget_access_plist_f(file1_id, access_id, error)
+              CALL check("h5fget_access_plist_f",error,total_error)
+
+          !
+          !based on the creation property list id and access property list id
+          !create a new file
+          !
+          CALL h5_fixname_f(filename2, fix_filename2, H5P_DEFAULT_F, error)
+          if (error .ne. 0) then
+              write(*,*) "Cannot modify file name"
+              stop
+          endif
+          CALL h5fcreate_f(fix_filename2, H5F_ACC_TRUNC_F, file2_id, error, &
+               prop_id, access_id)
+              CALL check("h5create_f",error,total_error)
+
+          !
+          !Close all the property lists.
+          !
+          CALL h5pclose_f(prop_id, error)
+              CALL check("h5pclose_f",error,total_error)
+          CALL h5pclose_f(access_id, error)
+              CALL check("h5pclose_f",error,total_error)
+
+          !
+          !Terminate access to the files.
+          !
+          CALL h5fclose_f(file1_id, error)
+              CALL check("h5fclose_f",error,total_error)
+
+          CALL h5fclose_f(file2_id, error)
+              CALL check("h5fclose_f",error,total_error)
+
+          if(cleanup) CALL h5_cleanup_f(filename1, H5P_DEFAULT_F, error)
+              CALL check("h5_cleanup_f", error, total_error)
+          if(cleanup) CALL h5_cleanup_f(filename2, H5P_DEFAULT_F, error)
+              CALL check("h5_cleanup_f", error, total_error)
+          RETURN
+
+        END SUBROUTINE plisttest
+
+
+!
+!    The following subroutine tests h5pget(set)_fclose_degree_f
+!
+
+        SUBROUTINE file_close(cleanup, total_error)
+        USE HDF5  ! This module contains all necessary modules
+        USE TH5_MISC
+          IMPLICIT NONE
+          LOGICAL, INTENT(IN) :: cleanup
+          INTEGER, INTENT(INOUT) :: total_error
+          INTEGER              :: error
+
+          !
+          CHARACTER(LEN=10), PARAMETER :: filename = "file_close"
+          CHARACTER(LEN=80)  :: fix_filename
+
+          INTEGER(HID_T) :: fid, fid_d, fid1, fid2, fid3  ! File identifiers
+          INTEGER(HID_T) :: fapl, fapl1, fapl2, fapl3 ! File access identifiers
+          INTEGER(HID_T) :: fid_d_fapl, fid1_fapl     ! File access identifiers
+          LOGICAL        :: flag
+          INTEGER(SIZE_T) :: obj_count, obj_countf
+          INTEGER(HID_T), ALLOCATABLE, DIMENSION(:) :: obj_ids
+          INTEGER(SIZE_T) :: i
+
+          CALL h5eset_auto_f(0, error)
+
+          CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
+          if (error .ne. 0) then
+              write(*,*) "Cannot modify filename"
+              stop
+          endif
+          CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, fid, error)
+               CALL check("h5fcreate_f",error,total_error)
+
+          CALL h5pcreate_f(H5P_FILE_ACCESS_F, fapl, error)
+               CALL check("h5pcreate_f",error,total_error)
+          CALL h5pset_fclose_degree_f(fapl, H5F_CLOSE_DEFAULT_F, error)
+               CALL check("h5pset_fclose_degree_f",error,total_error)
+
+
+          CALL h5pcreate_f(H5P_FILE_ACCESS_F, fapl1, error)
+               CALL check("h5pcreate_f",error,total_error)
+          CALL h5pset_fclose_degree_f(fapl1, H5F_CLOSE_WEAK_F, error)
+               CALL check("h5pset_fclose_degree_f",error,total_error)
+
+
+          CALL h5pcreate_f(H5P_FILE_ACCESS_F, fapl2, error)
+               CALL check("h5pcreate_f",error,total_error)
+          CALL h5pset_fclose_degree_f(fapl2, H5F_CLOSE_SEMI_F, error)
+               CALL check("h5pset_fclose_degree_f",error,total_error)
+
+          CALL h5pcreate_f(H5P_FILE_ACCESS_F, fapl3, error)
+               CALL check("h5pcreate_f",error,total_error)
+          CALL h5pset_fclose_degree_f(fapl3, H5F_CLOSE_STRONG_F, error)
+               CALL check("h5pset_fclose_degree_f",error,total_error)
+
+          CALL h5fopen_f(fix_filename, H5F_ACC_RDWR_F, fid1, error, access_prp=fapl1)
+               CALL check("h5fopen_f",error,total_error)
+          CALL h5fopen_f(fix_filename, H5F_ACC_RDWR_F, fid_d, error, access_prp=fapl)
+               CALL check("h5fopen_f",error,total_error)
+          CALL h5fget_access_plist_f(fid1, fid1_fapl, error)
+               CALL check("h5fget_access_plist_f",error,total_error)
+          CALL h5fget_access_plist_f(fid_d, fid_d_fapl, error)
+               CALL check("h5fget_access_plist_f",error,total_error)
+
+          CALL h5pequal_f(fid_d_fapl, fid1_fapl, flag, error)
+               CALL check("h5pequal_f",error,total_error)
+          if (.NOT. flag) then
+               write(*,*) " File access lists should be equal, error "
+               total_error=total_error + 1
+          endif
+          CALL h5fopen_f(fix_filename, H5F_ACC_RDWR_F, fid2, error, access_prp=fapl2)
+               if( error .ne. -1) then
+                   total_error = total_error + 1
+                   write(*,*) " Open with H5F_CLOSE_SEMI should fail "
+               endif
+          CALL h5fopen_f(fix_filename, H5F_ACC_RDWR_F, fid3, error, access_prp=fapl3)
+               if( error .ne. -1) then
+                   total_error = total_error + 1
+                   write(*,*) " Open with H5F_CLOSE_STRONG should fail "
+               endif
+
+          CALL h5fget_obj_count_f(fid1, H5F_OBJ_ALL_F, obj_count, error)
+               CALL check("h5fget_obj_count_f",error,total_error)
+               if(error .eq.0 .and. obj_count .ne. 3) then
+                 total_error = total_error + 1
+                 write(*,*) "Wrong number of open objects reported, error"
+               endif
+          CALL h5fget_obj_count_f(fid1, H5F_OBJ_FILE_F, obj_countf, error)
+               CALL check("h5fget_obj_count_f",error,total_error)
+               if(error .eq.0 .and. obj_countf .ne. 3) then
+                 total_error = total_error + 1
+                 write(*,*) "Wrong number of open objects reported, error"
+               endif
+          allocate(obj_ids(obj_countf), stat = error)
+          CALL h5fget_obj_ids_f(fid, H5F_OBJ_FILE_F, obj_countf, obj_ids, error)
+               CALL check("h5fget_obj_ids_f",error,total_error)
+          if(error .eq. 0) then
+             do i = 1, obj_countf
+                    CALL h5fclose_f(obj_ids(i), error)
+                         CALL check("h5fclose_f",error,total_error)
+             enddo
+          endif
+
+          CALL h5fclose_f(fid, error)
+              if(error .eq. 0) then
+                 total_error = total_error + 1
+                 write(*,*) "File should be closed at this point, error"
+              endif
+          CALL h5fclose_f(fid1, error)
+              if(error .eq. 0) then
+                 total_error = total_error + 1
+                 write(*,*) "File should be closed at this point, error"
+              endif
+          CALL h5fclose_f(fid_d, error)
+              if(error .eq. 0) then
+                 total_error = total_error + 1
+                 write(*,*) "File should be closed at this point, error"
+              endif
+
+          if(cleanup) then
+              CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
+              CALL check("h5_cleanup_f", error, total_error)
+          endif
+          deallocate(obj_ids)
+          RETURN
+
+        END SUBROUTINE file_close
+
+!
+!    The following subroutine tests h5fget_freespace_f
+!
+
+        SUBROUTINE file_space(filename, cleanup, total_error)
+        USE HDF5  ! This module contains all necessary modules
+        USE TH5_MISC
+          IMPLICIT NONE
+          CHARACTER(*), INTENT(IN) :: filename
+          LOGICAL, INTENT(IN) :: cleanup
+          INTEGER, INTENT(INOUT) :: total_error
+          INTEGER              :: error
+          !
+          CHARACTER(LEN=3), PARAMETER :: grpname = "grp"
+          CHARACTER(LEN=80)  :: fix_filename
+
+          INTEGER(HID_T) :: fid ! File identifiers
+          INTEGER(HSSIZE_T) :: free_space
+          INTEGER(HID_T) :: group_id      ! Group identifier
+
+          CALL h5eset_auto_f(0, error)
+
+          CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
+          if (error .ne. 0) then
+              write(*,*) "Cannot modify filename"
+              stop
+          endif
+          CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, fid, error)
+               CALL check("h5fcreate_f",error,total_error)
+
+          CALL h5fget_freespace_f(fid, free_space, error)
+               CALL check("h5fget_freespace_f",error,total_error)
+               if(error .eq.0 .and. free_space .ne. 1248) then
+                 total_error = total_error + 1
+                 write(*,*) "1: Wrong amount of free space reported, ", free_space
+               endif
+
+          ! Create group in the file.
+          CALL h5gcreate_f(fid, grpname, group_id, error)
+          CALL check("h5gcreate_f",error,total_error)
+
+          ! Close group
+          CALL h5gclose_f(group_id, error)
+          CALL check("h5gclose_f", error, total_error)
+
+          ! Check the free space now
+          CALL h5fget_freespace_f(fid, free_space, error)
+               CALL check("h5fget_freespace_f",error,total_error)
+               if(error .eq.0 .and. free_space .ne. 216) then
+                 total_error = total_error + 1
+                 write(*,*) "2: Wrong amount of free space reported, ", free_space
+               endif
+
+          !Unlink the group
+          CALL h5gunlink_f(fid, grpname, error)
+          CALL check("h5gunlink_f", error, total_error)
+
+          ! Check the free space now
+          CALL h5fget_freespace_f(fid, free_space, error)
+               CALL check("h5fget_freespace_f",error,total_error)
+               if(error .eq.0 .and. free_space .ne. 1248) then
+                 total_error = total_error + 1
+                 write(*,*) "3: Wrong amount of free space reported, ", free_space
+               endif
+
+          CALL h5fclose_f(fid, error)
+              CALL check("h5fclose_f",error,total_error)
+
+          if(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
+              CALL check("h5_cleanup_f", error, total_error)
+          RETURN
+
+        END SUBROUTINE file_space
+
+END MODULE TH5F
diff --git a/fortran/test/tH5F.f90 b/fortran/test/tH5F.f90
deleted file mode 100644
index 0b3c275..0000000
--- a/fortran/test/tH5F.f90
+++ /dev/null
@@ -1,782 +0,0 @@
-!***rh* root/fortran/test/tH5F.f90
-!
-! NAME
-!  tH5F.f90
-!
-! FUNCTION
-!  Basic testing of Fortran H5F APIs.
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! CONTAINS SUBROUTINES
-!  mountingtest, reopentest, plisttest, file_close, file_space
-!
-!*****
-!
-!  In the mountingtest subroutine we create one file with a group in it, 
-!  and another file with a dataset. Mounting is used to
-!  access the dataset from the second file as a member of a group 
-!  in the first file. 
-
-
-
-MODULE TH5F
-
-CONTAINS
-
-        SUBROUTINE mountingtest(cleanup, total_error)
-        USE HDF5  ! This module contains all necessary modules
-        USE TH5_MISC
-          IMPLICIT NONE
-          LOGICAL, INTENT(IN)  :: cleanup
-          INTEGER, INTENT(INOUT) :: total_error
-
-          !
-          !the respective filename is "mount1.h5" and "mount2.h5"
-          !
-          CHARACTER(LEN=6)  :: filename1
-          CHARACTER(LEN=6)  :: filename2
-          CHARACTER(LEN=80) :: fix_filename1
-          CHARACTER(LEN=80) :: fix_filename2
-
-          !
-          !data space rank and dimensions
-          !
-          INTEGER, PARAMETER :: RANK = 2
-          INTEGER, PARAMETER :: NX = 4
-          INTEGER, PARAMETER :: NY = 5
-
-          !
-          ! File identifiers
-          !
-          INTEGER(HID_T) :: file1_id, file2_id
-
-          !
-          ! Group identifier
-          !
-          INTEGER(HID_T) :: gid
-
-          !
-          ! dataset identifier
-          !
-          INTEGER(HID_T) :: dset_id
-
-          !
-          ! data space identifier
-          !
-          INTEGER(HID_T) :: dataspace
-
-          !
-          ! data type identifier
-          !
-          INTEGER(HID_T) :: dtype_id
-
-          !
-          !The dimensions for the dataset.
-          !
-          INTEGER(HSIZE_T), DIMENSION(2) :: dims = (/NX,NY/)
-
-          !
-          !return value for testing whether a file is in hdf5 format
-          !
-          LOGICAL     ::  status
-
-          !
-          !flag to check operation success
-          !
-          INTEGER     ::   error
-
-          !
-          !general purpose integer
-          !
-          INTEGER     ::   i, j
-
-          !
-          !data buffers
-          !
-          INTEGER, DIMENSION(NX,NY) :: data_in, data_out
-
-          INTEGER(HSIZE_T), DIMENSION(2) :: data_dims
-          filename1 = "mount1"
-          filename2 = "mount2"
-
-          do i = 1,80
-             fix_filename1(i:i) = " "
-             fix_filename2(i:i) = " "
-          enddo
-          !
-          !Initialize data_in buffer
-          !
-          do j = 1, NY
-             do i = 1, NX
-                data_in(i,j) =  (i-1) + (j-1)
-             end do
-          end do
-
-          !
-          ! Fix names of the files
-          !
-          CALL h5_fixname_f(filename1, fix_filename1, H5P_DEFAULT_F, error)
-          if(error .ne. 0) stop
-          CALL h5_fixname_f(filename2, fix_filename2, H5P_DEFAULT_F, error)
-          if(error .ne. 0) stop
-
-          !
-          !Create first file "mount1.h5" using default properties.
-          !
-          CALL h5fcreate_f(fix_filename1, H5F_ACC_TRUNC_F, file1_id, error)
-               CALL check("h5fcreate_f",error,total_error)
-
-          !
-          !Create group "/G" inside file "mount1.h5".
-          !
-          CALL h5gcreate_f(file1_id, "/G", gid, error)
-               CALL check("h5gcreate_f",error,total_error)
-          !
-          !close file and group identifiers.
-          !
-          CALL h5gclose_f(gid, error)
-               CALL check("h5gclose_f",error,total_error)
-          CALL h5fclose_f(file1_id, error)
-               CALL check("h5fclose_f",error,total_error)
-
-          !
-          !Create second file "mount2.h5" using default properties.
-          !
-          CALL h5fcreate_f(fix_filename2, H5F_ACC_TRUNC_F, file2_id, error)
-               CALL check("h5fcreate_f",error,total_error)
-
-          !
-          !Create data space for the dataset.
-          !
-          CALL h5screate_simple_f(RANK, dims, dataspace, error)
-               CALL check("h5screate_simple_f",error,total_error)
-
-          !
-          !Create dataset "/D" inside file "mount2.h5".
-          !
-          CALL h5dcreate_f(file2_id, "/D", H5T_NATIVE_INTEGER, dataspace, &
-               dset_id, error)
-              CALL check("h5dcreate_f",error,total_error)
-
-          !
-          ! Write data_in to the dataset
-          !
-          data_dims(1) = NX
-          data_dims(2) = NY
-          CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, data_in, data_dims, error)
-               CALL check("h5dwrite_f",error,total_error)
-
-          !
-          !close file, dataset and dataspace identifiers.
-          !
-          CALL h5sclose_f(dataspace, error)
-              CALL check("h5sclose_f",error,total_error)
-          CALL h5dclose_f(dset_id, error)
-              CALL check("h5dclose_f",error,total_error)
-          CALL h5fclose_f(file2_id, error)
-              CALL check("h5fclose_f",error,total_error)
-
-          !
-          !test whether files are in hdf5 format
-          !
-          CALL h5fis_hdf5_f(fix_filename1, status, error)
-               CALL check("h5fis_hdf5_f",error,total_error)
-          IF ( .NOT. status ) THEN
-              write(*,*) "File ", fix_filename1, " is not in hdf5 format"
-              stop
-          END IF
-
-          CALL h5fis_hdf5_f(fix_filename2, status, error)
-               CALL check("h5fis_hdf5_f",error,total_error)
-          IF ( .NOT. status ) THEN
-              write(*,*) "File ", fix_filename2, " is not in hdf5 format"
-              stop
-          END IF
-
-          !
-          !reopen both files.
-          !
-          CALL h5fopen_f (fix_filename1, H5F_ACC_RDWR_F, file1_id, error)
-              CALL check("hfopen_f",error,total_error)
-          CALL h5fopen_f (fix_filename2, H5F_ACC_RDWR_F, file2_id, error)
-              CALL check("h5fopen_f",error,total_error)
-
-          !
-          !mount the second file under the first file's "/G" group.
-          !
-          CALL h5fmount_f (file1_id, "/G", file2_id, error)
-              CALL check("h5fmount_f",error,total_error)
-
-
-          !
-          !Access dataset D in the first file under /G/D name.
-          !
-          CALL h5dopen_f(file1_id, "/G/D", dset_id, error)
-              CALL check("h5dopen_f",error,total_error)
-
-          !
-          !Get dataset's data type.
-          !
-          CALL h5dget_type_f(dset_id, dtype_id, error)
-              CALL check("h5dget_type_f",error,total_error)
-
-          !
-          !Read the dataset.
-          !
-          CALL h5dread_f(dset_id, dtype_id, data_out, data_dims, error)
-              CALL check("h5dread_f",error,total_error)
-
-          !
-          !Compare the data.
-          !
-          do i = 1, NX
-              do j = 1, NY
-                  IF (data_out(i,j) .NE. data_in(i, j)) THEN
-                  END IF
-              end do
-          end do
-
-
-          !
-          !Close dset_id and dtype_id.
-          !
-          CALL h5dclose_f(dset_id, error)
-              CALL check("h5dclose_f",error,total_error)
-          CALL h5tclose_f(dtype_id, error)
-              CALL check("h5tclose_f",error,total_error)
-
-          !
-          !unmount the second file.
-          !
-          CALL h5funmount_f(file1_id, "/G", error);
-              CALL check("h5funmount_f",error,total_error)
-
-          !
-          !Close both files.
-          !
-          CALL h5fclose_f(file1_id, error)
-              CALL check("h5fclose_f",error,total_error)
-          CALL h5fclose_f(file2_id, error)
-              CALL check("h5fclose_f",error,total_error)
-
-          if(cleanup) CALL h5_cleanup_f(filename1, H5P_DEFAULT_F, error)
-              CALL check("h5_cleanup_f", error, total_error)
-          if(cleanup) CALL h5_cleanup_f(filename2, H5P_DEFAULT_F, error)
-              CALL check("h5_cleanup_f", error, total_error)
-          RETURN
-        END SUBROUTINE mountingtest
-
-!
-!    The following subroutine tests h5freopen_f.
-!    It creates the file which has name "reopen.h5" and
-!    the "/dset" dataset inside the file.
-!    writes the data to the file, close the dataset.
-!    Reopen the file based upon the file_id, open the
-!    dataset use the reopen_id then reads the
-!    dataset back to memory to test whether the data
-!    read is identical to the data written
-!
-
-        SUBROUTINE reopentest(cleanup, total_error)
-        USE HDF5  ! This module contains all necessary modules
-        USE TH5_MISC
-          IMPLICIT NONE
-          LOGICAL, INTENT(IN) :: cleanup
-          INTEGER, INTENT(INOUT) :: total_error
-
-          !
-          CHARACTER(LEN=6), PARAMETER :: filename = "reopen"
-          CHARACTER(LEN=80)  :: fix_filename
-
-          INTEGER(HID_T) :: file_id, reopen_id  ! File identifiers
-          INTEGER(HID_T) :: dset_id             ! Dataset identifier
-
-          !
-          !dataset name is "dset"
-          !
-          CHARACTER(LEN=4), PARAMETER :: dsetname = "dset"
-
-          !
-          !data space rank and dimensions
-          !
-          INTEGER, PARAMETER :: RANK = 2
-          INTEGER, PARAMETER :: NX = 4
-          INTEGER, PARAMETER :: NY = 6
-
-          !
-          ! data space identifier
-          !
-          INTEGER(HID_T) :: dataspace
-
-          !
-          !The dimensions for the dataset.
-          !
-          INTEGER(HSIZE_T), DIMENSION(2) :: dims = (/NX,NY/)
-
-          !
-          !flag to check operation success
-          !
-          INTEGER     ::   error
-
-          !
-          !general purpose integer
-          !
-          INTEGER     ::  i, j
-
-          !
-          !array to store data
-          !
-          INTEGER, DIMENSION(4,6) :: dset_data, data_out
-          INTEGER(HSIZE_T), DIMENSION(2) :: data_dims
-          INTEGER(HSIZE_T)  :: file_size
-          CHARACTER(LEN=80) :: file_name
-          INTEGER(SIZE_T) :: name_size
-
-          !
-          !initialize the dset_data array which will be written to the "/dset"
-          !
-          do j = 1, NY
-               do i = 1, NX
-                    dset_data(i,j) = (i-1)*6 + j;
-               end do
-          end do
-
-          !
-          !Initialize FORTRAN predifined datatypes
-          !
-!          CALL h5init_types_f(error)
-!               CALL check("h5init_types_f",error,total_error)
-
-
-          !
-          !Create file "reopen.h5" using default properties.
-          !
-          CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
-          if (error .ne. 0) then
-              write(*,*) "Cannot modify filename"
-              stop
-          endif
-          CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
-               CALL check("h5fcreate_f",error,total_error)
-
-          !
-          !Create data space for the dataset.
-          !
-          CALL h5screate_simple_f(RANK, dims, dataspace, error)
-               CALL check("h5screate_simple_f",error,total_error)
-
-          !
-          !Create dataset "/dset" inside the file .
-          !
-          CALL h5dcreate_f(file_id, dsetname, H5T_NATIVE_INTEGER, dataspace, &
-               dset_id, error)
-              CALL check("h5dcreate_f",error,total_error)
-
-         !
-         !Write the dataset.
-         !
-         data_dims(1) = NX
-         data_dims(2) = NY
-         CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, dset_data, data_dims, error)
-              CALL check("h5dwrite_f",error,total_error)
-
-         !
-         !close the dataset.
-         !
-         CALL h5dclose_f(dset_id, error)
-              CALL check("h5dclose_f",error,total_error)
-
-         !
-         !close the dataspace.
-         !
-         CALL h5sclose_f(dataspace, error)
-              CALL check("h5sclose_f",error,total_error)
-
-         !
-         !Reopen file dsetf.h5.
-         !
-         CALL h5freopen_f(file_id, reopen_id, error)
-              CALL check("h5freopen_f",error,total_error)
-         !
-         !Check file size
-         !
-         CALL h5fget_filesize_f(file_id, file_size, error)
-              CALL check("h5fget_filesize_f",error,total_error)
-
-         !
-         !Open the dataset based on the reopen_id.
-         !
-         CALL h5dopen_f(reopen_id, dsetname, dset_id, error)
-              CALL check("h5dopen_f",error,total_error)
-         !
-         !Get file name from the dataset identifier
-         !
-         CALL h5fget_name_f(dset_id, file_name, name_size, error)
-              CALL check("h5fget_name_f",error,total_error)
-              IF(file_name(1:name_size) .NE. fix_filename(1:name_size)) THEN
-                 write(*,*) "file name obtained from the dataset id is incorrect"
-              END IF
-
-         !
-         !Read the dataset.
-         !
-         CALL h5dread_f(dset_id, H5T_NATIVE_INTEGER, data_out, data_dims, error)
-              CALL check("h5dread_f",error,total_error)
-
-          !
-          !Compare the data.
-          !
-          do i = 1, NX
-              do j = 1, NY
-                  IF (data_out(i,j) .NE. dset_data(i, j)) THEN
-                      write(*, *) "reopen test error occured"
-                  END IF
-              end do
-          end do
-
-
-         !
-         !Close the dataset.
-         !
-         CALL h5dclose_f(dset_id, error)
-              CALL check("h5dclose_f",error,total_error)
-
-         !
-         !Close the file identifiers.
-         !
-         CALL h5fclose_f(file_id, error)
-              CALL check("h5fclose_f",error,total_error)
-         CALL h5fclose_f(reopen_id, error)
-              CALL check("h5fclose_f",error,total_error)
-
-
-          if(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
-              CALL check("h5_cleanup_f", error, total_error)
-          RETURN
-
-        END SUBROUTINE reopentest
-
-!
-!    The following example demonstrates how to get creation property list,
-!    and access property list.
-!    We first create a file using the default creation and access property
-!    list. Then, the file was closed and reopened. We then get the
-!    creation and access property lists of the first file. The second file is
-!    created using the got property lists
-
-        SUBROUTINE plisttest(cleanup, total_error)
-         USE HDF5  ! This module contains all necessary modules
-         USE TH5_MISC
-          IMPLICIT NONE
-          LOGICAL, INTENT(IN)  :: cleanup
-          INTEGER, INTENT(INOUT) :: total_error
-
-          !
-          !file names are "plist1.h5" and "plist2.h5"
-          !
-          CHARACTER(LEN=6), PARAMETER :: filename1 = "plist1"
-          CHARACTER(LEN=80) :: fix_filename1
-          CHARACTER(LEN=6), PARAMETER :: filename2 = "plist2"
-          CHARACTER(LEN=80) :: fix_filename2
-
-          INTEGER(HID_T) :: file1_id, file2_id   ! File identifiers
-          INTEGER(HID_T) :: prop_id    ! File creation property list identifier
-          INTEGER(HID_T) :: access_id  ! File Access property list identifier
-
-          !flag to check operation success
-          INTEGER     ::   error
-
-          !
-          !Create a file1 using default properties.
-          !
-          CALL h5_fixname_f(filename1, fix_filename1, H5P_DEFAULT_F, error)
-          if (error .ne. 0) then
-              write(*,*) "Cannot modify file name"
-              stop
-          endif
-          CALL h5fcreate_f(fix_filename1, H5F_ACC_TRUNC_F, file1_id, error)
-              CALL check("h5fcreate_f",error,total_error)
-
-          !
-          !Terminate access to the file.
-          !
-          CALL h5fclose_f(file1_id, error)
-              CALL check("h5fclose_f",error,total_error)
-
-          !
-          !Open an existing file.
-          !
-          CALL h5fopen_f (fix_filename1, H5F_ACC_RDWR_F, file1_id, error)
-              CALL check("h5fopen_f",error,total_error)
-
-          !
-          !get the creation property list.
-          !
-          CALL h5fget_create_plist_f(file1_id, prop_id, error)
-              CALL check("h5fget_create_plist_f",error,total_error)
-
-          !
-          !get the access property list.
-          !
-          CALL h5fget_access_plist_f(file1_id, access_id, error)
-              CALL check("h5fget_access_plist_f",error,total_error)
-
-          !
-          !based on the creation property list id and access property list id
-          !create a new file
-          !
-          CALL h5_fixname_f(filename2, fix_filename2, H5P_DEFAULT_F, error)
-          if (error .ne. 0) then
-              write(*,*) "Cannot modify file name"
-              stop
-          endif
-          CALL h5fcreate_f(fix_filename2, H5F_ACC_TRUNC_F, file2_id, error, &
-               prop_id, access_id)
-              CALL check("h5create_f",error,total_error)
-
-          !
-          !Close all the property lists.
-          !
-          CALL h5pclose_f(prop_id, error)
-              CALL check("h5pclose_f",error,total_error)
-          CALL h5pclose_f(access_id, error)
-              CALL check("h5pclose_f",error,total_error)
-
-          !
-          !Terminate access to the files.
-          !
-          CALL h5fclose_f(file1_id, error)
-              CALL check("h5fclose_f",error,total_error)
-
-          CALL h5fclose_f(file2_id, error)
-              CALL check("h5fclose_f",error,total_error)
-
-          if(cleanup) CALL h5_cleanup_f(filename1, H5P_DEFAULT_F, error)
-              CALL check("h5_cleanup_f", error, total_error)
-          if(cleanup) CALL h5_cleanup_f(filename2, H5P_DEFAULT_F, error)
-              CALL check("h5_cleanup_f", error, total_error)
-          RETURN
-
-        END SUBROUTINE plisttest
-
-
-!
-!    The following subroutine tests h5pget(set)_fclose_degree_f
-!
-
-        SUBROUTINE file_close(cleanup, total_error)
-        USE HDF5  ! This module contains all necessary modules
-        USE TH5_MISC
-          IMPLICIT NONE
-          LOGICAL, INTENT(IN) :: cleanup
-          INTEGER, INTENT(INOUT) :: total_error
-          INTEGER              :: error
-
-          !
-          CHARACTER(LEN=10), PARAMETER :: filename = "file_close"
-          CHARACTER(LEN=80)  :: fix_filename
-
-          INTEGER(HID_T) :: fid, fid_d, fid1, fid2, fid3  ! File identifiers
-          INTEGER(HID_T) :: fapl, fapl1, fapl2, fapl3 ! File access identifiers
-          INTEGER(HID_T) :: fid_d_fapl, fid1_fapl     ! File access identifiers
-          LOGICAL        :: flag
-          INTEGER(SIZE_T) :: obj_count, obj_countf
-          INTEGER(HID_T), ALLOCATABLE, DIMENSION(:) :: obj_ids
-          INTEGER        :: i
-
-          CALL h5eset_auto_f(0, error)
-
-          CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
-          if (error .ne. 0) then
-              write(*,*) "Cannot modify filename"
-              stop
-          endif
-          CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, fid, error)
-               CALL check("h5fcreate_f",error,total_error)
-
-          CALL h5pcreate_f(H5P_FILE_ACCESS_F, fapl, error)
-               CALL check("h5pcreate_f",error,total_error)
-          CALL h5pset_fclose_degree_f(fapl, H5F_CLOSE_DEFAULT_F, error)
-               CALL check("h5pset_fclose_degree_f",error,total_error)
-
-
-          CALL h5pcreate_f(H5P_FILE_ACCESS_F, fapl1, error)
-               CALL check("h5pcreate_f",error,total_error)
-          CALL h5pset_fclose_degree_f(fapl1, H5F_CLOSE_WEAK_F, error)
-               CALL check("h5pset_fclose_degree_f",error,total_error)
-
-
-          CALL h5pcreate_f(H5P_FILE_ACCESS_F, fapl2, error)
-               CALL check("h5pcreate_f",error,total_error)
-          CALL h5pset_fclose_degree_f(fapl2, H5F_CLOSE_SEMI_F, error)
-               CALL check("h5pset_fclose_degree_f",error,total_error)
-
-          CALL h5pcreate_f(H5P_FILE_ACCESS_F, fapl3, error)
-               CALL check("h5pcreate_f",error,total_error)
-          CALL h5pset_fclose_degree_f(fapl3, H5F_CLOSE_STRONG_F, error)
-               CALL check("h5pset_fclose_degree_f",error,total_error)
-
-          CALL h5fopen_f(fix_filename, H5F_ACC_RDWR_F, fid1, error, access_prp=fapl1)
-               CALL check("h5fopen_f",error,total_error)
-          CALL h5fopen_f(fix_filename, H5F_ACC_RDWR_F, fid_d, error, access_prp=fapl)
-               CALL check("h5fopen_f",error,total_error)
-          CALL h5fget_access_plist_f(fid1, fid1_fapl, error)
-               CALL check("h5fget_access_plist_f",error,total_error)
-          CALL h5fget_access_plist_f(fid_d, fid_d_fapl, error)
-               CALL check("h5fget_access_plist_f",error,total_error)
-
-          CALL h5pequal_f(fid_d_fapl, fid1_fapl, flag, error)
-               CALL check("h5pequal_f",error,total_error)
-          if (.NOT. flag) then
-               write(*,*) " File access lists should be equal, error "
-               total_error=total_error + 1
-          endif
-          CALL h5fopen_f(fix_filename, H5F_ACC_RDWR_F, fid2, error, access_prp=fapl2)
-               if( error .ne. -1) then
-                   total_error = total_error + 1
-                   write(*,*) " Open with H5F_CLOSE_SEMI should fail "
-               endif
-          CALL h5fopen_f(fix_filename, H5F_ACC_RDWR_F, fid3, error, access_prp=fapl3)
-               if( error .ne. -1) then
-                   total_error = total_error + 1
-                   write(*,*) " Open with H5F_CLOSE_STRONG should fail "
-               endif
-
-          CALL h5fget_obj_count_f(fid1, H5F_OBJ_ALL_F, obj_count, error)
-               CALL check("h5fget_obj_count_f",error,total_error)
-               if(error .eq.0 .and. obj_count .ne. 3) then
-                 total_error = total_error + 1
-                 write(*,*) "Wrong number of open objects reported, error"
-               endif
-          CALL h5fget_obj_count_f(fid1, H5F_OBJ_FILE_F, obj_countf, error)
-               CALL check("h5fget_obj_count_f",error,total_error)
-               if(error .eq.0 .and. obj_countf .ne. 3) then
-                 total_error = total_error + 1
-                 write(*,*) "Wrong number of open objects reported, error"
-               endif
-          allocate(obj_ids(obj_countf), stat = error)
-          CALL h5fget_obj_ids_f(fid, H5F_OBJ_FILE_F, obj_countf, obj_ids, error)
-               CALL check("h5fget_obj_ids_f",error,total_error)
-          if(error .eq. 0) then
-             do i = 1, obj_countf
-                    CALL h5fclose_f(obj_ids(i), error)
-                         CALL check("h5fclose_f",error,total_error)
-             enddo
-          endif
-
-          CALL h5fclose_f(fid, error)
-              if(error .eq. 0) then
-                 total_error = total_error + 1
-                 write(*,*) "File should be closed at this point, error"
-              endif
-          CALL h5fclose_f(fid1, error)
-              if(error .eq. 0) then
-                 total_error = total_error + 1
-                 write(*,*) "File should be closed at this point, error"
-              endif
-          CALL h5fclose_f(fid_d, error)
-              if(error .eq. 0) then
-                 total_error = total_error + 1
-                 write(*,*) "File should be closed at this point, error"
-              endif
-
-          if(cleanup) then
-              CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
-              CALL check("h5_cleanup_f", error, total_error)
-          endif
-          deallocate(obj_ids)
-          RETURN
-
-        END SUBROUTINE file_close
-
-!
-!    The following subroutine tests h5fget_freespace_f
-!
-
-        SUBROUTINE file_space(filename, cleanup, total_error)
-        USE HDF5  ! This module contains all necessary modules
-        USE TH5_MISC
-          IMPLICIT NONE
-          CHARACTER(*), INTENT(IN) :: filename
-          LOGICAL, INTENT(IN) :: cleanup
-          INTEGER, INTENT(INOUT) :: total_error
-          INTEGER              :: error
-          !
-          CHARACTER(LEN=3), PARAMETER :: grpname = "grp"
-          CHARACTER(LEN=80)  :: fix_filename
-
-          INTEGER(HID_T) :: fid ! File identifiers
-          INTEGER(HSSIZE_T) :: free_space
-          INTEGER(HID_T) :: group_id      ! Group identifier
-
-          CALL h5eset_auto_f(0, error)
-
-          CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
-          if (error .ne. 0) then
-              write(*,*) "Cannot modify filename"
-              stop
-          endif
-          CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, fid, error)
-               CALL check("h5fcreate_f",error,total_error)
-
-          CALL h5fget_freespace_f(fid, free_space, error)
-               CALL check("h5fget_freespace_f",error,total_error)
-               if(error .eq.0 .and. free_space .ne. 0) then
-                 total_error = total_error + 1
-                 write(*,*) "1: Wrong amount of free space reported, ", free_space
-               endif
-
-          ! Create group in the file.
-          CALL h5gcreate_f(fid, grpname, group_id, error)
-          CALL check("h5gcreate_f",error,total_error)
-
-          ! Close group
-          CALL h5gclose_f(group_id, error)
-          CALL check("h5gclose_f", error, total_error)
-
-          ! Check the free space now
-          CALL h5fget_freespace_f(fid, free_space, error)
-               CALL check("h5fget_freespace_f",error,total_error)
-               if(error .eq.0 .and. free_space .ne. 0) then
-                 total_error = total_error + 1
-                 write(*,*) "2: Wrong amount of free space reported, ", free_space
-               endif
-
-          !Unlink the group
-          CALL h5gunlink_f(fid, grpname, error)
-          CALL check("h5gunlink_f", error, total_error)
-
-          ! Check the free space now
-          CALL h5fget_freespace_f(fid, free_space, error)
-               CALL check("h5fget_freespace_f",error,total_error)
-               if(error .eq.0 .and. free_space .ne. 0) then
-                 total_error = total_error + 1
-                 write(*,*) "3: Wrong amount of free space reported, ", free_space
-               endif
-
-          CALL h5fclose_f(fid, error)
-              CALL check("h5fclose_f",error,total_error)
-
-          if(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
-              CALL check("h5_cleanup_f", error, total_error)
-          RETURN
-
-        END SUBROUTINE file_space
-
-
-END MODULE TH5F
diff --git a/fortran/test/tH5F_F03.F90 b/fortran/test/tH5F_F03.F90
new file mode 100644
index 0000000..27bd30e
--- /dev/null
+++ b/fortran/test/tH5F_F03.F90
@@ -0,0 +1,177 @@
+!****h* root/fortran/test/tH5F_F03
+!
+! NAME
+!  tH5F_F03.F90
+!
+! FUNCTION
+!  Test FORTRAN HDF5 H5F APIs which are dependent on FORTRAN 2003
+!  features.
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+! NOTES
+!  Tests the H5F APIs functionalities of:
+!    h5fget_file_image_f
+!
+! CONTAINS SUBROUTINES
+!  test_get_file_image
+!
+!*****
+
+! *****************************************
+! ***        H 5 F   T E S T S
+! *****************************************
+
+MODULE TH5F_F03
+
+  USE HDF5
+  USE TH5_MISC
+  USE TH5_MISC_GEN
+  USE ISO_C_BINDING
+
+CONTAINS
+
+SUBROUTINE test_get_file_image(total_error)
+  !
+  !  Tests the wrapper for h5fget_file_image
+  !
+  IMPLICIT NONE
+
+  INTEGER, INTENT(INOUT) :: total_error ! returns error
+
+  CHARACTER(kind=c_char), ALLOCATABLE, DIMENSION(:), TARGET :: file_image_ptr ! Image from file
+  CHARACTER(kind=c_char), ALLOCATABLE, DIMENSION(:), TARGET :: image_ptr ! Image from h5fget_file_image_f
+
+  INTEGER, DIMENSION(1:100), TARGET :: data ! Write data
+  INTEGER :: file_sz
+  INTEGER(size_t) :: i
+  INTEGER(hid_t) :: file_id = -1  ! File identifier
+  INTEGER(hid_t) :: dset_id = -1  ! Dataset identifier
+  INTEGER(hid_t) :: space_id = -1 ! Dataspace identifier
+  INTEGER(hsize_t), DIMENSION(1:2) :: dims  ! Dataset dimensions
+  INTEGER(size_t) :: itmp_a ! General purpose integer
+  INTEGER(size_t) :: image_size     ! Size of image
+  TYPE(C_PTR) :: f_ptr            ! Pointer
+  INTEGER(hid_t) :: fapl          ! File access property
+  INTEGER :: error                ! Error flag
+
+  ! Create new properties for file access
+  CALL h5pcreate_f(H5P_FILE_ACCESS_F, fapl, error)
+  CALL check("h5pcreate_f", error, total_error)
+
+  ! Set standard I/O driver
+  CALL h5pset_fapl_stdio_f(fapl, error)
+  CALL check("h5pset_fapl_stdio_f", error, total_error)
+
+  ! Create the file
+  CALL h5fcreate_f("tget_file_image.h5", H5F_ACC_TRUNC_F, file_id, error, H5P_DEFAULT_F, fapl)
+  CALL check("h5fcreate_f", error, total_error)
+
+  ! Set up data space for new data set
+  dims(1:2) = (/10,10/)
+
+  CALL h5screate_simple_f(2, dims,  space_id, error)
+  CALL check("h5screate_simple_f", error, total_error)
+
+  ! Create a dataset
+  CALL h5dcreate_f(file_id, "dset 0", H5T_NATIVE_INTEGER, space_id, dset_id, error)
+  CALL check("h5dcreate_f", error, total_error)
+
+  ! Write some data to the data set
+  DO i = 1, 100
+     data(i) = INT(i)
+  ENDDO
+
+  f_ptr = C_LOC(data(1))
+  CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, f_ptr, error)
+  CALL check("h5dwrite_f",error, total_error)
+
+  ! Flush the file
+  CALL h5fflush_f(file_id, H5F_SCOPE_GLOBAL_F, error)
+  CALL check("h5fflush_f",error, total_error)
+
+  ! Open the test file using standard I/O calls
+  OPEN(UNIT=10,FILE='tget_file_image.h5', ACCESS='STREAM')
+  ! Get the size of the test file
+  !
+  ! Since we use the eoa to calculate the image size, the file size
+  ! may be larger.  This is OK, as long as (in this specialized instance)
+  ! the remainder of the file is all '\0's.
+  !
+  ! With latest mods to truncate call in core file drive,
+  ! file size should match image size; get the file size
+  INQUIRE(UNIT=10, SIZE=file_sz)
+  CLOSE(UNIT=10)
+
+  ! I. Get buffer size needed to hold the buffer
+
+  !  A. Preferred way to get the size
+  f_ptr = C_NULL_PTR
+  CALL h5fget_file_image_f(file_id, f_ptr, INT(0, size_t), error, image_size)
+  CALL check("h5fget_file_image_f",error, total_error)
+  CALL verify("h5fget_file_image_f", file_sz, INT(image_size), total_error)
+
+  !  B. f_ptr set to point to an incorrect buffer, should pass anyway
+  f_ptr = C_LOC(data(1))
+  itmp_a = 1
+  CALL h5fget_file_image_f(file_id, f_ptr, itmp_a, error, image_size)
+  CALL check("h5fget_file_image_f",error, total_error)
+  CALL verify("h5fget_file_image_f", INT(itmp_a), 1, total_error) ! Routine should not change the value
+  CALL verify("h5fget_file_image_f", file_sz, INT(image_size), total_error)
+
+  ! Allocate a buffer of the appropriate size
+  ALLOCATE(image_ptr(1:image_size))
+
+  ! Load the image of the file into the buffer
+  f_ptr = C_LOC(image_ptr(1)(1:1))
+  CALL h5fget_file_image_f(file_id, f_ptr, image_size, error)
+  CALL check("h5fget_file_image_f",error, total_error)
+
+  ! Close dset and space
+  CALL h5dclose_f(dset_id, error)
+  CALL check("h5dclose_f", error, total_error)
+  CALL h5sclose_f(space_id, error)
+  CALL check("h5sclose_f", error, total_error)
+  ! Close the test file
+  CALL h5fclose_f(file_id, error)
+  CALL check("h5fclose_f",error, total_error)
+
+  ! Allocate a buffer for the test file image
+  ALLOCATE(file_image_ptr(1:image_size))
+
+  ! Open the test file using standard I/O calls
+  OPEN(UNIT=10,FILE='tget_file_image.h5', FORM='UNFORMATTED', ACCESS='STREAM')
+
+  ! Read the test file from disk into the buffer
+  DO i = 1, image_size
+     READ(10) file_image_ptr(i)
+  ENDDO
+
+  CLOSE(10)
+
+  ! verify the file and the image contain the same data
+  DO i = 1, image_size
+     ! convert one byte to an unsigned integer
+     IF( ICHAR(file_image_ptr(i)) .NE. ICHAR(image_ptr(i)))THEN
+        total_error = total_error + 1
+        EXIT
+     ENDIF
+  ENDDO
+
+  ! release resources
+  DEALLOCATE(file_image_ptr,image_ptr)
+
+END SUBROUTINE test_get_file_image
+
+END MODULE TH5F_F03
diff --git a/fortran/test/tH5F_F03.f90 b/fortran/test/tH5F_F03.f90
deleted file mode 100644
index c878a59..0000000
--- a/fortran/test/tH5F_F03.f90
+++ /dev/null
@@ -1,178 +0,0 @@
-!****h* root/fortran/test/tH5F_F03.f90
-!
-! NAME
-!  tH5F_F03.f90
-!
-! FUNCTION
-!  Test FORTRAN HDF5 H5F APIs which are dependent on FORTRAN 2003
-!  features. 
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! NOTES
-!  Tests the H5F APIs functionalities of:
-!    h5fget_file_image_f
-!
-! CONTAINS SUBROUTINES
-!  test_get_file_image
-!
-!*****
-
-! *****************************************
-! ***        H 5 F   T E S T S
-! *****************************************
-
-MODULE TH5F_F03
-
-CONTAINS
-
-SUBROUTINE test_get_file_image(total_error)
-  !
-  !  Tests the wrapper for h5fget_file_image
-  !
-  USE HDF5
-  USE TH5_MISC 
-  USE ISO_C_BINDING
-
-  IMPLICIT NONE
-
-  INTEGER, INTENT(INOUT) :: total_error ! returns error
-
-  CHARACTER(kind=c_char), ALLOCATABLE, DIMENSION(:), TARGET :: file_image_ptr ! Image from file
-  CHARACTER(kind=c_char), ALLOCATABLE, DIMENSION(:), TARGET :: image_ptr ! Image from h5fget_file_image_f
-
-  INTEGER, DIMENSION(1:100), TARGET :: data ! Write data
-  INTEGER :: i, file_sz
-  INTEGER(hid_t) :: file_id = -1  ! File identifier
-  INTEGER(hid_t) :: dset_id = -1  ! Dataset identifier
-  INTEGER(hid_t) :: space_id = -1 ! Dataspace identifier
-  INTEGER(hsize_t), DIMENSION(1:2) :: dims  ! Dataset dimensions
-  INTEGER(size_t) :: itmp_a, itmp_b ! General purpose integers
-  INTEGER(size_t) :: image_size     ! Size of image
-  TYPE(C_PTR) :: f_ptr            ! Pointer
-  INTEGER(hid_t) :: fapl          ! File access property
-  INTEGER :: error                ! Error flag
-
-  ! Create new properties for file access
-  CALL h5pcreate_f(H5P_FILE_ACCESS_F, fapl, error)
-  CALL check("h5pcreate_f", error, total_error)
-
-  ! Set standard I/O driver
-  CALL h5pset_fapl_stdio_f(fapl, error)
-  CALL check("h5pset_fapl_stdio_f", error, total_error)
-
-  ! Create the file
-  CALL h5fcreate_f("tget_file_image.h5", H5F_ACC_TRUNC_F, file_id, error, H5P_DEFAULT_F, fapl)
-  CALL check("h5fcreate_f", error, total_error)
-
-  ! Set up data space for new data set 
-  dims(1:2) = (/10,10/)
-    
-  CALL h5screate_simple_f(2, dims,  space_id, error)
-  CALL check("h5screate_simple_f", error, total_error)
-
-  ! Create a dataset 
-  CALL h5dcreate_f(file_id, "dset 0", H5T_NATIVE_INTEGER, space_id, dset_id, error)
-  CALL check("h5dcreate_f", error, total_error)
-
-  ! Write some data to the data set 
-  DO i = 1, 100
-     data(i) = i
-  ENDDO
-  
-  f_ptr = C_LOC(data(1))
-  CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, f_ptr, error)
-  CALL check("h5dwrite_f",error, total_error)
-
-  ! Flush the file
-  CALL h5fflush_f(file_id, H5F_SCOPE_GLOBAL_F, error)
-  CALL check("h5fflush_f",error, total_error)
-
-  ! Open the test file using standard I/O calls 
-  OPEN(UNIT=10,FILE='tget_file_image.h5', ACCESS='STREAM')
-  ! Get the size of the test file
-  !
-  ! Since we use the eoa to calculate the image size, the file size
-  ! may be larger.  This is OK, as long as (in this specialized instance)
-  ! the remainder of the file is all '\0's.
-  !
-  ! With latest mods to truncate call in core file drive, 
-  ! file size should match image size; get the file size 
-  INQUIRE(UNIT=10, SIZE=file_sz)
-  CLOSE(UNIT=10)
-
-  ! I. Get buffer size needed to hold the buffer
-
-  !  A. Preferred way to get the size
-  f_ptr = C_NULL_PTR
-  CALL h5fget_file_image_f(file_id, f_ptr, INT(0, size_t), error, image_size)
-  CALL check("h5fget_file_image_f",error, total_error)
-  CALL verify("h5fget_file_image_f", file_sz, INT(image_size), total_error)
-
-  !  B. f_ptr set to point to an incorrect buffer, should pass anyway
-  f_ptr = C_LOC(data(1))
-  itmp_a = 1
-  CALL h5fget_file_image_f(file_id, f_ptr, itmp_a, error, image_size)
-  CALL check("h5fget_file_image_f",error, total_error)
-  CALL VERIFY("h5fget_file_image_f", INT(itmp_a), 1, total_error) ! Routine should not change the value
-  CALL VERIFY("h5fget_file_image_f", file_sz, INT(image_size), total_error)
-
-  ! Allocate a buffer of the appropriate size 
-  ALLOCATE(image_ptr(1:image_size))
-
-  ! Load the image of the file into the buffer
-  f_ptr = C_LOC(image_ptr(1)(1:1))
-  CALL h5fget_file_image_f(file_id, f_ptr, image_size, error)
-  CALL check("h5fget_file_image_f",error, total_error)
-
-  ! Close dset and space 
-  CALL h5dclose_f(dset_id, error)
-  CALL check("h5dclose_f", error, total_error)
-  CALL h5sclose_f(space_id, error)
-  CALL check("h5sclose_f", error, total_error)
-  ! Close the test file
-  CALL h5fclose_f(file_id, error)
-  CALL check("h5fclose_f",error, total_error)
-
-  ! Allocate a buffer for the test file image
-  ALLOCATE(file_image_ptr(1:image_size))
-
-  ! Open the test file using standard I/O calls 
-  OPEN(UNIT=10,FILE='tget_file_image.h5', FORM='UNFORMATTED', ACCESS='STREAM')
-
-  ! Read the test file from disk into the buffer
-  DO i = 1, image_size
-     READ(10) file_image_ptr(i)
-  ENDDO
-
-  CLOSE(10)
-
-  ! verify the file and the image contain the same data
-  DO i = 1, image_size
-     ! convert one byte to an unsigned integer
-     IF( ICHAR(file_image_ptr(i)) .NE. ICHAR(image_ptr(i)))THEN
-        total_error = total_error + 1
-        EXIT
-     ENDIF
-  ENDDO
-
-  ! release resources
-  DEALLOCATE(file_image_ptr,image_ptr)
-
-END SUBROUTINE test_get_file_image
-
-END MODULE TH5F_F03
diff --git a/fortran/test/tH5G.F90 b/fortran/test/tH5G.F90
new file mode 100644
index 0000000..83e0101
--- /dev/null
+++ b/fortran/test/tH5G.F90
@@ -0,0 +1,260 @@
+!****h* root/fortran/test/tH5G.f90
+!
+! NAME
+!  tH5G.f90
+!
+! FUNCTION
+!  Basic testing of Fortran H5G APIs.
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+! CONTAINS SUBROUTINES
+!  group_test
+!
+!*****
+
+MODULE TH5G
+
+CONTAINS
+
+    SUBROUTINE group_test(cleanup, total_error)
+
+!   This subroutine tests following functionalities:
+!   h5gcreate_f, h5gopen_f, h5gclose_f, (?)h5gget_obj_info_idx_f,  h5gn_members_f
+!   h5glink(2)_f, h5gunlink_f, h5gmove(2)_f,  h5gget_linkval_f, h5gset_comment_f,
+!   h5gget_comment_f
+
+     USE HDF5 ! This module contains all necessary modules
+     USE TH5_MISC
+
+     IMPLICIT NONE
+     LOGICAL, INTENT(IN)  :: cleanup
+     INTEGER, INTENT(INOUT) :: total_error
+
+     CHARACTER(LEN=5), PARAMETER :: filename = "gtest"    !File name
+     CHARACTER(LEN=80) :: fix_filename
+     CHARACTER(LEN=33), PARAMETER :: comment = "Testing the group functionalities"
+                                              ! comment for this file
+     CHARACTER(LEN=7), PARAMETER :: groupname1 = "MyGroup"  ! Group name
+     CHARACTER(LEN=16), PARAMETER :: groupname2 = "/MyGroup/Group_A"
+     CHARACTER(LEN=9), PARAMETER :: linkname1 = "hardlink1"
+     CHARACTER(LEN=9), PARAMETER :: linkname2 = "hardlink2"
+     CHARACTER(LEN=9), PARAMETER :: linkname3 = "softlink1"
+     CHARACTER(LEN=9), PARAMETER :: linkname4 = "softlink2"
+     CHARACTER(LEN=12), PARAMETER :: linkname5 = "newsoftlink2"
+
+     CHARACTER(LEN=13), PARAMETER :: dsetname1 = "MyGroup/dset1" ! Dataset name
+     CHARACTER(LEN=5),  PARAMETER :: dsetname2 = "dset2" ! dataset name
+
+     INTEGER(HID_T) :: file_id       ! File identifier
+     INTEGER(HID_T) :: group1_id      ! Group identifier
+     INTEGER(HID_T) :: group2_id      ! Group identifier
+     INTEGER(HID_T) :: dset1_id    ! Dataset identifier
+     INTEGER(HID_T) :: dset2_id    ! Dataset identifier
+     INTEGER(HID_T) :: dsetnew_id    ! Dataset identifier
+     INTEGER(HID_T) :: dspace_id  ! Data space identifier
+
+     INTEGER, DIMENSION(1) :: dset1_data = 34 ! Data value
+     INTEGER, DIMENSION(1) :: dset2_data = 98 ! Data value
+     INTEGER(HSIZE_T), DIMENSION(1) :: dims = 1 ! Datasets dimensions
+     INTEGER     ::   rank = 1 ! Datasets rank
+     INTEGER     ::   error ! Error flag
+     INTEGER(SIZE_T)   ::   namesize = 100 !size for symbolic object
+     CHARACTER(LEN=100) :: name !name to put symbolic object
+     CHARACTER(LEN=100) :: commentout !comment to the file
+     INTEGER     ::   nmembers
+     INTEGER(HSIZE_T), DIMENSION(2) :: data_dims
+     !
+     ! Create the file.
+     !
+          CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
+          if (error .ne. 0) then
+              write(*,*) "Cannot modify filename"
+              stop
+          endif
+     CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
+     CALL check("h5fcreate_f",error,total_error)
+
+     !
+     ! Create a group named "/MyGroup" in the file.
+     !
+     CALL h5gcreate_f(file_id, groupname1, group1_id, error)
+     CALL check("h5gcreate_f",error,total_error)
+
+     !
+     ! Create a group named "/MyGroup/Group_A" in the file.
+     !
+     CALL h5gcreate_f(file_id, groupname2, group2_id, error)
+     CALL check("h5gcreate_f",error,total_error)
+     !
+     !Create data space for the dataset.
+     !
+     CALL h5screate_simple_f(rank, dims, dspace_id, error)
+     CALL check("h5screate_simple_f",error,total_error)
+     !
+     ! create dataset in the file.
+     !
+     CALL h5dcreate_f(file_id, dsetname1, H5T_NATIVE_INTEGER, dspace_id, &
+               dset1_id, error)
+     CALL check("h5dcreate_f",error,total_error)
+
+     !
+     ! Write data_in to dataset1
+     !
+     data_dims(1) = 1
+     CALL h5dwrite_f(dset1_id, H5T_NATIVE_INTEGER, dset1_data, data_dims, error)
+     CALL check("h5dwrite_f",error,total_error)
+
+     !
+     ! create dataset2 in the Group_A.
+     !
+     CALL h5dcreate_f(group2_id, dsetname2, H5T_NATIVE_INTEGER, dspace_id, &
+               dset2_id, error)
+     CALL check("h5dcreate_f",error,total_error)
+
+     !
+     ! Write data_in to dataset2
+     !
+     CALL h5dwrite_f(dset2_id, H5T_NATIVE_INTEGER, dset2_data, data_dims, error)
+     CALL check("h5dwrite_f",error,total_error)
+
+     !
+     !Create a hard link to the group1
+     !
+     CALL h5glink_f(file_id, H5G_LINK_HARD_F, groupname1, linkname1, error)
+     CALL check("h5glink_f",error,total_error)
+     !
+     !Create a hard link to the group2
+     !
+     CALL h5glink2_f(file_id, groupname2, H5G_LINK_HARD_F, file_id, linkname2, error)
+     CALL check("h5glink2_f",error,total_error)
+     !
+     !Create a soft link to  dataset11
+     !
+     CALL h5glink_f(file_id, H5G_LINK_SOFT_F, dsetname1, linkname3, error)
+     CALL check("h5glink_f",error,total_error)
+     !
+     !Create a soft link to  dataset2
+     !
+     CALL h5glink_f(file_id, H5G_LINK_SOFT_F, dsetname2, linkname4, error)
+     CALL check("h5glink_f",error,total_error)
+     !
+     !close group1
+     !
+     CALL h5gclose_f(group1_id, error)
+     CALL check("h5gclose_f", error, total_error)
+     !
+     !reopen group1
+     !
+     CALL h5gopen_f(file_id, groupname1, group1_id, error)
+     CALL check("h5gopen_f", error, total_error)
+     !
+     !get obj info of group1
+     !
+!     CALL h5gget_obj_info_idx_f(file_id, linkname1, 2, name, obj_type, error)
+!     CALL check("h5gget_obj_info_idx_f", error, total_error)
+! XXX: Fix problems with H5G_LINK_F! - QAK
+!     if (obj_type .ne. H5G_LINK_F) then
+!         write(*,*)  "got object  ", name, " type error ", obj_type
+!         total_error = total_error +1
+!     end if
+     !
+     !Get number of members in the group
+     !
+     CALL  h5gn_members_f(file_id, groupname1, nmembers, error)
+     CALL check("h5gn_members_f",error,total_error)
+     if (nmembers .ne. 2) then
+         write(*,*)  "got nmembers ", nmembers, " is wrong"
+         total_error = total_error +1
+     end if
+     !
+     !Get the name of a symbolic name
+     !
+     CALL h5gget_linkval_f(file_id, linkname3, namesize, name, error)
+     CALL check("h5gget_linkval_f",error,total_error)
+     if ( name(1:13) .ne. dsetname1) then
+         write(*,*)  "got symbolic name  ", name, " is wrong"
+         total_error = total_error +1
+     end if
+     !
+     !move softlink2 to newsoftlink2
+     !
+     CALL h5gmove_f(file_id, linkname4, linkname5, error)
+     CALL check("h5gmove_f",error,total_error)
+     !
+     !Get the name of the moved symbolic name
+     !
+     CALL h5gget_linkval_f(file_id, linkname5, namesize, name, error)
+     CALL check("h5gget_linkval_f",error,total_error)
+     if ( name(1:5) .ne. dsetname2) then
+         write(*,*)  "got symbolic name  ", name, " is wrong"
+         total_error = total_error +1
+     end if
+
+     !
+     !Unlink the moved symbolic link
+     !
+     CALL h5gunlink_f(file_id, linkname5, error)
+     CALL check("h5gunlink_f", error, total_error)
+
+
+     !
+     !set the comment of dataset1 to comment
+     !
+     CALL  h5gset_comment_f(file_id, dsetname1, comment, error)
+     CALL check("h5gset_comment_f", error, total_error)
+     !
+     !get the comment of dataset1
+     !
+     CALL  h5gget_comment_f(file_id, dsetname1,namesize, commentout, error)
+     CALL check("h5gget_comment_f", error, total_error)
+     if ( commentout(1:33) .ne. comment) then
+         write(*,*)  "got comment  ", commentout, " is wrong"
+         total_error = total_error +1
+     end if
+     !
+     ! Move dataset1 to gourp2_id location
+     !
+     CALL h5dclose_f(dset1_id, error)
+     CALL check("h5dclose_f", error, total_error)
+
+     CALL h5gmove2_f(file_id, dsetname1, group2_id, "dset1", error)
+     CALL check("h5gmove2_f", error, total_error)
+     !
+     ! Open dataset from the new location
+     !
+     Call h5dopen_f(file_id, "/MyGroup/Group_A/dset1" , dsetnew_id, error)
+     CALL check("h5dopen_f",error, total_error)
+     !
+     !release all the resources
+     !
+     CALL h5fclose_f(file_id, error)
+     CALL check("h5fclose_f", error, total_error)
+     CALL h5gclose_f(group1_id, error)
+     CALL check("h5gclose_f", error, total_error)
+     CALL h5gclose_f(group2_id, error)
+     CALL check("h5gclose_f", error, total_error)
+     CALL h5dclose_f(dset2_id, error)
+     CALL check("h5dclose_f", error, total_error)
+     CALL h5dclose_f(dsetnew_id, error)
+     CALL check("h5dclose_f", error, total_error)
+     CALL h5sclose_f(dspace_id, error)
+     CALL check("h5sclose_f", error, total_error)
+
+
+          if(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
+              CALL check("h5_cleanup_f", error, total_error)
+  END SUBROUTINE group_test
+
+END MODULE TH5G
diff --git a/fortran/test/tH5G.f90 b/fortran/test/tH5G.f90
deleted file mode 100644
index 2ba174c..0000000
--- a/fortran/test/tH5G.f90
+++ /dev/null
@@ -1,263 +0,0 @@
-!****h* root/fortran/test/tH5G.f90
-!
-! NAME
-!  tH5G.f90
-!
-! FUNCTION
-!  Basic testing of Fortran H5G APIs.
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! CONTAINS SUBROUTINES
-!  group_test
-!
-!*****
-
-MODULE TH5G
-
-CONTAINS
-
-    SUBROUTINE group_test(cleanup, total_error)
-
-!   This subroutine tests following functionalities:
-!   h5gcreate_f, h5gopen_f, h5gclose_f, (?)h5gget_obj_info_idx_f,  h5gn_members_f
-!   h5glink(2)_f, h5gunlink_f, h5gmove(2)_f,  h5gget_linkval_f, h5gset_comment_f,
-!   h5gget_comment_f
-
-     USE HDF5 ! This module contains all necessary modules
-     USE TH5_MISC
-
-     IMPLICIT NONE
-     LOGICAL, INTENT(IN)  :: cleanup
-     INTEGER, INTENT(INOUT) :: total_error
-
-     CHARACTER(LEN=5), PARAMETER :: filename = "gtest"    !File name
-     CHARACTER(LEN=80) :: fix_filename
-     CHARACTER(LEN=33), PARAMETER :: comment = "Testing the group functionalities"
-                                              ! comment for this file
-     CHARACTER(LEN=7), PARAMETER :: groupname1 = "MyGroup"  ! Group name
-     CHARACTER(LEN=16), PARAMETER :: groupname2 = "/MyGroup/Group_A"
-     CHARACTER(LEN=9), PARAMETER :: linkname1 = "hardlink1"
-     CHARACTER(LEN=9), PARAMETER :: linkname2 = "hardlink2"
-     CHARACTER(LEN=9), PARAMETER :: linkname3 = "softlink1"
-     CHARACTER(LEN=9), PARAMETER :: linkname4 = "softlink2"
-     CHARACTER(LEN=12), PARAMETER :: linkname5 = "newsoftlink2"
-
-     CHARACTER(LEN=13), PARAMETER :: dsetname1 = "MyGroup/dset1" ! Dataset name
-     CHARACTER(LEN=5),  PARAMETER :: dsetname2 = "dset2" ! dataset name
-
-     INTEGER(HID_T) :: file_id       ! File identifier
-     INTEGER(HID_T) :: group1_id      ! Group identifier
-     INTEGER(HID_T) :: group2_id      ! Group identifier
-     INTEGER(HID_T) :: dset1_id    ! Dataset identifier
-     INTEGER(HID_T) :: dset2_id    ! Dataset identifier
-     INTEGER(HID_T) :: dsetnew_id    ! Dataset identifier
-     INTEGER(HID_T) :: dspace_id  ! Data space identifier
-
-     INTEGER, DIMENSION(1) :: dset1_data = 34 ! Data value
-     INTEGER, DIMENSION(1) :: dset2_data = 98 ! Data value
-     INTEGER(HSIZE_T), DIMENSION(1) :: dims = 1 ! Datasets dimensions
-     INTEGER     ::   rank = 1 ! Datasets rank
-     INTEGER     ::   error ! Error flag
-     INTEGER(SIZE_T)   ::   namesize = 100 !size for symbolic object
-     CHARACTER(LEN=100) :: name !name to put symbolic object
-     CHARACTER(LEN=100) :: commentout !comment to the file
-     INTEGER     ::   nmembers
-     INTEGER(HSIZE_T), DIMENSION(2) :: data_dims
-     !
-     ! Create the file.
-     !
-          CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
-          if (error .ne. 0) then
-              write(*,*) "Cannot modify filename"
-              stop
-          endif
-     CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
-     CALL check("h5fcreate_f",error,total_error)
-
-     !
-     ! Create a group named "/MyGroup" in the file.
-     !
-     CALL h5gcreate_f(file_id, groupname1, group1_id, error)
-     CALL check("h5gcreate_f",error,total_error)
-
-     !
-     ! Create a group named "/MyGroup/Group_A" in the file.
-     !
-     CALL h5gcreate_f(file_id, groupname2, group2_id, error)
-     CALL check("h5gcreate_f",error,total_error)
-     !
-     !Create data space for the dataset.
-     !
-     CALL h5screate_simple_f(rank, dims, dspace_id, error)
-     CALL check("h5screate_simple_f",error,total_error)
-     !
-     ! create dataset in the file.
-     !
-     CALL h5dcreate_f(file_id, dsetname1, H5T_NATIVE_INTEGER, dspace_id, &
-               dset1_id, error)
-     CALL check("h5dcreate_f",error,total_error)
-
-     !
-     ! Write data_in to dataset1
-     !
-     data_dims(1) = 1
-     CALL h5dwrite_f(dset1_id, H5T_NATIVE_INTEGER, dset1_data, data_dims, error)
-     CALL check("h5dwrite_f",error,total_error)
-
-     !
-     ! create dataset2 in the Group_A.
-     !
-     CALL h5dcreate_f(group2_id, dsetname2, H5T_NATIVE_INTEGER, dspace_id, &
-               dset2_id, error)
-     CALL check("h5dcreate_f",error,total_error)
-
-     !
-     ! Write data_in to dataset2
-     !
-     CALL h5dwrite_f(dset2_id, H5T_NATIVE_INTEGER, dset2_data, data_dims, error)
-     CALL check("h5dwrite_f",error,total_error)
-
-     !
-     !Create a hard link to the group1
-     !
-     CALL h5glink_f(file_id, H5G_LINK_HARD_F, groupname1, linkname1, error)
-     CALL check("h5glink_f",error,total_error)
-     !
-     !Create a hard link to the group2
-     !
-     CALL h5glink2_f(file_id, groupname2, H5G_LINK_HARD_F, file_id, linkname2, error)
-     CALL check("h5glink2_f",error,total_error)
-     !
-     !Create a soft link to  dataset11
-     !
-     CALL h5glink_f(file_id, H5G_LINK_SOFT_F, dsetname1, linkname3, error)
-     CALL check("h5glink_f",error,total_error)
-     !
-     !Create a soft link to  dataset2
-     !
-     CALL h5glink_f(file_id, H5G_LINK_SOFT_F, dsetname2, linkname4, error)
-     CALL check("h5glink_f",error,total_error)
-     !
-     !close group1
-     !
-     CALL h5gclose_f(group1_id, error)
-     CALL check("h5gclose_f", error, total_error)
-     !
-     !reopen group1
-     !
-     CALL h5gopen_f(file_id, groupname1, group1_id, error)
-     CALL check("h5gopen_f", error, total_error)
-     !
-     !get obj info of group1
-     !
-!     CALL h5gget_obj_info_idx_f(file_id, linkname1, 2, name, obj_type, error)
-!     CALL check("h5gget_obj_info_idx_f", error, total_error)
-! XXX: Fix problems with H5G_LINK_F! - QAK
-!     if (obj_type .ne. H5G_LINK_F) then
-!         write(*,*)  "got object  ", name, " type error ", obj_type
-!         total_error = total_error +1
-!     end if
-     !
-     !Get number of members in the group
-     !
-     CALL  h5gn_members_f(file_id, groupname1, nmembers, error)
-     CALL check("h5gn_members_f",error,total_error)
-     if (nmembers .ne. 2) then
-         write(*,*)  "got nmembers ", nmembers, " is wrong"
-         total_error = total_error +1
-     end if
-     !
-     !Get the name of a symbolic name
-     !
-     CALL h5gget_linkval_f(file_id, linkname3, namesize, name, error)
-     CALL check("h5gget_linkval_f",error,total_error)
-     if ( name(1:13) .ne. dsetname1) then
-         write(*,*)  "got symbolic name  ", name, " is wrong"
-         total_error = total_error +1
-     end if
-     !
-     !move softlink2 to newsoftlink2
-     !
-     CALL h5gmove_f(file_id, linkname4, linkname5, error)
-     CALL check("h5gmove_f",error,total_error)
-     !
-     !Get the name of the moved symbolic name
-     !
-     CALL h5gget_linkval_f(file_id, linkname5, namesize, name, error)
-     CALL check("h5gget_linkval_f",error,total_error)
-     if ( name(1:5) .ne. dsetname2) then
-         write(*,*)  "got symbolic name  ", name, " is wrong"
-         total_error = total_error +1
-     end if
-
-     !
-     !Unlink the moved symbolic link
-     !
-     CALL h5gunlink_f(file_id, linkname5, error)
-     CALL check("h5gunlink_f", error, total_error)
-
-
-     !
-     !set the comment of dataset1 to comment
-     !
-     CALL  h5gset_comment_f(file_id, dsetname1, comment, error)
-     CALL check("h5gset_comment_f", error, total_error)
-     !
-     !get the comment of dataset1
-     !
-     CALL  h5gget_comment_f(file_id, dsetname1,namesize, commentout, error)
-     CALL check("h5gget_comment_f", error, total_error)
-     if ( commentout(1:33) .ne. comment) then
-         write(*,*)  "got comment  ", commentout, " is wrong"
-         total_error = total_error +1
-     end if
-     !
-     ! Move dataset1 to gourp2_id location
-     !
-     CALL h5dclose_f(dset1_id, error)
-     CALL check("h5dclose_f", error, total_error)
-
-     CALL h5gmove2_f(file_id, dsetname1, group2_id, "dset1", error)
-     CALL check("h5gmove2_f", error, total_error)
-     !
-     ! Open dataset from the new location
-     !
-     Call h5dopen_f(file_id, "/MyGroup/Group_A/dset1" , dsetnew_id, error)
-     CALL check("h5dopen_f",error, total_error)
-     !
-     !release all the resources
-     !
-     CALL h5fclose_f(file_id, error)
-     CALL check("h5fclose_f", error, total_error)
-     CALL h5gclose_f(group1_id, error)
-     CALL check("h5gclose_f", error, total_error)
-     CALL h5gclose_f(group2_id, error)
-     CALL check("h5gclose_f", error, total_error)
-     CALL h5dclose_f(dset2_id, error)
-     CALL check("h5dclose_f", error, total_error)
-     CALL h5dclose_f(dsetnew_id, error)
-     CALL check("h5dclose_f", error, total_error)
-     CALL h5sclose_f(dspace_id, error)
-     CALL check("h5sclose_f", error, total_error)
-
-
-          if(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
-              CALL check("h5_cleanup_f", error, total_error)
-  END SUBROUTINE group_test
-
-END MODULE TH5G
diff --git a/fortran/test/tH5G_1_8.F90 b/fortran/test/tH5G_1_8.F90
new file mode 100644
index 0000000..755c96d
--- /dev/null
+++ b/fortran/test/tH5G_1_8.F90
@@ -0,0 +1,2123 @@
+!****h* root/fortran/test/tH5G_1_8.f90
+!
+! NAME
+!  tH5G_1_8.f90
+!
+! FUNCTION
+!  Basic testing of Fortran H5G APIs introduced in 1.8.
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+! CONTAINS SUBROUTINES
+!  group_test, group_info, timestamps, mklinks, test_move_preserves, lifecycle
+!  cklinks, delete_by_idx, link_info_by_idx_check, test_lcpl, objcopy,
+!  lapl_nlinks
+!
+!*****
+
+MODULE TH5G_1_8
+
+  USE HDF5
+  USE TH5_MISC
+  USE TH5_MISC_GEN
+
+CONTAINS
+
+SUBROUTINE group_test(cleanup, total_error)
+
+  IMPLICIT NONE
+  LOGICAL, INTENT(IN)  :: cleanup
+  INTEGER, INTENT(INOUT) :: total_error
+
+  INTEGER(HID_T) :: fapl, fapl2, my_fapl !  File access property lists
+
+  INTEGER :: error, ret_total_error
+
+!  WRITE(*,*) "TESTING GROUPS"
+  CALL H5Pcreate_f(H5P_FILE_ACCESS_F, fapl, error)
+  CALL check("H5Pcreate_f",error, total_error)
+
+  !  Copy the file access property list
+  CALL H5Pcopy_f(fapl, fapl2, error)
+  CALL check("H5Pcopy_f",error, total_error)
+
+  !  Set the "use the latest version of the format" bounds for creating objects in the file
+  CALL H5Pset_libver_bounds_f(fapl2, H5F_LIBVER_LATEST_F, H5F_LIBVER_LATEST_F, error)
+  CALL check("H5Pset_libver_bounds_f",error, total_error)
+
+  !  Check for FAPL to USE
+  my_fapl = fapl2
+
+  ret_total_error = 0
+  CALL mklinks(fapl2, ret_total_error)
+  CALL write_test_status(ret_total_error, &
+       ' Testing building a file with assorted links', &
+       total_error)
+
+  ret_total_error = 0
+  CALL cklinks(fapl2, ret_total_error)
+  CALL write_test_status(ret_total_error, &
+       ' Testing links are correct and building assorted links', &
+       total_error)
+
+  ret_total_error = 0
+  CALL group_info(cleanup, fapl2, ret_total_error)
+  CALL write_test_status(ret_total_error, &
+       ' Testing create group with creation order indices, test querying group info', &
+       total_error)
+
+! CALL ud_hard_links(fapl2,total_error)
+  ret_total_error = 0
+  CALL timestamps(cleanup, fapl2, ret_total_error)
+  CALL write_test_status(ret_total_error, &
+       ' Testing disabling tracking timestamps for an object', &
+       total_error)
+
+  ret_total_error = 0
+  CALL test_move_preserves(fapl2, ret_total_error)
+  CALL write_test_status(ret_total_error, &
+       ' Testing moving and renaming links preserves their properties', &
+       total_error)
+
+  ret_total_error = 0
+  CALL delete_by_idx(cleanup,fapl2,ret_total_error)
+  CALL write_test_status(ret_total_error, &
+       ' Testing deleting links by index', &
+       total_error)
+
+  ret_total_error = 0
+  CALL test_lcpl(cleanup, fapl, ret_total_error)
+  CALL write_test_status(ret_total_error, &
+       ' Testing link creation property lists', &
+       total_error)
+
+  ret_total_error = 0
+  CALL objcopy(fapl, ret_total_error)
+  CALL write_test_status(ret_total_error, &
+       ' Testing object copy', &
+       total_error)
+
+  ret_total_error = 0
+  CALL lifecycle(cleanup, fapl2, ret_total_error)
+  CALL write_test_status(ret_total_error, &
+       ' Testing adding links to a group follow proper "lifecycle"', &
+       total_error)
+
+  IF(cleanup) CALL h5_cleanup_f("TestLinks", H5P_DEFAULT_F, error)
+  CALL check("h5_cleanup_f", error, total_error)
+
+
+END SUBROUTINE group_test
+
+!-------------------------------------------------------------------------
+! * Function:    group_info
+! *
+! * Purpose:     Create a group with creation order indices and test querying
+! *              group info.
+! *
+! * Return:      Success:        0
+! *              Failure:        -1
+! *
+! * Programmer:  Adapted from C test routines by
+! *              M.S. Breitenfeld
+! *              February 18, 2008
+! *
+! *-------------------------------------------------------------------------
+!
+
+SUBROUTINE group_info(cleanup, fapl, total_error)
+
+  IMPLICIT NONE
+  INTEGER, INTENT(INOUT) :: total_error
+  INTEGER(HID_T), INTENT(IN) :: fapl
+
+  INTEGER(HID_T) :: gcpl_id !  Group creation property list ID
+
+  INTEGER :: max_compact !  Maximum # of links to store in group compactly
+  INTEGER :: min_dense !  Minimum # of links to store in group "densely"
+
+  INTEGER :: idx_type !  Type of index to operate on
+  INTEGER :: order, iorder   !  Order within in the index
+  LOGICAL, DIMENSION(1:2) :: use_index = (/.FALSE.,.TRUE./) !  Use index on creation order values
+  CHARACTER(LEN=6), PARAMETER :: prefix = 'links0'
+  CHARACTER(LEN=9), PARAMETER :: filename = prefix//'.h5'  !  File name
+  INTEGER :: Input1
+  INTEGER(HID_T) :: group_id !  Group ID
+  INTEGER(HID_T) :: soft_group_id !  Group ID for soft links
+
+  INTEGER :: i !  Local index variables
+  INTEGER :: storage_type ! Type of storage for links in group:
+                                          ! H5G_STORAGE_TYPE_COMPACT: Compact storage
+                                          ! H5G_STORAGE_TYPE_DENSE: Indexed storage
+                                          ! H5G_STORAGE_TYPE_SYMBOL_TABLE: Symbol tables, the original HDF5 structure
+  INTEGER :: nlinks ! Number of links in group
+  INTEGER :: max_corder ! Current maximum creation order value for group
+
+  INTEGER :: u,v  !  Local index variables
+  CHARACTER(LEN=2) :: chr2
+  INTEGER(HID_T) :: group_id2, group_id3 !  Group IDs
+  CHARACTER(LEN=7) :: objname !  Object name
+  CHARACTER(LEN=7) :: objname2 !  Object name
+  CHARACTER(LEN=19) :: valname !   Link value
+  CHARACTER(LEN=12), PARAMETER :: CORDER_GROUP_NAME = "corder_group"
+  CHARACTER(LEN=17), PARAMETER :: CORDER_SOFT_GROUP_NAME =  "corder_soft_group"
+  INTEGER(HID_T) :: file_id !  File ID
+  INTEGER :: error !  Generic return value
+  LOGICAL :: mounted
+  LOGICAL :: cleanup
+
+  !  Create group creation property list
+  CALL H5Pcreate_f(H5P_GROUP_CREATE_F, gcpl_id, error )
+  CALL check("H5Pcreate_f", error, total_error)
+
+  !  Query the group creation properties
+  CALL H5Pget_link_phase_change_f(gcpl_id, max_compact, min_dense, error)
+  CALL check("H5Pget_link_phase_change_f", error, total_error)
+
+  !  Loop over operating on different indices on link fields
+  DO idx_type = H5_INDEX_NAME_F, H5_INDEX_CRT_ORDER_F
+     !  Loop over operating in different orders
+     DO iorder = H5_ITER_INC_F,  H5_ITER_NATIVE_F
+        !  Loop over using index for creation order value
+        DO i = 1, 2
+           !  Print appropriate test message
+           IF(idx_type == H5_INDEX_CRT_ORDER_F)THEN
+              IF(iorder == H5_ITER_INC_F)THEN
+                 order = H5_ITER_INC_F
+!!$                 IF(use_index(i))THEN
+!!$                    WRITE(*,'(5x,A)')"query group info by creation order index in increasing order w/creation order index"
+!!$                 ELSE
+!!$                    WRITE(*,'(5x,A)')"query group info by creation order index in increasing order w/o creation order index"
+!!$                 ENDIF
+              ELSE IF (iorder == H5_ITER_DEC_F) THEN
+                 order = H5_ITER_DEC_F
+!!$                 IF(use_index(i))THEN
+!!$                    WRITE(*,'(5x,A)')"query group info by creation order index in decreasing order w/creation order index"
+!!$                 ELSE
+!!$                    WRITE(*,'(5x,A)')"query group info by creation order index in decreasing order w/o creation order index"
+!!$                 ENDIF
+              ELSE
+                 order = H5_ITER_NATIVE_F
+!!$                 IF(use_index(i))THEN
+!!$                    WRITE(*,'(5x,A)')"query group info by creation order index in native order w/creation order index"
+!!$                 ELSE
+!!$                    WRITE(*,'(5x,A)')"query group info by creation order index in native order w/o creation order index"
+!!$                 ENDIF
+              ENDIF
+           ELSE
+              IF(iorder == H5_ITER_INC_F)THEN
+                 order = H5_ITER_INC_F
+!!$                 IF(use_index(i))THEN
+!!$                    WRITE(*,'(5x,A)')"query group info by creation order index in increasing order w/creation order index"
+!!$                 ELSE
+!!$                    WRITE(*,'(5x,A)')"query group info by creation order index in increasing order w/o creation order index"
+!!$                 ENDIF
+              ELSE IF (iorder == H5_ITER_DEC_F) THEN
+                 order = H5_ITER_DEC_F
+!!$                 IF(use_index(i))THEN
+!!$                    WRITE(*,'(5x,A)')"query group info by creation order index in decreasing order w/creation order index"
+!!$                 ELSE
+!!$                    WRITE(*,'(5x,A)')"query group info by creation order index in decreasing order w/o creation order index"
+!!$                 ENDIF
+              ELSE
+                 order = H5_ITER_NATIVE_F
+!!$                 IF(use_index(i))THEN
+!!$                    WRITE(*,'(5x,A)')"query group info by creation order index in native order w/creation order index"
+!!$                 ELSE
+!!$                    WRITE(*,'(5x,A)')"query group info by creation order index in native order w/o creation order index"
+!!$                 ENDIF
+              ENDIF
+           END IF
+
+           !  Create file
+           CALL H5Fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, error, H5P_DEFAULT_F, fapl)
+           CALL check("H5Fcreate_f", error, total_error)
+
+           !  Set creation order tracking & indexing on group
+           IF(use_index(i))THEN
+              Input1 = H5P_CRT_ORDER_INDEXED_F
+           ELSE
+              Input1 = 0
+           ENDIF
+           CALL H5Pset_link_creation_order_f(gcpl_id, IOR(H5P_CRT_ORDER_TRACKED_F, Input1), error)
+           CALL check("H5Pset_link_creation_order_f", error, total_error)
+
+           !  Create group with creation order tracking on
+           CALL H5Gcreate_f(file_id, CORDER_GROUP_NAME, group_id, error, gcpl_id=gcpl_id)
+           CALL check("H5Gcreate_f", error, total_error)
+
+           !  Create group with creation order tracking on for soft links
+           CALL H5Gcreate_f(file_id, CORDER_SOFT_GROUP_NAME, soft_group_id, error, &
+                OBJECT_NAMELEN_DEFAULT_F, H5P_DEFAULT_F, gcpl_id)
+           CALL check("H5Gcreate_f", error, total_error)
+
+           !  Check for out of bound query by index on empty group, should fail
+           CALL H5Gget_info_by_idx_f(group_id, ".", H5_INDEX_NAME_F, order, INT(0,HSIZE_T), &
+                storage_type, nlinks, max_corder, error)
+           CALL verify("H5Gget_info_by_idx_f", error, -1, total_error)
+
+           !  Create several links, up to limit of compact form
+           DO u = 0, max_compact-1
+
+              !  Make name for link
+              WRITE(chr2,'(I2.2)') u
+              objname = 'fill '//chr2
+
+              !  Create hard link, with group object
+              CALL H5Gcreate_f(group_id, objname, group_id2, error, OBJECT_NAMELEN_DEFAULT_F, H5P_DEFAULT_F, gcpl_id)
+              CALL check("H5Gcreate_f", error, total_error)
+
+              !  Retrieve group's information
+              CALL H5Gget_info_f(group_id2, storage_type, nlinks, max_corder, error, mounted)
+              CALL check("H5Gget_info_f", error, total_error)
+
+              !  Check (new/empty) group's information
+              CALL verify("H5Gget_info_f", storage_type, H5G_STORAGE_TYPE_COMPACT_F, total_error)
+              CALL verify("H5Gget_info_f", max_corder, 0, total_error)
+              CALL verify("H5Gget_info_f", nlinks, 0, total_error)
+              CALL verify("H5Gget_info_f.mounted", mounted,.FALSE.,total_error)
+
+              !  Retrieve group's information
+              CALL H5Gget_info_by_name_f(group_id, objname, storage_type, nlinks, max_corder, error, mounted=mounted)
+              CALL check("H5Gget_info_by_name_f", error, total_error)
+
+              !  Check (new/empty) group's information
+              CALL verify("H5Gget_info_by_name_f", storage_type, H5G_STORAGE_TYPE_COMPACT_F, total_error)
+              CALL verify("H5Gget_info_by_name_f", max_corder, 0, total_error)
+              CALL verify("H5Gget_info_by_name_f", nlinks, 0, total_error)
+              CALL verify("H5Gget_info_by_name_f.mounted", mounted,.FALSE.,total_error)
+
+              !  Retrieve group's information
+              CALL H5Gget_info_by_name_f(group_id2, ".", storage_type, nlinks, max_corder, error)
+              CALL check("H5Gget_info_by_name", error, total_error)
+
+              !  Check (new/empty) group's information
+              CALL verify("H5Gget_info_by_name_f", storage_type, H5G_STORAGE_TYPE_COMPACT_F, total_error)
+              CALL verify("H5Gget_info_by_name_f", max_corder, 0, total_error)
+              CALL verify("H5Gget_info_by_name_f", nlinks, 0, total_error)
+
+              !  Create objects in new group created
+              DO v = 0, u
+                 !  Make name for link
+                 WRITE(chr2,'(I2.2)') v
+                 objname2 = 'fill '//chr2
+
+                 !  Create hard link, with group object
+                 CALL H5Gcreate_f(group_id2, objname2, group_id3, error )
+                 CALL check("H5Gcreate_f", error, total_error)
+
+                 !  Close group created
+                 CALL H5Gclose_f(group_id3, error)
+                 CALL check("H5Gclose_f", error, total_error)
+              ENDDO
+
+              !  Retrieve group's information
+              CALL H5Gget_info_f(group_id2, storage_type, nlinks, max_corder, error)
+              CALL check("H5Gget_info_f", error, total_error)
+
+              !  Check (new) group's information
+              CALL verify("H5Gget_info_f", storage_type, H5G_STORAGE_TYPE_COMPACT_F, total_error)
+              CALL verify("H5Gget_info_f", max_corder, u+1, total_error)
+              CALL verify("H5Gget_info_f", nlinks, u+1, total_error)
+
+              !  Retrieve group's information
+              CALL H5Gget_info_by_name_f(group_id, objname, storage_type, nlinks, max_corder, error)
+              CALL check("H5Gget_info_by_name_f", error, total_error)
+
+              !  Check (new) group's information
+              CALL verify("H5Gget_info_by_name_f", storage_type, H5G_STORAGE_TYPE_COMPACT_F, total_error)
+              CALL verify("H5Gget_info_by_name_f",max_corder, u+1, total_error)
+              CALL verify("H5Gget_info_by_name_f", nlinks, u+1, total_error)
+
+              !  Retrieve group's information
+              CALL H5Gget_info_by_name_f(group_id2, ".", storage_type, nlinks, max_corder, error)
+              CALL check("H5Gget_info_by_name_f", error, total_error)
+
+              !  Check (new) group's information
+              CALL verify("H5Gget_info_by_name_f", storage_type, H5G_STORAGE_TYPE_COMPACT_F, total_error)
+              CALL verify("H5Gget_info_by_name_f", max_corder, u+1, total_error)
+              CALL verify("H5Gget_info_by_name_f", nlinks, u+1, total_error)
+
+              !  Retrieve group's information
+              IF(order.NE.H5_ITER_NATIVE_F)THEN
+                 IF(order.EQ.H5_ITER_INC_F) THEN
+                    CALL H5Gget_info_by_idx_f(group_id, ".", idx_type, order, INT(u,HSIZE_T), &
+                         storage_type, nlinks, max_corder, error,lapl_id=H5P_DEFAULT_F, mounted=mounted)
+                    CALL check("H5Gget_info_by_idx_f", error, total_error)
+                    CALL verify("H5Gget_info_by_idx_f", mounted,.FALSE.,total_error)
+                 ELSE
+                    CALL H5Gget_info_by_idx_f(group_id, ".", idx_type, order, INT(0,HSIZE_T), &
+                         storage_type, nlinks, max_corder, error, mounted=mounted)
+                    CALL verify("H5Gget_info_by_idx_f", mounted,.FALSE.,total_error)
+                    CALL check("H5Gget_info_by_idx_f", error, total_error)
+                 ENDIF
+              !  Check (new) group's information
+                 CALL verify("H5Gget_info_by_idx_f", storage_type, H5G_STORAGE_TYPE_COMPACT_F, total_error)
+                 CALL verify("H5Gget_info_by_idx_f", max_corder, u+1, total_error)
+                 CALL verify("H5Gget_info_by_idx_f", nlinks, u+1, total_error)
+              ENDIF
+              !  Close group created
+              CALL H5Gclose_f(group_id2, error)
+              CALL check("H5Gclose_f", error, total_error)
+
+              !  Retrieve main group's information
+              CALL H5Gget_info_f(group_id, storage_type, nlinks, max_corder, error)
+              CALL check("H5Gget_info_f", error, total_error)
+
+              !  Check main group's information
+              CALL verify("H5Gget_info_f", storage_type, H5G_STORAGE_TYPE_COMPACT_F, total_error)
+              CALL verify("H5Gget_info_f", max_corder, u+1, total_error)
+              CALL verify("H5Gget_info_f", nlinks, u+1, total_error)
+
+              !  Retrieve main group's information, by name
+              CALL H5Gget_info_by_name_f(file_id, CORDER_GROUP_NAME, storage_type, nlinks, max_corder, error)
+              CALL check("H5Gget_info_by_name_f", error, total_error)
+
+              !  Check main group's information
+              CALL verify("H5Gget_info_by_name_f", storage_type, H5G_STORAGE_TYPE_COMPACT_F, total_error)
+              CALL verify("H5Gget_info_by_name_f", max_corder, u+1, total_error)
+              CALL verify("H5Gget_info_by_name_f", nlinks, u+1, total_error)
+
+              !  Retrieve main group's information, by name
+              CALL H5Gget_info_by_name_f(group_id, ".", storage_type, nlinks, max_corder, error, H5P_DEFAULT_F)
+              CALL check("H5Gget_info_by_name_f", error, total_error)
+
+              !  Check main group's information
+              CALL verify("H5Gget_info_by_name_f", storage_type, H5G_STORAGE_TYPE_COMPACT_F, total_error)
+              CALL verify("H5Gget_info_by_name_f", max_corder, u+1, total_error)
+              CALL verify("H5Gget_info_by_name_f", nlinks, u+1, total_error)
+
+              !  Create soft link in another group, to objects in main group
+              valname = CORDER_GROUP_NAME//objname
+
+              CALL H5Lcreate_soft_f(valname, soft_group_id, objname, error, H5P_DEFAULT_F, H5P_DEFAULT_F)
+
+              !  Retrieve soft link group's information, by name
+              CALL H5Gget_info_f(soft_group_id, storage_type, nlinks, max_corder, error)
+              CALL check("H5Gget_info_f", error, total_error)
+
+              !  Check soft link group's information
+              CALL verify("H5Gget_info_f", storage_type, H5G_STORAGE_TYPE_COMPACT_F, total_error)
+              CALL verify("H5Gget_info_f", max_corder, u+1, total_error)
+              CALL verify("H5Gget_info_f", nlinks, u+1, total_error)
+           ENDDO
+
+           !  Close the groups
+
+              CALL H5Gclose_f(group_id, error)
+              CALL check("H5Gclose_f", error, total_error)
+              CALL H5Gclose_f(soft_group_id, error)
+              CALL check("H5Gclose_f", error, total_error)
+
+              !  Close the file
+              CALL H5Fclose_f(file_id, error)
+              CALL check("H5Fclose_f", error, total_error)
+           ENDDO
+        ENDDO
+     ENDDO
+
+     !  Free resources
+     CALL H5Pclose_f(gcpl_id, error)
+     CALL check("H5Pclose_f", error, total_error)
+
+     IF(cleanup) CALL h5_cleanup_f(prefix, H5P_DEFAULT_F, error)
+     CALL check("h5_cleanup_f", error, total_error)
+
+
+   END SUBROUTINE group_info
+
+!-------------------------------------------------------------------------
+! * Function:    timestamps
+! *
+! * Purpose:     Verify that disabling tracking timestamps for an object
+! *              works correctly
+! *
+! *
+! * Programmer:  M.S. Breitenfeld
+! *              February 20, 2008
+! *
+! *-------------------------------------------------------------------------
+!
+
+   SUBROUTINE timestamps(cleanup, fapl, total_error)
+
+     IMPLICIT NONE
+     INTEGER, INTENT(INOUT) :: total_error
+     INTEGER(HID_T), INTENT(IN) :: fapl
+
+     INTEGER(HID_T) :: file_id ! File ID
+     INTEGER(HID_T) :: group_id ! Group ID
+     INTEGER(HID_T) :: group_id2 ! Group ID
+     INTEGER(HID_T) :: gcpl_id ! Group creation property list ID
+     INTEGER(HID_T) :: gcpl_id2 ! Group creation property list ID
+
+     CHARACTER(LEN=6), PARAMETER :: prefix = 'links9'
+     CHARACTER(LEN=9), PARAMETER :: filename = prefix//'.h5'  !  File name
+     !  Timestamp macros
+     CHARACTER(LEN=10), PARAMETER :: TIMESTAMP_GROUP_1="timestamp1"
+     CHARACTER(LEN=10), PARAMETER :: TIMESTAMP_GROUP_2="timestamp2"
+     LOGICAL :: track_times
+     LOGICAL :: cleanup
+
+     INTEGER :: error
+
+     !  Print test message
+!     WRITE(*,*) "timestamps on objects"
+
+     !  Create group creation property list
+     CALL H5Pcreate_f(H5P_GROUP_CREATE_F, gcpl_id, error )
+     CALL check("H5Pcreate_f", error, total_error)
+
+     !  Query the object timestamp setting
+     CALL H5Pget_obj_track_times_f(gcpl_id, track_times, error)
+     CALL check("H5Pget_obj_track_times_f", error, total_error)
+
+     ! Check default timestamp information
+     CALL verify("H5Pget_obj_track_times",track_times,.TRUE.,total_error)
+
+     !  Set a non-default object timestamp setting
+     CALL H5Pset_obj_track_times_f(gcpl_id, .FALSE., error)
+     CALL check("H5Pset_obj_track_times_f", error, total_error)
+
+     !  Query the object timestamp setting
+     CALL H5Pget_obj_track_times_f(gcpl_id, track_times, error)
+     CALL check("H5Pget_obj_track_times_f", error, total_error)
+
+     !  Check default timestamp information
+     CALL verify("H5Pget_obj_track_times",track_times,.FALSE.,total_error)
+
+     !  Create file
+     !h5_fixname(FILENAME[0], fapl, filename, sizeof filename);
+
+     CALL H5Fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, error, H5P_DEFAULT_F, fapl)
+     CALL check("h5fcreate_f",error,total_error)
+
+    !  Create group with non-default object timestamp setting
+     CALL h5gcreate_f(file_id, TIMESTAMP_GROUP_1, group_id, error, &
+          OBJECT_NAMELEN_DEFAULT_F, H5P_DEFAULT_F, gcpl_id, H5P_DEFAULT_F)
+     CALL check("h5fcreate_f",error,total_error)
+
+    !  Close the group creation property list
+     CALL H5Pclose_f(gcpl_id, error)
+     CALL check("H5Pclose_f", error, total_error)
+
+    !  Create group with default object timestamp setting
+     CALL h5gcreate_f(file_id, TIMESTAMP_GROUP_2, group_id2, error, &
+          OBJECT_NAMELEN_DEFAULT_F, H5P_DEFAULT_F, H5P_DEFAULT_F, H5P_DEFAULT_F)
+     CALL check("h5fcreate_f",error,total_error)
+
+    !  Retrieve the new groups' creation properties
+     CALL H5Gget_create_plist_f(group_id, gcpl_id, error)
+     CALL check("H5Gget_create_plist", error, total_error)
+     CALL H5Gget_create_plist_f(group_id2, gcpl_id2, error)
+     CALL check("H5Gget_create_plist", error, total_error)
+
+    !  Query & verify the object timestamp settings
+     CALL H5Pget_obj_track_times_f(gcpl_id, track_times, error)
+     CALL check("H5Pget_obj_track_times_f", error, total_error)
+     CALL verify("H5Pget_obj_track_times1",track_times,.FALSE.,total_error)
+     CALL H5Pget_obj_track_times_f(gcpl_id2, track_times, error)
+     CALL check("H5Pget_obj_track_times_f", error, total_error)
+     CALL verify("H5Pget_obj_track_times2",track_times,.TRUE.,total_error)
+
+!     Query the object information for each group
+!    if(H5Oget_info(group_id, &oinfo) < 0) TEST_ERROR
+!    if(H5Oget_info(group_id2, &oinfo2) < 0) TEST_ERROR
+
+!!$     Sanity check object information for each group
+!!$    if(oinfo.atime != 0) TEST_ERROR
+!!$    if(oinfo.mtime != 0) TEST_ERROR
+!!$    if(oinfo.ctime != 0) TEST_ERROR
+!!$    if(oinfo.btime != 0) TEST_ERROR
+!!$    if(oinfo.atime == oinfo2.atime) TEST_ERROR
+!!$    if(oinfo.mtime == oinfo2.mtime) TEST_ERROR
+!!$    if(oinfo.ctime == oinfo2.ctime) TEST_ERROR
+!!$    if(oinfo.btime == oinfo2.btime) TEST_ERROR
+!!$    if((oinfo.hdr.flags & H5O_HDR_STORE_TIMES) != 0) TEST_ERROR
+!!$    if((oinfo2.hdr.flags & H5O_HDR_STORE_TIMES) == 0) TEST_ERROR
+!!$    if(oinfo.hdr.space.total >= oinfo2.hdr.space.total) TEST_ERROR
+!!$    if(oinfo.hdr.space.meta >= oinfo2.hdr.space.meta) TEST_ERROR
+
+     !  Close the property lists
+     CALL H5Pclose_f(gcpl_id, error)
+     CALL check("H5Pclose_f", error, total_error)
+     CALL H5Pclose_f(gcpl_id2, error)
+     CALL check("H5Pclose_f", error, total_error)
+
+     !  Close the groups
+     CALL H5Gclose_f(group_id, error)
+     CALL check("H5Gclose_f", error, total_error)
+     CALL H5Gclose_f(group_id2, error)
+     CALL check("H5Gclose_f", error, total_error)
+
+     ! Close the file
+     CALL H5Fclose_f(file_id, error)
+     CALL check("H5Fclose_f", error, total_error)
+
+     ! Re-open the file
+
+     CALL h5fopen_f(FileName, H5F_ACC_RDONLY_F, file_id, error, H5P_DEFAULT_F)
+     CALL check("h5fopen_f",error,total_error)
+
+     ! Open groups
+     CALL H5Gopen_f(file_id, TIMESTAMP_GROUP_1, group_id, error) ! with no optional param.
+     CALL check("H5Gopen_f", error, total_error)
+     CALL H5Gopen_f(file_id, TIMESTAMP_GROUP_2, group_id2, error, H5P_DEFAULT_F) ! with optional param.
+     CALL check("H5Gopen_f", error, total_error)
+
+    !  Retrieve the new groups' creation properties
+     CALL H5Gget_create_plist_f(group_id, gcpl_id, error)
+     CALL check("H5Gget_create_plist", error, total_error)
+     CALL H5Gget_create_plist_f(group_id2, gcpl_id2, error)
+     CALL check("H5Gget_create_plist", error, total_error)
+
+    !  Query & verify the object timestamp settings
+
+     CALL H5Pget_obj_track_times_f(gcpl_id, track_times, error)
+     CALL check("H5Pget_obj_track_times_f", error, total_error)
+     CALL verify("H5Pget_obj_track_times1",track_times,.FALSE.,total_error)
+     CALL H5Pget_obj_track_times_f(gcpl_id2, track_times, error)
+     CALL check("H5Pget_obj_track_times_f", error, total_error)
+     CALL verify("H5Pget_obj_track_times2",track_times,.TRUE.,total_error)
+!!$
+!!$     Query the object information for each group
+!!$    if(H5Oget_info(group_id, &oinfo) < 0) TEST_ERROR
+!!$    if(H5Oget_info(group_id2, &oinfo2) < 0) TEST_ERROR
+!!$
+!!$     Sanity check object information for each group
+!!$    if(oinfo.atime != 0) TEST_ERROR
+!!$    if(oinfo.mtime != 0) TEST_ERROR
+!!$    if(oinfo.ctime != 0) TEST_ERROR
+!!$    if(oinfo.btime != 0) TEST_ERROR
+!!$    if(oinfo.atime == oinfo2.atime) TEST_ERROR
+!!$    if(oinfo.mtime == oinfo2.mtime) TEST_ERROR
+!!$    if(oinfo.ctime == oinfo2.ctime) TEST_ERROR
+!!$    if(oinfo.btime == oinfo2.btime) TEST_ERROR
+!!$    if((oinfo.hdr.flags & H5O_HDR_STORE_TIMES) != 0) TEST_ERROR
+!!$    if((oinfo2.hdr.flags & H5O_HDR_STORE_TIMES) == 0) TEST_ERROR
+!!$    if(oinfo.hdr.space.total >= oinfo2.hdr.space.total) TEST_ERROR
+!!$    if(oinfo.hdr.space.meta >= oinfo2.hdr.space.meta) TEST_ERROR
+
+     !  Close the property lists
+     CALL H5Pclose_f(gcpl_id, error)
+     CALL check("H5Pclose_f", error, total_error)
+     CALL H5Pclose_f(gcpl_id2, error)
+     CALL check("H5Pclose_f", error, total_error)
+
+     !  Close the groups
+     CALL H5Gclose_f(group_id, error)
+     CALL check("H5Gclose_f", error, total_error)
+     CALL H5Gclose_f(group_id2, error)
+     CALL check("H5Gclose_f", error, total_error)
+
+     ! Close the file
+     CALL H5Fclose_f(file_id, error)
+     CALL check("H5Fclose_f", error, total_error)
+
+     IF(cleanup) CALL h5_cleanup_f(prefix, H5P_DEFAULT_F, error)
+     CALL check("h5_cleanup_f", error, total_error)
+
+   END SUBROUTINE timestamps
+
+!-------------------------------------------------------------------------
+! * Function:	mklinks
+! *
+! * Purpose:	Build a file with assorted links.
+! *
+! *
+! * Programmer:	Adapted from C test by:
+! *             M.S. Breitenfeld
+! *
+! * Modifications:
+! *
+! *-------------------------------------------------------------------------
+!
+
+   SUBROUTINE mklinks(fapl, total_error)
+
+     IMPLICIT NONE
+     INTEGER, INTENT(INOUT) :: total_error
+     INTEGER(HID_T), INTENT(IN) :: fapl
+
+     INTEGER(HID_T) :: file, scalar, grp, d1
+     CHARACTER(LEN=12), PARAMETER :: filename ='TestLinks.h5'
+     INTEGER(HSIZE_T), DIMENSION(1) :: adims2 = (/1/) ! Attribute dimension
+     INTEGER ::   arank = 1                      ! Attribute rank
+     INTEGER :: error
+
+     INTEGER :: cset ! Indicates the character set used for the link’s name.
+     INTEGER :: corder ! Specifies the link’s creation order position.
+     LOGICAL :: f_corder_valid ! Indicates whether the value in corder is valid.
+     INTEGER :: link_type ! Specifies the link class:
+                          !  H5L_TYPE_HARD_F      - Hard link
+                          !  H5L_TYPE_SOFT_F      - Soft link
+                          !  H5L_TYPE_EXTERNAL_F  - External link
+                          !  H5L_TYPE_ERROR _F    - Error
+     TYPE(H5O_TOKEN_T_F) :: token  ! If the link is a hard link, token specifies the object token that the link points to
+     INTEGER(SIZE_T) :: val_size ! If the link is a symbolic link, val_size will be the length of the link value
+
+
+     WRITE(*,*) "link creation (w/new group format)"
+
+     !  Create a file
+     CALL h5fcreate_f(FileName, H5F_ACC_TRUNC_F, file, error, H5P_DEFAULT_F, fapl)
+     CALL check("mklinks.h5fcreate_f",error,total_error)
+     CALL h5screate_simple_f(arank, adims2, scalar, error)
+     CALL check("mklinks.h5screate_simple_f",error,total_error)
+
+     ! Create a group
+     CALL H5Gcreate_f(file, "grp1", grp, error)
+     CALL check("H5Gcreate_f", error, total_error)
+     CALL H5Gclose_f(grp, error)
+     CALL check("h5gclose_f",error,total_error)
+
+     ! Create a dataset
+     CALL h5dcreate_f(file, "d1", H5T_NATIVE_INTEGER, scalar, d1, error)
+     CALL check("h5dcreate_f",error,total_error)
+     CALL h5dclose_f(d1, error)
+     CALL check("h5dclose_f",error,total_error)
+
+     ! Create a hard link
+     CALL H5Lcreate_hard_f(file, "d1", INT(H5L_SAME_LOC_F,HID_T), "grp1/hard", error)
+     CALL check("H5Lcreate_hard_f", error, total_error)
+
+     ! Create a symbolic link
+     CALL H5Lcreate_soft_f("/d1", file, "grp1/soft",error)
+     CALL check("H5Lcreate_soft_f", error, total_error)
+
+     CALL H5Lget_info_f(file, "grp1/soft", &
+          cset, corder, f_corder_valid, link_type, token, val_size, &
+          error, H5P_DEFAULT_F)
+     CALL check("H5Lget_info_f",error,total_error)
+
+!     CALL verify("H5Lget_info_by_idx_f11", f_corder_valid, .TRUE., total_error)
+
+     CALL verify("H5Lget_info_by_idx_f", H5L_TYPE_SOFT_F, link_type, total_error)
+     CALL verify("H5Lget_info_by_idx_f", cset, H5T_CSET_ASCII_F, total_error)
+     ! should be '/d1' + NULL character = 4
+     CALL verify("H5Lget_info_by_idx_f", INT(val_size), 4, total_error)
+
+    ! Create a symbolic link to something that doesn't exist
+
+     CALL H5Lcreate_soft_f("foobar", file, "grp1/dangle",error)
+
+    ! Create a recursive symbolic link
+     CALL H5Lcreate_soft_f("/grp1/recursive", file, "/grp1/recursive",error)
+
+    ! Close
+     CALL h5sclose_f(scalar, error)
+     CALL check("h5sclose_f",error,total_error)
+     CALL h5fclose_f(file, error)
+     CALL check("h5fclose_f",error,total_error)
+
+  END SUBROUTINE mklinks
+
+!-------------------------------------------------------------------------
+! * Function:    test_move_preserves
+! *
+! * Purpose:     Tests that moving and renaming links preserves their
+! *              properties.
+! *
+! * Programmer:  M.S. Breitenfeld
+! *              March 3, 2008
+! *
+! * Modifications:
+! *
+! *-------------------------------------------------------------------------
+!
+
+  SUBROUTINE test_move_preserves(fapl_id, total_error)
+
+    IMPLICIT NONE
+    INTEGER, INTENT(INOUT) :: total_error
+    INTEGER(HID_T), INTENT(IN) :: fapl_id
+
+    INTEGER(HID_T):: file_id
+    INTEGER(HID_T):: group_id
+    INTEGER(HID_T):: fcpl_id !  Group creation property list ID
+    INTEGER(HID_T):: lcpl_id
+    !H5O_info_t oinfo;
+    !H5L_info_t linfo;
+    INTEGER :: old_cset
+    INTEGER :: old_corder
+    !H5T_cset_t old_cset;
+    !int64_t old_corder;          Creation order value of link
+    !time_t old_modification_time;
+    !time_t curr_time;
+    !unsigned crt_order_flags;    Status of creation order info for GCPL
+    !char filename[1024];
+
+    INTEGER :: crt_order_flags !  Status of creation order info for GCPL
+    CHARACTER(LEN=12), PARAMETER :: filename = 'TestLinks.h5'
+
+    INTEGER :: cset ! Indicates the character set used for the link’s name.
+    INTEGER :: corder ! Specifies the link’s creation order position.
+    LOGICAL :: f_corder_valid ! Indicates whether the value in corder is valid.
+    INTEGER :: link_type ! Specifies the link class:
+                         !  H5L_TYPE_HARD_F      - Hard link
+                         !  H5L_TYPE_SOFT_F      - Soft link
+                         !  H5L_TYPE_EXTERNAL_F  - External link
+                         !  H5L_TYPE_ERROR _F    - Error
+    TYPE(H5O_TOKEN_T_F) :: token  ! If the link is a hard link, token specifies the object token that the link points to
+    INTEGER(SIZE_T) :: val_size ! If the link is a symbolic link, val_size will be the length of the link value
+
+    INTEGER :: error
+
+!    WRITE(*,*) "moving and copying links preserves their properties (w/new group format)"
+
+    ! Create a file creation property list with creation order stored for links
+    ! * in the root group
+    !
+
+    CALL H5Pcreate_f(H5P_FILE_CREATE_F, fcpl_id, error)
+    CALL check("H5Pcreate_f",error, total_error)
+
+    CALL H5Pget_link_creation_order_f(fcpl_id, crt_order_flags, error)
+    CALL check("H5Pget_link_creation_order_f",error, total_error)
+    CALL verify("H5Pget_link_creation_order_f",crt_order_flags,0, total_error)
+
+    CALL H5Pset_link_creation_order_f(fcpl_id, H5P_CRT_ORDER_TRACKED_F, error)
+    CALL check("H5Pset_link_creation_order_f", error, total_error)
+
+    CALL H5Pget_link_creation_order_f(fcpl_id, crt_order_flags, error)
+    CALL check("H5Pget_link_creation_order_f",error, total_error)
+    CALL verify("H5Pget_link_creation_order_f",crt_order_flags, H5P_CRT_ORDER_TRACKED_F, total_error)
+
+    ! Create file
+    ! (with creation order tracking for the root group)
+
+    CALL h5fcreate_f(FileName, H5F_ACC_TRUNC_F, file_id, error, fcpl_id, fapl_id)
+    CALL check("h5fcreate_f",error,total_error)
+
+    ! Create a link creation property list with the UTF-8 character encoding
+    CALL H5Pcreate_f(H5P_LINK_CREATE_F, lcpl_id, error)
+    CALL check("H5Pcreate_f",error, total_error)
+
+    CALL H5Pset_char_encoding_f(lcpl_id, H5T_CSET_UTF8_F, error)
+    CALL check("H5Pset_char_encoding_f",error, total_error)
+
+    ! Create a group with that lcpl
+    CALL H5Gcreate_f(file_id, "group", group_id, error,lcpl_id=lcpl_id, gcpl_id=H5P_DEFAULT_F, gapl_id=H5P_DEFAULT_F)
+    CALL check("H5Gcreate_f", error, total_error)
+    CALL H5Gclose_f(group_id, error)
+    CALL check("H5Gclose_f", error, total_error)
+
+    !  Get the group's link's information
+    CALL H5Lget_info_f(file_id, "group", &
+         cset, corder, f_corder_valid, link_type, token, val_size, &
+         error, H5P_DEFAULT_F)
+    CALL check("H5Lget_info_f",error,total_error)
+
+!    if(H5Oget_info_by_name(file_id, "group", &oinfo, H5P_DEFAULT) < 0) TEST_ERROR
+
+    old_cset = cset
+    CALL verify("H5Lget_info_f",old_cset,H5T_CSET_UTF8_F,total_error)
+    CALL verify("H5Lget_info_f",f_corder_valid,.TRUE.,total_error)
+    old_corder = corder;
+    CALL verify("H5Lget_info_f",old_corder,0,total_error)
+
+!    old_modification_time = oinfo.mtime;
+
+!     If this test happens too quickly, the times will all be the same.  Make sure the time changes.
+!    curr_time = HDtime(NULL);
+!    while(HDtime(NULL) <= curr_time)
+!        ;
+
+!     Close the file and reopen it
+    CALL H5Fclose_f(file_id, error)
+    CALL check("H5Fclose_f", error, total_error)
+
+!!$    if((file_id = H5Fopen(filename, H5F_ACC_RDWR, fapl_id)) < 0) TEST_ERROR
+!!$
+!!$     Get the link's character set & modification time .  They should be unchanged
+!!$    if(H5Lget_info(file_id, "group", &linfo, H5P_DEFAULT) < 0) TEST_ERROR
+!!$    if(H5Oget_info_by_name(file_id, "group", &oinfo, H5P_DEFAULT) < 0) TEST_ERROR
+!!$    if(old_modification_time != oinfo.mtime) TEST_ERROR
+!!$    if(old_cset != linfo.cset) TEST_ERROR
+!!$    if(linfo.corder_valid != TRUE) TEST_ERROR
+!!$    if(old_corder != linfo.corder) TEST_ERROR
+!!$
+!!$     Create a new link to the group.  It should have a different creation order value but the same modification time
+!!$    if(H5Lcreate_hard(file_id, "group", file_id, "group2", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
+!!$    if(H5Oget_info_by_name(file_id, "group2", &oinfo, H5P_DEFAULT) < 0) TEST_ERROR
+!!$    if(old_modification_time != oinfo.mtime) TEST_ERROR
+!!$    if(H5Lget_info(file_id, "group2", &linfo, H5P_DEFAULT) < 0) TEST_ERROR
+!!$    if(old_corder == linfo.corder) TEST_ERROR
+!!$    if(linfo.corder_valid != TRUE) TEST_ERROR
+!!$    if(linfo.corder != 1) TEST_ERROR
+!!$    if(linfo.cset != H5T_CSET_ASCII) TEST_ERROR
+!!$
+!!$     Copy the first link to a UTF-8 name.
+!!$     *  Its creation order value should be different, but modification time
+!!$     * should not change.
+!!$
+!!$    if(H5Lcopy(file_id, "group", file_id, "group_copied", lcpl_id, H5P_DEFAULT) < 0) TEST_ERROR
+!!$    if(H5Oget_info_by_name(file_id, "group_copied", &oinfo, H5P_DEFAULT) < 0) TEST_ERROR
+!!$    if(old_modification_time != oinfo.mtime) TEST_ERROR
+!!$    if(H5Lget_info(file_id, "group_copied", &linfo, H5P_DEFAULT) < 0) TEST_ERROR
+!!$    if(linfo.corder_valid != TRUE) TEST_ERROR
+!!$    if(linfo.corder != 2) TEST_ERROR
+!!$
+!!$     Check that its character encoding is UTF-8
+!!$    if(linfo.cset != H5T_CSET_UTF8) TEST_ERROR
+!!$
+!!$     Move the link with the default property list.
+!!$    if(H5Lmove(file_id, "group_copied", file_id, "group_copied2", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
+!!$    if(H5Oget_info_by_name(file_id, "group_copied2", &oinfo, H5P_DEFAULT) < 0) TEST_ERROR
+!!$    if(old_modification_time != oinfo.mtime) TEST_ERROR
+!!$    if(H5Lget_info(file_id, "group_copied2", &linfo, H5P_DEFAULT) < 0) TEST_ERROR
+!!$    if(linfo.corder_valid != TRUE) TEST_ERROR
+!!$    if(linfo.corder != 3) TEST_ERROR
+!!$
+!!$     Check that its character encoding is not UTF-8
+!!$    if(linfo.cset == H5T_CSET_UTF8) TEST_ERROR
+!!$
+!!$     Check that the original link is unchanged
+!!$    if(H5Oget_info_by_name(file_id, "group", &oinfo, H5P_DEFAULT) < 0) TEST_ERROR
+!!$    if(old_modification_time != oinfo.mtime) TEST_ERROR
+!!$    if(H5Lget_info(file_id, "group", &linfo, H5P_DEFAULT) < 0) TEST_ERROR
+!!$    if(linfo.corder_valid != TRUE) TEST_ERROR
+!!$    if(old_corder != linfo.corder) TEST_ERROR
+!!$    if(linfo.cset != H5T_CSET_UTF8) TEST_ERROR
+!!$
+!!$     Move the first link to a UTF-8 name.
+!!$     *  Its creation order value will change, but modification time should not
+!!$     *  change.
+!!$    if(H5Lmove(file_id, "group", file_id, "group_moved", lcpl_id, H5P_DEFAULT) < 0) TEST_ERROR
+!!$    if(H5Oget_info_by_name(file_id, "group_moved", &oinfo, H5P_DEFAULT) < 0) TEST_ERROR
+!!$    if(old_modification_time != oinfo.mtime) TEST_ERROR
+!!$    if(H5Lget_info(file_id, "group_moved", &linfo, H5P_DEFAULT) < 0) TEST_ERROR
+!!$    if(linfo.corder_valid != TRUE) TEST_ERROR
+!!$    if(linfo.corder != 4) TEST_ERROR
+!!$
+!!$     Check that its character encoding is UTF-8
+!!$    if(linfo.cset != H5T_CSET_UTF8) TEST_ERROR
+!!$
+!!$     Move the link again using the default property list.
+!!$    if(H5Lmove(file_id, "group_moved", file_id, "group_moved_again", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
+!!$    if(H5Oget_info_by_name(file_id, "group_moved_again", &oinfo, H5P_DEFAULT) < 0) TEST_ERROR
+!!$    if(old_modification_time != oinfo.mtime) TEST_ERROR
+!!$    if(H5Lget_info(file_id, "group_moved_again", &linfo, H5P_DEFAULT) < 0) TEST_ERROR
+!!$    if(linfo.corder_valid != TRUE) TEST_ERROR
+!!$    if(linfo.corder != 5) TEST_ERROR
+!!$
+!!$     Check that its character encoding is not UTF-8
+!!$    if(linfo.cset == H5T_CSET_UTF8) TEST_ERROR
+
+    !  Close open IDs
+     CALL H5Pclose_f(fcpl_id, error)
+     CALL check("H5Pclose_f", error, total_error)
+     CALL H5Pclose_f(lcpl_id, error)
+     CALL check("H5Pclose_f", error, total_error)
+
+    ! if(H5Fclose(file_id) < 0) TEST_ERROR
+
+   END SUBROUTINE test_move_preserves
+
+!-------------------------------------------------------------------------
+! * Function:    lifecycle
+! *
+! * Purpose:     Test that adding links to a group follow proper "lifecycle"
+! *              of empty->compact->symbol table->compact->empty.  (As group
+! *              is created, links are added, then links removed)
+! *
+! * Return:      Success:        0
+! *
+! *              Failure:        -1
+! *
+! * Programmer:  Quincey Koziol
+! *              Monday, October 17, 2005
+! *
+! *-------------------------------------------------------------------------
+!
+SUBROUTINE lifecycle(cleanup, fapl2, total_error)
+
+  IMPLICIT NONE
+  INTEGER, INTENT(INOUT) :: total_error
+  INTEGER(HID_T), INTENT(IN) :: fapl2
+  INTEGER :: error
+
+  INTEGER, PARAMETER :: NAME_BUF_SIZE =7
+
+  INTEGER(HID_T) :: fid            ! File ID
+  INTEGER(HID_T) :: gid            ! Group ID
+  INTEGER(HID_T) :: gcpl           ! Group creation property list ID
+  INTEGER(size_t) :: lheap_size_hint ! Local heap size hint
+  INTEGER :: max_compact            ! Maximum # of links to store in group compactly
+  INTEGER :: min_dense              ! Minimum # of links to store in group "densely"
+  INTEGER :: est_num_entries        ! Estimated # of entries in group
+  INTEGER :: est_name_len           ! Estimated length of entry name
+  CHARACTER(LEN=NAME_BUF_SIZE) :: filename = 'fixx.h5'
+  INTEGER(SIZE_T) :: LIFECYCLE_LOCAL_HEAP_SIZE_HINT = 256
+  INTEGER :: LIFECYCLE_MAX_COMPACT = 4
+  INTEGER :: LIFECYCLE_MIN_DENSE = 3
+  INTEGER :: LIFECYCLE_EST_NUM_ENTRIES = 4
+  INTEGER :: LIFECYCLE_EST_NAME_LEN=8
+  CHARACTER(LEN=3) :: LIFECYCLE_TOP_GROUP="top"
+! These value are taken from H5Gprivate.h
+  INTEGER :: H5G_CRT_GINFO_MAX_COMPACT = 8
+  INTEGER :: H5G_CRT_GINFO_MIN_DENSE = 6
+  INTEGER :: H5G_CRT_GINFO_EST_NUM_ENTRIES = 4
+  INTEGER :: H5G_CRT_GINFO_EST_NAME_LEN = 8
+  logical :: cleanup
+
+!  WRITE(*,*) 'group lifecycle'
+
+  !  Create file
+  CALL H5Fcreate_f(filename, H5F_ACC_TRUNC_F, fid, error, access_prp=fapl2)
+  CALL check("H5Fcreate_f",error,total_error)
+
+  ! Close file
+  CALL H5Fclose_f(fid,error)
+  CALL check("H5Fclose_f",error,total_error)
+
+  !  Get size of file as empty
+  ! if((empty_size = h5_get_file_size(filename)) < 0) TEST_ERROR
+
+  !  Re-open file
+
+  CALL H5Fopen_f(filename, H5F_ACC_RDWR_F, fid, error,access_prp=fapl2)
+  CALL check("H5Fopen_f",error,total_error)
+
+
+  !  Set up group creation property list
+  CALL H5Pcreate_f(H5P_GROUP_CREATE_F,gcpl,error)
+  CALL check("H5Pcreate_f",error,total_error)
+
+
+  !  Query default group creation property settings
+  CALL H5Pget_local_heap_size_hint_f(gcpl, lheap_size_hint, error)
+  CALL check("H5Pget_local_heap_size_hint_f",error,total_error)
+  CALL verify("H5Pget_local_heap_size_hint_f", INT(lheap_size_hint),0,total_error)
+
+  CALL H5Pget_link_phase_change_f(gcpl, max_compact, min_dense, error)
+  CALL check("H5Pget_link_phase_change_f", error, total_error)
+  CALL verify("H5Pget_link_phase_change_f", max_compact, H5G_CRT_GINFO_MAX_COMPACT,total_error)
+  CALL verify("H5Pget_link_phase_change_f", min_dense, H5G_CRT_GINFO_MIN_DENSE,total_error)
+
+
+  CALL H5Pget_est_link_info_f(gcpl, est_num_entries, est_name_len, error)
+  CALL check("H5Pget_est_link_info_f", error, total_error)
+  CALL verify("H5Pget_est_link_info_f", est_num_entries, H5G_CRT_GINFO_EST_NUM_ENTRIES,total_error)
+  CALL verify("H5Pget_est_link_info_f", est_name_len, H5G_CRT_GINFO_EST_NAME_LEN,total_error)
+
+
+  ! Set GCPL parameters
+
+  CALL H5Pset_local_heap_size_hint_f(gcpl, LIFECYCLE_LOCAL_HEAP_SIZE_HINT, error)
+  CALL check("H5Pset_local_heap_size_hint_f", error, total_error)
+  CALL H5Pset_link_phase_change_f(gcpl, LIFECYCLE_MAX_COMPACT, LIFECYCLE_MIN_DENSE, error)
+  CALL check("H5Pset_link_phase_change_f", error, total_error)
+  CALL H5Pset_est_link_info_f(gcpl, LIFECYCLE_EST_NUM_ENTRIES, LIFECYCLE_EST_NAME_LEN, error)
+  CALL check("H5Pset_est_link_info_f", error, total_error)
+
+  !  Create group for testing lifecycle
+
+  CALL H5Gcreate_f(fid, LIFECYCLE_TOP_GROUP, gid, error, gcpl_id=gcpl)
+  CALL check("H5Gcreate_f", error, total_error)
+
+  !  Query group creation property settings
+
+  CALL H5Pget_local_heap_size_hint_f(gcpl, lheap_size_hint, error)
+  CALL check("H5Pget_local_heap_size_hint_f",error,total_error)
+  CALL verify("H5Pget_local_heap_size_hint_f", INT(lheap_size_hint),INT(LIFECYCLE_LOCAL_HEAP_SIZE_HINT),total_error)
+
+  CALL H5Pget_link_phase_change_f(gcpl, max_compact, min_dense, error)
+  CALL check("H5Pget_link_phase_change_f", error, total_error)
+  CALL verify("H5Pget_link_phase_change_f", max_compact, LIFECYCLE_MAX_COMPACT,total_error)
+  CALL verify("H5Pget_link_phase_change_f", min_dense, LIFECYCLE_MIN_DENSE,total_error)
+
+  CALL H5Pget_est_link_info_f(gcpl, est_num_entries, est_name_len, error)
+  CALL check("H5Pget_est_link_info_f", error, total_error)
+  CALL verify("H5Pget_est_link_info_f", est_num_entries, LIFECYCLE_EST_NUM_ENTRIES,total_error)
+  CALL verify("H5Pget_est_link_info_f", est_name_len, LIFECYCLE_EST_NAME_LEN,total_error)
+
+
+
+    ! Close top group
+    CALL H5Gclose_f(gid, error)
+    CALL check("H5Gclose_f", error, total_error)
+
+    ! Unlink top group
+
+    CALL H5Ldelete_f(fid, LIFECYCLE_TOP_GROUP, error)
+    CALL check("H5Ldelete_f", error, total_error)
+
+    !  Close GCPL
+    CALL H5Pclose_f(gcpl, error)
+    CALL check("H5Pclose_f", error, total_error)
+
+    !  Close file
+    CALL H5Fclose_f(fid,error)
+    CALL check("H5Fclose_f",error,total_error)
+
+    IF(cleanup) CALL h5_cleanup_f("fixx", H5P_DEFAULT_F, error)
+    CALL check("h5_cleanup_f", error, total_error)
+
+  END SUBROUTINE lifecycle
+
+!-------------------------------------------------------------------------
+! * Function:	cklinks
+! *
+! * Purpose:	Open the file created in the first step and check that the
+! *		links look correct.
+! *
+! * Return:	Success:	0
+! *
+! *		Failure:	-1
+! *
+! * Programmer:	M.S. Breitenfeld
+! *             April 14, 2008
+! *
+! * Modifications: Modified original C code
+! *
+! *-------------------------------------------------------------------------
+!
+
+
+  SUBROUTINE cklinks(fapl, total_error)
+
+  IMPLICIT NONE
+  INTEGER, INTENT(INOUT) :: total_error
+  INTEGER(HID_T), INTENT(IN) :: fapl
+  INTEGER :: error
+
+  INTEGER(HID_T) :: file
+!    H5O_info_t		oinfo1, oinfo2;
+!    H5L_info_t		linfo2;
+
+  CHARACTER(LEN=12), PARAMETER :: filename ='TestLinks.h5'
+
+!  TYPE(C_PTR) :: linkval
+
+  LOGICAL :: Lexists
+
+  !  Open the file
+  CALL H5Fopen_f(filename, H5F_ACC_RDONLY_F, file, error,access_prp=fapl)
+  CALL check("H5Fopen_f",error,total_error)
+
+
+  !  Hard link
+!!$  IF(H5Oget_info_by_name(file, "d1", &oinfo1, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+!!$  IF(H5Oget_info_by_name(file, "grp1/hard", &oinfo2, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+!!$  IF(H5O_TYPE_DATASET != oinfo2.type) {
+!!$	H5_FAILED();
+!!$	printf("    %d: Unexpected object type should have been a dataset\n", __LINE__);
+!!$	TEST_ERROR
+!!$    }  end if
+!!$    if(H5F_addr_ne(oinfo1.addr, oinfo2.addr)) {
+!!$	H5_FAILED();
+!!$	puts("    Hard link test failed. Link seems not to point to the ");
+!!$	puts("    expected file location.");
+!!$	TEST_ERROR
+!!$    }  end if
+
+
+  CALL H5Lexists_f(file,"d1",Lexists, error)
+  CALL verify("H5Lexists", Lexists,.TRUE.,total_error)
+
+  CALL H5Lexists_f(file,"grp1/hard",Lexists, error)
+  CALL verify("H5Lexists", Lexists,.TRUE.,total_error)
+
+  !  Cleanup
+  CALL H5Fclose_f(file,error)
+  CALL check("H5Fclose_f",error,total_error)
+
+END SUBROUTINE cklinks
+
+
+!-------------------------------------------------------------------------
+! * Function:    delete_by_idx
+! *
+! * Purpose:     Create a group with creation order indices and test deleting
+! *              links by index.
+! *
+! * Return:      Total error
+! *
+! * C Programmer:  Quincey Koziol
+! *                Tuesday, November 14, 2006
+! *
+! * Adapted to FORTRAN: M.S. Breitenfeld
+! *                     March 3, 2008
+! *
+! *-------------------------------------------------------------------------
+!
+SUBROUTINE delete_by_idx(cleanup, fapl, total_error)
+
+  IMPLICIT NONE
+  INTEGER, INTENT(INOUT) :: total_error
+  INTEGER(HID_T), INTENT(IN) :: fapl
+
+  INTEGER(HID_T) :: file_id  !  File ID
+  INTEGER(HID_T) :: group_id !  Group ID
+  INTEGER(HID_T) :: gcpl_id  !  Group creation property list ID
+
+  INTEGER :: idx_type        !  Type of index to operate on
+  LOGICAL, DIMENSION(1:2) :: use_index = (/.FALSE.,.TRUE./)
+                             !  Use index on creation order values
+  INTEGER :: max_compact     !  Maximum # of links to store in group compactly
+  INTEGER :: min_dense       !  Minimum # of links to store in group "densely"
+
+  CHARACTER(LEN=7) :: objname   !  Object name
+  CHARACTER(LEN=8) :: filename = 'file0.h5' !  File name
+  CHARACTER(LEN=12), PARAMETER :: CORDER_GROUP_NAME = "corder_group"
+
+  LOGICAL :: f_corder_valid ! Indicates whether the creation order data is valid for this attribute
+  INTEGER :: corder ! Is a positive integer containing the creation order of the attribute
+  INTEGER :: cset ! Indicates the character set used for the attribute’s name
+  INTEGER(SIZE_T) :: val_size
+  INTEGER :: link_type
+  TYPE(H5O_TOKEN_T_F) :: token
+
+  INTEGER :: u !  Local index variable
+  INTEGER :: Input1, i
+  INTEGER(HID_T) :: group_id2
+  INTEGER(HID_T) :: grp
+  INTEGER :: iorder !  Order within in the index
+  CHARACTER(LEN=2) :: chr2
+  INTEGER :: error
+  INTEGER :: id_type
+  !
+  !
+  !
+  CHARACTER(LEN=80) :: fix_filename1
+  CHARACTER(LEN=80) :: fix_filename2
+  INTEGER(HSIZE_T) :: htmp
+
+  LOGICAL :: cleanup
+
+  DO i = 1, 80
+     fix_filename1(i:i) = " "
+     fix_filename2(i:i) = " "
+  ENDDO
+
+  !  Loop over operating on different indices on link fields
+  DO idx_type = H5_INDEX_NAME_F, H5_INDEX_CRT_ORDER_F
+     !  Loop over operating in different orders
+     DO iorder = H5_ITER_INC_F,  H5_ITER_DEC_F
+        !  Loop over using index for creation order value
+        DO i = 1, 2
+           !  Print appropriate test message
+!!$           IF(idx_type == H5_INDEX_CRT_ORDER_F)THEN
+!!$              IF(iorder == H5_ITER_INC_F)THEN
+!!$                 IF(use_index(i))THEN
+!!$                    WRITE(*,'(5x,A)')"deleting links by creation order index in increasing order w/creation order index"
+!!$                 ELSE
+!!$                    WRITE(*,'(5x,A)')"deleting links by creation order index in increasing order w/o creation order index"
+!!$                 ENDIF
+!!$              ELSE
+!!$                 IF(use_index(i))THEN
+!!$                    WRITE(*,'(5x,A)')"deleting links by creation order index in decreasing order w/creation order index"
+!!$                 ELSE
+!!$                    WRITE(*,'(5x,A)')"deleting links by creation order index in decreasing order w/o creation order index"
+!!$                 ENDIF
+!!$              ENDIF
+!!$           ELSE
+!!$              IF(iorder == H5_ITER_INC_F)THEN
+!!$                 IF(use_index(i))THEN
+!!$                    WRITE(*,'(5x,A)')"deleting links by name index in increasing order w/creation order index"
+!!$                 ELSE
+!!$                    WRITE(*,'(5x,A)')"deleting links by name index in increasing order w/o creation order index"
+!!$                 ENDIF
+!!$              ELSE
+!!$                 IF(use_index(i))THEN
+!!$                    WRITE(*,'(5x,A)')"deleting links by name index in decreasing order w/creation order index"
+!!$                 ELSE
+!!$                    WRITE(*,'(5x,A)')"deleting links by name index in decreasing order w/o creation order index"
+!!$                 ENDIF
+!!$              ENDIF
+!!$           ENDIF
+
+           !  Create file
+           CALL H5Fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, error, access_prp=fapl)
+           CALL check("delete_by_idx.H5Fcreate_f", error, total_error)
+
+           !  Create group creation property list
+           CALL H5Pcreate_f(H5P_GROUP_CREATE_F, gcpl_id, error )
+           CALL check("delete_by_idx.H5Pcreate_f", error, total_error)
+
+           !  Set creation order tracking & indexing on group
+           IF(use_index(i))THEN
+              Input1 = H5P_CRT_ORDER_INDEXED_F
+           ELSE
+              Input1 = 0
+           ENDIF
+
+           CALL H5Pset_link_creation_order_f(gcpl_id, IOR(H5P_CRT_ORDER_TRACKED_F, Input1), error)
+           CALL check("delete_by_idx.H5Pset_link_creation_order_f", error, total_error)
+
+           !  Create group with creation order tracking on
+           CALL H5Gcreate_f(file_id, CORDER_GROUP_NAME, group_id, error, gcpl_id=gcpl_id)
+           CALL check("delete_by_idx.H5Gcreate_f", error, total_error)
+
+           !  Query the group creation properties
+           CALL H5Pget_link_phase_change_f(gcpl_id, max_compact, min_dense, error)
+           CALL check("delete_by_idx.H5Pget_link_phase_change_f", error, total_error)
+
+
+           !  Delete links from one end
+
+           !  Check for deletion on empty group
+           CALL H5Ldelete_by_idx_f(group_id, ".", idx_type, iorder, INT(0,HSIZE_T), error)
+           CALL verify("delete_by_idx.H5Ldelete_by_idx_f", error, -1, total_error) ! test should fail (error = -1)
+           !  Create several links, up to limit of compact form
+           DO u = 0, max_compact-1
+              !  Make name for link
+              WRITE(chr2,'(I2.2)') u
+              objname = 'fill '//chr2
+
+              !  Create hard link, with group object
+              CALL H5Gcreate_f(group_id, objname, group_id2, error)
+              CALL check("delete_by_idx.H5Gcreate_f", error, total_error)
+              CALL H5Gclose_f(group_id2, error)
+              CALL check("delete_by_idx.H5Gclose_f", error, total_error)
+
+              !  Verify link information for new link
+              CALL link_info_by_idx_check(group_id, objname, u, &
+                   .TRUE., use_index(i), total_error)
+           ENDDO
+
+           !  Verify state of group (compact)
+           ! IF(H5G_has_links_test(group_id, NULL) != TRUE) TEST_ERROR
+
+           !  Check for out of bound deletion
+           htmp =9
+!EP           CALL H5Ldelete_by_idx_f(group_id, ".", idx_type, iorder, INT(u,HSIZE_T), error)
+           CALL H5Ldelete_by_idx_f(group_id, ".", idx_type, iorder, htmp, error)
+           CALL verify("H5Ldelete_by_idx_f", error, -1, total_error) ! test should fail (error = -1)
+
+
+           !  Delete links from compact group
+
+           DO u = 0, (max_compact - 1) -1
+              !  Delete first link in appropriate order
+              CALL H5Ldelete_by_idx_f(group_id, ".", idx_type, iorder, INT(0,HSIZE_T), error)
+              CALL check("H5Ldelete_by_idx_f", error, total_error)
+              !  Verify the link information for first link in appropriate order
+              ! HDmemset(&linfo, 0, sizeof(linfo));
+
+              CALL H5Lget_info_by_idx_f(group_id, ".", idx_type, iorder, INT(0,HSIZE_T), &
+                   link_type, f_corder_valid, corder, cset, token, val_size, error)
+
+              CALL H5Oopen_by_token_f(group_id, token, grp, error)
+              CALL check("H5Oopen_by_token_f", error, total_error)
+
+              CALL H5Iget_type_f(grp, id_type, error)
+              CALL check("H5Iget_type_f", error, total_error)
+
+              CALL verify("H5Iget_type_f", id_type, H5I_GROUP_F, total_error)
+
+              CALL H5Gclose_f(grp, error)
+              CALL check("H5Gclose_f", error, total_error)
+
+              CALL verify("H5Lget_info_by_idx_f", f_corder_valid, .TRUE., total_error)
+
+              CALL verify("H5Lget_info_by_idx_f", H5L_TYPE_HARD_F, link_type, total_error)
+              IF(iorder.EQ.H5_ITER_INC_F)THEN
+                 CALL verify("H5Lget_info_by_idx_f", corder, u+1, total_error)
+              ELSE
+                 CALL verify("H5Lget_info_by_idx_f", corder, (max_compact - (u + 2)), total_error)
+              ENDIF
+
+              CALL verify("H5Lget_info_by_idx_f",cset, H5T_CSET_ASCII_F, total_error)
+
+
+
+              !  Verify the name for first link in appropriate order
+              ! HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE);
+!!$              size_tmp = 20
+!!$              CALL H5Lget_name_by_idx_f(group_id, ".", idx_type, order, INT(0,HSIZE_T), size_tmp, tmpname, error)
+!!$              CALL check("delete_by_idx.H5Lget_name_by_idx_f", error, total_error)
+!!$
+!!$              IF(order .EQ. H5_ITER_INC_F)THEN
+!!$                 WRITE(chr2,'(I2.2)') u + 1
+!!$              ELSE
+!!$                 WRITE(chr2,'(I2.2)') (max_compact - (u + 2))
+!!$              ENDIF
+!!$              objname = 'fill '//chr2
+!!$              PRINT*,objname, tmpname
+!!$              CALL verify("delete_by_idx.H5Lget_name_by_idx_f", objname, tmpname,  total_error)
+           ENDDO
+
+           !  Close the group
+           CALL H5Gclose_f(group_id, error)
+           CALL check("delete_by_idx.H5Gclose_f", error, total_error)
+
+           ! Close the group creation property list
+           CALL H5Pclose_f(gcpl_id, error)
+           CALL check("delete_by_idx.H5Pclose_f", error, total_error)
+
+           ! Close the file
+           CALL H5Fclose_f(file_id, error)
+           CALL check("delete_by_idx.H5Fclose_f", error, total_error)
+
+           IF(cleanup) CALL h5_cleanup_f("file0", H5P_DEFAULT_F, error)
+           CALL check("h5_cleanup_f", error, total_error)
+
+        ENDDO
+     ENDDO
+  ENDDO
+
+
+END SUBROUTINE delete_by_idx
+
+
+
+!-------------------------------------------------------------------------
+! * Function:    link_info_by_idx_check
+! *
+! * Purpose:     Support routine for link_info_by_idx, to verify the link
+! *              info is correct for a link
+! *
+! * Note:	 This routine assumes that the links have been inserted in the
+! *              group in alphabetical order.
+! *
+! * Return:      Success:        0
+! *              Failure:        -1
+! *
+! * Programmer:  Quincey Koziol
+! *              Tuesday, November  7, 2006
+! *
+! *-------------------------------------------------------------------------
+!
+SUBROUTINE link_info_by_idx_check(group_id, linkname, n, &
+    hard_link, use_index, total_error)
+
+  IMPLICIT NONE
+  INTEGER, INTENT(INOUT) :: total_error
+  INTEGER(HID_T), INTENT(IN) :: group_id
+  CHARACTER(LEN=*), INTENT(IN) :: linkname
+  INTEGER, INTENT(IN) :: n
+  LOGICAL, INTENT(IN) :: hard_link
+  LOGICAL, INTENT(IN) :: use_index
+
+  LOGICAL :: f_corder_valid ! Indicates whether the creation order data is valid for this attribute
+  INTEGER :: corder ! Is a positive integer containing the creation order of the attribute
+  INTEGER :: cset ! Indicates the character set used for the attribute’s name
+  INTEGER :: link_type
+  TYPE(H5O_TOKEN_T_F) :: token
+  INTEGER(SIZE_T) :: val_size   ! Indicates the size, in the number of characters, of the attribute
+
+  CHARACTER(LEN=7) :: tmpname     ! Temporary link name
+  CHARACTER(LEN=3) :: tmpname_small ! to small temporary link name
+  CHARACTER(LEN=10) :: tmpname_big ! to big temporary link name
+
+  CHARACTER(LEN=7) :: valname     ! Link value name
+  CHARACTER(LEN=2) :: chr2
+  INTEGER(SIZE_T) :: size_tmp
+  INTEGER :: error
+
+  !  Make link value for increasing/native order queries
+
+  WRITE(chr2,'(I2.2)') n
+  valname = 'valn.'//chr2
+
+  !  Verify the link information for first link, in increasing creation order
+  !  HDmemset(&linfo, 0, sizeof(linfo));
+  CALL H5Lget_info_by_idx_f(group_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_INC_F, INT(0,HSIZE_T), &
+       link_type, f_corder_valid, corder, cset, token, val_size, error)
+  CALL check("H5Lget_info_by_idx_f", error, total_error)
+  CALL verify("H5Lget_info_by_idx_f", corder, 0, total_error)
+
+  !  Verify the link information for new link, in increasing creation order
+  ! HDmemset(&linfo, 0, sizeof(linfo));
+  CALL H5Lget_info_by_idx_f(group_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_INC_F, INT(n,HSIZE_T), &
+       link_type, f_corder_valid, corder, cset, token, val_size, error)
+  CALL check("H5Lget_info_by_idx_f", error, total_error)
+  CALL verify("H5Lget_info_by_idx_f", corder, n, total_error)
+
+  !  Verify value for new soft link, in increasing creation order
+!!$  IF(hard_link)THEN
+!!$     ! HDmemset(tmpval, 0, (size_t)NAME_BUF_SIZE);
+!!$
+!!$     CALL H5Lget_val_by_idx_f(group_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_INC_F, n, tmpval, INT(7,SIZE_T),error)
+!!$     CALL check("H5Lget_val_by_idx",error,total_error)
+!!$
+!!$!     IF(HDstrcmp(valname, tmpval)) TEST_ERROR
+!!$  ENDIF
+
+  !  Verify the name for new link, in increasing creation order
+  !  HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE);
+
+  ! The actual size of tmpname should be 7
+
+  CALL H5Lget_name_by_idx_f(group_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_INC_F, INT(n,HSIZE_T), tmpname_small, error, size_tmp)
+  CALL check("link_info_by_idx_check.H5Lget_name_by_idx_f", error, total_error)
+  CALL verify("link_info_by_idx_check.H5Lget_name_by_idx_f", &
+       linkname(1:LEN(tmpname_small)), tmpname_small(1:LEN(tmpname_small)),  total_error)
+  CALL verify("link_info_by_idx_check.H5Lget_name_by_idx_f", INT(size_tmp), 7, total_error)
+  ! try it with the correct size
+  CALL H5Lget_name_by_idx_f(group_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_INC_F, INT(n,HSIZE_T), tmpname, error, size=size_tmp)
+  CALL check("link_info_by_idx_check.H5Lget_name_by_idx_f", error, total_error)
+  CALL verify("link_info_by_idx_check.H5Lget_name_by_idx_f", &
+       linkname(1:LEN(tmpname)), tmpname(1:LEN(tmpname)),  total_error)
+  CALL verify("link_info_by_idx_check.H5Lget_name_by_idx_f", INT(size_tmp), 7, total_error)
+
+  CALL H5Lget_name_by_idx_f(group_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_INC_F, INT(n,HSIZE_T), tmpname_big, error, size_tmp)
+  CALL check("link_info_by_idx_check.H5Lget_name_by_idx_f", error, total_error)
+  CALL verify("link_info_by_idx_check.H5Lget_name_by_idx_f", &
+       linkname(1:7), tmpname_big(1:7),  total_error)
+  CALL verify("link_info_by_idx_check.H5Lget_name_by_idx_f", INT(size_tmp), 7, total_error)
+
+  ! Try with a buffer set to small
+
+
+  END SUBROUTINE link_info_by_idx_check
+
+
+!-------------------------------------------------------------------------
+! * Function:    test_lcpl
+! *
+! * Purpose:     Tests Link Creation Property Lists
+! *
+! * Return:      Success:        0
+! *              Failure:        number of errors
+! *
+! * Programmer:  M.S. Breitenfeld
+! *              Modified C routine
+! *              March 12, 2008
+! *
+! * Modifications:
+! *
+! *-------------------------------------------------------------------------
+!
+
+  SUBROUTINE test_lcpl(cleanup, fapl, total_error)
+
+  IMPLICIT NONE
+  INTEGER, INTENT(INOUT) :: total_error
+  INTEGER(HID_T), INTENT(IN) :: fapl
+  LOGICAL :: cleanup
+
+  INTEGER(HID_T) :: file_id
+  INTEGER(HID_T) :: group_id
+  INTEGER(HID_T) :: space_id, data_space
+  INTEGER(HID_T) :: dset_id
+  INTEGER(HID_T) :: type_id
+  INTEGER(HID_T) :: lcpl_id
+
+  INTEGER :: cset ! Indicates the character set used for the link’s name.
+  INTEGER :: corder ! Specifies the link’s creation order position.
+  LOGICAL :: f_corder_valid ! Indicates whether the value in corder is valid.
+  INTEGER :: link_type ! Specifies the link class:
+                       !  H5L_TYPE_HARD_F      - Hard link
+                       !  H5L_TYPE_SOFT_F      - Soft link
+                       !  H5L_TYPE_EXTERNAL_F  - External link
+                       !  H5L_TYPE_ERROR _F    - Error
+  TYPE(H5O_TOKEN_T_F) :: token  ! If the link is a hard link, token specifies the object token that the link points to
+  INTEGER(SIZE_T) :: val_size ! If the link is a symbolic link, val_size will be the length of the link value
+
+  CHARACTER(LEN=1024) :: filename = 'tempfile.h5'
+  INTEGER, PARAMETER :: TEST6_DIM1 = 8, TEST6_DIM2 = 7
+  INTEGER(HSIZE_T), DIMENSION(1:2), PARAMETER :: dims = (/TEST6_DIM1,TEST6_DIM2/)
+
+  INTEGER :: encoding
+  INTEGER :: error
+  LOGICAL :: Lexists
+  INTEGER(HSIZE_T), DIMENSION(1:2), PARAMETER :: extend_dim = (/TEST6_DIM1-2,TEST6_DIM2-3/)
+  INTEGER(HSIZE_T), DIMENSION(1:2) :: dimsout, maxdimsout ! dimensions
+
+  INTEGER :: i
+  INTEGER :: tmp1, tmp2
+  INTEGER(HID_T) :: crp_list
+
+!  WRITE(*,*) "link creation property lists (w/new group format)"
+
+
+  ! Actually, intermediate group creation is tested elsewhere (tmisc).
+  ! * Here we only need to test the character encoding property
+
+  ! Create file
+  !  h5_fixname(FILENAME[0], fapl, filename, sizeof filename);
+
+  CALL H5Fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, error, H5P_DEFAULT_F, fapl)
+  CALL check("H5Fcreate_f", error, total_error)
+
+
+  !  Create and link a group with the default LCPL
+
+  CALL H5Gcreate_f(file_id, "/group", group_id, error)
+  CALL check("H5Gcreate_f", error, total_error)
+
+
+  !  Check that its character encoding is the default
+
+  CALL H5Lget_info_f(file_id, "group", &
+       cset, corder, f_corder_valid, link_type, token, val_size, &
+       error, H5P_DEFAULT_F)
+
+! File-wide default character encoding can not yet be set via the file
+! * creation property list and is always ASCII.
+!#define H5F_DEFAULT_CSET H5T_CSET_ASCII  -- FROM H5Fprivate.h --
+
+  CALL verify("H5Lget_info_f",cset, H5T_CSET_ASCII_F,total_error)
+
+  !  Create and commit a datatype with the default LCPL
+  CALL h5tcopy_f(H5T_NATIVE_INTEGER, type_id, error)
+  CALL check("h5tcopy_f",error,total_error)
+  CALL h5tcommit_f(file_id, "/type", type_id, error)
+  CALL check("h5tcommit_f", error, total_error)
+  CALL h5tclose_f(type_id, error)
+  CALL check("h5tclose_f", error, total_error)
+
+
+  !  Check that its character encoding is the default
+  CALL H5Lget_info_f(file_id, "type", &
+       cset, corder, f_corder_valid, link_type, token, val_size, &
+       error)
+  CALL check("h5tclose_f", error, total_error)
+
+! File-wide default character encoding can not yet be set via the file
+! * creation property list and is always ASCII.
+!#define H5F_DEFAULT_CSET H5T_CSET_ASCII  -- FROM H5Fprivate.h --
+
+  CALL verify("H5Lget_info_f",cset, H5T_CSET_ASCII_F,total_error)
+
+  ! Create a dataspace
+  CALL h5screate_simple_f(2, dims, space_id, error)
+  CALL check("h5screate_simple_f",error,total_error)
+  CALL h5pcreate_f(H5P_DATASET_CREATE_F, crp_list, error)
+  CALL h5pset_chunk_f(crp_list, 2, dims, error)
+  CALL h5pcreate_f(H5P_DATASET_CREATE_F, crp_list, error)
+  CALL h5pset_chunk_f(crp_list, 2, dims, error)
+  CALL h5pcreate_f(H5P_DATASET_CREATE_F, crp_list, error)
+  CALL h5pset_chunk_f(crp_list, 2, dims, error)
+
+  !  Create a dataset using the default LCPL
+  CALL h5dcreate_f(file_id, "/dataset", H5T_NATIVE_INTEGER, space_id, dset_id, error, crp_list)
+  CALL check("h5dcreate_f", error, total_error)
+
+  CALL h5dclose_f(dset_id, error)
+  CALL check("h5dclose_f", error, total_error)
+
+  ! Reopen
+
+  CALL H5Dopen_f(file_id, "/dataset", dset_id, error)
+  CALL check("h5dopen_f", error, total_error)
+
+  !   Extend the  dataset
+  CALL H5Dset_extent_f(dset_id, extend_dim, error)
+  CALL check("H5Dset_extent_f", error, total_error)
+  !   Verify the dataspaces
+        !
+          !Get dataset's dataspace handle.
+          !
+  CALL h5dget_space_f(dset_id, data_space, error)
+  CALL check("h5dget_space_f",error,total_error)
+
+  CALL h5sget_simple_extent_dims_f(data_space, dimsout, maxdimsout, error)
+  CALL check("h5sget_simple_extent_dims_f",error, total_error)
+
+  DO i = 1, 2
+     tmp1 = INT(dimsout(i))
+     tmp2 = INT(extend_dim(i))
+     CALL verify("H5Sget_simple_extent_dims", tmp1, tmp2, total_error)
+     tmp1 = INT(maxdimsout(i))
+     tmp2 = INT(dims(i))
+     CALL verify("H5Sget_simple_extent_dims", tmp1, tmp2, total_error)
+  ENDDO
+
+  !  close data set
+
+  CALL h5dclose_f(dset_id, error)
+  CALL check("h5dclose_f", error, total_error)
+
+  !  Check that its character encoding is the default
+  CALL H5Lget_info_f(file_id, "dataset", &
+       cset, corder, f_corder_valid, link_type, token, val_size, &
+       error)
+  CALL check("H5Lget_info_f", error, total_error)
+
+! File-wide default character encoding can not yet be set via the file
+! * creation property list and is always ASCII.
+!#define H5F_DEFAULT_CSET H5T_CSET_ASCII  -- FROM H5Fprivate.h --
+
+  CALL verify("h5tclose_f",cset, H5T_CSET_ASCII_F,total_error)
+
+  ! Create a link creation property list with the UTF-8 character encoding
+  CALL H5Pcreate_f(H5P_LINK_CREATE_F,lcpl_id,error)
+  CALL check("h5Pcreate_f",error,total_error)
+  CALL H5Pset_char_encoding_f(lcpl_id, H5T_CSET_UTF8_F, error)
+  CALL check("H5Pset_char_encoding_f",error, total_error)
+
+  !  Create and link a group with the new LCPL
+  CALL H5Gcreate_f(file_id, "/group2", group_id, error,lcpl_id=lcpl_id)
+  CALL check("H5Gcreate_f", error, total_error)
+  CALL H5Gclose_f(group_id, error)
+  CALL check("H5Gclose_f", error, total_error)
+
+
+  ! Check that its character encoding is UTF-8
+  CALL H5Lget_info_f(file_id, "group2", &
+       cset, corder, f_corder_valid, link_type, token, val_size, &
+       error)
+  CALL check("H5Lget_info_f", error, total_error)
+  CALL verify("H5Lget_info_f",cset, H5T_CSET_UTF8_F,total_error)
+
+
+  !  Create and commit a datatype with the new LCPL
+
+  CALL h5tcopy_f(H5T_NATIVE_INTEGER, type_id, error)
+  CALL check("h5tcopy_f",error,total_error)
+  CALL h5tcommit_f(file_id, "/type2", type_id, error, lcpl_id=lcpl_id)
+  CALL check("h5tcommit_f", error, total_error)
+  CALL h5tclose_f(type_id, error)
+  CALL check("h5tclose_f", error, total_error)
+
+
+  ! Check that its character encoding is UTF-8
+  CALL H5Lget_info_f(file_id, "type2", &
+       cset, corder, f_corder_valid, link_type, token, val_size, &
+       error)
+  CALL check("H5Lget_info_f", error, total_error)
+  CALL verify("H5Lget_info_f",cset, H5T_CSET_UTF8_F,total_error)
+
+  !  Create a dataset using the new LCPL
+  CALL h5dcreate_f(file_id, "/dataset2", H5T_NATIVE_INTEGER, space_id, dset_id, error,lcpl_id=lcpl_id)
+  CALL check("h5dcreate_f", error, total_error)
+
+  CALL h5dclose_f(dset_id, error)
+  CALL check("h5dclose_f", error, total_error)
+
+  CALL H5Pget_char_encoding_f(lcpl_id, encoding, error)
+  CALL check("H5Pget_char_encoding_f", error, total_error)
+  CALL verify("H5Pget_char_encoding_f", encoding, H5T_CSET_UTF8_F, total_error)
+
+  !  Check that its character encoding is UTF-8
+  CALL H5Lget_info_f(file_id, "dataset2", &
+       cset, corder, f_corder_valid, link_type, token, val_size, &
+       error)
+  CALL check("H5Lget_info_f", error, total_error)
+  CALL verify("H5Lget_info_f2",cset, H5T_CSET_UTF8_F,total_error)
+
+  !  Create a new link to the dataset with a different character encoding.
+  CALL H5Pclose_f(lcpl_id, error)
+  CALL check("H5Pclose_f", error, total_error)
+
+  CALL H5Pcreate_f(H5P_LINK_CREATE_F,lcpl_id,error)
+  CALL check("h5Pcreate_f",error,total_error)
+  CALL H5Pset_char_encoding_f(lcpl_id, H5T_CSET_ASCII_F, error)
+  CALL check("H5Pset_char_encoding_f",error, total_error)
+  CALL H5Lcreate_hard_f(file_id, "/dataset2", file_id, "/dataset2_link", error, lcpl_id)
+  CALL check("H5Lcreate_hard_f",error, total_error)
+
+  CALL H5Lexists_f(file_id,"/dataset2_link",Lexists, error)
+  CALL check("H5Lexists",error, total_error)
+  CALL verify("H5Lexists", Lexists,.TRUE.,total_error)
+
+  !  Check that its character encoding is ASCII
+  CALL H5Lget_info_f(file_id, "/dataset2_link", &
+       cset, corder, f_corder_valid, link_type, token, val_size, &
+       error)
+  CALL check("H5Lget_info_f", error, total_error)
+  CALL verify("H5Lget_info_f",cset, H5T_CSET_ASCII_F,total_error)
+
+  !  Check that the first link's encoding hasn't changed
+
+  CALL H5Lget_info_f(file_id, "/dataset2", &
+       cset, corder, f_corder_valid, link_type, token, val_size, &
+       error)
+  CALL check("H5Lget_info_f", error, total_error)
+  CALL verify("H5Lget_info_f3",cset, H5T_CSET_UTF8_F,total_error)
+
+
+  ! Make sure that LCPLs work properly for other API calls:
+  ! H5Lcreate_soft
+
+  CALL H5Pset_char_encoding_f(lcpl_id, H5T_CSET_UTF8_F, error)
+  CALL check("H5Pset_char_encoding_f",error, total_error)
+  CALL H5Lcreate_soft_f("dataset2", file_id, "slink_to_dset2",error,lcpl_id)
+  CALL check("H5Lcreate_soft_f", error, total_error)
+
+  CALL H5Lget_info_f(file_id, "slink_to_dset2", &
+       cset, corder, f_corder_valid, link_type, token, val_size, &
+       error)
+  CALL check("H5Lget_info_f", error, total_error)
+  CALL verify("H5Lget_info_f",cset, H5T_CSET_UTF8_F,total_error)
+
+
+  !  H5Lmove
+  CALL H5Pset_char_encoding_f(lcpl_id, H5T_CSET_ASCII_F, error)
+  CALL check("H5Pset_char_encoding_f",error, total_error)
+
+  CALL H5Lmove_f(file_id, "slink_to_dset2", file_id, "moved_slink", error, lcpl_id, H5P_DEFAULT_F)
+  CALL check("H5Lmove_f",error, total_error)
+
+  CALL H5Lget_info_f(file_id, "moved_slink", &
+       cset, corder, f_corder_valid, link_type, token, val_size, &
+       error)
+  CALL check("H5Lget_info_f", error, total_error)
+  CALL verify("H5Lget_info_f",cset, H5T_CSET_ASCII_F,total_error)
+
+
+  !  H5Lcopy
+
+  CALL H5Pset_char_encoding_f(lcpl_id, H5T_CSET_UTF8_F, error)
+  CALL check("H5Pset_char_encoding_f",error, total_error)
+
+  CALL H5Lcopy_f(file_id, "moved_slink", file_id, "copied_slink", error, lcpl_id)
+
+  CALL H5Lget_info_f(file_id, "copied_slink", &
+       cset, corder, f_corder_valid, link_type, token, val_size, &
+       error)
+  CALL check("H5Lget_info_f", error, total_error)
+  CALL verify("H5Lget_info_f",cset, H5T_CSET_UTF8_F,total_error)
+
+
+  !  H5Lcreate_external
+
+  CALL H5Lcreate_external_f("filename", "path", file_id, "extlink", error, lcpl_id)
+  CALL check("H5Lcreate_external_f", error, total_error)
+
+  CALL H5Lget_info_f(file_id, "extlink", &
+       cset, corder, f_corder_valid, link_type, token, val_size, &
+       error)
+  CALL check("H5Lget_info_f", error, total_error)
+  CALL verify("H5Lget_info_f",cset, H5T_CSET_UTF8_F,total_error)
+
+
+  !  Close open IDs
+
+  CALL H5Pclose_f(lcpl_id, error)
+  CALL check("H5Pclose_f", error, total_error)
+  CALL H5Sclose_f(space_id, error)
+  CALL check("h5Sclose_f",error,total_error)
+  CALL H5Fclose_f(file_id, error)
+  CALL check("H5Fclose_f", error, total_error)
+
+  IF(cleanup) CALL h5_cleanup_f("tempfile", H5P_DEFAULT_F, error)
+  CALL check("h5_cleanup_f", error, total_error)
+
+
+END SUBROUTINE test_lcpl
+
+SUBROUTINE objcopy(fapl, total_error)
+
+  IMPLICIT NONE
+  INTEGER, INTENT(INOUT) :: total_error
+  INTEGER(HID_T), INTENT(IN) :: fapl
+
+  INTEGER(HID_T) :: fapl2, pid
+
+  INTEGER :: flag, cpy_flags
+
+  INTEGER :: error
+
+  flag = H5O_COPY_SHALLOW_HIERARCHY_F
+
+! Copy the file access property list
+  CALL H5Pcopy_f(fapl, fapl2, error)
+  CALL check("H5Pcopy_f", error, total_error)
+
+! Set the "use the latest version of the format" bounds for creating objects in the file
+  CALL H5Pset_libver_bounds_f(fapl2, H5F_LIBVER_LATEST_F, H5F_LIBVER_LATEST_F, error)
+
+  !  create property to pass copy options
+  CALL h5pcreate_f(H5P_OBJECT_COPY_F, pid, error)
+  CALL check("h5pcreate_f",error, total_error)
+
+  !  set options for object copy
+  CALL H5Pset_copy_object_f(pid, flag, error)
+  CALL check("H5Pset_copy_object_f",error, total_error)
+
+  !  Verify object copy flags
+  CALL H5Pget_copy_object_f(pid, cpy_flags, error)
+  CALL check("H5Pget_copy_object_f",error, total_error)
+  CALL verify("H5Pget_copy_object_f", cpy_flags, flag, total_error)
+
+!!$
+!!$  CALL test_copy_option(fcpl_src, fcpl_dst, my_fapl, H5O_COPY_WITHOUT_ATTR_FLAG,
+!!$                       FALSE, "H5Ocopy(): without attributes");
+
+  CALL lapl_nlinks(fapl2, total_error)
+
+END SUBROUTINE objcopy
+
+
+!-------------------------------------------------------------------------
+! * Function:    lapl_nlinks
+! *
+! * Purpose:     Check that the maximum number of soft links can be adjusted
+! *              by the user using the Link Access Property List.
+! *
+! * Return:      Success:        0
+! *
+! *              Failure:        -1
+! *
+! * Programmer:  James Laird
+! *              Tuesday, June 6, 2006
+! *
+! * Modifications:
+! *
+! *-------------------------------------------------------------------------
+!
+
+SUBROUTINE lapl_nlinks( fapl, total_error)
+
+  IMPLICIT NONE
+  INTEGER(HID_T), INTENT(IN) :: fapl
+  INTEGER, INTENT(INOUT) :: total_error
+
+  INTEGER :: error
+
+  INTEGER(HID_T) :: fid = (-1) ! File ID
+  INTEGER(HID_T) :: gid = (-1), gid2 = (-1) ! Group IDs
+  INTEGER(HID_T) :: plist = (-1) !  lapl ID
+  INTEGER(HID_T) :: tid = (-1) !  Other IDs
+  INTEGER(HID_T) :: gapl = (-1), dapl = (-1), tapl = (-1) !  Other property lists
+
+  CHARACTER(LEN=7) :: objname !  Object name
+  INTEGER(size_t) :: name_len !  Length of object name
+  CHARACTER(LEN=12) :: filename = 'TestLinks.h5'
+  INTEGER(size_t) ::              nlinks !  nlinks for H5Pset_nlinks
+  INTEGER(size_t) :: buf_size = 7
+
+!  WRITE(*,*) "adjusting nlinks with LAPL (w/new group format)"
+
+
+  !  Create file
+  CALL h5fcreate_f(FileName, H5F_ACC_TRUNC_F, fid, error, access_prp=fapl)
+  CALL check(" lapl_nlinks.h5fcreate_f",error,total_error)
+
+  !  Create group with short name in file (used as target for links)
+  CALL H5Gcreate_f(fid, "final", gid, error)
+  CALL check(" lapl_nlinks.H5Gcreate_f", error, total_error)
+
+  ! Create chain of soft links to existing object (limited)
+  CALL H5Lcreate_soft_f("final", fid, "soft1", error)
+  CALL H5Lcreate_soft_f("soft1", fid, "soft2", error)
+  CALL H5Lcreate_soft_f("soft2", fid, "soft3", error)
+  CALL H5Lcreate_soft_f("soft3", fid, "soft4", error)
+  CALL H5Lcreate_soft_f("soft4", fid, "soft5", error)
+  CALL H5Lcreate_soft_f("soft5", fid, "soft6", error)
+  CALL H5Lcreate_soft_f("soft6", fid, "soft7", error)
+  CALL H5Lcreate_soft_f("soft7", fid, "soft8", error)
+  CALL H5Lcreate_soft_f("soft8", fid, "soft9", error)
+  CALL H5Lcreate_soft_f("soft9", fid, "soft10", error)
+  CALL H5Lcreate_soft_f("soft10", fid, "soft11", error)
+  CALL H5Lcreate_soft_f("soft11", fid, "soft12", error)
+  CALL H5Lcreate_soft_f("soft12", fid, "soft13", error)
+  CALL H5Lcreate_soft_f("soft13", fid, "soft14", error)
+  CALL H5Lcreate_soft_f("soft14", fid, "soft15", error)
+  CALL H5Lcreate_soft_f("soft15", fid, "soft16", error)
+  CALL H5Lcreate_soft_f("soft16", fid, "soft17", error)
+
+  ! Close objects
+  CALL H5Gclose_f(gid, error)
+  CALL check("h5gclose_f",error,total_error)
+  CALL h5fclose_f(fid, error)
+  CALL check("h5fclose_f",error,total_error)
+
+  ! Open file
+
+  CALL h5fopen_f(FileName, H5F_ACC_RDWR_F, fid, error, fapl)
+  CALL check("h5fopen_f",error,total_error)
+
+  ! Create LAPL with higher-than-usual nlinks value
+  ! Create a non-default lapl with udata set to point to the first group
+
+  CALL H5Pcreate_f(H5P_LINK_ACCESS_F,plist,error)
+  CALL check("h5Pcreate_f",error,total_error)
+  nlinks = 20
+  CALL H5Pset_nlinks_f(plist, nlinks, error)
+  CALL check("H5Pset_nlinks_f",error,total_error)
+  ! Ensure that nlinks was set successfully
+  nlinks = 0
+  CALL H5Pget_nlinks_f(plist, nlinks, error)
+  CALL check("H5Pset_nlinks_f",error,total_error)
+  CALL verify("H5Pset_nlinks_f",INT(nlinks), 20, total_error)
+
+
+  ! Open object through what is normally too many soft links using
+  ! * new property list
+
+  CALL H5Oopen_f(fid,"soft17",gid,error,plist)
+  CALL check("H5Oopen_f",error,total_error)
+
+  ! Check name
+  CALL h5iget_name_f(gid, objname, buf_size, name_len, error)
+  CALL check("h5iget_name_f",error,total_error)
+  CALL verify("h5iget_name_f", TRIM(objname),"/soft17", total_error)
+  ! Create group using soft link
+  CALL H5Gcreate_f(gid, "new_soft", gid2, error)
+  CALL check("H5Gcreate_f", error, total_error)
+
+  !  Close groups
+  CALL H5Gclose_f(gid2, error)
+  CALL check("H5Gclose_f", error, total_error)
+  CALL H5Gclose_f(gid, error)
+  CALL check("H5Gclose_f", error, total_error)
+
+
+  ! Set nlinks to a smaller number
+  nlinks = 4
+  CALL H5Pset_nlinks_f(plist, nlinks, error)
+  CALL check("H5Pset_nlinks_f", error, total_error)
+
+  ! Ensure that nlinks was set successfully
+  nlinks = 0
+
+  CALL H5Pget_nlinks_f(plist, nlinks, error)
+  CALL check("H5Pget_nlinks_f",error,total_error)
+  CALL verify("H5Pget_nlinks_f", INT(nlinks), 4, total_error)
+
+  !  Try opening through what is now too many soft links
+
+  CALL H5Oopen_f(fid,"soft5",gid,error,plist)
+  CALL verify("H5Oopen_f", error, -1, total_error) ! should fail
+
+  !  Open object through lesser soft link
+  CALL H5Oopen_f(fid,"soft4",gid,error,plist)
+  CALL check("H5Oopen_",error,total_error)
+
+  !  Check name
+  CALL h5iget_name_f(gid, objname, buf_size, name_len, error)
+  CALL check("h5iget_name_f",error,total_error)
+  CALL verify("h5iget_name_f", TRIM(objname),"/soft4", total_error)
+
+  !  Test other functions that should use a LAPL
+  nlinks = 20
+  CALL H5Pset_nlinks_f(plist, nlinks, error)
+  CALL check("H5Pset_nlinks_f", error, total_error)
+
+  ! Try copying and moving when both src and dst contain many soft links
+  ! * using a non-default LAPL
+  !
+  CALL H5Lcopy_f(fid, "soft17", fid, "soft17/newer_soft", error, H5P_DEFAULT_F, plist)
+  CALL check("H5Lcopy_f",error,total_error)
+
+  CALL H5Lmove_f(fid, "soft17/newer_soft", fid, "soft17/newest_soft", error, lapl_id=plist)
+  CALL check("H5Lmove_f",error, total_error)
+
+  !  H5Olink
+  CALL H5Olink_f(gid, fid, "soft17/link_to_group", error, H5P_DEFAULT_F, plist)
+  CALL check("H5Olink_f", error, total_error)
+
+  !  H5Lcreate_hard and H5Lcreate_soft
+  CALL H5Lcreate_hard_f(fid, "soft17", fid, "soft17/link2_to_group", error, H5P_DEFAULT_F, plist)
+  CALL check("H5Lcreate_hard_f", error, total_error)
+
+
+  CALL H5Lcreate_soft_f("/soft4", fid, "soft17/soft_link",error, H5P_DEFAULT_F, plist)
+  CALL check("H5Lcreate_soft_f", error, total_error)
+
+  !  H5Ldelete
+  CALL h5ldelete_f(fid, "soft17/soft_link", error, plist)
+  CALL check("H5Ldelete_f", error, total_error)
+
+!!$     H5Lget_val and H5Lget_info
+!!$    if(H5Lget_val(fid, "soft17", NULL, (size_t)0, plist) < 0) TEST_ERROR
+!!$    if(H5Lget_info(fid, "soft17", NULL, plist) < 0) TEST_ERROR
+!!$
+
+  !  H5Lcreate_external and H5Lcreate_ud
+  CALL H5Lcreate_external_f("filename", "path", fid, "soft17/extlink", error, H5P_DEFAULT_F, plist)
+  CALL check("H5Lcreate_external_f", error, total_error)
+
+!!$    if(H5Lregister(UD_rereg_class) < 0) TEST_ERROR
+!!$    if(H5Lcreate_ud(fid, "soft17/udlink", UD_HARD_TYPE, NULL, (size_t)0, H5P_DEFAULT, plist) < 0) TEST_ERROR
+!!$
+    !  Close plist
+  CALL h5pclose_f(plist, error)
+  CALL check("h5pclose_f", error, total_error)
+
+    !  Create a datatype and dataset as targets inside the group
+  CALL h5tcopy_f(H5T_NATIVE_INTEGER, tid, error)
+  CALL check("h5tcopy_f",error,total_error)
+  CALL h5tcommit_f(gid, "datatype", tid, error)
+  CALL check("h5tcommit_f", error, total_error)
+  CALL h5tclose_f(tid, error)
+  CALL check("h5tclose_f", error, total_error)
+
+!!$
+!!$    dims[0] = 2;
+!!$    dims[1] = 2;
+!!$    if((sid = H5Screate_simple(2, dims, NULL)) < 0) TEST_ERROR
+!!$    if((did = H5Dcreate2(gid, "dataset", H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
+!!$    if(H5Dclose(did) < 0) TEST_ERROR
+!!$
+  ! Close group
+  CALL h5gclose_f(gid, error)
+  CALL check("h5gclose_f",error,total_error)
+
+!!$
+!!$     Try to open the objects using too many symlinks with default *APLs
+!!$    H5E_BEGIN_TRY {
+!!$        if((gid = H5Gopen2(fid, "soft17", H5P_DEFAULT)) >= 0)
+!!$            FAIL_PUTS_ERROR("    Should have failed for too many nested links.")
+!!$        if((tid = H5Topen2(fid, "soft17/datatype", H5P_DEFAULT)) >= 0)
+!!$            FAIL_PUTS_ERROR("    Should have failed for too many nested links.")
+!!$        if((did = H5Dopen2(fid, "soft17/dataset", H5P_DEFAULT)) >= 0)
+!!$            FAIL_PUTS_ERROR("    Should have failed for too many nested links.")
+!!$    } H5E_END_TRY
+!!$
+    !  Create property lists with nlinks set
+
+  CALL H5Pcreate_f(H5P_GROUP_ACCESS_F,gapl,error)
+  CALL check("h5Pcreate_f",error,total_error)
+  CALL H5Pcreate_f(H5P_DATATYPE_ACCESS_F,tapl,error)
+  CALL check("h5Pcreate_f",error,total_error)
+  CALL H5Pcreate_f(H5P_DATASET_ACCESS_F,dapl,error)
+  CALL check("h5Pcreate_f",error,total_error)
+
+
+  nlinks = 20
+  CALL H5Pset_nlinks_f(gapl, nlinks, error)
+  CALL check("H5Pset_nlinks_f", error, total_error)
+  CALL H5Pset_nlinks_f(tapl, nlinks, error)
+  CALL check("H5Pset_nlinks_f", error, total_error)
+  CALL H5Pset_nlinks_f(dapl, nlinks, error)
+  CALL check("H5Pset_nlinks_f", error, total_error)
+
+  ! We should now be able to use these property lists to open each kind
+  ! * of object.
+  !
+
+  CALL H5Gopen_f(fid, "soft17", gid, error, gapl)
+  CALL check("H5Gopen_f",error,total_error)
+
+  CALL H5Topen_f(fid, "soft17/datatype", tid, error, tapl)
+  CALL check("H5Gopen_f",error,total_error)
+
+!!$    if((did = H5Dopen2(fid, "soft17/dataset", dapl)) < 0) TEST_ERROR
+
+  !  Close objects
+
+  CALL h5gclose_f(gid, error)
+  CALL check("h5gclose_f",error,total_error)
+  CALL h5tclose_f(tid, error)
+  CALL check("h5tclose_f", error, total_error)
+
+!!$    if(H5Dclose(did) < 0) TEST_ERROR
+!!$
+  !  Close plists
+
+  CALL h5pclose_f(gapl, error)
+  CALL check("h5pclose_f", error, total_error)
+  CALL h5pclose_f(tapl, error)
+  CALL check("h5pclose_f", error, total_error)
+
+!!$    if(H5Pclose(dapl) < 0) TEST_ERROR
+!!$
+!!$     Unregister UD hard link class
+!!$    if(H5Lunregister(UD_HARD_TYPE) < 0) TEST_ERROR
+!!$
+
+  !  Close file
+  CALL H5Fclose_f(fid, error)
+  CALL check("H5Fclose_f", error, total_error)
+
+END SUBROUTINE lapl_nlinks
+
+END MODULE TH5G_1_8
diff --git a/fortran/test/tH5G_1_8.f90 b/fortran/test/tH5G_1_8.f90
deleted file mode 100644
index ab75163..0000000
--- a/fortran/test/tH5G_1_8.f90
+++ /dev/null
@@ -1,2159 +0,0 @@
-!****h* root/fortran/test/tH5G_1_8.f90
-!
-! NAME
-!  tH5G_1_8.f90
-!
-! FUNCTION
-!  Basic testing of Fortran H5G APIs introduced in 1.8.
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! CONTAINS SUBROUTINES
-!  group_test, group_info, timestamps, mklinks, test_move_preserves, lifecycle
-!  cklinks, delete_by_idx, link_info_by_idx_check, test_lcpl, objcopy, 
-!  lapl_nlinks
-!
-!*****
-
-MODULE TH5G_1_8
-
-CONTAINS
-
-SUBROUTINE group_test(cleanup, total_error)
-  USE HDF5 ! This module contains all necessary modules
-  USE TH5_MISC
-
-  IMPLICIT NONE
-  LOGICAL, INTENT(IN)  :: cleanup
-  INTEGER, INTENT(INOUT) :: total_error
-
-  INTEGER(HID_T) :: fapl, fapl2, my_fapl !  File access property lists 
-
-  INTEGER :: error, ret_total_error
-
-!  WRITE(*,*) "TESTING GROUPS"
-  CALL H5Pcreate_f(H5P_FILE_ACCESS_F, fapl, error)
-  CALL check("H5Pcreate_f",error, total_error)
-
-  !  Copy the file access property list 
-  CALL H5Pcopy_f(fapl, fapl2, error)
-  CALL check("H5Pcopy_f",error, total_error)
-
-  !  Set the "use the latest version of the format" bounds for creating objects in the file 
-  CALL H5Pset_libver_bounds_f(fapl2, H5F_LIBVER_LATEST_F, H5F_LIBVER_LATEST_F, error)
-  CALL check("H5Pset_libver_bounds_f",error, total_error)
-
-  !  Check for FAPL to USE 
-  my_fapl = fapl2
-
-  ret_total_error = 0
-  CALL mklinks(fapl2, ret_total_error)
-  CALL write_test_status(ret_total_error, &
-       ' Testing building a file with assorted links', &
-       total_error)
-
-  ret_total_error = 0
-  CALL cklinks(fapl2, ret_total_error)
-  CALL write_test_status(ret_total_error, &
-       ' Testing links are correct and building assorted links', &
-       total_error)
-
-  ret_total_error = 0
-  CALL group_info(cleanup, fapl2, ret_total_error)
-  CALL write_test_status(ret_total_error, &
-       ' Testing create group with creation order indices, test querying group info', &
-       total_error)
-
-! CALL ud_hard_links(fapl2,total_error)
-  ret_total_error = 0
-  CALL timestamps(cleanup, fapl2, ret_total_error)
-  CALL write_test_status(ret_total_error, &
-       ' Testing disabling tracking timestamps for an object', &
-       total_error)
-
-  ret_total_error = 0
-  CALL test_move_preserves(fapl2, ret_total_error)
-  CALL write_test_status(ret_total_error, &
-       ' Testing moving and renaming links preserves their properties', &
-       total_error)
-
-  ret_total_error = 0
-  CALL delete_by_idx(cleanup,fapl2,ret_total_error)
-  CALL write_test_status(ret_total_error, &
-       ' Testing deleting links by index', &
-       total_error)
-
-  ret_total_error = 0
-  CALL test_lcpl(cleanup, fapl, ret_total_error)
-  CALL write_test_status(ret_total_error, &
-       ' Testing link creation property lists', &
-       total_error)
-
-  ret_total_error = 0
-  CALL objcopy(fapl, ret_total_error)
-  CALL write_test_status(ret_total_error, &
-       ' Testing object copy', &
-       total_error)
-
-  ret_total_error = 0
-  CALL lifecycle(cleanup, fapl2, ret_total_error)
-  CALL write_test_status(ret_total_error, &
-       ' Testing adding links to a group follow proper "lifecycle"', &
-       total_error)
-
-  IF(cleanup) CALL h5_cleanup_f("TestLinks", H5P_DEFAULT_F, error)
-  CALL check("h5_cleanup_f", error, total_error)
-
-
-END SUBROUTINE group_test
-
-!-------------------------------------------------------------------------
-! * Function:    group_info
-! *
-! * Purpose:     Create a group with creation order indices and test querying
-! *              group info.
-! *
-! * Return:      Success:        0
-! *              Failure:        -1
-! *
-! * Programmer:  Adapted from C test routines by
-! *              M.S. Breitenfeld
-! *              February 18, 2008
-! *
-! *-------------------------------------------------------------------------
-! 
-
-SUBROUTINE group_info(cleanup, fapl, total_error)
-
-  USE HDF5 ! This module contains all necessary modules
-  USE TH5_MISC
-
-  IMPLICIT NONE
-  INTEGER, INTENT(INOUT) :: total_error
-  INTEGER(HID_T), INTENT(IN) :: fapl
-
-  INTEGER(HID_T) :: gcpl_id !  Group creation property list ID 
-
-  INTEGER :: max_compact !  Maximum # of links to store in group compactly 
-  INTEGER :: min_dense !  Minimum # of links to store in group "densely" 
-
-  INTEGER :: idx_type !  Type of index to operate on 
-  INTEGER :: order, iorder   !  Order within in the index 
-  LOGICAL, DIMENSION(1:2) :: use_index = (/.FALSE.,.TRUE./) !  Use index on creation order values 
-  CHARACTER(LEN=6), PARAMETER :: prefix = 'links0'
-  CHARACTER(LEN=9), PARAMETER :: filename = prefix//'.h5'  !  File name 
-  INTEGER :: Input1
-  INTEGER(HID_T) :: group_id !  Group ID 
-  INTEGER(HID_T) :: soft_group_id !  Group ID for soft links 
-
-  INTEGER :: i !  Local index variables 
-  INTEGER :: storage_type ! Type of storage for links in group:
-                                          ! H5G_STORAGE_TYPE_COMPACT: Compact storage
-                                          ! H5G_STORAGE_TYPE_DENSE: Indexed storage
-                                          ! H5G_STORAGE_TYPE_SYMBOL_TABLE: Symbol tables, the original HDF5 structure
-  INTEGER :: nlinks ! Number of links in group
-  INTEGER :: max_corder ! Current maximum creation order value for group
-
-  INTEGER :: u,v  !  Local index variables 
-  CHARACTER(LEN=2) :: chr2
-  INTEGER(HID_T) :: group_id2, group_id3 !  Group IDs 
-  CHARACTER(LEN=7) :: objname !  Object name 
-  CHARACTER(LEN=7) :: objname2 !  Object name 
-  CHARACTER(LEN=19) :: valname !   Link value 
-  CHARACTER(LEN=12), PARAMETER :: CORDER_GROUP_NAME = "corder_group"
-  CHARACTER(LEN=17), PARAMETER :: CORDER_SOFT_GROUP_NAME =  "corder_soft_group"
-  INTEGER(HID_T) :: file_id !  File ID 
-  INTEGER :: error !  Generic return value 
-  LOGICAL :: mounted
-  LOGICAL :: cleanup
-
-  !  Create group creation property list 
-  CALL H5Pcreate_f(H5P_GROUP_CREATE_F, gcpl_id, error )
-  CALL check("H5Pcreate_f", error, total_error)
-
-  !  Query the group creation properties 
-  CALL H5Pget_link_phase_change_f(gcpl_id, max_compact, min_dense, error)
-  CALL check("H5Pget_link_phase_change_f", error, total_error)
-
-  !  Loop over operating on different indices on link fields 
-  DO idx_type = H5_INDEX_NAME_F, H5_INDEX_CRT_ORDER_F
-     !  Loop over operating in different orders 
-     DO iorder = H5_ITER_INC_F,  H5_ITER_NATIVE_F
-        !  Loop over using index for creation order value 
-        DO i = 1, 2
-           !  Print appropriate test message 
-           IF(idx_type == H5_INDEX_CRT_ORDER_F)THEN
-              IF(iorder == H5_ITER_INC_F)THEN
-                 order = H5_ITER_INC_F
-!!$                 IF(use_index(i))THEN
-!!$                    WRITE(*,'(5x,A)')"query group info by creation order index in increasing order w/creation order index"
-!!$                 ELSE
-!!$                    WRITE(*,'(5x,A)')"query group info by creation order index in increasing order w/o creation order index"
-!!$                 ENDIF
-              ELSE IF (iorder == H5_ITER_DEC_F) THEN
-                 order = H5_ITER_DEC_F
-!!$                 IF(use_index(i))THEN
-!!$                    WRITE(*,'(5x,A)')"query group info by creation order index in decreasing order w/creation order index"
-!!$                 ELSE
-!!$                    WRITE(*,'(5x,A)')"query group info by creation order index in decreasing order w/o creation order index"
-!!$                 ENDIF
-              ELSE
-                 order = H5_ITER_NATIVE_F
-!!$                 IF(use_index(i))THEN
-!!$                    WRITE(*,'(5x,A)')"query group info by creation order index in native order w/creation order index"
-!!$                 ELSE
-!!$                    WRITE(*,'(5x,A)')"query group info by creation order index in native order w/o creation order index"
-!!$                 ENDIF
-              ENDIF
-           ELSE
-              IF(iorder == H5_ITER_INC_F)THEN
-                 order = H5_ITER_INC_F
-!!$                 IF(use_index(i))THEN
-!!$                    WRITE(*,'(5x,A)')"query group info by creation order index in increasing order w/creation order index"
-!!$                 ELSE
-!!$                    WRITE(*,'(5x,A)')"query group info by creation order index in increasing order w/o creation order index"
-!!$                 ENDIF
-              ELSE IF (iorder == H5_ITER_DEC_F) THEN
-                 order = H5_ITER_DEC_F
-!!$                 IF(use_index(i))THEN
-!!$                    WRITE(*,'(5x,A)')"query group info by creation order index in decreasing order w/creation order index"
-!!$                 ELSE
-!!$                    WRITE(*,'(5x,A)')"query group info by creation order index in decreasing order w/o creation order index"
-!!$                 ENDIF
-              ELSE
-                 order = H5_ITER_NATIVE_F
-!!$                 IF(use_index(i))THEN
-!!$                    WRITE(*,'(5x,A)')"query group info by creation order index in native order w/creation order index"
-!!$                 ELSE
-!!$                    WRITE(*,'(5x,A)')"query group info by creation order index in native order w/o creation order index"
-!!$                 ENDIF
-              ENDIF
-           END IF
-
-           !  Create file 
-           CALL H5Fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, error, H5P_DEFAULT_F, fapl)
-           CALL check("H5Fcreate_f", error, total_error)
-
-           !  Set creation order tracking & indexing on group 
-           IF(use_index(i))THEN
-              Input1 = H5P_CRT_ORDER_INDEXED_F
-           ELSE
-              Input1 = 0
-           ENDIF
-           CALL H5Pset_link_creation_order_f(gcpl_id, IOR(H5P_CRT_ORDER_TRACKED_F, Input1), error)
-           CALL check("H5Pset_link_creation_order_f", error, total_error)
-
-           !  Create group with creation order tracking on 
-           CALL H5Gcreate_f(file_id, CORDER_GROUP_NAME, group_id, error, gcpl_id=gcpl_id)
-           CALL check("H5Gcreate_f", error, total_error)
-
-           !  Create group with creation order tracking on for soft links 
-           CALL H5Gcreate_f(file_id, CORDER_SOFT_GROUP_NAME, soft_group_id, error, &
-                OBJECT_NAMELEN_DEFAULT_F, H5P_DEFAULT_F, gcpl_id)
-           CALL check("H5Gcreate_f", error, total_error)
-
-           !  Check for out of bound query by index on empty group, should fail 
-           CALL H5Gget_info_by_idx_f(group_id, ".", H5_INDEX_NAME_F, order, INT(0,HSIZE_T), &
-                storage_type, nlinks, max_corder, error)
-           CALL VERIFY("H5Gget_info_by_idx_f", error, -1, total_error)
-
-           !  Create several links, up to limit of compact form 
-           DO u = 0, max_compact-1
-
-              !  Make name for link 
-              WRITE(chr2,'(I2.2)') u
-              objname = 'fill '//chr2
-
-              !  Create hard link, with group object 
-              CALL H5Gcreate_f(group_id, objname, group_id2, error, OBJECT_NAMELEN_DEFAULT_F, H5P_DEFAULT_F, gcpl_id)
-              CALL check("H5Gcreate_f", error, total_error)
-
-              !  Retrieve group's information 
-              CALL H5Gget_info_f(group_id2, storage_type, nlinks, max_corder, error, mounted)
-              CALL check("H5Gget_info_f", error, total_error)
-
-              !  Check (new/empty) group's information 
-              CALL VERIFY("H5Gget_info_f", storage_type, H5G_STORAGE_TYPE_COMPACT_F, total_error)
-              CALL VERIFY("H5Gget_info_f", max_corder, 0, total_error)
-              CALL VERIFY("H5Gget_info_f", nlinks, 0, total_error)
-              CALL verifyLogical("H5Gget_info_f.mounted", mounted,.FALSE.,total_error)
-
-              !  Retrieve group's information 
-              CALL H5Gget_info_by_name_f(group_id, objname, storage_type, nlinks, max_corder, error, mounted=mounted)
-              CALL check("H5Gget_info_by_name_f", error, total_error)
-
-              !  Check (new/empty) group's information 
-              CALL VERIFY("H5Gget_info_by_name_f", storage_type, H5G_STORAGE_TYPE_COMPACT_F, total_error)
-              CALL VERIFY("H5Gget_info_by_name_f", max_corder, 0, total_error)
-              CALL VERIFY("H5Gget_info_by_name_f", nlinks, 0, total_error)
-              CALL verifyLogical("H5Gget_info_by_name_f.mounted", mounted,.FALSE.,total_error)
-
-              !  Retrieve group's information 
-              CALL H5Gget_info_by_name_f(group_id2, ".", storage_type, nlinks, max_corder, error)
-              CALL check("H5Gget_info_by_name", error, total_error)
-
-              !  Check (new/empty) group's information 
-              CALL VERIFY("H5Gget_info_by_name_f", storage_type, H5G_STORAGE_TYPE_COMPACT_F, total_error)
-              CALL VERIFY("H5Gget_info_by_name_f", max_corder, 0, total_error)
-              CALL VERIFY("H5Gget_info_by_name_f", nlinks, 0, total_error)
-
-              !  Create objects in new group created 
-              DO v = 0, u
-                 !  Make name for link 
-                 WRITE(chr2,'(I2.2)') v
-                 objname2 = 'fill '//chr2
-
-                 !  Create hard link, with group object 
-                 CALL H5Gcreate_f(group_id2, objname2, group_id3, error )
-                 CALL check("H5Gcreate_f", error, total_error)
-
-                 !  Close group created 
-                 CALL H5Gclose_f(group_id3, error)
-                 CALL check("H5Gclose_f", error, total_error)
-              ENDDO
-
-              !  Retrieve group's information 
-              CALL H5Gget_info_f(group_id2, storage_type, nlinks, max_corder, error)
-              CALL check("H5Gget_info_f", error, total_error)
-
-              !  Check (new) group's information 
-              CALL VERIFY("H5Gget_info_f", storage_type, H5G_STORAGE_TYPE_COMPACT_F, total_error)
-              CALL VERIFY("H5Gget_info_f", max_corder, u+1, total_error)
-              CALL VERIFY("H5Gget_info_f", nlinks, u+1, total_error)
-
-              !  Retrieve group's information 
-              CALL H5Gget_info_by_name_f(group_id, objname, storage_type, nlinks, max_corder, error)
-              CALL check("H5Gget_info_by_name_f", error, total_error)
-
-              !  Check (new) group's information 
-              CALL VERIFY("H5Gget_info_by_name_f", storage_type, H5G_STORAGE_TYPE_COMPACT_F, total_error)
-              CALL VERIFY("H5Gget_info_by_name_f",max_corder, u+1, total_error)
-              CALL VERIFY("H5Gget_info_by_name_f", nlinks, u+1, total_error)
-
-              !  Retrieve group's information 
-              CALL H5Gget_info_by_name_f(group_id2, ".", storage_type, nlinks, max_corder, error)
-              CALL check("H5Gget_info_by_name_f", error, total_error)
-
-              !  Check (new) group's information 
-              CALL VERIFY("H5Gget_info_by_name_f", storage_type, H5G_STORAGE_TYPE_COMPACT_F, total_error)
-              CALL VERIFY("H5Gget_info_by_name_f", max_corder, u+1, total_error)
-              CALL VERIFY("H5Gget_info_by_name_f", nlinks, u+1, total_error)
-
-              !  Retrieve group's information 
-              IF(order.NE.H5_ITER_NATIVE_F)THEN
-                 IF(order.EQ.H5_ITER_INC_F) THEN
-                    CALL H5Gget_info_by_idx_f(group_id, ".", idx_type, order, INT(u,HSIZE_T), &
-                         storage_type, nlinks, max_corder, error,lapl_id=H5P_DEFAULT_F, mounted=mounted)
-                    CALL check("H5Gget_info_by_idx_f", error, total_error)
-                    CALL verifyLogical("H5Gget_info_by_idx_f", mounted,.FALSE.,total_error)
-                 ELSE
-                    CALL H5Gget_info_by_idx_f(group_id, ".", idx_type, order, INT(0,HSIZE_T), &
-                         storage_type, nlinks, max_corder, error, mounted=mounted)
-                    CALL verifyLogical("H5Gget_info_by_idx_f", mounted,.FALSE.,total_error)
-                    CALL check("H5Gget_info_by_idx_f", error, total_error)
-                 ENDIF
-              !  Check (new) group's information 
-                 CALL VERIFY("H5Gget_info_by_idx_f", storage_type, H5G_STORAGE_TYPE_COMPACT_F, total_error)
-                 CALL VERIFY("H5Gget_info_by_idx_f", max_corder, u+1, total_error)
-                 CALL VERIFY("H5Gget_info_by_idx_f", nlinks, u+1, total_error)
-              ENDIF
-              !  Close group created 
-              CALL H5Gclose_f(group_id2, error)
-              CALL check("H5Gclose_f", error, total_error)
-
-              !  Retrieve main group's information 
-              CALL H5Gget_info_f(group_id, storage_type, nlinks, max_corder, error)
-              CALL check("H5Gget_info_f", error, total_error)
-
-              !  Check main group's information 
-              CALL VERIFY("H5Gget_info_f", storage_type, H5G_STORAGE_TYPE_COMPACT_F, total_error)
-              CALL VERIFY("H5Gget_info_f", max_corder, u+1, total_error)
-              CALL VERIFY("H5Gget_info_f", nlinks, u+1, total_error)
-
-              !  Retrieve main group's information, by name 
-              CALL H5Gget_info_by_name_f(file_id, CORDER_GROUP_NAME, storage_type, nlinks, max_corder, error)
-              CALL check("H5Gget_info_by_name_f", error, total_error)
-
-              !  Check main group's information 
-              CALL VERIFY("H5Gget_info_by_name_f", storage_type, H5G_STORAGE_TYPE_COMPACT_F, total_error)
-              CALL VERIFY("H5Gget_info_by_name_f", max_corder, u+1, total_error)
-              CALL VERIFY("H5Gget_info_by_name_f", nlinks, u+1, total_error)
-
-              !  Retrieve main group's information, by name 
-              CALL H5Gget_info_by_name_f(group_id, ".", storage_type, nlinks, max_corder, error, H5P_DEFAULT_F)
-              CALL check("H5Gget_info_by_name_f", error, total_error)
-
-              !  Check main group's information 
-              CALL VERIFY("H5Gget_info_by_name_f", storage_type, H5G_STORAGE_TYPE_COMPACT_F, total_error)
-              CALL VERIFY("H5Gget_info_by_name_f", max_corder, u+1, total_error)
-              CALL VERIFY("H5Gget_info_by_name_f", nlinks, u+1, total_error)
-
-              !  Create soft link in another group, to objects in main group 
-              valname = CORDER_GROUP_NAME//objname
-
-              CALL H5Lcreate_soft_f(valname, soft_group_id, objname, error, H5P_DEFAULT_F, H5P_DEFAULT_F)
-
-              !  Retrieve soft link group's information, by name 
-              CALL H5Gget_info_f(soft_group_id, storage_type, nlinks, max_corder, error)
-              CALL check("H5Gget_info_f", error, total_error)
-
-              !  Check soft link group's information 
-              CALL VERIFY("H5Gget_info_f", storage_type, H5G_STORAGE_TYPE_COMPACT_F, total_error)
-              CALL VERIFY("H5Gget_info_f", max_corder, u+1, total_error)
-              CALL VERIFY("H5Gget_info_f", nlinks, u+1, total_error)
-           ENDDO
-
-           !  Close the groups 
-
-              CALL H5Gclose_f(group_id, error)
-              CALL check("H5Gclose_f", error, total_error)
-              CALL H5Gclose_f(soft_group_id, error)
-              CALL check("H5Gclose_f", error, total_error)
-
-              !  Close the file 
-              CALL H5Fclose_f(file_id, error)
-              CALL check("H5Fclose_f", error, total_error)
-           ENDDO
-        ENDDO
-     ENDDO
-
-     !  Free resources 
-     CALL H5Pclose_f(gcpl_id, error)
-     CALL check("H5Pclose_f", error, total_error)
-
-     IF(cleanup) CALL h5_cleanup_f(prefix, H5P_DEFAULT_F, error)
-     CALL check("h5_cleanup_f", error, total_error)
-
-
-   END SUBROUTINE group_info
-
-!-------------------------------------------------------------------------
-! * Function:    timestamps
-! *
-! * Purpose:     Verify that disabling tracking timestamps for an object
-! *              works correctly
-! *
-! *
-! * Programmer:  M.S. Breitenfeld
-! *              February 20, 2008
-! *
-! *-------------------------------------------------------------------------
-! 
-
-   SUBROUTINE timestamps(cleanup, fapl, total_error)
-
-     USE HDF5 ! This module contains all necessary modules
-     USE TH5_MISC
-
-     IMPLICIT NONE
-     INTEGER, INTENT(INOUT) :: total_error
-     INTEGER(HID_T), INTENT(IN) :: fapl
-
-     INTEGER(HID_T) :: file_id ! File ID 
-     INTEGER(HID_T) :: group_id ! Group ID 
-     INTEGER(HID_T) :: group_id2 ! Group ID 
-     INTEGER(HID_T) :: gcpl_id ! Group creation property list ID 
-     INTEGER(HID_T) :: gcpl_id2 ! Group creation property list ID 
-
-     CHARACTER(LEN=6), PARAMETER :: prefix = 'links9'
-     CHARACTER(LEN=9), PARAMETER :: filename = prefix//'.h5'  !  File name 
-     !  Timestamp macros 
-     CHARACTER(LEN=10), PARAMETER :: TIMESTAMP_GROUP_1="timestamp1"
-     CHARACTER(LEN=10), PARAMETER :: TIMESTAMP_GROUP_2="timestamp2"
-     LOGICAL :: track_times
-     LOGICAL :: cleanup
-
-     INTEGER :: error
-
-     !  Print test message 
-!     WRITE(*,*) "timestamps on objects"
-
-     !  Create group creation property list 
-     CALL H5Pcreate_f(H5P_GROUP_CREATE_F, gcpl_id, error )
-     CALL check("H5Pcreate_f", error, total_error)
-
-     !  Query the object timestamp setting 
-     CALL H5Pget_obj_track_times_f(gcpl_id, track_times, error)
-     CALL check("H5Pget_obj_track_times_f", error, total_error)
-
-     ! Check default timestamp information 
-     CALL VerifyLogical("H5Pget_obj_track_times",track_times,.TRUE.,total_error)
-
-     !  Set a non-default object timestamp setting 
-     CALL H5Pset_obj_track_times_f(gcpl_id, .FALSE., error)
-     CALL check("H5Pset_obj_track_times_f", error, total_error)
-
-     !  Query the object timestamp setting 
-     CALL H5Pget_obj_track_times_f(gcpl_id, track_times, error)
-     CALL check("H5Pget_obj_track_times_f", error, total_error)
-
-     !  Check default timestamp information 
-     CALL VerifyLogical("H5Pget_obj_track_times",track_times,.FALSE.,total_error)
-
-     !  Create file 
-     !h5_fixname(FILENAME[0], fapl, filename, sizeof filename);
-
-     CALL H5Fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, error, H5P_DEFAULT_F, fapl)
-     CALL check("h5fcreate_f",error,total_error)
-
-    !  Create group with non-default object timestamp setting 
-     CALL h5gcreate_f(file_id, TIMESTAMP_GROUP_1, group_id, error, &
-          OBJECT_NAMELEN_DEFAULT_F, H5P_DEFAULT_F, gcpl_id, H5P_DEFAULT_F)
-     CALL check("h5fcreate_f",error,total_error)
-
-    !  Close the group creation property list 
-     CALL H5Pclose_f(gcpl_id, error)
-     CALL check("H5Pclose_f", error, total_error)
-
-    !  Create group with default object timestamp setting 
-     CALL h5gcreate_f(file_id, TIMESTAMP_GROUP_2, group_id2, error, &
-          OBJECT_NAMELEN_DEFAULT_F, H5P_DEFAULT_F, H5P_DEFAULT_F, H5P_DEFAULT_F)
-     CALL check("h5fcreate_f",error,total_error)
-
-    !  Retrieve the new groups' creation properties 
-     CALL H5Gget_create_plist_f(group_id, gcpl_id, error)
-     CALL check("H5Gget_create_plist", error, total_error)
-     CALL H5Gget_create_plist_f(group_id2, gcpl_id2, error)
-     CALL check("H5Gget_create_plist", error, total_error)
-
-    !  Query & verify the object timestamp settings 
-     CALL H5Pget_obj_track_times_f(gcpl_id, track_times, error)
-     CALL check("H5Pget_obj_track_times_f", error, total_error)
-     CALL VerifyLogical("H5Pget_obj_track_times1",track_times,.FALSE.,total_error)
-     CALL H5Pget_obj_track_times_f(gcpl_id2, track_times, error)
-     CALL check("H5Pget_obj_track_times_f", error, total_error)
-     CALL VerifyLogical("H5Pget_obj_track_times2",track_times,.TRUE.,total_error)
-
-!     Query the object information for each group 
-!    if(H5Oget_info(group_id, &oinfo) < 0) TEST_ERROR
-!    if(H5Oget_info(group_id2, &oinfo2) < 0) TEST_ERROR
-
-!!$     Sanity check object information for each group 
-!!$    if(oinfo.atime != 0) TEST_ERROR
-!!$    if(oinfo.mtime != 0) TEST_ERROR
-!!$    if(oinfo.ctime != 0) TEST_ERROR
-!!$    if(oinfo.btime != 0) TEST_ERROR
-!!$    if(oinfo.atime == oinfo2.atime) TEST_ERROR
-!!$    if(oinfo.mtime == oinfo2.mtime) TEST_ERROR
-!!$    if(oinfo.ctime == oinfo2.ctime) TEST_ERROR
-!!$    if(oinfo.btime == oinfo2.btime) TEST_ERROR
-!!$    if((oinfo.hdr.flags & H5O_HDR_STORE_TIMES) != 0) TEST_ERROR
-!!$    if((oinfo2.hdr.flags & H5O_HDR_STORE_TIMES) == 0) TEST_ERROR
-!!$    if(oinfo.hdr.space.total >= oinfo2.hdr.space.total) TEST_ERROR
-!!$    if(oinfo.hdr.space.meta >= oinfo2.hdr.space.meta) TEST_ERROR
-
-     !  Close the property lists 
-     CALL H5Pclose_f(gcpl_id, error)
-     CALL check("H5Pclose_f", error, total_error)
-     CALL H5Pclose_f(gcpl_id2, error)
-     CALL check("H5Pclose_f", error, total_error)
-
-     !  Close the groups 
-     CALL H5Gclose_f(group_id, error)
-     CALL check("H5Gclose_f", error, total_error)
-     CALL H5Gclose_f(group_id2, error)
-     CALL check("H5Gclose_f", error, total_error)
-
-     ! Close the file 
-     CALL H5Fclose_f(file_id, error)
-     CALL check("H5Fclose_f", error, total_error)
-
-     ! Re-open the file 
-
-     CALL h5fopen_f(FileName, H5F_ACC_RDONLY_F, file_id, error, H5P_DEFAULT_F)
-     CALL check("h5fopen_f",error,total_error)
-
-     ! Open groups 
-     CALL H5Gopen_f(file_id, TIMESTAMP_GROUP_1, group_id, error) ! with no optional param.
-     CALL check("H5Gopen_f", error, total_error)
-     CALL H5Gopen_f(file_id, TIMESTAMP_GROUP_2, group_id2, error, H5P_DEFAULT_F) ! with optional param.
-     CALL check("H5Gopen_f", error, total_error)
-
-    !  Retrieve the new groups' creation properties 
-     CALL H5Gget_create_plist_f(group_id, gcpl_id, error)
-     CALL check("H5Gget_create_plist", error, total_error)
-     CALL H5Gget_create_plist_f(group_id2, gcpl_id2, error)
-     CALL check("H5Gget_create_plist", error, total_error)
-
-    !  Query & verify the object timestamp settings 
-
-     CALL H5Pget_obj_track_times_f(gcpl_id, track_times, error)
-     CALL check("H5Pget_obj_track_times_f", error, total_error)
-     CALL VerifyLogical("H5Pget_obj_track_times1",track_times,.FALSE.,total_error)
-     CALL H5Pget_obj_track_times_f(gcpl_id2, track_times, error)
-     CALL check("H5Pget_obj_track_times_f", error, total_error)
-     CALL VerifyLogical("H5Pget_obj_track_times2",track_times,.TRUE.,total_error)
-!!$
-!!$     Query the object information for each group 
-!!$    if(H5Oget_info(group_id, &oinfo) < 0) TEST_ERROR
-!!$    if(H5Oget_info(group_id2, &oinfo2) < 0) TEST_ERROR
-!!$
-!!$     Sanity check object information for each group 
-!!$    if(oinfo.atime != 0) TEST_ERROR
-!!$    if(oinfo.mtime != 0) TEST_ERROR
-!!$    if(oinfo.ctime != 0) TEST_ERROR
-!!$    if(oinfo.btime != 0) TEST_ERROR
-!!$    if(oinfo.atime == oinfo2.atime) TEST_ERROR
-!!$    if(oinfo.mtime == oinfo2.mtime) TEST_ERROR
-!!$    if(oinfo.ctime == oinfo2.ctime) TEST_ERROR
-!!$    if(oinfo.btime == oinfo2.btime) TEST_ERROR
-!!$    if((oinfo.hdr.flags & H5O_HDR_STORE_TIMES) != 0) TEST_ERROR
-!!$    if((oinfo2.hdr.flags & H5O_HDR_STORE_TIMES) == 0) TEST_ERROR
-!!$    if(oinfo.hdr.space.total >= oinfo2.hdr.space.total) TEST_ERROR
-!!$    if(oinfo.hdr.space.meta >= oinfo2.hdr.space.meta) TEST_ERROR
-
-     !  Close the property lists 
-     CALL H5Pclose_f(gcpl_id, error)
-     CALL check("H5Pclose_f", error, total_error)
-     CALL H5Pclose_f(gcpl_id2, error)
-     CALL check("H5Pclose_f", error, total_error)
-
-     !  Close the groups 
-     CALL H5Gclose_f(group_id, error)
-     CALL check("H5Gclose_f", error, total_error)
-     CALL H5Gclose_f(group_id2, error)
-     CALL check("H5Gclose_f", error, total_error)
-
-     ! Close the file 
-     CALL H5Fclose_f(file_id, error)
-     CALL check("H5Fclose_f", error, total_error)
-
-     IF(cleanup) CALL h5_cleanup_f(prefix, H5P_DEFAULT_F, error)
-     CALL check("h5_cleanup_f", error, total_error)
-
-   END SUBROUTINE timestamps
-
-!-------------------------------------------------------------------------
-! * Function:	mklinks
-! *
-! * Purpose:	Build a file with assorted links.
-! *
-! *
-! * Programmer:	Adapted from C test by:
-! *             M.S. Breitenfeld
-! *
-! * Modifications:
-! *
-! *-------------------------------------------------------------------------
-! 
-
-   SUBROUTINE mklinks(fapl, total_error)
-
-     USE HDF5 ! This module contains all necessary modules
-     USE TH5_MISC
-
-     IMPLICIT NONE
-     INTEGER, INTENT(INOUT) :: total_error
-     INTEGER(HID_T), INTENT(IN) :: fapl
-
-     INTEGER(HID_T) :: file, scalar, grp, d1
-     CHARACTER(LEN=12), PARAMETER :: filename ='TestLinks.h5'
-     INTEGER(HSIZE_T), DIMENSION(1) :: adims2 = (/1/) ! Attribute dimension
-     INTEGER ::   arank = 1                      ! Attribure rank
-     INTEGER :: error
-
-     INTEGER :: cset ! Indicates the character set used for the link’s name.
-     INTEGER :: corder ! Specifies the link’s creation order position.
-     LOGICAL :: f_corder_valid ! Indicates whether the value in corder is valid.
-     INTEGER :: link_type ! Specifies the link class:
-                          !  H5L_TYPE_HARD_F      - Hard link
-                          !  H5L_TYPE_SOFT_F      - Soft link
-                          !  H5L_TYPE_EXTERNAL_F  - External link
-                          !  H5L_TYPE_ERROR _F    - Error
-     INTEGER(HADDR_T) :: address  ! If the link is a hard link, address specifies the file address that the link points to
-     INTEGER(SIZE_T) :: val_size ! If the link is a symbolic link, val_size will be the length of the link value
-
-
-!     WRITE(*,*) "link creation (w/new group format)"
-
-     !  Create a file 
-     CALL h5fcreate_f(FileName, H5F_ACC_TRUNC_F, file, error, H5P_DEFAULT_F, fapl)
-     CALL check("mklinks.h5fcreate_f",error,total_error)
-     CALL h5screate_simple_f(arank, adims2, scalar, error)
-     CALL check("mklinks.h5screate_simple_f",error,total_error)
-
-     ! Create a group 
-     CALL H5Gcreate_f(file, "grp1", grp, error)
-     CALL check("H5Gcreate_f", error, total_error)
-     CALL H5Gclose_f(grp, error)
-     CALL check("h5gclose_f",error,total_error)
-
-     ! Create a dataset 
-     CALL h5dcreate_f(file, "d1", H5T_NATIVE_INTEGER, scalar, d1, error)
-     CALL check("h5dcreate_f",error,total_error)
-     CALL h5dclose_f(d1, error)
-     CALL check("h5dclose_f",error,total_error)
-
-     ! Create a hard link 
-     CALL H5Lcreate_hard_f(file, "d1", INT(H5L_SAME_LOC_F,HID_T), "grp1/hard", error)
-     CALL check("H5Lcreate_hard_f", error, total_error)
-
-     ! Create a symbolic link 
-     CALL H5Lcreate_soft_f("/d1", file, "grp1/soft",error)
-     CALL check("H5Lcreate_soft_f", error, total_error)
-
-     CALL H5Lget_info_f(file, "grp1/soft", &
-          cset, corder, f_corder_valid, link_type, address, val_size, &
-          error, H5P_DEFAULT_F)
-     CALL check("H5Lget_info_f",error,total_error)
-
-!     CALL VerifyLogical("H5Lget_info_by_idx_f11", f_corder_valid, .TRUE., total_error)
-
-     CALL VERIFY("H5Lget_info_by_idx_f", H5L_TYPE_SOFT_F, link_type, total_error)
-     CALL VERIFY("H5Lget_info_by_idx_f", cset, H5T_CSET_ASCII_F, total_error)
-     ! should be '/d1' + NULL character = 4
-     CALL VERIFY("H5Lget_info_by_idx_f", INT(val_size), 4, total_error)
-
-    ! Create a symbolic link to something that doesn't exist 
-
-     CALL H5Lcreate_soft_f("foobar", file, "grp1/dangle",error)
-
-    ! Create a recursive symbolic link 
-     CALL H5Lcreate_soft_f("/grp1/recursive", file, "/grp1/recursive",error)
-
-    ! Close 
-     CALL h5sclose_f(scalar, error)
-     CALL check("h5sclose_f",error,total_error)
-     CALL h5fclose_f(file, error)
-     CALL check("h5fclose_f",error,total_error)
-
-  END SUBROUTINE mklinks
-
-!-------------------------------------------------------------------------
-! * Function:    test_move_preserves
-! *
-! * Purpose:     Tests that moving and renaming links preserves their
-! *              properties.
-! *
-! * Programmer:  M.S. Breitenfeld
-! *              March 3, 2008
-! *
-! * Modifications:
-! *
-! *-------------------------------------------------------------------------
-! 
-
-  SUBROUTINE test_move_preserves(fapl_id, total_error)
-
-    USE HDF5 ! This module contains all necessary modules
-    USE TH5_MISC
-
-    IMPLICIT NONE
-    INTEGER, INTENT(INOUT) :: total_error
-    INTEGER(HID_T), INTENT(IN) :: fapl_id
-
-    INTEGER(HID_T):: file_id
-    INTEGER(HID_T):: group_id
-    INTEGER(HID_T):: fcpl_id !  Group creation property list ID 
-    INTEGER(HID_T):: lcpl_id
-    !H5O_info_t oinfo;
-    !H5L_info_t linfo;
-    INTEGER :: old_cset
-    INTEGER :: old_corder
-    !H5T_cset_t old_cset;
-    !int64_t old_corder;          Creation order value of link 
-    !time_t old_modification_time;
-    !time_t curr_time;
-    !unsigned crt_order_flags;    Status of creation order info for GCPL 
-    !char filename[1024];
-
-    INTEGER :: crt_order_flags !  Status of creation order info for GCPL 
-    CHARACTER(LEN=12), PARAMETER :: filename = 'TestLinks.h5'
-
-    INTEGER :: cset ! Indicates the character set used for the link’s name.
-    INTEGER :: corder ! Specifies the link’s creation order position.
-    LOGICAL :: f_corder_valid ! Indicates whether the value in corder is valid.
-    INTEGER :: link_type ! Specifies the link class:
-                         !  H5L_TYPE_HARD_F      - Hard link
-                         !  H5L_TYPE_SOFT_F      - Soft link
-                         !  H5L_TYPE_EXTERNAL_F  - External link
-                         !  H5L_TYPE_ERROR _F    - Error
-    INTEGER(HADDR_T) :: address  ! If the link is a hard link, address specifies the file address that the link points to
-    INTEGER(SIZE_T) :: val_size ! If the link is a symbolic link, val_size will be the length of the link value
-
-    INTEGER :: error
-
-!    WRITE(*,*) "moving and copying links preserves their properties (w/new group format)"
-
-    ! Create a file creation property list with creation order stored for links
-    ! * in the root group
-    ! 
-
-    CALL H5Pcreate_f(H5P_FILE_CREATE_F, fcpl_id, error)
-    CALL check("H5Pcreate_f",error, total_error)
-
-    CALL H5Pget_link_creation_order_f(fcpl_id, crt_order_flags, error)
-    CALL check("H5Pget_link_creation_order_f",error, total_error)
-    CALL VERIFY("H5Pget_link_creation_order_f",crt_order_flags,0, total_error)
-
-    CALL H5Pset_link_creation_order_f(fcpl_id, H5P_CRT_ORDER_TRACKED_F, error)
-    CALL check("H5Pset_link_creation_order_f", error, total_error)
-
-    CALL H5Pget_link_creation_order_f(fcpl_id, crt_order_flags, error)
-    CALL check("H5Pget_link_creation_order_f",error, total_error)
-    CALL VERIFY("H5Pget_link_creation_order_f",crt_order_flags, H5P_CRT_ORDER_TRACKED_F, total_error)
-
-    ! Create file 
-    ! (with creation order tracking for the root group) 
-
-    CALL h5fcreate_f(FileName, H5F_ACC_TRUNC_F, file_id, error, fcpl_id, fapl_id)
-    CALL check("h5fcreate_f",error,total_error)
-
-    ! Create a link creation property list with the UTF-8 character encoding 
-    CALL H5Pcreate_f(H5P_LINK_CREATE_F, lcpl_id, error)
-    CALL check("H5Pcreate_f",error, total_error)
-
-    CALL H5Pset_char_encoding_f(lcpl_id, H5T_CSET_UTF8_F, error)
-    CALL check("H5Pset_char_encoding_f",error, total_error)
-
-    ! Create a group with that lcpl 
-    CALL H5Gcreate_f(file_id, "group", group_id, error,lcpl_id=lcpl_id, gcpl_id=H5P_DEFAULT_F, gapl_id=H5P_DEFAULT_F)
-    CALL check("H5Gcreate_f", error, total_error)
-    CALL H5Gclose_f(group_id, error)
-    CALL check("H5Gclose_f", error, total_error)
-
-    !  Get the group's link's information 
-    CALL H5Lget_info_f(file_id, "group", &
-         cset, corder, f_corder_valid, link_type, address, val_size, &
-         error, H5P_DEFAULT_F)
-    CALL check("H5Lget_info_f",error,total_error)
-
-!    if(H5Oget_info_by_name(file_id, "group", &oinfo, H5P_DEFAULT) < 0) TEST_ERROR
-
-    old_cset = cset
-    CALL VERIFY("H5Lget_info_f",old_cset,H5T_CSET_UTF8_F,total_error)
-    CALL VerifyLogical("H5Lget_info_f",f_corder_valid,.TRUE.,total_error)
-    old_corder = corder;
-    CALL VERIFY("H5Lget_info_f",old_corder,0,total_error)
-
-!    old_modification_time = oinfo.mtime;
-
-!     If this test happens too quickly, the times will all be the same.  Make sure the time changes. 
-!    curr_time = HDtime(NULL);
-!    while(HDtime(NULL) <= curr_time)
-!        ;
-
-!     Close the file and reopen it 
-    CALL H5Fclose_f(file_id, error)
-    CALL check("H5Fclose_f", error, total_error)
-
-!!$    if((file_id = H5Fopen(filename, H5F_ACC_RDWR, fapl_id)) < 0) TEST_ERROR
-!!$
-!!$     Get the link's character set & modification time .  They should be unchanged 
-!!$    if(H5Lget_info(file_id, "group", &linfo, H5P_DEFAULT) < 0) TEST_ERROR
-!!$    if(H5Oget_info_by_name(file_id, "group", &oinfo, H5P_DEFAULT) < 0) TEST_ERROR
-!!$    if(old_modification_time != oinfo.mtime) TEST_ERROR
-!!$    if(old_cset != linfo.cset) TEST_ERROR
-!!$    if(linfo.corder_valid != TRUE) TEST_ERROR
-!!$    if(old_corder != linfo.corder) TEST_ERROR
-!!$
-!!$     Create a new link to the group.  It should have a different creation order value but the same modification time 
-!!$    if(H5Lcreate_hard(file_id, "group", file_id, "group2", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
-!!$    if(H5Oget_info_by_name(file_id, "group2", &oinfo, H5P_DEFAULT) < 0) TEST_ERROR
-!!$    if(old_modification_time != oinfo.mtime) TEST_ERROR
-!!$    if(H5Lget_info(file_id, "group2", &linfo, H5P_DEFAULT) < 0) TEST_ERROR
-!!$    if(old_corder == linfo.corder) TEST_ERROR
-!!$    if(linfo.corder_valid != TRUE) TEST_ERROR
-!!$    if(linfo.corder != 1) TEST_ERROR
-!!$    if(linfo.cset != H5T_CSET_ASCII) TEST_ERROR
-!!$
-!!$     Copy the first link to a UTF-8 name.
-!!$     *  Its creation order value should be different, but modification time
-!!$     * should not change.
-!!$     
-!!$    if(H5Lcopy(file_id, "group", file_id, "group_copied", lcpl_id, H5P_DEFAULT) < 0) TEST_ERROR
-!!$    if(H5Oget_info_by_name(file_id, "group_copied", &oinfo, H5P_DEFAULT) < 0) TEST_ERROR
-!!$    if(old_modification_time != oinfo.mtime) TEST_ERROR
-!!$    if(H5Lget_info(file_id, "group_copied", &linfo, H5P_DEFAULT) < 0) TEST_ERROR
-!!$    if(linfo.corder_valid != TRUE) TEST_ERROR
-!!$    if(linfo.corder != 2) TEST_ERROR
-!!$
-!!$     Check that its character encoding is UTF-8 
-!!$    if(linfo.cset != H5T_CSET_UTF8) TEST_ERROR
-!!$
-!!$     Move the link with the default property list. 
-!!$    if(H5Lmove(file_id, "group_copied", file_id, "group_copied2", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
-!!$    if(H5Oget_info_by_name(file_id, "group_copied2", &oinfo, H5P_DEFAULT) < 0) TEST_ERROR
-!!$    if(old_modification_time != oinfo.mtime) TEST_ERROR
-!!$    if(H5Lget_info(file_id, "group_copied2", &linfo, H5P_DEFAULT) < 0) TEST_ERROR
-!!$    if(linfo.corder_valid != TRUE) TEST_ERROR
-!!$    if(linfo.corder != 3) TEST_ERROR
-!!$
-!!$     Check that its character encoding is not UTF-8 
-!!$    if(linfo.cset == H5T_CSET_UTF8) TEST_ERROR
-!!$
-!!$     Check that the original link is unchanged 
-!!$    if(H5Oget_info_by_name(file_id, "group", &oinfo, H5P_DEFAULT) < 0) TEST_ERROR
-!!$    if(old_modification_time != oinfo.mtime) TEST_ERROR
-!!$    if(H5Lget_info(file_id, "group", &linfo, H5P_DEFAULT) < 0) TEST_ERROR
-!!$    if(linfo.corder_valid != TRUE) TEST_ERROR
-!!$    if(old_corder != linfo.corder) TEST_ERROR
-!!$    if(linfo.cset != H5T_CSET_UTF8) TEST_ERROR
-!!$
-!!$     Move the first link to a UTF-8 name.
-!!$     *  Its creation order value will change, but modification time should not
-!!$     *  change. 
-!!$    if(H5Lmove(file_id, "group", file_id, "group_moved", lcpl_id, H5P_DEFAULT) < 0) TEST_ERROR
-!!$    if(H5Oget_info_by_name(file_id, "group_moved", &oinfo, H5P_DEFAULT) < 0) TEST_ERROR
-!!$    if(old_modification_time != oinfo.mtime) TEST_ERROR
-!!$    if(H5Lget_info(file_id, "group_moved", &linfo, H5P_DEFAULT) < 0) TEST_ERROR
-!!$    if(linfo.corder_valid != TRUE) TEST_ERROR
-!!$    if(linfo.corder != 4) TEST_ERROR
-!!$
-!!$     Check that its character encoding is UTF-8 
-!!$    if(linfo.cset != H5T_CSET_UTF8) TEST_ERROR
-!!$
-!!$     Move the link again using the default property list. 
-!!$    if(H5Lmove(file_id, "group_moved", file_id, "group_moved_again", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
-!!$    if(H5Oget_info_by_name(file_id, "group_moved_again", &oinfo, H5P_DEFAULT) < 0) TEST_ERROR
-!!$    if(old_modification_time != oinfo.mtime) TEST_ERROR
-!!$    if(H5Lget_info(file_id, "group_moved_again", &linfo, H5P_DEFAULT) < 0) TEST_ERROR
-!!$    if(linfo.corder_valid != TRUE) TEST_ERROR
-!!$    if(linfo.corder != 5) TEST_ERROR
-!!$
-!!$     Check that its character encoding is not UTF-8 
-!!$    if(linfo.cset == H5T_CSET_UTF8) TEST_ERROR
-
-    !  Close open IDs 
-     CALL H5Pclose_f(fcpl_id, error)
-     CALL check("H5Pclose_f", error, total_error)
-     CALL H5Pclose_f(lcpl_id, error)
-     CALL check("H5Pclose_f", error, total_error)
-
-    ! if(H5Fclose(file_id) < 0) TEST_ERROR
-
-   END SUBROUTINE test_move_preserves
-
-!-------------------------------------------------------------------------
-! * Function:    lifecycle
-! *
-! * Purpose:     Test that adding links to a group follow proper "lifecycle"
-! *              of empty->compact->symbol table->compact->empty.  (As group
-! *              is created, links are added, then links removed)
-! *
-! * Return:      Success:        0
-! *
-! *              Failure:        -1
-! *
-! * Programmer:  Quincey Koziol
-! *              Monday, October 17, 2005
-! *
-! *-------------------------------------------------------------------------
-! 
-SUBROUTINE lifecycle(cleanup, fapl2, total_error)
-
-
-  USE HDF5 ! This module contains all necessary modules
-  USE TH5_MISC
-
-  IMPLICIT NONE
-  INTEGER, INTENT(INOUT) :: total_error
-  INTEGER(HID_T), INTENT(IN) :: fapl2
-  INTEGER :: error
-
-  INTEGER, PARAMETER :: NAME_BUF_SIZE =7
-
-  INTEGER(HID_T) :: fid            ! File ID 
-  INTEGER(HID_T) :: gid            ! Group ID 
-  INTEGER(HID_T) :: gcpl           ! Group creation property list ID 
-  INTEGER(size_t) :: lheap_size_hint ! Local heap size hint 
-  INTEGER :: max_compact            ! Maximum # of links to store in group compactly 
-  INTEGER :: min_dense              ! Minimum # of links to store in group "densely" 
-  INTEGER :: est_num_entries        ! Estimated # of entries in group 
-  INTEGER :: est_name_len           ! Estimated length of entry name 
-  CHARACTER(LEN=NAME_BUF_SIZE) :: filename = 'fixx.h5'
-  INTEGER(SIZE_T) :: LIFECYCLE_LOCAL_HEAP_SIZE_HINT = 256
-  INTEGER :: LIFECYCLE_MAX_COMPACT = 4
-  INTEGER :: LIFECYCLE_MIN_DENSE = 3
-  INTEGER :: LIFECYCLE_EST_NUM_ENTRIES = 4
-  INTEGER :: LIFECYCLE_EST_NAME_LEN=8
-  CHARACTER(LEN=3) :: LIFECYCLE_TOP_GROUP="top"
-! These value are taken from H5Gprivate.h
-  INTEGER :: H5G_CRT_GINFO_MAX_COMPACT = 8
-  INTEGER :: H5G_CRT_GINFO_MIN_DENSE = 6
-  INTEGER :: H5G_CRT_GINFO_EST_NUM_ENTRIES = 4
-  INTEGER :: H5G_CRT_GINFO_EST_NAME_LEN = 8
-  logical :: cleanup
-
-!  WRITE(*,*) 'group lifecycle'
-
-  !  Create file 
-  CALL H5Fcreate_f(filename, H5F_ACC_TRUNC_F, fid, error, access_prp=fapl2)
-  CALL check("H5Fcreate_f",error,total_error)
-
-  ! Close file 
-  CALL H5Fclose_f(fid,error)
-  CALL check("H5Fclose_f",error,total_error)
-
-  !  Get size of file as empty 
-  ! if((empty_size = h5_get_file_size(filename)) < 0) TEST_ERROR
-
-  !  Re-open file 
-
-  CALL H5Fopen_f(filename, H5F_ACC_RDWR_F, fid, error,access_prp=fapl2)
-  CALL check("H5Fopen_f",error,total_error)
-
-
-  !  Set up group creation property list 
-  CALL H5Pcreate_f(H5P_GROUP_CREATE_F,gcpl,error)
-  CALL check("H5Pcreate_f",error,total_error)
-
-
-  !  Query default group creation property settings 
-  CALL H5Pget_local_heap_size_hint_f(gcpl, lheap_size_hint, error)
-  CALL check("H5Pget_local_heap_size_hint_f",error,total_error)
-  CALL verify("H5Pget_local_heap_size_hint_f", INT(lheap_size_hint),0,total_error)
-
-  CALL H5Pget_link_phase_change_f(gcpl, max_compact, min_dense, error)
-  CALL check("H5Pget_link_phase_change_f", error, total_error)
-  CALL verify("H5Pget_link_phase_change_f", max_compact, H5G_CRT_GINFO_MAX_COMPACT,total_error)
-  CALL verify("H5Pget_link_phase_change_f", min_dense, H5G_CRT_GINFO_MIN_DENSE,total_error)
-
-
-  CALL H5Pget_est_link_info_f(gcpl, est_num_entries, est_name_len, error)
-  CALL check("H5Pget_est_link_info_f", error, total_error)
-  CALL verify("H5Pget_est_link_info_f", est_num_entries, H5G_CRT_GINFO_EST_NUM_ENTRIES,total_error)
-  CALL verify("H5Pget_est_link_info_f", est_name_len, H5G_CRT_GINFO_EST_NAME_LEN,total_error)
-
-
-  ! Set GCPL parameters 
-
-  CALL H5Pset_local_heap_size_hint_f(gcpl, LIFECYCLE_LOCAL_HEAP_SIZE_HINT, error)
-  CALL check("H5Pset_local_heap_size_hint_f", error, total_error)
-  CALL H5Pset_link_phase_change_f(gcpl, LIFECYCLE_MAX_COMPACT, LIFECYCLE_MIN_DENSE, error)
-  CALL check("H5Pset_link_phase_change_f", error, total_error)
-  CALL H5Pset_est_link_info_f(gcpl, LIFECYCLE_EST_NUM_ENTRIES, LIFECYCLE_EST_NAME_LEN, error)
-  CALL check("H5Pset_est_link_info_f", error, total_error)
-
-  !  Create group for testing lifecycle 
-
-  CALL H5Gcreate_f(fid, LIFECYCLE_TOP_GROUP, gid, error, gcpl_id=gcpl)
-  CALL check("H5Gcreate_f", error, total_error)
-
-  !  Query group creation property settings 
-
-  CALL H5Pget_local_heap_size_hint_f(gcpl, lheap_size_hint, error)
-  CALL check("H5Pget_local_heap_size_hint_f",error,total_error)
-  CALL verify("H5Pget_local_heap_size_hint_f", INT(lheap_size_hint),INT(LIFECYCLE_LOCAL_HEAP_SIZE_HINT),total_error)
-
-  CALL H5Pget_link_phase_change_f(gcpl, max_compact, min_dense, error)
-  CALL check("H5Pget_link_phase_change_f", error, total_error)
-  CALL verify("H5Pget_link_phase_change_f", max_compact, LIFECYCLE_MAX_COMPACT,total_error)
-  CALL verify("H5Pget_link_phase_change_f", min_dense, LIFECYCLE_MIN_DENSE,total_error)
-
-  CALL H5Pget_est_link_info_f(gcpl, est_num_entries, est_name_len, error)
-  CALL check("H5Pget_est_link_info_f", error, total_error)
-  CALL verify("H5Pget_est_link_info_f", est_num_entries, LIFECYCLE_EST_NUM_ENTRIES,total_error)
-  CALL verify("H5Pget_est_link_info_f", est_name_len, LIFECYCLE_EST_NAME_LEN,total_error)
-
-
-
-    ! Close top group 
-    CALL H5Gclose_f(gid, error)
-    CALL check("H5Gclose_f", error, total_error)
-
-    ! Unlink top group 
-
-    CALL H5Ldelete_f(fid, LIFECYCLE_TOP_GROUP, error)
-    CALL check("H5Ldelete_f", error, total_error)
-
-    !  Close GCPL 
-    CALL H5Pclose_f(gcpl, error)
-    CALL check("H5Pclose_f", error, total_error)
-
-    !  Close file 
-    CALL H5Fclose_f(fid,error)
-    CALL check("H5Fclose_f",error,total_error)
-
-    IF(cleanup) CALL h5_cleanup_f("fixx", H5P_DEFAULT_F, error)
-    CALL check("h5_cleanup_f", error, total_error)
-
-  END SUBROUTINE lifecycle
-
-!-------------------------------------------------------------------------
-! * Function:	cklinks
-! *
-! * Purpose:	Open the file created in the first step and check that the
-! *		links look correct.
-! *
-! * Return:	Success:	0
-! *
-! *		Failure:	-1
-! *
-! * Programmer:	M.S. Breitenfeld
-! *             April 14, 2008
-! *
-! * Modifications: Modified original C code
-! *
-! *-------------------------------------------------------------------------
-! 
-
-
-  SUBROUTINE cklinks(fapl, total_error)
-
-!    USE ISO_C_BINDING
-  USE HDF5 ! This module contains all necessary modules
-  USE TH5_MISC
-
-  IMPLICIT NONE
-  INTEGER, INTENT(INOUT) :: total_error
-  INTEGER(HID_T), INTENT(IN) :: fapl
-  INTEGER :: error
-
-  INTEGER(HID_T) :: file
-!    H5O_info_t		oinfo1, oinfo2;
-!    H5L_info_t		linfo2;
-
-  CHARACTER(LEN=12), PARAMETER :: filename ='TestLinks.h5'
-
-!  TYPE(C_PTR) :: linkval
-
-  LOGICAL :: Lexists
-
-  !  Open the file 
-  CALL H5Fopen_f(filename, H5F_ACC_RDONLY_F, file, error,access_prp=fapl)
-  CALL check("H5Fopen_f",error,total_error)
-
-
-  !  Hard link 
-!!$  IF(H5Oget_info_by_name(file, "d1", &oinfo1, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
-!!$  IF(H5Oget_info_by_name(file, "grp1/hard", &oinfo2, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
-!!$  IF(H5O_TYPE_DATASET != oinfo2.type) {
-!!$	H5_FAILED();
-!!$	printf("    %d: Unexpected object type should have been a dataset\n", __LINE__);
-!!$	TEST_ERROR
-!!$    }  end if 
-!!$    if(H5F_addr_ne(oinfo1.addr, oinfo2.addr)) {
-!!$	H5_FAILED();
-!!$	puts("    Hard link test failed. Link seems not to point to the ");
-!!$	puts("    expected file location.");
-!!$	TEST_ERROR
-!!$    }  end if 
-
-
-  CALL H5Lexists_f(file,"d1",Lexists, error)
-  CALL verifylogical("H5Lexists", Lexists,.TRUE.,total_error)
-
-  CALL H5Lexists_f(file,"grp1/hard",Lexists, error)
-  CALL verifylogical("H5Lexists", Lexists,.TRUE.,total_error)
-
-  !  Cleanup 
-  CALL H5Fclose_f(file,error)
-  CALL check("H5Fclose_f",error,total_error)
-
-END SUBROUTINE cklinks
-
-
-!-------------------------------------------------------------------------
-! * Function:    delete_by_idx
-! *
-! * Purpose:     Create a group with creation order indices and test deleting
-! *              links by index.
-! *
-! * Return:      Total error
-! *
-! * C Programmer:  Quincey Koziol
-! *                Tuesday, November 14, 2006
-! *
-! * Adapted to FORTRAN: M.S. Breitenfeld
-! *                     March 3, 2008
-! *
-! *-------------------------------------------------------------------------
-! 
-SUBROUTINE delete_by_idx(cleanup, fapl, total_error)
-
-  USE HDF5 ! This module contains all necessary modules
-  USE TH5_MISC
-
-  IMPLICIT NONE
-  INTEGER, INTENT(INOUT) :: total_error
-  INTEGER(HID_T), INTENT(IN) :: fapl
-
-  INTEGER(HID_T) :: file_id  !  File ID 
-  INTEGER(HID_T) :: group_id !  Group ID 
-  INTEGER(HID_T) :: gcpl_id  !  Group creation property list ID 
-
-  INTEGER :: idx_type        !  Type of index to operate on 
-  LOGICAL, DIMENSION(1:2) :: use_index = (/.FALSE.,.TRUE./)
-                             !  Use index on creation order values 
-  INTEGER :: max_compact     !  Maximum # of links to store in group compactly 
-  INTEGER :: min_dense       !  Minimum # of links to store in group "densely" 
-
-  CHARACTER(LEN=7) :: objname   !  Object name 
-  CHARACTER(LEN=8) :: filename = 'file0.h5' !  File name 
-  CHARACTER(LEN=12), PARAMETER :: CORDER_GROUP_NAME = "corder_group"
-
-  LOGICAL :: f_corder_valid ! Indicates whether the creation order data is valid for this attribute
-  INTEGER :: corder ! Is a positive integer containing the creation order of the attribute
-  INTEGER :: cset ! Indicates the character set used for the attribute’s name
-  INTEGER(SIZE_T) :: val_size
-  INTEGER :: link_type
-  INTEGER(HADDR_T) :: address
-
-  INTEGER :: u !  Local index variable 
-  INTEGER :: Input1, i
-  INTEGER(HID_T) :: group_id2
-  INTEGER(HID_T) :: grp
-  INTEGER :: iorder !  Order within in the index 
-  CHARACTER(LEN=2) :: chr2
-  INTEGER :: error
-  INTEGER :: id_type
-  !
-  !
-  !
-  CHARACTER(LEN=80) :: fix_filename1
-  CHARACTER(LEN=80) :: fix_filename2
-  INTEGER(HSIZE_T) :: htmp
-
-  LOGICAL :: cleanup
-
-  DO i = 1, 80
-     fix_filename1(i:i) = " "
-     fix_filename2(i:i) = " "
-  ENDDO
-
-  !  Loop over operating on different indices on link fields 
-  DO idx_type = H5_INDEX_NAME_F, H5_INDEX_CRT_ORDER_F
-     !  Loop over operating in different orders 
-     DO iorder = H5_ITER_INC_F,  H5_ITER_DEC_F
-        !  Loop over using index for creation order value 
-        DO i = 1, 2
-           !  Print appropriate test message 
-!!$           IF(idx_type == H5_INDEX_CRT_ORDER_F)THEN
-!!$              IF(iorder == H5_ITER_INC_F)THEN
-!!$                 IF(use_index(i))THEN
-!!$                    WRITE(*,'(5x,A)')"deleting links by creation order index in increasing order w/creation order index"
-!!$                 ELSE
-!!$                    WRITE(*,'(5x,A)')"deleting links by creation order index in increasing order w/o creation order index"
-!!$                 ENDIF
-!!$              ELSE
-!!$                 IF(use_index(i))THEN
-!!$                    WRITE(*,'(5x,A)')"deleting links by creation order index in decreasing order w/creation order index"
-!!$                 ELSE
-!!$                    WRITE(*,'(5x,A)')"deleting links by creation order index in decreasing order w/o creation order index"
-!!$                 ENDIF
-!!$              ENDIF
-!!$           ELSE
-!!$              IF(iorder == H5_ITER_INC_F)THEN
-!!$                 IF(use_index(i))THEN
-!!$                    WRITE(*,'(5x,A)')"deleting links by name index in increasing order w/creation order index"
-!!$                 ELSE
-!!$                    WRITE(*,'(5x,A)')"deleting links by name index in increasing order w/o creation order index"
-!!$                 ENDIF
-!!$              ELSE
-!!$                 IF(use_index(i))THEN
-!!$                    WRITE(*,'(5x,A)')"deleting links by name index in decreasing order w/creation order index"
-!!$                 ELSE
-!!$                    WRITE(*,'(5x,A)')"deleting links by name index in decreasing order w/o creation order index"
-!!$                 ENDIF
-!!$              ENDIF
-!!$           ENDIF
-
-           !  Create file 
-           CALL H5Fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, error, access_prp=fapl)
-           CALL check("delete_by_idx.H5Fcreate_f", error, total_error)
-
-           !  Create group creation property list 
-           CALL H5Pcreate_f(H5P_GROUP_CREATE_F, gcpl_id, error )
-           CALL check("delete_by_idx.H5Pcreate_f", error, total_error)
-
-           !  Set creation order tracking & indexing on group 
-           IF(use_index(i))THEN
-              Input1 = H5P_CRT_ORDER_INDEXED_F
-           ELSE
-              Input1 = 0
-           ENDIF
-
-           CALL H5Pset_link_creation_order_f(gcpl_id, IOR(H5P_CRT_ORDER_TRACKED_F, Input1), error)
-           CALL check("delete_by_idx.H5Pset_link_creation_order_f", error, total_error)
-
-           !  Create group with creation order tracking on 
-           CALL H5Gcreate_f(file_id, CORDER_GROUP_NAME, group_id, error, gcpl_id=gcpl_id)
-           CALL check("delete_by_idx.H5Gcreate_f", error, total_error)
-
-           !  Query the group creation properties 
-           CALL H5Pget_link_phase_change_f(gcpl_id, max_compact, min_dense, error)
-           CALL check("delete_by_idx.H5Pget_link_phase_change_f", error, total_error)
-
-
-           !  Delete links from one end 
-
-           !  Check for deletion on empty group 
-           CALL H5Ldelete_by_idx_f(group_id, ".", idx_type, iorder, INT(0,HSIZE_T), error)
-           CALL VERIFY("delete_by_idx.H5Ldelete_by_idx_f", error, -1, total_error) ! test should fail (error = -1)
-           !  Create several links, up to limit of compact form 
-           DO u = 0, max_compact-1
-              !  Make name for link 
-              WRITE(chr2,'(I2.2)') u
-              objname = 'fill '//chr2
-
-              !  Create hard link, with group object 
-              CALL H5Gcreate_f(group_id, objname, group_id2, error)
-              CALL check("delete_by_idx.H5Gcreate_f", error, total_error)
-              CALL H5Gclose_f(group_id2, error)
-              CALL check("delete_by_idx.H5Gclose_f", error, total_error)
-
-              !  Verify link information for new link 
-              CALL link_info_by_idx_check(group_id, objname, u, &
-                   .TRUE., use_index(i), total_error)
-           ENDDO
-
-           !  Verify state of group (compact) 
-           ! IF(H5G_has_links_test(group_id, NULL) != TRUE) TEST_ERROR
-
-           !  Check for out of bound deletion 
-           htmp =9
-!EP           CALL H5Ldelete_by_idx_f(group_id, ".", idx_type, iorder, INT(u,HSIZE_T), error)
-           CALL H5Ldelete_by_idx_f(group_id, ".", idx_type, iorder, htmp, error)
-           CALL VERIFY("H5Ldelete_by_idx_f", error, -1, total_error) ! test should fail (error = -1)
-
-
-           !  Delete links from compact group 
-
-           DO u = 0, (max_compact - 1) -1
-              !  Delete first link in appropriate order 
-              CALL H5Ldelete_by_idx_f(group_id, ".", idx_type, iorder, INT(0,HSIZE_T), error)
-              CALL check("H5Ldelete_by_idx_f", error, total_error)
-              !  Verify the link information for first link in appropriate order 
-              ! HDmemset(&linfo, 0, sizeof(linfo));
-
-              CALL H5Lget_info_by_idx_f(group_id, ".", idx_type, iorder, INT(0,HSIZE_T), &
-                   link_type, f_corder_valid, corder, cset, address, val_size, error)
-
-              CALL H5Oopen_by_addr_f(group_id, address, grp, error)
-              CALL check("H5Oopen_by_addr_f", error, total_error)
-
-              CALL H5Iget_type_f(grp, id_type, error)
-              CALL check("H5Iget_type_f", error, total_error)
-
-              CALL VERIFY("H5Iget_type_f", id_type, H5I_GROUP_F, total_error)
-
-              CALL H5Gclose_f(grp, error)
-              CALL check("H5Gclose_f", error, total_error)
-
-              CALL VerifyLogical("H5Lget_info_by_idx_f", f_corder_valid, .TRUE., total_error)
-
-              CALL VERIFY("H5Lget_info_by_idx_f", H5L_TYPE_HARD_F, link_type, total_error)
-              IF(iorder.EQ.H5_ITER_INC_F)THEN
-                 CALL VERIFY("H5Lget_info_by_idx_f", corder, u+1, total_error)
-              ELSE
-                 CALL VERIFY("H5Lget_info_by_idx_f", corder, (max_compact - (u + 2)), total_error)
-              ENDIF
-
-              CALL VERIFY("H5Lget_info_by_idx_f",cset, H5T_CSET_ASCII_F, total_error)
-
-
-
-              !  Verify the name for first link in appropriate order 
-              ! HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE);
-!!$              size_tmp = 20
-!!$              CALL H5Lget_name_by_idx_f(group_id, ".", idx_type, order, INT(0,HSIZE_T), size_tmp, tmpname, error)
-!!$              CALL check("delete_by_idx.H5Lget_name_by_idx_f", error, total_error)
-!!$
-!!$              IF(order .EQ. H5_ITER_INC_F)THEN
-!!$                 WRITE(chr2,'(I2.2)') u + 1
-!!$              ELSE
-!!$                 WRITE(chr2,'(I2.2)') (max_compact - (u + 2))
-!!$              ENDIF
-!!$              objname = 'fill '//chr2
-!!$              PRINT*,objname, tmpname
-!!$              CALL verifyString("delete_by_idx.H5Lget_name_by_idx_f", objname, tmpname,  total_error)
-           ENDDO
-
-           !  Close the group 
-           CALL H5Gclose_f(group_id, error)
-           CALL check("delete_by_idx.H5Gclose_f", error, total_error)
-
-           ! Close the group creation property list 
-           CALL H5Pclose_f(gcpl_id, error)
-           CALL check("delete_by_idx.H5Gclose_f", error, total_error)
-
-           ! Close the file 
-           CALL H5Fclose_f(file_id, error)
-           CALL check("delete_by_idx.H5Gclose_f", error, total_error)
-
-           IF(cleanup) CALL h5_cleanup_f("file0", H5P_DEFAULT_F, error)
-           CALL check("h5_cleanup_f", error, total_error)
-
-        ENDDO
-     ENDDO
-  ENDDO
-
-
-END SUBROUTINE delete_by_idx
-
-
-
-!-------------------------------------------------------------------------
-! * Function:    link_info_by_idx_check
-! *
-! * Purpose:     Support routine for link_info_by_idx, to verify the link
-! *              info is correct for a link
-! *
-! * Note:	This routine assumes that the links have been inserted in the
-! *              group in alphabetical order.
-! *
-! * Return:      Success:        0
-! *              Failure:        -1
-! *
-! * Programmer:  Quincey Koziol
-! *              Tuesday, November  7, 2006
-! *
-! *-------------------------------------------------------------------------
-! 
-SUBROUTINE link_info_by_idx_check(group_id, linkname, n, &
-    hard_link, use_index, total_error)
-
-  USE HDF5 ! This module contains all necessary modules
-  USE TH5_MISC
-
-  IMPLICIT NONE
-  INTEGER, INTENT(INOUT) :: total_error
-  INTEGER(HID_T), INTENT(IN) :: group_id
-  CHARACTER(LEN=*), INTENT(IN) :: linkname
-  INTEGER, INTENT(IN) :: n
-  LOGICAL, INTENT(IN) :: hard_link
-  LOGICAL, INTENT(IN) :: use_index
-
-  LOGICAL :: f_corder_valid ! Indicates whether the creation order data is valid for this attribute
-  INTEGER :: corder ! Is a positive integer containing the creation order of the attribute
-  INTEGER :: cset ! Indicates the character set used for the attribute’s name
-  INTEGER :: link_type
-  INTEGER(HADDR_T) :: address
-  INTEGER(SIZE_T) :: val_size   ! Indicates the size, in the number of characters, of the attribute
-
-  CHARACTER(LEN=7) :: tmpname     ! Temporary link name 
-  CHARACTER(LEN=3) :: tmpname_small ! to small temporary link name 
-  CHARACTER(LEN=10) :: tmpname_big ! to big temporary link name 
-
-  CHARACTER(LEN=7) :: valname     ! Link value name 
-  CHARACTER(LEN=2) :: chr2
-  INTEGER(SIZE_T) :: size_tmp
-  INTEGER :: error
-
-  !  Make link value for increasing/native order queries 
-
-  WRITE(chr2,'(I2.2)') n
-  valname = 'valn.'//chr2
-
-  !  Verify the link information for first link, in increasing creation order 
-  !  HDmemset(&linfo, 0, sizeof(linfo));
-  CALL H5Lget_info_by_idx_f(group_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_INC_F, INT(0,HSIZE_T), &
-       link_type, f_corder_valid, corder, cset, address, val_size, error)
-  CALL check("H5Lget_info_by_idx_f", error, total_error)
-  CALL VERIFY("H5Lget_info_by_idx_f", corder, 0, total_error)
-
-  !  Verify the link information for new link, in increasing creation order 
-  ! HDmemset(&linfo, 0, sizeof(linfo));
-  CALL H5Lget_info_by_idx_f(group_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_INC_F, INT(n,HSIZE_T), &
-       link_type, f_corder_valid, corder, cset, address, val_size, error)
-  CALL check("H5Lget_info_by_idx_f", error, total_error)
-  CALL VERIFY("H5Lget_info_by_idx_f", corder, n, total_error)
-
-  !  Verify value for new soft link, in increasing creation order 
-!!$  IF(hard_link)THEN
-!!$     ! HDmemset(tmpval, 0, (size_t)NAME_BUF_SIZE);
-!!$
-!!$     CALL H5Lget_val_by_idx_f(group_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_INC_F, n, tmpval, INT(7,SIZE_T),error)
-!!$     CALL check("H5Lget_val_by_idx",error,total_error)
-!!$
-!!$!     IF(HDstrcmp(valname, tmpval)) TEST_ERROR
-!!$  ENDIF
-
-  !  Verify the name for new link, in increasing creation order 
-  !  HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE);
-
-  ! The actual size of tmpname should be 7
-
-  CALL H5Lget_name_by_idx_f(group_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_INC_F, INT(n,HSIZE_T), tmpname_small, error, size_tmp)
-  CALL check("link_info_by_idx_check.H5Lget_name_by_idx_f", error, total_error)
-  CALL verifyString("link_info_by_idx_check.H5Lget_name_by_idx_f", &
-       linkname(1:LEN(tmpname_small)), tmpname_small(1:LEN(tmpname_small)),  total_error)
-  CALL VERIFY("link_info_by_idx_check.H5Lget_name_by_idx_f", INT(size_tmp), 7, total_error)
-  ! try it with the correct size
-  CALL H5Lget_name_by_idx_f(group_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_INC_F, INT(n,HSIZE_T), tmpname, error, size=size_tmp)
-  CALL check("link_info_by_idx_check.H5Lget_name_by_idx_f", error, total_error)
-  CALL verifyString("link_info_by_idx_check.H5Lget_name_by_idx_f", &
-       linkname(1:LEN(tmpname)), tmpname(1:LEN(tmpname)),  total_error)
-  CALL VERIFY("link_info_by_idx_check.H5Lget_name_by_idx_f", INT(size_tmp), 7, total_error)
-
-  CALL H5Lget_name_by_idx_f(group_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_INC_F, INT(n,HSIZE_T), tmpname_big, error, size_tmp)
-  CALL check("link_info_by_idx_check.H5Lget_name_by_idx_f", error, total_error)
-  CALL verifyString("link_info_by_idx_check.H5Lget_name_by_idx_f", &
-       linkname(1:7), tmpname_big(1:7),  total_error)
-  CALL VERIFY("link_info_by_idx_check.H5Lget_name_by_idx_f", INT(size_tmp), 7, total_error)
-
-  ! Try with a buffer set to small
-
-
-  END SUBROUTINE link_info_by_idx_check
-
-
-!-------------------------------------------------------------------------
-! * Function:    test_lcpl
-! *
-! * Purpose:     Tests Link Creation Property Lists
-! *
-! * Return:      Success:        0
-! *              Failure:        number of errors
-! *
-! * Programmer:  M.S. Breitenfeld
-! *              Modified C routine
-! *              March 12, 2008
-! *
-! * Modifications:
-! *
-! *-------------------------------------------------------------------------
-! 
-
-  SUBROUTINE test_lcpl(cleanup, fapl, total_error)
-
-  USE HDF5 ! This module contains all necessary modules
-  USE TH5_MISC
-
-  IMPLICIT NONE
-  INTEGER, INTENT(INOUT) :: total_error
-  INTEGER(HID_T), INTENT(IN) :: fapl
-  LOGICAL :: cleanup
-
-  INTEGER(HID_T) :: file_id
-  INTEGER(HID_T) :: group_id
-  INTEGER(HID_T) :: space_id, data_space
-  INTEGER(HID_T) :: dset_id
-  INTEGER(HID_T) :: type_id
-  INTEGER(HID_T) :: lcpl_id
-
-  INTEGER :: cset ! Indicates the character set used for the link’s name.
-  INTEGER :: corder ! Specifies the link’s creation order position.
-  LOGICAL :: f_corder_valid ! Indicates whether the value in corder is valid.
-  INTEGER :: link_type ! Specifies the link class:
-                       !  H5L_TYPE_HARD_F      - Hard link
-                       !  H5L_TYPE_SOFT_F      - Soft link
-                       !  H5L_TYPE_EXTERNAL_F  - External link
-                       !  H5L_TYPE_ERROR _F    - Error
-  INTEGER(HADDR_T) :: address  ! If the link is a hard link, address specifies the file address that the link points to
-  INTEGER(SIZE_T) :: val_size ! If the link is a symbolic link, val_size will be the length of the link value
-
-  CHARACTER(LEN=1024) :: filename = 'tempfile.h5'
-  INTEGER, PARAMETER :: TEST6_DIM1 = 8, TEST6_DIM2 = 7
-  INTEGER(HSIZE_T), DIMENSION(1:2), PARAMETER :: dims = (/TEST6_DIM1,TEST6_DIM2/)
-
-  INTEGER :: encoding
-  INTEGER :: error
-  LOGICAL :: Lexists
-  INTEGER(HSIZE_T), DIMENSION(1:2), PARAMETER :: extend_dim = (/TEST6_DIM1-2,TEST6_DIM2-3/)
-  INTEGER(HSIZE_T), DIMENSION(1:2) :: dimsout, maxdimsout ! dimensions
-
-  INTEGER :: i
-  INTEGER :: tmp1, tmp2
-  INTEGER(HID_T) :: crp_list
-
-!  WRITE(*,*) "link creation property lists (w/new group format)"
-
-
-  ! Actually, intermediate group creation is tested elsewhere (tmisc).
-  ! * Here we only need to test the character encoding property 
-
-  ! Create file 
-  !  h5_fixname(FILENAME[0], fapl, filename, sizeof filename);
-
-  CALL H5Fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, error, H5P_DEFAULT_F, fapl)
-  CALL check("H5Fcreate_f", error, total_error)
-
-
-  !  Create and link a group with the default LCPL 
-
-  CALL H5Gcreate_f(file_id, "/group", group_id, error)
-  CALL check("H5Gcreate_f", error, total_error)
-
-
-  !  Check that its character encoding is the default 
-
-  CALL H5Lget_info_f(file_id, "group", &
-       cset, corder, f_corder_valid, link_type, address, val_size, &
-       error, H5P_DEFAULT_F)
-
-! File-wide default character encoding can not yet be set via the file
-! * creation property list and is always ASCII. 
-!#define H5F_DEFAULT_CSET H5T_CSET_ASCII  -- FROM H5Fprivate.h --
-
-  CALL VERIFY("H5Lget_info_f",cset, H5T_CSET_ASCII_F,total_error)
-
-  !  Create and commit a datatype with the default LCPL 
-  CALL h5tcopy_f(H5T_NATIVE_INTEGER, type_id, error)
-  CALL check("h5tcopy_f",error,total_error)
-  CALL h5tcommit_f(file_id, "/type", type_id, error)
-  CALL check("h5tcommit_f", error, total_error)
-  CALL h5tclose_f(type_id, error)
-  CALL check("h5tclose_f", error, total_error)
-
-
-  !  Check that its character encoding is the default 
-  CALL H5Lget_info_f(file_id, "type", &
-       cset, corder, f_corder_valid, link_type, address, val_size, &
-       error)
-  CALL check("h5tclose_f", error, total_error)
-
-! File-wide default character encoding can not yet be set via the file
-! * creation property list and is always ASCII. 
-!#define H5F_DEFAULT_CSET H5T_CSET_ASCII  -- FROM H5Fprivate.h --
-
-  CALL verify("H5Lget_info_f",cset, H5T_CSET_ASCII_F,total_error)
-
-  ! Create a dataspace 
-  CALL h5screate_simple_f(2, dims, space_id, error)
-  CALL check("h5screate_simple_f",error,total_error)
-  CALL h5pcreate_f(H5P_DATASET_CREATE_F, crp_list, error)
-  CALL h5pset_chunk_f(crp_list, 2, dims, error)
-  CALL h5pcreate_f(H5P_DATASET_CREATE_F, crp_list, error)
-  CALL h5pset_chunk_f(crp_list, 2, dims, error)
-  CALL h5pcreate_f(H5P_DATASET_CREATE_F, crp_list, error)
-  CALL h5pset_chunk_f(crp_list, 2, dims, error)
-
-  !  Create a dataset using the default LCPL 
-  CALL h5dcreate_f(file_id, "/dataset", H5T_NATIVE_INTEGER, space_id, dset_id, error, crp_list)
-  CALL check("h5dcreate_f", error, total_error)
-
-  CALL h5dclose_f(dset_id, error)
-  CALL check("h5dclose_f", error, total_error)
-
-  ! Reopen
-
-  CALL H5Dopen_f(file_id, "/dataset", dset_id, error)
-  CALL check("h5dopen_f", error, total_error)
-
-  !   Extend the  dataset 
-  CALL H5Dset_extent_f(dset_id, extend_dim, error)
-  CALL check("H5Dset_extent_f", error, total_error)
-  !   Verify the dataspaces 
-        !
-          !Get dataset's dataspace handle.
-          !
-  CALL h5dget_space_f(dset_id, data_space, error)
-  CALL check("h5dget_space_f",error,total_error)
-
-  CALL h5sget_simple_extent_dims_f(data_space, dimsout, maxdimsout, error)
-  CALL check("h5sget_simple_extent_dims_f",error, total_error)
-
-  DO i = 1, 2
-     tmp1 = INT(dimsout(i))
-     tmp2 = INT(extend_dim(i))
-     CALL VERIFY("H5Sget_simple_extent_dims", tmp1, tmp2, total_error)
-     tmp1 = INT(maxdimsout(i))
-     tmp2 = INT(dims(i))
-     CALL VERIFY("H5Sget_simple_extent_dims", tmp1, tmp2, total_error)
-  ENDDO
-
-  !  close data set 
-
-  CALL h5dclose_f(dset_id, error)
-  CALL check("h5dclose_f", error, total_error)
-
-  !  Check that its character encoding is the default 
-  CALL H5Lget_info_f(file_id, "dataset", &
-       cset, corder, f_corder_valid, link_type, address, val_size, &
-       error)
-  CALL check("H5Lget_info_f", error, total_error)
-
-! File-wide default character encoding can not yet be set via the file
-! * creation property list and is always ASCII. 
-!#define H5F_DEFAULT_CSET H5T_CSET_ASCII  -- FROM H5Fprivate.h --
-
-  CALL verify("h5tclose_f",cset, H5T_CSET_ASCII_F,total_error)
-
-  ! Create a link creation property list with the UTF-8 character encoding 
-  CALL H5Pcreate_f(H5P_LINK_CREATE_F,lcpl_id,error)
-  CALL check("h5Pcreate_f",error,total_error)
-  CALL H5Pset_char_encoding_f(lcpl_id, H5T_CSET_UTF8_F, error)
-  CALL check("H5Pset_char_encoding_f",error, total_error)
-
-  !  Create and link a group with the new LCPL 
-  CALL H5Gcreate_f(file_id, "/group2", group_id, error,lcpl_id=lcpl_id)
-  CALL check("H5Gcreate_f", error, total_error)
-  CALL H5Gclose_f(group_id, error)
-  CALL check("H5Gclose_f", error, total_error)
-
-
-  ! Check that its character encoding is UTF-8 
-  CALL H5Lget_info_f(file_id, "group2", &
-       cset, corder, f_corder_valid, link_type, address, val_size, &
-       error)
-  CALL check("H5Lget_info_f", error, total_error)
-  CALL verify("H5Lget_info_f",cset, H5T_CSET_UTF8_F,total_error)
-
-
-  !  Create and commit a datatype with the new LCPL 
-
-  CALL h5tcopy_f(H5T_NATIVE_INTEGER, type_id, error)
-  CALL check("h5tcopy_f",error,total_error)
-  CALL h5tcommit_f(file_id, "/type2", type_id, error, lcpl_id=lcpl_id)
-  CALL check("h5tcommit_f", error, total_error)
-  CALL h5tclose_f(type_id, error)
-  CALL check("h5tclose_f", error, total_error)
-
-
-  ! Check that its character encoding is UTF-8 
-  CALL H5Lget_info_f(file_id, "type2", &
-       cset, corder, f_corder_valid, link_type, address, val_size, &
-       error)
-  CALL check("H5Lget_info_f", error, total_error)
-  CALL verify("H5Lget_info_f",cset, H5T_CSET_UTF8_F,total_error)
-
-  !  Create a dataset using the new LCPL 
-  CALL h5dcreate_f(file_id, "/dataset2", H5T_NATIVE_INTEGER, space_id, dset_id, error,lcpl_id=lcpl_id)
-  CALL check("h5dcreate_f", error, total_error)
-
-  CALL h5dclose_f(dset_id, error)
-  CALL check("h5dclose_f", error, total_error)
-
-  CALL H5Pget_char_encoding_f(lcpl_id, encoding, error)
-  CALL check("H5Pget_char_encoding_f", error, total_error)
-  CALL VERIFY("H5Pget_char_encoding_f", encoding, H5T_CSET_UTF8_F, total_error)
-
-  !  Check that its character encoding is UTF-8 
-  CALL H5Lget_info_f(file_id, "dataset2", &
-       cset, corder, f_corder_valid, link_type, address, val_size, &
-       error)
-  CALL check("H5Lget_info_f", error, total_error)
-  CALL verify("H5Lget_info_f2",cset, H5T_CSET_UTF8_F,total_error)
-
-  !  Create a new link to the dataset with a different character encoding. 
-  CALL H5Pclose_f(lcpl_id, error)
-  CALL check("H5Pclose_f", error, total_error)
-
-  CALL H5Pcreate_f(H5P_LINK_CREATE_F,lcpl_id,error)
-  CALL check("h5Pcreate_f",error,total_error)
-  CALL H5Pset_char_encoding_f(lcpl_id, H5T_CSET_ASCII_F, error)
-  CALL check("H5Pset_char_encoding_f",error, total_error)
-  CALL H5Lcreate_hard_f(file_id, "/dataset2", file_id, "/dataset2_link", error, lcpl_id)
-  CALL check("H5Lcreate_hard_f",error, total_error)
-
-  CALL H5Lexists_f(file_id,"/dataset2_link",Lexists, error)
-  CALL check("H5Lexists",error, total_error)
-  CALL verifylogical("H5Lexists", Lexists,.TRUE.,total_error)
-
-  !  Check that its character encoding is ASCII 
-  CALL H5Lget_info_f(file_id, "/dataset2_link", &
-       cset, corder, f_corder_valid, link_type, address, val_size, &
-       error)
-  CALL check("H5Lget_info_f", error, total_error)
-  CALL verify("H5Lget_info_f",cset, H5T_CSET_ASCII_F,total_error)
-
-  !  Check that the first link's encoding hasn't changed 
-
-  CALL H5Lget_info_f(file_id, "/dataset2", &
-       cset, corder, f_corder_valid, link_type, address, val_size, &
-       error)
-  CALL check("H5Lget_info_f", error, total_error)
-  CALL verify("H5Lget_info_f3",cset, H5T_CSET_UTF8_F,total_error)
-
-
-  ! Make sure that LCPLs work properly for other API calls: 
-  ! H5Lcreate_soft 
-
-  CALL H5Pset_char_encoding_f(lcpl_id, H5T_CSET_UTF8_F, error)
-  CALL check("H5Pset_char_encoding_f",error, total_error)
-  CALL H5Lcreate_soft_f("dataset2", file_id, "slink_to_dset2",error,lcpl_id)
-  CALL check("H5Lcreate_soft_f", error, total_error)
-
-  CALL H5Lget_info_f(file_id, "slink_to_dset2", &
-       cset, corder, f_corder_valid, link_type, address, val_size, &
-       error)
-  CALL check("H5Lget_info_f", error, total_error)
-  CALL verify("H5Lget_info_f",cset, H5T_CSET_UTF8_F,total_error)
-
-
-  !  H5Lmove 
-  CALL H5Pset_char_encoding_f(lcpl_id, H5T_CSET_ASCII_F, error)
-  CALL check("H5Pset_char_encoding_f",error, total_error)
-
-  CALL H5Lmove_f(file_id, "slink_to_dset2", file_id, "moved_slink", error, lcpl_id, H5P_DEFAULT_F)
-  CALL check("H5Lmove_f",error, total_error)
-
-  CALL H5Lget_info_f(file_id, "moved_slink", &
-       cset, corder, f_corder_valid, link_type, address, val_size, &
-       error)
-  CALL check("H5Lget_info_f", error, total_error)
-  CALL verify("H5Lget_info_f",cset, H5T_CSET_ASCII_F,total_error)
-
-
-  !  H5Lcopy 
-
-  CALL H5Pset_char_encoding_f(lcpl_id, H5T_CSET_UTF8_F, error)
-  CALL check("H5Pset_char_encoding_f",error, total_error)
-
-  CALL H5Lcopy_f(file_id, "moved_slink", file_id, "copied_slink", error, lcpl_id)
-
-  CALL H5Lget_info_f(file_id, "copied_slink", &
-       cset, corder, f_corder_valid, link_type, address, val_size, &
-       error)
-  CALL check("H5Lget_info_f", error, total_error)
-  CALL verify("H5Lget_info_f",cset, H5T_CSET_UTF8_F,total_error)
-
-
-  !  H5Lcreate_external 
-
-  CALL H5Lcreate_external_f("filename", "path", file_id, "extlink", error, lcpl_id)
-  CALL check("H5Lcreate_external_f", error, total_error)
-
-  CALL H5Lget_info_f(file_id, "extlink", &
-       cset, corder, f_corder_valid, link_type, address, val_size, &
-       error)
-  CALL check("H5Lget_info_f", error, total_error)
-  CALL verify("H5Lget_info_f",cset, H5T_CSET_UTF8_F,total_error)
-
-
-  !  Close open IDs 
-
-  CALL H5Pclose_f(lcpl_id, error)
-  CALL check("H5Pclose_f", error, total_error)
-  CALL H5Sclose_f(space_id, error)
-  CALL check("h5Sclose_f",error,total_error)
-  CALL H5Fclose_f(file_id, error)
-  CALL check("H5Fclose_f", error, total_error)
-
-  IF(cleanup) CALL h5_cleanup_f("tempfile", H5P_DEFAULT_F, error)
-  CALL check("h5_cleanup_f", error, total_error)
-
-
-END SUBROUTINE test_lcpl
-
-SUBROUTINE objcopy(fapl, total_error)
-
-  USE HDF5 ! This module contains all necessary modules
-  USE TH5_MISC
-
-  IMPLICIT NONE
-  INTEGER, INTENT(INOUT) :: total_error
-  INTEGER(HID_T), INTENT(IN) :: fapl
-
-  INTEGER(HID_T) :: fapl2, pid
-
-  INTEGER :: flag, cpy_flags
-
-  INTEGER :: error
-
-  flag = H5O_COPY_SHALLOW_HIERARCHY_F
-
-! Copy the file access property list 
-  CALL H5Pcopy_f(fapl, fapl2, error)
-  CALL check("H5Pcopy_f", error, total_error)
-
-! Set the "use the latest version of the format" bounds for creating objects in the file 
-  CALL H5Pset_libver_bounds_f(fapl2, H5F_LIBVER_LATEST_F, H5F_LIBVER_LATEST_F, error)
-
-  !  create property to pass copy options 
-  CALL h5pcreate_f(H5P_OBJECT_COPY_F, pid, error)
-  CALL check("h5pcreate_f",error, total_error)
-
-  !  set options for object copy 
-  CALL H5Pset_copy_object_f(pid, flag, error)
-  CALL check("H5Pset_copy_object_f",error, total_error)
-
-  !  Verify object copy flags 
-  CALL H5Pget_copy_object_f(pid, cpy_flags, error)
-  CALL check("H5Pget_copy_object_f",error, total_error)
-  CALL VERIFY("H5Pget_copy_object_f", cpy_flags, flag, total_error)
-
-!!$
-!!$  CALL test_copy_option(fcpl_src, fcpl_dst, my_fapl, H5O_COPY_WITHOUT_ATTR_FLAG,
-!!$                       FALSE, "H5Ocopy(): without attributes");
-
-  CALL lapl_nlinks(fapl2, total_error)
-
-END SUBROUTINE objcopy
-
-
-!-------------------------------------------------------------------------
-! * Function:    lapl_nlinks
-! *
-! * Purpose:     Check that the maximum number of soft links can be adjusted
-! *              by the user using the Link Access Property List.
-! *
-! * Return:      Success:        0
-! *
-! *              Failure:        -1
-! *
-! * Programmer:  James Laird
-! *              Tuesday, June 6, 2006
-! *
-! * Modifications:
-! *
-! *-------------------------------------------------------------------------
-! 
-
-SUBROUTINE lapl_nlinks( fapl, total_error)
-
-  USE HDF5
-  USE TH5_MISC
-
-  IMPLICIT NONE
-  INTEGER(HID_T), INTENT(IN) :: fapl
-  INTEGER, INTENT(INOUT) :: total_error
-
-  INTEGER :: error
-
-  INTEGER(HID_T) :: fid = (-1) ! File ID 
-  INTEGER(HID_T) :: gid = (-1), gid2 = (-1) ! Group IDs 
-  INTEGER(HID_T) :: plist = (-1) !  lapl ID 
-  INTEGER(HID_T) :: tid = (-1) !  Other IDs 
-  INTEGER(HID_T) :: gapl = (-1), dapl = (-1), tapl = (-1) !  Other property lists 
-
-  CHARACTER(LEN=7) :: objname !  Object name 
-  INTEGER(size_t) :: name_len !  Length of object name 
-  CHARACTER(LEN=12) :: filename = 'TestLinks.h5'
-  INTEGER(size_t) ::              nlinks !  nlinks for H5Pset_nlinks 
-  INTEGER(size_t) :: buf_size = 7
-
-!  WRITE(*,*) "adjusting nlinks with LAPL (w/new group format)"
-
-
-  !  Create file 
-  CALL h5fcreate_f(FileName, H5F_ACC_TRUNC_F, fid, error, access_prp=fapl)
-  CALL check(" lapl_nlinks.h5fcreate_f",error,total_error)
-
-  !  Create group with short name in file (used as target for links) 
-  CALL H5Gcreate_f(fid, "final", gid, error)
-  CALL check(" lapl_nlinks.H5Gcreate_f", error, total_error)
-
-  ! Create chain of soft links to existing object (limited) 
-  CALL H5Lcreate_soft_f("final", fid, "soft1", error)
-  CALL H5Lcreate_soft_f("soft1", fid, "soft2", error)
-  CALL H5Lcreate_soft_f("soft2", fid, "soft3", error)
-  CALL H5Lcreate_soft_f("soft3", fid, "soft4", error)
-  CALL H5Lcreate_soft_f("soft4", fid, "soft5", error)
-  CALL H5Lcreate_soft_f("soft5", fid, "soft6", error)
-  CALL H5Lcreate_soft_f("soft6", fid, "soft7", error)
-  CALL H5Lcreate_soft_f("soft7", fid, "soft8", error)
-  CALL H5Lcreate_soft_f("soft8", fid, "soft9", error)
-  CALL H5Lcreate_soft_f("soft9", fid, "soft10", error)
-  CALL H5Lcreate_soft_f("soft10", fid, "soft11", error)
-  CALL H5Lcreate_soft_f("soft11", fid, "soft12", error)
-  CALL H5Lcreate_soft_f("soft12", fid, "soft13", error)
-  CALL H5Lcreate_soft_f("soft13", fid, "soft14", error)
-  CALL H5Lcreate_soft_f("soft14", fid, "soft15", error)
-  CALL H5Lcreate_soft_f("soft15", fid, "soft16", error)
-  CALL H5Lcreate_soft_f("soft16", fid, "soft17", error)
-
-  ! Close objects 
-  CALL H5Gclose_f(gid, error)
-  CALL check("h5gclose_f",error,total_error)
-  CALL h5fclose_f(fid, error)
-  CALL check("h5fclose_f",error,total_error)
-
-  ! Open file 
-
-  CALL h5fopen_f(FileName, H5F_ACC_RDWR_F, fid, error, fapl)
-  CALL check("h5open_f",error,total_error)
-
-  ! Create LAPL with higher-than-usual nlinks value 
-  ! Create a non-default lapl with udata set to point to the first group 
-
-  CALL H5Pcreate_f(H5P_LINK_ACCESS_F,plist,error)
-  CALL check("h5Pcreate_f",error,total_error)
-  nlinks = 20
-  CALL H5Pset_nlinks_f(plist, nlinks, error)
-  CALL check("H5Pset_nlinks_f",error,total_error)
-  ! Ensure that nlinks was set successfully 
-  nlinks = 0
-  CALL H5Pget_nlinks_f(plist, nlinks, error)
-  CALL check("H5Pset_nlinks_f",error,total_error)
-  CALL VERIFY("H5Pset_nlinks_f",INT(nlinks), 20, total_error)
-
-
-  ! Open object through what is normally too many soft links using
-  ! * new property list 
-
-  CALL H5Oopen_f(fid,"soft17",gid,error,plist)
-  CALL check("H5Oopen_f",error,total_error)
-
-  ! Check name 
-  CALL h5iget_name_f(gid, objname, buf_size, name_len, error)
-  CALL check("h5iget_name_f",error,total_error)
-  CALL VerifyString("h5iget_name_f", TRIM(objname),"/soft17", total_error)
-  ! Create group using soft link 
-  CALL H5Gcreate_f(gid, "new_soft", gid2, error)
-  CALL check("H5Gcreate_f", error, total_error)
-
-  !  Close groups 
-  CALL H5Gclose_f(gid2, error)
-  CALL check("H5Gclose_f", error, total_error)
-  CALL H5Gclose_f(gid, error)
-  CALL check("H5Gclose_f", error, total_error)
-
-
-  ! Set nlinks to a smaller number 
-  nlinks = 4
-  CALL H5Pset_nlinks_f(plist, nlinks, error)
-  CALL check("H5Pset_nlinks_f", error, total_error)
-
-  ! Ensure that nlinks was set successfully 
-  nlinks = 0
-
-  CALL H5Pget_nlinks_f(plist, nlinks, error)
-  CALL check("H5Pget_nlinks_f",error,total_error)
-  CALL VERIFY("H5Pget_nlinks_f", INT(nlinks), 4, total_error)
-
-  !  Try opening through what is now too many soft links 
-
-  CALL H5Oopen_f(fid,"soft5",gid,error,plist)
-  CALL VERIFY("H5Oopen_f", error, -1, total_error) ! should fail
-
-  !  Open object through lesser soft link 
-  CALL H5Oopen_f(fid,"soft4",gid,error,plist)
-  CALL check("H5Oopen_",error,total_error)
-
-  !  Check name 
-  CALL h5iget_name_f(gid, objname, buf_size, name_len, error)
-  CALL check("h5iget_name_f",error,total_error)
-  CALL VerifyString("h5iget_name_f", TRIM(objname),"/soft4", total_error)
-
-  !  Test other functions that should use a LAPL 
-  nlinks = 20
-  CALL H5Pset_nlinks_f(plist, nlinks, error)
-  CALL check("H5Pset_nlinks_f", error, total_error)
-
-  ! Try copying and moving when both src and dst contain many soft links
-  ! * using a non-default LAPL
-  ! 
-  CALL H5Lcopy_f(fid, "soft17", fid, "soft17/newer_soft", error, H5P_DEFAULT_F, plist)
-  CALL check("H5Lcopy_f",error,total_error)
-
-  CALL H5Lmove_f(fid, "soft17/newer_soft", fid, "soft17/newest_soft", error, lapl_id=plist)
-  CALL check("H5Lmove_f",error, total_error)
-
-  !  H5Olink 
-  CALL H5Olink_f(gid, fid, "soft17/link_to_group", error, H5P_DEFAULT_F, plist)
-  CALL check("H5Olink_f", error, total_error)
-
-  !  H5Lcreate_hard and H5Lcreate_soft 
-  CALL H5Lcreate_hard_f(fid, "soft17", fid, "soft17/link2_to_group", error, H5P_DEFAULT_F, plist)
-  CALL check("H5Lcreate_hard_f", error, total_error)
-
-
-  CALL H5Lcreate_soft_f("/soft4", fid, "soft17/soft_link",error, H5P_DEFAULT_F, plist)
-  CALL check("H5Lcreate_soft_f", error, total_error)
-
-  !  H5Ldelete 
-  CALL h5ldelete_f(fid, "soft17/soft_link", error, plist)
-  CALL check("H5Ldelete_f", error, total_error)
-
-!!$     H5Lget_val and H5Lget_info 
-!!$    if(H5Lget_val(fid, "soft17", NULL, (size_t)0, plist) < 0) TEST_ERROR
-!!$    if(H5Lget_info(fid, "soft17", NULL, plist) < 0) TEST_ERROR
-!!$
-
-  !  H5Lcreate_external and H5Lcreate_ud 
-  CALL H5Lcreate_external_f("filename", "path", fid, "soft17/extlink", error, H5P_DEFAULT_F, plist)
-  CALL check("H5Lcreate_external_f", error, total_error)
-
-!!$    if(H5Lregister(UD_rereg_class) < 0) TEST_ERROR
-!!$    if(H5Lcreate_ud(fid, "soft17/udlink", UD_HARD_TYPE, NULL, (size_t)0, H5P_DEFAULT, plist) < 0) TEST_ERROR
-!!$
-    !  Close plist 
-  CALL h5pclose_f(plist, error)
-  CALL check("h5pclose_f", error, total_error)
-
-    !  Create a datatype and dataset as targets inside the group 
-  CALL h5tcopy_f(H5T_NATIVE_INTEGER, tid, error)
-  CALL check("h5tcopy_f",error,total_error)
-  CALL h5tcommit_f(gid, "datatype", tid, error)
-  CALL check("h5tcommit_f", error, total_error)
-  CALL h5tclose_f(tid, error)
-  CALL check("h5tclose_f", error, total_error)
-
-!!$
-!!$    dims[0] = 2;
-!!$    dims[1] = 2;
-!!$    if((sid = H5Screate_simple(2, dims, NULL)) < 0) TEST_ERROR
-!!$    if((did = H5Dcreate2(gid, "dataset", H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
-!!$    if(H5Dclose(did) < 0) TEST_ERROR
-!!$
-  ! Close group 
-  CALL h5gclose_f(gid, error)
-  CALL check("h5gclose_f",error,total_error)
-
-!!$
-!!$     Try to open the objects using too many symlinks with default *APLs 
-!!$    H5E_BEGIN_TRY {
-!!$        if((gid = H5Gopen2(fid, "soft17", H5P_DEFAULT)) >= 0)
-!!$            FAIL_PUTS_ERROR("    Should have failed for too many nested links.")
-!!$        if((tid = H5Topen2(fid, "soft17/datatype", H5P_DEFAULT)) >= 0)
-!!$            FAIL_PUTS_ERROR("    Should have failed for too many nested links.")
-!!$        if((did = H5Dopen2(fid, "soft17/dataset", H5P_DEFAULT)) >= 0)
-!!$            FAIL_PUTS_ERROR("    Should have failed for too many nested links.")
-!!$    } H5E_END_TRY
-!!$
-    !  Create property lists with nlinks set 
-
-  CALL H5Pcreate_f(H5P_GROUP_ACCESS_F,gapl,error)
-  CALL check("h5Pcreate_f",error,total_error)
-  CALL H5Pcreate_f(H5P_DATATYPE_ACCESS_F,tapl,error)
-  CALL check("h5Pcreate_f",error,total_error)
-  CALL H5Pcreate_f(H5P_DATASET_ACCESS_F,dapl,error)
-  CALL check("h5Pcreate_f",error,total_error)
-
-
-  nlinks = 20
-  CALL H5Pset_nlinks_f(gapl, nlinks, error)
-  CALL check("H5Pset_nlinks_f", error, total_error)
-  CALL H5Pset_nlinks_f(tapl, nlinks, error)
-  CALL check("H5Pset_nlinks_f", error, total_error)
-  CALL H5Pset_nlinks_f(dapl, nlinks, error)
-  CALL check("H5Pset_nlinks_f", error, total_error)
-
-  ! We should now be able to use these property lists to open each kind
-  ! * of object.
-  ! 
-
-  CALL H5Gopen_f(fid, "soft17", gid, error, gapl)
-  CALL check("H5Gopen_f",error,total_error)
-
-  CALL H5Topen_f(fid, "soft17/datatype", tid, error, tapl)
-  CALL check("H5Gopen_f",error,total_error)
-
-!!$    if((did = H5Dopen2(fid, "soft17/dataset", dapl)) < 0) TEST_ERROR
-
-  !  Close objects 
-
-  CALL h5gclose_f(gid, error)
-  CALL check("h5gclose_f",error,total_error)
-  CALL h5tclose_f(tid, error)
-  CALL check("h5tclose_f", error, total_error)
-
-!!$    if(H5Dclose(did) < 0) TEST_ERROR
-!!$
-  !  Close plists 
-
-  CALL h5pclose_f(gapl, error)
-  CALL check("h5pclose_f", error, total_error)
-  CALL h5pclose_f(tapl, error)
-  CALL check("h5pclose_f", error, total_error)
-
-!!$    if(H5Pclose(dapl) < 0) TEST_ERROR
-!!$
-!!$     Unregister UD hard link class 
-!!$    if(H5Lunregister(UD_HARD_TYPE) < 0) TEST_ERROR
-!!$
-
-  !  Close file 
-  CALL H5Fclose_f(fid, error)
-  CALL check("H5Fclose_f", error, total_error)
-
-END SUBROUTINE lapl_nlinks
-
-END MODULE TH5G_1_8
diff --git a/fortran/test/tH5I.F90 b/fortran/test/tH5I.F90
new file mode 100644
index 0000000..7f9b3ab
--- /dev/null
+++ b/fortran/test/tH5I.F90
@@ -0,0 +1,318 @@
+!****h* root/fortran/test/tH5I.f90
+!
+! NAME
+!  tH5I.f90
+!
+! FUNCTION
+!  Basic testing of Fortran H5I APIs.
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+! CONTAINS SUBROUTINES
+!  identifier_test
+!
+!*****
+MODULE TH5I
+
+  USE HDF5 ! This module contains all necessary modules
+  USE TH5_MISC
+  USE TH5_MISC_GEN
+
+CONTAINS
+
+    SUBROUTINE identifier_test(cleanup, total_error)
+
+!   This subroutine tests following functionalities: h5iget_type_f
+
+
+     IMPLICIT NONE
+     LOGICAL, INTENT(IN)  :: cleanup
+     INTEGER, INTENT(INOUT) :: total_error
+
+     CHARACTER(LEN=6), PARAMETER :: filename = "itestf" ! File name
+     CHARACTER(LEN=80) :: fix_filename
+     CHARACTER(LEN=10), PARAMETER :: dsetname = "/itestdset" ! Dataset name
+     CHARACTER(LEN=10), PARAMETER :: groupname = "itestgroup"! group name
+     CHARACTER(LEN=10), PARAMETER :: aname = "itestattr"! group name
+
+
+
+     INTEGER(HID_T) :: file_id       ! File identifier
+     INTEGER(HID_T) :: new_file_id   ! File identifier
+     INTEGER(HID_T) :: group_id      ! group identifier
+     INTEGER(HID_T) :: dset_id       ! Dataset identifier
+     INTEGER(HID_T) :: dspace_id     ! Dataspace identifier
+     INTEGER(HID_T) :: attr_id      ! Datatype attribute identifier
+     INTEGER(HID_T) :: aspace_id     ! attribute data space identifier
+     INTEGER(HID_T) :: atype_id     ! attribute data type identifier
+
+
+     INTEGER, DIMENSION(1) :: dset_data = 0 ! Data value
+
+     INTEGER(HSIZE_T), DIMENSION(1) :: dims = 1 ! Datasets dimensions
+     INTEGER(HSIZE_T), DIMENSION(1) :: adims = 1 ! Attribute dimensions
+
+     INTEGER, DIMENSION(1) ::  attr_data = 12
+     INTEGER     ::   rank = 1 ! Datasets rank
+     INTEGER     ::   arank = 1 ! Attribute rank
+
+     INTEGER     ::   type !object identifier
+     INTEGER     ::   error ! Error flag
+     INTEGER(HSIZE_T), DIMENSION(2) :: data_dims
+     CHARACTER(LEN=80) name_buf
+     CHARACTER(LEN=280) name_buf1
+     INTEGER(SIZE_T)   buf_size
+     INTEGER(SIZE_T)   name_size
+     INTEGER    ::    ref_count ! Reference count for IDs
+
+
+     INTEGER(hid_t) :: dtype  ! datatype id
+     LOGICAL :: tri_ret       ! value
+
+     !
+     ! Tests the function H5Iis_valid_f
+     !
+     ! check that the ID is not valid
+     dtype = -1
+     CALL H5Iis_valid_f(dtype, tri_ret, error)
+     CALL check("H5Iis_valid_f", error, total_error)
+     CALL verify("H5Iis_valid_f", tri_ret, .FALSE., total_error)
+
+     ! Create a datatype id
+     CALL H5Tcopy_f(H5T_NATIVE_INTEGER,dtype,error)
+     CALL check("H5Tcopy_f", error, total_error)
+
+     ! Check that the ID is valid
+     CALL H5Iis_valid_f(dtype, tri_ret, error)
+     CALL check("H5Iis_valid_f", error, total_error)
+     CALL verify("H5Tequal_f", tri_ret, .TRUE., total_error)
+
+     CALL H5Tclose_f(dtype, error)
+     CALL check("H5Tclose_f", error, total_error)
+
+     !
+     ! Create a new file using default properties.
+     !
+     CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
+          if (error .ne. 0) then
+              write(*,*) "Cannot modify filename"
+              stop
+     endif
+     CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
+     CALL check("h5fcreate_f",error,total_error)
+
+     !
+     ! Create a group named "/MyGroup" in the file.
+     !
+     CALL h5gcreate_f(file_id, groupname, group_id, error)
+     CALL check("h5gcreate_f",error,total_error)
+
+     !
+     !Create data space for the dataset.
+     !
+     CALL h5screate_simple_f(rank, dims, dspace_id, error)
+     CALL check("h5screate_simple_f",error,total_error)
+
+     !
+     ! create dataset in the file.
+     !
+     CALL h5dcreate_f(file_id, dsetname, H5T_NATIVE_INTEGER, dspace_id, &
+               dset_id, error)
+     CALL check("h5dcreate_f",error,total_error)
+     !
+     ! Get dataset name from dataset identifier
+     !
+     buf_size = 80
+     CALL h5iget_name_f(dset_id, name_buf, buf_size, name_size, error)
+     CALL check("h5iget_name_f",error,total_error)
+      if (name_size .ne. len(dsetname)) then
+          write(*,*) "h5iget_name returned wrong name size"
+          total_error = total_error + 1
+      else
+          if (name_buf(1:name_size) .ne. dsetname) then
+              write(*,*) "h5iget_name returned wrong name"
+              total_error = total_error + 1
+          endif
+      endif
+
+     !
+     ! Get file identifier from dataset identifier and then get file name
+     !
+     CALL h5iget_file_id_f(dset_id, new_file_id, error)
+     CALL check("h5iget_file_id_f",error,total_error)
+     name_size = 280
+     CALL h5fget_name_f(new_file_id, name_buf1, name_size, error)
+     CALL check("h5fget_name_f",error,total_error)
+          if (name_buf1(1:name_size) .ne. fix_filename(1:name_size)) then
+              write(*,*) "h5fget_name returned wrong file name"
+              total_error = total_error + 1
+          endif
+
+     !
+     ! Write data_in to the dataset
+     !
+     data_dims(1) = 1
+     CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, dset_data, data_dims, error)
+     CALL check("h5dwrite_f",error,total_error)
+
+     !
+     ! Create scalar data space for dataset attribute.
+     !
+     CALL h5screate_simple_f(arank, adims, aspace_id, error)
+     CALL check("h5screate_simple_f",error,total_error)
+
+     !
+     ! Create datatype for the Integer attribute.
+     !
+     CALL h5tcopy_f(H5T_NATIVE_INTEGER, atype_id, error)
+     CALL check("h5tcopy_f",error,total_error)
+
+     !
+     ! Create dataset INTEGER attribute.
+     !
+     CALL h5acreate_f(dset_id, aname, atype_id, aspace_id, attr_id, error)
+     CALL check("h5acreate_f",error,total_error)
+
+     !
+     ! Write the Integer attribute data.
+     !
+     CALL h5awrite_f(attr_id, atype_id, attr_data, data_dims, error)
+     CALL check("h5awrite_f",error,total_error)
+
+     !
+     !Get the file identifier
+     !
+     CALL h5iget_type_f(file_id, type, error)
+     CALL check("h5iget_type_f",error,total_error)
+     CALL verify("get file identifier wrong",type,H5I_FILE_F,total_error)
+
+     !
+     !Get the group identifier
+     !
+     CALL h5iget_type_f(group_id, type, error)
+     CALL check("h5iget_type_f",error,total_error)
+     CALL verify("get group identifier wrong",type,H5I_GROUP_F,total_error)
+
+     !
+     !Get the datatype identifier
+     !
+     CALL h5iget_type_f(atype_id, type, error)
+     CALL check("h5iget_type_f",error,total_error)
+     CALL verify("get datatype identifier wrong",type,H5I_DATATYPE_F,total_error)
+
+     !
+     !Get the dataspace identifier
+     !
+     CALL h5iget_type_f(aspace_id, type, error)
+     CALL check("h5iget_type_f",error,total_error)
+     CALL verify("get dataspace identifier wrong",type,H5I_DATASPACE_F,total_error)
+
+     !
+     !Get the dataset identifier
+     !
+     CALL h5iget_type_f(dset_id, type, error)
+     CALL check("h5iget_type_f",error,total_error)
+     CALL verify("get dataset identifier wrong",type,H5I_DATASET_F,total_error)
+
+     !
+     !Get the attribute identifier
+     !
+     CALL h5iget_type_f(attr_id, type, error)
+     CALL check("h5iget_type_f",error,total_error)
+     CALL verify("get attribute identifier wrong",type,H5I_ATTR_F,total_error)
+
+     !
+     ! Close the attribute.
+     !
+     CALL h5aclose_f(attr_id, error)
+     CALL check("h5aclose_f",error,total_error)
+     !
+     ! Close the dataspace.
+     !
+     CALL h5sclose_f(aspace_id, error)
+     CALL check("h5sclose_f",error,total_error)
+     CALL h5sclose_f(dspace_id, error)
+     CALL check("h5sclose_f",error,total_error)
+     !
+     ! Close the dataype.
+     !
+     CALL h5tclose_f(atype_id, error)
+     CALL check("h5tclose_f",error,total_error)
+
+     !
+     ! Close the dataset.
+     !
+     CALL h5dclose_f(dset_id, error)
+     CALL check("h5dclose_f",error,total_error)
+
+     !
+     ! Close the group.
+     !
+     CALL h5gclose_f(group_id, error)
+     CALL check("h5gclose_f",error,total_error)
+
+     !
+     ! Close the file.
+     !
+     CALL h5fclose_f(file_id, error)
+     CALL check("h5fclose_f",error,total_error)
+     CALL h5fclose_f(new_file_id, error)
+     CALL check("h5fclose_f",error,total_error)
+
+     !
+     ! Basic Test of increment/decrement ID functions
+     !
+
+     ! Create a file
+     CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
+     CALL check("h5fcreate_f",error,total_error)
+
+     ! Get the reference count for the file ID
+     CALL h5iget_ref_f(file_id, ref_count, error)
+     CALL check("h5iget_ref_f",error,total_error)
+     CALL verify("get file ref count wrong",ref_count,1,total_error)
+
+     ! Increment the reference count for the file ID
+     CALL h5iinc_ref_f(file_id, ref_count, error)
+     CALL check("h5iinc_ref_f",error,total_error)
+     CALL verify("get file ref count wrong",ref_count,2,total_error)
+
+     ! Close the file normally.
+     CALL h5fclose_f(file_id, error)
+     CALL check("h5fclose_f",error,total_error)
+
+     ! Get the reference count for the file ID
+     CALL h5iget_ref_f(file_id, ref_count, error)
+     CALL check("h5iget_ref_f",error,total_error)
+     CALL verify("get file ref count wrong",ref_count,1,total_error)
+
+     ! Close the file by decrementing the reference count
+     CALL h5idec_ref_f(file_id, ref_count, error)
+     CALL check("h5idec_ref_f",error,total_error)
+     CALL verify("get file ref count wrong",ref_count,0,total_error)
+     ! Try closing the file again (should fail)
+     CALL h5eset_auto_f(0, error)
+     CALL h5fclose_f(file_id, error)
+     CALL verify("file close should fail",error,-1,total_error)
+     ! Clear the error stack from the file close failure
+     CALL h5eset_auto_f(1, error)
+     CALL h5eclear_f(error)
+
+      if(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
+          CALL check("h5_cleanup_f", error, total_error)
+
+     RETURN
+     END SUBROUTINE identifier_test
+
+END MODULE TH5I
diff --git a/fortran/test/tH5I.f90 b/fortran/test/tH5I.f90
deleted file mode 100644
index 088b4eb..0000000
--- a/fortran/test/tH5I.f90
+++ /dev/null
@@ -1,319 +0,0 @@
-!****h* root/fortran/test/tH5I.f90
-!
-! NAME
-!  tH5I.f90
-!
-! FUNCTION
-!  Basic testing of Fortran H5I APIs.
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! CONTAINS SUBROUTINES
-!  identifier_test
-!
-!*****
-MODULE TH5I
-
-CONTAINS
-
-    SUBROUTINE identifier_test(cleanup, total_error)
-
-!   This subroutine tests following functionalities: h5iget_type_f
-
-   USE HDF5 ! This module contains all necessary modules
-   USE TH5_MISC
-
-     IMPLICIT NONE
-     LOGICAL, INTENT(IN)  :: cleanup
-     INTEGER, INTENT(INOUT) :: total_error
-
-     CHARACTER(LEN=6), PARAMETER :: filename = "itestf" ! File name
-     CHARACTER(LEN=80) :: fix_filename
-     CHARACTER(LEN=10), PARAMETER :: dsetname = "/itestdset" ! Dataset name
-     CHARACTER(LEN=10), PARAMETER :: groupname = "itestgroup"! group name
-     CHARACTER(LEN=10), PARAMETER :: aname = "itestattr"! group name
-
-
-
-     INTEGER(HID_T) :: file_id       ! File identifier
-     INTEGER(HID_T) :: new_file_id   ! File identifier
-     INTEGER(HID_T) :: group_id      ! group identifier
-     INTEGER(HID_T) :: dset_id       ! Dataset identifier
-     INTEGER(HID_T) :: dspace_id     ! Dataspace identifier
-     INTEGER(HID_T) :: attr_id      ! Datatype attribute identifier
-     INTEGER(HID_T) :: aspace_id     ! attribute data space identifier
-     INTEGER(HID_T) :: atype_id     ! attribute data type identifier
-
-
-     INTEGER, DIMENSION(1) :: dset_data = 0 ! Data value
-
-     INTEGER(HSIZE_T), DIMENSION(1) :: dims = 1 ! Datasets dimensions
-     INTEGER(HSIZE_T), DIMENSION(1) :: adims = 1 ! Attribute dimensions
-
-     INTEGER, DIMENSION(1) ::  attr_data = 12
-     INTEGER     ::   rank = 1 ! Datasets rank
-     INTEGER     ::   arank = 1 ! Attribute rank
-
-     INTEGER     ::   type !object identifier
-     INTEGER     ::   error ! Error flag
-     INTEGER(HSIZE_T), DIMENSION(2) :: data_dims
-     CHARACTER(LEN=80) name_buf
-     CHARACTER(LEN=280) name_buf1
-     INTEGER(SIZE_T)   buf_size
-     INTEGER(SIZE_T)   name_size
-     INTEGER    ::    ref_count ! Reference count for IDs
-
-
-     INTEGER(hid_t) :: dtype  ! datatype id
-     LOGICAL :: tri_ret       ! value
-
-     !
-     ! Tests the function H5Iis_valid_f
-     !
-     ! check that the ID is not valid
-     dtype = -1
-     CALL H5Iis_valid_f(dtype, tri_ret, error)
-     CALL check("H5Iis_valid_f", error, total_error) 
-     CALL VerifyLogical("H5Iis_valid_f", tri_ret, .FALSE., total_error)
-     
-     ! Create a datatype id
-     CALL H5Tcopy_f(H5T_NATIVE_INTEGER,dtype,error)
-     CALL check("H5Tcopy_f", error, total_error) 
-     
-     ! Check that the ID is valid
-     CALL H5Iis_valid_f(dtype, tri_ret, error)
-     CALL check("H5Iis_valid_f", error, total_error) 
-     CALL VerifyLogical("H5Tequal_f", tri_ret, .TRUE., total_error)
-     
-     CALL H5Tclose_f(dtype, error)
-     CALL check("H5Tclose_f", error, total_error) 
-  
-     !
-     ! Create a new file using default properties.
-     !
-     CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
-          if (error .ne. 0) then
-              write(*,*) "Cannot modify filename"
-              stop
-     endif
-     CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
-     CALL check("h5fcreate_f",error,total_error)
-
-     !
-     ! Create a group named "/MyGroup" in the file.
-     !
-     CALL h5gcreate_f(file_id, groupname, group_id, error)
-     CALL check("h5gcreate_f",error,total_error)
-
-     !
-     !Create data space for the dataset.
-     !
-     CALL h5screate_simple_f(rank, dims, dspace_id, error)
-     CALL check("h5screate_simple_f",error,total_error)
-
-     !
-     ! create dataset in the file.
-     !
-     CALL h5dcreate_f(file_id, dsetname, H5T_NATIVE_INTEGER, dspace_id, &
-               dset_id, error)
-     CALL check("h5dcreate_f",error,total_error)
-     !
-     ! Get dataset name from dataset identifier
-     !
-     buf_size = 80
-     CALL h5iget_name_f(dset_id, name_buf, buf_size, name_size, error)
-     CALL check("h5iget_name_f",error,total_error)
-      if (name_size .ne. len(dsetname)) then
-          write(*,*) "h5iget_name returned wrong name size"
-          total_error = total_error + 1
-      else
-          if (name_buf(1:name_size) .ne. dsetname) then
-              write(*,*) "h5iget_name returned wrong name"
-              total_error = total_error + 1
-          endif
-      endif
-
-     !
-     ! Get file identifier from dataset identifier and then get file name
-     !
-     CALL h5iget_file_id_f(dset_id, new_file_id, error)
-     CALL check("h5iget_file_id_f",error,total_error)
-     name_size = 280
-     CALL h5fget_name_f(new_file_id, name_buf1, name_size, error)
-     CALL check("h5fget_name_f",error,total_error)
-          if (name_buf1(1:name_size) .ne. fix_filename(1:name_size)) then
-              write(*,*) "h5fget_name returned wrong file name"
-              total_error = total_error + 1
-          endif
-
-     !
-     ! Write data_in to the dataset
-     !
-     data_dims(1) = 1
-     CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, dset_data, data_dims, error)
-     CALL check("h5dwrite_f",error,total_error)
-
-     !
-     ! Create scalar data space for dataset attribute.
-     !
-     CALL h5screate_simple_f(arank, adims, aspace_id, error)
-     CALL check("h5screate_simple_f",error,total_error)
-
-     !
-     ! Create datatype for the Integer attribute.
-     !
-     CALL h5tcopy_f(H5T_NATIVE_INTEGER, atype_id, error)
-     CALL check("h5tcopy_f",error,total_error)
-
-     !
-     ! Create dataset INTEGER attribute.
-     !
-     CALL h5acreate_f(dset_id, aname, atype_id, aspace_id, attr_id, error)
-     CALL check("h5acreate_f",error,total_error)
-
-     !
-     ! Write the Integer attribute data.
-     !
-     CALL h5awrite_f(attr_id, atype_id, attr_data, data_dims, error)
-     CALL check("h5awrite_f",error,total_error)
-
-     !
-     !Get the file identifier
-     !
-     CALL h5iget_type_f(file_id, type, error)
-     CALL check("h5iget_type_f",error,total_error)
-     CALL verify("get file identifier wrong",type,H5I_FILE_F,total_error)
-
-     !
-     !Get the group identifier
-     !
-     CALL h5iget_type_f(group_id, type, error)
-     CALL check("h5iget_type_f",error,total_error)
-     CALL verify("get group identifier wrong",type,H5I_GROUP_F,total_error)
-
-     !
-     !Get the datatype identifier
-     !
-     CALL h5iget_type_f(atype_id, type, error)
-     CALL check("h5iget_type_f",error,total_error)
-     CALL verify("get datatype identifier wrong",type,H5I_DATATYPE_F,total_error)
-
-     !
-     !Get the dataspace identifier
-     !
-     CALL h5iget_type_f(aspace_id, type, error)
-     CALL check("h5iget_type_f",error,total_error)
-     CALL verify("get dataspace identifier wrong",type,H5I_DATASPACE_F,total_error)
-
-     !
-     !Get the dataset identifier
-     !
-     CALL h5iget_type_f(dset_id, type, error)
-     CALL check("h5iget_type_f",error,total_error)
-     CALL verify("get dataset identifier wrong",type,H5I_DATASET_F,total_error)
-
-     !
-     !Get the attribute identifier
-     !
-     CALL h5iget_type_f(attr_id, type, error)
-     CALL check("h5iget_type_f",error,total_error)
-     CALL verify("get attribute identifier wrong",type,H5I_ATTR_F,total_error)
-
-     !
-     ! Close the attribute.
-     !
-     CALL h5aclose_f(attr_id, error)
-     CALL check("h5aclose_f",error,total_error)
-     !
-     ! Close the dataspace.
-     !
-     CALL h5sclose_f(aspace_id, error)
-     CALL check("h5sclose_f",error,total_error)
-     CALL h5sclose_f(dspace_id, error)
-     CALL check("h5sclose_f",error,total_error)
-     !
-     ! Close the dataype.
-     !
-     CALL h5tclose_f(atype_id, error)
-     CALL check("h5tclose_f",error,total_error)
-
-     !
-     ! Close the dataset.
-     !
-     CALL h5dclose_f(dset_id, error)
-     CALL check("h5dclose_f",error,total_error)
-
-     !
-     ! Close the group.
-     !
-     CALL h5gclose_f(group_id, error)
-     CALL check("h5gclose_f",error,total_error)
-
-     !
-     ! Close the file.
-     !
-     CALL h5fclose_f(file_id, error)
-     CALL check("h5fclose_f",error,total_error)
-     CALL h5fclose_f(new_file_id, error)
-     CALL check("h5fclose_f",error,total_error)
-
-     !
-     ! Basic Test of increment/decrement ID functions
-     !
-
-     ! Create a file
-     CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
-     CALL check("h5fcreate_f",error,total_error)
-
-     ! Get the reference count for the file ID
-     CALL h5iget_ref_f(file_id, ref_count, error)
-     CALL check("h5iget_ref_f",error,total_error)
-     CALL verify("get file ref count wrong",ref_count,1,total_error)
-
-     ! Increment the reference count for the file ID
-     CALL h5iinc_ref_f(file_id, ref_count, error)
-     CALL check("h5iinc_ref_f",error,total_error)
-     CALL verify("get file ref count wrong",ref_count,2,total_error)
-
-     ! Close the file normally.
-     CALL h5fclose_f(file_id, error)
-     CALL check("h5fclose_f",error,total_error)
-
-     ! Get the reference count for the file ID
-     CALL h5iget_ref_f(file_id, ref_count, error)
-     CALL check("h5iget_ref_f",error,total_error)
-     CALL verify("get file ref count wrong",ref_count,1,total_error)
-
-     ! Close the file by decrementing the reference count
-     CALL h5idec_ref_f(file_id, ref_count, error)
-     CALL check("h5idec_ref_f",error,total_error)
-     CALL verify("get file ref count wrong",ref_count,0,total_error)
-     ! Try closing the file again (should fail)
-     CALL h5eset_auto_f(0, error)
-     CALL h5fclose_f(file_id, error)
-     CALL verify("file close should fail",error,-1,total_error)
-     ! Clear the error stack from the file close failure
-     CALL h5eset_auto_f(1, error)
-     CALL h5eclear_f(error)
-
-      if(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
-          CALL check("h5_cleanup_f", error, total_error)
-
-     RETURN
-     END SUBROUTINE identifier_test
-
-END MODULE TH5I
diff --git a/fortran/test/tH5L_F03.F90 b/fortran/test/tH5L_F03.F90
new file mode 100644
index 0000000..e09ad5e
--- /dev/null
+++ b/fortran/test/tH5L_F03.F90
@@ -0,0 +1,316 @@
+!****h* root/fortran/test/tH5L_F03.f90
+!
+! NAME
+!  tH5L_F03.f90
+!
+! FUNCTION
+!  Test FORTRAN HDF5 H5L APIs which are dependent on FORTRAN 2003
+!  features.
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+! USES
+!  liter_cb_mod
+!
+! CONTAINS SUBROUTINES
+!  test_iter_group
+!
+!*****
+MODULE liter_cb_mod
+
+  USE HDF5
+  USE TH5_MISC
+  USE TH5_MISC_GEN
+  USE, INTRINSIC :: ISO_C_BINDING
+  IMPLICIT NONE
+
+  TYPE iter_enum
+     INTEGER RET_ZERO
+     INTEGER RET_TWO
+     INTEGER RET_CHANGE
+     INTEGER RET_CHANGE2
+  END TYPE iter_enum
+
+  ! Custom group iteration callback data
+  TYPE, bind(c) ::  iter_info
+     CHARACTER(KIND=C_CHAR), DIMENSION(1:10) :: name !  The name of the object
+     INTEGER(c_int) :: TYPE    !  The TYPE of the object
+     INTEGER(c_int) :: command ! The TYPE of RETURN value
+  END TYPE iter_info
+
+CONTAINS
+
+!***************************************************************
+!**
+!**  liter_cb(): Custom link iteration callback routine.
+!**
+!***************************************************************
+
+  INTEGER(KIND=C_INT) FUNCTION liter_cb(group, name, link_info, op_data) bind(C)
+
+    IMPLICIT NONE
+
+    INTEGER(HID_T), VALUE :: group
+    CHARACTER(LEN=1), DIMENSION(1:10) :: name
+
+
+    TYPE (H5L_info_t) :: link_info
+
+    TYPE(iter_info) :: op_data
+
+    INTEGER, SAVE :: count
+    INTEGER, SAVE :: count2
+
+    liter_cb = 0
+
+!!$    iter_info *info = (iter_info *)op_data;
+!!$    static int count = 0;
+!!$    static int count2 = 0;
+
+    op_data%name(1:10) = name(1:10)
+
+    SELECT CASE (op_data%command)
+
+    CASE(0)
+       liter_cb = 0
+    CASE(2)
+       liter_cb = 2
+    CASE(3)
+       count = count + 1
+       IF(count.GT.10) THEN
+          liter_cb = 1
+       ELSE
+          liter_cb = 0
+       ENDIF
+    CASE(4)
+       count2 = count2 + 1
+       IF(count2.GT.10) THEN
+          liter_cb = 1
+       ELSE
+          liter_cb = 0
+       ENDIF
+    END SELECT
+
+  END FUNCTION liter_cb
+END MODULE liter_cb_mod
+
+MODULE TH5L_F03
+
+CONTAINS
+
+! *****************************************
+! ***        H 5 L   T E S T S
+! *****************************************
+
+
+!***************************************************************
+!**
+!**  test_iter_group(): Test group iteration functionality
+!**
+!***************************************************************
+SUBROUTINE test_iter_group(total_error)
+
+  USE liter_cb_mod
+  IMPLICIT NONE
+
+  INTEGER, INTENT(INOUT) :: total_error
+  INTEGER(HID_T) :: fapl
+  INTEGER(HID_T) :: file             !  File ID
+  INTEGER(hid_t) :: dataset          ! Dataset ID
+  INTEGER(hid_t) :: datatype         ! Common datatype ID
+  INTEGER(hid_t) :: filespace        ! Common dataspace ID
+  INTEGER(hid_t) :: grp              ! Group ID
+  INTEGER i,j                        ! counting variable
+  INTEGER(hsize_t) idx               ! Index in the group
+  CHARACTER(LEN=11) :: DATAFILE = "titerate.h5"
+  INTEGER, PARAMETER :: ndatasets = 50
+  CHARACTER(LEN=10) :: name !  temporary name buffer
+  CHARACTER(LEN=10), DIMENSION(1:ndatasets+2) :: lnames !  Names of the links created
+
+  TYPE(iter_info), TARGET :: info
+
+  INTEGER :: error
+  INTEGER :: ret_value
+  TYPE(C_FUNPTR) :: f1
+  TYPE(C_PTR) :: f2
+  CHARACTER(LEN=2) :: ichr2
+  CHARACTER(LEN=10) :: ichr10
+
+  ! Get the default FAPL
+  CALL H5Pcreate_f(H5P_FILE_ACCESS_F, fapl, error)
+  CALL check("h5pcreate_f", error, total_error)
+
+  ! Set the "use the latest version of the format" bounds for creating objects in the file
+  CALL H5Pset_libver_bounds_f(fapl, H5F_LIBVER_LATEST_F, H5F_LIBVER_LATEST_F, error)
+  CALL check("H5Pset_libver_bounds_f",error, total_error)
+
+  ! Create the test file with the datasets
+  CALL h5fcreate_f(DATAFILE, H5F_ACC_TRUNC_F, file, error, H5P_DEFAULT_F, fapl)
+  CALL check("h5fcreate_f", error, total_error)
+
+  ! Test iterating over empty group
+  idx = 0
+  info%command = 0
+  f1 = C_FUNLOC(liter_cb)
+  f2 = C_LOC(info)
+
+
+  CALL H5Literate_f(file, H5_INDEX_NAME_F, H5_ITER_INC_F, idx, f1, f2, ret_value, error)
+  CALL check("H5Literate_f", error, total_error)
+
+  CALL H5Tcopy_f(H5T_NATIVE_INTEGER, datatype, error)
+  CALL check("H5Tcopy_f", error, total_error)
+
+  CALL H5Screate_f(H5S_SCALAR_F, filespace, error)
+  CALL check("H5Screate_f", error, total_error)
+
+  DO i = 1, ndatasets
+     WRITE(ichr2, '(I2.2)') i
+
+     name = 'Dataset '//ichr2
+
+     CALL h5dcreate_f(file, name, datatype, filespace, dataset, error)
+     CALL check("H5dcreate_f", error, total_error)
+
+     lnames(i) = name
+
+     CALL h5dclose_f(dataset,error)
+     CALL check("H5dclose_f", error, total_error)
+
+  ENDDO
+
+  !  Create a group and named datatype under root group for testing
+
+  CALL H5Gcreate_f(file, "grp0000000", grp, error)
+  CALL check("H5Gcreate_f", error, total_error)
+
+  lnames(ndatasets+2) = "grp0000000"
+
+!!$
+!!$    lnames[NDATASETS] = HDstrdup("grp");
+!!$    CHECK(lnames[NDATASETS], NULL, "strdup");
+!!$
+
+  CALL H5Tcommit_f(file, "dtype00000", datatype, error)
+  CALL check("H5Tcommit_f", error, total_error)
+
+  lnames(ndatasets+1) = "dtype00000"
+
+  !  Close everything up
+
+  CALL H5Tclose_f(datatype, error)
+  CALL check("H5Tclose_f", error, total_error)
+
+  CALL H5Gclose_f(grp, error)
+  CALL check("H5Gclose_f", error, total_error)
+
+  CALL H5Sclose_f(filespace, error)
+  CALL check("H5Sclose_f", error, total_error)
+
+  CALL H5Fclose_f(file, error)
+  CALL check("H5Fclose_f", error, total_error)
+
+  !  Iterate through the datasets in the root group in various ways
+  CALL H5Fopen_f(DATAFILE, H5F_ACC_RDONLY_F, file, error, access_prp=fapl)
+  CALL check("h5fopen_f", error, total_error)
+
+  ! Test all objects in group, when callback always returns 0
+  info%command = 0
+  idx = 0
+  CALL H5Literate_f(file, H5_INDEX_NAME_F, H5_ITER_INC_F, idx, f1, f2, ret_value, error)
+  IF(ret_value.GT.0)THEN
+     PRINT*,"ERROR: Group iteration function didn't return zero correctly!"
+     CALL verify("H5Literate_f", error, -1, total_error)
+  ENDIF
+
+  !   Test all objects in group, when callback always returns 1
+  !   This also tests the "restarting" ability, because the index changes
+
+  info%command = 2
+  idx = 0
+  i = 0
+  f1 = C_FUNLOC(liter_cb)
+  f2 = C_LOC(info)
+  DO
+     CALL H5Literate_f(file, H5_INDEX_NAME_F, H5_ITER_INC_F, idx, f1, f2, ret_value, error)
+     IF(error.LT.0) EXIT
+     !  Verify return value from iterator gets propagated correctly
+     CALL verify("H5Literate", ret_value, 2, total_error)
+     !  Increment the number of times "2" is returned
+     i = i + 1
+     ! Verify that the index is the correct value
+     CALL verify("H5Literate", INT(idx), INT(i), total_error)
+     IF(idx .GT.ndatasets+2)THEN
+        PRINT*,"ERROR: Group iteration function walked too far!"
+     ENDIF
+
+     ! Verify the correct name is retrieved
+     DO j = 1, 10
+        ichr10(j:j) = info%name(j)(1:1)
+     ENDDO
+     CALL verify("H5Literate_f", ichr10, lnames(INT(idx)), total_error)
+     IF(i.EQ.52)EXIT ! prints out error message otherwise (for gcc/gfortran/g95) not intel (why) -FIXME- scot
+  END DO
+
+  ! put check if did not walk far enough -scot FIXME
+
+  IF(i .NE. (NDATASETS + 2)) THEN
+     CALL verify("H5Literate_f", i, INT(NDATASETS + 2), total_error)
+     PRINT*,"ERROR: Group iteration function didn't perform multiple iterations correctly"
+  ENDIF
+
+  ! Test all objects in group, when callback changes return value
+  ! This also tests the "restarting" ability, because the index changes
+
+  info%command = 3
+  idx = 0
+  i = 0
+
+  f1 = C_FUNLOC(liter_cb)
+  f2 = C_LOC(info)
+  DO
+
+     CALL H5Literate_f(file, H5_INDEX_NAME_F, H5_ITER_INC_F, idx, f1, f2, ret_value, error)
+     IF(error.LT.0) EXIT
+     CALL verify("H5Literate_f", ret_value, 1, total_error)
+
+     ! Increment the number of times "1" is returned
+     i = i + 1
+
+     ! Verify that the index is the correct value
+     CALL verify("H5Literate_f", INT(idx), INT(i+10), total_error)
+
+     IF(idx .GT.ndatasets+2)THEN
+        PRINT*,"Group iteration function walked too far!"
+     ENDIF
+
+     DO j = 1, 10
+        ichr10(j:j) = info%name(j)(1:1)
+     ENDDO
+     ! Verify that the correct name is retrieved
+     CALL verify("H5Literate_f", ichr10, lnames(INT(idx)), total_error)
+     IF(i.EQ.42)EXIT ! prints out error message otherwise (for gcc/gfortran/g95) not intel (why) -FIX- scot
+  ENDDO
+
+  IF(i .NE. 42 .OR. idx .NE. 52)THEN
+     PRINT*,"ERROR: Group iteration function didn't perform multiple iterations correctly!"
+     CALL check("H5Literate_f",-1,total_error)
+  ENDIF
+
+  CALL H5Fclose_f(file, error)
+  CALL check("H5Fclose_f", error, total_error)
+
+END SUBROUTINE test_iter_group
+
+END MODULE TH5L_F03
diff --git a/fortran/test/tH5L_F03.f90 b/fortran/test/tH5L_F03.f90
deleted file mode 100644
index 795f1e2..0000000
--- a/fortran/test/tH5L_F03.f90
+++ /dev/null
@@ -1,321 +0,0 @@
-!****h* root/fortran/test/tH5L_F03.f90
-!
-! NAME
-!  tH5L_F03.f90
-!
-! FUNCTION
-!  Test FORTRAN HDF5 H5L APIs which are dependent on FORTRAN 2003
-!  features. 
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! USES
-!  liter_cb_mod
-!
-! CONTAINS SUBROUTINES
-!  test_iter_group
-!
-!*****
-MODULE liter_cb_mod
-
-  USE HDF5
-  USE ISO_C_BINDING
-  IMPLICIT NONE
-
-  TYPE iter_enum
-     INTEGER RET_ZERO
-     INTEGER RET_TWO
-     INTEGER RET_CHANGE
-     INTEGER RET_CHANGE2
-  END TYPE iter_enum
-
-  ! Custom group iteration callback data 
-  TYPE, bind(c) ::  iter_info
-     CHARACTER(LEN=1), DIMENSION(1:10) :: name !  The name of the object 
-     INTEGER(c_int) :: TYPE    !  The TYPE of the object 
-     INTEGER(c_int) :: command ! The TYPE of RETURN value 
-  END TYPE iter_info
-
-CONTAINS
-
-!***************************************************************
-!**
-!**  liter_cb(): Custom link iteration callback routine.
-!**
-!***************************************************************
-
-  INTEGER(KIND=C_INT) FUNCTION liter_cb(group, name, link_info, op_data) bind(C)
-
-    USE HDF5
-    USE ISO_C_BINDING
-    IMPLICIT NONE
-
-    INTEGER(HID_T), VALUE :: group
-    CHARACTER(LEN=1), DIMENSION(1:10) :: name
-
-
-    TYPE (H5L_info_t) :: link_info
-
-    TYPE(iter_info) :: op_data
-
-    INTEGER, SAVE :: count
-    INTEGER, SAVE :: count2
-
-!!$    
-!!$    iter_info *info = (iter_info *)op_data;
-!!$    static int count = 0;
-!!$    static int count2 = 0;
-
-    op_data%name(1:10) = name(1:10)
-
-    SELECT CASE (op_data%command)
-
-    CASE(0)
-       liter_cb = 0
-    CASE(2)
-       liter_cb = 2
-    CASE(3)
-       count = count + 1
-       IF(count.GT.10) THEN
-          liter_cb = 1
-       ELSE
-          liter_cb = 0
-       ENDIF
-    CASE(4)
-       count2 = count2 + 1
-       IF(count2.GT.10) THEN
-          liter_cb = 1
-       ELSE
-          liter_cb = 0
-       ENDIF
-    END SELECT
-
-  END FUNCTION liter_cb
-END MODULE liter_cb_mod
-
-MODULE TH5L_F03
-
-CONTAINS
-
-! *****************************************
-! ***        H 5 L   T E S T S
-! *****************************************
-
-
-!***************************************************************
-!**
-!**  test_iter_group(): Test group iteration functionality
-!**
-!***************************************************************
-SUBROUTINE test_iter_group(total_error)
-
-  USE HDF5 
-  USE TH5_MISC
-  USE ISO_C_BINDING
-  USE liter_cb_mod
-  IMPLICIT NONE
-
-  INTEGER, INTENT(INOUT) :: total_error
-  INTEGER(HID_T) :: fapl
-  INTEGER(HID_T) :: file             !  File ID 
-  INTEGER(hid_t) :: dataset          ! Dataset ID 
-  INTEGER(hid_t) :: datatype         ! Common datatype ID 
-  INTEGER(hid_t) :: filespace        ! Common dataspace ID 
-  INTEGER(hid_t) :: grp              ! Group ID 
-  INTEGER i,j                        ! counting variable 
-  INTEGER(hsize_t) idx               ! Index in the group 
-  CHARACTER(LEN=11) :: DATAFILE = "titerate.h5"
-  INTEGER, PARAMETER :: ndatasets = 50
-  CHARACTER(LEN=10) :: name !  temporary name buffer 
-  CHARACTER(LEN=10), DIMENSION(1:ndatasets+2) :: lnames !  Names of the links created 
-
-  TYPE(iter_info), TARGET :: info
-
-  INTEGER :: error
-  INTEGER :: ret_value
-  TYPE(C_FUNPTR) :: f1
-  TYPE(C_PTR) :: f2
-  CHARACTER(LEN=2) :: ichr2
-  CHARACTER(LEN=10) :: ichr10
-
-  ! Get the default FAPL 
-  CALL H5Pcreate_f(H5P_FILE_ACCESS_F, fapl, error)
-  CALL check("h5pcreate_f", error, total_error)
-
-  ! Set the "use the latest version of the format" bounds for creating objects in the file 
-  CALL H5Pset_libver_bounds_f(fapl, H5F_LIBVER_LATEST_F, H5F_LIBVER_LATEST_F, error)
-  CALL check("H5Pset_libver_bounds_f",error, total_error)
-
-  ! Create the test file with the datasets 
-  CALL h5fcreate_f(DATAFILE, H5F_ACC_TRUNC_F, file, error, H5P_DEFAULT_F, fapl)
-  CALL check("h5fcreate_f", error, total_error)
-
-  ! Test iterating over empty group
-  idx = 0
-  info%command = 0
-  f1 = C_FUNLOC(liter_cb)
-  f2 = C_LOC(info)
-
-
-  CALL H5Literate_f(file, H5_INDEX_NAME_F, H5_ITER_INC_F, idx, f1, f2, ret_value, error)
-  CALL check("H5Literate_f", error, total_error)
-
-  CALL H5Tcopy_f(H5T_NATIVE_INTEGER, datatype, error)
-  CALL check("H5Tcopy_f", error, total_error)
-
-  CALL H5Screate_f(H5S_SCALAR_F, filespace, error)
-  CALL check("H5Screate_f", error, total_error)
-
-  DO i = 1, ndatasets
-     WRITE(ichr2, '(I2.2)') i
-
-     name = 'Dataset '//ichr2
-
-     CALL h5dcreate_f(file, name, datatype, filespace, dataset, error)
-     CALL check("H5dcreate_f", error, total_error)
-
-     lnames(i) = name
-
-     CALL h5dclose_f(dataset,error)
-     CALL check("H5dclose_f", error, total_error)
-
-  ENDDO
-
-  !  Create a group and named datatype under root group for testing 
-
-  CALL H5Gcreate_f(file, "grp0000000", grp, error)
-  CALL check("H5Gcreate_f", error, total_error)
-
-  lnames(ndatasets+2) = "grp0000000" 
-
-!!$
-!!$    lnames[NDATASETS] = HDstrdup("grp");
-!!$    CHECK(lnames[NDATASETS], NULL, "strdup");
-!!$
-
-  CALL H5Tcommit_f(file, "dtype00000", datatype, error)
-  CALL check("H5Tcommit_f", error, total_error)
-
-  lnames(ndatasets+1) = "dtype00000" 
-
-  !  Close everything up 
-
-  CALL H5Tclose_f(datatype, error)
-  CALL check("H5Tclose_f", error, total_error)
-
-  CALL H5Gclose_f(grp, error)
-  CALL check("H5Gclose_f", error, total_error)
-
-  CALL H5Sclose_f(filespace, error)
-  CALL check("H5Sclose_f", error, total_error)
-
-  CALL H5Fclose_f(file, error)
-  CALL check("H5Fclose_f", error, total_error)
-
-  !  Iterate through the datasets in the root group in various ways 
-  CALL H5Fopen_f(DATAFILE, H5F_ACC_RDONLY_F, file, error, access_prp=fapl)
-  CALL check("h5fopen_f", error, total_error)
-
-  ! Test all objects in group, when callback always returns 0 
-  info%command = 0
-  idx = 0
-  CALL H5Literate_f(file, H5_INDEX_NAME_F, H5_ITER_INC_F, idx, f1, f2, ret_value, error)
-  IF(ret_value.GT.0)THEN
-     PRINT*,"ERROR: Group iteration function didn't return zero correctly!"
-     CALL verify("H5Literate_f", error, -1, total_error)
-  ENDIF
-
-  !   Test all objects in group, when callback always returns 1 
-  !   This also tests the "restarting" ability, because the index changes 
-
-  info%command = 2
-  idx = 0
-  i = 0
-  f1 = C_FUNLOC(liter_cb)
-  f2 = C_LOC(info)
-  DO 
-     CALL H5Literate_f(file, H5_INDEX_NAME_F, H5_ITER_INC_F, idx, f1, f2, ret_value, error)
-     IF(error.LT.0) EXIT
-     !  Verify return value from iterator gets propagated correctly 
-     CALL VERIFY("H5Literate", ret_value, 2, total_error)
-     !  Increment the number of times "2" is returned 
-     i = i + 1
-     ! Verify that the index is the correct value 
-     CALL VERIFY("H5Literate", INT(idx), INT(i), total_error)
-     IF(idx .GT.ndatasets+2)THEN
-        PRINT*,"ERROR: Group iteration function walked too far!"
-     ENDIF
-
-     ! Verify the correct name is retrieved 
-     DO j = 1, 10
-        ichr10(j:j) = info%name(j)(1:1)
-     ENDDO
-     CALL verifystring("H5Literate_f", ichr10, lnames(INT(idx)), total_error)
-     IF(i.EQ.52)EXIT ! prints out error message otherwise (for gcc/gfortran/g95) not intel (why) -FIXME- scot
-  END DO
-
-  ! put check if did not walk far enough -scot FIXME
-
-  IF(i .NE. (NDATASETS + 2)) THEN
-     CALL VERIFY("H5Literate_f", i, INT(NDATASETS + 2), total_error)
-     PRINT*,"ERROR: Group iteration function didn't perform multiple iterations correctly"
-  ENDIF
-
-  ! Test all objects in group, when callback changes return value 
-  ! This also tests the "restarting" ability, because the index changes 
-
-  info%command = 3
-  idx = 0
-  i = 0
-
-  f1 = C_FUNLOC(liter_cb)
-  f2 = C_LOC(info)
-  DO
-
-     CALL H5Literate_f(file, H5_INDEX_NAME_F, H5_ITER_INC_F, idx, f1, f2, ret_value, error)
-     IF(error.LT.0) EXIT
-     CALL VERIFY("H5Literate_f", ret_value, 1, total_error)
-
-     ! Increment the number of times "1" is returned 
-     i = i + 1
-
-     ! Verify that the index is the correct value 
-     CALL VERIFY("H5Literate_f", INT(idx), INT(i+10), total_error)
-
-     IF(idx .GT.ndatasets+2)THEN
-        PRINT*,"Group iteration function walked too far!"
-     ENDIF
-
-     DO j = 1, 10
-        ichr10(j:j) = info%name(j)(1:1)
-     ENDDO
-     ! Verify that the correct name is retrieved 
-     CALL verifystring("H5Literate_f", ichr10, lnames(INT(idx)), total_error)
-     IF(i.EQ.42)EXIT ! prints out error message otherwise (for gcc/gfortran/g95) not intel (why) -FIX- scot
-  ENDDO
-
-  IF(i .NE. 42 .OR. idx .NE. 52)THEN
-     PRINT*,"ERROR: Group iteration function didn't perform multiple iterations correctly!"
-     CALL check("H5Literate_f",-1,total_error)
-  ENDIF
-
-  CALL H5Fclose_f(file, error)
-  CALL check("H5Fclose_f", error, total_error)
-
-END SUBROUTINE test_iter_group
-
-END MODULE TH5L_F03
diff --git a/fortran/test/tH5MISC_1_8.F90 b/fortran/test/tH5MISC_1_8.F90
new file mode 100644
index 0000000..2eea6ba
--- /dev/null
+++ b/fortran/test/tH5MISC_1_8.F90
@@ -0,0 +1,485 @@
+!****h* root/fortran/test/tH5MISC_1_8.f90
+!
+! NAME
+!  tH5MISC_1_8.f90
+!
+! FUNCTION
+!  Basic testing of Fortran API's introduced in 1.8 release.
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+!*****
+MODULE TH5MISC_1_8
+
+  USE HDF5 ! This module contains all necessary modules
+  USE TH5_MISC
+  USE TH5_MISC_GEN
+
+CONTAINS
+
+SUBROUTINE dtransform(cleanup, total_error)
+
+  IMPLICIT NONE
+  LOGICAL, INTENT(IN)  :: cleanup
+  INTEGER, INTENT(INOUT) :: total_error
+
+  INTEGER(HID_T) :: dxpl_id_c_to_f
+  INTEGER(HID_T) :: file_id
+
+  CHARACTER(LEN=15), PARAMETER :: c_to_f = "(9/5.0)*x + 123"
+  INTEGER :: error
+  CHARACTER(LEN=15) :: ptrgetTest
+  CHARACTER(LEN=7) :: ptrgetTest_small
+  CHARACTER(LEN=30) :: ptrgetTest_big
+
+  INTEGER(SIZE_T) :: size
+
+  CALL H5Fcreate_f("dtransform.h5", H5F_ACC_TRUNC_F, file_id, error)
+  CALL check("dtransform.H5Fcreate_f", error, total_error)
+
+  CALL H5Pcreate_f(H5P_DATASET_XFER_F, dxpl_id_c_to_f, error)
+  CALL check("dtransform.H5Pcreate_f", error, total_error)
+
+  CALL H5Pset_data_transform_f(dxpl_id_c_to_f, c_to_f, error)
+  CALL check("dtransform.H5Pset_data_transform_f", error, total_error)
+
+  CALL H5Pget_data_transform_f(dxpl_id_c_to_f, ptrgetTest, error, size=size)
+  CALL check("dtransform.H5Pget_data_transform_f",  error, total_error)
+  CALL verify("dtransform.H5Pget_data_transform_f", c_to_f, ptrgetTest, total_error)
+  CALL verify("dtransform.H5Pget_data_transform_f", INT(size),15, total_error)
+
+! check case when receiving buffer to small
+
+  CALL H5Pget_data_transform_f(dxpl_id_c_to_f, ptrgetTest_small, error, size=size)
+  CALL check("dtransform.H5Pget_data_transform_f",  error, total_error)
+  CALL verify("dtransform.H5Pget_data_transform_f", c_to_f(1:7), ptrgetTest_small, total_error)
+  CALL verify("dtransform.H5Pget_data_transform_f", INT(size),15, total_error)
+
+! check case when receiving buffer to big
+
+  CALL H5Pget_data_transform_f(dxpl_id_c_to_f, ptrgetTest_big, error, size=size)
+  CALL check("dtransform.H5Pget_data_transform_f",  error, total_error)
+  CALL verify("dtransform.H5Pget_data_transform_f", c_to_f(1:15), ptrgetTest_big(1:15), total_error)
+  CALL verify("dtransform.H5Pget_data_transform_f", INT(size), 15, total_error)
+
+  CALL H5Fclose_f(file_id, error)
+  CALL check("H5Fclose_f", error, total_error)
+
+  IF(cleanup) CALL h5_cleanup_f("dtransform", H5P_DEFAULT_F, error)
+  CALL check("h5_cleanup_f", error, total_error)
+
+END SUBROUTINE dtransform
+
+
+!***************************************************************
+!**
+!**  test_genprop_basic_class(): Test basic generic property list code.
+!**      Tests creating new generic classes.
+!**
+!***************************************************************
+
+SUBROUTINE test_genprop_basic_class(total_error)
+
+  IMPLICIT NONE
+  INTEGER, INTENT(INOUT) :: total_error
+
+  INTEGER(HID_T) :: cid1    ! Generic Property class ID
+  INTEGER(HID_T) :: cid2    ! Generic Property class ID
+
+  CHARACTER(LEN=7) :: CLASS1_NAME = "Class 1"
+  CHARACTER(LEN=7)  :: name              !  Name of class
+  CHARACTER(LEN=10) :: name_big          !  Name of class bigger buffer
+  CHARACTER(LEN=4)  :: name_small        !  Name of class smaller buffer
+  INTEGER :: error
+  INTEGER :: size
+  LOGICAL :: flag
+
+  ! Output message about test being performed
+
+  !WRITE(*,*) "Testing Basic Generic Property List Class Creation Functionality"
+
+  ! Try some bogus value for class identifier; function should fail gracefully
+
+  cid1 = 456
+  CALL H5Pget_class_name_f(cid1, name, size, error)
+  CALL verify("H5Pget_class_name", error, -1, error)
+
+  !  Create a new generic class, derived from the root of the class hierarchy
+  CALL H5Pcreate_class_f(H5P_ROOT_F, CLASS1_NAME, cid1, error)
+  CALL check("H5Pcreate_class", error, total_error)
+
+  !  Check class name
+  CALL H5Pget_class_name_f(cid1, name, size, error)
+  CALL check("H5Pget_class_name", error, total_error)
+  CALL verify("H5Pget_class_name", size,7,error)
+  CALL verify("H5Pget_class_name", name, CLASS1_NAME, error)
+  IF(error.NE.0)THEN
+     WRITE(*,*) 'Class names do not match! name=',name, 'CLASS1_NAME=',CLASS1_NAME
+     total_error = total_error + 1
+  ENDIF
+
+  !  Check class name smaller buffer
+  CALL H5Pget_class_name_f(cid1, name_small, size, error)
+  CALL check("H5Pget_class_name", error, total_error)
+  CALL verify("H5Pget_class_name", size,7,error)
+  CALL verify("H5Pget_class_name", name_small(1:4), CLASS1_NAME(1:4), error)
+  IF(error.NE.0)THEN
+     WRITE(*,*) 'Class names do not match! name=',name_small(1:4), 'CLASS1_NAME=',CLASS1_NAME(1:4)
+     total_error = total_error + 1
+  ENDIF
+
+  !  Check class name bigger buffer
+  CALL H5Pget_class_name_f(cid1, name_big, size, error)
+  CALL check("H5Pget_class_name", error, total_error)
+  CALL verify("H5Pget_class_name", size,7,error)
+  CALL verify("H5Pget_class_name", TRIM(name_big), TRIM(CLASS1_NAME), error)
+  IF(error.NE.0)THEN
+     WRITE(*,*) 'Class names do not match! name=',TRIM(name_small), 'CLASS1_NAME=',TRIM(CLASS1_NAME)
+     total_error = total_error + 1
+  ENDIF
+
+  !  Check class parent
+  CALL H5Pget_class_parent_f(cid1, cid2, error)
+  CALL check("H5Pget_class_parent_f", error, total_error)
+
+  !  Verify class parent correct
+  CALL H5Pequal_f(cid2, H5P_ROOT_F, flag, error)
+  CALL check("H5Pequal_f", error, total_error)
+  CALL verify("H5Pequal_f", flag, .TRUE., total_error)
+
+
+  !  Make certain false positives aren't being returned
+  CALL H5Pequal_f(cid2, H5P_FILE_CREATE_F, flag, error)
+  CALL check("H5Pequal_f", error, total_error)
+  CALL verify("H5Pequal_f", flag, .FALSE., total_error)
+
+  ! Close parent class
+  CALL H5Pclose_class_f(cid2, error)
+  CALL check("H5Pclose_class_f", error, total_error)
+
+
+  ! Close class
+  CALL H5Pclose_class_f(cid1, error)
+  CALL check("H5Pclose_class_f", error, total_error)
+
+END SUBROUTINE test_genprop_basic_class
+
+SUBROUTINE test_h5s_encode(total_error)
+
+!***************************************************************
+!**
+!**  test_h5s_encode(): Test H5S (dataspace) encoding and decoding.
+!**
+!***************************************************************
+
+  IMPLICIT NONE
+  INTEGER, INTENT(INOUT) :: total_error
+
+  INTEGER(hid_t) :: sid1, sid3!	 Dataspace ID
+  INTEGER(hid_t) :: decoded_sid1, decoded_sid3
+  INTEGER(hid_t) :: fapl    ! File access property
+  INTEGER :: rank    ! LOGICAL rank of dataspace
+  INTEGER(size_t) :: new_size = 0, old_size = 0, orig_size=0, scalar_size=0
+
+! Make sure the size is large
+  CHARACTER(LEN=288) :: sbuf
+  CHARACTER(LEN=288) :: scalar_buf
+
+  INTEGER(hsize_t) :: n !  Number of dataspace elements
+
+  INTEGER(hsize_t), DIMENSION(1:3) :: start = (/0, 0, 0/)
+  INTEGER(hsize_t), DIMENSION(1:3) :: stride = (/2, 5, 3/)
+  INTEGER(hsize_t), DIMENSION(1:3) :: count = (/2, 2, 2/)
+  INTEGER(hsize_t), DIMENSION(1:3) :: BLOCK = (/1, 3, 1/)
+
+  INTEGER :: space_type
+  !
+  ! Dataset dimensions
+  !
+  INTEGER, PARAMETER :: SPACE1_DIM1= 3,  SPACE1_DIM2=15, SPACE1_DIM3=13
+
+  INTEGER(HSIZE_T), DIMENSION(1:3) :: dims1 = (/SPACE1_DIM1, SPACE1_DIM2, SPACE1_DIM3/)
+  INTEGER :: SPACE1_RANK = 3
+  INTEGER :: error
+
+  !-------------------------------------------------------------------------
+  ! * Test encoding and decoding of simple dataspace and hyperslab selection.
+  ! *-------------------------------------------------------------------------
+  !
+
+  CALL H5Screate_simple_f(SPACE1_RANK, dims1, sid1, error)
+  CALL check("H5Screate_simple", error, total_error)
+
+  CALL h5sselect_hyperslab_f(sid1, H5S_SELECT_SET_F, &
+       start, count, error, stride=stride, BLOCK=BLOCK)
+  CALL check("h5sselect_hyperslab_f", error, total_error)
+
+
+  ! Encode simple data space in a buffer
+
+  ! Find the buffer size without fapl
+  CALL H5Sencode_f(sid1, sbuf, orig_size, error)
+  CALL check("H5Sencode_f", error, total_error)
+  CALL verify("H5Sencode_f", INT(orig_size), 279, total_error)
+
+  ! Create file access property list
+  CALL h5pcreate_f(H5P_FILE_ACCESS_F, fapl, error)
+  CALL check("h5pcreate_f", error, total_error)
+
+  ! Find the buffer size with fapl (default old format)
+  CALL H5Sencode_f(sid1, sbuf, old_size, error, fapl)
+  CALL check("H5Sencode_f", error, total_error)
+  CALL verify("H5Sencode_f", INT(old_size), 279, total_error)
+
+  ! Set fapl to latest file format
+  CALL H5Pset_libver_bounds_f(fapl, H5F_LIBVER_LATEST_F, H5F_LIBVER_LATEST_F, error)
+  CALL check("H5Pset_libver_bounds_f",error, total_error)
+
+  ! Find the buffer size with fapl set to latest format
+  CALL H5Sencode_f(sid1, sbuf, new_size, error, fapl)
+  CALL check("H5Sencode_f", error, total_error)
+  CALL verify("H5Sencode_f", INT(new_size), 101, total_error)
+
+  !  Try decoding bogus buffer
+  CALL H5Sdecode_f(sbuf, decoded_sid1, error)
+  CALL verify("H5Sdecode", error, -1, total_error)
+
+  !  Encode according to the latest file format
+  CALL H5Sencode_f(sid1, sbuf, new_size, error, fapl)
+  CALL check("H5Sencode_f", error, total_error)
+
+  !  Decode from the dataspace buffer and return an object handle
+  CALL H5Sdecode_f(sbuf, decoded_sid1, error)
+  CALL check("H5Sdecode", error, total_error)
+
+
+  !  Verify the decoded dataspace
+  CALL h5sget_simple_extent_npoints_f(decoded_sid1, n, error)
+  CALL check("h5sget_simple_extent_npoints_f", error, total_error)
+  CALL verify("h5sget_simple_extent_npoints_f", INT(n), INT(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3), &
+       total_error)
+
+  !
+  !Close the dataspace for the dataset.
+  !
+  CALL h5sclose_f(sid1, error)
+  CALL check("h5sclose_f", error, total_error)
+
+  CALL h5sclose_f(decoded_sid1, error)
+  CALL check("h5sclose_f", error, total_error)
+
+  ! -------------------------------------------------------------------------
+  !  * Test encoding and decoding of scalar dataspace.
+  !  *-------------------------------------------------------------------------
+  !
+  !  Create scalar dataspace
+
+  CALL H5Screate_f(H5S_SCALAR_F, sid3, error)
+  CALL check("H5Screate_f",error, total_error)
+
+  !  Encode scalar data space in a buffer
+
+  !        First find the buffer size
+  CALL H5Sencode_f(sid3, scalar_buf, scalar_size, error)
+  CALL check("H5Sencode_f", error, total_error)
+
+  ! encode
+
+  CALL H5Sencode_f(sid3, scalar_buf, scalar_size, error)
+  CALL check("H5Sencode_f", error, total_error)
+
+
+  !  Decode from the dataspace buffer and return an object handle
+
+  CALL H5Sdecode_f(scalar_buf, decoded_sid3, error)
+  CALL check("H5Sdecode_f", error, total_error)
+
+
+  !  Verify extent type
+
+  CALL H5Sget_simple_extent_type_f(decoded_sid3, space_type, error)
+  CALL check("H5Sget_simple_extent_type_f", error, total_error)
+  CALL verify("H5Sget_simple_extent_type_f", space_type, H5S_SCALAR_F, total_error)
+
+  !  Verify decoded dataspace
+  CALL h5sget_simple_extent_npoints_f(decoded_sid3, n, error)
+  CALL check("h5sget_simple_extent_npoints_f", error, total_error)
+  CALL verify("h5sget_simple_extent_npoints_f", INT(n), 1, total_error)
+
+  CALL H5Sget_simple_extent_ndims_f(decoded_sid3, rank, error)
+  CALL CHECK("H5Sget_simple_extent_ndims_f", error, total_error)
+  CALL verify("H5Sget_simple_extent_ndims_f", rank, 0, total_error )
+
+  CALL h5sclose_f(sid3, error)
+  CALL check("h5sclose_f", error, total_error)
+
+  CALL h5sclose_f(decoded_sid3, error)
+  CALL check("h5sclose_f", error, total_error)
+
+END SUBROUTINE test_h5s_encode
+
+!-------------------------------------------------------------------------
+! Function:    test_scaleoffset
+!
+! Purpose:     Tests the integer datatype for scaleoffset filter
+!              with fill value set
+!
+! Return:      Success:        0
+!              Failure:        >0
+!
+! Programmer:  M. Scot Breitenfeld
+!              Decemeber 11, 2010
+!
+! Modifications:
+!
+!-------------------------------------------------------------------------
+!
+
+SUBROUTINE test_scaleoffset(cleanup, total_error )
+
+  IMPLICIT NONE
+  LOGICAL, INTENT(IN)  :: cleanup
+  INTEGER, INTENT(INOUT) :: total_error
+  INTEGER(hid_t) :: file
+
+  INTEGER(hid_t)   :: dataset, datatype, space, mspace, dc
+  INTEGER(hsize_t), DIMENSION(1:2) :: dims = (/2, 5/)
+  INTEGER(hsize_t), DIMENSION(1:2) :: chunk_dim = (/2, 5/)
+  INTEGER, DIMENSION(1:2,1:5) :: orig_data
+  INTEGER, DIMENSION(1:2,1:5) :: new_data
+  INTEGER(hsize_t), DIMENSION(1:2) :: start  ! Start of hyperslab
+  INTEGER(hsize_t), DIMENSION(1:2) :: stride ! Stride of hyperslab
+  INTEGER(hsize_t), DIMENSION(1:2) :: count  ! BLOCK count
+  INTEGER(hsize_t), DIMENSION(1:2) :: BLOCK  ! BLOCK sizes
+  INTEGER :: fillval
+  INTEGER(size_t) :: j
+  REAL :: x
+  INTEGER :: error
+  LOGICAL :: status
+
+  ! check to see if filter is available
+  CALL H5Zfilter_avail_f(H5Z_FILTER_SCALEOFFSET_F, status, error)
+  IF(.NOT.status)THEN ! We don't have H5Z_FILTER_SCALEOFFSET_F filter
+     total_error = -1       ! so return
+     RETURN
+  ENDIF
+
+  CALL H5Fcreate_f("h5scaleoffset.h5", H5F_ACC_TRUNC_F, file, error)
+  CALL check("H5Fcreate_f", error, total_error)
+
+  CALL H5Tcopy_f(H5T_NATIVE_INTEGER, datatype, error)
+  CALL CHECK(" H5Tcopy_f", error, total_error)
+
+  ! Set order of dataset datatype
+  CALL H5Tset_order_f(datatype, H5T_ORDER_BE_F, error)
+  CALL CHECK(" H5Tset_order_f", error, total_error)
+
+  ! Create the data space for the dataset
+  CALL H5Screate_simple_f(2, dims, space, error)
+  CALL CHECK(" H5Screate_simple_f", error, total_error)
+
+  ! Create the dataset property list
+  CALL H5Pcreate_f(H5P_DATASET_CREATE_F, dc, error)
+  CALL CHECK(" H5Pcreate_f", error, total_error)
+
+  ! Set fill value
+  fillval = 10000
+  CALL H5Pset_fill_value_f(dc, H5T_NATIVE_INTEGER, fillval, error)
+  CALL CHECK(" H5Pset_fill_value_f", error, total_error)
+
+  ! Set up to use scaleoffset filter, let library calculate minbits
+  CALL H5Pset_chunk_f(dc, 2, chunk_dim, error)
+  CALL CHECK(" H5Pset_chunk_f", error, total_error)
+
+  CALL H5Pset_scaleoffset_f(dc, H5Z_SO_INT_F, H5Z_SO_INT_MINBITS_DEFAULT_F, error)
+  CALL CHECK(" H5Pset_scaleoffset_f", error, total_error)
+
+  ! Create the dataset
+  CALL H5Dcreate_f(file, "scaleoffset_int", datatype, &
+       space, dataset, error, dc)
+  CALL CHECK(" H5Dcreate_f", error, total_error)
+
+  ! Create the memory data space
+  CALL H5Screate_simple_f(2, dims, mspace, error)
+  CALL CHECK(" H5Screate_simple_f", error, total_error)
+
+  ! Select hyperslab for data to write, using 1x5 blocks,
+  ! (1,1) stride and (1,1) count starting at the position (0,0)
+
+  start(1:2) = (/0,0/)
+  stride(1:2) = (/1,1/)
+  COUNT(1:2) = (/1,1/)
+  BLOCK(1:2) = (/1,5/)
+
+  CALL H5Sselect_hyperslab_f(mspace, H5S_SELECT_SET_F, start, &
+       count, error, stride, BLOCK)
+  CALL CHECK(" H5Sselect_hyperslab_f", error, total_error)
+
+  CALL RANDOM_SEED()
+  ! Initialize data of hyperslab
+  DO j = 1, INT(dims(2))
+     CALL RANDOM_NUMBER(x)
+     orig_data(1,j) = INT(x*10000.)
+     IF(MOD(j,2_size_t).EQ.0)THEN
+        orig_data(1,j) = - orig_data(1,j)
+     ENDIF
+  ENDDO
+
+  !----------------------------------------------------------------------
+  ! STEP 1: Test scaleoffset by setting up a chunked dataset and writing
+  ! to it.
+  !----------------------------------------------------------------------
+
+  ! Only data in the hyperslab will be written, other value should be fill value
+  CALL H5Dwrite_f(dataset, H5T_NATIVE_INTEGER, orig_data, dims, error, mspace, mspace, H5P_DEFAULT_F)
+  CALL CHECK(" H5Dwrite_f", error, total_error)
+
+  !----------------------------------------------------------------------
+  ! STEP 2: Try to read the data we just wrote.
+  !----------------------------------------------------------------------
+
+  ! Read the dataset back
+
+  CALL H5Dread_f(dataset, H5T_NATIVE_INTEGER, new_data, dims, error, mspace, mspace, H5P_DEFAULT_F)
+  CALL CHECK(" H5Dread_f", error, total_error)
+
+  ! Check that the values read are the same as the values written
+  DO j = 1, INT(dims(2))
+     IF(new_data(1,j) .NE. orig_data(1,j))THEN
+        total_error = total_error + 1
+        WRITE(*,'("    Read different values than written.")')
+        WRITE(*,'("    At index ", 2(1X,I0))') 1, j
+        EXIT
+     ENDIF
+  ENDDO
+  !----------------------------------------------------------------------
+  ! Cleanup
+  !----------------------------------------------------------------------
+  CALL H5Tclose_f(datatype, error)
+  CALL CHECK(" H5Tclose_f", error, total_error)
+  CALL H5Pclose_f(dc, error)
+  CALL CHECK(" H5Pclose_f", error, total_error)
+  CALL H5Sclose_f(space, error)
+  CALL CHECK(" H5Sclose_f", error, total_error)
+  CALL H5Dclose_f(dataset, error)
+  CALL CHECK(" H5Dclose_f", error, total_error)
+  CALL H5Fclose_f(file, error)
+  CALL CHECK(" H5Fclose_f", error, total_error)
+
+  IF(cleanup) CALL h5_cleanup_f("h5scaleoffset", H5P_DEFAULT_F, error)
+  CALL check("h5_cleanup_f", error, total_error)
+
+END SUBROUTINE test_scaleoffset
+
+END MODULE TH5MISC_1_8
diff --git a/fortran/test/tH5MISC_1_8.f90 b/fortran/test/tH5MISC_1_8.f90
deleted file mode 100644
index efaf594..0000000
--- a/fortran/test/tH5MISC_1_8.f90
+++ /dev/null
@@ -1,474 +0,0 @@
-!****h* root/fortran/test/tH5MISC_1_8.f90
-!
-! NAME
-!  tH5MISC_1_8.f90
-!
-! FUNCTION
-!  Basic testing of Fortran API's introduced in 1.8 release.
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-!*****
-MODULE TH5MISC_1_8
-
-CONTAINS
-
-SUBROUTINE dtransform(cleanup, total_error)
-  USE HDF5 ! This module contains all necessary modules
-  USE TH5_MISC
-
-  IMPLICIT NONE
-  LOGICAL, INTENT(IN)  :: cleanup
-  INTEGER, INTENT(INOUT) :: total_error
-
-  INTEGER(HID_T) :: dxpl_id_c_to_f
-  INTEGER(HID_T) :: file_id
-
-  CHARACTER(LEN=15), PARAMETER :: c_to_f = "(9/5.0)*x + 123"
-  INTEGER :: error
-  CHARACTER(LEN=15) :: ptrgetTest
-  CHARACTER(LEN=7) :: ptrgetTest_small
-  CHARACTER(LEN=30) :: ptrgetTest_big
-
-  INTEGER(SIZE_T) :: size
-
-  CALL H5Fcreate_f("dtransform.h5", H5F_ACC_TRUNC_F, file_id, error)
-  CALL check("dtransform.H5Fcreate_f", error, total_error)
-
-  CALL H5Pcreate_f(H5P_DATASET_XFER_F, dxpl_id_c_to_f, error)
-  CALL check("dtransform.H5Pcreate_f", error, total_error)
-
-  CALL H5Pset_data_transform_f(dxpl_id_c_to_f, c_to_f, error)
-  CALL check("dtransform.H5Pset_data_transform_f", error, total_error)
-
-  CALL H5Pget_data_transform_f(dxpl_id_c_to_f, ptrgetTest, error, size=size)
-  CALL check("dtransform.H5Pget_data_transform_f",  error, total_error)
-  CALL VerifyString("dtransform.H5Pget_data_transform_f", c_to_f, ptrgetTest, total_error)
-  CALL VERIFY("dtransform.H5Pget_data_transform_f", INT(size),15, total_error)
-
-! check case when receiving buffer to small
-
-  CALL H5Pget_data_transform_f(dxpl_id_c_to_f, ptrgetTest_small, error, size=size)
-  CALL check("dtransform.H5Pget_data_transform_f",  error, total_error)
-  CALL VerifyString("dtransform.H5Pget_data_transform_f", c_to_f(1:7), ptrgetTest_small, total_error)
-  CALL VERIFY("dtransform.H5Pget_data_transform_f", INT(size),15, total_error)
-
-! check case when receiving buffer to big
-
-  CALL H5Pget_data_transform_f(dxpl_id_c_to_f, ptrgetTest_big, error, size=size)
-  CALL check("dtransform.H5Pget_data_transform_f",  error, total_error)
-  CALL VerifyString("dtransform.H5Pget_data_transform_f", c_to_f(1:15), ptrgetTest_big(1:15), total_error)
-  CALL VERIFY("dtransform.H5Pget_data_transform_f", INT(size), 15, total_error)
-
-  CALL H5Fclose_f(file_id, error)
-  CALL check("H5Fclose_f", error, total_error)
-
-  IF(cleanup) CALL h5_cleanup_f("dtransform", H5P_DEFAULT_F, error)
-  CALL check("h5_cleanup_f", error, total_error)
-
-END SUBROUTINE dtransform
-
-
-!***************************************************************
-!**
-!**  test_genprop_basic_class(): Test basic generic property list code.
-!**      Tests creating new generic classes.
-!**
-!***************************************************************
-
-SUBROUTINE test_genprop_basic_class(total_error)
-
-  USE HDF5 ! This module contains all necessary modules
-  USE TH5_MISC
-
-  IMPLICIT NONE
-  INTEGER, INTENT(INOUT) :: total_error
-
-  INTEGER(HID_T) :: cid1    ! Generic Property class ID 
-  INTEGER(HID_T) :: cid2    ! Generic Property class ID 
-
-  CHARACTER(LEN=7) :: CLASS1_NAME = "Class 1"
-  CHARACTER(LEN=7)  :: name              !  Name of class 
-  CHARACTER(LEN=10) :: name_big          !  Name of class bigger buffer 
-  CHARACTER(LEN=4)  :: name_small        !  Name of class smaller buffer
-  INTEGER :: error
-  INTEGER :: size
-  LOGICAL :: flag
-
-  ! Output message about test being performed 
-
-  !WRITE(*,*) "Testing Basic Generic Property List Class Creation Functionality"
-
-  ! Try some bogus value for class identifier; function should fail gracefully
-
-  cid1 = 456
-  CALL H5Pget_class_name_f(cid1, name, size, error)
-  CALL VERIFY("H5Pget_class_name", error, -1, error)
-
-  !  Create a new generic class, derived from the root of the class hierarchy 
-  CALL H5Pcreate_class_f(H5P_ROOT_F, CLASS1_NAME, cid1, error)
-  CALL check("H5Pcreate_class", error, total_error)
-
-  !  Check class name 
-  CALL H5Pget_class_name_f(cid1, name, size, error)
-  CALL check("H5Pget_class_name", error, total_error)
-  CALL VERIFY("H5Pget_class_name", size,7,error)
-  CALL verifystring("H5Pget_class_name", name, CLASS1_NAME, error)
-  IF(error.NE.0)THEN
-     WRITE(*,*) 'Class names do not match! name=',name, 'CLASS1_NAME=',CLASS1_NAME
-     total_error = total_error + 1
-  ENDIF
-
-  !  Check class name smaller buffer
-  CALL H5Pget_class_name_f(cid1, name_small, size, error)
-  CALL check("H5Pget_class_name", error, total_error)
-  CALL VERIFY("H5Pget_class_name", size,7,error)
-  CALL verifystring("H5Pget_class_name", name_small(1:4), CLASS1_NAME(1:4), error)
-  IF(error.NE.0)THEN
-     WRITE(*,*) 'Class names do not match! name=',name_small(1:4), 'CLASS1_NAME=',CLASS1_NAME(1:4)
-     total_error = total_error + 1
-  ENDIF
-
-  !  Check class name bigger buffer
-  CALL H5Pget_class_name_f(cid1, name_big, size, error)
-  CALL check("H5Pget_class_name", error, total_error)
-  CALL VERIFY("H5Pget_class_name", size,7,error)
-  CALL verifystring("H5Pget_class_name", TRIM(name_big), TRIM(CLASS1_NAME), error)
-  IF(error.NE.0)THEN
-     WRITE(*,*) 'Class names do not match! name=',TRIM(name_small), 'CLASS1_NAME=',TRIM(CLASS1_NAME)
-     total_error = total_error + 1
-  ENDIF
-
-  !  Check class parent 
-  CALL H5Pget_class_parent_f(cid1, cid2, error)
-  CALL check("H5Pget_class_parent_f", error, total_error)
-
-  !  Verify class parent correct 
-  CALL H5Pequal_f(cid2, H5P_ROOT_F, flag, error)
-  CALL check("H5Pequal_f", error, total_error)
-  CALL verifylogical("H5Pequal_f", flag, .TRUE., total_error)
-
-
-  !  Make certain false postives aren't being returned 
-  CALL H5Pequal_f(cid2, H5P_FILE_CREATE_F, flag, error)
-  CALL check("H5Pequal_f", error, total_error)
-  CALL verifylogical("H5Pequal_f", flag, .FALSE., total_error)
-
-  ! Close parent class 
-  CALL H5Pclose_class_f(cid2, error)
-  CALL check("H5Pclose_class_f", error, total_error)
-
-
-  ! Close class 
-  CALL H5Pclose_class_f(cid1, error)
-  CALL check("H5Pclose_class_f", error, total_error)
-
-END SUBROUTINE test_genprop_basic_class
-
-SUBROUTINE test_h5s_encode(total_error)
-
-!***************************************************************
-!**
-!**  test_h5s_encode(): Test H5S (dataspace) encoding and decoding.
-!**
-!***************************************************************
-
-  USE HDF5 ! This module contains all necessary modules
-  USE TH5_MISC
-  IMPLICIT NONE
-  INTEGER, INTENT(INOUT) :: total_error
-
-  INTEGER(hid_t) :: sid1, sid3!	 Dataspace ID		
-  INTEGER(hid_t) :: decoded_sid1, decoded_sid3
-  INTEGER :: rank    ! LOGICAL rank of dataspace	
-  INTEGER(size_t) :: sbuf_size=0, scalar_size=0
-
-! Make sure the size is large
-  CHARACTER(LEN=288) :: sbuf
-  CHARACTER(LEN=288) :: scalar_buf
-
-  INTEGER(hsize_t) :: n !  Number of dataspace elements 
-
-  INTEGER(hsize_t), DIMENSION(1:3) :: start = (/0, 0, 0/)
-  INTEGER(hsize_t), DIMENSION(1:3) :: stride = (/2, 5, 3/)
-  INTEGER(hsize_t), DIMENSION(1:3) :: count = (/2, 2, 2/)
-  INTEGER(hsize_t), DIMENSION(1:3) :: BLOCK = (/1, 3, 1/)
-
-  INTEGER :: space_type
-  !
-  ! Dataset dimensions
-  !
-  INTEGER, PARAMETER :: SPACE1_DIM1= 3,  SPACE1_DIM2=15, SPACE1_DIM3=13
-
-  INTEGER(HSIZE_T), DIMENSION(1:3) :: dims1 = (/SPACE1_DIM1, SPACE1_DIM2, SPACE1_DIM3/)
-  INTEGER :: SPACE1_RANK = 3
-  INTEGER :: error
-
-  !-------------------------------------------------------------------------
-  ! * Test encoding and decoding of simple dataspace and hyperslab selection.
-  ! *-------------------------------------------------------------------------
-  ! 
-
-  CALL H5Screate_simple_f(SPACE1_RANK, dims1, sid1, error)
-  CALL check("H5Screate_simple", error, total_error)
-
-  CALL h5sselect_hyperslab_f(sid1, H5S_SELECT_SET_F, &
-       start, count, error, stride=stride, BLOCK=BLOCK)
-  CALL check("h5sselect_hyperslab_f", error, total_error)
-
-
-  ! Encode simple data space in a buffer 
-
-  !         First find the buffer size
-  CALL H5Sencode_f(sid1, sbuf, sbuf_size, error)
-  CALL check("H5Sencode", error, total_error)
-
-
-  !  Try decoding bogus buffer 
-
-  CALL H5Sdecode_f(sbuf, decoded_sid1, error)
-  CALL VERIFY("H5Sdecode", error, -1, total_error)
-
-  CALL H5Sencode_f(sid1, sbuf, sbuf_size, error)
-  CALL check("H5Sencode", error, total_error)
-
-  !  Decode from the dataspace buffer and return an object handle 
-  CALL H5Sdecode_f(sbuf, decoded_sid1, error)
-  CALL check("H5Sdecode", error, total_error)
-
-
-  !  Verify the decoded dataspace 
-  CALL h5sget_simple_extent_npoints_f(decoded_sid1, n, error)
-  CALL check("h5sget_simple_extent_npoints_f", error, total_error)
-  CALL VERIFY("h5sget_simple_extent_npoints_f", INT(n), INT(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3), &
-       total_error)
-
-  !
-  !Close the dataspace for the dataset.
-  !
-  CALL h5sclose_f(sid1, error)
-  CALL check("h5sclose_f", error, total_error)
-
-  CALL h5sclose_f(decoded_sid1, error)
-  CALL check("h5sclose_f", error, total_error)
-
-  ! -------------------------------------------------------------------------
-  !  * Test encoding and decoding of scalar dataspace.
-  !  *-------------------------------------------------------------------------
-  !  
-  !  Create scalar dataspace 
-
-  CALL H5Screate_f(H5S_SCALAR_F, sid3, error)
-  CALL check("H5Screate_f",error, total_error)
-
-  !  Encode scalar data space in a buffer 
-
-  !        First find the buffer size
-  CALL H5Sencode_f(sid3, scalar_buf, scalar_size, error)
-  CALL check("H5Sencode_f", error, total_error)
-
-  ! encode
-
-  CALL H5Sencode_f(sid3, scalar_buf, scalar_size, error)
-  CALL check("H5Sencode_f", error, total_error)
-
-
-  !  Decode from the dataspace buffer and return an object handle 
-
-  CALL H5Sdecode_f(scalar_buf, decoded_sid3, error)
-  CALL check("H5Sdecode_f", error, total_error)
-
-
-  !  Verify extent type 
-
-  CALL H5Sget_simple_extent_type_f(decoded_sid3, space_type, error)
-  CALL check("H5Sget_simple_extent_type_f", error, total_error)
-  CALL VERIFY("H5Sget_simple_extent_type_f", space_type, H5S_SCALAR_F, total_error)
-
-  !  Verify decoded dataspace 
-  CALL h5sget_simple_extent_npoints_f(decoded_sid3, n, error)
-  CALL check("h5sget_simple_extent_npoints_f", error, total_error)
-  CALL VERIFY("h5sget_simple_extent_npoints_f", INT(n), 1, total_error)
-
-  CALL H5Sget_simple_extent_ndims_f(decoded_sid3, rank, error)
-  CALL CHECK("H5Sget_simple_extent_ndims_f", error, total_error)
-  CALL VERIFY("H5Sget_simple_extent_ndims_f", rank, 0, total_error )
-
-  CALL h5sclose_f(sid3, error)
-  CALL check("h5sclose_f", error, total_error)
-
-  CALL h5sclose_f(decoded_sid3, error)
-  CALL check("h5sclose_f", error, total_error)
-
-END SUBROUTINE test_h5s_encode
-
-!-------------------------------------------------------------------------
-! Function:    test_scaleoffset
-!
-! Purpose:     Tests the integer datatype for scaleoffset filter
-!              with fill value set
-!
-! Return:      Success:        0
-!              Failure:        >0
-!
-! Programmer:  M. Scot Breitenfeld
-!              Decemeber 11, 2010
-!
-! Modifications:
-!
-!-------------------------------------------------------------------------
-!
-
-SUBROUTINE test_scaleoffset(cleanup, total_error )
-
-  USE HDF5
-  USE TH5_MISC
-  IMPLICIT NONE
-  LOGICAL, INTENT(IN)  :: cleanup
-  INTEGER, INTENT(INOUT) :: total_error
-  INTEGER(hid_t) :: file
-
-  INTEGER(hid_t)   :: dataset, datatype, space, mspace, dc
-  INTEGER(hsize_t), DIMENSION(1:2) :: dims = (/2, 5/)
-  INTEGER(hsize_t), DIMENSION(1:2) :: chunk_dim = (/2, 5/)
-  INTEGER, DIMENSION(1:2,1:5) :: orig_data
-  INTEGER, DIMENSION(1:2,1:5) :: new_data
-  INTEGER(hsize_t), DIMENSION(1:2) :: start  ! Start of hyperslab 
-  INTEGER(hsize_t), DIMENSION(1:2) :: stride ! Stride of hyperslab
-  INTEGER(hsize_t), DIMENSION(1:2) :: count  ! BLOCK count
-  INTEGER(hsize_t), DIMENSION(1:2) :: BLOCK  ! BLOCK sizes
-  INTEGER :: fillval
-  INTEGER(size_t) :: j
-  REAL :: x
-  INTEGER :: error
-  LOGICAL :: status
-
-  ! check to see if filter is available
-  CALL H5Zfilter_avail_f(H5Z_FILTER_SCALEOFFSET_F, status, error)
-  IF(.NOT.status)THEN ! We don't have H5Z_FILTER_SCALEOFFSET_F filter
-     total_error = -1       ! so return
-     RETURN
-  ENDIF
-
-  CALL H5Fcreate_f("h5scaleoffset.h5", H5F_ACC_TRUNC_F, file, error)
-  CALL check("H5Fcreate_f", error, total_error)
-
-  CALL H5Tcopy_f(H5T_NATIVE_INTEGER, datatype, error)
-  CALL CHECK(" H5Tcopy_f", error, total_error)
-
-  ! Set order of dataset datatype
-  CALL H5Tset_order_f(datatype, H5T_ORDER_BE_F, error)
-  CALL CHECK(" H5Tset_order_f", error, total_error)
-
-  ! Create the data space for the dataset
-  CALL H5Screate_simple_f(2, dims, space, error)
-  CALL CHECK(" H5Screate_simple_f", error, total_error)
-
-  ! Create the dataset property list  
-  CALL H5Pcreate_f(H5P_DATASET_CREATE_F, dc, error)
-  CALL CHECK(" H5Pcreate_f", error, total_error)
-
-  ! Set fill value 
-  fillval = 10000
-  CALL H5Pset_fill_value_f(dc, H5T_NATIVE_INTEGER, fillval, error)
-  CALL CHECK(" H5Pset_fill_value_f", error, total_error)
-
-  ! Set up to use scaleoffset filter, let library calculate minbits
-  CALL H5Pset_chunk_f(dc, 2, chunk_dim, error)
-  CALL CHECK(" H5Pset_chunk_f", error, total_error)
-  
-  CALL H5Pset_scaleoffset_f(dc, H5Z_SO_INT_F, H5Z_SO_INT_MINBITS_DEFAULT_F, error)
-  CALL CHECK(" H5Pset_scaleoffset_f", error, total_error)
-  
-  ! Create the dataset
-  CALL H5Dcreate_f(file, "scaleoffset_int", datatype, &
-       space, dataset, error, dc)
-  CALL CHECK(" H5Dcreate_f", error, total_error)
-
-  ! Create the memory data space
-  CALL H5Screate_simple_f(2, dims, mspace, error)
-  CALL CHECK(" H5Screate_simple_f", error, total_error)
-
-  ! Select hyperslab for data to write, using 1x5 blocks,
-  ! (1,1) stride and (1,1) count starting at the position (0,0)
-     
-  start(1:2) = (/0,0/)
-  stride(1:2) = (/1,1/)
-  COUNT(1:2) = (/1,1/)
-  BLOCK(1:2) = (/1,5/)
-
-  CALL H5Sselect_hyperslab_f(mspace, H5S_SELECT_SET_F, start, &
-       count, error, stride, BLOCK)
-  CALL CHECK(" H5Sselect_hyperslab_f", error, total_error)
-
-  CALL RANDOM_SEED()
-  ! Initialize data of hyperslab
-  DO j = 1, INT(dims(2))
-     CALL RANDOM_NUMBER(x)
-     orig_data(1,j) = INT(x*10000.)
-     IF(MOD(j,2_size_t).EQ.0)THEN
-        orig_data(1,j) = - orig_data(1,j)
-     ENDIF
-  ENDDO
-
-  !----------------------------------------------------------------------
-  ! STEP 1: Test scaleoffset by setting up a chunked dataset and writing
-  ! to it.
-  !----------------------------------------------------------------------
-  
-  ! Only data in the hyperslab will be written, other value should be fill value 
-  CALL H5Dwrite_f(dataset, H5T_NATIVE_INTEGER, orig_data, dims, error, mspace, mspace, H5P_DEFAULT_F)
-  CALL CHECK(" H5Dwrite_f", error, total_error)
-
-  !----------------------------------------------------------------------
-  ! STEP 2: Try to read the data we just wrote.
-  !----------------------------------------------------------------------
-     
-  ! Read the dataset back
-  
-  CALL H5Dread_f(dataset, H5T_NATIVE_INTEGER, new_data, dims, error, mspace, mspace, H5P_DEFAULT_F)
-  CALL CHECK(" H5Dread_f", error, total_error)
-
-  ! Check that the values read are the same as the values written 
-  DO j = 1, INT(dims(2))
-     IF(new_data(1,j) .NE. orig_data(1,j))THEN
-        total_error = total_error + 1
-        WRITE(*,'("    Read different values than written.")')
-        WRITE(*,'("    At index ", 2(1X,I0))') 1, j
-        EXIT
-     ENDIF
-  ENDDO
-  !----------------------------------------------------------------------
-  ! Cleanup
-  !----------------------------------------------------------------------
-  CALL H5Tclose_f(datatype, error)
-  CALL CHECK(" H5Tclose_f", error, total_error)
-  CALL H5Pclose_f(dc, error)
-  CALL CHECK(" H5Pclose_f", error, total_error)
-  CALL H5Sclose_f(space, error)
-  CALL CHECK(" H5Sclose_f", error, total_error)
-  CALL H5Dclose_f(dataset, error)
-  CALL CHECK(" H5Dclose_f", error, total_error)
-  CALL H5Fclose_f(file, error)
-  CALL CHECK(" H5Fclose_f", error, total_error)
-
-  IF(cleanup) CALL h5_cleanup_f("h5scaleoffset", H5P_DEFAULT_F, error)
-  CALL check("h5_cleanup_f", error, total_error)
-
-END SUBROUTINE test_scaleoffset
-
-END MODULE TH5MISC_1_8
diff --git a/fortran/test/tH5O.F90 b/fortran/test/tH5O.F90
new file mode 100644
index 0000000..5fdb066
--- /dev/null
+++ b/fortran/test/tH5O.F90
@@ -0,0 +1,794 @@
+!****h* root/fortran/test/tH5O.f90
+!
+! NAME
+!  tH5O.f90
+!
+! FUNCTION
+!  Basic testing of Fortran H5O APIs.
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+! CONTAINS SUBROUTINES
+!  test_h5o, test_h5o_link, test_h5o_plist
+!
+!*****
+MODULE TH5O
+
+  USE HDF5 ! This module contains all necessary modules
+  USE TH5_MISC
+  USE TH5_MISC_GEN
+
+CONTAINS
+
+SUBROUTINE test_h5o(cleanup, total_error)
+
+  IMPLICIT NONE
+  LOGICAL, INTENT(IN)  :: cleanup
+  INTEGER, INTENT(INOUT) :: total_error
+  INTEGER :: error
+
+  CALL test_h5o_plist(total_error) ! Test object creation properties
+  CALL test_h5o_link(total_error) ! Test object link routine
+
+  IF(cleanup) CALL h5_cleanup_f("TestFile", H5P_DEFAULT_F, error)
+  CALL check("h5_cleanup_f", error, total_error)
+  IF(cleanup) CALL h5_cleanup_f("test", H5P_DEFAULT_F, error)
+  CALL check("h5_cleanup_f", error, total_error)
+
+END SUBROUTINE test_h5o
+
+!***************************************************************
+!**
+!**  test_h5o_link: Test creating link to object
+!**
+!***************************************************************
+
+SUBROUTINE test_h5o_link(total_error)
+
+  IMPLICIT NONE
+  INTEGER, INTENT(INOUT) :: total_error
+
+  INTEGER(HID_T) :: file_id
+  INTEGER(HID_T) :: group_id, group_id1, group_id2, group_id3
+  INTEGER(HID_T) :: space_id
+  INTEGER(HID_T) :: dset_id
+  INTEGER(HID_T) :: type_id
+  INTEGER(HID_T) :: fapl_id
+  INTEGER(HID_T) :: lcpl_id
+  INTEGER(HID_T) :: ocpypl_id
+  CHARACTER(LEN=11), PARAMETER :: TEST_FILENAME = 'TestFile.h5'
+  INTEGER, PARAMETER :: TEST6_DIM1 = 2, TEST6_DIM2 = 5
+!EP  INTEGER(HSIZE_T), DIMENSION(1:2), PARAMETER :: dims = (/TEST6_DIM1,TEST6_DIM2/)
+  INTEGER(HSIZE_T), DIMENSION(1:2)  :: dims = (/TEST6_DIM1,TEST6_DIM2/)
+!EP  INTEGER, DIMENSION(1:TEST6_DIM1,1:TEST6_DIM2) :: wdata, rdata
+  INTEGER, DIMENSION(TEST6_DIM1,TEST6_DIM2) :: wdata, rdata
+
+  INTEGER, PARAMETER :: TRUE = 1
+
+  LOGICAL :: committed !  Whether the named datatype is committed
+
+  INTEGER :: i, j
+  INTEGER ::  error  !  Value returned from API calls
+
+  CHARACTER(LEN=14) :: NAME_DATATYPE_SIMPLE="H5T_NATIVE_INT"
+  CHARACTER(LEN=16) :: NAME_DATATYPE_SIMPLE2="H5T_NATIVE_INT-2"
+  INTEGER(HID_T) :: tid, tid2
+  LOGICAL :: flag
+
+  ! Data for tested h5ocopy_f
+  CHARACTER(LEN=3) , PARAMETER :: dataset = "DS1"
+  INTEGER          , PARAMETER :: dim0     = 4
+
+  INTEGER(HSIZE_T), DIMENSION(1:1)    :: dims2 = (/dim0/) ! size read/write buffer
+  INTEGER         , DIMENSION(1:dim0) :: wdata2   ! Write buffer
+  LOGICAL :: link_exists
+  CHARACTER(LEN=8)  :: chr_exact
+  CHARACTER(LEN=10) :: chr_lg
+  INTEGER(size_t) :: nlinks
+  INTEGER(HID_T) :: plist = -1
+
+  CHARACTER(LEN=20) :: dset_comment = "dataset comment"
+  CHARACTER(LEN=13) :: grp_comment = "group comment"
+  CHARACTER(LEN=10) :: comment_sm ! to small comment sized buffer
+  CHARACTER(LEN=15) :: comment ! exact comment sized buffer
+  CHARACTER(LEN=20) :: comment_lg ! large comment sized buffer
+  INTEGER(HSSIZE_T) :: comment_size
+  INTEGER(SIZE_T)   :: comment_size2
+
+  !  Initialize the raw data
+  DO i = 1, TEST6_DIM1
+     DO j = 1, TEST6_DIM2
+        wdata(i,j) = i*j
+     ENDDO
+  ENDDO
+
+  !  Create the dataspace
+  CALL h5screate_simple_f(2, dims, space_id, error)
+  CALL check("h5screate_simple_f",error,total_error)
+
+  !  Create LCPL with intermediate group creation flag set
+  CALL H5Pcreate_f(H5P_LINK_CREATE_F, lcpl_id, error)
+  CALL check("h5Pcreate_f",error,total_error)
+
+  CALL H5Pset_create_inter_group_f(lcpl_id, TRUE, error)
+  CALL check("H5Pset_create_inter_group_f",error,total_error)
+
+  !  Loop over using new group format
+  ! for(new_format = FALSE; new_format <= TRUE; new_format++) {
+
+  ! Make a FAPL that uses the "use the latest version of the format" bounds
+  CALL H5Pcreate_f(H5P_FILE_ACCESS_F,fapl_id,error)
+  CALL check("h5Pcreate_f",error,total_error)
+
+  !  Set the "use the latest version of the format" bounds for creating objects in the file
+
+  CALL H5Pset_libver_bounds_f(fapl_id, H5F_LIBVER_LATEST_F, H5F_LIBVER_LATEST_F, error)
+  CALL check("H5Pset_libver_bounds_f",error, total_error)
+
+  !  Create a new HDF5 file
+  CALL H5Fcreate_f(TEST_FILENAME, H5F_ACC_TRUNC_F, file_id, error, H5P_DEFAULT_F, fapl_id)
+  CALL check("H5Fcreate_f", error, total_error)
+
+  !  Close the FAPL
+  CALL h5pclose_f(fapl_id, error)
+  CALL check("h5pclose_f",error,total_error)
+
+  !  Create and commit a datatype with no name
+  CALL H5Tcopy_f( H5T_NATIVE_INTEGER, type_id, error)
+  CALL check("H5Tcopy_F",error,total_error)
+
+  CALL H5Tcommit_anon_f(file_id, type_id, error) ! using no optional parameters
+  CALL check("H5Tcommit_anon_F",error,total_error)
+
+  CALL H5Tcommitted_f(type_id, committed, error)
+  CALL check("H5Tcommitted_f",error,total_error)
+  CALL verify("H5Tcommitted_f", committed, .TRUE., total_error)
+
+  !  Create a dataset with no name using the committed datatype
+  CALL H5Dcreate_anon_f(file_id, type_id, space_id, dset_id, error ) ! using no optional parameters
+  CALL check("H5Dcreate_anon_f",error,total_error)
+  !
+  !  Verify that we can write to and read from the dataset
+  !
+  !  Write the data to the dataset
+
+!EP  CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, wdata, dims, error, &
+!EP         mem_space_id=H5S_ALL_F, file_space_id=H5S_ALL_F, xfer_prp = H5P_DEFAULT_F)
+  CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, wdata, dims, error)
+  CALL check("h5dwrite_f", error, total_error)
+
+  !  Read the data back
+!EP  CALL h5dread_f(dset_id, H5T_NATIVE_INTEGER, rdata, dims, error, &
+!EP       mem_space_id=H5S_ALL_F, file_space_id=H5S_ALL_F, xfer_prp = H5P_DEFAULT_F)
+  CALL h5dread_f(dset_id, H5T_NATIVE_INTEGER, rdata, dims, error)
+  CALL check("h5dread_f", error, total_error)
+
+  !  Verify the data
+  DO i = 1, TEST6_DIM1
+     DO j = 1, TEST6_DIM2
+        CALL verify("H5Dread_f",wdata(i,j),rdata(i,j),total_error)
+        wdata(i,j) = i*j
+     ENDDO
+  ENDDO
+
+  !  Create a group with no name
+
+  CALL H5Gcreate_anon_f(file_id, group_id, error)
+  CALL check("H5Gcreate_anon", error, total_error)
+
+  !  Link nameless datatype into nameless group
+  CALL H5Olink_f(type_id, group_id, "datatype", error, H5P_DEFAULT_F)
+  CALL check("H5Olink_f", error, total_error)
+
+  !  Link nameless dataset into nameless group with intermediate group
+  CALL H5Olink_f(dset_id, group_id, "inter_group/dataset", error, lcpl_id, H5P_DEFAULT_F)
+  CALL check("H5Olink_f", error, total_error)
+
+  !  Close IDs for dataset and datatype
+  CALL h5dclose_f(dset_id, error)
+  CALL check("h5dclose_f", error, total_error)
+  CALL h5tclose_f(type_id, error)
+  CALL check("h5tclose_f", error, total_error)
+
+  !  Re-open datatype using new link
+  CALL H5Topen_f(group_id, "datatype", type_id, error)
+  CALL check("h5topen_f", error, total_error)
+
+  !  Link nameless group to root group and close the group ID
+  CALL H5Olink_f(group_id, file_id, "/group", error)
+  CALL check("H5Olink_f", error, total_error)
+
+  CALL h5gclose_f(group_id, error)
+  CALL check("h5gclose_f",error,total_error)
+
+  !  Open dataset through root group and verify its data
+  CALL H5Dopen_f(file_id, "/group/inter_group/dataset", dset_id, error)
+  CALL check("test_lcpl.h5dopen_f", error, total_error)
+
+  !  Read data from dataset
+!EP  CALL h5dread_f(dset_id, H5T_NATIVE_INTEGER, rdata, dims, error, &
+!EP       H5S_ALL_F, H5S_ALL_F, xfer_prp = H5P_DEFAULT_F)
+  CALL h5dread_f(dset_id, H5T_NATIVE_INTEGER, rdata, dims, error)
+  CALL check("h5dread_f", error, total_error)
+
+  !  Verify the data
+  DO i = 1, TEST6_DIM1
+     DO j = 1, TEST6_DIM2
+        CALL verify("H5Dread",wdata(i,j),rdata(i,j),total_error)
+     ENDDO
+  ENDDO
+  !  Close open IDs
+
+  CALL h5dclose_f(dset_id, error)
+  CALL check("h5dclose_f",error,total_error)
+  CALL h5tclose_f(type_id, error)
+  CALL check("h5tclose_f",error,total_error)
+
+  !  Close remaining IDs
+  CALL h5sclose_f(space_id, error)
+  CALL check("h5sclose_f",error,total_error)
+  CALL h5pclose_f(lcpl_id,error)
+  CALL check("h5pclose_f", error, total_error)
+
+  ! *********************
+  !    CHECK H5OCOPY_F
+  ! *********************
+
+  DO i = 1, dim0
+     wdata2(i) = i-1
+  ENDDO
+  !
+  ! Create dataspace.  Setting size to be the current size.
+  !
+  CALL h5screate_simple_f(1, dims2, space_id, error)
+  CALL check("h5screate_simple_f", error, total_error)
+  !
+  ! Create intermediate groups
+  !
+  CALL h5gcreate_f(file_id,"/G1",group_id1,error)
+  CALL check("h5gcreate_f", error, total_error)
+  CALL h5gcreate_f(file_id,"/G1/G2",group_id2,error)
+  CALL check("h5gcreate_f", error, total_error)
+  CALL h5gcreate_f(file_id,"/G1/G2/G3",group_id3,error)
+  CALL check("h5gcreate_f", error, total_error)
+
+  ! Try putting a comment on the group /G1/G2/G3 by name
+  CALL h5oset_comment_by_name_f(file_id, "/G1/G2/G3", grp_comment, error)
+  CALL check("h5oset_comment_by_name_f", error, total_error)
+
+  comment_lg = ' '
+
+  CALL h5oget_comment_by_name_f(file_id, "/G1/G2/G3", comment_lg, error)
+  CALL check("h5oget_comment_by_name_f", error, total_error)
+
+  IF(comment_lg(1:13).NE.grp_comment)THEN
+     CALL check("h5oget_comment_by_name_f", -1, total_error)
+  ENDIF
+  IF(comment_lg(14:20).NE.'       ')THEN ! make sure no NULL terminator
+     CALL check("h5oget_comment_by_name_f", -1, total_error)
+  ENDIF
+
+  ! Try putting a comment on the group /G1/G2/G3 by name with trailing blanks
+
+  CALL h5oset_comment_by_name_f(file_id, "/G1/G2/G3"//'  ', grp_comment, error)
+  CALL check("h5oset_comment_by_name_f", error, total_error)
+
+  comment_lg = ' '
+
+  CALL h5oget_comment_by_name_f(file_id, "/G1/G2/G3"//'  ', comment_lg, error)
+  CALL check("h5oget_comment_by_name_f", error, total_error)
+
+  IF(comment_lg(1:13).NE.grp_comment)THEN
+     CALL check("h5oget_comment_by_name_f", -1, total_error)
+  ENDIF
+  IF(comment_lg(14:20).NE.'       ')THEN ! make sure no NULL terminator
+     CALL check("h5oget_comment_by_name_f", -1, total_error)
+  ENDIF
+
+  !
+  ! Create the dataset
+  !
+  CALL h5dcreate_f(group_id3, dataset, H5T_STD_I32LE, space_id, dset_id, error)
+  CALL check("h5dcreate_f", error, total_error)
+
+  ! Putting a comment on the dataset
+  CALL h5oset_comment_f(dset_id, dset_comment, error)
+  CALL check("h5oset_comment_f", error, total_error)
+
+  ! Try reading into a buffer that is the correct size
+
+  CALL h5oget_comment_f(dset_id, comment, error)
+  CALL check("h5oget_comment_f", error, total_error)
+
+  IF(comment(1:15).NE.dset_comment(1:15))THEN
+     CALL check("h5oget_comment_f", -1, total_error)
+  ENDIF
+
+  ! Try reading into a buffer that is to small
+
+  CALL h5oget_comment_f(dset_id, comment_sm, error)
+  CALL check("h5oget_comment_f", error, total_error)
+
+  IF(comment_sm(1:10).NE.dset_comment(1:10))THEN
+     CALL check("h5oget_comment_f", -1, total_error)
+  ENDIF
+
+ ! Try reading into a buffer that is larger then needed
+
+  comment_lg = ' '
+
+  CALL h5oget_comment_f(dset_id, comment_lg, error)
+  CALL check("h5oget_comment_f", error, total_error)
+
+  IF(comment_lg(1:15).NE.dset_comment)THEN
+     CALL check("h5oget_comment_f", -1, total_error)
+  ENDIF
+  IF(comment_lg(16:20).NE.'     ')THEN ! make sure no NULL terminator
+     CALL check("h5oget_comment_f", -1, total_error)
+  ENDIF
+  !
+  ! Check optional parameter
+  !
+  CALL h5oget_comment_f(dset_id, comment_lg, error, comment_size)
+  CALL check("h5oget_comment_f", error, total_error)
+
+  IF( comment_size.NE.15)THEN
+     CALL check("h5oget_comment_f", -1, total_error)
+  ENDIF
+
+  ! CHECK h5oget_comment_by_name_f
+
+  ! Try reading into a buffer that is the correct size
+
+  CALL h5oget_comment_by_name_f(dset_id, ".", comment, error)
+  CALL check("h5oget_comment_by_name_f", error, total_error)
+
+  IF(comment(1:15).NE.dset_comment(1:15))THEN
+     CALL check("h5oget_comment_by_name_f", -1, total_error)
+  ENDIF
+
+  ! Try with trailing blanks in the name
+
+  CALL h5oget_comment_by_name_f(dset_id, ".     ", comment, error)
+  CALL check("h5oget_comment_by_name_f", error, total_error)
+
+  IF(comment(1:15).NE.dset_comment(1:15))THEN
+     CALL check("h5oget_comment_by_name_f", -1, total_error)
+  ENDIF
+
+  !
+  ! Check optional parameter
+  !
+  CALL h5oget_comment_by_name_f(dset_id, ".     ", comment_lg, error, comment_size2)
+  CALL check("h5oget_comment_by_name_f", error, total_error)
+
+  IF( comment_size2.NE.15)THEN
+     CALL check("h5oget_comment_by_name_f", -1, total_error)
+  ENDIF
+
+  !
+  ! Write the data to the dataset.
+  !
+  CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, wdata2, dims2, error)
+  CALL check("h5dwrite_f", error, total_error)
+
+  ! *************************
+  ! CHECK H5OEXISTS_BY_NAME_F
+  ! *************************
+
+  ! Create a soft link to /G1
+  CALL h5lcreate_soft_f("/G1", file_id, "/G1_LINK", error)
+  CALL check("h5lcreate_soft_f", error, total_error)
+
+
+  ! Create a soft link to /G1000, does not exist
+  CALL h5lcreate_soft_f("/G1000", file_id, "/G1_FALSE", error)
+  CALL check("h5lcreate_soft_f", error, total_error)
+
+  ! Create a soft link to /G1_LINK
+  CALL h5lcreate_soft_f("/G1_FALSE", file_id, "/G2_FALSE", error)
+  CALL check("h5lcreate_soft_f", error, total_error)
+
+  ! See if the link exists
+  CALL h5oexists_by_name_f(file_id,"/G1_LINK", link_exists, error)
+  CALL check("h5oexists_by_name_f", error, total_error)
+
+  ! Object should exist
+  IF(.NOT.link_exists)THEN
+     CALL check("h5oexists_by_name_f", -1, total_error)
+  ENDIF
+
+  chr_exact = "/G1_LINK"
+  ! See if the link exists
+  CALL h5oexists_by_name_f(file_id,chr_exact, link_exists, error, H5P_DEFAULT_F)
+  CALL check("h5oexists_by_name_f", error, total_error)
+
+  ! Object should exist
+  IF(.NOT.link_exists)THEN
+     CALL check("h5oexists_by_name_f", -1, total_error)
+  ENDIF
+
+  chr_lg = "/G1_LINK"
+  ! See if the link exists
+  CALL h5oexists_by_name_f(file_id,chr_lg, link_exists, error, H5P_DEFAULT_F)
+  CALL check("h5oexists_by_name_f", error, total_error)
+
+  ! Object should exist
+  IF(.NOT.link_exists)THEN
+     CALL check("h5oexists_by_name_f", -1, total_error)
+  ENDIF
+
+  chr_lg = "/G1_LINK  "
+  ! See if the link exists
+  CALL h5oexists_by_name_f(file_id,chr_lg, link_exists, error, H5P_DEFAULT_F)
+  CALL check("h5oexists_by_name_f", error, total_error)
+
+  ! Object should exist
+  IF(.NOT.link_exists)THEN
+     CALL check("h5oexists_by_name_f", -1, total_error)
+  ENDIF
+
+  ! See if the link exists
+  CALL h5oexists_by_name_f(file_id,"/G1_FALSE", link_exists, error)
+  CALL check("h5oexists_by_name_f", error, total_error)
+
+  ! Object should not exist
+  IF(link_exists)THEN
+     CALL check("h5oexists_by_name_f", -1, total_error)
+  ENDIF
+
+  ! Check optional parameter
+
+  CALL h5pcreate_f(H5P_LINK_ACCESS_F,plist,error)
+  CALL check("h5pcreate_f",error,total_error)
+
+  nlinks = 2
+  CALL h5pset_nlinks_f(plist, nlinks, error)
+  CALL check("h5pset_nlinks_f", error, total_error)
+  ! Ensure that nlinks was set successfully
+  nlinks = 0
+  CALL h5pget_nlinks_f(plist, nlinks, error)
+  CALL check("h5pget_nlinks_f",error,total_error)
+  CALL verify("h5pget_nlinks_f", INT(nlinks), 2, total_error)
+
+  ! See if the link exists
+  CALL h5oexists_by_name_f(file_id,"/G1_LINK", link_exists, error, plist)
+  CALL check("h5oexists_by_name_f", error, total_error)
+
+  ! Object should exist
+  IF(.not.link_exists)THEN
+     CALL check("h5oexists_by_name_f", -1, total_error)
+  ENDIF
+  !
+  ! Close and release resources.
+  !
+  CALL h5dclose_f(dset_id , error)
+  CALL check(" h5dclose_f", error, total_error)
+  CALL h5sclose_f(space_id, error)
+  CALL check("h5sclose_f", error, total_error)
+  CALL h5gclose_f(group_id1, error)
+  CALL check("h5gclose_f", error, total_error)
+  CALL h5gclose_f(group_id2, error)
+  CALL check("h5gclose_f", error, total_error)
+  CALL h5gclose_f(group_id3, error)
+  CALL check("h5gclose_f", error, total_error)
+
+  ! Test opening an object by index, note
+  CALL h5oopen_by_idx_f(file_id, "/G1/G2/G3", H5_INDEX_NAME_F, H5_ITER_INC_F, 0_hsize_t, group_id, error)
+  CALL check("h5oopen_by_idx_f", error, total_error)
+
+  CALL h5oclose_f(group_id, error)
+  CALL check("h5gclose_f", error, total_error)
+
+  !
+  ! create property to pass copy options
+  !
+  CALL h5pcreate_f(H5P_LINK_CREATE_F, lcpl_id, error)
+  CALL check("h5Pcreate_f", error, total_error)
+
+  CALL h5pset_create_inter_group_f(lcpl_id, TRUE, error)
+  CALL check("H5Pset_create_inter_group_f", error, total_error)
+  !
+  ! Check optional parameter lcpl_id, this would fail if lcpl_id was not specified
+  !
+  CALL h5ocopy_f(file_id, "/G1/G2/G3/DS1", file_id, "/G1/G_cp1/DS2", error, lcpl_id=lcpl_id)
+  CALL check("h5ocopy_f -- W/ OPTION: lcpl_id", error ,total_error)
+
+  CALL h5pclose_f(lcpl_id, error)
+  CALL check("h5pclose_f",error,total_error)
+
+  CALL h5pcreate_f(H5P_OBJECT_COPY_F, ocpypl_id, error)
+  CALL check("h5Pcreate_f",error,total_error)
+
+  CALL h5pset_copy_object_f(ocpypl_id, H5O_COPY_SHALLOW_HIERARCHY_F, error)
+  CALL check("H5Pset_copy_object_f",error,total_error)
+
+  CALL h5ocopy_f(file_id, "/G1/G2", file_id, "/G1/G_cp2", error, ocpypl_id=ocpypl_id)
+  CALL check("h5ocopy_f",error,total_error)
+
+  ! Makes sure the "DS1" dataset was not copied since we set a
+  ! flag to copy only immediate members of a group.
+  ! Therefore, this should fail.
+  CALL h5dopen_f(file_id, "/G1/G_cp2/DS1", dset_id, error)
+  IF(error.EQ.0)THEN
+     CALL check("h5ocopy_f -- W/ OPTION: ocpypl_id", -1, total_error)
+  ENDIF
+
+  CALL h5pclose_f(ocpypl_id, error)
+  CALL check("h5pclose_f",error,total_error)
+
+  ! create datatype
+  CALL h5tcopy_f(H5T_NATIVE_INTEGER, tid, error)
+  CALL check("h5tcopy_f", error, total_error)
+
+  ! create named datatype
+  CALL h5tcommit_f(file_id, NAME_DATATYPE_SIMPLE, tid, error)
+  CALL check("h5tcommit_f", error, total_error)
+
+  ! close the datatype
+  CALL h5tclose_f(tid, error)
+  CALL check("h5tclose_f",error, total_error)
+
+  CALL h5ocopy_f(file_id, NAME_DATATYPE_SIMPLE, file_id, NAME_DATATYPE_SIMPLE2, error)
+  CALL check("h5ocopy_f",error,total_error)
+
+  ! open the datatype for copy
+  CALL h5topen_f(file_id, NAME_DATATYPE_SIMPLE, tid, error)
+  CALL check("h5topen_f",error,total_error)
+
+  ! open the copied datatype
+  CALL h5topen_f(file_id, NAME_DATATYPE_SIMPLE2, tid2, error)
+  CALL check("h5topen_f",error,total_error)
+
+  ! Compare the datatypes
+  CALL h5tequal_f(tid, tid2, flag, error)
+  IF(.NOT.flag)THEN
+     CALL check("h5ocopy_f FAILED", -1, total_error)
+  ENDIF
+
+  ! close the destination datatype
+  CALL h5tclose_f(tid, error)
+  CALL check("h5tclose_f",error,total_error)
+
+  ! close the destination datatype
+  CALL h5tclose_f(tid2, error)
+  CALL check("h5tclose_f",error,total_error)
+
+  CALL h5fclose_f(file_id, error)
+  CALL check("h5fclose_f",error,total_error)
+
+END SUBROUTINE test_h5o_link
+
+!***************************************************************
+!**
+!**  test_h5o_plist(): Test object creation properties
+!**
+!***************************************************************
+
+SUBROUTINE test_h5o_plist(total_error)
+
+  IMPLICIT NONE
+  INTEGER, INTENT(INOUT) :: total_error
+
+  INTEGER(hid_t) :: fid                        ! HDF5 File ID
+  INTEGER(hid_t) :: grp, dset, dtype, dspace   ! Object identifiers
+  INTEGER(hid_t) :: fapl                       ! File access property list
+  INTEGER(hid_t) :: gcpl, dcpl, tcpl           ! Object creation properties
+  INTEGER :: def_max_compact, def_min_dense    ! Default phase change parameters
+  INTEGER :: max_compact, min_dense            ! Actual phase change parameters
+  INTEGER :: error                             ! Value returned from API calls
+  CHARACTER(LEN=7), PARAMETER :: TEST_FILENAME = 'test.h5'
+
+
+!  PRINT*,'Testing object creation properties'
+
+  ! Make a FAPL that uses the "use the latest version of the format" flag
+  CALL H5Pcreate_f(H5P_FILE_ACCESS_F, fapl, error)
+  CALL check("H5Pcreate_f", error, total_error)
+
+  !  Set the "use the latest version of the format" bounds for creating objects in the file
+  CALL H5Pset_libver_bounds_f(fapl, H5F_LIBVER_LATEST_F, H5F_LIBVER_LATEST_F, error)
+  CALL check("H5Pcreate_f", error, total_error)
+
+  !  Create a new HDF5 file
+  CALL H5Fcreate_f(TEST_FILENAME, H5F_ACC_TRUNC_F, fid, error, access_prp=fapl)
+  CALL check("H5Fcreate_f", error, total_error)
+
+  !  Create group, dataset & named datatype creation property lists
+  CALL H5Pcreate_f(H5P_GROUP_CREATE_F, gcpl, error)
+  CALL check("H5Pcreate_f", error, total_error)
+  CALL H5Pcreate_f(H5P_DATASET_CREATE_F, dcpl, error)
+  CALL check("H5Pcreate_f", error, total_error)
+  CALL H5Pcreate_f(H5P_DATATYPE_CREATE_F, tcpl, error)
+  CALL check("H5Pcreate_f", error, total_error)
+
+  !  Retrieve default attribute phase change values
+  CALL H5Pget_attr_phase_change_f(gcpl, def_max_compact, def_min_dense, error)
+  CALL check("H5Pget_attr_phase_change_f", error, total_error)
+
+  !  Set non-default attribute phase change values on each creation property list
+  CALL H5Pset_attr_phase_change_f(gcpl, def_max_compact+1, def_min_dense-1, error)
+  CALL check("H5Pget_attr_phase_change_f", error, total_error)
+  CALL H5Pset_attr_phase_change_f(dcpl, def_max_compact+1, def_min_dense-1, error)
+  CALL check("H5Pget_attr_phase_change_f", error, total_error)
+  CALL H5Pset_attr_phase_change_f(tcpl, def_max_compact+1, def_min_dense-1, error)
+  CALL check("H5Pget_attr_phase_change_f", error, total_error)
+
+  !  Retrieve attribute phase change values on each creation property list and verify
+  CALL H5Pget_attr_phase_change_f(gcpl, max_compact, min_dense, error)
+  CALL check("H5Pget_attr_phase_change_f", error, total_error)
+  CALL verify("H5Pget_attr_phase_change_f", max_compact, (def_max_compact + 1), total_error)
+  CALL verify("H5Pget_attr_phase_change_f", min_dense, (def_min_dense - 1), total_error)
+
+  CALL H5Pget_attr_phase_change_f(dcpl, max_compact, min_dense, error)
+  CALL check("H5Pget_attr_phase_change_f", error, total_error)
+  CALL verify("H5Pget_attr_phase_change_f", max_compact, (def_max_compact + 1), total_error)
+  CALL verify("H5Pget_attr_phase_change_f", min_dense, (def_min_dense - 1), total_error)
+
+  CALL H5Pget_attr_phase_change_f(tcpl, max_compact, min_dense, error)
+  CALL check("H5Pget_attr_phase_change_f", error, total_error)
+  CALL verify("H5Pget_attr_phase_change_f", max_compact, (def_max_compact + 1), total_error)
+  CALL verify("H5Pget_attr_phase_change_f", min_dense, (def_min_dense - 1), total_error)
+
+  ! Create a group, dataset, and committed datatype within the file,
+  ! using the respective type of creation property lists.
+  !
+
+  ! Create the group anonymously and link it in
+  CALL H5Gcreate_anon_f(fid, grp, error, gcpl_id=gcpl)
+  CALL check("H5Gcreate_anon_f", error, total_error)
+
+  CALL H5Olink_f(grp, fid, "group", error)
+  CALL check("H5Olink_f", error, total_error)
+
+  !  Commit the type inside the group anonymously and link it in
+  CALL h5tcopy_f(H5T_NATIVE_INTEGER, dtype, error)
+  CALL check("h5tcopy_f", error, total_error)
+
+  CALL H5Tcommit_anon_f(fid, dtype, error, tcpl_id=tcpl)
+  CALL check("H5Tcommit_anon_f",error,total_error)
+
+  CALL H5Olink_f(dtype, fid, "datatype", error)
+  CALL check("H5Olink_f", error, total_error)
+
+  !  Create the dataspace for the dataset.
+  CALL h5screate_f(H5S_SCALAR_F, dspace, error)
+  CALL check("h5screate_f",error,total_error)
+
+  !  Create the dataset anonymously and link it in
+  CALL H5Dcreate_anon_f(fid, H5T_NATIVE_INTEGER, dspace, dset, error, dcpl )
+  CALL check("H5Dcreate_anon_f",error,total_error)
+
+  CALL H5Olink_f(dset, fid, "dataset", error)
+  CALL check("H5Olink_f", error, total_error)
+
+  CALL h5sclose_f(dspace, error)
+  CALL check("h5sclose_f",error,total_error)
+
+  !  Close current creation property lists
+  CALL h5pclose_f(gcpl,error)
+  CALL check("h5pclose_f", error, total_error)
+  CALL h5pclose_f(dcpl,error)
+  CALL check("h5pclose_f", error, total_error)
+  CALL h5pclose_f(tcpl,error)
+  CALL check("h5pclose_f", error, total_error)
+
+  !  Retrieve each object's creation property list
+  CALL H5Gget_create_plist_f(grp, gcpl, error)
+  CALL check("H5Gget_create_plist", error, total_error)
+
+  CALL H5Tget_create_plist_f(dtype, tcpl, error)
+  CALL check("H5Tget_create_plist_f", error, total_error)
+
+  CALL H5Dget_create_plist_f(dset, dcpl, error)
+  CALL check("H5Dget_create_plist_f", error, total_error)
+
+  !  Retrieve attribute phase change values on each creation property list and verify
+  CALL H5Pget_attr_phase_change_f(gcpl, max_compact, min_dense, error)
+  CALL check("H5Pget_attr_phase_change_f", error, total_error)
+  CALL verify("H5Pget_attr_phase_change_f", max_compact, (def_max_compact + 1), total_error)
+  CALL verify("H5Pget_attr_phase_change_f", min_dense, (def_min_dense - 1), total_error)
+
+  CALL H5Pget_attr_phase_change_f(dcpl, max_compact, min_dense, error)
+  CALL check("H5Pget_attr_phase_change_f", error, total_error)
+  CALL verify("H5Pget_attr_phase_change_f", max_compact, (def_max_compact + 1), total_error)
+  CALL verify("H5Pget_attr_phase_change_f", min_dense, (def_min_dense - 1), total_error)
+
+  CALL H5Pget_attr_phase_change_f(tcpl, max_compact, min_dense, error)
+  CALL check("H5Pget_attr_phase_change_f", error, total_error)
+  CALL verify("H5Pget_attr_phase_change_f", max_compact, (def_max_compact + 1), total_error)
+  CALL verify("H5Pget_attr_phase_change_f", min_dense, (def_min_dense - 1), total_error)
+
+  ! Close current objects
+  CALL h5pclose_f(gcpl,error)
+  CALL check("h5pclose_f", error, total_error)
+  CALL h5pclose_f(dcpl,error)
+  CALL check("h5pclose_f", error, total_error)
+  CALL h5pclose_f(tcpl,error)
+  CALL check("h5pclose_f", error, total_error)
+
+  CALL h5gclose_f(grp, error)
+  CALL check("h5gclose_f",error,total_error)
+
+  CALL h5tclose_f(dtype, error)
+  CALL check("h5tclose_f",error,total_error)
+  CALL h5dclose_f(dset, error)
+  CALL check("h5dclose_f",error,total_error)
+  CALL h5fclose_f(fid, error)
+  CALL check("h5fclose_f",error,total_error)
+  !  Re-open the file and check that the object creation properties persist
+  CALL h5fopen_f(TEST_FILENAME, H5F_ACC_RDONLY_F, fid, error, access_prp=fapl)
+  CALL check("H5fopen_f",error,total_error)
+
+  !  Re-open objects
+  CALL H5Gopen_f(fid, "group", grp, error)
+  CALL check("h5gopen_f", error, total_error)
+
+  CALL H5Topen_f(fid, "datatype", dtype,error)
+  CALL check("h5topen_f", error, total_error)
+
+  CALL H5Dopen_f(fid, "dataset", dset, error)
+  CALL check("h5dopen_f", error, total_error)
+
+  !  Retrieve each object's creation property list
+  CALL H5Gget_create_plist_f(grp, gcpl, error)
+  CALL check("H5Gget_create_plist", error, total_error)
+
+  CALL H5Tget_create_plist_f(dtype, tcpl, error)
+  CALL check("H5Tget_create_plist_f", error, total_error)
+
+  CALL H5Dget_create_plist_f(dset, dcpl, error)
+  CALL check("H5Dget_create_plist_f", error, total_error)
+
+  !  Retrieve attribute phase change values on each creation property list and verify
+  CALL H5Pget_attr_phase_change_f(gcpl, max_compact, min_dense, error)
+  CALL check("H5Pget_attr_phase_change_f", error, total_error)
+  CALL verify("H5Pget_attr_phase_change_f", max_compact, (def_max_compact + 1), total_error)
+  CALL verify("H5Pget_attr_phase_change_f", min_dense, (def_min_dense - 1), total_error)
+
+  CALL H5Pget_attr_phase_change_f(dcpl, max_compact, min_dense, error)
+  CALL check("H5Pget_attr_phase_change_f", error, total_error)
+  CALL verify("H5Pget_attr_phase_change_f", max_compact, (def_max_compact + 1), total_error)
+  CALL verify("H5Pget_attr_phase_change_f", min_dense, (def_min_dense - 1), total_error)
+
+  CALL H5Pget_attr_phase_change_f(tcpl, max_compact, min_dense, error)
+  CALL check("H5Pget_attr_phase_change_f", error, total_error)
+  CALL verify("H5Pget_attr_phase_change_f", max_compact, (def_max_compact + 1), total_error)
+  CALL verify("H5Pget_attr_phase_change_f", min_dense, (def_min_dense - 1), total_error)
+
+  !  Close current objects
+  CALL h5pclose_f(gcpl,error)
+  CALL check("h5pclose_f", error, total_error)
+  CALL h5pclose_f(dcpl,error)
+  CALL check("h5pclose_f", error, total_error)
+  CALL h5pclose_f(tcpl,error)
+  CALL check("h5pclose_f", error, total_error)
+
+  CALL h5gclose_f(grp, error)
+  CALL check("h5gclose_f",error,total_error)
+
+  CALL h5tclose_f(dtype, error)
+  CALL check("h5tclose_f",error,total_error)
+  CALL h5dclose_f(dset, error)
+  CALL check("h5dclose_f",error,total_error)
+  CALL h5fclose_f(fid, error)
+  CALL check("h5fclose_f",error,total_error)
+
+  !  Close the FAPL
+  CALL H5Pclose_f(fapl, error)
+  CALL check("H5Pclose_f", error, total_error)
+
+END SUBROUTINE test_h5o_plist
+
+END MODULE TH5O
diff --git a/fortran/test/tH5O.f90 b/fortran/test/tH5O.f90
deleted file mode 100644
index 99d4c22..0000000
--- a/fortran/test/tH5O.f90
+++ /dev/null
@@ -1,797 +0,0 @@
-!****h* root/fortran/test/tH5O.f90
-!
-! NAME
-!  tH5O.f90
-!
-! FUNCTION
-!  Basic testing of Fortran H5O APIs.
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! CONTAINS SUBROUTINES
-!  test_h5o, test_h5o_link, test_h5o_plist
-!
-!*****
-MODULE TH5O
-
-CONTAINS
-
-SUBROUTINE test_h5o(cleanup, total_error)
-  USE HDF5 ! This module contains all necessary modules
-  USE TH5_MISC
-
-  IMPLICIT NONE
-  LOGICAL, INTENT(IN)  :: cleanup
-  INTEGER, INTENT(INOUT) :: total_error
-  INTEGER :: error
-
-  CALL test_h5o_plist(total_error) ! Test object creation properties
-  CALL test_h5o_link(total_error) ! Test object link routine
-
-  IF(cleanup) CALL h5_cleanup_f("TestFile", H5P_DEFAULT_F, error)
-  CALL check("h5_cleanup_f", error, total_error)
-  IF(cleanup) CALL h5_cleanup_f("test", H5P_DEFAULT_F, error)
-  CALL check("h5_cleanup_f", error, total_error)
-
-END SUBROUTINE test_h5o
-
-!***************************************************************
-!**
-!**  test_h5o_link: Test creating link to object
-!**
-!***************************************************************
-
-SUBROUTINE test_h5o_link(total_error)
-
-  USE HDF5 ! This module contains all necessary modules
-  USE TH5_MISC
-
-  IMPLICIT NONE
-  INTEGER, INTENT(INOUT) :: total_error
-
-  INTEGER(HID_T) :: file_id
-  INTEGER(HID_T) :: group_id
-  INTEGER(HID_T) :: space_id
-  INTEGER(HID_T) :: dset_id
-  INTEGER(HID_T) :: type_id
-  INTEGER(HID_T) :: fapl_id
-  INTEGER(HID_T) :: lcpl_id
-  INTEGER(HID_T) :: ocpypl_id
-  CHARACTER(LEN=11), PARAMETER :: TEST_FILENAME = 'TestFile.h5'
-  INTEGER, PARAMETER :: TEST6_DIM1 = 2, TEST6_DIM2 = 5
-!EP  INTEGER(HSIZE_T), DIMENSION(1:2), PARAMETER :: dims = (/TEST6_DIM1,TEST6_DIM2/)
-  INTEGER(HSIZE_T), DIMENSION(1:2)  :: dims = (/TEST6_DIM1,TEST6_DIM2/)
-!EP  INTEGER, DIMENSION(1:TEST6_DIM1,1:TEST6_DIM2) :: wdata, rdata
-  INTEGER, DIMENSION(TEST6_DIM1,TEST6_DIM2) :: wdata, rdata
-
-  INTEGER, PARAMETER :: TRUE = 1
-
-  LOGICAL :: committed !  Whether the named datatype is committed 
-
-  INTEGER :: i, j
-  INTEGER ::  error  !  Value returned from API calls 
-
-  CHARACTER(LEN=14) :: NAME_DATATYPE_SIMPLE="H5T_NATIVE_INT"
-  CHARACTER(LEN=16) :: NAME_DATATYPE_SIMPLE2="H5T_NATIVE_INT-2"
-  INTEGER(HID_T) :: tid, tid2
-  LOGICAL :: flag
-  
-  ! Data for tested h5ocopy_f
-  CHARACTER(LEN=3) , PARAMETER :: dataset = "DS1"
-  INTEGER          , PARAMETER :: dim0     = 4
-
-  INTEGER(HSIZE_T), DIMENSION(1:1)    :: dims2 = (/dim0/) ! size read/write buffer
-  INTEGER         , DIMENSION(1:dim0) :: wdata2   ! Write buffer 
-  LOGICAL :: link_exists
-  CHARACTER(LEN=8)  :: chr_exact
-  CHARACTER(LEN=10) :: chr_lg
-  INTEGER(size_t) :: nlinks
-  INTEGER(HID_T) :: plist = -1
-
-  CHARACTER(LEN=20) :: dset_comment = "dataset comment"
-  CHARACTER(LEN=13) :: grp_comment = "group comment"
-  CHARACTER(LEN=10) :: comment_sm ! to small comment sized buffer
-  CHARACTER(LEN=15) :: comment ! exact comment sized buffer
-  CHARACTER(LEN=20) :: comment_lg ! large comment sized buffer
-  INTEGER(HSSIZE_T) :: comment_size
-  INTEGER(SIZE_T)   :: comment_size2
-
-  !  Initialize the raw data 
-  DO i = 1, TEST6_DIM1
-     DO j = 1, TEST6_DIM2
-        wdata(i,j) = i*j
-     ENDDO
-  ENDDO
-
-  !  Create the dataspace 
-  CALL h5screate_simple_f(2, dims, space_id, error)
-  CALL check("h5screate_simple_f",error,total_error)
-
-  !  Create LCPL with intermediate group creation flag set 
-  CALL H5Pcreate_f(H5P_LINK_CREATE_F, lcpl_id, error)
-  CALL check("h5Pcreate_f",error,total_error)
-
-  CALL H5Pset_create_inter_group_f(lcpl_id, TRUE, error)
-  CALL check("H5Pset_create_inter_group_f",error,total_error)
-
-  !  Loop over using new group format 
-  ! for(new_format = FALSE; new_format <= TRUE; new_format++) {
-
-  ! Make a FAPL that uses the "use the latest version of the format" bounds 
-  CALL H5Pcreate_f(H5P_FILE_ACCESS_F,fapl_id,error)
-  CALL check("h5Pcreate_f",error,total_error)
-
-  !  Set the "use the latest version of the format" bounds for creating objects in the file 
-
-  CALL H5Pset_libver_bounds_f(fapl_id, H5F_LIBVER_LATEST_F, H5F_LIBVER_LATEST_F, error)
-  CALL check("H5Pset_libver_bounds_f",error, total_error)
-
-  !  Create a new HDF5 file 
-  CALL H5Fcreate_f(TEST_FILENAME, H5F_ACC_TRUNC_F, file_id, error, H5P_DEFAULT_F, fapl_id)
-  CALL check("H5Fcreate_f", error, total_error)
-
-  !  Close the FAPL 
-  CALL h5pclose_f(fapl_id, error)
-  CALL check("h5pclose_f",error,total_error)
-
-  !  Create and commit a datatype with no name 
-  CALL H5Tcopy_f( H5T_NATIVE_INTEGER, type_id, error)
-  CALL check("H5Tcopy_F",error,total_error)
-
-  CALL H5Tcommit_anon_f(file_id, type_id, error) ! using no optional parameters
-  CALL check("H5Tcommit_anon_F",error,total_error)
-
-  CALL H5Tcommitted_f(type_id, committed, error)
-  CALL check("H5Tcommitted_f",error,total_error)
-  CALL verifyLogical("H5Tcommitted_f", committed, .TRUE., total_error)
-
-  !  Create a dataset with no name using the committed datatype
-  CALL H5Dcreate_anon_f(file_id, type_id, space_id, dset_id, error ) ! using no optional parameters
-  CALL check("H5Dcreate_anon_f",error,total_error)
-  !
-  !  Verify that we can write to and read from the dataset 
-  !
-  !  Write the data to the dataset 
-
-!EP  CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, wdata, dims, error, &
-!EP         mem_space_id=H5S_ALL_F, file_space_id=H5S_ALL_F, xfer_prp = H5P_DEFAULT_F)
-  CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, wdata, dims, error)
-  CALL check("h5dwrite_f", error, total_error)
-
-  !  Read the data back 
-!EP  CALL h5dread_f(dset_id, H5T_NATIVE_INTEGER, rdata, dims, error, &
-!EP       mem_space_id=H5S_ALL_F, file_space_id=H5S_ALL_F, xfer_prp = H5P_DEFAULT_F)
-  CALL h5dread_f(dset_id, H5T_NATIVE_INTEGER, rdata, dims, error)
-  CALL check("h5dread_f", error, total_error)
-
-  !  Verify the data 
-  DO i = 1, TEST6_DIM1
-     DO j = 1, TEST6_DIM2
-        CALL VERIFY("H5Dread_f",wdata(i,j),rdata(i,j),total_error)
-        wdata(i,j) = i*j
-     ENDDO
-  ENDDO
-
-  !  Create a group with no name
-
-  CALL H5Gcreate_anon_f(file_id, group_id, error)
-  CALL check("H5Gcreate_anon", error, total_error)
-
-  !  Link nameless datatype into nameless group 
-  CALL H5Olink_f(type_id, group_id, "datatype", error, H5P_DEFAULT_F)
-  CALL check("H5Olink_f", error, total_error)
-
-  !  Link nameless dataset into nameless group with intermediate group 
-  CALL H5Olink_f(dset_id, group_id, "inter_group/dataset", error, lcpl_id, H5P_DEFAULT_F)
-  CALL check("H5Olink_f", error, total_error)
-
-  !  Close IDs for dataset and datatype 
-  CALL h5dclose_f(dset_id, error)
-  CALL check("h5dclose_f", error, total_error)
-  CALL h5tclose_f(type_id, error)
-  CALL check("h5tclose_f", error, total_error)
-
-  !  Re-open datatype using new link 
-  CALL H5Topen_f(group_id, "datatype", type_id, error)
-  CALL check("h5topen_f", error, total_error)
-
-  !  Link nameless group to root group and close the group ID
-  CALL H5Olink_f(group_id, file_id, "/group", error)
-  CALL check("H5Olink_f", error, total_error)
-
-  CALL h5gclose_f(group_id, error)
-  CALL check("h5gclose_f",error,total_error)
-
-  !  Open dataset through root group and verify its data 
-  CALL H5Dopen_f(file_id, "/group/inter_group/dataset", dset_id, error)
-  CALL check("test_lcpl.h5dopen_f", error, total_error)
-
-  !  Read data from dataset 
-!EP  CALL h5dread_f(dset_id, H5T_NATIVE_INTEGER, rdata, dims, error, &
-!EP       H5S_ALL_F, H5S_ALL_F, xfer_prp = H5P_DEFAULT_F)
-  CALL h5dread_f(dset_id, H5T_NATIVE_INTEGER, rdata, dims, error)
-  CALL check("h5dread_f", error, total_error)
-
-  !  Verify the data 
-  DO i = 1, TEST6_DIM1
-     DO j = 1, TEST6_DIM2
-        CALL VERIFY("H5Dread",wdata(i,j),rdata(i,j),total_error)
-     ENDDO
-  ENDDO
-  !  Close open IDs 
-
-  CALL h5dclose_f(dset_id, error)
-  CALL check("h5dclose_f",error,total_error)
-  CALL h5tclose_f(type_id, error)
-  CALL check("h5tclose_f",error,total_error)
-
-  !  Close remaining IDs 
-  CALL h5sclose_f(space_id, error)
-  CALL check("h5sclose_f",error,total_error)
-  CALL h5pclose_f(lcpl_id,error)
-  CALL check("h5pclose_f", error, total_error)
-
-  ! *********************
-  !    CHECK H5OCOPY_F
-  ! *********************
-
-  DO i = 1, dim0
-     wdata2(i) = i-1
-  ENDDO
-  !
-  ! Create dataspace.  Setting size to be the current size.
-  !
-  CALL h5screate_simple_f(1, dims2, space_id, error)
-  CALL check("h5screate_simple_f", error, total_error)
-  !
-  ! Create intermediate groups
-  !
-  CALL h5gcreate_f(file_id,"/G1",group_id,error)
-  CALL check("h5gcreate_f", error, total_error)
-  CALL h5gcreate_f(file_id,"/G1/G2",group_id,error)
-  CALL check("h5gcreate_f", error, total_error)
-  CALL h5gcreate_f(file_id,"/G1/G2/G3",group_id,error)
-  CALL check("h5gcreate_f", error, total_error)
-
-  ! Try putting a comment on the group /G1/G2/G3 by name
-  CALL h5oset_comment_by_name_f(file_id, "/G1/G2/G3", grp_comment, error)
-  CALL check("h5oset_comment_by_name_f", error, total_error)
-
-  comment_lg = ' '
-
-  CALL h5oget_comment_by_name_f(file_id, "/G1/G2/G3", comment_lg, error) 
-  CALL check("h5oget_comment_by_name_f", error, total_error)
-
-  IF(comment_lg(1:13).NE.grp_comment)THEN
-     CALL check("h5oget_comment_by_name_f", -1, total_error)
-  ENDIF
-  IF(comment_lg(14:20).NE.'       ')THEN ! make sure no NULL terminator
-     CALL check("h5oget_comment_by_name_f", -1, total_error)
-  ENDIF
-
-  ! Try putting a comment on the group /G1/G2/G3 by name with trailing blanks
-
-  CALL h5oset_comment_by_name_f(file_id, "/G1/G2/G3"//'  ', grp_comment, error)
-  CALL check("h5oset_comment_by_name_f", error, total_error)
-
-  comment_lg = ' '
-
-  CALL h5oget_comment_by_name_f(file_id, "/G1/G2/G3"//'  ', comment_lg, error) 
-  CALL check("h5oget_comment_by_name_f", error, total_error)
-
-  IF(comment_lg(1:13).NE.grp_comment)THEN
-     CALL check("h5oget_comment_by_name_f", -1, total_error)
-  ENDIF
-  IF(comment_lg(14:20).NE.'       ')THEN ! make sure no NULL terminator
-     CALL check("h5oget_comment_by_name_f", -1, total_error)
-  ENDIF
-
-  !
-  ! Create the dataset
-  !
-  CALL h5dcreate_f(group_id, dataset, H5T_STD_I32LE, space_id, dset_id, error)
-  CALL check("h5dcreate_f", error, total_error)
-
-  ! Putting a comment on the dataset
-  CALL h5oset_comment_f(dset_id, dset_comment, error)
-  CALL check("h5oset_comment_f", error, total_error)
-
-  ! Try reading into a buffer that is the correct size
-
-  CALL h5oget_comment_f(dset_id, comment, error) 
-  CALL check("h5oget_comment_f", error, total_error)
-
-  IF(comment(1:15).NE.dset_comment(1:15))THEN
-     CALL check("h5oget_comment_f", -1, total_error)
-  ENDIF
-
-  ! Try reading into a buffer that is to small
-
-  CALL h5oget_comment_f(dset_id, comment_sm, error) 
-  CALL check("h5oget_comment_f", error, total_error)
-
-  IF(comment_sm(1:10).NE.dset_comment(1:10))THEN
-     CALL check("h5oget_comment_f", -1, total_error)
-  ENDIF 
-
- ! Try reading into a buffer that is larger then needed
-
-  comment_lg = ' '
-
-  CALL h5oget_comment_f(dset_id, comment_lg, error) 
-  CALL check("h5oget_comment_f", error, total_error)
-
-  IF(comment_lg(1:15).NE.dset_comment)THEN
-     CALL check("h5oget_comment_f", -1, total_error)
-  ENDIF
-  IF(comment_lg(16:20).NE.'     ')THEN ! make sure no NULL terminator
-     CALL check("h5oget_comment_f", -1, total_error)
-  ENDIF
-  !
-  ! Check optional parameter
-  !
-  CALL h5oget_comment_f(dset_id, comment_lg, error, comment_size) 
-  CALL check("h5oget_comment_f", error, total_error)
-
-  IF( comment_size.NE.15)THEN
-     CALL check("h5oget_comment_f", -1, total_error)
-  ENDIF
-
-  ! CHECK h5oget_comment_by_name_f
-
-  ! Try reading into a buffer that is the correct size
-
-  CALL h5oget_comment_by_name_f(dset_id, ".", comment, error) 
-  CALL check("h5oget_comment_by_name_f", error, total_error)
-
-  IF(comment(1:15).NE.dset_comment(1:15))THEN
-     CALL check("h5oget_comment_by_name_f", -1, total_error)
-  ENDIF
-
-  ! Try with trailing blanks in the name
-
-  CALL h5oget_comment_by_name_f(dset_id, ".     ", comment, error) 
-  CALL check("h5oget_comment_by_name_f", error, total_error)
-
-  IF(comment(1:15).NE.dset_comment(1:15))THEN
-     CALL check("h5oget_comment_by_name_f", -1, total_error)
-  ENDIF
-
-  !
-  ! Check optional parameter
-  !
-  CALL h5oget_comment_by_name_f(dset_id, ".     ", comment_lg, error, comment_size2) 
-  CALL check("h5oget_comment_by_name_f", error, total_error)
-
-  IF( comment_size2.NE.15)THEN
-     CALL check("h5oget_comment_by_name_f", -1, total_error)
-  ENDIF
-
-  !
-  ! Write the data to the dataset.
-  !
-  CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, wdata2, dims2, error)
-  CALL check("h5dwrite_f", error, total_error)
-
-  ! *************************
-  ! CHECK H5OEXISTS_BY_NAME_F
-  ! *************************
-
-  ! Create a soft link to /G1
-  CALL h5lcreate_soft_f("/G1", file_id, "/G1_LINK", error)
-  CALL check("h5lcreate_soft_f", error, total_error)
-
-
-  ! Create a soft link to /G1000, does not exist
-  CALL h5lcreate_soft_f("/G1000", file_id, "/G1_FALSE", error)
-  CALL check("h5lcreate_soft_f", error, total_error)
-
-  ! Create a soft link to /G1_LINK
-  CALL h5lcreate_soft_f("/G1_FALSE", file_id, "/G2_FALSE", error)
-  CALL check("h5lcreate_soft_f", error, total_error)
-
-  ! See if the link exists
-  CALL h5oexists_by_name_f(file_id,"/G1_LINK", link_exists, error)
-  CALL check("h5oexists_by_name_f", error, total_error)
-
-  ! Object should exist
-  IF(.NOT.link_exists)THEN
-     CALL check("h5oexists_by_name_f", -1, total_error)
-  ENDIF
-
-  chr_exact = "/G1_LINK"
-  ! See if the link exists
-  CALL h5oexists_by_name_f(file_id,chr_exact, link_exists, error, H5P_DEFAULT_F)
-  CALL check("h5oexists_by_name_f", error, total_error)
-
-  ! Object should exist
-  IF(.NOT.link_exists)THEN
-     CALL check("h5oexists_by_name_f", -1, total_error)
-  ENDIF
-
-  chr_lg = "/G1_LINK"
-  ! See if the link exists
-  CALL h5oexists_by_name_f(file_id,chr_lg, link_exists, error, H5P_DEFAULT_F)
-  CALL check("h5oexists_by_name_f", error, total_error)
-
-  ! Object should exist
-  IF(.NOT.link_exists)THEN
-     CALL check("h5oexists_by_name_f", -1, total_error)
-  ENDIF
-
-  chr_lg = "/G1_LINK  "
-  ! See if the link exists
-  CALL h5oexists_by_name_f(file_id,chr_lg, link_exists, error, H5P_DEFAULT_F)
-  CALL check("h5oexists_by_name_f", error, total_error)
-
-  ! Object should exist
-  IF(.NOT.link_exists)THEN
-     CALL check("h5oexists_by_name_f", -1, total_error)
-  ENDIF
-
-  ! See if the link exists
-  CALL h5oexists_by_name_f(file_id,"/G1_FALSE", link_exists, error)
-  CALL check("h5oexists_by_name_f", error, total_error)
-
-  ! Object should not exist
-  IF(link_exists)THEN
-     CALL check("h5oexists_by_name_f", -1, total_error)
-  ENDIF
-
-  ! Check optional parameter
-
-  CALL h5pcreate_f(H5P_LINK_ACCESS_F,plist,error)
-  CALL check("h5pcreate_f",error,total_error)
-
-  nlinks = 2
-  CALL h5pset_nlinks_f(plist, nlinks, error)
-  CALL check("h5pset_nlinks_f", error, total_error)
-  ! Ensure that nlinks was set successfully
-  nlinks = 0
-  CALL h5pget_nlinks_f(plist, nlinks, error)
-  CALL check("h5pget_nlinks_f",error,total_error)
-  CALL VERIFY("h5pget_nlinks_f", INT(nlinks), 2, total_error)
-
-  ! See if the link exists
-  CALL h5oexists_by_name_f(file_id,"/G1_LINK", link_exists, error, plist)
-  CALL check("h5oexists_by_name_f", error, total_error)
-
-  ! Object should exist
-  IF(.not.link_exists)THEN
-     CALL check("h5oexists_by_name_f", -1, total_error)
-  ENDIF
-  !
-  ! Close and release resources.
-  !
-  CALL h5dclose_f(dset_id , error)
-  CALL check(" h5dclose_f", error, total_error)
-  CALL h5sclose_f(space_id, error)
-  CALL check("h5sclose_f", error, total_error)
-  CALL h5gclose_f(group_id, error)
-  CALL check("h5gclose_f", error, total_error)
-
-  ! Test opening an object by index, note 
-  CALL h5oopen_by_idx_f(file_id, "/G1/G2/G3", H5_INDEX_NAME_F, H5_ITER_INC_F, 0_hsize_t, group_id, error)
-  CALL check("h5oopen_by_idx_f", error, total_error)
-
-  CALL h5oclose_f(group_id, error)
-  CALL check("h5gclose_f", error, total_error)
-
-  !
-  ! create property to pass copy options
-  !
-  CALL h5pcreate_f(H5P_LINK_CREATE_F, lcpl_id, error)
-  CALL check("h5Pcreate_f", error, total_error)
-
-  CALL h5pset_create_inter_group_f(lcpl_id, TRUE, error)
-  CALL check("H5Pset_create_inter_group_f", error, total_error)
-  !
-  ! Check optional parameter lcpl_id, this would fail if lcpl_id was not specified
-  !
-  CALL h5ocopy_f(file_id, "/G1/G2/G3/DS1", file_id, "/G1/G_cp1/DS2", error, lcpl_id=lcpl_id)
-  CALL check("h5ocopy_f -- W/ OPTION: lcpl_id", error ,total_error)
-
-  CALL h5pclose_f(lcpl_id, error)
-  CALL check("h5pclose_f",error,total_error)
-
-  CALL h5pcreate_f(H5P_OBJECT_COPY_F, ocpypl_id, error)
-  CALL check("h5Pcreate_f",error,total_error)
-
-  CALL h5pset_copy_object_f(ocpypl_id, H5O_COPY_SHALLOW_HIERARCHY_F, error) 
-  CALL check("H5Pset_copy_object_f",error,total_error)
-
-  CALL h5ocopy_f(file_id, "/G1/G2", file_id, "/G1/G_cp2", error, ocpypl_id=ocpypl_id) 
-  CALL check("h5ocopy_f",error,total_error)
-
-  ! Makes sure the "DS1" dataset was not copied since we set a 
-  ! flag to copy only immediate members of a group.
-  ! Therefore, this should fail.
-  CALL h5dopen_f(file_id, "/G1/G_cp2/DS1", dset_id, error)
-  IF(error.EQ.0)THEN
-     CALL check("h5ocopy_f -- W/ OPTION: ocpypl_id", -1, total_error)
-  ENDIF
-
-  CALL h5pclose_f(ocpypl_id, error)
-  CALL check("h5pclose_f",error,total_error)
-
-  ! create datatype
-  CALL h5tcopy_f(H5T_NATIVE_INTEGER, tid, error)
-  CALL check("h5tcopy_f", error, total_error)
-
-  ! create named datatype
-  CALL h5tcommit_f(file_id, NAME_DATATYPE_SIMPLE, tid, error)
-  CALL check("h5tcommit_f", error, total_error)
-
-  ! close the datatype
-  CALL h5tclose_f(tid, error)
-  CALL check("h5tclose_f",error, total_error)
-
-  CALL h5ocopy_f(file_id, NAME_DATATYPE_SIMPLE, file_id, NAME_DATATYPE_SIMPLE2, error)
-  CALL check("h5ocopy_f",error,total_error)
-
-  ! open the datatype for copy
-  CALL h5topen_f(file_id, NAME_DATATYPE_SIMPLE, tid, error)
-  CALL check("h5topen_f",error,total_error)
-
-  ! open the copied datatype
-  CALL h5topen_f(file_id, NAME_DATATYPE_SIMPLE2, tid2, error)
-  CALL check("h5topen_f",error,total_error)
-
-  ! Compare the datatypes
-  CALL h5tequal_f(tid, tid2, flag, error)
-  IF(.NOT.flag)THEN
-     CALL check("h5ocopy_f FAILED", -1, total_error)
-  ENDIF
-
-  ! close the destination datatype
-  CALL h5tclose_f(tid, error)
-  CALL check("h5tclose_f",error,total_error)
-
-  ! close the destination datatype
-  CALL h5tclose_f(tid2, error)
-  CALL check("h5tclose_f",error,total_error)
-
-  CALL h5fclose_f(file_id, error)
-  CALL check("h5fclose_f",error,total_error)
-
-END SUBROUTINE test_h5o_link
-
-!***************************************************************
-!**
-!**  test_h5o_plist(): Test object creation properties
-!**
-!***************************************************************
-
-SUBROUTINE test_h5o_plist(total_error)
-
-  USE HDF5 ! This module contains all necessary modules
-  USE TH5_MISC
-
-  IMPLICIT NONE
-  INTEGER, INTENT(INOUT) :: total_error
-
-  INTEGER(hid_t) :: fid                        ! HDF5 File ID      
-  INTEGER(hid_t) :: grp, dset, dtype, dspace   ! Object identifiers 
-  INTEGER(hid_t) :: fapl                       ! File access property list 
-  INTEGER(hid_t) :: gcpl, dcpl, tcpl           ! Object creation properties 
-  INTEGER :: def_max_compact, def_min_dense    ! Default phase change parameters 
-  INTEGER :: max_compact, min_dense            ! Actual phase change parameters 
-  INTEGER :: error                             ! Value returned from API calls 
-  CHARACTER(LEN=7), PARAMETER :: TEST_FILENAME = 'test.h5'
-
-
-!  PRINT*,'Testing object creation properties'
-
-  ! Make a FAPL that uses the "use the latest version of the format" flag 
-  CALL H5Pcreate_f(H5P_FILE_ACCESS_F, fapl, error)
-  CALL check("H5Pcreate_f", error, total_error)
-
-  !  Set the "use the latest version of the format" bounds for creating objects in the file 
-  CALL H5Pset_libver_bounds_f(fapl, H5F_LIBVER_LATEST_F, H5F_LIBVER_LATEST_F, error)
-  CALL check("H5Pcreate_f", error, total_error)
-
-  !  Create a new HDF5 file 
-  CALL H5Fcreate_f(TEST_FILENAME, H5F_ACC_TRUNC_F, fid, error, access_prp=fapl)
-  CALL check("H5Fcreate_f", error, total_error)
-
-  !  Create group, dataset & named datatype creation property lists 
-  CALL H5Pcreate_f(H5P_GROUP_CREATE_F, gcpl, error)
-  CALL check("H5Pcreate_f", error, total_error)
-  CALL H5Pcreate_f(H5P_DATASET_CREATE_F, dcpl, error)
-  CALL check("H5Pcreate_f", error, total_error)
-  CALL H5Pcreate_f(H5P_DATATYPE_CREATE_F, tcpl, error)
-  CALL check("H5Pcreate_f", error, total_error)
-
-  !  Retrieve default attribute phase change values 
-  CALL H5Pget_attr_phase_change_f(gcpl, def_max_compact, def_min_dense, error)
-  CALL check("H5Pget_attr_phase_change_f", error, total_error)
-
-  !  Set non-default attribute phase change values on each creation property list 
-  CALL H5Pset_attr_phase_change_f(gcpl, def_max_compact+1, def_min_dense-1, error)
-  CALL check("H5Pget_attr_phase_change_f", error, total_error)
-  CALL H5Pset_attr_phase_change_f(dcpl, def_max_compact+1, def_min_dense-1, error)
-  CALL check("H5Pget_attr_phase_change_f", error, total_error)
-  CALL H5Pset_attr_phase_change_f(tcpl, def_max_compact+1, def_min_dense-1, error)
-  CALL check("H5Pget_attr_phase_change_f", error, total_error)
-
-  !  Retrieve attribute phase change values on each creation property list and verify 
-  CALL H5Pget_attr_phase_change_f(gcpl, max_compact, min_dense, error)
-  CALL check("H5Pget_attr_phase_change_f", error, total_error)
-  CALL VERIFY("H5Pget_attr_phase_change_f", max_compact, (def_max_compact + 1), total_error)
-  CALL VERIFY("H5Pget_attr_phase_change_f", min_dense, (def_min_dense - 1), total_error)
-
-  CALL H5Pget_attr_phase_change_f(dcpl, max_compact, min_dense, error)
-  CALL check("H5Pget_attr_phase_change_f", error, total_error)
-  CALL VERIFY("H5Pget_attr_phase_change_f", max_compact, (def_max_compact + 1), total_error)
-  CALL VERIFY("H5Pget_attr_phase_change_f", min_dense, (def_min_dense - 1), total_error)
-
-  CALL H5Pget_attr_phase_change_f(tcpl, max_compact, min_dense, error)
-  CALL check("H5Pget_attr_phase_change_f", error, total_error)
-  CALL VERIFY("H5Pget_attr_phase_change_f", max_compact, (def_max_compact + 1), total_error)
-  CALL VERIFY("H5Pget_attr_phase_change_f", min_dense, (def_min_dense - 1), total_error)
-
-  ! Create a group, dataset, and committed datatype within the file,
-  ! using the respective type of creation property lists.
-  ! 
-
-  ! Create the group anonymously and link it in 
-  CALL H5Gcreate_anon_f(fid, grp, error, gcpl_id=gcpl)
-  CALL check("H5Gcreate_anon_f", error, total_error)
-
-  CALL H5Olink_f(grp, fid, "group", error)
-  CALL check("H5Olink_f", error, total_error)
-
-  !  Commit the type inside the group anonymously and link it in 
-  CALL h5tcopy_f(H5T_NATIVE_INTEGER, dtype, error)
-  CALL check("h5tcopy_f", error, total_error)
-
-  CALL H5Tcommit_anon_f(fid, dtype, error, tcpl_id=tcpl)
-  CALL check("H5Tcommit_anon_f",error,total_error)
-
-  CALL H5Olink_f(dtype, fid, "datatype", error)
-  CALL check("H5Olink_f", error, total_error)
-
-  !  Create the dataspace for the dataset. 
-  CALL h5screate_f(H5S_SCALAR_F, dspace, error)
-  CALL check("h5screate_f",error,total_error)
-
-  !  Create the dataset anonymously and link it in 
-  CALL H5Dcreate_anon_f(fid, H5T_NATIVE_INTEGER, dspace, dset, error, dcpl )
-  CALL check("H5Dcreate_anon_f",error,total_error)
-
-  CALL H5Olink_f(dset, fid, "dataset", error)
-  CALL check("H5Olink_f", error, total_error)
-
-  CALL h5sclose_f(dspace, error)
-  CALL check("h5sclose_f",error,total_error)
-
-  !  Close current creation property lists 
-  CALL h5pclose_f(gcpl,error)
-  CALL check("h5pclose_f", error, total_error)
-  CALL h5pclose_f(dcpl,error)
-  CALL check("h5pclose_f", error, total_error)
-  CALL h5pclose_f(tcpl,error)
-  CALL check("h5pclose_f", error, total_error)
-
-  !  Retrieve each object's creation property list 
-  CALL H5Gget_create_plist_f(grp, gcpl, error)
-  CALL check("H5Gget_create_plist", error, total_error)
-
-  CALL H5Tget_create_plist_f(dtype, tcpl, error)
-  CALL check("H5Tget_create_plist_f", error, total_error)
-
-  CALL H5Dget_create_plist_f(dset, dcpl, error)
-  CALL check("H5Dget_create_plist_f", error, total_error)
-
-  !  Retrieve attribute phase change values on each creation property list and verify 
-  CALL H5Pget_attr_phase_change_f(gcpl, max_compact, min_dense, error)
-  CALL check("H5Pget_attr_phase_change_f", error, total_error)
-  CALL VERIFY("H5Pget_attr_phase_change_f", max_compact, (def_max_compact + 1), total_error)
-  CALL VERIFY("H5Pget_attr_phase_change_f", min_dense, (def_min_dense - 1), total_error)
-
-  CALL H5Pget_attr_phase_change_f(dcpl, max_compact, min_dense, error)
-  CALL check("H5Pget_attr_phase_change_f", error, total_error)
-  CALL VERIFY("H5Pget_attr_phase_change_f", max_compact, (def_max_compact + 1), total_error)
-  CALL VERIFY("H5Pget_attr_phase_change_f", min_dense, (def_min_dense - 1), total_error)
-
-  CALL H5Pget_attr_phase_change_f(tcpl, max_compact, min_dense, error)
-  CALL check("H5Pget_attr_phase_change_f", error, total_error)
-  CALL VERIFY("H5Pget_attr_phase_change_f", max_compact, (def_max_compact + 1), total_error)
-  CALL VERIFY("H5Pget_attr_phase_change_f", min_dense, (def_min_dense - 1), total_error)
-
-  ! Close current objects 
-  CALL h5pclose_f(gcpl,error)
-  CALL check("h5pclose_f", error, total_error)
-  CALL h5pclose_f(dcpl,error)
-  CALL check("h5pclose_f", error, total_error)
-  CALL h5pclose_f(tcpl,error)
-  CALL check("h5pclose_f", error, total_error)
-
-  CALL h5gclose_f(grp, error)
-  CALL check("h5gclose_f",error,total_error)
-
-  CALL h5tclose_f(dtype, error)
-  CALL check("h5tclose_f",error,total_error)
-  CALL h5dclose_f(dset, error)
-  CALL check("h5dclose_f",error,total_error)
-  CALL h5fclose_f(fid, error)
-  CALL check("h5fclose_f",error,total_error)
-  !  Re-open the file and check that the object creation properties persist 
-  CALL h5fopen_f(TEST_FILENAME, H5F_ACC_RDONLY_F, fid, error, access_prp=fapl)
-  CALL check("H5fopen_f",error,total_error)
-
-  !  Re-open objects 
-  CALL H5Gopen_f(fid, "group", grp, error)
-  CALL check("h5gopen_f", error, total_error)
-
-  CALL H5Topen_f(fid, "datatype", dtype,error)
-  CALL check("h5topen_f", error, total_error)
-
-  CALL H5Dopen_f(fid, "dataset", dset, error)
-  CALL check("h5dopen_f", error, total_error)
-
-  !  Retrieve each object's creation property list 
-  CALL H5Gget_create_plist_f(grp, gcpl, error)
-  CALL check("H5Gget_create_plist", error, total_error)
-
-  CALL H5Tget_create_plist_f(dtype, tcpl, error)
-  CALL check("H5Tget_create_plist_f", error, total_error)
-
-  CALL H5Dget_create_plist_f(dset, dcpl, error)
-  CALL check("H5Dget_create_plist_f", error, total_error)
-
-  !  Retrieve attribute phase change values on each creation property list and verify 
-  CALL H5Pget_attr_phase_change_f(gcpl, max_compact, min_dense, error)
-  CALL check("H5Pget_attr_phase_change_f", error, total_error)
-  CALL VERIFY("H5Pget_attr_phase_change_f", max_compact, (def_max_compact + 1), total_error)
-  CALL VERIFY("H5Pget_attr_phase_change_f", min_dense, (def_min_dense - 1), total_error)
-
-  CALL H5Pget_attr_phase_change_f(dcpl, max_compact, min_dense, error)
-  CALL check("H5Pget_attr_phase_change_f", error, total_error)
-  CALL VERIFY("H5Pget_attr_phase_change_f", max_compact, (def_max_compact + 1), total_error)
-  CALL VERIFY("H5Pget_attr_phase_change_f", min_dense, (def_min_dense - 1), total_error)
-
-  CALL H5Pget_attr_phase_change_f(tcpl, max_compact, min_dense, error)
-  CALL check("H5Pget_attr_phase_change_f", error, total_error)
-  CALL VERIFY("H5Pget_attr_phase_change_f", max_compact, (def_max_compact + 1), total_error)
-  CALL VERIFY("H5Pget_attr_phase_change_f", min_dense, (def_min_dense - 1), total_error)
-
-  !  Close current objects 
-  CALL h5pclose_f(gcpl,error)
-  CALL check("h5pclose_f", error, total_error)
-  CALL h5pclose_f(dcpl,error)
-  CALL check("h5pclose_f", error, total_error)
-  CALL h5pclose_f(tcpl,error)
-  CALL check("h5pclose_f", error, total_error)
-
-  CALL h5gclose_f(grp, error)
-  CALL check("h5gclose_f",error,total_error)
-
-  CALL h5tclose_f(dtype, error)
-  CALL check("h5tclose_f",error,total_error)
-  CALL h5dclose_f(dset, error)
-  CALL check("h5dclose_f",error,total_error)
-  CALL h5fclose_f(fid, error)
-  CALL check("h5fclose_f",error,total_error)
-
-  !  Close the FAPL 
-  CALL H5Pclose_f(fapl, error)
-  CALL check("H5Pclose_f", error, total_error)
-
-END SUBROUTINE test_h5o_plist
-
-END MODULE TH5O
diff --git a/fortran/test/tH5O_F03.F90 b/fortran/test/tH5O_F03.F90
new file mode 100644
index 0000000..eab2e19
--- /dev/null
+++ b/fortran/test/tH5O_F03.F90
@@ -0,0 +1,796 @@
+!****h* root/fortran/test/tH5O_F03.f90
+!
+! NAME
+!  tH5O_F03.f90
+!
+! FUNCTION
+!  Test FORTRAN HDF5 H5O APIs which are dependent on FORTRAN 2003
+!  features.
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+!*****
+
+! *****************************************
+! ***        H 5 O   T E S T S
+! *****************************************
+MODULE visit_cb
+
+  USE HDF5
+  USE, INTRINSIC :: ISO_C_BINDING
+
+  IMPLICIT NONE
+
+  INTEGER, PARAMETER :: info_size = 9
+
+  !-------------------------------------------------------------------------
+  ! Function:    visit_obj_cb
+  !
+  ! Purpose:     Callback routine for visiting objects in a file
+  !
+  ! Return:      Success:        0
+  !              Failure:        -1
+  !
+  ! Programmer:  M.S. Breitenfeld
+  !              July 12, 2012
+  !              Adopted from C test.
+  !
+  !-------------------------------------------------------------------------
+  !
+  ! Object visit structs
+  TYPE, bind(c) :: obj_visit_t
+     CHARACTER(KIND=C_CHAR), DIMENSION(1:180) :: path   ! Path to object
+     INTEGER :: type_obj ! type of object
+  END TYPE obj_visit_t
+
+  TYPE, bind(c) :: ovisit_ud_t
+     INTEGER :: idx              ! Index in object visit structure
+     TYPE(obj_visit_t), DIMENSION(1:info_size) :: info   ! Pointer to the object visit structure to use
+     INTEGER :: field
+  END TYPE ovisit_ud_t
+
+CONTAINS
+
+! Compares the field values of a C H5O_info_t and a Fortran H5O_info_t.
+
+  INTEGER FUNCTION compare_h5o_info_t( loc_id, oinfo_f, oinfo_c, field, full_f_field ) RESULT(status)
+
+    IMPLICIT NONE
+    INTEGER(HID_T)     :: loc_id
+    TYPE(h5o_info_t)   :: oinfo_f
+    TYPE(c_h5o_info_t) :: oinfo_c
+    TYPE(H5O_TOKEN_T_F) :: token_c
+    INTEGER :: field
+    LOGICAL :: full_f_field ! All the fields of Fortran H5O_info_t where filled
+!   local
+    INTEGER(C_INT), DIMENSION(1:8) :: atime, btime, ctime, mtime
+    INTEGER :: cmp_value
+    INTEGER :: i
+    INTEGER :: ierr
+
+    status = 0
+
+    IF( (field .EQ. H5O_INFO_BASIC_F).OR.(field .EQ. H5O_INFO_ALL_F) )THEN
+       IF( (oinfo_f%fileno.LE.0) .OR. (oinfo_c%fileno .NE. oinfo_f%fileno) )THEN
+          status = -1
+          RETURN
+       ENDIF
+       token_c%token = oinfo_c%token%token
+       CALL H5Otoken_cmp_f(loc_id, oinfo_f%token, token_c, cmp_value, ierr);
+       IF( (ierr .EQ. -1) .OR. (cmp_value .NE. 0) ) THEN
+          status = -1
+          RETURN
+       ENDIF
+       IF( (oinfo_f%type.LT.0) .OR. (oinfo_c%type .NE. oinfo_f%type) )THEN
+          status = -1
+          RETURN
+       ENDIF
+       IF( (oinfo_f%rc.LT.0) .OR. (oinfo_c%rc .NE. oinfo_f%rc) )THEN
+          status = -1
+          RETURN
+       ENDIF
+
+    ENDIF
+
+    IF((field .EQ. H5O_INFO_TIME_F).OR.(field .EQ. H5O_INFO_ALL_F))THEN
+
+       atime(1:8) = h5gmtime(oinfo_c%atime)
+       btime(1:8) = h5gmtime(oinfo_c%btime)
+       ctime(1:8) = h5gmtime(oinfo_c%ctime)
+       mtime(1:8) = h5gmtime(oinfo_c%mtime)
+
+       DO i = 1, 8
+          IF( (atime(i) .NE. oinfo_f%atime(i)) )THEN
+             status = -1
+             RETURN
+          ENDIF
+
+          IF( (btime(i) .NE. oinfo_f%btime(i)) )THEN
+             status = -1
+             RETURN
+          ENDIF
+
+          IF( (ctime(i) .NE. oinfo_f%ctime(i)) )THEN
+             status = -1
+             RETURN
+          ENDIF
+
+          IF( (mtime(i) .NE. oinfo_f%mtime(i)) )THEN
+             status = -1
+             RETURN
+          ENDIF
+       ENDDO
+
+    ELSE IF(field .EQ. H5O_INFO_TIME_F.AND. full_f_field)THEN
+       ! check other field values are not filled (using only a small subset to check)
+       status = 0
+       IF( oinfo_c%fileno .NE. oinfo_f%fileno) status = status + 1
+       token_c%token = oinfo_c%token%token
+       CALL H5Otoken_cmp_f(loc_id, oinfo_f%token, token_c, cmp_value, ierr);
+       IF( (ierr .EQ. -1) .OR. (cmp_value .NE. 0) ) THEN
+          status = -1
+          RETURN
+       ENDIF
+       IF( oinfo_c%type .NE. oinfo_f%type) status = status + 1
+       IF( oinfo_c%rc .NE. oinfo_f%rc) status = status + 1
+       IF(status.EQ.0) THEN ! There was no difference found, which is only possible if the field was filled.
+          status = -1
+          RETURN
+       ENDIF
+       status = 0 ! reset
+    ENDIF
+
+    IF((field .EQ. H5O_INFO_NUM_ATTRS_F).OR.(field .EQ. H5O_INFO_ALL_F))THEN
+       IF( (oinfo_f%num_attrs.LT.0) .OR. (oinfo_c%num_attrs .NE. oinfo_f%num_attrs) )THEN
+          status = -1
+          RETURN
+       ENDIF
+    ELSE IF( field .EQ. H5O_INFO_ALL_F.AND.full_f_field)THEN
+       ! check other field values are not filled (using only a small subset to check)
+       status = 0
+       IF( oinfo_c%fileno .NE. oinfo_f%fileno) status = status + 1
+       token_c%token = oinfo_c%token%token
+       CALL H5Otoken_cmp_f(loc_id, oinfo_f%token, token_c, cmp_value, ierr);
+       IF( (ierr .EQ. -1) .OR. (cmp_value .NE. 0) ) THEN
+          status = -1
+          RETURN
+       ENDIF
+       IF( oinfo_c%type .NE. oinfo_f%type) status = status + 1
+       IF( oinfo_c%rc .NE. oinfo_f%rc) status = status + 1
+       IF(status.EQ.0) THEN ! There was no difference found, which is only possible if the field was filled.
+          status = -1
+          RETURN
+       ENDIF
+       status = 0 ! reset
+    ENDIF
+
+  END FUNCTION compare_h5o_info_t
+
+  INTEGER FUNCTION visit_obj_cb( group_id, name, oinfo_c, op_data) bind(C)
+
+    IMPLICIT NONE
+
+    INTEGER(HID_T), VALUE :: group_id
+    CHARACTER(LEN=1), DIMENSION(1:180) :: name
+    CHARACTER(LEN=180) :: name2
+    TYPE(c_h5o_info_t) :: oinfo_c
+    TYPE(ovisit_ud_t) :: op_data
+    TYPE(h5o_info_t) ::  oinfo_f
+!
+!   MEMBER      | TYPE | MEANING                 | RANGE
+! A(1) = tm_sec	  int   seconds after the minute   0-61*
+! A(2) = tm_min	  int   minutes after the hour     0-59
+! A(3) = tm_hour  int   hours since midnight       0-23
+! A(4) = tm_mday  int   day of the month           1-31
+! A(5) = tm_mon	  int   months since January       0-11
+! A(6) = tm_year  int   years since 1900
+! A(7) = tm_wday  int   days since Sunday          0-6
+! A(8) = tm_yday  int   days since January 1       0-365
+! A(9) = tm_isdst int   Daylight Saving Time flag
+!
+    INTEGER :: len, i
+    INTEGER :: idx
+    INTEGER :: ierr
+
+    visit_obj_cb = 0
+
+    ! Since the name is generated in C and passed to a Fortran string, it
+    ! will be NULL terminated, so we need to find the end of the string.
+
+    DO len = 1, 180
+       IF(name(len) .EQ. C_NULL_CHAR) EXIT
+    ENDDO
+
+    len = len - 1
+
+    ! Check for correct object information
+    name2(1:180) = ""
+    DO i = 1, len
+       name2(i:i) = name(i)(1:1)
+    ENDDO
+
+    IF(op_data%field .EQ. H5O_INFO_ALL_F)THEN
+
+       idx = op_data%idx
+
+       DO i = 1, len
+          IF(op_data%info(idx)%path(i)(1:1) .NE. name(i)(1:1))THEN
+             visit_obj_cb = -1
+             RETURN
+          ENDIF
+
+          IF(op_data%info(idx)%type_obj .NE. oinfo_c%type)THEN
+             visit_obj_cb = -1
+             RETURN
+          ENDIF
+       ENDDO
+
+    ENDIF
+
+    ! Check H5Oget_info_by_name_f; if partial field values were filled correctly
+    CALL H5Oget_info_by_name_f(group_id, name2, oinfo_f, ierr);
+    visit_obj_cb =  compare_h5o_info_t( group_id, oinfo_f, oinfo_c, op_data%field, .TRUE. )
+    IF(visit_obj_cb.EQ.-1) RETURN
+
+    ! Check H5Oget_info_by_name_f, only check field values
+    CALL H5Oget_info_by_name_f(group_id, name2, oinfo_f, ierr, fields = op_data%field);
+    visit_obj_cb =  compare_h5o_info_t(group_id, oinfo_f, oinfo_c, op_data%field, .FALSE. )
+    IF(visit_obj_cb.EQ.-1) RETURN
+
+
+    IF(op_data%idx.EQ.1)THEN
+
+       ! Check H5Oget_info_f, only check field values
+       CALL H5Oget_info_f(group_id, oinfo_f, ierr, fields = op_data%field);
+       visit_obj_cb =  compare_h5o_info_t(group_id, oinfo_f, oinfo_c, op_data%field, .FALSE.  )
+       IF(visit_obj_cb.EQ.-1) RETURN
+
+       ! Check H5Oget_info_f; if partial field values where filled correctly
+       CALL H5Oget_info_f(group_id, oinfo_f, ierr);
+       visit_obj_cb =  compare_h5o_info_t(group_id, oinfo_f, oinfo_c, op_data%field, .TRUE.  )
+       IF(visit_obj_cb.EQ.-1) RETURN
+
+    ENDIF
+
+    ! Advance to next location in expected output
+    op_data%idx = op_data%idx + 1
+
+  END FUNCTION visit_obj_cb
+
+END MODULE visit_cb
+
+MODULE TH5O_F03
+
+CONTAINS
+!***************************************************************
+!**
+!**  test_h5o_refcount(): Test H5O refcounting functions.
+!**
+!***************************************************************
+
+SUBROUTINE test_h5o_refcount(total_error)
+
+  USE HDF5
+  USE TH5_MISC
+  USE ISO_C_BINDING
+  IMPLICIT NONE
+
+  INTEGER, INTENT(INOUT) :: total_error
+
+  CHARACTER(LEN=11), PARAMETER :: FILENAME = "th5o_ref.h5"
+  INTEGER, PARAMETER :: DIM0 = 5
+  INTEGER, PARAMETER :: DIM1 = 10
+  INTEGER(hid_t) :: fid ! HDF5 File ID
+  INTEGER(hid_t) :: grp, dset, dtype, dspace ! Object identifiers
+  TYPE(h5o_info_t) :: oinfo                  ! Object info struct
+  INTEGER(hsize_t), DIMENSION(1:2) :: dims
+  INTEGER :: error                           ! Value returned from API calls
+
+  ! Create a new HDF5 file
+  CALL h5fcreate_f(FILENAME,H5F_ACC_TRUNC_F,fid,error)
+  CALL check("h5fcreate_f", error, total_error)
+
+  ! Create a group, dataset, and committed datatype within the file
+  ! Create the group
+  CALL h5gcreate_f(fid, "group", grp, error)
+  CALL check("h5gcreate_f",error, total_error)
+
+  ! Commit the type inside the group
+  CALL h5tcopy_f(H5T_NATIVE_INTEGER, dtype, error)
+  CALL check("H5Tcopy_f",error, total_error)
+  CALL h5tcommit_f(fid, "datatype", dtype, error)
+  CALL check("h5tcommit_f", error, total_error)
+
+  ! Create the data space for the dataset.
+  dims(1) = DIM0
+  dims(2) = DIM1
+
+  CALL h5screate_simple_f(2, dims, dspace, error)
+  CALL check("h5screate_simple_f", error, total_error)
+
+  ! Create the dataset.
+  CALL h5dcreate_f(fid, "dataset", H5T_NATIVE_INTEGER, dspace, dset, error)
+  CALL check("h5dcreate_f", error, total_error)
+  CALL h5sclose_f(dspace, error)
+  CALL check("h5sclose_f", error, total_error)
+
+  ! Get ref counts for each object.  They should all be 1, since each object has a hard link.
+  CALL h5oget_info_by_name_f(fid, "group", oinfo, error)
+  CALL check("h5oget_info_by_name_f", error, total_error)
+  IF(oinfo%rc.NE.1)THEN
+     CALL check("h5oget_info_by_name_f", -1, total_error)
+  ENDIF
+  CALL h5oget_info_by_name_f(fid, "datatype", oinfo, error)
+  CALL check("h5oget_info_by_name_f", error, total_error)
+  IF(oinfo%rc.NE.1)THEN
+     CALL check("h5oget_info_by_name_f", -1, total_error)
+  ENDIF
+  CALL h5oget_info_by_name_f(fid, "dataset", oinfo, error)
+  CALL check("h5oget_info_by_name_f", error, total_error)
+  IF(oinfo%rc.NE.1)THEN
+     CALL check("h5oget_info_by_name_f", -1, total_error)
+  ENDIF
+
+  ! Check h5oget_info
+  CALL h5oget_info_f(grp, oinfo, error)
+  CALL check("h5oget_info_f", error, total_error)
+  IF(oinfo%rc.NE.1)THEN
+     CALL check("h5oget_info_f", -1, total_error)
+  ENDIF
+  IF(oinfo%type.NE.H5O_TYPE_GROUP_F)THEN
+     CALL check("h5oget_info_f", -1, total_error)
+  ENDIF
+
+  ! Increment each object's reference count.
+  CALL h5oincr_refcount_f(grp, error)
+  CALL check("h5oincr_refcount_f", error, total_error)
+  CALL h5oincr_refcount_f(dtype, error)
+  CALL check("h5oincr_refcount_f", error, total_error)
+  CALL h5oincr_refcount_f(dset, error)
+  CALL check("h5oincr_refcount_f", error, total_error)
+
+  ! Get ref counts for each object.  They should all be 2 now.
+  CALL h5oget_info_by_name_f(fid, "group", oinfo, error)
+  CALL check("h5oget_info_by_name_f", error, total_error)
+  IF(oinfo%rc.NE.2)THEN
+     CALL check("h5oget_info_by_name_f", -1, total_error)
+  ENDIF
+  CALL h5oget_info_by_name_f(fid, "datatype", oinfo, error)
+  CALL check("h5oget_info_by_name_f", error, total_error)
+  IF(oinfo%rc.NE.2)THEN
+     CALL check("h5oget_info_by_name_f", -1, total_error)
+  ENDIF
+  CALL h5oget_info_by_name_f(fid, "dataset", oinfo, error)
+  CALL check("h5oget_info_by_name_f", error, total_error)
+  IF(oinfo%rc.NE.2)THEN
+     CALL check("h5oget_info_by_name_f", -1, total_error)
+  ENDIF
+
+  ! Decrement the reference counts and check that they decrease back to 1.
+  CALL h5odecr_refcount_f(grp, error)
+  CALL check("h5oincr_refcount_f", error, total_error)
+  CALL h5odecr_refcount_f(dtype, error)
+  CALL check("h5oincr_refcount_f", error, total_error)
+  CALL h5odecr_refcount_f(dset, error)
+  CALL check("h5oincr_refcount_f", error, total_error)
+
+  CALL h5oget_info_by_name_f(fid, "group", oinfo, error)
+  CALL check("h5oget_info_by_name_f", error, total_error)
+  IF(oinfo%rc.NE.1)THEN
+     CALL check("h5oget_info_by_name_f", -1, total_error)
+  ENDIF
+  CALL h5oget_info_by_name_f(fid, "datatype", oinfo, error)
+  CALL check("h5oget_info_by_name_f", error, total_error)
+  IF(oinfo%rc.NE.1)THEN
+     CALL check("h5oget_info_by_name_f", -1, total_error)
+  ENDIF
+  CALL h5oget_info_by_name_f(fid, "dataset", oinfo, error)
+  CALL check("h5oget_info_by_name_f", error, total_error)
+  IF(oinfo%rc.NE.1)THEN
+     CALL check("h5oget_info_by_name_f", -1, total_error)
+  ENDIF
+
+  CALL h5gclose_f(grp, error)
+  CALL check("h5gclose_f",error, total_error)
+  CALL h5tclose_f(dtype, error)
+  CALL check("h5tclose_f",error, total_error)
+  CALL h5dclose_f(dset, error)
+  CALL check("h5dclose_f",error, total_error)
+  CALL h5fclose_f(fid, error)
+  CALL check("h5fclose_f",error, total_error)
+
+END SUBROUTINE test_h5o_refcount
+
+!****************************************************************
+!**
+!**  test_obj_visit(): Test H5O visit functions.
+!**
+!****************************************************************
+
+SUBROUTINE test_obj_visit(total_error)
+
+  USE HDF5
+  USE TH5_MISC
+
+  USE visit_cb
+  USE ISO_C_BINDING
+  IMPLICIT NONE
+
+  INTEGER, INTENT(INOUT) :: total_error
+
+  TYPE(ovisit_ud_t), TARGET :: udata ! User-data for visiting
+  INTEGER(hid_t) :: fid = -1
+  TYPE(C_PTR) :: f_ptr
+  TYPE(C_FUNPTR) :: fun_ptr
+  CHARACTER(LEN=180) :: object_name
+  INTEGER :: ret_val
+  INTEGER :: error
+
+  ! Construct "interesting" file to visit
+  CALL build_visit_file(fid)
+
+  ! Inialize udata for testing purposes
+  udata%info(1)%path(1:1) ="."
+  udata%info(1)%type_obj = H5O_TYPE_GROUP_F
+  udata%info(2)%path(1:12) = &
+       (/"D","a","t","a","s","e","t","_","z","e","r","o"/)
+  udata%info(2)%type_obj =H5O_TYPE_DATASET_F
+  udata%info(3)%path(1:6) = &
+       (/"G","r","o","u","p","1"/)
+  udata%info(3)%type_obj = H5O_TYPE_GROUP_F
+  udata%info(4)%path(1:18) =&
+       (/"G","r","o","u","p","1","/","D","a","t","a","s","e","t","_","o","n","e"/)
+  udata%info(4)%type_obj = H5O_TYPE_DATASET_F
+  udata%info(5)%path(1:13) =&
+       (/"G","r","o","u","p","1","/","G","r","o","u","p","2"/)
+  udata%info(5)%type_obj = H5O_TYPE_GROUP_F
+  udata%info(6)%path(1:25) =&
+       (/"G","r","o","u","p","1","/","G","r","o","u","p","2","/","D","a","t","a","s","e","t","_","t","w","o"/)
+  udata%info(6)%type_obj = H5O_TYPE_DATASET_F
+  udata%info(7)%path(1:22) =&
+       (/"G","r","o","u","p","1","/","G","r","o","u","p","2","/","T","y","p","e","_","t","w","o"/)
+  udata%info(7)%type_obj = H5O_TYPE_NAMED_DATATYPE_F
+  udata%info(8)%path(1:15) =&
+       (/"G","r","o","u","p","1","/","T","y","p","e","_","o","n","e"/)
+  udata%info(8)%type_obj = H5O_TYPE_NAMED_DATATYPE_F
+  udata%info(9)%path(1:9) =&
+       (/"T","y","p","e","_","z","e","r","o"/)
+  udata%info(9)%type_obj = H5O_TYPE_NAMED_DATATYPE_F
+
+  ! Visit all the objects reachable from the root group (with file ID)
+
+  fun_ptr = C_FUNLOC(visit_obj_cb)
+  f_ptr = C_LOC(udata)
+
+  ! Test h5ovisit_f
+  udata%field = H5O_INFO_ALL_F
+  udata%idx = 1
+  CALL h5ovisit_f(fid, H5_INDEX_NAME_F, H5_ITER_INC_F, fun_ptr, f_ptr, ret_val, error)
+  CALL check("h5ovisit_f", error, total_error)
+  IF(ret_val.LT.0)THEN
+     CALL check("h5ovisit_f", -1, total_error)
+  ENDIF
+
+  ! Test fields option
+  udata%field = H5O_INFO_ALL_F
+  udata%idx = 1
+  CALL h5ovisit_f(fid, H5_INDEX_NAME_F, H5_ITER_INC_F, fun_ptr, f_ptr, ret_val, error, fields=udata%field)
+  CALL check("h5ovisit_f", error, total_error)
+  IF(ret_val.LT.0)THEN
+     CALL check("h5ovisit_f", -1, total_error)
+  ENDIF
+  udata%field = H5O_INFO_BASIC_F
+  udata%idx = 1
+  CALL h5ovisit_f(fid, H5_INDEX_NAME_F, H5_ITER_INC_F, fun_ptr, f_ptr, ret_val, error, fields=udata%field)
+  CALL check("h5ovisit_f", error, total_error)
+  IF(ret_val.LT.0)THEN
+     CALL check("h5ovisit_f", -1, total_error)
+  ENDIF
+  udata%field = H5O_INFO_TIME_F
+  udata%idx = 1
+  CALL h5ovisit_f(fid, H5_INDEX_NAME_F, H5_ITER_INC_F, fun_ptr, f_ptr, ret_val, error, fields=udata%field)
+  CALL check("h5ovisit_f", error, total_error)
+  IF(ret_val.LT.0)THEN
+     CALL check("h5ovisit_f", -1, total_error)
+  ENDIF
+  udata%field = H5O_INFO_NUM_ATTRS_F
+  udata%idx = 1
+  CALL h5ovisit_f(fid, H5_INDEX_NAME_F, H5_ITER_INC_F, fun_ptr, f_ptr, ret_val, error, fields=udata%field)
+  CALL check("h5ovisit_f", error, total_error)
+  IF(ret_val.LT.0)THEN
+     CALL check("h5ovisit_f", -1, total_error)
+  ENDIF
+
+  ! Test h5ovisit_by_name_f
+  object_name = "/"
+  udata%idx = 1
+  udata%field = H5O_INFO_ALL_F
+  CALL h5ovisit_by_name_f(fid, object_name, H5_INDEX_NAME_F, H5_ITER_INC_F, fun_ptr, f_ptr, ret_val, error, fields=udata%field)
+  CALL check("h5ovisit_by_name_f", error, total_error)
+  IF(ret_val.LT.0)THEN
+     CALL check("h5ovisit_by_name_f", -1, total_error)
+  ENDIF
+
+  ! Test fields option
+  udata%idx = 1
+  udata%field = H5O_INFO_BASIC_F
+  CALL h5ovisit_by_name_f(fid, object_name, H5_INDEX_NAME_F, H5_ITER_INC_F, fun_ptr, f_ptr, ret_val, error, fields=udata%field)
+  CALL check("h5ovisit_by_name_f", error, total_error)
+  IF(ret_val.LT.0)THEN
+     CALL check("h5ovisit_by_name_f", -1, total_error)
+  ENDIF
+  udata%idx = 1
+  udata%field = H5O_INFO_TIME_F
+  CALL h5ovisit_by_name_f(fid, object_name, H5_INDEX_NAME_F, H5_ITER_INC_F, fun_ptr, f_ptr, ret_val, error, fields=udata%field)
+  CALL check("h5ovisit_by_name_f", error, total_error)
+  IF(ret_val.LT.0)THEN
+     CALL check("h5ovisit_by_name_f", -1, total_error)
+  ENDIF
+  udata%idx = 1
+  udata%field =  H5O_INFO_NUM_ATTRS_F
+  CALL h5ovisit_by_name_f(fid, object_name, H5_INDEX_NAME_F, H5_ITER_INC_F, fun_ptr, f_ptr, ret_val, error, fields=udata%field)
+  CALL check("h5ovisit_by_name_f", error, total_error)
+  IF(ret_val.LT.0)THEN
+     CALL check("h5ovisit_by_name_f", -1, total_error)
+  ENDIF
+
+  CALL h5fclose_f(fid, error)
+  CALL check("h5fclose_f",error, total_error)
+
+END SUBROUTINE test_obj_visit
+
+!****************************************************************
+!**
+!**  test_obj_info(): Test H5O info functions.
+!**
+!****************************************************************
+
+SUBROUTINE test_obj_info(total_error)
+
+  USE HDF5
+  USE TH5_MISC
+  USE ISO_C_BINDING
+  IMPLICIT NONE
+
+  INTEGER, INTENT(INOUT) :: total_error
+
+  INTEGER(hid_t) :: fid = -1             ! File ID
+  INTEGER(hid_t) :: gid = -1, gid2 = -1  ! Group IDs
+  INTEGER(hid_t) :: did                  ! Dataset ID
+  INTEGER(hid_t) :: sid                  ! Dataspace ID
+  TYPE(hobj_ref_t_f), TARGET :: wref     ! Reference to write
+  TYPE(hobj_ref_t_f), TARGET :: rref     ! Reference to read
+  TYPE(H5O_info_t) :: oinfo              ! Object info struct
+  INTEGER :: error
+  TYPE(C_PTR) :: f_ptr
+
+  CHARACTER(LEN=6) :: GROUPNAME   =    "/group"
+  CHARACTER(LEN=6) :: GROUPNAME2  =    "group2"
+  CHARACTER(LEN=6) :: GROUPNAME3  =    "group3"
+  CHARACTER(LEN=5) :: DSETNAME    =    "/dset"
+  CHARACTER(LEN=5) :: DSETNAME2   =    "dset2"
+
+  ! Create file with a group and a dataset containing an object reference to the group
+  CALL h5fcreate_f("get_info.h5", H5F_ACC_TRUNC_F, fid, error)
+  CALL check("h5fcreate_f",error, total_error)
+
+  ! Create dataspace to use for dataset
+  CALL h5screate_f(H5S_SCALAR_F, sid, error)
+  CALL check("h5screate_f",error,total_error)
+
+  ! Create group to refer to
+  CALL h5gcreate_f(fid,  GROUPNAME, gid, error)
+  CALL check("h5gcreate_f",error,total_error)
+
+  ! Create nested groups
+  CALL h5gcreate_f(gid,  GROUPNAME2, gid2, error)
+  CALL check("h5gcreate_f",error,total_error)
+  CALL h5gclose_f(gid2, error)
+  CALL check("h5gclose_f",error,total_error)
+
+  CALL h5gcreate_f(gid,  GROUPNAME3, gid2, error)
+  CALL check("h5gcreate_f",error,total_error)
+  CALL h5gclose_f(gid2, error)
+  CALL check("h5gclose_f",error,total_error)
+
+  ! Create bottom dataset
+  CALL h5dcreate_f(gid, DSETNAME2, H5T_NATIVE_INTEGER, sid, did, error)
+  CALL check("h5dcreate_f",error, total_error)
+
+  CALL h5dclose_f(did, error)
+  CALL check("h5dclose_f", error, total_error)
+
+  CALL h5gclose_f(gid, error)
+  CALL check("h5gclose_f",error,total_error)
+
+  ! Create dataset
+  CALL h5dcreate_f(fid, DSETNAME, H5T_STD_REF_OBJ, sid, did, error)
+  CALL check("h5dcreate_f",error, total_error)
+
+  f_ptr = C_LOC(wref)
+
+  ! Create reference to group
+  CALL h5rcreate_f(fid, GROUPNAME, H5R_OBJECT_F, f_ptr, error)
+  CALL check("h5rcreate_f",error, total_error)
+
+  ! Write reference to disk
+  CALL h5dwrite_f(did, H5T_STD_REF_OBJ, f_ptr, error)
+  CALL check("h5dwrite_f",error, total_error)
+
+  ! Close objects
+  CALL h5dclose_f(did, error)
+  CALL check("h5dclose_f", error, total_error)
+  CALL h5sclose_f(sid, error)
+  CALL check("h5sclose_f", error, total_error)
+  CALL h5fclose_f(fid, error)
+  CALL check("h5fclose_f", error, total_error)
+
+  ! Re-open file
+  CALL h5fopen_f("get_info.h5", H5F_ACC_RDWR_F, fid, error)
+  CALL check("h5fopen_f", error, total_error)
+
+  ! Re-open dataset
+  CALL h5dopen_f(fid, DSETNAME, did, error)
+  CALL check("h5dopen_f", error, total_error)
+
+  ! Read in the reference
+
+  f_ptr = C_LOC(rref)
+
+  CALL h5dread_f(did, H5T_STD_REF_OBJ, f_ptr, error)
+  CALL check("H5Dread_f",error, total_error)
+
+  ! Dereference to get the group
+
+  CALL h5rdereference_f(did, H5R_OBJECT_F, f_ptr, gid, error)
+  CALL check("h5rdereference_f", error, total_error)
+
+  CALL h5oget_info_by_idx_f(gid, ".", H5_INDEX_NAME_F, H5_ITER_INC_F, 0_hsize_t, oinfo, error)
+  CALL check("h5oget_info_by_idx_f", error, total_error)
+
+  IF(oinfo%rc.NE.1)THEN
+     CALL check("h5oget_info_by_idx_f", -1, total_error)
+  ENDIF
+  IF(oinfo%type.NE.H5O_TYPE_DATASET_F)THEN
+     CALL check("h5oget_info_by_idx_f", -1, total_error)
+  ENDIF
+
+  ! Check partial fields
+  CALL h5oget_info_by_idx_f(gid, ".", H5_INDEX_NAME_F, H5_ITER_INC_F, 0_hsize_t, oinfo, error, fields=H5O_INFO_BASIC_F )
+  CALL check("h5oget_info_by_idx_f", error, total_error)
+
+  IF(oinfo%rc.NE.1)THEN
+     CALL check("h5oget_info_by_idx_f", -1, total_error)
+  ENDIF
+  IF(oinfo%type.NE.H5O_TYPE_DATASET_F)THEN
+     CALL check("h5oget_info_by_idx_f", -1, total_error)
+  ENDIF
+
+  CALL h5oget_info_by_idx_f(gid, ".", H5_INDEX_NAME_F, H5_ITER_INC_F, 0_hsize_t, oinfo, error, fields=H5O_INFO_TIME_F )
+  CALL check("h5oget_info_by_idx_f", error, total_error)
+  ! These field values should not be filled
+  IF(oinfo%rc.EQ.1)THEN
+     CALL check("h5oget_info_by_idx_f", -1, total_error)
+  ENDIF
+  IF(oinfo%type.EQ.H5O_TYPE_DATASET_F)THEN
+     CALL check("h5oget_info_by_idx_f", -1, total_error)
+  ENDIF
+
+
+  ! Close objects
+  CALL h5dclose_f(did, error)
+  CALL check("h5dclose_f", error, total_error)
+  CALL h5gclose_f(gid, error)
+  CALL check("h5sclose_f", error, total_error)
+  CALL h5fclose_f(fid, error)
+  CALL check("h5fclose_f", error, total_error)
+
+END SUBROUTINE test_obj_info
+
+!-------------------------------------------------------------------------
+! Function:    build_visit_file
+!
+! Purpose:     Build an "interesting" file to use for visiting links & objects
+!
+! Programmer:  M. Scot Breitenfeld
+!              July 12, 2012
+!              NOTE: Adapted from C test.
+!
+!-------------------------------------------------------------------------
+!
+
+SUBROUTINE build_visit_file(fid)
+
+  USE HDF5
+  USE TH5_MISC
+  IMPLICIT NONE
+
+  INTEGER(hid_t) :: fid                   ! File ID
+  INTEGER(hid_t) :: gid = -1, gid2 = -1   ! Group IDs
+  INTEGER(hid_t) :: sid = -1              ! Dataspace ID
+  INTEGER(hid_t) :: did = -1              ! Dataset ID
+  INTEGER(hid_t) :: tid = -1              ! Datatype ID
+  INTEGER(hid_t) :: aid = -1, aid2 = -1, aid3 = -1 ! Attribute ID
+  CHARACTER(LEN=20) :: filename = 'visit.h5'
+  INTEGER :: error
+
+  ! Create file for visiting
+  CALL H5Fcreate_f(filename, H5F_ACC_TRUNC_F, fid, error)
+
+  ! Create group
+  CALL H5Gcreate_f(fid, "/Group1", gid, error)
+
+  ! Create nested group
+  CALL H5Gcreate_f(gid, "Group2", gid2, error)
+
+  CALL H5Screate_f(H5S_SCALAR_F, sid, error)
+  CALL H5Acreate_f(gid2, "Attr1", H5T_NATIVE_INTEGER, sid, aid, error)
+  CALL H5Acreate_f(gid2, "Attr2", H5T_NATIVE_INTEGER, sid, aid2, error)
+  CALL H5Acreate_f(gid2, "Attr3", H5T_NATIVE_INTEGER, sid, aid3, error)
+  CALL H5Aclose_f(aid,error)
+  CALL H5Aclose_f(aid2,error)
+  CALL H5Aclose_f(aid3,error)
+  CALL H5Sclose_f(sid,error)
+
+  ! Close groups
+  CALL h5gclose_f(gid2, error)
+  CALL h5gclose_f(gid, error)
+
+  ! Create soft links to groups created
+  CALL H5Lcreate_soft_f("/Group1", fid, "/soft_one", error)
+  CALL H5Lcreate_soft_f("/Group1/Group2", fid, "/soft_two", error)
+
+  ! Create dangling soft link
+  CALL H5Lcreate_soft_f("nowhere", fid, "/soft_dangle", error)
+
+  ! Create hard links to all groups
+  CALL H5Lcreate_hard_f(fid, "/", fid, "hard_zero", error)
+  CALL H5Lcreate_hard_f(fid, "/Group1", fid, "hard_one", error)
+  CALL H5Lcreate_hard_f(fid, "/Group1/Group2", fid, "hard_two", error)
+
+  ! Create loops w/hard links
+  CALL H5Lcreate_hard_f(fid, "/Group1", fid, "/Group1/hard_one", error)
+  CALL H5Lcreate_hard_f(fid, "/", fid, "/Group1/Group2/hard_zero", error)
+
+  ! Create dataset in each group
+  CALL H5Screate_f(H5S_SCALAR_F, sid, error)
+
+  CALL H5Dcreate_f(fid, "/Dataset_zero", H5T_NATIVE_INTEGER, sid, did, error)
+  CALL H5Dclose_f(did, error)
+
+  CALL H5Dcreate_f(fid, "/Group1/Dataset_one", H5T_NATIVE_INTEGER, sid, did, error)
+  CALL H5Dclose_f(did, error)
+
+  CALL H5Dcreate_f(fid, "/Group1/Group2/Dataset_two", H5T_NATIVE_INTEGER, sid, did, error)
+  CALL H5Dclose_f(did, error)
+
+  CALL H5Sclose_f(sid, error)
+
+  ! Create named datatype in each group
+  CALL H5Tcopy_f(H5T_NATIVE_INTEGER, tid, error)
+
+  CALL H5Tcommit_f(fid, "/Type_zero", tid, error)
+  CALL H5Tclose_f(tid, error)
+
+  CALL H5Tcopy_f(H5T_NATIVE_INTEGER, tid, error)
+  CALL H5Tcommit_f(fid, "/Group1/Type_one", tid, error)
+  CALL H5Tclose_f(tid, error)
+
+  CALL H5Tcopy_f(H5T_NATIVE_INTEGER, tid, error)
+  CALL H5Tcommit_f(fid, "/Group1/Group2/Type_two", tid, error)
+  CALL H5Tclose_f(tid, error)
+
+END SUBROUTINE build_visit_file
+
+END MODULE TH5O_F03
diff --git a/fortran/test/tH5O_F03.f90 b/fortran/test/tH5O_F03.f90
deleted file mode 100644
index 8e014f4..0000000
--- a/fortran/test/tH5O_F03.f90
+++ /dev/null
@@ -1,555 +0,0 @@
-!****h* root/fortran/test/tH5O_F03.f90
-!
-! NAME
-!  tH5O_F03.f90
-!
-! FUNCTION
-!  Test FORTRAN HDF5 H5O APIs which are dependent on FORTRAN 2003
-!  features. 
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-!*****
-
-! *****************************************
-! ***        H 5 O   T E S T S
-! *****************************************
-MODULE visit_cb
-
-  USE HDF5 
-  USE ISO_C_BINDING
-  
-  IMPLICIT NONE
-
-  INTEGER, PARAMETER :: info_size = 9
-
-  !-------------------------------------------------------------------------
-  ! Function:    visit_obj_cb
-  !
-  ! Purpose:     Callback routine for visiting objects in a file
-  !
-  ! Return:      Success:        0
-  !              Failure:        -1
-  !
-  ! Programmer:  M.S. Breitenfeld
-  !              July 12, 2012
-  !              Adopted from C test.
-  !
-  !-------------------------------------------------------------------------
-  !
-  ! Object visit structs
-  TYPE, bind(c) :: obj_visit_t
-     CHARACTER(LEN=1), DIMENSION(1:180) :: path   ! Path to object
-     INTEGER :: type_obj ! type of object
-  END TYPE obj_visit_t
-
-  TYPE, bind(c) :: ovisit_ud_t
-     INTEGER :: idx              ! Index in object visit structure
-     TYPE(obj_visit_t), DIMENSION(1:info_size) :: info   ! Pointer to the object visit structure to use
-  END TYPE ovisit_ud_t
-
-CONTAINS
-
-  INTEGER FUNCTION visit_obj_cb( group_id, name, oinfo, op_data) bind(C)
-
-    IMPLICIT NONE
-
-    INTEGER(HID_T), VALUE :: group_id
-    CHARACTER(LEN=1), DIMENSION(1:180) :: name
-    TYPE(h5o_info_t) :: oinfo
-    TYPE(ovisit_ud_t) :: op_data
-
-    INTEGER :: len, i
-    INTEGER :: idx
-
-    visit_obj_cb = 0
-
-    ! Since the name is generated in C and passed to a Fortran string, it
-    ! will be NULL terminated, so we need to find the end of the string.
-
-    len = 1
-    DO len = 1, 180
-       IF(name(len) .EQ. C_NULL_CHAR) EXIT
-    ENDDO
-
-    len = len - 1
-
-    ! Check for correct object information
-
-    idx = op_data%idx
-
-    DO i = 1, len
-       IF(op_data%info(idx)%path(i)(1:1) .NE. name(i)(1:1))THEN
-          visit_obj_cb = -1
-          RETURN
-       ENDIF
-       
-       IF(op_data%info(idx)%type_obj .NE. oinfo%type)THEN
-          visit_obj_cb = -1
-          RETURN
-       ENDIF
-
-    ENDDO
-
-    ! Advance to next location in expected output
-    op_data%idx = op_data%idx + 1
-
-  END FUNCTION visit_obj_cb
-
-END MODULE visit_cb
-
-
-MODULE TH5O_F03
-
-CONTAINS
-!***************************************************************
-!**
-!**  test_h5o_refcount(): Test H5O refcounting functions.
-!**
-!***************************************************************
-
-SUBROUTINE test_h5o_refcount(total_error)
-
-  USE HDF5 
-  USE TH5_MISC
-  USE ISO_C_BINDING
-  IMPLICIT NONE
-
-  INTEGER, INTENT(INOUT) :: total_error
-
-  CHARACTER(LEN=11), PARAMETER :: FILENAME = "th5o_ref.h5"
-  INTEGER, PARAMETER :: DIM0 = 5
-  INTEGER, PARAMETER :: DIM1 = 10
-  INTEGER(hid_t) :: fid ! HDF5 File ID
-  INTEGER(hid_t) :: grp, dset, dtype, dspace ! Object identifiers
-  TYPE(h5o_info_t) :: oinfo                  ! Object info struct
-  INTEGER(hsize_t), DIMENSION(1:2) :: dims
-  INTEGER :: error                           ! Value returned from API calls
-
-  ! Create a new HDF5 file
-  CALL h5fcreate_f(FILENAME,H5F_ACC_TRUNC_F,fid,error)
-  CALL check("h5fcreate_f", error, total_error) 
-
-  ! Create a group, dataset, and committed datatype within the file
-  ! Create the group
-  CALL h5gcreate_f(fid, "group", grp, error)
-  CALL check("h5gcreate_f",error, total_error)
-
-  ! Commit the type inside the group
-  CALL h5tcopy_f(H5T_NATIVE_INTEGER, dtype, error)
-  CALL check("H5Tcopy_f",error, total_error)
-  CALL h5tcommit_f(fid, "datatype", dtype, error)
-  CALL check("h5tcommit_f", error, total_error)
-
-  ! Create the data space for the dataset.
-  dims(1) = DIM0
-  dims(2) = DIM1
-
-  CALL h5screate_simple_f(2, dims, dspace, error)
-  CALL check("h5screate_simple_f", error, total_error)
-
-  ! Create the dataset.
-  CALL h5dcreate_f(fid, "dataset", H5T_NATIVE_INTEGER, dspace, dset, error)
-  CALL check("h5dcreate_f", error, total_error)
-  CALL h5sclose_f(dspace, error)
-  CALL check("h5sclose_f", error, total_error)
-
-  ! Get ref counts for each object.  They should all be 1, since each object has a hard link.
-  CALL h5oget_info_by_name_f(fid, "group", oinfo, error)
-  CALL check("h5oget_info_by_name_f", error, total_error)
-  IF(oinfo%rc.NE.1)THEN
-     CALL check("h5oget_info_by_name_f", -1, total_error)
-  ENDIF
-  CALL h5oget_info_by_name_f(fid, "datatype", oinfo, error)
-  CALL check("h5oget_info_by_name_f", error, total_error)
-  IF(oinfo%rc.NE.1)THEN
-     CALL check("h5oget_info_by_name_f", -1, total_error)
-  ENDIF
-  CALL h5oget_info_by_name_f(fid, "dataset", oinfo, error)
-  CALL check("h5oget_info_by_name_f", error, total_error)
-  IF(oinfo%rc.NE.1)THEN
-     CALL check("h5oget_info_by_name_f", -1, total_error)
-  ENDIF
-
-  ! Check h5oget_info
-  CALL h5oget_info_f(grp, oinfo, error)
-  CALL check("h5oget_info_f", error, total_error)
-  IF(oinfo%rc.NE.1)THEN
-     CALL check("h5oget_info_f", -1, total_error)
-  ENDIF
-  IF(oinfo%type.NE.H5O_TYPE_GROUP_F)THEN
-     CALL check("h5oget_info_f", -1, total_error)
-  ENDIF
-
-  ! Increment each object's reference count.
-  CALL h5oincr_refcount_f(grp, error)
-  CALL check("h5oincr_refcount_f", error, total_error)
-  CALL h5oincr_refcount_f(dtype, error)
-  CALL check("h5oincr_refcount_f", error, total_error)
-  CALL h5oincr_refcount_f(dset, error)
-  CALL check("h5oincr_refcount_f", error, total_error)
-
-  ! Get ref counts for each object.  They should all be 2 now.
-  CALL h5oget_info_by_name_f(fid, "group", oinfo, error)
-  CALL check("h5oget_info_by_name_f", error, total_error)
-  IF(oinfo%rc.NE.2)THEN
-     CALL check("h5oget_info_by_name_f", -1, total_error)
-  ENDIF
-  CALL h5oget_info_by_name_f(fid, "datatype", oinfo, error)
-  CALL check("h5oget_info_by_name_f", error, total_error)
-  IF(oinfo%rc.NE.2)THEN
-     CALL check("h5oget_info_by_name_f", -1, total_error)
-  ENDIF
-  CALL h5oget_info_by_name_f(fid, "dataset", oinfo, error)
-  CALL check("h5oget_info_by_name_f", error, total_error)
-  IF(oinfo%rc.NE.2)THEN
-     CALL check("h5oget_info_by_name_f", -1, total_error)
-  ENDIF
-
-  ! Decrement the reference counts and check that they decrease back to 1.
-  CALL h5odecr_refcount_f(grp, error)
-  CALL check("h5oincr_refcount_f", error, total_error)
-  CALL h5odecr_refcount_f(dtype, error)
-  CALL check("h5oincr_refcount_f", error, total_error)
-  CALL h5odecr_refcount_f(dset, error)
-  CALL check("h5oincr_refcount_f", error, total_error)
-
-  CALL h5oget_info_by_name_f(fid, "group", oinfo, error)
-  CALL check("h5oget_info_by_name_f", error, total_error)
-  IF(oinfo%rc.NE.1)THEN
-     CALL check("h5oget_info_by_name_f", -1, total_error)
-  ENDIF
-  CALL h5oget_info_by_name_f(fid, "datatype", oinfo, error)
-  CALL check("h5oget_info_by_name_f", error, total_error)
-  IF(oinfo%rc.NE.1)THEN
-     CALL check("h5oget_info_by_name_f", -1, total_error)
-  ENDIF
-  CALL h5oget_info_by_name_f(fid, "dataset", oinfo, error)
-  CALL check("h5oget_info_by_name_f", error, total_error)
-  IF(oinfo%rc.NE.1)THEN
-     CALL check("h5oget_info_by_name_f", -1, total_error)
-  ENDIF
-
-  CALL h5gclose_f(grp, error)
-  CALL check("h5gclose_f",error, total_error)
-  CALL h5tclose_f(dtype, error)
-  CALL check("h5tclose_f",error, total_error)
-  CALL h5dclose_f(dset, error)
-  CALL check("h5dclose_f",error, total_error)
-  CALL h5fclose_f(fid, error)
-  CALL check("h5fclose_f",error, total_error)
-
-END SUBROUTINE test_h5o_refcount
-
-!****************************************************************
-!**
-!**  test_h5o_refcount(): Test H5O visit functions.
-!**
-!****************************************************************
-
-SUBROUTINE obj_visit(total_error)
-
-  USE HDF5
-  USE TH5_MISC
-
-  USE visit_cb
-  USE ISO_C_BINDING
-  IMPLICIT NONE
-
-  INTEGER, INTENT(INOUT) :: total_error
-
-  TYPE(ovisit_ud_t), TARGET :: udata ! User-data for visiting
-  INTEGER(hid_t) :: fid = -1
-  TYPE(C_PTR) :: f_ptr
-  TYPE(C_FUNPTR) :: fun_ptr
-  CHARACTER(LEN=180) :: object_name
-  INTEGER :: ret_val
-  INTEGER :: error
-
-  ! Construct "interesting" file to visit
-  CALL build_visit_file(fid)
-
-  ! Inialize udata for testing purposes
-  udata%info(1)%path(1:1) ="."
-  udata%info(1)%type_obj = H5O_TYPE_GROUP_F
-  udata%info(2)%path(1:12) = &
-       (/"D","a","t","a","s","e","t","_","z","e","r","o"/)
-  udata%info(2)%type_obj =H5O_TYPE_DATASET_F
-  udata%info(3)%path(1:6) = &
-       (/"G","r","o","u","p","1"/)
-  udata%info(3)%type_obj = H5O_TYPE_GROUP_F
-  udata%info(4)%path(1:18) =&
-       (/"G","r","o","u","p","1","/","D","a","t","a","s","e","t","_","o","n","e"/)
-  udata%info(4)%type_obj = H5O_TYPE_DATASET_F
-  udata%info(5)%path(1:13) =&
-       (/"G","r","o","u","p","1","/","G","r","o","u","p","2"/)
-  udata%info(5)%type_obj = H5O_TYPE_GROUP_F
-  udata%info(6)%path(1:25) =&
-       (/"G","r","o","u","p","1","/","G","r","o","u","p","2","/","D","a","t","a","s","e","t","_","t","w","o"/)
-  udata%info(6)%type_obj = H5O_TYPE_DATASET_F
-  udata%info(7)%path(1:22) =&
-       (/"G","r","o","u","p","1","/","G","r","o","u","p","2","/","T","y","p","e","_","t","w","o"/)
-  udata%info(7)%type_obj = H5O_TYPE_NAMED_DATATYPE_F
-  udata%info(8)%path(1:15) =&
-       (/"G","r","o","u","p","1","/","T","y","p","e","_","o","n","e"/)
-  udata%info(8)%type_obj = H5O_TYPE_NAMED_DATATYPE_F
-  udata%info(9)%path(1:9) =&
-       (/"T","y","p","e","_","z","e","r","o"/)
-  udata%info(9)%type_obj = H5O_TYPE_NAMED_DATATYPE_F
-
-  ! Visit all the objects reachable from the root group (with file ID)
-  udata%idx = 1
-
-  fun_ptr = C_FUNLOC(visit_obj_cb)
-  f_ptr = C_LOC(udata)
-
-  ! Test h5ovisit_f
-  CALL h5ovisit_f(fid, H5_INDEX_NAME_F, H5_ITER_INC_F, fun_ptr, f_ptr, ret_val, error)
-  CALL check("h5ovisit_f", error, total_error)
-  IF(ret_val.LT.0)THEN
-     CALL check("h5ovisit_f", -1, total_error)
-  ENDIF
-
-  ! Test h5ovisit_by_name_f
-
-  object_name = "/"
-  udata%idx = 1
-
-  CALL h5ovisit_by_name_f(fid, object_name, H5_INDEX_NAME_F, H5_ITER_INC_F, fun_ptr, f_ptr, ret_val, error)
-  CALL check("h5ovisit_by_name_f", error, total_error)
-  IF(ret_val.LT.0)THEN
-     CALL check("h5ovisit_by_name_f", -1, total_error)
-  ENDIF
-
-  CALL h5fclose_f(fid, error)
-  CALL check("h5fclose_f",error, total_error)
-
-END SUBROUTINE obj_visit
-
-!****************************************************************
-!**
-!**  test_h5o_refcount(): Test H5O info functions.
-!**
-!****************************************************************
-
-SUBROUTINE obj_info(total_error)
-
-  USE HDF5
-  USE TH5_MISC
-  USE ISO_C_BINDING
-  IMPLICIT NONE
-
-  INTEGER, INTENT(INOUT) :: total_error
-
-  INTEGER(hid_t) :: fid = -1             ! File ID 
-  INTEGER(hid_t) :: gid = -1, gid2 = -1  ! Group IDs 
-  INTEGER(hid_t) :: did                  ! Dataset ID 
-  INTEGER(hid_t) :: sid                  ! Dataspace ID 
-  TYPE(hobj_ref_t_f), TARGET :: wref     ! Reference to write 
-  TYPE(hobj_ref_t_f), TARGET :: rref     ! Reference to read
-  TYPE(H5O_info_t) :: oinfo              ! Object info struct 
-  INTEGER :: error
-  TYPE(C_PTR) :: f_ptr
-
-  CHARACTER(LEN=6) :: GROUPNAME   =    "/group"
-  CHARACTER(LEN=6) :: GROUPNAME2  =    "group2"
-  CHARACTER(LEN=6) :: GROUPNAME3  =    "group3"
-  CHARACTER(LEN=5) :: DSETNAME    =    "/dset"
-  CHARACTER(LEN=5) :: DSETNAME2   =    "dset2"
-
-  ! Create file with a group and a dataset containing an object reference to the group
-  CALL h5fcreate_f("get_info.h5", H5F_ACC_TRUNC_F, fid, error)
-  CALL check("h5fcreate_f",error, total_error)
-
-  ! Create dataspace to use for dataset
-  CALL h5screate_f(H5S_SCALAR_F, sid, error)
-  CALL check("h5screate_f",error,total_error)
-
-  ! Create group to refer to
-  CALL h5gcreate_f(fid,  GROUPNAME, gid, error)
-  CALL check("h5gcreate_f",error,total_error)
-
-  ! Create nested groups 
-  CALL h5gcreate_f(gid,  GROUPNAME2, gid2, error)
-  CALL check("h5gcreate_f",error,total_error)
-  CALL h5gclose_f(gid2, error)
-  CALL check("h5gclose_f",error,total_error)
-
-  CALL h5gcreate_f(gid,  GROUPNAME3, gid2, error)
-  CALL check("h5gcreate_f",error,total_error)
-  CALL h5gclose_f(gid2, error)
-  CALL check("h5gclose_f",error,total_error)
-
-  ! Create bottom dataset
-  CALL h5dcreate_f(gid, DSETNAME2, H5T_NATIVE_INTEGER, sid, did, error)
-  CALL check("h5dcreate_f",error, total_error)
-
-  CALL h5dclose_f(did, error)
-  CALL check("h5dclose_f", error, total_error)
-
-  CALL h5gclose_f(gid, error)
-  CALL check("h5gclose_f",error,total_error)
-
-  ! Create dataset
-  CALL h5dcreate_f(fid, DSETNAME, H5T_STD_REF_OBJ, sid, did, error)
-  CALL check("h5dcreate_f",error, total_error)
-
-  f_ptr = C_LOC(wref)
-
-  ! Create reference to group
-  CALL h5rcreate_f(fid, GROUPNAME, H5R_OBJECT_F, f_ptr, error)
-  CALL check("h5rcreate_f",error, total_error)
-
-  ! Write reference to disk
-  CALL h5dwrite_f(did, H5T_STD_REF_OBJ, f_ptr, error)
-  CALL check("h5dwrite_f",error, total_error)
-
-  ! Close objects 
-  CALL h5dclose_f(did, error)
-  CALL check("h5dclose_f", error, total_error)
-  CALL h5sclose_f(sid, error)
-  CALL check("h5sclose_f", error, total_error)
-  CALL h5fclose_f(fid, error)
-  CALL check("h5fclose_f", error, total_error)
-
-  ! Re-open file
-  CALL h5fopen_f("get_info.h5", H5F_ACC_RDWR_F, fid, error)
-  CALL check("h5fopen_f", error, total_error)
-
-  ! Re-open dataset
-  CALL h5dopen_f(fid, DSETNAME, did, error)
-  CALL check("h5dopen_f", error, total_error)
-
-  ! Read in the reference
-
-  f_ptr = C_LOC(rref)
-
-  CALL h5dread_f(did, H5T_STD_REF_OBJ, f_ptr, error)
-  CALL check("H5Dread_f",error, total_error)
-
-  ! Dereference to get the group
-
-  CALL h5rdereference_f(did, H5R_OBJECT_F, f_ptr, gid, error)
-  CALL check("h5rdereference_f", error, total_error)
-
-  CALL h5oget_info_by_idx_f(gid, ".", H5_INDEX_NAME_F, H5_ITER_INC_F, 0_hsize_t, oinfo, error)
-  CALL check("h5oget_info_by_idx_f", error, total_error)
-
-  IF(oinfo%rc.NE.1)THEN
-     CALL check("h5oget_info_by_idx_f", -1, total_error)
-  ENDIF
-
-  IF(oinfo%type.NE.H5O_TYPE_DATASET_F)THEN
-     CALL check("h5oget_info_by_idx_f", -1, total_error)
-  ENDIF
-
-  ! Close objects
-  CALL h5dclose_f(did, error)
-  CALL check("h5dclose_f", error, total_error)
-  CALL h5gclose_f(gid, error)
-  CALL check("h5sclose_f", error, total_error)
-  CALL h5fclose_f(fid, error)
-  CALL check("h5fclose_f", error, total_error)
-
-END SUBROUTINE obj_info
-
-!-------------------------------------------------------------------------
-! Function:    build_visit_file
-!
-! Purpose:     Build an "interesting" file to use for visiting links & objects
-!
-! Programmer:  M. Scot Breitenfeld
-!              July 12, 2012
-!              NOTE: Adapted from C test.
-!
-!-------------------------------------------------------------------------
-!
-
-SUBROUTINE build_visit_file(fid)
-
-  USE HDF5
-  USE TH5_MISC
-  IMPLICIT NONE
-
-  INTEGER(hid_t) :: fid                  ! File ID 
-  INTEGER(hid_t) :: gid = -1, gid2 = -1     ! Group IDs
-  INTEGER(hid_t) :: sid = -1              ! Dataspace ID
-  INTEGER(hid_t) :: did = -1              ! Dataset ID
-  INTEGER(hid_t) :: tid = -1              ! Datatype ID
-  CHARACTER(LEN=20) :: filename = 'visit.h5'
-  INTEGER :: error
-  
-  ! Create file for visiting
-  CALL H5Fcreate_f(filename, H5F_ACC_TRUNC_F, fid, error)
-
-  ! Create group
-  CALL H5Gcreate_f(fid, "/Group1", gid, error)
-
-  ! Create nested group
-  CALL H5Gcreate_f(gid, "Group2", gid2, error)
-
-  ! Close groups
-  CALL h5gclose_f(gid2, error)
-  CALL h5gclose_f(gid, error)
-
-  ! Create soft links to groups created
-  CALL H5Lcreate_soft_f("/Group1", fid, "/soft_one", error)
-  CALL H5Lcreate_soft_f("/Group1/Group2", fid, "/soft_two", error)
-
-  ! Create dangling soft link
-  CALL H5Lcreate_soft_f("nowhere", fid, "/soft_dangle", error)
-
-  ! Create hard links to all groups
-  CALL H5Lcreate_hard_f(fid, "/", fid, "hard_zero", error)
-  CALL H5Lcreate_hard_f(fid, "/Group1", fid, "hard_one", error)
-  CALL H5Lcreate_hard_f(fid, "/Group1/Group2", fid, "hard_two", error)
-
-  ! Create loops w/hard links
-  CALL H5Lcreate_hard_f(fid, "/Group1", fid, "/Group1/hard_one", error)
-  CALL H5Lcreate_hard_f(fid, "/", fid, "/Group1/Group2/hard_zero", error)
-
-  ! Create dataset in each group
-  CALL H5Screate_f(H5S_SCALAR_F, sid, error)
-
-  CALL H5Dcreate_f(fid, "/Dataset_zero", H5T_NATIVE_INTEGER, sid, did, error)
-  CALL H5Dclose_f(did, error)
-
-  CALL H5Dcreate_f(fid, "/Group1/Dataset_one", H5T_NATIVE_INTEGER, sid, did, error)
-  CALL H5Dclose_f(did, error)
-
-  CALL H5Dcreate_f(fid, "/Group1/Group2/Dataset_two", H5T_NATIVE_INTEGER, sid, did, error)
-  CALL H5Dclose_f(did, error)
-
-  CALL H5Sclose_f(sid, error)
-
-  ! Create named datatype in each group
-  CALL H5Tcopy_f(H5T_NATIVE_INTEGER, tid, error)
-
-  CALL H5Tcommit_f(fid, "/Type_zero", tid, error)
-  CALL H5Tclose_f(tid, error)
-
-  CALL H5Tcopy_f(H5T_NATIVE_INTEGER, tid, error)
-  CALL H5Tcommit_f(fid, "/Group1/Type_one", tid, error)
-  CALL H5Tclose_f(tid, error)
-
-  CALL H5Tcopy_f(H5T_NATIVE_INTEGER, tid, error)
-  CALL H5Tcommit_f(fid, "/Group1/Group2/Type_two", tid, error)
-  CALL H5Tclose_f(tid, error)
-
-END SUBROUTINE build_visit_file
-
-END MODULE TH5O_F03
diff --git a/fortran/test/tH5P.F90 b/fortran/test/tH5P.F90
new file mode 100644
index 0000000..3db5b28
--- /dev/null
+++ b/fortran/test/tH5P.F90
@@ -0,0 +1,799 @@
+!****h* root/fortran/test/tH5P.f90
+!
+! NAME
+!  tH5P.f90
+!
+! FUNCTION
+!  Basic testing of Fortran H5P APIs.
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+! CONTAINS SUBROUTINES
+!  external_test, multi_file_test
+!
+!*****
+MODULE TH5P
+  USE HDF5 ! This module contains all necessary modules
+  USE TH5_MISC
+  USE TH5_MISC_GEN
+
+CONTAINS
+
+SUBROUTINE external_test(cleanup, total_error)
+
+!   This subroutine tests following functionalities:
+!   h5pset_external_f,  h5pget_external_count_f,
+!   h5pget_external_f
+
+
+  IMPLICIT NONE
+  LOGICAL, INTENT(IN)  :: cleanup
+  INTEGER, INTENT(INOUT) :: total_error
+
+  CHARACTER(LEN=8), PARAMETER :: filename = "external"
+  CHARACTER(LEN=80) :: fix_filename
+  INTEGER(HID_T) :: file_id
+  INTEGER(HID_T) :: plist_id
+  INTEGER(HID_T) :: space_id
+  INTEGER(HID_T) :: dataset_id
+  INTEGER(HSIZE_T), DIMENSION(1) :: cur_size !data space current size
+  INTEGER(HSIZE_T), DIMENSION(1) :: max_size !data space maximum size
+  CHARACTER(LEN=256) :: name !external file name
+  INTEGER(OFF_T) :: file_offset !external file offset
+  INTEGER(HSIZE_T) :: file_size   !sizeof external file segment
+  INTEGER :: error !error code
+  INTEGER(SIZE_T) :: int_size !size of integer
+  INTEGER(HSIZE_T) :: file_bytes !Number of bytes reserved
+                                 !in the file for the data
+  INTEGER :: RANK = 1 !dataset rank
+  INTEGER :: count !number of external files for the
+                   !specified dataset
+  INTEGER(SIZE_T) :: namesize
+  INTEGER(HSIZE_T) :: size, buf_size
+  INTEGER :: idx
+
+  buf_size = 4*1024*1024
+
+  !
+  !Create file "external.h5" using default properties.
+  !
+  CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
+  IF (error .NE. 0) THEN
+     STOP "Cannot modify filename"
+  ENDIF
+  CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
+  CALL check("h5fcreate_f",error,total_error)
+
+  CALL h5pcreate_f(H5P_DATASET_XFER_F, plist_id, error)
+  CALL check("h5pcreate_f", error, total_error)
+  CALL h5pset_buffer_f(plist_id, buf_size, error)
+  CALL check("h5pset_buffer_f", error, total_error)
+  CALL h5pget_buffer_f(plist_id, size, error)
+  CALL check("h5pget_buffer_f", error, total_error)
+  IF (size .NE.buf_size) THEN
+     total_error = total_error + 1
+     WRITE(*,*) "h5pget_buffer_f returned wrong size, error"
+  ENDIF
+  CALL h5pclose_f(plist_id, error)
+  CALL check("h5pclose_f", error, total_error)
+
+  CALL h5pcreate_f(H5P_DATASET_CREATE_F, plist_id, error)
+  CALL check("h5pcreate_f",error,total_error)
+  cur_size(1) =100
+  max_size(1) = 100
+  CALL h5tget_size_f(H5T_NATIVE_INTEGER, int_size, error)
+  CALL check("h5tget_size_f",error,total_error)
+  file_size = int_size * max_size(1)
+  CALL h5pset_external_f(plist_id, "ext1.data", INT(0,off_t), file_size, error)
+  CALL check("h5pset_external_f",error,total_error)
+  CALL h5screate_simple_f(RANK, cur_size, space_id, error, max_size)
+  CALL check("h5screate_simple_f", error, total_error)
+  CALL h5dcreate_f(file_id, "dset1", H5T_NATIVE_INTEGER, space_id, &
+       dataset_id, error, plist_id)
+  CALL check("h5dcreate_f", error, total_error)
+
+  CALL h5dclose_f(dataset_id, error)
+  CALL check("h5dclose_f", error, total_error)
+  CALL h5pclose_f(plist_id, error)
+  CALL check("h5pclose_f", error, total_error)
+  CALL h5sclose_f(space_id, error)
+  CALL check("h5sclose_f", error, total_error)
+  CALL h5fclose_f(file_id, error)
+
+  CALL h5fopen_f(fix_filename, H5F_ACC_RDWR_F, file_id, error)
+  CALL h5dopen_f(file_id, "dset1", dataset_id, error)
+  CALL check("h5dopen_f",error,total_error)
+
+  ! Read dataset creation information
+  CALL h5dget_create_plist_f(dataset_id, plist_id, error)
+  CALL check("h5dget_create_plist_f",error,total_error)
+  CALL h5pget_external_count_f(plist_id, count, error)
+  CALL check("h5pget_external_count_f",error,total_error)
+  IF(count .NE. 1 ) THEN
+     WRITE (*,*) "got external_count is not correct"
+     total_error = total_error + 1
+  END IF
+  namesize = 10
+  idx = 0
+  CALL h5pget_external_f(plist_id, idx, namesize, name, file_offset, &
+       file_bytes, error)
+  CALL check("h5pget_external_f",error,total_error)
+  IF(file_offset .NE. 0 ) THEN
+     WRITE (*,*) "got external file offset is not correct"
+     total_error = total_error + 1
+  END IF
+  IF(file_bytes .NE. file_size ) THEN
+     WRITE (*,*) "got external file size is not correct"
+     total_error = total_error + 1
+  END IF
+
+  CALL h5dclose_f(dataset_id, error)
+  CALL check("h5dclose_f", error, total_error)
+  CALL h5pclose_f(plist_id, error)
+  CALL check("h5pclose_f", error, total_error)
+  CALL h5fclose_f(file_id, error)
+  CALL check("h5fclose_f", error, total_error)
+
+  IF(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
+  CALL check("h5_cleanup_f", error, total_error)
+  RETURN
+END SUBROUTINE external_test
+
+SUBROUTINE multi_file_test(cleanup, total_error)
+
+  IMPLICIT NONE
+  LOGICAL, INTENT(IN) :: cleanup
+  INTEGER, INTENT(INOUT) :: total_error
+
+  CHARACTER(LEN=9), PARAMETER :: filename = "multidset" ! File name
+  CHARACTER(LEN=80) :: fix_filename
+  CHARACTER(LEN=4), PARAMETER :: dsetname = "dset"     ! Dataset name
+
+  INTEGER(HID_T) :: file_id       ! File identifier
+  INTEGER(HID_T) :: dset_id       ! Dataset identifier
+  INTEGER(HID_T) :: dspace_id     ! Dataspace identifier
+  INTEGER(HID_T) :: dtype_id      ! Datatype identifier
+  INTEGER(HID_T) :: fapl, fapl_1  ! File access property list identifier
+  INTEGER, DIMENSION(0:H5FD_MEM_NTYPES_F-1) :: memb_map, memb_map_out
+  INTEGER(HID_T), DIMENSION(0:H5FD_MEM_NTYPES_F-1) :: memb_fapl, memb_fapl_out
+  CHARACTER(LEN=20), DIMENSION(0:H5FD_MEM_NTYPES_F-1) :: memb_name, memb_name_out
+  REAL, DIMENSION(0:H5FD_MEM_NTYPES_F-1) :: memb_addr, memb_addr_out
+  !INTEGER(HADDR_T), DIMENSION(0:H5FD_MEM_NTYPES_F) :: memb_addr
+  LOGICAL :: relax  = .TRUE.
+  LOGICAL :: relax_out = .TRUE.
+
+  INTEGER(HSIZE_T), DIMENSION(2) :: dims = (/4,6/) ! Dataset dimensions
+  INTEGER     ::   rank = 2                        ! Dataset rank
+
+  INTEGER, DIMENSION(4,6) :: dset_data, data_out ! Data buffers
+  INTEGER     ::   error ! Error flag
+  INTEGER(HID_T) :: driver
+  INTEGER     :: i, j    !general purpose integers
+  INTEGER(HSIZE_T), DIMENSION(2) :: data_dims
+  INTEGER :: mdc_nelmts
+  INTEGER(SIZE_T) :: rdcc_nelmts
+  INTEGER(SIZE_T) :: rdcc_nbytes
+  REAL :: rdcc_w0
+  memb_fapl = H5P_DEFAULT_F
+  memb_map = H5FD_MEM_SUPER_F
+  memb_addr = 0.
+  memb_map(H5FD_MEM_SUPER_F) = H5FD_MEM_SUPER_F
+  memb_addr(H5FD_MEM_SUPER_F) = 0.
+  memb_map(H5FD_MEM_BTREE_F) = H5FD_MEM_BTREE_F
+  memb_addr(H5FD_MEM_BTREE_F) = 0.1
+  memb_map(H5FD_MEM_DRAW_F)  = H5FD_MEM_DRAW_F
+  memb_addr(H5FD_MEM_DRAW_F) = 0.5
+  memb_map(H5FD_MEM_GHEAP_F) = H5FD_MEM_GHEAP_F
+  memb_addr(H5FD_MEM_GHEAP_F) = 0.2
+  memb_map(H5FD_MEM_LHEAP_F) = H5FD_MEM_LHEAP_F
+  memb_addr(H5FD_MEM_LHEAP_F) = 0.3
+  memb_map(H5FD_MEM_OHDR_F)  = H5FD_MEM_OHDR_F
+  memb_addr(H5FD_MEM_OHDR_F) = 0.4
+
+  memb_name = ' '
+  memb_name(H5FD_MEM_SUPER_F) = '%s-s.h5'
+  memb_name(H5FD_MEM_BTREE_F) = '%s-b.h5'
+  memb_name(H5FD_MEM_DRAW_F)  = '%s-r.h5'
+  memb_name(H5FD_MEM_GHEAP_F) = '%s-g.h5'
+  memb_name(H5FD_MEM_LHEAP_F) = '%s-l.h5'
+  memb_name(H5FD_MEM_OHDR_F)  = '%s-o.h5'
+
+  !
+  ! Initialize the dset_data array.
+  !
+  DO i = 1, 4
+     DO j = 1, 6
+        dset_data(i,j) = (i-1)*6 + j
+     END DO
+  END DO
+
+  !
+  ! Create a new file using default properties.
+  !
+  CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
+  IF (error .NE. 0) THEN
+     WRITE(*,*) "Cannot modify filename"
+     STOP
+  ENDIF
+  CALL h5pcreate_f(H5P_FILE_ACCESS_F, fapl, error)
+  CALL check("h5pcreate_f", error, total_error)
+  CALL h5pset_fapl_multi_f(fapl, memb_map, memb_fapl, memb_name, memb_addr, relax, error)
+  CALL check("h5pset_fapl_multi_f", error, total_error)
+  CALL h5pget_fapl_multi_f(fapl, memb_map_out, memb_fapl_out, memb_name_out, &
+       memb_addr_out, relax_out, error)
+  CALL check("h5pget_fapl_multi_f", error, total_error)
+  CALL h5pget_driver_f(fapl, driver, error)
+  CALL check("h5pget_driver_f",error, total_error)
+  IF(driver .NE. H5FD_MULTI_F) THEN
+     WRITE(*,*) "Wrong value for driver"
+  ENDIF
+  !
+  ! Let's check h5pget(set)cache_f APIs here for now
+  !
+  CALL h5pget_cache_f(fapl, mdc_nelmts, rdcc_nelmts, rdcc_nbytes, &
+       rdcc_w0, error)
+  CALL check("h5pget_cache_f", error, total_error)
+
+  !
+  ! Set cache to some number
+  !
+  rdcc_nbytes = 1024*1024
+  CALL h5pset_cache_f(fapl, mdc_nelmts, rdcc_nelmts, rdcc_nbytes, &
+       rdcc_w0, error)
+  CALL check("h5pset_cache_f", error, total_error)
+  CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error, access_prp = fapl)
+  CALL check("h5fcreate_f", error, total_error)
+  IF(error .NE. 0) THEN
+     WRITE(*,*) "Cannot create file using multi-file driver... Exiting...."
+     total_error = 1
+     CALL h5pclose_f(fapl, error)
+     RETURN
+  ENDIF
+  !
+  ! Create the dataspace.
+  !
+  CALL h5screate_simple_f(rank, dims, dspace_id, error)
+  CALL check("h5screate_simple_f", error, total_error)
+  !
+  ! Create the dataset with default properties.
+  !
+  CALL h5dcreate_f(file_id, dsetname, H5T_NATIVE_INTEGER, dspace_id, &
+       dset_id, error)
+  CALL check("h5dcreate_f", error, total_error)
+  !
+  ! Write the dataset.
+  !
+  data_dims(1) = 4
+  data_dims(2) = 6
+  CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, dset_data, data_dims, error)
+  CALL check("h5dwrite_f", error, total_error)
+  !
+  ! End access to the dataset and release resources used by it.
+  !
+  CALL h5dclose_f(dset_id, error)
+  CALL check("h5dclose_f", error, total_error)
+
+  !
+  ! Terminate access to the data space.
+  !
+  CALL h5sclose_f(dspace_id, error)
+  CALL check("h5sclose_f", error, total_error)
+
+  !
+  ! Close the file.
+  !
+  CALL h5fclose_f(file_id, error)
+  CALL check("h5fclose_f", error, total_error)
+  CALL h5pclose_f(fapl, error)
+  CALL check("h5pclose_f", error, total_error)
+  !
+  ! Open the existing file.
+  !
+  CALL h5pcreate_f(H5P_FILE_ACCESS_F, fapl, error)
+  CALL check("h5pcreate_f", error, total_error)
+  CALL h5pset_fapl_multi_f(fapl, memb_map, memb_fapl, memb_name, memb_addr, relax, error)
+  CALL check("h5pset_fapl_multi_f", error, total_error)
+  CALL h5fopen_f (fix_filename, H5F_ACC_RDWR_F, file_id, error, access_prp = fapl)
+  CALL check("h5fopen_f", error, total_error)
+  !
+  CALL h5fget_access_plist_f(file_id, fapl_1, error)
+  CALL check("h5fget_access_plist_f", error, total_error)
+  !It doesn't work on Windows.
+  !CALL h5pget_fapl_multi_f(fapl_1, memb_map_out, memb_fapl_out, memb_name_out, &
+  !                         memb_addr_out, relax_out, error)
+  ! write(*,*)  memb_map_out
+  ! write(*,*)  memb_fapl_out
+  ! write(*,*)  memb_name_out
+  ! write(*,*)  memb_addr_out
+  !    CALL check("h5pget_fapl_multi_f", error, total_error)
+
+  !
+  ! Open the existing dataset.
+  !
+  CALL h5dopen_f(file_id, dsetname, dset_id, error)
+  CALL check("h5dopen_f", error, total_error)
+
+  !
+  ! Get the dataset type.
+  !
+  CALL h5dget_type_f(dset_id, dtype_id, error)
+  CALL check("h5dget_type_f", error, total_error)
+
+  !
+  ! Get the data space.
+  !
+  CALL h5dget_space_f(dset_id, dspace_id, error)
+  CALL check("h5dget_space_f", error, total_error)
+
+  !
+  ! Read the dataset.
+  !
+  CALL h5dread_f(dset_id, H5T_NATIVE_INTEGER, data_out, data_dims, error)
+  CALL check("h5dread_f", error, total_error)
+
+  !
+  !Compare the data.
+  !
+  DO i = 1, 4
+     DO j = 1, 6
+        IF (data_out(i,j) .NE. dset_data(i, j)) THEN
+           WRITE(*, *) "dataset test error occurred"
+           WRITE(*,*) "data read is not the same as the data written"
+        END IF
+     END DO
+  END DO
+
+  !
+  ! End access to the dataset and release resources used by it.
+  !
+  CALL h5dclose_f(dset_id, error)
+  CALL check("h5dclose_f", error, total_error)
+
+  !
+  ! Terminate access to the data space.
+  !
+  CALL h5sclose_f(dspace_id, error)
+  CALL check("h5sclose_f", error, total_error)
+
+  !
+  ! Terminate access to the data type.
+  !
+  CALL h5tclose_f(dtype_id, error)
+  CALL check("h5tclose_f", error, total_error)
+  !
+  ! Close the file.
+  !
+  CALL h5fclose_f(file_id, error)
+  CALL check("h5fclose_f", error, total_error)
+  CALL h5pclose_f(fapl, error)
+  CALL check("h5pclose_f", error, total_error)
+  CALL h5pclose_f(fapl_1, error)
+  CALL check("h5pclose_f", error, total_error)
+  IF(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
+  CALL check("h5_cleanup_f", error, total_error)
+
+  IF(cleanup) CALL h5_cleanup_f(filename//'.h5-b', H5P_DEFAULT_F, error)
+  CALL check("h5_cleanup_f", error, total_error)
+  IF(cleanup) CALL h5_cleanup_f(filename//'.h5-g', H5P_DEFAULT_F, error)
+  CALL check("h5_cleanup_f", error, total_error)
+  IF(cleanup) CALL h5_cleanup_f(filename//'.h5-l', H5P_DEFAULT_F, error)
+  CALL check("h5_cleanup_f", error, total_error)
+  IF(cleanup) CALL h5_cleanup_f(filename//'.h5-o', H5P_DEFAULT_F, error)
+  CALL check("h5_cleanup_f", error, total_error)
+  IF(cleanup) CALL h5_cleanup_f(filename//'.h5-r', H5P_DEFAULT_F, error)
+  CALL check("h5_cleanup_f", error, total_error)
+  IF(cleanup) CALL h5_cleanup_f(filename//'.h5-s', H5P_DEFAULT_F, error)
+  CALL check("h5_cleanup_f", error, total_error)
+
+  RETURN
+END SUBROUTINE multi_file_test
+
+!-------------------------------------------------------------------------
+! Function: test_chunk_cache
+!
+! Purpose: Tests APIs:
+!            H5P_H5PSET_CHUNK_CACHE_F
+!            H5P_H5PGET_CHUNK_CACHE_F
+!            H5D_H5DGET_ACCESS_PLIST_F
+!
+! Return:      Success: 0
+!              Failure: -1
+!
+! C Programmer:  Neil Fortner
+!                Wednesday, October 29, 2008
+!
+! FORTRAN Programmer: M. Scot Breitenfeld
+!                     April 16, 2009
+!-------------------------------------------------------------------------
+!
+SUBROUTINE test_chunk_cache(cleanup, total_error)
+
+  IMPLICIT NONE
+  LOGICAL, INTENT(IN)  :: cleanup
+  INTEGER, INTENT(INOUT) :: total_error
+
+  CHARACTER(LEN=14), PARAMETER :: filename="chunk_cache"
+  CHARACTER(LEN=80) :: fix_filename
+  INTEGER(hid_t) :: fid = -1        ! File ID
+  INTEGER(hid_t) :: fapl_local = -1 !  Local fapl
+  INTEGER(hid_t) :: fapl_def = -1  !  Default fapl
+  INTEGER(hid_t) :: dcpl = -1      ! Dataset creation property list ID
+  INTEGER(hid_t) :: dapl1 = -1     ! Dataset access property list ID
+  INTEGER(hid_t) :: dapl2 = -1     ! Dataset access property list ID
+  INTEGER(hid_t) :: sid = -1       ! Dataspace ID
+  INTEGER(hid_t) :: dsid = -1      ! Dataset ID
+  INTEGER(hsize_t), DIMENSION(1:1) :: chunk_dim, NDIM = (/100/) ! Dataset and chunk dimensions
+  INTEGER(size_t) :: nslots_1, nslots_2, nslots_3, nslots_4 ! rdcc number of elements
+  INTEGER(size_t) :: nbytes_1, nbytes_2, nbytes_3, nbytes_4 ! rdcc number of bytes
+  INTEGER :: mdc_nelmts
+  INTEGER(size_t) ::nlinks         ! Number of link traversals
+  REAL :: w0_1, w0_2, w0_3, w0_4 ! rdcc preemption policy
+  INTEGER :: error
+  INTEGER(size_t) rdcc_nelmts
+  INTEGER(size_t) rdcc_nbytes
+  REAL :: rdcc_w0
+  LOGICAL :: minimize              ! Flag for minimized headers
+
+  CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
+  IF (error .NE. 0) THEN
+     WRITE(*,*) "Cannot modify filename"
+     STOP
+  ENDIF
+
+  ! Create a default fapl and dapl
+  CALL H5Pcreate_f(H5P_FILE_ACCESS_F, fapl_def, error)
+  CALL check("H5Pcreate_f", error, total_error)
+  CALL H5Pcreate_f(H5P_DATASET_ACCESS_F, dapl1, error)
+  CALL check("H5Pcreate_f", error, total_error)
+
+  !  Verify that H5Pget_chunk_cache(dapl) returns the same values as are in
+  !  the default fapl.
+  !
+  CALL H5Pget_cache_f(fapl_def, mdc_nelmts, nslots_1, nbytes_1, w0_1, error)
+  CALL check("H5Pget_cache_f", error, total_error)
+  CALL H5Pget_chunk_cache_f(dapl1, nslots_4, nbytes_4, w0_4, error)
+  CALL check("H5Pget_chunk_cache_f", error, total_error)
+  CALL verify("H5Pget_chunk_cache_f", nslots_1, nslots_4, total_error)
+  CALL verify("H5Pget_chunk_cache_f", nbytes_1, nbytes_4, total_error)
+  CALL verify("H5Pget_chunk_cache_f", w0_1, w0_4, total_error)
+
+  !  Set a lapl property on dapl1 (to verify inheritance)
+  CALL H5Pset_nlinks_f(dapl1, 134_size_t , error)
+  CALL check("H5Pset_nlinks_f", error, total_error)
+  CALL H5Pget_nlinks_f(dapl1, nlinks, error)
+  CALL check("H5Pget_nlinks_f", error, total_error)
+  CALL verify("H5Pget_nlinks_f", INT(nlinks), 134, total_error)
+
+
+  CALL h5pcreate_f(H5P_FILE_ACCESS_F, fapl_local, error)
+  CALL check("h5pcreate_f", error, total_error)
+  ! Turn off the chunk cache, so all the chunks are immediately written to disk
+  CALL H5Pget_cache_f(fapl_local, mdc_nelmts, rdcc_nelmts, rdcc_nbytes, rdcc_w0, error)
+  CALL check("H5Pget_cache_f", error, total_error)
+  rdcc_nbytes = 0
+  CALL H5Pset_cache_f(fapl_local, mdc_nelmts, rdcc_nelmts, rdcc_nbytes, rdcc_w0, error)
+  CALL check("H5Pset_cache_f", error, total_error)
+
+  ! Set new rdcc settings on fapl!
+  nslots_2 = nslots_1 * 2
+  nbytes_2 = nbytes_1 * 2
+  w0_2 = w0_1 / 2.
+
+  CALL H5Pset_cache_f(fapl_local, 0, nslots_2, nbytes_2, w0_2, error)
+  CALL check("H5Pset_cache_f", error, total_error)
+
+  ! Create file
+  CALL H5Fcreate_f(fix_filename, H5F_ACC_TRUNC_F, fid, error,  H5P_DEFAULT_F, fapl_local)
+  CALL check("H5Fcreate_f", error, total_error)
+
+  ! Create dataset creation property list
+  CALL H5Pcreate_f(H5P_DATASET_CREATE_F, dcpl, error)
+  CALL check("H5Pcreate_f", error, total_error)
+
+  ! Set chunking
+  chunk_dim(1) = 10
+  CALL H5Pset_chunk_f(dcpl, 1, chunk_dim, error)
+  CALL check("H5Pset_chunk_f", error, total_error)
+
+  ! Create 1-D dataspace
+  ndim(1) = 100
+  CALL H5Screate_simple_f(1, ndim, sid, error)
+  CALL check("H5Pcreate_f", error, total_error)
+
+  !  Create dataset with default dapl
+  CALL H5Dcreate_f(fid, "dset", H5T_NATIVE_INTEGER, sid, dsid, error,  dcpl, H5P_DEFAULT_F,  dapl1)
+  CALL check("H5Pcreate_f", error, total_error)
+
+  !  Retrieve dapl from dataset, verify cache values are the same as on fapl_local
+  CALL H5Dget_access_plist_f(dsid, dapl2, error)
+  CALL check("H5Dget_access_plist_f", error, total_error)
+  CALL H5Pget_chunk_cache_f(dapl2, nslots_4, nbytes_4, w0_4, error)
+  CALL check("H5Pget_chunk_cache_f", error, total_error)
+  CALL verify("H5Pget_chunk_cache_f", INT(nslots_2), INT(nslots_4), total_error)
+  CALL verify("H5Pget_chunk_cache_f", INT(nbytes_2), INT(nbytes_4), total_error)
+  CALL verify("H5Pget_chunk_cache_f", w0_2, w0_4, total_error)
+  CALL H5Pclose_f(dapl2,error)
+  CALL check("H5Pclose_f", error, total_error)
+
+  ! Set new values on dapl1.  nbytes will be set to default, so the file
+  ! property will override this setting
+
+  nslots_3 = nslots_2 * 2
+  nbytes_3 = H5D_CHUNK_CACHE_NBYTES_DFLT_F
+  w0_3 = w0_2 / 2
+
+  CALL H5Pset_chunk_cache_f(dapl1, nslots_3, nbytes_3, w0_3, error)
+  CALL check("H5Pset_chunk_cache_f", error, total_error)
+
+  ! Close dataset, reopen with dapl1.  Note the use of a dapl with H5Oopen
+  CALL H5Dclose_f(dsid, error)
+  CALL H5Oopen_f(fid, "dset", dsid, error, dapl1)
+
+  ! Retrieve dapl from dataset, verify cache values are the same as on dapl1
+  !
+  ! Note we rely on the knowledge that H5Pget_chunk_cache retrieves these
+  ! values directly from the dataset structure, and not from a copy of the
+  ! dapl used to open the dataset (which is not preserved).
+  !
+  CALL H5Dget_access_plist_f(dsid, dapl2, error)
+  CALL check("H5Dget_access_plist_f", error, total_error)
+  CALL H5Pget_chunk_cache_f(dapl2, nslots_4, nbytes_4, w0_4, error)
+  CALL check("H5Pget_chunk_cache_f", error, total_error)
+  CALL verify("H5Pget_chunk_cache_f", INT(nslots_3), INT(nslots_4), total_error)
+  CALL verify("H5Pget_chunk_cache_f", INT(nbytes_2), INT(nbytes_4), total_error)
+  CALL verify("H5Pget_chunk_cache_f", w0_3, w0_4, total_error)
+  CALL H5Pclose_f(dapl2,error)
+  CALL check("H5Pclose_f", error, total_error)
+
+  ! Close dataset, reopen with H5P_DEFAULT as dapl
+  CALL H5Dclose_f(dsid, error)
+  CALL check("H5Dclose_f", error, total_error)
+  CALL H5Oopen_f(fid, "dset", dsid, error)
+  CALL check("H5Oopen_f", error, total_error)
+
+  ! Retrieve dapl from dataset, verify cache values are the same as on fapl_local
+
+  CALL H5Dget_access_plist_f(dsid, dapl2, error)
+  CALL check("H5Dget_access_plist_f", error, total_error)
+  CALL H5Pget_chunk_cache_f(dapl2, nslots_4, nbytes_4, w0_4, error)
+  CALL check("H5Pget_chunk_cache_f", error, total_error)
+  CALL verify("H5Pget_chunk_cache_f", INT(nslots_2), INT(nslots_4), total_error)
+  CALL verify("H5Pget_chunk_cache_f", INT(nbytes_2), INT(nbytes_4), total_error)
+  CALL verify("H5Pget_chunk_cache_f", w0_2, w0_4, total_error)
+  CALL H5Pclose_f(dapl2,error)
+  CALL check("H5Pclose_f", error, total_error)
+
+  ! Similarly, test use of H5Dcreate2 with H5P_DEFAULT
+  CALL H5Dclose_f(dsid, error)
+  CALL check("H5Dclose_f", error, total_error)
+
+  CALL H5Dcreate_f(fid, "dset2", H5T_NATIVE_INTEGER, sid, dsid, error,  dcpl, H5P_DEFAULT_F,  H5P_DEFAULT_F)
+  CALL check("H5Pcreate_f", error, total_error)
+
+  CALL H5Dget_access_plist_f(dsid, dapl2, error)
+  CALL check("H5Dget_access_plist_f", error, total_error)
+
+  CALL H5Pget_chunk_cache_f(dapl2, nslots_4, nbytes_4, w0_4, error)
+  CALL check("H5Pget_chunk_cache_f", error, total_error)
+  CALL verify("H5Pget_chunk_cache_f", INT(nslots_2), INT(nslots_4), total_error)
+  CALL verify("H5Pget_chunk_cache_f", INT(nbytes_2), INT(nbytes_4), total_error)
+  CALL verify("H5Pget_chunk_cache_f", w0_2, w0_4, total_error)
+  ! Don't close dapl2, we will use it in the next section
+
+  ! Modify cache values on fapl_local
+  nbytes_3 = nbytes_2 * 2
+
+  CALL H5Pset_cache_f(fapl_local, 0, nslots_3, nbytes_3, w0_3, error)
+  CALL check("H5Pset_cache_f", error, total_error)
+
+  !  Close and reopen file with new fapl_local
+
+  CALL H5Dclose_f(dsid, error)
+  CALL check("H5Dclose_f", error, total_error)
+  CALL H5Fclose_f(fid,error)
+  CALL check("h5fclose_f", error, total_error)
+
+  CALL H5Fopen_f (fix_filename, H5F_ACC_RDWR_F, fid, error, fapl_local)
+  CALL check("h5fopen_f", error, total_error)
+
+  ! Verify that dapl2 retrieved earlier (using values from the old fapl)
+  ! sets its values in the new file (test use of H5Dopen2 with a dapl)
+  !
+
+  CALL h5dopen_f (fid, "dset", dsid, error, dapl2)
+  CALL check("h5dopen_f", error, total_error)
+
+  CALL H5Pclose_f(dapl2,error)
+  CALL check("H5Pclose_f", error, total_error) ! Close dapl2, to avoid id leak
+
+  CALL H5Dget_access_plist_f(dsid, dapl2, error)
+  CALL check("H5Dget_access_plist_f", error, total_error)
+  CALL H5Pget_chunk_cache_f(dapl2, nslots_4, nbytes_4, w0_4, error)
+  CALL check("H5Pget_chunk_cache_f", error, total_error)
+  CALL verify("H5Pget_chunk_cache_f", INT(nslots_2), INT(nslots_4), total_error)
+  CALL verify("H5Pget_chunk_cache_f", INT(nbytes_2), INT(nbytes_4), total_error)
+  CALL verify("H5Pget_chunk_cache_f", w0_2, w0_4, total_error)
+
+  ! Test H5D_CHUNK_CACHE_NSLOTS_DEFAULT and H5D_CHUNK_CACHE_W0_DEFAULT
+  nslots_2 = H5D_CHUNK_CACHE_NSLOTS_DFLT_F
+  w0_2 = H5D_CHUNK_CACHE_W0_DFLT_F
+
+  CALL H5Pset_chunk_cache_f(dapl2, nslots_2, nbytes_2, w0_2, error)
+  CALL check("H5Pset_chunk_cache_f", error, total_error)
+
+  CALL H5Dclose_f(dsid, error)
+  CALL check("H5Dclose_f", error, total_error)
+  CALL h5dopen_f (fid, "dset", dsid, error, dapl2)
+  CALL check("h5dopen_f", error, total_error)
+
+  CALL H5Pclose_f(dapl2,error)
+  CALL check("H5Pclose_f", error, total_error)
+
+  CALL H5Dget_access_plist_f(dsid, dapl2, error)
+  CALL check("H5Dget_access_plist_f", error, total_error)
+  CALL H5Pget_chunk_cache_f(dapl2, nslots_4, nbytes_4, w0_4, error)
+  CALL check("H5Pget_chunk_cache_f", error, total_error)
+  CALL verify("H5Pget_chunk_cache_f", INT(nslots_3), INT(nslots_4), total_error)
+  CALL verify("H5Pget_chunk_cache_f", INT(nbytes_2), INT(nbytes_4), total_error)
+  CALL verify("H5Pget_chunk_cache_f", w0_3, w0_4, total_error)
+
+  ! Check that the dataset object header minimization hint
+  ! can be set and retrieved.
+
+  ! H5P version
+  ! Check the default value
+  minimize = .TRUE.
+  CALL h5pget_dset_no_attrs_hint_f(dcpl, minimize, error)
+  CALL check("h5pget_dset_no_attrs_hint_f",error,total_error)
+  if(minimize .neqv. .FALSE.) then
+    total_error = total_error + 1
+    write(*,*) "Default dataset minimize flag was incorrect (H5P)"
+  endif
+
+  ! Check setter
+  minimize = .TRUE.
+  CALL h5pset_dset_no_attrs_hint_f(dcpl, minimize, error)
+  CALL check("h5pset_dset_no_attrs_hint_f",error,total_error)
+
+  ! Check getter
+  minimize = .FALSE.
+  CALL h5pget_dset_no_attrs_hint_f(dcpl, minimize, error)
+  CALL check("h5pget_dset_no_attrs_hint_f",error,total_error)
+  if(minimize .neqv. .TRUE.) then
+    total_error = total_error + 1
+    write(*,*) "Unable to get correct dataset minimize flag (H5P)"
+  endif
+
+  ! H5F version
+  ! Check the default value
+  minimize = .TRUE.
+  CALL h5fget_dset_no_attrs_hint_f(fid, minimize, error)
+  CALL check("h5fget_dset_no_attrs_hint_f",error,total_error)
+  if(minimize .neqv. .FALSE.) then
+    total_error = total_error + 1
+    write(*,*) "Default dataset minimize flag was incorrect (H5F)"
+  endif
+
+  ! Check setter
+  minimize = .TRUE.
+  CALL h5fset_dset_no_attrs_hint_f(fid, minimize, error)
+  CALL check("h5fset_dset_no_attrs_hint_f",error,total_error)
+
+  ! Check getter
+  minimize = .FALSE.
+  CALL h5fget_dset_no_attrs_hint_f(fid, minimize, error)
+  CALL check("h5fget_dset_no_attrs_hint_f",error,total_error)
+  if(minimize .neqv. .TRUE.) then
+    total_error = total_error + 1
+    write(*,*) "Unable to get correct dataset minimize flag (H5F)"
+  endif
+
+! Close
+
+  CALL H5Dclose_f(dsid, error)
+  CALL check("H5Dclose_f", error, total_error)
+  CALL H5Sclose_f(sid,error)
+  CALL check("H5Sclose_f", error, total_error)
+  CALL H5Pclose_f(fapl_local,error)
+  CALL check("H5Pclose_f", error, total_error)
+  CALL H5Pclose_f(fapl_def,error)
+  CALL check("H5Pclose_f", error, total_error)
+  CALL H5Pclose_f(dapl1,error)
+  CALL check("H5Pclose_f", error, total_error)
+  CALL H5Pclose_f(dapl2,error)
+  CALL check("H5Pclose_f", error, total_error)
+  CALL H5Pclose_f(dcpl,error)
+  CALL check("H5Pclose_f", error, total_error)
+  CALL H5Fclose_f(fid,error)
+  CALL check("H5Fclose_f", error, total_error)
+
+  IF(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
+  CALL check("h5_cleanup_f", error, total_error)
+
+END SUBROUTINE test_chunk_cache
+
+!-------------------------------------------------------------------------
+! Function: test_misc_properties
+!
+! Purpose:  Tests setting and getting of miscellaneous properties. Does
+!           not test the underlying functionality as that is done in
+!           the C library tests.
+!
+!           Tests APIs:
+!               H5P_GET/SET_FILE_LOCKING_F
+!
+! Return:   Success:    0
+!           Failure:    -1
+!
+!-------------------------------------------------------------------------
+!
+SUBROUTINE test_misc_properties(cleanup, total_error)
+
+  IMPLICIT NONE
+  LOGICAL, INTENT(IN)  :: cleanup
+  INTEGER, INTENT(INOUT) :: total_error
+
+  INTEGER(hid_t) :: fapl_id = -1 !  Local fapl
+  LOGICAL :: use_file_locking           ! (H5Pset/get_file_locking_f)
+  LOGICAL :: ignore_disabled_locks      ! (H5Pset/get_file_locking_f)
+  INTEGER :: error
+
+  ! Create a default fapl
+  CALL H5Pcreate_f(H5P_FILE_ACCESS_F, fapl_id, error)
+  CALL check("H5Pcreate_f", error, total_error)
+
+  ! Test H5Pset/get_file_locking_f
+  ! true values
+  use_file_locking = .TRUE.
+  ignore_disabled_locks = .TRUE.
+  CALL h5pset_file_locking_f(fapl_id, use_file_locking, ignore_disabled_locks, error)
+  CALL check("h5pset_set_file_locking_f", error, total_error)
+  use_file_locking = .FALSE.
+  ignore_disabled_locks = .FALSE.
+  CALL h5pget_file_locking_f(fapl_id, use_file_locking, ignore_disabled_locks, error)
+  CALL check("h5pget_set_file_locking_f", error, total_error)
+  if(use_file_locking .neqv. .TRUE.) then
+    total_error = total_error + 1
+    write(*,*) "Got wrong use_file_locking flag from h5pget_file_locking_f"
+  endif
+  if(ignore_disabled_locks .neqv. .TRUE.) then
+    total_error = total_error + 1
+    write(*,*) "Got wrong ignore_disabled_locks flag from h5pget_file_locking_f"
+  endif
+
+  ! false values
+  use_file_locking = .FALSE.
+  ignore_disabled_locks = .FALSE.
+  CALL h5pset_file_locking_f(fapl_id, use_file_locking, ignore_disabled_locks, error)
+  CALL check("h5pset_set_file_locking_f", error, total_error)
+  use_file_locking = .TRUE.
+  ignore_disabled_locks = .TRUE.
+  CALL h5pget_file_locking_f(fapl_id, use_file_locking, ignore_disabled_locks, error)
+  CALL check("h5pget_set_file_locking_f", error, total_error)
+  if(use_file_locking .neqv. .FALSE.) then
+    total_error = total_error + 1
+    write(*,*) "Got wrong use_file_locking flag from h5pget_file_locking_f"
+  endif
+  if(ignore_disabled_locks .neqv. .FALSE.) then
+    total_error = total_error + 1
+    write(*,*) "Got wrong ignore_disabled_locks flag from h5pget_file_locking_f"
+  endif
+
+  ! Close the fapl
+  CALL H5Pclose_f(fapl_id, error)
+  CALL check("H5Pclose_f", error, total_error)
+
+END SUBROUTINE test_misc_properties
+
+END MODULE TH5P
diff --git a/fortran/test/tH5P.f90 b/fortran/test/tH5P.f90
deleted file mode 100644
index 7dcc580..0000000
--- a/fortran/test/tH5P.f90
+++ /dev/null
@@ -1,696 +0,0 @@
-!****h* root/fortran/test/tH5P.f90
-!
-! NAME
-!  tH5P.f90
-!
-! FUNCTION
-!  Basic testing of Fortran H5P APIs.
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! CONTAINS SUBROUTINES
-!  external_test, multi_file_test
-!
-!*****
-MODULE TH5P
-
-CONTAINS
-
-SUBROUTINE external_test(cleanup, total_error)
-
-!   This subroutine tests following functionalities:
-!   h5pset_external_f,  h5pget_external_count_f,
-!   h5pget_external_f
-
-  USE HDF5 ! This module contains all necessary modules
-  USE TH5_MISC
-  
-  IMPLICIT NONE
-  LOGICAL, INTENT(IN)  :: cleanup
-  INTEGER, INTENT(INOUT) :: total_error
-  
-  CHARACTER(LEN=8), PARAMETER :: filename = "external"
-  CHARACTER(LEN=80) :: fix_filename
-  INTEGER(HID_T) :: file_id
-  INTEGER(HID_T) :: plist_id
-  INTEGER(HID_T) :: space_id
-  INTEGER(HID_T) :: dataset_id
-  INTEGER(HSIZE_T), DIMENSION(1) :: cur_size !data space current size
-  INTEGER(HSIZE_T), DIMENSION(1) :: max_size !data space maximum size
-  CHARACTER(LEN=256) :: name !external file name
-  INTEGER(OFF_T) :: file_offset !external file offset
-  INTEGER(HSIZE_T) :: file_size   !sizeof external file segment
-  INTEGER :: error !error code
-  INTEGER(SIZE_T) :: int_size !size of integer
-  INTEGER(HSIZE_T) :: file_bytes !Number of bytes reserved
-                                 !in the file for the data
-  INTEGER :: RANK = 1 !dataset rank
-  INTEGER :: count !number of external files for the
-                   !specified dataset
-  INTEGER(SIZE_T) :: namesize
-  INTEGER(HSIZE_T) :: size, buf_size
-  INTEGER :: idx
-
-  buf_size = 4*1024*1024
-
-  !
-  !Create file "external.h5" using default properties.
-  !
-  CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
-  IF (error .NE. 0) THEN
-     STOP "Cannot modify filename"
-  ENDIF
-  CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
-  CALL check("h5fcreate_f",error,total_error)
-  
-  CALL h5pcreate_f(H5P_DATASET_XFER_F, plist_id, error)
-  CALL check("h5pcreate_f", error, total_error)
-  CALL h5pset_buffer_f(plist_id, buf_size, error)
-  CALL check("h5pset_buffer_f", error, total_error)
-  CALL h5pget_buffer_f(plist_id, size, error)
-  CALL check("h5pget_buffer_f", error, total_error)
-  IF (size .NE.buf_size) THEN
-     total_error = total_error + 1
-     WRITE(*,*) "h5pget_buffer_f returned wrong size, error"
-  ENDIF
-  CALL h5pclose_f(plist_id, error)
-  CALL check("h5pclose_f", error, total_error)
-  
-  CALL h5pcreate_f(H5P_DATASET_CREATE_F, plist_id, error)
-  CALL check("h5pcreate_f",error,total_error)
-  cur_size(1) =100
-  max_size(1) = 100
-  CALL h5tget_size_f(H5T_NATIVE_INTEGER, int_size, error)
-  CALL check("h5tget_size_f",error,total_error)
-  file_size = int_size * max_size(1)
-  CALL h5pset_external_f(plist_id, "ext1.data", INT(0,off_t), file_size, error)
-  CALL check("h5pset_external_f",error,total_error)
-  CALL h5screate_simple_f(RANK, cur_size, space_id, error, max_size)
-  CALL check("h5screate_simple_f", error, total_error)
-  CALL h5dcreate_f(file_id, "dset1", H5T_NATIVE_INTEGER, space_id, &
-       dataset_id, error, plist_id)
-  CALL check("h5dcreate_f", error, total_error)
-  
-  CALL h5dclose_f(dataset_id, error)
-  CALL check("h5dclose_f", error, total_error)
-  CALL h5pclose_f(plist_id, error)
-  CALL check("h5pclose_f", error, total_error)
-  CALL h5sclose_f(space_id, error)
-  CALL check("h5sclose_f", error, total_error)
-  CALL h5fclose_f(file_id, error)
-  
-  CALL h5fopen_f(fix_filename, H5F_ACC_RDWR_F, file_id, error)
-  CALL h5dopen_f(file_id, "dset1", dataset_id, error)
-  CALL check("h5dopen_f",error,total_error)
-  
-  ! Read dataset creation information
-  CALL h5dget_create_plist_f(dataset_id, plist_id, error)
-  CALL check("h5dget_create_plist_f",error,total_error)
-  CALL h5pget_external_count_f(plist_id, count, error)
-  CALL check("h5pget_external_count_f",error,total_error)
-  IF(count .NE. 1 ) THEN
-     WRITE (*,*) "got external_count is not correct"
-     total_error = total_error + 1
-  END IF
-  namesize = 10
-  idx = 0
-  CALL h5pget_external_f(plist_id, idx, namesize, name, file_offset, &
-       file_bytes, error)
-  CALL check("h5pget_external_f",error,total_error)
-  IF(file_offset .NE. 0 ) THEN
-     WRITE (*,*) "got external file offset is not correct"
-     total_error = total_error + 1
-  END IF
-  IF(file_bytes .NE. file_size ) THEN
-     WRITE (*,*) "got external file size is not correct"
-     total_error = total_error + 1
-  END IF
-  
-  CALL h5dclose_f(dataset_id, error)
-  CALL check("h5dclose_f", error, total_error)
-  CALL h5pclose_f(plist_id, error)
-  CALL check("h5pclose_f", error, total_error)
-  CALL h5fclose_f(file_id, error)
-  CALL check("h5fclose_f", error, total_error)
-
-  IF(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
-  CALL check("h5_cleanup_f", error, total_error)
-  RETURN
-END SUBROUTINE external_test
-
-SUBROUTINE multi_file_test(cleanup, total_error)
-  USE HDF5 ! This module contains all necessary modules
-  USE TH5_MISC
-  
-  IMPLICIT NONE
-  LOGICAL, INTENT(IN) :: cleanup
-  INTEGER, INTENT(INOUT) :: total_error
-  
-  CHARACTER(LEN=9), PARAMETER :: filename = "multidset" ! File name
-  CHARACTER(LEN=80) :: fix_filename
-  CHARACTER(LEN=4), PARAMETER :: dsetname = "dset"     ! Dataset name
-  
-  INTEGER(HID_T) :: file_id       ! File identifier
-  INTEGER(HID_T) :: dset_id       ! Dataset identifier
-  INTEGER(HID_T) :: dspace_id     ! Dataspace identifier
-  INTEGER(HID_T) :: dtype_id      ! Datatype identifier
-  INTEGER(HID_T) :: fapl, fapl_1  ! File access property list identifier
-  INTEGER, DIMENSION(0:H5FD_MEM_NTYPES_F-1) :: memb_map, memb_map_out
-  INTEGER(HID_T), DIMENSION(0:H5FD_MEM_NTYPES_F-1) :: memb_fapl, memb_fapl_out
-  CHARACTER(LEN=20), DIMENSION(0:H5FD_MEM_NTYPES_F-1) :: memb_name, memb_name_out
-  REAL, DIMENSION(0:H5FD_MEM_NTYPES_F-1) :: memb_addr, memb_addr_out
-  !INTEGER(HADDR_T), DIMENSION(0:H5FD_MEM_NTYPES_F) :: memb_addr
-  LOGICAL :: relax  = .TRUE.
-  LOGICAL :: relax_out = .TRUE.
-  
-  INTEGER(HSIZE_T), DIMENSION(2) :: dims = (/4,6/) ! Dataset dimensions
-  INTEGER     ::   rank = 2                        ! Dataset rank
-  
-  INTEGER, DIMENSION(4,6) :: dset_data, data_out ! Data buffers
-  INTEGER     ::   error ! Error flag
-  INTEGER(HID_T) :: driver
-  INTEGER     :: i, j    !general purpose integers
-  INTEGER(HSIZE_T), DIMENSION(2) :: data_dims
-  INTEGER :: mdc_nelmts
-  INTEGER(SIZE_T) :: rdcc_nelmts
-  INTEGER(SIZE_T) :: rdcc_nbytes
-  REAL :: rdcc_w0
-  memb_fapl = H5P_DEFAULT_F
-  memb_map = H5FD_MEM_SUPER_F
-  memb_addr = 0.
-  memb_map(H5FD_MEM_SUPER_F) = H5FD_MEM_SUPER_F
-  memb_addr(H5FD_MEM_SUPER_F) = 0.
-  memb_map(H5FD_MEM_BTREE_F) = H5FD_MEM_BTREE_F
-  memb_addr(H5FD_MEM_BTREE_F) = 0.1
-  memb_map(H5FD_MEM_DRAW_F)  = H5FD_MEM_DRAW_F
-  memb_addr(H5FD_MEM_DRAW_F) = 0.5
-  memb_map(H5FD_MEM_GHEAP_F) = H5FD_MEM_GHEAP_F
-  memb_addr(H5FD_MEM_GHEAP_F) = 0.2
-  memb_map(H5FD_MEM_LHEAP_F) = H5FD_MEM_LHEAP_F
-  memb_addr(H5FD_MEM_LHEAP_F) = 0.3
-  memb_map(H5FD_MEM_OHDR_F)  = H5FD_MEM_OHDR_F
-  memb_addr(H5FD_MEM_OHDR_F) = 0.4
-  
-  memb_name = ' '
-  memb_name(H5FD_MEM_SUPER_F) = '%s-s.h5'
-  memb_name(H5FD_MEM_BTREE_F) = '%s-b.h5'
-  memb_name(H5FD_MEM_DRAW_F)  = '%s-r.h5'
-  memb_name(H5FD_MEM_GHEAP_F) = '%s-g.h5'
-  memb_name(H5FD_MEM_LHEAP_F) = '%s-l.h5'
-  memb_name(H5FD_MEM_OHDR_F)  = '%s-o.h5'
-
-  !
-  ! Initialize the dset_data array.
-  !
-  DO i = 1, 4
-     DO j = 1, 6
-        dset_data(i,j) = (i-1)*6 + j
-     END DO
-  END DO
-  
-  !
-  ! Create a new file using default properties.
-  !
-  CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
-  IF (error .NE. 0) THEN
-     WRITE(*,*) "Cannot modify filename"
-     STOP
-  ENDIF
-  CALL h5pcreate_f(H5P_FILE_ACCESS_F, fapl, error)
-  CALL check("h5pcreate_f", error, total_error)
-  CALL h5pset_fapl_multi_f(fapl, memb_map, memb_fapl, memb_name, memb_addr, relax, error)
-  CALL check("h5pset_fapl_multi_f", error, total_error)
-  CALL h5pget_fapl_multi_f(fapl, memb_map_out, memb_fapl_out, memb_name_out, &
-       memb_addr_out, relax_out, error)
-  CALL check("h5pget_fapl_multi_f", error, total_error)
-  CALL h5pget_driver_f(fapl, driver, error)
-  CALL check("h5pget_driver_f",error, total_error)
-  IF(driver .NE. H5FD_MULTI_F) THEN
-     WRITE(*,*) "Wrong value for driver"
-  ENDIF
-  !
-  ! Let's check h5pget(set)cache_f APIs here for now
-  !
-  CALL h5pget_cache_f(fapl, mdc_nelmts, rdcc_nelmts, rdcc_nbytes, &
-       rdcc_w0, error)
-  CALL check("h5pget_cache_f", error, total_error)  
-  
-  !
-  ! Set cache to some number
-  !
-  rdcc_nbytes = 1024*1024
-  CALL h5pset_cache_f(fapl, mdc_nelmts, rdcc_nelmts, rdcc_nbytes, &
-       rdcc_w0, error)
-  CALL check("h5pset_cache_f", error, total_error)
-  CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error, access_prp = fapl)
-  CALL check("h5fcreate_f", error, total_error)
-  IF(error .NE. 0) THEN
-     WRITE(*,*) "Cannot create file using multi-file driver... Exiting...."
-     total_error = 1
-     CALL h5pclose_f(fapl, error)
-     RETURN
-  ENDIF
-  !
-  ! Create the dataspace.
-  !
-  CALL h5screate_simple_f(rank, dims, dspace_id, error)
-  CALL check("h5screate_simple_f", error, total_error)
-  !
-  ! Create the dataset with default properties.
-  !
-  CALL h5dcreate_f(file_id, dsetname, H5T_NATIVE_INTEGER, dspace_id, &
-       dset_id, error)
-  CALL check("h5dcreate_f", error, total_error)
-  !
-  ! Write the dataset.
-  !
-  data_dims(1) = 4
-  data_dims(2) = 6
-  CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, dset_data, data_dims, error)
-  CALL check("h5dwrite_f", error, total_error)
-  !
-  ! End access to the dataset and release resources used by it.
-  !
-  CALL h5dclose_f(dset_id, error)
-  CALL check("h5dclose_f", error, total_error)
-  
-  !
-  ! Terminate access to the data space.
-  !
-  CALL h5sclose_f(dspace_id, error)
-  CALL check("h5sclose_f", error, total_error)
-  
-  !
-  ! Close the file.
-  !
-  CALL h5fclose_f(file_id, error)
-  CALL check("h5fclose_f", error, total_error)
-  CALL h5pclose_f(fapl, error)
-  CALL check("h5pclose_f", error, total_error)
-  !
-  ! Open the existing file.
-  !
-  CALL h5pcreate_f(H5P_FILE_ACCESS_F, fapl, error)
-  CALL check("h5pcreate_f", error, total_error)
-  CALL h5pset_fapl_multi_f(fapl, memb_map, memb_fapl, memb_name, memb_addr, relax, error)
-  CALL check("h5pset_fapl_multi_f", error, total_error)
-  CALL h5fopen_f (fix_filename, H5F_ACC_RDWR_F, file_id, error, access_prp = fapl)
-  CALL check("h5fopen_f", error, total_error)
-  !
-  CALL h5fget_access_plist_f(file_id, fapl_1, error)
-  CALL check("h5fget_access_plist_f", error, total_error)
-  !It doesn't work on Windows.
-  !CALL h5pget_fapl_multi_f(fapl_1, memb_map_out, memb_fapl_out, memb_name_out, &
-  !                         memb_addr_out, relax_out, error)
-  ! write(*,*)  memb_map_out
-  ! write(*,*)  memb_fapl_out
-  ! write(*,*)  memb_name_out
-  ! write(*,*)  memb_addr_out
-  !    CALL check("h5pget_fapl_multi_f", error, total_error)
-  
-  !
-  ! Open the existing dataset.
-  !
-  CALL h5dopen_f(file_id, dsetname, dset_id, error)
-  CALL check("h5dopen_f", error, total_error)
-  
-  !
-  ! Get the dataset type.
-  !
-  CALL h5dget_type_f(dset_id, dtype_id, error)
-  CALL check("h5dget_type_f", error, total_error)
-  
-  !
-  ! Get the data space.
-  !
-  CALL h5dget_space_f(dset_id, dspace_id, error)
-  CALL check("h5dget_space_f", error, total_error)
-  
-  !
-  ! Read the dataset.
-  !
-  CALL h5dread_f(dset_id, H5T_NATIVE_INTEGER, data_out, data_dims, error)
-  CALL check("h5dread_f", error, total_error)
-  
-  !
-  !Compare the data.
-  !
-  DO i = 1, 4
-     DO j = 1, 6
-        IF (data_out(i,j) .NE. dset_data(i, j)) THEN
-           WRITE(*, *) "dataset test error occured"
-           WRITE(*,*) "data read is not the same as the data writen"
-        END IF
-     END DO
-  END DO
-  
-  !
-  ! End access to the dataset and release resources used by it.
-  !
-  CALL h5dclose_f(dset_id, error)
-  CALL check("h5dclose_f", error, total_error)
-  
-  !
-  ! Terminate access to the data space.
-  !
-  CALL h5sclose_f(dspace_id, error)
-  CALL check("h5sclose_f", error, total_error)
-  
-  !
-  ! Terminate access to the data type.
-  !
-  CALL h5tclose_f(dtype_id, error)
-  CALL check("h5tclose_f", error, total_error)
-  !
-  ! Close the file.
-  !
-  CALL h5fclose_f(file_id, error)
-  CALL check("h5fclose_f", error, total_error)
-  CALL h5pclose_f(fapl, error)
-  CALL check("h5pclose_f", error, total_error)
-  CALL h5pclose_f(fapl_1, error)
-  CALL check("h5pclose_f", error, total_error)
-  IF(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
-  CALL check("h5_cleanup_f", error, total_error)
-  
-  IF(cleanup) CALL h5_cleanup_f(filename//'.h5-b', H5P_DEFAULT_F, error)
-  CALL check("h5_cleanup_f", error, total_error)
-  IF(cleanup) CALL h5_cleanup_f(filename//'.h5-g', H5P_DEFAULT_F, error)
-  CALL check("h5_cleanup_f", error, total_error)
-  IF(cleanup) CALL h5_cleanup_f(filename//'.h5-l', H5P_DEFAULT_F, error)
-  CALL check("h5_cleanup_f", error, total_error)
-  IF(cleanup) CALL h5_cleanup_f(filename//'.h5-o', H5P_DEFAULT_F, error)
-  CALL check("h5_cleanup_f", error, total_error)
-  IF(cleanup) CALL h5_cleanup_f(filename//'.h5-r', H5P_DEFAULT_F, error)
-  CALL check("h5_cleanup_f", error, total_error)
-  IF(cleanup) CALL h5_cleanup_f(filename//'.h5-s', H5P_DEFAULT_F, error)
-  CALL check("h5_cleanup_f", error, total_error)
-  
-  RETURN
-END SUBROUTINE multi_file_test
-
-!-------------------------------------------------------------------------
-! Function: test_chunk_cache
-!
-! Purpose: Tests APIs:
-!            H5P_H5PSET_CHUNK_CACHE_F
-!            H5P_H5PGET_CHUNK_CACHE_F
-!            H5D_H5DGET_ACCESS_PLIST_F
-!
-! Return:      Success: 0
-!              Failure: -1
-!
-! C Programmer:  Neil Fortner
-!                Wednesday, October 29, 2008
-!
-! FORTRAN Programmer: M. Scot Breitenfeld
-!                     April 16, 2009
-!-------------------------------------------------------------------------
-!
-SUBROUTINE test_chunk_cache(cleanup, total_error) 
-
-  USE HDF5 ! This module contains all necessary modules 
-  USE TH5_MISC
-  
-  IMPLICIT NONE
-  LOGICAL, INTENT(IN)  :: cleanup
-  INTEGER, INTENT(INOUT) :: total_error
-  
-  CHARACTER(LEN=14), PARAMETER :: filename="chunk_cache"
-  CHARACTER(LEN=80) :: fix_filename
-  INTEGER(hid_t) :: fid = -1        ! File ID 
-  INTEGER(hid_t) :: fapl_local = -1 !  Local fapl 
-  INTEGER(hid_t) :: fapl_def = -1  !  Default fapl 
-  INTEGER(hid_t) :: dcpl = -1      ! Dataset creation property list ID 
-  INTEGER(hid_t) :: dapl1 = -1     ! Dataset access property list ID 
-  INTEGER(hid_t) :: dapl2 = -1     ! Dataset access property list ID 
-  INTEGER(hid_t) :: sid = -1       ! Dataspace ID 
-  INTEGER(hid_t) :: dsid = -1      ! Dataset ID 
-  INTEGER(hsize_t), DIMENSION(1:1) :: chunk_dim, NDIM = (/100/) ! Dataset and chunk dimensions 
-  INTEGER(size_t) :: nslots_1, nslots_2, nslots_3, nslots_4 ! rdcc number of elements 
-  INTEGER(size_t) :: nbytes_1, nbytes_2, nbytes_3, nbytes_4 ! rdcc number of bytes 
-  INTEGER :: mdc_nelmts
-  INTEGER(size_t) ::nlinks         ! Number of link traversals 
-  REAL :: w0_1, w0_2, w0_3, w0_4 ! rdcc preemption policy 
-  INTEGER :: error
-  INTEGER(size_t) rdcc_nelmts
-  INTEGER(size_t) rdcc_nbytes
-  REAL :: rdcc_w0
-
-  CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
-  IF (error .NE. 0) THEN
-     WRITE(*,*) "Cannot modify filename"
-     STOP
-  ENDIF
-
-  ! Create a default fapl and dapl 
-  CALL H5Pcreate_f(H5P_FILE_ACCESS_F, fapl_def, error)
-  CALL check("H5Pcreate_f", error, total_error)
-  CALL H5Pcreate_f(H5P_DATASET_ACCESS_F, dapl1, error)
-  CALL check("H5Pcreate_f", error, total_error)
-
-  !  Verify that H5Pget_chunk_cache(dapl) returns the same values as are in
-  !  the default fapl.
-  ! 
-  CALL H5Pget_cache_f(fapl_def, mdc_nelmts, nslots_1, nbytes_1, w0_1, error)
-  CALL check("H5Pget_cache_f", error, total_error)
-  CALL H5Pget_chunk_cache_f(dapl1, nslots_4, nbytes_4, w0_4, error)
-  CALL check("H5Pget_chunk_cache_f", error, total_error)
-  CALL VERIFY("H5Pget_chunk_cache_f", INT(nslots_1), INT(nslots_4), total_error)
-  CALL VERIFY("H5Pget_chunk_cache_f", INT(nbytes_1), INT(nbytes_4), total_error)
-
-  IF( .NOT.dreal_eq( REAL(w0_1,dp), REAL( w0_4, dp)) ) THEN
-     CALL VERIFYlogical("H5Pget_chunk_cache_f", .TRUE., .FALSE., total_error)
-  ENDIF
-
-  !  Set a lapl property on dapl1 (to verify inheritance) 
-  CALL H5Pset_nlinks_f(dapl1, 134_size_t , error)
-  CALL check("H5Pset_nlinks_f", error, total_error)
-  CALL H5Pget_nlinks_f(dapl1, nlinks, error)
-  CALL check("H5Pget_nlinks_f", error, total_error)
-  CALL VERIFY("H5Pget_nlinks_f", INT(nlinks), 134, total_error)
-
-
-  CALL h5pcreate_f(H5P_FILE_ACCESS_F, fapl_local, error)
-  CALL check("h5pcreate_f", error, total_error)
-  ! Turn off the chunk cache, so all the chunks are immediately written to disk
-  CALL H5Pget_cache_f(fapl_local, mdc_nelmts, rdcc_nelmts, rdcc_nbytes, rdcc_w0, error)
-  CALL check("H5Pget_cache_f", error, total_error)
-  rdcc_nbytes = 0
-  CALL H5Pset_cache_f(fapl_local, mdc_nelmts, rdcc_nelmts, rdcc_nbytes, rdcc_w0, error)
-  CALL check("H5Pset_cache_f", error, total_error)
-
-  ! Set new rdcc settings on fapl!
-  nslots_2 = nslots_1 * 2
-  nbytes_2 = nbytes_1 * 2
-  w0_2 = w0_1 / 2.
-
-  CALL H5Pset_cache_f(fapl_local, 0, nslots_2, nbytes_2, w0_2, error)
-  CALL check("H5Pset_cache_f", error, total_error)
-
-  ! Create file 
-  CALL H5Fcreate_f(fix_filename, H5F_ACC_TRUNC_F, fid, error,  H5P_DEFAULT_F, fapl_local)
-  CALL check("H5Fcreate_f", error, total_error)
-
-  ! Create dataset creation property list 
-  CALL H5Pcreate_f(H5P_DATASET_CREATE_F, dcpl, error)
-  CALL check("H5Pcreate_f", error, total_error)
-
-  ! Set chunking 
-  chunk_dim(1) = 10
-  CALL H5Pset_chunk_f(dcpl, 1, chunk_dim, error)
-  CALL check("H5Pset_chunk_f", error, total_error)
-
-  ! Create 1-D dataspace 
-  ndim(1) = 100
-  CALL H5Screate_simple_f(1, ndim, sid, error)
-  CALL check("H5Pcreate_f", error, total_error)
-
-  !  Create dataset with default dapl 
-  CALL H5Dcreate_f(fid, "dset", H5T_NATIVE_INTEGER, sid, dsid, error,  dcpl, H5P_DEFAULT_F,  dapl1)
-  CALL check("H5Pcreate_f", error, total_error)
- 
-  !  Retrieve dapl from dataset, verify cache values are the same as on fapl_local 
-  CALL H5Dget_access_plist_f(dsid, dapl2, error)
-  CALL check("H5Dget_access_plist_f", error, total_error)
-  CALL H5Pget_chunk_cache_f(dapl2, nslots_4, nbytes_4, w0_4, error)
-  CALL check("H5Pget_chunk_cache_f", error, total_error)
-  CALL VERIFY("H5Pget_chunk_cache_f", INT(nslots_2), INT(nslots_4), total_error)
-  CALL VERIFY("H5Pget_chunk_cache_f", INT(nbytes_2), INT(nbytes_4), total_error)
-  IF( .NOT.dreal_eq( REAL(w0_2,dp), REAL( w0_4, dp)) ) THEN
-     CALL VERIFYlogical("H5Pget_chunk_cache_f", .TRUE., .FALSE., total_error)
-  ENDIF
-  CALL H5Pclose_f(dapl2,error) 
-  CALL check("H5Pclose_f", error, total_error)
-  
-  ! Set new values on dapl1.  nbytes will be set to default, so the file
-  ! property will override this setting
-
-  nslots_3 = nslots_2 * 2
-  nbytes_3 = H5D_CHUNK_CACHE_NBYTES_DFLT_F
-  w0_3 = w0_2 / 2
-
-  CALL H5Pset_chunk_cache_f(dapl1, nslots_3, nbytes_3, w0_3, error)
-  CALL check("H5Pset_chunk_cache_f", error, total_error)
-
-  ! Close dataset, reopen with dapl1.  Note the use of a dapl with H5Oopen 
-  CALL H5Dclose_f(dsid, error)
-  CALL H5Oopen_f(fid, "dset", dsid, error, dapl1)
-
-  ! Retrieve dapl from dataset, verfiy cache values are the same as on dapl1
-  !
-  ! Note we rely on the knowledge that H5Pget_chunk_cache retrieves these
-  ! values directly from the dataset structure, and not from a copy of the
-  ! dapl used to open the dataset (which is not preserved).
-  !
-  CALL H5Dget_access_plist_f(dsid, dapl2, error)
-  CALL check("H5Dget_access_plist_f", error, total_error)
-  CALL H5Pget_chunk_cache_f(dapl2, nslots_4, nbytes_4, w0_4, error)
-  CALL check("H5Pget_chunk_cache_f", error, total_error)
-  CALL VERIFY("H5Pget_chunk_cache_f", INT(nslots_3), INT(nslots_4), total_error)
-  CALL VERIFY("H5Pget_chunk_cache_f", INT(nbytes_2), INT(nbytes_4), total_error)
-  IF( .NOT.dreal_eq( REAL(w0_3,dp), REAL( w0_4, dp)) ) THEN
-     CALL VERIFYlogical("H5Pget_chunk_cache_f4", .TRUE., .FALSE., total_error)
-  ENDIF
-  CALL H5Pclose_f(dapl2,error)
-  CALL check("H5Pclose_f", error, total_error)
-
-  ! Close dataset, reopen with H5P_DEFAULT as dapl
-  CALL H5Dclose_f(dsid, error)
-  CALL check("H5Dclose_f", error, total_error)
-  CALL H5Oopen_f(fid, "dset", dsid, error)
-  CALL check("H5Oopen_f", error, total_error)
-
-  ! Retrieve dapl from dataset, verfiy cache values are the same as on fapl_local
-
-  CALL H5Dget_access_plist_f(dsid, dapl2, error)
-  CALL check("H5Dget_access_plist_f", error, total_error)
-  CALL H5Pget_chunk_cache_f(dapl2, nslots_4, nbytes_4, w0_4, error)
-  CALL check("H5Pget_chunk_cache_f", error, total_error)
-  CALL VERIFY("H5Pget_chunk_cache_f", INT(nslots_2), INT(nslots_4), total_error)
-  CALL VERIFY("H5Pget_chunk_cache_f", INT(nbytes_2), INT(nbytes_4), total_error)
-  IF( .NOT.dreal_eq( REAL(w0_2,dp), REAL( w0_4, dp)) ) THEN
-     CALL VERIFYlogical("H5Pget_chunk_cache_f", .TRUE., .FALSE., total_error)
-  ENDIF
-  CALL H5Pclose_f(dapl2,error) 
-  CALL check("H5Pclose_f", error, total_error)
-
-  ! Similary, test use of H5Dcreate2 with H5P_DEFAULT
-  CALL H5Dclose_f(dsid, error) 
-  CALL check("H5Dclose_f", error, total_error)
-
-  CALL H5Dcreate_f(fid, "dset2", H5T_NATIVE_INTEGER, sid, dsid, error,  dcpl, H5P_DEFAULT_F,  H5P_DEFAULT_F)
-  CALL check("H5Pcreate_f", error, total_error)
-
-  CALL H5Dget_access_plist_f(dsid, dapl2, error)
-  CALL check("H5Dget_access_plist_f", error, total_error)
-
-  CALL H5Pget_chunk_cache_f(dapl2, nslots_4, nbytes_4, w0_4, error)
-  CALL check("H5Pget_chunk_cache_f", error, total_error)
-  CALL VERIFY("H5Pget_chunk_cache_f", INT(nslots_2), INT(nslots_4), total_error)
-  CALL VERIFY("H5Pget_chunk_cache_f", INT(nbytes_2), INT(nbytes_4), total_error)
-  IF( .NOT.dreal_eq( REAL(w0_2,dp), REAL( w0_4, dp)) ) THEN
-     CALL VERIFYlogical("H5Pget_chunk_cache_f", .TRUE., .FALSE., total_error)
-  ENDIF
-  ! Don't close dapl2, we will use it in the next section
-
-  ! Modify cache values on fapl_local
-  nbytes_3 = nbytes_2 * 2
-
-  CALL H5Pset_cache_f(fapl_local, 0, nslots_3, nbytes_3, w0_3, error)
-  CALL check("H5Pset_cache_f", error, total_error)
-
-  !  Close and reopen file with new fapl_local
-  
-  CALL H5Dclose_f(dsid, error)
-  CALL check("H5Dclose_f", error, total_error)
-  CALL H5Fclose_f(fid,error)
-  CALL check("h5fclose_f", error, total_error)
-
-  CALL H5Fopen_f (fix_filename, H5F_ACC_RDWR_F, fid, error, fapl_local)
-  CALL check("h5fopen_f", error, total_error)
-
-  ! Verify that dapl2 retrieved earlier (using values from the old fapl)
-  ! sets its values in the new file (test use of H5Dopen2 with a dapl)
-  !
-  
-  CALL h5dopen_f (fid, "dset", dsid, error, dapl2)
-  CALL check("h5dopen_f", error, total_error)
-  
-  CALL H5Pclose_f(dapl2,error)
-  CALL check("H5Pclose_f", error, total_error) ! Close dapl2, to avoid id leak
-  
-  CALL H5Dget_access_plist_f(dsid, dapl2, error)
-  CALL check("H5Dget_access_plist_f", error, total_error)
-  CALL H5Pget_chunk_cache_f(dapl2, nslots_4, nbytes_4, w0_4, error)
-  CALL check("H5Pget_chunk_cache_f", error, total_error)
-  CALL VERIFY("H5Pget_chunk_cache_f", INT(nslots_2), INT(nslots_4), total_error)
-  CALL VERIFY("H5Pget_chunk_cache_f", INT(nbytes_2), INT(nbytes_4), total_error)
-  IF( .NOT.dreal_eq( REAL(w0_2,dp), REAL( w0_4, dp)) ) THEN
-     CALL VERIFYlogical("H5Pget_chunk_cache_f", .TRUE., .FALSE., total_error)
-  ENDIF
-
-  ! Test H5D_CHUNK_CACHE_NSLOTS_DEFAULT and H5D_CHUNK_CACHE_W0_DEFAULT
-  nslots_2 = H5D_CHUNK_CACHE_NSLOTS_DFLT_F
-  w0_2 = H5D_CHUNK_CACHE_W0_DFLT_F
-
-  CALL H5Pset_chunk_cache_f(dapl2, nslots_2, nbytes_2, w0_2, error)
-  CALL check("H5Pset_chunk_cache_f", error, total_error)
-
-  CALL H5Dclose_f(dsid, error)
-  CALL check("H5Dclose_f", error, total_error)
-  CALL h5dopen_f (fid, "dset", dsid, error, dapl2)
-  CALL check("h5dopen_f", error, total_error)
-
-  CALL H5Pclose_f(dapl2,error)
-  CALL check("H5Pclose_f", error, total_error)
-
-  CALL H5Dget_access_plist_f(dsid, dapl2, error)
-  CALL check("H5Dget_access_plist_f", error, total_error)
-  CALL H5Pget_chunk_cache_f(dapl2, nslots_4, nbytes_4, w0_4, error)
-  CALL check("H5Pget_chunk_cache_f", error, total_error)
-  CALL VERIFY("H5Pget_chunk_cache_f", INT(nslots_3), INT(nslots_4), total_error)
-  CALL VERIFY("H5Pget_chunk_cache_f", INT(nbytes_2), INT(nbytes_4), total_error)
-  IF( .NOT.dreal_eq( REAL(w0_3,dp), REAL( w0_4, dp)) ) THEN
-     CALL VERIFYlogical("H5Pget_chunk_cache_f", .TRUE., .FALSE., total_error)
-  ENDIF
-
-! Close
-
-  CALL H5Dclose_f(dsid, error)
-  CALL check("H5Dclose_f", error, total_error)
-  CALL H5Sclose_f(sid,error)
-  CALL check("H5Sclose_f", error, total_error)
-  CALL H5Pclose_f(fapl_local,error)
-  CALL check("H5Pclose_f", error, total_error) 
-  CALL H5Pclose_f(fapl_def,error)
-  CALL check("H5Pclose_f", error, total_error) 
-  CALL H5Pclose_f(dapl1,error)
-  CALL check("H5Pclose_f", error, total_error) 
-  CALL H5Pclose_f(dapl2,error)
-  CALL check("H5Pclose_f", error, total_error) 
-  CALL H5Pclose_f(dcpl,error)
-  CALL check("H5Pclose_f", error, total_error) 
-  CALL H5Fclose_f(fid,error)
-  CALL check("H5Fclose_f", error, total_error)
-
-  IF(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
-  CALL check("h5_cleanup_f", error, total_error)
-
-END SUBROUTINE test_chunk_cache
-
-END MODULE TH5P
diff --git a/fortran/test/tH5P_F03.F90 b/fortran/test/tH5P_F03.F90
new file mode 100644
index 0000000..ad505d4
--- /dev/null
+++ b/fortran/test/tH5P_F03.F90
@@ -0,0 +1,1120 @@
+!****h* root/fortran/test/TH5P_F03
+!
+! NAME
+!  tH5P_F03.F90
+!
+! FUNCTION
+!  Test FORTRAN HDF5 H5P APIs which are dependent on FORTRAN 2003
+!  features.
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+! USES
+!  test_genprop_cls_cb1_mod
+!
+! CONTAINS SUBROUTINES
+!  test_create, test_genprop_class_callback
+!
+!*****
+
+! *****************************************
+! ***        H 5 P   T E S T S
+! *****************************************
+MODULE test_genprop_cls_cb1_mod
+
+  ! Callback subroutine for test_genprop_class_callback
+  ! and the function H5Pcreate_class_f.
+
+  USE HDF5
+  USE ISO_C_BINDING
+  IMPLICIT NONE
+
+  TYPE, BIND(C) :: cop_cb_struct_ !  Struct for iterations
+    INTEGER :: count
+    INTEGER(HID_T) :: id
+  END TYPE cop_cb_struct_
+
+CONTAINS
+
+  INTEGER FUNCTION test_genprop_cls_cb1_f(list_id, create_data ) bind(C)
+
+    IMPLICIT NONE
+
+    INTEGER(HID_T), INTENT(IN), VALUE :: list_id
+
+    TYPE(cop_cb_struct_) :: create_data
+
+    create_data%count = create_data%count + 1
+    create_data%id = list_id
+
+    test_genprop_cls_cb1_f = 0
+
+  END FUNCTION test_genprop_cls_cb1_f
+
+END MODULE test_genprop_cls_cb1_mod
+
+MODULE TH5P_F03
+
+  USE HDF5
+  USE TH5_MISC
+  USE TH5_MISC_GEN
+  USE ISO_C_BINDING
+
+CONTAINS
+
+!-------------------------------------------------------------------------
+! * Function:	test_create
+! *
+! * Purpose:	Tests H5Pset_fill_value_f and H5Pget_fill_value_f
+! *
+! * Return:	Success:	0
+! *
+! *		Failure:	number of errors
+! *
+! * Programmer:	M. Scot Breitenfeld
+! *             June 24, 2008
+! *
+! * Modifications:
+! *
+! *-------------------------------------------------------------------------
+!
+
+SUBROUTINE test_create(total_error)
+
+  IMPLICIT NONE
+
+  INTEGER, INTENT(INOUT) :: total_error
+  INTEGER(HID_T) :: fapl
+
+  INTEGER(hid_t) :: file=-1, space=-1, dcpl=-1, comp_type_id=-1
+  INTEGER(hid_t) :: dset9=-1
+  INTEGER(hsize_t), DIMENSION(1:5), PARAMETER :: cur_size = (/2, 8, 8, 4, 2/)
+  INTEGER(hsize_t), DIMENSION(1:5), PARAMETER :: ch_size= (/1, 1, 1, 4, 1/)
+  CHARACTER(LEN=14) :: filename ='test_create.h5'
+
+  TYPE(comp_datatype), TARGET :: rd_c, fill_ctype
+  INTEGER :: error
+  INTEGER(SIZE_T) :: h5off
+  TYPE(C_PTR) :: f_ptr
+  CHARACTER(LEN=1) :: cfill
+  INTEGER :: ifill
+  REAL :: rfill
+  REAL(KIND=dp) :: dpfill
+  INTEGER :: low, high
+
+  !
+  ! * Create a file.
+  !
+  CALL h5fcreate_f(filename,H5F_ACC_TRUNC_F,file,error)
+  CALL check("h5fcreate_f", error, total_error)
+
+  CALL h5screate_simple_f(5, cur_size, space, error, cur_size)
+  CALL check("h5screate_simple_f", error, total_error)
+
+  CALL H5Pcreate_f(H5P_DATASET_CREATE_F, dcpl, error)
+  CALL check("H5Pcreate_f", error, total_error)
+
+  CALL h5pset_chunk_f(dcpl, 5, ch_size, error)
+  CALL check("h5pset_chunk_f",error, total_error)
+
+  !  Create a compound datatype
+  CALL h5tcreate_f(H5T_COMPOUND_F, H5_SIZEOF(fill_ctype), comp_type_id, error)
+  CALL check("h5tcreate_f", error, total_error)
+  h5off = H5OFFSETOF(C_LOC(fill_ctype), C_LOC(fill_ctype%a))
+  CALL h5tinsert_f(comp_type_id, "a", h5off , H5T_NATIVE_REAL, error)
+  CALL check("h5tinsert_f", error, total_error)
+  CALL h5tinsert_f(comp_type_id, "x", H5OFFSETOF(C_LOC(fill_ctype), C_LOC(fill_ctype%x)), H5T_NATIVE_INTEGER, error)
+  CALL check("h5tinsert_f", error, total_error)
+  CALL h5tinsert_f(comp_type_id, "y", H5OFFSETOF(C_LOC(fill_ctype), C_LOC(fill_ctype%y)), H5T_NATIVE_DOUBLE, error)
+  CALL check("h5tinsert_f", error, total_error)
+  CALL h5tinsert_f(comp_type_id, "z", &
+       H5OFFSETOF(C_LOC(fill_ctype), C_LOC(fill_ctype%z)), H5T_NATIVE_CHARACTER, error)
+  CALL check("h5tinsert_f", error, total_error)
+
+
+  CALL H5Pset_alloc_time_f(dcpl, H5D_ALLOC_TIME_LATE_F,error)
+  CALL check("H5Pset_alloc_time_f",error, total_error)
+
+  CALL H5Pset_fill_time_f(dcpl, H5D_FILL_TIME_ALLOC_F, error)
+  CALL check("H5Pset_fill_time_f",error, total_error)
+
+  !  Compound datatype test
+
+  f_ptr = C_LOC(fill_ctype)
+
+  CALL H5Pget_fill_value_f(dcpl, comp_type_id, f_ptr, error)
+  CALL check("H5Pget_fill_value_f",error, total_error)
+
+  fill_ctype%y = 4444.D0
+  fill_ctype%z = 'S'
+  fill_ctype%a = 5555.
+  fill_ctype%x = 55
+
+  f_ptr = C_LOC(fill_ctype)
+
+  ! Test various fill values
+  CALL H5Pset_fill_value_f(dcpl, H5T_NATIVE_CHARACTER, 'X', error)
+  CALL check("H5Pset_fill_value_f",error, total_error)
+  CALL h5pget_fill_value_f(dcpl, H5T_NATIVE_CHARACTER, cfill, error)
+  CALL check("H5Pget_fill_value_f",error, total_error)
+  IF(cfill.NE.'X')THEN
+     PRINT*,"***ERROR: Returned wrong fill value (character)"
+     total_error = total_error + 1
+  ENDIF
+  CALL H5Pset_fill_value_f(dcpl, H5T_NATIVE_INTEGER, 9, error)
+  CALL check("H5Pset_fill_value_f",error, total_error)
+  CALL h5pget_fill_value_f(dcpl, H5T_NATIVE_INTEGER, ifill, error)
+  CALL check("H5Pget_fill_value_f",error, total_error)
+  IF(ifill.NE.9)THEN
+     PRINT*,"***ERROR: Returned wrong fill value (integer)"
+     total_error = total_error + 1
+  ENDIF
+  CALL H5Pset_fill_value_f(dcpl, H5T_NATIVE_DOUBLE, 1.0_dp, error)
+  CALL check("H5Pset_fill_value_f",error, total_error)
+  CALL h5pget_fill_value_f(dcpl, H5T_NATIVE_DOUBLE, dpfill, error)
+  CALL check("H5Pget_fill_value_f",error, total_error)
+  CALL VERIFY("***ERROR: Returned wrong fill value (double)", dpfill, 1.0_dp, total_error)
+  CALL H5Pset_fill_value_f(dcpl, H5T_NATIVE_REAL, 2.0, error)
+  CALL check("H5Pset_fill_value_f",error, total_error)
+  CALL h5pget_fill_value_f(dcpl, H5T_NATIVE_REAL, rfill, error)
+  CALL check("H5Pget_fill_value_f",error, total_error)
+  CALL VERIFY("***ERROR: Returned wrong fill value (real)", rfill, 2.0, total_error)
+
+  ! For the actual compound type
+  CALL H5Pset_fill_value_f(dcpl, comp_type_id, f_ptr, error)
+  CALL check("H5Pget_fill_value_f",error, total_error)
+
+  CALL h5dcreate_f(file,"dset9", comp_type_id, space, dset9, error, dcpl_id=dcpl)
+  CALL check("h5dcreate_f", error, total_error)
+
+  CALL h5dclose_f(dset9, error)
+  CALL check("h5dclose_f", error, total_error)
+
+  CALL h5fclose_f(file,error)
+  CALL check("h5fclose_f", error, total_error)
+
+  !  Open the file and get the dataset fill value from each dataset
+  CALL h5pcreate_f(H5P_FILE_ACCESS_F, fapl, error)
+  CALL check("h5pcreate_f",error, total_error)
+
+  CALL h5pset_libver_bounds_f(fapl, H5F_LIBVER_V18_F, H5F_LIBVER_V18_F, error)
+  CALL check("h5pset_libver_bounds_f",error, total_error)
+  CALL h5pget_libver_bounds_f(fapl, low, high, error)
+  CALL check("h5pget_libver_bounds_f",error, total_error)
+  CALL VERIFY("***ERROR: Returned wrong low libver_bounds", low, H5F_LIBVER_V18_F, total_error)
+  CALL VERIFY("***ERROR: Returned wrong high libver_bounds", high, H5F_LIBVER_V18_F, total_error)
+
+  CALL h5pset_libver_bounds_f(fapl, H5F_LIBVER_V18_F, H5F_LIBVER_V110_F, error)
+  CALL check("h5pset_libver_bounds_f",error, total_error)
+  CALL h5pget_libver_bounds_f(fapl, low, high, error)
+  CALL check("h5pget_libver_bounds_f",error, total_error)
+  CALL VERIFY("***ERROR: Returned wrong low libver_bounds", low, H5F_LIBVER_V18_F, total_error)
+  CALL VERIFY("***ERROR: Returned wrong high libver_bounds", high, H5F_LIBVER_V110_F, total_error)
+
+  CALL h5pset_libver_bounds_f(fapl, H5F_LIBVER_V112_F, H5F_LIBVER_V112_F, error)
+  CALL check("h5pset_libver_bounds_f",error, total_error)
+  CALL h5pget_libver_bounds_f(fapl, low, high, error)
+  CALL check("h5pget_libver_bounds_f",error, total_error)
+  CALL VERIFY("***ERROR: Returned wrong low libver_bounds", low, H5F_LIBVER_V112_F, total_error)
+  CALL VERIFY("***ERROR: Returned wrong high libver_bounds", high, H5F_LIBVER_V112_F, total_error)
+
+  CALL h5pset_libver_bounds_f(fapl, H5F_LIBVER_V114_F, H5F_LIBVER_V114_F, error)
+  CALL check("h5pset_libver_bounds_f",error, total_error)
+  CALL h5pget_libver_bounds_f(fapl, low, high, error)
+  CALL check("h5pget_libver_bounds_f",error, total_error)
+  CALL VERIFY("***ERROR: Returned wrong low libver_bounds", low, H5F_LIBVER_V114_F, total_error)
+  CALL VERIFY("***ERROR: Returned wrong high libver_bounds", high, H5F_LIBVER_V114_F, total_error)
+
+  CALL H5Pset_libver_bounds_f(fapl, H5F_LIBVER_LATEST_F, H5F_LIBVER_LATEST_F, error)
+  CALL check("H5Pset_libver_bounds_f",error, total_error)
+  CALL h5pget_libver_bounds_f(fapl, low, high, error)
+  CALL check("h5pget_libver_bounds_f",error, total_error)
+  CALL VERIFY("***ERROR: Returned wrong low libver_bounds", low, H5F_LIBVER_LATEST_F, total_error)
+  CALL VERIFY("***ERROR: Returned wrong high libver_bounds", high, H5F_LIBVER_LATEST_F, total_error)
+  IF(H5F_LIBVER_LATEST_F.GE.H5F_LIBVER_NBOUNDS_F)THEN
+     WRITE(*,'(A,I0,A,I0,A)') &
+          "***ERROR: H5F_LIBVER_LATEST_F (",H5F_LIBVER_LATEST_F,") .GE. H5F_LIBVER_NBOUNDS_F (",H5F_LIBVER_NBOUNDS_F,")"
+     total_error = total_error + 1
+  ENDIF
+
+  CALL h5fopen_f (FILENAME, H5F_ACC_RDONLY_F, file, error, fapl)
+  CALL check("h5fopen_f", error, total_error)
+
+  ! Compound datatype test
+  CALL h5dopen_f(file, "dset9", dset9, error)
+  CALL check("h5dopen_f", error, total_error)
+
+  CALL H5Pclose_f(dcpl, error)
+  CALL check("H5Pclose_f", error, total_error)
+
+  CALL H5Dget_create_plist_f(dset9, dcpl, error)
+  CALL check("H5Dget_create_plist_f", error, total_error)
+
+  f_ptr = C_LOC(rd_c)
+
+  CALL H5Pget_fill_value_f(dcpl, comp_type_id, f_ptr, error)
+  CALL check("H5Pget_fill_value_f", error, total_error)
+  CALL verify("***ERROR: Returned wrong fill value", rd_c%a, fill_ctype%a, total_error)
+  CALL verify("***ERROR: Returned wrong fill value", rd_c%y, fill_ctype%y, total_error)
+
+  IF( rd_c%x .NE. fill_ctype%x .OR. &
+      rd_c%z .NE. fill_ctype%z )THEN
+
+     PRINT*,"***ERROR: Returned wrong fill value"
+     total_error = total_error + 1
+
+  ENDIF
+
+  CALL h5dclose_f(dset9, error)
+  CALL check("h5dclose_f", error, total_error)
+
+  CALL H5Pclose_f(dcpl, error)
+  CALL check("H5Pclose_f", error, total_error)
+
+  CALL h5fclose_f(file,error)
+  CALL check("h5fclose_f", error, total_error)
+
+END SUBROUTINE test_create
+
+
+SUBROUTINE test_genprop_class_callback(total_error)
+
+  !
+  !
+  !  test_genprop_class_callback(): Test basic generic property list code.
+  !      Tests callbacks for property lists in a generic class.
+  !
+  !  FORTRAN TESTS:
+  !      Tests function H5Pcreate_class_f with callback.
+  !
+  !
+
+  USE test_genprop_cls_cb1_mod
+  IMPLICIT NONE
+
+  INTEGER, INTENT(INOUT) :: total_error
+
+  INTEGER(hid_t) :: cid1, cid2 ! Generic Property class ID
+  INTEGER(hid_t) :: lid1, lid2 ! Generic Property list ID
+  INTEGER(size_t) :: nprops ! Number of properties in class
+
+  TYPE(cop_cb_struct_), TARGET :: crt_cb_struct, cls_cb_struct
+  INTEGER :: CLASS1_NAME_SIZE = 7 ! length of class string
+  CHARACTER(LEN=7) :: CLASS1_NAME = "Class 1", CLASS1_NAME_BUF
+  TYPE(C_FUNPTR) :: f1, f5
+  TYPE(C_PTR) :: f2, f6
+
+  CHARACTER(LEN=10) :: PROP1_NAME = "Property 1"
+  INTEGER(SIZE_T) :: PROP1_SIZE = 10
+  CHARACTER(LEN=10) :: PROP2_NAME = "Property 2"
+  INTEGER(SIZE_T) :: PROP2_SIZE = 10
+  CHARACTER(LEN=10) :: PROP3_NAME = "Property 3"
+  INTEGER(SIZE_T) :: PROP3_SIZE = 10
+  CHARACTER(LEN=10) :: PROP4_NAME = "Property 4"
+  INTEGER(SIZE_T) :: PROP4_SIZE = 10
+  INTEGER :: PROP1_DEF_VALUE = 10
+  INTEGER :: PROP2_DEF_VALUE = 10
+  INTEGER :: PROP3_DEF_VALUE = 10
+  INTEGER :: PROP4_DEF_VALUE = 10
+
+  INTEGER :: error !  Generic RETURN value
+  LOGICAL :: flag  ! for tests
+
+  f1 = C_FUNLOC(test_genprop_cls_cb1_f)
+  f5 = C_FUNLOC(test_genprop_cls_cb1_f)
+
+  f2 = C_LOC(crt_cb_struct)
+  f6 = C_LOC(cls_cb_struct)
+
+  ! Create a new generic class, derived from the root of the class hierarchy
+  CALL h5pcreate_class_f(h5p_ROOT_F, CLASS1_NAME, cid1, error, f1, f2, c_null_funptr, c_null_ptr, f5, f6)
+  CALL check("h5pcreate_class_f", error, total_error)
+
+  ! Insert first property into class (with no callbacks)
+  CALL h5pregister_f(cid1, PROP1_NAME, PROP1_SIZE, PROP1_DEF_VALUE, error)
+  CALL check("h5pregister_f", error, total_error)
+  ! Insert second property into class (with no callbacks)
+  CALL h5pregister_f(cid1, PROP2_NAME, PROP2_SIZE, PROP2_DEF_VALUE, error)
+  CALL check("h5pregister_f", error, total_error)
+  ! Insert third property into class (with no callbacks)
+  CALL h5pregister_f(cid1, PROP3_NAME, PROP3_SIZE, PROP3_DEF_VALUE, error)
+  CALL check("h5pregister_f", error, total_error)
+
+  ! Insert fourth property into class (with no callbacks)
+  CALL h5pregister_f(cid1, PROP4_NAME, PROP4_SIZE, PROP4_DEF_VALUE, error)
+  CALL check("h5pregister_f", error, total_error)
+
+  !  Check the number of properties in class
+  CALL h5pget_nprops_f(cid1, nprops, error)
+  CALL check("h5pget_nprops_f", error, total_error)
+  CALL verify("h5pget_nprops_f", INT(nprops), 4, total_error)
+
+  !  Initialize class callback structs
+
+  crt_cb_struct%count = 0
+  crt_cb_struct%id    = -1
+  cls_cb_struct%count = 0
+  cls_cb_struct%id    = -1
+
+  ! Create a property list from the class
+  CALL h5pcreate_f(cid1, lid1, error)
+  CALL check("h5pcreate_f", error, total_error)
+
+  ! Get the list's class
+  CALL H5Pget_class_f(lid1, cid2, error)
+  CALL check("H5Pget_class_f", error, total_error)
+
+  !  Check that the list's class is correct
+  CALL H5Pequal_f(cid2, cid1, flag, error)
+  CALL check("H5Pequal_f", error, total_error)
+  CALL verify("H5Pequal_f", flag, .TRUE., total_error)
+
+  ! Check the class name
+  CALL H5Pget_class_name_f(cid2, CLASS1_NAME_BUF, CLASS1_NAME_SIZE, error)
+  CALL check("H5Pget_class_name_f", error, total_error)
+  CALL verify("H5Pget_class_name_f", CLASS1_NAME_BUF, CLASS1_NAME, error)
+  IF(error.NE.0)THEN
+     WRITE(*,*) 'Class names do not match! name=',CLASS1_NAME_BUF, 'CLASS1_NAME=',CLASS1_NAME
+     total_error = total_error + 1
+  ENDIF
+  ! Close class
+  CALL h5pclose_class_f(cid2, error)
+  CALL check("h5pclose_class_f", error, total_error)
+
+  ! Verify that the creation callback occurred
+  CALL verify("h5pcreate_f", crt_cb_struct%count, 1, total_error)
+  CALL verify("h5pcreate_f", crt_cb_struct%id, lid1, total_error)
+
+  !  Check the number of properties in list
+  CALL h5pget_nprops_f(lid1,nprops, error)
+  CALL check("h5pget_nprops_f", error, total_error)
+  CALL verify("h5pget_nprops_f", INT(nprops), 4, total_error)
+
+  !  Create another property list from the class
+  CALL h5pcreate_f(cid1, lid2, error)
+  CALL check("h5pcreate_f", error, total_error)
+
+  !  Verify that the creation callback occurred
+  CALL verify("h5pcreate_f", crt_cb_struct%count, 2, total_error)
+  CALL verify("h5pcreate_f", crt_cb_struct%id, lid2, total_error)
+
+  !  Check the number of properties in list
+  CALL h5pget_nprops_f(lid2,nprops, error)
+  CALL check("h5pget_nprops_f", error, total_error)
+  CALL verify("h5pget_nprops_f", INT(nprops), 4, total_error)
+
+  !  Close first list
+  CALL h5pclose_f(lid1, error);
+  CALL check("h5pclose_f", error, total_error)
+
+  ! Verify that the close callback occurred
+  CALL verify("h5pcreate_f", cls_cb_struct%count, 1, total_error)
+  CALL verify("h5pcreate_f", cls_cb_struct%id, lid1, total_error)
+
+  ! Close second list
+  CALL h5pclose_f(lid2, error);
+  CALL check("h5pclose_f", error, total_error)
+
+  ! Verify that the close callback occurred
+  CALL verify("h5pcreate_f", cls_cb_struct%count, 2, total_error)
+  CALL verify("h5pcreate_f", cls_cb_struct%id, lid2, total_error)
+
+  ! Close class
+  CALL h5pclose_class_f(cid1, error)
+  CALL check("h5pclose_class_f", error, total_error)
+
+END SUBROUTINE test_genprop_class_callback
+
+!-------------------------------------------------------------------------
+! Function: test_h5p_file_image
+!
+! Purpose: Tests APIs:
+!          h5pget_file_image_f and h5pset_file_image_f
+!
+! Return:      Success: 0
+!              Failure: -1
+!
+! FORTRAN Programmer: M. Scot Breitenfeld
+!                     April 1, 2014
+!-------------------------------------------------------------------------
+
+SUBROUTINE test_h5p_file_image(total_error)
+
+  USE, INTRINSIC :: iso_c_binding
+  IMPLICIT NONE
+  INTEGER, INTENT(INOUT) :: total_error
+  INTEGER(hid_t) ::   fapl_1 = -1
+  INTEGER, PARAMETER :: count = 10
+  INTEGER, DIMENSION(1:count), TARGET :: buffer
+  INTEGER, DIMENSION(1:count), TARGET :: temp
+  INTEGER :: i
+  INTEGER(size_t) :: size
+  INTEGER(size_t) :: temp_size
+  INTEGER :: error ! error return value
+  TYPE(C_PTR) :: f_ptr
+  TYPE(C_PTR), DIMENSION(1:count) :: f_ptr1
+  TYPE(C_PTR), DIMENSION(1:1) :: f_ptr2
+
+  ! Initialize file image buffer
+  DO i = 1, count
+     buffer(i) = i*10
+  ENDDO
+
+  ! Create fapl
+  CALL h5pcreate_f(H5P_FILE_ACCESS_F, fapl_1, error)
+  CALL check("h5pcreate_f", error, total_error)
+
+  ! Test with NULL ptr
+  f_ptr2(1) = C_NULL_PTR
+  temp_size = 1
+  CALL h5pget_file_image_f(fapl_1, f_ptr2, temp_size, error)
+  CALL check("h5pget_file_image_f", error, total_error)
+  CALL verify("h5pget_file_image_f", INT(temp_size), 0, total_error)
+
+  ! Set file image
+  f_ptr = C_LOC(buffer(1))
+  size = H5_SIZEOF(buffer(1))*count
+
+  CALL h5pset_file_image_f(fapl_1, f_ptr, size, error)
+  CALL check("h5pset_file_image_f", error, total_error)
+
+  ! Get the same data back
+  DO i = 1, count
+     f_ptr1(i) = C_LOC(temp(i))
+  ENDDO
+
+  temp_size = 0
+  CALL h5pget_file_image_f(fapl_1, f_ptr1, temp_size, error)
+  CALL check("h5pget_file_image_f", error, total_error)
+
+  ! Check that sizes are the same, and that the buffers are identical but separate
+  CALL verify("h5pget_file_image_f", INT(temp_size), INT(size), total_error)
+
+  ! Verify the image data is correct
+  DO i = 1, count
+     CALL verify("h5pget_file_image_f", temp(i), buffer(i), total_error)
+  ENDDO
+
+END SUBROUTINE test_h5p_file_image
+
+!-------------------------------------------------------------------------
+! Function: external_test_offset
+!
+! Purpose: Tests APIs:
+!      h5pset_external_f (with offsets not equal to zero), h5pget_external_f
+!
+! Return:      Success: 0
+!              Failure: -1
+!
+! FORTRAN Programmer: M. Scot Breitenfeld
+!                     January 10, 2012
+!-------------------------------------------------------------------------
+!
+SUBROUTINE external_test_offset(cleanup,total_error)
+
+  IMPLICIT NONE
+  INTEGER, INTENT(INOUT) :: total_error
+  LOGICAL, INTENT(IN)  :: cleanup
+
+  INTEGER(hid_t) :: fapl=-1   ! file access property list
+  INTEGER(hid_t) :: file=-1   ! file to write to
+  INTEGER(hid_t) :: dcpl=-1   ! dataset creation properties
+  INTEGER(hid_t) :: space=-1  ! data space
+  INTEGER(hid_t) :: dset=-1   ! dataset
+  INTEGER(hid_t) :: grp=-1    ! group to emit diagnostics
+  INTEGER(size_t) :: i, j     ! miscellaneous counters
+  CHARACTER(LEN=180) :: filename   ! file names
+  INTEGER, DIMENSION(1:25) :: part
+  INTEGER, DIMENSION(1:100), TARGET :: whole ! raw data buffers
+  INTEGER(hsize_t), DIMENSION(1:1) :: cur_size ! current data space size
+  INTEGER(hid_t) :: hs_space  ! hyperslab data space
+  INTEGER(hsize_t), DIMENSION(1:1) :: hs_start = (/30/) ! hyperslab starting offset
+  INTEGER(hsize_t), DIMENSION(1:1) :: hs_count = (/25/) ! hyperslab size
+  CHARACTER(LEN=1) :: ichr1 ! character conversion holder
+  INTEGER :: error ! error status
+  TYPE(C_PTR) :: f_ptr ! fortran pointer
+  INTEGER(HSIZE_T) :: sizeof_part
+
+  CHARACTER(LEN=1,KIND=C_CHAR), DIMENSION(1:30) :: temparray
+
+  temparray(1:30)(1:1) = '0' ! 1 byte character
+
+  ! Write the data to external files directly
+  DO i = 1, 4
+     DO j = 1, 25
+        part(j) = INT((i-1_size_t)*25_size_t+(j-1_size_t))
+     ENDDO
+     WRITE(ichr1,'(I1.1)') i
+     filename = "extern_"//ichr1//"a.raw"
+     OPEN(10, FILE=filename, ACCESS='STREAM', form='UNFORMATTED')
+
+     WRITE(10) temparray(1:(i-1)*10)
+     WRITE(10) part
+     CLOSE(10)
+  ENDDO
+  !
+  ! Create the file and an initial group.
+  CALL h5pcreate_f(H5P_FILE_ACCESS_F, fapl, error)
+  CALL h5fcreate_f('extern_raw.h5', H5F_ACC_TRUNC_F, file, error, access_prp=fapl)
+  CALL check("h5fcreate_f",error,total_error)
+
+  CALL h5gcreate_f(file, "emit-diagnostics", grp, error)
+  CALL check("h5gcreate_f",error, total_error)
+
+  ! Create the dataset
+
+  sizeof_part = INT(H5_SIZEOF(part(1))*25, hsize_t)
+
+  CALL h5pcreate_f(H5P_DATASET_CREATE_F, dcpl, error)
+  CALL check("h5pcreate_f", error, total_error)
+  CALL h5pset_external_f(dcpl, "extern_1a.raw", INT(0,off_t), sizeof_part, error)
+  CALL check("h5pset_external_f",error,total_error)
+  CALL h5pset_external_f(dcpl, "extern_2a.raw", INT(10,off_t), sizeof_part, error)
+  CALL check("h5pset_external_f",error,total_error)
+  CALL h5pset_external_f(dcpl, "extern_3a.raw", INT(20,off_t), sizeof_part, error)
+  CALL check("h5pset_external_f",error,total_error)
+  CALL h5pset_external_f(dcpl, "extern_4a.raw", INT(30,off_t), sizeof_part, error)
+  CALL check("h5pset_external_f",error,total_error)
+
+  cur_size(1) = 100
+  CALL h5screate_simple_f(1, cur_size, space, error)
+  CALL check("h5screate_simple_f", error, total_error)
+  CALL h5dcreate_f(file, "dset1", H5T_NATIVE_INTEGER, space, dset,error,dcpl_id=dcpl)
+  CALL check("h5dcreate_f", error, total_error)
+
+  !
+  ! Read the entire dataset and compare with the original
+  whole(:) = 0
+  f_ptr = C_LOC(whole(1))
+  CALL h5dread_f(dset, H5T_NATIVE_INTEGER, f_ptr, error, mem_space_id=space, file_space_id=space)
+  CALL check("h5dread_f", error, total_error)
+
+  DO i = 1, 100
+     IF(whole(i) .NE. i-1)THEN
+        WRITE(*,*) "Incorrect value(s) read."
+        total_error =  total_error + 1
+        EXIT
+     ENDIF
+  ENDDO
+  !
+  ! Read the middle of the dataset
+  CALL h5scopy_f(space, hs_space, error)
+  CALL check("h5scopy_f", error, total_error)
+  CALL h5sselect_hyperslab_f(hs_space, H5S_SELECT_SET_F, hs_start, hs_count, error)
+  CALL check("h5sselect_hyperslab_f", error, total_error)
+
+  whole(:) = 0
+  f_ptr = C_LOC(whole(1))
+  CALL h5dread_f(dset, H5T_NATIVE_INTEGER, f_ptr, error, mem_space_id=hs_space, file_space_id=hs_space)
+  CALL check("h5dread_f", error, total_error)
+
+  CALL h5sclose_f(hs_space, error)
+  CALL check("h5sclose_f", error, total_error)
+  DO i = INT(hs_start(1))+1, INT(hs_start(1)+hs_count(1))
+     IF(whole(i) .NE. i-1)THEN
+        WRITE(*,*) "Incorrect value(s) read."
+        total_error =  total_error + 1
+        EXIT
+     ENDIF
+  ENDDO
+
+  CALL h5dclose_f(dset, error)
+  CALL check("h5dclose_f", error, total_error)
+  CALL h5pclose_f(dcpl, error)
+  CALL check("h5pclose_f", error, total_error)
+  CALL h5sclose_f(space, error)
+  CALL check("h5sclose_f", error, total_error)
+  CALL h5fclose_f(file, error)
+  CALL check("h5fclose_f", error, total_error)
+
+  ! cleanup
+  DO i = 1, 4
+     WRITE(ichr1,'(I1.1)') i
+     filename = "extern_"//ichr1//"a.raw"
+     CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
+     CALL check("h5_cleanup_f", error, total_error)
+  ENDDO
+  IF(cleanup) CALL h5_cleanup_f("extern_raw.h5", H5P_DEFAULT_F, error)
+  CALL check("h5_cleanup_f", error, total_error)
+
+END SUBROUTINE external_test_offset
+
+!-------------------------------------------------------------------------
+! NAME
+!  test_vds
+!
+! FUNCTION
+!  Tests VDS API wrappers
+!
+! RETURNS:
+!   Success:	0
+!   Failure:	number of errors
+!
+! FORTRAN Programmer:  M. Scot Breitenfeld
+!                      February 1, 2016
+!
+!-------------------------------------------------------------------------
+!
+SUBROUTINE test_vds(total_error)
+
+  USE ISO_C_BINDING
+  IMPLICIT NONE
+
+  INTEGER, INTENT(INOUT) :: total_error
+
+  CHARACTER(LEN=6), PARAMETER ::  VFILENAME="vds.h5"
+  CHARACTER(LEN=3), PARAMETER :: DATASET="VDS"
+  INTEGER(hsize_t) :: VDSDIM0
+  INTEGER(hsize_t), PARAMETER :: VDSDIM1 = 10
+  INTEGER(hsize_t), PARAMETER :: VDSDIM2 = 15
+
+  INTEGER(hsize_t) :: DIM0
+  INTEGER, PARAMETER :: DIM0_1= 4  ! Initial size of the source datasets
+  INTEGER, PARAMETER :: DIM1 = 10
+  INTEGER, PARAMETER :: DIM2 = 15
+  INTEGER, PARAMETER :: RANK =  3
+  INTEGER(hsize_t), PARAMETER :: PLANE_STRIDE = 4
+
+  CHARACTER(LEN=4), DIMENSION(1:PLANE_STRIDE) :: SRC_FILE = (/"a.h5","b.h5","c.h5","d.h5"/)
+  CHARACTER(LEN=3), DIMENSION(1:PLANE_STRIDE) :: SRC_DATASET = (/"AAA","BBB","CCC","DDD"/)
+
+
+  INTEGER(hid_t) :: vfile, file, src_space, mem_space, vspace, vdset, dset !Handles
+  INTEGER(hid_t) :: dcpl, dapl
+  INTEGER :: error
+  INTEGER(hsize_t), DIMENSION(1:3) :: &
+       vdsdims = (/4_hsize_t*INT(DIM0_1,hsize_t), VDSDIM1, VDSDIM2/), &
+                 vdsdims_max, &
+                 dims = (/DIM0_1, DIM1, DIM2/), &
+                 memdims = (/DIM0_1, DIM1, DIM2/), &
+                 extdims = (/0, DIM1, DIM2/), & ! Dimensions of the extended source datasets
+                 chunk_dims = (/DIM0_1, DIM1, DIM2/), &
+                 dims_max, &
+                 vdsdims_out, vdsdims_max_out, &
+                 start, &                   ! Hyperslab parameters
+                 stride, &
+                 count, &
+                 src_count, block
+  INTEGER(hsize_t), DIMENSION(1:2,1:3) :: vdsdims_out_correct
+
+  INTEGER(hsize_t), DIMENSION(1:3) :: start_out, &  !Hyperslab PARAMETER out
+                 stride_out, count_out, block_out
+  INTEGER(hsize_t), DIMENSION(1:3,1:PLANE_STRIDE) :: start_correct
+
+  INTEGER :: i, j
+  INTEGER(size_t) :: i_sz
+  INTEGER :: layout                     ! Storage layout
+  INTEGER(size_t) :: num_map            ! Number of mappings
+  INTEGER(size_t) :: len                ! Length of the string also a RETURN value
+  ! Different sized character buffers
+  CHARACTER(len=LEN(SRC_FILE(1))-3)  :: SRC_FILE_LEN_TINY
+  CHARACTER(len=LEN(SRC_FILE(1))-1)  :: SRC_FILE_LEN_SMALL
+  CHARACTER(len=LEN(SRC_FILE(1)))    :: SRC_FILE_LEN_EXACT
+  CHARACTER(len=LEN(SRC_FILE(1))+1)  :: SRC_FILE_LEN_LARGE
+  CHARACTER(len=LEN(SRC_FILE(1))+10) :: SRC_FILE_LEN_HUGE
+  CHARACTER(len=LEN(SRC_DATASET(1))) :: SRC_DATASET_LEN_EXACT
+
+  INTEGER(HID_T) :: space_out
+
+  INTEGER :: s_type, virtual_view
+  INTEGER :: type1, type2
+
+  INTEGER, DIMENSION(DIM0_1*DIM1*DIM2), TARGET :: wdata
+  TYPE(C_PTR) :: f_ptr
+  INTEGER(SIZE_T) :: nsize
+  LOGICAL :: IsRegular
+  INTEGER(HSIZE_T) :: gap_size
+
+  ! For testing against
+  vdsdims_out_correct(1,1) = DIM0_1*5
+  vdsdims_out_correct(2,1) = DIM0_1*8
+  vdsdims_out_correct(1:2,2) = VDSDIM1
+  vdsdims_out_correct(1:2,3) = VDSDIM2
+
+  VDSDIM0 = H5S_UNLIMITED_F
+  DIM0 = H5S_UNLIMITED_F
+  vdsdims_max = (/VDSDIM0, VDSDIM1, VDSDIM2/)
+  dims_max = (/INT(DIM0,hsize_t), INT(DIM1,hsize_t), INT(DIM2,hsize_t)/)
+
+  !
+  ! Create source files and datasets.
+  !
+  DO i = 1, PLANE_STRIDE
+     !
+     ! Initialize data for i-th source dataset.
+     DO j = 1, DIM0_1*DIM1*DIM2
+        wdata(j) = i
+     ENDDO
+     !
+     ! Create the source files and  datasets. Write data to each dataset and
+     ! close all resources.
+     CALL h5fcreate_f(SRC_FILE(i), H5F_ACC_TRUNC_F, file, error)
+     CALL check("h5fcreate_f", error, total_error)
+
+     CALL h5screate_simple_f(RANK, dims,  src_space, error, dims_max)
+     CALL check("h5screate_simple_f", error, total_error)
+     CALL h5pcreate_f(H5P_DATASET_CREATE_F, dcpl, error)
+     CALL check("h5pcreate_f", error, total_error)
+     CALL h5pset_chunk_f(dcpl, RANK, chunk_dims, error)
+     CALL check("h5pset_chunk_f",error, total_error)
+
+     CALL h5dcreate_f(file, SRC_DATASET(i), H5T_NATIVE_INTEGER, src_space, dset, error, dcpl, H5P_DEFAULT_F, H5P_DEFAULT_F)
+     CALL check("h5dcreate_f",error, total_error)
+     f_ptr = C_LOC(wdata(1))
+     CALL H5Dwrite_f(dset, H5T_NATIVE_INTEGER, f_ptr, error)
+     CALL check("H5Dwrite_f",error, total_error)
+     CALL H5Sclose_f(src_space, error)
+     CALL check("H5Sclose_f",error, total_error)
+     CALL H5Pclose_f(dcpl, error)
+     CALL check("H5Pclose_f",error, total_error)
+     CALL H5Dclose_f(dset, error)
+     CALL check("H5Dclose_f",error, total_error)
+     CALL H5Fclose_f(file, error)
+     CALL check("H5Fclose_f",error, total_error)
+  ENDDO
+
+  CALL h5fcreate_f(VFILENAME, H5F_ACC_TRUNC_F, vfile, error)
+  CALL check("h5fcreate_f", error, total_error)
+
+  ! Create VDS dataspace.
+  CALL H5Screate_simple_f(RANK, vdsdims, vspace, error, vdsdims_max)
+  CALL check("H5Screate_simple_f", error, total_error)
+
+  ! Create dataspaces for the source dataset.
+  CALL H5Screate_simple_f(RANK, dims, src_space, error, dims_max)
+  CALL check("H5Screate_simple_f", error, total_error)
+
+  ! Create VDS creation property
+  CALL H5Pcreate_f (H5P_DATASET_CREATE_F, dcpl, error)
+  CALL check("H5Pcreate_f", error, total_error)
+
+  ! Initialize hyperslab values
+  start(1:3) = 0
+  stride(1:3) = (/PLANE_STRIDE,1_hsize_t,1_hsize_t/) ! we will select every fifth plane in VDS
+  count(1:3) = (/H5S_UNLIMITED_F,1_hsize_t,1_hsize_t/)
+  src_count(1:3) = (/H5S_UNLIMITED_F,1_hsize_t,1_hsize_t/)
+  block(1:3) = (/1, DIM1, DIM2/)
+
+  !
+  ! Build the mappings
+  !
+  start_correct = 0
+  CALL H5Sselect_hyperslab_f(src_space, H5S_SELECT_SET_F, start, src_count, error, block=block)
+  CALL check("H5Sselect_hyperslab_f", error, total_error)
+  DO i = 1, PLANE_STRIDE
+     start_correct(1,i) = start(1)
+     CALL H5Sselect_hyperslab_f(vspace, H5S_SELECT_SET_F, start, count, error, stride=stride, block=block)
+     CALL check("H5Sselect_hyperslab_f", error, total_error)
+
+     IF(i.eq.1)THEN ! check src_file and src_dataset with trailing blanks
+        CALL H5Pset_virtual_f (dcpl, vspace, SRC_FILE(i)//"   ", SRC_DATASET(i)//"   ", src_space, error)
+     ELSE
+        CALL H5Pset_virtual_f (dcpl, vspace, SRC_FILE(i), SRC_DATASET(i), src_space, error)
+     ENDIF
+     CALL check("H5Pset_virtual_f", error, total_error)
+     start(1) = start(1) + 1
+  ENDDO
+
+  CALL H5Sselect_none_f(vspace, error)
+  CALL check("H5Sselect_none_f", error, total_error)
+
+  ! Create a virtual dataset
+  CALL H5Dcreate_f(vfile, DATASET, H5T_NATIVE_INTEGER, vspace, vdset, error, dcpl, H5P_DEFAULT_F, H5P_DEFAULT_F)
+  CALL check("H5Dcreate_f", error, total_error)
+  CALL H5Sclose_f(vspace, error)
+  CALL check("H5Sclose_f", error, total_error)
+  CALL H5Sclose_f(src_space, error)
+  CALL check("H5Sclose_f", error, total_error)
+  CALL H5Pclose_f(dcpl, error)
+  CALL check("H5Pclose_f", error, total_error)
+
+  ! Let's add data to the source datasets and check new dimensions for VDS
+  ! We will add only one plane to the first source dataset, two planes to the
+  ! second one, three to the third, and four to the forth.
+
+  DO i = 1, PLANE_STRIDE
+     !
+     ! Initialize data for i-th source dataset.
+     DO j = 1, i*DIM1*DIM2
+        wdata(j) = 10*i
+     ENDDO
+
+     !
+     ! Open the source files and datasets. Append data to each dataset and
+     ! close all resources.
+     CALL H5Fopen_f (SRC_FILE(i), H5F_ACC_RDWR_F, file, error)
+     CALL check("H5Fopen_f", error, total_error)
+     CALL H5Dopen_f (file, SRC_DATASET(i), dset, error)
+     CALL check("H5Dopen_f", error, total_error)
+     extdims(1) = DIM0_1+i
+     CALL H5Dset_extent_f(dset, extdims, error)
+     CALL check("H5Dset_extent_f", error, total_error)
+     CALL H5Dget_space_f(dset, src_space, error)
+     CALL check("H5Dget_space_f", error, total_error)
+
+     start(1:3) = (/DIM0_1,0,0/)
+     count(1:3) = 1
+     block(1:3) = (/i, DIM1, DIM2/)
+
+     memdims(1) = i
+
+     CALL H5Screate_simple_f(RANK, memdims, mem_space, error)
+     CALL check("H5Screate_simple_f", error, total_error)
+
+     CALL H5Sselect_hyperslab_f(src_space, H5S_SELECT_SET_F, start,count, error,block=block)
+     CALL check("H5Sselect_hyperslab_f", error, total_error)
+     f_ptr = C_LOC(wdata(1))
+     CALL H5Dwrite_f(dset, H5T_NATIVE_INTEGER, f_ptr, error, mem_space, src_space, H5P_DEFAULT_F)
+     CALL check("H5Dwrite_f", error, total_error)
+     CALL H5Sclose_f(src_space, error)
+     CALL check("H5Sclose_f", error, total_error)
+     call H5Dclose_f(dset, error)
+     CALL check("H5Dclose_f", error, total_error)
+     call H5Fclose_f(file, error)
+     CALL check("H5Fclose_f", error, total_error)
+  ENDDO
+
+  call H5Dclose_f(vdset, error)
+  CALL check("H5Dclose_f", error, total_error)
+  call H5Fclose_f(vfile, error)
+  CALL check("H5Fclose_f", error, total_error)
+
+  !
+  ! begin the read section
+  !
+  ! Open file and dataset using the default properties.
+  CALL H5Fopen_f(VFILENAME, H5F_ACC_RDONLY_F, vfile, error)
+  CALL check("H5Fopen_f", error, total_error)
+
+  !
+  ! Open VDS using different access properties to use max or
+  ! min extents depending on the sizes of the underlying datasets
+  CALL H5Pcreate_f(H5P_DATASET_ACCESS_F, dapl, error)
+  CALL check("H5Pcreate_f", error, total_error)
+
+  DO i = 1, 2
+
+     IF(i.NE.1)THEN
+        CALL H5Pset_virtual_view_f(dapl, H5D_VDS_LAST_AVAILABLE_F, error)
+        CALL check("H5Pset_virtual_view_f", error, total_error)
+     ELSE
+        CALL H5Pset_virtual_view_f(dapl, H5D_VDS_FIRST_MISSING_F, error)
+        CALL check("H5Pset_virtual_view_f", error, total_error)
+     ENDIF
+
+     CALL H5Dopen_f(vfile, DATASET, vdset, error, dapl)
+     CALL check("H5Dopen_f", error, total_error)
+
+     ! Let's get space of the VDS and its dimension we should get 32(or 20)x10x10
+     CALL H5Dget_space_f(vdset, vspace, error)
+     CALL check("H5Dget_space_f", error, total_error)
+     CALL H5Sget_simple_extent_dims_f(vspace, vdsdims_out, vdsdims_max_out, error)
+     CALL check("H5Sget_simple_extent_dims_f", error, total_error)
+
+     ! check VDS dimensions
+     DO j = 1, RANK
+        IF(vdsdims_out(j).NE.vdsdims_out_correct(i,j))THEN
+           total_error = total_error + 1
+           EXIT
+        ENDIF
+     ENDDO
+
+     CALL H5Pget_virtual_view_f(dapl, virtual_view, error)
+     CALL check("h5pget_virtual_view_f", error, total_error)
+
+     IF(i.EQ.1)THEN
+        IF(virtual_view .NE. H5D_VDS_FIRST_MISSING_F)THEN
+           total_error = total_error + 1
+        ENDIF
+     ELSE
+        IF(virtual_view .NE. H5D_VDS_LAST_AVAILABLE_F)THEN
+           total_error = total_error + 1
+        ENDIF
+
+     ENDIF
+
+     ! Close
+     CALL H5Dclose_f(vdset, error)
+     CALL check("H5Dclose_f", error, total_error)
+     CALL H5Sclose_f(vspace, error)
+     CALL check("H5Sclose_f", error, total_error)
+  ENDDO
+
+  CALL H5Dopen_f(vfile, DATASET, vdset, error)
+  CALL check("H5Dopen_f", error, total_error)
+
+  !
+  ! Get creation property list and mapping properties.
+  !
+  CALL H5Dget_create_plist_f (vdset, dcpl, error)
+  CALL check("H5Dget_create_plist_f", error, total_error)
+
+  !
+  ! Get storage layout.
+  CALL H5Pget_layout_f(dcpl, layout, error)
+  CALL check("H5Pget_layout_f", error, total_error)
+
+  IF (H5D_VIRTUAL_F .NE. layout) THEN
+     PRINT*,"Wrong layout found"
+     total_error = total_error + 1
+  ENDIF
+
+  !
+  ! Find number of mappings.
+
+  CALL H5Pget_virtual_count_f(dcpl, num_map, error)
+  CALL check("H5Pget_virtual_count_f", error, total_error)
+
+  IF(num_map.NE.4_size_t)THEN
+     PRINT*,"Number of mappings is incorrect"
+     total_error = total_error + 1
+  ENDIF
+  !
+  ! Get mapping parameters for each mapping.
+  !
+  DO i_sz = 1, num_map
+     CALL H5Pget_virtual_vspace_f(dcpl, INT(i_sz-1,size_t), vspace, error)
+     CALL check("H5Pget_virtual_vspace_f", error, total_error)
+
+     CALL h5sget_select_type_f(vspace, s_type, error)
+     CALL check("h5sget_select_type_f", error, total_error)
+     IF(s_type.EQ.H5S_SEL_HYPERSLABS_F)THEN
+        CALL H5Sis_regular_hyperslab_f(vspace, IsRegular, error)
+        CALL check("H5Sis_regular_hyperslab_f", error, total_error)
+
+        IF(IsRegular)THEN
+           CALL H5Sget_regular_hyperslab_f(vspace, start_out, stride_out, count_out, block_out, error)
+           CALL check("H5Sget_regular_hyperslab_f", error, total_error)
+           DO j = 1, 3
+              IF(start_out(j).NE.start_correct(j,i_sz) .OR. &
+                   stride_out(j).NE.stride(j).OR. &
+                   count_out(j).NE.src_count(j))THEN
+                 total_error = total_error + 1
+                 EXIT
+              ENDIF
+           ENDDO
+        ENDIF
+     END IF
+
+     ! Get source file name
+     CALL H5Pget_virtual_filename_f(dcpl, INT(i-1, size_t), SRC_FILE_LEN_EXACT, error, nsize)
+     CALL check("H5Pget_virtual_filename_f", error, total_error)
+
+     IF(nsize.NE.LEN(SRC_FILE_LEN_EXACT))THEN
+        PRINT*,"virtual filename size is incorrect"
+        total_error = total_error + 1
+     ENDIF
+     ! check passing a buffer that is very small
+     CALL H5Pget_virtual_filename_f(dcpl, INT(i-1, size_t), SRC_FILE_LEN_TINY, error)
+     CALL check("H5Pget_virtual_filename_f", error, total_error)
+     IF(SRC_FILE_LEN_TINY.NE.SRC_FILE(i)(1:LEN(SRC_FILE_LEN_TINY)))THEN
+        PRINT*,"virtual filename returned is incorrect"
+        total_error = total_error + 1
+     ENDIF
+     ! check passing a buffer that small by one
+     CALL H5Pget_virtual_filename_f(dcpl, INT(i-1, size_t), SRC_FILE_LEN_SMALL, error)
+     CALL check("H5Pget_virtual_filename_f", error, total_error)
+     IF(SRC_FILE_LEN_SMALL.NE.SRC_FILE(i)(1:LEN(SRC_FILE_LEN_SMALL)))THEN
+        PRINT*,"virtual filename returned is incorrect"
+        total_error = total_error + 1
+     ENDIF
+     ! check passing a buffer that is exact
+     CALL H5Pget_virtual_filename_f(dcpl, INT(i-1, size_t), SRC_FILE_LEN_EXACT, error)
+     CALL check("H5Pget_virtual_filename_f", error, total_error)
+     IF(SRC_FILE_LEN_EXACT.NE.SRC_FILE(i)(1:LEN(SRC_FILE_LEN_EXACT)))THEN
+        PRINT*,"virtual filename returned is incorrect"
+        total_error = total_error + 1
+     ENDIF
+     ! check passing a buffer that bigger by one
+     CALL H5Pget_virtual_filename_f(dcpl, INT(i-1, size_t), SRC_FILE_LEN_LARGE, error)
+     CALL check("H5Pget_virtual_filename_f", error, total_error)
+     IF(SRC_FILE_LEN_LARGE(1:LEN(SRC_FILE_LEN_EXACT)).NE.SRC_FILE(i)(1:LEN(SRC_FILE_LEN_EXACT)).AND. &
+         SRC_FILE_LEN_LARGE(LEN(SRC_FILE_LEN_EXACT):).NE.'')THEN
+        PRINT*,"virtual filename returned is incorrect"
+        total_error = total_error + 1
+     ENDIF
+     ! check passing a buffer that is very big
+     CALL H5Pget_virtual_filename_f(dcpl, INT(i-1, size_t), SRC_FILE_LEN_HUGE, error)
+     CALL check("H5Pget_virtual_filename_f", error, total_error)
+     IF(SRC_FILE_LEN_HUGE(1:LEN(SRC_FILE_LEN_EXACT)).NE.SRC_FILE(i)(1:LEN(SRC_FILE_LEN_EXACT)).AND. &
+         SRC_FILE_LEN_HUGE(LEN(SRC_FILE_LEN_EXACT):).NE.'')THEN
+        PRINT*,"virtual filename returned is incorrect"
+        total_error = total_error + 1
+     ENDIF
+     ! Get source dataset name
+     CALL H5Pget_virtual_dsetname_f(dcpl, INT(i-1, size_t), SRC_DATASET_LEN_EXACT, error, nsize)
+     CALL check("H5Pget_virtual_dsetname_f", error, total_error)
+
+     CALL H5Pget_virtual_dsetname_f(dcpl, INT(i-1, size_t), SRC_DATASET_LEN_EXACT, error)
+     CALL check("H5Pget_virtual_dsetname_f", error, total_error)
+     IF(SRC_DATASET_LEN_EXACT(1:LEN(SRC_DATASET_LEN_EXACT)).NE.SRC_DATASET(i)(1:LEN(SRC_DATASET_LEN_EXACT)).AND. &
+         SRC_DATASET_LEN_EXACT(LEN(SRC_DATASET_LEN_EXACT):).NE.'')THEN
+        PRINT*,"virtual dataset returned is incorrect"
+        total_error = total_error + 1
+     ENDIF
+
+     CALL h5pget_virtual_srcspace_f(dcpl, i_sz - 1_size_t, space_out, error)
+     CALL check("H5Pget_virtual_srcspace_f", error, total_error)
+
+     CALL h5sget_select_type_f(space_out, type1, error)
+     CALL check("H5Sget_select_type_f", error, total_error)
+     CALL h5sget_select_type_f(vspace, type2, error)
+     CALL check("H5Sget_select_type_f", error, total_error)
+
+     IF(type1.NE.type2)THEN
+        total_error = total_error + 1
+     ENDIF
+
+  ENDDO
+  !
+  ! Close and release resources.
+
+  ! Clear virtual layout in DCPL
+  CALL h5pset_layout_f(dcpl, H5D_VIRTUAL_F,error)
+  CALL check("H5Pset_layout_f", error, total_error)
+
+  CALL H5Pclose_f(dcpl, error)
+  CALL check("H5Pclose_f", error, total_error)
+  CALL H5Dclose_f(vdset, error)
+  CALL check("H5Dclose_f", error, total_error)
+
+  ! Reopen VDS with printf gap set to 1
+
+  CALL H5Pset_virtual_printf_gap_f(dapl, 1_hsize_t, error)
+  CALL check("H5Pset_virtual_printf_gap_f", error, total_error)
+
+  CALL H5Dopen_f(vfile, DATASET, vdset, error, dapl)
+  CALL check("H5Dopen_f", error, total_error)
+
+  CALL H5Pget_virtual_printf_gap_f(dapl, gap_size, error)
+  CALL check("H5Pget_virtual_printf_gap_f", error, total_error)
+
+  IF(gap_size.NE.1_hsize_t)THEN
+     PRINT*,"gapsize is incorrect"
+     total_error = total_error + 1
+  ENDIF
+
+  CALL H5Dclose_f(vdset, error)
+  CALL check("H5Dclose_f", error, total_error)
+  CALL H5Sclose_f(vspace, error)
+  CALL check("H5Sclose_f", error, total_error)
+  CALL H5Pclose_f(dapl, error)
+  CALL check("H5Pclose_f", error, total_error)
+  CALL H5Fclose_f(vfile, error)
+  CALL check("H5Fclose_f", error, total_error)
+
+END SUBROUTINE test_vds
+
+
+END MODULE TH5P_F03
diff --git a/fortran/test/tH5P_F03.f90 b/fortran/test/tH5P_F03.f90
deleted file mode 100644
index 34fd0ad..0000000
--- a/fortran/test/tH5P_F03.f90
+++ /dev/null
@@ -1,633 +0,0 @@
-!****h* root/fortran/test/tH5P_F03.f90
-!
-! NAME
-!  tH5P_F03.f90
-!
-! FUNCTION
-!  Test FORTRAN HDF5 H5P APIs which are dependent on FORTRAN 2003
-!  features. 
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! USES
-!  test_genprop_cls_cb1_mod
-!
-! CONTAINS SUBROUTINES
-!  test_create, test_genprop_class_callback
-!
-!*****
-
-! *****************************************
-! ***        H 5 P   T E S T S
-! *****************************************
-MODULE test_genprop_cls_cb1_mod
-
-  ! Callback subroutine for test_genprop_class_callback
-  ! and the function H5Pcreate_class_f.
-
-  USE HDF5
-  USE ISO_C_BINDING
-  IMPLICIT NONE
-  
-  TYPE, BIND(C) :: cop_cb_struct_ !  Struct for iterations 
-    INTEGER :: count
-    INTEGER(HID_T) :: id
-  END TYPE cop_cb_struct_
-
-CONTAINS
-  
-  INTEGER FUNCTION test_genprop_cls_cb1_f(list_id, create_data ) bind(C)
-    
-    USE HDF5
-    USE ISO_C_BINDING
-    IMPLICIT NONE
-
-    INTEGER(HID_T), INTENT(IN), VALUE :: list_id
-    
-    TYPE(cop_cb_struct_) :: create_data
-
-    create_data%count = create_data%count + 1
-    create_data%id = list_id
-
-    test_genprop_cls_cb1_f = 0
-    
-  END FUNCTION test_genprop_cls_cb1_f
-
-END MODULE test_genprop_cls_cb1_mod
-
-MODULE TH5P_F03
-
-CONTAINS
-
-!-------------------------------------------------------------------------
-! * Function:	test_create
-! *
-! * Purpose:	Tests H5Pset_fill_value_f and H5Pget_fill_value_f
-! *
-! * Return:	Success:	0
-! *
-! *		Failure:	number of errors
-! *
-! * Programmer:	M. Scot Breitenfeld
-! *             June 24, 2008
-! *
-! * Modifications:
-! *
-! *-------------------------------------------------------------------------
-! 
-
-SUBROUTINE test_create(total_error)
-
-  USE HDF5 
-  USE TH5_MISC
-  USE ISO_C_BINDING
-  IMPLICIT NONE
-
-  INTEGER, INTENT(INOUT) :: total_error
-  INTEGER(HID_T) :: fapl
-
-  INTEGER(hid_t) :: file=-1, space=-1, dcpl=-1, comp_type_id=-1
-  INTEGER(hid_t) :: dset9=-1
-  INTEGER(hsize_t), DIMENSION(1:5), PARAMETER :: cur_size = (/2, 8, 8, 4, 2/)
-  INTEGER(hsize_t), DIMENSION(1:5), PARAMETER :: ch_size= (/1, 1, 1, 4, 1/)
-  CHARACTER(LEN=14) :: filename ='test_create.h5'
-
-  TYPE(comp_datatype), TARGET :: rd_c, fill_ctype
-  INTEGER :: error
-  INTEGER(SIZE_T) :: h5off
-  TYPE(C_PTR) :: f_ptr
-  LOGICAL :: differ1, differ2
-  CHARACTER(LEN=1) :: cfill
-  INTEGER :: ifill
-  REAL :: rfill
-  REAL(KIND=dp) :: dpfill
-
-  !
-  ! * Create a file.
-  ! 
-  CALL h5fcreate_f(filename,H5F_ACC_TRUNC_F,file,error)
-  CALL check("h5fcreate_f", error, total_error)   
-
-  CALL h5screate_simple_f(5, cur_size, space, error, cur_size)
-  CALL check("h5screate_simple_f", error, total_error)
-
-  CALL H5Pcreate_f(H5P_DATASET_CREATE_F, dcpl, error)
-  CALL check("H5Pcreate_f", error, total_error)
-
-  CALL h5pset_chunk_f(dcpl, 5, ch_size, error)
-  CALL check("h5pset_chunk_f",error, total_error)
-
-  !  Create a compound datatype 
-  CALL h5tcreate_f(H5T_COMPOUND_F, H5_SIZEOF(fill_ctype), comp_type_id, error)
-  CALL check("h5tcreate_f", error, total_error)
-  h5off = H5OFFSETOF(C_LOC(fill_ctype), C_LOC(fill_ctype%a))
-  CALL h5tinsert_f(comp_type_id, "a", h5off , H5T_NATIVE_REAL, error)
-  CALL check("h5tinsert_f", error, total_error)
-  CALL h5tinsert_f(comp_type_id, "x", H5OFFSETOF(C_LOC(fill_ctype), C_LOC(fill_ctype%x)), H5T_NATIVE_INTEGER, error)
-  CALL check("h5tinsert_f", error, total_error)
-  CALL h5tinsert_f(comp_type_id, "y", H5OFFSETOF(C_LOC(fill_ctype), C_LOC(fill_ctype%y)), H5T_NATIVE_DOUBLE, error)
-  CALL check("h5tinsert_f", error, total_error)
-  CALL h5tinsert_f(comp_type_id, "z", &
-       H5OFFSETOF(C_LOC(fill_ctype), C_LOC(fill_ctype%z)), H5T_NATIVE_CHARACTER, error)
-  CALL check("h5tinsert_f", error, total_error)
-
-
-  CALL H5Pset_alloc_time_f(dcpl, H5D_ALLOC_TIME_LATE_F,error)
-  CALL check("H5Pset_alloc_time_f",error, total_error)
-
-  CALL H5Pset_fill_time_f(dcpl, H5D_FILL_TIME_ALLOC_F, error)
-  CALL check("H5Pset_fill_time_f",error, total_error)
-
-  !  Compound datatype test 
-
-  f_ptr = C_LOC(fill_ctype)
-
-  CALL H5Pget_fill_value_f(dcpl, comp_type_id, f_ptr, error)
-  CALL check("H5Pget_fill_value_f",error, total_error)
-
-  fill_ctype%y = 4444.D0
-  fill_ctype%z = 'S'
-  fill_ctype%a = 5555.
-  fill_ctype%x = 55
-
-  f_ptr = C_LOC(fill_ctype)
-
-  ! Test various fill values
-  CALL H5Pset_fill_value_f(dcpl, H5T_NATIVE_CHARACTER, 'X', error)
-  CALL check("H5Pset_fill_value_f",error, total_error)
-  CALL h5pget_fill_value_f(dcpl, H5T_NATIVE_CHARACTER, cfill, error)
-  CALL check("H5Pget_fill_value_f",error, total_error)
-  IF(cfill.NE.'X')THEN
-     PRINT*,"***ERROR: Returned wrong fill value (character)"
-     total_error = total_error + 1
-  ENDIF
-  CALL H5Pset_fill_value_f(dcpl, H5T_NATIVE_INTEGER, 9, error)
-  CALL check("H5Pset_fill_value_f",error, total_error)
-  CALL h5pget_fill_value_f(dcpl, H5T_NATIVE_INTEGER, ifill, error)
-  CALL check("H5Pget_fill_value_f",error, total_error)
-  IF(ifill.NE.9)THEN
-     PRINT*,"***ERROR: Returned wrong fill value (integer)"
-     total_error = total_error + 1
-  ENDIF
-  CALL H5Pset_fill_value_f(dcpl, H5T_NATIVE_DOUBLE, 1.0_dp, error)
-  CALL check("H5Pset_fill_value_f",error, total_error)
-  CALL h5pget_fill_value_f(dcpl, H5T_NATIVE_DOUBLE, dpfill, error)
-  CALL check("H5Pget_fill_value_f",error, total_error)
-  IF(.NOT.dreal_eq( REAL(dpfill,dp), 1.0_dp))THEN
-     PRINT*,"***ERROR: Returned wrong fill value (double)"
-     total_error = total_error + 1
-  ENDIF
-  CALL H5Pset_fill_value_f(dcpl, H5T_NATIVE_REAL, 2.0, error)
-  CALL check("H5Pset_fill_value_f",error, total_error)
-  CALL h5pget_fill_value_f(dcpl, H5T_NATIVE_REAL, rfill, error)
-  CALL check("H5Pget_fill_value_f",error, total_error)
-  IF(.NOT.dreal_eq( REAL(rfill,dp), REAL(2.0,dp)))THEN
-     PRINT*,"***ERROR: Returned wrong fill value (real)"
-     total_error = total_error + 1
-  ENDIF
-
-  ! For the actual compound type
-  CALL H5Pset_fill_value_f(dcpl, comp_type_id, f_ptr, error)
-  CALL check("H5Pget_fill_value_f",error, total_error)
-
-  CALL h5dcreate_f(file,"dset9", comp_type_id, space, dset9, error, dcpl_id=dcpl)
-  CALL check("h5dcreate_f", error, total_error)
-
-  CALL h5dclose_f(dset9, error)
-  CALL check("h5dclose_f", error, total_error)
-
-  CALL h5fclose_f(file,error)
-  CALL check("h5fclose_f", error, total_error)
-
-  !  Open the file and get the dataset fill value from each dataset 
-  CALL H5Pcreate_f(H5P_FILE_ACCESS_F, fapl, error)
-  CALL check("H5Pcreate_f",error, total_error)
-
-  CALL H5Pset_libver_bounds_f(fapl, H5F_LIBVER_LATEST_F, H5F_LIBVER_LATEST_F, error)
-  CALL check("H5Pset_libver_bounds_f",error, total_error)
-
-  CALL h5fopen_f (FILENAME, H5F_ACC_RDONLY_F, file, error, fapl)
-  CALL check("h5fopen_f", error, total_error)
-
-  ! Compound datatype test 
-  CALL h5dopen_f(file, "dset9", dset9, error)
-  CALL check("h5dopen_f", error, total_error)
-
-  CALL H5Dget_create_plist_f(dset9, dcpl, error)
-  CALL check("H5Dget_create_plist_f", error, total_error)
-
-  f_ptr = C_LOC(rd_c)
-
-  CALL H5Pget_fill_value_f(dcpl, comp_type_id, f_ptr, error)
-  CALL check("H5Pget_fill_value_f", error, total_error)
-
-  IF( .NOT.dreal_eq( REAL(rd_c%a,dp), REAL(fill_ctype%a, dp)) .OR. &
-      .NOT.dreal_eq( REAL(rd_c%y,dp), REAL(fill_ctype%y, dp)) .OR. &
-      rd_c%x .NE. fill_ctype%x .OR. &
-      rd_c%z .NE. fill_ctype%z )THEN
-
-     PRINT*,"***ERROR: Returned wrong fill value"
-     total_error = total_error + 1
-
-  ENDIF
-
-  CALL h5dclose_f(dset9, error)
-  CALL check("h5dclose_f", error, total_error)
-
-  CALL H5Pclose_f(dcpl, error)
-  CALL check("H5Pclose_f", error, total_error)
-
-  CALL h5fclose_f(file,error)
-  CALL check("h5fclose_f", error, total_error)
-
-END SUBROUTINE test_create
-
-
-SUBROUTINE test_genprop_class_callback(total_error)
-
-  !
-  !
-  !  test_genprop_class_callback(): Test basic generic property list code.
-  !      Tests callbacks for property lists in a generic class.
-  !
-  !  FORTRAN TESTS:
-  !      Tests function H5Pcreate_class_f with callback.
-  !
-  !
-
-  USE HDF5
-  USE TH5_MISC
-  USE ISO_C_BINDING
-  USE test_genprop_cls_cb1_mod
-  IMPLICIT NONE
-
-  INTEGER, INTENT(INOUT) :: total_error
-
-  INTEGER(hid_t) :: cid1, cid2 ! Generic Property class ID 
-  INTEGER(hid_t) :: lid1, lid2 ! Generic Property list ID 
-  INTEGER(size_t) :: nprops ! Number of properties in class 
-
-  TYPE(cop_cb_struct_), TARGET :: crt_cb_struct, cls_cb_struct
-  INTEGER :: CLASS1_NAME_SIZE = 7 ! length of class string
-  CHARACTER(LEN=7) :: CLASS1_NAME = "Class 1", CLASS1_NAME_BUF
-  TYPE(C_FUNPTR) :: f1, f5
-  TYPE(C_PTR) :: f2, f6
-
-  CHARACTER(LEN=10) :: PROP1_NAME = "Property 1"
-  INTEGER(SIZE_T) :: PROP1_SIZE = 10
-  CHARACTER(LEN=10) :: PROP2_NAME = "Property 2"
-  INTEGER(SIZE_T) :: PROP2_SIZE = 10
-  CHARACTER(LEN=10) :: PROP3_NAME = "Property 3"
-  INTEGER(SIZE_T) :: PROP3_SIZE = 10
-  CHARACTER(LEN=10) :: PROP4_NAME = "Property 4"
-  INTEGER(SIZE_T) :: PROP4_SIZE = 10
-  INTEGER :: PROP1_DEF_VALUE = 10
-  INTEGER :: PROP2_DEF_VALUE = 10
-  INTEGER :: PROP3_DEF_VALUE = 10
-  INTEGER :: PROP4_DEF_VALUE = 10
-
-  INTEGER :: error !  Generic RETURN value	
-  LOGICAL :: flag  ! for tests
-
-  f1 = C_FUNLOC(test_genprop_cls_cb1_f)
-  f5 = C_FUNLOC(test_genprop_cls_cb1_f)
-
-  f2 = C_LOC(crt_cb_struct)
-  f6 = C_LOC(cls_cb_struct)
-
-  ! Create a new generic class, derived from the root of the class hierarchy 
-  CALL h5pcreate_class_f(h5p_ROOT_F, CLASS1_NAME, cid1, error, f1, f2, c_null_funptr, c_null_ptr, f5, f6)
-  CALL check("h5pcreate_class_f", error, total_error)
-
-  ! Insert first property into class (with no callbacks) 
-  CALL h5pregister_f(cid1, PROP1_NAME, PROP1_SIZE, PROP1_DEF_VALUE, error)
-  CALL check("h5pregister_f", error, total_error)
-  ! Insert second property into class (with no callbacks) 
-  CALL h5pregister_f(cid1, PROP2_NAME, PROP2_SIZE, PROP2_DEF_VALUE, error)
-  CALL check("h5pregister_f", error, total_error)
-  ! Insert third property into class (with no callbacks) 
-  CALL h5pregister_f(cid1, PROP3_NAME, PROP3_SIZE, PROP3_DEF_VALUE, error)
-  CALL check("h5pregister_f", error, total_error)
-
-  ! Insert fourth property into class (with no callbacks) 
-  CALL h5pregister_f(cid1, PROP4_NAME, PROP4_SIZE, PROP4_DEF_VALUE, error)
-  CALL check("h5pregister_f", error, total_error)
-
-  !  Check the number of properties in class 
-  CALL h5pget_nprops_f(cid1, nprops, error)
-  CALL check("h5pget_nprops_f", error, total_error)
-  CALL VERIFY("h5pget_nprops_f", INT(nprops), 4, total_error)
-
-  !  Initialize class callback structs 
-
-  crt_cb_struct%count = 0
-  crt_cb_struct%id    = -1
-  cls_cb_struct%count = 0
-  cls_cb_struct%id    = -1
-
-  ! Create a property list from the class 
-  CALL h5pcreate_f(cid1, lid1, error)
-  CALL check("h5pcreate_f", error, total_error)
-
-  ! Get the list's class 
-  CALL H5Pget_class_f(lid1, cid2, error)
-  CALL check("H5Pget_class_f", error, total_error)
-
-  !  Check that the list's class is correct 
-  CALL H5Pequal_f(cid2, cid1, flag, error)
-  CALL check("H5Pequal_f", error, total_error)
-  CALL verifylogical("H5Pequal_f", flag, .TRUE., total_error)
-
-  ! Check the class name
-  CALL H5Pget_class_name_f(cid2, CLASS1_NAME_BUF, CLASS1_NAME_SIZE, error)
-  CALL check("H5Pget_class_name_f", error, total_error)
-  CALL verifystring("H5Pget_class_name_f", CLASS1_NAME_BUF, CLASS1_NAME, error)
-  IF(error.NE.0)THEN
-     WRITE(*,*) 'Class names do not match! name=',CLASS1_NAME_BUF, 'CLASS1_NAME=',CLASS1_NAME
-     total_error = total_error + 1
-  ENDIF
-
-  ! Close class 
-  CALL h5pclose_class_f(cid2, error)
-  CALL check("h5pclose_class_f", error, total_error)
-
-  ! Verify that the creation callback occurred 
-  CALL VERIFY("h5pcreate_f", crt_cb_struct%count, 1, total_error)
-  CALL VERIFY("h5pcreate_f", INT(crt_cb_struct%id), INT(lid1), total_error)
-
-  !  Check the number of properties in list 
-  CALL h5pget_nprops_f(lid1,nprops, error)
-  CALL check("h5pget_nprops_f", error, total_error)
-  CALL VERIFY("h5pget_nprops_f", INT(nprops), 4, total_error)
-
-  !  Create another property list from the class 
-  CALL h5pcreate_f(cid1, lid2, error)
-  CALL check("h5pcreate_f", error, total_error)
-
-  !  Verify that the creation callback occurred 
-  CALL VERIFY("h5pcreate_f", crt_cb_struct%count, 2, total_error)
-  CALL VERIFY("h5pcreate_f", INT(crt_cb_struct%id), INT(lid2), total_error)
-
-  !  Check the number of properties in list 
-  CALL h5pget_nprops_f(lid2,nprops, error)
-  CALL check("h5pget_nprops_f", error, total_error)
-  CALL VERIFY("h5pget_nprops_f", INT(nprops), 4, total_error)
-
-  !  Close first list 
-  CALL h5pclose_f(lid1, error);
-  CALL check("h5pclose_f", error, total_error)
-
-  ! Verify that the close callback occurred 
-  CALL VERIFY("h5pcreate_f", cls_cb_struct%count, 1, total_error)
-  CALL VERIFY("h5pcreate_f", INT(cls_cb_struct%id), INT(lid1), total_error)
-
-  ! Close second list 
-  CALL h5pclose_f(lid2, error);
-  CALL check("h5pclose_f", error, total_error)
-
-  ! Verify that the close callback occurred 
-  CALL VERIFY("h5pcreate_f", cls_cb_struct%count, 2, total_error)
-  CALL VERIFY("h5pcreate_f", INT(cls_cb_struct%id), INT(lid2), total_error)
-
-  ! Close class 
-  CALL h5pclose_class_f(cid1, error)
-  CALL check("h5pclose_class_f", error, total_error)
-
-END SUBROUTINE test_genprop_class_callback
-
-!-------------------------------------------------------------------------
-! Function: test_h5p_file_image
-!
-! Purpose: Tests APIs:
-!          h5pget_file_image_f and h5pset_file_image_f
-!
-! Return:      Success: 0
-!              Failure: -1
-!
-! FORTRAN Programmer: M. Scot Breitenfeld
-!                     April 1, 2014
-!-------------------------------------------------------------------------
-
-SUBROUTINE test_h5p_file_image(total_error)
-
-  USE HDF5
-  USE TH5_MISC
-  USE, INTRINSIC :: iso_c_binding
-  IMPLICIT NONE
-  INTEGER, INTENT(INOUT) :: total_error
-  INTEGER(hid_t) ::   fapl_1 = -1
-  INTEGER, PARAMETER :: count = 10
-  INTEGER, DIMENSION(1:count), TARGET :: buffer
-  INTEGER, DIMENSION(1:count), TARGET :: temp
-  INTEGER :: i   
-  INTEGER(size_t) :: size
-  INTEGER(size_t) :: temp_size
-  INTEGER :: error ! error return value
-  TYPE(C_PTR) :: f_ptr
-  TYPE(C_PTR), DIMENSION(1:count) :: f_ptr1
-  TYPE(C_PTR), DIMENSION(1:1) :: f_ptr2
-
-  INTEGER(HSIZE_T) :: sizeof_buffer
-
-  ! Initialize file image buffer
-  DO i = 1, count
-     buffer(i) = i*10
-  ENDDO
-
-  ! Create fapl
-  CALL h5pcreate_f(H5P_FILE_ACCESS_F, fapl_1, error)
-  CALL check("h5pcreate_f", error, total_error)
-
-  ! Test with NULL ptr
-  f_ptr2(1) = C_NULL_PTR
-  temp_size = 1
-  CALL h5pget_file_image_f(fapl_1, f_ptr2, temp_size, error)
-  CALL check("h5pget_file_image_f", error, total_error)
-  CALL verify("h5pget_file_image_f", INT(temp_size), 0, total_error)
-
-  ! Set file image
-  f_ptr = C_LOC(buffer(1))
-  size = H5_SIZEOF(buffer(1))*count
-
-  CALL h5pset_file_image_f(fapl_1, f_ptr, size, error)
-  CALL check("h5pset_file_image_f", error, total_error)
-  
-  ! Get the same data back
-  DO i = 1, count
-     f_ptr1(i) = C_LOC(temp(i))
-  ENDDO
-
-  temp_size = 0
-  CALL h5pget_file_image_f(fapl_1, f_ptr1, temp_size, error)
-  CALL check("h5pget_file_image_f", error, total_error)
-
-  ! Check that sizes are the same, and that the buffers are identical but separate
-  CALL VERIFY("h5pget_file_image_f", INT(temp_size), INT(size), total_error)
-  
-  ! Verify the image data is correct
-  DO i = 1, count
-     CALL VERIFY("h5pget_file_image_f", temp(i), buffer(i), total_error)
-  ENDDO
-
-END SUBROUTINE test_h5p_file_image
-
-!-------------------------------------------------------------------------
-! Function: external_test_offset
-!
-! Purpose: Tests APIs:
-!      h5pset_external_f (with offsets not equal to zero), h5pget_external_f
-!
-! Return:      Success: 0
-!              Failure: -1
-!
-! FORTRAN Programmer: M. Scot Breitenfeld
-!                     January 10, 2012
-!-------------------------------------------------------------------------
-!
-SUBROUTINE external_test_offset(cleanup,total_error)
-
-  USE ISO_C_BINDING
-  USE TH5_MISC
-  USE HDF5 ! This module contains all necessary modules
-
-  IMPLICIT NONE
-  INTEGER, INTENT(INOUT) :: total_error
-  LOGICAL, INTENT(IN)  :: cleanup
-
-  INTEGER(hid_t) :: fapl=-1   ! file access property list
-  INTEGER(hid_t) :: file=-1   ! file to write to		
-  INTEGER(hid_t) :: dcpl=-1   ! dataset creation properties	
-  INTEGER(hid_t) :: space=-1  ! data space			
-  INTEGER(hid_t) :: dset=-1   ! dataset			
-  INTEGER(hid_t) :: grp=-1    ! group to emit diagnostics
-  INTEGER(size_t) :: i, j     ! miscellaneous counters	
-  CHARACTER(LEN=180) :: filename   ! file names
-  INTEGER, DIMENSION(1:25) :: part
-  INTEGER, DIMENSION(1:100), TARGET :: whole ! raw data buffers		
-  INTEGER(hsize_t), DIMENSION(1:1) :: cur_size ! current data space size	
-  INTEGER(hid_t) :: hs_space  ! hyperslab data space		
-  INTEGER(hsize_t), DIMENSION(1:1) :: hs_start = (/30/) ! hyperslab starting offset	
-  INTEGER(hsize_t), DIMENSION(1:1) :: hs_count = (/25/) ! hyperslab size
-  CHARACTER(LEN=1) :: ichr1 ! character conversion holder
-  INTEGER :: error ! error status
-  TYPE(C_PTR) :: f_ptr ! fortran pointer
-  INTEGER(HSIZE_T) :: sizeof_part
-
-  CHARACTER(LEN=1,KIND=C_CHAR), DIMENSION(1:30) :: temparray
-
-  temparray(1:30)(1:1) = '0' ! 1 byte character
-
-  ! Write the data to external files directly
-  DO i = 1, 4
-     DO j = 1, 25
-        part(j) = (i-1)*25+(j-1)
-     ENDDO
-     WRITE(ichr1,'(I1.1)') i
-     filename = "extern_"//ichr1//"a.raw"
-     OPEN(10, FILE=filename, ACCESS='STREAM', form='UNFORMATTED')
-     
-     WRITE(10) temparray(1:(i-1)*10)
-     WRITE(10) part
-     CLOSE(10)
-  ENDDO
-  !
-  ! Create the file and an initial group. 
-  CALL h5pcreate_f(H5P_FILE_ACCESS_F, fapl, error)
-  CALL h5fcreate_f('extren_raw.h5', H5F_ACC_TRUNC_F, file, error, access_prp=fapl)
-  CALL check("h5fcreate_f",error,total_error)
-  
-  CALL h5gcreate_f(file, "emit-diagnostics", grp, error)
-  CALL check("h5gcreate_f",error, total_error)
-  
-  ! Create the dataset
-
-  sizeof_part = INT(H5_SIZEOF(part(1))*25, hsize_t) 
-
-  CALL h5pcreate_f(H5P_DATASET_CREATE_F, dcpl, error)
-  CALL check("h5pcreate_f", error, total_error)
-  CALL h5pset_external_f(dcpl, "extern_1a.raw", INT(0,off_t), sizeof_part, error)
-  CALL check("h5pset_external_f",error,total_error)
-  CALL h5pset_external_f(dcpl, "extern_2a.raw", INT(10,off_t), sizeof_part, error)
-  CALL check("h5pset_external_f",error,total_error)
-  CALL h5pset_external_f(dcpl, "extern_3a.raw", INT(20,off_t), sizeof_part, error)
-  CALL check("h5pset_external_f",error,total_error)
-  CALL h5pset_external_f(dcpl, "extern_4a.raw", INT(30,off_t), sizeof_part, error)
-  CALL check("h5pset_external_f",error,total_error)
-  
-  cur_size(1) = 100
-  CALL h5screate_simple_f(1, cur_size, space, error)
-  CALL check("h5screate_simple_f", error, total_error)
-  CALL h5dcreate_f(file, "dset1", H5T_NATIVE_INTEGER, space, dset,error,dcpl_id=dcpl)
-  CALL check("h5dcreate_f", error, total_error)
-
-  !
-  ! Read the entire dataset and compare with the original
-  whole(:) = 0
-  f_ptr = C_LOC(whole(1))
-  CALL h5dread_f(dset, H5T_NATIVE_INTEGER, f_ptr, error, mem_space_id=space, file_space_id=space)
-  CALL check("h5dread_f", error, total_error)
-
-  DO i = 1, 100
-     IF(whole(i) .NE. i-1)THEN
-        WRITE(*,*) "Incorrect value(s) read."
-        total_error =  total_error + 1
-        EXIT
-     ENDIF
-  ENDDO
-  !
-  ! Read the middle of the dataset
-  CALL h5scopy_f(space, hs_space, error)
-  CALL check("h5scopy_f", error, total_error)
-  CALL h5sselect_hyperslab_f(hs_space, H5S_SELECT_SET_F, hs_start, hs_count, error)
-  CALL check("h5sselect_hyperslab_f", error, total_error)
-
-  whole(:) = 0
-  f_ptr = C_LOC(whole(1))
-  CALL h5dread_f(dset, H5T_NATIVE_INTEGER, f_ptr, error, mem_space_id=hs_space, file_space_id=hs_space)
-  CALL check("h5dread_f", error, total_error)
-
-  CALL h5sclose_f(hs_space, error)
-  CALL check("h5sclose_f", error, total_error)
-  DO i = INT(hs_start(1))+1, INT(hs_start(1)+hs_count(1))
-     IF(whole(i) .NE. i-1)THEN
-        WRITE(*,*) "Incorrect value(s) read."
-        total_error =  total_error + 1
-        EXIT
-     ENDIF
-  ENDDO
-  
-  CALL h5dclose_f(dset, error)
-  CALL check("h5dclose_f", error, total_error)
-  CALL h5pclose_f(dcpl, error)
-  CALL check("h5pclose_f", error, total_error)
-  CALL h5sclose_f(space, error)
-  CALL check("h5sclose_f", error, total_error)
-  CALL h5fclose_f(file, error)
-  CALL check("h5fclose_f", error, total_error)
-
-  ! cleanup
-  DO i = 1, 4
-     WRITE(ichr1,'(I1.1)') i
-     filename = "extern_"//ichr1//"a.raw"
-     CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
-     CALL check("h5_cleanup_f", error, total_error)
-  ENDDO
-  IF(cleanup) CALL h5_cleanup_f("extren_raw.h5", H5P_DEFAULT_F, error)
-  CALL check("h5_cleanup_f", error, total_error)
-
-END SUBROUTINE external_test_offset
-END MODULE TH5P_F03
diff --git a/fortran/test/tH5R.F90 b/fortran/test/tH5R.F90
new file mode 100644
index 0000000..7c5a374
--- /dev/null
+++ b/fortran/test/tH5R.F90
@@ -0,0 +1,480 @@
+!****h* root/fortran/test/tH5R.f90
+!
+! NAME
+!  tH5R.f90
+!
+! FUNCTION
+!  Basic testing of Fortran H5R, Reference Interface, APIs.
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+! NOTES
+!  Tests h5rcreate_f, h5rdereference_f, h5rget_name_f
+!  and H5Rget_object_type functions
+!
+! CONTAINS SUBROUTINES
+!  refobjtest, refregtest
+!
+!*****
+!
+MODULE TH5R
+
+  USE HDF5
+  USE TH5_MISC
+  USE TH5_MISC_GEN
+
+CONTAINS
+
+SUBROUTINE refobjtest(cleanup, total_error)
+  IMPLICIT NONE
+  LOGICAL, INTENT(IN)  :: cleanup
+  INTEGER, INTENT(INOUT) :: total_error
+
+  CHARACTER(LEN=9), PARAMETER :: filename = "reference"
+  CHARACTER(LEN=80) :: fix_filename
+  CHARACTER(LEN=8), PARAMETER :: dsetnamei = "INTEGERS"
+  CHARACTER(LEN=17), PARAMETER :: dsetnamer = "OBJECT_REFERENCES"
+  CHARACTER(LEN=6), PARAMETER :: groupname1 = "GROUP1"
+  CHARACTER(LEN=6), PARAMETER :: groupname2 = "GROUP2"
+
+  INTEGER(HID_T) :: file_id       ! File identifier
+  INTEGER(HID_T) :: grp1_id       ! Group identifier
+  INTEGER(HID_T) :: grp2_id       ! Group identifier
+  INTEGER(HID_T) :: dset1_id      ! Dataset identifier
+  INTEGER(HID_T) :: dsetr_id      ! Dataset identifier
+  INTEGER(HID_T) :: type_id       ! Type identifier
+  INTEGER(HID_T) :: space_id      ! Dataspace identifier
+  INTEGER(HID_T) :: spacer_id     ! Dataspace identifier
+  INTEGER     ::   error, obj_type
+  INTEGER(HSIZE_T), DIMENSION(1) :: dims = (/5/)
+  INTEGER(HSIZE_T), DIMENSION(1) :: dimsr= (/4/)
+  INTEGER(HSIZE_T), DIMENSION(1) :: my_maxdims = (/5/)
+  INTEGER :: rank = 1
+  INTEGER :: rankr = 1
+  TYPE(hobj_ref_t_f), DIMENSION(4) ::  ref
+  TYPE(hobj_ref_t_f), DIMENSION(4) ::  ref_out
+  INTEGER(HSIZE_T), DIMENSION(1) :: ref_dim
+  INTEGER, DIMENSION(5) :: DATA = (/1, 2, 3, 4, 5/)
+  INTEGER(HSIZE_T), DIMENSION(2) :: data_dims
+
+  CHARACTER(LEN=7) :: buf        ! buffer to hold the region name
+  CHARACTER(LEN=16) :: buf_big    ! buffer bigger then needed
+  INTEGER(SIZE_T) :: buf_size     ! returned size of the region buffer name
+
+  !
+  !Create a new file with Default file access and
+  !file creation properties .
+  !
+  CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
+  IF (error .NE. 0) THEN
+     WRITE(*,*) "Cannot modify filename"
+     STOP
+  ENDIF
+  CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
+  CALL check("h5fcreate_f",error,total_error)
+
+
+  !
+  ! Create a group inside the file
+  !
+  CALL h5gcreate_f(file_id, groupname1, grp1_id, error)
+  CALL check("h5gcreate_f",error,total_error)
+
+  !
+  ! Create a group inside the group GROUP1
+  !
+  CALL h5gcreate_f(grp1_id, groupname2, grp2_id, error)
+  CALL check("h5gcreate_f",error,total_error)
+
+  !
+  ! Create dataspaces for datasets
+  !
+  CALL h5screate_simple_f(rank, dims, space_id, error, maxdims=my_maxdims)
+  CALL check("h5screate_simple_f",error,total_error)
+  CALL h5screate_simple_f(rankr, dimsr, spacer_id, error)
+  CALL check("h5screate_simple_f",error,total_error)
+
+  !
+  ! Create integer dataset
+  !
+  CALL h5dcreate_f(file_id, dsetnamei, H5T_NATIVE_INTEGER, space_id, &
+       dset1_id, error)
+  CALL check("h5dcreate_f",error,total_error)
+  !
+  ! Create dataset to store references to the objects
+  !
+  CALL h5dcreate_f(file_id, dsetnamer, H5T_STD_REF_OBJ, spacer_id, &
+       dsetr_id, error)
+  CALL check("h5dcreate_f",error,total_error)
+  !
+  ! Create a datatype and store in the file
+  !
+  CALL h5tcopy_f(H5T_NATIVE_REAL, type_id, error)
+  CALL check("h5tcopy_f",error,total_error)
+  CALL h5tcommit_f(file_id, "MyType", type_id, error)
+  CALL check("h5tcommit_f",error,total_error)
+  !
+  !  Close dataspaces, groups and integer dataset
+  !
+  CALL h5sclose_f(space_id, error)
+  CALL check("h5sclose_f",error,total_error)
+  CALL h5sclose_f(spacer_id, error)
+  CALL check("h5sclose_f",error,total_error)
+  CALL h5dclose_f(dset1_id, error)
+  CALL check("h5dclose_f",error,total_error)
+  CALL h5tclose_f(type_id, error)
+  CALL check("h5tclose_f",error,total_error)
+  CALL h5gclose_f(grp1_id, error)
+  CALL check("h5gclose_f",error,total_error)
+  CALL h5gclose_f(grp2_id, error)
+  CALL check("h5gclose_f",error,total_error)
+
+  !
+  ! Create references to two groups, integer dataset and shared datatype
+  ! and write it to the dataset in the file
+  !
+  CALL h5rcreate_f(file_id, groupname1, ref(1), error)
+  CALL check("h5rcreate_f",error,total_error)
+  CALL h5rcreate_f(file_id, "/GROUP1/GROUP2", ref(2), error)
+  CALL check("h5rcreate_f",error,total_error)
+  CALL h5rcreate_f(file_id, dsetnamei, ref(3), error)
+  CALL check("h5rcreate_f",error,total_error)
+  CALL h5rcreate_f(file_id, "MyType", ref(4), error)
+  CALL check("h5rcreate_f",error,total_error)
+  ref_dim(1) = SIZE(ref)
+  CALL h5dwrite_f(dsetr_id, H5T_STD_REF_OBJ, ref, ref_dim, error)
+  CALL check("h5dwrite_f",error,total_error)
+
+  ! getting path to normal dataset in root group
+
+  CALL H5Rget_name_f(dsetr_id, ref(1), buf, error, buf_size )
+  CALL check("H5Rget_name_f", error, total_error)
+
+
+  CALL verify("H5Rget_name_f", INT(buf_size),7, total_error)
+  CALL verify("H5Rget_name_f", buf, "/GROUP1", total_error)
+
+  ! with buffer bigger then needed
+
+  CALL H5Rget_name_f(dsetr_id, ref(1), buf_big, error, buf_size )
+  CALL check("H5Rget_name_f", error, total_error)
+  CALL verify("H5Rget_name_f", INT(buf_size),7,total_error)
+  CALL verify("H5Rget_name_f", TRIM(buf_big), "/GROUP1", total_error)
+
+  ! getting path to dataset in /Group1
+
+  CALL H5Rget_name_f(dsetr_id, ref(2), buf_big, error, buf_size )
+  CALL check("H5Rget_name_f", error, total_error)
+  CALL verify("H5Rget_name_f", INT(buf_size),14,total_error)
+  CALL verify("H5Rget_name_f", TRIM(buf_big), "/GROUP1/GROUP2", total_error)
+
+  !
+  !Close the dataset
+  !
+  CALL h5dclose_f(dsetr_id, error)
+  CALL check("h5dclose_f",error,total_error)
+
+  !
+  ! Reopen the dataset with object references
+  !
+  CALL h5dopen_f(file_id, dsetnamer,dsetr_id,error)
+  CALL check("h5dopen_f",error,total_error)
+  ref_dim(1) = SIZE(ref_out)
+  CALL h5dread_f(dsetr_id, H5T_STD_REF_OBJ, ref_out, ref_dim, error)
+  CALL check("h5dread_f",error,total_error)
+
+  !
+  !get the third reference's type and Dereference it
+  !
+  CALL h5rget_object_type_f(dsetr_id, ref(3), obj_type, error)
+  CALL check("h5rget_object_type_f",error,total_error)
+  IF (obj_type == H5G_DATASET_F) THEN
+     CALL h5rdereference_f(dsetr_id, ref(3), dset1_id, error)
+     CALL check("h5rdereference_f",error,total_error)
+
+     data_dims(1) = 5
+     CALL h5dwrite_f(dset1_id, H5T_NATIVE_INTEGER, DATA, data_dims, error)
+     CALL check("h5dwrite_f",error,total_error)
+  END IF
+
+  !
+  !get the fourth reference's type and Dereference it
+  !
+  CALL h5rget_object_type_f(dsetr_id, ref(4), obj_type, error)
+  CALL check("h5rget_object_type_f",error,total_error)
+  IF (obj_type == H5G_TYPE_F) THEN
+     CALL h5rdereference_f(dsetr_id, ref(4), type_id, error)
+     CALL check("h5rdereference_f",error,total_error)
+  END IF
+
+  !
+  ! Close all objects.
+  !
+  CALL h5dclose_f(dset1_id, error)
+  CALL check("h5dclose_f",error,total_error)
+  CALL h5tclose_f(type_id, error)
+  CALL check("h5tclose_f",error,total_error)
+
+  CALL h5dclose_f(dsetr_id, error)
+  CALL check("h5dclose_f",error,total_error)
+  CALL h5fclose_f(file_id, error)
+  CALL check("h5fclose_f",error,total_error)
+
+  IF(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
+  CALL check("h5_cleanup_f", error, total_error)
+  RETURN
+
+END SUBROUTINE refobjtest
+!
+!   The following subroutine tests h5rget_region_f, h5rcreate_f, h5rget_name_f,
+!   and h5rdereference_f functionalities
+!
+SUBROUTINE refregtest(cleanup, total_error)
+
+  IMPLICIT NONE
+  LOGICAL, INTENT(IN)  :: cleanup
+  INTEGER, INTENT(INOUT) :: total_error
+
+  CHARACTER(LEN=6), PARAMETER :: filename = "Refreg"
+  CHARACTER(LEN=80) :: fix_filename
+  CHARACTER(LEN=6), PARAMETER :: dsetnamev = "MATRIX"
+  CHARACTER(LEN=17), PARAMETER :: dsetnamer = "REGION_REFERENCES"
+
+  CHARACTER(LEN=7) :: buf        ! buffer to hold the region name
+  CHARACTER(LEN=11) :: buf_big    ! buffer bigger then needed
+  CHARACTER(LEN=4) :: buf_small  ! buffer smaller then needed
+  INTEGER(SIZE_T) :: buf_size     ! returned size of the region buffer name
+  INTEGER(HID_T) :: file_id       ! File identifier
+  INTEGER(HID_T) :: space_id      ! Dataspace identifier
+  INTEGER(HID_T) :: spacer_id     ! Dataspace identifier
+  INTEGER(HID_T) :: dsetv_id      ! Dataset identifier
+  INTEGER(HID_T) :: dsetr_id      ! Dataset identifier
+  INTEGER     ::   error
+!  TYPE(hdset_reg_ref_t_f) , DIMENSION(1:2), TARGET :: ref
+  TYPE(hdset_reg_ref_t_f) , DIMENSION(1:2) :: ref
+  TYPE(hdset_reg_ref_t_f) , DIMENSION(1:2) :: ref_out
+  INTEGER(HSIZE_T), DIMENSION(2) :: ref_dim   = (/0,0/)
+  INTEGER(HSIZE_T), DIMENSION(2) :: data_dims ! = (/0,0/)
+  INTEGER(HSIZE_T), DIMENSION(2) :: dims      = (/2,9/)  ! Datasets dimensions
+  INTEGER(HSIZE_T), DIMENSION(1) :: dimsr     = (/2/)    !
+  INTEGER(HSIZE_T), DIMENSION(2) :: start     ! = (/0,0/)
+  INTEGER(HSIZE_T), DIMENSION(2) :: count     ! = (/0,0/)
+
+  INTEGER :: rankr = 1
+  INTEGER :: rank = 2
+!  INTEGER , DIMENSION(2,9), TARGET ::  DATA
+  INTEGER , DIMENSION(2,9) ::  DATA
+  INTEGER , DIMENSION(2,9) ::  data_out = 0
+  INTEGER(HSIZE_T) , DIMENSION(2,3) :: coord
+  INTEGER(SIZE_T) ::num_points = 3  ! Number of selected points
+!  type(c_ptr) :: f_ptr
+  coord = RESHAPE((/1,1,2,7,1,9/), (/2,3/))   ! Coordinates of selected points
+  DATA = RESHAPE ((/1,1,1,2,2,2,3,3,3,4,4,4,5,5,5,6,6,6/), (/2,9/))
+
+  ref_out(1)%ref = 0
+  ref_out(2)%ref = 0
+
+  !
+  !  Initialize FORTRAN predefined datatypes.
+  !
+  !          CALL h5init_types_f(error)
+  !              CALL check("h5init_types_f", error, total_error)
+  !
+  !  Create a new file.
+  !
+  CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
+  IF (error .NE. 0) THEN
+     WRITE(*,*) "Cannot modify filename"
+     STOP
+  ENDIF
+  CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
+  ! Default file access and file creation
+  ! properties are used.
+  CALL check("h5fcreate_f", error, total_error)
+  !
+  ! Create  dataspaces:
+  !
+  ! for dataset with references to dataset regions
+  !
+  CALL h5screate_simple_f(rankr, dimsr, spacer_id, error)
+  CALL check("h5screate_simple_f", error, total_error)
+  !
+  ! for integer dataset
+  !
+  CALL h5screate_simple_f(rank, dims, space_id, error)
+  CALL check("h5screate_simple_f", error, total_error)
+  !
+  ! Create  and write datasets:
+  !
+  ! Integer dataset
+  !
+  CALL h5dcreate_f(file_id, dsetnamev, H5T_NATIVE_INTEGER, space_id, &
+       dsetv_id, error)
+  CALL check("h5dcreate_f", error, total_error)
+  data_dims(1) = 2
+  data_dims(2) = 9
+
+!  f_ptr = c_loc(data)
+!  CALL h5dwrite_f(dsetv_id, H5T_NATIVE_INTEGER, f_ptr, error)
+
+  CALL h5dwrite_f(dsetv_id, H5T_NATIVE_INTEGER, DATA, data_dims, error)
+  CALL check("h5dwrite_f", error, total_error)
+
+  CALL h5dclose_f(dsetv_id, error)
+  CALL check("h5dclose_f", error, total_error)
+
+  !
+  ! Dataset with references
+  !
+  CALL h5dcreate_f(file_id, dsetnamer, H5T_STD_REF_DSETREG, spacer_id, &
+       dsetr_id, error)
+  CALL check("h5dcreate_f", error, total_error)
+  !
+  ! Create a reference to the hyperslab selection.
+  !
+  start(1) = 0
+  start(2) = 3
+  COUNT(1) = 2
+  COUNT(2) = 3
+  CALL h5sselect_hyperslab_f(space_id, H5S_SELECT_SET_F, &
+       start, count, error)
+  CALL check("h5sselect_hyperslab_f", error, total_error)
+  ref(1)%ref(:) = 0
+!  f_ptr = C_LOC(ref(1))
+!  CALL h5rcreate_f(file_id, dsetnamev, 1, space_id, f_ptr, error)
+  CALL h5rcreate_f(file_id, dsetnamev, space_id, ref(1), error)
+  CALL check("h5rcreate_f", error, total_error)
+
+  !
+  ! Create a reference to elements selection.
+  !
+  CALL h5sselect_none_f(space_id, error)
+  CALL check("h5sselect_none_f", error, total_error)
+  CALL h5sselect_elements_f(space_id, H5S_SELECT_SET_F, rank, num_points,&
+       coord, error)
+  CALL check("h5sselect_elements_f", error, total_error)
+  ref(2)%ref(:) = 0
+  CALL h5rcreate_f(file_id, dsetnamev, space_id, ref(2), error)
+  CALL check("h5rcreate_f", error, total_error)
+  !
+  ! Write dataset with the references.
+  !
+  ref_dim(1) = SIZE(ref)
+  CALL h5dwrite_f(dsetr_id, H5T_STD_REF_DSETREG, ref, ref_dim, error)
+  CALL check("h5dwrite_f", error, total_error)
+  !
+  ! Close all objects.
+  !
+  CALL h5sclose_f(space_id, error)
+  CALL check("h5sclose_f", error, total_error)
+  CALL h5sclose_f(spacer_id, error)
+  CALL check("h5sclose_f", error, total_error)
+  CALL h5dclose_f(dsetr_id, error)
+  CALL check("h5dclose_f", error, total_error)
+  CALL h5fclose_f(file_id, error)
+  CALL check("h5fclose_f", error, total_error)
+
+  !
+  ! Reopen the file to test selections.
+  !
+  CALL h5fopen_f (fix_filename, H5F_ACC_RDWR_F, file_id, error)
+  CALL check("h5fopen_f", error, total_error)
+  CALL h5dopen_f(file_id, dsetnamer, dsetr_id, error)
+  CALL check("h5dopen_f", error, total_error)
+  !
+  ! Read references to the dataset regions.
+  !
+  ref_dim(1) = SIZE(ref_out)
+  CALL h5dread_f(dsetr_id, H5T_STD_REF_DSETREG, ref_out, ref_dim, error)
+  CALL check("h5dread_f", error, total_error)
+
+  ! Get name of the dataset the first region reference points to using H5Rget_name_f
+  CALL H5Rget_name_f(dsetr_id, ref_out(1), buf, error, buf_size )
+  CALL check("H5Rget_name_f", error, total_error)
+  CALL verify("H5Rget_name_f", INT(buf_size),7,total_error)
+  CALL verify("H5Rget_name_f", buf, "/MATRIX", total_error)
+
+  ! Get name of the dataset the first region reference points to using H5Rget_name_f
+  ! buffer bigger then needed
+  CALL H5Rget_name_f(dsetr_id, ref_out(1), buf_big, error, buf_size )
+  CALL check("H5Rget_name_f", error, total_error)
+  CALL verify("H5Rget_name_f", INT(buf_size),7,total_error)
+  CALL verify("H5Rget_name_f", TRIM(buf_big), "/MATRIX", total_error)
+
+
+  ! Get name of the dataset the first region reference points to using H5Rget_name_f
+  ! buffer smaller then needed
+  CALL H5Rget_name_f(dsetr_id, ref_out(1), buf_small, error, buf_size )
+  CALL check("H5Rget_name_f", error, total_error)
+  CALL verify("H5Rget_name_f", INT(buf_size),7,total_error)
+  CALL verify("H5Rget_name_f", TRIM(buf_small), "/MAT", total_error)
+  !
+  ! Dereference the first reference.
+  !
+  CALL H5rdereference_f(dsetr_id, ref_out(1), dsetv_id, error)
+  CALL check("h5rdereference_f", error, total_error)
+  CALL H5rget_region_f(dsetr_id, ref_out(1), space_id, error)
+  CALL check("h5rget_region_f", error, total_error)
+
+  ! Get name of the dataset the second region reference points to using H5Rget_name_f
+  CALL H5Rget_name_f(dsetr_id, ref_out(2), buf, error) ! no optional size
+  CALL check("H5Rget_name_f", error, total_error)
+  CALL verify("H5Rget_name_f", TRIM(buf), "/MATRIX", total_error)
+  !
+  ! Read selected data from the dataset.
+  !
+  data_dims(1) = 2
+  data_dims(2) = 9
+  CALL h5dread_f(dsetv_id, H5T_NATIVE_INTEGER, data_out, data_dims, error, &
+       mem_space_id = space_id, file_space_id = space_id)
+  CALL check("h5dread_f", error, total_error)
+  CALL h5sclose_f(space_id, error)
+  CALL check("h5sclose_f", error, total_error)
+  CALL h5dclose_f(dsetv_id, error)
+  CALL check("h5dclose_f", error, total_error)
+  data_out = 0
+  !
+  ! Dereference the second reference.
+  !
+  CALL H5rdereference_f(dsetr_id, ref_out(2), dsetv_id, error)
+  CALL check("h5rdereference_f", error, total_error)
+
+  CALL H5rget_region_f(dsetr_id, ref_out(2), space_id, error)
+  CALL check("h5rget_region_f", error, total_error)
+  !
+  ! Read selected data from the dataset.
+  !
+  CALL h5dread_f(dsetv_id, H5T_NATIVE_INTEGER, data_out, data_dims, error, &
+       mem_space_id = space_id, file_space_id = space_id)
+  CALL check("h5dread_f", error, total_error)
+  !
+  ! Close all objects
+  !
+  CALL h5sclose_f(space_id, error)
+  CALL check("h5sclose_f", error, total_error)
+  CALL h5dclose_f(dsetv_id, error)
+  CALL check("h5dclose_f", error, total_error)
+  CALL h5dclose_f(dsetr_id, error)
+  CALL check("h5dclose_f", error, total_error)
+  CALL h5fclose_f(file_id, error)
+  CALL check("h5fclose_f", error, total_error)
+
+
+  IF(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
+  CALL check("h5_cleanup_f", error, total_error)
+  RETURN
+
+END SUBROUTINE refregtest
+
+END MODULE TH5R
diff --git a/fortran/test/tH5R.f90 b/fortran/test/tH5R.f90
deleted file mode 100644
index bd6264f..0000000
--- a/fortran/test/tH5R.f90
+++ /dev/null
@@ -1,486 +0,0 @@
-!****h* root/fortran/test/tH5R.f90
-!
-! NAME
-!  tH5R.f90
-!
-! FUNCTION
-!  Basic testing of Fortran H5R, Reference Interface, APIs.
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! NOTES
-!  Tests h5rcreate_f, h5rdereference_f, h5rget_name_f 
-!  and H5Rget_object_type functions
-!
-! CONTAINS SUBROUTINES
-!  refobjtest, refregtest
-!
-!*****
-!
-MODULE TH5R
-
-CONTAINS
-
-SUBROUTINE refobjtest(cleanup, total_error)
-  USE HDF5 ! This module contains all necessary modules
-  USE TH5_MISC
-  IMPLICIT NONE
-  LOGICAL, INTENT(IN)  :: cleanup
-  INTEGER, INTENT(INOUT) :: total_error
-
-  CHARACTER(LEN=9), PARAMETER :: filename = "reference"
-  CHARACTER(LEN=80) :: fix_filename
-  CHARACTER(LEN=8), PARAMETER :: dsetnamei = "INTEGERS"
-  CHARACTER(LEN=17), PARAMETER :: dsetnamer = "OBJECT_REFERENCES"
-  CHARACTER(LEN=6), PARAMETER :: groupname1 = "GROUP1"
-  CHARACTER(LEN=6), PARAMETER :: groupname2 = "GROUP2"
-
-  INTEGER(HID_T) :: file_id       ! File identifier
-  INTEGER(HID_T) :: grp1_id       ! Group identifier
-  INTEGER(HID_T) :: grp2_id       ! Group identifier
-  INTEGER(HID_T) :: dset1_id      ! Dataset identifier
-  INTEGER(HID_T) :: dsetr_id      ! Dataset identifier
-  INTEGER(HID_T) :: type_id       ! Type identifier
-  INTEGER(HID_T) :: space_id      ! Dataspace identifier
-  INTEGER(HID_T) :: spacer_id     ! Dataspace identifier
-  INTEGER     ::   error, obj_type
-  INTEGER(HSIZE_T), DIMENSION(1) :: dims = (/5/)
-  INTEGER(HSIZE_T), DIMENSION(1) :: dimsr= (/4/)
-  INTEGER(HSIZE_T), DIMENSION(1) :: my_maxdims = (/5/)
-  INTEGER :: rank = 1
-  INTEGER :: rankr = 1
-  TYPE(hobj_ref_t_f), DIMENSION(4) ::  ref
-  TYPE(hobj_ref_t_f), DIMENSION(4) ::  ref_out
-  INTEGER(HSIZE_T), DIMENSION(1) :: ref_dim
-  INTEGER, DIMENSION(5) :: DATA = (/1, 2, 3, 4, 5/)
-  INTEGER(HSIZE_T), DIMENSION(2) :: data_dims
-
-  CHARACTER(LEN=7) :: buf        ! buffer to hold the region name
-  CHARACTER(LEN=16) :: buf_big    ! buffer bigger then needed
-  INTEGER(SIZE_T) :: buf_size     ! returned size of the region buffer name
-
-  !
-  !Create a new file with Default file access and
-  !file creation properties .
-  !
-  CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
-  IF (error .NE. 0) THEN
-     WRITE(*,*) "Cannot modify filename"
-     STOP
-  ENDIF
-  CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
-  CALL check("h5fcreate_f",error,total_error)
-
-
-  !
-  ! Create a group inside the file
-  !
-  CALL h5gcreate_f(file_id, groupname1, grp1_id, error)
-  CALL check("h5gcreate_f",error,total_error)
-
-  !
-  ! Create a group inside the group GROUP1
-  !
-  CALL h5gcreate_f(grp1_id, groupname2, grp2_id, error)
-  CALL check("h5gcreate_f",error,total_error)
-
-  !
-  ! Create dataspaces for datasets
-  !
-  CALL h5screate_simple_f(rank, dims, space_id, error, maxdims=my_maxdims)
-  CALL check("h5screate_simple_f",error,total_error)
-  CALL h5screate_simple_f(rankr, dimsr, spacer_id, error)
-  CALL check("h5screate_simple_f",error,total_error)
-
-  !
-  ! Create integer dataset
-  !
-  CALL h5dcreate_f(file_id, dsetnamei, H5T_NATIVE_INTEGER, space_id, &
-       dset1_id, error)
-  CALL check("h5dcreate_f",error,total_error)
-  !
-  ! Create dataset to store references to the objects
-  !
-  CALL h5dcreate_f(file_id, dsetnamer, H5T_STD_REF_OBJ, spacer_id, &
-       dsetr_id, error)
-  CALL check("h5dcreate_f",error,total_error)
-  !
-  ! Create a datatype and store in the file
-  !
-  CALL h5tcopy_f(H5T_NATIVE_REAL, type_id, error)
-  CALL check("h5tcopy_f",error,total_error)
-  CALL h5tcommit_f(file_id, "MyType", type_id, error)
-  CALL check("h5tcommit_f",error,total_error)
-
-  !
-  !  Close dataspaces, groups and integer dataset
-  !
-  CALL h5sclose_f(space_id, error)
-  CALL check("h5sclose_f",error,total_error)
-  CALL h5sclose_f(spacer_id, error)
-  CALL check("h5sclose_f",error,total_error)
-  CALL h5dclose_f(dset1_id, error)
-  CALL check("h5dclose_f",error,total_error)
-  CALL h5tclose_f(type_id, error)
-  CALL check("h5tclose_f",error,total_error)
-  CALL h5gclose_f(grp1_id, error)
-  CALL check("h5gclose_f",error,total_error)
-  CALL h5gclose_f(grp2_id, error)
-  CALL check("h5gclose_f",error,total_error)
-
-  !
-  ! Craete references to two groups, integer dataset and shared datatype
-  ! and write it to the dataset in the file
-  !
-  CALL h5rcreate_f(file_id, groupname1, ref(1), error)
-  CALL check("h5rcreate_f",error,total_error)
-  CALL h5rcreate_f(file_id, "/GROUP1/GROUP2", ref(2), error)
-  CALL check("h5rcreate_f",error,total_error)
-  CALL h5rcreate_f(file_id, dsetnamei, ref(3), error)
-  CALL check("h5rcreate_f",error,total_error)
-  CALL h5rcreate_f(file_id, "MyType", ref(4), error)
-  CALL check("h5rcreate_f",error,total_error)
-  ref_dim(1) = SIZE(ref)
-  CALL h5dwrite_f(dsetr_id, H5T_STD_REF_OBJ, ref, ref_dim, error)
-  CALL check("h5dwrite_f",error,total_error)
-
-  ! getting path to normal dataset in root group
-
-  CALL H5Rget_name_f(dsetr_id, ref(1), buf, error, buf_size )
-  CALL check("H5Rget_name_f", error, total_error)
-
-
-  CALL VERIFY("H5Rget_name_f", INT(buf_size),7, total_error)
-  CALL VerifyString("H5Rget_name_f", buf, "/GROUP1", total_error)
-
-  ! with buffer bigger then needed
-
-  CALL H5Rget_name_f(dsetr_id, ref(1), buf_big, error, buf_size )
-  CALL check("H5Rget_name_f", error, total_error)
-  CALL VERIFY("H5Rget_name_f", INT(buf_size),7,total_error)
-  CALL VerifyString("H5Rget_name_f", TRIM(buf_big), "/GROUP1", total_error)
-
-  ! getting path to dataset in /Group1
-
-  CALL H5Rget_name_f(dsetr_id, ref(2), buf_big, error, buf_size )
-  CALL check("H5Rget_name_f", error, total_error)
-  CALL VERIFY("H5Rget_name_f", INT(buf_size),14,total_error)
-  CALL VerifyString("H5Rget_name_f", TRIM(buf_big), "/GROUP1/GROUP2", total_error)
-
-  !
-  !Close the dataset
-  !
-  CALL h5dclose_f(dsetr_id, error)
-  CALL check("h5dclose_f",error,total_error)
-
-  !
-  ! Reopen the dataset with object references
-  !
-  CALL h5dopen_f(file_id, dsetnamer,dsetr_id,error)
-  CALL check("h5dopen_f",error,total_error)
-  ref_dim(1) = SIZE(ref_out)
-  CALL h5dread_f(dsetr_id, H5T_STD_REF_OBJ, ref_out, ref_dim, error)
-  CALL check("h5dread_f",error,total_error)
-
-  !
-  !get the third reference's type and Dereference it
-  !
-  CALL h5rget_object_type_f(dsetr_id, ref(3), obj_type, error)
-  CALL check("h5rget_object_type_f",error,total_error)
-  IF (obj_type == H5G_DATASET_F) THEN
-     CALL h5rdereference_f(dsetr_id, ref(3), dset1_id, error)
-     CALL check("h5rdereference_f",error,total_error)
-
-     data_dims(1) = 5
-     CALL h5dwrite_f(dset1_id, H5T_NATIVE_INTEGER, DATA, data_dims, error)
-     CALL check("h5dwrite_f",error,total_error)
-  END IF
-
-  !
-  !get the fourth reference's type and Dereference it
-  !
-  CALL h5rget_object_type_f(dsetr_id, ref(4), obj_type, error)
-  CALL check("h5rget_object_type_f",error,total_error)
-  IF (obj_type == H5G_TYPE_F) THEN
-     CALL h5rdereference_f(dsetr_id, ref(4), type_id, error)
-     CALL check("h5rdereference_f",error,total_error)
-  END IF
-
-  !
-  ! Close all objects.
-  !
-  CALL h5dclose_f(dset1_id, error)
-  CALL check("h5dclose_f",error,total_error)
-  CALL h5tclose_f(type_id, error)
-  CALL check("h5tclose_f",error,total_error)
-
-  CALL h5dclose_f(dsetr_id, error)
-  CALL check("h5dclose_f",error,total_error)
-  CALL h5fclose_f(file_id, error)
-  CALL check("h5fclose_f",error,total_error)
-
-
-  IF(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
-  CALL check("h5_cleanup_f", error, total_error)
-  RETURN
-
-END SUBROUTINE refobjtest
-!
-!   The following subroutine tests h5rget_region_f, h5rcreate_f, h5rget_name_f,
-!   and h5rdereference_f functionalities
-!
-SUBROUTINE refregtest(cleanup, total_error)
-  USE HDF5 ! This module contains all necessary modules
-  USE TH5_MISC
-!  use iso_c_binding  ! NOTE: if this is uncommented, then need to move subroutine into another file.
-
-  IMPLICIT NONE
-  LOGICAL, INTENT(IN)  :: cleanup
-  INTEGER, INTENT(INOUT) :: total_error
-
-  CHARACTER(LEN=6), PARAMETER :: filename = "Refreg"
-  CHARACTER(LEN=80) :: fix_filename
-  CHARACTER(LEN=6), PARAMETER :: dsetnamev = "MATRIX"
-  CHARACTER(LEN=17), PARAMETER :: dsetnamer = "REGION_REFERENCES"
-
-  CHARACTER(LEN=7) :: buf        ! buffer to hold the region name
-  CHARACTER(LEN=11) :: buf_big    ! buffer bigger then needed
-  CHARACTER(LEN=4) :: buf_small  ! buffer smaller then needed
-  INTEGER(SIZE_T) :: buf_size     ! returned size of the region buffer name
-  INTEGER(HID_T) :: file_id       ! File identifier
-  INTEGER(HID_T) :: space_id      ! Dataspace identifier
-  INTEGER(HID_T) :: spacer_id     ! Dataspace identifier
-  INTEGER(HID_T) :: dsetv_id      ! Dataset identifier
-  INTEGER(HID_T) :: dsetr_id      ! Dataset identifier
-  INTEGER     ::   error
-!  TYPE(hdset_reg_ref_t_f) , DIMENSION(1:2), TARGET :: ref 
-  TYPE(hdset_reg_ref_t_f) , DIMENSION(1:2) :: ref 
-  TYPE(hdset_reg_ref_t_f) , DIMENSION(1:2) :: ref_out
-  INTEGER(HSIZE_T), DIMENSION(2) :: ref_dim   = (/0,0/)
-  INTEGER(HSIZE_T), DIMENSION(2) :: data_dims ! = (/0,0/)
-  INTEGER(HSIZE_T), DIMENSION(2) :: dims      = (/2,9/)  ! Datasets dimensions
-  INTEGER(HSIZE_T), DIMENSION(1) :: dimsr     = (/2/)    ! 
-  INTEGER(HSIZE_T), DIMENSION(2) :: start     ! = (/0,0/)
-  INTEGER(HSIZE_T), DIMENSION(2) :: count     ! = (/0,0/)
-
-  INTEGER :: rankr = 1
-  INTEGER :: rank = 2
-!  INTEGER , DIMENSION(2,9), TARGET ::  DATA 
-  INTEGER , DIMENSION(2,9) ::  DATA 
-  INTEGER , DIMENSION(2,9) ::  data_out = 0
-  INTEGER(HSIZE_T) , DIMENSION(2,3) :: coord
-  INTEGER(SIZE_T) ::num_points = 3  ! Number of selected points
-!  type(c_ptr) :: f_ptr
-  coord = RESHAPE((/1,1,2,7,1,9/), (/2,3/))   ! Coordinates of selected points
-  DATA = RESHAPE ((/1,1,1,2,2,2,3,3,3,4,4,4,5,5,5,6,6,6/), (/2,9/))
-
-  ref_out(1)%ref = 0
-  ref_out(2)%ref = 0
-
-  !
-  !  Initialize FORTRAN predefined datatypes.
-  !
-  !          CALL h5init_types_f(error)
-  !              CALL check("h5init_types_f", error, total_error)
-  !
-  !  Create a new file.
-  !
-  CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
-  IF (error .NE. 0) THEN
-     WRITE(*,*) "Cannot modify filename"
-     STOP
-  ENDIF
-  CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
-  ! Default file access and file creation
-  ! properties are used.
-  CALL check("h5fcreate_f", error, total_error)
-  !
-  ! Create  dataspaces:
-  !
-  ! for dataset with references to dataset regions
-  !
-  CALL h5screate_simple_f(rankr, dimsr, spacer_id, error)
-  CALL check("h5screate_simple_f", error, total_error)
-  !
-  ! for integer dataset
-  !
-  CALL h5screate_simple_f(rank, dims, space_id, error)
-  CALL check("h5screate_simple_f", error, total_error)
-  !
-  ! Create  and write datasets:
-  !
-  ! Integer dataset
-  !
-  CALL h5dcreate_f(file_id, dsetnamev, H5T_NATIVE_INTEGER, space_id, &
-       dsetv_id, error)
-  CALL check("h5dcreate_f", error, total_error)
-  data_dims(1) = 2
-  data_dims(2) = 9
-
-!  f_ptr = c_loc(data)
-!  CALL h5dwrite_f(dsetv_id, H5T_NATIVE_INTEGER, f_ptr, error)
-
-  CALL h5dwrite_f(dsetv_id, H5T_NATIVE_INTEGER, DATA, data_dims, error)
-  CALL check("h5dwrite_f", error, total_error)
-
-  CALL h5dclose_f(dsetv_id, error)
-  CALL check("h5dclose_f", error, total_error)
-
-  !
-  ! Dataset with references
-  !
-  CALL h5dcreate_f(file_id, dsetnamer, H5T_STD_REF_DSETREG, spacer_id, &
-       dsetr_id, error)
-  CALL check("h5dcreate_f", error, total_error)
-  !
-  ! Create a reference to the hyperslab selection.
-  !
-  start(1) = 0
-  start(2) = 3
-  COUNT(1) = 2
-  COUNT(2) = 3
-  CALL h5sselect_hyperslab_f(space_id, H5S_SELECT_SET_F, &
-       start, count, error)
-  CALL check("h5sselect_hyperslab_f", error, total_error)
-  ref(1)%ref(:) = 0
-!  f_ptr = C_LOC(ref(1))
-!  CALL h5rcreate_f(file_id, dsetnamev, 1, space_id, f_ptr, error) 
-  CALL h5rcreate_f(file_id, dsetnamev, space_id, ref(1), error)
-  CALL check("h5rcreate_f", error, total_error)
-
-  !
-  ! Create a reference to elements selection.
-  !
-  CALL h5sselect_none_f(space_id, error)
-  CALL check("h5sselect_none_f", error, total_error)
-  CALL h5sselect_elements_f(space_id, H5S_SELECT_SET_F, rank, num_points,&
-       coord, error)
-  CALL check("h5sselect_elements_f", error, total_error)
-  ref(2)%ref(:) = 0
-  CALL h5rcreate_f(file_id, dsetnamev, space_id, ref(2), error)
-  CALL check("h5rcreate_f", error, total_error)
-  !
-  ! Write dataset with the references.
-  !
-  ref_dim(1) = SIZE(ref)
-  CALL h5dwrite_f(dsetr_id, H5T_STD_REF_DSETREG, ref, ref_dim, error)
-  CALL check("h5dwrite_f", error, total_error)
-  !
-  ! Close all objects.
-  !
-  CALL h5sclose_f(space_id, error)
-  CALL check("h5sclose_f", error, total_error)
-  CALL h5sclose_f(spacer_id, error)
-  CALL check("h5sclose_f", error, total_error)
-  CALL h5dclose_f(dsetr_id, error)
-  CALL check("h5dclose_f", error, total_error)
-  CALL h5fclose_f(file_id, error)
-  CALL check("h5fclose_f", error, total_error)
-
-  !
-  ! Reopen the file to test selections.
-  !
-  CALL h5fopen_f (fix_filename, H5F_ACC_RDWR_F, file_id, error)
-  CALL check("h5fopen_f", error, total_error)
-  CALL h5dopen_f(file_id, dsetnamer, dsetr_id, error)
-  CALL check("h5dopen_f", error, total_error)
-  !
-  ! Read references to the dataset regions.
-  !
-  ref_dim(1) = SIZE(ref_out)
-  CALL h5dread_f(dsetr_id, H5T_STD_REF_DSETREG, ref_out, ref_dim, error)
-  CALL check("h5dread_f", error, total_error)
-
-  ! Get name of the dataset the first region reference points to using H5Rget_name_f
-  CALL H5Rget_name_f(dsetr_id, ref_out(1), buf, error, buf_size )
-  CALL check("H5Rget_name_f", error, total_error)
-  CALL VERIFY("H5Rget_name_f", INT(buf_size),7,total_error)
-  CALL VerifyString("H5Rget_name_f", buf, "/MATRIX", total_error)
-
-  ! Get name of the dataset the first region reference points to using H5Rget_name_f
-  ! buffer bigger then needed
-  CALL H5Rget_name_f(dsetr_id, ref_out(1), buf_big, error, buf_size )
-  CALL check("H5Rget_name_f", error, total_error)
-  CALL VERIFY("H5Rget_name_f", INT(buf_size),7,total_error)
-  CALL VerifyString("H5Rget_name_f", TRIM(buf_big), "/MATRIX", total_error)
-
-
-  ! Get name of the dataset the first region reference points to using H5Rget_name_f
-  ! buffer smaller then needed
-  CALL H5Rget_name_f(dsetr_id, ref_out(1), buf_small, error, buf_size )
-  CALL check("H5Rget_name_f", error, total_error)
-  CALL VERIFY("H5Rget_name_f", INT(buf_size),7,total_error)
-  CALL VerifyString("H5Rget_name_f", TRIM(buf_small), "/MAT", total_error)
-  !
-  ! Dereference the first reference.
-  !
-  CALL H5rdereference_f(dsetr_id, ref_out(1), dsetv_id, error)
-  CALL check("h5rdereference_f", error, total_error)
-  CALL H5rget_region_f(dsetr_id, ref_out(1), space_id, error)
-  CALL check("h5rget_region_f", error, total_error)
-
-  ! Get name of the dataset the second region reference points to using H5Rget_name_f
-  CALL H5Rget_name_f(dsetr_id, ref_out(2), buf, error) ! no optional size
-  CALL check("H5Rget_name_f", error, total_error)
-  CALL VerifyString("H5Rget_name_f", TRIM(buf), "/MATRIX", total_error)
-  !
-  ! Read selected data from the dataset.
-  !
-  data_dims(1) = 2
-  data_dims(2) = 9
-  CALL h5dread_f(dsetv_id, H5T_NATIVE_INTEGER, data_out, data_dims, error, &
-       mem_space_id = space_id, file_space_id = space_id)
-  CALL check("h5dread_f", error, total_error)
-  CALL h5sclose_f(space_id, error)
-  CALL check("h5sclose_f", error, total_error)
-  CALL h5dclose_f(dsetv_id, error)
-  CALL check("h5dclose_f", error, total_error)
-  data_out = 0
-  !
-  ! Dereference the second reference.
-  !
-  CALL H5rdereference_f(dsetr_id, ref_out(2), dsetv_id, error)
-  CALL check("h5rdereference_f", error, total_error)
-
-  CALL H5rget_region_f(dsetr_id, ref_out(2), space_id, error)
-  CALL check("h5rget_region_f", error, total_error)
-  !
-  ! Read selected data from the dataset.
-  !
-  CALL h5dread_f(dsetv_id, H5T_NATIVE_INTEGER, data_out, data_dims, error, &
-       mem_space_id = space_id, file_space_id = space_id)
-  CALL check("h5dread_f", error, total_error)
-  !
-  ! Close all objects
-  !
-  CALL h5sclose_f(space_id, error)
-  CALL check("h5sclose_f", error, total_error)
-  CALL h5dclose_f(dsetv_id, error)
-  CALL check("h5dclose_f", error, total_error)
-  CALL h5dclose_f(dsetr_id, error)
-  CALL check("h5dclose_f", error, total_error)
-  CALL h5fclose_f(file_id, error)
-  CALL check("h5fclose_f", error, total_error)
-
-
-  IF(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
-  CALL check("h5_cleanup_f", error, total_error)
-  RETURN
-
-END SUBROUTINE refregtest
-
-END MODULE TH5R
diff --git a/fortran/test/tH5S.F90 b/fortran/test/tH5S.F90
new file mode 100644
index 0000000..4bb6810
--- /dev/null
+++ b/fortran/test/tH5S.F90
@@ -0,0 +1,295 @@
+!****h* root/fortran/test/tH5S.f90
+!
+! NAME
+!  tH5S.f90
+!
+! FUNCTION
+!  Basic testing of Fortran H5S, Dataspace Interface, APIs.
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+! NOTES
+!  Tests the following functionalities:
+!   h5screate_f, h5scopy_f, h5screate_simple_f, h5sis_simple_f,
+!   h5sget_simple_extent_dims_f,h5sget_simple_extent_ndims_f
+!   h5sget_simple_extent_npoints_f, h5sget_simple_extent_type_f,
+!   h5sextent_copy_f, h5sset_extent_simple_f, h5sset_extent_none_f
+!
+! CONTAINS SUBROUTINES
+!  dataspace_basic_test
+!
+!*****
+MODULE TH5S
+
+  USE HDF5 ! This module contains all necessary modules
+  USE TH5_MISC
+  USE TH5_MISC_GEN
+
+CONTAINS
+
+        SUBROUTINE dataspace_basic_test(cleanup, total_error)
+
+
+          IMPLICIT NONE
+          LOGICAL, INTENT(IN)  :: cleanup
+          INTEGER, INTENT(INOUT) :: total_error
+
+          CHARACTER(LEN=10), PARAMETER :: filename1 = "basicspace" ! File1 name
+          CHARACTER(LEN=9), PARAMETER :: filename2 = "copyspace"  ! File2 name
+          CHARACTER(LEN=80) :: fix_filename1
+          CHARACTER(LEN=80) :: fix_filename2
+          CHARACTER(LEN=9), PARAMETER :: dsetname = "basicdset"       ! Dataset name
+
+          INTEGER(HID_T) :: file1_id, file2_id     ! File identifiers
+          INTEGER(HID_T) :: dset1_id, dset2_id     ! Dataset identifiers
+          INTEGER(HID_T) :: space1_id, space2_id   ! Dataspace identifiers
+
+          INTEGER(HSIZE_T), DIMENSION(2) :: dims1 = (/4,6/) ! Dataset dimensions
+          INTEGER(HSIZE_T), DIMENSION(2) :: maxdims1 = (/4,6/) ! maximum dimensions
+          INTEGER(HSIZE_T), DIMENSION(2) :: dims2 = (/6,6/) ! Dataset dimensions
+          INTEGER(HSIZE_T), DIMENSION(2) :: maxdims2 = (/6,6/) ! maximum dimensions
+          INTEGER(HSIZE_T), DIMENSION(2) :: dimsout, maxdimsout ! dimensions
+          INTEGER(HSIZE_T)   ::   npoints  !number of elements in the dataspace
+
+          INTEGER     ::   rank1 = 2               ! Dataspace1 rank
+          INTEGER     ::   rank2 = 2               ! Dataspace2 rank
+          INTEGER     ::   classtype               ! Dataspace class type
+
+          INTEGER, DIMENSION(4,6) :: data1_in, data1_out   ! Data input buffers
+          INTEGER, DIMENSION(6,6) :: data2_in, data2_out  ! Data output buffers
+          INTEGER     ::   error ! Error flag
+
+          LOGICAL     ::   flag  !flag to test datyspace is simple or not
+          INTEGER     :: i, j    !general purpose integers
+          INTEGER(HSIZE_T), DIMENSION(2) :: data_dims
+
+          !
+          ! Initialize the dset_data array.
+          !
+          do i = 1, 4
+             do j = 1, 6
+                data1_in(i,j) = (i-1)*6 + j;
+             end do
+          end do
+
+          do i = 1, 6
+             do j = 1, 6
+                data2_in(i,j) = i*6 + j;
+             end do
+          end do
+
+          !
+          !  Initialize FORTRAN predefined datatypes.
+          !
+!          CALL h5init_types_f(error)
+!              CALL check("h5init_types_f", error, total_error)
+
+          !
+          ! Create new files using default properties.
+          !
+          CALL h5_fixname_f(filename1, fix_filename1, H5P_DEFAULT_F, error)
+          if (error .ne. 0) then
+              write(*,*) "Cannot modify filename"
+              stop
+          endif
+          CALL h5fcreate_f(fix_filename1, H5F_ACC_TRUNC_F, file1_id, error)
+              CALL check("h5fcreate_f", error, total_error)
+
+          CALL h5_fixname_f(filename2, fix_filename2, H5P_DEFAULT_F, error)
+          if (error .ne. 0) then
+              write(*,*) "Cannot modify filename"
+              stop
+          endif
+          CALL h5fcreate_f(fix_filename2, H5F_ACC_TRUNC_F, file2_id, error)
+              CALL check("h5fcreate_f", error, total_error)
+
+          !
+          ! Create dataspace for file1.
+          !
+          CALL h5screate_simple_f(rank1, dims1, space1_id, error, maxdims1)
+              CALL check("h5screate_simple_f", error, total_error)
+          !
+          ! Copy space1_id to space2_id.
+          !
+          CALL h5scopy_f(space1_id, space2_id, error)
+              CALL check("h5scopy_f", error, total_error)
+
+          !
+          !Check whether copied space is simple.
+          !
+          CALL h5sis_simple_f(space2_id, flag, error)
+              CALL check("h5sissimple_f", error, total_error)
+          IF (.NOT. flag) write(*,*) "dataspace is not simple type"
+
+          !
+          !set the copied space to none.
+          !
+          CALL h5sset_extent_none_f(space2_id, error)
+              CALL check("h5sset_extent_none_f", error, total_error)
+
+          !
+          !copy the extent of space1_id to space2_id.
+          !
+          CALL h5sextent_copy_f(space2_id, space1_id, error)
+              CALL check("h5sextent_copy_f", error, total_error)
+
+          !
+          !get the copied space's dimensions.
+          !
+          CALL h5sget_simple_extent_dims_f(space2_id, dimsout, maxdimsout, error)
+              CALL check("h5sget_simple_extent_dims_f", error, total_error)
+          IF ((dimsout(1) .NE. dims1(1)) .OR. (dimsout(2) .NE. dims1(2)) ) THEN
+              write(*,*)"error occurred, copied dims not same"
+          END IF
+
+          !
+          !get the copied space's rank.
+          !
+          CALL h5sget_simple_extent_ndims_f(space2_id, rank2, error)
+              CALL check("h5sget_simple_extent_ndims_f", error, total_error)
+          IF (rank2 .NE. rank1) write(*,*)"error occurred, copied ranks not same"
+
+          !
+          !get the copied space's number of elements.
+          !
+          CALL h5sget_simple_extent_npoints_f(space2_id, npoints, error)
+              CALL check("h5sget_simple_extent_npoints_f", error, total_error)
+          IF (npoints .NE. 24) write(*,*)"error occurred, number of elements not correct"
+
+
+          !
+          !get the copied space's class type.
+          !
+          CALL h5sget_simple_extent_type_f(space2_id, classtype, error)
+              CALL check("h5sget_simple_extent_type_f", error, total_error)
+          IF (classtype .NE. 1) write(*,*)"class type not H5S_SIMPLE_f"
+
+          !
+          !set the copied space to none before extend the dimensions.
+          !
+          CALL h5sset_extent_none_f(space2_id, error)
+              CALL check("h5sset_extent_none_f", error, total_error)
+
+          !
+          !set the copied space to dim2 size.
+          !
+          CALL h5sset_extent_simple_f(space2_id, rank2, dims2, maxdims2, error)
+              CALL check("h5sset_extent_simple_f", error, total_error)
+
+          !
+          !get the copied space's dimensions.
+          !
+          CALL h5sget_simple_extent_dims_f(space2_id, dimsout, maxdimsout, error)
+              CALL check("h5sget_simple_extent_dims_f", error, total_error)
+          IF ((dimsout(1) .NE. dims2(1)) .OR. (dimsout(2) .NE. dims2(2)) ) THEN
+              write(*,*)"error occurred, copied dims not same"
+          END IF
+
+          !
+          ! Create the datasets with default properties in two files.
+          !
+          CALL h5dcreate_f(file1_id, dsetname, H5T_NATIVE_INTEGER, space1_id, &
+                           dset1_id, error)
+              CALL check("h5dcreate_f", error, total_error)
+
+          CALL h5dcreate_f(file2_id, dsetname, H5T_NATIVE_INTEGER, space2_id, &
+                           dset2_id, error)
+              CALL check("h5dcreate_f", error, total_error)
+
+          !
+          ! Write the datasets.
+          !
+          data_dims(1) = 4
+          data_dims(2) = 6
+          CALL h5dwrite_f(dset1_id, H5T_NATIVE_INTEGER, data1_in, data_dims, error)
+              CALL check("h5dwrite_f", error, total_error)
+
+          data_dims(1) = 6
+          data_dims(2) = 6
+          CALL h5dwrite_f(dset2_id, H5T_NATIVE_INTEGER, data2_in, data_dims, error)
+              CALL check("h5dwrite_f", error, total_error)
+
+          !
+          ! Read the first dataset.
+          !
+          data_dims(1) = 4
+          data_dims(2) = 6
+          CALL h5dread_f(dset1_id, H5T_NATIVE_INTEGER, data1_out, data_dims, error)
+              CALL check("h5dread_f", error, total_error)
+
+          !
+          !Compare the data.
+          !
+          do i = 1, 4
+              do j = 1, 6
+                  IF (data1_out(i,j) .NE. data1_in(i, j)) THEN
+                      write(*, *) "dataset test error occurred"
+                      write(*,*) "data read is not the same as the data written"
+                  END IF
+              end do
+          end do
+
+
+          !
+          ! Read the second dataset.
+          !
+          data_dims(1) = 6
+          data_dims(2) = 6
+          CALL h5dread_f(dset2_id, H5T_NATIVE_INTEGER, data2_out, data_dims, error)
+              CALL check("h5dread_f", error, total_error)
+
+          !
+          !Compare the data.
+          !
+          do i = 1, 6
+              do j = 1, 6
+                  IF (data2_out(i,j) .NE. data2_in(i, j)) THEN
+                      write(*, *) "dataset test error occurred"
+                      write(*,*) "data read is not the same as the data written"
+                  END IF
+              end do
+          end do
+
+          !
+          !Close the datasets.
+          !
+          CALL h5dclose_f(dset1_id, error)
+              CALL check("h5dclose_f", error, total_error)
+          CALL h5dclose_f(dset2_id, error)
+              CALL check("h5dclose_f", error, total_error)
+
+          !
+          ! Terminate access to the data spaces.
+          !
+          CALL h5sclose_f(space1_id, error)
+              CALL check("h5sclose_f", error, total_error)
+          CALL h5sclose_f(space2_id, error)
+              CALL check("h5sclose_f", error, total_error)
+          !
+          ! Close the files.
+          !
+          CALL h5fclose_f(file1_id, error)
+              CALL check("h5fclose_f", error, total_error)
+          CALL h5fclose_f(file2_id, error)
+              CALL check("h5fclose_f", error, total_error)
+
+
+          if(cleanup) CALL h5_cleanup_f(filename1, H5P_DEFAULT_F, error)
+              CALL check("h5_cleanup_f", error, total_error)
+          if(cleanup) CALL h5_cleanup_f(filename2, H5P_DEFAULT_F, error)
+              CALL check("h5_cleanup_f", error, total_error)
+          RETURN
+        END SUBROUTINE dataspace_basic_test
+
+END MODULE TH5S
diff --git a/fortran/test/tH5S.f90 b/fortran/test/tH5S.f90
deleted file mode 100644
index eaaf29a..0000000
--- a/fortran/test/tH5S.f90
+++ /dev/null
@@ -1,296 +0,0 @@
-!****h* root/fortran/test/tH5S.f90
-!
-! NAME
-!  tH5S.f90
-!
-! FUNCTION
-!  Basic testing of Fortran H5S, Dataspace Interface, APIs.
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! NOTES
-!  Tests the following functionalities:
-!   h5screate_f, h5scopy_f, h5screate_simple_f, h5sis_simple_f,
-!   h5sget_simple_extent_dims_f,h5sget_simple_extent_ndims_f
-!   h5sget_simple_extent_npoints_f, h5sget_simple_extent_type_f,
-!   h5sextent_copy_f, h5sset_extent_simple_f, h5sset_extent_none_f
-!
-! CONTAINS SUBROUTINES
-!  dataspace_basic_test
-!
-!*****
-MODULE TH5S
-
-CONTAINS
-
-        SUBROUTINE dataspace_basic_test(cleanup, total_error)
-
-        USE HDF5 ! This module contains all necessary modules
-        USE TH5_MISC
-
-          IMPLICIT NONE
-          LOGICAL, INTENT(IN)  :: cleanup
-          INTEGER, INTENT(INOUT) :: total_error
-
-          CHARACTER(LEN=10), PARAMETER :: filename1 = "basicspace" ! File1 name
-          CHARACTER(LEN=9), PARAMETER :: filename2 = "copyspace"  ! File2 name
-          CHARACTER(LEN=80) :: fix_filename1
-          CHARACTER(LEN=80) :: fix_filename2
-          CHARACTER(LEN=9), PARAMETER :: dsetname = "basicdset"       ! Dataset name
-
-          INTEGER(HID_T) :: file1_id, file2_id     ! File identifiers
-          INTEGER(HID_T) :: dset1_id, dset2_id     ! Dataset identifiers
-          INTEGER(HID_T) :: space1_id, space2_id   ! Dataspace identifiers
-
-          INTEGER(HSIZE_T), DIMENSION(2) :: dims1 = (/4,6/) ! Dataset dimensions
-          INTEGER(HSIZE_T), DIMENSION(2) :: maxdims1 = (/4,6/) ! maximum dimensions
-          INTEGER(HSIZE_T), DIMENSION(2) :: dims2 = (/6,6/) ! Dataset dimensions
-          INTEGER(HSIZE_T), DIMENSION(2) :: maxdims2 = (/6,6/) ! maximum dimensions
-          INTEGER(HSIZE_T), DIMENSION(2) :: dimsout, maxdimsout ! dimensions
-          INTEGER(HSIZE_T)   ::   npoints  !number of elements in the dataspace
-
-          INTEGER     ::   rank1 = 2               ! Dataspace1 rank
-          INTEGER     ::   rank2 = 2               ! Dataspace2 rank
-          INTEGER     ::   classtype               ! Dataspace class type
-
-          INTEGER, DIMENSION(4,6) :: data1_in, data1_out   ! Data input buffers
-          INTEGER, DIMENSION(6,6) :: data2_in, data2_out  ! Data output buffers
-          INTEGER     ::   error ! Error flag
-
-          LOGICAL     ::   flag  !flag to test datyspace is simple or not
-          INTEGER     :: i, j    !general purpose integers
-          INTEGER(HSIZE_T), DIMENSION(2) :: data_dims
-
-          !
-          ! Initialize the dset_data array.
-          !
-          do i = 1, 4
-             do j = 1, 6
-                data1_in(i,j) = (i-1)*6 + j;
-             end do
-          end do
-
-          do i = 1, 6
-             do j = 1, 6
-                data2_in(i,j) = i*6 + j;
-             end do
-          end do
-
-          !
-          !  Initialize FORTRAN predefined datatypes.
-          !
-!          CALL h5init_types_f(error)
-!              CALL check("h5init_types_f", error, total_error)
-
-          !
-          ! Create new files using default properties.
-          !
-          CALL h5_fixname_f(filename1, fix_filename1, H5P_DEFAULT_F, error)
-          if (error .ne. 0) then
-              write(*,*) "Cannot modify filename"
-              stop
-          endif
-          CALL h5fcreate_f(fix_filename1, H5F_ACC_TRUNC_F, file1_id, error)
-              CALL check("h5fcreate_f", error, total_error)
-
-          CALL h5_fixname_f(filename2, fix_filename2, H5P_DEFAULT_F, error)
-          if (error .ne. 0) then
-              write(*,*) "Cannot modify filename"
-              stop
-          endif
-          CALL h5fcreate_f(fix_filename2, H5F_ACC_TRUNC_F, file2_id, error)
-              CALL check("h5fcreate_f", error, total_error)
-
-          !
-          ! Create dataspace for file1.
-          !
-          CALL h5screate_simple_f(rank1, dims1, space1_id, error, maxdims1)
-              CALL check("h5screate_simple_f", error, total_error)
-          !
-          ! Copy space1_id to space2_id.
-          !
-          CALL h5scopy_f(space1_id, space2_id, error)
-              CALL check("h5scopy_f", error, total_error)
-
-          !
-          !Check whether copied space is simple.
-          !
-          CALL h5sis_simple_f(space2_id, flag, error)
-              CALL check("h5sissimple_f", error, total_error)
-          IF (.NOT. flag) write(*,*) "dataspace is not simple type"
-
-          !
-          !set the copied space to none.
-          !
-          CALL h5sset_extent_none_f(space2_id, error)
-              CALL check("h5sset_extent_none_f", error, total_error)
-
-          !
-          !copy the extent of space1_id to space2_id.
-          !
-          CALL h5sextent_copy_f(space2_id, space1_id, error)
-              CALL check("h5sextent_copy_f", error, total_error)
-
-          !
-          !get the copied space's dimensions.
-          !
-          CALL h5sget_simple_extent_dims_f(space2_id, dimsout, maxdimsout, error)
-              CALL check("h5sget_simple_extent_dims_f", error, total_error)
-          IF ((dimsout(1) .NE. dims1(1)) .OR. (dimsout(2) .NE. dims1(2)) ) THEN
-              write(*,*)"error occured, copied dims not same"
-          END IF
-
-          !
-          !get the copied space's rank.
-          !
-          CALL h5sget_simple_extent_ndims_f(space2_id, rank2, error)
-              CALL check("h5sget_simple_extent_ndims_f", error, total_error)
-          IF (rank2 .NE. rank1) write(*,*)"error occured, copied ranks not same"
-
-          !
-          !get the copied space's number of elements.
-          !
-          CALL h5sget_simple_extent_npoints_f(space2_id, npoints, error)
-              CALL check("h5sget_simple_extent_npoints_f", error, total_error)
-          IF (npoints .NE. 24) write(*,*)"error occured, number of elements not correct"
-
-
-          !
-          !get the copied space's class type.
-          !
-          CALL h5sget_simple_extent_type_f(space2_id, classtype, error)
-              CALL check("h5sget_simple_extent_type_f", error, total_error)
-          IF (classtype .NE. 1) write(*,*)"class type not H5S_SIMPLE_f"
-
-          ! 
-          !set the copied space to none before extend the dimensions.
-          !
-          CALL h5sset_extent_none_f(space2_id, error)
-              CALL check("h5sset_extent_none_f", error, total_error)
-
-          !
-          !set the copied space to dim2 size. 
-          !
-          CALL h5sset_extent_simple_f(space2_id, rank2, dims2, maxdims2, error)
-              CALL check("h5sset_extent_simple_f", error, total_error)
-
-          !
-          !get the copied space's dimensions.
-          !
-          CALL h5sget_simple_extent_dims_f(space2_id, dimsout, maxdimsout, error)
-              CALL check("h5sget_simple_extent_dims_f", error, total_error)
-          IF ((dimsout(1) .NE. dims2(1)) .OR. (dimsout(2) .NE. dims2(2)) ) THEN
-              write(*,*)"error occured, copied dims not same"
-          END IF
-
-          !
-          ! Create the datasets with default properties in two files.
-          !
-          CALL h5dcreate_f(file1_id, dsetname, H5T_NATIVE_INTEGER, space1_id, &
-                           dset1_id, error)
-              CALL check("h5dcreate_f", error, total_error)
-
-          CALL h5dcreate_f(file2_id, dsetname, H5T_NATIVE_INTEGER, space2_id, &
-                           dset2_id, error)
-              CALL check("h5dcreate_f", error, total_error)
-
-          !
-          ! Write the datasets.
-          !
-          data_dims(1) = 4
-          data_dims(2) = 6
-          CALL h5dwrite_f(dset1_id, H5T_NATIVE_INTEGER, data1_in, data_dims, error)
-              CALL check("h5dwrite_f", error, total_error)
-
-          data_dims(1) = 6
-          data_dims(2) = 6
-          CALL h5dwrite_f(dset2_id, H5T_NATIVE_INTEGER, data2_in, data_dims, error)
-              CALL check("h5dwrite_f", error, total_error)
-
-          !
-          ! Read the first dataset.
-          !
-          data_dims(1) = 4
-          data_dims(2) = 6
-          CALL h5dread_f(dset1_id, H5T_NATIVE_INTEGER, data1_out, data_dims, error)
-              CALL check("h5dread_f", error, total_error)
-
-          !
-          !Compare the data.
-          !
-          do i = 1, 4
-              do j = 1, 6
-                  IF (data1_out(i,j) .NE. data1_in(i, j)) THEN
-                      write(*, *) "dataset test error occured"
-                      write(*,*) "data read is not the same as the data writen"
-                  END IF
-              end do
-          end do
-
-
-          !
-          ! Read the second dataset.
-          !
-          data_dims(1) = 6
-          data_dims(2) = 6
-          CALL h5dread_f(dset2_id, H5T_NATIVE_INTEGER, data2_out, data_dims, error)
-              CALL check("h5dread_f", error, total_error)
-
-          !
-          !Compare the data.
-          !
-          do i = 1, 6
-              do j = 1, 6
-                  IF (data2_out(i,j) .NE. data2_in(i, j)) THEN
-                      write(*, *) "dataset test error occured"
-                      write(*,*) "data read is not the same as the data writen"
-                  END IF
-              end do
-          end do
-
-          !
-          !Close the datasets.
-          !
-          CALL h5dclose_f(dset1_id, error)
-              CALL check("h5dclose_f", error, total_error)
-          CALL h5dclose_f(dset2_id, error)
-              CALL check("h5dclose_f", error, total_error)
-
-          !
-          ! Terminate access to the data spaces.
-          !
-          CALL h5sclose_f(space1_id, error)
-              CALL check("h5sclose_f", error, total_error)
-          CALL h5sclose_f(space2_id, error)
-              CALL check("h5sclose_f", error, total_error)
-          !
-          ! Close the files.
-          !
-          CALL h5fclose_f(file1_id, error)
-              CALL check("h5fclose_f", error, total_error)
-          CALL h5fclose_f(file2_id, error)
-              CALL check("h5fclose_f", error, total_error)
-
-
-          if(cleanup) CALL h5_cleanup_f(filename1, H5P_DEFAULT_F, error)
-              CALL check("h5_cleanup_f", error, total_error)
-          if(cleanup) CALL h5_cleanup_f(filename2, H5P_DEFAULT_F, error)
-              CALL check("h5_cleanup_f", error, total_error)
-          RETURN
-        END SUBROUTINE dataspace_basic_test
-
-END MODULE TH5S
diff --git a/fortran/test/tH5Sselect.F90 b/fortran/test/tH5Sselect.F90
new file mode 100644
index 0000000..f0b2c85
--- /dev/null
+++ b/fortran/test/tH5Sselect.F90
@@ -0,0 +1,1990 @@
+!****h* root/fortran/test/tH5Sselect.f90
+!
+! NAME
+!  tH5Sselect.f90
+!
+! FUNCTION
+!  Basic testing of Fortran H5S, Selection-related Dataspace Interface, APIs.
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+! NOTES
+!  Tests the following functionalities:
+!    h5sget_select_npoints_f, h5sselect_elements_f, h5sselect_all_f,
+!    h5sselect_none_f, h5sselect_valid_f, h5sselect_hyperslab_f,
+!    h5sget_select_bounds_f, h5sget_select_elem_pointlist_f,
+!    h5sget_select_elem_npoints_f, h5sget_select_hyper_blocklist_f,
+!    h5sget_select_hyper_nblocks_f, h5sget_select_npoints_f
+!
+! CONTAINS SUBROUTINES
+!  test_select_hyperslab, test_select_element, test_basic_select,
+!  test_select_point, test_select_combine, test_select_bounds
+!
+!
+!*****
+MODULE TH5SSELECT
+
+  USE HDF5 ! This module contains all necessary modules
+  USE TH5_MISC
+  USE TH5_MISC_GEN
+
+CONTAINS
+
+  SUBROUTINE test_select_hyperslab(cleanup, total_error)
+
+    IMPLICIT NONE
+    LOGICAL, INTENT(IN) :: cleanup
+    INTEGER, INTENT(INOUT) :: total_error
+
+    CHARACTER(LEN=7), PARAMETER :: filename = "tselect"
+    CHARACTER(LEN=80) :: fix_filename
+
+    !
+    !dataset name is "IntArray"
+    !
+    CHARACTER(LEN=8), PARAMETER :: dsetname = "IntArray"
+
+    INTEGER(HID_T) :: file_id       ! File identifier
+    INTEGER(HID_T) :: dset_id       ! Dataset identifier
+    INTEGER(HID_T) :: dataspace     ! Dataspace identifier
+    INTEGER(HID_T) :: memspace      ! memspace identifier
+
+    !
+    !Memory space dimensions
+    !
+    INTEGER(HSIZE_T), DIMENSION(3) :: dimsm = (/7,7,3/)
+
+
+    !
+    !Dataset dimensions
+    !
+    INTEGER(HSIZE_T), DIMENSION(2) :: dimsf = (/5,6/)
+
+    !
+    !Size of the hyperslab in the file
+    !
+    INTEGER(HSIZE_T), DIMENSION(2) :: count = (/3,4/)
+
+    !
+    !hyperslab offset in the file
+    !
+    INTEGER(HSIZE_T), DIMENSION(2) :: offset = (/1,2/)
+
+    !
+    !Size of the hyperslab in memory
+    !
+    INTEGER(HSIZE_T), DIMENSION(3) :: count_out = (/3,4,1/)
+
+    !
+    !hyperslab offset in memory
+    !
+    INTEGER(HSIZE_T), DIMENSION(3) :: offset_out = (/3,0,0/)
+
+    !
+    !data to write
+    !
+    INTEGER, DIMENSION(5,6) :: data
+
+    !
+    !output buffer
+    !
+    INTEGER, DIMENSION(7,7,3) :: data_out
+
+
+    !
+    !dataset space rank
+    !
+    INTEGER :: dsetrank = 2
+
+    !
+    !memspace rank
+    !
+    INTEGER :: memrank = 3
+
+
+
+
+    !
+    !general purpose integer
+    !
+    INTEGER :: i, j
+
+    !
+    !flag to check operation success
+    !
+    INTEGER :: error
+    INTEGER(HSIZE_T), DIMENSION(3) :: data_dims
+
+
+    !
+    !This writes data to the HDF5 file.
+    !
+
+    !
+    !data initialization
+    !
+    do i = 1, 5
+       do j = 1, 6
+          data(i,j) = (i-1) + (j-1);
+       end do
+    end do
+    !
+    ! 0,  1,  2,  3,  4,  5
+    ! 1,  2,  3,  4,  5,  6
+    ! 2,  3,  4,  5,  6,  7
+    ! 3,  4,  5,  6,  7,  8
+    ! 4,  5,  6,  7,  8,  9
+    !
+
+    !
+    !Initialize FORTRAN predefined datatypes
+    !
+!    CALL h5init_types_f(error)
+!    CALL check("h5init_types_f", error, total_error)
+
+    !
+    !Create a new file using default properties.
+    !
+          CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
+          if (error .ne. 0) then
+              write(*,*) "Cannot modify filename"
+              stop
+          endif
+    CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
+    CALL check("h5fcreate_f", error, total_error)
+
+    !
+    !Create the data space for the  dataset.
+    !
+    CALL h5screate_simple_f(dsetrank, dimsf, dataspace, error)
+    CALL check("h5screate_simple_f", error, total_error)
+
+    !
+    ! Create the dataset with default properties
+    !
+    CALL h5dcreate_f(file_id, dsetname, H5T_STD_I32BE, dataspace, &
+         dset_id, error)
+    CALL check("h5dcreate_f", error, total_error)
+
+    !
+    ! Write the dataset
+    !
+    data_dims(1) = 5
+    data_dims(2) = 6
+    CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, data, data_dims, error)
+    CALL check("h5dwrite_f", error, total_error)
+
+    !
+    !Close the dataspace for the dataset.
+    !
+    CALL h5sclose_f(dataspace, error)
+    CALL check("h5sclose_f", error, total_error)
+
+    !
+    !Close the dataset.
+    !
+    CALL h5dclose_f(dset_id, error)
+    CALL check("h5dclose_f", error, total_error)
+
+    !
+    !Close the file.
+    !
+    CALL h5fclose_f(file_id, error)
+    CALL check("h5fclose_f", error, total_error)
+
+    !
+    !This reads the hyperslab from the sds.h5 file just
+    !created, into a 2-dimensional plane of the 3-dimensional array.
+    !
+
+    !
+    !initialize data_out array
+    !
+    !     do i = 1, 7
+    !          do j = 1, 7
+    !              do k = 1,3
+    !                  data_out(i,j,k) = 0;
+    !              end do
+    !          end do
+    !     end do
+
+    !
+    !Open the file.
+    !
+    CALL h5fopen_f (fix_filename, H5F_ACC_RDONLY_F, file_id, error)
+    CALL check("h5fopen_f", error, total_error)
+
+    !
+    !Open the  dataset.
+    !
+    CALL h5dopen_f(file_id, dsetname, dset_id, error)
+    CALL check("h5dopen_f", error, total_error)
+
+    !
+    !Get dataset's dataspace handle.
+    !
+    CALL h5dget_space_f(dset_id, dataspace, error)
+    CALL check("h5dget_space_f", error, total_error)
+
+    !
+    !Select hyperslab in the dataset.
+    !
+    CALL h5sselect_hyperslab_f(dataspace, H5S_SELECT_SET_F, &
+         offset, count, error)
+    CALL check("h5sselect_hyperslab_f", error, total_error)
+    !
+    !create memory dataspace.
+    !
+    CALL h5screate_simple_f(memrank, dimsm, memspace, error)
+    CALL check("h5screate_simple_f", error, total_error)
+
+    !
+    !Select hyperslab in memory.
+    !
+    CALL h5sselect_hyperslab_f(memspace, H5S_SELECT_SET_F, &
+         offset_out, count_out, error)
+    CALL check("h5sselect_hyperslab_f", error, total_error)
+
+    !
+    !Read data from hyperslab in the file into the hyperslab in
+    !memory and display.
+    !
+    data_dims(1) = 7
+    data_dims(2) = 7
+    data_dims(3) = 3
+    CALL h5dread_f(dset_id, H5T_NATIVE_INTEGER, data_out, data_dims, error, &
+         memspace, dataspace)
+    CALL check("h5dread_f", error, total_error)
+
+    !
+    !Display data_out array
+    !
+    !do i = 1, 7
+    !   print *, (data_out(i,j,1), j = 1,7)
+    !end do
+
+    ! 0 0 0 0 0 0 0
+    ! 0 0 0 0 0 0 0
+    ! 0 0 0 0 0 0 0
+    ! 3 4 5 6 0 0 0
+    ! 4 5 6 7 0 0 0
+    ! 5 6 7 8 0 0 0
+    ! 0 0 0 0 0 0 0
+    !
+
+    !
+    !Close the dataspace for the dataset.
+    !
+    CALL h5sclose_f(dataspace, error)
+    CALL check("h5sclose_f", error, total_error)
+
+    !
+    !Close the memoryspace.
+    !
+    CALL h5sclose_f(memspace, error)
+    CALL check("h5sclose_f", error, total_error)
+
+    !
+    !Close the dataset.
+    !
+    CALL h5dclose_f(dset_id, error)
+    CALL check("h5dclose_f", error, total_error)
+
+    !
+    !Close the file.
+    !
+    CALL h5fclose_f(file_id, error)
+    CALL check("h5fclose_f", error, total_error)
+
+
+          if(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
+              CALL check("h5_cleanup_f", error, total_error)
+    RETURN
+
+  END SUBROUTINE test_select_hyperslab
+
+  !
+  !Subroutine to test element selection
+  !
+
+  SUBROUTINE test_select_element(cleanup, total_error)
+
+    USE HDF5 ! This module contains all necessary modules
+    USE TH5_MISC
+
+    IMPLICIT NONE
+    LOGICAL, INTENT(IN)  :: cleanup
+    INTEGER, INTENT(INOUT) :: total_error
+
+    !
+    !the dataset1 is stored in file "copy1.h5"
+    !
+    CHARACTER(LEN=13), PARAMETER :: filename1 = "tselect_copy1"
+    CHARACTER(LEN=80) :: fix_filename1
+
+    !
+    !the dataset2 is stored in file "copy2.h5"
+    !
+    CHARACTER(LEN=13), PARAMETER :: filename2 = "tselect_copy2"
+    CHARACTER(LEN=80) :: fix_filename2
+    !
+    !dataset1 name is "Copy1"
+    !
+    CHARACTER(LEN=8), PARAMETER :: dsetname1 = "Copy1"
+
+    !
+    !dataset2 name is "Copy2"
+    !
+    CHARACTER(LEN=8), PARAMETER :: dsetname2 = "Copy2"
+
+    !
+    !dataset rank
+    !
+    INTEGER, PARAMETER :: RANK = 2
+
+    !
+    !number of points selected
+    !
+    INTEGER(SIZE_T), PARAMETER :: NUMP = 2
+
+    INTEGER(HID_T) :: file1_id       ! File1 identifier
+    INTEGER(HID_T) :: file2_id       ! File2 identifier
+    INTEGER(HID_T) :: dset1_id       ! Dataset1 identifier
+    INTEGER(HID_T) :: dset2_id       ! Dataset2 identifier
+    INTEGER(HID_T) :: dataspace1     ! Dataspace identifier
+    INTEGER(HID_T) :: dataspace2     ! Dataspace identifier
+    INTEGER(HID_T) :: memspace       ! memspace identifier
+
+    !
+    !Memory space dimensions
+    !
+    INTEGER(HSIZE_T), DIMENSION(1) :: dimsm = (/2/)
+
+    !
+    !Dataset dimensions
+    !
+    INTEGER(HSIZE_T), DIMENSION(2) :: dimsf = (/3,4/)
+
+    !
+    !Points positions in the file
+    !
+    INTEGER(HSIZE_T), DIMENSION(RANK,NUMP) :: coord
+
+    !
+    !data buffers
+    !
+    INTEGER, DIMENSION(3,4) :: buf1, buf2, bufnew
+
+    !
+    !value to write
+    !
+    INTEGER, DIMENSION(2) :: val = (/53, 59/)
+
+    !
+    !memory rank
+    !
+    INTEGER :: memrank = 1
+
+    !
+    !general purpose integer
+    !
+    INTEGER :: i, j
+
+    !
+    !flag to check operation success
+    !
+    INTEGER :: error
+    INTEGER(HSIZE_T), DIMENSION(3) :: data_dims
+
+
+    !
+    !Create two files containing identical datasets. Write 0's to one
+    !and 1's to the other.
+    !
+
+    !
+    !data initialization
+    !
+    do i = 1, 3
+       do j = 1, 4
+          buf1(i,j) = 0;
+       end do
+    end do
+
+    do i = 1, 3
+       do j = 1, 4
+          buf2(i,j) = 1;
+       end do
+    end do
+
+    !
+    !Initialize FORTRAN predefined datatypes
+    !
+!    CALL h5init_types_f(error)
+!    CALL check("h5init_types_f", error, total_error)
+
+    !
+    !Create file1, file2  using default properties.
+    !
+          CALL h5_fixname_f(filename1, fix_filename1, H5P_DEFAULT_F, error)
+          if (error .ne. 0) then
+              write(*,*) "Cannot modify filename"
+              stop
+          endif
+    CALL h5fcreate_f(fix_filename1, H5F_ACC_TRUNC_F, file1_id, error)
+    CALL check("h5fcreate_f", error, total_error)
+
+          CALL h5_fixname_f(filename2, fix_filename2, H5P_DEFAULT_F, error)
+          if (error .ne. 0) then
+              write(*,*) "Cannot modify filename"
+              stop
+          endif
+    CALL h5fcreate_f(fix_filename2, H5F_ACC_TRUNC_F, file2_id, error)
+    CALL check("h5fcreate_f", error, total_error)
+
+    !
+    !Create the data space for the  datasets.
+    !
+    CALL h5screate_simple_f(RANK, dimsf, dataspace1, error)
+    CALL check("h5screate_simple_f", error, total_error)
+
+    CALL h5screate_simple_f(RANK, dimsf, dataspace2, error)
+    CALL check("h5screate_simple_f", error, total_error)
+
+    !
+    ! Create the datasets with default properties
+    !
+    CALL h5dcreate_f(file1_id, dsetname1, H5T_NATIVE_INTEGER, dataspace1, &
+         dset1_id, error)
+    CALL check("h5dcreate_f", error, total_error)
+
+    CALL h5dcreate_f(file2_id, dsetname2, H5T_NATIVE_INTEGER, dataspace2, &
+         dset2_id, error)
+    CALL check("h5dcreate_f", error, total_error)
+
+    !
+    ! Write the datasets
+    !
+    data_dims(1) = 3
+    data_dims(2) = 4
+    CALL h5dwrite_f(dset1_id, H5T_NATIVE_INTEGER, buf1, data_dims, error)
+    CALL check("h5dwrite_f", error, total_error)
+
+    CALL h5dwrite_f(dset2_id, H5T_NATIVE_INTEGER, buf2, data_dims, error)
+    CALL check("h5dwrite_f", error, total_error)
+
+    !
+    !Close the dataspace for the datasets.
+    !
+    CALL h5sclose_f(dataspace1, error)
+    CALL check("h5sclose_f", error, total_error)
+
+    CALL h5sclose_f(dataspace2, error)
+    CALL check("h5sclose_f", error, total_error)
+
+    !
+    !Close the datasets.
+    !
+    CALL h5dclose_f(dset1_id, error)
+    CALL check("h5dclose_f", error, total_error)
+
+    CALL h5dclose_f(dset2_id, error)
+    CALL check("h5dclose_f", error, total_error)
+
+    !
+    !Close the files.
+    !
+    CALL h5fclose_f(file1_id, error)
+    CALL check("h5fclose_f", error, total_error)
+
+    CALL h5fclose_f(file2_id, error)
+    CALL check("h5fclose_f", error, total_error)
+
+    !
+    !Open the two files.  Select two points in one file, write values to
+    !those point locations, then do H5Scopy and write the values to the
+    !other file.  Close files.
+    !
+
+    !
+    !Open the files.
+    !
+    CALL h5fopen_f (fix_filename1, H5F_ACC_RDWR_F, file1_id, error)
+    CALL check("h5fopen_f", error, total_error)
+
+    CALL h5fopen_f (fix_filename2, H5F_ACC_RDWR_F, file2_id, error)
+    CALL check("h5fopen_f", error, total_error)
+
+    !
+    !Open the  datasets.
+    !
+    CALL h5dopen_f(file1_id, dsetname1, dset1_id, error)
+    CALL check("h5dopen_f", error, total_error)
+
+    CALL h5dopen_f(file2_id, dsetname2, dset2_id, error)
+    CALL check("h5dopen_f", error, total_error)
+
+    !
+    !Get dataset1's dataspace handle.
+    !
+    CALL h5dget_space_f(dset1_id, dataspace1, error)
+    CALL check("h5dget_space_f", error, total_error)
+
+    !
+    !create memory dataspace.
+    !
+    CALL h5screate_simple_f(memrank, dimsm, memspace, error)
+    CALL check("h5screate_simple_f", error, total_error)
+
+    !
+    !Set the selected point positions.Because Fortran array index starts
+    ! from 1, so add one to the actual select points in C
+    !
+    coord(1,1) = 1
+    coord(2,1) = 2
+    coord(1,2) = 1
+    coord(2,2) = 4
+
+    !
+    !Select the elements in file space
+    !
+    CALL h5sselect_elements_f(dataspace1, H5S_SELECT_SET_F, RANK, NUMP,&
+         coord, error)
+    CALL check("h5sselect_elements_f", error, total_error)
+
+    !
+    !Write value into the selected points in dataset1
+    !
+    data_dims(1) = 2
+    CALL H5dwrite_f(dset1_id, H5T_NATIVE_INTEGER, val, data_dims, error, &
+         mem_space_id=memspace, file_space_id=dataspace1)
+    CALL check("h5dwrite_f", error, total_error)
+
+    !
+    !Copy the daspace1 into dataspace2
+    !
+    CALL h5scopy_f(dataspace1, dataspace2, error)
+    CALL check("h5scopy_f", error, total_error)
+
+    !
+    !Write value into the selected points in dataset2
+    !
+    CALL H5dwrite_f(dset2_id, H5T_NATIVE_INTEGER, val, data_dims, error, &
+         mem_space_id=memspace, file_space_id=dataspace2)
+    CALL check("h5dwrite_f", error, total_error)
+
+    !
+    !Close the dataspace for the datasets.
+    !
+    CALL h5sclose_f(dataspace1, error)
+    CALL check("h5sclose_f", error, total_error)
+
+    CALL h5sclose_f(dataspace2, error)
+    CALL check("h5sclose_f", error, total_error)
+
+    !
+    !Close the memoryspace.
+    !
+    CALL h5sclose_f(memspace, error)
+    CALL check("h5sclose_f", error, total_error)
+
+    !
+    !Close the datasets.
+    !
+    CALL h5dclose_f(dset1_id, error)
+    CALL check("h5dclose_f", error, total_error)
+
+    CALL h5dclose_f(dset2_id, error)
+    CALL check("h5dclose_f", error, total_error)
+
+    !
+    !Close the files.
+    !
+    CALL h5fclose_f(file1_id, error)
+    CALL check("h5fclose_f", error, total_error)
+
+    CALL h5fclose_f(file2_id, error)
+    CALL check("h5fclose_f", error, total_error)
+
+    !
+    !Open both files and print the contents of the datasets.
+    !
+
+    !
+    !Open the files.
+    !
+    CALL h5fopen_f (fix_filename1, H5F_ACC_RDWR_F, file1_id, error)
+    CALL check("h5fopen_f", error, total_error)
+
+    CALL h5fopen_f (fix_filename2, H5F_ACC_RDWR_F, file2_id, error)
+    CALL check("h5fopen_f", error, total_error)
+
+    !
+    !Open the  datasets.
+    !
+    CALL h5dopen_f(file1_id, dsetname1, dset1_id, error)
+    CALL check("h5dopen_f", error, total_error)
+
+    CALL h5dopen_f(file2_id, dsetname2, dset2_id, error)
+    CALL check("h5dopen_f", error, total_error)
+
+    !
+    !Read dataset1.
+    !
+    data_dims(1) = 3
+    data_dims(2) = 4
+    CALL h5dread_f(dset1_id, H5T_NATIVE_INTEGER, bufnew, data_dims, error)
+    CALL check("h5dread_f", error, total_error)
+
+    !
+    !Display the data read from dataset "Copy1"
+    !
+    !write(*,*) "The data in dataset Copy1 is: "
+    !do i = 1, 3
+    !   print *, (bufnew(i,j), j = 1,4)
+    !end do
+
+    !
+    !Read dataset2.
+    !
+    CALL h5dread_f(dset2_id, H5T_NATIVE_INTEGER, bufnew, data_dims, error)
+    CALL check("h5dread_f", error, total_error)
+
+    !
+    !Display the data read from dataset "Copy2"
+    !
+    !write(*,*) "The data in dataset Copy2 is: "
+    !do i = 1, 3
+    !   print *, (bufnew(i,j), j = 1,4)
+    !end do
+
+    !
+    !Close the datasets.
+    !
+    CALL h5dclose_f(dset1_id, error)
+    CALL check("h5dclose_f", error, total_error)
+
+    CALL h5dclose_f(dset2_id, error)
+    CALL check("h5dclose_f", error, total_error)
+
+    !
+    !Close the files.
+    !
+    CALL h5fclose_f(file1_id, error)
+    CALL check("h5fclose_f", error, total_error)
+
+    CALL h5fclose_f(file2_id, error)
+    CALL check("h5fclose_f", error, total_error)
+
+
+          if(cleanup) CALL h5_cleanup_f(filename1, H5P_DEFAULT_F, error)
+              CALL check("h5_cleanup_f", error, total_error)
+          if(cleanup) CALL h5_cleanup_f(filename2, H5P_DEFAULT_F, error)
+              CALL check("h5_cleanup_f", error, total_error)
+     RETURN
+  END SUBROUTINE  test_select_element
+
+
+  SUBROUTINE test_basic_select(cleanup, total_error)
+
+    IMPLICIT NONE
+    LOGICAL, INTENT(IN)  :: cleanup
+    INTEGER, INTENT(INOUT) :: total_error
+
+     !
+     !the dataset is stored in file "testselect.h5"
+     !
+     CHARACTER(LEN=10), PARAMETER :: filename = "testselect"
+     CHARACTER(LEN=80) :: fix_filename
+
+     !
+     !dataspace rank
+     !
+     INTEGER, PARAMETER :: RANK = 2
+
+     !
+     !select NUMP_POINTS points from the file
+     !
+     INTEGER(SIZE_T), PARAMETER :: NUMPS = 10
+
+     !
+     !dataset name is "testselect"
+     !
+     CHARACTER(LEN=10), PARAMETER :: dsetname = "testselect"
+
+     INTEGER(HID_T) :: file_id       ! File identifier
+     INTEGER(HID_T) :: dset_id       ! Dataset identifier
+     INTEGER(HID_T) :: dataspace     ! Dataspace identifier
+
+     !
+     !Dataset dimensions
+     !
+     INTEGER(HSIZE_T), DIMENSION(2) :: dimsf = (/5,6/)
+
+     !
+     !Size of the hyperslab in the file
+     !
+     INTEGER(HSIZE_T), DIMENSION(2) :: count = (/2,2/)
+
+     !
+     !hyperslab offset in the file
+     !
+     INTEGER(HSIZE_T), DIMENSION(2) :: offset = (/0,0/)
+
+     !
+     !start block for getting the selected hyperslab
+     !
+     INTEGER(HSIZE_T) :: startblock = 0
+
+     !
+     !start point for getting the selected elements
+     !
+     INTEGER(HSIZE_T)  :: startpoint = 0
+
+     !
+     !Stride of the hyperslab in the file
+     !
+     INTEGER(HSIZE_T), DIMENSION(2) :: stride = (/3,3/)
+
+     !
+     !BLock size of the hyperslab in the file
+     !
+     INTEGER(HSIZE_T), DIMENSION(2) :: block = (/2,2/)
+
+     !
+     !array to give selected points' coordinations
+     !
+     INTEGER(HSIZE_T), DIMENSION(RANK, NUMPS) :: coord
+
+
+     !
+     !Number of hyperslabs selected in the current dataspace
+     !
+     INTEGER(HSSIZE_T) :: num_blocks
+
+     !
+     !allocatable array for putting a list of hyperslabs
+     !selected in the current file dataspace
+     !
+     INTEGER(HSIZE_T), ALLOCATABLE, DIMENSION(:) :: blocklist
+
+     !
+     !Number of points selected in the current dataspace
+     !
+     INTEGER(HSSIZE_T) :: num_points
+     INTEGER(HSIZE_T) :: num1_points
+
+     !
+     !allocatable array for putting a list of points
+     !selected in the current file dataspace
+     !
+     INTEGER(HSIZE_T), ALLOCATABLE, DIMENSION(:) :: pointlist
+
+     !
+     !start and end bounds in the current dataspace selection
+     !
+     INTEGER(HSIZE_T), DIMENSION(RANK) :: startout, endout
+
+     !
+     !data to write
+     !
+     INTEGER, DIMENSION(5,6) :: data
+
+     !
+     !flag to check operation success
+     !
+     INTEGER :: error
+     INTEGER(HSIZE_T), DIMENSION(3) :: data_dims
+
+     !
+     !initialize the coord array to give the selected points' position
+     !
+     coord(1,1) = 1
+     coord(2,1) = 1
+     coord(1,2) = 1
+     coord(2,2) = 3
+     coord(1,3) = 1
+     coord(2,3) = 5
+     coord(1,4) = 3
+     coord(2,4) = 1
+     coord(1,5) = 3
+     coord(2,5) = 3
+     coord(1,6) = 3
+     coord(2,6) = 5
+     coord(1,7) = 4
+     coord(2,7) = 3
+     coord(1,8) = 4
+     coord(2,8) = 1
+     coord(1,9) = 5
+     coord(2,9) = 3
+     coord(1,10) = 5
+     coord(2,10) = 5
+
+     !
+     !Create a new file using default properties.
+     !
+          CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
+          if (error .ne. 0) then
+              write(*,*) "Cannot modify filename"
+              stop
+          endif
+     CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
+     CALL check("h5fcreate_f", error, total_error)
+
+     !
+     !Create the data space for the  dataset.
+     !
+     CALL h5screate_simple_f(RANK, dimsf, dataspace, error)
+     CALL check("h5screate_simple_f", error, total_error)
+
+     !
+     ! Create the dataset with default properties
+     !
+     CALL h5dcreate_f(file_id, dsetname, H5T_STD_I32BE, dataspace, &
+                      dset_id, error)
+     CALL check("h5dcreate_f", error, total_error)
+
+     !
+     ! Write the dataset
+     !
+     data_dims(1) = 5
+     data_dims(2) = 6
+     CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, data, data_dims, error)
+     CALL check("h5dwrite_f", error, total_error)
+
+     !
+     !Close the dataspace for the dataset.
+     !
+     CALL h5sclose_f(dataspace, error)
+     CALL check("h5sclose_f", error, total_error)
+
+     !
+     !Close the dataset.
+     !
+     CALL h5dclose_f(dset_id, error)
+     CALL check("h5dclose_f", error, total_error)
+
+     !
+     !Close the file.
+     !
+     CALL h5fclose_f(file_id, error)
+     CALL check("h5fclose_f", error, total_error)
+
+     !
+     !Open the file.
+     !
+     CALL h5fopen_f (fix_filename, H5F_ACC_RDONLY_F, file_id, error)
+     CALL check("h5fopen_f", error, total_error)
+
+     !
+     !Open the  dataset.
+     !
+     CALL h5dopen_f(file_id, dsetname, dset_id, error)
+     CALL check("h5dopen_f", error, total_error)
+
+     !
+     !Get dataset's dataspace handle.
+     !
+     CALL h5dget_space_f(dset_id, dataspace, error)
+     CALL check("h5dget_space_f", error, total_error)
+
+     !
+     !Select hyperslab in the dataset.
+     !
+     CALL h5sselect_hyperslab_f(dataspace, H5S_SELECT_SET_F, &
+                                offset, count, error, stride, block)
+     CALL check("h5sselect_hyperslab_f", error, total_error)
+
+     !
+     !get the number of hyperslab blocks in the current dataspac selection
+     !
+     CALL h5sget_select_hyper_nblocks_f(dataspace, num_blocks, error)
+     CALL check("h5sget_select_hyper_nblocks_f", error, total_error)
+     IF (num_blocks .NE. 4) write (*,*) "error occurred with num_blocks"
+     !write(*,*) num_blocks
+     !result of num_blocks is 4
+
+     !
+     !allocate the blocklist array
+     !
+     ALLOCATE(blocklist(num_blocks*RANK*2), STAT= error)
+     if(error .NE. 0) then
+         STOP
+     endif
+
+     !
+     !get the list of hyperslabs selected in the current dataspac selection
+     !
+     CALL h5sget_select_hyper_blocklist_f(dataspace, startblock, &
+                                          num_blocks, blocklist, error)
+     CALL check("h5sget_select_hyper_blocklist_f", error, total_error)
+!     write(*,*) (blocklist(i), i =1, num_blocks*RANK*2)
+     !result of blocklist selected is:
+     !1,  1,  2,  2,  4,  1,  5,  2,  1,  4,  2,  5,  4,  4,  5,  5
+
+     !
+     !deallocate the blocklist array
+     !
+     DEALLOCATE(blocklist)
+
+     !
+     !get the selection bounds in the current dataspac selection
+     !
+     CALL h5sget_select_bounds_f(dataspace, startout, endout, error)
+     CALL check("h5sget_select_bounds_f", error, total_error)
+     IF ( (startout(1) .ne. 1) .or. (startout(2) .ne. 1) ) THEN
+        write(*,*) "error occurred to select_bounds's start position"
+     END IF
+
+     IF ( (endout(1) .ne. 5) .or. (endout(2) .ne. 5) ) THEN
+        write(*,*) "error occurred to select_bounds's end position"
+     END IF
+     !write(*,*) (startout(i), i = 1, RANK)
+     !result of startout is 0, 0
+
+     !write(*,*) (endout(i), i = 1, RANK)
+     !result of endout is 5, 5
+
+     !
+     !allocate the pointlist array
+     !
+!     ALLOCATE(pointlist(num_blocks*RANK), STAT= error)
+     ALLOCATE(pointlist(20), STAT= error)
+     if(error .NE. 0) then
+         STOP
+     endif
+
+     !
+     !Select the elements in file space
+     !
+     CALL h5sselect_elements_f(dataspace, H5S_SELECT_SET_F, RANK, NUMPS,&
+                               coord, error)
+     CALL check("h5sselect_elements_f", error, total_error)
+
+     !
+     !Get the number of selected elements
+     !
+     CALL h5sget_select_elem_npoints_f(dataspace, num_points, error)
+     CALL check("h5sget_select_elem_npoints_f", error, total_error)
+     IF (num_points .NE. 10) write(*,*) "error occurred with num_points"
+     !write(*,*) num_points
+     ! result of num_points is 10
+
+     !
+     !Get the list of selected elements
+     !
+     num1_points = num_points
+     CALL h5sget_select_elem_pointlist_f(dataspace, startpoint, &
+                                          num1_points, pointlist, error)
+     CALL check("h5sget_select_elem_pointlist_f", error, total_error)
+     !write(*,*) (pointlist(i), i =1, num1_points*RANK)
+     !result of pintlist is:
+     !1,  1,  3,  1,  5,  1,  1,  3,  3,  3,  5,  3,  3,
+     !4,  1,  4,  3,  5,  5,  5
+
+     !
+     !deallocate the pointlist array
+     !
+     DEALLOCATE(pointlist)
+
+     !
+     !Close the dataspace for the dataset.
+     !
+     CALL h5sclose_f(dataspace, error)
+     CALL check("h5sclose_f", error, total_error)
+
+     !
+     !Close the dataset.
+     !
+     CALL h5dclose_f(dset_id, error)
+     CALL check("h5dclose_f", error, total_error)
+
+     !
+     !Close the file.
+     !
+     CALL h5fclose_f(file_id, error)
+     CALL check("h5fclose_f", error, total_error)
+
+
+          if(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
+              CALL check("h5_cleanup_f", error, total_error)
+
+     RETURN
+  END SUBROUTINE  test_basic_select
+
+!***************************************************************
+!**
+!**  test_select_point(): Test basic H5S (dataspace) selection code.
+!**      Tests element selections between dataspaces of various sizes
+!**      and dimensionalities.
+!**
+!***************************************************************
+
+SUBROUTINE test_select_point(cleanup, total_error)
+
+  IMPLICIT NONE
+  LOGICAL, INTENT(IN)  :: cleanup
+  INTEGER, INTENT(INOUT) :: total_error
+  INTEGER(HID_T) :: xfer_plist
+
+  INTEGER, PARAMETER :: SPACE1_DIM1=3
+  INTEGER, PARAMETER :: SPACE1_DIM2=15
+  INTEGER, PARAMETER :: SPACE1_DIM3=13
+  INTEGER, PARAMETER :: SPACE2_DIM1=30
+  INTEGER, PARAMETER :: SPACE2_DIM2=26
+  INTEGER, PARAMETER :: SPACE3_DIM1=15
+  INTEGER, PARAMETER :: SPACE3_DIM2=26
+
+  INTEGER, PARAMETER :: SPACE1_RANK=3
+  INTEGER, PARAMETER :: SPACE2_RANK=2
+  INTEGER, PARAMETER :: SPACE3_RANK=2
+
+  !  Element selection information
+  INTEGER, PARAMETER :: POINT1_NPOINTS=10
+  INTEGER(hid_t) ::fid1 !  HDF5 File IDs
+  INTEGER(hid_t) ::dataset !	 Dataset ID
+  INTEGER(hid_t) ::sid1,sid2 !  Dataspace ID
+  INTEGER(hsize_t), DIMENSION(1:3) :: dims1 = (/SPACE1_DIM1, SPACE1_DIM2, SPACE1_DIM3/)
+  INTEGER(hsize_t), DIMENSION(1:2) :: dims2 = (/SPACE2_DIM1, SPACE2_DIM2/)
+  INTEGER(hsize_t), DIMENSION(1:2) :: dims3 = (/SPACE3_DIM1, SPACE3_DIM2/)
+
+  INTEGER(hsize_t), DIMENSION(1:SPACE1_RANK,1:POINT1_NPOINTS) :: coord1 ! Coordinates for point selection
+  INTEGER(hsize_t), DIMENSION(1:SPACE1_RANK,1:POINT1_NPOINTS) :: temp_coord1 ! Coordinates for point selection
+  INTEGER(hsize_t), DIMENSION(1:SPACE2_RANK,1:POINT1_NPOINTS) :: coord2 ! Coordinates for point selection
+  INTEGER(hsize_t), DIMENSION(1:SPACE2_RANK,1:POINT1_NPOINTS) :: temp_coord2 ! Coordinates for point selection
+  INTEGER(hsize_t), DIMENSION(1:SPACE3_RANK,1:POINT1_NPOINTS) :: coord3 ! Coordinates for point selection
+  INTEGER(hsize_t), DIMENSION(1:SPACE3_RANK,1:POINT1_NPOINTS) :: temp_coord3 ! Coordinates for point selection
+  INTEGER(hssize_t) :: npoints
+
+!!$    uint8_t    *wbuf,        buffer to write to disk
+!!$               *rbuf,        buffer read from disk
+!!$               *tbuf;        temporary buffer pointer
+  INTEGER :: i,j;        ! Counters
+!    struct pnt_iter pi;      Custom Pointer iterator struct
+  INTEGER :: error    ! Generic return value
+  CHARACTER(LEN=9) :: filename = 'h5s_hyper'
+  CHARACTER(LEN=80) :: fix_filename
+  CHARACTER(LEN=1), DIMENSION(1:SPACE2_DIM1,1:SPACE2_DIM2) :: wbuf
+
+  CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
+  IF (error .NE. 0) THEN
+     WRITE(*,*) "Cannot modify filename"
+     STOP
+  ENDIF
+  xfer_plist = H5P_DEFAULT_F
+!    MESSAGE(5, ("Testing Element Selection Functions\n"));
+
+    ! Allocate write & read buffers
+!!$  wbuf = HDmalloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2);
+!!$  rbuf = HDcalloc(sizeof(uint8_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2));
+!!$
+  ! Initialize WRITE buffer
+
+  DO i = 1, SPACE2_DIM1
+     DO j = 1, SPACE2_DIM2
+        wbuf(i,j) = 'a'
+     ENDDO
+  ENDDO
+
+!!$  for(i=0, tbuf=wbuf; i<SPACE2_DIM1; i++)
+!!$  for(j=0; j<SPACE2_DIM2; j++)
+!!$  *tbuf++=(uint8_t)((i*SPACE2_DIM2)+j);
+
+  ! Create file
+  CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, fid1, error)
+  CALL check("h5fcreate_f", error, total_error)
+
+  ! Create dataspace for dataset
+  CALL h5screate_simple_f(SPACE1_RANK, dims1, sid1, error)
+  CALL check("h5screate_simple_f", error, total_error)
+
+  ! Create dataspace for write buffer
+  CALL h5screate_simple_f(SPACE2_RANK, dims2, sid2, error)
+  CALL check("h5screate_simple_f", error, total_error)
+
+  ! Select sequence of ten points for disk dataset
+  coord1(1,1)=1; coord1(2,1)=11; coord1(3,1)= 6;
+  coord1(1,2)=2; coord1(2,2)= 3; coord1(3,2)= 8;
+  coord1(1,3)=3; coord1(2,3)= 5; coord1(3,3)=10;
+  coord1(1,4)=1; coord1(2,4)= 7; coord1(3,4)=12;
+  coord1(1,5)=2; coord1(2,5)= 9; coord1(3,5)=14;
+  coord1(1,6)=3; coord1(2,6)=13; coord1(3,6)= 1;
+  coord1(1,7)=1; coord1(2,7)=15; coord1(3,7)= 3;
+  coord1(1,8)=2; coord1(2,8)= 1; coord1(3,8)= 5;
+  coord1(1,9)=3; coord1(2,9)= 2; coord1(3,9)= 7;
+  coord1(1,10)=1; coord1(2,10)= 4; coord1(3,10)= 9
+
+  CALL h5sselect_elements_f(sid1, H5S_SELECT_SET_F, SPACE1_RANK, INT(POINT1_NPOINTS,size_t), coord1, error)
+  CALL check("h5sselect_elements_f", error, total_error)
+
+  ! Verify correct elements selected
+
+  CALL h5sget_select_elem_pointlist_f(sid1, INT(0,hsize_t), INT(POINT1_NPOINTS,hsize_t),temp_coord1,error)
+  CALL check("h5sget_select_elem_pointlist_f", error, total_error)
+
+  DO i= 1, POINT1_NPOINTS
+     CALL verify("h5sget_select_elem_pointlist_f", INT(temp_coord1(1,i)), INT(coord1(1,i)), total_error)
+     CALL verify("h5sget_select_elem_pointlist_f", INT(temp_coord1(2,i)), INT(coord1(2,i)), total_error)
+     CALL verify("h5sget_select_elem_pointlist_f", INT(temp_coord1(3,i)), INT(coord1(3,i)), total_error)
+  ENDDO
+
+  CALL H5Sget_select_npoints_f(sid1, npoints, error)
+  CALL check("h5sget_select_npoints_f", error, total_error)
+  CALL verify("h5sget_select_npoints_f", INT(npoints), 10, total_error)
+
+  ! Append another sequence of ten points to disk dataset
+
+  coord1(1,1)=1; coord1(2,1)=3; coord1(3,1)= 1;
+  coord1(1,2)=2; coord1(2,2)=11; coord1(3,2)= 9;
+  coord1(1,3)=3; coord1(2,3)= 9; coord1(3,3)=11;
+  coord1(1,4)=1; coord1(2,4)= 8; coord1(3,4)=13;
+  coord1(1,5)=2; coord1(2,5)= 4; coord1(3,5)=12;
+  coord1(1,6)=3; coord1(2,6)= 2; coord1(3,6)= 2;
+  coord1(1,7)=1; coord1(2,7)=14; coord1(3,7)= 8;
+  coord1(1,8)=2; coord1(2,8)=15; coord1(3,8)= 7;
+  coord1(1,9)=3; coord1(2,9)= 3; coord1(3,9)= 6;
+  coord1(1,10)=1; coord1(2,10)= 7; coord1(3,10)= 14
+
+
+  CALL h5sselect_elements_f(sid1, H5S_SELECT_APPEND_F, SPACE1_RANK, INT(POINT1_NPOINTS,size_t), coord1, error)
+  CALL check("h5sselect_elements_f", error, total_error)
+  !  Verify correct elements selected
+
+  CALL h5sget_select_elem_pointlist_f(sid1, INT(POINT1_NPOINTS,hsize_t), INT(POINT1_NPOINTS,hsize_t),temp_coord1,error)
+  CALL check("h5sget_select_elem_pointlist_f", error, total_error)
+
+  DO i= 1, POINT1_NPOINTS
+     CALL verify("h5sget_select_elem_pointlist_f", INT(temp_coord1(1,i)), INT(coord1(1,i)), total_error)
+     CALL verify("h5sget_select_elem_pointlist_f", INT(temp_coord1(2,i)), INT(coord1(2,i)), total_error)
+     CALL verify("h5sget_select_elem_pointlist_f", INT(temp_coord1(3,i)), INT(coord1(3,i)), total_error)
+  ENDDO
+
+  CALL H5Sget_select_npoints_f(sid1, npoints, error)
+  CALL check("h5sget_select_npoints_f", error, total_error)
+  CALL verify("h5sget_select_npoints_f", INT(npoints), 20, total_error)
+
+  !  Select sequence of ten points for memory dataset
+  coord2(1,1)=13; coord2(2,1)= 4;
+  coord2(1,2)=16; coord2(2,2)=14;
+  coord2(1,3)= 8; coord2(2,3)=26;
+  coord2(1,4)= 1; coord2(2,4)= 7;
+  coord2(1,5)=14; coord2(2,5)= 1;
+  coord2(1,6)=25; coord2(2,6)=12;
+  coord2(1,7)=13; coord2(2,7)=22;
+  coord2(1,8)=30; coord2(2,8)= 5;
+  coord2(1,9)= 9; coord2(2,9)= 9;
+  coord2(1,10)=20; coord2(2,10)=18
+
+  CALL h5sselect_elements_f(sid2, H5S_SELECT_SET_F, SPACE2_RANK, INT(POINT1_NPOINTS,size_t), coord2, error)
+  CALL check("h5sselect_elements_f", error, total_error)
+
+
+  ! Verify correct elements selected
+
+  CALL h5sget_select_elem_pointlist_f(sid2, INT(0,hsize_t), INT(POINT1_NPOINTS,hsize_t),temp_coord2,error)
+  CALL check("h5sget_select_elem_pointlist_f", error, total_error)
+
+  DO i= 1, POINT1_NPOINTS
+     CALL verify("h5sget_select_elem_pointlist_f", INT(temp_coord2(1,i)), INT(coord2(1,i)), total_error)
+     CALL verify("h5sget_select_elem_pointlist_f", INT(temp_coord2(2,i)), INT(coord2(2,i)), total_error)
+  ENDDO
+
+!!$
+!!$     Save points for later iteration
+!!$     (these are in the second half of the buffer, because we are prepending
+!!$      the next list of points to the beginning of the point selection list)
+!!$    HDmemcpy(((char *)pi.coord)+sizeof(coord2),coord2,sizeof(coord2));
+!!$
+
+  CALL H5Sget_select_npoints_f(sid2, npoints, error)
+  CALL check("h5sget_select_npoints_f", error, total_error)
+  CALL verify("h5sget_select_npoints_f", INT(npoints), 10, total_error)
+
+  ! Append another sequence of ten points to memory dataset
+  coord2(1,1)=25; coord2(2,1)= 1;
+  coord2(1,2)= 3; coord2(2,2)=26;
+  coord2(1,3)=14; coord2(2,3)=18;
+  coord2(1,4)= 9; coord2(2,4)= 4;
+  coord2(1,5)=30; coord2(2,5)= 5;
+  coord2(1,6)=12; coord2(2,6)=15;
+  coord2(1,7)= 6; coord2(2,7)=23;
+  coord2(1,8)=13; coord2(2,8)= 3;
+  coord2(1,9)=22; coord2(2,9)=13;
+  coord2(1,10)= 10; coord2(2,10)=19
+
+  CALL h5sselect_elements_f(sid2, H5S_SELECT_PREPEND_F, SPACE2_RANK, INT(POINT1_NPOINTS,size_t), coord2, error)
+  CALL check("h5sselect_elements_f", error, total_error)
+
+
+  ! Verify correct elements selected
+  CALL h5sget_select_elem_pointlist_f(sid2, INT(0,hsize_t), INT(POINT1_NPOINTS,hsize_t),temp_coord2,error)
+  CALL check("h5sget_select_elem_pointlist_f", error, total_error)
+
+  DO i= 1, POINT1_NPOINTS
+     CALL verify("h5sget_select_elem_pointlist_f", INT(temp_coord2(1,i)), INT(coord2(1,i)), total_error)
+     CALL verify("h5sget_select_elem_pointlist_f", INT(temp_coord2(2,i)), INT(coord2(2,i)), total_error)
+  ENDDO
+
+  CALL H5Sget_select_npoints_f(sid2, npoints, error)
+  CALL check("h5sget_select_npoints_f", error, total_error)
+  CALL verify("h5sget_select_npoints_f", INT(npoints), 20, total_error)
+
+!!$     Save points for later iteration
+!!$    HDmemcpy(pi.coord,coord2,sizeof(coord2));
+
+  !  Create a dataset
+  CALL h5dcreate_f(fid1, "Dataset1", H5T_NATIVE_CHARACTER, sid1, dataset, error)
+  CALL check("h5dcreate_f", error, total_error)
+
+  !  Write selection to disk
+  CALL h5dwrite_f(dataset, H5T_NATIVE_CHARACTER, wbuf, dims2, error, sid2, sid1, xfer_plist)
+  CALL check("h5dwrite_f", error, total_error)
+
+  !  Close memory dataspace
+  CALL h5sclose_f(sid2, error)
+  CALL check("h5sclose_f", error, total_error)
+
+  !  Create dataspace for reading buffer
+  CALL h5screate_simple_f(SPACE3_RANK, dims3, sid2, error)
+  CALL check("h5screate_simple_f", error, total_error)
+
+  !  Select sequence of points for read dataset
+  coord3(1,1)= 1; coord3(2,1)= 3;
+  coord3(1,2)= 5; coord3(2,2)= 9;
+  coord3(1,3)=14; coord3(2,3)=14;
+  coord3(1,4)=15; coord3(2,4)=21;
+  coord3(1,5)= 8; coord3(2,5)=10;
+  coord3(1,6)= 3; coord3(2,6)= 1;
+  coord3(1,7)= 10; coord3(2,7)=20;
+  coord3(1,8)= 2; coord3(2,8)=23;
+  coord3(1,9)=13; coord3(2,9)=22;
+  coord3(1,10)=12; coord3(2,10)=7;
+
+  CALL h5sselect_elements_f(sid2, H5S_SELECT_SET_F, SPACE3_RANK, INT(POINT1_NPOINTS,size_t), coord3, error)
+  CALL check("h5sselect_elements_f", error, total_error)
+
+  !  Verify correct elements selected
+  CALL h5sget_select_elem_pointlist_f(sid2, INT(0,hsize_t), INT(POINT1_NPOINTS,hsize_t),temp_coord3,error)
+  CALL check("h5sget_select_elem_pointlist_f", error, total_error)
+  DO i= 1, POINT1_NPOINTS
+     CALL verify("h5sget_select_elem_pointlist_f", INT(temp_coord3(1,i)), INT(coord3(1,i)), total_error)
+     CALL verify("h5sget_select_elem_pointlist_f", INT(temp_coord3(2,i)), INT(coord3(2,i)), total_error)
+  ENDDO
+
+  CALL H5Sget_select_npoints_f(sid2, npoints, error)
+  CALL check("h5sget_select_npoints_f", error, total_error)
+  CALL verify("h5sget_select_npoints_f", INT(npoints), 10, total_error)
+
+  ! Append another sequence of ten points to disk dataset
+    coord3(1,1)=15; coord3(2,1)=26;
+    coord3(1,2)= 1; coord3(2,2)= 1;
+    coord3(1,3)=12; coord3(2,3)=12;
+    coord3(1,4)= 6; coord3(2,4)=15;
+    coord3(1,5)= 4; coord3(2,5)= 6;
+    coord3(1,6)= 3; coord3(2,6)= 3;
+    coord3(1,7)= 8; coord3(2,7)=14;
+    coord3(1,8)=10; coord3(2,8)=17;
+    coord3(1,9)=13; coord3(2,9)=23;
+    coord3(1,10)=14; coord3(2,10)=10
+
+    CALL h5sselect_elements_f(sid2, H5S_SELECT_APPEND_F, SPACE3_RANK, INT(POINT1_NPOINTS,size_t), coord3, error)
+    CALL check("h5sselect_elements_f", error, total_error)
+
+  !  Verify correct elements selected
+  CALL h5sget_select_elem_pointlist_f(sid2, INT(POINT1_NPOINTS,hsize_t), INT(POINT1_NPOINTS,hsize_t),temp_coord3,error)
+  CALL check("h5sget_select_elem_pointlist_f", error, total_error)
+  DO i= 1, POINT1_NPOINTS
+     CALL verify("h5sget_select_elem_pointlist_f", INT(temp_coord3(1,i)), INT(coord3(1,i)), total_error)
+     CALL verify("h5sget_select_elem_pointlist_f", INT(temp_coord3(2,i)), INT(coord3(2,i)), total_error)
+  ENDDO
+
+  CALL H5Sget_select_npoints_f(sid2, npoints, error)
+  CALL check("h5sget_select_npoints_f", error, total_error)
+  CALL verify("h5sget_select_npoints_f", INT(npoints), 20, total_error)
+
+! F2003 feature
+!!$  Read selection from disk
+!!$    ret=H5Dread(dataset,H5T_NATIVE_UCHAR,sid2,sid1,xfer_plist,rbuf);
+!!$    CHECK(ret, FAIL, "H5Dread");
+!!$
+!!$     Check that the values match with a dataset iterator
+!!$    pi.buf=wbuf;
+!!$    pi.offset=0;
+!!$    ret = H5Diterate(rbuf,H5T_NATIVE_UCHAR,sid2,test_select_point_iter1,&pi);
+!!$    CHECK(ret, FAIL, "H5Diterate");
+!!$
+! F2003 feature
+
+  ! Close memory dataspace
+  CALL h5sclose_f(sid2, error)
+  CALL check("h5sclose_f", error, total_error)
+
+  ! Close disk dataspace
+  CALL h5sclose_f(sid1, error)
+  CALL check("h5sclose_f", error, total_error)
+
+  ! Close Dataset
+  CALL h5dclose_f(dataset, error)
+  CALL check("h5dclose_f", error, total_error)
+
+  ! Close file
+  CALL h5fclose_f(fid1, error)
+  CALL check("h5fclose_f", error, total_error)
+
+  IF(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
+  CALL check("h5_cleanup_f", error, total_error)
+
+END SUBROUTINE test_select_point
+
+
+!***************************************************************
+!**
+!**  test_select_combine(): Test basic H5S (dataspace) selection code.
+!**      Tests combining "all" and "none" selections with hyperslab
+!**      operations.
+!**
+!***************************************************************
+
+SUBROUTINE test_select_combine(total_error)
+
+  IMPLICIT NONE
+  INTEGER, INTENT(INOUT) :: total_error
+
+  INTEGER, PARAMETER :: SPACE7_RANK = 2
+  INTEGER, PARAMETER :: SPACE7_DIM1 = 10
+  INTEGER, PARAMETER :: SPACE7_DIM2 = 10
+
+  INTEGER(hid_t) :: base_id !       Base dataspace for test
+  INTEGER(hid_t) :: all_id !        Dataspace for "all" selection
+  INTEGER(hid_t) :: none_id !       Dataspace for "none" selection
+  INTEGER(hid_t) :: space1 !        Temporary dataspace #1
+  INTEGER(hsize_t), DIMENSION(1:SPACE7_RANK) :: start !  Hyperslab start
+  INTEGER(hsize_t), DIMENSION(1:SPACE7_RANK) :: stride !  Hyperslab stride
+  INTEGER(hsize_t), DIMENSION(1:SPACE7_RANK) :: icount !  Hyperslab count
+  INTEGER(hsize_t), DIMENSION(1:SPACE7_RANK) :: iblock !  Hyperslab BLOCK
+  INTEGER(hsize_t), DIMENSION(1:SPACE7_RANK) :: dims = (/SPACE7_DIM1,SPACE7_DIM2/) ! Dimensions of dataspace
+  INTEGER :: sel_type !  Selection type
+  INTEGER(hssize_t) :: nblocks   ! Number of hyperslab blocks
+  INTEGER(hsize_t), DIMENSION(1:128,1:2,1:SPACE7_RANK) :: blocks !  List of blocks
+  INTEGER :: error, area
+
+  ! Create dataspace for dataset on disk
+  CALL h5screate_simple_f(SPACE7_RANK, dims, base_id, error)
+  CALL check("h5screate_simple_f", error, total_error)
+
+  !  Copy base dataspace and set selection to "all"
+  CALL h5scopy_f(base_id, all_id, error)
+  CALL check("h5scopy_f", error, total_error)
+
+  CALL H5Sselect_all_f(all_id, error)
+  CALL check("H5Sselect_all_f", error, total_error)
+
+  CALL H5Sget_select_type_f(all_id, sel_type, error)
+  CALL check("H5Sget_select_type_f", error, total_error)
+  CALL verify("H5Sget_select_type_f", INT(sel_type), INT(H5S_SEL_ALL_F), total_error)
+
+  ! Copy base dataspace and set selection to "none"
+  CALL h5scopy_f(base_id, none_id, error)
+  CALL check("h5scopy_f", error, total_error)
+
+  CALL H5Sselect_none_f(none_id, error)
+  CALL check("H5Sselect_none_f", error, total_error)
+
+  CALL H5Sget_select_type_f(none_id, sel_type, error)
+  CALL check("H5Sget_select_type_f", error, total_error)
+  CALL verify("H5Sget_select_type_f", INT(sel_type), INT(H5S_SEL_NONE_F), total_error)
+
+  ! Copy "all" selection & space
+  CALL H5Scopy_f(all_id, space1, error)
+  CALL check("h5scopy_f", error, total_error)
+
+  ! 'OR' "all" selection with another hyperslab
+  start(1:2) = 0
+  stride(1:2) = 1
+  icount(1:2) = 1
+  iblock(1:2) = (/5,4/)
+  CALL h5sselect_hyperslab_f(space1, H5S_SELECT_OR_F, start, &
+                                icount, error, stride, iblock)
+  CALL check("h5sselect_hyperslab_f", error, total_error)
+
+  ! Verify that it's still "all" selection
+  CALL H5Sget_select_type_f(space1, sel_type, error)
+  CALL check("H5Sget_select_type_f", error, total_error)
+  CALL verify("H5Sget_select_type_f", INT(sel_type), INT(H5S_SEL_ALL_F), total_error)
+
+  ! Close temporary dataspace
+  CALL h5sclose_f(space1, error)
+  CALL check("h5sclose_f", error, total_error)
+
+  ! Copy "all" selection & space
+  CALL H5Scopy_f(all_id, space1, error)
+  CALL check("h5scopy_f", error, total_error)
+
+  !  'AND' "all" selection with another hyperslab
+  start(1:2) = 0
+  stride(1:2) = 1
+  icount(1:2) = 1
+  iblock(1:2) = (/5,4/)
+  CALL h5sselect_hyperslab_f(space1, H5S_SELECT_AND_F, start, &
+       icount, error, stride, iblock)
+  CALL check("h5sselect_hyperslab_f", error, total_error)
+
+  ! Verify that the new selection is the same at the original block
+  CALL H5Sget_select_type_f(space1, sel_type, error)
+  CALL check("H5Sget_select_type_f", error, total_error)
+  CALL verify("H5Sget_select_type_f", INT(sel_type), INT( H5S_SEL_HYPERSLABS_F), total_error)
+
+  ! Verify that there is only one block
+  CALL h5sget_select_hyper_nblocks_f(space1, nblocks, error)
+  CALL check("h5sget_select_hyper_nblocks_f", error, total_error)
+  CALL verify("h5sget_select_hyper_nblocks_f", INT(nblocks), 1, total_error)
+
+  ! Retrieve the block defined
+  CALL h5sget_select_hyper_blocklist_f(space1, INT(0, hsize_t), INT(nblocks,hsize_t), blocks, error)
+  CALL check("h5sget_select_hyper_blocklist_f", error, total_error)
+
+  ! Verify that the correct block is defined
+
+  CALL verify("h5sget_select_hyper_blocklist_f", INT(blocks(1,1,1)), 1, total_error)
+  CALL verify("h5sget_select_hyper_blocklist_f", INT(blocks(2,1,1)), 1, total_error)
+  CALL verify("h5sget_select_hyper_blocklist_f", INT(blocks(3,1,1)), 5, total_error)
+  CALL verify("h5sget_select_hyper_blocklist_f", INT(blocks(4,1,1)), 4, total_error)
+
+  ! Close temporary dataspace
+  CALL h5sclose_f(space1, error)
+  CALL check("h5sclose_f", error, total_error)
+
+  ! Copy "all" selection & space
+  CALL H5Scopy_f(all_id, space1, error)
+  CALL check("h5scopy_f", error, total_error)
+
+  !  'XOR' "all" selection with another hyperslab
+  start(1:2) = 0
+  stride(1:2) = 1
+  icount(1:2) = 1
+  iblock(1:2) = (/5,4/)
+
+  CALL h5sselect_hyperslab_f(space1, H5S_SELECT_XOR_F, start, &
+       icount, error, stride, iblock)
+  CALL check("h5sselect_hyperslab_f", error, total_error)
+
+  !  Verify that the new selection is an inversion of the original block
+  CALL H5Sget_select_type_f(space1, sel_type, error)
+  CALL check("H5Sget_select_type_f", error, total_error)
+  CALL verify("H5Sget_select_type_f", INT(sel_type), INT( H5S_SEL_HYPERSLABS_F), total_error)
+
+  !  Verify that there are two blocks
+  CALL h5sget_select_hyper_nblocks_f(space1, nblocks, error)
+  CALL check("h5sget_select_hyper_nblocks_f", error, total_error)
+  CALL verify("h5sget_select_hyper_nblocks_f", INT(nblocks), 2, total_error)
+
+  !  Retrieve the block defined
+
+  blocks = -1 !  Reset block list
+  CALL h5sget_select_hyper_blocklist_f(space1, INT(0, hsize_t), INT(nblocks,hsize_t), blocks, error)
+  CALL check("h5sget_select_hyper_blocklist_f", error, total_error)
+
+  !  Verify that the correct block is defined
+
+  ! No guarantee is implied as the order in which blocks are listed.
+  ! So this will ONLY work for square domains iblock(1:2) = (/5,5/)
+!!$  CALL verify("h5sget_select_hyper_blocklist_f", INT(blocks(1,1,1)), 1, total_error)
+!!$  CALL verify("h5sget_select_hyper_blocklist_f", INT(blocks(2,1,1)), 5, total_error)
+!!$  CALL verify("h5sget_select_hyper_blocklist_f", INT(blocks(3,1,1)), 5, total_error)
+!!$  CALL verify("h5sget_select_hyper_blocklist_f", INT(blocks(4,1,1)), 10, total_error)
+!!$  CALL verify("h5sget_select_hyper_blocklist_f", INT(blocks(5,1,1)), 6, total_error)
+!!$  CALL verify("h5sget_select_hyper_blocklist_f", INT(blocks(6,1,1)), 1, total_error)
+!!$  CALL verify("h5sget_select_hyper_blocklist_f", INT(blocks(7,1,1)), 10, total_error)
+!!$  CALL verify("h5sget_select_hyper_blocklist_f", INT(blocks(8,1,1)), 10, total_error)
+
+  ! Otherwise make sure the "area" of the block is correct
+  area = (ABS(INT(blocks(1,1,1)-blocks(3,1,1)))+1)*(ABS(INT(blocks(2,1,1)-blocks(4,1,1)))+1)
+  area = area + (ABS(INT(blocks(5,1,1)-blocks(7,1,1)))+1)*(ABS(INT(blocks(6,1,1)-blocks(8,1,1)))+1)
+  CALL verify("h5sget_select_hyper_blocklist_f", area, 80, total_error)
+
+  ! Close temporary dataspace
+  CALL h5sclose_f(space1, error)
+  CALL check("h5sclose_f", error, total_error)
+
+  !  Copy "all" selection & space
+  CALL H5Scopy_f(all_id, space1, error)
+  CALL check("h5scopy_f", error, total_error)
+
+  !  'NOTB' "all" selection with another hyperslab
+  start(1:2) = 0
+  stride(1:2) = 1
+  icount(1:2) = 1
+  iblock(1:2) = (/5,4/) !5
+
+  CALL h5sselect_hyperslab_f(space1, H5S_SELECT_NOTB_F, start, &
+       icount, error, stride, iblock)
+  CALL check("h5sselect_hyperslab_f", error, total_error)
+
+  !  Verify that the new selection is an inversion of the original block
+  CALL H5Sget_select_type_f(space1, sel_type, error)
+  CALL check("H5Sget_select_type_f", error, total_error)
+  CALL verify("H5Sget_select_type_f", INT(sel_type), INT( H5S_SEL_HYPERSLABS_F), total_error)
+
+  !  Verify that there are two blocks
+  CALL h5sget_select_hyper_nblocks_f(space1, nblocks, error)
+  CALL check("h5sget_select_hyper_nblocks_f", error, total_error)
+  CALL verify("h5sget_select_hyper_nblocks_f", INT(nblocks), 2, total_error)
+
+  !  Retrieve the block defined
+  blocks = -1 !  Reset block list
+  CALL h5sget_select_hyper_blocklist_f(space1, INT(0, hsize_t), INT(nblocks,hsize_t), blocks, error)
+  CALL check("h5sget_select_hyper_blocklist_f", error, total_error)
+
+  !  Verify that the correct block is defined
+
+  ! No guarantee is implied as the order in which blocks are listed.
+  ! So this will ONLY work for square domains iblock(1:2) = (/5,5/)
+
+!!$  CALL verify("h5sget_select_hyper_blocklist_f", INT(blocks(1,1,1)), 1, total_error)
+!!$  CALL verify("h5sget_select_hyper_blocklist_f", INT(blocks(2,1,1)), 5, total_error)
+!!$  CALL verify("h5sget_select_hyper_blocklist_f", INT(blocks(3,1,1)), 5, total_error)
+!!$  CALL verify("h5sget_select_hyper_blocklist_f", INT(blocks(4,1,1)),10, total_error)
+!!$  CALL verify("h5sget_select_hyper_blocklist_f", INT(blocks(5,1,1)), 6, total_error)
+!!$  CALL verify("h5sget_select_hyper_blocklist_f", INT(blocks(6,1,1)), 1, total_error)
+!!$  CALL verify("h5sget_select_hyper_blocklist_f", INT(blocks(7,1,1)),10, total_error)
+!!$  CALL verify("h5sget_select_hyper_blocklist_f", INT(blocks(8,1,1)),10, total_error)
+
+  ! Otherwise make sure the "area" of the block is correct
+  area = (ABS(INT(blocks(1,1,1)-blocks(3,1,1)))+1)*(ABS(INT(blocks(2,1,1)-blocks(4,1,1)))+1)
+  area = area + (ABS(INT(blocks(5,1,1)-blocks(7,1,1)))+1)*(ABS(INT(blocks(6,1,1)-blocks(8,1,1)))+1)
+  CALL verify("h5sget_select_hyper_blocklist_f", area, 80, total_error)
+
+
+  !  Close temporary dataspace
+  CALL h5sclose_f(space1, error)
+  CALL check("h5sclose_f", error, total_error)
+  !  Copy "all" selection & space
+  CALL H5Scopy_f(all_id, space1, error)
+  CALL check("h5scopy_f", error, total_error)
+
+  !  'NOTA' "all" selection with another hyperslab
+  start(1:2) = 0
+  stride(1:2) = 1
+  icount(1:2) = 1
+  iblock(1:2) = (/5,4/) !5
+
+  CALL h5sselect_hyperslab_f(space1, H5S_SELECT_NOTA_F, start, &
+       icount, error, stride, iblock)
+  CALL check("h5sselect_hyperslab_f", error, total_error)
+
+  ! Verify that the new selection is the "none" selection
+  CALL H5Sget_select_type_f(space1, sel_type, error)
+  CALL check("H5Sget_select_type_f", error, total_error)
+  CALL verify("H5Sget_select_type_f", INT(sel_type), INT( H5S_SEL_NONE_F), total_error)
+
+  !  Close temporary dataspace
+  CALL h5sclose_f(space1, error)
+  CALL check("h5sclose_f", error, total_error)
+
+  !  Copy "none" selection & space
+  CALL H5Scopy_f(none_id, space1, error)
+  CALL check("h5scopy_f", error, total_error)
+
+  !  'OR' "none" selection with another hyperslab
+  start(1:2) = 0
+  stride(1:2) = 1
+  icount(1:2) = 1
+  iblock(1:2) = (/5,4/) !5
+
+  CALL h5sselect_hyperslab_f(space1, H5S_SELECT_OR_F, start, &
+       icount, error, stride, iblock)
+  CALL check("h5sselect_hyperslab_f", error, total_error)
+
+  !  Verify that the new selection is the same as the original hyperslab
+  CALL H5Sget_select_type_f(space1, sel_type, error)
+  CALL check("H5Sget_select_type_f", error, total_error)
+  CALL verify("H5Sget_select_type_f", INT(sel_type), INT( H5S_SEL_HYPERSLABS_F), total_error)
+
+
+  !  Verify that there is only one block
+  CALL h5sget_select_hyper_nblocks_f(space1, nblocks, error)
+  CALL check("h5sget_select_hyper_nblocks_f", error, total_error)
+  CALL verify("h5sget_select_hyper_nblocks_f", INT(nblocks), 1, total_error)
+
+  !  Retrieve the block defined
+  blocks = -1 !  Reset block list
+  CALL h5sget_select_hyper_blocklist_f(space1, INT(0, hsize_t), INT(nblocks,hsize_t), blocks, error)
+  CALL check("h5sget_select_hyper_blocklist_f", error, total_error)
+
+  !  Verify that the correct block is defined
+  CALL verify("h5sget_select_hyper_blocklist_f", INT(blocks(1,1,1)), 1, total_error)
+  CALL verify("h5sget_select_hyper_blocklist_f", INT(blocks(2,1,1)), 1, total_error)
+  CALL verify("h5sget_select_hyper_blocklist_f", INT(blocks(3,1,1)), 5, total_error)
+  CALL verify("h5sget_select_hyper_blocklist_f", INT(blocks(4,1,1)), 4, total_error)
+
+  !  Close temporary dataspace
+  CALL h5sclose_f(space1, error)
+  CALL check("h5sclose_f", error, total_error)
+
+  !  Copy "none" selection & space
+  CALL H5Scopy_f(none_id, space1, error)
+  CALL check("h5scopy_f", error, total_error)
+
+  !  'AND' "none" selection with another hyperslab
+  start(1:2) = 0
+  stride(1:2) = 1
+  icount(1:2) = 1
+  iblock(1:2) = (/5,4/) !5
+
+  CALL h5sselect_hyperslab_f(space1, H5S_SELECT_AND_F, start, &
+       icount, error, stride, iblock)
+  CALL check("h5sselect_hyperslab_f", error, total_error)
+
+  !  Verify that the new selection is the "none" selection
+  CALL H5Sget_select_type_f(space1, sel_type, error)
+  CALL check("H5Sget_select_type_f", error, total_error)
+  CALL verify("H5Sget_select_type_f", INT(sel_type), INT( H5S_SEL_NONE_F), total_error)
+
+  !  Close temporary dataspace
+  CALL h5sclose_f(space1, error)
+  CALL check("h5sclose_f", error, total_error)
+
+  !  Copy "none" selection & space
+  CALL H5Scopy_f(none_id, space1, error)
+  CALL check("h5scopy_f", error, total_error)
+
+  !  'XOR' "none" selection with another hyperslab
+  start(1:2) = 0
+  stride(1:2) = 1
+  icount(1:2) = 1
+  iblock(1:2) = (/5,4/) !5
+
+  CALL h5sselect_hyperslab_f(space1, H5S_SELECT_XOR_F, start, &
+       icount, error, stride, iblock)
+  CALL check("h5sselect_hyperslab_f", error, total_error)
+
+  !  Verify that the new selection is the same as the original hyperslab
+  CALL H5Sget_select_type_f(space1, sel_type, error)
+  CALL check("H5Sget_select_type_f", error, total_error)
+  CALL verify("H5Sget_select_type_f", INT(sel_type), INT( H5S_SEL_HYPERSLABS_F), total_error)
+
+
+  !  Verify that there is only one block
+  CALL h5sget_select_hyper_nblocks_f(space1, nblocks, error)
+  CALL check("h5sget_select_hyper_nblocks_f", error, total_error)
+  CALL verify("h5sget_select_hyper_nblocks_f", INT(nblocks), 1, total_error)
+
+  !  Retrieve the block defined
+  blocks = -1 !  Reset block list
+  CALL h5sget_select_hyper_blocklist_f(space1, INT(0, hsize_t), INT(nblocks,hsize_t), blocks, error)
+  CALL check("h5sget_select_hyper_blocklist_f", error, total_error)
+  !  Verify that the correct block is defined
+  CALL verify("h5sget_select_hyper_blocklist_f", INT(blocks(1,1,1)), 1, total_error)
+  CALL verify("h5sget_select_hyper_blocklist_f", INT(blocks(2,1,1)), 1, total_error)
+  CALL verify("h5sget_select_hyper_blocklist_f", INT(blocks(3,1,1)), 5, total_error)
+  CALL verify("h5sget_select_hyper_blocklist_f", INT(blocks(4,1,1)), 4, total_error)
+
+  !  Close temporary dataspace
+  CALL h5sclose_f(space1, error)
+  CALL check("h5sclose_f", error, total_error)
+
+  !  Copy "none" selection & space
+  CALL H5Scopy_f(none_id, space1, error)
+  CALL check("h5scopy_f", error, total_error)
+
+  !  'NOTB' "none" selection with another hyperslab
+  start(1:2) = 0
+  stride(1:2) = 1
+  icount(1:2) = 1
+  iblock(1:2) = (/5,4/) !5
+
+  CALL h5sselect_hyperslab_f(space1, H5S_SELECT_NOTB_F, start, &
+       icount, error, stride, iblock)
+  CALL check("h5sselect_hyperslab_f", error, total_error)
+
+  !  Verify that the new selection is the "none" selection
+  CALL H5Sget_select_type_f(space1, sel_type, error)
+  CALL check("H5Sget_select_type_f", error, total_error)
+  CALL verify("H5Sget_select_type_f", INT(sel_type), INT( H5S_SEL_NONE_F), total_error)
+
+  !  Close temporary dataspace
+  CALL h5sclose_f(space1, error)
+  CALL check("h5sclose_f", error, total_error)
+
+  !  Copy "none" selection & space
+  CALL H5Scopy_f(none_id, space1, error)
+  CALL check("h5scopy_f", error, total_error)
+
+  !  'NOTA' "none" selection with another hyperslab
+  start(1:2) = 0
+  stride(1:2) = 1
+  icount(1:2) = 1
+  iblock(1:2) = (/5,4/) !5
+  CALL h5sselect_hyperslab_f(space1, H5S_SELECT_NOTA_F, start, &
+       icount, error, stride, iblock)
+  CALL check("h5sselect_hyperslab_f", error, total_error)
+
+  !  Verify that the new selection is the same as the original hyperslab
+  CALL H5Sget_select_type_f(space1, sel_type, error)
+  CALL check("H5Sget_select_type_f", error, total_error)
+  CALL verify("H5Sget_select_type_f", INT(sel_type), INT( H5S_SEL_HYPERSLABS_F), total_error)
+
+  !  Verify that there is ONLY one BLOCK
+  CALL h5sget_select_hyper_nblocks_f(space1, nblocks, error)
+  CALL check("h5sget_select_hyper_nblocks_f", error, total_error)
+  CALL verify("h5sget_select_hyper_nblocks_f", INT(nblocks), 1, total_error)
+
+  !  Retrieve the block defined
+
+  blocks = -1 !  Reset block list
+  CALL h5sget_select_hyper_blocklist_f(space1, INT(0, hsize_t), INT(nblocks,hsize_t), blocks, error)
+  CALL check("h5sget_select_hyper_blocklist_f", error, total_error)
+
+
+  !  Verify that the correct block is defined
+
+  CALL verify("h5sget_select_hyper_blocklist_f", INT(blocks(1,1,1)), 1, total_error)
+  CALL verify("h5sget_select_hyper_blocklist_f", INT(blocks(2,1,1)), 1, total_error)
+  CALL verify("h5sget_select_hyper_blocklist_f", INT(blocks(3,1,1)), 5, total_error)
+  CALL verify("h5sget_select_hyper_blocklist_f", INT(blocks(4,1,1)), 4, total_error)
+
+  !  Close temporary dataspace
+  CALL h5sclose_f(space1, error)
+  CALL check("h5sclose_f", error, total_error)
+
+  !  Close dataspaces
+
+  CALL h5sclose_f(base_id, error)
+  CALL check("h5sclose_f", error, total_error)
+  CALL h5sclose_f(all_id, error)
+  CALL check("h5sclose_f", error, total_error)
+  CALL h5sclose_f(none_id, error)
+  CALL check("h5sclose_f", error, total_error)
+
+END SUBROUTINE test_select_combine
+
+!***************************************************************
+!**
+!**  test_select_bounds(): Tests selection bounds on dataspaces,
+!**      both with and without offsets.
+!**
+!***************************************************************
+
+SUBROUTINE test_select_bounds(total_error)
+
+  IMPLICIT NONE
+  INTEGER, INTENT(INOUT) :: total_error
+
+  INTEGER, PARAMETER :: SPACE11_RANK=2
+  INTEGER, PARAMETER :: SPACE11_DIM1=100
+  INTEGER, PARAMETER :: SPACE11_DIM2=50
+  INTEGER, PARAMETER :: SPACE11_NPOINTS=4
+
+  INTEGER(hid_t) :: sid !  Dataspace ID
+  INTEGER(hsize_t), DIMENSION(1:SPACE11_RANK) :: dims = (/SPACE11_DIM1, SPACE11_DIM2/) !Dataspace dimensions
+  INTEGER(hsize_t), DIMENSION(SPACE11_RANK, SPACE11_NPOINTS) :: coord ! Coordinates for point selection
+  INTEGER(hsize_t), DIMENSION(SPACE11_RANK) :: start !  The start of the hyperslab
+  INTEGER(hsize_t), DIMENSION(SPACE11_RANK) :: stride ! The stride between block starts for the hyperslab
+  INTEGER(hsize_t), DIMENSION(SPACE11_RANK) :: count ! The number of blocks for the hyperslab
+  INTEGER(hsize_t), DIMENSION(SPACE11_RANK) :: BLOCK ! The size of each block for the hyperslab
+  INTEGER(hssize_t), DIMENSION(SPACE11_RANK) :: offset ! Offset amount for selection
+  INTEGER(hsize_t), DIMENSION(SPACE11_RANK) :: low_bounds ! The low bounds for the selection
+  INTEGER(hsize_t), DIMENSION(SPACE11_RANK) :: high_bounds ! The high bounds for the selection
+
+  INTEGER :: error
+
+  ! Create dataspace
+  CALL h5screate_simple_f(SPACE11_RANK, dims, sid, error)
+  CALL check("h5screate_simple_f", error, total_error)
+
+  !  Get bounds for 'all' selection
+  CALL h5sget_select_bounds_f(sid, low_bounds, high_bounds, error)
+  CALL check("h5sget_select_bounds_f", error, total_error)
+
+  CALL verify("h5sget_select_bounds_f", low_bounds(1), 1_hsize_t, total_error)
+  CALL verify("h5sget_select_bounds_f", low_bounds(2), 1_hsize_t, total_error)
+  CALL verify("h5sget_select_bounds_f", high_bounds(1), INT(SPACE11_DIM1, hsize_t), total_error)
+  CALL verify("h5sget_select_bounds_f", high_bounds(2), INT(SPACE11_DIM2, hsize_t), total_error)
+
+  ! Set offset for selection
+  offset(1:2) = 1
+  CALL H5Soffset_simple_f(sid, offset, error)
+  CALL check("H5Soffset_simple_f", error, total_error)
+
+  ! Get bounds for 'all' selection with offset (which should be ignored)
+  CALL h5sget_select_bounds_f(sid, low_bounds, high_bounds, error)
+  CALL check("h5sget_select_bounds_f", error, total_error)
+
+  CALL verify("h5sget_select_bounds_f", low_bounds(1), 1_hsize_t, total_error)
+  CALL verify("h5sget_select_bounds_f", low_bounds(2), 1_hsize_t, total_error)
+  CALL VERIFY("h5sget_select_bounds_f", high_bounds(1), INT(SPACE11_DIM1, hsize_t), total_error)
+  CALL verify("h5sget_select_bounds_f", high_bounds(2), INT(SPACE11_DIM2, hsize_t), total_error)
+
+  ! Reset offset for selection
+  offset(1:2) = 0
+  CALL H5Soffset_simple_f(sid, offset, error)
+  CALL check("H5Soffset_simple_f", error, total_error)
+
+  ! Set 'none' selection
+  CALL H5Sselect_none_f(sid, error)
+  CALL check("H5Sselect_none_f", error, total_error)
+
+  ! Get bounds for 'none' selection, should fail
+  CALL h5sget_select_bounds_f(sid, low_bounds, high_bounds, error)
+  CALL verify("h5sget_select_bounds_f", error, -1, total_error)
+
+  ! Set point selection
+
+  coord(1,1)=  3; coord(2,1)=  3;
+  coord(1,2)=  3; coord(2,2)= 46;
+  coord(1,3)= 96; coord(2,3)=  3;
+  coord(1,4)= 96; coord(2,4)= 46;
+
+  CALL h5sselect_elements_f(sid, H5S_SELECT_SET_F, SPACE11_RANK, INT(SPACE11_NPOINTS,size_t), coord, error)
+  CALL check("h5sselect_elements_f", error, total_error)
+
+  ! Get bounds for point selection
+  CALL h5sget_select_bounds_f(sid, low_bounds, high_bounds, error)
+  CALL check("h5sget_select_bounds_f", error, total_error)
+
+  CALL verify("h5sget_select_bounds_f", low_bounds(1), 3_hsize_t, total_error)
+  CALL verify("h5sget_select_bounds_f", low_bounds(2), 3_hsize_t, total_error)
+  CALL VERIFY("h5sget_select_bounds_f", high_bounds(1), INT(SPACE11_DIM1-4,hsize_t), total_error)
+  CALL verify("h5sget_select_bounds_f", high_bounds(2), INT(SPACE11_DIM2-4,hsize_t), total_error)
+
+  !  Set bad offset for selection
+
+  offset(1:2) = (/5,-5/)
+  CALL H5Soffset_simple_f(sid, offset, error)
+  CALL check("H5Soffset_simple_f", error, total_error)
+
+  !  Get bounds for hyperslab selection with negative offset
+  CALL h5sget_select_bounds_f(sid, low_bounds, high_bounds, error)
+  CALL verify("h5sget_select_bounds_f", error, -1, total_error)
+
+  !  Set valid offset for selection
+  offset(1:2) = (/2,-2/)
+  CALL H5Soffset_simple_f(sid, offset, error)
+  CALL check("H5Soffset_simple_f", error, total_error)
+
+  !  Get bounds for point selection with offset
+  CALL h5sget_select_bounds_f(sid, low_bounds, high_bounds, error)
+  CALL check("h5sget_select_bounds_f", error, total_error)
+
+  CALL verify("h5sget_select_bounds_f", low_bounds(1), 5_hsize_t, total_error)
+  CALL verify("h5sget_select_bounds_f", low_bounds(2), 1_hsize_t, total_error)
+  CALL verify("h5sget_select_bounds_f", high_bounds(1), INT(SPACE11_DIM1-2,hsize_t), total_error)
+  CALL verify("h5sget_select_bounds_f", high_bounds(2), INT(SPACE11_DIM2-6,hsize_t), total_error)
+
+  !  Reset offset for selection
+  offset(1:2) = 0
+  CALL H5Soffset_simple_f(sid, offset, error)
+  CALL check("H5Soffset_simple_f", error, total_error)
+
+  !  Set "regular" hyperslab selection
+  start(1:2) = 2
+  stride(1:2) = 10
+  count(1:2) = 4
+  block(1:2) = 5
+
+  CALL h5sselect_hyperslab_f(sid, H5S_SELECT_SET_F, start, &
+       count, error, stride, block)
+  CALL check("h5sselect_hyperslab_f", error, total_error)
+
+  ! Get bounds for hyperslab selection
+  CALL h5sget_select_bounds_f(sid, low_bounds, high_bounds, error)
+  CALL check("h5sget_select_bounds_f", error, total_error)
+
+  CALL verify("h5sget_select_bounds_f", low_bounds(1), 3_hsize_t, total_error)
+  CALL verify("h5sget_select_bounds_f", low_bounds(2), 3_hsize_t, total_error)
+  CALL verify("h5sget_select_bounds_f", high_bounds(1), 37_hsize_t, total_error)
+  CALL verify("h5sget_select_bounds_f", high_bounds(2), 37_hsize_t, total_error)
+
+  ! Set bad offset for selection
+  offset(1:2) = (/5,-5/)
+  CALL H5Soffset_simple_f(sid, offset, error)
+  CALL check("H5Soffset_simple_f", error, total_error)
+
+  !  Get bounds for hyperslab selection with negative offset
+  CALL h5sget_select_bounds_f(sid, low_bounds, high_bounds, error)
+  CALL verify("h5sget_select_bounds_f", error, -1, total_error)
+
+  !  Set valid offset for selection
+  offset(1:2) = (/5,-2/)
+  CALL H5Soffset_simple_f(sid, offset, error)
+  CALL check("H5Soffset_simple_f", error, total_error)
+
+  ! Get bounds for hyperslab selection with offset
+  CALL h5sget_select_bounds_f(sid, low_bounds, high_bounds, error)
+  CALL check("h5sget_select_bounds_f", error, total_error)
+
+  CALL verify("h5sget_select_bounds_f", low_bounds(1), 8_hsize_t, total_error)
+  CALL verify("h5sget_select_bounds_f", low_bounds(2), 1_hsize_t, total_error)
+  CALL verify("h5sget_select_bounds_f", high_bounds(1), 42_hsize_t, total_error)
+  CALL verify("h5sget_select_bounds_f", high_bounds(2), 35_hsize_t, total_error)
+
+  ! Reset offset for selection
+  offset(1:2) = 0
+  CALL H5Soffset_simple_f(sid, offset, error)
+  CALL check("H5Soffset_simple_f", error, total_error)
+
+  !  Make "irregular" hyperslab selection
+  start(1:2) = 20
+  stride(1:2) = 20
+  count(1:2) = 2
+  block(1:2) = 10
+
+  CALL h5sselect_hyperslab_f(sid, H5S_SELECT_OR_F, start, &
+       count, error, stride, block)
+  CALL check("h5sselect_hyperslab_f", error, total_error)
+
+  ! Get bounds for hyperslab selection
+  CALL h5sget_select_bounds_f(sid, low_bounds, high_bounds, error)
+  CALL check("h5sget_select_bounds_f", error, total_error)
+
+  CALL verify("h5sget_select_bounds_f", low_bounds(1), 3_hsize_t, total_error)
+  CALL verify("h5sget_select_bounds_f", low_bounds(2), 3_hsize_t, total_error)
+  CALL verify("h5sget_select_bounds_f", high_bounds(1), 50_hsize_t, total_error)
+  CALL verify("h5sget_select_bounds_f", high_bounds(2), 50_hsize_t, total_error)
+
+  !  Set bad offset for selection
+  offset(1:2) = (/5,-5/)
+  CALL H5Soffset_simple_f(sid, offset, error)
+  CALL check("H5Soffset_simple_f", error, total_error)
+
+  !  Get bounds for hyperslab selection with negative offset
+  CALL h5sget_select_bounds_f(sid, low_bounds, high_bounds, error)
+  CALL verify("h5sget_select_bounds_f", error, -1, total_error)
+
+  ! Set valid offset for selection
+  offset(1:2) = (/5,-2/)
+  CALL H5Soffset_simple_f(sid, offset, error)
+  CALL check("H5Soffset_simple_f", error, total_error)
+
+  ! Get bounds for hyperslab selection with offset
+  CALL h5sget_select_bounds_f(sid, low_bounds, high_bounds, error)
+  CALL check("h5sget_select_bounds_f", error, total_error)
+
+  CALL verify("h5sget_select_bounds_f", low_bounds(1), 8_hsize_t, total_error)
+  CALL verify("h5sget_select_bounds_f", low_bounds(2), 1_hsize_t, total_error)
+  CALL verify("h5sget_select_bounds_f", high_bounds(1), 55_hsize_t, total_error)
+  CALL verify("h5sget_select_bounds_f", high_bounds(2), 48_hsize_t, total_error)
+
+  ! Reset offset for selection
+  offset(1:2) = 0
+  CALL H5Soffset_simple_f(sid, offset, error)
+  CALL check("H5Soffset_simple_f", error, total_error)
+
+  ! Close the dataspace
+  CALL h5sclose_f(sid, error)
+  CALL check("h5sclose_f", error, total_error)
+
+END SUBROUTINE test_select_bounds
+
+END MODULE TH5SSELECT
diff --git a/fortran/test/tH5Sselect.f90 b/fortran/test/tH5Sselect.f90
deleted file mode 100644
index 7d07308..0000000
--- a/fortran/test/tH5Sselect.f90
+++ /dev/null
@@ -1,2000 +0,0 @@
-!****h* root/fortran/test/tH5Sselect.f90
-!
-! NAME
-!  tH5Sselect.f90
-!
-! FUNCTION
-!  Basic testing of Fortran H5S, Selection-related Dataspace Interface, APIs.
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! NOTES
-!  Tests the following functionalities:
-!    h5sget_select_npoints_f, h5sselect_elements_f, h5sselect_all_f,
-!    h5sselect_none_f, h5sselect_valid_f, h5sselect_hyperslab_f,
-!    h5sget_select_bounds_f, h5sget_select_elem_pointlist_f,
-!    h5sget_select_elem_npoints_f, h5sget_select_hyper_blocklist_f,
-!    h5sget_select_hyper_nblocks_f, h5sget_select_npoints_f   
-!
-! CONTAINS SUBROUTINES
-!  test_select_hyperslab, test_select_element, test_basic_select,
-!  test_select_point, test_select_combine, test_select_bounds
-!  
-!
-!*****
-MODULE TH5SSELECT
-
-CONTAINS
-
-  SUBROUTINE test_select_hyperslab(cleanup, total_error)
-
-    USE HDF5 ! This module contains all necessary modules
-    USE TH5_MISC
-
-    IMPLICIT NONE
-    LOGICAL, INTENT(IN) :: cleanup
-    INTEGER, INTENT(INOUT) :: total_error
-
-    CHARACTER(LEN=7), PARAMETER :: filename = "tselect"
-    CHARACTER(LEN=80) :: fix_filename
-
-    !
-    !dataset name is "IntArray"
-    !
-    CHARACTER(LEN=8), PARAMETER :: dsetname = "IntArray"
-
-    INTEGER(HID_T) :: file_id       ! File identifier
-    INTEGER(HID_T) :: dset_id       ! Dataset identifier
-    INTEGER(HID_T) :: dataspace     ! Dataspace identifier
-    INTEGER(HID_T) :: memspace      ! memspace identifier
-
-    !
-    !Memory space dimensions
-    !
-    INTEGER(HSIZE_T), DIMENSION(3) :: dimsm = (/7,7,3/)
-
-
-    !
-    !Dataset dimensions
-    !
-    INTEGER(HSIZE_T), DIMENSION(2) :: dimsf = (/5,6/)
-
-    !
-    !Size of the hyperslab in the file
-    !
-    INTEGER(HSIZE_T), DIMENSION(2) :: count = (/3,4/)
-
-    !
-    !hyperslab offset in the file
-    !
-    INTEGER(HSIZE_T), DIMENSION(2) :: offset = (/1,2/)
-
-    !
-    !Size of the hyperslab in memory
-    !
-    INTEGER(HSIZE_T), DIMENSION(3) :: count_out = (/3,4,1/)
-
-    !
-    !hyperslab offset in memory
-    !
-    INTEGER(HSIZE_T), DIMENSION(3) :: offset_out = (/3,0,0/)
-
-    !
-    !data to write
-    !
-    INTEGER, DIMENSION(5,6) :: data
-
-    !
-    !output buffer
-    !
-    INTEGER, DIMENSION(7,7,3) :: data_out
-
-
-    !
-    !dataset space rank
-    !
-    INTEGER :: dsetrank = 2
-
-    !
-    !memspace rank
-    !
-    INTEGER :: memrank = 3
-
-
-
-
-    !
-    !general purpose integer
-    !
-    INTEGER :: i, j
-
-    !
-    !flag to check operation success
-    !
-    INTEGER :: error
-    INTEGER(HSIZE_T), DIMENSION(3) :: data_dims
-
-
-    !
-    !This writes data to the HDF5 file.
-    !
-
-    !
-    !data initialization
-    !
-    do i = 1, 5
-       do j = 1, 6
-          data(i,j) = (i-1) + (j-1);
-       end do
-    end do
-    !
-    ! 0,  1,  2,  3,  4,  5
-    ! 1,  2,  3,  4,  5,  6
-    ! 2,  3,  4,  5,  6,  7
-    ! 3,  4,  5,  6,  7,  8
-    ! 4,  5,  6,  7,  8,  9
-    !
-
-    !
-    !Initialize FORTRAN predifined datatypes
-    !
-!    CALL h5init_types_f(error)
-!    CALL check("h5init_types_f", error, total_error)
-
-    !
-    !Create a new file using default properties.
-    !
-          CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
-          if (error .ne. 0) then
-              write(*,*) "Cannot modify filename"
-              stop
-          endif
-    CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
-    CALL check("h5fcreate_f", error, total_error)
-
-    !
-    !Create the data space for the  dataset.
-    !
-    CALL h5screate_simple_f(dsetrank, dimsf, dataspace, error)
-    CALL check("h5screate_simple_f", error, total_error)
-
-    !
-    ! Create the dataset with default properties
-    !
-    CALL h5dcreate_f(file_id, dsetname, H5T_STD_I32BE, dataspace, &
-         dset_id, error)
-    CALL check("h5dcreate_f", error, total_error)
-
-    !
-    ! Write the dataset
-    !
-    data_dims(1) = 5
-    data_dims(2) = 6
-    CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, data, data_dims, error)
-    CALL check("h5dwrite_f", error, total_error)
-
-    !
-    !Close the dataspace for the dataset.
-    !
-    CALL h5sclose_f(dataspace, error)
-    CALL check("h5sclose_f", error, total_error)
-
-    !
-    !Close the dataset.
-    !
-    CALL h5dclose_f(dset_id, error)
-    CALL check("h5dclose_f", error, total_error)
-
-    !
-    !Close the file.
-    !
-    CALL h5fclose_f(file_id, error)
-    CALL check("h5fclose_f", error, total_error)
-
-    !
-    !This reads the hyperslab from the sds.h5 file just
-    !created, into a 2-dimensional plane of the 3-dimensional array.
-    !
-
-    !
-    !initialize data_out array
-    !
-    !     do i = 1, 7
-    !          do j = 1, 7
-    !              do k = 1,3
-    !                  data_out(i,j,k) = 0;
-    !              end do
-    !          end do
-    !     end do
-
-    !
-    !Open the file.
-    !
-    CALL h5fopen_f (fix_filename, H5F_ACC_RDONLY_F, file_id, error)
-    CALL check("h5fopen_f", error, total_error)
-
-    !
-    !Open the  dataset.
-    !
-    CALL h5dopen_f(file_id, dsetname, dset_id, error)
-    CALL check("h5dopen_f", error, total_error)
-
-    !
-    !Get dataset's dataspace handle.
-    !
-    CALL h5dget_space_f(dset_id, dataspace, error)
-    CALL check("h5dget_space_f", error, total_error)
-
-    !
-    !Select hyperslab in the dataset.
-    !
-    CALL h5sselect_hyperslab_f(dataspace, H5S_SELECT_SET_F, &
-         offset, count, error)
-    CALL check("h5sselect_hyperslab_f", error, total_error)
-    !
-    !create memory dataspace.
-    !
-    CALL h5screate_simple_f(memrank, dimsm, memspace, error)
-    CALL check("h5screate_simple_f", error, total_error)
-
-    !
-    !Select hyperslab in memory.
-    !
-    CALL h5sselect_hyperslab_f(memspace, H5S_SELECT_SET_F, &
-         offset_out, count_out, error)
-    CALL check("h5sselect_hyperslab_f", error, total_error)
-
-    !
-    !Read data from hyperslab in the file into the hyperslab in
-    !memory and display.
-    !
-    data_dims(1) = 7
-    data_dims(2) = 7
-    data_dims(3) = 3
-    CALL h5dread_f(dset_id, H5T_NATIVE_INTEGER, data_out, data_dims, error, &
-         memspace, dataspace)
-    CALL check("h5dread_f", error, total_error)
-
-    !
-    !Display data_out array
-    !
-    !do i = 1, 7
-    !   print *, (data_out(i,j,1), j = 1,7)
-    !end do
-
-    ! 0 0 0 0 0 0 0
-    ! 0 0 0 0 0 0 0
-    ! 0 0 0 0 0 0 0
-    ! 3 4 5 6 0 0 0
-    ! 4 5 6 7 0 0 0
-    ! 5 6 7 8 0 0 0
-    ! 0 0 0 0 0 0 0
-    !
-
-    !
-    !Close the dataspace for the dataset.
-    !
-    CALL h5sclose_f(dataspace, error)
-    CALL check("h5sclose_f", error, total_error)
-
-    !
-    !Close the memoryspace.
-    !
-    CALL h5sclose_f(memspace, error)
-    CALL check("h5sclose_f", error, total_error)
-
-    !
-    !Close the dataset.
-    !
-    CALL h5dclose_f(dset_id, error)
-    CALL check("h5dclose_f", error, total_error)
-
-    !
-    !Close the file.
-    !
-    CALL h5fclose_f(file_id, error)
-    CALL check("h5fclose_f", error, total_error)
-
-
-          if(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
-              CALL check("h5_cleanup_f", error, total_error)
-    RETURN
-
-  END SUBROUTINE test_select_hyperslab
-
-  !
-  !Subroutine to test element selection
-  !
-
-  SUBROUTINE test_select_element(cleanup, total_error)
-
-    USE HDF5 ! This module contains all necessary modules
-    USE TH5_MISC
-
-    IMPLICIT NONE
-    LOGICAL, INTENT(IN)  :: cleanup
-    INTEGER, INTENT(INOUT) :: total_error
-
-    !
-    !the dataset1 is stored in file "copy1.h5"
-    !
-    CHARACTER(LEN=13), PARAMETER :: filename1 = "tselect_copy1"
-    CHARACTER(LEN=80) :: fix_filename1
-
-    !
-    !the dataset2 is stored in file "copy2.h5"
-    !
-    CHARACTER(LEN=13), PARAMETER :: filename2 = "tselect_copy2"
-    CHARACTER(LEN=80) :: fix_filename2
-    !
-    !dataset1 name is "Copy1"
-    !
-    CHARACTER(LEN=8), PARAMETER :: dsetname1 = "Copy1"
-
-    !
-    !dataset2 name is "Copy2"
-    !
-    CHARACTER(LEN=8), PARAMETER :: dsetname2 = "Copy2"
-
-    !
-    !dataset rank
-    !
-    INTEGER, PARAMETER :: RANK = 2
-
-    !
-    !number of points selected
-    !
-    INTEGER(SIZE_T), PARAMETER :: NUMP = 2
-
-    INTEGER(HID_T) :: file1_id       ! File1 identifier
-    INTEGER(HID_T) :: file2_id       ! File2 identifier
-    INTEGER(HID_T) :: dset1_id       ! Dataset1 identifier
-    INTEGER(HID_T) :: dset2_id       ! Dataset2 identifier
-    INTEGER(HID_T) :: dataspace1     ! Dataspace identifier
-    INTEGER(HID_T) :: dataspace2     ! Dataspace identifier
-    INTEGER(HID_T) :: memspace       ! memspace identifier
-
-    !
-    !Memory space dimensions
-    !
-    INTEGER(HSIZE_T), DIMENSION(1) :: dimsm = (/2/)
-
-    !
-    !Dataset dimensions
-    !
-    INTEGER(HSIZE_T), DIMENSION(2) :: dimsf = (/3,4/)
-
-    !
-    !Points positions in the file
-    !
-    INTEGER(HSIZE_T), DIMENSION(RANK,NUMP) :: coord
-
-    !
-    !data buffers
-    !
-    INTEGER, DIMENSION(3,4) :: buf1, buf2, bufnew
-
-    !
-    !value to write
-    !
-    INTEGER, DIMENSION(2) :: val = (/53, 59/)
-
-    !
-    !memory rank
-    !
-    INTEGER :: memrank = 1
-
-    !
-    !general purpose integer
-    !
-    INTEGER :: i, j
-
-    !
-    !flag to check operation success
-    !
-    INTEGER :: error
-    INTEGER(HSIZE_T), DIMENSION(3) :: data_dims
-
-
-    !
-    !Create two files containing identical datasets. Write 0's to one
-    !and 1's to the other.
-    !
-
-    !
-    !data initialization
-    !
-    do i = 1, 3
-       do j = 1, 4
-          buf1(i,j) = 0;
-       end do
-    end do
-
-    do i = 1, 3
-       do j = 1, 4
-          buf2(i,j) = 1;
-       end do
-    end do
-
-    !
-    !Initialize FORTRAN predifined datatypes
-    !
-!    CALL h5init_types_f(error)
-!    CALL check("h5init_types_f", error, total_error)
-
-    !
-    !Create file1, file2  using default properties.
-    !
-          CALL h5_fixname_f(filename1, fix_filename1, H5P_DEFAULT_F, error)
-          if (error .ne. 0) then
-              write(*,*) "Cannot modify filename"
-              stop
-          endif
-    CALL h5fcreate_f(fix_filename1, H5F_ACC_TRUNC_F, file1_id, error)
-    CALL check("h5fcreate_f", error, total_error)
-
-          CALL h5_fixname_f(filename2, fix_filename2, H5P_DEFAULT_F, error)
-          if (error .ne. 0) then
-              write(*,*) "Cannot modify filename"
-              stop
-          endif
-    CALL h5fcreate_f(fix_filename2, H5F_ACC_TRUNC_F, file2_id, error)
-    CALL check("h5fcreate_f", error, total_error)
-
-    !
-    !Create the data space for the  datasets.
-    !
-    CALL h5screate_simple_f(RANK, dimsf, dataspace1, error)
-    CALL check("h5screate_simple_f", error, total_error)
-
-    CALL h5screate_simple_f(RANK, dimsf, dataspace2, error)
-    CALL check("h5screate_simple_f", error, total_error)
-
-    !
-    ! Create the datasets with default properties
-    !
-    CALL h5dcreate_f(file1_id, dsetname1, H5T_NATIVE_INTEGER, dataspace1, &
-         dset1_id, error)
-    CALL check("h5dcreate_f", error, total_error)
-
-    CALL h5dcreate_f(file2_id, dsetname2, H5T_NATIVE_INTEGER, dataspace2, &
-         dset2_id, error)
-    CALL check("h5dcreate_f", error, total_error)
-
-    !
-    ! Write the datasets
-    !
-    data_dims(1) = 3
-    data_dims(2) = 4
-    CALL h5dwrite_f(dset1_id, H5T_NATIVE_INTEGER, buf1, data_dims, error)
-    CALL check("h5dwrite_f", error, total_error)
-
-    CALL h5dwrite_f(dset2_id, H5T_NATIVE_INTEGER, buf2, data_dims, error)
-    CALL check("h5dwrite_f", error, total_error)
-
-    !
-    !Close the dataspace for the datasets.
-    !
-    CALL h5sclose_f(dataspace1, error)
-    CALL check("h5sclose_f", error, total_error)
-
-    CALL h5sclose_f(dataspace2, error)
-    CALL check("h5sclose_f", error, total_error)
-
-    !
-    !Close the datasets.
-    !
-    CALL h5dclose_f(dset1_id, error)
-    CALL check("h5dclose_f", error, total_error)
-
-    CALL h5dclose_f(dset2_id, error)
-    CALL check("h5dclose_f", error, total_error)
-
-    !
-    !Close the files.
-    !
-    CALL h5fclose_f(file1_id, error)
-    CALL check("h5fclose_f", error, total_error)
-
-    CALL h5fclose_f(file2_id, error)
-    CALL check("h5fclose_f", error, total_error)
-
-    !
-    !Open the two files.  Select two points in one file, write values to
-    !those point locations, then do H5Scopy and write the values to the
-    !other file.  Close files.
-    !
-
-    !
-    !Open the files.
-    !
-    CALL h5fopen_f (fix_filename1, H5F_ACC_RDWR_F, file1_id, error)
-    CALL check("h5fopen_f", error, total_error)
-
-    CALL h5fopen_f (fix_filename2, H5F_ACC_RDWR_F, file2_id, error)
-    CALL check("h5fopen_f", error, total_error)
-
-    !
-    !Open the  datasets.
-    !
-    CALL h5dopen_f(file1_id, dsetname1, dset1_id, error)
-    CALL check("h5dopen_f", error, total_error)
-
-    CALL h5dopen_f(file2_id, dsetname2, dset2_id, error)
-    CALL check("h5dopen_f", error, total_error)
-
-    !
-    !Get dataset1's dataspace handle.
-    !
-    CALL h5dget_space_f(dset1_id, dataspace1, error)
-    CALL check("h5dget_space_f", error, total_error)
-
-    !
-    !create memory dataspace.
-    !
-    CALL h5screate_simple_f(memrank, dimsm, memspace, error)
-    CALL check("h5screate_simple_f", error, total_error)
-
-    !
-    !Set the selected point positions.Because Fortran array index starts
-    ! from 1, so add one to the actual select points in C
-    !
-    coord(1,1) = 1
-    coord(2,1) = 2
-    coord(1,2) = 1
-    coord(2,2) = 4
-
-    !
-    !Select the elements in file space
-    !
-    CALL h5sselect_elements_f(dataspace1, H5S_SELECT_SET_F, RANK, NUMP,&
-         coord, error)
-    CALL check("h5sselect_elements_f", error, total_error)
-
-    !
-    !Write value into the selected points in dataset1
-    !
-    data_dims(1) = 2
-    CALL H5dwrite_f(dset1_id, H5T_NATIVE_INTEGER, val, data_dims, error, &
-         mem_space_id=memspace, file_space_id=dataspace1)
-    CALL check("h5dwrite_f", error, total_error)
-
-    !
-    !Copy the daspace1 into dataspace2
-    !
-    CALL h5scopy_f(dataspace1, dataspace2, error)
-    CALL check("h5scopy_f", error, total_error)
-
-    !
-    !Write value into the selected points in dataset2
-    !
-    CALL H5dwrite_f(dset2_id, H5T_NATIVE_INTEGER, val, data_dims, error, &
-         mem_space_id=memspace, file_space_id=dataspace2)
-    CALL check("h5dwrite_f", error, total_error)
-
-    !
-    !Close the dataspace for the datasets.
-    !
-    CALL h5sclose_f(dataspace1, error)
-    CALL check("h5sclose_f", error, total_error)
-
-    CALL h5sclose_f(dataspace2, error)
-    CALL check("h5sclose_f", error, total_error)
-
-    !
-    !Close the memoryspace.
-    !
-    CALL h5sclose_f(memspace, error)
-    CALL check("h5sclose_f", error, total_error)
-
-    !
-    !Close the datasets.
-    !
-    CALL h5dclose_f(dset1_id, error)
-    CALL check("h5dclose_f", error, total_error)
-
-    CALL h5dclose_f(dset2_id, error)
-    CALL check("h5dclose_f", error, total_error)
-
-    !
-    !Close the files.
-    !
-    CALL h5fclose_f(file1_id, error)
-    CALL check("h5fclose_f", error, total_error)
-
-    CALL h5fclose_f(file2_id, error)
-    CALL check("h5fclose_f", error, total_error)
-
-    !
-    !Open both files and print the contents of the datasets.
-    !
-
-    !
-    !Open the files.
-    !
-    CALL h5fopen_f (fix_filename1, H5F_ACC_RDWR_F, file1_id, error)
-    CALL check("h5fopen_f", error, total_error)
-
-    CALL h5fopen_f (fix_filename2, H5F_ACC_RDWR_F, file2_id, error)
-    CALL check("h5fopen_f", error, total_error)
-
-    !
-    !Open the  datasets.
-    !
-    CALL h5dopen_f(file1_id, dsetname1, dset1_id, error)
-    CALL check("h5dopen_f", error, total_error)
-
-    CALL h5dopen_f(file2_id, dsetname2, dset2_id, error)
-    CALL check("h5dopen_f", error, total_error)
-
-    !
-    !Read dataset1.
-    !
-    data_dims(1) = 3
-    data_dims(2) = 4
-    CALL h5dread_f(dset1_id, H5T_NATIVE_INTEGER, bufnew, data_dims, error)
-    CALL check("h5dread_f", error, total_error)
-
-    !
-    !Display the data read from dataset "Copy1"
-    !
-    !write(*,*) "The data in dataset Copy1 is: "
-    !do i = 1, 3
-    !   print *, (bufnew(i,j), j = 1,4)
-    !end do
-
-    !
-    !Read dataset2.
-    !
-    CALL h5dread_f(dset2_id, H5T_NATIVE_INTEGER, bufnew, data_dims, error)
-    CALL check("h5dread_f", error, total_error)
-
-    !
-    !Display the data read from dataset "Copy2"
-    !
-    !write(*,*) "The data in dataset Copy2 is: "
-    !do i = 1, 3
-    !   print *, (bufnew(i,j), j = 1,4)
-    !end do
-
-    !
-    !Close the datasets.
-    !
-    CALL h5dclose_f(dset1_id, error)
-    CALL check("h5dclose_f", error, total_error)
-
-    CALL h5dclose_f(dset2_id, error)
-    CALL check("h5dclose_f", error, total_error)
-
-    !
-    !Close the files.
-    !
-    CALL h5fclose_f(file1_id, error)
-    CALL check("h5fclose_f", error, total_error)
-
-    CALL h5fclose_f(file2_id, error)
-    CALL check("h5fclose_f", error, total_error)
-
-
-          if(cleanup) CALL h5_cleanup_f(filename1, H5P_DEFAULT_F, error)
-              CALL check("h5_cleanup_f", error, total_error)
-          if(cleanup) CALL h5_cleanup_f(filename2, H5P_DEFAULT_F, error)
-              CALL check("h5_cleanup_f", error, total_error)
-     RETURN
-  END SUBROUTINE  test_select_element
-
-
-  SUBROUTINE test_basic_select(cleanup, total_error)
-    USE HDF5 ! This module contains all necessary modules
-    USE TH5_MISC
-
-    IMPLICIT NONE
-    LOGICAL, INTENT(IN)  :: cleanup
-    INTEGER, INTENT(INOUT) :: total_error
-
-     !
-     !the dataset is stored in file "testselect.h5"
-     !
-     CHARACTER(LEN=10), PARAMETER :: filename = "testselect"
-     CHARACTER(LEN=80) :: fix_filename
-
-     !
-     !dataspace rank
-     !
-     INTEGER, PARAMETER :: RANK = 2
-
-     !
-     !select NUMP_POINTS points from the file
-     !
-     INTEGER(SIZE_T), PARAMETER :: NUMPS = 10
-
-     !
-     !dataset name is "testselect"
-     !
-     CHARACTER(LEN=10), PARAMETER :: dsetname = "testselect"
-
-     INTEGER(HID_T) :: file_id       ! File identifier
-     INTEGER(HID_T) :: dset_id       ! Dataset identifier
-     INTEGER(HID_T) :: dataspace     ! Dataspace identifier
-
-     !
-     !Dataset dimensions
-     !
-     INTEGER(HSIZE_T), DIMENSION(2) :: dimsf = (/5,6/)
-
-     !
-     !Size of the hyperslab in the file
-     !
-     INTEGER(HSIZE_T), DIMENSION(2) :: count = (/2,2/)
-
-     !
-     !hyperslab offset in the file
-     !
-     INTEGER(HSIZE_T), DIMENSION(2) :: offset = (/0,0/)
-
-     !
-     !start block for getting the selected hyperslab
-     !
-     INTEGER(HSIZE_T) :: startblock = 0
-
-     !
-     !start point for getting the selected elements
-     !
-     INTEGER(HSIZE_T)  :: startpoint = 0
-
-     !
-     !Stride of the hyperslab in the file
-     !
-     INTEGER(HSIZE_T), DIMENSION(2) :: stride = (/3,3/)
-
-     !
-     !BLock size of the hyperslab in the file
-     !
-     INTEGER(HSIZE_T), DIMENSION(2) :: block = (/2,2/)
-
-     !
-     !array to give selected points' coordinations
-     !
-     INTEGER(HSIZE_T), DIMENSION(RANK, NUMPS) :: coord
-
-
-     !
-     !Number of hyperslabs selected in the current dataspace
-     !
-     INTEGER(HSSIZE_T) :: num_blocks
-
-     !
-     !allocatable array for putting a list of hyperslabs
-     !selected in the current file dataspace
-     !
-     INTEGER(HSIZE_T), ALLOCATABLE, DIMENSION(:) :: blocklist
-
-     !
-     !Number of points selected in the current dataspace
-     !
-     INTEGER(HSSIZE_T) :: num_points
-     INTEGER(HSIZE_T) :: num1_points
-
-     !
-     !allocatable array for putting a list of points
-     !selected in the current file dataspace
-     !
-     INTEGER(HSIZE_T), ALLOCATABLE, DIMENSION(:) :: pointlist
-
-     !
-     !start and end bounds in the current dataspace selection
-     !
-     INTEGER(HSIZE_T), DIMENSION(RANK) :: startout, endout
-
-     !
-     !data to write
-     !
-     INTEGER, DIMENSION(5,6) :: data
-
-     !
-     !flag to check operation success
-     !
-     INTEGER :: error
-     INTEGER(HSIZE_T), DIMENSION(3) :: data_dims
-
-     !
-     !initialize the coord array to give the selected points' position
-     !
-     coord(1,1) = 1
-     coord(2,1) = 1
-     coord(1,2) = 1
-     coord(2,2) = 3
-     coord(1,3) = 1
-     coord(2,3) = 5
-     coord(1,4) = 3
-     coord(2,4) = 1
-     coord(1,5) = 3
-     coord(2,5) = 3
-     coord(1,6) = 3
-     coord(2,6) = 5
-     coord(1,7) = 4
-     coord(2,7) = 3
-     coord(1,8) = 4
-     coord(2,8) = 1
-     coord(1,9) = 5
-     coord(2,9) = 3
-     coord(1,10) = 5
-     coord(2,10) = 5
-
-     !
-     !Create a new file using default properties.
-     !
-          CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
-          if (error .ne. 0) then
-              write(*,*) "Cannot modify filename"
-              stop
-          endif
-     CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
-     CALL check("h5fcreate_f", error, total_error)
-
-     !
-     !Create the data space for the  dataset.
-     !
-     CALL h5screate_simple_f(RANK, dimsf, dataspace, error)
-     CALL check("h5screate_simple_f", error, total_error)
-
-     !
-     ! Create the dataset with default properties
-     !
-     CALL h5dcreate_f(file_id, dsetname, H5T_STD_I32BE, dataspace, &
-                      dset_id, error)
-     CALL check("h5dcreate_f", error, total_error)
-
-     !
-     ! Write the dataset
-     !
-     data_dims(1) = 5
-     data_dims(2) = 6
-     CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, data, data_dims, error)
-     CALL check("h5dwrite_f", error, total_error)
-
-     !
-     !Close the dataspace for the dataset.
-     !
-     CALL h5sclose_f(dataspace, error)
-     CALL check("h5sclose_f", error, total_error)
-
-     !
-     !Close the dataset.
-     !
-     CALL h5dclose_f(dset_id, error)
-     CALL check("h5dclose_f", error, total_error)
-
-     !
-     !Close the file.
-     !
-     CALL h5fclose_f(file_id, error)
-     CALL check("h5fclose_f", error, total_error)
-
-     !
-     !Open the file.
-     !
-     CALL h5fopen_f (fix_filename, H5F_ACC_RDONLY_F, file_id, error)
-     CALL check("h5fopen_f", error, total_error)
-
-     !
-     !Open the  dataset.
-     !
-     CALL h5dopen_f(file_id, dsetname, dset_id, error)
-     CALL check("h5dopen_f", error, total_error)
-
-     !
-     !Get dataset's dataspace handle.
-     !
-     CALL h5dget_space_f(dset_id, dataspace, error)
-     CALL check("h5dget_space_f", error, total_error)
-
-     !
-     !Select hyperslab in the dataset.
-     !
-     CALL h5sselect_hyperslab_f(dataspace, H5S_SELECT_SET_F, &
-                                offset, count, error, stride, block)
-     CALL check("h5sselect_hyperslab_f", error, total_error)
-
-     !
-     !get the number of hyperslab blocks in the current dataspac selection
-     !
-     CALL h5sget_select_hyper_nblocks_f(dataspace, num_blocks, error)
-     CALL check("h5sget_select_hyper_nblocks_f", error, total_error)
-     IF (num_blocks .NE. 4) write (*,*) "error occured with num_blocks"
-     !write(*,*) num_blocks
-     !result of num_blocks is 4
-
-     !
-     !allocate the blocklist array
-     !
-     ALLOCATE(blocklist(num_blocks*RANK*2), STAT= error)
-     if(error .NE. 0) then
-         STOP
-     endif
-
-     !
-     !get the list of hyperslabs selected in the current dataspac selection
-     !
-     CALL h5sget_select_hyper_blocklist_f(dataspace, startblock, &
-                                          num_blocks, blocklist, error)
-     CALL check("h5sget_select_hyper_blocklist_f", error, total_error)
-!     write(*,*) (blocklist(i), i =1, num_blocks*RANK*2)
-     !result of blocklist selected is:
-     !1,  1,  2,  2,  4,  1,  5,  2,  1,  4,  2,  5,  4,  4,  5,  5
-
-     !
-     !deallocate the blocklist array
-     !
-     DEALLOCATE(blocklist)
-
-     !
-     !get the selection bounds in the current dataspac selection
-     !
-     CALL h5sget_select_bounds_f(dataspace, startout, endout, error)
-     CALL check("h5sget_select_bounds_f", error, total_error)
-     IF ( (startout(1) .ne. 1) .or. (startout(2) .ne. 1) ) THEN
-        write(*,*) "error occured to select_bounds's start position"
-     END IF
-
-     IF ( (endout(1) .ne. 5) .or. (endout(2) .ne. 5) ) THEN
-        write(*,*) "error occured to select_bounds's end position"
-     END IF
-     !write(*,*) (startout(i), i = 1, RANK)
-     !result of startout is 0, 0
-
-     !write(*,*) (endout(i), i = 1, RANK)
-     !result of endout is 5, 5
-
-     !
-     !allocate the pointlist array
-     !
-!     ALLOCATE(pointlist(num_blocks*RANK), STAT= error)
-     ALLOCATE(pointlist(20), STAT= error)
-     if(error .NE. 0) then
-         STOP
-     endif
-
-     !
-     !Select the elements in file space
-     !
-     CALL h5sselect_elements_f(dataspace, H5S_SELECT_SET_F, RANK, NUMPS,&
-                               coord, error)
-     CALL check("h5sselect_elements_f", error, total_error)
-
-     !
-     !Get the number of selected elements
-     !
-     CALL h5sget_select_elem_npoints_f(dataspace, num_points, error)
-     CALL check("h5sget_select_elem_npoints_f", error, total_error)
-     IF (num_points .NE. 10) write(*,*) "error occured with num_points"
-     !write(*,*) num_points
-     ! result of num_points is 10
-
-     !
-     !Get the list of selected elements
-     !
-     num1_points = num_points
-     CALL h5sget_select_elem_pointlist_f(dataspace, startpoint, &
-                                          num1_points, pointlist, error)
-     CALL check("h5sget_select_elem_pointlist_f", error, total_error)
-     !write(*,*) (pointlist(i), i =1, num1_points*RANK)
-     !result of pintlist is:
-     !1,  1,  3,  1,  5,  1,  1,  3,  3,  3,  5,  3,  3,
-     !4,  1,  4,  3,  5,  5,  5
-
-     !
-     !deallocate the pointlist array
-     !
-     DEALLOCATE(pointlist)
-
-     !
-     !Close the dataspace for the dataset.
-     !
-     CALL h5sclose_f(dataspace, error)
-     CALL check("h5sclose_f", error, total_error)
-
-     !
-     !Close the dataset.
-     !
-     CALL h5dclose_f(dset_id, error)
-     CALL check("h5dclose_f", error, total_error)
-
-     !
-     !Close the file.
-     !
-     CALL h5fclose_f(file_id, error)
-     CALL check("h5fclose_f", error, total_error)
-
-
-          if(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
-              CALL check("h5_cleanup_f", error, total_error)
-
-     RETURN
-  END SUBROUTINE  test_basic_select
-
-!***************************************************************
-!**
-!**  test_select_point(): Test basic H5S (dataspace) selection code.
-!**      Tests element selections between dataspaces of various sizes
-!**      and dimensionalities.
-!**
-!***************************************************************
-
-SUBROUTINE test_select_point(cleanup, total_error)
-  USE HDF5 ! This module contains all necessary modules 
-  USE TH5_MISC
-  
-  IMPLICIT NONE
-  LOGICAL, INTENT(IN)  :: cleanup
-  INTEGER, INTENT(INOUT) :: total_error
-  INTEGER(HID_T) :: xfer_plist
-  
-  INTEGER, PARAMETER :: SPACE1_DIM1=3
-  INTEGER, PARAMETER :: SPACE1_DIM2=15
-  INTEGER, PARAMETER :: SPACE1_DIM3=13
-  INTEGER, PARAMETER :: SPACE2_DIM1=30
-  INTEGER, PARAMETER :: SPACE2_DIM2=26
-  INTEGER, PARAMETER :: SPACE3_DIM1=15
-  INTEGER, PARAMETER :: SPACE3_DIM2=26
-  
-  INTEGER, PARAMETER :: SPACE1_RANK=3
-  INTEGER, PARAMETER :: SPACE2_RANK=2
-  INTEGER, PARAMETER :: SPACE3_RANK=2
-  
-  !  Element selection information 
-  INTEGER, PARAMETER :: POINT1_NPOINTS=10
-  INTEGER(hid_t) ::fid1 !  HDF5 File IDs 
-  INTEGER(hid_t) ::dataset !	 Dataset ID 
-  INTEGER(hid_t) ::sid1,sid2 !  Dataspace ID 
-  INTEGER(hsize_t), DIMENSION(1:3) :: dims1 = (/SPACE1_DIM1, SPACE1_DIM2, SPACE1_DIM3/)
-  INTEGER(hsize_t), DIMENSION(1:2) :: dims2 = (/SPACE2_DIM1, SPACE2_DIM2/)
-  INTEGER(hsize_t), DIMENSION(1:2) :: dims3 = (/SPACE3_DIM1, SPACE3_DIM2/)
-  
-  INTEGER(hsize_t), DIMENSION(1:SPACE1_RANK,1:POINT1_NPOINTS) :: coord1 ! Coordinates for point selection 
-  INTEGER(hsize_t), DIMENSION(1:SPACE1_RANK,1:POINT1_NPOINTS) :: temp_coord1 ! Coordinates for point selection 
-  INTEGER(hsize_t), DIMENSION(1:SPACE2_RANK,1:POINT1_NPOINTS) :: coord2 ! Coordinates for point selection 
-  INTEGER(hsize_t), DIMENSION(1:SPACE2_RANK,1:POINT1_NPOINTS) :: temp_coord2 ! Coordinates for point selection 
-  INTEGER(hsize_t), DIMENSION(1:SPACE3_RANK,1:POINT1_NPOINTS) :: coord3 ! Coordinates for point selection 
-  INTEGER(hsize_t), DIMENSION(1:SPACE3_RANK,1:POINT1_NPOINTS) :: temp_coord3 ! Coordinates for point selection 
-  INTEGER(hssize_t) :: npoints
-
-!!$    uint8_t    *wbuf,        buffer to write to disk 
-!!$               *rbuf,        buffer read from disk 
-!!$               *tbuf;        temporary buffer pointer 
-  INTEGER :: i,j;        ! Counters 
-!    struct pnt_iter pi;      Custom Pointer iterator struct 
-  INTEGER :: error    ! Generic return value		
-  CHARACTER(LEN=9) :: filename = 'h5s_hyper'
-  CHARACTER(LEN=80) :: fix_filename 
-  CHARACTER(LEN=1), DIMENSION(1:SPACE2_DIM1,1:SPACE2_DIM2) :: wbuf
-
-  CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
-  IF (error .NE. 0) THEN
-     WRITE(*,*) "Cannot modify filename"
-     STOP
-  ENDIF
-  xfer_plist = H5P_DEFAULT_F
-!    MESSAGE(5, ("Testing Element Selection Functions\n"));
-
-    ! Allocate write & read buffers 
-!!$  wbuf = HDmalloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2);
-!!$  rbuf = HDcalloc(sizeof(uint8_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2));
-!!$
-  ! Initialize WRITE buffer 
-
-  DO i = 1, SPACE2_DIM1
-     DO j = 1, SPACE2_DIM2
-        wbuf(i,j) = 'a'
-     ENDDO
-  ENDDO
-
-!!$  for(i=0, tbuf=wbuf; i<SPACE2_DIM1; i++)
-!!$  for(j=0; j<SPACE2_DIM2; j++)
-!!$  *tbuf++=(uint8_t)((i*SPACE2_DIM2)+j);
-  
-  ! Create file 
-  CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, fid1, error)
-  CALL check("h5fcreate_f", error, total_error)
-  
-  ! Create dataspace for dataset 
-  CALL h5screate_simple_f(SPACE1_RANK, dims1, sid1, error)
-  CALL check("h5screate_simple_f", error, total_error)
-
-  ! Create dataspace for write buffer 
-  CALL h5screate_simple_f(SPACE2_RANK, dims2, sid2, error)
-  CALL check("h5screate_simple_f", error, total_error)
-
-  ! Select sequence of ten points for disk dataset 
-  coord1(1,1)=1; coord1(2,1)=11; coord1(3,1)= 6;
-  coord1(1,2)=2; coord1(2,2)= 3; coord1(3,2)= 8;
-  coord1(1,3)=3; coord1(2,3)= 5; coord1(3,3)=10;
-  coord1(1,4)=1; coord1(2,4)= 7; coord1(3,4)=12;
-  coord1(1,5)=2; coord1(2,5)= 9; coord1(3,5)=14;
-  coord1(1,6)=3; coord1(2,6)=13; coord1(3,6)= 1;
-  coord1(1,7)=1; coord1(2,7)=15; coord1(3,7)= 3;
-  coord1(1,8)=2; coord1(2,8)= 1; coord1(3,8)= 5;
-  coord1(1,9)=3; coord1(2,9)= 2; coord1(3,9)= 7;
-  coord1(1,10)=1; coord1(2,10)= 4; coord1(3,10)= 9
-
-  CALL h5sselect_elements_f(sid1, H5S_SELECT_SET_F, SPACE1_RANK, INT(POINT1_NPOINTS,size_t), coord1, error)
-  CALL check("h5sselect_elements_f", error, total_error)
-
-  ! Verify correct elements selected 
-
-  CALL h5sget_select_elem_pointlist_f(sid1, INT(0,hsize_t), INT(POINT1_NPOINTS,hsize_t),temp_coord1,error)
-  CALL check("h5sget_select_elem_pointlist_f", error, total_error)
-
-  DO i= 1, POINT1_NPOINTS
-     CALL VERIFY("h5sget_select_elem_pointlist_f", INT(temp_coord1(1,i)), INT(coord1(1,i)), total_error)
-     CALL VERIFY("h5sget_select_elem_pointlist_f", INT(temp_coord1(2,i)), INT(coord1(2,i)), total_error)
-     CALL VERIFY("h5sget_select_elem_pointlist_f", INT(temp_coord1(3,i)), INT(coord1(3,i)), total_error)
-  ENDDO
-
-  CALL H5Sget_select_npoints_f(sid1, npoints, error)
-  CALL check("h5sget_select_npoints_f", error, total_error)
-  CALL verify("h5sget_select_npoints_f", INT(npoints), 10, total_error)
-
-  ! Append another sequence of ten points to disk dataset 
-
-  coord1(1,1)=1; coord1(2,1)=3; coord1(3,1)= 1;
-  coord1(1,2)=2; coord1(2,2)=11; coord1(3,2)= 9;
-  coord1(1,3)=3; coord1(2,3)= 9; coord1(3,3)=11;
-  coord1(1,4)=1; coord1(2,4)= 8; coord1(3,4)=13;
-  coord1(1,5)=2; coord1(2,5)= 4; coord1(3,5)=12;
-  coord1(1,6)=3; coord1(2,6)= 2; coord1(3,6)= 2;
-  coord1(1,7)=1; coord1(2,7)=14; coord1(3,7)= 8;
-  coord1(1,8)=2; coord1(2,8)=15; coord1(3,8)= 7;
-  coord1(1,9)=3; coord1(2,9)= 3; coord1(3,9)= 6;
-  coord1(1,10)=1; coord1(2,10)= 7; coord1(3,10)= 14
-
-
-  CALL h5sselect_elements_f(sid1, H5S_SELECT_APPEND_F, SPACE1_RANK, INT(POINT1_NPOINTS,size_t), coord1, error)
-  CALL check("h5sselect_elements_f", error, total_error)
-  !  Verify correct elements selected 
-  
-  CALL h5sget_select_elem_pointlist_f(sid1, INT(POINT1_NPOINTS,hsize_t), INT(POINT1_NPOINTS,hsize_t),temp_coord1,error)
-  CALL check("h5sget_select_elem_pointlist_f", error, total_error)
-
-  DO i= 1, POINT1_NPOINTS
-     CALL VERIFY("h5sget_select_elem_pointlist_f", INT(temp_coord1(1,i)), INT(coord1(1,i)), total_error)
-     CALL VERIFY("h5sget_select_elem_pointlist_f", INT(temp_coord1(2,i)), INT(coord1(2,i)), total_error)
-     CALL VERIFY("h5sget_select_elem_pointlist_f", INT(temp_coord1(3,i)), INT(coord1(3,i)), total_error)
-  ENDDO
-
-  CALL H5Sget_select_npoints_f(sid1, npoints, error)
-  CALL check("h5sget_select_npoints_f", error, total_error)
-  CALL verify("h5sget_select_npoints_f", INT(npoints), 20, total_error)
-
-  !  Select sequence of ten points for memory dataset 
-  coord2(1,1)=13; coord2(2,1)= 4;
-  coord2(1,2)=16; coord2(2,2)=14;
-  coord2(1,3)= 8; coord2(2,3)=26;
-  coord2(1,4)= 1; coord2(2,4)= 7;
-  coord2(1,5)=14; coord2(2,5)= 1;
-  coord2(1,6)=25; coord2(2,6)=12;
-  coord2(1,7)=13; coord2(2,7)=22;
-  coord2(1,8)=30; coord2(2,8)= 5;
-  coord2(1,9)= 9; coord2(2,9)= 9;
-  coord2(1,10)=20; coord2(2,10)=18
-
-  CALL h5sselect_elements_f(sid2, H5S_SELECT_SET_F, SPACE2_RANK, INT(POINT1_NPOINTS,size_t), coord2, error)
-  CALL check("h5sselect_elements_f", error, total_error)
-
-
-  ! Verify correct elements selected 
-  
-  CALL h5sget_select_elem_pointlist_f(sid2, INT(0,hsize_t), INT(POINT1_NPOINTS,hsize_t),temp_coord2,error)
-  CALL check("h5sget_select_elem_pointlist_f", error, total_error)
-
-  DO i= 1, POINT1_NPOINTS
-     CALL VERIFY("h5sget_select_elem_pointlist_f", INT(temp_coord2(1,i)), INT(coord2(1,i)), total_error)
-     CALL VERIFY("h5sget_select_elem_pointlist_f", INT(temp_coord2(2,i)), INT(coord2(2,i)), total_error)
-  ENDDO
-
-!!$
-!!$     Save points for later iteration 
-!!$     (these are in the second half of the buffer, because we are prepending 
-!!$      the next list of points to the beginning of the point selection list) 
-!!$    HDmemcpy(((char *)pi.coord)+sizeof(coord2),coord2,sizeof(coord2));
-!!$
-
-  CALL H5Sget_select_npoints_f(sid2, npoints, error)
-  CALL check("h5sget_select_npoints_f", error, total_error)
-  CALL verify("h5sget_select_npoints_f", INT(npoints), 10, total_error)
-
-  ! Append another sequence of ten points to memory dataset 
-  coord2(1,1)=25; coord2(2,1)= 1;
-  coord2(1,2)= 3; coord2(2,2)=26;
-  coord2(1,3)=14; coord2(2,3)=18;
-  coord2(1,4)= 9; coord2(2,4)= 4;
-  coord2(1,5)=30; coord2(2,5)= 5;
-  coord2(1,6)=12; coord2(2,6)=15;
-  coord2(1,7)= 6; coord2(2,7)=23;
-  coord2(1,8)=13; coord2(2,8)= 3;
-  coord2(1,9)=22; coord2(2,9)=13;
-  coord2(1,10)= 10; coord2(2,10)=19
-
-  CALL h5sselect_elements_f(sid2, H5S_SELECT_PREPEND_F, SPACE2_RANK, INT(POINT1_NPOINTS,size_t), coord2, error)
-  CALL check("h5sselect_elements_f", error, total_error)
-
-
-  ! Verify correct elements selected 
-  CALL h5sget_select_elem_pointlist_f(sid2, INT(0,hsize_t), INT(POINT1_NPOINTS,hsize_t),temp_coord2,error)
-  CALL check("h5sget_select_elem_pointlist_f", error, total_error)
-
-  DO i= 1, POINT1_NPOINTS
-     CALL VERIFY("h5sget_select_elem_pointlist_f", INT(temp_coord2(1,i)), INT(coord2(1,i)), total_error)
-     CALL VERIFY("h5sget_select_elem_pointlist_f", INT(temp_coord2(2,i)), INT(coord2(2,i)), total_error)
-  ENDDO
-
-  CALL H5Sget_select_npoints_f(sid2, npoints, error)
-  CALL check("h5sget_select_npoints_f", error, total_error)
-  CALL verify("h5sget_select_npoints_f", INT(npoints), 20, total_error)
-
-!!$     Save points for later iteration 
-!!$    HDmemcpy(pi.coord,coord2,sizeof(coord2));
-
-  !  Create a dataset 
-  CALL h5dcreate_f(fid1, "Dataset1", H5T_NATIVE_CHARACTER, sid1, dataset, error)
-  CALL check("h5dcreate_f", error, total_error)
-
-  !  Write selection to disk 
-  CALL h5dwrite_f(dataset, H5T_NATIVE_CHARACTER, wbuf, dims2, error, sid2, sid1, xfer_plist)
-  CALL check("h5dwrite_f", error, total_error)
-
-  !  Close memory dataspace 
-  CALL h5sclose_f(sid2, error)
-  CALL check("h5sclose_f", error, total_error)
-
-  !  Create dataspace for reading buffer 
-  CALL h5screate_simple_f(SPACE3_RANK, dims3, sid2, error)
-  CALL check("h5screate_simple_f", error, total_error)
-
-  !  Select sequence of points for read dataset 
-  coord3(1,1)= 1; coord3(2,1)= 3;
-  coord3(1,2)= 5; coord3(2,2)= 9;
-  coord3(1,3)=14; coord3(2,3)=14;
-  coord3(1,4)=15; coord3(2,4)=21;
-  coord3(1,5)= 8; coord3(2,5)=10;
-  coord3(1,6)= 3; coord3(2,6)= 1;
-  coord3(1,7)= 10; coord3(2,7)=20;
-  coord3(1,8)= 2; coord3(2,8)=23;
-  coord3(1,9)=13; coord3(2,9)=22;
-  coord3(1,10)=12; coord3(2,10)=7;
-
-  CALL h5sselect_elements_f(sid2, H5S_SELECT_SET_F, SPACE3_RANK, INT(POINT1_NPOINTS,size_t), coord3, error)
-  CALL check("h5sselect_elements_f", error, total_error)
-
-  !  Verify correct elements selected 
-  CALL h5sget_select_elem_pointlist_f(sid2, INT(0,hsize_t), INT(POINT1_NPOINTS,hsize_t),temp_coord3,error)
-  CALL check("h5sget_select_elem_pointlist_f", error, total_error)
-  DO i= 1, POINT1_NPOINTS
-     CALL VERIFY("h5sget_select_elem_pointlist_f", INT(temp_coord3(1,i)), INT(coord3(1,i)), total_error)
-     CALL VERIFY("h5sget_select_elem_pointlist_f", INT(temp_coord3(2,i)), INT(coord3(2,i)), total_error)
-  ENDDO
-
-  CALL H5Sget_select_npoints_f(sid2, npoints, error)
-  CALL check("h5sget_select_npoints_f", error, total_error)
-  CALL verify("h5sget_select_npoints_f", INT(npoints), 10, total_error)
-
-  ! Append another sequence of ten points to disk dataset 
-    coord3(1,1)=15; coord3(2,1)=26;
-    coord3(1,2)= 1; coord3(2,2)= 1;
-    coord3(1,3)=12; coord3(2,3)=12;
-    coord3(1,4)= 6; coord3(2,4)=15;
-    coord3(1,5)= 4; coord3(2,5)= 6;
-    coord3(1,6)= 3; coord3(2,6)= 3;
-    coord3(1,7)= 8; coord3(2,7)=14;
-    coord3(1,8)=10; coord3(2,8)=17;
-    coord3(1,9)=13; coord3(2,9)=23;
-    coord3(1,10)=14; coord3(2,10)=10
-
-    CALL h5sselect_elements_f(sid2, H5S_SELECT_APPEND_F, SPACE3_RANK, INT(POINT1_NPOINTS,size_t), coord3, error)
-    CALL check("h5sselect_elements_f", error, total_error)
-
-  !  Verify correct elements selected 
-  CALL h5sget_select_elem_pointlist_f(sid2, INT(POINT1_NPOINTS,hsize_t), INT(POINT1_NPOINTS,hsize_t),temp_coord3,error)
-  CALL check("h5sget_select_elem_pointlist_f", error, total_error)
-  DO i= 1, POINT1_NPOINTS
-     CALL VERIFY("h5sget_select_elem_pointlist_f", INT(temp_coord3(1,i)), INT(coord3(1,i)), total_error)
-     CALL VERIFY("h5sget_select_elem_pointlist_f", INT(temp_coord3(2,i)), INT(coord3(2,i)), total_error)
-  ENDDO
-
-  CALL H5Sget_select_npoints_f(sid2, npoints, error)
-  CALL check("h5sget_select_npoints_f", error, total_error)
-  CALL verify("h5sget_select_npoints_f", INT(npoints), 20, total_error)
-
-! F2003 feature
-!!$  Read selection from disk 
-!!$    ret=H5Dread(dataset,H5T_NATIVE_UCHAR,sid2,sid1,xfer_plist,rbuf);
-!!$    CHECK(ret, FAIL, "H5Dread");
-!!$
-!!$     Check that the values match with a dataset iterator 
-!!$    pi.buf=wbuf;
-!!$    pi.offset=0;
-!!$    ret = H5Diterate(rbuf,H5T_NATIVE_UCHAR,sid2,test_select_point_iter1,&pi);
-!!$    CHECK(ret, FAIL, "H5Diterate");
-!!$
-! F2003 feature
-
-  ! Close memory dataspace 
-  CALL h5sclose_f(sid2, error)
-  CALL check("h5sclose_f", error, total_error)
-
-  ! Close disk dataspace 
-  CALL h5sclose_f(sid1, error)
-  CALL check("h5sclose_f", error, total_error)
-
-  ! Close Dataset 
-  CALL h5dclose_f(dataset, error)
-  CALL check("h5dclose_f", error, total_error)
-
-  ! Close file 
-  CALL h5fclose_f(fid1, error)
-  CALL check("h5fclose_f", error, total_error)
-
-  IF(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
-  CALL check("h5_cleanup_f", error, total_error)
-
-END SUBROUTINE test_select_point
-
-
-!***************************************************************
-!**
-!**  test_select_combine(): Test basic H5S (dataspace) selection code.
-!**      Tests combining "all" and "none" selections with hyperslab
-!**      operations.
-!**
-!***************************************************************
-
-SUBROUTINE test_select_combine(total_error)
-  USE HDF5 ! This module contains all necessary modules 
-  USE TH5_MISC
-  
-  IMPLICIT NONE
-  INTEGER, INTENT(INOUT) :: total_error
-
-  INTEGER, PARAMETER :: SPACE7_RANK = 2
-  INTEGER, PARAMETER :: SPACE7_DIM1 = 10
-  INTEGER, PARAMETER :: SPACE7_DIM2 = 10
-  
-  INTEGER(hid_t) :: base_id !       Base dataspace for test 
-  INTEGER(hid_t) :: all_id !        Dataspace for "all" selection 
-  INTEGER(hid_t) :: none_id !       Dataspace for "none" selection 
-  INTEGER(hid_t) :: space1 !        Temporary dataspace #1 
-  INTEGER(hsize_t), DIMENSION(1:SPACE7_RANK) :: start !  Hyperslab start 
-  INTEGER(hsize_t), DIMENSION(1:SPACE7_RANK) :: stride !  Hyperslab stride 
-  INTEGER(hsize_t), DIMENSION(1:SPACE7_RANK) :: icount !  Hyperslab count 
-  INTEGER(hsize_t), DIMENSION(1:SPACE7_RANK) :: iblock !  Hyperslab BLOCK 
-  INTEGER(hsize_t), DIMENSION(1:SPACE7_RANK) :: dims = (/SPACE7_DIM1,SPACE7_DIM2/) ! Dimensions of dataspace 
-  INTEGER :: sel_type !  Selection type 
-  INTEGER(hssize_t) :: nblocks   ! Number of hyperslab blocks 
-  INTEGER(hsize_t), DIMENSION(1:128,1:2,1:SPACE7_RANK) :: blocks !  List of blocks 
-  INTEGER :: error, area
-
-  ! Create dataspace for dataset on disk 
-  CALL h5screate_simple_f(SPACE7_RANK, dims, base_id, error)
-  CALL check("h5screate_simple_f", error, total_error)
-
-  !  Copy base dataspace and set selection to "all" 
-  CALL h5scopy_f(base_id, all_id, error)  
-  CALL check("h5scopy_f", error, total_error)
-
-  CALL H5Sselect_all_f(all_id, error)
-  CALL check("H5Sselect_all_f", error, total_error)
-
-  CALL H5Sget_select_type_f(all_id, sel_type, error)
-  CALL check("H5Sget_select_type_f", error, total_error)
-  CALL VERIFY("H5Sget_select_type_f", INT(sel_type), INT(H5S_SEL_ALL_F), total_error)
-
-  ! Copy base dataspace and set selection to "none" 
-  CALL h5scopy_f(base_id, none_id, error)  
-  CALL check("h5scopy_f", error, total_error)
-
-  CALL H5Sselect_none_f(none_id, error)
-  CALL check("H5Sselect_none_f", error, total_error)
-
-  CALL H5Sget_select_type_f(none_id, sel_type, error)
-  CALL check("H5Sget_select_type_f", error, total_error)
-  CALL VERIFY("H5Sget_select_type_f", INT(sel_type), INT(H5S_SEL_NONE_F), total_error)
-  
-  ! Copy "all" selection & space 
-  CALL H5Scopy_f(all_id, space1, error)  
-  CALL check("h5scopy_f", error, total_error)
-
-  ! 'OR' "all" selection with another hyperslab 
-  start(1:2) = 0
-  stride(1:2) = 1
-  icount(1:2) = 1
-  iblock(1:2) = (/5,4/)
-  CALL h5sselect_hyperslab_f(space1, H5S_SELECT_OR_F, start, &
-                                icount, error, stride, iblock) 
-  CALL check("h5sselect_hyperslab_f", error, total_error)
-
-  ! Verify that it's still "all" selection 
-  CALL H5Sget_select_type_f(space1, sel_type, error)
-  CALL check("H5Sget_select_type_f", error, total_error)
-  CALL VERIFY("H5Sget_select_type_f", INT(sel_type), INT(H5S_SEL_ALL_F), total_error)
-
-  ! Close temporary dataspace 
-  CALL h5sclose_f(space1, error)
-  CALL check("h5sclose_f", error, total_error)
-
-  ! Copy "all" selection & space 
-  CALL H5Scopy_f(all_id, space1, error)  
-  CALL check("h5scopy_f", error, total_error)
-
-  !  'AND' "all" selection with another hyperslab 
-  start(1:2) = 0
-  stride(1:2) = 1
-  icount(1:2) = 1
-  iblock(1:2) = (/5,4/)
-  CALL h5sselect_hyperslab_f(space1, H5S_SELECT_AND_F, start, &
-       icount, error, stride, iblock) 
-  CALL check("h5sselect_hyperslab_f", error, total_error)
-
-  ! Verify that the new selection is the same at the original block 
-  CALL H5Sget_select_type_f(space1, sel_type, error)
-  CALL check("H5Sget_select_type_f", error, total_error)
-  CALL VERIFY("H5Sget_select_type_f", INT(sel_type), INT( H5S_SEL_HYPERSLABS_F), total_error)
-
-  ! Verify that there is only one block 
-  CALL h5sget_select_hyper_nblocks_f(space1, nblocks, error)
-  CALL check("h5sget_select_hyper_nblocks_f", error, total_error)
-  CALL VERIFY("h5sget_select_hyper_nblocks_f", INT(nblocks), 1, total_error)
-  
-  ! Retrieve the block defined 
-  CALL h5sget_select_hyper_blocklist_f(space1, INT(0, hsize_t), INT(nblocks,hsize_t), blocks, error)
-  CALL check("h5sget_select_hyper_blocklist_f", error, total_error)
-
-  ! Verify that the correct block is defined 
-
-  CALL VERIFY("h5sget_select_hyper_blocklist_f", INT(blocks(1,1,1)), 1, total_error)
-  CALL VERIFY("h5sget_select_hyper_blocklist_f", INT(blocks(2,1,1)), 1, total_error)
-  CALL VERIFY("h5sget_select_hyper_blocklist_f", INT(blocks(3,1,1)), 5, total_error)
-  CALL VERIFY("h5sget_select_hyper_blocklist_f", INT(blocks(4,1,1)), 4, total_error)
-
-  ! Close temporary dataspace 
-  CALL h5sclose_f(space1, error)
-  CALL check("h5sclose_f", error, total_error)
-
-  ! Copy "all" selection & space 
-  CALL H5Scopy_f(all_id, space1, error)  
-  CALL check("h5scopy_f", error, total_error)
-
-  !  'XOR' "all" selection with another hyperslab 
-  start(1:2) = 0
-  stride(1:2) = 1
-  icount(1:2) = 1
-  iblock(1:2) = (/5,4/)
-
-  CALL h5sselect_hyperslab_f(space1, H5S_SELECT_XOR_F, start, &
-       icount, error, stride, iblock) 
-  CALL check("h5sselect_hyperslab_f", error, total_error)
-
-  !  Verify that the new selection is an inversion of the original block 
-  CALL H5Sget_select_type_f(space1, sel_type, error)
-  CALL check("H5Sget_select_type_f", error, total_error)
-  CALL VERIFY("H5Sget_select_type_f", INT(sel_type), INT( H5S_SEL_HYPERSLABS_F), total_error)
-
-  !  Verify that there are two blocks 
-  CALL h5sget_select_hyper_nblocks_f(space1, nblocks, error)
-  CALL check("h5sget_select_hyper_nblocks_f", error, total_error)
-  CALL VERIFY("h5sget_select_hyper_nblocks_f", INT(nblocks), 2, total_error)
-
-  !  Retrieve the block defined 
-
-  blocks = -1 !  Reset block list 
-  CALL h5sget_select_hyper_blocklist_f(space1, INT(0, hsize_t), INT(nblocks,hsize_t), blocks, error)
-  CALL check("h5sget_select_hyper_blocklist_f", error, total_error)
-
-  !  Verify that the correct block is defined 
-
-  ! No guarantee is implied as the order in which blocks are listed. 
-  ! So this will ONLY work for square domains iblock(1:2) = (/5,5/)
-!!$  CALL VERIFY("h5sget_select_hyper_blocklist_f", INT(blocks(1,1,1)), 1, total_error)
-!!$  CALL VERIFY("h5sget_select_hyper_blocklist_f", INT(blocks(2,1,1)), 5, total_error)
-!!$  CALL VERIFY("h5sget_select_hyper_blocklist_f", INT(blocks(3,1,1)), 5, total_error)
-!!$  CALL VERIFY("h5sget_select_hyper_blocklist_f", INT(blocks(4,1,1)), 10, total_error)
-!!$  CALL VERIFY("h5sget_select_hyper_blocklist_f", INT(blocks(5,1,1)), 6, total_error)
-!!$  CALL VERIFY("h5sget_select_hyper_blocklist_f", INT(blocks(6,1,1)), 1, total_error)
-!!$  CALL VERIFY("h5sget_select_hyper_blocklist_f", INT(blocks(7,1,1)), 10, total_error)
-!!$  CALL VERIFY("h5sget_select_hyper_blocklist_f", INT(blocks(8,1,1)), 10, total_error)
-
-  ! Otherwise make sure the "area" of the block is correct
-  area = (ABS(INT(blocks(1,1,1)-blocks(3,1,1)))+1)*(ABS(INT(blocks(2,1,1)-blocks(4,1,1)))+1)
-  area = area + (ABS(INT(blocks(5,1,1)-blocks(7,1,1)))+1)*(ABS(INT(blocks(6,1,1)-blocks(8,1,1)))+1)
-  CALL VERIFY("h5sget_select_hyper_blocklist_f", area, 80, total_error)
-
-  ! Close temporary dataspace 
-  CALL h5sclose_f(space1, error)
-  CALL check("h5sclose_f", error, total_error)
-
-  !  Copy "all" selection & space 
-  CALL H5Scopy_f(all_id, space1, error)  
-  CALL check("h5scopy_f", error, total_error)
-
-  !  'NOTB' "all" selection with another hyperslab 
-  start(1:2) = 0
-  stride(1:2) = 1
-  icount(1:2) = 1
-  iblock(1:2) = (/5,4/) !5
-
-  CALL h5sselect_hyperslab_f(space1, H5S_SELECT_NOTB_F, start, &
-       icount, error, stride, iblock) 
-  CALL check("h5sselect_hyperslab_f", error, total_error)
-
-  !  Verify that the new selection is an inversion of the original block 
-  CALL H5Sget_select_type_f(space1, sel_type, error)
-  CALL check("H5Sget_select_type_f", error, total_error)
-  CALL VERIFY("H5Sget_select_type_f", INT(sel_type), INT( H5S_SEL_HYPERSLABS_F), total_error)
-
-  !  Verify that there are two blocks 
-  CALL h5sget_select_hyper_nblocks_f(space1, nblocks, error)
-  CALL check("h5sget_select_hyper_nblocks_f", error, total_error)
-  CALL VERIFY("h5sget_select_hyper_nblocks_f", INT(nblocks), 2, total_error)
-
-  !  Retrieve the block defined 
-  blocks = -1 !  Reset block list 
-  CALL h5sget_select_hyper_blocklist_f(space1, INT(0, hsize_t), INT(nblocks,hsize_t), blocks, error)
-  CALL check("h5sget_select_hyper_blocklist_f", error, total_error)
-
-  !  Verify that the correct block is defined  
-
-  ! No guarantee is implied as the order in which blocks are listed. 
-  ! So this will ONLY work for square domains iblock(1:2) = (/5,5/)
-
-!!$  CALL VERIFY("h5sget_select_hyper_blocklist_f", INT(blocks(1,1,1)), 1, total_error)
-!!$  CALL VERIFY("h5sget_select_hyper_blocklist_f", INT(blocks(2,1,1)), 5, total_error)
-!!$  CALL VERIFY("h5sget_select_hyper_blocklist_f", INT(blocks(3,1,1)), 5, total_error)
-!!$  CALL VERIFY("h5sget_select_hyper_blocklist_f", INT(blocks(4,1,1)),10, total_error)
-!!$  CALL VERIFY("h5sget_select_hyper_blocklist_f", INT(blocks(5,1,1)), 6, total_error)
-!!$  CALL VERIFY("h5sget_select_hyper_blocklist_f", INT(blocks(6,1,1)), 1, total_error)
-!!$  CALL VERIFY("h5sget_select_hyper_blocklist_f", INT(blocks(7,1,1)),10, total_error)
-!!$  CALL VERIFY("h5sget_select_hyper_blocklist_f", INT(blocks(8,1,1)),10, total_error)
-
-  ! Otherwise make sure the "area" of the block is correct
-  area = (ABS(INT(blocks(1,1,1)-blocks(3,1,1)))+1)*(ABS(INT(blocks(2,1,1)-blocks(4,1,1)))+1)
-  area = area + (ABS(INT(blocks(5,1,1)-blocks(7,1,1)))+1)*(ABS(INT(blocks(6,1,1)-blocks(8,1,1)))+1)
-  CALL VERIFY("h5sget_select_hyper_blocklist_f", area, 80, total_error)
-
-
-  !  Close temporary dataspace 
-  CALL h5sclose_f(space1, error)
-  CALL check("h5sclose_f", error, total_error)
-  !  Copy "all" selection & space 
-  CALL H5Scopy_f(all_id, space1, error)  
-  CALL check("h5scopy_f", error, total_error)
-
-  !  'NOTA' "all" selection with another hyperslab 
-  start(1:2) = 0
-  stride(1:2) = 1
-  icount(1:2) = 1
-  iblock(1:2) = (/5,4/) !5
-
-  CALL h5sselect_hyperslab_f(space1, H5S_SELECT_NOTA_F, start, &
-       icount, error, stride, iblock) 
-  CALL check("h5sselect_hyperslab_f", error, total_error)
-
-  ! Verify that the new selection is the "none" selection 
-  CALL H5Sget_select_type_f(space1, sel_type, error)
-  CALL check("H5Sget_select_type_f", error, total_error)
-  CALL VERIFY("H5Sget_select_type_f", INT(sel_type), INT( H5S_SEL_NONE_F), total_error)
-
-  !  Close temporary dataspace 
-  CALL h5sclose_f(space1, error)
-  CALL check("h5sclose_f", error, total_error)
-
-  !  Copy "none" selection & space 
-  CALL H5Scopy_f(none_id, space1, error)  
-  CALL check("h5scopy_f", error, total_error)
-
-  !  'OR' "none" selection with another hyperslab 
-  start(1:2) = 0
-  stride(1:2) = 1
-  icount(1:2) = 1
-  iblock(1:2) = (/5,4/) !5
-
-  CALL h5sselect_hyperslab_f(space1, H5S_SELECT_OR_F, start, &
-       icount, error, stride, iblock) 
-  CALL check("h5sselect_hyperslab_f", error, total_error)
-
-  !  Verify that the new selection is the same as the original hyperslab 
-  CALL H5Sget_select_type_f(space1, sel_type, error)
-  CALL check("H5Sget_select_type_f", error, total_error)
-  CALL VERIFY("H5Sget_select_type_f", INT(sel_type), INT( H5S_SEL_HYPERSLABS_F), total_error)
-  
-
-  !  Verify that there is only one block 
-  CALL h5sget_select_hyper_nblocks_f(space1, nblocks, error)
-  CALL check("h5sget_select_hyper_nblocks_f", error, total_error)
-  CALL VERIFY("h5sget_select_hyper_nblocks_f", INT(nblocks), 1, total_error)
-
-  !  Retrieve the block defined 
-  blocks = -1 !  Reset block list 
-  CALL h5sget_select_hyper_blocklist_f(space1, INT(0, hsize_t), INT(nblocks,hsize_t), blocks, error)
-  CALL check("h5sget_select_hyper_blocklist_f", error, total_error)
-
-  !  Verify that the correct block is defined 
-  CALL VERIFY("h5sget_select_hyper_blocklist_f", INT(blocks(1,1,1)), 1, total_error)
-  CALL VERIFY("h5sget_select_hyper_blocklist_f", INT(blocks(2,1,1)), 1, total_error)
-  CALL VERIFY("h5sget_select_hyper_blocklist_f", INT(blocks(3,1,1)), 5, total_error)
-  CALL VERIFY("h5sget_select_hyper_blocklist_f", INT(blocks(4,1,1)), 4, total_error)
-
-  !  Close temporary dataspace 
-  CALL h5sclose_f(space1, error)
-  CALL check("h5sclose_f", error, total_error)
-
-  !  Copy "none" selection & space 
-  CALL H5Scopy_f(none_id, space1, error)  
-  CALL check("h5scopy_f", error, total_error)
-
-  !  'AND' "none" selection with another hyperslab 
-  start(1:2) = 0
-  stride(1:2) = 1
-  icount(1:2) = 1
-  iblock(1:2) = (/5,4/) !5
-
-  CALL h5sselect_hyperslab_f(space1, H5S_SELECT_AND_F, start, &
-       icount, error, stride, iblock) 
-  CALL check("h5sselect_hyperslab_f", error, total_error)
-
-  !  Verify that the new selection is the "none" selection 
-  CALL H5Sget_select_type_f(space1, sel_type, error)
-  CALL check("H5Sget_select_type_f", error, total_error)
-  CALL VERIFY("H5Sget_select_type_f", INT(sel_type), INT( H5S_SEL_NONE_F), total_error)
-
-  !  Close temporary dataspace 
-  CALL h5sclose_f(space1, error)
-  CALL check("h5sclose_f", error, total_error)
-
-  !  Copy "none" selection & space 
-  CALL H5Scopy_f(none_id, space1, error)  
-  CALL check("h5scopy_f", error, total_error)
-
-  !  'XOR' "none" selection with another hyperslab 
-  start(1:2) = 0
-  stride(1:2) = 1
-  icount(1:2) = 1
-  iblock(1:2) = (/5,4/) !5
-
-  CALL h5sselect_hyperslab_f(space1, H5S_SELECT_XOR_F, start, &
-       icount, error, stride, iblock) 
-  CALL check("h5sselect_hyperslab_f", error, total_error)
-
-  !  Verify that the new selection is the same as the original hyperslab 
-  CALL H5Sget_select_type_f(space1, sel_type, error)
-  CALL check("H5Sget_select_type_f", error, total_error)
-  CALL VERIFY("H5Sget_select_type_f", INT(sel_type), INT( H5S_SEL_HYPERSLABS_F), total_error)
-  
-
-  !  Verify that there is only one block 
-  CALL h5sget_select_hyper_nblocks_f(space1, nblocks, error)
-  CALL check("h5sget_select_hyper_nblocks_f", error, total_error)
-  CALL VERIFY("h5sget_select_hyper_nblocks_f", INT(nblocks), 1, total_error)
-
-  !  Retrieve the block defined 
-  blocks = -1 !  Reset block list 
-  CALL h5sget_select_hyper_blocklist_f(space1, INT(0, hsize_t), INT(nblocks,hsize_t), blocks, error)
-  CALL check("h5sget_select_hyper_blocklist_f", error, total_error)
-  !  Verify that the correct block is defined 
-  CALL VERIFY("h5sget_select_hyper_blocklist_f", INT(blocks(1,1,1)), 1, total_error)
-  CALL VERIFY("h5sget_select_hyper_blocklist_f", INT(blocks(2,1,1)), 1, total_error)
-  CALL VERIFY("h5sget_select_hyper_blocklist_f", INT(blocks(3,1,1)), 5, total_error)
-  CALL VERIFY("h5sget_select_hyper_blocklist_f", INT(blocks(4,1,1)), 4, total_error)
-  
-  !  Close temporary dataspace 
-  CALL h5sclose_f(space1, error)
-  CALL check("h5sclose_f", error, total_error)
-
-  !  Copy "none" selection & space 
-  CALL H5Scopy_f(none_id, space1, error)  
-  CALL check("h5scopy_f", error, total_error)
-
-  !  'NOTB' "none" selection with another hyperslab 
-  start(1:2) = 0
-  stride(1:2) = 1
-  icount(1:2) = 1
-  iblock(1:2) = (/5,4/) !5
-
-  CALL h5sselect_hyperslab_f(space1, H5S_SELECT_NOTB_F, start, &
-       icount, error, stride, iblock) 
-  CALL check("h5sselect_hyperslab_f", error, total_error)
-
-  !  Verify that the new selection is the "none" selection 
-  CALL H5Sget_select_type_f(space1, sel_type, error)
-  CALL check("H5Sget_select_type_f", error, total_error)
-  CALL VERIFY("H5Sget_select_type_f", INT(sel_type), INT( H5S_SEL_NONE_F), total_error)
-
-  !  Close temporary dataspace 
-  CALL h5sclose_f(space1, error)
-  CALL check("h5sclose_f", error, total_error)
-
-  !  Copy "none" selection & space 
-  CALL H5Scopy_f(none_id, space1, error)  
-  CALL check("h5scopy_f", error, total_error)
-
-  !  'NOTA' "none" selection with another hyperslab 
-  start(1:2) = 0
-  stride(1:2) = 1
-  icount(1:2) = 1
-  iblock(1:2) = (/5,4/) !5  
-  CALL h5sselect_hyperslab_f(space1, H5S_SELECT_NOTA_F, start, &
-       icount, error, stride, iblock) 
-  CALL check("h5sselect_hyperslab_f", error, total_error)
-
-  !  Verify that the new selection is the same as the original hyperslab 
-  CALL H5Sget_select_type_f(space1, sel_type, error)
-  CALL check("H5Sget_select_type_f", error, total_error)
-  CALL VERIFY("H5Sget_select_type_f", INT(sel_type), INT( H5S_SEL_HYPERSLABS_F), total_error)
-    
-  !  Verify that there is ONLY one BLOCK 
-  CALL h5sget_select_hyper_nblocks_f(space1, nblocks, error)
-  CALL check("h5sget_select_hyper_nblocks_f", error, total_error)
-  CALL VERIFY("h5sget_select_hyper_nblocks_f", INT(nblocks), 1, total_error)
-
-  !  Retrieve the block defined 
-
-  blocks = -1 !  Reset block list 
-  CALL h5sget_select_hyper_blocklist_f(space1, INT(0, hsize_t), INT(nblocks,hsize_t), blocks, error)
-  CALL check("h5sget_select_hyper_blocklist_f", error, total_error)
-
-
-  !  Verify that the correct block is defined 
-
-  CALL VERIFY("h5sget_select_hyper_blocklist_f", INT(blocks(1,1,1)), 1, total_error)
-  CALL VERIFY("h5sget_select_hyper_blocklist_f", INT(blocks(2,1,1)), 1, total_error)
-  CALL VERIFY("h5sget_select_hyper_blocklist_f", INT(blocks(3,1,1)), 5, total_error)
-  CALL VERIFY("h5sget_select_hyper_blocklist_f", INT(blocks(4,1,1)), 4, total_error)
-  
-  !  Close temporary dataspace 
-  CALL h5sclose_f(space1, error)
-  CALL check("h5sclose_f", error, total_error)
-
-  !  Close dataspaces 
-  
-  CALL h5sclose_f(base_id, error)
-  CALL check("h5sclose_f", error, total_error)
-  CALL h5sclose_f(all_id, error)
-  CALL check("h5sclose_f", error, total_error)
-  CALL h5sclose_f(none_id, error)
-  CALL check("h5sclose_f", error, total_error)
-
-END SUBROUTINE test_select_combine
-
-!***************************************************************
-!**
-!**  test_select_bounds(): Tests selection bounds on dataspaces,
-!**      both with and without offsets.
-!**
-!***************************************************************
-
-SUBROUTINE test_select_bounds(total_error)
-  USE HDF5 ! This module contains all necessary modules 
-  USE TH5_MISC
-  
-  IMPLICIT NONE
-  INTEGER, INTENT(INOUT) :: total_error
-
-  INTEGER, PARAMETER :: SPACE11_RANK=2
-  INTEGER, PARAMETER :: SPACE11_DIM1=100
-  INTEGER, PARAMETER :: SPACE11_DIM2=50
-  INTEGER, PARAMETER :: SPACE11_NPOINTS=4
-  
-  INTEGER(hid_t) :: sid !  Dataspace ID 
-  INTEGER(hsize_t), DIMENSION(1:SPACE11_RANK) :: dims = (/SPACE11_DIM1, SPACE11_DIM2/) !Dataspace dimensions
-  INTEGER(hsize_t), DIMENSION(SPACE11_RANK, SPACE11_NPOINTS) :: coord ! Coordinates for point selection
-  INTEGER(hsize_t), DIMENSION(SPACE11_RANK) :: start !  The start of the hyperslab 
-  INTEGER(hsize_t), DIMENSION(SPACE11_RANK) :: stride ! The stride between block starts for the hyperslab 
-  INTEGER(hsize_t), DIMENSION(SPACE11_RANK) :: count ! The number of blocks for the hyperslab 
-  INTEGER(hsize_t), DIMENSION(SPACE11_RANK) :: BLOCK ! The size of each block for the hyperslab 
-  INTEGER(hssize_t), DIMENSION(SPACE11_RANK) :: offset ! Offset amount for selection 
-  INTEGER(hsize_t), DIMENSION(SPACE11_RANK) :: low_bounds ! The low bounds for the selection 
-  INTEGER(hsize_t), DIMENSION(SPACE11_RANK) :: high_bounds ! The high bounds for the selection 
-    
-  INTEGER :: error
-
-  ! Create dataspace 
-  CALL h5screate_simple_f(SPACE11_RANK, dims, sid, error)
-  CALL check("h5screate_simple_f", error, total_error)
-
-  !  Get bounds for 'all' selection 
-  CALL h5sget_select_bounds_f(sid, low_bounds, high_bounds, error)
-  CALL check("h5sget_select_bounds_f", error, total_error)
-
-  CALL VERIFY("h5sget_select_bounds_f", INT(low_bounds(1)), 1, total_error)
-  CALL VERIFY("h5sget_select_bounds_f", INT(low_bounds(2)), 1, total_error)
-  CALL VERIFY("h5sget_select_bounds_f", INT(high_bounds(1)), SPACE11_DIM1, total_error)
-  CALL VERIFY("h5sget_select_bounds_f", INT(high_bounds(2)), SPACE11_DIM2, total_error)
-
-  ! Set offset for selection 
-  offset(1:2) = 1
-  CALL H5Soffset_simple_f(sid, offset, error)
-  CALL check("H5Soffset_simple_f", error, total_error)
-
-  ! Get bounds for 'all' selection with offset (which should be ignored) 
-  CALL h5sget_select_bounds_f(sid, low_bounds, high_bounds, error)
-  CALL check("h5sget_select_bounds_f", error, total_error)
-
-  CALL verify("h5sget_select_bounds_f", INT(low_bounds(1)), 1, total_error)
-  CALL verify("h5sget_select_bounds_f", INT(low_bounds(2)), 1, total_error)
-  CALL verify("h5sget_select_bounds_f", INT(high_bounds(1)), SPACE11_DIM1, total_error)
-  CALL verify("h5sget_select_bounds_f", INT(high_bounds(2)), SPACE11_DIM2, total_error)
-
-  ! Reset offset for selection 
-  offset(1:2) = 0
-  CALL H5Soffset_simple_f(sid, offset, error)
-  CALL check("H5Soffset_simple_f", error, total_error)
-
-  ! Set 'none' selection 
-  CALL H5Sselect_none_f(sid, error)
-  CALL check("H5Sselect_none_f", error, total_error)
-
-  ! Get bounds for 'none' selection, should fail 
-  CALL h5sget_select_bounds_f(sid, low_bounds, high_bounds, error)
-  CALL VERIFY("h5sget_select_bounds_f", error, -1, total_error)
-
-  ! Set point selection 
-  
-  coord(1,1)=  3; coord(2,1)=  3;
-  coord(1,2)=  3; coord(2,2)= 46;
-  coord(1,3)= 96; coord(2,3)=  3;
-  coord(1,4)= 96; coord(2,4)= 46;
-
-  CALL h5sselect_elements_f(sid, H5S_SELECT_SET_F, SPACE11_RANK, INT(SPACE11_NPOINTS,size_t), coord, error)
-  CALL check("h5sselect_elements_f", error, total_error)
-
-  ! Get bounds for point selection 
-  CALL h5sget_select_bounds_f(sid, low_bounds, high_bounds, error)
-  CALL check("h5sget_select_bounds_f", error, total_error)
-
-  CALL VERIFY("h5sget_select_bounds_f", INT(low_bounds(1)), 3, total_error)
-  CALL VERIFY("h5sget_select_bounds_f", INT(low_bounds(2)), 3, total_error)
-  CALL VERIFY("h5sget_select_bounds_f", INT(high_bounds(1)), INT(SPACE11_DIM1-4), total_error)
-  CALL VERIFY("h5sget_select_bounds_f", INT(high_bounds(2)), INT(SPACE11_DIM2-4), total_error)
-
-  !  Set bad offset for selection 
-
-  offset(1:2) = (/5,-5/)
-  CALL H5Soffset_simple_f(sid, offset, error)
-  CALL check("H5Soffset_simple_f", error, total_error)
-
-  !  Get bounds for hyperslab selection with negative offset 
-  CALL h5sget_select_bounds_f(sid, low_bounds, high_bounds, error)
-  CALL VERIFY("h5sget_select_bounds_f", error, -1, total_error)
- 
-  !  Set valid offset for selection 
-  offset(1:2) = (/2,-2/)
-  CALL H5Soffset_simple_f(sid, offset, error)
-  CALL check("H5Soffset_simple_f", error, total_error)
-
-  !  Get bounds for point selection with offset 
-  CALL h5sget_select_bounds_f(sid, low_bounds, high_bounds, error)
-  CALL check("h5sget_select_bounds_f", error, total_error)
-
-  CALL VERIFY("h5sget_select_bounds_f", INT(low_bounds(1)), 5, total_error)
-  CALL VERIFY("h5sget_select_bounds_f", INT(low_bounds(2)), 1, total_error)
-  CALL VERIFY("h5sget_select_bounds_f", INT(high_bounds(1)), INT(SPACE11_DIM1-2), total_error)
-  CALL VERIFY("h5sget_select_bounds_f", INT(high_bounds(2)), INT(SPACE11_DIM2-6), total_error)
-
-  !  Reset offset for selection 
-  offset(1:2) = 0
-  CALL H5Soffset_simple_f(sid, offset, error)
-  CALL check("H5Soffset_simple_f", error, total_error)
-
-  !  Set "regular" hyperslab selection 
-  start(1:2) = 2
-  stride(1:2) = 10
-  count(1:2) = 4
-  block(1:2) = 5
-  
-  CALL h5sselect_hyperslab_f(sid, H5S_SELECT_SET_F, start, &
-       count, error, stride, block) 
-  CALL check("h5sselect_hyperslab_f", error, total_error)
-
-  ! Get bounds for hyperslab selection 
-  CALL h5sget_select_bounds_f(sid, low_bounds, high_bounds, error)
-  CALL check("h5sget_select_bounds_f", error, total_error)
-
-  CALL VERIFY("h5sget_select_bounds_f", INT(low_bounds(1)), 3, total_error)
-  CALL VERIFY("h5sget_select_bounds_f", INT(low_bounds(2)), 3, total_error)
-  CALL VERIFY("h5sget_select_bounds_f", INT(high_bounds(1)), 37, total_error)
-  CALL VERIFY("h5sget_select_bounds_f", INT(high_bounds(2)), 37, total_error)
-
-  ! Set bad offset for selection 
-  offset(1:2) = (/5,-5/)
-  CALL H5Soffset_simple_f(sid, offset, error)
-  CALL check("H5Soffset_simple_f", error, total_error)
-
-  !  Get bounds for hyperslab selection with negative offset 
-  CALL h5sget_select_bounds_f(sid, low_bounds, high_bounds, error)
-  CALL VERIFY("h5sget_select_bounds_f", error, -1, total_error)
-
-  !  Set valid offset for selection 
-  offset(1:2) = (/5,-2/)
-  CALL H5Soffset_simple_f(sid, offset, error)
-  CALL check("H5Soffset_simple_f", error, total_error)
-
-  ! Get bounds for hyperslab selection with offset 
-  CALL h5sget_select_bounds_f(sid, low_bounds, high_bounds, error)
-  CALL check("h5sget_select_bounds_f", error, total_error)
-
-  CALL VERIFY("h5sget_select_bounds_f", INT(low_bounds(1)), 8, total_error)
-  CALL VERIFY("h5sget_select_bounds_f", INT(low_bounds(2)), 1, total_error)
-  CALL VERIFY("h5sget_select_bounds_f", INT(high_bounds(1)), 42, total_error)
-  CALL VERIFY("h5sget_select_bounds_f", INT(high_bounds(2)), 35, total_error)
-
-  ! Reset offset for selection 
-  offset(1:2) = 0
-  CALL H5Soffset_simple_f(sid, offset, error)
-  CALL check("H5Soffset_simple_f", error, total_error)
-  
-  !  Make "irregular" hyperslab selection 
-  start(1:2) = 20
-  stride(1:2) = 20
-  count(1:2) = 2
-  block(1:2) = 10
-
-  CALL h5sselect_hyperslab_f(sid, H5S_SELECT_OR_F, start, &
-       count, error, stride, block) 
-  CALL check("h5sselect_hyperslab_f", error, total_error)
-
-  ! Get bounds for hyperslab selection 
-  CALL h5sget_select_bounds_f(sid, low_bounds, high_bounds, error)
-  CALL check("h5sget_select_bounds_f", error, total_error)
-
-  CALL VERIFY("h5sget_select_bounds_f", INT(low_bounds(1)), 3, total_error)
-  CALL VERIFY("h5sget_select_bounds_f", INT(low_bounds(2)), 3, total_error)
-  CALL VERIFY("h5sget_select_bounds_f", INT(high_bounds(1)), 50, total_error)
-  CALL VERIFY("h5sget_select_bounds_f", INT(high_bounds(2)), 50, total_error)
-
-  !  Set bad offset for selection 
-  offset(1:2) = (/5,-5/)
-  CALL H5Soffset_simple_f(sid, offset, error)
-  CALL check("H5Soffset_simple_f", error, total_error)
-
-  !  Get bounds for hyperslab selection with negative offset 
-  CALL h5sget_select_bounds_f(sid, low_bounds, high_bounds, error)
-  CALL VERIFY("h5sget_select_bounds_f", error, -1, total_error)
-
-  ! Set valid offset for selection 
-  offset(1:2) = (/5,-2/)
-  CALL H5Soffset_simple_f(sid, offset, error)
-  CALL check("H5Soffset_simple_f", error, total_error)
-
-  ! Get bounds for hyperslab selection with offset 
-  CALL h5sget_select_bounds_f(sid, low_bounds, high_bounds, error)
-  CALL check("h5sget_select_bounds_f", error, total_error)
-
-  CALL VERIFY("h5sget_select_bounds_f", INT(low_bounds(1)), 8, total_error)
-  CALL VERIFY("h5sget_select_bounds_f", INT(low_bounds(2)), 1, total_error)
-  CALL VERIFY("h5sget_select_bounds_f", INT(high_bounds(1)), 55, total_error)
-  CALL VERIFY("h5sget_select_bounds_f", INT(high_bounds(2)), 48, total_error)
-
-  ! Reset offset for selection 
-  offset(1:2) = 0
-  CALL H5Soffset_simple_f(sid, offset, error)
-  CALL check("H5Soffset_simple_f", error, total_error)
-
-  ! Close the dataspace 
-  CALL h5sclose_f(sid, error)
-  CALL check("h5sclose_f", error, total_error)
-
-END SUBROUTINE test_select_bounds
-
-END MODULE TH5SSELECT
diff --git a/fortran/test/tH5T.F90 b/fortran/test/tH5T.F90
new file mode 100644
index 0000000..82a908e
--- /dev/null
+++ b/fortran/test/tH5T.F90
@@ -0,0 +1,1146 @@
+!****h* root/fortran/test/tH5T.f90
+!
+! NAME
+!  tH5T.f90
+!
+! FUNCTION
+!  Basic testing of Fortran H5T APIs.
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+! CONTAINS SUBROUTINES
+!  compoundtest, basic_data_type_test, enumtest, test_derived_flt
+!
+!*****
+
+MODULE TH5T
+
+  USE HDF5
+  USE TH5_MISC
+  USE TH5_MISC_GEN
+
+CONTAINS
+
+    SUBROUTINE compoundtest(cleanup, total_error)
+!
+! This program creates a dataset that is one dimensional array of
+! structures  {
+!                 character*2
+!                 integer
+!                 double precision
+!                 real
+!                                   }
+! Data is written and read back by fields.
+!
+! The following H5T interface functions are tested:
+! h5tcopy_f, h5tset(get)_size_f, h5tcreate_f, h5tinsert_f,  h5tclose_f,
+! h5tget_class_f, h5tget_member_name_f, h5tget_member_offset_f, h5tget_member_type_f,
+! h5tequal_f, h5tinsert_array_f, h5tcommit_f, h5tencode_f, h5tdecode_f
+
+
+     IMPLICIT NONE
+     LOGICAL, INTENT(IN)  :: cleanup
+     INTEGER, INTENT(OUT) :: total_error
+
+     CHARACTER(LEN=8), PARAMETER :: filename = "compound" ! File name
+     CHARACTER(LEN=80) :: fix_filename
+     CHARACTER(LEN=8), PARAMETER :: dsetname = "Compound"     ! Dataset name
+     INTEGER, PARAMETER :: dimsize = 6 ! Size of the dataset
+     INTEGER, PARAMETER :: COMP_NUM_MEMBERS = 4 ! Number of members in the compound datatype
+
+     INTEGER(HID_T) :: file_id       ! File identifier
+     INTEGER(HID_T) :: dset_id       ! Dataset identifier
+     INTEGER(HID_T) :: dspace_id     ! Dataspace identifier
+     INTEGER(HID_T) :: dtype_id      ! Compound datatype identifier
+     INTEGER(HID_T) :: dtarray_id    ! Compound datatype identifier
+     INTEGER(HID_T) :: arrayt_id    ! Array datatype identifier
+     INTEGER(HID_T) :: dt1_id      ! Memory datatype identifier (for character field)
+     INTEGER(HID_T) :: dt2_id      ! Memory datatype identifier (for integer field)
+     INTEGER(HID_T) :: dt3_id      ! Memory datatype identifier (for double precision field)
+     INTEGER(HID_T) :: dt4_id      ! Memory datatype identifier (for real field)
+     INTEGER(HID_T) :: dt5_id      ! Memory datatype identifier
+     INTEGER(HID_T) :: membtype_id ! Datatype identifier
+     INTEGER(HID_T) :: plist_id    ! Dataset transfer property
+
+
+     INTEGER(HSIZE_T), DIMENSION(1) :: dims = (/dimsize/) ! Dataset dimensions
+     INTEGER     ::   rank = 1                            ! Dataset rank
+
+     INTEGER     ::   error ! Error flag
+     INTEGER(SIZE_T)     ::   type_size  ! Size of the datatype
+     INTEGER(SIZE_T)     ::   type_sizec  ! Size of the character datatype
+     INTEGER(SIZE_T)     ::   type_sizei  ! Size of the integer datatype
+     INTEGER(SIZE_T)     ::   type_sized  ! Size of the double precision datatype
+     INTEGER(SIZE_T)     ::   type_sizer  ! Size of the real datatype
+     INTEGER(SIZE_T)     ::   offset     ! Member's offset
+     INTEGER(SIZE_T)     ::   offset_out     ! Member's offset
+     CHARACTER(LEN=2), DIMENSION(dimsize)      :: char_member
+     CHARACTER(LEN=2), DIMENSION(dimsize)      :: char_member_out ! Buffer to read data out
+     INTEGER, DIMENSION(dimsize)          :: int_member
+     INTEGER, DIMENSION(dimsize)          :: int_member_out
+     REAL(KIND=Fortran_DOUBLE), DIMENSION(dimsize) :: double_member
+     REAL(KIND=Fortran_DOUBLE), DIMENSION(dimsize) :: double_member_out
+     REAL, DIMENSION(dimsize)             :: real_member
+     REAL, DIMENSION(dimsize)             :: real_member_out
+     INTEGER :: i
+     INTEGER :: class ! Datatype class
+     INTEGER :: num_members ! Number of members in the compound datatype
+     CHARACTER(LEN=256) :: member_name
+     INTEGER :: len ! Length of the name of the compound datatype member
+     INTEGER :: member_index ! index of the field
+     INTEGER(HSIZE_T), DIMENSION(3) :: array_dims=(/2,3,4/)
+     INTEGER :: array_dims_range = 3
+     INTEGER :: elements = 24 ! number of elements in the array_dims array.
+     INTEGER(SIZE_T) :: sizechar
+     INTEGER(HSIZE_T), DIMENSION(1) :: data_dims
+     LOGICAL :: flag = .TRUE.
+
+     CHARACTER(LEN=1024) :: cmpd_buf
+     INTEGER(SIZE_T) :: cmpd_buf_size=0
+     INTEGER(HID_T) :: decoded_tid1
+
+     INTEGER(HID_T) :: fixed_str1, fixed_str2
+     LOGICAL :: are_equal
+     INTEGER(SIZE_T), PARAMETER :: str_size = 10
+     INTEGER(SIZE_T) :: query_size
+
+     ! Test h5tcreate_f with H5T_STRING_F option:
+     !   Create fixed-length string in two ways and make sure they are the same
+
+     CALL h5tcopy_f(H5T_FORTRAN_S1, fixed_str1, error)
+     CALL check("h5tcopy_f", error, total_error)
+     CALL h5tset_size_f(fixed_str1, str_size, error)
+     CALL check("h5tset_size_f", error, total_error)
+     CALL h5tset_strpad_f(fixed_str1, H5T_STR_NULLTERM_F, error)
+     CALL check("h5tset_strpad_f", error, total_error)
+
+     CALL h5tcreate_f(H5T_STRING_F, str_size, fixed_str2, error)
+     CALL check("h5tcreate_f", error, total_error)
+     CALL h5tset_strpad_f(fixed_str2, H5T_STR_NULLTERM_F, error)
+     CALL check("h5tset_strpad_f", error, total_error)
+
+     CALL h5tequal_f(fixed_str1, fixed_str2, are_equal, error)
+     IF(.NOT.are_equal)THEN
+        CALL check("h5tcreate_f", -1, total_error)
+     ENDIF
+
+     CALL h5tget_size_f(fixed_str1, query_size, error)
+     CALL check("h5tget_size_f", error, total_error)
+
+     IF(query_size.NE.str_size)THEN
+        CALL check("h5tget_size_f", -1, total_error)
+     ENDIF
+
+     CALL h5tget_size_f(fixed_str2, query_size, error)
+     CALL check("h5tget_size_f", error, total_error)
+
+     IF(query_size.NE.str_size)THEN
+        CALL check("h5tget_size_f", -1, total_error)
+     ENDIF
+
+     CALL h5tclose_f(fixed_str1,error)
+     CALL check("h5tclose_f", error, total_error)
+
+     CALL h5tclose_f(fixed_str2,error)
+     CALL check("h5tclose_f", error, total_error)
+     data_dims(1) = dimsize
+     !
+     ! Initialize data buffer.
+     !
+     do i = 1, dimsize
+        char_member(i)(1:1) = char(65+i)
+        char_member(i)(2:2) = char(65+i)
+        char_member_out(i)(1:1)   = char(65)
+        char_member_out(i)(2:2)   = char(65)
+        int_member(i)   = i
+        int_member_out(i)   = 0
+        double_member(i)   = 2.* i
+        double_member_out(i)   = 0.
+        real_member(i)   = 3. * i
+        real_member_out(i)   = 0.
+     enddo
+
+     !
+     ! Set dataset transfer property to preserve partially initialized fields
+     ! during write/read to/from dataset with compound datatype.
+     !
+     CALL h5pcreate_f(H5P_DATASET_XFER_F, plist_id, error)
+     CALL check("h5pcreate_f", error, total_error)
+     CALL h5pset_preserve_f(plist_id, flag, error)
+     CALL check("h5pset_preserve_f", error, total_error)
+     !
+     ! Create a new file using default properties.
+     !
+      CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
+          if (error .ne. 0) then
+              write(*,*) "Cannot modify filename"
+              stop
+          endif
+     CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
+     CALL check("h5fcreate_f", error, total_error)
+
+     !
+     ! Create the dataspace.
+     !
+     CALL h5screate_simple_f(rank, dims, dspace_id, error)
+     CALL check("h5screate_simple_f", error, total_error)
+     !
+     ! Create compound datatype.
+     !
+     ! First calculate total size by calculating sizes of each member
+     !
+     CALL h5tcopy_f(H5T_NATIVE_CHARACTER, dt5_id, error)
+     CALL check("h5tcopy_f", error, total_error)
+     sizechar = 2
+     CALL h5tset_size_f(dt5_id, sizechar, error)
+     CALL check("h5tset_size_f", error, total_error)
+     CALL h5tget_size_f(dt5_id, type_sizec, error)
+     CALL check("h5tget_size_f", error, total_error)
+     CALL h5tget_size_f(H5T_NATIVE_INTEGER, type_sizei, error)
+     CALL check("h5tget_size_f", error, total_error)
+     CALL h5tget_size_f(H5T_NATIVE_DOUBLE, type_sized, error)
+     CALL check("h5tget_size_f", error, total_error)
+     CALL h5tget_size_f(H5T_NATIVE_REAL, type_sizer, error)
+     CALL check("h5tget_size_f", error, total_error)
+     !write(*,*) "get sizes", type_sizec, type_sizei, type_sizer, type_sized
+     type_size = type_sizec + type_sizei + type_sized + type_sizer
+     CALL h5tcreate_f(H5T_COMPOUND_F, type_size, dtype_id, error)
+     CALL check("h5tcreate_f", error, total_error)
+     !
+     ! Insert members
+     !
+     ! CHARACTER*2 member
+     !
+     offset = 0
+     CALL h5tinsert_f(dtype_id, "char_field", offset, dt5_id, error)
+     CALL check("h5tinsert_f", error, total_error)
+     !
+     ! INTEGER member
+     !
+     offset = offset + type_sizec ! Offset of the second member is 2
+     CALL h5tinsert_f(dtype_id, "integer_field", offset, H5T_NATIVE_INTEGER, error)
+     CALL check("h5tinsert_f", error, total_error)
+     !
+     ! DOUBLE PRECISION member
+     !
+     offset = offset + type_sizei  ! Offset of the third member is 6
+     CALL h5tinsert_f(dtype_id, "double_field", offset, H5T_NATIVE_DOUBLE, error)
+     CALL check("h5tinsert_f", error, total_error)
+     !
+     ! REAL member
+     !
+     offset = offset + type_sized  ! Offset of the last member is 14
+     CALL h5tinsert_f(dtype_id, "real_field", offset, H5T_NATIVE_REAL, error)
+     CALL check("h5tinsert_f", error, total_error)
+     !
+     ! Create the dataset with compound datatype.
+     !
+     CALL h5dcreate_f(file_id, dsetname, dtype_id, dspace_id, &
+                      dset_id, error)
+     CALL check("h5dcreate_f", error, total_error)
+     !
+     ! Create memory types. We have to create a compound datatype
+     ! for each member we want to write.
+     !
+     CALL h5tcreate_f(H5T_COMPOUND_F, type_sizec, dt1_id, error)
+     CALL check("h5tcreate_f", error, total_error)
+     offset = 0
+     CALL h5tinsert_f(dt1_id, "char_field", offset, dt5_id, error)
+     CALL check("h5tinsert_f", error, total_error)
+     !
+     CALL h5tcreate_f(H5T_COMPOUND_F, type_sizei, dt2_id, error)
+     CALL check("h5tcreate_f", error, total_error)
+     offset = 0
+     CALL h5tinsert_f(dt2_id, "integer_field", offset, H5T_NATIVE_INTEGER, error)
+     CALL check("h5tinsert_f", error, total_error)
+     !
+     CALL h5tcreate_f(H5T_COMPOUND_F, type_sized, dt3_id, error)
+     CALL check("h5tcreate_f", error, total_error)
+     offset = 0
+     CALL h5tinsert_f(dt3_id, "double_field", offset, H5T_NATIVE_DOUBLE, error)
+     CALL check("h5tinsert_f", error, total_error)
+     !
+     CALL h5tcreate_f(H5T_COMPOUND_F, type_sizer, dt4_id, error)
+     CALL check("h5tcreate_f", error, total_error)
+     offset = 0
+     CALL h5tinsert_f(dt4_id, "real_field", offset, H5T_NATIVE_REAL, error)
+     CALL check("h5tinsert_f", error, total_error)
+     !
+     ! Write data by fields in the datatype. Fields order is not important.
+     !
+     CALL h5dwrite_f(dset_id, dt4_id, real_member, data_dims, error, xfer_prp = plist_id)
+     CALL check("h5dwrite_f", error, total_error)
+     CALL h5dwrite_f(dset_id, dt1_id, char_member, data_dims, error, xfer_prp = plist_id)
+     CALL check("h5dwrite_f", error, total_error)
+     CALL h5dwrite_f(dset_id, dt3_id, double_member, data_dims, error, xfer_prp = plist_id)
+     CALL check("h5dwrite_f", error, total_error)
+     CALL h5dwrite_f(dset_id, dt2_id, int_member, data_dims, error, xfer_prp = plist_id)
+     CALL check("h5dwrite_f", error, total_error)
+
+     !
+     ! End access to the dataset and release resources used by it.
+     !
+     CALL h5dclose_f(dset_id, error)
+     CALL check("h5dclose_f", error, total_error)
+
+     !
+     ! Terminate access to the data space.
+     !
+     CALL h5sclose_f(dspace_id, error)
+     CALL check("h5sclose_f", error, total_error)
+     !
+     ! Terminate access to the datatype
+     !
+     CALL h5tclose_f(dtype_id, error)
+     CALL check("h5tclose_f", error, total_error)
+     CALL h5tclose_f(dt1_id, error)
+     CALL check("h5tclose_f", error, total_error)
+     CALL h5tclose_f(dt2_id, error)
+     CALL check("h5tclose_f", error, total_error)
+     CALL h5tclose_f(dt3_id, error)
+     CALL check("h5tclose_f", error, total_error)
+     CALL h5tclose_f(dt4_id, error)
+     CALL check("h5tclose_f", error, total_error)
+     !
+     ! Create and store compound datatype with the character and
+     ! array members.
+     !
+     type_size = type_sizec + elements*type_sizer ! Size of compound datatype
+     CALL h5tcreate_f(H5T_COMPOUND_F, type_size, dtarray_id, error)
+     CALL check("h5tcreate_f", error, total_error)
+     offset = 0
+     CALL h5tinsert_f(dtarray_id, "char_field", offset, H5T_NATIVE_CHARACTER, error)
+     CALL check("h5tinsert_f", error, total_error)
+     offset = type_sizec
+     CALL h5tarray_create_f(H5T_NATIVE_REAL, array_dims_range, array_dims, arrayt_id, error)
+     CALL check("h5tarray_create_f", error, total_error)
+     CALL h5tinsert_f(dtarray_id,"array_field", offset, arrayt_id, error)
+     CALL check("h5tinsert_f", error, total_error)
+     CALL h5tcommit_f(file_id, "Compound_with_array_member", dtarray_id, error)
+     CALL check("h5tcommit_f", error, total_error)
+     CALL h5tclose_f(arrayt_id, error)
+     CALL check("h5tclose_f", error, total_error)
+     CALL h5tclose_f(dtarray_id, error)
+     CALL check("h5tclose_f", error, total_error)
+
+     !
+     ! Close the file.
+     !
+     CALL h5fclose_f(file_id, error)
+     CALL check("h5fclose_f", error, total_error)
+
+     !
+     ! Open the file.
+     !
+     CALL h5fopen_f (fix_filename, H5F_ACC_RDWR_F, file_id, error)
+     CALL check("h5fopen_f", error, total_error)
+     !
+     ! Open the dataset.
+     !
+     CALL h5dopen_f(file_id, dsetname, dset_id, error)
+     CALL check("h5dopen_f", error, total_error)
+     !
+     ! Get datatype of the open dataset.
+     ! Check it class, number of members,  and member's names.
+     !
+     CALL h5dget_type_f(dset_id, dtype_id, error)
+     CALL check("h5dget_type_f", error, total_error)
+     CALL h5tget_class_f(dtype_id, class, error)
+     CALL check("h5dget_class_f", error, total_error)
+         if (class .ne. H5T_COMPOUND_F) then
+            write(*,*) " Wrong class type returned"
+            total_error = total_error + 1
+         endif
+     CALL h5tget_nmembers_f(dtype_id, num_members, error)
+     CALL check("h5dget_nmembers_f", error, total_error)
+         if (num_members .ne. COMP_NUM_MEMBERS ) then
+            write(*,*) " Wrong number of members returned"
+            total_error = total_error + 1
+         endif
+     !
+     !  Go through the members and find out their names and offsets.
+     !  Also see if name corresponds to the index
+     !
+     do i = 1, num_members
+        CALL h5tget_member_name_f(dtype_id, i-1, member_name, len, error)
+     CALL check("h5tget_member_name_f", error, total_error)
+        CALL h5tget_member_offset_f(dtype_id, i-1, offset_out, error)
+     CALL check("h5tget_member_offset_f", error, total_error)
+        CALL h5tget_member_index_f(dtype_id, member_name(1:len), member_index, error)
+     CALL check("h5tget_member_index_f", error, total_error)
+         if(member_index .ne. i-1) then
+            write(*,*) "Index returned is incorrect"
+            write(*,*) member_index, i-1
+            total_error = total_error + 1
+            endif
+
+        CHECK_NAME: SELECT CASE (member_name(1:len))
+        CASE("char_field")
+             if(offset_out .ne. 0) then
+               write(*,*) "Offset of the char member is incorrect"
+               total_error = total_error + 1
+             endif
+         CALL h5tget_member_type_f(dtype_id, i-1, membtype_id, error)
+          CALL check("h5tget_member_type_f", error, total_error)
+         CALL h5tequal_f(membtype_id, dt5_id, flag, error)
+          CALL check("h5tequal_f", error, total_error)
+             if(.not. flag) then
+                write(*,*) "Wrong member type returned for character member"
+                total_error = total_error + 1
+             endif
+         CALL h5tget_member_class_f(dtype_id, i-1, class, error)
+          CALL check("h5tget_member_class_f",error, total_error)
+              if (class .ne. H5T_STRING_F) then
+                 write(*,*) "Wrong class returned for character member"
+                 total_error = total_error + 1
+              endif
+        CASE("integer_field")
+             if(offset_out .ne. type_sizec) then
+               write(*,*) "Offset of the integer member is incorrect"
+               total_error = total_error + 1
+             endif
+         CALL h5tget_member_type_f(dtype_id, i-1, membtype_id, error)
+          CALL check("h5tget_member_type_f", error, total_error)
+         CALL h5tequal_f(membtype_id, H5T_NATIVE_INTEGER, flag, error)
+          CALL check("h5tequal_f", error, total_error)
+             if(.not. flag) then
+                write(*,*) "Wrong member type returned for integer member"
+                total_error = total_error + 1
+             endif
+         CALL h5tget_member_class_f(dtype_id, i-1, class, error)
+          CALL check("h5tget_member_class_f",error, total_error)
+              if (class .ne. H5T_INTEGER_F) then
+                 write(*,*) "Wrong class returned for INTEGER member"
+                 total_error = total_error + 1
+              endif
+        CASE("double_field")
+             if(offset_out .ne. (type_sizec+type_sizei)) then
+               write(*,*) "Offset of the double precision member is incorrect"
+               total_error = total_error + 1
+             endif
+         CALL h5tget_member_type_f(dtype_id, i-1, membtype_id, error)
+          CALL check("h5tget_member_type_f", error, total_error)
+         CALL h5tequal_f(membtype_id, H5T_NATIVE_DOUBLE, flag, error)
+          CALL check("h5tequal_f", error, total_error)
+             if(.not. flag) then
+                write(*,*) "Wrong member type returned for double precision member"
+                total_error = total_error + 1
+             endif
+         CALL h5tget_member_class_f(dtype_id, i-1, class, error)
+          CALL check("h5tget_member_class_f",error, total_error)
+              if (class .ne. H5T_FLOAT_F) then
+                 write(*,*) "Wrong class returned for double precision member"
+                 total_error = total_error + 1
+              endif
+        CASE("real_field")
+             if(offset_out .ne. (type_sizec+type_sizei+type_sized)) then
+               write(*,*) "Offset of the real member is incorrect"
+               total_error = total_error + 1
+             endif
+         CALL h5tget_member_type_f(dtype_id, i-1, membtype_id, error)
+          CALL check("h5tget_member_type_f", error, total_error)
+         CALL h5tequal_f(membtype_id, H5T_NATIVE_REAL, flag, error)
+          CALL check("h5tequal_f", error, total_error)
+             if(.not. flag) then
+                write(*,*) "Wrong member type returned for real member"
+                total_error = total_error + 1
+             endif
+         CALL h5tget_member_class_f(dtype_id, i-1, class, error)
+          CALL check("h5tget_member_class_f",error, total_error)
+              if (class .ne. H5T_FLOAT_F) then
+                 write(*,*) "Wrong class returned for real member"
+                 total_error = total_error + 1
+              endif
+        CASE DEFAULT
+               write(*,*) "Wrong member's name"
+               total_error = total_error + 1
+
+        END SELECT CHECK_NAME
+
+     enddo
+     !
+     ! Create memory datatype to read character member of the compound datatype.
+     !
+     CALL h5tcopy_f(H5T_NATIVE_CHARACTER, dt2_id, error)
+     CALL check("h5tcopy_f", error, total_error)
+     sizechar = 2
+     CALL h5tset_size_f(dt2_id, sizechar, error)
+     CALL check("h5tset_size_f", error, total_error)
+     CALL h5tget_size_f(dt2_id, type_size, error)
+     CALL check("h5tget_size_f", error, total_error)
+     CALL h5tcreate_f(H5T_COMPOUND_F, type_size, dt1_id, error)
+     CALL check("h5tcreate_f", error, total_error)
+     offset = 0
+     CALL h5tinsert_f(dt1_id, "char_field", offset, dt2_id, error)
+     CALL check("h5tinsert_f", error, total_error)
+     !
+     ! Read part of the dataset
+     !
+     CALL h5dread_f(dset_id, dt1_id, char_member_out, data_dims, error, H5S_ALL_F, H5S_ALL_F, H5P_DEFAULT_F)
+     CALL check("h5dread_f", error, total_error)
+         do i = 1, dimsize
+            if (char_member_out(i) .ne. char_member(i)) then
+                write(*,*) " Wrong character data is read back "
+                total_error = total_error + 1
+            endif
+         enddo
+     !
+     CALL h5tcreate_f(H5T_COMPOUND_F, type_sizei, dt5_id, error)
+     CALL check("h5tcreate_f", error, total_error)
+     offset = 0
+     CALL h5tinsert_f(dt5_id, "integer_field", offset, H5T_NATIVE_INTEGER, error)
+     CALL check("h5tinsert_f", error, total_error)
+     !
+     ! Read part of the dataset
+     !
+     CALL h5dread_f(dset_id, dt5_id, int_member_out, data_dims, error)
+     CALL check("h5dread_f", error, total_error)
+         do i = 1, dimsize
+            if (int_member_out(i) .ne. int_member(i)) then
+                write(*,*) " Wrong integer data is read back "
+                total_error = total_error + 1
+            endif
+         enddo
+     !
+     !
+     CALL h5tcreate_f(H5T_COMPOUND_F, type_sized, dt3_id, error)
+     CALL check("h5tcreate_f", error, total_error)
+     offset = 0
+     CALL h5tinsert_f(dt3_id, "double_field", offset, H5T_NATIVE_DOUBLE, error)
+     CALL check("h5tinsert_f", error, total_error)
+     !
+     ! Read part of the dataset
+     !
+     CALL h5dread_f(dset_id, dt3_id, double_member_out, data_dims, error)
+     CALL check("h5dread_f", error, total_error)
+     DO i = 1, dimsize
+        CALL VERIFY("h5dread_f:Wrong double precision data is read back", double_member_out(i), double_member(i), total_error)
+     ENDDO
+     !
+     !
+     CALL h5tcreate_f(H5T_COMPOUND_F, type_sizer, dt4_id, error)
+     CALL check("h5tcreate_f", error, total_error)
+     offset = 0
+     CALL h5tinsert_f(dt4_id, "real_field", offset, H5T_NATIVE_REAL, error)
+     CALL check("h5tinsert_f", error, total_error)
+     !
+     ! Read part of the dataset
+     !
+     CALL h5dread_f(dset_id, dt4_id, real_member_out, data_dims, error)
+     CALL check("h5dread_f", error, total_error)
+     DO i = 1, dimsize
+        CALL VERIFY("h5dread_f:Wrong double precision data is read back", real_member_out(i), real_member(i), total_error)
+     ENDDO
+     !
+     ! *-----------------------------------------------------------------------
+     ! * Test encoding and decoding compound datatypes
+     ! *-----------------------------------------------------------------------
+     !
+     !     Encode compound type in a buffer
+     !         -- First find the buffer size
+
+     CALL H5Tencode_f(dtype_id, cmpd_buf, cmpd_buf_size, error)
+     CALL check("H5Tencode_f", error, total_error)
+
+     !  Try decoding bogus buffer
+
+     CALL H5Tdecode_f(cmpd_buf, decoded_tid1, error)
+     CALL verify("H5Tdecode_f", error, -1, total_error)
+
+     CALL H5Tencode_f(dtype_id, cmpd_buf, cmpd_buf_size, error)
+     CALL check("H5Tencode_f", error, total_error)
+
+     !  Decode from the compound buffer and return an object handle
+     CALL H5Tdecode_f(cmpd_buf, decoded_tid1, error)
+     CALL check("H5Tdecode_f", error, total_error)
+
+     !  Verify that the datatype was copied exactly
+
+     CALL H5Tequal_f(decoded_tid1, dtype_id, flag, error)
+     CALL check("H5Tequal_f", error, total_error)
+     CALL verify("H5Tequal_f", flag, .TRUE., total_error)
+     !
+     ! Close all open objects.
+     !
+     CALL h5dclose_f(dset_id, error)
+     CALL check("h5dclose_f", error, total_error)
+     CALL h5tclose_f(dt1_id, error)
+     CALL check("h5tclose_f", error, total_error)
+     CALL h5tclose_f(dt2_id, error)
+     CALL check("h5tclose_f", error, total_error)
+     CALL h5tclose_f(dt3_id, error)
+     CALL check("h5tclose_f", error, total_error)
+     CALL h5tclose_f(dt4_id, error)
+     CALL check("h5tclose_f", error, total_error)
+     CALL h5tclose_f(dt5_id, error)
+     CALL check("h5tclose_f", error, total_error)
+     CALL h5fclose_f(file_id, error)
+     CALL check("h5fclose_f", error, total_error)
+
+     IF(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
+     CALL check("h5_cleanup_f", error, total_error)
+     RETURN
+     END SUBROUTINE compoundtest
+
+
+
+
+    SUBROUTINE basic_data_type_test(total_error)
+
+!   This subroutine tests following functionalities:
+!   H5tget_precision_f, H5tset_precision_f, H5tget_offset_f
+!   H5tset_offset_f, H5tget_pad_f, H5tset_pad_f, H5tget_sign_f,
+!   H5tset_sign_f, H5tget_ebias_f,H5tset_ebias_f, H5tget_norm_f,
+!   H5tset_norm_f, H5tget_inpad_f, H5tset_inpad_f, H5tget_cset_f,
+!   H5tset_cset_f, H5tget_strpad_f, H5tset_strpad_f
+
+     IMPLICIT NONE
+     INTEGER, INTENT(OUT) :: total_error
+
+     INTEGER(HID_T) :: dtype1_id, dtype2_id, dtype3_id, dtype4_id, dtype5_id
+                                     ! datatype identifiers
+     INTEGER(SIZE_T) :: precision ! Datatype precision
+     INTEGER(SIZE_T) :: setprecision ! Datatype precision
+     INTEGER(SIZE_T) :: offset ! Datatype offset
+     INTEGER(SIZE_T) :: setoffset ! Datatype offset
+     INTEGER :: lsbpad !padding type of the least significant bit
+     INTEGER :: msbpad !padding type of the most significant bit
+     INTEGER :: sign !sign type for an integer type
+     INTEGER(SIZE_T) :: ebias1 !Datatype exponent bias of a floating-point type
+     INTEGER(SIZE_T) :: ebias2 !Datatype exponent bias of a floating-point type
+     INTEGER(SIZE_T) :: setebias
+     INTEGER :: norm   !mantissa normalization of a floating-point datatype
+     INTEGER :: inpad   !padding type for unused bits in floating-point datatypes.
+     INTEGER :: cset   !character set type of a string datatype
+     INTEGER :: strpad !string padding method for a string datatype
+     INTEGER :: error !error flag
+
+
+     !
+     ! Create a datatype
+     !
+     CALL h5tcopy_f(H5T_STD_U16BE, dtype1_id, error)
+     CALL check("h5tcopy_f",error,total_error)
+     !
+     !datatype type_id should be modifiable after h5tcopy_f
+     !
+     setprecision = 12
+     CALL h5tset_precision_f(dtype1_id, setprecision, error)
+     CALL check("h5set_precision_f",error,total_error)
+     CALL h5tget_precision_f(dtype1_id,precision, error)
+     CALL check("h5get_precision_f",error,total_error)
+     if(precision .ne. 12) then
+         write (*,*) "got precision is not correct"
+         total_error = total_error + 1
+     end if
+
+     CALL h5tcopy_f(H5T_STD_I32LE, dtype2_id, error)
+     CALL check("h5tcopy_f",error,total_error)
+     setprecision = 12
+     CALL h5tset_precision_f(dtype2_id, setprecision, error)
+     CALL check("h5set_precision_f",error,total_error)
+
+     setoffset = 2
+     CALL h5tset_offset_f(dtype1_id, setoffset, error)
+     CALL check("h5set_offset_f",error,total_error)
+     setoffset = 10
+     CALL h5tset_offset_f(dtype2_id, setoffset, error)
+     CALL check("h5set_offset_f",error,total_error)
+     CALL h5tget_offset_f(dtype2_id,offset, error)
+     CALL check("h5get_offset_f",error,total_error)
+     if(offset .ne. 10) then
+         write (*,*) "got offset is not correct"
+         total_error = total_error + 1
+     end if
+
+     CALL h5tset_pad_f(dtype2_id,H5T_PAD_ONE_F, H5T_PAD_ONE_F, error)
+     CALL check("h5set_pad_f",error,total_error)
+     CALL h5tget_pad_f(dtype2_id,lsbpad,msbpad, error)
+     CALL check("h5get_pad_f",error,total_error)
+     if((lsbpad .ne. H5T_PAD_ONE_F) .and. (msbpad .ne. H5T_PAD_ONE_F)) then
+         write (*,*) "got pad is not correct"
+         total_error = total_error + 1
+     end if
+
+!     CALL h5tset_sign_f(dtype2_id,H5T_SGN_2_F, error)
+!     CALL check("h5set_sign_f",error,total_error)
+!     CALL h5tget_sign_f(dtype2_id,sign, error)
+     CALL h5tget_sign_f(H5T_NATIVE_INTEGER, sign, error)
+     CALL check("h5tget_sign_f",error,total_error)
+     if(sign .ne. H5T_SGN_2_F ) then
+         write (*,*) "got sign is not correct"
+         total_error = total_error + 1
+     end if
+
+     CALL h5tcopy_f(H5T_IEEE_F64BE, dtype3_id, error)
+     CALL check("h5tcopy_f",error,total_error)
+     CALL h5tcopy_f(H5T_IEEE_F32LE, dtype4_id, error)
+     CALL check("h5tcopy_f",error,total_error)
+
+     setebias = 257
+     CALL h5tset_ebias_f(dtype3_id, setebias, error)
+     CALL check("h5tset_ebias_f",error,total_error)
+     setebias = 1
+     CALL h5tset_ebias_f(dtype4_id, setebias, error)
+     CALL check("h5tset_ebias_f",error,total_error)
+     CALL h5tget_ebias_f(dtype3_id, ebias1, error)
+     CALL check("h5tget_ebias_f",error,total_error)
+     if(ebias1 .ne. 257 ) then
+         write (*,*) "got ebias is not correct"
+         total_error = total_error + 1
+     end if
+     CALL h5tget_ebias_f(dtype4_id, ebias2, error)
+     CALL check("h5tget_ebias_f",error,total_error)
+     if(ebias2 .ne. 1 ) then
+         write (*,*) "got ebias is not correct"
+         total_error = total_error + 1
+     end if
+
+     !attention:
+     !It seems that I can't use H5T_NORM_IMPLIED_F to set the norm value
+     !because I got error for the get_norm function
+!     CALL h5tset_norm_f(dtype3_id,H5T_NORM_IMPLIED_F , error)
+!     CALL check("h5tset_norm_f",error,total_error)
+!     CALL h5tget_norm_f(dtype3_id, norm, error)
+!     CALL check("h5tget_norm_f",error,total_error)
+!     if(norm .ne. H5T_NORM_IMPLIED_F ) then
+!         write (*,*) "got norm is not correct"
+!         total_error = total_error + 1
+!     end if
+     CALL h5tset_norm_f(dtype3_id, H5T_NORM_MSBSET_F , error)
+     CALL check("h5tset_norm_f",error,total_error)
+     CALL h5tget_norm_f(dtype3_id, norm, error)
+     CALL check("h5tget_norm_f",error,total_error)
+     if(norm .ne. H5T_NORM_MSBSET_F ) then
+         write (*,*) "got norm is not correct"
+         total_error = total_error + 1
+     end if
+
+     CALL h5tset_norm_f(dtype3_id, H5T_NORM_NONE_F , error)
+     CALL check("h5tset_norm_f",error,total_error)
+     CALL h5tget_norm_f(dtype3_id, norm, error)
+     CALL check("h5tget_norm_f",error,total_error)
+     if(norm .ne. H5T_NORM_NONE_F ) then
+         write (*,*) "got norm is not correct"
+         total_error = total_error + 1
+    end if
+
+     CALL h5tset_inpad_f(dtype3_id, H5T_PAD_ZERO_F , error)
+     CALL check("h5tset_inpad_f",error,total_error)
+     CALL h5tget_inpad_f(dtype3_id, inpad , error)
+     CALL check("h5tget_inpad_f",error,total_error)
+     if(inpad .ne. H5T_PAD_ZERO_F ) then
+         write (*,*) "got inpad is not correct"
+         total_error = total_error + 1
+     end if
+
+     CALL h5tset_inpad_f(dtype3_id,H5T_PAD_ONE_F  , error)
+     CALL check("h5tset_inpad_f",error,total_error)
+     CALL h5tget_inpad_f(dtype3_id, inpad , error)
+     CALL check("h5tget_inpad_f",error,total_error)
+     if(inpad .ne. H5T_PAD_ONE_F ) then
+         write (*,*) "got inpad is not correct"
+         total_error = total_error + 1
+     end if
+
+     CALL h5tset_inpad_f(dtype3_id,H5T_PAD_BACKGROUND_F  , error)
+     CALL check("h5tset_inpad_f",error,total_error)
+     CALL h5tget_inpad_f(dtype3_id, inpad , error)
+     CALL check("h5tget_inpad_f",error,total_error)
+     if(inpad .ne. H5T_PAD_BACKGROUND_F ) then
+         write (*,*) "got inpad is not correct"
+         total_error = total_error + 1
+     end if
+
+!     we should not apply h5tset_cset_f to non_character data typemake
+
+!     CALL h5tset_cset_f(dtype4_id, H5T_CSET_ASCII_F, error)
+!     CALL check("h5tset_cset_f",error,total_error)
+!     CALL h5tget_cset_f(dtype4_id, cset, error)
+!     CALL check("h5tget_cset_f",error,total_error)
+!     if(cset .ne. H5T_CSET_ASCII_F ) then
+!         write (*,*) "got cset is not correct"
+!         total_error = total_error + 1
+!     end if
+
+     CALL h5tcopy_f(H5T_NATIVE_CHARACTER, dtype5_id, error)
+     CALL check("h5tcopy_f",error,total_error)
+     CALL h5tset_cset_f(dtype5_id, H5T_CSET_ASCII_F, error)
+     CALL check("h5tset_cset_f",error,total_error)
+     CALL h5tget_cset_f(dtype5_id, cset, error)
+     CALL check("h5tget_cset_f",error,total_error)
+     if(cset .ne. H5T_CSET_ASCII_F ) then
+         write (*,*) "got cset is not correct"
+         total_error = total_error + 1
+     end if
+     CALL h5tset_strpad_f(dtype5_id, H5T_STR_NULLPAD_F, error)
+     CALL check("h5tset_strpad_f",error,total_error)
+     CALL h5tget_strpad_f(dtype5_id, strpad, error)
+     CALL check("h5tget_strpad_f",error,total_error)
+     if(strpad .ne. H5T_STR_NULLPAD_F ) then
+         write (*,*) "got strpad is not correct"
+         total_error = total_error + 1
+     end if
+
+     CALL h5tset_strpad_f(dtype5_id, H5T_STR_SPACEPAD_F, error)
+     CALL check("h5tset_strpad_f",error,total_error)
+     CALL h5tget_strpad_f(dtype5_id, strpad, error)
+     CALL check("h5tget_strpad_f",error,total_error)
+     if(strpad .ne. H5T_STR_SPACEPAD_F ) then
+         write (*,*) "got strpad is not correct"
+         total_error = total_error + 1
+     end if
+
+    CALL h5tclose_f(dtype1_id, error)
+    CALL check("h5tclose_f", error, total_error)
+    CALL h5tclose_f(dtype2_id, error)
+    CALL check("h5tclose_f", error, total_error)
+    CALL h5tclose_f(dtype3_id, error)
+    CALL check("h5tclose_f", error, total_error)
+    CALL h5tclose_f(dtype4_id, error)
+    CALL check("h5tclose_f", error, total_error)
+    CALL h5tclose_f(dtype5_id, error)
+    CALL check("h5tclose_f", error, total_error)
+
+
+     RETURN
+     END SUBROUTINE basic_data_type_test
+
+    SUBROUTINE enumtest(cleanup, total_error)
+
+    USE HDF5
+    USE TH5_MISC
+    IMPLICIT NONE
+
+    LOGICAL, INTENT(IN)  :: cleanup
+    INTEGER, INTENT(OUT) :: total_error
+    CHARACTER(LEN=4), PARAMETER :: filename="enum"
+    CHARACTER(LEN=80) :: fix_filename
+    CHARACTER(LEN=8), PARAMETER :: dsetname="enumdset"
+    CHARACTER(LEN=4)            :: true ="TRUE"
+    CHARACTER(LEN=5)            :: false="FALSE"
+    CHARACTER(LEN=5)            :: mem_name
+
+    INTEGER(HID_T) :: file_id
+    INTEGER(HID_T) :: dset_id
+    INTEGER(HID_T) :: dspace_id
+    INTEGER(HID_T) :: dtype_id, dtype, native_type
+    INTEGER        :: error
+    INTEGER        :: value
+    INTEGER(HSIZE_T), DIMENSION(1) :: dsize
+    INTEGER(SIZE_T) :: buf_size
+    INTEGER, DIMENSION(2) :: data
+    INTEGER(HSIZE_T), DIMENSION(7) :: dims
+    INTEGER :: order1, order2
+!    INTEGER(SIZE_T) :: type_size1, type_size2
+    INTEGER :: class
+
+    dims(1) = 2
+    dsize(1) = 2
+    data(1) = 1
+    data(2) = 0
+     !
+     ! Create a new file using default properties.
+     !
+    CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
+    IF (error .NE. 0) THEN
+       WRITE(*,*) "Cannot modify filename"
+       STOP
+    ENDIF
+    CALL h5fcreate_f(fix_filename,H5F_ACC_TRUNC_F,file_id,error)
+    CALL check("h5fcreate_f", error, total_error)
+    !
+    ! Create enumeration datatype with two values
+    !
+    CALL h5tenum_create_f(H5T_NATIVE_INTEGER,dtype_id,error)
+    CALL check("h5tenum_create_f", error, total_error)
+    CALL h5tenum_insert_f(dtype_id,true,DATA(1),error)
+    CALL check("h5tenum_insert_f", error, total_error)
+    CALL h5tenum_insert_f(dtype_id,false,DATA(2),error)
+    CALL check("h5tenum_insert_f", error, total_error)
+    !
+    ! Create write and close a dataset with enum datatype
+    !
+    CALL h5screate_simple_f(1,dsize,dspace_id,error)
+    CALL check("h5screate_simple_f", error, total_error)
+    CALL h5dcreate_f(file_id,dsetname,dtype_id,dspace_id,dset_id,error)
+    CALL check("h5dcreate_f", error, total_error)
+    CALL h5dwrite_f(dset_id,dtype_id,DATA,dims,error)
+    CALL check("h5dwrite_f", error, total_error)
+
+    CALL H5Dget_type_f(dset_id, dtype, error)
+    CALL check("H5Dget_type_f", error, total_error)
+
+    CALL H5Tget_native_type_f(dtype, H5T_DIR_ASCEND_F, native_type, error)
+    CALL check("H5Tget_native_type_f",error, total_error)
+
+    ! Verify the datatype retrieved and converted
+    CALL H5Tget_order_f(native_type, order1, error)
+    CALL check("H5Tget_order_f",error, total_error)
+    CALL H5Tget_order_f(H5T_NATIVE_INTEGER, order2, error)
+    CALL check("H5Tget_order_f",error, total_error)
+    CALL verify("H5Tget_native_type_f",order1, order2, total_error)
+
+    ! this test depends on whether -i8 was specified
+
+!!$    CALL H5Tget_size_f(native_type, type_size1, error)
+!!$    CALL check("H5Tget_size_f",error, total_error)
+!!$    CALL H5Tget_size_f(H5T_STD_I32BE, type_size2, error)
+!!$    CALL check("H5Tget_size_f",error, total_error)
+!!$    CALL verify("H5Tget_native_type_f", INT(type_size1), INT(type_size2), total_error)
+
+    CALL H5Tget_class_f(native_type, class, error)
+    CALL check("H5Tget_class_f",error, total_error)
+    CALL verify("H5Tget_native_type_f", INT(class), INT(H5T_ENUM_F), total_error)
+
+    CALL h5dclose_f(dset_id,error)
+    CALL check("h5dclose_f", error, total_error)
+    CALL h5sclose_f(dspace_id,error)
+    CALL check("h5sclose_f", error, total_error)
+    !
+    ! Get value of "TRUE"
+    !
+    CALL h5tenum_valueof_f(dtype_id, "TRUE", value, error)
+    CALL check("h5tenum_valueof_f", error, total_error)
+    IF (value .NE. 1) THEN
+       WRITE(*,*) " Value of TRUE is not 1, error"
+       total_error = total_error + 1
+    ENDIF
+    !
+    !  Get name of 0
+    !
+    value = 0
+    buf_size = 5
+    CALL h5tenum_nameof_f(dtype_id,  value, buf_size, mem_name, error)
+    CALL check("h5tenum_nameof_f", error, total_error)
+    IF (mem_name .NE. "FALSE") THEN
+       WRITE(*,*) " Wrong name for 0 value"
+       total_error = total_error + 1
+    ENDIF
+
+    CALL h5tclose_f(dtype_id,error)
+    CALL check("h5tclose_f", error, total_error)
+    CALL h5fclose_f(file_id,error)
+    CALL check("h5fclose_f", error, total_error)
+
+    IF(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
+    CALL check("h5_cleanup_f", error, total_error)
+
+    RETURN
+  END SUBROUTINE enumtest
+
+!-------------------------------------------------------------------------
+! * Function:    test_derived_flt
+! *
+! * Purpose:     Tests user-define and query functions of floating-point types.
+! *              test h5tget/set_fields_f.
+! *
+! * Return:      Success:        0
+! *
+! *              Failure:        number of errors
+! *
+! * Fortran Programmer:  M.S. Breitenfeld
+! *                      September 9, 2008
+! *
+! * Modifications:
+! *
+! *-------------------------------------------------------------------------
+!
+
+SUBROUTINE test_derived_flt(cleanup, total_error)
+
+
+  IMPLICIT NONE
+  LOGICAL, INTENT(IN)  :: cleanup
+  INTEGER, INTENT(OUT) :: total_error
+  INTEGER(hid_t) :: file=-1, tid1=-1, tid2=-1
+  INTEGER(hid_t) :: dxpl_id=-1
+  INTEGER(size_t) :: spos, epos, esize, mpos, msize
+
+  CHARACTER(LEN=15), PARAMETER :: filename="h5t_derived_flt"
+  CHARACTER(LEN=80) :: fix_filename
+
+  INTEGER(SIZE_T) :: precision1, offset1, ebias1, size1
+  INTEGER(SIZE_T) :: precision2, offset2, ebias2, size2
+
+  INTEGER :: error
+
+  ! Create File
+  CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
+  IF (error .NE. 0) THEN
+     WRITE(*,*) "Cannot modify filename"
+     STOP
+  ENDIF
+
+  CALL h5fcreate_f(fix_filename,H5F_ACC_TRUNC_F,file,error)
+  CALL check("h5fcreate_f", error, total_error)
+
+  CALL h5pcreate_f(H5P_DATASET_XFER_F, dxpl_id, error)
+  CALL check("h5pcreate_f", error, total_error)
+
+  CALL h5tcopy_f(H5T_IEEE_F64LE, tid1, error)
+  CALL check("h5tcopy_f",error,total_error)
+
+  CALL h5tcopy_f(H5T_IEEE_F32LE, tid2, error)
+  CALL check("h5tcopy_f",error,total_error)
+
+  !------------------------------------------------------------------------
+  ! *                   1st floating-point type
+  ! * size=7 byte, precision=42 bits, offset=3 bits, mantissa size=31 bits,
+  ! * mantissa position=3, exponent size=10 bits, exponent position=34,
+  ! * exponent bias=511.  It can be illustrated in little-endian order as
+  ! *
+  ! *          6       5       4       3       2       1       0
+  ! *    ???????? ???SEEEE EEEEEEMM MMMMMMMM MMMMMMMM MMMMMMMM MMMMM???
+  ! *
+  ! * To create a new floating-point type, the following properties must be
+  ! * set in the order of
+  ! *   set fields -> set offset -> set precision -> set size.
+  ! * All these properties must be set before the type can function. Other
+  ! * properties can be set anytime.  Derived type size cannot be expanded
+  ! * bigger than original size but can be decreased.  There should be no
+  ! * holes among the significant bits.  Exponent bias usually is set
+  ! * 2^(n-1)-1, where n is the exponent size.
+  ! *-----------------------------------------------------------------------
+
+  CALL H5Tset_fields_f(tid1, INT(44,size_t), INT(34,size_t), INT(10,size_t), &
+       INT(3,size_t), INT(31,size_t), error)
+  CALL check("H5Tset_fields_f",error,total_error)
+
+  CALL H5Tset_offset_f(tid1, INT(3,size_t), error)
+  CALL check("H5Tset_offset_f",error,total_error)
+
+  CALL H5Tset_precision_f(tid1, INT(42,size_t), error)
+  CALL check("H5Tset_precision_f",error,total_error)
+
+  CALL H5Tset_size_f(tid1, INT(7,size_t), error)
+  CALL check("H5Tset_size_f",error,total_error)
+
+  CALL H5Tset_ebias_f(tid1, INT(511,size_t), error)
+  CALL check("H5Tset_ebias_f",error,total_error)
+
+  CALL H5Tset_pad_f(tid1, H5T_PAD_ZERO_F, H5T_PAD_ZERO_F, error)
+  CALL check("H5Tset_pad_f",error,total_error)
+
+  CALL h5tcommit_f(file, "new float type 1", tid1, error)
+  CALL check("h5tcommit_f", error, total_error)
+
+  CALL h5tclose_f(tid1, error)
+  CALL check("h5tclose_f", error, total_error)
+
+  CALL H5Topen_f(file, "new float type 1", tid1, error)
+  CALL check("H5Topen_f", error, total_error)
+
+  CALL H5Tget_fields_f(tid1, spos, epos, esize, mpos, msize, error)
+  CALL check("H5Tget_fields_f", error, total_error)
+
+  IF(spos.NE.44 .OR. epos.NE.34 .OR. esize.NE.10 .OR. mpos.NE.3 .OR. msize.NE.31)THEN
+     CALL verify("H5Tget_fields_f", -1, 0, total_error)
+  ENDIF
+
+  CALL H5Tget_precision_f(tid1, precision1, error)
+  CALL check("H5Tget_precision_f", error, total_error)
+  CALL verify("H5Tget_precision_f", INT(precision1), 42, total_error)
+
+  CALL H5Tget_offset_f(tid1, offset1, error)
+  CALL check("H5Tget_offset_f", error, total_error)
+  CALL verify("H5Tget_offset_f", INT(offset1), 3, total_error)
+
+  CALL H5Tget_size_f(tid1, size1, error)
+  CALL check("H5Tget_size_f", error, total_error)
+  CALL verify("H5Tget_size_f", INT(size1), 7, total_error)
+
+  CALL H5Tget_ebias_f(tid1, ebias1, error)
+  CALL check("H5Tget_ebias_f", error, total_error)
+  CALL verify("H5Tget_ebias_f", INT(ebias1), 511, total_error)
+
+  !--------------------------------------------------------------------------
+  ! *                   2nd floating-point type
+  ! * size=3 byte, precision=24 bits, offset=0 bits, mantissa size=16 bits,
+  ! * mantissa position=0, exponent size=7 bits, exponent position=16, exponent
+  ! * bias=63. It can be illustrated in little-endian order as
+  ! *
+  ! *          2       1       0
+  ! *    SEEEEEEE MMMMMMMM MMMMMMMM
+  ! *--------------------------------------------------------------------------
+
+  CALL H5Tset_fields_f(tid2, INT(23,size_t), INT(16,size_t), INT(7,size_t), &
+       INT(0,size_t), INT(16,size_t), error)
+  CALL check("H5Tset_fields_f",error,total_error)
+
+  CALL H5Tset_offset_f(tid2, INT(0,size_t), error)
+  CALL check("H5Tset_offset_f",error,total_error)
+
+  CALL H5Tset_precision_f(tid2, INT(24,size_t), error)
+  CALL check("H5Tset_precision_f",error,total_error)
+
+  CALL H5Tset_size_f(tid2, INT(3,size_t), error)
+  CALL check("H5Tset_size_f",error,total_error)
+
+  CALL H5Tset_ebias_f(tid2, INT(63,size_t), error)
+  CALL check("H5Tset_ebias_f",error,total_error)
+
+  CALL H5Tset_pad_f(tid2, H5T_PAD_ZERO_F, H5T_PAD_ZERO_F, error)
+  CALL check("H5Tset_pad_f",error,total_error)
+
+  CALL h5tcommit_f(file, "new float type 2", tid2, error)
+  CALL check("h5tcommit_f", error, total_error)
+
+  CALL h5tclose_f(tid2, error)
+  CALL check("h5tclose_f", error, total_error)
+
+  CALL H5Topen_f(file, "new float type 2", tid2, error)
+  CALL check("H5Topen_f", error, total_error)
+
+  CALL H5Tget_fields_f(tid2, spos, epos, esize, mpos, msize, error)
+  CALL check("H5Tget_fields_f", error, total_error)
+
+  IF(spos.NE.23 .OR. epos.NE.16 .OR. esize.NE.7 .OR. mpos.NE.0 .OR. msize.NE.16)THEN
+     CALL verify("H5Tget_fields_f", -1, 0, total_error)
+  ENDIF
+
+  CALL H5Tget_precision_f(tid2, precision2, error)
+  CALL check("H5Tget_precision_f", error, total_error)
+  CALL verify("H5Tget_precision_f", INT(precision2), 24, total_error)
+
+  CALL H5Tget_offset_f(tid2, offset2, error)
+  CALL check("H5Tget_offset_f", error, total_error)
+  CALL verify("H5Tget_offset_f", INT(offset2), 0, total_error)
+
+  CALL H5Tget_size_f(tid2, size2, error)
+  CALL check("H5Tget_size_f", error, total_error)
+  CALL verify("H5Tget_size_f", INT(size2), 3, total_error)
+
+  CALL H5Tget_ebias_f(tid2, ebias2, error)
+  CALL check("H5Tget_ebias_f", error, total_error)
+  CALL verify("H5Tget_ebias_f", INT(ebias2), 63, total_error)
+
+  CALL h5tclose_f(tid1, error)
+  CALL check("h5tclose_f", error, total_error)
+
+  CALL h5tclose_f(tid2, error)
+  CALL check("h5tclose_f", error, total_error)
+
+  CALL H5Pclose_f(dxpl_id, error)
+  CALL check("H5Pclose_f", error, total_error)
+
+  CALL h5fclose_f(file,error)
+  CALL check("h5fclose_f", error, total_error)
+
+  IF(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
+  CALL check("h5_cleanup_f", error, total_error)
+
+END SUBROUTINE test_derived_flt
+
+END MODULE TH5T
diff --git a/fortran/test/tH5T.f90 b/fortran/test/tH5T.f90
deleted file mode 100644
index 7822c16..0000000
--- a/fortran/test/tH5T.f90
+++ /dev/null
@@ -1,1160 +0,0 @@
-!****h* root/fortran/test/tH5T.f90
-!
-! NAME
-!  tH5T.f90
-!
-! FUNCTION
-!  Basic testing of Fortran H5T APIs.
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! CONTAINS SUBROUTINES
-!  compoundtest, basic_data_type_test, enumtest, test_derived_flt
-!
-!*****
-
-MODULE TH5T
-
-CONTAINS
-
-    SUBROUTINE compoundtest(cleanup, total_error)
-!
-! This program creates a dataset that is one dimensional array of
-! structures  {
-!                 character*2
-!                 integer
-!                 double precision
-!                 real
-!                                   }
-! Data is written and read back by fields.
-!
-! The following H5T interface functions are tested:
-! h5tcopy_f, h5tset(get)_size_f, h5tcreate_f, h5tinsert_f,  h5tclose_f,
-! h5tget_class_f, h5tget_member_name_f, h5tget_member_offset_f, h5tget_member_type_f,
-! h5tequal_f, h5tinsert_array_f, h5tcommit_f, h5tencode_f, h5tdecode_f
-
-     USE HDF5 ! This module contains all necessary modules
-     USE TH5_MISC
-
-     IMPLICIT NONE
-     LOGICAL, INTENT(IN)  :: cleanup
-     INTEGER, INTENT(OUT) :: total_error
-
-     CHARACTER(LEN=8), PARAMETER :: filename = "compound" ! File name
-     CHARACTER(LEN=80) :: fix_filename
-     CHARACTER(LEN=8), PARAMETER :: dsetname = "Compound"     ! Dataset name
-     INTEGER, PARAMETER :: dimsize = 6 ! Size of the dataset
-     INTEGER, PARAMETER :: COMP_NUM_MEMBERS = 4 ! Number of members in the compound datatype
-
-     INTEGER(HID_T) :: file_id       ! File identifier
-     INTEGER(HID_T) :: dset_id       ! Dataset identifier
-     INTEGER(HID_T) :: dspace_id     ! Dataspace identifier
-     INTEGER(HID_T) :: dtype_id      ! Compound datatype identifier
-     INTEGER(HID_T) :: dtarray_id    ! Compound datatype identifier
-     INTEGER(HID_T) :: arrayt_id    ! Array datatype identifier
-     INTEGER(HID_T) :: dt1_id      ! Memory datatype identifier (for character field)
-     INTEGER(HID_T) :: dt2_id      ! Memory datatype identifier (for integer field)
-     INTEGER(HID_T) :: dt3_id      ! Memory datatype identifier (for double precision field)
-     INTEGER(HID_T) :: dt4_id      ! Memory datatype identifier (for real field)
-     INTEGER(HID_T) :: dt5_id      ! Memory datatype identifier
-     INTEGER(HID_T) :: membtype_id ! Datatype identifier
-     INTEGER(HID_T) :: plist_id    ! Dataset trasfer property
-
-
-     INTEGER(HSIZE_T), DIMENSION(1) :: dims = (/dimsize/) ! Dataset dimensions
-     INTEGER     ::   rank = 1                            ! Dataset rank
-
-     INTEGER     ::   error ! Error flag
-     INTEGER(SIZE_T)     ::   type_size  ! Size of the datatype
-     INTEGER(SIZE_T)     ::   type_sizec  ! Size of the character datatype
-     INTEGER(SIZE_T)     ::   type_sizei  ! Size of the integer datatype
-     INTEGER(SIZE_T)     ::   type_sized  ! Size of the double precision datatype
-     INTEGER(SIZE_T)     ::   type_sizer  ! Size of the real datatype
-     INTEGER(SIZE_T)     ::   offset     ! Member's offset
-     INTEGER(SIZE_T)     ::   offset_out     ! Member's offset
-     CHARACTER(LEN=2), DIMENSION(dimsize)      :: char_member
-     CHARACTER(LEN=2), DIMENSION(dimsize)      :: char_member_out ! Buffer to read data out
-     INTEGER, DIMENSION(dimsize)          :: int_member
-     INTEGER, DIMENSION(dimsize)          :: int_member_out
-     REAL(KIND=Fortran_DOUBLE), DIMENSION(dimsize) :: double_member
-     REAL(KIND=Fortran_DOUBLE), DIMENSION(dimsize) :: double_member_out
-     REAL, DIMENSION(dimsize)             :: real_member
-     REAL, DIMENSION(dimsize)             :: real_member_out
-     INTEGER :: i
-     INTEGER :: class ! Datatype class
-     INTEGER :: num_members ! Number of members in the compound datatype
-     CHARACTER(LEN=256) :: member_name
-     INTEGER :: len ! Lenght of the name of the compound datatype member
-     INTEGER :: member_index ! index of the field
-     INTEGER(HSIZE_T), DIMENSION(3) :: array_dims=(/2,3,4/)
-     INTEGER :: array_dims_range = 3
-     INTEGER :: elements = 24 ! number of elements in the array_dims array.
-     INTEGER(SIZE_T) :: sizechar
-     INTEGER(HSIZE_T), DIMENSION(1) :: data_dims
-     LOGICAL :: flag = .TRUE.
-
-     CHARACTER(LEN=1024) :: cmpd_buf
-     INTEGER(SIZE_T) :: cmpd_buf_size=0
-     INTEGER(HID_T) :: decoded_tid1
-
-     INTEGER(HID_T) :: fixed_str1, fixed_str2
-     LOGICAL :: are_equal
-     INTEGER(SIZE_T), PARAMETER :: str_size = 10 
-     INTEGER(SIZE_T) :: query_size
-
-     ! Test h5tcreate_f with H5T_STRING_F option:
-     !   Create fixed-length string in two ways and make sure they are the same
-
-     CALL h5tcopy_f(H5T_FORTRAN_S1, fixed_str1, error)
-     CALL check("h5tcopy_f", error, total_error)
-     CALL h5tset_size_f(fixed_str1, str_size, error)
-     CALL check("h5tset_size_f", error, total_error)
-     CALL h5tset_strpad_f(fixed_str1, H5T_STR_NULLTERM_F, error)
-     CALL check("h5tset_strpad_f", error, total_error)
-     
-     CALL h5tcreate_f(H5T_STRING_F, str_size, fixed_str2, error)
-     CALL check("h5tcreate_f", error, total_error)
-     CALL h5tset_strpad_f(fixed_str2, H5T_STR_NULLTERM_F, error)
-     CALL check("h5tset_strpad_f", error, total_error)
-     
-     CALL h5tequal_f(fixed_str1, fixed_str2, are_equal, error)
-     IF(.NOT.are_equal)THEN
-        CALL check("h5tcreate_f", -1, total_error)
-     ENDIF
-     
-     CALL h5tget_size_f(fixed_str1, query_size, error)
-     CALL check("h5tget_size_f", error, total_error)
-     
-     IF(query_size.NE.str_size)THEN
-        CALL check("h5tget_size_f", -1, total_error)
-     ENDIF
-     
-     CALL h5tget_size_f(fixed_str2, query_size, error)
-     CALL check("h5tget_size_f", error, total_error)
-
-     IF(query_size.NE.str_size)THEN
-        CALL check("h5tget_size_f", -1, total_error)
-     ENDIF
-     
-     CALL h5tclose_f(fixed_str1,error)
-     CALL check("h5tclose_f", error, total_error)
-     
-     CALL h5tclose_f(fixed_str2,error)
-     CALL check("h5tclose_f", error, total_error)
-
-     data_dims(1) = dimsize
-     !
-     ! Initialize data buffer.
-     !
-     do i = 1, dimsize
-        char_member(i)(1:1) = char(65+i)
-        char_member(i)(2:2) = char(65+i)
-        char_member_out(i)(1:1)   = char(65)
-        char_member_out(i)(2:2)   = char(65)
-        int_member(i)   = i
-        int_member_out(i)   = 0
-        double_member(i)   = 2.* i
-        double_member_out(i)   = 0.
-        real_member(i)   = 3. * i
-        real_member_out(i)   = 0.
-     enddo
-
-     !
-     ! Set dataset transfer property to preserve partially initialized fields
-     ! during write/read to/from dataset with compound datatype.
-     !
-     CALL h5pcreate_f(H5P_DATASET_XFER_F, plist_id, error)
-         CALL check("h5pcreate_f", error, total_error)
-     CALL h5pset_preserve_f(plist_id, flag, error)
-         CALL check("h5pset_preserve_f", error, total_error)
-     !
-     ! Create a new file using default properties.
-     !
-          CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
-          if (error .ne. 0) then
-              write(*,*) "Cannot modify filename"
-              stop
-          endif
-     CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
-         CALL check("h5fcreate_f", error, total_error)
-
-     !
-     ! Create the dataspace.
-     !
-     CALL h5screate_simple_f(rank, dims, dspace_id, error)
-         CALL check("h5screate_simple_f", error, total_error)
-     !
-     ! Create compound datatype.
-     !
-     ! First calculate total size by calculating sizes of each member
-     !
-     CALL h5tcopy_f(H5T_NATIVE_CHARACTER, dt5_id, error)
-         CALL check("h5tcopy_f", error, total_error)
-     sizechar = 2
-     CALL h5tset_size_f(dt5_id, sizechar, error)
-         CALL check("h5tset_size_f", error, total_error)
-     CALL h5tget_size_f(dt5_id, type_sizec, error)
-         CALL check("h5tget_size_f", error, total_error)
-     CALL h5tget_size_f(H5T_NATIVE_INTEGER, type_sizei, error)
-         CALL check("h5tget_size_f", error, total_error)
-     CALL h5tget_size_f(H5T_NATIVE_DOUBLE, type_sized, error)
-         CALL check("h5tget_size_f", error, total_error)
-     CALL h5tget_size_f(H5T_NATIVE_REAL, type_sizer, error)
-         CALL check("h5tget_size_f", error, total_error)
-     !write(*,*) "get sizes", type_sizec, type_sizei, type_sizer, type_sized
-     type_size = type_sizec + type_sizei + type_sized + type_sizer
-     CALL h5tcreate_f(H5T_COMPOUND_F, type_size, dtype_id, error)
-         CALL check("h5tcreate_f", error, total_error)
-     !
-     ! Insert memebers
-     !
-     ! CHARACTER*2 memeber
-     !
-     offset = 0
-     CALL h5tinsert_f(dtype_id, "char_field", offset, dt5_id, error)
-         CALL check("h5tinsert_f", error, total_error)
-     !
-     ! INTEGER member
-     !
-     offset = offset + type_sizec ! Offset of the second memeber is 2
-     CALL h5tinsert_f(dtype_id, "integer_field", offset, H5T_NATIVE_INTEGER, error)
-         CALL check("h5tinsert_f", error, total_error)
-     !
-     ! DOUBLE PRECISION member
-     !
-     offset = offset + type_sizei  ! Offset of the third memeber is 6
-     CALL h5tinsert_f(dtype_id, "double_field", offset, H5T_NATIVE_DOUBLE, error)
-         CALL check("h5tinsert_f", error, total_error)
-     !
-     ! REAL member
-     !
-     offset = offset + type_sized  ! Offset of the last member is 14
-     CALL h5tinsert_f(dtype_id, "real_field", offset, H5T_NATIVE_REAL, error)
-     CALL check("h5tinsert_f", error, total_error)
-     !
-     ! Create the dataset with compound datatype.
-     !
-     CALL h5dcreate_f(file_id, dsetname, dtype_id, dspace_id, &
-                      dset_id, error)
-         CALL check("h5dcreate_f", error, total_error)
-     !
-     ! Create memory types. We have to create a compound datatype
-     ! for each member we want to write.
-     !
-     CALL h5tcreate_f(H5T_COMPOUND_F, type_sizec, dt1_id, error)
-         CALL check("h5tcreate_f", error, total_error)
-     offset = 0
-     CALL h5tinsert_f(dt1_id, "char_field", offset, dt5_id, error)
-         CALL check("h5tinsert_f", error, total_error)
-     !
-     CALL h5tcreate_f(H5T_COMPOUND_F, type_sizei, dt2_id, error)
-         CALL check("h5tcreate_f", error, total_error)
-     offset = 0
-     CALL h5tinsert_f(dt2_id, "integer_field", offset, H5T_NATIVE_INTEGER, error)
-         CALL check("h5tinsert_f", error, total_error)
-     !
-     CALL h5tcreate_f(H5T_COMPOUND_F, type_sized, dt3_id, error)
-         CALL check("h5tcreate_f", error, total_error)
-     offset = 0
-     CALL h5tinsert_f(dt3_id, "double_field", offset, H5T_NATIVE_DOUBLE, error)
-         CALL check("h5tinsert_f", error, total_error)
-     !
-     CALL h5tcreate_f(H5T_COMPOUND_F, type_sizer, dt4_id, error)
-         CALL check("h5tcreate_f", error, total_error)
-     offset = 0
-     CALL h5tinsert_f(dt4_id, "real_field", offset, H5T_NATIVE_REAL, error)
-         CALL check("h5tinsert_f", error, total_error)
-     !
-     ! Write data by fields in the datatype. Fields order is not important.
-     !
-     CALL h5dwrite_f(dset_id, dt4_id, real_member, data_dims, error, xfer_prp = plist_id)
-         CALL check("h5dwrite_f", error, total_error)
-     CALL h5dwrite_f(dset_id, dt1_id, char_member, data_dims, error, xfer_prp = plist_id)
-         CALL check("h5dwrite_f", error, total_error)
-     CALL h5dwrite_f(dset_id, dt3_id, double_member, data_dims, error, xfer_prp = plist_id)
-         CALL check("h5dwrite_f", error, total_error)
-     CALL h5dwrite_f(dset_id, dt2_id, int_member, data_dims, error, xfer_prp = plist_id)
-         CALL check("h5dwrite_f", error, total_error)
-
-     !
-     ! End access to the dataset and release resources used by it.
-     !
-     CALL h5dclose_f(dset_id, error)
-         CALL check("h5dclose_f", error, total_error)
-
-     !
-     ! Terminate access to the data space.
-     !
-     CALL h5sclose_f(dspace_id, error)
-         CALL check("h5sclose_f", error, total_error)
-     !
-     ! Terminate access to the datatype
-     !
-     CALL h5tclose_f(dtype_id, error)
-         CALL check("h5tclose_f", error, total_error)
-     CALL h5tclose_f(dt1_id, error)
-         CALL check("h5tclose_f", error, total_error)
-     CALL h5tclose_f(dt2_id, error)
-         CALL check("h5tclose_f", error, total_error)
-     CALL h5tclose_f(dt3_id, error)
-         CALL check("h5tclose_f", error, total_error)
-     CALL h5tclose_f(dt4_id, error)
-         CALL check("h5tclose_f", error, total_error)
-
-     !
-     ! Create and store compound datatype with the character and
-     ! array members.
-     !
-     type_size = type_sizec + elements*type_sizer ! Size of compound datatype
-     CALL h5tcreate_f(H5T_COMPOUND_F, type_size, dtarray_id, error)
-         CALL check("h5tcreate_f", error, total_error)
-     offset = 0
-     CALL h5tinsert_f(dtarray_id, "char_field", offset, H5T_NATIVE_CHARACTER, error)
-         CALL check("h5tinsert_f", error, total_error)
-     offset = type_sizec
-     CALL h5tarray_create_f(H5T_NATIVE_REAL, array_dims_range, array_dims, arrayt_id, error)
-         CALL check("h5tarray_create_f", error, total_error)
-     CALL h5tinsert_f(dtarray_id,"array_field", offset, arrayt_id, error)
-         CALL check("h5tinsert_f", error, total_error)
-     CALL h5tcommit_f(file_id, "Compound_with_array_member", dtarray_id, error)
-         CALL check("h5tcommit_f", error, total_error)
-     CALL h5tclose_f(arrayt_id, error)
-         CALL check("h5tclose_f", error, total_error)
-     CALL h5tclose_f(dtarray_id, error)
-         CALL check("h5tclose_f", error, total_error)
-
-     !
-     ! Close the file.
-     !
-     CALL h5fclose_f(file_id, error)
-         CALL check("h5fclose_f", error, total_error)
-
-     !
-     ! Open the file.
-     !
-     CALL h5fopen_f (fix_filename, H5F_ACC_RDWR_F, file_id, error)
-         CALL check("h5fopen_f", error, total_error)
-     !
-     ! Open the dataset.
-     !
-     CALL h5dopen_f(file_id, dsetname, dset_id, error)
-         CALL check("h5dopen_f", error, total_error)
-     !
-     ! Get datatype of the open dataset.
-     ! Check it class, number of members,  and member's names.
-     !
-     CALL h5dget_type_f(dset_id, dtype_id, error)
-         CALL check("h5dget_type_f", error, total_error)
-     CALL h5tget_class_f(dtype_id, class, error)
-         CALL check("h5dget_class_f", error, total_error)
-         if (class .ne. H5T_COMPOUND_F) then
-            write(*,*) " Wrong class type returned"
-            total_error = total_error + 1
-         endif
-     CALL h5tget_nmembers_f(dtype_id, num_members, error)
-         CALL check("h5dget_nmembers_f", error, total_error)
-         if (num_members .ne. COMP_NUM_MEMBERS ) then
-            write(*,*) " Wrong number of members returned"
-            total_error = total_error + 1
-         endif
-     !
-     !  Go through the members and find out their names and offsets.
-     !  Also see if name corresponds to the index
-     !
-     do i = 1, num_members
-        CALL h5tget_member_name_f(dtype_id, i-1, member_name, len, error)
-         CALL check("h5tget_member_name_f", error, total_error)
-        CALL h5tget_member_offset_f(dtype_id, i-1, offset_out, error)
-         CALL check("h5tget_member_offset_f", error, total_error)
-        CALL h5tget_member_index_f(dtype_id, member_name(1:len), member_index, error)
-         CALL check("h5tget_member_index_f", error, total_error)
-         if(member_index .ne. i-1) then
-            write(*,*) "Index returned is incorrect"
-            write(*,*) member_index, i-1
-            total_error = total_error + 1
-            endif
-
-        CHECK_NAME: SELECT CASE (member_name(1:len))
-        CASE("char_field")
-             if(offset_out .ne. 0) then
-               write(*,*) "Offset of the char member is incorrect"
-               total_error = total_error + 1
-             endif
-             CALL h5tget_member_type_f(dtype_id, i-1, membtype_id, error)
-              CALL check("h5tget_member_type_f", error, total_error)
-             CALL h5tequal_f(membtype_id, dt5_id, flag, error)
-              CALL check("h5tequal_f", error, total_error)
-             if(.not. flag) then
-                write(*,*) "Wrong member type returned for character member"
-                total_error = total_error + 1
-             endif
-             CALL h5tget_member_class_f(dtype_id, i-1, class, error)
-              CALL check("h5tget_member_class_f",error, total_error)
-              if (class .ne. H5T_STRING_F) then
-                 write(*,*) "Wrong class returned for character member"
-                 total_error = total_error + 1
-              endif
-        CASE("integer_field")
-             if(offset_out .ne. type_sizec) then
-               write(*,*) "Offset of the integer member is incorrect"
-               total_error = total_error + 1
-             endif
-             CALL h5tget_member_type_f(dtype_id, i-1, membtype_id, error)
-              CALL check("h5tget_member_type_f", error, total_error)
-             CALL h5tequal_f(membtype_id, H5T_NATIVE_INTEGER, flag, error)
-              CALL check("h5tequal_f", error, total_error)
-             if(.not. flag) then
-                write(*,*) "Wrong member type returned for integer memebr"
-                total_error = total_error + 1
-             endif
-             CALL h5tget_member_class_f(dtype_id, i-1, class, error)
-              CALL check("h5tget_member_class_f",error, total_error)
-              if (class .ne. H5T_INTEGER_F) then
-                 write(*,*) "Wrong class returned for INTEGER member"
-                 total_error = total_error + 1
-              endif
-        CASE("double_field")
-             if(offset_out .ne. (type_sizec+type_sizei)) then
-               write(*,*) "Offset of the double precision member is incorrect"
-               total_error = total_error + 1
-             endif
-             CALL h5tget_member_type_f(dtype_id, i-1, membtype_id, error)
-              CALL check("h5tget_member_type_f", error, total_error)
-             CALL h5tequal_f(membtype_id, H5T_NATIVE_DOUBLE, flag, error)
-              CALL check("h5tequal_f", error, total_error)
-             if(.not. flag) then
-                write(*,*) "Wrong member type returned for double precision memebr"
-                total_error = total_error + 1
-             endif
-             CALL h5tget_member_class_f(dtype_id, i-1, class, error)
-              CALL check("h5tget_member_class_f",error, total_error)
-              if (class .ne. H5T_FLOAT_F) then
-                 write(*,*) "Wrong class returned for double precision member"
-                 total_error = total_error + 1
-              endif
-        CASE("real_field")
-             if(offset_out .ne. (type_sizec+type_sizei+type_sized)) then
-               write(*,*) "Offset of the real member is incorrect"
-               total_error = total_error + 1
-             endif
-             CALL h5tget_member_type_f(dtype_id, i-1, membtype_id, error)
-              CALL check("h5tget_member_type_f", error, total_error)
-             CALL h5tequal_f(membtype_id, H5T_NATIVE_REAL, flag, error)
-              CALL check("h5tequal_f", error, total_error)
-             if(.not. flag) then
-                write(*,*) "Wrong member type returned for real memebr"
-                total_error = total_error + 1
-             endif
-             CALL h5tget_member_class_f(dtype_id, i-1, class, error)
-              CALL check("h5tget_member_class_f",error, total_error)
-              if (class .ne. H5T_FLOAT_F) then
-                 write(*,*) "Wrong class returned for real member"
-                 total_error = total_error + 1
-              endif
-        CASE DEFAULT
-               write(*,*) "Wrong member's name"
-               total_error = total_error + 1
-
-        END SELECT CHECK_NAME
-
-     enddo
-     !
-     ! Create memory datatype to read character member of the compound datatype.
-     !
-     CALL h5tcopy_f(H5T_NATIVE_CHARACTER, dt2_id, error)
-         CALL check("h5tcopy_f", error, total_error)
-     sizechar = 2
-     CALL h5tset_size_f(dt2_id, sizechar, error)
-         CALL check("h5tset_size_f", error, total_error)
-     CALL h5tget_size_f(dt2_id, type_size, error)
-         CALL check("h5tget_size_f", error, total_error)
-     CALL h5tcreate_f(H5T_COMPOUND_F, type_size, dt1_id, error)
-         CALL check("h5tcreate_f", error, total_error)
-     offset = 0
-     CALL h5tinsert_f(dt1_id, "char_field", offset, dt2_id, error)
-         CALL check("h5tinsert_f", error, total_error)
-     !
-     ! Read part of the dataset
-     !
-     CALL h5dread_f(dset_id, dt1_id, char_member_out, data_dims, error)
-         CALL check("h5dread_f", error, total_error)
-         do i = 1, dimsize
-            if (char_member_out(i) .ne. char_member(i)) then
-                write(*,*) " Wrong character data is read back "
-                total_error = total_error + 1
-            endif
-         enddo
-     !
-     CALL h5tcreate_f(H5T_COMPOUND_F, type_sizei, dt5_id, error)
-         CALL check("h5tcreate_f", error, total_error)
-     offset = 0
-     CALL h5tinsert_f(dt5_id, "integer_field", offset, H5T_NATIVE_INTEGER, error)
-         CALL check("h5tinsert_f", error, total_error)
-     !
-     ! Read part of the dataset
-     !
-     CALL h5dread_f(dset_id, dt5_id, int_member_out, data_dims, error)
-         CALL check("h5dread_f", error, total_error)
-         do i = 1, dimsize
-            if (int_member_out(i) .ne. int_member(i)) then
-                write(*,*) " Wrong integer data is read back "
-                total_error = total_error + 1
-            endif
-         enddo
-     !
-     !
-     CALL h5tcreate_f(H5T_COMPOUND_F, type_sized, dt3_id, error)
-         CALL check("h5tcreate_f", error, total_error)
-     offset = 0
-     CALL h5tinsert_f(dt3_id, "double_field", offset, H5T_NATIVE_DOUBLE, error)
-         CALL check("h5tinsert_f", error, total_error)
-     !
-     ! Read part of the dataset
-     !
-     CALL h5dread_f(dset_id, dt3_id, double_member_out, data_dims, error)
-         CALL check("h5dread_f", error, total_error)
-         do i = 1, dimsize
-            IF( .NOT.dreal_eq( REAL(double_member_out(i),dp), REAL( double_member(i), dp)) ) THEN
-                write(*,*) " Wrong double precision data is read back "
-                total_error = total_error + 1
-            endif
-         enddo
-     !
-     !
-     CALL h5tcreate_f(H5T_COMPOUND_F, type_sizer, dt4_id, error)
-         CALL check("h5tcreate_f", error, total_error)
-     offset = 0
-     CALL h5tinsert_f(dt4_id, "real_field", offset, H5T_NATIVE_REAL, error)
-         CALL check("h5tinsert_f", error, total_error)
-     !
-     ! Read part of the dataset
-     !
-     CALL h5dread_f(dset_id, dt4_id, real_member_out, data_dims, error)
-         CALL check("h5dread_f", error, total_error)
-         DO i = 1, dimsize
-            IF( .NOT.dreal_eq( REAL(real_member_out(i),dp), REAL( real_member(i), dp)) ) THEN
-               WRITE(*,*) " Wrong real precision data is read back "
-               total_error = total_error + 1
-            ENDIF
-         ENDDO
-     !
-     ! *-----------------------------------------------------------------------
-     ! * Test encoding and decoding compound datatypes
-     ! *-----------------------------------------------------------------------
-     !
-     !     Encode compound type in a buffer 
-     !         -- First find the buffer size
-
-     CALL H5Tencode_f(dtype_id, cmpd_buf, cmpd_buf_size, error)
-     CALL check("H5Tencode_f", error, total_error)
-
-     !  Try decoding bogus buffer 
-
-     CALL H5Tdecode_f(cmpd_buf, decoded_tid1, error)
-     CALL VERIFY("H5Tdecode_f", error, -1, total_error)
-
-     CALL H5Tencode_f(dtype_id, cmpd_buf, cmpd_buf_size, error)
-     CALL check("H5Tencode_f", error, total_error)
-
-     !  Decode from the compound buffer and return an object handle 
-     CALL H5Tdecode_f(cmpd_buf, decoded_tid1, error)
-     CALL check("H5Tdecode_f", error, total_error)
-
-     !  Verify that the datatype was copied exactly 
-
-     CALL H5Tequal_f(decoded_tid1, dtype_id, flag, error)
-     CALL check("H5Tequal_f", error, total_error)
-     CALL VerifyLogical("H5Tequal_f", flag, .TRUE., total_error)
-     !
-     ! Close all open objects.
-     !
-     CALL h5dclose_f(dset_id, error)
-         CALL check("h5dclose_f", error, total_error)
-     CALL h5tclose_f(dt1_id, error)
-         CALL check("h5tclose_f", error, total_error)
-     CALL h5tclose_f(dt2_id, error)
-         CALL check("h5tclose_f", error, total_error)
-     CALL h5tclose_f(dt3_id, error)
-         CALL check("h5tclose_f", error, total_error)
-     CALL h5tclose_f(dt4_id, error)
-         CALL check("h5tclose_f", error, total_error)
-     CALL h5tclose_f(dt5_id, error)
-         CALL check("h5tclose_f", error, total_error)
-     CALL h5fclose_f(file_id, error)
-         CALL check("h5fclose_f", error, total_error)
-
-          if(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
-              CALL check("h5_cleanup_f", error, total_error)
-     RETURN
-     END SUBROUTINE compoundtest
-
-
-
-
-    SUBROUTINE basic_data_type_test(total_error)
-
-!   This subroutine tests following functionalities:
-!   H5tget_precision_f, H5tset_precision_f, H5tget_offset_f
-!   H5tset_offset_f, H5tget_pad_f, H5tset_pad_f, H5tget_sign_f,
-!   H5tset_sign_f, H5tget_ebias_f,H5tset_ebias_f, H5tget_norm_f,
-!   H5tset_norm_f, H5tget_inpad_f, H5tset_inpad_f, H5tget_cset_f,
-!   H5tset_cset_f, H5tget_strpad_f, H5tset_strpad_f
-
-     USE HDF5 ! This module contains all necessary modules
-     USE TH5_MISC
-
-     IMPLICIT NONE
-     INTEGER, INTENT(OUT) :: total_error
-
-     INTEGER(HID_T) :: dtype1_id, dtype2_id, dtype3_id, dtype4_id, dtype5_id
-                                     ! datatype identifiers
-     INTEGER(SIZE_T) :: precision ! Datatype precision
-     INTEGER(SIZE_T) :: setprecision ! Datatype precision
-     INTEGER(SIZE_T) :: offset ! Datatype offset
-     INTEGER(SIZE_T) :: setoffset ! Datatype offset
-     INTEGER :: lsbpad !padding type of the least significant bit
-     INTEGER :: msbpad !padding type of the most significant bit
-     INTEGER :: sign !sign type for an integer type
-     INTEGER(SIZE_T) :: ebias1 !Datatype exponent bias of a floating-point type
-     INTEGER(SIZE_T) :: ebias2 !Datatype exponent bias of a floating-point type
-     INTEGER(SIZE_T) :: setebias
-     INTEGER :: norm   !mantissa normalization of a floating-point datatype
-     INTEGER :: inpad   !padding type for unused bits in floating-point datatypes.
-     INTEGER :: cset   !character set type of a string datatype
-     INTEGER :: strpad !string padding method for a string datatype
-     INTEGER :: error !error flag
-
-
-     !
-     ! Create a datatype
-     !
-     CALL h5tcopy_f(H5T_STD_U16BE, dtype1_id, error)
-     CALL check("h5tcopy_f",error,total_error)
-     !
-     !datatype type_id should be modifiable after h5tcopy_f
-     !
-     setprecision = 12
-     CALL h5tset_precision_f(dtype1_id, setprecision, error)
-     CALL check("h5set_precision_f",error,total_error)
-     CALL h5tget_precision_f(dtype1_id,precision, error)
-     CALL check("h5get_precision_f",error,total_error)
-     if(precision .ne. 12) then
-         write (*,*) "got precision is not correct"
-         total_error = total_error + 1
-     end if
-
-     CALL h5tcopy_f(H5T_STD_I32LE, dtype2_id, error)
-     CALL check("h5tcopy_f",error,total_error)
-     setprecision = 12
-     CALL h5tset_precision_f(dtype2_id, setprecision, error)
-     CALL check("h5set_precision_f",error,total_error)
-
-     setoffset = 2
-     CALL h5tset_offset_f(dtype1_id, setoffset, error)
-     CALL check("h5set_offset_f",error,total_error)
-     setoffset = 10
-     CALL h5tset_offset_f(dtype2_id, setoffset, error)
-     CALL check("h5set_offset_f",error,total_error)
-     CALL h5tget_offset_f(dtype2_id,offset, error)
-     CALL check("h5get_offset_f",error,total_error)
-     if(offset .ne. 10) then
-         write (*,*) "got offset is not correct"
-         total_error = total_error + 1
-     end if
-
-     CALL h5tset_pad_f(dtype2_id,H5T_PAD_ONE_F, H5T_PAD_ONE_F, error)
-     CALL check("h5set_pad_f",error,total_error)
-     CALL h5tget_pad_f(dtype2_id,lsbpad,msbpad, error)
-     CALL check("h5get_pad_f",error,total_error)
-     if((lsbpad .ne. H5T_PAD_ONE_F) .and. (msbpad .ne. H5T_PAD_ONE_F)) then
-         write (*,*) "got pad is not correct"
-         total_error = total_error + 1
-     end if
-
-!     CALL h5tset_sign_f(dtype2_id,H5T_SGN_2_F, error)
-!     CALL check("h5set_sign_f",error,total_error)
-!     CALL h5tget_sign_f(dtype2_id,sign, error)
-     CALL h5tget_sign_f(H5T_NATIVE_INTEGER, sign, error)
-     CALL check("h5tget_sign_f",error,total_error)
-     if(sign .ne. H5T_SGN_2_F ) then
-         write (*,*) "got sign is not correct"
-         total_error = total_error + 1
-     end if
-
-     CALL h5tcopy_f(H5T_IEEE_F64BE, dtype3_id, error)
-     CALL check("h5tcopy_f",error,total_error)
-     CALL h5tcopy_f(H5T_IEEE_F32LE, dtype4_id, error)
-     CALL check("h5tcopy_f",error,total_error)
-
-     setebias = 257
-     CALL h5tset_ebias_f(dtype3_id, setebias, error)
-     CALL check("h5tset_ebias_f",error,total_error)
-     setebias = 1
-     CALL h5tset_ebias_f(dtype4_id, setebias, error)
-     CALL check("h5tset_ebias_f",error,total_error)
-     CALL h5tget_ebias_f(dtype3_id, ebias1, error)
-     CALL check("h5tget_ebias_f",error,total_error)
-     if(ebias1 .ne. 257 ) then
-         write (*,*) "got ebias is not correct"
-         total_error = total_error + 1
-     end if
-     CALL h5tget_ebias_f(dtype4_id, ebias2, error)
-     CALL check("h5tget_ebias_f",error,total_error)
-     if(ebias2 .ne. 1 ) then
-         write (*,*) "got ebias is not correct"
-         total_error = total_error + 1
-     end if
-
-     !attention:
-     !It seems that I can't use H5T_NORM_IMPLIED_F to set the norm value
-     !because I got error for the get_norm function
-!     CALL h5tset_norm_f(dtype3_id,H5T_NORM_IMPLIED_F , error)
-!     CALL check("h5tset_norm_f",error,total_error)
-!     CALL h5tget_norm_f(dtype3_id, norm, error)
-!     CALL check("h5tget_norm_f",error,total_error)
-!     if(norm .ne. H5T_NORM_IMPLIED_F ) then
-!         write (*,*) "got norm is not correct"
-!         total_error = total_error + 1
-!     end if
-     CALL h5tset_norm_f(dtype3_id, H5T_NORM_MSBSET_F , error)
-     CALL check("h5tset_norm_f",error,total_error)
-     CALL h5tget_norm_f(dtype3_id, norm, error)
-     CALL check("h5tget_norm_f",error,total_error)
-     if(norm .ne. H5T_NORM_MSBSET_F ) then
-         write (*,*) "got norm is not correct"
-         total_error = total_error + 1
-     end if
-
-     CALL h5tset_norm_f(dtype3_id, H5T_NORM_NONE_F , error)
-     CALL check("h5tset_norm_f",error,total_error)
-     CALL h5tget_norm_f(dtype3_id, norm, error)
-     CALL check("h5tget_norm_f",error,total_error)
-     if(norm .ne. H5T_NORM_NONE_F ) then
-         write (*,*) "got norm is not correct"
-         total_error = total_error + 1
-    end if
-
-     CALL h5tset_inpad_f(dtype3_id, H5T_PAD_ZERO_F , error)
-     CALL check("h5tset_inpad_f",error,total_error)
-     CALL h5tget_inpad_f(dtype3_id, inpad , error)
-     CALL check("h5tget_inpad_f",error,total_error)
-     if(inpad .ne. H5T_PAD_ZERO_F ) then
-         write (*,*) "got inpad is not correct"
-         total_error = total_error + 1
-     end if
-
-     CALL h5tset_inpad_f(dtype3_id,H5T_PAD_ONE_F  , error)
-     CALL check("h5tset_inpad_f",error,total_error)
-     CALL h5tget_inpad_f(dtype3_id, inpad , error)
-     CALL check("h5tget_inpad_f",error,total_error)
-     if(inpad .ne. H5T_PAD_ONE_F ) then
-         write (*,*) "got inpad is not correct"
-         total_error = total_error + 1
-     end if
-
-     CALL h5tset_inpad_f(dtype3_id,H5T_PAD_BACKGROUND_F  , error)
-     CALL check("h5tset_inpad_f",error,total_error)
-     CALL h5tget_inpad_f(dtype3_id, inpad , error)
-     CALL check("h5tget_inpad_f",error,total_error)
-     if(inpad .ne. H5T_PAD_BACKGROUND_F ) then
-         write (*,*) "got inpad is not correct"
-         total_error = total_error + 1
-     end if
-
-!     we should not apply h5tset_cset_f to non_character data typemake
-
-!     CALL h5tset_cset_f(dtype4_id, H5T_CSET_ASCII_F, error)
-!     CALL check("h5tset_cset_f",error,total_error)
-!     CALL h5tget_cset_f(dtype4_id, cset, error)
-!     CALL check("h5tget_cset_f",error,total_error)
-!     if(cset .ne. H5T_CSET_ASCII_F ) then
-!         write (*,*) "got cset is not correct"
-!         total_error = total_error + 1
-!     end if
-
-     CALL h5tcopy_f(H5T_NATIVE_CHARACTER, dtype5_id, error)
-     CALL check("h5tcopy_f",error,total_error)
-     CALL h5tset_cset_f(dtype5_id, H5T_CSET_ASCII_F, error)
-     CALL check("h5tset_cset_f",error,total_error)
-     CALL h5tget_cset_f(dtype5_id, cset, error)
-     CALL check("h5tget_cset_f",error,total_error)
-     if(cset .ne. H5T_CSET_ASCII_F ) then
-         write (*,*) "got cset is not correct"
-         total_error = total_error + 1
-     end if
-     CALL h5tset_strpad_f(dtype5_id, H5T_STR_NULLPAD_F, error)
-     CALL check("h5tset_strpad_f",error,total_error)
-     CALL h5tget_strpad_f(dtype5_id, strpad, error)
-     CALL check("h5tget_strpad_f",error,total_error)
-     if(strpad .ne. H5T_STR_NULLPAD_F ) then
-         write (*,*) "got strpad is not correct"
-         total_error = total_error + 1
-     end if
-
-     CALL h5tset_strpad_f(dtype5_id, H5T_STR_SPACEPAD_F, error)
-     CALL check("h5tset_strpad_f",error,total_error)
-     CALL h5tget_strpad_f(dtype5_id, strpad, error)
-     CALL check("h5tget_strpad_f",error,total_error)
-     if(strpad .ne. H5T_STR_SPACEPAD_F ) then
-         write (*,*) "got strpad is not correct"
-         total_error = total_error + 1
-     end if
-
-    CALL h5tclose_f(dtype1_id, error)
-    CALL check("h5tclose_f", error, total_error)
-    CALL h5tclose_f(dtype2_id, error)
-    CALL check("h5tclose_f", error, total_error)
-    CALL h5tclose_f(dtype3_id, error)
-    CALL check("h5tclose_f", error, total_error)
-    CALL h5tclose_f(dtype4_id, error)
-    CALL check("h5tclose_f", error, total_error)
-    CALL h5tclose_f(dtype5_id, error)
-    CALL check("h5tclose_f", error, total_error)
-
-
-     RETURN
-     END SUBROUTINE basic_data_type_test
-
-    SUBROUTINE enumtest(cleanup, total_error)
-
-    USE HDF5
-    USE TH5_MISC
-    IMPLICIT NONE
-
-    LOGICAL, INTENT(IN)  :: cleanup
-    INTEGER, INTENT(OUT) :: total_error
-    CHARACTER(LEN=4), PARAMETER :: filename="enum"
-    CHARACTER(LEN=80) :: fix_filename
-    CHARACTER(LEN=8), PARAMETER :: dsetname="enumdset"
-    CHARACTER(LEN=4)            :: true ="TRUE"
-    CHARACTER(LEN=5)            :: false="FALSE"
-    CHARACTER(LEN=5)            :: mem_name
-
-    INTEGER(HID_T) :: file_id
-    INTEGER(HID_T) :: dset_id
-    INTEGER(HID_T) :: dspace_id
-    INTEGER(HID_T) :: dtype_id, dtype, native_type
-    INTEGER        :: error
-    INTEGER        :: value
-    INTEGER(HSIZE_T), DIMENSION(1) :: dsize
-    INTEGER(SIZE_T) :: buf_size
-    INTEGER, DIMENSION(2) :: data
-    INTEGER(HSIZE_T), DIMENSION(7) :: dims
-    INTEGER :: order1, order2
-!    INTEGER(SIZE_T) :: type_size1, type_size2
-    INTEGER :: class
-
-    dims(1) = 2
-    dsize(1) = 2
-    data(1) = 1
-    data(2) = 0
-     !
-     ! Create a new file using default properties.
-     !
-    CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
-    IF (error .NE. 0) THEN
-       WRITE(*,*) "Cannot modify filename"
-       STOP
-    ENDIF
-    CALL h5fcreate_f(fix_filename,H5F_ACC_TRUNC_F,file_id,error)
-    CALL check("h5fcreate_f", error, total_error)
-    !
-    ! Create enumeration datatype with tow values
-    !
-    CALL h5tenum_create_f(H5T_NATIVE_INTEGER,dtype_id,error)
-    CALL check("h5tenum_create_f", error, total_error)
-    CALL h5tenum_insert_f(dtype_id,true,DATA(1),error)
-    CALL check("h5tenum_insert_f", error, total_error)
-    CALL h5tenum_insert_f(dtype_id,false,DATA(2),error)
-    CALL check("h5tenum_insert_f", error, total_error)
-    !
-    ! Create write  and close a dataset with enum datatype
-    !
-    CALL h5screate_simple_f(1,dsize,dspace_id,error)
-    CALL check("h5screate_simple_f", error, total_error)
-    CALL h5dcreate_f(file_id,dsetname,dtype_id,dspace_id,dset_id,error)
-    CALL check("h5dcreate_f", error, total_error)
-    CALL h5dwrite_f(dset_id,dtype_id,DATA,dims,error)
-    CALL check("h5dwrite_f", error, total_error)
-
-    CALL H5Dget_type_f(dset_id, dtype, error)
-    CALL check("H5Dget_type_f", error, total_error)
-
-    CALL H5Tget_native_type_f(dtype, H5T_DIR_ASCEND_F, native_type, error)
-    CALL check("H5Tget_native_type_f",error, total_error)
-
-    ! Verify the datatype retrieved and converted 
-    CALL H5Tget_order_f(native_type, order1, error)
-    CALL check("H5Tget_order_f",error, total_error)
-    CALL H5Tget_order_f(H5T_NATIVE_INTEGER, order2, error)
-    CALL check("H5Tget_order_f",error, total_error)
-    CALL VERIFY("H5Tget_native_type_f",order1, order2, total_error)
-
-    ! this test depends on whether -i8 was specified
-
-!!$    CALL H5Tget_size_f(native_type, type_size1, error)
-!!$    CALL check("H5Tget_size_f",error, total_error)
-!!$    CALL H5Tget_size_f(H5T_STD_I32BE, type_size2, error)
-!!$    CALL check("H5Tget_size_f",error, total_error)
-!!$    CALL VERIFY("H5Tget_native_type_f", INT(type_size1), INT(type_size2), total_error)
-
-    CALL H5Tget_class_f(native_type, class, error)
-    CALL check("H5Tget_class_f",error, total_error)
-    CALL VERIFY("H5Tget_native_type_f", INT(class), INT(H5T_ENUM_F), total_error)
-
-    CALL h5dclose_f(dset_id,error)
-    CALL check("h5dclose_f", error, total_error)
-    CALL h5sclose_f(dspace_id,error)
-    CALL check("h5sclose_f", error, total_error)
-    !
-    ! Get value of "TRUE"
-    !
-    CALL h5tenum_valueof_f(dtype_id, "TRUE", value, error)
-    CALL check("h5tenum_valueof_f", error, total_error)
-    IF (value .NE. 1) THEN
-       WRITE(*,*) " Value of TRUE is not 1, error"
-       total_error = total_error + 1
-    ENDIF
-    !
-    !  Get name of 0
-    !
-    value = 0
-    buf_size = 5
-    CALL h5tenum_nameof_f(dtype_id,  value, buf_size, mem_name, error)
-    CALL check("h5tenum_nameof_f", error, total_error)
-    IF (mem_name .NE. "FALSE") THEN
-       WRITE(*,*) " Wrong name for 0 value"
-       total_error = total_error + 1
-    ENDIF
-
-    CALL h5tclose_f(dtype_id,error)
-    CALL check("h5tclose_f", error, total_error)
-    CALL h5fclose_f(file_id,error)
-    CALL check("h5fclose_f", error, total_error)
-
-    IF(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
-    CALL check("h5_cleanup_f", error, total_error)
-
-    RETURN
-  END SUBROUTINE enumtest
-
-!-------------------------------------------------------------------------
-! * Function:    test_derived_flt
-! *
-! * Purpose:     Tests user-define and query functions of floating-point types.
-! *              test h5tget/set_fields_f.
-! *
-! * Return:      Success:        0
-! *
-! *              Failure:        number of errors
-! *
-! * Fortran Programmer:  M.S. Breitenfeld
-! *                      September 9, 2008
-! *
-! * Modifications:
-! *
-! *-------------------------------------------------------------------------
-! 
-
-SUBROUTINE test_derived_flt(cleanup, total_error)
-
-  USE HDF5 ! This module contains all necessary modules
-  USE TH5_MISC
-
-  IMPLICIT NONE
-  LOGICAL, INTENT(IN)  :: cleanup
-  INTEGER, INTENT(OUT) :: total_error
-  INTEGER(hid_t) :: file=-1, tid1=-1, tid2=-1
-  INTEGER(hid_t) :: dxpl_id=-1
-  INTEGER(size_t) :: spos, epos, esize, mpos, msize
-
-  CHARACTER(LEN=15), PARAMETER :: filename="h5t_derived_flt"
-  CHARACTER(LEN=80) :: fix_filename
-
-  INTEGER(SIZE_T) :: precision1, offset1, ebias1, size1
-  INTEGER(SIZE_T) :: precision2, offset2, ebias2, size2
-
-  INTEGER :: error
-
-  ! Create File 
-  CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
-  IF (error .NE. 0) THEN
-     WRITE(*,*) "Cannot modify filename"
-     STOP
-  ENDIF
-
-  CALL h5fcreate_f(fix_filename,H5F_ACC_TRUNC_F,file,error)
-  CALL check("h5fcreate_f", error, total_error)
-
-  CALL h5pcreate_f(H5P_DATASET_XFER_F, dxpl_id, error)
-  CALL check("h5pcreate_f", error, total_error)
-
-  CALL h5tcopy_f(H5T_IEEE_F64LE, tid1, error)
-  CALL check("h5tcopy_f",error,total_error)
-
-  CALL h5tcopy_f(H5T_IEEE_F32LE, tid2, error)
-  CALL check("h5tcopy_f",error,total_error)
-
-  !------------------------------------------------------------------------
-  ! *                   1st floating-point type
-  ! * size=7 byte, precision=42 bits, offset=3 bits, mantissa size=31 bits,
-  ! * mantissa position=3, exponent size=10 bits, exponent position=34,
-  ! * exponent bias=511.  It can be illustrated in little-endian order as
-  ! *
-  ! *          6       5       4       3       2       1       0
-  ! *    ???????? ???SEEEE EEEEEEMM MMMMMMMM MMMMMMMM MMMMMMMM MMMMM???
-  ! *
-  ! * To create a new floating-point type, the following properties must be
-  ! * set in the order of
-  ! *   set fields -> set offset -> set precision -> set size.
-  ! * All these properties must be set before the type can function. Other
-  ! * properties can be set anytime.  Derived type size cannot be expanded
-  ! * bigger than original size but can be decreased.  There should be no
-  ! * holes among the significant bits.  Exponent bias usually is set
-  ! * 2^(n-1)-1, where n is the exponent size.
-  ! *-----------------------------------------------------------------------
-
-  CALL H5Tset_fields_f(tid1, INT(44,size_t), INT(34,size_t), INT(10,size_t), &
-       INT(3,size_t), INT(31,size_t), error)
-  CALL check("H5Tset_fields_f",error,total_error)
-
-  CALL H5Tset_offset_f(tid1, INT(3,size_t), error)
-  CALL check("H5Tset_offset_f",error,total_error)
-
-  CALL H5Tset_precision_f(tid1, INT(42,size_t), error)
-  CALL check("H5Tset_precision_f",error,total_error)
-
-  CALL H5Tset_size_f(tid1, INT(7,size_t), error)
-  CALL check("H5Tset_size_f",error,total_error)
-
-  CALL H5Tset_ebias_f(tid1, INT(511,size_t), error)
-  CALL check("H5Tset_ebias_f",error,total_error)
-
-  CALL H5Tset_pad_f(tid1, H5T_PAD_ZERO_F, H5T_PAD_ZERO_F, error)
-  CALL check("H5Tset_pad_f",error,total_error)
-
-  CALL h5tcommit_f(file, "new float type 1", tid1, error)
-  CALL check("h5tcommit_f", error, total_error)
-
-  CALL h5tclose_f(tid1, error)
-  CALL check("h5tclose_f", error, total_error)
-
-  CALL H5Topen_f(file, "new float type 1", tid1, error)
-  CALL check("H5Topen_f", error, total_error)
-
-  CALL H5Tget_fields_f(tid1, spos, epos, esize, mpos, msize, error)
-  CALL check("H5Tget_fields_f", error, total_error)
-
-  IF(spos.NE.44 .OR. epos.NE.34 .OR. esize.NE.10 .OR. mpos.NE.3 .OR. msize.NE.31)THEN
-     CALL VERIFY("H5Tget_fields_f", -1, 0, total_error)
-  ENDIF
-
-  CALL H5Tget_precision_f(tid1, precision1, error)
-  CALL check("H5Tget_precision_f", error, total_error)
-  CALL VERIFY("H5Tget_precision_f", INT(precision1), 42, total_error)
-
-  CALL H5Tget_offset_f(tid1, offset1, error)
-  CALL check("H5Tget_offset_f", error, total_error)
-  CALL VERIFY("H5Tget_offset_f", INT(offset1), 3, total_error)
-
-  CALL H5Tget_size_f(tid1, size1, error)
-  CALL check("H5Tget_size_f", error, total_error)
-  CALL VERIFY("H5Tget_size_f", INT(size1), 7, total_error)
-
-  CALL H5Tget_ebias_f(tid1, ebias1, error)
-  CALL check("H5Tget_ebias_f", error, total_error)
-  CALL VERIFY("H5Tget_ebias_f", INT(ebias1), 511, total_error)
-
-  !--------------------------------------------------------------------------
-  ! *                   2nd floating-point type
-  ! * size=3 byte, precision=24 bits, offset=0 bits, mantissa size=16 bits,
-  ! * mantissa position=0, exponent size=7 bits, exponent position=16, exponent
-  ! * bias=63. It can be illustrated in little-endian order as
-  ! *
-  ! *          2       1       0
-  ! *    SEEEEEEE MMMMMMMM MMMMMMMM
-  ! *--------------------------------------------------------------------------
-
-  CALL H5Tset_fields_f(tid2, INT(23,size_t), INT(16,size_t), INT(7,size_t), &
-       INT(0,size_t), INT(16,size_t), error)
-  CALL check("H5Tset_fields_f",error,total_error)
-
-  CALL H5Tset_offset_f(tid2, INT(0,size_t), error)
-  CALL check("H5Tset_offset_f",error,total_error)
-
-  CALL H5Tset_precision_f(tid2, INT(24,size_t), error)
-  CALL check("H5Tset_precision_f",error,total_error)
-
-  CALL H5Tset_size_f(tid2, INT(3,size_t), error)
-  CALL check("H5Tset_size_f",error,total_error)
-
-  CALL H5Tset_ebias_f(tid2, INT(63,size_t), error)
-  CALL check("H5Tset_ebias_f",error,total_error)
-
-  CALL H5Tset_pad_f(tid2, H5T_PAD_ZERO_F, H5T_PAD_ZERO_F, error)
-  CALL check("H5Tset_pad_f",error,total_error)
-
-  CALL h5tcommit_f(file, "new float type 2", tid2, error)
-  CALL check("h5tcommit_f", error, total_error)
-
-  CALL h5tclose_f(tid2, error)
-  CALL check("h5tclose_f", error, total_error)
-
-  CALL H5Topen_f(file, "new float type 2", tid2, error)
-  CALL check("H5Topen_f", error, total_error)
-
-  CALL H5Tget_fields_f(tid2, spos, epos, esize, mpos, msize, error)
-  CALL check("H5Tget_fields_f", error, total_error)
-
-  IF(spos.NE.23 .OR. epos.NE.16 .OR. esize.NE.7 .OR. mpos.NE.0 .OR. msize.NE.16)THEN
-     CALL VERIFY("H5Tget_fields_f", -1, 0, total_error)
-  ENDIF
-
-  CALL H5Tget_precision_f(tid2, precision2, error)
-  CALL check("H5Tget_precision_f", error, total_error)
-  CALL VERIFY("H5Tget_precision_f", INT(precision2), 24, total_error)
-
-  CALL H5Tget_offset_f(tid2, offset2, error)
-  CALL check("H5Tget_offset_f", error, total_error)
-  CALL VERIFY("H5Tget_offset_f", INT(offset2), 0, total_error)
-
-  CALL H5Tget_size_f(tid2, size2, error)
-  CALL check("H5Tget_size_f", error, total_error)
-  CALL VERIFY("H5Tget_size_f", INT(size2), 3, total_error)
-
-  CALL H5Tget_ebias_f(tid2, ebias2, error)
-  CALL check("H5Tget_ebias_f", error, total_error)
-  CALL VERIFY("H5Tget_ebias_f", INT(ebias2), 63, total_error)
-
-  CALL h5tclose_f(tid1, error)
-  CALL check("h5tclose_f", error, total_error)
-
-  CALL h5tclose_f(tid2, error)
-  CALL check("h5tclose_f", error, total_error)
-
-  CALL H5Pclose_f(dxpl_id, error)
-  CALL check("H5Pclose_f", error, total_error)
-
-  CALL h5fclose_f(file,error)
-  CALL check("h5fclose_f", error, total_error)
-
-  IF(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
-  CALL check("h5_cleanup_f", error, total_error)
-
-END SUBROUTINE test_derived_flt
-
-END MODULE TH5T
diff --git a/fortran/test/tH5T_F03.F90 b/fortran/test/tH5T_F03.F90
new file mode 100644
index 0000000..9535d3a
--- /dev/null
+++ b/fortran/test/tH5T_F03.F90
@@ -0,0 +1,3663 @@
+!****h* root/fortran/test/tH5T_F03.f90
+!
+! NAME
+!  tH5T_F03.f90
+!
+! FUNCTION
+!  Test FORTRAN HDF5 H5T APIs which are dependent on FORTRAN 2003
+!  features.
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+!
+! CONTAINS SUBROUTINES
+!  test_array_compound_atomic, test_array_compound_array,
+!  test_array_bkg, test_h5kind_to_type
+!
+!*****
+
+! *****************************************
+! ***        H 5 T   T E S T S
+! *****************************************
+
+!***************************************************************
+!**
+!**  test_array_compound_atomic(): Test basic array datatype code.
+!**  Tests 1-D array of compound datatypes (with no array fields)
+!**
+!***************************************************************
+!
+#include <H5config_f.inc>
+
+MODULE TH5T_F03
+
+  USE HDF5
+  USE TH5_MISC
+  USE TH5_MISC_GEN
+  USE ISO_C_BINDING
+
+CONTAINS
+
+SUBROUTINE test_array_compound_atomic(total_error)
+
+  IMPLICIT NONE
+
+  INTEGER, INTENT(INOUT) :: total_error
+  ! 1-D dataset WITH fixed dimensions
+  INTEGER, PARAMETER :: SPACE1_RANK = 1
+  INTEGER, PARAMETER :: SPACE1_DIM1 = 4
+  ! 1-D array datatype
+  INTEGER, PARAMETER :: ARRAY1_RANK= 1
+  INTEGER, PARAMETER :: ARRAY1_DIM1= 4
+  CHARACTER(LEN=10), PARAMETER :: FILENAME = "tarray1.h5"
+
+  TYPE s1_t
+     SEQUENCE
+     INTEGER :: i
+     REAL :: f
+  END TYPE s1_t
+  TYPE(s1_t), DIMENSION(:,:), ALLOCATABLE, TARGET :: wdata !  Information to write
+  TYPE(s1_t), DIMENSION(:,:), ALLOCATABLE, TARGET :: rdata !  Information read in
+  INTEGER(hid_t) :: fid1       ! HDF5 File IDs
+  INTEGER(hid_t) :: dataset    ! Dataset ID
+  INTEGER(hid_t) :: sid1       ! Dataspace ID
+  INTEGER(hid_t) :: tid1       ! Array Datatype ID
+  INTEGER(hid_t) :: tid2       ! Compound Datatype ID
+
+  INTEGER(HSIZE_T), DIMENSION(1) :: sdims1 = (/SPACE1_DIM1/)
+  INTEGER(HSIZE_T), DIMENSION(1) :: tdims1=(/ARRAY1_DIM1/)
+  INTEGER :: ndims !  Array rank for reading
+  INTEGER(HSIZE_T), ALLOCATABLE, DIMENSION(:) :: rdims1 ! Array dimensions for reading
+  INTEGER(HSIZE_T), ALLOCATABLE, DIMENSION(:) :: rdims ! Array dimensions for reading
+  INTEGER :: nmemb ! Number of compound members
+  CHARACTER(LEN=20) :: mname ! Name of compound field
+  INTEGER(size_t) :: off   ! Offset of compound field
+  INTEGER(hid_t) :: mtid   ! Datatype ID for field
+  INTEGER :: i,j      !  counting variables
+
+  INTEGER :: error    !  Generic RETURN value
+  INTEGER :: namelen
+  LOGICAL :: flag
+
+  TYPE(C_PTR) :: f_ptr ! Needed to pass the pointer, for g95 compiler to work
+
+  ALLOCATE( wdata(1:SPACE1_DIM1,1:ARRAY1_DIM1) )
+  ALLOCATE( rdata(1:SPACE1_DIM1,1:ARRAY1_DIM1) )
+
+  ! Initialize array data to write
+  DO i = 1, SPACE1_DIM1
+     DO j = 1, ARRAY1_DIM1
+        wdata(i,j)%i = i * 10 + j
+        wdata(i,j)%f = i * 2.5 + j
+     ENDDO
+  ENDDO
+
+  ! Create file
+  CALL h5fcreate_f(FILENAME,H5F_ACC_TRUNC_F,fid1,error)
+  CALL check("h5fcreate_f", error, total_error)
+
+  ! Create dataspace for datasets
+  CALL h5screate_simple_f(SPACE1_RANK, sdims1, sid1, error)
+  CALL check("h5screate_simple_f", error, total_error)
+
+  CALL h5tcreate_f(H5T_COMPOUND_F, H5OFFSETOF(C_LOC(wdata(1,1)), C_LOC(wdata(2,1))), tid2, error)
+  CALL check("h5tcreate_f", error, total_error)
+
+  ! Insert integer field
+  CALL h5tinsert_f(tid2, "i", H5OFFSETOF(C_LOC(wdata(1,1)),C_LOC(wdata(1,1)%i)), H5T_NATIVE_INTEGER, error)
+  CALL check("h5tinsert_f", error, total_error)
+
+  ! Insert float field
+
+  CALL h5tinsert_f(tid2, "f", H5OFFSETOF(C_LOC(wdata(1,1)),C_LOC(wdata(1,1)%f)), H5T_NATIVE_REAL, error)
+  CALL check("h5tinsert_f", error, total_error)
+
+  !  Create an array datatype to refer to
+  CALL h5tarray_create_f(tid2, ARRAY1_RANK, tdims1, tid1, error)
+  CALL check("h5tarray_create_f", error, total_error)
+
+  ! Close compound datatype
+  CALL h5tclose_f(tid2,error)
+  CALL check("h5tclose_f", error, total_error)
+
+
+  ! Create a dataset
+  CALL h5dcreate_f(fid1,"Dataset1",tid1, sid1, dataset,error)
+  CALL check("h5dcreate_f", error, total_error)
+
+  ! Write dataset to disk
+
+  ALLOCATE(rdims(1:2)) ! dummy not needed
+
+  f_ptr = C_LOC(wdata(1,1))
+  CALL h5dwrite_f(dataset, tid1, f_ptr, error )
+  CALL check("h5dwrite_f", error, total_error)
+  ! Close Dataset
+  CALL h5dclose_f(dataset, error)
+  CALL check("h5dclose_f", error, total_error)
+
+  ! Close datatype
+  CALL h5tclose_f(tid1,error)
+  CALL check("h5tclose_f", error, total_error)
+
+  ! Close disk dataspace
+  CALL h5sclose_f(sid1,error)
+  CALL check("h5sclose_f", error, total_error)
+
+  ! Close file
+  CALL h5fclose_f(fid1,error)
+  CALL check("h5fclose_f", error, total_error)
+
+  ! Re-open file
+  CALL h5fopen_f (FILENAME, H5F_ACC_RDONLY_F, fid1, error)
+  CALL check("h5fopen_f", error, total_error)
+
+  ! Open the dataset
+  CALL h5dopen_f(fid1, "Dataset1", dataset, error)
+  CALL check("h5dopen_f", error, total_error)
+
+  ! Get the datatype
+  CALL h5dget_type_f(dataset, tid1, error)
+  CALL check("h5dget_type_f", error, total_error)
+
+  ! Check the array rank
+  CALL h5tget_array_ndims_f(tid1, ndims, error)
+  CALL check("h5tget_array_ndims_f", error, total_error)
+  CALL VERIFY("h5tget_array_ndims_f",ndims, ARRAY1_RANK, total_error)
+
+  ! Get the array dimensions
+  ALLOCATE(rdims1(1:ndims))
+  CALL h5tget_array_dims_f(tid1, rdims1, error)
+  CALL check("h5tget_array_dims_f", error, total_error)
+
+
+  ! Check the array dimensions
+  DO i = 1, ndims
+     CALL VERIFY("h5tget_array_dims_f", INT(rdims1(i)), INT(tdims1(i)), total_error)
+  ENDDO
+
+  ! Get the compound datatype
+  CALL h5tget_super_f(tid1, tid2, error)
+  CALL check("h5tget_super_f", error, total_error)
+
+  ! Check the number of members
+  CALL h5tget_nmembers_f(tid2, nmemb, error)
+  CALL check("h5tget_nmembers_f", error, total_error)
+  CALL VERIFY("h5tget_nmembers_f", nmemb, 2, total_error)
+
+  ! Check the 1st field's name
+  CALL H5Tget_member_name_f(tid2, 0, mname, namelen,error)
+  CALL check("H5Tget_member_name_f", error, total_error)
+  CALL verify("H5Tget_member_name_f",mname(1:namelen),"i", total_error)
+
+  !  Check the 1st field's offset
+  CALL H5Tget_member_offset_f(tid2, 0, off, error)
+  CALL check("H5Tget_member_offset_f", error, total_error)
+  CALL VERIFY("H5Tget_member_offset_f",INT(off),0, total_error)
+
+
+  ! Check the 1st field's datatype
+  CALL H5Tget_member_type_f(tid2, 0, mtid, error)
+  CALL check("H5Tget_member_type_f", error, total_error)
+
+  CALL H5Tequal_f(mtid, H5T_NATIVE_INTEGER, flag, error)
+  CALL check("H5Tequal_f", error, total_error)
+  CALL verify("H5Tequal_f", flag, .TRUE., total_error)
+
+  CALL h5tclose_f(mtid,error)
+  CALL check("h5tclose_f", error, total_error)
+
+  ! Check the 2nd field's name
+  CALL H5Tget_member_name_f(tid2, 1, mname, namelen,error)
+  CALL check("H5Tget_member_name_f", error, total_error)
+  CALL verify("H5Tget_member_name_f",mname(1:namelen),"f", total_error)
+
+  !  Check the 2nd field's offset
+  CALL H5Tget_member_offset_f(tid2, 1, off, error)
+  CALL check("H5Tget_member_offset_f", error, total_error)
+  CALL VERIFY("H5Tget_member_offset_f",INT(off),INT(H5OFFSETOF(C_LOC(wdata(1,1)),C_LOC(wdata(1,1)%f))), total_error)
+
+  ! Check the 2nd field's datatype
+  CALL H5Tget_member_type_f(tid2, 1, mtid, error)
+  CALL check("H5Tget_member_type_f", error, total_error)
+
+  CALL H5Tequal_f(mtid, H5T_NATIVE_REAL, flag, error)
+  CALL check("H5Tequal_f", error, total_error)
+  CALL verify("H5Tequal_f", flag, .TRUE., total_error)
+
+  CALL h5tclose_f(mtid,error)
+  CALL check("h5tclose_f", error, total_error)
+
+  !  Close Compound Datatype
+  CALL h5tclose_f(tid2, error)
+  CALL check("h5tclose_f", error, total_error)
+
+  ! Read dataset from disk
+
+  f_ptr = C_LOC(rdata(1,1))
+  CALL H5Dread_f(dataset, tid1, f_ptr, error, H5S_ALL_F, H5S_ALL_F, H5P_DEFAULT_F)
+  CALL check("H5Dread_f", error, total_error)
+
+  ! Compare data read in
+  DO i = 1, SPACE1_DIM1
+     DO j = 1, ARRAY1_DIM1
+        IF(wdata(i,j)%i.NE.rdata(i,j)%i)THEN
+           PRINT*, 'ERROR: Wrong integer data is read back by H5Dread_f '
+           total_error = total_error + 1
+        ENDIF
+        CALL VERIFY('ERROR: Wrong real data is read back by H5Dread_f ',wdata(i,j)%f, rdata(i,j)%f, total_error)
+     ENDDO
+  ENDDO
+
+  ! Close Datatype
+  CALL h5tclose_f(tid1,error)
+  CALL check("h5tclose_f", error, total_error)
+
+  ! Close Dataset
+  CALL h5dclose_f(dataset, error)
+  CALL check("h5dclose_f", error, total_error)
+
+  ! Close file
+  CALL h5fclose_f(fid1,error)
+  CALL check("h5fclose_f", error, total_error)
+
+END SUBROUTINE test_array_compound_atomic
+!!$
+!!$!***************************************************************
+!!$!**
+!!$!**  test_array_compound_array(): Test basic array datatype code.
+!!$!**      Tests 1-D array of compound datatypes (with array fields)
+!!$!**
+!!$!***************************************************************
+!!$
+  SUBROUTINE test_array_compound_array(total_error)
+
+    IMPLICIT NONE
+
+    INTEGER, INTENT(INOUT) :: total_error
+
+    !  1-D array datatype
+    INTEGER, PARAMETER :: ARRAY1_RANK= 1
+    INTEGER, PARAMETER :: ARRAY1_DIM1= 3
+    INTEGER, PARAMETER :: ARRAY2_DIM1= 5
+
+    INTEGER, PARAMETER :: SPACE1_RANK = 1
+    INTEGER, PARAMETER :: SPACE1_DIM1 = 4
+    CHARACTER(LEN=10), PARAMETER :: FILENAME = "tarray2.h5"
+
+    TYPE st_t_struct !  Typedef for compound datatype
+       SEQUENCE
+       INTEGER :: i
+       REAL, DIMENSION(1:ARRAY2_DIM1) :: f
+       CHARACTER(LEN=2), DIMENSION(1:ARRAY2_DIM1) :: c
+    END TYPE st_t_struct
+    !  Information to write
+    TYPE(st_t_struct), DIMENSION(1:SPACE1_DIM1,1:ARRAY1_DIM1), TARGET :: wdata
+    !  Information read in
+    TYPE(st_t_struct), DIMENSION(1:SPACE1_DIM1,1:ARRAY1_DIM1), TARGET :: rdata
+
+
+    INTEGER(hid_t) :: fid1      !  HDF5 File IDs
+    INTEGER(hid_t) :: dataset   !  Dataset ID
+    integer(hid_t) :: sid1      !  Dataspace ID
+    integer(hid_t) :: tid1      !  Array Datatype ID
+    integer(hid_t) :: tid2      !  Compound Datatype ID
+    integer(hid_t) :: tid3      !  Nested Array Datatype ID
+    integer(hid_t) :: tid4      !  Nested Array Datatype ID
+
+    INTEGER(HSIZE_T), DIMENSION(1) :: sdims1 = (/SPACE1_DIM1/)
+    INTEGER(HSIZE_T), DIMENSION(1) :: tdims1=(/ARRAY1_DIM1/)
+    INTEGER(HSIZE_T), DIMENSION(1) :: tdims2=(/ARRAY2_DIM1/)
+
+    INTEGER  ndims      ! Array rank for reading
+
+    INTEGER(HSIZE_T), ALLOCATABLE, DIMENSION(:) :: rdims1 ! Array dimensions for reading
+
+    INTEGER :: nmemb ! Number of compound members
+    CHARACTER(LEN=20) :: mname ! Name of compound field
+    INTEGER(size_t) :: off   ! Offset of compound field
+    INTEGER(hid_t) :: mtid   ! Datatype ID for field
+    INTEGER(hid_t) :: mtid2   ! Datatype ID for field
+
+    INTEGER :: mclass     !  Datatype class for field
+    INTEGER :: i,j,k      ! counting variables
+
+    INTEGER :: error
+    CHARACTER(LEN=2) :: ichr2
+    INTEGER :: namelen
+    LOGICAL :: flag
+    INTEGER(HID_T) :: atype_id       !String Attribute Datatype identifier
+    INTEGER(SIZE_T) :: attrlen    ! Length of the attribute string
+
+    TYPE(c_ptr) :: f_ptr
+
+    !  Initialize array data to write
+    DO i = 1, SPACE1_DIM1
+       DO j = 1, array1_DIM1
+          wdata(i,j)%i = i*10+j
+          DO k = 1, ARRAY2_DIM1
+             wdata(i,j)%f(k) = 10*i+j+.5
+             WRITE(ichr2,'(I2.2)') k
+             wdata(i,j)%c(k) = ichr2
+          ENDDO
+       ENDDO
+    ENDDO
+
+    !  Create file
+    CALL h5fcreate_f(FILENAME,H5F_ACC_TRUNC_F,fid1,error)
+    CALL check("h5fcreate_f", error, total_error)
+
+
+    !  Create dataspace for datasets
+    CALL h5screate_simple_f(SPACE1_RANK, sdims1, sid1, error)
+    CALL check("h5screate_simple_f", error, total_error)
+
+    !  Create a compound datatype to refer to
+    !
+    CALL h5tcreate_f(H5T_COMPOUND_F,  H5OFFSETOF(C_LOC(wdata(1,1)), C_LOC(wdata(2,1))), tid2, error)
+    CALL check("h5tcreate_f", error, total_error)
+
+    ! Insert integer field
+    CALL h5tinsert_f(tid2, "i", H5OFFSETOF(C_LOC(wdata(1,1)),C_LOC(wdata(1,1)%i)), H5T_NATIVE_INTEGER, error)
+    CALL check("h5tinsert_f", error, total_error)
+
+    ! Create an array of floats datatype
+    CALL h5tarray_create_f(H5T_NATIVE_REAL, ARRAY1_RANK, tdims2, tid3, error)
+    CALL check("h5tarray_create_f", error, total_error)
+    ! Insert float array field
+
+    CALL h5tinsert_f(tid2, "f", H5OFFSETOF(C_LOC(wdata(1,1)),C_LOC(wdata(1,1)%f)), tid3, error)
+    CALL check("h5tinsert_f", error, total_error)
+
+    !
+    ! Create datatype for the String attribute.
+    !
+    CALL h5tcopy_f(H5T_NATIVE_CHARACTER, atype_id, error)
+    CALL check("h5tcopy_f",error,total_error)
+
+    attrlen = LEN(wdata(1,1)%c(1))
+    CALL h5tset_size_f(atype_id, attrlen, error)
+    CALL check("h5tset_size_f",error,total_error)
+
+    ! Create an array of character datatype
+    CALL h5tarray_create_f(atype_id, ARRAY1_RANK, tdims2, tid4, error)
+    CALL check("h5tarray_create_f", error, total_error)
+
+    ! Insert character array field
+    CALL h5tinsert_f(tid2, "c", H5OFFSETOF(C_LOC(wdata(1,1)),C_LOC(wdata(1,1)%c(1)(1:1))), tid4, error)
+    CALL check("h5tinsert2_f", error, total_error)
+
+    !  Close array of floats field datatype
+    CALL h5tclose_f(tid3,error)
+    CALL check("h5tclose_f", error, total_error)
+
+    CALL h5tclose_f(tid4,error)
+    CALL check("h5tclose_f", error, total_error)
+
+    ! Create an array datatype to refer to
+    CALL h5tarray_create_f(tid2, ARRAY1_RANK, tdims1, tid1, error)
+    CALL check("h5tarray_create_f", error, total_error)
+
+    ! Close compound datatype
+    CALL h5tclose_f(tid2,error)
+    CALL check("h5tclose_f", error, total_error)
+
+    !  Create a dataset
+    CALL h5dcreate_f(fid1,"Dataset1",tid1, sid1, dataset,error)
+    CALL check("h5dcreate_f", error, total_error)
+
+
+    ! Write dataset to disk
+    f_ptr = C_LOC(wdata(1,1))
+    CALL h5dwrite_f(dataset, tid1, f_ptr, error )
+    CALL check("h5dwrite_f", error, total_error)
+
+    ! Close Dataset
+    CALL h5dclose_f(dataset, error)
+    CALL check("h5dclose_f", error, total_error)
+
+    !  Close datatype
+    CALL h5tclose_f(tid1,error)
+    CALL check("h5tclose_f", error, total_error)
+
+    ! Close disk dataspace
+    CALL h5sclose_f(sid1,error)
+    CALL check("h5sclose_f", error, total_error)
+
+    ! Close file
+    CALL h5fclose_f(fid1,error)
+    CALL check("h5fclose_f", error, total_error)
+
+    !  Re-open file
+    CALL h5fopen_f (FILENAME, H5F_ACC_RDONLY_F, fid1, error)
+    CALL check("h5fopen_f", error, total_error)
+
+    ! Open the dataset
+
+    CALL h5dopen_f(fid1, "Dataset1", dataset, error)
+    CALL check("h5dopen_f", error, total_error)
+
+    !  Get the datatype
+    CALL h5dget_type_f(dataset, tid1, error)
+    CALL check("h5dget_type_f", error, total_error)
+
+    !  Check the array rank
+    CALL h5tget_array_ndims_f(tid1, ndims, error)
+    CALL check("h5tget_array_ndims_f", error, total_error)
+    CALL VERIFY("h5tget_array_ndims_f",ndims, ARRAY1_RANK, total_error)
+
+
+    ! Get the array dimensions
+    ALLOCATE(rdims1(1:ndims))
+    CALL h5tget_array_dims_f(tid1, rdims1, error)
+    CALL check("h5tget_array_dims_f", error, total_error)
+
+    !  Check the array dimensions
+    DO i = 1, ndims
+       CALL VERIFY("h5tget_array_dims_f", INT(rdims1(i)), INT(tdims1(i)), total_error)
+    ENDDO
+
+    !  Get the compound datatype
+    CALL h5tget_super_f(tid1, tid2, error)
+    CALL check("h5tget_super_f", error, total_error)
+
+    !  Check the number of members
+    CALL h5tget_nmembers_f(tid2, nmemb, error)
+    CALL check("h5tget_nmembers_f", error, total_error)
+    CALL VERIFY("h5tget_nmembers_f", nmemb, 3, total_error)
+
+    !  Check the 1st field's name
+    CALL H5Tget_member_name_f(tid2, 0, mname, namelen,error)
+    CALL check("H5Tget_member_name_f", error, total_error)
+    CALL verify("H5Tget_member_name_f",mname(1:namelen),"i", total_error)
+
+    !  Check the 1st field's offset
+
+    CALL H5Tget_member_offset_f(tid2, 0, off, error)
+    CALL check("H5Tget_member_offset_f", error, total_error)
+    CALL VERIFY("H5Tget_member_offset_f",INT(off),0, total_error)
+
+    !  Check the 1st field's datatype
+    CALL H5Tget_member_type_f(tid2, 0, mtid, error)
+    CALL check("H5Tget_member_type_f", error, total_error)
+
+    CALL H5Tequal_f(mtid, H5T_NATIVE_INTEGER, flag, error)
+    CALL check("H5Tequal_f", error, total_error)
+    CALL verify("H5Tequal_f", flag, .TRUE., total_error)
+
+    CALL h5tclose_f(mtid,error)
+    CALL check("h5tclose_f", error, total_error)
+
+    !  Check the 2nd field's name
+    CALL H5Tget_member_name_f(tid2, 1, mname, namelen,error)
+    CALL check("H5Tget_member_name_f", error, total_error)
+    CALL verify("H5Tget_member_name_f",mname(1:namelen),"f", total_error)
+
+    !  Check the 2nd field's offset
+    CALL H5Tget_member_offset_f(tid2, 1, off, error)
+    CALL check("H5Tget_member_offset_f", error, total_error)
+    CALL VERIFY("H5Tget_member_offset_f",INT(off),INT(H5OFFSETOF(C_LOC(wdata(1,1)),C_LOC(wdata(1,1)%f))), total_error)
+
+    !  Check the 2nd field's datatype
+    CALL H5Tget_member_type_f(tid2, 1, mtid, error)
+    CALL check("H5Tget_member_type_f", error, total_error)
+
+    !  Get the 2nd field's class
+    CALL H5Tget_class_f(mtid, mclass, error)
+    CALL check("H5Tget_class_f", error, total_error)
+    CALL VERIFY("H5Tget_class_f",mclass, H5T_ARRAY_F, total_error)
+
+    !  Check the array rank
+    CALL h5tget_array_ndims_f(mtid, ndims, error)
+    CALL check("h5tget_array_ndims_f", error, total_error)
+    CALL VERIFY("h5tget_array_ndims_f",ndims, ARRAY1_RANK, total_error)
+
+    !  Get the array dimensions
+    CALL h5tget_array_dims_f(mtid, rdims1, error)
+    CALL check("h5tget_array_dims_f", error, total_error)
+
+    !  Check the array dimensions
+    DO i = 1, ndims
+       CALL VERIFY("h5tget_array_dims_f", INT(rdims1(i)), INT(tdims2(i)), total_error)
+    ENDDO
+
+    !  Check the 3rd field's name
+    CALL H5Tget_member_name_f(tid2, 2, mname, namelen,error)
+    CALL check("H5Tget_member_name_f", error, total_error)
+    CALL verify("H5Tget_member_name_f",mname(1:namelen),"c", total_error)
+
+    !  Check the 3rd field's offset
+    CALL H5Tget_member_offset_f(tid2, 2, off, error)
+    CALL check("H5Tget_member_offset_f", error, total_error)
+    CALL VERIFY("H5Tget_member_offset_f",INT(off),&
+         INT(H5OFFSETOF(C_LOC(wdata(1,1)),C_LOC(wdata(1,1)%c(1)(1:1)))), total_error)
+
+    !  Check the 3rd field's datatype
+    CALL H5Tget_member_type_f(tid2, 2, mtid2, error)
+    CALL check("H5Tget_member_type_f", error, total_error)
+
+    !  Get the 3rd field's class
+    CALL H5Tget_class_f(mtid2, mclass, error)
+    CALL check("H5Tget_class_f", error, total_error)
+    CALL VERIFY("H5Tget_class_f",mclass, H5T_ARRAY_F, total_error)
+
+    !  Check the array rank
+    CALL h5tget_array_ndims_f(mtid2, ndims, error)
+    CALL check("h5tget_array_ndims_f", error, total_error)
+    CALL VERIFY("h5tget_array_ndims_f",ndims, ARRAY1_RANK, total_error)
+
+    !  Get the array dimensions
+    CALL h5tget_array_dims_f(mtid2, rdims1, error)
+    CALL check("h5tget_array_dims_f", error, total_error)
+
+    !  Check the array dimensions
+    DO i = 1, ndims
+       CALL VERIFY("h5tget_array_dims_f", INT(rdims1(i)), INT(tdims2(i)), total_error)
+    ENDDO
+
+    !  Check the nested array's datatype
+    CALL H5Tget_super_f(mtid, tid3, error)
+    CALL check("H5Tget_super_f", error, total_error)
+
+    CALL H5Tequal_f(tid3, H5T_NATIVE_REAL, flag, error)
+    CALL check("H5Tequal_f", error, total_error)
+    CALL verify("H5Tequal_f", flag, .TRUE., total_error)
+
+    !  Check the nested array's datatype
+    CALL H5Tget_super_f(mtid2, tid3, error)
+    CALL check("H5Tget_super_f", error, total_error)
+
+    CALL H5Tequal_f(tid3, atype_id, flag, error)
+    CALL check("H5Tequal_f", error, total_error)
+    CALL verify("H5Tequal_f", flag, .TRUE., total_error)
+
+    !  Close the array's base type datatype
+    CALL h5tclose_f(tid3, error)
+    CALL check("h5tclose_f", error, total_error)
+
+    !  Close the member datatype
+    CALL h5tclose_f(mtid,error)
+    CALL check("h5tclose_f", error, total_error)
+
+    !  Close the member datatype
+    CALL h5tclose_f(mtid2,error)
+    CALL check("h5tclose_f", error, total_error)
+
+    !  Close Compound Datatype
+    CALL h5tclose_f(tid2,error)
+    CALL check("h5tclose_f", error, total_error)
+
+    !  READ dataset from disk
+
+    f_ptr = c_null_ptr
+    f_ptr = C_LOC(rdata(1,1))
+    CALL H5Dread_f(dataset, tid1, f_ptr, error)
+    CALL check("H5Dread_f", error, total_error)
+
+    !  Compare data read in
+    DO i = 1, SPACE1_DIM1
+       DO j = 1, ARRAY1_DIM1
+          IF(wdata(i,j)%i.NE.rdata(i,j)%i)THEN
+             PRINT*, 'ERROR: Wrong integer data is read back by H5Dread_f '
+             total_error = total_error + 1
+          ENDIF
+          DO k = 1, ARRAY2_DIM1
+             CALL VERIFY("h5dread_f",wdata(i,j)%f(k),rdata(i,j)%f(k),total_error)
+             IF(total_error.NE.0) PRINT*,'ERROR: Wrong real array data is read back by H5Dread_f'
+             CALL VERIFY("h5dread_f",wdata(i,j)%c(k),rdata(i,j)%c(k),total_error)
+             IF(total_error.NE.0) PRINT*,'ERROR: Wrong character array data is read back by H5Dread_f'
+          ENDDO
+       ENDDO
+    ENDDO
+
+    !  Close Datatype
+    CALL h5tclose_f(tid1,error)
+    CALL check("h5tclose_f", error, total_error)
+
+    !  Close Dataset
+    CALL h5dclose_f(dataset, error)
+    CALL check("h5dclose_f", error, total_error)
+
+    !  Close file
+    CALL h5fclose_f(fid1,error)
+    CALL check("h5fclose_f", error, total_error)
+  END SUBROUTINE test_array_compound_array
+!!$
+!!$!***************************************************************
+!!$!**
+!!$!**  test_array_bkg(): Test basic array datatype code.
+!!$!**      Tests reading compound datatype with array fields and
+!!$!**          writing partial fields.
+!!$!**
+!!$!***************************************************************
+!!$
+  SUBROUTINE test_array_bkg(total_error)
+
+    IMPLICIT NONE
+
+    INTEGER, INTENT(INOUT) :: total_error
+
+    INTEGER, PARAMETER :: LENGTH = 5
+    INTEGER, PARAMETER :: ALEN = 10
+    INTEGER, PARAMETER :: RANK = 1
+    INTEGER, PARAMETER :: NMAX = 100
+    CHARACTER(LEN=17), PARAMETER :: FIELDNAME = "ArrayofStructures"
+
+    INTEGER(hid_t) :: fid, array_dt
+    INTEGER(hid_t) :: space
+    INTEGER(hid_t) :: type
+    INTEGER(hid_t) :: dataset
+
+    INTEGER(hsize_t), DIMENSION(1:1) :: dim =(/LENGTH/)
+    INTEGER(hsize_t), DIMENSION(1:1) :: dima =(/ALEN/)
+
+    INTEGER :: i, j
+    INTEGER, DIMENSION(1:3) :: ndims = (/1,1,1/)
+
+    TYPE CmpField_struct
+       INTEGER, DIMENSION(1:ALEN) :: a
+       REAL(KIND=sp), DIMENSION(1:ALEN) :: b
+       REAL(KIND=dp), DIMENSION(1:ALEN) :: c
+    ENDTYPE CmpField_struct
+
+    TYPE(CmpField_struct), DIMENSION(1:LENGTH), TARGET :: cf
+    TYPE(CmpField_struct), DIMENSION(1:LENGTH), TARGET :: cfr
+
+    TYPE CmpDTSinfo_struct
+       INTEGER :: nsubfields
+       CHARACTER(LEN=5), DIMENSION(1:nmax) :: name
+       INTEGER(size_t), DIMENSION(1:nmax) :: offset
+       INTEGER(hid_t), DIMENSION(1:nmax) :: datatype
+    END TYPE CmpDTSinfo_struct
+
+    TYPE(CmpDTSinfo_struct) :: dtsinfo
+
+    TYPE fld_t_struct
+       REAL(KIND=sp), DIMENSION(1:ALEN) :: b
+    END TYPE fld_t_struct
+
+    INTEGER(SIZE_T) :: type_sizei  ! Size of the integer datatype
+    INTEGER(SIZE_T) :: type_sizer  ! Size of the real datatype
+    INTEGER(SIZE_T) :: type_sized  ! Size of the double datatype
+    INTEGER(SIZE_T) :: sizeof_compound ! total size of compound
+
+    TYPE(fld_t_struct), DIMENSION(1:LENGTH), TARGET :: fld
+    TYPE(fld_t_struct), DIMENSION(1:LENGTH), TARGET :: fldr
+
+    CHARACTER(LEN=10), PARAMETER :: FILENAME = "tarray3.h5"
+
+    INTEGER(HSIZE_T), ALLOCATABLE, DIMENSION(:) :: rdims1 ! Array dimensions for reading
+    INTEGER(HSIZE_T), ALLOCATABLE, DIMENSION(:) :: rdims ! Array dimensions for reading
+
+    INTEGER :: error
+    TYPE(c_ptr) :: f_ptr
+
+!     Initialize the data
+!     -------------------
+
+    DO i = 1, LENGTH
+       DO j = 1, ALEN
+          cf(i)%a(j) = 100*(i+1) + j
+          cf(i)%b(j) = (100.*(i+1) + 0.01*j)
+          cf(i)%c(j) = 100.*(i+1) + 0.02*j
+       ENDDO
+    ENDDO
+
+    ! Set the number of data members
+    ! ------------------------------
+
+    dtsinfo%nsubfields = 3
+
+    ! Initialize the offsets
+    ! -----------------------
+    CALL h5tget_size_f(H5T_NATIVE_INTEGER, type_sizei, error)
+    CALL check("h5tget_size_f", error, total_error)
+    IF(h5_sizeof(cf(1)%b(1)).EQ.4_size_t)THEN
+       CALL h5tget_size_f(H5T_NATIVE_REAL_C_FLOAT, type_sizer, error)
+       CALL check("h5tget_size_f", error, total_error)
+    ELSE IF(h5_sizeof(cf(1)%b(1)).EQ.8_size_t)THEN
+       CALL h5tget_size_f(H5T_NATIVE_REAL_C_DOUBLE, type_sizer, error)
+       CALL check("h5tget_size_f", error, total_error)
+    ENDIF
+
+    CALL h5tget_size_f(H5T_NATIVE_DOUBLE, type_sized, error)
+    CALL check("h5tget_size_f", error, total_error)
+
+    dtsinfo%offset(1)   = H5OFFSETOF(C_LOC(cf(1)),C_LOC(cf(1)%a(1)))
+    dtsinfo%offset(2)   = H5OFFSETOF(C_LOC(cf(1)),C_LOC(cf(1)%b(1)))
+    dtsinfo%offset(3)   = H5OFFSETOF(C_LOC(cf(1)),C_LOC(cf(1)%c(1)))
+
+
+    ! Initialize the data type IDs
+    ! ----------------------------
+    dtsinfo%datatype(1) = H5T_NATIVE_INTEGER;
+    dtsinfo%datatype(2) = H5T_NATIVE_REAL_C_FLOAT;
+    dtsinfo%datatype(3) = H5T_NATIVE_REAL_C_DOUBLE;
+
+
+    ! Initialize the names of data members
+    ! ------------------------------------
+
+    dtsinfo%name(1) = "One  "
+    dtsinfo%name(2) = "Two  "
+    dtsinfo%name(3) = "Three"
+
+    ! Create file
+    ! -----------
+    CALL h5fcreate_f(FILENAME,H5F_ACC_TRUNC_F,fid,error)
+    CALL check("h5fcreate_f", error, total_error)
+
+
+    ! Create data space
+    ! -----------------
+    CALL h5screate_simple_f(RANK, dim, space, error)
+    CALL check("h5screate_simple_f", error, total_error)
+
+
+    ! Create the memory data type
+    ! ---------------------------
+
+    CALL h5tcreate_f(H5T_COMPOUND_F, H5OFFSETOF(C_LOC(cf(1)), C_LOC(cf(2))), type, error)
+    CALL check("h5tcreate_f", error, total_error)
+
+    ! Add  members to the compound data type
+    ! --------------------------------------
+
+    DO i = 1, dtsinfo%nsubfields
+       CALL h5tarray_create_f(dtsinfo%datatype(i), ndims(i), dima, array_dt, error)
+       CALL check("h5tarray_create_f", error, total_error)
+       CALL H5Tinsert_f(type, dtsinfo%name(i), dtsinfo%offset(i), array_dt, error)
+       CALL check("h5tinsert_f", error, total_error)
+
+       CALL h5tclose_f(array_dt,error)
+       CALL check("h5tclose_f", error, total_error)
+    ENDDO
+
+    ! Create the dataset
+    ! ------------------ /
+    CALL h5dcreate_f(fid,FIELDNAME,type, space, dataset,error)
+    CALL check("h5dcreate_f", error, total_error)
+
+    ! Write data to the dataset
+    ! -------------------------
+
+    ALLOCATE(rdims(1:2)) ! dummy not needed
+
+    f_ptr = C_LOC(cf(1))
+
+    CALL h5dwrite_f(dataset, type, f_ptr, error )
+    CALL check("h5dwrite_f", error, total_error)
+
+
+    ALLOCATE(rdims1(1:2)) ! dummy not needed
+    f_ptr = C_LOC(cfr(1))
+    CALL H5Dread_f(dataset, type, f_ptr, error)
+    CALL check("H5Dread_f", error, total_error)
+
+    ! Verify correct data
+    ! -------------------
+    DO i = 1, LENGTH
+       DO j = 1, ALEN
+           IF( cf(i)%a(j) .NE. cfr(i)%a(j) )THEN
+             PRINT*, 'ERROR: Wrong integer data is read back by H5Dread_f '
+             total_error = total_error + 1
+          ENDIF
+          CALL VERIFY('ERROR: Wrong real data is read back by H5Dread_f ',cf(i)%b(j), cfr(i)%b(j), total_error)
+          CALL VERIFY('ERROR: Wrong double data is read back by H5Dread_f ',cf(i)%c(j), cfr(i)%c(j), total_error)
+       ENDDO
+    ENDDO
+
+
+    ! Release IDs
+    ! -----------
+    CALL h5tclose_f(type,error)
+    CALL check("h5tclose_f", error, total_error)
+    CALL h5sclose_f(space,error)
+    CALL check("h5sclose_f", error, total_error)
+    CALL h5dclose_f(dataset, error)
+    CALL check("h5dclose_f", error, total_error)
+    CALL h5fclose_f(fid,error)
+    CALL check("h5fclose_f", error, total_error)
+
+    !****************************
+    ! Reopen the file and update
+    !****************************
+
+    CALL h5fopen_f (FILENAME, H5F_ACC_RDWR_F, fid, error)
+    CALL check("h5fopen_f", error, total_error)
+
+    CALL h5dopen_f(fid, FIELDNAME, dataset, error)
+    CALL check("h5dopen_f", error, total_error)
+
+    sizeof_compound =  INT( type_sizer*ALEN, size_t)
+
+    CALL h5tcreate_f(H5T_COMPOUND_F, sizeof_compound , type, error)
+    CALL check("h5tcreate_f", error, total_error)
+
+    CALL h5tarray_create_f(H5T_NATIVE_REAL_C_FLOAT, 1, dima, array_dt, error)
+    CALL check("h5tarray_create_f", error, total_error)
+
+    CALL h5tinsert_f(TYPE, "Two", 0_size_t, array_dt, error)
+    CALL check("h5tinsert_f", error, total_error)
+
+    ! Initialize the data to overwrite
+    ! --------------------------------
+    DO i = 1, LENGTH
+       DO j = 1, ALEN
+          fld(i)%b(j) = 1.313
+          cf(i)%b(j) = fld(i)%b(j)
+       ENDDO
+    ENDDO
+
+    f_ptr = C_LOC(fld(1))
+
+    CALL h5dwrite_f(dataset, TYPE, f_ptr, error )
+    CALL check("h5dwrite_f", error, total_error)
+
+
+    !  Read just the field changed
+
+    f_ptr = C_LOC(fldr(1))
+    CALL H5Dread_f(dataset, TYPE, f_ptr, error)
+    CALL check("H5Dread_f", error, total_error)
+
+    DO i = 1, LENGTH
+       DO j = 1, ALEN
+          CALL VERIFY('ERROR: Wrong real data is read back by H5Dread_f ',fld(i)%b(j), fldr(i)%b(j), total_error)
+       ENDDO
+    ENDDO
+    CALL h5tclose_f(TYPE,error)
+    CALL check("h5tclose_f", error, total_error)
+    CALL h5tclose_f(array_dt,error)
+    CALL check("h5tclose_f", error, total_error)
+
+    CALL h5dget_type_f(dataset, type, error)
+    CALL check("h5dget_type_f", error, total_error)
+
+
+    !  Read the entire dataset again
+
+    f_ptr = C_LOC(cfr(1))
+    CALL H5Dread_f(dataset, TYPE, f_ptr, error)
+    CALL check("H5Dread_f", error, total_error)
+
+
+    ! Verify correct data
+    ! -------------------
+
+    DO i = 1, LENGTH
+       DO j = 1, ALEN
+          CALL VERIFY('ERROR: Wrong integer data is read back by H5Dread_f ',cf(i)%a(j), cfr(i)%a(j), total_error)
+          CALL VERIFY('ERROR: Wrong real data is read back by H5Dread_f ',cf(i)%b(j),cfr(i)%b(j), total_error)
+          CALL VERIFY('ERROR: Wrong double data is read back by H5Dread_f ',cf(i)%c(j), cfr(i)%c(j), total_error)
+       ENDDO
+    ENDDO
+
+    CALL h5dclose_f(dataset, error)
+    CALL check("h5dclose_f", error, total_error)
+
+    CALL h5tclose_f(type,error)
+    CALL check("h5tclose_f", error, total_error)
+
+    CALL h5fclose_f(fid,error)
+    CALL check("h5fclose_f", error, total_error)
+
+!**************************************************
+! Reopen the file and print out all the data again
+!**************************************************
+
+    CALL h5fopen_f (FILENAME, H5F_ACC_RDWR_F, fid, error)
+    CALL check("h5fopen_f", error, total_error)
+
+
+    CALL h5dopen_f(fid, FIELDNAME, dataset, error)
+    CALL check("h5dopen_f", error, total_error)
+
+
+    CALL h5dget_type_f(dataset, type, error)
+    CALL check("h5dget_type_f", error, total_error)
+
+
+    ! Reset the data to read in
+    ! -------------------------
+
+    DO i = 1, LENGTH
+       cfr(i)%a(:) = 0
+       cfr(i)%b(:) = 0
+       cfr(i)%c(:) = 0
+    ENDDO
+
+    f_ptr = C_LOC(cfr(1))
+    CALL H5Dread_f(dataset, TYPE, f_ptr, error)
+    CALL check("H5Dread_f", error, total_error)
+
+    ! Verify correct data
+    ! -------------------
+
+    DO i = 1, LENGTH
+       DO j = 1, ALEN
+          CALL VERIFY('ERROR: Wrong integer data is read back by H5Dread_f ',cf(i)%a(j), cfr(i)%a(j), total_error)
+          CALL VERIFY('ERROR: Wrong real data is read back by H5Dread_f ',cf(i)%b(j),cfr(i)%b(j), total_error)
+          CALL VERIFY('ERROR: Wrong double data is read back by H5Dread_f ',cf(i)%c(j), cfr(i)%c(j), total_error)
+       ENDDO
+    ENDDO
+
+    CALL h5dclose_f(dataset, error)
+    CALL check("h5dclose_f", error, total_error)
+
+    CALL h5tclose_f(type,error)
+    CALL check("h5tclose_f", error, total_error)
+
+    CALL h5fclose_f(fid,error)
+    CALL check("h5fclose_f", error, total_error)
+
+  END SUBROUTINE test_array_bkg
+
+  SUBROUTINE test_h5kind_to_type(total_error)
+
+    IMPLICIT NONE
+
+    INTEGER, INTENT(INOUT) :: total_error
+
+    INTEGER, PARAMETER :: int_kind_1 = SELECTED_INT_KIND(2) !should map to INTEGER*1 on most modern processors
+    INTEGER, PARAMETER :: int_kind_4 = SELECTED_INT_KIND(4) !should map to INTEGER*2 on most modern processors
+    INTEGER, PARAMETER :: int_kind_8 = SELECTED_INT_KIND(9) !should map to INTEGER*4 on most modern processors
+    INTEGER, PARAMETER :: int_kind_16 = SELECTED_INT_KIND(18) !should map to INTEGER*8 on most modern processors
+#if H5_HAVE_Fortran_INTEGER_SIZEOF_16!=0
+    INTEGER, PARAMETER :: int_kind_32 = SELECTED_INT_KIND(36) !should map to INTEGER*16 on most modern processors
+    INTEGER(int_kind_32), DIMENSION(1:4), TARGET :: dset_data_i32, data_out_i32
+    INTEGER(HID_T) :: dset_id32     ! Dataset identifier
+    CHARACTER(LEN=6), PARAMETER :: dsetname16 = "dset16"     ! Dataset name
+#endif
+    INTEGER, PARAMETER :: real_kind_7  = C_FLOAT   !should map to REAL*4 on most modern processors
+    INTEGER, PARAMETER :: real_kind_15 = C_DOUBLE  !should map to REAL*8 on most modern processors
+
+! Check if C has quad precision extension
+#if H5_HAVE_FLOAT128!=0
+! Check if Fortran supports quad precision
+# if H5_PAC_FC_MAX_REAL_PRECISION > 26
+    INTEGER, PARAMETER :: real_kind_31 = SELECTED_REAL_KIND(31)
+# else
+    INTEGER, PARAMETER :: real_kind_31 = SELECTED_REAL_KIND(15,307)
+# endif
+#else
+! Check if the default of long double is quad precision
+# if H5_PAC_C_MAX_REAL_PRECISION  > 26
+#   if H5_PAC_FC_MAX_REAL_PRECISION > 26
+    INTEGER, PARAMETER :: real_kind_31 = SELECTED_REAL_KIND(31)
+#   else
+    INTEGER, PARAMETER :: real_kind_31 = SELECTED_REAL_KIND(15,307)
+#   endif
+# else
+    INTEGER, PARAMETER :: real_kind_31 = SELECTED_REAL_KIND(15,307)
+# endif
+#endif
+    REAL(real_kind_31), DIMENSION(1:4), TARGET :: dset_data_r31, data_out_r31
+    INTEGER(HID_T) :: dset_idr16      ! Dataset identifier
+    CHARACTER(LEN=7), PARAMETER :: dsetnamer16 = "dsetr16"     ! Dataset name
+
+    CHARACTER(LEN=12), PARAMETER :: filename = "dsetf_F03.h5" ! File name
+    CHARACTER(LEN=5), PARAMETER :: dsetname1 = "dset1"     ! Dataset name
+    CHARACTER(LEN=5), PARAMETER :: dsetname2 = "dset2"     ! Dataset name
+    CHARACTER(LEN=5), PARAMETER :: dsetname4 = "dset4"     ! Dataset name
+    CHARACTER(LEN=5), PARAMETER :: dsetname8 = "dset8"     ! Dataset name
+    CHARACTER(LEN=6), PARAMETER :: dsetnamer = "dsetr"     ! Dataset name
+    CHARACTER(LEN=6), PARAMETER :: dsetnamer4 = "dsetr4"     ! Dataset name
+    CHARACTER(LEN=6), PARAMETER :: dsetnamer8 = "dsetr8"     ! Dataset name
+
+    INTEGER(HID_T) :: file_id       ! File identifier
+    INTEGER(HID_T) :: dset_id1      ! Dataset identifier
+    INTEGER(HID_T) :: dset_id4      ! Dataset identifier
+    INTEGER(HID_T) :: dset_id8      ! Dataset identifier
+    INTEGER(HID_T) :: dset_id16     ! Dataset identifier
+    INTEGER(HID_T) :: dset_idr       ! Dataset identifier
+    INTEGER(HID_T) :: dset_idr4      ! Dataset identifier
+    INTEGER(HID_T) :: dset_idr8      ! Dataset identifier
+
+    INTEGER :: error ! Error flag
+    INTEGER :: i
+
+! Data buffers:
+
+    INTEGER(int_kind_1), DIMENSION(1:4), TARGET :: dset_data_i1, data_out_i1
+    INTEGER(int_kind_4), DIMENSION(1:4), TARGET :: dset_data_i4, data_out_i4
+    INTEGER(int_kind_8), DIMENSION(1:4), TARGET :: dset_data_i8, data_out_i8
+    INTEGER(int_kind_16), DIMENSION(1:4), TARGET :: dset_data_i16, data_out_i16
+
+    REAL, DIMENSION(1:4), TARGET :: dset_data_r, data_out_r
+    REAL(real_kind_7), DIMENSION(1:4), TARGET :: dset_data_r7, data_out_r7
+    REAL(real_kind_15), DIMENSION(1:4), TARGET :: dset_data_r15, data_out_r15
+
+    INTEGER(HSIZE_T), DIMENSION(1:1) :: data_dims = (/4/)
+    INTEGER(HID_T) :: dspace_id     ! Dataspace identifier
+
+    TYPE(C_PTR) :: f_ptr
+
+    !
+    ! Initialize the dset_data array.
+    !
+    DO i = 1, 4
+       dset_data_i1(i)  = HUGE(0_int_kind_1)-INT(i,int_kind_1)
+       dset_data_i4(i)  = HUGE(0_int_kind_4)-INT(i,int_kind_4)
+       dset_data_i8(i)  = HUGE(0_int_kind_8)-INT(i,int_kind_8)
+       dset_data_i16(i) = HUGE(0_int_kind_16)-INT(i,int_kind_16)
+#if H5_HAVE_Fortran_INTEGER_SIZEOF_16!=0
+       dset_data_i32(i) = HUGE(0_int_kind_32)-INT(i,int_kind_32)
+#endif
+       dset_data_r(i) = 4.0*ATAN(1.0)-REAL(i-1)
+       dset_data_r7(i) = 4.0_real_kind_7*ATAN(1.0_real_kind_7)-REAL(i-1,real_kind_7)
+       dset_data_r15(i) = 4.0_real_kind_15*ATAN(1.0_real_kind_15)-REAL(i-1,real_kind_15)
+       dset_data_r31(i) = 4.0_real_kind_31*ATAN(1.0_real_kind_31)-REAL(i-1,real_kind_31)
+
+    END DO
+
+    CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, error)
+    CALL check("h5fcreate_f",error, total_error)
+  !
+  ! Create dataspaces for datasets
+  !
+    CALL h5screate_simple_f(1, data_dims , dspace_id, error)
+    CALL check("h5screate_simple_f",error, total_error)
+  !
+  ! Create the dataset.
+  !
+    CALL H5Dcreate_f(file_id, dsetname1, h5kind_to_type(int_kind_1,H5_INTEGER_KIND),  dspace_id, dset_id1, error)
+    CALL check("H5Dcreate_f",error, total_error)
+    CALL H5Dcreate_f(file_id, dsetname2, h5kind_to_type(int_kind_4,H5_INTEGER_KIND),  dspace_id, dset_id4, error)
+    CALL check("H5Dcreate_f",error, total_error)
+    CALL H5Dcreate_f(file_id, dsetname4, h5kind_to_type(int_kind_8,H5_INTEGER_KIND),  dspace_id, dset_id8, error)
+    CALL check("H5Dcreate_f",error, total_error)
+    CALL H5Dcreate_f(file_id, dsetname8, h5kind_to_type(int_kind_16,H5_INTEGER_KIND), dspace_id, dset_id16, error)
+    CALL check("H5Dcreate_f",error, total_error)
+#if H5_HAVE_Fortran_INTEGER_SIZEOF_16!=0
+    CALL H5Dcreate_f(file_id, dsetname16, h5kind_to_type(int_kind_32,H5_INTEGER_KIND), dspace_id, dset_id32, error)
+    CALL check("H5Dcreate_f",error, total_error)
+#endif
+    CALL H5Dcreate_f(file_id, dsetnamer, H5T_NATIVE_REAL, dspace_id, dset_idr, error)
+    CALL check("H5Dcreate_f",error, total_error)
+    CALL H5Dcreate_f(file_id, dsetnamer4, h5kind_to_type(real_kind_7,H5_REAL_KIND),  dspace_id, dset_idr4, error)
+    CALL check("H5Dcreate_f",error, total_error)
+    CALL H5Dcreate_f(file_id, dsetnamer8, h5kind_to_type(real_kind_15,H5_REAL_KIND), dspace_id, dset_idr8, error)
+    CALL check("H5Dcreate_f",error, total_error)
+!#ifdef H5_HAVE_FLOAT128
+    CALL H5Dcreate_f(file_id, dsetnamer16, h5kind_to_type(real_kind_31,H5_REAL_KIND), dspace_id, dset_idr16, error)
+    CALL check("H5Dcreate_f",error, total_error)
+!#endif
+  !
+  ! Write the dataset.
+  !
+    f_ptr = C_LOC(dset_data_i1(1))
+    CALL h5dwrite_f(dset_id1, h5kind_to_type(int_kind_1,H5_INTEGER_KIND), f_ptr, error)
+    CALL check("H5Dwrite_f",error, total_error)
+    f_ptr = C_LOC(dset_data_i4(1))
+    CALL h5dwrite_f(dset_id4, h5kind_to_type(int_kind_4,H5_INTEGER_KIND), f_ptr, error)
+    CALL check("H5Dwrite_f",error, total_error)
+    f_ptr = C_LOC(dset_data_i8(1))
+    CALL h5dwrite_f(dset_id8, h5kind_to_type(int_kind_8,H5_INTEGER_KIND), f_ptr, error)
+    CALL check("H5Dwrite_f",error, total_error)
+    f_ptr = C_LOC(dset_data_i16(1))
+    CALL h5dwrite_f(dset_id16, h5kind_to_type(int_kind_16,H5_INTEGER_KIND), f_ptr, error)
+    CALL check("H5Dwrite_f",error, total_error)
+#if H5_HAVE_Fortran_INTEGER_SIZEOF_16!=0
+    f_ptr = C_LOC(dset_data_i32(1))
+    CALL h5dwrite_f(dset_id32, h5kind_to_type(int_kind_32,H5_INTEGER_KIND), f_ptr, error)
+    CALL check("H5Dwrite_f",error, total_error)
+#endif
+    f_ptr = C_LOC(dset_data_r(1))
+    CALL h5dwrite_f(dset_idr, H5T_NATIVE_REAL, f_ptr, error)
+    CALL check("H5Dwrite_f",error, total_error)
+    f_ptr = C_LOC(dset_data_r7(1))
+    CALL h5dwrite_f(dset_idr4, h5kind_to_type(real_kind_7,H5_REAL_KIND), f_ptr, error)
+    CALL check("H5Dwrite_f",error, total_error)
+    f_ptr = C_LOC(dset_data_r15(1))
+    CALL h5dwrite_f(dset_idr8, h5kind_to_type(real_kind_15,H5_REAL_KIND), f_ptr, error)
+    CALL check("H5Dwrite_f",error, total_error)
+!#ifdef H5_HAVE_FLOAT128
+    f_ptr = C_LOC(dset_data_r31(1))
+    CALL h5dwrite_f(dset_idr16, h5kind_to_type(real_kind_31,H5_REAL_KIND), f_ptr, error)
+    CALL check("H5Dwrite_f",error, total_error)
+!#endif
+  !
+  ! Close the file
+  !
+    CALL h5fclose_f(file_id, error)
+    CALL check("h5fclose_f",error, total_error)
+
+  ! Open the file
+
+    CALL h5fopen_f(filename, H5F_ACC_RDONLY_F, file_id, error)
+    CALL check("h5fopen_f",error, total_error)
+  !
+  ! Read the dataset.
+  !
+  ! Read data back into an integer size that is larger then the original size used for
+  ! writing the data
+    f_ptr = C_LOC(data_out_i1(1))
+    CALL h5dread_f(dset_id1, h5kind_to_type(int_kind_1,H5_INTEGER_KIND), f_ptr,  error)
+    CALL check("h5dread_f",error, total_error)
+    f_ptr = C_LOC(data_out_i4(1))
+    CALL h5dread_f(dset_id4, h5kind_to_type(int_kind_4,H5_INTEGER_KIND), f_ptr,  error)
+    CALL check("h5dread_f",error, total_error)
+    f_ptr = C_LOC(data_out_i8(1))
+    CALL h5dread_f(dset_id8, h5kind_to_type(int_kind_8,H5_INTEGER_KIND), f_ptr,  error)
+    CALL check("h5dread_f",error, total_error)
+    f_ptr = C_LOC(data_out_i16(1))
+    CALL h5dread_f(dset_id16, h5kind_to_type(int_kind_16,H5_INTEGER_KIND), f_ptr,  error)
+    CALL check("h5dread_f",error, total_error)
+#if H5_HAVE_Fortran_INTEGER_SIZEOF_16!=0
+    f_ptr = C_LOC(data_out_i32(1))
+    CALL h5dread_f(dset_id32, h5kind_to_type(int_kind_32,H5_INTEGER_KIND), f_ptr,  error)
+    CALL check("h5dread_f",error, total_error)
+#endif
+    f_ptr = C_LOC(data_out_r(1))
+    CALL h5dread_f(dset_idr, H5T_NATIVE_REAL, f_ptr,  error)
+    CALL check("h5dread_f",error, total_error)
+    f_ptr = C_LOC(data_out_r7(1))
+    CALL h5dread_f(dset_idr4, h5kind_to_type(real_kind_7,H5_REAL_KIND), f_ptr,  error)
+    CALL check("h5dread_f",error, total_error)
+    f_ptr = C_LOC(data_out_r15(1))
+    CALL h5dread_f(dset_idr8, h5kind_to_type(real_kind_15,H5_REAL_KIND), f_ptr,  error)
+    CALL check("h5dread_f",error, total_error)
+    f_ptr = C_LOC(data_out_r31(1))
+    CALL h5dread_f(dset_idr16, h5kind_to_type(real_kind_31,H5_REAL_KIND), f_ptr,  error)
+    CALL check("h5dread_f",error, total_error)
+    DO i = 1, 4
+
+       CALL verify("h5kind_to_type",dset_data_i1(i),data_out_i1(i),total_error)
+       CALL verify("h5kind_to_type",dset_data_i4(i),data_out_i4(i),total_error)
+       CALL verify("h5kind_to_type",dset_data_i8(i),data_out_i8(i),total_error)
+       CALL verify("h5kind_to_type",dset_data_i16(i),data_out_i16(i),total_error)
+
+#if H5_HAVE_Fortran_INTEGER_SIZEOF_16!=0
+       CALL verify("h5kind_to_type",dset_data_i32(i),data_out_i32(i),total_error)
+#endif
+       CALL verify("h5kind_to_type",dset_data_r(i),data_out_r(i),total_error)
+       CALL verify("h5kind_to_type",dset_data_r7(i),data_out_r7(i),total_error)
+       CALL verify("h5kind_to_type",dset_data_r15(i),data_out_r15(i),total_error)
+       CALL verify("h5kind_to_type",dset_data_r31(i),data_out_r31(i),total_error)
+    END DO
+
+  !
+  ! Close the dataset.
+  !
+    CALL h5dclose_f(dset_id1, error)
+    CALL check("h5dclose_f",error, total_error)
+    CALL h5dclose_f(dset_id4, error)
+    CALL check("h5dclose_f",error, total_error)
+    CALL h5dclose_f(dset_id8, error)
+    CALL check("h5dclose_f",error, total_error)
+    CALL h5dclose_f(dset_id16, error)
+    CALL check("h5dclose_f",error, total_error)
+    CALL h5dclose_f(dset_idr4, error)
+    CALL check("h5dclose_f",error, total_error)
+    CALL h5dclose_f(dset_idr8, error)
+    CALL check("h5dclose_f",error, total_error)
+  !
+  ! Close the file.
+  !
+    CALL h5fclose_f(file_id, error)
+    CALL check("h5fclose_f",error, total_error)
+
+END SUBROUTINE test_h5kind_to_type
+
+!************************************************************
+!
+!  This test reads and writes array datatypes
+!  to a dataset.  The test first writes integers arrays of
+!  dimension ADIM0xADIM1 to a dataset with a dataspace of
+!  DIM0, then closes the  file.  Next, it reopens the file,
+!  reads back the data.
+!
+!************************************************************
+SUBROUTINE t_array(total_error)
+
+  IMPLICIT NONE
+
+  INTEGER, INTENT(INOUT) :: total_error
+
+  CHARACTER(LEN=19), PARAMETER :: filename  = "t_array_F03.h5"
+  CHARACTER(LEN=3) , PARAMETER :: dataset   = "DS1"
+  INTEGER          , PARAMETER :: dim0      = 4
+  INTEGER          , PARAMETER :: adim0     = 3
+  INTEGER          , PARAMETER :: adim1     = 5
+  INTEGER(HID_T)  :: file, filetype, memtype, space, dset ! Handles
+  INTEGER(HSIZE_T), DIMENSION(1:1)   :: dims = (/dim0/)
+  INTEGER(HSIZE_T), DIMENSION(1:2)   :: adims = (/adim0, adim1/)
+  INTEGER(HSIZE_T), DIMENSION(1:2)   :: maxdims
+  INTEGER, DIMENSION(1:dim0, 1:adim0, 1:adim1), TARGET :: wdata ! Write buffer
+  INTEGER, DIMENSION(:,:,:), ALLOCATABLE, TARGET :: rdata    ! Read buffer
+  INTEGER :: i, j, k
+  TYPE(C_PTR) :: f_ptr
+  INTEGER :: error ! Error flag
+
+  !
+  ! Initialize data.  i is the element in the dataspace, j and k the
+  ! elements within the array datatype.
+  !
+  DO i = 1, dim0
+     DO j = 1, adim0
+        DO k = 1, adim1
+           wdata(i,j,k) = (i-1)*(j-1)-(j-1)*(k-1)+(i-1)*(k-1)
+        ENDDO
+     ENDDO
+  ENDDO
+  !
+  ! Create a new file using the default properties.
+  !
+  CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file, error)
+  CALL check("h5fcreate_f",error, error)
+  !
+  ! Create array datatypes for file and memory.
+  !
+  CALL H5Tarray_create_f(INT(H5T_STD_I64LE, HID_T), 2, adims, filetype, error)
+  CALL check("H5Tarray_create_f",error, total_error)
+  CALL H5Tarray_create_f(H5T_NATIVE_INTEGER, 2, adims, memtype, error)
+  CALL check("H5Tarray_create_f",error, total_error)
+  !
+  ! Create dataspace.  Setting maximum size to be the current size.
+  !
+  CALL h5screate_simple_f(1, dims, space, error)
+  CALL check("h5screate_simple_f",error, total_error)
+  !
+  ! Create the dataset and write the array data to it.
+  !
+  CALL h5dcreate_f(file, dataset, filetype, space, dset, error)
+  CALL check("h5dcreate_f",error, total_error)
+  f_ptr = C_LOC(wdata)
+  CALL h5dwrite_f(dset, memtype, f_ptr, error)
+  CALL check("h5dwrite_f",error, total_error)
+  !
+  ! Close and release resources.
+  !
+  CALL H5Dclose_f(dset, error)
+  CALL check("h5dclose_f",error, total_error)
+  CALL H5Sclose_f(space, error)
+  CALL check("h5sclose_f",error, total_error)
+  CALL H5Tclose_f(filetype, error)
+  CALL check("h5tclose_f",error, total_error)
+  CALL H5Tclose_f(memtype, error)
+  CALL check("h5tclose_f",error, total_error)
+  CALL H5Fclose_f(file, error)
+  CALL check("h5fclose_f",error, total_error)
+  !
+  ! Now we begin the read section of this example.
+  !
+  ! Open file, dataset, and attribute.
+  !
+  CALL h5fopen_f(filename, H5F_ACC_RDONLY_F, file, error)
+  CALL check("h5fopen_f",error, total_error)
+  CALL h5dopen_f(file, dataset, dset, error)
+  CALL check("h5dopen_f",error, total_error)
+  !
+  ! Get the datatype and its dimensions.
+  !
+  CALL h5dget_type_f(dset, filetype, error)
+  CALL check("h5dget_type_f",error, error)
+  CALL H5Tget_array_dims_f(filetype, adims, error)
+  CALL check("h5dget_type_f",error, total_error)
+  CALL VERIFY("H5Tget_array_dims_f", adims(1), INT(adim0,hsize_t), total_error)
+  CALL VERIFY("H5Tget_array_dims_f", adims(2), INT(adim1,hsize_t), total_error)
+  !
+  ! Get dataspace and allocate memory for read buffer.  This is a
+  ! three dimensional attribute when the array datatype is included.
+  !
+  CALL H5Dget_space_f(dset, space, error)
+  CALL check("H5Dget_space_f",error, error)
+  CALL H5Sget_simple_extent_dims_f(space, dims, maxdims, error)
+  CALL check("H5Sget_simple_extent_dims_f",error, total_error)
+  CALL VERIFY("H5Sget_simple_extent_dims_f", dims(1), INT(dim0,hsize_t), total_error)
+
+  ALLOCATE(rdata(1:dims(1),1:adims(1),1:adims(2)))
+  !
+  ! Create the memory datatype.
+  !
+  CALL H5Tarray_create_f(H5T_NATIVE_INTEGER, 2, adims, memtype, error)
+  CALL check("H5Tarray_create_f",error, total_error)
+  !
+  ! Read the data.
+  !
+
+  f_ptr = C_LOC(rdata)
+  CALL H5Dread_f(dset, memtype, f_ptr, error)
+  CALL check("H5Dread_f",error, total_error)
+  !
+  ! Output the data to the screen.
+  !
+  i_loop: DO i = 1, INT(dims(1))
+             DO j=1, INT(adim0)
+                DO k = 1, INT(adim1)
+                   CALL VERIFY("H5Sget_simple_extent_dims_f",  rdata(i,j,k), wdata(i,j,k), total_error)
+                   IF(total_error.NE.0) EXIT i_loop
+                ENDDO
+             ENDDO
+          ENDDO i_loop
+  !
+  ! Close and release resources.
+  !
+  DEALLOCATE(rdata)
+  CALL H5Dclose_f(dset, error)
+  CALL check("h5dclose_f",error, total_error)
+  CALL H5Sclose_f(space, error)
+  CALL check("h5sclose_f",error, total_error)
+  CALL H5Tclose_f(filetype, error)
+  CALL check("h5tclose_f",error, total_error)
+  CALL H5Tclose_f(memtype, error)
+  CALL check("h5tclose_f",error, total_error)
+  CALL H5Fclose_f(file, error)
+  CALL check("h5fclose_f",error, total_error)
+
+END SUBROUTINE t_array
+
+SUBROUTINE t_enum(total_error)
+
+  IMPLICIT NONE
+
+  INTEGER, INTENT(INOUT) :: total_error
+
+  CHARACTER(LEN=19), PARAMETER :: filename  = "t_enum_F03.h5"
+  CHARACTER(LEN=3) , PARAMETER :: dataset   = "DS1"
+  INTEGER          , PARAMETER :: dim0      = 4
+  INTEGER          , PARAMETER :: dim1      = 7
+  INTEGER(HID_T)               :: F_BASET  ! File base type
+  INTEGER(HID_T)               :: M_BASET  ! Memory base type
+  INTEGER(SIZE_T)  , PARAMETER :: NAME_BUF_SIZE = 16
+
+! Enumerated type
+  INTEGER, PARAMETER :: SOLID=0, LIQUID=1, GAS=2, PLASMA=3
+
+  INTEGER(HID_T) :: file, filetype, memtype, space, dset ! Handles
+
+  INTEGER(hsize_t),   DIMENSION(1:2) :: dims = (/dim0, dim1/)
+  INTEGER, DIMENSION(1:dim0, 1:dim1), TARGET :: wdata ! Write buffer
+  INTEGER, DIMENSION(:,:), ALLOCATABLE, TARGET :: rdata ! Read buffer
+  INTEGER, DIMENSION(1:1), TARGET :: val
+
+  CHARACTER(LEN=6), DIMENSION(1:4) :: &
+       names = (/"SOLID ", "LIQUID", "GAS   ", "PLASMA"/)
+  CHARACTER(LEN=NAME_BUF_SIZE) :: name
+  INTEGER(HSIZE_T), DIMENSION(1:2) :: maxdims
+  INTEGER :: i, j, idx
+  TYPE(C_PTR) :: f_ptr
+  INTEGER :: error ! Error flag
+  !
+  ! Initialize DATA.
+  !
+  F_BASET   = H5T_STD_I16BE      ! File base type
+  M_BASET   = H5T_NATIVE_INTEGER ! Memory base type
+  DO i = 1, dim0
+     DO j = 1, dim1
+        wdata(i,j) = MOD( (j-1)*(i-1), PLASMA+1)
+     ENDDO
+  ENDDO
+  !
+  ! Create a new file using the default properties.
+  !
+  CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file, error)
+  CALL check("h5fcreate_f",error, total_error)
+  !
+  ! Create the enumerated datatypes for file and memory.  This
+  ! process is simplified IF native types are used for the file,
+  ! as only one type must be defined.
+  !
+  CALL h5tenum_create_f(F_BASET, filetype, error)
+  CALL check("h5tenum_create_f",error, total_error)
+
+  CALL h5tenum_create_f(M_BASET, memtype, error)
+  CALL check("h5tenum_create_f",error, total_error)
+
+  DO i = SOLID, PLASMA
+     !
+     ! Insert enumerated value for memtype.
+     !
+     val(1) = i
+     f_ptr = C_LOC(val(1))
+     CALL H5Tenum_insert_f(memtype, TRIM(names(i+1)), f_ptr, error)
+     CALL check("H5Tenum_insert_f", error, total_error)
+     !
+     ! Insert enumerated value for filetype.  We must first convert
+     ! the numerical value val to the base type of the destination.
+     !
+     f_ptr = C_LOC(val(1))
+     CALL H5Tconvert_f(M_BASET, F_BASET, INT(1,SIZE_T), f_ptr, error)
+     CALL check("H5Tconvert_f",error, total_error)
+     IF(i.GE.1)THEN ! test both F90 and F03 APIs
+        CALL H5Tenum_insert_f(filetype, TRIM(names(i+1)), f_ptr, error)
+     ELSE
+        CALL H5Tenum_insert_f(filetype, TRIM(names(i+1)), val(1), error)
+     ENDIF
+     CALL check("H5Tenum_insert_f",error, total_error)
+  ENDDO
+  !
+  ! Create dataspace.  Setting maximum size to be the current size.
+  !
+  CALL h5screate_simple_f(2, dims, space, total_error)
+  CALL check("h5screate_simple_f",error, total_error)
+  !
+  ! Create the dataset and write the enumerated data to it.
+  !
+  CALL h5dcreate_f(file, dataset, filetype, space, dset, error)
+  CALL check("h5dcreate_f",error, total_error)
+  f_ptr = C_LOC(wdata(1,1))
+  CALL h5dwrite_f(dset, memtype, f_ptr, error)
+  CALL check("h5dwrite_f",error, total_error)
+  !
+  ! Close and release resources.
+  !
+  CALL h5dclose_f(dset , error)
+  CALL check("h5dclose_f",error, total_error)
+  CALL h5sclose_f(space, error)
+  CALL check("h5sclose_f",error, total_error)
+  CALL h5tclose_f(filetype, error)
+  CALL check("h5tclose_f",error, total_error)
+  CALL h5fclose_f(file , error)
+  CALL check("h5fclose_f",error, total_error)
+
+  !
+  ! Now we begin the read section of this example.
+  !
+  ! Open file and dataset.
+  !
+  CALL h5fopen_f(filename, H5F_ACC_RDONLY_F, file, error)
+  CALL check("h5fopen_f",error, total_error)
+  CALL h5dopen_f (file, dataset, dset, error)
+  CALL check("h5dopen_f",error, total_error)
+  CALL h5dopen_f(file, dataset, dset, error)
+  CALL check("h5dopen_f",error, total_error)
+  !
+  ! Get dataspace and allocate memory for read buffer.
+  !
+  CALL h5dget_space_f(dset,space, error)
+  CALL check("H5Dget_space_f",error, total_error)
+  CALL h5sget_simple_extent_dims_f(space, dims, maxdims, error)
+  CALL check("H5Sget_simple_extent_dims_f",error, total_error)
+  CALL VERIFY("H5Sget_simple_extent_dims_f", dims(1), INT(dim0,hsize_t), total_error)
+  CALL VERIFY("H5Sget_simple_extent_dims_f", dims(2), INT(dim1,hsize_t), total_error)
+
+  ALLOCATE(rdata(1:dims(1),1:dims(2)))
+
+  !
+  ! Read the data.
+  !
+  f_ptr = C_LOC(rdata(1,1))
+  CALL h5dread_f(dset, memtype, f_ptr, error)
+  CALL check("H5Dread_f",error, total_error)
+
+  !
+  ! Output the data to the screen.
+  !
+  i_loop: DO i = 1, INT(dims(1))
+             DO j = 1, INT(dims(2))
+                !
+                ! Get the name of the enumeration member.
+                !
+                CALL h5tenum_nameof_f( memtype, rdata(i,j), NAME_BUF_SIZE, name, error)
+                CALL check("h5tenum_nameof_f",error, total_error)
+                idx = MOD( (j-1)*(i-1), PLASMA+1 ) + 1
+                CALL verify("h5tenum_nameof_f",TRIM(name),TRIM(names(idx)), total_error)
+                IF(total_error.NE.0) EXIT i_loop
+             ENDDO
+          ENDDO i_loop
+  !
+  ! Close and release resources.
+  !
+  DEALLOCATE(rdata)
+  CALL h5dclose_f(dset , error)
+  CALL check("h5dclose_f",error, total_error)
+  CALL h5sclose_f(space, error)
+  CALL check("h5sclose_f",error, total_error)
+  CALL h5tclose_f(memtype, error)
+  CALL check("h5tclose_f",error, total_error)
+  CALL h5fclose_f(file , error)
+  CALL check("h5fclose_f",error, total_error)
+
+END SUBROUTINE t_enum
+
+SUBROUTINE t_bit(total_error)
+
+  IMPLICIT NONE
+
+  INTEGER, INTENT(INOUT) :: total_error
+
+  CHARACTER(LEN=20), PARAMETER :: filename  = "t_bit_F03.h5"
+  CHARACTER(LEN=3) , PARAMETER :: dataset   = "DS1"
+  INTEGER          , PARAMETER :: dim0      = 4
+  INTEGER          , PARAMETER :: dim1      = 7
+
+  INTEGER(HID_T)  :: file, space, dset ! Handles
+  INTEGER(HSIZE_T), DIMENSION(1:2)   :: dims = (/dim0, dim1/)
+  INTEGER(HSIZE_T), DIMENSION(1:2)   :: maxdims
+  INTEGER(C_SIGNED_CHAR), DIMENSION(1:dim0, 1:dim1), TARGET :: wdata              ! Write buffer
+  INTEGER(C_SIGNED_CHAR), DIMENSION(:,:), ALLOCATABLE, TARGET :: rdata    ! Read buffer
+  INTEGER :: A, B, C, D
+  INTEGER :: Aw, Bw, Cw, Dw
+  INTEGER :: i, j
+  INTEGER, PARAMETER :: hex =  INT(Z'00000003')
+  TYPE(C_PTR) :: f_ptr
+  INTEGER :: error     ! Error flag
+  !
+  ! Initialize data.  We will manually pack 4 2-bit integers into
+  ! each unsigned char data element.
+  !
+  DO i = 0, dim0-1
+     DO j = 0, dim1-1
+        wdata(i+1,j+1) = 0
+        wdata(i+1,j+1) = IOR( wdata(i+1,j+1), INT(IAND(i * j - j, hex),C_SIGNED_CHAR) )   ! Field "A"
+        wdata(i+1,j+1) = IOR( wdata(i+1,j+1), INT(ISHFT(IAND(i,hex),2),C_SIGNED_CHAR) )   ! Field "B"
+        wdata(i+1,j+1) = IOR( wdata(i+1,j+1), INT(ISHFT(IAND(j,hex),4),C_SIGNED_CHAR) )   ! Field "C"
+        wdata(i+1,j+1) = IOR( wdata(i+1,j+1), INT(ISHFT(IAND(i+j,hex),6),C_SIGNED_CHAR) ) ! Field "D"
+     ENDDO
+  ENDDO
+  !
+  ! Create a new file using the default properties.
+  !
+  CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file, error)
+  CALL check("h5fcreate_f",error, total_error)
+  !
+  ! Create dataspace.  Setting maximum size to be the current size.
+  !
+  CALL h5screate_simple_f(2, dims, space, error)
+  CALL check("h5screate_simple_f",error, total_error)
+  !
+  ! Create the dataset and write the bitfield data to it.
+  !
+  CALL H5Dcreate_f(file, dataset, H5T_STD_B8BE, space, dset, error)
+  CALL check("h5dcreate_f",error, total_error)
+  f_ptr = C_LOC(wdata(1,1))
+  CALL H5Dwrite_f(dset, H5T_NATIVE_B8, f_ptr, error)
+  CALL check("h5dwrite_f",error, total_error)
+  !
+  ! Close and release resources.
+  !
+  CALL H5Dclose_f(dset, error)
+  CALL check("h5dclose_f",error, total_error)
+  CALL H5Sclose_f(space, error)
+  CALL check("h5sclose_f",error, total_error)
+  CALL H5Fclose_f(file, error)
+  CALL check("h5fclose_f",error, total_error)
+  !
+  ! Now we begin the read section of this example.
+  !
+  ! Open file, dataset.
+  !
+  CALL h5fopen_f(filename, H5F_ACC_RDONLY_F, file, error)
+  CALL check("h5fopen_f",error, total_error)
+  CALL h5dopen_f(file, dataset, dset, error)
+  CALL check("h5dopen_f",error, total_error)
+  !
+  ! Get dataspace and allocate memory for read buffer.
+  !
+  CALL H5Dget_space_f(dset, space, error)
+  CALL check("H5Dget_space_f",error, total_error)
+  CALL H5Sget_simple_extent_dims_f(space, dims, maxdims, error)
+  CALL check("H5Sget_simple_extent_dims_f",error, total_error)
+  CALL VERIFY("H5Sget_simple_extent_dims_f", dims(1), INT(dim0,hsize_t), total_error)
+  CALL VERIFY("H5Sget_simple_extent_dims_f", dims(2), INT(dim1,hsize_t), total_error)
+  ALLOCATE(rdata(1:dims(1),1:dims(2)))
+  !
+  ! Read the data.
+  !
+  f_ptr = C_LOC(rdata)
+  CALL H5Dread_f(dset,  H5T_NATIVE_B8, f_ptr, error)
+  CALL check("H5Dread_f",error, total_error)
+  !
+  ! Output the data to the screen.
+  !
+  i_loop: DO i = 1, INT(dims(1))
+            DO j = 1, INT(dims(2))
+               A = IAND(rdata(i,j), INT(hex,C_SIGNED_CHAR)) ! Retrieve field "A"
+               B = IAND(ISHFT(rdata(i,j),-2), INT(hex,C_SIGNED_CHAR)) ! Retrieve field "B"
+               C = IAND(ISHFT(rdata(i,j),-4), INT(hex,C_SIGNED_CHAR)) ! Retrieve field "C"
+               D = IAND(ISHFT(rdata(i,j),-6), INT(hex,C_SIGNED_CHAR)) ! Retrieve field "D"
+
+               Aw = IAND(wdata(i,j), INT(hex,C_SIGNED_CHAR))
+               Bw = IAND(ISHFT(wdata(i,j),-2), INT(hex,C_SIGNED_CHAR))
+               Cw = IAND(ISHFT(wdata(i,j),-4), INT(hex,C_SIGNED_CHAR))
+               Dw = IAND(ISHFT(wdata(i,j),-6), INT(hex,C_SIGNED_CHAR))
+
+               CALL VERIFY("bitfield", A, Aw, total_error)
+               CALL VERIFY("bitfield", B, Bw, total_error)
+               CALL VERIFY("bitfield", C, Cw, total_error)
+               CALL VERIFY("bitfield", D, Dw, total_error)
+               IF(total_error.NE.0) EXIT i_loop
+            ENDDO
+         ENDDO i_loop
+  !
+  ! Close and release resources.
+  !
+  DEALLOCATE(rdata)
+  CALL H5Dclose_f(dset, error)
+  CALL check("h5dclose_f",error, total_error)
+  CALL H5Sclose_f(space, error)
+  CALL check("h5sclose_f",error, total_error)
+  CALL H5Fclose_f(file, error)
+  CALL check("h5fclose_f",error, total_error)
+
+END SUBROUTINE t_bit
+
+SUBROUTINE t_opaque(total_error)
+
+  IMPLICIT NONE
+
+  INTEGER, INTENT(INOUT) :: total_error
+  CHARACTER(LEN=20), PARAMETER :: filename  = "t_opaque_F03.h5"
+  CHARACTER(LEN=3) , PARAMETER :: dataset   = "DS1"
+  INTEGER          , PARAMETER :: dim0      = 4
+  INTEGER(SIZE_T)  , PARAMETER :: size      = 7
+  INTEGER(HID_T)  :: file, space, dtype, dset ! Handles
+  INTEGER(size_t) :: len
+  INTEGER(hsize_t),   DIMENSION(1:1) :: dims = (/DIM0/)
+
+  CHARACTER(LEN=size), DIMENSION(1:dim0), TARGET :: wdata ! Write buffer
+  CHARACTER(LEN=size), DIMENSION(:), ALLOCATABLE, TARGET :: rdata ! Read buffer
+  CHARACTER(LEN=size-1) :: str = "OPAQUE"
+
+  CHARACTER(LEN=14) :: tag_sm    ! Test reading obaque tag into
+  CHARACTER(LEN=15) :: tag_exact ! buffers that are: to small, exact
+  CHARACTER(LEN=17) :: tag_big   ! and to big.
+
+  INTEGER :: taglen
+  INTEGER(HSIZE_T), DIMENSION(1:1) :: maxdims
+  INTEGER(hsize_t) :: i
+  CHARACTER(LEN=1) :: ichr
+  TYPE(C_PTR) :: f_ptr
+  INTEGER :: error
+  !
+  ! Initialize data.
+  !
+  DO i = 1, dim0
+     WRITE(ichr,'(I1)') i-1
+     wdata(i) = str//ichr
+  ENDDO
+  !
+  ! Create a new file using the default properties.
+  !
+  CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file, error)
+  CALL check("h5fcreate_f",error, total_error)
+  !
+  ! Create opaque datatype and set the tag to something appropriate.
+  ! For this example we will write and view the data as a character
+  ! array.
+  !
+  CALL h5tcreate_f(h5T_OPAQUE_F, size, dtype, error)
+  CALL check("h5tcreate_f",error, total_error)
+  CALL h5tset_tag_f(dtype,"Character array",error)
+  CALL check("h5tset_tag_f",error, total_error)
+  !
+  ! Create dataspace.  Setting maximum size to be the current size.
+  !
+  CALL h5screate_simple_f(1, dims, space, error)
+  CALL check("h5screate_simple_f",error, total_error)
+  !
+  ! Create the dataset and write the opaque data to it.
+  !
+  CALL h5dcreate_f(file, dataset, dtype, space, dset, error)
+  CALL check("h5dcreate_f",error, total_error)
+  f_ptr = C_LOC(wdata(1)(1:1))
+  CALL h5dwrite_f(dset, dtype, f_ptr, error)
+  CALL check("h5dwrite_f",error, total_error)
+  !
+  ! Close and release resources.
+  !
+  CALL H5Dclose_f(dset, error)
+  CALL check("h5dclose_f",error, total_error)
+  CALL H5Sclose_f(space, error)
+  CALL check("h5sclose_f",error, total_error)
+  CALL H5Tclose_f(dtype, error)
+  CALL check("h5tclose_f",error, total_error)
+  CALL H5Fclose_f(file, error)
+  CALL check("h5fclose_f",error, total_error)
+  !
+  ! Now we begin the read section of this example.
+  !
+  ! Open file and dataset.
+  !
+  CALL h5fopen_f(filename, H5F_ACC_RDONLY_F, file, error)
+  CALL check("h5fopen_f",error, total_error)
+  CALL h5dopen_f(file, dataset, dset, error)
+  CALL check("h5dopen_f",error, total_error)
+  !
+  ! Get datatype and properties for the datatype.
+  !
+  CALL h5dget_type_f(dset, dtype, error)
+  CALL check("h5dget_type_f",error, total_error)
+  CALL h5tget_size_f(dtype, len, error)
+  CALL check("h5tget_size_f",error, total_error)
+
+  ! Next tests should return
+  ! opaque_tag = tag = "Character array" and the actual length = 15
+
+  ! Test reading into a string that is to small
+  CALL h5tget_tag_f(dtype, tag_sm, taglen, error)
+  CALL check("h5tget_tag_f",error, total_error)
+  CALL VERIFY("h5tget_tag_f", taglen, 15, total_error)
+  CALL verify("h5tget_tag_f",tag_sm,"Character arra", total_error)
+
+  ! Test reading into a string that is exact
+  CALL h5tget_tag_f(dtype, tag_exact, taglen, error)
+  CALL check("h5tget_tag_f",error, total_error)
+  CALL VERIFY("h5tget_tag_f", taglen, 15, total_error)
+  CALL verify("h5tget_tag_f",tag_exact,"Character array", total_error)
+
+  ! Test reading into a string that is to big
+  CALL h5tget_tag_f(dtype, tag_big, taglen, error)
+  CALL check("h5tget_tag_f",error, total_error)
+  CALL VERIFY("h5tget_tag_f", taglen, 15, total_error)
+  CALL verify("h5tget_tag_f",tag_big,"Character array  ", total_error)
+
+  !
+  ! Get dataspace and allocate memory for read buffer.
+  !
+  CALL h5dget_space_f(dset, space, error)
+  CALL check("H5Dget_space_f",error, total_error)
+  CALL h5sget_simple_extent_dims_f(space, dims, maxdims, error)
+  CALL check("H5Sget_simple_extent_dims_f",error, total_error)
+  CALL VERIFY("H5Sget_simple_extent_dims_f", dims(1), INT(dim0,hsize_t), total_error)
+  ALLOCATE(rdata(1:dims(1)))
+  !
+  ! Read the data.
+  !
+  f_ptr = C_LOC(rdata(1)(1:1))
+  CALL h5dread_f(dset, dtype, f_ptr, error)
+  CALL check("H5Dread_f",error, total_error)
+  !
+  DO i = 1, dims(1)
+     CALL verify("t_opaque",TRIM(rdata(i)),TRIM(wdata(i)), total_error)
+  ENDDO
+  !
+  ! Close and release resources.
+  !
+  DEALLOCATE(rdata)
+  CALL H5Dclose_f(dset, error)
+  CALL check("h5dclose_f",error, total_error)
+  CALL H5Sclose_f(space, error)
+  CALL check("h5sclose_f",error, total_error)
+  CALL H5Tclose_f(dtype, error)
+  CALL check("h5tclose_f",error, total_error)
+  CALL H5Fclose_f(file, error)
+  CALL check("h5fclose_f",error, total_error)
+
+END SUBROUTINE t_opaque
+
+SUBROUTINE t_objref(total_error)
+
+  IMPLICIT NONE
+
+  INTEGER, INTENT(INOUT) :: total_error
+  CHARACTER(LEN=20), PARAMETER :: filename  = "t_objref_F03.h5"
+  CHARACTER(LEN=3) , PARAMETER :: dataset   = "DS1"
+  INTEGER          , PARAMETER :: dim0      = 2
+
+  INTEGER(HID_T)  :: file, space, dset, obj ! Handles
+  INTEGER :: error
+
+  INTEGER(hsize_t),   DIMENSION(1:1) :: dims = (/dim0/)
+  TYPE(hobj_ref_t_f), DIMENSION(1:dim0), TARGET :: wdata ! Write buffer
+  TYPE(hobj_ref_t_f), DIMENSION(:), ALLOCATABLE, TARGET :: rdata ! Read buffer
+  INTEGER :: objtype
+  INTEGER(SIZE_T) :: name_size
+  CHARACTER(LEN=80) :: name
+  INTEGER(HSIZE_T), DIMENSION(1:1) :: maxdims
+  INTEGER :: i
+  TYPE(C_PTR) :: f_ptr
+  !
+  ! Create a new file using the default properties.
+  !
+  CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file, error)
+  CALL check("h5fcreate_f",error, total_error)
+  !
+  ! Create a dataset with a null dataspace.
+  !
+  CALL h5screate_f(H5S_NULL_F,space,error)
+  CALL check("h5screate_f",error, total_error)
+  CALL h5dcreate_f(file, "DS2", H5T_STD_I32LE, space, obj, error)
+  CALL check("h5dcreate_f",error, total_error)
+  !
+  CALL h5dclose_f(obj  , error)
+  CALL check("h5dclose_f",error, total_error)
+  CALL h5sclose_f(space, error)
+  CALL check("h5sclose_f",error, total_error)
+  !
+  ! Create a group.
+  !
+  CALL h5gcreate_f(file, "G1", obj, error)
+  CALL check("h5gcreate_f",error, total_error)
+  CALL h5gclose_f(obj, error)
+  CALL check("h5gclose_f",error, total_error)
+  !
+  ! Create references to the previously created objects. note, space_id
+  ! is not needed for object references.
+  !
+  f_ptr = C_LOC(wdata(1))
+  CALL H5Rcreate_f(file, "G1", H5R_OBJECT_F, f_ptr, error)
+  CALL check("H5Rcreate_f",error, total_error)
+  f_ptr = C_LOC(wdata(2))
+  CALL H5Rcreate_f(file, "DS2", H5R_OBJECT_F, f_ptr, error)
+  CALL check("H5Rcreate_f",error, total_error)
+  !
+  ! Create dataspace.  Setting maximum size to be the current size.
+  !
+  CALL h5screate_simple_f(1, dims, space, error)
+  CALL check("h5screate_simple_f",error, total_error)
+  !
+  ! Create the dataset and write the object references to it.
+  !
+  CALL h5dcreate_f(file, dataset, H5T_STD_REF_OBJ, space, dset, error)
+  CALL check("h5dcreate_f",error, total_error)
+
+  f_ptr = C_LOC(wdata(1))
+  CALL h5dwrite_f(dset, H5T_STD_REF_OBJ, f_ptr, error)
+  CALL check("h5dwrite_f",error, total_error)
+  !
+  ! Close and release resources.
+  !
+  CALL h5dclose_f(dset , error)
+  CALL check("h5dclose_f",error, total_error)
+  CALL h5sclose_f(space, error)
+  CALL check("h5sclose_f",error, total_error)
+  CALL h5fclose_f(file , error)
+  CALL check("h5fclose_f",error, total_error)
+  !
+  ! Now we begin the read section of this example.
+  !
+  ! Open file and dataset.
+  !
+  CALL h5fopen_f(filename, H5F_ACC_RDONLY_F, file, error)
+  CALL check("h5fopen_f",error, total_error)
+  CALL h5dopen_f(file, dataset, dset, error)
+  CALL check("h5dopen_f",error, total_error)
+  !
+  ! Get dataspace and allocate memory for read buffer.
+  !
+  CALL h5dget_space_f(dset, space, error)
+  CALL check("H5Dget_space_f",error, total_error)
+  CALL h5sget_simple_extent_dims_f(space, dims, maxdims, error)
+  CALL check("H5Sget_simple_extent_dims_f",error, total_error)
+  CALL VERIFY("H5Sget_simple_extent_dims_f", dims(1), INT(dim0,hsize_t), total_error)
+
+  ALLOCATE(rdata(1:maxdims(1)))
+  !
+  ! Read the data.
+  !
+  f_ptr = C_LOC(rdata(1))
+  CALL h5dread_f( dset, H5T_STD_REF_OBJ, f_ptr, error)
+  CALL check("H5Dread_f",error, total_error)
+  !
+  ! Output the data to the screen.
+  !
+  DO i = 1, INT(maxdims(1))
+     !
+     ! Open the referenced object, get its name and type.
+     !
+     f_ptr = C_LOC(rdata(i))
+     CALL H5Rdereference_f(dset, H5R_OBJECT_F, f_ptr, obj, error)
+     CALL check("H5Rdereference_f",error, total_error)
+     CALL H5Rget_obj_type_f(dset, H5R_OBJECT_F, f_ptr, objtype, error)
+     CALL check("H5Rget_obj_type_f",error, total_error)
+     !
+     ! Get the length of the name and name
+     !
+     name(:) = ' ' ! initialize string to blanks
+     CALL H5Iget_name_f(obj, name, 80_size_t, name_size, error)
+     CALL check("H5Iget_name_f",error, total_error)
+     !
+     ! Print the object type and close the object.
+     !
+     IF(objtype.EQ.H5G_GROUP_F)THEN
+        CALL verify("t_objref", name(1:name_size),"/G1", total_error)
+     ELSE IF(objtype.EQ.H5G_DATASET_F)THEN
+        CALL verify("t_objref", name(1:name_size),"/DS2", total_error)
+     ELSE
+        total_error = total_error + 1
+     ENDIF
+     CALL h5oclose_f(obj, error)
+     CALL check("h5oclose_f",error, total_error)
+
+  END DO
+  !
+  ! Close and release resources.
+  !
+  DEALLOCATE(rdata)
+  CALL h5dclose_f(dset , error)
+  CALL check("h5dclose_f",error, total_error)
+  CALL h5sclose_f(space, error)
+  CALL check("h5sclose_f",error, total_error)
+  CALL h5fclose_f(file , error)
+  CALL check("h5fclose_f",error, total_error)
+
+END SUBROUTINE t_objref
+
+
+SUBROUTINE t_regref(total_error)
+
+  IMPLICIT NONE
+
+  INTEGER, INTENT(INOUT) :: total_error
+  CHARACTER(LEN=22), PARAMETER :: filename  = "t_regref_F03.h5"
+  CHARACTER(LEN=3) , PARAMETER :: dataset   = "DS1"
+  CHARACTER(LEN=3) , PARAMETER :: dataset2  = "DS2"
+  INTEGER          , PARAMETER :: dim0      = 2
+  INTEGER          , PARAMETER :: ds2dim0   = 16
+  INTEGER          , PARAMETER :: ds2dim1   = 3
+
+  INTEGER(HID_T)  :: file, memspace, space, dset, dset2 ! Handles
+  INTEGER :: error
+
+  INTEGER(HSIZE_T), DIMENSION(1:1)   :: dims = (/dim0/)
+  INTEGER(HSIZE_T), DIMENSION(1:1)   :: dims3
+  INTEGER(HSIZE_T), DIMENSION(1:2)   :: dims2 = (/ds2dim0,ds2dim1/)
+
+  INTEGER(HSIZE_T), DIMENSION(1:2,1:4) :: coords = RESHAPE((/2,1,12,3,1,2,5,3/),(/2,4/))
+
+  INTEGER(HSIZE_T), DIMENSION(1:2) :: start=(/0,0/),stride=(/11,2/),count=(/2,2/), BLOCK=(/3,1/)
+
+  INTEGER(HSIZE_T), DIMENSION(1:1) :: maxdims
+  INTEGER(hssize_t) :: npoints
+  TYPE(hdset_reg_ref_t_f03), DIMENSION(1:dim0), TARGET :: wdata ! Write buffer
+  TYPE(hdset_reg_ref_t_f03), DIMENSION(:), ALLOCATABLE, TARGET :: rdata ! Read buffer
+
+  INTEGER(size_t) :: size
+  CHARACTER(LEN=1), DIMENSION(1:ds2dim0,1:ds2dim1), TARGET :: wdata2
+
+  CHARACTER(LEN=80),DIMENSION(1:1), TARGET :: rdata2
+  CHARACTER(LEN=80) :: name
+  INTEGER(hsize_t) :: i
+  TYPE(C_PTR) :: f_ptr
+  CHARACTER(LEN=ds2dim0) :: chrvar
+  CHARACTER(LEN=20), DIMENSION(1:2) :: chrref_correct
+
+  chrvar = "The quick brown "
+  READ(chrvar,'(16A1)') wdata2(1:16,1)
+  chrvar = "fox jumps over  "
+  READ(chrvar,'(16A1)') wdata2(1:16,2)
+  chrvar = "the 5 lazy dogs "
+  READ(chrvar,'(16A1)') wdata2(1:16,3)
+
+  chrref_correct(1) = 'hdf5'
+  chrref_correct(2) = 'Therowthedog'
+
+  !
+  ! Create a new file using the default properties.
+  !
+  CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file, error)
+  CALL check("h5fcreate_f",error, total_error)
+  !
+  ! Create a dataset with character data.
+  !
+  CALL h5screate_simple_f(2, dims2, space, error)
+  CALL check("h5screate_simple_f",error, total_error)
+  CALL h5dcreate_f(file,dataset2, H5T_STD_I8LE, space, dset2, error)
+  CALL check("h5dcreate_f",error, total_error)
+  f_ptr = C_LOC(wdata2(1,1))
+  CALL h5dwrite_f(dset2, H5T_NATIVE_INTEGER_KIND(1), f_ptr, error)
+  CALL check("h5dwrite_f",error, total_error)
+  !
+  ! Create reference to a list of elements in dset2.
+  !
+  CALL h5sselect_elements_f(space, H5S_SELECT_SET_F, 2, INT(4,size_t), coords, error)
+  CALL check("h5sselect_elements_f",error, total_error)
+  f_ptr = C_LOC(wdata(1))
+  CALL h5rcreate_f(file, DATASET2, H5R_DATASET_REGION_F, f_ptr, error, space)
+  CALL check("h5rcreate_f",error, total_error)
+  !
+  ! Create reference to a hyperslab in dset2, close dataspace.
+  !
+  CALL h5sselect_hyperslab_f (space, H5S_SELECT_SET_F, start, count, error, stride, block)
+  CALL check("h5sselect_hyperslab_f",error, total_error)
+  f_ptr = C_LOC(wdata(2))
+  CALL h5rcreate_f(file, DATASET2, H5R_DATASET_REGION_F, f_ptr, error, space)
+  CALL check("h5rcreate_f",error, total_error)
+
+  CALL h5sclose_f(space, error)
+  CALL check("h5sclose_f",error, total_error)
+  !
+  ! Create dataspace.  Setting maximum size to the current size.
+  !
+  CALL h5screate_simple_f(1, dims, space, error)
+  CALL check("h5screate_simple_f",error, total_error)
+
+  !
+  ! Create the dataset and write the region references to it.
+  !
+  CALL h5dcreate_f(file, dataset, H5T_STD_REF_DSETREG, space, dset, error)
+  CALL check("h5dcreate_f",error, total_error)
+  f_ptr = C_LOC(wdata(1))
+  CALL h5dwrite_f(dset, H5T_STD_REF_DSETREG, f_ptr, error)
+  CALL check("h5dwrite_f",error, total_error)
+  !
+  ! Close and release resources.
+  !
+  CALL h5dclose_f(dset , error)
+  CALL check("h5dclose_f",error, total_error)
+  CALL h5dclose_f(dset2, error)
+  CALL check("h5dclose_f",error, total_error)
+  CALL h5sclose_f(space, error)
+  CALL check("h5sclose_f",error, total_error)
+  CALL h5fclose_f(file , error)
+  CALL check("h5fclose_f",error, total_error)
+  !
+  ! Now we begin the read section of this example.
+  !
+  !
+  ! Open file and dataset.
+  !
+  CALL h5fopen_f(filename, H5F_ACC_RDONLY_F, file, error)
+  CALL check("h5fopen_f",error, total_error)
+  CALL h5dopen_f(file, dataset, dset, error)
+  CALL check("h5dopen_f",error, total_error)
+  !
+  ! Get dataspace and allocate memory for read buffer.
+  !
+  CALL h5dget_space_f(dset, space, error)
+  CALL check("H5Dget_space_f",error, total_error)
+  CALL h5sget_simple_extent_dims_f(space, dims, maxdims, error)
+  CALL check("H5Sget_simple_extent_dims_f",error, total_error)
+  CALL VERIFY("H5Sget_simple_extent_dims_f", dims(1), INT(dim0,hsize_t), total_error)
+  ALLOCATE(rdata(1:dims(1)))
+  CALL h5sclose_f(space, error)
+  CALL check("h5sclose_f",error, total_error)
+  !
+  ! Read the data.
+  !
+  f_ptr = C_LOC(rdata(1))
+  CALL h5dread_f( dset, H5T_STD_REF_DSETREG, f_ptr, error)
+  CALL check("H5Dread_f",error, total_error)
+  !
+  ! Output the data to the screen.
+  !
+  DO i = 1, dims(1)
+
+     !
+     ! Open the referenced object, retrieve its region as a
+     ! dataspace selection.
+     !
+     f_ptr = C_LOC(rdata(i))
+     CALL H5Rdereference_f(dset, H5R_DATASET_REGION_F, f_ptr, dset2, error)
+     CALL check("H5Rdereference_f",error, total_error)
+
+     CALL H5Rget_region_f(dset, f_ptr, space, error)
+     CALL check("H5Rget_region_f",error, total_error)
+
+     !
+     ! Get the object's name
+     !
+     name(:) = ' ' ! initialize string to blanks
+     CALL H5Iget_name_f(dset2, name, 80_size_t, size, error)
+     CALL check("H5Iget_name_f",error, total_error)
+     CALL VERIFY("H5Iget_name_f", INT(size), LEN_TRIM(name), total_error)
+     CALL verify("H5Iget_name_f",name(1:size),TRIM(name), total_error)
+     !
+     ! Allocate space for the read buffer.
+     !
+     CALL H5Sget_select_npoints_f(space, npoints, error)
+     CALL check("H5Sget_select_npoints_f",error, total_error)
+     CALL VERIFY("H5Sget_select_npoints_f", INT(npoints), LEN_TRIM(chrref_correct(i)), total_error)
+
+     dims3(1) = npoints
+     !
+     ! Read the dataset region.
+     !
+     CALL h5screate_simple_f(1, dims3, memspace, error)
+     CALL check("h5screate_simple_f",error, total_error)
+
+     f_ptr = C_LOC(rdata2(1)(1:1))
+     CALL h5dread_f( dset2, H5T_NATIVE_INTEGER_KIND(1), f_ptr, error, memspace, space)
+     CALL check("H5Dread_f",error, total_error)
+     CALL verify("h5dread_f",rdata2(1)(1:npoints),TRIM(chrref_correct(i)), total_error)
+
+     CALL H5Sclose_f(space, error)
+     CALL check("h5sclose_f",error, total_error)
+     CALL H5Sclose_f(memspace, error)
+     CALL check("h5sclose_f",error, total_error)
+     CALL H5Dclose_f(dset2, error)
+     CALL check("h5dclose_f",error, total_error)
+
+  END DO
+  !
+  ! Close and release resources.
+  !
+  DEALLOCATE(rdata)
+  CALL H5Dclose_f(dset, error)
+  CALL check("h5dclose_f",error, total_error)
+  CALL H5Fclose_f(file, error)
+  CALL check("h5fclose_f",error, total_error)
+
+END SUBROUTINE t_regref
+
+SUBROUTINE t_vlen(total_error)
+
+  IMPLICIT NONE
+
+  INTEGER, INTENT(INOUT) :: total_error
+  CHARACTER(LEN=18), PARAMETER :: filename  = "t_vlen_F03.h5"
+  CHARACTER(LEN=3) , PARAMETER :: dataset   = "DS1"
+  INTEGER, PARAMETER :: LEN0 = 3
+  INTEGER, PARAMETER :: LEN1 = 12
+  INTEGER(hsize_t) :: dim0
+
+  INTEGER(HID_T)  :: file, filetype, memtype, space, dset ! Handles
+  INTEGER :: error
+  INTEGER(HSIZE_T), DIMENSION(1:2)   :: maxdims
+  INTEGER :: i, j
+
+  ! vl data
+  TYPE vl
+     INTEGER, DIMENSION(:), POINTER :: DATA
+  END TYPE vl
+  TYPE(vl), DIMENSION(:), ALLOCATABLE, TARGET :: ptr
+
+
+  TYPE(hvl_t), DIMENSION(1:2), TARGET :: wdata ! Array of vlen structures
+  TYPE(hvl_t), DIMENSION(1:2), TARGET :: rdata ! Pointer to vlen structures
+
+  INTEGER(hsize_t), DIMENSION(1:1) :: dims = (/2/)
+  INTEGER, DIMENSION(:), POINTER :: ptr_r
+  TYPE(C_PTR) :: f_ptr
+
+  !
+  ! Initialize variable-length data.  wdata(1) is a countdown of
+  ! length LEN0, wdata(2) is a Fibonacci sequence of length LEN1.
+  !
+  wdata(1)%len = LEN0
+  wdata(2)%len = LEN1
+
+  ALLOCATE( ptr(1:2) )
+  ALLOCATE( ptr(1)%data(1:wdata(1)%len) )
+  ALLOCATE( ptr(2)%data(1:wdata(2)%len) )
+
+  DO i=1, INT(wdata(1)%len)
+     ptr(1)%data(i) = INT(wdata(1)%len) - i + 1 ! 3 2 1
+  ENDDO
+  wdata(1)%p = C_LOC(ptr(1)%data(1))
+
+  ptr(2)%data(1:2) = 1
+  DO i = 3, INT(wdata(2)%len)
+     ptr(2)%data(i) = ptr(2)%data(i-1) + ptr(2)%data(i-2) ! (1 1 2 3 5 8 etc.)
+  ENDDO
+  wdata(2)%p = C_LOC(ptr(2)%data(1))
+
+  !
+  ! Create a new file using the default properties.
+  !
+  CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file, error)
+  CALL check("h5fcreate_f",error, total_error)
+  !
+  ! Create variable-length datatype for file and memory.
+  !
+  CALL H5Tvlen_create_f(H5T_STD_I32LE, filetype, error)
+  CALL check("H5Tvlen_create_f",error, total_error)
+  CALL H5Tvlen_create_f(H5T_NATIVE_INTEGER, memtype, error)
+  CALL check("H5Tvlen_create_f",error, total_error)
+  !
+  ! Create dataspace.
+  !
+  CALL h5screate_simple_f(1, dims, space, error)
+  CALL check("h5screate_simple_f",error, total_error)
+  !
+  ! Create the dataset and write the variable-length data to it.
+  !
+  CALL H5Dcreate_f(file, dataset, filetype, space, dset, error)
+  CALL check("h5dcreate_f",error, total_error)
+
+  f_ptr = C_LOC(wdata(1))
+  CALL h5dwrite_f(dset, memtype, f_ptr, error)
+  CALL check("h5dwrite_f",error, total_error)
+  !
+  ! Close and release resources.  Note the use of H5Dvlen_reclaim
+  ! removes the need to manually deallocate the previously allocated
+  ! data.
+  !
+
+  CALL h5dclose_f(dset , error)
+  CALL check("h5dclose_f",error, total_error)
+  CALL h5sclose_f(space, error)
+  CALL check("h5sclose_f",error, total_error)
+  CALL H5Tclose_f(filetype, error)
+  CALL check("h5tclose_f",error, total_error)
+  CALL H5Tclose_f(memtype, error)
+  CALL check("h5tclose_f",error, total_error)
+  CALL h5fclose_f(file , error)
+  CALL check("h5fclose_f",error, total_error)
+
+  !
+  ! Now we begin the read section of this example.
+
+  !
+  ! Open file and dataset.
+  !
+  CALL h5fopen_f(filename, H5F_ACC_RDONLY_F, file, error)
+  CALL check("h5fopen_f",error, total_error)
+  CALL h5dopen_f(file, dataset, dset, error)
+  CALL check("h5dopen_f",error, total_error)
+
+  !
+  ! Get dataspace and allocate memory for array of vlen structures.
+  ! This does not actually allocate memory for the vlen data, that
+  ! will be done by the library.
+  !
+  CALL H5Dget_space_f(dset, space, error)
+  CALL check("H5Dget_space_f",error, total_error)
+  dim0 = dims(1)
+  CALL H5Sget_simple_extent_dims_f(space, dims, maxdims, error)
+  CALL check("H5Sget_simple_extent_dims_f",error, total_error)
+  CALL VERIFY("H5Sget_simple_extent_dims_f", INT(dims(1)), INT(dim0), total_error)
+
+  !
+  ! Create the memory datatype.
+  !
+  CALL H5Tvlen_create_f(H5T_NATIVE_INTEGER, memtype, error)
+  CALL check("H5Tvlen_create_f",error, total_error)
+
+  !
+  ! Read the data.
+  !
+  f_ptr = C_LOC(rdata(1))
+  CALL H5Dread_f(dset, memtype, f_ptr, error)
+  CALL check("H5Dread_f",error, total_error)
+
+  DO i = 1, INT(dims(1))
+     CALL c_f_pointer(rdata(i)%p, ptr_r, [rdata(i)%len] )
+     DO j = 1, INT(rdata(i)%len)
+        CALL VERIFY("t_vlen", ptr_r(j), ptr(i)%data(j), total_error)
+     ENDDO
+  ENDDO
+  !
+  ! Close and release resources.
+  !
+  DEALLOCATE(ptr)
+  CALL h5dvlen_reclaim_f(memtype, space, H5P_DEFAULT_F, f_ptr, error)
+  CALL h5dclose_f(dset, error)
+  CALL check("h5dclose_f",error, total_error)
+  CALL h5sclose_f(space, error)
+  CALL check("h5sclose_f",error, total_error)
+  CALL H5Tclose_f(memtype, error)
+  CALL check("h5tclose_f",error, total_error)
+  CALL h5fclose_f(file, error)
+  CALL check("h5fclose_f",error, total_error)
+
+END SUBROUTINE t_vlen
+
+
+SUBROUTINE t_vlstring(total_error)
+
+  IMPLICIT NONE
+
+  INTEGER, INTENT(INOUT) :: total_error
+
+  CHARACTER(LEN=18), PARAMETER :: filename  = "t_vlstring.h5"
+  CHARACTER(LEN=3) , PARAMETER :: dataset   = "DS1"
+
+  INTEGER(SIZE_T), PARAMETER :: dim0      = 4
+  INTEGER(SIZE_T), PARAMETER :: sdim      = 7
+  INTEGER(HID_T)  :: file, filetype, space, dset ! Handles
+  INTEGER :: error
+  INTEGER(HSIZE_T), DIMENSION(1:1) :: dims = (/dim0/)
+  INTEGER(HSIZE_T), DIMENSION(1:2) :: maxdims
+
+  CHARACTER(LEN=sdim), DIMENSION(1:dim0), TARGET :: &
+       wdata = (/"Parting", "is such", "sweet  ", "sorrow."/) ! Write buffer
+  CHARACTER(LEN=sdim), DIMENSION(:), ALLOCATABLE :: rdata ! Read buffer
+  INTEGER(HSIZE_T), DIMENSION(2) :: data_dims = (/sdim,dim0/)
+  INTEGER(SIZE_T), DIMENSION(4) :: str_len = (/7,7,5,7/)
+  INTEGER(hsize_t) :: i
+
+  !
+  ! Create a new file using the default properties.
+  !
+  CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file, error)
+  CALL check("h5fcreate_f",error, total_error)
+  !
+  ! Create file and memory datatypes.  For this example we will save
+  ! the strings as C variable length strings, H5T_STRING is defined
+  ! as a variable length string.
+  !
+  CALL H5Tcopy_f(H5T_STRING, filetype, error)
+  CALL check("H5Tcopy_f",error, total_error)
+  CALL H5Tset_strpad_f(filetype, H5T_STR_NULLPAD_F, error)
+  CALL check("H5Tset_strpad_f",error, total_error)
+  !
+  ! Create dataspace.
+  !
+  CALL h5screate_simple_f(1, dims, space, error)
+  CALL check("h5screate_simple_f",error, total_error)
+  !
+  ! Create the dataset and write the variable-length string data to
+  ! it.
+  !
+  CALL h5dcreate_f(file, dataset, filetype, space, dset, error)
+  CALL check("h5dcreate_f",error, total_error)
+
+  CALL h5dwrite_vl_f(dset, filetype, wdata, data_dims, str_len, error, space)
+  CALL check("h5dwrite_vl_f",error, total_error)
+
+  !
+  ! Close and release resources.
+  !
+  CALL h5dclose_f(dset , error)
+  CALL check("h5dclose_f",error, total_error)
+  CALL h5sclose_f(space, error)
+  CALL check("h5sclose_f",error, total_error)
+  CALL H5Tclose_f(filetype, error)
+  CALL check("h5tclose_f",error, total_error)
+  CALL h5fclose_f(file , error)
+  CALL check("h5fclose_f",error, total_error)
+
+  !
+  ! Now we begin the read section of this example.
+  !
+  !
+  ! Open file and dataset.
+  !
+  CALL h5fopen_f(filename, H5F_ACC_RDONLY_F, file, error)
+  CALL check("h5fopen_f",error, total_error)
+  CALL h5dopen_f(file, dataset, dset, error)
+  CALL check("h5dopen_f",error, total_error)
+  !
+  ! Get the datatype.
+  !
+  CALL H5Dget_type_f(dset, filetype, error)
+  CALL check("H5Dget_type_f",error, total_error)
+  !
+  ! Get dataspace and allocate memory for read buffer.
+  !
+  CALL H5Dget_space_f(dset, space, error)
+  CALL check("H5Dget_space_f",error, total_error)
+  CALL H5Sget_simple_extent_dims_f(space, dims, maxdims, error)
+  CALL check("H5Sget_simple_extent_dims_f",error, total_error)
+  CALL VERIFY("H5Sget_simple_extent_dims_f", INT(dims(1)), INT(dim0), total_error)
+
+  ALLOCATE(rdata(1:dims(1)))
+
+  !
+  ! Read the data.
+  !
+  CALL h5dread_vl_f(dset, filetype, rdata, data_dims, str_len, error, space)
+  CALL check("H5Dread_vl_f",error, total_error)
+
+  !
+  ! Output the data to the screen.
+  !
+  DO i = 1, dims(1)
+     CALL verify("h5dopen_f",TRIM(rdata(i)),TRIM(wdata(i)) , total_error)
+  END DO
+
+  DEALLOCATE(rdata)
+  CALL h5dclose_f(dset, error)
+  CALL check("h5dclose_f",error, total_error)
+  CALL h5sclose_f(space, error)
+  CALL check("h5sclose_f",error, total_error)
+  CALL H5Tclose_f(filetype, error)
+  CALL check("h5tclose_f",error, total_error)
+  CALL h5fclose_f(file , error)
+  CALL check("h5fclose_f",error, total_error)
+
+END SUBROUTINE t_vlstring
+
+SUBROUTINE t_vlstring_readwrite(total_error)
+
+! test writing and reading vl string using h5dread_f and h5dwrite_f, C_LOC and C_F_POINTER
+
+  IMPLICIT NONE
+
+  INTEGER, INTENT(INOUT) :: total_error
+
+  CHARACTER(LEN=19), PARAMETER :: filename  = "t_vlstringrw_F03.h5"
+  CHARACTER(LEN=3) , PARAMETER :: dataset   = "DS1"
+  CHARACTER(LEN=3) , PARAMETER :: dataset2D = "DS2"
+
+  INTEGER(HSIZE_T) , PARAMETER :: dim0 = 4
+  INTEGER(HSIZE_T) , PARAMETER :: dim1 = 2
+  INTEGER(HID_T)               :: file, filetype, space, dset ! Handles
+  INTEGER(HSIZE_T), DIMENSION(1:1) :: dims = (/dim0/)
+  INTEGER(HSIZE_T), DIMENSION(1:2) :: dims2D = (/dim1,dim0/)
+  INTEGER(HSIZE_T), DIMENSION(1:2) :: maxdims
+
+  TYPE(C_PTR), DIMENSION(1:dim0), TARGET :: wdata
+  CHARACTER(len=7, KIND=c_char), DIMENSION(1:1), TARGET :: A = "123456"//C_NULL_CHAR
+  CHARACTER(len=5, KIND=c_char), DIMENSION(1:1), TARGET :: B = "7890"//C_NULL_CHAR
+  CHARACTER(len=4, KIND=c_char), DIMENSION(1:1), TARGET :: C = "abc"//C_NULL_CHAR
+  CHARACTER(len=3, KIND=c_char), DIMENSION(1:1), TARGET :: D = "df"//C_NULL_CHAR
+
+  TYPE(C_PTR), DIMENSION(1:dim1,1:dim0), TARGET :: wdata2D
+
+  CHARACTER(len=7, KIND=c_char), DIMENSION(1:1), TARGET :: A11 = "A(1,1)"//C_NULL_CHAR
+  CHARACTER(len=4, KIND=c_char), DIMENSION(1:1), TARGET :: A12 = "A12"//C_NULL_CHAR
+  CHARACTER(len=5, KIND=c_char), DIMENSION(1:1), TARGET :: A13 = "A_13"//C_NULL_CHAR
+  CHARACTER(len=8, KIND=c_char), DIMENSION(1:1), TARGET :: A14 = "A_{1,4}"//C_NULL_CHAR
+  CHARACTER(len=8, KIND=c_char), DIMENSION(1:1), TARGET :: A21 = "A_{2,1}"//C_NULL_CHAR
+  CHARACTER(len=5, KIND=c_char), DIMENSION(1:1), TARGET :: A22 = "A_22"//C_NULL_CHAR
+  CHARACTER(len=4, KIND=c_char), DIMENSION(1:1), TARGET :: A23 = "A23"//C_NULL_CHAR
+  CHARACTER(len=7, KIND=c_char), DIMENSION(1:1), TARGET :: A24 = "A(2,4)"//C_NULL_CHAR
+
+  TYPE(C_PTR), DIMENSION(:), ALLOCATABLE, TARGET :: rdata ! Read buffer
+  TYPE(C_PTR), DIMENSION(:,:), ALLOCATABLE, TARGET :: rdata2D ! Read 2D buffer
+  CHARACTER(len=8, kind=c_char), POINTER :: data ! A pointer to a Fortran string
+  CHARACTER(len=8, kind=c_char), DIMENSION(1:4) :: data_w ! A pointer to a Fortran string
+  CHARACTER(len=8, kind=c_char), DIMENSION(1:dim1,1:dim0) :: data2D_w ! A pointer to a Fortran string
+  TYPE(C_PTR) :: f_ptr
+  INTEGER(hsize_t) :: i, j
+  INTEGER :: len
+  INTEGER :: error
+
+  ! Initialize array of C pointers
+
+  wdata(1) = C_LOC(A(1)(1:1))
+  wdata(2) = C_LOC(B(1)(1:1))
+  wdata(3) = C_LOC(C(1)(1:1))
+  wdata(4) = C_LOC(D(1)(1:1))
+
+  data_w(1) = A(1)
+  data_w(2) = B(1)
+  data_w(3) = C(1)
+  data_w(4) = D(1)
+
+  wdata2D(1,1) = C_LOC(A11(1)(1:1))
+  wdata2D(1,2) = C_LOC(A12(1)(1:1))
+  wdata2D(1,3) = C_LOC(A13(1)(1:1))
+  wdata2D(1,4) = C_LOC(A14(1)(1:1))
+  wdata2D(2,1) = C_LOC(A21(1)(1:1))
+  wdata2D(2,2) = C_LOC(A22(1)(1:1))
+  wdata2D(2,3) = C_LOC(A23(1)(1:1))
+  wdata2D(2,4) = C_LOC(A24(1)(1:1))
+
+  data2D_w(1,1) = A11(1)
+  data2D_w(1,2) = A12(1)
+  data2D_w(1,3) = A13(1)
+  data2D_w(1,4) = A14(1)
+  data2D_w(2,1) = A21(1)
+  data2D_w(2,2) = A22(1)
+  data2D_w(2,3) = A23(1)
+  data2D_w(2,4) = A24(1)
+
+  !
+  ! Create a new file using the default properties.
+  !
+  CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file, error)
+  CALL check("h5fcreate_f",error, total_error)
+  !
+  ! Create file and memory datatypes.  For this test we will save
+  ! the strings as C variable length strings, H5T_STRING is defined
+  ! as a variable length string.
+  !
+  CALL H5Tcopy_f(H5T_STRING, filetype, error)
+  CALL check("H5Tcopy_f",error, total_error)
+  !
+  ! Create dataspace.
+  !
+  CALL h5screate_simple_f(1, dims, space, error)
+  CALL check("h5screate_simple_f",error, total_error)
+  !
+  ! Create the dataset and write the variable-length string data to
+  ! it.
+  !
+  CALL h5dcreate_f(file, dataset, filetype, space, dset, error)
+  CALL check("h5dcreate_f",error, total_error)
+
+  f_ptr = C_LOC(wdata(1))
+  CALL h5dwrite_f(dset, filetype, f_ptr, error)
+  CALL check("h5dwrite_f",error, total_error)
+
+  !
+  ! Close and release resources.
+  !
+  CALL h5dclose_f(dset , error)
+  CALL check("h5dclose_f",error, total_error)
+  CALL h5sclose_f(space, error)
+  CALL check("h5sclose_f",error, total_error)
+
+  !
+  ! Create dataspace.
+  !
+  CALL h5screate_simple_f(2, dims2D, space, error)
+  CALL check("h5screate_simple_f",error, total_error)
+  !
+  ! Create the dataset and write the variable-length string data to
+  ! it.
+  !
+  CALL h5dcreate_f(file, dataset2D, filetype, space, dset, error)
+  CALL check("h5dcreate_f",error, total_error)
+
+  f_ptr = C_LOC(wdata2D(1,1))
+  CALL h5dwrite_f(dset, filetype, f_ptr, error)
+  CALL check("h5dwrite_f",error, total_error)
+
+  !
+  ! Close and release resources.
+  !
+  CALL h5dclose_f(dset , error)
+  CALL check("h5dclose_f",error, total_error)
+  CALL h5sclose_f(space, error)
+  CALL check("h5sclose_f",error, total_error)
+
+  CALL H5Tclose_f(filetype, error)
+  CALL check("h5tclose_f",error, total_error)
+  CALL h5fclose_f(file , error)
+  CALL check("h5fclose_f",error, total_error)
+
+  !
+  ! Now we begin the read section of this test.
+  !
+  !
+  ! Open file and dataset.
+  !
+  CALL h5fopen_f(filename, H5F_ACC_RDONLY_F, file, error)
+  CALL check("h5fopen_f",error, total_error)
+  CALL h5dopen_f(file, dataset, dset, error)
+  CALL check("h5dopen_f",error, total_error)
+  !
+  ! Get the datatype.
+  !
+  CALL H5Dget_type_f(dset, filetype, error)
+  CALL check("H5Dget_type_f",error, total_error)
+  !
+  ! Get dataspace and allocate memory for read buffer.
+  !
+  CALL H5Dget_space_f(dset, space, error)
+  CALL check("H5Dget_space_f",error, total_error)
+
+  CALL H5Sget_simple_extent_dims_f(space, dims, maxdims, error)
+  CALL check("H5Sget_simple_extent_dims_f",error, total_error)
+  ALLOCATE(rdata(1:dims(1)))
+  !
+  ! Read the data.
+  !
+
+  f_ptr = C_LOC(rdata(1))
+  CALL h5dread_f(dset, H5T_STRING, f_ptr, error)
+  CALL check("H5Dread_f",error, total_error)
+
+  !
+  ! Check the data.
+  !
+  DO i = 1, dims(1)
+     CALL C_F_POINTER(rdata(i), data)
+     len = 0
+     DO
+        IF(DATA(len+1:len+1).EQ.C_NULL_CHAR.OR.len.GE.8) EXIT
+        len = len + 1
+     ENDDO
+     CALL verify("h5dread_f",data(1:len), data_w(i)(1:len), total_error)
+  END DO
+
+  DEALLOCATE(rdata)
+  CALL h5dclose_f(dset , error)
+  CALL check("h5dclose_f",error, total_error)
+  CALL h5sclose_f(space, error)
+  CALL check("h5sclose_f",error, total_error)
+  !
+  ! Test reading in 2D dataset
+  !
+  CALL h5dopen_f(file, dataset2D, dset, error)
+  CALL check("h5dopen_f",error, total_error)
+  !
+  ! Get the datatype.
+  !
+  CALL H5Dget_type_f(dset, filetype, error)
+  CALL check("H5Dget_type_f",error, total_error)
+  !
+  ! Get dataspace and allocate memory for read buffer.
+  !
+  CALL H5Dget_space_f(dset, space, error)
+  CALL check("H5Dget_space_f",error, total_error)
+
+
+  CALL H5Sget_simple_extent_dims_f(space, dims2D, maxdims, error)
+  CALL check("H5Sget_simple_extent_dims_f",error, total_error)
+  ALLOCATE(rdata2D(1:dims2D(1),1:dims2D(2)))
+
+  !
+  ! Read the data.
+  !
+
+  f_ptr = C_LOC(rdata2D(1,1))
+  CALL h5dread_f(dset, H5T_STRING, f_ptr, error)
+  CALL check("H5Dread_f",error, total_error)
+
+  !
+  ! Check the data.
+  !
+  DO i = 1, dims2D(1)
+     DO j = 1, dims2D(2)
+        CALL C_F_POINTER(rdata2D(i,j), DATA)
+        len = 0
+        DO
+           IF(DATA(len+1:len+1).EQ.C_NULL_CHAR.OR.len.GE.8) EXIT
+           len = len + 1
+        ENDDO
+        CALL verify("h5dread_f",DATA(1:len), data2D_w(i,j)(1:len), total_error)
+     ENDDO
+  END DO
+
+  DEALLOCATE(rdata2D)
+  CALL h5dclose_f(dset , error)
+  CALL check("h5dclose_f",error, total_error)
+  CALL h5sclose_f(space, error)
+  CALL check("h5sclose_f",error, total_error)
+
+  CALL H5Tclose_f(filetype, error)
+  CALL check("h5tclose_f",error, total_error)
+  CALL h5fclose_f(file , error)
+  CALL check("h5fclose_f",error, total_error)
+
+END SUBROUTINE t_vlstring_readwrite
+
+
+SUBROUTINE t_string(total_error)
+
+  IMPLICIT NONE
+
+  INTEGER, INTENT(INOUT) :: total_error
+
+  CHARACTER(LEN=20), PARAMETER :: filename  = "t_string_F03.h5"
+  CHARACTER(LEN=3) , PARAMETER :: dataset   = "DS1"
+  INTEGER          , PARAMETER :: dim0      = 4
+  INTEGER(SIZE_T)  , PARAMETER :: sdim      = 8
+
+  INTEGER(HID_T)  :: file, filetype, memtype, space, dset ! Handles
+  INTEGER :: error
+
+  INTEGER(HSIZE_T), DIMENSION(1:1) :: dims = (/dim0/)
+  INTEGER(HSIZE_T), DIMENSION(1:1) :: maxdims
+
+  CHARACTER(LEN=sdim), DIMENSION(1:dim0), TARGET :: &
+       wdata = (/"Parting", "is such", "sweet  ", "sorrow."/)
+  CHARACTER(LEN=sdim), DIMENSION(:), ALLOCATABLE, TARGET :: rdata
+  INTEGER(hsize_t) :: i
+  INTEGER(SIZE_T) :: size
+  TYPE(C_PTR) :: f_ptr
+  !
+  ! Create a new file using the default properties.
+  !
+  CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file, error)
+  CALL check("h5fcreate_f",error, total_error)
+  !
+  ! Create file datatypes.  For this example we will save
+  ! the strings as FORTRAN strings
+  !
+  CALL H5Tcopy_f(H5T_FORTRAN_S1, filetype, error)
+  CALL check("H5Tcopy_f",error, total_error)
+  CALL H5Tset_size_f(filetype, sdim, error)
+  CALL check("H5Tset_size_f",error, total_error)
+  !
+  ! Create dataspace.
+  !
+  CALL h5screate_simple_f(1, dims, space, error)
+  CALL check("h5screate_simple_f",error, total_error)
+  !
+  ! Create the dataset and write the string data to it.
+  !
+  CALL h5dcreate_f(file, dataset, filetype, space, dset, error)
+  CALL check("h5dcreate_f",error, total_error)
+
+  f_ptr = C_LOC(wdata(1)(1:1))
+  CALL H5Dwrite_f(dset, filetype, f_ptr, error)
+  CALL check("H5Dwrite_f",error, total_error)
+  !
+  ! Close and release resources.
+  !
+  CALL h5dclose_f(dset , error)
+  CALL check("h5dclose_f",error, total_error)
+  CALL h5sclose_f(space, error)
+  CALL check("h5sclose_f",error, total_error)
+  CALL H5Tclose_f(filetype, error)
+  CALL check("h5tclose_f",error, total_error)
+  CALL h5fclose_f(file , error)
+  CALL check("h5fclose_f",error, total_error)
+  !
+  ! Now we begin the read section of this example.
+  !
+  ! Open file and dataset.
+  !
+  CALL h5fopen_f(filename, H5F_ACC_RDONLY_F, file, error)
+  CALL check("h5fopen_f",error, total_error)
+  CALL h5dopen_f(file, dataset, dset, error)
+  CALL check("h5dopen_f",error, total_error)
+  !
+  ! Get the datatype and its size.
+  !
+  CALL H5Dget_type_f(dset, filetype, error)
+  CALL check("H5Dget_type_f",error, total_error)
+  CALL H5Tget_size_f(filetype, size, error)
+  CALL check("H5Tget_size_f",error, total_error)
+  CALL VERIFY("H5Tget_size_f", INT(size), INT(sdim), total_error)
+  !
+  ! Get dataspace.
+  !
+  CALL H5Dget_space_f(dset, space, error)
+  CALL check("H5Dget_space_f",error, total_error)
+  CALL H5Sget_simple_extent_dims_f(space, dims, maxdims, error)
+  CALL check("H5Sget_simple_extent_dims_f",error, total_error)
+  CALL VERIFY("H5Sget_simple_extent_dims_f", dims(1), INT(dim0,hsize_t), total_error)
+
+  ALLOCATE(rdata(1:dims(1)))
+  !
+  ! Create the memory datatype.
+  !
+  CALL H5Tcopy_f(H5T_FORTRAN_S1, memtype, error)
+  CALL check("H5Tcopy_f",error, total_error)
+  CALL H5Tset_size_f(memtype, sdim, error)
+  CALL check("H5Tset_size_f",error, total_error)
+  !
+  ! Read the data.
+  !
+  f_ptr = C_LOC(rdata(1)(1:1))
+  CALL H5Dread_f(dset, memtype, f_ptr, error, space)
+  CALL check("H5Dread_f",error, total_error)
+
+  DO i = 1, dims(1)
+     CALL verify("h5dread_f",TRIM(rdata(i)),TRIM(wdata(i)) , total_error)
+  END DO
+
+  DEALLOCATE(rdata)
+
+  !
+  ! Close and release resources.
+  !
+  CALL H5Dclose_f(dset, error)
+  CALL check("h5dclose_f",error, total_error)
+  CALL H5Sclose_f(space, error)
+  CALL check("h5sclose_f",error, total_error)
+  CALL H5Tclose_f(memtype, error)
+  CALL check("h5tclose_f",error, total_error)
+  CALL H5Fclose_f(file, error)
+  CALL check("h5fclose_f",error, total_error)
+
+
+END SUBROUTINE t_string
+
+SUBROUTINE vl_test_special_char(total_error)
+
+  IMPLICIT NONE
+
+!  INTERFACE
+!     SUBROUTINE setup_buffer(data_in, line_lengths, char_type)
+!       USE HDF5
+!       USE ISO_C_BINDING
+!     IMPLICIT NONE
+!       CHARACTER(len=*), DIMENSION(:) :: data_in
+!       INTEGER(size_t), DIMENSION(:) :: line_lengths
+!       CHARACTER(KIND=C_CHAR,LEN=*) :: char_type
+!     END SUBROUTINE setup_buffer
+!  END INTERFACE
+
+  INTEGER, INTENT(OUT) :: total_error
+
+  CHARACTER(LEN=16), PARAMETER :: filename  = "t_controlchar.h5"
+  INTEGER, PARAMETER :: line_length = 10
+  INTEGER(hid_t) :: file
+  INTEGER(hid_t) :: dataset0
+  CHARACTER(len=line_length), DIMENSION(1:100) :: data_in
+  CHARACTER(len=line_length), DIMENSION(1:100) :: data_out
+  INTEGER(size_t), DIMENSION(1:100) :: line_lengths
+  INTEGER(hid_t) :: string_id, space, dcpl
+  INTEGER(hsize_t), DIMENSION(1:1) :: dims = (/0/)
+  INTEGER(hsize_t), DIMENSION(1:1) :: max_dims = (/0/)
+  INTEGER(hsize_t), DIMENSION(1:2) :: data_dims = (/0,0/)
+  INTEGER(hsize_t), DIMENSION(1:1) :: chunk =(/10/)
+  INTEGER, PARAMETER :: ncontrolchar = 7
+  CHARACTER(KIND=C_CHAR,LEN=1), DIMENSION(1:ncontrolchar) :: controlchar = &
+       (/C_ALERT, C_BACKSPACE,C_CARRIAGE_RETURN, C_FORM_FEED,C_HORIZONTAL_TAB,C_VERTICAL_TAB, C_NEW_LINE/)
+  INTEGER :: i, j, n, error
+  n = 8
+  !
+  ! Create a new file using the default properties.
+  !
+  CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file, error)
+  CALL check("h5fcreate_f",error, total_error)
+
+  max_dims = (/H5S_UNLIMITED_F/)
+
+  !
+  ! Create the memory datatype.
+  !
+  CALL h5tcopy_f(h5t_string, string_id, error)
+  CALL check("h5tcopy_f", error, total_error)
+  CALL h5tset_strpad_f(string_id, h5t_str_nullpad_f, error)
+  CALL check("h5tset_strpad_f", error, total_error)
+  dims(1) = n
+  !
+  ! Create dataspace.
+  !
+  CALL h5screate_simple_f(1, dims, space, error, max_dims)
+  CALL check("h5screate_simple_f", error, total_error)
+  CALL h5pcreate_f(h5p_dataset_create_f, dcpl, error)
+  CALL check("h5pcreate_f", error, total_error)
+  CALL h5pset_chunk_f(dcpl, 1, chunk, error)
+  CALL check("h5pset_chunk_f", error, total_error)
+
+  data_dims(1) = line_length
+  data_dims(2) = n
+  !
+  ! Create data with strings containing various control characters.
+  !
+  DO i = 1, ncontrolchar
+     !
+     ! Create the dataset, for the string with control character and write the string data to it.
+     !
+     CALL h5dcreate_f(file, controlchar(i), string_id, space, dataset0, error, dcpl)
+     CALL check("h5dcreate_f", error, total_error)
+     CALL setup_buffer(data_in(1:n), line_lengths, controlchar(i))
+     CALL h5dwrite_vl_f(dataset0, string_id, data_in(1:n), data_dims, line_lengths(1:n), error, space)
+     CALL check("h5dwrite_vl_f", error, total_error)
+     !
+     ! Read the string back.
+     !
+     CALL h5dread_vl_f(dataset0, string_id, data_out(1:n), data_dims, line_lengths(1:n), error, space)
+     CALL check("h5dread_vl_f", error, total_error)
+
+     DO j = 1, n
+        IF(data_in(j).NE.data_out(j))THEN
+           total_error = total_error + 1
+           EXIT
+        ENDIF
+     ENDDO
+
+     CALL h5dclose_f(dataset0, error)
+     CALL check("h5dclose_f", error, total_error)
+  ENDDO
+
+  CALL h5pclose_f(dcpl, error)
+  CALL check("h5pclose_f", error, total_error)
+  CALL h5sclose_f(space, error)
+  CALL check("h5sclose_f", error, total_error)
+  CALL h5fclose_f(file, error)
+  CALL check("h5fclose_f", error, total_error)
+
+END SUBROUTINE vl_test_special_char
+
+
+SUBROUTINE setup_buffer(data_in, line_lengths, char_type)
+
+  IMPLICIT NONE
+
+  ! Creates a simple "Data_in" consisting of the letters of the alphabet,
+  ! one per line, with a control character.
+
+  CHARACTER(len=10), DIMENSION(:) :: data_in
+  INTEGER(size_t), DIMENSION(:) :: line_lengths
+  CHARACTER(LEN=3) :: lets = 'abc'
+  CHARACTER(KIND=C_CHAR,LEN=*) :: char_type
+  INTEGER :: i, j, n
+
+  n = SIZE(data_in)
+  j = 1
+  DO i=1,n-1
+     IF( j .EQ. 4 )THEN
+        data_in(i:i) = char_type(1:1)
+     ELSE
+        data_in(i:i) = lets(j:j)
+     ENDIF
+     line_lengths(i) = LEN_TRIM(data_in(i))
+     j = j + 1
+     IF( j .EQ. 5 ) j = 1
+  END DO
+  data_in(n:n) =  char_type(1:1)
+  line_lengths(n) = 1
+
+END SUBROUTINE setup_buffer
+
+!-------------------------------------------------------------------------
+! Function:    test_nbit
+!
+! Purpose:     Tests (real, 4 byte) datatype for nbit filter
+!
+! Return:      Success:        0
+!              Failure:        >0
+!
+! Programmer:  M. Scot Breitenfeld
+!              Decemeber 7, 2010
+!
+! Modifications: Moved this subroutine from the 1.8 test file and
+! modified it to use F2003 features.
+! This routine requires 4 byte reals, so we use F2003 features to
+! ensure the requirement is satisfied in a portable way.
+! The need for this arises when a user specifies the default real is 8 bytes.
+! MSB 7/31/12
+!
+!-------------------------------------------------------------------------
+!
+
+SUBROUTINE test_nbit(total_error )
+
+  IMPLICIT NONE
+  INTEGER, PARAMETER :: wp = C_FLOAT !should map to REAL*4 on most modern processors
+  INTEGER, INTENT(INOUT) :: total_error
+  INTEGER(hid_t) :: file
+
+  INTEGER(hid_t) :: dataset, datatype, space, dc, mem_type_id
+  INTEGER(hsize_t), DIMENSION(1:2) :: dims = (/2,5/)
+  INTEGER(hsize_t), DIMENSION(1:2) :: chunk_dim = (/2,5/)
+  ! orig_data[] are initialized to be within the range that can be represented by
+  ! dataset datatype (no precision loss during datatype conversion)
+  !
+  REAL(kind=wp), DIMENSION(1:2,1:5), TARGET :: orig_data = &
+       RESHAPE( (/188384.00, 19.103516, -1.0831790e9, -84.242188, &
+       5.2045898, -49140.000, 2350.2500, -3.2110596e-1, 6.4998865e-5, -0.0000000/) , (/2,5/) )
+  REAL(kind=wp), DIMENSION(1:2,1:5), TARGET :: new_data
+  INTEGER(size_t) :: PRECISION, offset
+  INTEGER :: error
+  LOGICAL :: status
+  INTEGER(hsize_t) :: i, j
+  TYPE(C_PTR) :: f_ptr
+
+  ! check to see if filter is available
+  CALL H5Zfilter_avail_f(H5Z_FILTER_NBIT_F, status, error)
+  IF(.NOT.status)THEN ! We don't have H5Z_FILTER_NBIT_F filter
+     total_error = -1     ! so return
+     RETURN
+  ENDIF
+
+  CALL H5Fcreate_f("nbit.h5", H5F_ACC_TRUNC_F, file, error)
+  CALL check("H5Fcreate_f", error, total_error)
+
+  ! Define dataset datatype (integer), and set precision, offset
+  CALL H5Tcopy_f(H5T_IEEE_F32BE, datatype, error)
+  CALL CHECK(" H5Tcopy_f", error, total_error)
+  CALL H5Tset_fields_f(datatype, 26_size_t, 20_size_t, 6_size_t, 7_size_t, 13_size_t, error)
+  CALL CHECK(" H5Tset_fields_f", error, total_error)
+  offset = 7
+  CALL H5Tset_offset_f(datatype, offset, error)
+  CALL CHECK(" H5Tset_offset_f", error, total_error)
+  PRECISION = 20
+  CALL H5Tset_precision_f(datatype,PRECISION, error)
+  CALL CHECK(" H5Tset_precision_f", error, total_error)
+
+  CALL H5Tset_size_f(datatype, 4_size_t, error)
+  CALL CHECK(" H5Tset_size_f", error, total_error)
+
+  CALL H5Tset_ebias_f(datatype, 31_size_t, error)
+  CALL CHECK(" H5Tset_ebias_f", error, total_error)
+
+  ! Create the data space
+  CALL H5Screate_simple_f(2, dims, space, error)
+  CALL CHECK(" H5Screate_simple_f", error, total_error)
+
+  ! USE nbit filter
+  CALL H5Pcreate_f(H5P_DATASET_CREATE_F, dc, error)
+  CALL CHECK(" H5Pcreate_f", error, total_error)
+
+  CALL H5Pset_chunk_f(dc, 2, chunk_dim, error)
+  CALL CHECK(" H5Pset_chunk_f", error, total_error)
+  CALL H5Pset_nbit_f(dc, error)
+  CALL CHECK(" H5Pset_nbit_f", error, total_error)
+
+  ! Create the dataset
+  CALL  H5Dcreate_f(file, "nbit_real", datatype, &
+       space, dataset, error, dc)
+  CALL CHECK(" H5Dcreate_f", error, total_error)
+
+  !----------------------------------------------------------------------
+  ! STEP 1: Test nbit by setting up a chunked dataset and writing
+  ! to it.
+  !----------------------------------------------------------------------
+  !
+  mem_type_id = h5kind_to_type(wp,H5_REAL_KIND)
+
+  f_ptr = C_LOC(orig_data(1,1))
+  CALL H5Dwrite_f(dataset, mem_type_id, f_ptr, error)
+  CALL CHECK(" H5Dwrite_f", error, total_error)
+
+  !----------------------------------------------------------------------
+  ! STEP 2: Try to read the data we just wrote.
+  !----------------------------------------------------------------------
+  !
+  f_ptr = C_LOC(new_data(1,1))
+  CALL H5Dread_f(dataset, mem_type_id, f_ptr, error)
+  CALL CHECK(" H5Dread_f", error, total_error)
+
+  ! Check that the values read are the same as the values written
+  ! Assume size of long long = size of double
+  !
+  i_loop: DO i = 1, dims(1)
+     j_loop: DO j = 1, dims(2)
+
+        IF(.NOT.(orig_data(i,j).EQ.orig_data(i,j))) CYCLE  ! skip IF value is NaN
+
+        IF( .NOT.check_real_eq( new_data(i,j), orig_data(i,j)) ) THEN
+           total_error = total_error + 1
+           WRITE(*,'("    Read different values than written.")')
+           WRITE(*,'("    At index ", 2(1X,I0))') i, j
+           EXIT i_loop
+        END IF
+     ENDDO j_loop
+  ENDDO i_loop
+
+  !----------------------------------------------------------------------
+  ! Cleanup
+  !----------------------------------------------------------------------
+  !
+  CALL H5Tclose_f(datatype, error)
+  CALL CHECK(" H5Tclose_f", error, total_error)
+  CALL H5Pclose_f(dc, error)
+  CALL CHECK(" H5Pclose_f", error, total_error)
+  CALL H5Sclose_f(space, error)
+  CALL CHECK(" H5Sclose_f", error, total_error)
+  CALL H5Dclose_f(dataset, error)
+  CALL CHECK(" H5Dclose_f", error, total_error)
+  CALL H5Fclose_f(file, error)
+  CALL CHECK(" H5Fclose_f", error, total_error)
+
+END SUBROUTINE test_nbit
+
+
+SUBROUTINE t_enum_conv(total_error)
+
+!-------------------------------------------------------------------------
+! Subroutine: t_enum_conv
+!
+! Purpose: Tests converting data from enumeration datatype
+!          to numeric (integer or floating-point number)
+!          datatype. Tests various KINDs of INTEGERs
+!          and REALs. Checks reading enum data into
+!          INTEGER and REAL KINDs.
+!
+! Return: Success:	0
+!	  Failure:	number of errors
+!
+! Programmer:  M. Scot Breitenfeld
+!              October 27, 2012
+!
+! Note:        Adapted from C test (enum.c -- test_conv)
+!              No reliance on C tests.
+!-------------------------------------------------------------------------
+!
+
+  IMPLICIT NONE
+
+  INTEGER, INTENT(INOUT) :: total_error
+
+  INTEGER, PARAMETER :: int_kind_8 = SELECTED_INT_KIND(9)   !should map to INTEGER*4 on most modern processors
+  INTEGER, PARAMETER :: int_kind_16 = SELECTED_INT_KIND(18) !should map to INTEGER*8 on most modern processors
+
+  INTEGER, PARAMETER :: real_kind_7 = C_FLOAT  !should map to REAL*4 on most modern processors
+
+  INTEGER(hid_t) :: cwg=-1, dtype=-1, space=-1, dset=-1 ! Handles
+  INTEGER(hid_t) :: file ! Handles
+
+  ! Enumerated type
+  ENUM, BIND(C)
+    ENUMERATOR :: E1_RED, E1_GREEN, E1_BLUE, E1_WHITE, E1_BLACK
+  END ENUM
+
+  INTEGER(KIND(E1_RED)), TARGET :: val
+
+  ! Enumerated data array
+  ! Some values are out of range for testing. The library should accept them
+  INTEGER(KIND(E1_RED)), DIMENSION(1:20), TARGET :: data1 = (/INT(E1_RED,KIND(E1_RED)), &
+       INT(E1_GREEN,KIND(E1_RED)), INT(E1_BLUE,KIND(E1_RED)),  &
+       INT(E1_GREEN,KIND(E1_RED)), INT(E1_WHITE,KIND(E1_RED)), &
+       INT(E1_WHITE,KIND(E1_RED)), INT(E1_BLACK,KIND(E1_RED)), &
+       INT(E1_GREEN,KIND(E1_RED)), INT(E1_BLUE,KIND(E1_RED)), &
+       INT(E1_RED,KIND(E1_RED)), INT(E1_RED,KIND(E1_RED)), INT(E1_BLUE,KIND(E1_RED)), &
+       INT(E1_GREEN,KIND(E1_RED)), INT(E1_BLACK,KIND(E1_RED)), INT(E1_WHITE,KIND(E1_RED)),&
+       INT(E1_RED,KIND(E1_RED)), INT(E1_WHITE,KIND(E1_RED)), &
+       INT(0,KIND(E1_RED)), INT(-1,KIND(E1_RED)), INT(-2,KIND(E1_RED))/)
+
+  ! Reading array for enum data
+  INTEGER(KIND(E1_RED)), DIMENSION(1:20), TARGET :: data2
+
+  ! Reading array's for converted enum data
+  INTEGER(C_SHORT), DIMENSION(1:20), TARGET :: data_short
+  INTEGER(C_INT), DIMENSION(1:20), TARGET :: data_int
+  REAL(C_DOUBLE), DIMENSION(1:20), TARGET :: data_double
+
+  INTEGER(int_kind_8), DIMENSION(1:20), TARGET :: data_i8
+  INTEGER(int_kind_16), DIMENSION(1:20), TARGET :: data_i16
+  REAL(real_kind_7), DIMENSION(1:20), TARGET :: data_r7
+
+  INTEGER(hsize_t), DIMENSION(1:1) :: ds_size = (/20/)
+  INTEGER(size_t) :: i
+  INTEGER(hsize_t) :: ih
+  INTEGER :: error
+  TYPE(C_PTR) :: f_ptr
+  INTEGER(HID_T) :: m_baset  ! Memory base type
+  !
+  ! Create a new file using the default properties.
+  !
+  CALL h5fcreate_f("enum1.h5", H5F_ACC_TRUNC_F, file, error)
+  CALL check("h5fcreate_f", error, total_error)
+  !
+  ! Create a new group using the default properties.
+  !
+  CALL h5gcreate_f(file, "test_conv", cwg, error)
+  CALL check("h5gcreate_f",error, total_error)
+  !
+  ! Create a enum type
+  !
+  CALL H5Tcreate_f(H5T_ENUM_F, H5OFFSETOF(C_LOC(data1(1)), C_LOC(data1(2))), dtype, error)
+  CALL check("h5tcreate_f",error, total_error)
+  !
+  ! Initialize enum data.
+  !
+
+  val = E1_RED
+  CALL H5Tenum_insert_f(dtype, "RED", C_LOC(val), error)
+  CALL check("h5tenum_insert_f",error, total_error)
+  val = E1_GREEN
+  f_ptr = C_LOC(val)
+  CALL H5Tenum_insert_f(dtype, "GREEN", f_ptr, error)
+  CALL check("h5tenum_insert_f",error, total_error)
+  val = E1_BLUE
+  f_ptr = C_LOC(val)
+  CALL H5Tenum_insert_f(dtype, "BLUE", f_ptr, error)
+  CALL check("h5tenum_insert_f",error, total_error)
+  val = E1_WHITE
+  f_ptr = C_LOC(val)
+  CALL H5Tenum_insert_f(dtype, "WHITE", f_ptr, error)
+  CALL check("h5tenum_insert_f",error, total_error)
+  val = E1_BLACK
+  f_ptr = C_LOC(val)
+  CALL H5Tenum_insert_f(dtype, "BLACK", f_ptr, error)
+  CALL check("h5tenum_insert_f",error, total_error)
+  !
+  ! Create dataspace.  Setting maximum size to be the current size.
+  !
+  CALL h5screate_simple_f(1, ds_size, space, error)
+  CALL check("h5screate_simple_f", error, total_error)
+
+  ! ***************************************
+  ! * Dataset of enumeration type
+  ! ***************************************
+  !
+  ! Create a dataset of enum type and write enum data to it
+
+  CALL h5dcreate_f(cwg, "color_table1", dtype, space, dset, error)
+  CALL check("h5dcreate_f", error, total_error)
+
+  f_ptr = C_LOC(data1(1))
+  CALL h5dwrite_f(dset, dtype, f_ptr, error, space, space)
+  CALL check(" h5dwrite_f", error, total_error)
+
+  ! Test reading back the data with no conversion
+
+  f_ptr = C_LOC(data2(1))
+  CALL h5dread_f(dset, dtype, f_ptr, error, space, space)
+  CALL check(" h5dread_f", error, total_error)
+
+  ! Check values
+  DO ih = 1, ds_size(1)
+     IF(data1(ih) .NE. data2(ih))THEN
+        total_error = total_error + 1
+        WRITE(*,'("    1. data1(",I0,")=",I0," .NE. data2(",I0,")=",I0)') ih, data1(ih),i,data2(ih)
+        EXIT
+     ENDIF
+  ENDDO
+
+  ! Test converting the data to integer (KIND=C_SHORT). Read enum data back as integer
+  m_baset = h5kind_to_type(KIND(data_short(1)), H5_INTEGER_KIND) ! Memory base type
+  f_ptr = C_LOC(data_short(1))
+  CALL h5dread_f(dset, m_baset, f_ptr, error, space, space)
+  CALL check("h5dread_f", error, total_error)
+  ! Check values
+  DO ih = 1, ds_size(1)
+     IF(data1(ih) .NE. data_short(ih))THEN
+        total_error = total_error + 1
+        WRITE(*,'("    2. data1(",I0,")=",I0," .NE. data_short(",I0,")=",I0)') ih, data1(ih),i,data_short(ih)
+        EXIT
+     ENDIF
+  ENDDO
+
+  ! Test converting the data to (KIND=C_double) number.
+  ! Read enum data back as (KIND=C_double) number
+
+  m_baset = h5kind_to_type(KIND(data_double(1)), H5_REAL_KIND) ! Memory base type
+  f_ptr = C_LOC(data_double(1))
+  CALL h5dread_f(dset,  m_baset, f_ptr, error, space, space)
+  CALL check("h5dread_f", error, total_error)
+  ! Check values
+  DO ih = 1, ds_size(1)
+     IF(data1(ih) .NE. INT(data_double(ih)))THEN
+        total_error = total_error + 1
+        WRITE(*,'("    3. data_double(",I0,")=",I0," .NE. data_double(",I0,")=",I0)') &
+             ih, INT(data1(ih)), ih, INT(data_double(ih))
+        EXIT
+     ENDIF
+  ENDDO
+
+  ! Test converting the data to (SELECTED_INT_KIND(9)) number.
+  ! Read enum data back as (SELECTED_INT_KIND(9)) number
+
+  m_baset = h5kind_to_type(int_kind_8, H5_INTEGER_KIND) ! Memory base type
+  f_ptr = C_LOC(data_i8(1))
+  CALL h5dread_f(dset,  m_baset, f_ptr, error, space, space)
+  CALL check("h5dread_f", error, total_error)
+  ! Check values
+  DO ih = 1, ds_size(1)
+     IF(data1(ih) .NE. INT(data_i8(ih)))THEN
+        total_error = total_error + 1
+        WRITE(*,'("    4. data_i8(",I0,")=",I0," .NE. data_i8(",I0,")=",I0)') &
+             ih, INT(data1(ih)), i, INT(data_i8(ih))
+        EXIT
+     ENDIF
+  ENDDO
+
+  ! Test converting the data to (SELECTED_INT_KIND(18)) number.
+  ! Read enum data back as (SELECTED_INT_KIND(18)) number
+
+  m_baset = h5kind_to_type(int_kind_16, H5_INTEGER_KIND) ! Memory base type
+  f_ptr = C_LOC(data_i16(1))
+  CALL h5dread_f(dset,  m_baset, f_ptr, error, space, space)
+  CALL check("h5dread_f", error, total_error)
+  ! Check values
+  DO ih = 1, ds_size(1)
+     IF(data1(ih) .NE. INT(data_i16(ih)))THEN
+        total_error = total_error + 1
+        WRITE(*,'("    5. data_i16(",I0,")=",I0," .NE. data_i16(",I0,")=",I0)') &
+             ih, INT(data1(ih)), i, INT(data_i16(ih))
+        EXIT
+     ENDIF
+  ENDDO
+
+  ! Test converting the data to C_FLOAT number.
+  ! Read enum data back as C_FLOAT number
+
+  m_baset = h5kind_to_type(KIND(data_r7(1)), H5_REAL_KIND) ! Memory base type
+  f_ptr = C_LOC(data_r7(1))
+  CALL h5dread_f(dset,  m_baset, f_ptr, error, space, space)
+  CALL check("h5dread_f", error, total_error)
+  ! Check values
+  DO ih = 1, ds_size(1)
+     IF(data1(ih) .NE. INT(data_r7(ih)))THEN
+        total_error = total_error + 1
+        WRITE(*,'("    6. data_r7(",I0,")=",I0," .NE. data_r7(",I0,")=",I0)') &
+             ih, INT(data1(ih)), i, INT(data_r7(ih))
+        EXIT
+     ENDIF
+  ENDDO
+
+  CALL h5dclose_f(dset, error)
+  CALL check("h5dclose_f", error, total_error)
+
+  ! ***************************************
+  ! *    Dataset of C_int type
+  ! ***************************************
+
+  ! Create a integer dataset of KIND=C_INT and write enum data to it
+  m_baset = h5kind_to_type(KIND(data_int(1)), H5_INTEGER_KIND) ! Memory base type
+  CALL h5dcreate_f(cwg, "color_table2", m_baset, space, dset, error)
+  CALL check("h5dcreate_f", error, total_error)
+
+  ! Write the enum data
+  f_ptr = C_LOC(data1(1))
+  CALL h5dwrite_f(dset, dtype, f_ptr, error, space, space)
+  CALL check("h5dwrite_f", error, total_error)
+
+  ! Test reading back the data with no conversion
+  f_ptr = C_LOC(data_int(1))
+  CALL h5dread_f(dset, m_baset, f_ptr, error, space, space)
+  CALL check("h5dread_f", error, total_error)
+
+  DO ih = 1, ds_size(1)
+     IF(data1(ih) .NE. data_int(ih))THEN
+        total_error = total_error + 1
+        WRITE(*,'("    7. data1(",I0,")=",I0," .NE. data_int(",I0,")=",I0)') ih, data1(ih),i,data_int(ih)
+        EXIT
+     ENDIF
+  ENDDO
+  CALL h5dclose_f(dset, error)
+  CALL check("h5dclose_f", error, total_error)
+
+  !**************************************
+  !*    Dataset of C_double type
+  !**************************************
+
+  ! Create a dataset of KIND=C_DOUBLE and write enum data to it
+  m_baset = h5kind_to_type(KIND(data_double(1)), H5_REAL_KIND) ! Memory base type
+  CALL h5dcreate_f(cwg, "color_table3", m_baset, space, dset,  error)
+  CALL check("h5dcreate_f", error, total_error)
+
+  f_ptr = C_LOC(data1(1))
+  CALL h5dwrite_f(dset, dtype, f_ptr, error, space, space)
+  CALL check("h5dwrite_f", error, total_error)
+
+  ! Test reading back the data with no conversion
+  f_ptr = C_LOC(data_double(1))
+  CALL h5dread_f(dset, m_baset, f_ptr, error, space, space)
+  CALL check("h5dread_f", error, total_error)
+
+  DO ih = 1, ds_size(1)
+     IF(data1(ih) .NE. INT(data_double(ih)))THEN
+        total_error = total_error + 1
+        WRITE(*,'("    8. data1(",I0,")=",I0," .NE. data_double(",I0,")=",I0)') ih, data1(ih),ih,INT(data_double(ih))
+        EXIT
+     ENDIF
+  ENDDO
+  CALL h5dclose_f(dset, error)
+  CALL check("h5dclose_f", error, total_error)
+
+  !*********************************************************
+  !* Dataset of real C_FLOAT type
+  !*********************************************************
+
+  ! Create a dataset of C_FLOAT and write enum data to it
+  m_baset = h5kind_to_type(KIND(data_r7(1)), H5_REAL_KIND) ! Memory base type
+  CALL h5dcreate_f(cwg, "color_table4", m_baset, space, dset,  error)
+  CALL check("h5dcreate_f", error, total_error)
+
+  f_ptr = C_LOC(data1(1))
+  CALL h5dwrite_f(dset, dtype, f_ptr, error, space, space)
+  CALL check("h5dwrite_f", error, total_error)
+
+  ! Test reading back the data with no conversion
+  f_ptr = C_LOC(data_r7(1))
+  CALL h5dread_f(dset, m_baset, f_ptr, error, space, space)
+  CALL check("h5dread_f", error, total_error)
+
+  DO ih = 1, ds_size(1)
+     IF(data1(ih) .NE. INT(data_r7(ih)))THEN
+        total_error = total_error + 1
+        WRITE(*,'("    9. data1(",I0,")=",I0," .NE. data_r7(",I0,")=",I0)') ih, data1(ih),ih,INT(data_r7(ih))
+        EXIT
+     ENDIF
+  ENDDO
+  CALL h5dclose_f(dset, error)
+  CALL check("h5dclose_f", error, total_error)
+
+  ! *****************************************************************
+  ! * Dataset of integer SELECTED_INT_KIND(18) type
+  ! *****************************************************************
+
+  ! Create a integer dataset of (SELECTED_INT_KIND(18)) and write enum data to it
+  m_baset = h5kind_to_type(KIND(data_i16(1)), H5_INTEGER_KIND) ! Memory base type
+  CALL h5dcreate_f(cwg, "color_table5", m_baset, space, dset, error)
+  CALL check("h5dcreate_f", error, total_error)
+
+  ! Write the enum data
+  f_ptr = C_LOC(data1(1))
+  CALL h5dwrite_f(dset, dtype, f_ptr, error, space, space)
+  CALL check("h5dwrite_f", error, total_error)
+
+  ! Test reading back the data with no conversion
+  f_ptr = C_LOC(data_i16(1))
+  CALL h5dread_f(dset, m_baset, f_ptr, error, space, space)
+  CALL check("h5dread_f", error, total_error)
+
+  DO ih = 1, ds_size(1)
+     IF(data1(ih) .NE. data_i16(ih))THEN
+        total_error = total_error + 1
+        WRITE(*,'("    10. data1(",I0,")=",I0," .NE. data_i16(",I0,")=",I0)') ih, data1(ih),ih,data_i16(ih)
+        EXIT
+     ENDIF
+  ENDDO
+  CALL h5dclose_f(dset, error)
+  CALL check("h5dclose_f", error, total_error)
+
+  !
+  ! Close and release resources.
+  !
+  CALL h5sclose_f(space, error)
+  CALL check("H5Sclose_f", error, total_error)
+  CALL h5tclose_f(dtype, error)
+  CALL check("H5Tclose_f", error, total_error)
+  CALL h5gclose_f(cwg, error)
+  CALL check("h5gclose_f",error, total_error)
+  CALL h5fclose_f(file, error)
+  CALL check("H5Fclose_f", error, total_error)
+
+END SUBROUTINE t_enum_conv
+
+! Tests the reading and writing of multiple datasets using H5Dread_multi and
+! H5Dwrite_multi
+	 
+SUBROUTINE multiple_dset_rw(total_error)
+	 
+!-------------------------------------------------------------------------
+! Subroutine: multiple_dset_rw
+!
+! Purpose:  Tests the reading and writing of multiple datasets 
+!           using H5Dread_multi and H5Dwrite_multi
+!
+! Return: Success:      0
+!         Failure:      number of errors
+!
+! Programmer:  M. Scot Breitenfeld
+!              April 2, 2014
+!
+!-------------------------------------------------------------------------
+!
+  USE iso_c_binding
+  USE hdf5
+  IMPLICIT NONE
+  
+  INTEGER, INTENT(INOUT) :: total_error   ! number of errors
+  INTEGER :: error                        ! HDF hdferror flag
+  
+  INTEGER(SIZE_T), PARAMETER :: ndset = 5 ! Number of data sets
+  INTEGER(HID_T), DIMENSION(:), ALLOCATABLE :: dset_id
+  INTEGER(HID_T), DIMENSION(:), ALLOCATABLE :: mem_type_id
+  INTEGER(HID_T), DIMENSION(:), ALLOCATABLE :: mem_space_id
+  INTEGER(HID_T), DIMENSION(:), ALLOCATABLE :: file_space_id
+
+  INTEGER, PARAMETER :: idim=10, idim2=5, idim3=3 ! size of integer array
+  INTEGER, PARAMETER :: rdim=5  ! size of real array
+  INTEGER, PARAMETER :: cdim=3  ! size of character array
+  INTEGER, PARAMETER :: sdim=2  ! length of character string
+  INTEGER, PARAMETER :: ddim=2  ! size of derived type array
+  INTEGER  :: i,j,k
+  
+  TYPE(C_PTR), ALLOCATABLE, DIMENSION(:) :: buf_md ! array to hold the multi-datasets
+  
+  INTEGER, DIMENSION(1:idim), TARGET :: wbuf_int             ! integer write buffer
+  INTEGER, DIMENSION(1:idim,idim2,idim3), TARGET :: wbuf_intmd
+  REAL, DIMENSION(1:rdim), TARGET :: wbuf_real               ! real write buffer
+  CHARACTER(LEN=sdim), DIMENSION(1:cdim), TARGET :: wbuf_chr ! character write buffer
+  INTEGER, DIMENSION(1:idim), TARGET :: rbuf_int             ! integer read buffer
+  INTEGER, DIMENSION(1:idim,idim2,idim3), TARGET :: rbuf_intmd ! integer read buffer
+  REAL, DIMENSION(1:rdim), TARGET :: rbuf_real               ! real read buffer
+  CHARACTER(LEN=sdim), DIMENSION(1:cdim), TARGET :: rbuf_chr ! character read buffer
+
+  TYPE derived
+     REAL :: r
+     INTEGER :: i
+     CHARACTER(LEN=sdim) :: c
+  END TYPE derived
+
+  TYPE(derived), DIMENSION(1:ddim), TARGET :: wbuf_derived ! derived type write buffer
+  TYPE(derived), DIMENSION(1:ddim), TARGET :: rbuf_derived ! derived type read buffer
+  INTEGER(HSIZE_T), DIMENSION(1:1) :: dims ! dimension of the spaces
+  INTEGER(HSIZE_T), DIMENSION(1:3) :: dimsmd ! dimension of the spaces
+  INTEGER(HID_T) :: file_id, strtype ! handles
+  INTEGER(SIZE_T) :: obj_count
+
+  ALLOCATE(buf_md(1:ndset),stat=error)
+  IF (error .NE. 0) THEN
+     WRITE(*,*) 'allocate error'
+     total_error = total_error + 1
+     RETURN
+  ENDIF
+  ALLOCATE(dset_id(1:ndset),stat=error)
+  IF (error .NE. 0) THEN
+     WRITE(*,*) 'allocate error'
+     total_error = total_error + 1
+     RETURN
+  ENDIF
+  ALLOCATE(mem_type_id(1:ndset),stat=error)
+  IF (error .NE. 0) THEN
+     WRITE(*,*) 'allocate error'
+     total_error = total_error + 1
+     RETURN
+  ENDIF
+  ALLOCATE(mem_space_id(1:ndset),stat=error)
+  IF (error .NE. 0) THEN
+     WRITE(*,*) 'allocate error'
+     total_error = total_error + 1
+     RETURN
+  ENDIF
+  ALLOCATE(file_space_id(1:ndset),stat=error)
+  IF (error .NE. 0) THEN
+     WRITE(*,*) 'allocate error'
+     total_error = total_error + 1
+     RETURN
+  ENDIF
+
+  CALL h5fcreate_f("multidset_rw.h5", H5F_ACC_TRUNC_F, file_id, error)
+  CALL check("h5fcreate_f", error, total_error)
+  !
+  ! Create real dataset
+  !
+  wbuf_real(1:rdim) = (/(i,i=1,rdim)/)
+  dims(1) = rdim
+  buf_md(1) = C_LOC(wbuf_real(1))
+  mem_type_id(1) = H5T_NATIVE_REAL
+  CALL h5screate_simple_f(1, dims, file_space_id(1), error)
+  CALL check("h5screate_simple_f", error, total_error)
+  CALL h5dcreate_f(file_id, "ds real", mem_type_id(1), file_space_id(1), dset_id(1), error)
+  CALL check("h5dcreate_f", error, total_error)
+  mem_space_id(1) = file_space_id(1)
+
+  ! Create integer dataset (1D)
+  wbuf_int(1:idim) = (/(i,i=1,idim)/)
+  dims(1) = idim
+  buf_md(2) = C_LOC(wbuf_int(1))
+  mem_type_id(2) = H5T_NATIVE_INTEGER
+  CALL h5screate_simple_f(1, dims, file_space_id(2), error)
+  CALL check("h5screate_simple_f", error, total_error)
+  CALL h5dcreate_f(file_id, "ds int", mem_type_id(2), file_space_id(2), dset_id(2), error)
+  CALL check("h5dcreate_f", error, total_error)
+  mem_space_id(2) = file_space_id(2)
+
+  ! Create character dataset
+  wbuf_chr(1:cdim) = (/'ab','cd','ef'/)
+  dims(1) = cdim
+  buf_md(3) = C_LOC(wbuf_chr(1)(1:1))
+  CALL H5Tcopy_f(H5T_FORTRAN_S1, mem_type_id(3), error)
+  CALL check("H5Tcopy_f", error, total_error)
+  CALL H5Tset_size_f(mem_type_id(3), INT(sdim,SIZE_T), error)
+  CALL check("H5Tset_size_f", error, total_error)
+  CALL h5screate_simple_f(1, dims, file_space_id(3), error)
+  CALL check("h5screate_simple_f", error, total_error)
+  CALL h5dcreate_f(file_id, "ds chr", mem_type_id(3), file_space_id(3), dset_id(3), error)
+  CALL check("h5dcreate_f", error, total_error)
+  mem_space_id(3) = file_space_id(3)
+
+  ! Create derived type dataset
+  wbuf_derived(1:ddim)%r = (/10.,20./)
+  wbuf_derived(1:ddim)%i = (/30,40/)
+  wbuf_derived(1:ddim)%c = (/'wx','yz'/)
+  buf_md(4) = C_LOC(wbuf_derived(1)%r)
+  CALL h5tcreate_f(H5T_COMPOUND_F, H5OFFSETOF(C_LOC(wbuf_derived(1)), C_LOC(wbuf_derived(2))), mem_type_id(4), error)
+  CALL check("h5tcreate_f", error, total_error)
+  CALL h5tinsert_f(mem_type_id(4), "real", &
+       H5OFFSETOF(C_LOC(wbuf_derived(1)),C_LOC(wbuf_derived(1)%r)), H5T_NATIVE_REAL, error)
+  CALL check("h5tinsert_f", error, total_error)
+  CALL h5tinsert_f(mem_type_id(4), "int", &
+       H5OFFSETOF(C_LOC(wbuf_derived(1)),C_LOC(wbuf_derived(1)%i)), H5T_NATIVE_INTEGER, error)
+  CALL check("h5tinsert_f", error, total_error)
+  CALL h5tcopy_f(H5T_NATIVE_CHARACTER, strtype, error)
+  CALL check("h5tcopy_f", error, total_error)
+  CALL h5tset_size_f(strtype, INT(sdim,size_t), error)  
+  CALL check("h5tset_size_f", error, total_error)
+  CALL h5tinsert_f(mem_type_id(4), "chr", &
+       H5OFFSETOF(C_LOC(wbuf_derived(1)),C_LOC(wbuf_derived(1)%c(1:1))), strtype, error)
+  CALL check("h5tinsert_f", error, total_error)
+
+  dims(1) = ddim
+  CALL h5screate_simple_f(1, dims, file_space_id(4), error)
+  CALL check("h5screate_simple_f", error, total_error)
+  CALL h5dcreate_f(file_id, "ds derived", mem_type_id(4), file_space_id(4), dset_id(4), error)
+  CALL check("h5dcreate_f", error, total_error)
+  mem_space_id(4) = file_space_id(4)
+
+
+  ! Create integer dataset (3D)
+
+  DO i = 1, idim
+     DO j = 1, idim2
+        DO k = 1, idim3
+           wbuf_intmd(i,j,k) = i*j
+        ENDDO
+     ENDDO
+  ENDDO
+
+  dimsmd(1:3) = (/idim,idim2,idim3/)
+  buf_md(5) = C_LOC(wbuf_intmd(1,1,1))
+  mem_type_id(5) = H5T_NATIVE_INTEGER
+  CALL h5screate_simple_f(3, dimsmd, file_space_id(5), error)
+  CALL check("h5screate_simple_f", error, total_error)
+  CALL h5dcreate_f(file_id, "ds int 3d", mem_type_id(5), file_space_id(5), dset_id(5), error)
+  CALL check("h5dcreate_f", error, total_error)
+  mem_space_id(5) = file_space_id(5)
+
+  ! write all the datasets
+  CALL h5dwrite_multi_f(ndset, dset_id, mem_type_id, mem_space_id, file_space_id, buf_md, error)
+  CALL check("h5dwrite_multi_f", error, total_error)
+
+  ! point to read buffers
+
+  buf_md(1) = C_LOC(rbuf_real(1))
+  buf_md(2) = C_LOC(rbuf_int(1))
+  buf_md(3) = C_LOC(rbuf_chr(1)(1:1))
+  buf_md(4) = C_LOC(rbuf_derived(1)%r)
+  buf_md(5) = C_LOC(rbuf_intmd(1,1,1))
+
+  ! read all the datasets
+  CALL h5dread_multi_f(ndset, dset_id, mem_type_id, mem_space_id, file_space_id, buf_md, error)
+  CALL check("h5dread_multi_f", error, total_error)
+
+  ! check the written and read in values
+  DO i = 1, rdim
+     IF(rbuf_real(i).NE.wbuf_real(i))THEN
+        total_error = total_error + 1
+     END IF
+  END DO
+  DO i = 1, idim
+     IF(rbuf_int(i).NE.wbuf_int(i))THEN
+        total_error = total_error + 1
+     END IF
+  END DO
+  DO i = 1, cdim
+     IF(rbuf_chr(i).NE.wbuf_chr(i))THEN
+        total_error = total_error + 1
+     END IF
+  END DO
+  DO i = 1, ddim
+     IF(rbuf_derived(i)%r.NE.wbuf_derived(i)%r)THEN
+        total_error = total_error + 1
+     END IF
+     IF(rbuf_derived(i)%i.NE.wbuf_derived(i)%i)THEN
+        total_error = total_error + 1
+     END IF
+     IF(rbuf_derived(i)%c.NE.wbuf_derived(i)%c)THEN
+        total_error = total_error + 1
+     END IF
+  END DO
+  DO i = 1, idim
+     DO j = 1, idim2
+        DO k = 1, idim3
+           IF(rbuf_intmd(i,j,k).NE.wbuf_intmd(i,j,k))THEN
+              total_error = total_error + 1
+           END IF
+        END DO
+     ENDDO
+  ENDDO
+
+  DO i = 1, ndset
+     CALL H5Dclose_f(dset_id(i), error)
+     CALL check("H5Dclose_f", error, total_error)
+     CALL H5Sclose_f(file_space_id(i), error)
+     CALL check("H5Sclose_f", error, total_error)
+  ENDDO
+  CALL H5Tclose_f(mem_type_id(4), error)
+  CALL check("H5Tclose_f", error, total_error)
+
+  CALL h5fget_obj_count_f(file_id, H5F_OBJ_ALL_F, obj_count, error)
+  IF(obj_count.NE.1)THEN
+     total_error = total_error + 1
+  END IF
+
+  CALL H5Fclose_f(file_id, error)
+
+END SUBROUTINE multiple_dset_rw
+
+
+END MODULE TH5T_F03
diff --git a/fortran/test/tH5T_F03.f90 b/fortran/test/tH5T_F03.f90
deleted file mode 100644
index 32531b0..0000000
--- a/fortran/test/tH5T_F03.f90
+++ /dev/null
@@ -1,3453 +0,0 @@
-!****h* root/fortran/test/tH5T_F03.f90
-!
-! NAME
-!  tH5T_F03.f90
-!
-! FUNCTION
-!  Test FORTRAN HDF5 H5T APIs which are dependent on FORTRAN 2003
-!  features. 
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-!
-! CONTAINS SUBROUTINES
-!  test_array_compound_atomic, test_array_compound_array,
-!  test_array_bkg, test_h5kind_to_type
-!
-!*****
-
-! *****************************************
-! ***        H 5 T   T E S T S
-! *****************************************
-
-!***************************************************************
-!**
-!**  test_array_compound_atomic(): Test basic array datatype code.
-!**  Tests 1-D array of compound datatypes (with no array fields)
-!**
-!***************************************************************
-!
-
-MODULE TH5T_F03
-
-  USE HDF5 
-  USE ISO_C_BINDING
-
-CONTAINS
-
-SUBROUTINE test_array_compound_atomic(total_error)
-
-  USE HDF5 
-  USE TH5_MISC
-  USE ISO_C_BINDING
-  IMPLICIT NONE
-
-  INTEGER, INTENT(INOUT) :: total_error
-  ! 1-D dataset WITH fixed dimensions 
-  INTEGER, PARAMETER :: SPACE1_RANK = 1
-  INTEGER, PARAMETER :: SPACE1_DIM1 = 4
-  ! 1-D array datatype 
-  INTEGER, PARAMETER :: ARRAY1_RANK= 1
-  INTEGER, PARAMETER :: ARRAY1_DIM1= 4
-  CHARACTER(LEN=10), PARAMETER :: FILENAME = "tarray1.h5"
-
-  TYPE s1_t
-     INTEGER :: i
-     REAL :: f
-  END TYPE s1_t
-  TYPE(s1_t), DIMENSION(:,:), ALLOCATABLE, TARGET :: wdata !  Information to write 
-  TYPE(s1_t), DIMENSION(:,:), ALLOCATABLE, TARGET :: rdata !  Information read in 
-  INTEGER(hid_t) :: fid1       ! HDF5 File IDs		
-  INTEGER(hid_t) :: dataset    ! Dataset ID			
-  INTEGER(hid_t) :: sid1       ! Dataspace ID			
-  INTEGER(hid_t) :: tid1       ! Array Datatype ID			
-  INTEGER(hid_t) :: tid2       ! Compound Datatype ID			
-
-  INTEGER(HSIZE_T), DIMENSION(1) :: sdims1 = (/SPACE1_DIM1/)
-  INTEGER(HSIZE_T), DIMENSION(1) :: tdims1=(/ARRAY1_DIM1/)
-  INTEGER :: ndims !  Array rank for reading 
-  INTEGER(HSIZE_T), ALLOCATABLE, DIMENSION(:) :: rdims1 ! Array dimensions for reading 
-  INTEGER(HSIZE_T), ALLOCATABLE, DIMENSION(:) :: rdims ! Array dimensions for reading 
-  INTEGER :: nmemb ! Number of compound members 
-  CHARACTER(LEN=20) :: mname ! Name of compound field 
-  INTEGER(size_t) :: off   ! Offset of compound field 
-  INTEGER(hid_t) :: mtid   ! Datatype ID for field 
-  INTEGER :: i,j      !  counting variables  
-
-  INTEGER :: error    !  Generic RETURN value 
-  INTEGER :: namelen
-  LOGICAL :: flag
-
-  TYPE(C_PTR) :: f_ptr ! Needed to pass the pointer, for g95 compiler to work
-
-  ALLOCATE( wdata(1:SPACE1_DIM1,1:ARRAY1_DIM1) )
-  ALLOCATE( rdata(1:SPACE1_DIM1,1:ARRAY1_DIM1) )
-
-  ! Initialize array data to write 
-  DO i = 1, SPACE1_DIM1
-     DO j = 1, ARRAY1_DIM1
-        wdata(i,j)%i = i * 10 + j
-        wdata(i,j)%f = i * 2.5 + j
-     ENDDO
-  ENDDO
-
-  ! Create file 
-  CALL h5fcreate_f(FILENAME,H5F_ACC_TRUNC_F,fid1,error)
-  CALL check("h5fcreate_f", error, total_error)
-
-  ! Create dataspace for datasets 
-  CALL h5screate_simple_f(SPACE1_RANK, sdims1, sid1, error)
-  CALL check("h5screate_simple_f", error, total_error)
-
-  CALL h5tcreate_f(H5T_COMPOUND_F, H5OFFSETOF(C_LOC(wdata(1,1)), C_LOC(wdata(2,1))), tid2, error)
-  CALL check("h5tcreate_f", error, total_error)
-
-  ! Insert integer field 
-  CALL h5tinsert_f(tid2, "i", H5OFFSETOF(C_LOC(wdata(1,1)),C_LOC(wdata(1,1)%i)), H5T_NATIVE_INTEGER, error)
-  CALL check("h5tinsert_f", error, total_error)
-
-  ! Insert float field 
-
-  CALL h5tinsert_f(tid2, "f", H5OFFSETOF(C_LOC(wdata(1,1)),C_LOC(wdata(1,1)%f)), H5T_NATIVE_REAL, error)
-  CALL check("h5tinsert_f", error, total_error)
-
-  !  Create an array datatype to refer to 
-  CALL h5tarray_create_f(tid2, ARRAY1_RANK, tdims1, tid1, error)
-  CALL check("h5tarray_create_f", error, total_error)
-
-  ! Close compound datatype 
-  CALL h5tclose_f(tid2,error)
-  CALL check("h5tclose_f", error, total_error)
-
-
-  ! Create a dataset 
-  CALL h5dcreate_f(fid1,"Dataset1",tid1, sid1, dataset,error)
-  CALL check("h5dcreate_f", error, total_error)
-
-  ! Write dataset to disk 
-
-  ALLOCATE(rdims(1:2)) ! dummy not needed
-
-  f_ptr = C_LOC(wdata(1,1))
-  CALL h5dwrite_f(dataset, tid1, f_ptr, error )
-  CALL check("h5dwrite_f", error, total_error)
-  ! Close Dataset  
-  CALL h5dclose_f(dataset, error)
-  CALL check("h5dclose_f", error, total_error)
-
-  ! Close datatype 
-  CALL h5tclose_f(tid1,error)
-  CALL check("h5tclose_f", error, total_error)
-
-  ! Close disk dataspace 
-  CALL h5sclose_f(sid1,error)
-  CALL check("h5sclose_f", error, total_error)
-
-  ! Close file 
-  CALL h5fclose_f(fid1,error)
-  CALL check("h5fclose_f", error, total_error)
-
-  ! Re-open file 
-  CALL h5fopen_f (FILENAME, H5F_ACC_RDONLY_F, fid1, error)
-  CALL check("h5fopen_f", error, total_error)
-
-  ! Open the dataset  
-  CALL h5dopen_f(fid1, "Dataset1", dataset, error)
-  CALL check("h5dopen_f", error, total_error)
-
-  ! Get the datatype     
-  CALL h5dget_type_f(dataset, tid1, error)
-  CALL check("h5dget_type_f", error, total_error)
-
-  ! Check the array rank 
-  CALL h5tget_array_ndims_f(tid1, ndims, error)
-  CALL check("h5tget_array_ndims_f", error, total_error)
-  CALL VERIFY("h5tget_array_ndims_f",ndims, ARRAY1_RANK, total_error)
-
-  ! Get the array dimensions 
-  ALLOCATE(rdims1(1:ndims))
-  CALL h5tget_array_dims_f(tid1, rdims1, error)
-  CALL check("h5tget_array_dims_f", error, total_error)
-
-
-  ! Check the array dimensions 
-  DO i = 1, ndims
-     CALL VERIFY("h5tget_array_dims_f", INT(rdims1(i)), INT(tdims1(i)), total_error)
-  ENDDO
-
-  ! Get the compound datatype 
-  CALL h5tget_super_f(tid1, tid2, error)
-  CALL check("h5tget_super_f", error, total_error)
-
-  ! Check the number of members 
-  CALL h5tget_nmembers_f(tid2, nmemb, error)
-  CALL check("h5tget_nmembers_f", error, total_error)
-  CALL VERIFY("h5tget_nmembers_f", nmemb, 2, total_error)
-
-  ! Check the 1st field's name 
-  CALL H5Tget_member_name_f(tid2, 0, mname, namelen,error)
-  CALL check("H5Tget_member_name_f", error, total_error)
-  CALL verifystring("H5Tget_member_name_f",mname(1:namelen),"i", total_error)
-
-  !  Check the 1st field's offset 
-  CALL H5Tget_member_offset_f(tid2, 0, off, error)
-  CALL check("H5Tget_member_offset_f", error, total_error)
-  CALL VERIFY("H5Tget_member_offset_f",INT(off),0, total_error) 
-
-
-  ! Check the 1st field's datatype 
-  CALL H5Tget_member_type_f(tid2, 0, mtid, error)
-  CALL check("H5Tget_member_type_f", error, total_error)
-
-  CALL H5Tequal_f(mtid, H5T_NATIVE_INTEGER, flag, error)
-  CALL check("H5Tequal_f", error, total_error) 
-  CALL VerifyLogical("H5Tequal_f", flag, .TRUE., total_error)
-
-  CALL h5tclose_f(mtid,error)
-  CALL check("h5tclose_f", error, total_error)
-
-  ! Check the 2nd field's name 
-  CALL H5Tget_member_name_f(tid2, 1, mname, namelen,error)
-  CALL check("H5Tget_member_name_f", error, total_error)
-  CALL verifystring("H5Tget_member_name_f",mname(1:namelen),"f", total_error)
-
-  !  Check the 2nd field's offset 
-  CALL H5Tget_member_offset_f(tid2, 1, off, error)
-  CALL check("H5Tget_member_offset_f", error, total_error)
-  CALL VERIFY("H5Tget_member_offset_f",INT(off),INT(H5OFFSETOF(C_LOC(wdata(1,1)),C_LOC(wdata(1,1)%f))), total_error)    
-
-  ! Check the 2nd field's datatype 
-  CALL H5Tget_member_type_f(tid2, 1, mtid, error)
-  CALL check("H5Tget_member_type_f", error, total_error)
-
-  CALL H5Tequal_f(mtid, H5T_NATIVE_REAL, flag, error)
-  CALL check("H5Tequal_f", error, total_error) 
-  CALL VerifyLogical("H5Tequal_f", flag, .TRUE., total_error)
-
-  CALL h5tclose_f(mtid,error)
-  CALL check("h5tclose_f", error, total_error)
-
-  !  Close Compound Datatype 
-  CALL h5tclose_f(tid2, error)
-  CALL check("h5tclose_f", error, total_error)
-
-  ! Read dataset from disk 
-
-  f_ptr = C_LOC(rdata(1,1))
-  CALL H5Dread_f(dataset, tid1, f_ptr, error)
-  CALL check("H5Dread_f", error, total_error)
-
-  ! Compare data read in 
-  DO i = 1, SPACE1_DIM1
-     DO j = 1, ARRAY1_DIM1
-        IF(wdata(i,j)%i.NE.rdata(i,j)%i)THEN
-           PRINT*, 'ERROR: Wrong integer data is read back by H5Dread_f '
-           total_error = total_error + 1
-        ENDIF
-        IF( .NOT.dreal_eq( REAL(wdata(i,j)%f,dp), REAL( rdata(i,j)%f, dp)) ) THEN
-           PRINT*, 'ERROR: Wrong real data is read back by H5Dread_f '
-           total_error = total_error + 1
-        ENDIF
-     ENDDO
-  ENDDO
-
-  ! Close Datatype 
-  CALL h5tclose_f(tid1,error)
-  CALL check("h5tclose_f", error, total_error)
-
-  ! Close Dataset 
-  CALL h5dclose_f(dataset, error)
-  CALL check("h5dclose_f", error, total_error)
-
-  ! Close file 
-  CALL h5fclose_f(fid1,error)
-  CALL check("h5fclose_f", error, total_error)
-
-END SUBROUTINE test_array_compound_atomic
-!!$
-!!$!***************************************************************
-!!$!**
-!!$!**  test_array_compound_array(): Test basic array datatype code.
-!!$!**      Tests 1-D array of compound datatypes (with array fields)
-!!$!**
-!!$!***************************************************************
-!!$
-  SUBROUTINE test_array_compound_array(total_error)
-    
-    USE HDF5 
-    USE TH5_MISC
-    USE ISO_C_BINDING
-    IMPLICIT NONE
-    
-    INTEGER, INTENT(INOUT) :: total_error
-
-    !  1-D array datatype 
-    INTEGER, PARAMETER :: ARRAY1_RANK= 1
-    INTEGER, PARAMETER :: ARRAY1_DIM1= 3
-    INTEGER, PARAMETER :: ARRAY2_DIM1= 5
-
-    INTEGER, PARAMETER :: SPACE1_RANK = 1
-    INTEGER, PARAMETER :: SPACE1_DIM1 = 4
-    CHARACTER(LEN=10), PARAMETER :: FILENAME = "tarray2.h5"
-
-    TYPE st_t_struct !  Typedef for compound datatype 
-       INTEGER :: i
-       REAL, DIMENSION(1:ARRAY2_DIM1) :: f
-       CHARACTER(LEN=2), DIMENSION(1:ARRAY2_DIM1) :: c
-    END TYPE st_t_struct
-    !  Information to write 
-    TYPE(st_t_struct), DIMENSION(1:SPACE1_DIM1,1:ARRAY1_DIM1), TARGET :: wdata
-    !  Information read in 
-    TYPE(st_t_struct), DIMENSION(1:SPACE1_DIM1,1:ARRAY1_DIM1), TARGET :: rdata
-
-
-    INTEGER(hid_t) :: fid1      !  HDF5 File IDs		
-    INTEGER(hid_t) :: dataset   !  Dataset ID			
-    integer(hid_t) :: sid1      !  Dataspace ID			
-    integer(hid_t) :: tid1      !  Array Datatype ID	
-    integer(hid_t) :: tid2      !  Compound Datatype ID	
-    integer(hid_t) :: tid3      !  Nested Array Datatype ID	
-    integer(hid_t) :: tid4      !  Nested Array Datatype ID	
-
-    INTEGER(HSIZE_T), DIMENSION(1) :: sdims1 = (/SPACE1_DIM1/)
-    INTEGER(HSIZE_T), DIMENSION(1) :: tdims1=(/ARRAY1_DIM1/)
-    INTEGER(HSIZE_T), DIMENSION(1) :: tdims2=(/ARRAY2_DIM1/)
-
-    INTEGER  ndims      ! Array rank for reading 
-
-    INTEGER(HSIZE_T), ALLOCATABLE, DIMENSION(:) :: rdims1 ! Array dimensions for reading 
-
-    INTEGER :: nmemb ! Number of compound members 
-    CHARACTER(LEN=20) :: mname ! Name of compound field 
-    INTEGER(size_t) :: off   ! Offset of compound field 
-    INTEGER(hid_t) :: mtid   ! Datatype ID for field  
-    INTEGER(hid_t) :: mtid2   ! Datatype ID for field  
-
-    INTEGER :: mclass     !  Datatype class for field 
-    INTEGER :: i,j,k      ! counting variables 
-
-    INTEGER :: error
-    CHARACTER(LEN=2) :: ichr2
-    INTEGER :: namelen
-    LOGICAL :: flag 
-    INTEGER(HID_T) :: atype_id       !String Attribute Datatype identifier
-    INTEGER(SIZE_T) :: attrlen    ! Length of the attribute string 
-
-    TYPE(c_ptr) :: f_ptr
-
-    !  Initialize array data to write 
-    DO i = 1, SPACE1_DIM1
-       DO j = 1, array1_DIM1
-          wdata(i,j)%i = i*10+j
-          DO k = 1, ARRAY2_DIM1
-             wdata(i,j)%f(k) = 10*i+j+.5
-             WRITE(ichr2,'(I2.2)') k
-             wdata(i,j)%c(k) = ichr2
-          ENDDO
-       ENDDO
-    ENDDO
-
-    !  Create file 
-    CALL h5fcreate_f(FILENAME,H5F_ACC_TRUNC_F,fid1,error)
-    CALL check("h5fcreate_f", error, total_error)   
-
-
-    !  Create dataspace for datasets 
-    CALL h5screate_simple_f(SPACE1_RANK, sdims1, sid1, error)
-    CALL check("h5screate_simple_f", error, total_error)
-
-    !  Create a compound datatype to refer to 
-    !
-    CALL h5tcreate_f(H5T_COMPOUND_F,  H5OFFSETOF(C_LOC(wdata(1,1)), C_LOC(wdata(2,1))), tid2, error)
-    CALL check("h5tcreate_f", error, total_error)
-
-    ! Insert integer field 
-    CALL h5tinsert_f(tid2, "i", H5OFFSETOF(C_LOC(wdata(1,1)),C_LOC(wdata(1,1)%i)), H5T_NATIVE_INTEGER, error)
-    CALL check("h5tinsert_f", error, total_error)
-
-    ! Create an array of floats datatype 
-    CALL h5tarray_create_f(H5T_NATIVE_REAL, ARRAY1_RANK, tdims2, tid3, error)
-    CALL check("h5tarray_create_f", error, total_error)
-    ! Insert float array field 
-
-    CALL h5tinsert_f(tid2, "f", H5OFFSETOF(C_LOC(wdata(1,1)),C_LOC(wdata(1,1)%f)), tid3, error)
-    CALL check("h5tinsert_f", error, total_error)
-
-    !
-    ! Create datatype for the String attribute.
-    !
-    CALL h5tcopy_f(H5T_NATIVE_CHARACTER, atype_id, error)
-    CALL check("h5tcopy_f",error,total_error)
- 
-    attrlen = LEN(wdata(1,1)%c(1)) 
-    CALL h5tset_size_f(atype_id, attrlen, error)
-    CALL check("h5tset_size_f",error,total_error)    
-
-    ! Create an array of character datatype 
-    CALL h5tarray_create_f(atype_id, ARRAY1_RANK, tdims2, tid4, error)
-    CALL check("h5tarray_create_f", error, total_error)
-
-    ! Insert character array field 
-    CALL h5tinsert_f(tid2, "c", H5OFFSETOF(C_LOC(wdata(1,1)),C_LOC(wdata(1,1)%c(1)(1:1))), tid4, error)
-    CALL check("h5tinsert2_f", error, total_error)
-
-    !  Close array of floats field datatype 
-    CALL h5tclose_f(tid3,error)
-    CALL check("h5tclose_f", error, total_error)
-
-    CALL h5tclose_f(tid4,error)
-    CALL check("h5tclose_f", error, total_error)
-
-    ! Create an array datatype to refer to 
-    CALL h5tarray_create_f(tid2, ARRAY1_RANK, tdims1, tid1, error)
-    CALL check("h5tarray_create_f", error, total_error)
-
-    ! Close compound datatype 
-    CALL h5tclose_f(tid2,error)
-    CALL check("h5tclose_f", error, total_error)
-
-    !  Create a dataset 
-    CALL h5dcreate_f(fid1,"Dataset1",tid1, sid1, dataset,error)
-    CALL check("h5dcreate_f", error, total_error)
-
-
-    ! Write dataset to disk 
-    f_ptr = C_LOC(wdata(1,1))
-    CALL h5dwrite_f(dataset, tid1, f_ptr, error )
-    CALL check("h5dwrite_f", error, total_error)
-
-    ! Close Dataset 
-    CALL h5dclose_f(dataset, error)
-    CALL check("h5dclose_f", error, total_error)
-
-    !  Close datatype 
-    CALL h5tclose_f(tid1,error)
-    CALL check("h5tclose_f", error, total_error)
-
-    ! Close disk dataspace 
-    CALL h5sclose_f(sid1,error)
-    CALL check("h5sclose_f", error, total_error)
-
-    ! Close file 
-    CALL h5fclose_f(fid1,error)
-    CALL check("h5fclose_f", error, total_error)
-
-    !  Re-open file 
-    CALL h5fopen_f (FILENAME, H5F_ACC_RDONLY_F, fid1, error)
-    CALL check("h5fopen_f", error, total_error)
-
-    ! Open the dataset 
-
-    CALL h5dopen_f(fid1, "Dataset1", dataset, error)
-    CALL check("h5dopen_f", error, total_error)
-    
-    !  Get the datatype 
-    CALL h5dget_type_f(dataset, tid1, error)
-    CALL check("h5dget_type_f", error, total_error)
-
-    !  Check the array rank 
-    CALL h5tget_array_ndims_f(tid1, ndims, error)
-    CALL check("h5tget_array_ndims_f", error, total_error)
-    CALL VERIFY("h5tget_array_ndims_f",ndims, ARRAY1_RANK, total_error)
-
-
-    ! Get the array dimensions 
-    ALLOCATE(rdims1(1:ndims))
-    CALL h5tget_array_dims_f(tid1, rdims1, error)
-    CALL check("h5tget_array_dims_f", error, total_error)
-
-    !  Check the array dimensions 
-    DO i = 1, ndims
-       CALL VERIFY("h5tget_array_dims_f", INT(rdims1(i)), INT(tdims1(i)), total_error)
-    ENDDO
-
-    !  Get the compound datatype 
-    CALL h5tget_super_f(tid1, tid2, error)
-    CALL check("h5tget_super_f", error, total_error)
-
-    !  Check the number of members 
-    CALL h5tget_nmembers_f(tid2, nmemb, error)
-    CALL check("h5tget_nmembers_f", error, total_error)
-    CALL VERIFY("h5tget_nmembers_f", nmemb, 3, total_error)
-
-    !  Check the 1st field's name 
-    CALL H5Tget_member_name_f(tid2, 0, mname, namelen,error)
-    CALL check("H5Tget_member_name_f", error, total_error)
-    CALL verifystring("H5Tget_member_name_f",mname(1:namelen),"i", total_error)
-
-    !  Check the 1st field's offset 
-
-    CALL H5Tget_member_offset_f(tid2, 0, off, error)
-    CALL check("H5Tget_member_offset_f", error, total_error)
-    CALL VERIFY("H5Tget_member_offset_f",INT(off),0, total_error) 
-
-    !  Check the 1st field's datatype 
-    CALL H5Tget_member_type_f(tid2, 0, mtid, error)
-    CALL check("H5Tget_member_type_f", error, total_error)
-
-    CALL H5Tequal_f(mtid, H5T_NATIVE_INTEGER, flag, error)
-    CALL check("H5Tequal_f", error, total_error) 
-    CALL VerifyLogical("H5Tequal_f", flag, .TRUE., total_error)
-
-    CALL h5tclose_f(mtid,error)
-    CALL check("h5tclose_f", error, total_error)
-
-    !  Check the 2nd field's name 
-    CALL H5Tget_member_name_f(tid2, 1, mname, namelen,error)
-    CALL check("H5Tget_member_name_f", error, total_error)
-    CALL verifystring("H5Tget_member_name_f",mname(1:namelen),"f", total_error)
-
-    !  Check the 2nd field's offset 
-    CALL H5Tget_member_offset_f(tid2, 1, off, error)
-    CALL check("H5Tget_member_offset_f", error, total_error)
-    CALL VERIFY("H5Tget_member_offset_f",INT(off),INT(H5OFFSETOF(C_LOC(wdata(1,1)),C_LOC(wdata(1,1)%f))), total_error) 
-
-    !  Check the 2nd field's datatype 
-    CALL H5Tget_member_type_f(tid2, 1, mtid, error)
-    CALL check("H5Tget_member_type_f", error, total_error)
-
-    !  Get the 2nd field's class 
-    CALL H5Tget_class_f(mtid, mclass, error)
-    CALL check("H5Tget_class_f", error, total_error)
-    CALL VERIFY("H5Tget_class_f",mclass, H5T_ARRAY_F, total_error)
-
-    !  Check the array rank 
-    CALL h5tget_array_ndims_f(mtid, ndims, error)
-    CALL check("h5tget_array_ndims_f", error, total_error)
-    CALL VERIFY("h5tget_array_ndims_f",ndims, ARRAY1_RANK, total_error)
-
-    !  Get the array dimensions 
-    CALL h5tget_array_dims_f(mtid, rdims1, error)
-    CALL check("h5tget_array_dims_f", error, total_error)
-
-    !  Check the array dimensions 
-    DO i = 1, ndims
-       CALL VERIFY("h5tget_array_dims_f", INT(rdims1(i)), INT(tdims2(i)), total_error)
-    ENDDO
-
-    !  Check the 3rd field's name 
-    CALL H5Tget_member_name_f(tid2, 2, mname, namelen,error)
-    CALL check("H5Tget_member_name_f", error, total_error)
-    CALL verifystring("H5Tget_member_name_f",mname(1:namelen),"c", total_error)
-
-    !  Check the 3rd field's offset 
-    CALL H5Tget_member_offset_f(tid2, 2, off, error)
-    CALL check("H5Tget_member_offset_f", error, total_error)
-    CALL VERIFY("H5Tget_member_offset_f",INT(off),&
-         INT(H5OFFSETOF(C_LOC(wdata(1,1)),C_LOC(wdata(1,1)%c(1)(1:1)))), total_error) 
-
-    !  Check the 3rd field's datatype 
-    CALL H5Tget_member_type_f(tid2, 2, mtid2, error)
-    CALL check("H5Tget_member_type_f", error, total_error)
-
-    !  Get the 3rd field's class 
-    CALL H5Tget_class_f(mtid2, mclass, error)
-    CALL check("H5Tget_class_f", error, total_error)
-    CALL VERIFY("H5Tget_class_f",mclass, H5T_ARRAY_F, total_error)
-
-    !  Check the array rank 
-    CALL h5tget_array_ndims_f(mtid2, ndims, error)
-    CALL check("h5tget_array_ndims_f", error, total_error)
-    CALL VERIFY("h5tget_array_ndims_f",ndims, ARRAY1_RANK, total_error)
-
-    !  Get the array dimensions 
-    CALL h5tget_array_dims_f(mtid2, rdims1, error)
-    CALL check("h5tget_array_dims_f", error, total_error)
-
-    !  Check the array dimensions 
-    DO i = 1, ndims
-       CALL VERIFY("h5tget_array_dims_f", INT(rdims1(i)), INT(tdims2(i)), total_error)
-    ENDDO
-
-    !  Check the nested array's datatype 
-    CALL H5Tget_super_f(mtid, tid3, error)
-    CALL check("H5Tget_super_f", error, total_error)
-
-    CALL H5Tequal_f(tid3, H5T_NATIVE_REAL, flag, error)
-    CALL check("H5Tequal_f", error, total_error) 
-    CALL VerifyLogical("H5Tequal_f", flag, .TRUE., total_error)
-
-    !  Check the nested array's datatype 
-    CALL H5Tget_super_f(mtid2, tid3, error)
-    CALL check("H5Tget_super_f", error, total_error)
-
-    CALL H5Tequal_f(tid3, atype_id, flag, error)
-    CALL check("H5Tequal_f", error, total_error) 
-    CALL VerifyLogical("H5Tequal_f", flag, .TRUE., total_error)
-
-    !  Close the array's base type datatype 
-    CALL h5tclose_f(tid3, error)
-    CALL check("h5tclose_f", error, total_error)
-
-    !  Close the member datatype 
-    CALL h5tclose_f(mtid,error)
-    CALL check("h5tclose_f", error, total_error)
-
-    !  Close the member datatype 
-    CALL h5tclose_f(mtid2,error)
-    CALL check("h5tclose_f", error, total_error)
-
-    !  Close Compound Datatype 
-    CALL h5tclose_f(tid2,error)
-    CALL check("h5tclose_f", error, total_error)
-
-    !  READ dataset from disk 
-    
-    f_ptr = c_null_ptr
-    f_ptr = C_LOC(rdata(1,1))
-    CALL H5Dread_f(dataset, tid1, f_ptr, error)
-    CALL check("H5Dread_f", error, total_error)
-
-    !  Compare data read in 
-    DO i = 1, SPACE1_DIM1
-       DO j = 1, ARRAY1_DIM1
-          IF(wdata(i,j)%i.NE.rdata(i,j)%i)THEN
-             PRINT*, 'ERROR: Wrong integer data is read back by H5Dread_f '
-             total_error = total_error + 1
-          ENDIF
-          DO k = 1, ARRAY2_DIM1
-             
-             IF(wdata(i,j)%f(k).NE.rdata(i,j)%f(k))THEN
-                PRINT*, 'ERROR: Wrong real array data is read back by H5Dread_f '
-                total_error = total_error + 1
-             ENDIF
-             IF(wdata(i,j)%c(k).NE.rdata(i,j)%c(k))THEN
-                PRINT*, 'ERROR: Wrong character array data is read back by H5Dread_f '
-                total_error = total_error + 1
-             ENDIF
-          ENDDO
-       ENDDO
-    ENDDO
-
-    !  Close Datatype 
-    CALL h5tclose_f(tid1,error)
-    CALL check("h5tclose_f", error, total_error)
-
-    !  Close Dataset 
-    CALL h5dclose_f(dataset, error)
-    CALL check("h5dclose_f", error, total_error)
-
-    !  Close file 
-    CALL h5fclose_f(fid1,error)
-    CALL check("h5fclose_f", error, total_error)
-  END SUBROUTINE test_array_compound_array
-!!$
-!!$!***************************************************************
-!!$!**
-!!$!**  test_array_bkg(): Test basic array datatype code.
-!!$!**      Tests reading compound datatype with array fields and
-!!$!**          writing partial fields.
-!!$!**
-!!$!***************************************************************
-!!$
-  SUBROUTINE test_array_bkg(total_error)
-    
-    USE HDF5 
-    USE TH5_MISC
-    USE ISO_C_BINDING
-    IMPLICIT NONE
-
-    INTEGER, INTENT(INOUT) :: total_error
-
-    INTEGER, PARAMETER :: LENGTH = 5
-    INTEGER, PARAMETER :: ALEN = 10
-    INTEGER, PARAMETER :: RANK = 1
-    INTEGER, PARAMETER :: NMAX = 100
-    CHARACTER(LEN=17), PARAMETER :: FIELDNAME = "ArrayofStructures"
-
-    INTEGER(hid_t) :: fid, array_dt
-    INTEGER(hid_t) :: space
-    INTEGER(hid_t) :: type
-    INTEGER(hid_t) :: dataset
-
-    INTEGER(hsize_t), DIMENSION(1:1) :: dim =(/LENGTH/)
-    INTEGER(hsize_t), DIMENSION(1:1) :: dima =(/ALEN/)
-
-    INTEGER :: i, j
-    INTEGER, DIMENSION(1:3) :: ndims = (/1,1,1/)
-
-    TYPE CmpField_struct
-       INTEGER, DIMENSION(1:ALEN) :: a
-       REAL(KIND=sp), DIMENSION(1:ALEN) :: b
-       REAL(KIND=dp), DIMENSION(1:ALEN) :: c
-    ENDTYPE CmpField_struct
-
-    TYPE(CmpField_struct), DIMENSION(1:LENGTH), TARGET :: cf
-    TYPE(CmpField_struct), DIMENSION(1:LENGTH), TARGET :: cfr
-    
-    TYPE CmpDTSinfo_struct
-       INTEGER :: nsubfields
-       CHARACTER(LEN=5), DIMENSION(1:nmax) :: name
-       INTEGER(size_t), DIMENSION(1:nmax) :: offset
-       INTEGER(hid_t), DIMENSION(1:nmax) :: datatype
-    END TYPE CmpDTSinfo_struct
-
-    TYPE(CmpDTSinfo_struct) :: dtsinfo
-
-    TYPE fld_t_struct
-       REAL(KIND=sp), DIMENSION(1:ALEN) :: b
-    END TYPE fld_t_struct
- 
-    INTEGER(SIZE_T) :: type_sizei  ! Size of the integer datatype 
-    INTEGER(SIZE_T) :: type_sizer  ! Size of the real datatype 
-    INTEGER(SIZE_T) :: type_sized  ! Size of the double datatype
-    INTEGER(SIZE_T) :: sizeof_compound ! total size of compound
-
-    TYPE(fld_t_struct), DIMENSION(1:LENGTH), TARGET :: fld
-    TYPE(fld_t_struct), DIMENSION(1:LENGTH), TARGET :: fldr
-
-    CHARACTER(LEN=10), PARAMETER :: FILENAME = "tarray3.h5"
-
-    INTEGER(HSIZE_T), ALLOCATABLE, DIMENSION(:) :: rdims1 ! Array dimensions for reading 
-    INTEGER(HSIZE_T), ALLOCATABLE, DIMENSION(:) :: rdims ! Array dimensions for reading 
-
-    INTEGER :: error
-    TYPE(c_ptr) :: f_ptr
-    
-!     Initialize the data 
-!     ------------------- 
-
-    DO i = 1, LENGTH
-       DO j = 1, ALEN
-          cf(i)%a(j) = 100*(i+1) + j
-          cf(i)%b(j) = (100.*(i+1) + 0.01*j)
-          cf(i)%c(j) = 100.*(i+1) + 0.02*j
-       ENDDO
-    ENDDO
-
-    ! Set the number of data members 
-    ! ------------------------------ 
-
-    dtsinfo%nsubfields = 3
-
-    ! Initialize the offsets  
-    ! ----------------------- 
-    CALL h5tget_size_f(H5T_NATIVE_INTEGER, type_sizei, error)
-    CALL check("h5tget_size_f", error, total_error)
-    IF(h5_sizeof(cf(1)%b(1)).EQ.4_size_t)THEN
-       CALL h5tget_size_f(H5T_NATIVE_REAL_4, type_sizer, error)
-       CALL check("h5tget_size_f", error, total_error)
-    ELSE IF(h5_sizeof(cf(1)%b(1)).EQ.8_size_t)THEN
-       CALL h5tget_size_f(H5T_NATIVE_REAL_8, type_sizer, error)
-       CALL check("h5tget_size_f", error, total_error)
-    ENDIF
-
-    CALL h5tget_size_f(H5T_NATIVE_DOUBLE, type_sized, error)
-    CALL check("h5tget_size_f", error, total_error)
-
-    dtsinfo%offset(1)   = H5OFFSETOF(C_LOC(cf(1)),C_LOC(cf(1)%a(1)))
-    dtsinfo%offset(2)   = H5OFFSETOF(C_LOC(cf(1)),C_LOC(cf(1)%b(1))) 
-    dtsinfo%offset(3)   = H5OFFSETOF(C_LOC(cf(1)),C_LOC(cf(1)%c(1)))
-
-
-    ! Initialize the data type IDs 
-    ! ---------------------------- 
-    dtsinfo%datatype(1) = H5T_NATIVE_INTEGER;
-    dtsinfo%datatype(2) = H5T_NATIVE_REAL_4;
-    dtsinfo%datatype(3) = H5T_NATIVE_REAL_8;
-
-
-    ! Initialize the names of data members 
-    ! ------------------------------------ 
-     
-    dtsinfo%name(1) = "One  "
-    dtsinfo%name(2) = "Two  "
-    dtsinfo%name(3) = "Three"
-       
-    ! Create file 
-    ! ----------- 
-    CALL h5fcreate_f(FILENAME,H5F_ACC_TRUNC_F,fid,error)
-    CALL check("h5fcreate_f", error, total_error)   
-
-
-    ! Create data space 
-    ! ----------------- 
-    CALL h5screate_simple_f(RANK, dim, space, error)
-    CALL check("h5screate_simple_f", error, total_error)
-
-
-    ! Create the memory data type 
-    ! --------------------------- 
-
-    CALL h5tcreate_f(H5T_COMPOUND_F, H5OFFSETOF(C_LOC(cf(1)), C_LOC(cf(2))), type, error)
-    CALL check("h5tcreate_f", error, total_error)
-
-    ! Add  members to the compound data type 
-    ! -------------------------------------- 
-
-    DO i = 1, dtsinfo%nsubfields
-       CALL h5tarray_create_f(dtsinfo%datatype(i), ndims(i), dima, array_dt, error)
-       CALL check("h5tarray_create_f", error, total_error)
-       CALL H5Tinsert_f(type, dtsinfo%name(i), dtsinfo%offset(i), array_dt, error)
-       CALL check("h5tinsert_f", error, total_error)
-
-       CALL h5tclose_f(array_dt,error)
-       CALL check("h5tclose_f", error, total_error)
-    ENDDO
-
-    ! Create the dataset 
-    ! ------------------ /
-    CALL h5dcreate_f(fid,FIELDNAME,type, space, dataset,error)
-    CALL check("h5dcreate_f", error, total_error)
-
-    ! Write data to the dataset 
-    ! ------------------------- 
-
-    ALLOCATE(rdims(1:2)) ! dummy not needed
-
-    f_ptr = C_LOC(cf(1))
-
-    CALL h5dwrite_f(dataset, type, f_ptr, error )
-    CALL check("h5dwrite_f", error, total_error)
-
-
-    ALLOCATE(rdims1(1:2)) ! dummy not needed
-    f_ptr = C_LOC(cfr(1))
-    CALL H5Dread_f(dataset, type, f_ptr, error)
-    CALL check("H5Dread_f", error, total_error)
-
-    ! Verify correct data 
-    ! ------------------- 
-    DO i = 1, LENGTH
-       DO j = 1, ALEN
-           IF( cf(i)%a(j) .NE. cfr(i)%a(j) )THEN
-             PRINT*, 'ERROR: Wrong integer data is read back by H5Dread_f '
-             total_error = total_error + 1
-          ENDIF
-          IF( .NOT.dreal_eq( REAL(cf(i)%b(j),dp), REAL( cfr(i)%b(j), dp)) ) THEN
-             PRINT*, 'ERROR: Wrong real data is read back by H5Dread_f '
-             total_error = total_error + 1
-          ENDIF
-          IF( .NOT.dreal_eq( REAL(cf(i)%c(j),dp), REAL( cfr(i)%c(j), dp)) ) THEN
-             PRINT*, 'ERROR: Wrong double data is read back by H5Dread_f '
-             total_error = total_error + 1
-          ENDIF
-       ENDDO
-    ENDDO
-
-
-    ! Release IDs 
-    ! ----------- 
-    CALL h5tclose_f(type,error)
-    CALL check("h5tclose_f", error, total_error)
-    CALL h5sclose_f(space,error)
-    CALL check("h5sclose_f", error, total_error)
-    CALL h5dclose_f(dataset, error)
-    CALL check("h5dclose_f", error, total_error)
-    CALL h5fclose_f(fid,error)
-    CALL check("h5fclose_f", error, total_error)
-
-    !****************************
-    ! Reopen the file and update 
-    !****************************
-
-    CALL h5fopen_f (FILENAME, H5F_ACC_RDWR_F, fid, error)
-    CALL check("h5fopen_f", error, total_error)
-
-    CALL h5dopen_f(fid, FIELDNAME, dataset, error)
-    CALL check("h5dopen_f", error, total_error)
-
-    sizeof_compound =  INT( type_sizer*ALEN, size_t)
-
-    CALL h5tcreate_f(H5T_COMPOUND_F, sizeof_compound , type, error)
-    CALL check("h5tcreate_f", error, total_error)
-
-    CALL h5tarray_create_f(H5T_NATIVE_REAL_4, 1, dima, array_dt, error)
-    CALL check("h5tarray_create_f", error, total_error)
-
-    CALL h5tinsert_f(TYPE, "Two", 0_size_t, array_dt, error)
-    CALL check("h5tinsert_f", error, total_error)
-
-    ! Initialize the data to overwrite 
-    ! -------------------------------- 
-    DO i = 1, LENGTH
-       DO j = 1, ALEN
-          fld(i)%b(j) = 1.313
-          cf(i)%b(j) = fld(i)%b(j)
-       ENDDO
-    ENDDO
-
-    f_ptr = C_LOC(fld(1))
-
-    CALL h5dwrite_f(dataset, TYPE, f_ptr, error )
-    CALL check("h5dwrite_f", error, total_error)
-
-
-    !  Read just the field changed 
-    
-    f_ptr = C_LOC(fldr(1))
-    CALL H5Dread_f(dataset, TYPE, f_ptr, error)
-    CALL check("H5Dread_f", error, total_error)
-
-    DO i = 1, LENGTH
-       DO j = 1, ALEN
-          IF( .NOT.dreal_eq( REAL(fld(i)%b(j),dp), REAL( fldr(i)%b(j), dp)) ) THEN
-             PRINT*, 'ERROR: Wrong real data is read back by H5Dread_f '
-             total_error = total_error + 1
-          ENDIF
-       ENDDO
-    ENDDO
-    CALL h5tclose_f(TYPE,error)
-    CALL check("h5tclose_f", error, total_error)
-    CALL h5tclose_f(array_dt,error)
-    CALL check("h5tclose_f", error, total_error)
-
-    CALL h5dget_type_f(dataset, type, error)
-    CALL check("h5dget_type_f", error, total_error)
-
-
-    !  Read the entire dataset again 
-
-    f_ptr = C_LOC(cfr(1))
-    CALL H5Dread_f(dataset, TYPE, f_ptr, error)
-    CALL check("H5Dread_f", error, total_error)
-
-
-    ! Verify correct data 
-    ! ------------------- 
-
-    DO i = 1, LENGTH
-       DO j = 1, ALEN
-           IF( cf(i)%a(j) .NE. cfr(i)%a(j) )THEN
-             PRINT*, 'ERROR: Wrong integer data is read back by H5Dread_f '
-             total_error = total_error + 1
-          ENDIF
-          IF( .NOT.dreal_eq( REAL(cf(i)%b(j),dp), REAL(cfr(i)%b(j), dp)) ) THEN
-             PRINT*, 'ERROR: Wrong real data is read back by H5Dread_f '
-             total_error = total_error + 1
-          ENDIF
-          IF( .NOT.dreal_eq( REAL(cf(i)%c(j),dp), REAL(cfr(i)%c(j), dp)) ) THEN
-             PRINT*, 'ERROR: Wrong double data is read back by H5Dread_f '
-             total_error = total_error + 1
-          ENDIF
-       ENDDO
-    ENDDO
-
-    CALL h5dclose_f(dataset, error)
-    CALL check("h5dclose_f", error, total_error)
-
-    CALL h5tclose_f(type,error)
-    CALL check("h5tclose_f", error, total_error)
-
-    CALL h5fclose_f(fid,error)
-    CALL check("h5fclose_f", error, total_error)
-
-!**************************************************
-! Reopen the file and print out all the data again 
-!**************************************************
-
-    CALL h5fopen_f (FILENAME, H5F_ACC_RDWR_F, fid, error)
-    CALL check("h5fopen_f", error, total_error)
-
-
-    CALL h5dopen_f(fid, FIELDNAME, dataset, error)
-    CALL check("h5dopen_f", error, total_error)
-
-
-    CALL h5dget_type_f(dataset, type, error)
-    CALL check("h5dget_type_f", error, total_error)
-
-
-    ! Reset the data to read in 
-    ! ------------------------- 
-
-    DO i = 1, LENGTH
-       cfr(i)%a(:) = 0
-       cfr(i)%b(:) = 0
-       cfr(i)%c(:) = 0
-    ENDDO
-
-    f_ptr = C_LOC(cfr(1))
-    CALL H5Dread_f(dataset, TYPE, f_ptr, error)
-    CALL check("H5Dread_f", error, total_error)
-
-    ! Verify correct data 
-    ! ------------------- 
-
-    DO i = 1, LENGTH
-       DO j = 1, ALEN
-           IF( cf(i)%a(j) .NE. cfr(i)%a(j) )THEN
-             PRINT*, 'ERROR: Wrong integer data is read back by H5Dread_f '
-             total_error = total_error + 1
-          ENDIF
-          IF( .NOT.dreal_eq( REAL(cf(i)%b(j),dp), REAL(cfr(i)%b(j), dp)) ) THEN
-             PRINT*, 'ERROR: Wrong real data is read back by H5Dread_f '
-             total_error = total_error + 1
-          ENDIF
-          IF( .NOT.dreal_eq( REAL(cf(i)%c(j),dp), REAL(cfr(i)%c(j), dp)) ) THEN
-             PRINT*, 'ERROR: Wrong double data is read back by H5Dread_f '
-             total_error = total_error + 1
-          ENDIF
-       ENDDO
-    ENDDO
-
-    CALL h5dclose_f(dataset, error)
-    CALL check("h5dclose_f", error, total_error)
-
-    CALL h5tclose_f(type,error)
-    CALL check("h5tclose_f", error, total_error)
-
-    CALL h5fclose_f(fid,error)
-    CALL check("h5fclose_f", error, total_error)
-
-  END SUBROUTINE test_array_bkg
-
-
-
-  SUBROUTINE test_h5kind_to_type(total_error)
-
-    USE ISO_C_BINDING
-    USE HDF5 ! This module contains all necessary modules
-    USE TH5_MISC
-
-    IMPLICIT NONE
-    
-    INTEGER, INTENT(INOUT) :: total_error
-    
-    INTEGER, PARAMETER :: int_kind_1 = SELECTED_INT_KIND(Fortran_INTEGER_1)  !should map to INTEGER*1 on most modern processors
-    INTEGER, PARAMETER :: int_kind_4 = SELECTED_INT_KIND(Fortran_INTEGER_2)  !should map to INTEGER*2 on most modern processors
-    INTEGER, PARAMETER :: int_kind_8 = SELECTED_INT_KIND(Fortran_INTEGER_4)  !should map to INTEGER*4 on most modern processors
-    INTEGER, PARAMETER :: int_kind_16 = SELECTED_INT_KIND(Fortran_INTEGER_8) !should map to INTEGER*8 on most modern processors
-    
-    INTEGER, PARAMETER :: real_kind_7 = SELECTED_REAL_KIND(Fortran_REAL_4)   !should map to REAL*4 on most modern processors
-    INTEGER, PARAMETER :: real_kind_15 = SELECTED_REAL_KIND(Fortran_REAL_8)  !should map to REAL*8 on most modern processors
-    
-    CHARACTER(LEN=12), PARAMETER :: filename = "dsetf_F03.h5" ! File name
-    CHARACTER(LEN=5), PARAMETER :: dsetname1 = "dset1"     ! Dataset name
-    CHARACTER(LEN=5), PARAMETER :: dsetname2 = "dset2"     ! Dataset name
-    CHARACTER(LEN=5), PARAMETER :: dsetname4 = "dset4"     ! Dataset name
-    CHARACTER(LEN=5), PARAMETER :: dsetname8 = "dset8"     ! Dataset name
-    CHARACTER(LEN=6), PARAMETER :: dsetnamer = "dsetr"     ! Dataset name
-    CHARACTER(LEN=6), PARAMETER :: dsetnamer4 = "dsetr4"     ! Dataset name
-    CHARACTER(LEN=6), PARAMETER :: dsetnamer8 = "dsetr8"     ! Dataset name
-    
-    INTEGER(HID_T) :: file_id       ! File identifier 
-    INTEGER(HID_T) :: dset_id1      ! Dataset identifier  
-    INTEGER(HID_T) :: dset_id4      ! Dataset identifier   
-    INTEGER(HID_T) :: dset_id8      ! Dataset identifier  
-    INTEGER(HID_T) :: dset_id16     ! Dataset identifier     
-    INTEGER(HID_T) :: dset_idr       ! Dataset identifier 
-    INTEGER(HID_T) :: dset_idr4      ! Dataset identifier   
-    INTEGER(HID_T) :: dset_idr8      ! Dataset identifier 
-    
-    INTEGER :: error ! Error flag
-    INTEGER :: i
-    
-! Data buffers:
-
-    INTEGER(int_kind_1), DIMENSION(1:4), TARGET :: dset_data_i1, data_out_i1
-    INTEGER(int_kind_4), DIMENSION(1:4), TARGET :: dset_data_i4, data_out_i4
-    INTEGER(int_kind_8), DIMENSION(1:4), TARGET :: dset_data_i8, data_out_i8
-    INTEGER(int_kind_16), DIMENSION(1:4), TARGET :: dset_data_i16, data_out_i16
-
-    REAL, DIMENSION(1:4), TARGET :: dset_data_r, data_out_r
-    REAL(real_kind_7), DIMENSION(1:4), TARGET :: dset_data_r7, data_out_r7
-    REAL(real_kind_15), DIMENSION(1:4), TARGET :: dset_data_r15, data_out_r15
-    
-    INTEGER(HSIZE_T), DIMENSION(1:1) :: data_dims = (/4/) 
-    INTEGER(HID_T) :: dspace_id     ! Dataspace identifier
-    
-    TYPE(C_PTR) :: f_ptr
-
-    !
-    ! Initialize the dset_data array.
-    !
-    DO i = 1, 4
-       dset_data_i1(i)  = i
-       dset_data_i4(i)  = i
-       dset_data_i8(i)  = i
-       dset_data_i16(i) = i
-
-       dset_data_r(i) = (i)*100.
-       dset_data_r7(i) = (i)*100.
-       dset_data_r15(i) = (i)*1000.
-       
-    END DO
-
-    CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, error)
-    CALL check("h5fcreate_f",error, total_error)
-  !
-  ! Create dataspaces for datasets
-  !
-    CALL h5screate_simple_f(1, data_dims , dspace_id, error)
-    CALL check("h5screate_simple_f",error, total_error)
-  !
-  ! Create the dataset.
-  !
-    CALL H5Dcreate_f(file_id, dsetname1, h5kind_to_type(int_kind_1,H5_INTEGER_KIND),  dspace_id, dset_id1, error)
-    CALL check("H5Dcreate_f",error, total_error)
-    CALL H5Dcreate_f(file_id, dsetname2, h5kind_to_type(int_kind_4,H5_INTEGER_KIND),  dspace_id, dset_id4, error)
-    CALL check("H5Dcreate_f",error, total_error)
-    CALL H5Dcreate_f(file_id, dsetname4, h5kind_to_type(int_kind_8,H5_INTEGER_KIND),  dspace_id, dset_id8, error)
-    CALL check("H5Dcreate_f",error, total_error)
-    CALL H5Dcreate_f(file_id, dsetname8, h5kind_to_type(int_kind_16,H5_INTEGER_KIND), dspace_id, dset_id16, error)
-    CALL check("H5Dcreate_f",error, total_error)
-    
-    CALL H5Dcreate_f(file_id, dsetnamer, H5T_NATIVE_REAL, dspace_id, dset_idr, error)
-    CALL check("H5Dcreate_f",error, total_error)
-    CALL H5Dcreate_f(file_id, dsetnamer4, h5kind_to_type(real_kind_7,H5_REAL_KIND),  dspace_id, dset_idr4, error)
-    CALL check("H5Dcreate_f",error, total_error)
-    CALL H5Dcreate_f(file_id, dsetnamer8, h5kind_to_type(real_kind_15,H5_REAL_KIND), dspace_id, dset_idr8, error)
-    CALL check("H5Dcreate_f",error, total_error)
-
-  !
-  ! Write the dataset.
-  !
-    f_ptr = C_LOC(dset_data_i1(1))
-    CALL h5dwrite_f(dset_id1, h5kind_to_type(int_kind_1,H5_INTEGER_KIND), f_ptr, error)
-    CALL check("H5Dwrite_f",error, total_error)
-    f_ptr = C_LOC(dset_data_i4(1))
-    CALL h5dwrite_f(dset_id4, h5kind_to_type(int_kind_4,H5_INTEGER_KIND), f_ptr, error)
-    CALL check("H5Dwrite_f",error, total_error)
-    f_ptr = C_LOC(dset_data_i8(1))
-    CALL h5dwrite_f(dset_id8, h5kind_to_type(int_kind_8,H5_INTEGER_KIND), f_ptr, error)
-    CALL check("H5Dwrite_f",error, total_error)
-    f_ptr = C_LOC(dset_data_i16(1))
-    CALL h5dwrite_f(dset_id16, h5kind_to_type(int_kind_16,H5_INTEGER_KIND), f_ptr, error)
-    CALL check("H5Dwrite_f",error, total_error)
-    f_ptr = C_LOC(dset_data_r(1))
-    CALL h5dwrite_f(dset_idr, H5T_NATIVE_REAL, f_ptr, error)
-    CALL check("H5Dwrite_f",error, total_error)
-    f_ptr = C_LOC(dset_data_r7(1))
-    CALL h5dwrite_f(dset_idr4, h5kind_to_type(real_kind_7,H5_REAL_KIND), f_ptr, error)
-    CALL check("H5Dwrite_f",error, total_error)
-    f_ptr = C_LOC(dset_data_r15(1))
-    CALL h5dwrite_f(dset_idr8, h5kind_to_type(real_kind_15,H5_REAL_KIND), f_ptr, error)
-    CALL check("H5Dwrite_f",error, total_error)
-  !
-  ! Close the file
-  !
-    CALL h5fclose_f(file_id, error)
-    CALL check("h5fclose_f",error, total_error)
-
-  ! Open the file
-
-    CALL h5fopen_f(filename, H5F_ACC_RDONLY_F, file_id, error)
-    CALL check("h5fopen_f",error, total_error)
-  !
-  ! Read the dataset.
-  !
-  ! Read data back into an integer size that is larger then the original size used for 
-  ! writing the data
-    f_ptr = C_LOC(data_out_i1)
-    CALL h5dread_f(dset_id1, h5kind_to_type(int_kind_1,H5_INTEGER_KIND), f_ptr,  error)
-    CALL check("h5dread_f",error, total_error)
-    f_ptr = C_LOC(data_out_i4)
-    CALL h5dread_f(dset_id4, h5kind_to_type(int_kind_4,H5_INTEGER_KIND), f_ptr,  error)
-    CALL check("h5dread_f",error, total_error)
-    f_ptr = C_LOC(data_out_i8)
-    CALL h5dread_f(dset_id8, h5kind_to_type(int_kind_8,H5_INTEGER_KIND), f_ptr,  error)
-    CALL check("h5dread_f",error, total_error)
-    f_ptr = C_LOC(data_out_i16)
-    CALL h5dread_f(dset_id16, h5kind_to_type(int_kind_16,H5_INTEGER_KIND), f_ptr,  error)
-    CALL check("h5dread_f",error, total_error)
-    f_ptr = C_LOC(data_out_r)
-    CALL h5dread_f(dset_idr, H5T_NATIVE_REAL, f_ptr,  error)
-    CALL check("h5dread_f",error, total_error)
-    f_ptr = C_LOC(data_out_r7)
-    CALL h5dread_f(dset_idr4, h5kind_to_type(real_kind_7,H5_REAL_KIND), f_ptr,  error)
-    CALL check("h5dread_f",error, total_error)
-    f_ptr = C_LOC(data_out_r15)
-    CALL h5dread_f(dset_idr8, h5kind_to_type(real_kind_15,H5_REAL_KIND), f_ptr,  error)
-    CALL check("h5dread_f",error, total_error)
-    
-    DO i = 1, 4
-       
-       CALL verify_Fortran_INTEGER_4("h5kind_to_type1",INT(dset_data_i1(i),int_kind_8),INT(data_out_i1(i),int_kind_8),total_error)
-       CALL verify_Fortran_INTEGER_4("h5kind_to_type2",INT(dset_data_i4(i),int_kind_8),INT(data_out_i4(i),int_kind_8),total_error)
-       CALL verify_Fortran_INTEGER_4("h5kind_to_type3",INT(dset_data_i8(i),int_kind_8),INT(data_out_i8(i),int_kind_8),total_error)
-       CALL verify_Fortran_INTEGER_4("h5kind_to_type4",INT(dset_data_i16(i),int_kind_8),INT(data_out_i16(i),int_kind_8),total_error)
-       
-       CALL verify_real_kind_7("h5kind_to_type5",REAL(dset_data_r(i),real_kind_7),REAL(data_out_r(i),real_kind_7),total_error)
-       CALL verify_real_kind_7("h5kind_to_type6",REAL(dset_data_r7(i),real_kind_7),REAL(data_out_r7(i),real_kind_7),total_error)
-       CALL verify_real_kind_7("h5kind_to_type7",REAL(dset_data_r15(i),real_kind_7),REAL(data_out_r15(i),real_kind_7),total_error)
-
-    END DO
-
-  !
-  ! Close the dataset.
-  !
-    CALL h5dclose_f(dset_id1, error)
-    CALL check("h5dclose_f",error, total_error)
-    CALL h5dclose_f(dset_id4, error)
-    CALL check("h5dclose_f",error, total_error)
-    CALL h5dclose_f(dset_id8, error)
-    CALL check("h5dclose_f",error, total_error)
-    CALL h5dclose_f(dset_id16, error)
-    CALL check("h5dclose_f",error, total_error)
-    CALL h5dclose_f(dset_idr4, error)
-    CALL check("h5dclose_f",error, total_error)
-    CALL h5dclose_f(dset_idr8, error)
-    CALL check("h5dclose_f",error, total_error)
-  !
-  ! Close the file.
-  !
-    CALL h5fclose_f(file_id, error)
-    CALL check("h5fclose_f",error, total_error)
-
-END SUBROUTINE test_h5kind_to_type
-
-!************************************************************
-!
-!  This test reads and writes array datatypes
-!  to a dataset.  The test first writes integers arrays of
-!  dimension ADIM0xADIM1 to a dataset with a dataspace of
-!  DIM0, then closes the  file.  Next, it reopens the file,
-!  reads back the data.
-!
-!************************************************************
-SUBROUTINE t_array(total_error)
-
-  USE ISO_C_BINDING
-  USE HDF5
-  USE TH5_MISC
-  
-  IMPLICIT NONE
-    
-  INTEGER, INTENT(INOUT) :: total_error
-
-  CHARACTER(LEN=19), PARAMETER :: filename  = "t_array_F03.h5"
-  CHARACTER(LEN=3) , PARAMETER :: dataset   = "DS1"
-  INTEGER          , PARAMETER :: dim0      = 4
-  INTEGER          , PARAMETER :: adim0     = 3
-  INTEGER          , PARAMETER :: adim1     = 5
-  INTEGER(HID_T)  :: file, filetype, memtype, space, dset ! Handles
-  INTEGER(HSIZE_T), DIMENSION(1:1)   :: dims = (/dim0/)
-  INTEGER(HSIZE_T), DIMENSION(1:2)   :: adims = (/adim0, adim1/)
-  INTEGER(HSIZE_T), DIMENSION(1:2)   :: maxdims
-  INTEGER, DIMENSION(1:dim0, 1:adim0, 1:adim1), TARGET :: wdata ! Write buffer 
-  INTEGER, DIMENSION(:,:,:), ALLOCATABLE, TARGET :: rdata    ! Read buffer
-  INTEGER :: i, j, k
-  TYPE(C_PTR) :: f_ptr
-  INTEGER :: error ! Error flag
-
-  !
-  ! Initialize data.  i is the element in the dataspace, j and k the
-  ! elements within the array datatype.
-  !
-  DO i = 1, dim0
-     DO j = 1, adim0
-        DO k = 1, adim1
-           wdata(i,j,k) = (i-1)*(j-1)-(j-1)*(k-1)+(i-1)*(k-1)
-        ENDDO
-     ENDDO
-  ENDDO
-  !
-  ! Create a new file using the default properties.
-  !
-  CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file, error)
-  CALL check("h5fcreate_f",error, error)
-  !
-  ! Create array datatypes for file and memory.
-  !
-  CALL H5Tarray_create_f(INT(H5T_STD_I64LE, HID_T), 2, adims, filetype, error)
-  CALL check("H5Tarray_create_f",error, total_error)
-  CALL H5Tarray_create_f(H5T_NATIVE_INTEGER, 2, adims, memtype, error)
-  CALL check("H5Tarray_create_f",error, total_error)
-  !
-  ! Create dataspace.  Setting maximum size to be the current size.
-  !
-  CALL h5screate_simple_f(1, dims, space, error)
-  CALL check("h5screate_simple_f",error, total_error)
-  !
-  ! Create the dataset and write the array data to it.
-  !
-  CALL h5dcreate_f(file, dataset, filetype, space, dset, error)
-  CALL check("h5dcreate_f",error, total_error)
-  f_ptr = C_LOC(wdata)
-  CALL h5dwrite_f(dset, memtype, f_ptr, error)
-  CALL check("h5dwrite_f",error, total_error)
-  !
-  ! Close and release resources.
-  !
-  CALL H5Dclose_f(dset, error)
-  CALL check("h5dclose_f",error, total_error)
-  CALL H5Sclose_f(space, error)
-  CALL check("h5sclose_f",error, total_error)
-  CALL H5Tclose_f(filetype, error)
-  CALL check("h5tclose_f",error, total_error)
-  CALL H5Tclose_f(memtype, error)
-  CALL check("h5tclose_f",error, total_error)
-  CALL H5Fclose_f(file, error)
-  CALL check("h5fclose_f",error, total_error)
-  !
-  ! Now we begin the read section of this example. 
-  !
-  ! Open file, dataset, and attribute.
-  !
-  CALL h5fopen_f(filename, H5F_ACC_RDONLY_F, file, error)
-  CALL check("h5fopen_f",error, total_error)
-  CALL h5dopen_f(file, dataset, dset, error)
-  CALL check("h5dopen_f",error, total_error)
-  !
-  ! Get the datatype and its dimensions.
-  !
-  CALL h5dget_type_f(dset, filetype, error)
-  CALL check("h5dget_type_f",error, error)
-  CALL H5Tget_array_dims_f(filetype, adims, error)
-  CALL check("h5dget_type_f",error, total_error)
-  CALL VERIFY("H5Tget_array_dims_f", INT(adims(1)), adim0, total_error)
-  CALL VERIFY("H5Tget_array_dims_f", INT(adims(2)), adim1, total_error)
-  !
-  ! Get dataspace and allocate memory for read buffer.  This is a
-  ! three dimensional attribute when the array datatype is included.
-  !
-  CALL H5Dget_space_f(dset, space, error)
-  CALL check("H5Dget_space_f",error, error)
-  CALL H5Sget_simple_extent_dims_f(space, dims, maxdims, error)
-  CALL check("H5Sget_simple_extent_dims_f",error, total_error)
-  CALL VERIFY("H5Sget_simple_extent_dims_f", INT(dims(1)), dim0, total_error)
-
-  ALLOCATE(rdata(1:dims(1),1:adims(1),1:adims(2)))
-  !
-  ! Create the memory datatype.
-  ! 
-  CALL H5Tarray_create_f(H5T_NATIVE_INTEGER, 2, adims, memtype, error)
-  CALL check("H5Tarray_create_f",error, total_error)
-  !
-  ! Read the data.
-  !
-
-  f_ptr = C_LOC(rdata)
-  CALL H5Dread_f(dset, memtype, f_ptr, error)
-  CALL check("H5Dread_f",error, total_error)
-  !
-  ! Output the data to the screen.
-  !
-  i_loop: DO i = 1, INT(dims(1))
-             DO j=1, INT(adim0)
-                DO k = 1, INT(adim1)
-                   CALL VERIFY("H5Sget_simple_extent_dims_f",  rdata(i,j,k), wdata(i,j,k), total_error)
-                   IF(total_error.NE.0) EXIT i_loop
-                ENDDO
-             ENDDO
-          ENDDO i_loop
-  !
-  ! Close and release resources.
-  !
-  DEALLOCATE(rdata)
-  CALL H5Dclose_f(dset, error)
-  CALL check("h5dclose_f",error, total_error)
-  CALL H5Sclose_f(space, error)
-  CALL check("h5sclose_f",error, total_error)
-  CALL H5Tclose_f(filetype, error)
-  CALL check("h5tclose_f",error, total_error)
-  CALL H5Tclose_f(memtype, error)
-  CALL check("h5tclose_f",error, total_error)
-  CALL H5Fclose_f(file, error)
-  CALL check("h5fclose_f",error, total_error)
-
-END SUBROUTINE t_array
-
-SUBROUTINE t_enum(total_error)
-
-  USE HDF5
-  USE TH5_MISC
-  USE ISO_C_BINDING
-
-  IMPLICIT NONE
-
-  INTEGER, INTENT(INOUT) :: total_error
-
-  CHARACTER(LEN=19), PARAMETER :: filename  = "t_enum_F03.h5"
-  CHARACTER(LEN=3) , PARAMETER :: dataset   = "DS1"
-  INTEGER          , PARAMETER :: dim0      = 4
-  INTEGER          , PARAMETER :: dim1      = 7
-  INTEGER(HID_T)               :: F_BASET  ! File base type
-  INTEGER(HID_T)               :: M_BASET  ! Memory base type
-  INTEGER(SIZE_T)  , PARAMETER :: NAME_BUF_SIZE = 16
-
-! Enumerated type
-  INTEGER, PARAMETER :: SOLID=0, LIQUID=1, GAS=2, PLASMA=3
-
-  INTEGER(HID_T) :: file, filetype, memtype, space, dset ! Handles
-
-  INTEGER(hsize_t),   DIMENSION(1:2) :: dims = (/dim0, dim1/)
-  INTEGER, DIMENSION(1:dim0, 1:dim1), TARGET :: wdata ! Write buffer
-  INTEGER, DIMENSION(:,:), ALLOCATABLE, TARGET :: rdata ! Read buffer
-  INTEGER, DIMENSION(1:1), TARGET :: val
-
-  CHARACTER(LEN=6), DIMENSION(1:4) :: &
-       names = (/"SOLID ", "LIQUID", "GAS   ", "PLASMA"/)
-  CHARACTER(LEN=NAME_BUF_SIZE) :: name
-  INTEGER(HSIZE_T), DIMENSION(1:2) :: maxdims
-  INTEGER :: i, j, idx
-  TYPE(C_PTR) :: f_ptr
-  INTEGER :: error ! Error flag
-  !
-  ! Initialize DATA.
-  !
-  F_BASET   = H5T_STD_I16BE      ! File base type
-  M_BASET   = H5T_NATIVE_INTEGER ! Memory base type
-  DO i = 1, dim0
-     DO j = 1, dim1 
-        wdata(i,j) = MOD( (j-1)*(i-1), PLASMA+1)
-     ENDDO
-  ENDDO
-  !
-  ! Create a new file using the default properties.
-  !
-  CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file, error)
-  CALL check("h5fcreate_f",error, total_error)
-  !
-  ! Create the enumerated datatypes for file and memory.  This
-  ! process is simplified IF native types are used for the file,
-  ! as only one type must be defined.
-  !
-  CALL h5tenum_create_f(F_BASET, filetype, error)
-  CALL check("h5tenum_create_f",error, total_error)
-  
-  CALL h5tenum_create_f(M_BASET, memtype, error)
-  CALL check("h5tenum_create_f",error, total_error)
-
-  DO i = SOLID, PLASMA
-     !
-     ! Insert enumerated value for memtype.
-     !
-     val(1) = i
-     CALL H5Tenum_insert_f(memtype, TRIM(names(i+1)), C_LOC(val(1)), error)
-     CALL check("H5Tenum_insert_f", error, total_error)
-     !
-     ! Insert enumerated value for filetype.  We must first convert
-     ! the numerical value val to the base type of the destination.
-     !
-     f_ptr = C_LOC(val(1))
-     CALL H5Tconvert_f(M_BASET, F_BASET, INT(1,SIZE_T), f_ptr, error)
-     CALL check("H5Tconvert_f",error, total_error)
-     IF(i.GE.1)THEN ! test both F90 and F03 APIs
-        CALL H5Tenum_insert_f(filetype, TRIM(names(i+1)), f_ptr, error)
-     ELSE
-        CALL H5Tenum_insert_f(filetype, TRIM(names(i+1)), val(1), error)
-     ENDIF
-     CALL check("H5Tenum_insert_f",error, total_error)
-  ENDDO
-  !
-  ! Create dataspace.  Setting maximum size to be the current size.
-  !
-  CALL h5screate_simple_f(2, dims, space, total_error)
-  CALL check("h5screate_simple_f",error, total_error)
-  !
-  ! Create the dataset and write the enumerated data to it.
-  ! 
-  CALL h5dcreate_f(file, dataset, filetype, space, dset, error)
-  CALL check("h5dcreate_f",error, total_error)
-  f_ptr = C_LOC(wdata(1,1))
-  CALL h5dwrite_f(dset, memtype, f_ptr, error)
-  CALL check("h5dwrite_f",error, total_error)
-  !
-  ! Close and release resources.
-  !
-  CALL h5dclose_f(dset , error)
-  CALL check("h5dclose_f",error, total_error)
-  CALL h5sclose_f(space, error)
-  CALL check("h5sclose_f",error, total_error)
-  CALL h5tclose_f(filetype, error)
-  CALL check("h5tclose_f",error, total_error)
-  CALL h5fclose_f(file , error)
-  CALL check("h5fclose_f",error, total_error)
-
-  !
-  ! Now we begin the read section of this example.
-  !
-  ! Open file and dataset.
-  !
-  CALL h5fopen_f(filename, H5F_ACC_RDONLY_F, file, error)
-  CALL check("h5fopen_f",error, total_error)
-  CALL h5dopen_f (file, dataset, dset, error)
-  CALL check("h5dopen_f",error, total_error)
-  CALL h5dopen_f(file, dataset, dset, error)
-  CALL check("h5dopen_f",error, total_error)
-  !
-  ! Get dataspace and allocate memory for read buffer.
-  !
-  CALL h5dget_space_f(dset,space, error)
-  CALL check("H5Dget_space_f",error, total_error)
-  CALL h5sget_simple_extent_dims_f(space, dims, maxdims, error)
-  CALL check("H5Sget_simple_extent_dims_f",error, total_error)
-  CALL VERIFY("H5Sget_simple_extent_dims_f", INT(dims(1)), dim0, total_error)
-  CALL VERIFY("H5Sget_simple_extent_dims_f", INT(dims(2)), dim1, total_error)
-
-  ALLOCATE(rdata(1:dims(1),1:dims(2)))
-
-  !
-  ! Read the data.
-  !
-  f_ptr = C_LOC(rdata(1,1))
-  CALL h5dread_f(dset, memtype, f_ptr, error)
-  CALL check("H5Dread_f",error, total_error)
-
-  !
-  ! Output the data to the screen.
-  !
-  i_loop: DO i = 1, INT(dims(1))
-             DO j = 1, INT(dims(2))
-                !
-                ! Get the name of the enumeration member.
-                !
-                CALL h5tenum_nameof_f( memtype, rdata(i,j), NAME_BUF_SIZE, name, error)
-                CALL check("h5tenum_nameof_f",error, total_error)
-                idx = MOD( (j-1)*(i-1), PLASMA+1 ) + 1
-                CALL verifystring("h5tenum_nameof_f",TRIM(name),TRIM(names(idx)), total_error)
-                IF(total_error.NE.0) EXIT i_loop
-             ENDDO
-          ENDDO i_loop
-  !
-  ! Close and release resources.
-  !
-  DEALLOCATE(rdata)
-  CALL h5dclose_f(dset , error)
-  CALL check("h5dclose_f",error, total_error)
-  CALL h5sclose_f(space, error)
-  CALL check("h5sclose_f",error, total_error)
-  CALL h5tclose_f(memtype, error)
-  CALL check("h5tclose_f",error, total_error)
-  CALL h5fclose_f(file , error)
-  CALL check("h5fclose_f",error, total_error)
-  
-END SUBROUTINE t_enum
-
-SUBROUTINE t_bit(total_error)
-
-  USE HDF5
-  USE TH5_MISC
-  USE ISO_C_BINDING
-
-  IMPLICIT NONE
-
-  INTEGER, INTENT(INOUT) :: total_error
-
-  CHARACTER(LEN=20), PARAMETER :: filename  = "t_bit_F03.h5"
-  CHARACTER(LEN=3) , PARAMETER :: dataset   = "DS1"
-  INTEGER          , PARAMETER :: dim0      = 4
-  INTEGER          , PARAMETER :: dim1      = 7
-
-  INTEGER(HID_T)  :: file, space, dset ! Handles
-  INTEGER(HSIZE_T), DIMENSION(1:2)   :: dims = (/dim0, dim1/)
-  INTEGER(HSIZE_T), DIMENSION(1:2)   :: maxdims
-  INTEGER(C_SIGNED_CHAR), DIMENSION(1:dim0, 1:dim1), TARGET :: wdata              ! Write buffer 
-  INTEGER(C_SIGNED_CHAR), DIMENSION(:,:), ALLOCATABLE, TARGET :: rdata    ! Read buffer
-  INTEGER :: A, B, C, D
-  INTEGER :: Aw, Bw, Cw, Dw
-  INTEGER :: i, j
-  INTEGER, PARAMETER :: hex =  Z'00000003'
-  TYPE(C_PTR) :: f_ptr
-  INTEGER :: error     ! Error flag
-  !
-  ! Initialize data.  We will manually pack 4 2-bit integers into
-  ! each unsigned char data element.
-  !
-  DO i = 0, dim0-1
-     DO j = 0, dim1-1
-        wdata(i+1,j+1) = 0
-        wdata(i+1,j+1) = IOR( wdata(i+1,j+1), INT(IAND(i * j - j, hex),C_SIGNED_CHAR) )   ! Field "A"
-        wdata(i+1,j+1) = IOR( wdata(i+1,j+1), INT(ISHFT(IAND(i,hex),2),C_SIGNED_CHAR) )   ! Field "B"
-        wdata(i+1,j+1) = IOR( wdata(i+1,j+1), INT(ISHFT(IAND(j,hex),4),C_SIGNED_CHAR) )   ! Field "C"
-        wdata(i+1,j+1) = IOR( wdata(i+1,j+1), INT(ISHFT(IAND(i+j,hex),6),C_SIGNED_CHAR) ) ! Field "D"
-     ENDDO
-  ENDDO
-  !
-  ! Create a new file using the default properties.
-  !
-  CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file, error)
-  CALL check("h5fcreate_f",error, total_error)
-  !
-  ! Create dataspace.  Setting maximum size to be the current size.
-  !
-  CALL h5screate_simple_f(2, dims, space, error)
-  CALL check("h5screate_simple_f",error, total_error)
-  !
-  ! Create the dataset and write the bitfield data to it.
-  !
-  CALL H5Dcreate_f(file, dataset, H5T_STD_B8BE, space, dset, error)
-  CALL check("h5dcreate_f",error, total_error)
-  f_ptr = C_LOC(wdata(1,1))
-  CALL H5Dwrite_f(dset, H5T_NATIVE_B8, f_ptr, error)
-  CALL check("h5dwrite_f",error, total_error)
-  !
-  ! Close and release resources.
-  !
-  CALL H5Dclose_f(dset, error)
-  CALL check("h5dclose_f",error, total_error)
-  CALL H5Sclose_f(space, error)
-  CALL check("h5sclose_f",error, total_error)
-  CALL H5Fclose_f(file, error)
-  CALL check("h5fclose_f",error, total_error)
-  !
-  ! Now we begin the read section of this example. 
-  !
-  ! Open file, dataset.
-  !
-  CALL h5fopen_f(filename, H5F_ACC_RDONLY_F, file, error)
-  CALL check("h5fopen_f",error, total_error)
-  CALL h5dopen_f(file, dataset, dset, error)
-  CALL check("h5dopen_f",error, total_error)
-  !
-  ! Get dataspace and allocate memory for read buffer.
-  !
-  CALL H5Dget_space_f(dset, space, error)
-  CALL check("H5Dget_space_f",error, total_error)
-  CALL H5Sget_simple_extent_dims_f(space, dims, maxdims, error)
-  CALL check("H5Sget_simple_extent_dims_f",error, total_error)
-  CALL VERIFY("H5Sget_simple_extent_dims_f", INT(dims(1)), dim0, total_error)
-  CALL VERIFY("H5Sget_simple_extent_dims_f", INT(dims(2)), dim1, total_error)
-  ALLOCATE(rdata(1:dims(1),1:dims(2)))
-  !
-  ! Read the data.
-  !
-  f_ptr = C_LOC(rdata)
-  CALL H5Dread_f(dset,  H5T_NATIVE_B8, f_ptr, error)
-  CALL check("H5Dread_f",error, total_error)
-  !
-  ! Output the data to the screen.
-  !
-  i_loop: DO i = 1, INT(dims(1))
-            DO j = 1, INT(dims(2))
-               A = IAND(rdata(i,j), INT(hex,C_SIGNED_CHAR)) ! Retrieve field "A"
-               B = IAND(ISHFT(rdata(i,j),-2), INT(hex,C_SIGNED_CHAR)) ! Retrieve field "B"
-               C = IAND(ISHFT(rdata(i,j),-4), INT(hex,C_SIGNED_CHAR)) ! Retrieve field "C"
-               D = IAND(ISHFT(rdata(i,j),-6), INT(hex,C_SIGNED_CHAR)) ! Retrieve field "D"
-               
-               Aw = IAND(wdata(i,j), INT(hex,C_SIGNED_CHAR)) 
-               Bw = IAND(ISHFT(wdata(i,j),-2), INT(hex,C_SIGNED_CHAR))
-               Cw = IAND(ISHFT(wdata(i,j),-4), INT(hex,C_SIGNED_CHAR))
-               Dw = IAND(ISHFT(wdata(i,j),-6), INT(hex,C_SIGNED_CHAR))
-
-               CALL VERIFY("bitfield", A, Aw, total_error)
-               CALL VERIFY("bitfield", B, Bw, total_error)
-               CALL VERIFY("bitfield", C, Cw, total_error)
-               CALL VERIFY("bitfield", D, Dw, total_error)
-               IF(total_error.NE.0) EXIT i_loop
-            ENDDO
-         ENDDO i_loop
-  !
-  ! Close and release resources.
-  !
-  DEALLOCATE(rdata)
-  CALL H5Dclose_f(dset, error)
-  CALL check("h5dclose_f",error, total_error)
-  CALL H5Sclose_f(space, error)
-  CALL check("h5sclose_f",error, total_error)
-  CALL H5Fclose_f(file, error)
-  CALL check("h5fclose_f",error, total_error)
-
-END SUBROUTINE t_bit
-
-SUBROUTINE t_opaque(total_error)
-
-  USE HDF5
-  USE TH5_MISC
-  USE ISO_C_BINDING
-
-  IMPLICIT NONE
-
-  INTEGER, INTENT(INOUT) :: total_error
-  CHARACTER(LEN=20), PARAMETER :: filename  = "t_opaque_F03.h5"
-  CHARACTER(LEN=3) , PARAMETER :: dataset   = "DS1"
-  INTEGER          , PARAMETER :: dim0      = 4
-  INTEGER(SIZE_T)  , PARAMETER :: size      = 7
-  INTEGER(HID_T)  :: file, space, dtype, dset ! Handles
-  INTEGER(size_t) :: len
-  INTEGER(hsize_t),   DIMENSION(1:1) :: dims = (/DIM0/)
-
-  CHARACTER(LEN=size), DIMENSION(1:dim0), TARGET :: wdata ! Write buffer
-  CHARACTER(LEN=size), DIMENSION(:), ALLOCATABLE, TARGET :: rdata ! Read buffer
-  CHARACTER(LEN=size-1) :: str = "OPAQUE"
-  
-  CHARACTER(LEN=14) :: tag_sm    ! Test reading obaque tag into 
-  CHARACTER(LEN=15) :: tag_exact ! buffers that are: to small, exact
-  CHARACTER(LEN=17) :: tag_big   ! and to big.
-
-  INTEGER :: taglen
-  INTEGER(HSIZE_T), DIMENSION(1:1) :: maxdims
-  INTEGER(hsize_t) :: i
-  CHARACTER(LEN=1) :: ichr
-  TYPE(C_PTR) :: f_ptr
-  INTEGER :: error
-  !
-  ! Initialize data.
-  !
-  DO i = 1, dim0
-     WRITE(ichr,'(I1)') i-1 
-     wdata(i) = str//ichr
-  ENDDO
-  !
-  ! Create a new file using the default properties.
-  !
-  CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file, error)
-  CALL check("h5fcreate_f",error, total_error)
-  !
-  ! Create opaque datatype and set the tag to something appropriate.
-  ! For this example we will write and view the data as a character
-  ! array.
-  !
-  CALL h5tcreate_f(h5T_OPAQUE_F, size, dtype, error)
-  CALL check("h5tcreate_f",error, total_error)
-  CALL h5tset_tag_f(dtype,"Character array",error)
-  CALL check("h5tset_tag_f",error, total_error)
-  !
-  ! Create dataspace.  Setting maximum size to be the current size.
-  !
-  CALL h5screate_simple_f(1, dims, space, error)
-  CALL check("h5screate_simple_f",error, total_error)
-  !
-  ! Create the dataset and write the opaque data to it.
-  !
-  CALL h5dcreate_f(file, dataset, dtype, space, dset, error)
-  CALL check("h5dcreate_f",error, total_error)
-  f_ptr = C_LOC(wdata(1)(1:1))
-  CALL h5dwrite_f(dset, dtype, f_ptr, error)
-  CALL check("h5dwrite_f",error, total_error)
-  !
-  ! Close and release resources.
-  !
-  CALL H5Dclose_f(dset, error)
-  CALL check("h5dclose_f",error, total_error)
-  CALL H5Sclose_f(space, error)
-  CALL check("h5sclose_f",error, total_error)
-  CALL H5Tclose_f(dtype, error)
-  CALL check("h5tclose_f",error, total_error)
-  CALL H5Fclose_f(file, error)
-  CALL check("h5fclose_f",error, total_error)
-  !
-  ! Now we begin the read section of this example.
-  !
-  ! Open file and dataset.
-  !
-  CALL h5fopen_f(filename, H5F_ACC_RDONLY_F, file, error)
-  CALL check("h5fopen_f",error, total_error)
-  CALL h5dopen_f(file, dataset, dset, error)
-  CALL check("h5dopen_f",error, total_error)
-  !
-  ! Get datatype and properties for the datatype.
-  !
-  CALL h5dget_type_f(dset, dtype, error)
-  CALL check("h5dget_type_f",error, total_error)
-  CALL h5tget_size_f(dtype, len, error)
-  CALL check("h5tget_size_f",error, total_error)
-
-  ! Next tests should return 
-  ! opaque_tag = tag = "Character array" and the actual length = 15
-  
-  ! Test reading into a string that is to small
-  CALL h5tget_tag_f(dtype, tag_sm, taglen, error)
-  CALL check("h5tget_tag_f",error, total_error)
-  CALL VERIFY("h5tget_tag_f", taglen, 15, total_error)
-  CALL verifystring("h5tget_tag_f",tag_sm,"Character arra", total_error)
-  
-  ! Test reading into a string that is exact
-  CALL h5tget_tag_f(dtype, tag_exact, taglen, error)
-  CALL check("h5tget_tag_f",error, total_error)
-  CALL VERIFY("h5tget_tag_f", taglen, 15, total_error)
-  CALL verifystring("h5tget_tag_f",tag_exact,"Character array", total_error)
-
-  ! Test reading into a string that is to big
-  CALL h5tget_tag_f(dtype, tag_big, taglen, error)
-  CALL check("h5tget_tag_f",error, total_error)
-  CALL VERIFY("h5tget_tag_f", taglen, 15, total_error)
-  CALL verifystring("h5tget_tag_f",tag_big,"Character array  ", total_error)
-  
-  !
-  ! Get dataspace and allocate memory for read buffer.
-  !
-  CALL h5dget_space_f(dset, space, error)
-  CALL check("H5Dget_space_f",error, total_error)
-  CALL h5sget_simple_extent_dims_f(space, dims, maxdims, error)
-  CALL check("H5Sget_simple_extent_dims_f",error, total_error)
-  CALL VERIFY("H5Sget_simple_extent_dims_f", INT(dims(1)), dim0, total_error)
-  ALLOCATE(rdata(1:dims(1)))
-  !
-  ! Read the data.
-  !
-  f_ptr = C_LOC(rdata(1)(1:1))
-  CALL h5dread_f(dset, dtype, f_ptr, error)
-  CALL check("H5Dread_f",error, total_error)
-  !
-  DO i = 1, dims(1)
-     CALL verifystring("t_opaque",TRIM(rdata(i)),TRIM(wdata(i)), total_error)
-  ENDDO
-  !
-  ! Close and release resources.
-  !
-  DEALLOCATE(rdata)
-  CALL H5Dclose_f(dset, error)
-  CALL check("h5dclose_f",error, total_error)
-  CALL H5Sclose_f(space, error)
-  CALL check("h5sclose_f",error, total_error)
-  CALL H5Tclose_f(dtype, error)
-  CALL check("h5tclose_f",error, total_error)
-  CALL H5Fclose_f(file, error)
-  CALL check("h5fclose_f",error, total_error)
-  
-END SUBROUTINE t_opaque
-
-SUBROUTINE t_objref(total_error)
-
-  USE HDF5
-  USE TH5_MISC
-  USE ISO_C_BINDING
-
-  IMPLICIT NONE
-
-  INTEGER, INTENT(INOUT) :: total_error
-  CHARACTER(LEN=20), PARAMETER :: filename  = "t_objref_F03.h5"
-  CHARACTER(LEN=3) , PARAMETER :: dataset   = "DS1"
-  INTEGER          , PARAMETER :: dim0      = 2
-
-  INTEGER(HID_T)  :: file, space, dset, obj ! Handles
-  INTEGER :: error
-
-  INTEGER(hsize_t),   DIMENSION(1:1) :: dims = (/dim0/)
-  TYPE(hobj_ref_t_f), DIMENSION(1:dim0), TARGET :: wdata ! Write buffer
-  TYPE(hobj_ref_t_f), DIMENSION(:), ALLOCATABLE, TARGET :: rdata ! Read buffer
-  INTEGER :: objtype
-  INTEGER(SIZE_T) :: name_size
-  CHARACTER(LEN=80) :: name
-  INTEGER(HSIZE_T), DIMENSION(1:1) :: maxdims
-  INTEGER :: i
-  TYPE(C_PTR) :: f_ptr
-  !
-  ! Create a new file using the default properties.
-  !
-  CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file, error)
-  CALL check("h5fcreate_f",error, total_error)
-  !
-  ! Create a dataset with a null dataspace.
-  !
-  CALL h5screate_f(H5S_NULL_F,space,error)
-  CALL check("h5screate_f",error, total_error)
-  CALL h5dcreate_f(file, "DS2", H5T_STD_I32LE, space, obj, error)
-  CALL check("h5dcreate_f",error, total_error)
-  !
-  CALL h5dclose_f(obj  , error)
-  CALL check("h5dclose_f",error, total_error)
-  CALL h5sclose_f(space, error)
-  CALL check("h5sclose_f",error, total_error)
-  !
-  ! Create a group.
-  !
-  CALL h5gcreate_f(file, "G1", obj, error)
-  CALL check("h5gcreate_f",error, total_error)
-  CALL h5gclose_f(obj, error)
-  CALL check("h5gclose_f",error, total_error)
-  !
-  ! Create references to the previously created objects. note, space_id
-  ! is not needed for object references.
-  !
-  f_ptr = C_LOC(wdata(1))
-  CALL H5Rcreate_f(file, "G1", H5R_OBJECT_F, f_ptr, error)
-  CALL check("H5Rcreate_f",error, total_error)
-  f_ptr = C_LOC(wdata(2))
-  CALL H5Rcreate_f(file, "DS2", H5R_OBJECT_F, f_ptr, error)
-  CALL check("H5Rcreate_f",error, total_error)
-  !
-  ! Create dataspace.  Setting maximum size to be the current size.
-  !
-  CALL h5screate_simple_f(1, dims, space, error)
-  CALL check("h5screate_simple_f",error, total_error)
-  !
-  ! Create the dataset and write the object references to it.
-  !
-  CALL h5dcreate_f(file, dataset, H5T_STD_REF_OBJ, space, dset, error)
-  CALL check("h5dcreate_f",error, total_error)
-  
-  f_ptr = C_LOC(wdata(1))
-  CALL h5dwrite_f(dset, H5T_STD_REF_OBJ, f_ptr, error)
-  CALL check("h5dwrite_f",error, total_error)
-  !
-  ! Close and release resources.
-  !
-  CALL h5dclose_f(dset , error)
-  CALL check("h5dclose_f",error, total_error)
-  CALL h5sclose_f(space, error)
-  CALL check("h5sclose_f",error, total_error)
-  CALL h5fclose_f(file , error)
-  CALL check("h5fclose_f",error, total_error)
-  !
-  ! Now we begin the read section of this example.
-  !
-  ! Open file and dataset.
-  !
-  CALL h5fopen_f(filename, H5F_ACC_RDONLY_F, file, error)
-  CALL check("h5fopen_f",error, total_error)
-  CALL h5dopen_f(file, dataset, dset, error)
-  CALL check("h5dopen_f",error, total_error)
-  !
-  ! Get dataspace and allocate memory for read buffer.
-  !
-  CALL h5dget_space_f(dset, space, error)
-  CALL check("H5Dget_space_f",error, total_error)
-  CALL h5sget_simple_extent_dims_f(space, dims, maxdims, error)
-  CALL check("H5Sget_simple_extent_dims_f",error, total_error)
-  CALL VERIFY("H5Sget_simple_extent_dims_f", INT(dims(1)), dim0, total_error)
-
-  ALLOCATE(rdata(1:maxdims(1)))
-  !
-  ! Read the data.
-  !
-  f_ptr = C_LOC(rdata(1))
-  CALL h5dread_f( dset, H5T_STD_REF_OBJ, f_ptr, error)
-  CALL check("H5Dread_f",error, total_error)
-  !
-  ! Output the data to the screen.
-  !
-  DO i = 1, INT(maxdims(1))
-     !
-     ! Open the referenced object, get its name and type.
-     !
-     f_ptr = C_LOC(rdata(i))
-     CALL H5Rdereference_f(dset, H5R_OBJECT_F, f_ptr, obj, error)
-     CALL check("H5Rdereference_f",error, total_error)
-     CALL H5Rget_obj_type_f(dset, H5R_OBJECT_F, f_ptr, objtype, error)
-     CALL check("H5Rget_obj_type_f",error, total_error)
-     !
-     ! Get the length of the name and name
-     !
-     name(:) = ' ' ! initialize string to blanks
-     CALL H5Iget_name_f(obj, name, 80_size_t, name_size, error)
-     CALL check("H5Iget_name_f",error, total_error)
-     !
-     ! Print the object type and close the object.
-     !
-     IF(objtype.EQ.H5G_GROUP_F)THEN
-        CALL verifystring("t_objref", name(1:name_size),"/G1", total_error)
-     ELSE IF(objtype.EQ.H5G_DATASET_F)THEN
-        CALL verifystring("t_objref", name(1:name_size),"/DS2", total_error)
-     ELSE
-        total_error = total_error + 1
-     ENDIF
-     CALL h5oclose_f(obj, error)
-     CALL check("h5oclose_f",error, total_error)
-
-  END DO
-  !
-  ! Close and release resources.
-  !
-  DEALLOCATE(rdata)
-  CALL h5dclose_f(dset , error)
-  CALL check("h5dclose_f",error, total_error)
-  CALL h5sclose_f(space, error)
-  CALL check("h5sclose_f",error, total_error)
-  CALL h5fclose_f(file , error)
-  CALL check("h5fclose_f",error, total_error)
-
-END SUBROUTINE t_objref
-
-
-SUBROUTINE t_regref(total_error)
-
-  USE HDF5
-  USE TH5_MISC
-  USE ISO_C_BINDING
-
-  IMPLICIT NONE
-
-  INTEGER, INTENT(INOUT) :: total_error
-  CHARACTER(LEN=22), PARAMETER :: filename  = "t_regref_F03.h5"
-  CHARACTER(LEN=3) , PARAMETER :: dataset   = "DS1"
-  CHARACTER(LEN=3) , PARAMETER :: dataset2  = "DS2"
-  INTEGER          , PARAMETER :: dim0      = 2
-  INTEGER          , PARAMETER :: ds2dim0   = 16
-  INTEGER          , PARAMETER :: ds2dim1   = 3
-
-  INTEGER(HID_T)  :: file, memspace, space, dset, dset2 ! Handles
-  INTEGER :: error
-
-  INTEGER(HSIZE_T), DIMENSION(1:1)   :: dims = (/dim0/)
-  INTEGER(HSIZE_T), DIMENSION(1:1)   :: dims3 
-  INTEGER(HSIZE_T), DIMENSION(1:2)   :: dims2 = (/ds2dim0,ds2dim1/)
-
-  INTEGER(HSIZE_T), DIMENSION(1:2,1:4) :: coords = RESHAPE((/2,1,12,3,1,2,5,3/),(/2,4/))
-  
-  INTEGER(HSIZE_T), DIMENSION(1:2) :: start=(/0,0/),stride=(/11,2/),count=(/2,2/), BLOCK=(/3,1/)
-
-  INTEGER(HSIZE_T), DIMENSION(1:1) :: maxdims
-  INTEGER(hssize_t) :: npoints
-  TYPE(hdset_reg_ref_t_f03), DIMENSION(1:dim0), TARGET :: wdata ! Write buffer
-  TYPE(hdset_reg_ref_t_f03), DIMENSION(:), ALLOCATABLE, TARGET :: rdata ! Read buffer
-
-  INTEGER(size_t) :: size
-  CHARACTER(LEN=1), DIMENSION(1:ds2dim0,1:ds2dim1), TARGET :: wdata2
-
-  CHARACTER(LEN=80),DIMENSION(1:1), TARGET :: rdata2
-  CHARACTER(LEN=80) :: name
-  INTEGER(hsize_t) :: i
-  TYPE(C_PTR) :: f_ptr
-  CHARACTER(LEN=ds2dim0) :: chrvar
-  CHARACTER(LEN=20), DIMENSION(1:2) :: chrref_correct
-
-  chrvar = "The quick brown "
-  READ(chrvar,'(16A1)') wdata2(1:16,1)
-  chrvar = "fox jumps over  "
-  READ(chrvar,'(16A1)') wdata2(1:16,2)
-  chrvar = "the 5 lazy dogs "
-  READ(chrvar,'(16A1)') wdata2(1:16,3)
-
-  chrref_correct(1) = 'hdf5'
-  chrref_correct(2) = 'Therowthedog'
-
-  !
-  ! Create a new file using the default properties.
-  !
-  CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file, error)
-  CALL check("h5fcreate_f",error, total_error)
-  !
-  ! Create a dataset with character data.
-  !
-  CALL h5screate_simple_f(2, dims2, space, error)
-  CALL check("h5screate_simple_f",error, total_error)
-  CALL h5dcreate_f(file,dataset2, H5T_STD_I8LE, space, dset2, error)
-  CALL check("h5dcreate_f",error, total_error)
-  f_ptr = C_LOC(wdata2(1,1))
-  CALL h5dwrite_f(dset2, H5T_NATIVE_INTEGER_1, f_ptr, error)
-  CALL check("h5dwrite_f",error, total_error)
-  !
-  ! Create reference to a list of elements in dset2.
-  !
-  CALL h5sselect_elements_f(space, H5S_SELECT_SET_F, 2, INT(4,size_t), coords, error)
-  CALL check("h5sselect_elements_f",error, total_error)
-  f_ptr = C_LOC(wdata(1))
-  CALL h5rcreate_f(file, DATASET2, H5R_DATASET_REGION_F, f_ptr, error, space)
-  CALL check("h5rcreate_f",error, total_error)
-  !
-  ! Create reference to a hyperslab in dset2, close dataspace.
-  !
-  CALL h5sselect_hyperslab_f (space, H5S_SELECT_SET_F, start, count, error, stride, block)
-  CALL check("h5sselect_hyperslab_f",error, total_error)
-  f_ptr = C_LOC(wdata(2))
-  CALL h5rcreate_f(file, DATASET2, H5R_DATASET_REGION_F, f_ptr, error, space)
-  CALL check("h5rcreate_f",error, total_error)
-
-  CALL h5sclose_f(space, error)
-  CALL check("h5sclose_f",error, total_error)
-  !
-  ! Create dataspace.  Setting maximum size to the current size.
-  !
-  CALL h5screate_simple_f(1, dims, space, error)
-  CALL check("h5screate_simple_f",error, total_error)
-
-  !
-  ! Create the dataset and write the region references to it.
-  !
-  CALL h5dcreate_f(file, dataset, H5T_STD_REF_DSETREG, space, dset, error)
-  CALL check("h5dcreate_f",error, total_error)
-  f_ptr = C_LOC(wdata(1))
-  CALL h5dwrite_f(dset, H5T_STD_REF_DSETREG, f_ptr, error)
-  CALL check("h5dwrite_f",error, total_error)
-  !
-  ! Close and release resources.
-  !
-  CALL h5dclose_f(dset , error)
-  CALL check("h5dclose_f",error, total_error)
-  CALL h5dclose_f(dset2, error)
-  CALL check("h5dclose_f",error, total_error)
-  CALL h5sclose_f(space, error)
-  CALL check("h5sclose_f",error, total_error)
-  CALL h5fclose_f(file , error)
-  CALL check("h5fclose_f",error, total_error)
-  !
-  ! Now we begin the read section of this example.
-  !
-  !
-  ! Open file and dataset.
-  !
-  CALL h5fopen_f(filename, H5F_ACC_RDONLY_F, file, error)
-  CALL check("h5fopen_f",error, total_error)
-  CALL h5dopen_f(file, dataset, dset, error)
-  CALL check("h5dopen_f",error, total_error)
-  !
-  ! Get dataspace and allocate memory for read buffer.
-  !
-  CALL h5dget_space_f(dset, space, error)
-  CALL check("H5Dget_space_f",error, total_error)
-  CALL h5sget_simple_extent_dims_f(space, dims, maxdims, error)
-  CALL check("H5Sget_simple_extent_dims_f",error, total_error)
-  CALL VERIFY("H5Sget_simple_extent_dims_f", INT(dims(1)), dim0, total_error)
-  ALLOCATE(rdata(1:dims(1)))
-  CALL h5sclose_f(space, error)
-  CALL check("h5sclose_f",error, total_error)
-  !
-  ! Read the data.
-  !
-  f_ptr = C_LOC(rdata(1))
-  CALL h5dread_f( dset, H5T_STD_REF_DSETREG, f_ptr, error)
-  CALL check("H5Dread_f",error, total_error)
-  !
-  ! Output the data to the screen.
-  !
-  DO i = 1, dims(1)
-     
-     !
-     ! Open the referenced object, retrieve its region as a
-     ! dataspace selection.
-     !
-     f_ptr = C_LOC(rdata(i))
-     CALL H5Rdereference_f(dset, H5R_DATASET_REGION_F, f_ptr, dset2, error)
-     CALL check("H5Rdereference_f",error, total_error)
- 
-     CALL H5Rget_region_f(dset, f_ptr, space, error)
-     CALL check("H5Rget_region_f",error, total_error)
-  
-     !
-     ! Get the object's name
-     !
-     name(:) = ' ' ! initialize string to blanks
-     CALL H5Iget_name_f(dset2, name, 80_size_t, size, error)
-     CALL check("H5Iget_name_f",error, total_error)
-     CALL VERIFY("H5Iget_name_f", INT(size), LEN_TRIM(name), total_error)
-     CALL verifystring("H5Iget_name_f",name(1:size),TRIM(name), total_error)
-     !
-     ! Allocate space for the read buffer.
-     !
-     CALL H5Sget_select_npoints_f(space, npoints, error)
-     CALL check("H5Sget_select_npoints_f",error, total_error)
-     CALL VERIFY("H5Sget_select_npoints_f", INT(npoints), LEN_TRIM(chrref_correct(i)), total_error)
-     
-     dims3(1) = npoints
-     !
-     ! Read the dataset region.
-     !
-     CALL h5screate_simple_f(1, dims3, memspace, error)
-     CALL check("h5screate_simple_f",error, total_error)
-
-     f_ptr = C_LOC(rdata2(1)(1:1))
-     CALL h5dread_f( dset2, H5T_NATIVE_INTEGER_1, f_ptr, error, memspace, space)
-     CALL check("H5Dread_f",error, total_error)
-     CALL verifystring("h5dread_f",rdata2(1)(1:npoints),TRIM(chrref_correct(i)), total_error)
-
-     CALL H5Sclose_f(space, error)
-     CALL check("h5sclose_f",error, total_error)
-     CALL H5Sclose_f(memspace, error)
-     CALL check("h5sclose_f",error, total_error)
-     CALL H5Dclose_f(dset2, error)
-     CALL check("h5dclose_f",error, total_error)
-
-  END DO
-  !
-  ! Close and release resources.
-  !
-  DEALLOCATE(rdata)
-  CALL H5Dclose_f(dset, error)
-  CALL check("h5dclose_f",error, total_error)
-  CALL H5Fclose_f(file, error)
-  CALL check("h5fclose_f",error, total_error)
-
-END SUBROUTINE t_regref
-
-SUBROUTINE t_vlen(total_error)
-
-  USE HDF5
-  USE TH5_MISC
-  USE ISO_C_BINDING
-
-  IMPLICIT NONE
-
-  INTEGER, INTENT(INOUT) :: total_error
-  CHARACTER(LEN=18), PARAMETER :: filename  = "t_vlen_F03.h5"
-  CHARACTER(LEN=3) , PARAMETER :: dataset   = "DS1"
-  INTEGER, PARAMETER :: LEN0 = 3
-  INTEGER, PARAMETER :: LEN1 = 12
-  INTEGER(hsize_t) :: dim0
-
-  INTEGER(HID_T)  :: file, filetype, memtype, space, dset ! Handles
-  INTEGER :: error
-  INTEGER(HSIZE_T), DIMENSION(1:2)   :: maxdims
-  INTEGER :: i, j
-
-  ! vl data
-  TYPE vl
-     INTEGER, DIMENSION(:), POINTER :: DATA
-  END TYPE vl
-  TYPE(vl), DIMENSION(:), ALLOCATABLE, TARGET :: ptr
-
-
-  TYPE(hvl_t), DIMENSION(1:2), TARGET :: wdata ! Array of vlen structures
-  TYPE(hvl_t), DIMENSION(1:2), TARGET :: rdata ! Pointer to vlen structures
-
-  INTEGER(hsize_t), DIMENSION(1:1) :: dims = (/2/)
-  INTEGER, DIMENSION(:), POINTER :: ptr_r 
-  TYPE(C_PTR) :: f_ptr
-  
-  !
-  ! Initialize variable-length data.  wdata(1) is a countdown of
-  ! length LEN0, wdata(2) is a Fibonacci sequence of length LEN1.
-  !
-  wdata(1)%len = LEN0
-  wdata(2)%len = LEN1
-
-  ALLOCATE( ptr(1:2) )
-  ALLOCATE( ptr(1)%data(1:wdata(1)%len) )
-  ALLOCATE( ptr(2)%data(1:wdata(2)%len) )
-
-  DO i=1, wdata(1)%len
-     ptr(1)%data(i) = wdata(1)%len - i + 1 ! 3 2 1
-  ENDDO
-  wdata(1)%p = C_LOC(ptr(1)%data(1))
-
-  ptr(2)%data(1:2) = 1
-  DO i = 3, wdata(2)%len
-     ptr(2)%data(i) = ptr(2)%data(i-1) + ptr(2)%data(i-2) ! (1 1 2 3 5 8 etc.)
-  ENDDO
-  wdata(2)%p = C_LOC(ptr(2)%data(1))
-
-  !
-  ! Create a new file using the default properties.
-  !
-  CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file, error)
-  CALL check("h5fcreate_f",error, total_error)
-  !
-  ! Create variable-length datatype for file and memory.
-  !
-  CALL H5Tvlen_create_f(H5T_STD_I32LE, filetype, error)
-  CALL check("H5Tvlen_create_f",error, total_error)
-  CALL H5Tvlen_create_f(H5T_NATIVE_INTEGER, memtype, error)
-  CALL check("H5Tvlen_create_f",error, total_error)
-  !
-  ! Create dataspace.
-  !
-  CALL h5screate_simple_f(1, dims, space, error)
-  CALL check("h5screate_simple_f",error, total_error)
-  !
-  ! Create the dataset and write the variable-length data to it.
-  !
-  CALL H5Dcreate_f(file, dataset, filetype, space, dset, error)
-  CALL check("h5dcreate_f",error, total_error)
- 
-  f_ptr = C_LOC(wdata(1))
-  CALL h5dwrite_f(dset, memtype, f_ptr, error)
-  CALL check("h5dwrite_f",error, total_error)
-  !
-  ! Close and release resources.  Note the use of H5Dvlen_reclaim
-  ! removes the need to manually deallocate the previously allocated
-  ! data.
-  !
-
-  CALL h5dclose_f(dset , error)
-  CALL check("h5dclose_f",error, total_error)
-  CALL h5sclose_f(space, error)
-  CALL check("h5sclose_f",error, total_error)
-  CALL H5Tclose_f(filetype, error)
-  CALL check("h5tclose_f",error, total_error)
-  CALL H5Tclose_f(memtype, error)
-  CALL check("h5tclose_f",error, total_error)
-  CALL h5fclose_f(file , error)
-  CALL check("h5fclose_f",error, total_error)
-
-  !
-  ! Now we begin the read section of this example.
-
-  !
-  ! Open file and dataset.
-  !
-  CALL h5fopen_f(filename, H5F_ACC_RDONLY_F, file, error)
-  CALL check("h5fopen_f",error, total_error)
-  CALL h5dopen_f(file, dataset, dset, error)
-  CALL check("h5dopen_f",error, total_error)
-
-  !
-  ! Get dataspace and allocate memory for array of vlen structures.
-  ! This does not actually allocate memory for the vlen data, that
-  ! will be done by the library.
-  !
-  CALL H5Dget_space_f(dset, space, error)
-  CALL check("H5Dget_space_f",error, total_error)
-  dim0 = dims(1)
-  CALL H5Sget_simple_extent_dims_f(space, dims, maxdims, error) 
-  CALL check("H5Sget_simple_extent_dims_f",error, total_error)
-  CALL VERIFY("H5Sget_simple_extent_dims_f", INT(dims(1)), INT(dim0), total_error)
-
-  !
-  ! Create the memory datatype.
-  !
-  CALL H5Tvlen_create_f(H5T_NATIVE_INTEGER, memtype, error) 
-  CALL check("H5Tvlen_create_f",error, total_error)
-
-  !
-  ! Read the data.
-  !
-  f_ptr = C_LOC(rdata(1))
-  CALL H5Dread_f(dset, memtype, f_ptr, error)
-  CALL check("H5Dread_f",error, total_error)
-
-  DO i = 1, INT(dims(1))
-     CALL c_f_pointer(rdata(i)%p, ptr_r, [rdata(i)%len] )
-     DO j = 1, rdata(i)%len
-        CALL VERIFY("t_vlen", ptr_r(j), ptr(i)%data(j), total_error)
-     ENDDO
-  ENDDO
-  !
-  ! Close and release resources.
-  !
-  DEALLOCATE(ptr)
-  CALL h5dvlen_reclaim_f(memtype, space, H5P_DEFAULT_F, f_ptr, error)
-  CALL h5dclose_f(dset, error)
-  CALL check("h5dclose_f",error, total_error)
-  CALL h5sclose_f(space, error)
-  CALL check("h5sclose_f",error, total_error)
-  CALL H5Tclose_f(memtype, error)
-  CALL check("h5tclose_f",error, total_error)
-  CALL h5fclose_f(file, error)
-  CALL check("h5fclose_f",error, total_error)
-
-END SUBROUTINE t_vlen
-
-
-SUBROUTINE t_vlstring(total_error)
-
-  USE HDF5
-  USE TH5_MISC
-  USE ISO_C_BINDING
-
-  IMPLICIT NONE
-
-  INTEGER, INTENT(INOUT) :: total_error
-
-  CHARACTER(LEN=18), PARAMETER :: filename  = "t_vlstring.h5"
-  CHARACTER(LEN=3) , PARAMETER :: dataset   = "DS1"
-
-  INTEGER(SIZE_T), PARAMETER :: dim0      = 4
-  INTEGER(SIZE_T), PARAMETER :: sdim      = 7
-  INTEGER(HID_T)  :: file, filetype, space, dset ! Handles
-  INTEGER :: error
-  INTEGER(HSIZE_T), DIMENSION(1:1) :: dims = (/dim0/)
-  INTEGER(HSIZE_T), DIMENSION(1:2) :: maxdims
-  
-  CHARACTER(LEN=sdim), DIMENSION(1:dim0), TARGET :: &
-       wdata = (/"Parting", "is such", "sweet  ", "sorrow."/) ! Write buffer
-  CHARACTER(LEN=sdim), DIMENSION(:), ALLOCATABLE :: rdata ! Read buffer
-  INTEGER(HSIZE_T), DIMENSION(2) :: data_dims = (/sdim,dim0/)
-  INTEGER(SIZE_T), DIMENSION(4) :: str_len = (/7,7,5,7/)
-  INTEGER(hsize_t) :: i
-
-  !
-  ! Create a new file using the default properties.
-  !
-  CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file, error)
-  CALL check("h5fcreate_f",error, total_error)
-  !
-  ! Create file and memory datatypes.  For this example we will save
-  ! the strings as C variable length strings, H5T_STRING is defined
-  ! as a variable length string.
-  !
-  CALL H5Tcopy_f(H5T_STRING, filetype, error)
-  CALL check("H5Tcopy_f",error, total_error)
-  CALL H5Tset_strpad_f(filetype, H5T_STR_NULLPAD_F, error)
-  CALL check("H5Tset_strpad_f",error, total_error)
-  !
-  ! Create dataspace.
-  !
-  CALL h5screate_simple_f(1, dims, space, error)
-  CALL check("h5screate_simple_f",error, total_error)
-  !
-  ! Create the dataset and write the variable-length string data to
-  ! it.
-  !
-  CALL h5dcreate_f(file, dataset, filetype, space, dset, error)
-  CALL check("h5dcreate_f",error, total_error)
-
-  CALL h5dwrite_vl_f(dset, filetype, wdata, data_dims, str_len, error, space)
-  CALL check("h5dwrite_vl_f",error, total_error)
-
-  !
-  ! Close and release resources.
-  !
-  CALL h5dclose_f(dset , error)
-  CALL check("h5dclose_f",error, total_error)
-  CALL h5sclose_f(space, error)
-  CALL check("h5sclose_f",error, total_error)
-  CALL H5Tclose_f(filetype, error)
-  CALL check("h5tclose_f",error, total_error)
-  CALL h5fclose_f(file , error)
-  CALL check("h5fclose_f",error, total_error)
-
-  !
-  ! Now we begin the read section of this example.
-  !
-  !
-  ! Open file and dataset.
-  !
-  CALL h5fopen_f(filename, H5F_ACC_RDONLY_F, file, error)
-  CALL check("h5fopen_f",error, total_error)
-  CALL h5dopen_f(file, dataset, dset, error)
-  CALL check("h5dopen_f",error, total_error)
-  !
-  ! Get the datatype.
-  !
-  CALL H5Dget_type_f(dset, filetype, error)
-  CALL check("H5Dget_type_f",error, total_error)
-  !
-  ! Get dataspace and allocate memory for read buffer.
-  !
-  CALL H5Dget_space_f(dset, space, error)
-  CALL check("H5Dget_space_f",error, total_error)
-  CALL H5Sget_simple_extent_dims_f(space, dims, maxdims, error) 
-  CALL check("H5Sget_simple_extent_dims_f",error, total_error)
-  CALL VERIFY("H5Sget_simple_extent_dims_f", INT(dims(1)), INT(dim0), total_error)
-
-  ALLOCATE(rdata(1:dims(1)))
-
-  !
-  ! Read the data.
-  !
-  CALL h5dread_vl_f(dset, filetype, rdata, data_dims, str_len, error, space)
-  CALL check("H5Dread_vl_f",error, total_error)
-
-  !
-  ! Output the data to the screen.
-  !
-  DO i = 1, dims(1)
-     CALL verifystring("h5dopen_f",TRIM(rdata(i)),TRIM(wdata(i)) , total_error)
-  END DO
-
-  DEALLOCATE(rdata)
-  CALL h5dclose_f(dset, error)
-  CALL check("h5dclose_f",error, total_error)
-  CALL h5sclose_f(space, error)
-  CALL check("h5sclose_f",error, total_error)
-  CALL H5Tclose_f(filetype, error)
-  CALL check("h5tclose_f",error, total_error)
-  CALL h5fclose_f(file , error)
-  CALL check("h5fclose_f",error, total_error)
-
-END SUBROUTINE t_vlstring
-
-SUBROUTINE t_vlstring_readwrite(total_error)
-
-! test writing and reading vl string using h5dread_f and h5dwrite_f, C_LOC and C_F_POINTER
-
-  USE HDF5
-  USE TH5_MISC
-  USE ISO_C_BINDING
-
-  IMPLICIT NONE
-
-  INTEGER, INTENT(INOUT) :: total_error
-
-  CHARACTER(LEN=19), PARAMETER :: filename  = "t_vlstringrw_F03.h5"
-  CHARACTER(LEN=3) , PARAMETER :: dataset   = "DS1"
-  CHARACTER(LEN=3) , PARAMETER :: dataset2D = "DS2"
-
-  INTEGER(HSIZE_T) , PARAMETER :: dim0 = 4
-  INTEGER(HSIZE_T) , PARAMETER :: dim1 = 2
-  INTEGER(HID_T)               :: file, filetype, space, dset ! Handles
-  INTEGER(HSIZE_T), DIMENSION(1:1) :: dims = (/dim0/)
-  INTEGER(HSIZE_T), DIMENSION(1:2) :: dims2D = (/dim1,dim0/)
-  INTEGER(HSIZE_T), DIMENSION(1:2) :: maxdims
-  
-  TYPE(C_PTR), DIMENSION(1:dim0), TARGET :: wdata
-  CHARACTER(len=7, KIND=c_char), DIMENSION(1:1), TARGET :: A = "123456"//C_NULL_CHAR
-  CHARACTER(len=5, KIND=c_char), DIMENSION(1:1), TARGET :: B = "7890"//C_NULL_CHAR
-  CHARACTER(len=4, KIND=c_char), DIMENSION(1:1), TARGET :: C = "abc"//C_NULL_CHAR
-  CHARACTER(len=3, KIND=c_char), DIMENSION(1:1), TARGET :: D = "df"//C_NULL_CHAR
-
-  TYPE(C_PTR), DIMENSION(1:dim1,1:dim0), TARGET :: wdata2D
-  
-  CHARACTER(len=7, KIND=c_char), DIMENSION(1:1), TARGET :: A11 = "A(1,1)"//C_NULL_CHAR
-  CHARACTER(len=4, KIND=c_char), DIMENSION(1:1), TARGET :: A12 = "A12"//C_NULL_CHAR
-  CHARACTER(len=5, KIND=c_char), DIMENSION(1:1), TARGET :: A13 = "A_13"//C_NULL_CHAR
-  CHARACTER(len=8, KIND=c_char), DIMENSION(1:1), TARGET :: A14 = "A_{1,4}"//C_NULL_CHAR
-  CHARACTER(len=8, KIND=c_char), DIMENSION(1:1), TARGET :: A21 = "A_{2,1}"//C_NULL_CHAR
-  CHARACTER(len=5, KIND=c_char), DIMENSION(1:1), TARGET :: A22 = "A_22"//C_NULL_CHAR
-  CHARACTER(len=4, KIND=c_char), DIMENSION(1:1), TARGET :: A23 = "A23"//C_NULL_CHAR
-  CHARACTER(len=7, KIND=c_char), DIMENSION(1:1), TARGET :: A24 = "A(2,4)"//C_NULL_CHAR
-
-  TYPE(C_PTR), DIMENSION(:), ALLOCATABLE, TARGET :: rdata ! Read buffer
-  TYPE(C_PTR), DIMENSION(:,:), ALLOCATABLE, TARGET :: rdata2D ! Read 2D buffer
-  CHARACTER(len=8, kind=c_char), POINTER :: data ! A pointer to a Fortran string
-  CHARACTER(len=8, kind=c_char), DIMENSION(1:4) :: data_w ! A pointer to a Fortran string
-  CHARACTER(len=8, kind=c_char), DIMENSION(1:dim1,1:dim0) :: data2D_w ! A pointer to a Fortran string
-  TYPE(C_PTR) :: f_ptr
-  INTEGER(hsize_t) :: i, j
-  INTEGER :: len
-  INTEGER :: error
-
-  ! Initialize array of C pointers
-
-  wdata(1) = C_LOC(A(1)(1:1))
-  wdata(2) = C_LOC(B(1)(1:1))
-  wdata(3) = C_LOC(C(1)(1:1))
-  wdata(4) = C_LOC(D(1)(1:1))
-
-  data_w(1) = A(1)
-  data_w(2) = B(1)
-  data_w(3) = C(1)
-  data_w(4) = D(1)
-
-  wdata2D(1,1) = C_LOC(A11(1)(1:1))
-  wdata2D(1,2) = C_LOC(A12(1)(1:1))
-  wdata2D(1,3) = C_LOC(A13(1)(1:1))
-  wdata2D(1,4) = C_LOC(A14(1)(1:1))
-  wdata2D(2,1) = C_LOC(A21(1)(1:1))
-  wdata2D(2,2) = C_LOC(A22(1)(1:1))
-  wdata2D(2,3) = C_LOC(A23(1)(1:1))
-  wdata2D(2,4) = C_LOC(A24(1)(1:1))
-
-  data2D_w(1,1) = A11(1)
-  data2D_w(1,2) = A12(1)
-  data2D_w(1,3) = A13(1)
-  data2D_w(1,4) = A14(1)
-  data2D_w(2,1) = A21(1)
-  data2D_w(2,2) = A22(1)
-  data2D_w(2,3) = A23(1)
-  data2D_w(2,4) = A24(1)
-
-  !
-  ! Create a new file using the default properties.
-  !
-  CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file, error)
-  CALL check("h5fcreate_f",error, total_error)
-  !
-  ! Create file and memory datatypes.  For this test we will save
-  ! the strings as C variable length strings, H5T_STRING is defined
-  ! as a variable length string.
-  !
-  CALL H5Tcopy_f(H5T_STRING, filetype, error)
-  CALL check("H5Tcopy_f",error, total_error)
-  !
-  ! Create dataspace.
-  !
-  CALL h5screate_simple_f(1, dims, space, error)
-  CALL check("h5screate_simple_f",error, total_error)
-  !
-  ! Create the dataset and write the variable-length string data to
-  ! it.
-  !
-  CALL h5dcreate_f(file, dataset, filetype, space, dset, error)
-  CALL check("h5dcreate_f",error, total_error)
-
-  f_ptr = C_LOC(wdata(1))
-  CALL h5dwrite_f(dset, filetype, f_ptr, error)
-  CALL check("h5dwrite_f",error, total_error)
-
-  !
-  ! Close and release resources.
-  !
-  CALL h5dclose_f(dset , error)
-  CALL check("h5dclose_f",error, total_error)
-  CALL h5sclose_f(space, error)
-  CALL check("h5sclose_f",error, total_error)
-
-  !
-  ! Create dataspace.
-  !
-  CALL h5screate_simple_f(2, dims2D, space, error)
-  CALL check("h5screate_simple_f",error, total_error)
-  !
-  ! Create the dataset and write the variable-length string data to
-  ! it.
-  !
-  CALL h5dcreate_f(file, dataset2D, filetype, space, dset, error)
-  CALL check("h5dcreate_f",error, total_error)
-
-  f_ptr = C_LOC(wdata2D(1,1))
-  CALL h5dwrite_f(dset, filetype, f_ptr, error)
-  CALL check("h5dwrite_f",error, total_error)
-
-  !
-  ! Close and release resources.
-  !
-  CALL h5dclose_f(dset , error)
-  CALL check("h5dclose_f",error, total_error)
-  CALL h5sclose_f(space, error)
-  CALL check("h5sclose_f",error, total_error)
-
-  CALL H5Tclose_f(filetype, error)
-  CALL check("h5tclose_f",error, total_error)
-  CALL h5fclose_f(file , error)
-  CALL check("h5fclose_f",error, total_error)
-
-  !
-  ! Now we begin the read section of this test.
-  !
-  !
-  ! Open file and dataset.
-  !
-  CALL h5fopen_f(filename, H5F_ACC_RDONLY_F, file, error)
-  CALL check("h5fopen_f",error, total_error)
-  CALL h5dopen_f(file, dataset, dset, error)
-  CALL check("h5dopen_f",error, total_error)
-  !
-  ! Get the datatype.
-  !
-  CALL H5Dget_type_f(dset, filetype, error)
-  CALL check("H5Dget_type_f",error, total_error)
-  !
-  ! Get dataspace and allocate memory for read buffer.
-  !
-  CALL H5Dget_space_f(dset, space, error)
-  CALL check("H5Dget_space_f",error, total_error)
-
-  CALL H5Sget_simple_extent_dims_f(space, dims, maxdims, error) 
-  CALL check("H5Sget_simple_extent_dims_f",error, total_error)
-  ALLOCATE(rdata(1:dims(1)))
-  !
-  ! Read the data.
-  !
-  
-  f_ptr = C_LOC(rdata(1))
-  CALL h5dread_f(dset, H5T_STRING, f_ptr, error)
-  CALL check("H5Dread_f",error, total_error)
-
-  !
-  ! Check the data.
-  !
-  DO i = 1, dims(1)
-     CALL C_F_POINTER(rdata(i), data)
-     len = 0
-     DO
-        IF(DATA(len+1:len+1).EQ.C_NULL_CHAR.OR.len.GE.8) EXIT
-        len = len + 1
-     ENDDO
-     CALL verifystring("h5dread_f",data(1:len), data_w(i)(1:len), total_error)
-  END DO
-
-  DEALLOCATE(rdata)
-  CALL h5dclose_f(dset , error)
-  CALL check("h5dclose_f",error, total_error)
-  CALL h5sclose_f(space, error)
-  CALL check("h5sclose_f",error, total_error)
-  !
-  ! Test reading in 2D dataset
-  !
-  CALL h5dopen_f(file, dataset2D, dset, error)
-  CALL check("h5dopen_f",error, total_error)
-  !
-  ! Get the datatype.
-  !
-  CALL H5Dget_type_f(dset, filetype, error)
-  CALL check("H5Dget_type_f",error, total_error)
-  !
-  ! Get dataspace and allocate memory for read buffer.
-  !
-  CALL H5Dget_space_f(dset, space, error)
-  CALL check("H5Dget_space_f",error, total_error)
-
-
-  CALL H5Sget_simple_extent_dims_f(space, dims2D, maxdims, error) 
-  CALL check("H5Sget_simple_extent_dims_f",error, total_error)
-  ALLOCATE(rdata2D(1:dims2D(1),1:dims2D(2)))
-
-  !
-  ! Read the data.
-  !
-  
-  f_ptr = C_LOC(rdata2D(1,1))
-  CALL h5dread_f(dset, H5T_STRING, f_ptr, error)
-  CALL check("H5Dread_f",error, total_error)
-
-  !
-  ! Check the data.
-  !
-  DO i = 1, dims2D(1)
-     DO j = 1, dims2D(2)
-        CALL C_F_POINTER(rdata2D(i,j), DATA)
-        len = 0
-        DO
-           IF(DATA(len+1:len+1).EQ.C_NULL_CHAR.OR.len.GE.8) EXIT
-           len = len + 1
-        ENDDO
-        CALL verifystring("h5dread_f",DATA(1:len), data2D_w(i,j)(1:len), total_error)
-     ENDDO
-  END DO
-
-  DEALLOCATE(rdata2D)
-  CALL h5dclose_f(dset , error)
-  CALL check("h5dclose_f",error, total_error)
-  CALL h5sclose_f(space, error)
-  CALL check("h5sclose_f",error, total_error)
-
-  CALL H5Tclose_f(filetype, error)
-  CALL check("h5tclose_f",error, total_error)
-  CALL h5fclose_f(file , error)
-  CALL check("h5fclose_f",error, total_error)
-
-END SUBROUTINE t_vlstring_readwrite
-
-
-SUBROUTINE t_string(total_error)
-
-  USE HDF5
-  USE TH5_MISC
-  USE ISO_C_BINDING
-
-  IMPLICIT NONE
-
-  INTEGER, INTENT(INOUT) :: total_error
-
-  CHARACTER(LEN=20), PARAMETER :: filename  = "t_string_F03.h5"
-  CHARACTER(LEN=3) , PARAMETER :: dataset   = "DS1"
-  INTEGER          , PARAMETER :: dim0      = 4
-  INTEGER(SIZE_T)  , PARAMETER :: sdim      = 8
-
-  INTEGER(HID_T)  :: file, filetype, memtype, space, dset ! Handles
-  INTEGER :: error
-
-  INTEGER(HSIZE_T), DIMENSION(1:1) :: dims = (/dim0/)
-  INTEGER(HSIZE_T), DIMENSION(1:1) :: maxdims
-
-  CHARACTER(LEN=sdim), DIMENSION(1:dim0), TARGET :: &
-       wdata = (/"Parting", "is such", "sweet  ", "sorrow."/)
-  CHARACTER(LEN=sdim), DIMENSION(:), ALLOCATABLE, TARGET :: rdata
-  INTEGER(hsize_t) :: i
-  INTEGER(SIZE_T) :: size
-  TYPE(C_PTR) :: f_ptr
-  !
-  ! Create a new file using the default properties.
-  !
-  CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file, error)
-  CALL check("h5fcreate_f",error, total_error)
-  !
-  ! Create file datatypes.  For this example we will save
-  ! the strings as FORTRAN strings
-  !
-  CALL H5Tcopy_f(H5T_FORTRAN_S1, filetype, error)
-  CALL check("H5Tcopy_f",error, total_error)
-  CALL H5Tset_size_f(filetype, sdim, error)
-  CALL check("H5Tset_size_f",error, total_error)
-  !
-  ! Create dataspace.
-  !
-  CALL h5screate_simple_f(1, dims, space, error)
-  CALL check("h5screate_simple_f",error, total_error)
-  !
-  ! Create the dataset and write the string data to it.
-  !
-  CALL h5dcreate_f(file, dataset, filetype, space, dset, error)
-  CALL check("h5dcreate_f",error, total_error)
-
-  f_ptr = C_LOC(wdata(1)(1:1))
-  CALL H5Dwrite_f(dset, filetype, f_ptr, error)
-  CALL check("H5Dwrite_f",error, total_error)
-  !
-  ! Close and release resources.
-  !
-  CALL h5dclose_f(dset , error)
-  CALL check("h5dclose_f",error, total_error)
-  CALL h5sclose_f(space, error)
-  CALL check("h5sclose_f",error, total_error)
-  CALL H5Tclose_f(filetype, error)
-  CALL check("h5tclose_f",error, total_error)
-  CALL h5fclose_f(file , error)
-  CALL check("h5fclose_f",error, total_error)
-  !
-  ! Now we begin the read section of this example.
-  !
-  ! Open file and dataset.
-  !
-  CALL h5fopen_f(filename, H5F_ACC_RDONLY_F, file, error)
-  CALL check("h5fopen_f",error, total_error)
-  CALL h5dopen_f(file, dataset, dset, error)
-  CALL check("h5dopen_f",error, total_error)
-  !
-  ! Get the datatype and its size.
-  !
-  CALL H5Dget_type_f(dset, filetype, error)
-  CALL check("H5Dget_type_f",error, total_error)
-  CALL H5Tget_size_f(filetype, size, error)
-  CALL check("H5Tget_size_f",error, total_error)
-  CALL VERIFY("H5Tget_size_f", INT(size), INT(sdim), total_error)
-  !
-  ! Get dataspace.
-  !
-  CALL H5Dget_space_f(dset, space, error)
-  CALL check("H5Dget_space_f",error, total_error)
-  CALL H5Sget_simple_extent_dims_f(space, dims, maxdims, error) 
-  CALL check("H5Sget_simple_extent_dims_f",error, total_error)
-  CALL VERIFY("H5Sget_simple_extent_dims_f", INT(dims(1)), dim0, total_error)
-
-  ALLOCATE(rdata(1:dims(1)))
-  !
-  ! Create the memory datatype.
-  !
-  CALL H5Tcopy_f(H5T_FORTRAN_S1, memtype, error) 
-  CALL check("H5Tcopy_f",error, total_error)
-  CALL H5Tset_size_f(memtype, sdim, error) 
-  CALL check("H5Tset_size_f",error, total_error)
-  !
-  ! Read the data.
-  !
-  f_ptr = C_LOC(rdata(1)(1:1))
-  CALL H5Dread_f(dset, memtype, f_ptr, error, space)
-  CALL check("H5Dread_f",error, total_error)
-
-  DO i = 1, dims(1)
-     CALL verifystring("h5dread_f",TRIM(rdata(i)),TRIM(wdata(i)) , total_error)
-  END DO
-
-  DEALLOCATE(rdata)
-
-  !
-  ! Close and release resources.
-  !
-  CALL H5Dclose_f(dset, error)
-  CALL check("h5dclose_f",error, total_error)
-  CALL H5Sclose_f(space, error)
-  CALL check("h5sclose_f",error, total_error)
-  CALL H5Tclose_f(memtype, error)
-  CALL check("h5tclose_f",error, total_error)
-  CALL H5Fclose_f(file, error)
-  CALL check("h5fclose_f",error, total_error)
-
-
-END SUBROUTINE t_string
-
-SUBROUTINE vl_test_special_char(total_error)
-  
-  USE HDF5
-  USE TH5_MISC
-  IMPLICIT NONE
-  
-!  INTERFACE
-!     SUBROUTINE setup_buffer(data_in, line_lengths, char_type)
-!       USE HDF5
-!       USE ISO_C_BINDING
-!     IMPLICIT NONE
-!       CHARACTER(len=*), DIMENSION(:) :: data_in
-!       INTEGER(size_t), DIMENSION(:) :: line_lengths
-!       CHARACTER(KIND=C_CHAR,LEN=*) :: char_type
-!     END SUBROUTINE setup_buffer
-!  END INTERFACE
-  
-  INTEGER, INTENT(OUT) :: total_error
-  
-  CHARACTER(LEN=16), PARAMETER :: filename  = "t_controlchar.h5"
-  INTEGER, PARAMETER :: line_length = 10
-  INTEGER(hid_t) :: file
-  INTEGER(hid_t) :: dataset0
-  CHARACTER(len=line_length), DIMENSION(1:100) :: data_in
-  CHARACTER(len=line_length), DIMENSION(1:100) :: data_out
-  INTEGER(size_t), DIMENSION(1:100) :: line_lengths
-  INTEGER(hid_t) :: string_id, space, dcpl
-  INTEGER(hsize_t), DIMENSION(1:1) :: dims = (/0/)
-  INTEGER(hsize_t), DIMENSION(1:1) :: max_dims = (/0/)
-  INTEGER(hsize_t), DIMENSION(1:2) :: data_dims = (/0,0/)
-  INTEGER(hsize_t), DIMENSION(1:1) :: chunk =(/10/)
-  INTEGER, PARAMETER :: ncontrolchar = 7
-  CHARACTER(KIND=C_CHAR,LEN=1), DIMENSION(1:ncontrolchar) :: controlchar = &
-       (/C_ALERT, C_BACKSPACE,C_CARRIAGE_RETURN, C_FORM_FEED,C_HORIZONTAL_TAB,C_VERTICAL_TAB, C_NEW_LINE/)
-  INTEGER :: i, j, n, error
-  n = 8
-  !
-  ! Create a new file using the default properties.
-  !
-  CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file, error)
-  CALL check("h5fcreate_f",error, total_error)
- 
-  max_dims = (/H5S_UNLIMITED_F/)
-
-  !
-  ! Create the memory datatype.
-  !
-  CALL h5tcopy_f(h5t_string, string_id, error)
-  CALL check("h5tcopy_f", error, total_error)
-  CALL h5tset_strpad_f(string_id, h5t_str_nullpad_f, error)
-  CALL check("h5tset_strpad_f", error, total_error)
-  dims(1) = n
-  !
-  ! Create dataspace.
-  !
-  CALL h5screate_simple_f(1, dims, space, error, max_dims)
-  CALL check("h5screate_simple_f", error, total_error)
-  CALL h5pcreate_f(h5p_dataset_create_f, dcpl, error)
-  CALL check("h5pcreate_f", error, total_error)
-  CALL h5pset_chunk_f(dcpl, 1, chunk, error)
-  CALL check("h5pset_chunk_f", error, total_error)
-  
-  data_dims(1) = line_length
-  data_dims(2) = n
-  !
-  ! Create data with strings containing various control characters.
-  !
-  DO i = 1, ncontrolchar
-     !
-     ! Create the dataset, for the string with control character and write the string data to it.
-     !
-     CALL h5dcreate_f(file, controlchar(i), string_id, space, dataset0, error, dcpl)
-     CALL check("h5dcreate_f", error, total_error)
-     CALL setup_buffer(data_in(1:n), line_lengths, controlchar(i))
-     CALL h5dwrite_vl_f(dataset0, string_id, data_in(1:n), data_dims, line_lengths(1:n), error, space)
-     CALL check("h5dwrite_vl_f", error, total_error)
-     !
-     ! Read the string back.
-     !
-     CALL h5dread_vl_f(dataset0, string_id, data_out(1:n), data_dims, line_lengths(1:n), error, space)
-     CALL check("h5dread_vl_f", error, total_error)
-  
-     DO j = 1, n
-        IF(data_in(j).NE.data_out(j))THEN
-           total_error = total_error + 1
-           EXIT
-        ENDIF
-     ENDDO
-
-     CALL h5dclose_f(dataset0, error)
-     CALL check("h5dclose_f", error, total_error)
-  ENDDO
-
-  CALL h5pclose_f(dcpl, error)
-  CALL check("h5pclose_f", error, total_error)
-  CALL h5sclose_f(space, error)
-  CALL check("h5sclose_f", error, total_error)
-  CALL h5fclose_f(file, error)
-  CALL check("h5fclose_f", error, total_error)
-  
-END SUBROUTINE vl_test_special_char
-
-
-SUBROUTINE setup_buffer(data_in, line_lengths, char_type)
-  
-  USE HDF5
-  USE ISO_C_BINDING
-  
-  IMPLICIT NONE
-  
-  ! Creates a simple "Data_in" consisting of the letters of the alphabet,
-  ! one per line, with a control character.
-  
-  CHARACTER(len=10), DIMENSION(:) :: data_in
-  INTEGER(size_t), DIMENSION(:) :: line_lengths
-  INTEGER, DIMENSION(1:3) :: letters
-  CHARACTER(LEN=3) :: lets
-  CHARACTER(KIND=C_CHAR,LEN=*) :: char_type
-  CHARACTER(KIND=C_CHAR,LEN=1) :: char_tmp
-  INTEGER :: i, j, n, ff
-
-  ! Convert the letters and special character to integers    
-  lets = 'abc'
-  
-  READ(lets,'(3A1)') letters
-  READ(char_type,'(A1)') ff
-  n = SIZE(data_in)
-  j = 1
-  DO i=1,n-1
-     IF( j .EQ. 4 )THEN
-        WRITE(char_tmp,'(A1)') ff
-        data_in(i:i) = char_tmp
-     ELSE
-        WRITE(char_tmp,'(A1)') letters(j)
-        data_in(i:i) = char_tmp
-     ENDIF
-     line_lengths(i) = LEN_TRIM(data_in(i))
-     j = j + 1
-     IF( j .EQ. 5 ) j = 1
-  END DO
-  WRITE(char_tmp,'(A1)') ff
-  data_in(n:n) =  char_tmp
-  line_lengths(n) = 1
-  
-END SUBROUTINE setup_buffer
-
-!-------------------------------------------------------------------------
-! Function:    test_nbit
-!
-! Purpose:     Tests (real, 4 byte) datatype for nbit filter
-!
-! Return:      Success:        0
-!              Failure:        >0
-!
-! Programmer:  M. Scot Breitenfeld
-!              Decemeber 7, 2010
-!
-! Modifications: Moved this subroutine from the 1.8 test file and
-! modified it to use F2003 features. 
-! This routine requires 4 byte reals, so we use F2003 features to 
-! ensure the requirement is satisfied in a portable way. 
-! The need for this arises when a user specifies the default real is 8 bytes.
-! MSB 7/31/12
-!
-!-------------------------------------------------------------------------
-!
-
-SUBROUTINE test_nbit(total_error )
-
-  USE HDF5
-  USE TH5_MISC
-  USE ISO_C_BINDING
-
-  IMPLICIT NONE
-  INTEGER, PARAMETER :: wp = SELECTED_REAL_KIND(Fortran_REAL_4) !should map to REAL*4 on most modern processors
-  INTEGER, INTENT(INOUT) :: total_error
-  INTEGER(hid_t) :: file
-  
-  INTEGER(hid_t) :: dataset, datatype, space, dc, mem_type_id
-  INTEGER(hsize_t), DIMENSION(1:2) :: dims = (/2,5/)
-  INTEGER(hsize_t), DIMENSION(1:2) :: chunk_dim = (/2,5/)
-  ! orig_data[] are initialized to be within the range that can be represented by
-  ! dataset datatype (no precision loss during datatype conversion)
-  !
-  REAL(kind=wp), DIMENSION(1:2,1:5), TARGET :: orig_data = &
-       RESHAPE( (/188384.00, 19.103516, -1.0831790e9, -84.242188, &
-       5.2045898, -49140.000, 2350.2500, -3.2110596e-1, 6.4998865e-5, -0.0000000/) , (/2,5/) )
-  REAL(kind=wp), DIMENSION(1:2,1:5), TARGET :: new_data
-  INTEGER(size_t) :: PRECISION, offset
-  INTEGER :: error
-  LOGICAL :: status
-  INTEGER(hsize_t) :: i, j
-  TYPE(C_PTR) :: f_ptr
-
-  ! check to see if filter is available
-  CALL H5Zfilter_avail_f(H5Z_FILTER_NBIT_F, status, error)
-  IF(.NOT.status)THEN ! We don't have H5Z_FILTER_NBIT_F filter
-     total_error = -1     ! so return
-     RETURN
-  ENDIF
-
-  CALL H5Fcreate_f("nbit.h5", H5F_ACC_TRUNC_F, file, error)
-  CALL check("H5Fcreate_f", error, total_error)
-
-  ! Define dataset datatype (integer), and set precision, offset
-  CALL H5Tcopy_f(H5T_IEEE_F32BE, datatype, error)
-  CALL CHECK(" H5Tcopy_f", error, total_error)
-  CALL H5Tset_fields_f(datatype, 26_size_t, 20_size_t, 6_size_t, 7_size_t, 13_size_t, error)
-  CALL CHECK(" H5Tset_fields_f", error, total_error)
-  offset = 7
-  CALL H5Tset_offset_f(datatype, offset, error)
-  CALL CHECK(" H5Tset_offset_f", error, total_error)
-  PRECISION = 20
-  CALL H5Tset_precision_f(datatype,PRECISION, error)
-  CALL CHECK(" H5Tset_precision_f", error, total_error)
-  
-  CALL H5Tset_size_f(datatype, 4_size_t, error)
-  CALL CHECK(" H5Tset_size_f", error, total_error)
-  
-  CALL H5Tset_ebias_f(datatype, 31_size_t, error)
-  CALL CHECK(" H5Tset_ebias_f", error, total_error)
- 
-  ! Create the data space 
-  CALL H5Screate_simple_f(2, dims, space, error)
-  CALL CHECK(" H5Screate_simple_f", error, total_error)
-
-  ! USE nbit filter
-  CALL H5Pcreate_f(H5P_DATASET_CREATE_F, dc, error)
-  CALL CHECK(" H5Pcreate_f", error, total_error)
-
-  CALL H5Pset_chunk_f(dc, 2, chunk_dim, error)
-  CALL CHECK(" H5Pset_chunk_f", error, total_error)
-  CALL H5Pset_nbit_f(dc, error)
-  CALL CHECK(" H5Pset_nbit_f", error, total_error)
-
-  ! Create the dataset
-  CALL  H5Dcreate_f(file, "nbit_real", datatype, &
-       space, dataset, error, dc)
-  CALL CHECK(" H5Dcreate_f", error, total_error)
-
-  !----------------------------------------------------------------------
-  ! STEP 1: Test nbit by setting up a chunked dataset and writing
-  ! to it.
-  !----------------------------------------------------------------------
-  !
-  mem_type_id = h5kind_to_type(wp,H5_REAL_KIND)
-
-  f_ptr = C_LOC(orig_data(1,1))
-  CALL H5Dwrite_f(dataset, mem_type_id, f_ptr, error)
-  CALL CHECK(" H5Dwrite_f", error, total_error)
-
-  !----------------------------------------------------------------------
-  ! STEP 2: Try to read the data we just wrote.
-  !----------------------------------------------------------------------
-  !  
-  f_ptr = C_LOC(new_data(1,1))
-  CALL H5Dread_f(dataset, mem_type_id, f_ptr, error)
-  CALL CHECK(" H5Dread_f", error, total_error)
-
-  ! Check that the values read are the same as the values written
-  ! Assume size of long long = size of double
-  !
-  i_loop: DO i = 1, dims(1)
-     j_loop: DO j = 1, dims(2)
-        IF(.NOT.(orig_data(i,j).EQ.orig_data(i,j))) CYCLE  ! skip IF value is NaN
-        IF( .NOT.dreal_eq( REAL(new_data(i,j),dp), REAL( orig_data(i,j), dp)) ) THEN
-           total_error = total_error + 1
-           WRITE(*,'("    Read different values than written.")')
-           WRITE(*,'("    At index ", 2(1X,I0))') i, j
-           EXIT i_loop
-        END IF
-     ENDDO j_loop
-  ENDDO i_loop
-
-  !----------------------------------------------------------------------
-  ! Cleanup
-  !----------------------------------------------------------------------
-  !
-  CALL H5Tclose_f(datatype, error)
-  CALL CHECK(" H5Tclose_f", error, total_error)
-  CALL H5Pclose_f(dc, error)
-  CALL CHECK(" H5Pclose_f", error, total_error)
-  CALL H5Sclose_f(space, error)
-  CALL CHECK(" H5Sclose_f", error, total_error)
-  CALL H5Dclose_f(dataset, error)
-  CALL CHECK(" H5Dclose_f", error, total_error)
-  CALL H5Fclose_f(file, error)
-  CALL CHECK(" H5Fclose_f", error, total_error)
-
-END SUBROUTINE test_nbit
-
-
-SUBROUTINE t_enum_conv(total_error)
-
-!-------------------------------------------------------------------------
-! Subroutine: t_enum_conv
-!
-! Purpose: Tests converting data from enumeration datatype
-!          to numeric (integer or floating-point number)
-!          datatype. Tests various KINDs of INTEGERs
-!          and REALs. Checks reading enum data into
-!          INTEGER and REAL KINDs.
-!
-! Return: Success:	0
-!	  Failure:	number of errors
-!
-! Programmer:  M. Scot Breitenfeld
-!              October 27, 2012
-!
-! Note:        Adapted from C test (enum.c -- test_conv)
-!              No reliance on C tests.
-!-------------------------------------------------------------------------
-!
-  USE HDF5
-  USE TH5_MISC
-  USE ISO_C_BINDING
-
-  IMPLICIT NONE
-
-  INTEGER, INTENT(INOUT) :: total_error
-
-  INTEGER, PARAMETER :: int_kind_8 = SELECTED_INT_KIND(Fortran_INTEGER_4) !should map to INTEGER*4 on most modern processors
-  INTEGER, PARAMETER :: int_kind_16 = SELECTED_INT_KIND(Fortran_INTEGER_8)!should map to INTEGER*8 on most modern processors
-  
-  INTEGER, PARAMETER :: real_kind_7 = SELECTED_REAL_KIND(Fortran_REAL_4)  !should map to REAL*4 on most modern processors
-
-  INTEGER(hid_t) :: cwg=-1, dtype=-1, space=-1, dset=-1 ! Handles
-  INTEGER(hid_t) :: file ! Handles
-
-  ! Enumerated type
-  ENUM, BIND(C)
-    ENUMERATOR :: E1_RED, E1_GREEN, E1_BLUE, E1_WHITE, E1_BLACK
-  END ENUM
-
-  INTEGER(KIND(E1_RED)), TARGET :: val
-
-  ! Enumerated data array 
-  ! Some values are out of range for testing. The library should accept them
-  INTEGER(KIND(E1_RED)), DIMENSION(1:20), TARGET :: data1 = (/INT(E1_RED,KIND(E1_RED)), &
-       INT(E1_GREEN,KIND(E1_RED)), INT(E1_BLUE,KIND(E1_RED)),  &
-       INT(E1_GREEN,KIND(E1_RED)), INT(E1_WHITE,KIND(E1_RED)), &
-       INT(E1_WHITE,KIND(E1_RED)), INT(E1_BLACK,KIND(E1_RED)), &
-       INT(E1_GREEN,KIND(E1_RED)), INT(E1_BLUE,KIND(E1_RED)), &
-       INT(E1_RED,KIND(E1_RED)), INT(E1_RED,KIND(E1_RED)), INT(E1_BLUE,KIND(E1_RED)), &
-       INT(E1_GREEN,KIND(E1_RED)), INT(E1_BLACK,KIND(E1_RED)), INT(E1_WHITE,KIND(E1_RED)),&
-       INT(E1_RED,KIND(E1_RED)), INT(E1_WHITE,KIND(E1_RED)), &
-       INT(0,KIND(E1_RED)), INT(-1,KIND(E1_RED)), INT(-2,KIND(E1_RED))/)
-
-  ! Reading array for enum data
-  INTEGER(KIND(E1_RED)), DIMENSION(1:20), TARGET :: data2
-
-  ! Reading array's for converted enum data
-  INTEGER(C_SHORT), DIMENSION(1:20), TARGET :: data_short
-  INTEGER(C_INT), DIMENSION(1:20), TARGET :: data_int
-  REAL(C_DOUBLE), DIMENSION(1:20), TARGET :: data_double
-
-  INTEGER(int_kind_8), DIMENSION(1:20), TARGET :: data_i8
-  INTEGER(int_kind_16), DIMENSION(1:20), TARGET :: data_i16
-  REAL(real_kind_7), DIMENSION(1:20), TARGET :: data_r7
-
-  INTEGER(hsize_t), DIMENSION(1:1) :: ds_size = (/20/)
-  INTEGER(size_t) :: i
-  INTEGER(hsize_t) :: ih
-  INTEGER :: error
-  TYPE(C_PTR) :: f_ptr
-  INTEGER(HID_T) :: m_baset  ! Memory base type
-  !
-  ! Create a new file using the default properties.
-  !
-  CALL h5fcreate_f("enum1.h5", H5F_ACC_TRUNC_F, file, error)
-  CALL check("h5fcreate_f", error, total_error)
-  !
-  ! Create a new group using the default properties.
-  !
-  CALL h5gcreate_f(file, "test_conv", cwg, error)
-  CALL check("h5gcreate_f",error, total_error)
-  !
-  ! Create a enum type
-  !
-  CALL H5Tcreate_f(H5T_ENUM_F, H5OFFSETOF(C_LOC(data1(1)), C_LOC(data1(2))), dtype, error)
-  CALL check("h5tcreate_f",error, total_error)
-  !
-  ! Initialize enum data.
-  !
-  val = E1_RED
-  CALL H5Tenum_insert_f(dtype, "RED", C_LOC(val), error)
-  CALL check("h5tenum_insert_f",error, total_error)
-  val = E1_GREEN
-  CALL H5Tenum_insert_f(dtype, "GREEN", C_LOC(val), error)
-  CALL check("h5tenum_insert_f",error, total_error)
-  val = E1_BLUE
-  CALL H5Tenum_insert_f(dtype, "BLUE", C_LOC(val), error)
-  CALL check("h5tenum_insert_f",error, total_error)
-  val = E1_WHITE
-  CALL H5Tenum_insert_f(dtype, "WHITE", C_LOC(val), error)
-  CALL check("h5tenum_insert_f",error, total_error)
-  val = E1_BLACK
-  CALL H5Tenum_insert_f(dtype, "BLACK", C_LOC(val), error)
-  CALL check("h5tenum_insert_f",error, total_error)
-  !
-  ! Create dataspace.  Setting maximum size to be the current size.
-  !
-  CALL h5screate_simple_f(1, ds_size, space, error)
-  CALL check("h5screate_simple_f", error, total_error)
-
-  ! ***************************************
-  ! * Dataset of enumeration type
-  ! ***************************************
-  !
-  ! Create a dataset of enum type and write enum data to it
-
-  CALL h5dcreate_f(cwg, "color_table1", dtype, space, dset, error)
-  CALL check("h5dcreate_f", error, total_error)
-
-  f_ptr = C_LOC(data1(1))
-  CALL h5dwrite_f(dset, dtype, f_ptr, error, space, space)
-  CALL check(" h5dwrite_f", error, total_error)
-
-  ! Test reading back the data with no conversion
-
-  f_ptr = C_LOC(data2(1))
-  CALL h5dread_f(dset, dtype, f_ptr, error, space, space)
-  CALL check(" h5dread_f", error, total_error)
-
-  ! Check values
-  DO ih = 1, ds_size(1)
-     IF(data1(ih) .NE. data2(ih))THEN
-        total_error = total_error + 1
-        WRITE(*,'("    1. data1(",I0,")=",I0," .NE. data2(",I0,")=",I0)') ih, data1(ih),i,data2(ih)
-        EXIT
-     ENDIF
-  ENDDO
-
-  ! Test converting the data to integer (KIND=C_SHORT). Read enum data back as integer
-  m_baset = h5kind_to_type(KIND(data_short(1)), H5_INTEGER_KIND) ! Memory base type
-  f_ptr = C_LOC(data_short(1))
-  CALL h5dread_f(dset, m_baset, f_ptr, error, space, space)
-  CALL check("h5dread_f", error, total_error)
-  ! Check values
-  DO ih = 1, ds_size(1)
-     IF(data1(ih) .NE. data_short(ih))THEN
-        total_error = total_error + 1
-        WRITE(*,'("    2. data1(",I0,")=",I0," .NE. data_short(",I0,")=",I0)') ih, data1(ih),i,data_short(ih)
-        EXIT
-     ENDIF
-  ENDDO
-
-  ! Test converting the data to (KIND=C_double) number. 
-  ! Read enum data back as (KIND=C_double) number
-
-  m_baset = h5kind_to_type(KIND(data_double(1)), H5_REAL_KIND) ! Memory base type
-  f_ptr = C_LOC(data_double(1))
-  CALL h5dread_f(dset,  m_baset, f_ptr, error, space, space)
-  CALL check("h5dread_f", error, total_error)
-  ! Check values
-  DO ih = 1, ds_size(1)
-     IF(data1(ih) .NE. INT(data_double(ih)))THEN
-        total_error = total_error + 1
-        WRITE(*,'("    3. data_double(",I0,")=",I0," .NE. data_double(",I0,")=",I0)') &
-             ih, INT(data1(ih)), ih, INT(data_double(ih))
-        EXIT
-     ENDIF
-  ENDDO
-
-  ! Test converting the data to (SELECTED_INT_KIND(Fortran_INTEGER_4)) number. 
-  ! Read enum data back as (SELECTED_INT_KIND(Fortran_INTEGER_4)) number
-
-  m_baset = h5kind_to_type(int_kind_8, H5_INTEGER_KIND) ! Memory base type
-  f_ptr = C_LOC(data_i8(1))
-  CALL h5dread_f(dset,  m_baset, f_ptr, error, space, space)
-  CALL check("h5dread_f", error, total_error)
-  ! Check values
-  DO ih = 1, ds_size(1)
-     IF(data1(ih) .NE. INT(data_i8(ih)))THEN
-        total_error = total_error + 1
-        WRITE(*,'("    4. data_i8(",I0,")=",I0," .NE. data_i8(",I0,")=",I0)') &
-             ih, INT(data1(ih)), i, INT(data_i8(ih))
-        EXIT
-     ENDIF
-  ENDDO
-
-  ! Test converting the data to (SELECTED_INT_KIND(Fortran_INTEGER_8)) number. 
-  ! Read enum data back as (SELECTED_INT_KIND(Fortran_INTEGER_8)) number
-
-  m_baset = h5kind_to_type(int_kind_16, H5_INTEGER_KIND) ! Memory base type
-  f_ptr = C_LOC(data_i16(1))
-  CALL h5dread_f(dset,  m_baset, f_ptr, error, space, space)
-  CALL check("h5dread_f", error, total_error)
-  ! Check values
-  DO ih = 1, ds_size(1)
-     IF(data1(ih) .NE. INT(data_i16(ih)))THEN
-        total_error = total_error + 1
-        WRITE(*,'("    5. data_i16(",I0,")=",I0," .NE. data_i16(",I0,")=",I0)') &
-             ih, INT(data1(ih)), i, INT(data_i16(ih))
-        EXIT
-     ENDIF
-  ENDDO
-
-  ! Test converting the data to  SELECTED_REAL_KIND(Fortran_REAL_4) number. 
-  ! Read enum data back as  SELECTED_REAL_KIND(Fortran_REAL_4) number
-
-  m_baset = h5kind_to_type(KIND(data_r7(1)), H5_REAL_KIND) ! Memory base type
-  f_ptr = C_LOC(data_r7(1))
-  CALL h5dread_f(dset,  m_baset, f_ptr, error, space, space)
-  CALL check("h5dread_f", error, total_error)
-  ! Check values
-  DO ih = 1, ds_size(1)
-     IF(data1(ih) .NE. INT(data_r7(ih)))THEN
-        total_error = total_error + 1
-        WRITE(*,'("    6. data_r7(",I0,")=",I0," .NE. data_r7(",I0,")=",I0)') &
-             ih, INT(data1(ih)), i, INT(data_r7(ih))
-        EXIT
-     ENDIF
-  ENDDO
-
-  CALL h5dclose_f(dset, error)
-  CALL check("h5dclose_f", error, total_error)
-
-  ! ***************************************
-  ! *    Dataset of C_int type
-  ! ***************************************
-
-  ! Create a integer dataset of KIND=C_INT and write enum data to it
-  m_baset = h5kind_to_type(KIND(data_int(1)), H5_INTEGER_KIND) ! Memory base type
-  CALL h5dcreate_f(cwg, "color_table2", m_baset, space, dset, error)
-  CALL check("h5dcreate_f", error, total_error)
-  
-  ! Write the enum data
-  f_ptr = C_LOC(data1(1))
-  CALL h5dwrite_f(dset, dtype, f_ptr, error, space, space)
-  CALL check("h5dwrite_f", error, total_error)
-
-  ! Test reading back the data with no conversion 
-  f_ptr = C_LOC(data_int(1))
-  CALL h5dread_f(dset, m_baset, f_ptr, error, space, space)
-  CALL check("h5dread_f", error, total_error)
-
-  DO ih = 1, ds_size(1)
-     IF(data1(ih) .NE. data_int(ih))THEN
-        total_error = total_error + 1
-        WRITE(*,'("    7. data1(",I0,")=",I0," .NE. data_int(",I0,")=",I0)') ih, data1(ih),i,data_int(ih)
-        EXIT
-     ENDIF
-  ENDDO
-  CALL h5dclose_f(dset, error)
-  CALL check("h5dclose_f", error, total_error)
-
-  !**************************************
-  !*    Dataset of C_double type
-  !**************************************
-
-  ! Create a dataset of KIND=C_DOUBLE and write enum data to it
-  m_baset = h5kind_to_type(KIND(data_double(1)), H5_REAL_KIND) ! Memory base type
-  CALL h5dcreate_f(cwg, "color_table3", m_baset, space, dset,  error)
-  CALL check("h5dcreate_f", error, total_error)
-
-  f_ptr = C_LOC(data1(1))
-  CALL h5dwrite_f(dset, dtype, f_ptr, error, space, space)
-  CALL check("h5dwrite_f", error, total_error)
-
-  ! Test reading back the data with no conversion 
-  f_ptr = C_LOC(data_double(1))
-  CALL h5dread_f(dset, m_baset, f_ptr, error, space, space)
-  CALL check("h5dread_f", error, total_error)
-
-  DO ih = 1, ds_size(1)
-     IF(data1(ih) .NE. INT(data_double(ih)))THEN
-        total_error = total_error + 1
-        WRITE(*,'("    8. data1(",I0,")=",I0," .NE. data_double(",I0,")=",I0)') ih, data1(ih),ih,INT(data_double(ih))
-        EXIT
-     ENDIF
-  ENDDO
-  CALL h5dclose_f(dset, error)
-  CALL check("h5dclose_f", error, total_error)
-
-  !*********************************************************
-  !* Dataset of real SELECTED_REAL_KIND(Fortran_REAL_4) type
-  !*********************************************************
-
-  ! Create a dataset of SELECTED_REAL_KIND(Fortran_REAL_4) and write enum data to it
-  m_baset = h5kind_to_type(KIND(data_r7(1)), H5_REAL_KIND) ! Memory base type
-  CALL h5dcreate_f(cwg, "color_table4", m_baset, space, dset,  error)
-  CALL check("h5dcreate_f", error, total_error)
-
-  f_ptr = C_LOC(data1(1))
-  CALL h5dwrite_f(dset, dtype, f_ptr, error, space, space)
-  CALL check("h5dwrite_f", error, total_error)
-
-  ! Test reading back the data with no conversion 
-  f_ptr = C_LOC(data_r7(1))
-  CALL h5dread_f(dset, m_baset, f_ptr, error, space, space)
-  CALL check("h5dread_f", error, total_error)
-
-  DO ih = 1, ds_size(1)
-     IF(data1(ih) .NE. INT(data_r7(ih)))THEN
-        total_error = total_error + 1
-        WRITE(*,'("    9. data1(",I0,")=",I0," .NE. data_r7(",I0,")=",I0)') ih, data1(ih),ih,INT(data_r7(ih))
-        EXIT
-     ENDIF
-  ENDDO
-  CALL h5dclose_f(dset, error)
-  CALL check("h5dclose_f", error, total_error)
-
-  ! *****************************************************************
-  ! * Dataset of integer SELECTED_INT_KIND(Fortran_INTEGER_8) type
-  ! *****************************************************************
-
-  ! Create a integer dataset of (SELECTED_INT_KIND(Fortran_INTEGER_8)) and write enum data to it
-  m_baset = h5kind_to_type(KIND(data_i16(1)), H5_INTEGER_KIND) ! Memory base type
-  CALL h5dcreate_f(cwg, "color_table5", m_baset, space, dset, error)
-  CALL check("h5dcreate_f", error, total_error)
-  
-  ! Write the enum data
-  f_ptr = C_LOC(data1(1))
-  CALL h5dwrite_f(dset, dtype, f_ptr, error, space, space)
-  CALL check("h5dwrite_f", error, total_error)
-
-  ! Test reading back the data with no conversion 
-  f_ptr = C_LOC(data_i16(1))
-  CALL h5dread_f(dset, m_baset, f_ptr, error, space, space)
-  CALL check("h5dread_f", error, total_error)
-
-  DO ih = 1, ds_size(1)
-     IF(data1(ih) .NE. data_i16(ih))THEN
-        total_error = total_error + 1
-        WRITE(*,'("    10. data1(",I0,")=",I0," .NE. data_i16(",I0,")=",I0)') ih, data1(ih),ih,data_i16(ih)
-        EXIT
-     ENDIF
-  ENDDO
-  CALL h5dclose_f(dset, error)
-  CALL check("h5dclose_f", error, total_error)
-
-  !
-  ! Close and release resources.
-  !
-  CALL h5sclose_f(space, error)
-  CALL check("H5Sclose_f", error, total_error)
-  CALL h5tclose_f(dtype, error)
-  CALL check("H5Tclose_f", error, total_error)
-  CALL h5gclose_f(cwg, error)
-  CALL check("h5gclose_f",error, total_error)
-  CALL h5fclose_f(file, error)
-  CALL check("H5Fclose_f", error, total_error)
-
-END SUBROUTINE t_enum_conv
-
-END MODULE TH5T_F03
diff --git a/fortran/test/tH5VL.F90 b/fortran/test/tH5VL.F90
new file mode 100644
index 0000000..e7a0363
--- /dev/null
+++ b/fortran/test/tH5VL.F90
@@ -0,0 +1,509 @@
+!****h* root/fortran/test/tH5VL.f90
+!
+! NAME
+!  tH5VL.f90
+!
+! FUNCTION
+!  Basic testing of Fortran Variable_length datatypes APIs.
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+! CONTAINS SUBROUTINES
+!  vl_test_integer, vl_test_real, vl_test_string
+!
+!*****
+
+MODULE TH5VL
+  USE HDF5 ! This module contains all necessary modules
+  USE TH5_MISC
+  USE TH5_MISC_GEN
+
+CONTAINS
+
+        SUBROUTINE vl_test_integer(cleanup, total_error)
+
+          IMPLICIT NONE
+          LOGICAL, INTENT(IN) :: cleanup
+          INTEGER, INTENT(OUT) :: total_error
+
+          CHARACTER(LEN=7), PARAMETER :: filename = "VLtypes" ! File name
+          CHARACTER(LEN=80) :: fix_filename
+          CHARACTER(LEN=5), PARAMETER :: dsetname = "VLint"     ! Dataset name
+
+          INTEGER(HID_T) :: file_id       ! File identifier
+          INTEGER(HID_T) :: dset_id       ! Dataset identifier
+          INTEGER(HID_T) :: dspace_id     ! Dataspace identifier
+          INTEGER(HID_T) :: vltype_id     ! Datatype identifier
+
+
+          INTEGER(HSIZE_T), DIMENSION(1) :: dims = (/6/) ! Dataset dimensions
+          INTEGER(SIZE_T), DIMENSION(6) :: len           ! Elements lengths
+          INTEGER(SIZE_T), DIMENSION(6) :: len_out
+          INTEGER     ::   rank = 1                      ! Dataset rank
+
+          INTEGER, DIMENSION(5,6) :: vl_int_data ! Data buffers
+          INTEGER, DIMENSION(5,6) :: vl_int_data_out ! Data buffers
+          INTEGER     ::   error ! Error flag
+
+          INTEGER     :: i, j    !general purpose integers
+          INTEGER(HSIZE_T) :: ih, jh    !general purpose integers
+          INTEGER(HSIZE_T), DIMENSION(2) :: data_dims = (/5,6/)
+          INTEGER(SIZE_T)  max_len
+
+          !
+          ! Initialize the vl_int_data array.
+          !
+          do i = 1, 6
+             do j = 1, 5
+                vl_int_data(j,i) = -100
+             end do
+          end do
+
+          do i = 2, 6
+             do j = 1,  i-1
+                vl_int_data(j,i) = i-1
+             end do
+          end do
+
+           do i = 1,6
+              len(i) = i-1
+           end do
+
+
+          !
+          ! Create a new file using default properties.
+          !
+          CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
+          if (error .ne. 0) then
+              write(*,*) "Cannot modify filename"
+              stop
+          endif
+          CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
+              CALL check("h5fcreate_f", error, total_error)
+
+
+          !
+          ! Create the dataspace.
+          !
+          CALL h5screate_simple_f(rank, dims, dspace_id, error)
+              CALL check("h5screate_simple_f", error, total_error)
+
+
+          !
+          ! Create the dataset with default properties.
+          !
+          CALL h5tvlen_create_f(H5T_NATIVE_INTEGER, vltype_id, error)
+              CALL check("h5dvlen_create_f", error, total_error)
+
+          CALL h5dcreate_f(file_id, dsetname, vltype_id, dspace_id, &
+                           dset_id, error)
+              CALL check("h5dcreate_f", error, total_error)
+
+          !
+          ! Write the dataset.
+          !
+          CALL h5dwrite_vl_f(dset_id, vltype_id, vl_int_data, data_dims, len, error)
+              CALL check("h5dwrite_int_f", error, total_error)
+
+
+
+          !
+          ! End access to the dataset and release resources used by it.
+          !
+          CALL h5dclose_f(dset_id, error)
+              CALL check("h5dclose_f", error, total_error)
+
+          !
+          ! Close the file.
+          !
+          CALL h5fclose_f(file_id, error)
+              CALL check("h5fclose_f", error, total_error)
+
+          !
+          ! Open the existing file.
+          !
+          CALL h5fopen_f (fix_filename, H5F_ACC_RDWR_F, file_id, error)
+              CALL check("h5fopen_f", error, total_error)
+
+          !
+          ! Open the existing dataset.
+          !
+          CALL h5dopen_f(file_id, dsetname, dset_id, error)
+              CALL check("h5dopen_f", error, total_error)
+
+          CALL h5dvlen_get_max_len_f(dset_id, vltype_id, dspace_id, max_len, error)
+              CALL check("h5dvlen_get_max_len_f", error, total_error)
+              if(max_len .ne. data_dims(1)) then
+                      total_error = total_error + 1
+                      write(*,*) "Wrong number of elements returned by h5dvlen_get_max_len_f"
+              endif
+          !
+          ! Read the dataset.
+          !
+          CALL h5dread_vl_f(dset_id, vltype_id, vl_int_data_out, data_dims, len_out, &
+                            error, mem_space_id = dspace_id, file_space_id = dspace_id)
+              CALL check("h5dread_int_f", error, total_error)
+              do ih = 1, data_dims(2)
+              do jh = 1, len_out(ih)
+              if(vl_int_data(jh,ih) .ne. vl_int_data_out(jh,ih))  then
+                  total_error = total_error + 1
+                  write(*,*) "h5dread_vl_f returned incorrect data"
+              endif
+              enddo
+               if (len(ih) .ne. len_out(ih)) then
+                  total_error = total_error + 1
+                  write(*,*) "h5dread_vl_f returned incorrect data"
+              endif
+              enddo
+
+          !
+          CALL h5dclose_f(dset_id, error)
+              CALL check("h5dclose_f", error, total_error)
+
+          CALL h5tclose_f(vltype_id, error)
+              CALL check("h5tclose_f", error, total_error)
+
+          !
+          ! Terminate access to the data space.
+          !
+          CALL h5sclose_f(dspace_id, error)
+              CALL check("h5sclose_f", error, total_error)
+
+          !
+          ! Close the file.
+          !
+          CALL h5fclose_f(file_id, error)
+              CALL check("h5fclose_f", error, total_error)
+          if(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
+              CALL check("h5_cleanup_f", error, total_error)
+
+          RETURN
+        END SUBROUTINE vl_test_integer
+
+        SUBROUTINE vl_test_real(cleanup, total_error)
+
+          IMPLICIT NONE
+          LOGICAL, INTENT(IN) :: cleanup
+          INTEGER, INTENT(OUT) :: total_error
+
+          CHARACTER(LEN=8), PARAMETER :: filename = "VLtypesR" ! File name
+          CHARACTER(LEN=80) :: fix_filename
+          CHARACTER(LEN=6), PARAMETER :: dsetname = "VLreal"     ! Dataset name
+
+          INTEGER(HID_T) :: file_id       ! File identifier
+          INTEGER(HID_T) :: dset_id       ! Dataset identifier
+          INTEGER(HID_T) :: dspace_id     ! Dataspace identifier
+          INTEGER(HID_T) :: vltype_id     ! Datatype identifier
+
+
+          INTEGER(HSIZE_T), DIMENSION(1) :: dims = (/6/) ! Dataset dimensions
+          INTEGER(SIZE_T), DIMENSION(6) :: len           ! Elements lengths
+          INTEGER(SIZE_T), DIMENSION(6) :: len_out
+          INTEGER     ::   rank = 1                      ! Dataset rank
+
+          REAL, DIMENSION(5,6) :: vl_real_data ! Data buffers
+          REAL, DIMENSION(5,6) :: vl_real_data_out ! Data buffers
+          INTEGER     ::   error ! Error flag
+
+          INTEGER     :: i, j    !general purpose integers
+          INTEGER(HSIZE_T)     :: ih, jh    !general purpose integers
+          INTEGER(HSIZE_T), DIMENSION(2) :: data_dims = (/5,6/)
+          INTEGER(SIZE_T)  max_len
+          INTEGER(HID_T) ::  vl_type_id
+          LOGICAL        ::  vl_flag
+
+          !
+          ! Initialize the vl_int_data array.
+          !
+          do i = 1, 6
+             do j = 1, 5
+                vl_real_data(j,i) = -100.
+             end do
+          end do
+
+          do i = 2, 6
+             do j = 1,  i-1
+                vl_real_data(j,i) = i-1
+             end do
+          end do
+
+           do i = 1,6
+              len(i) = i-1
+           end do
+
+
+          !
+          ! Create a new file using default properties.
+          !
+          CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
+          if (error .ne. 0) then
+              write(*,*) "Cannot modify filename"
+              stop
+          endif
+          CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
+              CALL check("h5fcreate_f", error, total_error)
+
+
+          !
+          ! Create the dataspace.
+          !
+          CALL h5screate_simple_f(rank, dims, dspace_id, error)
+              CALL check("h5screate_simple_f", error, total_error)
+
+
+          !
+          ! Create the dataset with default properties.
+          !
+          CALL h5tvlen_create_f(H5T_NATIVE_REAL, vltype_id, error)
+              CALL check("h5dvlen_create_f", error, total_error)
+
+          CALL h5dcreate_f(file_id, dsetname, vltype_id, dspace_id, &
+                           dset_id, error)
+              CALL check("h5dcreate_f", error, total_error)
+          CALL h5dget_type_f(dset_id, vl_type_id, error)
+              CALL check("h5dget_type_f", error, total_error)
+          CALL h5tis_variable_str_f( vl_type_id, vl_flag, error)
+              CALL check("h5tis_variable_str_f", error, total_error)
+              if( vl_flag ) then
+                 write(*,*) "type is wrong"
+                 total_error = total_error + 1
+              endif
+
+
+          !
+          ! Write the dataset.
+          !
+          CALL h5dwrite_vl_f(dset_id, vltype_id, vl_real_data, data_dims, len, error)
+              CALL check("h5dwrite_vl_real_f", error, total_error)
+
+
+          !
+          ! End access to the dataset and release resources used by it.
+          !
+          CALL h5dclose_f(dset_id, error)
+              CALL check("h5dclose_f", error, total_error)
+
+          !
+          ! Close the file.
+          !
+          CALL h5fclose_f(file_id, error)
+              CALL check("h5fclose_f", error, total_error)
+
+          !
+          ! Open the existing file.
+          !
+          CALL h5fopen_f (fix_filename, H5F_ACC_RDWR_F, file_id, error)
+              CALL check("h5fopen_f", error, total_error)
+
+          !
+          ! Open the existing dataset.
+          !
+          CALL h5dopen_f(file_id, dsetname, dset_id, error)
+              CALL check("h5dopen_f", error, total_error)
+
+          CALL h5dvlen_get_max_len_f(dset_id, vltype_id, dspace_id, max_len, error)
+              CALL check("h5dvlen_get_max_len_f", error, total_error)
+              if(max_len .ne. data_dims(1)) then
+                      total_error = total_error + 1
+                      write(*,*) "Wrong number of elements returned by h5dvlen_get_max_len_f"
+              endif
+          !
+          ! Read the dataset.
+          !
+          CALL h5dread_vl_f(dset_id, vltype_id, vl_real_data_out, data_dims, len_out, &
+                            error, mem_space_id = dspace_id, file_space_id = dspace_id)
+              CALL check("h5dread_real_f", error, total_error)
+              DO ih = 1, data_dims(2)
+              DO jh = 1, len_out(ih)
+                 CALL VERIFY("h5dread_vl_f returned incorrect data",vl_real_data(jh,ih),vl_real_data_out(jh,ih), total_error)
+              ENDDO
+              IF (LEN(ih) .NE. len_out(ih)) THEN
+                 total_error = total_error + 1
+                 WRITE(*,*) "h5dread_vl_f returned incorrect data"
+              ENDIF
+           ENDDO
+
+
+          !
+          CALL h5dclose_f(dset_id, error)
+              CALL check("h5dclose_f", error, total_error)
+
+          CALL h5tclose_f(vltype_id, error)
+              CALL check("h5tclose_f", error, total_error)
+
+          !
+          ! Terminate access to the data space.
+          !
+          CALL h5sclose_f(dspace_id, error)
+              CALL check("h5sclose_f", error, total_error)
+
+          !
+          ! Close the file.
+          !
+          CALL h5fclose_f(file_id, error)
+              CALL check("h5fclose_f", error, total_error)
+          if(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
+              CALL check("h5_cleanup_f", error, total_error)
+
+          RETURN
+        END SUBROUTINE vl_test_real
+
+        SUBROUTINE vl_test_string(cleanup, total_error)
+
+          IMPLICIT NONE
+          LOGICAL, INTENT(IN) :: cleanup
+          INTEGER, INTENT(OUT) :: total_error
+
+          CHARACTER(LEN=8), PARAMETER :: filename = "VLtypesS" ! File name
+          CHARACTER(LEN=80) :: fix_filename
+          CHARACTER(LEN=9), PARAMETER :: dsetname = "VLstrings"     ! Dataset name
+
+          INTEGER(HID_T) :: file_id       ! File identifier
+          INTEGER(HID_T) :: dset_id       ! Dataset identifier
+          INTEGER(HID_T) :: dspace_id     ! Dataspace identifier
+
+
+          INTEGER(HSIZE_T), DIMENSION(1) :: dims = (/4/) ! Dataset dimensions
+          INTEGER(SIZE_T), DIMENSION(4) :: str_len           ! Elements lengths
+          INTEGER(SIZE_T), DIMENSION(4) :: str_len_out
+          INTEGER     ::   rank = 1                      ! Dataset rank
+
+          CHARACTER(LEN=10), DIMENSION(4) :: string_data ! Array of strings
+          CHARACTER(LEN=10), DIMENSION(4) :: string_data_out     ! Data buffers
+          INTEGER     ::   error ! Error flag
+
+          INTEGER(HSIZE_T) :: ih    !general purpose integers
+          INTEGER(HSIZE_T), DIMENSION(2) :: data_dims = (/10,4/)
+          INTEGER(HID_T) :: vl_type_id
+          LOGICAL        :: vl_flag
+
+          !
+          ! Initialize the string_data array.
+          !
+          string_data(1) = 'This is   '
+          str_len(1) = 8
+          string_data(2) = 'a fortran '
+          str_len(2) = 10
+          string_data(3) = 'strings   '
+          str_len(3) = 8
+          string_data(4) = 'test.     '
+          str_len(4) = 5
+
+
+          !
+          ! Create a new file using default properties.
+          !
+          CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
+          if (error .ne. 0) then
+              write(*,*) "Cannot modify filename"
+              stop
+          endif
+          CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
+              CALL check("h5fcreate_f", error, total_error)
+
+
+          !
+          ! Create the dataspace.
+          !
+          CALL h5screate_simple_f(rank, dims, dspace_id, error)
+              CALL check("h5screate_simple_f", error, total_error)
+
+
+          !
+          ! Create the dataset with default properties.
+          !
+          CALL h5dcreate_f(file_id, dsetname, H5T_STRING, dspace_id, &
+                           dset_id, error)
+              CALL check("h5dcreate_f", error, total_error)
+          !
+          ! Check that dataset has a string datatype
+          !
+          CALL h5dget_type_f(dset_id, vl_type_id, error)
+              CALL check("h5dget_type_f", error, total_error)
+          CALL h5tis_variable_str_f( vl_type_id, vl_flag, error)
+              CALL check("h5tis_variable_str_f", error, total_error)
+              if( .NOT. vl_flag ) then
+                 write(*,*) "type is wrong"
+                 total_error = total_error + 1
+              endif
+
+          !
+          ! Write the dataset.
+          !
+          CALL h5dwrite_vl_f(dset_id, H5T_STRING, string_data, data_dims, str_len, error)
+              CALL check("h5dwrite_string_f", error, total_error)
+
+
+          !
+          ! End access to the dataset and release resources used by it.
+          !
+          CALL h5dclose_f(dset_id, error)
+              CALL check("h5dclose_f", error, total_error)
+
+          !
+          ! Close the file.
+          !
+          CALL h5fclose_f(file_id, error)
+              CALL check("h5fclose_f", error, total_error)
+
+          !
+          ! Open the existing file.
+          !
+          CALL h5fopen_f (fix_filename, H5F_ACC_RDWR_F, file_id, error)
+              CALL check("h5fopen_f", error, total_error)
+
+          !
+          ! Open the existing dataset.
+          !
+          CALL h5dopen_f(file_id, dsetname, dset_id, error)
+              CALL check("h5dopen_f", error, total_error)
+          !
+          !  Read the dataset.
+          !
+          CALL h5dread_vl_f(dset_id, H5T_STRING, string_data_out, data_dims,  &
+                            str_len_out, error)
+              CALL check("h5dread_string_f", error, total_error)
+          do 100 ih = 1, data_dims(2)
+             if(str_len(ih) .ne. str_len_out(ih)) then
+                total_error=total_error + 1
+                write(*,*) 'Returned string length is incorrect'
+                goto 100
+             endif
+             if(string_data(1)(1:str_len(ih)) .ne. string_data_out(1)(1:str_len(ih))) then
+             write(*,*) ' Returned string is wrong'
+             total_error = total_error + 1
+             endif
+100       continue
+
+          !
+          CALL h5dclose_f(dset_id, error)
+              CALL check("h5dclose_f", error, total_error)
+
+          !
+          ! Terminate access to the data space.
+          !
+          CALL h5sclose_f(dspace_id, error)
+              CALL check("h5sclose_f", error, total_error)
+
+          !
+          ! Close the file.
+          !
+          CALL h5fclose_f(file_id, error)
+              CALL check("h5fclose_f", error, total_error)
+          if(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
+              CALL check("h5_cleanup_f", error, total_error)
+
+          RETURN
+        END SUBROUTINE vl_test_string
+END MODULE TH5VL
diff --git a/fortran/test/tH5VL.f90 b/fortran/test/tH5VL.f90
deleted file mode 100644
index 651ca75..0000000
--- a/fortran/test/tH5VL.f90
+++ /dev/null
@@ -1,518 +0,0 @@
-!****h* root/fortran/test/tH5VL.f90
-!
-! NAME
-!  tH5VL.f90
-!
-! FUNCTION
-!  Basic testing of Fortran Variable_length datatypes APIs.
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! CONTAINS SUBROUTINES
-!  vl_test_integer, vl_test_real, vl_test_string 
-!
-!*****
-
-MODULE TH5VL
-
-CONTAINS
-
-        SUBROUTINE vl_test_integer(cleanup, total_error)
-        USE HDF5 ! This module contains all necessary modules
-        USE TH5_MISC
-
-          IMPLICIT NONE
-          LOGICAL, INTENT(IN) :: cleanup
-          INTEGER, INTENT(OUT) :: total_error
-
-          CHARACTER(LEN=7), PARAMETER :: filename = "VLtypes" ! File name
-          CHARACTER(LEN=80) :: fix_filename
-          CHARACTER(LEN=5), PARAMETER :: dsetname = "VLint"     ! Dataset name
-
-          INTEGER(HID_T) :: file_id       ! File identifier
-          INTEGER(HID_T) :: dset_id       ! Dataset identifier
-          INTEGER(HID_T) :: dspace_id     ! Dataspace identifier
-          INTEGER(HID_T) :: vltype_id     ! Datatype identifier
-
-
-          INTEGER(HSIZE_T), DIMENSION(1) :: dims = (/6/) ! Dataset dimensions
-          INTEGER(SIZE_T), DIMENSION(6) :: len           ! Elements lengths
-          INTEGER(SIZE_T), DIMENSION(6) :: len_out
-          INTEGER     ::   rank = 1                      ! Dataset rank
-
-          INTEGER, DIMENSION(5,6) :: vl_int_data ! Data buffers
-          INTEGER, DIMENSION(5,6) :: vl_int_data_out ! Data buffers
-          INTEGER     ::   error ! Error flag
-
-          INTEGER     :: i, j    !general purpose integers
-          INTEGER(HSIZE_T) :: ih, jh    !general purpose integers
-          INTEGER(HSIZE_T), DIMENSION(2) :: data_dims = (/5,6/)
-          INTEGER(SIZE_T)  max_len
-
-          !
-          ! Initialize the vl_int_data array.
-          !
-          do i = 1, 6
-             do j = 1, 5
-                vl_int_data(j,i) = -100
-             end do
-          end do
-
-          do i = 2, 6
-             do j = 1,  i-1
-                vl_int_data(j,i) = i-1
-             end do
-          end do
-
-           do i = 1,6
-              len(i) = i-1
-           end do
-
-
-          !
-          ! Create a new file using default properties.
-          !
-          CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
-          if (error .ne. 0) then
-              write(*,*) "Cannot modify filename"
-              stop
-          endif
-          CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
-              CALL check("h5fcreate_f", error, total_error)
-
-
-          !
-          ! Create the dataspace.
-          !
-          CALL h5screate_simple_f(rank, dims, dspace_id, error)
-              CALL check("h5screate_simple_f", error, total_error)
-
-
-          !
-          ! Create the dataset with default properties.
-          !
-          CALL h5tvlen_create_f(H5T_NATIVE_INTEGER, vltype_id, error)
-              CALL check("h5dvlen_create_f", error, total_error)
-
-          CALL h5dcreate_f(file_id, dsetname, vltype_id, dspace_id, &
-                           dset_id, error)
-              CALL check("h5dcreate_f", error, total_error)
-
-          !
-          ! Write the dataset.
-          !
-          CALL h5dwrite_vl_f(dset_id, vltype_id, vl_int_data, data_dims, len, error)
-              CALL check("h5dwrite_int_f", error, total_error)
-
-
-
-          !   
-          ! End access to the dataset and release resources used by it.
-          !
-          CALL h5dclose_f(dset_id, error)
-              CALL check("h5dclose_f", error, total_error)
-
-          !
-          ! Close the file.
-          !
-          CALL h5fclose_f(file_id, error)
-              CALL check("h5fclose_f", error, total_error)
-
-          !
-          ! Open the existing file.
-          !
-          CALL h5fopen_f (fix_filename, H5F_ACC_RDWR_F, file_id, error)
-              CALL check("h5fopen_f", error, total_error)
-
-          !
-          ! Open the existing dataset.
-          !
-          CALL h5dopen_f(file_id, dsetname, dset_id, error)
-              CALL check("h5dopen_f", error, total_error)
-
-          CALL h5dvlen_get_max_len_f(dset_id, vltype_id, dspace_id, max_len, error)
-              CALL check("h5dvlen_get_max_len_f", error, total_error)
-              if(max_len .ne. data_dims(1)) then
-                      total_error = total_error + 1
-                      write(*,*) "Wrong number of elemets returned by h5dvlen_get_max_len_f"
-              endif
-          !
-          ! Read the dataset.
-          !
-          CALL h5dread_vl_f(dset_id, vltype_id, vl_int_data_out, data_dims, len_out, &
-                            error, mem_space_id = dspace_id, file_space_id = dspace_id)
-              CALL check("h5dread_int_f", error, total_error)
-              do ih = 1, data_dims(2)
-              do jh = 1, len_out(ih)
-              if(vl_int_data(jh,ih) .ne. vl_int_data_out(jh,ih))  then
-                  total_error = total_error + 1
-                  write(*,*) "h5dread_vl_f returned incorrect data"
-              endif
-              enddo
-               if (len(ih) .ne. len_out(ih)) then
-                  total_error = total_error + 1
-                  write(*,*) "h5dread_vl_f returned incorrect data"
-              endif
-              enddo
-
-          !
-          CALL h5dclose_f(dset_id, error)
-              CALL check("h5dclose_f", error, total_error)
-
-          CALL h5tclose_f(vltype_id, error)
-              CALL check("h5tclose_f", error, total_error)
-
-          !
-          ! Terminate access to the data space.
-          !
-          CALL h5sclose_f(dspace_id, error)
-              CALL check("h5sclose_f", error, total_error)
-
-          !
-          ! Close the file.
-          !
-          CALL h5fclose_f(file_id, error)
-              CALL check("h5fclose_f", error, total_error)
-          if(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
-              CALL check("h5_cleanup_f", error, total_error)
-
-          RETURN
-        END SUBROUTINE vl_test_integer
-
-        SUBROUTINE vl_test_real(cleanup, total_error)
-        USE HDF5 ! This module contains all necessary modules
-        USE TH5_MISC
-
-          IMPLICIT NONE
-          LOGICAL, INTENT(IN) :: cleanup
-          INTEGER, INTENT(OUT) :: total_error
-
-          CHARACTER(LEN=8), PARAMETER :: filename = "VLtypesR" ! File name
-          CHARACTER(LEN=80) :: fix_filename
-          CHARACTER(LEN=6), PARAMETER :: dsetname = "VLreal"     ! Dataset name
-
-          INTEGER(HID_T) :: file_id       ! File identifier
-          INTEGER(HID_T) :: dset_id       ! Dataset identifier
-          INTEGER(HID_T) :: dspace_id     ! Dataspace identifier
-          INTEGER(HID_T) :: vltype_id     ! Datatype identifier
-
-
-          INTEGER(HSIZE_T), DIMENSION(1) :: dims = (/6/) ! Dataset dimensions
-          INTEGER(SIZE_T), DIMENSION(6) :: len           ! Elements lengths
-          INTEGER(SIZE_T), DIMENSION(6) :: len_out
-          INTEGER     ::   rank = 1                      ! Dataset rank
-
-          REAL, DIMENSION(5,6) :: vl_real_data ! Data buffers
-          REAL, DIMENSION(5,6) :: vl_real_data_out ! Data buffers
-          INTEGER     ::   error ! Error flag
-
-          INTEGER     :: i, j    !general purpose integers
-          INTEGER(HSIZE_T)     :: ih, jh    !general purpose integers
-          INTEGER(HSIZE_T), DIMENSION(2) :: data_dims = (/5,6/)
-          INTEGER(SIZE_T)  max_len
-          INTEGER(HID_T) ::  vl_type_id
-          LOGICAL        ::  vl_flag
-
-          !
-          ! Initialize the vl_int_data array.
-          !
-          do i = 1, 6
-             do j = 1, 5
-                vl_real_data(j,i) = -100.
-             end do
-          end do
-
-          do i = 2, 6
-             do j = 1,  i-1
-                vl_real_data(j,i) = i-1
-             end do
-          end do
-
-           do i = 1,6
-              len(i) = i-1
-           end do
-
-
-          !
-          ! Create a new file using default properties.
-          !
-          CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
-          if (error .ne. 0) then
-              write(*,*) "Cannot modify filename"
-              stop
-          endif
-          CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
-              CALL check("h5fcreate_f", error, total_error)
-
-
-          !
-          ! Create the dataspace.
-          !
-          CALL h5screate_simple_f(rank, dims, dspace_id, error)
-              CALL check("h5screate_simple_f", error, total_error)
-
-
-          !
-          ! Create the dataset with default properties.
-          !
-          CALL h5tvlen_create_f(H5T_NATIVE_REAL, vltype_id, error)
-              CALL check("h5dvlen_create_f", error, total_error)
-
-          CALL h5dcreate_f(file_id, dsetname, vltype_id, dspace_id, &
-                           dset_id, error)
-              CALL check("h5dcreate_f", error, total_error)
-          CALL h5dget_type_f(dset_id, vl_type_id, error)
-              CALL check("h5dget_type_f", error, total_error)
-          CALL h5tis_variable_str_f( vl_type_id, vl_flag, error)
-              CALL check("h5tis_variable_str_f", error, total_error)
-              if( vl_flag ) then
-                 write(*,*) "type is wrong"
-                 total_error = total_error + 1
-              endif
-
-
-          !
-          ! Write the dataset.
-          !
-          CALL h5dwrite_vl_f(dset_id, vltype_id, vl_real_data, data_dims, len, error)
-              CALL check("h5dwrite_vl_real_f", error, total_error)
-
-
-          !
-          ! End access to the dataset and release resources used by it.
-          !
-          CALL h5dclose_f(dset_id, error)
-              CALL check("h5dclose_f", error, total_error)
-
-          !
-          ! Close the file.
-          !
-          CALL h5fclose_f(file_id, error)
-              CALL check("h5fclose_f", error, total_error)
-
-          !
-          ! Open the existing file.
-          !
-          CALL h5fopen_f (fix_filename, H5F_ACC_RDWR_F, file_id, error)
-              CALL check("h5fopen_f", error, total_error)
-
-          !
-          ! Open the existing dataset.
-          !
-          CALL h5dopen_f(file_id, dsetname, dset_id, error)
-              CALL check("h5dopen_f", error, total_error)
-
-          CALL h5dvlen_get_max_len_f(dset_id, vltype_id, dspace_id, max_len, error)
-              CALL check("h5dvlen_get_max_len_f", error, total_error)
-              if(max_len .ne. data_dims(1)) then
-                      total_error = total_error + 1
-                      write(*,*) "Wrong number of elemets returned by h5dvlen_get_max_len_f"
-              endif
-          !
-          ! Read the dataset.
-          !
-          CALL h5dread_vl_f(dset_id, vltype_id, vl_real_data_out, data_dims, len_out, &
-                            error, mem_space_id = dspace_id, file_space_id = dspace_id)
-              CALL check("h5dread_real_f", error, total_error)
-              do ih = 1, data_dims(2)
-              do jh = 1, len_out(ih)
-                 IF( .NOT.dreal_eq( REAL(vl_real_data(jh,ih),dp), REAL(vl_real_data_out(jh,ih), dp)) ) THEN
-                    total_error = total_error + 1
-                    WRITE(*,*) "h5dread_vl_f returned incorrect data"
-                 ENDIF
-              enddo
-               if (len(ih) .ne. len_out(ih)) then
-                  total_error = total_error + 1
-                  write(*,*) "h5dread_vl_f returned incorrect data"
-              endif
-              enddo
-
-
-          !
-          CALL h5dclose_f(dset_id, error)
-              CALL check("h5dclose_f", error, total_error)
-
-          CALL h5tclose_f(vltype_id, error)
-              CALL check("h5tclose_f", error, total_error)
-
-          !
-          ! Terminate access to the data space.
-          !
-          CALL h5sclose_f(dspace_id, error)
-              CALL check("h5sclose_f", error, total_error)
-
-          !
-          ! Close the file.
-          !
-          CALL h5fclose_f(file_id, error)
-              CALL check("h5fclose_f", error, total_error)
-          if(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
-              CALL check("h5_cleanup_f", error, total_error)
-
-          RETURN
-        END SUBROUTINE vl_test_real
-
-        SUBROUTINE vl_test_string(cleanup, total_error)
-        USE HDF5 ! This module contains all necessary modules
-        USE TH5_MISC
-
-          IMPLICIT NONE
-          LOGICAL, INTENT(IN) :: cleanup
-          INTEGER, INTENT(OUT) :: total_error
-
-          CHARACTER(LEN=8), PARAMETER :: filename = "VLtypesS" ! File name
-          CHARACTER(LEN=80) :: fix_filename
-          CHARACTER(LEN=9), PARAMETER :: dsetname = "VLstrings"     ! Dataset name
-
-          INTEGER(HID_T) :: file_id       ! File identifier
-          INTEGER(HID_T) :: dset_id       ! Dataset identifier
-          INTEGER(HID_T) :: dspace_id     ! Dataspace identifier
-
-
-          INTEGER(HSIZE_T), DIMENSION(1) :: dims = (/4/) ! Dataset dimensions
-          INTEGER(SIZE_T), DIMENSION(4) :: str_len           ! Elements lengths
-          INTEGER(SIZE_T), DIMENSION(4) :: str_len_out
-          INTEGER     ::   rank = 1                      ! Dataset rank
-
-          CHARACTER(LEN=10), DIMENSION(4) :: string_data ! Array of strings
-          CHARACTER(LEN=10), DIMENSION(4) :: string_data_out     ! Data buffers
-          INTEGER     ::   error ! Error flag
-
-          INTEGER(HSIZE_T) :: ih    !general purpose integers
-          INTEGER(HSIZE_T), DIMENSION(2) :: data_dims = (/10,4/)
-          INTEGER(HID_T) :: vl_type_id
-          LOGICAL        :: vl_flag
-
-          !
-          ! Initialize the string_data array.
-          !
-          string_data(1) = 'This is   '
-          str_len(1) = 8
-          string_data(2) = 'a fortran '
-          str_len(2) = 10
-          string_data(3) = 'strings   '
-          str_len(3) = 8
-          string_data(4) = 'test.     '
-          str_len(4) = 5
-
-
-          !
-          ! Create a new file using default properties.
-          !
-          CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
-          if (error .ne. 0) then
-              write(*,*) "Cannot modify filename"
-              stop
-          endif
-          CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
-              CALL check("h5fcreate_f", error, total_error)
-
-
-          !
-          ! Create the dataspace.
-          !
-          CALL h5screate_simple_f(rank, dims, dspace_id, error)
-              CALL check("h5screate_simple_f", error, total_error)
-
-
-          !
-          ! Create the dataset with default properties.
-          !
-          CALL h5dcreate_f(file_id, dsetname, H5T_STRING, dspace_id, &
-                           dset_id, error)
-              CALL check("h5dcreate_f", error, total_error)
-          !
-          ! Check that dataset has a string datatype
-          !
-          CALL h5dget_type_f(dset_id, vl_type_id, error)
-              CALL check("h5dget_type_f", error, total_error)
-          CALL h5tis_variable_str_f( vl_type_id, vl_flag, error)
-              CALL check("h5tis_variable_str_f", error, total_error)
-              if( .NOT. vl_flag ) then
-                 write(*,*) "type is wrong"
-                 total_error = total_error + 1
-              endif
-
-          !
-          ! Write the dataset.
-          !
-          CALL h5dwrite_vl_f(dset_id, H5T_STRING, string_data, data_dims, str_len, error)
-              CALL check("h5dwrite_string_f", error, total_error)
-
-
-          !
-          ! End access to the dataset and release resources used by it.
-          !
-          CALL h5dclose_f(dset_id, error)
-              CALL check("h5dclose_f", error, total_error)
-
-          !
-          ! Close the file.
-          !
-          CALL h5fclose_f(file_id, error)
-              CALL check("h5fclose_f", error, total_error)
-
-          !
-          ! Open the existing file.
-          !
-          CALL h5fopen_f (fix_filename, H5F_ACC_RDWR_F, file_id, error)
-              CALL check("h5fopen_f", error, total_error)
-
-          !
-          ! Open the existing dataset.
-          !
-          CALL h5dopen_f(file_id, dsetname, dset_id, error)
-              CALL check("h5dopen_f", error, total_error)
-          !
-          !  Read the dataset.
-          !
-          CALL h5dread_vl_f(dset_id, H5T_STRING, string_data_out, data_dims,  &
-                            str_len_out, error)
-              CALL check("h5dread_string_f", error, total_error)
-          do 100 ih = 1, data_dims(2)
-             if(str_len(ih) .ne. str_len_out(ih)) then
-                total_error=total_error + 1
-                write(*,*) 'Returned string length is incorrect'
-                goto 100
-             endif
-             if(string_data(1)(1:str_len(ih)) .ne. string_data_out(1)(1:str_len(ih))) then
-             write(*,*) ' Returned string is wrong'
-             total_error = total_error + 1
-             endif
-100       continue
-
-          !
-          CALL h5dclose_f(dset_id, error)
-              CALL check("h5dclose_f", error, total_error)
-
-          !
-          ! Terminate access to the data space.
-          !
-          CALL h5sclose_f(dspace_id, error)
-              CALL check("h5sclose_f", error, total_error)
-
-          !
-          ! Close the file.
-          !
-          CALL h5fclose_f(file_id, error)
-              CALL check("h5fclose_f", error, total_error)
-          if(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
-              CALL check("h5_cleanup_f", error, total_error)
-
-          RETURN
-        END SUBROUTINE vl_test_string
-END MODULE TH5VL
diff --git a/fortran/test/tH5Z.F90 b/fortran/test/tH5Z.F90
new file mode 100644
index 0000000..3ac51d6
--- /dev/null
+++ b/fortran/test/tH5Z.F90
@@ -0,0 +1,421 @@
+!****h* root/fortran/test/tH5Z.f90
+!
+! NAME
+!  tH5Z.f90
+!
+! FUNCTION
+!  Basic testing of Fortran H5Z szip APIs.
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+! CONTAINS SUBROUTINES
+!  filters_test, szip_test
+!
+!*****
+MODULE TH5Z
+
+CONTAINS
+
+    SUBROUTINE filters_test(total_error)
+
+!   This subroutine tests following functionalities: h5zfilter_avail_f, h5zunregister_f
+
+   USE HDF5 ! This module contains all necessary modules
+   USE TH5_MISC
+
+     IMPLICIT NONE
+     INTEGER, INTENT(OUT) :: total_error
+     LOGICAL :: status
+     INTEGER(HID_T)    :: crtpr_id, xfer_id
+     INTEGER           :: nfilters
+     INTEGER           :: error
+     INTEGER(HSIZE_T)  :: ch_dims(2)
+     INTEGER           :: RANK = 2
+     INTEGER           :: dlevel = 6
+     INTEGER           :: edc_flag
+
+     ch_dims(1) = 10
+     ch_dims(2) = 3
+!
+! Deflate filter
+!
+     CALL h5zfilter_avail_f(H5Z_FILTER_DEFLATE_F, status, error)
+              CALL check("h5zfilter_avail_f", error, total_error)
+     if(status) then
+        CALL h5pcreate_f(H5P_DATASET_CREATE_F, crtpr_id, error)
+              CALL check("h5pcreate_f", error, total_error)
+        CALL h5pset_chunk_f(crtpr_id, RANK, ch_dims, error)
+              CALL check("h5pset_chunk_f",error, total_error)
+        CALL h5pset_deflate_f(crtpr_id, dlevel, error)
+              CALL check("h5pset_deflate_f", error, total_error)
+        CALL h5pclose_f(crtpr_id,error)
+              CALL check("h5pclose_f", error, total_error)
+     endif
+
+!
+! Shuffle filter
+!
+     CALL h5zfilter_avail_f(H5Z_FILTER_SHUFFLE_F, status, error)
+              CALL check("h5zfilter_avail_f", error, total_error)
+     if(status) then
+        CALL h5pcreate_f(H5P_DATASET_CREATE_F, crtpr_id, error)
+              CALL check("h5pcreate_f", error, total_error)
+        CALL h5pset_chunk_f(crtpr_id, RANK, ch_dims, error)
+              CALL check("h5pset_chunk_f",error, total_error)
+        CALL h5pset_shuffle_f(crtpr_id, error)
+              CALL check("h5pset_shuffle_f", error, total_error)
+        CALL h5pclose_f(crtpr_id,error)
+              CALL check("h5pclose_f", error, total_error)
+     endif
+
+!
+! Checksum filter
+!
+     CALL h5zfilter_avail_f(H5Z_FILTER_FLETCHER32_F, status, error)
+              CALL check("h5zfilter_avail_f", error, total_error)
+     if(status) then
+        CALL h5pcreate_f(H5P_DATASET_CREATE_F, crtpr_id, error)
+              CALL check("h5pcreate_f", error, total_error)
+        CALL h5pset_chunk_f(crtpr_id, RANK, ch_dims, error)
+              CALL check("h5pset_chunk_f",error, total_error)
+        CALL h5pset_fletcher32_f(crtpr_id, error)
+              CALL check("h5pset_fletcher32_f", error, total_error)
+        CALL h5pclose_f(crtpr_id,error)
+              CALL check("h5pclose_f", error, total_error)
+        CALL h5pcreate_f(H5P_DATASET_XFER_F, xfer_id, error)
+              CALL check("h5pcreate_f", error, total_error)
+        CALL h5pset_edc_check_f( xfer_id, H5Z_DISABLE_EDC_F, error)
+              CALL check("h5pset_edc_check_f", error, total_error)
+        CALL h5pget_edc_check_f( xfer_id, edc_flag, error)
+              CALL check("h5pget_edc_check_f", error, total_error)
+        if (edc_flag .ne. H5Z_DISABLE_EDC_F) then
+              write(*,*) "EDC status is wrong"
+              total_error = total_error + 1
+        endif
+        CALL h5pclose_f(xfer_id, error)
+              CALL check("h5pclose_f", error, total_error)
+
+     endif
+
+!
+! Verify h5premove_filter_f
+!
+     CALL h5zfilter_avail_f(H5Z_FILTER_FLETCHER32_F, status, error)
+              CALL check("h5zfilter_avail_f", error, total_error)
+     if(status) then
+         CALL h5zfilter_avail_f(H5Z_FILTER_SHUFFLE_F, status, error)
+                  CALL check("h5zfilter_avail_f", error, total_error)
+         if(status) then
+            CALL h5pcreate_f(H5P_DATASET_CREATE_F, crtpr_id, error)
+                  CALL check("h5pcreate_f", error, total_error)
+            CALL h5pset_fletcher32_f(crtpr_id, error)
+                  CALL check("h5pset_fletcher32_f", error, total_error)
+            CALL h5pset_shuffle_f(crtpr_id, error)
+                  CALL check("h5pset_shuffle_f", error, total_error)
+            CALL h5pget_nfilters_f(crtpr_id, nfilters, error)
+                  CALL check("h5pget_nfilters_f", error, total_error)
+
+            ! Verify the correct number of filters
+            if (nfilters .ne. 2) then
+                  write(*,*) "number of filters is wrong"
+                  total_error = total_error + 1
+            endif
+
+            ! Delete a single filter
+            CALL h5premove_filter_f(crtpr_id, H5Z_FILTER_SHUFFLE_F, error)
+                  CALL check("h5pset_shuffle_f", error, total_error)
+
+            ! Verify the correct number of filters now
+            CALL h5pget_nfilters_f(crtpr_id, nfilters, error)
+                  CALL check("h5pget_nfilters_f", error, total_error)
+            if (nfilters .ne. 1) then
+                  write(*,*) "number of filters is wrong"
+                  total_error = total_error + 1
+            endif
+
+            ! Delete all filters
+            CALL h5premove_filter_f(crtpr_id, H5Z_FILTER_ALL_F, error)
+                  CALL check("h5premove_filter_f", error, total_error)
+
+            ! Verify the correct number of filters now
+            CALL h5pget_nfilters_f(crtpr_id, nfilters, error)
+                  CALL check("h5pget_nfilters_f", error, total_error)
+            if (nfilters .ne. 0) then
+                  write(*,*) "number of filters is wrong"
+                  total_error = total_error + 1
+            endif
+            CALL h5pclose_f(crtpr_id,error)
+                  CALL check("h5pclose_f", error, total_error)
+         endif
+     endif
+
+     RETURN
+     END SUBROUTINE filters_test
+
+        SUBROUTINE szip_test(szip_flag, cleanup, total_error)
+        USE HDF5 ! This module contains all necessary modules
+        USE TH5_MISC
+
+          IMPLICIT NONE
+          LOGICAL, INTENT(OUT) :: szip_flag
+          LOGICAL, INTENT(IN) :: cleanup
+          INTEGER, INTENT(OUT) :: total_error
+
+
+          CHARACTER(LEN=4), PARAMETER :: filename = "szip" ! File name
+          CHARACTER(LEN=80) :: fix_filename
+          CHARACTER(LEN=4), PARAMETER :: dsetname = "dset"     ! Dataset name
+          INTEGER, PARAMETER :: N = 1024
+          INTEGER, PARAMETER :: NN = 64
+          INTEGER, PARAMETER :: M = 512
+          INTEGER, PARAMETER :: MM = 32
+
+          INTEGER(HID_T) :: file_id       ! File identifier
+          INTEGER(HID_T) :: dset_id       ! Dataset identifier
+          INTEGER(HID_T) :: dspace_id     ! Dataspace identifier
+          INTEGER(HID_T) :: dtype_id      ! Datatype identifier
+
+
+          INTEGER(HSIZE_T), DIMENSION(2) :: dims = (/N,M/) ! Dataset dimensions
+          INTEGER(HSIZE_T), DIMENSION(2) :: chunk_dims = (/NN, MM/)
+          INTEGER     ::   rank = 2                        ! Dataset rank
+
+          INTEGER, DIMENSION(:,:), ALLOCATABLE :: dset_data ! Data buffers
+          INTEGER, DIMENSION(:,:), ALLOCATABLE :: data_out  ! Data buffers
+          INTEGER     ::   error ! Error flag
+          INTEGER     ::   num_errors = 0 ! Number of data errors
+
+          INTEGER     :: i, j    !general purpose integers
+          INTEGER(HSIZE_T), DIMENSION(2) :: data_dims
+          INTEGER(HID_T) ::  crp_list
+          INTEGER :: options_mask, pix_per_block
+          LOGICAL :: flag
+          CHARACTER(LEN=4) filter_name
+
+          INTEGER :: filter_flag = -1
+          INTEGER(SIZE_T) :: cd_nelemnts = 4
+          INTEGER(SIZE_T) :: filter_name_len = 4
+          INTEGER, DIMENSION(4) :: cd_values
+          INTEGER     :: config_flag = 0   ! for h5zget_filter_info_f
+          INTEGER     :: config_flag_both = 0   ! for h5zget_filter_info_f
+
+          !
+          ! Verify that SZIP exists and has an encoder
+          !
+          CALL h5zfilter_avail_f(H5Z_FILTER_SZIP_F, szip_flag, error)
+              CALL check("h5zfilter_avail", error, total_error)
+
+          ! Quit if failed
+          if (error .ne. 0) return
+
+          ! Skip if no SZIP available
+          if (.NOT. szip_flag)then
+              return
+
+          else  !SZIP available
+
+          ! Continue
+          CALL h5zget_filter_info_f(H5Z_FILTER_SZIP_F, config_flag, error)
+              CALL check("h5zget_filter_info_f", error, total_error)
+          ! Quit if failed
+          if (error .ne. 0) return
+          !
+          ! Make sure h5zget_filter_info_f returns the right flag
+          !
+          config_flag_both=IOR(H5Z_FILTER_ENCODE_ENABLED_F,H5Z_FILTER_DECODE_ENABLED_F)
+          if( szip_flag ) then
+              if (config_flag .NE. config_flag_both) then
+                  if(config_flag .NE. H5Z_FILTER_DECODE_ENABLED_F)  then
+                     error = -1
+                     CALL check("h5zget_filter_info_f config_flag", error, total_error)
+                  endif
+              endif
+          endif
+
+          ! Continue only when encoder is available
+          if ( IAND(config_flag,  H5Z_FILTER_ENCODE_ENABLED_F) .EQ. 0 ) return
+
+          options_mask = H5_SZIP_NN_OM_F
+          pix_per_block = 32
+          !
+          ! Initialize the dset_data array.
+          !
+          ALLOCATE(dset_data(1:N,1:M))
+          do i = 1, N
+             do j = 1, M
+                dset_data(i,j) = (i-1)*6 + j;
+             end do
+          end do
+
+
+          !
+          ! Create a new file using default properties.
+          !
+          CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
+          if (error .ne. 0) then
+              write(*,*) "Cannot modify filename"
+              stop
+          endif
+          CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
+              CALL check("h5fcreate_f", error, total_error)
+
+
+          !
+          ! Create the dataspace.
+          !
+          CALL h5screate_simple_f(rank, dims, dspace_id, error)
+              CALL check("h5screate_simple_f", error, total_error)
+
+          CALL h5pcreate_f(H5P_DATASET_CREATE_F, crp_list, error)
+              CALL check("h5pcreat_f",error,total_error)
+
+          CALL h5pset_chunk_f(crp_list, rank, chunk_dims, error)
+              CALL check("h5pset_chunk_f",error,total_error)
+          CALL h5pset_szip_f(crp_list, options_mask, pix_per_block, error)
+              CALL check("h5pset_szip_f",error,total_error)
+          CALL h5pall_filters_avail_f(crp_list, flag, error)
+              CALL check("h5pall_filters_avail_f",error,total_error)
+          if (.NOT. flag) then
+             CALL h5pclose_f(crp_list, error)
+             CALL h5sclose_f(dspace_id, error)
+             CALL h5fclose_f(file_id, error)
+             szip_flag = .FALSE.
+             total_error = -1
+             return
+          endif
+
+         CALL h5pget_filter_by_id_f(crp_list, H5Z_FILTER_SZIP_F, filter_flag, &
+
+                                    cd_nelemnts, cd_values,&
+
+                                    filter_name_len, filter_name, error)
+               CALL check("h5pget_filter_by_id_f",error,total_error)
+          !
+          ! Create the dataset with default properties.
+          !
+          CALL h5dcreate_f(file_id, dsetname, H5T_NATIVE_INTEGER, dspace_id, &
+                           dset_id, error, crp_list)
+              CALL check("h5dcreate_f", error, total_error)
+
+          !
+          ! Write the dataset.
+          !
+          data_dims(1) = N
+          data_dims(2) =  M
+          CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, dset_data, data_dims, error)
+              CALL check("h5dwrite_f", error, total_error)
+
+
+          !
+          ! End access to the dataset and release resources used by it.
+          !
+          CALL h5dclose_f(dset_id, error)
+              CALL check("h5dclose_f", error, total_error)
+
+          !
+          ! Terminate access to the data space.
+          !
+          CALL h5sclose_f(dspace_id, error)
+              CALL check("h5sclose_f", error, total_error)
+
+          !
+          ! Close the file.
+          !
+             CALL h5pclose_f(crp_list, error)
+          CALL h5fclose_f(file_id, error)
+              CALL check("h5fclose_f", error, total_error)
+
+          !
+          ! Open the existing file.
+          !
+          CALL h5fopen_f (fix_filename, H5F_ACC_RDWR_F, file_id, error)
+              CALL check("h5fopen_f", error, total_error)
+
+          !
+          ! Open the existing dataset.
+          !
+          CALL h5dopen_f(file_id, dsetname, dset_id, error)
+              CALL check("h5dopen_f", error, total_error)
+               CALL check("h5pget_filter_by_id_f",error,total_error)
+
+          !
+          ! Get the dataset type.
+          !
+          CALL h5dget_type_f(dset_id, dtype_id, error)
+              CALL check("h5dget_type_f", error, total_error)
+
+          !
+          ! Get the data space.
+          !
+          CALL h5dget_space_f(dset_id, dspace_id, error)
+              CALL check("h5dget_space_f", error, total_error)
+
+          !
+          ! Read the dataset.
+          !
+          ALLOCATE(data_out(1:N,1:M))
+          CALL h5dread_f (dset_id, H5T_NATIVE_INTEGER, data_out, data_dims, error)
+          CALL check("h5dread_f", error, total_error)
+
+          !
+          !Compare the data.
+          !
+          do i = 1, N
+              do j = 1, M
+                  IF (data_out(i,j) .NE. dset_data(i, j)) THEN
+                      write(*, *) "dataset test error occurred"
+                      write(*,*) "data read is not the same as the data written"
+                      num_errors = num_errors + 1
+                      IF (num_errors .GE. 512) THEN
+                        write(*, *) "maximum data errors reached"
+                        goto 100
+                      END IF
+                  END IF
+              end do
+          end do
+100       IF (num_errors .GT. 0) THEN
+            total_error=total_error + 1
+          END IF
+          DEALLOCATE(dset_data)
+          DEALLOCATE(data_out)
+
+          !
+          ! End access to the dataset and release resources used by it.
+          !
+          CALL h5dclose_f(dset_id, error)
+              CALL check("h5dclose_f", error, total_error)
+
+          !
+          ! Terminate access to the data space.
+          !
+          CALL h5sclose_f(dspace_id, error)
+              CALL check("h5sclose_f", error, total_error)
+
+          !
+          ! Terminate access to the data type.
+          !
+          CALL h5tclose_f(dtype_id, error)
+              CALL check("h5tclose_f", error, total_error)
+          !
+          ! Close the file.
+          !
+          CALL h5fclose_f(file_id, error)
+              CALL check("h5fclose_f", error, total_error)
+          if(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
+              CALL check("h5_cleanup_f", error, total_error)
+          endif ! SZIP available
+
+          RETURN
+        END SUBROUTINE szip_test
+END MODULE TH5Z
diff --git a/fortran/test/tH5Z.f90 b/fortran/test/tH5Z.f90
deleted file mode 100644
index 4201960..0000000
--- a/fortran/test/tH5Z.f90
+++ /dev/null
@@ -1,419 +0,0 @@
-!****h* root/fortran/test/tH5Z.f90
-!
-! NAME
-!  tH5Z.f90
-!
-! FUNCTION
-!  Basic testing of Fortran H5Z szip APIs.
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! CONTAINS SUBROUTINES
-!  filters_test, szip_test
-!
-!*****
-MODULE TH5Z
-
-CONTAINS
-
-    SUBROUTINE filters_test(total_error)
-
-!   This subroutine tests following functionalities: h5zfilter_avail_f, h5zunregister_f
-
-   USE HDF5 ! This module contains all necessary modules
-   USE TH5_MISC
-
-     IMPLICIT NONE
-     INTEGER, INTENT(OUT) :: total_error
-     LOGICAL :: status
-     INTEGER(HID_T)    :: crtpr_id, xfer_id
-     INTEGER           :: nfilters
-     INTEGER           :: error
-     INTEGER(HSIZE_T)  :: ch_dims(2)
-     INTEGER           :: RANK = 2
-     INTEGER           :: dlevel = 6
-     INTEGER           :: edc_flag
-
-     ch_dims(1) = 10
-     ch_dims(2) = 3
-!
-! Deflate filter
-!
-     CALL h5zfilter_avail_f(H5Z_FILTER_DEFLATE_F, status, error)
-              CALL check("h5zfilter_avail_f", error, total_error)
-     if(status) then
-        CALL h5pcreate_f(H5P_DATASET_CREATE_F, crtpr_id, error)
-              CALL check("h5pcreate_f", error, total_error)
-        CALL h5pset_chunk_f(crtpr_id, RANK, ch_dims, error)
-              CALL check("h5pset_chunk_f",error, total_error)
-        CALL h5pset_deflate_f(crtpr_id, dlevel, error)
-              CALL check("h5pset_deflate_f", error, total_error)
-        CALL h5pclose_f(crtpr_id,error)
-              CALL check("h5pclose_f", error, total_error)
-     endif
-
-!
-! Shuffle filter
-!
-     CALL h5zfilter_avail_f(H5Z_FILTER_SHUFFLE_F, status, error)
-              CALL check("h5zfilter_avail_f", error, total_error)
-     if(status) then
-        CALL h5pcreate_f(H5P_DATASET_CREATE_F, crtpr_id, error)
-              CALL check("h5pcreate_f", error, total_error)
-        CALL h5pset_chunk_f(crtpr_id, RANK, ch_dims, error)
-              CALL check("h5pset_chunk_f",error, total_error)
-        CALL h5pset_shuffle_f(crtpr_id, error)
-              CALL check("h5pset_shuffle_f", error, total_error)
-        CALL h5pclose_f(crtpr_id,error)
-              CALL check("h5pclose_f", error, total_error)
-     endif
-
-!
-! Checksum filter
-!
-     CALL h5zfilter_avail_f(H5Z_FILTER_FLETCHER32_F, status, error)
-              CALL check("h5zfilter_avail_f", error, total_error)
-     if(status) then
-        CALL h5pcreate_f(H5P_DATASET_CREATE_F, crtpr_id, error)
-              CALL check("h5pcreate_f", error, total_error)
-        CALL h5pset_chunk_f(crtpr_id, RANK, ch_dims, error)
-              CALL check("h5pset_chunk_f",error, total_error)
-        CALL h5pset_fletcher32_f(crtpr_id, error)
-              CALL check("h5pset_fletcher32_f", error, total_error)
-        CALL h5pclose_f(crtpr_id,error)
-              CALL check("h5pclose_f", error, total_error)
-        CALL h5pcreate_f(H5P_DATASET_XFER_F, xfer_id, error)
-              CALL check("h5pcreate_f", error, total_error)
-        CALL h5pset_edc_check_f( xfer_id, H5Z_DISABLE_EDC_F, error)
-              CALL check("h5pset_edc_check_f", error, total_error)
-        CALL h5pget_edc_check_f( xfer_id, edc_flag, error)
-              CALL check("h5pget_edc_check_f", error, total_error)
-        if (edc_flag .ne. H5Z_DISABLE_EDC_F) then
-              write(*,*) "EDC status is wrong"
-              total_error = total_error + 1
-        endif
-        CALL h5pclose_f(xfer_id, error)
-              CALL check("h5pclose_f", error, total_error)
-
-     endif
-
-!
-! Verify h5premove_filter_f
-!
-     CALL h5zfilter_avail_f(H5Z_FILTER_FLETCHER32_F, status, error)
-              CALL check("h5zfilter_avail_f", error, total_error)
-     if(status) then
-         CALL h5zfilter_avail_f(H5Z_FILTER_SHUFFLE_F, status, error)
-                  CALL check("h5zfilter_avail_f", error, total_error)
-         if(status) then
-            CALL h5pcreate_f(H5P_DATASET_CREATE_F, crtpr_id, error)
-                  CALL check("h5pcreate_f", error, total_error)
-            CALL h5pset_fletcher32_f(crtpr_id, error)
-                  CALL check("h5pset_fletcher32_f", error, total_error)
-            CALL h5pset_shuffle_f(crtpr_id, error)
-                  CALL check("h5pset_shuffle_f", error, total_error)
-            CALL h5pget_nfilters_f(crtpr_id, nfilters, error)
-                  CALL check("h5pget_nfilters_f", error, total_error)
-
-            ! Verify the correct number of filters
-            if (nfilters .ne. 2) then
-                  write(*,*) "number of filters is wrong"
-                  total_error = total_error + 1
-            endif
-
-            ! Delete a single filter
-            CALL h5premove_filter_f(crtpr_id, H5Z_FILTER_SHUFFLE_F, error)
-                  CALL check("h5pset_shuffle_f", error, total_error)
-
-            ! Verify the correct number of filters now
-            CALL h5pget_nfilters_f(crtpr_id, nfilters, error)
-                  CALL check("h5pget_nfilters_f", error, total_error)
-            if (nfilters .ne. 1) then
-                  write(*,*) "number of filters is wrong"
-                  total_error = total_error + 1
-            endif
-
-            ! Delete all filters
-            CALL h5premove_filter_f(crtpr_id, H5Z_FILTER_ALL_F, error)
-                  CALL check("h5premove_filter_f", error, total_error)
-
-            ! Verify the correct number of filters now
-            CALL h5pget_nfilters_f(crtpr_id, nfilters, error)
-                  CALL check("h5pget_nfilters_f", error, total_error)
-            if (nfilters .ne. 0) then
-                  write(*,*) "number of filters is wrong"
-                  total_error = total_error + 1
-            endif
-            CALL h5pclose_f(crtpr_id,error)
-                  CALL check("h5pclose_f", error, total_error)
-         endif
-     endif
-
-     RETURN
-     END SUBROUTINE filters_test
-
-        SUBROUTINE szip_test(szip_flag, cleanup, total_error)
-        USE HDF5 ! This module contains all necessary modules
-        USE TH5_MISC
-
-          IMPLICIT NONE
-          LOGICAL, INTENT(OUT) :: szip_flag
-          LOGICAL, INTENT(IN) :: cleanup
-          INTEGER, INTENT(OUT) :: total_error
-
-
-          CHARACTER(LEN=4), PARAMETER :: filename = "szip" ! File name
-          CHARACTER(LEN=80) :: fix_filename
-          CHARACTER(LEN=4), PARAMETER :: dsetname = "dset"     ! Dataset name
-          INTEGER, PARAMETER :: N = 1024
-          INTEGER, PARAMETER :: NN = 64
-          INTEGER, PARAMETER :: M = 512
-          INTEGER, PARAMETER :: MM = 32
-
-          INTEGER(HID_T) :: file_id       ! File identifier
-          INTEGER(HID_T) :: dset_id       ! Dataset identifier
-          INTEGER(HID_T) :: dspace_id     ! Dataspace identifier
-          INTEGER(HID_T) :: dtype_id      ! Datatype identifier
-
-
-          INTEGER(HSIZE_T), DIMENSION(2) :: dims = (/N,M/) ! Dataset dimensions
-          INTEGER(HSIZE_T), DIMENSION(2) :: chunk_dims = (/NN, MM/)
-          INTEGER     ::   rank = 2                        ! Dataset rank
-
-          INTEGER, DIMENSION(N,M) :: dset_data, data_out ! Data buffers
-          INTEGER     ::   error ! Error flag
-          INTEGER     ::   num_errors = 0 ! Number of data errors
-
-          INTEGER     :: i, j    !general purpose integers
-          INTEGER(HSIZE_T), DIMENSION(2) :: data_dims
-          INTEGER(HID_T) ::  crp_list
-          INTEGER :: options_mask, pix_per_block
-          LOGICAL :: flag
-          CHARACTER(LEN=4) filter_name
-
-          INTEGER :: filter_flag = -1
-          INTEGER(SIZE_T) :: cd_nelemnts = 4
-          INTEGER(SIZE_T) :: filter_name_len = 4
-          INTEGER, DIMENSION(4) :: cd_values
-          INTEGER     :: config_flag = 0   ! for h5zget_filter_info_f
-          INTEGER     :: config_flag_both = 0   ! for h5zget_filter_info_f
-
-          !
-          ! Verify that SZIP exists and has an encoder
-          !
-          CALL h5zfilter_avail_f(H5Z_FILTER_SZIP_F, szip_flag, error)
-              CALL check("h5zfilter_avail", error, total_error)
-
-          ! Quit if failed
-          if (error .ne. 0) return
-
-          ! Skip if no SZIP available
-          if (.NOT. szip_flag)then
-              return
-
-          else  !SZIP available
-
-          ! Continue
-          CALL h5zget_filter_info_f(H5Z_FILTER_SZIP_F, config_flag, error)
-              CALL check("h5zget_filter_info_f", error, total_error)
-          ! Quit if failed
-          if (error .ne. 0) return
-          !
-          ! Make sure h5zget_filter_info_f returns the right flag
-          !
-          config_flag_both=IOR(H5Z_FILTER_ENCODE_ENABLED_F,H5Z_FILTER_DECODE_ENABLED_F)
-          if( szip_flag ) then
-              if (config_flag .NE. config_flag_both) then
-                  if(config_flag .NE. H5Z_FILTER_DECODE_ENABLED_F)  then
-                     error = -1
-                     CALL check("h5zget_filter_info_f config_flag", error, total_error)
-                  endif
-              endif
-          endif
-
-          ! Continue only when encoder is available
-          if ( IAND(config_flag,  H5Z_FILTER_ENCODE_ENABLED_F) .EQ. 0 ) return
-
-          options_mask = H5_SZIP_NN_OM_F
-          pix_per_block = 32
-          !
-          ! Initialize the dset_data array.
-          !
-          do i = 1, N
-             do j = 1, M
-                dset_data(i,j) = (i-1)*6 + j;
-             end do
-          end do
-
-
-          !
-          ! Create a new file using default properties.
-          !
-          CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
-          if (error .ne. 0) then
-              write(*,*) "Cannot modify filename"
-              stop
-          endif
-          CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
-              CALL check("h5fcreate_f", error, total_error)
-
-
-          !
-          ! Create the dataspace.
-          !
-          CALL h5screate_simple_f(rank, dims, dspace_id, error)
-              CALL check("h5screate_simple_f", error, total_error)
-
-          CALL h5pcreate_f(H5P_DATASET_CREATE_F, crp_list, error)
-              CALL check("h5pcreat_f",error,total_error)
-
-          CALL h5pset_chunk_f(crp_list, rank, chunk_dims, error)
-              CALL check("h5pset_chunk_f",error,total_error)
-          CALL h5pset_szip_f(crp_list, options_mask, pix_per_block, error)
-              CALL check("h5pset_szip_f",error,total_error)
-          CALL h5pall_filters_avail_f(crp_list, flag, error)
-              CALL check("h5pall_filters_avail_f",error,total_error)
-          if (.NOT. flag) then
-             CALL h5pclose_f(crp_list, error)
-             CALL h5sclose_f(dspace_id, error)
-             CALL h5fclose_f(file_id, error)
-             szip_flag = .FALSE.
-             total_error = -1
-             return
-          endif
-
-         CALL h5pget_filter_by_id_f(crp_list, H5Z_FILTER_SZIP_F, filter_flag, &
-
-                                    cd_nelemnts, cd_values,&
-
-                                    filter_name_len, filter_name, error)
-               CALL check("h5pget_filter_by_id_f",error,total_error)
-          !
-          ! Create the dataset with default properties.
-          !
-          CALL h5dcreate_f(file_id, dsetname, H5T_NATIVE_INTEGER, dspace_id, &
-                           dset_id, error, crp_list)
-              CALL check("h5dcreate_f", error, total_error)
-
-          !
-          ! Write the dataset.
-          !
-          data_dims(1) = N
-          data_dims(2) =  M
-          CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, dset_data, data_dims, error)
-              CALL check("h5dwrite_f", error, total_error)
-
-
-          !
-          ! End access to the dataset and release resources used by it.
-          !
-          CALL h5dclose_f(dset_id, error)
-              CALL check("h5dclose_f", error, total_error)
-
-          !
-          ! Terminate access to the data space.
-          !
-          CALL h5sclose_f(dspace_id, error)
-              CALL check("h5sclose_f", error, total_error)
-
-          !
-          ! Close the file.
-          !
-             CALL h5pclose_f(crp_list, error)
-          CALL h5fclose_f(file_id, error)
-              CALL check("h5fclose_f", error, total_error)
-
-          !
-          ! Open the existing file.
-          !
-          CALL h5fopen_f (fix_filename, H5F_ACC_RDWR_F, file_id, error)
-              CALL check("h5fopen_f", error, total_error)
-
-          !
-          ! Open the existing dataset.
-          !
-          CALL h5dopen_f(file_id, dsetname, dset_id, error)
-              CALL check("h5dopen_f", error, total_error)
-               CALL check("h5pget_filter_by_id_f",error,total_error)
-
-          !
-          ! Get the dataset type.
-          !
-          CALL h5dget_type_f(dset_id, dtype_id, error)
-              CALL check("h5dget_type_f", error, total_error)
-
-          !
-          ! Get the data space.
-          !
-          CALL h5dget_space_f(dset_id, dspace_id, error)
-              CALL check("h5dget_space_f", error, total_error)
-
-          !
-          ! Read the dataset.
-          !
-          CALL h5dread_f (dset_id, H5T_NATIVE_INTEGER, data_out, data_dims, error)
-              CALL check("h5dread_f", error, total_error)
-
-          !
-          !Compare the data.
-          !
-          do i = 1, N
-              do j = 1, M
-                  IF (data_out(i,j) .NE. dset_data(i, j)) THEN
-                      write(*, *) "dataset test error occured"
-                      write(*,*) "data read is not the same as the data written"
-                      num_errors = num_errors + 1
-                      IF (num_errors .GE. 512) THEN
-                        write(*, *) "maximum data errors reached"
-                        goto 100
-                      END IF
-                  END IF
-              end do
-          end do
-100       IF (num_errors .GT. 0) THEN
-            total_error=total_error + 1
-          END IF
-
-          !
-          ! End access to the dataset and release resources used by it.
-          !
-          CALL h5dclose_f(dset_id, error)
-              CALL check("h5dclose_f", error, total_error)
-
-          !
-          ! Terminate access to the data space.
-          !
-          CALL h5sclose_f(dspace_id, error)
-              CALL check("h5sclose_f", error, total_error)
-
-          !
-          ! Terminate access to the data type.
-          !
-          CALL h5tclose_f(dtype_id, error)
-              CALL check("h5tclose_f", error, total_error)
-          !
-          ! Close the file.
-          !
-          CALL h5fclose_f(file_id, error)
-              CALL check("h5fclose_f", error, total_error)
-          if(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
-              CALL check("h5_cleanup_f", error, total_error)
-          endif ! SZIP available
-
-          RETURN
-        END SUBROUTINE szip_test
-END MODULE TH5Z
diff --git a/fortran/test/tHDF5.F90 b/fortran/test/tHDF5.F90
new file mode 100644
index 0000000..34e1ea0
--- /dev/null
+++ b/fortran/test/tHDF5.F90
@@ -0,0 +1,43 @@
+!****h* ROBODoc/THDF5
+!
+! NAME
+!  MODULE THDF5
+!
+! FILE
+!  src/fortran/test/tHDF5.f90
+!
+! PURPOSE
+!  This is the test module used for testing the Fortran90 HDF library APIs.
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+!*****
+
+MODULE THDF5
+  USE TH5_MISC
+  USE TH5_MISC_GEN
+  USE TH5A
+  USE TH5D
+  USE TH5E
+  USE TH5F
+  USE TH5G
+  USE TH5I
+  USE TH5P
+  USE TH5R
+  USE TH5S
+  USE TH5SSELECT
+  USE TH5T
+  USE TH5VL
+  USE TH5Z
+END MODULE THDF5
diff --git a/fortran/test/tHDF5.f90 b/fortran/test/tHDF5.f90
deleted file mode 100644
index e73fed2..0000000
--- a/fortran/test/tHDF5.f90
+++ /dev/null
@@ -1,45 +0,0 @@
-!****h* ROBODoc/HDF5
-!
-! NAME
-!  MODULE THDF5
-!
-! FILE
-!  src/fortran/test/tHDF5.f90
-!
-! PURPOSE
-!  This is the test  module used for testing the Fortran90 HDF library APIs.
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-!*****
-
-MODULE THDF5
-  USE TH5_MISC
-  USE TH5A
-  USE TH5D
-  USE TH5E
-  USE TH5F
-  USE TH5G
-  USE TH5I
-  USE TH5P
-  USE TH5R
-  USE TH5S
-  USE TH5SSELECT
-  USE TH5T
-  USE TH5VL
-  USE TH5Z
-END MODULE THDF5
diff --git a/fortran/test/tHDF5_1_8.F90 b/fortran/test/tHDF5_1_8.F90
new file mode 100644
index 0000000..2a41fb9
--- /dev/null
+++ b/fortran/test/tHDF5_1_8.F90
@@ -0,0 +1,34 @@
+!****h* ROBODoc/THDF5_1_8
+!
+! NAME
+!  MODULE THDF5_1_8
+!
+! FILE
+!  src/fortran/test/tHDF5_1_8.f90
+!
+! PURPOSE
+!  This is the test  module used for testing the Fortran90 HDF library
+!  1.8.* APIs
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+!*****
+
+MODULE THDF5_1_8
+  USE TH5_MISC
+  USE TH5MISC_1_8
+  USE TH5A_1_8
+  USE TH5G_1_8
+  USE TH5O
+END MODULE THDF5_1_8
diff --git a/fortran/test/tHDF5_1_8.f90 b/fortran/test/tHDF5_1_8.f90
deleted file mode 100644
index 9d1c3ec..0000000
--- a/fortran/test/tHDF5_1_8.f90
+++ /dev/null
@@ -1,37 +0,0 @@
-!****h* ROBODoc/HDF5
-!
-! NAME
-!  MODULE THDF5_1_8
-!
-! FILE
-!  src/fortran/test/tHDF5_1_8.f90
-!
-! PURPOSE
-!  This is the test  module used for testing the Fortran90 HDF library
-!  1.8.* APIs
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-!*****
-
-MODULE THDF5_1_8
-  USE TH5_MISC
-  USE TH5MISC_1_8
-  USE TH5A_1_8
-  USE TH5G_1_8
-  USE TH5O
-END MODULE THDF5_1_8
diff --git a/fortran/test/tHDF5_F03.F90 b/fortran/test/tHDF5_F03.F90
new file mode 100644
index 0000000..dc4da31
--- /dev/null
+++ b/fortran/test/tHDF5_F03.F90
@@ -0,0 +1,36 @@
+!****h* ROBODoc/THDF5_F03
+!
+! NAME
+!  MODULE THDF5_F03
+!
+! FILE
+!  src/fortran/test/tHDF5_F03.f90
+!
+! PURPOSE
+!  This is the test module used for testing the Fortran2003 HDF
+!  library APIS.
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+!*****
+
+MODULE THDF5_F03
+  USE TH5_MISC
+  USE TH5E_F03
+  USE TH5F_F03
+  USE TH5L_F03
+  USE TH5O_F03
+  USE TH5P_F03
+  USE TH5T_F03
+END MODULE THDF5_F03
diff --git a/fortran/test/tHDF5_F03.f90 b/fortran/test/tHDF5_F03.f90
deleted file mode 100644
index 3dbec11..0000000
--- a/fortran/test/tHDF5_F03.f90
+++ /dev/null
@@ -1,39 +0,0 @@
-!****h* ROBODoc/HDF5
-!
-! NAME
-!  MODULE THDF5_F03
-!
-! FILE
-!  src/fortran/test/tHDF5_F03.f90
-!
-! PURPOSE
-!  This is the test  module used for testing the Fortran2003 HDF 
-!  library APIS.
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-!*****
-
-MODULE THDF5_F03
-  USE TH5_MISC
-  USE TH5E_F03
-  USE TH5F_F03
-  USE TH5L_F03
-  USE TH5O_F03
-  USE TH5P_F03
-  USE TH5T_F03
-END MODULE THDF5_F03
diff --git a/fortran/test/tf.F90 b/fortran/test/tf.F90
new file mode 100644
index 0000000..0c518f5
--- /dev/null
+++ b/fortran/test/tf.F90
@@ -0,0 +1,410 @@
+!****h* root/fortran/test/tf.f90
+!
+! NAME
+!  tf.f90
+!
+! FUNCTION
+!  Contains subroutines which are needed in all the hdf5 fortran tests
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+! CONTAINS SUBROUTINES
+!  write_test_status, check, verify, verifyLogical, verifyString, h5_fixname_f,
+!  h5_cleanup_f, h5_exit_f, h5_env_nocleanup_f,dreal_eqv
+!
+!*****
+
+#include "H5config_f.inc"
+
+MODULE TH5_MISC
+
+  USE, INTRINSIC :: ISO_C_BINDING
+
+  IMPLICIT NONE
+
+  INTEGER, PARAMETER :: sp = SELECTED_REAL_KIND(5)  ! This should map to REAL*4 on most modern processors
+  INTEGER, PARAMETER :: dp = SELECTED_REAL_KIND(10) ! This should map to REAL*8 on most modern processors
+
+  ! generic compound datatype
+  TYPE :: comp_datatype
+    SEQUENCE
+    REAL :: a
+    INTEGER :: x
+    DOUBLE PRECISION :: y
+    CHARACTER(KIND=C_CHAR) :: z
+  END TYPE comp_datatype
+
+  PUBLIC :: H5_SIZEOF
+  INTERFACE H5_SIZEOF
+     MODULE PROCEDURE H5_SIZEOF_CMPD
+     MODULE PROCEDURE H5_SIZEOF_CHR
+     MODULE PROCEDURE H5_SIZEOF_I
+     MODULE PROCEDURE H5_SIZEOF_SP,H5_SIZEOF_DP
+  END INTERFACE
+
+CONTAINS
+
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_TEST_DLL)
+!DEC$attributes dllexport :: write_test_status
+!DEC$endif
+  SUBROUTINE write_test_status( test_result, test_title, total_error)
+
+    ! Writes the results of the tests
+
+    IMPLICIT NONE
+
+    INTEGER, INTENT(IN) :: test_result  ! negative,  --skip --
+                                        ! 0       ,   passed
+                                        ! positive,   failed
+
+    CHARACTER(LEN=*), INTENT(IN) :: test_title ! Short description of test
+    INTEGER, INTENT(INOUT) :: total_error ! Accumulated error
+
+! Controls the output style for reporting test results
+
+    CHARACTER(LEN=8) :: error_string
+    CHARACTER(LEN=8), PARAMETER :: success = ' PASSED '
+    CHARACTER(LEN=8), PARAMETER :: failure = '*FAILED*'
+    CHARACTER(LEN=8), PARAMETER :: skip    = '--SKIP--'
+
+
+    error_string = failure
+    IF (test_result ==  0) THEN
+       error_string = success
+    ELSE IF (test_result == -1) THEN
+       error_string = skip
+    ENDIF
+
+    WRITE(*, fmt = '(A, T88, A)') test_title, error_string
+
+    IF(test_result.GT.0) total_error = total_error + test_result
+
+  END SUBROUTINE write_test_status
+
+
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_TEST_DLL)
+!DEC$attributes dllexport :: check
+!DEC$endif
+  SUBROUTINE check(string,error,total_error)
+    CHARACTER(LEN=*) :: string
+    INTEGER :: error, total_error
+    IF (error .LT. 0) THEN
+       total_error=total_error+1
+       WRITE(*,*) string, " FAILED"
+    ENDIF
+    RETURN
+  END SUBROUTINE check
+
+!----------------------------------------------------------------------
+! Name:		h5_fixname_f
+!
+! Purpose:	Create a file name from the a file base name.
+!               It is a fortran counterpart for the h5_fixname in ../../test/h5test.c
+!
+! Inputs:
+!		base_name	- base name of the file
+!               fapl		- file access property list
+! Outputs:
+!		full_name	- full file name
+!		hdferr:		- error code
+!				 	Success:  0
+!				 	Failure: -1
+!
+! Programmer:	Elena Pourmal
+!		September 13, 2002
+!
+!
+!----------------------------------------------------------------------
+  SUBROUTINE h5_fixname_f(base_name, full_name, fapl, hdferr)
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_TEST_DLL)
+!DEC$attributes dllexport :: h5_fixname_f
+!DEC$endif
+    USE H5GLOBAL
+    IMPLICIT NONE
+    CHARACTER(LEN=*), INTENT(IN) :: base_name   ! base name
+    CHARACTER(LEN=*), INTENT(IN) :: full_name   ! full name
+    INTEGER, INTENT(OUT) :: hdferr         ! Error code
+    INTEGER(HID_T), INTENT(IN) :: fapl ! file access property list
+
+    INTEGER(SIZE_T) :: base_namelen ! Length of the base name character string
+    INTEGER(SIZE_T) :: full_namelen ! Length of the full name character string
+!            INTEGER(HID_T) :: fapl_default
+
+    INTERFACE
+       INTEGER FUNCTION h5_fixname_c(base_name, base_namelen, fapl, &
+            full_name, full_namelen)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5_FIXNAME_C':: h5_fixname_c
+         !DEC$ ENDIF
+         !DEC$ATTRIBUTES reference :: base_name
+         !DEC$ATTRIBUTES reference :: full_name
+         CHARACTER(LEN=*), INTENT(IN) :: base_name
+         INTEGER(SIZE_T) :: base_namelen
+         INTEGER(HID_T), INTENT(IN) :: fapl
+         CHARACTER(LEN=*), INTENT(IN) :: full_name
+         INTEGER(SIZE_T) :: full_namelen
+       END FUNCTION h5_fixname_c
+    END INTERFACE
+
+    base_namelen = LEN(base_name)
+    full_namelen = LEN(full_name)
+    hdferr = h5_fixname_c(base_name, base_namelen, fapl, &
+         full_name, full_namelen)
+
+  END SUBROUTINE h5_fixname_f
+
+!----------------------------------------------------------------------
+! Name:		h5_cleanup_f
+!
+! Purpose:	Cleanups tests files
+!               It is a fortran counterpart for the h5_cleanup in ../../test/h5test.c
+!
+! Inputs:
+!		base_name	- base name of the file
+!               fapl		- file access property list
+! Outputs:
+!		hdferr:		- error code
+!				 	Success:  0
+!				 	Failure: -1
+!
+! Programmer:	Elena Pourmal
+!		September 19, 2002
+!
+!
+!----------------------------------------------------------------------
+  SUBROUTINE h5_cleanup_f(base_name, fapl, hdferr)
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_TEST_DLL)
+!DEC$attributes dllexport :: h5_cleanup_f
+!DEC$endif
+    USE H5GLOBAL
+    IMPLICIT NONE
+    CHARACTER(LEN=*), INTENT(IN) :: base_name   ! base name
+    INTEGER, INTENT(OUT) :: hdferr         ! Error code
+    INTEGER(HID_T), INTENT(IN) :: fapl ! file access property list
+
+    INTEGER(SIZE_T) :: base_namelen ! Length of the base name character string
+
+    INTERFACE
+       INTEGER FUNCTION h5_cleanup_c(base_name, base_namelen, fapl)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5_CLEANUP_C':: h5_cleanup_c
+         !DEC$ ENDIF
+         !DEC$ATTRIBUTES reference :: base_name
+         CHARACTER(LEN=*), INTENT(IN) :: base_name
+         INTEGER(SIZE_T) :: base_namelen
+         INTEGER(HID_T), INTENT(IN) :: fapl
+       END FUNCTION h5_cleanup_c
+    END INTERFACE
+
+    base_namelen = LEN(base_name)
+    hdferr = h5_cleanup_c(base_name, base_namelen, fapl)
+
+  END SUBROUTINE h5_cleanup_f
+
+!----------------------------------------------------------------------
+! Name:		h5_exit_f
+!
+! Purpose:	Exit application
+!               It is a fortran counterpart for the standard C 'exit()' routine
+! 		Be careful not to overflow the exit value range since
+! 		UNIX supports a very small range such as 1 byte.
+!		Therefore, exit(256) may end up as exit(0).
+!
+! Inputs:
+!		status	- Status to return from application
+!
+! Outputs:
+!		none
+!
+! Programmer:	Quincey Koziol
+!		December 14, 2004
+!
+!
+!----------------------------------------------------------------------
+  SUBROUTINE h5_exit_f(status)
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_TEST_DLL)
+!DEC$attributes dllexport :: h5_exit_f
+!DEC$endif
+    IMPLICIT NONE
+    INTEGER, INTENT(IN) :: status         ! Return code
+
+    INTERFACE
+       SUBROUTINE h5_exit_c(status)
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5_EXIT_C':: h5_exit_c
+         !DEC$ ENDIF
+         INTEGER, INTENT(IN) :: status
+       END SUBROUTINE h5_exit_c
+    END INTERFACE
+
+    CALL h5_exit_c(status)
+
+  END SUBROUTINE h5_exit_f
+
+!----------------------------------------------------------------------
+! Name:		h5_env_nocleanup_f
+!
+! Purpose:	Uses the HDF5_NOCLEANUP environment variable in Fortran
+!               tests to determine if the output files should be removed
+!
+! Inputs:
+!
+! Outputs:      HDF5_NOCLEANUP:  .true. - don't remove test files
+!		                .false. - remove test files
+!
+! Programmer:	M.S. Breitenfeld
+!               September 30, 2008
+!
+!----------------------------------------------------------------------
+  SUBROUTINE h5_env_nocleanup_f(HDF5_NOCLEANUP)
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_TEST_DLL)
+!DEC$attributes dllexport :: h5_env_nocleanup_f
+!DEC$endif
+    IMPLICIT NONE
+    LOGICAL, INTENT(OUT) :: HDF5_NOCLEANUP ! Return code
+    INTEGER :: status
+
+    INTERFACE
+       SUBROUTINE h5_env_nocleanup_c(status)
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5_ENV_NOCLEANUP_C':: h5_env_nocleanup_c
+         !DEC$ ENDIF
+         INTEGER :: status
+       END SUBROUTINE h5_env_nocleanup_c
+    END INTERFACE
+
+    CALL h5_env_nocleanup_c(status)
+
+    HDF5_NOCLEANUP = .FALSE.
+    IF(status.EQ.1) HDF5_NOCLEANUP = .TRUE.
+
+  END SUBROUTINE h5_env_nocleanup_f
+
+! ---------------------------------------------------------------------------------------------------
+! H5_SIZEOF routines
+!
+! NOTES
+!   (1) The Sun/Oracle compiler has the following restrictions on the SIZEOF intrinsic function:
+!
+!     "The SIZEOF intrinsic cannot be applied to arrays of an assumed size, characters of a
+!      length that is passed, or subroutine calls or names. SIZEOF returns default INTEGER*4 data.
+!      If compiling for a 64-bit environment, the compiler will issue a warning if the result overflows
+!      the INTEGER*4 data range. To use SIZEOF in a 64-bit environment with arrays larger
+!      than the INTEGER*4 limit (2 Gbytes), the SIZEOF function and
+!      the variables receiving the result must be declared INTEGER*8."
+!
+!    Thus, we can not overload the H5_SIZEOF function to handle arrays (as used in tH5P_F03.f90), or
+!    characters that do not have a set length (as used in tH5P_F03.f90), sigh...
+!
+!   (2) F08+TS29113 requires C interoperable variable as argument for C_SIZEOF.
+!
+!   (3) Unfortunately we need to wrap the C_SIZEOF/STORAGE_SIZE functions to handle different
+!       data types from the various tests.
+!
+! ---------------------------------------------------------------------------------------------------
+
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_TEST_DLL)
+!DEC$attributes dllexport :: h5_sizeof_cmpd
+!DEC$endif
+  INTEGER(C_SIZE_T) FUNCTION H5_SIZEOF_CMPD(a)
+    IMPLICIT NONE
+    TYPE(comp_datatype), INTENT(in) :: a
+
+#ifdef H5_FORTRAN_HAVE_STORAGE_SIZE
+    H5_SIZEOF_CMPD = storage_size(a, c_size_t)/storage_size(c_char_'a',c_size_t)
+#else
+    H5_SIZEOF_CMPD = SIZEOF(a)
+#endif
+
+  END FUNCTION H5_SIZEOF_CMPD
+
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_TEST_DLL)
+!DEC$attributes dllexport :: h5_sizeof_chr
+!DEC$endif
+  INTEGER(C_SIZE_T) FUNCTION H5_SIZEOF_CHR(a)
+    IMPLICIT NONE
+    CHARACTER(LEN=1), INTENT(in) :: a
+
+#ifdef H5_FORTRAN_HAVE_STORAGE_SIZE
+    H5_SIZEOF_CHR = storage_size(a, c_size_t)/storage_size(c_char_'a',c_size_t)
+#else
+    H5_SIZEOF_CHR = SIZEOF(a)
+#endif
+
+  END FUNCTION H5_SIZEOF_CHR
+
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_TEST_DLL)
+!DEC$attributes dllexport :: h5_sizeof_i
+!DEC$endif
+  INTEGER(C_SIZE_T) FUNCTION H5_SIZEOF_I(a)
+    IMPLICIT NONE
+    INTEGER, INTENT(in):: a
+
+#ifdef H5_FORTRAN_HAVE_STORAGE_SIZE
+    H5_SIZEOF_I = storage_size(a, c_size_t)/storage_size(c_char_'a',c_size_t)
+#else
+    H5_SIZEOF_I = SIZEOF(a)
+#endif
+
+  END FUNCTION H5_SIZEOF_I
+
+
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_TEST_DLL)
+!DEC$attributes dllexport :: h5_sizeof_sp
+!DEC$endif
+  INTEGER(C_SIZE_T) FUNCTION H5_SIZEOF_SP(a)
+    IMPLICIT NONE
+    REAL(sp), INTENT(in):: a
+
+#ifdef H5_FORTRAN_HAVE_STORAGE_SIZE
+    H5_SIZEOF_SP = storage_size(a, c_size_t)/storage_size(c_char_'a',c_size_t)
+#else
+    H5_SIZEOF_SP = SIZEOF(a)
+#endif
+
+  END FUNCTION H5_SIZEOF_SP
+
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_TEST_DLL)
+!DEC$attributes dllexport :: h5_sizeof_dp
+!DEC$endif
+  INTEGER(C_SIZE_T) FUNCTION H5_SIZEOF_DP(a)
+    IMPLICIT NONE
+    REAL(dp), INTENT(in):: a
+
+#ifdef H5_FORTRAN_HAVE_STORAGE_SIZE
+    H5_SIZEOF_DP = storage_size(a, c_size_t)/storage_size(c_char_'a',c_size_t)
+#else
+    H5_SIZEOF_DP = SIZEOF(a)
+#endif
+
+  END FUNCTION H5_SIZEOF_DP
+
+END MODULE TH5_MISC
diff --git a/fortran/test/tf.f90 b/fortran/test/tf.f90
deleted file mode 100644
index 6d5911f..0000000
--- a/fortran/test/tf.f90
+++ /dev/null
@@ -1,377 +0,0 @@
-!****h* root/fortran/test/tf.f90
-!
-! NAME
-!  tf.f90
-!
-! FUNCTION
-!  Contains subroutines which are needed in all the hdf5 fortran tests
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! CONTAINS SUBROUTINES
-!  write_test_status, check, verify, verifyLogical, verifyString, h5_fixname_f,
-!  h5_cleanup_f, h5_exit_f, h5_env_nocleanup_f,dreal_eqv
-!
-!*****
-MODULE TH5_MISC
-
-  USE TH5_MISC_PROVISIONAL
-
-  IMPLICIT NONE
-
-CONTAINS
-
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_TEST_DLL)
-!DEC$attributes dllexport :: dreal_eq
-!DEC$endif
-  LOGICAL FUNCTION dreal_eq(a,b)
-
-    ! Check if two double precision reals are equivalent
-    REAL(dp), INTENT (in):: a,b
-    REAL(dp), PARAMETER :: eps = 1.e-8
-    dreal_eq = ABS(a-b) .LT. eps
-
-  END FUNCTION dreal_eq
-
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_TEST_DLL)
-!DEC$attributes dllexport :: verify_real_kind_7
-!DEC$endif
-  SUBROUTINE verify_real_kind_7(string,value,correct_value,total_error)
-    USE HDF5
-    INTEGER, PARAMETER :: real_kind_7 = SELECTED_REAL_KIND(Fortran_REAL_4) !should map to REAL*4 on most modern processors
-    CHARACTER(LEN=*) :: string
-    REAL(real_kind_7) :: value, correct_value
-    INTEGER :: total_error
-    IF (.NOT.dreal_eq( REAL(value,dp), REAL(correct_value, dp)) ) THEN
-       total_error=total_error+1
-       WRITE(*,*) "ERROR: INCORRECT REAL VALIDATION ", string
-    ENDIF
-    RETURN
-  END SUBROUTINE verify_real_kind_7
-
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_TEST_DLL)
-!DEC$attributes dllexport :: write_test_status
-!DEC$endif
-  SUBROUTINE write_test_status( test_result, test_title, total_error)
-
-    ! Writes the results of the tests
-
-    IMPLICIT NONE
-
-    INTEGER, INTENT(IN) :: test_result  ! negative,  --skip --
-                                        ! 0       ,   passed
-                                        ! positive,   failed
-
-    CHARACTER(LEN=*), INTENT(IN) :: test_title ! Short description of test
-    INTEGER, INTENT(INOUT) :: total_error ! Accumulated error
-
-! Controls the output style for reporting test results
-
-    CHARACTER(LEN=8) :: error_string
-    CHARACTER(LEN=8), PARAMETER :: success = ' PASSED '
-    CHARACTER(LEN=8), PARAMETER :: failure = '*FAILED*'
-    CHARACTER(LEN=8), PARAMETER :: skip    = '--SKIP--'
-    
-
-    error_string = failure
-    IF (test_result ==  0) THEN
-       error_string = success
-    ELSE IF (test_result == -1) THEN
-       error_string = skip
-    ENDIF
-
-    WRITE(*, fmt = '(A, T72, A)') test_title, error_string
-
-    IF(test_result.GT.0) total_error = total_error + test_result
-
-  END SUBROUTINE write_test_status
-
-
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_TEST_DLL)
-!DEC$attributes dllexport :: check
-!DEC$endif
-  SUBROUTINE check(string,error,total_error)
-    CHARACTER(LEN=*) :: string
-    INTEGER :: error, total_error
-    IF (error .LT. 0) THEN
-       total_error=total_error+1
-       WRITE(*,*) string, " FAILED"
-    ENDIF
-    RETURN
-  END SUBROUTINE check
-
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_TEST_DLL)
-!DEC$attributes dllexport :: verify
-!DEC$endif
-  SUBROUTINE VERIFY(string,value,correct_value,total_error)
-    CHARACTER(LEN=*) :: string
-    INTEGER :: value, correct_value, total_error
-    IF (value .NE. correct_value) THEN
-       total_error=total_error+1
-       WRITE(*,*) "ERROR: INCORRECT VALIDATION ", string
-    ENDIF
-    RETURN
-  END SUBROUTINE verify
-
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_TEST_DLL)
-!DEC$attributes dllexport :: verify_Fortran_INTEGER_4
-!DEC$endif
-  SUBROUTINE verify_Fortran_INTEGER_4(string,value,correct_value,total_error)
-    USE HDF5
-    INTEGER, PARAMETER :: int_kind_8 = SELECTED_INT_KIND(Fortran_INTEGER_4)  ! should map to INTEGER*4 on most modern processors	
-    CHARACTER(LEN=*) :: string
-    INTEGER(int_kind_8) :: value, correct_value
-    INTEGER :: total_error
-    IF (value .NE. correct_value) THEN
-       total_error=total_error+1
-       WRITE(*,*) "ERROR: INCORRECT VALIDATION ", string
-    ENDIF
-    RETURN
-  END SUBROUTINE verify_Fortran_INTEGER_4
-
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_TEST_DLL)
-!DEC$attributes dllexport :: verifyLogical
-!DEC$endif
-  SUBROUTINE verifyLogical(string,value,correct_value,total_error)
-    CHARACTER(LEN=*) :: string
-    LOGICAL :: value, correct_value
-    INTEGER :: total_error
-    IF (value .NEQV. correct_value) THEN
-       total_error = total_error + 1
-       WRITE(*,*) "ERROR: INCORRECT VALIDATION ", string
-    ENDIF
-    RETURN
-  END SUBROUTINE verifyLogical
-  
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_TEST_DLL)
-!DEC$attributes dllexport :: verifyString
-!DEC$endif
-  SUBROUTINE verifyString(string, value,correct_value,total_error)
-    CHARACTER*(*) :: string
-    CHARACTER*(*) :: value, correct_value
-    INTEGER :: total_error
-    IF (TRIM(value) .NE. TRIM(correct_value)) THEN
-       total_error = total_error + 1
-       WRITE(*,*) "ERROR: INCORRECT VALIDATION ", string
-    ENDIF
-    RETURN
-  END SUBROUTINE verifyString
-
-
-!----------------------------------------------------------------------
-! Name:		h5_fixname_f
-!
-! Purpose:	Create a file name from the a file base name.
-!               It is a fortran counterpart for the h5_fixname in ../../test/h5test.c
-!
-! Inputs:
-!		base_name	- base name of the file
-!               fapl		- file access property list
-! Outputs:
-!		full_name	- full file name
-!		hdferr:		- error code
-!				 	Success:  0
-!				 	Failure: -1
-!
-! Programmer:	Elena Pourmal
-!		September 13, 2002
-!
-!
-!----------------------------------------------------------------------
-  SUBROUTINE h5_fixname_f(base_name, full_name, fapl, hdferr)
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_TEST_DLL)
-!DEC$attributes dllexport :: h5_fixname_f
-!DEC$endif
-    USE H5GLOBAL
-    IMPLICIT NONE
-    CHARACTER(LEN=*), INTENT(IN) :: base_name   ! base name
-    CHARACTER(LEN=*), INTENT(IN) :: full_name   ! full name
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-    INTEGER(HID_T), INTENT(IN) :: fapl ! file access property list
-
-    INTEGER(SIZE_T) :: base_namelen ! Length of the base name character string
-    INTEGER(SIZE_T) :: full_namelen ! Length of the full name character string
-!            INTEGER(HID_T) :: fapl_default
-
-    INTERFACE
-       INTEGER FUNCTION h5_fixname_c(base_name, base_namelen, fapl, &
-            full_name, full_namelen)
-         USE H5GLOBAL
-         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5_FIXNAME_C':: h5_fixname_c
-         !DEC$ ENDIF
-         !DEC$ATTRIBUTES reference :: base_name
-         !DEC$ATTRIBUTES reference :: full_name
-         CHARACTER(LEN=*), INTENT(IN) :: base_name
-         INTEGER(SIZE_T) :: base_namelen
-         INTEGER(HID_T), INTENT(IN) :: fapl
-         CHARACTER(LEN=*), INTENT(IN) :: full_name
-         INTEGER(SIZE_T) :: full_namelen
-       END FUNCTION h5_fixname_c
-    END INTERFACE
-
-    base_namelen = LEN(base_name)
-    full_namelen = LEN(full_name)
-    hdferr = h5_fixname_c(base_name, base_namelen, fapl, &
-         full_name, full_namelen)
-  
-  END SUBROUTINE h5_fixname_f
-
-!----------------------------------------------------------------------
-! Name:		h5_cleanup_f
-!
-! Purpose:	Cleanups tests files
-!               It is a fortran counterpart for the h5_cleanup in ../../test/h5test.c
-!
-! Inputs:
-!		base_name	- base name of the file
-!               fapl		- file access property list
-! Outputs:
-!		hdferr:		- error code
-!				 	Success:  0
-!				 	Failure: -1
-!
-! Programmer:	Elena Pourmal
-!		September 19, 2002
-!
-!
-!----------------------------------------------------------------------
-  SUBROUTINE h5_cleanup_f(base_name, fapl, hdferr)
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_TEST_DLL)
-!DEC$attributes dllexport :: h5_cleanup_f
-!DEC$endif
-    USE H5GLOBAL
-    IMPLICIT NONE
-    CHARACTER(LEN=*), INTENT(IN) :: base_name   ! base name
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-    INTEGER(HID_T), INTENT(IN) :: fapl ! file access property list
-    
-    INTEGER(SIZE_T) :: base_namelen ! Length of the base name character string
-
-    INTERFACE
-       INTEGER FUNCTION h5_cleanup_c(base_name, base_namelen, fapl)
-         USE H5GLOBAL
-         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5_CLEANUP_C':: h5_cleanup_c
-         !DEC$ ENDIF
-         !DEC$ATTRIBUTES reference :: base_name
-         CHARACTER(LEN=*), INTENT(IN) :: base_name
-         INTEGER(SIZE_T) :: base_namelen
-         INTEGER(HID_T), INTENT(IN) :: fapl
-       END FUNCTION h5_cleanup_c
-    END INTERFACE
-    
-    base_namelen = LEN(base_name)
-    hdferr = h5_cleanup_c(base_name, base_namelen, fapl)
-    
-  END SUBROUTINE h5_cleanup_f
-
-!----------------------------------------------------------------------
-! Name:		h5_exit_f
-!
-! Purpose:	Exit application
-!               It is a fortran counterpart for the standard C 'exit()' routine
-! 		Be careful not to overflow the exit value range since
-! 		UNIX supports a very small range such as 1 byte.
-!		Therefore, exit(256) may end up as exit(0).
-!
-! Inputs:
-!		status	- Status to return from application
-!
-! Outputs:
-!		none
-!
-! Programmer:	Quincey Koziol
-!		December 14, 2004
-!
-!
-!----------------------------------------------------------------------
-  SUBROUTINE h5_exit_f(status)
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_TEST_DLL)
-!DEC$attributes dllexport :: h5_exit_f
-!DEC$endif
-    IMPLICIT NONE
-    INTEGER, INTENT(IN) :: status         ! Return code
-
-    INTERFACE
-       SUBROUTINE h5_exit_c(status)
-         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5_EXIT_C':: h5_exit_c
-         !DEC$ ENDIF
-         INTEGER, INTENT(IN) :: status
-       END SUBROUTINE h5_exit_c
-    END INTERFACE
-    
-    CALL h5_exit_c(status)
-
-  END SUBROUTINE h5_exit_f
-
-!----------------------------------------------------------------------
-! Name:		h5_env_nocleanup_f
-!
-! Purpose:	Uses the HDF5_NOCLEANUP environment variable in Fortran
-!               tests to determine if the output files should be removed
-!
-! Inputs:
-!
-! Outputs:      HDF5_NOCLEANUP:  .true. - don't remove test files
-!		                .false. - remove test files
-!
-! Programmer:	M.S. Breitenfeld
-!               September 30, 2008
-!
-!----------------------------------------------------------------------
-  SUBROUTINE h5_env_nocleanup_f(HDF5_NOCLEANUP)
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_TEST_DLL)
-!DEC$attributes dllexport :: h5_env_nocleanup_f
-!DEC$endif
-    IMPLICIT NONE
-    LOGICAL, INTENT(OUT) :: HDF5_NOCLEANUP ! Return code
-    INTEGER :: status
-    
-    INTERFACE
-       SUBROUTINE h5_env_nocleanup_c(status)
-         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5_ENV_NOCLEANUP_C':: h5_env_nocleanup_c
-         !DEC$ ENDIF
-         INTEGER :: status
-       END SUBROUTINE h5_env_nocleanup_c
-    END INTERFACE
-    
-    CALL h5_env_nocleanup_c(status)
-    
-    HDF5_NOCLEANUP = .FALSE.
-    IF(status.EQ.1) HDF5_NOCLEANUP = .TRUE.
-    
-  END SUBROUTINE h5_env_nocleanup_f
-END MODULE TH5_MISC
diff --git a/fortran/test/tf_F03.f90 b/fortran/test/tf_F03.f90
deleted file mode 100644
index b3f1399..0000000
--- a/fortran/test/tf_F03.f90
+++ /dev/null
@@ -1,128 +0,0 @@
-!****h* root/fortran/test/tf_F03.f90
-!
-! NAME
-!  tf_F03.f90
-!
-! FUNCTION
-!  Contains functions that are part of the F2003 standard, and are not F2008 compliant.
-!  Needed by the hdf5 fortran tests.
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! CONTAINS SUBROUTINES
-!   H5_SIZEOF
-!
-! NOTES
-!   The Sun/Oracle compiler has the following restrictions on the SIZEOF intrinsic function:
-!
-!     "The SIZEOF intrinsic cannot be applied to arrays of an assumed size, characters of a 
-!      length that is passed, or subroutine calls or names. SIZEOF returns default INTEGER*4 data. 
-!      If compiling for a 64-bit environment, the compiler will issue a warning if the result overflows 
-!      the INTEGER*4 data range. To use SIZEOF in a 64-bit environment with arrays larger 
-!      than the INTEGER*4 limit (2 Gbytes), the SIZEOF function and 
-!      the variables receiving the result must be declared INTEGER*8."
-!
-!    Thus, we can not overload the H5_SIZEOF function to handle arrays (as used in tH5P_F03.f90), or
-!    characters that do not have a set length (as used in tH5P_F03.f90), sigh...
-!
-!*****
-MODULE TH5_MISC_PROVISIONAL
-
-  USE ISO_C_BINDING
-  IMPLICIT NONE
-
-  INTEGER, PARAMETER :: sp = SELECTED_REAL_KIND(5)  ! This should map to REAL*4 on most modern processors
-  INTEGER, PARAMETER :: dp = SELECTED_REAL_KIND(10) ! This should map to REAL*8 on most modern processors
-
-  ! generic compound datatype
-  TYPE, BIND(C) :: comp_datatype
-    REAL :: a
-    INTEGER :: x
-    DOUBLE PRECISION :: y
-    CHARACTER(LEN=1) :: z
-  END TYPE comp_datatype
-
-  PUBLIC :: H5_SIZEOF
-  INTERFACE H5_SIZEOF
-     MODULE PROCEDURE H5_SIZEOF_CMPD
-     MODULE PROCEDURE H5_SIZEOF_I, H5_SIZEOF_CHR   
-     MODULE PROCEDURE H5_SIZEOF_SP,H5_SIZEOF_DP
-  END INTERFACE
-
-CONTAINS
-
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_TEST_DLL)
-!DEC$attributes dllexport :: h5_sizeof_cmpd
- !DEC$endif
-  INTEGER(C_SIZE_T) FUNCTION H5_SIZEOF_CMPD(a)
-    IMPLICIT NONE
-    TYPE(comp_datatype), INTENT(in) :: a
-
-    H5_SIZEOF_CMPD = SIZEOF(a)
-
-  END FUNCTION H5_SIZEOF_CMPD
-
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_TEST_DLL)
-!DEC$attributes dllexport :: h5_sizeof_chr
-!DEC$endif
-  INTEGER(C_SIZE_T) FUNCTION H5_SIZEOF_CHR(a)
-    IMPLICIT NONE
-    CHARACTER(LEN=1), INTENT(in):: a
-
-    H5_SIZEOF_CHR = SIZEOF(a)
-
-  END FUNCTION H5_SIZEOF_CHR
-
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_TEST_DLL)
-!DEC$attributes dllexport :: h5_sizeof_i
-!DEC$endif
-  INTEGER(C_SIZE_T) FUNCTION H5_SIZEOF_I(a)
-    IMPLICIT NONE
-    INTEGER, INTENT(in):: a
-
-    H5_SIZEOF_I = SIZEOF(a)
-
-  END FUNCTION H5_SIZEOF_I
-
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_TEST_DLL)
-!DEC$attributes dllexport :: h5_sizeof_sp
-!DEC$endif
-  INTEGER(C_SIZE_T) FUNCTION H5_SIZEOF_SP(a)
-    IMPLICIT NONE
-    REAL(sp), INTENT(in):: a
-
-    H5_SIZEOF_SP = SIZEOF(a)
-
-  END FUNCTION H5_SIZEOF_SP
-
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_TEST_DLL)
-!DEC$attributes dllexport :: h5_sizeof_dp
-!DEC$endif
-  INTEGER(C_SIZE_T) FUNCTION H5_SIZEOF_DP(a)
-    IMPLICIT NONE
-    REAL(dp), INTENT(in):: a
-
-    H5_SIZEOF_DP = SIZEOF(a)
-
-  END FUNCTION H5_SIZEOF_DP
-
-END MODULE TH5_MISC_PROVISIONAL
diff --git a/fortran/test/tf_F08.f90 b/fortran/test/tf_F08.f90
deleted file mode 100644
index 20c2859..0000000
--- a/fortran/test/tf_F08.f90
+++ /dev/null
@@ -1,128 +0,0 @@
-!****h* root/fortran/test/tf_F08.f90
-!
-! NAME
-!  tf_F08.f90
-!
-! FUNCTION
-!  Contains functions that are part of the F2008 standard and needed by 
-!  the hdf5 fortran tests.
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! CONTAINS SUBROUTINES
-!   H5_SIZEOF
-!
-! NOTES
-!   This file contains "sizeof" functions that are F2008 standard compliant
-!   and replace the non-standard 'SIZEOF' functions found in the file tf_F03.
-!   Unfortunity we need to wrap the C_SIZEOF/STORAGE_SIZE functions to handle different
-!   data types from the various tests.
-!
-!   F08+TS29113 requires C interoperable variable as argument for C_SIZEOF.
-!   
-!   This file will be build instead of tf_F03.f90 if the intrinsic fortran 
-!   function C_SIZEOF/STORAGE_SIZE is found during configure.
-!
-!*****
-MODULE TH5_MISC_PROVISIONAL
-
-  USE ISO_C_BINDING
-  IMPLICIT NONE
-
-  INTEGER, PARAMETER :: sp = SELECTED_REAL_KIND(5)  ! This should map to REAL*4 on most modern processors
-  INTEGER, PARAMETER :: dp = SELECTED_REAL_KIND(10) ! This should map to REAL*8 on most modern processors
-
-  ! generic compound datatype
-  TYPE, BIND(C) :: comp_datatype
-    REAL :: a
-    INTEGER :: x
-    DOUBLE PRECISION :: y
-    CHARACTER(LEN=1) :: z
-  END TYPE comp_datatype
-
-  PUBLIC :: H5_SIZEOF
-  INTERFACE H5_SIZEOF
-     MODULE PROCEDURE H5_SIZEOF_CMPD
-     MODULE PROCEDURE H5_SIZEOF_CHR
-     MODULE PROCEDURE H5_SIZEOF_I
-     MODULE PROCEDURE H5_SIZEOF_SP,H5_SIZEOF_DP
-  END INTERFACE
-
-CONTAINS
-
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_TEST_DLL)
-!DEC$attributes dllexport :: h5_sizeof_cmpd
-!DEC$endif
-  INTEGER(C_SIZE_T) FUNCTION H5_SIZEOF_CMPD(a)
-    IMPLICIT NONE
-    TYPE(comp_datatype), INTENT(in) :: a
-
-    H5_SIZEOF_CMPD = C_SIZEOF(a)
-
-  END FUNCTION H5_SIZEOF_CMPD
-
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_TEST_DLL)
-!DEC$attributes dllexport :: h5_sizeof_chr
-!DEC$endif
-  INTEGER(C_SIZE_T) FUNCTION H5_SIZEOF_CHR(a)
-    IMPLICIT NONE
-    CHARACTER(LEN=*), INTENT(in) :: a
-
-    H5_SIZEOF_CHR = storage_size(a, c_size_t)/storage_size(c_char_'a',c_size_t)
-
-  END FUNCTION H5_SIZEOF_CHR
-
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_TEST_DLL)
-!DEC$attributes dllexport :: h5_sizeof_i
-!DEC$endif
-  INTEGER(C_SIZE_T) FUNCTION H5_SIZEOF_I(a)
-    IMPLICIT NONE
-    INTEGER, INTENT(in):: a
-
-    H5_SIZEOF_I = storage_size(a, c_size_t)/storage_size(c_char_'a',c_size_t)
-
-  END FUNCTION H5_SIZEOF_I
-
-
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_TEST_DLL)
-!DEC$attributes dllexport :: h5_sizeof_sp
-!DEC$endif
-  INTEGER(C_SIZE_T) FUNCTION H5_SIZEOF_SP(a)
-    IMPLICIT NONE
-    REAL(sp), INTENT(in):: a
-
-    H5_SIZEOF_SP = storage_size(a, c_size_t)/storage_size(c_char_'a',c_size_t)
-
-  END FUNCTION H5_SIZEOF_SP
-
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_TEST_DLL)
-!DEC$attributes dllexport :: h5_sizeof_dp
-!DEC$endif
-  INTEGER(C_SIZE_T) FUNCTION H5_SIZEOF_DP(a)
-    IMPLICIT NONE
-    REAL(dp), INTENT(in):: a
-
-    H5_SIZEOF_DP = storage_size(a, c_size_t)/storage_size(c_char_'a',c_size_t)
-
-  END FUNCTION H5_SIZEOF_DP
-
-END MODULE TH5_MISC_PROVISIONAL
diff --git a/fortran/test/tf_F90.f90 b/fortran/test/tf_F90.f90
deleted file mode 100644
index 11a047c..0000000
--- a/fortran/test/tf_F90.f90
+++ /dev/null
@@ -1,33 +0,0 @@
-!****h* root/fortran/test/tf_F90.f90
-!
-! NAME
-!  tf_F90.f90
-!
-! FUNCTION
-!  Module for when the compiler is not F2003 or F2008 compliant. 
-!  Needed by tf.f90 for the test programs.
-!
-! COPYRIGHT
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-!*****
-MODULE TH5_MISC_PROVISIONAL
-  IMPLICIT NONE
-
-  INTEGER, PARAMETER :: sp = KIND(0.0)
-  INTEGER, PARAMETER :: dp = KIND(0.D0)
-
-END MODULE TH5_MISC_PROVISIONAL
diff --git a/fortran/test/vol_connector.F90 b/fortran/test/vol_connector.F90
new file mode 100644
index 0000000..e2235f4
--- /dev/null
+++ b/fortran/test/vol_connector.F90
@@ -0,0 +1,285 @@
+!****h* root/fortran/test/vol_connector.F90
+!
+! NAME
+!  vol_connector.F90
+!
+! FUNCTION
+!
+!  Tests basic Fortran VOL plugin operations (registration, etc.).
+!  Uses the null VOL connector (built with the testing code)
+!  which is loaded as a dynamic plugin.
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+!*****
+
+MODULE VOL_TMOD
+
+  USE HDF5
+  USE TH5_MISC
+  USE TH5_MISC_GEN
+  IMPLICIT NONE
+
+  INTEGER, PARAMETER :: NATIVE_VOL_CONNECTOR_VALUE = 0
+  CHARACTER(LEN=180) :: NATIVE_VOL_CONNECTOR_NAME
+
+CONTAINS
+
+  !-------------------------------------------------------------------------
+  ! Function:    test_registration_by_name()
+  !
+  ! Purpose:     Tests if we can load, register, and close a VOL
+  !              connector by name.
+  !
+  !-------------------------------------------------------------------------
+  !
+
+  SUBROUTINE test_registration_by_name(total_error)
+
+    IMPLICIT NONE
+
+    INTEGER, INTENT(INOUT) :: total_error
+    INTEGER :: error = 0
+
+    LOGICAL :: is_registered = .FALSE.
+    INTEGER(hid_t) :: vol_id = 0, vol_id_out = 1
+    CHARACTER(LEN=64) :: name
+    CHARACTER(LEN=1) :: name_null
+    INTEGER(SIZE_T) :: name_len
+    INTEGER(hid_t) :: file_id
+
+    ! The null VOL connector should not be registered at the start of the test
+    CALL H5VLis_connector_registered_by_name_f( "FAKE_VOL_CONNECTOR_NAME", is_registered, error)
+    CALL check("H5VLis_connector_registered_by_name_f",error,total_error)
+    CALL VERIFY("H5VLis_connector_registered_by_name_f", is_registered, .FALSE., total_error)
+
+    ! Register the connector by name
+    CALL H5VLregister_connector_by_name_f(NATIVE_VOL_CONNECTOR_NAME, vol_id, error)
+    CALL check("H5VLregister_connector_by_name_f",error,total_error)
+
+    ! The connector should be registered now
+    CALL H5VLis_connector_registered_by_name_f(NATIVE_VOL_CONNECTOR_NAME, is_registered, error)
+    CALL check("H5VLis_connector_registered_by_name_f",error,total_error)
+    CALL VERIFY("H5VLis_connector_registered_by_name_f", is_registered, .TRUE., total_error)
+
+    CALL H5VLget_connector_id_by_name_f(NATIVE_VOL_CONNECTOR_NAME, vol_id_out, error)
+    CALL check("H5VLget_connector_id_by_name_f",error,total_error)
+
+    CALL H5Fcreate_f("voltest.h5",H5F_ACC_TRUNC_F, file_id, error)
+    CALL check("H5F_create_f",error,total_error)
+
+    CALL H5VLget_connector_name_f(file_id, name, error, name_len)
+    CALL check("H5VLget_connector_name_f",error,total_error)
+    CALL VERIFY("H5VLget_connector_name_f", INT(name_len), LEN_TRIM(NATIVE_VOL_CONNECTOR_NAME), total_error)
+
+    CALL H5VLget_connector_name_f(file_id, name, error)
+    CALL check("H5VLget_connector_name_f",error,total_error)
+    CALL VERIFY("H5VLget_connector_name_f", TRIM(name), NATIVE_VOL_CONNECTOR_NAME, total_error)
+
+    CALL H5VLget_connector_name_f(file_id, name_null, error, name_len)
+    CALL check("H5VLget_connector_name_f",error,total_error)
+    CALL VERIFY("H5VLget_connector_name_f", INT(name_len), LEN_TRIM(NATIVE_VOL_CONNECTOR_NAME), total_error)
+
+    CALL H5VLget_connector_name_f(file_id, name_null, error)
+    CALL check("H5VLget_connector_name_f",error,total_error)
+    CALL VERIFY("H5VLget_connector_name_f", name_null, NATIVE_VOL_CONNECTOR_NAME(1:1), total_error)
+
+    CALL H5Fclose_f(file_id, error)
+    CALL check("H5Fclose_f",error,total_error)
+
+    CALL H5VLclose_f(vol_id_out, error)
+    CALL check("H5VLclose_f",error, total_error)
+
+  END SUBROUTINE test_registration_by_name
+
+  !-------------------------------------------------------------------------
+  ! Function:    test_registration_by_value()
+  !
+  ! Purpose:     Tests if we can load, register, and close a VOL
+  !              connector by value.
+  !
+  !-------------------------------------------------------------------------
+
+  SUBROUTINE test_registration_by_value(total_error)
+
+    IMPLICIT NONE
+
+    INTEGER, INTENT(INOUT) :: total_error
+    INTEGER :: error = 0
+
+    LOGICAL :: is_registered = .FALSE.
+    INTEGER(hid_t) :: vol_id = 0
+
+
+    ! The null VOL connector should not be registered at the start of the test
+    CALL H5VLis_connector_registered_by_name_f( "FAKE_VOL_CONNECTOR_NAME", is_registered, error)
+    CALL check("H5VLis_connector_registered_by_name_f",error,total_error)
+    CALL VERIFY("H5VLis_connector_registered_by_name_f", is_registered, .FALSE., total_error)
+
+    ! Register the connector by value
+    CALL H5VLregister_connector_by_value_f(NATIVE_VOL_CONNECTOR_VALUE, vol_id, error)
+    CALL check("H5VLregister_connector_by_value_f", error, total_error)
+
+    ! The connector should be registered now
+    CALL H5VLis_connector_registered_by_name_f(NATIVE_VOL_CONNECTOR_NAME, is_registered, error)
+    CALL check("H5VLis_connector_registered_by_name_f",error,total_error)
+    CALL VERIFY("H5VLis_connector_registered_by_name_f", is_registered, .TRUE., total_error)
+
+  END SUBROUTINE test_registration_by_value
+
+
+  !-------------------------------------------------------------------------
+  ! Function:    test_registration_by_name()
+  !
+  ! Purpose:     Tests if we can load, register, and close a VOL
+  !              connector by name.
+  !
+  !-------------------------------------------------------------------------
+  !
+
+  SUBROUTINE test_registration_by_fapl(total_error)
+
+    IMPLICIT NONE
+
+    INTEGER, INTENT(INOUT) :: total_error
+    INTEGER :: error = 0
+
+    LOGICAL :: is_registered = .FALSE.
+    INTEGER(hid_t) :: vol_id = 0, vol_id_out = 1
+    INTEGER(hid_t) :: file_id
+    INTEGER(hid_t) :: fapl_id
+    TYPE(C_PTR) :: f_ptr
+
+    CALL H5VLis_connector_registered_by_name_f( "FAKE_VOL_CONNECTOR_NAME", is_registered, error)
+
+    CALL check("H5VLis_connector_registered_by_name_f",error,total_error)
+    CALL VERIFY("H5VLis_connector_registered_by_name_f", is_registered, .FALSE., total_error)
+
+    ! The null VOL connector should not be registered at the start of the test
+    CALL H5VLis_connector_registered_by_name_f( "FAKE_VOL_CONNECTOR_NAME", is_registered, error)
+    CALL check("H5VLis_connector_registered_by_name_f",error,total_error)
+    CALL VERIFY("H5VLis_connector_registered_by_name_f", is_registered, .FALSE., total_error)
+
+    CALL H5VLregister_connector_by_name_f(NATIVE_VOL_CONNECTOR_NAME, vol_id, error)
+    CALL check("H5VLregister_connector_by_name_f",error,total_error)
+
+    ! The connector should be registered now
+    CALL H5VLis_connector_registered_by_name_f(NATIVE_VOL_CONNECTOR_NAME, is_registered, error)
+    CALL check("H5VLis_connector_registered_by_name_f",error,total_error)
+    CALL VERIFY("H5VLis_connector_registered_by_name_f", is_registered, .TRUE., total_error)
+
+    ! Register the connector
+    CALL H5Pcreate_f(H5P_FILE_ACCESS_F, fapl_id, error)
+    CALL check("H5Pcreate_f",error,total_error)
+
+    IF(TRIM(NATIVE_VOL_CONNECTOR_NAME) .EQ. "native")THEN
+       CALL H5Pset_vol_f(fapl_id, vol_id, error)
+       CALL check("H5Pset_vol_f",error,total_error)
+
+       CALL H5Pget_vol_id_f(fapl_id, vol_id_out, error)
+       CALL check("H5Pget_vol_id_f",error,total_error)
+       CALL VERIFY("H5Pget_vol_id_f", vol_id_out, vol_id, total_error)
+
+       f_ptr = C_NULL_PTR
+       CALL H5Pset_vol_f(fapl_id, vol_id, error, f_ptr)
+       CALL check("H5Pset_vol_f",error,total_error)
+
+       CALL H5Pget_vol_id_f(fapl_id, vol_id_out, error)
+       CALL check("H5Pget_vol_id_f",error,total_error)
+       CALL VERIFY("H5Pget_vol_id_f", vol_id_out, vol_id, total_error)
+    ENDIF
+
+    CALL H5VLget_connector_id_by_name_f(NATIVE_VOL_CONNECTOR_NAME, vol_id_out, error)
+    CALL check("H5VLget_connector_id_by_name_f",error,total_error)
+    CALL VERIFY("H5VLget_connector_id_by_name_f", vol_id_out, vol_id, total_error)
+    CALL H5Fcreate_f("voltest.h5",H5F_ACC_TRUNC_F, file_id, error, H5P_DEFAULT_F, fapl_id)
+
+    CALL check("H5F_create_f",error,total_error)
+
+    CALL H5VLclose_f(vol_id_out, error)
+    CALL check("H5VLclose_f",error, total_error)
+
+    CALL H5VLclose_f(vol_id, error)
+    CALL check("H5VLclose_f",error, total_error)
+
+    CALL H5Fclose_f(file_id, error)
+    CALL check("H5Fclose_f",error,total_error)
+
+    CALL H5Pclose_f(fapl_id, error)
+    CALL check("H5Pclose_f",error,total_error)
+
+  END SUBROUTINE test_registration_by_fapl
+
+
+END MODULE VOL_TMOD
+
+
+PROGRAM vol_connector
+
+  USE HDF5
+  USE VOL_TMOD
+
+  IMPLICIT NONE
+  INTEGER :: total_error = 0
+  INTEGER :: error
+  INTEGER :: ret_total_error
+  LOGICAL :: cleanup, status
+  CHARACTER(LEN=32) :: VOL_CONNECTOR_ENV
+  INTEGER :: LEN = 0
+  INTEGER :: CONN_NAME_LEN
+
+  CALL h5open_f(error)
+  cleanup = .TRUE.
+  CALL h5_env_nocleanup_f(status)
+  IF(status) cleanup=.FALSE.
+
+  WRITE(*,'(18X,A)') '=============================='
+  WRITE(*,'(24X,A)') 'FORTRAN VOL tests'
+  WRITE(*,'(18X,A)') '=============================='
+
+  WRITE(*,'(A)') "Testing VOL connector plugin functionality."
+
+  ! Check to see if the VOL connector was set with an env variable
+  CALL GET_ENVIRONMENT_VARIABLE("HDF5_VOL_CONNECTOR", VOL_CONNECTOR_ENV, LEN)
+  CONN_NAME_LEN = INDEX(VOL_CONNECTOR_ENV, ' ')
+  IF(LEN.NE.0)THEN
+     NATIVE_VOL_CONNECTOR_NAME = TRIM(VOL_CONNECTOR_ENV(1:CONN_NAME_LEN))
+  ELSE
+     NATIVE_VOL_CONNECTOR_NAME = "native"
+  ENDIF
+
+  ret_total_error = 0
+  CALL test_registration_by_name(ret_total_error)
+  CALL write_test_status(ret_total_error, ' Testing VOL registration by name', total_error)
+
+  ret_total_error = 0
+  CALL test_registration_by_value(ret_total_error)
+  CALL write_test_status(ret_total_error, ' Testing VOL registration by value', total_error)
+
+  ret_total_error = 0
+  CALL test_registration_by_fapl(ret_total_error)
+  CALL write_test_status(ret_total_error, ' Testing VOL registration by fapl', total_error)
+
+  WRITE(*, fmt = '(/18X,A)') '============================================'
+  WRITE(*, fmt = '(19X, A)', advance='NO') ' FORTRAN VOL tests completed with '
+  WRITE(*, fmt = '(I4)', advance='NO') total_error
+  WRITE(*, fmt = '(A)' ) ' error(s) ! '
+  WRITE(*,'(18X,A)') '============================================'
+
+  CALL h5close_f(error)
+
+  ! if errors detected, exit with non-zero code.
+  IF (total_error .NE. 0) CALL h5_exit_f(1)
+
+END PROGRAM vol_connector
diff --git a/fortran/testpar/CMakeLists.txt b/fortran/testpar/CMakeLists.txt
index 98ef6c8..58ef95d 100644
--- a/fortran/testpar/CMakeLists.txt
+++ b/fortran/testpar/CMakeLists.txt
@@ -1,10 +1,15 @@
-cmake_minimum_required (VERSION 3.1.0)
-PROJECT (HDF5_FORTRAN_TESTPAR C CXX Fortran)
+cmake_minimum_required (VERSION 3.18)
+project (HDF5_FORTRAN_TESTPAR C Fortran)
 
 #-----------------------------------------------------------------------------
 # Setup include Directories
 #-----------------------------------------------------------------------------
-INCLUDE_DIRECTORIES (${HDF5_F90_BINARY_DIR} ${HDF5_F90_SRC_DIR}/src)
+set (TESTPAR_INCLUDES ${MPI_Fortran_INCLUDE_DIRS} ${HDF5_F90_BINARY_DIR} ${HDF5_F90_SRC_DIR}/src)
+if (NOT BUILD_SHARED_LIBS)
+  set (TESTPAR_INCLUDES ${TESTPAR_INCLUDES} ${CMAKE_Fortran_MODULE_DIRECTORY}/static)
+else ()
+  set (TESTPAR_INCLUDES ${TESTPAR_INCLUDES} ${CMAKE_Fortran_MODULE_DIRECTORY}/shared)
+endif ()
 
 #-----------------------------------------------------------------------------
 # Add Tests
@@ -12,23 +17,87 @@ INCLUDE_DIRECTORIES (${HDF5_F90_BINARY_DIR} ${HDF5_F90_SRC_DIR}/src)
 
 #-- Adding test for parallel_test
 add_executable (parallel_test
-    ptest.f90
-    hyper.f90
-    mdset.f90
+    ptest.F90
+    hyper.F90
+    mdset.F90
+    multidsetrw.F90
 )
-TARGET_NAMING (parallel_test ${LIB_TYPE})
-TARGET_FORTRAN_PROPERTIES (parallel_test ${LIB_TYPE} " " " ")
-target_link_libraries (parallel_test 
-    ${HDF5_F90_TEST_LIB_TARGET}
-    ${HDF5_F90_LIB_TARGET}
-    ${HDF5_LIB_TARGET}
-    ${MPI_Fortran_LIBRARIES}
+target_include_directories (parallel_test
+    PRIVATE ${TESTPAR_INCLUDES}
 )
-if (WIN32 AND MSVC)
-  target_link_libraries (parallel_test "ws2_32.lib")
-endif (WIN32 AND MSVC)
-target_include_directories (parallel_test PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY})
-set_target_properties (parallel_test PROPERTIES LINKER_LANGUAGE Fortran)
-set_target_properties (parallel_test PROPERTIES FOLDER test/fortran)
+target_compile_options(parallel_test
+    PRIVATE
+        "${HDF5_CMAKE_Fortran_FLAGS}"
+        $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_COMPILE_FLAGS}>
+)
+if (NOT BUILD_SHARED_LIBS)
+  target_link_libraries (parallel_test
+      PRIVATE
+          ${HDF5_F90_TEST_LIB_TARGET} ${HDF5_F90_LIB_TARGET} ${HDF5_LIB_TARGET} ${LINK_Fortran_LIBS}
+          $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"ws2_32.lib">
+  )
+  set_target_properties (parallel_test PROPERTIES
+      FOLDER test/fortran
+      LINKER_LANGUAGE Fortran
+      Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/static
+  )
+else ()
+  target_link_libraries (parallel_test
+      PRIVATE
+          ${HDF5_F90_TEST_LIBSH_TARGET} ${HDF5_F90_LIBSH_TARGET} ${HDF5_LIBSH_TARGET} ${LINK_Fortran_LIBS}
+          $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"ws2_32.lib">
+  )
+  set_target_properties (parallel_test PROPERTIES
+      FOLDER test/fortran
+      LINKER_LANGUAGE Fortran
+      Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/shared
+  )
+endif ()
+
+if(MSVC)
+  set_property(TARGET parallel_test PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE ${WIN_LINK_FLAGS}")
+endif()
+
+#-- Adding test for subfiling_test
+add_executable (subfiling_test
+    subfiling.F90
+)
+target_include_directories (subfiling_test
+    PRIVATE ${TESTPAR_INCLUDES}
+)
+target_compile_options(subfiling_test
+    PRIVATE
+        "${HDF5_CMAKE_Fortran_FLAGS}"
+        $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_COMPILE_FLAGS}>
+)
+if (NOT BUILD_SHARED_LIBS)
+  target_link_libraries (subfiling_test
+      PRIVATE
+          ${HDF5_F90_TEST_LIB_TARGET} ${HDF5_F90_LIB_TARGET} ${HDF5_LIB_TARGET} ${LINK_Fortran_LIBS}
+          $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"ws2_32.lib">
+  )
+  set_target_properties (subfiling_test PROPERTIES
+      FOLDER test/fortran
+      LINKER_LANGUAGE Fortran
+      Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/static
+  )
+else ()
+  target_link_libraries (subfiling_test
+      PRIVATE
+          ${HDF5_F90_TEST_LIBSH_TARGET} ${HDF5_F90_LIBSH_TARGET} ${HDF5_LIBSH_TARGET} ${LINK_Fortran_LIBS}
+          $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"ws2_32.lib">
+  )
+  set_target_properties (subfiling_test PROPERTIES
+      FOLDER test/fortran
+      LINKER_LANGUAGE Fortran
+      Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/shared
+  )
+endif ()
+
+if(MSVC)
+  set_property(TARGET subfiling_test PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE ${WIN_LINK_FLAGS}")
+endif()
 
-include (CMakeTests.cmake)
+if (HDF5_TEST_FORTRAN AND HDF5_TEST_PARALLEL)
+  include (CMakeTests.cmake)
+endif ()
diff --git a/fortran/testpar/CMakeTests.cmake b/fortran/testpar/CMakeTests.cmake
index 61085e6..1d893d5 100644
--- a/fortran/testpar/CMakeTests.cmake
+++ b/fortran/testpar/CMakeTests.cmake
@@ -1,7 +1,19 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
 
 ##############################################################################
 ##############################################################################
 ###           T E S T I N G                                                ###
 ##############################################################################
 ##############################################################################
-add_test (NAME FORT_parallel_test COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $<TARGET_FILE:parallel_test>)
+add_test (NAME MPI_TEST_FORT_parallel_test COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:parallel_test> ${MPIEXEC_POSTFLAGS})
+add_test (NAME MPI_TEST_FORT_subfiling_test COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:subfiling_test> ${MPIEXEC_POSTFLAGS})
+\ No newline at end of file
diff --git a/fortran/testpar/Makefile.am b/fortran/testpar/Makefile.am
index 517a3c8..b1cefbc 100644
--- a/fortran/testpar/Makefile.am
+++ b/fortran/testpar/Makefile.am
@@ -1,16 +1,13 @@
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 ##
 ## Makefile.am
 ## Run automake to generate a Makefile.in from this file.
@@ -35,14 +32,15 @@ else
 endif
 
 # These are our main targets
-TEST_PROG_PARA=parallel_test
+TEST_PROG_PARA=parallel_test subfiling_test
 check_PROGRAMS=$(TEST_PROG_PARA)
 
 # Temporary files
-CHECK_CLEANFILES+=parf[12].h5
+CHECK_CLEANFILES+=parf[12].h5 subf.h5*
 
 # Test source files
-parallel_test_SOURCES=ptest.f90 hyper.f90 mdset.f90
+parallel_test_SOURCES=ptest.F90 hyper.F90 mdset.F90 multidsetrw.F90
+subfiling_test_SOURCES=subfiling.F90
 
 # The tests depend on several libraries.
 LDADD=$(LIBH5FTEST) $(LIBH5TEST) $(LIBH5F) $(LIBHDF5)
@@ -50,4 +48,4 @@ LDADD=$(LIBH5FTEST) $(LIBH5TEST) $(LIBH5F) $(LIBHDF5)
 # Mark this directory as part of the Fortran API
 FORTRAN_API=yes
 
-include $(top_srcdir)/config/conclude.am
+include $(top_srcdir)/config/conclude_fc.am
diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in
deleted file mode 100644
index 210d61c..0000000
--- a/fortran/testpar/Makefile.in
+++ /dev/null
@@ -1,1323 +0,0 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-#
-# HDF5 Fortran Parallel Library Test Makefile(.in)
-#
-VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-DIST_COMMON = $(top_srcdir)/config/commence.am \
-	$(top_srcdir)/config/conclude.am $(srcdir)/Makefile.in \
-	$(srcdir)/Makefile.am $(top_srcdir)/bin/mkinstalldirs \
-	$(top_srcdir)/bin/test-driver
-
-# Some Fortran compilers can't build shared libraries, so sometimes we
-# want to build a shared C library and a static Fortran library.  If so,
-# pass the -static flag to the library linker.
-# (Actually, we historically have bad luck combining shared libraries with
-# parallel code.  But you're welcome to try...)
-@FORTRAN_SHARED_CONDITIONAL_FALSE@am__append_1 = -static
-check_PROGRAMS = $(am__EXEEXT_1)
-TESTS =
-subdir = fortran/testpar
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/aclocal_cxx.m4 \
-	$(top_srcdir)/m4/aclocal_fc.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/src/H5config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__EXEEXT_1 = parallel_test$(EXEEXT)
-am_parallel_test_OBJECTS = ptest.$(OBJEXT) hyper.$(OBJEXT) \
-	mdset.$(OBJEXT)
-parallel_test_OBJECTS = $(am_parallel_test_OBJECTS)
-parallel_test_LDADD = $(LDADD)
-parallel_test_DEPENDENCIES = $(LIBH5FTEST) $(LIBH5TEST) $(LIBH5F) \
-	$(LIBHDF5)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 = 
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
-FCCOMPILE = $(FC) $(AM_FCFLAGS) $(FCFLAGS)
-LTFCCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=FC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(FC) $(AM_FCFLAGS) $(FCFLAGS)
-AM_V_FC = $(am__v_FC_@AM_V@)
-am__v_FC_ = $(am__v_FC_@AM_DEFAULT_V@)
-am__v_FC_0 = @echo "  FC      " $@;
-am__v_FC_1 = 
-FCLD = $(FC)
-FCLINK = $(LIBTOOL) $(AM_V_lt) --tag=FC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(FCLD) $(AM_FCFLAGS) $(FCFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_FCLD = $(am__v_FCLD_@AM_V@)
-am__v_FCLD_ = $(am__v_FCLD_@AM_DEFAULT_V@)
-am__v_FCLD_0 = @echo "  FCLD    " $@;
-am__v_FCLD_1 = 
-SOURCES = $(parallel_test_SOURCES)
-DIST_SOURCES = $(parallel_test_SOURCES)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-am__tty_colors_dummy = \
-  mgn= red= grn= lgn= blu= brg= std=; \
-  am__color_tests=no
-am__tty_colors = { \
-  $(am__tty_colors_dummy); \
-  if test "X$(AM_COLOR_TESTS)" = Xno; then \
-    am__color_tests=no; \
-  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
-    am__color_tests=yes; \
-  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
-    am__color_tests=yes; \
-  fi; \
-  if test $$am__color_tests = yes; then \
-    red='[0;31m'; \
-    grn='[0;32m'; \
-    lgn='[1;32m'; \
-    blu='[1;34m'; \
-    mgn='[0;35m'; \
-    brg='[1m'; \
-    std='[m'; \
-  fi; \
-}
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__recheck_rx = ^[ 	]*:recheck:[ 	]*
-am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
-am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
-# A command that, given a newline-separated list of test names on the
-# standard input, print the name of the tests that are to be re-run
-# upon "make recheck".
-am__list_recheck_tests = $(AWK) '{ \
-  recheck = 1; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-        { \
-          if ((getline line2 < ($$0 ".log")) < 0) \
-	    recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
-        { \
-          recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
-        { \
-          break; \
-        } \
-    }; \
-  if (recheck) \
-    print $$0; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# A command that, given a newline-separated list of test names on the
-# standard input, create the global log from their .trs and .log files.
-am__create_global_log = $(AWK) ' \
-function fatal(msg) \
-{ \
-  print "fatal: making $@: " msg | "cat >&2"; \
-  exit 1; \
-} \
-function rst_section(header) \
-{ \
-  print header; \
-  len = length(header); \
-  for (i = 1; i <= len; i = i + 1) \
-    printf "="; \
-  printf "\n\n"; \
-} \
-{ \
-  copy_in_global_log = 1; \
-  global_test_result = "RUN"; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-         fatal("failed to read from " $$0 ".trs"); \
-      if (line ~ /$(am__global_test_result_rx)/) \
-        { \
-          sub("$(am__global_test_result_rx)", "", line); \
-          sub("[ 	]*$$", "", line); \
-          global_test_result = line; \
-        } \
-      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
-        copy_in_global_log = 0; \
-    }; \
-  if (copy_in_global_log) \
-    { \
-      rst_section(global_test_result ": " $$0); \
-      while ((rc = (getline line < ($$0 ".log"))) != 0) \
-      { \
-        if (rc < 0) \
-          fatal("failed to read from " $$0 ".log"); \
-        print line; \
-      }; \
-      printf "\n"; \
-    }; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# Restructured Text title.
-am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
-# Solaris 10 'make', and several other traditional 'make' implementations,
-# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
-# by disabling -e (using the XSI extension "set +e") if it's set.
-am__sh_e_setup = case $$- in *e*) set +e;; esac
-# Default flags passed to test drivers.
-am__common_driver_flags = \
-  --color-tests "$$am__color_tests" \
-  --enable-hard-errors "$$am__enable_hard_errors" \
-  --expect-failure "$$am__expect_failure"
-# To be inserted before the command running the test.  Creates the
-# directory for the log if needed.  Stores in $dir the directory
-# containing $f, in $tst the test, in $log the log.  Executes the
-# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
-# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
-# will run the test scripts (or their associated LOG_COMPILER, if
-# thy have one).
-am__check_pre = \
-$(am__sh_e_setup);					\
-$(am__vpath_adj_setup) $(am__vpath_adj)			\
-$(am__tty_colors);					\
-srcdir=$(srcdir); export srcdir;			\
-case "$@" in						\
-  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
-    *) am__odir=.;; 					\
-esac;							\
-test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
-  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
-if test -f "./$$f"; then dir=./;			\
-elif test -f "$$f"; then dir=;				\
-else dir="$(srcdir)/"; fi;				\
-tst=$$dir$$f; log='$@'; 				\
-if test -n '$(DISABLE_HARD_ERRORS)'; then		\
-  am__enable_hard_errors=no; 				\
-else							\
-  am__enable_hard_errors=yes; 				\
-fi; 							\
-case " $(XFAIL_TESTS) " in				\
-  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
-    am__expect_failure=yes;;				\
-  *)							\
-    am__expect_failure=no;;				\
-esac; 							\
-$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
-# A shell command to get the names of the tests scripts with any registered
-# extension removed (i.e., equivalently, the names of the test logs, with
-# the '.log' extension removed).  The result is saved in the shell variable
-# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
-# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
-# since that might cause problem with VPATH rewrites for suffix-less tests.
-# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
-am__set_TESTS_bases = \
-  bases='$(TEST_LOGS)'; \
-  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
-  bases=`echo $$bases`
-RECHECK_LOGS = $(TEST_LOGS)
-AM_RECURSIVE_TARGETS = check recheck
-TEST_SUITE_LOG = test-suite.log
-am__test_logs1 = $(TESTS:=.log)
-am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
-TEST_LOGS = $(am__test_logs2:.sh.log=.log)
-SH_LOG_DRIVER = $(SHELL) $(top_srcdir)/bin/test-driver
-SH_LOG_COMPILE = $(SH_LOG_COMPILER) $(AM_SH_LOG_FLAGS) $(SH_LOG_FLAGS)
-am__set_b = \
-  case '$@' in \
-    */*) \
-      case '$*' in \
-        */*) b='$*';; \
-          *) b=`echo '$@' | sed 's/\.log$$//'`; \
-       esac;; \
-    *) \
-      b='$*';; \
-  esac
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
-AMTAR = @AMTAR@
-
-# H5_CFLAGS holds flags that should be used when building hdf5,
-# but which should not be exported to h5cc for building other programs.
-# AM_CFLAGS is an automake construct which should be used by Makefiles 
-# instead of CFLAGS, as CFLAGS is reserved solely for the user to define.
-# This applies to FCFLAGS, CXXFLAGS, CPPFLAGS, and LDFLAGS as well.
-AM_CFLAGS = @AM_CFLAGS@ @H5_CFLAGS@
-AM_CPPFLAGS = @AM_CPPFLAGS@ @H5_CPPFLAGS@
-AM_CXXFLAGS = @AM_CXXFLAGS@ @H5_CXXFLAGS@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-
-# Include files
-AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@ -I$(top_srcdir)/fortran/src \
-	-I$(top_srcdir)/fortran/test \
-	$(F9XMODFLAG)$(top_builddir)/fortran/src \
-	$(F9XMODFLAG)$(top_builddir)/fortran/test
-AM_LDFLAGS = @AM_LDFLAGS@ @H5_LDFLAGS@ $(am__append_1)
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BYTESEX = @BYTESEX@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CC_VERSION = @CC_VERSION@
-CFLAGS = @CFLAGS@
-CLEARFILEBUF = @CLEARFILEBUF@
-CODESTACK = @CODESTACK@
-CONFIG_DATE = @CONFIG_DATE@
-CONFIG_MODE = @CONFIG_MODE@
-CONFIG_USER = @CONFIG_USER@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CXX_VERSION = @CXX_VERSION@
-CYGPATH_W = @CYGPATH_W@
-DEBUG_PKG = @DEBUG_PKG@
-DEFAULT_API_VERSION = @DEFAULT_API_VERSION@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
-DIRECT_VFD = @DIRECT_VFD@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-EXTERNAL_FILTERS = @EXTERNAL_FILTERS@
-
-# Make sure that these variables are exported to the Makefiles
-F9XMODEXT = @F9XMODEXT@
-F9XMODFLAG = @F9XMODFLAG@
-F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
-FC = @FC@
-FC2003 = @FC2003@
-FCFLAGS = @FCFLAGS@
-FCFLAGS_f90 = @FCFLAGS_f90@
-FCLIBS = @FCLIBS@
-FC_VERSION = @FC_VERSION@
-FGREP = @FGREP@
-FSEARCH_DIRS = @FSEARCH_DIRS@
-GREP = @GREP@
-H5_CFLAGS = @H5_CFLAGS@
-H5_CPPFLAGS = @H5_CPPFLAGS@
-H5_CXXFLAGS = @H5_CXXFLAGS@
-H5_CXX_SHARED = @H5_CXX_SHARED@
-H5_FCFLAGS = @H5_FCFLAGS@
-H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@
-H5_LDFLAGS = @H5_LDFLAGS@
-H5_LONE_COLON = @H5_LONE_COLON@
-H5_VERSION = @H5_VERSION@
-HADDR_T = @HADDR_T@
-HAVE_DMALLOC = @HAVE_DMALLOC@
-HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@
-HAVE_PTHREAD = @HAVE_PTHREAD@
-HDF5_HL = @HDF5_HL@
-HDF5_INTERFACES = @HDF5_INTERFACES@
-HDF_CXX = @HDF_CXX@
-HDF_FORTRAN = @HDF_FORTRAN@
-HDF_FORTRAN2003 = @HDF_FORTRAN2003@
-HID_T = @HID_T@
-HL = @HL@
-HL_FOR = @HL_FOR@
-HSIZE_T = @HSIZE_T@
-HSSIZE_T = @HSSIZE_T@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTRUMENT = @INSTRUMENT@
-INSTRUMENT_LIBRARY = @INSTRUMENT_LIBRARY@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LL_PATH = @LL_PATH@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_STATIC_EXEC = @LT_STATIC_EXEC@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MPE = @MPE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJECT_NAMELEN_DEFAULT_F = @OBJECT_NAMELEN_DEFAULT_F@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PARALLEL = @PARALLEL@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-RANLIB = @RANLIB@
-ROOT = @ROOT@
-RUNPARALLEL = @RUNPARALLEL@
-RUNSERIAL = @RUNSERIAL@
-R_INTEGER = @R_INTEGER@
-R_LARGE = @R_LARGE@
-SEARCH = @SEARCH@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SIZE_T = @SIZE_T@
-STATIC_EXEC = @STATIC_EXEC@
-STATIC_SHARED = @STATIC_SHARED@
-STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@
-STRIP = @STRIP@
-TESTPARALLEL = @TESTPARALLEL@
-THREADSAFE = @THREADSAFE@
-TIME = @TIME@
-TR = @TR@
-TRACE_API = @TRACE_API@
-UNAME_INFO = @UNAME_INFO@
-USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
-USE_FILTER_SZIP = @USE_FILTER_SZIP@
-USINGMEMCHECKER = @USINGMEMCHECKER@
-VERSION = @VERSION@
-WORDS_BIGENDIAN = @WORDS_BIGENDIAN@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_FC = @ac_ct_FC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-
-# Install directories that automake doesn't know about
-docdir = $(exec_prefix)/doc
-dvidir = @dvidir@
-enable_shared = @enable_shared@
-enable_static = @enable_static@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-
-# Shell commands used in Makefiles
-RM = rm -f
-CP = cp
-
-# Some machines need a command to run executables; this is that command
-# so that our tests will run.
-# We use RUNEXEC instead of RUNSERIAL directly because it may be that
-# some tests need to be run with a different command.  Older versions
-# of the makefiles used the command
-# $(LIBTOOL) --mode=execute
-# in some directories, for instance.
-RUNEXEC = $(RUNSERIAL)
-
-# Libraries to link to while building
-LIBHDF5 = $(top_builddir)/src/libhdf5.la
-LIBH5TEST = $(top_builddir)/test/libh5test.la
-LIBH5F = $(top_builddir)/fortran/src/libhdf5_fortran.la
-LIBH5FTEST = $(top_builddir)/fortran/test/libh5test_fortran.la
-LIBH5CPP = $(top_builddir)/c++/src/libhdf5_cpp.la
-LIBH5TOOLS = $(top_builddir)/tools/lib/libh5tools.la
-LIBH5_HL = $(top_builddir)/hl/src/libhdf5_hl.la
-LIBH5F_HL = $(top_builddir)/hl/fortran/src/libhdf5hl_fortran.la
-LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
-
-# Note that in svn revision 19400 the '/' after DESTDIR in H5* variables below  
-# has been removed. According to the official description of DESTDIR by Gnu at 
-# http://www.gnu.org/prep/standards/html_node/DESTDIR.html, DESTDIR is 
-# prepended to the normal and complete install path that it precedes for the 
-# purpose of installing in a temporary directory which is useful for building 
-# rpms and other packages.  The '/' after ${DESTDIR} will be followed by another 
-# '/' at the beginning of the normal install path.  When DESTDIR is empty the  
-# path then begins with '//', which is incorrect and causes problems at least for 
-# Cygwin.   
-
-# Scripts used to build examples
-# If only shared libraries have been installed, have h5cc build examples with
-# shared libraries instead of static libraries
-H5CC = ${DESTDIR}$(bindir)/h5cc
-H5CC_PP = ${DESTDIR}$(bindir)/h5pcc
-H5FC = ${DESTDIR}$(bindir)/h5fc
-H5FC_PP = ${DESTDIR}$(bindir)/h5pfc
-H5CPP = ${DESTDIR}$(bindir)/h5c++
-ACLOCAL_AMFLAGS = "-I m4"
-
-# The trace script; this is used on source files from the C library to
-# insert tracing macros.
-TRACE = perl $(top_srcdir)/bin/trace
-
-# .chkexe files are used to mark tests that have run successfully.
-# .chklog files are output from those tests.
-# *.clog and *.clog2 are from the MPE option.
-
-# Temporary files
-CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 parf[12].h5
-
-# These are our main targets
-TEST_PROG_PARA = parallel_test
-
-# Test source files
-parallel_test_SOURCES = ptest.f90 hyper.f90 mdset.f90
-
-# The tests depend on several libraries.
-LDADD = $(LIBH5FTEST) $(LIBH5TEST) $(LIBH5F) $(LIBHDF5)
-
-# Mark this directory as part of the Fortran API
-FORTRAN_API = yes
-
-# Automake needs to be taught how to build lib, progs, and tests targets.
-# These will be filled in automatically for the most part (e.g.,
-# lib_LIBRARIES are built for lib target), but EXTRA_LIB, EXTRA_PROG, and
-# EXTRA_TEST variables are supplied to allow the user to force targets to
-# be built at certain times. 
-LIB = $(lib_LIBRARIES) $(lib_LTLIBRARIES) $(noinst_LIBRARIES)                 \
-      $(noinst_LTLIBRARIES) $(check_LIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LIB)
-
-PROGS = $(bin_PROGRAMS) $(bin_SCRIPTS) $(noinst_PROGRAMS) $(noinst_SCRIPTS)   \
-        $(EXTRA_PROG)
-
-chk_TESTS = $(check_PROGRAMS) $(check_SCRIPTS) $(EXTRA_TEST) 
-TEST_EXTENSIONS = .sh
-SH_LOG_COMPILER = $(SHELL)
-AM_SH_LOG_FLAGS = 
-TEST_PROG_CHKEXE = $(TEST_PROG:=.chkexe_)
-TEST_PROG_PARA_CHKEXE = $(TEST_PROG_PARA:=.chkexe_)
-TEST_SCRIPT_CHKSH = $(TEST_SCRIPT:=.chkexe_)
-TEST_SCRIPT_PARA_CHKSH = $(TEST_SCRIPT_PARA:=.chkexe_)
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .f90 .lo .log .o .obj .sh .sh$(EXEEXT) .trs
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign fortran/testpar/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign fortran/testpar/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-$(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am:
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-checkPROGRAMS:
-	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-
-parallel_test$(EXEEXT): $(parallel_test_OBJECTS) $(parallel_test_DEPENDENCIES) $(EXTRA_parallel_test_DEPENDENCIES) 
-	@rm -f parallel_test$(EXEEXT)
-	$(AM_V_FCLD)$(FCLINK) $(parallel_test_OBJECTS) $(parallel_test_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-.f90.o:
-	$(AM_V_FC)$(FCCOMPILE) -c -o $@ $(FCFLAGS_f90) $<
-
-.f90.obj:
-	$(AM_V_FC)$(FCCOMPILE) -c -o $@ $(FCFLAGS_f90) `$(CYGPATH_W) '$<'`
-
-.f90.lo:
-	$(AM_V_FC)$(LTFCCOMPILE) -c -o $@ $(FCFLAGS_f90) $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: ctags-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-# Recover from deleted '.trs' file; this should ensure that
-# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
-# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
-# to avoid problems with "make -n".
-.log.trs:
-	rm -f $< $@
-	$(MAKE) $(AM_MAKEFLAGS) $<
-
-# Leading 'am--fnord' is there to ensure the list of targets does not
-# expand to empty, as could happen e.g. with make check TESTS=''.
-am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
-am--force-recheck:
-	@:
-
-$(TEST_SUITE_LOG): $(TEST_LOGS)
-	@$(am__set_TESTS_bases); \
-	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
-	redo_bases=`for i in $$bases; do \
-	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
-	            done`; \
-	if test -n "$$redo_bases"; then \
-	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
-	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
-	  if $(am__make_dryrun); then :; else \
-	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
-	  fi; \
-	fi; \
-	if test -n "$$am__remaking_logs"; then \
-	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
-	       "recursion detected" >&2; \
-	else \
-	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
-	fi; \
-	if $(am__make_dryrun); then :; else \
-	  st=0;  \
-	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
-	  for i in $$redo_bases; do \
-	    test -f $$i.trs && test -r $$i.trs \
-	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
-	    test -f $$i.log && test -r $$i.log \
-	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
-	  done; \
-	  test $$st -eq 0 || exit 1; \
-	fi
-	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
-	ws='[ 	]'; \
-	results=`for b in $$bases; do echo $$b.trs; done`; \
-	test -n "$$results" || results=/dev/null; \
-	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
-	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
-	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
-	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
-	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
-	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
-	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
-	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
-	  success=true; \
-	else \
-	  success=false; \
-	fi; \
-	br='==================='; br=$$br$$br$$br$$br; \
-	result_count () \
-	{ \
-	    if test x"$$1" = x"--maybe-color"; then \
-	      maybe_colorize=yes; \
-	    elif test x"$$1" = x"--no-color"; then \
-	      maybe_colorize=no; \
-	    else \
-	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
-	    fi; \
-	    shift; \
-	    desc=$$1 count=$$2; \
-	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
-	      color_start=$$3 color_end=$$std; \
-	    else \
-	      color_start= color_end=; \
-	    fi; \
-	    echo "$${color_start}# $$desc $$count$${color_end}"; \
-	}; \
-	create_testsuite_report () \
-	{ \
-	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
-	  result_count $$1 "PASS: " $$pass  "$$grn"; \
-	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
-	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
-	  result_count $$1 "FAIL: " $$fail  "$$red"; \
-	  result_count $$1 "XPASS:" $$xpass "$$red"; \
-	  result_count $$1 "ERROR:" $$error "$$mgn"; \
-	}; \
-	{								\
-	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
-	    $(am__rst_title);						\
-	  create_testsuite_report --no-color;				\
-	  echo;								\
-	  echo ".. contents:: :depth: 2";				\
-	  echo;								\
-	  for b in $$bases; do echo $$b; done				\
-	    | $(am__create_global_log);					\
-	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
-	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
-	if $$success; then						\
-	  col="$$grn";							\
-	 else								\
-	  col="$$red";							\
-	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
-	fi;								\
-	echo "$${col}$$br$${std}"; 					\
-	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
-	echo "$${col}$$br$${std}"; 					\
-	create_testsuite_report --maybe-color;				\
-	echo "$$col$$br$$std";						\
-	if $$success; then :; else					\
-	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
-	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
-	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
-	  fi;								\
-	  echo "$$col$$br$$std";					\
-	fi;								\
-	$$success || exit 1
-recheck: all $(check_PROGRAMS)
-	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-	@set +e; $(am__set_TESTS_bases); \
-	bases=`for i in $$bases; do echo $$i; done \
-	         | $(am__list_recheck_tests)` || exit 1; \
-	log_list=`for i in $$bases; do echo $$i.log; done`; \
-	log_list=`echo $$log_list`; \
-	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
-	        am__force_recheck=am--force-recheck \
-	        TEST_LOGS="$$log_list"; \
-	exit $$?
-.sh.log:
-	@p='$<'; \
-	$(am__set_b); \
-	$(am__check_pre) $(SH_LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_SH_LOG_DRIVER_FLAGS) $(SH_LOG_DRIVER_FLAGS) -- $(SH_LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-@am__EXEEXT_TRUE@.sh$(EXEEXT).log:
-@am__EXEEXT_TRUE@	@p='$<'; \
-@am__EXEEXT_TRUE@	$(am__set_b); \
-@am__EXEEXT_TRUE@	$(am__check_pre) $(SH_LOG_DRIVER) --test-name "$$f" \
-@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
-@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_SH_LOG_DRIVER_FLAGS) $(SH_LOG_DRIVER_FLAGS) -- $(SH_LOG_COMPILE) \
-@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
-	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
-check: check-am
-all-am: Makefile all-local
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
-	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
-	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-local
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: check-am install-am install-strip
-
-.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-TESTS \
-	check-am clean clean-checkPROGRAMS clean-generic clean-libtool \
-	cscopelist-am ctags ctags-am distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
-	pdf-am ps ps-am recheck tags tags-am uninstall uninstall-am
-
-
-# List all build rules defined by HDF5 Makefiles as "PHONY" targets here.
-# This tells the Makefiles that these targets are not files to be built but
-# commands that should be executed even if a file with the same name already
-# exists.
-.PHONY: build-check-clean build-check-p build-check-s build-lib build-progs \
-        build-tests check-clean check-install check-p check-s check-vfd \
-        install-doc lib progs tests uninstall-doc _exec_check-s _test help
-
-help:
-	@$(top_srcdir)/bin/makehelp
-
-# lib/progs/tests targets recurse into subdirectories. build-* targets
-# build files in this directory.
-build-lib: $(LIB)
-build-progs: $(LIB) $(PROGS)
-build-tests: $(LIB) $(PROGS) $(chk_TESTS)
-
-# General rule for recursive building targets.
-# BUILT_SOURCES contain targets that need to be built before anything else
-# in the directory (e.g., for Fortran type detection)
-lib progs tests check-s check-p :: $(BUILT_SOURCES)
-	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
-	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X && test $$d != .; then                           \
-	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
-	    fi;                                                               \
-	done
-
-# General rule for recursive cleaning targets.  Like the rule above,
-# but doesn't require building BUILT_SOURCES.
-check-clean ::
-	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
-	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X && test $$d != .; then                           \
-	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
-	    fi;                                                               \
-	done
-
-# Tell Automake to build tests when the user types `make all' (this is
-# not its default behavior).  Also build EXTRA_LIB and EXTRA_PROG since
-# Automake won't build them automatically, either.
-all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(chk_TESTS)
-
-# make install-doc doesn't do anything outside of doc directory, but
-# Makefiles should recognize it.
-# UPDATE: docs no longer reside in this build tree, so this target
-# is depreciated.
-install-doc uninstall-doc:
-	@echo "Nothing to be done."
-
-# clean up files generated by tests so they can be re-run.
-build-check-clean:
-	$(RM) -rf $(CHECK_CLEANFILES)
-
-# run check-clean whenever mostlyclean is run
-mostlyclean-local: build-check-clean
-
-# check-install is just a synonym for installcheck
-check-install: installcheck
-
-# Run each test in order, passing $(TEST_FLAGS) to the program.
-# Since tests are done in a shell loop, "make -i" does apply inside it.
-# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
-# The timestamps give a rough idea how much time the tests use.
-#
-# Note that targets in chk_TESTS (defined above) will be built when the user
-# types 'make tests' or 'make check', but only programs in TEST_PROG,
-# TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
-check-TESTS: test
-
-test _test:
-	@$(MAKE) build-check-s
-	@$(MAKE) build-check-p
-
-# Actual execution of check-s.
-build-check-s: $(LIB) $(PROGS) $(chk_TESTS)
-	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
-	   echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
-	fi
-	@$(MAKE) $(AM_MAKEFLAGS) _exec_check-s
-	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
-	    echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
-	fi
-
-_exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH)
-
-# The dummy.chkexe here prevents the target from being
-# empty if there are no tests in the current directory.
-# $${log} is the log file.
-# $${tname} is the name of test.
-$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
-	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \
-	   tname=$(@:.chkexe_=)$(EXEEXT);\
-	   log=$(@:.chkexe_=.chklog); \
-	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \
-	      echo "No need to test $${tname} again."; \
-	   else \
-	      echo "============================" > $${log}; \
-	      if test "X$(FORTRAN_API)" = "Xyes"; then \
-	         echo "Fortran API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "Fortran API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(CXX_API)" = "Xyes"; then \
-	         echo "C++ API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "C++ API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log};\
-	      else \
-	         echo "Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "$(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      fi; \
-	      echo "============================" >> $${log}; \
-	      srcdir="$(srcdir)" \
-	         $(TIME) $(RUNEXEC) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \
-	         && touch $(@:.chkexe_=.chkexe) || \
-	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	         (cat $${log} && false) || exit 1; \
-	      echo "" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
-	      echo "============================" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
-	      cat $${log}; \
-	   fi; \
-	fi
-
-# The dummysh.chkexe here prevents the target from being
-# empty if there are no tests in the current directory.
-# $${log} is the log file.
-# $${tname} is the name of test.
-$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
-	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummysh.chkexe_"; then \
-	   cmd=$(@:.chkexe_=);\
-	   tname=`basename $$cmd`;\
-	   chkname=`basename $(@:.chkexe_=.chkexe)`;\
-	   log=`basename $(@:.chkexe_=.chklog)`; \
-	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer $${chkname} $$cmd $(SCRIPT_DEPEND); then \
-	      echo "No need to test $${tname} again."; \
-	   else \
-	      echo "============================" > $${log}; \
-	      if test "X$(FORTRAN_API)" = "Xyes"; then \
-	         echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(CXX_API)" = "Xyes"; then \
-	         echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      else \
-	         echo "Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      fi; \
-	      echo "============================" >> $${log}; \
-	      RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
-	      srcdir="$(srcdir)" \
-	         $(TIME) $(SHELL) $$cmd $(TEST_FLAGS) >> $${log} 2>&1 \
-	         && touch $${chkname} || \
-	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	         (cat $${log} && false) || exit 1; \
-	      echo "" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
-	      echo "============================" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
-	      cat $${log}; \
-	   fi; \
-	   echo "============================"; \
-	fi
-
-# Actual execution of check-p.
-build-check-p: $(LIB) $(PROGS) $(chk_TESTS)
-	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
-	   echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
-	fi
-	@if test -n "$(TEST_PROG_PARA)"; then                                \
-	    echo "**** Hint ****";                                            \
-	    echo "Parallel test files reside in the current directory"        \
-	         "by default.";                                               \
-	    echo "Set HDF5_PARAPREFIX to use another directory. E.g.,";       \
-	    echo "    HDF5_PARAPREFIX=/PFS/user/me";                          \
-	    echo "    export HDF5_PARAPREFIX";                                \
-	    echo "    make check";                                            \
-	    echo "**** end of Hint ****";                                     \
-	fi
-	@for test in $(TEST_PROG_PARA) dummy; do                             \
-	   if test $$test != dummy; then                                      \
-	      $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ \
-	      RUNEXEC="$(RUNPARALLEL)" || exit 1; \
-	   fi;                                                                \
-	done
-	@for test in $(TEST_SCRIPT_PARA) dummy; do                           \
-	  if test $$test != dummy; then                                      \
-	    $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ || exit 1; \
-	  fi;                                                                 \
-	done
-	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
-	    echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
-	fi
-
-# Run test with different Virtual File Driver
-check-vfd: $(LIB) $(PROGS) $(chk_TESTS)
-	@for vfd in $(VFD_LIST) dummy; do                                     \
-	    if test $$vfd != dummy; then                                      \
-	        echo "============================";                          \
-	        echo "Testing Virtual File Driver $$vfd";                     \
-	        echo "============================";                          \
-	        $(MAKE) $(AM_MAKEFLAGS) check-clean || exit 1;                \
-	        HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check || exit 1;    \
-	    fi;                                                               \
-	done
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/fortran/testpar/hyper.F90 b/fortran/testpar/hyper.F90
new file mode 100644
index 0000000..8051b38
--- /dev/null
+++ b/fortran/testpar/hyper.F90
@@ -0,0 +1,373 @@
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+
+
+!
+! writes/reads dataset by hyperslabs
+!
+
+SUBROUTINE hyper(length,do_collective,do_chunk, mpi_size, mpi_rank, nerrors)
+  USE HDF5
+  USE MPI
+  USE TH5_MISC
+
+  IMPLICIT NONE
+
+  INTEGER, INTENT(in) :: length                     ! array length
+  LOGICAL, INTENT(in) :: do_collective              ! use collective I/O
+  LOGICAL, INTENT(in) :: do_chunk                   ! use chunking
+  INTEGER, INTENT(in) :: mpi_size                   ! number of processes in the group of communicator
+  INTEGER, INTENT(in) :: mpi_rank                   ! rank of the calling process in the communicator
+  INTEGER, INTENT(inout) :: nerrors                 ! number of errors
+  INTEGER :: hdferror                               ! HDF hdferror flag
+  INTEGER(hsize_t), DIMENSION(1) :: dims            ! dataset dimensions
+  INTEGER(hsize_t), DIMENSION(1) :: cdims           ! chunk dimensions
+  INTEGER, ALLOCATABLE :: wbuf(:)                   ! write buffer
+  INTEGER, ALLOCATABLE :: rbuf(:)                   ! read buffer
+  INTEGER(hsize_t), DIMENSION(1) :: counti          ! hyperslab selection
+  INTEGER(hsize_t), DIMENSION(1) :: start           ! hyperslab selection
+  INTEGER(hid_t) :: fapl_id                         ! file access identifier
+  INTEGER(hid_t) :: dxpl_id                         ! dataset transfer property list
+  INTEGER(hid_t) :: dcpl_id                         ! dataset creation property list
+  INTEGER(hid_t) :: file_id                         ! file identifier
+  INTEGER(hid_t) :: dset_id                         ! dataset identifier
+  INTEGER(hid_t) :: fspace_id                       ! file space identifier
+  INTEGER(hid_t) :: mspace_id                       ! memory space identifier
+  INTEGER(hid_t) :: driver_id                       ! low-level file driver identifier
+  INTEGER        :: istart                          ! start position in array
+  INTEGER        :: iend                            ! end position in array
+  INTEGER        :: icount                          ! number of elements in array
+  CHARACTER(len=80) :: filename                     ! filename
+  INTEGER        :: i
+  INTEGER        :: actual_io_mode                  ! The type of I/O performed by this process
+  LOGICAL        :: is_coll
+  LOGICAL        :: is_coll_true = .TRUE.
+  !
+  ! initialize the array data between the processes (3)
+  ! for the 12 size array we get
+  ! p0 = 1,2,3,4
+  ! p1 = 5,6,7,8
+  ! p2 = 9,10,11,12
+  !
+
+  ALLOCATE(wbuf(0:length-1),stat=hdferror)
+  IF (hdferror /= 0) THEN
+     WRITE(*,*) 'allocate error'
+     RETURN
+  ENDIF
+
+  ALLOCATE(rbuf(0:length-1),stat=hdferror)
+  IF (hdferror /= 0) THEN
+     WRITE(*,*) 'allocate error'
+     RETURN
+  ENDIF
+
+  icount  = length/mpi_size     ! divide the array by the number of processes
+  istart  = mpi_rank*icount     ! start position
+  iend    = istart + icount     ! end position
+
+  DO i = istart, iend-1
+     wbuf(i) = i
+  ENDDO
+
+  !
+  ! HDF5 I/O
+  !
+
+  dims(1)  = length
+  cdims(1) = length/mpi_size     ! define chunks as the number of processes
+
+  !
+  ! setup file access property list with parallel I/O access
+  !
+  CALL h5pcreate_f(H5P_FILE_ACCESS_F, fapl_id, hdferror)
+  CALL check("h5pcreate_f", hdferror, nerrors)
+
+  CALL h5pset_fapl_mpio_f(fapl_id, MPI_COMM_WORLD, MPI_INFO_NULL, hdferror)
+  CALL check("h5pset_fapl_mpio_f", hdferror, nerrors)
+
+  CALL h5pget_driver_f(fapl_id, driver_id, hdferror)
+  CALL check("h5pget_driver_f", hdferror, nerrors)
+
+  IF( driver_id /= H5FD_MPIO_F) THEN
+     WRITE(*,*) "Wrong driver information returned"
+     nerrors = nerrors + 1
+  ENDIF
+
+  !
+  ! create the file collectively
+  !
+  CALL h5_fixname_f("parf1", filename, fapl_id, hdferror)
+
+  IF(do_collective)THEN
+     ! verify settings for file access properties
+
+     ! Collective metadata writes
+     CALL h5pget_coll_metadata_write_f(fapl_id, is_coll, hdferror)
+     CALL check("h5pget_coll_metadata_write_f", hdferror, nerrors)
+     IF(is_coll .NEQV. .FALSE.)THEN
+        PRINT*, "Incorrect property setting for coll metadata writes"
+        nerrors = nerrors + 1
+     ENDIF
+
+     ! Collective metadata read API calling requirement
+     CALL h5pget_all_coll_metadata_ops_f(fapl_id, is_coll, hdferror)
+     CALL check("h5pget_all_coll_metadata_ops_f", hdferror, nerrors)
+     IF(is_coll .NEQV. .FALSE.)THEN
+        PRINT*, "Incorrect property setting for coll metadata API calls requirement"
+        nerrors = nerrors + 1
+     ENDIF
+
+     ! Collective metadata writes
+     CALL h5pset_coll_metadata_write_f(fapl_id, .TRUE., hdferror)
+     CALL check("h5pset_coll_metadata_write_f", hdferror, nerrors)
+     ! Collective metadata READ API calling requirement
+     CALL h5pset_all_coll_metadata_ops_f(fapl_id, is_coll_true, hdferror)
+     CALL check("h5pset_all_coll_metadata_ops_f", hdferror, nerrors)
+
+     CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, hdferror, access_prp = fapl_id)
+     CALL check("h5fcreate_f", hdferror, nerrors)
+
+     ! close fapl and retrieve it from file
+     CALL h5pclose_f(fapl_id, hdferror)
+     CALL check("h5pclose_f", hdferror, nerrors)
+     CALL h5fget_access_plist_f(file_id, fapl_id, hdferror)
+     CALL check("h5fget_access_plist_f", hdferror, nerrors)
+
+     ! verify settings for file access properties
+
+     ! Collective metadata writes
+     CALL h5pget_coll_metadata_write_f(fapl_id, is_coll, hdferror)
+     CALL check("h5pget_coll_metadata_write_f", hdferror, nerrors)
+     IF(is_coll .NEQV. .TRUE.)THEN
+        PRINT*, "Incorrect property setting for coll metadata writes"
+        nerrors = nerrors + 1
+     ENDIF
+
+     ! Collective metadata read API calling requirement
+     CALL h5pget_all_coll_metadata_ops_f(fapl_id, is_coll, hdferror)
+     CALL check("h5pget_all_coll_metadata_ops_f", hdferror, nerrors)
+     IF(is_coll .NEQV. .TRUE.)THEN
+        PRINT*, "Incorrect property setting for coll metadata API calls requirement"
+        nerrors = nerrors + 1
+     ENDIF
+  ELSE
+     CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, hdferror, access_prp = fapl_id)
+     CALL check("h5fcreate_f", hdferror, nerrors)
+  ENDIF
+
+  CALL h5screate_simple_f(1, dims, fspace_id, hdferror)
+  CALL check("h5screate_simple_f", hdferror, nerrors)
+
+  CALL h5screate_simple_f(1, dims, mspace_id, hdferror)
+  CALL check("h5screate_simple_f", hdferror, nerrors)
+
+  !
+  ! modify dataset creation properties to enable chunking
+  !
+
+  CALL h5pcreate_f(H5P_DATASET_CREATE_F, dcpl_id, hdferror)
+  CALL check("h5pcreate_f", hdferror, nerrors)
+
+  IF (do_chunk) THEN
+     CALL h5pset_chunk_f(dcpl_id, 1, cdims, hdferror)
+     CALL check("h5pset_chunk_f", hdferror, nerrors)
+  ENDIF
+
+  !
+  ! create the dataset
+  !
+
+  CALL h5dcreate_f(file_id, "dset", H5T_NATIVE_INTEGER, fspace_id, dset_id, hdferror, dcpl_id)
+  CALL check("h5dcreate_f", hdferror, nerrors)
+
+  !
+  ! define hyperslab
+  !
+
+  counti(1) = icount
+  start(1)  = istart
+
+  !
+  ! select hyperslab in memory
+  !
+
+  CALL h5sselect_hyperslab_f(mspace_id, H5S_SELECT_SET_F, start, counti, hdferror)
+  CALL check("h5sselect_hyperslab_f", hdferror, nerrors)
+
+  !
+  ! select hyperslab in the file
+  !
+
+  CALL h5sselect_hyperslab_f(fspace_id, H5S_SELECT_SET_F, start, counti, hdferror)
+  CALL check("h5sselect_hyperslab_f", hdferror, nerrors)
+
+
+  !
+  ! create a property list for collective dataset write
+  !
+
+  CALL h5pcreate_f(H5P_DATASET_XFER_F, dxpl_id, hdferror)
+  CALL check("h5pcreate_f", hdferror, nerrors)
+
+  IF (do_collective) THEN
+     CALL h5pset_dxpl_mpio_f(dxpl_id, H5FD_MPIO_COLLECTIVE_F, hdferror)
+     CALL check("h5pset_dxpl_mpio_f", hdferror, nerrors)
+  ENDIF
+
+  !
+  ! write dataset
+  !
+
+  CALL h5dwrite_f(dset_id,H5T_NATIVE_INTEGER,wbuf,dims,hdferror,file_space_id=fspace_id,mem_space_id=mspace_id,xfer_prp=dxpl_id)
+  CALL check("h5dwrite_f", hdferror, nerrors)
+
+
+  ! Check h5pget_mpio_actual_io_mode_f function
+  CALL h5pget_mpio_actual_io_mode_f(dxpl_id, actual_io_mode, hdferror)
+  CALL check("h5pget_mpio_actual_io_mode_f", hdferror, nerrors)
+
+! MSB -- TODO FIX: skipping for now since multi-dataset
+!        has no specific  path for contiguous collective
+! 
+!  IF(do_collective.AND.do_chunk)THEN
+!     IF(actual_io_mode.NE.H5D_MPIO_CHUNK_COLLECTIVE_F)THEN
+!       CALL check("h5pget_mpio_actual_io_mode_f", -1, nerrors)
+!     ENDIF
+!  ELSEIF(.NOT.do_collective)THEN
+!     IF(actual_io_mode.NE.H5D_MPIO_NO_COLLECTIVE_F)THEN
+!        CALL check("h5pget_mpio_actual_io_mode_f", -1, nerrors)
+!     ENDIF
+!  ELSEIF( do_collective.AND.(.NOT.do_chunk))THEN
+!     IF(actual_io_mode.NE.H5D_MPIO_CONTIG_COLLECTIVE_F)THEN
+!        CALL check("h5pget_mpio_actual_io_mode_f", -1, nerrors)
+!     ENDIF
+!  ENDIF
+! MSB
+
+  !
+  ! close HDF5 I/O
+  !
+
+  CALL h5pclose_f(fapl_id, hdferror)
+  CALL check("h5pclose_f", hdferror, nerrors)
+
+  CALL h5pclose_f(dcpl_id, hdferror)
+  CALL check("h5pclose_f", hdferror, nerrors)
+
+  CALL h5pclose_f(dxpl_id, hdferror)
+  CALL check("h5pclose_f", hdferror, nerrors)
+
+  CALL h5sclose_f(mspace_id, hdferror)
+  CALL check("h5sclose_f", hdferror, nerrors)
+
+  CALL h5sclose_f(fspace_id, hdferror)
+  CALL check("h5sclose_f", hdferror, nerrors)
+
+  CALL h5dclose_f(dset_id, hdferror)
+  CALL check("h5dclose_f", hdferror, nerrors)
+
+  CALL h5fclose_f(file_id, hdferror)
+  CALL check("h5fclose_f", hdferror, nerrors)
+
+  !
+  ! reopen file with read access
+  !
+
+  CALL h5pcreate_f(H5P_FILE_ACCESS_F, fapl_id, hdferror)
+  CALL check("h5pcreate_f", hdferror, nerrors)
+
+  CALL h5pset_fapl_mpio_f(fapl_id, MPI_COMM_WORLD, MPI_INFO_NULL, hdferror)
+  CALL check("h5pset_fapl_mpio_f", hdferror, nerrors)
+
+  CALL h5fopen_f(filename, H5F_ACC_RDWR_F, file_id, hdferror, access_prp = fapl_id)
+  CALL check("h5fopen_f", hdferror, nerrors)
+
+  CALL h5screate_simple_f(1, dims, fspace_id, hdferror)
+  CALL check("h5screate_simple_f", hdferror, nerrors)
+
+  CALL h5screate_simple_f(1, dims, mspace_id, hdferror)
+  CALL check(" h5screate_simple_f", hdferror, nerrors)
+
+  CALL h5dopen_f(file_id, "dset", dset_id, hdferror)
+  CALL check("h5dopen_f", hdferror, nerrors)
+
+  !
+  ! select hyperslab in memory
+  !
+
+  CALL h5sselect_hyperslab_f(mspace_id, H5S_SELECT_SET_F, start, counti, hdferror)
+  CALL check("h5sselect_hyperslab_f", hdferror, nerrors)
+
+  !
+  ! select hyperslab in the file
+  !
+
+  CALL h5sselect_hyperslab_f(fspace_id, H5S_SELECT_SET_F, start, counti, hdferror)
+  CALL check("h5sselect_hyperslab_f", hdferror, nerrors)
+
+  !
+  ! create a property list for collective dataset read
+  !
+
+  CALL h5pcreate_f(H5P_DATASET_XFER_F, dxpl_id, hdferror)
+  CALL check("h5pcreate_f", hdferror, nerrors)
+  IF (do_collective) THEN
+     CALL h5pset_dxpl_mpio_f(dxpl_id, H5FD_MPIO_COLLECTIVE_F, hdferror)
+     CALL check("h5pset_dxpl_mpio_f", hdferror, nerrors)
+  ENDIF
+
+  !
+  ! read dataset
+  !
+
+  CALL h5dread_f(dset_id,H5T_NATIVE_INTEGER,rbuf,dims,hdferror,file_space_id=fspace_id,mem_space_id=mspace_id,xfer_prp=dxpl_id)
+  CALL check("h5dread_f", hdferror, nerrors)
+
+  !
+  ! close HDF5 I/O
+  !
+
+  CALL h5pclose_f(fapl_id, hdferror)
+  CALL check("h5pclose_f", hdferror, nerrors)
+
+  CALL h5pclose_f(dxpl_id, hdferror)
+  CALL check("h5pclose_f", hdferror, nerrors)
+
+  CALL h5sclose_f(fspace_id, hdferror)
+  CALL check("h5sclose_f", hdferror, nerrors)
+
+  CALL h5sclose_f(mspace_id, hdferror)
+  CALL check("h5sclose_f", hdferror, nerrors)
+
+  CALL h5dclose_f(dset_id, hdferror)
+  CALL check("h5dclose_f", hdferror, nerrors)
+
+  CALL h5fclose_f(file_id, hdferror)
+  CALL check("h5fclose_f", hdferror, nerrors)
+
+  !
+  ! compare read and write data. each process compares a subset of the array
+  !
+
+  DO i = istart, iend-1
+     IF( wbuf(i) /= rbuf(i)) THEN
+        WRITE(*,*) 'buffers differs at ', i, rbuf(i), wbuf(i)
+        nerrors = nerrors + 1
+     ENDIF
+  ENDDO
+
+  DEALLOCATE(wbuf)
+  DEALLOCATE(rbuf)
+
+END SUBROUTINE hyper
+
diff --git a/fortran/testpar/hyper.f90 b/fortran/testpar/hyper.f90
deleted file mode 100644
index a2e2e07..0000000
--- a/fortran/testpar/hyper.f90
+++ /dev/null
@@ -1,320 +0,0 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-
-
-!//////////////////////////////////////////////////////////
-! writes/reads dataset by hyperslabs
-!//////////////////////////////////////////////////////////
-
-SUBROUTINE hyper(length,do_collective,do_chunk, mpi_size, mpi_rank, nerrors)
-  USE HDF5
-  USE TH5_MISC
-  IMPLICIT NONE
-  INCLUDE 'mpif.h'
-
-  INTEGER, INTENT(in) :: length                     ! array length
-  LOGICAL, INTENT(in) :: do_collective              ! use collective I/O
-  LOGICAL, INTENT(in) :: do_chunk                   ! use chunking
-  INTEGER, INTENT(in) :: mpi_size                   ! number of processes in the group of communicator
-  INTEGER, INTENT(in) :: mpi_rank                   ! rank of the calling process in the communicator
-  INTEGER, INTENT(inout) :: nerrors                 ! number of errors
-  INTEGER :: mpierror                               ! MPI hdferror flag
-  INTEGER :: hdferror                               ! HDF hdferror flag
-  INTEGER(hsize_t), DIMENSION(1) :: dims            ! dataset dimensions
-  INTEGER(hsize_t), DIMENSION(1) :: cdims           ! chunk dimensions
-  INTEGER, ALLOCATABLE :: wbuf(:)                   ! write buffer
-  INTEGER, ALLOCATABLE :: rbuf(:)                   ! read buffer
-  INTEGER(hsize_t), DIMENSION(1) :: counti          ! hyperslab selection
-  INTEGER(hsize_t), DIMENSION(1) :: start           ! hyperslab selection
-  INTEGER(hid_t) :: fapl_id                         ! file access identifier
-  INTEGER(hid_t) :: dxpl_id                         ! dataset transfer property list
-  INTEGER(hid_t) :: dcpl_id                         ! dataset creation property list
-  INTEGER(hid_t) :: file_id                         ! file identifier
-  INTEGER(hid_t) :: dset_id                         ! dataset identifier
-  INTEGER(hid_t) :: fspace_id                       ! file space identifier
-  INTEGER(hid_t) :: mspace_id                       ! memory space identifier
-  INTEGER(hid_t) :: driver_id                       ! low-level file driver identifier
-  INTEGER        :: istart                          ! start position in array
-  INTEGER        :: iend                            ! end position in array
-  INTEGER        :: icount                          ! number of elements in array
-  CHARACTER(len=80) :: filename                     ! filename
-  INTEGER        :: i
-  INTEGER        :: actual_io_mode                  ! The type of I/O performed by this process
-
-  !//////////////////////////////////////////////////////////
-  ! initialize the array data between the processes (3)
-  ! for the 12 size array we get
-  ! p0 = 1,2,3,4
-  ! p1 = 5,6,7,8
-  ! p2 = 9,10,11,12
-  !//////////////////////////////////////////////////////////
-
-  ALLOCATE(wbuf(0:length-1),stat=hdferror)
-  IF (hdferror /= 0) THEN
-     WRITE(*,*) 'allocate error'
-     RETURN
-  ENDIF
-
-  ALLOCATE(rbuf(0:length-1),stat=hdferror)
-  IF (hdferror /= 0) THEN
-     WRITE(*,*) 'allocate error'
-     RETURN
-  ENDIF
-
-  icount  = length/mpi_size     ! divide the array by the number of processes
-  istart  = mpi_rank*icount     ! start position
-  iend    = istart + icount     ! end position
-
-  DO i = istart, iend-1
-     wbuf(i) = i
-  ENDDO
-
-  !//////////////////////////////////////////////////////////
-  ! HDF5 I/O
-  !//////////////////////////////////////////////////////////
-
-  dims(1)  = length
-  cdims(1) = length/mpi_size     ! define chunks as the number of processes
-
-  !//////////////////////////////////////////////////////////
-  ! setup file access property list with parallel I/O access
-  !//////////////////////////////////////////////////////////
-
-  CALL h5pcreate_f(H5P_FILE_ACCESS_F, fapl_id, hdferror)
-  CALL check("h5pcreate_f", hdferror, nerrors)
-
-  CALL h5pset_fapl_mpio_f(fapl_id, MPI_COMM_WORLD, MPI_INFO_NULL, hdferror)
-  CALL check("h5pset_fapl_mpio_f", hdferror, nerrors)
-
-  CALL h5pget_driver_f(fapl_id, driver_id, hdferror)
-  CALL check("h5pget_driver_f", hdferror, nerrors)
-
-  IF( driver_id /= H5FD_MPIO_F) THEN
-     WRITE(*,*) "Wrong driver information returned"
-     nerrors = nerrors + 1
-  ENDIF
-
-  !//////////////////////////////////////////////////////////
-  ! create the file collectively
-  !//////////////////////////////////////////////////////////
-
-  CALL h5_fixname_f("parf1", filename, fapl_id, hdferror)
-
-  CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, hdferror, access_prp = fapl_id)
-  CALL check("h5fcreate_f", hdferror, nerrors)
-
-  CALL h5screate_simple_f(1, dims, fspace_id, hdferror)
-  CALL check("h5screate_simple_f", hdferror, nerrors)
-
-  CALL h5screate_simple_f(1, dims, mspace_id, hdferror)
-  CALL check("h5screate_simple_f", hdferror, nerrors)
-
-  !//////////////////////////////////////////////////////////
-  ! modify dataset creation properties to enable chunking
-  !//////////////////////////////////////////////////////////
-
-  CALL h5pcreate_f(H5P_DATASET_CREATE_F, dcpl_id, hdferror)
-  CALL check("h5pcreate_f", hdferror, nerrors)
-
-  IF (do_chunk) THEN
-     CALL h5pset_chunk_f(dcpl_id, 1, cdims, hdferror)
-     CALL check("h5pset_chunk_f", hdferror, nerrors)
-  ENDIF
-
-  !//////////////////////////////////////////////////////////
-  ! create the dataset
-  !//////////////////////////////////////////////////////////
-
-  CALL h5dcreate_f(file_id, "dset", H5T_NATIVE_INTEGER, fspace_id, dset_id, hdferror, dcpl_id)
-  CALL check("h5dcreate_f", hdferror, nerrors)
-
-  !//////////////////////////////////////////////////////////
-  ! define hyperslab
-  !//////////////////////////////////////////////////////////
-
-  counti(1) = icount
-  start(1)  = istart
-
-  !//////////////////////////////////////////////////////////
-  ! select hyperslab in memory
-  !//////////////////////////////////////////////////////////
-
-  CALL h5sselect_hyperslab_f(mspace_id, H5S_SELECT_SET_F, start, counti, hdferror)
-  CALL check("h5sselect_hyperslab_f", hdferror, nerrors)
-
-  !//////////////////////////////////////////////////////////
-  ! select hyperslab in the file
-  !//////////////////////////////////////////////////////////
-
-  CALL h5sselect_hyperslab_f(fspace_id, H5S_SELECT_SET_F, start, counti, hdferror)
-  CALL check("h5sselect_hyperslab_f", hdferror, nerrors)
-
-
-  !//////////////////////////////////////////////////////////
-  ! create a property list for collective dataset write
-  !//////////////////////////////////////////////////////////
-
-  CALL h5pcreate_f(H5P_DATASET_XFER_F, dxpl_id, hdferror)
-  CALL check("h5pcreate_f", hdferror, nerrors)
-
-  IF (do_collective) THEN
-     CALL h5pset_dxpl_mpio_f(dxpl_id, H5FD_MPIO_COLLECTIVE_F, hdferror)
-     CALL check("h5pset_dxpl_mpio_f", hdferror, nerrors)
-  ENDIF
-
-  !//////////////////////////////////////////////////////////
-  ! write dataset
-  !//////////////////////////////////////////////////////////
-
-  CALL h5dwrite_f(dset_id,H5T_NATIVE_INTEGER,wbuf,dims,hdferror,file_space_id=fspace_id,mem_space_id=mspace_id,xfer_prp=dxpl_id)
-  CALL check("h5dwrite_f", hdferror, nerrors)
-
-
-  ! Check h5pget_mpio_actual_io_mode_f function
-  CALL h5pget_mpio_actual_io_mode_f(dxpl_id, actual_io_mode, hdferror)
-  CALL check("h5pget_mpio_actual_io_mode_f", hdferror, nerrors)
-
-  IF(do_collective.AND.do_chunk)THEN
-     IF(actual_io_mode.NE.H5D_MPIO_CHUNK_COLLECTIVE_F)THEN
-        CALL check("h5pget_mpio_actual_io_mode_f", -1, nerrors)
-     ENDIF
-  ELSEIF(.NOT.do_collective)THEN
-     IF(actual_io_mode.NE.H5D_MPIO_NO_COLLECTIVE_F)THEN
-        CALL check("h5pget_mpio_actual_io_mode_f", -1, nerrors)
-     ENDIF
-  ELSEIF( do_collective.AND.(.NOT.do_chunk))THEN
-     IF(actual_io_mode.NE.H5D_MPIO_CONTIG_COLLECTIVE_F)THEN
-        CALL check("h5pget_mpio_actual_io_mode_f", -1, nerrors)
-     ENDIF
-  ENDIF
-
-  !//////////////////////////////////////////////////////////
-  ! close HDF5 I/O
-  !//////////////////////////////////////////////////////////
-
-  CALL h5pclose_f(fapl_id, hdferror)
-  CALL check("h5pclose_f", hdferror, nerrors)
-
-  CALL h5pclose_f(dcpl_id, hdferror)
-  CALL check("h5pclose_f", hdferror, nerrors)
-
-  CALL h5pclose_f(dxpl_id, hdferror)
-  CALL check("h5pclose_f", hdferror, nerrors)
-
-  CALL h5sclose_f(mspace_id, hdferror)
-  CALL check("h5sclose_f", hdferror, nerrors)
-
-  CALL h5sclose_f(fspace_id, hdferror)
-  CALL check("h5sclose_f", hdferror, nerrors)
-
-  CALL h5dclose_f(dset_id, hdferror)
-  CALL check("h5dclose_f", hdferror, nerrors)
-
-  CALL h5fclose_f(file_id, hdferror)
-  CALL check("h5fclose_f", hdferror, nerrors)
-
-  !//////////////////////////////////////////////////////////
-  ! reopen file with read access
-  !//////////////////////////////////////////////////////////
-
-  CALL h5pcreate_f(H5P_FILE_ACCESS_F, fapl_id, hdferror)
-  CALL check("h5pcreate_f", hdferror, nerrors)
-
-  CALL h5pset_fapl_mpio_f(fapl_id, MPI_COMM_WORLD, MPI_INFO_NULL, hdferror)
-  CALL check("h5pcreate_f", hdferror, nerrors)
-
-  CALL h5fopen_f(filename, H5F_ACC_RDWR_F, file_id, hdferror, access_prp = fapl_id)
-  CALL check("h5pcreate_f", hdferror, nerrors)
-
-  CALL h5screate_simple_f(1, dims, fspace_id, hdferror)
-  CALL check("h5pcreate_f", hdferror, nerrors)
-
-  CALL h5screate_simple_f(1, dims, mspace_id, hdferror)
-  CALL check("h5pcreate_f", hdferror, nerrors)
-
-  CALL h5dopen_f(file_id, "dset", dset_id, hdferror)
-  CALL check("h5pcreate_f", hdferror, nerrors)
-
-  !//////////////////////////////////////////////////////////
-  ! select hyperslab in memory
-  !//////////////////////////////////////////////////////////
-
-  CALL h5sselect_hyperslab_f(mspace_id, H5S_SELECT_SET_F, start, counti, hdferror)
-  CALL check("h5pcreate_f", hdferror, nerrors)
-
-  !//////////////////////////////////////////////////////////
-  ! select hyperslab in the file
-  !//////////////////////////////////////////////////////////
-
-  CALL h5sselect_hyperslab_f(fspace_id, H5S_SELECT_SET_F, start, counti, hdferror)
-  CALL check("h5pcreate_f", hdferror, nerrors)
-
-  !//////////////////////////////////////////////////////////
-  ! create a property list for collective dataset read
-  !//////////////////////////////////////////////////////////
-
-  CALL h5pcreate_f(H5P_DATASET_XFER_F, dxpl_id, hdferror)
-  CALL check("h5pcreate_f", hdferror, nerrors)
-
-  IF (do_collective) THEN
-     CALL h5pset_dxpl_mpio_f(dxpl_id, H5FD_MPIO_COLLECTIVE_F, hdferror)
-     CALL check("h5pcreate_f", hdferror, nerrors)
-  ENDIF
-
-  !//////////////////////////////////////////////////////////
-  ! read dataset
-  !//////////////////////////////////////////////////////////
-
-  CALL h5dread_f(dset_id,H5T_NATIVE_INTEGER,rbuf,dims,hdferror,file_space_id=fspace_id,mem_space_id=mspace_id,xfer_prp=dxpl_id)
-  CALL check("h5pcreate_f", hdferror, nerrors)
-
-  !//////////////////////////////////////////////////////////
-  ! close HDF5 I/O
-  !//////////////////////////////////////////////////////////
-
-  CALL h5pclose_f(fapl_id, hdferror)
-  CALL check("h5pcreate_f", hdferror, nerrors)
-
-  CALL h5pclose_f(dxpl_id, hdferror)
-  CALL check("h5pcreate_f", hdferror, nerrors)
-
-  CALL h5sclose_f(fspace_id, hdferror)
-  CALL check("h5pcreate_f", hdferror, nerrors)
-
-  CALL h5sclose_f(mspace_id, hdferror)
-  CALL check("h5pcreate_f", hdferror, nerrors)
-
-  CALL h5dclose_f(dset_id, hdferror)
-  CALL check("h5pcreate_f", hdferror, nerrors)
-
-  CALL h5fclose_f(file_id, hdferror)
-  CALL check("h5pcreate_f", hdferror, nerrors)
-
-  !//////////////////////////////////////////////////////////
-  ! compare read and write data. each process compares a subset of the array
-  !//////////////////////////////////////////////////////////
-
-  DO i = istart, iend-1
-     IF( wbuf(i) /= rbuf(i)) THEN
-        WRITE(*,*) 'buffers differs at ', i, rbuf(i), wbuf(i)
-        nerrors = nerrors + 1
-     ENDIF
-  ENDDO
-
-  DEALLOCATE(wbuf)
-  DEALLOCATE(rbuf)
-
-END SUBROUTINE hyper
-
diff --git a/fortran/testpar/mdset.F90 b/fortran/testpar/mdset.F90
new file mode 100644
index 0000000..6757f4d
--- /dev/null
+++ b/fortran/testpar/mdset.F90
@@ -0,0 +1,315 @@
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+
+
+!//////////////////////////////////////////////////////////
+! writes/reads dataset by hyperslabs
+!//////////////////////////////////////////////////////////
+
+SUBROUTINE multiple_dset_write(length, do_collective, do_chunk, mpi_size, mpi_rank, nerrors)
+  USE HDF5
+  USE MPI
+  USE TH5_MISC
+
+  IMPLICIT NONE
+
+  INTEGER, INTENT(in) :: length                     ! array length
+  LOGICAL, INTENT(in) :: do_collective              ! use collective I/O
+  LOGICAL, INTENT(in) :: do_chunk                   ! use chunking
+  INTEGER, INTENT(in) :: mpi_size                   ! number of processes in the group of communicator
+  INTEGER, INTENT(in) :: mpi_rank                   ! rank of the calling process in the communicator
+  INTEGER, INTENT(inout) :: nerrors                 ! number of errors
+  INTEGER :: hdferror                               ! HDF hdferror flag
+  INTEGER(hsize_t), DIMENSION(1) :: dims            ! dataset dimensions
+  INTEGER(hsize_t), DIMENSION(1) :: cdims           ! chunk dimensions
+  INTEGER, ALLOCATABLE :: wbuf(:)                   ! write buffer
+  INTEGER, ALLOCATABLE :: rbuf(:)                   ! read buffer
+  INTEGER(hsize_t), DIMENSION(1) :: counti          ! hyperslab selection
+  INTEGER(hsize_t), DIMENSION(1) :: start           ! hyperslab selection
+  INTEGER(hid_t) :: fapl_id                         ! file access identifier
+  INTEGER(hid_t) :: dxpl_id                         ! dataset transfer property list
+  INTEGER(hid_t) :: dcpl_id                         ! dataset creation property list
+  INTEGER(hid_t) :: file_id                         ! file identifier
+  INTEGER(hid_t) :: dset_id                         ! dataset identifier
+  INTEGER(hid_t) :: fspace_id                       ! file space identifier
+  INTEGER(hid_t) :: mspace_id                       ! memory space identifier
+  INTEGER(hid_t) :: driver_id                       ! low-level file driver identifier
+  INTEGER        :: istart                          ! start position in array
+  INTEGER        :: iend                            ! end position in array
+  INTEGER        :: icount                          ! number of elements in array
+  CHARACTER(len=80) :: filename                     ! filename
+  CHARACTER(len=80) :: dsetname                     ! dataset name
+  INTEGER        :: n, i
+
+  !//////////////////////////////////////////////////////////
+  ! initialize the array data between the processes (3)
+  ! for the 12 size array we get
+  ! p0 = 1,2,3,4
+  ! p1 = 5,6,7,8
+  ! p2 = 9,10,11,12
+  !//////////////////////////////////////////////////////////
+
+  ALLOCATE(wbuf(0:length-1),stat=hdferror)
+  IF (hdferror /= 0) THEN
+     WRITE(*,*) 'allocate error'
+     RETURN
+  ENDIF
+
+  ALLOCATE(rbuf(0:length-1),stat=hdferror)
+  IF (hdferror /= 0) THEN
+     WRITE(*,*) 'allocate error'
+     RETURN
+  ENDIF
+
+  icount  = length/mpi_size     ! divide the array by the number of processes
+  istart  = mpi_rank*icount     ! start position
+  iend    = istart + icount     ! end position
+
+  !//////////////////////////////////////////////////////////
+  ! HDF5 I/O
+  !//////////////////////////////////////////////////////////
+
+  dims(1)  = length
+  cdims(1) = length/mpi_size     ! define chunks as the number of processes
+
+  !//////////////////////////////////////////////////////////
+  ! setup file access property list with parallel I/O access
+  !//////////////////////////////////////////////////////////
+
+  CALL h5pcreate_f(H5P_FILE_ACCESS_F, fapl_id, hdferror)
+  CALL check("h5pcreate_f", hdferror, nerrors)
+
+  CALL h5pset_fapl_mpio_f(fapl_id, MPI_COMM_WORLD, MPI_INFO_NULL, hdferror)
+  CALL check("h5pset_fapl_mpio_f", hdferror, nerrors)
+
+  CALL h5pget_driver_f(fapl_id, driver_id, hdferror)
+  CALL check("h5pget_driver_f", hdferror, nerrors)
+
+  IF( driver_id /= H5FD_MPIO_F) THEN
+     WRITE(*,*) "Wrong driver information returned"
+     nerrors = nerrors + 1
+  ENDIF
+
+  !//////////////////////////////////////////////////////////
+  ! create the file collectively
+  !//////////////////////////////////////////////////////////
+
+  CALL h5_fixname_f("parf2", filename, fapl_id, hdferror)
+
+  CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, hdferror, access_prp = fapl_id)
+  CALL check("h5fcreate_f", hdferror, nerrors)
+
+  CALL h5screate_simple_f(1, dims, fspace_id, hdferror)
+  CALL check("h5screate_simple_f", hdferror, nerrors)
+
+  CALL h5screate_simple_f(1, dims, mspace_id, hdferror)
+  CALL check("h5screate_simple_f", hdferror, nerrors)
+
+  !//////////////////////////////////////////////////////////
+  ! modify dataset creation properties to enable chunking
+  !//////////////////////////////////////////////////////////
+
+  CALL h5pcreate_f(H5P_DATASET_CREATE_F, dcpl_id, hdferror)
+  CALL check("h5pcreate_f", hdferror, nerrors)
+
+  IF (do_chunk) THEN
+     CALL h5pset_chunk_f(dcpl_id, 1, cdims, hdferror)
+     CALL check("h5pset_chunk_f", hdferror, nerrors)
+  ENDIF
+
+  !//////////////////////////////////////////////////////////
+  ! create a property list for collective dataset write
+  !//////////////////////////////////////////////////////////
+
+  CALL h5pcreate_f(H5P_DATASET_XFER_F, dxpl_id, hdferror)
+  CALL check("h5pcreate_f", hdferror, nerrors)
+
+  IF (do_collective) THEN
+     CALL h5pset_dxpl_mpio_f(dxpl_id, H5FD_MPIO_COLLECTIVE_F, hdferror)
+     CALL check("h5pset_dxpl_mpio_f", hdferror, nerrors)
+  ENDIF
+
+  !//////////////////////////////////////////////////////////
+  ! define hyperslab
+  !//////////////////////////////////////////////////////////
+
+  counti(1) = icount
+  start(1)  = istart
+
+  !//////////////////////////////////////////////////////////
+  ! select hyperslab in memory
+  !//////////////////////////////////////////////////////////
+
+  CALL h5sselect_hyperslab_f(mspace_id, H5S_SELECT_SET_F, start, counti, hdferror)
+  CALL check("h5sselect_hyperslab_f", hdferror, nerrors)
+
+  !//////////////////////////////////////////////////////////
+  ! select hyperslab in the file
+  !//////////////////////////////////////////////////////////
+
+  CALL h5sselect_hyperslab_f(fspace_id, H5S_SELECT_SET_F, start, counti, hdferror)
+  CALL check("h5sselect_hyperslab_f", hdferror, nerrors)
+
+  !//////////////////////////////////////////////////////////
+  ! create and write the datasets
+  !//////////////////////////////////////////////////////////
+
+  DO n = 1, 300
+
+     ! direct the output of the write statement to unit "dsetname"
+     WRITE(dsetname,*) 'dataset', n
+
+     ! create this dataset
+     CALL h5dcreate_f(file_id, dsetname, H5T_NATIVE_INTEGER, fspace_id, dset_id, hdferror, dcpl_id)
+     CALL check("h5dcreate_f", hdferror, nerrors)
+
+     DO i = istart, iend-1
+        wbuf(i) = n + mpi_rank
+     ENDDO
+
+     ! write this dataset
+     CALL h5dwrite_f(dset_id,H5T_NATIVE_INTEGER,wbuf,dims,hdferror,file_space_id=fspace_id,mem_space_id=mspace_id,xfer_prp=dxpl_id)
+     CALL check("h5dwrite_f", hdferror, nerrors)
+
+     ! close this dataset
+     CALL h5dclose_f(dset_id, hdferror)
+     CALL check("h5dclose_f", hdferror, nerrors)
+
+  ENDDO
+
+  !//////////////////////////////////////////////////////////
+  ! close HDF5 I/O
+  !//////////////////////////////////////////////////////////
+
+  CALL h5pclose_f(fapl_id, hdferror)
+  CALL check("h5pclose_f", hdferror, nerrors)
+
+  CALL h5pclose_f(dcpl_id, hdferror)
+  CALL check("h5pclose_f", hdferror, nerrors)
+
+  CALL h5pclose_f(dxpl_id, hdferror)
+  CALL check("h5pclose_f", hdferror, nerrors)
+
+  CALL h5sclose_f(mspace_id, hdferror)
+  CALL check("h5sclose_f", hdferror, nerrors)
+
+  CALL h5sclose_f(fspace_id, hdferror)
+  CALL check("h5sclose_f", hdferror, nerrors)
+
+  CALL h5fclose_f(file_id, hdferror)
+  CALL check("h5fclose_f", hdferror, nerrors)
+
+  !//////////////////////////////////////////////////////////
+  ! reopen file with read access
+  !//////////////////////////////////////////////////////////
+
+  CALL h5pcreate_f(H5P_FILE_ACCESS_F, fapl_id, hdferror)
+  CALL check("h5pcreate_f", hdferror, nerrors)
+
+  CALL h5pset_fapl_mpio_f(fapl_id, MPI_COMM_WORLD, MPI_INFO_NULL, hdferror)
+  CALL check("h5pset_fapl_mpio_f", hdferror, nerrors)
+
+  CALL h5fopen_f(filename, H5F_ACC_RDWR_F, file_id, hdferror, access_prp = fapl_id)
+  CALL check("h5fopen_f", hdferror, nerrors)
+
+  CALL h5screate_simple_f(1, dims, fspace_id, hdferror)
+  CALL check("h5screate_simple_f", hdferror, nerrors)
+
+  CALL h5screate_simple_f(1, dims, mspace_id, hdferror)
+  CALL check("h5screate_simple_f", hdferror, nerrors)
+
+  !//////////////////////////////////////////////////////////
+  ! select hyperslab in memory
+  !//////////////////////////////////////////////////////////
+
+  CALL h5sselect_hyperslab_f(mspace_id, H5S_SELECT_SET_F, start, counti, hdferror)
+  CALL check("h5sselect_hyperslab_f", hdferror, nerrors)
+
+  !//////////////////////////////////////////////////////////
+  ! select hyperslab in the file
+  !//////////////////////////////////////////////////////////
+
+  CALL h5sselect_hyperslab_f(fspace_id, H5S_SELECT_SET_F, start, counti, hdferror)
+  CALL check("h5sselect_hyperslab_f", hdferror, nerrors)
+
+  !//////////////////////////////////////////////////////////
+  ! create a property list for collective dataset read
+  !//////////////////////////////////////////////////////////
+
+  CALL h5pcreate_f(H5P_DATASET_XFER_F, dxpl_id, hdferror)
+  CALL check("h5pcreate_f", hdferror, nerrors)
+
+  IF (do_collective) THEN
+     CALL h5pset_dxpl_mpio_f(dxpl_id, H5FD_MPIO_COLLECTIVE_F, hdferror)
+     CALL check("h5pset_dxpl_mpio_f", hdferror, nerrors)
+  ENDIF
+
+  !//////////////////////////////////////////////////////////
+  ! read dataset
+  !//////////////////////////////////////////////////////////
+
+  DO n = 1, 300
+
+     ! direct the output of the write statement to unit "dsetname"
+     WRITE(dsetname,*) 'dataset', n
+
+     ! create this dataset
+     CALL h5dopen_f(file_id, dsetname, dset_id, hdferror)
+     CALL check("h5dopen_f", hdferror, nerrors)
+
+     ! read this dataset
+     CALL h5dread_f(dset_id,H5T_NATIVE_INTEGER,rbuf,dims,hdferror,file_space_id=fspace_id,mem_space_id=mspace_id,xfer_prp=dxpl_id)
+     CALL check("h5dread_f", hdferror, nerrors)
+
+     ! close this dataset
+     CALL h5dclose_f(dset_id, hdferror)
+     CALL check("h5dclose_f", hdferror, nerrors)
+
+     DO i = istart, iend-1
+        wbuf(i) = n + mpi_rank
+     ENDDO
+
+     ! compare read and write data. each process compares a subset of the array
+     DO i = istart, iend-1
+        IF( wbuf(i) /= rbuf(i)) THEN
+           WRITE(*,*) 'buffers differs at ', i, rbuf(i), wbuf(i)
+           nerrors = nerrors + 1
+        ENDIF
+     ENDDO
+
+  ENDDO
+
+
+  !//////////////////////////////////////////////////////////
+  ! close HDF5 I/O
+  !//////////////////////////////////////////////////////////
+
+  CALL h5pclose_f(fapl_id, hdferror)
+  CALL check("h5pclose_f", hdferror, nerrors)
+
+  CALL h5pclose_f(dxpl_id, hdferror)
+  CALL check("h5pclose_f", hdferror, nerrors)
+
+  CALL h5sclose_f(fspace_id, hdferror)
+  CALL check("h5sclose_f", hdferror, nerrors)
+
+  CALL h5sclose_f(mspace_id, hdferror)
+  CALL check("h5sclose_f", hdferror, nerrors)
+
+  CALL h5fclose_f(file_id, hdferror)
+  CALL check("h5fclose_f", hdferror, nerrors)
+
+  DEALLOCATE(wbuf)
+  DEALLOCATE(rbuf)
+
+END SUBROUTINE multiple_dset_write
+
diff --git a/fortran/testpar/mdset.f90 b/fortran/testpar/mdset.f90
deleted file mode 100644
index 7fe431b..0000000
--- a/fortran/testpar/mdset.f90
+++ /dev/null
@@ -1,319 +0,0 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-
-
-!//////////////////////////////////////////////////////////
-! writes/reads dataset by hyperslabs
-!//////////////////////////////////////////////////////////
-
-SUBROUTINE multiple_dset_write(length, do_collective, do_chunk, mpi_size, mpi_rank, nerrors)
-  USE HDF5
-  USE TH5_MISC
-  IMPLICIT NONE
-  INCLUDE 'mpif.h'
-
-  INTEGER, INTENT(in) :: length                     ! array length
-  LOGICAL, INTENT(in) :: do_collective              ! use collective I/O
-  LOGICAL, INTENT(in) :: do_chunk                   ! use chunking
-  INTEGER, INTENT(in) :: mpi_size                   ! number of processes in the group of communicator
-  INTEGER, INTENT(in) :: mpi_rank                   ! rank of the calling process in the communicator
-  INTEGER, INTENT(inout) :: nerrors                 ! number of errors
-  INTEGER :: mpierror                               ! MPI hdferror flag
-  INTEGER :: hdferror                               ! HDF hdferror flag
-  INTEGER(hsize_t), DIMENSION(1) :: dims            ! dataset dimensions
-  INTEGER(hsize_t), DIMENSION(1) :: cdims           ! chunk dimensions
-  INTEGER, ALLOCATABLE :: wbuf(:)                   ! write buffer
-  INTEGER, ALLOCATABLE :: rbuf(:)                   ! read buffer
-  INTEGER(hsize_t), DIMENSION(1) :: counti          ! hyperslab selection
-  INTEGER(hsize_t), DIMENSION(1) :: start           ! hyperslab selection
-  INTEGER(hid_t) :: fapl_id                         ! file access identifier
-  INTEGER(hid_t) :: dxpl_id                         ! dataset transfer property list
-  INTEGER(hid_t) :: dcpl_id                         ! dataset creation property list
-  INTEGER(hid_t) :: file_id                         ! file identifier
-  INTEGER(hid_t) :: dset_id                         ! dataset identifier
-  INTEGER(hid_t) :: fspace_id                       ! file space identifier
-  INTEGER(hid_t) :: mspace_id                       ! memory space identifier
-  INTEGER(hid_t) :: driver_id                       ! low-level file driver identifier
-  INTEGER        :: istart                          ! start position in array
-  INTEGER        :: iend                            ! end position in array
-  INTEGER        :: icount                          ! number of elements in array
-  CHARACTER(len=80) :: filename                     ! filename
-  CHARACTER(len=80) :: dsetname                     ! dataset name
-  INTEGER        :: n, i
-
-  !//////////////////////////////////////////////////////////
-  ! initialize the array data between the processes (3)
-  ! for the 12 size array we get
-  ! p0 = 1,2,3,4
-  ! p1 = 5,6,7,8
-  ! p2 = 9,10,11,12
-  !//////////////////////////////////////////////////////////
-
-  ALLOCATE(wbuf(0:length-1),stat=hdferror)
-  IF (hdferror /= 0) THEN
-     WRITE(*,*) 'allocate error'
-     RETURN
-  ENDIF
-
-  ALLOCATE(rbuf(0:length-1),stat=hdferror)
-  IF (hdferror /= 0) THEN
-     WRITE(*,*) 'allocate error'
-     RETURN
-  ENDIF
-
-  icount  = length/mpi_size     ! divide the array by the number of processes
-  istart  = mpi_rank*icount     ! start position
-  iend    = istart + icount     ! end position
-
-  !//////////////////////////////////////////////////////////
-  ! HDF5 I/O
-  !//////////////////////////////////////////////////////////
-
-  dims(1)  = length
-  cdims(1) = length/mpi_size     ! define chunks as the number of processes
-
-  !//////////////////////////////////////////////////////////
-  ! setup file access property list with parallel I/O access
-  !//////////////////////////////////////////////////////////
-
-  CALL h5pcreate_f(H5P_FILE_ACCESS_F, fapl_id, hdferror)
-  CALL check("h5pcreate_f", hdferror, nerrors)
-
-  CALL h5pset_fapl_mpio_f(fapl_id, MPI_COMM_WORLD, MPI_INFO_NULL, hdferror)
-  CALL check("h5pset_fapl_mpio_f", hdferror, nerrors)
-
-  CALL h5pget_driver_f(fapl_id, driver_id, hdferror)
-  CALL check("h5pget_driver_f", hdferror, nerrors)
-
-  IF( driver_id /= H5FD_MPIO_F) THEN
-     WRITE(*,*) "Wrong driver information returned"
-     nerrors = nerrors + 1
-  ENDIF
-
-  !//////////////////////////////////////////////////////////
-  ! create the file collectively
-  !//////////////////////////////////////////////////////////
-
-  CALL h5_fixname_f("parf2", filename, fapl_id, hdferror)
-
-  CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, hdferror, access_prp = fapl_id)
-  CALL check("h5fcreate_f", hdferror, nerrors)
-
-  CALL h5screate_simple_f(1, dims, fspace_id, hdferror)
-  CALL check("h5screate_simple_f", hdferror, nerrors)
-
-  CALL h5screate_simple_f(1, dims, mspace_id, hdferror)
-  CALL check("h5screate_simple_f", hdferror, nerrors)
-
-  !//////////////////////////////////////////////////////////
-  ! modify dataset creation properties to enable chunking
-  !//////////////////////////////////////////////////////////
-
-  CALL h5pcreate_f(H5P_DATASET_CREATE_F, dcpl_id, hdferror)
-  CALL check("h5pcreate_f", hdferror, nerrors)
-
-  IF (do_chunk) THEN
-     CALL h5pset_chunk_f(dcpl_id, 1, cdims, hdferror)
-     CALL check("h5pset_chunk_f", hdferror, nerrors)
-  ENDIF
-
-  !//////////////////////////////////////////////////////////
-  ! create a property list for collective dataset write
-  !//////////////////////////////////////////////////////////
-
-  CALL h5pcreate_f(H5P_DATASET_XFER_F, dxpl_id, hdferror)
-  CALL check("h5pcreate_f", hdferror, nerrors)
-
-  IF (do_collective) THEN
-     CALL h5pset_dxpl_mpio_f(dxpl_id, H5FD_MPIO_COLLECTIVE_F, hdferror)
-     CALL check("h5pset_dxpl_mpio_f", hdferror, nerrors)
-  ENDIF
-
-  !//////////////////////////////////////////////////////////
-  ! define hyperslab
-  !//////////////////////////////////////////////////////////
-
-  counti(1) = icount
-  start(1)  = istart
-
-  !//////////////////////////////////////////////////////////
-  ! select hyperslab in memory
-  !//////////////////////////////////////////////////////////
-
-  CALL h5sselect_hyperslab_f(mspace_id, H5S_SELECT_SET_F, start, counti, hdferror)
-  CALL check("h5sselect_hyperslab_f", hdferror, nerrors)
-
-  !//////////////////////////////////////////////////////////
-  ! select hyperslab in the file
-  !//////////////////////////////////////////////////////////
-
-  CALL h5sselect_hyperslab_f(fspace_id, H5S_SELECT_SET_F, start, counti, hdferror)
-  CALL check("h5sselect_hyperslab_f", hdferror, nerrors)
-
-  !//////////////////////////////////////////////////////////
-  ! create and write the datasets
-  !//////////////////////////////////////////////////////////
-
-  DO n = 1, 300
-
-     ! direct the output of the write statement to unit "dsetname"
-     WRITE(dsetname,*) 'dataset', n
-
-     ! create this dataset
-     CALL h5dcreate_f(file_id, dsetname, H5T_NATIVE_INTEGER, fspace_id, dset_id, hdferror, dcpl_id)
-     CALL check("h5dcreate_f", hdferror, nerrors)
-
-     DO i = istart, iend-1
-        wbuf(i) = n + mpi_rank
-     ENDDO
-
-     ! write this dataset
-     CALL h5dwrite_f(dset_id,H5T_NATIVE_INTEGER,wbuf,dims,hdferror,file_space_id=fspace_id,mem_space_id=mspace_id,xfer_prp=dxpl_id)
-     CALL check("h5dwrite_f", hdferror, nerrors)
-
-     ! close this dataset
-     CALL h5dclose_f(dset_id, hdferror)
-     CALL check("h5dclose_f", hdferror, nerrors)
-
-  ENDDO
-
-  !//////////////////////////////////////////////////////////
-  ! close HDF5 I/O
-  !//////////////////////////////////////////////////////////
-
-  CALL h5pclose_f(fapl_id, hdferror)
-  CALL check("h5pclose_f", hdferror, nerrors)
-
-  CALL h5pclose_f(dcpl_id, hdferror)
-  CALL check("h5pclose_f", hdferror, nerrors)
-
-  CALL h5pclose_f(dxpl_id, hdferror)
-  CALL check("h5pclose_f", hdferror, nerrors)
-
-  CALL h5sclose_f(mspace_id, hdferror)
-  CALL check("h5sclose_f", hdferror, nerrors)
-
-  CALL h5sclose_f(fspace_id, hdferror)
-  CALL check("h5sclose_f", hdferror, nerrors)
-
-  CALL h5fclose_f(file_id, hdferror)
-  CALL check("h5fclose_f", hdferror, nerrors)
-
-  !//////////////////////////////////////////////////////////
-  ! reopen file with read access
-  !//////////////////////////////////////////////////////////
-
-  CALL h5pcreate_f(H5P_FILE_ACCESS_F, fapl_id, hdferror)
-  CALL check("h5pcreate_f", hdferror, nerrors)
-
-  CALL h5pset_fapl_mpio_f(fapl_id, MPI_COMM_WORLD, MPI_INFO_NULL, hdferror)
-  CALL check("h5pcreate_f", hdferror, nerrors)
-
-  CALL h5fopen_f(filename, H5F_ACC_RDWR_F, file_id, hdferror, access_prp = fapl_id)
-  CALL check("h5pcreate_f", hdferror, nerrors)
-
-  CALL h5screate_simple_f(1, dims, fspace_id, hdferror)
-  CALL check("h5pcreate_f", hdferror, nerrors)
-
-  CALL h5screate_simple_f(1, dims, mspace_id, hdferror)
-  CALL check("h5pcreate_f", hdferror, nerrors)
-
-  !//////////////////////////////////////////////////////////
-  ! select hyperslab in memory
-  !//////////////////////////////////////////////////////////
-
-  CALL h5sselect_hyperslab_f(mspace_id, H5S_SELECT_SET_F, start, counti, hdferror)
-  CALL check("h5pcreate_f", hdferror, nerrors)
-
-  !//////////////////////////////////////////////////////////
-  ! select hyperslab in the file
-  !//////////////////////////////////////////////////////////
-
-  CALL h5sselect_hyperslab_f(fspace_id, H5S_SELECT_SET_F, start, counti, hdferror)
-  CALL check("h5pcreate_f", hdferror, nerrors)
-
-  !//////////////////////////////////////////////////////////
-  ! create a property list for collective dataset read
-  !//////////////////////////////////////////////////////////
-
-  CALL h5pcreate_f(H5P_DATASET_XFER_F, dxpl_id, hdferror)
-  CALL check("h5pcreate_f", hdferror, nerrors)
-
-  IF (do_collective) THEN
-     CALL h5pset_dxpl_mpio_f(dxpl_id, H5FD_MPIO_COLLECTIVE_F, hdferror)
-     CALL check("h5pcreate_f", hdferror, nerrors)
-  ENDIF
-
-  !//////////////////////////////////////////////////////////
-  ! read dataset
-  !//////////////////////////////////////////////////////////
-
-  DO n = 1, 300
-
-     ! direct the output of the write statement to unit "dsetname"
-     WRITE(dsetname,*) 'dataset', n
-
-     ! create this dataset
-     CALL h5dopen_f(file_id, dsetname, dset_id, hdferror)
-     CALL check("h5pcreate_f", hdferror, nerrors)
-
-     ! read this dataset
-     CALL h5dread_f(dset_id,H5T_NATIVE_INTEGER,rbuf,dims,hdferror,file_space_id=fspace_id,mem_space_id=mspace_id,xfer_prp=dxpl_id)
-     CALL check("h5pcreate_f", hdferror, nerrors)
-
-     ! close this dataset
-     CALL h5dclose_f(dset_id, hdferror)
-     CALL check("h5dclose_f", hdferror, nerrors)
-
-     DO i = istart, iend-1
-        wbuf(i) = n + mpi_rank
-     ENDDO
-
-     ! compare read and write data. each process compares a subset of the array
-     DO i = istart, iend-1
-        IF( wbuf(i) /= rbuf(i)) THEN
-           WRITE(*,*) 'buffers differs at ', i, rbuf(i), wbuf(i)
-           nerrors = nerrors + 1
-        ENDIF
-     ENDDO
-
-  ENDDO
-
-
-  !//////////////////////////////////////////////////////////
-  ! close HDF5 I/O
-  !//////////////////////////////////////////////////////////
-
-  CALL h5pclose_f(fapl_id, hdferror)
-  CALL check("h5pcreate_f", hdferror, nerrors)
-
-  CALL h5pclose_f(dxpl_id, hdferror)
-  CALL check("h5pcreate_f", hdferror, nerrors)
-
-  CALL h5sclose_f(fspace_id, hdferror)
-  CALL check("h5pcreate_f", hdferror, nerrors)
-
-  CALL h5sclose_f(mspace_id, hdferror)
-  CALL check("h5pcreate_f", hdferror, nerrors)
-
-  CALL h5fclose_f(file_id, hdferror)
-  CALL check("h5pcreate_f", hdferror, nerrors)
-
-
-  DEALLOCATE(wbuf)
-  DEALLOCATE(rbuf)
-
-END SUBROUTINE multiple_dset_write
-
diff --git a/fortran/testpar/multidsetrw.F90 b/fortran/testpar/multidsetrw.F90
new file mode 100644
index 0000000..e39900c
--- /dev/null
+++ b/fortran/testpar/multidsetrw.F90
@@ -0,0 +1,233 @@
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+
+!
+! writes/reads dataset by hyperslabs using multi-dataset routines, h5dread_multi and
+! h5dwrite_multi
+!
+
+SUBROUTINE pmultiple_dset_hyper_rw(do_collective, do_chunk, mpi_size, mpi_rank, nerrors)
+
+  USE iso_c_binding
+  USE TH5_MISC
+  USE hdf5
+  USE mpi
+  IMPLICIT NONE
+
+  LOGICAL, INTENT(in) :: do_collective              ! use collective IO
+  LOGICAL, INTENT(in) :: do_chunk                   ! use chunking
+  INTEGER, INTENT(in) :: mpi_size                   ! number of processes in the group of communicator
+  INTEGER, INTENT(in) :: mpi_rank                   ! rank of the calling process in the communicator
+  INTEGER, INTENT(inout) :: nerrors                 ! number of errors
+  CHARACTER(LEN=80):: dsetname ! Dataset name
+  INTEGER(hsize_t), DIMENSION(1:2) :: cdims           ! chunk dimensions
+
+  INTEGER(HID_T) :: file_id       ! File identifier
+  INTEGER(HID_T) :: filespace     ! Dataspace identifier in file 
+  INTEGER(HID_T) :: memspace      ! Dataspace identifier in memory
+  INTEGER(HID_T) :: plist_id      ! Property list identifier 
+  INTEGER(HID_T) :: dcpl_id       ! Dataset creation property list
+  INTEGER(HSIZE_T), DIMENSION(1:2) :: dimsf  ! Dataset dimensions.
+
+  INTEGER(HSIZE_T), DIMENSION(1:2) :: count  
+  INTEGER(HSSIZE_T), DIMENSION(1:2) :: offset 
+  INTEGER, ALLOCATABLE, DIMENSION(:,:,:), TARGET :: DATA  ! Data to write
+  INTEGER, ALLOCATABLE, DIMENSION(:,:,:), TARGET :: rDATA  ! Data to write
+  INTEGER, PARAMETER :: rank = 2 ! Dataset rank 
+  INTEGER :: i
+  INTEGER(HSIZE_T) :: ii, jj, kk, istart
+  INTEGER :: error          ! Error flags
+
+  INTEGER(SIZE_T), PARAMETER :: ndsets = 5
+  INTEGER(HID_T), DIMENSION(1:ndsets) :: dset_id
+  INTEGER(HID_T), DIMENSION(1:ndsets) :: mem_type_id
+  INTEGER(HID_T), DIMENSION(1:ndsets) :: mem_space_id
+  INTEGER(HID_T), DIMENSION(1:ndsets) :: file_space_id
+  TYPE(C_PTR), DIMENSION(1:ndsets) :: buf_md
+  INTEGER(SIZE_T) :: obj_count
+  INTEGER :: data_xfer_mode
+
+  dimsf(1) = 5_hsize_t
+  dimsf(2) = INT(mpi_size, hsize_t)*8_hsize_t
+
+  ! 
+  ! Setup file access property list with parallel I/O access.
+  !
+  CALL h5pcreate_f(H5P_FILE_ACCESS_F, plist_id, error)
+  CALL check("h5pcreate_f", error, nerrors)
+  CALL h5pset_fapl_mpio_f(plist_id, MPI_COMM_WORLD, MPI_INFO_NULL, error)
+  CALL check("h5pset_fapl_mpio_f", error, nerrors)
+  !
+  ! Create the file collectively.
+  ! 
+  CALL h5fcreate_f("parf2.h5", H5F_ACC_TRUNC_F, file_id, error, access_prp = plist_id)
+  CALL check("h5fcreate_f", error, nerrors)
+  CALL h5pclose_f(plist_id, error)
+  CALL check("h5pclose_f", error, nerrors)
+  !
+  ! Create the data space for the  dataset. 
+  !
+  CALL h5screate_simple_f(rank, dimsf, filespace, error)
+  CALL check("h5screate_simple_f", error, nerrors)
+  !
+  ! Each process defines dataset in memory and writes it to the hyperslab
+  ! in the file. 
+  !
+  count(1) = dimsf(1)
+  count(2) = dimsf(2)/mpi_size 
+  offset(1) = 0
+  offset(2) = mpi_rank * count(2) 
+  CALL h5screate_simple_f(rank, count, memspace, error) 
+  CALL check("h5screate_simple_f", error, nerrors)
+
+  !
+  ! Modify dataset creation properties to enable chunking
+  !
+
+  CALL h5pcreate_f(H5P_DATASET_CREATE_F, dcpl_id, error)
+  CALL check("h5pcreate_f", error, nerrors)
+
+  IF (do_chunk) THEN
+     cdims(1) = dimsf(1)
+     cdims(2) = dimsf(2)/mpi_size/2
+     CALL h5pset_chunk_f(dcpl_id, 2, cdims, error)
+     CALL check("h5pset_chunk_f", error, nerrors)
+  ENDIF
+  ! 
+  ! Select hyperslab in the file.
+  !
+  CALL h5sselect_hyperslab_f(filespace, H5S_SELECT_SET_F, offset, count, error)
+  CALL check("h5sselect_hyperslab_f", error, nerrors)
+  !
+  ! Initialize data buffer
+  !
+  ALLOCATE ( DATA(COUNT(1),COUNT(2), ndsets))
+  ALLOCATE ( rdata(COUNT(1),COUNT(2), ndsets))
+
+  ! Create property list for collective dataset write
+  !
+  CALL h5pcreate_f(H5P_DATASET_XFER_F, plist_id, error)
+  CALL check("h5pcreate_f", error, nerrors)
+  IF(do_collective)THEN
+     CALL h5pset_dxpl_mpio_f(plist_id, H5FD_MPIO_COLLECTIVE_F, error)
+     CALL check("h5pset_dxpl_mpio_f", error, nerrors)
+  ELSE
+     CALL h5pset_dxpl_mpio_f(plist_id, H5FD_MPIO_INDEPENDENT_F, error)
+     CALL check("h5pset_dxpl_mpio_f", error, nerrors)
+  ENDIF
+     
+  !
+  ! Create the dataset with default properties.
+  !
+  mem_type_id(1:ndsets) = H5T_NATIVE_INTEGER
+  mem_space_id(1:ndsets) = memspace
+  file_space_id(1:ndsets)= filespace
+
+  DO ii = 1, ndsets
+     ! Create the data
+     DO kk = 1, COUNT(1)
+        DO jj = 1, COUNT(2)
+           istart = (kk-1)*dimsf(2) + mpi_rank*COUNT(2)
+           DATA(kk,jj,ii) = INT((istart + jj)*10**(ii-1))
+        ENDDO
+     ENDDO
+     ! Point to te data
+     buf_md(ii) = C_LOC(DATA(1,1,ii))
+
+     ! direct the output of the write statement to unit "dsetname"
+     WRITE(dsetname,'("dataset ",I0)') ii
+     ! create the dataset
+     CALL h5dcreate_f(file_id, dsetname, H5T_NATIVE_INTEGER, filespace, dset_id(ii), error, dcpl_id)
+     CALL check("h5dcreate_f", error, nerrors)
+  ENDDO
+
+  !
+  ! Write the dataset collectively. 
+  !  
+  CALL h5dwrite_multi_f(ndsets, dset_id, mem_type_id, mem_space_id, file_space_id, buf_md, error, plist_id)
+  CALL check("h5dwrite_multi_f", error, nerrors)
+
+  CALL h5pget_dxpl_mpio_f(plist_id, data_xfer_mode, error)
+  CALL check("h5pget_dxpl_mpio_f", error, nerrors)
+
+  IF(do_collective)THEN
+     IF(data_xfer_mode.NE.H5FD_MPIO_COLLECTIVE_F)THEN
+        nerrors = nerrors + 1
+     ENDIF
+  ENDIF
+
+  DO i = 1, ndsets
+     ! Point to the read buffer
+     buf_md(i) = C_LOC(rdata(1,1,i))
+  ENDDO
+
+  CALL H5Dread_multi_f(ndsets, dset_id, mem_type_id, mem_space_id, file_space_id, buf_md, error, plist_id)
+  CALL check("h5dread_multi_f", error, nerrors)
+
+  CALL h5pget_dxpl_mpio_f(plist_id, data_xfer_mode, error)
+  CALL check("h5pget_dxpl_mpio_f", error, nerrors)
+
+  IF(do_collective)THEN
+     IF(data_xfer_mode.NE.H5FD_MPIO_COLLECTIVE_F)THEN
+        nerrors = nerrors + 1
+     ENDIF
+  ENDIF
+
+  DO i = 1, ndsets
+     ! Close all the datasets
+     CALL h5dclose_f(dset_id(i), error)
+     CALL check("h5dclose_f", error, nerrors)
+  ENDDO
+
+  ! check the data read and write buffers
+  DO ii = 1, ndsets
+     ! Create the data
+     DO kk = 1, COUNT(1)
+        DO jj = 1, COUNT(2)
+           IF(rDATA(kk,jj,ii).NE.DATA(kk,jj,ii))THEN
+              nerrors = nerrors + 1
+           ENDIF
+        ENDDO
+     ENDDO
+  ENDDO
+  !
+  ! Deallocate data buffer.
+  !
+  DEALLOCATE(data, rdata)
+
+  !
+  ! Close dataspaces.
+  !
+  CALL h5sclose_f(filespace, error)
+  CALL check("h5sclose_f", error, nerrors)
+  CALL h5sclose_f(memspace, error)
+  CALL check("h5sclose_f", error, nerrors)
+  !
+  ! Close the dataset and property list.
+  !
+  CALL h5pclose_f(dcpl_id, error)
+  CALL check("h5pclose_f", error, nerrors)
+  CALL h5pclose_f(plist_id, error)
+  CALL check("h5pclose_f", error, nerrors)
+
+  CALL h5fget_obj_count_f(file_id, H5F_OBJ_ALL_F, obj_count, error)
+  IF(obj_count.NE.1)THEN
+     nerrors = nerrors + 1
+  END IF
+
+  !
+  ! Close the file.
+  !
+  CALL h5fclose_f(file_id, error)
+  CALL check("h5fclose_f", error, nerrors)
+
+END SUBROUTINE pmultiple_dset_hyper_rw
diff --git a/fortran/testpar/ptest.F90 b/fortran/testpar/ptest.F90
new file mode 100644
index 0000000..2974933
--- /dev/null
+++ b/fortran/testpar/ptest.F90
@@ -0,0 +1,115 @@
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+
+!
+! main program for parallel HDF5 Fortran tests
+!
+
+PROGRAM parallel_test
+  USE HDF5
+  USE MPI
+  USE TH5_MISC
+
+  IMPLICIT NONE
+
+  INTEGER :: mpierror                             ! MPI hdferror flag
+  INTEGER :: hdferror                             ! HDF hdferror flag
+  INTEGER :: ret_total_error = 0                  ! number of errors in subroutine
+  INTEGER :: total_error = 0                      ! sum of the number of errors
+  INTEGER :: mpi_size                             ! number of processes in the group of communicator
+  INTEGER :: mpi_rank                             ! rank of the calling process in the communicator
+  INTEGER :: length = 12000                       ! length of array
+  INTEGER :: i,j, sum
+  ! use collective MPI I/O
+  LOGICAL, DIMENSION(1:2) :: do_collective = (/.FALSE.,.TRUE./)
+  CHARACTER(LEN=11), DIMENSION(1:2) :: chr_collective =(/"independent", "collective "/)
+  ! use chunking
+  LOGICAL, DIMENSION(1:2) :: do_chunk = (/.FALSE.,.TRUE./)
+  CHARACTER(LEN=10), DIMENSION(1:2) :: chr_chunk =(/"contiguous", "chunk     "/)
+
+  !
+  ! initialize MPI
+  !
+  CALL mpi_init(mpierror)
+  IF (mpierror .NE. MPI_SUCCESS) THEN
+     WRITE(*,*) "MPI_INIT  *FAILED*"
+  ENDIF
+  CALL mpi_comm_rank( MPI_COMM_WORLD, mpi_rank, mpierror )
+  IF (mpierror .NE. MPI_SUCCESS) THEN
+     WRITE(*,*) "MPI_COMM_RANK  *FAILED* Process = ", mpi_rank
+  ENDIF
+  CALL mpi_comm_size( MPI_COMM_WORLD, mpi_size, mpierror )
+  IF (mpierror .NE. MPI_SUCCESS) THEN
+     WRITE(*,*) "MPI_COMM_SIZE  *FAILED* Process = ", mpi_rank
+  ENDIF
+  !
+  ! initialize the HDF5 fortran interface
+  !
+  CALL h5open_f(hdferror)
+  !
+  ! test write/read dataset by hyperslabs (contiguous/chunk) with independent/collective MPI I/O
+  !
+  DO i = 1, 2
+     DO j = 1, 2
+        ret_total_error = 0
+        CALL hyper(length, do_collective(j), do_chunk(i), mpi_size, mpi_rank, ret_total_error)
+        IF(mpi_rank==0) CALL write_test_status(ret_total_error, &
+             "Writing/reading dataset by hyperslabs ("//TRIM(chr_chunk(i))//" layout, "//TRIM(chr_collective(j))//" MPI I/O)", &
+             total_error)
+     ENDDO
+  ENDDO
+
+  !
+  ! test write/read several datasets (independent MPI I/O)
+  !
+  ret_total_error = 0
+  CALL multiple_dset_write(length, do_collective(1), do_chunk(1), mpi_size, mpi_rank, ret_total_error)
+  IF(mpi_rank==0) CALL write_test_status(ret_total_error, &
+       'Writing/reading several datasets (contiguous layout, independent MPI I/O)', total_error)
+  !
+  ! test write/read multiple hyperslab datasets
+  !
+  DO i = 1, 2
+     DO j = 1, 2
+        ret_total_error = 0
+        CALL pmultiple_dset_hyper_rw(do_collective(j), do_chunk(i), mpi_size, mpi_rank, ret_total_error)
+        IF(mpi_rank==0) CALL write_test_status(ret_total_error, &
+             "Writing/reading multiple datasets by hyperslab ("//TRIM(chr_chunk(i))//" layout, "&
+             //TRIM(chr_collective(j))//" MPI I/O)", total_error)
+     ENDDO
+  ENDDO
+  !
+  ! close HDF5 interface
+  !
+  CALL h5close_f(hdferror)
+
+  CALL MPI_ALLREDUCE(total_error, sum, 1, MPI_INTEGER, MPI_SUM, MPI_COMM_WORLD, mpierror)
+
+  !
+  ! close MPI
+  !
+  IF (total_error == 0) THEN
+     CALL mpi_finalize(mpierror)
+     IF (mpierror .NE. MPI_SUCCESS) THEN
+        WRITE(*,*) "MPI_FINALIZE  *FAILED* Process = ", mpi_rank
+     ENDIF
+  ELSE
+     WRITE(*,*) 'Errors detected in process ', mpi_rank
+     CALL mpi_abort(MPI_COMM_WORLD, 1, mpierror)
+     IF (mpierror .NE. MPI_SUCCESS) THEN
+        WRITE(*,*) "MPI_ABORT  *FAILED* Process = ", mpi_rank
+     ENDIF
+  ENDIF
+  !
+  ! end main program
+  !
+END PROGRAM parallel_test
diff --git a/fortran/testpar/ptest.f90 b/fortran/testpar/ptest.f90
deleted file mode 100644
index 69594b0..0000000
--- a/fortran/testpar/ptest.f90
+++ /dev/null
@@ -1,136 +0,0 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-
-!//////////////////////////////////////////////////////////
-! main program for parallel HDF5 Fortran tests
-!//////////////////////////////////////////////////////////
-
-PROGRAM parallel_test
-  USE hdf5
-  
-  IMPLICIT NONE
-  INCLUDE 'mpif.h'
-
-  INTEGER :: mpierror                             ! MPI hdferror flag
-  INTEGER :: hdferror                             ! HDF hdferror flag
-  LOGICAL :: do_collective                        ! use collective MPI I/O
-  LOGICAL :: do_chunk                             ! use chunking
-  INTEGER :: nerrors = 0                          ! number of errors
-  INTEGER :: mpi_size                             ! number of processes in the group of communicator
-  INTEGER :: mpi_rank                             ! rank of the calling process in the communicator
-  INTEGER :: length = 12000                       ! length of array
-
-  !//////////////////////////////////////////////////////////
-  ! initialize MPI
-  !//////////////////////////////////////////////////////////
-
-  CALL mpi_init(mpierror)
-  IF (mpierror .NE. MPI_SUCCESS) THEN
-     WRITE(*,*) "MPI_INIT  *FAILED*"
-  ENDIF
-  CALL mpi_comm_rank( MPI_COMM_WORLD, mpi_rank, mpierror )
-  IF (mpierror .NE. MPI_SUCCESS) THEN
-     WRITE(*,*) "MPI_COMM_RANK  *FAILED* Process = ", mpi_rank
-  ENDIF
-  CALL mpi_comm_size( MPI_COMM_WORLD, mpi_size, mpierror )
-  IF (mpierror .NE. MPI_SUCCESS) THEN
-     WRITE(*,*) "MPI_COMM_SIZE  *FAILED* Process = ", mpi_rank
-  ENDIF
-  !//////////////////////////////////////////////////////////
-  ! initialize the HDF5 fortran interface
-  !//////////////////////////////////////////////////////////
-
-  CALL h5open_f(hdferror)
-
-  !//////////////////////////////////////////////////////////
-  ! test write/read dataset by hyperslabs with independent MPI I/O
-  !//////////////////////////////////////////////////////////
-
-  IF (mpi_rank == 0) WRITE(*,*) 'Writing/reading dataset by hyperslabs (contiguous layout, independent MPI I/O)'
-
-  do_collective = .FALSE.
-  do_chunk      = .FALSE.
-  CALL hyper(length, do_collective, do_chunk, mpi_size, mpi_rank, nerrors)
-
-  !//////////////////////////////////////////////////////////
-  ! test write/read dataset by hyperslabs with collective MPI I/O
-  !//////////////////////////////////////////////////////////
-
-  IF (mpi_rank == 0) WRITE(*,*) 'Writing/reading dataset by hyperslabs (contiguous layout, collective MPI I/O)'
-
-  do_collective = .TRUE.
-  do_chunk      = .FALSE.
-  CALL hyper(length, do_collective, do_chunk, mpi_size, mpi_rank, nerrors)
-
-  !//////////////////////////////////////////////////////////
-  ! test write/read dataset by hyperslabs with independent MPI I/O
-  !//////////////////////////////////////////////////////////
-
-  IF (mpi_rank == 0) WRITE(*,*) 'Writing/reading dataset by hyperslabs (chunk layout, independent MPI I/O)'
-
-  do_collective = .FALSE.
-  do_chunk      = .TRUE.
-  CALL hyper(length, do_collective, do_chunk, mpi_size, mpi_rank, nerrors)
-
-  !//////////////////////////////////////////////////////////
-  ! test write/read dataset by hyperslabs with collective MPI I/O
-  !//////////////////////////////////////////////////////////
-
-  IF (mpi_rank == 0) WRITE(*,*) 'Writing/reading dataset by hyperslabs (chunk layout, collective MPI I/O)'
-
-  do_collective = .TRUE.
-  do_chunk      = .TRUE.
-  CALL hyper(length, do_collective, do_chunk, mpi_size, mpi_rank, nerrors)
-
-  !//////////////////////////////////////////////////////////
-  ! test write/read several datasets (independent MPI I/O)
-  !//////////////////////////////////////////////////////////
-
-  IF (mpi_rank == 0) WRITE(*,*) 'Writing/reading several datasets (contiguous layout, independent MPI I/O)'
-
-  do_collective = .FALSE.
-  do_chunk      = .FALSE.
-  CALL multiple_dset_write(length, do_collective, do_chunk, mpi_size, mpi_rank, nerrors)
-
-
-  !//////////////////////////////////////////////////////////
-  ! close HDF5 interface
-  !//////////////////////////////////////////////////////////
-
-  CALL h5close_f(hdferror)
-
-  !//////////////////////////////////////////////////////////
-  ! close MPI
-  !//////////////////////////////////////////////////////////
-
-  IF (nerrors == 0) THEN
-     CALL mpi_finalize(mpierror)
-     IF (mpierror .NE. MPI_SUCCESS) THEN
-        WRITE(*,*) "MPI_FINALIZE  *FAILED* Process = ", mpi_rank
-     ENDIF
-  ELSE
-     WRITE(*,*) 'Errors detected in process ', mpi_rank
-     CALL mpi_abort(MPI_COMM_WORLD, 1, mpierror)
-     IF (mpierror .NE. MPI_SUCCESS) THEN
-        WRITE(*,*) "MPI_ABORT  *FAILED* Process = ", mpi_rank
-     ENDIF
-  ENDIF
-
-  !//////////////////////////////////////////////////////////
-  ! end main program
-  !//////////////////////////////////////////////////////////
-
-END PROGRAM parallel_test
-
diff --git a/fortran/testpar/subfiling.F90 b/fortran/testpar/subfiling.F90
new file mode 100644
index 0000000..18614b6
--- /dev/null
+++ b/fortran/testpar/subfiling.F90
@@ -0,0 +1,401 @@
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+
+!
+! main program for subfiling HDF5 Fortran tests
+!
+
+#include <H5config_f.inc>
+
+PROGRAM subfiling_test
+  USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_INT64_T
+  USE HDF5
+  USE MPI
+  USE TH5_MISC
+
+  IMPLICIT NONE
+
+  INTEGER :: total_error = 0        ! sum of the number of errors
+  INTEGER :: mpierror               ! MPI hdferror flag
+  INTEGER :: mpi_rank               ! rank of the calling process in the communicator
+
+#ifdef H5_HAVE_SUBFILING_VFD
+
+  CHARACTER(LEN=7), PARAMETER :: filename = "subf.h5"
+
+  INTEGER :: hdferror               ! HDF hdferror flag
+  INTEGER :: mpi_size, mpi_size_ret ! number of processes in the group of communicator
+  INTEGER :: required, provided
+  LOGICAL :: file_exists
+
+  INTEGER(HID_T) :: fapl_id
+  INTEGER(HID_T) :: file_id
+  INTEGER :: comm, comm_ret
+  INTEGER :: info, info_ret
+  CHARACTER(LEN=3) :: info_val
+  CHARACTER(LEN=180) :: subfname
+  INTEGER :: i, sum
+  INTEGER(C_INT64_T) inode
+  TYPE(H5FD_subfiling_config_t) :: vfd_config
+  TYPE(H5FD_ioc_config_t)       :: vfd_config_ioc
+  LOGICAL :: flag
+
+  INTEGER :: nerrors = 0
+
+  INTEGER(HID_T) :: driver_id
+
+  CHARACTER(len=8) :: hex1, hex2
+
+  !
+  ! initialize MPI
+  !
+  required = MPI_THREAD_MULTIPLE
+  CALL mpi_init_thread(required, provided, mpierror)
+  IF (mpierror .NE. MPI_SUCCESS) THEN
+     WRITE(*,*) "MPI_INIT_THREAD  *FAILED*"
+     nerrors = nerrors + 1
+  ENDIF
+  IF (provided .NE. required) THEN
+     WRITE(*,*) "MPI doesn't support MPI_Init_thread with MPI_THREAD_MULTIPLE *FAILED*"
+     nerrors = nerrors + 1
+  ENDIF
+  CALL mpi_comm_rank( MPI_COMM_WORLD, mpi_rank, mpierror )
+  IF (mpierror .NE. MPI_SUCCESS) THEN
+     WRITE(*,*) "MPI_COMM_RANK  *FAILED* Process = ", mpi_rank
+     nerrors = nerrors + 1
+  ENDIF
+  CALL mpi_comm_size( MPI_COMM_WORLD, mpi_size, mpierror )
+  IF (mpierror .NE. MPI_SUCCESS) THEN
+     WRITE(*,*) "MPI_COMM_SIZE  *FAILED* Process = ", mpi_rank
+     nerrors = nerrors + 1
+  ENDIF
+
+  IF(nerrors.NE.0)THEN
+     IF(mpi_rank==0) CALL write_test_status(sum, &
+          'Testing Initializing mpi_init_thread', total_error)
+     CALL MPI_Barrier(MPI_COMM_WORLD, mpierror)
+     CALL mpi_abort(MPI_COMM_WORLD, 1, mpierror)
+  ENDIF
+
+  !
+  ! initialize the HDF5 fortran interface
+  !
+  CALL h5open_f(hdferror)
+
+  ! ***********************************
+  ! Test H5Pset/get_mpi_params_f APIs
+  ! ***********************************
+  nerrors = 0
+  IF(mpi_size.GT.2)THEN
+
+     IF (mpi_rank.LE.1)THEN
+        CALL MPI_Comm_split(MPI_COMM_WORLD, 1, mpi_rank, comm, mpierror)
+     ELSE
+        CALL MPI_Comm_split(MPI_COMM_WORLD, 0, mpi_rank, comm, mpierror)
+     ENDIF
+
+     CALL MPI_Info_create(info, mpierror)
+     CALL MPI_Info_set( info, "foo", "bar", mpierror)
+
+     IF (mpi_rank.LE.1)THEN
+
+        CALL h5pcreate_f(H5P_FILE_ACCESS_F, fapl_id, hdferror)
+        CALL check("h5pcreate_f", hdferror, nerrors)
+
+        CALL H5Pset_mpi_params_f(fapl_id, comm, info, hdferror)
+        CALL check("H5Pset_mpi_params_f", hdferror, nerrors)
+
+        CALL H5Pget_mpi_params_f(fapl_id, comm_ret, info_ret, hdferror)
+        CALL check("H5Pget_mpi_params_f", hdferror, nerrors)
+
+        CALL mpi_comm_size(comm_ret, mpi_size_ret, mpierror)
+
+        IF(mpi_size_ret.NE.2)THEN
+           IF(mpi_rank.EQ.0) &
+                WRITE(*,*) "Failed H5Pset_mpi_params_f and H5Pget_mpi_params_f sequence"
+           nerrors = nerrors + 1
+        ENDIF
+
+        CALL mpi_info_get(info_ret,"foo", 3, info_val, flag, mpierror)
+        IF(flag .EQV. .TRUE.)THEN
+           IF(info_val.NE."bar")THEN
+              IF(mpi_rank.EQ.0) &
+                   WRITE(*,*) "Failed H5Pset_mpi_params_f and H5Pget_mpi_params_f sequence"
+              nerrors = nerrors + 1
+           ENDIF
+        ELSE
+           IF(mpi_rank.EQ.0) &
+                WRITE(*,*) "Failed to find info value with mpi_info_get"
+           nerrors = nerrors + 1
+        ENDIF
+        CALL h5pclose_f(fapl_id, hdferror)
+     ENDIF
+
+     CALL MPI_Comm_free(comm, mpierror)
+     CALL MPI_Info_free(info, mpierror)
+
+  ENDIF
+
+  CALL MPI_REDUCE(nerrors, sum, 1, MPI_INTEGER, MPI_SUM, 0, MPI_COMM_WORLD, mpierror)
+  IF(mpi_rank==0) CALL write_test_status(sum, &
+       'Testing H5Pset/get_mpi_params_f', total_error)
+
+  ! *********************************************************
+  ! Setup file access property list with subfiling I/O access
+  ! *********************************************************
+
+  nerrors = 0
+  CALL h5pcreate_f(H5P_FILE_ACCESS_F, fapl_id, hdferror)
+  CALL check("h5pcreate_f", hdferror, nerrors)
+
+  CALL H5Pset_mpi_params_f(fapl_id, MPI_COMM_WORLD, MPI_INFO_NULL, hdferror)
+  CALL check("H5Pset_mpi_params_f", hdferror, nerrors)
+
+  CALL H5Pget_mpi_params_f(fapl_id, comm, info, hdferror)
+  CALL check("H5Pset_mpi_params_f", hdferror, nerrors)
+
+  CALL mpi_comm_size(comm, mpi_size_ret, mpierror)
+  IF(mpi_size_ret.NE.mpi_size)THEN
+     IF(mpi_rank.EQ.0) &
+          WRITE(*,*) "Failed H5Pset_mpi_params_f and H5Pget_mpi_params_f sequence"
+     nerrors = nerrors + 1
+  ENDIF
+
+  IF(mpi_rank==0) CALL write_test_status(nerrors, &
+       'Testing H5Pset/get_mpi_params_f with defaults ', total_error)
+
+  ! Verify no new enum parameters have been added in C and not updated in Fortran
+  IF( IOC_SELECTION_OPTIONS_F .NE. 4)THEN
+     IF(mpi_rank.EQ.0) &
+          WRITE(*,*) "Mismatch between Fortran and C H5FD_subfiling_ioc_select_t definitions"
+     nerrors = nerrors + 1
+  ENDIF
+
+  IF(mpi_rank==0) CALL write_test_status(nerrors, &
+       'Testing Subfiling FD is registered', total_error)
+
+  ! *********************************************************
+  ! Check the default subfiling parameters
+  ! *********************************************************
+  nerrors = 0
+  CALL h5pset_fapl_subfiling_f(fapl_id, hdferror)
+  CALL check("h5pset_fapl_subfiling_f", hdferror, nerrors)
+
+  CALL h5pget_driver_f(fapl_id, driver_id, hdferror)
+  CALL check("h5pget_driver_f", hdferror, nerrors)
+
+  IF( driver_id .NE. H5FD_SUBFILING_F) THEN
+     WRITE(*,*) "Wrong file driver type returned"
+     nerrors = nerrors + 1
+  ENDIF
+
+  ! *********************************************************
+  ! Check the default parameters for subfiling and ioc
+  ! *********************************************************
+
+  CALL h5pget_fapl_subfiling_f(fapl_id, vfd_config, hdferror)
+  CALL check("h5pget_fapl_subfiling_f", hdferror, nerrors)
+
+  CALL h5pset_fapl_ioc_f(vfd_config%ioc_fapl_id, hdferror)
+  CALL check("h5pset_fapl_ioc_f", hdferror, nerrors)
+
+  CALL h5pget_fapl_ioc_f(vfd_config%ioc_fapl_id, vfd_config_ioc, hdferror)
+  CALL check("h5pget_fapl_ioc_f", hdferror, nerrors)
+
+  WRITE(hex1,'(z8)') H5FD_SUBFILING_FAPL_MAGIC_F
+  WRITE(hex2,'(z8)') vfd_config%magic
+
+  IF(hex1 .NE. hex2 .OR. &
+     vfd_config%version .NE. H5FD_SUBFILING_CURR_FAPL_VERSION_F .OR. &
+     .NOT.vfd_config%require_ioc .OR. &
+     vfd_config%shared_cfg%ioc_selection .NE. SELECT_IOC_ONE_PER_NODE_F .OR. &
+     vfd_config%shared_cfg%stripe_size .NE. H5FD_SUBFILING_DEFAULT_STRIPE_SIZE_F .OR. &
+     vfd_config%shared_cfg%stripe_count .NE. H5FD_SUBFILING_DEFAULT_STRIPE_COUNT_F &
+     )THEN
+     IF(mpi_rank.EQ.0) &
+          WRITE(*,*) "Failed h5pget_fapl_subfiling_f"
+     nerrors = nerrors + 1
+  ENDIF
+
+  IF(mpi_rank==0) CALL write_test_status(nerrors, &
+       'Testing H5Pset/get_fapl_subfiling_f with defaults', total_error)
+
+  WRITE(hex1,'(z8)') H5FD_IOC_FAPL_MAGIC_F
+  WRITE(hex2,'(z8)') vfd_config_ioc%magic
+
+  nerrors = 0
+  IF(hex1 .NE. hex2 .OR. &
+     vfd_config_ioc%version .NE. H5FD_IOC_CURR_FAPL_VERSION_F .OR. &
+     vfd_config_ioc%thread_pool_size .NE. H5FD_IOC_DEFAULT_THREAD_POOL_SIZE_F &
+     )THEN
+     IF(mpi_rank.EQ.0) &
+          WRITE(*,*) "Failed h5pget_fapl_ioc_f"
+     nerrors = nerrors + 1
+  ENDIF
+
+  IF(mpi_rank==0) CALL write_test_status(nerrors, &
+       'Testing H5Pset/get_fapl_ioc_f with defaults', total_error)
+
+  ! *********************************************************
+  ! Testing creating a file with subfiling, default settings
+  ! *********************************************************
+
+  CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, hdferror, access_prp = fapl_id)
+  CALL check("h5fcreate_f", hdferror, nerrors)
+
+  CALL h5fclose_f(file_id, hdferror)
+  CALL check("h5fclose_f", hdferror, nerrors)
+
+  IF(mpi_rank==0) CALL write_test_status(nerrors, &
+       'Testing H5Fcreate with subfiling with default settings', total_error)
+
+  ! *********************************************************
+  ! Testing creating a file with subfiling, modified settings
+  ! *********************************************************
+
+  ! Testing modifying defaults for subfiling FD
+
+  vfd_config%magic = H5FD_SUBFILING_FAPL_MAGIC_F
+  vfd_config%version = H5FD_SUBFILING_CURR_FAPL_VERSION_F
+  vfd_config%require_ioc = .TRUE.
+  vfd_config%shared_cfg%ioc_selection = SELECT_IOC_ONE_PER_NODE_F
+  vfd_config%shared_cfg%stripe_size = 16*1024*1024
+  vfd_config%shared_cfg%stripe_count = 3
+
+  nerrors = 0
+  CALL h5pset_fapl_subfiling_f(fapl_id, hdferror, vfd_config)
+  CALL check("h5pset_fapl_ioc_f", hdferror, nerrors)
+
+  CALL h5pget_fapl_subfiling_f(fapl_id, vfd_config, hdferror)
+  CALL check("h5pget_fapl_ioc_f", hdferror, nerrors)
+
+  WRITE(hex1,'(z8)') H5FD_SUBFILING_FAPL_MAGIC_F
+  WRITE(hex2,'(z8)') vfd_config%magic
+
+  IF(hex1 .NE. hex2 .OR. &
+     vfd_config%version .NE. H5FD_SUBFILING_CURR_FAPL_VERSION_F .OR. &
+     .NOT.vfd_config%require_ioc .OR. &
+     vfd_config%shared_cfg%ioc_selection .NE. SELECT_IOC_ONE_PER_NODE_F .OR. &
+     vfd_config%shared_cfg%stripe_size .NE. 16*1024*1024 .OR. &
+     vfd_config%shared_cfg%stripe_count .NE. 3 &
+     )THEN
+     IF(mpi_rank.EQ.0) &
+          WRITE(*,*) "Failed h5pget_fapl_subfiling_f"
+     nerrors = nerrors + 1
+  ENDIF
+
+  IF(mpi_rank==0) CALL write_test_status(nerrors, &
+       'Testing H5Pset/get_fapl_subfiling_f with custom settings', total_error)
+
+  vfd_config_ioc%magic   = H5FD_IOC_FAPL_MAGIC_F
+  vfd_config_ioc%version = H5FD_IOC_CURR_FAPL_VERSION_F
+  vfd_config_ioc%thread_pool_size = 2
+
+  nerrors = 0
+  CALL h5pset_fapl_ioc_f(vfd_config%ioc_fapl_id, hdferror, vfd_config_ioc)
+  CALL check("h5pset_fapl_ioc_f", hdferror, nerrors)
+
+  CALL h5pget_fapl_ioc_f(vfd_config%ioc_fapl_id, vfd_config_ioc, hdferror)
+  CALL check("h5pget_fapl_ioc_f", hdferror, nerrors)
+
+  IF(& !vfd_config_ioc%magic .NE. H5FD_IOC_FAPL_MAGIC_F .OR. &
+     vfd_config_ioc%version .NE. H5FD_IOC_CURR_FAPL_VERSION_F .OR. &
+     vfd_config_ioc%thread_pool_size .NE. 2 &
+     )THEN
+     IF(mpi_rank.EQ.0) &
+          WRITE(*,*) "Failed h5pget_fapl_ioc_f"
+     nerrors = nerrors + 1
+  ENDIF
+  IF(mpi_rank==0) CALL write_test_status(nerrors, &
+       'Testing H5Pset/get_fapl_ioc_f with custom settings', total_error)
+
+  ! *********************************************************
+  ! Testing creating a file with subfiling, custom settings
+  ! *********************************************************
+
+  CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, hdferror, access_prp = fapl_id)
+  CALL check("h5pcreate_f", hdferror, nerrors)
+
+  CALL h5fclose_f(file_id, hdferror)
+  CALL check("h5fclose_f", hdferror, nerrors)
+
+  IF(mpi_rank.EQ.0)THEN
+     INQUIRE(FILE=filename, EXIST=file_exists)
+     IF(.NOT.file_exists)THEN
+        WRITE(*,"(A,A)") "Failed to find the stub subfile ",TRIM(filename)
+        nerrors = nerrors + 1
+     ENDIF
+
+     CALL EXECUTE_COMMAND_LINE("stat --format='%i' "//filename//" >> tmp_inode", EXITSTAT=i)
+     IF(i.ne.0)THEN
+        WRITE(*,"(A,A)") "Failed to stat the stub  subfile ",TRIM(filename)
+        nerrors = nerrors + 1
+     ENDIF
+
+     OPEN(11,FILE="tmp_inode")
+     READ(11,*) inode
+     CLOSE(11,STATUS="delete")
+
+     DO i = 1, vfd_config%shared_cfg%stripe_count
+        WRITE(subfname,'(A,".subfile_",I0,"_",I0,"_of_",I0)') filename,inode,i,vfd_config%shared_cfg%stripe_count
+        INQUIRE(FILE=subfname, EXIST=file_exists)
+        IF(.NOT.file_exists)THEN
+           WRITE(*,"(A,A)") "Failed to create the subfile ",TRIM(subfname)
+           nerrors = nerrors + 1
+        ENDIF
+     ENDDO
+
+  ENDIF
+
+  CALL h5pclose_f(fapl_id, hdferror)
+  CALL check("h5pclose_f", hdferror, nerrors)
+
+  IF(mpi_rank==0) CALL write_test_status(nerrors, &
+       'Testing H5Fcreate with subfiling with custom settings', total_error)
+
+  !
+  ! close HDF5 interface
+  !
+  CALL h5close_f(hdferror)
+
+  CALL MPI_ALLREDUCE(total_error, sum, 1, MPI_INTEGER, MPI_SUM, MPI_COMM_WORLD, mpierror)
+
+  !
+  ! close MPI
+  !
+  IF (sum == 0) THEN
+     CALL mpi_finalize(mpierror)
+     IF (mpierror .NE. MPI_SUCCESS) THEN
+        WRITE(*,*) "MPI_FINALIZE  *FAILED* Process = ", mpi_rank
+     ENDIF
+  ELSE
+     WRITE(*,*) 'Errors detected in process ', mpi_rank
+     CALL mpi_abort(MPI_COMM_WORLD, 1, mpierror)
+     IF (mpierror .NE. MPI_SUCCESS) THEN
+        WRITE(*,*) "MPI_ABORT  *FAILED* Process = ", mpi_rank
+     ENDIF
+  ENDIF
+  !
+  ! end main program
+  !
+
+#else
+
+  CALL mpi_init(mpierror)
+  CALL mpi_comm_rank(MPI_COMM_WORLD, mpi_rank, mpierror)
+  IF(mpi_rank==0) CALL write_test_status( -1, &
+       'Subfiling not enabled', total_error)
+  CALL mpi_finalize(mpierror)
+
+#endif
+
+END PROGRAM subfiling_test
diff --git a/hl/CMakeLists.txt b/hl/CMakeLists.txt
index b5d4308..a777b72 100644
--- a/hl/CMakeLists.txt
+++ b/hl/CMakeLists.txt
@@ -1,40 +1,31 @@
-cmake_minimum_required (VERSION 3.1.0)
-PROJECT (HDF5_HL C CXX)
+cmake_minimum_required (VERSION 3.18)
+project (HDF5_HL C)
 
 #-----------------------------------------------------------------------------
-# Apply Definitions to compiler in this directory and below
+# Option to use new-style references with dimension scale APIs
 #-----------------------------------------------------------------------------
-add_definitions (${HDF_EXTRA_C_FLAGS})
-
-#-----------------------------------------------------------------------------
-# Shared Libs
-#-----------------------------------------------------------------------------
-if (BUILD_SHARED_LIBS)
-  set (HL_BUILT_AS_DYNAMIC_LIB 1)
-else (BUILD_SHARED_LIBS)
-  set (HL_BUILT_AS_STATIC_LIB 1)
-endif (BUILD_SHARED_LIBS)
+option (HDF5_DIMENSION_SCALES_NEW_REF  "Use new-style references with dimension scale APIs" OFF)
+if (HDF5_DIMENSION_SCALES_NEW_REF)
+  set (H5_DIMENSION_SCALES_WITH_NEW_REF 1)
+endif ()
 
 #-----------------------------------------------------------------------------
 # List Source files
 #-----------------------------------------------------------------------------
-INCLUDE_DIRECTORIES (${HDF5_HL_SOURCE_DIR}/src )
 
-add_subdirectory (${HDF5_HL_SOURCE_DIR}/src ${HDF5_HL_BINARY_DIR}/src)
+add_subdirectory (src)
 
-#-- Build the High level Tools
+# Build HDF5 Tools
 if (HDF5_BUILD_TOOLS)
-  add_subdirectory (${HDF5_HL_SOURCE_DIR}/tools ${HDF5_HL_BINARY_DIR}/tools)
-endif (HDF5_BUILD_TOOLS)
+  add_subdirectory (tools)
+endif ()
 
 #-- Add High Level Examples
 if (HDF5_BUILD_EXAMPLES)
-  add_subdirectory (${HDF5_HL_SOURCE_DIR}/examples ${HDF5_HL_BINARY_DIR}/examples)
-endif (HDF5_BUILD_EXAMPLES)
+  add_subdirectory (examples)
+endif ()
 
 #-- Build the Unit testing if requested
-if (NOT HDF5_EXTERNALLY_CONFIGURED)
-  if (BUILD_TESTING)
-    add_subdirectory (${HDF5_HL_SOURCE_DIR}/test ${HDF5_HL_BINARY_DIR}/test)
-  endif (BUILD_TESTING)
-endif (NOT HDF5_EXTERNALLY_CONFIGURED)
+if (BUILD_TESTING AND HDF5_TEST_SERIAL)
+  add_subdirectory (test)
+endif ()
diff --git a/hl/COPYING b/hl/COPYING
deleted file mode 100644
index 6903daf..0000000
--- a/hl/COPYING
+++ /dev/null
@@ -1,16 +0,0 @@
-
-  Copyright by  The HDF Group and 
-                The Board of Trustees of the University of Illinois. 
-  All rights reserved. 
-
-  The files and subdirectories in this directory are part of HDF5.  
-  The full HDF5 copyright notice, including terms governing use, 
-  modification, and redistribution, is contained in the files COPYING 
-  and Copyright.html.  COPYING can be found at the root of the source 
-  code distribution tree; Copyright.html can be found at the root 
-  level of an installed copy of the electronic HDF5 document set and 
-  is linked from the top-level documents page.  It can also be found 
-  at http://www.hdfgroup.org/HDF5/doc/Copyright.html.  If you do not 
-  have access to either file, you may request a copy from 
-  help@hdfgroup.org. 
-
diff --git a/hl/Makefile.am b/hl/Makefile.am
index 9f31719..5660b9b 100644
--- a/hl/Makefile.am
+++ b/hl/Makefile.am
@@ -1,18 +1,15 @@
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
 #
-# 
 # This makefile mostly just reinvokes make in the various subdirectories
 # but does so in the correct order.  You can alternatively invoke make from
 # each subdirectory manually.
@@ -33,11 +30,21 @@ endif
 if BUILD_CXX_CONDITIONAL
   CXX_DIR = c++
 endif
+if BUILD_TESTS_CONDITIONAL
+  TEST_DIR = test
+else
+  TEST_DIR =
+endif
+if BUILD_TOOLS_CONDITIONAL
+  TOOLS_DIR = tools
+else
+  TOOLS_DIR =
+endif
 
 ## Don't recurse into any subdirectories if HDF5 is not configured to
 ## use the HL library
 if BUILD_HDF5_HL_CONDITIONAL
-   SUBDIRS=src test tools $(CXX_DIR) $(FORTRAN_DIR)
+   SUBDIRS=src $(TEST_DIR) $(TOOLS_DIR) $(CXX_DIR) $(FORTRAN_DIR)
 endif
 DIST_SUBDIRS=src test tools c++ fortran examples
 
diff --git a/hl/Makefile.in b/hl/Makefile.in
deleted file mode 100644
index 4113318..0000000
--- a/hl/Makefile.in
+++ /dev/null
@@ -1,1379 +0,0 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-#
-# 
-# This makefile mostly just reinvokes make in the various subdirectories
-# but does so in the correct order.  You can alternatively invoke make from
-# each subdirectory manually.
-#
-# HDF5 High-Level Makefile(.in)
-VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-DIST_COMMON = $(top_srcdir)/config/commence.am \
-	$(top_srcdir)/config/conclude.am $(srcdir)/Makefile.in \
-	$(srcdir)/Makefile.am $(top_srcdir)/bin/mkinstalldirs \
-	$(top_srcdir)/bin/test-driver COPYING
-TESTS =
-subdir = hl
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/aclocal_cxx.m4 \
-	$(top_srcdir)/m4/aclocal_fc.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/src/H5config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
-	ctags-recursive dvi-recursive html-recursive info-recursive \
-	install-data-recursive install-dvi-recursive \
-	install-exec-recursive install-html-recursive \
-	install-info-recursive install-pdf-recursive \
-	install-ps-recursive install-recursive installcheck-recursive \
-	installdirs-recursive pdf-recursive ps-recursive \
-	tags-recursive uninstall-recursive
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-am__recursive_targets = \
-  $(RECURSIVE_TARGETS) \
-  $(RECURSIVE_CLEAN_TARGETS) \
-  $(am__extra_recursive_targets)
-AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	check recheck distdir
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-am__tty_colors_dummy = \
-  mgn= red= grn= lgn= blu= brg= std=; \
-  am__color_tests=no
-am__tty_colors = { \
-  $(am__tty_colors_dummy); \
-  if test "X$(AM_COLOR_TESTS)" = Xno; then \
-    am__color_tests=no; \
-  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
-    am__color_tests=yes; \
-  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
-    am__color_tests=yes; \
-  fi; \
-  if test $$am__color_tests = yes; then \
-    red='[0;31m'; \
-    grn='[0;32m'; \
-    lgn='[1;32m'; \
-    blu='[1;34m'; \
-    mgn='[0;35m'; \
-    brg='[1m'; \
-    std='[m'; \
-  fi; \
-}
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__recheck_rx = ^[ 	]*:recheck:[ 	]*
-am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
-am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
-# A command that, given a newline-separated list of test names on the
-# standard input, print the name of the tests that are to be re-run
-# upon "make recheck".
-am__list_recheck_tests = $(AWK) '{ \
-  recheck = 1; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-        { \
-          if ((getline line2 < ($$0 ".log")) < 0) \
-	    recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
-        { \
-          recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
-        { \
-          break; \
-        } \
-    }; \
-  if (recheck) \
-    print $$0; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# A command that, given a newline-separated list of test names on the
-# standard input, create the global log from their .trs and .log files.
-am__create_global_log = $(AWK) ' \
-function fatal(msg) \
-{ \
-  print "fatal: making $@: " msg | "cat >&2"; \
-  exit 1; \
-} \
-function rst_section(header) \
-{ \
-  print header; \
-  len = length(header); \
-  for (i = 1; i <= len; i = i + 1) \
-    printf "="; \
-  printf "\n\n"; \
-} \
-{ \
-  copy_in_global_log = 1; \
-  global_test_result = "RUN"; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-         fatal("failed to read from " $$0 ".trs"); \
-      if (line ~ /$(am__global_test_result_rx)/) \
-        { \
-          sub("$(am__global_test_result_rx)", "", line); \
-          sub("[ 	]*$$", "", line); \
-          global_test_result = line; \
-        } \
-      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
-        copy_in_global_log = 0; \
-    }; \
-  if (copy_in_global_log) \
-    { \
-      rst_section(global_test_result ": " $$0); \
-      while ((rc = (getline line < ($$0 ".log"))) != 0) \
-      { \
-        if (rc < 0) \
-          fatal("failed to read from " $$0 ".log"); \
-        print line; \
-      }; \
-      printf "\n"; \
-    }; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# Restructured Text title.
-am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
-# Solaris 10 'make', and several other traditional 'make' implementations,
-# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
-# by disabling -e (using the XSI extension "set +e") if it's set.
-am__sh_e_setup = case $$- in *e*) set +e;; esac
-# Default flags passed to test drivers.
-am__common_driver_flags = \
-  --color-tests "$$am__color_tests" \
-  --enable-hard-errors "$$am__enable_hard_errors" \
-  --expect-failure "$$am__expect_failure"
-# To be inserted before the command running the test.  Creates the
-# directory for the log if needed.  Stores in $dir the directory
-# containing $f, in $tst the test, in $log the log.  Executes the
-# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
-# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
-# will run the test scripts (or their associated LOG_COMPILER, if
-# thy have one).
-am__check_pre = \
-$(am__sh_e_setup);					\
-$(am__vpath_adj_setup) $(am__vpath_adj)			\
-$(am__tty_colors);					\
-srcdir=$(srcdir); export srcdir;			\
-case "$@" in						\
-  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
-    *) am__odir=.;; 					\
-esac;							\
-test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
-  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
-if test -f "./$$f"; then dir=./;			\
-elif test -f "$$f"; then dir=;				\
-else dir="$(srcdir)/"; fi;				\
-tst=$$dir$$f; log='$@'; 				\
-if test -n '$(DISABLE_HARD_ERRORS)'; then		\
-  am__enable_hard_errors=no; 				\
-else							\
-  am__enable_hard_errors=yes; 				\
-fi; 							\
-case " $(XFAIL_TESTS) " in				\
-  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
-    am__expect_failure=yes;;				\
-  *)							\
-    am__expect_failure=no;;				\
-esac; 							\
-$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
-# A shell command to get the names of the tests scripts with any registered
-# extension removed (i.e., equivalently, the names of the test logs, with
-# the '.log' extension removed).  The result is saved in the shell variable
-# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
-# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
-# since that might cause problem with VPATH rewrites for suffix-less tests.
-# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
-am__set_TESTS_bases = \
-  bases='$(TEST_LOGS)'; \
-  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
-  bases=`echo $$bases`
-RECHECK_LOGS = $(TEST_LOGS)
-TEST_SUITE_LOG = test-suite.log
-am__test_logs1 = $(TESTS:=.log)
-am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
-TEST_LOGS = $(am__test_logs2:.sh.log=.log)
-SH_LOG_DRIVER = $(SHELL) $(top_srcdir)/bin/test-driver
-SH_LOG_COMPILE = $(SH_LOG_COMPILER) $(AM_SH_LOG_FLAGS) $(SH_LOG_FLAGS)
-am__set_b = \
-  case '$@' in \
-    */*) \
-      case '$*' in \
-        */*) b='$*';; \
-          *) b=`echo '$@' | sed 's/\.log$$//'`; \
-       esac;; \
-    *) \
-      b='$*';; \
-  esac
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
-  sed_rest='s,^[^/]*/*,,'; \
-  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
-  sed_butlast='s,/*[^/]*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
-ACLOCAL = @ACLOCAL@
-ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
-AMTAR = @AMTAR@
-
-# H5_CFLAGS holds flags that should be used when building hdf5,
-# but which should not be exported to h5cc for building other programs.
-# AM_CFLAGS is an automake construct which should be used by Makefiles 
-# instead of CFLAGS, as CFLAGS is reserved solely for the user to define.
-# This applies to FCFLAGS, CXXFLAGS, CPPFLAGS, and LDFLAGS as well.
-AM_CFLAGS = @AM_CFLAGS@ @H5_CFLAGS@
-AM_CPPFLAGS = @AM_CPPFLAGS@ @H5_CPPFLAGS@
-AM_CXXFLAGS = @AM_CXXFLAGS@ @H5_CXXFLAGS@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@
-AM_LDFLAGS = @AM_LDFLAGS@ @H5_LDFLAGS@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BYTESEX = @BYTESEX@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CC_VERSION = @CC_VERSION@
-CFLAGS = @CFLAGS@
-CLEARFILEBUF = @CLEARFILEBUF@
-CODESTACK = @CODESTACK@
-CONFIG_DATE = @CONFIG_DATE@
-CONFIG_MODE = @CONFIG_MODE@
-CONFIG_USER = @CONFIG_USER@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CXX_VERSION = @CXX_VERSION@
-CYGPATH_W = @CYGPATH_W@
-DEBUG_PKG = @DEBUG_PKG@
-DEFAULT_API_VERSION = @DEFAULT_API_VERSION@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
-DIRECT_VFD = @DIRECT_VFD@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-EXTERNAL_FILTERS = @EXTERNAL_FILTERS@
-
-# Make sure that these variables are exported to the Makefiles
-F9XMODEXT = @F9XMODEXT@
-F9XMODFLAG = @F9XMODFLAG@
-F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
-FC = @FC@
-FC2003 = @FC2003@
-FCFLAGS = @FCFLAGS@
-FCFLAGS_f90 = @FCFLAGS_f90@
-FCLIBS = @FCLIBS@
-FC_VERSION = @FC_VERSION@
-FGREP = @FGREP@
-FSEARCH_DIRS = @FSEARCH_DIRS@
-GREP = @GREP@
-H5_CFLAGS = @H5_CFLAGS@
-H5_CPPFLAGS = @H5_CPPFLAGS@
-H5_CXXFLAGS = @H5_CXXFLAGS@
-H5_CXX_SHARED = @H5_CXX_SHARED@
-H5_FCFLAGS = @H5_FCFLAGS@
-H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@
-H5_LDFLAGS = @H5_LDFLAGS@
-H5_LONE_COLON = @H5_LONE_COLON@
-H5_VERSION = @H5_VERSION@
-HADDR_T = @HADDR_T@
-HAVE_DMALLOC = @HAVE_DMALLOC@
-HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@
-HAVE_PTHREAD = @HAVE_PTHREAD@
-HDF5_HL = @HDF5_HL@
-HDF5_INTERFACES = @HDF5_INTERFACES@
-HDF_CXX = @HDF_CXX@
-HDF_FORTRAN = @HDF_FORTRAN@
-HDF_FORTRAN2003 = @HDF_FORTRAN2003@
-HID_T = @HID_T@
-HL = @HL@
-HL_FOR = @HL_FOR@
-HSIZE_T = @HSIZE_T@
-HSSIZE_T = @HSSIZE_T@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTRUMENT = @INSTRUMENT@
-INSTRUMENT_LIBRARY = @INSTRUMENT_LIBRARY@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LL_PATH = @LL_PATH@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_STATIC_EXEC = @LT_STATIC_EXEC@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MPE = @MPE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJECT_NAMELEN_DEFAULT_F = @OBJECT_NAMELEN_DEFAULT_F@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PARALLEL = @PARALLEL@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-RANLIB = @RANLIB@
-ROOT = @ROOT@
-RUNPARALLEL = @RUNPARALLEL@
-RUNSERIAL = @RUNSERIAL@
-R_INTEGER = @R_INTEGER@
-R_LARGE = @R_LARGE@
-SEARCH = @SEARCH@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SIZE_T = @SIZE_T@
-STATIC_EXEC = @STATIC_EXEC@
-STATIC_SHARED = @STATIC_SHARED@
-STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@
-STRIP = @STRIP@
-TESTPARALLEL = @TESTPARALLEL@
-THREADSAFE = @THREADSAFE@
-TIME = @TIME@
-TR = @TR@
-TRACE_API = @TRACE_API@
-UNAME_INFO = @UNAME_INFO@
-USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
-USE_FILTER_SZIP = @USE_FILTER_SZIP@
-USINGMEMCHECKER = @USINGMEMCHECKER@
-VERSION = @VERSION@
-WORDS_BIGENDIAN = @WORDS_BIGENDIAN@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_FC = @ac_ct_FC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-
-# Install directories that automake doesn't know about
-docdir = $(exec_prefix)/doc
-dvidir = @dvidir@
-enable_shared = @enable_shared@
-enable_static = @enable_static@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-
-# Shell commands used in Makefiles
-RM = rm -f
-CP = cp
-
-# Some machines need a command to run executables; this is that command
-# so that our tests will run.
-# We use RUNEXEC instead of RUNSERIAL directly because it may be that
-# some tests need to be run with a different command.  Older versions
-# of the makefiles used the command
-# $(LIBTOOL) --mode=execute
-# in some directories, for instance.
-RUNEXEC = $(RUNSERIAL)
-
-# Libraries to link to while building
-LIBHDF5 = $(top_builddir)/src/libhdf5.la
-LIBH5TEST = $(top_builddir)/test/libh5test.la
-LIBH5F = $(top_builddir)/fortran/src/libhdf5_fortran.la
-LIBH5FTEST = $(top_builddir)/fortran/test/libh5test_fortran.la
-LIBH5CPP = $(top_builddir)/c++/src/libhdf5_cpp.la
-LIBH5TOOLS = $(top_builddir)/tools/lib/libh5tools.la
-LIBH5_HL = $(top_builddir)/hl/src/libhdf5_hl.la
-LIBH5F_HL = $(top_builddir)/hl/fortran/src/libhdf5hl_fortran.la
-LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
-
-# Note that in svn revision 19400 the '/' after DESTDIR in H5* variables below  
-# has been removed. According to the official description of DESTDIR by Gnu at 
-# http://www.gnu.org/prep/standards/html_node/DESTDIR.html, DESTDIR is 
-# prepended to the normal and complete install path that it precedes for the 
-# purpose of installing in a temporary directory which is useful for building 
-# rpms and other packages.  The '/' after ${DESTDIR} will be followed by another 
-# '/' at the beginning of the normal install path.  When DESTDIR is empty the  
-# path then begins with '//', which is incorrect and causes problems at least for 
-# Cygwin.   
-
-# Scripts used to build examples
-# If only shared libraries have been installed, have h5cc build examples with
-# shared libraries instead of static libraries
-H5CC = ${DESTDIR}$(bindir)/h5cc
-H5CC_PP = ${DESTDIR}$(bindir)/h5pcc
-H5FC = ${DESTDIR}$(bindir)/h5fc
-H5FC_PP = ${DESTDIR}$(bindir)/h5pfc
-H5CPP = ${DESTDIR}$(bindir)/h5c++
-ACLOCAL_AMFLAGS = "-I m4"
-
-# The trace script; this is used on source files from the C library to
-# insert tracing macros.
-TRACE = perl $(top_srcdir)/bin/trace
-
-# .chkexe files are used to mark tests that have run successfully.
-# .chklog files are output from those tests.
-# *.clog and *.clog2 are from the MPE option.
-CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2
-@BUILD_FORTRAN_CONDITIONAL_TRUE@FORTRAN_DIR = fortran
-@BUILD_CXX_CONDITIONAL_TRUE@CXX_DIR = c++
-@BUILD_HDF5_HL_CONDITIONAL_TRUE@SUBDIRS = src test tools $(CXX_DIR) $(FORTRAN_DIR)
-DIST_SUBDIRS = src test tools c++ fortran examples
-
-# Automake needs to be taught how to build lib, progs, and tests targets.
-# These will be filled in automatically for the most part (e.g.,
-# lib_LIBRARIES are built for lib target), but EXTRA_LIB, EXTRA_PROG, and
-# EXTRA_TEST variables are supplied to allow the user to force targets to
-# be built at certain times. 
-LIB = $(lib_LIBRARIES) $(lib_LTLIBRARIES) $(noinst_LIBRARIES)                 \
-      $(noinst_LTLIBRARIES) $(check_LIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LIB)
-
-PROGS = $(bin_PROGRAMS) $(bin_SCRIPTS) $(noinst_PROGRAMS) $(noinst_SCRIPTS)   \
-        $(EXTRA_PROG)
-
-chk_TESTS = $(check_PROGRAMS) $(check_SCRIPTS) $(EXTRA_TEST) 
-TEST_EXTENSIONS = .sh
-SH_LOG_COMPILER = $(SHELL)
-AM_SH_LOG_FLAGS = 
-TEST_PROG_CHKEXE = $(TEST_PROG:=.chkexe_)
-TEST_PROG_PARA_CHKEXE = $(TEST_PROG_PARA:=.chkexe_)
-TEST_SCRIPT_CHKSH = $(TEST_SCRIPT:=.chkexe_)
-TEST_SCRIPT_PARA_CHKSH = $(TEST_SCRIPT_PARA:=.chkexe_)
-all: all-recursive
-
-.SUFFIXES:
-.SUFFIXES: .log .sh .sh$(EXEEXT) .trs
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign hl/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign hl/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-$(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am:
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run 'make' without going through this Makefile.
-# To change the values of 'make' variables: instead of editing Makefiles,
-# (1) if the variable is set in 'config.status', edit 'config.status'
-#     (which will cause the Makefiles to be regenerated when you run 'make');
-# (2) otherwise, pass the desired values on the 'make' command line.
-$(am__recursive_targets):
-	@fail=; \
-	if $(am__make_keepgoing); then \
-	  failcom='fail=yes'; \
-	else \
-	  failcom='exit 1'; \
-	fi; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-recursive
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: ctags-recursive
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-recursive
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-# Recover from deleted '.trs' file; this should ensure that
-# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
-# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
-# to avoid problems with "make -n".
-.log.trs:
-	rm -f $< $@
-	$(MAKE) $(AM_MAKEFLAGS) $<
-
-# Leading 'am--fnord' is there to ensure the list of targets does not
-# expand to empty, as could happen e.g. with make check TESTS=''.
-am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
-am--force-recheck:
-	@:
-
-$(TEST_SUITE_LOG): $(TEST_LOGS)
-	@$(am__set_TESTS_bases); \
-	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
-	redo_bases=`for i in $$bases; do \
-	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
-	            done`; \
-	if test -n "$$redo_bases"; then \
-	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
-	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
-	  if $(am__make_dryrun); then :; else \
-	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
-	  fi; \
-	fi; \
-	if test -n "$$am__remaking_logs"; then \
-	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
-	       "recursion detected" >&2; \
-	else \
-	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
-	fi; \
-	if $(am__make_dryrun); then :; else \
-	  st=0;  \
-	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
-	  for i in $$redo_bases; do \
-	    test -f $$i.trs && test -r $$i.trs \
-	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
-	    test -f $$i.log && test -r $$i.log \
-	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
-	  done; \
-	  test $$st -eq 0 || exit 1; \
-	fi
-	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
-	ws='[ 	]'; \
-	results=`for b in $$bases; do echo $$b.trs; done`; \
-	test -n "$$results" || results=/dev/null; \
-	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
-	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
-	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
-	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
-	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
-	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
-	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
-	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
-	  success=true; \
-	else \
-	  success=false; \
-	fi; \
-	br='==================='; br=$$br$$br$$br$$br; \
-	result_count () \
-	{ \
-	    if test x"$$1" = x"--maybe-color"; then \
-	      maybe_colorize=yes; \
-	    elif test x"$$1" = x"--no-color"; then \
-	      maybe_colorize=no; \
-	    else \
-	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
-	    fi; \
-	    shift; \
-	    desc=$$1 count=$$2; \
-	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
-	      color_start=$$3 color_end=$$std; \
-	    else \
-	      color_start= color_end=; \
-	    fi; \
-	    echo "$${color_start}# $$desc $$count$${color_end}"; \
-	}; \
-	create_testsuite_report () \
-	{ \
-	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
-	  result_count $$1 "PASS: " $$pass  "$$grn"; \
-	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
-	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
-	  result_count $$1 "FAIL: " $$fail  "$$red"; \
-	  result_count $$1 "XPASS:" $$xpass "$$red"; \
-	  result_count $$1 "ERROR:" $$error "$$mgn"; \
-	}; \
-	{								\
-	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
-	    $(am__rst_title);						\
-	  create_testsuite_report --no-color;				\
-	  echo;								\
-	  echo ".. contents:: :depth: 2";				\
-	  echo;								\
-	  for b in $$bases; do echo $$b; done				\
-	    | $(am__create_global_log);					\
-	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
-	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
-	if $$success; then						\
-	  col="$$grn";							\
-	 else								\
-	  col="$$red";							\
-	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
-	fi;								\
-	echo "$${col}$$br$${std}"; 					\
-	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
-	echo "$${col}$$br$${std}"; 					\
-	create_testsuite_report --maybe-color;				\
-	echo "$$col$$br$$std";						\
-	if $$success; then :; else					\
-	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
-	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
-	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
-	  fi;								\
-	  echo "$$col$$br$$std";					\
-	fi;								\
-	$$success || exit 1
-recheck: all 
-	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-	@set +e; $(am__set_TESTS_bases); \
-	bases=`for i in $$bases; do echo $$i; done \
-	         | $(am__list_recheck_tests)` || exit 1; \
-	log_list=`for i in $$bases; do echo $$i.log; done`; \
-	log_list=`echo $$log_list`; \
-	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
-	        am__force_recheck=am--force-recheck \
-	        TEST_LOGS="$$log_list"; \
-	exit $$?
-.sh.log:
-	@p='$<'; \
-	$(am__set_b); \
-	$(am__check_pre) $(SH_LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_SH_LOG_DRIVER_FLAGS) $(SH_LOG_DRIVER_FLAGS) -- $(SH_LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-@am__EXEEXT_TRUE@.sh$(EXEEXT).log:
-@am__EXEEXT_TRUE@	@p='$<'; \
-@am__EXEEXT_TRUE@	$(am__set_b); \
-@am__EXEEXT_TRUE@	$(am__check_pre) $(SH_LOG_DRIVER) --test-name "$$f" \
-@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
-@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_SH_LOG_DRIVER_FLAGS) $(SH_LOG_DRIVER_FLAGS) -- $(SH_LOG_COMPILE) \
-@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    $(am__make_dryrun) \
-	      || test -d "$(distdir)/$$subdir" \
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
-	      || exit 1; \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
-check: check-recursive
-all-am: Makefile all-local
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
-	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
-	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am: installcheck-local
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool \
-	mostlyclean-local
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: $(am__recursive_targets) check-am install-am install-strip
-
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \
-	check check-TESTS check-am clean clean-generic clean-libtool \
-	cscopelist-am ctags ctags-am distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installcheck-local installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
-	pdf-am ps ps-am recheck tags tags-am uninstall uninstall-am
-
-
-# List all build rules defined by HDF5 Makefiles as "PHONY" targets here.
-# This tells the Makefiles that these targets are not files to be built but
-# commands that should be executed even if a file with the same name already
-# exists.
-.PHONY: build-check-clean build-check-p build-check-s build-lib build-progs \
-        build-tests check-clean check-install check-p check-s check-vfd \
-        install-doc lib progs tests uninstall-doc _exec_check-s _test help
-
-help:
-	@$(top_srcdir)/bin/makehelp
-
-# Install examples
-install-examples uninstall-examples:
-	for d in examples $(HDF5_INTERFACES); do               \
-	    (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;           \
-	done
-
-installcheck-local:
-	@(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
-
-# Clean examples when check-clean is invoked
-check-clean ::
-	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
-	@for d in X $(SUBDIRS) examples; do                                   \
-	    if test $$d != X && test $$d != .; then                           \
-	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
-	    fi;                                                               \
-	done
-
-build-check-clean:
-
-# lib/progs/tests targets recurse into subdirectories. build-* targets
-# build files in this directory.
-build-lib: $(LIB)
-build-progs: $(LIB) $(PROGS)
-build-tests: $(LIB) $(PROGS) $(chk_TESTS)
-
-# General rule for recursive building targets.
-# BUILT_SOURCES contain targets that need to be built before anything else
-# in the directory (e.g., for Fortran type detection)
-lib progs tests check-s check-p :: $(BUILT_SOURCES)
-	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
-	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X && test $$d != .; then                           \
-	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
-	    fi;                                                               \
-	done
-
-# General rule for recursive cleaning targets.  Like the rule above,
-# but doesn't require building BUILT_SOURCES.
-check-clean ::
-	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
-	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X && test $$d != .; then                           \
-	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
-	    fi;                                                               \
-	done
-
-# Tell Automake to build tests when the user types `make all' (this is
-# not its default behavior).  Also build EXTRA_LIB and EXTRA_PROG since
-# Automake won't build them automatically, either.
-all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(chk_TESTS)
-
-# make install-doc doesn't do anything outside of doc directory, but
-# Makefiles should recognize it.
-# UPDATE: docs no longer reside in this build tree, so this target
-# is depreciated.
-install-doc uninstall-doc:
-	@echo "Nothing to be done."
-
-# clean up files generated by tests so they can be re-run.
-build-check-clean:
-	$(RM) -rf $(CHECK_CLEANFILES)
-
-# run check-clean whenever mostlyclean is run
-mostlyclean-local: build-check-clean
-
-# check-install is just a synonym for installcheck
-check-install: installcheck
-
-# Run each test in order, passing $(TEST_FLAGS) to the program.
-# Since tests are done in a shell loop, "make -i" does apply inside it.
-# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
-# The timestamps give a rough idea how much time the tests use.
-#
-# Note that targets in chk_TESTS (defined above) will be built when the user
-# types 'make tests' or 'make check', but only programs in TEST_PROG,
-# TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
-check-TESTS: test
-
-test _test:
-	@$(MAKE) build-check-s
-	@$(MAKE) build-check-p
-
-# Actual execution of check-s.
-build-check-s: $(LIB) $(PROGS) $(chk_TESTS)
-	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
-	   echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
-	fi
-	@$(MAKE) $(AM_MAKEFLAGS) _exec_check-s
-	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
-	    echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
-	fi
-
-_exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH)
-
-# The dummy.chkexe here prevents the target from being
-# empty if there are no tests in the current directory.
-# $${log} is the log file.
-# $${tname} is the name of test.
-$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
-	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \
-	   tname=$(@:.chkexe_=)$(EXEEXT);\
-	   log=$(@:.chkexe_=.chklog); \
-	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \
-	      echo "No need to test $${tname} again."; \
-	   else \
-	      echo "============================" > $${log}; \
-	      if test "X$(FORTRAN_API)" = "Xyes"; then \
-	         echo "Fortran API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "Fortran API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(CXX_API)" = "Xyes"; then \
-	         echo "C++ API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "C++ API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log};\
-	      else \
-	         echo "Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "$(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      fi; \
-	      echo "============================" >> $${log}; \
-	      srcdir="$(srcdir)" \
-	         $(TIME) $(RUNEXEC) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \
-	         && touch $(@:.chkexe_=.chkexe) || \
-	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	         (cat $${log} && false) || exit 1; \
-	      echo "" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
-	      echo "============================" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
-	      cat $${log}; \
-	   fi; \
-	fi
-
-# The dummysh.chkexe here prevents the target from being
-# empty if there are no tests in the current directory.
-# $${log} is the log file.
-# $${tname} is the name of test.
-$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
-	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummysh.chkexe_"; then \
-	   cmd=$(@:.chkexe_=);\
-	   tname=`basename $$cmd`;\
-	   chkname=`basename $(@:.chkexe_=.chkexe)`;\
-	   log=`basename $(@:.chkexe_=.chklog)`; \
-	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer $${chkname} $$cmd $(SCRIPT_DEPEND); then \
-	      echo "No need to test $${tname} again."; \
-	   else \
-	      echo "============================" > $${log}; \
-	      if test "X$(FORTRAN_API)" = "Xyes"; then \
-	         echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(CXX_API)" = "Xyes"; then \
-	         echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      else \
-	         echo "Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      fi; \
-	      echo "============================" >> $${log}; \
-	      RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
-	      srcdir="$(srcdir)" \
-	         $(TIME) $(SHELL) $$cmd $(TEST_FLAGS) >> $${log} 2>&1 \
-	         && touch $${chkname} || \
-	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	         (cat $${log} && false) || exit 1; \
-	      echo "" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
-	      echo "============================" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
-	      cat $${log}; \
-	   fi; \
-	   echo "============================"; \
-	fi
-
-# Actual execution of check-p.
-build-check-p: $(LIB) $(PROGS) $(chk_TESTS)
-	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
-	   echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
-	fi
-	@if test -n "$(TEST_PROG_PARA)"; then                                \
-	    echo "**** Hint ****";                                            \
-	    echo "Parallel test files reside in the current directory"        \
-	         "by default.";                                               \
-	    echo "Set HDF5_PARAPREFIX to use another directory. E.g.,";       \
-	    echo "    HDF5_PARAPREFIX=/PFS/user/me";                          \
-	    echo "    export HDF5_PARAPREFIX";                                \
-	    echo "    make check";                                            \
-	    echo "**** end of Hint ****";                                     \
-	fi
-	@for test in $(TEST_PROG_PARA) dummy; do                             \
-	   if test $$test != dummy; then                                      \
-	      $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ \
-	      RUNEXEC="$(RUNPARALLEL)" || exit 1; \
-	   fi;                                                                \
-	done
-	@for test in $(TEST_SCRIPT_PARA) dummy; do                           \
-	  if test $$test != dummy; then                                      \
-	    $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ || exit 1; \
-	  fi;                                                                 \
-	done
-	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
-	    echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
-	fi
-
-# Run test with different Virtual File Driver
-check-vfd: $(LIB) $(PROGS) $(chk_TESTS)
-	@for vfd in $(VFD_LIST) dummy; do                                     \
-	    if test $$vfd != dummy; then                                      \
-	        echo "============================";                          \
-	        echo "Testing Virtual File Driver $$vfd";                     \
-	        echo "============================";                          \
-	        $(MAKE) $(AM_MAKEFLAGS) check-clean || exit 1;                \
-	        HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check || exit 1;    \
-	    fi;                                                               \
-	done
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/hl/c++/CMakeLists.txt b/hl/c++/CMakeLists.txt
index 36f4c30..07e7777 100644
--- a/hl/c++/CMakeLists.txt
+++ b/hl/c++/CMakeLists.txt
@@ -1,22 +1,22 @@
-cmake_minimum_required (VERSION 3.1.0)
-PROJECT (HDF5_HL_CPP)
+cmake_minimum_required (VERSION 3.18)
+project (HDF5_HL_CPP CXX)
 
 #-----------------------------------------------------------------------------
 # Main HL lib is in /src
 #-----------------------------------------------------------------------------
-add_subdirectory (${HDF5_HL_CPP_SOURCE_DIR}/src ${HDF5_HL_CPP_BINARY_DIR}/src)
+add_subdirectory (src)
 
 # --------------------------------------------------------------------
 #  Add in the examples for the Packet Table codes
 # --------------------------------------------------------------------
 if (HDF5_BUILD_EXAMPLES)
-  add_subdirectory (${HDF5_HL_CPP_SOURCE_DIR}/examples ${HDF5_HL_CPP_BINARY_DIR}/examples)
-endif (HDF5_BUILD_EXAMPLES)
+  add_subdirectory (examples)
+endif ()
 
 # --------------------------------------------------------------------
 # Add in the unit tests for the packet table c++ wrapper
 # --------------------------------------------------------------------
 
 if (BUILD_TESTING)
-  add_subdirectory (${HDF5_HL_CPP_SOURCE_DIR}/test ${HDF5_HL_CPP_BINARY_DIR}/test)
-endif (BUILD_TESTING)
+  add_subdirectory (test)
+endif ()
diff --git a/hl/c++/COPYING b/hl/c++/COPYING
deleted file mode 100644
index 6903daf..0000000
--- a/hl/c++/COPYING
+++ /dev/null
@@ -1,16 +0,0 @@
-
-  Copyright by  The HDF Group and 
-                The Board of Trustees of the University of Illinois. 
-  All rights reserved. 
-
-  The files and subdirectories in this directory are part of HDF5.  
-  The full HDF5 copyright notice, including terms governing use, 
-  modification, and redistribution, is contained in the files COPYING 
-  and Copyright.html.  COPYING can be found at the root of the source 
-  code distribution tree; Copyright.html can be found at the root 
-  level of an installed copy of the electronic HDF5 document set and 
-  is linked from the top-level documents page.  It can also be found 
-  at http://www.hdfgroup.org/HDF5/doc/Copyright.html.  If you do not 
-  have access to either file, you may request a copy from 
-  help@hdfgroup.org. 
-
diff --git a/hl/c++/Makefile.am b/hl/c++/Makefile.am
index 80445f7..4bdab41 100644
--- a/hl/c++/Makefile.am
+++ b/hl/c++/Makefile.am
@@ -1,26 +1,29 @@
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 ##
 ## Makefile.am
 ## Run automake to generate a Makefile.in from this file.
 #
 # High-Level API C++ Makefile(.in)
-# 
+#
 
 include $(top_srcdir)/config/commence.am
 
-SUBDIRS=src test
+if BUILD_TESTS_CONDITIONAL
+   TESTSERIAL_DIR =test
+else
+   TESTSERIAL_DIR=
+endif
+
+SUBDIRS=src $(TESTSERIAL_DIR)
 DIST_SUBDIRS=src test examples
 
 # Install examples
diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in
deleted file mode 100644
index 95cc842..0000000
--- a/hl/c++/Makefile.in
+++ /dev/null
@@ -1,1369 +0,0 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-#
-# High-Level API C++ Makefile(.in)
-# 
-VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-DIST_COMMON = $(top_srcdir)/config/commence.am \
-	$(top_srcdir)/config/conclude.am $(srcdir)/Makefile.in \
-	$(srcdir)/Makefile.am $(top_srcdir)/bin/mkinstalldirs \
-	$(top_srcdir)/bin/test-driver COPYING
-TESTS =
-subdir = hl/c++
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/aclocal_cxx.m4 \
-	$(top_srcdir)/m4/aclocal_fc.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/src/H5config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
-	ctags-recursive dvi-recursive html-recursive info-recursive \
-	install-data-recursive install-dvi-recursive \
-	install-exec-recursive install-html-recursive \
-	install-info-recursive install-pdf-recursive \
-	install-ps-recursive install-recursive installcheck-recursive \
-	installdirs-recursive pdf-recursive ps-recursive \
-	tags-recursive uninstall-recursive
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-am__recursive_targets = \
-  $(RECURSIVE_TARGETS) \
-  $(RECURSIVE_CLEAN_TARGETS) \
-  $(am__extra_recursive_targets)
-AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	check recheck distdir
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-am__tty_colors_dummy = \
-  mgn= red= grn= lgn= blu= brg= std=; \
-  am__color_tests=no
-am__tty_colors = { \
-  $(am__tty_colors_dummy); \
-  if test "X$(AM_COLOR_TESTS)" = Xno; then \
-    am__color_tests=no; \
-  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
-    am__color_tests=yes; \
-  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
-    am__color_tests=yes; \
-  fi; \
-  if test $$am__color_tests = yes; then \
-    red='[0;31m'; \
-    grn='[0;32m'; \
-    lgn='[1;32m'; \
-    blu='[1;34m'; \
-    mgn='[0;35m'; \
-    brg='[1m'; \
-    std='[m'; \
-  fi; \
-}
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__recheck_rx = ^[ 	]*:recheck:[ 	]*
-am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
-am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
-# A command that, given a newline-separated list of test names on the
-# standard input, print the name of the tests that are to be re-run
-# upon "make recheck".
-am__list_recheck_tests = $(AWK) '{ \
-  recheck = 1; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-        { \
-          if ((getline line2 < ($$0 ".log")) < 0) \
-	    recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
-        { \
-          recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
-        { \
-          break; \
-        } \
-    }; \
-  if (recheck) \
-    print $$0; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# A command that, given a newline-separated list of test names on the
-# standard input, create the global log from their .trs and .log files.
-am__create_global_log = $(AWK) ' \
-function fatal(msg) \
-{ \
-  print "fatal: making $@: " msg | "cat >&2"; \
-  exit 1; \
-} \
-function rst_section(header) \
-{ \
-  print header; \
-  len = length(header); \
-  for (i = 1; i <= len; i = i + 1) \
-    printf "="; \
-  printf "\n\n"; \
-} \
-{ \
-  copy_in_global_log = 1; \
-  global_test_result = "RUN"; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-         fatal("failed to read from " $$0 ".trs"); \
-      if (line ~ /$(am__global_test_result_rx)/) \
-        { \
-          sub("$(am__global_test_result_rx)", "", line); \
-          sub("[ 	]*$$", "", line); \
-          global_test_result = line; \
-        } \
-      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
-        copy_in_global_log = 0; \
-    }; \
-  if (copy_in_global_log) \
-    { \
-      rst_section(global_test_result ": " $$0); \
-      while ((rc = (getline line < ($$0 ".log"))) != 0) \
-      { \
-        if (rc < 0) \
-          fatal("failed to read from " $$0 ".log"); \
-        print line; \
-      }; \
-      printf "\n"; \
-    }; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# Restructured Text title.
-am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
-# Solaris 10 'make', and several other traditional 'make' implementations,
-# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
-# by disabling -e (using the XSI extension "set +e") if it's set.
-am__sh_e_setup = case $$- in *e*) set +e;; esac
-# Default flags passed to test drivers.
-am__common_driver_flags = \
-  --color-tests "$$am__color_tests" \
-  --enable-hard-errors "$$am__enable_hard_errors" \
-  --expect-failure "$$am__expect_failure"
-# To be inserted before the command running the test.  Creates the
-# directory for the log if needed.  Stores in $dir the directory
-# containing $f, in $tst the test, in $log the log.  Executes the
-# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
-# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
-# will run the test scripts (or their associated LOG_COMPILER, if
-# thy have one).
-am__check_pre = \
-$(am__sh_e_setup);					\
-$(am__vpath_adj_setup) $(am__vpath_adj)			\
-$(am__tty_colors);					\
-srcdir=$(srcdir); export srcdir;			\
-case "$@" in						\
-  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
-    *) am__odir=.;; 					\
-esac;							\
-test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
-  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
-if test -f "./$$f"; then dir=./;			\
-elif test -f "$$f"; then dir=;				\
-else dir="$(srcdir)/"; fi;				\
-tst=$$dir$$f; log='$@'; 				\
-if test -n '$(DISABLE_HARD_ERRORS)'; then		\
-  am__enable_hard_errors=no; 				\
-else							\
-  am__enable_hard_errors=yes; 				\
-fi; 							\
-case " $(XFAIL_TESTS) " in				\
-  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
-    am__expect_failure=yes;;				\
-  *)							\
-    am__expect_failure=no;;				\
-esac; 							\
-$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
-# A shell command to get the names of the tests scripts with any registered
-# extension removed (i.e., equivalently, the names of the test logs, with
-# the '.log' extension removed).  The result is saved in the shell variable
-# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
-# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
-# since that might cause problem with VPATH rewrites for suffix-less tests.
-# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
-am__set_TESTS_bases = \
-  bases='$(TEST_LOGS)'; \
-  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
-  bases=`echo $$bases`
-RECHECK_LOGS = $(TEST_LOGS)
-TEST_SUITE_LOG = test-suite.log
-am__test_logs1 = $(TESTS:=.log)
-am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
-TEST_LOGS = $(am__test_logs2:.sh.log=.log)
-SH_LOG_DRIVER = $(SHELL) $(top_srcdir)/bin/test-driver
-SH_LOG_COMPILE = $(SH_LOG_COMPILER) $(AM_SH_LOG_FLAGS) $(SH_LOG_FLAGS)
-am__set_b = \
-  case '$@' in \
-    */*) \
-      case '$*' in \
-        */*) b='$*';; \
-          *) b=`echo '$@' | sed 's/\.log$$//'`; \
-       esac;; \
-    *) \
-      b='$*';; \
-  esac
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
-  sed_rest='s,^[^/]*/*,,'; \
-  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
-  sed_butlast='s,/*[^/]*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
-ACLOCAL = @ACLOCAL@
-ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
-AMTAR = @AMTAR@
-
-# H5_CFLAGS holds flags that should be used when building hdf5,
-# but which should not be exported to h5cc for building other programs.
-# AM_CFLAGS is an automake construct which should be used by Makefiles 
-# instead of CFLAGS, as CFLAGS is reserved solely for the user to define.
-# This applies to FCFLAGS, CXXFLAGS, CPPFLAGS, and LDFLAGS as well.
-AM_CFLAGS = @AM_CFLAGS@ @H5_CFLAGS@
-AM_CPPFLAGS = @AM_CPPFLAGS@ @H5_CPPFLAGS@
-AM_CXXFLAGS = @AM_CXXFLAGS@ @H5_CXXFLAGS@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@
-AM_LDFLAGS = @AM_LDFLAGS@ @H5_LDFLAGS@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BYTESEX = @BYTESEX@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CC_VERSION = @CC_VERSION@
-CFLAGS = @CFLAGS@
-CLEARFILEBUF = @CLEARFILEBUF@
-CODESTACK = @CODESTACK@
-CONFIG_DATE = @CONFIG_DATE@
-CONFIG_MODE = @CONFIG_MODE@
-CONFIG_USER = @CONFIG_USER@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CXX_VERSION = @CXX_VERSION@
-CYGPATH_W = @CYGPATH_W@
-DEBUG_PKG = @DEBUG_PKG@
-DEFAULT_API_VERSION = @DEFAULT_API_VERSION@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
-DIRECT_VFD = @DIRECT_VFD@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-EXTERNAL_FILTERS = @EXTERNAL_FILTERS@
-
-# Make sure that these variables are exported to the Makefiles
-F9XMODEXT = @F9XMODEXT@
-F9XMODFLAG = @F9XMODFLAG@
-F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
-FC = @FC@
-FC2003 = @FC2003@
-FCFLAGS = @FCFLAGS@
-FCFLAGS_f90 = @FCFLAGS_f90@
-FCLIBS = @FCLIBS@
-FC_VERSION = @FC_VERSION@
-FGREP = @FGREP@
-FSEARCH_DIRS = @FSEARCH_DIRS@
-GREP = @GREP@
-H5_CFLAGS = @H5_CFLAGS@
-H5_CPPFLAGS = @H5_CPPFLAGS@
-H5_CXXFLAGS = @H5_CXXFLAGS@
-H5_CXX_SHARED = @H5_CXX_SHARED@
-H5_FCFLAGS = @H5_FCFLAGS@
-H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@
-H5_LDFLAGS = @H5_LDFLAGS@
-H5_LONE_COLON = @H5_LONE_COLON@
-H5_VERSION = @H5_VERSION@
-HADDR_T = @HADDR_T@
-HAVE_DMALLOC = @HAVE_DMALLOC@
-HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@
-HAVE_PTHREAD = @HAVE_PTHREAD@
-HDF5_HL = @HDF5_HL@
-HDF5_INTERFACES = @HDF5_INTERFACES@
-HDF_CXX = @HDF_CXX@
-HDF_FORTRAN = @HDF_FORTRAN@
-HDF_FORTRAN2003 = @HDF_FORTRAN2003@
-HID_T = @HID_T@
-HL = @HL@
-HL_FOR = @HL_FOR@
-HSIZE_T = @HSIZE_T@
-HSSIZE_T = @HSSIZE_T@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTRUMENT = @INSTRUMENT@
-INSTRUMENT_LIBRARY = @INSTRUMENT_LIBRARY@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LL_PATH = @LL_PATH@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_STATIC_EXEC = @LT_STATIC_EXEC@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MPE = @MPE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJECT_NAMELEN_DEFAULT_F = @OBJECT_NAMELEN_DEFAULT_F@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PARALLEL = @PARALLEL@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-RANLIB = @RANLIB@
-ROOT = @ROOT@
-RUNPARALLEL = @RUNPARALLEL@
-RUNSERIAL = @RUNSERIAL@
-R_INTEGER = @R_INTEGER@
-R_LARGE = @R_LARGE@
-SEARCH = @SEARCH@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SIZE_T = @SIZE_T@
-STATIC_EXEC = @STATIC_EXEC@
-STATIC_SHARED = @STATIC_SHARED@
-STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@
-STRIP = @STRIP@
-TESTPARALLEL = @TESTPARALLEL@
-THREADSAFE = @THREADSAFE@
-TIME = @TIME@
-TR = @TR@
-TRACE_API = @TRACE_API@
-UNAME_INFO = @UNAME_INFO@
-USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
-USE_FILTER_SZIP = @USE_FILTER_SZIP@
-USINGMEMCHECKER = @USINGMEMCHECKER@
-VERSION = @VERSION@
-WORDS_BIGENDIAN = @WORDS_BIGENDIAN@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_FC = @ac_ct_FC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-
-# Install directories that automake doesn't know about
-docdir = $(exec_prefix)/doc
-dvidir = @dvidir@
-enable_shared = @enable_shared@
-enable_static = @enable_static@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-
-# Shell commands used in Makefiles
-RM = rm -f
-CP = cp
-
-# Some machines need a command to run executables; this is that command
-# so that our tests will run.
-# We use RUNEXEC instead of RUNSERIAL directly because it may be that
-# some tests need to be run with a different command.  Older versions
-# of the makefiles used the command
-# $(LIBTOOL) --mode=execute
-# in some directories, for instance.
-RUNEXEC = $(RUNSERIAL)
-
-# Libraries to link to while building
-LIBHDF5 = $(top_builddir)/src/libhdf5.la
-LIBH5TEST = $(top_builddir)/test/libh5test.la
-LIBH5F = $(top_builddir)/fortran/src/libhdf5_fortran.la
-LIBH5FTEST = $(top_builddir)/fortran/test/libh5test_fortran.la
-LIBH5CPP = $(top_builddir)/c++/src/libhdf5_cpp.la
-LIBH5TOOLS = $(top_builddir)/tools/lib/libh5tools.la
-LIBH5_HL = $(top_builddir)/hl/src/libhdf5_hl.la
-LIBH5F_HL = $(top_builddir)/hl/fortran/src/libhdf5hl_fortran.la
-LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
-
-# Note that in svn revision 19400 the '/' after DESTDIR in H5* variables below  
-# has been removed. According to the official description of DESTDIR by Gnu at 
-# http://www.gnu.org/prep/standards/html_node/DESTDIR.html, DESTDIR is 
-# prepended to the normal and complete install path that it precedes for the 
-# purpose of installing in a temporary directory which is useful for building 
-# rpms and other packages.  The '/' after ${DESTDIR} will be followed by another 
-# '/' at the beginning of the normal install path.  When DESTDIR is empty the  
-# path then begins with '//', which is incorrect and causes problems at least for 
-# Cygwin.   
-
-# Scripts used to build examples
-# If only shared libraries have been installed, have h5cc build examples with
-# shared libraries instead of static libraries
-H5CC = ${DESTDIR}$(bindir)/h5cc
-H5CC_PP = ${DESTDIR}$(bindir)/h5pcc
-H5FC = ${DESTDIR}$(bindir)/h5fc
-H5FC_PP = ${DESTDIR}$(bindir)/h5pfc
-H5CPP = ${DESTDIR}$(bindir)/h5c++
-ACLOCAL_AMFLAGS = "-I m4"
-
-# The trace script; this is used on source files from the C library to
-# insert tracing macros.
-TRACE = perl $(top_srcdir)/bin/trace
-
-# .chkexe files are used to mark tests that have run successfully.
-# .chklog files are output from those tests.
-# *.clog and *.clog2 are from the MPE option.
-CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2
-SUBDIRS = src test
-DIST_SUBDIRS = src test examples
-
-# Automake needs to be taught how to build lib, progs, and tests targets.
-# These will be filled in automatically for the most part (e.g.,
-# lib_LIBRARIES are built for lib target), but EXTRA_LIB, EXTRA_PROG, and
-# EXTRA_TEST variables are supplied to allow the user to force targets to
-# be built at certain times. 
-LIB = $(lib_LIBRARIES) $(lib_LTLIBRARIES) $(noinst_LIBRARIES)                 \
-      $(noinst_LTLIBRARIES) $(check_LIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LIB)
-
-PROGS = $(bin_PROGRAMS) $(bin_SCRIPTS) $(noinst_PROGRAMS) $(noinst_SCRIPTS)   \
-        $(EXTRA_PROG)
-
-chk_TESTS = $(check_PROGRAMS) $(check_SCRIPTS) $(EXTRA_TEST) 
-TEST_EXTENSIONS = .sh
-SH_LOG_COMPILER = $(SHELL)
-AM_SH_LOG_FLAGS = 
-TEST_PROG_CHKEXE = $(TEST_PROG:=.chkexe_)
-TEST_PROG_PARA_CHKEXE = $(TEST_PROG_PARA:=.chkexe_)
-TEST_SCRIPT_CHKSH = $(TEST_SCRIPT:=.chkexe_)
-TEST_SCRIPT_PARA_CHKSH = $(TEST_SCRIPT_PARA:=.chkexe_)
-all: all-recursive
-
-.SUFFIXES:
-.SUFFIXES: .log .sh .sh$(EXEEXT) .trs
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign hl/c++/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign hl/c++/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-$(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am:
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run 'make' without going through this Makefile.
-# To change the values of 'make' variables: instead of editing Makefiles,
-# (1) if the variable is set in 'config.status', edit 'config.status'
-#     (which will cause the Makefiles to be regenerated when you run 'make');
-# (2) otherwise, pass the desired values on the 'make' command line.
-$(am__recursive_targets):
-	@fail=; \
-	if $(am__make_keepgoing); then \
-	  failcom='fail=yes'; \
-	else \
-	  failcom='exit 1'; \
-	fi; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-recursive
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: ctags-recursive
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-recursive
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-# Recover from deleted '.trs' file; this should ensure that
-# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
-# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
-# to avoid problems with "make -n".
-.log.trs:
-	rm -f $< $@
-	$(MAKE) $(AM_MAKEFLAGS) $<
-
-# Leading 'am--fnord' is there to ensure the list of targets does not
-# expand to empty, as could happen e.g. with make check TESTS=''.
-am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
-am--force-recheck:
-	@:
-
-$(TEST_SUITE_LOG): $(TEST_LOGS)
-	@$(am__set_TESTS_bases); \
-	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
-	redo_bases=`for i in $$bases; do \
-	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
-	            done`; \
-	if test -n "$$redo_bases"; then \
-	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
-	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
-	  if $(am__make_dryrun); then :; else \
-	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
-	  fi; \
-	fi; \
-	if test -n "$$am__remaking_logs"; then \
-	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
-	       "recursion detected" >&2; \
-	else \
-	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
-	fi; \
-	if $(am__make_dryrun); then :; else \
-	  st=0;  \
-	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
-	  for i in $$redo_bases; do \
-	    test -f $$i.trs && test -r $$i.trs \
-	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
-	    test -f $$i.log && test -r $$i.log \
-	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
-	  done; \
-	  test $$st -eq 0 || exit 1; \
-	fi
-	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
-	ws='[ 	]'; \
-	results=`for b in $$bases; do echo $$b.trs; done`; \
-	test -n "$$results" || results=/dev/null; \
-	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
-	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
-	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
-	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
-	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
-	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
-	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
-	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
-	  success=true; \
-	else \
-	  success=false; \
-	fi; \
-	br='==================='; br=$$br$$br$$br$$br; \
-	result_count () \
-	{ \
-	    if test x"$$1" = x"--maybe-color"; then \
-	      maybe_colorize=yes; \
-	    elif test x"$$1" = x"--no-color"; then \
-	      maybe_colorize=no; \
-	    else \
-	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
-	    fi; \
-	    shift; \
-	    desc=$$1 count=$$2; \
-	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
-	      color_start=$$3 color_end=$$std; \
-	    else \
-	      color_start= color_end=; \
-	    fi; \
-	    echo "$${color_start}# $$desc $$count$${color_end}"; \
-	}; \
-	create_testsuite_report () \
-	{ \
-	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
-	  result_count $$1 "PASS: " $$pass  "$$grn"; \
-	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
-	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
-	  result_count $$1 "FAIL: " $$fail  "$$red"; \
-	  result_count $$1 "XPASS:" $$xpass "$$red"; \
-	  result_count $$1 "ERROR:" $$error "$$mgn"; \
-	}; \
-	{								\
-	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
-	    $(am__rst_title);						\
-	  create_testsuite_report --no-color;				\
-	  echo;								\
-	  echo ".. contents:: :depth: 2";				\
-	  echo;								\
-	  for b in $$bases; do echo $$b; done				\
-	    | $(am__create_global_log);					\
-	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
-	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
-	if $$success; then						\
-	  col="$$grn";							\
-	 else								\
-	  col="$$red";							\
-	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
-	fi;								\
-	echo "$${col}$$br$${std}"; 					\
-	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
-	echo "$${col}$$br$${std}"; 					\
-	create_testsuite_report --maybe-color;				\
-	echo "$$col$$br$$std";						\
-	if $$success; then :; else					\
-	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
-	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
-	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
-	  fi;								\
-	  echo "$$col$$br$$std";					\
-	fi;								\
-	$$success || exit 1
-recheck: all 
-	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-	@set +e; $(am__set_TESTS_bases); \
-	bases=`for i in $$bases; do echo $$i; done \
-	         | $(am__list_recheck_tests)` || exit 1; \
-	log_list=`for i in $$bases; do echo $$i.log; done`; \
-	log_list=`echo $$log_list`; \
-	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
-	        am__force_recheck=am--force-recheck \
-	        TEST_LOGS="$$log_list"; \
-	exit $$?
-.sh.log:
-	@p='$<'; \
-	$(am__set_b); \
-	$(am__check_pre) $(SH_LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_SH_LOG_DRIVER_FLAGS) $(SH_LOG_DRIVER_FLAGS) -- $(SH_LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-@am__EXEEXT_TRUE@.sh$(EXEEXT).log:
-@am__EXEEXT_TRUE@	@p='$<'; \
-@am__EXEEXT_TRUE@	$(am__set_b); \
-@am__EXEEXT_TRUE@	$(am__check_pre) $(SH_LOG_DRIVER) --test-name "$$f" \
-@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
-@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_SH_LOG_DRIVER_FLAGS) $(SH_LOG_DRIVER_FLAGS) -- $(SH_LOG_COMPILE) \
-@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    $(am__make_dryrun) \
-	      || test -d "$(distdir)/$$subdir" \
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
-	      || exit 1; \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
-check: check-recursive
-all-am: Makefile all-local
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
-	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
-	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am: installcheck-local
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool \
-	mostlyclean-local
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: $(am__recursive_targets) check-am install-am install-strip
-
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \
-	check check-TESTS check-am clean clean-generic clean-libtool \
-	cscopelist-am ctags ctags-am distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installcheck-local installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
-	pdf-am ps ps-am recheck tags tags-am uninstall uninstall-am
-
-
-# List all build rules defined by HDF5 Makefiles as "PHONY" targets here.
-# This tells the Makefiles that these targets are not files to be built but
-# commands that should be executed even if a file with the same name already
-# exists.
-.PHONY: build-check-clean build-check-p build-check-s build-lib build-progs \
-        build-tests check-clean check-install check-p check-s check-vfd \
-        install-doc lib progs tests uninstall-doc _exec_check-s _test help
-
-help:
-	@$(top_srcdir)/bin/makehelp
-
-# Install examples
-install-examples uninstall-examples:
-	@(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
-
-installcheck-local:
-	@(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
-
-# Clean examples when check-clean is invoked
-check-clean ::
-	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
-	@for d in X $(SUBDIRS) examples; do                                   \
-	    if test $$d != X && test $$d != .; then                           \
-	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
-	    fi;                                                               \
-	done
-
-# lib/progs/tests targets recurse into subdirectories. build-* targets
-# build files in this directory.
-build-lib: $(LIB)
-build-progs: $(LIB) $(PROGS)
-build-tests: $(LIB) $(PROGS) $(chk_TESTS)
-
-# General rule for recursive building targets.
-# BUILT_SOURCES contain targets that need to be built before anything else
-# in the directory (e.g., for Fortran type detection)
-lib progs tests check-s check-p :: $(BUILT_SOURCES)
-	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
-	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X && test $$d != .; then                           \
-	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
-	    fi;                                                               \
-	done
-
-# General rule for recursive cleaning targets.  Like the rule above,
-# but doesn't require building BUILT_SOURCES.
-check-clean ::
-	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
-	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X && test $$d != .; then                           \
-	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
-	    fi;                                                               \
-	done
-
-# Tell Automake to build tests when the user types `make all' (this is
-# not its default behavior).  Also build EXTRA_LIB and EXTRA_PROG since
-# Automake won't build them automatically, either.
-all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(chk_TESTS)
-
-# make install-doc doesn't do anything outside of doc directory, but
-# Makefiles should recognize it.
-# UPDATE: docs no longer reside in this build tree, so this target
-# is depreciated.
-install-doc uninstall-doc:
-	@echo "Nothing to be done."
-
-# clean up files generated by tests so they can be re-run.
-build-check-clean:
-	$(RM) -rf $(CHECK_CLEANFILES)
-
-# run check-clean whenever mostlyclean is run
-mostlyclean-local: build-check-clean
-
-# check-install is just a synonym for installcheck
-check-install: installcheck
-
-# Run each test in order, passing $(TEST_FLAGS) to the program.
-# Since tests are done in a shell loop, "make -i" does apply inside it.
-# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
-# The timestamps give a rough idea how much time the tests use.
-#
-# Note that targets in chk_TESTS (defined above) will be built when the user
-# types 'make tests' or 'make check', but only programs in TEST_PROG,
-# TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
-check-TESTS: test
-
-test _test:
-	@$(MAKE) build-check-s
-	@$(MAKE) build-check-p
-
-# Actual execution of check-s.
-build-check-s: $(LIB) $(PROGS) $(chk_TESTS)
-	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
-	   echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
-	fi
-	@$(MAKE) $(AM_MAKEFLAGS) _exec_check-s
-	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
-	    echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
-	fi
-
-_exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH)
-
-# The dummy.chkexe here prevents the target from being
-# empty if there are no tests in the current directory.
-# $${log} is the log file.
-# $${tname} is the name of test.
-$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
-	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \
-	   tname=$(@:.chkexe_=)$(EXEEXT);\
-	   log=$(@:.chkexe_=.chklog); \
-	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \
-	      echo "No need to test $${tname} again."; \
-	   else \
-	      echo "============================" > $${log}; \
-	      if test "X$(FORTRAN_API)" = "Xyes"; then \
-	         echo "Fortran API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "Fortran API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(CXX_API)" = "Xyes"; then \
-	         echo "C++ API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "C++ API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log};\
-	      else \
-	         echo "Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "$(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      fi; \
-	      echo "============================" >> $${log}; \
-	      srcdir="$(srcdir)" \
-	         $(TIME) $(RUNEXEC) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \
-	         && touch $(@:.chkexe_=.chkexe) || \
-	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	         (cat $${log} && false) || exit 1; \
-	      echo "" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
-	      echo "============================" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
-	      cat $${log}; \
-	   fi; \
-	fi
-
-# The dummysh.chkexe here prevents the target from being
-# empty if there are no tests in the current directory.
-# $${log} is the log file.
-# $${tname} is the name of test.
-$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
-	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummysh.chkexe_"; then \
-	   cmd=$(@:.chkexe_=);\
-	   tname=`basename $$cmd`;\
-	   chkname=`basename $(@:.chkexe_=.chkexe)`;\
-	   log=`basename $(@:.chkexe_=.chklog)`; \
-	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer $${chkname} $$cmd $(SCRIPT_DEPEND); then \
-	      echo "No need to test $${tname} again."; \
-	   else \
-	      echo "============================" > $${log}; \
-	      if test "X$(FORTRAN_API)" = "Xyes"; then \
-	         echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(CXX_API)" = "Xyes"; then \
-	         echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      else \
-	         echo "Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      fi; \
-	      echo "============================" >> $${log}; \
-	      RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
-	      srcdir="$(srcdir)" \
-	         $(TIME) $(SHELL) $$cmd $(TEST_FLAGS) >> $${log} 2>&1 \
-	         && touch $${chkname} || \
-	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	         (cat $${log} && false) || exit 1; \
-	      echo "" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
-	      echo "============================" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
-	      cat $${log}; \
-	   fi; \
-	   echo "============================"; \
-	fi
-
-# Actual execution of check-p.
-build-check-p: $(LIB) $(PROGS) $(chk_TESTS)
-	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
-	   echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
-	fi
-	@if test -n "$(TEST_PROG_PARA)"; then                                \
-	    echo "**** Hint ****";                                            \
-	    echo "Parallel test files reside in the current directory"        \
-	         "by default.";                                               \
-	    echo "Set HDF5_PARAPREFIX to use another directory. E.g.,";       \
-	    echo "    HDF5_PARAPREFIX=/PFS/user/me";                          \
-	    echo "    export HDF5_PARAPREFIX";                                \
-	    echo "    make check";                                            \
-	    echo "**** end of Hint ****";                                     \
-	fi
-	@for test in $(TEST_PROG_PARA) dummy; do                             \
-	   if test $$test != dummy; then                                      \
-	      $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ \
-	      RUNEXEC="$(RUNPARALLEL)" || exit 1; \
-	   fi;                                                                \
-	done
-	@for test in $(TEST_SCRIPT_PARA) dummy; do                           \
-	  if test $$test != dummy; then                                      \
-	    $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ || exit 1; \
-	  fi;                                                                 \
-	done
-	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
-	    echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
-	fi
-
-# Run test with different Virtual File Driver
-check-vfd: $(LIB) $(PROGS) $(chk_TESTS)
-	@for vfd in $(VFD_LIST) dummy; do                                     \
-	    if test $$vfd != dummy; then                                      \
-	        echo "============================";                          \
-	        echo "Testing Virtual File Driver $$vfd";                     \
-	        echo "============================";                          \
-	        $(MAKE) $(AM_MAKEFLAGS) check-clean || exit 1;                \
-	        HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check || exit 1;    \
-	    fi;                                                               \
-	done
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/hl/c++/examples/CMakeLists.txt b/hl/c++/examples/CMakeLists.txt
index e3fc3ae..dfc5818 100644
--- a/hl/c++/examples/CMakeLists.txt
+++ b/hl/c++/examples/CMakeLists.txt
@@ -1,26 +1,35 @@
-cmake_minimum_required (VERSION 3.1.0)
-PROJECT (HDF5_HL_CPP_EXAMPLES)
-
-#-----------------------------------------------------------------------------
-# Setup include Directories
-#-----------------------------------------------------------------------------
-INCLUDE_DIRECTORIES (${HDF5_HL_SRC_DIR}/src)
-INCLUDE_DIRECTORIES (${HDF5_HL_CPP_SRC_DIR}/src)
+cmake_minimum_required (VERSION 3.18)
+project (HDF5_HL_CPP_EXAMPLES CXX)
 
 # --------------------------------------------------------------------
 #  Add in the examples for the Packet Table codes
 # --------------------------------------------------------------------
 add_executable (ptExampleFL ${HDF5_HL_CPP_EXAMPLES_SOURCE_DIR}/ptExampleFL.cpp)
-TARGET_NAMING (ptExampleFL ${LIB_TYPE})
-TARGET_C_PROPERTIES (ptExampleFL ${LIB_TYPE} " " " ")
-target_link_libraries (
-    ptExampleFL
-    ${HDF5_HL_CPP_LIB_TARGET}
-    ${HDF5_HL_LIB_TARGET}
-    ${HDF5_LIB_TARGET}
-)
+target_include_directories (ptExampleFL PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+if (NOT BUILD_SHARED_LIBS)
+  TARGET_C_PROPERTIES (ptExampleFL STATIC)
+  target_link_libraries (ptExampleFL PRIVATE
+      ${HDF5_HL_CPP_LIB_TARGET}
+      ${HDF5_HL_LIB_TARGET}
+      ${HDF5_LIB_TARGET}
+  )
+else ()
+  TARGET_C_PROPERTIES (ptExampleFL SHARED)
+  target_link_libraries (ptExampleFL PRIVATE
+      ${HDF5_HL_CPP_LIBSH_TARGET}
+      ${HDF5_HL_LIBSH_TARGET}
+      ${HDF5_LIBSH_TARGET}
+  )
+endif ()
 set_target_properties (ptExampleFL PROPERTIES FOLDER examples/hl/cpp)
 
-if (BUILD_TESTING)
+#-----------------------------------------------------------------------------
+# Add Target to clang-format
+#-----------------------------------------------------------------------------
+if (HDF5_ENABLE_FORMATTERS)
+  clang_format (HDF5_HL_CPP_EXAMPLES_FORMAT ptExampleFL)
+endif ()
+
+if (BUILD_TESTING AND HDF5_TEST_CPP AND HDF5_TEST_EXAMPLES AND HDF5_TEST_SERIAL)
   include (CMakeTests.cmake)
-endif (BUILD_TESTING)
+endif ()
diff --git a/hl/c++/examples/CMakeTests.cmake b/hl/c++/examples/CMakeTests.cmake
index bac9fdf..8b2b4ce 100644
--- a/hl/c++/examples/CMakeTests.cmake
+++ b/hl/c++/examples/CMakeTests.cmake
@@ -1,3 +1,14 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
 
 ##############################################################################
 ##############################################################################
@@ -5,12 +16,40 @@
 ##############################################################################
 ##############################################################################
 # Remove any output file left over from previous test run
+set (HL_CPP_EX_PT_CLEANFILES
+            PTcppexampleFL.h5
+)
 add_test (
     NAME HL_CPP_ex_ptExampleFL-clear-objects
     COMMAND    ${CMAKE_COMMAND}
-        -E remove 
-            PTcppexampleFL.h5
+        -E remove ${HL_CPP_EX_PT_CLEANFILES}
+)
+set_tests_properties (HL_CPP_ex_ptExampleFL-clear-objects PROPERTIES
+    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
 )
 
-add_test (NAME HL_CPP_ex_ptExampleFL COMMAND $<TARGET_FILE:ptExampleFL>)
+if (HDF5_ENABLE_USING_MEMCHECKER)
+  add_test (NAME HL_CPP_ex_ptExampleFL COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:ptExampleFL>)
+else ()
+  add_test (NAME HL_CPP_ex_ptExampleFL COMMAND "${CMAKE_COMMAND}"
+      -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
+      -D "TEST_PROGRAM=$<TARGET_FILE:ptExampleFL>"
+      -D "TEST_ARGS:STRING="
+      -D "TEST_EXPECT=0"
+      -D "TEST_SKIP_COMPARE=TRUE"
+      -D "TEST_OUTPUT=ptExampleFL.txt"
+      #-D "TEST_REFERENCE=ptExampleFL.out"
+      -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+      -P "${HDF_RESOURCES_DIR}/runTest.cmake"
+  )
+endif ()
 set_tests_properties (HL_CPP_ex_ptExampleFL PROPERTIES DEPENDS HL_CPP_ex_ptExampleFL-clear-objects)
+add_test (
+    NAME HL_CPP_ex_ptExampleFL-clean-objects
+    COMMAND    ${CMAKE_COMMAND}
+        -E remove ${HL_CPP_EX_PT_CLEANFILES}
+)
+set_tests_properties (HL_CPP_ex_ptExampleFL-clean-objects PROPERTIES
+    DEPENDS HL_CPP_ex_ptExampleFL
+    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+)
diff --git a/hl/c++/examples/Makefile.am b/hl/c++/examples/Makefile.am
index c8f0305..a069065 100644
--- a/hl/c++/examples/Makefile.am
+++ b/hl/c++/examples/Makefile.am
@@ -1,16 +1,13 @@
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 ##
 ## Makefile.am
 ## Run automake to generate a Makefile.in from this file.
@@ -35,7 +32,8 @@ CXX_API=yes
 
 # Where to install examples
 # Note: no '/' after DESTDIR.  Explanation in commence.am
-EXAMPLEDIR=${DESTDIR}$(exec_prefix)/share/hdf5_examples/hl/c++
+EXAMPLEDIR=${DESTDIR}$(examplesdir)/hl/c++
+EXAMPLETOPDIR=${DESTDIR}$(examplesdir)/hl
 
 # How to build programs using h5c++
 $(EXTRA_PROG): $(H5CPP)
diff --git a/hl/c++/examples/Makefile.in b/hl/c++/examples/Makefile.in
deleted file mode 100644
index abc23ba..0000000
--- a/hl/c++/examples/Makefile.in
+++ /dev/null
@@ -1,1286 +0,0 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-#
-# HDF5 Library Examples Makefile(.in)
-#
-
-# We can't tell automake about example programs, because they need to be
-# built using h5cc (or h5fc, etc.) instead of the standard compilers.
-# This creates some extra work for us.
-VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-DIST_COMMON = $(top_srcdir)/config/commence.am \
-	$(top_srcdir)/config/examples.am \
-	$(top_srcdir)/config/conclude.am $(srcdir)/Makefile.in \
-	$(srcdir)/Makefile.am $(top_srcdir)/bin/mkinstalldirs \
-	$(srcdir)/run-hlc++-ex.sh.in $(top_srcdir)/bin/test-driver
-TESTS =
-subdir = hl/c++/examples
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/aclocal_cxx.m4 \
-	$(top_srcdir)/m4/aclocal_fc.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/src/H5config.h
-CONFIG_CLEAN_FILES = run-hlc++-ex.sh
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__tty_colors_dummy = \
-  mgn= red= grn= lgn= blu= brg= std=; \
-  am__color_tests=no
-am__tty_colors = { \
-  $(am__tty_colors_dummy); \
-  if test "X$(AM_COLOR_TESTS)" = Xno; then \
-    am__color_tests=no; \
-  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
-    am__color_tests=yes; \
-  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
-    am__color_tests=yes; \
-  fi; \
-  if test $$am__color_tests = yes; then \
-    red='[0;31m'; \
-    grn='[0;32m'; \
-    lgn='[1;32m'; \
-    blu='[1;34m'; \
-    mgn='[0;35m'; \
-    brg='[1m'; \
-    std='[m'; \
-  fi; \
-}
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__recheck_rx = ^[ 	]*:recheck:[ 	]*
-am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
-am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
-# A command that, given a newline-separated list of test names on the
-# standard input, print the name of the tests that are to be re-run
-# upon "make recheck".
-am__list_recheck_tests = $(AWK) '{ \
-  recheck = 1; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-        { \
-          if ((getline line2 < ($$0 ".log")) < 0) \
-	    recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
-        { \
-          recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
-        { \
-          break; \
-        } \
-    }; \
-  if (recheck) \
-    print $$0; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# A command that, given a newline-separated list of test names on the
-# standard input, create the global log from their .trs and .log files.
-am__create_global_log = $(AWK) ' \
-function fatal(msg) \
-{ \
-  print "fatal: making $@: " msg | "cat >&2"; \
-  exit 1; \
-} \
-function rst_section(header) \
-{ \
-  print header; \
-  len = length(header); \
-  for (i = 1; i <= len; i = i + 1) \
-    printf "="; \
-  printf "\n\n"; \
-} \
-{ \
-  copy_in_global_log = 1; \
-  global_test_result = "RUN"; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-         fatal("failed to read from " $$0 ".trs"); \
-      if (line ~ /$(am__global_test_result_rx)/) \
-        { \
-          sub("$(am__global_test_result_rx)", "", line); \
-          sub("[ 	]*$$", "", line); \
-          global_test_result = line; \
-        } \
-      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
-        copy_in_global_log = 0; \
-    }; \
-  if (copy_in_global_log) \
-    { \
-      rst_section(global_test_result ": " $$0); \
-      while ((rc = (getline line < ($$0 ".log"))) != 0) \
-      { \
-        if (rc < 0) \
-          fatal("failed to read from " $$0 ".log"); \
-        print line; \
-      }; \
-      printf "\n"; \
-    }; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# Restructured Text title.
-am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
-# Solaris 10 'make', and several other traditional 'make' implementations,
-# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
-# by disabling -e (using the XSI extension "set +e") if it's set.
-am__sh_e_setup = case $$- in *e*) set +e;; esac
-# Default flags passed to test drivers.
-am__common_driver_flags = \
-  --color-tests "$$am__color_tests" \
-  --enable-hard-errors "$$am__enable_hard_errors" \
-  --expect-failure "$$am__expect_failure"
-# To be inserted before the command running the test.  Creates the
-# directory for the log if needed.  Stores in $dir the directory
-# containing $f, in $tst the test, in $log the log.  Executes the
-# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
-# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
-# will run the test scripts (or their associated LOG_COMPILER, if
-# thy have one).
-am__check_pre = \
-$(am__sh_e_setup);					\
-$(am__vpath_adj_setup) $(am__vpath_adj)			\
-$(am__tty_colors);					\
-srcdir=$(srcdir); export srcdir;			\
-case "$@" in						\
-  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
-    *) am__odir=.;; 					\
-esac;							\
-test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
-  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
-if test -f "./$$f"; then dir=./;			\
-elif test -f "$$f"; then dir=;				\
-else dir="$(srcdir)/"; fi;				\
-tst=$$dir$$f; log='$@'; 				\
-if test -n '$(DISABLE_HARD_ERRORS)'; then		\
-  am__enable_hard_errors=no; 				\
-else							\
-  am__enable_hard_errors=yes; 				\
-fi; 							\
-case " $(XFAIL_TESTS) " in				\
-  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
-    am__expect_failure=yes;;				\
-  *)							\
-    am__expect_failure=no;;				\
-esac; 							\
-$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
-# A shell command to get the names of the tests scripts with any registered
-# extension removed (i.e., equivalently, the names of the test logs, with
-# the '.log' extension removed).  The result is saved in the shell variable
-# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
-# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
-# since that might cause problem with VPATH rewrites for suffix-less tests.
-# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
-am__set_TESTS_bases = \
-  bases='$(TEST_LOGS)'; \
-  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
-  bases=`echo $$bases`
-RECHECK_LOGS = $(TEST_LOGS)
-AM_RECURSIVE_TARGETS = check recheck
-TEST_SUITE_LOG = test-suite.log
-am__test_logs1 = $(TESTS:=.log)
-am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
-TEST_LOGS = $(am__test_logs2:.sh.log=.log)
-SH_LOG_DRIVER = $(SHELL) $(top_srcdir)/bin/test-driver
-SH_LOG_COMPILE = $(SH_LOG_COMPILER) $(AM_SH_LOG_FLAGS) $(SH_LOG_FLAGS)
-am__set_b = \
-  case '$@' in \
-    */*) \
-      case '$*' in \
-        */*) b='$*';; \
-          *) b=`echo '$@' | sed 's/\.log$$//'`; \
-       esac;; \
-    *) \
-      b='$*';; \
-  esac
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
-AMTAR = @AMTAR@
-
-# H5_CFLAGS holds flags that should be used when building hdf5,
-# but which should not be exported to h5cc for building other programs.
-# AM_CFLAGS is an automake construct which should be used by Makefiles 
-# instead of CFLAGS, as CFLAGS is reserved solely for the user to define.
-# This applies to FCFLAGS, CXXFLAGS, CPPFLAGS, and LDFLAGS as well.
-AM_CFLAGS = @AM_CFLAGS@ @H5_CFLAGS@
-AM_CPPFLAGS = @AM_CPPFLAGS@ @H5_CPPFLAGS@
-AM_CXXFLAGS = @AM_CXXFLAGS@ @H5_CXXFLAGS@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@
-AM_LDFLAGS = @AM_LDFLAGS@ @H5_LDFLAGS@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BYTESEX = @BYTESEX@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CC_VERSION = @CC_VERSION@
-CFLAGS = @CFLAGS@
-CLEARFILEBUF = @CLEARFILEBUF@
-CODESTACK = @CODESTACK@
-CONFIG_DATE = @CONFIG_DATE@
-CONFIG_MODE = @CONFIG_MODE@
-CONFIG_USER = @CONFIG_USER@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CXX_VERSION = @CXX_VERSION@
-CYGPATH_W = @CYGPATH_W@
-DEBUG_PKG = @DEBUG_PKG@
-DEFAULT_API_VERSION = @DEFAULT_API_VERSION@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
-DIRECT_VFD = @DIRECT_VFD@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-EXTERNAL_FILTERS = @EXTERNAL_FILTERS@
-
-# Make sure that these variables are exported to the Makefiles
-F9XMODEXT = @F9XMODEXT@
-F9XMODFLAG = @F9XMODFLAG@
-F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
-FC = @FC@
-FC2003 = @FC2003@
-FCFLAGS = @FCFLAGS@
-FCFLAGS_f90 = @FCFLAGS_f90@
-FCLIBS = @FCLIBS@
-FC_VERSION = @FC_VERSION@
-FGREP = @FGREP@
-FSEARCH_DIRS = @FSEARCH_DIRS@
-GREP = @GREP@
-H5_CFLAGS = @H5_CFLAGS@
-H5_CPPFLAGS = @H5_CPPFLAGS@
-H5_CXXFLAGS = @H5_CXXFLAGS@
-H5_CXX_SHARED = @H5_CXX_SHARED@
-H5_FCFLAGS = @H5_FCFLAGS@
-H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@
-H5_LDFLAGS = @H5_LDFLAGS@
-H5_LONE_COLON = @H5_LONE_COLON@
-H5_VERSION = @H5_VERSION@
-HADDR_T = @HADDR_T@
-HAVE_DMALLOC = @HAVE_DMALLOC@
-HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@
-HAVE_PTHREAD = @HAVE_PTHREAD@
-HDF5_HL = @HDF5_HL@
-HDF5_INTERFACES = @HDF5_INTERFACES@
-HDF_CXX = @HDF_CXX@
-HDF_FORTRAN = @HDF_FORTRAN@
-HDF_FORTRAN2003 = @HDF_FORTRAN2003@
-HID_T = @HID_T@
-HL = @HL@
-HL_FOR = @HL_FOR@
-HSIZE_T = @HSIZE_T@
-HSSIZE_T = @HSSIZE_T@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTRUMENT = @INSTRUMENT@
-INSTRUMENT_LIBRARY = @INSTRUMENT_LIBRARY@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LL_PATH = @LL_PATH@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_STATIC_EXEC = @LT_STATIC_EXEC@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MPE = @MPE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJECT_NAMELEN_DEFAULT_F = @OBJECT_NAMELEN_DEFAULT_F@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PARALLEL = @PARALLEL@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-RANLIB = @RANLIB@
-ROOT = @ROOT@
-RUNPARALLEL = @RUNPARALLEL@
-RUNSERIAL = @RUNSERIAL@
-R_INTEGER = @R_INTEGER@
-R_LARGE = @R_LARGE@
-SEARCH = @SEARCH@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SIZE_T = @SIZE_T@
-STATIC_EXEC = @STATIC_EXEC@
-STATIC_SHARED = @STATIC_SHARED@
-STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@
-STRIP = @STRIP@
-TESTPARALLEL = @TESTPARALLEL@
-THREADSAFE = @THREADSAFE@
-TIME = @TIME@
-TR = @TR@
-TRACE_API = @TRACE_API@
-UNAME_INFO = @UNAME_INFO@
-USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
-USE_FILTER_SZIP = @USE_FILTER_SZIP@
-USINGMEMCHECKER = @USINGMEMCHECKER@
-VERSION = @VERSION@
-WORDS_BIGENDIAN = @WORDS_BIGENDIAN@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_FC = @ac_ct_FC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-
-# Install directories that automake doesn't know about
-docdir = $(exec_prefix)/doc
-dvidir = @dvidir@
-enable_shared = @enable_shared@
-enable_static = @enable_static@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-
-# Shell commands used in Makefiles
-RM = rm -f
-CP = cp
-
-# Some machines need a command to run executables; this is that command
-# so that our tests will run.
-# We use RUNEXEC instead of RUNSERIAL directly because it may be that
-# some tests need to be run with a different command.  Older versions
-# of the makefiles used the command
-# $(LIBTOOL) --mode=execute
-# in some directories, for instance.
-RUNEXEC = $(RUNSERIAL)
-
-# Libraries to link to while building
-LIBHDF5 = $(top_builddir)/src/libhdf5.la
-LIBH5TEST = $(top_builddir)/test/libh5test.la
-LIBH5F = $(top_builddir)/fortran/src/libhdf5_fortran.la
-LIBH5FTEST = $(top_builddir)/fortran/test/libh5test_fortran.la
-LIBH5CPP = $(top_builddir)/c++/src/libhdf5_cpp.la
-LIBH5TOOLS = $(top_builddir)/tools/lib/libh5tools.la
-LIBH5_HL = $(top_builddir)/hl/src/libhdf5_hl.la
-LIBH5F_HL = $(top_builddir)/hl/fortran/src/libhdf5hl_fortran.la
-LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
-
-# Note that in svn revision 19400 the '/' after DESTDIR in H5* variables below  
-# has been removed. According to the official description of DESTDIR by Gnu at 
-# http://www.gnu.org/prep/standards/html_node/DESTDIR.html, DESTDIR is 
-# prepended to the normal and complete install path that it precedes for the 
-# purpose of installing in a temporary directory which is useful for building 
-# rpms and other packages.  The '/' after ${DESTDIR} will be followed by another 
-# '/' at the beginning of the normal install path.  When DESTDIR is empty the  
-# path then begins with '//', which is incorrect and causes problems at least for 
-# Cygwin.   
-
-# Scripts used to build examples
-# If only shared libraries have been installed, have h5cc build examples with
-# shared libraries instead of static libraries
-H5CC = ${DESTDIR}$(bindir)/h5cc
-H5CC_PP = ${DESTDIR}$(bindir)/h5pcc
-H5FC = ${DESTDIR}$(bindir)/h5fc
-H5FC_PP = ${DESTDIR}$(bindir)/h5pfc
-H5CPP = ${DESTDIR}$(bindir)/h5c++
-ACLOCAL_AMFLAGS = "-I m4"
-
-# The trace script; this is used on source files from the C library to
-# insert tracing macros.
-TRACE = perl $(top_srcdir)/bin/trace
-
-# .chkexe files are used to mark tests that have run successfully.
-# .chklog files are output from those tests.
-# *.clog and *.clog2 are from the MPE option.
-CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5
-
-# These are the programs that 'make all' or 'make prog' will build and
-# which 'make check' will run.  List them in the order they should be run.
-EXAMPLE_PROG = ptExampleFL
-TEST_EXAMPLES_SCRIPT = $(INSTALL_SCRIPT_FILES)
-
-# These are the example files to be installed
-INSTALL_FILES = ptExampleFL.cpp
-INSTALL_SCRIPT_FILES = run-hlc++-ex.sh
-
-# Tell conclude.am that these are C++ tests.
-CXX_API = yes
-
-# Where to install examples
-# Note: no '/' after DESTDIR.  Explanation in commence.am
-EXAMPLEDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples/hl/c++
-
-# Assume that all tests in this directory are examples, and tell
-# conclude.am when to build them.
-EXTRA_PROG = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA)
-
-# We need to tell automake what to clean
-MOSTLYCLEANFILES = *.raw *.meta *.o
-CLEANFILES = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA)
-
-# Automake needs to be taught how to build lib, progs, and tests targets.
-# These will be filled in automatically for the most part (e.g.,
-# lib_LIBRARIES are built for lib target), but EXTRA_LIB, EXTRA_PROG, and
-# EXTRA_TEST variables are supplied to allow the user to force targets to
-# be built at certain times. 
-LIB = $(lib_LIBRARIES) $(lib_LTLIBRARIES) $(noinst_LIBRARIES)                 \
-      $(noinst_LTLIBRARIES) $(check_LIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LIB)
-
-PROGS = $(bin_PROGRAMS) $(bin_SCRIPTS) $(noinst_PROGRAMS) $(noinst_SCRIPTS)   \
-        $(EXTRA_PROG)
-
-chk_TESTS = $(check_PROGRAMS) $(check_SCRIPTS) $(EXTRA_TEST) 
-TEST_EXTENSIONS = .sh
-SH_LOG_COMPILER = $(SHELL)
-AM_SH_LOG_FLAGS = 
-TEST_PROG_CHKEXE = $(TEST_PROG:=.chkexe_)
-TEST_PROG_PARA_CHKEXE = $(TEST_PROG_PARA:=.chkexe_)
-TEST_SCRIPT_CHKSH = $(TEST_SCRIPT:=.chkexe_)
-TEST_SCRIPT_PARA_CHKSH = $(TEST_SCRIPT_PARA:=.chkexe_)
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .log .sh .sh$(EXEEXT) .trs
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/examples.am $(top_srcdir)/config/conclude.am $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign hl/c++/examples/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign hl/c++/examples/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-$(top_srcdir)/config/commence.am $(top_srcdir)/config/examples.am $(top_srcdir)/config/conclude.am:
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-run-hlc++-ex.sh: $(top_builddir)/config.status $(srcdir)/run-hlc++-ex.sh.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-# Recover from deleted '.trs' file; this should ensure that
-# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
-# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
-# to avoid problems with "make -n".
-.log.trs:
-	rm -f $< $@
-	$(MAKE) $(AM_MAKEFLAGS) $<
-
-# Leading 'am--fnord' is there to ensure the list of targets does not
-# expand to empty, as could happen e.g. with make check TESTS=''.
-am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
-am--force-recheck:
-	@:
-
-$(TEST_SUITE_LOG): $(TEST_LOGS)
-	@$(am__set_TESTS_bases); \
-	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
-	redo_bases=`for i in $$bases; do \
-	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
-	            done`; \
-	if test -n "$$redo_bases"; then \
-	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
-	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
-	  if $(am__make_dryrun); then :; else \
-	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
-	  fi; \
-	fi; \
-	if test -n "$$am__remaking_logs"; then \
-	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
-	       "recursion detected" >&2; \
-	else \
-	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
-	fi; \
-	if $(am__make_dryrun); then :; else \
-	  st=0;  \
-	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
-	  for i in $$redo_bases; do \
-	    test -f $$i.trs && test -r $$i.trs \
-	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
-	    test -f $$i.log && test -r $$i.log \
-	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
-	  done; \
-	  test $$st -eq 0 || exit 1; \
-	fi
-	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
-	ws='[ 	]'; \
-	results=`for b in $$bases; do echo $$b.trs; done`; \
-	test -n "$$results" || results=/dev/null; \
-	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
-	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
-	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
-	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
-	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
-	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
-	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
-	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
-	  success=true; \
-	else \
-	  success=false; \
-	fi; \
-	br='==================='; br=$$br$$br$$br$$br; \
-	result_count () \
-	{ \
-	    if test x"$$1" = x"--maybe-color"; then \
-	      maybe_colorize=yes; \
-	    elif test x"$$1" = x"--no-color"; then \
-	      maybe_colorize=no; \
-	    else \
-	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
-	    fi; \
-	    shift; \
-	    desc=$$1 count=$$2; \
-	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
-	      color_start=$$3 color_end=$$std; \
-	    else \
-	      color_start= color_end=; \
-	    fi; \
-	    echo "$${color_start}# $$desc $$count$${color_end}"; \
-	}; \
-	create_testsuite_report () \
-	{ \
-	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
-	  result_count $$1 "PASS: " $$pass  "$$grn"; \
-	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
-	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
-	  result_count $$1 "FAIL: " $$fail  "$$red"; \
-	  result_count $$1 "XPASS:" $$xpass "$$red"; \
-	  result_count $$1 "ERROR:" $$error "$$mgn"; \
-	}; \
-	{								\
-	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
-	    $(am__rst_title);						\
-	  create_testsuite_report --no-color;				\
-	  echo;								\
-	  echo ".. contents:: :depth: 2";				\
-	  echo;								\
-	  for b in $$bases; do echo $$b; done				\
-	    | $(am__create_global_log);					\
-	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
-	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
-	if $$success; then						\
-	  col="$$grn";							\
-	 else								\
-	  col="$$red";							\
-	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
-	fi;								\
-	echo "$${col}$$br$${std}"; 					\
-	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
-	echo "$${col}$$br$${std}"; 					\
-	create_testsuite_report --maybe-color;				\
-	echo "$$col$$br$$std";						\
-	if $$success; then :; else					\
-	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
-	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
-	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
-	  fi;								\
-	  echo "$$col$$br$$std";					\
-	fi;								\
-	$$success || exit 1
-recheck: all 
-	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-	@set +e; $(am__set_TESTS_bases); \
-	bases=`for i in $$bases; do echo $$i; done \
-	         | $(am__list_recheck_tests)` || exit 1; \
-	log_list=`for i in $$bases; do echo $$i.log; done`; \
-	log_list=`echo $$log_list`; \
-	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
-	        am__force_recheck=am--force-recheck \
-	        TEST_LOGS="$$log_list"; \
-	exit $$?
-.sh.log:
-	@p='$<'; \
-	$(am__set_b); \
-	$(am__check_pre) $(SH_LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_SH_LOG_DRIVER_FLAGS) $(SH_LOG_DRIVER_FLAGS) -- $(SH_LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-@am__EXEEXT_TRUE@.sh$(EXEEXT).log:
-@am__EXEEXT_TRUE@	@p='$<'; \
-@am__EXEEXT_TRUE@	$(am__set_b); \
-@am__EXEEXT_TRUE@	$(am__check_pre) $(SH_LOG_DRIVER) --test-name "$$f" \
-@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
-@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_SH_LOG_DRIVER_FLAGS) $(SH_LOG_DRIVER_FLAGS) -- $(SH_LOG_COMPILE) \
-@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
-check: check-am
-all-am: Makefile all-local
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
-	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
-	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
-	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-data-local
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am: installcheck-local
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool \
-	mostlyclean-local
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-local
-
-.MAKE: check-am install-am install-strip
-
-.PHONY: all all-am all-local check check-TESTS check-am clean \
-	clean-generic clean-libtool cscopelist-am ctags-am distclean \
-	distclean-generic distclean-libtool distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-data-local install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installcheck-local installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
-	pdf-am ps ps-am recheck tags-am uninstall uninstall-am \
-	uninstall-local
-
-
-# List all build rules defined by HDF5 Makefiles as "PHONY" targets here.
-# This tells the Makefiles that these targets are not files to be built but
-# commands that should be executed even if a file with the same name already
-# exists.
-.PHONY: build-check-clean build-check-p build-check-s build-lib build-progs \
-        build-tests check-clean check-install check-p check-s check-vfd \
-        install-doc lib progs tests uninstall-doc _exec_check-s _test help
-
-help:
-	@$(top_srcdir)/bin/makehelp
-
-# How to build programs using h5c++
-$(EXTRA_PROG): $(H5CPP)
-	$(H5CPP) $(H5CCFLAGS) $(CPPFLAGS) -o $@ $(srcdir)/$@.cpp
-
-# List dependencies for each program.  Normally, automake would take
-# care of this for us, but if we tell automake about the programs it
-# will try to build them with the normal C++ compiler, not h5c++.  This is
-# an inelegant way of solving the problem, unfortunately.
-ptExampleFL: ptExampleFL.cpp
-
-# How to create EXAMPLEDIR if it doesn't already exist
-$(EXAMPLEDIR):
-	-$(top_srcdir)/bin/mkdirs $@
-$(EXAMPLETOPDIR):
-	-$(top_srcdir)/bin/mkdirs $@
-
-# Install and uninstall rules.  We install the source files, not the
-# example programs themselves.
-install-data-local:
-	@$(MAKE) $(AM_MAKEFLAGS) install-examples
-uninstall-local:
-	@$(MAKE) $(AM_MAKEFLAGS) uninstall-examples
-
-install-examples: $(EXAMPLEDIR) $(INSTALL_FILES) 
-	@for f in X $(INSTALL_FILES); do                                     \
-	  if test $$f != X; then                                             \
-	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);    \
-            chmod a-x $(EXAMPLEDIR)/$$f;                                     \
-	  fi;                                                                \
-	done
-	@for f in X $(INSTALL_SCRIPT_FILES); do                                   \
-	  if test $$f != X; then                                             \
-	    (set -x; $(INSTALL) $$f $(EXAMPLEDIR)/. || exit 1);\
-	  fi;                                                                \
-	done
-	@for f in X $(INSTALL_TOP_FILES); do                       \
-	  if test $$f != X; then                                             \
-	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1); \
-            chmod a-x $(EXAMPLETOPDIR)/$$f;\
-	  fi;                                                                \
-	done
-	@for f in X $(INSTALL_TOP_SCRIPT_FILES); do                       \
-	  if test $$f != X; then                                             \
-	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1); \
-	  fi;                                                                \
-	done
-
-uninstall-examples:
-	@if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then             \
-	  set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_FILES);                \
-	fi
-	@if test -n "$(INSTALL_SCRIPT_FILES)" -a -d $(EXAMPLEDIR); then           \
-	  set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_SCRIPT_FILES);              \
-	fi
-	@if test -n "$(INSTALL_TOP_FILES)" -a -d $(EXAMPLETOPDIR); then    \
-	  set -x; cd $(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_FILES);       \
-	fi
-	@if test -n "$(INSTALL_TOP_SCRIPT_FILES)" -a -d $(EXAMPLETOPDIR); then    \
-	  set -x; cd $(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_SCRIPT_FILES);       \
-	fi
-
-installcheck-local:
-	@if test "$(STATIC_SHARED)" = "static, shared"; then               \
-	  H5CCFLAGS="-shlib" $(MAKE) $(AM_MAKEFLAGS) check;                \
-	  $(MAKE) $(AM_MAKEFLAGS) clean;                                   \
-	  H5CCFLAGS="" $(MAKE) $(AM_MAKEFLAGS) check;                      \
-	elif test "$(STATIC_SHARED)" = "shared"; then                     \
-	  H5CCFLAGS="-shlib" $(MAKE) $(AM_MAKEFLAGS) check;                \
-	else                                                              \
-	  $(MAKE) $(AM_MAKEFLAGS) check;                                   \
-	fi 
-	@if test "$(INSTALL_FILES)" -a $(TEST_EXAMPLES_SCRIPT) -a -d $(EXAMPLEDIR); then \
-	    echo "============================";                                         \
-	    echo "Testing $(TEST_EXAMPLES_SCRIPT)";                                      \
-	    echo "============================";                                         \
-	    (cd $(EXAMPLEDIR);                                                           \
-	     /bin/sh ./$(TEST_EXAMPLES_SCRIPT);)                                                   \
-	fi
-
-# lib/progs/tests targets recurse into subdirectories. build-* targets
-# build files in this directory.
-build-lib: $(LIB)
-build-progs: $(LIB) $(PROGS)
-build-tests: $(LIB) $(PROGS) $(chk_TESTS)
-
-# General rule for recursive building targets.
-# BUILT_SOURCES contain targets that need to be built before anything else
-# in the directory (e.g., for Fortran type detection)
-lib progs tests check-s check-p :: $(BUILT_SOURCES)
-	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
-	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X && test $$d != .; then                           \
-	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
-	    fi;                                                               \
-	done
-
-# General rule for recursive cleaning targets.  Like the rule above,
-# but doesn't require building BUILT_SOURCES.
-check-clean ::
-	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
-	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X && test $$d != .; then                           \
-	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
-	    fi;                                                               \
-	done
-
-# Tell Automake to build tests when the user types `make all' (this is
-# not its default behavior).  Also build EXTRA_LIB and EXTRA_PROG since
-# Automake won't build them automatically, either.
-all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(chk_TESTS)
-
-# make install-doc doesn't do anything outside of doc directory, but
-# Makefiles should recognize it.
-# UPDATE: docs no longer reside in this build tree, so this target
-# is depreciated.
-install-doc uninstall-doc:
-	@echo "Nothing to be done."
-
-# clean up files generated by tests so they can be re-run.
-build-check-clean:
-	$(RM) -rf $(CHECK_CLEANFILES)
-
-# run check-clean whenever mostlyclean is run
-mostlyclean-local: build-check-clean
-
-# check-install is just a synonym for installcheck
-check-install: installcheck
-
-# Run each test in order, passing $(TEST_FLAGS) to the program.
-# Since tests are done in a shell loop, "make -i" does apply inside it.
-# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
-# The timestamps give a rough idea how much time the tests use.
-#
-# Note that targets in chk_TESTS (defined above) will be built when the user
-# types 'make tests' or 'make check', but only programs in TEST_PROG,
-# TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
-check-TESTS: test
-
-test _test:
-	@$(MAKE) build-check-s
-	@$(MAKE) build-check-p
-
-# Actual execution of check-s.
-build-check-s: $(LIB) $(PROGS) $(chk_TESTS)
-	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
-	   echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
-	fi
-	@$(MAKE) $(AM_MAKEFLAGS) _exec_check-s
-	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
-	    echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
-	fi
-
-_exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH)
-
-# The dummy.chkexe here prevents the target from being
-# empty if there are no tests in the current directory.
-# $${log} is the log file.
-# $${tname} is the name of test.
-$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
-	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \
-	   tname=$(@:.chkexe_=)$(EXEEXT);\
-	   log=$(@:.chkexe_=.chklog); \
-	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \
-	      echo "No need to test $${tname} again."; \
-	   else \
-	      echo "============================" > $${log}; \
-	      if test "X$(FORTRAN_API)" = "Xyes"; then \
-	         echo "Fortran API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "Fortran API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(CXX_API)" = "Xyes"; then \
-	         echo "C++ API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "C++ API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log};\
-	      else \
-	         echo "Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "$(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      fi; \
-	      echo "============================" >> $${log}; \
-	      srcdir="$(srcdir)" \
-	         $(TIME) $(RUNEXEC) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \
-	         && touch $(@:.chkexe_=.chkexe) || \
-	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	         (cat $${log} && false) || exit 1; \
-	      echo "" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
-	      echo "============================" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
-	      cat $${log}; \
-	   fi; \
-	fi
-
-# The dummysh.chkexe here prevents the target from being
-# empty if there are no tests in the current directory.
-# $${log} is the log file.
-# $${tname} is the name of test.
-$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
-	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummysh.chkexe_"; then \
-	   cmd=$(@:.chkexe_=);\
-	   tname=`basename $$cmd`;\
-	   chkname=`basename $(@:.chkexe_=.chkexe)`;\
-	   log=`basename $(@:.chkexe_=.chklog)`; \
-	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer $${chkname} $$cmd $(SCRIPT_DEPEND); then \
-	      echo "No need to test $${tname} again."; \
-	   else \
-	      echo "============================" > $${log}; \
-	      if test "X$(FORTRAN_API)" = "Xyes"; then \
-	         echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(CXX_API)" = "Xyes"; then \
-	         echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      else \
-	         echo "Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      fi; \
-	      echo "============================" >> $${log}; \
-	      RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
-	      srcdir="$(srcdir)" \
-	         $(TIME) $(SHELL) $$cmd $(TEST_FLAGS) >> $${log} 2>&1 \
-	         && touch $${chkname} || \
-	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	         (cat $${log} && false) || exit 1; \
-	      echo "" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
-	      echo "============================" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
-	      cat $${log}; \
-	   fi; \
-	   echo "============================"; \
-	fi
-
-# Actual execution of check-p.
-build-check-p: $(LIB) $(PROGS) $(chk_TESTS)
-	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
-	   echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
-	fi
-	@if test -n "$(TEST_PROG_PARA)"; then                                \
-	    echo "**** Hint ****";                                            \
-	    echo "Parallel test files reside in the current directory"        \
-	         "by default.";                                               \
-	    echo "Set HDF5_PARAPREFIX to use another directory. E.g.,";       \
-	    echo "    HDF5_PARAPREFIX=/PFS/user/me";                          \
-	    echo "    export HDF5_PARAPREFIX";                                \
-	    echo "    make check";                                            \
-	    echo "**** end of Hint ****";                                     \
-	fi
-	@for test in $(TEST_PROG_PARA) dummy; do                             \
-	   if test $$test != dummy; then                                      \
-	      $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ \
-	      RUNEXEC="$(RUNPARALLEL)" || exit 1; \
-	   fi;                                                                \
-	done
-	@for test in $(TEST_SCRIPT_PARA) dummy; do                           \
-	  if test $$test != dummy; then                                      \
-	    $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ || exit 1; \
-	  fi;                                                                 \
-	done
-	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
-	    echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
-	fi
-
-# Run test with different Virtual File Driver
-check-vfd: $(LIB) $(PROGS) $(chk_TESTS)
-	@for vfd in $(VFD_LIST) dummy; do                                     \
-	    if test $$vfd != dummy; then                                      \
-	        echo "============================";                          \
-	        echo "Testing Virtual File Driver $$vfd";                     \
-	        echo "============================";                          \
-	        $(MAKE) $(AM_MAKEFLAGS) check-clean || exit 1;                \
-	        HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check || exit 1;    \
-	    fi;                                                               \
-	done
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/hl/c++/examples/ptExampleFL.cpp b/hl/c++/examples/ptExampleFL.cpp
index 3ce2217..0e280f0 100644
--- a/hl/c++/examples/ptExampleFL.cpp
+++ b/hl/c++/examples/ptExampleFL.cpp
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "H5PacketTable.h"
@@ -24,57 +21,66 @@
  *-------------------------------------------------------------------------
  */
 
-int main(void)
+const char *FILE_NAME("PTcppexampleFL.h5");
+const char *PT_NAME("/examplePacketTable");
+
+int
+main(void)
 {
-    herr_t err;     /* Return value from function calls */
-    hid_t fileID;   /* HDF5 identifier for file */
-    hsize_t count;  /* Number of records in table */
-    int x;          /* Temporary counter variable */
+    herr_t  err;     /* Return value from function calls */
+    hid_t   fileID;  /* HDF5 identifier for file */
+    hid_t   plistID; /* HDF5 identifier for property list to use compression */
+    hsize_t count;   /* Number of records in table */
+    int     x;       /* Temporary counter variable */
 
     /* Buffers to hold data */
     int readBuffer[5];
     int writeBuffer[5];
 
     /* Initialize buffers */
-    for(x=0; x<5; x++)
-    {
-        writeBuffer[x]=x;
-        readBuffer[x] = -1;
+    for (x = 0; x < 5; x++) {
+        writeBuffer[x] = x;
+        readBuffer[x]  = -1;
     }
 
     /* Create a new HDF5 file */
-    fileID = H5Fcreate("PTcppexampleFL.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    if(fileID <0)
+    fileID = H5Fcreate(FILE_NAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    if (fileID < 0)
         fprintf(stderr, "Couldn't create file.\n");
 
-    /* Create a fixed-length packet table with compression level 5. */
-    FL_PacketTable ptable(fileID, "/examplePacketTable", H5T_NATIVE_INT, 100, 5);
-    if(! ptable.IsValid())
+    /* Prepare property list to set compression, randomly use deflate
+       with compression level 5. */
+    plistID = H5Pcreate(H5P_DATASET_CREATE);
+    err     = H5Pset_deflate(plistID, 5);
+    if (err < 0)
+        fprintf(stderr, "Error setting compression level.");
+
+    /* Create a fixed-length packet table. */
+    FL_PacketTable ptable(fileID, plistID, PT_NAME, H5T_NATIVE_INT, 100);
+    if (!ptable.IsValid())
         fprintf(stderr, "Unable to create packet table.");
 
     /* Append five packets to the packet table, one at a time */
-    for(x=0; x<5; x++)
-    {
-        err = ptable.AppendPacket( &(writeBuffer[x]) );
-        if(err<0)
+    for (x = 0; x < 5; x++) {
+        err = ptable.AppendPacket(&(writeBuffer[x]));
+        if (err < 0)
             fprintf(stderr, "Error adding record.");
     }
 
     /* Get the number of packets in the packet table.  This should be five. */
     count = ptable.GetPacketCount(err);
-    if(err < 0)
+    if (err < 0)
         fprintf(stderr, "Error getting packet count.");
 
-    printf("Number of packets in packet table after five appends: %d\n", count);
+    printf("Number of packets in packet table after five appends: %llu\n", count);
 
     /* Initialize packet table's "current record" */
     ptable.ResetIndex();
 
     /* Iterate through packets, read each one back */
-    for(x=0; x<5; x++)
-    {
-        err = ptable.GetNextPacket( &(readBuffer[x]) );
-        if(err < 0)
+    for (x = 0; x < 5; x++) {
+        err = ptable.GetNextPacket(&(readBuffer[x]));
+        if (err < 0)
             fprintf(stderr, "Error reading record.");
 
         printf("Packet %d's value is %d.\n", x, readBuffer[x]);
@@ -84,9 +90,8 @@ int main(void)
     /* out of scope.  */
 
     err = H5Fclose(fileID);
-    if( err < 0 )
+    if (err < 0)
         fprintf(stderr, "Failed to close file.\n");
 
     return 0;
 }
-
diff --git a/hl/c++/examples/run-hlc++-ex.sh.in b/hl/c++/examples/run-hlc++-ex.sh.in
index 103dd76..47f460b 100644
--- a/hl/c++/examples/run-hlc++-ex.sh.in
+++ b/hl/c++/examples/run-hlc++-ex.sh.in
@@ -5,12 +5,10 @@
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 
 #
 #  This file:  run-hlc++-ex.sh
@@ -20,7 +18,7 @@
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 #                                                                               #
 # This script will compile and run the c++ examples from source files           #
-# installed in .../share/hdf5_examples/hl/c++ using h5c++.  The                 #
+# installed in @examplesdir@/hl/c++ using h5c++.  The                           #
 # order for running programs with RunTest in the MAIN section below is taken    #
 # from the Makefile.  The order is important since some of the test programs    #
 # use data files created by earlier test programs.  Any future additions should #
@@ -31,9 +29,33 @@
 # Initializations
 EXIT_SUCCESS=0
 EXIT_FAILURE=1
+
+#
+# Try to derive the path to the installation $prefix established
+# by ./configure relative to the examples directory established by
+# ./configure.  If successful, set `prefix_relto_examplesdir` to the
+# relative path.  Otherwise, set `prefix_relto_examplesdir` to the
+# absolute installation $prefix.
+#
+# This script uses the value of `prefix` in the user's environment, if
+# it is set, below.  The content of $() is evaluated in a sub-shell, so
+# if `prefix` is set in the user's environment, the shell statements in
+# $() won't clobbered it.
+#
+prefix_relto_examplesdir=$(
+prefix=@prefix@
+examplesdir=@examplesdir@
+if [ ${examplesdir##${prefix}/} != ${examplesdir} ]; then
+	echo $(echo ${examplesdir##${prefix}/} | \
+	    sed 's,[^/][^/]*,..,g')
+else
+	echo $prefix
+fi
+)
+
 # Where the tool is installed.
 # default is relative path to installed location of the tools
-prefix="${prefix:-../../../../}"
+prefix="${prefix:-../../${prefix_relto_examplesdir}}"
 AR="@AR@"
 RANLIB="@RANLIB@"
 H5TOOL="h5c++"                  # The tool name
@@ -76,5 +98,5 @@ rm *.o
 rm *.h5
 echo
 
-exit $EXIT_VALUE 
+exit $EXIT_VALUE
 
diff --git a/hl/c++/src/CMakeLists.txt b/hl/c++/src/CMakeLists.txt
index 640cb2d..3949624 100644
--- a/hl/c++/src/CMakeLists.txt
+++ b/hl/c++/src/CMakeLists.txt
@@ -1,31 +1,57 @@
-cmake_minimum_required (VERSION 3.1.0)
-PROJECT (HDF5_HL_CPP_SRC)
+cmake_minimum_required (VERSION 3.18)
+project (HDF5_HL_CPP_SRC CXX)
 
 #-----------------------------------------------------------------------------
 # Define Sources
 #-----------------------------------------------------------------------------
-INCLUDE_DIRECTORIES (${HDF5_HL_SRC_DIR}/src)
-INCLUDE_DIRECTORIES (${HDF5_HL_CPP_SRC_SOURCE_DIR})
 
-set (HDF5_HL_CPP_SRCS ${HDF5_HL_CPP_SRC_SOURCE_DIR}/H5PacketTable.cpp)
+set (HDF5_HL_CPP_SOURCES ${HDF5_HL_CPP_SRC_SOURCE_DIR}/H5PacketTable.cpp)
 set (HDF5_HL_CPP_HDRS ${HDF5_HL_CPP_SRC_SOURCE_DIR}/H5PacketTable.h)
 
-add_library (${HDF5_HL_CPP_LIB_TARGET} ${LIB_TYPE} ${HDF5_HL_CPP_SRCS})
-TARGET_C_PROPERTIES (${HDF5_HL_CPP_LIB_TARGET} ${LIB_TYPE} " " " ")
-target_link_libraries (
-    ${HDF5_HL_CPP_LIB_TARGET}
-    ${HDF5_HL_LIB_TARGET}
-    ${HDF5_LIB_TARGET}
-)
-set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_CPP_LIB_TARGET}")
-H5_SET_LIB_OPTIONS (${HDF5_HL_CPP_LIB_TARGET} ${HDF5_HL_CPP_LIB_NAME} ${LIB_TYPE})
-set_target_properties (${HDF5_HL_CPP_LIB_TARGET} PROPERTIES
-    FOLDER libraries/hl
-    INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
-)
+if (NOT ONLY_SHARED_LIBS)
+  add_library (${HDF5_HL_CPP_LIB_TARGET} STATIC ${HDF5_HL_CPP_SOURCES} ${HDF5_HL_CPP_HDRS})
+  target_include_directories (${HDF5_HL_CPP_LIB_TARGET}
+      PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
+      INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
+  )
+  target_compile_options(${HDF5_HL_CPP_LIB_TARGET} PRIVATE "${HDF5_CMAKE_CXX_FLAGS}")
+  TARGET_C_PROPERTIES (${HDF5_HL_CPP_LIB_TARGET} STATIC)
+  target_link_libraries (${HDF5_HL_CPP_LIB_TARGET} PUBLIC ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET})
+  set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_CPP_LIB_TARGET}")
+  H5_SET_LIB_OPTIONS (${HDF5_HL_CPP_LIB_TARGET} ${HDF5_HL_CPP_LIB_NAME} STATIC 0)
+  set_target_properties (${HDF5_HL_CPP_LIB_TARGET} PROPERTIES FOLDER libraries/hl)
+  set (install_targets ${HDF5_HL_CPP_LIB_TARGET})
+endif ()
+
+if (BUILD_SHARED_LIBS)
+  add_library (${HDF5_HL_CPP_LIBSH_TARGET} SHARED ${HDF5_HL_CPP_SOURCES})
+  target_include_directories (${HDF5_HL_CPP_LIBSH_TARGET}
+      PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
+      INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
+  )
+  target_compile_options(${HDF5_HL_CPP_LIBSH_TARGET} PRIVATE "${HDF5_CMAKE_CXX_FLAGS}")
+  target_compile_definitions(${HDF5_HL_CPP_LIBSH_TARGET} PUBLIC "H5_BUILT_AS_DYNAMIC_LIB")
+  TARGET_C_PROPERTIES (${HDF5_HL_CPP_LIBSH_TARGET} SHARED)
+  target_link_libraries (${HDF5_HL_CPP_LIBSH_TARGET} PUBLIC ${HDF5_HL_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
+  set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_CPP_LIBSH_TARGET}")
+  H5_SET_LIB_OPTIONS (${HDF5_HL_CPP_LIBSH_TARGET} ${HDF5_HL_CPP_LIB_NAME} SHARED "HL_CXX")
+  set_target_properties (${HDF5_HL_CPP_LIBSH_TARGET} PROPERTIES FOLDER libraries/hl)
+  set (install_targets ${install_targets} ${HDF5_HL_CPP_LIBSH_TARGET})
+endif ()
+
+#-----------------------------------------------------------------------------
+# Add Target to clang-format
+#-----------------------------------------------------------------------------
+if (HDF5_ENABLE_FORMATTERS)
+  if (NOT ONLY_SHARED_LIBS)
+    clang_format (HDF5_HL_CPP_SRC_FORMAT ${HDF5_HL_CPP_LIB_TARGET})
+  else ()
+    clang_format (HDF5_HL_CPP_SRC_FORMAT ${HDF5_HL_CPP_LIBSH_TARGET})
+  endif ()
+endif ()
 
 #-----------------------------------------------------------------------------
-# Add file(s) to CMake Install 
+# Add file(s) to CMake Install
 #-----------------------------------------------------------------------------
 install (
     FILES
@@ -41,16 +67,73 @@ install (
 #-----------------------------------------------------------------------------
 if (HDF5_EXPORTED_TARGETS)
   if (BUILD_SHARED_LIBS)
-    INSTALL_TARGET_PDB (${HDF5_HL_CPP_LIB_TARGET} ${HDF5_INSTALL_BIN_DIR} hlcpplibraries)
-  endif (BUILD_SHARED_LIBS)
-  
+    INSTALL_TARGET_PDB (${HDF5_HL_CPP_LIBSH_TARGET} ${HDF5_INSTALL_BIN_DIR} hlcpplibraries)
+  endif ()
+  if (NOT ONLY_SHARED_LIBS)
+    INSTALL_TARGET_PDB (${HDF5_HL_CPP_LIB_TARGET} ${HDF5_INSTALL_LIB_DIR} hlcpplibraries)
+  endif ()
+
   install (
       TARGETS
-          ${HDF5_HL_CPP_LIB_TARGET}
+          ${install_targets}
       EXPORT
           ${HDF5_EXPORTED_TARGETS}
       LIBRARY DESTINATION ${HDF5_INSTALL_LIB_DIR} COMPONENT hlcpplibraries
       ARCHIVE DESTINATION ${HDF5_INSTALL_LIB_DIR} COMPONENT hlcpplibraries
       RUNTIME DESTINATION ${HDF5_INSTALL_BIN_DIR} COMPONENT hlcpplibraries
+      FRAMEWORK DESTINATION ${HDF5_INSTALL_FWRK_DIR} COMPONENT hlcpplibraries
+      INCLUDES DESTINATION include
+  )
+endif ()
+
+#-----------------------------------------------------------------------------
+# Create pkgconfig files
+#-----------------------------------------------------------------------------
+set (_PKG_CONFIG_PREFIX ${CMAKE_INSTALL_PREFIX})
+set (_PKG_CONFIG_EXEC_PREFIX \${prefix})
+set (_PKG_CONFIG_LIBDIR \${exec_prefix}/${HDF5_INSTALL_LIB_DIR})
+set (_PKG_CONFIG_INCLUDEDIR \${prefix}/${HDF5_INSTALL_INCLUDE_DIR})
+set (_PKG_CONFIG_LIBNAME "${HDF5_HL_CPP_LIB_CORENAME}")
+set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}")
+
+set (_PKG_CONFIG_LIBS_PRIVATE)
+
+if (NOT ONLY_SHARED_LIBS)
+  set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_HL_CPP_LIB_CORENAME}")
+endif ()
+if (BUILD_SHARED_LIBS)
+  set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_HL_CPP_LIB_CORENAME}")
+endif ()
+
+set (_PKG_CONFIG_REQUIRES "${HDF5_HL_LIB_CORENAME} = ${HDF5_PACKAGE_VERSION}")
+set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_HL_LIB_CORENAME} = ${HDF5_PACKAGE_VERSION}")
+
+configure_file (
+    ${HDF_CONFIG_DIR}/libhdf5.pc.in
+    ${HDF5_BINARY_DIR}/CMakeFiles/${HDF5_HL_CPP_LIB_CORENAME}.pc
+    @ONLY
+)
+install (
+    FILES ${HDF5_BINARY_DIR}/CMakeFiles/${HDF5_HL_CPP_LIB_CORENAME}.pc
+    DESTINATION ${HDF5_INSTALL_LIB_DIR}/pkgconfig
+    COMPONENT hlcpplibraries
+)
+
+if (NOT WIN32 AND NOT MINGW)
+  if (HDF5_ENABLE_PARALLEL AND MPI_CXX_FOUND)
+    set (_PKG_CONFIG_COMPILER ${MPI_CXX_COMPILER})
+  else ()
+    set (_PKG_CONFIG_COMPILER ${CMAKE_CXX_COMPILER})
+  endif ()
+  configure_file (
+      ${HDF_RESOURCES_DIR}/libh5cc.in
+      ${HDF5_BINARY_DIR}/CMakeFiles/h5hlc++
+      @ONLY
+  )
+  install (
+      FILES ${HDF5_BINARY_DIR}/CMakeFiles/h5hlc++
+      DESTINATION ${HDF5_INSTALL_BIN_DIR}
+      PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+      COMPONENT hlcpplibraries
   )
-endif (HDF5_EXPORTED_TARGETS)
+endif ()
diff --git a/hl/c++/src/H5PacketTable.cpp b/hl/c++/src/H5PacketTable.cpp
index 74b8029..4cd3c03 100644
--- a/hl/c++/src/H5PacketTable.cpp
+++ b/hl/c++/src/H5PacketTable.cpp
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /* Packet Table wrapper classes
@@ -26,308 +23,280 @@
 
 #include "H5PacketTable.h"
 
-    /********************************/
-    /* PacketTable superclass       */
-    /********************************/
-
-    /* "Open" Constructor
-     * Opens an existing packet table, which can contain either fixed-length or
-     * variable-length packets.
-     */
-    PacketTable::PacketTable(hid_t fileID, char* name)
-    {
-        table_id = H5PTopen( fileID, name);
-    }
-
-    /* Destructor
-     * Cleans up the packet table
-     */
-    PacketTable::~PacketTable()
-    {
-        H5PTclose( table_id);
-    }
-
-    /* IsValid
-     * Returns true if this packet table is valid, false otherwise.
-     * Use this after the constructor to ensure HDF did not have
-     * any trouble making or opening the packet table.
-     */
-    bool PacketTable::IsValid()
-    {
-        if (H5PTis_valid(table_id) == 0)
-            return true;
-        else
-            return false;
-    }
-
-#ifdef VLPT_REMOVED
-    /* IsVariableLength
-     * Return 1 if this packet table is a Variable Length packet table,
-     * return 0 if it is Fixed Length.  Returns -1 if the table is
-     * invalid (not open).
-     */
-    int PacketTable::IsVariableLength()
-    {
-        return H5PTis_varlen(table_id);
-    }
-#endif /* VLPT_REMOVED */
-
-    /* ResetIndex
-     * Sets the index to point to the first packet in the packet table
-     */
-    void PacketTable::ResetIndex()
-    {
-        H5PTcreate_index(table_id);
-    }
-
-    /* SetIndex
-     * Sets the index to point to the packet specified by index.
-     * Returns 0 on success, negative on failure (if index is out of bounds)
-     */
-    int PacketTable::SetIndex(hsize_t index)
-    {
-        return H5PTset_index(table_id, index);
-    }
-
-    /* SetIndex
-     * Sets the index to point to the packet specified by index.
-     * Returns 0 on success, negative on failure (if index is out of bounds)
-     */
-    hsize_t PacketTable::GetIndex(int &error)
-    {
-        hsize_t index;
-
-        error = H5PTget_index(table_id, &index);
-        if(error < 0)
-           return 0;
-        else
-           return index;
-    }
-
-    /* GetPacketCount
-     * Returns the number of packets in the packet table.  Error
-     * is set to 0 on success.  On failure, returns 0 and
-     * error is set to negative.
-     */
-    hsize_t PacketTable::GetPacketCount(int& error)
-    {
-        hsize_t npackets;
-
-        error = H5PTget_num_packets( table_id, (hsize_t *)&npackets);
-        return npackets;
-    }
-
-    /********************************/
-    /* Fixed-Length Packet Table    */
-    /********************************/
-
-    /* Constructor
-     * Creates a packet table in which to store fixed length packets.
-     * Takes the ID of the file the packet table will be created in, the name of
-     * the packet table, the ID of the datatype of the set, and the size
-     * of a memory chunk used in chunking.
-     */
-    FL_PacketTable::FL_PacketTable(hid_t fileID, char* name, hid_t dtypeID, hsize_t chunkSize, int compression)
-    {
-        table_id = H5PTcreate_fl ( fileID, name, dtypeID, chunkSize, compression);
-    }
-
-    /* "Open" Constructor
-     * Opens an existing fixed-length packet table.
-     * Fails if the packet table specified is variable-length.
-     */
-    FL_PacketTable::FL_PacketTable(hid_t fileID, char* name) : PacketTable(fileID, name)
-    {
-#ifdef VLPT_REMOVED
-        if( H5PTis_varlen(table_id) != 0 )    // If this is not a fixed-length table
-        {
-            H5PTclose(table_id);
-            table_id = -1;
-        }
-#endif /* VLPT_REMOVED */
-    }
-
-    /* AppendPacket
-     * Adds a single packet to the packet table.  Takes a pointer
-     * to the location of the data in memory.
-     * Returns 0 on success, negative on failure
-     */
-    int FL_PacketTable::AppendPacket(void * data)
-    {
-        return H5PTappend(table_id, 1, data);
-    }
-
-    /* AppendPackets (multiple packets)
-     * Adds multiple packets to the packet table.  Takes the number of packets
-     * to be added and a pointer to their location in memory.
-     * Returns 0 on success, -1 on failure.
-     */
-    int FL_PacketTable::AppendPackets(size_t numPackets, void * data)
-    {
-        return H5PTappend(table_id, numPackets, data);
-    }
-
-    /* GetPacket (indexed)
-     * Gets a single packet from the packet table.  Takes the index
-     * of the packet (with 0 being the first packet) and a pointer
-     * to memory where the data should be stored.
-     * Returns 0 on success, negative on failure
-     */
-    int FL_PacketTable::GetPacket(hsize_t index, void * data)
-    {
-        return H5PTread_packets(table_id, index, 1, data);
-    }
-
-    /* GetPackets (multiple packets)
-     * Gets multiple packets at once, all packets between
-     * startIndex and endIndex inclusive.  Also takes a pointer to
-     * the memory where these packets should be stored.
-     * Returns 0 on success, negative on failure.
-     */
-    int FL_PacketTable::GetPackets(hsize_t startIndex, hsize_t endIndex, void * data)
-    {
-        // Make sure the range of indexes is valid
-        if (startIndex > endIndex)
-            return -1;
-
-        return  H5PTread_packets(table_id, startIndex, (size_t)(endIndex-startIndex+1), data);
-    }
-
-    /* GetNextPacket (single packet)
-     * Gets the next packet in the packet table.  Takes a pointer to
-     * memory where the packet should be stored.
-     * Returns 0 on success, negative on failure.  Index
-     * is not advanced to the next packet on failure.
-     */
-    int FL_PacketTable::GetNextPacket(void * data)
-    {
-        return H5PTget_next(table_id, 1, data);
-    }
-
-    /* GetNextPackets (multiple packets)
-     * Gets the next numPackets packets in the packet table.  Takes a
-     * pointer to memory where these packets should be stored.
-     * Returns 0 on success, negative on failure.  Index
-     * is not advanced on failure.
-     */
-    int FL_PacketTable::GetNextPackets(size_t numPackets, void * data)
-    {
-        return H5PTget_next(table_id, numPackets, data);
-    }
-
-
-#ifdef VLPT_REMOVED
-    /********************************/
-    /* Variable-Length Packet Table */
-    /********************************/
-
-    /* Constructor
-     * Creates a packet table in which to store variable length packets.
-     * Takes the ID of the file the packet table will be created in, the name of
-     * the packet table, and the size of a memory chunk used in chunking.
-     */
-    VL_PacketTable::VL_PacketTable(hid_t fileID, char* name, hsize_t chunkSize)
-    {
-        table_id = H5PTcreate_vl ( fileID, name, chunkSize);
-    }
-
-    /* "Open" Constructor
-     * Opens an existing variable-length packet table.
-     * Fails if the packet table specified is fixed-length.
-     */
-    VL_PacketTable::VL_PacketTable(hid_t fileID, char* name) : PacketTable(fileID, name)
-    {
-        if( H5PTis_varlen(table_id) != 1 )    // If this is not a variable-length table
-        {
-            H5PTclose(table_id);
-            table_id = -1;
-        }
-    }
-
-    /* AppendPacket (variable-length)
-     * Adds a single variable-length packet to the packet table.
-     * Takes a pointer to the location of the data in memory and the length of the data
-     * in bytes.
-     * Returns 0 on success, negative on failure.
-     */
-       int VL_PacketTable::AppendPacket(void * data, size_t length)
-    {
-        hvl_t packet;
-
-        packet.len = length;
-        packet.p = data;
-
-        return H5PTappend(table_id, 1, &packet);
-    }
-
-    /* AppendPackets (multiple packets)
-     * Adds multiple variable-length packets to the packet table.  Takes the
-     * number of
-     * packets to be added and a pointer to an array of hvl_t structs in memory.
-     * Returns 0 on success, negative on failure.
-     */
-    int VL_PacketTable::AppendPackets(size_t numPackets, hvl_t * data)
-    {
-        return H5PTappend(table_id, numPackets, data);
-    }
-
-    /* GetPacket (indexed)
-     * Gets a single variable-length packet from the packet table.  Takes the
-     * index of the packet (with 0 being the first packet) and a pointer
-     * to a hvl_t struct in which to store the packet's size and location.
-     * Returns 0 on success, negative on failure.
-     */
-    int VL_PacketTable::GetPacket(hsize_t index, hvl_t * data)
-    {
-        return H5PTread_packets(table_id, index, 1, data);
-    }
-
-    /* GetPackets (multiple packets)
-     * Gets multiple variable-length packets at once, all packets between
-     * startIndex and endIndex inclusive.  Takes a pointer to an array
-     * of hvl_t structs in memory in which to store pointers to the packets.
-     * Returns 0 on success, negative on failure.
-     */
-    int VL_PacketTable::GetPackets(hsize_t startIndex, hsize_t endIndex, hvl_t * data)
-    {
-        // Make sure the range of indexes is valid
-        if (startIndex > endIndex)
-            return -1;
-
-        return  H5PTread_packets(table_id, startIndex, endIndex-startIndex+1, data);
-    }
-
-    /* GetNextPacket (single packet)
-     * Gets the next packet in the packet table.  Takes a pointer to
-     * an hvl_t struct where the packet should be stored.
-     * Returns 0 on success, negative on failure.  Index
-     * is not advanced to the next packet on failure.
-     */
-    int VL_PacketTable::GetNextPacket(hvl_t * data)
-    {
-        return H5PTget_next(table_id, 1, data);
-    }
-
-    /* GetNextPackets (multiple packets)
-     * Gets the next numPackets packets in the packet table.  Takes a
-     * pointer to an array of hvl_t structs where pointers to the packets
-     * should be stored.
-     * Returns 0 on success, negative on failure.  Index
-     * is not advanced on failure.
-     */
-    int VL_PacketTable::GetNextPackets(size_t numPackets, hvl_t * data)
-    {
-        return H5PTget_next(table_id, numPackets, data);
-    }
-
-    /* FreeReadbuff
-     * Frees the buffers created when variable-length packets are read.
-     * Takes the number of hvl_t structs to be freed and a pointer to their
-     * location in memory.
-     * Returns 0 on success, negative on error.
-     */
-    int VL_PacketTable::FreeReadbuff(size_t numStructs, hvl_t * buffer)
-    {
-        return H5PTfree_vlen_readbuff( table_id, numStructs, buffer);
-    }
-#endif /* VLPT_REMOVED */
+/********************************/
+/* PacketTable superclass       */
+/********************************/
+
+/* Null constructor
+ * Sets table_id to "invalid"
+ */
+PacketTable::PacketTable() : table_id{H5I_INVALID_HID}
+{
+}
+
+/* "Open" Constructor
+ * Opens an existing packet table, which can contain either fixed-length or
+ * variable-length packets.
+ */
+PacketTable::PacketTable(hid_t fileID, const char *name) : table_id{H5PTopen(fileID, name)}
+{
+}
+
+/* "Open" Constructor - will be deprecated because of char* name */
+PacketTable::PacketTable(hid_t fileID, char *name) : table_id{H5PTopen(fileID, name)}
+{
+}
+
+/* Destructor
+ * Cleans up the packet table
+ */
+PacketTable::~PacketTable()
+{
+    H5PTclose(table_id);
+}
+
+/* IsValid
+ * Returns true if this packet table is valid, false otherwise.
+ * Use this after the constructor to ensure HDF did not have
+ * any trouble making or opening the packet table.
+ */
+bool
+PacketTable::IsValid() const
+{
+    return H5PTis_valid(table_id) == 0;
+}
+
+/* IsVariableLength
+ * Return 1 if this packet table uses variable-length datatype,
+ * and 0, otherwise.  Returns -1 if the table is invalid (not open).
+ */
+int
+PacketTable::IsVariableLength() const
+{
+    return H5PTis_varlen(table_id);
+}
+
+/* ResetIndex
+ * Sets the index to point to the first packet in the packet table
+ */
+void
+PacketTable::ResetIndex() const
+{
+    H5PTcreate_index(table_id);
+}
+
+/* SetIndex
+ * Sets the index to point to the packet specified by index.
+ * Returns 0 on success, negative on failure (if index is out of bounds)
+ */
+int
+PacketTable::SetIndex(hsize_t index) const
+{
+    return H5PTset_index(table_id, index);
+}
+
+/* SetIndex
+ * Sets the index to point to the packet specified by index.
+ * Returns 0 on success, negative on failure (if index is out of bounds)
+ */
+hsize_t
+PacketTable::GetIndex(int &error) const
+{
+    hsize_t index;
+
+    error = H5PTget_index(table_id, &index);
+    if (error < 0)
+        return 0;
+    else
+        return index;
+}
+
+/* GetPacketCount
+ * Returns the number of packets in the packet table.  Error
+ * is set to 0 on success.  On failure, returns 0 and
+ * error is set to negative.
+ */
+hsize_t
+PacketTable::GetPacketCount(int &error) const
+{
+    hsize_t npackets;
+
+    error = H5PTget_num_packets(table_id, &npackets);
+    return npackets;
+}
+
+/* GetTableId
+ * Returns the identifier of the packet table
+ */
+hid_t
+PacketTable::GetTableId() const
+{
+    return table_id;
+}
+
+/* GetDatatype
+ * Returns the datatype identifier used by the packet table, on success,
+ * or H5I_INVALID_HID, on failure.
+ * Note: it is best to avoid using this identifier in applications, unless
+ * the desired functionality cannot be performed via the packet table ID.
+ */
+hid_t
+PacketTable::GetDatatype() const
+{
+    return H5PTget_type(table_id);
+}
+
+/* GetDataset
+ * Returns the dataset identifier associated with the packet table, on
+ * success, or H5I_INVALID_HID, on failure.
+ * Note: it is best to avoid using this identifier in applications, unless
+ * the desired functionality cannot be performed via the packet table ID.
+ */
+hid_t
+PacketTable::GetDataset() const
+{
+    return H5PTget_dataset(table_id);
+}
+
+/* FreeBuff
+ * Frees the buffers created when variable-length packets are read.
+ * Takes the number of hvl_t structs to be freed and a pointer to their
+ * location in memory.
+ * Returns 0 on success, negative on error.
+ */
+int
+PacketTable::FreeBuff(size_t numStructs, hvl_t *buffer) const
+{
+    return H5PTfree_vlen_buff(table_id, numStructs, buffer);
+}
+
+/********************************/
+/* Fixed-Length Packet Table    */
+/********************************/
+
+/* Constructor
+ * Creates a packet table to store either fixed- or variable-length packets.
+ * Takes the ID of the file the packet table will be created in, the ID of
+ * the property list to specify compression, the name of the packet table,
+ * the ID of the datatype, and the size of a memory chunk used in chunking.
+ */
+FL_PacketTable::FL_PacketTable(hid_t fileID, const char *name, hid_t dtypeID, hsize_t chunkSize,
+                               hid_t plistID)
+{
+    table_id = H5PTcreate(fileID, name, dtypeID, chunkSize, plistID);
+}
+
+/* Constructor - deprecated
+ * Creates a packet table to store either fixed- or variable-length packets.
+ * Takes the ID of the file the packet table will be created in, the ID of
+ * the property list to specify compression, the name of the packet table,
+ * the ID of the datatype, and the size of a memory chunk used in chunking.
+ * Note: The above constructor has a better prototype, which allows default
+ * values to be used.  This constructor was only released in 1.10.0.
+ */
+FL_PacketTable::FL_PacketTable(hid_t fileID, hid_t plistID, const char *name, hid_t dtypeID,
+                               hsize_t chunkSize)
+{
+    table_id = H5PTcreate(fileID, name, dtypeID, chunkSize, plistID);
+}
+
+/* Constructor
+ * Creates a packet table to store either fixed- or variable-length packets.
+ * Takes the ID of the file the packet table will be created in, the name of
+ * the packet table, the ID of the datatype of the set, and the size
+ * of a memory chunk used in chunking.
+ * Note: this overload will be deprecated in favor of the constructor above.
+ */
+FL_PacketTable::FL_PacketTable(hid_t fileID, char *name, hid_t dtypeID, hsize_t chunkSize, int compression)
+{
+    table_id = H5PTcreate_fl(fileID, name, dtypeID, chunkSize, compression);
+}
+
+/* "Open" Constructor
+ * Opens an existing fixed-length packet table.
+ * Fails if the packet table specified is variable-length.
+ */
+FL_PacketTable::FL_PacketTable(hid_t fileID, const char *name) : PacketTable(fileID, name)
+{
+}
+
+/* "Open" Constructor - will be deprecated because of char* name */
+FL_PacketTable::FL_PacketTable(hid_t fileID, char *name) : PacketTable(fileID, name)
+{
+}
+
+/* AppendPacket
+ * Adds a single packet to the packet table.  Takes a pointer
+ * to the location of the data in memory.
+ * Returns 0 on success, negative on failure
+ */
+int
+FL_PacketTable::AppendPacket(void *data)
+{
+    return H5PTappend(table_id, 1, data);
+}
+
+/* AppendPackets (multiple packets)
+ * Adds multiple packets to the packet table.  Takes the number of packets
+ * to be added and a pointer to their location in memory.
+ * Returns 0 on success, -1 on failure.
+ */
+int
+FL_PacketTable::AppendPackets(size_t numPackets, void *data)
+{
+    return H5PTappend(table_id, numPackets, data);
+}
+
+/* GetPacket (indexed)
+ * Gets a single packet from the packet table.  Takes the index
+ * of the packet (with 0 being the first packet) and a pointer
+ * to memory where the data should be stored.
+ * Returns 0 on success, negative on failure
+ */
+int
+FL_PacketTable::GetPacket(hsize_t index, void *data)
+{
+    return H5PTread_packets(table_id, index, 1, data);
+}
+
+/* GetPackets (multiple packets)
+ * Gets multiple packets at once, all packets between
+ * startIndex and endIndex inclusive.  Also takes a pointer to
+ * the memory where these packets should be stored.
+ * Returns 0 on success, negative on failure.
+ */
+int
+FL_PacketTable::GetPackets(hsize_t startIndex, hsize_t endIndex, void *data)
+{
+    // Make sure the range of indexes is valid
+    if (startIndex > endIndex)
+        return -1;
+
+    return H5PTread_packets(table_id, startIndex, static_cast<size_t>(endIndex - startIndex + 1), data);
+}
+
+/* GetNextPacket (single packet)
+ * Gets the next packet in the packet table.  Takes a pointer to
+ * memory where the packet should be stored.
+ * Returns 0 on success, negative on failure.  Index
+ * is not advanced to the next packet on failure.
+ */
+int
+FL_PacketTable::GetNextPacket(void *data)
+{
+    return H5PTget_next(table_id, 1, data);
+}
+
+/* GetNextPackets (multiple packets)
+ * Gets the next numPackets packets in the packet table.  Takes a
+ * pointer to memory where these packets should be stored.
+ * Returns 0 on success, negative on failure.  Index
+ * is not advanced on failure.
+ */
+int
+FL_PacketTable::GetNextPackets(size_t numPackets, void *data)
+{
+    return H5PTget_next(table_id, numPackets, data);
+}
+
+/* Removed "ifdef VLPT_REMOVED" block. 03/08/2016, -BMR */
diff --git a/hl/c++/src/H5PacketTable.h b/hl/c++/src/H5PacketTable.h
index 5f9a213..8ef5ac3 100644
--- a/hl/c++/src/H5PacketTable.h
+++ b/hl/c++/src/H5PacketTable.h
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /* Packet Table wrapper classes
@@ -30,107 +27,158 @@
 #include "H5PTpublic.h"
 #include "H5api_adpt.h"
 
-class H5_HLCPPDLL  PacketTable
-{
-public:
+class H5_HLCPPDLL PacketTable {
+  public:
     /* Null constructor
-     * Sets table_id to "invalid"
+     * Sets table_id to H5I_INVALID_HID
      */
-    PacketTable() {table_id = H5I_BADID;}
+    PacketTable();
 
     /* "Open" Constructor
      * Opens an existing packet table, which can contain either fixed-length or
      * variable-length packets.
      */
-    PacketTable(hid_t fileID, char* name);
+    PacketTable(hid_t fileID, const char *name);
+
+    /* "Open" Constructor - will be deprecated because of char* name */
+    PacketTable(hid_t fileID, char *name);
 
     /* Destructor
      * Cleans up the packet table
      */
-    ~PacketTable();
+    virtual ~PacketTable();
 
     /* IsValid
      * Returns true if this packet table is valid, false otherwise.
      * Use this after the constructor to ensure HDF did not have
      * any trouble making or opening the packet table.
      */
-    bool IsValid();
+    bool IsValid() const;
 
-#ifdef VLPT_REMOVED
     /* IsVariableLength
-     * Return 1 if this packet table is a Variable Length packet table,
+     * Return 1 if this packet table uses variable-length datatype,
      * return 0 if it is Fixed Length.  Returns -1 if the table is
      * invalid (not open).
      */
-    int IsVariableLength();
-#endif /* VLPT_REMOVED */
+    int IsVariableLength() const;
 
     /* ResetIndex
      * Sets the "current packet" index to point to the first packet in the
      * packet table
      */
-    void ResetIndex();
+    void ResetIndex() const;
 
     /* SetIndex
      * Sets the current packet to point to the packet specified by index.
      * Returns 0 on success, negative on failure (if index is out of bounds)
      */
-    int SetIndex(hsize_t index);
+    int SetIndex(hsize_t index) const;
 
     /* GetIndex
      * Returns the position of the current packet.
      * On failure, returns 0 and error is set to negative.
      */
-    hsize_t GetIndex(int& error);
+    hsize_t GetIndex(int &error) const;
 
     /* GetPacketCount
      * Returns the number of packets in the packet table.  Error
      * is set to 0 on success.  On failure, returns 0 and
      * error is set to negative.
      */
-    hsize_t GetPacketCount(int& error);
+    hsize_t GetPacketCount(int &error) const;
 
-    hsize_t GetPacketCount()
+    hsize_t
+    GetPacketCount()
     {
         int ignoreError;
         return GetPacketCount(ignoreError);
     }
 
-protected:
+    /* GetTableId
+     * Returns the identifier of the packet table.
+     */
+    hid_t GetTableId() const;
+
+    /* GetDatatype
+     * Returns the datatype identifier used by the packet table, on success,
+     * or FAIL, on failure.
+     * Note: it is best to avoid using this identifier in applications, unless
+     * the desired functionality cannot be performed via the packet table ID.
+     */
+    hid_t GetDatatype() const;
+
+    /* GetDataset
+     * Returns the dataset identifier associated with the packet table, on
+     * success, or FAIL, on failure.
+     * Note: it is best to avoid using this identifier in applications, unless
+     * the desired functionality cannot be performed via the packet table ID.
+     */
+    hid_t GetDataset() const;
+
+    /* FreeBuff
+     * Frees the buffers created when variable-length packets are read.
+     * Takes the number of hvl_t structs to be freed and a pointer to their
+     * location in memory.
+     * Returns 0 on success, negative on error.
+     */
+    int FreeBuff(size_t numStructs, hvl_t *buffer) const;
+
+  protected:
     hid_t table_id;
 };
 
-class H5_HLCPPDLL FL_PacketTable : virtual public PacketTable
-{
-public:
+class H5_HLCPPDLL FL_PacketTable : virtual public PacketTable {
+  public:
     /* Constructor
+     * Creates a packet table to store either fixed- or variable-length packets.
+     * Takes the ID of the file the packet table will be created in, the ID of
+     * the property list to specify compression, the name of the packet table,
+     * the ID of the datatype, and the size of a memory chunk used in chunking.
+     */
+    FL_PacketTable(hid_t fileID, const char *name, hid_t dtypeID, hsize_t chunkSize = 0,
+                   hid_t plistID = H5P_DEFAULT);
+
+    /* Constructors - deprecated
      * Creates a packet table in which to store fixed length packets.
      * Takes the ID of the file the packet table will be created in, the name of
      * the packet table, the ID of the datatype of the set, the size
      * of a memory chunk used in chunking, and the desired compression level
      * (0-9, or -1 for no compression).
+     * Note: these overloaded constructors will be deprecated in favor of the
+     * constructor above.
      */
-    FL_PacketTable(hid_t fileID, char* name, hid_t dtypeID, hsize_t chunkSize, int compression = -1);
+    FL_PacketTable(hid_t fileID, hid_t plist_id, const char *name, hid_t dtypeID, hsize_t chunkSize);
+    FL_PacketTable(hid_t fileID, char *name, hid_t dtypeID, hsize_t chunkSize, int compression = 0);
 
     /* "Open" Constructor
      * Opens an existing fixed-length packet table.
      * Fails if the packet table specified is variable-length.
      */
-    FL_PacketTable(hid_t fileID, char* name);
+    FL_PacketTable(hid_t fileID, const char *name);
+
+    /* "Open" Constructor - will be deprecated because of char* name */
+    FL_PacketTable(hid_t fileID, char *name);
+
+    /* Destructor
+     * Cleans up the packet table
+     */
+    ~FL_PacketTable() override
+    {
+    }
 
     /* AppendPacket
      * Adds a single packet to the packet table.  Takes a pointer
      * to the location of the data in memory.
      * Returns 0 on success, negative on failure
      */
-    int AppendPacket(void * data);
+    int AppendPacket(void *data);
 
     /* AppendPackets (multiple packets)
      * Adds multiple packets to the packet table.  Takes the number of packets
      * to be added and a pointer to their location in memory.
      * Returns 0 on success, -1 on failure.
      */
-    int AppendPackets(size_t numPackets, void * data);
+    int AppendPackets(size_t numPackets, void *data);
 
     /* GetPacket (indexed)
      * Gets a single packet from the packet table.  Takes the index
@@ -138,7 +186,7 @@ public:
      * to memory where the data should be stored.
      * Returns 0 on success, negative on failure
      */
-    int GetPacket(hsize_t index, void * data);
+    int GetPacket(hsize_t index, void *data);
 
     /* GetPackets (multiple packets)
      * Gets multiple packets at once, all packets between
@@ -146,7 +194,7 @@ public:
      * the memory where these packets should be stored.
      * Returns 0 on success, negative on failure.
      */
-    int GetPackets(hsize_t startIndex, hsize_t endIndex, void * data);
+    int GetPackets(hsize_t startIndex, hsize_t endIndex, void *data);
 
     /* GetNextPacket (single packet)
      * Gets the next packet in the packet table.  Takes a pointer to
@@ -154,7 +202,7 @@ public:
      * Returns 0 on success, negative on failure.  Index
      * is not advanced to the next packet on failure.
      */
-    int GetNextPacket(void * data);
+    int GetNextPacket(void *data);
 
     /* GetNextPackets (multiple packets)
      * Gets the next numPackets packets in the packet table.  Takes a
@@ -162,83 +210,9 @@ public:
      * Returns 0 on success, negative on failure.  Index
      * is not advanced on failure.
      */
-    int GetNextPackets(size_t numPackets, void * data);
+    int GetNextPackets(size_t numPackets, void *data);
 };
 
-#ifdef VLPT_REMOVED
-class H5_HLCPPDLL  VL_PacketTable : virtual public PacketTable
-{
-public:
-    /* Constructor
-     * Creates a packet table in which to store variable length packets.
-     * Takes the ID of the file the packet table will be created in, the name of
-     * the packet table, and the size of a memory chunk used in chunking.
-     */
-    VL_PacketTable(hid_t fileID, char* name, hsize_t chunkSize);
-
-    /* "Open" Constructor
-     * Opens an existing variable-length packet table.
-     * Fails if the packet table specified is fixed-length.
-     */
-    VL_PacketTable(hid_t fileID, char* name);
-
-    /* AppendPacket
-     * Adds a single packet of any length to the packet table.
-     * Takes a pointer to the location of the data in memory and the length of the data
-     * in bytes.
-     * Returns 0 on success, negative on failure.
-     */
-    int AppendPacket(void * data, size_t length);
-
-    /* AppendPackets (multiple packets)
-     * Adds multiple variable-length packets to the packet table.  Takes the
-     * number of packets to be added and a pointer to an array of
-     * hvl_t structs in memory.
-     * Returns 0 on success, negative on failure.
-     */
-    int AppendPackets(size_t numPackets, hvl_t * data);
-
-    /* GetPacket (indexed)
-     * Gets a single variable-length packet from the packet table.  Takes
-     * the index of the packet (with 0 being the first packet) and a pointer
-     * to a hvl_t struct in which to store the packet's size and location.
-     * Returns 0 on success, negative on failure.
-     */
-    int GetPacket(hsize_t index, hvl_t * data);
-
-    /* GetPackets (multiple packets)
-     * Gets multiple variable-length packets at once, all packets between
-     * startIndex and endIndex inclusive.  Takes a pointer to an array
-     * of hvl_t structs in memory in which to store pointers to the packets.
-     * Returns 0 on success, negative on failure.
-     */
-    int GetPackets(hsize_t startIndex, hsize_t endIndex, hvl_t * data);
-
-    /* GetNextPacket (single packet)
-     * Gets the next packet in the packet table.  Takes a pointer to
-     * an hvl_t struct where the packet should be stored.
-     * Returns 0 on success, negative on failure.  Index
-     * is not advanced to the next packet on failure.
-     */
-    int GetNextPacket(hvl_t * data);
-
-    /* GetNextPackets (multiple packets)
-     * Gets the next numPackets packets in the packet table.  Takes a
-     * pointer to an array of hvl_t structs where pointers to the packets
-     * should be stored.
-     * Returns 0 on success, negative on failure.  Index
-     * is not advanced on failure.
-     */
-    int GetNextPackets(size_t numPackets, hvl_t * data);
-
-    /* FreeReadbuff
-     * Frees the buffers created when variable-length packets are read.
-     * Takes the number of hvl_t structs to be freed and a pointer to their
-     * location in memory.
-     * Returns 0 on success, negative on error.
-     */
-    int FreeReadbuff(size_t numStructs, hvl_t * buffer);
-};
-#endif /* VLPT_REMOVED */
+/* Removed "#ifdef VLPT_REMOVED" block.  03/08/2016, -BMR */
 
 #endif /* H5PTWRAP_H */
diff --git a/hl/c++/src/Makefile.am b/hl/c++/src/Makefile.am
index 9751e94..54fd52e 100644
--- a/hl/c++/src/Makefile.am
+++ b/hl/c++/src/Makefile.am
@@ -1,16 +1,13 @@
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 ##
 ## Makefile.am
 ## Run automake to generate a Makefile.in from this file.
@@ -28,13 +25,7 @@ AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/hl/src
 lib_LTLIBRARIES=libhdf5_hl_cpp.la
 
 # Add libtool numbers to the HDF5 HL C++ library (from config/lt_vers.am)
-libhdf5_hl_cpp_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
-
-# Shared C++ libraries aren't universally supported.
-if CXX_SHARED_CONDITIONAL
-else
-  AM_LDFLAGS+=-static
-endif
+libhdf5_hl_cpp_la_LDFLAGS= -version-info $(LT_HL_CXX_VERS_INTERFACE):$(LT_HL_CXX_VERS_REVISION):$(LT_HL_CXX_VERS_AGE) $(AM_LDFLAGS)
 
 # Source files for the library
 # At the moment, only the H5PT Packet Table has a C++ API.
diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in
deleted file mode 100644
index 70d7e70..0000000
--- a/hl/c++/src/Makefile.in
+++ /dev/null
@@ -1,1418 +0,0 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-#
-# HDF5-C++ Makefile(.in)
-#
-
-
-VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-DIST_COMMON = $(top_srcdir)/config/commence.am \
-	$(top_srcdir)/config/lt_vers.am \
-	$(top_srcdir)/config/conclude.am $(srcdir)/Makefile.in \
-	$(srcdir)/Makefile.am $(top_srcdir)/bin/mkinstalldirs \
-	$(top_srcdir)/bin/depcomp $(include_HEADERS) \
-	$(top_srcdir)/bin/test-driver
-
-# Shared C++ libraries aren't universally supported.
-@CXX_SHARED_CONDITIONAL_FALSE@am__append_1 = -static
-TESTS =
-subdir = hl/c++/src
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/aclocal_cxx.m4 \
-	$(top_srcdir)/m4/aclocal_fc.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/src/H5config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
-LTLIBRARIES = $(lib_LTLIBRARIES)
-libhdf5_hl_cpp_la_DEPENDENCIES = $(LIBH5_HL) $(LIBH5CPP)
-am_libhdf5_hl_cpp_la_OBJECTS = H5PacketTable.lo
-libhdf5_hl_cpp_la_OBJECTS = $(am_libhdf5_hl_cpp_la_OBJECTS)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 = 
-libhdf5_hl_cpp_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(libhdf5_hl_cpp_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
-depcomp = $(SHELL) $(top_srcdir)/bin/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS)
-AM_V_CXX = $(am__v_CXX_@AM_V@)
-am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
-am__v_CXX_0 = @echo "  CXX     " $@;
-am__v_CXX_1 = 
-CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
-am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
-am__v_CXXLD_0 = @echo "  CXXLD   " $@;
-am__v_CXXLD_1 = 
-SOURCES = $(libhdf5_hl_cpp_la_SOURCES)
-DIST_SOURCES = $(libhdf5_hl_cpp_la_SOURCES)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-HEADERS = $(include_HEADERS)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-am__tty_colors_dummy = \
-  mgn= red= grn= lgn= blu= brg= std=; \
-  am__color_tests=no
-am__tty_colors = { \
-  $(am__tty_colors_dummy); \
-  if test "X$(AM_COLOR_TESTS)" = Xno; then \
-    am__color_tests=no; \
-  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
-    am__color_tests=yes; \
-  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
-    am__color_tests=yes; \
-  fi; \
-  if test $$am__color_tests = yes; then \
-    red='[0;31m'; \
-    grn='[0;32m'; \
-    lgn='[1;32m'; \
-    blu='[1;34m'; \
-    mgn='[0;35m'; \
-    brg='[1m'; \
-    std='[m'; \
-  fi; \
-}
-am__recheck_rx = ^[ 	]*:recheck:[ 	]*
-am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
-am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
-# A command that, given a newline-separated list of test names on the
-# standard input, print the name of the tests that are to be re-run
-# upon "make recheck".
-am__list_recheck_tests = $(AWK) '{ \
-  recheck = 1; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-        { \
-          if ((getline line2 < ($$0 ".log")) < 0) \
-	    recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
-        { \
-          recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
-        { \
-          break; \
-        } \
-    }; \
-  if (recheck) \
-    print $$0; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# A command that, given a newline-separated list of test names on the
-# standard input, create the global log from their .trs and .log files.
-am__create_global_log = $(AWK) ' \
-function fatal(msg) \
-{ \
-  print "fatal: making $@: " msg | "cat >&2"; \
-  exit 1; \
-} \
-function rst_section(header) \
-{ \
-  print header; \
-  len = length(header); \
-  for (i = 1; i <= len; i = i + 1) \
-    printf "="; \
-  printf "\n\n"; \
-} \
-{ \
-  copy_in_global_log = 1; \
-  global_test_result = "RUN"; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-         fatal("failed to read from " $$0 ".trs"); \
-      if (line ~ /$(am__global_test_result_rx)/) \
-        { \
-          sub("$(am__global_test_result_rx)", "", line); \
-          sub("[ 	]*$$", "", line); \
-          global_test_result = line; \
-        } \
-      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
-        copy_in_global_log = 0; \
-    }; \
-  if (copy_in_global_log) \
-    { \
-      rst_section(global_test_result ": " $$0); \
-      while ((rc = (getline line < ($$0 ".log"))) != 0) \
-      { \
-        if (rc < 0) \
-          fatal("failed to read from " $$0 ".log"); \
-        print line; \
-      }; \
-      printf "\n"; \
-    }; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# Restructured Text title.
-am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
-# Solaris 10 'make', and several other traditional 'make' implementations,
-# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
-# by disabling -e (using the XSI extension "set +e") if it's set.
-am__sh_e_setup = case $$- in *e*) set +e;; esac
-# Default flags passed to test drivers.
-am__common_driver_flags = \
-  --color-tests "$$am__color_tests" \
-  --enable-hard-errors "$$am__enable_hard_errors" \
-  --expect-failure "$$am__expect_failure"
-# To be inserted before the command running the test.  Creates the
-# directory for the log if needed.  Stores in $dir the directory
-# containing $f, in $tst the test, in $log the log.  Executes the
-# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
-# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
-# will run the test scripts (or their associated LOG_COMPILER, if
-# thy have one).
-am__check_pre = \
-$(am__sh_e_setup);					\
-$(am__vpath_adj_setup) $(am__vpath_adj)			\
-$(am__tty_colors);					\
-srcdir=$(srcdir); export srcdir;			\
-case "$@" in						\
-  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
-    *) am__odir=.;; 					\
-esac;							\
-test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
-  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
-if test -f "./$$f"; then dir=./;			\
-elif test -f "$$f"; then dir=;				\
-else dir="$(srcdir)/"; fi;				\
-tst=$$dir$$f; log='$@'; 				\
-if test -n '$(DISABLE_HARD_ERRORS)'; then		\
-  am__enable_hard_errors=no; 				\
-else							\
-  am__enable_hard_errors=yes; 				\
-fi; 							\
-case " $(XFAIL_TESTS) " in				\
-  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
-    am__expect_failure=yes;;				\
-  *)							\
-    am__expect_failure=no;;				\
-esac; 							\
-$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
-# A shell command to get the names of the tests scripts with any registered
-# extension removed (i.e., equivalently, the names of the test logs, with
-# the '.log' extension removed).  The result is saved in the shell variable
-# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
-# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
-# since that might cause problem with VPATH rewrites for suffix-less tests.
-# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
-am__set_TESTS_bases = \
-  bases='$(TEST_LOGS)'; \
-  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
-  bases=`echo $$bases`
-RECHECK_LOGS = $(TEST_LOGS)
-AM_RECURSIVE_TARGETS = check recheck
-TEST_SUITE_LOG = test-suite.log
-am__test_logs1 = $(TESTS:=.log)
-am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
-TEST_LOGS = $(am__test_logs2:.sh.log=.log)
-SH_LOG_DRIVER = $(SHELL) $(top_srcdir)/bin/test-driver
-SH_LOG_COMPILE = $(SH_LOG_COMPILER) $(AM_SH_LOG_FLAGS) $(SH_LOG_FLAGS)
-am__set_b = \
-  case '$@' in \
-    */*) \
-      case '$*' in \
-        */*) b='$*';; \
-          *) b=`echo '$@' | sed 's/\.log$$//'`; \
-       esac;; \
-    *) \
-      b='$*';; \
-  esac
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
-AMTAR = @AMTAR@
-
-# H5_CFLAGS holds flags that should be used when building hdf5,
-# but which should not be exported to h5cc for building other programs.
-# AM_CFLAGS is an automake construct which should be used by Makefiles 
-# instead of CFLAGS, as CFLAGS is reserved solely for the user to define.
-# This applies to FCFLAGS, CXXFLAGS, CPPFLAGS, and LDFLAGS as well.
-AM_CFLAGS = @AM_CFLAGS@ @H5_CFLAGS@
-
-# Include src directory
-AM_CPPFLAGS = @AM_CPPFLAGS@ @H5_CPPFLAGS@ -I$(top_srcdir)/src \
-	-I$(top_srcdir)/hl/src
-AM_CXXFLAGS = @AM_CXXFLAGS@ @H5_CXXFLAGS@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@
-AM_LDFLAGS = @AM_LDFLAGS@ @H5_LDFLAGS@ $(am__append_1)
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BYTESEX = @BYTESEX@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CC_VERSION = @CC_VERSION@
-CFLAGS = @CFLAGS@
-CLEARFILEBUF = @CLEARFILEBUF@
-CODESTACK = @CODESTACK@
-CONFIG_DATE = @CONFIG_DATE@
-CONFIG_MODE = @CONFIG_MODE@
-CONFIG_USER = @CONFIG_USER@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CXX_VERSION = @CXX_VERSION@
-CYGPATH_W = @CYGPATH_W@
-DEBUG_PKG = @DEBUG_PKG@
-DEFAULT_API_VERSION = @DEFAULT_API_VERSION@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
-DIRECT_VFD = @DIRECT_VFD@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-EXTERNAL_FILTERS = @EXTERNAL_FILTERS@
-
-# Make sure that these variables are exported to the Makefiles
-F9XMODEXT = @F9XMODEXT@
-F9XMODFLAG = @F9XMODFLAG@
-F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
-FC = @FC@
-FC2003 = @FC2003@
-FCFLAGS = @FCFLAGS@
-FCFLAGS_f90 = @FCFLAGS_f90@
-FCLIBS = @FCLIBS@
-FC_VERSION = @FC_VERSION@
-FGREP = @FGREP@
-FSEARCH_DIRS = @FSEARCH_DIRS@
-GREP = @GREP@
-H5_CFLAGS = @H5_CFLAGS@
-H5_CPPFLAGS = @H5_CPPFLAGS@
-H5_CXXFLAGS = @H5_CXXFLAGS@
-H5_CXX_SHARED = @H5_CXX_SHARED@
-H5_FCFLAGS = @H5_FCFLAGS@
-H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@
-H5_LDFLAGS = @H5_LDFLAGS@
-H5_LONE_COLON = @H5_LONE_COLON@
-H5_VERSION = @H5_VERSION@
-HADDR_T = @HADDR_T@
-HAVE_DMALLOC = @HAVE_DMALLOC@
-HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@
-HAVE_PTHREAD = @HAVE_PTHREAD@
-HDF5_HL = @HDF5_HL@
-HDF5_INTERFACES = @HDF5_INTERFACES@
-HDF_CXX = @HDF_CXX@
-HDF_FORTRAN = @HDF_FORTRAN@
-HDF_FORTRAN2003 = @HDF_FORTRAN2003@
-HID_T = @HID_T@
-HL = @HL@
-HL_FOR = @HL_FOR@
-HSIZE_T = @HSIZE_T@
-HSSIZE_T = @HSSIZE_T@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTRUMENT = @INSTRUMENT@
-INSTRUMENT_LIBRARY = @INSTRUMENT_LIBRARY@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LL_PATH = @LL_PATH@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_STATIC_EXEC = @LT_STATIC_EXEC@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MPE = @MPE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJECT_NAMELEN_DEFAULT_F = @OBJECT_NAMELEN_DEFAULT_F@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PARALLEL = @PARALLEL@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-RANLIB = @RANLIB@
-ROOT = @ROOT@
-RUNPARALLEL = @RUNPARALLEL@
-RUNSERIAL = @RUNSERIAL@
-R_INTEGER = @R_INTEGER@
-R_LARGE = @R_LARGE@
-SEARCH = @SEARCH@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SIZE_T = @SIZE_T@
-STATIC_EXEC = @STATIC_EXEC@
-STATIC_SHARED = @STATIC_SHARED@
-STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@
-STRIP = @STRIP@
-TESTPARALLEL = @TESTPARALLEL@
-THREADSAFE = @THREADSAFE@
-TIME = @TIME@
-TR = @TR@
-TRACE_API = @TRACE_API@
-UNAME_INFO = @UNAME_INFO@
-USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
-USE_FILTER_SZIP = @USE_FILTER_SZIP@
-USINGMEMCHECKER = @USINGMEMCHECKER@
-VERSION = @VERSION@
-WORDS_BIGENDIAN = @WORDS_BIGENDIAN@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_FC = @ac_ct_FC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-
-# Install directories that automake doesn't know about
-docdir = $(exec_prefix)/doc
-dvidir = @dvidir@
-enable_shared = @enable_shared@
-enable_static = @enable_static@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-
-# Shell commands used in Makefiles
-RM = rm -f
-CP = cp
-
-# Some machines need a command to run executables; this is that command
-# so that our tests will run.
-# We use RUNEXEC instead of RUNSERIAL directly because it may be that
-# some tests need to be run with a different command.  Older versions
-# of the makefiles used the command
-# $(LIBTOOL) --mode=execute
-# in some directories, for instance.
-RUNEXEC = $(RUNSERIAL)
-
-# Libraries to link to while building
-LIBHDF5 = $(top_builddir)/src/libhdf5.la
-LIBH5TEST = $(top_builddir)/test/libh5test.la
-LIBH5F = $(top_builddir)/fortran/src/libhdf5_fortran.la
-LIBH5FTEST = $(top_builddir)/fortran/test/libh5test_fortran.la
-LIBH5CPP = $(top_builddir)/c++/src/libhdf5_cpp.la
-LIBH5TOOLS = $(top_builddir)/tools/lib/libh5tools.la
-LIBH5_HL = $(top_builddir)/hl/src/libhdf5_hl.la
-LIBH5F_HL = $(top_builddir)/hl/fortran/src/libhdf5hl_fortran.la
-LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
-
-# Note that in svn revision 19400 the '/' after DESTDIR in H5* variables below  
-# has been removed. According to the official description of DESTDIR by Gnu at 
-# http://www.gnu.org/prep/standards/html_node/DESTDIR.html, DESTDIR is 
-# prepended to the normal and complete install path that it precedes for the 
-# purpose of installing in a temporary directory which is useful for building 
-# rpms and other packages.  The '/' after ${DESTDIR} will be followed by another 
-# '/' at the beginning of the normal install path.  When DESTDIR is empty the  
-# path then begins with '//', which is incorrect and causes problems at least for 
-# Cygwin.   
-
-# Scripts used to build examples
-# If only shared libraries have been installed, have h5cc build examples with
-# shared libraries instead of static libraries
-H5CC = ${DESTDIR}$(bindir)/h5cc
-H5CC_PP = ${DESTDIR}$(bindir)/h5pcc
-H5FC = ${DESTDIR}$(bindir)/h5fc
-H5FC_PP = ${DESTDIR}$(bindir)/h5pfc
-H5CPP = ${DESTDIR}$(bindir)/h5c++
-ACLOCAL_AMFLAGS = "-I m4"
-
-# The trace script; this is used on source files from the C library to
-# insert tracing macros.
-TRACE = perl $(top_srcdir)/bin/trace
-
-# .chkexe files are used to mark tests that have run successfully.
-# .chklog files are output from those tests.
-# *.clog and *.clog2 are from the MPE option.
-CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2
-
-# Add libtool shared library version numbers to the HDF5 library
-# See libtool versioning documentation online.
-# After making changes, run bin/reconfigure to update other configure related
-# files like Makefile.in.
-LT_VERS_INTERFACE = 6
-LT_VERS_REVISION = 206
-LT_VERS_AGE = 0
-
-# This is our main target
-lib_LTLIBRARIES = libhdf5_hl_cpp.la
-
-# Add libtool numbers to the HDF5 HL C++ library (from config/lt_vers.am)
-libhdf5_hl_cpp_la_LDFLAGS = -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
-
-# Source files for the library
-# At the moment, only the H5PT Packet Table has a C++ API.
-libhdf5_hl_cpp_la_SOURCES = H5PacketTable.cpp
-
-# HDF5 HL C++ library depends on HDF5 Library.
-libhdf5_hl_cpp_la_LIBADD = $(LIBH5_HL) $(LIBH5CPP)
-
-# Public headers
-include_HEADERS = H5PacketTable.h
-
-# Automake needs to be taught how to build lib, progs, and tests targets.
-# These will be filled in automatically for the most part (e.g.,
-# lib_LIBRARIES are built for lib target), but EXTRA_LIB, EXTRA_PROG, and
-# EXTRA_TEST variables are supplied to allow the user to force targets to
-# be built at certain times. 
-LIB = $(lib_LIBRARIES) $(lib_LTLIBRARIES) $(noinst_LIBRARIES)                 \
-      $(noinst_LTLIBRARIES) $(check_LIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LIB)
-
-PROGS = $(bin_PROGRAMS) $(bin_SCRIPTS) $(noinst_PROGRAMS) $(noinst_SCRIPTS)   \
-        $(EXTRA_PROG)
-
-chk_TESTS = $(check_PROGRAMS) $(check_SCRIPTS) $(EXTRA_TEST) 
-TEST_EXTENSIONS = .sh
-SH_LOG_COMPILER = $(SHELL)
-AM_SH_LOG_FLAGS = 
-TEST_PROG_CHKEXE = $(TEST_PROG:=.chkexe_)
-TEST_PROG_PARA_CHKEXE = $(TEST_PROG_PARA:=.chkexe_)
-TEST_SCRIPT_CHKSH = $(TEST_SCRIPT:=.chkexe_)
-TEST_SCRIPT_PARA_CHKSH = $(TEST_SCRIPT_PARA:=.chkexe_)
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .cpp .lo .log .o .obj .sh .sh$(EXEEXT) .trs
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/lt_vers.am $(top_srcdir)/config/conclude.am $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign hl/c++/src/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign hl/c++/src/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-$(top_srcdir)/config/commence.am $(top_srcdir)/config/lt_vers.am $(top_srcdir)/config/conclude.am:
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
-	}
-
-uninstall-libLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
-	done
-
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; \
-	locs=`for p in $$list; do echo $$p; done | \
-	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
-	      sort -u`; \
-	test -z "$$locs" || { \
-	  echo rm -f $${locs}; \
-	  rm -f $${locs}; \
-	}
-
-libhdf5_hl_cpp.la: $(libhdf5_hl_cpp_la_OBJECTS) $(libhdf5_hl_cpp_la_DEPENDENCIES) $(EXTRA_libhdf5_hl_cpp_la_DEPENDENCIES) 
-	$(AM_V_CXXLD)$(libhdf5_hl_cpp_la_LINK) -rpath $(libdir) $(libhdf5_hl_cpp_la_OBJECTS) $(libhdf5_hl_cpp_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5PacketTable.Plo@am__quote@
-
-.cpp.o:
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
-
-.cpp.obj:
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.cpp.lo:
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-includeHEADERS: $(include_HEADERS)
-	@$(NORMAL_INSTALL)
-	@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \
-	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \
-	done
-
-uninstall-includeHEADERS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: ctags-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-# Recover from deleted '.trs' file; this should ensure that
-# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
-# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
-# to avoid problems with "make -n".
-.log.trs:
-	rm -f $< $@
-	$(MAKE) $(AM_MAKEFLAGS) $<
-
-# Leading 'am--fnord' is there to ensure the list of targets does not
-# expand to empty, as could happen e.g. with make check TESTS=''.
-am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
-am--force-recheck:
-	@:
-
-$(TEST_SUITE_LOG): $(TEST_LOGS)
-	@$(am__set_TESTS_bases); \
-	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
-	redo_bases=`for i in $$bases; do \
-	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
-	            done`; \
-	if test -n "$$redo_bases"; then \
-	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
-	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
-	  if $(am__make_dryrun); then :; else \
-	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
-	  fi; \
-	fi; \
-	if test -n "$$am__remaking_logs"; then \
-	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
-	       "recursion detected" >&2; \
-	else \
-	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
-	fi; \
-	if $(am__make_dryrun); then :; else \
-	  st=0;  \
-	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
-	  for i in $$redo_bases; do \
-	    test -f $$i.trs && test -r $$i.trs \
-	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
-	    test -f $$i.log && test -r $$i.log \
-	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
-	  done; \
-	  test $$st -eq 0 || exit 1; \
-	fi
-	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
-	ws='[ 	]'; \
-	results=`for b in $$bases; do echo $$b.trs; done`; \
-	test -n "$$results" || results=/dev/null; \
-	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
-	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
-	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
-	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
-	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
-	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
-	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
-	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
-	  success=true; \
-	else \
-	  success=false; \
-	fi; \
-	br='==================='; br=$$br$$br$$br$$br; \
-	result_count () \
-	{ \
-	    if test x"$$1" = x"--maybe-color"; then \
-	      maybe_colorize=yes; \
-	    elif test x"$$1" = x"--no-color"; then \
-	      maybe_colorize=no; \
-	    else \
-	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
-	    fi; \
-	    shift; \
-	    desc=$$1 count=$$2; \
-	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
-	      color_start=$$3 color_end=$$std; \
-	    else \
-	      color_start= color_end=; \
-	    fi; \
-	    echo "$${color_start}# $$desc $$count$${color_end}"; \
-	}; \
-	create_testsuite_report () \
-	{ \
-	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
-	  result_count $$1 "PASS: " $$pass  "$$grn"; \
-	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
-	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
-	  result_count $$1 "FAIL: " $$fail  "$$red"; \
-	  result_count $$1 "XPASS:" $$xpass "$$red"; \
-	  result_count $$1 "ERROR:" $$error "$$mgn"; \
-	}; \
-	{								\
-	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
-	    $(am__rst_title);						\
-	  create_testsuite_report --no-color;				\
-	  echo;								\
-	  echo ".. contents:: :depth: 2";				\
-	  echo;								\
-	  for b in $$bases; do echo $$b; done				\
-	    | $(am__create_global_log);					\
-	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
-	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
-	if $$success; then						\
-	  col="$$grn";							\
-	 else								\
-	  col="$$red";							\
-	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
-	fi;								\
-	echo "$${col}$$br$${std}"; 					\
-	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
-	echo "$${col}$$br$${std}"; 					\
-	create_testsuite_report --maybe-color;				\
-	echo "$$col$$br$$std";						\
-	if $$success; then :; else					\
-	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
-	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
-	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
-	  fi;								\
-	  echo "$$col$$br$$std";					\
-	fi;								\
-	$$success || exit 1
-recheck: all 
-	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-	@set +e; $(am__set_TESTS_bases); \
-	bases=`for i in $$bases; do echo $$i; done \
-	         | $(am__list_recheck_tests)` || exit 1; \
-	log_list=`for i in $$bases; do echo $$i.log; done`; \
-	log_list=`echo $$log_list`; \
-	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
-	        am__force_recheck=am--force-recheck \
-	        TEST_LOGS="$$log_list"; \
-	exit $$?
-.sh.log:
-	@p='$<'; \
-	$(am__set_b); \
-	$(am__check_pre) $(SH_LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_SH_LOG_DRIVER_FLAGS) $(SH_LOG_DRIVER_FLAGS) -- $(SH_LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-@am__EXEEXT_TRUE@.sh$(EXEEXT).log:
-@am__EXEEXT_TRUE@	@p='$<'; \
-@am__EXEEXT_TRUE@	$(am__set_b); \
-@am__EXEEXT_TRUE@	$(am__check_pre) $(SH_LOG_DRIVER) --test-name "$$f" \
-@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
-@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_SH_LOG_DRIVER_FLAGS) $(SH_LOG_DRIVER_FLAGS) -- $(SH_LOG_COMPILE) \
-@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS) all-local
-installdirs:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
-	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
-	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-includeHEADERS
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-libLTLIBRARIES
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-local
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES
-
-.MAKE: check-am install-am install-strip
-
-.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-TESTS \
-	check-am clean clean-generic clean-libLTLIBRARIES \
-	clean-libtool cscopelist-am ctags ctags-am distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-includeHEADERS install-info \
-	install-info-am install-libLTLIBRARIES install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
-	pdf-am ps ps-am recheck tags tags-am uninstall uninstall-am \
-	uninstall-includeHEADERS uninstall-libLTLIBRARIES
-
-
-# List all build rules defined by HDF5 Makefiles as "PHONY" targets here.
-# This tells the Makefiles that these targets are not files to be built but
-# commands that should be executed even if a file with the same name already
-# exists.
-.PHONY: build-check-clean build-check-p build-check-s build-lib build-progs \
-        build-tests check-clean check-install check-p check-s check-vfd \
-        install-doc lib progs tests uninstall-doc _exec_check-s _test help
-
-help:
-	@$(top_srcdir)/bin/makehelp
-
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-
-# lib/progs/tests targets recurse into subdirectories. build-* targets
-# build files in this directory.
-build-lib: $(LIB)
-build-progs: $(LIB) $(PROGS)
-build-tests: $(LIB) $(PROGS) $(chk_TESTS)
-
-# General rule for recursive building targets.
-# BUILT_SOURCES contain targets that need to be built before anything else
-# in the directory (e.g., for Fortran type detection)
-lib progs tests check-s check-p :: $(BUILT_SOURCES)
-	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
-	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X && test $$d != .; then                           \
-	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
-	    fi;                                                               \
-	done
-
-# General rule for recursive cleaning targets.  Like the rule above,
-# but doesn't require building BUILT_SOURCES.
-check-clean ::
-	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
-	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X && test $$d != .; then                           \
-	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
-	    fi;                                                               \
-	done
-
-# Tell Automake to build tests when the user types `make all' (this is
-# not its default behavior).  Also build EXTRA_LIB and EXTRA_PROG since
-# Automake won't build them automatically, either.
-all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(chk_TESTS)
-
-# make install-doc doesn't do anything outside of doc directory, but
-# Makefiles should recognize it.
-# UPDATE: docs no longer reside in this build tree, so this target
-# is depreciated.
-install-doc uninstall-doc:
-	@echo "Nothing to be done."
-
-# clean up files generated by tests so they can be re-run.
-build-check-clean:
-	$(RM) -rf $(CHECK_CLEANFILES)
-
-# run check-clean whenever mostlyclean is run
-mostlyclean-local: build-check-clean
-
-# check-install is just a synonym for installcheck
-check-install: installcheck
-
-# Run each test in order, passing $(TEST_FLAGS) to the program.
-# Since tests are done in a shell loop, "make -i" does apply inside it.
-# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
-# The timestamps give a rough idea how much time the tests use.
-#
-# Note that targets in chk_TESTS (defined above) will be built when the user
-# types 'make tests' or 'make check', but only programs in TEST_PROG,
-# TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
-check-TESTS: test
-
-test _test:
-	@$(MAKE) build-check-s
-	@$(MAKE) build-check-p
-
-# Actual execution of check-s.
-build-check-s: $(LIB) $(PROGS) $(chk_TESTS)
-	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
-	   echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
-	fi
-	@$(MAKE) $(AM_MAKEFLAGS) _exec_check-s
-	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
-	    echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
-	fi
-
-_exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH)
-
-# The dummy.chkexe here prevents the target from being
-# empty if there are no tests in the current directory.
-# $${log} is the log file.
-# $${tname} is the name of test.
-$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
-	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \
-	   tname=$(@:.chkexe_=)$(EXEEXT);\
-	   log=$(@:.chkexe_=.chklog); \
-	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \
-	      echo "No need to test $${tname} again."; \
-	   else \
-	      echo "============================" > $${log}; \
-	      if test "X$(FORTRAN_API)" = "Xyes"; then \
-	         echo "Fortran API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "Fortran API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(CXX_API)" = "Xyes"; then \
-	         echo "C++ API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "C++ API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log};\
-	      else \
-	         echo "Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "$(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      fi; \
-	      echo "============================" >> $${log}; \
-	      srcdir="$(srcdir)" \
-	         $(TIME) $(RUNEXEC) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \
-	         && touch $(@:.chkexe_=.chkexe) || \
-	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	         (cat $${log} && false) || exit 1; \
-	      echo "" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
-	      echo "============================" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
-	      cat $${log}; \
-	   fi; \
-	fi
-
-# The dummysh.chkexe here prevents the target from being
-# empty if there are no tests in the current directory.
-# $${log} is the log file.
-# $${tname} is the name of test.
-$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
-	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummysh.chkexe_"; then \
-	   cmd=$(@:.chkexe_=);\
-	   tname=`basename $$cmd`;\
-	   chkname=`basename $(@:.chkexe_=.chkexe)`;\
-	   log=`basename $(@:.chkexe_=.chklog)`; \
-	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer $${chkname} $$cmd $(SCRIPT_DEPEND); then \
-	      echo "No need to test $${tname} again."; \
-	   else \
-	      echo "============================" > $${log}; \
-	      if test "X$(FORTRAN_API)" = "Xyes"; then \
-	         echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(CXX_API)" = "Xyes"; then \
-	         echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      else \
-	         echo "Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      fi; \
-	      echo "============================" >> $${log}; \
-	      RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
-	      srcdir="$(srcdir)" \
-	         $(TIME) $(SHELL) $$cmd $(TEST_FLAGS) >> $${log} 2>&1 \
-	         && touch $${chkname} || \
-	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	         (cat $${log} && false) || exit 1; \
-	      echo "" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
-	      echo "============================" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
-	      cat $${log}; \
-	   fi; \
-	   echo "============================"; \
-	fi
-
-# Actual execution of check-p.
-build-check-p: $(LIB) $(PROGS) $(chk_TESTS)
-	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
-	   echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
-	fi
-	@if test -n "$(TEST_PROG_PARA)"; then                                \
-	    echo "**** Hint ****";                                            \
-	    echo "Parallel test files reside in the current directory"        \
-	         "by default.";                                               \
-	    echo "Set HDF5_PARAPREFIX to use another directory. E.g.,";       \
-	    echo "    HDF5_PARAPREFIX=/PFS/user/me";                          \
-	    echo "    export HDF5_PARAPREFIX";                                \
-	    echo "    make check";                                            \
-	    echo "**** end of Hint ****";                                     \
-	fi
-	@for test in $(TEST_PROG_PARA) dummy; do                             \
-	   if test $$test != dummy; then                                      \
-	      $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ \
-	      RUNEXEC="$(RUNPARALLEL)" || exit 1; \
-	   fi;                                                                \
-	done
-	@for test in $(TEST_SCRIPT_PARA) dummy; do                           \
-	  if test $$test != dummy; then                                      \
-	    $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ || exit 1; \
-	  fi;                                                                 \
-	done
-	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
-	    echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
-	fi
-
-# Run test with different Virtual File Driver
-check-vfd: $(LIB) $(PROGS) $(chk_TESTS)
-	@for vfd in $(VFD_LIST) dummy; do                                     \
-	    if test $$vfd != dummy; then                                      \
-	        echo "============================";                          \
-	        echo "Testing Virtual File Driver $$vfd";                     \
-	        echo "============================";                          \
-	        $(MAKE) $(AM_MAKEFLAGS) check-clean || exit 1;                \
-	        HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check || exit 1;    \
-	    fi;                                                               \
-	done
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/hl/c++/test/CMakeLists.txt b/hl/c++/test/CMakeLists.txt
index ff06b22..192fb13 100644
--- a/hl/c++/test/CMakeLists.txt
+++ b/hl/c++/test/CMakeLists.txt
@@ -1,31 +1,37 @@
-cmake_minimum_required (VERSION 3.1.0)
-PROJECT (HDF5_HL_CPP_TEST)
-
-#-----------------------------------------------------------------------------
-# Setup include Directories
-#-----------------------------------------------------------------------------
-INCLUDE_DIRECTORIES (${HDF5_HL_SRC_DIR}/src)
-INCLUDE_DIRECTORIES (${HDF5_HL_SRC_DIR}/c++/src)
-
-# --------------------------------------------------------------------
-# Add in the unit tests for the packet table c++ wrapper
-# --------------------------------------------------------------------
-
-INCLUDE_DIRECTORIES (${HDF5_TEST_SRC_DIR})
-INCLUDE_DIRECTORIES (${HDF5_HL_SRC_DIR}/test)
-INCLUDE_DIRECTORIES (${HDF5_CPP_SRC_DIR}/src)
+cmake_minimum_required (VERSION 3.18)
+project (HDF5_HL_CPP_TEST CXX)
 
 add_executable (hl_ptableTest ${HDF5_HL_CPP_TEST_SOURCE_DIR}/ptableTest.cpp)
-TARGET_C_PROPERTIES (hl_ptableTest ${LIB_TYPE} " " " ")
-TARGET_NAMING (hl_ptableTest ${LIB_TYPE})
-target_link_libraries (
-    hl_ptableTest
-    ${HDF5_LIB_TARGET}
-    ${HDF5_TEST_LIB_TARGET}
-    ${HDF5_CPP_LIB_TARGET}
-    ${HDF5_HL_LIB_TARGET}
-    ${HDF5_HL_CPP_LIB_TARGET}
-)
+target_compile_options(hl_ptableTest PRIVATE "${HDF5_CMAKE_CXX_FLAGS}")
+target_include_directories (hl_ptableTest PRIVATE "${HDF5_HL_SRC_DIR}/test;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+if (NOT BUILD_SHARED_LIBS)
+  TARGET_C_PROPERTIES (hl_ptableTest STATIC)
+  target_link_libraries (hl_ptableTest PRIVATE
+      ${HDF5_LIB_TARGET}
+      ${HDF5_TEST_LIB_TARGET}
+      ${HDF5_CPP_LIB_TARGET}
+      ${HDF5_HL_LIB_TARGET}
+      ${HDF5_HL_CPP_LIB_TARGET}
+  )
+else ()
+  TARGET_C_PROPERTIES (hl_ptableTest SHARED)
+  target_link_libraries (hl_ptableTest PRIVATE
+      ${HDF5_LIBSH_TARGET}
+      ${HDF5_TEST_LIBSH_TARGET}
+      ${HDF5_CPP_LIBSH_TARGET}
+      ${HDF5_HL_LIBSH_TARGET}
+      ${HDF5_HL_CPP_LIBSH_TARGET}
+  )
+endif ()
 set_target_properties (hl_ptableTest PROPERTIES FOLDER test/hl/cpp)
 
-include (CMakeTests.cmake)
+#-----------------------------------------------------------------------------
+# Add Target to clang-format
+#-----------------------------------------------------------------------------
+if (HDF5_ENABLE_FORMATTERS)
+  clang_format (HDF5_HL_CPP_TEST_FORMAT hl_ptableTest)
+endif ()
+
+if (HDF5_TEST_CPP AND HDF5_TEST_SERIAL)
+  include (CMakeTests.cmake)
+endif ()
diff --git a/hl/c++/test/CMakeTests.cmake b/hl/c++/test/CMakeTests.cmake
index e36b5aa..4137270 100644
--- a/hl/c++/test/CMakeTests.cmake
+++ b/hl/c++/test/CMakeTests.cmake
@@ -1,8 +1,55 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
 
 ##############################################################################
 ##############################################################################
 ###           T E S T I N G                                                ###
 ##############################################################################
 ##############################################################################
-  
-  add_test (NAME HL_CPP_ptableTest COMMAND $<TARGET_FILE:hl_ptableTest>)
+# Remove any output file left over from previous test run
+set (HL_CPP_PT_CLEANFILES
+            packettest.h5
+)
+add_test (
+    NAME HL_CPP_ptableTest-clear-objects
+    COMMAND    ${CMAKE_COMMAND}
+        -E remove ${HL_CPP_PT_CLEANFILES}
+)
+set_tests_properties (HL_CPP_ptableTest-clear-objects PROPERTIES
+    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+)
+
+if (HDF5_ENABLE_USING_MEMCHECKER)
+  add_test (NAME HL_CPP_ptableTest COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:hl_ptableTest>)
+else ()
+  add_test (NAME HL_CPP_ptableTest COMMAND "${CMAKE_COMMAND}"
+      -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
+      -D "TEST_PROGRAM=$<TARGET_FILE:hl_ptableTest>"
+      -D "TEST_ARGS:STRING="
+      -D "TEST_EXPECT=0"
+      -D "TEST_SKIP_COMPARE=TRUE"
+      -D "TEST_OUTPUT=hl_ptableTest.txt"
+      #-D "TEST_REFERENCE=hl_ptableTest.out"
+      -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+      -P "${HDF_RESOURCES_DIR}/runTest.cmake"
+  )
+endif ()
+set_tests_properties (HL_CPP_ptableTest PROPERTIES DEPENDS HL_CPP_ptableTest-clear-objects)
+add_test (
+    NAME HL_CPP_ptableTest-clean-objects
+    COMMAND    ${CMAKE_COMMAND}
+        -E remove ${HL_CPP_PT_CLEANFILES}
+)
+set_tests_properties (HL_CPP_ptableTest-clean-objects PROPERTIES
+    DEPENDS HL_CPP_ptableTest
+    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+)
diff --git a/hl/c++/test/Makefile.am b/hl/c++/test/Makefile.am
index 105188f..251d56a 100644
--- a/hl/c++/test/Makefile.am
+++ b/hl/c++/test/Makefile.am
@@ -1,16 +1,13 @@
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 ##
 ## Makefile.am
 ## Run automake to generate a Makefile.in from this file.
@@ -23,12 +20,6 @@ include $(top_srcdir)/config/commence.am
 # Include directories
 AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/c++/src -I$(top_srcdir)/hl/src -I$(top_srcdir)/hl/c++/src -I$(top_srcdir)/test -I$(top_builddir)/hl/test -I$(top_srcdir)/hl/test
 
-# Shared C++ libraries aren't universally supported.
-if CXX_SHARED_CONDITIONAL
-else
-  AM_LDFLAGS+=-static
-endif
-
 # These are our main targets.  They should be listed in the order to be
 # executed, generally most specific tests to least specific tests.
 TEST_PROG=ptableTest
diff --git a/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in
deleted file mode 100644
index eef6fcc..0000000
--- a/hl/c++/test/Makefile.in
+++ /dev/null
@@ -1,1346 +0,0 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-#
-# HDF5-C++ Makefile(.in)
-#
-VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-DIST_COMMON = $(top_srcdir)/config/commence.am \
-	$(top_srcdir)/config/conclude.am $(srcdir)/Makefile.in \
-	$(srcdir)/Makefile.am $(top_srcdir)/bin/mkinstalldirs \
-	$(top_srcdir)/bin/depcomp $(top_srcdir)/bin/test-driver
-
-# Shared C++ libraries aren't universally supported.
-@CXX_SHARED_CONDITIONAL_FALSE@am__append_1 = -static
-check_PROGRAMS = $(am__EXEEXT_1)
-TESTS = $(am__EXEEXT_1)
-subdir = hl/c++/test
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/aclocal_cxx.m4 \
-	$(top_srcdir)/m4/aclocal_fc.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/src/H5config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__EXEEXT_1 = ptableTest$(EXEEXT)
-am_ptableTest_OBJECTS = ptableTest.$(OBJEXT)
-ptableTest_OBJECTS = $(am_ptableTest_OBJECTS)
-ptableTest_LDADD = $(LDADD)
-ptableTest_DEPENDENCIES = $(LIBH5CPP_HL) $(LIBH5_HL) $(LIBH5CPP) \
-	$(LIBHDF5)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 = 
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
-depcomp = $(SHELL) $(top_srcdir)/bin/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS)
-AM_V_CXX = $(am__v_CXX_@AM_V@)
-am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
-am__v_CXX_0 = @echo "  CXX     " $@;
-am__v_CXX_1 = 
-CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
-am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
-am__v_CXXLD_0 = @echo "  CXXLD   " $@;
-am__v_CXXLD_1 = 
-SOURCES = $(ptableTest_SOURCES)
-DIST_SOURCES = $(ptableTest_SOURCES)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-am__tty_colors_dummy = \
-  mgn= red= grn= lgn= blu= brg= std=; \
-  am__color_tests=no
-am__tty_colors = { \
-  $(am__tty_colors_dummy); \
-  if test "X$(AM_COLOR_TESTS)" = Xno; then \
-    am__color_tests=no; \
-  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
-    am__color_tests=yes; \
-  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
-    am__color_tests=yes; \
-  fi; \
-  if test $$am__color_tests = yes; then \
-    red='[0;31m'; \
-    grn='[0;32m'; \
-    lgn='[1;32m'; \
-    blu='[1;34m'; \
-    mgn='[0;35m'; \
-    brg='[1m'; \
-    std='[m'; \
-  fi; \
-}
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__recheck_rx = ^[ 	]*:recheck:[ 	]*
-am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
-am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
-# A command that, given a newline-separated list of test names on the
-# standard input, print the name of the tests that are to be re-run
-# upon "make recheck".
-am__list_recheck_tests = $(AWK) '{ \
-  recheck = 1; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-        { \
-          if ((getline line2 < ($$0 ".log")) < 0) \
-	    recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
-        { \
-          recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
-        { \
-          break; \
-        } \
-    }; \
-  if (recheck) \
-    print $$0; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# A command that, given a newline-separated list of test names on the
-# standard input, create the global log from their .trs and .log files.
-am__create_global_log = $(AWK) ' \
-function fatal(msg) \
-{ \
-  print "fatal: making $@: " msg | "cat >&2"; \
-  exit 1; \
-} \
-function rst_section(header) \
-{ \
-  print header; \
-  len = length(header); \
-  for (i = 1; i <= len; i = i + 1) \
-    printf "="; \
-  printf "\n\n"; \
-} \
-{ \
-  copy_in_global_log = 1; \
-  global_test_result = "RUN"; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-         fatal("failed to read from " $$0 ".trs"); \
-      if (line ~ /$(am__global_test_result_rx)/) \
-        { \
-          sub("$(am__global_test_result_rx)", "", line); \
-          sub("[ 	]*$$", "", line); \
-          global_test_result = line; \
-        } \
-      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
-        copy_in_global_log = 0; \
-    }; \
-  if (copy_in_global_log) \
-    { \
-      rst_section(global_test_result ": " $$0); \
-      while ((rc = (getline line < ($$0 ".log"))) != 0) \
-      { \
-        if (rc < 0) \
-          fatal("failed to read from " $$0 ".log"); \
-        print line; \
-      }; \
-      printf "\n"; \
-    }; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# Restructured Text title.
-am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
-# Solaris 10 'make', and several other traditional 'make' implementations,
-# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
-# by disabling -e (using the XSI extension "set +e") if it's set.
-am__sh_e_setup = case $$- in *e*) set +e;; esac
-# Default flags passed to test drivers.
-am__common_driver_flags = \
-  --color-tests "$$am__color_tests" \
-  --enable-hard-errors "$$am__enable_hard_errors" \
-  --expect-failure "$$am__expect_failure"
-# To be inserted before the command running the test.  Creates the
-# directory for the log if needed.  Stores in $dir the directory
-# containing $f, in $tst the test, in $log the log.  Executes the
-# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
-# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
-# will run the test scripts (or their associated LOG_COMPILER, if
-# thy have one).
-am__check_pre = \
-$(am__sh_e_setup);					\
-$(am__vpath_adj_setup) $(am__vpath_adj)			\
-$(am__tty_colors);					\
-srcdir=$(srcdir); export srcdir;			\
-case "$@" in						\
-  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
-    *) am__odir=.;; 					\
-esac;							\
-test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
-  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
-if test -f "./$$f"; then dir=./;			\
-elif test -f "$$f"; then dir=;				\
-else dir="$(srcdir)/"; fi;				\
-tst=$$dir$$f; log='$@'; 				\
-if test -n '$(DISABLE_HARD_ERRORS)'; then		\
-  am__enable_hard_errors=no; 				\
-else							\
-  am__enable_hard_errors=yes; 				\
-fi; 							\
-case " $(XFAIL_TESTS) " in				\
-  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
-    am__expect_failure=yes;;				\
-  *)							\
-    am__expect_failure=no;;				\
-esac; 							\
-$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
-# A shell command to get the names of the tests scripts with any registered
-# extension removed (i.e., equivalently, the names of the test logs, with
-# the '.log' extension removed).  The result is saved in the shell variable
-# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
-# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
-# since that might cause problem with VPATH rewrites for suffix-less tests.
-# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
-am__set_TESTS_bases = \
-  bases='$(TEST_LOGS)'; \
-  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
-  bases=`echo $$bases`
-RECHECK_LOGS = $(TEST_LOGS)
-AM_RECURSIVE_TARGETS = check recheck
-TEST_SUITE_LOG = test-suite.log
-LOG_DRIVER = $(SHELL) $(top_srcdir)/bin/test-driver
-LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
-am__set_b = \
-  case '$@' in \
-    */*) \
-      case '$*' in \
-        */*) b='$*';; \
-          *) b=`echo '$@' | sed 's/\.log$$//'`; \
-       esac;; \
-    *) \
-      b='$*';; \
-  esac
-am__test_logs1 = $(TESTS:=.log)
-am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
-TEST_LOGS = $(am__test_logs2:.sh.log=.log)
-SH_LOG_DRIVER = $(SHELL) $(top_srcdir)/bin/test-driver
-SH_LOG_COMPILE = $(SH_LOG_COMPILER) $(AM_SH_LOG_FLAGS) $(SH_LOG_FLAGS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
-AMTAR = @AMTAR@
-
-# H5_CFLAGS holds flags that should be used when building hdf5,
-# but which should not be exported to h5cc for building other programs.
-# AM_CFLAGS is an automake construct which should be used by Makefiles 
-# instead of CFLAGS, as CFLAGS is reserved solely for the user to define.
-# This applies to FCFLAGS, CXXFLAGS, CPPFLAGS, and LDFLAGS as well.
-AM_CFLAGS = @AM_CFLAGS@ @H5_CFLAGS@
-
-# Include directories
-AM_CPPFLAGS = @AM_CPPFLAGS@ @H5_CPPFLAGS@ -I$(top_srcdir)/src \
-	-I$(top_srcdir)/c++/src -I$(top_srcdir)/hl/src \
-	-I$(top_srcdir)/hl/c++/src -I$(top_srcdir)/test \
-	-I$(top_builddir)/hl/test -I$(top_srcdir)/hl/test
-AM_CXXFLAGS = @AM_CXXFLAGS@ @H5_CXXFLAGS@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@
-AM_LDFLAGS = @AM_LDFLAGS@ @H5_LDFLAGS@ $(am__append_1)
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BYTESEX = @BYTESEX@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CC_VERSION = @CC_VERSION@
-CFLAGS = @CFLAGS@
-CLEARFILEBUF = @CLEARFILEBUF@
-CODESTACK = @CODESTACK@
-CONFIG_DATE = @CONFIG_DATE@
-CONFIG_MODE = @CONFIG_MODE@
-CONFIG_USER = @CONFIG_USER@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CXX_VERSION = @CXX_VERSION@
-CYGPATH_W = @CYGPATH_W@
-DEBUG_PKG = @DEBUG_PKG@
-DEFAULT_API_VERSION = @DEFAULT_API_VERSION@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
-DIRECT_VFD = @DIRECT_VFD@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-EXTERNAL_FILTERS = @EXTERNAL_FILTERS@
-
-# Make sure that these variables are exported to the Makefiles
-F9XMODEXT = @F9XMODEXT@
-F9XMODFLAG = @F9XMODFLAG@
-F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
-FC = @FC@
-FC2003 = @FC2003@
-FCFLAGS = @FCFLAGS@
-FCFLAGS_f90 = @FCFLAGS_f90@
-FCLIBS = @FCLIBS@
-FC_VERSION = @FC_VERSION@
-FGREP = @FGREP@
-FSEARCH_DIRS = @FSEARCH_DIRS@
-GREP = @GREP@
-H5_CFLAGS = @H5_CFLAGS@
-H5_CPPFLAGS = @H5_CPPFLAGS@
-H5_CXXFLAGS = @H5_CXXFLAGS@
-H5_CXX_SHARED = @H5_CXX_SHARED@
-H5_FCFLAGS = @H5_FCFLAGS@
-H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@
-H5_LDFLAGS = @H5_LDFLAGS@
-H5_LONE_COLON = @H5_LONE_COLON@
-H5_VERSION = @H5_VERSION@
-HADDR_T = @HADDR_T@
-HAVE_DMALLOC = @HAVE_DMALLOC@
-HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@
-HAVE_PTHREAD = @HAVE_PTHREAD@
-HDF5_HL = @HDF5_HL@
-HDF5_INTERFACES = @HDF5_INTERFACES@
-HDF_CXX = @HDF_CXX@
-HDF_FORTRAN = @HDF_FORTRAN@
-HDF_FORTRAN2003 = @HDF_FORTRAN2003@
-HID_T = @HID_T@
-HL = @HL@
-HL_FOR = @HL_FOR@
-HSIZE_T = @HSIZE_T@
-HSSIZE_T = @HSSIZE_T@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTRUMENT = @INSTRUMENT@
-INSTRUMENT_LIBRARY = @INSTRUMENT_LIBRARY@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LL_PATH = @LL_PATH@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_STATIC_EXEC = @LT_STATIC_EXEC@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MPE = @MPE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJECT_NAMELEN_DEFAULT_F = @OBJECT_NAMELEN_DEFAULT_F@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PARALLEL = @PARALLEL@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-RANLIB = @RANLIB@
-ROOT = @ROOT@
-RUNPARALLEL = @RUNPARALLEL@
-RUNSERIAL = @RUNSERIAL@
-R_INTEGER = @R_INTEGER@
-R_LARGE = @R_LARGE@
-SEARCH = @SEARCH@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SIZE_T = @SIZE_T@
-STATIC_EXEC = @STATIC_EXEC@
-STATIC_SHARED = @STATIC_SHARED@
-STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@
-STRIP = @STRIP@
-TESTPARALLEL = @TESTPARALLEL@
-THREADSAFE = @THREADSAFE@
-TIME = @TIME@
-TR = @TR@
-TRACE_API = @TRACE_API@
-UNAME_INFO = @UNAME_INFO@
-USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
-USE_FILTER_SZIP = @USE_FILTER_SZIP@
-USINGMEMCHECKER = @USINGMEMCHECKER@
-VERSION = @VERSION@
-WORDS_BIGENDIAN = @WORDS_BIGENDIAN@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_FC = @ac_ct_FC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-
-# Install directories that automake doesn't know about
-docdir = $(exec_prefix)/doc
-dvidir = @dvidir@
-enable_shared = @enable_shared@
-enable_static = @enable_static@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-
-# Shell commands used in Makefiles
-RM = rm -f
-CP = cp
-
-# Some machines need a command to run executables; this is that command
-# so that our tests will run.
-# We use RUNEXEC instead of RUNSERIAL directly because it may be that
-# some tests need to be run with a different command.  Older versions
-# of the makefiles used the command
-# $(LIBTOOL) --mode=execute
-# in some directories, for instance.
-RUNEXEC = $(RUNSERIAL)
-
-# Libraries to link to while building
-LIBHDF5 = $(top_builddir)/src/libhdf5.la
-LIBH5TEST = $(top_builddir)/test/libh5test.la
-LIBH5F = $(top_builddir)/fortran/src/libhdf5_fortran.la
-LIBH5FTEST = $(top_builddir)/fortran/test/libh5test_fortran.la
-LIBH5CPP = $(top_builddir)/c++/src/libhdf5_cpp.la
-LIBH5TOOLS = $(top_builddir)/tools/lib/libh5tools.la
-LIBH5_HL = $(top_builddir)/hl/src/libhdf5_hl.la
-LIBH5F_HL = $(top_builddir)/hl/fortran/src/libhdf5hl_fortran.la
-LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
-
-# Note that in svn revision 19400 the '/' after DESTDIR in H5* variables below  
-# has been removed. According to the official description of DESTDIR by Gnu at 
-# http://www.gnu.org/prep/standards/html_node/DESTDIR.html, DESTDIR is 
-# prepended to the normal and complete install path that it precedes for the 
-# purpose of installing in a temporary directory which is useful for building 
-# rpms and other packages.  The '/' after ${DESTDIR} will be followed by another 
-# '/' at the beginning of the normal install path.  When DESTDIR is empty the  
-# path then begins with '//', which is incorrect and causes problems at least for 
-# Cygwin.   
-
-# Scripts used to build examples
-# If only shared libraries have been installed, have h5cc build examples with
-# shared libraries instead of static libraries
-H5CC = ${DESTDIR}$(bindir)/h5cc
-H5CC_PP = ${DESTDIR}$(bindir)/h5pcc
-H5FC = ${DESTDIR}$(bindir)/h5fc
-H5FC_PP = ${DESTDIR}$(bindir)/h5pfc
-H5CPP = ${DESTDIR}$(bindir)/h5c++
-ACLOCAL_AMFLAGS = "-I m4"
-
-# The trace script; this is used on source files from the C library to
-# insert tracing macros.
-TRACE = perl $(top_srcdir)/bin/trace
-
-# .chkexe files are used to mark tests that have run successfully.
-# .chklog files are output from those tests.
-# *.clog and *.clog2 are from the MPE option.
-CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2
-
-# These are our main targets.  They should be listed in the order to be
-# executed, generally most specific tests to least specific tests.
-TEST_PROG = ptableTest
-
-# The tests depend on the hdf5, hdf5 C++, and hdf5_hl libraries
-LDADD = $(LIBH5CPP_HL) $(LIBH5_HL) $(LIBH5CPP) $(LIBHDF5)
-ptableTest_SOURCES = ptableTest.cpp
-
-# Tell conclude.am that these are C++ tests.
-CXX_API = yes
-
-# Automake needs to be taught how to build lib, progs, and tests targets.
-# These will be filled in automatically for the most part (e.g.,
-# lib_LIBRARIES are built for lib target), but EXTRA_LIB, EXTRA_PROG, and
-# EXTRA_TEST variables are supplied to allow the user to force targets to
-# be built at certain times. 
-LIB = $(lib_LIBRARIES) $(lib_LTLIBRARIES) $(noinst_LIBRARIES)                 \
-      $(noinst_LTLIBRARIES) $(check_LIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LIB)
-
-PROGS = $(bin_PROGRAMS) $(bin_SCRIPTS) $(noinst_PROGRAMS) $(noinst_SCRIPTS)   \
-        $(EXTRA_PROG)
-
-chk_TESTS = $(check_PROGRAMS) $(check_SCRIPTS) $(EXTRA_TEST) 
-TEST_EXTENSIONS = .sh
-SH_LOG_COMPILER = $(SHELL)
-AM_SH_LOG_FLAGS = 
-TEST_PROG_CHKEXE = $(TEST_PROG:=.chkexe_)
-TEST_PROG_PARA_CHKEXE = $(TEST_PROG_PARA:=.chkexe_)
-TEST_SCRIPT_CHKSH = $(TEST_SCRIPT:=.chkexe_)
-TEST_SCRIPT_PARA_CHKSH = $(TEST_SCRIPT_PARA:=.chkexe_)
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .cpp .lo .log .o .obj .sh .sh$(EXEEXT) .trs
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign hl/c++/test/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign hl/c++/test/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-$(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am:
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-checkPROGRAMS:
-	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-
-ptableTest$(EXEEXT): $(ptableTest_OBJECTS) $(ptableTest_DEPENDENCIES) $(EXTRA_ptableTest_DEPENDENCIES) 
-	@rm -f ptableTest$(EXEEXT)
-	$(AM_V_CXXLD)$(CXXLINK) $(ptableTest_OBJECTS) $(ptableTest_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptableTest.Po@am__quote@
-
-.cpp.o:
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
-
-.cpp.obj:
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.cpp.lo:
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: ctags-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-# Recover from deleted '.trs' file; this should ensure that
-# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
-# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
-# to avoid problems with "make -n".
-.log.trs:
-	rm -f $< $@
-	$(MAKE) $(AM_MAKEFLAGS) $<
-
-# Leading 'am--fnord' is there to ensure the list of targets does not
-# expand to empty, as could happen e.g. with make check TESTS=''.
-am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
-am--force-recheck:
-	@:
-
-$(TEST_SUITE_LOG): $(TEST_LOGS)
-	@$(am__set_TESTS_bases); \
-	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
-	redo_bases=`for i in $$bases; do \
-	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
-	            done`; \
-	if test -n "$$redo_bases"; then \
-	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
-	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
-	  if $(am__make_dryrun); then :; else \
-	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
-	  fi; \
-	fi; \
-	if test -n "$$am__remaking_logs"; then \
-	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
-	       "recursion detected" >&2; \
-	else \
-	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
-	fi; \
-	if $(am__make_dryrun); then :; else \
-	  st=0;  \
-	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
-	  for i in $$redo_bases; do \
-	    test -f $$i.trs && test -r $$i.trs \
-	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
-	    test -f $$i.log && test -r $$i.log \
-	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
-	  done; \
-	  test $$st -eq 0 || exit 1; \
-	fi
-	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
-	ws='[ 	]'; \
-	results=`for b in $$bases; do echo $$b.trs; done`; \
-	test -n "$$results" || results=/dev/null; \
-	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
-	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
-	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
-	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
-	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
-	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
-	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
-	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
-	  success=true; \
-	else \
-	  success=false; \
-	fi; \
-	br='==================='; br=$$br$$br$$br$$br; \
-	result_count () \
-	{ \
-	    if test x"$$1" = x"--maybe-color"; then \
-	      maybe_colorize=yes; \
-	    elif test x"$$1" = x"--no-color"; then \
-	      maybe_colorize=no; \
-	    else \
-	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
-	    fi; \
-	    shift; \
-	    desc=$$1 count=$$2; \
-	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
-	      color_start=$$3 color_end=$$std; \
-	    else \
-	      color_start= color_end=; \
-	    fi; \
-	    echo "$${color_start}# $$desc $$count$${color_end}"; \
-	}; \
-	create_testsuite_report () \
-	{ \
-	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
-	  result_count $$1 "PASS: " $$pass  "$$grn"; \
-	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
-	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
-	  result_count $$1 "FAIL: " $$fail  "$$red"; \
-	  result_count $$1 "XPASS:" $$xpass "$$red"; \
-	  result_count $$1 "ERROR:" $$error "$$mgn"; \
-	}; \
-	{								\
-	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
-	    $(am__rst_title);						\
-	  create_testsuite_report --no-color;				\
-	  echo;								\
-	  echo ".. contents:: :depth: 2";				\
-	  echo;								\
-	  for b in $$bases; do echo $$b; done				\
-	    | $(am__create_global_log);					\
-	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
-	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
-	if $$success; then						\
-	  col="$$grn";							\
-	 else								\
-	  col="$$red";							\
-	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
-	fi;								\
-	echo "$${col}$$br$${std}"; 					\
-	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
-	echo "$${col}$$br$${std}"; 					\
-	create_testsuite_report --maybe-color;				\
-	echo "$$col$$br$$std";						\
-	if $$success; then :; else					\
-	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
-	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
-	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
-	  fi;								\
-	  echo "$$col$$br$$std";					\
-	fi;								\
-	$$success || exit 1
-recheck: all $(check_PROGRAMS)
-	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-	@set +e; $(am__set_TESTS_bases); \
-	bases=`for i in $$bases; do echo $$i; done \
-	         | $(am__list_recheck_tests)` || exit 1; \
-	log_list=`for i in $$bases; do echo $$i.log; done`; \
-	log_list=`echo $$log_list`; \
-	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
-	        am__force_recheck=am--force-recheck \
-	        TEST_LOGS="$$log_list"; \
-	exit $$?
-ptableTest.log: ptableTest$(EXEEXT)
-	@p='ptableTest$(EXEEXT)'; \
-	b='ptableTest'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-.sh.log:
-	@p='$<'; \
-	$(am__set_b); \
-	$(am__check_pre) $(SH_LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_SH_LOG_DRIVER_FLAGS) $(SH_LOG_DRIVER_FLAGS) -- $(SH_LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-@am__EXEEXT_TRUE@.sh$(EXEEXT).log:
-@am__EXEEXT_TRUE@	@p='$<'; \
-@am__EXEEXT_TRUE@	$(am__set_b); \
-@am__EXEEXT_TRUE@	$(am__check_pre) $(SH_LOG_DRIVER) --test-name "$$f" \
-@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
-@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_SH_LOG_DRIVER_FLAGS) $(SH_LOG_DRIVER_FLAGS) -- $(SH_LOG_COMPILE) \
-@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
-	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
-check: check-am
-all-am: Makefile all-local
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
-	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
-	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-local
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: check-am install-am install-strip
-
-.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-TESTS \
-	check-am clean clean-checkPROGRAMS clean-generic clean-libtool \
-	cscopelist-am ctags ctags-am distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
-	pdf-am ps ps-am recheck tags tags-am uninstall uninstall-am
-
-
-# List all build rules defined by HDF5 Makefiles as "PHONY" targets here.
-# This tells the Makefiles that these targets are not files to be built but
-# commands that should be executed even if a file with the same name already
-# exists.
-.PHONY: build-check-clean build-check-p build-check-s build-lib build-progs \
-        build-tests check-clean check-install check-p check-s check-vfd \
-        install-doc lib progs tests uninstall-doc _exec_check-s _test help
-
-help:
-	@$(top_srcdir)/bin/makehelp
-
-# lib/progs/tests targets recurse into subdirectories. build-* targets
-# build files in this directory.
-build-lib: $(LIB)
-build-progs: $(LIB) $(PROGS)
-build-tests: $(LIB) $(PROGS) $(chk_TESTS)
-
-# General rule for recursive building targets.
-# BUILT_SOURCES contain targets that need to be built before anything else
-# in the directory (e.g., for Fortran type detection)
-lib progs tests check-s check-p :: $(BUILT_SOURCES)
-	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
-	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X && test $$d != .; then                           \
-	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
-	    fi;                                                               \
-	done
-
-# General rule for recursive cleaning targets.  Like the rule above,
-# but doesn't require building BUILT_SOURCES.
-check-clean ::
-	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
-	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X && test $$d != .; then                           \
-	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
-	    fi;                                                               \
-	done
-
-# Tell Automake to build tests when the user types `make all' (this is
-# not its default behavior).  Also build EXTRA_LIB and EXTRA_PROG since
-# Automake won't build them automatically, either.
-all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(chk_TESTS)
-
-# make install-doc doesn't do anything outside of doc directory, but
-# Makefiles should recognize it.
-# UPDATE: docs no longer reside in this build tree, so this target
-# is depreciated.
-install-doc uninstall-doc:
-	@echo "Nothing to be done."
-
-# clean up files generated by tests so they can be re-run.
-build-check-clean:
-	$(RM) -rf $(CHECK_CLEANFILES)
-
-# run check-clean whenever mostlyclean is run
-mostlyclean-local: build-check-clean
-
-# check-install is just a synonym for installcheck
-check-install: installcheck
-
-# Run each test in order, passing $(TEST_FLAGS) to the program.
-# Since tests are done in a shell loop, "make -i" does apply inside it.
-# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
-# The timestamps give a rough idea how much time the tests use.
-#
-# Note that targets in chk_TESTS (defined above) will be built when the user
-# types 'make tests' or 'make check', but only programs in TEST_PROG,
-# TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
-check-TESTS: test
-
-test _test:
-	@$(MAKE) build-check-s
-	@$(MAKE) build-check-p
-
-# Actual execution of check-s.
-build-check-s: $(LIB) $(PROGS) $(chk_TESTS)
-	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
-	   echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
-	fi
-	@$(MAKE) $(AM_MAKEFLAGS) _exec_check-s
-	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
-	    echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
-	fi
-
-_exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH)
-
-# The dummy.chkexe here prevents the target from being
-# empty if there are no tests in the current directory.
-# $${log} is the log file.
-# $${tname} is the name of test.
-$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
-	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \
-	   tname=$(@:.chkexe_=)$(EXEEXT);\
-	   log=$(@:.chkexe_=.chklog); \
-	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \
-	      echo "No need to test $${tname} again."; \
-	   else \
-	      echo "============================" > $${log}; \
-	      if test "X$(FORTRAN_API)" = "Xyes"; then \
-	         echo "Fortran API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "Fortran API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(CXX_API)" = "Xyes"; then \
-	         echo "C++ API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "C++ API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log};\
-	      else \
-	         echo "Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "$(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      fi; \
-	      echo "============================" >> $${log}; \
-	      srcdir="$(srcdir)" \
-	         $(TIME) $(RUNEXEC) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \
-	         && touch $(@:.chkexe_=.chkexe) || \
-	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	         (cat $${log} && false) || exit 1; \
-	      echo "" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
-	      echo "============================" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
-	      cat $${log}; \
-	   fi; \
-	fi
-
-# The dummysh.chkexe here prevents the target from being
-# empty if there are no tests in the current directory.
-# $${log} is the log file.
-# $${tname} is the name of test.
-$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
-	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummysh.chkexe_"; then \
-	   cmd=$(@:.chkexe_=);\
-	   tname=`basename $$cmd`;\
-	   chkname=`basename $(@:.chkexe_=.chkexe)`;\
-	   log=`basename $(@:.chkexe_=.chklog)`; \
-	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer $${chkname} $$cmd $(SCRIPT_DEPEND); then \
-	      echo "No need to test $${tname} again."; \
-	   else \
-	      echo "============================" > $${log}; \
-	      if test "X$(FORTRAN_API)" = "Xyes"; then \
-	         echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(CXX_API)" = "Xyes"; then \
-	         echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      else \
-	         echo "Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      fi; \
-	      echo "============================" >> $${log}; \
-	      RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
-	      srcdir="$(srcdir)" \
-	         $(TIME) $(SHELL) $$cmd $(TEST_FLAGS) >> $${log} 2>&1 \
-	         && touch $${chkname} || \
-	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	         (cat $${log} && false) || exit 1; \
-	      echo "" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
-	      echo "============================" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
-	      cat $${log}; \
-	   fi; \
-	   echo "============================"; \
-	fi
-
-# Actual execution of check-p.
-build-check-p: $(LIB) $(PROGS) $(chk_TESTS)
-	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
-	   echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
-	fi
-	@if test -n "$(TEST_PROG_PARA)"; then                                \
-	    echo "**** Hint ****";                                            \
-	    echo "Parallel test files reside in the current directory"        \
-	         "by default.";                                               \
-	    echo "Set HDF5_PARAPREFIX to use another directory. E.g.,";       \
-	    echo "    HDF5_PARAPREFIX=/PFS/user/me";                          \
-	    echo "    export HDF5_PARAPREFIX";                                \
-	    echo "    make check";                                            \
-	    echo "**** end of Hint ****";                                     \
-	fi
-	@for test in $(TEST_PROG_PARA) dummy; do                             \
-	   if test $$test != dummy; then                                      \
-	      $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ \
-	      RUNEXEC="$(RUNPARALLEL)" || exit 1; \
-	   fi;                                                                \
-	done
-	@for test in $(TEST_SCRIPT_PARA) dummy; do                           \
-	  if test $$test != dummy; then                                      \
-	    $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ || exit 1; \
-	  fi;                                                                 \
-	done
-	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
-	    echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
-	fi
-
-# Run test with different Virtual File Driver
-check-vfd: $(LIB) $(PROGS) $(chk_TESTS)
-	@for vfd in $(VFD_LIST) dummy; do                                     \
-	    if test $$vfd != dummy; then                                      \
-	        echo "============================";                          \
-	        echo "Testing Virtual File Driver $$vfd";                     \
-	        echo "============================";                          \
-	        $(MAKE) $(AM_MAKEFLAGS) check-clean || exit 1;                \
-	        HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check || exit 1;    \
-	    fi;                                                               \
-	done
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/hl/c++/test/ptableTest.cpp b/hl/c++/test/ptableTest.cpp
index 929058d..1807be6 100644
--- a/hl/c++/test/ptableTest.cpp
+++ b/hl/c++/test/ptableTest.cpp
@@ -1,63 +1,60 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /* ptableTest.cpp */
 
+#include <iostream>
 #include "ptableTest.h"
 
 using namespace H5;
+using namespace std;
 
 #define TEST_FILE "packettest.h5"
 
 /* Main test function */
-int main(void)
+int
+main(void)
 {
     herr_t err;
     herr_t num_errors = 0;
 
     /* Create new HDF5 file */
     fileID = H5Fcreate(TEST_FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    if(fileID <0)
-    {
+    if (fileID < 0) {
         fprintf(stderr, "Couldn't create file.\n");
         num_errors = 1;
     }
     else {
 
-            num_errors += BasicTest();
+        num_errors += BasicTest();
 
-            num_errors += TestCompoundDatatype();
+        num_errors += TestCompoundDatatype();
 
-            num_errors += TestGetPacket();
+        num_errors += TestGetPacket();
 
-            num_errors += TestGetNext();
+        num_errors += TestGetNext();
 
-            num_errors += TestCompress();
+        num_errors += TestCompress();
 
-            num_errors += TestErrors();
+        num_errors += TestErrors();
 
-            num_errors += SystemTest();
+        num_errors += SystemTest();
 
-#ifdef VLPT_REMOVED
-            num_errors += VariableLengthTest();
-#endif /* VLPT_REMOVED */
+        /* Test data corruption in packed structs */
+        num_errors += TestHDFFV_9758();
 
         /* Terminate access to the file. */
         err = H5Fclose(fileID);
-        if( err < 0 )
-        {
+        if (err < 0) {
             fprintf(stderr, "Failed to close file.\n");
             num_errors++;
         }
@@ -67,38 +64,40 @@ int main(void)
     }
 
     if (num_errors == 0)
-      /* ALL TESTS PASSED */
-      return 0;
+        /* ALL TESTS PASSED */
+        return 0;
     else
-      /* ERRORS */
-      return -1;
+        /* ERRORS */
+        return -1;
 }
 
-
-int BasicTest()
+const char *BASICTEST_PT("/basicTest");
+int
+BasicTest()
 {
-    herr_t err;
-    int myRecord;
+    herr_t  err;
+    int     myRecord;
     hsize_t count;
-    int error;
+    int     error;
 
-    TESTING("basic funtionality")
+    printf("Testing %-62s", "basic functionality");
+    HDfflush(stdout);
 
-    FL_PacketTable wrapper(fileID, "/basicTest", H5T_NATIVE_INT, 1);
-    if(! wrapper.IsValid())
-      goto out;
+    FL_PacketTable wrapper(fileID, H5P_DEFAULT, BASICTEST_PT, H5T_NATIVE_INT, 1);
+    if (!wrapper.IsValid())
+        goto error;
 
     /* Ensure initial count is zero */
     count = wrapper.GetPacketCount(error);
-    if(count != 0 || error != 0)
-      goto out;
+    if (count != 0 || error != 0)
+        goto error;
 
     myRecord = 1;
 
     /* add some records test */
     err = wrapper.AppendPacket(&myRecord);
-    if(err < 0)
-        goto out;
+    if (err < 0)
+        goto error;
 
     myRecord = 2;
 
@@ -106,172 +105,191 @@ int BasicTest()
 
     /* get number of records test */
     count = wrapper.GetPacketCount();
-    if(count != 2)
-      goto out;
+    if (count != 2)
+        goto error;
 
     /* get records test */
     err = wrapper.GetPacket(0, &myRecord);
-    if(err < 0)
-      goto out;
+    if (err < 0)
+        goto error;
 
-    if(myRecord != 1)
-      goto out;
+    if (myRecord != 1)
+        goto error;
 
     err = wrapper.GetPacket(1, &myRecord);
-    if(err < 0)
-      goto out;
-    if(myRecord != 2)
-      goto out;
+    if (err < 0)
+        goto error;
+    if (myRecord != 2)
+        goto error;
 
     PASSED();
     return 0;
 
-out:
+error:
     H5_FAILED();
     return 1;
 }
 
-int TestCompoundDatatype()
+const char *CMPDTEST_PT("/compoundTest");
+int
+TestCompoundDatatype()
 {
-    hid_t dtypeID;
+    hid_t   dtypeID;
     hsize_t count;
-    int error;
+    int     error;
 
-    TESTING("compound datatypes")
+    printf("Testing %-62s", "compound datatypes");
+    HDfflush(stdout);
 
     /* Create compound datatype */
-    typedef struct compoundType
-    {
+    typedef struct {
         short a, b, c;
-        int e;
+        int   e;
     } compoundType;
 
-    dtypeID = H5Tcreate( H5T_COMPOUND, sizeof(compoundType));
+    dtypeID = H5Tcreate(H5T_COMPOUND, sizeof(compoundType));
 
-    H5Tinsert(dtypeID, "abbey", HOFFSET( compoundType, a ), H5T_NATIVE_SHORT);
-    H5Tinsert(dtypeID, "bert", HOFFSET( compoundType, b ), H5T_NATIVE_SHORT);
-    H5Tinsert(dtypeID, "charlie", HOFFSET( compoundType, c ), H5T_NATIVE_SHORT);
-    H5Tinsert(dtypeID, "ebert", HOFFSET( compoundType, e ), H5T_NATIVE_INT);
+    H5Tinsert(dtypeID, "abbey", HOFFSET(compoundType, a), H5T_NATIVE_SHORT);
+    H5Tinsert(dtypeID, "bert", HOFFSET(compoundType, b), H5T_NATIVE_SHORT);
+    H5Tinsert(dtypeID, "charlie", HOFFSET(compoundType, c), H5T_NATIVE_SHORT);
+    H5Tinsert(dtypeID, "ebert", HOFFSET(compoundType, e), H5T_NATIVE_INT);
 
-    /* Create packet table.  Explicitly specify no compression */
-    FL_PacketTable wrapper(fileID, "/compoundTest", dtypeID, 1, -1);
+    /* Create packet table using default property list. */
+    FL_PacketTable wrapper(fileID, H5P_DEFAULT, CMPDTEST_PT, dtypeID, 1);
 
-    if(! wrapper.IsValid())
-      goto out;
+    if (!wrapper.IsValid())
+        goto error;
 
     compoundType first;
     first.a = 1;
     first.b = first.c = 3;
-    first.e = 5;
+    first.e           = 5;
 
     /* Write packet */
     wrapper.AppendPacket(&first);
 
     count = wrapper.GetPacketCount(error);
-    if(count != 1)
-      goto out;
+    if (count != 1)
+        goto error;
 
     first.a = first.b = first.c = 0;
-    first.e = 0;
+    first.e                     = 0;
 
     /* Read packet back */
     wrapper.GetPacket(0, &first);
 
-    if(first.a != 1)
-      goto out;
-    if(first.e != 5)
-      goto out;
+    if (first.a != 1)
+        goto error;
+    if (first.e != 5)
+        goto error;
 
     PASSED();
 
     H5Tclose(dtypeID);
     return 0;
 
-out:
+error:
 
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         H5Tclose(dtypeID);
-    } H5E_END_TRY;
-
+    }
+    H5E_END_TRY;
 
     H5_FAILED();
     return 1;
 }
 
-int TestGetNext()
+const char *GETNEXT_PT("/TestGetNext");
+int
+TestGetNext()
 {
     int error;
     int record;
     int records[2];
     int i;
 
-    TESTING("GetNextPacket")
+    printf("Testing %-62s", "GetNextPacket");
+    HDfflush(stdout);
 
     /* Create a dataset */
-    FL_PacketTable wrapper(fileID, "/TestGetNext", H5T_NATIVE_INT, 500);
+    FL_PacketTable wrapper(fileID, H5P_DEFAULT, GETNEXT_PT, H5T_NATIVE_INT, 500);
 
-    if(! wrapper.IsValid())
-      goto out;
+    if (!wrapper.IsValid())
+        goto error;
 
     /* Append 5 records to the dataset */
-    for(record = 1; record < 6; record++)
+    for (record = 1; record < 6; record++)
         wrapper.AppendPacket(&record);
 
-    /* Ensure that we can interate through the records and get the right ones */
-    for(i = 1; i < 6; i++)
-    {
+    /* Ensure that we can iterate through the records and get the right ones */
+    for (i = 1; i < 6; i++) {
         wrapper.GetNextPacket(&record);
-        if(record != i)
-          goto out;
+        if (record != i)
+            goto error;
     }
 
     /* Reset the index and check that it worked */
     wrapper.ResetIndex();
-    if(wrapper.GetIndex(error) != 0) goto out;
-    if(error < 0) goto out;
+    if (wrapper.GetIndex(error) != 0)
+        goto error;
+    if (error < 0)
+        goto error;
 
-    /* Ensure that we can interate through the records and get the right ones */
-    for(i = 1; i < 6; i++)
-    {
+    /* Ensure that we can iterate through the records and get the right ones */
+    for (i = 1; i < 6; i++) {
         error = wrapper.GetNextPacket(&record);
-        if(record != i || error <0)
-          goto out;
+        if (record != i || error < 0)
+            goto error;
     }
 
     wrapper.SetIndex(1);
-    if(wrapper.GetIndex(error) != 1) goto out;
-    if(error < 0) goto out;
+    if (wrapper.GetIndex(error) != 1)
+        goto error;
+    if (error < 0)
+        goto error;
 
     /* Ensure we can get multiple records with our index pointer */
     wrapper.GetNextPackets(2, records);
-    if(records[0] != 2 || records[1] != 3)
-      goto out;
+    if (records[0] != 2 || records[1] != 3)
+        goto error;
 
     /* Ensure our pointer was updated correctly */
     wrapper.GetNextPacket(&record);
-    if(record != 4)
-      goto out;
+    if (record != 4)
+        goto error;
 
     PASSED();
     return 0;
 
-out:
+error:
     H5_FAILED();
     return 1;
 }
 
-int TestCompress()
+const char *COMPRESS_PT("/compressTest");
+int
+TestCompress()
 {
-
-	unsigned int flags = 0;
-    unsigned int config = 0;
-    size_t cd_nelemts = 0;
-
-    TESTING("compression")
 #ifdef H5_HAVE_FILTER_DEFLATE
+    unsigned int flags      = 0;
+    unsigned int config     = 0;
+    size_t       cd_nelemts = 0;
+
+    printf("Testing %-62s", "compression");
+    HDfflush(stdout);
     try {
+        /* Prepare property list to set compression, randomly use deflate */
+        DSetCreatPropList dscreatplist;
+        dscreatplist.setDeflate(6);
+
         /* Create packet table with compression. */
-        FL_PacketTable wrapper(fileID, "/compressTest", H5T_NATIVE_CHAR, 100, 8);
+        FL_PacketTable wrapper(fileID, COMPRESS_PT, H5T_NATIVE_CHAR, 100, dscreatplist.getId());
+
+        /* Close the property list */
+        dscreatplist.close();
+
+        /* Verify that the deflate filter is set */
 
         /* Create an HDF5 C++ file object */
         H5File file;
@@ -279,226 +297,245 @@ int TestCompress()
 
         /* Make sure that the deflate filter is set by opening the packet table
          * as a dataset and getting its creation property list */
-        DataSet dsetID = file.openDataSet("/compressTest");
+        DataSet dset = file.openDataSet(COMPRESS_PT);
 
-        DSetCreatPropList dcplID = dsetID.getCreatePlist();
+        DSetCreatPropList dcpl = dset.getCreatePlist();
 
-        dcplID.getFilterById(H5Z_FILTER_DEFLATE, flags, cd_nelemts, NULL, 0, NULL, config);
-    } catch (Exception e) {
-      H5_FAILED();
-      return 1;
+        char filter_name[8];
+        dcpl.getFilterById(H5Z_FILTER_DEFLATE, flags, cd_nelemts, NULL, 8, filter_name, config);
+        if (HDstrncmp(filter_name, "deflate", 7) != 0)
+            H5_FAILED();
+    }
+    catch (Exception const &) {
+        H5_FAILED();
+        return 1;
     }
     PASSED();
 #else
     SKIPPED();
-    puts("    deflate filter not enabled");
+    HDputs("    deflate filter not enabled");
 #endif /* H5_HAVE_FILTER_DEFLATE */
     return 0;
 }
 
-int TestGetPacket()
+const char *PT_TESTGETPT = "/TestGetPacket";
+int
+TestGetPacket()
 {
     int record;
     int theRecs[3];
     int i;
-    TESTING("GetPacket")
+    printf("Testing %-62s", "GetPacket");
+    HDfflush(stdout);
 
-    /* Create a dataset.  Explicitly specify no compression */
-    FL_PacketTable wrapper(fileID, "/TestGetPacket", H5T_NATIVE_INT, 1, -1);
+    /* Create a dataset.  Does not need to specify property list because
+       there is no compression. */
+    FL_PacketTable wrapper(fileID, PT_TESTGETPT, H5T_NATIVE_INT, 1);
 
-    if(! wrapper.IsValid())
-      goto out;
+    if (!wrapper.IsValid())
+        goto error;
 
     /* Append 5 records to the dataset */
-    for(record = 1; record < 6; record++)
+    for (record = 1; record < 6; record++)
         wrapper.AppendPacket(&record);
 
     /* Ensure that the records were written properly */
     wrapper.GetPacket(1, &record);
-    if(record != 2)
-      goto out;
+    if (record != 2)
+        goto error;
 
     /* Ensure that we can retrieve multiple records */
     wrapper.GetPackets(1, 3, theRecs);
-    for(i = 0; i < 3; i++)
-    {
-        if(theRecs[i] != i+2)
-          goto out;
+    for (i = 0; i < 3; i++) {
+        if (theRecs[i] != i + 2)
+            goto error;
     }
 
     PASSED();
     return 0;
 
-out:
+error:
     H5_FAILED();
     return 1;
 }
 
-int TestErrors()
+const char *PT_TESTERROR = "/TestErrors";
+
+int
+TestErrors()
 {
-    TESTING("error conditions")
+    printf("Testing %-62s", "error conditions");
+    HDfflush(stdout);
 
     /* Create a dataset */
-    FL_PacketTable wrapper(fileID, "/TestErrors", H5T_NATIVE_INT, 1);
+    FL_PacketTable wrapper(fileID, PT_TESTERROR, H5T_NATIVE_INT, 1);
 
-    if(! wrapper.IsValid())
-      goto out;
+    if (!wrapper.IsValid())
+        goto error;
 
     int record;
     int records[3];
     int error;
 
     /* Append 4 records to the dataset */
-    for(record = 1; record < 5; record++)
+    for (record = 1; record < 5; record++)
         wrapper.AppendPacket(&record);
 
     /* Try to confuse functions with bad indexes */
-    error = wrapper.GetPacket( (unsigned) -1, &record);
-    if(error >= 0)
-      goto out;
+    error = wrapper.GetPacket(static_cast<unsigned>(-1), &record);
+    if (error >= 0)
+        goto error;
     error = wrapper.GetPacket(4, &record);
-    if(error >= 0)
-      goto out;
-    error = wrapper.GetPacket((unsigned) -250, &record);
-    if(error >= 0)
-      goto out;
+    if (error >= 0)
+        goto error;
+    error = wrapper.GetPacket(static_cast<unsigned>(-250), &record);
+    if (error >= 0)
+        goto error;
     error = wrapper.GetPacket(3000, &record);
-    if(error >= 0)
-      goto out;
+    if (error >= 0)
+        goto error;
     error = wrapper.GetPacket(1, &record);
-    if(error < 0)
-      goto out;
+    if (error < 0)
+        goto error;
 
-    error = wrapper.GetPackets((unsigned) -1, 1, records);
-    if(error >= 0)
-      goto out;
+    error = wrapper.GetPackets(static_cast<unsigned>(-1), 1, records);
+    if (error >= 0)
+        goto error;
     error = wrapper.GetPackets(2, 4, records);
-    if(error >= 0)
-      goto out;
-    error = wrapper.GetPackets((unsigned) -60, (unsigned) -62, records);
-     if(error >= 0)
-      goto out;
+    if (error >= 0)
+        goto error;
+    error = wrapper.GetPackets(static_cast<unsigned>(-60), static_cast<unsigned>(-62), records);
+    if (error >= 0)
+        goto error;
     error = wrapper.GetPackets(10, 12, records);
-    if(error >= 0)
-      goto out;
+    if (error >= 0)
+        goto error;
     error = wrapper.GetPackets(0, 2, records);
-    if(error < 0)
-      goto out;
+    if (error < 0)
+        goto error;
     error = wrapper.GetPackets(2, 0, records);
-    if(error >= 0)
-      goto out;
+    if (error >= 0)
+        goto error;
     error = wrapper.GetPackets(1, 1, records);
-    if(error < 0)
-      goto out;
+    if (error < 0)
+        goto error;
     error = wrapper.GetPackets(1, 3, records);
-    if(error < 0)
-      goto out;
+    if (error < 0)
+        goto error;
 
     wrapper.ResetIndex();
-    error = wrapper.SetIndex((unsigned) -1);
-    if(error >= 0)
-      goto out;
-    if(wrapper.GetIndex(error) != 0) goto out;
-    if(error < 0) goto out;
+    error = wrapper.SetIndex(static_cast<unsigned>(-1));
+    if (error >= 0)
+        goto error;
+    if (wrapper.GetIndex(error) != 0)
+        goto error;
+    if (error < 0)
+        goto error;
     error = wrapper.GetNextPacket(&record);
-    if(error < 0)
-      goto out;
-    if(record != 1)
-      goto out;
-    if(wrapper.GetIndex(error) != 1) goto out;
-    if(error < 0) goto out;
+    if (error < 0)
+        goto error;
+    if (record != 1)
+        goto error;
+    if (wrapper.GetIndex(error) != 1)
+        goto error;
+    if (error < 0)
+        goto error;
     error = wrapper.SetIndex(20);
-    if(error >= 0)
-      goto out;
+    if (error >= 0)
+        goto error;
     error = wrapper.GetNextPacket(&record);
-    if(error < 0)
-      goto out;
-    if(record != 2)
-      goto out;
+    if (error < 0)
+        goto error;
+    if (record != 2)
+        goto error;
     wrapper.SetIndex(3);
     error = wrapper.GetNextPacket(&record);
-    if(error < 0)
-      goto out;
-    if(record != 4)
-      goto out;
-    if(wrapper.GetIndex(error) != 4) goto out;
-    if(error < 0) goto out;
+    if (error < 0)
+        goto error;
+    if (record != 4)
+        goto error;
+    if (wrapper.GetIndex(error) != 4)
+        goto error;
+    if (error < 0)
+        goto error;
     error = wrapper.GetNextPacket(&record);
-    if(error >= 0)
-      goto out;
+    if (error >= 0)
+        goto error;
 
     wrapper.ResetIndex();
     error = wrapper.GetNextPackets(10, records);
-    if(error >= 0)
-      goto out;
+    if (error >= 0)
+        goto error;
     error = wrapper.GetNextPackets(0, records);
-    if(error < 0)
-      goto out;
+    if (error < 0)
+        goto error;
 
     PASSED();
     return 0;
 
-out:
+error:
     H5_FAILED();
     return 1;
 }
 
-int SystemTest()
+const char *PT_SYSTEMTST1 = "/SystemTest1";
+const char *PT_SYSTEMTST2 = "/SystemTest2";
+int
+SystemTest()
 {
-    TESTING("multiple datatypes")
+    printf("Testing %-62s", "multiple datatypes");
+    HDfflush(stdout);
 
-    hid_t dtypeID1, dtypeID2;
+    hid_t   dtypeID1, dtypeID2;
     hsize_t count;
-    int error;
+    int     error;
 
     /* Creating two inter-related datatypes.  Create two datasets and put
      * one datatype in each. */
-    typedef struct compoundType
-    {
+    typedef struct {
         short a, b, c;
-        int e;
+        int   e;
     } compoundType;
 
-    dtypeID1 = H5Tcreate( H5T_COMPOUND, sizeof(compoundType));
+    dtypeID1 = H5Tcreate(H5T_COMPOUND, sizeof(compoundType));
 
-    H5Tinsert(dtypeID1, "abbey", HOFFSET( compoundType, a ), H5T_NATIVE_SHORT);
-    H5Tinsert(dtypeID1, "bert", HOFFSET( compoundType, b ), H5T_NATIVE_SHORT);
-    H5Tinsert(dtypeID1, "charlie", HOFFSET( compoundType, c ), H5T_NATIVE_SHORT);
-    H5Tinsert(dtypeID1, "ebert", HOFFSET( compoundType, e ), H5T_NATIVE_INT);
+    H5Tinsert(dtypeID1, "abbey", HOFFSET(compoundType, a), H5T_NATIVE_SHORT);
+    H5Tinsert(dtypeID1, "bert", HOFFSET(compoundType, b), H5T_NATIVE_SHORT);
+    H5Tinsert(dtypeID1, "charlie", HOFFSET(compoundType, c), H5T_NATIVE_SHORT);
+    H5Tinsert(dtypeID1, "ebert", HOFFSET(compoundType, e), H5T_NATIVE_INT);
 
-    typedef struct cType2
-    {
-        char f;
+    typedef struct {
+        char         f;
         compoundType g;
     } cType2;
 
-    dtypeID2 = H5Tcreate ( H5T_COMPOUND, sizeof(cType2));
+    dtypeID2 = H5Tcreate(H5T_COMPOUND, sizeof(cType2));
 
-    H5Tinsert(dtypeID2, "f", HOFFSET( cType2, f ), H5T_NATIVE_CHAR);
-    H5Tinsert(dtypeID2, "g", HOFFSET( cType2, g ), dtypeID1);
+    H5Tinsert(dtypeID2, "f", HOFFSET(cType2, f), H5T_NATIVE_CHAR);
+    H5Tinsert(dtypeID2, "g", HOFFSET(cType2, g), dtypeID1);
 
     cType2 ct2[10];
-    ct2[0].f = 'h';
+    ct2[0].f   = 'h';
     ct2[0].g.a = 9;
     ct2[0].g.b = -13;
     ct2[0].g.c = 0;
     ct2[0].g.e = 3000;
 
-    /* Create the packet table datasets.  Make one of them compressed. */
-    FL_PacketTable wrapper1(fileID, "/SystemTest1", dtypeID1, 1);
-    FL_PacketTable wrapper2(fileID, "/SystemTest2", dtypeID2, 1, 5);
+    /* Create the packet table datasets.  One used a deprecated constructor */
+    FL_PacketTable wrapper1(fileID, PT_SYSTEMTST1, dtypeID1, 1);
+    FL_PacketTable wrapper2(fileID, H5P_DEFAULT, PT_SYSTEMTST2, dtypeID2, 1);
 
-    if(! wrapper1.IsValid())
-      goto out;
-    if(! wrapper2.IsValid())
-      goto out;
+    if (!wrapper1.IsValid())
+        goto error;
+    if (!wrapper2.IsValid())
+        goto error;
 
     /* Write and read packets, ensure that nothing is unusual */
     wrapper2.AppendPacket(ct2);
 
     count = wrapper1.GetPacketCount();
-    if(count != 0)
-      goto out;
+    if (count != 0)
+        goto error;
 
     compoundType ct1[10];
     ct1[0].a = 31;
@@ -515,13 +552,17 @@ int SystemTest()
     wrapper1.ResetIndex();
     wrapper1.GetNextPacket(&ct1[1]);
     wrapper2.GetPacket(1, &ct2[2]);
-    if(wrapper1.GetIndex(error) != 1) goto out;
-    if(error < 0) goto out;
-    if(wrapper2.GetIndex(error) != 0) goto out;
-    if(error < 0) goto out;
-
-    if(ct1[1].b != ct2[2].g.b)
-      goto out;
+    if (wrapper1.GetIndex(error) != 1)
+        goto error;
+    if (error < 0)
+        goto error;
+    if (wrapper2.GetIndex(error) != 0)
+        goto error;
+    if (error < 0)
+        goto error;
+
+    if (ct1[1].b != ct2[2].g.b)
+        goto error;
 
     H5Tclose(dtypeID1);
     H5Tclose(dtypeID2);
@@ -529,84 +570,146 @@ int SystemTest()
     PASSED();
     return 0;
 
-out:
-
-    H5E_BEGIN_TRY {
+error:
+    H5E_BEGIN_TRY
+    {
         H5Tclose(dtypeID1);
         H5Tclose(dtypeID2);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
 
     H5_FAILED();
     return 1;
 }
 
-#ifdef VLPT_REMOVED
-int VariableLengthTest(void)
+/*-------------------------------------------------------------------------
+ * TestHDFFV_9758(): Test that a packet table with compound datatype which
+ *    contains string type can be created and written correctly. (HDFFV-9758)
+ *
+ * Notes:
+ *    Previously, data of the field that follows the string was read back
+ *    as garbage when #pragma pack(1) is used.
+ * 2016/10/20 -BMR
+ *      Updated:
+ *        #pragma pack(1) caused failure on Emu because Sparc cannot
+ *        access misaligned data.  Changed it to pack() to do the
+ *        default alignment.
+ * 2016/10/25 -BMR
+ *-------------------------------------------------------------------------
+ */
+#pragma pack() // default alignment
+const char   *ABHI_PT("/abhiTest");
+const hsize_t NUM_PACKETS   = 5;
+const int     STRING_LENGTH = 19; // including terminating NULL
+int
+TestHDFFV_9758()
 {
-    long test_long;
-    short test_short;
-    hvl_t read_buf;
-    VL_PacketTable* test_VLPT;
-    PacketTable* new_pt;
-
-    TESTING("variable-length packet tables")
-
-    /* Create a variable length table */
-    test_VLPT = new VL_PacketTable(fileID, "/VariableLengthTest", 1);
-
-    /* Verify that the creation succeeded */
-    if(! test_VLPT->IsValid())
-      goto out;
-
-    /* Append some packets */
-    test_short = 9;
-    test_VLPT->AppendPacket(&test_short, sizeof(short));
-    test_long = 16;
-    test_VLPT->AppendPacket(&test_long, sizeof(long));
-
-    /* Read them back and make sure they are correct */
-    test_VLPT->GetNextPackets(1, &read_buf);
-
-    if(read_buf.len != sizeof(short))
-      goto out;
-    if(*(short *)(read_buf.p) != test_short)
-      goto out;
-
-    /* Free the memory used by the read */
-    test_VLPT->FreeReadbuff(1, &read_buf);
-
-    /* Read the second record */
-    test_VLPT->GetNextPackets(1, &read_buf);
-
-    if(read_buf.len != sizeof(long))
-      goto out;
-    if(*(long *)(read_buf.p) != test_long)
-      goto out;
-
-    /* Free the memory used by the read */
-    test_VLPT->FreeReadbuff(1, &read_buf);
-
-    /* Close the packet table */
-    delete test_VLPT;
+    hid_t  strtype       = H5I_INVALID_HID;
+    hid_t  compound_type = H5I_INVALID_HID;
+    herr_t err;
+    struct s1_t {
+        int    a;
+        float  b;
+        double c;
+        char   d[STRING_LENGTH]; // null terminated string
+        int    e;
+    };
+
+    s1_t s1[NUM_PACKETS];
+
+    for (hsize_t i = 0; i < NUM_PACKETS; i++) {
+        s1[i].a = static_cast<int>(i);
+        s1[i].b = 1.0F * static_cast<float>(i * i);
+        s1[i].c = 1.0 / static_cast<double>(i + 1);
+        HDsnprintf(s1[i].d, STRING_LENGTH, "string%" PRIuHSIZE "", i);
+        s1[i].e = static_cast<int>(100 + i);
+    }
 
-    /* Reopen the packet table and verify that it is variable length */
-    new_pt = new PacketTable(fileID, "/VariableLengthTest");
+    printf("Testing %-62s", "data corruption in packed structs (HDFFV-9758)");
+    HDfflush(stdout);
+
+    // Build a compound datatype
+    compound_type = H5Tcreate(H5T_COMPOUND, sizeof(s1_t));
+    if (compound_type < 0)
+        goto error;
+
+    err = H5Tinsert(compound_type, "a_name", HOFFSET(s1_t, a), H5T_NATIVE_INT);
+    if (err < 0)
+        goto error;
+    err = H5Tinsert(compound_type, "b_name", HOFFSET(s1_t, b), H5T_NATIVE_FLOAT);
+    if (err < 0)
+        goto error;
+    err = H5Tinsert(compound_type, "c_name", HOFFSET(s1_t, c), H5T_NATIVE_DOUBLE);
+    if (err < 0)
+        goto error;
+
+    strtype = H5Tcopy(H5T_C_S1);
+    if (compound_type < 0)
+        goto error;
+    err = H5Tset_size(strtype, STRING_LENGTH); /* create string */
+    if (err < 0)
+        goto error;
+    err = H5Tinsert(compound_type, "d_name", HOFFSET(s1_t, d), strtype);
+    if (err < 0)
+        goto error;
+    err = H5Tinsert(compound_type, "e_name", HOFFSET(s1_t, e), H5T_NATIVE_INT);
+    if (err < 0)
+        goto error;
+
+    { // so ptable will go out of scope before PASSED
+
+        // Create a packet table
+        FL_PacketTable ptable(fileID, "/examplePacketTable", compound_type, 1);
+        if (!ptable.IsValid())
+            goto error;
+
+        // Add packets to the table
+        for (size_t i = 0; i < NUM_PACKETS; i++) {
+            /* Appends one packet at the current position */
+            err = ptable.AppendPacket(s1 + i);
+            if (err < 0)
+                goto error;
+        }
 
-    /* Verify that the open succeeded */
-    if(! new_pt->IsValid())
-      goto out;
+        // Check packet count
+        const hsize_t count = ptable.GetPacketCount(err);
+        if (err < 0)
+            goto error;
 
-    if(new_pt->IsVariableLength() != 1)
-      goto out;
+        if (count != NUM_PACKETS) {
+            std::cerr << "Number of packets in packet table should be " << NUM_PACKETS << " but is " << count
+                      << endl;
+        }
 
-    /* Close the packet table */
-    delete new_pt;
+        // Read and verify the data
+        ptable.ResetIndex();
+        for (size_t i = 0; i < NUM_PACKETS; i++) {
+            s1_t s2;
+            HDmemset(&s2, 0, sizeof(s1_t));
+            err = ptable.GetNextPacket(&s2);
+            if (err < 0)
+                goto error;
+
+            if (s2.a != s1[i].a || s2.e != s1[i].e)
+                goto error;
+            else if (HDstrcmp(s2.d, s1[i].d) != 0)
+                goto error;
+        }
+    } // end of ptable block
 
     PASSED();
     return 0;
 
-out:
+error:
+
+    H5E_BEGIN_TRY
+    {
+        H5Tclose(strtype);
+        H5Tclose(compound_type);
+        H5Fclose(fileID);
+    }
+    H5E_END_TRY;
+
     H5_FAILED();
     return 1;
 }
-#endif /* VLPT_REMOVED */
diff --git a/hl/c++/test/ptableTest.h b/hl/c++/test/ptableTest.h
index d351e34..7c5ac35 100644
--- a/hl/c++/test/ptableTest.h
+++ b/hl/c++/test/ptableTest.h
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /* Test header for Packet Table C++ wrapper API */
@@ -23,9 +20,9 @@
 #ifndef PTABLETEST
 #define PTABLETEST
 
+#include "h5hltest.h"
 #include "H5PacketTable.h"
 #include "H5Cpp.h"
-#include "h5hltest.h"
 
 static hid_t fileID;
 
@@ -52,7 +49,8 @@ int TestGetPacket(void);
    Test for unusual interactions between multiple packet tables. */
 int SystemTest(void);
 
-/* Test the variable length dataset functionality */
-int VariableLengthTest(void);
+/* Create a packet table with compound type, which has a string type.  Verify
+   that data was written and read correctly. */
+int TestHDFFV_9758(void);
 
 #endif /* PTABLETEST */
diff --git a/hl/examples/CMakeLists.txt b/hl/examples/CMakeLists.txt
index e264f75..c58d4dd 100644
--- a/hl/examples/CMakeLists.txt
+++ b/hl/examples/CMakeLists.txt
@@ -1,5 +1,5 @@
-cmake_minimum_required (VERSION 3.1.0)
-PROJECT (HDF5_HL_EXAMPLES )
+cmake_minimum_required (VERSION 3.18)
+project (HDF5_HL_EXAMPLES C)
 
 #-----------------------------------------------------------------------------
 # Define Sources
@@ -28,14 +28,24 @@ set (examples
 
 foreach (example ${examples})
   add_executable (hl_ex_${example} ${HDF5_HL_EXAMPLES_SOURCE_DIR}/${example}.c)
-  TARGET_NAMING (hl_ex_${example} ${LIB_TYPE})
-  TARGET_C_PROPERTIES (hl_ex_${example} ${LIB_TYPE} " " " ")
-  target_link_libraries (hl_ex_${example} ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET})
+  target_include_directories (hl_ex_${example} PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  if (NOT BUILD_SHARED_LIBS)
+    TARGET_C_PROPERTIES (hl_ex_${example} STATIC)
+    target_link_libraries (hl_ex_${example} PRIVATE ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET})
+  else ()
+    TARGET_C_PROPERTIES (hl_ex_${example} SHARED)
+    target_link_libraries (hl_ex_${example} PRIVATE ${HDF5_HL_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
+  endif ()
   set_target_properties (hl_ex_${example} PROPERTIES FOLDER examples/hl)
-endforeach (example ${examples})
 
-if (BUILD_TESTING)
+  #-----------------------------------------------------------------------------
+  # Add Target to clang-format
+  #-----------------------------------------------------------------------------
+  if (HDF5_ENABLE_FORMATTERS)
+    clang_format (HDF5_HL_EXAMPLES_${example}_FORMAT hl_ex_${example})
+  endif ()
+endforeach ()
 
+if (BUILD_TESTING AND HDF5_TEST_EXAMPLES AND HDF5_TEST_SERIAL)
   include (CMakeTests.cmake)
-
-endif (BUILD_TESTING)
+endif ()
diff --git a/hl/examples/CMakeTests.cmake b/hl/examples/CMakeTests.cmake
index 8cf74d9..6a0a6e7 100644
--- a/hl/examples/CMakeTests.cmake
+++ b/hl/examples/CMakeTests.cmake
@@ -1,3 +1,14 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
 
 ##############################################################################
 ##############################################################################
@@ -11,21 +22,12 @@ set (HDF5_TEST_FILES
 )
 
 foreach (h5_file ${HDF5_TEST_FILES})
-  set (dest "${PROJECT_BINARY_DIR}/${h5_file}")
-  #message (STATUS " Copying ${h5_file}")
-  add_custom_command (
-      TARGET     hl_ex_ex_ds1
-      POST_BUILD
-      COMMAND    ${CMAKE_COMMAND}
-      ARGS       -E copy_if_different ${PROJECT_SOURCE_DIR}/${h5_file} ${dest}
-  )
-endforeach (h5_file ${HDF5_TEST_FILES})
+  HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/${h5_file}" "${PROJECT_BINARY_DIR}/${h5_file}" "hl_ex_ex_ds1_files")
+endforeach ()
+add_custom_target(hl_ex_ex_ds1_files ALL COMMENT "Copying files needed by hl_ex_ex_ds1 tests" DEPENDS ${hl_ex_ex_ds1_files_list})
 
-  # Remove any output file left over from previous test run
-  add_test (
-      NAME HL_ex-clear-objects
-      COMMAND    ${CMAKE_COMMAND}
-          -E remove 
+# Remove any output file left over from previous test run
+set (HL_EX_CLEANFILES
     ex_lite1.h5
     ex_lite2.h5
     ex_lite3.h5
@@ -45,16 +47,47 @@ endforeach (h5_file ${HDF5_TEST_FILES})
     ex_table_11.h5
     ex_table_12.h5
     ex_ds1.h5
-  )
-  if (NOT "${last_test}" STREQUAL "")
-    set_tests_properties (HL_ex-clear-objects PROPERTIES DEPENDS ${last_test})
-  endif (NOT "${last_test}" STREQUAL "")
-  set (last_test "HL_ex-clear-objects")
+)
+add_test (
+    NAME HL_ex-clear-objects
+    COMMAND    ${CMAKE_COMMAND}
+        -E remove ${HL_EX_CLEANFILES}
+)
+set_tests_properties (HL_ex-clear-objects PROPERTIES
+    FIXTURES_SETUP clear_HL_ex
+    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+)
+add_test (
+    NAME HL_ex-clean-objects
+    COMMAND    ${CMAKE_COMMAND}
+        -E remove ${HL_EX_CLEANFILES}
+)
+set_tests_properties (HL_ex-clean-objects PROPERTIES
+    FIXTURES_CLEANUP clear_HL_ex
+    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+)
 
 foreach (example ${examples})
-  add_test (NAME HL_ex_${example} COMMAND $<TARGET_FILE:hl_ex_${example}>)
-    if (NOT "${last_test}" STREQUAL "")
-      set_tests_properties (HL_ex_${example} PROPERTIES DEPENDS ${last_test})
-    endif (NOT "${last_test}" STREQUAL "")
-    set (last_test "HL_ex_${example}")
-endforeach (example ${examples})
+  if (HDF5_ENABLE_USING_MEMCHECKER)
+    add_test (NAME HL_ex_${example} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:hl_ex_${example}>)
+  else ()
+    add_test (NAME HL_ex_${example} COMMAND "${CMAKE_COMMAND}"
+        -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
+        -D "TEST_PROGRAM=$<TARGET_FILE:hl_ex_${example}>"
+        -D "TEST_ARGS:STRING="
+        -D "TEST_EXPECT=0"
+        -D "TEST_SKIP_COMPARE=TRUE"
+        -D "TEST_OUTPUT=hl_ex_${example}.txt"
+        #-D "TEST_REFERENCE=hl_ex_${example}.out"
+        -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+        -P "${HDF_RESOURCES_DIR}/runTest.cmake"
+    )
+  endif ()
+  if (last_test)
+    set_tests_properties (HL_ex_${example} PROPERTIES
+        DEPENDS ${last_test}
+        FIXTURES_REQUIRED clear_HL_ex
+    )
+  endif ()
+  set (last_test "HL_ex_${example}")
+endforeach ()
diff --git a/hl/examples/Makefile.am b/hl/examples/Makefile.am
index ba200ed..95eb5eb 100644
--- a/hl/examples/Makefile.am
+++ b/hl/examples/Makefile.am
@@ -1,16 +1,13 @@
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 ##
 ## Makefile.am
 ## Run automake to generate a Makefile.in from this file.
@@ -27,8 +24,8 @@ endif
 
 # Example directory
 # Note: no '/' after DESTDIR.  Explanation in commence.am
-EXAMPLEDIR=${DESTDIR}$(exec_prefix)/share/hdf5_examples/hl/c
-EXAMPLETOPDIR=${DESTDIR}$(exec_prefix)/share/hdf5_examples/hl
+EXAMPLEDIR=${DESTDIR}$(examplesdir)/hl/c
+EXAMPLETOPDIR=${DESTDIR}$(examplesdir)/hl
 INSTALL_SCRIPT_FILES = run-hlc-ex.sh
 INSTALL_TOP_SCRIPT_FILES = run-hl-ex.sh
 
diff --git a/hl/examples/Makefile.in b/hl/examples/Makefile.in
deleted file mode 100644
index 42f36aa..0000000
--- a/hl/examples/Makefile.in
+++ /dev/null
@@ -1,1326 +0,0 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-#
-# HDF5 Library Examples Makefile(.in)
-#
-
-# We can't tell automake about example programs, because they need to be
-# built using h5cc (or h5fc, etc.) instead of the standard compilers.
-# This creates some extra work for us.
-VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-DIST_COMMON = $(top_srcdir)/config/commence.am \
-	$(top_srcdir)/config/examples.am \
-	$(top_srcdir)/config/conclude.am $(srcdir)/Makefile.in \
-	$(srcdir)/Makefile.am $(top_srcdir)/bin/mkinstalldirs \
-	$(srcdir)/run-hlc-ex.sh.in $(top_srcdir)/bin/test-driver
-TESTS =
-subdir = hl/examples
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/aclocal_cxx.m4 \
-	$(top_srcdir)/m4/aclocal_fc.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/src/H5config.h
-CONFIG_CLEAN_FILES = run-hlc-ex.sh
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__tty_colors_dummy = \
-  mgn= red= grn= lgn= blu= brg= std=; \
-  am__color_tests=no
-am__tty_colors = { \
-  $(am__tty_colors_dummy); \
-  if test "X$(AM_COLOR_TESTS)" = Xno; then \
-    am__color_tests=no; \
-  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
-    am__color_tests=yes; \
-  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
-    am__color_tests=yes; \
-  fi; \
-  if test $$am__color_tests = yes; then \
-    red='[0;31m'; \
-    grn='[0;32m'; \
-    lgn='[1;32m'; \
-    blu='[1;34m'; \
-    mgn='[0;35m'; \
-    brg='[1m'; \
-    std='[m'; \
-  fi; \
-}
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__recheck_rx = ^[ 	]*:recheck:[ 	]*
-am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
-am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
-# A command that, given a newline-separated list of test names on the
-# standard input, print the name of the tests that are to be re-run
-# upon "make recheck".
-am__list_recheck_tests = $(AWK) '{ \
-  recheck = 1; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-        { \
-          if ((getline line2 < ($$0 ".log")) < 0) \
-	    recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
-        { \
-          recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
-        { \
-          break; \
-        } \
-    }; \
-  if (recheck) \
-    print $$0; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# A command that, given a newline-separated list of test names on the
-# standard input, create the global log from their .trs and .log files.
-am__create_global_log = $(AWK) ' \
-function fatal(msg) \
-{ \
-  print "fatal: making $@: " msg | "cat >&2"; \
-  exit 1; \
-} \
-function rst_section(header) \
-{ \
-  print header; \
-  len = length(header); \
-  for (i = 1; i <= len; i = i + 1) \
-    printf "="; \
-  printf "\n\n"; \
-} \
-{ \
-  copy_in_global_log = 1; \
-  global_test_result = "RUN"; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-         fatal("failed to read from " $$0 ".trs"); \
-      if (line ~ /$(am__global_test_result_rx)/) \
-        { \
-          sub("$(am__global_test_result_rx)", "", line); \
-          sub("[ 	]*$$", "", line); \
-          global_test_result = line; \
-        } \
-      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
-        copy_in_global_log = 0; \
-    }; \
-  if (copy_in_global_log) \
-    { \
-      rst_section(global_test_result ": " $$0); \
-      while ((rc = (getline line < ($$0 ".log"))) != 0) \
-      { \
-        if (rc < 0) \
-          fatal("failed to read from " $$0 ".log"); \
-        print line; \
-      }; \
-      printf "\n"; \
-    }; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# Restructured Text title.
-am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
-# Solaris 10 'make', and several other traditional 'make' implementations,
-# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
-# by disabling -e (using the XSI extension "set +e") if it's set.
-am__sh_e_setup = case $$- in *e*) set +e;; esac
-# Default flags passed to test drivers.
-am__common_driver_flags = \
-  --color-tests "$$am__color_tests" \
-  --enable-hard-errors "$$am__enable_hard_errors" \
-  --expect-failure "$$am__expect_failure"
-# To be inserted before the command running the test.  Creates the
-# directory for the log if needed.  Stores in $dir the directory
-# containing $f, in $tst the test, in $log the log.  Executes the
-# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
-# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
-# will run the test scripts (or their associated LOG_COMPILER, if
-# thy have one).
-am__check_pre = \
-$(am__sh_e_setup);					\
-$(am__vpath_adj_setup) $(am__vpath_adj)			\
-$(am__tty_colors);					\
-srcdir=$(srcdir); export srcdir;			\
-case "$@" in						\
-  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
-    *) am__odir=.;; 					\
-esac;							\
-test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
-  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
-if test -f "./$$f"; then dir=./;			\
-elif test -f "$$f"; then dir=;				\
-else dir="$(srcdir)/"; fi;				\
-tst=$$dir$$f; log='$@'; 				\
-if test -n '$(DISABLE_HARD_ERRORS)'; then		\
-  am__enable_hard_errors=no; 				\
-else							\
-  am__enable_hard_errors=yes; 				\
-fi; 							\
-case " $(XFAIL_TESTS) " in				\
-  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
-    am__expect_failure=yes;;				\
-  *)							\
-    am__expect_failure=no;;				\
-esac; 							\
-$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
-# A shell command to get the names of the tests scripts with any registered
-# extension removed (i.e., equivalently, the names of the test logs, with
-# the '.log' extension removed).  The result is saved in the shell variable
-# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
-# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
-# since that might cause problem with VPATH rewrites for suffix-less tests.
-# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
-am__set_TESTS_bases = \
-  bases='$(TEST_LOGS)'; \
-  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
-  bases=`echo $$bases`
-RECHECK_LOGS = $(TEST_LOGS)
-AM_RECURSIVE_TARGETS = check recheck
-TEST_SUITE_LOG = test-suite.log
-am__test_logs1 = $(TESTS:=.log)
-am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
-TEST_LOGS = $(am__test_logs2:.sh.log=.log)
-SH_LOG_DRIVER = $(SHELL) $(top_srcdir)/bin/test-driver
-SH_LOG_COMPILE = $(SH_LOG_COMPILER) $(AM_SH_LOG_FLAGS) $(SH_LOG_FLAGS)
-am__set_b = \
-  case '$@' in \
-    */*) \
-      case '$*' in \
-        */*) b='$*';; \
-          *) b=`echo '$@' | sed 's/\.log$$//'`; \
-       esac;; \
-    *) \
-      b='$*';; \
-  esac
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
-AMTAR = @AMTAR@
-
-# H5_CFLAGS holds flags that should be used when building hdf5,
-# but which should not be exported to h5cc for building other programs.
-# AM_CFLAGS is an automake construct which should be used by Makefiles 
-# instead of CFLAGS, as CFLAGS is reserved solely for the user to define.
-# This applies to FCFLAGS, CXXFLAGS, CPPFLAGS, and LDFLAGS as well.
-AM_CFLAGS = @AM_CFLAGS@ @H5_CFLAGS@
-AM_CPPFLAGS = @AM_CPPFLAGS@ @H5_CPPFLAGS@
-AM_CXXFLAGS = @AM_CXXFLAGS@ @H5_CXXFLAGS@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@
-AM_LDFLAGS = @AM_LDFLAGS@ @H5_LDFLAGS@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BYTESEX = @BYTESEX@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CC_VERSION = @CC_VERSION@
-CFLAGS = @CFLAGS@
-CLEARFILEBUF = @CLEARFILEBUF@
-CODESTACK = @CODESTACK@
-CONFIG_DATE = @CONFIG_DATE@
-CONFIG_MODE = @CONFIG_MODE@
-CONFIG_USER = @CONFIG_USER@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CXX_VERSION = @CXX_VERSION@
-CYGPATH_W = @CYGPATH_W@
-DEBUG_PKG = @DEBUG_PKG@
-DEFAULT_API_VERSION = @DEFAULT_API_VERSION@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
-DIRECT_VFD = @DIRECT_VFD@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-EXTERNAL_FILTERS = @EXTERNAL_FILTERS@
-
-# Make sure that these variables are exported to the Makefiles
-F9XMODEXT = @F9XMODEXT@
-F9XMODFLAG = @F9XMODFLAG@
-F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
-FC = @FC@
-FC2003 = @FC2003@
-FCFLAGS = @FCFLAGS@
-FCFLAGS_f90 = @FCFLAGS_f90@
-FCLIBS = @FCLIBS@
-FC_VERSION = @FC_VERSION@
-FGREP = @FGREP@
-FSEARCH_DIRS = @FSEARCH_DIRS@
-GREP = @GREP@
-H5_CFLAGS = @H5_CFLAGS@
-H5_CPPFLAGS = @H5_CPPFLAGS@
-H5_CXXFLAGS = @H5_CXXFLAGS@
-H5_CXX_SHARED = @H5_CXX_SHARED@
-H5_FCFLAGS = @H5_FCFLAGS@
-H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@
-H5_LDFLAGS = @H5_LDFLAGS@
-H5_LONE_COLON = @H5_LONE_COLON@
-H5_VERSION = @H5_VERSION@
-HADDR_T = @HADDR_T@
-HAVE_DMALLOC = @HAVE_DMALLOC@
-HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@
-HAVE_PTHREAD = @HAVE_PTHREAD@
-HDF5_HL = @HDF5_HL@
-HDF5_INTERFACES = @HDF5_INTERFACES@
-HDF_CXX = @HDF_CXX@
-HDF_FORTRAN = @HDF_FORTRAN@
-HDF_FORTRAN2003 = @HDF_FORTRAN2003@
-HID_T = @HID_T@
-HL = @HL@
-HL_FOR = @HL_FOR@
-HSIZE_T = @HSIZE_T@
-HSSIZE_T = @HSSIZE_T@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTRUMENT = @INSTRUMENT@
-INSTRUMENT_LIBRARY = @INSTRUMENT_LIBRARY@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LL_PATH = @LL_PATH@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_STATIC_EXEC = @LT_STATIC_EXEC@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MPE = @MPE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJECT_NAMELEN_DEFAULT_F = @OBJECT_NAMELEN_DEFAULT_F@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PARALLEL = @PARALLEL@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-RANLIB = @RANLIB@
-ROOT = @ROOT@
-RUNPARALLEL = @RUNPARALLEL@
-RUNSERIAL = @RUNSERIAL@
-R_INTEGER = @R_INTEGER@
-R_LARGE = @R_LARGE@
-SEARCH = @SEARCH@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SIZE_T = @SIZE_T@
-STATIC_EXEC = @STATIC_EXEC@
-STATIC_SHARED = @STATIC_SHARED@
-STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@
-STRIP = @STRIP@
-TESTPARALLEL = @TESTPARALLEL@
-THREADSAFE = @THREADSAFE@
-TIME = @TIME@
-TR = @TR@
-TRACE_API = @TRACE_API@
-UNAME_INFO = @UNAME_INFO@
-USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
-USE_FILTER_SZIP = @USE_FILTER_SZIP@
-USINGMEMCHECKER = @USINGMEMCHECKER@
-VERSION = @VERSION@
-WORDS_BIGENDIAN = @WORDS_BIGENDIAN@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_FC = @ac_ct_FC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-
-# Install directories that automake doesn't know about
-docdir = $(exec_prefix)/doc
-dvidir = @dvidir@
-enable_shared = @enable_shared@
-enable_static = @enable_static@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-
-# Shell commands used in Makefiles
-RM = rm -f
-CP = cp
-
-# Some machines need a command to run executables; this is that command
-# so that our tests will run.
-# We use RUNEXEC instead of RUNSERIAL directly because it may be that
-# some tests need to be run with a different command.  Older versions
-# of the makefiles used the command
-# $(LIBTOOL) --mode=execute
-# in some directories, for instance.
-RUNEXEC = $(RUNSERIAL)
-
-# Libraries to link to while building
-LIBHDF5 = $(top_builddir)/src/libhdf5.la
-LIBH5TEST = $(top_builddir)/test/libh5test.la
-LIBH5F = $(top_builddir)/fortran/src/libhdf5_fortran.la
-LIBH5FTEST = $(top_builddir)/fortran/test/libh5test_fortran.la
-LIBH5CPP = $(top_builddir)/c++/src/libhdf5_cpp.la
-LIBH5TOOLS = $(top_builddir)/tools/lib/libh5tools.la
-LIBH5_HL = $(top_builddir)/hl/src/libhdf5_hl.la
-LIBH5F_HL = $(top_builddir)/hl/fortran/src/libhdf5hl_fortran.la
-LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
-
-# Note that in svn revision 19400 the '/' after DESTDIR in H5* variables below  
-# has been removed. According to the official description of DESTDIR by Gnu at 
-# http://www.gnu.org/prep/standards/html_node/DESTDIR.html, DESTDIR is 
-# prepended to the normal and complete install path that it precedes for the 
-# purpose of installing in a temporary directory which is useful for building 
-# rpms and other packages.  The '/' after ${DESTDIR} will be followed by another 
-# '/' at the beginning of the normal install path.  When DESTDIR is empty the  
-# path then begins with '//', which is incorrect and causes problems at least for 
-# Cygwin.   
-
-# Scripts used to build examples
-# If only shared libraries have been installed, have h5cc build examples with
-# shared libraries instead of static libraries
-H5CC = ${DESTDIR}$(bindir)/h5cc
-H5CC_PP = ${DESTDIR}$(bindir)/h5pcc
-H5FC = ${DESTDIR}$(bindir)/h5fc
-H5FC_PP = ${DESTDIR}$(bindir)/h5pfc
-H5CPP = ${DESTDIR}$(bindir)/h5c++
-ACLOCAL_AMFLAGS = "-I m4"
-
-# The trace script; this is used on source files from the C library to
-# insert tracing macros.
-TRACE = perl $(top_srcdir)/bin/trace
-
-# .chkexe files are used to mark tests that have run successfully.
-# .chklog files are output from those tests.
-# *.clog and *.clog2 are from the MPE option.
-CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5
-@BUILD_PARALLEL_CONDITIONAL_TRUE@EXAMPLE_PROG_PARA = 
-
-# Example directory
-# Note: no '/' after DESTDIR.  Explanation in commence.am
-EXAMPLEDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples/hl/c
-EXAMPLETOPDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples/hl
-INSTALL_SCRIPT_FILES = run-hlc-ex.sh
-INSTALL_TOP_SCRIPT_FILES = run-hl-ex.sh
-
-# Example programs.
-# Don't tell automake about them, because if it knew they were programs,
-# it would try to compile them instead of using the h5cc script.
-# Use the boilerplate in config/examples.am instead.
-EXAMPLE_PROG = ex_lite1 ex_lite2 ex_lite3 ptExampleFL \
-            ex_image1 ex_image2 \
-            ex_table_01 ex_table_02 ex_table_03 ex_table_04 \
-            ex_table_05 ex_table_06 ex_table_07 ex_table_08 \
-            ex_table_09 ex_table_10 ex_table_11 ex_table_12 \
-            ex_ds1
-
-TEST_EXAMPLES_SCRIPT = $(INSTALL_SCRIPT_FILES)
-
-# Install files
-# List all file that should be installed in examples directory
-INSTALL_FILES = ex_lite1.c ex_lite2.c ex_lite3.c ptExampleFL.c \
-                ex_image1.c ex_image2.c \
-                ex_table_01.c ex_table_02.c ex_table_03.c ex_table_04.c      \
-                ex_table_05.c ex_table_06.c ex_table_07.c ex_table_08.c      \
-                ex_table_09.c ex_table_10.c ex_table_11.c ex_table_12.c      \
-                ex_ds1.c image24pixel.txt image8.txt pal_rgb.h
-
-@BUILD_SHARED_SZIP_CONDITIONAL_TRUE@LD_LIBRARY_PATH = $(LL_PATH)
-
-# Assume that all tests in this directory are examples, and tell
-# conclude.am when to build them.
-EXTRA_PROG = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA)
-
-# We need to tell automake what to clean
-MOSTLYCLEANFILES = *.raw *.meta *.o
-CLEANFILES = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA)
-
-# Automake needs to be taught how to build lib, progs, and tests targets.
-# These will be filled in automatically for the most part (e.g.,
-# lib_LIBRARIES are built for lib target), but EXTRA_LIB, EXTRA_PROG, and
-# EXTRA_TEST variables are supplied to allow the user to force targets to
-# be built at certain times. 
-LIB = $(lib_LIBRARIES) $(lib_LTLIBRARIES) $(noinst_LIBRARIES)                 \
-      $(noinst_LTLIBRARIES) $(check_LIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LIB)
-
-PROGS = $(bin_PROGRAMS) $(bin_SCRIPTS) $(noinst_PROGRAMS) $(noinst_SCRIPTS)   \
-        $(EXTRA_PROG)
-
-chk_TESTS = $(check_PROGRAMS) $(check_SCRIPTS) $(EXTRA_TEST) 
-TEST_EXTENSIONS = .sh
-SH_LOG_COMPILER = $(SHELL)
-AM_SH_LOG_FLAGS = 
-TEST_PROG_CHKEXE = $(TEST_PROG:=.chkexe_)
-TEST_PROG_PARA_CHKEXE = $(TEST_PROG_PARA:=.chkexe_)
-TEST_SCRIPT_CHKSH = $(TEST_SCRIPT:=.chkexe_)
-TEST_SCRIPT_PARA_CHKSH = $(TEST_SCRIPT_PARA:=.chkexe_)
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .log .sh .sh$(EXEEXT) .trs
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/examples.am $(top_srcdir)/config/conclude.am $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign hl/examples/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign hl/examples/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-$(top_srcdir)/config/commence.am $(top_srcdir)/config/examples.am $(top_srcdir)/config/conclude.am:
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-run-hlc-ex.sh: $(top_builddir)/config.status $(srcdir)/run-hlc-ex.sh.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-# Recover from deleted '.trs' file; this should ensure that
-# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
-# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
-# to avoid problems with "make -n".
-.log.trs:
-	rm -f $< $@
-	$(MAKE) $(AM_MAKEFLAGS) $<
-
-# Leading 'am--fnord' is there to ensure the list of targets does not
-# expand to empty, as could happen e.g. with make check TESTS=''.
-am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
-am--force-recheck:
-	@:
-
-$(TEST_SUITE_LOG): $(TEST_LOGS)
-	@$(am__set_TESTS_bases); \
-	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
-	redo_bases=`for i in $$bases; do \
-	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
-	            done`; \
-	if test -n "$$redo_bases"; then \
-	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
-	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
-	  if $(am__make_dryrun); then :; else \
-	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
-	  fi; \
-	fi; \
-	if test -n "$$am__remaking_logs"; then \
-	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
-	       "recursion detected" >&2; \
-	else \
-	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
-	fi; \
-	if $(am__make_dryrun); then :; else \
-	  st=0;  \
-	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
-	  for i in $$redo_bases; do \
-	    test -f $$i.trs && test -r $$i.trs \
-	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
-	    test -f $$i.log && test -r $$i.log \
-	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
-	  done; \
-	  test $$st -eq 0 || exit 1; \
-	fi
-	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
-	ws='[ 	]'; \
-	results=`for b in $$bases; do echo $$b.trs; done`; \
-	test -n "$$results" || results=/dev/null; \
-	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
-	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
-	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
-	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
-	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
-	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
-	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
-	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
-	  success=true; \
-	else \
-	  success=false; \
-	fi; \
-	br='==================='; br=$$br$$br$$br$$br; \
-	result_count () \
-	{ \
-	    if test x"$$1" = x"--maybe-color"; then \
-	      maybe_colorize=yes; \
-	    elif test x"$$1" = x"--no-color"; then \
-	      maybe_colorize=no; \
-	    else \
-	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
-	    fi; \
-	    shift; \
-	    desc=$$1 count=$$2; \
-	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
-	      color_start=$$3 color_end=$$std; \
-	    else \
-	      color_start= color_end=; \
-	    fi; \
-	    echo "$${color_start}# $$desc $$count$${color_end}"; \
-	}; \
-	create_testsuite_report () \
-	{ \
-	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
-	  result_count $$1 "PASS: " $$pass  "$$grn"; \
-	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
-	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
-	  result_count $$1 "FAIL: " $$fail  "$$red"; \
-	  result_count $$1 "XPASS:" $$xpass "$$red"; \
-	  result_count $$1 "ERROR:" $$error "$$mgn"; \
-	}; \
-	{								\
-	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
-	    $(am__rst_title);						\
-	  create_testsuite_report --no-color;				\
-	  echo;								\
-	  echo ".. contents:: :depth: 2";				\
-	  echo;								\
-	  for b in $$bases; do echo $$b; done				\
-	    | $(am__create_global_log);					\
-	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
-	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
-	if $$success; then						\
-	  col="$$grn";							\
-	 else								\
-	  col="$$red";							\
-	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
-	fi;								\
-	echo "$${col}$$br$${std}"; 					\
-	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
-	echo "$${col}$$br$${std}"; 					\
-	create_testsuite_report --maybe-color;				\
-	echo "$$col$$br$$std";						\
-	if $$success; then :; else					\
-	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
-	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
-	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
-	  fi;								\
-	  echo "$$col$$br$$std";					\
-	fi;								\
-	$$success || exit 1
-recheck: all 
-	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-	@set +e; $(am__set_TESTS_bases); \
-	bases=`for i in $$bases; do echo $$i; done \
-	         | $(am__list_recheck_tests)` || exit 1; \
-	log_list=`for i in $$bases; do echo $$i.log; done`; \
-	log_list=`echo $$log_list`; \
-	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
-	        am__force_recheck=am--force-recheck \
-	        TEST_LOGS="$$log_list"; \
-	exit $$?
-.sh.log:
-	@p='$<'; \
-	$(am__set_b); \
-	$(am__check_pre) $(SH_LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_SH_LOG_DRIVER_FLAGS) $(SH_LOG_DRIVER_FLAGS) -- $(SH_LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-@am__EXEEXT_TRUE@.sh$(EXEEXT).log:
-@am__EXEEXT_TRUE@	@p='$<'; \
-@am__EXEEXT_TRUE@	$(am__set_b); \
-@am__EXEEXT_TRUE@	$(am__check_pre) $(SH_LOG_DRIVER) --test-name "$$f" \
-@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
-@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_SH_LOG_DRIVER_FLAGS) $(SH_LOG_DRIVER_FLAGS) -- $(SH_LOG_COMPILE) \
-@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
-check: check-am
-all-am: Makefile all-local
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
-	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
-	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
-	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-data-local
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am: installcheck-local
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool \
-	mostlyclean-local
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-local
-
-.MAKE: check-am install-am install-strip
-
-.PHONY: all all-am all-local check check-TESTS check-am clean \
-	clean-generic clean-libtool cscopelist-am ctags-am distclean \
-	distclean-generic distclean-libtool distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-data-local install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installcheck-local installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
-	pdf-am ps ps-am recheck tags-am uninstall uninstall-am \
-	uninstall-local
-
-
-# List all build rules defined by HDF5 Makefiles as "PHONY" targets here.
-# This tells the Makefiles that these targets are not files to be built but
-# commands that should be executed even if a file with the same name already
-# exists.
-.PHONY: build-check-clean build-check-p build-check-s build-lib build-progs \
-        build-tests check-clean check-install check-p check-s check-vfd \
-        install-doc lib progs tests uninstall-doc _exec_check-s _test help
-
-help:
-	@$(top_srcdir)/bin/makehelp
-
-# Additional dependencies for each program are listed below.
-@BUILD_PARALLEL_CONDITIONAL_TRUE@$(EXTRA_PROG): $(H5CC_PP)
-@BUILD_PARALLEL_CONDITIONAL_TRUE@	$(H5CC_PP) $(H5CCFLAGS) $(CFLAGS) -o $@ $(srcdir)/$@.c;
-@BUILD_PARALLEL_CONDITIONAL_FALSE@$(EXTRA_PROG): $(H5CC)
-@BUILD_PARALLEL_CONDITIONAL_FALSE@	$(H5CC) $(H5CCFLAGS) $(CFLAGS) -o $@ $(srcdir)/$@.c;
-
-# ex_lite2 uses a file created by ex_lite1
-ex_lite2.chkexe_: ex_lite1.chkexe_
-
-# List dependencies for each program.  Normally, automake would take
-# care of this for us, but if we tell automake about the programs it
-# will try to build them with the normal C compiler, not h5cc.  This is
-# an inelegant way of solving the problem.
-# All programs share the same build rule and a dependency on the main hdf5
-# library above.
-ex_lite1: $(srcdir)/ex_lite1.c
-ex_lite2: $(srcdir)/ex_lite2.c
-ex_lite3: $(srcdir)/ex_lite3.c
-ptExampleFL: $(srcdir)/ptExampleFL.c
-ex_image1: $(srcdir)/ex_image1.c
-ex_image2: $(srcdir)/ex_image2.c
-ex_table01: $(srcdir)/ex_table01.c
-ex_table02: $(srcdir)/ex_table02.c
-ex_table03: $(srcdir)/ex_table03.c
-ex_table04: $(srcdir)/ex_table04.c
-ex_table05: $(srcdir)/ex_table05.c
-ex_table06: $(srcdir)/ex_table06.c
-ex_table07: $(srcdir)/ex_table07.c
-ex_table08: $(srcdir)/ex_table08.c
-ex_table09: $(srcdir)/ex_table09.c
-ex_table10: $(srcdir)/ex_table10.c
-ex_table11: $(srcdir)/ex_table11.c
-ex_table12: $(srcdir)/ex_table12.c
-
-# How to create EXAMPLEDIR if it doesn't already exist
-$(EXAMPLEDIR):
-	-$(top_srcdir)/bin/mkdirs $@
-$(EXAMPLETOPDIR):
-	-$(top_srcdir)/bin/mkdirs $@
-
-# Install and uninstall rules.  We install the source files, not the
-# example programs themselves.
-install-data-local:
-	@$(MAKE) $(AM_MAKEFLAGS) install-examples
-uninstall-local:
-	@$(MAKE) $(AM_MAKEFLAGS) uninstall-examples
-
-install-examples: $(EXAMPLEDIR) $(INSTALL_FILES) 
-	@for f in X $(INSTALL_FILES); do                                     \
-	  if test $$f != X; then                                             \
-	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);    \
-            chmod a-x $(EXAMPLEDIR)/$$f;                                     \
-	  fi;                                                                \
-	done
-	@for f in X $(INSTALL_SCRIPT_FILES); do                                   \
-	  if test $$f != X; then                                             \
-	    (set -x; $(INSTALL) $$f $(EXAMPLEDIR)/. || exit 1);\
-	  fi;                                                                \
-	done
-	@for f in X $(INSTALL_TOP_FILES); do                       \
-	  if test $$f != X; then                                             \
-	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1); \
-            chmod a-x $(EXAMPLETOPDIR)/$$f;\
-	  fi;                                                                \
-	done
-	@for f in X $(INSTALL_TOP_SCRIPT_FILES); do                       \
-	  if test $$f != X; then                                             \
-	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1); \
-	  fi;                                                                \
-	done
-
-uninstall-examples:
-	@if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then             \
-	  set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_FILES);                \
-	fi
-	@if test -n "$(INSTALL_SCRIPT_FILES)" -a -d $(EXAMPLEDIR); then           \
-	  set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_SCRIPT_FILES);              \
-	fi
-	@if test -n "$(INSTALL_TOP_FILES)" -a -d $(EXAMPLETOPDIR); then    \
-	  set -x; cd $(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_FILES);       \
-	fi
-	@if test -n "$(INSTALL_TOP_SCRIPT_FILES)" -a -d $(EXAMPLETOPDIR); then    \
-	  set -x; cd $(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_SCRIPT_FILES);       \
-	fi
-
-installcheck-local:
-	@if test "$(STATIC_SHARED)" = "static, shared"; then               \
-	  H5CCFLAGS="-shlib" $(MAKE) $(AM_MAKEFLAGS) check;                \
-	  $(MAKE) $(AM_MAKEFLAGS) clean;                                   \
-	  H5CCFLAGS="" $(MAKE) $(AM_MAKEFLAGS) check;                      \
-	elif test "$(STATIC_SHARED)" = "shared"; then                     \
-	  H5CCFLAGS="-shlib" $(MAKE) $(AM_MAKEFLAGS) check;                \
-	else                                                              \
-	  $(MAKE) $(AM_MAKEFLAGS) check;                                   \
-	fi 
-	@if test "$(INSTALL_FILES)" -a $(TEST_EXAMPLES_SCRIPT) -a -d $(EXAMPLEDIR); then \
-	    echo "============================";                                         \
-	    echo "Testing $(TEST_EXAMPLES_SCRIPT)";                                      \
-	    echo "============================";                                         \
-	    (cd $(EXAMPLEDIR);                                                           \
-	     /bin/sh ./$(TEST_EXAMPLES_SCRIPT);)                                                   \
-	fi
-
-# lib/progs/tests targets recurse into subdirectories. build-* targets
-# build files in this directory.
-build-lib: $(LIB)
-build-progs: $(LIB) $(PROGS)
-build-tests: $(LIB) $(PROGS) $(chk_TESTS)
-
-# General rule for recursive building targets.
-# BUILT_SOURCES contain targets that need to be built before anything else
-# in the directory (e.g., for Fortran type detection)
-lib progs tests check-s check-p :: $(BUILT_SOURCES)
-	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
-	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X && test $$d != .; then                           \
-	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
-	    fi;                                                               \
-	done
-
-# General rule for recursive cleaning targets.  Like the rule above,
-# but doesn't require building BUILT_SOURCES.
-check-clean ::
-	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
-	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X && test $$d != .; then                           \
-	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
-	    fi;                                                               \
-	done
-
-# Tell Automake to build tests when the user types `make all' (this is
-# not its default behavior).  Also build EXTRA_LIB and EXTRA_PROG since
-# Automake won't build them automatically, either.
-all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(chk_TESTS)
-
-# make install-doc doesn't do anything outside of doc directory, but
-# Makefiles should recognize it.
-# UPDATE: docs no longer reside in this build tree, so this target
-# is depreciated.
-install-doc uninstall-doc:
-	@echo "Nothing to be done."
-
-# clean up files generated by tests so they can be re-run.
-build-check-clean:
-	$(RM) -rf $(CHECK_CLEANFILES)
-
-# run check-clean whenever mostlyclean is run
-mostlyclean-local: build-check-clean
-
-# check-install is just a synonym for installcheck
-check-install: installcheck
-
-# Run each test in order, passing $(TEST_FLAGS) to the program.
-# Since tests are done in a shell loop, "make -i" does apply inside it.
-# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
-# The timestamps give a rough idea how much time the tests use.
-#
-# Note that targets in chk_TESTS (defined above) will be built when the user
-# types 'make tests' or 'make check', but only programs in TEST_PROG,
-# TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
-check-TESTS: test
-
-test _test:
-	@$(MAKE) build-check-s
-	@$(MAKE) build-check-p
-
-# Actual execution of check-s.
-build-check-s: $(LIB) $(PROGS) $(chk_TESTS)
-	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
-	   echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
-	fi
-	@$(MAKE) $(AM_MAKEFLAGS) _exec_check-s
-	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
-	    echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
-	fi
-
-_exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH)
-
-# The dummy.chkexe here prevents the target from being
-# empty if there are no tests in the current directory.
-# $${log} is the log file.
-# $${tname} is the name of test.
-$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
-	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \
-	   tname=$(@:.chkexe_=)$(EXEEXT);\
-	   log=$(@:.chkexe_=.chklog); \
-	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \
-	      echo "No need to test $${tname} again."; \
-	   else \
-	      echo "============================" > $${log}; \
-	      if test "X$(FORTRAN_API)" = "Xyes"; then \
-	         echo "Fortran API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "Fortran API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(CXX_API)" = "Xyes"; then \
-	         echo "C++ API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "C++ API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log};\
-	      else \
-	         echo "Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "$(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      fi; \
-	      echo "============================" >> $${log}; \
-	      srcdir="$(srcdir)" \
-	         $(TIME) $(RUNEXEC) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \
-	         && touch $(@:.chkexe_=.chkexe) || \
-	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	         (cat $${log} && false) || exit 1; \
-	      echo "" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
-	      echo "============================" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
-	      cat $${log}; \
-	   fi; \
-	fi
-
-# The dummysh.chkexe here prevents the target from being
-# empty if there are no tests in the current directory.
-# $${log} is the log file.
-# $${tname} is the name of test.
-$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
-	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummysh.chkexe_"; then \
-	   cmd=$(@:.chkexe_=);\
-	   tname=`basename $$cmd`;\
-	   chkname=`basename $(@:.chkexe_=.chkexe)`;\
-	   log=`basename $(@:.chkexe_=.chklog)`; \
-	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer $${chkname} $$cmd $(SCRIPT_DEPEND); then \
-	      echo "No need to test $${tname} again."; \
-	   else \
-	      echo "============================" > $${log}; \
-	      if test "X$(FORTRAN_API)" = "Xyes"; then \
-	         echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(CXX_API)" = "Xyes"; then \
-	         echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      else \
-	         echo "Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      fi; \
-	      echo "============================" >> $${log}; \
-	      RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
-	      srcdir="$(srcdir)" \
-	         $(TIME) $(SHELL) $$cmd $(TEST_FLAGS) >> $${log} 2>&1 \
-	         && touch $${chkname} || \
-	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	         (cat $${log} && false) || exit 1; \
-	      echo "" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
-	      echo "============================" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
-	      cat $${log}; \
-	   fi; \
-	   echo "============================"; \
-	fi
-
-# Actual execution of check-p.
-build-check-p: $(LIB) $(PROGS) $(chk_TESTS)
-	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
-	   echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
-	fi
-	@if test -n "$(TEST_PROG_PARA)"; then                                \
-	    echo "**** Hint ****";                                            \
-	    echo "Parallel test files reside in the current directory"        \
-	         "by default.";                                               \
-	    echo "Set HDF5_PARAPREFIX to use another directory. E.g.,";       \
-	    echo "    HDF5_PARAPREFIX=/PFS/user/me";                          \
-	    echo "    export HDF5_PARAPREFIX";                                \
-	    echo "    make check";                                            \
-	    echo "**** end of Hint ****";                                     \
-	fi
-	@for test in $(TEST_PROG_PARA) dummy; do                             \
-	   if test $$test != dummy; then                                      \
-	      $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ \
-	      RUNEXEC="$(RUNPARALLEL)" || exit 1; \
-	   fi;                                                                \
-	done
-	@for test in $(TEST_SCRIPT_PARA) dummy; do                           \
-	  if test $$test != dummy; then                                      \
-	    $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ || exit 1; \
-	  fi;                                                                 \
-	done
-	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
-	    echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
-	fi
-
-# Run test with different Virtual File Driver
-check-vfd: $(LIB) $(PROGS) $(chk_TESTS)
-	@for vfd in $(VFD_LIST) dummy; do                                     \
-	    if test $$vfd != dummy; then                                      \
-	        echo "============================";                          \
-	        echo "Testing Virtual File Driver $$vfd";                     \
-	        echo "============================";                          \
-	        $(MAKE) $(AM_MAKEFLAGS) check-clean || exit 1;                \
-	        HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check || exit 1;    \
-	    fi;                                                               \
-	done
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/hl/examples/ex_ds1.c b/hl/examples/ex_ds1.c
index 8b7e530..7371f82 100644
--- a/hl/examples/ex_ds1.c
+++ b/hl/examples/ex_ds1.c
@@ -1,114 +1,107 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "hdf5.h"
 #include "hdf5_hl.h"
 
+#define RANK      2
+#define DIM_DATA  12
+#define DIM1_SIZE 3
+#define DIM2_SIZE 4
+#define DIM0      0
+#define DIM1      1
 
-#define RANK          2
-#define DIM_DATA      12
-#define DIM1_SIZE     3
-#define DIM2_SIZE     4
-#define DIM0          0
-#define DIM1          1
+#define DSET_NAME "Mydata"
+#define DS_1_NAME "Yaxis"
+#define DS_2_NAME "Xaxis"
 
-#define DSET_NAME      "Mydata"
-#define DS_1_NAME      "Yaxis"
-#define DS_2_NAME      "Xaxis"
-
-int main(void)
+int
+main(void)
 {
 
- hid_t   fid;                                              /* file ID */
- hid_t   did;                                              /* dataset ID */
- hid_t   dsid;                                             /* DS dataset ID */
- int     rank     = RANK;                                  /* rank of data dataset */
- int     rankds   = 1;                                     /* rank of DS dataset */
- hsize_t dims[RANK]  = {DIM1_SIZE,DIM2_SIZE};              /* size of data dataset */
- int     buf[DIM_DATA] = {1,2,3,4,5,6,7,8,9,10,11,12};     /* data of data dataset */
- hsize_t s1_dim[1]  = {DIM1_SIZE};                         /* size of DS 1 dataset */
- hsize_t s2_dim[1]  = {DIM2_SIZE};                         /* size of DS 2 dataset */
- float   s1_wbuf[DIM1_SIZE] = {10,20,30};                  /* data of DS 1 dataset */
- int     s2_wbuf[DIM2_SIZE] = {10,20,50,100};              /* data of DS 2 dataset */
-
-
- /* create a file using default properties */
- if ((fid=H5Fcreate("ex_ds1.h5",H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT))<0)
-  goto out;
-
- /* make a dataset */
- if (H5LTmake_dataset_int(fid,DSET_NAME,rank,dims,buf)<0)
-  goto out;
-
- /* make a DS dataset for the first dimension */
- if (H5LTmake_dataset_float(fid,DS_1_NAME,rankds,s1_dim,s1_wbuf)<0)
-  goto out;
-
- /* make a DS dataset for the second dimension */
- if (H5LTmake_dataset_int(fid,DS_2_NAME,rankds,s2_dim,s2_wbuf)<0)
-  goto out;
-
-
-/*-------------------------------------------------------------------------
- * attach the DS_1_NAME dimension scale to DSET_NAME at dimension 0
- *-------------------------------------------------------------------------
- */
-
- /* get the dataset id for DSET_NAME */
- if ((did = H5Dopen2(fid,DSET_NAME, H5P_DEFAULT))<0)
-  goto out;
-
- /* get the DS dataset id */
- if ((dsid = H5Dopen2(fid,DS_1_NAME, H5P_DEFAULT))<0)
-  goto out;
-
- /* attach the DS_1_NAME dimension scale to DSET_NAME at dimension index 0 */
- if (H5DSattach_scale(did,dsid,DIM0)<0)
-  goto out;
-
- /* close DS id */
- if (H5Dclose(dsid)<0)
-  goto out;
-
-/*-------------------------------------------------------------------------
- * attach the DS_2_NAME dimension scale to DSET_NAME
- *-------------------------------------------------------------------------
- */
-
- /* get the DS dataset id */
- if ((dsid = H5Dopen2(fid,DS_2_NAME, H5P_DEFAULT))<0)
-  goto out;
-
- /* attach the DS_2_NAME dimension scale to DSET_NAME as the 2nd dimension (index 1)  */
- if (H5DSattach_scale(did,dsid,DIM1)<0)
-  goto out;
-
- /* close DS id */
- if (H5Dclose(dsid)<0)
-  goto out;
-
- /* close file */
- H5Fclose(fid);
-
- return 0;
+    hid_t   fid;                                                          /* file ID */
+    hid_t   did;                                                          /* dataset ID */
+    hid_t   dsid;                                                         /* DS dataset ID */
+    int     rank               = RANK;                                    /* rank of data dataset */
+    int     rankds             = 1;                                       /* rank of DS dataset */
+    hsize_t dims[RANK]         = {DIM1_SIZE, DIM2_SIZE};                  /* size of data dataset */
+    int     buf[DIM_DATA]      = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12}; /* data of data dataset */
+    hsize_t s1_dim[1]          = {DIM1_SIZE};                             /* size of DS 1 dataset */
+    hsize_t s2_dim[1]          = {DIM2_SIZE};                             /* size of DS 2 dataset */
+    float   s1_wbuf[DIM1_SIZE] = {10, 20, 30};                            /* data of DS 1 dataset */
+    int     s2_wbuf[DIM2_SIZE] = {10, 20, 50, 100};                       /* data of DS 2 dataset */
+
+    /* create a file using default properties */
+    if ((fid = H5Fcreate("ex_ds1.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto out;
+
+    /* make a dataset */
+    if (H5LTmake_dataset_int(fid, DSET_NAME, rank, dims, buf) < 0)
+        goto out;
+
+    /* make a DS dataset for the first dimension */
+    if (H5LTmake_dataset_float(fid, DS_1_NAME, rankds, s1_dim, s1_wbuf) < 0)
+        goto out;
+
+    /* make a DS dataset for the second dimension */
+    if (H5LTmake_dataset_int(fid, DS_2_NAME, rankds, s2_dim, s2_wbuf) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+     * attach the DS_1_NAME dimension scale to DSET_NAME at dimension 0
+     *-------------------------------------------------------------------------
+     */
+
+    /* get the dataset id for DSET_NAME */
+    if ((did = H5Dopen2(fid, DSET_NAME, H5P_DEFAULT)) < 0)
+        goto out;
+
+    /* get the DS dataset id */
+    if ((dsid = H5Dopen2(fid, DS_1_NAME, H5P_DEFAULT)) < 0)
+        goto out;
+
+    /* attach the DS_1_NAME dimension scale to DSET_NAME at dimension index 0 */
+    if (H5DSattach_scale(did, dsid, DIM0) < 0)
+        goto out;
+
+    /* close DS id */
+    if (H5Dclose(dsid) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+     * attach the DS_2_NAME dimension scale to DSET_NAME
+     *-------------------------------------------------------------------------
+     */
+
+    /* get the DS dataset id */
+    if ((dsid = H5Dopen2(fid, DS_2_NAME, H5P_DEFAULT)) < 0)
+        goto out;
+
+    /* attach the DS_2_NAME dimension scale to DSET_NAME as the 2nd dimension (index 1)  */
+    if (H5DSattach_scale(did, dsid, DIM1) < 0)
+        goto out;
+
+    /* close DS ids */
+    if (H5Dclose(dsid) < 0)
+        goto out;
+    if (H5Dclose(did) < 0)
+        goto out;
+
+    /* close file */
+    H5Fclose(fid);
+
+    return 0;
 
 out:
- printf("Error on return function...Exiting\n");
- return 1;
-
+    printf("Error on return function...Exiting\n");
+    return 1;
 }
-
-
-
diff --git a/hl/examples/ex_image1.c b/hl/examples/ex_image1.c
index 18ad903..d9080cb 100644
--- a/hl/examples/ex_image1.c
+++ b/hl/examples/ex_image1.c
@@ -1,71 +1,67 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "hdf5.h"
 #include "hdf5_hl.h"
 
-#define WIDTH         400
-#define HEIGHT        200
-#define PAL_ENTRIES   9
-unsigned char buf [ WIDTH*HEIGHT ];
+#define WIDTH       400
+#define HEIGHT      200
+#define PAL_ENTRIES 9
+unsigned char buf[WIDTH * HEIGHT];
 
-int main( void )
+int
+main(void)
 {
- hid_t         file_id;
- hsize_t       pal_dims[] = {PAL_ENTRIES,3};
- size_t        i, j;
- int           n, space;
- unsigned char pal[PAL_ENTRIES*3] = {  /* create a palette with 9 colors */
- 0,0,168,      /* dark blue */
- 0,0,252,      /* blue */
- 0,168,252,    /* ocean blue */
- 84,252,252,   /* light blue */
- 168,252,168,  /* light green */
- 0,252,168,    /* green */
- 252,252,84,   /* yellow */
- 252,168,0,    /* orange */
- 252,0,0};     /* red */
+    hid_t         file_id;
+    hsize_t       pal_dims[] = {PAL_ENTRIES, 3};
+    size_t        i, j;
+    int           n, space;
+    unsigned char pal[PAL_ENTRIES * 3] = {               /* create a palette with 9 colors */
+                                          0,   0,   168, /* dark blue */
+                                          0,   0,   252, /* blue */
+                                          0,   168, 252, /* ocean blue */
+                                          84,  252, 252, /* light blue */
+                                          168, 252, 168, /* light green */
+                                          0,   252, 168, /* green */
+                                          252, 252, 84,  /* yellow */
+                                          252, 168, 0,   /* orange */
+                                          252, 0,   0};  /* red */
 
- /* create an image of 9 values divided evenly by the array */
- space = WIDTH*HEIGHT / PAL_ENTRIES;
- for (i=0, j=0, n=0; i < WIDTH*HEIGHT; i++, j++ )
- {
-  buf[i] = n;
-  if ( j > space )
-  {
-   n++;
-   j=0;
-  }
-  if (n>PAL_ENTRIES-1) n=0;
- }
+    /* create an image of 9 values divided evenly by the array */
+    space = WIDTH * HEIGHT / PAL_ENTRIES;
+    for (i = 0, j = 0, n = 0; i < WIDTH * HEIGHT; i++, j++) {
+        buf[i] = n;
+        if (j > space) {
+            n++;
+            j = 0;
+        }
+        if (n > PAL_ENTRIES - 1)
+            n = 0;
+    }
 
- /* create a new HDF5 file using default properties. */
- file_id = H5Fcreate( "ex_image1.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
+    /* create a new HDF5 file using default properties. */
+    file_id = H5Fcreate("ex_image1.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
- /* make the image */
- H5IMmake_image_8bit( file_id, "image1", (hsize_t)WIDTH, (hsize_t)HEIGHT, buf );
+    /* make the image */
+    H5IMmake_image_8bit(file_id, "image1", (hsize_t)WIDTH, (hsize_t)HEIGHT, buf);
 
- /* make a palette */
- H5IMmake_palette( file_id, "pallete", pal_dims, pal );
+    /* make a palette */
+    H5IMmake_palette(file_id, "palette", pal_dims, pal);
 
- /* attach the palette to the image */
- H5IMlink_palette( file_id, "image1", "pallete" );
+    /* attach the palette to the image */
+    H5IMlink_palette(file_id, "image1", "palette");
 
- /* close the file. */
- H5Fclose( file_id );
-
- return 0;
+    /* close the file. */
+    H5Fclose(file_id);
 
+    return 0;
 }
diff --git a/hl/examples/ex_image2.c b/hl/examples/ex_image2.c
index b57f1b7..579b126 100644
--- a/hl/examples/ex_image2.c
+++ b/hl/examples/ex_image2.c
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "hdf5.h"
@@ -18,90 +15,89 @@
 #include <stdlib.h>
 #include <string.h>
 
-#define DATA_FILE1   "image8.txt"
-#define DATA_FILE2   "image24pixel.txt"
-#define IMAGE1_NAME  "image8bit"
-#define IMAGE2_NAME  "image24bitpixel"
-#define PAL_NAME     "palette"
-#define PAL_ENTRIES  256
+#define DATA_FILE1  "image8.txt"
+#define DATA_FILE2  "image24pixel.txt"
+#define IMAGE1_NAME "image8bit"
+#define IMAGE2_NAME "image24bitpixel"
+#define PAL_NAME    "palette"
+#define PAL_ENTRIES 256
 
-static int    read_data(const char* file_name, hsize_t *width, hsize_t *height );
-unsigned char *gbuf = NULL;  /* global buffer for image data */
+static int     read_data(const char *file_name, hsize_t *width, hsize_t *height);
+unsigned char *gbuf = NULL; /* global buffer for image data */
 
-int main( void )
+int
+main(void)
 {
- hid_t          file_id;                       /* HDF5 file identifier */
- hsize_t        width;                         /* width of image */
- hsize_t        height;                        /* height of image */
- unsigned char  pal[ PAL_ENTRIES * 3 ];        /* palette array */
- hsize_t        pal_dims[2] = {PAL_ENTRIES,3}; /* palette dimensions */
- herr_t         i, n;
-
- /* create a new HDF5 file using default properties. */
- file_id = H5Fcreate( "ex_image2.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
-
- /* read first data file */
- if (read_data(DATA_FILE1,&width,&height)<0)
-  goto out;
-
- /* make the image */
- H5IMmake_image_8bit( file_id, IMAGE1_NAME, width, height, gbuf );
- if (gbuf) {
-    free(gbuf);
-    gbuf = NULL;
- }
-
-/*-------------------------------------------------------------------------
- * define a palette, blue to red tones
- *-------------------------------------------------------------------------
- */
- for ( i=0, n=0; i<PAL_ENTRIES*3; i+=3, n++)
- {
-  pal[i]  =n;      /* red */
-  pal[i+1]=0;      /* green */
-  pal[i+2]=255-n;  /* blue */
- }
-
- /* make a palette */
- H5IMmake_palette( file_id, PAL_NAME, pal_dims, pal );
-
- /* attach the palette to the image */
- H5IMlink_palette( file_id, IMAGE1_NAME, PAL_NAME );
-
-/*-------------------------------------------------------------------------
- * True color image example with pixel interlace
- *-------------------------------------------------------------------------
- */
-
- /* read second data file */
- if (read_data(DATA_FILE2,&width,&height)<0)
-  goto out;
-
- /* make dataset */
- H5IMmake_image_24bit( file_id, IMAGE2_NAME, width, height, "INTERLACE_PIXEL", gbuf );
-
- /* close the file. */
- H5Fclose( file_id );
-
- if(gbuf) {
-    free(gbuf);
-    gbuf = NULL;
- }
-
- return 0;
+    hid_t         file_id;                        /* HDF5 file identifier */
+    hsize_t       width;                          /* width of image */
+    hsize_t       height;                         /* height of image */
+    unsigned char pal[PAL_ENTRIES * 3];           /* palette array */
+    hsize_t       pal_dims[2] = {PAL_ENTRIES, 3}; /* palette dimensions */
+    herr_t        i, n;
+
+    /* create a new HDF5 file using default properties. */
+    file_id = H5Fcreate("ex_image2.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+
+    /* read first data file */
+    if (read_data(DATA_FILE1, &width, &height) < 0)
+        goto out;
+
+    /* make the image */
+    H5IMmake_image_8bit(file_id, IMAGE1_NAME, width, height, gbuf);
+    if (gbuf) {
+        free(gbuf);
+        gbuf = NULL;
+    }
+
+    /*-------------------------------------------------------------------------
+     * define a palette, blue to red tones
+     *-------------------------------------------------------------------------
+     */
+    for (i = 0, n = 0; i < PAL_ENTRIES * 3; i += 3, n++) {
+        pal[i]     = n;       /* red */
+        pal[i + 1] = 0;       /* green */
+        pal[i + 2] = 255 - n; /* blue */
+    }
+
+    /* make a palette */
+    H5IMmake_palette(file_id, PAL_NAME, pal_dims, pal);
+
+    /* attach the palette to the image */
+    H5IMlink_palette(file_id, IMAGE1_NAME, PAL_NAME);
+
+    /*-------------------------------------------------------------------------
+     * True color image example with pixel interlace
+     *-------------------------------------------------------------------------
+     */
+
+    /* read second data file */
+    if (read_data(DATA_FILE2, &width, &height) < 0)
+        goto out;
+
+    /* make dataset */
+    H5IMmake_image_24bit(file_id, IMAGE2_NAME, width, height, "INTERLACE_PIXEL", gbuf);
+
+    /* close the file. */
+    H5Fclose(file_id);
+
+    if (gbuf) {
+        free(gbuf);
+        gbuf = NULL;
+    }
+
+    return 0;
 
 out:
- printf("Error on return function...Exiting\n");
+    printf("Error on return function...Exiting\n");
 
- if(gbuf) {
-    free(gbuf);
-    gbuf = NULL;
- }
+    if (gbuf) {
+        free(gbuf);
+        gbuf = NULL;
+    }
 
- return 1;
+    return 1;
 }
 
-
 /*-------------------------------------------------------------------------
  * read_data
  * utility function to read ASCII image data
@@ -119,68 +115,63 @@ out:
  *-------------------------------------------------------------------------
  */
 
-static int read_data( const char* fname, /*IN*/
-                      hsize_t *width, /*OUT*/
-                      hsize_t *height /*OUT*/ )
+static int
+read_data(const char *fname, /*IN*/
+          hsize_t    *width, /*OUT*/
+          hsize_t    *height /*OUT*/)
 {
- int    i, n;
- int    color_planes;
- char   str[20];
- FILE   *f;
- int    w, h;
- char   *srcdir = getenv("srcdir"); /* the source directory */
- char   data_file[512]="";          /* buffer to hold name of existing data file */
-
-/*-------------------------------------------------------------------------
- * compose the name of the file to open, using "srcdir", if appropriate
- *-------------------------------------------------------------------------
- */
- strcpy(data_file, "");
- if (srcdir)
- {
-  strcpy(data_file, srcdir);
-  strcat(data_file, "/");
- }
- strcat(data_file,fname);
-
-/*-------------------------------------------------------------------------
- * read
- *-------------------------------------------------------------------------
- */
-
- f = fopen(data_file, "r");
- if ( f == NULL )
- {
-  printf( "Could not open file %s. Try set $srcdir \n", data_file );
-  return -1;
- }
-
- fscanf( f, "%s", str );
- fscanf( f, "%d", &color_planes );
- fscanf( f, "%s", str );
- fscanf( f, "%d", &h);
- fscanf( f, "%s", str );
- fscanf( f, "%d", &w);
-
- *width = (hsize_t)w;
- *height = (hsize_t)h;
-
- if ( gbuf )
- {
-  free( gbuf );
-  gbuf=NULL;
- }
-
- gbuf = (unsigned char*) malloc (w * h * color_planes * sizeof( unsigned char ));
-
- for (i = 0; i < h * w * color_planes ; i++)
- {
-  fscanf( f, "%d",&n );
-  gbuf[i] = (unsigned char)n;
- }
- fclose(f);
-
- return 1;
-
+    int   i, n;
+    int   color_planes;
+    char  str[20];
+    FILE *f;
+    int   w, h;
+    char *srcdir         = getenv("srcdir"); /* the source directory */
+    char  data_file[512] = "";               /* buffer to hold name of existing data file */
+
+    /*-------------------------------------------------------------------------
+     * compose the name of the file to open, using "srcdir", if appropriate
+     *-------------------------------------------------------------------------
+     */
+    strcpy(data_file, "");
+    if (srcdir) {
+        strcpy(data_file, srcdir);
+        strcat(data_file, "/");
+    }
+    strcat(data_file, fname);
+
+    /*-------------------------------------------------------------------------
+     * read
+     *-------------------------------------------------------------------------
+     */
+
+    f = fopen(data_file, "r");
+    if (f == NULL) {
+        printf("Could not open file %s. Try set $srcdir \n", data_file);
+        return -1;
+    }
+
+    fscanf(f, "%s", str);
+    fscanf(f, "%d", &color_planes);
+    fscanf(f, "%s", str);
+    fscanf(f, "%d", &h);
+    fscanf(f, "%s", str);
+    fscanf(f, "%d", &w);
+
+    *width  = (hsize_t)w;
+    *height = (hsize_t)h;
+
+    if (gbuf) {
+        free(gbuf);
+        gbuf = NULL;
+    }
+
+    gbuf = (unsigned char *)malloc(w * h * color_planes * sizeof(unsigned char));
+
+    for (i = 0; i < h * w * color_planes; i++) {
+        fscanf(f, "%d", &n);
+        gbuf[i] = (unsigned char)n;
+    }
+    fclose(f);
+
+    return 1;
 }
-
diff --git a/hl/examples/ex_lite1.c b/hl/examples/ex_lite1.c
index 446c803..a23bd29 100644
--- a/hl/examples/ex_lite1.c
+++ b/hl/examples/ex_lite1.c
@@ -1,41 +1,35 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-
 #include "hdf5.h"
 #include "hdf5_hl.h"
 
 #define RANK 2
 
-
-int main( void )
+int
+main(void)
 {
- hid_t       file_id;
- hsize_t     dims[RANK]={2,3};
- int         data[6]={1,2,3,4,5,6};
+    hid_t   file_id;
+    hsize_t dims[RANK] = {2, 3};
+    int     data[6]    = {1, 2, 3, 4, 5, 6};
 
- /* create a HDF5 file */
- file_id = H5Fcreate ("ex_lite1.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    /* create a HDF5 file */
+    file_id = H5Fcreate("ex_lite1.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
- /* create and write an integer type dataset named "dset" */
- H5LTmake_dataset(file_id,"/dset",RANK,dims,H5T_NATIVE_INT,data);
+    /* create and write an integer type dataset named "dset" */
+    H5LTmake_dataset(file_id, "/dset", RANK, dims, H5T_NATIVE_INT, data);
 
- /* close file */
- H5Fclose (file_id);
+    /* close file */
+    H5Fclose(file_id);
 
- return 0;
+    return 0;
 }
-
-
diff --git a/hl/examples/ex_lite2.c b/hl/examples/ex_lite2.c
index a696a20..aa6a47f 100644
--- a/hl/examples/ex_lite2.c
+++ b/hl/examples/ex_lite2.c
@@ -1,53 +1,46 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "hdf5.h"
 #include "hdf5_hl.h"
 
-int main( void )
+int
+main(void)
 {
- hid_t       file_id;
- int         data[6];
- hsize_t     dims[2];
- size_t     i, j, nrow, n_values;
+    hid_t   file_id;
+    int     data[6];
+    hsize_t dims[2];
+    size_t  i, j, nrow, n_values;
 
- /* open file from ex_lite1.c */
- file_id = H5Fopen ("ex_lite1.h5", H5F_ACC_RDONLY, H5P_DEFAULT);
+    /* open file from ex_lite1.c */
+    file_id = H5Fopen("ex_lite1.h5", H5F_ACC_RDONLY, H5P_DEFAULT);
 
- /* read dataset */
- H5LTread_dataset_int(file_id,"/dset",data);
+    /* read dataset */
+    H5LTread_dataset_int(file_id, "/dset", data);
 
- /* get the dimensions of the dataset */
- H5LTget_dataset_info(file_id,"/dset",dims,NULL,NULL);
+    /* get the dimensions of the dataset */
+    H5LTget_dataset_info(file_id, "/dset", dims, NULL, NULL);
 
- /* print it by rows */
- n_values = (size_t)(dims[0] * dims[1]);
- nrow = (size_t)dims[1];
- for (i=0; i<n_values/nrow; i++ )
- {
-  for (j=0; j<nrow; j++)
-   printf ("  %d", data[i*nrow + j]);
-  printf ("\n");
- }
-
- /* close file */
- H5Fclose (file_id);
-
- return 0;
+    /* print it by rows */
+    n_values = (size_t)(dims[0] * dims[1]);
+    nrow     = (size_t)dims[1];
+    for (i = 0; i < n_values / nrow; i++) {
+        for (j = 0; j < nrow; j++)
+            printf("  %d", data[i * nrow + j]);
+        printf("\n");
+    }
 
+    /* close file */
+    H5Fclose(file_id);
 
+    return 0;
 }
-
-
diff --git a/hl/examples/ex_lite3.c b/hl/examples/ex_lite3.c
index f409ea4..8b774de 100644
--- a/hl/examples/ex_lite3.c
+++ b/hl/examples/ex_lite3.c
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "hdf5.h"
@@ -19,51 +16,51 @@
 
 #define ATTR_SIZE 5
 
-int main( void )
+int
+main(void)
 {
- hid_t   file_id;
- hid_t   dset_id;
- hid_t   space_id;
- hsize_t dims[1] = { ATTR_SIZE };
- int     data[ATTR_SIZE] = {1,2,3,4,5};
- int     i;
+    hid_t   file_id;
+    hid_t   dset_id;
+    hid_t   space_id;
+    hsize_t dims[1]         = {ATTR_SIZE};
+    int     data[ATTR_SIZE] = {1, 2, 3, 4, 5};
+    int     i;
 
- /* create a file */
- file_id = H5Fcreate("ex_lite3.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    /* create a file */
+    file_id = H5Fcreate("ex_lite3.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
- /* create a data space  */
- space_id = H5Screate_simple(1, dims, NULL);
+    /* create a data space  */
+    space_id = H5Screate_simple(1, dims, NULL);
 
- /* create a dataset named "dset" */
- dset_id = H5Dcreate2(file_id, "dset", H5T_NATIVE_INT, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    /* create a dataset named "dset" */
+    dset_id = H5Dcreate2(file_id, "dset", H5T_NATIVE_INT, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
- /* close */
- H5Dclose(dset_id);
- H5Sclose(space_id);
+    /* close */
+    H5Dclose(dset_id);
+    H5Sclose(space_id);
 
-/*-------------------------------------------------------------------------
- * example of H5LTset_attribute_int
- *-------------------------------------------------------------------------
- */
+    /*-------------------------------------------------------------------------
+     * example of H5LTset_attribute_int
+     *-------------------------------------------------------------------------
+     */
 
- /* create and write the attribute "attr1" on the dataset "dset" */
- H5LTset_attribute_int(file_id, "dset", "attr1", data, ATTR_SIZE);
+    /* create and write the attribute "attr1" on the dataset "dset" */
+    H5LTset_attribute_int(file_id, "dset", "attr1", data, ATTR_SIZE);
 
-/*-------------------------------------------------------------------------
- * example of H5LTget_attribute_int
- *-------------------------------------------------------------------------
- */
+    /*-------------------------------------------------------------------------
+     * example of H5LTget_attribute_int
+     *-------------------------------------------------------------------------
+     */
 
- /* get the attribute "attr1" from the dataset "dset" */
- H5LTget_attribute_int(file_id, "dset", "attr1", data);
+    /* get the attribute "attr1" from the dataset "dset" */
+    H5LTget_attribute_int(file_id, "dset", "attr1", data);
 
- for(i = 0; i < ATTR_SIZE; i++ )
-  printf("  %d", data[i]);
- printf("\n");
+    for (i = 0; i < ATTR_SIZE; i++)
+        printf("  %d", data[i]);
+    printf("\n");
 
- /* close file */
- H5Fclose(file_id);
+    /* close file */
+    H5Fclose(file_id);
 
- return 0;
+    return 0;
 }
-
diff --git a/hl/examples/ex_table_01.c b/hl/examples/ex_table_01.c
index 1d381ae..582cdc7 100644
--- a/hl/examples/ex_table_01.c
+++ b/hl/examples/ex_table_01.c
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "hdf5.h"
@@ -26,112 +23,91 @@
  *-------------------------------------------------------------------------
  */
 
-#define NFIELDS  (hsize_t)  5
-#define NRECORDS (hsize_t)  8
+#define NFIELDS    (hsize_t)5
+#define NRECORDS   (hsize_t)8
 #define TABLE_NAME "table"
 
-
-int main( void )
+int
+main(void)
 {
- typedef struct Particle
- {
-  char   name[16];
-  int    lati;
-  int    longi;
-  float  pressure;
-  double temperature;
- } Particle;
-
- Particle  dst_buf[NRECORDS];
-
- /* Calculate the size and the offsets of our struct members in memory */
- size_t dst_size =  sizeof( Particle );
- size_t dst_offset[NFIELDS] = { HOFFSET( Particle, name ),
-                                HOFFSET( Particle, lati ),
-                                HOFFSET( Particle, longi ),
-                                HOFFSET( Particle, pressure ),
-                                HOFFSET( Particle, temperature )};
-
- size_t dst_sizes[NFIELDS] = { sizeof( dst_buf[0].name),
-                               sizeof( dst_buf[0].lati),
-                               sizeof( dst_buf[0].longi),
-                               sizeof( dst_buf[0].pressure),
-                               sizeof( dst_buf[0].temperature)};
-
-
- /* Define an array of Particles */
- Particle  p_data[NRECORDS] = {
- {"zero",0,0, 0.0f, 0.0},
- {"one",10,10, 1.0f, 10.0},
- {"two",  20,20, 2.0f, 20.0},
- {"three",30,30, 3.0f, 30.0},
- {"four", 40,40, 4.0f, 40.0},
- {"five", 50,50, 5.0f, 50.0},
- {"six",  60,60, 6.0f, 60.0},
- {"seven",70,70, 7.0f, 70.0}
-  };
-
-  /* Define field information */
-  const char *field_names[NFIELDS]  =
-  { "Name","Latitude", "Longitude", "Pressure", "Temperature" };
-  hid_t      field_type[NFIELDS];
-  hid_t      string_type;
-  hid_t      file_id;
-  hsize_t    chunk_size = 10;
-  int        *fill_data = NULL;
-  int        compress  = 0;
-  int        i;
-
-  /* Initialize field_type */
-  string_type = H5Tcopy( H5T_C_S1 );
-  H5Tset_size( string_type, 16 );
-  field_type[0] = string_type;
-  field_type[1] = H5T_NATIVE_INT;
-  field_type[2] = H5T_NATIVE_INT;
-  field_type[3] = H5T_NATIVE_FLOAT;
-  field_type[4] = H5T_NATIVE_DOUBLE;
-
-  /* Create a new file using default properties. */
-  file_id = H5Fcreate( "ex_table_01.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
-
-/*-------------------------------------------------------------------------
- * H5TBmake_table
- *-------------------------------------------------------------------------
- */
-
- H5TBmake_table( "Table Title", file_id, TABLE_NAME,NFIELDS,NRECORDS,
-                         dst_size,field_names, dst_offset, field_type,
-                         chunk_size, fill_data, compress, p_data  );
-
-/*-------------------------------------------------------------------------
- * H5TBread_table
- *-------------------------------------------------------------------------
- */
-
- H5TBread_table( file_id, TABLE_NAME, dst_size, dst_offset, dst_sizes, dst_buf );
-
- /* print it by rows */
- for (i=0; i<NRECORDS; i++) {
-  printf ("%-5s %-5d %-5d %-5f %-5f",
-   dst_buf[i].name,
-   dst_buf[i].lati,
-   dst_buf[i].longi,
-   dst_buf[i].pressure,
-   dst_buf[i].temperature);
-  printf ("\n");
- }
-
-/*-------------------------------------------------------------------------
- * end
- *-------------------------------------------------------------------------
- */
-
-  /* close type */
- H5Tclose( string_type );
-
- /* close the file */
- H5Fclose( file_id );
-
- return 0;
+    typedef struct Particle {
+        char   name[16];
+        int    lati;
+        int    longi;
+        float  pressure;
+        double temperature;
+    } Particle;
+
+    Particle dst_buf[NRECORDS];
+
+    /* Calculate the size and the offsets of our struct members in memory */
+    size_t dst_size            = sizeof(Particle);
+    size_t dst_offset[NFIELDS] = {HOFFSET(Particle, name), HOFFSET(Particle, lati), HOFFSET(Particle, longi),
+                                  HOFFSET(Particle, pressure), HOFFSET(Particle, temperature)};
+
+    size_t dst_sizes[NFIELDS] = {sizeof(dst_buf[0].name), sizeof(dst_buf[0].lati), sizeof(dst_buf[0].longi),
+                                 sizeof(dst_buf[0].pressure), sizeof(dst_buf[0].temperature)};
+
+    /* Define an array of Particles */
+    Particle p_data[NRECORDS] = {{"zero", 0, 0, 0.0F, 0.0},    {"one", 10, 10, 1.0F, 10.0},
+                                 {"two", 20, 20, 2.0F, 20.0},  {"three", 30, 30, 3.0F, 30.0},
+                                 {"four", 40, 40, 4.0F, 40.0}, {"five", 50, 50, 5.0F, 50.0},
+                                 {"six", 60, 60, 6.0F, 60.0},  {"seven", 70, 70, 7.0F, 70.0}};
+
+    /* Define field information */
+    const char *field_names[NFIELDS] = {"Name", "Latitude", "Longitude", "Pressure", "Temperature"};
+    hid_t       field_type[NFIELDS];
+    hid_t       string_type;
+    hid_t       file_id;
+    hsize_t     chunk_size = 10;
+    int        *fill_data  = NULL;
+    int         compress   = 0;
+    int         i;
+
+    /* Initialize field_type */
+    string_type = H5Tcopy(H5T_C_S1);
+    H5Tset_size(string_type, 16);
+    field_type[0] = string_type;
+    field_type[1] = H5T_NATIVE_INT;
+    field_type[2] = H5T_NATIVE_INT;
+    field_type[3] = H5T_NATIVE_FLOAT;
+    field_type[4] = H5T_NATIVE_DOUBLE;
+
+    /* Create a new file using default properties. */
+    file_id = H5Fcreate("ex_table_01.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+
+    /*-------------------------------------------------------------------------
+     * H5TBmake_table
+     *-------------------------------------------------------------------------
+     */
+
+    H5TBmake_table("Table Title", file_id, TABLE_NAME, NFIELDS, NRECORDS, dst_size, field_names, dst_offset,
+                   field_type, chunk_size, fill_data, compress, p_data);
+
+    /*-------------------------------------------------------------------------
+     * H5TBread_table
+     *-------------------------------------------------------------------------
+     */
+
+    H5TBread_table(file_id, TABLE_NAME, dst_size, dst_offset, dst_sizes, dst_buf);
+
+    /* print it by rows */
+    for (i = 0; i < NRECORDS; i++) {
+        printf("%-5s %-5d %-5d %-5f %-5f", dst_buf[i].name, dst_buf[i].lati, dst_buf[i].longi,
+               dst_buf[i].pressure, dst_buf[i].temperature);
+        printf("\n");
+    }
+
+    /*-------------------------------------------------------------------------
+     * end
+     *-------------------------------------------------------------------------
+     */
+
+    /* close type */
+    H5Tclose(string_type);
+
+    /* close the file */
+    H5Fclose(file_id);
+
+    return 0;
 }
-
diff --git a/hl/examples/ex_table_02.c b/hl/examples/ex_table_02.c
index 129f87d..5b4fe31 100644
--- a/hl/examples/ex_table_02.c
+++ b/hl/examples/ex_table_02.c
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "hdf5.h"
@@ -25,107 +22,85 @@
  *-------------------------------------------------------------------------
  */
 
-#define NFIELDS  (hsize_t)     5
-#define NRECORDS (hsize_t)     8
-#define NRECORDS_ADD (hsize_t) 2
-#define TABLE_NAME             "table"
+#define NFIELDS      (hsize_t)5
+#define NRECORDS     (hsize_t)8
+#define NRECORDS_ADD (hsize_t)2
+#define TABLE_NAME   "table"
 
-int main( void )
+int
+main(void)
 {
- typedef struct Particle
- {
-  char   name[16];
-  int    lati;
-  int    longi;
-  float  pressure;
-  double temperature;
- } Particle;
-
- Particle  dst_buf[NRECORDS+NRECORDS_ADD];
-
-/* Define an array of Particles */
- Particle  p_data[NRECORDS] = {
- {"zero",0,0, 0.0f, 0.0},
- {"one",10,10, 1.0f, 10.0},
- {"two",  20,20, 2.0f, 20.0},
- {"three",30,30, 3.0f, 30.0},
- {"four", 40,40, 4.0f, 40.0},
- {"five", 50,50, 5.0f, 50.0},
- {"six",  60,60, 6.0f, 60.0},
- {"seven",70,70, 7.0f, 70.0}
-  };
-
- /* Calculate the size and the offsets of our struct members in memory */
- size_t dst_size =  sizeof( Particle );
- size_t dst_offset[NFIELDS] = { HOFFSET( Particle, name ),
-                                HOFFSET( Particle, lati ),
-                                HOFFSET( Particle, longi ),
-                                HOFFSET( Particle, pressure ),
-                                HOFFSET( Particle, temperature )};
-
- size_t dst_sizes[NFIELDS] = { sizeof( p_data[0].name),
-                               sizeof( p_data[0].lati),
-                               sizeof( p_data[0].longi),
-                               sizeof( p_data[0].pressure),
-                               sizeof( p_data[0].temperature)};
-
- /* Define field information */
- const char *field_names[NFIELDS] =
- { "Name","Latitude", "Longitude", "Pressure", "Temperature" };
- hid_t      field_type[NFIELDS];
- hid_t      string_type;
- hid_t      file_id;
- hsize_t    chunk_size = 10;
- int        *fill_data = NULL;
- int        compress  = 0;
- int        i;
-
-  /* Append particles */
- Particle particle_in[ NRECORDS_ADD ] =
- {{ "eight",80,80, 8.0f, 80.0},
- {"nine",90,90, 9.0f, 90.0} };
-
- /* Initialize the field field_type */
- string_type = H5Tcopy( H5T_C_S1 );
- H5Tset_size( string_type, 16 );
- field_type[0] = string_type;
- field_type[1] = H5T_NATIVE_INT;
- field_type[2] = H5T_NATIVE_INT;
- field_type[3] = H5T_NATIVE_FLOAT;
- field_type[4] = H5T_NATIVE_DOUBLE;
-
- /* Create a new file using default properties. */
- file_id = H5Fcreate( "ex_table_02.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
-
- /* make a table */
- H5TBmake_table( "Table Title",file_id,TABLE_NAME,NFIELDS,NRECORDS,
-                        dst_size, field_names, dst_offset, field_type,
-                        chunk_size, fill_data, compress, p_data  );
-
- /* append two records */
- H5TBappend_records(file_id, TABLE_NAME,NRECORDS_ADD, dst_size, dst_offset, dst_sizes,
-  &particle_in );
-
- /* read the table */
- H5TBread_table( file_id, TABLE_NAME, dst_size, dst_offset, dst_sizes, dst_buf );
-
- /* print it by rows */
- for (i=0; i<NRECORDS+NRECORDS_ADD; i++) {
-  printf ("%-5s %-5d %-5d %-5f %-5f",
-   dst_buf[i].name,
-   dst_buf[i].lati,
-   dst_buf[i].longi,
-   dst_buf[i].pressure,
-   dst_buf[i].temperature);
-  printf ("\n");
- }
-
-  /* close type */
- H5Tclose( string_type );
-
- /* close the file */
- H5Fclose( file_id );
-
- return 0;
+    typedef struct Particle {
+        char   name[16];
+        int    lati;
+        int    longi;
+        float  pressure;
+        double temperature;
+    } Particle;
+
+    Particle dst_buf[NRECORDS + NRECORDS_ADD];
+
+    /* Define an array of Particles */
+    Particle p_data[NRECORDS] = {{"zero", 0, 0, 0.0F, 0.0},    {"one", 10, 10, 1.0F, 10.0},
+                                 {"two", 20, 20, 2.0F, 20.0},  {"three", 30, 30, 3.0F, 30.0},
+                                 {"four", 40, 40, 4.0F, 40.0}, {"five", 50, 50, 5.0F, 50.0},
+                                 {"six", 60, 60, 6.0F, 60.0},  {"seven", 70, 70, 7.0F, 70.0}};
+
+    /* Calculate the size and the offsets of our struct members in memory */
+    size_t dst_size            = sizeof(Particle);
+    size_t dst_offset[NFIELDS] = {HOFFSET(Particle, name), HOFFSET(Particle, lati), HOFFSET(Particle, longi),
+                                  HOFFSET(Particle, pressure), HOFFSET(Particle, temperature)};
+
+    size_t dst_sizes[NFIELDS] = {sizeof(p_data[0].name), sizeof(p_data[0].lati), sizeof(p_data[0].longi),
+                                 sizeof(p_data[0].pressure), sizeof(p_data[0].temperature)};
+
+    /* Define field information */
+    const char *field_names[NFIELDS] = {"Name", "Latitude", "Longitude", "Pressure", "Temperature"};
+    hid_t       field_type[NFIELDS];
+    hid_t       string_type;
+    hid_t       file_id;
+    hsize_t     chunk_size = 10;
+    int        *fill_data  = NULL;
+    int         compress   = 0;
+    int         i;
+
+    /* Append particles */
+    Particle particle_in[NRECORDS_ADD] = {{"eight", 80, 80, 8.0F, 80.0}, {"nine", 90, 90, 9.0F, 90.0}};
+
+    /* Initialize the field field_type */
+    string_type = H5Tcopy(H5T_C_S1);
+    H5Tset_size(string_type, 16);
+    field_type[0] = string_type;
+    field_type[1] = H5T_NATIVE_INT;
+    field_type[2] = H5T_NATIVE_INT;
+    field_type[3] = H5T_NATIVE_FLOAT;
+    field_type[4] = H5T_NATIVE_DOUBLE;
+
+    /* Create a new file using default properties. */
+    file_id = H5Fcreate("ex_table_02.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+
+    /* make a table */
+    H5TBmake_table("Table Title", file_id, TABLE_NAME, NFIELDS, NRECORDS, dst_size, field_names, dst_offset,
+                   field_type, chunk_size, fill_data, compress, p_data);
+
+    /* append two records */
+    H5TBappend_records(file_id, TABLE_NAME, NRECORDS_ADD, dst_size, dst_offset, dst_sizes, &particle_in);
+
+    /* read the table */
+    H5TBread_table(file_id, TABLE_NAME, dst_size, dst_offset, dst_sizes, dst_buf);
+
+    /* print it by rows */
+    for (i = 0; i < NRECORDS + NRECORDS_ADD; i++) {
+        printf("%-5s %-5d %-5d %-5f %-5f", dst_buf[i].name, dst_buf[i].lati, dst_buf[i].longi,
+               dst_buf[i].pressure, dst_buf[i].temperature);
+        printf("\n");
+    }
+
+    /* close type */
+    H5Tclose(string_type);
+
+    /* close the file */
+    H5Fclose(file_id);
+
+    return 0;
 }
-
diff --git a/hl/examples/ex_table_03.c b/hl/examples/ex_table_03.c
index c9f94ce..694eeb5 100644
--- a/hl/examples/ex_table_03.c
+++ b/hl/examples/ex_table_03.c
@@ -1,19 +1,15 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-
 #include "hdf5.h"
 #include "hdf5_hl.h"
 #include <stdlib.h>
@@ -26,113 +22,85 @@
  *-------------------------------------------------------------------------
  */
 
-#define NFIELDS  (hsize_t)       5
-#define NRECORDS (hsize_t)       8
-#define NRECORDS_WRITE (hsize_t) 2
-#define TABLE_NAME               "table"
+#define NFIELDS        (hsize_t)5
+#define NRECORDS       (hsize_t)8
+#define NRECORDS_WRITE (hsize_t)2
+#define TABLE_NAME     "table"
 
-int main( void )
+int
+main(void)
 {
- typedef struct Particle
- {
-  char   name[16];
-  int    lati;
-  int    longi;
-  float  pressure;
-  double temperature;
- } Particle;
-
- Particle  dst_buf[NRECORDS];
-
- /* Calculate the size and the offsets of our struct members in memory */
- size_t dst_size =  sizeof( Particle );
- size_t dst_offset[NFIELDS] = { HOFFSET( Particle, name ),
-                                HOFFSET( Particle, lati ),
-                                HOFFSET( Particle, longi ),
-                                HOFFSET( Particle, pressure ),
-                                HOFFSET( Particle, temperature )};
-
- Particle  p = {"zero",0,0, 0.0f, 0.0};
- size_t dst_sizes[NFIELDS] = { sizeof( p.name),
-                               sizeof( p.lati),
-                               sizeof( p.longi),
-                               sizeof( p.pressure),
-                               sizeof( p.temperature)};
-
- /* Define field information */
- const char *field_names[NFIELDS]  =
- { "Name","Latitude", "Longitude", "Pressure", "Temperature" };
- /* Fill value particle */
- Particle   fill_data[1] =
-	{ {"no data",-1,-1, -99.0f, -99.0} };
- hid_t      field_type[NFIELDS];
- hid_t      string_type;
- hid_t      file_id;
- hsize_t    chunk_size = 10;
- hsize_t    start;      /* Record to start reading/writing */
- hsize_t    nrecords;   /* Number of records to read/write */
- int        i;
-
- /* Define 2 new particles to write */
- Particle  particle_in[NRECORDS_WRITE] =
- { {"zero",0,0, 0.0f, 0.0},
- {"one",10,10, 1.0f, 10.0} };
-
- /* Initialize the field field_type */
- string_type = H5Tcopy( H5T_C_S1 );
- H5Tset_size( string_type, 16 );
- field_type[0] = string_type;
- field_type[1] = H5T_NATIVE_INT;
- field_type[2] = H5T_NATIVE_INT;
- field_type[3] = H5T_NATIVE_FLOAT;
- field_type[4] = H5T_NATIVE_DOUBLE;
-
-/* Create a new file using default properties. */
- file_id = H5Fcreate( "ex_table_03.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
-
- /* Make the table */
- H5TBmake_table( "Table Title",
-  file_id,
-  TABLE_NAME,
-  NFIELDS,
-  NRECORDS,
-  dst_size,
-  field_names,
-  dst_offset,
-  field_type,
-  chunk_size,
-  fill_data,
-  0,           /* no compression */
-  NULL );      /* no data written */
-
-
- /* Overwrite 2 records starting at record 0 */
- start    = 0;
- nrecords = NRECORDS_WRITE;
- H5TBwrite_records( file_id, TABLE_NAME, start, nrecords, dst_size, dst_offset,
-  dst_sizes, particle_in);
-
- /* read the table */
- H5TBread_table( file_id, TABLE_NAME, dst_size, dst_offset, dst_sizes, dst_buf );
-
- /* print it by rows */
- for (i=0; i<NRECORDS; i++) {
-  printf ("%-5s %-5d %-5d %-5f %-5f",
-   dst_buf[i].name,
-   dst_buf[i].lati,
-   dst_buf[i].longi,
-   dst_buf[i].pressure,
-   dst_buf[i].temperature);
-  printf ("\n");
- }
-
-  /* close type */
- H5Tclose( string_type );
-
- /* close the file */
- H5Fclose( file_id );
-
- return 0;
-
+    typedef struct Particle {
+        char   name[16];
+        int    lati;
+        int    longi;
+        float  pressure;
+        double temperature;
+    } Particle;
+
+    Particle dst_buf[NRECORDS];
+
+    /* Calculate the size and the offsets of our struct members in memory */
+    size_t dst_size            = sizeof(Particle);
+    size_t dst_offset[NFIELDS] = {HOFFSET(Particle, name), HOFFSET(Particle, lati), HOFFSET(Particle, longi),
+                                  HOFFSET(Particle, pressure), HOFFSET(Particle, temperature)};
+
+    Particle p                  = {"zero", 0, 0, 0.0F, 0.0};
+    size_t   dst_sizes[NFIELDS] = {sizeof(p.name), sizeof(p.lati), sizeof(p.longi), sizeof(p.pressure),
+                                 sizeof(p.temperature)};
+
+    /* Define field information */
+    const char *field_names[NFIELDS] = {"Name", "Latitude", "Longitude", "Pressure", "Temperature"};
+    /* Fill value particle */
+    Particle fill_data[1] = {{"no data", -1, -1, -99.0F, -99.0}};
+    hid_t    field_type[NFIELDS];
+    hid_t    string_type;
+    hid_t    file_id;
+    hsize_t  chunk_size = 10;
+    hsize_t  start;    /* Record to start reading/writing */
+    hsize_t  nrecords; /* Number of records to read/write */
+    int      i;
+
+    /* Define 2 new particles to write */
+    Particle particle_in[NRECORDS_WRITE] = {{"zero", 0, 0, 0.0F, 0.0}, {"one", 10, 10, 1.0F, 10.0}};
+
+    /* Initialize the field field_type */
+    string_type = H5Tcopy(H5T_C_S1);
+    H5Tset_size(string_type, 16);
+    field_type[0] = string_type;
+    field_type[1] = H5T_NATIVE_INT;
+    field_type[2] = H5T_NATIVE_INT;
+    field_type[3] = H5T_NATIVE_FLOAT;
+    field_type[4] = H5T_NATIVE_DOUBLE;
+
+    /* Create a new file using default properties. */
+    file_id = H5Fcreate("ex_table_03.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+
+    /* Make the table */
+    H5TBmake_table("Table Title", file_id, TABLE_NAME, NFIELDS, NRECORDS, dst_size, field_names, dst_offset,
+                   field_type, chunk_size, fill_data, 0, /* no compression */
+                   NULL);                                /* no data written */
+
+    /* Overwrite 2 records starting at record 0 */
+    start    = 0;
+    nrecords = NRECORDS_WRITE;
+    H5TBwrite_records(file_id, TABLE_NAME, start, nrecords, dst_size, dst_offset, dst_sizes, particle_in);
+
+    /* read the table */
+    H5TBread_table(file_id, TABLE_NAME, dst_size, dst_offset, dst_sizes, dst_buf);
+
+    /* print it by rows */
+    for (i = 0; i < NRECORDS; i++) {
+        printf("%-5s %-5d %-5d %-5f %-5f", dst_buf[i].name, dst_buf[i].lati, dst_buf[i].longi,
+               dst_buf[i].pressure, dst_buf[i].temperature);
+        printf("\n");
+    }
+
+    /* close type */
+    H5Tclose(string_type);
+
+    /* close the file */
+    H5Fclose(file_id);
+
+    return 0;
 }
-
diff --git a/hl/examples/ex_table_04.c b/hl/examples/ex_table_04.c
index 01f2869..4960173 100644
--- a/hl/examples/ex_table_04.c
+++ b/hl/examples/ex_table_04.c
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "hdf5.h"
@@ -25,141 +22,117 @@
  *-------------------------------------------------------------------------
  */
 
-#define NFIELDS       (hsize_t)   5
-#define NRECORDS      (hsize_t)   8
-#define NRECORDS_ADD  (hsize_t)   3
-#define TABLE_NAME               "table"
+#define NFIELDS      (hsize_t)5
+#define NRECORDS     (hsize_t)8
+#define NRECORDS_ADD (hsize_t)3
+#define TABLE_NAME   "table"
 
-int main( void )
+int
+main(void)
 {
- typedef struct Particle
- {
-  char   name[16];
-  int    lati;
-  int    longi;
-  float  pressure;
-  double temperature;
- } Particle;
-
- /* Define a subset of Particle, with latitude and longitude fields */
- typedef struct Position
- {
-  int    lati;
-  int    longi;
- } Position;
-
- /* Define a subset of Particle, with name and pressure fields */
- typedef struct NamePressure
- {
-  char   name[16];
-  float  pressure;
- } NamePressure;
-
- Particle  dst_buf[NRECORDS];
- /* Calculate the size and the offsets of our struct members in memory */
- size_t dst_size =  sizeof( Particle );
- size_t dst_offset[NFIELDS] = { HOFFSET( Particle, name ),
-                                HOFFSET( Particle, lati ),
-                                HOFFSET( Particle, longi ),
-                                HOFFSET( Particle, pressure ),
-                                HOFFSET( Particle, temperature )};
- size_t dst_sizes[NFIELDS] = { sizeof( dst_buf[0].name),
-                               sizeof( dst_buf[0].lati),
-                               sizeof( dst_buf[0].longi),
-                               sizeof( dst_buf[0].pressure),
-                               sizeof( dst_buf[0].temperature)};
- size_t field_offset_pos[2] = { HOFFSET( Position, lati ),
-                                HOFFSET( Position, longi )};
- const char *field_names[NFIELDS]  =     /* Define field information */
- { "Name","Latitude", "Longitude", "Pressure", "Temperature" };
- hid_t      field_type[NFIELDS];
- hid_t      string_type;
- hid_t      file_id;
- hsize_t    chunk_size = 10;
- Particle   fill_data[1] =
- { {"no data",-1,-1, -99.0f, -99.0} };   /* Fill value particle */
- hsize_t    start;                       /* Record to start reading/writing */
- hsize_t    nrecords;                    /* Number of records to read/write */
- int        compress  = 0;
- int        i;
- Particle  *p_data = NULL;               /* Initially no data */
- float      pressure_in [NRECORDS_ADD] = /* Define new values for the field "Pressure"  */
- { 0.0f,1.0f,2.0f};
- Position   position_in[NRECORDS_ADD] = {/* Define new values for "Latitude,Longitude"  */
- {0,0},
- {10,10},
- {20,20}};
- NamePressure   namepre_in[NRECORDS_ADD] =/* Define new values for "Name,Pressure"  */
- { {"zero",0.0f},
- {"one",   1.0f},
- {"two",   2.0f},
- };
- size_t field_sizes_pos[2]=
- {
-  sizeof(position_in[0].longi),
-  sizeof(position_in[0].lati)
- };
- size_t field_sizes_pre[1]=
- {
-  sizeof(namepre_in[0].pressure)
- };
-
- /* Initialize the field field_type */
- string_type = H5Tcopy( H5T_C_S1 );
- H5Tset_size( string_type, 16 );
- field_type[0] = string_type;
- field_type[1] = H5T_NATIVE_INT;
- field_type[2] = H5T_NATIVE_INT;
- field_type[3] = H5T_NATIVE_FLOAT;
- field_type[4] = H5T_NATIVE_DOUBLE;
-
- /* Create a new file using default properties. */
- file_id = H5Fcreate( "ex_table_04.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
-
- /* Make the table */
- H5TBmake_table( "Table Title",file_id,TABLE_NAME,NFIELDS,NRECORDS,
-                         dst_size,field_names, dst_offset, field_type,
-                         chunk_size, fill_data, compress, p_data  );
-
- /* Write the pressure field starting at record 2 */
- start    = 2;
- nrecords = NRECORDS_ADD;
- H5TBwrite_fields_name( file_id, TABLE_NAME, "Pressure", start, nrecords,
-   sizeof( float ), 0, field_sizes_pre, pressure_in  );
-
- /* Write the new longitude and latitude information starting at record 2 */
- start    = 2;
- nrecords = NRECORDS_ADD;
- H5TBwrite_fields_name( file_id, TABLE_NAME, "Latitude,Longitude", start, nrecords,
-   sizeof( Position ), field_offset_pos, field_sizes_pos,  position_in  );
-
- /* read the table */
- H5TBread_table( file_id, TABLE_NAME, dst_size, dst_offset, dst_sizes, dst_buf );
-
- /* print it by rows */
- for (i=0; i<NRECORDS; i++) {
-  printf ("%-5s %-5d %-5d %-5f %-5f",
-   dst_buf[i].name,
-   dst_buf[i].lati,
-   dst_buf[i].longi,
-   dst_buf[i].pressure,
-   dst_buf[i].temperature);
-  printf ("\n");
- }
-
-/*-------------------------------------------------------------------------
- * end
- *-------------------------------------------------------------------------
- */
-
-  /* close type */
- H5Tclose( string_type );
-
- /* close the file */
- H5Fclose( file_id );
-
- return 0;
-
-
+    typedef struct Particle {
+        char   name[16];
+        int    lati;
+        int    longi;
+        float  pressure;
+        double temperature;
+    } Particle;
+
+    /* Define a subset of Particle, with latitude and longitude fields */
+    typedef struct Position {
+        int lati;
+        int longi;
+    } Position;
+
+    /* Define a subset of Particle, with name and pressure fields */
+    typedef struct NamePressure {
+        char  name[16];
+        float pressure;
+    } NamePressure;
+
+    Particle dst_buf[NRECORDS];
+    /* Calculate the size and the offsets of our struct members in memory */
+    size_t dst_size            = sizeof(Particle);
+    size_t dst_offset[NFIELDS] = {HOFFSET(Particle, name), HOFFSET(Particle, lati), HOFFSET(Particle, longi),
+                                  HOFFSET(Particle, pressure), HOFFSET(Particle, temperature)};
+    size_t dst_sizes[NFIELDS]  = {sizeof(dst_buf[0].name), sizeof(dst_buf[0].lati), sizeof(dst_buf[0].longi),
+                                 sizeof(dst_buf[0].pressure), sizeof(dst_buf[0].temperature)};
+    size_t field_offset_pos[2] = {HOFFSET(Position, lati), HOFFSET(Position, longi)};
+    const char *field_names[NFIELDS] = /* Define field information */
+        {"Name", "Latitude", "Longitude", "Pressure", "Temperature"};
+    hid_t     field_type[NFIELDS];
+    hid_t     string_type;
+    hid_t     file_id;
+    hsize_t   chunk_size   = 10;
+    Particle  fill_data[1] = {{"no data", -1, -1, -99.0F, -99.0}}; /* Fill value particle */
+    hsize_t   start;                                               /* Record to start reading/writing */
+    hsize_t   nrecords;                                            /* Number of records to read/write */
+    int       compress = 0;
+    int       i;
+    Particle *p_data                    = NULL; /* Initially no data */
+    float     pressure_in[NRECORDS_ADD] =       /* Define new values for the field "Pressure"  */
+        {0.0F, 1.0F, 2.0F};
+    Position     position_in[NRECORDS_ADD] = {/* Define new values for "Latitude,Longitude"  */
+                                          {0, 0},
+                                          {10, 10},
+                                          {20, 20}};
+    NamePressure namepre_in[NRECORDS_ADD]  = /* Define new values for "Name,Pressure"  */
+        {
+            {"zero", 0.0F},
+            {"one", 1.0F},
+            {"two", 2.0F},
+        };
+    size_t field_sizes_pos[2] = {sizeof(position_in[0].longi), sizeof(position_in[0].lati)};
+    size_t field_sizes_pre[1] = {sizeof(namepre_in[0].pressure)};
+
+    /* Initialize the field field_type */
+    string_type = H5Tcopy(H5T_C_S1);
+    H5Tset_size(string_type, 16);
+    field_type[0] = string_type;
+    field_type[1] = H5T_NATIVE_INT;
+    field_type[2] = H5T_NATIVE_INT;
+    field_type[3] = H5T_NATIVE_FLOAT;
+    field_type[4] = H5T_NATIVE_DOUBLE;
+
+    /* Create a new file using default properties. */
+    file_id = H5Fcreate("ex_table_04.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+
+    /* Make the table */
+    H5TBmake_table("Table Title", file_id, TABLE_NAME, NFIELDS, NRECORDS, dst_size, field_names, dst_offset,
+                   field_type, chunk_size, fill_data, compress, p_data);
+
+    /* Write the pressure field starting at record 2 */
+    start    = 2;
+    nrecords = NRECORDS_ADD;
+    H5TBwrite_fields_name(file_id, TABLE_NAME, "Pressure", start, nrecords, sizeof(float), 0, field_sizes_pre,
+                          pressure_in);
+
+    /* Write the new longitude and latitude information starting at record 2 */
+    start    = 2;
+    nrecords = NRECORDS_ADD;
+    H5TBwrite_fields_name(file_id, TABLE_NAME, "Latitude,Longitude", start, nrecords, sizeof(Position),
+                          field_offset_pos, field_sizes_pos, position_in);
+
+    /* read the table */
+    H5TBread_table(file_id, TABLE_NAME, dst_size, dst_offset, dst_sizes, dst_buf);
+
+    /* print it by rows */
+    for (i = 0; i < NRECORDS; i++) {
+        printf("%-5s %-5d %-5d %-5f %-5f", dst_buf[i].name, dst_buf[i].lati, dst_buf[i].longi,
+               dst_buf[i].pressure, dst_buf[i].temperature);
+        printf("\n");
+    }
+
+    /*-------------------------------------------------------------------------
+     * end
+     *-------------------------------------------------------------------------
+     */
+
+    /* close type */
+    H5Tclose(string_type);
+
+    /* close the file */
+    H5Fclose(file_id);
+
+    return 0;
 }
-
diff --git a/hl/examples/ex_table_05.c b/hl/examples/ex_table_05.c
index 7ed1fec..9a689e3 100644
--- a/hl/examples/ex_table_05.c
+++ b/hl/examples/ex_table_05.c
@@ -1,19 +1,15 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-
 #include "hdf5.h"
 #include "hdf5_hl.h"
 #include <stdlib.h>
@@ -26,142 +22,111 @@
  *-------------------------------------------------------------------------
  */
 
-#define NFIELDS       (hsize_t)   5
-#define NRECORDS      (hsize_t)   8
-#define NRECORDS_ADD  (hsize_t)   3
-#define TABLE_NAME               "table"
-
-
+#define NFIELDS      (hsize_t)5
+#define NRECORDS     (hsize_t)8
+#define NRECORDS_ADD (hsize_t)3
+#define TABLE_NAME   "table"
 
-int main( void )
+int
+main(void)
 {
- typedef struct Particle
- {
-  char   name[16];
-  int    lati;
-  int    longi;
-  float  pressure;
-  double temperature;
- } Particle;
-
- /* Define a subset of Particle, with latitude and longitude fields */
- typedef struct Position
- {
-  int    lati;
-  int    longi;
- } Position;
-
- /* Calculate the type_size and the offsets of our struct members */
- Particle  dst_buf[NRECORDS];
- size_t dst_size =  sizeof( Particle );
- size_t dst_offset[NFIELDS] = { HOFFSET( Particle, name ),
-                                HOFFSET( Particle, lati ),
-                                HOFFSET( Particle, longi ),
-                                HOFFSET( Particle, pressure ),
-                                HOFFSET( Particle, temperature )};
- size_t dst_sizes[NFIELDS] = { sizeof( dst_buf[0].name),
-                               sizeof( dst_buf[0].lati),
-                               sizeof( dst_buf[0].longi),
-                               sizeof( dst_buf[0].pressure),
-                               sizeof( dst_buf[0].temperature)};
-
- size_t field_offset_pos[2] = { HOFFSET( Position, lati ),
-                                HOFFSET( Position, longi )};
-
- /* Initially no data */
- Particle  *p_data = NULL;
-
- /* Define field information */
- const char *field_names[NFIELDS]  =
- { "Name","Latitude", "Longitude", "Pressure", "Temperature" };
- hid_t      field_type[NFIELDS];
- hid_t      string_type;
- hid_t      file_id;
- hsize_t    chunk_size = 10;
-  Particle   fill_data[1] =
- { {"no data",-1,-1, -99.0f, -99.0} };   /* Fill value particle */
- int        compress  = 0;
- hsize_t    nfields;
- hsize_t    start;                       /* Record to start reading/writing */
- hsize_t    nrecords;                    /* Number of records to read/write */
- int        i;
-
- /* Define new values for the field "Pressure"  */
- float      pressure_in  [NRECORDS_ADD] =
- { 0.0f,1.0f,2.0f};
- int        field_index_pre[1]     = { 3 };
- int        field_index_pos[2]     = { 1,2 };
-
- /* Define new values for the fields "Latitude,Longitude"  */
- Position   position_in[NRECORDS_ADD] = { {0,0},
- {10,10},
- {20,20} };
-
- size_t field_sizes_pos[2]=
- {
-  sizeof(position_in[0].longi),
-  sizeof(position_in[0].lati)
- };
-
- size_t field_sizes_pre[1]=
- {
-  sizeof(float)
- };
-
- /* Initialize the field field_type */
- string_type = H5Tcopy( H5T_C_S1 );
- H5Tset_size( string_type, 16 );
- field_type[0] = string_type;
- field_type[1] = H5T_NATIVE_INT;
- field_type[2] = H5T_NATIVE_INT;
- field_type[3] = H5T_NATIVE_FLOAT;
- field_type[4] = H5T_NATIVE_DOUBLE;
-
- /* Create a new file using default properties. */
- file_id = H5Fcreate( "ex_table_05.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
-
- /* Make the table */
- H5TBmake_table( "Table Title", file_id, TABLE_NAME,NFIELDS,NRECORDS,
-                         dst_size,field_names, dst_offset, field_type,
-                         chunk_size, fill_data, compress, p_data  );
-
- /* Write the pressure field starting at record 2 */
- nfields  = 1;
- start    = 2;
- nrecords = NRECORDS_ADD;
- H5TBwrite_fields_index( file_id, TABLE_NAME, nfields, field_index_pre, start, nrecords,
-   sizeof( float ), 0, field_sizes_pre, pressure_in  );
-
-
- /* Write the new longitude and latitude information starting at record 2  */
- nfields  = 2;
- start    = 2;
- nrecords = NRECORDS_ADD;
- H5TBwrite_fields_index( file_id, TABLE_NAME, nfields, field_index_pos, start, nrecords,
-   sizeof( Position ), field_offset_pos, field_sizes_pos, position_in  );
-
-
- /* read the table */
- H5TBread_table( file_id, TABLE_NAME, dst_size, dst_offset, dst_sizes, dst_buf );
-
- /* print it by rows */
- for (i=0; i<NRECORDS; i++) {
-  printf ("%-5s %-5d %-5d %-5f %-5f",
-   dst_buf[i].name,
-   dst_buf[i].lati,
-   dst_buf[i].longi,
-   dst_buf[i].pressure,
-   dst_buf[i].temperature);
-  printf ("\n");
- }
-
- /* close type */
- H5Tclose( string_type );
-
- /* close the file */
- H5Fclose( file_id );
-
- return 0;
-
+    typedef struct Particle {
+        char   name[16];
+        int    lati;
+        int    longi;
+        float  pressure;
+        double temperature;
+    } Particle;
+
+    /* Define a subset of Particle, with latitude and longitude fields */
+    typedef struct Position {
+        int lati;
+        int longi;
+    } Position;
+
+    /* Calculate the type_size and the offsets of our struct members */
+    Particle dst_buf[NRECORDS];
+    size_t   dst_size          = sizeof(Particle);
+    size_t dst_offset[NFIELDS] = {HOFFSET(Particle, name), HOFFSET(Particle, lati), HOFFSET(Particle, longi),
+                                  HOFFSET(Particle, pressure), HOFFSET(Particle, temperature)};
+    size_t dst_sizes[NFIELDS]  = {sizeof(dst_buf[0].name), sizeof(dst_buf[0].lati), sizeof(dst_buf[0].longi),
+                                 sizeof(dst_buf[0].pressure), sizeof(dst_buf[0].temperature)};
+
+    size_t field_offset_pos[2] = {HOFFSET(Position, lati), HOFFSET(Position, longi)};
+
+    /* Initially no data */
+    Particle *p_data = NULL;
+
+    /* Define field information */
+    const char *field_names[NFIELDS] = {"Name", "Latitude", "Longitude", "Pressure", "Temperature"};
+    hid_t       field_type[NFIELDS];
+    hid_t       string_type;
+    hid_t       file_id;
+    hsize_t     chunk_size   = 10;
+    Particle    fill_data[1] = {{"no data", -1, -1, -99.0F, -99.0}}; /* Fill value particle */
+    int         compress     = 0;
+    hsize_t     nfields;
+    hsize_t     start;    /* Record to start reading/writing */
+    hsize_t     nrecords; /* Number of records to read/write */
+    int         i;
+
+    /* Define new values for the field "Pressure"  */
+    float pressure_in[NRECORDS_ADD] = {0.0F, 1.0F, 2.0F};
+    int   field_index_pre[1]        = {3};
+    int   field_index_pos[2]        = {1, 2};
+
+    /* Define new values for the fields "Latitude,Longitude"  */
+    Position position_in[NRECORDS_ADD] = {{0, 0}, {10, 10}, {20, 20}};
+
+    size_t field_sizes_pos[2] = {sizeof(position_in[0].longi), sizeof(position_in[0].lati)};
+
+    size_t field_sizes_pre[1] = {sizeof(float)};
+
+    /* Initialize the field field_type */
+    string_type = H5Tcopy(H5T_C_S1);
+    H5Tset_size(string_type, 16);
+    field_type[0] = string_type;
+    field_type[1] = H5T_NATIVE_INT;
+    field_type[2] = H5T_NATIVE_INT;
+    field_type[3] = H5T_NATIVE_FLOAT;
+    field_type[4] = H5T_NATIVE_DOUBLE;
+
+    /* Create a new file using default properties. */
+    file_id = H5Fcreate("ex_table_05.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+
+    /* Make the table */
+    H5TBmake_table("Table Title", file_id, TABLE_NAME, NFIELDS, NRECORDS, dst_size, field_names, dst_offset,
+                   field_type, chunk_size, fill_data, compress, p_data);
+
+    /* Write the pressure field starting at record 2 */
+    nfields  = 1;
+    start    = 2;
+    nrecords = NRECORDS_ADD;
+    H5TBwrite_fields_index(file_id, TABLE_NAME, nfields, field_index_pre, start, nrecords, sizeof(float), 0,
+                           field_sizes_pre, pressure_in);
+
+    /* Write the new longitude and latitude information starting at record 2  */
+    nfields  = 2;
+    start    = 2;
+    nrecords = NRECORDS_ADD;
+    H5TBwrite_fields_index(file_id, TABLE_NAME, nfields, field_index_pos, start, nrecords, sizeof(Position),
+                           field_offset_pos, field_sizes_pos, position_in);
+
+    /* read the table */
+    H5TBread_table(file_id, TABLE_NAME, dst_size, dst_offset, dst_sizes, dst_buf);
+
+    /* print it by rows */
+    for (i = 0; i < NRECORDS; i++) {
+        printf("%-5s %-5d %-5d %-5f %-5f", dst_buf[i].name, dst_buf[i].lati, dst_buf[i].longi,
+               dst_buf[i].pressure, dst_buf[i].temperature);
+        printf("\n");
+    }
+
+    /* close type */
+    H5Tclose(string_type);
+
+    /* close the file */
+    H5Fclose(file_id);
+
+    return 0;
 }
-
diff --git a/hl/examples/ex_table_06.c b/hl/examples/ex_table_06.c
index 081347e..b53216f 100644
--- a/hl/examples/ex_table_06.c
+++ b/hl/examples/ex_table_06.c
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "hdf5.h"
@@ -25,73 +22,64 @@
  *-------------------------------------------------------------------------
  */
 
-#define NFIELDS  (hsize_t)  5
-#define NRECORDS (hsize_t)  8
+#define NFIELDS    (hsize_t)5
+#define NRECORDS   (hsize_t)8
 #define TABLE_NAME "table"
 
-int main( void )
+int
+main(void)
 {
- typedef struct Particle
- {
-  char   name[16];
-  int    lati;
-  int    longi;
-  float  pressure;
-  double temperature;
- } Particle;
-
- /* Calculate the size and the offsets of our struct members in memory */
- size_t dst_size =  sizeof( Particle );
- size_t dst_offset[NFIELDS] = { HOFFSET( Particle, name ),
-                                HOFFSET( Particle, lati ),
-                                HOFFSET( Particle, longi ),
-                                HOFFSET( Particle, pressure ),
-                                HOFFSET( Particle, temperature )};
-
-  /* Define field information */
-  const char *field_names[NFIELDS]  =
-  { "Name","Latitude", "Longitude", "Pressure", "Temperature" };
-  hid_t      field_type[NFIELDS];
-  hid_t      string_type;
-  hid_t      file_id;
-  hsize_t    chunk_size = 10;
-  Particle   fill_data[1] =
-  { {"no data",-1,-1, -99.0f, -99.0} };   /* Fill value particle */
-  int        compress  = 0;
-  hsize_t    nfields_out;
-  hsize_t    nrecords_out;
-
-  /* Initialize field_type */
-  string_type = H5Tcopy( H5T_C_S1 );
-  H5Tset_size( string_type, 16 );
-  field_type[0] = string_type;
-  field_type[1] = H5T_NATIVE_INT;
-  field_type[2] = H5T_NATIVE_INT;
-  field_type[3] = H5T_NATIVE_FLOAT;
-  field_type[4] = H5T_NATIVE_DOUBLE;
-
- /* Create a new file using default properties. */
- file_id = H5Fcreate( "ex_table_06.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
-
- /* Make a table */
- H5TBmake_table( "Table Title",file_id,TABLE_NAME,NFIELDS,NRECORDS,dst_size,
-                       field_names, dst_offset, field_type,
-                       chunk_size, fill_data, compress, NULL);
-
- /* Get table info  */
- H5TBget_table_info (file_id,TABLE_NAME, &nfields_out, &nrecords_out );
-
- /* print */
- printf ("Table has %d fields and %d records\n",(int)nfields_out,(int)nrecords_out);
-
-  /* close type */
- H5Tclose( string_type );
-
- /* close the file */
- H5Fclose( file_id );
-
- return 0;
-
-
+    typedef struct Particle {
+        char   name[16];
+        int    lati;
+        int    longi;
+        float  pressure;
+        double temperature;
+    } Particle;
+
+    /* Calculate the size and the offsets of our struct members in memory */
+    size_t dst_size            = sizeof(Particle);
+    size_t dst_offset[NFIELDS] = {HOFFSET(Particle, name), HOFFSET(Particle, lati), HOFFSET(Particle, longi),
+                                  HOFFSET(Particle, pressure), HOFFSET(Particle, temperature)};
+
+    /* Define field information */
+    const char *field_names[NFIELDS] = {"Name", "Latitude", "Longitude", "Pressure", "Temperature"};
+    hid_t       field_type[NFIELDS];
+    hid_t       string_type;
+    hid_t       file_id;
+    hsize_t     chunk_size   = 10;
+    Particle    fill_data[1] = {{"no data", -1, -1, -99.0F, -99.0}}; /* Fill value particle */
+    int         compress     = 0;
+    hsize_t     nfields_out;
+    hsize_t     nrecords_out;
+
+    /* Initialize field_type */
+    string_type = H5Tcopy(H5T_C_S1);
+    H5Tset_size(string_type, 16);
+    field_type[0] = string_type;
+    field_type[1] = H5T_NATIVE_INT;
+    field_type[2] = H5T_NATIVE_INT;
+    field_type[3] = H5T_NATIVE_FLOAT;
+    field_type[4] = H5T_NATIVE_DOUBLE;
+
+    /* Create a new file using default properties. */
+    file_id = H5Fcreate("ex_table_06.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+
+    /* Make a table */
+    H5TBmake_table("Table Title", file_id, TABLE_NAME, NFIELDS, NRECORDS, dst_size, field_names, dst_offset,
+                   field_type, chunk_size, fill_data, compress, NULL);
+
+    /* Get table info  */
+    H5TBget_table_info(file_id, TABLE_NAME, &nfields_out, &nrecords_out);
+
+    /* print */
+    printf("Table has %d fields and %d records\n", (int)nfields_out, (int)nrecords_out);
+
+    /* close type */
+    H5Tclose(string_type);
+
+    /* close the file */
+    H5Fclose(file_id);
+
+    return 0;
 }
-
diff --git a/hl/examples/ex_table_07.c b/hl/examples/ex_table_07.c
index 3be788f..e99d234 100644
--- a/hl/examples/ex_table_07.c
+++ b/hl/examples/ex_table_07.c
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "hdf5.h"
@@ -25,90 +22,77 @@
  *-------------------------------------------------------------------------
  */
 
-#define NFIELDS  (hsize_t)  5
-#define NRECORDS (hsize_t)  8
-#define TABLE_NAME          "table"
+#define NFIELDS    (hsize_t)5
+#define NRECORDS   (hsize_t)8
+#define TABLE_NAME "table"
 
-int main( void )
+int
+main(void)
 {
- typedef struct Particle
- {
-  char   name[16];
-  int    lati;
-  int    longi;
-  float  pressure;
-  double temperature;
- } Particle;
-
- /* Calculate the size and the offsets of our struct members in memory */
- size_t dst_size =  sizeof( Particle );
- size_t dst_offset[NFIELDS] = { HOFFSET( Particle, name ),
-                                HOFFSET( Particle, lati ),
-                                HOFFSET( Particle, longi ),
-                                HOFFSET( Particle, pressure ),
-                                HOFFSET( Particle, temperature )};
-
- /* Define an array of Particles */
- Particle  p_data[NRECORDS] = {
- {"zero",0,0, 0.0f, 0.0},
- {"one",10,10, 1.0f, 10.0},
- {"two",  20,20, 2.0f, 20.0},
- {"three",30,30, 3.0f, 30.0},
- {"four", 40,40, 4.0f, 40.0},
- {"five", 50,50, 5.0f, 50.0},
- {"six",  60,60, 6.0f, 60.0},
- {"seven",70,70, 7.0f, 70.0}
-  };
-
- const char *field_names[NFIELDS]  =     /* Define field information */
- { "Name","Latitude", "Longitude", "Pressure", "Temperature" };
- hid_t      field_type[NFIELDS];
- hid_t      string_type;
- hid_t      file_id;
- hsize_t    chunk_size = 10;
- int        compress  = 0;
- Particle   fill_data[1] =
- { {"no data",-1,-1, -99.0f, -99.0} };
- hsize_t    start;                      /* Record to start reading */
- hsize_t    nrecords;                   /* Number of records to insert/delete */
- hsize_t    nfields_out;
- hsize_t    nrecords_out;
-
- /* Initialize the field field_type */
- string_type = H5Tcopy( H5T_C_S1 );
- H5Tset_size( string_type, 16 );
- field_type[0] = string_type;
- field_type[1] = H5T_NATIVE_INT;
- field_type[2] = H5T_NATIVE_INT;
- field_type[3] = H5T_NATIVE_FLOAT;
- field_type[4] = H5T_NATIVE_DOUBLE;
-
- /* Create a new file using default properties. */
- file_id = H5Fcreate( "ex_table_07.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
-
- /* Make the table */
- H5TBmake_table( "Table Title",file_id,TABLE_NAME,NFIELDS,NRECORDS,
-  dst_size,field_names, dst_offset, field_type,
-  chunk_size, fill_data, compress, p_data  );
-
- /* Delete records  */
- start    = 3;
- nrecords = 3;
- H5TBdelete_record( file_id, TABLE_NAME, start, nrecords );
-
-  /* Get table info  */
- H5TBget_table_info (file_id,TABLE_NAME, &nfields_out, &nrecords_out );
-
- /* print */
- printf ("Table has %d fields and %d records\n",(int)nfields_out,(int)nrecords_out);
-
-  /* close type */
- H5Tclose( string_type );
-
- /* close the file */
- H5Fclose( file_id );
-
- return 0;
-
+    typedef struct Particle {
+        char   name[16];
+        int    lati;
+        int    longi;
+        float  pressure;
+        double temperature;
+    } Particle;
+
+    /* Calculate the size and the offsets of our struct members in memory */
+    size_t dst_size            = sizeof(Particle);
+    size_t dst_offset[NFIELDS] = {HOFFSET(Particle, name), HOFFSET(Particle, lati), HOFFSET(Particle, longi),
+                                  HOFFSET(Particle, pressure), HOFFSET(Particle, temperature)};
+
+    /* Define an array of Particles */
+    Particle p_data[NRECORDS] = {{"zero", 0, 0, 0.0F, 0.0},    {"one", 10, 10, 1.0F, 10.0},
+                                 {"two", 20, 20, 2.0F, 20.0},  {"three", 30, 30, 3.0F, 30.0},
+                                 {"four", 40, 40, 4.0F, 40.0}, {"five", 50, 50, 5.0F, 50.0},
+                                 {"six", 60, 60, 6.0F, 60.0},  {"seven", 70, 70, 7.0F, 70.0}};
+
+    const char *field_names[NFIELDS] = /* Define field information */
+        {"Name", "Latitude", "Longitude", "Pressure", "Temperature"};
+    hid_t    field_type[NFIELDS];
+    hid_t    string_type;
+    hid_t    file_id;
+    hsize_t  chunk_size   = 10;
+    int      compress     = 0;
+    Particle fill_data[1] = {{"no data", -1, -1, -99.0F, -99.0}};
+    hsize_t  start;    /* Record to start reading */
+    hsize_t  nrecords; /* Number of records to insert/delete */
+    hsize_t  nfields_out;
+    hsize_t  nrecords_out;
+
+    /* Initialize the field field_type */
+    string_type = H5Tcopy(H5T_C_S1);
+    H5Tset_size(string_type, 16);
+    field_type[0] = string_type;
+    field_type[1] = H5T_NATIVE_INT;
+    field_type[2] = H5T_NATIVE_INT;
+    field_type[3] = H5T_NATIVE_FLOAT;
+    field_type[4] = H5T_NATIVE_DOUBLE;
+
+    /* Create a new file using default properties. */
+    file_id = H5Fcreate("ex_table_07.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+
+    /* Make the table */
+    H5TBmake_table("Table Title", file_id, TABLE_NAME, NFIELDS, NRECORDS, dst_size, field_names, dst_offset,
+                   field_type, chunk_size, fill_data, compress, p_data);
+
+    /* Delete records  */
+    start    = 3;
+    nrecords = 3;
+    H5TBdelete_record(file_id, TABLE_NAME, start, nrecords);
+
+    /* Get table info  */
+    H5TBget_table_info(file_id, TABLE_NAME, &nfields_out, &nrecords_out);
+
+    /* print */
+    printf("Table has %d fields and %d records\n", (int)nfields_out, (int)nrecords_out);
+
+    /* close type */
+    H5Tclose(string_type);
+
+    /* close the file */
+    H5Fclose(file_id);
+
+    return 0;
 }
-
diff --git a/hl/examples/ex_table_08.c b/hl/examples/ex_table_08.c
index 5d3659f..3d67b16 100644
--- a/hl/examples/ex_table_08.c
+++ b/hl/examples/ex_table_08.c
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "hdf5_hl.h"
@@ -24,121 +21,96 @@
  *-------------------------------------------------------------------------
  */
 
-#define NFIELDS      (hsize_t)  5
-#define NRECORDS     (hsize_t)  8
-#define NRECORDS_INS (hsize_t)  2
-#define TABLE_NAME              "table"
+#define NFIELDS      (hsize_t)5
+#define NRECORDS     (hsize_t)8
+#define NRECORDS_INS (hsize_t)2
+#define TABLE_NAME   "table"
 
-int main( void )
+int
+main(void)
 {
- typedef struct Particle
- {
-  char   name[16];
-  int    lati;
-  int    longi;
-  float  pressure;
-  double temperature;
- } Particle;
-
- Particle  dst_buf[ NRECORDS + NRECORDS_INS ];
-
-  /* Define an array of Particles */
- Particle  p_data[NRECORDS] = {
- {"zero",0,0, 0.0f, 0.0},
- {"one",10,10, 1.0f, 10.0},
- {"two",  20,20, 2.0f, 20.0},
- {"three",30,30, 3.0f, 30.0},
- {"four", 40,40, 4.0f, 40.0},
- {"five", 50,50, 5.0f, 50.0},
- {"six",  60,60, 6.0f, 60.0},
- {"seven",70,70, 7.0f, 70.0}
-  };
-
- /* Calculate the size and the offsets of our struct members in memory */
- size_t dst_size =  sizeof( Particle );
- size_t dst_offset[NFIELDS] = { HOFFSET( Particle, name ),
-                                HOFFSET( Particle, lati ),
-                                HOFFSET( Particle, longi ),
-                                HOFFSET( Particle, pressure ),
-                                HOFFSET( Particle, temperature )};
- size_t dst_sizes[NFIELDS] = { sizeof( p_data[0].name),
-                               sizeof( p_data[0].lati),
-                               sizeof( p_data[0].longi),
-                               sizeof( p_data[0].pressure),
-                               sizeof( p_data[0].temperature)};
-
- /* Define an array of Particles to insert */
- Particle  p_data_insert[NRECORDS_INS] =
- { {"new",30,30, 3.0f, 30.0},
- {"new",40,40, 4.0f, 40.0}
- };
-
- /* Define field information */
- const char *field_names[NFIELDS]  =
- { "Name","Latitude", "Longitude", "Pressure", "Temperature" };
- hid_t      field_type[NFIELDS];
- hid_t      string_type;
- hid_t      file_id;
- hsize_t    chunk_size = 10;
- int        compress  = 0;
- int        *fill_data = NULL;
- hsize_t    start;      /* Record to start reading */
- hsize_t    nrecords;   /* Number of records to insert/delete */
- hsize_t    nfields_out;
- hsize_t    nrecords_out;
- int        i;
-
- /* Initialize the field field_type */
- string_type = H5Tcopy( H5T_C_S1 );
- H5Tset_size( string_type, 16 );
- field_type[0] = string_type;
- field_type[1] = H5T_NATIVE_INT;
- field_type[2] = H5T_NATIVE_INT;
- field_type[3] = H5T_NATIVE_FLOAT;
- field_type[4] = H5T_NATIVE_DOUBLE;
-
- /* Create a new file using default properties. */
- file_id = H5Fcreate( "ex_table_08.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
-
- /* Make the table */
- H5TBmake_table( "Table Title",file_id,TABLE_NAME,NFIELDS,NRECORDS,
-                         dst_size,field_names, dst_offset, field_type,
-                         chunk_size, fill_data, compress, p_data  );
-
- /* Insert records */
- start    = 3;
- nrecords = NRECORDS_INS;
- H5TBinsert_record( file_id, TABLE_NAME, start, nrecords, dst_size, dst_offset,
-  dst_sizes, p_data_insert );
-
- /* read the table */
- H5TBread_table( file_id, TABLE_NAME, dst_size, dst_offset, dst_sizes, dst_buf );
-
- /* get table info  */
- H5TBget_table_info(file_id,TABLE_NAME, &nfields_out, &nrecords_out );
-
- /* print */
- printf ("Table has %d fields and %d records\n",(int)nfields_out,(int)nrecords_out);
-
- /* print it by rows */
- for (i=0; i<nrecords_out; i++) {
-  printf ("%-5s %-5d %-5d %-5f %-5f",
-   dst_buf[i].name,
-   dst_buf[i].lati,
-   dst_buf[i].longi,
-   dst_buf[i].pressure,
-   dst_buf[i].temperature);
-  printf ("\n");
- }
-
-
-  /* close type */
- H5Tclose( string_type );
-
- /* close the file */
- H5Fclose( file_id );
-
- return 0;
-
+    typedef struct Particle {
+        char   name[16];
+        int    lati;
+        int    longi;
+        float  pressure;
+        double temperature;
+    } Particle;
+
+    Particle dst_buf[NRECORDS + NRECORDS_INS];
+
+    /* Define an array of Particles */
+    Particle p_data[NRECORDS] = {{"zero", 0, 0, 0.0F, 0.0},    {"one", 10, 10, 1.0F, 10.0},
+                                 {"two", 20, 20, 2.0F, 20.0},  {"three", 30, 30, 3.0F, 30.0},
+                                 {"four", 40, 40, 4.0F, 40.0}, {"five", 50, 50, 5.0F, 50.0},
+                                 {"six", 60, 60, 6.0F, 60.0},  {"seven", 70, 70, 7.0F, 70.0}};
+
+    /* Calculate the size and the offsets of our struct members in memory */
+    size_t dst_size            = sizeof(Particle);
+    size_t dst_offset[NFIELDS] = {HOFFSET(Particle, name), HOFFSET(Particle, lati), HOFFSET(Particle, longi),
+                                  HOFFSET(Particle, pressure), HOFFSET(Particle, temperature)};
+    size_t dst_sizes[NFIELDS]  = {sizeof(p_data[0].name), sizeof(p_data[0].lati), sizeof(p_data[0].longi),
+                                 sizeof(p_data[0].pressure), sizeof(p_data[0].temperature)};
+
+    /* Define an array of Particles to insert */
+    Particle p_data_insert[NRECORDS_INS] = {{"new", 30, 30, 3.0F, 30.0}, {"new", 40, 40, 4.0F, 40.0}};
+
+    /* Define field information */
+    const char *field_names[NFIELDS] = {"Name", "Latitude", "Longitude", "Pressure", "Temperature"};
+    hid_t       field_type[NFIELDS];
+    hid_t       string_type;
+    hid_t       file_id;
+    hsize_t     chunk_size = 10;
+    int         compress   = 0;
+    int        *fill_data  = NULL;
+    hsize_t     start;    /* Record to start reading */
+    hsize_t     nrecords; /* Number of records to insert/delete */
+    hsize_t     nfields_out;
+    hsize_t     nrecords_out;
+    int         i;
+
+    /* Initialize the field field_type */
+    string_type = H5Tcopy(H5T_C_S1);
+    H5Tset_size(string_type, 16);
+    field_type[0] = string_type;
+    field_type[1] = H5T_NATIVE_INT;
+    field_type[2] = H5T_NATIVE_INT;
+    field_type[3] = H5T_NATIVE_FLOAT;
+    field_type[4] = H5T_NATIVE_DOUBLE;
+
+    /* Create a new file using default properties. */
+    file_id = H5Fcreate("ex_table_08.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+
+    /* Make the table */
+    H5TBmake_table("Table Title", file_id, TABLE_NAME, NFIELDS, NRECORDS, dst_size, field_names, dst_offset,
+                   field_type, chunk_size, fill_data, compress, p_data);
+
+    /* Insert records */
+    start    = 3;
+    nrecords = NRECORDS_INS;
+    H5TBinsert_record(file_id, TABLE_NAME, start, nrecords, dst_size, dst_offset, dst_sizes, p_data_insert);
+
+    /* read the table */
+    H5TBread_table(file_id, TABLE_NAME, dst_size, dst_offset, dst_sizes, dst_buf);
+
+    /* get table info  */
+    H5TBget_table_info(file_id, TABLE_NAME, &nfields_out, &nrecords_out);
+
+    /* print */
+    printf("Table has %d fields and %d records\n", (int)nfields_out, (int)nrecords_out);
+
+    /* print it by rows */
+    for (i = 0; i < nrecords_out; i++) {
+        printf("%-5s %-5d %-5d %-5f %-5f", dst_buf[i].name, dst_buf[i].lati, dst_buf[i].longi,
+               dst_buf[i].pressure, dst_buf[i].temperature);
+        printf("\n");
+    }
+
+    /* close type */
+    H5Tclose(string_type);
+
+    /* close the file */
+    H5Fclose(file_id);
+
+    return 0;
 }
-
diff --git a/hl/examples/ex_table_09.c b/hl/examples/ex_table_09.c
index a4ef611..3704295 100644
--- a/hl/examples/ex_table_09.c
+++ b/hl/examples/ex_table_09.c
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "hdf5_hl.h"
@@ -24,121 +21,99 @@
  *-------------------------------------------------------------------------
  */
 
-#define NFIELDS      (hsize_t)  5
-#define NRECORDS     (hsize_t)  8
-#define NRECORDS_INS (hsize_t)  2
-#define TABLE1_NAME             "table1"
-#define TABLE2_NAME             "table2"
+#define NFIELDS      (hsize_t)5
+#define NRECORDS     (hsize_t)8
+#define NRECORDS_INS (hsize_t)2
+#define TABLE1_NAME  "table1"
+#define TABLE2_NAME  "table2"
 
-int main( void )
+int
+main(void)
 {
- typedef struct Particle
- {
-  char   name[16];
-  int    lati;
-  int    longi;
-  float  pressure;
-  double temperature;
- } Particle;
-
- Particle  dst_buf[ NRECORDS + NRECORDS_INS ];
-
- /* Calculate the size and the offsets of our struct members in memory */
- size_t dst_size =  sizeof( Particle );
- size_t dst_offset[NFIELDS] = { HOFFSET( Particle, name ),
-                                HOFFSET( Particle, lati ),
-                                HOFFSET( Particle, longi ),
-                                HOFFSET( Particle, pressure ),
-                                HOFFSET( Particle, temperature )};
- size_t dst_sizes[NFIELDS] = { sizeof( dst_buf[0].name),
-                               sizeof( dst_buf[0].lati),
-                               sizeof( dst_buf[0].longi),
-                               sizeof( dst_buf[0].pressure),
-                               sizeof( dst_buf[0].temperature)};
-
- /* Define an array of Particles */
- Particle  p_data[NRECORDS] = {
- {"zero",0,0, 0.0f, 0.0},
- {"one",10,10, 1.0f, 10.0},
- {"two",  20,20, 2.0f, 20.0},
- {"three",30,30, 3.0f, 30.0},
- {"four", 40,40, 4.0f, 40.0},
- {"five", 50,50, 5.0f, 50.0},
- {"six",  60,60, 6.0f, 60.0},
- {"seven",70,70, 7.0f, 70.0}
-  };
-
- /* Define field information */
- const char *field_names[NFIELDS]  =
- { "Name","Latitude", "Longitude", "Pressure", "Temperature" };
- hid_t      field_type[NFIELDS];
- hid_t      string_type;
- hid_t      file_id;
- hsize_t    chunk_size = 10;
- int        compress  = 0;
- Particle   fill_data[1] =
- { {"no data",-1,-1, -99.0f, -99.0} };   /* Fill value particle */
- hsize_t    start1;                      /* Record to start reading from 1st table */
- hsize_t    nrecords;                    /* Number of records to insert */
- hsize_t    start2;                      /* Record to start writing in 2nd table */
- int        i;
- hsize_t    nfields_out;
- hsize_t    nrecords_out;
-
- /* Initialize the field field_type */
- string_type = H5Tcopy( H5T_C_S1 );
- H5Tset_size( string_type, 16 );
- field_type[0] = string_type;
- field_type[1] = H5T_NATIVE_INT;
- field_type[2] = H5T_NATIVE_INT;
- field_type[3] = H5T_NATIVE_FLOAT;
- field_type[4] = H5T_NATIVE_DOUBLE;
-
- /* Create a new file using default properties. */
- file_id = H5Fcreate( "ex_table_09.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
-
- /* Make 2 tables: TABLE2_NAME is empty  */
- H5TBmake_table( "Table Title",file_id,TABLE1_NAME,NFIELDS,NRECORDS,
-                         dst_size,field_names, dst_offset, field_type,
-                         chunk_size, fill_data, compress, p_data  );
-
- H5TBmake_table( "Table Title",file_id,TABLE2_NAME,NFIELDS,NRECORDS,
-                         dst_size,field_names, dst_offset, field_type,
-                         chunk_size, fill_data, compress, NULL  );
-
-
- /* Add 2 records from TABLE1_NAME to TABLE2_NAME  */
- start1    = 3;
- nrecords  = NRECORDS_INS;
- start2    = 6;
- H5TBadd_records_from( file_id, TABLE1_NAME, start1, nrecords, TABLE2_NAME, start2 );
-
- /* read TABLE2_NAME: it should have 2 more records now */
- H5TBread_table( file_id, TABLE2_NAME, dst_size, dst_offset, dst_sizes, dst_buf );
-
- /* Get table info  */
- H5TBget_table_info (file_id,TABLE2_NAME, &nfields_out, &nrecords_out );
-
- /* print */
- printf ("Table has %d fields and %d records\n",(int)nfields_out,(int)nrecords_out);
-
- /* print it by rows */
- for (i=0; i<nrecords_out; i++) {
-  printf ("%-5s %-5d %-5d %-5f %-5f",
-   dst_buf[i].name,
-   dst_buf[i].lati,
-   dst_buf[i].longi,
-   dst_buf[i].pressure,
-   dst_buf[i].temperature);
-  printf ("\n");
- }
-
-  /* close type */
- H5Tclose( string_type );
-
- /* close the file */
- H5Fclose( file_id );
-
- return 0;
+    typedef struct Particle {
+        char   name[16];
+        int    lati;
+        int    longi;
+        float  pressure;
+        double temperature;
+    } Particle;
+
+    Particle dst_buf[NRECORDS + NRECORDS_INS];
+
+    /* Calculate the size and the offsets of our struct members in memory */
+    size_t dst_size            = sizeof(Particle);
+    size_t dst_offset[NFIELDS] = {HOFFSET(Particle, name), HOFFSET(Particle, lati), HOFFSET(Particle, longi),
+                                  HOFFSET(Particle, pressure), HOFFSET(Particle, temperature)};
+    size_t dst_sizes[NFIELDS]  = {sizeof(dst_buf[0].name), sizeof(dst_buf[0].lati), sizeof(dst_buf[0].longi),
+                                 sizeof(dst_buf[0].pressure), sizeof(dst_buf[0].temperature)};
+
+    /* Define an array of Particles */
+    Particle p_data[NRECORDS] = {{"zero", 0, 0, 0.0F, 0.0},    {"one", 10, 10, 1.0F, 10.0},
+                                 {"two", 20, 20, 2.0F, 20.0},  {"three", 30, 30, 3.0F, 30.0},
+                                 {"four", 40, 40, 4.0F, 40.0}, {"five", 50, 50, 5.0F, 50.0},
+                                 {"six", 60, 60, 6.0F, 60.0},  {"seven", 70, 70, 7.0F, 70.0}};
+
+    /* Define field information */
+    const char *field_names[NFIELDS] = {"Name", "Latitude", "Longitude", "Pressure", "Temperature"};
+    hid_t       field_type[NFIELDS];
+    hid_t       string_type;
+    hid_t       file_id;
+    hsize_t     chunk_size   = 10;
+    int         compress     = 0;
+    Particle    fill_data[1] = {{"no data", -1, -1, -99.0F, -99.0}}; /* Fill value particle */
+    hsize_t     start1;   /* Record to start reading from 1st table */
+    hsize_t     nrecords; /* Number of records to insert */
+    hsize_t     start2;   /* Record to start writing in 2nd table */
+    int         i;
+    hsize_t     nfields_out;
+    hsize_t     nrecords_out;
+
+    /* Initialize the field field_type */
+    string_type = H5Tcopy(H5T_C_S1);
+    H5Tset_size(string_type, 16);
+    field_type[0] = string_type;
+    field_type[1] = H5T_NATIVE_INT;
+    field_type[2] = H5T_NATIVE_INT;
+    field_type[3] = H5T_NATIVE_FLOAT;
+    field_type[4] = H5T_NATIVE_DOUBLE;
+
+    /* Create a new file using default properties. */
+    file_id = H5Fcreate("ex_table_09.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+
+    /* Make 2 tables: TABLE2_NAME is empty  */
+    H5TBmake_table("Table Title", file_id, TABLE1_NAME, NFIELDS, NRECORDS, dst_size, field_names, dst_offset,
+                   field_type, chunk_size, fill_data, compress, p_data);
+
+    H5TBmake_table("Table Title", file_id, TABLE2_NAME, NFIELDS, NRECORDS, dst_size, field_names, dst_offset,
+                   field_type, chunk_size, fill_data, compress, NULL);
+
+    /* Add 2 records from TABLE1_NAME to TABLE2_NAME  */
+    start1   = 3;
+    nrecords = NRECORDS_INS;
+    start2   = 6;
+    H5TBadd_records_from(file_id, TABLE1_NAME, start1, nrecords, TABLE2_NAME, start2);
+
+    /* read TABLE2_NAME: it should have 2 more records now */
+    H5TBread_table(file_id, TABLE2_NAME, dst_size, dst_offset, dst_sizes, dst_buf);
+
+    /* Get table info  */
+    H5TBget_table_info(file_id, TABLE2_NAME, &nfields_out, &nrecords_out);
+
+    /* print */
+    printf("Table has %d fields and %d records\n", (int)nfields_out, (int)nrecords_out);
+
+    /* print it by rows */
+    for (i = 0; i < nrecords_out; i++) {
+        printf("%-5s %-5d %-5d %-5f %-5f", dst_buf[i].name, dst_buf[i].lati, dst_buf[i].longi,
+               dst_buf[i].pressure, dst_buf[i].temperature);
+        printf("\n");
+    }
+
+    /* close type */
+    H5Tclose(string_type);
+
+    /* close the file */
+    H5Fclose(file_id);
+
+    return 0;
 }
-
diff --git a/hl/examples/ex_table_10.c b/hl/examples/ex_table_10.c
index 059c7ea..ad3f2e1 100644
--- a/hl/examples/ex_table_10.c
+++ b/hl/examples/ex_table_10.c
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "hdf5_hl.h"
@@ -24,114 +21,92 @@
  *-------------------------------------------------------------------------
  */
 
-#define NFIELDS  (hsize_t)  5
-#define NRECORDS (hsize_t)  8
-#define TABLE1_NAME         "table1"
-#define TABLE2_NAME         "table2"
-#define TABLE3_NAME         "table3"
+#define NFIELDS     (hsize_t)5
+#define NRECORDS    (hsize_t)8
+#define TABLE1_NAME "table1"
+#define TABLE2_NAME "table2"
+#define TABLE3_NAME "table3"
 
-int main( void )
+int
+main(void)
 {
- typedef struct Particle
- {
-  char   name[16];
-  int    lati;
-  int    longi;
-  float  pressure;
-  double temperature;
- } Particle;
-
- /* Define an array of Particles */
- Particle  p_data[NRECORDS] = {
- {"zero",0,0, 0.0f, 0.0},
- {"one",10,10, 1.0f, 10.0},
- {"two",  20,20, 2.0f, 20.0},
- {"three",30,30, 3.0f, 30.0},
- {"four", 40,40, 4.0f, 40.0},
- {"five", 50,50, 5.0f, 50.0},
- {"six",  60,60, 6.0f, 60.0},
- {"seven",70,70, 7.0f, 70.0}
-  };
-
- Particle  dst_buf[ 2 * NRECORDS ];
- /* Calculate the size and the offsets of our struct members in memory */
- size_t dst_size =  sizeof( Particle );
- size_t dst_offset[NFIELDS] = { HOFFSET( Particle, name ),
-                                HOFFSET( Particle, lati ),
-                                HOFFSET( Particle, longi ),
-                                HOFFSET( Particle, pressure ),
-                                HOFFSET( Particle, temperature )};
- size_t dst_sizes[NFIELDS] = { sizeof( dst_buf[0].name),
-                               sizeof( dst_buf[0].lati),
-                               sizeof( dst_buf[0].longi),
-                               sizeof( dst_buf[0].pressure),
-                               sizeof( dst_buf[0].temperature)};
-
-
- /* Define field information */
- const char *field_names[NFIELDS]  =
- { "Name","Latitude", "Longitude", "Pressure", "Temperature" };
- hid_t      field_type[NFIELDS];
- hid_t      string_type;
- hid_t      file_id;
- hsize_t    chunk_size = 10;
- int        compress  = 0;
- int        *fill_data = NULL;
- hsize_t    nfields_out;
- hsize_t    nrecords_out;
- int        i;
-
- /* Initialize the field field_type */
- string_type = H5Tcopy( H5T_C_S1 );
- H5Tset_size( string_type, 16 );
- field_type[0] = string_type;
- field_type[1] = H5T_NATIVE_INT;
- field_type[2] = H5T_NATIVE_INT;
- field_type[3] = H5T_NATIVE_FLOAT;
- field_type[4] = H5T_NATIVE_DOUBLE;
-
- /* Create a new file using default properties. */
- file_id = H5Fcreate( "ex_table_10.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
-
- /* Make two tables */
- H5TBmake_table( "Table Title",file_id,TABLE1_NAME,NFIELDS,NRECORDS,
-                         dst_size,field_names, dst_offset, field_type,
-                         chunk_size, fill_data, compress, p_data  );
-
- H5TBmake_table( "Table Title",file_id,TABLE2_NAME,NFIELDS,NRECORDS,
-                         dst_size,field_names, dst_offset, field_type,
-                         chunk_size, fill_data, compress, p_data  );
-
- /* Combine the two tables into a third in the same file  */
- H5TBcombine_tables( file_id, TABLE1_NAME, file_id, TABLE2_NAME, TABLE3_NAME );
-
- /* read the combined table */
- H5TBread_table( file_id, TABLE3_NAME, dst_size, dst_offset, dst_sizes, dst_buf );
-
- /* Get table info  */
- H5TBget_table_info (file_id,TABLE3_NAME, &nfields_out, &nrecords_out );
-
- /* print */
- printf ("Table has %d fields and %d records\n",(int)nfields_out,(int)nrecords_out);
-
- /* print it by rows */
- for (i=0; i<nrecords_out; i++) {
-  printf ("%-5s %-5d %-5d %-5f %-5f",
-   dst_buf[i].name,
-   dst_buf[i].lati,
-   dst_buf[i].longi,
-   dst_buf[i].pressure,
-   dst_buf[i].temperature);
-  printf ("\n");
- }
-
-  /* close type */
- H5Tclose( string_type );
-
- /* close the file */
- H5Fclose( file_id );
-
- return 0;
-
+    typedef struct Particle {
+        char   name[16];
+        int    lati;
+        int    longi;
+        float  pressure;
+        double temperature;
+    } Particle;
+
+    /* Define an array of Particles */
+    Particle p_data[NRECORDS] = {{"zero", 0, 0, 0.0F, 0.0},    {"one", 10, 10, 1.0F, 10.0},
+                                 {"two", 20, 20, 2.0F, 20.0},  {"three", 30, 30, 3.0F, 30.0},
+                                 {"four", 40, 40, 4.0F, 40.0}, {"five", 50, 50, 5.0F, 50.0},
+                                 {"six", 60, 60, 6.0F, 60.0},  {"seven", 70, 70, 7.0F, 70.0}};
+
+    Particle dst_buf[2 * NRECORDS];
+    /* Calculate the size and the offsets of our struct members in memory */
+    size_t dst_size            = sizeof(Particle);
+    size_t dst_offset[NFIELDS] = {HOFFSET(Particle, name), HOFFSET(Particle, lati), HOFFSET(Particle, longi),
+                                  HOFFSET(Particle, pressure), HOFFSET(Particle, temperature)};
+    size_t dst_sizes[NFIELDS]  = {sizeof(dst_buf[0].name), sizeof(dst_buf[0].lati), sizeof(dst_buf[0].longi),
+                                 sizeof(dst_buf[0].pressure), sizeof(dst_buf[0].temperature)};
+
+    /* Define field information */
+    const char *field_names[NFIELDS] = {"Name", "Latitude", "Longitude", "Pressure", "Temperature"};
+    hid_t       field_type[NFIELDS];
+    hid_t       string_type;
+    hid_t       file_id;
+    hsize_t     chunk_size = 10;
+    int         compress   = 0;
+    int        *fill_data  = NULL;
+    hsize_t     nfields_out;
+    hsize_t     nrecords_out;
+    int         i;
+
+    /* Initialize the field field_type */
+    string_type = H5Tcopy(H5T_C_S1);
+    H5Tset_size(string_type, 16);
+    field_type[0] = string_type;
+    field_type[1] = H5T_NATIVE_INT;
+    field_type[2] = H5T_NATIVE_INT;
+    field_type[3] = H5T_NATIVE_FLOAT;
+    field_type[4] = H5T_NATIVE_DOUBLE;
+
+    /* Create a new file using default properties. */
+    file_id = H5Fcreate("ex_table_10.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+
+    /* Make two tables */
+    H5TBmake_table("Table Title", file_id, TABLE1_NAME, NFIELDS, NRECORDS, dst_size, field_names, dst_offset,
+                   field_type, chunk_size, fill_data, compress, p_data);
+
+    H5TBmake_table("Table Title", file_id, TABLE2_NAME, NFIELDS, NRECORDS, dst_size, field_names, dst_offset,
+                   field_type, chunk_size, fill_data, compress, p_data);
+
+    /* Combine the two tables into a third in the same file  */
+    H5TBcombine_tables(file_id, TABLE1_NAME, file_id, TABLE2_NAME, TABLE3_NAME);
+
+    /* read the combined table */
+    H5TBread_table(file_id, TABLE3_NAME, dst_size, dst_offset, dst_sizes, dst_buf);
+
+    /* Get table info  */
+    H5TBget_table_info(file_id, TABLE3_NAME, &nfields_out, &nrecords_out);
+
+    /* print */
+    printf("Table has %d fields and %d records\n", (int)nfields_out, (int)nrecords_out);
+
+    /* print it by rows */
+    for (i = 0; i < nrecords_out; i++) {
+        printf("%-5s %-5d %-5d %-5f %-5f", dst_buf[i].name, dst_buf[i].lati, dst_buf[i].longi,
+               dst_buf[i].pressure, dst_buf[i].temperature);
+        printf("\n");
+    }
+
+    /* close type */
+    H5Tclose(string_type);
+
+    /* close the file */
+    H5Fclose(file_id);
+
+    return 0;
 }
-
diff --git a/hl/examples/ex_table_11.c b/hl/examples/ex_table_11.c
index 687568c..725c26c 100644
--- a/hl/examples/ex_table_11.c
+++ b/hl/examples/ex_table_11.c
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "hdf5_hl.h"
@@ -24,95 +21,81 @@
  *-------------------------------------------------------------------------
  */
 
-#define NFIELDS  (hsize_t)  5
-#define NRECORDS (hsize_t)  8
-#define TABLE_NAME          "table"
+#define NFIELDS    (hsize_t)5
+#define NRECORDS   (hsize_t)8
+#define TABLE_NAME "table"
 
-int main( void )
+int
+main(void)
 {
- typedef struct Particle1
- {
-  char   name[16];
-  int    lati;
-  int    longi;
-  float  pressure;
-  double temperature;
- } Particle1;
-
-/* Define an array of Particles */
- Particle1  p_data[NRECORDS] = {
- {"zero",0,0, 0.0f, 0.0},
- {"one",10,10, 1.0f, 10.0},
- {"two",  20,20, 2.0f, 20.0},
- {"three",30,30, 3.0f, 30.0},
- {"four", 40,40, 4.0f, 40.0},
- {"five", 50,50, 5.0f, 50.0},
- {"six",  60,60, 6.0f, 60.0},
- {"seven",70,70, 7.0f, 70.0}
-  };
-
- /* Calculate the size and the offsets of our struct members in memory */
- size_t dst_size1 =  sizeof( Particle1 );
- size_t dst_offset1[NFIELDS] = { HOFFSET( Particle1, name ),
-  HOFFSET( Particle1, lati ),
-  HOFFSET( Particle1, longi ),
-  HOFFSET( Particle1, pressure ),
-  HOFFSET( Particle1, temperature )};
-
- /* Define field information */
- const char *field_names[NFIELDS]  =
- { "Name","Latitude", "Longitude", "Pressure", "Temperature" };
- hid_t      field_type[NFIELDS];
- hid_t      string_type;
- hid_t      file_id;
- hsize_t    chunk_size = 10;
- int        compress  = 0;
- Particle1  fill_data[1] = { {"no data",-1,-1, -99.0f, -99.0} };
- int        fill_data_new[1] = { -100 };
- hsize_t    position;
- hsize_t    nfields_out;
- hsize_t    nrecords_out;
-
- /* Define the inserted field information */
- hid_t      field_type_new = H5T_NATIVE_INT;
- int        data[NRECORDS] = { 0,1,2,3,4,5,6,7 };
-
- /* Initialize the field type */
- string_type = H5Tcopy( H5T_C_S1 );
- H5Tset_size( string_type, 16 );
- field_type[0] = string_type;
- field_type[1] = H5T_NATIVE_INT;
- field_type[2] = H5T_NATIVE_INT;
- field_type[3] = H5T_NATIVE_FLOAT;
- field_type[4] = H5T_NATIVE_DOUBLE;
-
- /* Create a new file using default properties. */
- file_id = H5Fcreate( "ex_table_11.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
-
- /* Make the table */
- H5TBmake_table( "Table Title",file_id,TABLE_NAME,NFIELDS,NRECORDS,
-                         dst_size1,field_names, dst_offset1, field_type,
-                         chunk_size, fill_data, compress, p_data  );
-
- /* Insert the new field at the end of the field list */
- position = NFIELDS;
- H5TBinsert_field( file_id, TABLE_NAME, "New Field", field_type_new, position,
-  fill_data_new, data );
-
- /* Get table info  */
- H5TBget_table_info (file_id,TABLE_NAME, &nfields_out, &nrecords_out );
-
- /* print */
- printf ("Table has %d fields and %d records\n",(int)nfields_out,(int)nrecords_out);
-
-  /* close type */
- H5Tclose( string_type );
-
- /* close the file */
- H5Fclose( file_id );
-
- return 0;
-
-
+    typedef struct Particle1 {
+        char   name[16];
+        int    lati;
+        int    longi;
+        float  pressure;
+        double temperature;
+    } Particle1;
+
+    /* Define an array of Particles */
+    Particle1 p_data[NRECORDS] = {{"zero", 0, 0, 0.0F, 0.0},    {"one", 10, 10, 1.0F, 10.0},
+                                  {"two", 20, 20, 2.0F, 20.0},  {"three", 30, 30, 3.0F, 30.0},
+                                  {"four", 40, 40, 4.0F, 40.0}, {"five", 50, 50, 5.0F, 50.0},
+                                  {"six", 60, 60, 6.0F, 60.0},  {"seven", 70, 70, 7.0F, 70.0}};
+
+    /* Calculate the size and the offsets of our struct members in memory */
+    size_t dst_size1            = sizeof(Particle1);
+    size_t dst_offset1[NFIELDS] = {HOFFSET(Particle1, name), HOFFSET(Particle1, lati),
+                                   HOFFSET(Particle1, longi), HOFFSET(Particle1, pressure),
+                                   HOFFSET(Particle1, temperature)};
+
+    /* Define field information */
+    const char *field_names[NFIELDS] = {"Name", "Latitude", "Longitude", "Pressure", "Temperature"};
+    hid_t       field_type[NFIELDS];
+    hid_t       string_type;
+    hid_t       file_id;
+    hsize_t     chunk_size       = 10;
+    int         compress         = 0;
+    Particle1   fill_data[1]     = {{"no data", -1, -1, -99.0F, -99.0}};
+    int         fill_data_new[1] = {-100};
+    hsize_t     position;
+    hsize_t     nfields_out;
+    hsize_t     nrecords_out;
+
+    /* Define the inserted field information */
+    hid_t field_type_new = H5T_NATIVE_INT;
+    int   data[NRECORDS] = {0, 1, 2, 3, 4, 5, 6, 7};
+
+    /* Initialize the field type */
+    string_type = H5Tcopy(H5T_C_S1);
+    H5Tset_size(string_type, 16);
+    field_type[0] = string_type;
+    field_type[1] = H5T_NATIVE_INT;
+    field_type[2] = H5T_NATIVE_INT;
+    field_type[3] = H5T_NATIVE_FLOAT;
+    field_type[4] = H5T_NATIVE_DOUBLE;
+
+    /* Create a new file using default properties. */
+    file_id = H5Fcreate("ex_table_11.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+
+    /* Make the table */
+    H5TBmake_table("Table Title", file_id, TABLE_NAME, NFIELDS, NRECORDS, dst_size1, field_names, dst_offset1,
+                   field_type, chunk_size, fill_data, compress, p_data);
+
+    /* Insert the new field at the end of the field list */
+    position = NFIELDS;
+    H5TBinsert_field(file_id, TABLE_NAME, "New Field", field_type_new, position, fill_data_new, data);
+
+    /* Get table info  */
+    H5TBget_table_info(file_id, TABLE_NAME, &nfields_out, &nrecords_out);
+
+    /* print */
+    printf("Table has %d fields and %d records\n", (int)nfields_out, (int)nrecords_out);
+
+    /* close type */
+    H5Tclose(string_type);
+
+    /* close the file */
+    H5Fclose(file_id);
+
+    return 0;
 }
-
diff --git a/hl/examples/ex_table_12.c b/hl/examples/ex_table_12.c
index 125b8be..35175d0 100644
--- a/hl/examples/ex_table_12.c
+++ b/hl/examples/ex_table_12.c
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "hdf5.h"
@@ -25,87 +22,73 @@
  *-------------------------------------------------------------------------
  */
 
-#define NFIELDS  (hsize_t)  5
-#define NRECORDS (hsize_t)  8
-#define TABLE_NAME          "table"
+#define NFIELDS    (hsize_t)5
+#define NRECORDS   (hsize_t)8
+#define TABLE_NAME "table"
 
-int main( void )
+int
+main(void)
 {
- typedef struct Particle
- {
-  char   name[16];
-  int    lati;
-  int    longi;
-  float  pressure;
-  double temperature;
- } Particle;
-
- /* Calculate the size and the offsets of our struct members in memory */
- size_t dst_size =  sizeof( Particle );
- size_t dst_offset[NFIELDS] = { HOFFSET( Particle, name ),
-  HOFFSET( Particle, lati ),
-  HOFFSET( Particle, longi ),
-  HOFFSET( Particle, pressure ),
-  HOFFSET( Particle, temperature )};
-
- /* Define an array of Particles */
- Particle  p_data[NRECORDS] = {
- {"zero",0,0, 0.0f, 0.0},
- {"one",10,10, 1.0f, 10.0},
- {"two",  20,20, 2.0f, 20.0},
- {"three",30,30, 3.0f, 30.0},
- {"four", 40,40, 4.0f, 40.0},
- {"five", 50,50, 5.0f, 50.0},
- {"six",  60,60, 6.0f, 60.0},
- {"seven",70,70, 7.0f, 70.0}
- };
-
- /* Define field information */
- const char *field_names[NFIELDS]  =
- { "Name","Latitude", "Longitude", "Pressure", "Temperature" };
- hid_t      field_type[NFIELDS];
- hid_t      string_type;
- hid_t      file_id;
- hsize_t    chunk_size = 10;
- int        compress  = 0;
- Particle   fill_data[1] =
- { {"no data",-1,-1, -99.0f, -99.0} };
- hsize_t    nfields_out;
- hsize_t    nrecords_out;
-
- /* Initialize the field type */
- string_type = H5Tcopy( H5T_C_S1 );
- H5Tset_size( string_type, 16 );
- field_type[0] = string_type;
- field_type[1] = H5T_NATIVE_INT;
- field_type[2] = H5T_NATIVE_INT;
- field_type[3] = H5T_NATIVE_FLOAT;
- field_type[4] = H5T_NATIVE_DOUBLE;
-
- /* Create a new file using default properties. */
- file_id = H5Fcreate( "ex_table_12.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
-
- /* Make a table */
- H5TBmake_table( "Table Title", file_id, TABLE_NAME, NFIELDS, NRECORDS, dst_size,
-  field_names, dst_offset, field_type,
-  chunk_size, fill_data, compress, p_data  );
-
- /* Delete the field */
- H5TBdelete_field( file_id, TABLE_NAME, "Pressure" );
-
- /* Get table info  */
- H5TBget_table_info (file_id,TABLE_NAME, &nfields_out, &nrecords_out );
-
- /* print */
- printf ("Table has %d fields and %d records\n",(int)nfields_out,(int)nrecords_out);
-
-  /* close type */
- H5Tclose( string_type );
-
- /* close the file */
- H5Fclose( file_id );
-
- return 0;
-
+    typedef struct Particle {
+        char   name[16];
+        int    lati;
+        int    longi;
+        float  pressure;
+        double temperature;
+    } Particle;
+
+    /* Calculate the size and the offsets of our struct members in memory */
+    size_t dst_size            = sizeof(Particle);
+    size_t dst_offset[NFIELDS] = {HOFFSET(Particle, name), HOFFSET(Particle, lati), HOFFSET(Particle, longi),
+                                  HOFFSET(Particle, pressure), HOFFSET(Particle, temperature)};
+
+    /* Define an array of Particles */
+    Particle p_data[NRECORDS] = {{"zero", 0, 0, 0.0F, 0.0},    {"one", 10, 10, 1.0F, 10.0},
+                                 {"two", 20, 20, 2.0F, 20.0},  {"three", 30, 30, 3.0F, 30.0},
+                                 {"four", 40, 40, 4.0F, 40.0}, {"five", 50, 50, 5.0F, 50.0},
+                                 {"six", 60, 60, 6.0F, 60.0},  {"seven", 70, 70, 7.0F, 70.0}};
+
+    /* Define field information */
+    const char *field_names[NFIELDS] = {"Name", "Latitude", "Longitude", "Pressure", "Temperature"};
+    hid_t       field_type[NFIELDS];
+    hid_t       string_type;
+    hid_t       file_id;
+    hsize_t     chunk_size   = 10;
+    int         compress     = 0;
+    Particle    fill_data[1] = {{"no data", -1, -1, -99.0F, -99.0}};
+    hsize_t     nfields_out;
+    hsize_t     nrecords_out;
+
+    /* Initialize the field type */
+    string_type = H5Tcopy(H5T_C_S1);
+    H5Tset_size(string_type, 16);
+    field_type[0] = string_type;
+    field_type[1] = H5T_NATIVE_INT;
+    field_type[2] = H5T_NATIVE_INT;
+    field_type[3] = H5T_NATIVE_FLOAT;
+    field_type[4] = H5T_NATIVE_DOUBLE;
+
+    /* Create a new file using default properties. */
+    file_id = H5Fcreate("ex_table_12.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+
+    /* Make a table */
+    H5TBmake_table("Table Title", file_id, TABLE_NAME, NFIELDS, NRECORDS, dst_size, field_names, dst_offset,
+                   field_type, chunk_size, fill_data, compress, p_data);
+
+    /* Delete the field */
+    H5TBdelete_field(file_id, TABLE_NAME, "Pressure");
+
+    /* Get table info  */
+    H5TBget_table_info(file_id, TABLE_NAME, &nfields_out, &nrecords_out);
+
+    /* print */
+    printf("Table has %d fields and %d records\n", (int)nfields_out, (int)nrecords_out);
+
+    /* close type */
+    H5Tclose(string_type);
+
+    /* close the file */
+    H5Fclose(file_id);
+
+    return 0;
 }
-
diff --git a/hl/examples/pal_rgb.h b/hl/examples/pal_rgb.h
index 606137e..8409f7e 100644
--- a/hl/examples/pal_rgb.h
+++ b/hl/examples/pal_rgb.h
@@ -1,279 +1,272 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-const unsigned char pal_rgb[256*3] = {255,255,255,
-0,0,131,
-0,0,135,
-0,0,139,
-0,0,143,
-0,0,147,
-0,0,151,
-0,0,155,
-0,0,159,
-0,0,163,
-0,0,167,
-0,0,171,
-0,0,175,
-0,0,179,
-0,0,183,
-0,0,187,
-0,0,191,
-0,0,195,
-0,0,199,
-0,0,203,
-0,0,207,
-0,0,211,
-0,0,215,
-0,0,219,
-0,0,223,
-0,0,227,
-0,0,231,
-0,0,235,
-0,0,239,
-0,0,243,
-0,0,247,
-0,0,251,
-0,0,255,
-0,0,255,
-0,3,255,
-0,7,255,
-0,11,255,
-0,15,255,
-0,19,255,
-0,23,255,
-0,27,255,
-0,31,255,
-0,35,255,
-0,39,255,
-0,43,255,
-0,47,255,
-0,51,255,
-0,55,255,
-0,59,255,
-0,63,255,
-0,67,255,
-0,71,255,
-0,75,255,
-0,79,255,
-0,83,255,
-0,87,255,
-0,91,255,
-0,95,255,
-0,99,255,
-0,103,255,
-0,107,255,
-0,111,255,
-0,115,255,
-0,119,255,
-0,123,255,
-0,127,255,
-0,131,255,
-0,135,255,
-0,139,255,
-0,143,255,
-0,147,255,
-0,151,255,
-0,155,255,
-0,159,255,
-0,163,255,
-0,167,255,
-0,171,255,
-0,175,255,
-0,179,255,
-0,183,255,
-0,187,255,
-0,191,255,
-0,195,255,
-0,199,255,
-0,203,255,
-0,207,255,
-0,211,255,
-0,215,255,
-0,219,255,
-0,223,255,
-0,227,255,
-0,231,255,
-0,235,255,
-0,239,255,
-0,243,255,
-0,247,255,
-0,251,255,
-0,255,255,
-0,255,255,
-3,255,251,
-7,255,247,
-11,255,243,
-15,255,239,
-19,255,235,
-23,255,231,
-27,255,227,
-31,255,223,
-35,255,219,
-39,255,215,
-43,255,211,
-47,255,207,
-51,255,203,
-55,255,199,
-59,255,195,
-63,255,191,
-67,255,187,
-71,255,183,
-75,255,179,
-79,255,175,
-83,255,171,
-87,255,167,
-91,255,163,
-95,255,159,
-99,255,155,
-103,255,151,
-107,255,147,
-111,255,143,
-115,255,139,
-119,255,135,
-123,255,131,
-127,255,127,
-131,255,123,
-135,255,119,
-139,255,115,
-143,255,111,
-147,255,107,
-151,255,103,
-155,255,99,
-159,255,95,
-163,255,91,
-167,255,87,
-171,255,83,
-175,255,79,
-179,255,75,
-183,255,71,
-187,255,67,
-191,255,63,
-195,255,59,
-199,255,55,
-203,255,51,
-207,255,47,
-211,255,43,
-215,255,39,
-219,255,35,
-223,255,31,
-227,255,27,
-231,255,23,
-235,255,19,
-239,255,15,
-243,255,11,
-247,255,7,
-251,255,3,
-255,255,0,
-255,251,0,
-255,247,0,
-255,243,0,
-255,239,0,
-255,235,0,
-255,231,0,
-255,227,0,
-255,223,0,
-255,219,0,
-255,215,0,
-255,211,0,
-255,207,0,
-255,203,0,
-255,199,0,
-255,195,0,
-255,191,0,
-255,187,0,
-255,183,0,
-255,179,0,
-255,175,0,
-255,171,0,
-255,167,0,
-255,163,0,
-255,159,0,
-255,155,0,
-255,151,0,
-255,147,0,
-255,143,0,
-255,139,0,
-255,135,0,
-255,131,0,
-255,127,0,
-255,123,0,
-255,119,0,
-255,115,0,
-255,111,0,
-255,107,0,
-255,103,0,
-255,99,0,
-255,95,0,
-255,91,0,
-255,87,0,
-255,83,0,
-255,79,0,
-255,75,0,
-255,71,0,
-255,67,0,
-255,63,0,
-255,59,0,
-255,55,0,
-255,51,0,
-255,47,0,
-255,43,0,
-255,39,0,
-255,35,0,
-255,31,0,
-255,27,0,
-255,23,0,
-255,19,0,
-255,15,0,
-255,11,0,
-255,7,0,
-255,3,0,
-255,0,0,
-250,0,0,
-246,0,0,
-241,0,0,
-237,0,0,
-233,0,0,
-228,0,0,
-224,0,0,
-219,0,0,
-215,0,0,
-211,0,0,
-206,0,0,
-202,0,0,
-197,0,0,
-193,0,0,
-189,0,0,
-184,0,0,
-180,0,0,
-175,0,0,
-171,0,0,
-167,0,0,
-162,0,0,
-158,0,0,
-153,0,0,
-149,0,0,
-145,0,0,
-140,0,0,
-136,0,0,
-131,0,0,
-127,0,0
+/* clang-format off */
+const unsigned char pal_rgb[256*3] = {
+        255,255,255,
+        0,0,131,
+        0,0,135,
+        0,0,139,
+        0,0,143,
+        0,0,147,
+        0,0,151,
+        0,0,155,
+        0,0,159,
+        0,0,163,
+        0,0,167,
+        0,0,171,
+        0,0,175,
+        0,0,179,
+        0,0,183,
+        0,0,187,
+        0,0,191,
+        0,0,195,
+        0,0,199,
+        0,0,203,
+        0,0,207,
+        0,0,211,
+        0,0,215,
+        0,0,219,
+        0,0,223,
+        0,0,227,
+        0,0,231,
+        0,0,235,
+        0,0,239,
+        0,0,243,
+        0,0,247,
+        0,0,251,
+        0,0,255,
+        0,0,255,
+        0,3,255,
+        0,7,255,
+        0,11,255,
+        0,15,255,
+        0,19,255,
+        0,23,255,
+        0,27,255,
+        0,31,255,
+        0,35,255,
+        0,39,255,
+        0,43,255,
+        0,47,255,
+        0,51,255,
+        0,55,255,
+        0,59,255,
+        0,63,255,
+        0,67,255,
+        0,71,255,
+        0,75,255,
+        0,79,255,
+        0,83,255,
+        0,87,255,
+        0,91,255,
+        0,95,255,
+        0,99,255,
+        0,103,255,
+        0,107,255,
+        0,111,255,
+        0,115,255,
+        0,119,255,
+        0,123,255,
+        0,127,255,
+        0,131,255,
+        0,135,255,
+        0,139,255,
+        0,143,255,
+        0,147,255,
+        0,151,255,
+        0,155,255,
+        0,159,255,
+        0,163,255,
+        0,167,255,
+        0,171,255,
+        0,175,255,
+        0,179,255,
+        0,183,255,
+        0,187,255,
+        0,191,255,
+        0,195,255,
+        0,199,255,
+        0,203,255,
+        0,207,255,
+        0,211,255,
+        0,215,255,
+        0,219,255,
+        0,223,255,
+        0,227,255,
+        0,231,255,
+        0,235,255,
+        0,239,255,
+        0,243,255,
+        0,247,255,
+        0,251,255,
+        0,255,255,
+        0,255,255,
+        3,255,251,
+        7,255,247,
+        11,255,243,
+        15,255,239,
+        19,255,235,
+        23,255,231,
+        27,255,227,
+        31,255,223,
+        35,255,219,
+        39,255,215,
+        43,255,211,
+        47,255,207,
+        51,255,203,
+        55,255,199,
+        59,255,195,
+        63,255,191,
+        67,255,187,
+        71,255,183,
+        75,255,179,
+        79,255,175,
+        83,255,171,
+        87,255,167,
+        91,255,163,
+        95,255,159,
+        99,255,155,
+        103,255,151,
+        107,255,147,
+        111,255,143,
+        115,255,139,
+        119,255,135,
+        123,255,131,
+        127,255,127,
+        131,255,123,
+        135,255,119,
+        139,255,115,
+        143,255,111,
+        147,255,107,
+        151,255,103,
+        155,255,99,
+        159,255,95,
+        163,255,91,
+        167,255,87,
+        171,255,83,
+        175,255,79,
+        179,255,75,
+        183,255,71,
+        187,255,67,
+        191,255,63,
+        195,255,59,
+        199,255,55,
+        203,255,51,
+        207,255,47,
+        211,255,43,
+        215,255,39,
+        219,255,35,
+        223,255,31,
+        227,255,27,
+        231,255,23,
+        235,255,19,
+        239,255,15,
+        243,255,11,
+        247,255,7,
+        251,255,3,
+        255,255,0,
+        255,251,0,
+        255,247,0,
+        255,243,0,
+        255,239,0,
+        255,235,0,
+        255,231,0,
+        255,227,0,
+        255,223,0,
+        255,219,0,
+        255,215,0,
+        255,211,0,
+        255,207,0,
+        255,203,0,
+        255,199,0,
+        255,195,0,
+        255,191,0,
+        255,187,0,
+        255,183,0,
+        255,179,0,
+        255,175,0,
+        255,171,0,
+        255,167,0,
+        255,163,0,
+        255,159,0,
+        255,155,0,
+        255,151,0,
+        255,147,0,
+        255,143,0,
+        255,139,0,
+        255,135,0,
+        255,131,0,
+        255,127,0,
+        255,123,0,
+        255,119,0,
+        255,115,0,
+        255,111,0,
+        255,107,0,
+        255,103,0,
+        255,99,0,
+        255,95,0,
+        255,91,0,
+        255,87,0,
+        255,83,0,
+        255,79,0,
+        255,75,0,
+        255,71,0,
+        255,67,0,
+        255,63,0,
+        255,59,0,
+        255,55,0,
+        255,51,0,
+        255,47,0,
+        255,43,0,
+        255,39,0,
+        255,35,0,
+        255,31,0,
+        255,27,0,
+        255,23,0,
+        255,19,0,
+        255,15,0,
+        255,11,0,
+        255,7,0,
+        255,3,0,
+        255,0,0,
+        250,0,0,
+        246,0,0,
+        241,0,0,
+        237,0,0,
+        233,0,0,
+        228,0,0,
+        224,0,0,
+        219,0,0,
+        215,0,0,
+        211,0,0,
+        206,0,0,
+        202,0,0,
+        197,0,0,
+        193,0,0,
+        189,0,0,
+        184,0,0,
+        180,0,0,
+        175,0,0,
+        171,0,0,
+        167,0,0,
+        162,0,0,
+        158,0,0,
+        153,0,0,
+        149,0,0,
+        145,0,0,
+        140,0,0,
+        136,0,0,
+        131,0,0,
+        127,0,0
 };
-
-
-
-
-
-
-
+/* clang-format on */
diff --git a/hl/examples/ptExampleFL.c b/hl/examples/ptExampleFL.c
index 37b5035..b3b4f72 100644
--- a/hl/examples/ptExampleFL.c
+++ b/hl/examples/ptExampleFL.c
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "hdf5_hl.h"
@@ -25,82 +22,80 @@
  *-------------------------------------------------------------------------
  */
 
-int main(void)
+int
+main(void)
 {
- hid_t          fid;        /* File identifier */
- hid_t          ptable;     /* Packet table identifier */
+    hid_t fid;    /* File identifier */
+    hid_t ptable; /* Packet table identifier */
 
- herr_t         err;        /* Function return status */
- hsize_t        count;      /* Number of records in the table */
+    herr_t  err;   /* Function return status */
+    hsize_t count; /* Number of records in the table */
 
- int            x;          /* Loop variable */
+    int x; /* Loop variable */
 
     /* Buffers to hold data */
- int writeBuffer[5];
- int readBuffer[5];
+    int writeBuffer[5];
+    int readBuffer[5];
 
-   /* Initialize buffers */
- for(x=0; x<5; x++)
- {
-     writeBuffer[x]=x;
-     readBuffer[x] = -1;
- }
+    /* Initialize buffers */
+    for (x = 0; x < 5; x++) {
+        writeBuffer[x] = x;
+        readBuffer[x]  = -1;
+    }
 
     /* Create a file using default properties */
- fid=H5Fcreate("packet_table_FLexample.h5",H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT);
+    fid = H5Fcreate("packet_table_FLexample.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
     /* Create a fixed-length packet table within the file */
     /* This table's "packets" will be simple integers and it will use compression
      * level 5. */
- ptable = H5PTcreate_fl(fid, "Packet Test Dataset", H5T_NATIVE_INT, (hsize_t)100, 5);
- if(ptable == H5I_INVALID_HID)
-     goto out;
+    ptable = H5PTcreate_fl(fid, "Packet Test Dataset", H5T_NATIVE_INT, (hsize_t)100, 5);
+    if (ptable == H5I_INVALID_HID)
+        goto out;
 
     /* Write one packet to the packet table */
- err = H5PTappend(ptable, (hsize_t)1, &(writeBuffer[0]) );
- if(err < 0)
-     goto out;
+    err = H5PTappend(ptable, (hsize_t)1, &(writeBuffer[0]));
+    if (err < 0)
+        goto out;
 
     /* Write several packets to the packet table */
- err = H5PTappend(ptable, (hsize_t)4, &(writeBuffer[1]) );
- if(err < 0)
-     goto out;
+    err = H5PTappend(ptable, (hsize_t)4, &(writeBuffer[1]));
+    if (err < 0)
+        goto out;
 
     /* Get the number of packets in the packet table.  This should be five. */
- err = H5PTget_num_packets(ptable, &count);
- if(err < 0)
-     goto out;
+    err = H5PTget_num_packets(ptable, &count);
+    if (err < 0)
+        goto out;
 
- printf("Number of packets in packet table after five appends: %d\n", (int)count);
+    printf("Number of packets in packet table after five appends: %d\n", (int)count);
 
     /* Initialize packet table's "current record" */
- err = H5PTcreate_index(ptable);
- if(err < 0)
-     goto out;
+    err = H5PTcreate_index(ptable);
+    if (err < 0)
+        goto out;
 
     /* Iterate through packets, read each one back */
- for(x=0; x<5; x++)
- {
-    err = H5PTget_next(ptable, (hsize_t)1, &(readBuffer[x]) );
-    if(err < 0)
-	goto out;
+    for (x = 0; x < 5; x++) {
+        err = H5PTget_next(ptable, (hsize_t)1, &(readBuffer[x]));
+        if (err < 0)
+            goto out;
 
-    printf("Packet %d's value is %d\n", x, readBuffer[x]);
- }
+        printf("Packet %d's value is %d\n", x, readBuffer[x]);
+    }
 
     /* Close the packet table */
- err = H5PTclose(ptable);
- if(err < 0)
-     goto out;
+    err = H5PTclose(ptable);
+    if (err < 0)
+        goto out;
 
     /* Close the file */
- H5Fclose(fid);
+    H5Fclose(fid);
 
- return 0;
+    return 0;
 
- out: /* An error has occurred.  Clean up and exit. */
+out: /* An error has occurred.  Clean up and exit. */
     H5PTclose(ptable);
     H5Fclose(fid);
     return -1;
 }
-
diff --git a/hl/examples/run-hl-ex.sh b/hl/examples/run-hl-ex.sh
index 5fa97c0..c31e0d4 100755
--- a/hl/examples/run-hl-ex.sh
+++ b/hl/examples/run-hl-ex.sh
@@ -5,12 +5,10 @@
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 
 #
 #  This file:  run-hl-ex.sh
diff --git a/hl/examples/run-hlc-ex.sh.in b/hl/examples/run-hlc-ex.sh.in
index a79f67a..81d3c00 100644
--- a/hl/examples/run-hlc-ex.sh.in
+++ b/hl/examples/run-hlc-ex.sh.in
@@ -5,12 +5,10 @@
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 
 #
 #  This file:  run-hlc-ex.sh
@@ -20,7 +18,7 @@
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 #                                                                               #
 # This script will compile and run the c examples from source files installed   #
-# in .../share/hdf5_examples/hl/c using h5cc or h5pc.  The order for running    #
+# in @examplesdir@/hl/c using h5cc or h5pc.  The order for running              #
 # programs with RunTest in the MAIN section below is taken from the Makefile.   #
 # The order is important since some of the test programs use data files created #
 # by earlier test programs.  Any future additions should be placed accordingly. #
@@ -31,9 +29,32 @@
 EXIT_SUCCESS=0
 EXIT_FAILURE=1
 
+#
+# Try to derive the path to the installation $prefix established
+# by ./configure relative to the examples directory established by
+# ./configure.  If successful, set `prefix_relto_examplesdir` to the
+# relative path.  Otherwise, set `prefix_relto_examplesdir` to the
+# absolute installation $prefix.
+#
+# This script uses the value of `prefix` in the user's environment, if
+# it is set, below.  The content of $() is evaluated in a sub-shell, so
+# if `prefix` is set in the user's environment, the shell statements in
+# $() won't clobbered it.
+#
+prefix_relto_examplesdir=$(
+prefix=@prefix@
+examplesdir=@examplesdir@
+if [ ${examplesdir##${prefix}/} != ${examplesdir} ]; then
+	echo $(echo ${examplesdir##${prefix}/} | \
+	    sed 's,[^/][^/]*,..,g')
+else
+	echo $prefix
+fi
+)
+
 # Where the tool is installed.
 # default is relative path to installed location of the tools
-prefix="${prefix:-../../../../}"
+prefix="${prefix:-../../${prefix_relto_examplesdir}}"
 PARALLEL=@PARALLEL@             # Am I in parallel mode?
 AR="@AR@"
 RANLIB="@RANLIB@"
@@ -117,5 +138,5 @@ rm *.o
 rm *.h5
 echo
 
-exit $EXIT_VALUE 
+exit $EXIT_VALUE
 
diff --git a/hl/fortran/CMakeLists.txt b/hl/fortran/CMakeLists.txt
index 892169c..ad6faa4 100644
--- a/hl/fortran/CMakeLists.txt
+++ b/hl/fortran/CMakeLists.txt
@@ -1,21 +1,21 @@
-cmake_minimum_required (VERSION 3.1.0)
-PROJECT (HDF5_HL_F90 C CXX Fortran)
+cmake_minimum_required (VERSION 3.18)
+project (HDF5_HL_F90 C Fortran)
 
 #-----------------------------------------------------------------------------
 # List Source files
 #-----------------------------------------------------------------------------
-add_subdirectory (${HDF5_HL_F90_SOURCE_DIR}/src ${HDF5_HL_F90_BINARY_DIR}/src)
+add_subdirectory (src)
 
 #-----------------------------------------------------------------------------
 # Build the HL Fortran Examples
 #-----------------------------------------------------------------------------
 if (HDF5_BUILD_EXAMPLES)
-  add_subdirectory (${HDF5_HL_F90_SOURCE_DIR}/examples ${HDF5_HL_F90_BINARY_DIR}/examples)
-endif (HDF5_BUILD_EXAMPLES)
+  add_subdirectory (examples)
+endif ()
 
 #-----------------------------------------------------------------------------
 # Testing
 #-----------------------------------------------------------------------------
 if (BUILD_TESTING)
-  add_subdirectory (${HDF5_HL_F90_SOURCE_DIR}/test ${HDF5_HL_F90_BINARY_DIR}/test)
-endif (BUILD_TESTING)
+  add_subdirectory (test)
+endif ()
diff --git a/hl/fortran/COPYING b/hl/fortran/COPYING
deleted file mode 100644
index 6903daf..0000000
--- a/hl/fortran/COPYING
+++ /dev/null
@@ -1,16 +0,0 @@
-
-  Copyright by  The HDF Group and 
-                The Board of Trustees of the University of Illinois. 
-  All rights reserved. 
-
-  The files and subdirectories in this directory are part of HDF5.  
-  The full HDF5 copyright notice, including terms governing use, 
-  modification, and redistribution, is contained in the files COPYING 
-  and Copyright.html.  COPYING can be found at the root of the source 
-  code distribution tree; Copyright.html can be found at the root 
-  level of an installed copy of the electronic HDF5 document set and 
-  is linked from the top-level documents page.  It can also be found 
-  at http://www.hdfgroup.org/HDF5/doc/Copyright.html.  If you do not 
-  have access to either file, you may request a copy from 
-  help@hdfgroup.org. 
-
diff --git a/hl/fortran/Makefile.am b/hl/fortran/Makefile.am
index 646de26..b8a3ac4 100644
--- a/hl/fortran/Makefile.am
+++ b/hl/fortran/Makefile.am
@@ -1,18 +1,15 @@
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
 #
-# 
 # This makefile mostly just reinvokes make in the various subdirectories
 # but does so in the correct order.  You can alternatively invoke make from
 # each subdirectory manually.
@@ -25,7 +22,13 @@
 
 include $(top_srcdir)/config/commence.am
 
-SUBDIRS=src test
+if BUILD_TESTS_CONDITIONAL
+   TESTSERIAL_DIR =test
+else
+   TESTSERIAL_DIR=
+endif
+
+SUBDIRS=src $(TESTSERIAL_DIR)
 DIST_SUBDIRS=src test examples
 
 # Install examples
diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in
deleted file mode 100644
index fd1a20c..0000000
--- a/hl/fortran/Makefile.in
+++ /dev/null
@@ -1,1373 +0,0 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-#
-# 
-# This makefile mostly just reinvokes make in the various subdirectories
-# but does so in the correct order.  You can alternatively invoke make from
-# each subdirectory manually.
-#
-# HDF5 High-Level Makefile(.in)
-VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-DIST_COMMON = $(top_srcdir)/config/commence.am \
-	$(top_srcdir)/config/conclude.am $(srcdir)/Makefile.in \
-	$(srcdir)/Makefile.am $(top_srcdir)/bin/mkinstalldirs \
-	$(top_srcdir)/bin/test-driver COPYING
-TESTS =
-subdir = hl/fortran
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/aclocal_cxx.m4 \
-	$(top_srcdir)/m4/aclocal_fc.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/src/H5config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
-	ctags-recursive dvi-recursive html-recursive info-recursive \
-	install-data-recursive install-dvi-recursive \
-	install-exec-recursive install-html-recursive \
-	install-info-recursive install-pdf-recursive \
-	install-ps-recursive install-recursive installcheck-recursive \
-	installdirs-recursive pdf-recursive ps-recursive \
-	tags-recursive uninstall-recursive
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-am__recursive_targets = \
-  $(RECURSIVE_TARGETS) \
-  $(RECURSIVE_CLEAN_TARGETS) \
-  $(am__extra_recursive_targets)
-AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	check recheck distdir
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-am__tty_colors_dummy = \
-  mgn= red= grn= lgn= blu= brg= std=; \
-  am__color_tests=no
-am__tty_colors = { \
-  $(am__tty_colors_dummy); \
-  if test "X$(AM_COLOR_TESTS)" = Xno; then \
-    am__color_tests=no; \
-  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
-    am__color_tests=yes; \
-  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
-    am__color_tests=yes; \
-  fi; \
-  if test $$am__color_tests = yes; then \
-    red='[0;31m'; \
-    grn='[0;32m'; \
-    lgn='[1;32m'; \
-    blu='[1;34m'; \
-    mgn='[0;35m'; \
-    brg='[1m'; \
-    std='[m'; \
-  fi; \
-}
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__recheck_rx = ^[ 	]*:recheck:[ 	]*
-am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
-am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
-# A command that, given a newline-separated list of test names on the
-# standard input, print the name of the tests that are to be re-run
-# upon "make recheck".
-am__list_recheck_tests = $(AWK) '{ \
-  recheck = 1; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-        { \
-          if ((getline line2 < ($$0 ".log")) < 0) \
-	    recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
-        { \
-          recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
-        { \
-          break; \
-        } \
-    }; \
-  if (recheck) \
-    print $$0; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# A command that, given a newline-separated list of test names on the
-# standard input, create the global log from their .trs and .log files.
-am__create_global_log = $(AWK) ' \
-function fatal(msg) \
-{ \
-  print "fatal: making $@: " msg | "cat >&2"; \
-  exit 1; \
-} \
-function rst_section(header) \
-{ \
-  print header; \
-  len = length(header); \
-  for (i = 1; i <= len; i = i + 1) \
-    printf "="; \
-  printf "\n\n"; \
-} \
-{ \
-  copy_in_global_log = 1; \
-  global_test_result = "RUN"; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-         fatal("failed to read from " $$0 ".trs"); \
-      if (line ~ /$(am__global_test_result_rx)/) \
-        { \
-          sub("$(am__global_test_result_rx)", "", line); \
-          sub("[ 	]*$$", "", line); \
-          global_test_result = line; \
-        } \
-      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
-        copy_in_global_log = 0; \
-    }; \
-  if (copy_in_global_log) \
-    { \
-      rst_section(global_test_result ": " $$0); \
-      while ((rc = (getline line < ($$0 ".log"))) != 0) \
-      { \
-        if (rc < 0) \
-          fatal("failed to read from " $$0 ".log"); \
-        print line; \
-      }; \
-      printf "\n"; \
-    }; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# Restructured Text title.
-am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
-# Solaris 10 'make', and several other traditional 'make' implementations,
-# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
-# by disabling -e (using the XSI extension "set +e") if it's set.
-am__sh_e_setup = case $$- in *e*) set +e;; esac
-# Default flags passed to test drivers.
-am__common_driver_flags = \
-  --color-tests "$$am__color_tests" \
-  --enable-hard-errors "$$am__enable_hard_errors" \
-  --expect-failure "$$am__expect_failure"
-# To be inserted before the command running the test.  Creates the
-# directory for the log if needed.  Stores in $dir the directory
-# containing $f, in $tst the test, in $log the log.  Executes the
-# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
-# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
-# will run the test scripts (or their associated LOG_COMPILER, if
-# thy have one).
-am__check_pre = \
-$(am__sh_e_setup);					\
-$(am__vpath_adj_setup) $(am__vpath_adj)			\
-$(am__tty_colors);					\
-srcdir=$(srcdir); export srcdir;			\
-case "$@" in						\
-  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
-    *) am__odir=.;; 					\
-esac;							\
-test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
-  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
-if test -f "./$$f"; then dir=./;			\
-elif test -f "$$f"; then dir=;				\
-else dir="$(srcdir)/"; fi;				\
-tst=$$dir$$f; log='$@'; 				\
-if test -n '$(DISABLE_HARD_ERRORS)'; then		\
-  am__enable_hard_errors=no; 				\
-else							\
-  am__enable_hard_errors=yes; 				\
-fi; 							\
-case " $(XFAIL_TESTS) " in				\
-  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
-    am__expect_failure=yes;;				\
-  *)							\
-    am__expect_failure=no;;				\
-esac; 							\
-$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
-# A shell command to get the names of the tests scripts with any registered
-# extension removed (i.e., equivalently, the names of the test logs, with
-# the '.log' extension removed).  The result is saved in the shell variable
-# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
-# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
-# since that might cause problem with VPATH rewrites for suffix-less tests.
-# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
-am__set_TESTS_bases = \
-  bases='$(TEST_LOGS)'; \
-  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
-  bases=`echo $$bases`
-RECHECK_LOGS = $(TEST_LOGS)
-TEST_SUITE_LOG = test-suite.log
-am__test_logs1 = $(TESTS:=.log)
-am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
-TEST_LOGS = $(am__test_logs2:.sh.log=.log)
-SH_LOG_DRIVER = $(SHELL) $(top_srcdir)/bin/test-driver
-SH_LOG_COMPILE = $(SH_LOG_COMPILER) $(AM_SH_LOG_FLAGS) $(SH_LOG_FLAGS)
-am__set_b = \
-  case '$@' in \
-    */*) \
-      case '$*' in \
-        */*) b='$*';; \
-          *) b=`echo '$@' | sed 's/\.log$$//'`; \
-       esac;; \
-    *) \
-      b='$*';; \
-  esac
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
-  sed_rest='s,^[^/]*/*,,'; \
-  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
-  sed_butlast='s,/*[^/]*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
-ACLOCAL = @ACLOCAL@
-ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
-AMTAR = @AMTAR@
-
-# H5_CFLAGS holds flags that should be used when building hdf5,
-# but which should not be exported to h5cc for building other programs.
-# AM_CFLAGS is an automake construct which should be used by Makefiles 
-# instead of CFLAGS, as CFLAGS is reserved solely for the user to define.
-# This applies to FCFLAGS, CXXFLAGS, CPPFLAGS, and LDFLAGS as well.
-AM_CFLAGS = @AM_CFLAGS@ @H5_CFLAGS@
-AM_CPPFLAGS = @AM_CPPFLAGS@ @H5_CPPFLAGS@
-AM_CXXFLAGS = @AM_CXXFLAGS@ @H5_CXXFLAGS@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@
-AM_LDFLAGS = @AM_LDFLAGS@ @H5_LDFLAGS@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BYTESEX = @BYTESEX@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CC_VERSION = @CC_VERSION@
-CFLAGS = @CFLAGS@
-CLEARFILEBUF = @CLEARFILEBUF@
-CODESTACK = @CODESTACK@
-CONFIG_DATE = @CONFIG_DATE@
-CONFIG_MODE = @CONFIG_MODE@
-CONFIG_USER = @CONFIG_USER@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CXX_VERSION = @CXX_VERSION@
-CYGPATH_W = @CYGPATH_W@
-DEBUG_PKG = @DEBUG_PKG@
-DEFAULT_API_VERSION = @DEFAULT_API_VERSION@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
-DIRECT_VFD = @DIRECT_VFD@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-EXTERNAL_FILTERS = @EXTERNAL_FILTERS@
-
-# Make sure that these variables are exported to the Makefiles
-F9XMODEXT = @F9XMODEXT@
-F9XMODFLAG = @F9XMODFLAG@
-F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
-FC = @FC@
-FC2003 = @FC2003@
-FCFLAGS = @FCFLAGS@
-FCFLAGS_f90 = @FCFLAGS_f90@
-FCLIBS = @FCLIBS@
-FC_VERSION = @FC_VERSION@
-FGREP = @FGREP@
-FSEARCH_DIRS = @FSEARCH_DIRS@
-GREP = @GREP@
-H5_CFLAGS = @H5_CFLAGS@
-H5_CPPFLAGS = @H5_CPPFLAGS@
-H5_CXXFLAGS = @H5_CXXFLAGS@
-H5_CXX_SHARED = @H5_CXX_SHARED@
-H5_FCFLAGS = @H5_FCFLAGS@
-H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@
-H5_LDFLAGS = @H5_LDFLAGS@
-H5_LONE_COLON = @H5_LONE_COLON@
-H5_VERSION = @H5_VERSION@
-HADDR_T = @HADDR_T@
-HAVE_DMALLOC = @HAVE_DMALLOC@
-HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@
-HAVE_PTHREAD = @HAVE_PTHREAD@
-HDF5_HL = @HDF5_HL@
-HDF5_INTERFACES = @HDF5_INTERFACES@
-HDF_CXX = @HDF_CXX@
-HDF_FORTRAN = @HDF_FORTRAN@
-HDF_FORTRAN2003 = @HDF_FORTRAN2003@
-HID_T = @HID_T@
-HL = @HL@
-HL_FOR = @HL_FOR@
-HSIZE_T = @HSIZE_T@
-HSSIZE_T = @HSSIZE_T@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTRUMENT = @INSTRUMENT@
-INSTRUMENT_LIBRARY = @INSTRUMENT_LIBRARY@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LL_PATH = @LL_PATH@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_STATIC_EXEC = @LT_STATIC_EXEC@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MPE = @MPE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJECT_NAMELEN_DEFAULT_F = @OBJECT_NAMELEN_DEFAULT_F@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PARALLEL = @PARALLEL@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-RANLIB = @RANLIB@
-ROOT = @ROOT@
-RUNPARALLEL = @RUNPARALLEL@
-RUNSERIAL = @RUNSERIAL@
-R_INTEGER = @R_INTEGER@
-R_LARGE = @R_LARGE@
-SEARCH = @SEARCH@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SIZE_T = @SIZE_T@
-STATIC_EXEC = @STATIC_EXEC@
-STATIC_SHARED = @STATIC_SHARED@
-STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@
-STRIP = @STRIP@
-TESTPARALLEL = @TESTPARALLEL@
-THREADSAFE = @THREADSAFE@
-TIME = @TIME@
-TR = @TR@
-TRACE_API = @TRACE_API@
-UNAME_INFO = @UNAME_INFO@
-USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
-USE_FILTER_SZIP = @USE_FILTER_SZIP@
-USINGMEMCHECKER = @USINGMEMCHECKER@
-VERSION = @VERSION@
-WORDS_BIGENDIAN = @WORDS_BIGENDIAN@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_FC = @ac_ct_FC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-
-# Install directories that automake doesn't know about
-docdir = $(exec_prefix)/doc
-dvidir = @dvidir@
-enable_shared = @enable_shared@
-enable_static = @enable_static@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-
-# Shell commands used in Makefiles
-RM = rm -f
-CP = cp
-
-# Some machines need a command to run executables; this is that command
-# so that our tests will run.
-# We use RUNEXEC instead of RUNSERIAL directly because it may be that
-# some tests need to be run with a different command.  Older versions
-# of the makefiles used the command
-# $(LIBTOOL) --mode=execute
-# in some directories, for instance.
-RUNEXEC = $(RUNSERIAL)
-
-# Libraries to link to while building
-LIBHDF5 = $(top_builddir)/src/libhdf5.la
-LIBH5TEST = $(top_builddir)/test/libh5test.la
-LIBH5F = $(top_builddir)/fortran/src/libhdf5_fortran.la
-LIBH5FTEST = $(top_builddir)/fortran/test/libh5test_fortran.la
-LIBH5CPP = $(top_builddir)/c++/src/libhdf5_cpp.la
-LIBH5TOOLS = $(top_builddir)/tools/lib/libh5tools.la
-LIBH5_HL = $(top_builddir)/hl/src/libhdf5_hl.la
-LIBH5F_HL = $(top_builddir)/hl/fortran/src/libhdf5hl_fortran.la
-LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
-
-# Note that in svn revision 19400 the '/' after DESTDIR in H5* variables below  
-# has been removed. According to the official description of DESTDIR by Gnu at 
-# http://www.gnu.org/prep/standards/html_node/DESTDIR.html, DESTDIR is 
-# prepended to the normal and complete install path that it precedes for the 
-# purpose of installing in a temporary directory which is useful for building 
-# rpms and other packages.  The '/' after ${DESTDIR} will be followed by another 
-# '/' at the beginning of the normal install path.  When DESTDIR is empty the  
-# path then begins with '//', which is incorrect and causes problems at least for 
-# Cygwin.   
-
-# Scripts used to build examples
-# If only shared libraries have been installed, have h5cc build examples with
-# shared libraries instead of static libraries
-H5CC = ${DESTDIR}$(bindir)/h5cc
-H5CC_PP = ${DESTDIR}$(bindir)/h5pcc
-H5FC = ${DESTDIR}$(bindir)/h5fc
-H5FC_PP = ${DESTDIR}$(bindir)/h5pfc
-H5CPP = ${DESTDIR}$(bindir)/h5c++
-ACLOCAL_AMFLAGS = "-I m4"
-
-# The trace script; this is used on source files from the C library to
-# insert tracing macros.
-TRACE = perl $(top_srcdir)/bin/trace
-
-# .chkexe files are used to mark tests that have run successfully.
-# .chklog files are output from those tests.
-# *.clog and *.clog2 are from the MPE option.
-CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2
-SUBDIRS = src test
-DIST_SUBDIRS = src test examples
-
-# Automake needs to be taught how to build lib, progs, and tests targets.
-# These will be filled in automatically for the most part (e.g.,
-# lib_LIBRARIES are built for lib target), but EXTRA_LIB, EXTRA_PROG, and
-# EXTRA_TEST variables are supplied to allow the user to force targets to
-# be built at certain times. 
-LIB = $(lib_LIBRARIES) $(lib_LTLIBRARIES) $(noinst_LIBRARIES)                 \
-      $(noinst_LTLIBRARIES) $(check_LIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LIB)
-
-PROGS = $(bin_PROGRAMS) $(bin_SCRIPTS) $(noinst_PROGRAMS) $(noinst_SCRIPTS)   \
-        $(EXTRA_PROG)
-
-chk_TESTS = $(check_PROGRAMS) $(check_SCRIPTS) $(EXTRA_TEST) 
-TEST_EXTENSIONS = .sh
-SH_LOG_COMPILER = $(SHELL)
-AM_SH_LOG_FLAGS = 
-TEST_PROG_CHKEXE = $(TEST_PROG:=.chkexe_)
-TEST_PROG_PARA_CHKEXE = $(TEST_PROG_PARA:=.chkexe_)
-TEST_SCRIPT_CHKSH = $(TEST_SCRIPT:=.chkexe_)
-TEST_SCRIPT_PARA_CHKSH = $(TEST_SCRIPT_PARA:=.chkexe_)
-all: all-recursive
-
-.SUFFIXES:
-.SUFFIXES: .log .sh .sh$(EXEEXT) .trs
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign hl/fortran/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign hl/fortran/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-$(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am:
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run 'make' without going through this Makefile.
-# To change the values of 'make' variables: instead of editing Makefiles,
-# (1) if the variable is set in 'config.status', edit 'config.status'
-#     (which will cause the Makefiles to be regenerated when you run 'make');
-# (2) otherwise, pass the desired values on the 'make' command line.
-$(am__recursive_targets):
-	@fail=; \
-	if $(am__make_keepgoing); then \
-	  failcom='fail=yes'; \
-	else \
-	  failcom='exit 1'; \
-	fi; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-recursive
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: ctags-recursive
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-recursive
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-# Recover from deleted '.trs' file; this should ensure that
-# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
-# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
-# to avoid problems with "make -n".
-.log.trs:
-	rm -f $< $@
-	$(MAKE) $(AM_MAKEFLAGS) $<
-
-# Leading 'am--fnord' is there to ensure the list of targets does not
-# expand to empty, as could happen e.g. with make check TESTS=''.
-am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
-am--force-recheck:
-	@:
-
-$(TEST_SUITE_LOG): $(TEST_LOGS)
-	@$(am__set_TESTS_bases); \
-	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
-	redo_bases=`for i in $$bases; do \
-	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
-	            done`; \
-	if test -n "$$redo_bases"; then \
-	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
-	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
-	  if $(am__make_dryrun); then :; else \
-	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
-	  fi; \
-	fi; \
-	if test -n "$$am__remaking_logs"; then \
-	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
-	       "recursion detected" >&2; \
-	else \
-	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
-	fi; \
-	if $(am__make_dryrun); then :; else \
-	  st=0;  \
-	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
-	  for i in $$redo_bases; do \
-	    test -f $$i.trs && test -r $$i.trs \
-	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
-	    test -f $$i.log && test -r $$i.log \
-	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
-	  done; \
-	  test $$st -eq 0 || exit 1; \
-	fi
-	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
-	ws='[ 	]'; \
-	results=`for b in $$bases; do echo $$b.trs; done`; \
-	test -n "$$results" || results=/dev/null; \
-	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
-	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
-	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
-	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
-	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
-	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
-	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
-	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
-	  success=true; \
-	else \
-	  success=false; \
-	fi; \
-	br='==================='; br=$$br$$br$$br$$br; \
-	result_count () \
-	{ \
-	    if test x"$$1" = x"--maybe-color"; then \
-	      maybe_colorize=yes; \
-	    elif test x"$$1" = x"--no-color"; then \
-	      maybe_colorize=no; \
-	    else \
-	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
-	    fi; \
-	    shift; \
-	    desc=$$1 count=$$2; \
-	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
-	      color_start=$$3 color_end=$$std; \
-	    else \
-	      color_start= color_end=; \
-	    fi; \
-	    echo "$${color_start}# $$desc $$count$${color_end}"; \
-	}; \
-	create_testsuite_report () \
-	{ \
-	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
-	  result_count $$1 "PASS: " $$pass  "$$grn"; \
-	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
-	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
-	  result_count $$1 "FAIL: " $$fail  "$$red"; \
-	  result_count $$1 "XPASS:" $$xpass "$$red"; \
-	  result_count $$1 "ERROR:" $$error "$$mgn"; \
-	}; \
-	{								\
-	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
-	    $(am__rst_title);						\
-	  create_testsuite_report --no-color;				\
-	  echo;								\
-	  echo ".. contents:: :depth: 2";				\
-	  echo;								\
-	  for b in $$bases; do echo $$b; done				\
-	    | $(am__create_global_log);					\
-	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
-	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
-	if $$success; then						\
-	  col="$$grn";							\
-	 else								\
-	  col="$$red";							\
-	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
-	fi;								\
-	echo "$${col}$$br$${std}"; 					\
-	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
-	echo "$${col}$$br$${std}"; 					\
-	create_testsuite_report --maybe-color;				\
-	echo "$$col$$br$$std";						\
-	if $$success; then :; else					\
-	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
-	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
-	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
-	  fi;								\
-	  echo "$$col$$br$$std";					\
-	fi;								\
-	$$success || exit 1
-recheck: all 
-	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-	@set +e; $(am__set_TESTS_bases); \
-	bases=`for i in $$bases; do echo $$i; done \
-	         | $(am__list_recheck_tests)` || exit 1; \
-	log_list=`for i in $$bases; do echo $$i.log; done`; \
-	log_list=`echo $$log_list`; \
-	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
-	        am__force_recheck=am--force-recheck \
-	        TEST_LOGS="$$log_list"; \
-	exit $$?
-.sh.log:
-	@p='$<'; \
-	$(am__set_b); \
-	$(am__check_pre) $(SH_LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_SH_LOG_DRIVER_FLAGS) $(SH_LOG_DRIVER_FLAGS) -- $(SH_LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-@am__EXEEXT_TRUE@.sh$(EXEEXT).log:
-@am__EXEEXT_TRUE@	@p='$<'; \
-@am__EXEEXT_TRUE@	$(am__set_b); \
-@am__EXEEXT_TRUE@	$(am__check_pre) $(SH_LOG_DRIVER) --test-name "$$f" \
-@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
-@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_SH_LOG_DRIVER_FLAGS) $(SH_LOG_DRIVER_FLAGS) -- $(SH_LOG_COMPILE) \
-@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    $(am__make_dryrun) \
-	      || test -d "$(distdir)/$$subdir" \
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
-	      || exit 1; \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
-check: check-recursive
-all-am: Makefile all-local
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
-	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
-	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am: installcheck-local
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool \
-	mostlyclean-local
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: $(am__recursive_targets) check-am install-am install-strip
-
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \
-	check check-TESTS check-am clean clean-generic clean-libtool \
-	cscopelist-am ctags ctags-am distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installcheck-local installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
-	pdf-am ps ps-am recheck tags tags-am uninstall uninstall-am
-
-
-# List all build rules defined by HDF5 Makefiles as "PHONY" targets here.
-# This tells the Makefiles that these targets are not files to be built but
-# commands that should be executed even if a file with the same name already
-# exists.
-.PHONY: build-check-clean build-check-p build-check-s build-lib build-progs \
-        build-tests check-clean check-install check-p check-s check-vfd \
-        install-doc lib progs tests uninstall-doc _exec_check-s _test help
-
-help:
-	@$(top_srcdir)/bin/makehelp
-
-# Install examples
-install-examples uninstall-examples:
-	@(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
-
-installcheck-local:
-	@(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
-
-# Clean examples when check-clean is invoked
-check-clean ::
-	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
-	@for d in X $(SUBDIRS) examples; do                                   \
-	    if test $$d != X && test $$d != .; then                           \
-	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
-	    fi;                                                               \
-	done
-
-# lib/progs/tests targets recurse into subdirectories. build-* targets
-# build files in this directory.
-build-lib: $(LIB)
-build-progs: $(LIB) $(PROGS)
-build-tests: $(LIB) $(PROGS) $(chk_TESTS)
-
-# General rule for recursive building targets.
-# BUILT_SOURCES contain targets that need to be built before anything else
-# in the directory (e.g., for Fortran type detection)
-lib progs tests check-s check-p :: $(BUILT_SOURCES)
-	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
-	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X && test $$d != .; then                           \
-	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
-	    fi;                                                               \
-	done
-
-# General rule for recursive cleaning targets.  Like the rule above,
-# but doesn't require building BUILT_SOURCES.
-check-clean ::
-	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
-	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X && test $$d != .; then                           \
-	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
-	    fi;                                                               \
-	done
-
-# Tell Automake to build tests when the user types `make all' (this is
-# not its default behavior).  Also build EXTRA_LIB and EXTRA_PROG since
-# Automake won't build them automatically, either.
-all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(chk_TESTS)
-
-# make install-doc doesn't do anything outside of doc directory, but
-# Makefiles should recognize it.
-# UPDATE: docs no longer reside in this build tree, so this target
-# is depreciated.
-install-doc uninstall-doc:
-	@echo "Nothing to be done."
-
-# clean up files generated by tests so they can be re-run.
-build-check-clean:
-	$(RM) -rf $(CHECK_CLEANFILES)
-
-# run check-clean whenever mostlyclean is run
-mostlyclean-local: build-check-clean
-
-# check-install is just a synonym for installcheck
-check-install: installcheck
-
-# Run each test in order, passing $(TEST_FLAGS) to the program.
-# Since tests are done in a shell loop, "make -i" does apply inside it.
-# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
-# The timestamps give a rough idea how much time the tests use.
-#
-# Note that targets in chk_TESTS (defined above) will be built when the user
-# types 'make tests' or 'make check', but only programs in TEST_PROG,
-# TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
-check-TESTS: test
-
-test _test:
-	@$(MAKE) build-check-s
-	@$(MAKE) build-check-p
-
-# Actual execution of check-s.
-build-check-s: $(LIB) $(PROGS) $(chk_TESTS)
-	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
-	   echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
-	fi
-	@$(MAKE) $(AM_MAKEFLAGS) _exec_check-s
-	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
-	    echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
-	fi
-
-_exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH)
-
-# The dummy.chkexe here prevents the target from being
-# empty if there are no tests in the current directory.
-# $${log} is the log file.
-# $${tname} is the name of test.
-$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
-	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \
-	   tname=$(@:.chkexe_=)$(EXEEXT);\
-	   log=$(@:.chkexe_=.chklog); \
-	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \
-	      echo "No need to test $${tname} again."; \
-	   else \
-	      echo "============================" > $${log}; \
-	      if test "X$(FORTRAN_API)" = "Xyes"; then \
-	         echo "Fortran API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "Fortran API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(CXX_API)" = "Xyes"; then \
-	         echo "C++ API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "C++ API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log};\
-	      else \
-	         echo "Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "$(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      fi; \
-	      echo "============================" >> $${log}; \
-	      srcdir="$(srcdir)" \
-	         $(TIME) $(RUNEXEC) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \
-	         && touch $(@:.chkexe_=.chkexe) || \
-	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	         (cat $${log} && false) || exit 1; \
-	      echo "" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
-	      echo "============================" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
-	      cat $${log}; \
-	   fi; \
-	fi
-
-# The dummysh.chkexe here prevents the target from being
-# empty if there are no tests in the current directory.
-# $${log} is the log file.
-# $${tname} is the name of test.
-$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
-	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummysh.chkexe_"; then \
-	   cmd=$(@:.chkexe_=);\
-	   tname=`basename $$cmd`;\
-	   chkname=`basename $(@:.chkexe_=.chkexe)`;\
-	   log=`basename $(@:.chkexe_=.chklog)`; \
-	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer $${chkname} $$cmd $(SCRIPT_DEPEND); then \
-	      echo "No need to test $${tname} again."; \
-	   else \
-	      echo "============================" > $${log}; \
-	      if test "X$(FORTRAN_API)" = "Xyes"; then \
-	         echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(CXX_API)" = "Xyes"; then \
-	         echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      else \
-	         echo "Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      fi; \
-	      echo "============================" >> $${log}; \
-	      RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
-	      srcdir="$(srcdir)" \
-	         $(TIME) $(SHELL) $$cmd $(TEST_FLAGS) >> $${log} 2>&1 \
-	         && touch $${chkname} || \
-	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	         (cat $${log} && false) || exit 1; \
-	      echo "" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
-	      echo "============================" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
-	      cat $${log}; \
-	   fi; \
-	   echo "============================"; \
-	fi
-
-# Actual execution of check-p.
-build-check-p: $(LIB) $(PROGS) $(chk_TESTS)
-	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
-	   echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
-	fi
-	@if test -n "$(TEST_PROG_PARA)"; then                                \
-	    echo "**** Hint ****";                                            \
-	    echo "Parallel test files reside in the current directory"        \
-	         "by default.";                                               \
-	    echo "Set HDF5_PARAPREFIX to use another directory. E.g.,";       \
-	    echo "    HDF5_PARAPREFIX=/PFS/user/me";                          \
-	    echo "    export HDF5_PARAPREFIX";                                \
-	    echo "    make check";                                            \
-	    echo "**** end of Hint ****";                                     \
-	fi
-	@for test in $(TEST_PROG_PARA) dummy; do                             \
-	   if test $$test != dummy; then                                      \
-	      $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ \
-	      RUNEXEC="$(RUNPARALLEL)" || exit 1; \
-	   fi;                                                                \
-	done
-	@for test in $(TEST_SCRIPT_PARA) dummy; do                           \
-	  if test $$test != dummy; then                                      \
-	    $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ || exit 1; \
-	  fi;                                                                 \
-	done
-	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
-	    echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
-	fi
-
-# Run test with different Virtual File Driver
-check-vfd: $(LIB) $(PROGS) $(chk_TESTS)
-	@for vfd in $(VFD_LIST) dummy; do                                     \
-	    if test $$vfd != dummy; then                                      \
-	        echo "============================";                          \
-	        echo "Testing Virtual File Driver $$vfd";                     \
-	        echo "============================";                          \
-	        $(MAKE) $(AM_MAKEFLAGS) check-clean || exit 1;                \
-	        HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check || exit 1;    \
-	    fi;                                                               \
-	done
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/hl/fortran/examples/CMakeLists.txt b/hl/fortran/examples/CMakeLists.txt
index bded2d9..293bc2b 100644
--- a/hl/fortran/examples/CMakeLists.txt
+++ b/hl/fortran/examples/CMakeLists.txt
@@ -1,13 +1,5 @@
-cmake_minimum_required (VERSION 3.1.0)
-PROJECT (HDF5_HL_F90_EXAMPLES C CXX Fortran)
-
-#-----------------------------------------------------------------------------
-# Setup include Directories
-#-----------------------------------------------------------------------------
-INCLUDE_DIRECTORIES (
-    ${HDF5_F90_BINARY_DIR}
-    ${HDF5_F90_SRC_DIR}/src
-)
+cmake_minimum_required (VERSION 3.18)
+project (HDF5_HL_F90_EXAMPLES C Fortran)
 
 set (examples
     exlite
@@ -16,21 +8,34 @@ set (examples
 
 foreach (example ${examples})
   add_executable (hl_f90_ex_${example} ${HDF5_HL_F90_EXAMPLES_SOURCE_DIR}/${example}.f90)
-  TARGET_NAMING (hl_f90_ex_${example} ${LIB_TYPE})
-  TARGET_FORTRAN_PROPERTIES (hl_f90_ex_${example} ${LIB_TYPE} " " " ")
-  target_link_libraries (hl_f90_ex_${example} 
-      ${HDF5_HL_F90_LIB_TARGET}
-      ${HDF5_F90_LIB_TARGET}
-      ${HDF5_LIB_TARGET}
+  target_compile_options(hl_f90_ex_${example}
+      PRIVATE
+          $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_COMPILE_FLAGS}>
   )
-  target_include_directories (hl_f90_ex_${example} PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY})
-  set_target_properties (hl_f90_ex_${example} PROPERTIES LINKER_LANGUAGE Fortran)
-  set_target_properties (hl_f90_ex_${example} PROPERTIES FOLDER examples/hl/fortran)
-
-endforeach (example ${examples})
-
-if (BUILD_TESTING)
+#  set_property(TARGET hl_f90_ex_${example} APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"-SUBSYSTEM:CONSOLE">)
+#  set_property(TARGET hl_f90_ex_${example} APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_LINK_FLAGS}>)
+  if(MSVC)
+    set_property(TARGET hl_f90_ex_${example} PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE ${WIN_LINK_FLAGS}")
+  endif()
+  if (NOT BUILD_SHARED_LIBS)
+    target_include_directories (hl_f90_ex_${example} PRIVATE "${CMAKE_Fortran_MODULE_DIRECTORY}/static;${HDF5_F90_BINARY_DIR};${HDF5_F90_SRC_DIR}/src")
+    target_link_libraries (hl_f90_ex_${example} PRIVATE ${HDF5_HL_F90_LIB_TARGET} ${HDF5_F90_LIB_TARGET} ${HDF5_LIB_TARGET})
+    set_target_properties (hl_f90_ex_${example} PROPERTIES
+        LINKER_LANGUAGE Fortran
+        FOLDER examples/hl/fortran
+        Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/static
+    )
+  else ()
+    target_include_directories (hl_f90_ex_${example} PRIVATE "${CMAKE_Fortran_MODULE_DIRECTORY}/shared;${HDF5_F90_BINARY_DIR};${HDF5_F90_SRC_DIR}/src")
+    target_link_libraries (hl_f90_ex_${example} PRIVATE ${HDF5_HL_F90_LIBSH_TARGET} ${HDF5_F90_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
+    set_target_properties (hl_f90_ex_${example} PROPERTIES
+        LINKER_LANGUAGE Fortran
+        FOLDER examples/hl/fortran
+        Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/shared
+    )
+  endif ()
+endforeach ()
 
+if (BUILD_TESTING AND HDF5_TEST_FORTRAN AND HDF5_TEST_EXAMPLES AND HDF5_TEST_SERIAL)
   include (CMakeTests.cmake)
-
-endif (BUILD_TESTING)
+endif ()
diff --git a/hl/fortran/examples/CMakeTests.cmake b/hl/fortran/examples/CMakeTests.cmake
index 954a01b..46827b5 100644
--- a/hl/fortran/examples/CMakeTests.cmake
+++ b/hl/fortran/examples/CMakeTests.cmake
@@ -1,3 +1,14 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
 
 ##############################################################################
 ##############################################################################
@@ -5,6 +16,48 @@
 ##############################################################################
 ##############################################################################
 
+# Remove any output file left over from previous test run
+set (HL_FORTRAN_F90_EX_CLEANFILES
+    ex_ds1.h5
+    exlite.h5
+)
+add_test (
+    NAME HL_FORTRAN_f90_ex-clear-objects
+    COMMAND    ${CMAKE_COMMAND}
+        -E remove ${HL_FORTRAN_F90_EX_CLEANFILES}
+)
+set_tests_properties (HL_FORTRAN_f90_ex-clear-objects PROPERTIES
+    FIXTURES_SETUP clear_HL_FORTRAN_f90_ex
+    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+)
+add_test (
+    NAME HL_FORTRAN_f90_ex-clean-objects
+    COMMAND    ${CMAKE_COMMAND}
+        -E remove ${HL_FORTRAN_F90_EX_CLEANFILES}
+)
+set_tests_properties (HL_FORTRAN_f90_ex-clean-objects PROPERTIES
+    FIXTURES_CLEANUP clear_HL_FORTRAN_f90_ex
+    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+)
+
 foreach (example ${examples})
-  add_test (NAME HL_FORTRAN_f90_ex_${example} COMMAND $<TARGET_FILE:hl_f90_ex_${example}>)
-endforeach (example ${examples})
+  if (HDF5_ENABLE_USING_MEMCHECKER)
+    add_test (NAME HL_FORTRAN_f90_ex_${example} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:hl_f90_ex_${example}>)
+  else ()
+    add_test (NAME HL_FORTRAN_f90_ex_${example} COMMAND "${CMAKE_COMMAND}"
+        -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
+        -D "TEST_PROGRAM=$<TARGET_FILE:hl_f90_ex_${example}>"
+        -D "TEST_ARGS:STRING="
+        -D "TEST_EXPECT=0"
+        -D "TEST_SKIP_COMPARE=TRUE"
+        -D "TEST_OUTPUT=hl_f90_ex_${example}.txt"
+        #-D "TEST_REFERENCE=hl_f90_ex_${example}.out"
+        -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+        -P "${HDF_RESOURCES_DIR}/runTest.cmake"
+    )
+  endif ()
+  set_tests_properties (HL_FORTRAN_f90_ex_${example} PROPERTIES
+      FIXTURES_REQUIRED clear_HL_FORTRAN_f90_ex
+      WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+  )
+endforeach ()
diff --git a/hl/fortran/examples/Makefile.am b/hl/fortran/examples/Makefile.am
index 91cb7c5..eda9e7d 100644
--- a/hl/fortran/examples/Makefile.am
+++ b/hl/fortran/examples/Makefile.am
@@ -1,16 +1,13 @@
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 ##
 ## Makefile.am
 ## Run automake to generate a Makefile.in from this file.
@@ -45,15 +42,16 @@ FORTRAN_API=yes
 # Tell automake how to build examples using h5fc
 if BUILD_PARALLEL_CONDITIONAL
 $(EXTRA_PROG): $(H5FC_PP)
-	$(H5FC_PP) $(H5CCFLAGS) $(FCFLAGS) -o $@ $(srcdir)/$@.f90;
+	$(H5FC_PP) $(H5CCFLAGS) -o $@ $(srcdir)/$@.f90;
 else
 $(EXTRA_PROG): $(H5FC)
-	$(H5FC) $(H5CCFLAGS) $(FCFLAGS) -o $@ $(srcdir)/$@.f90;
+	$(H5FC) $(H5CCFLAGS) -o $@ $(srcdir)/$@.f90;
 endif
 
 # Tell automake how to install examples
 # Note: no '/' after DESTDIR.  Explanation in commence.am
-EXAMPLEDIR=${DESTDIR}$(exec_prefix)/share/hdf5_examples/hl/fortran
+EXAMPLEDIR=${DESTDIR}$(examplesdir)/hl/fortran
+EXAMPLETOPDIR=${DESTDIR}$(examplesdir)/hl
 
 # List dependencies for each example.  Normally, automake would take
 # care of this for us, but if we tell automake about the programs it
@@ -63,4 +61,4 @@ EXAMPLEDIR=${DESTDIR}$(exec_prefix)/share/hdf5_examples/hl/fortran
 # and fortran libraries above.
 
 include $(top_srcdir)/config/examples.am
-include $(top_srcdir)/config/conclude.am
+include $(top_srcdir)/config/conclude_fc.am
diff --git a/hl/fortran/examples/Makefile.in b/hl/fortran/examples/Makefile.in
deleted file mode 100644
index 320962a..0000000
--- a/hl/fortran/examples/Makefile.in
+++ /dev/null
@@ -1,1296 +0,0 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-#
-# HDF5-Fortran Examples Makefile(.in)
-#
-
-# We can't tell automake about example programs, because they need to be
-# built using h5cc (or h5fc, etc.) instead of the standard compilers.
-# This creates some extra work for us.
-VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-DIST_COMMON = $(top_srcdir)/config/commence.am \
-	$(top_srcdir)/config/examples.am \
-	$(top_srcdir)/config/conclude.am $(srcdir)/Makefile.in \
-	$(srcdir)/Makefile.am $(top_srcdir)/bin/mkinstalldirs \
-	$(srcdir)/run-hlfortran-ex.sh.in $(top_srcdir)/bin/test-driver
-TESTS =
-subdir = hl/fortran/examples
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/aclocal_cxx.m4 \
-	$(top_srcdir)/m4/aclocal_fc.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/src/H5config.h
-CONFIG_CLEAN_FILES = run-hlfortran-ex.sh
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__tty_colors_dummy = \
-  mgn= red= grn= lgn= blu= brg= std=; \
-  am__color_tests=no
-am__tty_colors = { \
-  $(am__tty_colors_dummy); \
-  if test "X$(AM_COLOR_TESTS)" = Xno; then \
-    am__color_tests=no; \
-  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
-    am__color_tests=yes; \
-  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
-    am__color_tests=yes; \
-  fi; \
-  if test $$am__color_tests = yes; then \
-    red='[0;31m'; \
-    grn='[0;32m'; \
-    lgn='[1;32m'; \
-    blu='[1;34m'; \
-    mgn='[0;35m'; \
-    brg='[1m'; \
-    std='[m'; \
-  fi; \
-}
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__recheck_rx = ^[ 	]*:recheck:[ 	]*
-am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
-am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
-# A command that, given a newline-separated list of test names on the
-# standard input, print the name of the tests that are to be re-run
-# upon "make recheck".
-am__list_recheck_tests = $(AWK) '{ \
-  recheck = 1; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-        { \
-          if ((getline line2 < ($$0 ".log")) < 0) \
-	    recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
-        { \
-          recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
-        { \
-          break; \
-        } \
-    }; \
-  if (recheck) \
-    print $$0; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# A command that, given a newline-separated list of test names on the
-# standard input, create the global log from their .trs and .log files.
-am__create_global_log = $(AWK) ' \
-function fatal(msg) \
-{ \
-  print "fatal: making $@: " msg | "cat >&2"; \
-  exit 1; \
-} \
-function rst_section(header) \
-{ \
-  print header; \
-  len = length(header); \
-  for (i = 1; i <= len; i = i + 1) \
-    printf "="; \
-  printf "\n\n"; \
-} \
-{ \
-  copy_in_global_log = 1; \
-  global_test_result = "RUN"; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-         fatal("failed to read from " $$0 ".trs"); \
-      if (line ~ /$(am__global_test_result_rx)/) \
-        { \
-          sub("$(am__global_test_result_rx)", "", line); \
-          sub("[ 	]*$$", "", line); \
-          global_test_result = line; \
-        } \
-      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
-        copy_in_global_log = 0; \
-    }; \
-  if (copy_in_global_log) \
-    { \
-      rst_section(global_test_result ": " $$0); \
-      while ((rc = (getline line < ($$0 ".log"))) != 0) \
-      { \
-        if (rc < 0) \
-          fatal("failed to read from " $$0 ".log"); \
-        print line; \
-      }; \
-      printf "\n"; \
-    }; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# Restructured Text title.
-am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
-# Solaris 10 'make', and several other traditional 'make' implementations,
-# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
-# by disabling -e (using the XSI extension "set +e") if it's set.
-am__sh_e_setup = case $$- in *e*) set +e;; esac
-# Default flags passed to test drivers.
-am__common_driver_flags = \
-  --color-tests "$$am__color_tests" \
-  --enable-hard-errors "$$am__enable_hard_errors" \
-  --expect-failure "$$am__expect_failure"
-# To be inserted before the command running the test.  Creates the
-# directory for the log if needed.  Stores in $dir the directory
-# containing $f, in $tst the test, in $log the log.  Executes the
-# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
-# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
-# will run the test scripts (or their associated LOG_COMPILER, if
-# thy have one).
-am__check_pre = \
-$(am__sh_e_setup);					\
-$(am__vpath_adj_setup) $(am__vpath_adj)			\
-$(am__tty_colors);					\
-srcdir=$(srcdir); export srcdir;			\
-case "$@" in						\
-  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
-    *) am__odir=.;; 					\
-esac;							\
-test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
-  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
-if test -f "./$$f"; then dir=./;			\
-elif test -f "$$f"; then dir=;				\
-else dir="$(srcdir)/"; fi;				\
-tst=$$dir$$f; log='$@'; 				\
-if test -n '$(DISABLE_HARD_ERRORS)'; then		\
-  am__enable_hard_errors=no; 				\
-else							\
-  am__enable_hard_errors=yes; 				\
-fi; 							\
-case " $(XFAIL_TESTS) " in				\
-  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
-    am__expect_failure=yes;;				\
-  *)							\
-    am__expect_failure=no;;				\
-esac; 							\
-$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
-# A shell command to get the names of the tests scripts with any registered
-# extension removed (i.e., equivalently, the names of the test logs, with
-# the '.log' extension removed).  The result is saved in the shell variable
-# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
-# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
-# since that might cause problem with VPATH rewrites for suffix-less tests.
-# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
-am__set_TESTS_bases = \
-  bases='$(TEST_LOGS)'; \
-  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
-  bases=`echo $$bases`
-RECHECK_LOGS = $(TEST_LOGS)
-AM_RECURSIVE_TARGETS = check recheck
-TEST_SUITE_LOG = test-suite.log
-am__test_logs1 = $(TESTS:=.log)
-am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
-TEST_LOGS = $(am__test_logs2:.sh.log=.log)
-SH_LOG_DRIVER = $(SHELL) $(top_srcdir)/bin/test-driver
-SH_LOG_COMPILE = $(SH_LOG_COMPILER) $(AM_SH_LOG_FLAGS) $(SH_LOG_FLAGS)
-am__set_b = \
-  case '$@' in \
-    */*) \
-      case '$*' in \
-        */*) b='$*';; \
-          *) b=`echo '$@' | sed 's/\.log$$//'`; \
-       esac;; \
-    *) \
-      b='$*';; \
-  esac
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
-AMTAR = @AMTAR@
-
-# H5_CFLAGS holds flags that should be used when building hdf5,
-# but which should not be exported to h5cc for building other programs.
-# AM_CFLAGS is an automake construct which should be used by Makefiles 
-# instead of CFLAGS, as CFLAGS is reserved solely for the user to define.
-# This applies to FCFLAGS, CXXFLAGS, CPPFLAGS, and LDFLAGS as well.
-AM_CFLAGS = @AM_CFLAGS@ @H5_CFLAGS@
-AM_CPPFLAGS = @AM_CPPFLAGS@ @H5_CPPFLAGS@
-AM_CXXFLAGS = @AM_CXXFLAGS@ @H5_CXXFLAGS@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@
-AM_LDFLAGS = @AM_LDFLAGS@ @H5_LDFLAGS@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BYTESEX = @BYTESEX@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CC_VERSION = @CC_VERSION@
-CFLAGS = @CFLAGS@
-CLEARFILEBUF = @CLEARFILEBUF@
-CODESTACK = @CODESTACK@
-CONFIG_DATE = @CONFIG_DATE@
-CONFIG_MODE = @CONFIG_MODE@
-CONFIG_USER = @CONFIG_USER@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CXX_VERSION = @CXX_VERSION@
-CYGPATH_W = @CYGPATH_W@
-DEBUG_PKG = @DEBUG_PKG@
-DEFAULT_API_VERSION = @DEFAULT_API_VERSION@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
-DIRECT_VFD = @DIRECT_VFD@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-EXTERNAL_FILTERS = @EXTERNAL_FILTERS@
-
-# Make sure that these variables are exported to the Makefiles
-F9XMODEXT = @F9XMODEXT@
-F9XMODFLAG = @F9XMODFLAG@
-F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
-FC = @FC@
-FC2003 = @FC2003@
-FCFLAGS = @FCFLAGS@
-FCFLAGS_f90 = @FCFLAGS_f90@
-FCLIBS = @FCLIBS@
-FC_VERSION = @FC_VERSION@
-FGREP = @FGREP@
-FSEARCH_DIRS = @FSEARCH_DIRS@
-GREP = @GREP@
-H5_CFLAGS = @H5_CFLAGS@
-H5_CPPFLAGS = @H5_CPPFLAGS@
-H5_CXXFLAGS = @H5_CXXFLAGS@
-H5_CXX_SHARED = @H5_CXX_SHARED@
-H5_FCFLAGS = @H5_FCFLAGS@
-H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@
-H5_LDFLAGS = @H5_LDFLAGS@
-H5_LONE_COLON = @H5_LONE_COLON@
-H5_VERSION = @H5_VERSION@
-HADDR_T = @HADDR_T@
-HAVE_DMALLOC = @HAVE_DMALLOC@
-HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@
-HAVE_PTHREAD = @HAVE_PTHREAD@
-HDF5_HL = @HDF5_HL@
-HDF5_INTERFACES = @HDF5_INTERFACES@
-HDF_CXX = @HDF_CXX@
-HDF_FORTRAN = @HDF_FORTRAN@
-HDF_FORTRAN2003 = @HDF_FORTRAN2003@
-HID_T = @HID_T@
-HL = @HL@
-HL_FOR = @HL_FOR@
-HSIZE_T = @HSIZE_T@
-HSSIZE_T = @HSSIZE_T@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTRUMENT = @INSTRUMENT@
-INSTRUMENT_LIBRARY = @INSTRUMENT_LIBRARY@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LL_PATH = @LL_PATH@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_STATIC_EXEC = @LT_STATIC_EXEC@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MPE = @MPE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJECT_NAMELEN_DEFAULT_F = @OBJECT_NAMELEN_DEFAULT_F@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PARALLEL = @PARALLEL@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-RANLIB = @RANLIB@
-ROOT = @ROOT@
-RUNPARALLEL = @RUNPARALLEL@
-RUNSERIAL = @RUNSERIAL@
-R_INTEGER = @R_INTEGER@
-R_LARGE = @R_LARGE@
-SEARCH = @SEARCH@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SIZE_T = @SIZE_T@
-STATIC_EXEC = @STATIC_EXEC@
-STATIC_SHARED = @STATIC_SHARED@
-STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@
-STRIP = @STRIP@
-TESTPARALLEL = @TESTPARALLEL@
-THREADSAFE = @THREADSAFE@
-TIME = @TIME@
-TR = @TR@
-TRACE_API = @TRACE_API@
-UNAME_INFO = @UNAME_INFO@
-USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
-USE_FILTER_SZIP = @USE_FILTER_SZIP@
-USINGMEMCHECKER = @USINGMEMCHECKER@
-VERSION = @VERSION@
-WORDS_BIGENDIAN = @WORDS_BIGENDIAN@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_FC = @ac_ct_FC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-
-# Install directories that automake doesn't know about
-docdir = $(exec_prefix)/doc
-dvidir = @dvidir@
-enable_shared = @enable_shared@
-enable_static = @enable_static@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-
-# Shell commands used in Makefiles
-RM = rm -f
-CP = cp
-
-# Some machines need a command to run executables; this is that command
-# so that our tests will run.
-# We use RUNEXEC instead of RUNSERIAL directly because it may be that
-# some tests need to be run with a different command.  Older versions
-# of the makefiles used the command
-# $(LIBTOOL) --mode=execute
-# in some directories, for instance.
-RUNEXEC = $(RUNSERIAL)
-
-# Libraries to link to while building
-LIBHDF5 = $(top_builddir)/src/libhdf5.la
-LIBH5TEST = $(top_builddir)/test/libh5test.la
-LIBH5F = $(top_builddir)/fortran/src/libhdf5_fortran.la
-LIBH5FTEST = $(top_builddir)/fortran/test/libh5test_fortran.la
-LIBH5CPP = $(top_builddir)/c++/src/libhdf5_cpp.la
-LIBH5TOOLS = $(top_builddir)/tools/lib/libh5tools.la
-LIBH5_HL = $(top_builddir)/hl/src/libhdf5_hl.la
-LIBH5F_HL = $(top_builddir)/hl/fortran/src/libhdf5hl_fortran.la
-LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
-
-# Note that in svn revision 19400 the '/' after DESTDIR in H5* variables below  
-# has been removed. According to the official description of DESTDIR by Gnu at 
-# http://www.gnu.org/prep/standards/html_node/DESTDIR.html, DESTDIR is 
-# prepended to the normal and complete install path that it precedes for the 
-# purpose of installing in a temporary directory which is useful for building 
-# rpms and other packages.  The '/' after ${DESTDIR} will be followed by another 
-# '/' at the beginning of the normal install path.  When DESTDIR is empty the  
-# path then begins with '//', which is incorrect and causes problems at least for 
-# Cygwin.   
-
-# Scripts used to build examples
-# If only shared libraries have been installed, have h5cc build examples with
-# shared libraries instead of static libraries
-H5CC = ${DESTDIR}$(bindir)/h5cc
-H5CC_PP = ${DESTDIR}$(bindir)/h5pcc
-H5FC = ${DESTDIR}$(bindir)/h5fc
-H5FC_PP = ${DESTDIR}$(bindir)/h5pfc
-H5CPP = ${DESTDIR}$(bindir)/h5c++
-ACLOCAL_AMFLAGS = "-I m4"
-
-# The trace script; this is used on source files from the C library to
-# insert tracing macros.
-TRACE = perl $(top_srcdir)/bin/trace
-
-# .chkexe files are used to mark tests that have run successfully.
-# .chklog files are output from those tests.
-# *.clog and *.clog2 are from the MPE option.
-CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5
-
-# Compile parallel fortran examples only if parallel is enabled
-@BUILD_PARALLEL_CONDITIONAL_TRUE@EXAMPLE_PROG_PARA = 
-
-# These are the programs that 'make all' or 'make tests' will build and
-# that 'make check' will run.  List them in the order in which they should
-# be run.
-# We don't tell automake about these programs so that it doesn't try to
-# compile them with the regular fortran compiler.
-EXAMPLE_PROG = exlite ex_ds1
-TEST_EXAMPLES_SCRIPT = $(INSTALL_SCRIPT_FILES)
-
-# List files to be installed here
-INSTALL_FILES = exlite.f90 ex_ds1.f90
-INSTALL_SCRIPT_FILES = run-hlfortran-ex.sh
-
-# Mark this directory as part of the Fortran API (this affects output
-# from tests in conclude.am)
-FORTRAN_API = yes
-
-# Tell automake how to install examples
-# Note: no '/' after DESTDIR.  Explanation in commence.am
-EXAMPLEDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples/hl/fortran
-
-# Assume that all tests in this directory are examples, and tell
-# conclude.am when to build them.
-EXTRA_PROG = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA)
-
-# We need to tell automake what to clean
-MOSTLYCLEANFILES = *.raw *.meta *.o
-CLEANFILES = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA)
-
-# Automake needs to be taught how to build lib, progs, and tests targets.
-# These will be filled in automatically for the most part (e.g.,
-# lib_LIBRARIES are built for lib target), but EXTRA_LIB, EXTRA_PROG, and
-# EXTRA_TEST variables are supplied to allow the user to force targets to
-# be built at certain times. 
-LIB = $(lib_LIBRARIES) $(lib_LTLIBRARIES) $(noinst_LIBRARIES)                 \
-      $(noinst_LTLIBRARIES) $(check_LIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LIB)
-
-PROGS = $(bin_PROGRAMS) $(bin_SCRIPTS) $(noinst_PROGRAMS) $(noinst_SCRIPTS)   \
-        $(EXTRA_PROG)
-
-chk_TESTS = $(check_PROGRAMS) $(check_SCRIPTS) $(EXTRA_TEST) 
-TEST_EXTENSIONS = .sh
-SH_LOG_COMPILER = $(SHELL)
-AM_SH_LOG_FLAGS = 
-TEST_PROG_CHKEXE = $(TEST_PROG:=.chkexe_)
-TEST_PROG_PARA_CHKEXE = $(TEST_PROG_PARA:=.chkexe_)
-TEST_SCRIPT_CHKSH = $(TEST_SCRIPT:=.chkexe_)
-TEST_SCRIPT_PARA_CHKSH = $(TEST_SCRIPT_PARA:=.chkexe_)
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .log .sh .sh$(EXEEXT) .trs
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/examples.am $(top_srcdir)/config/conclude.am $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign hl/fortran/examples/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign hl/fortran/examples/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-$(top_srcdir)/config/commence.am $(top_srcdir)/config/examples.am $(top_srcdir)/config/conclude.am:
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-run-hlfortran-ex.sh: $(top_builddir)/config.status $(srcdir)/run-hlfortran-ex.sh.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-# Recover from deleted '.trs' file; this should ensure that
-# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
-# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
-# to avoid problems with "make -n".
-.log.trs:
-	rm -f $< $@
-	$(MAKE) $(AM_MAKEFLAGS) $<
-
-# Leading 'am--fnord' is there to ensure the list of targets does not
-# expand to empty, as could happen e.g. with make check TESTS=''.
-am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
-am--force-recheck:
-	@:
-
-$(TEST_SUITE_LOG): $(TEST_LOGS)
-	@$(am__set_TESTS_bases); \
-	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
-	redo_bases=`for i in $$bases; do \
-	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
-	            done`; \
-	if test -n "$$redo_bases"; then \
-	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
-	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
-	  if $(am__make_dryrun); then :; else \
-	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
-	  fi; \
-	fi; \
-	if test -n "$$am__remaking_logs"; then \
-	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
-	       "recursion detected" >&2; \
-	else \
-	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
-	fi; \
-	if $(am__make_dryrun); then :; else \
-	  st=0;  \
-	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
-	  for i in $$redo_bases; do \
-	    test -f $$i.trs && test -r $$i.trs \
-	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
-	    test -f $$i.log && test -r $$i.log \
-	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
-	  done; \
-	  test $$st -eq 0 || exit 1; \
-	fi
-	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
-	ws='[ 	]'; \
-	results=`for b in $$bases; do echo $$b.trs; done`; \
-	test -n "$$results" || results=/dev/null; \
-	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
-	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
-	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
-	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
-	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
-	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
-	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
-	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
-	  success=true; \
-	else \
-	  success=false; \
-	fi; \
-	br='==================='; br=$$br$$br$$br$$br; \
-	result_count () \
-	{ \
-	    if test x"$$1" = x"--maybe-color"; then \
-	      maybe_colorize=yes; \
-	    elif test x"$$1" = x"--no-color"; then \
-	      maybe_colorize=no; \
-	    else \
-	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
-	    fi; \
-	    shift; \
-	    desc=$$1 count=$$2; \
-	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
-	      color_start=$$3 color_end=$$std; \
-	    else \
-	      color_start= color_end=; \
-	    fi; \
-	    echo "$${color_start}# $$desc $$count$${color_end}"; \
-	}; \
-	create_testsuite_report () \
-	{ \
-	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
-	  result_count $$1 "PASS: " $$pass  "$$grn"; \
-	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
-	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
-	  result_count $$1 "FAIL: " $$fail  "$$red"; \
-	  result_count $$1 "XPASS:" $$xpass "$$red"; \
-	  result_count $$1 "ERROR:" $$error "$$mgn"; \
-	}; \
-	{								\
-	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
-	    $(am__rst_title);						\
-	  create_testsuite_report --no-color;				\
-	  echo;								\
-	  echo ".. contents:: :depth: 2";				\
-	  echo;								\
-	  for b in $$bases; do echo $$b; done				\
-	    | $(am__create_global_log);					\
-	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
-	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
-	if $$success; then						\
-	  col="$$grn";							\
-	 else								\
-	  col="$$red";							\
-	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
-	fi;								\
-	echo "$${col}$$br$${std}"; 					\
-	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
-	echo "$${col}$$br$${std}"; 					\
-	create_testsuite_report --maybe-color;				\
-	echo "$$col$$br$$std";						\
-	if $$success; then :; else					\
-	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
-	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
-	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
-	  fi;								\
-	  echo "$$col$$br$$std";					\
-	fi;								\
-	$$success || exit 1
-recheck: all 
-	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-	@set +e; $(am__set_TESTS_bases); \
-	bases=`for i in $$bases; do echo $$i; done \
-	         | $(am__list_recheck_tests)` || exit 1; \
-	log_list=`for i in $$bases; do echo $$i.log; done`; \
-	log_list=`echo $$log_list`; \
-	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
-	        am__force_recheck=am--force-recheck \
-	        TEST_LOGS="$$log_list"; \
-	exit $$?
-.sh.log:
-	@p='$<'; \
-	$(am__set_b); \
-	$(am__check_pre) $(SH_LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_SH_LOG_DRIVER_FLAGS) $(SH_LOG_DRIVER_FLAGS) -- $(SH_LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-@am__EXEEXT_TRUE@.sh$(EXEEXT).log:
-@am__EXEEXT_TRUE@	@p='$<'; \
-@am__EXEEXT_TRUE@	$(am__set_b); \
-@am__EXEEXT_TRUE@	$(am__check_pre) $(SH_LOG_DRIVER) --test-name "$$f" \
-@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
-@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_SH_LOG_DRIVER_FLAGS) $(SH_LOG_DRIVER_FLAGS) -- $(SH_LOG_COMPILE) \
-@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
-check: check-am
-all-am: Makefile all-local
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
-	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
-	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
-	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-data-local
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am: installcheck-local
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool \
-	mostlyclean-local
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-local
-
-.MAKE: check-am install-am install-strip
-
-.PHONY: all all-am all-local check check-TESTS check-am clean \
-	clean-generic clean-libtool cscopelist-am ctags-am distclean \
-	distclean-generic distclean-libtool distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-data-local install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installcheck-local installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
-	pdf-am ps ps-am recheck tags-am uninstall uninstall-am \
-	uninstall-local
-
-
-# List all build rules defined by HDF5 Makefiles as "PHONY" targets here.
-# This tells the Makefiles that these targets are not files to be built but
-# commands that should be executed even if a file with the same name already
-# exists.
-.PHONY: build-check-clean build-check-p build-check-s build-lib build-progs \
-        build-tests check-clean check-install check-p check-s check-vfd \
-        install-doc lib progs tests uninstall-doc _exec_check-s _test help
-
-help:
-	@$(top_srcdir)/bin/makehelp
-
-# Tell automake how to build examples using h5fc
-@BUILD_PARALLEL_CONDITIONAL_TRUE@$(EXTRA_PROG): $(H5FC_PP)
-@BUILD_PARALLEL_CONDITIONAL_TRUE@	$(H5FC_PP) $(H5CCFLAGS) $(FCFLAGS) -o $@ $(srcdir)/$@.f90;
-@BUILD_PARALLEL_CONDITIONAL_FALSE@$(EXTRA_PROG): $(H5FC)
-@BUILD_PARALLEL_CONDITIONAL_FALSE@	$(H5FC) $(H5CCFLAGS) $(FCFLAGS) -o $@ $(srcdir)/$@.f90;
-
-# How to create EXAMPLEDIR if it doesn't already exist
-$(EXAMPLEDIR):
-	-$(top_srcdir)/bin/mkdirs $@
-$(EXAMPLETOPDIR):
-	-$(top_srcdir)/bin/mkdirs $@
-
-# Install and uninstall rules.  We install the source files, not the
-# example programs themselves.
-install-data-local:
-	@$(MAKE) $(AM_MAKEFLAGS) install-examples
-uninstall-local:
-	@$(MAKE) $(AM_MAKEFLAGS) uninstall-examples
-
-install-examples: $(EXAMPLEDIR) $(INSTALL_FILES) 
-	@for f in X $(INSTALL_FILES); do                                     \
-	  if test $$f != X; then                                             \
-	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);    \
-            chmod a-x $(EXAMPLEDIR)/$$f;                                     \
-	  fi;                                                                \
-	done
-	@for f in X $(INSTALL_SCRIPT_FILES); do                                   \
-	  if test $$f != X; then                                             \
-	    (set -x; $(INSTALL) $$f $(EXAMPLEDIR)/. || exit 1);\
-	  fi;                                                                \
-	done
-	@for f in X $(INSTALL_TOP_FILES); do                       \
-	  if test $$f != X; then                                             \
-	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1); \
-            chmod a-x $(EXAMPLETOPDIR)/$$f;\
-	  fi;                                                                \
-	done
-	@for f in X $(INSTALL_TOP_SCRIPT_FILES); do                       \
-	  if test $$f != X; then                                             \
-	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1); \
-	  fi;                                                                \
-	done
-
-uninstall-examples:
-	@if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then             \
-	  set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_FILES);                \
-	fi
-	@if test -n "$(INSTALL_SCRIPT_FILES)" -a -d $(EXAMPLEDIR); then           \
-	  set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_SCRIPT_FILES);              \
-	fi
-	@if test -n "$(INSTALL_TOP_FILES)" -a -d $(EXAMPLETOPDIR); then    \
-	  set -x; cd $(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_FILES);       \
-	fi
-	@if test -n "$(INSTALL_TOP_SCRIPT_FILES)" -a -d $(EXAMPLETOPDIR); then    \
-	  set -x; cd $(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_SCRIPT_FILES);       \
-	fi
-
-installcheck-local:
-	@if test "$(STATIC_SHARED)" = "static, shared"; then               \
-	  H5CCFLAGS="-shlib" $(MAKE) $(AM_MAKEFLAGS) check;                \
-	  $(MAKE) $(AM_MAKEFLAGS) clean;                                   \
-	  H5CCFLAGS="" $(MAKE) $(AM_MAKEFLAGS) check;                      \
-	elif test "$(STATIC_SHARED)" = "shared"; then                     \
-	  H5CCFLAGS="-shlib" $(MAKE) $(AM_MAKEFLAGS) check;                \
-	else                                                              \
-	  $(MAKE) $(AM_MAKEFLAGS) check;                                   \
-	fi 
-	@if test "$(INSTALL_FILES)" -a $(TEST_EXAMPLES_SCRIPT) -a -d $(EXAMPLEDIR); then \
-	    echo "============================";                                         \
-	    echo "Testing $(TEST_EXAMPLES_SCRIPT)";                                      \
-	    echo "============================";                                         \
-	    (cd $(EXAMPLEDIR);                                                           \
-	     /bin/sh ./$(TEST_EXAMPLES_SCRIPT);)                                                   \
-	fi
-
-# lib/progs/tests targets recurse into subdirectories. build-* targets
-# build files in this directory.
-build-lib: $(LIB)
-build-progs: $(LIB) $(PROGS)
-build-tests: $(LIB) $(PROGS) $(chk_TESTS)
-
-# General rule for recursive building targets.
-# BUILT_SOURCES contain targets that need to be built before anything else
-# in the directory (e.g., for Fortran type detection)
-lib progs tests check-s check-p :: $(BUILT_SOURCES)
-	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
-	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X && test $$d != .; then                           \
-	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
-	    fi;                                                               \
-	done
-
-# General rule for recursive cleaning targets.  Like the rule above,
-# but doesn't require building BUILT_SOURCES.
-check-clean ::
-	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
-	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X && test $$d != .; then                           \
-	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
-	    fi;                                                               \
-	done
-
-# Tell Automake to build tests when the user types `make all' (this is
-# not its default behavior).  Also build EXTRA_LIB and EXTRA_PROG since
-# Automake won't build them automatically, either.
-all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(chk_TESTS)
-
-# make install-doc doesn't do anything outside of doc directory, but
-# Makefiles should recognize it.
-# UPDATE: docs no longer reside in this build tree, so this target
-# is depreciated.
-install-doc uninstall-doc:
-	@echo "Nothing to be done."
-
-# clean up files generated by tests so they can be re-run.
-build-check-clean:
-	$(RM) -rf $(CHECK_CLEANFILES)
-
-# run check-clean whenever mostlyclean is run
-mostlyclean-local: build-check-clean
-
-# check-install is just a synonym for installcheck
-check-install: installcheck
-
-# Run each test in order, passing $(TEST_FLAGS) to the program.
-# Since tests are done in a shell loop, "make -i" does apply inside it.
-# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
-# The timestamps give a rough idea how much time the tests use.
-#
-# Note that targets in chk_TESTS (defined above) will be built when the user
-# types 'make tests' or 'make check', but only programs in TEST_PROG,
-# TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
-check-TESTS: test
-
-test _test:
-	@$(MAKE) build-check-s
-	@$(MAKE) build-check-p
-
-# Actual execution of check-s.
-build-check-s: $(LIB) $(PROGS) $(chk_TESTS)
-	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
-	   echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
-	fi
-	@$(MAKE) $(AM_MAKEFLAGS) _exec_check-s
-	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
-	    echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
-	fi
-
-_exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH)
-
-# The dummy.chkexe here prevents the target from being
-# empty if there are no tests in the current directory.
-# $${log} is the log file.
-# $${tname} is the name of test.
-$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
-	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \
-	   tname=$(@:.chkexe_=)$(EXEEXT);\
-	   log=$(@:.chkexe_=.chklog); \
-	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \
-	      echo "No need to test $${tname} again."; \
-	   else \
-	      echo "============================" > $${log}; \
-	      if test "X$(FORTRAN_API)" = "Xyes"; then \
-	         echo "Fortran API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "Fortran API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(CXX_API)" = "Xyes"; then \
-	         echo "C++ API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "C++ API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log};\
-	      else \
-	         echo "Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "$(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      fi; \
-	      echo "============================" >> $${log}; \
-	      srcdir="$(srcdir)" \
-	         $(TIME) $(RUNEXEC) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \
-	         && touch $(@:.chkexe_=.chkexe) || \
-	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	         (cat $${log} && false) || exit 1; \
-	      echo "" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
-	      echo "============================" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
-	      cat $${log}; \
-	   fi; \
-	fi
-
-# The dummysh.chkexe here prevents the target from being
-# empty if there are no tests in the current directory.
-# $${log} is the log file.
-# $${tname} is the name of test.
-$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
-	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummysh.chkexe_"; then \
-	   cmd=$(@:.chkexe_=);\
-	   tname=`basename $$cmd`;\
-	   chkname=`basename $(@:.chkexe_=.chkexe)`;\
-	   log=`basename $(@:.chkexe_=.chklog)`; \
-	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer $${chkname} $$cmd $(SCRIPT_DEPEND); then \
-	      echo "No need to test $${tname} again."; \
-	   else \
-	      echo "============================" > $${log}; \
-	      if test "X$(FORTRAN_API)" = "Xyes"; then \
-	         echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(CXX_API)" = "Xyes"; then \
-	         echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      else \
-	         echo "Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      fi; \
-	      echo "============================" >> $${log}; \
-	      RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
-	      srcdir="$(srcdir)" \
-	         $(TIME) $(SHELL) $$cmd $(TEST_FLAGS) >> $${log} 2>&1 \
-	         && touch $${chkname} || \
-	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	         (cat $${log} && false) || exit 1; \
-	      echo "" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
-	      echo "============================" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
-	      cat $${log}; \
-	   fi; \
-	   echo "============================"; \
-	fi
-
-# Actual execution of check-p.
-build-check-p: $(LIB) $(PROGS) $(chk_TESTS)
-	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
-	   echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
-	fi
-	@if test -n "$(TEST_PROG_PARA)"; then                                \
-	    echo "**** Hint ****";                                            \
-	    echo "Parallel test files reside in the current directory"        \
-	         "by default.";                                               \
-	    echo "Set HDF5_PARAPREFIX to use another directory. E.g.,";       \
-	    echo "    HDF5_PARAPREFIX=/PFS/user/me";                          \
-	    echo "    export HDF5_PARAPREFIX";                                \
-	    echo "    make check";                                            \
-	    echo "**** end of Hint ****";                                     \
-	fi
-	@for test in $(TEST_PROG_PARA) dummy; do                             \
-	   if test $$test != dummy; then                                      \
-	      $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ \
-	      RUNEXEC="$(RUNPARALLEL)" || exit 1; \
-	   fi;                                                                \
-	done
-	@for test in $(TEST_SCRIPT_PARA) dummy; do                           \
-	  if test $$test != dummy; then                                      \
-	    $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ || exit 1; \
-	  fi;                                                                 \
-	done
-	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
-	    echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
-	fi
-
-# Run test with different Virtual File Driver
-check-vfd: $(LIB) $(PROGS) $(chk_TESTS)
-	@for vfd in $(VFD_LIST) dummy; do                                     \
-	    if test $$vfd != dummy; then                                      \
-	        echo "============================";                          \
-	        echo "Testing Virtual File Driver $$vfd";                     \
-	        echo "============================";                          \
-	        $(MAKE) $(AM_MAKEFLAGS) check-clean || exit 1;                \
-	        HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check || exit 1;    \
-	    fi;                                                               \
-	done
-
-# List dependencies for each example.  Normally, automake would take
-# care of this for us, but if we tell automake about the programs it
-# will try to build them with the normal C compiler, not h5cc.  This is
-# an inelegant way of solving the problem.
-# All programs share the same build rule and a dependency on the main hdf5
-# and fortran libraries above.
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/hl/fortran/examples/ex_ds1.f90 b/hl/fortran/examples/ex_ds1.f90
index d77f8e0..b34467e 100644
--- a/hl/fortran/examples/ex_ds1.f90
+++ b/hl/fortran/examples/ex_ds1.f90
@@ -1,16 +1,13 @@
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-! * Copyright by The HDF Group.                                               *
-! * Copyright by the Board of Trustees of the University of Illinois.         *
-! * All rights reserved.                                                      *
-! *                                                                           *
-! * This file is part of HDF5.  The full HDF5 copyright notice, including     *
-! * terms governing use, modification, and redistribution, is contained in    *
-! * the files COPYING and Copyright.html.  COPYING can be found at the root   *
-! * of the source code distribution tree; Copyright.html can be found at the  *
-! * root level of an installed copy of the electronic HDF5 document set and   *
-! * is linked from the top-level documents page.  It can also be found at     *
-! * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-! * access to either file, you may request a copy from help@hdfgroup.org.     *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 PROGRAM example_ds
 
@@ -20,7 +17,7 @@ PROGRAM example_ds
 
   IMPLICIT NONE
 
-  INTEGER, PARAMETER :: RANK      = 2 ! rank of DATA dataset 
+  INTEGER, PARAMETER :: RANK      = 2 ! rank of DATA dataset
   INTEGER, PARAMETER :: DIM_DATA  = 12
   INTEGER, PARAMETER :: DIM1_SIZE = 3
   INTEGER, PARAMETER :: DIM2_SIZE = 4
@@ -35,13 +32,13 @@ PROGRAM example_ds
   INTEGER(hid_t) :: fid    ! file ID
   INTEGER(hid_t) :: did    ! dataset ID
   INTEGER(hid_t) :: dsid   ! DS dataset ID
-  INTEGER :: rankds = 1    ! rank of DS dataset 
-  INTEGER(hsize_t), DIMENSION(1:rank) ::  dims  = (/DIM2_SIZE,DIM1_SIZE/) ! size of data dataset 
-  INTEGER, DIMENSION(1:DIM_DATA) :: buf = (/1,2,3,4,5,6,7,8,9,10,11,12/)  ! data of data dataset 
-  INTEGER(hsize_t), DIMENSION(1:1) ::  s1_dim  = (/DIM1_SIZE/)  ! size of DS 1 dataset 
-  INTEGER(hsize_t), DIMENSION(1:1) ::  s2_dim  = (/DIM2_SIZE/)  ! size of DS 2 dataset 
-  REAL, DIMENSION(1:DIM1_SIZE) :: s1_wbuf = (/10,20,30/)     ! data of DS 1 dataset 
-  REAL, DIMENSION(1:DIM2_SIZE) :: s2_wbuf = (/10,20,50,100/) ! data of DS 2 dataset 
+  INTEGER :: rankds = 1    ! rank of DS dataset
+  INTEGER(hsize_t), DIMENSION(1:rank) ::  dims  = (/DIM2_SIZE,DIM1_SIZE/) ! size of data dataset
+  INTEGER, DIMENSION(1:DIM_DATA) :: buf = (/1,2,3,4,5,6,7,8,9,10,11,12/)  ! data of data dataset
+  INTEGER(hsize_t), DIMENSION(1:1) ::  s1_dim  = (/DIM1_SIZE/)  ! size of DS 1 dataset
+  INTEGER(hsize_t), DIMENSION(1:1) ::  s2_dim  = (/DIM2_SIZE/)  ! size of DS 2 dataset
+  REAL, DIMENSION(1:DIM1_SIZE) :: s1_wbuf = (/10,20,30/)     ! data of DS 1 dataset
+  REAL, DIMENSION(1:DIM2_SIZE) :: s2_wbuf = (/10,20,50,100/) ! data of DS 2 dataset
   INTEGER :: err
   INTEGER :: num_scales
   INTEGER(size_t) :: name_len
@@ -58,7 +55,7 @@ PROGRAM example_ds
   ! create a file using default properties
   CALL H5Fcreate_f("ex_ds1.h5",H5F_ACC_TRUNC_F, fid, err)
 
-  ! make a dataset 
+  ! make a dataset
   CALL H5LTmake_dataset_int_f(fid, DSET_NAME, rank,dims,buf, err)
 
   ! make a DS dataset for the first dimension
@@ -71,7 +68,7 @@ PROGRAM example_ds
   ! attach the DS_1_NAME dimension scale to DSET_NAME at dimension 1
   ! and then detach it.
   !-------------------------------------------------------------------------
- 
+
   ! get the dataset id for DSET_NAME
   CALL H5Dopen_f(fid, DSET_NAME, did, err)
 
@@ -84,11 +81,11 @@ PROGRAM example_ds
   ! attach the DS_1_NAME dimension scale to DSET_NAME at dimension index 1
   CALL H5DSattach_scale_f(did, dsid, DIM1, err)
 
-  ! Test if dimension Scale Attached 
+  ! Test if dimension Scale Attached
   CALL H5DSis_attached_f(did, dsid, DIM1, is_attached, err)
   WRITE(*,'(/,5X,3(A,1X),I0,A,L1)') 'Is',TRIM(DS_1_NAME),&
        'attached to dimension',DIM1,' ... ',is_attached
-  
+
 
   ! Check to see how many Dimension Scales are attached
 
@@ -105,11 +102,11 @@ PROGRAM example_ds
   CALL H5DSis_attached_f(did, dsid, DIM1, is_attached, err)
   WRITE(*,'(/,5X,3(A,1X),I0,A,L1)') 'Is',TRIM(DS_1_NAME),&
        'attached to dimension',DIM1,' ... ',is_attached
-  
+
   !-------------------------------------------------------------------------
   ! set the DS_1_NAME dimension scale to DSET_NAME at dimension 1
   !-------------------------------------------------------------------------
- 
+
   WRITE(*,'(/,5A,I0)') &
        'Set Dimension Scale "', TRIM(DS_1_NAME), '" to "', TRIM(DSET_NAME), '" at dimension ', DIM1
 
@@ -125,11 +122,11 @@ PROGRAM example_ds
   name = ''
   CALL H5DSget_scale_name_f(dsid, name, name_len, err)
 
-  WRITE(*,'(/,5X,A,A)') 'The Dimension Scale name is ... ', name(1:name_len) 
+  WRITE(*,'(/,5X,A,A)') 'The Dimension Scale name is ... ', name(1:name_len)
 
   ! Setting Dimension Scale Label
 
-  WRITE(*,'(/,A,I0)') "Setting Dimension Scale label ""X"" for dimension ", DIM1 
+  WRITE(*,'(/,A,I0)') "Setting Dimension Scale label ""X"" for dimension ", DIM1
 
   CALL H5DSset_label_f(did, DIM1, "X", err)
 
@@ -141,11 +138,11 @@ PROGRAM example_ds
 
   ! close DS id
   CALL H5Dclose_f(dsid, err)
-  
+
   !-------------------------------------------------------------------------
   ! attach the DS_2_NAME dimension scale to DSET_NAME
   !-------------------------------------------------------------------------
- 
+
   ! get the DS dataset id
   CALL H5Dopen_f(fid, DS_2_NAME, dsid, err)
 
@@ -165,7 +162,7 @@ PROGRAM example_ds
   name = ''
   CALL H5DSget_scale_name_f(dsid, name(1:name_len), name_len, err)
 
-  WRITE(*,'(/,5X,A,A)') 'The Dimension Scale name is ... ', name(1:name_len) 
+  WRITE(*,'(/,5X,A,A)') 'The Dimension Scale name is ... ', name(1:name_len)
 
 
   ! Setting Dimension Scale Label
@@ -179,13 +176,14 @@ PROGRAM example_ds
   label_len = 25
   label = ''
   CALL H5DSget_label_f(did, DIM2, label, label_len, err)
-  
+
   WRITE(*,'(/,5X,A,I0,2A,/)') 'Dimension Scale Label for dimension ', DIM2, ' is ... ', label(1:label_len)
 
- ! close DS id
+ ! close DS ids
   CALL H5Dclose_f(dsid, err)
+  CALL H5Dclose_f(did, err)
 
- ! close file 
+ ! close file
   CALL H5Fclose_f(fid, err)
 
 END PROGRAM example_ds
diff --git a/hl/fortran/examples/exlite.f90 b/hl/fortran/examples/exlite.f90
index 916bcb9..7d080d1 100644
--- a/hl/fortran/examples/exlite.f90
+++ b/hl/fortran/examples/exlite.f90
@@ -1,16 +1,13 @@
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
 !                                                                             *
 !   This file is part of HDF5.  The full HDF5 copyright notice, including     *
 !   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 
 !
diff --git a/hl/fortran/examples/run-hlfortran-ex.sh.in b/hl/fortran/examples/run-hlfortran-ex.sh.in
index 2780bff..83a6195 100644
--- a/hl/fortran/examples/run-hlfortran-ex.sh.in
+++ b/hl/fortran/examples/run-hlfortran-ex.sh.in
@@ -5,12 +5,10 @@
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 
 #
 #  This file:  run-hlfortran-ex.sh
@@ -20,7 +18,7 @@
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 #                                                                               #
 # This script will compile and run the fortran examples from source files       #
-# installed in .../share/hdf5_examples/hl/fortran using h5fc or h5pfc.  The     #
+# installed in @examplesdir@/hl/fortran using h5fc or h5pfc.  The               #
 # order for running programs with RunTest in the MAIN section below is taken    #
 # from the Makefile.  The order is important since some of the test programs    #
 # use data files created by earlier test programs.  Any future additions should #
@@ -34,7 +32,7 @@ EXIT_FAILURE=1
 
 # Where the tool is installed.
 # default is relative path to installed location of the tools
-prefix="${prefix:-../../../../}"
+prefix="${prefix:-@prefix@}"
 PARALLEL=@PARALLEL@             # Am I in parallel mode?
 AR="@AR@"
 RANLIB="@RANLIB@"
@@ -82,5 +80,5 @@ rm *.o
 rm *.h5
 echo
 
-exit $EXIT_VALUE 
+exit $EXIT_VALUE
 
diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt
index 6e6e44a..3eae810 100644
--- a/hl/fortran/src/CMakeLists.txt
+++ b/hl/fortran/src/CMakeLists.txt
@@ -1,124 +1,373 @@
-cmake_minimum_required (VERSION 3.1.0)
-PROJECT(HDF5_HL_F90_SRC C CXX Fortran)
+cmake_minimum_required (VERSION 3.18)
+project (HDF5_HL_F90_SRC C Fortran)
 
 #-----------------------------------------------------------------------------
-# Setup include Directories
+# configure def file for shared libs on windows
+if (WIN32)
+  if (BUILD_SHARED_LIBS)
+    if (MSVC)
+      configure_file (${HDF5_HL_F90_SRC_SOURCE_DIR}/hdf5_hl_fortrandll.def.in ${HDF5_HL_F90_SRC_BINARY_DIR}/hdf5_hl_fortrandll.def @ONLY)
+    endif ()
+  endif ()
+endif ()
+
+#-----------------------------------------------------------------------------
+# Generate the H5LT and H5TB REAL APIs
 #-----------------------------------------------------------------------------
-INCLUDE_DIRECTORIES (
-    ${HDF5_HL_SRC_DIR}/src
-    ${HDF5_F90_SRC_DIR}/src
-    ${HDF5_F90_BINARY_DIR}
+
+add_executable (H5HL_buildiface ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5HL_buildiface.F90)
+target_include_directories (H5HL_buildiface PRIVATE "${HDF5_SRC_BINARY_DIR};${HDF5_F90_BINARY_DIR}")
+if (WIN32 AND MSVC)
+  if (BUILD_SHARED_LIBS)
+    set_target_properties (H5HL_buildiface PROPERTIES COMPILE_FLAGS "/MT")
+  endif ()
+endif ()
+#set_property(TARGET H5HL_buildiface APPEND PROPERTY
+#    LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"-SUBSYSTEM:CONSOLE">
+#)
+if(MSVC)
+  set_property(TARGET H5HL_buildiface PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE")
+endif()
+set_target_properties (H5HL_buildiface PROPERTIES
+    LINKER_LANGUAGE Fortran
+    Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}
 )
 
+if (BUILD_SHARED_LIBS)
+  file (MAKE_DIRECTORY "${HDF5_HL_F90_BINARY_DIR}/shared")
+  set (MODSH_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/shared/${HDF_CFG_BUILD_TYPE})
+endif ()
+if (NOT ONLY_SHARED_LIBS)
+  file (MAKE_DIRECTORY "${HDF5_HL_F90_BINARY_DIR}/static")
+  set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static/${HDF_CFG_BUILD_TYPE})
+endif ()
+
 #-----------------------------------------------------------------------------
 # hl_f90CStub lib
 #-----------------------------------------------------------------------------
-set (HDF5_HL_F90_C_SRCS
+set (HDF5_HL_F90_C_SOURCES
     ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5DSfc.c
     ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5LTfc.c
     ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5IMfc.c
     ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5IMcc.c
     ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5TBfc.c
 )
-set_source_files_properties (${HDF5_HL_F90_C_SRCS} PROPERTIES LANGUAGE C)
-
-set (HDF5_HL_F90_HEADERS ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5LTf90proto.h)
-
-add_library (${HDF5_HL_F90_C_LIB_TARGET} ${LIB_TYPE} ${HDF5_HL_F90_C_SRCS} ${HDF5_HL_F90_HEADERS})
-TARGET_C_PROPERTIES (${HDF5_HL_F90_C_LIB_TARGET} ${LIB_TYPE} " " " ")
-target_link_libraries (${HDF5_HL_F90_C_LIB_TARGET} ${HDF5_F90_C_LIB_TARGET} ${HDF5_HL_LIB_TARGET})
-set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_F90_C_LIB_TARGET}")
-H5_SET_LIB_OPTIONS (${HDF5_HL_F90_C_LIB_TARGET} ${HDF5_HL_F90_C_LIB_NAME} ${LIB_TYPE})
-set_target_properties (${HDF5_HL_F90_C_LIB_TARGET} PROPERTIES
-    FOLDER libraries/hl/fortran
-    LINKER_LANGUAGE C
-    INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
-)
+set_source_files_properties (${HDF5_HL_F90_C_SOURCES} PROPERTIES LANGUAGE C)
+
+set (HDF5_HL_F90_HEADERS ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5LTf90proto.h ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5IMcc.h)
+
+if (NOT ONLY_SHARED_LIBS)
+  add_library (${HDF5_HL_F90_C_LIB_TARGET} STATIC ${HDF5_HL_F90_C_SOURCES} ${HDF5_HL_F90_HEADERS})
+  target_include_directories (${HDF5_HL_F90_C_LIB_TARGET}
+      PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};${HDF5_F90_BINARY_DIR}/static;$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
+      INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
+  )
+  target_compile_options(${HDF5_HL_F90_C_LIB_TARGET} PRIVATE "${HDF5_CMAKE_C_FLAGS}")
+  TARGET_C_PROPERTIES (${HDF5_HL_F90_C_LIB_TARGET} STATIC)
+  target_link_libraries (${HDF5_HL_F90_C_LIB_TARGET} PUBLIC ${HDF5_F90_C_LIB_TARGET} ${HDF5_HL_LIB_TARGET})
+  set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_F90_C_LIB_TARGET}")
+  H5_SET_LIB_OPTIONS (${HDF5_HL_F90_C_LIB_TARGET} ${HDF5_HL_F90_C_LIB_NAME} STATIC 0)
+  set_target_properties (${HDF5_HL_F90_C_LIB_TARGET} PROPERTIES
+      FOLDER libraries/hl/fortran
+      LINKER_LANGUAGE C
+  )
+  set (install_targets ${HDF5_HL_F90_C_LIB_TARGET})
+endif ()
+if (BUILD_SHARED_LIBS)
+  add_library (${HDF5_HL_F90_C_LIBSH_TARGET} SHARED ${HDF5_HL_F90_C_SOURCES} ${HDF5_HL_F90_HEADERS})
+  target_include_directories (${HDF5_HL_F90_C_LIBSH_TARGET}
+      PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};${HDF5_F90_BINARY_DIR}/shared;$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
+      INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
+  )
+  target_compile_options(${HDF5_HL_F90_C_LIBSH_TARGET} PRIVATE "${HDF5_CMAKE_C_FLAGS}")
+  target_compile_definitions(${HDF5_HL_F90_C_LIBSH_TARGET} PUBLIC "H5_BUILT_AS_DYNAMIC_LIB")
+  TARGET_C_PROPERTIES (${HDF5_HL_F90_C_LIBSH_TARGET} SHARED)
+  target_link_libraries (${HDF5_HL_F90_C_LIBSH_TARGET} PUBLIC ${HDF5_F90_C_LIBSH_TARGET} ${HDF5_HL_LIBSH_TARGET})
+  set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_F90_C_LIBSH_TARGET}")
+  H5_SET_LIB_OPTIONS (${HDF5_HL_F90_C_LIBSH_TARGET} ${HDF5_HL_F90_C_LIB_NAME} SHARED "HL_F")
+  set_target_properties (${HDF5_HL_F90_C_LIBSH_TARGET} PROPERTIES
+      FOLDER libraries/hl/fortran
+      LINKER_LANGUAGE C
+  )
+  set (install_targets ${install_targets} ${HDF5_HL_F90_C_LIBSH_TARGET})
+endif ()
+
+#-----------------------------------------------------------------------------
+# Add Target to clang-format
+#-----------------------------------------------------------------------------
+if (HDF5_ENABLE_FORMATTERS)
+  if (NOT ONLY_SHARED_LIBS)
+    clang_format (HDF5_HL_F90_C_SRC_FORMAT ${HDF5_HL_F90_C_LIB_TARGET})
+  else ()
+    clang_format (HDF5_HL_F90_C_SRC_FORMAT ${HDF5_HL_F90_C_LIBSH_TARGET})
+  endif ()
+endif ()
 
 #-----------------------------------------------------------------------------
 # Fortran Modules
 #-----------------------------------------------------------------------------
-set (HDF5_HL_F90_F_SRCS
-    ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5DSff.f90
-    ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5TBff.f90
-    ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5LTff.f90
-    ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5IMff.f90
+set (HDF5_HL_F90_F_BASE_SOURCES
+    ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5DSff.F90
+    ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5TBff.F90
+    ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5LTff.F90
+    ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5IMff.F90
 )
-set_source_files_properties (${HDF5_HL_F90_F_SRCS} PROPERTIES LANGUAGE Fortran)
 
-add_library (${HDF5_HL_F90_LIB_TARGET} ${LIB_TYPE} ${HDF5_HL_F90_F_SRCS})
-set (SHARED_LINK_FLAGS " ")
+if (NOT ONLY_SHARED_LIBS)
+  add_custom_command (TARGET H5HL_buildiface POST_BUILD
+      BYPRODUCTS ${HDF5_HL_F90_BINARY_DIR}/static/H5LTff_gen.F90 ${HDF5_HL_F90_BINARY_DIR}/static/H5TBff_gen.F90
+      COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:H5HL_buildiface>
+      WORKING_DIRECTORY ${HDF5_HL_F90_BINARY_DIR}/static
+      DEPENDS ${HDF5_HL_F90_F_BASE_SOURCES}
+      COMMENT "Generating the H5LTff_gen.F90, H5TBff_gen.F90 files"
+  )
+  add_custom_target (H5HLgen ALL
+      DEPENDS H5HL_buildiface ${HDF5_HL_F90_BINARY_DIR}/static/H5LTff_gen.F90 ${HDF5_HL_F90_BINARY_DIR}/static/H5TBff_gen.F90
+  )
+  set_source_files_properties (
+      ${HDF5_HL_F90_BINARY_DIR}/static/H5LTff_gen.F90
+      ${HDF5_HL_F90_BINARY_DIR}/static/H5TBff_gen.F90
+      PROPERTIES GENERATED TRUE
+  )
+endif ()
 if (BUILD_SHARED_LIBS)
-  if (WIN32)
-    set_property (TARGET ${HDF5_HL_F90_LIB_TARGET} 
-      APPEND PROPERTY COMPILE_DEFINITIONS 
-        BUILD_HDF5_HL_DLL
-    )
-    if (MSVC)
-      set (SHARED_LINK_FLAGS "/DLL")
-    endif (MSVC)
-  endif (WIN32)
-endif (BUILD_SHARED_LIBS)
-if (WIN32)
-  set_property (TARGET ${HDF5_HL_F90_LIB_TARGET} 
-      APPEND PROPERTY COMPILE_DEFINITIONS 
-        HDF5F90_WINDOWS
-  )
-endif (WIN32)
-TARGET_FORTRAN_PROPERTIES (${HDF5_HL_F90_LIB_TARGET} ${LIB_TYPE} " " ${SHARED_LINK_FLAGS})
-target_link_libraries (${HDF5_HL_F90_LIB_TARGET} ${HDF5_HL_F90_C_LIB_TARGET} ${HDF5_F90_LIB_TARGET})
-set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_F90_LIB_TARGET}")
-H5_SET_LIB_OPTIONS (${HDF5_HL_F90_LIB_TARGET} ${HDF5_HL_F90_LIB_NAME} ${LIB_TYPE})
-set_target_properties (${HDF5_HL_F90_LIB_TARGET} PROPERTIES
-    FOLDER libraries/hl/fortran
-    LINKER_LANGUAGE Fortran
-    INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
-    Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}
-)
+  add_custom_command (TARGET H5HL_buildiface POST_BUILD
+      BYPRODUCTS ${HDF5_HL_F90_BINARY_DIR}/shared/H5LTff_gen.F90 ${HDF5_HL_F90_BINARY_DIR}/shared/H5TBff_gen.F90
+      COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:H5HL_buildiface>
+      WORKING_DIRECTORY ${HDF5_HL_F90_BINARY_DIR}/shared
+      DEPENDS ${HDF5_HL_F90_F_BASE_SOURCES}
+      COMMENT "Generating the H5LTff_gen.F90, H5TBff_gen.F90 shared files"
+  )
+  add_custom_target (H5HLgenSH ALL
+      DEPENDS H5HL_buildiface ${HDF5_HL_F90_BINARY_DIR}/shared/H5LTff_gen.F90 ${HDF5_HL_F90_BINARY_DIR}/shared/H5TBff_gen.F90
+  )
+  set_source_files_properties (
+      ${HDF5_HL_F90_BINARY_DIR}/shared/H5LTff_gen.F90
+      ${HDF5_HL_F90_BINARY_DIR}/shared/H5TBff_gen.F90
+      PROPERTIES GENERATED TRUE
+  )
+endif ()
+
+if (NOT ONLY_SHARED_LIBS)
+  set (HDF5_HL_F90_F_SOURCES
+      ${HDF5_HL_F90_F_BASE_SOURCES}
+
+      # generated files
+      ${HDF5_HL_F90_BINARY_DIR}/static/H5LTff_gen.F90
+      ${HDF5_HL_F90_BINARY_DIR}/static/H5TBff_gen.F90
+  )
+  set_source_files_properties (${HDF5_HL_F90_F_SOURCES} PROPERTIES LANGUAGE Fortran)
+endif ()
+if (BUILD_SHARED_LIBS)
+  set (HDF5_HL_F90_F_SOURCES_SHARED
+      ${HDF5_HL_F90_F_BASE_SOURCES}
+
+      # generated files
+      ${HDF5_HL_F90_BINARY_DIR}/shared/H5LTff_gen.F90
+      ${HDF5_HL_F90_BINARY_DIR}/shared/H5TBff_gen.F90
+  )
+  set_source_files_properties (${HDF5_HL_F90_F_SOURCES_SHARED} PROPERTIES LANGUAGE Fortran)
+endif ()
+
+if (NOT ONLY_SHARED_LIBS)
+  add_library (${HDF5_HL_F90_LIB_TARGET} STATIC ${HDF5_HL_F90_F_SOURCES})
+  target_include_directories (${HDF5_HL_F90_LIB_TARGET}
+      PRIVATE "${HDF5_F90_BINARY_DIR};${CMAKE_Fortran_MODULE_DIRECTORY}/static;$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_Fortran_INCLUDE_DIRS}>"
+      INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${HDF5_INSTALL_MODULE_DIR}/static>"
+  )
+  target_compile_options(${HDF5_HL_F90_LIB_TARGET} PRIVATE "${HDF5_CMAKE_Fortran_FLAGS}")
+  target_compile_definitions(${HDF5_HL_F90_LIB_TARGET}
+      PUBLIC $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:HDF5F90_WINDOWS>
+      PRIVATE $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_COMPILE_FLAGS}>
+  )
+  target_link_libraries (${HDF5_HL_F90_LIB_TARGET} PUBLIC ${HDF5_HL_F90_C_LIB_TARGET} ${HDF5_F90_LIB_TARGET})
+#  set_property(TARGET ${HDF5_HL_F90_LIB_TARGET} APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"-SUBSYSTEM:CONSOLE">)
+#  set_property(TARGET ${HDF5_HL_F90_LIB_TARGET} APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_LINK_FLAGS}>)
+  if(MSVC)
+    set_property(TARGET ${HDF5_HL_F90_LIB_TARGET} PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE ${WIN_LINK_FLAGS}")
+  endif()
+  set_target_properties (${HDF5_HL_F90_LIB_TARGET} PROPERTIES
+      FOLDER libraries/hl/fortran
+      LINKER_LANGUAGE Fortran
+      Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/static
+  )
+  H5_SET_LIB_OPTIONS (${HDF5_HL_F90_LIB_TARGET} ${HDF5_HL_F90_LIB_NAME} STATIC 0)
+  set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_F90_LIB_TARGET}")
+  set (install_targets ${install_targets} ${HDF5_HL_F90_LIB_TARGET})
+  add_dependencies(${HDF5_HL_F90_LIB_TARGET} H5HLgen)
+endif ()
+if (BUILD_SHARED_LIBS)
+  add_library (${HDF5_HL_F90_LIBSH_TARGET} SHARED ${HDF5_HL_F90_F_SOURCES_SHARED})
+  target_include_directories (${HDF5_HL_F90_LIBSH_TARGET}
+      PRIVATE "${HDF5_F90_BINARY_DIR};${CMAKE_Fortran_MODULE_DIRECTORY}/shared;$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_Fortran_INCLUDE_DIRS}>"
+      INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${HDF5_INSTALL_MODULE_DIR}/shared>"
+  )
+  target_compile_options(${HDF5_HL_F90_LIBSH_TARGET} PRIVATE "${HDF5_CMAKE_Fortran_FLAGS}")
+  target_compile_definitions(${HDF5_HL_F90_LIBSH_TARGET}
+      PUBLIC "H5_BUILT_AS_DYNAMIC_LIB"
+      PRIVATE
+          $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:BUILD_HDF5_HL_DLL;HDF5F90_WINDOWS>
+          $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_COMPILE_FLAGS}>
+  )
+  target_link_libraries (${HDF5_HL_F90_LIBSH_TARGET}
+      PUBLIC ${HDF5_HL_F90_C_LIBSH_TARGET} ${HDF5_F90_LIBSH_TARGET}
+      PRIVATE ${LINK_Fortran_LIBS}
+  )
+#  set_property(TARGET ${HDF5_HL_F90_LIBSH_TARGET} APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"-SUBSYSTEM:CONSOLE">)
+#  set_property(TARGET ${HDF5_HL_F90_LIBSH_TARGET} APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_LINK_FLAGS}>)
+#  set_property(TARGET ${HDF5_HL_F90_LIBSH_TARGET} APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"-DLL">)
+#  set_property(TARGET ${HDF5_HL_F90_LIBSH_TARGET} APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"-DEF:${HDF5_HL_F90_SRC_BINARY_DIR}/hdf5_hl_fortrandll.def">)
+  if(MSVC)
+    set_property(TARGET ${HDF5_HL_F90_LIBSH_TARGET} PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE ${WIN_LINK_FLAGS} -DLL -DEF:${HDF5_HL_F90_SRC_BINARY_DIR}/hdf5_hl_fortrandll.def")
+  endif()
+  set_target_properties (${HDF5_HL_F90_LIBSH_TARGET} PROPERTIES
+      FOLDER libraries/hl/fortran
+      LINKER_LANGUAGE Fortran
+      Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/shared
+  )
+  H5_SET_LIB_OPTIONS (${HDF5_HL_F90_LIBSH_TARGET} ${HDF5_HL_F90_LIB_NAME} SHARED "HL_F")
+  set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_F90_LIBSH_TARGET}")
+  set (install_targets ${install_targets} ${HDF5_HL_F90_LIBSH_TARGET})
+  add_dependencies(${HDF5_HL_F90_LIBSH_TARGET} H5HLgenSH)
+endif ()
 
 #-----------------------------------------------------------------------------
 # Add file(s) to CMake Install
 #-----------------------------------------------------------------------------
 
-if (WIN32)
-  set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/\${BUILD_TYPE})
-else (WIN32)
-  set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY})
-endif (WIN32)
-
-set (mod_files
-    ${MOD_BUILD_DIR}/h5ds.mod
-    ${MOD_BUILD_DIR}/h5tb.mod
-    ${MOD_BUILD_DIR}/h5lt.mod
-    ${MOD_BUILD_DIR}/h5im.mod
-)
 
-install (
-    FILES
-        ${mod_files}
-    DESTINATION
-        ${HDF5_INSTALL_INCLUDE_DIR}
-    COMPONENT
-        fortheaders
-)
+if (NOT ONLY_SHARED_LIBS)
+  set (mod_files
+      ${MOD_BUILD_DIR}/h5ds.mod
+      ${MOD_BUILD_DIR}/h5tb.mod
+      ${MOD_BUILD_DIR}/h5tb_const.mod
+      ${MOD_BUILD_DIR}/h5lt.mod
+      ${MOD_BUILD_DIR}/h5lt_const.mod
+      ${MOD_BUILD_DIR}/h5im.mod
+  )
+  install (
+      FILES
+          ${mod_files}
+      DESTINATION
+          ${HDF5_INSTALL_MODULE_DIR}/static
+      COMPONENT
+          fortheaders
+  )
+  if (HDF5_INSTALL_MOD_FORTRAN MATCHES "STATIC")
+    install (
+        FILES
+            ${mod_files}
+        DESTINATION
+            ${HDF5_INSTALL_INCLUDE_DIR}
+        COMPONENT
+            fortheaders
+    )
+  endif ()
+endif ()
+if (BUILD_SHARED_LIBS)
+  set (modsh_files
+      ${MODSH_BUILD_DIR}/h5ds.mod
+      ${MODSH_BUILD_DIR}/h5tb.mod
+      ${MODSH_BUILD_DIR}/h5tb_const.mod
+      ${MODSH_BUILD_DIR}/h5lt.mod
+      ${MODSH_BUILD_DIR}/h5lt_const.mod
+      ${MODSH_BUILD_DIR}/h5im.mod
+  )
+  install (
+      FILES
+          ${modsh_files}
+      DESTINATION
+          ${HDF5_INSTALL_MODULE_DIR}/shared
+      COMPONENT
+          fortheaders
+  )
+  if (HDF5_INSTALL_MOD_FORTRAN MATCHES "SHARED")
+    install (
+        FILES
+            ${modsh_files}
+        DESTINATION
+            ${HDF5_INSTALL_INCLUDE_DIR}
+        COMPONENT
+            fortheaders
+    )
+  endif ()
+endif ()
 
 #-----------------------------------------------------------------------------
 # Add Target(s) to CMake Install for import into other projects
 #-----------------------------------------------------------------------------
 if (HDF5_EXPORTED_TARGETS)
   if (BUILD_SHARED_LIBS)
-    INSTALL_TARGET_PDB (${HDF5_HL_F90_C_LIB_TARGET} ${HDF5_INSTALL_BIN_DIR} hlfortlibraries)
-    #INSTALL_TARGET_PDB (${HDF5_HL_F90_LIB_TARGET} ${HDF5_INSTALL_BIN_DIR} hlfortlibraries)
-  endif (BUILD_SHARED_LIBS)
-  
+    INSTALL_TARGET_PDB (${HDF5_HL_F90_C_LIBSH_TARGET} ${HDF5_INSTALL_BIN_DIR} hlfortlibraries)
+    #INSTALL_TARGET_PDB (${HDF5_HL_F90_LIBSH_TARGET} ${HDF5_INSTALL_BIN_DIR} hlfortlibraries)
+  endif ()
+  if (NOT ONLY_SHARED_LIBS)
+    INSTALL_TARGET_PDB (${HDF5_HL_F90_C_LIB_TARGET} ${HDF5_INSTALL_LIB_DIR} hlfortlibraries)
+    #INSTALL_TARGET_PDB (${HDF5_HL_F90_LIB_TARGET} ${HDF5_INSTALL_LIB_DIR} hlfortlibraries)
+  endif ()
+
   install (
       TARGETS
-          ${HDF5_HL_F90_C_LIB_TARGET}
-          ${HDF5_HL_F90_LIB_TARGET}
+          ${install_targets}
       EXPORT
           ${HDF5_EXPORTED_TARGETS}
       LIBRARY DESTINATION ${HDF5_INSTALL_LIB_DIR} COMPONENT hlfortlibraries
       ARCHIVE DESTINATION ${HDF5_INSTALL_LIB_DIR} COMPONENT hlfortlibraries
       RUNTIME DESTINATION ${HDF5_INSTALL_BIN_DIR} COMPONENT hlfortlibraries
+      FRAMEWORK DESTINATION ${HDF5_INSTALL_FWRK_DIR} COMPONENT hlfortlibraries
+      INCLUDES DESTINATION include
+  )
+endif ()
+
+#-----------------------------------------------------------------------------
+# Create pkgconfig files
+#-----------------------------------------------------------------------------
+set (_PKG_CONFIG_PREFIX ${CMAKE_INSTALL_PREFIX})
+set (_PKG_CONFIG_EXEC_PREFIX \${prefix})
+set (_PKG_CONFIG_LIBDIR \${exec_prefix}/${HDF5_INSTALL_LIB_DIR})
+set (_PKG_CONFIG_INCLUDEDIR \${prefix}/${HDF5_INSTALL_INCLUDE_DIR})
+set (_PKG_CONFIG_MODULEDIR \${prefix}/${HDF5_INSTALL_MODULE_DIR})
+set (_PKG_CONFIG_LIBNAME "${HDF5_HL_F90_LIB_CORENAME}")
+set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}")
+
+set (_PKG_CONFIG_LIBS_PRIVATE)
+
+if (NOT ONLY_SHARED_LIBS)
+  set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_HL_F90_LIB_CORENAME}")
+endif ()
+if (BUILD_SHARED_LIBS)
+  set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_HL_F90_LIB_CORENAME}")
+endif ()
+
+set (_PKG_CONFIG_REQUIRES "${HDF5_F90_LIB_CORENAME} = ${HDF5_PACKAGE_VERSION}")
+set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_F90_LIB_CORENAME} = ${HDF5_PACKAGE_VERSION}")
+
+configure_file (
+    ${HDF_CONFIG_DIR}/libhdf5.fpc.in
+    ${HDF5_BINARY_DIR}/CMakeFiles/${HDF5_HL_F90_LIB_CORENAME}.pc
+    @ONLY
+)
+install (
+    FILES ${HDF5_BINARY_DIR}/CMakeFiles/${HDF5_HL_F90_LIB_CORENAME}.pc
+    DESTINATION ${HDF5_INSTALL_LIB_DIR}/pkgconfig
+    COMPONENT hlfortlibraries
+)
+
+if (NOT WIN32 AND NOT MINGW)
+  if (HDF5_ENABLE_PARALLEL AND MPI_Fortran_FOUND)
+    set (_PKG_CONFIG_COMPILER ${MPI_Fortran_COMPILER})
+  else ()
+    set (_PKG_CONFIG_COMPILER ${CMAKE_Fortran_COMPILER})
+  endif ()
+  configure_file (
+      ${HDF_RESOURCES_DIR}/libh5cc.in
+      ${HDF5_BINARY_DIR}/CMakeFiles/h5hlfc
+      @ONLY
+  )
+  install (
+      FILES ${HDF5_BINARY_DIR}/CMakeFiles/h5hlfc
+      DESTINATION ${HDF5_INSTALL_BIN_DIR}
+      PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+      COMPONENT hlfortlibraries
   )
-endif (HDF5_EXPORTED_TARGETS)
+endif ()
diff --git a/hl/fortran/src/H5DSfc.c b/hl/fortran/src/H5DSfc.c
index 1de3fff..9ebd322 100644
--- a/hl/fortran/src/H5DSfc.c
+++ b/hl/fortran/src/H5DSfc.c
@@ -1,17 +1,14 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Board of Trustees of the University of Illinois.         *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of HDF5.  The full HDF5 copyright notice, including     *
-* terms governing use, modification, and redistribution, is contained in    *
-* the files COPYING and Copyright.html.  COPYING can be found at the root   *
-* of the source code distribution tree; Copyright.html can be found at the  *
-* root level of an installed copy of the electronic HDF5 document set and   *
-* is linked from the top-level documents page.  It can also be found at     *
-* http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-* access to either file, you may request a copy from help@hdfgroup.org.     *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /* This files contains C stubs for H5D Fortran APIs */
 
@@ -20,354 +17,352 @@
 #include "H5Eprivate.h"
 
 /*-------------------------------------------------------------------------
-* Function: h5dsset_scale_c
-*
-* Purpose: Calls H5DSset_scale
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: M. Scot Breitenfeld
-*
-* Date: April 17, 2011
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5dsset_scale_c
+ *
+ * Purpose: Calls H5DSset_scale
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: M. Scot Breitenfeld
+ *
+ * Date: April 17, 2011
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 int_f
-nh5dsset_scale_c(hid_t_f *dsid, _fcd dimname, size_t_f *dimnamelen) 
+h5dsset_scale_c(hid_t_f *dsid, _fcd dimname, size_t_f *dimnamelen)
 {
-  char *c_dimname = NULL;
-  int_f ret_value = 0;
-  
-  /*
-   * convert FORTRAN name to C name
-   */
-  
-  if(*dimnamelen != 0)
-    if(NULL == (c_dimname = (char *)HD5f2cstring(dimname, (size_t)*dimnamelen)))
-      HGOTO_DONE(FAIL)
+    char *c_dimname = NULL;
+    int_f ret_value = 0;
 
-   /*
-    * call H5DSset_scale function.
-    */
+    /*
+     * convert FORTRAN name to C name
+     */
 
-   if(H5DSset_scale( (hid_t)*dsid, c_dimname) < 0)
-     HGOTO_DONE(FAIL)
+    if (*dimnamelen != 0)
+        if (NULL == (c_dimname = (char *)HD5f2cstring(dimname, (size_t)*dimnamelen)))
+            HGOTO_DONE(FAIL)
 
-   done:
-     if(c_dimname)
-       HDfree(c_dimname);
+    /*
+     * call H5DSset_scale function.
+     */
 
-  return ret_value;
+    if (H5DSset_scale((hid_t)*dsid, c_dimname) < 0)
+        HGOTO_DONE(FAIL)
 
-} /* end nh5dsset_scale_c() */
+done:
+    if (c_dimname)
+        HDfree(c_dimname);
+
+    return ret_value;
 
+} /* end h5dsset_scale_c() */
 
 /*-------------------------------------------------------------------------
-* Function: H5DSattach_scale_c
-*
-* Purpose: Calls H5DSattach_scale
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: M. Scot Breitenfeld
-*
-* Date: April 17, 2011
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5DSattach_scale_c
+ *
+ * Purpose: Calls H5DSattach_scale
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: M. Scot Breitenfeld
+ *
+ * Date: April 17, 2011
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 int_f
-nh5dsattach_scale_c( hid_t_f *did, hid_t_f *dsid, int_f *idx) 
+h5dsattach_scale_c(hid_t_f *did, hid_t_f *dsid, int_f *idx)
 {
-  int_f ret_value = 0;
-  
-  /*
-   * call H5DSset_scale function.
-   */
-  
-  if(H5DSattach_scale( (hid_t)*did, (hid_t)*dsid, (unsigned)*idx ) < 0)
-    HGOTO_DONE(FAIL)
-      
-  done:
-    return ret_value;
+    int_f ret_value = 0;
 
-} /* end nh5dsattach_scale_c() */
+    /*
+     * call H5DSset_scale function.
+     */
 
+    if (H5DSattach_scale((hid_t)*did, (hid_t)*dsid, (unsigned)*idx) < 0)
+        HGOTO_DONE(FAIL)
+
+done:
+    return ret_value;
+
+} /* end h5dsattach_scale_c() */
 
 /*-------------------------------------------------------------------------
-* Function: H5DSdetach_scale_c
-*
-* Purpose: Calls H5DSdetach_scale
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: M. Scot Breitenfeld
-*
-* Date: April 17, 2011
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5DSdetach_scale_c
+ *
+ * Purpose: Calls H5DSdetach_scale
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: M. Scot Breitenfeld
+ *
+ * Date: April 17, 2011
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 int_f
-nh5dsdetach_scale_c( hid_t_f *did, hid_t_f *dsid, int_f *idx) 
+h5dsdetach_scale_c(hid_t_f *did, hid_t_f *dsid, int_f *idx)
 {
-  int_f ret_value = 0;
-  
-  /*
-   * call H5DSset_scale function.
-   */
-  
-  if(H5DSdetach_scale( (hid_t)*did, (hid_t)*dsid, (unsigned)*idx ) < 0)
-    HGOTO_DONE(FAIL)
-      
-  done:
-    return ret_value;
+    int_f ret_value = 0;
 
-} /* end nh5dsdetach_scale_c() */
+    /*
+     * call H5DSset_scale function.
+     */
 
+    if (H5DSdetach_scale((hid_t)*did, (hid_t)*dsid, (unsigned)*idx) < 0)
+        HGOTO_DONE(FAIL)
+
+done:
+    return ret_value;
+
+} /* end h5dsdetach_scale_c() */
 
 /*-------------------------------------------------------------------------
-* Function: H5DSis_attached_c
-*
-* Purpose: Calls H5DSis_attached
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: M. Scot Breitenfeld
-*
-* Date: April 17, 2011
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5DSis_attached_c
+ *
+ * Purpose: Calls H5DSis_attached
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: M. Scot Breitenfeld
+ *
+ * Date: April 17, 2011
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 int_f
-nh5dsis_attached_c( hid_t_f *did, hid_t_f *dsid, int_f *idx, int_f *is_attached) 
+h5dsis_attached_c(hid_t_f *did, hid_t_f *dsid, int_f *idx, int_f *is_attached)
 {
-  int_f ret_value = 0;
-  htri_t c_is_attached;
-  
-  /*
-   * call H5DSis_attached function.
-   */
+    int_f  ret_value = 0;
+    htri_t c_is_attached;
+
+    /*
+     * call H5DSis_attached function.
+     */
 
-  if((c_is_attached = H5DSis_attached( (hid_t)*did, (hid_t)*dsid, (unsigned)*idx )) < 0)
-    HGOTO_DONE(FAIL)
+    if ((c_is_attached = H5DSis_attached((hid_t)*did, (hid_t)*dsid, (unsigned)*idx)) < 0)
+        HGOTO_DONE(FAIL)
 
-  *is_attached = (int_f)c_is_attached;
-      
-  done:
-      return ret_value;
+    *is_attached = (int_f)c_is_attached;
+
+done:
+    return ret_value;
 
-} /* end nh5dsis_attached_c() */
+} /* end h5dsis_attached_c() */
 
 /*-------------------------------------------------------------------------
-* Function: H5DSis_scale_c
-*
-* Purpose: Calls H5DSis_scale
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: M. Scot Breitenfeld
-*
-* Date: April 18, 2011
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5DSis_scale_c
+ *
+ * Purpose: Calls H5DSis_scale
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: M. Scot Breitenfeld
+ *
+ * Date: April 18, 2011
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 int_f
-nh5dsis_scale_c( hid_t_f *did, int_f *is_scale) 
+h5dsis_scale_c(hid_t_f *did, int_f *is_scale)
 {
-  int_f ret_value = 0;
-  htri_t c_is_scale;
-  
-  /*
-   * call H5DSis_scale function.
-   */
-  
-  if((c_is_scale=H5DSis_scale( (hid_t)*did )) < 0)
-    HGOTO_DONE(FAIL)
-
-  *is_scale = (int_f)c_is_scale;
-      
-  done:
-    return ret_value;
+    int_f  ret_value = 0;
+    htri_t c_is_scale;
+
+    /*
+     * call H5DSis_scale function.
+     */
+
+    if ((c_is_scale = H5DSis_scale((hid_t)*did)) < 0)
+        HGOTO_DONE(FAIL)
+
+    *is_scale = (int_f)c_is_scale;
 
-} /* end nh5dsis_scale_c() */
+done:
+    return ret_value;
 
+} /* end h5dsis_scale_c() */
 
 /*-------------------------------------------------------------------------
-* Function: h5dsset_label_c
-*
-* Purpose: Calls H5DSset_label
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: M. Scot Breitenfeld
-*
-* Date: April 18, 2011
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5dsset_label_c
+ *
+ * Purpose: Calls H5DSset_label
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: M. Scot Breitenfeld
+ *
+ * Date: April 18, 2011
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 int_f
-nh5dsset_label_c(hid_t_f *did, int_f *idx, _fcd label, size_t_f *labellen) 
+h5dsset_label_c(hid_t_f *did, int_f *idx, _fcd label, size_t_f *labellen)
 {
-  char *c_label = NULL;
-  int_f ret_value = 0;
-  
-  /*
-   * convert FORTRAN name to C name
-   */
-  
-  if(NULL == (c_label = (char *)HD5f2cstring(label, (size_t)*labellen)))
-    HGOTO_DONE(FAIL)
+    char *c_label   = NULL;
+    int_f ret_value = 0;
+
+    /*
+     * convert FORTRAN name to C name
+     */
 
-  /*
-   * call H5DSset_label function.
-   */
+    if (NULL == (c_label = (char *)HD5f2cstring(label, (size_t)*labellen)))
+        HGOTO_DONE(FAIL)
 
-  if(H5DSset_label( (hid_t)*did, (unsigned)*idx, c_label) < 0)
-    HGOTO_DONE(FAIL)
+    /*
+     * call H5DSset_label function.
+     */
 
-  done:
-     if(c_label)
-       HDfree(c_label);
+    if (H5DSset_label((hid_t)*did, (unsigned)*idx, c_label) < 0)
+        HGOTO_DONE(FAIL)
 
-  return ret_value;
+done:
+    if (c_label)
+        HDfree(c_label);
+
+    return ret_value;
 
-} /* end nh5dsset_label_c() */
+} /* end h5dsset_label_c() */
 
 /*-------------------------------------------------------------------------
-* Function: h5dsget_label_c
-*
-* Purpose: Calls H5DSget_label
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: M. Scot Breitenfeld
-*
-* Date: April 18, 2011
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5dsget_label_c
+ *
+ * Purpose: Calls H5DSget_label
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: M. Scot Breitenfeld
+ *
+ * Date: April 18, 2011
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 int_f
-nh5dsget_label_c(hid_t_f *did, int_f *idx, _fcd label, size_t_f *size) 
+h5dsget_label_c(hid_t_f *did, int_f *idx, _fcd label, size_t_f *size)
 {
-  char *c_label = NULL;
-  ssize_t size_c = -1;
-  int_f ret_value = 0;
-
-  /*
-   * Allocate buffer to hold label
-   */
-  if ((c_label = (char *)HDmalloc((size_t)*size + 1)) == NULL)
-    HGOTO_DONE(FAIL);
-
-  /*
-   * call H5DSget_label function.
-   */
-      
-  if( (size_c = H5DSget_label( (hid_t)*did, (unsigned)*idx, c_label, (size_t)*size+1)) < 0)
-    HGOTO_DONE(FAIL)
-
-  /*
-   * Convert C name to FORTRAN and place it in the given buffer
-   */
-      
-  HD5packFstring(c_label, _fcdtocp(label), (size_t)*size);
+    char   *c_label   = NULL;
+    ssize_t size_c    = -1;
+    int_f   ret_value = 0;
+
+    /*
+     * Allocate buffer to hold label
+     */
+    if ((c_label = (char *)HDmalloc((size_t)*size + 1)) == NULL)
+        HGOTO_DONE(FAIL);
+
+    /*
+     * call H5DSget_label function.
+     */
+
+    if ((size_c = H5DSget_label((hid_t)*did, (unsigned)*idx, c_label, (size_t)*size + 1)) < 0)
+        HGOTO_DONE(FAIL)
+
+    /*
+     * Convert C name to FORTRAN and place it in the given buffer
+     */
+
+    HD5packFstring(c_label, _fcdtocp(label), (size_t)*size);
 
 done:
-     *size = (size_t_f)size_c; /* Don't subtract '1'  because H5DSget_label doesn't include the 
-                                * trailing NULL in the length calculation, Ref. HDFFV-7596 */
-     if(c_label) HDfree(c_label);
-     return ret_value;
+    *size = (size_t_f)size_c; /* Don't subtract '1'  because H5DSget_label doesn't include the
+                               * trailing NULL in the length calculation, Ref. HDFFV-7596 */
+    if (c_label)
+        HDfree(c_label);
+    return ret_value;
 
-} /* end nh5dsget_label_c() */
+} /* end h5dsget_label_c() */
 
 /*-------------------------------------------------------------------------
-* Function: h5dsget_scale_name_c
-*
-* Purpose: Calls H5DSget_scale_name
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: M. Scot Breitenfeld
-*
-* Date: April 18, 2011
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5dsget_scale_name_c
+ *
+ * Purpose: Calls H5DSget_scale_name
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: M. Scot Breitenfeld
+ *
+ * Date: April 18, 2011
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 int_f
-nh5dsget_scale_name_c(hid_t_f *did, _fcd name, size_t_f *size) 
+h5dsget_scale_name_c(hid_t_f *did, _fcd name, size_t_f *size)
 {
-  char *c_scale_name = NULL;
-  ssize_t size_c = -1;
-  int_f ret_value = 0;
-
-  /*
-   * Allocate buffer to hold name
-   */
-  if ((c_scale_name = (char *)HDmalloc((size_t)*size + 1)) == NULL)
-    HGOTO_DONE(FAIL);
-
-  /*
-   * call H5DSget_scale_name function.
-   */
-      
-  if( (size_c = H5DSget_scale_name( (hid_t)*did, c_scale_name, (size_t)*size+1)) < 0)
-    HGOTO_DONE(FAIL)
-
-  /*
-   * Convert C name to FORTRAN and place it in the given buffer
-   */
-  HD5packFstring(c_scale_name, _fcdtocp(name), (size_t)*size);
-  *size = (size_t_f)size_c;
+    char   *c_scale_name = NULL;
+    ssize_t size_c       = -1;
+    int_f   ret_value    = 0;
+
+    /*
+     * Allocate buffer to hold name
+     */
+    if ((c_scale_name = (char *)HDmalloc((size_t)*size + 1)) == NULL)
+        HGOTO_DONE(FAIL);
+
+    /*
+     * call H5DSget_scale_name function.
+     */
+
+    if ((size_c = H5DSget_scale_name((hid_t)*did, c_scale_name, (size_t)*size + 1)) < 0)
+        HGOTO_DONE(FAIL)
+
+    /*
+     * Convert C name to FORTRAN and place it in the given buffer
+     */
+    HD5packFstring(c_scale_name, _fcdtocp(name), (size_t)*size);
+    *size = (size_t_f)size_c;
 
 done:
-  if(c_scale_name) HDfree(c_scale_name);
-  return ret_value;
+    if (c_scale_name)
+        HDfree(c_scale_name);
+    return ret_value;
 
-} /* end nh5dsget_scale_name_c() */
+} /* end h5dsget_scale_name_c() */
 
 /*-------------------------------------------------------------------------
-* Function: H5DSget_num_scales_c
-*
-* Purpose: Calls H5DSget_num_scales
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: M. Scot Breitenfeld
-*
-* Date: April 18, 2011
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5DSget_num_scales_c
+ *
+ * Purpose: Calls H5DSget_num_scales
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: M. Scot Breitenfeld
+ *
+ * Date: April 18, 2011
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 int_f
-nh5dsget_num_scales_c( hid_t_f *did, int_f *idx, int_f *num_scales) 
+h5dsget_num_scales_c(hid_t_f *did, int_f *idx, int_f *num_scales)
 {
-  int_f ret_value = 0;
-  
-  /*
-   * call H5DSset_scale function.
-   */
-  
-  if( (*num_scales = (int_f)H5DSget_num_scales( (hid_t)*did, (unsigned)*idx)) < 0)
-    HGOTO_DONE(FAIL)
-      
-  done:
+    int_f ret_value = 0;
+
+    /*
+     * call H5DSset_scale function.
+     */
+
+    if ((*num_scales = (int_f)H5DSget_num_scales((hid_t)*did, (unsigned)*idx)) < 0)
+        HGOTO_DONE(FAIL)
+
+done:
     return ret_value;
 
-} /* end nh5dsget_num_scales_c() */
+} /* end h5dsget_num_scales_c() */
diff --git a/hl/fortran/src/H5DSff.F90 b/hl/fortran/src/H5DSff.F90
new file mode 100644
index 0000000..8e238c5
--- /dev/null
+++ b/hl/fortran/src/H5DSff.F90
@@ -0,0 +1,425 @@
+!> @defgroup FH5DS Fortran High Level Dimension Scales (H5DS) Interface
+!!
+!! @see H5DS, C-HL API
+!!
+!! @see @ref H5DS_UG, User Guide
+!!
+
+!> @ingroup FH5DS
+!!
+!! @brief This module contains Fortran interfaces for H5DS
+!
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!       _____ __  __ _____   ____  _____ _______       _   _ _______
+!      |_   _|  \/  |  __ \ / __ \|  __ \__   __|/\   | \ | |__   __|
+! ****   | | | \  / | |__) | |  | | |__) | | |  /  \  |  \| |  | |    ****
+! ****   | | | |\/| |  ___/| |  | |  _  /  | | / /\ \ | . ` |  | |    ****
+! ****  _| |_| |  | | |    | |__| | | \ \  | |/ ____ \| |\  |  | |    ****
+!      |_____|_|  |_|_|     \____/|_|  \_\ |_/_/    \_\_| \_|  |_|
+!
+!  If you add a new function here then you MUST add the function name to the
+!  Windows dll file 'hdf5_hl_fortrandll.def.in' in the hl/fortran/src directory.
+!  This is needed for Windows based operating systems.
+!
+
+MODULE H5DS
+
+  USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR, C_CHAR, C_FLOAT, C_DOUBLE, C_LOC, C_CHAR
+  USE h5fortran_types
+  USE hdf5
+
+CONTAINS
+
+!>
+!! \ingroup FH5DS
+!!
+!! \brief Convert dataset \p dsid to a dimension scale, with optional name, \p dimname.
+!!
+!! \param dsid    The dataset to be made a Dimemsion Scale.
+!! \param errcode \fortran_error
+!! \param dimname The dimension name
+!!
+!! See C API: @ref H5DSset_scale()
+!!
+  SUBROUTINE H5DSset_scale_f( dsid, errcode, dimname)
+
+    IMPLICIT NONE
+
+    INTEGER(hid_t),   INTENT(in) :: dsid
+    CHARACTER(LEN=*), INTENT(in), OPTIONAL :: dimname
+    INTEGER :: errcode
+
+    INTEGER(SIZE_T) :: dimname_len ! length of dimname (if present)
+
+    INTERFACE
+       INTEGER FUNCTION H5DSset_scale_c(dsid, dimname, dimname_len) &
+            BIND(C,NAME='h5dsset_scale_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(hid_t),   INTENT(in) :: dsid
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: dimname
+         INTEGER(SIZE_T),  INTENT(in) :: dimname_len
+       END FUNCTION H5DSset_scale_c
+    END INTERFACE
+
+    IF(PRESENT(dimname))THEN
+       dimname_len = LEN(dimname)
+       errcode = H5DSset_scale_c(dsid, dimname, dimname_len )
+    ELSE
+       errcode = H5DSset_scale_c(dsid, " ", INT(0,SIZE_T) )
+    ENDIF
+
+  END SUBROUTINE H5DSset_scale_f
+
+!>
+!! \ingroup FH5DS
+!!
+!! \brief Attach dimension scale dsid to dimension \p idx of dataset \p did.
+!!
+!! \param did     The dataset.
+!! \param dsid    The scale to be attached.
+!! \param idx     The dimension of \p did that \p dsid is associated with.
+!! \param errcode \fortran_error
+!!
+!! See C API: @ref H5DSattach_scale()
+!!
+  SUBROUTINE H5DSattach_scale_f( did, dsid, idx, errcode)
+
+    IMPLICIT NONE
+
+    INTEGER(hid_t), INTENT(in) :: did
+    INTEGER(hid_t), INTENT(in) :: dsid
+    INTEGER       , INTENT(in) :: idx
+    INTEGER                    :: errcode
+    INTEGER                    :: c_idx
+
+    INTERFACE
+       INTEGER FUNCTION  H5DSattach_scale_c(did, dsid, idx) &
+            BIND(C,NAME='h5dsattach_scale_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(hid_t), INTENT(in) :: did
+         INTEGER(hid_t), INTENT(in) :: dsid
+         INTEGER       , INTENT(in) :: idx
+       END FUNCTION H5DSattach_scale_c
+    END INTERFACE
+
+    c_idx = idx -1 ! account for C-dimensions starting at 0
+
+    errcode = H5DSattach_scale_c( did, dsid, c_idx)
+
+  END SUBROUTINE H5DSattach_scale_f
+
+!>
+!! \ingroup FH5DS
+!!
+!! \brief Detach dimension scale dsid from the dimension idx of dataset \p did.
+!!
+!! \param did     The dataset.
+!! \param dsid    The scale to be detached.
+!! \param idx     The dimension of \p did to detach.
+!! \param errcode \fortran_error
+!!
+
+!! See C API: @ref H5DSdetach_scale()
+!!
+  SUBROUTINE H5DSdetach_scale_f( did, dsid, idx, errcode)
+
+    IMPLICIT NONE
+
+    INTEGER(hid_t), INTENT(in) :: did
+    INTEGER(hid_t), INTENT(in) :: dsid
+    INTEGER       , INTENT(in) :: idx
+    INTEGER                    :: errcode
+    INTEGER                    :: c_idx
+
+    INTERFACE
+       INTEGER FUNCTION  H5DSdetach_scale_c(did, dsid, idx) &
+            BIND(C,NAME='h5dsdetach_scale_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(hid_t), INTENT(in) :: did
+         INTEGER(hid_t), INTENT(in) :: dsid
+         INTEGER       , INTENT(in) :: idx
+       END FUNCTION H5DSdetach_scale_c
+    END INTERFACE
+
+    c_idx = idx - 1 ! account for C-dimensions starting at 0
+
+    errcode = H5DSdetach_scale_c( did, dsid, c_idx)
+
+  END SUBROUTINE H5DSdetach_scale_f
+
+!>
+!! \ingroup FH5DS
+!!
+!! \brief Report if dimension scale dsid is currently attached to dimension idx of dataset did.
+!!
+!! \param did         The dataset.
+!! \param dsid        The scale to be attached.
+!! \param idx         The dimension of \p did that \p dsid is associated with.
+!! \param is_attached If dimension scale \p dsid is currently attached to dimension \p idx of dataset \p did.
+!! \param errcode     \fortran_error
+!!
+!! See C API: @ref H5DSis_attached()
+!!
+  SUBROUTINE H5DSis_attached_f( did, dsid, idx, is_attached, errcode)
+
+    IMPLICIT NONE
+
+    INTEGER(hid_t), INTENT(in)  :: did
+    INTEGER(hid_t), INTENT(in)  :: dsid
+    INTEGER       , INTENT(in)  :: idx
+    LOGICAL       , INTENT(out) :: is_attached
+    INTEGER                     :: errcode
+    INTEGER                     :: c_is_attached
+    INTEGER                     :: c_idx
+
+    INTERFACE
+       INTEGER FUNCTION H5DSis_attached_c(did, dsid, idx, c_is_attached) &
+            BIND(C,NAME='h5dsis_attached_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(hid_t), INTENT(in)  :: did
+         INTEGER(hid_t), INTENT(in)  :: dsid
+         INTEGER       , INTENT(in)  :: idx
+         INTEGER       , INTENT(out) :: c_is_attached
+       END FUNCTION H5DSis_attached_c
+    END INTERFACE
+
+    c_idx = idx - 1 ! account for C-dimensions starting at 0
+
+    errcode = H5DSis_attached_c(did, dsid, c_idx, c_is_attached)
+
+    is_attached = .FALSE. ! default
+    IF(c_is_attached.GT.0)THEN
+       is_attached = .TRUE.
+    ELSE IF(errcode.LT.0)THEN
+       errcode = -1
+    ENDIF
+
+  END SUBROUTINE H5DSis_attached_f
+
+!
+! H5DSiterate_scales: Implement in  F2003
+!
+!>
+!! \ingroup FH5DS
+!!
+!! \brief Determines whether \p did is a Dimension Scale.
+!!
+!! \param did         The data set to query.
+!! \param is_scale    If is a Dimension Scale.
+!! \param errcode     \fortran_error
+!!
+!! See C API: @ref H5DSis_scale()
+!!
+  SUBROUTINE H5DSis_scale_f( did, is_scale, errcode)
+
+    IMPLICIT NONE
+
+    INTEGER(hid_t), INTENT(in)  :: did
+    LOGICAL       , INTENT(out) :: is_scale
+    INTEGER       , INTENT(out) :: errcode
+    INTEGER                     :: c_is_scale
+
+    INTERFACE
+       INTEGER FUNCTION H5DSis_scale_c(did,c_is_scale) &
+            BIND(C,NAME='h5dsis_scale_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(hid_t), INTENT(in) :: did
+         INTEGER, INTENT(out) :: c_is_scale
+       END FUNCTION H5DSis_scale_c
+    END INTERFACE
+
+    errcode = H5DSis_scale_c(did, c_is_scale)
+
+    is_scale = .FALSE. ! default
+    IF(c_is_scale.GT.0)THEN
+       is_scale = .TRUE.
+    ELSE IF(errcode.LT.0)THEN
+       errcode = -1
+    ENDIF
+
+  END SUBROUTINE H5DSis_scale_f
+
+!>
+!! \ingroup FH5DS
+!!
+!! \brief Set label for the dimension \p idx of \p did to the value \p label.
+!!
+!! \param did     The data set.
+!! \param idx     The dimension.
+!! \param label   The label.
+!! \param errcode \fortran_error
+!!
+!! See C API: @ref H5DSset_label()
+!!
+  SUBROUTINE H5DSset_label_f( did, idx, label, errcode)
+
+    IMPLICIT NONE
+
+    INTEGER(hid_t),   INTENT(in) :: did
+    INTEGER       ,   INTENT(in) :: idx
+    CHARACTER(LEN=*), INTENT(in) :: label
+    INTEGER :: errcode                     ! Error code
+
+    INTEGER(SIZE_T) :: label_len  ! Length of label
+    INTEGER :: c_idx
+
+    INTERFACE
+       INTEGER FUNCTION H5DSset_label_c(did, idx, label, label_len) &
+            BIND(C,NAME='h5dsset_label_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(hid_t),   INTENT(in) :: did
+         INTEGER       ,   INTENT(in) :: idx
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: label
+         INTEGER(SIZE_T),  INTENT(in) :: label_len
+       END FUNCTION H5DSset_label_c
+    END INTERFACE
+
+    c_idx = idx - 1
+
+    label_len = LEN(label)
+    errcode = H5DSset_label_c(did, c_idx, label, label_len)
+
+  END SUBROUTINE H5DSset_label_f
+
+!>
+!! \ingroup FH5DS
+!!
+!! \brief Read the \p label for dimension \p idx of \p did into buffer \p label.
+!!
+!! \param did     The dataset.
+!! \param idx     The dimension.
+!! \param label   The label.
+!! \param size    The length of the \p label buffer.
+!! \param errcode \fortran_error
+!!
+!! See C API: @ref H5DSget_label()
+!!
+  SUBROUTINE H5DSget_label_f( did, idx, label, size, errcode)
+
+    IMPLICIT NONE
+
+    INTEGER(hid_t),   INTENT(in) :: did
+    INTEGER       ,   INTENT(in) :: idx
+    CHARACTER(LEN=*), INTENT(INOUT) :: label
+    INTEGER(size_t) , INTENT(INOUT) :: size
+    INTEGER :: errcode
+    INTEGER :: c_idx
+
+    INTERFACE
+       INTEGER FUNCTION H5DSget_label_c(did, idx, label, size) &
+            BIND(C,NAME='h5dsget_label_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(hid_t),   INTENT(in)    :: did
+         INTEGER       ,   INTENT(in)    :: idx
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(INOUT) :: label
+         INTEGER(SIZE_T),  INTENT(inout) :: size
+       END FUNCTION H5DSget_label_c
+    END INTERFACE
+
+    c_idx = idx - 1
+
+    errcode = H5DSget_label_c(did, c_idx, label, size)
+
+  END SUBROUTINE H5DSget_label_f
+
+!>
+!! \ingroup FH5DS
+!!
+!! \brief Read the name of scale \p did into buffer name.
+!!
+!! \param did     Dimension scale identifier.
+!! \param name    Buffer to contain the returned name.
+!! \param size    Size in bytes, of the name buffer.
+!! \param errcode \fortran_error
+!!
+!! See C API: @ref H5DSget_scale_name()
+!!
+  SUBROUTINE H5DSget_scale_name_f(did, name, size, errcode)
+
+    IMPLICIT NONE
+
+    INTEGER(hid_t),   INTENT(in) :: did
+    CHARACTER(LEN=*), INTENT(INOUT) :: name
+    INTEGER(size_t) , INTENT(INOUT) :: size
+    INTEGER :: errcode
+
+    INTERFACE
+       INTEGER FUNCTION H5DSget_scale_name_c(did, name, size) &
+            bind(c,name='h5dsget_scale_name_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(hid_t),   INTENT(in)    :: did
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(INOUT) :: name
+         INTEGER(SIZE_T),  INTENT(inout) :: size
+       END FUNCTION H5DSget_scale_name_c
+    END INTERFACE
+
+    errcode = H5DSget_scale_name_c(did, name, size)
+
+  END SUBROUTINE H5DSget_scale_name_f
+
+!>
+!! \ingroup FH5DS
+!!
+!! \brief Determines how many Dimension Scales are attached to dimension idx of \p did.
+!!
+!! \param did        The dataset to query.
+!! \param idx        The dimension of \p did to query.
+!! \param num_scales Number of Dimension Scales associated with \p did.
+!! \param errcode    \fortran_error
+!!
+!! See C API: @ref H5DSget_num_scales()
+!!
+  SUBROUTINE H5DSget_num_scales_f( did, idx, num_scales, errcode)
+
+    IMPLICIT NONE
+    INTEGER(hid_t), INTENT(in)  :: did
+    INTEGER       , INTENT(in)  :: idx
+    INTEGER       , INTENT(INOUT) :: num_scales
+    INTEGER                     :: errcode
+    INTEGER                     :: c_idx
+
+    INTERFACE
+       INTEGER FUNCTION H5DSget_num_scales_c(did, idx, num_scales) &
+            BIND(C,NAME='h5dsget_num_scales_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(hid_t), INTENT(in)  :: did
+         INTEGER       , INTENT(in)  :: idx
+         INTEGER       , INTENT(INOUT) :: num_scales
+       END FUNCTION H5DSget_num_scales_c
+    END INTERFACE
+
+    c_idx = idx - 1
+    errcode = H5DSget_num_scales_c(did, c_idx, num_scales)
+
+  END SUBROUTINE H5DSget_num_scales_f
+
+END MODULE h5ds
+
+
+
+
+
+
diff --git a/hl/fortran/src/H5DSff.f90 b/hl/fortran/src/H5DSff.f90
deleted file mode 100644
index 04540a6..0000000
--- a/hl/fortran/src/H5DSff.f90
+++ /dev/null
@@ -1,545 +0,0 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-!
-! This file contains FORTRAN90 interfaces for H5DS functions
-!
-
-MODULE h5ds
-
-  USE h5fortran_types
-  USE hdf5
-
-CONTAINS
-
-
-!-------------------------------------------------------------------------
-! Function: H5DSset_scale_f
-!
-! Purpose: Convert dataset dsid to a dimension scale, with optional name, dimname. 
-!
-! Return: Success: 0, Failure: -1
-!
-! Programmer: M. Scot Breitenfeld
-!
-! Date: April 17, 2011
-!
-! Comments:
-!
-! Modifications:
-!
-!-------------------------------------------------------------------------
-
-  SUBROUTINE H5DSset_scale_f( dsid, errcode, dimname)
-
-    IMPLICIT NONE
-
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5dsset_scale_f
-!DEC$endif
-!
-
-    INTEGER(hid_t),   INTENT(in) :: dsid               ! The dataset to be made a Dimension Scale
-    CHARACTER(LEN=*), INTENT(in), OPTIONAL :: dimname  ! The dimension name
-    INTEGER :: errcode                                 ! Error code
-
-    INTEGER(SIZE_T) :: dimname_len                     ! length of dimname (if present)
-
-    INTERFACE
-       INTEGER FUNCTION H5DSset_scale_c(dsid, dimname, dimname_len )
-
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DSSET_SCALE_C'::h5dsset_scale_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dimname  
-         INTEGER(hid_t),   INTENT(in) :: dsid     ! The dataset to be made a Dimension Scale
-         CHARACTER(LEN=*), INTENT(in) :: dimname  ! The dimension name
-         INTEGER(SIZE_T),  INTENT(in) :: dimname_len
-       END FUNCTION H5DSset_scale_c
-    END INTERFACE
-
-    IF(PRESENT(dimname))THEN
-       dimname_len = LEN(dimname)
-       errcode = H5DSset_scale_c(dsid, dimname, dimname_len )
-    ELSE
-       errcode = H5DSset_scale_c(dsid, " ", INT(0,SIZE_T) )
-    ENDIF
-
-  END SUBROUTINE H5DSset_scale_f
-
-!-------------------------------------------------------------------------
-! Function: H5DSattach_scale_f
-!
-! Purpose: Attach dimension scale dsid to dimension idx of dataset did.
-!
-! Return: Success: 0, Failure: -1
-!
-! Programmer: M. Scot Breitenfeld
-!
-! Date: April 17, 2011
-!
-! Comments:
-!
-! Modifications:
-!
-!-------------------------------------------------------------------------
-
-  SUBROUTINE H5DSattach_scale_f( did, dsid, idx, errcode)
-
-    IMPLICIT NONE
-
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5dsattach_scale_f
-!DEC$endif
-!
-    INTEGER(hid_t), INTENT(in) :: did     ! the dataset
-    INTEGER(hid_t), INTENT(in) :: dsid    ! the scale to be attached 
-    INTEGER       , INTENT(in) :: idx     ! the dimension of did that dsid is associated with.
-    INTEGER                    :: errcode ! error code
-    INTEGER                    :: c_idx
-    
-    INTERFACE
-       INTEGER FUNCTION  H5DSattach_scale_c(did, dsid, idx )
-         
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DSATTACH_SCALE_C':: h5dsattach_scale_c
-         !DEC$ENDIF
-         INTEGER(hid_t), INTENT(in) :: did     ! the dataset
-         INTEGER(hid_t), INTENT(in) :: dsid    ! the scale to be attached 
-         INTEGER       , INTENT(in) :: idx     ! the dimension of did that dsid is associated with.
-       END FUNCTION H5DSattach_scale_c
-    END INTERFACE
-
-    c_idx = idx -1 ! account for C-dimensions starting at 0 
-    
-    errcode = H5DSattach_scale_c( did, dsid, c_idx)
-    
-  END SUBROUTINE H5DSattach_scale_f
-  
-!-------------------------------------------------------------------------
-! Function: H5DSdetach_scale_f
-!
-! Purpose: Detach dimension scale dsid from the dimension idx of Dataset did.
-!
-! Return: Success: 0, Failure: -1
-!
-! Programmer: M. Scot Breitenfeld
-!
-! Date: April 17, 2011
-!
-! Comments:
-!
-! Modifications:
-!
-!-------------------------------------------------------------------------
-
-  SUBROUTINE H5DSdetach_scale_f( did, dsid, idx, errcode)
-    
-    IMPLICIT NONE
-    
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5dsdetach_scale_f
-!DEC$endif
-!
-    INTEGER(hid_t), INTENT(in) :: did     ! the dataset
-    INTEGER(hid_t), INTENT(in) :: dsid    ! the scale to be detached 
-    INTEGER       , INTENT(in) :: idx     ! the dimension of did to detach
-    INTEGER                    :: errcode ! error code
-    INTEGER                    :: c_idx
-    
-    INTERFACE
-       INTEGER FUNCTION  H5DSdetach_scale_c(did, dsid, idx )
-         
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DSDETACH_SCALE_C':: h5dsdetach_scale_c
-         !DEC$ENDIF
-         INTEGER(hid_t), INTENT(in) :: did     ! the dataset
-         INTEGER(hid_t), INTENT(in) :: dsid    ! the scale to be detached 
-         INTEGER       , INTENT(in) :: idx     ! the dimension of did to detach
-       END FUNCTION H5DSdetach_scale_c
-    END INTERFACE
-
-    c_idx = idx - 1 ! account for C-dimensions starting at 0 
-
-    errcode = H5DSdetach_scale_c( did, dsid, c_idx)
-    
-  END SUBROUTINE H5DSdetach_scale_f
-
-
-!-------------------------------------------------------------------------
-! Function: H5DSis_attached_f
-!
-! Purpose: Report if dimension scale dsid is currently attached to dimension idx of dataset did. 
-!
-! Return: Success: 0, Failure: -1
-!
-! Programmer: M. Scot Breitenfeld
-!
-! Date: April 17, 2011
-!
-! Comments:
-!
-! Modifications:
-!
-!-------------------------------------------------------------------------
-
-  SUBROUTINE H5DSis_attached_f( did, dsid, idx, is_attached, errcode)
-    
-    IMPLICIT NONE
-    
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5dsis_attached_f
-!DEC$endif
-!
-    INTEGER(hid_t), INTENT(in)  :: did         ! the dataset
-    INTEGER(hid_t), INTENT(in)  :: dsid        ! the scale to be attached
-    INTEGER       , INTENT(in)  :: idx         ! the dimension of did that dsid is associated with
-    LOGICAL       , INTENT(out) :: is_attached ! logical: dimension scale dsid is currently attached to 
-                                               ! dimension idx of dataset did
-    INTEGER                     :: errcode     ! error code
-    INTEGER                     :: c_is_attached
-    INTEGER                     :: c_idx
-    
-    INTERFACE
-       INTEGER FUNCTION H5DSis_attached_c(did, dsid, idx, c_is_attached )
-         
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DSIS_ATTACHED_C':: h5dsis_attached_c
-         !DEC$ENDIF
-         INTEGER(hid_t), INTENT(in)  :: did         ! the dataset
-         INTEGER(hid_t), INTENT(in)  :: dsid        ! the scale to be detached 
-         INTEGER       , INTENT(in)  :: idx         ! the dimension of did to detach
-         INTEGER       , INTENT(out) :: c_is_attached ! dimension scale dsid is currently attached to 
-       END FUNCTION H5DSis_attached_c
-    END INTERFACE
-
-    c_idx = idx - 1 ! account for C-dimensions starting at 0 
-    
-    errcode = H5DSis_attached_c(did, dsid, c_idx, c_is_attached)
-
-    is_attached = .FALSE. ! default
-    IF(c_is_attached.GT.0)THEN
-       is_attached = .TRUE.
-    ELSE IF(errcode.LT.0)THEN
-       errcode = -1
-    ENDIF
-    
-  END SUBROUTINE H5DSis_attached_f
-
-!
-! H5DSiterate_scales: Impliment in  F2003
-!
-
-!-------------------------------------------------------------------------
-! Function: H5DSis_scale_f
-!
-! Purpose: Determines whether dset is a Dimension Scale. 
-!
-! Return: Success: 0, Failure: -1
-!
-! Programmer: M. Scot Breitenfeld
-!
-! Date: April 18, 2011
-!
-! Comments:
-!
-! Modifications:
-!
-!-------------------------------------------------------------------------
-
-  SUBROUTINE H5DSis_scale_f( did, is_scale, errcode)
-    
-    IMPLICIT NONE
-    
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5dsis_scale_f
-!DEC$endif
-!
-    INTEGER(hid_t), INTENT(in)  :: did         ! the data set to query
-    LOGICAL       , INTENT(out) :: is_scale    ! logical:  
-                                               ! .TRUE. if did is a Dimension Scale
-    INTEGER                     :: errcode     ! error code
-    INTEGER                     :: c_is_scale
-    
-    INTERFACE
-       INTEGER FUNCTION  H5DSis_scale_c(did,c_is_scale)
-         
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DSIS_SCALE_C':: h5dsis_scale_c
-         !DEC$ENDIF
-         INTEGER(hid_t), INTENT(in) :: did     !  the data set to query
-         INTEGER, INTENT(out) :: c_is_scale
-       END FUNCTION H5DSis_scale_c
-    END INTERFACE
-    
-    errcode = H5DSis_scale_c(did, c_is_scale)
-
-    is_scale = .FALSE. ! default
-    IF(c_is_scale.GT.0)THEN
-       is_scale = .TRUE.
-    ELSE IF(errcode.LT.0)THEN
-       errcode = -1
-    ENDIF
-    
-  END SUBROUTINE H5DSis_scale_f
-
-!-------------------------------------------------------------------------
-! Function: H5DSset_label_f
-!
-! Purpose: Set label for the dimension idx of did to the value label
-!
-! Return: Success: 0, Failure: -1
-!
-! Programmer: M. Scot Breitenfeld
-!
-! Date: April 18, 2011
-!
-! Comments:
-!
-! Modifications:
-!
-!-------------------------------------------------------------------------
-
-  SUBROUTINE H5DSset_label_f( did, idx, label, errcode)
-
-    IMPLICIT NONE
-
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5dsset_label_f
-!DEC$endif
-!
-
-    INTEGER(hid_t),   INTENT(in) :: did    ! The dataset
-    INTEGER       ,   INTENT(in) :: idx    ! The dimension
-    CHARACTER(LEN=*), INTENT(in) :: label  ! The label
-    INTEGER :: errcode                     ! Error code
-
-    INTEGER(SIZE_T) :: label_len  ! Length of label
-    INTEGER :: c_idx
-
-    INTERFACE
-       INTEGER FUNCTION H5DSset_label_c(did, idx, label, label_len)
-
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DSSET_LABEL_C'::h5dsset_label_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: label
-         INTEGER(hid_t),   INTENT(in) :: did        ! The dataset
-         INTEGER       ,   INTENT(in) :: idx        ! The dimension
-         CHARACTER(LEN=*), INTENT(in) :: label      ! The label
-         INTEGER(SIZE_T),  INTENT(in) :: label_len  ! Length of label
-       END FUNCTION H5DSset_label_c
-    END INTERFACE
-
-    c_idx = idx - 1
-
-    label_len = LEN(label)
-    errcode = H5DSset_label_c(did, c_idx, label, label_len)
-
-  END SUBROUTINE H5DSset_label_f
-
-!-------------------------------------------------------------------------
-! Function: H5DSget_label_f
-!
-! Purpose: Read the label for dimension idx of did into buffer label. 
-!
-! Return: Success: 0, Failure: -1
-!
-! Programmer: M. Scot Breitenfeld
-!
-! Date: April 18, 2011
-!
-! Comments:
-!
-! Modifications:
-!
-!-------------------------------------------------------------------------
-
-  SUBROUTINE H5DSget_label_f( did, idx, label, size, errcode)
-
-    IMPLICIT NONE
-
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5dsget_label_f
-!DEC$endif
-!
-
-    INTEGER(hid_t),   INTENT(in) :: did     ! The dataget
-    INTEGER       ,   INTENT(in) :: idx     ! The dimension
-    CHARACTER(LEN=*), INTENT(in) :: label   ! The label
-    INTEGER(size_t) , INTENT(inout) :: size ! The length of the label buffer
-    INTEGER :: errcode                      ! Error code
-    INTEGER :: c_idx
-
-    INTERFACE
-       INTEGER FUNCTION H5DSget_label_c(did, idx, label, size)
-
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DSGET_LABEL_C'::h5dsget_label_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: label
-         INTEGER(hid_t),   INTENT(in)    :: did        ! The dataget
-         INTEGER       ,   INTENT(in)    :: idx        ! The dimension
-         CHARACTER(LEN=*), INTENT(in)    :: label      ! The label
-         INTEGER(SIZE_T),  INTENT(inout) :: size       ! Length of label
-       END FUNCTION H5DSget_label_c
-    END INTERFACE
-
-    c_idx = idx - 1
-
-    errcode = H5DSget_label_c(did, c_idx, label, size)
-
-  END SUBROUTINE H5DSget_label_f
-
-
-!-------------------------------------------------------------------------
-! Function: H5DSget_scale_name_f
-!
-! Purpose: Read the name of scale did into buffer name.
-!
-! Return: Success: 0, Failure: -1
-!
-! Programmer: M. Scot Breitenfeld
-!
-! Date: April 18, 2011
-!
-! Comments:
-!
-! Modifications:
-!
-!-------------------------------------------------------------------------
-
-  SUBROUTINE H5DSget_scale_name_f(did, name, size, errcode)
-
-    IMPLICIT NONE
-
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5dsget_scale_name_f
-!DEC$endif
-!
-
-    INTEGER(hid_t),   INTENT(in) :: did     ! The dataget
-    CHARACTER(LEN=*), INTENT(out) :: name   ! The name
-    INTEGER(size_t) , INTENT(inout) :: size ! The length of the name buffer
-    INTEGER :: errcode                      ! Error code
-
-    INTERFACE
-       INTEGER FUNCTION H5DSget_scale_name_c(did, name, size)
-
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DSGET_SCALE_NAME_C'::h5dsget_scale_name_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
-         INTEGER(hid_t),   INTENT(in)    :: did       ! The dataget
-         CHARACTER(LEN=*), INTENT(out)   :: name      ! The name
-         INTEGER(SIZE_T),  INTENT(inout) :: size      ! Length of name
-       END FUNCTION H5DSget_scale_name_c
-    END INTERFACE
-
-    errcode = H5DSget_scale_name_c(did, name, size)
-
-  END SUBROUTINE H5DSget_scale_name_f
-
-!-------------------------------------------------------------------------
-! Function: H5DSget_num_scales_f
-!
-! Purpose: Determines how many Dimension Scales are attached to dimension idx of did
-!
-! Return: Success: 0, Failure: -1
-!
-! Programmer: M. Scot Breitenfeld
-!
-! Date: April 18, 2011
-!
-! Comments:
-!
-! Modifications:
-!
-!-------------------------------------------------------------------------
-
-  SUBROUTINE H5DSget_num_scales_f( did, idx, num_scales, errcode)
-
-    IMPLICIT NONE
-
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5dsget_num_scales_f
-!DEC$endif
-!
-    INTEGER(hid_t), INTENT(in)  :: did         ! the dataset
-    INTEGER       , INTENT(in)  :: idx         ! the dimension of did to query
-    INTEGER       , INTENT(out) :: num_scales  ! the number of Dimension Scales associated with did
-    INTEGER                     :: errcode     ! error code
-    INTEGER                     :: c_idx
-    
-    INTERFACE
-       INTEGER FUNCTION  H5DSget_num_scales_c(did, idx, num_scales)
-         
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DSGET_NUM_SCALES_C':: h5dsget_num_scales_c
-         !DEC$ENDIF
-         INTEGER(hid_t), INTENT(in)  :: did        ! the dataset
-         INTEGER       , INTENT(in)  :: idx        ! the dimension of did to query
-         INTEGER       , INTENT(out) :: num_scales ! the number of Dimension Scales associated with did
-       END FUNCTION H5DSget_num_scales_c
-    END INTERFACE
-    
-    c_idx = idx - 1
-    errcode = H5DSget_num_scales_c(did, c_idx, num_scales)
-    
-  END SUBROUTINE H5DSget_num_scales_f
-
-END MODULE h5ds
-
-
-
-
-
-
diff --git a/hl/fortran/src/H5HL_buildiface.F90 b/hl/fortran/src/H5HL_buildiface.F90
new file mode 100644
index 0000000..bbe1b2b
--- /dev/null
+++ b/hl/fortran/src/H5HL_buildiface.F90
@@ -0,0 +1,832 @@
+!****p* Program/H5HL_buildiface
+!
+! NAME
+!  Executable: H5HL_buildiface
+!
+! FILE
+!  fortran/src/H5HL_buildiface.f90
+!
+! PURPOSE
+!  This stand alone program is used at build time to generate the program
+!  H5HL_gen.f90. It cycles through all the available KIND parameters for
+!  integers and reals. The appropriate program and subroutines are then generated
+!  depending on which of the KIND values are found.
+!
+! NOTES
+!  This program uses the Fortran 2008 intrinsic function STORAGE_SIZE or SIZEOF
+!  depending on availability.It generates code that makes use of
+!  STORAGE_SIZE/SIZEOF in H5fortran_detect.f90. STORAGE_SIZE is standard
+!  compliant and should always be chosen over SIZEOF.
+!
+!  The availability of STORAGE_SIZE/SIZEOF is checked at configure time and the TRUE/FALSE
+!  condition is set in the configure variable "FORTRAN_HAVE_STORAGE_SIZE" or
+!  "FORTRAN_HAVE_SIZEOF".
+!
+!  The use of C_SIZOF(X) is not used since the argument X must be an interoperable
+!  data entity.
+!
+! COPYRIGHT
+!  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!  Copyright by The HDF Group.                                                 *
+!  All rights reserved.                                                        *
+!                                                                              *
+!  This file is part of HDF5.  The full HDF5 copyright notice, including       *
+!  terms governing use, modification, and redistribution, is contained in      *
+!  the COPYING file, which can be found at the root of the source code         *
+!  distribution tree, or in https://www.hdfgroup.org/licenses.                 *
+!  If you do not have access to either file, you may request a copy from       *
+!  help@hdfgroup.org.                                                          *
+!  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+! AUTHOR
+!  M. Scot Breitenfeld
+!
+!*****
+
+#include <H5config_f.inc>
+
+PROGRAM H5HL_buildiface
+  USE, INTRINSIC :: ISO_C_BINDING
+  IMPLICIT NONE
+
+! These values are valid REAL KINDs (with corresponding C float) found during configure
+  H5_H5CONFIG_F_NUM_RKIND
+  H5_H5CONFIG_F_RKIND
+! These values are valid INTEGER KINDs (with corresponding C float) found during configure
+  H5_H5CONFIG_F_NUM_IKIND
+  H5_H5CONFIG_F_IKIND
+
+  INTEGER :: i, j, k
+  CHARACTER(LEN=2) :: chr2
+! subroutine rank of array being passed in
+  CHARACTER(LEN=2), DIMENSION(1:8), PARAMETER :: chr_rank=(/"_0","_1","_2","_3","_4","_5","_6","_7"/)
+! rank definitions
+  CHARACTER(LEN=70), DIMENSION(1:8), PARAMETER :: rank_dim_line=(/ &
+       '                                                                    ', &
+       ', DIMENSION(dims(1))                                                ', &
+       ', DIMENSION(dims(1),dims(2))                                        ', &
+       ', DIMENSION(dims(1),dims(2),dims(3))                                ', &
+       ', DIMENSION(dims(1),dims(2),dims(3),dims(4))                        ', &
+       ', DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5))                ', &
+       ', DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6))        ', &
+       ', DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7))' &
+            /)
+! pointer to the buffer
+  CHARACTER(LEN=37), DIMENSION(1:8), PARAMETER :: f_ptr_line=(/ &
+       '    f_ptr = C_LOC(buf               )', &
+       '    f_ptr = C_LOC(buf(1)            )', &
+       '    f_ptr = C_LOC(buf(1,1)          )', &
+       '    f_ptr = C_LOC(buf(1,1,1)        )', &
+       '    f_ptr = C_LOC(buf(1,1,1,1)      )', &
+       '    f_ptr = C_LOC(buf(1,1,1,1,1)    )', &
+       '    f_ptr = C_LOC(buf(1,1,1,1,1,1)  )', &
+       '    f_ptr = C_LOC(buf(1,1,1,1,1,1,1))' &
+            /)
+
+! Generate Fortran H5LT* interfaces having multiple KIND interfaces.
+!
+! Developer's notes:
+!
+! Only interfaces with arrays of rank 7 and less are provided. Even-though the F2008
+! standard extended the maximum rank to 15, it was decided that they should use the
+! new APIs to handle those use cases. Handling rank 7 and less is for backward compatibility
+! with the Fortran 90/95 APIs codes which could never handle rank 8-15 array sizes.
+
+  OPEN(11,FILE='H5LTff_gen.F90')
+  WRITE(11,'(40(A,/))') &
+'!****h* ROBODoc/H5LTff_gen.F90',&
+'!',&
+'! NAME',&
+'!  H5LTff_gen',&
+'! ',&
+'! PURPOSE',&
+'!  This module is generated at build by H5HL_buildiface.F90 to handle all the',&
+'!  detected REAL/INTEGER KINDs for APIs being passed those KINDs. Currently these ',&
+'!  are H5LT and H5TB APIs',&
+'!',&
+'! COPYRIGHT',&
+'! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *',&
+'!   Copyright by The HDF Group.                                               *',&
+'!   All rights reserved.                                                      *',&
+'!                                                                             *',&
+'!   This file is part of HDF5.  The full HDF5 copyright notice, including     *',&
+'!   terms governing use, modification, and redistribution, is contained in    *',&
+'!   the COPYING file, which can be found at the root of the source code       *',&
+'!   distribution tree, or in https://www.hdfgroup.org/licenses.               *',&
+'!   If you do not have access to either file, you may request a copy from     *',&
+'!   help@hdfgroup.org.                                                        *',&
+'! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *',&
+'!',&
+'! AUTHOR',&
+'!   H5HL_buildiface.F90',&
+'!',&
+'!*****'
+
+  WRITE(11,'(a)') "MODULE H5LT"
+
+  WRITE(11,'(A)') '  USE, INTRINSIC :: ISO_C_BINDING'
+  WRITE(11,'(A)') '  USE h5fortran_types'
+  WRITE(11,'(A)') '  USE H5LT_CONST'
+  WRITE(11,'(A)') '  IMPLICIT NONE'
+!***************
+! H5LT INTERFACES
+!***************
+!
+! H5LTmake_dataset_f
+!
+  WRITE(11,'(A)') "  INTERFACE h5ltmake_dataset_f"
+  DO i = 1, num_rkinds
+     j = rkind(i)
+     WRITE(chr2,'(I2)') j
+     DO k = 1, 8
+        WRITE(11,'(A)') "     MODULE PROCEDURE h5ltmake_dataset_real_kind_"//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(k)
+     ENDDO
+  END DO
+  DO i = 1, num_ikinds
+     j = ikind(i)
+     WRITE(chr2,'(I2)') j
+     DO k = 1, 8
+        WRITE(11,'(A)') "     MODULE PROCEDURE h5ltmake_dataset_integer_kind_"//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(k)
+     ENDDO
+  END DO
+  WRITE(11,'(A)') "  END INTERFACE"
+
+!  h5ltread_dataset_f
+  WRITE(11,'(A)') "  INTERFACE h5ltread_dataset_f"
+  DO i = 1, num_rkinds
+     j = rkind(i)
+     WRITE(chr2,'(I2)') j
+     DO k = 1, 8
+        WRITE(11,'(A)') "     MODULE PROCEDURE h5ltread_dataset_real_kind_"//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(k)
+     ENDDO
+  END DO
+  DO i = 1, num_ikinds
+     j = ikind(i)
+     WRITE(chr2,'(I2)') j
+     DO k = 1, 8
+        WRITE(11,'(A)') "     MODULE PROCEDURE h5ltread_dataset_integer_kind_"//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(k)
+     ENDDO
+  END DO
+  WRITE(11,'(A)') "  END INTERFACE"
+
+! h5ltread_dataset_int_f
+  WRITE(11,'(A)') "  INTERFACE h5ltread_dataset_int_f"
+  DO i = 1, num_ikinds
+     j = ikind(i)
+     WRITE(chr2,'(I2)') j
+     DO k = 1, 8
+        WRITE(11,'(A)') "     MODULE PROCEDURE h5ltread_dataset_int_kind_"//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(k)
+     ENDDO
+  END DO
+  WRITE(11,'(A)') "  END INTERFACE"
+
+!  h5ltmake_dataset_int_f
+  WRITE(11,'(A)') "  INTERFACE h5ltmake_dataset_int_f"
+  DO i = 1, num_ikinds
+     j = ikind(i)
+     WRITE(chr2,'(I2)') j
+     DO k = 1, 8
+        WRITE(11,'(A)') "     MODULE PROCEDURE h5ltmake_dataset_int_kind_"//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(k)
+     ENDDO
+  END DO
+  WRITE(11,'(A)') "  END INTERFACE"
+
+!  h5ltmake_dataset_float_f
+  WRITE(11,'(A)') "  INTERFACE h5ltmake_dataset_float_f"
+  DO i = 1, num_rkinds
+     j = rkind(i)
+     WRITE(chr2,'(I2)') j
+     DO k = 1, 8
+        WRITE(11,'(A)') "     MODULE PROCEDURE h5ltmake_dataset_float_kind_"//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(k)
+     ENDDO
+  END DO
+  WRITE(11,'(A)') "  END INTERFACE"
+
+!  h5ltmake_dataset_double_f
+  WRITE(11,'(A)') "  INTERFACE h5ltmake_dataset_double_f"
+  DO i = 1, num_rkinds
+     j = rkind(i)
+     WRITE(chr2,'(I2)') j
+     DO k = 1, 8
+        WRITE(11,'(A)') "     MODULE PROCEDURE h5ltmake_dataset_double_kind_"//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(k)
+     ENDDO
+  END DO
+  WRITE(11,'(A)') "  END INTERFACE"
+
+!  h5ltread_dataset_float_f
+  WRITE(11,'(A)') "  INTERFACE h5ltread_dataset_float_f"
+  DO i = 1, num_rkinds
+     j = rkind(i)
+     WRITE(chr2,'(I2)') j
+     DO k = 1, 8
+        WRITE(11,'(A)') "     MODULE PROCEDURE h5ltread_dataset_float_kind_"//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(k)
+     ENDDO
+  END DO
+  WRITE(11,'(A)') "  END INTERFACE"
+
+!  h5ltread_dataset_double_f
+  WRITE(11,'(A)') "  INTERFACE h5ltread_dataset_double_f"
+  DO i = 1, num_rkinds
+     j = rkind(i)
+     WRITE(chr2,'(I2)') j
+     DO k = 1, 8
+        WRITE(11,'(A)') "     MODULE PROCEDURE h5ltread_dataset_double_kind_"//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(k)
+     ENDDO
+  END DO
+  WRITE(11,'(A)') "  END INTERFACE"
+
+  WRITE(11,'(A)') 'CONTAINS'
+
+!**********************
+! H5LT APIs
+!**********************
+!
+! h5ltmake_dataset_f
+  DO i = 1, num_rkinds
+     k = rkind(i)
+     WRITE(chr2,'(I2)') k
+     DO j = 1, 8
+
+! DLL definitions for windows
+        WRITE(11,'(A)') '!DEC$if defined(BUILD_HDF5_HL_DLL)'
+        WRITE(11,'(A)') '!DEC$attributes dllexport :: h5ltmake_dataset_real_kind_'//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(j)
+        WRITE(11,'(A)') '!DEC$endif'
+
+! Subroutine API
+        WRITE(11,'(A)') '  SUBROUTINE h5ltmake_dataset_real_kind_'//TRIM(ADJUSTL(chr2))&
+             &//'_rank'//chr_rank(j)//'(loc_id,dset_name,rank,dims,type_id,buf,errcode)'
+        WRITE(11,'(A)') '    IMPLICIT NONE'
+        WRITE(11,'(A)') '    INTEGER(hid_t)  , INTENT(IN) :: loc_id'
+        WRITE(11,'(A)') '    CHARACTER(LEN=*), INTENT(IN) :: dset_name'
+        WRITE(11,'(A)') '    INTEGER,          INTENT(IN) :: rank'
+        WRITE(11,'(A)') '    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims'
+        WRITE(11,'(A)') '    INTEGER(hid_t),   INTENT(in) :: type_id'
+        WRITE(11,'(A)') '    REAL(KIND='//TRIM(ADJUSTL(chr2))//'),INTENT(IN)'//TRIM(rank_dim_line(j))//', TARGET :: buf'
+        WRITE(11,'(A)') '    INTEGER :: errcode '
+        WRITE(11,'(A)') '    TYPE(C_PTR) :: f_ptr'
+        WRITE(11,'(A)') '    INTEGER(size_t) :: namelen'
+
+        WRITE(11,'(A)') f_ptr_line(j)
+        WRITE(11,'(A)') '    namelen = LEN(dset_name)'
+        WRITE(11,'(A)') '    errcode = h5ltmake_dataset_c(loc_id,namelen,dset_name,rank,dims,type_id,f_ptr)'
+        WRITE(11,'(A)') '  END SUBROUTINE h5ltmake_dataset_real_kind_'//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(j)
+     ENDDO
+  ENDDO
+
+! h5ltread_dataset_f
+  DO i = 1, num_rkinds
+     k = rkind(i)
+     WRITE(chr2,'(I2)') k
+     DO j = 1, 8
+
+! DLL definitions for windows
+        WRITE(11,'(A)') '!DEC$if defined(BUILD_HDF5_HL_DLL)'
+        WRITE(11,'(A)') '!DEC$attributes dllexport :: h5ltread_dataset_real_kind_'//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(j)
+        WRITE(11,'(A)') '!DEC$endif'
+
+! Subroutine API
+        WRITE(11,'(A)') '  SUBROUTINE h5ltread_dataset_real_kind_'//TRIM(ADJUSTL(chr2))&
+             &//'_rank'//chr_rank(j)//'(loc_id,dset_name,type_id,buf,dims,errcode)'
+        WRITE(11,'(A)') '    IMPLICIT NONE'
+        WRITE(11,'(A)') '    INTEGER(hid_t)  , INTENT(IN) :: loc_id'
+        WRITE(11,'(A)') '    CHARACTER(LEN=*), INTENT(IN) :: dset_name'
+        WRITE(11,'(A)') '    INTEGER(hid_t),   INTENT(in) :: type_id'
+        WRITE(11,'(A)') '    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims'
+        WRITE(11,'(A)') '    REAL(KIND='//TRIM(ADJUSTL(chr2))//'),INTENT(INOUT)'//TRIM(rank_dim_line(j))//', TARGET :: buf'
+        WRITE(11,'(A)') '    INTEGER :: errcode '
+        WRITE(11,'(A)') '    TYPE(C_PTR) :: f_ptr'
+        WRITE(11,'(A)') '    INTEGER(size_t) :: namelen'
+
+        WRITE(11,'(A)') f_ptr_line(j)
+        WRITE(11,'(A)') '    namelen = LEN(dset_name)'
+        WRITE(11,'(A)') '    errcode = h5ltread_dataset_c(loc_id,namelen,dset_name,type_id,f_ptr)'
+        WRITE(11,'(A)') '  END SUBROUTINE h5ltread_dataset_real_kind_'//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(j)
+     ENDDO
+  ENDDO
+
+! h5ltmake_dataset_float_f
+  DO i = 1, num_rkinds
+     k = rkind(i)
+     WRITE(chr2,'(I2)') k
+     DO j = 1, 8
+
+! DLL definitions for windows
+        WRITE(11,'(A)') '!DEC$if defined(BUILD_HDF5_HL_DLL)'
+        WRITE(11,'(A)') '!DEC$attributes dllexport :: h5ltmake_dataset_float_kind_'//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(j)
+        WRITE(11,'(A)') '!DEC$endif'
+
+! Subroutine API
+        WRITE(11,'(A)') '  SUBROUTINE h5ltmake_dataset_float_kind_'//TRIM(ADJUSTL(chr2))&
+             &//'_rank'//chr_rank(j)//'(loc_id,dset_name,rank,dims,buf,errcode)'
+        WRITE(11,'(A)') '    IMPLICIT NONE'
+        WRITE(11,'(A)') '    INTEGER(hid_t)  , INTENT(IN) :: loc_id'
+        WRITE(11,'(A)') '    CHARACTER(LEN=*), INTENT(IN) :: dset_name'
+        WRITE(11,'(A)') '    INTEGER,          INTENT(IN) :: rank'
+        WRITE(11,'(A)') '    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims'
+        WRITE(11,'(A)') '    REAL(KIND='//TRIM(ADJUSTL(chr2))//'),INTENT(IN)'//TRIM(rank_dim_line(j))//', TARGET :: buf'
+        WRITE(11,'(A)') '    INTEGER :: errcode '
+        WRITE(11,'(A)') '    TYPE(C_PTR) :: f_ptr'
+        WRITE(11,'(A)') '    INTEGER(size_t) :: namelen'
+
+        WRITE(11,'(A)') f_ptr_line(j)
+        WRITE(11,'(A)') '    namelen = LEN(dset_name)'
+        WRITE(11,'(A)') '    errcode = h5ltmake_dataset_c(loc_id,namelen,dset_name,rank,dims,H5T_NATIVE_REAL,f_ptr)'
+        WRITE(11,'(A)') '  END SUBROUTINE h5ltmake_dataset_float_kind_'//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(j)
+     ENDDO
+  ENDDO
+
+! h5ltread_dataset_float_f
+  DO i = 1, num_rkinds
+     k = rkind(i)
+     WRITE(chr2,'(I2)') k
+     DO j = 1, 8
+
+! DLL definitions for windows
+        WRITE(11,'(A)') '!DEC$if defined(BUILD_HDF5_HL_DLL)'
+        WRITE(11,'(A)') '!DEC$attributes dllexport :: h5ltread_dataset_float_kind_'//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(j)
+        WRITE(11,'(A)') '!DEC$endif'
+
+! Subroutine API
+        WRITE(11,'(A)') '  SUBROUTINE h5ltread_dataset_float_kind_'//TRIM(ADJUSTL(chr2))&
+             &//'_rank'//chr_rank(j)//'(loc_id,dset_name,buf,dims,errcode)'
+        WRITE(11,'(A)') '    IMPLICIT NONE'
+        WRITE(11,'(A)') '    INTEGER(hid_t)  , INTENT(IN) :: loc_id'
+        WRITE(11,'(A)') '    CHARACTER(LEN=*), INTENT(IN) :: dset_name'
+        WRITE(11,'(A)') '    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims'
+        WRITE(11,'(A)') '    REAL(KIND='//TRIM(ADJUSTL(chr2))//'),INTENT(INOUT)'//TRIM(rank_dim_line(j))//', TARGET :: buf'
+        WRITE(11,'(A)') '    INTEGER :: errcode '
+        WRITE(11,'(A)') '    TYPE(C_PTR) :: f_ptr'
+        WRITE(11,'(A)') '    INTEGER(size_t) :: namelen'
+
+        WRITE(11,'(A)') f_ptr_line(j)
+        WRITE(11,'(A)') '    namelen = LEN(dset_name)'
+        WRITE(11,'(A)') '    errcode = h5ltread_dataset_c(loc_id,namelen,dset_name,H5T_NATIVE_REAL,f_ptr)'
+        WRITE(11,'(A)') '  END SUBROUTINE h5ltread_dataset_float_kind_'//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(j)
+     ENDDO
+  ENDDO
+
+! h5ltmake_dataset_double_f
+  DO i = 1, num_rkinds
+     k = rkind(i)
+     WRITE(chr2,'(I2)') k
+     DO j = 1, 8
+! DLL definitions for windows
+        WRITE(11,'(A)') '!DEC$if defined(BUILD_HDF5_HL_DLL)'
+        WRITE(11,'(A)') '!DEC$attributes dllexport :: h5ltmake_dataset_double_kind_'//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(j)
+        WRITE(11,'(A)') '!DEC$endif'
+
+! Subroutine API
+        WRITE(11,'(A)') '  SUBROUTINE h5ltmake_dataset_double_kind_'//TRIM(ADJUSTL(chr2))&
+             &//'_rank'//chr_rank(j)//'(loc_id,dset_name,rank,dims,buf,errcode)'
+        WRITE(11,'(A)') '    IMPLICIT NONE'
+        WRITE(11,'(A)') '    INTEGER(hid_t)  , INTENT(IN) :: loc_id'
+        WRITE(11,'(A)') '    CHARACTER(LEN=*), INTENT(IN) :: dset_name'
+        WRITE(11,'(A)') '    INTEGER,          INTENT(IN) :: rank'
+        WRITE(11,'(A)') '    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims'
+        WRITE(11,'(A)') '    REAL(KIND='//TRIM(ADJUSTL(chr2))//'),INTENT(IN)'//TRIM(rank_dim_line(j))//', TARGET :: buf'
+        WRITE(11,'(A)') '    INTEGER :: errcode '
+        WRITE(11,'(A)') '    TYPE(C_PTR) :: f_ptr'
+        WRITE(11,'(A)') '    INTEGER(size_t) :: namelen'
+
+        WRITE(11,'(A)') f_ptr_line(j)
+        WRITE(11,'(A)') '    namelen = LEN(dset_name)'
+        WRITE(11,'(A)') '    errcode = h5ltmake_dataset_c(loc_id,namelen,dset_name,rank,dims,H5T_NATIVE_DOUBLE,f_ptr)'
+        WRITE(11,'(A)') '  END SUBROUTINE h5ltmake_dataset_double_kind_'//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(j)
+     ENDDO
+  ENDDO
+
+! h5ltread_dataset_double_f
+  DO i = 1, num_rkinds
+     k = rkind(i)
+     WRITE(chr2,'(I2)') k
+     DO j = 1, 8
+
+! DLL definitions for windows
+        WRITE(11,'(A)') '!DEC$if defined(BUILD_HDF5_HL_DLL)'
+        WRITE(11,'(A)') '!DEC$attributes dllexport :: h5ltread_dataset_double_kind_'//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(j)
+        WRITE(11,'(A)') '!DEC$endif'
+
+! Subroutine API
+        WRITE(11,'(A)') '  SUBROUTINE h5ltread_dataset_double_kind_'//TRIM(ADJUSTL(chr2))&
+             &//'_rank'//chr_rank(j)//'(loc_id,dset_name,buf,dims,errcode)'
+        WRITE(11,'(A)') '    IMPLICIT NONE'
+        WRITE(11,'(A)') '    INTEGER(hid_t)  , INTENT(IN) :: loc_id'
+        WRITE(11,'(A)') '    CHARACTER(LEN=*), INTENT(IN) :: dset_name'
+        WRITE(11,'(A)') '    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims'
+        WRITE(11,'(A)') '    REAL(KIND='//TRIM(ADJUSTL(chr2))//'),INTENT(INOUT)'//TRIM(rank_dim_line(j))//', TARGET :: buf'
+        WRITE(11,'(A)') '    INTEGER :: errcode '
+        WRITE(11,'(A)') '    TYPE(C_PTR) :: f_ptr'
+        WRITE(11,'(A)') '    INTEGER(size_t) :: namelen'
+
+        WRITE(11,'(A)') f_ptr_line(j)
+        WRITE(11,'(A)') '    namelen = LEN(dset_name)'
+        WRITE(11,'(A)') '    errcode = h5ltread_dataset_c(loc_id,namelen,dset_name,H5T_NATIVE_DOUBLE,f_ptr)'
+        WRITE(11,'(A)') '  END SUBROUTINE h5ltread_dataset_double_kind_'//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(j)
+     ENDDO
+  ENDDO
+
+! h5ltmake_dataset_f
+  DO i = 1, num_ikinds
+     k = ikind(i)
+     WRITE(chr2,'(I2)') k
+     DO j = 1, 8
+
+! DLL definitions for windows
+        WRITE(11,'(A)') '!DEC$if defined(BUILD_HDF5_HL_DLL)'
+        WRITE(11,'(A)') '!DEC$attributes dllexport :: h5ltmake_dataset_integer_kind_'//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(j)
+        WRITE(11,'(A)') '!DEC$endif'
+
+! Subroutine API
+        WRITE(11,'(A)') '  SUBROUTINE h5ltmake_dataset_integer_kind_'//TRIM(ADJUSTL(chr2))&
+             &//'_rank'//chr_rank(j)//'(loc_id,dset_name,rank,dims,type_id,buf,errcode)'
+        WRITE(11,'(A)') '    IMPLICIT NONE'
+        WRITE(11,'(A)') '    INTEGER(hid_t)  , INTENT(IN) :: loc_id'
+        WRITE(11,'(A)') '    CHARACTER(LEN=*), INTENT(IN) :: dset_name'
+        WRITE(11,'(A)') '    INTEGER,          INTENT(IN) :: rank'
+        WRITE(11,'(A)') '    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims'
+        WRITE(11,'(A)') '    INTEGER(hid_t),   INTENT(in) :: type_id'
+        WRITE(11,'(A)') '    INTEGER(KIND='//TRIM(ADJUSTL(chr2))//'),INTENT(IN)'//TRIM(rank_dim_line(j))//', TARGET :: buf'
+        WRITE(11,'(A)') '    INTEGER :: errcode '
+        WRITE(11,'(A)') '    TYPE(C_PTR) :: f_ptr'
+        WRITE(11,'(A)') '    INTEGER(size_t) :: namelen'
+
+        WRITE(11,'(A)') f_ptr_line(j)
+        WRITE(11,'(A)') '    namelen = LEN(dset_name)'
+        WRITE(11,'(A)') '    errcode = h5ltmake_dataset_c(loc_id, namelen, dset_name, rank, dims, type_id, f_ptr)'
+        WRITE(11,'(A)') '  END SUBROUTINE h5ltmake_dataset_integer_kind_'//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(j)
+     ENDDO
+  ENDDO
+
+! h5ltmake_dataset_int_f
+  DO i = 1, num_ikinds
+     k = ikind(i)
+     WRITE(chr2,'(I2)') k
+     DO j = 1, 8
+
+! DLL definitions for windows
+        WRITE(11,'(A)') '!DEC$if defined(BUILD_HDF5_HL_DLL)'
+        WRITE(11,'(A)') '!DEC$attributes dllexport :: h5ltmake_dataset_int_kind_'//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(j)
+        WRITE(11,'(A)') '!DEC$endif'
+
+! Subroutine API
+        WRITE(11,'(A)') '  SUBROUTINE h5ltmake_dataset_int_kind_'//TRIM(ADJUSTL(chr2))&
+             &//'_rank'//chr_rank(j)//'(loc_id,dset_name,rank,dims,buf,errcode)'
+        WRITE(11,'(A)') '    IMPLICIT NONE'
+        WRITE(11,'(A)') '    INTEGER(hid_t)  , INTENT(IN) :: loc_id'
+        WRITE(11,'(A)') '    CHARACTER(LEN=*), INTENT(IN) :: dset_name'
+        WRITE(11,'(A)') '    INTEGER,          INTENT(IN) :: rank'
+        WRITE(11,'(A)') '    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims'
+        WRITE(11,'(A)') '    INTEGER(KIND='//TRIM(ADJUSTL(chr2))//'),INTENT(IN)'//TRIM(rank_dim_line(j))//', TARGET :: buf'
+        WRITE(11,'(A)') '    INTEGER :: errcode '
+        WRITE(11,'(A)') '    TYPE(C_PTR) :: f_ptr'
+        WRITE(11,'(A)') '    INTEGER(size_t) :: namelen'
+        WRITE(11,'(A)') '    INTEGER(hid_t) :: type_id'
+
+        WRITE(11,'(A)') f_ptr_line(j)
+        WRITE(11,'(A)') '    namelen = LEN(dset_name)'
+        WRITE(11,'(A)') '    type_id = h5kind_to_type(KIND('//f_ptr_line(j)(19:36)//'), H5_INTEGER_KIND)'
+        WRITE(11,'(A)') '    errcode = h5ltmake_dataset_c(loc_id, namelen, dset_name, rank, dims, type_id, f_ptr)'
+        WRITE(11,'(A)') '  END SUBROUTINE h5ltmake_dataset_int_kind_'//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(j)
+     ENDDO
+  ENDDO
+
+! h5ltread_dataset_f
+  DO i = 1, num_ikinds
+     k = ikind(i)
+     WRITE(chr2,'(I2)') k
+     DO j = 1, 8
+
+! DLL definitions for windows
+        WRITE(11,'(A)') '!DEC$if defined(BUILD_HDF5_HL_DLL)'
+        WRITE(11,'(A)') '!DEC$attributes dllexport :: h5ltread_dataset_integer_kind_'//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(j)
+        WRITE(11,'(A)') '!DEC$endif'
+
+! Subroutine API
+        WRITE(11,'(A)') '  SUBROUTINE h5ltread_dataset_integer_kind_'//TRIM(ADJUSTL(chr2))&
+             &//'_rank'//chr_rank(j)//'(loc_id,dset_name, type_id, buf,dims,errcode)'
+        WRITE(11,'(A)') '    IMPLICIT NONE'
+        WRITE(11,'(A)') '    INTEGER(hid_t)  , INTENT(IN) :: loc_id'
+        WRITE(11,'(A)') '    CHARACTER(LEN=*), INTENT(IN) :: dset_name'
+        WRITE(11,'(A)') '    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims'
+        WRITE(11,'(A)') '    INTEGER(hid_t),   INTENT(in) :: type_id'
+        WRITE(11,'(A)') '    INTEGER(KIND='//TRIM(ADJUSTL(chr2))//'),INTENT(INOUT)'//TRIM(rank_dim_line(j))//', TARGET :: buf'
+        WRITE(11,'(A)') '    INTEGER :: errcode '
+        WRITE(11,'(A)') '    TYPE(C_PTR) :: f_ptr'
+        WRITE(11,'(A)') '    INTEGER(size_t) :: namelen'
+
+        WRITE(11,'(A)') f_ptr_line(j)
+        WRITE(11,'(A)') '    namelen = LEN(dset_name)'
+        WRITE(11,'(A)') '    errcode = h5ltread_dataset_c(loc_id, namelen, dset_name, type_id, f_ptr)'
+        WRITE(11,'(A)') '  END SUBROUTINE h5ltread_dataset_integer_kind_'//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(j)
+     ENDDO
+  ENDDO
+
+! h5ltread_dataset_int_f
+  DO i = 1, num_ikinds
+     k = ikind(i)
+     WRITE(chr2,'(I2)') k
+     DO j = 1, 8
+
+! DLL definitions for windows
+        WRITE(11,'(A)') '!DEC$if defined(BUILD_HDF5_HL_DLL)'
+        WRITE(11,'(A)') '!DEC$attributes dllexport :: h5ltread_dataset_int_kind_'//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(j)
+        WRITE(11,'(A)') '!DEC$endif'
+
+! Subroutine API
+        WRITE(11,'(A)') '  SUBROUTINE h5ltread_dataset_int_kind_'//TRIM(ADJUSTL(chr2))&
+             &//'_rank'//chr_rank(j)//'(loc_id,dset_name, buf,dims,errcode)'
+        WRITE(11,'(A)') '    IMPLICIT NONE'
+        WRITE(11,'(A)') '    INTEGER(hid_t)  , INTENT(IN) :: loc_id'
+        WRITE(11,'(A)') '    CHARACTER(LEN=*), INTENT(IN) :: dset_name'
+        WRITE(11,'(A)') '    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims'
+        WRITE(11,'(A)') '    INTEGER(KIND='//TRIM(ADJUSTL(chr2))//'),INTENT(INOUT)'//TRIM(rank_dim_line(j))//', TARGET :: buf'
+        WRITE(11,'(A)') '    INTEGER :: errcode '
+        WRITE(11,'(A)') '    TYPE(C_PTR) :: f_ptr'
+        WRITE(11,'(A)') '    INTEGER(size_t) :: namelen'
+        WRITE(11,'(A)') '    INTEGER(hid_t) :: type_id'
+
+        WRITE(11,'(A)') f_ptr_line(j)
+        WRITE(11,'(A)') '    namelen = LEN(dset_name)'
+        WRITE(11,'(A)') '    type_id = h5kind_to_type(KIND('//f_ptr_line(j)(19:36)//'), H5_INTEGER_KIND)'
+        WRITE(11,'(A)') '    errcode = h5ltread_dataset_c(loc_id, namelen, dset_name, type_id, f_ptr)'
+        WRITE(11,'(A)') '  END SUBROUTINE h5ltread_dataset_int_kind_'//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(j)
+     ENDDO
+  ENDDO
+
+  WRITE(11,'(A)') 'END MODULE H5LT' ! change this to be generic MSB
+
+  CLOSE(11)
+
+! Generate Fortran H5TB* interfaces having multiple KIND interfaces.
+
+
+  OPEN(11,FILE='H5TBff_gen.F90')
+  WRITE(11,'(40(A,/))') &
+'!****h* ROBODoc/H5TBff_gen.F90',&
+'!',&
+'! NAME',&
+'!  H5TBff_gen',&
+'! ',&
+'! PURPOSE',&
+'!  This module is generated at build by H5HL_buildiface.F90 to handle all the',&
+'!  detected REAL/INTEGER KINDs for APIs being passed those KINDs. Currently these ',&
+'!  are H5LT and H5TB APIs',&
+'!',&
+'! COPYRIGHT',&
+'! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *',&
+'!   Copyright by The HDF Group.                                               *',&
+'!   All rights reserved.                                                      *',&
+'!                                                                             *',&
+'!   This file is part of HDF5.  The full HDF5 copyright notice, including     *',&
+'!   terms governing use, modification, and redistribution, is contained in    *',&
+'!   the COPYING file, which can be found at the root of the source code       *',&
+'!   distribution tree, or in https://www.hdfgroup.org/licenses.               *',&
+'!   If you do not have access to either file, you may request a copy from     *',&
+'!   help@hdfgroup.org.                                                        *',&
+'! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *',&
+'!',&
+'! AUTHOR',&
+'!   H5HL_buildiface.F90',&
+'!',&
+'!*****'
+
+  WRITE(11,'(a)') "MODULE H5TB"
+
+  WRITE(11,'(A)') '  USE, INTRINSIC :: ISO_C_BINDING'
+  WRITE(11,'(A)') '  USE h5fortran_types'
+  WRITE(11,'(A)') '  USE H5TB_CONST'
+  WRITE(11,'(A)') '  IMPLICIT NONE'
+
+!***************
+! H5TB INTERFACES
+!***************
+
+!  h5tbwrite_field_name_f
+  WRITE(11,'(A)') "  INTERFACE h5tbwrite_field_name_f"
+  DO i = 1, num_rkinds
+     j = rkind(i)
+     WRITE(chr2,'(I2)') j
+     k =2
+     WRITE(11,'(A)') "     MODULE PROCEDURE h5tbwrite_field_name_kind_"//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(k)
+  END DO
+  WRITE(11,'(A)') "  END INTERFACE"
+
+!  h5tbread_field_name_f
+  WRITE(11,'(A)') "  INTERFACE h5tbread_field_name_f"
+  DO i = 1, num_rkinds
+     j = rkind(i)
+     WRITE(chr2,'(I2)') j
+     k = 2
+     WRITE(11,'(A)') "     MODULE PROCEDURE h5tbread_field_name_kind_"//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(k)
+  END DO
+  WRITE(11,'(A)') "  END INTERFACE"
+
+!  h5tbwrite_field_index_f
+  WRITE(11,'(A)') "  INTERFACE h5tbwrite_field_index_f"
+  DO i = 1, num_rkinds
+     j = rkind(i)
+     WRITE(chr2,'(I2)') j
+     k = 2
+     WRITE(11,'(A)') "     MODULE PROCEDURE h5tbwrite_field_index_kind_"//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(k)
+  END DO
+  WRITE(11,'(A)') "  END INTERFACE"
+
+!  h5tbread_field_index_f
+  WRITE(11,'(A)') "  INTERFACE h5tbread_field_index_f"
+  DO i = 1, num_rkinds
+     j = rkind(i)
+     WRITE(chr2,'(I2)') j
+     k = 2
+     WRITE(11,'(A)') "     MODULE PROCEDURE h5tbread_field_index_kind_"//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(k)
+  END DO
+  WRITE(11,'(A)') "  END INTERFACE"
+
+!  h5tbinsert_field_f
+  WRITE(11,'(A)') "  INTERFACE h5tbinsert_field_f"
+  DO i = 1, num_rkinds
+     j = rkind(i)
+     WRITE(chr2,'(I2)') j
+     k = 2
+     WRITE(11,'(A)') "     MODULE PROCEDURE h5tbinsert_field_kind_"//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(k)
+  END DO
+  WRITE(11,'(A)') "  END INTERFACE"
+
+  WRITE(11,'(A)') 'CONTAINS'
+
+  !**********************
+  ! H5TB APIs
+  !**********************
+
+  ! h5tbwrite_field_name_f
+  DO i = 1, num_rkinds
+     k = rkind(i)
+     WRITE(chr2,'(I2)') k
+     j = 2
+! DLL definitions for windows
+     WRITE(11,'(A)') '!DEC$if defined(BUILD_HDF5_HL_DLL)'
+     WRITE(11,'(A)') '!DEC$attributes dllexport :: h5tbwrite_field_name_kind_'//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(j)
+     WRITE(11,'(A)') '!DEC$endif'
+
+! Subroutine API
+     WRITE(11,'(A)') '  SUBROUTINE h5tbwrite_field_name_kind_'//TRIM(ADJUSTL(chr2))&
+          &//'_rank'//chr_rank(j)//'(loc_id,dset_name,field_name,start, nrecords,type_size,buf,errcode)'
+     WRITE(11,'(A)') '    IMPLICIT NONE'
+     WRITE(11,'(A)') '    INTEGER(hid_t)  , INTENT(IN) :: loc_id'
+     WRITE(11,'(A)') '    CHARACTER(LEN=*), INTENT(IN) :: dset_name'
+     WRITE(11,'(A)') '    CHARACTER(LEN=*), INTENT(in) :: field_name'
+     WRITE(11,'(A)') '    INTEGER(hsize_t), INTENT(in) :: start'
+     WRITE(11,'(A)') '    INTEGER(hsize_t), INTENT(in) :: nrecords'
+     WRITE(11,'(A)') '    INTEGER(size_t),  INTENT(in) :: type_size'
+     WRITE(11,'(A)') '    REAL(KIND='//TRIM(ADJUSTL(chr2))//'),INTENT(IN), DIMENSION(*), TARGET :: buf'
+     WRITE(11,'(A)') '    INTEGER :: errcode '
+     WRITE(11,'(A)') '    INTEGER(size_t) :: namelen'
+     WRITE(11,'(A)') '    INTEGER(size_t) :: namelen1'
+     WRITE(11,'(A)') '    TYPE(C_PTR) :: f_ptr'
+
+     WRITE(11,'(A)') f_ptr_line(j)
+     WRITE(11,'(A)') '    namelen = LEN(dset_name)'
+     WRITE(11,'(A)') '    namelen1 = LEN(field_name)'
+     WRITE(11,'(A)') &
+          '    errcode = h5tbwrite_field_name_c(loc_id,namelen,dset_name,namelen1,field_name,start,nrecords,type_size,f_ptr)'
+     WRITE(11,'(A)') '  END SUBROUTINE h5tbwrite_field_name_kind_'//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(j)
+  ENDDO
+
+  ! h5tbread_field_name_f
+  DO i = 1, num_rkinds
+     k = rkind(i)
+     WRITE(chr2,'(I2)') k
+     j = 2
+! DLL definitions for windows
+     WRITE(11,'(A)') '!DEC$if defined(BUILD_HDF5_HL_DLL)'
+     WRITE(11,'(A)') '!DEC$attributes dllexport :: h5tbread_field_name_kind_'//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(j)
+     WRITE(11,'(A)') '!DEC$endif'
+
+! Subroutine API
+     WRITE(11,'(A)') '  SUBROUTINE h5tbread_field_name_kind_'//TRIM(ADJUSTL(chr2))&
+          &//'_rank'//chr_rank(j)//'(loc_id,dset_name,field_name,start, nrecords,type_size,buf,errcode)'
+     WRITE(11,'(A)') '    IMPLICIT NONE'
+     WRITE(11,'(A)') '    INTEGER(hid_t)  , INTENT(IN) :: loc_id'
+     WRITE(11,'(A)') '    CHARACTER(LEN=*), INTENT(IN) :: dset_name'
+     WRITE(11,'(A)') '    CHARACTER(LEN=*), INTENT(in) :: field_name'
+     WRITE(11,'(A)') '    INTEGER(hsize_t), INTENT(in) :: start'
+     WRITE(11,'(A)') '    INTEGER(hsize_t), INTENT(in) :: nrecords'
+     WRITE(11,'(A)') '    INTEGER(size_t),  INTENT(in) :: type_size'
+     WRITE(11,'(A)') '    REAL(KIND='//TRIM(ADJUSTL(chr2))//'),INTENT(INOUT), DIMENSION(*), TARGET :: buf'
+     WRITE(11,'(A)') '    INTEGER :: errcode '
+     WRITE(11,'(A)') '    INTEGER(size_t) :: namelen'
+     WRITE(11,'(A)') '    INTEGER(size_t) :: namelen1'
+     WRITE(11,'(A)') '    TYPE(C_PTR) :: f_ptr'
+
+     WRITE(11,'(A)') f_ptr_line(j)
+     WRITE(11,'(A)') '    namelen = LEN(dset_name)'
+     WRITE(11,'(A)') '    namelen1 = LEN(field_name)'
+     WRITE(11,'(A)') &
+          '    errcode = h5tbread_field_name_c(loc_id,namelen,dset_name,namelen1,field_name,start,nrecords,type_size,f_ptr)'
+     WRITE(11,'(A)') '  END SUBROUTINE h5tbread_field_name_kind_'//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(j)
+  ENDDO
+
+  ! h5tbwrite_field_index_f
+  DO i = 1, num_rkinds
+     k = rkind(i)
+     WRITE(chr2,'(I2)') k
+     j = 2
+! DLL definitions for windows
+     WRITE(11,'(A)') '!DEC$if defined(BUILD_HDF5_HL_DLL)'
+     WRITE(11,'(A)') '!DEC$attributes dllexport :: h5tbwrite_field_index_kind_'//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(j)
+     WRITE(11,'(A)') '!DEC$endif'
+
+! Subroutine API
+     WRITE(11,'(A)') '  SUBROUTINE h5tbwrite_field_index_kind_'//TRIM(ADJUSTL(chr2))&
+          &//'_rank'//chr_rank(j)//'(loc_id,dset_name,field_index,start, nrecords,type_size,buf,errcode)'
+     WRITE(11,'(A)') '    IMPLICIT NONE'
+     WRITE(11,'(A)') '    INTEGER(hid_t)  , INTENT(IN) :: loc_id'
+     WRITE(11,'(A)') '    CHARACTER(LEN=*), INTENT(IN) :: dset_name'
+     WRITE(11,'(A)') '    INTEGER, INTENT(in) :: field_index'
+     WRITE(11,'(A)') '    INTEGER(hsize_t), INTENT(in) :: start'
+     WRITE(11,'(A)') '    INTEGER(hsize_t), INTENT(in) :: nrecords'
+     WRITE(11,'(A)') '    INTEGER(size_t),  INTENT(in) :: type_size'
+     WRITE(11,'(A)') '    REAL(KIND='//TRIM(ADJUSTL(chr2))//'),INTENT(IN), DIMENSION(*), TARGET :: buf'
+     WRITE(11,'(A)') '    INTEGER :: errcode '
+     WRITE(11,'(A)') '    INTEGER(size_t) :: namelen'
+     WRITE(11,'(A)') '    TYPE(C_PTR) :: f_ptr'
+
+     WRITE(11,'(A)') f_ptr_line(j)
+     WRITE(11,'(A)') '    namelen = LEN(dset_name)'
+     WRITE(11,'(A)') &
+          '    errcode = h5tbwrite_field_index_c(loc_id,namelen,dset_name,field_index,start,nrecords,type_size,f_ptr)'
+     WRITE(11,'(A)') '  END SUBROUTINE h5tbwrite_field_index_kind_'//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(j)
+  ENDDO
+
+  ! h5tbread_field_index_f
+  DO i = 1, num_rkinds
+     k = rkind(i)
+     WRITE(chr2,'(I2)') k
+     j = 2
+! DLL definitions for windows
+     WRITE(11,'(A)') '!DEC$if defined(BUILD_HDF5_HL_DLL)'
+     WRITE(11,'(A)') '!DEC$attributes dllexport :: h5tbread_field_index_kind_'//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(j)
+     WRITE(11,'(A)') '!DEC$endif'
+
+! Subroutine API
+     WRITE(11,'(A)') '  SUBROUTINE h5tbread_field_index_kind_'//TRIM(ADJUSTL(chr2))&
+          &//'_rank'//chr_rank(j)//'(loc_id,dset_name,field_index,start, nrecords,type_size,buf,errcode)'
+     WRITE(11,'(A)') '    IMPLICIT NONE'
+     WRITE(11,'(A)') '    INTEGER(hid_t)  , INTENT(IN) :: loc_id'
+     WRITE(11,'(A)') '    CHARACTER(LEN=*), INTENT(IN) :: dset_name'
+     WRITE(11,'(A)') '    INTEGER, INTENT(in) :: field_index'
+     WRITE(11,'(A)') '    INTEGER(hsize_t), INTENT(in) :: start'
+     WRITE(11,'(A)') '    INTEGER(hsize_t), INTENT(in) :: nrecords'
+     WRITE(11,'(A)') '    INTEGER(size_t),  INTENT(in) :: type_size'
+     WRITE(11,'(A)') '    REAL(KIND='//TRIM(ADJUSTL(chr2))//'),INTENT(INOUT), DIMENSION(*), TARGET :: buf'
+     WRITE(11,'(A)') '    INTEGER :: errcode '
+     WRITE(11,'(A)') '    INTEGER(size_t) :: namelen'
+     WRITE(11,'(A)') '    TYPE(C_PTR) :: f_ptr'
+
+     WRITE(11,'(A)') f_ptr_line(j)
+     WRITE(11,'(A)') '    namelen = LEN(dset_name)'
+     WRITE(11,'(A)') &
+          '    errcode = h5tbread_field_index_c(loc_id,namelen,dset_name,field_index,start,nrecords,type_size,f_ptr)'
+     WRITE(11,'(A)') '  END SUBROUTINE h5tbread_field_index_kind_'//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(j)
+  ENDDO
+
+  ! h5tbinsert_field_f
+  DO i = 1, num_rkinds
+     k = rkind(i)
+     WRITE(chr2,'(I2)') k
+     j = 2
+! DLL definitions for windows
+     WRITE(11,'(A)') '!DEC$if defined(BUILD_HDF5_HL_DLL)'
+     WRITE(11,'(A)') '!DEC$attributes dllexport :: h5tbinsert_field_kind_'//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(j)
+     WRITE(11,'(A)') '!DEC$endif'
+
+! Subroutine API
+     WRITE(11,'(A)') '  SUBROUTINE h5tbinsert_field_kind_'//TRIM(ADJUSTL(chr2))&
+          &//'_rank'//chr_rank(j)//'(loc_id,dset_name,field_name,field_type,field_index,buf,errcode)'
+     WRITE(11,'(A)') '    IMPLICIT NONE'
+     WRITE(11,'(A)') '        INTEGER(hid_t),   INTENT(in) :: loc_id'
+     WRITE(11,'(A)') '        CHARACTER(LEN=*), INTENT(in) :: dset_name'
+     WRITE(11,'(A)') '        CHARACTER(LEN=*), INTENT(in) :: field_name'
+     WRITE(11,'(A)') '        INTEGER(hid_t), INTENT(in)   :: field_type'
+     WRITE(11,'(A)') '        INTEGER, INTENT(in) :: field_index'
+     WRITE(11,'(A)') '        REAL(KIND='//TRIM(ADJUSTL(chr2))//'), INTENT(IN), DIMENSION(*), TARGET :: buf'
+     WRITE(11,'(A)') '        INTEGER(size_t) :: namelen'
+     WRITE(11,'(A)') '        INTEGER(size_t) :: namelen1'
+     WRITE(11,'(A)') '        INTEGER :: errcode'
+     WRITE(11,'(A)') '        TYPE(C_PTR) :: f_ptr'
+
+     WRITE(11,'(A)') f_ptr_line(j)
+     WRITE(11,'(A)') '    namelen = LEN(dset_name)'
+     WRITE(11,'(A)') '    namelen1 = LEN(field_name)'
+     WRITE(11,'(A)') &
+          '    errcode = h5tbinsert_field_c(loc_id,namelen,dset_name,namelen1,field_name,field_type,field_index,f_ptr)'
+     WRITE(11,'(A)') '  END SUBROUTINE h5tbinsert_field_kind_'//TRIM(ADJUSTL(chr2))//'_rank'//chr_rank(j)
+  ENDDO
+
+  WRITE(11,'(A)') 'END MODULE H5TB'
+
+  CLOSE(11)
+
+END PROGRAM H5HL_buildiface
+
+
+
diff --git a/hl/fortran/src/H5IMcc.c b/hl/fortran/src/H5IMcc.c
index ae58fab..6e812f8 100644
--- a/hl/fortran/src/H5IMcc.c
+++ b/hl/fortran/src/H5IMcc.c
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "H5IMcc.h"
@@ -18,16 +15,11 @@
 #include <string.h>
 #include <stdlib.h>
 
-
 /*-------------------------------------------------------------------------
  * private functions
  *-------------------------------------------------------------------------
  */
-herr_t H5IM_get_palette(hid_t loc_id,
-                         const char *image_name,
-                         int pal_number,
-                         hid_t tid,
-                         void *pal_data);
+herr_t H5IM_get_palette(hid_t loc_id, const char *image_name, int pal_number, hid_t tid, void *pal_data);
 
 /*-------------------------------------------------------------------------
  * Function: H5IMmake_image_8bitf
@@ -36,7 +28,7 @@ herr_t H5IM_get_palette(hid_t loc_id,
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente Nunes
  *
  * Date: May 10, 2005
  *
@@ -50,77 +42,76 @@ herr_t H5IM_get_palette(hid_t loc_id,
  *-------------------------------------------------------------------------
  */
 
-herr_t H5IMmake_image_8bitf(hid_t loc_id,
-                             const char *dset_name,
-                             hsize_t width,
-                             hsize_t height,
-                             int_f *buf)
+herr_t
+H5IMmake_image_8bitf(hid_t loc_id, const char *dset_name, hsize_t width, hsize_t height, int_f *buf)
 {
- hid_t    did;                  /* dataset ID */
- hid_t    sid;                  /* space ID */
- hsize_t  dims[IMAGE8_RANK];  /* dimensions */
+    hid_t   did;               /* dataset ID */
+    hid_t   sid;               /* space ID */
+    hsize_t dims[IMAGE8_RANK]; /* dimensions */
 
- /* initialize the image dimensions */
- dims[0] = height;
- dims[1] = width;
+    /* initialize the image dimensions */
+    dims[0] = height;
+    dims[1] = width;
 
-/*-------------------------------------------------------------------------
- * create and write the dataset
- *-------------------------------------------------------------------------
- */
+    /*-------------------------------------------------------------------------
+     * create and write the dataset
+     *-------------------------------------------------------------------------
+     */
 
- /* create the data space for the dataset. */
- if((sid = H5Screate_simple(IMAGE8_RANK, dims, NULL)) < 0)
-  return -1;
-
- /* create the dataset as H5T_NATIVE_UCHAR */
- if((did = H5Dcreate2(loc_id, dset_name, H5T_NATIVE_UINT8, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-  return -1;
-
- /* write with memory type H5T_NATIVE_INT */
- /* Use long type if Fortran integer is 8 bytes and C long long is also 8 bytes*/
- /* Fail if otherwise */
- if(buf) {
-  if(sizeof(int_f) == sizeof(int)) {
-      if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
-       return -1;
-  } else if(sizeof(int_f) == sizeof(long)) {
-      if(H5Dwrite(did, H5T_NATIVE_LONG, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
-       return -1;
-  } else if(sizeof(int_f) == sizeof(long long)) {
-      if(H5Dwrite(did, H5T_NATIVE_LLONG, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
-       return -1;
-  } else
-       return -1;
- }
-
- /* close */
- if(H5Dclose(did) < 0)
-  return -1;
- if(H5Sclose(sid) < 0)
-  return -1;
+    /* create the data space for the dataset. */
+    if ((sid = H5Screate_simple(IMAGE8_RANK, dims, NULL)) < 0)
+        return -1;
 
-/*-------------------------------------------------------------------------
- * attach the specification attributes
- *-------------------------------------------------------------------------
- */
+    /* create the dataset as H5T_NATIVE_UCHAR */
+    if ((did = H5Dcreate2(loc_id, dset_name, H5T_NATIVE_UINT8, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) <
+        0)
+        return -1;
 
- /* attach the CLASS attribute */
- if(H5LTset_attribute_string(loc_id, dset_name, "CLASS", IMAGE_CLASS) < 0)
-  return -1;
+    /* write with memory type H5T_NATIVE_INT */
+    /* Use long type if Fortran integer is 8 bytes and C long long is also 8 bytes*/
+    /* Fail if otherwise */
+    if (buf) {
+        if (sizeof(int_f) == sizeof(int)) {
+            if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
+                return -1;
+        }
+        else if (sizeof(int_f) == sizeof(long)) {
+            if (H5Dwrite(did, H5T_NATIVE_LONG, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
+                return -1;
+        }
+        else if (sizeof(int_f) == sizeof(long long)) {
+            if (H5Dwrite(did, H5T_NATIVE_LLONG, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
+                return -1;
+        }
+        else
+            return -1;
+    }
 
- /* attach the VERSION attribute */
- if(H5LTset_attribute_string(loc_id, dset_name, "IMAGE_VERSION", IMAGE_VERSION) < 0)
-  return -1;
+    /* close */
+    if (H5Dclose(did) < 0)
+        return -1;
+    if (H5Sclose(sid) < 0)
+        return -1;
 
- /* attach the IMAGE_SUBCLASS attribute */
- if(H5LTset_attribute_string(loc_id, dset_name, "IMAGE_SUBCLASS", "IMAGE_INDEXED") < 0)
-  return -1;
+    /*-------------------------------------------------------------------------
+     * attach the specification attributes
+     *-------------------------------------------------------------------------
+     */
 
- return 0;
-}
+    /* attach the CLASS attribute */
+    if (H5LTset_attribute_string(loc_id, dset_name, "CLASS", IMAGE_CLASS) < 0)
+        return -1;
 
+    /* attach the VERSION attribute */
+    if (H5LTset_attribute_string(loc_id, dset_name, "IMAGE_VERSION", IMAGE_VERSION) < 0)
+        return -1;
+
+    /* attach the IMAGE_SUBCLASS attribute */
+    if (H5LTset_attribute_string(loc_id, dset_name, "IMAGE_SUBCLASS", "IMAGE_INDEXED") < 0)
+        return -1;
 
+    return 0;
+}
 
 /*-------------------------------------------------------------------------
  * Function: H5IMmake_image_24bitf
@@ -129,7 +120,7 @@ herr_t H5IMmake_image_8bitf(hid_t loc_id,
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente Nunes
  *
  * Date: May 10, 2005
  *
@@ -148,96 +139,94 @@ herr_t H5IMmake_image_8bitf(hid_t loc_id,
  *-------------------------------------------------------------------------
  */
 
-herr_t H5IMmake_image_24bitf(hid_t loc_id,
-                              const char *dset_name,
-                              hsize_t width,
-                              hsize_t height,
-                              const char *interlace,
-                              int_f *buf)
+herr_t
+H5IMmake_image_24bitf(hid_t loc_id, const char *dset_name, hsize_t width, hsize_t height,
+                      const char *interlace, int_f *buf)
 {
- hid_t    did;                /* dataset ID */
- hid_t    sid;                /* space ID */
- hsize_t  dims[IMAGE24_RANK]; /* dimensions */
+    hid_t   did;                /* dataset ID */
+    hid_t   sid;                /* space ID */
+    hsize_t dims[IMAGE24_RANK]; /* dimensions */
+
+    /*-------------------------------------------------------------------------
+     * attach the image dimensions according to the interlace mode
+     *-------------------------------------------------------------------------
+     */
+    if (strcmp(interlace, "INTERLACE_PIXEL") == 0) {
+        /* Number of color planes is defined as the third dimension */
+        dims[0] = height;
+        dims[1] = width;
+        dims[2] = IMAGE24_RANK;
+    }
+    else if (strcmp(interlace, "INTERLACE_PLANE") == 0) {
+        /* Number of color planes is defined as the first dimension */
+        dims[0] = IMAGE24_RANK;
+        dims[1] = height;
+        dims[2] = width;
+    }
+    else
+        return -1;
 
-/*-------------------------------------------------------------------------
- * attach the image dimensions according to the interlace mode
- *-------------------------------------------------------------------------
- */
- if(strcmp(interlace, "INTERLACE_PIXEL") == 0) {
-  /* Number of color planes is defined as the third dimension */
-  dims[0] = height;
-  dims[1] = width;
-  dims[2] = IMAGE24_RANK;
- }
- else
- if(strcmp(interlace, "INTERLACE_PLANE") == 0) {
-  /* Number of color planes is defined as the first dimension */
-  dims[0] = IMAGE24_RANK;
-  dims[1] = height;
-  dims[2] = width;
- }
- else
-  return -1;
+    /*-------------------------------------------------------------------------
+     * create and write the dataset
+     *-------------------------------------------------------------------------
+     */
 
-/*-------------------------------------------------------------------------
- * create and write the dataset
- *-------------------------------------------------------------------------
- */
+    /* create the data space for the dataset. */
+    if ((sid = H5Screate_simple(IMAGE24_RANK, dims, NULL)) < 0)
+        return -1;
 
- /* create the data space for the dataset. */
- if((sid = H5Screate_simple(IMAGE24_RANK, dims, NULL)) < 0)
-  return -1;
-
- /* create the dataset as H5T_NATIVE_UCHAR */
- if((did = H5Dcreate2(loc_id, dset_name, H5T_NATIVE_UCHAR, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-  return -1;
-
- /* write with memory type H5T_NATIVE_INT */
- if(buf) {
-  if(sizeof(int_f) == sizeof(int)) {
-      if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
-       return -1;
-  } else if(sizeof(int_f) == sizeof(long)) {
-      if(H5Dwrite(did, H5T_NATIVE_LONG, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
-       return -1;
-  } else if(sizeof(int_f) == sizeof(long long)) {
-      if(H5Dwrite(did, H5T_NATIVE_LLONG, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
-       return -1;
-  } else
-   return -1;
- }
-
- /* close */
- if(H5Dclose(did) < 0)
-  return -1;
- if(H5Sclose(sid) < 0)
-  return -1;
+    /* create the dataset as H5T_NATIVE_UCHAR */
+    if ((did = H5Dcreate2(loc_id, dset_name, H5T_NATIVE_UCHAR, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) <
+        0)
+        return -1;
 
-/*-------------------------------------------------------------------------
- * attach the specification attributes
- *-------------------------------------------------------------------------
- */
+    /* write with memory type H5T_NATIVE_INT */
+    if (buf) {
+        if (sizeof(int_f) == sizeof(int)) {
+            if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
+                return -1;
+        }
+        else if (sizeof(int_f) == sizeof(long)) {
+            if (H5Dwrite(did, H5T_NATIVE_LONG, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
+                return -1;
+        }
+        else if (sizeof(int_f) == sizeof(long long)) {
+            if (H5Dwrite(did, H5T_NATIVE_LLONG, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
+                return -1;
+        }
+        else
+            return -1;
+    }
 
- /* Attach the CLASS attribute */
- if(H5LTset_attribute_string(loc_id, dset_name, "CLASS", IMAGE_CLASS) < 0)
-  return -1;
+    /* close */
+    if (H5Dclose(did) < 0)
+        return -1;
+    if (H5Sclose(sid) < 0)
+        return -1;
 
- /* Attach the VERSION attribute */
- if(H5LTset_attribute_string(loc_id, dset_name, "IMAGE_VERSION", IMAGE_VERSION) < 0)
-  return -1;
+    /*-------------------------------------------------------------------------
+     * attach the specification attributes
+     *-------------------------------------------------------------------------
+     */
 
- /* Attach the IMAGE_SUBCLASS attribute */
- if(H5LTset_attribute_string(loc_id, dset_name, "IMAGE_SUBCLASS", "IMAGE_TRUECOLOR") < 0)
-  return -1;
+    /* Attach the CLASS attribute */
+    if (H5LTset_attribute_string(loc_id, dset_name, "CLASS", IMAGE_CLASS) < 0)
+        return -1;
 
- /* Attach the INTERLACE_MODE attribute. This attributes is only for true color images */
- if(H5LTset_attribute_string(loc_id, dset_name, "INTERLACE_MODE", interlace) < 0)
-  return -1;
+    /* Attach the VERSION attribute */
+    if (H5LTset_attribute_string(loc_id, dset_name, "IMAGE_VERSION", IMAGE_VERSION) < 0)
+        return -1;
 
- return 0;
+    /* Attach the IMAGE_SUBCLASS attribute */
+    if (H5LTset_attribute_string(loc_id, dset_name, "IMAGE_SUBCLASS", "IMAGE_TRUECOLOR") < 0)
+        return -1;
 
-}
+    /* Attach the INTERLACE_MODE attribute. This attributes is only for true color images */
+    if (H5LTset_attribute_string(loc_id, dset_name, "INTERLACE_MODE", interlace) < 0)
+        return -1;
 
+    return 0;
+}
 
 /*-------------------------------------------------------------------------
  * Function: H5IMread_imagef
@@ -246,7 +235,7 @@ herr_t H5IMmake_image_24bitf(hid_t loc_id,
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente Nunes
  *
  * Date: May 10, 2005
  *
@@ -260,33 +249,32 @@ herr_t H5IMmake_image_24bitf(hid_t loc_id,
  *-------------------------------------------------------------------------
  */
 
-herr_t H5IMread_imagef(hid_t loc_id,
-                        const char *dset_name,
-                        int_f *buf)
+herr_t
+H5IMread_imagef(hid_t loc_id, const char *dset_name, int_f *buf)
 {
-    hid_t   did;
-    hid_t   tid;
+    hid_t did;
+    hid_t tid;
 
     /* open the dataset */
-    if((did = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
         return -1;
 
     /* determine appropriate datatype to use */
-    if(sizeof(int_f) == sizeof(int))
+    if (sizeof(int_f) == sizeof(int))
         tid = H5T_NATIVE_INT;
-    else if(sizeof(int_f) == sizeof(long))
+    else if (sizeof(int_f) == sizeof(long))
         tid = H5T_NATIVE_LONG;
-    else if(sizeof(int_f) == sizeof(long long))
+    else if (sizeof(int_f) == sizeof(long long))
         tid = H5T_NATIVE_LLONG;
     else
         goto out;
 
     /* read to memory */
-    if(H5Dread(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
+    if (H5Dread(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
         goto out;
 
     /* close */
-    if(H5Dclose(did))
+    if (H5Dclose(did))
         return -1;
 
     return 0;
@@ -296,7 +284,6 @@ out:
     return -1;
 }
 
-
 /*-------------------------------------------------------------------------
  * Function: H5IMmake_palettef
  *
@@ -304,7 +291,7 @@ out:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente Nunes
  *
  * Date: May 10, 2005
  *
@@ -314,82 +301,81 @@ out:
  *  the FORTRAN interface where the image buffer is defined as type "integer"
  *
  *  based on HDF5 Image and Palette Specification
- *  http://hdf.ncsa.uiuc.edu/HDF5/H5Image/ImageSpec.html
  *
  * Modifications:
  *
  *-------------------------------------------------------------------------
  */
 
-herr_t H5IMmake_palettef(hid_t loc_id,
-                          const char *pal_name,
-                          const hsize_t *pal_dims,
-                          int_f *pal_data)
+herr_t
+H5IMmake_palettef(hid_t loc_id, const char *pal_name, const hsize_t *pal_dims, int_f *pal_data)
 
 {
 
- hid_t did;                /* dataset ID */
- hid_t sid;                /* space ID */
- int   has_pal;
+    hid_t did; /* dataset ID */
+    hid_t sid; /* space ID */
+    int   has_pal;
 
- /* Check if the dataset already exists */
- has_pal = H5LTfind_dataset(loc_id, pal_name);
+    /* Check if the dataset already exists */
+    has_pal = H5LTfind_dataset(loc_id, pal_name);
 
- /* It exists. Return */
- if(has_pal == 1)
-  return 0;
+    /* It exists. Return */
+    if (has_pal == 1)
+        return 0;
 
-/*-------------------------------------------------------------------------
- * create and write the dataset
- *-------------------------------------------------------------------------
- */
+    /*-------------------------------------------------------------------------
+     * create and write the dataset
+     *-------------------------------------------------------------------------
+     */
 
- /* create the data space for the dataset. */
- if((sid = H5Screate_simple(2, pal_dims, NULL)) < 0)
-  return -1;
-
- /* create the dataset as H5T_NATIVE_UCHAR */
- if((did = H5Dcreate2(loc_id, pal_name, H5T_NATIVE_UCHAR, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-  return -1;
-
- /* write with memory type H5T_NATIVE_INT */
- if(pal_data) {
-  if(sizeof(int_f) == sizeof(int)) {
-      if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, pal_data) < 0)
-       return -1;
-  } else if(sizeof(int_f) == sizeof(long)) {
-      if(H5Dwrite(did, H5T_NATIVE_LONG, H5S_ALL, H5S_ALL, H5P_DEFAULT, pal_data) < 0)
-       return -1;
-  } else if(sizeof(int_f) == sizeof(long long)) {
-      if(H5Dwrite(did, H5T_NATIVE_LLONG, H5S_ALL, H5S_ALL, H5P_DEFAULT, pal_data) < 0)
-       return -1;
-  } else
-      return -1;
- }
-
- /* close */
- if(H5Dclose(did) < 0)
-  return -1;
- if(H5Sclose(sid) < 0)
-  return -1;
+    /* create the data space for the dataset. */
+    if ((sid = H5Screate_simple(2, pal_dims, NULL)) < 0)
+        return -1;
 
-/*-------------------------------------------------------------------------
- * attach the specification attributes
- *-------------------------------------------------------------------------
- */
+    /* create the dataset as H5T_NATIVE_UCHAR */
+    if ((did = H5Dcreate2(loc_id, pal_name, H5T_NATIVE_UCHAR, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) <
+        0)
+        return -1;
 
- /* Attach the attribute "CLASS" to the >>palette<< dataset*/
- if(H5LTset_attribute_string(loc_id, pal_name, "CLASS", PALETTE_CLASS) < 0)
-  return -1;
+    /* write with memory type H5T_NATIVE_INT */
+    if (pal_data) {
+        if (sizeof(int_f) == sizeof(int)) {
+            if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, pal_data) < 0)
+                return -1;
+        }
+        else if (sizeof(int_f) == sizeof(long)) {
+            if (H5Dwrite(did, H5T_NATIVE_LONG, H5S_ALL, H5S_ALL, H5P_DEFAULT, pal_data) < 0)
+                return -1;
+        }
+        else if (sizeof(int_f) == sizeof(long long)) {
+            if (H5Dwrite(did, H5T_NATIVE_LLONG, H5S_ALL, H5S_ALL, H5P_DEFAULT, pal_data) < 0)
+                return -1;
+        }
+        else
+            return -1;
+    }
 
- /* Attach the attribute "PAL_VERSION" to the >>palette<< dataset*/
- if(H5LTset_attribute_string(loc_id, pal_name, "PAL_VERSION", "1.2") < 0)
-  return -1;
+    /* close */
+    if (H5Dclose(did) < 0)
+        return -1;
+    if (H5Sclose(sid) < 0)
+        return -1;
 
- return 0;
+    /*-------------------------------------------------------------------------
+     * attach the specification attributes
+     *-------------------------------------------------------------------------
+     */
 
-}
+    /* Attach the attribute "CLASS" to the >>palette<< dataset*/
+    if (H5LTset_attribute_string(loc_id, pal_name, "CLASS", PALETTE_CLASS) < 0)
+        return -1;
 
+    /* Attach the attribute "PAL_VERSION" to the >>palette<< dataset*/
+    if (H5LTset_attribute_string(loc_id, pal_name, "PAL_VERSION", "1.2") < 0)
+        return -1;
+
+    return 0;
+}
 
 /*-------------------------------------------------------------------------
  * Function: H5IMget_palettef
@@ -398,7 +384,7 @@ herr_t H5IMmake_palettef(hid_t loc_id,
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente Nunes
  *
  * Date: May 10, 2005
  *
@@ -408,27 +394,23 @@ herr_t H5IMmake_palettef(hid_t loc_id,
  *  the FORTRAN interface where the image buffer is defined as type "integer"
  *
  *  based on HDF5 Image and Palette Specification
- *  http://hdf.ncsa.uiuc.edu/HDF5/H5Image/ImageSpec.html
  *
  * Modifications:
  *
  *-------------------------------------------------------------------------
  */
 
-herr_t H5IMget_palettef(hid_t loc_id,
-                         const char *image_name,
-                         int pal_number,
-                         int_f *pal_data)
+herr_t
+H5IMget_palettef(hid_t loc_id, const char *image_name, int pal_number, int_f *pal_data)
 {
- if(sizeof(int_f) == sizeof(int))
-  return H5IM_get_palette(loc_id,image_name,pal_number,H5T_NATIVE_INT,pal_data);
- else if(sizeof(int_f) == sizeof(long))
-  return H5IM_get_palette(loc_id,image_name,pal_number,H5T_NATIVE_LONG,pal_data);
- else if(sizeof(int_f) == sizeof(long long))
-  return H5IM_get_palette(loc_id,image_name,pal_number,H5T_NATIVE_LLONG,pal_data);
- else
-  return -1;
-
+    if (sizeof(int_f) == sizeof(int))
+        return H5IM_get_palette(loc_id, image_name, pal_number, H5T_NATIVE_INT, pal_data);
+    else if (sizeof(int_f) == sizeof(long))
+        return H5IM_get_palette(loc_id, image_name, pal_number, H5T_NATIVE_LONG, pal_data);
+    else if (sizeof(int_f) == sizeof(long long))
+        return H5IM_get_palette(loc_id, image_name, pal_number, H5T_NATIVE_LLONG, pal_data);
+    else
+        return -1;
 }
 
 /*-------------------------------------------------------------------------
@@ -438,7 +420,7 @@ herr_t H5IMget_palettef(hid_t loc_id,
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente Nunes
  *
  * Date: May 10, 2005
  *
@@ -451,102 +433,93 @@ herr_t H5IMget_palettef(hid_t loc_id,
  *
  * Comments:
  *  based on HDF5 Image and Palette Specification
- *  http://hdf.ncsa.uiuc.edu/HDF5/H5Image/ImageSpec.html
  *
  * Modifications:
  *
  *-------------------------------------------------------------------------
  */
-herr_t H5IM_get_palette(hid_t loc_id,
-                         const char *image_name,
-                         int pal_number,
-                         hid_t tid,
-                         void *pal_data)
+herr_t
+H5IM_get_palette(hid_t loc_id, const char *image_name, int pal_number, hid_t tid, void *pal_data)
 {
- hid_t      image_id;
- int        has_pal;
- hid_t      attr_type;
- hid_t      attr_id;
- hid_t      attr_space_id;
- hid_t      attr_class;
- hssize_t   n_refs;
- size_t    dim_ref;
- hobj_ref_t *refbuf;     /* buffer to read references */
- hid_t      pal_id;
-
- /* Open the dataset. */
- if((image_id = H5Dopen2(loc_id, image_name, H5P_DEFAULT)) < 0)
-  return -1;
-
- /* Try to find the attribute "PALETTE" on the >>image<< dataset */
- has_pal = H5IM_find_palette(image_id);
+    hid_t       image_id;
+    int         has_pal;
+    hid_t       attr_type;
+    hid_t       attr_id;
+    hid_t       attr_space_id;
+    hid_t       attr_class;
+    hssize_t    n_refs;
+    size_t      dim_ref;
+    hobj_ref_t *refbuf; /* buffer to read references */
+    hid_t       pal_id;
+
+    /* Open the dataset. */
+    if ((image_id = H5Dopen2(loc_id, image_name, H5P_DEFAULT)) < 0)
+        return -1;
 
- if(has_pal ==  1)
- {
+    /* Try to find the attribute "PALETTE" on the >>image<< dataset */
+    has_pal = H5IM_find_palette(image_id);
 
-  if((attr_id = H5Aopen(image_id, "PALETTE", H5P_DEFAULT)) < 0)
-   goto out;
+    if (has_pal == 1) {
 
-  if((attr_type = H5Aget_type(attr_id)) < 0)
-   goto out;
+        if ((attr_id = H5Aopen(image_id, "PALETTE", H5P_DEFAULT)) < 0)
+            goto out;
 
-  if((attr_class = H5Tget_class(attr_type)) < 0)
-   goto out;
+        if ((attr_type = H5Aget_type(attr_id)) < 0)
+            goto out;
 
-  /* Check if it is really a reference */
-  if(attr_class == H5T_REFERENCE)
-  {
+        if ((attr_class = H5Tget_class(attr_type)) < 0)
+            goto out;
 
-   /* Get the reference(s) */
-   if((attr_space_id = H5Aget_space(attr_id)) < 0)
-    goto out;
+        /* Check if it is really a reference */
+        if (attr_class == H5T_REFERENCE) {
 
-   n_refs = H5Sget_simple_extent_npoints(attr_space_id);
+            /* Get the reference(s) */
+            if ((attr_space_id = H5Aget_space(attr_id)) < 0)
+                goto out;
 
-   dim_ref = (size_t)n_refs;
+            n_refs = H5Sget_simple_extent_npoints(attr_space_id);
 
-   refbuf = (hobj_ref_t *)HDmalloc(sizeof(hobj_ref_t) * dim_ref);
+            dim_ref = (size_t)n_refs;
 
-   if(H5Aread(attr_id, attr_type, refbuf) < 0)
-    goto out;
+            refbuf = (hobj_ref_t *)HDmalloc(sizeof(hobj_ref_t) * dim_ref);
 
-   /* Get the palette id */
-   if((pal_id = H5Rdereference2(image_id, H5P_DEFAULT, H5R_OBJECT, &refbuf[pal_number])) < 0)
-    goto out;
+            if (H5Aread(attr_id, attr_type, refbuf) < 0)
+                goto out;
 
-   /* Read the palette dataset using the memory type TID */
-   if(H5Dread(pal_id, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, pal_data) < 0)
-    goto out;
+            /* Get the palette id */
+            if ((pal_id = H5Rdereference2(image_id, H5P_DEFAULT, H5R_OBJECT, &refbuf[pal_number])) < 0)
+                goto out;
 
-   if(H5Sclose(attr_space_id) < 0)
-    goto out;
+            /* Read the palette dataset using the memory type TID */
+            if (H5Dread(pal_id, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, pal_data) < 0)
+                goto out;
 
-   /* close the dereferenced dataset */
-   if(H5Dclose(pal_id) < 0)
-    goto out;
+            if (H5Sclose(attr_space_id) < 0)
+                goto out;
 
-   HDfree(refbuf);
+            /* close the dereferenced dataset */
+            if (H5Dclose(pal_id) < 0)
+                goto out;
 
-  } /* H5T_REFERENCE */
+            HDfree(refbuf);
 
-  if(H5Tclose(attr_type) < 0)
-   goto out;
+        } /* H5T_REFERENCE */
 
-  /* Close the attribute. */
-  if(H5Aclose(attr_id) < 0)
-   goto out;
+        if (H5Tclose(attr_type) < 0)
+            goto out;
 
- }
+        /* Close the attribute. */
+        if (H5Aclose(attr_id) < 0)
+            goto out;
+    }
 
- /* Close the image dataset. */
- if(H5Dclose(image_id) < 0)
-  return -1;
+    /* Close the image dataset. */
+    if (H5Dclose(image_id) < 0)
+        return -1;
 
- return 0;
+    return 0;
 
 out:
- H5Dclose(image_id);
- return -1;
-
-
+    H5Dclose(image_id);
+    return -1;
 }
diff --git a/hl/fortran/src/H5IMcc.h b/hl/fortran/src/H5IMcc.h
index 0b8a345..0b04e1f 100644
--- a/hl/fortran/src/H5IMcc.h
+++ b/hl/fortran/src/H5IMcc.h
@@ -1,20 +1,17 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef _H5IMCC_H
-#define _H5IMCC_H
+#ifndef H5IMCC_H
+#define H5IMCC_H
 
 #include "H5LTprivate.h"
 #include "H5IMprivate.h"
@@ -24,34 +21,16 @@
 extern "C" {
 #endif
 
+herr_t H5IMmake_image_8bitf(hid_t loc_id, const char *dset_name, hsize_t width, hsize_t height, int_f *buf);
 
-herr_t H5IMmake_image_8bitf( hid_t loc_id,
-                             const char *dset_name,
-                             hsize_t width,
-                             hsize_t height,
-                             int_f *buf );
+herr_t H5IMmake_image_24bitf(hid_t loc_id, const char *dset_name, hsize_t width, hsize_t height,
+                             const char *interlace, int_f *buf);
 
-herr_t H5IMmake_image_24bitf( hid_t loc_id,
-                              const char *dset_name,
-                              hsize_t width,
-                              hsize_t height,
-                              const char *interlace,
-                              int_f *buf);
+herr_t H5IMread_imagef(hid_t loc_id, const char *dset_name, int_f *buf);
 
-herr_t H5IMread_imagef( hid_t loc_id,
-                        const char *dset_name,
-                        int_f *buf );
-
-herr_t H5IMmake_palettef( hid_t loc_id,
-                          const char *pal_name,
-                          const hsize_t *pal_dims,
-                          int_f *pal_data );
-
-herr_t H5IMget_palettef( hid_t loc_id,
-                         const char *image_name,
-                         int pal_number,
-                         int_f *pal_data );
+herr_t H5IMmake_palettef(hid_t loc_id, const char *pal_name, const hsize_t *pal_dims, int_f *pal_data);
 
+herr_t H5IMget_palettef(hid_t loc_id, const char *image_name, int pal_number, int_f *pal_data);
 
 #ifdef __cplusplus
 }
diff --git a/hl/fortran/src/H5IMfc.c b/hl/fortran/src/H5IMfc.c
index 6acd410..30b70dc 100644
--- a/hl/fortran/src/H5IMfc.c
+++ b/hl/fortran/src/H5IMfc.c
@@ -1,17 +1,14 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Board of Trustees of the University of Illinois.         *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of HDF5.  The full HDF5 copyright notice, including     *
-* terms governing use, modification, and redistribution, is contained in    *
-* the files COPYING and Copyright.html.  COPYING can be found at the root   *
-* of the source code distribution tree; Copyright.html can be found at the  *
-* root level of an installed copy of the electronic HDF5 document set and   *
-* is linked from the top-level documents page.  It can also be found at     *
-* http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-* access to either file, you may request a copy from help@hdfgroup.org.     *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /* This files contains C stubs for H5D Fortran APIs */
 
@@ -20,51 +17,47 @@
 #include "H5Eprivate.h"
 
 /*-------------------------------------------------------------------------
-* Function: h5immake_image_8bit_c
-*
-* Purpose: Call H5IMmake_image_8bit
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 05, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5immake_image_8bit_c
+ *
+ * Purpose: Call H5IMmake_image_8bit
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * Date: October 05, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
 
 int_f
-nh5immake_image_8bit_c (hid_t_f *loc_id,
-                        size_t_f *namelen,
-                        _fcd name,
-                        hsize_t_f *width,
-                        hsize_t_f *height,
-                        int_f *buf)
+h5immake_image_8bit_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *width, hsize_t_f *height,
+                      int_f *buf)
 {
     int     ret_value = -1;
     herr_t  ret;
     hid_t   c_loc_id;
-    char    *c_name = NULL;
-    hsize_t w = (hsize_t)*width;
-    hsize_t h = (hsize_t)*height;
+    char   *c_name = NULL;
+    hsize_t w      = (hsize_t)*width;
+    hsize_t h      = (hsize_t)*height;
 
     /*
-    * convert FORTRAN name to C name
-    */
+     * convert FORTRAN name to C name
+     */
     c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
 
     /*
-    * call H5IMmake_image_8bitf function.
-    */
+     * call H5IMmake_image_8bitf function.
+     */
     c_loc_id = (hid_t)*loc_id;
-    ret = H5IMmake_image_8bitf(c_loc_id,c_name,w,h,buf);
+    ret      = H5IMmake_image_8bitf(c_loc_id, c_name, w, h, buf);
 
     if (ret < 0)
         goto done;
@@ -72,54 +65,49 @@ nh5immake_image_8bit_c (hid_t_f *loc_id,
     ret_value = 0;
 
 done:
-    if(c_name!=NULL)
+    if (c_name != NULL)
         HDfree(c_name);
 
     return ret_value;
-
-
 }
 
 /*-------------------------------------------------------------------------
-* Function: h5imread_image_c
-*
-* Purpose: Call H5IMread_image
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 05, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5imread_image_c
+ *
+ * Purpose: Call H5IMread_image
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * Date: October 05, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
 
 int_f
-nh5imread_image_c (hid_t_f *loc_id,
-                   size_t_f *namelen,
-                   _fcd name,
-                   int_f *buf)
+h5imread_image_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *buf)
 {
-    int     ret_value = -1;
-    herr_t  ret;
-    char    *c_name = NULL;
+    int    ret_value = -1;
+    herr_t ret;
+    char  *c_name = NULL;
 
     /*
-    * convert FORTRAN name to C name
-    */
+     * convert FORTRAN name to C name
+     */
     c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
 
     /*
-    * call H5IMread_image function.
-    */
-    ret = H5IMread_imagef((hid_t)*loc_id,c_name,buf);
+     * call H5IMread_image function.
+     */
+    ret = H5IMread_imagef((hid_t)*loc_id, c_name, buf);
 
     if (ret < 0)
         goto done;
@@ -127,52 +115,46 @@ nh5imread_image_c (hid_t_f *loc_id,
     ret_value = 0;
 
 done:
-    if(c_name!=NULL)
+    if (c_name != NULL)
         HDfree(c_name);
 
     return ret_value;
 }
 
 /*-------------------------------------------------------------------------
-* Function: h5immake_image_24bit_c
-*
-* Purpose: Call H5IMmake_image_24bit
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 05, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5immake_image_24bit_c
+ *
+ * Purpose: Call H5IMmake_image_24bit
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * Date: October 05, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
 
 int_f
-nh5immake_image_24bit_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         size_t_f *ilen,
-                         _fcd il,
-                         hsize_t_f *width,
-                         hsize_t_f *height,
-                         void *buf)
+h5immake_image_24bit_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *ilen, _fcd il,
+                       hsize_t_f *width, hsize_t_f *height, void *buf)
 {
     int     ret_value = -1;
     herr_t  ret;
     hid_t   c_loc_id;
-    char    *c_name = NULL;
-    char    *c_il = NULL;
-    hsize_t w = (hsize_t)*width;
-    hsize_t h = (hsize_t)*height;
+    char   *c_name = NULL;
+    char   *c_il   = NULL;
+    hsize_t w      = (hsize_t)*width;
+    hsize_t h      = (hsize_t)*height;
 
     /*
-    * convert FORTRAN name to C name
-    */
+     * convert FORTRAN name to C name
+     */
     c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
@@ -182,11 +164,11 @@ nh5immake_image_24bit_c (hid_t_f *loc_id,
         goto done;
 
     /*
-    * call H5IMmake_image_24bitf function.
-    */
+     * call H5IMmake_image_24bitf function.
+     */
     c_loc_id = (hid_t)*loc_id;
 
-    ret = H5IMmake_image_24bitf(c_loc_id,c_name,w,h,c_il,(int_f *)buf);
+    ret = H5IMmake_image_24bitf(c_loc_id, c_name, w, h, c_il, (int_f *)buf);
 
     if (ret < 0)
         goto done;
@@ -194,238 +176,218 @@ nh5immake_image_24bit_c (hid_t_f *loc_id,
     ret_value = 0;
 
 done:
-    if(c_name!=NULL)
+    if (c_name != NULL)
         HDfree(c_name);
-    if(c_il!=NULL)
+    if (c_il != NULL)
         HDfree(c_il);
 
     return ret_value;
 }
 
 /*-------------------------------------------------------------------------
-* Function: h5imget_image_info_c
-*
-* Purpose: Call H5IMget_image_info
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 05, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5imget_image_info_c
+ *
+ * Purpose: Call H5IMget_image_info
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * Date: October 05, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
 
 int_f
-nh5imget_image_info_c(hid_t_f *loc_id,
-                      size_t_f *namelen,
-                      _fcd name,
-                      hsize_t_f *width,
-                      hsize_t_f *height,
-                      hsize_t_f *planes,
-                      hsize_t_f *npals,
-                      size_t_f *ilen,
-                      _fcd interlace)
+h5imget_image_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *width, hsize_t_f *height,
+                     hsize_t_f *planes, hsize_t_f *npals, size_t_f *ilen, _fcd interlace)
 {
-    int          ret_value = -1;
-    herr_t       ret;
-    hid_t        c_loc_id;
-    char         *c_name = NULL;
-    hsize_t      c_width;
-    hsize_t      c_height;
-    hsize_t      c_planes;
-    hssize_t     c_npals;
-    char         *c_buf=NULL;           /* buffer to hold C string */
+    int      ret_value = -1;
+    herr_t   ret;
+    hid_t    c_loc_id;
+    char    *c_name = NULL;
+    hsize_t  c_width;
+    hsize_t  c_height;
+    hsize_t  c_planes;
+    hssize_t c_npals;
+    char    *c_buf = NULL; /* buffer to hold C string */
 
     /*
-    * convert FORTRAN name to C name
-    */
+     * convert FORTRAN name to C name
+     */
     c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
 
     /*
-    * allocate buffer to hold name of an attribute
-    */
-    if ((c_buf = (char *)HDmalloc((size_t)*ilen +1)) == NULL)
+     * allocate buffer to hold name of an attribute
+     */
+    if ((c_buf = (char *)HDmalloc((size_t)*ilen + 1)) == NULL)
         goto done;
 
     /*
-    * call H5IMget_image_info function.
-    */
+     * call H5IMget_image_info function.
+     */
     c_loc_id = (hid_t)*loc_id;
 
-    ret = H5IMget_image_info(c_loc_id,c_name,&c_width,&c_height,&c_planes,c_buf,&c_npals);
+    ret = H5IMget_image_info(c_loc_id, c_name, &c_width, &c_height, &c_planes, c_buf, &c_npals);
 
     if (ret < 0)
         goto done;
 
-    *width  = (hsize_t_f) c_width;
-    *height = (hsize_t_f) c_height;
-    *planes = (hsize_t_f) c_planes;
-    *npals  = (hsize_t_f) c_npals;
+    *width  = (hsize_t_f)c_width;
+    *height = (hsize_t_f)c_height;
+    *planes = (hsize_t_f)c_planes;
+    *npals  = (hsize_t_f)c_npals;
 
     /*
-    * convert C name to FORTRAN and place it in the given buffer
-    */
+     * convert C name to FORTRAN and place it in the given buffer
+     */
     HD5packFstring(c_buf, _fcdtocp(interlace), (size_t)*ilen);
 
     ret_value = 0;
 
 done:
-    if(c_name!=NULL)
+    if (c_name != NULL)
         HDfree(c_name);
-    if(c_buf!=NULL)
+    if (c_buf != NULL)
         HDfree(c_buf);
 
     return ret_value;
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: h5imis_image_c
-*
-* Purpose: Call H5IMis_image
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 06, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5imis_image_c
+ *
+ * Purpose: Call H5IMis_image
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * Date: October 06, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
 
 int_f
-nh5imis_image_c(hid_t_f *loc_id,
-                size_t_f *namelen,
-                _fcd name)
+h5imis_image_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name)
 {
-    hid_t   c_loc_id;
-    char    *c_name = NULL;
-    herr_t  ret;
+    hid_t  c_loc_id;
+    char  *c_name = NULL;
+    herr_t ret;
 
     /*
-    * convert FORTRAN name to C name
-    */
+     * convert FORTRAN name to C name
+     */
     c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
-    if (c_name == NULL) return -1;
+    if (c_name == NULL)
+        return -1;
 
     /*
-    * call H5LTget_dataset_ndims function.
-    */
+     * call H5LTget_dataset_ndims function.
+     */
     c_loc_id = (hid_t)*loc_id;
 
     ret = H5IMis_image(c_loc_id, c_name);
 
-    if(c_name!=NULL)
+    if (c_name != NULL)
         HDfree(c_name);
 
     return ret;
-
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: h5immake_palette_c
-*
-* Purpose: Call H5IMmake_palette
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 06, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5immake_palette_c
+ *
+ * Purpose: Call H5IMmake_palette
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * Date: October 06, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
 
 int_f
-nh5immake_palette_c (hid_t_f *loc_id,
-                     size_t_f *namelen,
-                     _fcd name,
-                     hsize_t_f *dims,
-                     void *buf)
+h5immake_palette_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *dims, void *buf)
 {
-    char    *c_name = NULL;
+    char   *c_name = NULL;
     hsize_t c_dims[H5S_MAX_RANK];
     int     i;
-    int     rank=2;
+    int     rank      = 2;
     int_f   ret_value = 0;
 
     /*
-    * convert FORTRAN name to C name
-    */
-    if(NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
+     * convert FORTRAN name to C name
+     */
+    if (NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
         HGOTO_DONE(FAIL)
 
-    for(i = 0; i < rank ; i++)
-      c_dims[i] =  (hsize_t)dims[i];
+    for (i = 0; i < rank; i++)
+        c_dims[i] = (hsize_t)dims[i];
 
     /*
-    * call H5IMmake_palette function.
-    */
-    if(H5IMmake_palettef((hid_t)*loc_id, c_name, c_dims, (int_f *)buf) < 0)
+     * call H5IMmake_palette function.
+     */
+    if (H5IMmake_palettef((hid_t)*loc_id, c_name, c_dims, (int_f *)buf) < 0)
         HGOTO_DONE(FAIL)
 
 done:
-    if(c_name)
+    if (c_name)
         HDfree(c_name);
 
     return ret_value;
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: h5imlink_palette_c
-*
-* Purpose: Call H5IMlink_palette
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 06, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5imlink_palette_c
+ *
+ * Purpose: Call H5IMlink_palette
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * Date: October 06, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
 
 int_f
-nh5imlink_palette_c (hid_t_f *loc_id,
-                     size_t_f *namelen,
-                     _fcd name,
-                     size_t_f *ilen,
-                     _fcd pal_name)
+h5imlink_palette_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *ilen, _fcd pal_name)
 {
-    int     ret_value = -1;
-    herr_t  ret;
-    hid_t   c_loc_id;
-    char    *c_name = NULL;
-    char    *c_namepal = NULL;
+    int    ret_value = -1;
+    herr_t ret;
+    hid_t  c_loc_id;
+    char  *c_name    = NULL;
+    char  *c_namepal = NULL;
 
     /*
-    * convert FORTRAN name to C name
-    */
+     * convert FORTRAN name to C name
+     */
     c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
@@ -435,11 +397,11 @@ nh5imlink_palette_c (hid_t_f *loc_id,
         goto done;
 
     /*
-    * call H5IMlink_palette function.
-    */
+     * call H5IMlink_palette function.
+     */
     c_loc_id = (hid_t)*loc_id;
 
-    ret = H5IMlink_palette(c_loc_id,c_name,c_namepal);
+    ret = H5IMlink_palette(c_loc_id, c_name, c_namepal);
 
     if (ret < 0)
         goto done;
@@ -447,50 +409,45 @@ nh5imlink_palette_c (hid_t_f *loc_id,
     ret_value = 0;
 
 done:
-    if(c_name!=NULL)
+    if (c_name != NULL)
         HDfree(c_name);
-    if(c_namepal!=NULL)
+    if (c_namepal != NULL)
         HDfree(c_namepal);
 
     return ret_value;
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: h5imunlink_palette_c
-*
-* Purpose: Call H5IMunlink_palette
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 06, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5imunlink_palette_c
+ *
+ * Purpose: Call H5IMunlink_palette
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * Date: October 06, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
 
 int_f
-nh5imunlink_palette_c (hid_t_f *loc_id,
-                       size_t_f *namelen,
-                       _fcd name,
-                       size_t_f *ilen,
-                       _fcd pal_name)
+h5imunlink_palette_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *ilen, _fcd pal_name)
 {
-    int     ret_value = -1;
-    herr_t  ret;
-    hid_t   c_loc_id;
-    char    *c_name = NULL;
-    char    *c_namepal = NULL;
+    int    ret_value = -1;
+    herr_t ret;
+    hid_t  c_loc_id;
+    char  *c_name    = NULL;
+    char  *c_namepal = NULL;
 
     /*
-    * convert FORTRAN name to C name
-    */
+     * convert FORTRAN name to C name
+     */
     c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
@@ -500,11 +457,11 @@ nh5imunlink_palette_c (hid_t_f *loc_id,
         goto done;
 
     /*
-    * call H5IMunlink_palette function.
-    */
+     * call H5IMunlink_palette function.
+     */
     c_loc_id = (hid_t)*loc_id;
 
-    ret = H5IMunlink_palette(c_loc_id,c_name,c_namepal);
+    ret = H5IMunlink_palette(c_loc_id, c_name, c_namepal);
 
     if (ret < 0)
         goto done;
@@ -512,62 +469,57 @@ nh5imunlink_palette_c (hid_t_f *loc_id,
     ret_value = 0;
 
 done:
-    if(c_name!=NULL)
+    if (c_name != NULL)
         HDfree(c_name);
-    if(c_namepal!=NULL)
+    if (c_namepal != NULL)
         HDfree(c_namepal);
 
     return ret_value;
 }
 
-
-
 /*-------------------------------------------------------------------------
-* Function: h5imget_npalettes_c
-*
-* Purpose: Call H5IMget_npalettes
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 06 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5imget_npalettes_c
+ *
+ * Purpose: Call H5IMget_npalettes
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * Date: October 06 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
 
 int_f
-nh5imget_npalettes_c(hid_t_f *loc_id,
-                     size_t_f *namelen,
-                     _fcd name,
-                     hsize_t_f *npals)
+h5imget_npalettes_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *npals)
 {
-    int          ret_value = -1;
-    herr_t       ret;
-    hid_t        c_loc_id;
-    char         *c_name = NULL;
-    hssize_t     c_npals;
+    int      ret_value = -1;
+    herr_t   ret;
+    hid_t    c_loc_id;
+    char    *c_name = NULL;
+    hssize_t c_npals;
 
     /*
-    * convert FORTRAN name to C name
-    */
+     * convert FORTRAN name to C name
+     */
     c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
 
     /*
-    * call H5IMget_image_info function.
-    */
+     * call H5IMget_image_info function.
+     */
     c_loc_id = (hid_t)*loc_id;
 
-    ret = H5IMget_npalettes(c_loc_id,c_name,&c_npals);
+    ret = H5IMget_npalettes(c_loc_id, c_name, &c_npals);
 
-    *npals  = (hsize_t_f) c_npals;
+    *npals = (hsize_t_f)c_npals;
 
     if (ret < 0)
         goto done;
@@ -575,184 +527,166 @@ nh5imget_npalettes_c(hid_t_f *loc_id,
     ret_value = 0;
 
 done:
-    if(c_name!=NULL)
+    if (c_name != NULL)
         HDfree(c_name);
 
     return ret_value;
 }
 
-
-
 /*-------------------------------------------------------------------------
-* Function: h5imget_palette_info_c
-*
-* Purpose: Call H5IMget_palette_info
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 06 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
-
+ * Function: h5imget_palette_info_c
+ *
+ * Purpose: Call H5IMget_palette_info
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * Date: October 06 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
 
 int_f
-nh5imget_palette_info_c(hid_t_f *loc_id,
-                        size_t_f *namelen,
-                        _fcd name,
-                        int_f *pal_number,
-                        hsize_t_f *dims)
+h5imget_palette_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *pal_number, hsize_t_f *dims)
 {
-    int          ret_value = -1;
-    herr_t       ret;
-    hid_t        c_loc_id;
-    char         *c_name = NULL;
-    hsize_t      c_dims[2];
-    int          i;
+    int     ret_value = -1;
+    herr_t  ret;
+    hid_t   c_loc_id;
+    char   *c_name = NULL;
+    hsize_t c_dims[2];
+    int     i;
 
     /*
-    * convert FORTRAN name to C name
-    */
+     * convert FORTRAN name to C name
+     */
     c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
 
     /*
-    * call H5IMget_image_info function.
-    */
+     * call H5IMget_image_info function.
+     */
     c_loc_id = (hid_t)*loc_id;
 
-    ret = H5IMget_palette_info(c_loc_id,c_name,*pal_number,c_dims);
+    ret = H5IMget_palette_info(c_loc_id, c_name, *pal_number, c_dims);
 
     if (ret < 0)
         goto done;
 
-    for (i = 0; i < 2 ; i++)
-    {
-        dims[i] = (hsize_t_f) c_dims[i];
+    for (i = 0; i < 2; i++) {
+        dims[i] = (hsize_t_f)c_dims[i];
     }
 
     ret_value = 0;
 
-
 done:
-    if(c_name!=NULL)
+    if (c_name != NULL)
         HDfree(c_name);
 
     return ret_value;
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: h5imget_palette_c
-*
-* Purpose: Call H5IMget_palette
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 06 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
-
+ * Function: h5imget_palette_c
+ *
+ * Purpose: Call H5IMget_palette
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * Date: October 06 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
 
 int_f
-nh5imget_palette_c(hid_t_f *loc_id,
-                   size_t_f *namelen,
-                   _fcd name,
-                   int_f *pal_number,
-                   void *buf)
+h5imget_palette_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *pal_number, void *buf)
 {
-    int          ret_value = -1;
-    herr_t       ret;
-    hid_t        c_loc_id;
-    char         *c_name = NULL;
+    int    ret_value = -1;
+    herr_t ret;
+    hid_t  c_loc_id;
+    char  *c_name = NULL;
 
     /*
-    * convert FORTRAN name to C name
-    */
+     * convert FORTRAN name to C name
+     */
     c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL)
-         goto done;
+        goto done;
 
     /*
-    * call H5IMget_image_info function.
-    */
+     * call H5IMget_image_info function.
+     */
     c_loc_id = (hid_t)*loc_id;
 
-    ret = H5IMget_palettef(c_loc_id,c_name,*pal_number,(int_f *)buf);
+    ret = H5IMget_palettef(c_loc_id, c_name, *pal_number, (int_f *)buf);
 
     if (ret < 0)
-         goto done;
+        goto done;
 
     ret_value = 0;
 
 done:
-    if(c_name!=NULL)
+    if (c_name != NULL)
         HDfree(c_name);
 
     return ret_value;
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: h5imis_palette_c
-*
-* Purpose: Call H5IMis_palette
-*
-* Return: true, false, fail
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 06, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5imis_palette_c
+ *
+ * Purpose: Call H5IMis_palette
+ *
+ * Return: true, false, fail
+ *
+ * Programmer: Pedro Vicente
+ *
+ * Date: October 06, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
 
 int_f
-nh5imis_palette_c(hid_t_f *loc_id,
-                  size_t_f *namelen,
-                  _fcd name)
+h5imis_palette_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name)
 {
-    hid_t   c_loc_id;
-    char    *c_name;
-    herr_t  ret;
+    hid_t  c_loc_id;
+    char  *c_name;
+    herr_t ret;
 
     /*
-    * convert FORTRAN name to C name
-    */
+     * convert FORTRAN name to C name
+     */
     c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
-    if (c_name == NULL) return -1;
+    if (c_name == NULL)
+        return -1;
 
     /*
-    * call H5IMis_palette function.
-    */
+     * call H5IMis_palette function.
+     */
     c_loc_id = (hid_t)*loc_id;
 
     ret = H5IMis_palette(c_loc_id, c_name);
 
-    if(c_name!=NULL)
+    if (c_name != NULL)
         HDfree(c_name);
 
     return ret;
-
 }
diff --git a/hl/fortran/src/H5IMff.F90 b/hl/fortran/src/H5IMff.F90
new file mode 100644
index 0000000..a1be745
--- /dev/null
+++ b/hl/fortran/src/H5IMff.F90
@@ -0,0 +1,601 @@
+!> @defgroup FH5IM Fortran High Level Images (H5IM) Interface
+!!
+!! @see H5IM, C-HL API
+!!
+!! @see @ref H5IM_UG, User Guide
+!!
+
+!> @ingroup FH5IM
+!!
+!! @brief This module contains Fortran interfaces for H5IM.
+!
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!       _____ __  __ _____   ____  _____ _______       _   _ _______
+!      |_   _|  \/  |  __ \ / __ \|  __ \__   __|/\   | \ | |__   __|
+! ****   | | | \  / | |__) | |  | | |__) | | |  /  \  |  \| |  | |    ****
+! ****   | | | |\/| |  ___/| |  | |  _  /  | | / /\ \ | . ` |  | |    ****
+! ****  _| |_| |  | | |    | |__| | | \ \  | |/ ____ \| |\  |  | |    ****
+!      |_____|_|  |_|_|     \____/|_|  \_\ |_/_/    \_\_| \_|  |_|
+!
+!  If you add a new function here then you MUST add the function name to the
+!  Windows dll file 'hdf5_hl_fortrandll.def.in' in the hl/fortran/src directory.
+!  This is needed for Windows based operating systems.
+!
+
+MODULE H5IM
+  USE, INTRINSIC :: ISO_C_BINDING
+  USE h5fortran_types
+  USE hdf5
+CONTAINS
+
+!>
+!! \ingroup FH5IM
+!!
+!! \brief Creates and writes an image an 8 bit image
+!!
+!! \param loc_id    Location identifier. The identifier may be that of a file or group.
+!! \param dset_name The name of the dataset to create.
+!! \param width	    The width of the image.
+!! \param height    The height of the image
+!! \param buf       Buffer with data to be written to the dataset
+!! \param errcode   \fortran_error
+!!
+!! See C API: @ref H5IMmake_image_8bit()
+!!
+  SUBROUTINE h5immake_image_8bit_f(loc_id,&
+       dset_name,&
+       width,&
+       height,&
+       buf,&
+       errcode )
+
+    IMPLICIT NONE
+
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(len=*), INTENT(in) :: dset_name
+    INTEGER(hsize_t), INTENT(in) :: width
+    INTEGER(hsize_t), INTENT(in) :: height
+    INTEGER, INTENT(in), DIMENSION(*) :: buf
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen ! name length
+
+    INTERFACE
+       INTEGER FUNCTION h5immake_image_8bit_c(loc_id,namelen,dset_name,width,height,buf) &
+            BIND(C,NAME='h5immake_image_8bit_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(hid_t),   INTENT(in) :: loc_id
+         INTEGER(size_t) :: namelen
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: dset_name
+         INTEGER(hsize_t), INTENT(in) :: width
+         INTEGER(hsize_t), INTENT(in) :: height
+         INTEGER         , INTENT(in), DIMENSION(*) :: buf
+       END FUNCTION h5immake_image_8bit_c
+    END INTERFACE
+
+    namelen = LEN(dset_name)
+    errcode = h5immake_image_8bit_c(loc_id,namelen,dset_name,width,height,buf)
+
+  END SUBROUTINE h5immake_image_8bit_f
+
+!>
+!! \ingroup FH5IM
+!!
+!! \brief Reads image data from disk.
+!!
+!! \param loc_id    Location identifier. The identifier may be that of a file or group.
+!! \param dset_name The name of the dataset to create.
+!! \param buf       Buffer with data to store the image.
+!! \param errcode   \fortran_error
+!!
+!! See C API: @ref H5IMread_image()
+!!
+  SUBROUTINE h5imread_image_f(loc_id,&
+       dset_name,&
+       buf,&
+       errcode )
+
+    IMPLICIT NONE
+
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(len=*), INTENT(in) :: dset_name
+    INTEGER, INTENT(inout), DIMENSION(*) :: buf
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen ! name length
+
+    INTERFACE
+       INTEGER FUNCTION h5imread_image_c(loc_id,namelen,dset_name,buf) &
+            BIND(C,NAME='h5imread_image_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(hid_t),   INTENT(in) :: loc_id
+         INTEGER(size_t) :: namelen
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: dset_name
+         INTEGER, INTENT(inout), DIMENSION(*) :: buf
+       END FUNCTION h5imread_image_c
+    END INTERFACE
+
+    namelen = LEN(dset_name)
+    errcode = h5imread_image_c(loc_id,namelen,dset_name,buf)
+
+  END SUBROUTINE h5imread_image_f
+
+!>
+!! \ingroup FH5IM
+!!
+!! \brief Creates and writes an image a 24 bit image.
+!!
+!! \param loc_id    Location identifier. The identifier may be that of a file or group.
+!! \param dset_name The name of the dataset to create.
+!! \param width     The width of the image.
+!! \param height    The height of the image.
+!! \param il        String defining the interlace mode.
+!! \param buf       Buffer with data to be written to the dataset.
+!! \param errcode   \fortran_error
+!!
+!! See C API: @ref H5IMmake_image_24bit()
+!!
+  SUBROUTINE h5immake_image_24bit_f(loc_id, dset_name, width, height, il, buf, errcode)
+
+    IMPLICIT NONE
+
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(len=*), INTENT(in) :: dset_name
+    INTEGER(hsize_t), INTENT(in) :: width
+    INTEGER(hsize_t), INTENT(in) :: height
+    CHARACTER(len=*), INTENT(in) :: il
+    INTEGER, INTENT(in), DIMENSION(*) :: buf
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen ! name length
+    INTEGER(size_t) :: ILEN    ! name length
+
+    INTERFACE
+       INTEGER FUNCTION h5immake_image_24bit_c(loc_id,namelen,dset_name,ILEN,il,width,height,buf) &
+            BIND(C,NAME='h5immake_image_24bit_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(hid_t),   INTENT(in) :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: dset_name
+         INTEGER(hsize_t), INTENT(in) :: width
+         INTEGER(hsize_t), INTENT(in) :: height
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: il
+         INTEGER, INTENT(in), DIMENSION(*) :: buf
+         INTEGER(size_t) :: namelen
+         INTEGER(size_t) :: ILEN
+
+       END FUNCTION h5immake_image_24bit_c
+    END INTERFACE
+
+    namelen = LEN(dset_name)
+    ILEN    = LEN(il)
+    errcode = h5immake_image_24bit_c(loc_id,namelen,dset_name,ILEN,il,width,height,buf)
+
+  END SUBROUTINE h5immake_image_24bit_f
+
+!>
+!! \ingroup FH5IM
+!!
+!! \brief Gets information about an image dataset (dimensions, interlace mode and number of associated palettes).
+!!
+!! \param loc_id    Location identifier. The identifier may be that of a file or group.
+!! \param dset_name The name of the dataset.
+!! \param width     The width of the image.
+!! \param height    The height of the image.
+!! \param planes    The number of color planes of the image.
+!! \param interlace The interlace mode of the image.
+!! \param npals     The number of palettes associated to the image.
+!! \param errcode   \fortran_error
+!!
+!! See C API: @ref H5IMget_image_info()
+!!
+  SUBROUTINE h5imget_image_info_f(loc_id,&
+       dset_name,&
+       width,&
+       height,&
+       planes,&
+       interlace,&
+       npals,&
+       errcode )
+
+    IMPLICIT NONE
+
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(len=*), INTENT(in) :: dset_name
+    INTEGER(hsize_t), INTENT(inout) :: width
+    INTEGER(hsize_t), INTENT(inout) :: height
+    INTEGER(hsize_t), INTENT(inout) :: planes
+    INTEGER(hsize_t), INTENT(inout) :: npals
+    CHARACTER(len=*), INTENT(inout) :: interlace
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen ! name length
+    INTEGER(size_t) :: ILEN    ! name length
+
+    INTERFACE
+       INTEGER FUNCTION h5imget_image_info_c(loc_id,namelen,dset_name,width,height,planes,npals,ILEN,interlace) &
+            BIND(C,NAME='h5imget_image_info_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(hid_t),   INTENT(in) :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: dset_name
+         INTEGER(hsize_t), INTENT(inout) :: width
+         INTEGER(hsize_t), INTENT(inout) :: height
+         INTEGER(hsize_t), INTENT(inout) :: planes
+         INTEGER(hsize_t), INTENT(inout) :: npals
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(inout) :: interlace
+         INTEGER(size_t) :: namelen
+         INTEGER(size_t) :: ILEN
+       END FUNCTION h5imget_image_info_c
+    END INTERFACE
+
+    namelen = LEN(dset_name)
+    ILEN    = LEN(interlace)
+    errcode = h5imget_image_info_c(loc_id,namelen,dset_name,width,height,planes,npals,ILEN,interlace)
+
+  END SUBROUTINE h5imget_image_info_f
+
+!>
+!! \ingroup FH5IM
+!!
+!! \brief Inquires if a dataset is an image.
+!!
+!! \param loc_id    Location identifier. The identifier may be that of a file or group.
+!! \param dset_name The name of the dataset.
+!!
+!! See C API: @ref H5IMis_image()
+!!
+  INTEGER FUNCTION h5imis_image_f(loc_id, dset_name)
+
+    IMPLICIT NONE
+
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(len=*), INTENT(in) :: dset_name
+    INTEGER :: errcode         ! error code
+    INTEGER(size_t) :: namelen ! name length
+
+    INTERFACE
+       INTEGER FUNCTION h5imis_image_c(loc_id,namelen,dset_name) &
+            BIND(C,NAME='h5imis_image_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(hid_t),   INTENT(in) :: loc_id
+         INTEGER(size_t) :: namelen
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: dset_name
+       END FUNCTION h5imis_image_c
+    END INTERFACE
+
+    namelen = LEN(dset_name)
+    errcode = h5imis_image_c(loc_id,namelen,dset_name)
+    h5imis_image_f = errcode
+
+  END FUNCTION h5imis_image_f
+
+!>
+!! \ingroup FH5IM
+!!
+!! \brief Creates and writes a palette
+!!
+!! \param loc_id   Location identifier. The identifier may be that of a file or group.
+!! \param pal_name The name of the palette.
+!! \param pal_dims An array of the size of the palette dimensions.
+!! \param pal_data Buffer with data to be written to the dataset.
+!! \param errcode  \fortran_error
+!!
+!! See C API: @ref H5IMmake_palette()
+!!
+  SUBROUTINE h5immake_palette_f(loc_id,&
+       pal_name,&
+       pal_dims,&
+       pal_data,&
+       errcode )
+
+    IMPLICIT NONE
+
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(len=*), INTENT(in) :: pal_name
+    INTEGER(hsize_t), INTENT(in), DIMENSION(*) :: pal_dims
+    INTEGER, INTENT(in), DIMENSION(*) :: pal_data
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen ! name length
+
+    INTERFACE
+       INTEGER FUNCTION h5immake_palette_c(loc_id,namelen,pal_name,pal_dims,pal_data) &
+            BIND(C,NAME='h5immake_palette_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(hid_t),   INTENT(in) :: loc_id
+         INTEGER(size_t) :: namelen
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: pal_name
+         INTEGER(hsize_t), INTENT(in), DIMENSION(*) :: pal_dims
+         INTEGER, INTENT(in), DIMENSION(*) :: pal_data
+       END FUNCTION h5immake_palette_c
+    END INTERFACE
+
+    namelen = LEN(pal_name)
+    errcode = h5immake_palette_c(loc_id,namelen,pal_name,pal_dims,pal_data)
+
+  END SUBROUTINE h5immake_palette_f
+
+!>
+!! \ingroup FH5IM
+!!
+!! \brief This function attaches a palette to an existing image dataset.
+!!
+!! \param loc_id     Location identifier. The identifier may be that of a file or group.
+!! \param image_name The name of the dataset to attach the palette to.
+!! \param pal_name   The name of the palette.
+!! \param errcode    \fortran_error
+!!
+!! See C API: @ref H5IMlink_palette()
+!!
+  SUBROUTINE h5imlink_palette_f(loc_id,&
+       image_name,&
+       pal_name,&
+       errcode )
+
+    IMPLICIT NONE
+
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(len=*), INTENT(in) :: image_name
+    CHARACTER(len=*), INTENT(in) :: pal_name
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen ! name length
+    INTEGER(size_t) :: ILEN    ! name length
+
+    INTERFACE
+       INTEGER FUNCTION h5imlink_palette_c(loc_id,namelen,image_name,ILEN,pal_name) &
+            BIND(C,NAME='h5imlink_palette_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(hid_t),   INTENT(in) :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: image_name
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: pal_name
+         INTEGER(size_t) :: namelen
+         INTEGER(size_t) :: ILEN
+       END FUNCTION h5imlink_palette_c
+    END INTERFACE
+
+    namelen = LEN(image_name)
+    ILEN    = LEN(pal_name)
+    errcode = h5imlink_palette_c(loc_id,namelen,image_name,ILEN,pal_name)
+
+  END SUBROUTINE h5imlink_palette_f
+
+!>
+!! \ingroup FH5IM
+!!
+!! \brief This function dettaches a palette to an existing image dataset.
+!!
+!! \param loc_id     Location identifier. The identifier may be that of a file or group.
+!! \param image_name The name of the image dataset.
+!! \param pal_name   The name of the palette.
+!! \param errcode    \fortran_error
+!!
+!! See C API: @ref H5IMunlink_palette()
+!!
+  SUBROUTINE h5imunlink_palette_f(loc_id,&
+       image_name,&
+       pal_name,&
+       errcode )
+
+    IMPLICIT NONE
+
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(len=*), INTENT(in) :: image_name
+    CHARACTER(len=*), INTENT(in) :: pal_name
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen ! name length
+    INTEGER(size_t) :: ILEN    ! name length
+
+    INTERFACE
+       INTEGER FUNCTION h5imunlink_palette_c(loc_id,namelen,image_name,ILEN,pal_name) &
+            BIND(C,NAME='h5imunlink_palette_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(hid_t),   INTENT(in) :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: image_name
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: pal_name
+         INTEGER(size_t) :: namelen
+         INTEGER(size_t) :: ILEN
+       END FUNCTION h5imunlink_palette_c
+    END INTERFACE
+
+    namelen = LEN(image_name)
+    ILEN    = LEN(pal_name)
+    errcode = h5imunlink_palette_c(loc_id,namelen,image_name,ILEN,pal_name)
+
+  END SUBROUTINE h5imunlink_palette_f
+
+!>
+!! \ingroup FH5IM
+!!
+!! \brief Gets the number of palettes associated to an image.
+!!
+!! \param loc_id     Location identifier. The identifier may be that of a file or group.
+!! \param image_name The name of the image dataset.
+!! \param npals      The number of palettes.
+!! \param errcode    \fortran_error
+!!
+!! See C API: @ref H5IMget_npalettes()
+!!
+  SUBROUTINE h5imget_npalettes_f(loc_id,&
+       image_name,&
+       npals,&
+       errcode )
+
+    IMPLICIT NONE
+
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(len=*), INTENT(in) :: image_name
+    INTEGER(hsize_t), INTENT(inout) :: npals
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen ! name length
+
+    INTERFACE
+       INTEGER FUNCTION h5imget_npalettes_c(loc_id,namelen,image_name,npals) &
+            BIND(C,NAME='h5imget_npalettes_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(hid_t),   INTENT(in) :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: image_name
+         INTEGER(hsize_t), INTENT(inout) :: npals
+         INTEGER(size_t) :: namelen
+       END FUNCTION h5imget_npalettes_c
+    END INTERFACE
+
+    namelen = LEN(image_name)
+    errcode = h5imget_npalettes_c(loc_id,namelen,image_name,npals)
+
+  END SUBROUTINE h5imget_npalettes_f
+
+!>
+!! \ingroup FH5IM
+!!
+!! \brief Gets information about a palette dataset (dimensions).
+!!
+!! \param loc_id     Location identifier. The identifier may be that of a file or group.
+!! \param image_name The name of the image dataset.
+!! \param pal_number The zero based index that identifies the palette.
+!! \param pal_dims   The dimensions of the palette dataset.
+!! \param  errcode   \fortran_error
+!!
+!! See C API: @ref H5IMget_palette_info()
+!!
+  SUBROUTINE h5imget_palette_info_f(loc_id,&
+       image_name,&
+       pal_number,&
+       pal_dims,&
+       errcode )
+
+    IMPLICIT NONE
+
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(len=*), INTENT(in) :: image_name
+    INTEGER, INTENT(in) :: pal_number
+    INTEGER(hsize_t), DIMENSION(*), INTENT(inout) :: pal_dims
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen ! name length
+
+    INTERFACE
+       INTEGER FUNCTION h5imget_palette_info_c(loc_id,namelen,image_name,pal_number,pal_dims) &
+            BIND(C,NAME='h5imget_palette_info_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(hid_t),   INTENT(in) :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: image_name
+         INTEGER, INTENT(in) :: pal_number
+         INTEGER(hsize_t), DIMENSION(*), INTENT(inout) :: pal_dims
+         INTEGER(size_t) :: namelen
+       END FUNCTION h5imget_palette_info_c
+    END INTERFACE
+
+    namelen = LEN(image_name)
+    errcode = h5imget_palette_info_c(loc_id,namelen,image_name,pal_number,pal_dims)
+
+  END SUBROUTINE h5imget_palette_info_f
+
+!>
+!! \ingroup FH5IM
+!!
+!! \brief Gets the palette dataset
+!!
+!! \param loc_id     Location identifier. The identifier may be that of a file or group.
+!! \param image_name The name of the image dataset.
+!! \param pal_number The zero based index that identifies the palette.
+!! \param pal_data   The palette dataset.
+!! \param errcode    \fortran_error
+!!
+!! See C API: @ref H5IMget_palette_info()
+!!
+  SUBROUTINE h5imget_palette_f(loc_id,&
+       image_name,&
+       pal_number,&
+       pal_data,&
+       errcode )
+
+    IMPLICIT NONE
+
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(len=*), INTENT(in) :: image_name
+    INTEGER, INTENT(in) :: pal_number
+    INTEGER, INTENT(inout), DIMENSION(*) :: pal_data
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen ! length of name buffer
+
+    INTERFACE
+       INTEGER FUNCTION h5imget_palette_c(loc_id,namelen,image_name,pal_number,pal_data) &
+            BIND(C,NAME='h5imget_palette_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(hid_t),   INTENT(in) :: loc_id
+         INTEGER(size_t) :: namelen
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: image_name
+         INTEGER, INTENT(in) :: pal_number
+         INTEGER, INTENT(inout), DIMENSION(*) :: pal_data
+       END FUNCTION h5imget_palette_c
+    END INTERFACE
+
+    namelen = LEN(image_name)
+    errcode = h5imget_palette_c(loc_id,namelen,image_name,pal_number,pal_data)
+
+  END SUBROUTINE h5imget_palette_f
+
+!>
+!! \ingroup FH5IM
+!!
+!! \brief Inquires if a dataset is a palette. Returns zero (false), a positive (true) or a negative (failure) value.
+!!
+!! \param loc_id    Location identifier. The identifier may be that of a file or group.
+!! \param dset_name The name of the dataset.
+!!
+!! See C API: @ref H5IMis_palette()
+!!
+  INTEGER FUNCTION h5imis_palette_f(loc_id, dset_name)
+
+    IMPLICIT NONE
+
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(len=*), INTENT(in) :: dset_name
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen ! name length
+
+    INTERFACE
+       INTEGER FUNCTION h5imis_palette_c(loc_id,namelen,dset_name) &
+            BIND(C,NAME='h5imis_palette_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(hid_t),   INTENT(in) :: loc_id
+         INTEGER(size_t) :: namelen
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: dset_name
+       END FUNCTION h5imis_palette_c
+    END INTERFACE
+
+    namelen = LEN(dset_name)
+    errcode = h5imis_palette_c(loc_id,namelen,dset_name)
+    h5imis_palette_f = errcode
+
+  END FUNCTION h5imis_palette_f
+
+END MODULE H5IM
+
diff --git a/hl/fortran/src/H5IMff.f90 b/hl/fortran/src/H5IMff.f90
deleted file mode 100644
index 50c6d8b..0000000
--- a/hl/fortran/src/H5IMff.f90
+++ /dev/null
@@ -1,783 +0,0 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-!
-! This file contains FORTRAN90 interfaces for H5IM functions
-!
-
-module h5im
-use h5fortran_types
-use hdf5
-contains
-
-
-!-------------------------------------------------------------------------
-! Function: h5immake_image_8bit_f
-!
-! Purpose: Creates and writes an image an 8 bit image
-!
-! Return: Success: 0, Failure: -1
-!
-! Programmer: pvn@ncsa.uiuc.edu
-!
-! Date: October 05, 2004
-!
-! Comments:
-!
-! Modifications:
-!
-!-------------------------------------------------------------------------
-
-subroutine h5immake_image_8bit_f(loc_id,&
-                                 dset_name,&
-                                 width,&
-                                 height,&
-                                 buf,&
-                                 errcode )
-
- implicit none
-
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5immake_image_8bit_f
-!DEC$endif
-!
-
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
- character(len=*), intent(in) :: dset_name          ! name of the dataset
- integer(hsize_t), intent(in) :: width              ! width of image
- integer(hsize_t), intent(in) :: height             ! height of image
- integer, intent(in), dimension(*) :: buf           ! buffer
- integer :: errcode                                 ! error code
- INTEGER(size_t) :: namelen                         ! name length
-
- interface
-  integer function h5immake_image_8bit_c(loc_id,namelen,dset_name,width,height,buf)
-  use h5global
-  IMPLICIT NONE
-  !DEC$IF DEFINED(HDF5F90_WINDOWS)
-  !DEC$ATTRIBUTES C,reference,decorate,alias:'H5IMMAKE_IMAGE_8BIT_C'::h5immake_image_8bit_c
-  !DEC$ENDIF
-  !DEC$ATTRIBUTES reference :: dset_name
-  integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
-  integer(size_t) :: namelen                              ! length of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset
-  integer(hsize_t), intent(in) :: width                   ! width of image
-  integer(hsize_t), intent(in) :: height                  ! height of image
-  integer         , intent(in), dimension(*) :: buf       ! buffer
-  end function h5immake_image_8bit_c
- end interface
-
- namelen = len(dset_name)
- errcode = h5immake_image_8bit_c(loc_id,namelen,dset_name,width,height,buf)
-
-end subroutine h5immake_image_8bit_f
-
-
-
-!-------------------------------------------------------------------------
-! Function: h5imread_image_f
-!
-! Purpose: Reads image data from disk.
-!
-! Return: Success: 0, Failure: -1
-!
-! Programmer: pvn@ncsa.uiuc.edu
-!
-! Date: October 05, 2004
-!
-! Comments:
-!
-! Modifications:
-!
-!-------------------------------------------------------------------------
-
-
-subroutine h5imread_image_f(loc_id,&
-                            dset_name,&
-                            buf,&
-                            errcode )
-
- implicit none
-
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5imread_image_f
-!DEC$endif
-!
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
- character(len=*), intent(in) :: dset_name          ! name of the dataset
- integer, intent(inout), dimension(*) :: buf        ! buffer
- integer :: errcode                                 ! error code
- INTEGER(size_t) :: namelen                         ! name length
-
- interface
-  integer function h5imread_image_c(loc_id,namelen,dset_name,buf)
-  use h5global
-  IMPLICIT NONE
-  !DEC$IF DEFINED(HDF5F90_WINDOWS)
-  !DEC$ATTRIBUTES C,reference,decorate,alias:'H5IMREAD_IMAGE_C'::h5imread_image_c
-  !DEC$ENDIF
-  !DEC$ATTRIBUTES reference :: dset_name
-  integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
-  integer(size_t) :: namelen                              ! length of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset
-  integer, intent(inout), dimension(*) :: buf             ! buffer
-  end function h5imread_image_c
- end interface
-
- namelen = len(dset_name)
- errcode = h5imread_image_c(loc_id,namelen,dset_name,buf)
-
-end subroutine h5imread_image_f
-
-
-!-------------------------------------------------------------------------
-! Function: h5immake_image_24bit_f
-!
-! Purpose: Creates and writes an image a 24 bit image
-!
-! Return: Success: 0, Failure: -1
-!
-! Programmer: pvn@ncsa.uiuc.edu
-!
-! Date: October 05, 2004
-!
-! Comments:
-!
-! Modifications:
-!
-!-------------------------------------------------------------------------
-
-subroutine h5immake_image_24bit_f(loc_id,&
-                                 dset_name,&
-                                 width,&
-                                 height,&
-                                 il,&
-                                 buf,&
-                                 errcode )
-
- implicit none
-
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5immake_image_24bit_f
-!DEC$endif
-!
-
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
- character(len=*), intent(in) :: dset_name          ! name of the dataset
- integer(hsize_t), intent(in) :: width              ! width of image
- integer(hsize_t), intent(in) :: height             ! height of image
- character(len=*), intent(in) :: il                 ! interlace
- integer, intent(in), dimension(*) :: buf           ! buffer
- integer :: errcode                                 ! error code
- INTEGER(size_t) :: namelen                                 ! name length
- integer(size_t) :: ilen                                    ! name length
-
- interface
-  integer function h5immake_image_24bit_c(loc_id,namelen,dset_name,ilen,il,width,height,buf)
-  use h5global
-  IMPLICIT NONE
-  !DEC$IF DEFINED(HDF5F90_WINDOWS)
-  !DEC$ATTRIBUTES C,reference,decorate,alias:'H5IMMAKE_IMAGE_24BIT_C'::h5immake_image_24bit_c
-  !DEC$ENDIF
-  !DEC$ATTRIBUTES reference :: dset_name
-  !DEC$ATTRIBUTES reference :: il
-  integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
-  character(len=*), intent(in) :: dset_name               ! name of the dataset
-  integer(hsize_t), intent(in) :: width                   ! width of image
-  integer(hsize_t), intent(in) :: height                  ! height of image
-  character(len=*), intent(in) :: il                      ! interlace
-  integer, intent(in), dimension(*) :: buf                ! buffer
-  integer(size_t) :: namelen                                      ! length of name buffer
-  integer(size_t) :: ilen                                         ! name length
-
-  end function h5immake_image_24bit_c
- end interface
-
- namelen = len(dset_name)
- ilen    = len(il)
- errcode = h5immake_image_24bit_c(loc_id,namelen,dset_name,ilen,il,width,height,buf)
-
-end subroutine h5immake_image_24bit_f
-
-
-!-------------------------------------------------------------------------
-! Function: h5imget_image_info_f
-!
-! Purpose: Gets information about an image dataset (dimensions, interlace mode
-!          and number of associated palettes).
-!
-! Return: Success: 0, Failure: -1
-!
-! Programmer: pvn@ncsa.uiuc.edu
-!
-! Date: October 05, 2004
-!
-! Comments:
-!
-! Modifications:
-!
-!-------------------------------------------------------------------------
-
-subroutine h5imget_image_info_f(loc_id,&
-                                dset_name,&
-                                width,&
-                                height,&
-                                planes,&
-                                interlace,&
-                                npals,&
-                                errcode )
-
- implicit none
-
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5imget_image_info_f
-!DEC$endif
-!
-
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
- character(len=*), intent(in) :: dset_name          ! name of the dataset
- integer(hsize_t), intent(inout) :: width           ! width of image
- integer(hsize_t), intent(inout) :: height          ! height of image
- integer(hsize_t), intent(inout) :: planes          ! color planes
- integer(hsize_t), intent(inout) :: npals           ! palettes
- character(len=*), intent(inout) :: interlace       ! interlace
- integer :: errcode                                 ! error code
- integer(size_t) :: namelen                                 ! name length
- integer(size_t) :: ilen                                    ! name length
-
- interface
-  integer function h5imget_image_info_c(loc_id,namelen,dset_name,width,height,planes,npals,ilen,interlace)
-  use h5global
-  IMPLICIT NONE
-  !DEC$IF DEFINED(HDF5F90_WINDOWS)
-  !DEC$ATTRIBUTES C,reference,decorate,alias:'H5IMGET_IMAGE_INFO_C'::h5imget_image_info_c
-  !DEC$ENDIF
-  !DEC$ATTRIBUTES reference :: dset_name
-  !DEC$ATTRIBUTES reference :: interlace
-  integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
-  character(len=*), intent(in) :: dset_name          ! name of the dataset
-  integer(hsize_t), intent(inout) :: width           ! width of image
-  integer(hsize_t), intent(inout) :: height          ! height of image
-  integer(hsize_t), intent(inout) :: planes          ! color planes
-  integer(hsize_t), intent(inout) :: npals           ! palettes
-  character(len=*), intent(inout) :: interlace       ! interlace
-  integer(size_t) :: namelen                                 ! name length
-  integer(size_t) :: ilen                                    ! name length
-  end function h5imget_image_info_c
- end interface
-
- namelen = len(dset_name)
- ilen    = len(interlace)
- errcode = h5imget_image_info_c(loc_id,namelen,dset_name,width,height,planes,npals,ilen,interlace)
-
-end subroutine h5imget_image_info_f
-
-
-!-------------------------------------------------------------------------
-! Function: h5imis_image_f
-!
-! Purpose: Inquires if a dataset is an image
-!
-! Return: Success: 0, Failure: -1
-!
-! Programmer: pvn@ncsa.uiuc.edu
-!
-! Date: October 05, 2004
-!
-! Comments:
-!
-! Modifications:
-!
-!-------------------------------------------------------------------------
-
-integer function h5imis_image_f(loc_id,&
-                                dset_name)
-
- implicit none
-
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5imis_image_f
-!DEC$endif
-!
-
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
- character(len=*), intent(in) :: dset_name          ! name of the dataset
- integer :: errcode                                 ! error code
- integer(size_t) :: namelen                                 ! name length
-
- interface
-  integer function h5imis_image_c(loc_id,namelen,dset_name)
-  use h5global
-  IMPLICIT NONE
-  !DEC$IF DEFINED(HDF5F90_WINDOWS)
-  !DEC$ATTRIBUTES C,reference,decorate,alias:'H5IMIS_IMAGE_C'::h5imis_image_c
-  !DEC$ENDIF
-  !DEC$ATTRIBUTES reference :: dset_name
-  integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
-  integer(size_t) :: namelen                                      ! length of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset
-  end function h5imis_image_c
- end interface
-
- namelen = len(dset_name)
- errcode = h5imis_image_c(loc_id,namelen,dset_name)
- h5imis_image_f = errcode
-
-end function h5imis_image_f
-
-
-!-------------------------------------------------------------------------
-! Function: h5immake_palette_f
-!
-! Purpose: Creates and writes a palette
-!
-! Return: Success: 0, Failure: -1
-!
-! Programmer: pvn@ncsa.uiuc.edu
-!
-! Date: October 06, 2004
-!
-! Comments:
-!
-! Modifications:
-!
-!-------------------------------------------------------------------------
-
-subroutine h5immake_palette_f(loc_id,&
-                              dset_name,&
-                              pal_dims,&
-                              buf,&
-                              errcode )
-
- implicit none
-
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5immake_palette_f
-!DEC$endif
-!
-
- integer(hid_t),   intent(in) :: loc_id                 ! file or group identifier
- character(len=*), intent(in) :: dset_name              ! name of the dataset
- integer(hsize_t), intent(in), dimension(*) :: pal_dims ! dimensions
- integer, intent(in), dimension(*) :: buf               ! buffer
- integer :: errcode                                     ! error code
- integer(size_t) :: namelen                                     ! name length
-
- interface
-  integer function h5immake_palette_c(loc_id,namelen,dset_name,pal_dims,buf)
-  use h5global
-  IMPLICIT NONE
-  !DEC$IF DEFINED(HDF5F90_WINDOWS)
-  !DEC$ATTRIBUTES C,reference,decorate,alias:'H5IMMAKE_PALETTE_C'::h5immake_palette_c
-  !DEC$ENDIF
-  !DEC$ATTRIBUTES reference :: dset_name
-  integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
-  integer(size_t) :: namelen                                      ! length of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset
-  integer(hsize_t), intent(in), dimension(*) :: pal_dims  ! dimensions
-  integer, intent(in), dimension(*) :: buf                ! buffer
-  end function h5immake_palette_c
- end interface
-
- namelen = len(dset_name)
- errcode = h5immake_palette_c(loc_id,namelen,dset_name,pal_dims,buf)
-
-end subroutine h5immake_palette_f
-
-
-
-!-------------------------------------------------------------------------
-! Function: h5imlink_palette_f
-!
-! Purpose: This function attaches a palette to an existing image dataset
-!
-! Return: Success: 0, Failure: -1
-!
-! Programmer: pvn@ncsa.uiuc.edu
-!
-! Date: October 06, 2004
-!
-! Comments:
-!
-! Modifications:
-!
-!-------------------------------------------------------------------------
-
-subroutine h5imlink_palette_f(loc_id,&
-                              dset_name,&
-                              pal_name,&
-                              errcode )
-
- implicit none
-
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5imlink_palette_f
-!DEC$endif
-!
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
- character(len=*), intent(in) :: dset_name          ! name of the dataset
- character(len=*), intent(in) :: pal_name           ! palette name
- integer :: errcode                                 ! error code
- integer(size_t) :: namelen                                 ! name length
- integer(size_t) :: ilen                                    ! name length
-
- interface
-  integer function h5imlink_palette_c(loc_id,namelen,dset_name,ilen,pal_name)
-  use h5global
-  IMPLICIT NONE
-  !DEC$IF DEFINED(HDF5F90_WINDOWS)
-  !DEC$ATTRIBUTES C,reference,decorate,alias:'H5IMLINK_PALETTE_C'::h5imlink_palette_c
-  !DEC$ENDIF
-  !DEC$ATTRIBUTES reference :: dset_name
-  !DEC$ATTRIBUTES reference :: pal_name
-  integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
-  character(len=*), intent(in) :: dset_name          ! name of the dataset
-  character(len=*), intent(in) :: pal_name           ! palette name
-  integer(size_t) :: namelen                                 ! name length
-  integer(size_t) :: ilen                                    ! name length
-  end function h5imlink_palette_c
- end interface
-
- namelen = len(dset_name)
- ilen    = len(pal_name)
- errcode = h5imlink_palette_c(loc_id,namelen,dset_name,ilen,pal_name)
-
-end subroutine h5imlink_palette_f
-
-
-!-------------------------------------------------------------------------
-! Function: h5imunlink_palette_f
-!
-! Purpose: This function dettaches a palette to an existing image dataset
-!
-! Return: Success: 0, Failure: -1
-!
-! Programmer: pvn@ncsa.uiuc.edu
-!
-! Date: October 06, 2004
-!
-! Comments:
-!
-! Modifications:
-!
-!-------------------------------------------------------------------------
-
-subroutine h5imunlink_palette_f(loc_id,&
-                              dset_name,&
-                              pal_name,&
-                              errcode )
-
- implicit none
-
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5imunlink_palette_f
-!DEC$endif
-!
-
-
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
- character(len=*), intent(in) :: dset_name          ! name of the dataset
- character(len=*), intent(in) :: pal_name           ! palette name
- integer :: errcode                                 ! error code
- integer(size_t) :: namelen                                 ! name length
- integer(size_t) :: ilen                                    ! name length
-
- interface
-  integer function h5imunlink_palette_c(loc_id,namelen,dset_name,ilen,pal_name)
-  use h5global
-  IMPLICIT NONE
-  !DEC$IF DEFINED(HDF5F90_WINDOWS)
-  !DEC$ATTRIBUTES C,reference,decorate,alias:'H5IMUNLINK_PALETTE_C'::h5imunlink_palette_c
-  !DEC$ENDIF
-  !DEC$ATTRIBUTES reference :: dset_name
-  !DEC$ATTRIBUTES reference :: pal_name
-  integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
-  character(len=*), intent(in) :: dset_name          ! name of the dataset
-  character(len=*), intent(in) :: pal_name           ! palette name
-  integer(size_t) :: namelen                                 ! name length
-  integer(size_t) :: ilen                                    ! name length
-  end function h5imunlink_palette_c
- end interface
-
- namelen = len(dset_name)
- ilen    = len(pal_name)
- errcode = h5imunlink_palette_c(loc_id,namelen,dset_name,ilen,pal_name)
-
-end subroutine h5imunlink_palette_f
-
-
-
-!-------------------------------------------------------------------------
-! Function: h5imget_npalettes_f
-!
-! Purpose: Gets the number of palettes associated to an image
-!
-! Return: Success: 0, Failure: -1
-!
-! Programmer: pvn@ncsa.uiuc.edu
-!
-! Date: October 05, 2004
-!
-! Comments:
-!
-! Modifications:
-!
-!-------------------------------------------------------------------------
-
-subroutine h5imget_npalettes_f(loc_id,&
-                               dset_name,&
-                               npals,&
-                               errcode )
-
- implicit none
-
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5imget_npalettes_f
-!DEC$endif
-!
-
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
- character(len=*), intent(in) :: dset_name          ! name of the dataset
- integer(hsize_t), intent(inout) :: npals           ! palettes
- integer :: errcode                                 ! error code
- integer(size_t) :: namelen                                 ! name length
-
- interface
-  integer function h5imget_npalettes_c(loc_id,namelen,dset_name,npals)
-  use h5global
-  IMPLICIT NONE
-  !DEC$IF DEFINED(HDF5F90_WINDOWS)
-  !DEC$ATTRIBUTES C,reference,decorate,alias:'H5IMGET_NPALETTES_C'::h5imget_npalettes_c
-  !DEC$ENDIF
-  !DEC$ATTRIBUTES reference :: dset_name
-  integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
-  character(len=*), intent(in) :: dset_name          ! name of the dataset
-  integer(hsize_t), intent(inout) :: npals           ! palettes
-  integer(size_t) :: namelen                                 ! name length
-  end function h5imget_npalettes_c
- end interface
-
- namelen = len(dset_name)
- errcode = h5imget_npalettes_c(loc_id,namelen,dset_name,npals)
-
-end subroutine h5imget_npalettes_f
-
-
-!-------------------------------------------------------------------------
-! Function: h5imget_palette_info_f
-!
-! Purpose: Get palette information
-!
-! Return: Success: 0, Failure: -1
-!
-! Programmer: pvn@ncsa.uiuc.edu
-!
-! Date: October 06, 2004
-!
-! Comments:
-!
-! Modifications:
-!
-!-------------------------------------------------------------------------
-
-subroutine h5imget_palette_info_f(loc_id,&
-                                  dset_name,&
-                                  pal_number,&
-                                  dims,&
-                                  errcode )
-
- implicit none
-
-
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5imget_palette_info_f
-!DEC$endif
-!
-
- integer(hid_t),   intent(in) :: loc_id                ! file or group identifier
- character(len=*), intent(in) :: dset_name             ! name of the dataset
- integer, intent(in) :: pal_number                     ! palette number
- integer(hsize_t), dimension(*), intent(inout) :: dims ! dimensions
- integer :: errcode                                    ! error code
- integer(size_t) :: namelen                                    ! name length
-
- interface
-  integer function h5imget_palette_info_c(loc_id,namelen,dset_name,pal_number,dims)
-  use h5global
-  IMPLICIT NONE
-  !DEC$IF DEFINED(HDF5F90_WINDOWS)
-  !DEC$ATTRIBUTES C,reference,decorate,alias:'H5IMGET_PALETTE_INFO_C'::h5imget_palette_info_c
-  !DEC$ENDIF
-  !DEC$ATTRIBUTES reference :: dset_name
-  integer(hid_t),   intent(in) :: loc_id                ! file or group identifier
-  character(len=*), intent(in) :: dset_name             ! name of the dataset
-  integer, intent(in) :: pal_number                     ! palette number
-  integer(hsize_t), dimension(*), intent(inout) :: dims ! dimensions
-  integer(size_t) :: namelen                                    ! name length
-  end function h5imget_palette_info_c
- end interface
-
- namelen = len(dset_name)
- errcode = h5imget_palette_info_c(loc_id,namelen,dset_name,pal_number,dims)
-
-end subroutine h5imget_palette_info_f
-
-
-
-!-------------------------------------------------------------------------
-! Function: h5imget_palette_f
-!
-! Purpose: Reads palette
-!
-! Return: Success: 0, Failure: -1
-!
-! Programmer: pvn@ncsa.uiuc.edu
-!
-! Date: October 06, 2004
-!
-! Comments:
-!
-! Modifications:
-!
-!-------------------------------------------------------------------------
-
-
-subroutine h5imget_palette_f(loc_id,&
-                             dset_name,&
-                             pal_number,&
-                             buf,&
-                             errcode )
-
- implicit none
-
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5imget_palette_f
-!DEC$endif
-!
-
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
- character(len=*), intent(in) :: dset_name          ! name of the dataset
- integer, intent(in) :: pal_number                  ! palette number
- integer, intent(inout), dimension(*) :: buf        ! buffer
- integer :: errcode                                 ! error code
- integer(size_t) :: namelen                                 ! name length
-
- interface
-  integer function h5imget_palette_c(loc_id,namelen,dset_name,pal_number,buf)
-  use h5global
-  IMPLICIT NONE
-  !DEC$IF DEFINED(HDF5F90_WINDOWS)
-  !DEC$ATTRIBUTES C,reference,decorate,alias:'H5IMGET_PALETTE_C'::h5imget_palette_c
-  !DEC$ENDIF
-  !DEC$ATTRIBUTES reference :: dset_name
-  integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
-  integer(size_t) :: namelen                                      ! length of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset
-  integer, intent(in) :: pal_number                       ! palette number
-  integer, intent(inout), dimension(*) :: buf             ! buffer
-  end function h5imget_palette_c
- end interface
-
- namelen = len(dset_name)
- errcode = h5imget_palette_c(loc_id,namelen,dset_name,pal_number,buf)
-
-end subroutine h5imget_palette_f
-
-
-!-------------------------------------------------------------------------
-! Function: h5imis_palette_f
-!
-! Purpose: Inquires if a dataset is a palette
-!
-! Return: true, false, fail
-!
-! Programmer: pvn@ncsa.uiuc.edu
-!
-! Date: October 06, 2004
-!
-! Comments:
-!
-! Modifications:
-!
-!-------------------------------------------------------------------------
-
-integer function h5imis_palette_f(loc_id,&
-                                  dset_name)
-
- implicit none
-
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5imis_palette_f
-!DEC$endif
-!
-
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
- character(len=*), intent(in) :: dset_name          ! name of the dataset
- integer :: errcode                                 ! error code
- integer(size_t) :: namelen                                 ! name length
-
- interface
-  integer function h5imis_palette_c(loc_id,namelen,dset_name)
-  use h5global
-  IMPLICIT NONE
-  !DEC$IF DEFINED(HDF5F90_WINDOWS)
-  !DEC$ATTRIBUTES C,reference,decorate,alias:'H5IMIS_PALETTE_C'::h5imis_palette_c
-  !DEC$ENDIF
-  !DEC$ATTRIBUTES reference :: dset_name
-  integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
-  integer(size_t) :: namelen                              ! length of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset
-  end function h5imis_palette_c
- end interface
-
- namelen = len(dset_name)
- errcode = h5imis_palette_c(loc_id,namelen,dset_name)
- h5imis_palette_f = errcode
-
-end function h5imis_palette_f
-
-
-!  end
-!
-end module H5IM
-
-
-
-
-
diff --git a/hl/fortran/src/H5LTf90proto.h b/hl/fortran/src/H5LTf90proto.h
index 532d9d8..997d3a0 100644
--- a/hl/fortran/src/H5LTf90proto.h
+++ b/hl/fortran/src/H5LTf90proto.h
@@ -1,21 +1,17 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Board of Trustees of the University of Illinois.         *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of HDF5.  The full HDF5 copyright notice, including     *
-* terms governing use, modification, and redistribution, is contained in    *
-* the files COPYING and Copyright.html.  COPYING can be found at the root   *
-* of the source code distribution tree; Copyright.html can be found at the  *
-* root level of an installed copy of the electronic HDF5 document set and   *
-* is linked from the top-level documents page.  It can also be found at     *
-* http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-* access to either file, you may request a copy from help@hdfgroup.org.     *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-
-#ifndef _H5LTf90proto_H
-#define _H5LTf90proto_H
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#ifndef H5LTf90proto_H
+#define H5LTf90proto_H
 
 #include "H5public.h"
 #include "H5f90i.h"
@@ -24,1624 +20,189 @@
 
 /* These definitions should match those in fortran/src/H5f90kit.c */
 
-H5_FCDLL char*  HD5f2cstring (_fcd fdesc, size_t len);
-H5_FCDLL void HD5packFstring (char *src, char *dest, size_t len);
+H5_FCDLL char *HD5f2cstring(_fcd fdesc, size_t len);
+H5_FCDLL void  HD5packFstring(char *src, char *dest, size_t len);
 
 /*
  *  Functions from H5DSfc.c
  */
-
-#define nh5dsset_scale_c      H5_FC_FUNC_(h5dsset_scale_c, H5DSSET_SCALE_C)
-#define nh5dsattach_scale_c   H5_FC_FUNC_(h5dsattach_scale_c, H5DSATTACH_SCALE_C)
-#define nh5dsdetach_scale_c   H5_FC_FUNC_(h5dsdetach_scale_c, H5DSDETACH_SCALE_C)
-#define nh5dsis_attached_c    H5_FC_FUNC_(h5dsis_attached_c, H5DSIS_ATTACHED_C)
-#define nh5dsis_scale_c       H5_FC_FUNC_(h5dsis_scale_c, H5DSIS_SCALE_C)
-#define nh5dsset_label_c      H5_FC_FUNC_(h5dsset_label_c, H5DSSET_LABEL_C)
-#define nh5dsget_label_c      H5_FC_FUNC_(h5dsget_label_c, H5DSGET_LABEL_C)
-#define nh5dsget_scale_name_c H5_FC_FUNC_(h5dsget_scale_name_c,H5DSGET_SCALE_NAME_C)
-#define nh5dsget_num_scales_c H5_FC_FUNC_(h5dsget_num_scales_c,H5DSGET_NUM_SCALES_C)
-
-
-/*
- *  Functions from H5LTfc.c
- */
-#define nh5ltmake_dataset_c       H5_FC_FUNC_(h5ltmake_dataset_c, H5LTMAKE_DATASET_C)
-#define nh5ltmake_dataset_int1_c  H5_FC_FUNC_(h5ltmake_dataset_int1_c, H5LTMAKE_DATASET_INT1_C)
-#define nh5ltmake_dataset_int2_c  H5_FC_FUNC_(h5ltmake_dataset_int2_c, H5LTMAKE_DATASET_INT2_C)
-#define nh5ltmake_dataset_int3_c  H5_FC_FUNC_(h5ltmake_dataset_int3_c, H5LTMAKE_DATASET_INT3_C)
-#define nh5ltmake_dataset_int4_c  H5_FC_FUNC_(h5ltmake_dataset_int4_c, H5LTMAKE_DATASET_INT4_C)
-#define nh5ltmake_dataset_int5_c  H5_FC_FUNC_(h5ltmake_dataset_int5_c, H5LTMAKE_DATASET_INT5_C)
-#define nh5ltmake_dataset_int6_c  H5_FC_FUNC_(h5ltmake_dataset_int6_c, H5LTMAKE_DATASET_INT6_C)
-#define nh5ltmake_dataset_int7_c  H5_FC_FUNC_(h5ltmake_dataset_int7_c, H5LTMAKE_DATASET_INT7_C)
-#define nh5ltmake_dataset_fl1_c   H5_FC_FUNC_(h5ltmake_dataset_fl1_c, H5LTMAKE_DATASET_FL1_C)
-#define nh5ltmake_dataset_fl2_c   H5_FC_FUNC_(h5ltmake_dataset_fl2_c, H5LTMAKE_DATASET_FL2_C)
-#define nh5ltmake_dataset_fl3_c   H5_FC_FUNC_(h5ltmake_dataset_fl3_c, H5LTMAKE_DATASET_FL3_C)
-#define nh5ltmake_dataset_fl4_c   H5_FC_FUNC_(h5ltmake_dataset_fl4_c, H5LTMAKE_DATASET_FL4_C)
-#define nh5ltmake_dataset_fl5_c   H5_FC_FUNC_(h5ltmake_dataset_fl5_c, H5LTMAKE_DATASET_FL5_C)
-#define nh5ltmake_dataset_fl6_c   H5_FC_FUNC_(h5ltmake_dataset_fl6_c, H5LTMAKE_DATASET_FL6_C)
-#define nh5ltmake_dataset_fl7_c   H5_FC_FUNC_(h5ltmake_dataset_fl7_c, H5LTMAKE_DATASET_FL7_C)
-#define nh5ltmake_dataset_dl1_c   H5_FC_FUNC_(h5ltmake_dataset_dl1_c, H5LTMAKE_DATASET_DL1_C)
-#define nh5ltmake_dataset_dl2_c   H5_FC_FUNC_(h5ltmake_dataset_dl2_c, H5LTMAKE_DATASET_DL2_C)
-#define nh5ltmake_dataset_dl3_c   H5_FC_FUNC_(h5ltmake_dataset_dl3_c, H5LTMAKE_DATASET_DL3_C)
-#define nh5ltmake_dataset_dl4_c   H5_FC_FUNC_(h5ltmake_dataset_dl4_c, H5LTMAKE_DATASET_DL4_C)
-#define nh5ltmake_dataset_dl5_c   H5_FC_FUNC_(h5ltmake_dataset_dl5_c, H5LTMAKE_DATASET_DL5_C)
-#define nh5ltmake_dataset_dl6_c   H5_FC_FUNC_(h5ltmake_dataset_dl6_c, H5LTMAKE_DATASET_DL6_C)
-#define nh5ltmake_dataset_dl7_c   H5_FC_FUNC_(h5ltmake_dataset_dl7_c, H5LTMAKE_DATASET_DL7_C)
-#define nh5ltmake_dataset_nint1_c H5_FC_FUNC_(h5ltmake_dataset_nint1_c, H5LTMAKE_DATASET_NINT1_C)
-#define nh5ltmake_dataset_nint2_c H5_FC_FUNC_(h5ltmake_dataset_nint2_c, H5LTMAKE_DATASET_NINT2_C)
-#define nh5ltmake_dataset_nint3_c H5_FC_FUNC_(h5ltmake_dataset_nint3_c, H5LTMAKE_DATASET_NINT3_C)
-#define nh5ltmake_dataset_nint4_c H5_FC_FUNC_(h5ltmake_dataset_nint4_c, H5LTMAKE_DATASET_NINT4_C)
-#define nh5ltmake_dataset_nint5_c H5_FC_FUNC_(h5ltmake_dataset_nint5_c, H5LTMAKE_DATASET_NINT5_C)
-#define nh5ltmake_dataset_nint6_c H5_FC_FUNC_(h5ltmake_dataset_nint6_c, H5LTMAKE_DATASET_NINT6_C)
-#define nh5ltmake_dataset_nint7_c H5_FC_FUNC_(h5ltmake_dataset_nint7_c, H5LTMAKE_DATASET_NINT7_C)
-#define nh5ltmake_dataset_nfl1_c  H5_FC_FUNC_(h5ltmake_dataset_nfl1_c, H5LTMAKE_DATASET_NFL1_C)
-#define nh5ltmake_dataset_nfl2_c  H5_FC_FUNC_(h5ltmake_dataset_nfl2_c, H5LTMAKE_DATASET_NFL2_C)
-#define nh5ltmake_dataset_nfl3_c  H5_FC_FUNC_(h5ltmake_dataset_nfl3_c, H5LTMAKE_DATASET_NFL3_C)
-#define nh5ltmake_dataset_nfl4_c  H5_FC_FUNC_(h5ltmake_dataset_nfl4_c, H5LTMAKE_DATASET_NFL4_C)
-#define nh5ltmake_dataset_nfl5_c  H5_FC_FUNC_(h5ltmake_dataset_nfl5_c, H5LTMAKE_DATASET_NFL5_C)
-#define nh5ltmake_dataset_nfl6_c  H5_FC_FUNC_(h5ltmake_dataset_nfl6_c, H5LTMAKE_DATASET_NFL6_C)
-#define nh5ltmake_dataset_nfl7_c  H5_FC_FUNC_(h5ltmake_dataset_nfl7_c, H5LTMAKE_DATASET_NFL7_C)
-#define nh5ltmake_dataset_ndl1_c  H5_FC_FUNC_(h5ltmake_dataset_ndl1_c, H5LTMAKE_DATASET_NDL1_C)
-#define nh5ltmake_dataset_ndl2_c  H5_FC_FUNC_(h5ltmake_dataset_ndl2_c, H5LTMAKE_DATASET_NDL2_C)
-#define nh5ltmake_dataset_ndl3_c  H5_FC_FUNC_(h5ltmake_dataset_ndl3_c, H5LTMAKE_DATASET_NDL3_C)
-#define nh5ltmake_dataset_ndl4_c  H5_FC_FUNC_(h5ltmake_dataset_ndl4_c, H5LTMAKE_DATASET_NDL4_C)
-#define nh5ltmake_dataset_ndl5_c  H5_FC_FUNC_(h5ltmake_dataset_ndl5_c, H5LTMAKE_DATASET_NDL5_C)
-#define nh5ltmake_dataset_ndl6_c  H5_FC_FUNC_(h5ltmake_dataset_ndl6_c, H5LTMAKE_DATASET_NDL6_C)
-#define nh5ltmake_dataset_ndl7_c  H5_FC_FUNC_(h5ltmake_dataset_ndl7_c, H5LTMAKE_DATASET_NDL7_C)
-#define nh5ltread_dataset_c       H5_FC_FUNC_(h5ltread_dataset_c, H5LTREAD_DATASET_C)
-#define nh5ltread_dataset_int1_c         H5_FC_FUNC_(h5ltread_dataset_int1_c, H5LTREAD_DATASET_INT1_C)
-#define nh5ltread_dataset_int2_c         H5_FC_FUNC_(h5ltread_dataset_int2_c, H5LTREAD_DATASET_INT2_C)
-#define nh5ltread_dataset_int3_c         H5_FC_FUNC_(h5ltread_dataset_int3_c, H5LTREAD_DATASET_INT3_C)
-#define nh5ltread_dataset_int4_c         H5_FC_FUNC_(h5ltread_dataset_int4_c, H5LTREAD_DATASET_INT4_C)
-#define nh5ltread_dataset_int5_c         H5_FC_FUNC_(h5ltread_dataset_int5_c, H5LTREAD_DATASET_INT5_C)
-#define nh5ltread_dataset_int6_c         H5_FC_FUNC_(h5ltread_dataset_int6_c, H5LTREAD_DATASET_INT6_C)
-#define nh5ltread_dataset_int7_c         H5_FC_FUNC_(h5ltread_dataset_int7_c, H5LTREAD_DATASET_INT7_C)
-#define nh5ltread_dataset_fl1_c         H5_FC_FUNC_(h5ltread_dataset_fl1_c, H5LTREAD_DATASET_FL1_C)
-#define nh5ltread_dataset_fl2_c         H5_FC_FUNC_(h5ltread_dataset_fl2_c, H5LTREAD_DATASET_FL2_C)
-#define nh5ltread_dataset_fl3_c         H5_FC_FUNC_(h5ltread_dataset_fl3_c, H5LTREAD_DATASET_FL3_C)
-#define nh5ltread_dataset_fl4_c         H5_FC_FUNC_(h5ltread_dataset_fl4_c, H5LTREAD_DATASET_FL4_C)
-#define nh5ltread_dataset_fl5_c         H5_FC_FUNC_(h5ltread_dataset_fl5_c, H5LTREAD_DATASET_FL5_C)
-#define nh5ltread_dataset_fl6_c         H5_FC_FUNC_(h5ltread_dataset_fl6_c, H5LTREAD_DATASET_FL6_C)
-#define nh5ltread_dataset_fl7_c         H5_FC_FUNC_(h5ltread_dataset_fl7_c, H5LTREAD_DATASET_FL7_C)
-#define nh5ltread_dataset_dl1_c         H5_FC_FUNC_(h5ltread_dataset_dl1_c, H5LTREAD_DATASET_DL1_C)
-#define nh5ltread_dataset_dl2_c         H5_FC_FUNC_(h5ltread_dataset_dl2_c, H5LTREAD_DATASET_DL2_C)
-#define nh5ltread_dataset_dl3_c         H5_FC_FUNC_(h5ltread_dataset_dl3_c, H5LTREAD_DATASET_DL3_C)
-#define nh5ltread_dataset_dl4_c         H5_FC_FUNC_(h5ltread_dataset_dl4_c, H5LTREAD_DATASET_DL4_C)
-#define nh5ltread_dataset_dl5_c         H5_FC_FUNC_(h5ltread_dataset_dl5_c, H5LTREAD_DATASET_DL5_C)
-#define nh5ltread_dataset_dl6_c         H5_FC_FUNC_(h5ltread_dataset_dl6_c, H5LTREAD_DATASET_DL6_C)
-#define nh5ltread_dataset_dl7_c         H5_FC_FUNC_(h5ltread_dataset_dl7_c, H5LTREAD_DATASET_DL7_C)
-#define nh5ltread_dataset_nint1_c         H5_FC_FUNC_(h5ltread_dataset_nint1_c, H5LTREAD_DATASET_NINT1_C)
-#define nh5ltread_dataset_nint2_c         H5_FC_FUNC_(h5ltread_dataset_nint2_c, H5LTREAD_DATASET_NINT2_C)
-#define nh5ltread_dataset_nint3_c         H5_FC_FUNC_(h5ltread_dataset_nint3_c, H5LTREAD_DATASET_NINT3_C)
-#define nh5ltread_dataset_nint4_c         H5_FC_FUNC_(h5ltread_dataset_nint4_c, H5LTREAD_DATASET_NINT4_C)
-#define nh5ltread_dataset_nint5_c         H5_FC_FUNC_(h5ltread_dataset_nint5_c, H5LTREAD_DATASET_NINT5_C)
-#define nh5ltread_dataset_nint6_c         H5_FC_FUNC_(h5ltread_dataset_nint6_c, H5LTREAD_DATASET_NINT6_C)
-#define nh5ltread_dataset_nint7_c         H5_FC_FUNC_(h5ltread_dataset_nint7_c, H5LTREAD_DATASET_NINT7_C)
-#define nh5ltread_dataset_nfl1_c         H5_FC_FUNC_(h5ltread_dataset_nfl1_c, H5LTREAD_DATASET_NFL1_C)
-#define nh5ltread_dataset_nfl2_c         H5_FC_FUNC_(h5ltread_dataset_nfl2_c, H5LTREAD_DATASET_NFL2_C)
-#define nh5ltread_dataset_nfl3_c         H5_FC_FUNC_(h5ltread_dataset_nfl3_c, H5LTREAD_DATASET_NFL3_C)
-#define nh5ltread_dataset_nfl4_c         H5_FC_FUNC_(h5ltread_dataset_nfl4_c, H5LTREAD_DATASET_NFL4_C)
-#define nh5ltread_dataset_nfl5_c         H5_FC_FUNC_(h5ltread_dataset_nfl5_c, H5LTREAD_DATASET_NFL5_C)
-#define nh5ltread_dataset_nfl6_c         H5_FC_FUNC_(h5ltread_dataset_nfl6_c, H5LTREAD_DATASET_NFL6_C)
-#define nh5ltread_dataset_nfl7_c         H5_FC_FUNC_(h5ltread_dataset_nfl7_c, H5LTREAD_DATASET_NFL7_C)
-#define nh5ltread_dataset_ndl1_c         H5_FC_FUNC_(h5ltread_dataset_ndl1_c, H5LTREAD_DATASET_NDL1_C)
-#define nh5ltread_dataset_ndl2_c         H5_FC_FUNC_(h5ltread_dataset_ndl2_c, H5LTREAD_DATASET_NDL2_C)
-#define nh5ltread_dataset_ndl3_c         H5_FC_FUNC_(h5ltread_dataset_ndl3_c, H5LTREAD_DATASET_NDL3_C)
-#define nh5ltread_dataset_ndl4_c         H5_FC_FUNC_(h5ltread_dataset_ndl4_c, H5LTREAD_DATASET_NDL4_C)
-#define nh5ltread_dataset_ndl5_c         H5_FC_FUNC_(h5ltread_dataset_ndl5_c, H5LTREAD_DATASET_NDL5_C)
-#define nh5ltread_dataset_ndl6_c         H5_FC_FUNC_(h5ltread_dataset_ndl6_c, H5LTREAD_DATASET_NDL6_C)
-#define nh5ltread_dataset_ndl7_c         H5_FC_FUNC_(h5ltread_dataset_ndl7_c, H5LTREAD_DATASET_NDL7_C)
-#define nh5ltmake_dataset_string_c  H5_FC_FUNC_(h5ltmake_dataset_string_c, H5LTMAKE_DATASET_STRING_C)
-#define nh5ltread_dataset_string_c  H5_FC_FUNC_(h5ltread_dataset_string_c, H5LTREAD_DATASET_STRING_C)
-
-#define nh5ltset_attribute_int_c    H5_FC_FUNC_(h5ltset_attribute_int_c, H5LTSET_ATTRIBUTE_INT_C)
-#define nh5ltset_attribute_float_c  H5_FC_FUNC_(h5ltset_attribute_float_c, H5LTSET_ATTRIBUTE_FLOAT_C)
-#define nh5ltset_attribute_double_c H5_FC_FUNC_(h5ltset_attribute_double_c, H5LTSET_ATTRIBUTE_DOUBLE_C)
-#define nh5ltset_attribute_string_c H5_FC_FUNC_(h5ltset_attribute_string_c, H5LTSET_ATTRIBUTE_STRING_C)
-
-#define nh5ltget_attribute_int_c    H5_FC_FUNC_(h5ltget_attribute_int_c, H5LTGET_ATTRIBUTE_INT_C)
-#define nh5ltget_attribute_float_c  H5_FC_FUNC_(h5ltget_attribute_float_c, H5LTGET_ATTRIBUTE_FLOAT_C)
-#define nh5ltget_attribute_double_c H5_FC_FUNC_(h5ltget_attribute_double_c, H5LTGET_ATTRIBUTE_DOUBLE_C)
-#define nh5ltget_attribute_string_c H5_FC_FUNC_(h5ltget_attribute_string_c, H5LTGET_ATTRIBUTE_STRING_C)
-
-#define nh5ltget_dataset_ndims_c    H5_FC_FUNC_(h5ltget_dataset_ndims_c, H5LTGET_DATASET_NDIMS_C)
-#define nh5ltfind_dataset_c         H5_FC_FUNC_(h5ltfind_dataset_c, H5LTFIND_DATASET_C)
-#define nh5ltget_dataset_info_c     H5_FC_FUNC_(h5ltget_dataset_info_c, H5LTGET_DATASET_INFO_C)
-
-#define nh5ltget_attribute_ndims_c  H5_FC_FUNC_(h5ltget_attribute_ndims_c, H5LTGET_ATTRIBUTE_NDIMS_C)
-#define nh5ltget_attribute_info_c   H5_FC_FUNC_(h5ltget_attribute_info_c, H5LTGET_ATTRIBUTE_INFO_C)
-#define nh5ltpath_valid_c           H5_FC_FUNC_(h5ltpath_valid_c, H5LTPATH_VALID_C)
-
-/*-------------------------------------------------------------------------
-* Image
-*-------------------------------------------------------------------------
-*/
-#define nh5immake_image_8bit_c      H5_FC_FUNC_(h5immake_image_8bit_c, H5IMMAKE_IMAGE_8BIT_C)
-#define nh5immake_image_24bit_c     H5_FC_FUNC_(h5immake_image_24bit_c, H5IMMAKE_IMAGE_24BIT_C)
-#define nh5imread_image_c           H5_FC_FUNC_(h5imread_image_c, H5IMREAD_IMAGE_C)
-#define nh5imget_image_info_c       H5_FC_FUNC_(h5imget_image_info_c, H5IMGET_IMAGE_INFO_C)
-#define nh5imis_image_c             H5_FC_FUNC_(h5imis_image_c, H5IMIS_IMAGE_C)
-#define nh5immake_palette_c         H5_FC_FUNC_(h5immake_palette_c, H5IMMAKE_PALETTE_C)
-#define nh5imlink_palette_c         H5_FC_FUNC_(h5imlink_palette_c, H5IMLINK_PALETTE_C)
-#define nh5imunlink_palette_c       H5_FC_FUNC_(h5imunlink_palette_c, H5IMUNLINK_PALETTE_C)
-#define nh5imget_npalettes_c        H5_FC_FUNC_(h5imget_npalettes_c, H5IMGET_NPALETTES_C)
-#define nh5imget_palette_info_c     H5_FC_FUNC_(h5imget_palette_info_c, H5IMGET_PALETTE_INFO_C)
-#define nh5imget_palette_c          H5_FC_FUNC_(h5imget_palette_c, H5IMGET_PALETTE_C)
-#define nh5imis_palette_c           H5_FC_FUNC_(h5imis_palette_c, H5IMIS_PALETTE_C)
-
-/*-------------------------------------------------------------------------
-* Table
-*-------------------------------------------------------------------------
-*/
-#define nh5tbmake_table_c           H5_FC_FUNC_(h5tbmake_table_c, H5TBMAKE_TABLE_C)
-#define nh5tbwrite_field_name_c     H5_FC_FUNC_(h5tbwrite_field_name_c, H5TBWRITE_FIELD_NAME_C)
-#define nh5tbwrite_field_name_int_c    H5_FC_FUNC_(h5tbwrite_field_name_int_c, H5TBWRITE_FIELD_NAME_INT_C)
-#define nh5tbwrite_field_name_fl_c     H5_FC_FUNC_(h5tbwrite_field_name_fl_c, H5TBWRITE_FIELD_NAME_FL_C)
-#define nh5tbwrite_field_name_dl_c     H5_FC_FUNC_(h5tbwrite_field_name_dl_c, H5TBWRITE_FIELD_NAME_DL_C)
-#define nh5tbwrite_field_name_st_c     H5_FC_FUNC_(h5tbwrite_field_name_st_c, H5TBWRITE_FIELD_NAME_ST_C)
-#define nh5tbread_field_name_c      H5_FC_FUNC_(h5tbread_field_name_c, H5TBREAD_FIELD_NAME_C)
-#define nh5tbread_field_name_int_c     H5_FC_FUNC_(h5tbread_field_name_int_c, H5TBREAD_FIELD_NAME_INT_C)
-#define nh5tbread_field_name_fl_c      H5_FC_FUNC_(h5tbread_field_name_fl_c, H5TBREAD_FIELD_NAME_FL_C)
-#define nh5tbread_field_name_dl_c      H5_FC_FUNC_(h5tbread_field_name_dl_c, H5TBREAD_FIELD_NAME_DL_C)
-#define nh5tbread_field_name_st_c      H5_FC_FUNC_(h5tbread_field_name_st_c, H5TBREAD_FIELD_NAME_ST_C)
-#define nh5tbwrite_field_index_c    H5_FC_FUNC_(h5tbwrite_field_index_c, H5TBWRITE_FIELD_INDEX_C)
-#define nh5tbwrite_field_index_int_c   H5_FC_FUNC_(h5tbwrite_field_index_int_c, H5TBWRITE_FIELD_INDEX_INT_C)
-#define nh5tbwrite_field_index_fl_c    H5_FC_FUNC_(h5tbwrite_field_index_fl_c, H5TBWRITE_FIELD_INDEX_FL_C)
-#define nh5tbwrite_field_index_dl_c    H5_FC_FUNC_(h5tbwrite_field_index_dl_c, H5TBWRITE_FIELD_INDEX_DL_C)
-#define nh5tbwrite_field_index_st_c    H5_FC_FUNC_(h5tbwrite_field_index_st_c, H5TBWRITE_FIELD_INDEX_ST_C)
-#define nh5tbread_field_index_c     H5_FC_FUNC_(h5tbread_field_index_c, H5TBREAD_FIELD_INDEX_C)
-#define nh5tbread_field_index_int_c    H5_FC_FUNC_(h5tbread_field_index_int_c, H5TBREAD_FIELD_INDEX_INT_C)
-#define nh5tbread_field_index_fl_c     H5_FC_FUNC_(h5tbread_field_index_fl_c, H5TBREAD_FIELD_INDEX_FL_C)
-#define nh5tbread_field_index_dl_c     H5_FC_FUNC_(h5tbread_field_index_dl_c, H5TBREAD_FIELD_INDEX_DL_C)
-#define nh5tbread_field_index_st_c     H5_FC_FUNC_(h5tbread_field_index_st_c, H5TBREAD_FIELD_INDEX_ST_C)
-#define nh5tbinsert_field_c         H5_FC_FUNC_(h5tbinsert_field_c, H5TBINSERT_FIELD_C)
-#define nh5tbinsert_field_int_c        H5_FC_FUNC_(h5tbinsert_field_int_c, H5TBINSERT_FIELD_INT_C)
-#define nh5tbinsert_field_fl_c         H5_FC_FUNC_(h5tbinsert_field_fl_c, H5TBINSERT_FIELD_FL_C)
-#define nh5tbinsert_field_dl_c         H5_FC_FUNC_(h5tbinsert_field_dl_c, H5TBINSERT_FIELD_DL_C)
-#define nh5tbinsert_field_st_c         H5_FC_FUNC_(h5tbinsert_field_st_c, H5TBINSERT_FIELD_ST_C)
-#define nh5tbdelete_field_c         H5_FC_FUNC_(h5tbdelete_field_c, H5TBDELETE_FIELD_C)
-#define nh5tbget_table_info_c       H5_FC_FUNC_(h5tbget_table_info_c, H5TBGET_TABLE_INFO_C)
-#define nh5tbget_field_info_c       H5_FC_FUNC_(h5tbget_field_info_c, H5TBGET_FIELD_INFO_C)
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5dsset_scale_c(hid_t_f *dsid, _fcd dimname, size_t_f *dimnamelen);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5dsattach_scale_c( hid_t_f *did, hid_t_f *dsid, int_f *idx);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5dsdetach_scale_c( hid_t_f *did, hid_t_f *dsid, int_f *idx);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5dsis_attached_c( hid_t_f *did, hid_t_f *dsid, int_f *idx, int_f *c_is_attached);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5dsis_scale_c(hid_t_f *did, int_f *is_scale);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5dsset_label_c(hid_t_f *did, int_f *idx, _fcd label, size_t_f *labellen);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5dsget_label_c(hid_t_f *did, int_f *idx, _fcd label, size_t_f *size);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5dsget_scale_name_c(hid_t_f *did, _fcd label, size_t_f *size);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5dsget_num_scales_c( hid_t_f *did, int_f *idx, int_f *num_scales);
-
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltmake_dataset_c (hid_t_f *loc_id,
-                     size_t_f *namelen,
-                     _fcd name,
-                     int_f *rank,
-                     hsize_t_f *dims,
-                     hid_t_f *type_id,
-                     void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltmake_dataset_int1_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          int_f *rank,
-                          hsize_t_f *dims,
-                          hid_t_f *type_id,
-                          void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltmake_dataset_int2_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          int_f *rank,
-                          hsize_t_f *dims,
-                          hid_t_f *type_id,
-                          void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltmake_dataset_int3_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          int_f *rank,
-                          hsize_t_f *dims,
-                          hid_t_f *type_id,
-                          void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltmake_dataset_int4_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          int_f *rank,
-                          hsize_t_f *dims,
-                          hid_t_f *type_id,
-                          void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltmake_dataset_int5_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          int_f *rank,
-                          hsize_t_f *dims,
-                          hid_t_f *type_id,
-                          void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltmake_dataset_int6_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          int_f *rank,
-                          hsize_t_f *dims,
-                          hid_t_f *type_id,
-                          void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltmake_dataset_int7_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          int_f *rank,
-                          hsize_t_f *dims,
-                          hid_t_f *type_id,
-                          void *buf);
-
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltmake_dataset_fl1_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         int_f *rank,
-                         hsize_t_f *dims,
-                         hid_t_f *type_id,
-                         void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltmake_dataset_fl2_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         int_f *rank,
-                         hsize_t_f *dims,
-                         hid_t_f *type_id,
-                         void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltmake_dataset_fl3_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         int_f *rank,
-                         hsize_t_f *dims,
-                         hid_t_f *type_id,
-                         void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltmake_dataset_fl4_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         int_f *rank,
-                         hsize_t_f *dims,
-                         hid_t_f *type_id,
-                         void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltmake_dataset_fl5_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         int_f *rank,
-                         hsize_t_f *dims,
-                         hid_t_f *type_id,
-                         void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltmake_dataset_fl6_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         int_f *rank,
-                         hsize_t_f *dims,
-                         hid_t_f *type_id,
-                         void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltmake_dataset_fl7_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         int_f *rank,
-                         hsize_t_f *dims,
-                         hid_t_f *type_id,
-                         void *buf);
-
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltmake_dataset_dl1_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         int_f *rank,
-                         hsize_t_f *dims,
-                         hid_t_f *type_id,
-                         void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltmake_dataset_dl2_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         int_f *rank,
-                         hsize_t_f *dims,
-                         hid_t_f *type_id,
-                         void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltmake_dataset_dl3_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         int_f *rank,
-                         hsize_t_f *dims,
-                         hid_t_f *type_id,
-                         void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltmake_dataset_dl4_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         int_f *rank,
-                         hsize_t_f *dims,
-                         hid_t_f *type_id,
-                         void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltmake_dataset_dl5_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         int_f *rank,
-                         hsize_t_f *dims,
-                         hid_t_f *type_id,
-                         void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltmake_dataset_dl6_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         int_f *rank,
-                         hsize_t_f *dims,
-                         hid_t_f *type_id,
-                         void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltmake_dataset_dl7_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         int_f *rank,
-                         hsize_t_f *dims,
-                         hid_t_f *type_id,
-                         void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltmake_dataset_nint1_c (hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd name,
-                           int_f *rank,
-                           hsize_t_f *dims,
-                           hid_t_f *type_id,
-                           void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltmake_dataset_nint2_c (hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd name,
-                           int_f *rank,
-                           hsize_t_f *dims,
-                           hid_t_f *type_id,
-                           void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltmake_dataset_nint3_c (hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd name,
-                           int_f *rank,
-                           hsize_t_f *dims,
-                           hid_t_f *type_id,
-                           void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltmake_dataset_nint4_c (hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd name,
-                           int_f *rank,
-                           hsize_t_f *dims,
-                           hid_t_f *type_id,
-                           void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltmake_dataset_nint5_c (hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd name,
-                           int_f *rank,
-                           hsize_t_f *dims,
-                           hid_t_f *type_id,
-                           void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltmake_dataset_nint6_c (hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd name,
-                           int_f *rank,
-                           hsize_t_f *dims,
-                           hid_t_f *type_id,
-                           void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltmake_dataset_nint7_c (hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd name,
-                           int_f *rank,
-                           hsize_t_f *dims,
-                           hid_t_f *type_id,
-                           void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltmake_dataset_nfl1_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          int_f *rank,
-                          hsize_t_f *dims,
-                          hid_t_f *type_id,
-                          void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltmake_dataset_nfl2_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          int_f *rank,
-                          hsize_t_f *dims,
-                          hid_t_f *type_id,
-                          void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltmake_dataset_nfl3_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          int_f *rank,
-                          hsize_t_f *dims,
-                          hid_t_f *type_id,
-                          void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltmake_dataset_nfl4_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          int_f *rank,
-                          hsize_t_f *dims,
-                          hid_t_f *type_id,
-                          void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltmake_dataset_nfl5_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          int_f *rank,
-                          hsize_t_f *dims,
-                          hid_t_f *type_id,
-                          void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltmake_dataset_nfl6_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          int_f *rank,
-                          hsize_t_f *dims,
-                          hid_t_f *type_id,
-                          void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltmake_dataset_nfl7_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          int_f *rank,
-                          hsize_t_f *dims,
-                          hid_t_f *type_id,
-                          void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltmake_dataset_ndl1_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          int_f *rank,
-                          hsize_t_f *dims,
-                          hid_t_f *type_id,
-                          void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltmake_dataset_ndl2_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          int_f *rank,
-                          hsize_t_f *dims,
-                          hid_t_f *type_id,
-                          void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltmake_dataset_ndl3_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          int_f *rank,
-                          hsize_t_f *dims,
-                          hid_t_f *type_id,
-                          void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltmake_dataset_ndl4_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          int_f *rank,
-                          hsize_t_f *dims,
-                          hid_t_f *type_id,
-                          void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltmake_dataset_ndl5_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          int_f *rank,
-                          hsize_t_f *dims,
-                          hid_t_f *type_id,
-                          void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltmake_dataset_ndl6_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          int_f *rank,
-                          hsize_t_f *dims,
-                          hid_t_f *type_id,
-                          void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltmake_dataset_ndl7_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          int_f *rank,
-                          hsize_t_f *dims,
-                          hid_t_f *type_id,
-                          void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltread_dataset_c (hid_t_f *loc_id,
-                     size_t_f *namelen,
-                     _fcd name,
-                     hid_t_f *type_id,
-                     void *buf,
-                     hsize_t_f *dims);
-
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltread_dataset_int1_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          hid_t_f *type_id,
-                          void *buf,
-                          hsize_t_f *dims);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltread_dataset_int2_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          hid_t_f *type_id,
-                          void *buf,
-                          hsize_t_f *dims);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltread_dataset_int3_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          hid_t_f *type_id,
-                          void *buf,
-                          hsize_t_f *dims);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltread_dataset_int4_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          hid_t_f *type_id,
-                          void *buf,
-                          hsize_t_f *dims);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltread_dataset_int5_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          hid_t_f *type_id,
-                          void *buf,
-                          hsize_t_f *dims);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltread_dataset_int6_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          hid_t_f *type_id,
-                          void *buf,
-                          hsize_t_f *dims);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltread_dataset_int7_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          hid_t_f *type_id,
-                          void *buf,
-                          hsize_t_f *dims);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltread_dataset_fl1_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         hid_t_f *type_id,
-                         void *buf,
-                         hsize_t_f *dims);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltread_dataset_fl2_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         hid_t_f *type_id,
-                         void *buf,
-                         hsize_t_f *dims);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltread_dataset_fl3_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         hid_t_f *type_id,
-                         void *buf,
-                         hsize_t_f *dims);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltread_dataset_fl4_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         hid_t_f *type_id,
-                         void *buf,
-                         hsize_t_f *dims);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltread_dataset_fl5_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         hid_t_f *type_id,
-                         void *buf,
-                         hsize_t_f *dims);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltread_dataset_fl6_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         hid_t_f *type_id,
-                         void *buf,
-                         hsize_t_f *dims);
-
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltread_dataset_fl7_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         hid_t_f *type_id,
-                         void *buf,
-                         hsize_t_f *dims);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltread_dataset_dl1_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         hid_t_f *type_id,
-                         void *buf,
-                         hsize_t_f *dims);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltread_dataset_dl2_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         hid_t_f *type_id,
-                         void *buf,
-                         hsize_t_f *dims);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltread_dataset_dl3_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         hid_t_f *type_id,
-                         void *buf,
-                         hsize_t_f *dims);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltread_dataset_dl4_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         hid_t_f *type_id,
-                         void *buf,
-                         hsize_t_f *dims);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltread_dataset_dl5_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         hid_t_f *type_id,
-                         void *buf,
-                         hsize_t_f *dims);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltread_dataset_dl6_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         hid_t_f *type_id,
-                         void *buf,
-                         hsize_t_f *dims);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltread_dataset_dl7_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         hid_t_f *type_id,
-                         void *buf,
-                         hsize_t_f *dims);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltread_dataset_nint1_c (hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd name,
-                           hid_t_f *type_id,
-                           void *buf,
-                           hsize_t_f *dims);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltread_dataset_nint2_c (hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd name,
-                           hid_t_f *type_id,
-                           void *buf,
-                           hsize_t_f *dims);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltread_dataset_nint3_c (hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd name,
-                           hid_t_f *type_id,
-                           void *buf,
-                           hsize_t_f *dims);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltread_dataset_nint4_c (hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd name,
-                           hid_t_f *type_id,
-                           void *buf,
-                           hsize_t_f *dims);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltread_dataset_nint5_c (hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd name,
-                           hid_t_f *type_id,
-                           void *buf,
-                           hsize_t_f *dims);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltread_dataset_nint6_c (hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd name,
-                           hid_t_f *type_id,
-                           void *buf,
-                           hsize_t_f *dims);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltread_dataset_nint7_c (hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd name,
-                           hid_t_f *type_id,
-                           void *buf,
-                           hsize_t_f *dims);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltread_dataset_nfl1_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          hid_t_f *type_id,
-                          void *buf,
-                          hsize_t_f *dims);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltread_dataset_nfl2_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          hid_t_f *type_id,
-                          void *buf,
-                          hsize_t_f *dims);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltread_dataset_nfl3_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          hid_t_f *type_id,
-                          void *buf,
-                          hsize_t_f *dims);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltread_dataset_nfl4_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          hid_t_f *type_id,
-                          void *buf,
-                          hsize_t_f *dims);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltread_dataset_nfl5_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          hid_t_f *type_id,
-                          void *buf,
-                          hsize_t_f *dims);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltread_dataset_nfl6_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          hid_t_f *type_id,
-                          void *buf,
-                          hsize_t_f *dims);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltread_dataset_nfl7_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          hid_t_f *type_id,
-                          void *buf,
-                          hsize_t_f *dims);
-
 HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltread_dataset_ndl1_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          hid_t_f *type_id,
-                          void *buf,
-                          hsize_t_f *dims);
+int_f h5dsset_scale_c(hid_t_f *dsid, _fcd dimname, size_t_f *dimnamelen);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltread_dataset_ndl2_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          hid_t_f *type_id,
-                          void *buf,
-                          hsize_t_f *dims);
+int_f h5dsattach_scale_c(hid_t_f *did, hid_t_f *dsid, int_f *idx);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltread_dataset_ndl3_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          hid_t_f *type_id,
-                          void *buf,
-                          hsize_t_f *dims);
+int_f h5dsdetach_scale_c(hid_t_f *did, hid_t_f *dsid, int_f *idx);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltread_dataset_ndl4_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          hid_t_f *type_id,
-                          void *buf,
-                          hsize_t_f *dims);
+int_f h5dsis_attached_c(hid_t_f *did, hid_t_f *dsid, int_f *idx, int_f *c_is_attached);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltread_dataset_ndl5_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          hid_t_f *type_id,
-                          void *buf,
-                          hsize_t_f *dims);
+int_f h5dsis_scale_c(hid_t_f *did, int_f *is_scale);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltread_dataset_ndl6_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          hid_t_f *type_id,
-                          void *buf,
-                          hsize_t_f *dims);
+int_f h5dsset_label_c(hid_t_f *did, int_f *idx, _fcd label, size_t_f *labellen);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltread_dataset_ndl7_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          hid_t_f *type_id,
-                          void *buf,
-                          hsize_t_f *dims);
+int_f h5dsget_label_c(hid_t_f *did, int_f *idx, _fcd label, size_t_f *size);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltset_attribute_int_c(hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd dsetname,
-                         size_t_f *attrnamelen,
-                         _fcd attrname,
-                         size_t_f *size,
-                         void *buf);
+int_f h5dsget_scale_name_c(hid_t_f *did, _fcd label, size_t_f *size);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltset_attribute_float_c(hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd dsetname,
-                           size_t_f *attrnamelen,
-                           _fcd attrname,
-                           size_t_f *size,
-                           void *buf);
+int_f h5dsget_num_scales_c(hid_t_f *did, int_f *idx, int_f *num_scales);
 
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltset_attribute_double_c(hid_t_f *loc_id,
-                            size_t_f *namelen,
-                            _fcd dsetname,
-                            size_t_f *attrnamelen,
-                            _fcd attrname,
-                            size_t_f *size,
-                            void *buf);
+/*
+ *  Functions from H5LTfc.c
+ */
 
 HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltset_attribute_string_c(hid_t_f *loc_id,
-                            size_t_f *namelen,
-                            _fcd dsetname,
-                            size_t_f *attrnamelen,
-                            _fcd attrname,
-                            size_t_f *buflen,
-                            void *buf);
-
+int_f h5ltmake_dataset_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *rank, hsize_t_f *dims,
+                         hid_t_f *type_id, void *buf);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltget_attribute_int_c(hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd dsetname,
-                         size_t_f *attrnamelen,
-                         _fcd attrname,
-                         void *buf);
+int_f h5ltread_dataset_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hid_t_f *type_id, void *buf);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltget_attribute_float_c(hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd dsetname,
-                           size_t_f *attrnamelen,
-                           _fcd attrname,
-                           void *buf);
+int_f h5ltset_attribute_c(hid_t_f *loc_id, size_t_f *namelen, _fcd dsetname, size_t_f *attrnamelen,
+                          _fcd attrname, size_t_f *size, void *buf, char *dtype, size_t_f *sizeof_val);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltget_attribute_double_c(hid_t_f *loc_id,
-                            size_t_f *namelen,
-                            _fcd dsetname,
-                            size_t_f *attrnamelen,
-                            _fcd attrname,
-                            void *buf);
+int_f h5ltget_attribute_c(hid_t_f *loc_id, size_t_f *namelen, _fcd dsetname, size_t_f *attrnamelen,
+                          _fcd attrname, void *buf, char *dtype, size_t_f *sizeof_val);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltget_attribute_string_c(hid_t_f *loc_id,
-                            size_t_f *namelen,
-                            _fcd dsetname,
-                            size_t_f *attrnamelen,
-                            _fcd attrname,
-                            _fcd buf,
-                            size_t_f *buf_size);
+int_f h5ltget_attribute_string_c(hid_t_f *loc_id, size_t_f *namelen, _fcd dsetname, size_t_f *attrnamelen,
+                                 _fcd attrname, _fcd buf, size_t_f *buf_size);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltget_dataset_ndims_c(hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         int_f *rank);
+int_f h5ltget_dataset_ndims_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *rank);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltfind_dataset_c(hid_t_f *loc_id,
-                    size_t_f *namelen,
-                    _fcd name);
+int_f h5ltfind_dataset_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltget_dataset_info_c(hid_t_f *loc_id,
-                        size_t_f *namelen,
-                        _fcd name,
-                        hsize_t_f *dims,
-                        int_f *type_class,
-                        size_t_f *type_size);
+int_f h5ltget_dataset_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *dims,
+                             int_f *type_class, size_t_f *type_size);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltget_attribute_ndims_c(hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd dsetname,
-                           size_t_f *attrnamelen,
-                           _fcd attrname,
-                           int_f *rank);
+int_f h5ltget_attribute_ndims_c(hid_t_f *loc_id, size_t_f *namelen, _fcd dsetname, size_t_f *attrnamelen,
+                                _fcd attrname, int_f *rank);
 HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltget_attribute_info_c(hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          size_t_f *attrnamelen,
-                          _fcd attrname,
-                          hsize_t_f *dims,
-                          int_f *type_class,
-                          size_t_f *type_size);
+int_f h5ltget_attribute_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *attrnamelen,
+                               _fcd attrname, hsize_t_f *dims, int_f *type_class, size_t_f *type_size);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltmake_dataset_string_c (hid_t_f *loc_id,
-                            size_t_f *namelen,
-                            _fcd name,
-                            size_t_f *buflen,
-                            char *buf);
+int_f h5ltmake_dataset_string_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *buflen, char *buf);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltread_dataset_string_c (hid_t_f *loc_id,
-                            size_t_f *namelen,
-                            _fcd name,
-                            char *buf);
+int_f h5ltread_dataset_string_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, char *buf);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-nh5ltpath_valid_c(hid_t_f *loc_id, 
-                  _fcd path, 
-                  size_t_f *pathlen, 
-                  int_f *check_object_valid_c);
+int_f h5ltpath_valid_c(hid_t_f *loc_id, _fcd path, size_t_f *pathlen, int_f *check_object_valid_c);
 
 /*-------------------------------------------------------------------------
-* Image
-*-------------------------------------------------------------------------
-*/
-
+ * Image
+ *-------------------------------------------------------------------------
+ */
 HDF5_HL_F90CSTUBDLL
-int_f
-nh5immake_image_8bit_c (hid_t_f *loc_id,
-                        size_t_f *namelen,
-                        _fcd name,
-                        hsize_t_f *width,
-                        hsize_t_f *height,
-                        int_f *buf);
+int_f h5immake_image_8bit_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *width,
+                            hsize_t_f *height, int_f *buf);
 HDF5_HL_F90CSTUBDLL
-int_f
-nh5imread_image_c (hid_t_f *loc_id,
-                   size_t_f *namelen,
-                   _fcd name,
-                   int_f *buf);
+int_f h5imread_image_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *buf);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-nh5immake_image_24bit_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         size_t_f *ilen,
-                         _fcd il,
-                         hsize_t_f *width,
-                         hsize_t_f *height,
-                         void *buf);
+int_f h5immake_image_24bit_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *ilen, _fcd il,
+                             hsize_t_f *width, hsize_t_f *height, void *buf);
 HDF5_HL_F90CSTUBDLL
-int_f
-nh5imget_image_info_c(hid_t_f *loc_id,
-                      size_t_f *namelen,
-                      _fcd name,
-                      hsize_t_f *width,
-                      hsize_t_f *height,
-                      hsize_t_f *planes,
-                      hsize_t_f *npals,
-                      size_t_f *ilen,
-                      _fcd interlace);
-
+int_f h5imget_image_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *width, hsize_t_f *height,
+                           hsize_t_f *planes, hsize_t_f *npals, size_t_f *ilen, _fcd interlace);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-nh5imis_image_c(hid_t_f *loc_id,
-                size_t_f *namelen,
-                _fcd name);
-
+int_f h5imis_image_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-nh5immake_palette_c (hid_t_f *loc_id,
-                     size_t_f *namelen,
-                     _fcd name,
-                     hsize_t_f *dims,
-                     void *buf);
+int_f h5immake_palette_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *dims, void *buf);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-nh5imlink_palette_c (hid_t_f *loc_id,
-                     size_t_f *namelen,
-                     _fcd name,
-                     size_t_f *ilen,
-                     _fcd pal_name);
+int_f h5imlink_palette_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *ilen, _fcd pal_name);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-nh5imunlink_palette_c (hid_t_f *loc_id,
-                       size_t_f *namelen,
-                       _fcd name,
-                       size_t_f *ilen,
-                       _fcd pal_name);
+int_f h5imunlink_palette_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *ilen, _fcd pal_name);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-nh5imget_npalettes_c(hid_t_f *loc_id,
-                     size_t_f *namelen,
-                     _fcd name,
-                     hsize_t_f *npals);
-
+int_f h5imget_npalettes_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *npals);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-nh5imget_palette_info_c(hid_t_f *loc_id,
-                        size_t_f *namelen,
-                        _fcd name,
-                        int_f *pal_number,
-                        hsize_t_f *dims);
+int_f h5imget_palette_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *pal_number,
+                             hsize_t_f *dims);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-nh5imget_palette_c(hid_t_f *loc_id,
-                   size_t_f *namelen,
-                   _fcd name,
-                   int_f *pal_number,
-                   void *buf);
+int_f h5imget_palette_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *pal_number, void *buf);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-nh5imis_palette_c(hid_t_f *loc_id,
-                  size_t_f *namelen,
-                  _fcd name);
-
-
+int_f h5imis_palette_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name);
 
 /*-------------------------------------------------------------------------
-* Table
-*-------------------------------------------------------------------------
-*/
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5tbmake_table_c(size_t_f *namelen1,
-                  _fcd name1,
-                  hid_t_f *loc_id,
-                  size_t_f *namelen,
-                  _fcd name,
-                  hsize_t_f *nfields,
-                  hsize_t_f *nrecords,
-                  size_t_f *type_size,
-                  size_t_f *field_offset,
-                  hid_t_f *field_types,
-                  hsize_t_f *chunk_size,
-                  int_f *compress,
-                  size_t_f *char_len_field_names, /* field_names lenghts */
-                  size_t_f *max_char_size_field_names, /* char len of fields */
-                  _fcd buf);          /* field_names */
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5tbwrite_field_name_c(hid_t_f *loc_id,
-                        size_t_f *namelen,
-                        _fcd name,
-                        size_t_f *namelen1,
-                        _fcd field_name,
-                        hsize_t_f *start,
-                        hsize_t_f *nrecords,
-                        size_t_f *type_size,
-                        void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5tbwrite_field_name_int_c(hid_t_f *loc_id,
-                            size_t_f *namelen,
-                            _fcd name,
-                            size_t_f *namelen1,
-                            _fcd field_name,
-                            hsize_t_f *start,
-                            hsize_t_f *nrecords,
-                            size_t_f *type_size,
-                            void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5tbwrite_field_name_fl_c(hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd name,
-                           size_t_f *namelen1,
-                           _fcd field_name,
-                           hsize_t_f *start,
-                           hsize_t_f *nrecords,
-                           size_t_f *type_size,
-                           void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5tbwrite_field_name_dl_c(hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd name,
-                           size_t_f *namelen1,
-                           _fcd field_name,
-                           hsize_t_f *start,
-                           hsize_t_f *nrecords,
-                           size_t_f *type_size,
-                           void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5tbwrite_field_name_st_c(hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd name,
-                           size_t_f *namelen1,
-                           _fcd field_name,
-                           hsize_t_f *start,
-                           hsize_t_f *nrecords,
-                           size_t_f *type_size,
-                           void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5tbread_field_name_c(hid_t_f *loc_id,
-                       size_t_f *namelen,
-                       _fcd name,
-                       size_t_f *namelen1,
-                       _fcd field_name,
-                       hsize_t_f *start,
-                       hsize_t_f *nrecords,
-                       size_t_f *type_size,
-                       void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5tbread_field_name_int_c(hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd name,
-                           size_t_f *namelen1,
-                           _fcd field_name,
-                           hsize_t_f *start,
-                           hsize_t_f *nrecords,
-                           size_t_f *type_size,
-                           void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5tbread_field_name_fl_c(hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          size_t_f *namelen1,
-                          _fcd field_name,
-                          hsize_t_f *start,
-                          hsize_t_f *nrecords,
-                          size_t_f *type_size,
-                          void *buf);
+ * Table
+ *-------------------------------------------------------------------------
+ */
 
 HDF5_HL_F90CSTUBDLL
-int_f
-nh5tbread_field_name_dl_c(hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          size_t_f *namelen1,
-                          _fcd field_name,
-                          hsize_t_f *start,
-                          hsize_t_f *nrecords,
-                          size_t_f *type_size,
-                          void *buf);
+int_f h5tbmake_table_c(size_t_f *namelen1, _fcd name1, hid_t_f *loc_id, size_t_f *namelen, _fcd name,
+                       hsize_t_f *nfields, hsize_t_f *nrecords, size_t_f *type_size, size_t_f *field_offset,
+                       hid_t_f *field_types, hsize_t_f *chunk_size, int_f *compress,
+                       size_t_f *char_len_field_names,      /* field_names lengths */
+                       size_t_f *max_char_size_field_names, /* char len of fields */
+                       _fcd      buf);                           /* field_names */
 
 HDF5_HL_F90CSTUBDLL
-int_f
-nh5tbread_field_name_st_c(hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          size_t_f *namelen1,
-                          _fcd field_name,
-                          hsize_t_f *start,
-                          hsize_t_f *nrecords,
-                          size_t_f *type_size,
-                          void *buf);
+int_f h5tbread_table_c(hid_t_f *loc_id, _fcd name, size_t_f *namelen, hsize_t_f *nfields, size_t_f *dst_size,
+                       size_t_f *dst_offset, size_t_f *dst_sizes, void *dst_buf);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-nh5tbwrite_field_index_c(hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         int_f *field_index,
-                         hsize_t_f *start,
-                         hsize_t_f *nrecords,
-                         size_t_f *type_size,
-                         void *buf);
+int_f h5tbmake_table_ptr_c(size_t_f *namelen1, _fcd name1, hid_t_f *loc_id, size_t_f *namelen, _fcd name,
+                           hsize_t_f *nfields, hsize_t_f *nrecords, size_t_f *type_size,
+                           size_t_f *field_offset, hid_t_f *field_types, hsize_t_f *chunk_size,
+                           void *fill_data, int_f *compress,
+                           size_t_f *char_len_field_names,      /* field_names lengths */
+                           size_t_f *max_char_size_field_names, /* char len of fields */
+                           char     *field_names,               /* field_names */
+                           void     *data);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-nh5tbwrite_field_index_int_c(hid_t_f *loc_id,
-                             size_t_f *namelen,
-                             _fcd name,
-                             int_f *field_index,
-                             hsize_t_f *start,
-                             hsize_t_f *nrecords,
-                             size_t_f *type_size,
+int_f h5tbwrite_field_name_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *namelen1,
+                             _fcd field_name, hsize_t_f *start, hsize_t_f *nrecords, size_t_f *type_size,
                              void *buf);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-nh5tbwrite_field_index_fl_c(hid_t_f *loc_id,
-                            size_t_f *namelen,
-                            _fcd name,
-                            int_f *field_index,
-                            hsize_t_f *start,
-                            hsize_t_f *nrecords,
-                            size_t_f *type_size,
+int_f h5tbread_field_name_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *namelen1,
+                            _fcd field_name, hsize_t_f *start, hsize_t_f *nrecords, size_t_f *type_size,
                             void *buf);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-nh5tbwrite_field_index_dl_c(hid_t_f *loc_id,
-                            size_t_f *namelen,
-                            _fcd name,
-                            int_f *field_index,
-                            hsize_t_f *start,
-                            hsize_t_f *nrecords,
-                            size_t_f *type_size,
-                            void *buf);
+int_f h5tbwrite_field_index_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *field_index,
+                              hsize_t_f *start, hsize_t_f *nrecords, size_t_f *type_size, void *buf);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-nh5tbwrite_field_index_st_c(hid_t_f *loc_id,
-                            size_t_f *namelen,
-                            _fcd name,
-                            int_f *field_index,
-                            hsize_t_f *start,
-                            hsize_t_f *nrecords,
-                            size_t_f *type_size,
-                            void *buf);
+int_f h5tbread_field_index_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *field_index,
+                             hsize_t_f *start, hsize_t_f *nrecords, size_t_f *type_size, void *buf);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-nh5tbread_field_index_c(hid_t_f *loc_id,
-                        size_t_f *namelen,
-                        _fcd name,
-                        int_f *field_index,
-                        hsize_t_f *start,
-                        hsize_t_f *nrecords,
-                        size_t_f *type_size,
-                        void *buf);
+int_f h5tbinsert_field_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *namelen1, _fcd field_name,
+                         hid_t_f *field_type, int_f *position, void *buf);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-nh5tbread_field_index_int_c(hid_t_f *loc_id,
-                            size_t_f *namelen,
-                            _fcd name,
-                            int_f *field_index,
-                            hsize_t_f *start,
-                            hsize_t_f *nrecords,
-                            size_t_f *type_size,
-                            void *buf);
+int_f h5tbdelete_field_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *namelen1, _fcd field_name);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-nh5tbread_field_index_fl_c(hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd name,
-                           int_f *field_index,
-                           hsize_t_f *start,
-                           hsize_t_f *nrecords,
-                           size_t_f *type_size,
-                           void *buf);
+int_f h5tbget_table_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *nfields,
+                           hsize_t_f *nrecords);
 
 HDF5_HL_F90CSTUBDLL
-int_f
-nh5tbread_field_index_dl_c(hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd name,
-                           int_f *field_index,
-                           hsize_t_f *start,
-                           hsize_t_f *nrecords,
-                           size_t_f *type_size,
-                           void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5tbread_field_index_st_c(hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd name,
-                           int_f *field_index,
-                           hsize_t_f *start,
-                           hsize_t_f *nrecords,
-                           size_t_f *type_size,
-                           void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5tbinsert_field_c(hid_t_f *loc_id,
-                    size_t_f *namelen,
-                    _fcd name,
-                    size_t_f *namelen1,
-                    _fcd field_name,
-                    hid_t_f *field_type,
-                    int_f *position,
-                    void *buf);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5tbinsert_field_int_c(hid_t_f *loc_id,
-                        size_t_f *namelen,
-                        _fcd name,
-                        size_t_f *namelen1,
-                        _fcd field_name,
-                        hid_t_f *field_type,
-                        int_f *position,
-                        void *buf);
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5tbinsert_field_fl_c(hid_t_f *loc_id,
-                       size_t_f *namelen,
-                       _fcd name,
-                       size_t_f *namelen1,
-                       _fcd field_name,
-                       hid_t_f *field_type,
-                       int_f *position,
-                       void *buf);
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5tbinsert_field_dl_c(hid_t_f *loc_id,
-                       size_t_f *namelen,
-                       _fcd name,
-                       size_t_f *namelen1,
-                       _fcd field_name,
-                       hid_t_f *field_type,
-                       int_f *position,
-                       void *buf);
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5tbinsert_field_st_c(hid_t_f *loc_id,
-                       size_t_f *namelen,
-                       _fcd name,
-                       size_t_f *namelen1,
-                       _fcd field_name,
-                       hid_t_f *field_type,
-                       int_f *position,
-                       void *buf);
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5tbdelete_field_c(hid_t_f *loc_id,
-                    size_t_f *namelen,
-                    _fcd name,
-                    size_t_f *namelen1,
-                    _fcd field_name);
-
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5tbget_table_info_c(hid_t_f *loc_id,
-                      size_t_f *namelen,
-                      _fcd name,
-                      hsize_t_f *nfields,
-                      hsize_t_f *nrecords);
-
-HDF5_HL_F90CSTUBDLL
-int_f
-nh5tbget_field_info_c(hid_t_f *loc_id,
-                      size_t_f *namelen,
-                      _fcd name,
-                      hsize_t_f *nfields,
-                      size_t_f *field_sizes,
-                      size_t_f *field_offsets,
-                      size_t_f *type_size,
-                      size_t_f *namelen2,
-                      size_t_f *lenmax,
-                      _fcd field_names,
-                      size_t_f *maxlen_out);    
-
+int_f h5tbget_field_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *nfields,
+                           size_t_f *field_sizes, size_t_f *field_offsets, size_t_f *type_size,
+                           size_t_f *namelen2, size_t_f *lenmax, _fcd field_names, size_t_f *maxlen_out);
 
-#endif /* _H5LTf90proto_H */
+#endif /* H5LTf90proto_H */
diff --git a/hl/fortran/src/H5LTfc.c b/hl/fortran/src/H5LTfc.c
index 1e0a236..2819f1b 100644
--- a/hl/fortran/src/H5LTfc.c
+++ b/hl/fortran/src/H5LTfc.c
@@ -1,17 +1,14 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Board of Trustees of the University of Illinois.         *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of HDF5.  The full HDF5 copyright notice, including     *
-* terms governing use, modification, and redistribution, is contained in    *
-* the files COPYING and Copyright.html.  COPYING can be found at the root   *
-* of the source code distribution tree; Copyright.html can be found at the  *
-* root level of an installed copy of the electronic HDF5 document set and   *
-* is linked from the top-level documents page.  It can also be found at     *
-* http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-* access to either file, you may request a copy from help@hdfgroup.org.     *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /* This files contains C stubs for H5D Fortran APIs */
 
@@ -20,584 +17,111 @@
 #include "H5Eprivate.h"
 
 /*-------------------------------------------------------------------------
-* Function: H5LTmake_dataset_c
-*
-* Purpose: Call H5LTmake_dataset
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: September 09, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
-
-int_f
-nh5ltmake_dataset_c (hid_t_f *loc_id,
-                     size_t_f *namelen,
-                     _fcd name,
-                     int_f *rank,
-                     hsize_t_f *dims,
-                     hid_t_f *type_id,
-                     void *buf)
-{
-    int     ret_value = -1;
-    herr_t  ret;
+ * Function: H5LTmake_dataset_c
+ *
+ * Purpose: Call H5LTmake_dataset
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * Date: September 09, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
+
+int_f
+h5ltmake_dataset_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *rank, hsize_t_f *dims,
+                   hid_t_f *type_id, void *buf)
+{
+    int      ret_value = -1;
+    herr_t   ret;
     char    *c_name = NULL;
     hsize_t *c_dims = NULL;
-    int     i;
+    int      i;
 
     /*
-    * convert FORTRAN name to C name
-    */
+     * convert FORTRAN name to C name
+     */
     c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
 
-    c_dims =  (hsize_t *)HDmalloc(sizeof(hsize_t) * ( (size_t)*rank ));
+    c_dims = (hsize_t *)HDmalloc(sizeof(hsize_t) * ((size_t)*rank));
     if (c_dims == NULL)
         goto done;
     /*
-    * transpose dimension arrays because of C-FORTRAN storage order
-    */
-    for (i = 0; i < *rank ; i++)
-    {
-        c_dims[i] =  dims[*rank - i - 1];
+     * transpose dimension arrays because of C-FORTRAN storage order
+     */
+    for (i = 0; i < *rank; i++) {
+        c_dims[i] = dims[*rank - i - 1];
     }
 
     /*
-    * call H5LTmake_dataset function.
-    */
+     * call H5LTmake_dataset function.
+     */
 
-    ret = H5LTmake_dataset((hid_t)*loc_id, c_name, (int)*rank, c_dims, (hid_t)*type_id, buf );
+    ret = H5LTmake_dataset((hid_t)*loc_id, c_name, (int)*rank, c_dims, (hid_t)*type_id, buf);
     if (ret < 0)
         goto done;
 
     ret_value = 0;
 
 done:
-    if(c_name!=NULL)
+    if (c_name != NULL)
         HDfree(c_name);
-    if(c_dims!=NULL)
+    if (c_dims != NULL)
         HDfree(c_dims);
     return ret_value;
 }
 
-int_f
-nh5ltmake_dataset_int1_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          int_f *rank,
-                          hsize_t_f *dims,
-                          hid_t_f *type_id,
-                          void *buf)
-{
-    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
-}
-int_f
-nh5ltmake_dataset_int2_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          int_f *rank,
-                          hsize_t_f *dims,
-                          hid_t_f *type_id,
-                          void *buf)
-{
-    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
-}
-int_f
-nh5ltmake_dataset_int3_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          int_f *rank,
-                          hsize_t_f *dims,
-                          hid_t_f *type_id,
-                          void *buf)
-{
-    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
-}
-int_f
-nh5ltmake_dataset_int4_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          int_f *rank,
-                          hsize_t_f *dims,
-                          hid_t_f *type_id,
-                          void *buf)
-{
-    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
-}
-int_f
-nh5ltmake_dataset_int5_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          int_f *rank,
-                          hsize_t_f *dims,
-                          hid_t_f *type_id,
-                          void *buf)
-{
-    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
-}
-int_f
-nh5ltmake_dataset_int6_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          int_f *rank,
-                          hsize_t_f *dims,
-                          hid_t_f *type_id,
-                          void *buf)
-{
-    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
-}
-int_f
-nh5ltmake_dataset_int7_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          int_f *rank,
-                          hsize_t_f *dims,
-                          hid_t_f *type_id,
-                          void *buf)
-{
-    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
-}
-int_f
-nh5ltmake_dataset_fl1_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         int_f *rank,
-                         hsize_t_f *dims,
-                         hid_t_f *type_id,
-                         void *buf)
-{
-    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
-}
-int_f
-nh5ltmake_dataset_fl2_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         int_f *rank,
-                         hsize_t_f *dims,
-                         hid_t_f *type_id,
-                         void *buf)
-{
-    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
-}
-int_f
-nh5ltmake_dataset_fl3_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         int_f *rank,
-                         hsize_t_f *dims,
-                         hid_t_f *type_id,
-                         void *buf)
-{
-    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
-}
-int_f
-nh5ltmake_dataset_fl4_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         int_f *rank,
-                         hsize_t_f *dims,
-                         hid_t_f *type_id,
-                         void *buf)
-{
-    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
-}
-int_f
-nh5ltmake_dataset_fl5_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         int_f *rank,
-                         hsize_t_f *dims,
-                         hid_t_f *type_id,
-                         void *buf)
-{
-    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
-}
-int_f
-nh5ltmake_dataset_fl6_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         int_f *rank,
-                         hsize_t_f *dims,
-                         hid_t_f *type_id,
-                         void *buf)
-{
-    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
-}
-int_f
-nh5ltmake_dataset_fl7_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         int_f *rank,
-                         hsize_t_f *dims,
-                         hid_t_f *type_id,
-                         void *buf)
-{
-    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
-}
-int_f
-nh5ltmake_dataset_dl1_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         int_f *rank,
-                         hsize_t_f *dims,
-                         hid_t_f *type_id,
-                         void *buf)
-{
-    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
-}
-int_f
-nh5ltmake_dataset_dl2_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         int_f *rank,
-                         hsize_t_f *dims,
-                         hid_t_f *type_id,
-                         void *buf)
-{
-    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
-}
-int_f
-nh5ltmake_dataset_dl3_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         int_f *rank,
-                         hsize_t_f *dims,
-                         hid_t_f *type_id,
-                         void *buf)
-{
-    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
-}
-int_f
-nh5ltmake_dataset_dl4_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         int_f *rank,
-                         hsize_t_f *dims,
-                         hid_t_f *type_id,
-                         void *buf)
-{
-    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
-}
-int_f
-nh5ltmake_dataset_dl5_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         int_f *rank,
-                         hsize_t_f *dims,
-                         hid_t_f *type_id,
-                         void *buf)
-{
-    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
-}
-int_f
-nh5ltmake_dataset_dl6_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         int_f *rank,
-                         hsize_t_f *dims,
-                         hid_t_f *type_id,
-                         void *buf)
-{
-    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
-}
-int_f
-nh5ltmake_dataset_dl7_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         int_f *rank,
-                         hsize_t_f *dims,
-                         hid_t_f *type_id,
-                         void *buf)
-{
-    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
-}
-int_f
-nh5ltmake_dataset_nint1_c (hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd name,
-                           int_f *rank,
-                           hsize_t_f *dims,
-                           hid_t_f *type_id,
-                           void *buf)
-{
-    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
-}
-int_f
-nh5ltmake_dataset_nint2_c (hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd name,
-                           int_f *rank,
-                           hsize_t_f *dims,
-                           hid_t_f *type_id,
-                           void *buf)
-{
-    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
-}
-int_f
-nh5ltmake_dataset_nint3_c (hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd name,
-                           int_f *rank,
-                           hsize_t_f *dims,
-                           hid_t_f *type_id,
-                           void *buf)
-{
-    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
-}
-int_f
-nh5ltmake_dataset_nint4_c (hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd name,
-                           int_f *rank,
-                           hsize_t_f *dims,
-                           hid_t_f *type_id,
-                           void *buf)
-{
-    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
-}
-int_f
-nh5ltmake_dataset_nint5_c (hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd name,
-                           int_f *rank,
-                           hsize_t_f *dims,
-                           hid_t_f *type_id,
-                           void *buf)
-{
-    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
-}
-int_f
-nh5ltmake_dataset_nint6_c (hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd name,
-                           int_f *rank,
-                           hsize_t_f *dims,
-                           hid_t_f *type_id,
-                           void *buf)
-{
-    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
-}
-int_f
-nh5ltmake_dataset_nint7_c (hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd name,
-                           int_f *rank,
-                           hsize_t_f *dims,
-                           hid_t_f *type_id,
-                           void *buf)
-{
-    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
-}
-int_f
-nh5ltmake_dataset_nfl1_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          int_f *rank,
-                          hsize_t_f *dims,
-                          hid_t_f *type_id,
-                          void *buf)
-{
-    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
-}
-int_f
-nh5ltmake_dataset_nfl2_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          int_f *rank,
-                          hsize_t_f *dims,
-                          hid_t_f *type_id,
-                          void *buf)
-{
-    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
-}
-int_f
-nh5ltmake_dataset_nfl3_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          int_f *rank,
-                          hsize_t_f *dims,
-                          hid_t_f *type_id,
-                          void *buf)
-{
-    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
-}
-int_f
-nh5ltmake_dataset_nfl4_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          int_f *rank,
-                          hsize_t_f *dims,
-                          hid_t_f *type_id,
-                          void *buf)
-{
-    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
-}
-int_f
-nh5ltmake_dataset_nfl5_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          int_f *rank,
-                          hsize_t_f *dims,
-                          hid_t_f *type_id,
-                          void *buf)
-{
-    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
-}
-int_f
-nh5ltmake_dataset_nfl6_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          int_f *rank,
-                          hsize_t_f *dims,
-                          hid_t_f *type_id,
-                          void *buf)
-{
-    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
-}
-int_f
-nh5ltmake_dataset_nfl7_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          int_f *rank,
-                          hsize_t_f *dims,
-                          hid_t_f *type_id,
-                          void *buf)
-{
-    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
-}
-int_f
-nh5ltmake_dataset_ndl1_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          int_f *rank,
-                          hsize_t_f *dims,
-                          hid_t_f *type_id,
-                          void *buf)
-{
-    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
-}
-int_f
-nh5ltmake_dataset_ndl2_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          int_f *rank,
-                          hsize_t_f *dims,
-                          hid_t_f *type_id,
-                          void *buf)
-{
-    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
-}
-int_f
-nh5ltmake_dataset_ndl3_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          int_f *rank,
-                          hsize_t_f *dims,
-                          hid_t_f *type_id,
-                          void *buf)
-{
-    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
-}
-int_f
-nh5ltmake_dataset_ndl4_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          int_f *rank,
-                          hsize_t_f *dims,
-                          hid_t_f *type_id,
-                          void *buf)
-{
-    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
-}
-int_f
-nh5ltmake_dataset_ndl5_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          int_f *rank,
-                          hsize_t_f *dims,
-                          hid_t_f *type_id,
-                          void *buf)
-{
-    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
-}
-int_f
-nh5ltmake_dataset_ndl6_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          int_f *rank,
-                          hsize_t_f *dims,
-                          hid_t_f *type_id,
-                          void *buf)
-{
-    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
-}
-int_f
-nh5ltmake_dataset_ndl7_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          int_f *rank,
-                          hsize_t_f *dims,
-                          hid_t_f *type_id,
-                          void *buf)
-{
-    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
-}
 /*-------------------------------------------------------------------------
-* Function: H5LTread_dataset_c
-*
-* Purpose: Call H5LTmake_dataset
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: September 09, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
-
-int_f
-nh5ltread_dataset_c (hid_t_f *loc_id,
-                     size_t_f *namelen,
-                     _fcd name,
-                     hid_t_f *type_id,
-                     void *buf,
-                     hsize_t_f *dims)
-{
-    int     ret_value = -1;
-    herr_t  ret;
-    hid_t   c_loc_id;
-    hid_t   c_type_id;
-    char    *c_name = NULL;
+ * Function: H5LTread_dataset_c
+ *
+ * Purpose: Call H5LTmake_dataset
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * Date: September 09, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
+
+int_f
+h5ltread_dataset_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hid_t_f *type_id, void *buf)
+{
+    int    ret_value = -1;
+    herr_t ret;
+    hid_t  c_loc_id;
+    hid_t  c_type_id;
+    char  *c_name = NULL;
 
     /*
-    * convert FORTRAN name to C name
-    */
+     * convert FORTRAN name to C name
+     */
     c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
 
     /*
-    * call H5LTread_dataset function.
-    */
-    c_loc_id = (hid_t)*loc_id;
+     * call H5LTread_dataset function.
+     */
+    c_loc_id  = (hid_t)*loc_id;
     c_type_id = (hid_t)*type_id;
 
-    ret = H5LTread_dataset(c_loc_id, c_name, c_type_id, buf );
+    ret = H5LTread_dataset(c_loc_id, c_name, c_type_id, buf);
 
     if (ret < 0)
         goto done;
@@ -605,467 +129,43 @@ nh5ltread_dataset_c (hid_t_f *loc_id,
     ret_value = 0;
 
 done:
-    if(c_name!=NULL)
+    if (c_name != NULL)
         HDfree(c_name);
 
     return ret_value;
 }
 
-int_f
-nh5ltread_dataset_int1_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          hid_t_f *type_id,
-                          void *buf,
-                          hsize_t_f *dims)
-{
-    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
-}
-int_f
-nh5ltread_dataset_int2_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          hid_t_f *type_id,
-                          void *buf,
-                          hsize_t_f *dims)
-{
-    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
-}
-int_f
-nh5ltread_dataset_int3_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          hid_t_f *type_id,
-                          void *buf,
-                          hsize_t_f *dims)
-{
-    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
-}
-int_f
-nh5ltread_dataset_int4_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          hid_t_f *type_id,
-                          void *buf,
-                          hsize_t_f *dims)
-{
-    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
-}
-int_f
-nh5ltread_dataset_int5_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          hid_t_f *type_id,
-                          void *buf,
-                          hsize_t_f *dims)
-{
-    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
-}
-int_f
-nh5ltread_dataset_int6_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          hid_t_f *type_id,
-                          void *buf,
-                          hsize_t_f *dims)
-{
-    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
-}
-int_f
-nh5ltread_dataset_int7_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          hid_t_f *type_id,
-                          void *buf,
-                          hsize_t_f *dims)
-{
-    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
-}
-int_f
-nh5ltread_dataset_fl1_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         hid_t_f *type_id,
-                         void *buf,
-                         hsize_t_f *dims)
-{
-    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
-}
-int_f
-nh5ltread_dataset_fl2_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         hid_t_f *type_id,
-                         void *buf,
-                         hsize_t_f *dims)
-{
-    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
-}
-int_f
-nh5ltread_dataset_fl3_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         hid_t_f *type_id,
-                         void *buf,
-                         hsize_t_f *dims)
-{
-    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
-}
-int_f
-nh5ltread_dataset_fl4_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         hid_t_f *type_id,
-                         void *buf,
-                         hsize_t_f *dims)
-{
-    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
-}
-int_f
-nh5ltread_dataset_fl5_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         hid_t_f *type_id,
-                         void *buf,
-                         hsize_t_f *dims)
-{
-    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
-}
-int_f
-nh5ltread_dataset_fl6_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         hid_t_f *type_id,
-                         void *buf,
-                         hsize_t_f *dims)
-{
-    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
-}
-int_f
-nh5ltread_dataset_fl7_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         hid_t_f *type_id,
-                         void *buf,
-                         hsize_t_f *dims)
-{
-    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
-}
-int_f
-nh5ltread_dataset_dl1_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         hid_t_f *type_id,
-                         void *buf,
-                         hsize_t_f *dims)
-{
-    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
-}
-int_f
-nh5ltread_dataset_dl2_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         hid_t_f *type_id,
-                         void *buf,
-                         hsize_t_f *dims)
-{
-    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
-}
-int_f
-nh5ltread_dataset_dl3_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         hid_t_f *type_id,
-                         void *buf,
-                         hsize_t_f *dims)
-{
-    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
-}
-int_f
-nh5ltread_dataset_dl4_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         hid_t_f *type_id,
-                         void *buf,
-                         hsize_t_f *dims)
-{
-    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
-}
-int_f
-nh5ltread_dataset_dl5_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         hid_t_f *type_id,
-                         void *buf,
-                         hsize_t_f *dims)
-{
-    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
-}
-int_f
-nh5ltread_dataset_dl6_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         hid_t_f *type_id,
-                         void *buf,
-                         hsize_t_f *dims)
-{
-    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
-}
-int_f
-nh5ltread_dataset_dl7_c (hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         hid_t_f *type_id,
-                         void *buf,
-                         hsize_t_f *dims)
-{
-    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
-}
-int_f
-nh5ltread_dataset_nint1_c (hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd name,
-                           hid_t_f *type_id,
-                           void *buf,
-                           hsize_t_f *dims)
-{
-    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
-}
-int_f
-nh5ltread_dataset_nint2_c (hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd name,
-                           hid_t_f *type_id,
-                           void *buf,
-                           hsize_t_f *dims)
-{
-    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
-}
-int_f
-nh5ltread_dataset_nint3_c (hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd name,
-                           hid_t_f *type_id,
-                           void *buf,
-                           hsize_t_f *dims)
-{
-    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
-}
-int_f
-nh5ltread_dataset_nint4_c (hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd name,
-                           hid_t_f *type_id,
-                           void *buf,
-                           hsize_t_f *dims)
-{
-    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
-}
-int_f
-nh5ltread_dataset_nint5_c (hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd name,
-                           hid_t_f *type_id,
-                           void *buf,
-                           hsize_t_f *dims)
-{
-    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
-}
-int_f
-nh5ltread_dataset_nint6_c (hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd name,
-                           hid_t_f *type_id,
-                           void *buf,
-                           hsize_t_f *dims)
-{
-    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
-}
-int_f
-nh5ltread_dataset_nint7_c (hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd name,
-                           hid_t_f *type_id,
-                           void *buf,
-                           hsize_t_f *dims)
-{
-    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
-}
-int_f
-nh5ltread_dataset_nfl1_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          hid_t_f *type_id,
-                          void *buf,
-                          hsize_t_f *dims)
-{
-    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
-}
-int_f
-nh5ltread_dataset_nfl2_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          hid_t_f *type_id,
-                          void *buf,
-                          hsize_t_f *dims)
-{
-    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
-}
-int_f
-nh5ltread_dataset_nfl3_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          hid_t_f *type_id,
-                          void *buf,
-                          hsize_t_f *dims)
-{
-    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
-}
-int_f
-nh5ltread_dataset_nfl4_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          hid_t_f *type_id,
-                          void *buf,
-                          hsize_t_f *dims)
-{
-    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
-}
-int_f
-nh5ltread_dataset_nfl5_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          hid_t_f *type_id,
-                          void *buf,
-                          hsize_t_f *dims)
-{
-    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
-}
-int_f
-nh5ltread_dataset_nfl6_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          hid_t_f *type_id,
-                          void *buf,
-                          hsize_t_f *dims)
-{
-    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
-}
-int_f
-nh5ltread_dataset_nfl7_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          hid_t_f *type_id,
-                          void *buf,
-                          hsize_t_f *dims)
-{
-    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
-}
-int_f
-nh5ltread_dataset_ndl1_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          hid_t_f *type_id,
-                          void *buf,
-                          hsize_t_f *dims)
-{
-    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
-}
-int_f
-nh5ltread_dataset_ndl2_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          hid_t_f *type_id,
-                          void *buf,
-                          hsize_t_f *dims)
-{
-    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
-}
-int_f
-nh5ltread_dataset_ndl3_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          hid_t_f *type_id,
-                          void *buf,
-                          hsize_t_f *dims)
-{
-    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
-}
-int_f
-nh5ltread_dataset_ndl4_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          hid_t_f *type_id,
-                          void *buf,
-                          hsize_t_f *dims)
-{
-    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
-}
-int_f
-nh5ltread_dataset_ndl5_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          hid_t_f *type_id,
-                          void *buf,
-                          hsize_t_f *dims)
-{
-    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
-}
-int_f
-nh5ltread_dataset_ndl6_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          hid_t_f *type_id,
-                          void *buf,
-                          hsize_t_f *dims)
-{
-    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
-}
-int_f
-nh5ltread_dataset_ndl7_c (hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          hid_t_f *type_id,
-                          void *buf,
-                          hsize_t_f *dims)
-{
-    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
-}
 /*-------------------------------------------------------------------------
-* Function: H5LTmake_dataset_string_c
-*
-* Purpose: Call H5LTmake_dataset
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: September 09, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
-
-int_f
-nh5ltmake_dataset_string_c (hid_t_f *loc_id,
-                            size_t_f *namelen,
-                            _fcd name,
-                            size_t_f *buflen,
-                            char *buf)
-{
-    int     ret_value = -1;
-    herr_t  ret;
-    hid_t   c_loc_id;
-    char    *c_name = NULL;
-    char    *c_buf = NULL;
+ * Function: H5LTmake_dataset_string_c
+ *
+ * Purpose: Call H5LTmake_dataset
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * Date: September 09, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
+
+int_f
+h5ltmake_dataset_string_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *buflen, char *buf)
+{
+    int    ret_value = -1;
+    herr_t ret;
+    hid_t  c_loc_id;
+    char  *c_name = NULL;
+    char  *c_buf  = NULL;
 
     /*
-    * convert FORTRAN name to C name
-    */
+     * convert FORTRAN name to C name
+     */
     c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
@@ -1075,11 +175,11 @@ nh5ltmake_dataset_string_c (hid_t_f *loc_id,
         goto done;
 
     /*
-    * call H5LTmake_dataset_string function.
-    */
+     * call H5LTmake_dataset_string function.
+     */
     c_loc_id = (hid_t)*loc_id;
 
-    ret = H5LTmake_dataset_string(c_loc_id,c_name,c_buf);
+    ret = H5LTmake_dataset_string(c_loc_id, c_name, c_buf);
 
     if (ret < 0)
         goto done;
@@ -1087,133 +187,54 @@ nh5ltmake_dataset_string_c (hid_t_f *loc_id,
     ret_value = 0;
 
 done:
-    if(c_name!=NULL)
+    if (c_name != NULL)
         HDfree(c_name);
-    if(c_buf!=NULL)
+    if (c_buf != NULL)
         HDfree(c_buf);
 
     return ret_value;
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: H5LTread_dataset_string_c
-*
-* Purpose: Call H5LTread_dataset_string
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: September 09, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
-
-int_f
-nh5ltread_dataset_string_c (hid_t_f *loc_id,
-                            size_t_f *namelen,
-                            _fcd name,
-                            char *buf)
-{
-    int     ret_value = -1;
-    herr_t  ret;
-    hid_t   c_loc_id;
-    char    *c_name = NULL;
+ * Function: H5LTread_dataset_string_c
+ *
+ * Purpose: Call H5LTread_dataset_string
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * Date: September 09, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
+
+int_f
+h5ltread_dataset_string_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, char *buf)
+{
+    int    ret_value = -1;
+    herr_t ret;
+    hid_t  c_loc_id;
+    char  *c_name = NULL;
 
     /*
-    * convert FORTRAN name to C name
-    */
+     * convert FORTRAN name to C name
+     */
     c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
 
     /*
-    * call H5LTread_dataset_string function.
-    */
-    c_loc_id = (hid_t)*loc_id;
-
-    ret = H5LTread_dataset_string(c_loc_id,c_name,buf);
-
-    if (ret < 0)
-        goto done;
-
-    ret_value = 0;
-
-done:
-    if(c_name!=NULL)
-        HDfree(c_name);
-
-    return ret_value;
-}
-
-
-
-/*-------------------------------------------------------------------------
-* Function: H5LTset_attribute_int_c
-*
-* Purpose: Call H5LTset_attribute_int
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 05, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
-
-int_f
-nh5ltset_attribute_int_c(hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd dsetname,
-                         size_t_f *attrnamelen,
-                         _fcd attrname,
-                         size_t_f *size,
-                         void *buf)
-{
-    int     ret_value = -1;
-    herr_t  ret;
-    hid_t   c_loc_id;
-    char    *c_name = NULL;
-    char    *c_attrname = NULL;
-    size_t  c_size;
-
-    /*
-    * convert FORTRAN name to C name
-    */
-    c_name = (char *)HD5f2cstring(dsetname, (size_t)*namelen);
-    if (c_name == NULL)
-        goto done;
-
-    c_attrname = (char *)HD5f2cstring(attrname, (size_t)*attrnamelen);
-    if (c_attrname == NULL)
-        goto done;
-
-    /*
-    * call H5LTset_attribute_int function.
-    */
+     * call H5LTread_dataset_string function.
+     */
     c_loc_id = (hid_t)*loc_id;
-    c_size   = (size_t)*size;
 
-    if (sizeof(int_f) == sizeof(int))
-        ret = H5LTset_attribute_int(c_loc_id,c_name,c_attrname,(const int *)buf,c_size);
-    else if (sizeof(int_f) == sizeof(long))
-      ret = H5LTset_attribute_long(c_loc_id,c_name,c_attrname,(const long *)buf,c_size);
-    else if (sizeof(int_f) == sizeof(long long))
-        ret = H5LTset_attribute_long_long(c_loc_id,c_name,c_attrname,(const long long *)buf,c_size);
-    else
-        goto done;
+    ret = H5LTread_dataset_string(c_loc_id, c_name, buf);
 
     if (ret < 0)
         goto done;
@@ -1221,121 +242,46 @@ nh5ltset_attribute_int_c(hid_t_f *loc_id,
     ret_value = 0;
 
 done:
-    if(c_name!=NULL)
+    if (c_name != NULL)
         HDfree(c_name);
-     if(c_attrname!=NULL)
-        HDfree(c_attrname);
 
     return ret_value;
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5LTset_attribute_float_c
-*
-* Purpose: Call H5LTset_attribute_float
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 05, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
-
-int_f
-nh5ltset_attribute_float_c(hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd dsetname,
-                           size_t_f *attrnamelen,
-                           _fcd attrname,
-                           size_t_f *size,
-                           void *buf)
-{
-    int     ret_value = -1;
-    herr_t  ret;
-    hid_t   c_loc_id;
-    char    *c_name = NULL;
-    char    *c_attrname = NULL;
-    size_t  c_size;
-
-    /*
-    * convert FORTRAN name to C name
-    */
-    c_name = (char *)HD5f2cstring(dsetname, (size_t)*namelen);
-    if (c_name == NULL)
-         goto done;
-
-    c_attrname = (char *)HD5f2cstring(attrname, (size_t)*attrnamelen);
-    if (c_attrname == NULL)
-         goto done;
+ * Function: H5LTset_attribute_int_c
+ *
+ * Purpose: Call H5LTset_attribute_int
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * Date: October 05, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
+
+int_f
+h5ltset_attribute_c(hid_t_f *loc_id, size_t_f *namelen, _fcd dsetname, size_t_f *attrnamelen, _fcd attrname,
+                    size_t_f *size, void *buf, char *dtype, size_t_f *sizeof_val)
+{
+    int    ret_value = -1;
+    herr_t ret       = SUCCEED;
+    hid_t  c_loc_id;
+    char  *c_name     = NULL;
+    char  *c_attrname = NULL;
+    char  *c_buf      = NULL;
+    size_t c_size;
 
     /*
-    * Call H5LTset_attribute_float function.
-    */
-    c_loc_id = (hid_t)*loc_id;
-    c_size   = (size_t)*size;
-
-    ret = H5LTset_attribute_float(c_loc_id,c_name,c_attrname,(float *)buf,c_size);
-
-    if (ret < 0)
-         goto done;
-
-    ret_value = 0;
-
-done:
-    if(c_name!=NULL)
-        HDfree(c_name);
-    if(c_attrname!=NULL)
-        HDfree(c_attrname);
-
-    return ret_value;
-}
-
-
-/*-------------------------------------------------------------------------
-* Function: H5LTset_attribute_double_c
-*
-* Purpose: Call H5LTset_attribute_double
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 05, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
-
-int_f
-nh5ltset_attribute_double_c(hid_t_f *loc_id,
-                            size_t_f *namelen,
-                            _fcd dsetname,
-                            size_t_f *attrnamelen,
-                            _fcd attrname,
-                            size_t_f *size,
-                            void *buf)
-{
-    int     ret_value = -1;
-    herr_t  ret;
-    hid_t   c_loc_id;
-    char    *c_name = NULL;
-    char    *c_attrname = NULL;
-    size_t  c_size;
-
-    /*
-    * Convert FORTRAN name to C name
-    */
+     * convert FORTRAN name to C name
+     */
     c_name = (char *)HD5f2cstring(dsetname, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
@@ -1345,278 +291,95 @@ nh5ltset_attribute_double_c(hid_t_f *loc_id,
         goto done;
 
     /*
-    * Call H5LTset_attribute_double function.
-    */
+     * call H5LTset_attribute_int function.
+     */
     c_loc_id = (hid_t)*loc_id;
     c_size   = (size_t)*size;
 
-    ret = H5LTset_attribute_double(c_loc_id,c_name,c_attrname,(double *)buf,c_size);
-
-    if (ret < 0)
-        goto done;
-
-    ret_value = 0;
-
-
-done:
-    if(c_name!=NULL)
-        HDfree(c_name);
-    if(c_attrname!=NULL)
-        HDfree(c_attrname);
-
-    return ret_value;
-}
-
-/*-------------------------------------------------------------------------
-* Function: H5LTset_attribute_string_c
-*
-* Purpose: Call H5LTset_attribute_string
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 05, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
-
-int_f
-nh5ltset_attribute_string_c(hid_t_f *loc_id,
-                            size_t_f *namelen,
-                            _fcd dsetname,
-                            size_t_f *attrnamelen,
-                            _fcd attrname,
-                            size_t_f *buflen,
-                            void *buf)
-{
-    int     ret_value = -1;
-    herr_t  ret;
-    hid_t   c_loc_id;
-    char    *c_name = NULL;
-    char    *c_attrname = NULL;
-    char    *c_buf = NULL;
-
-    /*
-    * convert FORTRAN name to C name
-    */
-    c_name = (char *)HD5f2cstring(dsetname, (size_t)*namelen);
-    if (c_name == NULL)
-        goto done;
-
-    c_attrname = (char *)HD5f2cstring(attrname, (size_t)*attrnamelen);
-    if (c_attrname == NULL)
-        goto done;
-
-    c_buf = (char *)HD5f2cstring((_fcd)buf, (size_t)*buflen);
-    if (c_buf == NULL)
-        goto done;
-
-
-    /*
-    * call H5LTset_attribute_string function.
-    */
-    c_loc_id = (hid_t)*loc_id;
+    if (HDstrncmp(dtype, "I", 1) == 0) {
+        if ((size_t)*sizeof_val == sizeof(int))
+            ret = H5LT_set_attribute_numerical(c_loc_id, c_name, c_attrname, c_size, H5T_NATIVE_INT,
+                                               (const int *)buf);
+        else if ((size_t)*sizeof_val == sizeof(long))
+            ret = H5LT_set_attribute_numerical(c_loc_id, c_name, c_attrname, c_size, H5T_NATIVE_LONG,
+                                               (const long *)buf);
+#if H5_SIZEOF_LONG != H5_SIZEOF_LONG_LONG
+        else if ((size_t)*sizeof_val == sizeof(long long))
+            ret = H5LT_set_attribute_numerical(c_loc_id, c_name, c_attrname, c_size, H5T_NATIVE_LLONG,
+                                               (const long long *)buf);
+#endif /* H5_SIZEOF_LONG != H5_SIZEOF_LONG_LONG */
+        else
+            goto done;
+    }
+    else if (HDstrncmp(dtype, "R", 1) == 0) {
+        if ((size_t)*sizeof_val == sizeof(float))
+            ret = H5LT_set_attribute_numerical(c_loc_id, c_name, c_attrname, c_size, H5T_NATIVE_FLOAT,
+                                               (const float *)buf);
+        else if ((size_t)*sizeof_val == sizeof(double))
+            ret = H5LT_set_attribute_numerical(c_loc_id, c_name, c_attrname, c_size, H5T_NATIVE_DOUBLE,
+                                               (const double *)buf);
+        else if ((size_t)*sizeof_val == sizeof(long double))
+            ret = H5LT_set_attribute_numerical(c_loc_id, c_name, c_attrname, c_size, H5T_NATIVE_LDOUBLE,
+                                               (const long double *)buf);
+        else
+            goto done;
+    }
+    else if (HDstrncmp(dtype, "C", 1) == 0) {
 
-    ret = H5LTset_attribute_string(c_loc_id,c_name,c_attrname,c_buf);
+        c_buf = (char *)HD5f2cstring((_fcd)buf, c_size);
+        if (c_buf == NULL)
+            goto done;
 
+        ret = H5LTset_attribute_string(c_loc_id, c_name, c_attrname, c_buf);
+    }
     if (ret < 0)
         goto done;
 
     ret_value = 0;
 
-
 done:
-    if(c_name!=NULL)
+    if (c_name != NULL)
         HDfree(c_name);
-    if(c_attrname!=NULL)
+    if (c_attrname != NULL)
         HDfree(c_attrname);
-    if(c_buf!=NULL)
+    if (c_buf != NULL)
         HDfree(c_buf);
 
     return ret_value;
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5LTget_attribute_int_c
-*
-* Purpose: Call H5LTget_attribute_int
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 05, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
-
-int_f
-nh5ltget_attribute_int_c(hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd dsetname,
-                         size_t_f *attrnamelen,
-                         _fcd attrname,
-                         void *buf)
-{
-    int     ret_value = -1;
-    herr_t  ret;
-    hid_t   c_loc_id;
-    char    *c_name = NULL;
-    char    *c_attrname = NULL;
+ * Function: H5LTget_attribute_c
+ *
+ * Purpose: Call H5LTget_attribute_int
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * Date: October 05, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
+
+int_f
+h5ltget_attribute_c(hid_t_f *loc_id, size_t_f *namelen, _fcd dsetname, size_t_f *attrnamelen, _fcd attrname,
+                    void *buf, char *dtype, size_t_f *sizeof_val)
+{
+    int    ret_value = -1;
+    herr_t ret       = SUCCEED;
+    hid_t  c_loc_id;
+    char  *c_name     = NULL;
+    char  *c_attrname = NULL;
 
     /*
-    * convert FORTRAN name to C name
-    */
-    c_name = (char *)HD5f2cstring(dsetname, (size_t)*namelen);
-    if (c_name == NULL)
-        goto done;
-
-    c_attrname = (char *)HD5f2cstring(attrname, (size_t)*attrnamelen);
-    if (c_attrname == NULL)
-        goto done;
-
-    /*
-    * call H5LTget_attribute_int function.
-    */
-    c_loc_id = (hid_t)*loc_id;
-
-    if(sizeof(int_f) == sizeof(int))
-      ret = H5LTget_attribute_int(c_loc_id,c_name,c_attrname,(int *)buf);
-    else if (sizeof(int_f) == sizeof(long))
-      ret = H5LTget_attribute_long(c_loc_id,c_name,c_attrname,(long *)buf);
-    else if (sizeof(int_f) == sizeof(long long))
-      ret = H5LTget_attribute_long_long(c_loc_id,c_name,c_attrname,(long long *)buf);
-    else
-        goto done;
-
-    if (ret < 0)
-        goto done;
-
-    ret_value = 0;
-
-done:
-    if(c_name!=NULL)
-        HDfree(c_name);
-    if(c_attrname!=NULL)
-        HDfree(c_attrname);
-
-
-    return ret_value;
-}
-
-
-/*-------------------------------------------------------------------------
-* Function: H5LTget_attribute_float_c
-*
-* Purpose: Call H5LTget_attribute_float
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 05, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
-
-int_f
-nh5ltget_attribute_float_c(hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd dsetname,
-                           size_t_f *attrnamelen,
-                           _fcd attrname,
-                           void *buf)
-{
-    int     ret_value = -1;
-    herr_t  ret;
-    hid_t   c_loc_id;
-    char    *c_name = NULL;
-    char    *c_attrname = NULL;
-
-    /*
-    * convert FORTRAN name to C name
-    */
-    c_name = (char *)HD5f2cstring(dsetname, (size_t)*namelen);
-    if (c_name == NULL)
-        goto done;
-
-    c_attrname = (char *)HD5f2cstring(attrname, (size_t)*attrnamelen);
-    if (c_attrname == NULL)
-        goto done;
-
-    /*
-    * call H5LTget_attribute_int function.
-    */
-    c_loc_id = (hid_t)*loc_id;
-
-    ret = H5LTget_attribute_float(c_loc_id,c_name,c_attrname,(float*)buf);
-
-    if (ret < 0)
-        goto done;
-
-    ret_value = 0;
-
-done:
-    if(c_name!=NULL)
-        HDfree(c_name);
-    if(c_attrname!=NULL)
-        HDfree(c_attrname);
-
-    return ret_value;
-}
-
-/*-------------------------------------------------------------------------
-* Function: H5LTget_attribute_double_c
-*
-* Purpose: Call H5LTget_attribute_double
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 05, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
-
-int_f
-nh5ltget_attribute_double_c(hid_t_f *loc_id,
-                            size_t_f *namelen,
-                            _fcd dsetname,
-                            size_t_f *attrnamelen,
-                            _fcd attrname,
-                            void *buf)
-{
-    int     ret_value = -1;
-    herr_t  ret;
-    hid_t   c_loc_id;
-    char    *c_name = NULL;
-    char    *c_attrname = NULL;
-
-    /*
-    * convert FORTRAN name to C name
-    */
+     * convert FORTRAN name to C name
+     */
     c_name = (char *)HD5f2cstring(dsetname, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
@@ -1626,63 +389,79 @@ nh5ltget_attribute_double_c(hid_t_f *loc_id,
         goto done;
 
     /*
-    * call H5LTget_attribute_int function.
-    */
+     * call H5LTget_attribute_int function.
+     */
     c_loc_id = (hid_t)*loc_id;
 
-    ret = H5LTget_attribute_double(c_loc_id,c_name,c_attrname,(double *)buf);
+    if (HDstrncmp(dtype, "I", 1) == 0) {
+        if ((size_t)*sizeof_val == sizeof(int))
+            ret = H5LTget_attribute(c_loc_id, c_name, c_attrname, H5T_NATIVE_INT, buf);
+        else if ((size_t)*sizeof_val == sizeof(long))
+            ret = H5LTget_attribute(c_loc_id, c_name, c_attrname, H5T_NATIVE_LONG, buf);
+#if H5_SIZEOF_LONG != H5_SIZEOF_LONG_LONG
+        else if ((size_t)*sizeof_val == sizeof(long long))
+            ret = H5LTget_attribute(c_loc_id, c_name, c_attrname, H5T_NATIVE_LLONG, buf);
+#endif /* H5_SIZEOF_LONG != H5_SIZEOF_LONG_LONG */
+        else
+            goto done;
+    }
+    else if (HDstrncmp(dtype, "R", 1) == 0) {
+        if ((size_t)*sizeof_val == sizeof(float))
+            ret = H5LTget_attribute(c_loc_id, c_name, c_attrname, H5T_NATIVE_FLOAT, buf);
+        else if ((size_t)*sizeof_val == sizeof(double))
+            ret = H5LTget_attribute(c_loc_id, c_name, c_attrname, H5T_NATIVE_DOUBLE, buf);
+        else if ((size_t)*sizeof_val == sizeof(long double))
+            ret = H5LTget_attribute(c_loc_id, c_name, c_attrname, H5T_NATIVE_LDOUBLE, buf);
+        else
+            goto done;
+    }
 
     if (ret < 0)
         goto done;
 
     ret_value = 0;
 
-
 done:
-    if(c_name!=NULL)
+    if (c_name != NULL)
         HDfree(c_name);
-    if(c_attrname!=NULL)
+    if (c_attrname != NULL)
         HDfree(c_attrname);
 
     return ret_value;
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5LTget_attribute_string_c
-*
-* Purpose: Call H5LTget_attribute_string
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 05, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
-
-int_f
-nh5ltget_attribute_string_c(hid_t_f *loc_id,
-                            size_t_f *namelen,
-                            _fcd dsetname,
-                            size_t_f *attrnamelen,
-                            _fcd attrname,
-                            _fcd buf, size_t_f *buf_size)
-{
-    int     ret_value = -1;
-    herr_t  ret;
-    char    *c_name = NULL;
-    char    *c_attrname = NULL;
-    char    *c_buf = NULL;
-
-    /*
-    * Convert FORTRAN name to C name
-    */
+ * Function: H5LTget_attribute_string_c
+ *
+ * Purpose: Call H5LTget_attribute_string
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * Date: October 05, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
+
+int_f
+h5ltget_attribute_string_c(hid_t_f *loc_id, size_t_f *namelen, _fcd dsetname, size_t_f *attrnamelen,
+                           _fcd attrname, _fcd buf, size_t_f *buf_size)
+{
+    int    ret_value = -1;
+    herr_t ret;
+    char  *c_name     = NULL;
+    char  *c_attrname = NULL;
+    char  *c_buf      = NULL;
+
+    /*
+     * Convert FORTRAN name to C name
+     */
     c_name = (char *)HD5f2cstring(dsetname, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
@@ -1694,75 +473,71 @@ nh5ltget_attribute_string_c(hid_t_f *loc_id,
      * Allocate buffer to hold C attribute string
      */
     if ((c_buf = (char *)HDmalloc((size_t)*buf_size + 1)) == NULL)
-      goto done;
+        goto done;
 
     /*
      * Call H5LTget_attribute_int function.
      */
-    ret = H5LTget_attribute_string((hid_t)*loc_id,c_name,c_attrname,c_buf);
+    ret = H5LTget_attribute_string((hid_t)*loc_id, c_name, c_attrname, c_buf);
     if (ret < 0)
         goto done;
 
     /*
      * Convert C name to FORTRAN and place it in the given buffer
      */
-    HD5packFstring(c_buf, _fcdtocp(buf), (size_t)*buf_size); 
+    HD5packFstring(c_buf, _fcdtocp(buf), (size_t)*buf_size);
 
     ret_value = 0;
 
 done:
-    if(c_name!=NULL)
+    if (c_name != NULL)
         HDfree(c_name);
-    if(c_attrname!=NULL)
+    if (c_attrname != NULL)
         HDfree(c_attrname);
-    if(c_buf!=NULL)
+    if (c_buf != NULL)
         HDfree(c_buf);
 
     return ret_value;
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: H5LTget_dataset_ndims_c
-*
-* Purpose: Call H5LTget_dataset_ndims
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: September 09, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
-
-int_f
-nh5ltget_dataset_ndims_c(hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         int_f *rank)
-{
-    int     ret_value = -1;
-    herr_t  ret;
-    hid_t   c_loc_id;
-    char    *c_name = NULL;
-    int     c_rank;
-
-    /*
-    * Convert FORTRAN name to C name
-    */
+ * Function: H5LTget_dataset_ndims_c
+ *
+ * Purpose: Call H5LTget_dataset_ndims
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * Date: September 09, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
+
+int_f
+h5ltget_dataset_ndims_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *rank)
+{
+    int    ret_value = -1;
+    herr_t ret;
+    hid_t  c_loc_id;
+    char  *c_name = NULL;
+    int    c_rank;
+
+    /*
+     * Convert FORTRAN name to C name
+     */
     c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
 
     /*
-    * Call H5LTget_dataset_ndims function.
-    */
+     * Call H5LTget_dataset_ndims function.
+     */
     c_loc_id = (hid_t)*loc_id;
 
     ret = H5LTget_dataset_ndims(c_loc_id, c_name, &c_rank);
@@ -1770,113 +545,105 @@ nh5ltget_dataset_ndims_c(hid_t_f *loc_id,
     if (ret < 0)
         goto done;
 
-    *rank = (int_f)c_rank;
+    *rank     = (int_f)c_rank;
     ret_value = 0;
 
-
 done:
-    if(c_name!=NULL)
+    if (c_name != NULL)
         HDfree(c_name);
 
     return ret_value;
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: h5ltfind_dataset_c
-*
-* Purpose: Call H5LTfind_dataset
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: September 09, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
-
-int_f
-nh5ltfind_dataset_c(hid_t_f *loc_id,
-                    size_t_f *namelen,
-                    _fcd name)
-{
-    hid_t   c_loc_id;
-    char    *c_name = NULL;
-    herr_t  ret;
-
-    /*
-    * Convert FORTRAN name to C name
-    */
+ * Function: h5ltfind_dataset_c
+ *
+ * Purpose: Call H5LTfind_dataset
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * Date: September 09, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
+
+int_f
+h5ltfind_dataset_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name)
+{
+    hid_t  c_loc_id;
+    char  *c_name = NULL;
+    herr_t ret;
+
+    /*
+     * Convert FORTRAN name to C name
+     */
     c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
-    if (c_name == NULL) return -1;
+    if (c_name == NULL)
+        return -1;
 
     /*
-    * Call H5LTget_dataset_ndims function.
-    */
+     * Call H5LTget_dataset_ndims function.
+     */
     c_loc_id = (hid_t)*loc_id;
 
     ret = H5LTfind_dataset(c_loc_id, c_name);
 
-    if(c_name!=NULL)
-       HDfree(c_name);
+    if (c_name != NULL)
+        HDfree(c_name);
 
     return ret;
-
 }
 
 /*-------------------------------------------------------------------------
-* Function: h5ltget_dataset_info_c
-*
-* Purpose: Call H5LTget_dataset_info
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: September 09, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
-
-int_f
-nh5ltget_dataset_info_c(hid_t_f *loc_id,
-                        size_t_f *namelen,
-                        _fcd name,
-                        hsize_t_f *dims,
-                        int_f *type_class,
-                        size_t_f *type_size)
-{
-    int          ret_value = -1;
-    herr_t       ret;
-    hid_t        c_loc_id;
-    char         *c_name = NULL;
-    H5T_class_t  c_classtype;
-    size_t       c_type_size;
-    hsize_t      c_dims[32];
-    int          i;
-    int          c_rank;
+ * Function: h5ltget_dataset_info_c
+ *
+ * Purpose: Call H5LTget_dataset_info
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * Date: September 09, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
+
+int_f
+h5ltget_dataset_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *dims, int_f *type_class,
+                       size_t_f *type_size)
+{
+    int         ret_value = -1;
+    herr_t      ret;
+    hid_t       c_loc_id;
+    char       *c_name = NULL;
+    H5T_class_t c_classtype;
+    size_t      c_type_size;
+    hsize_t     c_dims[32];
+    int         i;
+    int         c_rank;
 
     /*
-    * convert FORTRAN name to C name
-    */
+     * convert FORTRAN name to C name
+     */
     c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
 
     /*
-    * call H5LTget_dataset_ndims function.
-    */
+     * call H5LTget_dataset_ndims function.
+     */
     c_loc_id = (hid_t)*loc_id;
 
     ret = H5LTget_dataset_info(c_loc_id, c_name, c_dims, &c_classtype, &c_type_size);
@@ -1884,68 +651,62 @@ nh5ltget_dataset_info_c(hid_t_f *loc_id,
         goto done;
 
     *type_class = c_classtype;
-    *type_size = (size_t_f)c_type_size;
+    *type_size  = (size_t_f)c_type_size;
 
     /*
-    * transpose dimension arrays because of C-FORTRAN storage order
-    */
+     * transpose dimension arrays because of C-FORTRAN storage order
+     */
 
     ret = H5LTget_dataset_ndims(c_loc_id, c_name, &c_rank);
     if (ret < 0)
         goto done;
 
-    for (i = 0; i < c_rank ; i++)
-    {
-        dims[i] = (hsize_t_f) c_dims[c_rank - i - 1];
+    for (i = 0; i < c_rank; i++) {
+        dims[i] = (hsize_t_f)c_dims[c_rank - i - 1];
     }
 
-
     ret_value = 0;
 
 done:
-    if(c_name!=NULL)
+    if (c_name != NULL)
         HDfree(c_name);
 
     return ret_value;
 }
 
 /*-------------------------------------------------------------------------
-* Function: h5ltget_attribute_ndims_c
-*
-* Purpose: Call H5LTget_attribute_ndims
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 05, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
-
-int_f
-nh5ltget_attribute_ndims_c(hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd dsetname,
-                           size_t_f *attrnamelen,
-                           _fcd attrname,
-                           int_f *rank)
-{
-    int     ret_value = -1;
-    herr_t  ret;
-    hid_t   c_loc_id;
-    char    *c_name = NULL;
-    char    *c_attrname = NULL;
-    int     c_rank;
-
-    /*
-    * Convert FORTRAN name to C name
-    */
+ * Function: h5ltget_attribute_ndims_c
+ *
+ * Purpose: Call H5LTget_attribute_ndims
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * Date: October 05, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
+
+int_f
+h5ltget_attribute_ndims_c(hid_t_f *loc_id, size_t_f *namelen, _fcd dsetname, size_t_f *attrnamelen,
+                          _fcd attrname, int_f *rank)
+{
+    int    ret_value = -1;
+    herr_t ret;
+    hid_t  c_loc_id;
+    char  *c_name     = NULL;
+    char  *c_attrname = NULL;
+    int    c_rank;
+
+    /*
+     * Convert FORTRAN name to C name
+     */
     c_name = (char *)HD5f2cstring(dsetname, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
@@ -1955,72 +716,64 @@ nh5ltget_attribute_ndims_c(hid_t_f *loc_id,
         goto done;
 
     /*
-    * Call H5LTset_attribute_ndims function.
-    */
+     * Call H5LTset_attribute_ndims function.
+     */
     c_loc_id = (hid_t)*loc_id;
 
-    ret = H5LTget_attribute_ndims(c_loc_id,c_name,c_attrname,&c_rank);
+    ret = H5LTget_attribute_ndims(c_loc_id, c_name, c_attrname, &c_rank);
 
     if (ret < 0)
         goto done;
 
-    *rank = (int_f)c_rank;
+    *rank     = (int_f)c_rank;
     ret_value = 0;
 
-
 done:
-    if(c_name!=NULL)
+    if (c_name != NULL)
         HDfree(c_name);
-    if(c_attrname!=NULL)
+    if (c_attrname != NULL)
         HDfree(c_attrname);
 
     return ret_value;
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: h5ltget_attribute_info_c
-*
-* Purpose: Call H5LTget_attribute_info
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: September 09, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
-
-int_f
-nh5ltget_attribute_info_c(hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          size_t_f *attrnamelen,
-                          _fcd attrname,
-                          hsize_t_f *dims,
-                          int_f *type_class,
-                          size_t_f *type_size)
-{
-    int          ret_value = -1;
-    herr_t       ret;
-    hid_t        c_loc_id;
-    char         *c_name = NULL;
-    char         *c_attrname = NULL;
-    H5T_class_t  c_classtype;
-    size_t       c_type_size;
-    hsize_t      c_dims[32];
-    int          i;
-    int          c_rank;
+ * Function: h5ltget_attribute_info_c
+ *
+ * Purpose: Call H5LTget_attribute_info
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * Date: September 09, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
+
+int_f
+h5ltget_attribute_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *attrnamelen, _fcd attrname,
+                         hsize_t_f *dims, int_f *type_class, size_t_f *type_size)
+{
+    int         ret_value = -1;
+    herr_t      ret;
+    hid_t       c_loc_id;
+    char       *c_name     = NULL;
+    char       *c_attrname = NULL;
+    H5T_class_t c_classtype;
+    size_t      c_type_size;
+    hsize_t     c_dims[32];
+    int         i;
+    int         c_rank;
 
     /*
-    * convert FORTRAN name to C name
-    */
+     * convert FORTRAN name to C name
+     */
     c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
@@ -2030,90 +783,84 @@ nh5ltget_attribute_info_c(hid_t_f *loc_id,
         goto done;
 
     /*
-    * call H5LTget_attribute_info function.
-    */
+     * call H5LTget_attribute_info function.
+     */
     c_loc_id = (hid_t)*loc_id;
 
-    ret = H5LTget_attribute_info(c_loc_id,c_name,c_attrname,c_dims,&c_classtype,&c_type_size);
+    ret = H5LTget_attribute_info(c_loc_id, c_name, c_attrname, c_dims, &c_classtype, &c_type_size);
     if (ret < 0)
         goto done;
 
     *type_class = c_classtype;
-    *type_size = (size_t_f)c_type_size;
+    *type_size  = (size_t_f)c_type_size;
 
     /*
-    * transpose dimension arrays because of C-FORTRAN storage order
-    */
+     * transpose dimension arrays because of C-FORTRAN storage order
+     */
 
-    ret = H5LTget_attribute_ndims(c_loc_id,c_name,c_attrname,&c_rank);
+    ret = H5LTget_attribute_ndims(c_loc_id, c_name, c_attrname, &c_rank);
     if (ret < 0)
         goto done;
 
-    for (i = 0; i < c_rank ; i++)
-    {
-        dims[i] = (hsize_t_f) c_dims[c_rank - i - 1];
+    for (i = 0; i < c_rank; i++) {
+        dims[i] = (hsize_t_f)c_dims[c_rank - i - 1];
     }
 
     ret_value = 0;
 
-
 done:
-    if(c_name!=NULL)
+    if (c_name != NULL)
         HDfree(c_name);
-    if(c_attrname!=NULL)
+    if (c_attrname != NULL)
         HDfree(c_attrname);
 
-
     return ret_value;
 }
 
 /*-------------------------------------------------------------------------
-* Function: h5ltpath_valid_c
-*
-* Purpose: Calls h5ltpath_valid
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: M. Scot Breitenfeld
-*
-* Date: February 18, 2012
-*
-* Comments:
-*
-* Modifications:
-*
-*
-*-------------------------------------------------------------------------
-*/
-
-int_f
-nh5ltpath_valid_c(hid_t_f *loc_id, 
-                  _fcd path, 
-                  size_t_f *pathlen, 
-                  int_f *check_object_valid_c)
-{
-    htri_t ret = -1;
-    char *c_path = NULL;
+ * Function: h5ltpath_valid_c
+ *
+ * Purpose: Calls h5ltpath_valid
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: M. Scot Breitenfeld
+ *
+ * Date: February 18, 2012
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
+
+int_f
+h5ltpath_valid_c(hid_t_f *loc_id, _fcd path, size_t_f *pathlen, int_f *check_object_valid_c)
+{
+    htri_t  ret    = -1;
+    char   *c_path = NULL;
     hbool_t check_object_valid;
 
     /*
      * convert FORTRAN name to C name
      */
-    if( NULL == (c_path = (char *)HD5f2cstring(path, (size_t)*pathlen)))
-      goto done;
-    
+    if (NULL == (c_path = (char *)HD5f2cstring(path, (size_t)*pathlen)))
+        goto done;
+
     check_object_valid = FALSE;
-    if(*check_object_valid_c == 1)
-      check_object_valid = TRUE;
+    if (*check_object_valid_c == 1)
+        check_object_valid = TRUE;
 
     /*
      * call H5LTpath_valid function.
      */
-    ret = H5LTpath_valid( (hid_t)*loc_id, c_path, check_object_valid );
+    ret = H5LTpath_valid((hid_t)*loc_id, c_path, check_object_valid);
 
 done:
-    if(c_path != NULL)
-      HDfree(c_path);
+    if (c_path != NULL)
+        HDfree(c_path);
 
     return (int_f)ret;
 }
diff --git a/hl/fortran/src/H5LTff.F90 b/hl/fortran/src/H5LTff.F90
new file mode 100644
index 0000000..8ced874
--- /dev/null
+++ b/hl/fortran/src/H5LTff.F90
@@ -0,0 +1,1857 @@
+!> @defgroup FH5LT Fortran High Level Lite (H5LT) Interface
+!!
+!! @see H5LT, C-HL API
+!!
+!! @see @ref H5LT_UG, User Guide
+!!
+
+!> @ingroup H5LT
+!!
+!! @brief This module contains Fortran interfaces for H5LT.
+!
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!       _____ __  __ _____   ____  _____ _______       _   _ _______
+!      |_   _|  \/  |  __ \ / __ \|  __ \__   __|/\   | \ | |__   __|
+! ****   | | | \  / | |__) | |  | | |__) | | |  /  \  |  \| |  | |    ****
+! ****   | | | |\/| |  ___/| |  | |  _  /  | | / /\ \ | . ` |  | |    ****
+! ****  _| |_| |  | | |    | |__| | | \ \  | |/ ____ \| |\  |  | |    ****
+!      |_____|_|  |_|_|     \____/|_|  \_\ |_/_/    \_\_| \_|  |_|
+!
+!  If you add a new function here then you MUST add the function name to the
+!  Windows dll file 'hdf5_hl_fortrandll.def.in' in the hl/fortran/src directory.
+!  This is needed for Windows based operating systems.
+!
+
+#include <H5config_f.inc>
+
+#ifdef H5_DOXYGEN
+MODULE H5LT
+#else
+MODULE H5LT_CONST
+#endif
+
+  USE, INTRINSIC :: ISO_C_BINDING
+  USE h5fortran_types
+  USE hdf5
+
+#ifndef H5_DOXYGEN
+
+  INTERFACE h5ltmake_dataset_f
+     MODULE PROCEDURE h5ltmake_dataset_f_ptr
+  END INTERFACE
+
+  INTERFACE h5ltread_dataset_f
+     MODULE PROCEDURE h5ltread_dataset_f_ptr
+  END INTERFACE
+
+  INTERFACE
+     INTEGER FUNCTION h5ltmake_dataset_c(loc_id,namelen,dset_name,rank,dims,type_id,buf) &
+          BIND(C,NAME='h5ltmake_dataset_c')
+       IMPORT :: C_CHAR, C_PTR
+       IMPORT :: HID_T, SIZE_T, HSIZE_T
+       IMPLICIT NONE
+       INTEGER(hid_t),   INTENT(in) :: loc_id                        ! file or group identifier
+       INTEGER(hid_t),   INTENT(in) :: type_id                       ! datatype identifier
+       INTEGER(size_t) :: namelen                                    ! length of name buffer
+       CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: dset_name ! name of the dataset
+       INTEGER,          INTENT(in) :: rank                          ! rank
+       INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims            ! size of the buffer buf
+       TYPE(C_PTR), VALUE :: buf                                     ! data buffer
+     END FUNCTION h5ltmake_dataset_c
+  END INTERFACE
+
+  INTERFACE
+     INTEGER FUNCTION h5ltread_dataset_c(loc_id,namelen,dset_name,type_id,buf) &
+          BIND(C,NAME='h5ltread_dataset_c')
+       IMPORT :: C_CHAR, C_PTR
+       IMPORT :: HID_T, SIZE_T, HSIZE_T
+       IMPLICIT NONE
+       INTEGER(hid_t),   INTENT(in) :: loc_id                        ! file or group identifier
+       INTEGER(hid_t),   INTENT(in) :: type_id                       ! datatype identifier
+       INTEGER(size_t) :: namelen                                    ! length of name buffer
+       CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: dset_name ! name of the dataset
+       TYPE(C_PTR), VALUE :: buf                                     ! data buffer
+     END FUNCTION h5ltread_dataset_c
+  END INTERFACE
+
+  INTERFACE
+     INTEGER FUNCTION h5ltset_attribute_c(loc_id,namelen,dset_name,attrlen,attr_name,size,buf,dtype, SizeOf_buf) &
+          BIND(C,NAME='h5ltset_attribute_c')
+       IMPORT :: C_CHAR, C_PTR
+       IMPORT :: HID_T, SIZE_T, HSIZE_T
+       IMPLICIT NONE
+       INTEGER(hid_t),   INTENT(in) :: loc_id                        ! file or group identifier
+       INTEGER(size_t) :: namelen                                    ! length of name buffer
+       INTEGER(size_t) :: attrlen                                    ! length of attr name buffer
+       CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: dset_name ! name of the dataset
+       CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: attr_name ! name of the attribute
+       INTEGER(size_t),  INTENT(in) :: size                          ! size of attribute array
+       TYPE(C_PTR), VALUE :: buf                                     ! data buffer
+       CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: dtype     ! flag indicating the datatype of the buffer:
+                                                                     ! R=Real, D=DOUBLE, I=Integer, C=Character
+       INTEGER(size_t) :: SizeOf_buf                                 ! Sizeof the buf datatype
+     END FUNCTION h5ltset_attribute_c
+  END INTERFACE
+
+  INTERFACE
+     INTEGER FUNCTION h5ltget_attribute_c(loc_id,namelen,dset_name,attrlen,attr_name,buf,dtype, SizeOf_buf) &
+          BIND(C,NAME='h5ltget_attribute_c')
+       IMPORT :: C_CHAR, C_PTR
+       IMPORT :: HID_T, SIZE_T, HSIZE_T
+       IMPLICIT NONE
+       INTEGER(hid_t),   INTENT(in) :: loc_id                        ! file or group identifier
+       INTEGER(size_t) :: namelen                                    ! length of name buffer
+       INTEGER(size_t) :: attrlen                                    ! length of attr name buffer
+       CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: dset_name ! name of the dataset
+       CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: attr_name ! name of the attribute
+       TYPE(C_PTR), VALUE :: buf                                     ! data buffer
+       CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: dtype     ! flag indicating the datatype of the buffer:
+                                                                     ! R=Real, D=DOUBLE, I=Integer
+       INTEGER(size_t), INTENT(in) :: SizeOf_buf                     ! Sizeof the buf data type
+     END FUNCTION h5ltget_attribute_c
+  END INTERFACE
+
+#endif
+
+CONTAINS
+
+  !-------------------------------------------------------------------------
+  ! Make/Read dataset functions
+  !-------------------------------------------------------------------------
+
+#ifdef H5_DOXYGEN
+  !>
+  !! \ingroup FH5LT
+  !!
+  !! \brief Creates and writes a dataset of a type \p type_id.
+  !!
+  !! \attention  \fortran_approved
+  !!
+  !! \param loc_id    Location identifier. The identifier may be that of a file or group.
+  !! \param dset_name The name of the dataset to create.
+  !! \param rank      Number of dimensions of dataspace.
+  !! \param dims      An array of the size of each dimension.
+  !! \param type_id   Identifier of the datatype to use when creating the dataset.
+  !! \param buf       Buffer with data to be written to the dataset.
+  !! \param errcode   \fortran_error
+  !!
+  !! See C API: @ref H5LTmake_dataset()
+  !!
+  SUBROUTINE h5ltmake_dataset_f(&
+#else
+  SUBROUTINE h5ltmake_dataset_f_ptr( &
+#endif
+       loc_id,&
+       dset_name,&
+       rank,&
+       dims,&
+       type_id,&
+       buf,&
+       errcode)
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(len=*), INTENT(in) :: dset_name
+    INTEGER,          INTENT(in) :: rank
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims
+    INTEGER(hid_t),   INTENT(in) :: type_id
+    TYPE(C_PTR) :: buf
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen ! name length
+
+    namelen = LEN(dset_name)
+    errcode = h5ltmake_dataset_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
+
+#ifdef H5_DOXYGEN
+  END SUBROUTINE h5ltmake_dataset_f
+#else
+  END SUBROUTINE h5ltmake_dataset_f_ptr
+#endif
+
+#ifdef H5_DOXYGEN
+  !>
+  !! \ingroup FH5LT
+  !!
+  !! \brief Creates and writes a dataset of a type \p type_id.
+  !!
+  !! \attention \fortran_obsolete
+  !!
+  !! \param loc_id    Location identifier. The identifier may be that of a file or group.
+  !! \param dset_name The name of the dataset to create.
+  !! \param rank      Number of dimensions of dataspace.
+  !! \param dims      An array of the size of each dimension. Limited to seven dimensions.
+  !! \param type_id   Identifier of the datatype to use when creating the dataset.
+  !! \param buf       Buffer with data to be written to the dataset.
+  !! \param errcode   \fortran_error
+  !!
+  !! See C API: @ref H5LTmake_dataset()
+  !!
+   SUBROUTINE h5ltmake_dataset_f(&
+#else
+  SUBROUTINE h5ltmake_dataset_f_int1(&
+#endif
+       loc_id,&
+       dset_name,&
+       rank,&
+       dims,&
+       type_id,&
+       buf,&
+       errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(len=*), INTENT(in) :: dset_name
+    INTEGER,          INTENT(in) :: rank
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims
+    INTEGER(hid_t),   INTENT(in) :: type_id
+#ifdef H5_DOXYGEN
+    TYPE(TYPE), INTENT(in), DIMENSION(*,*,...) :: buf
+#else
+    INTEGER, INTENT(in), DIMENSION(*), TARGET :: buf
+#endif
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen ! name length
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1))
+    namelen = LEN(dset_name)
+    errcode = h5ltmake_dataset_c(loc_id,namelen,dset_name,rank,dims,type_id,f_ptr)
+#ifdef H5_DOXYGEN
+  END SUBROUTINE h5ltmake_dataset_f
+#else
+  END SUBROUTINE h5ltmake_dataset_f_int1
+
+  SUBROUTINE h5ltmake_dataset_f_int2(loc_id,&
+       dset_name,&
+       rank,&
+       dims,&
+       type_id,&
+       buf,&
+       errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(len=*), INTENT(in) :: dset_name
+    INTEGER,          INTENT(in) :: rank
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims
+    INTEGER(hid_t),   INTENT(in) :: type_id
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen ! name length
+    INTEGER, INTENT(in), &
+         DIMENSION(dims(1),dims(2)), TARGET :: buf ! data buffer
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1,1))
+
+    namelen = LEN(dset_name)
+    errcode = h5ltmake_dataset_c(loc_id,namelen,dset_name,rank,dims,type_id,f_ptr)
+
+  END SUBROUTINE h5ltmake_dataset_f_int2
+
+  SUBROUTINE h5ltmake_dataset_f_int3(loc_id,&
+       dset_name,&
+       rank,&
+       dims,&
+       type_id,&
+       buf,&
+       errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: dset_name
+    INTEGER,          INTENT(in) :: rank
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims
+    INTEGER(hid_t),   INTENT(in) :: type_id
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen ! name length
+    INTEGER, INTENT(in), &
+         DIMENSION(dims(1),dims(2),dims(3)), TARGET :: buf ! data buffer
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1,1,1))
+
+    namelen = LEN(dset_name)
+    errcode = h5ltmake_dataset_c(loc_id,namelen,dset_name,rank,dims,type_id,f_ptr)
+
+  END SUBROUTINE h5ltmake_dataset_f_int3
+
+  SUBROUTINE h5ltmake_dataset_f_int4(loc_id, dset_name, rank, dims, &
+       type_id, buf, errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: dset_name
+    INTEGER,          INTENT(in) :: rank
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims
+    INTEGER(hid_t),   INTENT(in) :: type_id
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen ! name length
+    INTEGER, INTENT(in), &
+         DIMENSION(dims(1),dims(2),dims(3),dims(4)), TARGET :: buf ! data buffer
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1,1,1,1))
+
+    namelen = LEN(dset_name)
+    errcode = h5ltmake_dataset_c(loc_id,namelen,dset_name,rank,dims,type_id,f_ptr)
+
+  END SUBROUTINE h5ltmake_dataset_f_int4
+
+  SUBROUTINE h5ltmake_dataset_f_int5(loc_id, dset_name, rank, dims, &
+       type_id, buf, errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: dset_name
+    INTEGER,          INTENT(in) :: rank
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims
+    INTEGER(hid_t),   INTENT(in) :: type_id
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen ! name length
+    INTEGER, INTENT(in), &
+         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)), TARGET :: buf ! data buffer
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1,1,1,1,1))
+
+    namelen = LEN(dset_name)
+    errcode = h5ltmake_dataset_c(loc_id,namelen,dset_name,rank,dims,type_id,f_ptr)
+
+  END SUBROUTINE h5ltmake_dataset_f_int5
+
+  SUBROUTINE h5ltmake_dataset_f_int6(loc_id, dset_name, rank, dims, &
+       type_id, buf, errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: dset_name
+    INTEGER,          INTENT(in) :: rank
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims
+    INTEGER(hid_t),   INTENT(in) :: type_id
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen ! name length
+    INTEGER, INTENT(in), &
+         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)), TARGET :: buf ! data buffer
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1,1,1,1,1,1))
+
+    namelen = LEN(dset_name)
+    errcode = h5ltmake_dataset_c(loc_id,namelen,dset_name,rank,dims,type_id,f_ptr)
+
+  END SUBROUTINE h5ltmake_dataset_f_int6
+
+  SUBROUTINE h5ltmake_dataset_f_int7(loc_id, dset_name, rank, dims, &
+       type_id, buf, errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: dset_name
+    INTEGER,          INTENT(in) :: rank
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims
+    INTEGER(hid_t),   INTENT(in) :: type_id
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen ! name length
+    INTEGER, INTENT(in), &
+         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)), TARGET :: buf ! data buffer
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1,1,1,1,1,1,1))
+
+    namelen = LEN(dset_name)
+    errcode = h5ltmake_dataset_c(loc_id,namelen,dset_name,rank,dims,type_id,f_ptr)
+
+  END SUBROUTINE h5ltmake_dataset_f_int7
+#endif
+
+#ifdef H5_DOXYGEN
+  !>
+  !! \ingroup FH5LT
+  !!
+  !! \brief Reads a dataset of a type \p type_id.
+  !!
+  !! \attention \fortran_approved
+  !!
+  !! \param loc_id    Location identifier. The identifier may be that of a file or group.
+  !! \param dset_name The name of the dataset to create.
+  !! \param type_id   Identifier of the datatype to use when creating the dataset.
+  !! \param buf       Buffer with data to be written to the dataset.
+  !! \param errcode   \fortran_error
+  !!
+  !! See C API: @ref H5LTread_dataset()
+  !!
+  SUBROUTINE h5ltread_dataset_f(&
+#else
+  SUBROUTINE h5ltread_dataset_f_ptr(&
+#endif
+       loc_id,&
+       dset_name,&
+       type_id,&
+       buf,&
+       errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: dset_name
+    INTEGER(hid_t),   INTENT(in) :: type_id
+    TYPE(C_PTR) :: buf
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen
+
+    namelen = LEN(dset_name)
+    errcode = h5ltread_dataset_c(loc_id,namelen,dset_name,type_id, buf)
+#ifdef H5_DOXYGEN
+  END SUBROUTINE h5ltread_dataset_f
+#else
+  END SUBROUTINE h5ltread_dataset_f_ptr
+#endif
+
+#ifdef H5_DOXYGEN
+  !>
+  !! \ingroup FH5LT
+  !!
+  !! \brief Reads a dataset of a type \p type_id.
+  !!
+  !! \attention \fortran_obsolete
+  !!
+  !! \param loc_id    Location identifier. The identifier may be that of a file or group.
+  !! \param dset_name The name of the dataset to create.
+  !! \param type_id   Identifier of the datatype to use when creating the dataset.
+  !! \param buf       Buffer with data to be written to the dataset.
+  !! \param dims      An array of the size of each dimension. Limited to seven dimensions.
+  !! \param errcode   \fortran_error
+  !!
+  !! See C API: @ref H5LTread_dataset()
+  !!
+   SUBROUTINE h5ltread_dataset_f(&
+#else
+  SUBROUTINE h5ltread_dataset_f_int1(&
+#endif
+       loc_id,&
+       dset_name,&
+       type_id,&
+       buf,&
+       dims,&
+       errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: dset_name
+    INTEGER(hid_t),   INTENT(in) :: type_id
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims
+#ifdef H5_DOXYGEN
+    TYPE(TYPE), INTENT(inout), DIMENSION(*,*,...) :: buf
+#else
+    INTEGER, INTENT(inout), DIMENSION(*), TARGET :: buf
+#endif
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1))
+
+    namelen = LEN(dset_name)
+    errcode = h5ltread_dataset_c(loc_id,namelen,dset_name,type_id,f_ptr)
+
+#ifdef H5_DOXYGEN
+  END SUBROUTINE h5ltread_dataset_f
+#else
+  END SUBROUTINE h5ltread_dataset_f_int1
+
+  SUBROUTINE h5ltread_dataset_f_int2(loc_id,&
+       dset_name,&
+       type_id,&
+       buf,&
+       dims,&
+       errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: dset_name
+    INTEGER(hid_t),   INTENT(in) :: type_id
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen ! name length
+    INTEGER, INTENT(inout), &
+         DIMENSION(dims(1),dims(2)), TARGET :: buf
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1,1))
+
+    namelen = LEN(dset_name)
+    errcode = h5ltread_dataset_c(loc_id,namelen,dset_name,type_id,f_ptr)
+
+  END SUBROUTINE h5ltread_dataset_f_int2
+
+  SUBROUTINE h5ltread_dataset_f_int3(loc_id,&
+       dset_name,&
+       type_id,&
+       buf,&
+       dims,&
+       errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: dset_name
+    INTEGER(hid_t),   INTENT(in) :: type_id
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen ! name length
+    INTEGER, INTENT(inout), &
+         DIMENSION(dims(1),dims(2),dims(3)), TARGET :: buf
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1,1,1))
+
+    namelen = LEN(dset_name)
+    errcode = h5ltread_dataset_c(loc_id,namelen,dset_name,type_id,f_ptr)
+
+  END SUBROUTINE h5ltread_dataset_f_int3
+
+  SUBROUTINE h5ltread_dataset_f_int4(loc_id, dset_name, type_id, buf, &
+       dims, errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: dset_name
+    INTEGER(hid_t),   INTENT(in) :: type_id
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen ! name length
+    INTEGER, INTENT(inout), &
+         DIMENSION(dims(1),dims(2),dims(3),dims(4)), TARGET :: buf
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1,1,1,1))
+
+    namelen = LEN(dset_name)
+    errcode = h5ltread_dataset_c(loc_id,namelen,dset_name,type_id,f_ptr)
+
+  END SUBROUTINE h5ltread_dataset_f_int4
+
+  SUBROUTINE h5ltread_dataset_f_int5(loc_id, dset_name, type_id, buf, &
+       dims, errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: dset_name
+    INTEGER(hid_t),   INTENT(in) :: type_id
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen ! name length
+    INTEGER, INTENT(inout), &
+         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)), TARGET :: buf
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1,1,1,1,1))
+
+    namelen = LEN(dset_name)
+    errcode = h5ltread_dataset_c(loc_id,namelen,dset_name,type_id,f_ptr)
+
+  END SUBROUTINE h5ltread_dataset_f_int5
+
+  SUBROUTINE h5ltread_dataset_f_int6(loc_id, dset_name, type_id, buf, &
+       dims, errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: dset_name
+    INTEGER(hid_t),   INTENT(in) :: type_id
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen ! name length
+    INTEGER, INTENT(inout), &
+         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)), TARGET :: buf
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1,1,1,1,1,1))
+
+    namelen = LEN(dset_name)
+    errcode = h5ltread_dataset_c(loc_id,namelen,dset_name,type_id,f_ptr)
+
+  END SUBROUTINE h5ltread_dataset_f_int6
+
+  SUBROUTINE h5ltread_dataset_f_int7(loc_id, dset_name, type_id, buf, &
+       dims, errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: dset_name
+    INTEGER(hid_t),   INTENT(in) :: type_id
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen ! name length
+    INTEGER, INTENT(inout), &
+         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)), TARGET :: buf
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1,1,1,1,1,1,1))
+
+    namelen = LEN(dset_name)
+    errcode = h5ltread_dataset_c(loc_id,namelen,dset_name,type_id,f_ptr)
+
+  END SUBROUTINE h5ltread_dataset_f_int7
+
+  !-------------------------------------------------------------------------
+  ! Function: h5ltmake_dataset_int_f_1
+  !
+  !! \brief Creates and writes a dataset of H5T_NATIVE_INT type
+  !
+  ! Return: Success: 0, Failure: -1
+  !
+  ! Programmer: Pedro Vicente
+  !
+  ! Date: September 22, 2004
+  !
+  ! Comments:
+  !
+  ! Modifications:
+  !
+  !-------------------------------------------------------------------------
+
+  SUBROUTINE h5ltmake_dataset_int_f_1 (loc_id,&
+       dset_name,&
+       rank,&
+       dims,&
+       buf,&
+       errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: dset_name
+    INTEGER,          INTENT(in) :: rank
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims
+    INTEGER, INTENT(in), DIMENSION(*), TARGET :: buf
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen ! name length
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1))
+
+    namelen = LEN(dset_name)
+    errcode = h5ltmake_dataset_c(loc_id,namelen,dset_name,rank,dims,h5t_native_integer,f_ptr)
+
+  END SUBROUTINE h5ltmake_dataset_int_f_1
+
+  SUBROUTINE h5ltmake_dataset_int_f_2 (loc_id,&
+       dset_name,&
+       rank,&
+       dims,&
+       buf,&
+       errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: dset_name
+    INTEGER,          INTENT(in) :: rank
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen ! name length
+    INTEGER, INTENT(in), &
+         DIMENSION(dims(1),dims(2)), TARGET :: buf
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1,1))
+
+    namelen = LEN(dset_name)
+    errcode = h5ltmake_dataset_c(loc_id,namelen,dset_name,rank,dims,H5T_NATIVE_INTEGER,f_ptr)
+
+  END SUBROUTINE h5ltmake_dataset_int_f_2
+
+  SUBROUTINE h5ltmake_dataset_int_f_3 (loc_id,&
+       dset_name,&
+       rank,&
+       dims,&
+       buf,&
+       errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: dset_name
+    INTEGER,          INTENT(in) :: rank
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen ! name length
+    INTEGER, INTENT(in), &
+         DIMENSION(dims(1),dims(2),dims(3)), TARGET :: buf
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1,1,1))
+
+    namelen = LEN(dset_name)
+    errcode = h5ltmake_dataset_c(loc_id,namelen,dset_name,rank,dims,H5T_NATIVE_INTEGER,f_ptr)
+
+  END SUBROUTINE h5ltmake_dataset_int_f_3
+
+  SUBROUTINE h5ltmake_dataset_int_f_4(loc_id, dset_name, rank, dims, &
+       buf, errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: dset_name
+    INTEGER,          INTENT(in) :: rank
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen ! name length
+    INTEGER, INTENT(in), &
+         DIMENSION(dims(1),dims(2),dims(3),dims(4)), TARGET :: buf
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1,1,1,1))
+
+    namelen = LEN(dset_name)
+    errcode = h5ltmake_dataset_c(loc_id,namelen,dset_name,rank,dims,H5T_NATIVE_INTEGER,f_ptr)
+
+  END SUBROUTINE h5ltmake_dataset_int_f_4
+
+  SUBROUTINE h5ltmake_dataset_int_f_5(loc_id, dset_name, rank, dims, &
+       buf, errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: dset_name
+    INTEGER,          INTENT(in) :: rank
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen ! name length
+    INTEGER, INTENT(in), &
+         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)), TARGET :: buf
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1,1,1,1,1))
+
+    namelen = LEN(dset_name)
+    errcode = h5ltmake_dataset_c(loc_id,namelen,dset_name,rank,dims,H5T_NATIVE_INTEGER,f_ptr)
+
+  END SUBROUTINE h5ltmake_dataset_int_f_5
+
+  SUBROUTINE h5ltmake_dataset_int_f_6(loc_id, dset_name, rank, dims, &
+       buf, errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: dset_name
+    INTEGER,          INTENT(in) :: rank
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen ! name length
+    INTEGER, INTENT(in), &
+         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)), TARGET :: buf
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1,1,1,1,1,1))
+
+    namelen = LEN(dset_name)
+    errcode = h5ltmake_dataset_c(loc_id,namelen,dset_name,rank,dims,H5T_NATIVE_INTEGER,f_ptr)
+
+  END SUBROUTINE h5ltmake_dataset_int_f_6
+
+  SUBROUTINE h5ltmake_dataset_int_f_7(loc_id, dset_name, rank, dims, &
+       buf, errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: dset_name
+    INTEGER,          INTENT(in) :: rank
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen ! name length
+    INTEGER, INTENT(in), &
+         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)), TARGET :: buf
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1,1,1,1,1,1,1))
+
+    namelen = LEN(dset_name)
+    errcode = h5ltmake_dataset_c(loc_id,namelen,dset_name,rank,dims,H5T_NATIVE_INTEGER,f_ptr)
+
+  END SUBROUTINE h5ltmake_dataset_int_f_7
+
+  !-------------------------------------------------------------------------
+  ! Function(s): h5ltread_dataset_int_f_(1-7)
+  !
+  !! \brief Read a dataset
+  !
+  ! Return: Success: 0, Failure: -1
+  !
+  ! Programmer: Pedro Vicente
+  !
+  ! Date: September 22, 2004
+  !
+  ! Comments:
+  !
+  ! Modifications:
+  !
+  !-------------------------------------------------------------------------
+
+  SUBROUTINE h5ltread_dataset_int_f_1(loc_id,&
+       dset_name,&
+       buf,&
+       dims,&
+       errcode )
+
+    IMPLICIT NONE
+    INTEGER(HID_T),   INTENT(IN) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: dset_name
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen ! name length
+    INTEGER, INTENT(inout), &
+         DIMENSION(dims(1)), TARGET :: buf
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1))
+
+    namelen = LEN(dset_name)
+    errcode = h5ltread_dataset_c(loc_id,namelen,dset_name,H5T_NATIVE_INTEGER,f_ptr)
+
+  END SUBROUTINE h5ltread_dataset_int_f_1
+
+  SUBROUTINE h5ltread_dataset_int_f_2(loc_id,&
+       dset_name,&
+       buf,&
+       dims,&
+       errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: dset_name
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen ! name length
+    INTEGER, INTENT(inout), &
+         DIMENSION(dims(1),dims(2)), TARGET :: buf
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1,1))
+
+    namelen = LEN(dset_name)
+    errcode = h5ltread_dataset_c(loc_id,namelen,dset_name,H5T_NATIVE_INTEGER,f_ptr)
+
+  END SUBROUTINE h5ltread_dataset_int_f_2
+
+  SUBROUTINE h5ltread_dataset_int_f_3(loc_id,&
+       dset_name,&
+       buf,&
+       dims,&
+       errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: dset_name
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen ! name length
+    INTEGER, INTENT(inout), &
+         DIMENSION(dims(1),dims(2),dims(3)), TARGET :: buf
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1,1,1))
+
+    namelen = LEN(dset_name)
+    errcode = h5ltread_dataset_c(loc_id,namelen,dset_name,H5T_NATIVE_INTEGER,f_ptr)
+
+  END SUBROUTINE h5ltread_dataset_int_f_3
+
+  SUBROUTINE h5ltread_dataset_int_f_4(loc_id, dset_name, buf, dims, errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: dset_name
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen ! name length
+    INTEGER, INTENT(inout), &
+         DIMENSION(dims(1),dims(2),dims(3),dims(4)), TARGET :: buf
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1,1,1,1))
+
+    namelen = LEN(dset_name)
+    errcode = h5ltread_dataset_c(loc_id,namelen,dset_name,H5T_NATIVE_INTEGER,f_ptr)
+
+  END SUBROUTINE h5ltread_dataset_int_f_4
+
+  SUBROUTINE h5ltread_dataset_int_f_5(loc_id, dset_name, buf, dims, errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: dset_name
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen ! name length
+    INTEGER, INTENT(inout), &
+         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)), TARGET :: buf
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1,1,1,1,1))
+
+    namelen = LEN(dset_name)
+    errcode = h5ltread_dataset_c(loc_id,namelen,dset_name,H5T_NATIVE_INTEGER,f_ptr)
+
+  END SUBROUTINE h5ltread_dataset_int_f_5
+
+  SUBROUTINE h5ltread_dataset_int_f_6(loc_id, dset_name, buf, dims, errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: dset_name
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen ! name length
+    INTEGER, INTENT(inout), &
+         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)), TARGET :: buf
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1,1,1,1,1,1))
+
+    namelen = LEN(dset_name)
+    errcode = h5ltread_dataset_c(loc_id,namelen,dset_name,H5T_NATIVE_INTEGER,f_ptr)
+
+  END SUBROUTINE h5ltread_dataset_int_f_6
+
+  SUBROUTINE h5ltread_dataset_int_f_7(loc_id, dset_name, buf, dims, errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: dset_name
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen ! name length
+    INTEGER, INTENT(inout), &
+         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)), TARGET :: buf
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1,1,1,1,1,1,1))
+
+    namelen = LEN(dset_name)
+    errcode = h5ltread_dataset_c(loc_id,namelen,dset_name,H5T_NATIVE_INTEGER,f_ptr)
+
+  END SUBROUTINE h5ltread_dataset_int_f_7
+
+
+  !-------------------------------------------------------------------------
+  ! Function: h5ltmake_dataset_string_f
+  !
+  !! \brief Creates and writes a dataset
+  !
+  ! Return: Success: 0, Failure: -1
+  !
+  ! Programmer: Pedro Vicente
+  !
+  ! Date: September 22, 2004
+  !
+  ! Comments:
+  !
+  ! Modifications:
+  !
+  !-------------------------------------------------------------------------
+
+  SUBROUTINE h5ltmake_dataset_string_f(loc_id,&
+       dset_name,&
+       buf,&
+       errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: dset_name
+    CHARACTER(LEN=*), INTENT(in) :: buf
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen                         ! name length
+    INTEGER(size_t) :: buflen                          ! buffer length
+
+    INTERFACE
+       INTEGER FUNCTION h5ltmake_dataset_string_c(loc_id,namelen,dset_name,buflen,buf) &
+            BIND(C,NAME='h5ltmake_dataset_string_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(hid_t),   INTENT(in) :: loc_id
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
+         INTEGER(size_t) :: buflen                                       ! length of data buffer
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: dset_name
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: buf
+       END FUNCTION h5ltmake_dataset_string_c
+    END INTERFACE
+
+    namelen = LEN(dset_name)
+    buflen = LEN(buf)
+    errcode = h5ltmake_dataset_string_c(loc_id,namelen,dset_name,buflen,buf)
+
+  END SUBROUTINE h5ltmake_dataset_string_f
+
+  !-------------------------------------------------------------------------
+  ! Function: h5ltread_dataset_string_f
+  !
+  !! \brief Read a dataset
+  !
+  ! Return: Success: 0, Failure: -1
+  !
+  ! Programmer: Pedro Vicente
+  !
+  ! Date: September 22, 2004
+  !
+  ! Comments:
+  !
+  ! Modifications:
+  !
+  !-------------------------------------------------------------------------
+
+  SUBROUTINE h5ltread_dataset_string_f(loc_id,&
+       dset_name,&
+       buf,&
+       errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: dset_name
+    CHARACTER(LEN=*), INTENT(inout) :: buf
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen                         ! name length
+
+    INTERFACE
+       INTEGER FUNCTION h5ltread_dataset_string_c(loc_id,namelen,dset_name,buf) &
+            BIND(C,NAME='h5ltread_dataset_string_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(hid_t),   INTENT(in) :: loc_id
+         INTEGER(size_t) :: namelen                                       ! length of name buffer
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in)    :: dset_name
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(inout) :: buf
+       END FUNCTION h5ltread_dataset_string_c
+    END INTERFACE
+
+    namelen = LEN(dset_name)
+    errcode = h5ltread_dataset_string_c(loc_id,namelen,dset_name,buf)
+
+  END SUBROUTINE h5ltread_dataset_string_f
+
+#endif
+
+  !-------------------------------------------------------------------------
+  ! Make/Read attribute functions
+  !-------------------------------------------------------------------------
+
+  !>
+  !! \ingroup FH5LT
+  !!
+  !! \brief Creates and writes an attribute and is a generic replacement for data type specific
+  !!        Fortran h5ltset_attribute_*_f APIs. There is no C equivalent API.
+  !!
+  !! \attention  \fortran_approved
+  !!
+  !! \param loc_id          Location identifier. The identifier may be that of a file or group.
+  !! \param dset_name       The name of the dataset to create.
+  !! \param attr_name       The name of the attribute to create.
+  !! \param buf             The data buffer.
+  !! \param buf_type        Valid data types are CHARACTER, INTEGER or REAL.
+  !!                        NOTE: only the first character matters and is case insensitive.
+  !! \param SizeOf_buf_type Size of \p buf&apos;s data type, in bytes.
+  !! \param size            Size of attribute array.
+  !! \param errcode         \fortran_error
+  !!
+  SUBROUTINE h5ltset_attribute_f(loc_id,&
+       dset_name,&
+       attr_name,&
+       buf,&
+       buf_type,&
+       SizeOf_buf_type, &
+       size,&
+       errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: dset_name
+    CHARACTER(LEN=*), INTENT(in) :: attr_name
+    TYPE(C_PTR) :: buf
+    CHARACTER(LEN=*), INTENT(in) :: buf_type
+    INTEGER(size_t),  INTENT(in) :: size
+    INTEGER(size_t),  INTENT(in) :: SizeOf_buf_type
+    INTEGER, INTENT(out) :: errcode
+
+    INTEGER(size_t) :: namelen ! name length
+    INTEGER(size_t) :: attrlen ! name length
+    CHARACTER(KIND=C_CHAR) :: buf_type_uppercase
+
+    namelen = LEN(dset_name)
+    attrlen = LEN(attr_name)
+
+    buf_type_uppercase(1:1) = buf_type(1:1)
+    IF(buf_type_uppercase(1:1).EQ.'i')THEN
+       buf_type_uppercase(1:1) = 'I'
+    ELSE IF(buf_type_uppercase(1:1).EQ.'r')THEN
+       buf_type_uppercase(1:1) = 'R'
+    ELSE IF(buf_type_uppercase(1:1).EQ.'c')THEN
+       buf_type_uppercase(1:1) = 'C'
+    ENDIF
+
+    errcode = h5ltset_attribute_c(loc_id,namelen,dset_name,attrlen,attr_name,size,&
+         buf,buf_type_uppercase(1:1)//C_NULL_CHAR, SizeOf_buf_type)
+
+  END SUBROUTINE h5ltset_attribute_f
+
+  !>
+  !! \ingroup FH5LT
+  !!
+  !! \brief Creates and writes an attribute.
+  !!
+  !! \attention  \fortran_obsolete
+  !!
+  !! \param loc_id    Identifier of the object (dataset or group) to create the attribute within
+  !! \param obj_name  The name of the object to attach the attribute.
+  !! \param attr_name The attribute name.
+  !! \param buf       Buffer with data to be written to the attribute.
+  !! \param size      The size of the 1D array (one in the case of a scalar attribute).
+  !!                  This value is used by H5Screate_simple() to create the dataspace.
+  !! \param errcode   \fortran_error
+  !!
+  !! See C API: @ref H5LTset_attribute_int()
+  !!
+  SUBROUTINE h5ltset_attribute_int_f(loc_id,&
+       obj_name,&
+       attr_name,&
+       buf,&
+       size,&
+       errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: obj_name
+    CHARACTER(LEN=*), INTENT(in) :: attr_name
+    INTEGER(size_t),  INTENT(in) :: size
+    INTEGER :: errcode
+    INTEGER, DIMENSION(*), TARGET :: buf
+    INTEGER(size_t) :: namelen ! name length
+    INTEGER(size_t) :: attrlen ! name length
+    TYPE(C_PTR) :: f_ptr
+    INTEGER(size_t) :: SizeOf_buf_type
+
+    f_ptr = C_LOC(buf(1:1))
+
+#if H5_FORTRAN_HAVE_STORAGE_SIZE!=0
+    SizeOf_buf_type = STORAGE_SIZE(buf(1), c_size_t)/STORAGE_SIZE(c_char_'a',c_size_t)
+#else
+    SizeOf_buf_type = SIZEOF(buf(1))
+#endif
+
+    namelen = LEN(obj_name)
+    attrlen = LEN(attr_name)
+    errcode = h5ltset_attribute_c(loc_id,namelen,obj_name,attrlen,attr_name,size,&
+         f_ptr,'I'//C_NULL_CHAR,SizeOf_buf_type)
+
+  END SUBROUTINE h5ltset_attribute_int_f
+
+  !>
+  !! \ingroup FH5LT
+  !!
+  !! \brief Creates and writes an attribute.
+  !!
+  !! \attention  \fortran_obsolete
+  !!
+  !! \param loc_id    Identifier of the object (dataset or group) to create the attribute within
+  !! \param obj_name  The name of the object to attach the attribute.
+  !! \param attr_name The attribute name.
+  !! \param buf       Buffer with data to be written to the attribute.
+  !! \param size      The size of the 1D array (one in the case of a scalar attribute).
+  !!                  This value is used by H5Screate_simple() to create the dataspace.
+  !! \param errcode   \fortran_error
+  !!
+  !! See C API: @ref H5LTset_attribute_float()
+  !!
+  SUBROUTINE h5ltset_attribute_float_f(loc_id,&
+       obj_name,&
+       attr_name,&
+       buf,&
+       size,&
+       errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: obj_name
+    CHARACTER(LEN=*), INTENT(in) :: attr_name
+    INTEGER(size_t),  INTENT(in) :: size
+    INTEGER :: errcode
+    REAL(KIND=C_FLOAT), INTENT(in), DIMENSION(*), TARGET :: buf
+    INTEGER(size_t) :: namelen ! name length
+    INTEGER(size_t) :: attrlen ! name length
+    TYPE(C_PTR) :: f_ptr
+    INTEGER(size_t) :: SizeOf_buf_type
+
+    f_ptr = C_LOC(buf(1))
+#if H5_FORTRAN_HAVE_STORAGE_SIZE!=0
+    SizeOf_buf_type = STORAGE_SIZE(buf(1), c_size_t)/STORAGE_SIZE(c_char_'a',c_size_t)
+#else
+    SizeOf_buf_type = SIZEOF(buf(1))
+#endif
+
+    namelen = LEN(obj_name)
+    attrlen = LEN(attr_name)
+    errcode = h5ltset_attribute_c(loc_id,namelen,obj_name,attrlen,attr_name,size,&
+         f_ptr,'R'//C_NULL_CHAR, SizeOf_buf_type)
+
+  END SUBROUTINE h5ltset_attribute_float_f
+
+  !>
+  !! \ingroup FH5LT
+  !!
+  !! \brief Creates and writes an attribute.
+  !!
+  !! \attention  \fortran_obsolete
+  !!
+  !! \param loc_id    Identifier of the object (dataset or group) to create the attribute within
+  !! \param obj_name  The name of the object to attach the attribute.
+  !! \param attr_name The attribute name.
+  !! \param buf       Buffer with data to be written to the attribute.
+  !! \param size      The size of the 1D array (one in the case of a scalar attribute).
+  !!                  This value is used by H5Screate_simple() to create the dataspace.
+  !! \param errcode   \fortran_error
+  !!
+  !! See C API: @ref H5LTset_attribute_double()
+  !!
+  SUBROUTINE h5ltset_attribute_double_f(loc_id,&
+       obj_name,&
+       attr_name,&
+       buf,&
+       size,&
+       errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: obj_name
+    CHARACTER(LEN=*), INTENT(in) :: attr_name
+    INTEGER(size_t),  INTENT(in) :: size
+    INTEGER :: errcode
+    REAL(KIND=C_DOUBLE), INTENT(in), DIMENSION(*), TARGET :: buf
+    INTEGER(size_t) :: namelen ! name length
+    INTEGER(size_t) :: attrlen ! name length
+    TYPE(C_PTR) :: f_ptr
+    INTEGER(size_t) :: SizeOf_buf_type
+
+    f_ptr = C_LOC(buf(1))
+
+#if H5_FORTRAN_HAVE_STORAGE_SIZE!=0
+    SizeOf_buf_type = STORAGE_SIZE(buf(1), c_size_t)/STORAGE_SIZE(c_char_'a',c_size_t)
+#else
+    SizeOf_buf_type = SIZEOF(buf(1))
+#endif
+
+    namelen = LEN(obj_name)
+    attrlen = LEN(attr_name)
+    errcode = h5ltset_attribute_c(loc_id,namelen,obj_name,attrlen,attr_name,size,&
+         f_ptr,'R'//C_NULL_CHAR,SizeOf_buf_type)
+
+  END SUBROUTINE h5ltset_attribute_double_f
+
+  !>
+  !! \ingroup FH5LT
+  !!
+  !! \brief Creates and writes an attribute.
+  !!
+  !! \attention  \fortran_obsolete
+  !!
+  !! \param loc_id    Identifier of the object (dataset or group) to create the attribute within
+  !! \param obj_name  The name of the object to attach the attribute.
+  !! \param attr_name The attribute name.
+  !! \param buf       Buffer with data to be written to the attribute.
+  !! \param errcode   \fortran_error
+  !!
+  !! See C API: @ref H5LTset_attribute_string()
+  !!
+  SUBROUTINE h5ltset_attribute_string_f(loc_id,&
+       obj_name,&
+       attr_name,&
+       buf,&
+       errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: obj_name
+    CHARACTER(LEN=*), INTENT(in) :: attr_name
+    INTEGER :: errcode
+    CHARACTER(LEN=*), DIMENSION(*), INTENT(in), TARGET :: buf
+    INTEGER(size_t) :: namelen ! name length
+    INTEGER(size_t) :: attrlen ! name length
+    INTEGER(size_t) :: buflen  ! data buffer length
+    TYPE(C_PTR) :: f_ptr
+    INTEGER(size_t) :: SizeOf_buf_type
+
+    f_ptr = C_LOC(buf(1)(1:1))
+
+#if H5_FORTRAN_HAVE_STORAGE_SIZE!=0
+    SizeOf_buf_type = STORAGE_SIZE(buf(1)(1:1), c_size_t)/STORAGE_SIZE(c_char_'a',c_size_t)
+#else
+    SizeOf_buf_type = SIZEOF(buf(1:1)(1:1))
+#endif
+
+    namelen = LEN(obj_name)
+    attrlen = LEN(attr_name)
+    buflen = LEN(buf)
+    errcode = h5ltset_attribute_c(loc_id,namelen,obj_name,attrlen,attr_name,buflen,&
+         f_ptr,'C'//C_NULL_CHAR, SizeOf_buf_type)
+
+  END SUBROUTINE h5ltset_attribute_string_f
+  !>
+  !! \ingroup FH5LT
+  !!
+  !! \brief Reads an attribute from disk.
+  !!
+  !! \attention  \fortran_approved
+  !!
+  !! \param loc_id          Location identifier. The identifier may be that of a file or group.
+  !! \param obj_name        The name of the object that the attribute is attached to.
+  !! \param attr_name       The name of the attribute to create.
+  !! \param buf             The data buffer.
+  !! \param buf_type        Valid data types are CHARACTER, INTEGER or REAL.
+  !!                        NOTE: only the first character matters and is case insensitive.
+  !! \param SizeOf_buf_type Size of \p buf&apos;s data type, in bytes.
+  !! \param errcode         \fortran_error
+  !!
+  !! See C API: @ref H5LTget_attribute()
+  !!
+  SUBROUTINE h5ltget_attribute_f(loc_id,&
+       obj_name,&
+       attr_name,&
+       buf, buf_type, SizeOf_buf_type, &
+       errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: obj_name
+    CHARACTER(LEN=*), INTENT(in) :: attr_name
+    TYPE(C_PTR) :: buf
+    CHARACTER(LEN=*), INTENT(in) :: buf_type
+    INTEGER(size_t), INTENT(in) :: SizeOf_buf_type
+    INTEGER, INTENT(out) :: errcode
+    INTEGER(size_t) :: namelen ! name length
+    INTEGER(size_t) :: attrlen ! attr length
+    CHARACTER(KIND=C_CHAR) :: buf_type_uppercase
+
+    namelen = LEN(obj_name)
+    attrlen = LEN(attr_name)
+
+    buf_type_uppercase(1:1) = buf_type(1:1)
+    IF(buf_type_uppercase(1:1).EQ.'i')THEN
+       buf_type_uppercase(1:1) = 'I'
+    ELSE IF(buf_type_uppercase(1:1).EQ.'r')THEN
+       buf_type_uppercase(1:1) = 'R'
+    ELSE IF(buf_type_uppercase(1:1).EQ.'c')THEN
+       buf_type_uppercase(1:1) = 'C'
+    ENDIF
+    errcode = h5ltget_attribute_c(loc_id,namelen,obj_name,attrlen,attr_name, &
+         buf, buf_type_uppercase//C_NULL_CHAR, SizeOf_buf_type)
+
+  END SUBROUTINE h5ltget_attribute_f
+
+  !>
+  !! \ingroup FH5LT
+  !!
+  !! \brief Reads an attribute from disk.
+  !!
+  !! \attention  \fortran_obsolete
+  !!
+  !! \param loc_id    Identifier of the object (dataset or group) to create the attribute within
+  !! \param obj_name  The name of the object that the attribute is attached to.
+  !! \param attr_name The attribute name.
+  !! \param buf       Buffer with data to be written to the attribute.
+  !! \param errcode   \fortran_error
+  !!
+  !! See C API: @ref H5LTget_attribute_int()
+  !!
+  SUBROUTINE h5ltget_attribute_int_f(loc_id,&
+       obj_name,&
+       attr_name,&
+       buf,&
+       errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: obj_name
+    CHARACTER(LEN=*), INTENT(in) :: attr_name
+    INTEGER :: errcode
+    INTEGER, INTENT(inout), DIMENSION(*), TARGET :: buf
+    INTEGER(size_t) :: namelen ! name length
+    INTEGER(size_t) :: attrlen ! name length
+    TYPE(C_PTR) :: f_ptr
+    INTEGER(size_t) :: SizeOf_buf
+
+    f_ptr = C_LOC(buf(1))
+
+#if H5_FORTRAN_HAVE_STORAGE_SIZE!=0
+    SizeOf_buf = STORAGE_SIZE(buf(1), c_size_t)/STORAGE_SIZE(c_char_'a',c_size_t)
+#else
+    SizeOf_buf = SIZEOF(buf(1))
+#endif
+    namelen = LEN(obj_name)
+    attrlen = LEN(attr_name)
+    errcode = h5ltget_attribute_c(loc_id,namelen,obj_name,attrlen,attr_name,f_ptr,'I'//C_NULL_CHAR, SizeOf_buf)
+
+  END SUBROUTINE h5ltget_attribute_int_f
+
+  !>
+  !! \ingroup FH5LT
+  !!
+  !! \brief Reads an attribute from disk.
+  !!
+  !! \attention  \fortran_obsolete
+  !!
+  !! \param loc_id    Identifier of the object (dataset or group) to create the attribute within
+  !! \param obj_name  The name of the object that the attribute is attached to.
+  !! \param attr_name The attribute name.
+  !! \param buf       Buffer with data to be written to the attribute.
+  !! \param errcode   \fortran_error
+  !!
+  !! See C API: @ref H5LTget_attribute_float()
+  !!
+  SUBROUTINE h5ltget_attribute_float_f(loc_id,&
+       obj_name,&
+       attr_name,&
+       buf,&
+       errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: obj_name
+    CHARACTER(LEN=*), INTENT(in) :: attr_name
+    INTEGER :: errcode
+    REAL(KIND=C_FLOAT), INTENT(inout), DIMENSION(*), TARGET :: buf
+    INTEGER(size_t) :: namelen ! name length
+    INTEGER(size_t) :: attrlen ! name length
+    TYPE(C_PTR) :: f_ptr
+    INTEGER(size_t) :: SizeOf_buf
+
+    f_ptr = C_LOC(buf(1))
+#if H5_FORTRAN_HAVE_STORAGE_SIZE!=0
+    SizeOf_buf = STORAGE_SIZE(buf(1), c_size_t)/STORAGE_SIZE(c_char_'a',c_size_t)
+#else
+    SizeOf_buf = SIZEOF(buf(1))
+#endif
+    namelen = LEN(obj_name)
+    attrlen = LEN(attr_name)
+    errcode = h5ltget_attribute_c(loc_id,namelen,obj_name,attrlen,attr_name,f_ptr,'R'//C_NULL_CHAR, SizeOf_buf)
+
+  END SUBROUTINE h5ltget_attribute_float_f
+
+  !>
+  !! \ingroup FH5LT
+  !!
+  !! \brief Reads an attribute from disk.
+  !!
+  !! \attention  \fortran_obsolete
+  !!
+  !! \param loc_id    Identifier of the object (dataset or group) to create the attribute within
+  !! \param obj_name  The name of the object that the attribute is attached to.
+  !! \param attr_name The attribute name.
+  !! \param buf       Buffer with data to be written to the attribute.
+  !! \param errcode   \fortran_error
+  !!
+  !! See C API: @ref H5LTget_attribute_double()
+  !!
+  SUBROUTINE h5ltget_attribute_double_f(loc_id,&
+       obj_name,&
+       attr_name,&
+       buf,&
+       errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: obj_name
+    CHARACTER(LEN=*), INTENT(in) :: attr_name
+    INTEGER :: errcode
+    REAL(KIND=C_DOUBLE),INTENT(inout),DIMENSION(*), TARGET :: buf
+    INTEGER(size_t) :: namelen ! name length
+    INTEGER(size_t) :: attrlen ! name length
+    TYPE(C_PTR) :: f_ptr
+    INTEGER(size_t) :: SizeOf_buf
+
+    f_ptr = C_LOC(buf(1))
+#if H5_FORTRAN_HAVE_STORAGE_SIZE!=0
+    SizeOf_buf = STORAGE_SIZE(buf(1), c_size_t)/STORAGE_SIZE(c_char_'a',c_size_t)
+#else
+    SizeOf_buf = SIZEOF(buf(1))
+#endif
+
+    namelen = LEN(obj_name)
+    attrlen = LEN(attr_name)
+    errcode = h5ltget_attribute_c(loc_id,namelen,obj_name,attrlen,attr_name,f_ptr,'R'//C_NULL_CHAR, SizeOf_buf)
+
+  END SUBROUTINE h5ltget_attribute_double_f
+
+  !>
+  !! \ingroup FH5LT
+  !!
+  !! \brief Reads an attribute from disk.
+  !!
+  !! \attention  \fortran_obsolete
+  !!
+  !! \param loc_id    Identifier of the object (dataset or group) to create the attribute within
+  !! \param obj_name  The name of the object that the attribute is attached to.
+  !! \param attr_name The attribute name.
+  !! \param buf       Buffer with data to be written to the attribute.
+  !! \param errcode   \fortran_error
+  !!
+  !! See C API: @ref H5LTget_attribute_string()
+  !!
+  SUBROUTINE h5ltget_attribute_string_f(loc_id,&
+       obj_name,&
+       attr_name,&
+       buf,&
+       errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: obj_name
+    CHARACTER(LEN=*), INTENT(in) :: attr_name
+    INTEGER :: errcode
+    CHARACTER(LEN=*), INTENT(inout) :: buf
+    INTEGER(size_t) :: namelen  ! name length
+    INTEGER(size_t) :: attrlen  ! name length
+    INTEGER(size_t) :: buf_size ! buf size
+
+   INTERFACE
+       INTEGER FUNCTION h5ltget_attribute_string_c(loc_id,namelen,obj_name,attrlen,attr_name,buf,buf_size) &
+            BIND(C,NAME='h5ltget_attribute_string_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(hid_t),   INTENT(in) :: loc_id
+         INTEGER(size_t) :: namelen
+         INTEGER(size_t) :: attrlen
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: obj_name
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: attr_name
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(inout) :: buf
+         INTEGER(size_t) :: buf_size
+       END FUNCTION h5ltget_attribute_string_c
+    END INTERFACE
+
+    namelen  = LEN(obj_name)
+    attrlen  = LEN(attr_name)
+    buf_size = LEN(buf)
+
+    errcode = h5ltget_attribute_string_c(loc_id,namelen,obj_name,attrlen,attr_name,buf,buf_size)
+
+  END SUBROUTINE h5ltget_attribute_string_f
+
+  !-------------------------------------------------------------------------
+  ! Query dataset functions
+  !-------------------------------------------------------------------------
+
+  !>
+  !! \ingroup FH5LT
+  !!
+  !! \brief Gets the dimensionality of a dataset.
+  !!
+  !! \param loc_id    Identifier of the object to locate the dataset within.
+  !! \param dset_name The dataset name.
+  !! \param rank      The dimensionality of the dataset.
+  !! \param errcode   \fortran_error
+  !!
+  !! See C API: @ref H5LTget_dataset_ndims()
+  !!
+  SUBROUTINE h5ltget_dataset_ndims_f(loc_id,&
+       dset_name,&
+       rank,&
+       errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: dset_name
+    INTEGER,          INTENT(inout) :: rank
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen ! name length
+
+    INTERFACE
+       INTEGER FUNCTION h5ltget_dataset_ndims_c(loc_id,namelen,dset_name,rank) &
+            BIND(C,NAME='h5ltget_dataset_ndims_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(hid_t),   INTENT(in) :: loc_id
+         INTEGER(size_t) :: namelen
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: dset_name
+         INTEGER,          INTENT(inout) :: rank
+       END FUNCTION h5ltget_dataset_ndims_c
+    END INTERFACE
+
+    namelen = LEN(dset_name)
+    errcode = h5ltget_dataset_ndims_c(loc_id,namelen,dset_name,rank)
+
+  END SUBROUTINE h5ltget_dataset_ndims_f
+
+  !>
+  !! \ingroup FH5LT
+  !!
+  !! \brief Determines whether a dataset exists.
+  !!
+  !! \param loc_id    Identifier of the group containing the dataset.
+  !! \param dset_name The dataset name.
+  !!
+  !! \result Returns zero (false), a positive (true) or a negative (failure) value.
+  !!
+  !! See C API: @ref H5LTfind_dataset()
+  !!
+  INTEGER FUNCTION h5ltfind_dataset_f(loc_id, dset_name)
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: dset_name
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen ! name length
+
+    INTERFACE
+       INTEGER FUNCTION h5ltfind_dataset_c(loc_id,namelen,dset_name) &
+            BIND(C,NAME='h5ltfind_dataset_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(hid_t),   INTENT(in) :: loc_id
+         INTEGER(size_t) :: namelen
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: dset_name
+       END FUNCTION h5ltfind_dataset_c
+    END INTERFACE
+
+    namelen = LEN(dset_name)
+    errcode = h5ltfind_dataset_c(loc_id,namelen,dset_name)
+    h5ltfind_dataset_f = errcode
+
+  END FUNCTION h5ltfind_dataset_f
+
+  !>
+  !! \ingroup FH5LT
+  !!
+  !! \brief Retrieves information about a dataset.
+  !!
+  !! \param loc_id     Identifier of the object to locate the dataset within.
+  !! \param dset_name  The dataset name.
+  !! \param dims       The dimensions of the dataset.
+  !! \param type_class The class identifier. See H5Tget_class_f() for a list of class types.
+  !! \param type_size  The size of the datatype in bytes.
+  !! \param errcode    \fortran_error
+  !!
+  !! See C API: @ref H5LTget_dataset_info()
+  !!
+  SUBROUTINE h5ltget_dataset_info_f(loc_id,&
+       dset_name,&
+       dims,&
+       type_class,&
+       type_size,&
+       errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: dset_name
+    INTEGER(hsize_t),DIMENSION(*),INTENT(inout):: dims
+    INTEGER, INTENT(inout)         :: type_class
+    INTEGER(size_t), INTENT(inout) :: type_size
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen ! name length
+
+    INTERFACE
+       INTEGER FUNCTION h5ltget_dataset_info_c(loc_id,namelen,dset_name,dims,type_class,type_size) &
+            BIND(C,NAME='h5ltget_dataset_info_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(hid_t),   INTENT(in) :: loc_id
+         INTEGER(size_t) :: namelen
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: dset_name
+         INTEGER(hsize_t),DIMENSION(*),INTENT(inout):: dims
+         INTEGER, INTENT(inout)         :: type_class
+         INTEGER(size_t), INTENT(inout) :: type_size
+       END FUNCTION h5ltget_dataset_info_c
+    END INTERFACE
+
+    namelen = LEN(dset_name)
+    errcode = h5ltget_dataset_info_c(loc_id,namelen,dset_name,dims,type_class,type_size)
+
+  END SUBROUTINE h5ltget_dataset_info_f
+
+
+  !-------------------------------------------------------------------------
+  ! Query attribute functions
+  !-------------------------------------------------------------------------
+
+  !>
+  !! \ingroup FH5LT
+  !!
+  !! \brief Gets the dimensionality of an attribute.
+  !!
+  !! \param loc_id     Identifier of the object (dataset or group) to read the attribute from.
+  !! \param obj_name   The name of the object that the attribute is attached to.
+  !! \param attr_name  The attribute name.
+  !! \param rank       The dimensionality of the attribute.
+  !! \param errcode    \fortran_error
+  !!
+  !! See C API: @ref H5LTget_attribute_ndims()
+  !!
+  SUBROUTINE h5ltget_attribute_ndims_f(loc_id,&
+       obj_name,&
+       attr_name,&
+       rank,&
+       errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: obj_name
+    CHARACTER(LEN=*), INTENT(in) :: attr_name
+    INTEGER,          INTENT(inout) :: rank
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen ! name length
+    INTEGER(size_t) :: attrlen ! name length
+
+    INTERFACE
+       INTEGER FUNCTION h5ltget_attribute_ndims_c(loc_id,namelen,obj_name,attrlen,attr_name,rank) &
+            BIND(C,NAME='h5ltget_attribute_ndims_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(hid_t),   INTENT(in) :: loc_id
+         INTEGER(size_t) :: namelen
+         INTEGER(size_t) :: attrlen
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: obj_name
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: attr_name
+         INTEGER,          INTENT(inout) :: rank
+       END FUNCTION h5ltget_attribute_ndims_c
+    END INTERFACE
+
+    namelen = LEN(obj_name)
+    attrlen = LEN(attr_name)
+    errcode = h5ltget_attribute_ndims_c(loc_id,namelen,obj_name,attrlen,attr_name,rank)
+
+  END SUBROUTINE h5ltget_attribute_ndims_f
+
+  !>
+  !! \ingroup FH5LT
+  !!
+  !! \brief Gets information about an attribute.
+  !!
+  !! \param loc_id     Identifier of the object (dataset or group) to read the attribute from.
+  !! \param obj_name   The name of the object that the attribute is attached to.
+  !! \param attr_name  The attribute name.
+  !! \param dims       The dimensions of the attribute.
+  !! \param type_class The class identifier. For a list of valid class types see: H5Tget_class_f().
+  !! \param type_size  The size of the datatype in bytes.
+  !! \param errcode    \fortran_error
+  !!
+  !! See C API: @ref H5LTget_attribute_info()
+  !!
+  SUBROUTINE h5ltget_attribute_info_f(loc_id,&
+       obj_name,&
+       attr_name,&
+       dims,&
+       type_class,&
+       type_size,&
+       errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: obj_name
+    CHARACTER(LEN=*), INTENT(in) :: attr_name
+    INTEGER(hsize_t),DIMENSION(*),INTENT(inout):: dims
+    INTEGER, INTENT(inout)         :: type_class
+    INTEGER(size_t), INTENT(inout) :: type_size
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen ! name length
+    INTEGER(size_t) :: attrlen ! name length
+
+    INTERFACE
+       INTEGER FUNCTION h5ltget_attribute_info_c(loc_id,namelen,obj_name,attrlen,attr_name,dims,type_class,type_size) &
+            BIND(C,NAME='h5ltget_attribute_info_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(hid_t),   INTENT(in) :: loc_id
+         INTEGER(size_t) :: namelen
+         INTEGER(size_t) :: attrlen
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: obj_name
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: attr_name
+         INTEGER(hsize_t),DIMENSION(*),INTENT(inout):: dims
+         INTEGER, INTENT(inout)         :: type_class
+         INTEGER(size_t), INTENT(inout) :: type_size
+       END FUNCTION h5ltget_attribute_info_c
+    END INTERFACE
+
+    namelen = LEN(obj_name)
+    attrlen = LEN(attr_name)
+    errcode = h5ltget_attribute_info_c(loc_id,namelen,obj_name,attrlen,attr_name,dims,type_class,type_size)
+
+  END SUBROUTINE h5ltget_attribute_info_f
+
+  !>
+  !! \ingroup FH5LT
+  !!
+  !! \brief Determines whether an HDF5 path is valid and, optionally, whether the path resolves to an HDF5 object.
+  !!
+  !! \param loc_id              Identifier of an object in the file.
+  !! \param path                The path to the object to check; links in path may be of any type.
+  !! \param check_object_valid	Indicates whether to check if the final component of the path resolves to a valid object.
+  !! \param path_valid          Object status.
+  !! \param errcode             \fortran_error
+  !!
+  !! See C API: @ref H5LTpath_valid()
+  !!
+  SUBROUTINE h5ltpath_valid_f(loc_id, path, check_object_valid, path_valid, errcode)
+
+    IMPLICIT NONE
+    INTEGER(hid_t)  , INTENT(IN)  :: loc_id
+    CHARACTER(LEN=*), INTENT(IN)  :: path
+    LOGICAL         , INTENT(IN)  :: check_object_valid
+    LOGICAL         , INTENT(OUT) :: path_valid
+    INTEGER         , INTENT(OUT) :: errcode
+
+    INTEGER(size_t) :: pathlen
+    INTEGER :: check_object_valid_c
+    INTEGER :: status
+
+    INTERFACE
+       INTEGER FUNCTION h5ltpath_valid_c(loc_id, path, pathlen, check_object_valid_c) &
+            BIND(C,NAME='h5ltpath_valid_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(hid_t),   INTENT(in) :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: path
+         INTEGER(size_t) :: pathlen
+         INTEGER :: check_object_valid_c
+       END FUNCTION h5ltpath_valid_c
+    END INTERFACE
+
+    ! Initialize
+    path_valid = .FALSE.
+    errcode = 0
+
+    check_object_valid_c = 0
+    IF(check_object_valid) check_object_valid_c = 1
+
+    pathlen = LEN(path)
+    status = h5ltpath_valid_c(loc_id, path, pathlen, check_object_valid_c)
+
+    IF(status.EQ.1)THEN
+       path_valid = .TRUE.
+    ELSE IF(status.LT.0)THEN
+       errcode = -1
+    ENDIF
+
+  END SUBROUTINE h5ltpath_valid_f
+
+#ifdef H5_DOXYGEN
+END MODULE H5LT
+#else
+END MODULE H5LT_CONST
+#endif
+
+
+
+
+
+
diff --git a/hl/fortran/src/H5LTff.f90 b/hl/fortran/src/H5LTff.f90
deleted file mode 100644
index 9393f7f..0000000
--- a/hl/fortran/src/H5LTff.f90
+++ /dev/null
@@ -1,6490 +0,0 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-!
-! This file contains FORTRAN90 interfaces for H5LT functions
-!
-
-MODULE h5lt
-  USE h5fortran_types
-  USE hdf5
-
-  INTERFACE h5ltmake_dataset_f
-     MODULE PROCEDURE h5ltmake_dataset_f_int1
-     MODULE PROCEDURE h5ltmake_dataset_f_int2
-     MODULE PROCEDURE h5ltmake_dataset_f_int3
-     MODULE PROCEDURE h5ltmake_dataset_f_int4
-     MODULE PROCEDURE h5ltmake_dataset_f_int5
-     MODULE PROCEDURE h5ltmake_dataset_f_int6
-     MODULE PROCEDURE h5ltmake_dataset_f_int7
-     MODULE PROCEDURE h5ltmake_dataset_f_float1
-     MODULE PROCEDURE h5ltmake_dataset_f_float2
-     MODULE PROCEDURE h5ltmake_dataset_f_float3
-     MODULE PROCEDURE h5ltmake_dataset_f_float4
-     MODULE PROCEDURE h5ltmake_dataset_f_float5
-     MODULE PROCEDURE h5ltmake_dataset_f_float6
-     MODULE PROCEDURE h5ltmake_dataset_f_float7
-     MODULE PROCEDURE h5ltmake_dataset_f_double1
-     MODULE PROCEDURE h5ltmake_dataset_f_double2
-     MODULE PROCEDURE h5ltmake_dataset_f_double3
-     MODULE PROCEDURE h5ltmake_dataset_f_double4
-     MODULE PROCEDURE h5ltmake_dataset_f_double5
-     MODULE PROCEDURE h5ltmake_dataset_f_double6
-     MODULE PROCEDURE h5ltmake_dataset_f_double7
-  END INTERFACE
-
-  INTERFACE h5ltread_dataset_f
-     MODULE PROCEDURE h5ltread_dataset_f_int1
-     MODULE PROCEDURE h5ltread_dataset_f_int2
-     MODULE PROCEDURE h5ltread_dataset_f_int3
-     MODULE PROCEDURE h5ltread_dataset_f_int4
-     MODULE PROCEDURE h5ltread_dataset_f_int5
-     MODULE PROCEDURE h5ltread_dataset_f_int6
-     MODULE PROCEDURE h5ltread_dataset_f_int7
-     MODULE PROCEDURE h5ltread_dataset_f_float1
-     MODULE PROCEDURE h5ltread_dataset_f_float2
-     MODULE PROCEDURE h5ltread_dataset_f_float3
-     MODULE PROCEDURE h5ltread_dataset_f_float4
-     MODULE PROCEDURE h5ltread_dataset_f_float5
-     MODULE PROCEDURE h5ltread_dataset_f_float6
-     MODULE PROCEDURE h5ltread_dataset_f_float7
-     MODULE PROCEDURE h5ltread_dataset_f_double1
-     MODULE PROCEDURE h5ltread_dataset_f_double2
-     MODULE PROCEDURE h5ltread_dataset_f_double3
-     MODULE PROCEDURE h5ltread_dataset_f_double4
-     MODULE PROCEDURE h5ltread_dataset_f_double5
-     MODULE PROCEDURE h5ltread_dataset_f_double6
-     MODULE PROCEDURE h5ltread_dataset_f_double7
-  END INTERFACE
-
-  INTERFACE h5ltmake_dataset_int_f
-     MODULE PROCEDURE h5ltmake_dataset_int_f_1
-     MODULE PROCEDURE h5ltmake_dataset_int_f_2
-     MODULE PROCEDURE h5ltmake_dataset_int_f_3
-     MODULE PROCEDURE h5ltmake_dataset_int_f_4
-     MODULE PROCEDURE h5ltmake_dataset_int_f_5
-     MODULE PROCEDURE h5ltmake_dataset_int_f_6
-     MODULE PROCEDURE h5ltmake_dataset_int_f_7
-  END INTERFACE
-
-  INTERFACE h5ltmake_dataset_float_f
-     MODULE PROCEDURE h5ltmake_dataset_float_f_1
-     MODULE PROCEDURE h5ltmake_dataset_float_f_2
-     MODULE PROCEDURE h5ltmake_dataset_float_f_3
-     MODULE PROCEDURE h5ltmake_dataset_float_f_4
-     MODULE PROCEDURE h5ltmake_dataset_float_f_5
-     MODULE PROCEDURE h5ltmake_dataset_float_f_6
-     MODULE PROCEDURE h5ltmake_dataset_float_f_7
-  END INTERFACE
-
-  INTERFACE h5ltmake_dataset_double_f
-     MODULE PROCEDURE h5ltmake_dataset_double_f_1
-     MODULE PROCEDURE h5ltmake_dataset_double_f_2
-     MODULE PROCEDURE h5ltmake_dataset_double_f_3
-     MODULE PROCEDURE h5ltmake_dataset_double_f_4
-     MODULE PROCEDURE h5ltmake_dataset_double_f_5
-     MODULE PROCEDURE h5ltmake_dataset_double_f_6
-     MODULE PROCEDURE h5ltmake_dataset_double_f_7
-  END INTERFACE
-
-  INTERFACE h5ltread_dataset_int_f
-     MODULE PROCEDURE h5ltread_dataset_int_f_1
-     MODULE PROCEDURE h5ltread_dataset_int_f_2
-     MODULE PROCEDURE h5ltread_dataset_int_f_3
-     MODULE PROCEDURE h5ltread_dataset_int_f_4
-     MODULE PROCEDURE h5ltread_dataset_int_f_5
-     MODULE PROCEDURE h5ltread_dataset_int_f_6
-     MODULE PROCEDURE h5ltread_dataset_int_f_7
-  END INTERFACE
-
-  INTERFACE h5ltread_dataset_float_f
-     MODULE PROCEDURE h5ltread_dataset_float_f_1
-     MODULE PROCEDURE h5ltread_dataset_float_f_2
-     MODULE PROCEDURE h5ltread_dataset_float_f_3
-     MODULE PROCEDURE h5ltread_dataset_float_f_4
-     MODULE PROCEDURE h5ltread_dataset_float_f_5
-     MODULE PROCEDURE h5ltread_dataset_float_f_6
-     MODULE PROCEDURE h5ltread_dataset_float_f_7
-  END INTERFACE
-
-  INTERFACE h5ltread_dataset_double_f
-     MODULE PROCEDURE h5ltread_dataset_double_f_1
-     MODULE PROCEDURE h5ltread_dataset_double_f_2
-     MODULE PROCEDURE h5ltread_dataset_double_f_3
-     MODULE PROCEDURE h5ltread_dataset_double_f_4
-     MODULE PROCEDURE h5ltread_dataset_double_f_5
-     MODULE PROCEDURE h5ltread_dataset_double_f_6
-     MODULE PROCEDURE h5ltread_dataset_double_f_7
-  END INTERFACE
-
-CONTAINS
-  !-------------------------------------------------------------------------
-  ! Make/Read dataset functions
-  !-------------------------------------------------------------------------
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltmake_dataset_f_int1
-  !
-  ! Purpose: Creates and writes a dataset of a type TYPE_ID
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: September 1, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltmake_dataset_f_int1(loc_id,&
-       dset_name,&
-       rank,&
-       dims,&
-       type_id,&
-       buf,&
-       errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltmake_dataset_f_int1
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER, INTENT(in), DIMENSION(*) :: buf           ! data buffer
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                         ! name length
-
-    INTERFACE
-       INTEGER FUNCTION h5ltmake_dataset_int1_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTMAKE_DATASET_INT1_C'::h5ltmake_dataset_int1_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         INTEGER, INTENT(in), DIMENSION(*) :: buf                ! data buffer
-       END FUNCTION h5ltmake_dataset_int1_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltmake_dataset_int1_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-
-  END SUBROUTINE h5ltmake_dataset_f_int1
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltmake_dataset_f_int2
-  !
-  ! Purpose: Creates and writes a dataset of a type TYPE_ID
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: September 1, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltmake_dataset_f_int2(loc_id,&
-       dset_name,&
-       rank,&
-       dims,&
-       type_id,&
-       buf,&
-       errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltmake_dataset_f_int2
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    INTEGER, INTENT(in), &
-         DIMENSION(dims(1),dims(2)) :: buf                  ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltmake_dataset_int2_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTMAKE_DATASET_INT2_C'::h5ltmake_dataset_int2_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                              ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         INTEGER, INTENT(in), &
-              DIMENSION(dims(1),dims(2)) :: buf                       ! data buffer
-       END FUNCTION h5ltmake_dataset_int2_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltmake_dataset_int2_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-
-  END SUBROUTINE h5ltmake_dataset_f_int2
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltmake_dataset_f_int3
-  !
-  ! Purpose: Creates and writes a dataset of a type TYPE_ID
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: September 1, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltmake_dataset_f_int3(loc_id,&
-       dset_name,&
-       rank,&
-       dims,&
-       type_id,&
-       buf,&
-       errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltmake_dataset_f_int3
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    INTEGER, INTENT(in), &
-         DIMENSION(dims(1),dims(2),dims(3)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltmake_dataset_int3_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTMAKE_DATASET_INT3_C'::h5ltmake_dataset_int3_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         INTEGER, INTENT(in), &
-              DIMENSION(dims(1),dims(2),dims(3)) :: buf               ! data buffer
-       END FUNCTION h5ltmake_dataset_int3_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltmake_dataset_int3_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-
-  END SUBROUTINE h5ltmake_dataset_f_int3
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltmake_dataset_f_int4
-  !
-  ! Purpose: Creates and writes a dataset of a type TYPE_ID
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: M. Scot Breitenfeld
-  !
-  ! Date: March 7, 2011
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltmake_dataset_f_int4(loc_id, dset_name, rank, dims, &
-       type_id, buf, errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltmake_dataset_f_int4
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    INTEGER, INTENT(in), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf  ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltmake_dataset_int4_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTMAKE_DATASET_INT4_C'::h5ltmake_dataset_int4_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         INTEGER, INTENT(in), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf      ! data buffer
-       END FUNCTION h5ltmake_dataset_int4_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltmake_dataset_int4_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-
-  END SUBROUTINE h5ltmake_dataset_f_int4
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltmake_dataset_f_int5
-  !
-  ! Purpose: Creates and writes a dataset of a type TYPE_ID
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: M. Scot Breitenfeld
-  !
-  ! Date: March 7, 2011
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltmake_dataset_f_int5(loc_id, dset_name, rank, dims, &
-       type_id, buf, errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltmake_dataset_f_int5
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    INTEGER, INTENT(in), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf  ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltmake_dataset_int5_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTMAKE_DATASET_INT5_C'::h5ltmake_dataset_int5_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         INTEGER, INTENT(in), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf      ! data buffer
-       END FUNCTION h5ltmake_dataset_int5_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltmake_dataset_int5_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-
-  END SUBROUTINE h5ltmake_dataset_f_int5
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltmake_dataset_f_int6
-  !
-  ! Purpose: Creates and writes a dataset of a type TYPE_ID
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: M. Scot Breitenfeld
-  !
-  ! Date: March 7, 2011
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltmake_dataset_f_int6(loc_id, dset_name, rank, dims, &
-       type_id, buf, errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltmake_dataset_f_int6
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    INTEGER, INTENT(in), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf  ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltmake_dataset_int6_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTMAKE_DATASET_INT6_C'::h5ltmake_dataset_int6_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         INTEGER, INTENT(in), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf      ! data buffer
-       END FUNCTION h5ltmake_dataset_int6_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltmake_dataset_int6_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-
-  END SUBROUTINE h5ltmake_dataset_f_int6
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltmake_dataset_f_int7
-  !
-  ! Purpose: Creates and writes a dataset of a type TYPE_ID
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: M. Scot Breitenfeld
-  !
-  ! Date: March 7, 2011
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltmake_dataset_f_int7(loc_id, dset_name, rank, dims, &
-       type_id, buf, errcode )
-    
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltmake_dataset_f_int7
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    INTEGER, INTENT(in), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf  ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltmake_dataset_int7_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTMAKE_DATASET_INT7_C'::h5ltmake_dataset_int7_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         INTEGER, INTENT(in), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf      ! data buffer
-       END FUNCTION h5ltmake_dataset_int7_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltmake_dataset_int7_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-
-  END SUBROUTINE h5ltmake_dataset_f_int7
-
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltmake_dataset_f_float1
-  !
-  ! Purpose: Creates and writes a dataset of a type TYPE_ID
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: September 1, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltmake_dataset_f_float1(loc_id,&
-       dset_name,&
-       rank,&
-       dims,&
-       type_id,&
-       buf,&
-       errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltmake_dataset_f_float1
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    REAL, INTENT(in), DIMENSION(*) :: buf              ! data buffer
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-
-    INTERFACE
-       INTEGER FUNCTION h5ltmake_dataset_fl1_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTMAKE_DATASET_FL1_C'::h5ltmake_dataset_fl1_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         REAL, INTENT(in), DIMENSION(*) :: buf                   ! data buffer
-       END FUNCTION h5ltmake_dataset_fl1_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltmake_dataset_fl1_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-
-  END SUBROUTINE h5ltmake_dataset_f_float1
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltmake_dataset_f_float2
-  !
-  ! Purpose: Creates and writes a dataset of a type TYPE_ID
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: September 1, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltmake_dataset_f_float2(loc_id,&
-       dset_name,&
-       rank,&
-       dims,&
-       type_id,&
-       buf,&
-       errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltmake_dataset_f_float2
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    REAL, INTENT(in), &
-         DIMENSION(dims(1),dims(2)) :: buf                  ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltmake_dataset_fl2_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTMAKE_DATASET_FL2_C'::h5ltmake_dataset_fl2_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         REAL, INTENT(in), &
-              DIMENSION(dims(1),dims(2)) :: buf                       ! data buffer
-       END FUNCTION h5ltmake_dataset_fl2_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltmake_dataset_fl2_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-
-  END SUBROUTINE h5ltmake_dataset_f_float2
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltmake_dataset_f_float3
-  !
-  ! Purpose: Creates and writes a dataset of a type TYPE_ID
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: September 1, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltmake_dataset_f_float3(loc_id,&
-       dset_name,&
-       rank,&
-       dims,&
-       type_id,&
-       buf,&
-       errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltmake_dataset_f_float3
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    REAL, INTENT(in), &
-         DIMENSION(dims(1),dims(2),dims(3)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltmake_dataset_fl3_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTMAKE_DATASET_FL3_C'::h5ltmake_dataset_fl3_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         REAL, INTENT(in), &
-              DIMENSION(dims(1),dims(2),dims(3)) :: buf               ! data buffer
-       END FUNCTION h5ltmake_dataset_fl3_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltmake_dataset_fl3_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-
-  END SUBROUTINE h5ltmake_dataset_f_float3
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltmake_dataset_f_float4
-  !
-  ! Purpose: Creates and writes a dataset of a type TYPE_ID
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: M. Scot Breitenfeld
-  !
-  ! Date: March 7, 2011
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltmake_dataset_f_float4(loc_id, dset_name, rank, dims,&
-       type_id, buf, errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltmake_dataset_f_float4
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    REAL, INTENT(in), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltmake_dataset_fl4_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTMAKE_DATASET_FL4_C'::h5ltmake_dataset_fl4_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         REAL, INTENT(in), &
-              DIMENSION(dims(1),dims(2),dims(3), dims(4)) :: buf ! data buffer
-       END FUNCTION h5ltmake_dataset_fl4_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltmake_dataset_fl4_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-
-  END SUBROUTINE h5ltmake_dataset_f_float4
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltmake_dataset_f_float5
-  !
-  ! Purpose: Creates and writes a dataset of a type TYPE_ID
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: M. Scot Breitenfeld
-  !
-  ! Date: March 7, 2011
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltmake_dataset_f_float5(loc_id, dset_name, rank, dims,&
-       type_id, buf, errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltmake_dataset_f_float5
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    REAL, INTENT(in), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltmake_dataset_fl5_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTMAKE_DATASET_FL5_C'::h5ltmake_dataset_fl5_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         REAL, INTENT(in), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf ! data buffer
-       END FUNCTION h5ltmake_dataset_fl5_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltmake_dataset_fl5_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-
-  END SUBROUTINE h5ltmake_dataset_f_float5
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltmake_dataset_f_float6
-  !
-  ! Purpose: Creates and writes a dataset of a type TYPE_ID
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: M. Scot Breitenfeld
-  !
-  ! Date: March 7, 2011
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltmake_dataset_f_float6(loc_id, dset_name, rank, dims,&
-       type_id, buf, errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltmake_dataset_f_float6
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    REAL, INTENT(in), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltmake_dataset_fl6_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTMAKE_DATASET_FL6_C'::h5ltmake_dataset_fl6_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         REAL, INTENT(in), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf ! data buffer
-       END FUNCTION h5ltmake_dataset_fl6_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltmake_dataset_fl6_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-
-  END SUBROUTINE h5ltmake_dataset_f_float6
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltmake_dataset_f_float7
-  !
-  ! Purpose: Creates and writes a dataset of a type TYPE_ID
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: M. Scot Breitenfeld
-  !
-  ! Date: March 7, 2011
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltmake_dataset_f_float7(loc_id, dset_name, rank, dims,&
-       type_id, buf, errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltmake_dataset_f_float7
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    REAL, INTENT(in), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltmake_dataset_fl7_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTMAKE_DATASET_FL7_C'::h5ltmake_dataset_fl7_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         REAL, INTENT(in), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf ! data buffer
-       END FUNCTION h5ltmake_dataset_fl7_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltmake_dataset_fl7_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-
-  END SUBROUTINE h5ltmake_dataset_f_float7
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltmake_dataset_f_double1
-  !
-  ! Purpose: Creates and writes a dataset of a type TYPE_ID
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: September 1, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltmake_dataset_f_double1(loc_id,&
-       dset_name,&
-       rank,&
-       dims,&
-       type_id,&
-       buf,&
-       errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltmake_dataset_f_double1
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    DOUBLE PRECISION, INTENT(in), DIMENSION(*) :: buf  ! data buffer
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-
-    INTERFACE
-       INTEGER FUNCTION h5ltmake_dataset_dl1_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTMAKE_DATASET_DL1_C'::h5ltmake_dataset_dl1_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         DOUBLE PRECISION, INTENT(in), DIMENSION(*) :: buf       ! data buffer
-       END FUNCTION h5ltmake_dataset_dl1_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltmake_dataset_dl1_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-
-  END SUBROUTINE h5ltmake_dataset_f_double1
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltmake_dataset_f_double2
-  !
-  ! Purpose: Creates and writes a dataset of a type TYPE_ID
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: September 1, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltmake_dataset_f_double2(loc_id,&
-       dset_name,&
-       rank,&
-       dims,&
-       type_id,&
-       buf,&
-       errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltmake_dataset_f_double2
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    DOUBLE PRECISION, INTENT(in), &
-         DIMENSION(dims(1),dims(2)) :: buf                  ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltmake_dataset_dl2_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTMAKE_DATASET_DL2_C'::h5ltmake_dataset_dl2_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         DOUBLE PRECISION, INTENT(in), &
-              DIMENSION(dims(1),dims(2)) :: buf                       ! data buffer
-       END FUNCTION h5ltmake_dataset_dl2_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltmake_dataset_dl2_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-
-  END SUBROUTINE h5ltmake_dataset_f_double2
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltmake_dataset_f_double3
-  !
-  ! Purpose: Creates and writes a dataset of a type TYPE_ID
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: September 1, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltmake_dataset_f_double3(loc_id,&
-       dset_name,&
-       rank,&
-       dims,&
-       type_id,&
-       buf,&
-       errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltmake_dataset_f_double3
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    DOUBLE PRECISION, INTENT(in), &
-         DIMENSION(dims(1),dims(2),dims(3)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltmake_dataset_dl3_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTMAKE_DATASET_DL3_C'::h5ltmake_dataset_dl3_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         DOUBLE PRECISION, INTENT(in), &
-              DIMENSION(dims(1),dims(2),dims(3)) :: buf               ! data buffer
-       END FUNCTION h5ltmake_dataset_dl3_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltmake_dataset_dl3_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-
-  END SUBROUTINE h5ltmake_dataset_f_double3
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltmake_dataset_f_double4
-  !
-  ! Purpose: Creates and writes a dataset of a type TYPE_ID
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: M. Scot Breitenfeld
-  !
-  ! Date: March 7, 2011
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltmake_dataset_f_double4(loc_id, dset_name, rank, dims, &
-       type_id, buf, errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltmake_dataset_f_double4
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    DOUBLE PRECISION, INTENT(in), &
-         DIMENSION(dims(1),dims(2),dims(3), dims(4)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltmake_dataset_dl4_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTMAKE_DATASET_DL4_C'::h5ltmake_dataset_dl4_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         DOUBLE PRECISION, INTENT(in), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf  ! data buffer
-       END FUNCTION h5ltmake_dataset_dl4_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltmake_dataset_dl4_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-
-  END SUBROUTINE h5ltmake_dataset_f_double4
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltmake_dataset_f_double5
-  !
-  ! Purpose: Creates and writes a dataset of a type TYPE_ID
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: M. Scot Breitenfeld
-  !
-  ! Date: March 7, 2011
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltmake_dataset_f_double5(loc_id, dset_name, rank, dims, &
-       type_id, buf, errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltmake_dataset_f_double5
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    DOUBLE PRECISION, INTENT(in), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltmake_dataset_dl5_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTMAKE_DATASET_DL5_C'::h5ltmake_dataset_dl5_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         DOUBLE PRECISION, INTENT(in), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf  ! data buffer
-       END FUNCTION h5ltmake_dataset_dl5_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltmake_dataset_dl5_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-
-  END SUBROUTINE h5ltmake_dataset_f_double5
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltmake_dataset_f_double6
-  !
-  ! Purpose: Creates and writes a dataset of a type TYPE_ID
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: M. Scot Breitenfeld
-  !
-  ! Date: March 7, 2011
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltmake_dataset_f_double6(loc_id, dset_name, rank, dims, &
-       type_id, buf, errcode )
-    
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltmake_dataset_f_double6
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    DOUBLE PRECISION, INTENT(in), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltmake_dataset_dl6_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTMAKE_DATASET_DL6_C'::h5ltmake_dataset_dl6_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         DOUBLE PRECISION, INTENT(in), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf  ! data buffer
-       END FUNCTION h5ltmake_dataset_dl6_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltmake_dataset_dl6_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-
-  END SUBROUTINE h5ltmake_dataset_f_double6
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltmake_dataset_f_double7
-  !
-  ! Purpose: Creates and writes a dataset of a type TYPE_ID
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: M. Scot Breitenfeld
-  !
-  ! Date: March 7, 2011
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltmake_dataset_f_double7(loc_id, dset_name, rank, dims, &
-       type_id, buf, errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltmake_dataset_f_double7
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    DOUBLE PRECISION, INTENT(in), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltmake_dataset_dl7_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTMAKE_DATASET_DL7_C'::h5ltmake_dataset_dl7_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         DOUBLE PRECISION, INTENT(in), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf  ! data buffer
-       END FUNCTION h5ltmake_dataset_dl7_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltmake_dataset_dl7_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-
-  END SUBROUTINE h5ltmake_dataset_f_double7
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltread_dataset_f_int1
-  !
-  ! Purpose: Read a dataset of a type TYPE_ID
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: September 22, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltread_dataset_f_int1(loc_id,&
-       dset_name,&
-       type_id,&
-       buf,&
-       dims,&
-       errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltread_dataset_f_int1
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER, INTENT(inout), DIMENSION(*) :: buf        ! data buffer
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-
-    INTERFACE
-       INTEGER FUNCTION h5ltread_dataset_int1_c(loc_id,namelen,dset_name,type_id,buf,dims)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTREAD_DATASET_INT1_C'::h5ltread_dataset_int1_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(HID_T),   INTENT(IN) :: loc_id                  ! file or group identifier
-         INTEGER(HID_T),   INTENT(IN) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(LEN=*), INTENT(IN) :: dset_name               ! name of the dataset
-         INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: dims      ! size of the buffer buf
-         INTEGER, INTENT(IN), DIMENSION(*) :: buf                ! data buffer
-       END FUNCTION h5ltread_dataset_int1_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltread_dataset_int1_c(loc_id,namelen,dset_name,type_id,buf,dims)
-
-  END SUBROUTINE h5ltread_dataset_f_int1
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltread_dataset_f_int2
-  !
-  ! Purpose: Read a dataset of a type TYPE_ID
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: September 22, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltread_dataset_f_int2(loc_id,&
-       dset_name,&
-       type_id,&
-       buf,&
-       dims,&
-       errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltread_dataset_f_int2
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    INTEGER, INTENT(inout), &
-         DIMENSION(dims(1),dims(2)) :: buf                  ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltread_dataset_int2_c(loc_id,namelen,dset_name,type_id,buf,dims)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTREAD_DATASET_INT2_C'::h5ltread_dataset_int2_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         INTEGER, INTENT(in), &
-              DIMENSION(dims(1),dims(2)) :: buf                       ! data buffer
-       END FUNCTION h5ltread_dataset_int2_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltread_dataset_int2_c(loc_id,namelen,dset_name,type_id,buf,dims)
-
-  END SUBROUTINE h5ltread_dataset_f_int2
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltread_dataset_f_int3
-  !
-  ! Purpose: Read a dataset of a type TYPE_ID
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: September 22, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltread_dataset_f_int3(loc_id,&
-       dset_name,&
-       type_id,&
-       buf,&
-       dims,&
-       errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltread_dataset_f_int3
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    INTEGER, INTENT(inout), &
-         DIMENSION(dims(1),dims(2),dims(3)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltread_dataset_int3_c(loc_id,namelen,dset_name,type_id,buf,dims)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTREAD_DATASET_INT3_C'::h5ltread_dataset_int3_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         INTEGER, INTENT(in), &
-              DIMENSION(dims(1),dims(2),dims(3)) :: buf               ! data buffer
-       END FUNCTION h5ltread_dataset_int3_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltread_dataset_int3_c(loc_id,namelen,dset_name,type_id,buf,dims)
-
-  END SUBROUTINE h5ltread_dataset_f_int3
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltread_dataset_f_int4
-  !
-  ! Purpose: Read a dataset of a type TYPE_ID
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: M. Scot Breitenfeld
-  !
-  ! Date: March 12, 2011
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltread_dataset_f_int4(loc_id, dset_name, type_id, buf, &
-       dims, errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltread_dataset_f_int4
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    INTEGER, INTENT(inout), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltread_dataset_int4_c(loc_id,namelen,dset_name,type_id,buf,dims)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTREAD_DATASET_INT4_C'::h5ltread_dataset_int4_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         INTEGER, INTENT(in), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf               ! data buffer
-       END FUNCTION h5ltread_dataset_int4_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltread_dataset_int4_c(loc_id,namelen,dset_name,type_id,buf,dims)
-
-  END SUBROUTINE h5ltread_dataset_f_int4
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltread_dataset_f_int5
-  !
-  ! Purpose: Read a dataset of a type TYPE_ID
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: M. Scot Breitenfeld
-  !
-  ! Date: March 12, 2011
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltread_dataset_f_int5(loc_id, dset_name, type_id, buf, &
-       dims, errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltread_dataset_f_int5
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    INTEGER, INTENT(inout), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltread_dataset_int5_c(loc_id,namelen,dset_name,type_id,buf,dims)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTREAD_DATASET_INT5_C'::h5ltread_dataset_int5_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         INTEGER, INTENT(in), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf               ! data buffer
-       END FUNCTION h5ltread_dataset_int5_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltread_dataset_int5_c(loc_id,namelen,dset_name,type_id,buf,dims)
-
-  END SUBROUTINE h5ltread_dataset_f_int5
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltread_dataset_f_int6
-  !
-  ! Purpose: Read a dataset of a type TYPE_ID
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: M. Scot Breitenfeld
-  !
-  ! Date: March 12, 2011
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltread_dataset_f_int6(loc_id, dset_name, type_id, buf, &
-       dims, errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltread_dataset_f_int6
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    INTEGER, INTENT(inout), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltread_dataset_int6_c(loc_id,namelen,dset_name,type_id,buf,dims)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTREAD_DATASET_INT6_C'::h5ltread_dataset_int6_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         INTEGER, INTENT(in), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf               ! data buffer
-       END FUNCTION h5ltread_dataset_int6_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltread_dataset_int6_c(loc_id,namelen,dset_name,type_id,buf,dims)
-
-  END SUBROUTINE h5ltread_dataset_f_int6
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltread_dataset_f_int7
-  !
-  ! Purpose: Read a dataset of a type TYPE_ID
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: M. Scot Breitenfeld
-  !
-  ! Date: March 12, 2011
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltread_dataset_f_int7(loc_id, dset_name, type_id, buf, &
-       dims, errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltread_dataset_f_int7
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    INTEGER, INTENT(inout), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltread_dataset_int7_c(loc_id,namelen,dset_name,type_id,buf,dims)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTREAD_DATASET_INT7_C'::h5ltread_dataset_int7_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         INTEGER, INTENT(in), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf               ! data buffer
-       END FUNCTION h5ltread_dataset_int7_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltread_dataset_int7_c(loc_id,namelen,dset_name,type_id,buf,dims)
-
-  END SUBROUTINE h5ltread_dataset_f_int7
-
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltread_dataset_f_float1
-  !
-  ! Purpose: Read a dataset of a type TYPE_ID
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: September 22, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltread_dataset_f_float1(loc_id,&
-       dset_name,&
-       type_id,&
-       buf,&
-       dims,&
-       errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltread_dataset_f_float1
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    REAL, INTENT(inout), DIMENSION(*) :: buf           ! data buffer
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-
-    INTERFACE
-       INTEGER FUNCTION h5ltread_dataset_fl1_c(loc_id,namelen,dset_name,type_id,buf,dims)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTREAD_DATASET_FL1_C'::h5ltread_dataset_fl1_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         REAL, INTENT(in), DIMENSION(*) :: buf                   ! data buffer
-       END FUNCTION h5ltread_dataset_fl1_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltread_dataset_fl1_c(loc_id,namelen,dset_name,type_id,buf,dims)
-
-  END SUBROUTINE h5ltread_dataset_f_float1
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltread_dataset_f_float2
-  !
-  ! Purpose: Read a dataset of a type TYPE_ID
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: September 22, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltread_dataset_f_float2(loc_id,&
-       dset_name,&
-       type_id,&
-       buf,&
-       dims,&
-       errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltread_dataset_f_float2
-    !DEC$endif
-    !
-
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    REAL, INTENT(inout), &
-         DIMENSION(dims(1),dims(2)) :: buf                  ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltread_dataset_fl2_c(loc_id,namelen,dset_name,type_id,buf,dims)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTREAD_DATASET_FL2_C'::h5ltread_dataset_fl2_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         REAL, INTENT(in), &
-              DIMENSION(dims(1),dims(2)) :: buf                       ! data buffer
-       END FUNCTION h5ltread_dataset_fl2_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltread_dataset_fl2_c(loc_id,namelen,dset_name,type_id,buf,dims)
-
-  END SUBROUTINE h5ltread_dataset_f_float2
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltread_dataset_f_float3
-  !
-  ! Purpose: Read a dataset of a type TYPE_ID
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: September 22, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltread_dataset_f_float3(loc_id,&
-       dset_name,&
-       type_id,&
-       buf,&
-       dims,&
-       errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltread_dataset_f_float3
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    REAL, INTENT(inout), &
-         DIMENSION(dims(1),dims(2),dims(3)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltread_dataset_fl3_c(loc_id,namelen,dset_name,type_id,buf,dims)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTREAD_DATASET_FL3_C'::h5ltread_dataset_fl3_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         REAL, INTENT(in), &
-              DIMENSION(dims(1),dims(2),dims(3)) :: buf               ! data buffer
-       END FUNCTION h5ltread_dataset_fl3_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltread_dataset_fl3_c(loc_id,namelen,dset_name,type_id,buf,dims)
-
-  END SUBROUTINE h5ltread_dataset_f_float3
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltread_dataset_f_float4
-  !
-  ! Purpose: Read a dataset of a type TYPE_ID
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: M. Scot Breitenfeld
-  !
-  ! Date: March 8, 2011
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltread_dataset_f_float4(loc_id, dset_name, type_id, buf, &
-       dims, errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltread_dataset_f_float4
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    REAL, INTENT(inout), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltread_dataset_fl4_c(loc_id,namelen,dset_name,type_id,buf,dims)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTREAD_DATASET_FL4_C'::h5ltread_dataset_fl4_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         REAL, INTENT(in), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf               ! data buffer
-       END FUNCTION h5ltread_dataset_fl4_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltread_dataset_fl4_c(loc_id,namelen,dset_name,type_id,buf,dims)
-
-  END SUBROUTINE h5ltread_dataset_f_float4
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltread_dataset_f_float5
-  !
-  ! Purpose: Read a dataset of a type TYPE_ID
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: M. Scot Breitenfeld
-  !
-  ! Date: March 8, 2011
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltread_dataset_f_float5(loc_id, dset_name, type_id, buf, &
-       dims, errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltread_dataset_f_float5
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    REAL, INTENT(inout), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltread_dataset_fl5_c(loc_id,namelen,dset_name,type_id,buf,dims)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTREAD_DATASET_FL5_C'::h5ltread_dataset_fl5_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         REAL, INTENT(in), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf               ! data buffer
-       END FUNCTION h5ltread_dataset_fl5_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltread_dataset_fl5_c(loc_id,namelen,dset_name,type_id,buf,dims)
-
-  END SUBROUTINE h5ltread_dataset_f_float5
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltread_dataset_f_float6
-  !
-  ! Purpose: Read a dataset of a type TYPE_ID
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: M. Scot Breitenfeld
-  !
-  ! Date: March 8, 2011
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltread_dataset_f_float6(loc_id, dset_name, type_id, buf, &
-       dims, errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltread_dataset_f_float6
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    REAL, INTENT(inout), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltread_dataset_fl6_c(loc_id,namelen,dset_name,type_id,buf,dims)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTREAD_DATASET_FL6_C'::h5ltread_dataset_fl6_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         REAL, INTENT(in), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf               ! data buffer
-       END FUNCTION h5ltread_dataset_fl6_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltread_dataset_fl6_c(loc_id,namelen,dset_name,type_id,buf,dims)
-
-  END SUBROUTINE h5ltread_dataset_f_float6
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltread_dataset_f_float7
-  !
-  ! Purpose: Read a dataset of a type TYPE_ID
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: M. Scot Breitenfeld
-  !
-  ! Date: March 8, 2011
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltread_dataset_f_float7(loc_id, dset_name, type_id, buf, &
-       dims, errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltread_dataset_f_float7
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    REAL, INTENT(inout), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltread_dataset_fl7_c(loc_id,namelen,dset_name,type_id,buf,dims)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTREAD_DATASET_FL7_C'::h5ltread_dataset_fl7_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         REAL, INTENT(in), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf               ! data buffer
-       END FUNCTION h5ltread_dataset_fl7_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltread_dataset_fl7_c(loc_id,namelen,dset_name,type_id,buf,dims)
-
-  END SUBROUTINE h5ltread_dataset_f_float7
-
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltread_dataset_f_double1
-  !
-  ! Purpose: Read a dataset of a type TYPE_ID
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: September 22, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltread_dataset_f_double1(loc_id,&
-       dset_name,&
-       type_id,&
-       buf,&
-       dims,&
-       errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport ::h5ltread_dataset_f_double1
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    DOUBLE PRECISION, INTENT(inout), DIMENSION(*) :: buf ! data buffer
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-
-    INTERFACE
-       INTEGER FUNCTION h5ltread_dataset_dl1_c(loc_id,namelen,dset_name,type_id,buf,dims)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTREAD_DATASET_DL1_C'::h5ltread_dataset_dl1_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         DOUBLE PRECISION, INTENT(in), DIMENSION(*) :: buf       ! data buffer
-       END FUNCTION h5ltread_dataset_dl1_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltread_dataset_dl1_c(loc_id,namelen,dset_name,type_id,buf,dims)
-
-  END SUBROUTINE h5ltread_dataset_f_double1
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltread_dataset_f_double2
-  !
-  ! Purpose: Read a dataset of a type TYPE_ID
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: September 22, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltread_dataset_f_double2(loc_id,&
-       dset_name,&
-       type_id,&
-       buf,&
-       dims,&
-       errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltread_dataset_f_double2
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    DOUBLE PRECISION, INTENT(inout), &
-         DIMENSION(dims(1),dims(2)) :: buf                  ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltread_dataset_dl2_c(loc_id,namelen,dset_name,type_id,buf,dims)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTREAD_DATASET_DL2_C'::h5ltread_dataset_dl2_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         DOUBLE PRECISION, INTENT(in), &
-              DIMENSION(dims(1),dims(2)) :: buf                       ! data buffer
-       END FUNCTION h5ltread_dataset_dl2_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltread_dataset_dl2_c(loc_id,namelen,dset_name,type_id,buf,dims)
-
-  END SUBROUTINE h5ltread_dataset_f_double2
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltread_dataset_f_double3
-  !
-  ! Purpose: Read a dataset of a type TYPE_ID
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: September 22, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltread_dataset_f_double3(loc_id,&
-       dset_name,&
-       type_id,&
-       buf,&
-       dims,&
-       errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltread_dataset_f_double3
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    DOUBLE PRECISION, INTENT(inout), &
-         DIMENSION(dims(1),dims(2),dims(3)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltread_dataset_dl3_c(loc_id,namelen,dset_name,type_id,buf,dims)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTREAD_DATASET_DL3_C'::h5ltread_dataset_dl3_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         DOUBLE PRECISION, INTENT(in), &
-              DIMENSION(dims(1),dims(2),dims(3)) :: buf               ! data buffer
-       END FUNCTION h5ltread_dataset_dl3_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltread_dataset_dl3_c(loc_id,namelen,dset_name,type_id,buf,dims)
-
-  END SUBROUTINE h5ltread_dataset_f_double3
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltread_dataset_f_double4
-  !
-  ! Purpose: Read a dataset of a type TYPE_ID
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: M. Scot Breitenfeld
-  !
-  ! Date: March 8, 2011
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltread_dataset_f_double4(loc_id, dset_name, type_id, buf, &
-       dims, errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltread_dataset_f_double4
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    DOUBLE PRECISION, INTENT(inout), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltread_dataset_dl4_c(loc_id,namelen,dset_name,type_id,buf,dims)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTREAD_DATASET_DL4_C'::h5ltread_dataset_dl4_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         DOUBLE PRECISION, INTENT(in), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf               ! data buffer
-       END FUNCTION h5ltread_dataset_dl4_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltread_dataset_dl4_c(loc_id,namelen,dset_name,type_id,buf,dims)
-
-  END SUBROUTINE h5ltread_dataset_f_double4
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltread_dataset_f_double5
-  !
-  ! Purpose: Read a dataset of a type TYPE_ID
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: M. Scot Breitenfeld
-  !
-  ! Date: March 8, 2011
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltread_dataset_f_double5(loc_id, dset_name, type_id, buf, &
-       dims, errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltread_dataset_f_double5
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    DOUBLE PRECISION, INTENT(inout), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltread_dataset_dl5_c(loc_id,namelen,dset_name,type_id,buf,dims)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTREAD_DATASET_DL5_C'::h5ltread_dataset_dl5_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         DOUBLE PRECISION, INTENT(in), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf               ! data buffer
-       END FUNCTION h5ltread_dataset_dl5_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltread_dataset_dl5_c(loc_id,namelen,dset_name,type_id,buf,dims)
-
-  END SUBROUTINE h5ltread_dataset_f_double5
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltread_dataset_f_double6
-  !
-  ! Purpose: Read a dataset of a type TYPE_ID
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: M. Scot Breitenfeld
-  !
-  ! Date: March 8, 2011
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltread_dataset_f_double6(loc_id, dset_name, type_id, buf, &
-       dims, errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltread_dataset_f_double6
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    DOUBLE PRECISION, INTENT(inout), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltread_dataset_dl6_c(loc_id,namelen,dset_name,type_id,buf,dims)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTREAD_DATASET_DL6_C'::h5ltread_dataset_dl6_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         DOUBLE PRECISION, INTENT(in), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf               ! data buffer
-       END FUNCTION h5ltread_dataset_dl6_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltread_dataset_dl6_c(loc_id,namelen,dset_name,type_id,buf,dims)
-
-  END SUBROUTINE h5ltread_dataset_f_double6
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltread_dataset_f_double7
-  !
-  ! Purpose: Read a dataset of a type TYPE_ID
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: M. Scot Breitenfeld
-  !
-  ! Date: March 8, 2011
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltread_dataset_f_double7(loc_id, dset_name, type_id, buf, &
-       dims, errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltread_dataset_f_double7
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    DOUBLE PRECISION, INTENT(inout), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltread_dataset_dl7_c(loc_id,namelen,dset_name,type_id,buf,dims)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTREAD_DATASET_DL7_C'::h5ltread_dataset_dl7_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         DOUBLE PRECISION, INTENT(in), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf               ! data buffer
-       END FUNCTION h5ltread_dataset_dl7_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltread_dataset_dl7_c(loc_id,namelen,dset_name,type_id,buf,dims)
-
-  END SUBROUTINE h5ltread_dataset_f_double7
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltmake_dataset_int_f_1
-  !
-  ! Purpose: Creates and writes a dataset of H5T_NATIVE_INT type
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: September 22, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltmake_dataset_int_f_1 (loc_id,&
-       dset_name,&
-       rank,&
-       dims,&
-       buf,&
-       errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltmake_dataset_int_f_1
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER, INTENT(in), DIMENSION(*) :: buf           ! data buffer
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-
-    INTERFACE
-       INTEGER FUNCTION h5ltmake_dataset_nint1_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTMAKE_DATASET_NINT1_C'::h5ltmake_dataset_nint1_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         INTEGER, INTENT(in), DIMENSION(*) :: buf                ! data buffer
-       END FUNCTION h5ltmake_dataset_nint1_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltmake_dataset_nint1_c(loc_id,namelen,dset_name,rank,dims,h5t_native_integer,buf)
-
-  END SUBROUTINE h5ltmake_dataset_int_f_1
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltmake_dataset_int_f_2
-  !
-  ! Purpose: Creates and writes a dataset of H5T_NATIVE_INT type
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: September 22, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltmake_dataset_int_f_2 (loc_id,&
-       dset_name,&
-       rank,&
-       dims,&
-       buf,&
-       errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltmake_dataset_int_f_2
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    INTEGER, INTENT(in), &
-         DIMENSION(dims(1),dims(2)) :: buf                  ! data buffer
-
-
-    INTERFACE
-       INTEGER FUNCTION h5ltmake_dataset_nint2_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTMAKE_DATASET_NINT2_C'::h5ltmake_dataset_nint2_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         INTEGER, INTENT(in), &
-              DIMENSION(dims(1),dims(2)) :: buf                  ! data buffer
-       END FUNCTION h5ltmake_dataset_nint2_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltmake_dataset_nint2_c(loc_id,namelen,dset_name,rank,dims,H5T_NATIVE_INTEGER,buf)
-
-  END SUBROUTINE h5ltmake_dataset_int_f_2
-
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltmake_dataset_int_f_3
-  !
-  ! Purpose: Creates and writes a dataset of H5T_NATIVE_INT type
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: September 22, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltmake_dataset_int_f_3 (loc_id,&
-       dset_name,&
-       rank,&
-       dims,&
-       buf,&
-       errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltmake_dataset_int_f_3
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    INTEGER, INTENT(in), &
-         DIMENSION(dims(1),dims(2),dims(3)) :: buf          ! data buffer
-
-
-    INTERFACE
-       INTEGER FUNCTION h5ltmake_dataset_nint3_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTMAKE_DATASET_NINT3_C'::h5ltmake_dataset_nint3_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         INTEGER, INTENT(in), &
-              DIMENSION(dims(1),dims(2),dims(3)) :: buf               ! data buffer
-       END FUNCTION h5ltmake_dataset_nint3_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltmake_dataset_nint3_c(loc_id,namelen,dset_name,rank,dims,H5T_NATIVE_INTEGER,buf)
-
-  END SUBROUTINE h5ltmake_dataset_int_f_3
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltmake_dataset_int_f_4
-  !
-  ! Purpose: Creates and writes a dataset of H5T_NATIVE_INT type
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: M. Scot Breitenfeld
-  !
-  ! Date: March 8, 2011
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltmake_dataset_int_f_4(loc_id, dset_name, rank, dims, &
-       buf, errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltmake_dataset_int_f_4
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    INTEGER, INTENT(in), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf          ! data buffer
-
-
-    INTERFACE
-       INTEGER FUNCTION h5ltmake_dataset_nint4_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTMAKE_DATASET_NINT4_C'::h5ltmake_dataset_nint4_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         INTEGER, INTENT(in), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf  ! data buffer
-       END FUNCTION h5ltmake_dataset_nint4_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltmake_dataset_nint4_c(loc_id,namelen,dset_name,rank,dims,H5T_NATIVE_INTEGER,buf)
-
-  END SUBROUTINE h5ltmake_dataset_int_f_4
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltmake_dataset_int_f_5
-  !
-  ! Purpose: Creates and writes a dataset of H5T_NATIVE_INT type
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: M. Scot Breitenfeld
-  !
-  ! Date: March 8, 2011
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltmake_dataset_int_f_5(loc_id, dset_name, rank, dims, &
-       buf, errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltmake_dataset_int_f_5
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    INTEGER, INTENT(in), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf          ! data buffer
-
-
-    INTERFACE
-       INTEGER FUNCTION h5ltmake_dataset_nint5_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTMAKE_DATASET_NINT5_C'::h5ltmake_dataset_nint5_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         INTEGER, INTENT(in), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf  ! data buffer
-       END FUNCTION h5ltmake_dataset_nint5_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltmake_dataset_nint5_c(loc_id,namelen,dset_name,rank,dims,H5T_NATIVE_INTEGER,buf)
-
-  END SUBROUTINE h5ltmake_dataset_int_f_5
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltmake_dataset_int_f_6
-  !
-  ! Purpose: Creates and writes a dataset of H5T_NATIVE_INT type
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: M. Scot Breitenfeld
-  !
-  ! Date: March 8, 2011
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltmake_dataset_int_f_6(loc_id, dset_name, rank, dims, &
-       buf, errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltmake_dataset_int_f_6
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    INTEGER, INTENT(in), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf          ! data buffer
-
-
-    INTERFACE
-       INTEGER FUNCTION h5ltmake_dataset_nint6_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTMAKE_DATASET_NINT6_C'::h5ltmake_dataset_nint6_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         INTEGER, INTENT(in), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf  ! data buffer
-       END FUNCTION h5ltmake_dataset_nint6_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltmake_dataset_nint6_c(loc_id,namelen,dset_name,rank,dims,H5T_NATIVE_INTEGER,buf)
-
-  END SUBROUTINE h5ltmake_dataset_int_f_6
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltmake_dataset_int_f_7
-  !
-  ! Purpose: Creates and writes a dataset of H5T_NATIVE_INT type
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: M. Scot Breitenfeld
-  !
-  ! Date: March 8, 2011
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltmake_dataset_int_f_7(loc_id, dset_name, rank, dims, &
-       buf, errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltmake_dataset_int_f_7
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    INTEGER, INTENT(in), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf          ! data buffer
-
-
-    INTERFACE
-       INTEGER FUNCTION h5ltmake_dataset_nint7_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTMAKE_DATASET_NINT7_C'::h5ltmake_dataset_nint7_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         INTEGER, INTENT(in), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf  ! data buffer
-       END FUNCTION h5ltmake_dataset_nint7_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltmake_dataset_nint7_c(loc_id,namelen,dset_name,rank,dims,H5T_NATIVE_INTEGER,buf)
-
-  END SUBROUTINE h5ltmake_dataset_int_f_7
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltmake_dataset_float_f_1
-  !
-  ! Purpose: Creates and writes a dataset of H5T_NATIVE_FLOAT type
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: September 22, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltmake_dataset_float_f_1 (loc_id,&
-       dset_name,&
-       rank,&
-       dims,&
-       buf,&
-       errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltmake_dataset_float_f_1
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    REAL, INTENT(in), DIMENSION(*) :: buf              ! data buffer
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-
-    INTERFACE
-       INTEGER FUNCTION h5ltmake_dataset_nfl1_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTMAKE_DATASET_NFL1_C'::h5ltmake_dataset_nfl1_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         REAL, INTENT(in), DIMENSION(*) :: buf                   ! data buffer
-       END FUNCTION h5ltmake_dataset_nfl1_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltmake_dataset_nfl1_c(loc_id,namelen,dset_name,rank,dims,H5T_NATIVE_REAL,buf)
-
-  END SUBROUTINE h5ltmake_dataset_float_f_1
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltmake_dataset_float_f_2
-  !
-  ! Purpose: Creates and writes a dataset of H5T_NATIVE_FLOAT type
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: September 22, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltmake_dataset_float_f_2 (loc_id,&
-       dset_name,&
-       rank,&
-       dims,&
-       buf,&
-       errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltmake_dataset_float_f_2
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    REAL, INTENT(in), &
-         DIMENSION(dims(1),dims(2)) :: buf                  ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltmake_dataset_nfl2_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTMAKE_DATASET_NFL2_C'::h5ltmake_dataset_nfl2_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         REAL, INTENT(in), &
-              DIMENSION(dims(1),dims(2)) :: buf                  ! data buffer
-       END FUNCTION h5ltmake_dataset_nfl2_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltmake_dataset_nfl2_c(loc_id,namelen,dset_name,rank,dims,H5T_NATIVE_REAL,buf)
-
-  END SUBROUTINE h5ltmake_dataset_float_f_2
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltmake_dataset_float_f_3
-  !
-  ! Purpose: Creates and writes a dataset of H5T_NATIVE_FLOAT type
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: September 22, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltmake_dataset_float_f_3 (loc_id,&
-       dset_name,&
-       rank,&
-       dims,&
-       buf,&
-       errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltmake_dataset_float_f_3
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    REAL, INTENT(in), &
-         DIMENSION(dims(1),dims(2),dims(3)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltmake_dataset_nfl3_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTMAKE_DATASET_NFL3_C'::h5ltmake_dataset_nfl3_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         REAL, INTENT(in), &
-              DIMENSION(dims(1),dims(2),dims(3)) :: buf               ! data buffer
-       END FUNCTION h5ltmake_dataset_nfl3_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltmake_dataset_nfl3_c(loc_id,namelen,dset_name,rank,dims,H5T_NATIVE_REAL,buf)
-
-  END SUBROUTINE h5ltmake_dataset_float_f_3
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltmake_dataset_float_f_4
-  !
-  ! Purpose: Creates and writes a dataset of H5T_NATIVE_FLOAT type
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: M. Scot Breitenfeld
-  !
-  ! Date: March 8, 2011
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltmake_dataset_float_f_4 (loc_id, dset_name, rank, dims, &
-       buf, errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltmake_dataset_float_f_4
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    REAL, INTENT(in), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltmake_dataset_nfl4_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTMAKE_DATASET_NFL4_C'::h5ltmake_dataset_nfl4_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         REAL, INTENT(in), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf               ! data buffer
-       END FUNCTION h5ltmake_dataset_nfl4_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltmake_dataset_nfl4_c(loc_id,namelen,dset_name,rank,dims,H5T_NATIVE_REAL,buf)
-
-  END SUBROUTINE h5ltmake_dataset_float_f_4
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltmake_dataset_float_f_5
-  !
-  ! Purpose: Creates and writes a dataset of H5T_NATIVE_FLOAT type
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: M. Scot Breitenfeld
-  !
-  ! Date: March 8, 2011
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltmake_dataset_float_f_5 (loc_id, dset_name, rank, dims, &
-       buf, errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltmake_dataset_float_f_5
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    REAL, INTENT(in), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltmake_dataset_nfl5_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTMAKE_DATASET_NFL5_C'::h5ltmake_dataset_nfl5_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         REAL, INTENT(in), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf               ! data buffer
-       END FUNCTION h5ltmake_dataset_nfl5_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltmake_dataset_nfl5_c(loc_id,namelen,dset_name,rank,dims,H5T_NATIVE_REAL,buf)
-
-  END SUBROUTINE h5ltmake_dataset_float_f_5
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltmake_dataset_float_f_6
-  !
-  ! Purpose: Creates and writes a dataset of H5T_NATIVE_FLOAT type
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: M. Scot Breitenfeld
-  !
-  ! Date: March 8, 2011
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltmake_dataset_float_f_6 (loc_id, dset_name, rank, dims, &
-       buf, errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltmake_dataset_float_f_6
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    REAL, INTENT(in), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltmake_dataset_nfl6_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTMAKE_DATASET_NFL6_C'::h5ltmake_dataset_nfl6_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         REAL, INTENT(in), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf               ! data buffer
-       END FUNCTION h5ltmake_dataset_nfl6_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltmake_dataset_nfl6_c(loc_id,namelen,dset_name,rank,dims,H5T_NATIVE_REAL,buf)
-
-  END SUBROUTINE h5ltmake_dataset_float_f_6
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltmake_dataset_float_f_7
-  !
-  ! Purpose: Creates and writes a dataset of H5T_NATIVE_FLOAT type
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: M. Scot Breitenfeld
-  !
-  ! Date: March 8, 2011
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltmake_dataset_float_f_7 (loc_id, dset_name, rank, dims, &
-       buf, errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltmake_dataset_float_f_7
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    REAL, INTENT(in), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltmake_dataset_nfl7_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTMAKE_DATASET_NFL7_C'::h5ltmake_dataset_nfl7_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         REAL, INTENT(in), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf               ! data buffer
-       END FUNCTION h5ltmake_dataset_nfl7_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltmake_dataset_nfl7_c(loc_id,namelen,dset_name,rank,dims,H5T_NATIVE_REAL,buf)
-
-  END SUBROUTINE h5ltmake_dataset_float_f_7
-
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltmake_dataset_double_f_1
-  !
-  ! Purpose: Creates and writes a dataset of H5T_NATIVE_DOUBLE type
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: September 22, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltmake_dataset_double_f_1 (loc_id,&
-       dset_name,&
-       rank,&
-       dims,&
-       buf,&
-       errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltmake_dataset_double_f_1
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    DOUBLE PRECISION, INTENT(in), &
-         DIMENSION(dims(1)) :: buf                          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltmake_dataset_ndl1_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTMAKE_DATASET_NDL1_C'::h5ltmake_dataset_ndl1_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         DOUBLE PRECISION, INTENT(in), &
-              DIMENSION(dims(1)) :: buf                               ! data buffer
-       END FUNCTION h5ltmake_dataset_ndl1_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltmake_dataset_ndl1_c(loc_id,namelen,dset_name,rank,dims,H5T_NATIVE_DOUBLE,buf)
-
-  END SUBROUTINE h5ltmake_dataset_double_f_1
-
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltmake_dataset_double_f_2
-  !
-  ! Purpose: Creates and writes a dataset of H5T_NATIVE_DOUBLE type
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: September 22, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltmake_dataset_double_f_2 (loc_id,&
-       dset_name,&
-       rank,&
-       dims,&
-       buf,&
-       errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltmake_dataset_double_f_2
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    DOUBLE PRECISION, INTENT(in), &
-         DIMENSION(dims(1),dims(2)) :: buf                  ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltmake_dataset_ndl2_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTMAKE_DATASET_NDL2_C'::h5ltmake_dataset_ndl2_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         DOUBLE PRECISION, INTENT(in), &
-              DIMENSION(dims(1),dims(2)) :: buf                       ! data buffer
-       END FUNCTION h5ltmake_dataset_ndl2_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltmake_dataset_ndl2_c(loc_id,namelen,dset_name,rank,dims,H5T_NATIVE_DOUBLE,buf)
-
-  END SUBROUTINE h5ltmake_dataset_double_f_2
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltmake_dataset_double_f_3
-  !
-  ! Purpose: Creates and writes a dataset of H5T_NATIVE_DOUBLE type
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: September 22, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltmake_dataset_double_f_3 (loc_id,&
-       dset_name,&
-       rank,&
-       dims,&
-       buf,&
-       errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltmake_dataset_double_f_3
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    DOUBLE PRECISION, INTENT(in), &
-         DIMENSION(dims(1),dims(2),dims(3)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltmake_dataset_ndl3_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTMAKE_DATASET_NDL3_C'::h5ltmake_dataset_ndl3_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         DOUBLE PRECISION, INTENT(in), &
-              DIMENSION(dims(1),dims(2),dims(3)) :: buf               ! data buffer
-       END FUNCTION h5ltmake_dataset_ndl3_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltmake_dataset_ndl3_c(loc_id,namelen,dset_name,rank,dims,H5T_NATIVE_DOUBLE,buf)
-
-  END SUBROUTINE h5ltmake_dataset_double_f_3
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltmake_dataset_double_f_4
-  !
-  ! Purpose: Creates and writes a dataset of H5T_NATIVE_DOUBLE type
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: M. Scot Breitenfeld
-  !
-  ! Date: March 8, 2011
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltmake_dataset_double_f_4 (loc_id, dset_name, rank, dims,&
-       buf, errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltmake_dataset_double_f_4
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    DOUBLE PRECISION, INTENT(in), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltmake_dataset_ndl4_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTMAKE_DATASET_NDL4_C'::h5ltmake_dataset_ndl4_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         DOUBLE PRECISION, INTENT(in), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf               ! data buffer
-       END FUNCTION h5ltmake_dataset_ndl4_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltmake_dataset_ndl4_c(loc_id,namelen,dset_name,rank,dims,H5T_NATIVE_DOUBLE,buf)
-
-  END SUBROUTINE h5ltmake_dataset_double_f_4
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltmake_dataset_double_f_5
-  !
-  ! Purpose: Creates and writes a dataset of H5T_NATIVE_DOUBLE type
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: M. Scot Breitenfeld
-  !
-  ! Date: March 8, 2011
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltmake_dataset_double_f_5 (loc_id, dset_name, rank, dims,&
-       buf, errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltmake_dataset_double_f_5
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    DOUBLE PRECISION, INTENT(in), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltmake_dataset_ndl5_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTMAKE_DATASET_NDL5_C'::h5ltmake_dataset_ndl5_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         DOUBLE PRECISION, INTENT(in), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf               ! data buffer
-       END FUNCTION h5ltmake_dataset_ndl5_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltmake_dataset_ndl5_c(loc_id,namelen,dset_name,rank,dims,H5T_NATIVE_DOUBLE,buf)
-
-  END SUBROUTINE h5ltmake_dataset_double_f_5
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltmake_dataset_double_f_6
-  !
-  ! Purpose: Creates and writes a dataset of H5T_NATIVE_DOUBLE type
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: M. Scot Breitenfeld
-  !
-  ! Date: March 8, 2011
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltmake_dataset_double_f_6 (loc_id, dset_name, rank, dims,&
-       buf, errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltmake_dataset_double_f_5
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    DOUBLE PRECISION, INTENT(in), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltmake_dataset_ndl6_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTMAKE_DATASET_NDL6_C'::h5ltmake_dataset_ndl6_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         DOUBLE PRECISION, INTENT(in), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf               ! data buffer
-       END FUNCTION h5ltmake_dataset_ndl6_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltmake_dataset_ndl6_c(loc_id,namelen,dset_name,rank,dims,H5T_NATIVE_DOUBLE,buf)
-
-  END SUBROUTINE h5ltmake_dataset_double_f_6
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltmake_dataset_double_f_7
-  !
-  ! Purpose: Creates and writes a dataset of H5T_NATIVE_DOUBLE type
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: M. Scot Breitenfeld
-  !
-  ! Date: March 8, 2011
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltmake_dataset_double_f_7 (loc_id, dset_name, rank, dims,&
-       buf, errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltmake_dataset_double_f_5
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    DOUBLE PRECISION, INTENT(in), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltmake_dataset_ndl7_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTMAKE_DATASET_NDL7_C'::h5ltmake_dataset_ndl7_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         DOUBLE PRECISION, INTENT(in), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf               ! data buffer
-       END FUNCTION h5ltmake_dataset_ndl7_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltmake_dataset_ndl7_c(loc_id,namelen,dset_name,rank,dims,H5T_NATIVE_DOUBLE,buf)
-
-  END SUBROUTINE h5ltmake_dataset_double_f_7
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltread_dataset_int_f_1
-  !
-  ! Purpose: Read a dataset
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: September 22, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltread_dataset_int_f_1(loc_id,&
-       dset_name,&
-       buf,&
-       dims,&
-       errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltread_dataset_int_f_1
-    !DEC$endif
-    !
-
-    INTEGER(HID_T),   INTENT(IN) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    INTEGER, INTENT(inout), &
-         DIMENSION(dims(1)) :: buf                          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltread_dataset_nint1_c(loc_id,namelen,dset_name,type_id,buf,dims)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTREAD_DATASET_NINT1_C'::h5ltread_dataset_nint1_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         INTEGER, INTENT(inout), &
-              DIMENSION(dims(1)) :: buf                               ! data buffer
-       END FUNCTION h5ltread_dataset_nint1_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltread_dataset_nint1_c(loc_id,namelen,dset_name,H5T_NATIVE_INTEGER,buf,dims)
-
-  END SUBROUTINE h5ltread_dataset_int_f_1
-
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltread_dataset_int_f_2
-  !
-  ! Purpose: Read a dataset
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: September 22, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltread_dataset_int_f_2(loc_id,&
-       dset_name,&
-       buf,&
-       dims,&
-       errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltread_dataset_int_f_2
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    INTEGER, INTENT(inout), &
-         DIMENSION(dims(1),dims(2)) :: buf                  ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltread_dataset_nint2_c(loc_id,namelen,dset_name,type_id,buf,dims)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTREAD_DATASET_NINT2_C'::h5ltread_dataset_nint2_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         INTEGER, INTENT(inout), &
-              DIMENSION(dims(1),dims(2)) :: buf                       ! data buffer
-       END FUNCTION h5ltread_dataset_nint2_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltread_dataset_nint2_c(loc_id,namelen,dset_name,H5T_NATIVE_INTEGER,buf,dims)
-
-  END SUBROUTINE h5ltread_dataset_int_f_2
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltread_dataset_int_f_3
-  !
-  ! Purpose: Read a dataset
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: September 22, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltread_dataset_int_f_3(loc_id,&
-       dset_name,&
-       buf,&
-       dims,&
-       errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltread_dataset_int_f_3
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    INTEGER, INTENT(inout), &
-         DIMENSION(dims(1),dims(2),dims(3)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltread_dataset_nint3_c(loc_id,namelen,dset_name,type_id,buf,dims)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTREAD_DATASET_NINT3_C'::h5ltread_dataset_nint3_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         INTEGER, INTENT(inout), &
-              DIMENSION(dims(1),dims(2),dims(3)) :: buf               ! data buffer
-       END FUNCTION h5ltread_dataset_nint3_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltread_dataset_nint3_c(loc_id,namelen,dset_name,H5T_NATIVE_INTEGER,buf,dims)
-
-  END SUBROUTINE h5ltread_dataset_int_f_3
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltread_dataset_int_f_4
-  !
-  ! Purpose: Read a dataset
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: M. Scot Breitenfeld
-  !
-  ! Date: March 8, 2011
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltread_dataset_int_f_4(loc_id, dset_name, buf, dims, errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltread_dataset_int_f_4
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    INTEGER, INTENT(inout), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltread_dataset_nint4_c(loc_id,namelen,dset_name,type_id,buf,dims)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTREAD_DATASET_NINT4_C'::h5ltread_dataset_nint4_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         INTEGER, INTENT(inout), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf               ! data buffer
-       END FUNCTION h5ltread_dataset_nint4_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltread_dataset_nint4_c(loc_id,namelen,dset_name,H5T_NATIVE_INTEGER,buf,dims)
-
-  END SUBROUTINE h5ltread_dataset_int_f_4
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltread_dataset_int_f_5
-  !
-  ! Purpose: Read a dataset
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: M. Scot Breitenfeld
-  !
-  ! Date: March 8, 2011
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltread_dataset_int_f_5(loc_id, dset_name, buf, dims, errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltread_dataset_int_f_5
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    INTEGER, INTENT(inout), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltread_dataset_nint5_c(loc_id,namelen,dset_name,type_id,buf,dims)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTREAD_DATASET_NINT5_C'::h5ltread_dataset_nint5_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         INTEGER, INTENT(inout), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf               ! data buffer
-       END FUNCTION h5ltread_dataset_nint5_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltread_dataset_nint5_c(loc_id,namelen,dset_name,H5T_NATIVE_INTEGER,buf,dims)
-
-  END SUBROUTINE h5ltread_dataset_int_f_5
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltread_dataset_int_f_6
-  !
-  ! Purpose: Read a dataset
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: M. Scot Breitenfeld
-  !
-  ! Date: March 8, 2011
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltread_dataset_int_f_6(loc_id, dset_name, buf, dims, errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltread_dataset_int_f_6
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    INTEGER, INTENT(inout), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltread_dataset_nint6_c(loc_id,namelen,dset_name,type_id,buf,dims)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTREAD_DATASET_NINT6_C'::h5ltread_dataset_nint6_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         INTEGER, INTENT(inout), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf               ! data buffer
-       END FUNCTION h5ltread_dataset_nint6_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltread_dataset_nint6_c(loc_id,namelen,dset_name,H5T_NATIVE_INTEGER,buf,dims)
-
-  END SUBROUTINE h5ltread_dataset_int_f_6
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltread_dataset_int_f_7
-  !
-  ! Purpose: Read a dataset
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: M. Scot Breitenfeld
-  !
-  ! Date: March 8, 2011
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltread_dataset_int_f_7(loc_id, dset_name, buf, dims, errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltread_dataset_int_f_7
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    INTEGER, INTENT(inout), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltread_dataset_nint7_c(loc_id,namelen,dset_name,type_id,buf,dims)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTREAD_DATASET_NINT7_C'::h5ltread_dataset_nint7_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         INTEGER, INTENT(inout), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf               ! data buffer
-       END FUNCTION h5ltread_dataset_nint7_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltread_dataset_nint7_c(loc_id,namelen,dset_name,H5T_NATIVE_INTEGER,buf,dims)
-
-  END SUBROUTINE h5ltread_dataset_int_f_7
-
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltread_dataset_float_f_1
-  !
-  ! Purpose: Read a dataset
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: September 22, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltread_dataset_float_f_1(loc_id,&
-       dset_name,&
-       buf,&
-       dims,&
-       errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltread_dataset_float_f_1
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    REAL, INTENT(inout), &
-         DIMENSION(dims(1)) :: buf                          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltread_dataset_nfl1_c(loc_id,namelen,dset_name,type_id,buf,dims)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTREAD_DATASET_NFL1_C'::h5ltread_dataset_nfl1_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         REAL, INTENT(inout), &
-              DIMENSION(dims(1)) :: buf                               ! data buffer
-       END FUNCTION h5ltread_dataset_nfl1_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltread_dataset_nfl1_c(loc_id,namelen,dset_name,H5T_NATIVE_REAL,buf,dims)
-
-  END SUBROUTINE h5ltread_dataset_float_f_1
-
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltread_dataset_float_f_2
-  !
-  ! Purpose: Read a dataset
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: September 22, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltread_dataset_float_f_2(loc_id,&
-       dset_name,&
-       buf,&
-       dims,&
-       errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltread_dataset_float_f_2
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    REAL, INTENT(inout), &
-         DIMENSION(dims(1),dims(2)) :: buf                  ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltread_dataset_nfl2_c(loc_id,namelen,dset_name,type_id,buf,dims)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTREAD_DATASET_NFL2_C'::h5ltread_dataset_nfl2_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         REAL, INTENT(inout), &
-              DIMENSION(dims(1),dims(2)) :: buf                       ! data buffer
-       END FUNCTION h5ltread_dataset_nfl2_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltread_dataset_nfl2_c(loc_id,namelen,dset_name,H5T_NATIVE_REAL,buf,dims)
-
-  END SUBROUTINE h5ltread_dataset_float_f_2
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltread_dataset_float_f_3
-  !
-  ! Purpose: Read a dataset
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: September 22, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltread_dataset_float_f_3(loc_id,&
-       dset_name,&
-       buf,&
-       dims,&
-       errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltread_dataset_float_f_3
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    REAL, INTENT(inout), &
-         DIMENSION(dims(1),dims(2),dims(3)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltread_dataset_nfl3_c(loc_id,namelen,dset_name,type_id,buf,dims)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTREAD_DATASET_NFL3_C'::h5ltread_dataset_nfl3_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         REAL, INTENT(inout), &
-              DIMENSION(dims(1),dims(2),dims(3)) :: buf               ! data buffer
-       END FUNCTION h5ltread_dataset_nfl3_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltread_dataset_nfl3_c(loc_id,namelen,dset_name,H5T_NATIVE_REAL,buf,dims)
-
-  END SUBROUTINE h5ltread_dataset_float_f_3
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltread_dataset_float_f_4
-  !
-  ! Purpose: Read a dataset
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: M. Scot Breitenfeld
-  !
-  ! Date: March 8, 2011
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltread_dataset_float_f_4(loc_id, dset_name, buf, dims, errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltread_dataset_float_f_4
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    REAL, INTENT(inout), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltread_dataset_nfl4_c(loc_id,namelen,dset_name,type_id,buf,dims)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTREAD_DATASET_NFL4_C'::h5ltread_dataset_nfl4_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         REAL, INTENT(inout), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf               ! data buffer
-       END FUNCTION h5ltread_dataset_nfl4_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltread_dataset_nfl4_c(loc_id,namelen,dset_name,H5T_NATIVE_REAL,buf,dims)
-
-  END SUBROUTINE h5ltread_dataset_float_f_4
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltread_dataset_float_f_5
-  !
-  ! Purpose: Read a dataset
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: M. Scot Breitenfeld
-  !
-  ! Date: March 8, 2011
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltread_dataset_float_f_5(loc_id, dset_name, buf, dims, errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltread_dataset_float_f_5
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    REAL, INTENT(inout), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltread_dataset_nfl5_c(loc_id,namelen,dset_name,type_id,buf,dims)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTREAD_DATASET_NFL5_C'::h5ltread_dataset_nfl5_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         REAL, INTENT(inout), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf               ! data buffer
-       END FUNCTION h5ltread_dataset_nfl5_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltread_dataset_nfl5_c(loc_id,namelen,dset_name,H5T_NATIVE_REAL,buf,dims)
-
-  END SUBROUTINE h5ltread_dataset_float_f_5
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltread_dataset_float_f_6
-  !
-  ! Purpose: Read a dataset
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: M. Scot Breitenfeld
-  !
-  ! Date: March 8, 2011
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltread_dataset_float_f_6(loc_id, dset_name, buf, dims, errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltread_dataset_float_f_6
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    REAL, INTENT(inout), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltread_dataset_nfl6_c(loc_id,namelen,dset_name,type_id,buf,dims)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTREAD_DATASET_NFL6_C'::h5ltread_dataset_nfl6_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         REAL, INTENT(inout), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf               ! data buffer
-       END FUNCTION h5ltread_dataset_nfl6_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltread_dataset_nfl6_c(loc_id,namelen,dset_name,H5T_NATIVE_REAL,buf,dims)
-
-  END SUBROUTINE h5ltread_dataset_float_f_6
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltread_dataset_float_f_7
-  !
-  ! Purpose: Read a dataset
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: M. Scot Breitenfeld
-  !
-  ! Date: March 8, 2011
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltread_dataset_float_f_7(loc_id, dset_name, buf, dims, errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltread_dataset_float_f_7
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    REAL, INTENT(inout), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltread_dataset_nfl7_c(loc_id,namelen,dset_name,type_id,buf,dims)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTREAD_DATASET_NFL7_C'::h5ltread_dataset_nfl7_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         REAL, INTENT(inout), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf               ! data buffer
-       END FUNCTION h5ltread_dataset_nfl7_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltread_dataset_nfl7_c(loc_id,namelen,dset_name,H5T_NATIVE_REAL,buf,dims)
-
-  END SUBROUTINE h5ltread_dataset_float_f_7
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltread_dataset_double_f_1
-  !
-  ! Purpose: Read a dataset
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: September 22, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltread_dataset_double_f_1(loc_id,&
-       dset_name,&
-       buf,&
-       dims,&
-       errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltread_dataset_double_f_1
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    DOUBLE PRECISION, INTENT(inout), &
-         DIMENSION(dims(1)) :: buf                          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltread_dataset_ndl1_c(loc_id,namelen,dset_name,type_id,buf,dims)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTREAD_DATASET_NDL1_C'::h5ltread_dataset_ndl1_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         DOUBLE PRECISION, INTENT(inout), &
-              DIMENSION(dims(1)) :: buf                               ! data buffer
-       END FUNCTION h5ltread_dataset_ndl1_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltread_dataset_ndl1_c(loc_id,namelen,dset_name,H5T_NATIVE_DOUBLE,buf,dims)
-
-  END SUBROUTINE h5ltread_dataset_double_f_1
-
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltread_dataset_double_f_2
-  !
-  ! Purpose: Read a dataset
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: September 22, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltread_dataset_double_f_2(loc_id,&
-       dset_name,&
-       buf,&
-       dims,&
-       errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltread_dataset_double_f_2
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    DOUBLE PRECISION, INTENT(inout), &
-         DIMENSION(dims(1),dims(2)) :: buf                  ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltread_dataset_ndl2_c(loc_id,namelen,dset_name,type_id,buf,dims)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTREAD_DATASET_NDL2_C'::h5ltread_dataset_ndl2_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         DOUBLE PRECISION, INTENT(inout), &
-              DIMENSION(dims(1),dims(2)) :: buf                       ! data buffer
-       END FUNCTION h5ltread_dataset_ndl2_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltread_dataset_ndl2_c(loc_id,namelen,dset_name,H5T_NATIVE_DOUBLE,buf,dims)
-
-  END SUBROUTINE h5ltread_dataset_double_f_2
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltread_dataset_double_f_3
-  !
-  ! Purpose: Read a dataset
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: September 22, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltread_dataset_double_f_3(loc_id,&
-       dset_name,&
-       buf,&
-       dims,&
-       errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltread_dataset_double_f_3
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    DOUBLE PRECISION, INTENT(inout), &
-         DIMENSION(dims(1),dims(2),dims(3)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltread_dataset_ndl3_c(loc_id,namelen,dset_name,type_id,buf,dims)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTREAD_DATASET_NDL3_C'::h5ltread_dataset_ndl3_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         DOUBLE PRECISION, INTENT(inout), &
-              DIMENSION(dims(1),dims(2),dims(3)) :: buf               ! data buffer
-       END FUNCTION h5ltread_dataset_ndl3_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltread_dataset_ndl3_c(loc_id,namelen,dset_name,H5T_NATIVE_DOUBLE,buf,dims)
-
-  END SUBROUTINE h5ltread_dataset_double_f_3
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltread_dataset_double_f_4
-  !
-  ! Purpose: Read a dataset
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: M. Scot Breitenfeld
-  !
-  ! Date: March 8, 2011
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltread_dataset_double_f_4(loc_id, dset_name, buf, dims, errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltread_dataset_double_f_4
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    DOUBLE PRECISION, INTENT(inout), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltread_dataset_ndl4_c(loc_id,namelen,dset_name,type_id,buf,dims)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTREAD_DATASET_NDL4_C'::h5ltread_dataset_ndl4_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         DOUBLE PRECISION, INTENT(inout), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf               ! data buffer
-       END FUNCTION h5ltread_dataset_ndl4_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltread_dataset_ndl4_c(loc_id,namelen,dset_name,H5T_NATIVE_DOUBLE,buf,dims)
-
-  END SUBROUTINE h5ltread_dataset_double_f_4
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltread_dataset_double_f_5
-  !
-  ! Purpose: Read a dataset
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: M. Scot Breitenfeld
-  !
-  ! Date: March 8, 2011
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltread_dataset_double_f_5(loc_id, dset_name, buf, dims, errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltread_dataset_double_f_5
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    DOUBLE PRECISION, INTENT(inout), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltread_dataset_ndl5_c(loc_id,namelen,dset_name,type_id,buf,dims)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTREAD_DATASET_NDL5_C'::h5ltread_dataset_ndl5_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         DOUBLE PRECISION, INTENT(inout), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf               ! data buffer
-       END FUNCTION h5ltread_dataset_ndl5_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltread_dataset_ndl5_c(loc_id,namelen,dset_name,H5T_NATIVE_DOUBLE,buf,dims)
-
-  END SUBROUTINE h5ltread_dataset_double_f_5
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltread_dataset_double_f_6
-  !
-  ! Purpose: Read a dataset
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: M. Scot Breitenfeld
-  !
-  ! Date: March 8, 2011
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltread_dataset_double_f_6(loc_id, dset_name, buf, dims, errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltread_dataset_double_f_6
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    DOUBLE PRECISION, INTENT(inout), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltread_dataset_ndl6_c(loc_id,namelen,dset_name,type_id,buf,dims)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTREAD_DATASET_NDL6_C'::h5ltread_dataset_ndl6_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         DOUBLE PRECISION, INTENT(inout), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf               ! data buffer
-       END FUNCTION h5ltread_dataset_ndl6_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltread_dataset_ndl6_c(loc_id,namelen,dset_name,H5T_NATIVE_DOUBLE,buf,dims)
-
-  END SUBROUTINE h5ltread_dataset_double_f_6
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltread_dataset_double_f_7
-  !
-  ! Purpose: Read a dataset
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: M. Scot Breitenfeld
-  !
-  ! Date: March 8, 2011
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltread_dataset_double_f_7(loc_id, dset_name, buf, dims, errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltread_dataset_double_f_7
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                         ! name length
-    DOUBLE PRECISION, INTENT(inout), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf          ! data buffer
-
-    INTERFACE
-       INTEGER FUNCTION h5ltread_dataset_ndl7_c(loc_id,namelen,dset_name,type_id,buf,dims)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTREAD_DATASET_NDL7_C'::h5ltread_dataset_ndl7_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER(size_t) :: namelen                              ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
-         DOUBLE PRECISION, INTENT(inout), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf               ! data buffer
-       END FUNCTION h5ltread_dataset_ndl7_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltread_dataset_ndl7_c(loc_id,namelen,dset_name,H5T_NATIVE_DOUBLE,buf,dims)
-
-  END SUBROUTINE h5ltread_dataset_double_f_7
-
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltmake_dataset_string_f
-  !
-  ! Purpose: Creates and writes a dataset
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: September 22, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltmake_dataset_string_f(loc_id,&
-       dset_name,&
-       buf,&
-       errcode )
-
-    IMPLICIT NONE
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltmake_dataset_string_f
-    !DEC$endif
-    !
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    CHARACTER(len=*), INTENT(in) :: buf                ! data buffer
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                         ! name length
-    INTEGER(size_t) :: buflen                          ! buffer length
-
-    INTERFACE
-       INTEGER FUNCTION h5ltmake_dataset_string_c(loc_id,namelen,dset_name,buflen,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTMAKE_DATASET_STRING_C'::h5ltmake_dataset_string_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(size_t) :: namelen                              ! length of name buffer
-         INTEGER(size_t) :: buflen                               ! length of data buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         CHARACTER(len=*), INTENT(in) :: buf                     ! data buffer
-       END FUNCTION h5ltmake_dataset_string_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    buflen = LEN(buf)
-    errcode = h5ltmake_dataset_string_c(loc_id,namelen,dset_name,buflen,buf)
-
-  END SUBROUTINE h5ltmake_dataset_string_f
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltread_dataset_string_f
-  !
-  ! Purpose: Read a dataset
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: September 22, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltread_dataset_string_f(loc_id,&
-       dset_name,&
-       buf,&
-       errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltread_dataset_string_f
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    CHARACTER(len=*), INTENT(inout) :: buf             ! data buffer
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-
-    INTERFACE
-       INTEGER FUNCTION h5ltread_dataset_string_c(loc_id,namelen,dset_name,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTREAD_DATASET_STRING_C'::h5ltread_dataset_string_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         CHARACTER(len=*), INTENT(inout) :: buf                  ! data buffer
-       END FUNCTION h5ltread_dataset_string_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltread_dataset_string_c(loc_id,namelen,dset_name,buf)
-
-  END SUBROUTINE h5ltread_dataset_string_f
-
-
-
-
-  !-------------------------------------------------------------------------
-  ! Make/Read attribute functions
-  !-------------------------------------------------------------------------
-
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltset_attribute_int_f
-  !
-  ! Purpose: Create and write an attribute
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: October 05, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltset_attribute_int_f(loc_id,&
-       dset_name,&
-       attr_name,&
-       buf,&
-       size,&
-       errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltset_attribute_int_f
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    CHARACTER(len=*), INTENT(in) :: attr_name          ! name of the attribute
-    INTEGER(size_t),  INTENT(in) :: size               ! size of attribute array
-    INTEGER :: errcode                                 ! error code
-    INTEGER, INTENT(in), DIMENSION(*) :: buf           ! data buffer
-    INTEGER(size_t) :: namelen                                 ! name length
-    INTEGER(size_t) :: attrlen                                 ! name length
-
-    INTERFACE
-       INTEGER FUNCTION h5ltset_attribute_int_c(loc_id,namelen,dset_name,attrlen,attr_name,size,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTSET_ATTRIBUTE_INT_C'::h5ltset_attribute_int_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         !DEC$ATTRIBUTES reference :: attr_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(size_t) :: namelen                              ! length of name buffer
-         INTEGER(size_t) :: attrlen                              ! length of attr name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         CHARACTER(len=*), INTENT(in) :: attr_name               ! name of the attribute
-         INTEGER(size_t),  INTENT(in) :: size                    ! size of attribute array
-         INTEGER, INTENT(in), DIMENSION(*) :: buf                ! data buffer
-       END FUNCTION h5ltset_attribute_int_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    attrlen = LEN(attr_name)
-    errcode = h5ltset_attribute_int_c(loc_id,namelen,dset_name,attrlen,attr_name,size,buf)
-
-  END SUBROUTINE h5ltset_attribute_int_f
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltset_attribute_float_f
-  !
-  ! Purpose: Create and write an attribute
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: October 05, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltset_attribute_float_f(loc_id,&
-       dset_name,&
-       attr_name,&
-       buf,&
-       size,&
-       errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltset_attribute_float_f
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    CHARACTER(len=*), INTENT(in) :: attr_name          ! name of the attribute
-    INTEGER(size_t),  INTENT(in) :: size               ! size of attribute array
-    INTEGER :: errcode                                 ! error code
-    REAL, INTENT(in), DIMENSION(*) :: buf              ! data buffer
-    INTEGER(size_t) :: namelen                         ! name length
-    INTEGER(size_t) :: attrlen                         ! name length
-
-    INTERFACE
-       INTEGER FUNCTION h5ltset_attribute_float_c(loc_id,namelen,dset_name,attrlen,attr_name,size,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTSET_ATTRIBUTE_FLOAT_C'::h5ltset_attribute_float_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         !DEC$ATTRIBUTES reference :: attr_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(size_t) :: namelen                              ! length of name buffer
-         INTEGER(size_t) :: attrlen                              ! length of attr name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         CHARACTER(len=*), INTENT(in) :: attr_name               ! name of the attribute
-         INTEGER(size_t),  INTENT(in) :: size                    ! size of attribute array
-         REAL, INTENT(in), DIMENSION(*) :: buf                   ! data buffer
-       END FUNCTION h5ltset_attribute_float_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    attrlen = LEN(attr_name)
-    errcode = h5ltset_attribute_float_c(loc_id,namelen,dset_name,attrlen,attr_name,size,buf)
-
-  END SUBROUTINE h5ltset_attribute_float_f
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltset_attribute_double_f
-  !
-  ! Purpose: Create and write an attribute
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: October 05, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltset_attribute_double_f(loc_id,&
-       dset_name,&
-       attr_name,&
-       buf,&
-       size,&
-       errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltset_attribute_double_f
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    CHARACTER(len=*), INTENT(in) :: attr_name          ! name of the attribute
-    INTEGER(size_t),  INTENT(in) :: size               ! size of attribute array
-    INTEGER :: errcode                                 ! error code
-    DOUBLE PRECISION, INTENT(in), DIMENSION(*) :: buf  ! data buffer
-    INTEGER(size_t) :: namelen                         ! name length
-    INTEGER(size_t) :: attrlen                         ! name length
-
-    INTERFACE
-       INTEGER FUNCTION h5ltset_attribute_double_c(loc_id,namelen,dset_name,attrlen,attr_name,size,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTSET_ATTRIBUTE_DOUBLE_C'::h5ltset_attribute_double_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         !DEC$ATTRIBUTES reference :: attr_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(size_t) :: namelen                              ! length of name buffer
-         INTEGER(size_t) :: attrlen                              ! length of attr name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         CHARACTER(len=*), INTENT(in) :: attr_name               ! name of the attribute
-         INTEGER(size_t),  INTENT(in) :: size                    ! size of attribute array
-         DOUBLE PRECISION, INTENT(in), DIMENSION(*) :: buf       ! data buffer
-       END FUNCTION h5ltset_attribute_double_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    attrlen = LEN(attr_name)
-    errcode = h5ltset_attribute_double_c(loc_id,namelen,dset_name,attrlen,attr_name,size,buf)
-
-  END SUBROUTINE h5ltset_attribute_double_f
-
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltset_attribute_string_f
-  !
-  ! Purpose: Create and write an attribute
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: October 05, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltset_attribute_string_f(loc_id,&
-       dset_name,&
-       attr_name,&
-       buf,&
-       errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltset_attribute_string_f
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    CHARACTER(len=*), INTENT(in) :: attr_name          ! name of the attribute
-    INTEGER :: errcode                                 ! error code
-    CHARACTER(len=*), INTENT(in) :: buf                ! data buffer
-    INTEGER(size_t) :: namelen                         ! name length
-    INTEGER(size_t) :: attrlen                         ! name length
-    INTEGER(size_t) :: buflen                          ! data buffer length
-
-    INTERFACE
-       INTEGER FUNCTION h5ltset_attribute_string_c(loc_id,namelen,dset_name,attrlen,attr_name,buflen,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTSET_ATTRIBUTE_STRING_C'::h5ltset_attribute_string_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         !DEC$ATTRIBUTES reference :: attr_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(size_t) :: namelen                              ! length of name buffer
-         INTEGER(size_t) :: attrlen                              ! length of attr name buffer
-         INTEGER(size_t) :: buflen                               ! data buffer length
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         CHARACTER(len=*), INTENT(in) :: attr_name               ! name of the attribute
-         CHARACTER(len=*), INTENT(in) :: buf                     ! data buffer
-       END FUNCTION h5ltset_attribute_string_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    attrlen = LEN(attr_name)
-    buflen = LEN(buf)
-    errcode = h5ltset_attribute_string_c(loc_id,namelen,dset_name,attrlen,attr_name,buflen,buf)
-
-  END SUBROUTINE h5ltset_attribute_string_f
-
-
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltget_attribute_int_f
-  !
-  ! Purpose: Reads an attribute named ATTR_NAME
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: October 05, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltget_attribute_int_f(loc_id,&
-       dset_name,&
-       attr_name,&
-       buf,&
-       errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltget_attribute_int_f
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    CHARACTER(len=*), INTENT(in) :: attr_name          ! name of the attribute
-    INTEGER :: errcode                                 ! error code
-    INTEGER, INTENT(inout), DIMENSION(*) :: buf        ! data buffer
-    INTEGER(size_t) :: namelen                         ! name length
-    INTEGER(size_t) :: attrlen                         ! name length
-
-    INTERFACE
-       INTEGER FUNCTION h5ltget_attribute_int_c(loc_id,namelen,dset_name,attrlen,attr_name,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTGET_ATTRIBUTE_INT_C'::h5ltget_attribute_int_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         !DEC$ATTRIBUTES reference :: attr_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(size_t) :: namelen                              ! length of name buffer
-         INTEGER(size_t) :: attrlen                              ! length of attr name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         CHARACTER(len=*), INTENT(in) :: attr_name               ! name of the attribute
-         INTEGER, INTENT(inout), DIMENSION(*) :: buf     ! data buffer
-       END FUNCTION h5ltget_attribute_int_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    attrlen = LEN(attr_name)
-    errcode = h5ltget_attribute_int_c(loc_id,namelen,dset_name,attrlen,attr_name,buf)
-
-  END SUBROUTINE h5ltget_attribute_int_f
-
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltget_attribute_float_f
-  !
-  ! Purpose: Reads an attribute named ATTR_NAME
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: October 05, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltget_attribute_float_f(loc_id,&
-       dset_name,&
-       attr_name,&
-       buf,&
-       errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltget_attribute_float_f
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    CHARACTER(len=*), INTENT(in) :: attr_name          ! name of the attribute
-    INTEGER :: errcode                                 ! error code
-    REAL, INTENT(inout), DIMENSION(*) :: buf           ! data buffer
-    INTEGER(size_t) :: namelen                         ! name length
-    INTEGER(size_t) :: attrlen                         ! name length
-
-    INTERFACE
-       INTEGER FUNCTION h5ltget_attribute_float_c(loc_id,namelen,dset_name,attrlen,attr_name,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTGET_ATTRIBUTE_FLOAT_C'::h5ltget_attribute_float_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         !DEC$ATTRIBUTES reference :: attr_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         INTEGER(size_t) :: attrlen                                      ! length of attr name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         CHARACTER(len=*), INTENT(in) :: attr_name               ! name of the attribute
-         REAL, INTENT(inout), DIMENSION(*) :: buf                ! data buffer
-       END FUNCTION h5ltget_attribute_float_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    attrlen = LEN(attr_name)
-    errcode = h5ltget_attribute_float_c(loc_id,namelen,dset_name,attrlen,attr_name,buf)
-
-  END SUBROUTINE h5ltget_attribute_float_f
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltget_attribute_double_f
-  !
-  ! Purpose: Reads an attribute named ATTR_NAME
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: October 05, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltget_attribute_double_f(loc_id,&
-       dset_name,&
-       attr_name,&
-       buf,&
-       errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltget_attribute_double_f
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    CHARACTER(len=*), INTENT(in) :: attr_name          ! name of the attribute
-    INTEGER :: errcode                                 ! error code
-    DOUBLE PRECISION,INTENT(inout),DIMENSION(*) :: buf ! data buffer
-    INTEGER(size_t) :: namelen                                 ! name length
-    INTEGER(size_t) :: attrlen                                 ! name length
-
-    INTERFACE
-       INTEGER FUNCTION h5ltget_attribute_double_c(loc_id,namelen,dset_name,attrlen,attr_name,buf)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTGET_ATTRIBUTE_DOUBLE_C'::h5ltget_attribute_double_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         !DEC$ATTRIBUTES reference :: attr_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         INTEGER(size_t) :: attrlen                                      ! length of attr name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         CHARACTER(len=*), INTENT(in) :: attr_name               ! name of the attribute
-         DOUBLE PRECISION, INTENT(inout), DIMENSION(*) :: buf    ! data buffer
-       END FUNCTION h5ltget_attribute_double_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    attrlen = LEN(attr_name)
-    errcode = h5ltget_attribute_double_c(loc_id,namelen,dset_name,attrlen,attr_name,buf)
-
-  END SUBROUTINE h5ltget_attribute_double_f
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltget_attribute_string_f
-  !
-  ! Purpose: Reads an attribute named ATTR_NAME
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: October 05, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltget_attribute_string_f(loc_id,&
-       dset_name,&
-       attr_name,&
-       buf,&
-       errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltget_attribute_string_f
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    CHARACTER(len=*), INTENT(in) :: attr_name          ! name of the attribute
-    INTEGER :: errcode                                 ! error code
-    CHARACTER(len=*), INTENT(inout) :: buf             ! data buffer
-    INTEGER(size_t) :: namelen                                 ! name length
-    INTEGER(size_t) :: attrlen                                 ! name length
-    INTEGER(size_t) :: buf_size                        ! buf size
-
-    INTERFACE
-       INTEGER FUNCTION h5ltget_attribute_string_c(loc_id,namelen,dset_name,attrlen,attr_name,buf,buf_size)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTGET_ATTRIBUTE_STRING_C'::h5ltget_attribute_string_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         !DEC$ATTRIBUTES reference :: attr_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         INTEGER(size_t) :: attrlen                                      ! length of attr name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         CHARACTER(len=*), INTENT(in) :: attr_name               ! name of the attribute
-         CHARACTER(len=*), INTENT(inout) :: buf                  ! data buffer
-         INTEGER(size_t) :: buf_size                 ! data buffer size
-       END FUNCTION h5ltget_attribute_string_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    attrlen = LEN(attr_name)
-    buf_size = LEN(buf)
-
-    errcode = h5ltget_attribute_string_c(loc_id,namelen,dset_name,attrlen,attr_name,buf,buf_size)
-
-  END SUBROUTINE h5ltget_attribute_string_f
-
-  !-------------------------------------------------------------------------
-  ! Query dataset functions
-  !-------------------------------------------------------------------------
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltget_dataset_ndims_f
-  !
-  ! Purpose: Gets the dimensionality of a dataset
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: September 30, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltget_dataset_ndims_f(loc_id,&
-       dset_name,&
-       rank,&
-       errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltget_dataset_ndims_f
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER,          INTENT(inout) :: rank            ! rank
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-
-    INTERFACE
-       INTEGER FUNCTION h5ltget_dataset_ndims_c(loc_id,namelen,dset_name,rank)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTGET_DATASET_NDIMS_C'::h5ltget_dataset_ndims_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER,          INTENT(inout) :: rank                 ! rank
-       END FUNCTION h5ltget_dataset_ndims_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltget_dataset_ndims_c(loc_id,namelen,dset_name,rank)
-
-  END SUBROUTINE h5ltget_dataset_ndims_f
-
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltfind_dataset_f
-  !
-  ! Purpose: Inquires if a dataset named dset_name exists attached
-  !           to the object loc_id.
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: October 05, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  INTEGER FUNCTION h5ltfind_dataset_f(loc_id,&
-       dset_name)
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltfind_dataset_f
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-
-    INTERFACE
-       INTEGER FUNCTION h5ltfind_dataset_c(loc_id,namelen,dset_name)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTFIND_DATASET_C'::h5ltfind_dataset_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-       END FUNCTION h5ltfind_dataset_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltfind_dataset_c(loc_id,namelen,dset_name)
-    h5ltfind_dataset_f = errcode
-
-  END FUNCTION h5ltfind_dataset_f
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltget_dataset_info_f
-  !
-  ! Purpose: Gets information about a dataset
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: September 30, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltget_dataset_info_f(loc_id,&
-       dset_name,&
-       dims,&
-       type_class,&
-       type_size,&
-       errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltget_dataset_info_f
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hsize_t),DIMENSION(*),INTENT(inout):: dims ! dimensions
-    INTEGER, INTENT(inout)         :: type_class       ! type class
-    INTEGER(size_t), INTENT(inout) :: type_size        ! type size
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-
-    INTERFACE
-       INTEGER FUNCTION h5ltget_dataset_info_c(loc_id,namelen,dset_name,dims,type_class,type_size)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTGET_DATASET_INFO_C'::h5ltget_dataset_info_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t),DIMENSION(*),INTENT(inout):: dims      ! dimensions
-         INTEGER, INTENT(inout)         :: type_class            ! type class
-         INTEGER(size_t), INTENT(inout) :: type_size             ! type size
-       END FUNCTION h5ltget_dataset_info_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    errcode = h5ltget_dataset_info_c(loc_id,namelen,dset_name,dims,type_class,type_size)
-
-  END SUBROUTINE h5ltget_dataset_info_f
-
-
-  !-------------------------------------------------------------------------
-  ! Query attribute functions
-  !-------------------------------------------------------------------------
-
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltget_attribute_ndims_f
-  !
-  ! Purpose: Create and write an attribute
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: October 05, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltget_attribute_ndims_f(loc_id,&
-       dset_name,&
-       attr_name,&
-       rank,&
-       errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltget_attribute_ndims_f
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    CHARACTER(len=*), INTENT(in) :: attr_name          ! name of the attribute
-    INTEGER,          INTENT(inout) :: rank            ! rank
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                                 ! name length
-    INTEGER(size_t) :: attrlen                                 ! name length
-
-    INTERFACE
-       INTEGER FUNCTION h5ltget_attribute_ndims_c(loc_id,namelen,dset_name,attrlen,attr_name,rank)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTGET_ATTRIBUTE_NDIMS_C'::h5ltget_attribute_ndims_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         !DEC$ATTRIBUTES reference :: attr_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(size_t) :: namelen                                      ! length of name buffer
-         INTEGER(size_t) :: attrlen                                      ! length of attr name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         CHARACTER(len=*), INTENT(in) :: attr_name               ! name of the attribute
-         INTEGER,          INTENT(inout) :: rank                 ! rank
-       END FUNCTION h5ltget_attribute_ndims_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    attrlen = LEN(attr_name)
-    errcode = h5ltget_attribute_ndims_c(loc_id,namelen,dset_name,attrlen,attr_name,rank)
-
-  END SUBROUTINE h5ltget_attribute_ndims_f
-
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltget_attribute_info_f
-  !
-  ! Purpose: Gets information about an attribute
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: pvn@ncsa.uiuc.edu
-  !
-  ! Date: September 30, 2004
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltget_attribute_info_f(loc_id,&
-       dset_name,&
-       attr_name,&
-       dims,&
-       type_class,&
-       type_size,&
-       errcode )
-
-    IMPLICIT NONE
-
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltget_attribute_info_f
-    !DEC$endif
-    !
-
-    INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-    CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    CHARACTER(len=*), INTENT(in) :: attr_name          ! name of the attribute
-    INTEGER(hsize_t),DIMENSION(*),INTENT(inout):: dims ! dimensions
-    INTEGER, INTENT(inout)         :: type_class       ! type class
-    INTEGER(size_t), INTENT(inout) :: type_size        ! type size
-    INTEGER :: errcode                                 ! error code
-    INTEGER(size_t) :: namelen                         ! name length
-    INTEGER(size_t) :: attrlen                                 ! name length
-
-    INTERFACE
-       INTEGER FUNCTION h5ltget_attribute_info_c(loc_id,namelen,dset_name,attrlen,attr_name,dims,type_class,type_size)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTGET_ATTRIBUTE_INFO_C'::h5ltget_attribute_info_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: dset_name
-         !DEC$ATTRIBUTES reference :: attr_name
-         INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER(size_t) :: namelen                              ! length of name buffer
-         INTEGER(size_t) :: attrlen                                      ! length of attr name buffer
-         CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         CHARACTER(len=*), INTENT(in) :: attr_name               ! name of the attribute
-         INTEGER(hsize_t),DIMENSION(*),INTENT(inout):: dims      ! dimensions
-         INTEGER, INTENT(inout)         :: type_class            ! type class
-         INTEGER(size_t), INTENT(inout) :: type_size             ! type size
-       END FUNCTION h5ltget_attribute_info_c
-    END INTERFACE
-
-    namelen = LEN(dset_name)
-    attrlen = LEN(attr_name)
-    errcode = h5ltget_attribute_info_c(loc_id,namelen,dset_name,attrlen,attr_name,dims,type_class,type_size)
-
-  END SUBROUTINE h5ltget_attribute_info_f
-
-  !-------------------------------------------------------------------------
-  ! Function: h5ltpath_valid_f
-  !
-  ! Purpose: Validates a path 
-  !
-  ! Return: Success: 0, Failure: -1
-  !
-  ! Programmer: M. Scot Breitenfeld
-  !
-  ! Date: February 18, 2012
-  !
-  ! Comments:
-  !
-  ! Modifications:
-  !
-  !-------------------------------------------------------------------------
-
-  SUBROUTINE h5ltpath_valid_f(loc_id, path, check_object_valid, path_valid, errcode)
-
-    IMPLICIT NONE
-    !
-    !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_HL_DLL)
-    !DEC$attributes dllexport :: h5ltpath_valid_f
-    !DEC$endif
-    !
-    INTEGER(hid_t)  , INTENT(IN)  :: loc_id              ! An identifier of an object in the file.
-    CHARACTER(LEN=*), INTENT(IN)  :: path                ! Path to the object to check, relative to loc_id.
-    LOGICAL         , INTENT(IN)  :: check_object_valid  ! Indicates whether to check if the final component 
-                                                         !  of the path resolves to a valid object 
-    LOGICAL         , INTENT(OUT) :: path_valid          ! Object status
-    INTEGER         , INTENT(OUT) :: errcode             ! Error code: 0 on success and -1 on failure
-
-    INTEGER(size_t) :: pathlen
-    INTEGER :: check_object_valid_c
-    INTEGER :: status
-
-    INTERFACE
-       INTEGER FUNCTION h5ltpath_valid_c(loc_id, path, pathlen, check_object_valid_c)
-         USE h5global
-         IMPLICIT NONE
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTPATH_VALID_C'::h5ltpath_valid_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: path
-         INTEGER(hid_t),   INTENT(in) :: loc_id  
-         CHARACTER(len=*), INTENT(in) :: path
-         INTEGER(size_t) :: pathlen
-         INTEGER :: check_object_valid_c
-       END FUNCTION h5ltpath_valid_c
-    END INTERFACE
-
-    ! Initialize
-    path_valid = .FALSE.
-    errcode = 0
-    
-    check_object_valid_c = 0
-    IF(check_object_valid) check_object_valid_c = 1
-
-    pathlen = LEN(path)
-    status = h5ltpath_valid_c(loc_id, path, pathlen, check_object_valid_c)
-
-    IF(status.EQ.1)THEN
-       path_valid = .TRUE.
-    ELSE IF(status.LT.0)THEN
-       errcode = -1
-    ENDIF
-    
-  END SUBROUTINE h5ltpath_valid_f
-  !  end
-  !
-END MODULE H5LT
-
-
-
-
-
-
diff --git a/hl/fortran/src/H5TBfc.c b/hl/fortran/src/H5TBfc.c
index bf058fd..588638c 100644
--- a/hl/fortran/src/H5TBfc.c
+++ b/hl/fortran/src/H5TBfc.c
@@ -1,17 +1,14 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Board of Trustees of the University of Illinois.         *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of HDF5.  The full HDF5 copyright notice, including     *
-* terms governing use, modification, and redistribution, is contained in    *
-* the files COPYING and Copyright.html.  COPYING can be found at the root   *
-* of the source code distribution tree; Copyright.html can be found at the  *
-* root level of an installed copy of the electronic HDF5 document set and   *
-* is linked from the top-level documents page.  It can also be found at     *
-* http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-* access to either file, you may request a copy from help@hdfgroup.org.     *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <math.h>
 
@@ -22,741 +19,568 @@
 #include "H5Eprivate.h"
 
 /*-------------------------------------------------------------------------
-* Function: h5tbmake_table_c
-*
-* Purpose: Call H5TBmake_table
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 06, 2004
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5tbmake_table_c
+ *
+ * Purpose: Call H5TBmake_table
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * Date: October 06, 2004
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 int_f
-nh5tbmake_table_c(size_t_f *namelen1,
-                  _fcd name1,
-                  hid_t_f *loc_id,
-                  size_t_f *namelen,
-                  _fcd name,
-                  hsize_t_f *nfields,
-                  hsize_t_f *nrecords,
-                  size_t_f *type_size,
-                  size_t_f *field_offset,
-                  hid_t_f *field_types,
-                  hsize_t_f *chunk_size,
-                  int_f *compress,
-                  size_t_f *char_len_field_names, /* field_names lenghts */
-                  size_t_f *max_char_size_field_names, /* char len of fields */
-                  char *field_names)            /* field_names */
+h5tbmake_table_c(size_t_f *namelen1, _fcd name1, hid_t_f *loc_id, size_t_f *namelen, _fcd name,
+                 hsize_t_f *nfields, hsize_t_f *nrecords, size_t_f *type_size, size_t_f *field_offset,
+                 hid_t_f *field_types, hsize_t_f *chunk_size, int_f *compress,
+                 size_t_f *char_len_field_names,      /* field_names lengths */
+                 size_t_f *max_char_size_field_names, /* char len of fields */
+                 char     *field_names)                   /* field_names */
 {
-    char *c_name = NULL;
-    char *c_name1 = NULL;
+    char   *c_name  = NULL;
+    char   *c_name1 = NULL;
     hsize_t num_elem;
     hsize_t i;
-    hsize_t c_nfields = (hsize_t)*nfields;
+    hsize_t c_nfields      = (hsize_t)*nfields;
     size_t *c_field_offset = NULL;
-    hid_t *c_field_types = NULL;
-    char **c_field_names = NULL;
-    char *tmp = NULL, *tmp_p;
-    int_f ret_value = 0;
+    hid_t  *c_field_types  = NULL;
+    char  **c_field_names  = NULL;
+    char   *tmp            = NULL, *tmp_p;
+    int_f   ret_value      = 0;
 
     num_elem = (hsize_t)*nfields;
 
     /*
      * convert FORTRAN name to C name
      */
-    if(NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
+    if (NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
         HGOTO_DONE(FAIL)
-    if(NULL == (c_name1 = (char *)HD5f2cstring(name1, (size_t)*namelen1)))
+    if (NULL == (c_name1 = (char *)HD5f2cstring(name1, (size_t)*namelen1)))
         HGOTO_DONE(FAIL)
-    if(NULL == (c_field_offset = (size_t *)HDmalloc(sizeof(size_t) * (size_t)c_nfields)))
+    if (NULL == (c_field_offset = (size_t *)HDmalloc(sizeof(size_t) * (size_t)c_nfields)))
         HGOTO_DONE(FAIL)
-    if(NULL == (c_field_types = (hid_t *)HDmalloc(sizeof(hid_t) * (size_t)c_nfields)))
+    if (NULL == (c_field_types = (hid_t *)HDmalloc(sizeof(hid_t) * (size_t)c_nfields)))
         HGOTO_DONE(FAIL)
 
-    for(i = 0; i < num_elem; i++) {
-      c_field_offset[i] = (size_t)field_offset[i];
-        c_field_types[i] = field_types[i];
+    for (i = 0; i < num_elem; i++) {
+        c_field_offset[i] = (size_t)field_offset[i];
+        c_field_types[i]  = field_types[i];
     } /* end for */
 
     /*
      * allocate array of character pointers
      */
-    if(NULL == (c_field_names = (char **)HDcalloc((size_t)num_elem, sizeof(char *))))
+    if (NULL == (c_field_names = (char **)HDcalloc((size_t)num_elem, sizeof(char *))))
         HGOTO_DONE(FAIL)
 
     /* copy data to long C string */
-    if(NULL == (tmp = (char *)HD5f2cstring(field_names, (size_t)*(max_char_size_field_names)*(size_t)num_elem)))
+    if (NULL ==
+        (tmp = (char *)HD5f2cstring(field_names, (size_t) * (max_char_size_field_names) * (size_t)num_elem)))
         HGOTO_DONE(FAIL)
     /*
-     * move data from temorary buffer
+     * move data from temporary buffer
      */
     tmp_p = tmp;
-    for(i = 0; i < num_elem; i++) {
-        if(NULL == (c_field_names[i] = (char *)HDmalloc((size_t)char_len_field_names[i] + 1)))
+    for (i = 0; i < num_elem; i++) {
+        if (NULL == (c_field_names[i] = (char *)HDmalloc((size_t)char_len_field_names[i] + 1)))
             HGOTO_DONE(FAIL)
         HDmemcpy(c_field_names[i], tmp_p, (size_t)char_len_field_names[i]);
         c_field_names[i][char_len_field_names[i]] = '\0';
-
-        tmp_p = tmp_p + *max_char_size_field_names;
+        tmp_p                                     = tmp_p + *max_char_size_field_names;
     } /* end for */
 
     /*
      * call H5TBmake_table function.
      */
-    if(H5TBmake_table(c_name1, (hid_t)*loc_id, c_name, c_nfields, (hsize_t)*nrecords,
-            (size_t)*type_size, (const char **)c_field_names, c_field_offset, c_field_types,
-            (hsize_t)*chunk_size, NULL, *compress, NULL) < 0)
+    if (H5TBmake_table(c_name1, (hid_t)*loc_id, c_name, c_nfields, (hsize_t)*nrecords, (size_t)*type_size,
+                       (const char **)c_field_names, c_field_offset, c_field_types, (hsize_t)*chunk_size,
+                       NULL, *compress, NULL) < 0)
         HGOTO_DONE(FAIL)
 
 done:
-    if(c_name)
+    if (c_name)
         HDfree(c_name);
-    if(c_name1)
+    if (c_name1)
         HDfree(c_name1);
-    if(c_field_names) {
-        for(i = 0; i < num_elem; i++) {
-            if(c_field_names[i])
+    if (c_field_names) {
+        for (i = 0; i < num_elem; i++) {
+            if (c_field_names[i])
                 HDfree(c_field_names[i]);
         } /* end for */
         HDfree(c_field_names);
     } /* end if */
-    if(tmp)
+    if (tmp)
         HDfree(tmp);
-    if(c_field_offset)
+    if (c_field_offset)
         HDfree(c_field_offset);
-    if(c_field_types)
+    if (c_field_types)
         HDfree(c_field_types);
 
     return ret_value;
-} /* end nh5tbmake_table_c() */
+} /* end h5tbmake_table_c() */
 
 /*-------------------------------------------------------------------------
-* Function: h5tbwrite_field_name_c
-*
-* Purpose: Call H5TBwrite_fields_name
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 12, 2004
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5tbmake_table_ptr_c
+ *
+ * Purpose: Call H5TBmake_table using F2003 features
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: M. Scot Breitenfeld
+ *
+ * Date: Sept. 10, 2015
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 int_f
-nh5tbwrite_field_name_c(hid_t_f *loc_id,
-                        size_t_f *namelen,
-                        _fcd name,
-                        size_t_f *namelen1,
-                        _fcd field_name,
-                        hsize_t_f *start,
-                        hsize_t_f *nrecords,
-                        size_t_f *type_size,
-                        void *buf)
+h5tbmake_table_ptr_c(size_t_f *namelen1, _fcd name1, hid_t_f *loc_id, size_t_f *namelen, _fcd name,
+                     hsize_t_f *nfields, hsize_t_f *nrecords, size_t_f *type_size, size_t_f *field_offset,
+                     hid_t_f *field_types, hsize_t_f *chunk_size, void *fill_data, int_f *compress,
+                     size_t_f *char_len_field_names,      /* field_names lengths */
+                     size_t_f *max_char_size_field_names, /* char len of fields */
+                     char *field_names, void *data)       /* field_names */
 {
-    char   *c_name = NULL;
+    char   *c_name  = NULL;
     char   *c_name1 = NULL;
-    size_t  c_type_size[1]  = {(size_t)*type_size};
-    int_f   ret_value = 0;
+    hsize_t num_elem;
+    hsize_t i;
+    hsize_t c_nfields      = (hsize_t)*nfields;
+    size_t *c_field_offset = NULL;
+    hid_t  *c_field_types  = NULL;
+    char  **c_field_names  = NULL;
+    char   *tmp            = NULL, *tmp_p;
+    int_f   ret_value      = 0;
+
+    num_elem = (hsize_t)*nfields;
 
     /*
      * convert FORTRAN name to C name
      */
-    if(NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
+    if (NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
         HGOTO_DONE(FAIL)
-    if(NULL == (c_name1 = (char *)HD5f2cstring(field_name, (size_t)*namelen1)))
+    if (NULL == (c_name1 = (char *)HD5f2cstring(name1, (size_t)*namelen1)))
+        HGOTO_DONE(FAIL)
+    if (NULL == (c_field_offset = (size_t *)HDmalloc(sizeof(size_t) * (size_t)c_nfields)))
+        HGOTO_DONE(FAIL)
+    if (NULL == (c_field_types = (hid_t *)HDmalloc(sizeof(hid_t) * (size_t)c_nfields)))
         HGOTO_DONE(FAIL)
 
+    for (i = 0; i < num_elem; i++) {
+        c_field_offset[i] = (size_t)field_offset[i];
+        c_field_types[i]  = field_types[i];
+    } /* end for */
+
     /*
-     * call H5TBwrite_fields_name function.
+     * allocate array of character pointers
+     */
+    if (NULL == (c_field_names = (char **)HDcalloc((size_t)num_elem, sizeof(char *))))
+        HGOTO_DONE(FAIL)
+
+    /* copy data to long C string */
+    if (NULL ==
+        (tmp = (char *)HD5f2cstring(field_names, (size_t) * (max_char_size_field_names) * (size_t)num_elem)))
+        HGOTO_DONE(FAIL)
+    /*
+     * move data from temporary buffer
+     */
+    tmp_p = tmp;
+    for (i = 0; i < num_elem; i++) {
+        if (NULL == (c_field_names[i] = (char *)HDmalloc((size_t)char_len_field_names[i] + 1)))
+            HGOTO_DONE(FAIL)
+        HDmemcpy(c_field_names[i], tmp_p, (size_t)char_len_field_names[i]);
+        c_field_names[i][char_len_field_names[i]] = '\0';
+        tmp_p                                     = tmp_p + *max_char_size_field_names;
+    } /* end for */
+
+    /*
+     * call H5TBmake_table function.
      */
-    if(H5TBwrite_fields_name((hid_t)*loc_id, c_name, c_name1, (hsize_t)*start,
-            (hsize_t)*nrecords, c_type_size[0], 0, c_type_size, buf) < 0)
+    if (H5TBmake_table(c_name1, (hid_t)*loc_id, c_name, c_nfields, (hsize_t)*nrecords, (size_t)*type_size,
+                       (const char **)c_field_names, c_field_offset, c_field_types, (hsize_t)*chunk_size,
+                       fill_data, *compress, data) < 0)
         HGOTO_DONE(FAIL)
 
 done:
-    if(c_name)
+    if (c_name)
         HDfree(c_name);
-    if(c_name1)
+    if (c_name1)
         HDfree(c_name1);
+    if (c_field_names) {
+        for (i = 0; i < num_elem; i++) {
+            if (c_field_names[i])
+                HDfree(c_field_names[i]);
+        } /* end for */
+        HDfree(c_field_names);
+    } /* end if */
+    if (tmp)
+        HDfree(tmp);
+    if (c_field_offset)
+        HDfree(c_field_offset);
+    if (c_field_types)
+        HDfree(c_field_types);
 
     return ret_value;
-}
+} /* end h5tbmake_table_c() */
 
+/*-------------------------------------------------------------------------
+ * Function: h5tbread_table_c
+ *
+ * Purpose: Call H5TBread_table using F2003 features
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: M. Scot Breitenfeld
+ *
+ * Date: Sept. 14, 2015
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 int_f
-nh5tbwrite_field_name_int_c(hid_t_f *loc_id,
-                            size_t_f *namelen,
-                            _fcd name,
-                            size_t_f *namelen1,
-                            _fcd field_name,
-                            hsize_t_f *start,
-                            hsize_t_f *nrecords,
-                            size_t_f *type_size,
-                            void *buf)
+h5tbread_table_c(hid_t_f *loc_id, _fcd name, size_t_f *namelen, hsize_t_f *nfields, size_t_f *dst_size,
+                 size_t_f *dst_offset, size_t_f *dst_sizes, void *dst_buf)
 {
-    return nh5tbwrite_field_name_c(loc_id, namelen, name, namelen1, field_name,
-            start, nrecords, type_size, buf);
-}
+    char   *c_name       = NULL;
+    size_t *c_dst_offset = NULL;
+    size_t *c_dst_sizes  = NULL;
+    hsize_t c_nfields    = (hsize_t)*nfields;
+    int_f   ret_value    = 0;
+    hsize_t i;
 
-int_f
-nh5tbwrite_field_name_fl_c(hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd name,
-                           size_t_f *namelen1,
-                           _fcd field_name,
-                           hsize_t_f *start,
-                           hsize_t_f *nrecords,
-                           size_t_f *type_size,
-                           void *buf)
-{
-    return nh5tbwrite_field_name_c(loc_id, namelen, name, namelen1, field_name,
-            start, nrecords, type_size, buf);
-}
+    /*
+     * convert FORTRAN name to C name
+     */
+    if (NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
+        HGOTO_DONE(FAIL)
 
-int_f
-nh5tbwrite_field_name_dl_c(hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd name,
-                           size_t_f *namelen1,
-                           _fcd field_name,
-                           hsize_t_f *start,
-                           hsize_t_f *nrecords,
-                           size_t_f *type_size,
-                           void *buf)
-{
-    return nh5tbwrite_field_name_c(loc_id, namelen, name, namelen1, field_name,
-            start, nrecords, type_size, buf);
-}
+    if (NULL == (c_dst_offset = (size_t *)HDmalloc(sizeof(size_t) * (size_t)c_nfields)))
+        HGOTO_DONE(FAIL)
+    if (NULL == (c_dst_sizes = (size_t *)HDmalloc(sizeof(size_t) * (size_t)c_nfields)))
+        HGOTO_DONE(FAIL)
 
-int_f
-nh5tbwrite_field_name_st_c(hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd name,
-                           size_t_f *namelen1,
-                           _fcd field_name,
-                           hsize_t_f *start,
-                           hsize_t_f *nrecords,
-                           size_t_f *type_size,
-                           void *buf)
-{
-    return nh5tbwrite_field_name_c(loc_id, namelen, name, namelen1, field_name,
-            start, nrecords, type_size, buf);
-}
+    for (i = 0; i < c_nfields; i++) {
+        c_dst_offset[i] = (size_t)dst_offset[i];
+        c_dst_sizes[i]  = (size_t)dst_sizes[i];
+    } /* end for */
+
+    /*
+     * call H5TBread_table function.
+     */
+    if (H5TBread_table((hid_t)*loc_id, c_name, (size_t)*dst_size, c_dst_offset, c_dst_sizes, dst_buf) < 0)
+        HGOTO_DONE(FAIL)
+
+done:
+    if (c_name)
+        HDfree(c_name);
+
+    if (c_dst_offset)
+        HDfree(c_dst_offset);
+    if (c_dst_sizes)
+        HDfree(c_dst_sizes);
+
+    return ret_value;
+} /* end h5tbmake_table_c() */
 
 /*-------------------------------------------------------------------------
-* Function: h5tbread_field_name_c
-*
-* Purpose: Call H5TBread_fields_name
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 12, 2004
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5tbwrite_field_name_c
+ *
+ * Purpose: Call H5TBwrite_fields_name
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * Date: October 12, 2004
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 int_f
-nh5tbread_field_name_c(hid_t_f *loc_id,
-                       size_t_f *namelen,
-                       _fcd name,
-                       size_t_f *namelen1,
-                       _fcd field_name,
-                       hsize_t_f *start,
-                       hsize_t_f *nrecords,
-                       size_t_f *type_size,
-                       void *buf)
+h5tbwrite_field_name_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *namelen1, _fcd field_name,
+                       hsize_t_f *start, hsize_t_f *nrecords, size_t_f *type_size, void *buf)
 {
-    char   *c_name = NULL;
-    char   *c_name1 = NULL;
-    size_t  c_type_size[1]  = {(size_t)*type_size};
-    int_f   ret_value = 0;
+    char  *c_name         = NULL;
+    char  *c_name1        = NULL;
+    size_t c_type_size[1] = {(size_t)*type_size};
+    int_f  ret_value      = 0;
 
     /*
      * convert FORTRAN name to C name
      */
-    if(NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
+    if (NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
         HGOTO_DONE(FAIL)
-    if(NULL == (c_name1 = (char *)HD5f2cstring(field_name, (size_t)*namelen1)))
+    if (NULL == (c_name1 = (char *)HD5f2cstring(field_name, (size_t)*namelen1)))
         HGOTO_DONE(FAIL)
 
     /*
-     * call H5TBread_fields_name function.
+     * call H5TBwrite_fields_name function.
      */
-    if(H5TBread_fields_name((hid_t)*loc_id, c_name, c_name1, (hsize_t)*start,
-            (hsize_t)*nrecords, c_type_size[0], 0, c_type_size, buf) < 0)
+    if (H5TBwrite_fields_name((hid_t)*loc_id, c_name, c_name1, (hsize_t)*start, (hsize_t)*nrecords,
+                              c_type_size[0], 0, c_type_size, buf) < 0)
         HGOTO_DONE(FAIL)
 
 done:
-    if(c_name)
+    if (c_name)
         HDfree(c_name);
-    if(c_name1)
+    if (c_name1)
         HDfree(c_name1);
 
     return ret_value;
 }
 
+/*-------------------------------------------------------------------------
+ * Function: h5tbread_field_name_c
+ *
+ * Purpose: Call H5TBread_fields_name
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * Date: October 12, 2004
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 int_f
-nh5tbread_field_name_int_c(hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd name,
-                           size_t_f *namelen1,
-                           _fcd field_name,
-                           hsize_t_f *start,
-                           hsize_t_f *nrecords,
-                           size_t_f *type_size,
-                           void *buf)
+h5tbread_field_name_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *namelen1, _fcd field_name,
+                      hsize_t_f *start, hsize_t_f *nrecords, size_t_f *type_size, void *buf)
 {
-    return nh5tbread_field_name_c(loc_id, namelen, name, namelen1, field_name,
-            start, nrecords, type_size, buf);
-}
+    char  *c_name         = NULL;
+    char  *c_name1        = NULL;
+    size_t c_type_size[1] = {(size_t)*type_size};
+    int_f  ret_value      = 0;
 
-int_f
-nh5tbread_field_name_fl_c(hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          size_t_f *namelen1,
-                          _fcd field_name,
-                          hsize_t_f *start,
-                          hsize_t_f *nrecords,
-                          size_t_f *type_size,
-                          void *buf)
-{
-    return nh5tbread_field_name_c(loc_id, namelen, name, namelen1, field_name,
-            start, nrecords, type_size, buf);
-}
+    /*
+     * convert FORTRAN name to C name
+     */
+    if (NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
+        HGOTO_DONE(FAIL)
+    if (NULL == (c_name1 = (char *)HD5f2cstring(field_name, (size_t)*namelen1)))
+        HGOTO_DONE(FAIL)
 
-int_f
-nh5tbread_field_name_dl_c(hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          size_t_f *namelen1,
-                          _fcd field_name,
-                          hsize_t_f *start,
-                          hsize_t_f *nrecords,
-                          size_t_f *type_size,
-                          void *buf)
-{
-    return nh5tbread_field_name_c(loc_id, namelen, name, namelen1, field_name,
-            start, nrecords, type_size, buf);
-}
+    /*
+     * call H5TBread_fields_name function.
+     */
+    if (H5TBread_fields_name((hid_t)*loc_id, c_name, c_name1, (hsize_t)*start, (hsize_t)*nrecords,
+                             c_type_size[0], 0, c_type_size, buf) < 0)
+        HGOTO_DONE(FAIL)
 
-int_f
-nh5tbread_field_name_st_c(hid_t_f *loc_id,
-                          size_t_f *namelen,
-                          _fcd name,
-                          size_t_f *namelen1,
-                          _fcd field_name,
-                          hsize_t_f *start,
-                          hsize_t_f *nrecords,
-                          size_t_f *type_size,
-                          void *buf)
-{
-    return nh5tbread_field_name_c(loc_id, namelen, name, namelen1, field_name,
-            start, nrecords, type_size, buf);
+done:
+    if (c_name)
+        HDfree(c_name);
+    if (c_name1)
+        HDfree(c_name1);
+
+    return ret_value;
 }
 
 /*-------------------------------------------------------------------------
-* Function: h5tbwrite_field_index_c
-*
-* Purpose: Call H5TBwrite_fields_index
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 12, 2004
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5tbwrite_field_index_c
+ *
+ * Purpose: Call H5TBwrite_fields_index
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * Date: October 12, 2004
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 int_f
-nh5tbwrite_field_index_c(hid_t_f *loc_id,
-                         size_t_f *namelen,
-                         _fcd name,
-                         int_f *field_index,
-                         hsize_t_f *start,
-                         hsize_t_f *nrecords,
-                         size_t_f *type_size,
-                         void *buf)
+h5tbwrite_field_index_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *field_index, hsize_t_f *start,
+                        hsize_t_f *nrecords, size_t_f *type_size, void *buf)
 {
-    char   *c_name =  NULL;
-    size_t  c_type_size  = *type_size;
-    int     c_field_index = *field_index - 1; /* C zero based index */
-    int_f   ret_value = 0;
+    char  *c_name        = NULL;
+    size_t c_type_size   = *type_size;
+    int    c_field_index = *field_index - 1; /* C zero based index */
+    int_f  ret_value     = 0;
 
     /*
      * convert FORTRAN name to C name
      */
-    if(NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
+    if (NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
         HGOTO_DONE(FAIL)
 
-
     /*
      * call H5TBwrite_fields_name function.
      */
-    if(H5TBwrite_fields_index((hid_t)*loc_id, c_name, (hsize_t)1, &c_field_index,
-            (hsize_t)*start, (hsize_t)*nrecords, c_type_size, 0, &c_type_size, buf) < 0)
+    if (H5TBwrite_fields_index((hid_t)*loc_id, c_name, (hsize_t)1, &c_field_index, (hsize_t)*start,
+                               (hsize_t)*nrecords, c_type_size, 0, &c_type_size, buf) < 0)
         HGOTO_DONE(FAIL)
 
 done:
-    if(c_name)
+    if (c_name)
         HDfree(c_name);
 
     return ret_value;
 }
 
-int_f
-nh5tbwrite_field_index_int_c(hid_t_f *loc_id,
-                             size_t_f *namelen,
-                             _fcd name,
-                             int_f *field_index,
-                             hsize_t_f *start,
-                             hsize_t_f *nrecords,
-                             size_t_f *type_size,
-                             void *buf)
-{
-    return nh5tbwrite_field_index_c(loc_id, namelen, name, field_index, start,
-            nrecords, type_size, buf);
-}
-
-int_f
-nh5tbwrite_field_index_fl_c(hid_t_f *loc_id,
-                            size_t_f *namelen,
-                            _fcd name,
-                            int_f *field_index,
-                            hsize_t_f *start,
-                            hsize_t_f *nrecords,
-                            size_t_f *type_size,
-                            void *buf)
-{
-    return nh5tbwrite_field_index_c(loc_id, namelen, name, field_index, start,
-            nrecords, type_size, buf);
-}
-
-int_f
-nh5tbwrite_field_index_dl_c(hid_t_f *loc_id,
-                            size_t_f *namelen,
-                            _fcd name,
-                            int_f *field_index,
-                            hsize_t_f *start,
-                            hsize_t_f *nrecords,
-                            size_t_f *type_size,
-                            void *buf)
-{
-    return nh5tbwrite_field_index_c(loc_id, namelen, name, field_index, start,
-            nrecords, type_size, buf);
-}
-
-int_f
-nh5tbwrite_field_index_st_c(hid_t_f *loc_id,
-                            size_t_f *namelen,
-                            _fcd name,
-                            int_f *field_index,
-                            hsize_t_f *start,
-                            hsize_t_f *nrecords,
-                            size_t_f *type_size,
-                            void *buf)
-{
-    return nh5tbwrite_field_index_c(loc_id, namelen, name, field_index, start,
-            nrecords, type_size, buf);
-}
-
 /*-------------------------------------------------------------------------
-* Function: h5tbread_field_index_c
-*
-* Purpose: Call H5TBread_fields_index
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 12, 2004
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5tbread_field_index_c
+ *
+ * Purpose: Call H5TBread_fields_index
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * Date: October 12, 2004
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 int_f
-nh5tbread_field_index_c(hid_t_f *loc_id,
-                        size_t_f *namelen,
-                        _fcd name,
-                        int_f *field_index,
-                        hsize_t_f *start,
-                        hsize_t_f *nrecords,
-                        size_t_f *type_size,
-                        void *buf)
+h5tbread_field_index_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *field_index, hsize_t_f *start,
+                       hsize_t_f *nrecords, size_t_f *type_size, void *buf)
 {
-    char   *c_name = NULL;
-    size_t  c_type_size  = *type_size;
-    int     c_field_index = *field_index - 1; /* C zero based index */
-    int_f   ret_value = 0;
+    char  *c_name        = NULL;
+    size_t c_type_size   = *type_size;
+    int    c_field_index = *field_index - 1; /* C zero based index */
+    int_f  ret_value     = 0;
 
     /*
      * convert FORTRAN name to C name
      */
-    if(NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
+    if (NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
         HGOTO_DONE(FAIL)
 
     /*
      * call H5TBread_fields_index function.
      */
-    if(H5TBread_fields_index((hid_t)*loc_id, c_name,(hsize_t)1, &c_field_index,
-            (hsize_t)*start, (hsize_t)*nrecords, c_type_size, 0, &c_type_size, buf) < 0)
+    if (H5TBread_fields_index((hid_t)*loc_id, c_name, (hsize_t)1, &c_field_index, (hsize_t)*start,
+                              (hsize_t)*nrecords, c_type_size, 0, &c_type_size, buf) < 0)
         HGOTO_DONE(FAIL)
 
 done:
-    if(c_name)
+    if (c_name)
         HDfree(c_name);
 
     return ret_value;
 }
 
-int_f
-nh5tbread_field_index_int_c(hid_t_f *loc_id,
-                            size_t_f *namelen,
-                            _fcd name,
-                            int_f *field_index,
-                            hsize_t_f *start,
-                            hsize_t_f *nrecords,
-                            size_t_f *type_size,
-                            void *buf)
-{
-    return nh5tbread_field_index_c(loc_id, namelen, name, field_index, start,
-        nrecords, type_size, buf);
-}
-
-int_f
-nh5tbread_field_index_fl_c(hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd name,
-                           int_f *field_index,
-                           hsize_t_f *start,
-                           hsize_t_f *nrecords,
-                           size_t_f *type_size,
-                           void *buf)
-{
-    return nh5tbread_field_index_c(loc_id, namelen, name, field_index, start,
-            nrecords, type_size, buf);
-}
-
-int_f
-nh5tbread_field_index_dl_c(hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd name,
-                           int_f *field_index,
-                           hsize_t_f *start,
-                           hsize_t_f *nrecords,
-                           size_t_f *type_size,
-                           void *buf)
-{
-    return nh5tbread_field_index_c(loc_id, namelen, name, field_index, start,
-            nrecords, type_size, buf);
-}
-
-int_f
-nh5tbread_field_index_st_c(hid_t_f *loc_id,
-                           size_t_f *namelen,
-                           _fcd name,
-                           int_f *field_index,
-                           hsize_t_f *start,
-                           hsize_t_f *nrecords,
-                           size_t_f *type_size,
-                           void *buf)
-{
-    return nh5tbread_field_index_c(loc_id, namelen, name, field_index, start,
-            nrecords, type_size, buf);
-}
-
 /*-------------------------------------------------------------------------
-* Function: h5tbinsert_field_c
-*
-* Purpose: Call H5TBinsert_field
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 13, 2004
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5tbinsert_field_c
+ *
+ * Purpose: Call H5TBinsert_field
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * Date: October 13, 2004
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 int_f
-nh5tbinsert_field_c(hid_t_f *loc_id,
-                    size_t_f *namelen,
-                    _fcd name,
-                    size_t_f *namelen1,
-                    _fcd field_name,
-                    hid_t_f *field_type,
-                    int_f *position,
-                    void *buf)
+h5tbinsert_field_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *namelen1, _fcd field_name,
+                   hid_t_f *field_type, int_f *position, void *buf)
 {
-    char   *c_name = NULL;
-    char   *c_name1 = NULL;
-    int_f   ret_value = 0;
+    char *c_name    = NULL;
+    char *c_name1   = NULL;
+    int_f ret_value = 0;
 
     /*
      * convert FORTRAN name to C name
      */
-    if(NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
+    if (NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
         HGOTO_DONE(FAIL)
-    if(NULL == (c_name1 = (char *)HD5f2cstring(field_name, (size_t)*namelen1)))
+    if (NULL == (c_name1 = (char *)HD5f2cstring(field_name, (size_t)*namelen1)))
         HGOTO_DONE(FAIL)
     /*
      * call H5TBinsert_field function.
      */
 
-    if(H5TBinsert_field((hid_t)*loc_id, c_name, c_name1, (hid_t)*field_type, 
-            (hsize_t)*position, NULL, buf) < 0)
+    if (H5TBinsert_field((hid_t)*loc_id, c_name, c_name1, (hid_t)*field_type, (hsize_t)*position, NULL, buf) <
+        0)
         HGOTO_DONE(FAIL)
 
 done:
-    if(c_name)
+    if (c_name)
         HDfree(c_name);
-    if(c_name1)
+    if (c_name1)
         HDfree(c_name1);
 
     return ret_value;
 }
 
-int_f
-nh5tbinsert_field_int_c(hid_t_f *loc_id,
-                        size_t_f *namelen,
-                        _fcd name,
-                        size_t_f *namelen1,
-                        _fcd field_name,
-                        hid_t_f *field_type,
-                        int_f *position,
-                        void *buf)
-{
-    return nh5tbinsert_field_c(loc_id, namelen, name, namelen1, field_name,
-            field_type, position, buf);
-}
-
-int_f
-nh5tbinsert_field_fl_c(hid_t_f *loc_id,
-                       size_t_f *namelen,
-                       _fcd name,
-                       size_t_f *namelen1,
-                       _fcd field_name,
-                       hid_t_f *field_type,
-                       int_f *position,
-                       void *buf)
-{
-    return nh5tbinsert_field_c(loc_id, namelen, name, namelen1, field_name,
-            field_type, position, buf);
-}
-
-int_f
-nh5tbinsert_field_dl_c(hid_t_f *loc_id,
-                       size_t_f *namelen,
-                       _fcd name,
-                       size_t_f *namelen1,
-                       _fcd field_name,
-                       hid_t_f *field_type,
-                       int_f *position,
-                       void *buf)
-{
-    return nh5tbinsert_field_c(loc_id, namelen, name, namelen1, field_name,
-            field_type, position, buf);
-}
-
-int_f
-nh5tbinsert_field_st_c(hid_t_f *loc_id,
-                       size_t_f *namelen,
-                       _fcd name,
-                       size_t_f *namelen1,
-                       _fcd field_name,
-                       hid_t_f *field_type,
-                       int_f *position,
-                       void *buf)
-{
-    return nh5tbinsert_field_c(loc_id, namelen, name, namelen1, field_name,
-            field_type, position, buf);
-}
-
 /*-------------------------------------------------------------------------
-* Function: h5tbdelete_field_c
-*
-* Purpose: Call H5TBdelete_field
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 13, 2004
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5tbdelete_field_c
+ *
+ * Purpose: Call H5TBdelete_field
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * Date: October 13, 2004
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 int_f
-nh5tbdelete_field_c(hid_t_f *loc_id,
-                    size_t_f *namelen,
-                    _fcd name,
-                    size_t_f *namelen1,
-                    _fcd field_name)
+h5tbdelete_field_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *namelen1, _fcd field_name)
 {
-    char   *c_name = NULL;
-    char   *c_name1 = NULL;
-    int_f   ret_value = 0;
+    char *c_name    = NULL;
+    char *c_name1   = NULL;
+    int_f ret_value = 0;
 
     /*
      * convert FORTRAN name to C name
      */
-    if(NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
+    if (NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
         HGOTO_DONE(FAIL)
-    if(NULL == (c_name1 = (char *)HD5f2cstring(field_name, (size_t)*namelen1)))
+    if (NULL == (c_name1 = (char *)HD5f2cstring(field_name, (size_t)*namelen1)))
         HGOTO_DONE(FAIL)
 
     /*
      * call H5TBinsert_field function.
      */
-    if(H5TBdelete_field((hid_t)*loc_id, c_name, c_name1) < 0)
+    if (H5TBdelete_field((hid_t)*loc_id, c_name, c_name1) < 0)
         HGOTO_DONE(FAIL)
 
 done:
-    if(c_name)
+    if (c_name)
         HDfree(c_name);
-    if(c_name1)
+    if (c_name1)
         HDfree(c_name1);
 
     return ret_value;
 }
 
 /*-------------------------------------------------------------------------
-* Function: h5tbget_table_info_c
-*
-* Purpose: Call H5TBread_fields_index
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 12, 2004
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5tbget_table_info_c
+ *
+ * Purpose: Call H5TBread_fields_index
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * Date: October 12, 2004
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 int_f
-nh5tbget_table_info_c(hid_t_f *loc_id,
-                      size_t_f *namelen,
-                      _fcd name,
-                      hsize_t_f *nfields,
-                      hsize_t_f *nrecords)
+h5tbget_table_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *nfields, hsize_t_f *nrecords)
 {
     char   *c_name = NULL;
     hsize_t c_nfields;
@@ -766,67 +590,61 @@ nh5tbget_table_info_c(hid_t_f *loc_id,
     /*
      * convert FORTRAN name to C name
      */
-    if(NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
+    if (NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
         HGOTO_DONE(FAIL)
 
-
     /*
      * call H5TBread_fields_index function.
      */
 
-    if(H5TBget_table_info((hid_t)*loc_id, c_name, &c_nfields, &c_nrecords) < 0)
+    if (H5TBget_table_info((hid_t)*loc_id, c_name, &c_nfields, &c_nrecords) < 0)
         HGOTO_DONE(FAIL)
-    *nfields = (hsize_t_f) c_nfields;
-    *nrecords = (hsize_t_f) c_nrecords;
+    *nfields  = (hsize_t_f)c_nfields;
+    *nrecords = (hsize_t_f)c_nrecords;
 
 done:
-    if(c_name)
+    if (c_name)
         HDfree(c_name);
 
     return ret_value;
 }
 
 /*-------------------------------------------------------------------------
-* Function: h5tbget_field_info_c
-*
-* Purpose: Call H5TBget_field_info
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: October 13, 2004
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: h5tbget_field_info_c
+ *
+ * Purpose: Call H5TBget_field_info
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * Date: October 13, 2004
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
 int_f
-nh5tbget_field_info_c(hid_t_f *loc_id,
-                      size_t_f *namelen,
-                      _fcd name,
-                      hsize_t_f *nfields,
-                      size_t_f *field_sizes,
-                      size_t_f *field_offsets,
-                      size_t_f *type_size,
-                      size_t_f *namelen2,       /* field_names lenghts */
-                      size_t_f *lenmax,         /* character len max */
-                      _fcd field_names,      /* field_names */
-                      size_t_f *maxlen_out)
+h5tbget_field_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *nfields, size_t_f *field_sizes,
+                     size_t_f *field_offsets, size_t_f *type_size,
+                     size_t_f *namelen2,    /* field_names lengths */
+                     size_t_f *lenmax,      /* character len max */
+                     _fcd      field_names, /* field_names */
+                     size_t_f *maxlen_out)
 
 {
     char   *c_name = NULL;
     hsize_t num_elem;
-    hsize_t c_nfields  = *nfields;
-    size_t *c_field_sizes = NULL;
+    hsize_t c_nfields       = *nfields;
+    size_t *c_field_sizes   = NULL;
     size_t *c_field_offsets = NULL;
     size_t  c_type_size;
     char  **c_field_names = NULL;
-    char   *tmp = NULL, *tmp_p;
+    char   *tmp           = NULL, *tmp_p;
     hsize_t i;
     int_f   ret_value = 0;
-    size_t c_lenmax;
-    size_t length = 0;
+    size_t  c_lenmax;
+    size_t  length = 0;
 
     c_lenmax = (size_t)*lenmax;
 
@@ -835,69 +653,68 @@ nh5tbget_field_info_c(hid_t_f *loc_id,
     /*
      * convert FORTRAN name to C name
      */
-    if(NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
+    if (NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
         HGOTO_DONE(FAIL)
-    if(NULL == (c_field_offsets =  (size_t *)HDmalloc(sizeof(size_t) * (size_t)c_nfields)))
+    if (NULL == (c_field_offsets = (size_t *)HDmalloc(sizeof(size_t) * (size_t)c_nfields)))
         HGOTO_DONE(FAIL)
-    if(NULL == (c_field_sizes =  (size_t *)HDmalloc(sizeof(size_t) * (size_t)c_nfields)))
+    if (NULL == (c_field_sizes = (size_t *)HDmalloc(sizeof(size_t) * (size_t)c_nfields)))
         HGOTO_DONE(FAIL)
-    if(NULL == (c_field_names = (char **)HDcalloc((size_t)c_nfields, sizeof(char *))))
+    if (NULL == (c_field_names = (char **)HDcalloc((size_t)c_nfields, sizeof(char *))))
         HGOTO_DONE(FAIL)
 
-    for(i = 0; i < c_nfields; i++)
-        if(NULL == (c_field_names[i] = (char *)HDmalloc(sizeof(char) * HLTB_MAX_FIELD_LEN)))
+    for (i = 0; i < c_nfields; i++)
+        if (NULL == (c_field_names[i] = (char *)HDmalloc(sizeof(char) * HLTB_MAX_FIELD_LEN)))
             HGOTO_DONE(FAIL)
 
     /*
      * call H5TBget_field_info function.
      */
-    if(H5TBget_field_info((hid_t)*loc_id, c_name, c_field_names, c_field_sizes,
-            c_field_offsets, &c_type_size) < 0)
+    if (H5TBget_field_info((hid_t)*loc_id, c_name, c_field_names, c_field_sizes, c_field_offsets,
+                           &c_type_size) < 0)
         HGOTO_DONE(FAIL)
-   
+
     /* return values */
 
     /* names array */
-    if(NULL == (tmp = (char *)HDmalloc((c_lenmax * (size_t)c_nfields) + 1)))
+    if (NULL == (tmp = (char *)HDmalloc((c_lenmax * (size_t)c_nfields) + 1)))
         HGOTO_DONE(FAIL)
     tmp_p = tmp;
     HDmemset(tmp, ' ', c_lenmax * (size_t)c_nfields);
     tmp[c_lenmax * c_nfields] = '\0';
-    for(i = 0; i < c_nfields; i++) {
-         size_t field_name_len = HDstrlen(c_field_names[i]);
+    for (i = 0; i < c_nfields; i++) {
+        size_t field_name_len = HDstrlen(c_field_names[i]);
 
-         HDmemcpy(tmp_p, c_field_names[i], field_name_len);
-         namelen2[i] = (size_t_f)field_name_len;
-         length = MAX(length, strlen((c_field_names[i])));
-         tmp_p = tmp_p + c_lenmax;
+        HDmemcpy(tmp_p, c_field_names[i], field_name_len);
+        namelen2[i] = (size_t_f)field_name_len;
+        length      = MAX(length, strlen((c_field_names[i])));
+        tmp_p       = tmp_p + c_lenmax;
     } /* end for */
 
-    HD5packFstring(tmp, _fcdtocp(field_names), (size_t)( c_lenmax* c_nfields));
+    HD5packFstring(tmp, _fcdtocp(field_names), (size_t)(c_lenmax * c_nfields));
 
     *type_size = (size_t_f)c_type_size;
-    for(i = 0; i < num_elem; i++) {
+    for (i = 0; i < num_elem; i++) {
         field_sizes[i]   = (size_t_f)c_field_sizes[i];
         field_offsets[i] = (size_t_f)c_field_offsets[i];
     } /* end for */
 
-    *maxlen_out = (size_t_f)length; 
+    *maxlen_out = (size_t_f)length;
 
 done:
-    if(c_name)
+    if (c_name)
         HDfree(c_name);
-    if(c_field_names) {
-        for(i = 0; i < num_elem; i++)
-            if(c_field_names[i])
+    if (c_field_names) {
+        for (i = 0; i < num_elem; i++)
+            if (c_field_names[i])
                 HDfree(c_field_names[i]);
         HDfree(c_field_names);
     } /* end if */
-    if(tmp)
+    if (tmp)
         HDfree(tmp);
-    if(c_field_offsets)
+    if (c_field_offsets)
         HDfree(c_field_offsets);
-    if(c_field_sizes)
+    if (c_field_sizes)
         HDfree(c_field_sizes);
 
     return ret_value;
 }
-
diff --git a/hl/fortran/src/H5TBff.F90 b/hl/fortran/src/H5TBff.F90
new file mode 100644
index 0000000..f4f8950
--- /dev/null
+++ b/hl/fortran/src/H5TBff.F90
@@ -0,0 +1,1140 @@
+!> @defgroup FH5TB Fortran High Level Table (H5TB) Interface
+!!
+!! @see H5TB, C-HL API
+!!
+!! @see @ref H5TB_UG, User Guide
+!!
+
+!> @ingroup FH5TB
+!!
+!! @brief This module contains Fortran interfaces for H5TB.
+!
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!       _____ __  __ _____   ____  _____ _______       _   _ _______
+!      |_   _|  \/  |  __ \ / __ \|  __ \__   __|/\   | \ | |__   __|
+! ****   | | | \  / | |__) | |  | | |__) | | |  /  \  |  \| |  | |    ****
+! ****   | | | |\/| |  ___/| |  | |  _  /  | | / /\ \ | . ` |  | |    ****
+! ****  _| |_| |  | | |    | |__| | | \ \  | |/ ____ \| |\  |  | |    ****
+!      |_____|_|  |_|_|     \____/|_|  \_\ |_/_/    \_\_| \_|  |_|
+!
+!  If you add a new function here then you MUST add the function name to the
+!  Windows dll file 'hdf5_hl_fortrandll.def.in' in the hl/fortran/src directory.
+!  This is needed for Windows based operating systems.
+!
+#include "H5config_f.inc"
+#ifdef H5_DOXYGEN
+   MODULE H5TB
+#else
+   MODULE H5TB_CONST
+#endif
+
+  USE, INTRINSIC :: ISO_C_BINDING
+  USE h5fortran_types
+  USE hdf5
+
+  INTERFACE h5tbwrite_field_name_f
+#ifdef H5_DOXYGEN
+     MODULE PROCEDURE h5tbwrite_field_name_f
+#else
+     MODULE PROCEDURE h5tbwrite_field_name_f_int
+     MODULE PROCEDURE h5tbwrite_field_name_f_string
+#endif
+  END INTERFACE
+
+  INTERFACE h5tbread_field_name_f
+#ifdef H5_DOXYGEN
+     MODULE PROCEDURE h5tbread_field_name_f
+#else
+     MODULE PROCEDURE h5tbread_field_name_f_int
+     MODULE PROCEDURE h5tbread_field_name_f_string
+#endif
+  END INTERFACE
+
+  INTERFACE h5tbwrite_field_index_f
+#ifdef H5_DOXYGEN
+     MODULE PROCEDURE h5tbwrite_field_index_f
+#else
+     MODULE PROCEDURE h5tbwrite_field_index_f_int
+     MODULE PROCEDURE h5tbwrite_field_index_f_string
+#endif
+  END INTERFACE
+
+  INTERFACE h5tbread_field_index_f
+#ifdef H5_DOXYGEN
+     MODULE PROCEDURE h5tbread_field_index_f
+#else
+     MODULE PROCEDURE h5tbread_field_index_f_int
+     MODULE PROCEDURE h5tbread_field_index_f_string
+#endif
+  END INTERFACE
+
+  INTERFACE h5tbinsert_field_f
+#ifdef H5_DOXYGEN
+     MODULE PROCEDURE h5tbinsert_field_f
+#else
+     MODULE PROCEDURE h5tbinsert_field_f_int
+     MODULE PROCEDURE h5tbinsert_field_f_string
+#endif
+  END INTERFACE
+
+
+#ifndef H5_DOXYGEN
+
+  INTERFACE h5tbmake_table_f
+     MODULE PROCEDURE h5tbmake_table_f90
+     MODULE PROCEDURE h5tbmake_table_ptr_f
+  END INTERFACE
+
+  INTERFACE
+     INTEGER FUNCTION h5tbwrite_field_name_c(loc_id,namelen,dset_name,namelen1,field_name,&
+          start,nrecords,type_size,buf) &
+          BIND(C,NAME='h5tbwrite_field_name_c')
+       IMPORT :: C_CHAR, C_PTR
+       IMPORT :: HID_T, SIZE_T, HSIZE_T
+       IMPLICIT NONE
+       INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
+       CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: dset_name    ! name of the dataset
+       CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: field_name   ! name of the field
+       INTEGER(hsize_t), INTENT(in) :: start                            ! start record
+       INTEGER(hsize_t), INTENT(in) :: nrecords                         ! records
+       INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
+       TYPE(C_PTR), VALUE :: buf                                        ! data buffer
+       INTEGER :: errcode                                               ! error code
+       INTEGER(size_t) :: namelen                                       ! name length
+       INTEGER(size_t) :: namelen1                                      ! name length
+     END FUNCTION h5tbwrite_field_name_c
+  END INTERFACE
+
+  INTERFACE
+     INTEGER FUNCTION h5tbread_field_name_c(loc_id,namelen,dset_name,namelen1,field_name, &
+          start,nrecords,type_size,buf) &
+          BIND(C,NAME='h5tbread_field_name_c')
+       IMPORT :: C_CHAR, C_PTR
+       IMPORT :: HID_T, SIZE_T, HSIZE_T
+       IMPLICIT NONE
+       INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
+       CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: dset_name    ! name of the dataset
+       CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: field_name   ! name of the field
+       INTEGER(hsize_t), INTENT(in) :: start                            ! start record
+       INTEGER(hsize_t), INTENT(in) :: nrecords                         ! records
+       INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
+       TYPE(C_PTR), VALUE :: buf                                        ! data buffer
+       INTEGER :: errcode                                               ! error code
+       INTEGER(size_t) :: namelen                                       ! name length
+       INTEGER(size_t) :: namelen1                                      ! name length
+     END FUNCTION h5tbread_field_name_c
+  END INTERFACE
+
+  INTERFACE
+     INTEGER FUNCTION h5tbwrite_field_index_c(loc_id,namelen,dset_name,field_index,&
+          start,nrecords,type_size,buf) &
+          BIND(C,NAME='h5tbwrite_field_index_c')
+       IMPORT :: C_CHAR, C_PTR
+       IMPORT :: HID_T, SIZE_T, HSIZE_T
+       IMPLICIT NONE
+       INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
+       CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: dset_name    ! name of the dataset
+       INTEGER, INTENT(in) :: field_index                               ! index
+       INTEGER(hsize_t), INTENT(in) :: start                            ! start record
+       INTEGER(hsize_t), INTENT(in) :: nrecords                         ! records
+       INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
+       TYPE(C_PTR), VALUE :: buf                                        ! data buffer
+       INTEGER :: errcode                                               ! error code
+       INTEGER(size_t) :: namelen                                       ! name length
+     END FUNCTION h5tbwrite_field_index_c
+  END INTERFACE
+
+  INTERFACE
+     INTEGER FUNCTION h5tbread_field_index_c(loc_id,namelen,dset_name,field_index,&
+          start,nrecords,type_size,buf) &
+          BIND(C,NAME='h5tbread_field_index_c')
+       IMPORT :: C_CHAR, C_PTR
+       IMPORT :: HID_T, SIZE_T, HSIZE_T
+       IMPLICIT NONE
+       INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
+       CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: dset_name    ! name of the dataset
+       INTEGER, INTENT(in) :: field_index                               ! index
+       INTEGER(hsize_t), INTENT(in) :: start                            ! start record
+       INTEGER(hsize_t), INTENT(in) :: nrecords                         ! records
+       INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
+       TYPE(C_PTR), VALUE :: buf                                        ! data buffer
+       INTEGER :: errcode                                               ! error code
+       INTEGER(size_t) :: namelen                                       ! name length
+     END FUNCTION h5tbread_field_index_c
+  END INTERFACE
+
+  INTERFACE
+     INTEGER FUNCTION h5tbinsert_field_c(loc_id,namelen,dset_name,namelen1,field_name,&
+          field_type,field_index,buf) &
+          BIND(C,NAME='h5tbinsert_field_c')
+       IMPORT :: C_CHAR, C_PTR
+       IMPORT :: HID_T, SIZE_T, HSIZE_T
+       IMPLICIT NONE
+       INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
+       CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: dset_name    ! name of the dataset
+       CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: field_name   ! name of the field
+       INTEGER(hid_t), INTENT(in)   :: field_type                       ! field type
+       INTEGER, INTENT(in) :: field_index                               ! field_index
+       TYPE(C_PTR), VALUE :: buf                                        ! data buffer
+       INTEGER(size_t) :: namelen                                       ! name length
+       INTEGER(size_t) :: namelen1                                      ! name length length
+     END FUNCTION h5tbinsert_field_c
+  END INTERFACE
+
+#endif
+
+CONTAINS
+
+!>
+!! \ingroup FH5TB
+!!
+!! \brief Creates (DOES NOT WRITE) a dataset named \p dset_name attached to the object specified by the identifier \p loc_id.
+!!
+!! \attention  \fortran_obsolete
+!!
+!! \param table_title   The title of the table.
+!! \param loc_id        Location identifier. The identifier may be that of a file or group.
+!! \param dset_name     The name of the dataset to create.
+!! \param nfields       The number of fields.
+!! \param nrecords      The number of records.
+!! \param type_size     The size in bytes of the structure associated with the table. Obtained with sizeof or storage_size.
+!! \param field_names   An array containing the names of the fields.
+!! \param field_offset  An array containing the offsets of the fields.
+!! \param field_types   An array containing the type of the fields.
+!! \param chunk_size    The chunk size.
+!! \param compress      Flag that turns compression on or off.
+!! \param errcode       \fortran_error
+!!
+!! See C API: @ref H5TBmake_table()
+!!
+#ifdef H5_DOXYGEN
+  SUBROUTINE h5tbmake_table_f(&
+#else
+  SUBROUTINE h5tbmake_table_f90(&
+#endif
+       table_title,&
+       loc_id,&
+       dset_name,&
+       nfields,&
+       nrecords,&
+       type_size,&
+       field_names,&
+       field_offset,&
+       field_types,&
+       chunk_size,&
+       compress,&
+       errcode )
+
+    IMPLICIT NONE
+    CHARACTER(LEN=*), INTENT(in) :: table_title
+    INTEGER(hid_t)  , INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: dset_name
+    INTEGER(hsize_t), INTENT(in) :: nfields
+    INTEGER(hsize_t), INTENT(in) :: nrecords
+    INTEGER(size_t) , INTENT(in) :: type_size
+    CHARACTER(LEN=*), DIMENSION(1:nfields), INTENT(in) :: field_names
+    INTEGER(size_t) , DIMENSION(1:nfields), INTENT(in) :: field_offset
+    INTEGER(hid_t),   DIMENSION(1:nfields), INTENT(in) :: field_types
+    INTEGER(hsize_t), INTENT(in) :: chunk_size
+    INTEGER,          INTENT(in) :: compress
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen                                       ! name length
+    INTEGER(size_t) :: namelen1                                      ! name length
+    INTEGER(size_t), DIMENSION(1:nfields) :: char_len_field_names    ! field name lengths
+    INTEGER(size_t) :: max_char_size_field_names                     ! character len of field names
+    INTEGER(hsize_t) :: i                                            ! general purpose integer
+
+    INTERFACE
+       INTEGER FUNCTION h5tbmake_table_c(namelen1,&
+            table_title,&
+            loc_id,&
+            namelen,&
+            dset_name,&
+            nfields,&
+            nrecords,&
+            type_size,&
+            field_offset,&
+            field_types,&
+            chunk_size,&
+            compress,&
+            char_len_field_names,&
+            max_char_size_field_names,&
+            field_names) &
+            BIND(C,NAME='h5tbmake_table_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T, HSIZE_T
+         IMPLICIT NONE
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: table_title
+         INTEGER(hid_t),   INTENT(in) :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: dset_name
+         INTEGER(hsize_t), INTENT(in) :: nfields
+         INTEGER(hsize_t), INTENT(in) :: nrecords
+         INTEGER(size_t),  INTENT(in) :: type_size
+         CHARACTER(KIND=C_CHAR), DIMENSION(nfields), INTENT(in) :: field_names
+         INTEGER(size_t),  DIMENSION(nfields), INTENT(in) :: field_offset
+         INTEGER(hid_t),   DIMENSION(nfields), INTENT(in) :: field_types
+         INTEGER(hsize_t), INTENT(in) :: chunk_size
+         INTEGER,          INTENT(in) :: compress
+         INTEGER(size_t) :: namelen
+         INTEGER(size_t) :: namelen1
+         INTEGER(size_t), DIMENSION(nfields) :: char_len_field_names
+         INTEGER(size_t) :: max_char_size_field_names
+       END FUNCTION h5tbmake_table_c
+    END INTERFACE
+
+    namelen  = LEN(dset_name)
+    namelen1 = LEN(table_title)
+
+    ! Find the size of each character string in the array
+    DO i = 1, nfields
+       char_len_field_names(i) = LEN_TRIM(field_names(i))
+    END DO
+
+    max_char_size_field_names = LEN(field_names(1))
+
+    errcode = h5tbmake_table_c(namelen1, table_title, loc_id, namelen, dset_name, nfields, nrecords,&
+         type_size, field_offset, field_types, chunk_size, compress, char_len_field_names, &
+         max_char_size_field_names, field_names)
+
+#ifdef H5_DOXYGEN
+  END SUBROUTINE h5tbmake_table_f
+#else
+  END SUBROUTINE h5tbmake_table_f90
+#endif
+
+!>
+!! \ingroup FH5TB
+!!
+!! \brief Creates and writes a dataset named \p dset_name attached to the object specified by the identifier \p loc_id.
+!!
+!! \attention  \fortran_approved
+!!
+!! \param table_title   The title of the table
+!! \param loc_id        Location identifier. The identifier may be that of a file or group.
+!! \param dset_name     The name of the dataset to create
+!! \param nfields       The number of fields
+!! \param nrecords      The number of records
+!! \param type_size     The size in bytes of the structure associated with the table; This value is obtained with sizeof().
+!! \param field_names   An array containing the names of the fields
+!! \param field_offset  An array containing the offsets of the fields
+!! \param field_types   An array containing the type of the fields
+!! \param chunk_size    The chunk size
+!! \param fill_data     Fill values data
+!! \param compress      Flag that turns compression on or off
+!! \param data	        Buffer with data to be written to the table
+!! \param errcode       \fortran_error
+!!
+!! See C API: @ref H5TBmake_table()
+!!
+#ifdef H5_DOXYGEN
+  SUBROUTINE h5tbmake_table_f(&
+#else
+  SUBROUTINE h5tbmake_table_ptr_f(&
+#endif
+       table_title,&
+       loc_id,&
+       dset_name,&
+       nfields,&
+       nrecords,&
+       type_size,&
+       field_names,&
+       field_offset,&
+       field_types,&
+       chunk_size,&
+       fill_data,&
+       compress,&
+       data,&
+       errcode )
+
+    USE ISO_C_BINDING
+    IMPLICIT NONE
+    CHARACTER(LEN=*), INTENT(in) :: table_title
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: dset_name
+    INTEGER(hsize_t), INTENT(in) :: nfields
+    INTEGER(hsize_t), INTENT(in) :: nrecords
+    INTEGER(size_t),  INTENT(in) :: type_size
+    CHARACTER(LEN=*), DIMENSION(1:nfields), INTENT(in) :: field_names
+    INTEGER(size_t),  DIMENSION(1:nfields), INTENT(in) :: field_offset
+    INTEGER(hid_t),   DIMENSION(1:nfields), INTENT(in) :: field_types
+    INTEGER :: errcode
+    INTEGER(hsize_t), INTENT(in) :: chunk_size
+    TYPE(C_PTR), INTENT(in) :: fill_data
+    INTEGER,          INTENT(in) :: compress
+    TYPE(C_PTR), INTENT(in) :: data
+    INTEGER(size_t) :: namelen                                       ! name length
+    INTEGER(size_t) :: namelen1                                      ! name length
+    INTEGER(size_t), DIMENSION(1:nfields) :: char_len_field_names    ! field name lengths
+    INTEGER(size_t) :: max_char_size_field_names                     ! character len of field names
+    INTEGER(hsize_t) :: i                                            ! general purpose integer
+
+    INTERFACE
+       INTEGER FUNCTION h5tbmake_table_ptr_c(namelen1,&
+            table_title,&
+            loc_id,&
+            namelen,&
+            dset_name,&
+            nfields,&
+            nrecords,&
+            type_size,&
+            field_offset,&
+            field_types,&
+            chunk_size,&
+            fill_data,&
+            compress,&
+            char_len_field_names,&
+            max_char_size_field_names,&
+            field_names,&
+            data) &
+            BIND(C,NAME='h5tbmake_table_ptr_c')
+         IMPORT :: C_CHAR, C_PTR
+         IMPORT :: HID_T, SIZE_T, HSIZE_T
+         IMPLICIT NONE
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: table_title
+         INTEGER(hid_t),   INTENT(in) :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: dset_name
+         INTEGER(hsize_t), INTENT(in) :: nfields
+         INTEGER(hsize_t), INTENT(in) :: nrecords
+         INTEGER(size_t),  INTENT(in) :: type_size
+         CHARACTER(KIND=C_CHAR), DIMENSION(nfields), INTENT(in) :: field_names
+         INTEGER(size_t),  DIMENSION(nfields), INTENT(in) :: field_offset
+         INTEGER(hid_t),   DIMENSION(nfields), INTENT(in) :: field_types
+         INTEGER(hsize_t), INTENT(in) :: chunk_size
+         TYPE(C_PTR), INTENT(in), VALUE :: fill_data
+         INTEGER,          INTENT(in) :: compress
+         INTEGER(size_t) :: namelen
+         INTEGER(size_t) :: namelen1
+         INTEGER(size_t), DIMENSION(nfields) :: char_len_field_names
+         INTEGER(size_t) :: max_char_size_field_names
+         TYPE(C_PTR), INTENT(in), VALUE :: data
+       END FUNCTION h5tbmake_table_ptr_c
+    END INTERFACE
+
+    namelen  = LEN(dset_name)
+    namelen1 = LEN(table_title)
+
+    ! Find the size of each character string in the array
+    DO i = 1, nfields
+       char_len_field_names(i) = LEN_TRIM(field_names(i))
+    END DO
+
+    max_char_size_field_names = LEN(field_names(1))
+
+    errcode = h5tbmake_table_ptr_c(namelen1, table_title, loc_id, namelen, dset_name, nfields, nrecords,&
+         type_size, field_offset, field_types, chunk_size, fill_data, compress, char_len_field_names, &
+         max_char_size_field_names, field_names, data)
+
+#ifdef H5_DOXYGEN
+   END SUBROUTINE h5tbmake_table_f
+#else
+   END SUBROUTINE h5tbmake_table_ptr_f
+#endif
+!>
+!! \ingroup FH5TB
+!!
+!! \brief Reads a table.
+!!
+!! \param loc_id     Location identifier. The identifier may be that of a file or group.
+!! \param dset_name  The name of the dataset to read
+!! \param nfields    Number of fields, i.e., size of dst_offset and dst_sizes arrays.
+!! \param dst_size   The size of the structure type, as calculated by sizeof or storage_size
+!! \param dst_offset An array containing the offsets of the fields. These offsets can be calculated with H5OFFSETOF.
+!! \param dst_sizes  An array containing the sizes of the fields. These sizes can be calculated with sizeof or storage_size.
+!! \param dst_buf    Pointer to buffer with data.
+!! \param errcode    \fortran_error
+!!
+!! See C API: @ref H5TBread_table()
+!!
+  SUBROUTINE h5tbread_table_f(loc_id, dset_name, nfields, dst_size, dst_offset, &
+       dst_sizes, dst_buf, errcode)
+
+    USE ISO_C_BINDING
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: dset_name
+    INTEGER(hsize_t), INTENT(in) :: nfields
+    INTEGER(size_t),  INTENT(in) :: dst_size
+    INTEGER(size_t),  DIMENSION(1:nfields), INTENT(in) :: dst_offset
+    INTEGER(size_t),  DIMENSION(1:nfields), INTENT(in) :: dst_sizes
+    TYPE(C_PTR)                                        :: dst_buf !!! do not use INTENT, causes NAG to segfault in C APIs
+    INTEGER :: errcode
+
+    INTEGER(size_t) :: namelen  ! name length
+
+    INTERFACE
+       INTEGER FUNCTION h5tbread_table_c(loc_id,&
+            dset_name,&
+            namelen,&
+            nfields,&
+            dst_size,&
+            dst_offset, &
+            dst_sizes, &
+            dst_buf) &
+            BIND(C,NAME='h5tbread_table_c')
+         IMPORT :: C_PTR
+         IMPORT :: HID_T, SIZE_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(hid_t),   INTENT(in) :: loc_id
+         CHARACTER(LEN=1), INTENT(in) :: dset_name
+         INTEGER(hsize_t), INTENT(in) :: nfields
+         INTEGER(size_t),  INTENT(in) :: dst_size
+         INTEGER(size_t),  DIMENSION(1:nfields), INTENT(in) :: dst_offset
+         INTEGER(size_t),  DIMENSION(1:nfields), INTENT(in) :: dst_sizes
+         INTEGER(size_t) :: namelen
+         TYPE(C_PTR), VALUE :: dst_buf
+
+       END FUNCTION h5tbread_table_c
+    END INTERFACE
+
+    namelen = LEN(dset_name)
+
+    errcode = h5tbread_table_c(loc_id,&
+         dset_name,&
+         namelen, &
+         nfields, &
+         dst_size,&
+         dst_offset, &
+         dst_sizes, &
+         dst_buf)
+
+  END SUBROUTINE h5tbread_table_f
+
+#ifdef H5_DOXYGEN
+!>
+!! \ingroup FH5TB
+!!
+!! \brief Overwrites field.
+!!
+!! \param loc_id      Location identifier. The identifier may be that of a file or group.
+!! \param dset_name   The name of the dataset to overwrite
+!! \param field_name  The names of the fields to write
+!! \param start       The zero index record to start writing
+!! \param nrecords    The number of records to write
+!! \param type_size   The size of the structure type, as calculated by sizeof or storage_size.
+!! \param buf         Buffer with data.
+!! \param errcode     \fortran_error
+!!
+!! See similar C API: @ref H5TBwrite_fields_name()
+!!
+  SUBROUTINE h5tbwrite_field_name_f(&
+#else
+  SUBROUTINE h5tbwrite_field_name_f_int(&
+#endif
+       loc_id,&
+       dset_name,&
+       field_name,&
+       start,&
+       nrecords,&
+       type_size,&
+       buf,&
+       errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: dset_name
+    CHARACTER(LEN=*), INTENT(in) :: field_name
+    INTEGER(hsize_t), INTENT(in) :: start
+    INTEGER(hsize_t), INTENT(in) :: nrecords
+    INTEGER(size_t),  INTENT(in) :: type_size
+#ifdef H5_DOXYGEN
+    TYPE(TYPE), INTENT(in), DIMENSION(*) :: buf
+#else
+    INTEGER, INTENT(in), DIMENSION(*), TARGET :: buf
+#endif
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen  ! name length
+    INTEGER(size_t) :: namelen1 ! name length
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1))
+    namelen  = LEN(dset_name)
+    namelen1 = LEN(field_name)
+
+    errcode = h5tbwrite_field_name_c(loc_id,namelen,dset_name,namelen1,field_name,&
+         start,nrecords,type_size,f_ptr)
+#ifdef H5_DOXYGEN
+  END SUBROUTINE h5tbwrite_field_name_f
+#else
+  END SUBROUTINE h5tbwrite_field_name_f_int
+
+  SUBROUTINE h5tbwrite_field_name_f_string(loc_id,&
+       dset_name,&
+       field_name,&
+       start,&
+       nrecords,&
+       type_size,&
+       buf,&
+       errcode )
+
+    IMPLICIT NONE
+
+    INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
+    CHARACTER(LEN=*), INTENT(in) :: dset_name                        ! name of the dataset
+    CHARACTER(LEN=*), INTENT(in) :: field_name                       ! name of the field
+    INTEGER(hsize_t), INTENT(in) :: start                            ! start record
+    INTEGER(hsize_t), INTENT(in) :: nrecords                         ! records
+    INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
+    CHARACTER(LEN=*), INTENT(in), DIMENSION(*), TARGET :: buf        ! data buffer
+    INTEGER :: errcode                                               ! error code
+    INTEGER(size_t) :: namelen                                       ! name length
+    INTEGER(size_t) :: namelen1
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1)(1:1))
+
+    namelen  = LEN(dset_name)
+    namelen1 = LEN(field_name)
+
+    errcode = h5tbwrite_field_name_c(loc_id,namelen,dset_name,namelen1,field_name,&
+         start,nrecords,type_size,f_ptr)
+
+  END SUBROUTINE h5tbwrite_field_name_f_string
+#endif
+
+#ifdef H5_DOXYGEN
+!>
+!! \ingroup FH5TB
+!!
+!! \brief Reads one or several fields. The fields are identified by name.
+!!
+!! \param loc_id      Location identifier. The identifier may be that of a file or group.
+!! \param dset_name   The name of the dataset to read.
+!! \param field_name  An array containing the names of the fields to read.
+!! \param start       The start record to read from.
+!! \param nrecords    The number of records to read.
+!! \param type_size   The size in bytes of the structure associated with the table.  Obtained with sizeof or storage_size.
+!! \param buf         Buffer with data
+!! \param errcode     \fortran_error
+!!
+!! See similar C API: @ref H5TBread_fields_name()
+!!
+  SUBROUTINE h5tbread_field_name_f(&
+#else
+  SUBROUTINE h5tbread_field_name_f_int(&
+#endif
+       loc_id,&
+       dset_name,&
+       field_name,&
+       start,&
+       nrecords,&
+       type_size,&
+       buf,&
+       errcode )
+
+    IMPLICIT NONE
+
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: dset_name
+    CHARACTER(LEN=*), INTENT(in) :: field_name
+    INTEGER(hsize_t), INTENT(in) :: start
+    INTEGER(hsize_t), INTENT(in) :: nrecords
+    INTEGER(size_t),  INTENT(in) :: type_size
+#ifdef H5_DOXYGEN
+    TYPE(TYPE), INTENT(INOUT), DIMENSION(*):: buf
+#else
+    INTEGER, INTENT(INOUT), DIMENSION(*), TARGET :: buf
+#endif
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen   ! name length
+    INTEGER(size_t) :: namelen1  ! name length
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1))
+
+    namelen  = LEN(dset_name)
+    namelen1 = LEN(field_name)
+
+    errcode = h5tbread_field_name_c(loc_id,namelen,dset_name,namelen1,field_name,&
+         start,nrecords,type_size,f_ptr)
+
+#ifdef H5_DOXYGEN
+  END SUBROUTINE h5tbread_field_name_f
+#else
+  END SUBROUTINE h5tbread_field_name_f_int
+
+  SUBROUTINE h5tbread_field_name_f_string(loc_id,&
+       dset_name,&
+       field_name,&
+       start,&
+       nrecords,&
+       type_size,&
+       buf,&
+       errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: dset_name
+    CHARACTER(LEN=*), INTENT(in) :: field_name
+    INTEGER(hsize_t), INTENT(in) :: start
+    INTEGER(hsize_t), INTENT(in) :: nrecords
+    INTEGER(size_t),  INTENT(in) :: type_size
+    CHARACTER(LEN=*), INTENT(INOUT), DIMENSION(*), TARGET :: buf
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen  ! name length
+    INTEGER(size_t) :: namelen1 ! name length
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1)(1:1))
+
+    namelen  = LEN(dset_name)
+    namelen1 = LEN(field_name)
+
+    errcode = h5tbread_field_name_c(loc_id,namelen,dset_name,namelen1,field_name,&
+         start,nrecords,type_size,f_ptr)
+
+  END SUBROUTINE h5tbread_field_name_f_string
+#endif
+
+#ifdef H5_DOXYGEN
+!>
+!! \ingroup FH5TB
+!!
+!! \brief Overwrites a field.
+!!
+!! \param loc_id       Location identifier. The identifier may be that of a file or group.
+!! \param dset_name    The name of the dataset to overwrite.
+!! \param field_index  The indexe of the fields to write.
+!! \param start        The zero based index record to start writing.
+!! \param nrecords     The number of records to write.
+!! \param type_size    The size of the structure type, as calculated by sizeof or storage_size.
+!! \param buf	       Buffer with data.
+!! \param errcode      \fortran_error
+!!
+!! See similar C API: @ref H5TBwrite_fields_index()
+!!
+  SUBROUTINE h5tbwrite_field_index_f(&
+#else
+  SUBROUTINE h5tbwrite_field_index_f_int(&
+#endif
+       loc_id,&
+       dset_name,&
+       field_index,&
+       start,&
+       nrecords,&
+       type_size,&
+       buf,&
+       errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: dset_name
+    INTEGER, INTENT(in) :: field_index
+    INTEGER(hsize_t), INTENT(in) :: start
+    INTEGER(hsize_t), INTENT(in) :: nrecords
+    INTEGER(size_t),  INTENT(in) :: type_size
+#ifdef H5_DOXYGEN
+    INTEGER, INTENT(in), DIMENSION(*) :: buf
+#else
+    INTEGER, INTENT(in), DIMENSION(*), TARGET :: buf
+#endif
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen ! name length
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1))
+
+    namelen  = LEN(dset_name)
+
+    errcode = h5tbwrite_field_index_c(loc_id,namelen,dset_name,field_index,&
+         start,nrecords,type_size,f_ptr)
+
+#ifdef H5_DOXYGEN
+  END SUBROUTINE h5tbwrite_field_index_f
+#else
+  END SUBROUTINE h5tbwrite_field_index_f_int
+
+  SUBROUTINE h5tbwrite_field_index_f_string(loc_id,&
+       dset_name,&
+       field_index,&
+       start,&
+       nrecords,&
+       type_size,&
+       buf,&
+       errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: dset_name
+    INTEGER, INTENT(in) :: field_index
+    INTEGER(hsize_t), INTENT(in) :: start
+    INTEGER(hsize_t), INTENT(in) :: nrecords
+    INTEGER(size_t),  INTENT(in) :: type_size
+    CHARACTER(LEN=*), INTENT(in), DIMENSION(*), TARGET :: buf
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen ! name length
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1)(1:1))
+    namelen  = LEN(dset_name)
+
+    errcode = h5tbwrite_field_index_c(loc_id,namelen,dset_name,field_index,&
+         start,nrecords,type_size,f_ptr)
+
+  END SUBROUTINE h5tbwrite_field_index_f_string
+#endif
+
+#ifdef H5_DOXYGEN
+!>
+!! \ingroup FH5TB
+!!
+!! \brief Reads field. The fields are identified by index.
+!!
+!! \param loc_id       Location identifier. The identifier may be that of a file or group.
+!! \param dset_name    The name of the dataset to read.
+!! \param field_index  The indexes of the fields to read.
+!! \param start        The start record to read from.
+!! \param nrecords     The number of records to read.
+!! \param type_size    The size in bytes of the structure associated with the table. Obtained with sizeof or storage_size.
+!! \param buf          Buffer with data.
+!! \param errcode      \fortran_error
+!!
+!! See similar C API: @ref H5TBread_fields_index()
+!!
+  SUBROUTINE h5tbread_field_index_f(&
+#else
+  SUBROUTINE h5tbread_field_index_f_int(&
+#endif
+       loc_id,&
+       dset_name,&
+       field_index,&
+       start,&
+       nrecords,&
+       type_size,&
+       buf,&
+       errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: dset_name
+    INTEGER, INTENT(in) :: field_index
+    INTEGER(hsize_t), INTENT(in) :: start
+    INTEGER(hsize_t), INTENT(in) :: nrecords
+    INTEGER(size_t),  INTENT(in) :: type_size
+#ifdef H5_DOXYGEN
+    TYPE(TYPE), INTENT(INOUT), DIMENSION(*) :: buf
+#else
+    INTEGER, INTENT(INOUT), DIMENSION(*), TARGET :: buf
+#endif
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen ! name length
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1))
+    namelen  = LEN(dset_name)
+
+    errcode = h5tbread_field_index_c(loc_id,namelen,dset_name,field_index,&
+         start,nrecords,type_size,f_ptr)
+#ifdef H5_DOXYGEN
+  END SUBROUTINE h5tbread_field_index_f
+#else
+  END SUBROUTINE h5tbread_field_index_f_int
+
+  SUBROUTINE h5tbread_field_index_f_string(loc_id,&
+       dset_name,&
+       field_index,&
+       start,&
+       nrecords,&
+       type_size,&
+       buf,&
+       errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: dset_name
+    INTEGER, INTENT(in) :: field_index
+    INTEGER(hsize_t), INTENT(in) :: start
+    INTEGER(hsize_t), INTENT(in) :: nrecords
+    INTEGER(size_t),  INTENT(in) :: type_size
+    CHARACTER(LEN=*), INTENT(INOUT), DIMENSION(*), TARGET :: buf
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1)(1:1))
+    namelen  = LEN(dset_name)
+
+    errcode = h5tbread_field_index_c(loc_id,namelen,dset_name,field_index,&
+         start,nrecords,type_size,f_ptr)
+
+  END SUBROUTINE h5tbread_field_index_f_string
+#endif
+
+#ifdef H5_DOXYGEN
+!>
+!! \ingroup FH5TB
+!!
+!! \brief Insert a new field into a table.
+!!
+!! \param loc_id     Location identifier. The identifier may be that of a file or group.
+!! \param dset_name  The name of the table.
+!! \param field_name The name of the field to insert.
+!! \param field_type The data type of the field.
+!! \param position   The zero based index position where to insert the field.
+!! \param buf	     Buffer with data.
+!! \param errcode    \fortran_error
+!!
+!! See C API: @ref H5TBinsert_field()
+!!
+  SUBROUTINE h5tbinsert_field_f(&
+#else
+  SUBROUTINE h5tbinsert_field_f_int(&
+#endif
+       loc_id,&
+       dset_name,&
+       field_name,&
+       field_type,&
+       position,&
+       buf,&
+       errcode )
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: dset_name
+    CHARACTER(LEN=*), INTENT(in) :: field_name
+    INTEGER(hid_t), INTENT(in)   :: field_type
+    INTEGER, INTENT(in) :: position
+#ifdef H5_DOXYGEN
+    TYPE(TYPE), INTENT(in), DIMENSION(*) :: buf
+#else
+    INTEGER, INTENT(in), DIMENSION(*), TARGET :: buf
+#endif
+    INTEGER :: errcode
+
+    INTEGER(size_t) :: namelen  ! name length
+    INTEGER(size_t) :: namelen1 ! name length
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1))
+
+    namelen  = LEN(dset_name)
+    namelen1 = LEN(field_name)
+
+    errcode = h5tbinsert_field_c(loc_id,namelen,dset_name,namelen1,field_name,&
+         field_type,position,f_ptr)
+
+#ifdef H5_DOXYGEN
+  END SUBROUTINE h5tbinsert_field_f
+#else
+  END SUBROUTINE h5tbinsert_field_f_int
+
+  SUBROUTINE h5tbinsert_field_f_string(loc_id,&
+       dset_name,&
+       field_name,&
+       field_type,&
+       position,&
+       buf,&
+       errcode )
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: dset_name
+    CHARACTER(LEN=*), INTENT(in) :: field_name
+    INTEGER(hid_t), INTENT(in)   :: field_type
+    INTEGER, INTENT(in) :: position
+    CHARACTER(LEN=*), INTENT(in), DIMENSION(*), TARGET :: buf
+    INTEGER :: errcode
+
+    INTEGER(size_t) :: namelen   ! name length
+    INTEGER(size_t) :: namelen1  ! name length
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1)(1:1))
+
+    namelen  = LEN(dset_name)
+    namelen1 = LEN(field_name)
+
+    errcode = h5tbinsert_field_c(loc_id,namelen,dset_name,namelen1,field_name,&
+         field_type,position,f_ptr)
+
+  END SUBROUTINE h5tbinsert_field_f_string
+#endif
+
+!>
+!! \ingroup FH5TB
+!!
+!! \brief Deletes a field from a table.
+!!
+!! \param loc_id	Location identifier. The identifier may be that of a file or group.
+!! \param dset_name	The name of the table.
+!! \param field_name	The name of the field to delete.
+!! \param errcode       \fortran_error
+!!
+!! See C API: @ref H5TBdelete_field()
+!!
+  SUBROUTINE h5tbdelete_field_f(loc_id,&
+       dset_name,&
+       field_name,&
+       errcode )
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: dset_name
+    CHARACTER(LEN=*), INTENT(in) :: field_name
+    INTEGER :: errcode
+
+    INTEGER(size_t) :: namelen  ! name length
+    INTEGER(size_t) :: namelen1 ! name length
+
+
+    INTERFACE
+       INTEGER FUNCTION h5tbdelete_field_c(loc_id,namelen,dset_name,namelen1,field_name) &
+            BIND(C,NAME='h5tbdelete_field_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T),   INTENT(IN) :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: dset_name
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: field_name
+         INTEGER(size_t) :: namelen
+         INTEGER(size_t) :: namelen1
+       END FUNCTION h5tbdelete_field_c
+    END INTERFACE
+
+    namelen  = LEN(dset_name)
+    namelen1 = LEN(field_name)
+
+    errcode = h5tbdelete_field_c(loc_id,namelen,dset_name,namelen1,field_name)
+
+  END SUBROUTINE h5tbdelete_field_f
+!>
+!! \ingroup FH5TB
+!!
+!! \brief Gets the table dimensions.
+!!
+!! \param loc_id    Location identifier. The identifier may be that of a file or group.
+!! \param dset_name The name of the dataset to read.
+!! \param nfields   The number of fields.
+!! \param nrecords  The number of records.
+!! \param errcode   \fortran_error
+!!
+!! See C API: @ref H5TBget_table_info()
+!!
+  SUBROUTINE h5tbget_table_info_f(loc_id,&
+       dset_name,&
+       nfields,&
+       nrecords,&
+       errcode )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: dset_name
+    INTEGER(hsize_t), INTENT(inout):: nfields
+    INTEGER(hsize_t), INTENT(inout):: nrecords
+    INTEGER :: errcode
+    INTEGER(size_t) :: namelen ! name length
+
+    INTERFACE
+       INTEGER FUNCTION h5tbget_table_info_c(loc_id,namelen,dset_name,nfields,nrecords) &
+            BIND(C,NAME='h5tbget_table_info_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(hid_t),   INTENT(in) :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: dset_name
+         INTEGER(hsize_t), INTENT(inout):: nfields
+         INTEGER(hsize_t), INTENT(inout):: nrecords
+         INTEGER(size_t) :: namelen
+       END FUNCTION h5tbget_table_info_c
+    END INTERFACE
+
+    namelen = LEN(dset_name)
+    errcode = h5tbget_table_info_c(loc_id,namelen,dset_name,nfields,nrecords)
+
+  END SUBROUTINE h5tbget_table_info_f
+
+!>
+!! \ingroup FH5TB
+!!
+!! \brief Gets information about a table.
+!!
+!! \param loc_id        Location identifier. The identifier may be that of a file or group.
+!! \param dset_name     The name of the dataset to read.
+!! \param nfields       The number of fields.
+!! \param field_names   An array containing the names of the fields.
+!! \param field_sizes   An array containing the size of the fields.
+!! \param field_offsets	An array containing the offsets of the fields.
+!! \param type_size	The size of the HDF5 datatype associated with the table
+!!                      (i.e., the size in bytes of the HDF5 compound datatype used to define a row, or record, in the table).
+!! \param errcode       \fortran_error
+!! \param maxlen_out    Maximum character length of the field names.
+!!
+!! See C API: @ref H5TBget_field_info()
+!!
+  SUBROUTINE h5tbget_field_info_f(loc_id,&
+       dset_name,&
+       nfields,&
+       field_names,&
+       field_sizes,&
+       field_offsets,&
+       type_size,&
+       errcode, maxlen_out )
+
+    IMPLICIT NONE
+    INTEGER(hid_t),   INTENT(in) :: loc_id
+    CHARACTER(LEN=*), INTENT(in) :: dset_name
+    INTEGER(hsize_t), INTENT(in) :: nfields
+    CHARACTER(LEN=*), DIMENSION(nfields), INTENT(inout) :: field_names
+    INTEGER(size_t),  DIMENSION(nfields), INTENT(inout) :: field_sizes
+    INTEGER(size_t),  DIMENSION(nfields), INTENT(inout) :: field_offsets
+    INTEGER(size_t),  INTENT(inout):: type_size
+    INTEGER :: errcode
+    INTEGER(size_t), OPTIONAL :: maxlen_out
+    INTEGER(size_t) :: namelen                       ! name length
+    INTEGER(size_t), DIMENSION(nfields) :: namelen2  ! name lengths
+    INTEGER(hsize_t) :: i
+    INTEGER(size_t) :: maxlen
+    INTEGER(size_t) :: c_maxlen_out
+
+    INTERFACE
+       INTEGER FUNCTION h5tbget_field_info_c(loc_id,namelen,dset_name,nfields,&
+            field_sizes,field_offsets,type_size,namelen2, maxlen, field_names, c_maxlen_out) &
+            BIND(C,NAME='h5tbget_field_info_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(hid_t),   INTENT(in) :: loc_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(in) :: dset_name
+         INTEGER(hsize_t), INTENT(in):: nfields
+         CHARACTER(KIND=C_CHAR), DIMENSION(1:nfields), INTENT(inout) :: field_names
+         INTEGER(size_t),  DIMENSION(1:nfields), INTENT(inout) :: field_sizes
+         INTEGER(size_t),  DIMENSION(1:nfields), INTENT(inout) :: field_offsets
+         INTEGER(size_t),  INTENT(inout):: type_size
+         INTEGER(size_t) :: namelen
+         INTEGER(size_t) :: maxlen
+         INTEGER(size_t), DIMENSION(1:nfields) :: namelen2
+         INTEGER(size_t) :: c_maxlen_out
+       END FUNCTION h5tbget_field_info_c
+    END INTERFACE
+
+    namelen = LEN(dset_name)
+    DO i = 1, nfields
+       namelen2(i) = LEN_TRIM(field_names(i))
+    END DO
+    maxlen = LEN(field_names(1))
+    c_maxlen_out = 0
+
+    errcode = h5tbget_field_info_c(loc_id, namelen,dset_name, nfields, &
+         field_sizes, field_offsets, type_size, namelen2, maxlen, field_names, c_maxlen_out)
+
+    IF(PRESENT(maxlen_out)) maxlen_out = c_maxlen_out
+
+  END SUBROUTINE h5tbget_field_info_f
+
+#ifdef H5_DOXYGEN
+END MODULE H5TB
+#else
+END MODULE H5TB_CONST
+#endif
+
+
+
+
+
+
diff --git a/hl/fortran/src/H5TBff.f90 b/hl/fortran/src/H5TBff.f90
deleted file mode 100644
index 5846f49..0000000
--- a/hl/fortran/src/H5TBff.f90
+++ /dev/null
@@ -1,1900 +0,0 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-!
-! This file contains FORTRAN90 interfaces for H5TB functions
-!
-
-MODULE h5tb
-USE h5fortran_types
-USE hdf5
-
-
-INTERFACE h5tbwrite_field_name_f
- MODULE PROCEDURE h5tbwrite_field_name_f_int
- MODULE PROCEDURE h5tbwrite_field_name_f_float
- MODULE PROCEDURE h5tbwrite_field_name_f_double
- MODULE PROCEDURE h5tbwrite_field_name_f_string
-END INTERFACE
-
-INTERFACE h5tbread_field_name_f
- MODULE PROCEDURE h5tbread_field_name_f_int
- MODULE PROCEDURE h5tbread_field_name_f_float
- MODULE PROCEDURE h5tbread_field_name_f_double
- MODULE PROCEDURE h5tbread_field_name_f_string
-END INTERFACE
-
-INTERFACE h5tbwrite_field_index_f
- MODULE PROCEDURE h5tbwrite_field_index_f_int
- MODULE PROCEDURE h5tbwrite_field_index_f_float
- MODULE PROCEDURE h5tbwrite_field_index_f_double
- MODULE PROCEDURE h5tbwrite_field_index_f_string
-END INTERFACE
-
-INTERFACE h5tbread_field_index_f
- MODULE PROCEDURE h5tbread_field_index_f_int
- MODULE PROCEDURE h5tbread_field_index_f_float
- MODULE PROCEDURE h5tbread_field_index_f_double
- MODULE PROCEDURE h5tbread_field_index_f_string
-END INTERFACE
-
-
-INTERFACE h5tbinsert_field_f
- MODULE PROCEDURE h5tbinsert_field_f_int
- MODULE PROCEDURE h5tbinsert_field_f_float
- MODULE PROCEDURE h5tbinsert_field_f_double
- MODULE PROCEDURE h5tbinsert_field_f_string
-END INTERFACE
-
-
-CONTAINS
-
-
-!-------------------------------------------------------------------------
-! Function: h5tbmake_table_f
-!
-! Purpose: Make a table
-!
-! Return: Success: 0, Failure: -1
-!
-! Programmer: pvn@ncsa.uiuc.edu
-!
-! Date: October 06, 2004
-!
-! Comments:
-!
-! Modifications:
-!
-!-------------------------------------------------------------------------
-
-SUBROUTINE h5tbmake_table_f(table_title,&
-                            loc_id,&
-                            dset_name,&
-                            nfields,&
-                            nrecords,&
-                            type_size,&
-                            field_names,&
-                            field_offset,&
-                            field_types,&
-                            chunk_size,&
-                            compress,&
-                            errcode )
-
- IMPLICIT NONE
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5tbmake_table_f
-!DEC$endif
-!
- CHARACTER(LEN=*), INTENT(in) :: table_title                      ! name of the dataset
- INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
- CHARACTER(LEN=*), INTENT(in) :: dset_name                        ! name of the dataset
- INTEGER(hsize_t), INTENT(in) :: nfields                          ! fields
- INTEGER(hsize_t), INTENT(in) :: nrecords                         ! records
- INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
- CHARACTER(LEN=*), DIMENSION(1:nfields), INTENT(in) :: field_names  ! field names
- INTEGER(size_t),  DIMENSION(1:nfields), INTENT(in) :: field_offset ! field offset
- INTEGER(hid_t),   DIMENSION(1:nfields), INTENT(in) :: field_types  ! field types
- INTEGER(hsize_t), INTENT(in) :: chunk_size                       ! chunk size
- INTEGER,          INTENT(in) :: compress                         ! compress
- INTEGER(size_t) :: namelen                                       ! name length
- INTEGER(size_t) :: namelen1                                      ! name length
- INTEGER :: errcode                                               ! error code
- INTEGER(size_t), DIMENSION(1:nfields) :: char_len_field_names    ! field name lengths
- INTEGER(size_t) :: max_char_size_field_names                     ! character len of field names
- INTEGER(hsize_t) :: i                                            ! general purpose integer
-
-
- INTERFACE
-    INTEGER FUNCTION h5tbmake_table_c(namelen1,&
-         table_title,&
-         loc_id,&
-         namelen,&
-         dset_name,&
-         nfields,&
-         nrecords,&
-         type_size,&
-         field_offset,&
-         field_types,&
-         chunk_size,&
-         compress,&
-         char_len_field_names,&
-         max_char_size_field_names,&
-         field_names)
-
-      USE h5global
-      IMPLICIT NONE
-      !DEC$IF DEFINED(HDF5F90_WINDOWS)
-      !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TBMAKE_TABLE_C'::h5tbmake_table_c
-      !DEC$ENDIF
-      !DEC$ATTRIBUTES reference :: dset_name
-      !DEC$ATTRIBUTES reference :: table_title
-      CHARACTER(LEN=*), INTENT(in) :: table_title                      ! name of the dataset
-      INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
-      CHARACTER(LEN=*), INTENT(in) :: dset_name                        ! name of the dataset
-      INTEGER(hsize_t), INTENT(in) :: nfields                          ! fields
-      INTEGER(hsize_t), INTENT(in) :: nrecords                         ! records
-      INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
-      CHARACTER(LEN=*), DIMENSION(nfields), INTENT(in) :: field_names  ! field names
-      INTEGER(size_t),  DIMENSION(nfields), INTENT(in) :: field_offset ! field offset
-      INTEGER(hid_t),   DIMENSION(nfields), INTENT(in) :: field_types  ! field types
-      INTEGER(hsize_t), INTENT(in) :: chunk_size                       ! chunk size
-      INTEGER,          INTENT(in) :: compress                         ! compress
-      INTEGER(size_t) :: namelen                                       ! name length
-      INTEGER(size_t) :: namelen1                                      ! name length
-      INTEGER(size_t), DIMENSION(nfields) :: char_len_field_names      ! field name's lengths
-      INTEGER(size_t) :: max_char_size_field_names                     ! character len of field names
-    END FUNCTION h5tbmake_table_c
- END INTERFACE
- 
- namelen  = LEN(dset_name)
- namelen1 = LEN(table_title)
- 
- ! Find the size of each character string in the array
- DO i = 1, nfields
-    char_len_field_names(i) = LEN_TRIM(field_names(i))
- END DO
-
- max_char_size_field_names = LEN(field_names(1)) 
-
- errcode = h5tbmake_table_c(namelen1,&
-  table_title,&
-  loc_id,&
-  namelen,&
-  dset_name,&
-  nfields,&
-  nrecords,&
-  type_size,&
-  field_offset,&
-  field_types,&
-  chunk_size,&
-  compress,&
-  char_len_field_names, &
-  max_char_size_field_names, &
-  field_names)
-
-END SUBROUTINE h5tbmake_table_f
-
-
-!-------------------------------------------------------------------------
-! Function: h5tbwrite_field_name_f_int
-!
-! Purpose: Writes one field
-!
-! Programmer: pvn@ncsa.uiuc.edu
-!
-! Date: October 12, 2004
-!
-! Comments:
-!
-! Modifications:
-!
-!-------------------------------------------------------------------------
-
-SUBROUTINE h5tbwrite_field_name_f_int(loc_id,&
-                                      dset_name,&
-                                      field_name,&
-                                      start,&
-                                      nrecords,&
-                                      type_size,&
-                                      buf,&
-                                      errcode )
-
- IMPLICIT NONE
-
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5tbwrite_field_name_f_int
-!DEC$endif
-!
-
- INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
- CHARACTER(LEN=*), INTENT(in) :: dset_name                        ! name of the dataset
- CHARACTER(LEN=*), INTENT(in) :: field_name                       ! name of the field
- INTEGER(hsize_t), INTENT(in) :: start                            ! start record
- INTEGER(hsize_t), INTENT(in) :: nrecords                         ! records
- INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
- INTEGER, INTENT(in), DIMENSION(*) :: buf                         ! data buffer
- INTEGER :: errcode                                               ! error code
- INTEGER(size_t) :: namelen                                       ! name length
- INTEGER(size_t) :: namelen1                                      ! name length
-
- INTERFACE
-  INTEGER FUNCTION h5tbwrite_field_name_int_c(loc_id,namelen,dset_name,namelen1,field_name,&
-  start,nrecords,type_size,buf)
-
-  USE h5global
-  IMPLICIT NONE
-  !DEC$IF DEFINED(HDF5F90_WINDOWS)
-  !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TBWRITE_FIELD_NAME_INT_C'::h5tbwrite_field_name_int_c
-  !DEC$ENDIF
-  !DEC$ATTRIBUTES reference :: dset_name
-  !DEC$ATTRIBUTES reference :: field_name
-  INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
-  CHARACTER(LEN=*), INTENT(in) :: dset_name                        ! name of the dataset
-  CHARACTER(LEN=*), INTENT(in) :: field_name                       ! name of the field
-  INTEGER(hsize_t), INTENT(in) :: start                            ! start record
-  INTEGER(hsize_t), INTENT(in) :: nrecords                         ! records
-  INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
-  INTEGER, INTENT(in), DIMENSION(*) :: buf                         ! data buffer
-  INTEGER :: errcode                                               ! error code
-  INTEGER(size_t) :: namelen                                       ! name length
-  INTEGER(size_t) :: namelen1                                      ! name length
-  END FUNCTION h5tbwrite_field_name_int_c
- END INTERFACE
-
- namelen  = LEN(dset_name)
- namelen1 = LEN(field_name)
-
- errcode = h5tbwrite_field_name_int_c(loc_id,namelen,dset_name,namelen1,field_name,&
-  start,nrecords,type_size,buf)
-
-END SUBROUTINE h5tbwrite_field_name_f_int
-
-!-------------------------------------------------------------------------
-! Function: h5tbwrite_field_name_f_float
-!
-! Purpose: Writes one field
-!
-! Programmer: pvn@ncsa.uiuc.edu
-!
-! Date: October 12, 2004
-!
-! Comments:
-!
-! Modifications:
-!
-!-------------------------------------------------------------------------
-
-SUBROUTINE h5tbwrite_field_name_f_float(loc_id,&
-                                      dset_name,&
-                                      field_name,&
-                                      start,&
-                                      nrecords,&
-                                      type_size,&
-                                      buf,&
-                                      errcode )
-
- IMPLICIT NONE
-
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5tbwrite_field_name_f_float
-!DEC$endif
-!
-
- INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
- CHARACTER(LEN=*), INTENT(in) :: dset_name                        ! name of the dataset
- CHARACTER(LEN=*), INTENT(in) :: field_name                       ! name of the field
- INTEGER(hsize_t), INTENT(in) :: start                            ! start record
- INTEGER(hsize_t), INTENT(in) :: nrecords                         ! records
- INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
- REAL, INTENT(in), DIMENSION(*) :: buf                            ! data buffer
- INTEGER :: errcode                                               ! error code
- INTEGER(size_t) :: namelen                                       ! name length
- INTEGER(size_t) :: namelen1                                      ! name length
-
- INTERFACE
-  INTEGER FUNCTION h5tbwrite_field_name_fl_c(loc_id,namelen,dset_name,namelen1,field_name,&
-  start,nrecords,type_size,buf)
-
-  USE h5global
-  IMPLICIT NONE
-  !DEC$IF DEFINED(HDF5F90_WINDOWS)
-  !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TBWRITE_FIELD_NAME_FL_C'::h5tbwrite_field_name_fl_c
-  !DEC$ENDIF
-  !DEC$ATTRIBUTES reference :: dset_name
-  !DEC$ATTRIBUTES reference :: field_name
-  INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
-  CHARACTER(LEN=*), INTENT(in) :: dset_name                        ! name of the dataset
-  CHARACTER(LEN=*), INTENT(in) :: field_name                       ! name of the field
-  INTEGER(hsize_t), INTENT(in) :: start                            ! start record
-  INTEGER(hsize_t), INTENT(in) :: nrecords                         ! records
-  INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
-  REAL, INTENT(in), DIMENSION(*) :: buf                            ! data buffer
-  INTEGER :: errcode                                               ! error code
-  INTEGER(size_t) :: namelen                                       ! name length
-  INTEGER(size_t) :: namelen1                                      ! name length
-  END FUNCTION h5tbwrite_field_name_fl_c
- END INTERFACE
-
- namelen  = LEN(dset_name)
- namelen1 = LEN(field_name)
-
- errcode = h5tbwrite_field_name_fl_c(loc_id,namelen,dset_name,namelen1,field_name,&
-  start,nrecords,type_size,buf)
-
-END SUBROUTINE h5tbwrite_field_name_f_float
-
-
-
-!-------------------------------------------------------------------------
-! Function: h5tbwrite_field_name_f_double
-!
-! Purpose: Writes one field
-!
-! Programmer: pvn@ncsa.uiuc.edu
-!
-! Date: October 12, 2004
-!
-! Comments:
-!
-! Modifications:
-!
-!-------------------------------------------------------------------------
-
-SUBROUTINE h5tbwrite_field_name_f_double(loc_id,&
-                                      dset_name,&
-                                      field_name,&
-                                      start,&
-                                      nrecords,&
-                                      type_size,&
-                                      buf,&
-                                      errcode )
-
- IMPLICIT NONE
-
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5tbwrite_field_name_f_double
-!DEC$endif
-!
-
- INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
- CHARACTER(LEN=*), INTENT(in) :: dset_name                        ! name of the dataset
- CHARACTER(LEN=*), INTENT(in) :: field_name                       ! name of the field
- INTEGER(hsize_t), INTENT(in) :: start                            ! start record
- INTEGER(hsize_t), INTENT(in) :: nrecords                         ! records
- INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
- DOUBLE PRECISION, INTENT(in), DIMENSION(*) :: buf                ! data buffer
- INTEGER :: errcode                                               ! error code
- INTEGER(size_t) :: namelen                                       ! name length
- INTEGER(size_t) :: namelen1                                      ! name length
-
- INTERFACE
-  INTEGER FUNCTION h5tbwrite_field_name_dl_c(loc_id,namelen,dset_name,namelen1,field_name,&
-  start,nrecords,type_size,buf)
-
-  USE h5global
-  IMPLICIT NONE
-  !DEC$IF DEFINED(HDF5F90_WINDOWS)
-  !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TBWRITE_FIELD_NAME_DL_C'::h5tbwrite_field_name_dl_c
-  !DEC$ENDIF
-  !DEC$ATTRIBUTES reference :: dset_name
-  !DEC$ATTRIBUTES reference :: field_name
-  INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
-  CHARACTER(LEN=*), INTENT(in) :: dset_name                        ! name of the dataset
-  CHARACTER(LEN=*), INTENT(in) :: field_name                       ! name of the field
-  INTEGER(hsize_t), INTENT(in) :: start                            ! start record
-  INTEGER(hsize_t), INTENT(in) :: nrecords                         ! records
-  INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
-  DOUBLE PRECISION, INTENT(in), DIMENSION(*) :: buf                ! data buffer
-  INTEGER :: errcode                                               ! error code
-  INTEGER(size_t) :: namelen                                       ! name length
-  INTEGER(size_t) :: namelen1                                      ! name length
-  END FUNCTION h5tbwrite_field_name_dl_c
- END INTERFACE
-
- namelen  = LEN(dset_name)
- namelen1 = LEN(field_name)
-
- errcode = h5tbwrite_field_name_dl_c(loc_id,namelen,dset_name,namelen1,field_name,&
-  start,nrecords,type_size,buf)
-
-END SUBROUTINE h5tbwrite_field_name_f_double
-
-!-------------------------------------------------------------------------
-! Function: h5tbwrite_field_name_f_string
-!
-! Purpose: Writes one field
-!
-! Programmer: pvn@ncsa.uiuc.edu
-!
-! Date: October 12, 2004
-!
-! Comments:
-!
-! Modifications:
-!
-!-------------------------------------------------------------------------
-
-SUBROUTINE h5tbwrite_field_name_f_string(loc_id,&
-                                      dset_name,&
-                                      field_name,&
-                                      start,&
-                                      nrecords,&
-                                      type_size,&
-                                      buf,&
-                                      errcode )
-
- IMPLICIT NONE
-
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5tbwrite_field_name_f_string
-!DEC$endif
-!
-
- INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
- CHARACTER(LEN=*), INTENT(in) :: dset_name                        ! name of the dataset
- CHARACTER(LEN=*), INTENT(in) :: field_name                       ! name of the field
- INTEGER(hsize_t), INTENT(in) :: start                            ! start record
- INTEGER(hsize_t), INTENT(in) :: nrecords                         ! records
- INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
- CHARACTER(LEN=*), INTENT(in), DIMENSION(*) :: buf                ! data buffer
- INTEGER :: errcode                                               ! error code
- INTEGER(size_t) :: namelen                                       ! name length
- INTEGER(size_t) :: namelen1                                      ! name length
-
- INTERFACE
-  INTEGER FUNCTION h5tbwrite_field_name_st_c(loc_id,namelen,dset_name,namelen1,field_name,&
-  start,nrecords,type_size,buf)
-
-  USE h5global
-  IMPLICIT NONE
-  !DEC$IF DEFINED(HDF5F90_WINDOWS)
-  !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TBWRITE_FIELD_NAME_ST_C'::h5tbwrite_field_name_st_c
-  !DEC$ENDIF
-  !DEC$ATTRIBUTES reference :: dset_name
-  !DEC$ATTRIBUTES reference :: field_name
-  INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
-  CHARACTER(LEN=*), INTENT(in) :: dset_name                        ! name of the dataset
-  CHARACTER(LEN=*), INTENT(in) :: field_name                       ! name of the field
-  INTEGER(hsize_t), INTENT(in) :: start                            ! start record
-  INTEGER(hsize_t), INTENT(in) :: nrecords                         ! records
-  INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
-  CHARACTER(LEN=*), INTENT(in), DIMENSION(*) :: buf                ! data buffer
-  INTEGER :: errcode                                               ! error code
-  INTEGER(size_t) :: namelen                                               ! name length
-  INTEGER(size_t) :: namelen1                                      ! name length
-  END FUNCTION h5tbwrite_field_name_st_c
- END INTERFACE
-
- namelen  = LEN(dset_name)
- namelen1 = LEN(field_name)
-
- errcode = h5tbwrite_field_name_st_c(loc_id,namelen,dset_name,namelen1,field_name,&
-  start,nrecords,type_size,buf)
-
-END SUBROUTINE h5tbwrite_field_name_f_string
-
-
-!-------------------------------------------------------------------------
-! Function: h5tbread_field_name_f_int
-!
-! Purpose: Reads one field
-!
-! Programmer: pvn@ncsa.uiuc.edu
-!
-! Date: October 12, 2004
-!
-! Comments:
-!
-! Modifications:
-!
-!-------------------------------------------------------------------------
-
-SUBROUTINE h5tbread_field_name_f_int(loc_id,&
-                                      dset_name,&
-                                      field_name,&
-                                      start,&
-                                      nrecords,&
-                                      type_size,&
-                                      buf,&
-                                      errcode )
-
- IMPLICIT NONE
-
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5tbread_field_name_f_int
-!DEC$endif
-!
-
- INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
- CHARACTER(LEN=*), INTENT(in) :: dset_name                        ! name of the dataset
- CHARACTER(LEN=*), INTENT(in) :: field_name                       ! name of the field
- INTEGER(hsize_t), INTENT(in) :: start                            ! start record
- INTEGER(hsize_t), INTENT(in) :: nrecords                         ! records
- INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
- INTEGER, INTENT(in), DIMENSION(*) :: buf                         ! data buffer
- INTEGER :: errcode                                               ! error code
- INTEGER(size_t) :: namelen                                       ! name length
- INTEGER(size_t) :: namelen1                                      ! name length
-
- INTERFACE
-  INTEGER FUNCTION h5tbread_field_name_int_c(loc_id,namelen,dset_name,namelen1,field_name,&
-  start,nrecords,type_size,buf)
-
-  USE h5global
-  IMPLICIT NONE
-  !DEC$IF DEFINED(HDF5F90_WINDOWS)
-  !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TBREAD_FIELD_NAME_INT_C'::h5tbread_field_name_int_c
-  !DEC$ENDIF
-  !DEC$ATTRIBUTES reference :: dset_name
-  !DEC$ATTRIBUTES reference :: field_name
-  INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
-  CHARACTER(LEN=*), INTENT(in) :: dset_name                        ! name of the dataset
-  CHARACTER(LEN=*), INTENT(in) :: field_name                       ! name of the field
-  INTEGER(hsize_t), INTENT(in) :: start                            ! start record
-  INTEGER(hsize_t), INTENT(in) :: nrecords                         ! records
-  INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
-  INTEGER, INTENT(in), DIMENSION(*) :: buf                         ! data buffer
-  INTEGER :: errcode                                               ! error code
-  INTEGER(size_t) :: namelen                                       ! name length
-  INTEGER(size_t) :: namelen1                                      ! name length
-  END FUNCTION h5tbread_field_name_int_c
- END INTERFACE
-
- namelen  = LEN(dset_name)
- namelen1 = LEN(field_name)
-
- errcode = h5tbread_field_name_int_c(loc_id,namelen,dset_name,namelen1,field_name,&
-  start,nrecords,type_size,buf)
-
-END SUBROUTINE h5tbread_field_name_f_int
-
-!-------------------------------------------------------------------------
-! Function: h5tbread_field_name_f_float
-!
-! Purpose: Reads one field
-!
-! Programmer: pvn@ncsa.uiuc.edu
-!
-! Date: October 12, 2004
-!
-! Comments:
-!
-! Modifications:
-!
-!-------------------------------------------------------------------------
-
-SUBROUTINE h5tbread_field_name_f_float(loc_id,&
-                                      dset_name,&
-                                      field_name,&
-                                      start,&
-                                      nrecords,&
-                                      type_size,&
-                                      buf,&
-                                      errcode )
-
- IMPLICIT NONE
-
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5tbread_field_name_f_float
-!DEC$endif
-!
-
- INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
- CHARACTER(LEN=*), INTENT(in) :: dset_name                        ! name of the dataset
- CHARACTER(LEN=*), INTENT(in) :: field_name                       ! name of the field
- INTEGER(hsize_t), INTENT(in) :: start                            ! start record
- INTEGER(hsize_t), INTENT(in) :: nrecords                         ! records
- INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
- REAL, INTENT(in), DIMENSION(*) :: buf                            ! data buffer
- INTEGER :: errcode                                               ! error code
- INTEGER(size_t) :: namelen                                       ! name length
- INTEGER(size_t) :: namelen1                                      ! name length
-
- INTERFACE
-  INTEGER FUNCTION h5tbread_field_name_fl_c(loc_id,namelen,dset_name,namelen1,field_name,&
-  start,nrecords,type_size,buf)
-
-  USE h5global
-  IMPLICIT NONE
-  !DEC$IF DEFINED(HDF5F90_WINDOWS)
-  !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TBREAD_FIELD_NAME_FL_C'::h5tbread_field_name_fl_c
-  !DEC$ENDIF
-  !DEC$ATTRIBUTES reference :: dset_name
-  !DEC$ATTRIBUTES reference :: field_name
-  INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
-  CHARACTER(LEN=*), INTENT(in) :: dset_name                        ! name of the dataset
-  CHARACTER(LEN=*), INTENT(in) :: field_name                       ! name of the field
-  INTEGER(hsize_t), INTENT(in) :: start                            ! start record
-  INTEGER(hsize_t), INTENT(in) :: nrecords                         ! records
-  INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
-  REAL, INTENT(in), DIMENSION(*) :: buf                            ! data buffer
-  INTEGER :: errcode                                               ! error code
-  INTEGER(size_t) :: namelen                                       ! name length
-  INTEGER(size_t) :: namelen1                                      ! name length
-  END FUNCTION h5tbread_field_name_fl_c
- END INTERFACE
-
- namelen  = LEN(dset_name)
- namelen1 = LEN(field_name)
-
- errcode = h5tbread_field_name_fl_c(loc_id,namelen,dset_name,namelen1,field_name,&
-  start,nrecords,type_size,buf)
-
-END SUBROUTINE h5tbread_field_name_f_float
-
-!-------------------------------------------------------------------------
-! Function: h5tbread_field_name_f_double
-!
-! Purpose: Reads one field
-!
-! Programmer: pvn@ncsa.uiuc.edu
-!
-! Date: October 12, 2004
-!
-! Comments:
-!
-! Modifications:
-!
-!-------------------------------------------------------------------------
-
-SUBROUTINE h5tbread_field_name_f_double(loc_id,&
-                                      dset_name,&
-                                      field_name,&
-                                      start,&
-                                      nrecords,&
-                                      type_size,&
-                                      buf,&
-                                      errcode )
-
- IMPLICIT NONE
-
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5tbread_field_name_f_double
-!DEC$endif
-!
-
- INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
- CHARACTER(LEN=*), INTENT(in) :: dset_name                        ! name of the dataset
- CHARACTER(LEN=*), INTENT(in) :: field_name                       ! name of the field
- INTEGER(hsize_t), INTENT(in) :: start                            ! start record
- INTEGER(hsize_t), INTENT(in) :: nrecords                         ! records
- INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
- DOUBLE PRECISION, INTENT(in), DIMENSION(*) :: buf                ! data buffer
- INTEGER :: errcode                                               ! error code
- INTEGER(size_t) :: namelen                                       ! name length
- INTEGER(size_t) :: namelen1                                      ! name length
-
- INTERFACE
-  INTEGER FUNCTION h5tbread_field_name_dl_c(loc_id,namelen,dset_name,namelen1,field_name,&
-  start,nrecords,type_size,buf)
-
-  USE h5global
-  IMPLICIT NONE
-  !DEC$IF DEFINED(HDF5F90_WINDOWS)
-  !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TBREAD_FIELD_NAME_DL_C'::h5tbread_field_name_dl_c
-  !DEC$ENDIF
-  !DEC$ATTRIBUTES reference :: dset_name
-  !DEC$ATTRIBUTES reference :: field_name
-  INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
-  CHARACTER(LEN=*), INTENT(in) :: dset_name                        ! name of the dataset
-  CHARACTER(LEN=*), INTENT(in) :: field_name                       ! name of the field
-  INTEGER(hsize_t), INTENT(in) :: start                            ! start record
-  INTEGER(hsize_t), INTENT(in) :: nrecords                         ! records
-  INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
-  DOUBLE PRECISION, INTENT(in), DIMENSION(*) :: buf                ! data buffer
-  INTEGER :: errcode                                               ! error code
-  INTEGER(size_t) :: namelen                                       ! name length
-  INTEGER(size_t) :: namelen1                                      ! name length
-  END FUNCTION h5tbread_field_name_dl_c
- END INTERFACE
-
- namelen  = LEN(dset_name)
- namelen1 = LEN(field_name)
-
- errcode = h5tbread_field_name_dl_c(loc_id,namelen,dset_name,namelen1,field_name,&
-  start,nrecords,type_size,buf)
-
-END SUBROUTINE h5tbread_field_name_f_double
-
-!-------------------------------------------------------------------------
-! Function: h5tbread_field_name_f_string
-!
-! Purpose: Reads one field
-!
-! Programmer: pvn@ncsa.uiuc.edu
-!
-! Date: October 12, 2004
-!
-! Comments:
-!
-! Modifications:
-!
-!-------------------------------------------------------------------------
-
-SUBROUTINE h5tbread_field_name_f_string(loc_id,&
-                                      dset_name,&
-                                      field_name,&
-                                      start,&
-                                      nrecords,&
-                                      type_size,&
-                                      buf,&
-                                      errcode )
-
- IMPLICIT NONE
-
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5tbread_field_name_f_string
-!DEC$endif
-!
-
- INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
- CHARACTER(LEN=*), INTENT(in) :: dset_name                        ! name of the dataset
- CHARACTER(LEN=*), INTENT(in) :: field_name                       ! name of the field
- INTEGER(hsize_t), INTENT(in) :: start                            ! start record
- INTEGER(hsize_t), INTENT(in) :: nrecords                         ! records
- INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
- CHARACTER(LEN=*), INTENT(in), DIMENSION(*) :: buf                ! data buffer
- INTEGER :: errcode                                               ! error code
- INTEGER(size_t) :: namelen                                       ! name length
- INTEGER(size_t) :: namelen1                                      ! name length
-
- INTERFACE
-  INTEGER FUNCTION h5tbread_field_name_st_c(loc_id,namelen,dset_name,namelen1,field_name,&
-  start,nrecords,type_size,buf)
-
-  USE h5global
-  IMPLICIT NONE
-  !DEC$IF DEFINED(HDF5F90_WINDOWS)
-  !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TBREAD_FIELD_NAME_ST_C'::h5tbread_field_name_st_c
-  !DEC$ENDIF
-  !DEC$ATTRIBUTES reference :: dset_name
-  !DEC$ATTRIBUTES reference :: field_name
-  INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
-  CHARACTER(LEN=*), INTENT(in) :: dset_name                        ! name of the dataset
-  CHARACTER(LEN=*), INTENT(in) :: field_name                       ! name of the field
-  INTEGER(hsize_t), INTENT(in) :: start                            ! start record
-  INTEGER(hsize_t), INTENT(in) :: nrecords                         ! records
-  INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
-  CHARACTER(LEN=*), INTENT(in), DIMENSION(*) :: buf                ! data buffer
-  INTEGER :: errcode                                               ! error code
-  INTEGER(size_t) :: namelen                                       ! name length
-  INTEGER(size_t) :: namelen1                                      ! name length
-  END FUNCTION h5tbread_field_name_st_c
- END INTERFACE
-
- namelen  = LEN(dset_name)
- namelen1 = LEN(field_name)
-
- errcode = h5tbread_field_name_st_c(loc_id,namelen,dset_name,namelen1,field_name,&
-  start,nrecords,type_size,buf)
-
-END SUBROUTINE h5tbread_field_name_f_string
-
-
-!-------------------------------------------------------------------------
-! Function: h5tbwrite_field_index_f_int
-!
-! Purpose: Writes one field
-!
-! Programmer: pvn@ncsa.uiuc.edu
-!
-! Date: October 12, 2004
-!
-! Comments:
-!
-! Modifications:
-!
-!-------------------------------------------------------------------------
-
-SUBROUTINE h5tbwrite_field_index_f_int(loc_id,&
-                                      dset_name,&
-                                      field_index,&
-                                      start,&
-                                      nrecords,&
-                                      type_size,&
-                                      buf,&
-                                      errcode )
-
- IMPLICIT NONE
-
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5tbwrite_field_index_f_int
-!DEC$endif
-!
-
- INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
- CHARACTER(LEN=*), INTENT(in) :: dset_name                        ! name of the dataset
- INTEGER, INTENT(in) :: field_index                               ! index
- INTEGER(hsize_t), INTENT(in) :: start                            ! start record
- INTEGER(hsize_t), INTENT(in) :: nrecords                         ! records
- INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
- INTEGER, INTENT(in), DIMENSION(*) :: buf                         ! data buffer
- INTEGER :: errcode                                               ! error code
- INTEGER(size_t) :: namelen                                       ! name length
-
- INTERFACE
-  INTEGER FUNCTION h5tbwrite_field_index_int_c(loc_id,namelen,dset_name,field_index,&
-  start,nrecords,type_size,buf)
-
-  USE h5global
-  IMPLICIT NONE
-  !DEC$IF DEFINED(HDF5F90_WINDOWS)
-  !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TBWRITE_FIELD_INDEX_INT_C'::h5tbwrite_field_index_int_c
-  !DEC$ENDIF
-  !DEC$ATTRIBUTES reference :: dset_name
-  INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
-  CHARACTER(LEN=*), INTENT(in) :: dset_name                        ! name of the dataset
-  INTEGER, INTENT(in) :: field_index                               ! index
-  INTEGER(hsize_t), INTENT(in) :: start                            ! start record
-  INTEGER(hsize_t), INTENT(in) :: nrecords                         ! records
-  INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
-  INTEGER, INTENT(in), DIMENSION(*) :: buf                         ! data buffer
-  INTEGER :: errcode                                               ! error code
-  INTEGER(size_t) :: namelen                                       ! name length
-  END FUNCTION h5tbwrite_field_index_int_c
- END INTERFACE
-
- namelen  = LEN(dset_name)
-
- errcode = h5tbwrite_field_index_int_c(loc_id,namelen,dset_name,field_index,&
-  start,nrecords,type_size,buf)
-
-END SUBROUTINE h5tbwrite_field_index_f_int
-
-!-------------------------------------------------------------------------
-! Function: h5tbwrite_field_index_f_float
-!
-! Purpose: Writes one field
-!
-! Programmer: pvn@ncsa.uiuc.edu
-!
-! Date: October 12, 2004
-!
-! Comments:
-!
-! Modifications:
-!
-!-------------------------------------------------------------------------
-
-SUBROUTINE h5tbwrite_field_index_f_float(loc_id,&
-                                      dset_name,&
-                                      field_index,&
-                                      start,&
-                                      nrecords,&
-                                      type_size,&
-                                      buf,&
-                                      errcode )
-
- IMPLICIT NONE
-
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5tbwrite_field_index_f_float
-!DEC$endif
-!
-
- INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
- CHARACTER(LEN=*), INTENT(in) :: dset_name                        ! name of the dataset
- INTEGER, INTENT(in) :: field_index                               ! index
- INTEGER(hsize_t), INTENT(in) :: start                            ! start record
- INTEGER(hsize_t), INTENT(in) :: nrecords                         ! records
- INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
- REAL, INTENT(in), DIMENSION(*) :: buf                            ! data buffer
- INTEGER :: errcode                                               ! error code
- INTEGER(size_t) :: namelen                                       ! name length
-
- INTERFACE
-  INTEGER FUNCTION h5tbwrite_field_index_fl_c(loc_id,namelen,dset_name,field_index,&
-  start,nrecords,type_size,buf)
-
-  USE h5global
-  IMPLICIT NONE
-  !DEC$IF DEFINED(HDF5F90_WINDOWS)
-  !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TBWRITE_FIELD_INDEX_FL_C'::h5tbwrite_field_index_fl_c
-  !DEC$ENDIF
-  !DEC$ATTRIBUTES reference :: dset_name
-  INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
-  CHARACTER(LEN=*), INTENT(in) :: dset_name                        ! name of the dataset
-  INTEGER, INTENT(in) :: field_index                               ! index
-  INTEGER(hsize_t), INTENT(in) :: start                            ! start record
-  INTEGER(hsize_t), INTENT(in) :: nrecords                         ! records
-  INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
-  REAL, INTENT(in), DIMENSION(*) :: buf                            ! data buffer
-  INTEGER :: errcode                                               ! error code
-  INTEGER(size_t) :: namelen                                       ! name length
-  END FUNCTION h5tbwrite_field_index_fl_c
- END INTERFACE
-
- namelen  = LEN(dset_name)
-
- errcode = h5tbwrite_field_index_fl_c(loc_id,namelen,dset_name,field_index,&
-  start,nrecords,type_size,buf)
-
-END SUBROUTINE h5tbwrite_field_index_f_float
-
-
-
-!-------------------------------------------------------------------------
-! Function: h5tbwrite_field_index_f_double
-!
-! Purpose: Writes one field
-!
-! Programmer: pvn@ncsa.uiuc.edu
-!
-! Date: October 12, 2004
-!
-! Comments:
-!
-! Modifications:
-!
-!-------------------------------------------------------------------------
-
-SUBROUTINE h5tbwrite_field_index_f_double(loc_id,&
-                                      dset_name,&
-                                      field_index,&
-                                      start,&
-                                      nrecords,&
-                                      type_size,&
-                                      buf,&
-                                      errcode )
-
- IMPLICIT NONE
-
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5tbwrite_field_index_f_double
-!DEC$endif
-!
-
- INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
- CHARACTER(LEN=*), INTENT(in) :: dset_name                        ! name of the dataset
- INTEGER, INTENT(in) :: field_index                               ! index
- INTEGER(hsize_t), INTENT(in) :: start                            ! start record
- INTEGER(hsize_t), INTENT(in) :: nrecords                         ! records
- INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
- DOUBLE PRECISION, INTENT(in), DIMENSION(*) :: buf                ! data buffer
- INTEGER :: errcode                                               ! error code
- INTEGER(size_t) :: namelen                                       ! name length
-
- INTERFACE
-  INTEGER FUNCTION h5tbwrite_field_index_dl_c(loc_id,namelen,dset_name,field_index,&
-  start,nrecords,type_size,buf)
-
-  USE h5global
-  IMPLICIT NONE
-  !DEC$IF DEFINED(HDF5F90_WINDOWS)
-  !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TBWRITE_FIELD_INDEX_DL_C'::h5tbwrite_field_index_dl_c
-  !DEC$ENDIF
-  !DEC$ATTRIBUTES reference :: dset_name
-  INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
-  CHARACTER(LEN=*), INTENT(in) :: dset_name                        ! name of the dataset
-  INTEGER, INTENT(in) :: field_index                               ! index
-  INTEGER(hsize_t), INTENT(in) :: start                            ! start record
-  INTEGER(hsize_t), INTENT(in) :: nrecords                         ! records
-  INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
-  DOUBLE PRECISION, INTENT(in), DIMENSION(*) :: buf                ! data buffer
-  INTEGER :: errcode                                               ! error code
-  INTEGER(size_t) :: namelen                                       ! name length
-  END FUNCTION h5tbwrite_field_index_dl_c
- END INTERFACE
-
- namelen  = LEN(dset_name)
-
- errcode = h5tbwrite_field_index_dl_c(loc_id,namelen,dset_name,field_index,&
-  start,nrecords,type_size,buf)
-
-END SUBROUTINE h5tbwrite_field_index_f_double
-
-!-------------------------------------------------------------------------
-! Function: h5tbwrite_field_index_f_string
-!
-! Purpose: Writes one field
-!
-! Programmer: pvn@ncsa.uiuc.edu
-!
-! Date: October 12, 2004
-!
-! Comments:
-!
-! Modifications:
-!
-!-------------------------------------------------------------------------
-
-SUBROUTINE h5tbwrite_field_index_f_string(loc_id,&
-                                      dset_name,&
-                                      field_index,&
-                                      start,&
-                                      nrecords,&
-                                      type_size,&
-                                      buf,&
-                                      errcode )
-
- IMPLICIT NONE
-
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5tbwrite_field_index_f_string
-!DEC$endif
-!
-
- INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
- CHARACTER(LEN=*), INTENT(in) :: dset_name                        ! name of the dataset
- INTEGER, INTENT(in) :: field_index                               ! index
- INTEGER(hsize_t), INTENT(in) :: start                            ! start record
- INTEGER(hsize_t), INTENT(in) :: nrecords                         ! records
- INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
- CHARACTER(LEN=*), INTENT(in), DIMENSION(*) :: buf                ! data buffer
- INTEGER :: errcode                                               ! error code
- INTEGER(size_t) :: namelen                                       ! name length
-
- INTERFACE
-  INTEGER FUNCTION h5tbwrite_field_index_st_c(loc_id,namelen,dset_name,field_index,&
-  start,nrecords,type_size,buf)
-
-  USE h5global
-  IMPLICIT NONE
-  !DEC$IF DEFINED(HDF5F90_WINDOWS)
-  !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TBWRITE_FIELD_INDEX_ST_C'::h5tbwrite_field_index_st_c
-  !DEC$ENDIF
-  !DEC$ATTRIBUTES reference :: dset_name
-  INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
-  CHARACTER(LEN=*), INTENT(in) :: dset_name                        ! name of the dataset
-  INTEGER, INTENT(in) :: field_index                               ! index
-  INTEGER(hsize_t), INTENT(in) :: start                            ! start record
-  INTEGER(hsize_t), INTENT(in) :: nrecords                         ! records
-  INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
-  CHARACTER(LEN=*), INTENT(in), DIMENSION(*) :: buf                ! data buffer
-  INTEGER :: errcode                                               ! error code
-  INTEGER(size_t) :: namelen                                       ! name length
-  END FUNCTION h5tbwrite_field_index_st_c
- END INTERFACE
-
- namelen  = LEN(dset_name)
-
- errcode = h5tbwrite_field_index_st_c(loc_id,namelen,dset_name,field_index,&
-  start,nrecords,type_size,buf)
-
-END SUBROUTINE h5tbwrite_field_index_f_string
-
-
-!-------------------------------------------------------------------------
-! Function: h5tbread_field_index_f_int
-!
-! Purpose: Reads one field
-!
-! Programmer: pvn@ncsa.uiuc.edu
-!
-! Date: October 12, 2004
-!
-! Comments:
-!
-! Modifications:
-!
-!-------------------------------------------------------------------------
-
-SUBROUTINE h5tbread_field_index_f_int(loc_id,&
-                                      dset_name,&
-                                      field_index,&
-                                      start,&
-                                      nrecords,&
-                                      type_size,&
-                                      buf,&
-                                      errcode )
-
- IMPLICIT NONE
-
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport ::h5tbread_field_index_f_int
-!DEC$endif
-!
-
- INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
- CHARACTER(LEN=*), INTENT(in) :: dset_name                        ! name of the dataset
- INTEGER, INTENT(in) :: field_index                               ! index
- INTEGER(hsize_t), INTENT(in) :: start                            ! start record
- INTEGER(hsize_t), INTENT(in) :: nrecords                         ! records
- INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
- INTEGER, INTENT(in), DIMENSION(*) :: buf                         ! data buffer
- INTEGER :: errcode                                               ! error code
- INTEGER(size_t) :: namelen                                       ! name length
-
- INTERFACE
-  INTEGER FUNCTION h5tbread_field_index_int_c(loc_id,namelen,dset_name,field_index,&
-  start,nrecords,type_size,buf)
-
-  USE h5global
-  IMPLICIT NONE
-  !DEC$IF DEFINED(HDF5F90_WINDOWS)
-  !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TBREAD_FIELD_INDEX_INT_C'::h5tbread_field_index_int_c
-  !DEC$ENDIF
-  !DEC$ATTRIBUTES reference :: dset_name
-  INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
-  CHARACTER(LEN=*), INTENT(in) :: dset_name                        ! name of the dataset
-  INTEGER, INTENT(in) :: field_index                               ! index
-  INTEGER(hsize_t), INTENT(in) :: start                            ! start record
-  INTEGER(hsize_t), INTENT(in) :: nrecords                         ! records
-  INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
-  INTEGER, INTENT(in), DIMENSION(*) :: buf                         ! data buffer
-  INTEGER :: errcode                                               ! error code
-  INTEGER(size_t) :: namelen                                       ! name length
-  END FUNCTION h5tbread_field_index_int_c
- END INTERFACE
-
- namelen  = LEN(dset_name)
-
- errcode = h5tbread_field_index_int_c(loc_id,namelen,dset_name,field_index,&
-  start,nrecords,type_size,buf)
-
-END SUBROUTINE h5tbread_field_index_f_int
-
-!-------------------------------------------------------------------------
-! Function: h5tbread_field_index_f_float
-!
-! Purpose: Reads one field
-!
-! Programmer: pvn@ncsa.uiuc.edu
-!
-! Date: October 12, 2004
-!
-! Comments:
-!
-! Modifications:
-!
-!-------------------------------------------------------------------------
-
-SUBROUTINE h5tbread_field_index_f_float(loc_id,&
-                                      dset_name,&
-                                      field_index,&
-                                      start,&
-                                      nrecords,&
-                                      type_size,&
-                                      buf,&
-                                      errcode )
-
- IMPLICIT NONE
-
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5tbread_field_index_f_float
-!DEC$endif
-!
-
- INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
- CHARACTER(LEN=*), INTENT(in) :: dset_name                        ! name of the dataset
- INTEGER, INTENT(in) :: field_index                               ! index
- INTEGER(hsize_t), INTENT(in) :: start                            ! start record
- INTEGER(hsize_t), INTENT(in) :: nrecords                         ! records
- INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
- REAL, INTENT(in), DIMENSION(*) :: buf                            ! data buffer
- INTEGER :: errcode                                               ! error code
- INTEGER(size_t) :: namelen                                       ! name length
-
- INTERFACE
-  INTEGER FUNCTION h5tbread_field_index_fl_c(loc_id,namelen,dset_name,field_index,&
-   start,nrecords,type_size,buf)
-
-  USE h5global
-  IMPLICIT NONE
-  !DEC$IF DEFINED(HDF5F90_WINDOWS)
-  !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TBREAD_FIELD_INDEX_FL_C'::h5tbread_field_index_fl_c
-  !DEC$ENDIF
-  !DEC$ATTRIBUTES reference :: dset_name
-  INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
-  CHARACTER(LEN=*), INTENT(in) :: dset_name                        ! name of the dataset
-  INTEGER, INTENT(in) :: field_index                               ! index
-  INTEGER(hsize_t), INTENT(in) :: start                            ! start record
-  INTEGER(hsize_t), INTENT(in) :: nrecords                         ! records
-  INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
-  REAL, INTENT(in), DIMENSION(*) :: buf                            ! data buffer
-  INTEGER :: errcode                                               ! error code
-  INTEGER(size_t) :: namelen                                       ! name length
-  END FUNCTION h5tbread_field_index_fl_c
- END INTERFACE
-
- namelen  = LEN(dset_name)
-
- errcode = h5tbread_field_index_fl_c(loc_id,namelen,dset_name,field_index,&
-  start,nrecords,type_size,buf)
-
-END SUBROUTINE h5tbread_field_index_f_float
-
-!-------------------------------------------------------------------------
-! Function: h5tbread_field_index_f_double
-!
-! Purpose: Reads one field
-!
-! Programmer: pvn@ncsa.uiuc.edu
-!
-! Date: October 12, 2004
-!
-! Comments:
-!
-! Modifications:
-!
-!-------------------------------------------------------------------------
-
-SUBROUTINE h5tbread_field_index_f_double(loc_id,&
-                                      dset_name,&
-                                      field_index,&
-                                      start,&
-                                      nrecords,&
-                                      type_size,&
-                                      buf,&
-                                      errcode )
-
- IMPLICIT NONE
-
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5tbread_field_index_f_double
-!DEC$endif
-!
-
- INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
- CHARACTER(LEN=*), INTENT(in) :: dset_name                        ! name of the dataset
- INTEGER, INTENT(in) :: field_index                               ! index
- INTEGER(hsize_t), INTENT(in) :: start                            ! start record
- INTEGER(hsize_t), INTENT(in) :: nrecords                         ! records
- INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
- DOUBLE PRECISION, INTENT(in), DIMENSION(*) :: buf                ! data buffer
- INTEGER :: errcode                                               ! error code
- INTEGER(size_t) :: namelen                                       ! name length
-
- INTERFACE
-  INTEGER FUNCTION h5tbread_field_index_dl_c(loc_id,namelen,dset_name,field_index,&
-   start,nrecords,type_size,buf)
-
-  USE h5global
-  IMPLICIT NONE
-  !DEC$IF DEFINED(HDF5F90_WINDOWS)
-  !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TBREAD_FIELD_INDEX_DL_C'::h5tbread_field_index_dl_c
-  !DEC$ENDIF
-  !DEC$ATTRIBUTES reference :: dset_name
-  INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
-  CHARACTER(LEN=*), INTENT(in) :: dset_name                        ! name of the dataset
-  INTEGER, INTENT(in) :: field_index                               ! index
-  INTEGER(hsize_t), INTENT(in) :: start                            ! start record
-  INTEGER(hsize_t), INTENT(in) :: nrecords                         ! records
-  INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
-  DOUBLE PRECISION, INTENT(in), DIMENSION(*) :: buf                ! data buffer
-  INTEGER :: errcode                                               ! error code
-  INTEGER(size_t) :: namelen                                       ! name length
-  END FUNCTION h5tbread_field_index_dl_c
- END INTERFACE
-
- namelen  = LEN(dset_name)
-
- errcode = h5tbread_field_index_dl_c(loc_id,namelen,dset_name,field_index,&
-  start,nrecords,type_size,buf)
-
-END SUBROUTINE h5tbread_field_index_f_double
-
-!-------------------------------------------------------------------------
-! Function: h5tbread_field_index_f_string
-!
-! Purpose: Reads one field
-!
-! Programmer: pvn@ncsa.uiuc.edu
-!
-! Date: October 12, 2004
-!
-! Comments:
-!
-! Modifications:
-!
-!-------------------------------------------------------------------------
-
-SUBROUTINE h5tbread_field_index_f_string(loc_id,&
-                                      dset_name,&
-                                      field_index,&
-                                      start,&
-                                      nrecords,&
-                                      type_size,&
-                                      buf,&
-                                      errcode )
-
- IMPLICIT NONE
-
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5tbread_field_index_f_string
-!DEC$endif
-!
-
- INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
- CHARACTER(LEN=*), INTENT(in) :: dset_name                        ! name of the dataset
- INTEGER, INTENT(in) :: field_index                               ! index
- INTEGER(hsize_t), INTENT(in) :: start                            ! start record
- INTEGER(hsize_t), INTENT(in) :: nrecords                         ! records
- INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
- CHARACTER(LEN=*), INTENT(in), DIMENSION(*) :: buf                ! data buffer
- INTEGER :: errcode                                               ! error code
- INTEGER(size_t) :: namelen                                       ! name length
-
- INTERFACE
-  INTEGER FUNCTION h5tbread_field_index_st_c(loc_id,namelen,dset_name,field_index,&
-   start,nrecords,type_size,buf)
-
-  USE h5global
-  IMPLICIT NONE
-  !DEC$IF DEFINED(HDF5F90_WINDOWS)
-  !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TBREAD_FIELD_INDEX_ST_C'::h5tbread_field_index_st_c
-  !DEC$ENDIF
-  !DEC$ATTRIBUTES reference :: dset_name
-  INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
-  CHARACTER(LEN=*), INTENT(in) :: dset_name                        ! name of the dataset
-  INTEGER, INTENT(in) :: field_index                               ! index
-  INTEGER(hsize_t), INTENT(in) :: start                            ! start record
-  INTEGER(hsize_t), INTENT(in) :: nrecords                         ! records
-  INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
-  CHARACTER(LEN=*), INTENT(in), DIMENSION(*) :: buf                ! data buffer
-  INTEGER :: errcode                                               ! error code
-  INTEGER(size_t) :: namelen                                       ! name length
-  END FUNCTION h5tbread_field_index_st_c
- END INTERFACE
-
- namelen  = LEN(dset_name)
-
- errcode = h5tbread_field_index_st_c(loc_id,namelen,dset_name,field_index,&
-  start,nrecords,type_size,buf)
-
-END SUBROUTINE h5tbread_field_index_f_string
-
-
-!-------------------------------------------------------------------------
-! Function: h5tbinsert_field_f_int
-!
-! Purpose: Inserts one field
-!
-! Programmer: pvn@ncsa.uiuc.edu
-!
-! Date: October 13, 2004
-!
-! Comments:
-!
-! Modifications:
-!
-!-------------------------------------------------------------------------
-
-SUBROUTINE h5tbinsert_field_f_int(loc_id,&
-                                  dset_name,&
-                                  field_name,&
-                                  field_type,&
-                                  field_index,&
-                                  buf,&
-                                  errcode )
- IMPLICIT NONE
-
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5tbinsert_field_f_int
-!DEC$endif
-!
-
- INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
- CHARACTER(LEN=*), INTENT(in) :: dset_name                        ! name of the dataset
- CHARACTER(LEN=*), INTENT(in) :: field_name                       ! name of the field
- INTEGER(hid_t), INTENT(in)   :: field_type                       ! field type
- INTEGER, INTENT(in) :: field_index                               ! field_index
- INTEGER, INTENT(in), DIMENSION(*) :: buf                         ! data buffer
- INTEGER(size_t) :: namelen                                       ! name length
- INTEGER(size_t) :: namelen1                                      ! name length
- INTEGER :: errcode                                               ! error code
-
-
- INTERFACE
-  INTEGER FUNCTION h5tbinsert_field_int_c(loc_id,namelen,dset_name,namelen1,field_name,&
-   field_type,field_index,buf)
-
-  USE h5global
-  IMPLICIT NONE
-  !DEC$IF DEFINED(HDF5F90_WINDOWS)
-  !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TBINSERT_FIELD_INT_C'::h5tbinsert_field_int_c
-  !DEC$ENDIF
-  !DEC$ATTRIBUTES reference :: dset_name
-  !DEC$ATTRIBUTES reference :: field_name
-  INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
-  CHARACTER(LEN=*), INTENT(in) :: dset_name                        ! name of the dataset
-  CHARACTER(LEN=*), INTENT(in) :: field_name                       ! name of the field
-  INTEGER(hid_t), INTENT(in)   :: field_type                       ! field type
-  INTEGER, INTENT(in) :: field_index                               ! field_index
-  INTEGER, INTENT(in), DIMENSION(*) :: buf                         ! data buffer
-  INTEGER(size_t) :: namelen                                       ! name length
-  INTEGER(size_t) :: namelen1                                      ! name length length
-  END FUNCTION h5tbinsert_field_int_c
- END INTERFACE
-
- namelen  = LEN(dset_name)
- namelen1 = LEN(field_name)
-
- errcode = h5tbinsert_field_int_c(loc_id,namelen,dset_name,namelen1,field_name,&
-   field_type,field_index,buf)
-
-END SUBROUTINE h5tbinsert_field_f_int
-
-
-
-!-------------------------------------------------------------------------
-! Function: h5tbinsert_field_f_float
-!
-! Purpose: Inserts one field
-!
-! Programmer: pvn@ncsa.uiuc.edu
-!
-! Date: October 13, 2004
-!
-! Comments:
-!
-! Modifications:
-!
-!-------------------------------------------------------------------------
-
-SUBROUTINE h5tbinsert_field_f_float(loc_id,&
-                                  dset_name,&
-                                  field_name,&
-                                  field_type,&
-                                  field_index,&
-                                  buf,&
-                                  errcode )
- IMPLICIT NONE
-
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5tbinsert_field_f_float
-!DEC$endif
-!
-
- INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
- CHARACTER(LEN=*), INTENT(in) :: dset_name                        ! name of the dataset
- CHARACTER(LEN=*), INTENT(in) :: field_name                       ! name of the field
- INTEGER(hid_t), INTENT(in)   :: field_type                       ! field type
- INTEGER, INTENT(in) :: field_index                               ! field_index
- REAL, INTENT(in), DIMENSION(*) :: buf                            ! data buffer
- INTEGER(size_t) :: namelen                                       ! name length
- INTEGER(size_t) :: namelen1                                      ! name length
- INTEGER :: errcode                                               ! error code
-
-
- INTERFACE
-  INTEGER FUNCTION h5tbinsert_field_fl_c(loc_id,namelen,dset_name,namelen1,field_name,&
-   field_type,field_index,buf)
-
-  USE h5global
-  IMPLICIT NONE
-  !DEC$IF DEFINED(HDF5F90_WINDOWS)
-  !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TBINSERT_FIELD_FL_C'::h5tbinsert_field_fl_c
-  !DEC$ENDIF
-  !DEC$ATTRIBUTES reference :: dset_name
-  !DEC$ATTRIBUTES reference :: field_name
-  INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
-  CHARACTER(LEN=*), INTENT(in) :: dset_name                        ! name of the dataset
-  CHARACTER(LEN=*), INTENT(in) :: field_name                       ! name of the field
-  INTEGER(hid_t), INTENT(in)   :: field_type                       ! field type
-  INTEGER, INTENT(in) :: field_index                               ! field_index
-  REAL, INTENT(in), DIMENSION(*) :: buf                            ! data buffer
-  INTEGER(size_t) :: namelen                                       ! name length
-  INTEGER(size_t) :: namelen1                                      ! name length length
-  END FUNCTION h5tbinsert_field_fl_c
- END INTERFACE
-
- namelen  = LEN(dset_name)
- namelen1 = LEN(field_name)
-
- errcode = h5tbinsert_field_fl_c(loc_id,namelen,dset_name,namelen1,field_name,&
-   field_type,field_index,buf)
-
-END SUBROUTINE h5tbinsert_field_f_float
-
-
-
-!-------------------------------------------------------------------------
-! Function: h5tbinsert_field_f_double
-!
-! Purpose: Inserts one field
-!
-! Programmer: pvn@ncsa.uiuc.edu
-!
-! Date: October 13, 2004
-!
-! Comments:
-!
-! Modifications:
-!
-!-------------------------------------------------------------------------
-
-SUBROUTINE h5tbinsert_field_f_double(loc_id,&
-                                  dset_name,&
-                                  field_name,&
-                                  field_type,&
-                                  field_index,&
-                                  buf,&
-                                  errcode )
- IMPLICIT NONE
-
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5tbinsert_field_f_double
-!DEC$endif
-!
-
- INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
- CHARACTER(LEN=*), INTENT(in) :: dset_name                        ! name of the dataset
- CHARACTER(LEN=*), INTENT(in) :: field_name                       ! name of the field
- INTEGER(hid_t), INTENT(in)   :: field_type                       ! field type
- INTEGER, INTENT(in) :: field_index                               ! field_index
- DOUBLE PRECISION, INTENT(in), DIMENSION(*) :: buf                ! data buffer
- INTEGER(size_t) :: namelen                                       ! name length
- INTEGER(size_t) :: namelen1                                      ! name length
- INTEGER :: errcode                                               ! error code
-
-
- INTERFACE
-  INTEGER FUNCTION h5tbinsert_field_dl_c(loc_id,namelen,dset_name,namelen1,field_name,&
-   field_type,field_index,buf)
-
-  USE h5global
-  IMPLICIT NONE
-  !DEC$IF DEFINED(HDF5F90_WINDOWS)
-  !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TBINSERT_FIELD_DL_C'::h5tbinsert_field_dl_c
-  !DEC$ENDIF
-  !DEC$ATTRIBUTES reference :: dset_name
-  !DEC$ATTRIBUTES reference :: field_name
-  INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
-  CHARACTER(LEN=*), INTENT(in) :: dset_name                        ! name of the dataset
-  CHARACTER(LEN=*), INTENT(in) :: field_name                       ! name of the field
-  INTEGER(hid_t), INTENT(in)   :: field_type                       ! field type
-  INTEGER, INTENT(in) :: field_index                               ! field_index
-  DOUBLE PRECISION, INTENT(in), DIMENSION(*) :: buf                ! data buffer
-  INTEGER(size_t) :: namelen                                       ! name length
-  INTEGER(size_t) :: namelen1                                      ! name length length
-  END FUNCTION h5tbinsert_field_dl_c
- END INTERFACE
-
- namelen  = LEN(dset_name)
- namelen1 = LEN(field_name)
-
- errcode = h5tbinsert_field_dl_c(loc_id,namelen,dset_name,namelen1,field_name,&
-   field_type,field_index,buf)
-
-END SUBROUTINE h5tbinsert_field_f_double
-
-
-
-
-!-------------------------------------------------------------------------
-! Function: h5tbinsert_field_f_string
-!
-! Purpose: Inserts one field
-!
-! Programmer: pvn@ncsa.uiuc.edu
-!
-! Date: October 13, 2004
-!
-! Comments:
-!
-! Modifications:
-!
-!-------------------------------------------------------------------------
-
-SUBROUTINE h5tbinsert_field_f_string(loc_id,&
-                                  dset_name,&
-                                  field_name,&
-                                  field_type,&
-                                  field_index,&
-                                  buf,&
-                                  errcode )
- IMPLICIT NONE
-
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5tbinsert_field_f_string
-!DEC$endif
-!
-
- INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
- CHARACTER(LEN=*), INTENT(in) :: dset_name                        ! name of the dataset
- CHARACTER(LEN=*), INTENT(in) :: field_name                       ! name of the field
- INTEGER(hid_t), INTENT(in)   :: field_type                       ! field type
- INTEGER, INTENT(in) :: field_index                               ! field_index
- CHARACTER(LEN=*), INTENT(in), DIMENSION(*) :: buf                ! data buffer
- INTEGER(size_t) :: namelen                                       ! name length
- INTEGER(size_t) :: namelen1                                      ! name length
- INTEGER :: errcode                                               ! error code
-
-
- INTERFACE
-  INTEGER FUNCTION h5tbinsert_field_st_c(loc_id,namelen,dset_name,namelen1,field_name,&
-   field_type,field_index,buf)
-
-  USE h5global
-  IMPLICIT NONE
-  !DEC$IF DEFINED(HDF5F90_WINDOWS)
-  !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TBINSERT_FIELD_ST_C'::h5tbinsert_field_st_c
-  !DEC$ENDIF
-  !DEC$ATTRIBUTES reference :: dset_name
-  !DEC$ATTRIBUTES reference :: field_name
-  INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
-  CHARACTER(LEN=*), INTENT(in) :: dset_name                        ! name of the dataset
-  CHARACTER(LEN=*), INTENT(in) :: field_name                       ! name of the field
-  INTEGER(hid_t), INTENT(in)   :: field_type                       ! field type
-  INTEGER, INTENT(in) :: field_index                               ! field_index
-  CHARACTER(LEN=*), INTENT(in), DIMENSION(*) :: buf                ! data buffer
-  INTEGER(size_t) :: namelen                                       ! name length
-  INTEGER(size_t) :: namelen1                                      ! name length length
-  END FUNCTION h5tbinsert_field_st_c
- END INTERFACE
-
- namelen  = LEN(dset_name)
- namelen1 = LEN(field_name)
-
- errcode = h5tbinsert_field_st_c(loc_id,namelen,dset_name,namelen1,field_name,&
-   field_type,field_index,buf)
-
-END SUBROUTINE h5tbinsert_field_f_string
-
-
-
-
-!-------------------------------------------------------------------------
-! Function: h5tbdelete_field_f
-!
-! Purpose: Inserts one field
-!
-! Programmer: pvn@ncsa.uiuc.edu
-!
-! Date: October 13, 2004
-!
-! Comments:
-!
-! Modifications:
-!
-!-------------------------------------------------------------------------
-
-SUBROUTINE h5tbdelete_field_f(loc_id,&
-                              dset_name,&
-                              field_name,&
-                              errcode )
- IMPLICIT NONE
-
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5tbdelete_field_f
-!DEC$endif
-!
-
- INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
- CHARACTER(LEN=*), INTENT(in) :: dset_name                        ! name of the dataset
- CHARACTER(LEN=*), INTENT(in) :: field_name                       ! name of the field
- INTEGER(size_t) :: namelen                                       ! name length
- INTEGER(size_t) :: namelen1                                      ! name length
- INTEGER :: errcode                                               ! error code
-
-
- INTERFACE
-  INTEGER FUNCTION h5tbdelete_field_c(loc_id,namelen,dset_name,namelen1,field_name)
-
-  USE h5global
-  IMPLICIT NONE
-  !DEC$IF DEFINED(HDF5F90_WINDOWS)
-  !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TBDELETE_FIELD_C'::h5tbdelete_field_c
-  !DEC$ENDIF
-  !DEC$ATTRIBUTES reference :: dset_name
-  !DEC$ATTRIBUTES reference :: field_name
-  INTEGER(HID_T),   INTENT(IN) :: loc_id                           ! file or group identifier
-  CHARACTER(LEN=*), INTENT(IN) :: dset_name                        ! name of the dataset
-  CHARACTER(LEN=*), INTENT(IN) :: field_name                       ! name of the field
-  INTEGER(size_t) :: namelen                                       ! name length
-  INTEGER(size_t) :: namelen1                                      ! name length length
-  END FUNCTION h5tbdelete_field_c
- END INTERFACE
-
- namelen  = LEN(dset_name)
- namelen1 = LEN(field_name)
-
- errcode = h5tbdelete_field_c(loc_id,namelen,dset_name,namelen1,field_name)
-
-END SUBROUTINE h5tbdelete_field_f
-
-
-
-!-------------------------------------------------------------------------
-! Function: h5tbget_table_info_f
-!
-! Purpose: Gets the number of records and fields of a table
-!
-! Return: Success: 0, Failure: -1
-!
-! Programmer: pvn@ncsa.uiuc.edu
-!
-! Date: October 13, 2004
-!
-! Comments:
-!
-! Modifications:
-!
-!-------------------------------------------------------------------------
-
-SUBROUTINE h5tbget_table_info_f(loc_id,&
-                                dset_name,&
-                                nfields,&
-                                nrecords,&
-                                errcode )
-
- IMPLICIT NONE
-
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5tbget_table_info_f
-!DEC$endif
-!
-
- INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
- CHARACTER(LEN=*), INTENT(in) :: dset_name          ! name of the dataset
- INTEGER(hsize_t), INTENT(inout):: nfields          ! nfields
- INTEGER(hsize_t), INTENT(inout):: nrecords         ! nrecords
- INTEGER :: errcode                                 ! error code
- INTEGER(size_t) :: namelen                         ! name length
-
- INTERFACE
-  INTEGER FUNCTION h5tbget_table_info_c(loc_id,namelen,dset_name,nfields,nrecords)
-  USE h5global
-  IMPLICIT NONE
-  !DEC$IF DEFINED(HDF5F90_WINDOWS)
-  !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TBGET_TABLE_INFO_C'::h5tbget_table_info_c
-  !DEC$ENDIF
-  !DEC$ATTRIBUTES reference :: dset_name
-  INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
-  CHARACTER(LEN=*), INTENT(in) :: dset_name          ! name of the dataset
-  INTEGER(hsize_t), INTENT(inout):: nfields          ! nfields
-  INTEGER(hsize_t), INTENT(inout):: nrecords         ! nrecords
-  INTEGER(size_t) :: namelen                         ! name length
-  END FUNCTION h5tbget_table_info_c
- END INTERFACE
-
- namelen = LEN(dset_name)
- errcode = h5tbget_table_info_c(loc_id,namelen,dset_name,nfields,nrecords)
-
-END SUBROUTINE h5tbget_table_info_f
-
-
-!-------------------------------------------------------------------------
-! Function: h5tbget_field_info_f
-!
-! Purpose: Get information about fields
-!
-! Return: Success: 0, Failure: -1
-!
-! Programmer: pvn@ncsa.uiuc.edu
-!
-! Date: October 13, 2004
-!
-! Comments:
-!
-! Modifications: 
-!  Added optional parameter for returning the maximum character length
-!  in the field name array. March 3, 2011 
-!
-!-------------------------------------------------------------------------
-
-SUBROUTINE h5tbget_field_info_f(loc_id,&
-                                dset_name,&
-                                nfields,&
-                                field_names,&
-                                field_sizes,&
-                                field_offsets,&
-                                type_size,&
-                                errcode, maxlen_out )
-
-  IMPLICIT NONE
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5tbget_field_info_f
-!DEC$endif
-!
-  INTEGER(hid_t),   INTENT(in) :: loc_id                                ! file or group identifier
-  CHARACTER(LEN=*), INTENT(in) :: dset_name                             ! name of the dataset
-  INTEGER(hsize_t), INTENT(in) :: nfields                               ! nfields
-  CHARACTER(LEN=*), DIMENSION(nfields), INTENT(inout) :: field_names    ! field names
-  INTEGER(size_t),  DIMENSION(nfields), INTENT(inout) :: field_sizes    ! field sizes
-  INTEGER(size_t),  DIMENSION(nfields), INTENT(inout) :: field_offsets  ! field offsets
-  INTEGER(size_t),  INTENT(inout):: type_size                           ! type size
-  INTEGER :: errcode                                                    ! error code
-  INTEGER, OPTIONAL :: maxlen_out                                       ! maximum character len of the field names
-  INTEGER(size_t) :: namelen                                            ! name length
-  INTEGER(size_t), DIMENSION(nfields) :: namelen2                       ! name lengths
-  INTEGER(hsize_t) :: i                                                          ! general purpose integer
-  INTEGER(size_t) :: maxlen
-  INTEGER(size_t) :: c_maxlen_out
-
-  INTERFACE
-     INTEGER FUNCTION h5tbget_field_info_c(loc_id,namelen,dset_name,nfields,&
-          field_sizes,field_offsets,type_size,namelen2, maxlen, field_names, c_maxlen_out)
-
-       USE h5global
-       IMPLICIT NONE
-       !DEC$IF DEFINED(HDF5F90_WINDOWS)
-       !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TBGET_FIELD_INFO_C'::h5tbget_field_info_c
-       !DEC$ENDIF
-       !DEC$ATTRIBUTES reference :: dset_name
-       INTEGER(hid_t),   INTENT(in) :: loc_id                                 ! file or group identifier
-       CHARACTER(LEN=*), INTENT(in) :: dset_name                              ! name of the dataset
-       INTEGER(hsize_t), INTENT(in):: nfields                                 ! nfields
-       CHARACTER(LEN=*), DIMENSION(1:nfields), INTENT(inout) :: field_names   ! field names
-       INTEGER(size_t),  DIMENSION(1:nfields), INTENT(inout) :: field_sizes   ! field sizes
-       INTEGER(size_t),  DIMENSION(1:nfields), INTENT(inout) :: field_offsets ! field offsets
-       INTEGER(size_t),  INTENT(inout):: type_size                            ! type size
-       INTEGER(size_t) :: namelen                                             ! name length
-       INTEGER(size_t) :: maxlen                                              ! maxiumum length of input field names
-       INTEGER(size_t), DIMENSION(1:nfields) :: namelen2                      ! name lengths
-       INTEGER(size_t) :: c_maxlen_out                  ! maximum character length of a field array element 
-     END FUNCTION h5tbget_field_info_c
-  END INTERFACE
-
-  namelen = LEN(dset_name)
-  DO i = 1, nfields
-     namelen2(i) = LEN_TRIM(field_names(i))
-  END DO
-  maxlen = LEN(field_names(1))
-  c_maxlen_out = 0
-
-  errcode = h5tbget_field_info_c(loc_id, namelen,dset_name, nfields, &
-       field_sizes, field_offsets, type_size, namelen2, maxlen, field_names, c_maxlen_out)
-
-  IF(PRESENT(maxlen_out)) maxlen_out = c_maxlen_out
-
-END SUBROUTINE h5tbget_field_info_f
-
-END MODULE H5TB
-
-
-
-
-
-
diff --git a/hl/fortran/src/Makefile.am b/hl/fortran/src/Makefile.am
index c8c4541..8fe618d 100644
--- a/hl/fortran/src/Makefile.am
+++ b/hl/fortran/src/Makefile.am
@@ -1,16 +1,13 @@
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 #
 ##
 ## Makefile.am
@@ -30,7 +27,7 @@ AM_FCFLAGS+=-I$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/s
 lib_LTLIBRARIES=libhdf5hl_fortran.la
 
 # Add libtool numbers to the HDF5 HL Fortran library (from config/lt_vers.am)
-libhdf5hl_fortran_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
+libhdf5hl_fortran_la_LDFLAGS= -version-info $(LT_HL_F_VERS_INTERFACE):$(LT_HL_F_VERS_REVISION):$(LT_HL_F_VERS_AGE) $(AM_LDFLAGS)
 
 # Some Fortran compilers can't build shared libraries, so sometimes we
 # want to build a shared C library and a static Fortran library.  If so,
@@ -42,16 +39,31 @@ endif
 
 # Source files for the library
 #if BUILD_PARALLEL_CONDITIONAL
-#    PARALLEL_COND_SRC=HDFDmpiof.c HDF5mpio.f90
+#    PARALLEL_COND_SRC=HDFDmpiof.c HDF5mpio.F90
 #endif
 
 # List sources to include in the HDF5 HL Fortran library.
-libhdf5hl_fortran_la_SOURCES=H5DSfc.c H5LTfc.c  H5IMfc.c H5IMcc.c H5TBfc.c \
-	H5DSff.f90 H5LTff.f90 H5IMff.f90 H5TBff.f90
+libhdf5hl_fortran_la_SOURCES=H5DSfc.c H5LTfc.c H5IMfc.c H5IMcc.c H5TBfc.c \
+	H5DSff.F90 H5LTff.F90 H5TBff.F90 H5IMff.F90 H5LTff_gen.F90 H5TBff_gen.F90
 
 # HDF5 HL Fortran library depends on HDF5 Library.
 libhdf5hl_fortran_la_LIBADD=$(LIBH5_HL) $(LIBH5F)
 
+# The name of the lib file doesn't follow the same pattern as the other hl lib
+# files, namely libhdf5_hl_*.  Add a symlink with the compliant name to the
+# actual lib file.
+install-exec-hook:
+	cd $(DESTDIR)$(libdir) && \
+	    if test -f libhdf5hl_fortran.a -a \
+	    ! -f libhdf5_hl_fortran.a; then \
+	        $(LN_S) libhdf5hl_fortran.a libhdf5_hl_fortran.a; \
+	    fi; \
+	    if test -f libhdf5hl_fortran.so -a \
+	    ! -f libhdf5_hl_fortran.so; then \
+	        $(LN_S) libhdf5hl_fortran.so libhdf5_hl_fortran.so; \
+	    fi;
+
+
 # Fortran module files can have different extensions and different names
 # (e.g., different capitalizations) on different platforms.  Write rules
 # for them explicitly rather than trying to teach automake about them.
@@ -60,28 +72,45 @@ maintainer-clean-local: clean-local
 distclean-local: clean-local
 clean-local:
 	@if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \
-	  $(RM) *.$(F9XMODEXT);                                         \
+	  $(RM) *.$(F9XMODEXT) H5LTff_gen.F90 H5TBff_gen.F90; \
 	fi
 
 install-data-local:
 	@if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \
-	  $(CP) $(top_builddir)/$(subdir)/*.$(F9XMODEXT) $(DESTDIR)$(includedir)/. ; \
+	  $(CP) $(top_builddir)/$(subdir)/*.$(F9XMODEXT) $(DESTDIR)$(fmoddir)/. ; \
 	fi
 
 uninstall-local:
 	@if test -n "$(F9XMODEXT)" -a "X$(F9XMODEXT)" != "Xo"; then      \
-	  if test -f "$(includedir)/hdf5.$(F9XMODEXT)" -o -f "$(DESTDIR)$(includedir)/HDF5.$(F9XMODEXT)"; then \
-	    set -x; $(RM) $(includedir)/*.$(F9XMODEXT);                 \
+	  if test -f "$(fmoddir)/hdf5.$(F9XMODEXT)" -o -f "$(DESTDIR)$(fmoddir)/HDF5.$(F9XMODEXT)"; then \
+	    set -x; $(RM) $(fmoddir)/*.$(F9XMODEXT);                 \
 	  fi;                                                           \
 	fi
+	$(RM) $(DESTDIR)$(libdir)/libhdf5_hl_fortran*
+
+# These are the helper programs we need to build.
+noinst_PROGRAMS = H5HL_buildiface
+
+# H5HL_buildiface.F90 generates all the APIs that have a KIND type associated
+# with them.
 
+H5LTff_gen.F90: H5HL_buildiface$(EXEEXT)
+	$(RUNSERIAL) ./H5HL_buildiface$(EXEEXT)
+
+H5TBff_gen.F90: H5HL_buildiface$(EXEEXT)
+
+# H5HL_buildiface.F90 is included in the distribution, and Automake knows
+# how to compile a fortran program given its sources.
+
+H5HL_buildiface_SOURCES = H5HL_buildiface.F90
 # Hardcode the dependencies of these files. There isn't a known way of
 # determining this automagically (like we do with the C files). So, when
 # doing a parallel make, some modules could be made way before the
 # modules they depend upon are actually made. *sigh*
-H5DSff.lo:          $(srcdir)/H5DSff.f90
-H5LTff.lo:          $(srcdir)/H5LTff.f90
-H5IMff.lo:          $(srcdir)/H5IMff.f90
-H5TBff.lo:          $(srcdir)/H5TBff.f90
-
-include $(top_srcdir)/config/conclude.am
+H5DSff.lo:          $(srcdir)/H5DSff.F90
+H5LTff.lo:          $(srcdir)/H5LTff.F90
+H5IMff.lo:          $(srcdir)/H5IMff.F90
+H5TBff.lo:          $(srcdir)/H5TBff.F90
+H5LTff_gen.lo:      H5LTff.lo H5LTff_gen.F90
+H5TBff_gen.lo:      H5TBff.lo H5LTff_gen.F90 H5TBff_gen.F90
+include $(top_srcdir)/config/conclude_fc.am
diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in
deleted file mode 100644
index e7cc443..0000000
--- a/hl/fortran/src/Makefile.in
+++ /dev/null
@@ -1,1463 +0,0 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-#
-#
-# HDF5 High-Level Fortran Makefile(.in)
-
-VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-DIST_COMMON = $(top_srcdir)/config/commence.am \
-	$(top_srcdir)/config/lt_vers.am \
-	$(top_srcdir)/config/conclude.am $(srcdir)/Makefile.in \
-	$(srcdir)/Makefile.am $(top_srcdir)/bin/mkinstalldirs \
-	$(top_srcdir)/bin/depcomp $(top_srcdir)/bin/test-driver
-
-# Some Fortran compilers can't build shared libraries, so sometimes we
-# want to build a shared C library and a static Fortran library.  If so,
-# pass the -static flag to the library linker.
-@FORTRAN_SHARED_CONDITIONAL_FALSE@am__append_1 = -static
-TESTS =
-subdir = hl/fortran/src
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/aclocal_cxx.m4 \
-	$(top_srcdir)/m4/aclocal_fc.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/src/H5config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(libdir)"
-LTLIBRARIES = $(lib_LTLIBRARIES)
-libhdf5hl_fortran_la_DEPENDENCIES = $(LIBH5_HL) $(LIBH5F)
-am_libhdf5hl_fortran_la_OBJECTS = H5DSfc.lo H5LTfc.lo H5IMfc.lo \
-	H5IMcc.lo H5TBfc.lo H5DSff.lo H5LTff.lo H5IMff.lo H5TBff.lo
-libhdf5hl_fortran_la_OBJECTS = $(am_libhdf5hl_fortran_la_OBJECTS)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 = 
-libhdf5hl_fortran_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=FC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(FCLD) \
-	$(AM_FCFLAGS) $(FCFLAGS) $(libhdf5hl_fortran_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
-depcomp = $(SHELL) $(top_srcdir)/bin/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC      " $@;
-am__v_CC_1 = 
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD    " $@;
-am__v_CCLD_1 = 
-FCCOMPILE = $(FC) $(AM_FCFLAGS) $(FCFLAGS)
-LTFCCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=FC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(FC) $(AM_FCFLAGS) $(FCFLAGS)
-AM_V_FC = $(am__v_FC_@AM_V@)
-am__v_FC_ = $(am__v_FC_@AM_DEFAULT_V@)
-am__v_FC_0 = @echo "  FC      " $@;
-am__v_FC_1 = 
-FCLD = $(FC)
-FCLINK = $(LIBTOOL) $(AM_V_lt) --tag=FC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(FCLD) $(AM_FCFLAGS) $(FCFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_FCLD = $(am__v_FCLD_@AM_V@)
-am__v_FCLD_ = $(am__v_FCLD_@AM_DEFAULT_V@)
-am__v_FCLD_0 = @echo "  FCLD    " $@;
-am__v_FCLD_1 = 
-SOURCES = $(libhdf5hl_fortran_la_SOURCES)
-DIST_SOURCES = $(libhdf5hl_fortran_la_SOURCES)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-am__tty_colors_dummy = \
-  mgn= red= grn= lgn= blu= brg= std=; \
-  am__color_tests=no
-am__tty_colors = { \
-  $(am__tty_colors_dummy); \
-  if test "X$(AM_COLOR_TESTS)" = Xno; then \
-    am__color_tests=no; \
-  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
-    am__color_tests=yes; \
-  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
-    am__color_tests=yes; \
-  fi; \
-  if test $$am__color_tests = yes; then \
-    red='[0;31m'; \
-    grn='[0;32m'; \
-    lgn='[1;32m'; \
-    blu='[1;34m'; \
-    mgn='[0;35m'; \
-    brg='[1m'; \
-    std='[m'; \
-  fi; \
-}
-am__recheck_rx = ^[ 	]*:recheck:[ 	]*
-am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
-am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
-# A command that, given a newline-separated list of test names on the
-# standard input, print the name of the tests that are to be re-run
-# upon "make recheck".
-am__list_recheck_tests = $(AWK) '{ \
-  recheck = 1; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-        { \
-          if ((getline line2 < ($$0 ".log")) < 0) \
-	    recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
-        { \
-          recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
-        { \
-          break; \
-        } \
-    }; \
-  if (recheck) \
-    print $$0; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# A command that, given a newline-separated list of test names on the
-# standard input, create the global log from their .trs and .log files.
-am__create_global_log = $(AWK) ' \
-function fatal(msg) \
-{ \
-  print "fatal: making $@: " msg | "cat >&2"; \
-  exit 1; \
-} \
-function rst_section(header) \
-{ \
-  print header; \
-  len = length(header); \
-  for (i = 1; i <= len; i = i + 1) \
-    printf "="; \
-  printf "\n\n"; \
-} \
-{ \
-  copy_in_global_log = 1; \
-  global_test_result = "RUN"; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-         fatal("failed to read from " $$0 ".trs"); \
-      if (line ~ /$(am__global_test_result_rx)/) \
-        { \
-          sub("$(am__global_test_result_rx)", "", line); \
-          sub("[ 	]*$$", "", line); \
-          global_test_result = line; \
-        } \
-      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
-        copy_in_global_log = 0; \
-    }; \
-  if (copy_in_global_log) \
-    { \
-      rst_section(global_test_result ": " $$0); \
-      while ((rc = (getline line < ($$0 ".log"))) != 0) \
-      { \
-        if (rc < 0) \
-          fatal("failed to read from " $$0 ".log"); \
-        print line; \
-      }; \
-      printf "\n"; \
-    }; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# Restructured Text title.
-am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
-# Solaris 10 'make', and several other traditional 'make' implementations,
-# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
-# by disabling -e (using the XSI extension "set +e") if it's set.
-am__sh_e_setup = case $$- in *e*) set +e;; esac
-# Default flags passed to test drivers.
-am__common_driver_flags = \
-  --color-tests "$$am__color_tests" \
-  --enable-hard-errors "$$am__enable_hard_errors" \
-  --expect-failure "$$am__expect_failure"
-# To be inserted before the command running the test.  Creates the
-# directory for the log if needed.  Stores in $dir the directory
-# containing $f, in $tst the test, in $log the log.  Executes the
-# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
-# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
-# will run the test scripts (or their associated LOG_COMPILER, if
-# thy have one).
-am__check_pre = \
-$(am__sh_e_setup);					\
-$(am__vpath_adj_setup) $(am__vpath_adj)			\
-$(am__tty_colors);					\
-srcdir=$(srcdir); export srcdir;			\
-case "$@" in						\
-  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
-    *) am__odir=.;; 					\
-esac;							\
-test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
-  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
-if test -f "./$$f"; then dir=./;			\
-elif test -f "$$f"; then dir=;				\
-else dir="$(srcdir)/"; fi;				\
-tst=$$dir$$f; log='$@'; 				\
-if test -n '$(DISABLE_HARD_ERRORS)'; then		\
-  am__enable_hard_errors=no; 				\
-else							\
-  am__enable_hard_errors=yes; 				\
-fi; 							\
-case " $(XFAIL_TESTS) " in				\
-  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
-    am__expect_failure=yes;;				\
-  *)							\
-    am__expect_failure=no;;				\
-esac; 							\
-$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
-# A shell command to get the names of the tests scripts with any registered
-# extension removed (i.e., equivalently, the names of the test logs, with
-# the '.log' extension removed).  The result is saved in the shell variable
-# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
-# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
-# since that might cause problem with VPATH rewrites for suffix-less tests.
-# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
-am__set_TESTS_bases = \
-  bases='$(TEST_LOGS)'; \
-  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
-  bases=`echo $$bases`
-RECHECK_LOGS = $(TEST_LOGS)
-AM_RECURSIVE_TARGETS = check recheck
-TEST_SUITE_LOG = test-suite.log
-am__test_logs1 = $(TESTS:=.log)
-am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
-TEST_LOGS = $(am__test_logs2:.sh.log=.log)
-SH_LOG_DRIVER = $(SHELL) $(top_srcdir)/bin/test-driver
-SH_LOG_COMPILE = $(SH_LOG_COMPILER) $(AM_SH_LOG_FLAGS) $(SH_LOG_FLAGS)
-am__set_b = \
-  case '$@' in \
-    */*) \
-      case '$*' in \
-        */*) b='$*';; \
-          *) b=`echo '$@' | sed 's/\.log$$//'`; \
-       esac;; \
-    *) \
-      b='$*';; \
-  esac
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
-AMTAR = @AMTAR@
-
-# H5_CFLAGS holds flags that should be used when building hdf5,
-# but which should not be exported to h5cc for building other programs.
-# AM_CFLAGS is an automake construct which should be used by Makefiles 
-# instead of CFLAGS, as CFLAGS is reserved solely for the user to define.
-# This applies to FCFLAGS, CXXFLAGS, CPPFLAGS, and LDFLAGS as well.
-AM_CFLAGS = @AM_CFLAGS@ @H5_CFLAGS@
-AM_CPPFLAGS = @AM_CPPFLAGS@ @H5_CPPFLAGS@ -I$(top_srcdir)/src \
-	-I$(top_srcdir)/hl/src -I$(top_builddir)/hl/src \
-	-I$(top_srcdir)/fortran/src -I$(top_builddir)/fortran/src
-AM_CXXFLAGS = @AM_CXXFLAGS@ @H5_CXXFLAGS@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@ -I$(top_builddir)/fortran/src \
-	$(F9XMODFLAG)$(top_builddir)/fortran/src
-AM_LDFLAGS = @AM_LDFLAGS@ @H5_LDFLAGS@ $(am__append_1)
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BYTESEX = @BYTESEX@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CC_VERSION = @CC_VERSION@
-CFLAGS = @CFLAGS@
-CLEARFILEBUF = @CLEARFILEBUF@
-CODESTACK = @CODESTACK@
-CONFIG_DATE = @CONFIG_DATE@
-CONFIG_MODE = @CONFIG_MODE@
-CONFIG_USER = @CONFIG_USER@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CXX_VERSION = @CXX_VERSION@
-CYGPATH_W = @CYGPATH_W@
-DEBUG_PKG = @DEBUG_PKG@
-DEFAULT_API_VERSION = @DEFAULT_API_VERSION@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
-DIRECT_VFD = @DIRECT_VFD@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-EXTERNAL_FILTERS = @EXTERNAL_FILTERS@
-
-# Make sure that these variables are exported to the Makefiles
-F9XMODEXT = @F9XMODEXT@
-F9XMODFLAG = @F9XMODFLAG@
-F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
-FC = @FC@
-FC2003 = @FC2003@
-FCFLAGS = @FCFLAGS@
-FCFLAGS_f90 = @FCFLAGS_f90@
-FCLIBS = @FCLIBS@
-FC_VERSION = @FC_VERSION@
-FGREP = @FGREP@
-FSEARCH_DIRS = @FSEARCH_DIRS@
-GREP = @GREP@
-H5_CFLAGS = @H5_CFLAGS@
-H5_CPPFLAGS = @H5_CPPFLAGS@
-H5_CXXFLAGS = @H5_CXXFLAGS@
-H5_CXX_SHARED = @H5_CXX_SHARED@
-H5_FCFLAGS = @H5_FCFLAGS@
-H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@
-H5_LDFLAGS = @H5_LDFLAGS@
-H5_LONE_COLON = @H5_LONE_COLON@
-H5_VERSION = @H5_VERSION@
-HADDR_T = @HADDR_T@
-HAVE_DMALLOC = @HAVE_DMALLOC@
-HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@
-HAVE_PTHREAD = @HAVE_PTHREAD@
-HDF5_HL = @HDF5_HL@
-HDF5_INTERFACES = @HDF5_INTERFACES@
-HDF_CXX = @HDF_CXX@
-HDF_FORTRAN = @HDF_FORTRAN@
-HDF_FORTRAN2003 = @HDF_FORTRAN2003@
-HID_T = @HID_T@
-HL = @HL@
-HL_FOR = @HL_FOR@
-HSIZE_T = @HSIZE_T@
-HSSIZE_T = @HSSIZE_T@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTRUMENT = @INSTRUMENT@
-INSTRUMENT_LIBRARY = @INSTRUMENT_LIBRARY@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LL_PATH = @LL_PATH@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_STATIC_EXEC = @LT_STATIC_EXEC@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MPE = @MPE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJECT_NAMELEN_DEFAULT_F = @OBJECT_NAMELEN_DEFAULT_F@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PARALLEL = @PARALLEL@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-RANLIB = @RANLIB@
-ROOT = @ROOT@
-RUNPARALLEL = @RUNPARALLEL@
-RUNSERIAL = @RUNSERIAL@
-R_INTEGER = @R_INTEGER@
-R_LARGE = @R_LARGE@
-SEARCH = @SEARCH@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SIZE_T = @SIZE_T@
-STATIC_EXEC = @STATIC_EXEC@
-STATIC_SHARED = @STATIC_SHARED@
-STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@
-STRIP = @STRIP@
-TESTPARALLEL = @TESTPARALLEL@
-THREADSAFE = @THREADSAFE@
-TIME = @TIME@
-TR = @TR@
-TRACE_API = @TRACE_API@
-UNAME_INFO = @UNAME_INFO@
-USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
-USE_FILTER_SZIP = @USE_FILTER_SZIP@
-USINGMEMCHECKER = @USINGMEMCHECKER@
-VERSION = @VERSION@
-WORDS_BIGENDIAN = @WORDS_BIGENDIAN@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_FC = @ac_ct_FC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-
-# Install directories that automake doesn't know about
-docdir = $(exec_prefix)/doc
-dvidir = @dvidir@
-enable_shared = @enable_shared@
-enable_static = @enable_static@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-
-# Shell commands used in Makefiles
-RM = rm -f
-CP = cp
-
-# Some machines need a command to run executables; this is that command
-# so that our tests will run.
-# We use RUNEXEC instead of RUNSERIAL directly because it may be that
-# some tests need to be run with a different command.  Older versions
-# of the makefiles used the command
-# $(LIBTOOL) --mode=execute
-# in some directories, for instance.
-RUNEXEC = $(RUNSERIAL)
-
-# Libraries to link to while building
-LIBHDF5 = $(top_builddir)/src/libhdf5.la
-LIBH5TEST = $(top_builddir)/test/libh5test.la
-LIBH5F = $(top_builddir)/fortran/src/libhdf5_fortran.la
-LIBH5FTEST = $(top_builddir)/fortran/test/libh5test_fortran.la
-LIBH5CPP = $(top_builddir)/c++/src/libhdf5_cpp.la
-LIBH5TOOLS = $(top_builddir)/tools/lib/libh5tools.la
-LIBH5_HL = $(top_builddir)/hl/src/libhdf5_hl.la
-LIBH5F_HL = $(top_builddir)/hl/fortran/src/libhdf5hl_fortran.la
-LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
-
-# Note that in svn revision 19400 the '/' after DESTDIR in H5* variables below  
-# has been removed. According to the official description of DESTDIR by Gnu at 
-# http://www.gnu.org/prep/standards/html_node/DESTDIR.html, DESTDIR is 
-# prepended to the normal and complete install path that it precedes for the 
-# purpose of installing in a temporary directory which is useful for building 
-# rpms and other packages.  The '/' after ${DESTDIR} will be followed by another 
-# '/' at the beginning of the normal install path.  When DESTDIR is empty the  
-# path then begins with '//', which is incorrect and causes problems at least for 
-# Cygwin.   
-
-# Scripts used to build examples
-# If only shared libraries have been installed, have h5cc build examples with
-# shared libraries instead of static libraries
-H5CC = ${DESTDIR}$(bindir)/h5cc
-H5CC_PP = ${DESTDIR}$(bindir)/h5pcc
-H5FC = ${DESTDIR}$(bindir)/h5fc
-H5FC_PP = ${DESTDIR}$(bindir)/h5pfc
-H5CPP = ${DESTDIR}$(bindir)/h5c++
-ACLOCAL_AMFLAGS = "-I m4"
-
-# The trace script; this is used on source files from the C library to
-# insert tracing macros.
-TRACE = perl $(top_srcdir)/bin/trace
-
-# .chkexe files are used to mark tests that have run successfully.
-# .chklog files are output from those tests.
-# *.clog and *.clog2 are from the MPE option.
-CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2
-
-# Add libtool shared library version numbers to the HDF5 library
-# See libtool versioning documentation online.
-# After making changes, run bin/reconfigure to update other configure related
-# files like Makefile.in.
-LT_VERS_INTERFACE = 6
-LT_VERS_REVISION = 206
-LT_VERS_AGE = 0
-
-# Our main target, the high-level fortran library
-lib_LTLIBRARIES = libhdf5hl_fortran.la
-
-# Add libtool numbers to the HDF5 HL Fortran library (from config/lt_vers.am)
-libhdf5hl_fortran_la_LDFLAGS = -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
-
-# Source files for the library
-#if BUILD_PARALLEL_CONDITIONAL
-#    PARALLEL_COND_SRC=HDFDmpiof.c HDF5mpio.f90
-#endif
-
-# List sources to include in the HDF5 HL Fortran library.
-libhdf5hl_fortran_la_SOURCES = H5DSfc.c H5LTfc.c  H5IMfc.c H5IMcc.c H5TBfc.c \
-	H5DSff.f90 H5LTff.f90 H5IMff.f90 H5TBff.f90
-
-
-# HDF5 HL Fortran library depends on HDF5 Library.
-libhdf5hl_fortran_la_LIBADD = $(LIBH5_HL) $(LIBH5F)
-
-# Automake needs to be taught how to build lib, progs, and tests targets.
-# These will be filled in automatically for the most part (e.g.,
-# lib_LIBRARIES are built for lib target), but EXTRA_LIB, EXTRA_PROG, and
-# EXTRA_TEST variables are supplied to allow the user to force targets to
-# be built at certain times. 
-LIB = $(lib_LIBRARIES) $(lib_LTLIBRARIES) $(noinst_LIBRARIES)                 \
-      $(noinst_LTLIBRARIES) $(check_LIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LIB)
-
-PROGS = $(bin_PROGRAMS) $(bin_SCRIPTS) $(noinst_PROGRAMS) $(noinst_SCRIPTS)   \
-        $(EXTRA_PROG)
-
-chk_TESTS = $(check_PROGRAMS) $(check_SCRIPTS) $(EXTRA_TEST) 
-TEST_EXTENSIONS = .sh
-SH_LOG_COMPILER = $(SHELL)
-AM_SH_LOG_FLAGS = 
-TEST_PROG_CHKEXE = $(TEST_PROG:=.chkexe_)
-TEST_PROG_PARA_CHKEXE = $(TEST_PROG_PARA:=.chkexe_)
-TEST_SCRIPT_CHKSH = $(TEST_SCRIPT:=.chkexe_)
-TEST_SCRIPT_PARA_CHKSH = $(TEST_SCRIPT_PARA:=.chkexe_)
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .f90 .lo .log .o .obj .sh .sh$(EXEEXT) .trs
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/lt_vers.am $(top_srcdir)/config/conclude.am $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign hl/fortran/src/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign hl/fortran/src/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-$(top_srcdir)/config/commence.am $(top_srcdir)/config/lt_vers.am $(top_srcdir)/config/conclude.am:
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
-	}
-
-uninstall-libLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
-	done
-
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; \
-	locs=`for p in $$list; do echo $$p; done | \
-	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
-	      sort -u`; \
-	test -z "$$locs" || { \
-	  echo rm -f $${locs}; \
-	  rm -f $${locs}; \
-	}
-
-libhdf5hl_fortran.la: $(libhdf5hl_fortran_la_OBJECTS) $(libhdf5hl_fortran_la_DEPENDENCIES) $(EXTRA_libhdf5hl_fortran_la_DEPENDENCIES) 
-	$(AM_V_FCLD)$(libhdf5hl_fortran_la_LINK) -rpath $(libdir) $(libhdf5hl_fortran_la_OBJECTS) $(libhdf5hl_fortran_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5DSfc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5IMcc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5IMfc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5LTfc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5TBfc.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
-
-.f90.o:
-	$(AM_V_FC)$(FCCOMPILE) -c -o $@ $(FCFLAGS_f90) $<
-
-.f90.obj:
-	$(AM_V_FC)$(FCCOMPILE) -c -o $@ $(FCFLAGS_f90) `$(CYGPATH_W) '$<'`
-
-.f90.lo:
-	$(AM_V_FC)$(LTFCCOMPILE) -c -o $@ $(FCFLAGS_f90) $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: ctags-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-# Recover from deleted '.trs' file; this should ensure that
-# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
-# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
-# to avoid problems with "make -n".
-.log.trs:
-	rm -f $< $@
-	$(MAKE) $(AM_MAKEFLAGS) $<
-
-# Leading 'am--fnord' is there to ensure the list of targets does not
-# expand to empty, as could happen e.g. with make check TESTS=''.
-am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
-am--force-recheck:
-	@:
-
-$(TEST_SUITE_LOG): $(TEST_LOGS)
-	@$(am__set_TESTS_bases); \
-	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
-	redo_bases=`for i in $$bases; do \
-	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
-	            done`; \
-	if test -n "$$redo_bases"; then \
-	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
-	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
-	  if $(am__make_dryrun); then :; else \
-	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
-	  fi; \
-	fi; \
-	if test -n "$$am__remaking_logs"; then \
-	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
-	       "recursion detected" >&2; \
-	else \
-	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
-	fi; \
-	if $(am__make_dryrun); then :; else \
-	  st=0;  \
-	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
-	  for i in $$redo_bases; do \
-	    test -f $$i.trs && test -r $$i.trs \
-	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
-	    test -f $$i.log && test -r $$i.log \
-	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
-	  done; \
-	  test $$st -eq 0 || exit 1; \
-	fi
-	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
-	ws='[ 	]'; \
-	results=`for b in $$bases; do echo $$b.trs; done`; \
-	test -n "$$results" || results=/dev/null; \
-	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
-	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
-	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
-	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
-	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
-	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
-	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
-	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
-	  success=true; \
-	else \
-	  success=false; \
-	fi; \
-	br='==================='; br=$$br$$br$$br$$br; \
-	result_count () \
-	{ \
-	    if test x"$$1" = x"--maybe-color"; then \
-	      maybe_colorize=yes; \
-	    elif test x"$$1" = x"--no-color"; then \
-	      maybe_colorize=no; \
-	    else \
-	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
-	    fi; \
-	    shift; \
-	    desc=$$1 count=$$2; \
-	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
-	      color_start=$$3 color_end=$$std; \
-	    else \
-	      color_start= color_end=; \
-	    fi; \
-	    echo "$${color_start}# $$desc $$count$${color_end}"; \
-	}; \
-	create_testsuite_report () \
-	{ \
-	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
-	  result_count $$1 "PASS: " $$pass  "$$grn"; \
-	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
-	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
-	  result_count $$1 "FAIL: " $$fail  "$$red"; \
-	  result_count $$1 "XPASS:" $$xpass "$$red"; \
-	  result_count $$1 "ERROR:" $$error "$$mgn"; \
-	}; \
-	{								\
-	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
-	    $(am__rst_title);						\
-	  create_testsuite_report --no-color;				\
-	  echo;								\
-	  echo ".. contents:: :depth: 2";				\
-	  echo;								\
-	  for b in $$bases; do echo $$b; done				\
-	    | $(am__create_global_log);					\
-	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
-	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
-	if $$success; then						\
-	  col="$$grn";							\
-	 else								\
-	  col="$$red";							\
-	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
-	fi;								\
-	echo "$${col}$$br$${std}"; 					\
-	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
-	echo "$${col}$$br$${std}"; 					\
-	create_testsuite_report --maybe-color;				\
-	echo "$$col$$br$$std";						\
-	if $$success; then :; else					\
-	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
-	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
-	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
-	  fi;								\
-	  echo "$$col$$br$$std";					\
-	fi;								\
-	$$success || exit 1
-recheck: all 
-	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-	@set +e; $(am__set_TESTS_bases); \
-	bases=`for i in $$bases; do echo $$i; done \
-	         | $(am__list_recheck_tests)` || exit 1; \
-	log_list=`for i in $$bases; do echo $$i.log; done`; \
-	log_list=`echo $$log_list`; \
-	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
-	        am__force_recheck=am--force-recheck \
-	        TEST_LOGS="$$log_list"; \
-	exit $$?
-.sh.log:
-	@p='$<'; \
-	$(am__set_b); \
-	$(am__check_pre) $(SH_LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_SH_LOG_DRIVER_FLAGS) $(SH_LOG_DRIVER_FLAGS) -- $(SH_LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-@am__EXEEXT_TRUE@.sh$(EXEEXT).log:
-@am__EXEEXT_TRUE@	@p='$<'; \
-@am__EXEEXT_TRUE@	$(am__set_b); \
-@am__EXEEXT_TRUE@	$(am__check_pre) $(SH_LOG_DRIVER) --test-name "$$f" \
-@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
-@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_SH_LOG_DRIVER_FLAGS) $(SH_LOG_DRIVER_FLAGS) -- $(SH_LOG_COMPILE) \
-@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
-check: check-am
-all-am: Makefile $(LTLIBRARIES) all-local
-installdirs:
-	for dir in "$(DESTDIR)$(libdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
-	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
-	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool clean-local \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-local distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-data-local
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-libLTLIBRARIES
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic \
-	maintainer-clean-local
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-local
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-libLTLIBRARIES uninstall-local
-
-.MAKE: check-am install-am install-strip
-
-.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-TESTS \
-	check-am clean clean-generic clean-libLTLIBRARIES \
-	clean-libtool clean-local cscopelist-am ctags ctags-am \
-	distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-local distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-data-local install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am \
-	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic maintainer-clean-local mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	mostlyclean-local pdf pdf-am ps ps-am recheck tags tags-am \
-	uninstall uninstall-am uninstall-libLTLIBRARIES \
-	uninstall-local
-
-
-# List all build rules defined by HDF5 Makefiles as "PHONY" targets here.
-# This tells the Makefiles that these targets are not files to be built but
-# commands that should be executed even if a file with the same name already
-# exists.
-.PHONY: build-check-clean build-check-p build-check-s build-lib build-progs \
-        build-tests check-clean check-install check-p check-s check-vfd \
-        install-doc lib progs tests uninstall-doc _exec_check-s _test help
-
-help:
-	@$(top_srcdir)/bin/makehelp
-
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-
-# Fortran module files can have different extensions and different names
-# (e.g., different capitalizations) on different platforms.  Write rules
-# for them explicitly rather than trying to teach automake about them.
-# They should be installed as headers and removed during clean.
-maintainer-clean-local: clean-local
-distclean-local: clean-local
-clean-local:
-	@if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \
-	  $(RM) *.$(F9XMODEXT);                                         \
-	fi
-
-install-data-local:
-	@if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \
-	  $(CP) $(top_builddir)/$(subdir)/*.$(F9XMODEXT) $(DESTDIR)$(includedir)/. ; \
-	fi
-
-uninstall-local:
-	@if test -n "$(F9XMODEXT)" -a "X$(F9XMODEXT)" != "Xo"; then      \
-	  if test -f "$(includedir)/hdf5.$(F9XMODEXT)" -o -f "$(DESTDIR)$(includedir)/HDF5.$(F9XMODEXT)"; then \
-	    set -x; $(RM) $(includedir)/*.$(F9XMODEXT);                 \
-	  fi;                                                           \
-	fi
-
-# Hardcode the dependencies of these files. There isn't a known way of
-# determining this automagically (like we do with the C files). So, when
-# doing a parallel make, some modules could be made way before the
-# modules they depend upon are actually made. *sigh*
-H5DSff.lo:          $(srcdir)/H5DSff.f90
-H5LTff.lo:          $(srcdir)/H5LTff.f90
-H5IMff.lo:          $(srcdir)/H5IMff.f90
-H5TBff.lo:          $(srcdir)/H5TBff.f90
-
-# lib/progs/tests targets recurse into subdirectories. build-* targets
-# build files in this directory.
-build-lib: $(LIB)
-build-progs: $(LIB) $(PROGS)
-build-tests: $(LIB) $(PROGS) $(chk_TESTS)
-
-# General rule for recursive building targets.
-# BUILT_SOURCES contain targets that need to be built before anything else
-# in the directory (e.g., for Fortran type detection)
-lib progs tests check-s check-p :: $(BUILT_SOURCES)
-	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
-	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X && test $$d != .; then                           \
-	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
-	    fi;                                                               \
-	done
-
-# General rule for recursive cleaning targets.  Like the rule above,
-# but doesn't require building BUILT_SOURCES.
-check-clean ::
-	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
-	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X && test $$d != .; then                           \
-	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
-	    fi;                                                               \
-	done
-
-# Tell Automake to build tests when the user types `make all' (this is
-# not its default behavior).  Also build EXTRA_LIB and EXTRA_PROG since
-# Automake won't build them automatically, either.
-all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(chk_TESTS)
-
-# make install-doc doesn't do anything outside of doc directory, but
-# Makefiles should recognize it.
-# UPDATE: docs no longer reside in this build tree, so this target
-# is depreciated.
-install-doc uninstall-doc:
-	@echo "Nothing to be done."
-
-# clean up files generated by tests so they can be re-run.
-build-check-clean:
-	$(RM) -rf $(CHECK_CLEANFILES)
-
-# run check-clean whenever mostlyclean is run
-mostlyclean-local: build-check-clean
-
-# check-install is just a synonym for installcheck
-check-install: installcheck
-
-# Run each test in order, passing $(TEST_FLAGS) to the program.
-# Since tests are done in a shell loop, "make -i" does apply inside it.
-# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
-# The timestamps give a rough idea how much time the tests use.
-#
-# Note that targets in chk_TESTS (defined above) will be built when the user
-# types 'make tests' or 'make check', but only programs in TEST_PROG,
-# TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
-check-TESTS: test
-
-test _test:
-	@$(MAKE) build-check-s
-	@$(MAKE) build-check-p
-
-# Actual execution of check-s.
-build-check-s: $(LIB) $(PROGS) $(chk_TESTS)
-	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
-	   echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
-	fi
-	@$(MAKE) $(AM_MAKEFLAGS) _exec_check-s
-	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
-	    echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
-	fi
-
-_exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH)
-
-# The dummy.chkexe here prevents the target from being
-# empty if there are no tests in the current directory.
-# $${log} is the log file.
-# $${tname} is the name of test.
-$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
-	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \
-	   tname=$(@:.chkexe_=)$(EXEEXT);\
-	   log=$(@:.chkexe_=.chklog); \
-	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \
-	      echo "No need to test $${tname} again."; \
-	   else \
-	      echo "============================" > $${log}; \
-	      if test "X$(FORTRAN_API)" = "Xyes"; then \
-	         echo "Fortran API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "Fortran API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(CXX_API)" = "Xyes"; then \
-	         echo "C++ API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "C++ API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log};\
-	      else \
-	         echo "Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "$(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      fi; \
-	      echo "============================" >> $${log}; \
-	      srcdir="$(srcdir)" \
-	         $(TIME) $(RUNEXEC) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \
-	         && touch $(@:.chkexe_=.chkexe) || \
-	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	         (cat $${log} && false) || exit 1; \
-	      echo "" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
-	      echo "============================" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
-	      cat $${log}; \
-	   fi; \
-	fi
-
-# The dummysh.chkexe here prevents the target from being
-# empty if there are no tests in the current directory.
-# $${log} is the log file.
-# $${tname} is the name of test.
-$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
-	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummysh.chkexe_"; then \
-	   cmd=$(@:.chkexe_=);\
-	   tname=`basename $$cmd`;\
-	   chkname=`basename $(@:.chkexe_=.chkexe)`;\
-	   log=`basename $(@:.chkexe_=.chklog)`; \
-	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer $${chkname} $$cmd $(SCRIPT_DEPEND); then \
-	      echo "No need to test $${tname} again."; \
-	   else \
-	      echo "============================" > $${log}; \
-	      if test "X$(FORTRAN_API)" = "Xyes"; then \
-	         echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(CXX_API)" = "Xyes"; then \
-	         echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      else \
-	         echo "Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      fi; \
-	      echo "============================" >> $${log}; \
-	      RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
-	      srcdir="$(srcdir)" \
-	         $(TIME) $(SHELL) $$cmd $(TEST_FLAGS) >> $${log} 2>&1 \
-	         && touch $${chkname} || \
-	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	         (cat $${log} && false) || exit 1; \
-	      echo "" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
-	      echo "============================" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
-	      cat $${log}; \
-	   fi; \
-	   echo "============================"; \
-	fi
-
-# Actual execution of check-p.
-build-check-p: $(LIB) $(PROGS) $(chk_TESTS)
-	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
-	   echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
-	fi
-	@if test -n "$(TEST_PROG_PARA)"; then                                \
-	    echo "**** Hint ****";                                            \
-	    echo "Parallel test files reside in the current directory"        \
-	         "by default.";                                               \
-	    echo "Set HDF5_PARAPREFIX to use another directory. E.g.,";       \
-	    echo "    HDF5_PARAPREFIX=/PFS/user/me";                          \
-	    echo "    export HDF5_PARAPREFIX";                                \
-	    echo "    make check";                                            \
-	    echo "**** end of Hint ****";                                     \
-	fi
-	@for test in $(TEST_PROG_PARA) dummy; do                             \
-	   if test $$test != dummy; then                                      \
-	      $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ \
-	      RUNEXEC="$(RUNPARALLEL)" || exit 1; \
-	   fi;                                                                \
-	done
-	@for test in $(TEST_SCRIPT_PARA) dummy; do                           \
-	  if test $$test != dummy; then                                      \
-	    $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ || exit 1; \
-	  fi;                                                                 \
-	done
-	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
-	    echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
-	fi
-
-# Run test with different Virtual File Driver
-check-vfd: $(LIB) $(PROGS) $(chk_TESTS)
-	@for vfd in $(VFD_LIST) dummy; do                                     \
-	    if test $$vfd != dummy; then                                      \
-	        echo "============================";                          \
-	        echo "Testing Virtual File Driver $$vfd";                     \
-	        echo "============================";                          \
-	        $(MAKE) $(AM_MAKEFLAGS) check-clean || exit 1;                \
-	        HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check || exit 1;    \
-	    fi;                                                               \
-	done
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/hl/fortran/src/hdf5_hl_fortrandll.def.in b/hl/fortran/src/hdf5_hl_fortrandll.def.in
new file mode 100644
index 0000000..b48cae3
--- /dev/null
+++ b/hl/fortran/src/hdf5_hl_fortrandll.def.in
@@ -0,0 +1,90 @@
+EXPORTS
+; H5DS
+H5DS_mp_H5DSSET_SCALE_F
+H5DS_mp_H5DSATTACH_SCALE_F
+H5DS_mp_H5DSDETACH_SCALE_F
+H5DS_mp_H5DSIS_ATTACHED_F
+H5DS_mp_H5DSIS_SCALE_F
+H5DS_mp_H5DSSET_LABEL_F
+H5DS_mp_H5DSGET_LABEL_F
+H5DS_mp_H5DSGET_SCALE_NAME_F
+H5DS_mp_H5DSGET_NUM_SCALES_F
+; H5IM
+H5IM_mp_H5IMMAKE_IMAGE_8BIT_F
+H5IM_mp_H5IMREAD_IMAGE_F
+H5IM_mp_H5IMMAKE_IMAGE_24BIT_F
+H5IM_mp_H5IMGET_IMAGE_INFO_F
+H5IM_mp_H5IMIS_IMAGE_F
+H5IM_mp_H5IMMAKE_PALETTE_F
+H5IM_mp_H5IMLINK_PALETTE_F
+H5IM_mp_H5IMUNLINK_PALETTE_F
+H5IM_mp_H5IMGET_NPALETTES_F
+H5IM_mp_H5IMGET_PALETTE_INFO_F
+H5IM_mp_H5IMGET_PALETTE_F
+H5IM_mp_H5IMIS_PALETTE_F
+; H5LT
+H5LT_CONST_mp_H5LTMAKE_DATASET_F_PTR
+H5LT_CONST_mp_H5LTMAKE_DATASET_F_INT1
+H5LT_CONST_mp_H5LTMAKE_DATASET_F_INT2
+H5LT_CONST_mp_H5LTMAKE_DATASET_F_INT3
+H5LT_CONST_mp_H5LTMAKE_DATASET_F_INT4
+H5LT_CONST_mp_H5LTMAKE_DATASET_F_INT5
+H5LT_CONST_mp_H5LTMAKE_DATASET_F_INT6
+H5LT_CONST_mp_H5LTMAKE_DATASET_F_INT7
+H5LT_CONST_mp_H5LTREAD_DATASET_F_PTR
+H5LT_CONST_mp_H5LTREAD_DATASET_F_INT1
+H5LT_CONST_mp_H5LTREAD_DATASET_F_INT2
+H5LT_CONST_mp_H5LTREAD_DATASET_F_INT3
+H5LT_CONST_mp_H5LTREAD_DATASET_F_INT4
+H5LT_CONST_mp_H5LTREAD_DATASET_F_INT5
+H5LT_CONST_mp_H5LTREAD_DATASET_F_INT6
+H5LT_CONST_mp_H5LTREAD_DATASET_F_INT7
+H5LT_CONST_mp_H5LTMAKE_DATASET_INT_F_1
+H5LT_CONST_mp_H5LTMAKE_DATASET_INT_F_2
+H5LT_CONST_mp_H5LTMAKE_DATASET_INT_F_3
+H5LT_CONST_mp_H5LTMAKE_DATASET_INT_F_4
+H5LT_CONST_mp_H5LTMAKE_DATASET_INT_F_5
+H5LT_CONST_mp_H5LTMAKE_DATASET_INT_F_6
+H5LT_CONST_mp_H5LTMAKE_DATASET_INT_F_7
+H5LT_CONST_mp_H5LTREAD_DATASET_INT_F_1
+H5LT_CONST_mp_H5LTREAD_DATASET_INT_F_2
+H5LT_CONST_mp_H5LTREAD_DATASET_INT_F_3
+H5LT_CONST_mp_H5LTREAD_DATASET_INT_F_4
+H5LT_CONST_mp_H5LTREAD_DATASET_INT_F_5
+H5LT_CONST_mp_H5LTREAD_DATASET_INT_F_6
+H5LT_CONST_mp_H5LTREAD_DATASET_INT_F_7
+H5LT_CONST_mp_H5LTMAKE_DATASET_STRING_F
+H5LT_CONST_mp_H5LTREAD_DATASET_STRING_F
+H5LT_CONST_mp_H5LTSET_ATTRIBUTE_F
+H5LT_CONST_mp_H5LTSET_ATTRIBUTE_INT_F
+H5LT_CONST_mp_H5LTSET_ATTRIBUTE_FLOAT_F
+H5LT_CONST_mp_H5LTSET_ATTRIBUTE_DOUBLE_F
+H5LT_CONST_mp_H5LTSET_ATTRIBUTE_STRING_F
+H5LT_CONST_mp_H5LTGET_ATTRIBUTE_F
+H5LT_CONST_mp_H5LTGET_ATTRIBUTE_INT_F
+H5LT_CONST_mp_H5LTGET_ATTRIBUTE_FLOAT_F
+H5LT_CONST_mp_H5LTGET_ATTRIBUTE_DOUBLE_F
+H5LT_CONST_mp_H5LTGET_ATTRIBUTE_STRING_F
+H5LT_CONST_mp_H5LTGET_DATASET_NDIMS_F
+H5LT_CONST_mp_H5LTFIND_DATASET_F
+H5LT_CONST_mp_H5LTGET_DATASET_INFO_F
+H5LT_CONST_mp_H5LTGET_ATTRIBUTE_NDIMS_F
+H5LT_CONST_mp_H5LTGET_ATTRIBUTE_INFO_F
+H5LT_CONST_mp_H5LTPATH_VALID_F
+; H5TB
+H5TB_CONST_mp_H5TBREAD_TABLE_F
+H5TB_CONST_mp_H5TBMAKE_TABLE_F90
+H5TB_CONST_mp_H5TBMAKE_TABLE_PTR_F
+H5TB_CONST_mp_H5TBWRITE_FIELD_NAME_F_INT
+H5TB_CONST_mp_H5TBWRITE_FIELD_NAME_F_STRING
+H5TB_CONST_mp_H5TBREAD_FIELD_NAME_F_INT
+H5TB_CONST_mp_H5TBREAD_FIELD_NAME_F_STRING
+H5TB_CONST_mp_H5TBWRITE_FIELD_INDEX_F_INT
+H5TB_CONST_mp_H5TBWRITE_FIELD_INDEX_F_STRING
+H5TB_CONST_mp_H5TBREAD_FIELD_INDEX_F_INT
+H5TB_CONST_mp_H5TBREAD_FIELD_INDEX_F_STRING
+H5TB_CONST_mp_H5TBINSERT_FIELD_F_INT
+H5TB_CONST_mp_H5TBINSERT_FIELD_F_STRING
+H5TB_CONST_mp_H5TBDELETE_FIELD_F
+H5TB_CONST_mp_H5TBGET_TABLE_INFO_F
+H5TB_CONST_mp_H5TBGET_FIELD_INFO_F
diff --git a/hl/fortran/test/CMakeLists.txt b/hl/fortran/test/CMakeLists.txt
index 55fb987..f78e52e 100644
--- a/hl/fortran/test/CMakeLists.txt
+++ b/hl/fortran/test/CMakeLists.txt
@@ -1,45 +1,51 @@
-cmake_minimum_required (VERSION 3.1.0)
-PROJECT (HDF5_HL_FORTRAN_TESTS C CXX Fortran)
+cmake_minimum_required (VERSION 3.18)
+project (HDF5_HL_FORTRAN_TESTS C Fortran)
 
 #-----------------------------------------------------------------------------
 # Add Tests
 #-----------------------------------------------------------------------------
-INCLUDE_DIRECTORIES (${CMAKE_Fortran_MODULE_DIRECTORY} ${HDF5_F90_BINARY_DIR} ${HDF5_F90_SRC_DIR}/src)
+set (H5_TESTS
+    tstds
+    tstlite
+    tstimage
+    tsttable
+)
 
-#-- Adding test for hl_f90_tstds
-add_executable (hl_f90_tstds tstds.f90)
-TARGET_NAMING (hl_f90_tstds ${LIB_TYPE})
-TARGET_FORTRAN_PROPERTIES (hl_f90_tstds ${LIB_TYPE} " " " ")
-target_link_libraries (hl_f90_tstds ${HDF5_HL_F90_LIB_TARGET} ${HDF5_F90_LIB_TARGET})
-target_include_directories (hl_f90_tstds PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY})
-set_target_properties (hl_f90_tstds PROPERTIES LINKER_LANGUAGE Fortran)
-set_target_properties (hl_f90_tstds PROPERTIES FOLDER test/hl/fortran)
+macro (ADD_H5_FORTRAN_EXE file)
+  add_executable (hl_f90_${file} ${file}.F90)
+  target_compile_options(hl_f90_${file}
+      PRIVATE
+          "${HDF5_CMAKE_Fortran_FLAGS}"
+          $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_COMPILE_FLAGS}>
+  )
+#  set_property(TARGET hl_f90_${file} APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"-SUBSYSTEM:CONSOLE">)
+#  set_property(TARGET hl_f90_${file} APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_LINK_FLAGS}>)
+  if(MSVC)
+    set_property(TARGET hl_f90_${file} PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE ${WIN_LINK_FLAGS}")
+  endif()
+  if (NOT BUILD_SHARED_LIBS)
+    target_include_directories (hl_f90_${file} PRIVATE "${CMAKE_Fortran_MODULE_DIRECTORY}/static;${HDF5_F90_BINARY_DIR};${HDF5_F90_SRC_DIR}/src")
+    target_link_libraries (hl_f90_${file} PRIVATE ${HDF5_HL_F90_LIB_TARGET} ${HDF5_F90_LIB_TARGET} ${HDF5_F90_TEST_LIB_TARGET})
+    set_target_properties (hl_f90_${file} PROPERTIES
+        LINKER_LANGUAGE Fortran
+        FOLDER test/hl/fortran
+        Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/static
+    )
+  else ()
+    target_include_directories (hl_f90_${file} PRIVATE "${CMAKE_Fortran_MODULE_DIRECTORY}/shared;${HDF5_F90_BINARY_DIR};${HDF5_F90_SRC_DIR}/src")
+    target_link_libraries (hl_f90_${file} PRIVATE ${HDF5_HL_F90_LIBSH_TARGET} ${HDF5_F90_LIBSH_TARGET} ${HDF5_F90_TEST_LIBSH_TARGET})
+    set_target_properties (hl_f90_${file} PROPERTIES
+        LINKER_LANGUAGE Fortran
+        FOLDER test/hl/fortran
+        Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/shared
+    )
+  endif ()
+endmacro ()
 
-#-- Adding test for hl_f90_tstlite
-add_executable (hl_f90_tstlite tstlite.f90)
-TARGET_NAMING (hl_f90_tstlite ${LIB_TYPE})
-TARGET_FORTRAN_PROPERTIES (hl_f90_tstlite ${LIB_TYPE} " " " ")
-target_link_libraries (hl_f90_tstlite ${HDF5_HL_F90_LIB_TARGET} ${HDF5_F90_LIB_TARGET})
-target_include_directories (hl_f90_tstlite PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY})
-set_target_properties (hl_f90_tstlite PROPERTIES LINKER_LANGUAGE Fortran)
-set_target_properties (hl_f90_tstlite PROPERTIES FOLDER test/hl/fortran)
+foreach (h5_test ${H5_TESTS})
+  ADD_H5_FORTRAN_EXE(${h5_test})
+endforeach ()
 
-#-- Adding test for hl_f90_tstimage
-add_executable (hl_f90_tstimage tstimage.f90)
-TARGET_NAMING (hl_f90_tstimage ${LIB_TYPE})
-TARGET_FORTRAN_PROPERTIES (hl_f90_tstimage ${LIB_TYPE} " " " ")
-target_link_libraries (hl_f90_tstimage  ${HDF5_HL_F90_LIB_TARGET} ${HDF5_F90_LIB_TARGET})
-target_include_directories (hl_f90_tstimage PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY})
-set_target_properties (hl_f90_tstimage PROPERTIES LINKER_LANGUAGE Fortran)
-set_target_properties (hl_f90_tstimage PROPERTIES FOLDER test/hl/fortran)
-
-#-- Adding test for hl_f90_tsttable
-add_executable (hl_f90_tsttable tsttable.f90)
-TARGET_NAMING (hl_f90_tsttable ${LIB_TYPE})
-TARGET_FORTRAN_PROPERTIES (hl_f90_tsttable ${LIB_TYPE} " " " ")
-target_link_libraries (hl_f90_tsttable ${HDF5_HL_F90_LIB_TARGET} ${HDF5_F90_LIB_TARGET})
-target_include_directories (hl_f90_tsttable PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY})
-set_target_properties (hl_f90_tsttable PROPERTIES LINKER_LANGUAGE Fortran)
-set_target_properties (hl_f90_tsttable PROPERTIES FOLDER test/hl/fortran)
-
-include (CMakeTests.cmake)
+if (HDF5_TEST_FORTRAN AND HDF5_TEST_SERIAL)
+  include (CMakeTests.cmake)
+endif ()
diff --git a/hl/fortran/test/CMakeTests.cmake b/hl/fortran/test/CMakeTests.cmake
index 3676d24..209186b 100644
--- a/hl/fortran/test/CMakeTests.cmake
+++ b/hl/fortran/test/CMakeTests.cmake
@@ -1,3 +1,14 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
 
 ##############################################################################
 ##############################################################################
@@ -5,29 +16,60 @@
 ##############################################################################
 ##############################################################################
 
+set (test_hl_fortran_CLEANFILES
+    dsetf1.h5
+    dsetf2.h5
+    dsetf3.h5
+    dsetf4.h5
+    dsetf5.h5
+    f1img.h5
+    f1tab.h5
+    f2tab.h5
+    tstds.h5
+)
+
 # Remove any output file left over from previous test run
 add_test (
     NAME HL_FORTRAN_test-clear-objects
     COMMAND    ${CMAKE_COMMAND}
-        -E remove 
-        dsetf1.h5
-        dsetf2.h5
-        dsetf3.h5
-        dsetf4.h5
-        dsetf5.h5
-        f1img.h5
-        f1tab.h5
-        tstds.h5
+        -E remove ${test_hl_fortran_CLEANFILES}
+)
+set_tests_properties (HL_FORTRAN_test-clear-objects PROPERTIES
+    FIXTURES_SETUP clear_HL_FORTRAN_test
+    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+)
+add_test (
+    NAME HL_FORTRAN_test-clean-objects
+    COMMAND    ${CMAKE_COMMAND}
+        -E remove ${test_hl_fortran_CLEANFILES}
+)
+set_tests_properties (HL_FORTRAN_test-clean-objects PROPERTIES
+    FIXTURES_CLEANUP clear_HL_FORTRAN_test
+    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
 )
 
-add_test (NAME HL_FORTRAN_f90_tstds COMMAND $<TARGET_FILE:hl_f90_tstds>)
-set_tests_properties (HL_FORTRAN_f90_tstds PROPERTIES DEPENDS HL_FORTRAN_test-clear-objects)
-
-add_test (NAME HL_FORTRAN_f90_tstlite COMMAND $<TARGET_FILE:hl_f90_tstlite>)
-set_tests_properties (HL_FORTRAN_f90_tstlite PROPERTIES DEPENDS HL_FORTRAN_test-clear-objects)
-
-add_test (NAME HL_FORTRAN_f90_tstimage COMMAND $<TARGET_FILE:hl_f90_tstimage>)
-set_tests_properties (HL_FORTRAN_f90_tstimage PROPERTIES DEPENDS HL_FORTRAN_test-clear-objects)
+macro (ADD_H5_FORTRAN_TEST file)
+  if (HDF5_ENABLE_USING_MEMCHECKER)
+    add_test (NAME HL_FORTRAN_f90_${file} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:hl_f90_${file}>)
+  else ()
+    add_test (NAME HL_FORTRAN_f90_${file} COMMAND "${CMAKE_COMMAND}"
+        -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
+        -D "TEST_PROGRAM=$<TARGET_FILE:hl_f90_${file}>"
+        -D "TEST_ARGS:STRING="
+        -D "TEST_EXPECT=0"
+        -D "TEST_SKIP_COMPARE=TRUE"
+        -D "TEST_OUTPUT=hl_f90_${file}.txt"
+        #-D "TEST_REFERENCE=hl_f90_${file}.out"
+        -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+        -P "${HDF_RESOURCES_DIR}/runTest.cmake"
+    )
+  endif ()
+  set_tests_properties (HL_FORTRAN_f90_${file} PROPERTIES
+      FIXTURES_REQUIRED clear_HL_FORTRAN_test
+      WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+  )
+endmacro ()
 
-add_test (NAME HL_FORTRAN_f90_tsttable COMMAND $<TARGET_FILE:hl_f90_tsttable>)
-set_tests_properties (HL_FORTRAN_f90_tsttable PROPERTIES DEPENDS HL_FORTRAN_test-clear-objects)
+foreach (h5_test ${H5_TESTS})
+  ADD_H5_FORTRAN_TEST(${h5_test})
+endforeach ()
diff --git a/hl/fortran/test/Makefile.am b/hl/fortran/test/Makefile.am
index fa3a803..a74f8ef 100644
--- a/hl/fortran/test/Makefile.am
+++ b/hl/fortran/test/Makefile.am
@@ -1,16 +1,13 @@
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 #
 ##
 ## Makefile.am
@@ -22,7 +19,7 @@
 include $(top_srcdir)/config/commence.am
 
 AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_srcdir)/hl/src
-AM_FCFLAGS+=-I$(top_builddir)/fortran/src -I$(top_builddir)/hl/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/hl/fortran/src
+AM_FCFLAGS+=-I$(top_builddir)/fortran/src -I$(top_builddir)/hl/fortran/src -I$(top_builddir)/fortran/test $(F9XMODFLAG)$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/test $(F9XMODFLAG)$(top_builddir)/hl/fortran/src
 
 # Some Fortran compilers can't build shared libraries, so sometimes we
 # need to make sure the Fortran programs link against the static version
@@ -36,19 +33,32 @@ endif
 TEST_PROG=tstds tstlite tstimage tsttable
 check_PROGRAMS=$(TEST_PROG)
 
-LDADD= $(LIBH5F_HL) $(LIBH5F) $(LIBH5_HL)  $(LIBHDF5)
+LIBOBJS=$(top_builddir)/fortran/test/tf_gen.o
+
+LDADD=$(LIBOBJS) $(LIBH5F_HL) $(LIBH5F) $(LIBH5_HL)  $(LIBHDF5)
 
 # Source files for the programs
-tstds_SOURCES=tstds.f90
-tstlite_SOURCES=tstlite.f90
-tstimage_SOURCES=tstimage.f90
-tsttable_SOURCES=tsttable.f90
+tstds_SOURCES=tstds.F90
+tstlite_SOURCES=tstlite.F90
+tstimage_SOURCES=tstimage.F90
+tsttable_SOURCES=tsttable.F90
 
 # Temporary files.
-CHECK_CLEANFILES+=dsetf[1-5].h5 f1img.h5 f1tab.h5 tstds.h5
+CHECK_CLEANFILES+=dsetf[1-5].h5 f1img.h5 f[1-2]tab.h5 tstds.h5
+
+# Fortran module files can have different extensions and different names
+# (e.g., different capitalizations) on different platforms.  Write rules
+# for them explicitly rather than trying to teach automake about them.
+# They should be installed as headers and removed during clean.
+maintainer-clean-local: clean-local
+distclean-local: clean-local
+clean-local:
+	@if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \
+	  $(RM) *.$(F9XMODEXT); \
+	fi
 
 # Mark this directory as part of the Fortran API (this affects output
 # from tests in conclude.am)
 FORTRAN_API=yes
 
-include $(top_srcdir)/config/conclude.am
+include $(top_srcdir)/config/conclude_fc.am
diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in
deleted file mode 100644
index bb72f29..0000000
--- a/hl/fortran/test/Makefile.in
+++ /dev/null
@@ -1,1378 +0,0 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-#
-#
-# HDF5 High-Level Fortran Makefile(.in)
-VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-DIST_COMMON = $(top_srcdir)/config/commence.am \
-	$(top_srcdir)/config/conclude.am $(srcdir)/Makefile.in \
-	$(srcdir)/Makefile.am $(top_srcdir)/bin/mkinstalldirs \
-	$(top_srcdir)/bin/test-driver
-
-# Some Fortran compilers can't build shared libraries, so sometimes we
-# need to make sure the Fortran programs link against the static version
-# of the HDF5 library.  We do this by passing the -static flag to the linker.
-@FORTRAN_SHARED_CONDITIONAL_FALSE@am__append_1 = -static
-check_PROGRAMS = $(am__EXEEXT_1)
-TESTS = $(am__EXEEXT_1)
-subdir = hl/fortran/test
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/aclocal_cxx.m4 \
-	$(top_srcdir)/m4/aclocal_fc.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/src/H5config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__EXEEXT_1 = tstds$(EXEEXT) tstlite$(EXEEXT) tstimage$(EXEEXT) \
-	tsttable$(EXEEXT)
-am_tstds_OBJECTS = tstds.$(OBJEXT)
-tstds_OBJECTS = $(am_tstds_OBJECTS)
-tstds_LDADD = $(LDADD)
-tstds_DEPENDENCIES = $(LIBH5F_HL) $(LIBH5F) $(LIBH5_HL) $(LIBHDF5)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 = 
-am_tstimage_OBJECTS = tstimage.$(OBJEXT)
-tstimage_OBJECTS = $(am_tstimage_OBJECTS)
-tstimage_LDADD = $(LDADD)
-tstimage_DEPENDENCIES = $(LIBH5F_HL) $(LIBH5F) $(LIBH5_HL) $(LIBHDF5)
-am_tstlite_OBJECTS = tstlite.$(OBJEXT)
-tstlite_OBJECTS = $(am_tstlite_OBJECTS)
-tstlite_LDADD = $(LDADD)
-tstlite_DEPENDENCIES = $(LIBH5F_HL) $(LIBH5F) $(LIBH5_HL) $(LIBHDF5)
-am_tsttable_OBJECTS = tsttable.$(OBJEXT)
-tsttable_OBJECTS = $(am_tsttable_OBJECTS)
-tsttable_LDADD = $(LDADD)
-tsttable_DEPENDENCIES = $(LIBH5F_HL) $(LIBH5F) $(LIBH5_HL) $(LIBHDF5)
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
-FCCOMPILE = $(FC) $(AM_FCFLAGS) $(FCFLAGS)
-LTFCCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=FC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(FC) $(AM_FCFLAGS) $(FCFLAGS)
-AM_V_FC = $(am__v_FC_@AM_V@)
-am__v_FC_ = $(am__v_FC_@AM_DEFAULT_V@)
-am__v_FC_0 = @echo "  FC      " $@;
-am__v_FC_1 = 
-FCLD = $(FC)
-FCLINK = $(LIBTOOL) $(AM_V_lt) --tag=FC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(FCLD) $(AM_FCFLAGS) $(FCFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_FCLD = $(am__v_FCLD_@AM_V@)
-am__v_FCLD_ = $(am__v_FCLD_@AM_DEFAULT_V@)
-am__v_FCLD_0 = @echo "  FCLD    " $@;
-am__v_FCLD_1 = 
-SOURCES = $(tstds_SOURCES) $(tstimage_SOURCES) $(tstlite_SOURCES) \
-	$(tsttable_SOURCES)
-DIST_SOURCES = $(tstds_SOURCES) $(tstimage_SOURCES) $(tstlite_SOURCES) \
-	$(tsttable_SOURCES)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-am__tty_colors_dummy = \
-  mgn= red= grn= lgn= blu= brg= std=; \
-  am__color_tests=no
-am__tty_colors = { \
-  $(am__tty_colors_dummy); \
-  if test "X$(AM_COLOR_TESTS)" = Xno; then \
-    am__color_tests=no; \
-  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
-    am__color_tests=yes; \
-  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
-    am__color_tests=yes; \
-  fi; \
-  if test $$am__color_tests = yes; then \
-    red='[0;31m'; \
-    grn='[0;32m'; \
-    lgn='[1;32m'; \
-    blu='[1;34m'; \
-    mgn='[0;35m'; \
-    brg='[1m'; \
-    std='[m'; \
-  fi; \
-}
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__recheck_rx = ^[ 	]*:recheck:[ 	]*
-am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
-am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
-# A command that, given a newline-separated list of test names on the
-# standard input, print the name of the tests that are to be re-run
-# upon "make recheck".
-am__list_recheck_tests = $(AWK) '{ \
-  recheck = 1; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-        { \
-          if ((getline line2 < ($$0 ".log")) < 0) \
-	    recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
-        { \
-          recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
-        { \
-          break; \
-        } \
-    }; \
-  if (recheck) \
-    print $$0; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# A command that, given a newline-separated list of test names on the
-# standard input, create the global log from their .trs and .log files.
-am__create_global_log = $(AWK) ' \
-function fatal(msg) \
-{ \
-  print "fatal: making $@: " msg | "cat >&2"; \
-  exit 1; \
-} \
-function rst_section(header) \
-{ \
-  print header; \
-  len = length(header); \
-  for (i = 1; i <= len; i = i + 1) \
-    printf "="; \
-  printf "\n\n"; \
-} \
-{ \
-  copy_in_global_log = 1; \
-  global_test_result = "RUN"; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-         fatal("failed to read from " $$0 ".trs"); \
-      if (line ~ /$(am__global_test_result_rx)/) \
-        { \
-          sub("$(am__global_test_result_rx)", "", line); \
-          sub("[ 	]*$$", "", line); \
-          global_test_result = line; \
-        } \
-      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
-        copy_in_global_log = 0; \
-    }; \
-  if (copy_in_global_log) \
-    { \
-      rst_section(global_test_result ": " $$0); \
-      while ((rc = (getline line < ($$0 ".log"))) != 0) \
-      { \
-        if (rc < 0) \
-          fatal("failed to read from " $$0 ".log"); \
-        print line; \
-      }; \
-      printf "\n"; \
-    }; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# Restructured Text title.
-am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
-# Solaris 10 'make', and several other traditional 'make' implementations,
-# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
-# by disabling -e (using the XSI extension "set +e") if it's set.
-am__sh_e_setup = case $$- in *e*) set +e;; esac
-# Default flags passed to test drivers.
-am__common_driver_flags = \
-  --color-tests "$$am__color_tests" \
-  --enable-hard-errors "$$am__enable_hard_errors" \
-  --expect-failure "$$am__expect_failure"
-# To be inserted before the command running the test.  Creates the
-# directory for the log if needed.  Stores in $dir the directory
-# containing $f, in $tst the test, in $log the log.  Executes the
-# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
-# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
-# will run the test scripts (or their associated LOG_COMPILER, if
-# thy have one).
-am__check_pre = \
-$(am__sh_e_setup);					\
-$(am__vpath_adj_setup) $(am__vpath_adj)			\
-$(am__tty_colors);					\
-srcdir=$(srcdir); export srcdir;			\
-case "$@" in						\
-  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
-    *) am__odir=.;; 					\
-esac;							\
-test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
-  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
-if test -f "./$$f"; then dir=./;			\
-elif test -f "$$f"; then dir=;				\
-else dir="$(srcdir)/"; fi;				\
-tst=$$dir$$f; log='$@'; 				\
-if test -n '$(DISABLE_HARD_ERRORS)'; then		\
-  am__enable_hard_errors=no; 				\
-else							\
-  am__enable_hard_errors=yes; 				\
-fi; 							\
-case " $(XFAIL_TESTS) " in				\
-  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
-    am__expect_failure=yes;;				\
-  *)							\
-    am__expect_failure=no;;				\
-esac; 							\
-$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
-# A shell command to get the names of the tests scripts with any registered
-# extension removed (i.e., equivalently, the names of the test logs, with
-# the '.log' extension removed).  The result is saved in the shell variable
-# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
-# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
-# since that might cause problem with VPATH rewrites for suffix-less tests.
-# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
-am__set_TESTS_bases = \
-  bases='$(TEST_LOGS)'; \
-  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
-  bases=`echo $$bases`
-RECHECK_LOGS = $(TEST_LOGS)
-AM_RECURSIVE_TARGETS = check recheck
-TEST_SUITE_LOG = test-suite.log
-LOG_DRIVER = $(SHELL) $(top_srcdir)/bin/test-driver
-LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
-am__set_b = \
-  case '$@' in \
-    */*) \
-      case '$*' in \
-        */*) b='$*';; \
-          *) b=`echo '$@' | sed 's/\.log$$//'`; \
-       esac;; \
-    *) \
-      b='$*';; \
-  esac
-am__test_logs1 = $(TESTS:=.log)
-am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
-TEST_LOGS = $(am__test_logs2:.sh.log=.log)
-SH_LOG_DRIVER = $(SHELL) $(top_srcdir)/bin/test-driver
-SH_LOG_COMPILE = $(SH_LOG_COMPILER) $(AM_SH_LOG_FLAGS) $(SH_LOG_FLAGS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
-AMTAR = @AMTAR@
-
-# H5_CFLAGS holds flags that should be used when building hdf5,
-# but which should not be exported to h5cc for building other programs.
-# AM_CFLAGS is an automake construct which should be used by Makefiles 
-# instead of CFLAGS, as CFLAGS is reserved solely for the user to define.
-# This applies to FCFLAGS, CXXFLAGS, CPPFLAGS, and LDFLAGS as well.
-AM_CFLAGS = @AM_CFLAGS@ @H5_CFLAGS@
-AM_CPPFLAGS = @AM_CPPFLAGS@ @H5_CPPFLAGS@ -I$(top_srcdir)/src \
-	-I$(top_builddir)/src -I$(top_srcdir)/hl/src
-AM_CXXFLAGS = @AM_CXXFLAGS@ @H5_CXXFLAGS@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@ -I$(top_builddir)/fortran/src \
-	-I$(top_builddir)/hl/fortran/src \
-	$(F9XMODFLAG)$(top_builddir)/fortran/src \
-	$(F9XMODFLAG)$(top_builddir)/hl/fortran/src
-AM_LDFLAGS = @AM_LDFLAGS@ @H5_LDFLAGS@ $(am__append_1)
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BYTESEX = @BYTESEX@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CC_VERSION = @CC_VERSION@
-CFLAGS = @CFLAGS@
-CLEARFILEBUF = @CLEARFILEBUF@
-CODESTACK = @CODESTACK@
-CONFIG_DATE = @CONFIG_DATE@
-CONFIG_MODE = @CONFIG_MODE@
-CONFIG_USER = @CONFIG_USER@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CXX_VERSION = @CXX_VERSION@
-CYGPATH_W = @CYGPATH_W@
-DEBUG_PKG = @DEBUG_PKG@
-DEFAULT_API_VERSION = @DEFAULT_API_VERSION@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
-DIRECT_VFD = @DIRECT_VFD@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-EXTERNAL_FILTERS = @EXTERNAL_FILTERS@
-
-# Make sure that these variables are exported to the Makefiles
-F9XMODEXT = @F9XMODEXT@
-F9XMODFLAG = @F9XMODFLAG@
-F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
-FC = @FC@
-FC2003 = @FC2003@
-FCFLAGS = @FCFLAGS@
-FCFLAGS_f90 = @FCFLAGS_f90@
-FCLIBS = @FCLIBS@
-FC_VERSION = @FC_VERSION@
-FGREP = @FGREP@
-FSEARCH_DIRS = @FSEARCH_DIRS@
-GREP = @GREP@
-H5_CFLAGS = @H5_CFLAGS@
-H5_CPPFLAGS = @H5_CPPFLAGS@
-H5_CXXFLAGS = @H5_CXXFLAGS@
-H5_CXX_SHARED = @H5_CXX_SHARED@
-H5_FCFLAGS = @H5_FCFLAGS@
-H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@
-H5_LDFLAGS = @H5_LDFLAGS@
-H5_LONE_COLON = @H5_LONE_COLON@
-H5_VERSION = @H5_VERSION@
-HADDR_T = @HADDR_T@
-HAVE_DMALLOC = @HAVE_DMALLOC@
-HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@
-HAVE_PTHREAD = @HAVE_PTHREAD@
-HDF5_HL = @HDF5_HL@
-HDF5_INTERFACES = @HDF5_INTERFACES@
-HDF_CXX = @HDF_CXX@
-HDF_FORTRAN = @HDF_FORTRAN@
-HDF_FORTRAN2003 = @HDF_FORTRAN2003@
-HID_T = @HID_T@
-HL = @HL@
-HL_FOR = @HL_FOR@
-HSIZE_T = @HSIZE_T@
-HSSIZE_T = @HSSIZE_T@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTRUMENT = @INSTRUMENT@
-INSTRUMENT_LIBRARY = @INSTRUMENT_LIBRARY@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LL_PATH = @LL_PATH@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_STATIC_EXEC = @LT_STATIC_EXEC@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MPE = @MPE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJECT_NAMELEN_DEFAULT_F = @OBJECT_NAMELEN_DEFAULT_F@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PARALLEL = @PARALLEL@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-RANLIB = @RANLIB@
-ROOT = @ROOT@
-RUNPARALLEL = @RUNPARALLEL@
-RUNSERIAL = @RUNSERIAL@
-R_INTEGER = @R_INTEGER@
-R_LARGE = @R_LARGE@
-SEARCH = @SEARCH@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SIZE_T = @SIZE_T@
-STATIC_EXEC = @STATIC_EXEC@
-STATIC_SHARED = @STATIC_SHARED@
-STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@
-STRIP = @STRIP@
-TESTPARALLEL = @TESTPARALLEL@
-THREADSAFE = @THREADSAFE@
-TIME = @TIME@
-TR = @TR@
-TRACE_API = @TRACE_API@
-UNAME_INFO = @UNAME_INFO@
-USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
-USE_FILTER_SZIP = @USE_FILTER_SZIP@
-USINGMEMCHECKER = @USINGMEMCHECKER@
-VERSION = @VERSION@
-WORDS_BIGENDIAN = @WORDS_BIGENDIAN@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_FC = @ac_ct_FC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-
-# Install directories that automake doesn't know about
-docdir = $(exec_prefix)/doc
-dvidir = @dvidir@
-enable_shared = @enable_shared@
-enable_static = @enable_static@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-
-# Shell commands used in Makefiles
-RM = rm -f
-CP = cp
-
-# Some machines need a command to run executables; this is that command
-# so that our tests will run.
-# We use RUNEXEC instead of RUNSERIAL directly because it may be that
-# some tests need to be run with a different command.  Older versions
-# of the makefiles used the command
-# $(LIBTOOL) --mode=execute
-# in some directories, for instance.
-RUNEXEC = $(RUNSERIAL)
-
-# Libraries to link to while building
-LIBHDF5 = $(top_builddir)/src/libhdf5.la
-LIBH5TEST = $(top_builddir)/test/libh5test.la
-LIBH5F = $(top_builddir)/fortran/src/libhdf5_fortran.la
-LIBH5FTEST = $(top_builddir)/fortran/test/libh5test_fortran.la
-LIBH5CPP = $(top_builddir)/c++/src/libhdf5_cpp.la
-LIBH5TOOLS = $(top_builddir)/tools/lib/libh5tools.la
-LIBH5_HL = $(top_builddir)/hl/src/libhdf5_hl.la
-LIBH5F_HL = $(top_builddir)/hl/fortran/src/libhdf5hl_fortran.la
-LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
-
-# Note that in svn revision 19400 the '/' after DESTDIR in H5* variables below  
-# has been removed. According to the official description of DESTDIR by Gnu at 
-# http://www.gnu.org/prep/standards/html_node/DESTDIR.html, DESTDIR is 
-# prepended to the normal and complete install path that it precedes for the 
-# purpose of installing in a temporary directory which is useful for building 
-# rpms and other packages.  The '/' after ${DESTDIR} will be followed by another 
-# '/' at the beginning of the normal install path.  When DESTDIR is empty the  
-# path then begins with '//', which is incorrect and causes problems at least for 
-# Cygwin.   
-
-# Scripts used to build examples
-# If only shared libraries have been installed, have h5cc build examples with
-# shared libraries instead of static libraries
-H5CC = ${DESTDIR}$(bindir)/h5cc
-H5CC_PP = ${DESTDIR}$(bindir)/h5pcc
-H5FC = ${DESTDIR}$(bindir)/h5fc
-H5FC_PP = ${DESTDIR}$(bindir)/h5pfc
-H5CPP = ${DESTDIR}$(bindir)/h5c++
-ACLOCAL_AMFLAGS = "-I m4"
-
-# The trace script; this is used on source files from the C library to
-# insert tracing macros.
-TRACE = perl $(top_srcdir)/bin/trace
-
-# .chkexe files are used to mark tests that have run successfully.
-# .chklog files are output from those tests.
-# *.clog and *.clog2 are from the MPE option.
-
-# Temporary files.
-CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 dsetf[1-5].h5 \
-	f1img.h5 f1tab.h5 tstds.h5
-
-# Our main target, the test programs
-TEST_PROG = tstds tstlite tstimage tsttable
-LDADD = $(LIBH5F_HL) $(LIBH5F) $(LIBH5_HL)  $(LIBHDF5)
-
-# Source files for the programs
-tstds_SOURCES = tstds.f90
-tstlite_SOURCES = tstlite.f90
-tstimage_SOURCES = tstimage.f90
-tsttable_SOURCES = tsttable.f90
-
-# Mark this directory as part of the Fortran API (this affects output
-# from tests in conclude.am)
-FORTRAN_API = yes
-
-# Automake needs to be taught how to build lib, progs, and tests targets.
-# These will be filled in automatically for the most part (e.g.,
-# lib_LIBRARIES are built for lib target), but EXTRA_LIB, EXTRA_PROG, and
-# EXTRA_TEST variables are supplied to allow the user to force targets to
-# be built at certain times. 
-LIB = $(lib_LIBRARIES) $(lib_LTLIBRARIES) $(noinst_LIBRARIES)                 \
-      $(noinst_LTLIBRARIES) $(check_LIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LIB)
-
-PROGS = $(bin_PROGRAMS) $(bin_SCRIPTS) $(noinst_PROGRAMS) $(noinst_SCRIPTS)   \
-        $(EXTRA_PROG)
-
-chk_TESTS = $(check_PROGRAMS) $(check_SCRIPTS) $(EXTRA_TEST) 
-TEST_EXTENSIONS = .sh
-SH_LOG_COMPILER = $(SHELL)
-AM_SH_LOG_FLAGS = 
-TEST_PROG_CHKEXE = $(TEST_PROG:=.chkexe_)
-TEST_PROG_PARA_CHKEXE = $(TEST_PROG_PARA:=.chkexe_)
-TEST_SCRIPT_CHKSH = $(TEST_SCRIPT:=.chkexe_)
-TEST_SCRIPT_PARA_CHKSH = $(TEST_SCRIPT_PARA:=.chkexe_)
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .f90 .lo .log .o .obj .sh .sh$(EXEEXT) .trs
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign hl/fortran/test/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign hl/fortran/test/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-$(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am:
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-checkPROGRAMS:
-	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-
-tstds$(EXEEXT): $(tstds_OBJECTS) $(tstds_DEPENDENCIES) $(EXTRA_tstds_DEPENDENCIES) 
-	@rm -f tstds$(EXEEXT)
-	$(AM_V_FCLD)$(FCLINK) $(tstds_OBJECTS) $(tstds_LDADD) $(LIBS)
-
-tstimage$(EXEEXT): $(tstimage_OBJECTS) $(tstimage_DEPENDENCIES) $(EXTRA_tstimage_DEPENDENCIES) 
-	@rm -f tstimage$(EXEEXT)
-	$(AM_V_FCLD)$(FCLINK) $(tstimage_OBJECTS) $(tstimage_LDADD) $(LIBS)
-
-tstlite$(EXEEXT): $(tstlite_OBJECTS) $(tstlite_DEPENDENCIES) $(EXTRA_tstlite_DEPENDENCIES) 
-	@rm -f tstlite$(EXEEXT)
-	$(AM_V_FCLD)$(FCLINK) $(tstlite_OBJECTS) $(tstlite_LDADD) $(LIBS)
-
-tsttable$(EXEEXT): $(tsttable_OBJECTS) $(tsttable_DEPENDENCIES) $(EXTRA_tsttable_DEPENDENCIES) 
-	@rm -f tsttable$(EXEEXT)
-	$(AM_V_FCLD)$(FCLINK) $(tsttable_OBJECTS) $(tsttable_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-.f90.o:
-	$(AM_V_FC)$(FCCOMPILE) -c -o $@ $(FCFLAGS_f90) $<
-
-.f90.obj:
-	$(AM_V_FC)$(FCCOMPILE) -c -o $@ $(FCFLAGS_f90) `$(CYGPATH_W) '$<'`
-
-.f90.lo:
-	$(AM_V_FC)$(LTFCCOMPILE) -c -o $@ $(FCFLAGS_f90) $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: ctags-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-# Recover from deleted '.trs' file; this should ensure that
-# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
-# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
-# to avoid problems with "make -n".
-.log.trs:
-	rm -f $< $@
-	$(MAKE) $(AM_MAKEFLAGS) $<
-
-# Leading 'am--fnord' is there to ensure the list of targets does not
-# expand to empty, as could happen e.g. with make check TESTS=''.
-am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
-am--force-recheck:
-	@:
-
-$(TEST_SUITE_LOG): $(TEST_LOGS)
-	@$(am__set_TESTS_bases); \
-	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
-	redo_bases=`for i in $$bases; do \
-	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
-	            done`; \
-	if test -n "$$redo_bases"; then \
-	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
-	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
-	  if $(am__make_dryrun); then :; else \
-	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
-	  fi; \
-	fi; \
-	if test -n "$$am__remaking_logs"; then \
-	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
-	       "recursion detected" >&2; \
-	else \
-	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
-	fi; \
-	if $(am__make_dryrun); then :; else \
-	  st=0;  \
-	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
-	  for i in $$redo_bases; do \
-	    test -f $$i.trs && test -r $$i.trs \
-	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
-	    test -f $$i.log && test -r $$i.log \
-	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
-	  done; \
-	  test $$st -eq 0 || exit 1; \
-	fi
-	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
-	ws='[ 	]'; \
-	results=`for b in $$bases; do echo $$b.trs; done`; \
-	test -n "$$results" || results=/dev/null; \
-	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
-	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
-	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
-	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
-	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
-	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
-	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
-	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
-	  success=true; \
-	else \
-	  success=false; \
-	fi; \
-	br='==================='; br=$$br$$br$$br$$br; \
-	result_count () \
-	{ \
-	    if test x"$$1" = x"--maybe-color"; then \
-	      maybe_colorize=yes; \
-	    elif test x"$$1" = x"--no-color"; then \
-	      maybe_colorize=no; \
-	    else \
-	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
-	    fi; \
-	    shift; \
-	    desc=$$1 count=$$2; \
-	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
-	      color_start=$$3 color_end=$$std; \
-	    else \
-	      color_start= color_end=; \
-	    fi; \
-	    echo "$${color_start}# $$desc $$count$${color_end}"; \
-	}; \
-	create_testsuite_report () \
-	{ \
-	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
-	  result_count $$1 "PASS: " $$pass  "$$grn"; \
-	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
-	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
-	  result_count $$1 "FAIL: " $$fail  "$$red"; \
-	  result_count $$1 "XPASS:" $$xpass "$$red"; \
-	  result_count $$1 "ERROR:" $$error "$$mgn"; \
-	}; \
-	{								\
-	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
-	    $(am__rst_title);						\
-	  create_testsuite_report --no-color;				\
-	  echo;								\
-	  echo ".. contents:: :depth: 2";				\
-	  echo;								\
-	  for b in $$bases; do echo $$b; done				\
-	    | $(am__create_global_log);					\
-	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
-	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
-	if $$success; then						\
-	  col="$$grn";							\
-	 else								\
-	  col="$$red";							\
-	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
-	fi;								\
-	echo "$${col}$$br$${std}"; 					\
-	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
-	echo "$${col}$$br$${std}"; 					\
-	create_testsuite_report --maybe-color;				\
-	echo "$$col$$br$$std";						\
-	if $$success; then :; else					\
-	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
-	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
-	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
-	  fi;								\
-	  echo "$$col$$br$$std";					\
-	fi;								\
-	$$success || exit 1
-recheck: all $(check_PROGRAMS)
-	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-	@set +e; $(am__set_TESTS_bases); \
-	bases=`for i in $$bases; do echo $$i; done \
-	         | $(am__list_recheck_tests)` || exit 1; \
-	log_list=`for i in $$bases; do echo $$i.log; done`; \
-	log_list=`echo $$log_list`; \
-	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
-	        am__force_recheck=am--force-recheck \
-	        TEST_LOGS="$$log_list"; \
-	exit $$?
-tstds.log: tstds$(EXEEXT)
-	@p='tstds$(EXEEXT)'; \
-	b='tstds'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-tstlite.log: tstlite$(EXEEXT)
-	@p='tstlite$(EXEEXT)'; \
-	b='tstlite'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-tstimage.log: tstimage$(EXEEXT)
-	@p='tstimage$(EXEEXT)'; \
-	b='tstimage'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-tsttable.log: tsttable$(EXEEXT)
-	@p='tsttable$(EXEEXT)'; \
-	b='tsttable'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-.sh.log:
-	@p='$<'; \
-	$(am__set_b); \
-	$(am__check_pre) $(SH_LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_SH_LOG_DRIVER_FLAGS) $(SH_LOG_DRIVER_FLAGS) -- $(SH_LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-@am__EXEEXT_TRUE@.sh$(EXEEXT).log:
-@am__EXEEXT_TRUE@	@p='$<'; \
-@am__EXEEXT_TRUE@	$(am__set_b); \
-@am__EXEEXT_TRUE@	$(am__check_pre) $(SH_LOG_DRIVER) --test-name "$$f" \
-@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
-@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_SH_LOG_DRIVER_FLAGS) $(SH_LOG_DRIVER_FLAGS) -- $(SH_LOG_COMPILE) \
-@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
-	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
-check: check-am
-all-am: Makefile all-local
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
-	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
-	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-local
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: check-am install-am install-strip
-
-.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-TESTS \
-	check-am clean clean-checkPROGRAMS clean-generic clean-libtool \
-	cscopelist-am ctags ctags-am distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
-	pdf-am ps ps-am recheck tags tags-am uninstall uninstall-am
-
-
-# List all build rules defined by HDF5 Makefiles as "PHONY" targets here.
-# This tells the Makefiles that these targets are not files to be built but
-# commands that should be executed even if a file with the same name already
-# exists.
-.PHONY: build-check-clean build-check-p build-check-s build-lib build-progs \
-        build-tests check-clean check-install check-p check-s check-vfd \
-        install-doc lib progs tests uninstall-doc _exec_check-s _test help
-
-help:
-	@$(top_srcdir)/bin/makehelp
-
-# lib/progs/tests targets recurse into subdirectories. build-* targets
-# build files in this directory.
-build-lib: $(LIB)
-build-progs: $(LIB) $(PROGS)
-build-tests: $(LIB) $(PROGS) $(chk_TESTS)
-
-# General rule for recursive building targets.
-# BUILT_SOURCES contain targets that need to be built before anything else
-# in the directory (e.g., for Fortran type detection)
-lib progs tests check-s check-p :: $(BUILT_SOURCES)
-	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
-	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X && test $$d != .; then                           \
-	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
-	    fi;                                                               \
-	done
-
-# General rule for recursive cleaning targets.  Like the rule above,
-# but doesn't require building BUILT_SOURCES.
-check-clean ::
-	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
-	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X && test $$d != .; then                           \
-	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
-	    fi;                                                               \
-	done
-
-# Tell Automake to build tests when the user types `make all' (this is
-# not its default behavior).  Also build EXTRA_LIB and EXTRA_PROG since
-# Automake won't build them automatically, either.
-all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(chk_TESTS)
-
-# make install-doc doesn't do anything outside of doc directory, but
-# Makefiles should recognize it.
-# UPDATE: docs no longer reside in this build tree, so this target
-# is depreciated.
-install-doc uninstall-doc:
-	@echo "Nothing to be done."
-
-# clean up files generated by tests so they can be re-run.
-build-check-clean:
-	$(RM) -rf $(CHECK_CLEANFILES)
-
-# run check-clean whenever mostlyclean is run
-mostlyclean-local: build-check-clean
-
-# check-install is just a synonym for installcheck
-check-install: installcheck
-
-# Run each test in order, passing $(TEST_FLAGS) to the program.
-# Since tests are done in a shell loop, "make -i" does apply inside it.
-# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
-# The timestamps give a rough idea how much time the tests use.
-#
-# Note that targets in chk_TESTS (defined above) will be built when the user
-# types 'make tests' or 'make check', but only programs in TEST_PROG,
-# TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
-check-TESTS: test
-
-test _test:
-	@$(MAKE) build-check-s
-	@$(MAKE) build-check-p
-
-# Actual execution of check-s.
-build-check-s: $(LIB) $(PROGS) $(chk_TESTS)
-	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
-	   echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
-	fi
-	@$(MAKE) $(AM_MAKEFLAGS) _exec_check-s
-	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
-	    echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
-	fi
-
-_exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH)
-
-# The dummy.chkexe here prevents the target from being
-# empty if there are no tests in the current directory.
-# $${log} is the log file.
-# $${tname} is the name of test.
-$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
-	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \
-	   tname=$(@:.chkexe_=)$(EXEEXT);\
-	   log=$(@:.chkexe_=.chklog); \
-	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \
-	      echo "No need to test $${tname} again."; \
-	   else \
-	      echo "============================" > $${log}; \
-	      if test "X$(FORTRAN_API)" = "Xyes"; then \
-	         echo "Fortran API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "Fortran API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(CXX_API)" = "Xyes"; then \
-	         echo "C++ API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "C++ API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log};\
-	      else \
-	         echo "Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
-	         echo "$(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      fi; \
-	      echo "============================" >> $${log}; \
-	      srcdir="$(srcdir)" \
-	         $(TIME) $(RUNEXEC) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \
-	         && touch $(@:.chkexe_=.chkexe) || \
-	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	         (cat $${log} && false) || exit 1; \
-	      echo "" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
-	      echo "============================" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
-	      cat $${log}; \
-	   fi; \
-	fi
-
-# The dummysh.chkexe here prevents the target from being
-# empty if there are no tests in the current directory.
-# $${log} is the log file.
-# $${tname} is the name of test.
-$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
-	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummysh.chkexe_"; then \
-	   cmd=$(@:.chkexe_=);\
-	   tname=`basename $$cmd`;\
-	   chkname=`basename $(@:.chkexe_=.chkexe)`;\
-	   log=`basename $(@:.chkexe_=.chklog)`; \
-	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer $${chkname} $$cmd $(SCRIPT_DEPEND); then \
-	      echo "No need to test $${tname} again."; \
-	   else \
-	      echo "============================" > $${log}; \
-	      if test "X$(FORTRAN_API)" = "Xyes"; then \
-	         echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(CXX_API)" = "Xyes"; then \
-	         echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      else \
-	         echo "Testing $${tname} $(TEST_FLAGS)"; \
-	         echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      fi; \
-	      echo "============================" >> $${log}; \
-	      RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
-	      srcdir="$(srcdir)" \
-	         $(TIME) $(SHELL) $$cmd $(TEST_FLAGS) >> $${log} 2>&1 \
-	         && touch $${chkname} || \
-	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	         (cat $${log} && false) || exit 1; \
-	      echo "" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
-	      echo "============================" >> $${log}; \
-	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
-	      cat $${log}; \
-	   fi; \
-	   echo "============================"; \
-	fi
-
-# Actual execution of check-p.
-build-check-p: $(LIB) $(PROGS) $(chk_TESTS)
-	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
-	   echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
-	fi
-	@if test -n "$(TEST_PROG_PARA)"; then                                \
-	    echo "**** Hint ****";                                            \
-	    echo "Parallel test files reside in the current directory"        \
-	         "by default.";                                               \
-	    echo "Set HDF5_PARAPREFIX to use another directory. E.g.,";       \
-	    echo "    HDF5_PARAPREFIX=/PFS/user/me";                          \
-	    echo "    export HDF5_PARAPREFIX";                                \
-	    echo "    make check";                                            \
-	    echo "**** end of Hint ****";                                     \
-	fi
-	@for test in $(TEST_PROG_PARA) dummy; do                             \
-	   if test $$test != dummy; then                                      \
-	      $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ \
-	      RUNEXEC="$(RUNPARALLEL)" || exit 1; \
-	   fi;                                                                \
-	done
-	@for test in $(TEST_SCRIPT_PARA) dummy; do                           \
-	  if test $$test != dummy; then                                      \
-	    $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ || exit 1; \
-	  fi;                                                                 \
-	done
-	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
-	    echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
-	fi
-
-# Run test with different Virtual File Driver
-check-vfd: $(LIB) $(PROGS) $(chk_TESTS)
-	@for vfd in $(VFD_LIST) dummy; do                                     \
-	    if test $$vfd != dummy; then                                      \
-	        echo "============================";                          \
-	        echo "Testing Virtual File Driver $$vfd";                     \
-	        echo "============================";                          \
-	        $(MAKE) $(AM_MAKEFLAGS) check-clean || exit 1;                \
-	        HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check || exit 1;    \
-	    fi;                                                               \
-	done
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/hl/fortran/test/tstds.F90 b/hl/fortran/test/tstds.F90
new file mode 100644
index 0000000..4027b11
--- /dev/null
+++ b/hl/fortran/test/tstds.F90
@@ -0,0 +1,366 @@
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+
+MODULE TSTDS
+
+CONTAINS
+
+!-------------------------------------------------------------------------
+! test_begin
+!-------------------------------------------------------------------------
+
+SUBROUTINE test_begin(string)
+  CHARACTER(LEN=*), INTENT(IN) :: string
+  WRITE(*, fmt = '(A)', advance = 'no') ADJUSTL(string)
+END SUBROUTINE test_begin
+
+!-------------------------------------------------------------------------
+! passed/failed
+!-------------------------------------------------------------------------
+SUBROUTINE write_test_status( test_result)
+
+! Writes the results of the tests
+
+  IMPLICIT NONE
+
+  INTEGER, INTENT(IN) :: test_result  ! negative,   failed
+                                      ! 0       ,   passed
+
+! Controls the output style for reporting test results
+
+  CHARACTER(LEN=8) :: error_string
+  CHARACTER(LEN=8), PARAMETER :: success = ' PASSED '
+  CHARACTER(LEN=8), PARAMETER :: failure = '*FAILED*'
+
+  error_string = failure
+  IF (test_result .EQ.  0) THEN
+     error_string = success
+  ENDIF
+
+  WRITE(*, fmt = '(T34, A)') error_string
+
+END SUBROUTINE write_test_status
+
+END MODULE TSTDS
+
+MODULE TSTDS_TESTS
+
+CONTAINS
+
+SUBROUTINE test_testds(err)
+
+  USE HDF5
+  USE H5LT
+  USE H5DS
+  USE TSTDS ! module for testing dataset support routines
+
+  IMPLICIT NONE
+
+  INTEGER, PARAMETER :: RANK      = 2 ! rank of DATA dataset
+  INTEGER, PARAMETER :: DIM_DATA  = 12
+  INTEGER, PARAMETER :: DIM1_SIZE = 3
+  INTEGER, PARAMETER :: DIM2_SIZE = 4
+  INTEGER, PARAMETER :: DIM1      = 1
+  INTEGER, PARAMETER :: DIM2      = 2
+  INTEGER, PARAMETER :: FAILED    = -1
+
+  CHARACTER(LEN=6), PARAMETER :: DSET_NAME = "Mydata"
+  CHARACTER(LEN=5), PARAMETER :: DS_1_NAME = "Yaxis"
+  CHARACTER(LEN=5), PARAMETER :: DS_2_NAME = "Xaxis"
+
+
+  INTEGER(hid_t) :: fid    ! file ID
+  INTEGER(hid_t) :: did    ! dataset ID
+  INTEGER(hid_t) :: dsid   ! DS dataset ID
+  INTEGER :: rankds = 1    ! rank of DS dataset
+  INTEGER(hsize_t), DIMENSION(1:rank) ::  dims  = (/DIM2_SIZE,DIM1_SIZE/) ! size of DATA dataset
+  INTEGER, DIMENSION(1:DIM_DATA) :: buf = (/1,2,3,4,5,6,7,8,9,10,11,12/)  ! DATA of DATA dataset
+  INTEGER(hsize_t), DIMENSION(1:1) ::  s1_dim  = (/DIM1_SIZE/)  ! size of DS 1 dataset
+  INTEGER(hsize_t), DIMENSION(1:1) ::  s2_dim  = (/DIM2_SIZE/)  ! size of DS 2 dataset
+  REAL, DIMENSION(1:DIM1_SIZE) ::   s1_wbuf = (/10,20,30/)     ! DATA of DS 1 dataset
+  INTEGER, DIMENSION(1:DIM2_SIZE) :: s2_wbuf = (/10,20,50,100/) ! DATA of DS 2 dataset
+  INTEGER :: err
+  INTEGER :: num_scales
+  INTEGER(size_t) :: name_len
+  CHARACTER(LEN=80) :: name
+  INTEGER(size_t) :: label_len
+  CHARACTER(LEN=80) :: label
+  LOGICAL :: is_attached, is_scale
+
+  !
+  ! Initialize FORTRAN predefined datatypes.
+  !
+  CALL h5open_f(err)
+  IF(err.LT.0) RETURN
+
+  ! create a file using default properties
+  CALL H5Fcreate_f("tstds.h5",H5F_ACC_TRUNC_F, fid, err)
+  IF(err.LT.0) RETURN
+
+  ! make a dataset
+  CALL H5LTmake_dataset_int_f(fid,DSET_NAME,rank,dims,buf, err)
+  IF(err.LT.0) RETURN
+
+  ! make a DS dataset for the first dimension
+  CALL H5LTmake_dataset_float_f(fid,DS_1_NAME,rankds,s1_dim,s1_wbuf,err)
+  IF(err.LT.0) RETURN
+
+  ! make a DS dataset for the second dimension
+  CALL H5LTmake_dataset_int_f(fid,DS_2_NAME,rankds,s2_dim,s2_wbuf,err)
+  IF(err.LT.0) RETURN
+
+  !-------------------------------------------------------------------------
+  ! attach the DS_1_NAME dimension scale to DSET_NAME at dimension 1
+  !-------------------------------------------------------------------------
+
+  CALL test_begin(' Test Attaching Dimension Scale         ')
+
+  ! get the dataset id for DSET_NAME
+  CALL H5Dopen_f(fid, DSET_NAME, did, err)
+  IF(err.LT.0) RETURN
+
+  ! get the DS dataset id
+  CALL H5Dopen_f(fid, DS_1_NAME, dsid, err)
+  IF(err.LT.0) RETURN
+
+  ! check attaching to a non-existent dimension; should fail
+  CALL H5DSattach_scale_f(did, dsid, 20, err)
+  IF(err.NE.-1) THEN
+     err = FAILED ! should fail, mark as an error
+     CALL write_test_status(err)
+     RETURN
+  ENDIF
+
+  ! attach the DS_1_NAME dimension scale to DSET_NAME at dimension index 1
+  CALL H5DSattach_scale_f(did, dsid, DIM1, err)
+  IF(err.EQ.-1) THEN
+     CALL write_test_status(err)
+     RETURN
+  ENDIF
+  CALL write_test_status(err)
+
+  CALL test_begin(' Test If Dimension Scale Attached       ')
+
+  CALL H5DSis_attached_f(did, dsid, DIM1, is_attached, err)
+  IF(err.EQ.-1.OR..NOT.is_attached) THEN
+     err = FAILED
+     CALL write_test_status(err)
+     RETURN
+  ENDIF
+  CALL write_test_status(err)
+
+  ! Check to see how many Dimension Scales are attached
+
+  CALL test_begin(' Test Getting Number Dimension Scales   ')
+
+  CALL H5DSget_num_scales_f(did, DIM1, num_scales, err)
+  IF(err.LT.0.OR.num_scales.NE.1)THEN
+     err = FAILED
+     CALL write_test_status(err)
+     RETURN
+  ENDIF
+  CALL write_test_status(err)
+
+  CALL test_begin(' Test Detaching Dimension Scale         ')
+
+  ! Detach scale
+  CALL H5DSdetach_scale_f(did, dsid, DIM1, err)
+  IF(err.LT.0) RETURN
+
+  ! Check to see if a dimension scale is attached, should be .false.
+  CALL H5DSis_attached_f(did, dsid, DIM1, is_attached, err)
+  IF(err.LT.0.OR.is_attached)THEN
+     err = FAILED
+     CALL write_test_status(err)
+     RETURN
+  ENDIF
+  CALL write_test_status(err)
+
+  !-------------------------------------------------------------------------
+  ! set the DS_1_NAME dimension scale to DSET_NAME at dimension 0
+  !-------------------------------------------------------------------------
+
+  CALL test_begin(' Test Setting Dimension Scale           ')
+
+  CALL H5DSset_scale_f(dsid, err, "Dimension Scale Set 1")
+  IF(err.LT.0.OR.is_attached)THEN
+     err = FAILED
+     CALL write_test_status(err)
+     RETURN
+  ENDIF
+  CALL write_test_status(err)
+
+  CALL test_begin(' Test If Dimension Scale                ')
+
+  CALL H5DSis_scale_f(dsid, is_scale, err)
+  IF(err.LT.0.OR..NOT.is_scale)THEN
+     err = FAILED
+     CALL write_test_status(err)
+     RETURN
+  ENDIF
+  CALL write_test_status(err)
+
+  ! Get scale name; test to large character buffer
+
+  CALL test_begin(' Test Getting Dimension Scale By Name   ')
+
+  name_len = 25
+  name = ''
+  CALL H5DSget_scale_name_f(dsid, name, name_len, err)
+  IF(err.LT.0 .OR. &
+       name_len.NE.21 .OR. &
+       TRIM(name).NE."Dimension Scale Set 1" .OR. &
+       name(22:25).NE.'   ')THEN
+     err = FAILED
+     CALL write_test_status(err)
+     RETURN
+  ENDIF
+
+  ! Get scale name; test exact size character buffer
+  name_len = 21
+  name = ''
+  CALL H5DSget_scale_name_f(dsid, name(1:name_len), name_len, err)
+  IF(err.LT.0.OR.name_len.NE.21.OR.TRIM(name).NE."Dimension Scale Set 1")THEN
+     err = FAILED
+     CALL write_test_status(err)
+     RETURN
+  ENDIF
+
+  ! Get scale name; test to small character buffer
+  name_len = 5
+  name = ''
+  CALL H5DSget_scale_name_f(dsid, name(1:name_len), name_len, err)
+  IF(err.LT.0.OR.name_len.NE.21.OR.TRIM(name).NE."Dimen")THEN
+     err = FAILED
+     CALL write_test_status(err)
+     RETURN
+  ENDIF
+
+  ! close DS id
+  CALL H5Dclose_f(dsid, err)
+  IF(err.LT.0) RETURN
+
+  !-------------------------------------------------------------------------
+  ! attach the DS_2_NAME dimension scale to DSET_NAME
+  !-------------------------------------------------------------------------
+
+  ! get the DS dataset id
+  CALL H5Dopen_f(fid, DS_2_NAME, dsid, err)
+  IF(err.LT.0) RETURN
+
+  ! attach the DS_2_NAME dimension scale to DSET_NAME as the 2nd dimension (index 2)
+  CALL H5DSattach_scale_f(did, dsid, DIM2, err)
+  IF(err.LT.0) RETURN
+
+  CALL H5DSis_attached_f(did, dsid, DIM2, is_attached, err)
+  IF(err.LT.0) RETURN
+
+  ! test sending no Dimension Scale name
+
+  CALL H5DSset_scale_f(dsid, err)
+  IF(err.LT.0)THEN
+     CALL write_test_status(err)
+     RETURN
+  ENDIF
+
+  CALL H5DSis_scale_f(dsid, is_scale, err)
+  IF(err.LT.0.OR..NOT.is_scale)THEN
+     err = FAILED
+     CALL write_test_status(err)
+     RETURN
+  ENDIF
+
+  ! Get scale name when there is no scale name
+  name_len = 5
+  name = ''
+  CALL H5DSget_scale_name_f(dsid, name(1:name_len), name_len, err)
+  IF(err.LT.0.OR.name_len.NE.0)THEN ! name_len is 0 if no name is found
+     err = FAILED
+     CALL write_test_status(err)
+     RETURN
+  ENDIF
+
+  CALL write_test_status(err)
+
+  CALL test_begin(' Test Setting Dimension Scale Label     ')
+
+  CALL H5DSset_label_f(did, DIM2, "Label12", err)
+  IF(err.LT.0)THEN
+     CALL write_test_status(err)
+     RETURN
+  ENDIF
+
+  ! Test label where character length is to small
+
+  label_len = 5
+  label = ''
+  CALL H5DSget_label_f(did, DIM2, label(1:label_len), label_len, err)
+  IF(err.LT.0.OR.label(1:5).NE."Label".OR.label_len.NE.7)THEN
+     err = FAILED
+     CALL write_test_status(err)
+     RETURN
+  ENDIF
+
+  ! Test label where character length is exact
+
+  label_len = 7
+  label = ''
+  CALL H5DSget_label_f(did, DIM2, label(1:label_len), label_len, err)
+  IF(err.LT.0.OR.label(1:label_len).NE."Label12".OR.label_len.NE.7)THEN
+     err = FAILED
+     CALL write_test_status(err)
+     RETURN
+  ENDIF
+
+  ! Test label where character length is to big
+
+  label_len = 25
+  label = ''
+  CALL H5DSget_label_f(did, DIM2, label, label_len, err)
+  IF(err.LT.0.OR. &
+       label(1:label_len).NE."Label12" .OR. &
+       label_len.NE.7 .OR. &
+       label(8:25).NE.'                  ')THEN
+     err = FAILED
+     CALL write_test_status(err)
+     RETURN
+  ENDIF
+  CALL write_test_status(err)
+
+ ! close DS id
+  CALL H5Dclose_f(dsid, err)
+  IF(err.LT.0) RETURN
+
+ ! close file
+  CALL H5Fclose_f(fid, err)
+  IF(err.LT.0) RETURN
+
+END SUBROUTINE test_testds
+
+END MODULE TSTDS_TESTS
+
+PROGRAM test_ds
+
+  USE TSTDS_TESTS ! module for testing dataset routines
+
+  IMPLICIT NONE
+
+  INTEGER :: err
+
+  CALL test_testds(err)
+
+  IF(err.LT.0)THEN
+     WRITE(*,'(5X,A)') "DIMENSION SCALES TEST *FAILED*"
+  ENDIF
+
+END PROGRAM test_ds
+
diff --git a/hl/fortran/test/tstds.f90 b/hl/fortran/test/tstds.f90
deleted file mode 100644
index cbf6c38..0000000
--- a/hl/fortran/test/tstds.f90
+++ /dev/null
@@ -1,353 +0,0 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-! * Copyright by The HDF Group.                                               *
-! * Copyright by the Board of Trustees of the University of Illinois.         *
-! * All rights reserved.                                                      *
-! *                                                                           *
-! * This file is part of HDF5.  The full HDF5 copyright notice, including     *
-! * terms governing use, modification, and redistribution, is contained in    *
-! * the files COPYING and Copyright.html.  COPYING can be found at the root   *
-! * of the source code distribution tree; Copyright.html can be found at the  *
-! * root level of an installed copy of the electronic HDF5 document set and   *
-! * is linked from the top-level documents page.  It can also be found at     *
-! * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-! * access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-PROGRAM test_ds
-
-  IMPLICIT NONE
-
-  INTEGER :: err
-
-  CALL test_testds(err)
-
-  IF(err.LT.0)THEN
-     WRITE(*,'(5X,A)') "DIMENSION SCALES TEST *FAILED*"
-  ENDIF
-
-END PROGRAM test_ds
-
-SUBROUTINE test_testds(err)
-
-  USE HDF5
-  USE H5LT
-  USE H5DS
-
-  IMPLICIT NONE
-
-  INTEGER, PARAMETER :: RANK      = 2 ! rank of DATA dataset 
-  INTEGER, PARAMETER :: DIM_DATA  = 12
-  INTEGER, PARAMETER :: DIM1_SIZE = 3
-  INTEGER, PARAMETER :: DIM2_SIZE = 4
-  INTEGER, PARAMETER :: DIM1      = 1
-  INTEGER, PARAMETER :: DIM2      = 2
-  INTEGER, PARAMETER :: FAILED    = -1
-
-  CHARACTER(LEN=6), PARAMETER :: DSET_NAME = "Mydata"
-  CHARACTER(LEN=5), PARAMETER :: DS_1_NAME = "Yaxis"
-  CHARACTER(LEN=5), PARAMETER :: DS_1_NAME_A = "Yaxiz"
-  CHARACTER(LEN=5), PARAMETER :: DS_2_NAME = "Xaxis"
-
-
-  INTEGER(hid_t) :: fid    ! file ID
-  INTEGER(hid_t) :: did    ! dataset ID
-  INTEGER(hid_t) :: dsid   ! DS dataset ID
-  INTEGER :: rankds = 1    ! rank of DS dataset 
-  INTEGER(hsize_t), DIMENSION(1:rank) ::  dims  = (/DIM2_SIZE,DIM1_SIZE/) ! size of DATA dataset 
-  INTEGER, DIMENSION(1:DIM_DATA) :: buf = (/1,2,3,4,5,6,7,8,9,10,11,12/)  ! DATA of DATA dataset 
-  INTEGER(hsize_t), DIMENSION(1:1) ::  s1_dim  = (/DIM1_SIZE/)  ! size of DS 1 dataset 
-  INTEGER(hsize_t), DIMENSION(1:1) ::  s2_dim  = (/DIM2_SIZE/)  ! size of DS 2 dataset 
-  REAL, DIMENSION(1:DIM1_SIZE) ::   s1_wbuf = (/10,20,30/)     ! DATA of DS 1 dataset 
-  INTEGER, DIMENSION(1:DIM2_SIZE) :: s2_wbuf = (/10,20,50,100/) ! DATA of DS 2 dataset 
-  INTEGER :: err
-  INTEGER :: num_scales
-  INTEGER(size_t) :: name_len
-  CHARACTER(LEN=80) :: name
-  INTEGER(size_t) :: label_len
-  CHARACTER(LEN=80) :: label
-  LOGICAL :: is_attached, is_scale
-
-  !
-  ! Initialize FORTRAN predefined datatypes.
-  !
-  CALL h5open_f(err)
-  IF(err.LT.0) RETURN
-
-  ! create a file using default properties
-  CALL H5Fcreate_f("tstds.h5",H5F_ACC_TRUNC_F, fid, err)
-  IF(err.LT.0) RETURN
-
-  ! make a dataset 
-  CALL H5LTmake_dataset_int_f(fid,DSET_NAME,rank,dims,buf, err)
-  IF(err.LT.0) RETURN
-
-  ! make a DS dataset for the first dimension
-  CALL H5LTmake_dataset_float_f(fid,DS_1_NAME,rankds,s1_dim,s1_wbuf,err)
-  IF(err.LT.0) RETURN
-
-  ! make a DS dataset for the second dimension
-  CALL H5LTmake_dataset_int_f(fid,DS_2_NAME,rankds,s2_dim,s2_wbuf,err)
-  IF(err.LT.0) RETURN
-
-  !-------------------------------------------------------------------------
-  ! attach the DS_1_NAME dimension scale to DSET_NAME at dimension 1
-  !-------------------------------------------------------------------------
-
-  CALL test_begin(' Test Attaching Dimension Scale         ')
-
-  ! get the dataset id for DSET_NAME
-  CALL H5Dopen_f(fid, DSET_NAME, did, err)
-  IF(err.LT.0) RETURN
-
-  ! get the DS dataset id
-  CALL H5Dopen_f(fid, DS_1_NAME, dsid, err)
-  IF(err.LT.0) RETURN
-
-  ! check attaching to a non-existent dimension; should fail
-  CALL H5DSattach_scale_f(did, dsid, 20, err)
-  IF(err.NE.-1) THEN
-     err = FAILED ! should fail, mark as an error
-     CALL write_test_status(err)
-     RETURN
-  ENDIF
-
-  ! attach the DS_1_NAME dimension scale to DSET_NAME at dimension index 1
-  CALL H5DSattach_scale_f(did, dsid, DIM1, err)
-  IF(err.EQ.-1) THEN
-     CALL write_test_status(err)
-     RETURN
-  ENDIF
-  CALL write_test_status(err)
-
-  CALL test_begin(' Test If Dimension Scale Attached       ')
-
-  CALL H5DSis_attached_f(did, dsid, DIM1, is_attached, err)
-  IF(err.EQ.-1.OR..NOT.is_attached) THEN
-     err = FAILED
-     CALL write_test_status(err)
-     RETURN
-  ENDIF
-  CALL write_test_status(err)
-
-  ! Check to see how many Dimension Scales are attached
-
-  CALL test_begin(' Test Getting Number Dimension Scales   ')
-
-  CALL H5DSget_num_scales_f(did, DIM1, num_scales, err)
-  IF(err.LT.0.OR.num_scales.NE.1)THEN
-     err = FAILED
-     CALL write_test_status(err)
-     RETURN
-  ENDIF
-  CALL write_test_status(err)
-
-  CALL test_begin(' Test Detaching Dimension Scale         ')
-
-  ! Detach scale
-  CALL H5DSdetach_scale_f(did, dsid, DIM1, err)
-  IF(err.LT.0) RETURN
-
-  ! Check to see if a dimension scale is attached, should be .false.
-  CALL H5DSis_attached_f(did, dsid, DIM1, is_attached, err)
-  IF(err.LT.0.OR.is_attached)THEN
-     err = FAILED
-     CALL write_test_status(err)
-     RETURN
-  ENDIF
-  CALL write_test_status(err)
-  
-  !-------------------------------------------------------------------------
-  ! set the DS_1_NAME dimension scale to DSET_NAME at dimension 0
-  !-------------------------------------------------------------------------
- 
-  CALL test_begin(' Test Setting Dimension Scale           ')
-
-  CALL H5DSset_scale_f(dsid, err, "Dimension Scale Set 1")
-  IF(err.LT.0.OR.is_attached)THEN
-     err = FAILED
-     CALL write_test_status(err)
-     RETURN
-  ENDIF
-  CALL write_test_status(err)
-
-  CALL test_begin(' Test If Dimension Scale                ')
-
-  CALL H5DSis_scale_f(dsid, is_scale, err)
-  IF(err.LT.0.OR..NOT.is_scale)THEN
-     err = FAILED
-     CALL write_test_status(err)
-     RETURN
-  ENDIF
-  CALL write_test_status(err)
-
-  ! Get scale name; test to large character buffer
-
-  CALL test_begin(' Test Getting Dimension Scale By Name   ')
-
-  name_len = 25
-  name = ''
-  CALL H5DSget_scale_name_f(dsid, name, name_len, err)
-  IF(err.LT.0 .OR. &
-       name_len.NE.21 .OR. &
-       TRIM(name).NE."Dimension Scale Set 1" .OR. &
-       name(22:25).NE.'   ')THEN
-     err = FAILED
-     CALL write_test_status(err)
-     RETURN
-  ENDIF
-
-  ! Get scale name; test exact size character buffer
-  name_len = 21
-  name = ''
-  CALL H5DSget_scale_name_f(dsid, name(1:name_len), name_len, err)
-  IF(err.LT.0.OR.name_len.NE.21.OR.TRIM(name).NE."Dimension Scale Set 1")THEN
-     err = FAILED
-     CALL write_test_status(err)
-     RETURN
-  ENDIF
-
-  ! Get scale name; test to small character buffer
-  name_len = 5
-  name = ''
-  CALL H5DSget_scale_name_f(dsid, name(1:name_len), name_len, err)
-  IF(err.LT.0.OR.name_len.NE.21.OR.TRIM(name).NE."Dimen")THEN
-     err = FAILED
-     CALL write_test_status(err)
-     RETURN
-  ENDIF
-  
-  ! close DS id
-  CALL H5Dclose_f(dsid, err)
-  IF(err.LT.0) RETURN
-  
-  !-------------------------------------------------------------------------
-  ! attach the DS_2_NAME dimension scale to DSET_NAME
-  !-------------------------------------------------------------------------
- 
-  ! get the DS dataset id
-  CALL H5Dopen_f(fid, DS_2_NAME, dsid, err)
-  IF(err.LT.0) RETURN
-
-  ! attach the DS_2_NAME dimension scale to DSET_NAME as the 2nd dimension (index 2)
-  CALL H5DSattach_scale_f(did, dsid, DIM2, err)
-  IF(err.LT.0) RETURN
-
-  CALL H5DSis_attached_f(did, dsid, DIM2, is_attached, err)
-  IF(err.LT.0) RETURN
-
-  ! test sending no Dimension Scale name
-
-  CALL H5DSset_scale_f(dsid, err)
-  IF(err.LT.0)THEN
-     CALL write_test_status(err)
-     RETURN
-  ENDIF
-
-  CALL H5DSis_scale_f(dsid, is_scale, err)
-  IF(err.LT.0.OR..NOT.is_scale)THEN
-     err = FAILED
-     CALL write_test_status(err)
-     RETURN
-  ENDIF
-
-  ! Get scale name when there is no scale name
-  name_len = 5
-  name = ''
-  CALL H5DSget_scale_name_f(dsid, name(1:name_len), name_len, err)
-  IF(err.LT.0.OR.name_len.NE.0)THEN ! name_len is 0 if no name is found
-     err = FAILED
-     CALL write_test_status(err)
-     RETURN
-  ENDIF
-
-  CALL write_test_status(err)
-
-  CALL test_begin(' Test Setting Dimension Scale Label     ')
-
-  CALL H5DSset_label_f(did, DIM2, "Label12", err)
-  IF(err.LT.0)THEN
-     CALL write_test_status(err)
-     RETURN
-  ENDIF
-
-  ! Test label where character length is to small
-  
-  label_len = 5
-  label = ''
-  CALL H5DSget_label_f(did, DIM2, label(1:label_len), label_len, err)
-  IF(err.LT.0.OR.label(1:5).NE."Label".OR.label_len.NE.7)THEN
-     err = FAILED
-     CALL write_test_status(err)
-     RETURN
-  ENDIF
-
-  ! Test label where character length is exact
-
-  label_len = 7
-  label = ''
-  CALL H5DSget_label_f(did, DIM2, label(1:label_len), label_len, err)
-  IF(err.LT.0.OR.label(1:label_len).NE."Label12".OR.label_len.NE.7)THEN
-     err = FAILED
-     CALL write_test_status(err)
-     RETURN
-  ENDIF
-
-  ! Test label where character length is to big
-
-  label_len = 25
-  label = ''
-  CALL H5DSget_label_f(did, DIM2, label, label_len, err)
-  IF(err.LT.0.OR. &
-       label(1:label_len).NE."Label12" .OR. &
-       label_len.NE.7 .OR. &
-       label(8:25).NE.'                  ')THEN
-     err = FAILED
-     CALL write_test_status(err)
-     RETURN
-  ENDIF
-  CALL write_test_status(err)
-
- ! close DS id
-  CALL H5Dclose_f(dsid, err)
-  IF(err.LT.0) RETURN
-
- ! close file 
-  CALL H5Fclose_f(fid, err)
-  IF(err.LT.0) RETURN
-
-END SUBROUTINE test_testds
-
-!-------------------------------------------------------------------------
-! test_begin
-!-------------------------------------------------------------------------
-
-SUBROUTINE test_begin(string)
-  CHARACTER(LEN=*), INTENT(IN) :: string
-  WRITE(*, fmt = '(A)', advance = 'no') ADJUSTL(string)
-END SUBROUTINE test_begin
-
-!-------------------------------------------------------------------------
-! passed/failed
-!-------------------------------------------------------------------------
-SUBROUTINE write_test_status( test_result)
-
-! Writes the results of the tests
-
-  IMPLICIT NONE
-
-  INTEGER, INTENT(IN) :: test_result  ! negative,   failed
-                                      ! 0       ,   passed
-
-! Controls the output style for reporting test results
-
-  CHARACTER(LEN=8) :: error_string
-  CHARACTER(LEN=8), PARAMETER :: success = ' PASSED '
-  CHARACTER(LEN=8), PARAMETER :: failure = '*FAILED*'
-
-  error_string = failure
-  IF (test_result .EQ.  0) THEN
-     error_string = success
-  ENDIF
-  
-  WRITE(*, fmt = '(T34, A)') error_string
-
-END SUBROUTINE write_test_status
diff --git a/hl/fortran/test/tstimage.F90 b/hl/fortran/test/tstimage.F90
new file mode 100644
index 0000000..fc3a43a
--- /dev/null
+++ b/hl/fortran/test/tstimage.F90
@@ -0,0 +1,369 @@
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the COPYING file, which can be found at the root of the source code       *
+!   distribution tree, or in https://www.hdfgroup.org/licenses.               *
+!   If you do not have access to either file, you may request a copy from     *
+!   help@hdfgroup.org.                                                        *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+!
+! This file contains the FORTRAN90 tests for H5LT
+!
+
+MODULE TSTIMAGE
+
+CONTAINS
+
+!-------------------------------------------------------------------------
+! test_begin
+!-------------------------------------------------------------------------
+
+subroutine test_begin(string)
+character(len=*), intent(in) :: string
+write(*, fmt = '(14a)', advance = 'no') string
+write(*, fmt = '(40x,a)', advance = 'no') ' '
+end subroutine test_begin
+
+!-------------------------------------------------------------------------
+! passed
+!-------------------------------------------------------------------------
+
+subroutine passed()
+write(*, fmt = '(6a)')  'PASSED'
+end subroutine passed
+
+END MODULE TSTIMAGE
+
+
+MODULE TSTIMAGE_TESTS
+
+CONTAINS
+
+!-------------------------------------------------------------------------
+! make_image1
+!-------------------------------------------------------------------------
+
+subroutine make_image1()
+
+use h5im ! module of H5IM
+use hdf5 ! module of HDF5 library
+USE TSTIMAGE ! module for testing image support routines
+
+implicit none
+
+character(len=8), parameter :: filename = "f1img.h5" ! file name
+character(len=4), parameter :: dsetname1 = "img1"    ! dataset name
+character(len=4), parameter :: dsetname2 = "img2"    ! dataset name
+character(len=15), parameter :: il ="INTERLACE_PIXEL"! dataset name
+integer(hid_t) :: file_id                            ! file identifier
+integer(hsize_t), parameter :: width  = 500          ! width of image
+integer(hsize_t), parameter :: height = 270          ! height of image
+integer, parameter :: pal_entries = 9                ! palette number of entries
+integer, dimension(:), allocatable :: buf1           ! data buffer
+integer, dimension(:), allocatable :: bufr1          ! data buffer
+integer, dimension(:), allocatable :: buf2           ! data buffer
+integer, dimension(:), allocatable :: bufr2          ! data buffer
+integer(hsize_t) :: widthr                           ! width of image
+integer(hsize_t) :: heightr                          ! height of image
+integer(hsize_t) :: planesr                          ! color planes
+integer(hsize_t) :: npalsr                           ! palettes
+character(len=15) :: interlacer                      ! interlace
+integer :: errcode                                   ! error flag
+integer :: is_image                                  ! error flag
+integer :: i, j, n                                   ! general purpose integers
+!
+! palette
+! create a 9 entry palette
+!
+character(len=4), parameter :: pal_name = "pal1"     ! dataset name
+integer(hsize_t), dimension(2) :: pal_dims = (/pal_entries,3/) ! palette dimensions
+integer(hsize_t), dimension(2) :: pal_dims_out       ! palette dimensions
+integer, dimension(pal_entries*3) :: pal_data_out    ! data buffer
+integer(hsize_t) :: npals                            ! number of palettes
+integer          :: pal_number                       ! palette number
+integer          :: is_palette                       ! is palette
+integer          :: space
+integer, dimension(pal_entries*3) :: pal_data_in = (/&
+ 0,0,168,&      ! dark blue
+ 0,0,252,&      ! blue
+ 0,168,252,&    ! ocean blue
+ 84,252,252,&   ! light blue
+ 168,252,168,&  ! light green
+ 0,252,168,&    ! green
+ 252,252,84,&   ! yellow
+ 252,168,0,&    ! orange
+ 252,0,0/)      ! red
+
+! allocate arrays
+!
+allocate(buf1(width * height))
+allocate(bufr1(width * height))
+allocate(buf2(width * height * 3))
+allocate(bufr2(width * height * 3))
+
+! create an 8bit image of 9 values divided evenly by the array
+!
+space = width*height / pal_entries;
+n = 0; j = 0;
+do i = 1, width*height
+  buf1(i) = n
+  if ( j > space ) then
+   n = n + 1;
+   j = 0;
+  endif
+  if (n>pal_entries-1) n=0;
+  j = j +1;
+end do
+
+!
+! create a 3 byte rgb image
+!
+n = 0; j = 0;
+do i = 1, width*height*3
+  buf2(i) = n;
+  if (j == 3) then
+   n = n + 1;
+   j = 0;
+  endif
+  if (n>255) n=0;
+  j = j +1;
+end do
+
+
+! Initialize FORTRAN predefined datatypes.
+!
+call h5open_f(errcode)
+!
+! Create a new file using default properties.
+!
+call h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, errcode)
+
+!-------------------------------------------------------------------------
+! indexed image
+!-------------------------------------------------------------------------
+
+call test_begin(' Make/Read image 8bit           ')
+
+!
+! write image.
+!
+call h5immake_image_8bit_f(file_id,dsetname1,width,height,buf1,errcode)
+!
+! read image.
+!
+call h5imread_image_f(file_id,dsetname1,bufr1,errcode)
+!
+! compare read and write buffers.
+!
+do i = 1, width*height
+ if ( buf1(i) /= bufr1(i) ) then
+   print *, 'read buffer differs from write buffer'
+   print *,  bufr1(i), ' and ',   buf1(i)
+   stop
+  endif
+end do
+
+!
+! get image info.
+!
+call h5imget_image_info_f(file_id,dsetname1,widthr,heightr,planesr,interlacer,npalsr,errcode)
+
+if ( (widthr /= widthr) .or. (heightr /= height) .or. (planesr /= 1)) then
+ print *, 'h5imget_image_info_f bad value'
+ stop
+endif
+
+is_image = h5imis_image_f(file_id,dsetname1)
+if ( is_image /= 1) then
+ print *, 'h5imis_image_f bad value'
+ stop
+endif
+
+
+call passed()
+
+!-------------------------------------------------------------------------
+! true color image
+!-------------------------------------------------------------------------
+
+call test_begin(' Make/Read image 24bit          ')
+
+!
+! write image.
+!
+call h5immake_image_24bit_f(file_id,dsetname2,width,height,il,buf2,errcode)
+
+!
+! read image.
+!
+call h5imread_image_f(file_id,dsetname2,bufr2,errcode)
+
+!
+! compare read and write buffers.
+!
+do i = 1, width*height*3
+ if ( buf2(i) /= bufr2(i) ) then
+   print *, 'read buffer differs from write buffer'
+   print *,  bufr2(i), ' and ',   buf2(i)
+   stop
+  endif
+end do
+
+!
+! get image info.
+!
+call h5imget_image_info_f(file_id,dsetname2,widthr,heightr,planesr,interlacer,npalsr,errcode)
+
+if ( (widthr /= widthr) .or. (heightr /= height) .or. (planesr /= 3)) then
+ print *, 'h5imget_image_info_f bad value'
+ stop
+endif
+
+is_image = h5imis_image_f(file_id,dsetname2)
+if ( is_image /= 1) then
+ print *, 'h5imis_image_f bad value'
+ stop
+endif
+
+
+
+call passed()
+
+!-------------------------------------------------------------------------
+! palette
+!-------------------------------------------------------------------------
+
+call test_begin(' Make palette                   ')
+
+!
+! make palette.
+!
+call h5immake_palette_f(file_id,pal_name,pal_dims,pal_data_in,errcode)
+
+call passed()
+
+
+call test_begin(' Link/Unlink palette            ')
+
+!
+! link palette.
+!
+call h5imlink_palette_f(file_id,dsetname1,pal_name,errcode)
+
+
+!
+! read palette.
+!
+pal_number = 0
+call h5imget_palette_f(file_id,dsetname1,pal_number,pal_data_out,errcode)
+
+!
+! compare read and write buffers.
+!
+do i = 1, pal_entries*3
+ if ( pal_data_in(i) /= pal_data_out(i) ) then
+   print *, 'read buffer differs from write buffer'
+   print *,  pal_data_in(i), ' and ',   pal_data_out(i)
+   stop
+  endif
+end do
+
+!
+! get number of palettes
+!
+call h5imget_npalettes_f(file_id,dsetname1,npals,errcode)
+
+if ( npals /= 1) then
+ print *, 'h5imget_npalettes_f bad value'
+ stop
+endif
+
+!
+! get palette info
+!
+pal_number = 0
+call h5imget_palette_info_f(file_id,dsetname1,pal_number,pal_dims_out,errcode)
+
+if ( (pal_dims_out(1) /= pal_dims(1)) .or. (pal_dims_out(2) /= pal_dims(2))) then
+ print *, 'h5imget_palette_info_f bad value'
+ stop
+endif
+
+!
+! is palette
+!
+is_palette = h5imis_palette_f(file_id,pal_name)
+
+if ( is_palette /= 1 ) then
+ print *, 'h5imis_palette_f bad value'
+ stop
+endif
+
+!
+! unlink palette.
+!
+call h5imunlink_palette_f(file_id,dsetname1,pal_name,errcode)
+
+!
+! get number of palettes
+!
+call h5imget_npalettes_f(file_id,dsetname1,npals,errcode )
+
+if ( npals /= 0) then
+ print *, 'h5imget_npalettes_f bad value'
+ stop
+endif
+
+
+!
+! link palette again
+!
+call h5imlink_palette_f(file_id,dsetname1,pal_name,errcode)
+
+call passed()
+
+
+!-------------------------------------------------------------------------
+! end
+!-------------------------------------------------------------------------
+
+!
+! Close the file.
+!
+call h5fclose_f(file_id, errcode)
+
+!
+! Close FORTRAN predefined datatypes.
+!
+call h5close_f(errcode)
+
+! deallocate arrays
+!
+deallocate(buf1)
+deallocate(bufr1)
+deallocate(buf2)
+deallocate(bufr2)
+
+!
+! end function.
+!
+end subroutine make_image1
+
+END MODULE TSTIMAGE_TESTS
+
+
+program image_test
+
+USE TSTIMAGE_TESTS ! module for testing dataset routines
+
+IMPLICIT NONE
+
+call make_image1()
+
+end program image_test
+
+
diff --git a/hl/fortran/test/tstimage.f90 b/hl/fortran/test/tstimage.f90
deleted file mode 100644
index 0bff6b2..0000000
--- a/hl/fortran/test/tstimage.f90
+++ /dev/null
@@ -1,339 +0,0 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-!
-! This file contains the FORTRAN90 tests for H5LT
-!
-
-program image_test
-
-call make_image1()
-
-end program image_test
-
-
-!-------------------------------------------------------------------------
-! make_image1
-!-------------------------------------------------------------------------
-
-subroutine make_image1()
-
-use h5im ! module of H5IM
-use hdf5 ! module of HDF5 library
-
-implicit none
-
-character(len=8), parameter :: filename = "f1img.h5" ! file name
-character(len=4), parameter :: dsetname1 = "img1"    ! dataset name
-character(len=4), parameter :: dsetname2 = "img2"    ! dataset name
-character(len=15), parameter :: il ="INTERLACE_PIXEL"! dataset name
-integer(hid_t) :: file_id                            ! file identifier
-integer(hsize_t), parameter :: width  = 500          ! width of image
-integer(hsize_t), parameter :: height = 200          ! height of image
-integer, parameter :: pal_entries = 9                ! palette number of entries
-integer, dimension(width*height) :: buf1             ! data buffer
-integer, dimension(width*height) :: bufr1            ! data buffer
-integer, dimension(width*height*3) :: buf2           ! data buffer
-integer, dimension(width*height*3) :: bufr2          ! data buffer
-integer(hsize_t) :: widthr                           ! width of image
-integer(hsize_t) :: heightr                          ! height of image
-integer(hsize_t) :: planesr                          ! color planes
-integer(hsize_t) :: npalsr                           ! palettes
-character(len=15) :: interlacer                      ! interlace
-integer :: errcode                                   ! error flag
-integer :: is_image                                  ! error flag
-integer :: i, j, n                                   ! general purpose integers
-!
-! palette
-! create a 9 entry palette
-!
-character(len=4), parameter :: pal_name = "pal1"     ! dataset name
-integer(hsize_t), dimension(2) :: pal_dims = (/pal_entries,3/) ! palette dimensions
-integer(hsize_t), dimension(2) :: pal_dims_out       ! palette dimensions
-integer, dimension(pal_entries*3) :: pal_data_out    ! data buffer
-integer(hsize_t) :: npals                            ! number of palettes
-integer          :: pal_number                       ! palette number
-integer          :: is_palette                       ! is palette
-integer          :: space
-integer, dimension(pal_entries*3) :: pal_data_in = (/&
- 0,0,168,&      ! dark blue
- 0,0,252,&      ! blue
- 0,168,252,&    ! ocean blue
- 84,252,252,&   ! light blue
- 168,252,168,&  ! light green
- 0,252,168,&    ! green
- 252,252,84,&   ! yellow
- 252,168,0,&    ! orange
- 252,0,0/)      ! red
-
-
-! create an 8bit image of 9 values divided evenly by the array
-!
-space = width*height / pal_entries;
-n = 0; j = 0;
-do i = 1, width*height
-  buf1(i) = n
-  if ( j > space ) then
-   n = n + 1;
-   j = 0;
-  endif
-  if (n>pal_entries-1) n=0;
-  j = j +1;
-end do
-
-!
-! create a 3 byte rgb image
-!
-n = 0; j = 0;
-do i = 1, width*height*3
-  buf2(i) = n;
-  if (j == 3) then
-   n = n + 1;
-   j = 0;
-  endif
-  if (n>255) n=0;
-  j = j +1;
-end do
-
-
-! Initialize FORTRAN predefined datatypes.
-!
-call h5open_f(errcode)
-!
-! Create a new file using default properties.
-!
-call h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, errcode)
-
-!-------------------------------------------------------------------------
-! indexed image
-!-------------------------------------------------------------------------
-
-call test_begin(' Make/Read image 8bit           ')
-
-!
-! write image.
-!
-call h5immake_image_8bit_f(file_id,dsetname1,width,height,buf1,errcode)
-!
-! read image.
-!
-call h5imread_image_f(file_id,dsetname1,bufr1,errcode)
-!
-! compare read and write buffers.
-!
-do i = 1, width*height
- if ( buf1(i) /= bufr1(i) ) then
-   print *, 'read buffer differs from write buffer'
-   print *,  bufr1(i), ' and ',   buf1(i)
-   stop
-  endif
-end do
-
-!
-! get image info.
-!
-call h5imget_image_info_f(file_id,dsetname1,widthr,heightr,planesr,interlacer,npalsr,errcode)
-
-if ( (widthr /= widthr) .or. (heightr /= height) .or. (planesr /= 1)) then
- print *, 'h5imget_image_info_f bad value'
- stop
-endif
-
-is_image = h5imis_image_f(file_id,dsetname1)
-if ( is_image /= 1) then
- print *, 'h5imis_image_f bad value'
- stop
-endif
-
-
-call passed()
-
-!-------------------------------------------------------------------------
-! true color image
-!-------------------------------------------------------------------------
-
-call test_begin(' Make/Read image 24bit          ')
-
-!
-! write image.
-!
-call h5immake_image_24bit_f(file_id,dsetname2,width,height,il,buf2,errcode)
-
-!
-! read image.
-!
-call h5imread_image_f(file_id,dsetname2,bufr2,errcode)
-
-!
-! compare read and write buffers.
-!
-do i = 1, width*height*3
- if ( buf2(i) /= bufr2(i) ) then
-   print *, 'read buffer differs from write buffer'
-   print *,  bufr2(i), ' and ',   buf2(i)
-   stop
-  endif
-end do
-
-!
-! get image info.
-!
-call h5imget_image_info_f(file_id,dsetname2,widthr,heightr,planesr,interlacer,npalsr,errcode)
-
-if ( (widthr /= widthr) .or. (heightr /= height) .or. (planesr /= 3)) then
- print *, 'h5imget_image_info_f bad value'
- stop
-endif
-
-is_image = h5imis_image_f(file_id,dsetname2)
-if ( is_image /= 1) then
- print *, 'h5imis_image_f bad value'
- stop
-endif
-
-
-
-call passed()
-
-!-------------------------------------------------------------------------
-! palette
-!-------------------------------------------------------------------------
-
-call test_begin(' Make palette                   ')
-
-!
-! make palette.
-!
-call h5immake_palette_f(file_id,pal_name,pal_dims,pal_data_in,errcode)
-
-call passed()
-
-
-call test_begin(' Link/Unlink palette            ')
-
-!
-! link palette.
-!
-call h5imlink_palette_f(file_id,dsetname1,pal_name,errcode)
-
-
-!
-! read palette.
-!
-pal_number = 0
-call h5imget_palette_f(file_id,dsetname1,pal_number,pal_data_out,errcode)
-
-!
-! compare read and write buffers.
-!
-do i = 1, pal_entries*3
- if ( pal_data_in(i) /= pal_data_out(i) ) then
-   print *, 'read buffer differs from write buffer'
-   print *,  pal_data_in(i), ' and ',   pal_data_out(i)
-   stop
-  endif
-end do
-
-!
-! get number of palettes
-!
-call h5imget_npalettes_f(file_id,dsetname1,npals,errcode)
-
-if ( npals /= 1) then
- print *, 'h5imget_npalettes_f bad value'
- stop
-endif
-
-!
-! get palette info
-!
-pal_number = 0
-call h5imget_palette_info_f(file_id,dsetname1,pal_number,pal_dims_out,errcode)
-
-if ( (pal_dims_out(1) /= pal_dims(1)) .or. (pal_dims_out(2) /= pal_dims(2))) then
- print *, 'h5imget_palette_info_f bad value'
- stop
-endif
-
-!
-! is palette
-!
-is_palette = h5imis_palette_f(file_id,pal_name)
-
-if ( is_palette /= 1 ) then
- print *, 'h5imis_palette_f bad value'
- stop
-endif
-
-!
-! unlink palette.
-!
-call h5imunlink_palette_f(file_id,dsetname1,pal_name,errcode)
-
-!
-! get number of palettes
-!
-call h5imget_npalettes_f(file_id,dsetname1,npals,errcode )
-
-if ( npals /= 0) then
- print *, 'h5imget_npalettes_f bad value'
- stop
-endif
-
-
-!
-! link palette again
-!
-call h5imlink_palette_f(file_id,dsetname1,pal_name,errcode)
-
-call passed()
-
-
-!-------------------------------------------------------------------------
-! end
-!-------------------------------------------------------------------------
-
-!
-! Close the file.
-!
-call h5fclose_f(file_id, errcode)
-
-!
-! Close FORTRAN predefined datatypes.
-!
-call h5close_f(errcode)
-
-!
-! end function.
-!
-end subroutine make_image1
-
-!-------------------------------------------------------------------------
-! test_begin
-!-------------------------------------------------------------------------
-
-subroutine test_begin(string)
-character(len=*), intent(in) :: string
-write(*, fmt = '(14a)', advance = 'no') string
-write(*, fmt = '(40x,a)', advance = 'no') ' '
-end subroutine test_begin
-
-!-------------------------------------------------------------------------
-! passed
-!-------------------------------------------------------------------------
-
-subroutine passed()
-write(*, fmt = '(6a)')  'PASSED'
-end subroutine passed
diff --git a/hl/fortran/test/tstlite.F90 b/hl/fortran/test/tstlite.F90
new file mode 100644
author	Martin Smith <martin.smith@nokia.com>	2010-07-14 08:52:10 (GMT)
committer	Martin Smith <martin.smith@nokia.com>	2010-07-14 08:52:10 (GMT)
commit	bad44806fd543b91777b69d9afb0e1dd4910b15a (patch)
tree	4f0fbc9a7548bc068b5f7048d8bbb20e5fea5759 /doc/src/snippets/code/doc_src_wince-introduction.qdoc
parent	d3f67bfe7cd1cc39d25e6a7371b2b185591008c4 (diff)
parent	852ba9a62f65a27e42648d4b28b68c76b1589e75 (diff)
download	Qt-bad44806fd543b91777b69d9afb0e1dd4910b15a.zip Qt-bad44806fd543b91777b69d9afb0e1dd4910b15a.tar.gz Qt-bad44806fd543b91777b69d9afb0e1dd4910b15a.tar.bz2